diff --git a/.github/workflows/build-multi-arch-pinot-docker-image.yml b/.github/workflows/build-multi-arch-pinot-docker-image.yml
new file mode 100644
index 00000000000..d6f41d059d0
--- /dev/null
+++ b/.github/workflows/build-multi-arch-pinot-docker-image.yml
@@ -0,0 +1,108 @@
+#
+# 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.
+#
+name: Pinot Multi-Arch Platform Docker Image Build and Publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      gitUrl:
+        description: "The Pinot git repo to check out to build, use https."
+        default: "https://github.com/apache/pinot.git"
+        required: true
+      commit:
+        description: "The branch/commit to check out to build Pinot image."
+        default: "master"
+        required: true
+      dockerImageName:
+        description: "The docker image name, default to 'apachepinot/pinot'."
+        default: "apachepinot/pinot"
+        required: true
+      tags:
+        description: "Tags to push of the image, comma separated, e.g. tag1,tag2,tag3"
+        default: ""
+
+jobs:
+  generate-build-info:
+    name: Generate Build Info
+    runs-on: ubuntu-latest
+    outputs:
+      commit-id: ${{ steps.generate-build-info.outputs.commit-id }}
+      tags: ${{ steps.generate-build-info.outputs.tags }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Generate Build Info
+        id: generate-build-info
+        env:
+          PINOT_GIT_URL: ${{ github.event.inputs.gitUrl }}
+          PINOT_BRANCH: ${{ github.event.inputs.commit }}
+          TAGS: ${{ github.event.inputs.tags }}
+        run: |
+          .github/workflows/scripts/docker/.pinot_build_info_gen.sh
+  build-pinot-docker-image:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [ "amd64", "arm64" ]
+        base-image-tag: [ "11-amazoncorretto", "11-ms-openjdk" ]
+    name: Build Pinot Docker Image on ${{ matrix.arch }} with base image ${{ matrix.base-image-tag }}
+    needs: [ generate-build-info ]
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: docker/setup-qemu-action@v2
+        name: Set up QEMU
+        with:
+          platforms: linux/${{ matrix.arch }}
+      - uses: docker/setup-buildx-action@v2
+        name: Set up Docker Buildx
+      - uses: actions/checkout@v3
+      - name: Build and push the Docker image
+        env:
+          DOCKER_FILE_BASE_DIR: "docker/images/pinot"
+          DOCKER_IMAGE_NAME: ${{ github.event.inputs.dockerImageName }}
+          BUILD_PLATFORM: "linux/${{ matrix.arch }}"
+          BASE_IMAGE_TAG: ${{ matrix.base-image-tag }}
+          PINOT_GIT_URL: ${{ github.event.inputs.gitUrl }}
+          PINOT_BRANCH: "${{needs.generate-build-info.outputs.commit-id}}"
+          TAGS: "${{needs.generate-build-info.outputs.tags}}"
+        run: .github/workflows/scripts/docker/.pinot_single_platform_docker_image_build.sh
+  create-multi-arch-manifest:
+    name: Create Multi-Arch Manifest
+    runs-on: ubuntu-latest
+    needs: [ generate-build-info, build-pinot-docker-image ]
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: docker/setup-qemu-action@v2
+        name: Set up QEMU
+      - uses: docker/setup-buildx-action@v2
+        name: Set up Docker Buildx
+      - uses: actions/checkout@v3
+      - name: Create Multi-Arch Manifest
+        env:
+          TAGS: "${{needs.generate-build-info.outputs.tags}}"
+          BUILD_PLATFORM: "linux/arm64,linux/amd64"
+          BASE_IMAGE_TAGS: "11-amazoncorretto,11-ms-openjdk"
+        run: .github/workflows/scripts/docker/.pinot_multi_arch_docker_image_manifest_package.sh
diff --git a/.github/workflows/build-pinot-base-docker-image.yml b/.github/workflows/build-pinot-base-docker-image.yml
new file mode 100644
index 00000000000..b540ffd61ef
--- /dev/null
+++ b/.github/workflows/build-pinot-base-docker-image.yml
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+name: Pinot Base Docker Image Build and Publish
+
+on:
+  workflow_dispatch:
+    inputs: { }
+
+jobs:
+  build-pinot-build-docker-image:
+    name: Build Pinot Base Docker Image
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        baseImageType: [ "build", "runtime" ]
+        openJdkDist: [ "amazoncorretto", "ms-openjdk" ]
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: docker/setup-qemu-action@v2
+        name: Set up QEMU
+      - uses: docker/setup-buildx-action@v2
+        name: Set up Docker Buildx
+      - uses: actions/checkout@v3
+      - name: Build and push the Docker image
+        env:
+          OPEN_JDK_DIST: ${{ matrix.openJdkDist }}
+          BASE_IMAGE_TYPE: ${{ matrix.baseImageType }}
+          BUILD_PLATFORM: "linux/amd64,linux/arm64"
+          TAG: "11-${{ matrix.openJdkDist }}"
+        run: .github/workflows/scripts/docker/.pinot_base_docker_image_build_and_push.sh
diff --git a/.github/workflows/build-pinot-docker-image.yml b/.github/workflows/build-pinot-docker-image.yml
index 345440750e9..93ab5850a70 100644
--- a/.github/workflows/build-pinot-docker-image.yml
+++ b/.github/workflows/build-pinot-docker-image.yml
@@ -47,13 +47,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-qemu-action@v2
       name: Set up QEMU
-    - uses: docker/setup-buildx-action@v1
+    - uses: docker/setup-buildx-action@v2
       name: Set up Docker Buildx
     - uses: actions/checkout@v3
     - name: Build and push the Docker image
diff --git a/.github/workflows/build-presto-docker-image.yml b/.github/workflows/build-presto-docker-image.yml
index 7ae35253615..43b09ea5def 100644
--- a/.github/workflows/build-presto-docker-image.yml
+++ b/.github/workflows/build-presto-docker-image.yml
@@ -47,13 +47,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-qemu-action@v2
       name: Set up QEMU
-    - uses: docker/setup-buildx-action@v1
+    - uses: docker/setup-buildx-action@v2
       name: Set up Docker Buildx
     - uses: actions/checkout@v3
     - name: Build and push the Docker image
diff --git a/.github/workflows/build-superset-docker-image.yml b/.github/workflows/build-superset-docker-image.yml
index c0e87199169..55d28786252 100644
--- a/.github/workflows/build-superset-docker-image.yml
+++ b/.github/workflows/build-superset-docker-image.yml
@@ -43,13 +43,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-qemu-action@v2
       name: Set up QEMU
-    - uses: docker/setup-buildx-action@v1
+    - uses: docker/setup-buildx-action@v2
       name: Set up Docker Buildx
     - uses: actions/checkout@v3
     - name: Build and push the Docker image
diff --git a/.github/workflows/pinot_compatibility_tests.yml b/.github/workflows/pinot_compatibility_tests.yml
index acb0b1974ca..4059852163f 100644
--- a/.github/workflows/pinot_compatibility_tests.yml
+++ b/.github/workflows/pinot_compatibility_tests.yml
@@ -36,11 +36,23 @@ jobs:
         test_suite: [ "compatibility-verifier/sample-test-suite" ]
     name: Pinot Compatibility Regression Testing against ${{ github.event.inputs.oldCommit }} and ${{ github.event.inputs.newCommit }} on ${{ matrix.test_suite }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'adopt'
+          cache: 'maven'
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: v10.16.1
+          cache: 'npm'
+          cache-dependency-path: pinot-controller/src/main/resources/package-lock.json
+      - name: Install npm
+        run: |
+          npm install -g npm@6.10.0
+          npm --version
       - name: Pinot Compatibility Regression Testing
         if : ${{github.event_name == 'workflow_dispatch'}}
         env:
@@ -50,7 +62,7 @@ jobs:
           TEST_SUITE: ${{ matrix.test_suite }}
           MAVEN_OPTS: >
             -Xmx2G -DskipShade -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
+            -Dmaven.wagon.http.retryHandler.count=30 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
             -XX:+IgnoreUnrecognizedVMOptions
             --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
             --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
@@ -62,7 +74,7 @@ jobs:
         if: always()
         run: |
           zip -1 -r artifacts.zip /tmp/compatibility-verifier/*
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         name: Store compatibility verifier work directory
         if: always()
         with:
diff --git a/.github/workflows/pinot_tests.yml b/.github/workflows/pinot_tests.yml
index b3331fc7d44..844b7bd6fe8 100644
--- a/.github/workflows/pinot_tests.yml
+++ b/.github/workflows/pinot_tests.yml
@@ -49,16 +49,18 @@ jobs:
     runs-on: ubuntu-latest
     name: Pinot Linter Test Set
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'adopt'
+          cache: 'maven'
       - name: Linter Test
         env:
           MAVEN_OPTS: >
             -Xmx2G -DskipShade -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
+            -Dmaven.wagon.http.retryHandler.count=30 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
             -XX:+IgnoreUnrecognizedVMOptions
             --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
             --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
@@ -70,15 +72,21 @@ jobs:
     if: github.repository == 'apache/pinot'
     runs-on: ubuntu-latest
     strategy:
+      # Changed to false in order to improve coverage using unsafe buffers
+      fail-fast: false
       matrix:
         testset: [ 1, 2 ]
-    name: Pinot Unit Test Set ${{ matrix.testset }}
+        java: [ 11, 17, 20 ]
+        distribution: [ "temurin" ]
+    name: Pinot Unit Test Set ${{ matrix.testset }} (${{matrix.distribution}}-${{matrix.java}})
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
+          distribution: ${{ matrix.distribution }}
+          cache: 'maven'
       # Step that does that actual cache save and restore
       - uses: actions/cache@v3
         env:
@@ -94,7 +102,7 @@ jobs:
           RUN_TEST_SET: ${{ matrix.testset }}
           MAVEN_OPTS: >
             -Xmx2G -DskipShade -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
+            -Dmaven.wagon.http.retryHandler.count=30 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
             -XX:+IgnoreUnrecognizedVMOptions
             --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
             --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
@@ -104,8 +112,10 @@ jobs:
         run: .github/workflows/scripts/.pinot_test.sh
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        continue-on-error: true
+        timeout-minutes: 5
         with:
-          flags: unittests${{ matrix.testset }}
+          flags: unittests${{ matrix.testset }}${{matrix.distribution}}${{matrix.java}}
           name: codecov-unit-tests
           fail_ci_if_error: false
           verbose: true
@@ -114,15 +124,21 @@ jobs:
     if: github.repository == 'apache/pinot'
     runs-on: ubuntu-latest
     strategy:
+      # Changed to false in order to improve coverage using unsafe buffers
+      fail-fast: false
       matrix:
         testset: [ 1, 2 ]
-    name: Pinot Integration Test Set ${{ matrix.testset }}
+        java: [ 11, 17, 20 ]
+        distribution: [ "temurin" ]
+    name: Pinot Integration Test Set ${{ matrix.testset }} (${{matrix.distribution}}-${{matrix.java}})
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
+          distribution: ${{ matrix.distribution }}
+          cache: 'maven'
       # Step that does that actual cache save and restore
       - uses: actions/cache@v3
         env:
@@ -138,7 +154,7 @@ jobs:
           RUN_TEST_SET: ${{ matrix.testset }}
           MAVEN_OPTS: >
             -Xmx2G -DskipShade -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
+            -Dmaven.wagon.http.retryHandler.count=30 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
             -XX:+IgnoreUnrecognizedVMOptions
             --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
             --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
@@ -148,8 +164,10 @@ jobs:
         run: .github/workflows/scripts/.pinot_test.sh
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        continue-on-error: true
+        timeout-minutes: 5
         with:
-          flags: integration${{ matrix.testset }}
+          flags: integration${{ matrix.testset }}${{matrix.distribution}}${{matrix.java}}
           name: codecov-integration-tests
           fail_ci_if_error: false
           verbose: true
@@ -158,16 +176,32 @@ jobs:
     if: github.repository == 'apache/pinot'
     runs-on: ubuntu-latest
     strategy:
+      # Changed to false in order to improve coverage using unsafe buffers
+      fail-fast: false
       matrix:
         test_suite: [ "compatibility-verifier/sample-test-suite" ]
-        old_commit: [ "release-0.9.0", "master" ]
+        old_commit: [
+          "release-0.9.3", "release-0.10.0", "release-0.11.0", "release-0.12.1", "master"
+        ]
     name: Pinot Compatibility Regression Testing against ${{ matrix.old_commit }} on ${{ matrix.test_suite }}
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 11
+          distribution: 'adopt'
+          cache: 'maven'
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: v10.16.1
+          cache: 'npm'
+          cache-dependency-path: pinot-controller/src/main/resources/package-lock.json
+      - name: Install npm
+        run: |
+          npm install -g npm@6.10.0
+          npm --version
       # Step that does that actual cache save and restore
       - uses: actions/cache@v3
         env:
@@ -184,7 +218,7 @@ jobs:
           TEST_SUITE: ${{ matrix.test_suite }}
           MAVEN_OPTS: >
             -Xmx2G -DskipShade -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
+            -Dmaven.wagon.http.retryHandler.count=30 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
             -XX:+IgnoreUnrecognizedVMOptions
             --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
             --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
@@ -197,17 +231,20 @@ jobs:
     if: github.repository == 'apache/pinot'
     runs-on: ubuntu-latest
     strategy:
+      # Changed to false in order to improve coverage using unsafe buffers
+      fail-fast: false
       matrix:
-        # We only test LTS Java versions
-        # TODO: add JDK 17 once ready. see: https://github.com/apache/pinot/issues/8529
-        java: [ 1.8, 11, 15 ]
+        java: [ 11, 17, 20 ]
+        distribution: [ "temurin" ]
     name: Pinot Quickstart on JDK ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
+          distribution: ${{ matrix.distribution }}
+          cache: 'maven'
       # Step that does that actual cache save and restore
       - uses: actions/cache@v3
         env:
@@ -225,30 +262,15 @@ jobs:
     runs-on: ubuntu-latest
     name: Build Presto Pinot Driver
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Build presto pinot driver with JDK 11
-        env:
-          MAVEN_OPTS: >
-            -Xmx2G -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-            -XX:+IgnoreUnrecognizedVMOptions
-            --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
-            --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
-            --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
-            --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
-            --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-        run: |
-          mvn clean install -DskipTests -Ppresto-driver -am -B -pl ':presto-pinot-driver' -T 16 || exit 1
+      - uses: actions/checkout@v3
       - name: Set up JDK 8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 8
+          distribution: 'adopt'
+          cache: 'maven'
       - name: Build presto pinot driver with JDK 8
         env:
-          MAVEN_OPTS: -Xmx2G -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
+          MAVEN_OPTS: -Xmx2G -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=30 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
         run: |
-          mvn clean install -DskipTests -Ppresto-driver -am -B -pl ':presto-pinot-driver' -Djdk.version=8 -T 16 || exit 1
+          mvn clean install -Dmaven.test.skip=true -Ppresto-driver -am -B -pl ':pinot-spi-jdk8',':pinot-common-jdk8',':pinot-segment-spi-jdk8' -Djdk.version=8 -T 16 || exit 1
diff --git a/.github/workflows/pinot_vuln_check.yml b/.github/workflows/pinot_vuln_check.yml
index e471f880490..d9aea49353b 100644
--- a/.github/workflows/pinot_vuln_check.yml
+++ b/.github/workflows/pinot_vuln_check.yml
@@ -37,9 +37,9 @@ jobs:
     name: Verify Docker Image
     runs-on: ubuntu-latest
     steps:
-      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-qemu-action@v2
         name: Set up QEMU
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v2
         name: Set up Docker Buildx
       - uses: actions/checkout@v3
       - name: Build the Docker image
diff --git a/.github/workflows/scripts/.pinot_compatibility_verifier.sh b/.github/workflows/scripts/.pinot_compatibility_verifier.sh
index 0897eacdd80..93789ce67ca 100755
--- a/.github/workflows/scripts/.pinot_compatibility_verifier.sh
+++ b/.github/workflows/scripts/.pinot_compatibility_verifier.sh
@@ -41,17 +41,49 @@ echo "      <url>https://packages.confluent.io/maven/</url>">> ${SETTINGS_FILE}
 echo "      <blocked>false</blocked>">> ${SETTINGS_FILE}
 echo "    </mirror>">> ${SETTINGS_FILE}
 echo "  </mirrors>">> ${SETTINGS_FILE}
+
+echo "  <servers>">> ${SETTINGS_FILE}
+echo "    <server>">> ${SETTINGS_FILE}
+echo "      <id>central</id>">> ${SETTINGS_FILE}
+echo "      <configuration>">> ${SETTINGS_FILE}
+echo "        <httpConfiguration>">> ${SETTINGS_FILE}
+echo "          <all>">> ${SETTINGS_FILE}
+echo "            <connectionTimeout>120000</connectionTimeout>">> ${SETTINGS_FILE}
+echo "            <readTimeout>120000</readTimeout>">> ${SETTINGS_FILE}
+echo "            <retries>3</retries>">> ${SETTINGS_FILE}
+echo "          </all>">> ${SETTINGS_FILE}
+echo "        </httpConfiguration>">> ${SETTINGS_FILE}
+echo "      </configuration>">> ${SETTINGS_FILE}
+echo "    </server>">> ${SETTINGS_FILE}
+echo "  </servers>">> ${SETTINGS_FILE}
+
 echo "</settings>">> ${SETTINGS_FILE}
 
 # PINOT_MAVEN_OPTS is used to provide additional maven options to the checkoutAndBuild.sh command
 export PINOT_MAVEN_OPTS="-s $(pwd)/${SETTINGS_FILE}"
 
-if [ -z "$newerCommit" ]; then
-  echo "Running compatibility regression test against \"${olderCommit}\""
+# Compare commit hash for compatibility verification
+git fetch --all
+NEW_COMMIT_HASH=`git log -1 --pretty=format:'%h' HEAD`
+if [ ! -z "${NEW_COMMIT}" ]; then
+  NEW_COMMIT_HASH=`git log -1 --pretty=format:'%h' ${NEW_COMMIT}`
+fi
+OLD_COMMIT_HASH=`git log -1 --pretty=format:'%h' ${OLD_COMMIT}`
+if [ $? -ne 0 ]; then
+  echo "Failed to get commit hash for commit: \"${OLD_COMMIT}\""
+  OLD_COMMIT_HASH=`git log -1 --pretty=format:'%h' origin/${OLD_COMMIT}`
+fi
+if [ "${NEW_COMMIT_HASH}" == "${OLD_COMMIT_HASH}" ]; then
+  echo "No changes between old commit: \"${OLD_COMMIT}\" and new commit: \"${NEW_COMMIT}\""
+  exit 0
+fi
+
+if [ -z "${NEW_COMMIT}" ]; then
+  echo "Running compatibility regression test against \"${OLD_COMMIT}\""
   compatibility-verifier/checkoutAndBuild.sh -w $WORKING_DIR -o $OLD_COMMIT
 else
-  echo "Running compatibility regression test against \"${olderCommit}\" and \"${newerCommit}\""
-  compatibility-verifier/checkoutAndBuild.sh -w $WORKING_DIR -o $OLD_COMMIT -n $NEW_OLD_COMMIT
+  echo "Running compatibility regression test against \"${OLD_COMMIT}\" and \"${NEW_COMMIT}\""
+  compatibility-verifier/checkoutAndBuild.sh -w $WORKING_DIR -o $OLD_COMMIT -n $NEW_COMMIT
 fi
 
 compatibility-verifier/compCheck.sh -w $WORKING_DIR -t $TEST_SUITE
diff --git a/.github/workflows/scripts/.pinot_quickstart.sh b/.github/workflows/scripts/.pinot_quickstart.sh
index f27ecc8dcfd..d78f647c0c9 100755
--- a/.github/workflows/scripts/.pinot_quickstart.sh
+++ b/.github/workflows/scripts/.pinot_quickstart.sh
@@ -68,9 +68,9 @@ PASS=0
 for i in $(seq 1 2)
 do
   if [ "$JAVA_VER" -gt 11 ] ; then
-    mvn clean install -B -DskipTests=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=11
+    mvn clean install -B -Dmaven.test.skip=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=11
   else
-    mvn clean install -B -DskipTests=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=${JAVA_VER}
+    mvn clean install -B -Dmaven.test.skip=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=${JAVA_VER}
   fi
   if [ $? -eq 0 ]; then
     PASS=1
@@ -87,6 +87,7 @@ cd "${DIST_BIN_DIR}"
 
 # Test standalone pinot. Configure JAVA_OPTS for smaller memory, and don't use System.exit
 export JAVA_OPTS="-Xms1G -Dlog4j2.configurationFile=conf/log4j2.xml"
+
 bin/pinot-admin.sh StartZookeeper &
 ZK_PID=$!
 sleep 10
@@ -119,6 +120,12 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
+bin/pinot-admin.sh AddTable -tableConfigFile examples/batch/dimBaseballTeams/dimBaseballTeams_offline_table_config.json -schemaFile examples/batch/dimBaseballTeams/dimBaseballTeams_schema.json -exec
+if [ $? -ne 0 ]; then
+  echo 'Failed to create table dimBaseballTeams.'
+  exit 1
+fi
+
 # Ingest Data
 d=`pwd`
 INSERT_INTO_RES=`curl -X POST --header 'Content-Type: application/json'  -d "{\"sql\":\"INSERT INTO baseballStats FROM FILE '${d}/examples/batch/baseballStats/rawdata'\",\"trace\":false}" http://localhost:8099/query/sql`
@@ -128,8 +135,17 @@ if [ $? -ne 0 ]; then
 fi
 PASS=0
 
+
+INSERT_INTO_RES=`curl -X POST --header 'Content-Type: application/json'  -d "{\"sql\":\"INSERT INTO dimBaseballTeams FROM FILE '${d}/examples/batch/dimBaseballTeams/rawdata'\",\"trace\":false}" http://localhost:8099/query/sql`
+if [ $? -ne 0 ]; then
+  echo 'Failed to ingest data for table baseballStats.'
+  exit 1
+fi
+PASS=0
+
 # Wait for 10 Seconds for table to be set up, then query the total count.
 sleep 10
+# Validate V1 query count(*) result
 for i in $(seq 1 150)
 do
   QUERY_RES=`curl -X POST --header 'Accept: application/json'  -d '{"sql":"select count(*) from baseballStats limit 1","trace":false}' http://localhost:8099/query/sql`
@@ -143,6 +159,38 @@ do
   sleep 2
 done
 
+PASS=0
+
+# Validate V2 query count(*) result
+for i in $(seq 1 150)
+do
+  QUERY_RES=`curl -X POST --header 'Accept: application/json'  -d '{"sql":"SET useMultistageEngine=true; select count(*) from baseballStats limit 1","trace":false}' http://localhost:8099/query/sql`
+  if [ $? -eq 0 ]; then
+    COUNT_STAR_RES=`echo "${QUERY_RES}" | jq '.resultTable.rows[0][0]'`
+    if [[ "${COUNT_STAR_RES}" =~ ^[0-9]+$ ]] && [ "${COUNT_STAR_RES}" -eq 97889 ]; then
+      PASS=1
+      break
+    fi
+  fi
+  sleep 2
+done
+
+PASS=0
+
+# Validate V2 join query results
+for i in $(seq 1 150)
+do
+  QUERY_RES=`curl -X POST --header 'Accept: application/json'  -d '{"sql":"SET useMultistageEngine=true;SELECT a.playerName, a.teamID, b.teamName FROM baseballStats_OFFLINE AS a JOIN dimBaseballTeams_OFFLINE AS b ON a.teamID = b.teamID LIMIT 10","trace":false}' http://localhost:8099/query/sql`
+  if [ $? -eq 0 ]; then
+    RES_0=`echo "${QUERY_RES}" | jq '.resultTable.rows[0][0]'`
+    if [[ "${RES_0}" = "\"David Allan\"" ]]; then
+      PASS=1
+      break
+    fi
+  fi
+  sleep 2
+done
+
 cleanup "${PINOT_PID}"
 cleanup "${ZK_PID}"
 if [ "${PASS}" -eq 0 ]; then
@@ -150,8 +198,8 @@ if [ "${PASS}" -eq 0 ]; then
   exit 1
 fi
 
-# Test quick-start-batch
-bin/quick-start-batch.sh &
+# Test quick-start-multi-stage
+bin/pinot-admin.sh QuickStart -type MULTI_STAGE &
 PID=$!
 
 # Print the JVM settings
@@ -174,6 +222,38 @@ do
   sleep 2
 done
 
+PASS=0
+
+# Validate V2 query count(*) result
+for i in $(seq 1 150)
+do
+  QUERY_RES=`curl -X POST --header 'Accept: application/json'  -d '{"sql":"SET useMultistageEngine=true; select count(*) from baseballStats limit 1","trace":false}' http://localhost:8000/query/sql`
+  if [ $? -eq 0 ]; then
+    COUNT_STAR_RES=`echo "${QUERY_RES}" | jq '.resultTable.rows[0][0]'`
+    if [[ "${COUNT_STAR_RES}" =~ ^[0-9]+$ ]] && [ "${COUNT_STAR_RES}" -eq 97889 ]; then
+      PASS=1
+      break
+    fi
+  fi
+  sleep 2
+done
+
+PASS=0
+
+# Validate V2 join query results
+for i in $(seq 1 150)
+do
+  QUERY_RES=`curl -X POST --header 'Accept: application/json'  -d '{"sql":"SET useMultistageEngine=true;SELECT a.playerName, a.teamID, b.teamName FROM baseballStats_OFFLINE AS a JOIN dimBaseballTeams_OFFLINE AS b ON a.teamID = b.teamID LIMIT 10","trace":false}' http://localhost:8000/query/sql`
+  if [ $? -eq 0 ]; then
+    RES_0=`echo "${QUERY_RES}" | jq '.resultTable.rows[0][0]'`
+    if [[ ${RES_0} = "\"David Allan\"" ]]; then
+      PASS=1
+      break
+    fi
+  fi
+  sleep 2
+done
+
 cleanup "${PID}"
 if [ "${PASS}" -eq 0 ]; then
   echo 'Batch Quickstart failed: Cannot get correct result for count star query.'
diff --git a/.github/workflows/scripts/.pinot_test.sh b/.github/workflows/scripts/.pinot_test.sh
index d88414583c6..1608b6f7e99 100755
--- a/.github/workflows/scripts/.pinot_test.sh
+++ b/.github/workflows/scripts/.pinot_test.sh
@@ -27,18 +27,21 @@ netstat -i
 
 if [ "$RUN_INTEGRATION_TESTS" != false ]; then
   # Integration Tests
-  mvn clean install -DskipTests -am -B -pl 'pinot-integration-tests' -T 16 || exit 1
+  mvn clean install -DskipTests -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true -am -B \
+    -pl 'pinot-integration-tests' -T 16 || exit 1
   if [ "$RUN_TEST_SET" == "1" ]; then
     mvn test -am -B \
         -pl 'pinot-integration-tests' \
         -Dtest='C*Test,L*Test,M*Test,R*Test,S*Test' \
-        -P github-actions,integration-tests-only && exit 0 || exit 1
+        -P github-actions,integration-tests-only \
+        -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true && exit 0 || exit 1
   fi
   if [ "$RUN_TEST_SET" == "2" ]; then
     mvn test -am -B \
         -pl 'pinot-integration-tests' \
         -Dtest='!C*Test,!L*Test,!M*Test,!R*Test,!S*Test' \
-        -P github-actions,integration-tests-only && exit 0 || exit 1
+        -P github-actions,integration-tests-only \
+        -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true && exit 0 || exit 1
   fi
 else
   # Unit Tests
@@ -60,10 +63,11 @@ else
         -pl ':pinot-csv' \
         -pl ':pinot-json' \
         -pl ':pinot-segment-uploader-default' \
-        -P github-actions,no-integration-tests && exit 0 || exit 1
+        -P github-actions,no-integration-tests \
+        -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true && exit 0 || exit 1
   fi
   if [ "$RUN_TEST_SET" == "2" ]; then
-    mvn clean install -DskipTests -T 16 || exit 1
+    mvn clean install -DskipTests -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true -T 16 || exit 1
     mvn test -am -B \
         -pl '!pinot-spi' \
         -pl '!pinot-segment-spi' \
@@ -79,7 +83,9 @@ else
         -pl '!:pinot-csv' \
         -pl '!:pinot-json' \
         -pl '!:pinot-segment-uploader-default' \
-        -P github-actions,no-integration-tests && exit 0 || exit 1
+        -P github-actions,no-integration-tests \
+        -Dspotless.apply.skip -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true \
+         && exit 0 || exit 1
   fi
 fi
 
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory b/.github/workflows/scripts/docker/.pinot_base_docker_image_build_and_push.sh
old mode 100644
new mode 100755
similarity index 68%
rename from pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory
rename to .github/workflows/scripts/docker/.pinot_base_docker_image_build_and_push.sh
index 0bbaa018851..b13b14d786b
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/resources/META-INF/services/org.apache.pinot.spi.stream.StreamConsumerFactory
+++ b/.github/workflows/scripts/docker/.pinot_base_docker_image_build_and_push.sh
@@ -1,3 +1,4 @@
+#!/bin/bash -x
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,4 +17,21 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-org.apache.pinot.plugin.stream.kafka09.KafkaConsumerFactory
\ No newline at end of file
+
+if [ -z "${BUILD_PLATFORM}" ]; then
+  exit 1
+fi
+
+if [ -z "${BASE_IMAGE_TYPE}" ]; then
+  exit 1
+fi
+
+cd docker/images/pinot-base/pinot-base-${BASE_IMAGE_TYPE}
+
+docker buildx build \
+  --no-cache \
+  --platform=${BUILD_PLATFORM} \
+  --file ${OPEN_JDK_DIST}.dockerfile \
+  --tag apachepinot/pinot-base-${BASE_IMAGE_TYPE}:${TAG} \
+  --push \
+  .
diff --git a/.github/workflows/scripts/docker/.pinot_build_info_gen.sh b/.github/workflows/scripts/docker/.pinot_build_info_gen.sh
new file mode 100755
index 00000000000..bca2a0ef8e3
--- /dev/null
+++ b/.github/workflows/scripts/docker/.pinot_build_info_gen.sh
@@ -0,0 +1,41 @@
+#!/bin/bash -x
+#
+# 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.
+#
+if [ -z "${PINOT_GIT_URL}" ]; then
+  PINOT_GIT_URL="https://github.com/apache/pinot.git"
+fi
+if [ -z "${PINOT_BRANCH}" ]; then
+  PINOT_BRANCH="master"
+fi
+
+# Get pinot commit id
+ROOT_DIR=$(pwd)
+rm -rf /tmp/pinot
+git clone -b ${PINOT_BRANCH} --single-branch ${PINOT_GIT_URL} /tmp/pinot
+cd /tmp/pinot
+COMMIT_ID=$(git rev-parse --short HEAD)
+VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+rm -rf /tmp/pinot
+DATE=$(date +%Y%m%d)
+
+if [ -z "${TAGS}" ]; then
+  TAGS="${VERSION}-${COMMIT_ID}-${DATE},latest"
+fi
+echo "commit-id=${COMMIT_ID}" >>"$GITHUB_OUTPUT"
+echo "tags=${TAGS}" >>"$GITHUB_OUTPUT"
diff --git a/.github/workflows/scripts/docker/.pinot_multi_arch_docker_image_manifest_package.sh b/.github/workflows/scripts/docker/.pinot_multi_arch_docker_image_manifest_package.sh
new file mode 100755
index 00000000000..3a2995facfd
--- /dev/null
+++ b/.github/workflows/scripts/docker/.pinot_multi_arch_docker_image_manifest_package.sh
@@ -0,0 +1,62 @@
+#!/bin/bash -x
+#
+# 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.
+#
+
+if [ -z "${DOCKER_IMAGE_NAME}" ]; then
+  DOCKER_IMAGE_NAME="apachepinot/pinot"
+fi
+
+tags=()
+declare -a tags=($(echo ${TAGS} | tr "," " "))
+
+platforms=()
+declare -a platforms=($(echo ${BUILD_PLATFORM} | tr "," " "))
+
+baseImageTags=()
+declare -a baseImageTags=($(echo ${BASE_IMAGE_TAGS} | tr "," " "))
+
+for tag in "${tags[@]}"; do
+  for baseImageTag in "${baseImageTags[@]}"; do
+    DOCKER_AMEND_TAGS_CMD=""
+    for platform in "${platforms[@]}"; do
+      platformTag=${platform/\//-}
+      DOCKER_AMEND_TAGS_CMD+=" --amend ${DOCKER_IMAGE_NAME}:${tag}-${baseImageTag}-${platformTag} "
+    done
+
+    echo "Creating manifest for tag: ${tag}-${baseImageTag}"
+    docker manifest create \
+      ${DOCKER_IMAGE_NAME}:${tag}-${baseImageTag} \
+      ${DOCKER_AMEND_TAGS_CMD}
+
+    docker manifest push \
+      ${DOCKER_IMAGE_NAME}:${tag}-${baseImageTag}
+
+    if [ "${baseImageTag}" == "11-amazoncorretto" ]; then
+      if [ "${tag}" == "latest" ]; then
+        echo "Creating manifest for tag: latest"
+        docker manifest create \
+          ${DOCKER_IMAGE_NAME}:latest \
+          ${DOCKER_AMEND_TAGS_CMD}
+
+        docker manifest push \
+          ${DOCKER_IMAGE_NAME}:latest
+      fi
+    fi
+  done
+done
diff --git a/.github/workflows/scripts/docker/.pinot_single_platform_docker_image_build.sh b/.github/workflows/scripts/docker/.pinot_single_platform_docker_image_build.sh
new file mode 100755
index 00000000000..c2f8b288a9e
--- /dev/null
+++ b/.github/workflows/scripts/docker/.pinot_single_platform_docker_image_build.sh
@@ -0,0 +1,66 @@
+#!/bin/bash -x
+#
+# 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.
+#
+
+if [ -z "${DOCKER_IMAGE_NAME}" ]; then
+  DOCKER_IMAGE_NAME="apachepinot/pinot"
+fi
+if [ -z "${PINOT_GIT_URL}" ]; then
+  PINOT_GIT_URL="https://github.com/apache/pinot.git"
+fi
+if [ -z "${JDK_VERSION}" ]; then
+  JDK_VERSION="11"
+fi
+
+tags=()
+declare -a tags=($(echo ${TAGS} | tr "," " "))
+
+cd ${DOCKER_FILE_BASE_DIR}
+platformTag=${BUILD_PLATFORM/\//-}
+DOCKER_BUILD_TAGS=""
+for tag in "${tags[@]}"; do
+  DOCKER_BUILD_TAGS+=" --tag ${DOCKER_IMAGE_NAME}:${tag}-${BASE_IMAGE_TAG}-${platformTag} "
+
+  if [ "${BASE_IMAGE_TAG}" == "11-amazoncorretto" ]; then
+    if [ "${tag}" == "latest" ]; then
+      DOCKER_BUILD_TAGS+=" --tag ${DOCKER_IMAGE_NAME}:latest-${platformTag} "
+    fi
+  fi
+done
+
+echo "Building docker image for platform: ${BUILD_PLATFORM} with tags: ${DOCKER_BUILD_TAGS}"
+docker build \
+  --no-cache \
+  --platform ${BUILD_PLATFORM} \
+  --file Dockerfile \
+  --build-arg PINOT_GIT_URL=${PINOT_GIT_URL} \
+  --build-arg PINOT_BRANCH=${PINOT_BRANCH} \
+  --build-arg JDK_VERSION=${JDK_VERSION} \
+  ${DOCKER_BUILD_TAGS} \
+  .
+
+for tag in "${tags[@]}"; do
+  docker push ${DOCKER_IMAGE_NAME}:${tag}-${BASE_IMAGE_TAG}-${platformTag}
+
+  if [ "${BASE_IMAGE_TAG}" == "11-amazoncorretto" ]; then
+    if [ "${tag}" == "latest" ]; then
+      docker push ${DOCKER_IMAGE_NAME}:${tag}-${platformTag}
+    fi
+  fi
+done
diff --git a/LICENSE-binary b/LICENSE-binary
index 41b098b628f..e22858ca850 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -270,7 +270,7 @@ com.uber:h3:4.0.0
 com.yahoo.datasketches:memory:0.8.3
 com.yahoo.datasketches:sketches-core:0.8.3
 com.yammer.metrics:metrics-core:2.2.0
-com.yscope.clp:clp-ffi:0.2.1
+com.yscope.clp:clp-ffi:0.4.3
 com.zaxxer:HikariCP-java7:2.4.13
 commons-cli:commons-cli:1.2
 commons-codec:commons-codec:1.15
@@ -459,7 +459,7 @@ org.scala-lang.modules:scala-collection-compat_2.12:2.3.0
 org.scala-lang.modules:scala-java8-compat_2.12:0.9.1
 org.scala-lang.modules:scala-xml_2.12:1.3.0
 org.typelevel:macro-compat_2.12:1.1.1
-org.webjars:swagger-ui:3.23.11
+org.webjars:swagger-ui:5.1.0
 org.wildfly.openssl:wildfly-openssl:1.0.7.Final
 org.xerial.larray:larray-buffer:0.4.1
 org.xerial.larray:larray-mmap:0.4.1
diff --git a/compatibility-verifier/checkoutAndBuild.sh b/compatibility-verifier/checkoutAndBuild.sh
index 702e01b1f4a..0bbb531740f 100755
--- a/compatibility-verifier/checkoutAndBuild.sh
+++ b/compatibility-verifier/checkoutAndBuild.sh
@@ -22,6 +22,8 @@ cmdName=`basename $0`
 cmdDir=`dirname $0`
 source ${cmdDir}/utils.inc
 MVN_CACHE_DIR="mvn-compat-cache"
+df -h
+du -hd2 /home/runner
 
 # get usage of the script
 function usage() {
@@ -64,7 +66,7 @@ function checkOut() {
 # compatibility tester
 # It uses a different version for each build, since we build trees in parallel.
 # Building the same version on all trees in parallel causes unstable builds.
-# Using indpendent buildIds will cause maven cache to fill up, so we use a
+# Using independent buildIds will cause maven cache to fill up, so we use a
 # dedicated maven cache for these builds, and remove the cache after build is
 # completed.
 # If buildId is less than 0, then the mvn version is not changed in pom files.
@@ -72,10 +74,13 @@ function build() {
   local outFile=$1
   local buildTests=$2
   local buildId=$3
+  local buildCompatibilityVerifier=$4
   local repoOption=""
-  local versionOption="-Djdk.version=8"
+  local versionOption="-Djdk.version=11"
+  local maxRetry=5
 
   mkdir -p ${MVN_CACHE_DIR}
+  mkdir -p ${mvnCache}
 
   if [ ${buildId} -gt 0 ]; then
     # Build it in a different env under different version so that maven cache does
@@ -85,15 +90,40 @@ function build() {
     mvn versions:commit -q -B 1>${outFile} 2>&1
     repoOption="-Dmaven.repo.local=${mvnCache}/${buildId}"
   fi
-
-  mvn install package -DskipTests -Pbin-dist ${versionOption} ${repoOption} ${PINOT_MAVEN_OPTS} 1>${outFile} 2>&1
-  if [ $? -ne 0 ]; then exit 1; fi
-  mvn -pl pinot-tools package -DskipTests ${versionOption} ${repoOption} ${PINOT_MAVEN_OPTS} 1>>${outFile} 2>&1
-  if [ $? -ne 0 ]; then exit 1; fi
+  buildComponents=":pinot-tools"
+  if [ $buildCompatibilityVerifier -gt 0 ]; then
+    buildComponents=":pinot-tools,:pinot-compatibility-verifier"
+  fi
+  for i in $(seq 1 $maxRetry); do
+    mvn clean package -am -pl ${buildComponents} -DskipTests -T1C ${versionOption} ${repoOption} ${PINOT_MAVEN_OPTS} 1>${outFile} 2>&1
+    if [ $? -eq 0 ]; then break; fi
+    if [ $i -eq $maxRetry ]; then exit 1; fi
+    echo ""
+    echo "Build failed, see last 1000 lines of output below."
+    tail -1000 ${outFile}
+    echo "Retrying after 30 seconds..."
+    sleep 30
+  done
   if [ $buildTests -eq 1 ]; then
-    mvn -pl pinot-integration-tests package -DskipTests ${versionOption} ${repoOption} ${PINOT_MAVEN_OPTS} 1>>${outFile} 2>&1
-    if [ $? -ne 0 ]; then exit 1; fi
+    for i in $(seq 1 $maxRetry); do
+      mvn -pl :pinot-integration-tests package -DskipTests -T1C ${versionOption} ${repoOption} ${PINOT_MAVEN_OPTS} 1>>${outFile} 2>&1
+      if [ $? -eq 0 ]; then break; fi
+      if [ $i -eq $maxRetry ]; then exit 1; fi
+      echo ""
+      echo "Build failed, see last 500 lines of output below."
+      tail -500 ${outFile}
+      echo "Retrying after 30 seconds..."
+      sleep 30
+    done
   fi
+  # DELETE the mvn cache
+  du -hd1 ${mvnCache}
+  df -h
+  rm -rf ${mvnCache}
+  du -hd2 /home/runner
+  df -h
+  rm -rf /home/runner/.m2/repository
+  df -h
 }
 
 #
@@ -190,29 +220,46 @@ fi
 echo "Checking out old version at commit \"${olderCommit}\""
 checkOut "$olderCommit" "$oldTargetDir"
 
-# Start builds in parallel.
+exitStatus=0
+
+# Start builds in sequential.
 # First build the current tree. We need it so that we can
-# run the compatibiity tester.
+# run the compatibility tester.
 echo Starting build for compat checker at ${cmdDir}, buildId none.
-(cd ${cmdDir}/..; build ${curBuildOutFile} 1 -1) &
+(cd ${cmdDir}/..; build ${curBuildOutFile} 1 -1 1) &
 curBuildPid=$!
 
+echo Awaiting build complete for compat checker
+while true ; do
+  printf "."
+  ps -p ${curBuildPid} 1>/dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    printf "\n"
+    wait ${curBuildPid}
+    curBuildStatus=$?
+    break
+  fi
+  sleep 5
+done
+
+if [ ${curBuildStatus} -eq 0 ]; then
+  echo Compat checker build completed successfully
+else
+  echo Compat checker build failed. See ${curBuildOutFile}
+  echo ======== Build output ========
+  cat ${curBuildOutFile}
+  echo ==== End Build output ========
+  exitStatus=1
+  /bin/rm -r ${mvnCache}
+  exit ${exitStatus}
+fi
+
 # The old commit has been cloned in oldTargetDir, build it.
 buildId=$(date +%s)
 echo Starting build for old version at ${oldTargetDir} buildId ${buildId}
-(cd ${oldTargetDir}; build ${oldBuildOutFile} 0 ${buildId}) &
+(cd ${oldTargetDir}; build ${oldBuildOutFile} 0 ${buildId} 0) &
 oldBuildPid=$!
 
-# In case the user specified the current tree as newer commit, then
-# We don't need to build newer commit tree (we have already built the
-# current tree above and linked newTargetDir). Otherwise, build the newTargetDir
-if [ ${buildNewTarget} -eq 1 ]; then
-  buildId=$((buildId+1))
-  echo Starting build for new version at ${newTargetDir} buildId ${buildId}
-  (cd ${newTargetDir}; build ${newBuildOutFile} 0 ${buildId}) &
-  newBuildPid=$!
-fi
-
 # We may have potentially started three builds above (at least two).
 # Wait for each of them to complete.
 echo Awaiting build complete for old commit
@@ -228,18 +275,27 @@ while true ; do
   sleep 5
 done
 
-echo Awaiting build complete for compat checker
-while true ; do
-  printf "."
-  ps -p ${curBuildPid} 1>/dev/null 2>&1
-  if [ $? -ne 0 ]; then
-    printf "\n"
-    wait ${curBuildPid}
-    curBuildStatus=$?
-    break
-  fi
-  sleep 5
-done
+if [ ${oldBuildStatus} -eq 0 ]; then
+  echo Old version build completed successfully
+else
+  echo Old version build failed. See ${oldBuildOutFile}
+  echo ======== Build output ========
+  cat ${oldBuildOutFile}
+  echo ==== End Build output ========
+  exitStatus=1
+  /bin/rm -r ${mvnCache}
+  exit ${exitStatus}
+fi
+
+# In case the user specified the current tree as newer commit, then
+# We don't need to build newer commit tree (we have already built the
+# current tree above and linked newTargetDir). Otherwise, build the newTargetDir
+if [ ${buildNewTarget} -eq 1 ]; then
+  buildId=$((buildId+1))
+  echo Starting build for new version at ${newTargetDir} buildId ${buildId}
+  (cd ${newTargetDir}; build ${newBuildOutFile} 0 ${buildId} 0) &
+  newBuildPid=$!
+fi
 
 if [ ${buildNewTarget} -eq 1 ]; then
   echo Awaiting build complete for new commit
@@ -256,28 +312,6 @@ if [ ${buildNewTarget} -eq 1 ]; then
   done
 fi
 
-exitStatus=0
-
-if [ ${oldBuildStatus} -eq 0 ]; then
-  echo Old version build completed successfully
-else
-  echo Old version build failed. See ${oldBuildOutFile}
-  echo ======== Build output ========
-  cat ${oldBuildOutFile}
-  echo ==== End Build output ========
-  exitStatus=1
-fi
-
-if [ ${curBuildStatus} -eq 0 ]; then
-  echo Compat checker build completed successfully
-else
-  echo Compat checker build failed. See ${curBuildOutFile}
-  echo ======== Build output ========
-  cat ${curBuildOutFile}
-  echo ==== End Build output ========
-  exitStatus=1
-fi
-
 if [ ${buildNewTarget} -eq 1 ]; then
   if [ ${newBuildStatus} -eq 0 ]; then
     echo New version build completed successfully
@@ -287,6 +321,7 @@ if [ ${buildNewTarget} -eq 1 ]; then
     cat ${newBuildOutFile}
     echo ==== End Build output ========
     exitStatus=1
+    exit ${exitStatus}
   fi
 fi
 
diff --git a/config/suppressions.xml b/config/suppressions.xml
index 56b06ed6b7a..10d796b2333 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -45,4 +45,7 @@
 
   <!-- Allow static imports in tests -->
   <suppress checks="AvoidStaticImport" files="[\\/]src[\\/]test[\\/].*" />
+
+  <suppress checks="IllegalImport" files="Unsafer.java"/>
+  <suppress checks="IllegalImport" files="UnsafePinotBuffer.java"/>
 </suppressions>
diff --git a/contrib/pinot-druid-benchmark/pom.xml b/contrib/pinot-druid-benchmark/pom.xml
index 050e312a1b2..0e4589761e0 100644
--- a/contrib/pinot-druid-benchmark/pom.xml
+++ b/contrib/pinot-druid-benchmark/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.1</version>
+      <version>4.5.13</version>
     </dependency>
   </dependencies>
 
diff --git a/contrib/pinot-fmpp-maven-plugin/pom.xml b/contrib/pinot-fmpp-maven-plugin/pom.xml
index b7ccad0d855..7ed1a2dab60 100644
--- a/contrib/pinot-fmpp-maven-plugin/pom.xml
+++ b/contrib/pinot-fmpp-maven-plugin/pom.xml
@@ -36,9 +36,9 @@
   <packaging>maven-plugin</packaging>
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
-    <maven.version>3.3.3</maven.version>
+    <maven.version>3.8.2</maven.version>
     <fmpp.version>0.9.16</fmpp.version>
-    <freemarker.version>2.3.28</freemarker.version>
+    <freemarker.version>2.3.30</freemarker.version>
   </properties>
 
   <dependencies>
@@ -55,17 +55,33 @@
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-utils</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>org.eclipse.sisu.plexus</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${maven.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>org.eclipse.sisu.plexus</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.fmpp</groupId>
       <artifactId>fmpp</artifactId>
       <version>${fmpp.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.freemarker</groupId>
+          <artifactId>freemarker</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.freemarker</groupId>
diff --git a/docker/images/pinot-base/README.md b/docker/images/pinot-base/README.md
index d7f5e929174..92430de06c6 100644
--- a/docker/images/pinot-base/README.md
+++ b/docker/images/pinot-base/README.md
@@ -20,40 +20,35 @@
 -->
 
 # docker-pinot-base
+
 This is the base docker image to build [Apache Pinot](https://github.com/apache/pinot).
 
-## How to build a docker image
+## Build and publish the docker image
 
-Arguments:
+Here is
+the [Github Action task](https://github.com/apachepinot/pinot-fork/actions/workflows/build-pinot-docker-base-image.yml)
+to build and publish pinot base docker images.
 
-`JAVA_VERSION`: The Java Build and Runtime image version. Default is `11`
+This task can be triggered manually to build the cross platform(amd64 and arm64v8) base image.
 
-`OPENJDK_IMAGE`: Base image to use for Pinot build and runtime, e.g. `arm64v8/openjdk`. Default is `openjdk`.
+The build shell is:
 
-Usage:
-```SHELL
-docker build -t apachepinot/pinot-base-build:openjdk11 --no-cache --network=host --build-arg JAVA_VERSION=11 -f pinot-base-build/Dockerfile .
-```
+For Amazon Corretto 11:
 
 ```SHELL
-docker build -t apachepinot/pinot-base-runtime:openjdk11 --no-cache --network=host --build-arg JAVA_VERSION=11 -f pinot-base-runtime/Dockerfile .
+docker buildx build --no-cache --platform=linux/arm64,linux/amd64 --file pinot-base-build/amazoncorretto.dockerfile --tag apachepinot/pinot-base-build:11-amazoncorretto --push .
 ```
 
-Note that if you are not on arm64 machine, you can still build the image by turning on the experimental feature of docker, and add `--platform linux/arm64` into the `docker build ...` script, e.g.
-```SHELL
-docker build -t apachepinot/pinot-base-build:openjdk11-arm64v8 --platform linux/arm64 --no-cache --network=host --build-arg JAVA_VERSION=11 --build-arg OPENJDK_IMAGE=arm64v8/openjdk -f pinot-base-build/Dockerfile .
-```
 ```SHELL
-docker build -t apachepinot/pinot-base-runtime:openjdk11-arm64v8 --platform linux/arm64 --no-cache --network=host --build-arg JAVA_VERSION=11 --build-arg OPENJDK_IMAGE=arm64v8/openjdk -f pinot-base-runtime/Dockerfile .
+docker buildx build --no-cache --platform=linux/arm64,linux/amd64 --file pinot-base-runtime/amazoncorretto.dockerfile --tag apachepinot/pinot-base-runtime:11-amazoncorretto --push .
 ```
 
-## Publish the docker image
+For MS OpenJDK, the build shell is:
 
-Here is the [Github Action task](https://github.com/apachepinot/pinot-fork/actions/workflows/build-pinot-docker-base-image.yml) to build and publish pinot base docker images.
-
-This task can be triggered manually to build the cross platform(amd64 and arm64v8) base image.
+```SHELL
+docker buildx build --no-cache --platform=linux/arm64,linux/amd64 --file pinot-base-build/amazoncorretto.dockerfile --tag apachepinot/pinot-base-build:11-ms-openjdk --push .
+```
 
-The build shell is:
 ```SHELL
-docker buildx build --no-cache --platform=linux/arm64,linux/amd64 --file Dockerfile --tag apachepinot/pinot-base-build:openjdk11 --push .
-```
\ No newline at end of file
+docker buildx build --no-cache --platform=linux/arm64,linux/amd64 --file pinot-base-runtime/amazoncorretto.dockerfile --tag apachepinot/pinot-base-runtime:11-ms-openjdk --push .
+```
diff --git a/docker/images/pinot-base/pinot-base-build/amazoncorretto.dockerfile b/docker/images/pinot-base/pinot-base-build/amazoncorretto.dockerfile
new file mode 100644
index 00000000000..674f87d6cbb
--- /dev/null
+++ b/docker/images/pinot-base/pinot-base-build/amazoncorretto.dockerfile
@@ -0,0 +1,64 @@
+#
+# 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.
+#
+FROM debian:buster-slim
+
+ARG version=11.0.18.10-1
+# In addition to installing the Amazon corretto, we also install
+# fontconfig. The folks who manage the docker hub's
+# official image library have found that font management
+# is a common usecase, and painpoint, and have
+# recommended that Java images include font support.
+#
+# See:
+#  https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java
+
+LABEL MAINTAINER=dev@pinot.apache.org
+
+RUN set -eux \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+  curl ca-certificates gnupg software-properties-common fontconfig java-common vim wget git automake bison flex g++ libboost-all-dev libevent-dev libssl-dev libtool make pkg-config\
+  && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \
+  && add-apt-repository 'deb https://apt.corretto.aws stable main' \
+  && mkdir -p /usr/share/man/man1 || true \
+  && apt-get update \
+  && apt-get install -y java-11-amazon-corretto-jdk=1:$version \
+  && rm -rf /var/lib/apt/lists/*
+
+ENV LANG C.UTF-8
+ENV JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto
+
+# install maven
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+  && wget https://dlcdn.apache.org/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz -P /tmp \
+  && tar -xzf /tmp/apache-maven-*.tar.gz -C /usr/share/maven --strip-components=1 \
+  && rm -f /tmp/apache-maven-*.tar.gz \
+  && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG /opt/.m2
+
+# install thrift
+RUN  wget http://archive.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz -O /tmp/thrift-0.12.0.tar.gz && \
+  tar xfz /tmp/thrift-0.12.0.tar.gz --directory /tmp && \
+  base_dir=`pwd` && \
+  cd /tmp/thrift-0.12.0 && \
+  ./configure --with-cpp=no --with-c_glib=no --with-java=yes --with-python=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-php=no && \
+  make install
+
+CMD ["bash"]
diff --git a/docker/images/pinot-base/pinot-base-build/Dockerfile b/docker/images/pinot-base/pinot-base-build/ms-openjdk.dockerfile
similarity index 65%
rename from docker/images/pinot-base/pinot-base-build/Dockerfile
rename to docker/images/pinot-base/pinot-base-build/ms-openjdk.dockerfile
index 5b93684c563..7fb80886c7a 100644
--- a/docker/images/pinot-base/pinot-base-build/Dockerfile
+++ b/docker/images/pinot-base/pinot-base-build/ms-openjdk.dockerfile
@@ -17,20 +17,20 @@
 # under the License.
 #
 ARG JAVA_VERSION=11
-ARG OPENJDK_IMAGE=openjdk
-FROM ${OPENJDK_IMAGE}:${JAVA_VERSION} AS pinot_build_env
+ARG JDK_IMAGE=mcr.microsoft.com/openjdk/jdk
+FROM ${JDK_IMAGE}:${JAVA_VERSION}-ubuntu AS pinot_build_env
 
 LABEL MAINTAINER=dev@pinot.apache.org
 
 # extra dependency for running launcher
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends vim wget curl git automake bison flex g++ libboost-all-dev libevent-dev \
-    libssl-dev libtool make pkg-config && \
-    rm -rf /var/lib/apt/lists/*
+  apt-get install -y --no-install-recommends vim wget curl git automake bison flex g++ libboost-all-dev libevent-dev \
+  libssl-dev libtool make pkg-config && \
+  rm -rf /var/lib/apt/lists/*
 
 # install maven
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
-  && wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -P /tmp \
+  && wget https://dlcdn.apache.org/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz -P /tmp \
   && tar -xzf /tmp/apache-maven-*.tar.gz -C /usr/share/maven --strip-components=1 \
   && rm -f /tmp/apache-maven-*.tar.gz \
   && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
@@ -39,10 +39,10 @@ ENV MAVEN_CONFIG /opt/.m2
 
 # install thrift
 RUN  wget http://archive.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz -O /tmp/thrift-0.12.0.tar.gz && \
-     tar xfz /tmp/thrift-0.12.0.tar.gz --directory /tmp && \
-     base_dir=`pwd` && \
-     cd /tmp/thrift-0.12.0 && \
-     ./configure --with-cpp=no --with-c_glib=no --with-java=yes --with-python=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-php=no && \
-     make install
+  tar xfz /tmp/thrift-0.12.0.tar.gz --directory /tmp && \
+  base_dir=`pwd` && \
+  cd /tmp/thrift-0.12.0 && \
+  ./configure --with-cpp=no --with-c_glib=no --with-java=yes --with-python=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-php=no && \
+  make install
 
-CMD ["-help"]
+CMD ["bash"]
diff --git a/docker/images/pinot-base/pinot-base-build/openjdk.dockerfile b/docker/images/pinot-base/pinot-base-build/openjdk.dockerfile
new file mode 100644
index 00000000000..0abef1191ff
--- /dev/null
+++ b/docker/images/pinot-base/pinot-base-build/openjdk.dockerfile
@@ -0,0 +1,52 @@
+#
+# 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.
+#
+ARG JAVA_VERSION=21
+ARG JDK_IMAGE=openjdk
+# At 2023-06-14, slim is the only openjdk flavour without medium, high or critical vulns
+FROM ${JDK_IMAGE}:${JAVA_VERSION}-jdk-slim
+
+LABEL MAINTAINER=dev@pinot.apache.org
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG /root/.m2
+
+# extra dependency for running launcher
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends vim wget curl git automake bison flex g++ libboost-all-dev libevent-dev \
+  libssl-dev libtool make pkg-config && \
+  rm -rf /var/lib/apt/lists/*
+
+# install maven
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+  && wget https://dlcdn.apache.org/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz -P /tmp \
+  && tar -xzf /tmp/apache-maven-*.tar.gz -C /usr/share/maven --strip-components=1 \
+  && rm -f /tmp/apache-maven-*.tar.gz \
+  && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn \
+  && mvn help:evaluate -Dexpression=settings.localRepository
+
+
+# install thrift
+RUN  wget http://archive.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz -O /tmp/thrift-0.12.0.tar.gz && \
+  tar xfz /tmp/thrift-0.12.0.tar.gz --directory /tmp && \
+  base_dir=`pwd` && \
+  cd /tmp/thrift-0.12.0 && \
+  ./configure --with-cpp=no --with-c_glib=no --with-java=yes --with-python=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-php=no && \
+  make install
+
+CMD ["bash"]
diff --git a/docker/images/pinot-base/pinot-base-runtime/amazoncorretto.dockerfile b/docker/images/pinot-base/pinot-base-runtime/amazoncorretto.dockerfile
new file mode 100644
index 00000000000..bb43e2131c2
--- /dev/null
+++ b/docker/images/pinot-base/pinot-base-runtime/amazoncorretto.dockerfile
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+ARG JAVA_VERSION=11
+ARG JDK_IMAGE=amazoncorretto
+
+FROM ${JDK_IMAGE}:${JAVA_VERSION}-al2-jdk
+
+LABEL MAINTAINER=dev@pinot.apache.org
+
+RUN yum update -y && \
+  yum groupinstall 'Development Tools' -y && \
+  yum install -y procps vim less wget curl git python sysstat perf libtasn1 && \
+  yum clean all
+
+RUN case `uname -m` in \
+  x86_64) arch=x64; ;; \
+  aarch64) arch=arm64; ;; \
+  *) echo "platform=$(uname -m) un-supported, exit ..."; exit 1; ;; \
+  esac \
+  && mkdir -p /usr/local/lib/async-profiler \
+  && curl -L https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-${arch}.tar.gz | tar -xz --strip-components 1 -C /usr/local/lib/async-profiler \
+  && ln -s /usr/local/lib/async-profiler/profiler.sh /usr/local/bin/async-profiler
+
+CMD ["bash"]
diff --git a/docker/images/pinot-base/pinot-base-runtime/Dockerfile b/docker/images/pinot-base/pinot-base-runtime/ms-openjdk.dockerfile
similarity index 69%
rename from docker/images/pinot-base/pinot-base-runtime/Dockerfile
rename to docker/images/pinot-base/pinot-base-runtime/ms-openjdk.dockerfile
index 7a8ade3016a..364da20d6b4 100644
--- a/docker/images/pinot-base/pinot-base-runtime/Dockerfile
+++ b/docker/images/pinot-base/pinot-base-runtime/ms-openjdk.dockerfile
@@ -16,24 +16,25 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+
 ARG JAVA_VERSION=11
-ARG OPENJDK_IMAGE=openjdk
+ARG JDK_IMAGE=mcr.microsoft.com/openjdk/jdk
 
-FROM ${OPENJDK_IMAGE}:${JAVA_VERSION}-jdk-slim
+FROM ${JDK_IMAGE}:${JAVA_VERSION}-ubuntu
 
 LABEL MAINTAINER=dev@pinot.apache.org
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends vim less wget curl git python sysstat procps linux-perf openjdk-11-dbg && \
-    rm -rf /var/lib/apt/lists/*
+  apt-get install -y --no-install-recommends vim less wget curl git python sysstat procps linux-tools-generic libtasn1-6 && \
+  rm -rf /var/lib/apt/lists/*
 
 RUN case `uname -m` in \
-    x86_64) arch=x64; ;; \
-    aarch64) arch=arm64; ;; \
-    *) echo "platform=$(uname -m) un-supported, exit ..."; exit 1; ;; \
+  x86_64) arch=x64; ;; \
+  aarch64) arch=arm64; ;; \
+  *) echo "platform=$(uname -m) un-supported, exit ..."; exit 1; ;; \
   esac \
   && mkdir -p /usr/local/lib/async-profiler \
-  && curl -L https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.5.1/async-profiler-2.5.1-linux-${arch}.tar.gz | tar -xz --strip-components 1 -C /usr/local/lib/async-profiler \
+  && curl -L https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-${arch}.tar.gz | tar -xz --strip-components 1 -C /usr/local/lib/async-profiler \
   && ln -s /usr/local/lib/async-profiler/profiler.sh /usr/local/bin/async-profiler
 
 CMD ["bash"]
diff --git a/docker/images/pinot-base/pinot-base-runtime/openjdk.dockerfile b/docker/images/pinot-base/pinot-base-runtime/openjdk.dockerfile
new file mode 100644
index 00000000000..e59787749fd
--- /dev/null
+++ b/docker/images/pinot-base/pinot-base-runtime/openjdk.dockerfile
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+ARG JAVA_VERSION=21
+ARG JDK_IMAGE=openjdk
+
+FROM ${JDK_IMAGE}:${JAVA_VERSION}-jdk-slim
+
+LABEL MAINTAINER=dev@pinot.apache.org
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends vim less wget curl git python-is-python3 sysstat procps linux-perf libtasn1-6 && \
+  rm -rf /var/lib/apt/lists/*
+
+RUN case `uname -m` in \
+  x86_64) arch=x64; ;; \
+  aarch64) arch=arm64; ;; \
+  *) echo "platform=$(uname -m) un-supported, exit ..."; exit 1; ;; \
+  esac \
+  && mkdir -p /usr/local/lib/async-profiler \
+  && curl -L https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-${arch}.tar.gz | tar -xz --strip-components 1 -C /usr/local/lib/async-profiler \
+  && ln -s /usr/local/lib/async-profiler/profiler.sh /usr/local/bin/async-profiler
+
+CMD ["bash"]
diff --git a/docker/images/pinot-superset/requirements-db.txt b/docker/images/pinot-superset/requirements-db.txt
index bb250db8c99..caf7d4a3ff7 100644
--- a/docker/images/pinot-superset/requirements-db.txt
+++ b/docker/images/pinot-superset/requirements-db.txt
@@ -17,4 +17,4 @@
 # under the License.
 #
 pinotdb>=0.4.5
-redis==3.4.1
+redis==4.5.4
diff --git a/docker/images/pinot/Dockerfile b/docker/images/pinot/Dockerfile
index 499060ed7c7..3378b6f6454 100644
--- a/docker/images/pinot/Dockerfile
+++ b/docker/images/pinot/Dockerfile
@@ -16,16 +16,20 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-ARG PINOT_BASE_IMAGE_TAG=openjdk11
+ARG PINOT_BASE_IMAGE_TAG=11-amazoncorretto
 FROM apachepinot/pinot-base-build:${PINOT_BASE_IMAGE_TAG} AS pinot_build_env
 
 LABEL MAINTAINER=dev@pinot.apache.org
 
 ARG PINOT_BRANCH=master
-ARG KAFKA_VERSION=2.0
 ARG JDK_VERSION=11
 ARG PINOT_GIT_URL="https://github.com/apache/pinot.git"
-RUN echo "Trying to build Pinot from [ ${PINOT_GIT_URL} ] on branch [ ${PINOT_BRANCH} ] with Kafka version [ ${KAFKA_VERSION} ]"
+ARG CI=true
+
+RUN echo "Build Pinot based on image: apachepinot/pinot-base-build:${PINOT_BASE_IMAGE_TAG}"
+RUN echo "Current build system CPU arch is [ $(uname -m) ]"
+
+RUN echo "Trying to build Pinot from [ ${PINOT_GIT_URL} ] on branch [ ${PINOT_BRANCH} ] and CI [ ${CI} ]"
 ENV PINOT_HOME=/opt/pinot
 ENV PINOT_BUILD_DIR=/opt/pinot-build
 ENV MAVEN_HOME /usr/share/maven
@@ -35,6 +39,7 @@ RUN git clone ${PINOT_GIT_URL} ${PINOT_BUILD_DIR} && \
     cd ${PINOT_BUILD_DIR} && \
     git checkout ${PINOT_BRANCH} && \
     mvn install package -DskipTests -Pbin-dist -Pbuild-shaded-jar -Djdk.version=${JDK_VERSION} -T1C && \
+    rm -rf /root/.m2 && \
     mkdir -p ${PINOT_HOME}/configs && \
     mkdir -p ${PINOT_HOME}/data && \
     cp -r build/* ${PINOT_HOME}/. && \
@@ -54,9 +59,8 @@ COPY bin ${PINOT_HOME}/bin
 COPY etc ${PINOT_HOME}/etc
 COPY examples ${PINOT_HOME}/examples
 
-RUN wget -O ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.12.0.jar https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.12.0/jmx_prometheus_javaagent-0.12.0.jar
-RUN wget -O ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.16.1.jar https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar && \
-    ln -s ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.16.1.jar ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent.jar
+RUN wget -O ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.18.0.jar https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.18.0/jmx_prometheus_javaagent-0.18.0.jar && \
+    ln -s ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.18.0.jar ${PINOT_HOME}/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent.jar
 
 # expose ports for controller/broker/server/admin
 EXPOSE 9000 8099 8098 8097 8096
diff --git a/docker/images/pinot/etc/conf/pinot-minion-log4j2.xml b/docker/images/pinot/etc/conf/pinot-minion-log4j2.xml
new file mode 100644
index 00000000000..6907f5e9f9d
--- /dev/null
+++ b/docker/images/pinot/etc/conf/pinot-minion-log4j2.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<Configuration>
+  <Properties>
+    <Property name="LOG_DIR">logs/pinotMinion</Property>
+  </Properties>
+  <Appenders>
+    <Console name="console" target="SYSTEM_OUT">
+      <PatternLayout>
+        <pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</pattern>
+      </PatternLayout>
+    </Console>
+    <RollingFile
+        name="minionLog"
+        fileName="${env:LOG_DIR}/pinotMinion.log"
+        filePattern="${env:LOG_DIR}/pinotMinion.%d{yyyy-MM-dd}.%i.log.gz"
+        immediateFlush="false">
+      <PatternLayout>
+        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
+      </PatternLayout>
+      <Policies>
+        <OnStartupTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="20 MB"/>
+        <TimeBasedTriggeringPolicy/>
+      </Policies>
+      <DefaultRolloverStrategy max="10"/>
+    </RollingFile>
+    <RollingFile
+        name="minionHelixLog"
+        fileName="${env:LOG_DIR}/pinotMinionHelix.log"
+        filePattern="${env:LOG_DIR}/pinotMinionHelix.%d{yyyy-MM-dd}.%i.log.gz"
+        immediateFlush="false">
+      <PatternLayout>
+        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
+      </PatternLayout>
+      <Policies>
+        <OnStartupTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="20 MB"/>
+        <TimeBasedTriggeringPolicy/>
+      </Policies>
+      <DefaultRolloverStrategy max="10"/>
+    </RollingFile>
+  </Appenders>
+  <Loggers>
+    <Root level="info" additivity="false">
+      <!-- Display warnings on the console -->
+      <AppenderRef ref="console" level="${env:LOG4J_CONSOLE_LEVEL:-warn}"/>
+      <!-- Direct most logs to the log file -->
+      <AppenderRef ref="minionLog"/>
+    </Root>
+    <!-- Output helix logs to dedicated files -->
+    <Logger name="org.apache.helix" level="info" additivity="false">
+      <AppenderRef ref="minionHelixLog"/>
+    </Logger>
+    <!-- Output minion starter logs to the console -->
+    <Logger name="org.apache.pinot.minion.MinionStarter" level="info" additivity="false">
+      <AppenderRef ref="console"/>
+    </Logger>
+    <AsyncLogger name="org.reflections" level="error" additivity="false"/>
+  </Loggers>
+</Configuration>
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
index ea9d5e3a859..91e72bc39b5 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
@@ -1,71 +1,71 @@
 rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?).authorization\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?).authorization\"><>(\\w+)"
   name: "pinot_broker_authorization_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.documentsScanned\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.documentsScanned\"><>(\\w+)"
   name: "pinot_broker_documentsScanned_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.entriesScannedInFilter\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.entriesScannedInFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedInFilter_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.entriesScannedPostFilter\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.entriesScannedPostFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedPostFilter_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.freshnessLagMs\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.freshnessLagMs\"><>(\\w+)"
   name: "pinot_broker_freshnessLagMs_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queries\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queries\"><>(\\w+)"
   name: "pinot_broker_queries_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryExecution\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryExecution\"><>(\\w+)"
   name: "pinot_broker_queryExecution_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryRouting\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryRouting\"><>(\\w+)"
   name: "pinot_broker_queryRouting_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.reduce\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.reduce\"><>(\\w+)"
   name: "pinot_broker_reduce_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.requestCompilation\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.requestCompilation\"><>(\\w+)"
   name: "pinot_broker_requestCompilation_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.scatterGather\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.scatterGather\"><>(\\w+)"
   name: "pinot_broker_scatterGather_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.totalServerResponseSize\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.totalServerResponseSize\"><>(\\w+)"
   name: "pinot_broker_totalServerResponseSize_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)_(OFFLINE|REALTIME).groupBySize\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)_(OFFLINE|REALTIME).groupBySize\"><>(\\w+)"
   name: "pinot_broker_groupBySize_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)_(OFFLINE|REALTIME).noServingHostForSegment\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)_(OFFLINE|REALTIME).noServingHostForSegment\"><>(\\w+)"
   name: "pinot_broker_noServingHostForSegment_$3"
   cache: true
   labels:
@@ -98,48 +98,48 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.routingTableUpdateTime\"><>(\\w+)"
   name: "pinot_broker_routingTableUpdateTime_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithPartialServersResponded_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.noServerFoundExceptions\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.noServerFoundExceptions\"><>(\\w+)"
   name: "pinot_broker_noServerFoundExceptions_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithProcessingExceptions_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryQuotaExceeded\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryQuotaExceeded\"><>(\\w+)"
   name: "pinot_broker_queryQuotaExceeded_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryTotalTimeMs\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryTotalTimeMs\"><>(\\w+)"
   name: "pinot_broker_queryTotalTimeMs_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)_(OFFLINE|REALTIME).serverMissingForRouting\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)_(OFFLINE|REALTIME).serverMissingForRouting\"><>(\\w+)"
   name: "pinot_broker_serverMissingForRouting_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.deserialization\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.deserialization\"><>(\\w+)"
   name: "pinot_broker_deserialization_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.requestConnectionWait\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.requestConnectionWait\"><>(\\w+)"
   name: "pinot_broker_requestConnectionWait_$2"
   cache: true
   labels:
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
index 5dafc3910c9..88ea8dff920 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
@@ -8,49 +8,49 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_controller_helix_ZookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeSize.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeSize.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeSize_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeByteSize.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeByteSize.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeByteSize_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.replicationFromConfig.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.replicationFromConfig.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_replicationFromConfig_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.numberOfReplicas.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.numberOfReplicas.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_numberOfReplicas_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentOfReplicas.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentOfReplicas.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentOfReplicas_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentSegmentsAvailable.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentSegmentsAvailable.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentSegmentsAvailable_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentCount.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentCount.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentCount_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentsInErrorState.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentsInErrorState.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentsInErrorState_$3"
   cache: true
   labels:
@@ -77,49 +77,49 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.offlineTableCount\"><>(\\w+)"
   name: "pinot_controller_offlineTableCount_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_validateion_$2_$3"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.cronSchedulerJobScheduled.(.*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.cronSchedulerJobScheduled.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobScheduled_$3"
   cache: true
   labels:
     table: "$1"
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+).cronSchedulerTriggered\"><>(\\w+)"
-  name: "pinot_controller_cronSchedulerTriggered_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+).cronSchedulerJobTriggered\"><>(\\w+)"
+  name: "pinot_controller_cronSchedulerJobTriggered_$3"
   cache: true
   labels:
     table: "$1"
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+).cronSchedulerSkipped\"><>(\\w+)"
-  name: "pinot_controller_cronSchedulerSkipped_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+).cronSchedulerJobSkipped\"><>(\\w+)"
+  name: "pinot_controller_cronSchedulerJobSkipped_$3"
   cache: true
   labels:
     table: "$1"
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+).cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+).cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$3"
   cache: true
   labels:
     table: "$1"
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.taskStatus.(.*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.taskStatus.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_taskStatus_$3"
   cache: true
   labels:
     taskType: "$1"
     status: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastMinionTaskMetadataUpdate.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastMinionTaskMetadataUpdate.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
     taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).(.*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$5"
   cache: true
   labels:
@@ -131,14 +131,14 @@ rules:
   cache: true
   labels:
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastSuccessfulMinionTaskGeneration.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastSuccessfulMinionTaskGeneration.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
     taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.lastMinionTaskGenerationEncountersError.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.lastMinionTaskGenerationEncountersError.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_lastMinionTaskGenerationEncountersError_$4"
   cache: true
   labels:
@@ -148,47 +148,47 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.pinotLeadControllerResourceEnabled\"><>(\\w+)"
   name: "pinot_controller_pinotLeadControllerResourceEnabled_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.offlineTableEstimatedSize.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.offlineTableEstimatedSize.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_controller_offlineTableEstimatedSize_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableQuota.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableQuota.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableQuota_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(.*?)_(OFFLINE|REALTIME).(\\w+).periodicTaskError\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).periodicTaskError\"><>(\\w+)"
   name: "pinot_controller_periodicTaskError_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
     periodicTask: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageQuotaUtilization.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageQuotaUtilization.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageQuotaUtilization_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageEstMissingSegmentPercent.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageEstMissingSegmentPercent.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageEstMissingSegmentPercent_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableTotalSizeOnServer.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableTotalSizeOnServer.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableTotalSizeOnServer_$3"
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableSizePerReplicaOnServer.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableSizePerReplicaOnServer.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableSizePerReplicaOnServer_$3"
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableCompressedSize.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableCompressedSize.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableCompressedSize_$3"
   labels:
     table: "$1"
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
index 8d493e90b62..95853f50ecb 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
@@ -4,13 +4,13 @@ rules:
   cache: true
   labels:
     version: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.numberOfTasks.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.numberOfTasks.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_minion_numberOfTasks_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.(.*?)_(OFFLINE|REALTIME).(\\w+).(taskExecution|taskQueueing|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).(taskExecution|taskQueueing|numberTasks|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
   name: "pinot_minion_$4_$5"
   cache: true
   labels:
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
index 104d461bbec..a502742e02f 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
@@ -9,43 +9,43 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_controller_helix_ZookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeSize.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeSize.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeSize_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeByteSize.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.idealstateZnodeByteSize.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeByteSize_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.numberOfReplicas.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.numberOfReplicas.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_numberOfReplicas_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentOfReplicas.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentOfReplicas.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentOfReplicas_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentSegmentsAvailable.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.percentSegmentsAvailable.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentSegmentsAvailable_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentCount.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentCount.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentCount_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentsInErrorState.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.segmentsInErrorState.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentsInErrorState_$3"
   cache: true
   labels:
@@ -72,24 +72,30 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.offlineTableCount\"><>(\\w+)"
   name: "pinot_controller_offlineTableCount_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_validateion_$2_$3"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.cronSchedulerJobScheduled.(.*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.cronSchedulerJobScheduled.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobScheduled_$3"
   cache: true
   labels:
     table: "$1"
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+).cronSchedulerTriggered\"><>(\\w+)"
-  name: "pinot_controller_cronSchedulerTriggered_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+).cronSchedulerJobTriggered\"><>(\\w+)"
+  name: "pinot_controller_cronSchedulerJobTriggered_$3"
   cache: true
   labels:
     table: "$1"
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(.*?)\\.(\\w+).cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+).cronSchedulerJobSkipped\"><>(\\w+)"
+  name: "pinot_controller_cronSchedulerJobSkipped_$3"
+  cache: true
+  labels:
+    table: "$1"
+    taskType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.([^\\.]*?)\\.(\\w+).cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$3"
   cache: true
   labels:
@@ -101,14 +107,14 @@ rules:
   labels:
     taskType: "$1"
     status: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastMinionTaskMetadataUpdate.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastMinionTaskMetadataUpdate.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
     taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).(.*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$5"
   cache: true
   labels:
@@ -120,14 +126,14 @@ rules:
   cache: true
   labels:
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastSuccessfulMinionTaskGeneration.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.timeMsSinceLastSuccessfulMinionTaskGeneration.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
     taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.lastMinionTaskGenerationEncountersError.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.lastMinionTaskGenerationEncountersError.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_lastMinionTaskGenerationEncountersError_$4"
   cache: true
   labels:
@@ -137,44 +143,44 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.pinotLeadControllerResourceEnabled\"><>(\\w+)"
   name: "pinot_controller_pinotLeadControllerResourceEnabled_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.offlineTableEstimatedSize.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.offlineTableEstimatedSize.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_controller_offlineTableEstimatedSize_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.largestSegmentSizeOnServer.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.largestSegmentSizeOnServer.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_controller_largestSegmentSizeOnServer_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableTotalSizeOnServer.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableTotalSizeOnServer.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableTotalSizeOnServer_$3"
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableSizePerReplicaOnServer.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableSizePerReplicaOnServer.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableSizePerReplicaOnServer_$3"
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableCompressedSize.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableCompressedSize.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableCompressedSize_$3"
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableQuota.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableQuota.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableQuota_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageQuotaUtilization.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageQuotaUtilization.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageQuotaUtilization_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageEstMissingSegmentPercent.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", name=\"pinot.controller.tableStorageEstMissingSegmentPercent.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageEstMissingSegmentPercent_$3"
   cache: true
   labels:
@@ -182,78 +188,78 @@ rules:
     tableType: "$2"
 
   # Pinot Broker
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?).authorization\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?).authorization\"><>(\\w+)"
   name: "pinot_broker_authorization_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.documentsScanned\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.documentsScanned\"><>(\\w+)"
   name: "pinot_broker_documentsScanned_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.entriesScannedInFilter\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.entriesScannedInFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedInFilter_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.entriesScannedPostFilter\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.entriesScannedPostFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedPostFilter_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.freshnessLagMs\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.freshnessLagMs\"><>(\\w+)"
   name: "pinot_broker_freshnessLagMs_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queries\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queries\"><>(\\w+)"
   name: "pinot_broker_queries_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryExecution\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryExecution\"><>(\\w+)"
   name: "pinot_broker_queryExecution_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryRouting\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryRouting\"><>(\\w+)"
   name: "pinot_broker_queryRouting_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryTotalTimeMs\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryTotalTimeMs\"><>(\\w+)"
   name: "pinot_broker_queryTotalTimeMs_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.reduce\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.reduce\"><>(\\w+)"
   name: "pinot_broker_reduce_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.requestCompilation\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.requestCompilation\"><>(\\w+)"
   name: "pinot_broker_requestCompilation_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.scatterGather\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.scatterGather\"><>(\\w+)"
   name: "pinot_broker_scatterGather_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.totalServerResponseSize\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.totalServerResponseSize\"><>(\\w+)"
   name: "pinot_broker_totalServerResponseSize_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)_(OFFLINE|REALTIME).groupBySize\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)_(OFFLINE|REALTIME).groupBySize\"><>(\\w+)"
   name: "pinot_broker_groupBySize_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)_(OFFLINE|REALTIME).noServingHostForSegment\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)_(OFFLINE|REALTIME).noServingHostForSegment\"><>(\\w+)"
   name: "pinot_broker_noServingHostForSegment_$3"
   cache: true
   labels:
@@ -286,63 +292,63 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.routingTableUpdateTime\"><>(\\w+)"
   name: "pinot_broker_routingTableUpdateTime_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithPartialServersResponded_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithProcessingExceptions_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.queryQuotaExceeded\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.queryQuotaExceeded\"><>(\\w+)"
   name: "pinot_broker_queryQuotaExceeded_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)_(OFFLINE|REALTIME).serverMissingForRouting\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)_(OFFLINE|REALTIME).serverMissingForRouting\"><>(\\w+)"
   name: "pinot_broker_serverMissingForRouting_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.deserialization\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.deserialization\"><>(\\w+)"
   name: "pinot_broker_deserialization_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.(.*?)\\.requestConnectionWait\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", name=\"pinot.broker.([^\\.]*?)\\.requestConnectionWait\"><>(\\w+)"
   name: "pinot_broker_requestConnectionWait_$2"
   cache: true
   labels:
     table: "$1"
 
 # Pinot Server
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.documentCount.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.documentCount.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_documentCount_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.segmentCount.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.segmentCount.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_segmentCount_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_$3_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+).realtimeRowsConsumed\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+).realtimeRowsConsumed\"><>(\\w+)"
   name: "pinot_server_realtimeRowsConsumed_$5"
   cache: true
   labels:
@@ -356,7 +362,7 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_server_helix_zookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestKafkaOffsetConsumed.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestKafkaOffsetConsumed.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestKafkaOffsetConsumed_$5"
   cache: true
   labels:
@@ -364,7 +370,7 @@ rules:
     tableType: "$2"
     topic: "$3"
     partition: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestStreamOffsetConsumed.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestStreamOffsetConsumed.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestStreamOffsetConsumed_$5"
   cache: true
   labels:
@@ -372,7 +378,7 @@ rules:
     tableType: "$2"
     topic: "$3"
     partition: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_lastRealtimeSegment$1Seconds_$6"
   cache: true
   labels:
@@ -383,7 +389,7 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcControllerResponse(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcControllerResponse_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcPartitionConsuming.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcPartitionConsuming.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcPartitionConsuming_$5"
   cache: true
   labels:
@@ -403,7 +409,7 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeConsumptionExceptions\"><>(\\w+)"
   name: "pinot_server_realtime_consumptionExceptions_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeOffheapMemoryUsed.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeOffheapMemoryUsed.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_server_realtime_offheapMemoryUsed_$2"
   cache: true
   labels:
@@ -428,25 +434,25 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.nettyConnection(\\w+)\"><>(\\w+)"
   name: "pinot_server_nettyConnection_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeSegmentNumPartitions.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeSegmentNumPartitions.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_server_realtimeSegmentNumPartitions_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.resizeTimeMs.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.resizeTimeMs.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_resizeTimeMs_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertPrimaryKeysCount.(.*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertPrimaryKeysCount.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertPrimaryKeysCount_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
     partition: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeIngestionDelayMs.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeIngestionDelayMs.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_realtimeIngestionDelayMs_$4"
   cache: true
   labels:
@@ -455,13 +461,13 @@ rules:
     partition: "$3"
 
 # Pinot Minions
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.numberOfTasks.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.numberOfTasks.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_minion_numberOfTasks_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.(.*?)_(OFFLINE|REALTIME).(\\w+).(taskExecution|taskQueueing|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", name=\"pinot.minion.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).(taskExecution|taskQueueing|numberTasks|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
   name: "pinot_minion_$4_$5"
   cache: true
   labels:
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
index 5ad7d15f81c..ad5b96eef84 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
@@ -1,23 +1,23 @@
 rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.documentCount.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.documentCount.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_documentCount_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.segmentCount.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.segmentCount.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_segmentCount_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_$3_$4"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+).realtimeRowsConsumed\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+).realtimeRowsConsumed\"><>(\\w+)"
   name: "pinot_server_realtimeRowsConsumed_$5"
   cache: true
   labels:
@@ -31,7 +31,7 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_server_helix_zookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestKafkaOffsetConsumed.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestKafkaOffsetConsumed.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestKafkaOffsetConsumed_$5"
   cache: true
   labels:
@@ -39,7 +39,7 @@ rules:
     tableType: "$2"
     topic: "$3"
     partition: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestStreamOffsetConsumed.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestStreamOffsetConsumed.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestStreamOffsetConsumed_$5"
   cache: true
   labels:
@@ -47,7 +47,7 @@ rules:
     tableType: "$2"
     topic: "$3"
     partition: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_lastRealtimeSegment$1Seconds_$6"
   cache: true
   labels:
@@ -58,7 +58,7 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcControllerResponse(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcControllerResponse_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcPartitionConsuming.(.*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcPartitionConsuming.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcPartitionConsuming_$5"
   cache: true
   labels:
@@ -66,7 +66,7 @@ rules:
     tableType: "$2"
     topic: "$3"
     partition: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeIngestionDelayMs.(.*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeIngestionDelayMs.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_realtimeIngestionDelayMs_$4"
   cache: true
   labels:
@@ -85,7 +85,7 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeConsumptionExceptions\"><>(\\w+)"
   name: "pinot_server_realtime_consumptionExceptions_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeOffheapMemoryUsed.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeOffheapMemoryUsed.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_server_realtime_offheapMemoryUsed_$2"
   cache: true
   labels:
@@ -107,18 +107,18 @@ rules:
 - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.nettyConnection(\\w+)\"><>(\\w+)"
   name: "pinot_server_nettyConnection_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeSegmentNumPartitions.(.*?)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeSegmentNumPartitions.([^\\.]*?)\"><>(\\w+)"
   name: "pinot_server_realtimeSegmentNumPartitions_$2"
   cache: true
   labels:
     table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.resizeTimeMs.(.*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.resizeTimeMs.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_resizeTimeMs_$3"
   cache: true
   labels:
     table: "$1"
     tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertPrimaryKeysCount.(.*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertPrimaryKeysCount.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertPrimaryKeysCount_$4"
   cache: true
   labels:
diff --git a/kubernetes/helm/index.yaml b/kubernetes/helm/index.yaml
index 5f69405a114..01aece8b5e7 100644
--- a/kubernetes/helm/index.yaml
+++ b/kubernetes/helm/index.yaml
@@ -1,6 +1,34 @@
 apiVersion: v1
 entries:
   pinot:
+  - apiVersion: v1
+    appVersion: 0.2.7
+    created: "2023-05-04T20:38:46.922122-04:00"
+    dependencies:
+    - condition: pinot.zookeeper.enabled,zookeeper.enabled
+      name: zookeeper
+      repository: https://charts.bitnami.com/bitnami
+      version: 9.x.x
+    description: Apache Pinot is a realtime distributed OLAP datastore, which is used
+      to deliver scalable real time analytics with low latency. It can ingest data
+      from offline data sources (such as Hadoop and flat files) as well as online
+      sources (such as Kafka). Pinot is designed to scale horizontally.
+    digest: f466ab18582850c589c0a6fc264e12ee236ab9cb3b540b653822296e2f65a323
+    home: https://pinot.apache.org/
+    keywords:
+    - olap
+    - analytics
+    - database
+    - pinot
+    maintainers:
+    - email: dev@pinot.apache.org
+      name: pinot-dev
+    name: pinot
+    sources:
+    - https://github.com/apache/pinot/tree/master/kubernetes/helm
+    urls:
+    - pinot-0.2.7.tgz
+    version: 0.2.7
   - apiVersion: v1
     appVersion: 0.2.6
     created: "2022-11-23T13:05:57.685715-08:00"
diff --git a/kubernetes/helm/pinot-0.2.7.tgz b/kubernetes/helm/pinot-0.2.7.tgz
new file mode 100644
index 00000000000..0bffc948def
Binary files /dev/null and b/kubernetes/helm/pinot-0.2.7.tgz differ
diff --git a/kubernetes/helm/pinot/Chart.yaml b/kubernetes/helm/pinot/Chart.yaml
index 8d60c123665..835cdc051d9 100644
--- a/kubernetes/helm/pinot/Chart.yaml
+++ b/kubernetes/helm/pinot/Chart.yaml
@@ -18,10 +18,10 @@
 #
 
 apiVersion: v1
-appVersion: 0.2.7-SNAPSHOT
+appVersion: 0.2.8-SNAPSHOT
 name: pinot
 description: Apache Pinot is a realtime distributed OLAP datastore, which is used to deliver scalable real time analytics with low latency. It can ingest data from offline data sources (such as Hadoop and flat files) as well as online sources (such as Kafka). Pinot is designed to scale horizontally.
-version: 0.2.7-SNAPSHOT
+version: 0.2.8-SNAPSHOT
 keywords:
   - olap
   - analytics
diff --git a/kubernetes/helm/pinot/README.md b/kubernetes/helm/pinot/README.md
index cf5d086f8cb..239c5be080b 100644
--- a/kubernetes/helm/pinot/README.md
+++ b/kubernetes/helm/pinot/README.md
@@ -62,6 +62,22 @@ eksctl create cluster \
 --node-ami auto
 ```
 
+For k8s 1.23+ we need to run the following commands to allow the containers to provision their storage
+```
+eksctl utils associate-iam-oidc-provider --region=us-east-2 --cluster=pinot-quickstart --approve
+
+eksctl create iamserviceaccount \
+  --name ebs-csi-controller-sa \
+  --namespace kube-system \
+  --cluster pinot-quickstart \
+  --attach-policy-arn arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy \
+  --approve \
+  --role-only \
+  --role-name AmazonEKS_EBS_CSI_DriverRole
+
+eksctl create addon --name aws-ebs-csi-driver --cluster pinot-quickstart --service-account-role-arn arn:aws:iam::$(aws sts get-caller-identity --query Account --output text):role/AmazonEKS_EBS_CSI_DriverRole --force
+```
+
 You can monitor cluster status by command:
 
 ```bash
diff --git a/kubernetes/helm/pinot/templates/broker/ingress.yaml b/kubernetes/helm/pinot/templates/broker/ingress-v1.yaml
similarity index 54%
rename from kubernetes/helm/pinot/templates/broker/ingress.yaml
rename to kubernetes/helm/pinot/templates/broker/ingress-v1.yaml
index 80aa8fe4266..29ab8b43d5c 100644
--- a/kubernetes/helm/pinot/templates/broker/ingress.yaml
+++ b/kubernetes/helm/pinot/templates/broker/ingress-v1.yaml
@@ -1,34 +1,3 @@
-{{- if .Values.broker.ingress.v1beta1.enabled -}}
-{{- $ingressPath := .Values.broker.ingress.v1beta1.path -}}
-{{- $serviceName := include "pinot.broker.fullname" . -}}
-{{- $servicePort := .Values.broker.service.port -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $serviceName }}
-{{- if .Values.broker.ingress.v1beta1.annotations }}
-  annotations:
-{{ toYaml .Values.broker.ingress.v1beta1.annotations | indent 4 }}
-{{- end }}
-  labels:
-{{- include "pinot.brokerLabels" . | nindent 4 }}
-spec:
-{{- if .Values.broker.ingress.v1beta1.tls }}
-  tls:
-{{ toYaml .Values.broker.ingress.v1beta1.tls | indent 4 }}
-{{- end }}
-  rules:
-    {{- range .Values.broker.ingress.v1beta1.hosts }}
-  - host: {{ . }}
-    http:
-      paths:
-        - path: {{ $ingressPath }}
-          backend:
-            serviceName: {{ $serviceName }}
-            servicePort: {{ $servicePort }}
-    {{- end }}
-{{- end }}
-
 {{- if .Values.broker.ingress.v1.enabled -}}
 {{- $ingressPath := .Values.broker.ingress.v1.path -}}
 {{- $serviceName := include "pinot.broker.fullname" . -}}
diff --git a/kubernetes/helm/pinot/templates/broker/ingress-v1beta1.yaml b/kubernetes/helm/pinot/templates/broker/ingress-v1beta1.yaml
new file mode 100644
index 00000000000..9c8d07cfef9
--- /dev/null
+++ b/kubernetes/helm/pinot/templates/broker/ingress-v1beta1.yaml
@@ -0,0 +1,30 @@
+{{- if .Values.broker.ingress.v1beta1.enabled -}}
+{{- $ingressPath := .Values.broker.ingress.v1beta1.path -}}
+{{- $serviceName := include "pinot.broker.fullname" . -}}
+{{- $servicePort := .Values.broker.service.port -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $serviceName }}
+{{- if .Values.broker.ingress.v1beta1.annotations }}
+  annotations:
+{{ toYaml .Values.broker.ingress.v1beta1.annotations | indent 4 }}
+{{- end }}
+  labels:
+{{- include "pinot.brokerLabels" . | nindent 4 }}
+spec:
+{{- if .Values.broker.ingress.v1beta1.tls }}
+  tls:
+{{ toYaml .Values.broker.ingress.v1beta1.tls | indent 4 }}
+{{- end }}
+  rules:
+    {{- range .Values.broker.ingress.v1beta1.hosts }}
+  - host: {{ . }}
+    http:
+      paths:
+        - path: {{ $ingressPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $servicePort }}
+    {{- end }}
+{{- end }}
diff --git a/kubernetes/helm/pinot/templates/broker/service-headless.yaml b/kubernetes/helm/pinot/templates/broker/service-headless.yaml
index 1c8ad71e720..ab537bf57e5 100644
--- a/kubernetes/helm/pinot/templates/broker/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/broker/service-headless.yaml
@@ -29,5 +29,11 @@ spec:
     # [pod_name].[service_name].[namespace].svc.cluster.local
     - name: {{ .Values.broker.service.name }}
       port: {{ .Values.broker.service.port }}
+    {{- if .Values.broker.service.extraPorts }}
+    {{- range .Values.broker.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.brokerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/broker/service.yaml b/kubernetes/helm/pinot/templates/broker/service.yaml
index bd0f4a5db06..2f441fdaf55 100644
--- a/kubernetes/helm/pinot/templates/broker/service.yaml
+++ b/kubernetes/helm/pinot/templates/broker/service.yaml
@@ -31,5 +31,11 @@ spec:
     # [pod_name].[service_name].[namespace].svc.cluster.local
     - name: {{ .Values.broker.service.name }}
       port: {{ .Values.broker.service.port }}
+    {{- if .Values.broker.service.extraPorts }}      
+    {{- range .Values.broker.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.brokerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/broker/statefulset.yaml b/kubernetes/helm/pinot/templates/broker/statefulset.yaml
index f53ce57d354..de69c0408f4 100644
--- a/kubernetes/helm/pinot/templates/broker/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/broker/statefulset.yaml
@@ -60,7 +60,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args: [
-          "StartBroker",
+          "{{ .Values.broker.startCommand }}",
           "-clusterName", "{{ .Values.cluster.name }}",
           "-zkAddress", {{ include "zookeeper.url" . | quote }},
           "-configFileName", "/var/pinot/broker/config/pinot-broker.conf"
@@ -77,6 +77,9 @@ spec:
           - containerPort: {{ .Values.broker.service.port }}
             protocol: {{ .Values.broker.service.protocol }}
             name: {{ .Values.broker.service.name }}
+{{- if .Values.broker.service.extraPorts }}
+{{ toYaml .Values.broker.service.extraPorts | indent 10 }}
+{{- end }}                  
         volumeMounts:
           - name: config
             mountPath: /var/pinot/broker/config
diff --git a/kubernetes/helm/pinot/templates/controller/ingress.yaml b/kubernetes/helm/pinot/templates/controller/ingress-v1.yaml
similarity index 54%
rename from kubernetes/helm/pinot/templates/controller/ingress.yaml
rename to kubernetes/helm/pinot/templates/controller/ingress-v1.yaml
index 449a84e6786..45295a60fe5 100644
--- a/kubernetes/helm/pinot/templates/controller/ingress.yaml
+++ b/kubernetes/helm/pinot/templates/controller/ingress-v1.yaml
@@ -1,34 +1,3 @@
-{{- if .Values.controller.ingress.v1beta1.enabled -}}
-{{- $ingressPath := .Values.controller.ingress.v1beta1.path -}}
-{{- $serviceName := include "pinot.controller.fullname" . -}}
-{{- $servicePort := .Values.controller.service.port -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $serviceName }}
-{{- if .Values.controller.ingress.v1beta1.annotations }}
-  annotations:
-{{ toYaml .Values.controller.ingress.v1beta1.annotations | indent 4 }}
-{{- end }}
-  labels:
-{{- include "pinot.controllerLabels" . | nindent 4 }}
-spec:
-{{- if .Values.controller.ingress.v1beta1.tls }}
-  tls:
-{{ toYaml .Values.controller.ingress.v1beta1.tls | indent 4 }}
-{{- end }}
-  rules:
-    {{- range .Values.controller.ingress.v1beta1.hosts }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-    {{- end }}
-{{- end }}
-
 {{- if .Values.controller.ingress.v1.enabled -}}
 {{- $ingressPath := .Values.controller.ingress.v1.path -}}
 {{- $serviceName := include "pinot.controller.fullname" . -}}
diff --git a/kubernetes/helm/pinot/templates/controller/ingress-v1beta1.yaml b/kubernetes/helm/pinot/templates/controller/ingress-v1beta1.yaml
new file mode 100644
index 00000000000..228b7501b91
--- /dev/null
+++ b/kubernetes/helm/pinot/templates/controller/ingress-v1beta1.yaml
@@ -0,0 +1,30 @@
+{{- if .Values.controller.ingress.v1beta1.enabled -}}
+{{- $ingressPath := .Values.controller.ingress.v1beta1.path -}}
+{{- $serviceName := include "pinot.controller.fullname" . -}}
+{{- $servicePort := .Values.controller.service.port -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $serviceName }}
+{{- if .Values.controller.ingress.v1beta1.annotations }}
+  annotations:
+{{ toYaml .Values.controller.ingress.v1beta1.annotations | indent 4 }}
+{{- end }}
+  labels:
+{{- include "pinot.controllerLabels" . | nindent 4 }}
+spec:
+{{- if .Values.controller.ingress.v1beta1.tls }}
+  tls:
+{{ toYaml .Values.controller.ingress.v1beta1.tls | indent 4 }}
+{{- end }}
+  rules:
+    {{- range .Values.controller.ingress.v1beta1.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+    {{- end }}
+{{- end }}
diff --git a/kubernetes/helm/pinot/templates/controller/service-headless.yaml b/kubernetes/helm/pinot/templates/controller/service-headless.yaml
index bb64490c3c2..1b1f5f47cca 100644
--- a/kubernetes/helm/pinot/templates/controller/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/controller/service-headless.yaml
@@ -29,5 +29,11 @@ spec:
     # [pod_name].[service_name].[namespace].svc.cluster.local
     - name: {{ .Values.controller.service.name }}
       port: {{ .Values.controller.service.port }}
+    {{- if .Values.controller.service.extraPorts }}
+    {{- range .Values.controller.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.controllerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/controller/service.yaml b/kubernetes/helm/pinot/templates/controller/service.yaml
index 8e0cba9bf23..7453142e12f 100644
--- a/kubernetes/helm/pinot/templates/controller/service.yaml
+++ b/kubernetes/helm/pinot/templates/controller/service.yaml
@@ -31,5 +31,11 @@ spec:
     # [pod_name].[service_name].[namespace].svc.cluster.local
     - name: {{ .Values.controller.service.name }}
       port: {{ .Values.controller.service.port }}
+    {{- if .Values.controller.service.extraPorts }}
+    {{- range .Values.controller.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.controllerMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/controller/statefulset.yaml b/kubernetes/helm/pinot/templates/controller/statefulset.yaml
index baf6229b5de..8b652b301e5 100644
--- a/kubernetes/helm/pinot/templates/controller/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/controller/statefulset.yaml
@@ -59,7 +59,7 @@ spec:
           {{- toYaml .Values.controller.securityContext | nindent 10 }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        args: [ "StartController", "-configFileName", "/var/pinot/controller/config/pinot-controller.conf" ]
+        args: [ "{{ .Values.controller.startCommand }}", "-configFileName", "/var/pinot/controller/config/pinot-controller.conf" ]
         env:
           - name: JAVA_OPTS
             value: "{{ .Values.controller.jvmOpts }} -Dlog4j2.configurationFile={{ .Values.controller.log4j2ConfFile }} -Dplugins.dir={{ .Values.controller.pluginsDir }}"
@@ -72,6 +72,9 @@ spec:
           - containerPort: {{ .Values.controller.service.port }}
             protocol: {{ .Values.controller.service.protocol }}
             name: {{ .Values.controller.service.name }}
+{{- if .Values.controller.service.extraPorts }}
+{{ toYaml .Values.controller.service.extraPorts | indent 10 }}
+{{- end }}           
         {{- if .Values.controller.probes.livenessEnabled }}
         livenessProbe:
           initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml b/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
index 1f286f7a80d..d68fd40275c 100644
--- a/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
+++ b/kubernetes/helm/pinot/templates/minion-stateless/deployment.yaml
@@ -37,6 +37,7 @@ spec:
 {{ toYaml .Values.minionStateless.podAnnotations | indent 8 }}
     spec:
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      serviceAccountName: {{ include "pinot.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.minionStateless.podSecurityContext | nindent 8 }}
       {{- with .Values.imagePullSecrets }}
@@ -56,7 +57,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args: [
-          "StartMinion",
+          "{{ .Values.minionStateless.startCommand }}",
           "-clusterName", "{{ .Values.cluster.name }}",
           "-zkAddress", {{ include "zookeeper.url" . | quote }},
           "-configFileName", "/var/pinot/minion/config/pinot-minion-stateless.conf"
@@ -73,6 +74,9 @@ spec:
           - containerPort: {{ .Values.minionStateless.service.port }}
             protocol: {{ .Values.minionStateless.service.protocol }}
             name: {{ .Values.minionStateless.service.name }}
+{{- if .Values.minionStateless.service.extraPorts }}
+{{ toYaml .Values.minionStateless.service.extraPorts | indent 10 }}
+{{- end }}  
         {{- if .Values.minionStateless.probes.livenessEnabled }}
         livenessProbe:
           initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/templates/minion/service-headless.yaml b/kubernetes/helm/pinot/templates/minion/service-headless.yaml
index 120042b8b16..5673b9ac2d5 100644
--- a/kubernetes/helm/pinot/templates/minion/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/minion/service-headless.yaml
@@ -30,6 +30,12 @@ spec:
     # [pod_name].[service_name].[namespace].svc.cluster.local
     - name: {{ .Values.minion.service.name }}
       port: {{ .Values.minion.service.port }}
+    {{- if .Values.minion.service.extraPorts }}
+    {{- range .Values.minion.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.minionMatchLabels" . | nindent 4 }}
 {{- end }}
diff --git a/kubernetes/helm/pinot/templates/minion/service.yaml b/kubernetes/helm/pinot/templates/minion/service.yaml
index d4f61d982d2..4fc88fd2889 100644
--- a/kubernetes/helm/pinot/templates/minion/service.yaml
+++ b/kubernetes/helm/pinot/templates/minion/service.yaml
@@ -32,6 +32,12 @@ spec:
     # [pod_name].[service_name].[namespace].svc.cluster.local
     - name: {{ .Values.minion.service.name }}
       port: {{ .Values.minion.service.port }}
+    {{- if .Values.minion.service.extraPorts }}
+    {{- range .Values.minion.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.minionMatchLabels" . | nindent 4 }}
 {{- end }}
diff --git a/kubernetes/helm/pinot/templates/minion/statefulset.yaml b/kubernetes/helm/pinot/templates/minion/statefulset.yaml
index db43b87ded8..443056dacfb 100644
--- a/kubernetes/helm/pinot/templates/minion/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/minion/statefulset.yaml
@@ -61,7 +61,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args: [
-          "StartMinion",
+          "{{ .Values.minion.startCommand }}",
           "-clusterName", "{{ .Values.cluster.name }}",
           "-zkAddress", {{ include "zookeeper.url" . | quote }},
           "-configFileName", "/var/pinot/minion/config/pinot-minion.conf"
@@ -78,6 +78,9 @@ spec:
           - containerPort: {{ .Values.minion.service.port }}
             protocol: {{ .Values.minion.service.protocol }}
             name: {{ .Values.minion.service.name }}
+{{- if .Values.minion.service.extraPorts }}
+{{ toYaml .Values.minion.service.extraPorts | indent 10 }}
+{{- end }}     
         {{- if .Values.minion.probes.livenessEnabled }}
         livenessProbe:
           initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/templates/server/service-headless.yaml b/kubernetes/helm/pinot/templates/server/service-headless.yaml
index 5ccfcd56b1b..fe558e41430 100644
--- a/kubernetes/helm/pinot/templates/server/service-headless.yaml
+++ b/kubernetes/helm/pinot/templates/server/service-headless.yaml
@@ -34,5 +34,12 @@ spec:
       port: {{ .Values.server.service.adminExposePort }}
       targetPort: {{ .Values.server.service.adminPort }}
       protocol: {{ .Values.server.service.protocol }}
+    {{- if .Values.server.service.extraPorts }}
+    {{- range .Values.server.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }}
+      protocol: {{ .protocol }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.serverMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/server/service.yaml b/kubernetes/helm/pinot/templates/server/service.yaml
index c93dfd01fac..298470c9565 100644
--- a/kubernetes/helm/pinot/templates/server/service.yaml
+++ b/kubernetes/helm/pinot/templates/server/service.yaml
@@ -36,5 +36,11 @@ spec:
       port: {{ .Values.server.service.adminExposePort }}
       targetPort: {{ .Values.server.service.adminPort }}
       protocol: {{ .Values.server.service.protocol }}
+    {{- if .Values.server.service.extraPorts }}
+    {{- range .Values.server.service.extraPorts }}
+    - name: {{ .name }}
+      port: {{ .containerPort }} 
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "pinot.serverMatchLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/pinot/templates/server/statefulset.yaml b/kubernetes/helm/pinot/templates/server/statefulset.yaml
index 1d80e9bdd06..ea2de5785ec 100644
--- a/kubernetes/helm/pinot/templates/server/statefulset.yaml
+++ b/kubernetes/helm/pinot/templates/server/statefulset.yaml
@@ -60,7 +60,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args: [
-          "StartServer",
+          "{{ .Values.server.startCommand }}",
           "-clusterName", "{{ .Values.cluster.name }}",
           "-zkAddress", {{ include "zookeeper.url" . | quote }},
           "-configFileName", "/var/pinot/server/config/pinot-server.conf"
@@ -80,6 +80,9 @@ spec:
           - containerPort: {{ .Values.server.service.adminPort }}
             protocol: {{ .Values.server.service.protocol }}
             name: {{ .Values.server.service.adminPortName }}
+{{- if .Values.server.service.extraPorts }}
+{{ toYaml .Values.server.service.extraPorts | indent 10 }}
+{{- end }}   
         {{- if .Values.server.probes.livenessEnabled }}
         livenessProbe:
           initialDelaySeconds: {{ .Values.probes.initialDelaySeconds }}
diff --git a/kubernetes/helm/pinot/values.yaml b/kubernetes/helm/pinot/values.yaml
index 54aaa638d14..9e21167a6c7 100644
--- a/kubernetes/helm/pinot/values.yaml
+++ b/kubernetes/helm/pinot/values.yaml
@@ -21,7 +21,7 @@
 
 image:
   repository: apachepinot/pinot
-  tag: latest # release-0.11.0
+  tag: latest # release-0.12.0
   pullPolicy: Always # Use IfNotPresent when you pinged a version of image tag
 
 cluster:
@@ -76,6 +76,7 @@ controller:
   podSecurityContext: {}
     # fsGroup: 2000
   securityContext: {}
+  startCommand: "StartController"
 
   probes:
     endpoint: "/health"
@@ -115,6 +116,10 @@ controller:
     nodePort: ""
     protocol: TCP
     name: controller
+    extraPorts: []
+      # - containerPort: 1234
+      #   protocol: PROTOCOL
+      #   name: extra-port
 
   external:
     enabled: true
@@ -185,6 +190,7 @@ broker:
   podSecurityContext: {}
     # fsGroup: 2000
   securityContext: {}
+  startCommand: "StartBroker"
 
   jvmOpts: "-XX:ActiveProcessorCount=2 -Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Xlog:gc*:file=/opt/pinot/gc-pinot-broker.log"
 
@@ -214,6 +220,10 @@ broker:
     port: 8099
     name: broker
     nodePort: ""
+    extraPorts: []
+      # - containerPort: 1234
+      #   protocol: PROTOCOL
+      #   name: extra-port
 
   external:
     enabled: true
@@ -284,6 +294,7 @@ server:
   podSecurityContext: {}
     # fsGroup: 2000
   securityContext: {}
+  startCommand: "StartServer"
 
   probes:
     endpoint: "/health"
@@ -322,6 +333,10 @@ server:
     adminPortName: admin
     nodePort: ""
     protocol: TCP
+    extraPorts: []
+      # - containerPort: 1234
+      #   protocol: PROTOCOL
+      #   name: extra-port
 
   resources:
     requests:
@@ -372,6 +387,7 @@ minion:
   podSecurityContext: {}
     # fsGroup: 2000
   securityContext: {}
+  startCommand: "StartMinion"
 
   probes:
     endpoint: "/health"
@@ -405,6 +421,10 @@ minion:
     nodePort: ""
     protocol: TCP
     name: minion
+    extraPorts: []
+      # - containerPort: 1234
+      #   protocol: PROTOCOL
+      #   name: extra-port
 
   resources:
     requests:
@@ -454,6 +474,7 @@ minionStateless:
   podSecurityContext: {}
     # fsGroup: 2000
   securityContext: {}
+  startCommand: "StartMinion"
 
   probes:
     endpoint: "/health"
@@ -481,7 +502,11 @@ minionStateless:
     port: 9514
     protocol: TCP
     name: minion
-
+    extraPorts: []
+      # - containerPort: 1234
+      #   protocol: PROTOCOL
+      #   name: extra-port
+      
   resources:
     requests:
       memory: "1.25Gi"
diff --git a/pinot-broker/pom.xml b/pinot-broker/pom.xml
index c90e920d0a7..771780bcc53 100644
--- a/pinot-broker/pom.xml
+++ b/pinot-broker/pom.xml
@@ -79,6 +79,10 @@
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-common</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-jaxrs</artifactId>
@@ -153,5 +157,10 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.mercateo</groupId>
+      <artifactId>test-clock</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java
index c8e252ee272..485131a3e56 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/AccessControl.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.broker.api;
 
+import java.util.Set;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.spi.annotations.InterfaceAudience;
 import org.apache.pinot.spi.annotations.InterfaceStability;
@@ -47,4 +48,14 @@ default boolean hasAccess(RequesterIdentity requesterIdentity) {
    * @return {@code true} if authorized, {@code false} otherwise
    */
   boolean hasAccess(RequesterIdentity requesterIdentity, BrokerRequest brokerRequest);
+
+  /**
+   * Fine-grained access control on pinot tables.
+   *
+   * @param requesterIdentity requester identity
+   * @param tables Set of pinot tables used in the query. Table name can be with or without tableType.
+   *
+   * @return {@code true} if authorized, {@code false} otherwise
+   */
+  boolean hasAccess(RequesterIdentity requesterIdentity, Set<String> tables);
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/InstanceResource.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/InstanceResource.java
new file mode 100644
index 00000000000..3b6a80f6d67
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/InstanceResource.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.broker.api.resources;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiKeyAuthDefinition;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.SecurityDefinition;
+import io.swagger.annotations.SwaggerDefinition;
+import java.util.Collections;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.broker.broker.BrokerAdminApiApplication;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+
+import static org.apache.pinot.spi.utils.CommonConstants.SWAGGER_AUTHORIZATION_KEY;
+
+/**
+ * This resource API can be used to retrieve instance level information like instance tags.
+ */
+@Api(description = "Metadata for this instance (like tenant tags)", tags = "instance",
+    authorizations = {@Authorization(value = SWAGGER_AUTHORIZATION_KEY)})
+@SwaggerDefinition(securityDefinition = @SecurityDefinition(apiKeyAuthDefinitions = @ApiKeyAuthDefinition(name =
+    HttpHeaders.AUTHORIZATION, in = ApiKeyAuthDefinition.ApiKeyLocation.HEADER, key = SWAGGER_AUTHORIZATION_KEY)))
+@Path("instance")
+public class InstanceResource {
+  @Inject
+  @Named(BrokerAdminApiApplication.BROKER_INSTANCE_ID)
+  private String _instanceId;
+  @Inject
+  private HelixManager _helixManager;
+
+  @GET
+  @Path("tags")
+  @ApiOperation(value = "Tenant tags for current instance")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 500, message = "Internal server error")
+  })
+  @Produces(MediaType.APPLICATION_JSON)
+  public List<String> getInstanceTags() {
+    InstanceConfig config = HelixHelper.getInstanceConfig(_helixManager, _instanceId);
+    if (config != null && config.getTags() != null) {
+      return config.getTags();
+    }
+    return Collections.emptyList();
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java
index 30c8cb6d7b8..5792579c3af 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/api/resources/PinotClientRequest.java
@@ -121,6 +121,8 @@ public void processSqlQueryGet(@ApiParam(value = "Query", required = true) @Quer
       }
       BrokerResponse brokerResponse = executeSqlQuery(requestJson, makeHttpIdentity(requestContext), true);
       asyncResponse.resume(brokerResponse.toJsonString());
+    } catch (WebApplicationException wae) {
+      asyncResponse.resume(wae);
     } catch (Exception e) {
       LOGGER.error("Caught exception while processing GET request", e);
       _brokerMetrics.addMeteredGlobalValue(BrokerMeter.UNCAUGHT_GET_EXCEPTIONS, 1L);
@@ -148,6 +150,8 @@ public void processSqlQueryPost(String query, @Suspended AsyncResponse asyncResp
       BrokerResponse brokerResponse =
           executeSqlQuery((ObjectNode) requestJson, makeHttpIdentity(requestContext), false);
       asyncResponse.resume(brokerResponse.toJsonString());
+    } catch (WebApplicationException wae) {
+      asyncResponse.resume(wae);
     } catch (Exception e) {
       LOGGER.error("Caught exception while processing POST request", e);
       _brokerMetrics.addMeteredGlobalValue(BrokerMeter.UNCAUGHT_POST_EXCEPTIONS, 1L);
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
index e5d96a424fe..1e5a888a66f 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/AllowAllAccessControlFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.broker.broker;
 
+import java.util.Set;
 import org.apache.pinot.broker.api.AccessControl;
 import org.apache.pinot.broker.api.RequesterIdentity;
 import org.apache.pinot.common.request.BrokerRequest;
@@ -43,5 +44,10 @@ private static class AllowAllAccessControl implements AccessControl {
     public boolean hasAccess(RequesterIdentity requesterIdentity, BrokerRequest brokerRequest) {
       return true;
     }
+
+    @Override
+    public boolean hasAccess(RequesterIdentity requesterIdentity, Set<String> tables) {
+      return true;
+    }
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BasicAuthAccessControlFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BasicAuthAccessControlFactory.java
index 91ae183e8c2..1eb134cfa73 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BasicAuthAccessControlFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BasicAuthAccessControlFactory.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.pinot.broker.api.AccessControl;
 import org.apache.pinot.broker.api.HttpRequesterIdentity;
@@ -77,18 +78,12 @@ public BasicAuthAccessControl(Collection<BasicAuthPrincipal> principals) {
 
     @Override
     public boolean hasAccess(RequesterIdentity requesterIdentity) {
-      return hasAccess(requesterIdentity, null);
+      return hasAccess(requesterIdentity, (BrokerRequest) null);
     }
 
     @Override
     public boolean hasAccess(RequesterIdentity requesterIdentity, BrokerRequest brokerRequest) {
-      Preconditions.checkArgument(requesterIdentity instanceof HttpRequesterIdentity, "HttpRequesterIdentity required");
-      HttpRequesterIdentity identity = (HttpRequesterIdentity) requesterIdentity;
-
-      Collection<String> tokens = identity.getHttpHeaders().get(HEADER_AUTHORIZATION);
-      Optional<BasicAuthPrincipal> principalOpt =
-          tokens.stream().map(BasicAuthUtils::normalizeBase64Token).map(_token2principal::get).filter(Objects::nonNull)
-              .findFirst();
+      Optional<BasicAuthPrincipal> principalOpt = getPrincipalOpt(requesterIdentity);
 
       if (!principalOpt.isPresent()) {
         // no matching token? reject
@@ -104,5 +99,39 @@ public boolean hasAccess(RequesterIdentity requesterIdentity, BrokerRequest brok
 
       return principal.hasTable(brokerRequest.getQuerySource().getTableName());
     }
+
+    @Override
+    public boolean hasAccess(RequesterIdentity requesterIdentity, Set<String> tables) {
+      Optional<BasicAuthPrincipal> principalOpt = getPrincipalOpt(requesterIdentity);
+
+      if (!principalOpt.isPresent()) {
+        // no matching token? reject
+        return false;
+      }
+
+      if (tables == null || tables.isEmpty()) {
+        return true;
+      }
+
+      BasicAuthPrincipal principal = principalOpt.get();
+      for (String table : tables) {
+        if (!principal.hasTable(table)) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    private Optional<BasicAuthPrincipal> getPrincipalOpt(RequesterIdentity requesterIdentity) {
+      Preconditions.checkArgument(requesterIdentity instanceof HttpRequesterIdentity, "HttpRequesterIdentity required");
+      HttpRequesterIdentity identity = (HttpRequesterIdentity) requesterIdentity;
+
+      Collection<String> tokens = identity.getHttpHeaders().get(HEADER_AUTHORIZATION);
+      Optional<BasicAuthPrincipal> principalOpt =
+          tokens.stream().map(BasicAuthUtils::normalizeBase64Token).map(_token2principal::get).filter(Objects::nonNull)
+              .findFirst();
+      return principalOpt;
+    }
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
index a0b5e9e330d..a3e11a22060 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
@@ -29,6 +29,7 @@
 import java.util.concurrent.Executors;
 import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.helix.HelixManager;
 import org.apache.pinot.broker.requesthandler.BrokerRequestHandler;
 import org.apache.pinot.broker.routing.BrokerRoutingManager;
 import org.apache.pinot.common.metrics.BrokerMetrics;
@@ -55,10 +56,10 @@
 
 public class BrokerAdminApiApplication extends ResourceConfig {
   private static final Logger LOGGER = LoggerFactory.getLogger(BrokerAdminApiApplication.class);
-  private static final String RESOURCE_PACKAGE = "org.apache.pinot.broker.api.resources";
   public static final String PINOT_CONFIGURATION = "pinotConfiguration";
   public static final String BROKER_INSTANCE_ID = "brokerInstanceId";
 
+  private final String _brokerResourcePackages;
   private final boolean _useHttps;
   private final boolean _swaggerBrokerEnabled;
   private final ExecutorService _executorService;
@@ -67,8 +68,12 @@ public class BrokerAdminApiApplication extends ResourceConfig {
 
   public BrokerAdminApiApplication(BrokerRoutingManager routingManager, BrokerRequestHandler brokerRequestHandler,
       BrokerMetrics brokerMetrics, PinotConfiguration brokerConf, SqlQueryExecutor sqlQueryExecutor,
-      ServerRoutingStatsManager serverRoutingStatsManager, AccessControlFactory accessFactory) {
-    packages(RESOURCE_PACKAGE);
+      ServerRoutingStatsManager serverRoutingStatsManager, AccessControlFactory accessFactory,
+      HelixManager helixManager) {
+    _brokerResourcePackages = brokerConf.getProperty(CommonConstants.Broker.BROKER_RESOURCE_PACKAGES,
+        CommonConstants.Broker.DEFAULT_BROKER_RESOURCE_PACKAGES);
+    String[] pkgs = _brokerResourcePackages.split(",");
+    packages(pkgs);
     property(PINOT_CONFIGURATION, brokerConf);
     _useHttps = Boolean.parseBoolean(brokerConf.getProperty(CommonConstants.Broker.CONFIG_OF_SWAGGER_USE_HTTPS));
     _swaggerBrokerEnabled = brokerConf.getProperty(CommonConstants.Broker.CONFIG_OF_SWAGGER_BROKER_ENABLED,
@@ -87,6 +92,7 @@ public BrokerAdminApiApplication(BrokerRoutingManager routingManager, BrokerRequ
       protected void configure() {
         bind(connMgr).to(HttpConnectionManager.class);
         bind(_executorService).to(Executor.class);
+        bind(helixManager).to(HelixManager.class);
         bind(sqlQueryExecutor).to(SqlQueryExecutor.class);
         bind(routingManager).to(BrokerRoutingManager.class);
         bind(brokerRequestHandler).to(BrokerRequestHandler.class);
@@ -102,6 +108,12 @@ protected void configure() {
         bind(accessFactory).to(AccessControlFactory.class);
       }
     });
+    boolean enableBoundedJerseyThreadPoolExecutor = brokerConf
+        .getProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_BOUNDED_JERSEY_THREADPOOL_EXECUTOR,
+            CommonConstants.Broker.DEFAULT_ENABLE_BOUNDED_JERSEY_THREADPOOL_EXECUTOR);
+    if (enableBoundedJerseyThreadPoolExecutor) {
+      register(buildBrokerManagedAsyncExecutorProvider(brokerConf, brokerMetrics));
+    }
     register(JacksonFeature.class);
     registerClasses(io.swagger.jaxrs.listing.ApiListingResource.class);
     registerClasses(io.swagger.jaxrs.listing.SwaggerSerializers.class);
@@ -137,7 +149,7 @@ private void setupSwagger() {
       beanConfig.setSchemes(new String[]{CommonConstants.HTTP_PROTOCOL, CommonConstants.HTTPS_PROTOCOL});
     }
     beanConfig.setBasePath("/");
-    beanConfig.setResourcePackage(RESOURCE_PACKAGE);
+    beanConfig.setResourcePackage(_brokerResourcePackages);
     beanConfig.setScan(true);
 
     HttpHandler httpHandler = new CLStaticHttpHandler(BrokerAdminApiApplication.class.getClassLoader(), "/api/");
@@ -145,11 +157,24 @@ private void setupSwagger() {
     _httpServer.getServerConfiguration().addHttpHandler(httpHandler, "/api/", "/help/");
 
     URL swaggerDistLocation =
-        BrokerAdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
+        BrokerAdminApiApplication.class.getClassLoader().getResource(CommonConstants.CONFIG_OF_SWAGGER_RESOURCES_PATH);
     CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new URLClassLoader(new URL[]{swaggerDistLocation}));
     _httpServer.getServerConfiguration().addHttpHandler(swaggerDist, "/swaggerui-dist/");
   }
 
+  private BrokerManagedAsyncExecutorProvider buildBrokerManagedAsyncExecutorProvider(PinotConfiguration brokerConf,
+      BrokerMetrics brokerMetrics) {
+    int corePoolSize = brokerConf
+        .getProperty(CommonConstants.Broker.CONFIG_OF_JERSEY_THREADPOOL_EXECUTOR_CORE_POOL_SIZE,
+            CommonConstants.Broker.DEFAULT_JERSEY_THREADPOOL_EXECUTOR_CORE_POOL_SIZE);
+    int maximumPoolSize = brokerConf
+        .getProperty(CommonConstants.Broker.CONFIG_OF_JERSEY_THREADPOOL_EXECUTOR_MAX_POOL_SIZE,
+            CommonConstants.Broker.DEFAULT_JERSEY_THREADPOOL_EXECUTOR_MAX_POOL_SIZE);
+    int queueSize = brokerConf.getProperty(CommonConstants.Broker.CONFIG_OF_JERSEY_THREADPOOL_EXECUTOR_QUEUE_SIZE,
+        CommonConstants.Broker.DEFAULT_JERSEY_THREADPOOL_EXECUTOR_QUEUE_SIZE);
+    return new BrokerManagedAsyncExecutorProvider(corePoolSize, maximumPoolSize, queueSize, brokerMetrics);
+  }
+
   public void stop() {
     if (_httpServer != null) {
       LOGGER.info("Shutting down http server");
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerManagedAsyncExecutorProvider.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerManagedAsyncExecutorProvider.java
new file mode 100644
index 00000000000..c85f421f4c1
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerManagedAsyncExecutorProvider.java
@@ -0,0 +1,108 @@
+/**
+ * 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.pinot.broker.broker;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+import javax.ws.rs.ServiceUnavailableException;
+import javax.ws.rs.core.Response;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.glassfish.jersey.server.ManagedAsyncExecutor;
+import org.glassfish.jersey.spi.ThreadPoolExecutorProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * BrokerManagedAsyncExecutorProvider provides a bounded thread pool.
+ */
+@ManagedAsyncExecutor
+public class BrokerManagedAsyncExecutorProvider extends ThreadPoolExecutorProvider {
+  private static final Logger LOGGER = LoggerFactory.getLogger(BrokerManagedAsyncExecutorProvider.class);
+
+  private static final String NAME = "broker-managed-async-executor";
+
+  private final BrokerMetrics _brokerMetrics;
+
+  private final int _maximumPoolSize;
+  private final int _corePoolSize;
+  private final int _queueSize;
+
+  public BrokerManagedAsyncExecutorProvider(int corePoolSize, int maximumPoolSize, int queueSize,
+      BrokerMetrics brokerMetrics) {
+    super(NAME);
+    _corePoolSize = corePoolSize;
+    _maximumPoolSize = maximumPoolSize;
+    _queueSize = queueSize;
+    _brokerMetrics = brokerMetrics;
+  }
+
+  @Override
+  protected int getMaximumPoolSize() {
+    return _maximumPoolSize;
+  }
+
+  @Override
+  protected int getCorePoolSize() {
+    return _corePoolSize;
+  }
+
+  @Override
+  protected BlockingQueue<Runnable> getWorkQueue() {
+    if (_queueSize == Integer.MAX_VALUE) {
+      return new LinkedBlockingQueue();
+    }
+    return new ArrayBlockingQueue(_queueSize);
+  }
+
+  @Override
+  protected RejectedExecutionHandler getRejectedExecutionHandler() {
+    return new BrokerThreadPoolRejectExecutionHandler(_brokerMetrics);
+  }
+
+  static class BrokerThreadPoolRejectExecutionHandler implements RejectedExecutionHandler {
+    private final BrokerMetrics _brokerMetrics;
+
+    public BrokerThreadPoolRejectExecutionHandler(BrokerMetrics brokerMetrics) {
+      _brokerMetrics = brokerMetrics;
+    }
+
+    /**
+     * Reject the runnable if it can’t be accommodated by the thread pool.
+     *
+     * <p> Response returned will have SERVICE_UNAVAILABLE(503) error code with error msg.
+     *
+     * @param r Runnable
+     * @param executor ThreadPoolExecutor
+     */
+    @Override
+    public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
+      _brokerMetrics.addMeteredGlobalValue(BrokerMeter.QUERY_REJECTED_EXCEPTIONS, 1L);
+      LOGGER.error("Task " + r + " rejected from " + executor);
+
+      throw new ServiceUnavailableException(Response.status(Response.Status.SERVICE_UNAVAILABLE).entity(
+          "Pinot Broker thread pool can not accommodate more requests now. " + "Request is rejected from " + executor)
+          .build());
+    }
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
index a127f1a40aa..95414928184 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
@@ -20,9 +20,11 @@
 
 import com.google.common.base.Preconditions;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
@@ -79,11 +81,42 @@ public BasicAuthAccessControl(AccessControlUserCache userCache) {
 
         @Override
         public boolean hasAccess(RequesterIdentity requesterIdentity) {
-            return hasAccess(requesterIdentity, null);
+            return hasAccess(requesterIdentity, (BrokerRequest) null);
         }
 
         @Override
         public boolean hasAccess(RequesterIdentity requesterIdentity, BrokerRequest brokerRequest) {
+            if (brokerRequest == null || !brokerRequest.isSetQuerySource() || !brokerRequest.getQuerySource()
+                .isSetTableName()) {
+                // no table restrictions? accept
+                return true;
+            }
+
+            return hasAccess(requesterIdentity, Collections.singleton(brokerRequest.getQuerySource().getTableName()));
+        }
+
+        @Override
+        public boolean hasAccess(RequesterIdentity requesterIdentity, Set<String> tables) {
+            Optional<ZkBasicAuthPrincipal> principalOpt = getPrincipalAuth(requesterIdentity);
+            if (!principalOpt.isPresent()) {
+                // no matching token? reject
+                return false;
+            }
+            if (tables == null || tables.isEmpty()) {
+                return true;
+            }
+
+            ZkBasicAuthPrincipal principal = principalOpt.get();
+            for (String table : tables) {
+                if (!principal.hasTable(table)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private Optional<ZkBasicAuthPrincipal> getPrincipalAuth(RequesterIdentity requesterIdentity) {
             Preconditions.checkArgument(requesterIdentity instanceof HttpRequesterIdentity,
                 "HttpRequesterIdentity required");
             HttpRequesterIdentity identity = (HttpRequesterIdentity) requesterIdentity;
@@ -95,28 +128,15 @@ public boolean hasAccess(RequesterIdentity requesterIdentity, BrokerRequest brok
 
 
             Map<String, String> name2password = tokens.stream().collect(Collectors
-              .toMap(BasicAuthUtils::extractUsername, BasicAuthUtils::extractPassword));
+                .toMap(BasicAuthUtils::extractUsername, BasicAuthUtils::extractPassword));
             Map<String, ZkBasicAuthPrincipal> password2principal = name2password.keySet().stream()
-              .collect(Collectors.toMap(name2password::get, _name2principal::get));
+                .collect(Collectors.toMap(name2password::get, _name2principal::get));
 
             Optional<ZkBasicAuthPrincipal> principalOpt =
-              password2principal.entrySet().stream()
-                .filter(entry -> BcryptUtils.checkpw(entry.getKey(), entry.getValue().getPassword()))
-                .map(u -> u.getValue()).filter(Objects::nonNull).findFirst();
-
-            if (!principalOpt.isPresent()) {
-                // no matching token? reject
-                return false;
-            }
-
-            ZkBasicAuthPrincipal principal = principalOpt.get();
-            if (brokerRequest == null || !brokerRequest.isSetQuerySource() || !brokerRequest.getQuerySource()
-                .isSetTableName()) {
-                // no table restrictions? accept
-                return true;
-            }
-
-            return principal.hasTable(brokerRequest.getQuerySource().getTableName());
+                password2principal.entrySet().stream()
+                    .filter(entry -> BcryptUtils.checkpw(entry.getKey(), entry.getValue().getPassword()))
+                    .map(u -> u.getValue()).filter(Objects::nonNull).findFirst();
+            return principalOpt;
         }
     }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
index 6407fd0b296..c54183da8b1 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
@@ -56,6 +56,7 @@
 import org.apache.pinot.common.metrics.BrokerGauge;
 import org.apache.pinot.common.metrics.BrokerMeter;
 import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.utils.PinotAppConfigs;
 import org.apache.pinot.common.utils.ServiceStartableUtils;
 import org.apache.pinot.common.utils.ServiceStatus;
 import org.apache.pinot.common.utils.TlsUtils;
@@ -63,14 +64,19 @@
 import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.common.version.PinotVersion;
 import org.apache.pinot.core.query.executor.sql.SqlQueryExecutor;
+import org.apache.pinot.core.query.utils.rewriter.ResultRewriterFactory;
 import org.apache.pinot.core.transport.ListenerConfig;
 import org.apache.pinot.core.transport.server.routing.stats.ServerRoutingStatsManager;
 import org.apache.pinot.core.util.ListenerConfigUtil;
+import org.apache.pinot.query.service.QueryConfig;
+import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.metrics.PinotMetricUtils;
 import org.apache.pinot.spi.metrics.PinotMetricsRegistry;
 import org.apache.pinot.spi.services.ServiceRole;
 import org.apache.pinot.spi.services.ServiceStartable;
+import org.apache.pinot.spi.trace.Tracing;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Broker;
 import org.apache.pinot.spi.utils.CommonConstants.Helix;
 import org.apache.pinot.spi.utils.InstanceTypeUtils;
@@ -128,6 +134,9 @@ public void init(PinotConfiguration brokerConf)
     _clusterName = brokerConf.getProperty(Helix.CONFIG_OF_CLUSTER_NAME);
     ServiceStartableUtils.applyClusterConfig(_brokerConf, _zkServers, _clusterName, ServiceRole.BROKER);
 
+    if (_brokerConf.getProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, QueryConfig.DEFAULT_QUERY_RUNNER_PORT) == 0) {
+      _brokerConf.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, NetUtils.findOpenPort());
+    }
     setupHelixSystemProperties();
     _listenerConfigs = ListenerConfigUtil.buildBrokerConfigs(brokerConf);
     _hostname = brokerConf.getProperty(Broker.CONFIG_OF_BROKER_HOSTNAME);
@@ -220,6 +229,7 @@ public PinotConfiguration getConfig() {
   public void start()
       throws Exception {
     LOGGER.info("Starting Pinot broker (Version: {})", PinotVersion.VERSION);
+    LOGGER.info("Broker configs: {}", new PinotAppConfigs(getConfig()).toJSONString());
     _isStarting = true;
     Utils.logVersions();
 
@@ -241,6 +251,7 @@ public void start()
         _brokerConf.getProperty(Broker.CONFIG_OF_ALLOWED_TABLES_FOR_EMITTING_METRICS, Collections.emptyList()));
     _brokerMetrics.initializeGlobalMeters();
     _brokerMetrics.setValueOfGlobalGauge(BrokerGauge.VERSION, PinotVersion.VERSION_METRIC_NAME, 1);
+    BrokerMetrics.register(_brokerMetrics);
     // Set up request handling classes
     _serverRoutingStatsManager = new ServerRoutingStatsManager(_brokerConf);
     _serverRoutingStatsManager.init();
@@ -254,11 +265,12 @@ public void start()
     // Initialize QueryRewriterFactory
     LOGGER.info("Initializing QueryRewriterFactory");
     QueryRewriterFactory.init(_brokerConf.getProperty(Broker.CONFIG_OF_BROKER_QUERY_REWRITER_CLASS_NAMES));
+    LOGGER.info("Initializing ResultRewriterFactory");
+    ResultRewriterFactory.init(_brokerConf.getProperty(Broker.CONFIG_OF_BROKER_RESULT_REWRITER_CLASS_NAMES));
     // Initialize FunctionRegistry before starting the broker request handler
     FunctionRegistry.init();
     boolean caseInsensitive =
-        _brokerConf.getProperty(Helix.ENABLE_CASE_INSENSITIVE_KEY, false) || _brokerConf.getProperty(
-            Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY, false);
+        _brokerConf.getProperty(Helix.ENABLE_CASE_INSENSITIVE_KEY, Helix.DEFAULT_ENABLE_CASE_INSENSITIVE);
     TableCache tableCache = new TableCache(_propertyStore, caseInsensitive);
     // Configure TLS for netty connection to server
     TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(_brokerConf, Broker.BROKER_TLS_PREFIX);
@@ -298,6 +310,18 @@ public void start()
     _brokerRequestHandler = new BrokerRequestHandlerDelegate(brokerId, singleStageBrokerRequestHandler,
         multiStageBrokerRequestHandler, _brokerMetrics);
     _brokerRequestHandler.start();
+
+    // Enable/disable thread CPU time measurement through instance config.
+    ThreadResourceUsageProvider.setThreadCpuTimeMeasurementEnabled(
+        _brokerConf.getProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_THREAD_CPU_TIME_MEASUREMENT,
+            CommonConstants.Broker.DEFAULT_ENABLE_THREAD_CPU_TIME_MEASUREMENT));
+    // Enable/disable thread memory allocation tracking through instance config
+    ThreadResourceUsageProvider.setThreadMemoryMeasurementEnabled(
+        _brokerConf.getProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT,
+            CommonConstants.Broker.DEFAULT_THREAD_ALLOCATED_BYTES_MEASUREMENT));
+    Tracing.ThreadAccountantOps
+        .initializeThreadAccountant(_brokerConf.subset(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX), _instanceId);
+
     String controllerUrl = _brokerConf.getProperty(Broker.CONTROLLER_URL);
     if (controllerUrl != null) {
       _sqlQueryExecutor = new SqlQueryExecutor(controllerUrl);
@@ -307,7 +331,8 @@ public void start()
     LOGGER.info("Starting broker admin application on: {}", ListenerConfigUtil.toString(_listenerConfigs));
     _brokerAdminApplication =
         new BrokerAdminApiApplication(_routingManager, _brokerRequestHandler, _brokerMetrics, _brokerConf,
-            _sqlQueryExecutor, _serverRoutingStatsManager, _accessControlFactory);
+        _sqlQueryExecutor, _serverRoutingStatsManager, _accessControlFactory, _spectatorHelixManager);
+    registerExtraComponents(_brokerAdminApplication);
     _brokerAdminApplication.start(_listenerConfigs);
 
     LOGGER.info("Initializing cluster change mediator");
@@ -370,12 +395,31 @@ public void start()
     LOGGER.info("Finish starting Pinot broker");
   }
 
+  /**
+   * This method is called after initialization of BrokerAdminApiApplication object
+   * and before calling start to allow custom broker starters to register additional
+   * components.
+   * @param brokerAdminApplication is the application
+   */
+  protected void registerExtraComponents(BrokerAdminApiApplication brokerAdminApplication) {
+  }
+
   private void updateInstanceConfigAndBrokerResourceIfNeeded() {
     InstanceConfig instanceConfig = HelixHelper.getInstanceConfig(_participantHelixManager, _instanceId);
     boolean updated = HelixHelper.updateHostnamePort(instanceConfig, _hostname, _port);
+
+    ZNRecord znRecord = instanceConfig.getRecord();
+    Map<String, String> simpleFields = znRecord.getSimpleFields();
     if (_tlsPort > 0) {
       HelixHelper.updateTlsPort(instanceConfig, _tlsPort);
     }
+    // Update multi-stage query engine ports
+    if (_brokerConf.getProperty(Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED, Helix.DEFAULT_MULTI_STAGE_ENGINE_ENABLED)) {
+      updated |= updatePortIfNeeded(simpleFields, Helix.Instance.MULTI_STAGE_QUERY_ENGINE_MAILBOX_PORT_KEY,
+          Integer.parseInt(_brokerConf.getProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT)));
+    } else {
+      updated |= updatePortIfNeeded(simpleFields, Helix.Instance.MULTI_STAGE_QUERY_ENGINE_MAILBOX_PORT_KEY, -1);
+    }
     updated |= HelixHelper.removeDisabledPartitions(instanceConfig);
     boolean shouldUpdateBrokerResource = false;
     String brokerTag = null;
@@ -444,6 +488,25 @@ private String getDefaultBrokerId() {
     }
   }
 
+  private boolean updatePortIfNeeded(Map<String, String> instanceConfigSimpleFields, String key, int port) {
+    String existingPortStr = instanceConfigSimpleFields.get(key);
+    if (port > 0) {
+      String portStr = Integer.toString(port);
+      if (!portStr.equals(existingPortStr)) {
+        LOGGER.info("Updating '{}' for instance: {} to: {}", key, _instanceId, port);
+        instanceConfigSimpleFields.put(key, portStr);
+        return true;
+      }
+    } else {
+      if (existingPortStr != null) {
+        LOGGER.info("Removing '{}' from instance: {}", key, _instanceId);
+        instanceConfigSimpleFields.remove(key);
+        return true;
+      }
+    }
+    return false;
+  }
+
   @Override
   public void stop() {
     LOGGER.info("Shutting down Pinot broker");
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
index c9277395a4d..5921435aab7 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
@@ -34,10 +34,11 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.httpclient.URI;
@@ -57,6 +58,7 @@
 import org.apache.pinot.common.metrics.BrokerQueryPhase;
 import org.apache.pinot.common.metrics.BrokerTimer;
 import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.DataSource;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
@@ -83,6 +85,7 @@
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
 import org.apache.pinot.spi.trace.RequestContext;
+import org.apache.pinot.spi.trace.Tracing;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Broker;
@@ -113,7 +116,7 @@ public abstract class BaseBrokerRequestHandler implements BrokerRequestHandler {
   protected final TableCache _tableCache;
   protected final BrokerMetrics _brokerMetrics;
 
-  protected final AtomicLong _requestIdGenerator = new AtomicLong();
+  protected final BrokerRequestIdGenerator _brokerIdGenerator;
   protected final QueryOptimizer _queryOptimizer = new QueryOptimizer();
 
   protected final String _brokerId;
@@ -132,6 +135,7 @@ public BaseBrokerRequestHandler(PinotConfiguration config, String brokerId, Brok
       AccessControlFactory accessControlFactory, QueryQuotaManager queryQuotaManager, TableCache tableCache,
       BrokerMetrics brokerMetrics) {
     _brokerId = brokerId;
+    _brokerIdGenerator = new BrokerRequestIdGenerator(brokerId);
     _config = config;
     _routingManager = routingManager;
     _accessControlFactory = accessControlFactory;
@@ -229,7 +233,7 @@ public boolean cancelQuery(long requestId, int timeoutMs, Executor executor, Htt
   public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOptions sqlNodeAndOptions,
       @Nullable RequesterIdentity requesterIdentity, RequestContext requestContext)
       throws Exception {
-    long requestId = _requestIdGenerator.incrementAndGet();
+    long requestId = _brokerIdGenerator.get();
     requestContext.setRequestId(requestId);
     requestContext.setRequestArrivalTimeMillis(System.currentTimeMillis());
 
@@ -240,7 +244,7 @@ public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOption
       _brokerMetrics.addMeteredGlobalValue(BrokerMeter.REQUEST_DROPPED_DUE_TO_ACCESS_ERROR, 1);
       LOGGER.info("Access denied for requestId {}", requestId);
       requestContext.setErrorCode(QueryException.ACCESS_DENIED_ERROR_CODE);
-      return new BrokerResponseNative(QueryException.ACCESS_DENIED_ERROR);
+      throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
     }
 
     JsonNode sql = request.get(Broker.Request.SQL);
@@ -249,7 +253,19 @@ public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOption
     }
     String query = sql.asText();
     requestContext.setQuery(query);
-    return handleRequest(requestId, query, sqlNodeAndOptions, request, requesterIdentity, requestContext);
+    BrokerResponse brokerResponse = handleRequest(requestId, query, sqlNodeAndOptions, request,
+            requesterIdentity, requestContext);
+
+    if (request.has(Broker.Request.QUERY_OPTIONS)) {
+      String queryOptions = request.get(Broker.Request.QUERY_OPTIONS).asText();
+      Map<String, String> optionsFromString = RequestUtils.getOptionsFromString(queryOptions);
+      if (QueryOptionsUtils.shouldDropResults(optionsFromString)) {
+        brokerResponse.setResultTable(null);
+      }
+    }
+
+    brokerResponse.setRequestId(String.valueOf(requestId));
+    return brokerResponse;
   }
 
   private BrokerResponseNative handleRequest(long requestId, String query,
@@ -258,434 +274,470 @@ private BrokerResponseNative handleRequest(long requestId, String query,
       throws Exception {
     LOGGER.debug("SQL query for request {}: {}", requestId, query);
 
-    long compilationStartTimeNs;
-    PinotQuery pinotQuery;
+    //Start instrumentation context. This must not be moved further below interspersed into the code.
+    Tracing.ThreadAccountantOps.setupRunner(String.valueOf(requestId));
+
     try {
-      // Parse the request
-      sqlNodeAndOptions = sqlNodeAndOptions != null ? sqlNodeAndOptions : RequestUtils.parseQuery(query, request);
-      // Compile the request into PinotQuery
-      compilationStartTimeNs = System.nanoTime();
-      pinotQuery = CalciteSqlParser.compileToPinotQuery(sqlNodeAndOptions);
-    } catch (Exception e) {
-      LOGGER.info("Caught exception while compiling SQL request {}: {}, {}", requestId, query, e.getMessage());
-      _brokerMetrics.addMeteredGlobalValue(BrokerMeter.REQUEST_COMPILATION_EXCEPTIONS, 1);
-      requestContext.setErrorCode(QueryException.SQL_PARSING_ERROR_CODE);
-      return new BrokerResponseNative(QueryException.getException(QueryException.SQL_PARSING_ERROR, e));
-    }
-
-    if (isLiteralOnlyQuery(pinotQuery)) {
-      LOGGER.debug("Request {} contains only Literal, skipping server query: {}", requestId, query);
+      long compilationStartTimeNs;
+      PinotQuery pinotQuery;
       try {
-        if (pinotQuery.isExplain()) {
-          // EXPLAIN PLAN results to show that query is evaluated exclusively by Broker.
-          return BrokerResponseNative.BROKER_ONLY_EXPLAIN_PLAN_OUTPUT;
-        }
-        return processLiteralOnlyQuery(pinotQuery, compilationStartTimeNs, requestContext);
+        // Parse the request
+        sqlNodeAndOptions = sqlNodeAndOptions != null ? sqlNodeAndOptions : RequestUtils.parseQuery(query, request);
+        // Compile the request into PinotQuery
+        compilationStartTimeNs = System.nanoTime();
+        pinotQuery = CalciteSqlParser.compileToPinotQuery(sqlNodeAndOptions);
       } catch (Exception e) {
-        // TODO: refine the exceptions here to early termination the queries won't requires to send to servers.
-        LOGGER.warn("Unable to execute literal request {}: {} at broker, fallback to server query. {}", requestId,
-            query, e.getMessage());
+        LOGGER.info("Caught exception while compiling SQL request {}: {}, {}", requestId, query, e.getMessage());
+        _brokerMetrics.addMeteredGlobalValue(BrokerMeter.REQUEST_COMPILATION_EXCEPTIONS, 1);
+        requestContext.setErrorCode(QueryException.SQL_PARSING_ERROR_CODE);
+        return new BrokerResponseNative(QueryException.getException(QueryException.SQL_PARSING_ERROR, e));
       }
-    }
-
-    PinotQuery serverPinotQuery = GapfillUtils.stripGapfill(pinotQuery);
-    if (serverPinotQuery.getDataSource() == null) {
-      LOGGER.info("Data source (FROM clause) not found in request {}: {}", request, query);
-      requestContext.setErrorCode(QueryException.QUERY_VALIDATION_ERROR_CODE);
-      return new BrokerResponseNative(
-          QueryException.getException(QueryException.QUERY_VALIDATION_ERROR, "Data source (FROM clause) not found"));
-    }
 
-    try {
-      handleSubquery(serverPinotQuery, requestId, request, requesterIdentity, requestContext);
-    } catch (Exception e) {
-      LOGGER.info("Caught exception while handling the subquery in request {}: {}, {}", requestId, query,
-          e.getMessage());
-      requestContext.setErrorCode(QueryException.QUERY_EXECUTION_ERROR_CODE);
-      return new BrokerResponseNative(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, e));
-    }
+      if (isLiteralOnlyQuery(pinotQuery)) {
+        LOGGER.debug("Request {} contains only Literal, skipping server query: {}", requestId, query);
+        try {
+          if (pinotQuery.isExplain()) {
+            // EXPLAIN PLAN results to show that query is evaluated exclusively by Broker.
+            return BrokerResponseNative.BROKER_ONLY_EXPLAIN_PLAN_OUTPUT;
+          }
+          return processLiteralOnlyQuery(pinotQuery, compilationStartTimeNs, requestContext);
+        } catch (Exception e) {
+          // TODO: refine the exceptions here to early termination the queries won't requires to send to servers.
+          LOGGER.warn("Unable to execute literal request {}: {} at broker, fallback to server query. {}", requestId,
+              query, e.getMessage());
+        }
+      }
 
-    String tableName = getActualTableName(serverPinotQuery.getDataSource().getTableName(), _tableCache);
-    serverPinotQuery.getDataSource().setTableName(tableName);
-    String rawTableName = TableNameBuilder.extractRawTableName(tableName);
-    requestContext.setTableName(rawTableName);
+      PinotQuery serverPinotQuery = GapfillUtils.stripGapfill(pinotQuery);
+      DataSource dataSource = serverPinotQuery.getDataSource();
+      if (dataSource == null) {
+        LOGGER.info("Data source (FROM clause) not found in request {}: {}", request, query);
+        requestContext.setErrorCode(QueryException.QUERY_VALIDATION_ERROR_CODE);
+        return new BrokerResponseNative(
+            QueryException.getException(QueryException.QUERY_VALIDATION_ERROR, "Data source (FROM clause) not found"));
+      }
+      if (dataSource.getJoin() != null) {
+        LOGGER.info("JOIN is not supported in request {}: {}", request, query);
+        requestContext.setErrorCode(QueryException.QUERY_VALIDATION_ERROR_CODE);
+        return new BrokerResponseNative(
+            QueryException.getException(QueryException.QUERY_VALIDATION_ERROR, "JOIN is not supported"));
+      }
+      if (dataSource.getTableName() == null) {
+        LOGGER.info("Table name not found in request {}: {}", request, query);
+        requestContext.setErrorCode(QueryException.QUERY_VALIDATION_ERROR_CODE);
+        return new BrokerResponseNative(
+            QueryException.getException(QueryException.QUERY_VALIDATION_ERROR, "Table name not found"));
+      }
 
-    try {
-      boolean isCaseInsensitive = _tableCache.isIgnoreCase();
-      Map<String, String> columnNameMap = _tableCache.getColumnNameMap(rawTableName);
-      if (columnNameMap != null) {
-        updateColumnNames(rawTableName, serverPinotQuery, isCaseInsensitive, columnNameMap);
-      }
-    } catch (Exception e) {
-      // Throw exceptions with column in-existence error.
-      if (e instanceof BadQueryRequestException) {
-        LOGGER.info("Caught exception while checking column names in request {}: {}, {}", requestId, query,
+      try {
+        handleSubquery(serverPinotQuery, requestId, request, requesterIdentity, requestContext);
+      } catch (Exception e) {
+        LOGGER.info("Caught exception while handling the subquery in request {}: {}, {}", requestId, query,
             e.getMessage());
-        requestContext.setErrorCode(QueryException.UNKNOWN_COLUMN_ERROR_CODE);
-        _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.UNKNOWN_COLUMN_EXCEPTIONS, 1);
-        return new BrokerResponseNative(QueryException.getException(QueryException.UNKNOWN_COLUMN_ERROR, e));
-      }
-      LOGGER.warn("Caught exception while updating column names in request {}: {}, {}", requestId, query,
-          e.getMessage());
-    }
-    if (_defaultHllLog2m > 0) {
-      handleHLLLog2mOverride(serverPinotQuery, _defaultHllLog2m);
-    }
-    if (_enableQueryLimitOverride) {
-      handleQueryLimitOverride(serverPinotQuery, _queryResponseLimit);
-    }
-    handleSegmentPartitionedDistinctCountOverride(serverPinotQuery,
-        getSegmentPartitionedColumns(_tableCache, tableName));
-    if (_enableDistinctCountBitmapOverride) {
-      handleDistinctCountBitmapOverride(serverPinotQuery);
-    }
-
-    long compilationEndTimeNs = System.nanoTime();
-    // full request compile time = compilationTimeNs + parserTimeNs
-    _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.REQUEST_COMPILATION,
-        (compilationEndTimeNs - compilationStartTimeNs) + sqlNodeAndOptions.getParseTimeNs());
-
-    // Second-stage table-level access control
-    // TODO: Modify AccessControl interface to directly take PinotQuery
-    BrokerRequest brokerRequest = CalciteSqlCompiler.convertToBrokerRequest(pinotQuery);
-    BrokerRequest serverBrokerRequest =
-        serverPinotQuery == pinotQuery ? brokerRequest : CalciteSqlCompiler.convertToBrokerRequest(serverPinotQuery);
-    boolean hasTableAccess = _accessControlFactory.create().hasAccess(requesterIdentity, serverBrokerRequest);
-    if (!hasTableAccess) {
-      _brokerMetrics.addMeteredTableValue(tableName, BrokerMeter.REQUEST_DROPPED_DUE_TO_ACCESS_ERROR, 1);
-      LOGGER.info("Access denied for request {}: {}, table: {}", requestId, query, tableName);
-      requestContext.setErrorCode(QueryException.ACCESS_DENIED_ERROR_CODE);
-      return new BrokerResponseNative(QueryException.ACCESS_DENIED_ERROR);
-    }
-    _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.AUTHORIZATION,
-        System.nanoTime() - compilationEndTimeNs);
+        requestContext.setErrorCode(QueryException.QUERY_EXECUTION_ERROR_CODE);
+        return new BrokerResponseNative(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, e));
+      }
+
+      String tableName = getActualTableName(dataSource.getTableName(), _tableCache);
+      dataSource.setTableName(tableName);
+      String rawTableName = TableNameBuilder.extractRawTableName(tableName);
+      requestContext.setTableName(rawTableName);
 
-    // Get the tables hit by the request
-    String offlineTableName = null;
-    String realtimeTableName = null;
-    TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
-    if (tableType == TableType.OFFLINE) {
-      // Offline table
-      if (_routingManager.routingExists(tableName)) {
-        offlineTableName = tableName;
+      try {
+        boolean isCaseInsensitive = _tableCache.isIgnoreCase();
+        Map<String, String> columnNameMap = _tableCache.getColumnNameMap(rawTableName);
+        if (columnNameMap != null) {
+          updateColumnNames(rawTableName, serverPinotQuery, isCaseInsensitive, columnNameMap);
+        }
+      } catch (Exception e) {
+        // Throw exceptions with column in-existence error.
+        if (e instanceof BadQueryRequestException) {
+          LOGGER.info("Caught exception while checking column names in request {}: {}, {}", requestId, query,
+              e.getMessage());
+          requestContext.setErrorCode(QueryException.UNKNOWN_COLUMN_ERROR_CODE);
+          _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.UNKNOWN_COLUMN_EXCEPTIONS, 1);
+          return new BrokerResponseNative(QueryException.getException(QueryException.UNKNOWN_COLUMN_ERROR, e));
+        }
+        LOGGER.warn("Caught exception while updating column names in request {}: {}, {}", requestId, query,
+            e.getMessage());
       }
-    } else if (tableType == TableType.REALTIME) {
-      // Realtime table
-      if (_routingManager.routingExists(tableName)) {
-        realtimeTableName = tableName;
+      if (_defaultHllLog2m > 0) {
+        handleHLLLog2mOverride(serverPinotQuery, _defaultHllLog2m);
       }
-    } else {
-      // Hybrid table (check both OFFLINE and REALTIME)
-      String offlineTableNameToCheck = TableNameBuilder.OFFLINE.tableNameWithType(tableName);
-      if (_routingManager.routingExists(offlineTableNameToCheck)) {
-        offlineTableName = offlineTableNameToCheck;
+      if (_enableQueryLimitOverride) {
+        handleQueryLimitOverride(serverPinotQuery, _queryResponseLimit);
       }
-      String realtimeTableNameToCheck = TableNameBuilder.REALTIME.tableNameWithType(tableName);
-      if (_routingManager.routingExists(realtimeTableNameToCheck)) {
-        realtimeTableName = realtimeTableNameToCheck;
+      handleSegmentPartitionedDistinctCountOverride(serverPinotQuery,
+          getSegmentPartitionedColumns(_tableCache, tableName));
+      if (_enableDistinctCountBitmapOverride) {
+        handleDistinctCountBitmapOverride(serverPinotQuery);
       }
-    }
 
-    TableConfig offlineTableConfig =
-        _tableCache.getTableConfig(TableNameBuilder.OFFLINE.tableNameWithType(rawTableName));
-    TableConfig realtimeTableConfig =
-        _tableCache.getTableConfig(TableNameBuilder.REALTIME.tableNameWithType(rawTableName));
+      long compilationEndTimeNs = System.nanoTime();
+      // full request compile time = compilationTimeNs + parserTimeNs
+      _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.REQUEST_COMPILATION,
+          (compilationEndTimeNs - compilationStartTimeNs) + sqlNodeAndOptions.getParseTimeNs());
+
+      // Second-stage table-level access control
+      // TODO: Modify AccessControl interface to directly take PinotQuery
+      BrokerRequest brokerRequest = CalciteSqlCompiler.convertToBrokerRequest(pinotQuery);
+      BrokerRequest serverBrokerRequest =
+          serverPinotQuery == pinotQuery ? brokerRequest : CalciteSqlCompiler.convertToBrokerRequest(serverPinotQuery);
+      boolean hasTableAccess = _accessControlFactory.create().hasAccess(requesterIdentity, serverBrokerRequest);
+      if (!hasTableAccess) {
+        _brokerMetrics.addMeteredTableValue(tableName, BrokerMeter.REQUEST_DROPPED_DUE_TO_ACCESS_ERROR, 1);
+        LOGGER.info("Access denied for request {}: {}, table: {}", requestId, query, tableName);
+        requestContext.setErrorCode(QueryException.ACCESS_DENIED_ERROR_CODE);
+        throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
+      }
+      _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.AUTHORIZATION,
+          System.nanoTime() - compilationEndTimeNs);
+
+      // Get the tables hit by the request
+      String offlineTableName = null;
+      String realtimeTableName = null;
+      TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
+      if (tableType == TableType.OFFLINE) {
+        // Offline table
+        if (_routingManager.routingExists(tableName)) {
+          offlineTableName = tableName;
+        }
+      } else if (tableType == TableType.REALTIME) {
+        // Realtime table
+        if (_routingManager.routingExists(tableName)) {
+          realtimeTableName = tableName;
+        }
+      } else {
+        // Hybrid table (check both OFFLINE and REALTIME)
+        String offlineTableNameToCheck = TableNameBuilder.OFFLINE.tableNameWithType(tableName);
+        if (_routingManager.routingExists(offlineTableNameToCheck)) {
+          offlineTableName = offlineTableNameToCheck;
+        }
+        String realtimeTableNameToCheck = TableNameBuilder.REALTIME.tableNameWithType(tableName);
+        if (_routingManager.routingExists(realtimeTableNameToCheck)) {
+          realtimeTableName = realtimeTableNameToCheck;
+        }
+      }
 
-    if (offlineTableName == null && realtimeTableName == null) {
-      // No table matches the request
-      if (realtimeTableConfig == null && offlineTableConfig == null) {
-        LOGGER.info("Table not found for request {}: {}", requestId, query);
-        requestContext.setErrorCode(QueryException.TABLE_DOES_NOT_EXIST_ERROR_CODE);
-        return BrokerResponseNative.TABLE_DOES_NOT_EXIST;
+      TableConfig offlineTableConfig =
+          _tableCache.getTableConfig(TableNameBuilder.OFFLINE.tableNameWithType(rawTableName));
+      TableConfig realtimeTableConfig =
+          _tableCache.getTableConfig(TableNameBuilder.REALTIME.tableNameWithType(rawTableName));
+
+      if (offlineTableName == null && realtimeTableName == null) {
+        // No table matches the request
+        if (realtimeTableConfig == null && offlineTableConfig == null) {
+          LOGGER.info("Table not found for request {}: {}", requestId, query);
+          requestContext.setErrorCode(QueryException.TABLE_DOES_NOT_EXIST_ERROR_CODE);
+          return BrokerResponseNative.TABLE_DOES_NOT_EXIST;
+        }
+        LOGGER.info("No table matches for request {}: {}", requestId, query);
+        requestContext.setErrorCode(QueryException.BROKER_RESOURCE_MISSING_ERROR_CODE);
+        _brokerMetrics.addMeteredGlobalValue(BrokerMeter.RESOURCE_MISSING_EXCEPTIONS, 1);
+        return BrokerResponseNative.NO_TABLE_RESULT;
       }
-      LOGGER.info("No table matches for request {}: {}", requestId, query);
-      requestContext.setErrorCode(QueryException.BROKER_RESOURCE_MISSING_ERROR_CODE);
-      _brokerMetrics.addMeteredGlobalValue(BrokerMeter.RESOURCE_MISSING_EXCEPTIONS, 1);
-      return BrokerResponseNative.NO_TABLE_RESULT;
-    }
 
-    // Handle query rewrite that can be overridden by the table configs
-    if (offlineTableName == null) {
-      offlineTableConfig = null;
-    }
-    if (realtimeTableName == null) {
-      realtimeTableConfig = null;
-    }
-    HandlerContext handlerContext = getHandlerContext(offlineTableConfig, realtimeTableConfig);
-    if (handlerContext._disableGroovy) {
-      rejectGroovyQuery(serverPinotQuery);
-    }
-    if (handlerContext._useApproximateFunction) {
-      handleApproximateFunctionOverride(serverPinotQuery);
-    }
+      // Handle query rewrite that can be overridden by the table configs
+      if (offlineTableName == null) {
+        offlineTableConfig = null;
+      }
+      if (realtimeTableName == null) {
+        realtimeTableConfig = null;
+      }
+      HandlerContext handlerContext = getHandlerContext(offlineTableConfig, realtimeTableConfig);
+      if (handlerContext._disableGroovy) {
+        rejectGroovyQuery(serverPinotQuery);
+      }
+      if (handlerContext._useApproximateFunction) {
+        handleApproximateFunctionOverride(serverPinotQuery);
+      }
 
-    // Validate QPS quota
-    if (!_queryQuotaManager.acquire(tableName)) {
-      String errorMessage =
-          String.format("Request %d: %s exceeds query quota for table: %s", requestId, query, tableName);
-      LOGGER.info(errorMessage);
-      requestContext.setErrorCode(QueryException.TOO_MANY_REQUESTS_ERROR_CODE);
-      _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERY_QUOTA_EXCEEDED, 1);
-      return new BrokerResponseNative(QueryException.getException(QueryException.QUOTA_EXCEEDED_ERROR, errorMessage));
-    }
+      // Validate QPS quota
+      if (!_queryQuotaManager.acquire(tableName)) {
+        String errorMessage =
+            String.format("Request %d: %s exceeds query quota for table: %s", requestId, query, tableName);
+        LOGGER.info(errorMessage);
+        requestContext.setErrorCode(QueryException.TOO_MANY_REQUESTS_ERROR_CODE);
+        _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERY_QUOTA_EXCEEDED, 1);
+        return new BrokerResponseNative(QueryException.getException(QueryException.QUOTA_EXCEEDED_ERROR, errorMessage));
+      }
 
-    // Validate the request
-    try {
-      validateRequest(serverPinotQuery, _queryResponseLimit);
-    } catch (Exception e) {
-      LOGGER.info("Caught exception while validating request {}: {}, {}", requestId, query, e.getMessage());
-      requestContext.setErrorCode(QueryException.QUERY_VALIDATION_ERROR_CODE);
-      _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERY_VALIDATION_EXCEPTIONS, 1);
-      return new BrokerResponseNative(QueryException.getException(QueryException.QUERY_VALIDATION_ERROR, e));
-    }
-
-    _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERIES, 1);
-    _brokerMetrics.addValueToTableGauge(rawTableName, BrokerGauge.REQUEST_SIZE, query.length());
-
-    // Prepare OFFLINE and REALTIME requests
-    BrokerRequest offlineBrokerRequest = null;
-    BrokerRequest realtimeBrokerRequest = null;
-    TimeBoundaryInfo timeBoundaryInfo = null;
-    Schema schema = _tableCache.getSchema(rawTableName);
-    if (offlineTableName != null && realtimeTableName != null) {
-      // Time boundary info might be null when there is no segment in the offline table, query real-time side only
-      timeBoundaryInfo = _routingManager.getTimeBoundaryInfo(offlineTableName);
-      if (timeBoundaryInfo == null) {
-        LOGGER.debug("No time boundary info found for hybrid table: {}", rawTableName);
-        offlineTableName = null;
-      }
-    }
-    if (offlineTableName != null && realtimeTableName != null) {
-      // Hybrid
-      PinotQuery offlinePinotQuery = serverPinotQuery.deepCopy();
-      offlinePinotQuery.getDataSource().setTableName(offlineTableName);
-      attachTimeBoundary(offlinePinotQuery, timeBoundaryInfo, true);
-      handleExpressionOverride(offlinePinotQuery, _tableCache.getExpressionOverrideMap(offlineTableName));
-      handleTimestampIndexOverride(offlinePinotQuery, offlineTableConfig);
-      _queryOptimizer.optimize(offlinePinotQuery, offlineTableConfig, schema);
-      offlineBrokerRequest = CalciteSqlCompiler.convertToBrokerRequest(offlinePinotQuery);
-
-      PinotQuery realtimePinotQuery = serverPinotQuery.deepCopy();
-      realtimePinotQuery.getDataSource().setTableName(realtimeTableName);
-      attachTimeBoundary(realtimePinotQuery, timeBoundaryInfo, false);
-      handleExpressionOverride(realtimePinotQuery, _tableCache.getExpressionOverrideMap(realtimeTableName));
-      handleTimestampIndexOverride(realtimePinotQuery, realtimeTableConfig);
-      _queryOptimizer.optimize(realtimePinotQuery, realtimeTableConfig, schema);
-      realtimeBrokerRequest = CalciteSqlCompiler.convertToBrokerRequest(realtimePinotQuery);
-
-      requestContext.setFanoutType(RequestContext.FanoutType.HYBRID);
-      requestContext.setOfflineServerTenant(getServerTenant(offlineTableName));
-      requestContext.setRealtimeServerTenant(getServerTenant(realtimeTableName));
-    } else if (offlineTableName != null) {
-      // OFFLINE only
-      setTableName(serverBrokerRequest, offlineTableName);
-      handleExpressionOverride(serverPinotQuery, _tableCache.getExpressionOverrideMap(offlineTableName));
-      handleTimestampIndexOverride(serverPinotQuery, offlineTableConfig);
-      _queryOptimizer.optimize(serverPinotQuery, offlineTableConfig, schema);
-      offlineBrokerRequest = serverBrokerRequest;
-
-      requestContext.setFanoutType(RequestContext.FanoutType.OFFLINE);
-      requestContext.setOfflineServerTenant(getServerTenant(offlineTableName));
-    } else {
-      // REALTIME only
-      setTableName(serverBrokerRequest, realtimeTableName);
-      handleExpressionOverride(serverPinotQuery, _tableCache.getExpressionOverrideMap(realtimeTableName));
-      handleTimestampIndexOverride(serverPinotQuery, realtimeTableConfig);
-      _queryOptimizer.optimize(serverPinotQuery, realtimeTableConfig, schema);
-      realtimeBrokerRequest = serverBrokerRequest;
+      // Validate the request
+      try {
+        validateRequest(serverPinotQuery, _queryResponseLimit);
+      } catch (Exception e) {
+        LOGGER.info("Caught exception while validating request {}: {}, {}", requestId, query, e.getMessage());
+        requestContext.setErrorCode(QueryException.QUERY_VALIDATION_ERROR_CODE);
+        _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERY_VALIDATION_EXCEPTIONS, 1);
+        return new BrokerResponseNative(QueryException.getException(QueryException.QUERY_VALIDATION_ERROR, e));
+      }
 
-      requestContext.setFanoutType(RequestContext.FanoutType.REALTIME);
-      requestContext.setRealtimeServerTenant(getServerTenant(realtimeTableName));
-    }
+      _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERIES, 1);
+      _brokerMetrics.addValueToTableGauge(rawTableName, BrokerGauge.REQUEST_SIZE, query.length());
+
+      // Prepare OFFLINE and REALTIME requests
+      BrokerRequest offlineBrokerRequest = null;
+      BrokerRequest realtimeBrokerRequest = null;
+      TimeBoundaryInfo timeBoundaryInfo = null;
+      Schema schema = _tableCache.getSchema(rawTableName);
+      if (offlineTableName != null && realtimeTableName != null) {
+        // Time boundary info might be null when there is no segment in the offline table, query real-time side only
+        timeBoundaryInfo = _routingManager.getTimeBoundaryInfo(offlineTableName);
+        if (timeBoundaryInfo == null) {
+          LOGGER.debug("No time boundary info found for hybrid table: {}", rawTableName);
+          offlineTableName = null;
+        }
+      }
+      if (offlineTableName != null && realtimeTableName != null) {
+        // Hybrid
+        PinotQuery offlinePinotQuery = serverPinotQuery.deepCopy();
+        offlinePinotQuery.getDataSource().setTableName(offlineTableName);
+        attachTimeBoundary(offlinePinotQuery, timeBoundaryInfo, true);
+        handleExpressionOverride(offlinePinotQuery, _tableCache.getExpressionOverrideMap(offlineTableName));
+        handleTimestampIndexOverride(offlinePinotQuery, offlineTableConfig);
+        _queryOptimizer.optimize(offlinePinotQuery, offlineTableConfig, schema);
+        offlineBrokerRequest = CalciteSqlCompiler.convertToBrokerRequest(offlinePinotQuery);
+
+        PinotQuery realtimePinotQuery = serverPinotQuery.deepCopy();
+        realtimePinotQuery.getDataSource().setTableName(realtimeTableName);
+        attachTimeBoundary(realtimePinotQuery, timeBoundaryInfo, false);
+        handleExpressionOverride(realtimePinotQuery, _tableCache.getExpressionOverrideMap(realtimeTableName));
+        handleTimestampIndexOverride(realtimePinotQuery, realtimeTableConfig);
+        _queryOptimizer.optimize(realtimePinotQuery, realtimeTableConfig, schema);
+        realtimeBrokerRequest = CalciteSqlCompiler.convertToBrokerRequest(realtimePinotQuery);
+
+        requestContext.setFanoutType(RequestContext.FanoutType.HYBRID);
+        requestContext.setOfflineServerTenant(getServerTenant(offlineTableName));
+        requestContext.setRealtimeServerTenant(getServerTenant(realtimeTableName));
+      } else if (offlineTableName != null) {
+        // OFFLINE only
+        setTableName(serverBrokerRequest, offlineTableName);
+        handleExpressionOverride(serverPinotQuery, _tableCache.getExpressionOverrideMap(offlineTableName));
+        handleTimestampIndexOverride(serverPinotQuery, offlineTableConfig);
+        _queryOptimizer.optimize(serverPinotQuery, offlineTableConfig, schema);
+        offlineBrokerRequest = serverBrokerRequest;
+
+        requestContext.setFanoutType(RequestContext.FanoutType.OFFLINE);
+        requestContext.setOfflineServerTenant(getServerTenant(offlineTableName));
+      } else {
+        // REALTIME only
+        setTableName(serverBrokerRequest, realtimeTableName);
+        handleExpressionOverride(serverPinotQuery, _tableCache.getExpressionOverrideMap(realtimeTableName));
+        handleTimestampIndexOverride(serverPinotQuery, realtimeTableConfig);
+        _queryOptimizer.optimize(serverPinotQuery, realtimeTableConfig, schema);
+        realtimeBrokerRequest = serverBrokerRequest;
+
+        requestContext.setFanoutType(RequestContext.FanoutType.REALTIME);
+        requestContext.setRealtimeServerTenant(getServerTenant(realtimeTableName));
+      }
 
-    // Check if response can be sent without server query evaluation.
-    if (offlineBrokerRequest != null && isFilterAlwaysFalse(offlineBrokerRequest.getPinotQuery())) {
-      // We don't need to evaluate offline request
-      offlineBrokerRequest = null;
-    }
-    if (realtimeBrokerRequest != null && isFilterAlwaysFalse(realtimeBrokerRequest.getPinotQuery())) {
-      // We don't need to evaluate realtime request
-      realtimeBrokerRequest = null;
-    }
+      // Check if response can be sent without server query evaluation.
+      if (offlineBrokerRequest != null && isFilterAlwaysFalse(offlineBrokerRequest.getPinotQuery())) {
+        // We don't need to evaluate offline request
+        offlineBrokerRequest = null;
+      }
+      if (realtimeBrokerRequest != null && isFilterAlwaysFalse(realtimeBrokerRequest.getPinotQuery())) {
+        // We don't need to evaluate realtime request
+        realtimeBrokerRequest = null;
+      }
 
-    if (offlineBrokerRequest == null && realtimeBrokerRequest == null) {
-      if (pinotQuery.isExplain()) {
-        // EXPLAIN PLAN results to show that query is evaluated exclusively by Broker.
-        return BrokerResponseNative.BROKER_ONLY_EXPLAIN_PLAN_OUTPUT;
+      if (offlineBrokerRequest == null && realtimeBrokerRequest == null) {
+        return getEmptyBrokerOnlyResponse(requestId, query, requesterIdentity, requestContext, pinotQuery, tableName);
       }
 
-      // Send empty response since we don't need to evaluate either offline or realtime request.
-      BrokerResponseNative brokerResponse = BrokerResponseNative.empty();
-      // Extract source info from incoming request
-      _queryLogger.log(new QueryLogger.QueryLogParams(requestId, query, requestContext, tableName, 0, new ServerStats(),
-          brokerResponse, System.nanoTime(), requesterIdentity));
-      return brokerResponse;
-    }
+      if (offlineBrokerRequest != null && isFilterAlwaysTrue(offlineBrokerRequest.getPinotQuery())) {
+        // Drop offline request filter since it is always true
+        offlineBrokerRequest.getPinotQuery().setFilterExpression(null);
+      }
+      if (realtimeBrokerRequest != null && isFilterAlwaysTrue(realtimeBrokerRequest.getPinotQuery())) {
+        // Drop realtime request filter since it is always true
+        realtimeBrokerRequest.getPinotQuery().setFilterExpression(null);
+      }
 
-    if (offlineBrokerRequest != null && isFilterAlwaysTrue(offlineBrokerRequest.getPinotQuery())) {
-      // Drop offline request filter since it is always true
-      offlineBrokerRequest.getPinotQuery().setFilterExpression(null);
-    }
-    if (realtimeBrokerRequest != null && isFilterAlwaysTrue(realtimeBrokerRequest.getPinotQuery())) {
-      // Drop realtime request filter since it is always true
-      realtimeBrokerRequest.getPinotQuery().setFilterExpression(null);
-    }
-
-    // Calculate routing table for the query
-    // TODO: Modify RoutingManager interface to directly take PinotQuery
-    long routingStartTimeNs = System.nanoTime();
-    Map<ServerInstance, List<String>> offlineRoutingTable = null;
-    Map<ServerInstance, List<String>> realtimeRoutingTable = null;
-    List<String> unavailableSegments = new ArrayList<>();
-    int numPrunedSegmentsTotal = 0;
-    if (offlineBrokerRequest != null) {
-      // NOTE: Routing table might be null if table is just removed
-      RoutingTable routingTable = _routingManager.getRoutingTable(offlineBrokerRequest, requestId);
-      if (routingTable != null) {
-        unavailableSegments.addAll(routingTable.getUnavailableSegments());
-        Map<ServerInstance, List<String>> serverInstanceToSegmentsMap = routingTable.getServerInstanceToSegmentsMap();
-        if (!serverInstanceToSegmentsMap.isEmpty()) {
-          offlineRoutingTable = serverInstanceToSegmentsMap;
+      // Calculate routing table for the query
+      // TODO: Modify RoutingManager interface to directly take PinotQuery
+      long routingStartTimeNs = System.nanoTime();
+      Map<ServerInstance, List<String>> offlineRoutingTable = null;
+      Map<ServerInstance, List<String>> realtimeRoutingTable = null;
+      List<String> unavailableSegments = new ArrayList<>();
+      int numPrunedSegmentsTotal = 0;
+      if (offlineBrokerRequest != null) {
+        // NOTE: Routing table might be null if table is just removed
+        RoutingTable routingTable = _routingManager.getRoutingTable(offlineBrokerRequest, requestId);
+        if (routingTable != null) {
+          unavailableSegments.addAll(routingTable.getUnavailableSegments());
+          Map<ServerInstance, List<String>> serverInstanceToSegmentsMap = routingTable.getServerInstanceToSegmentsMap();
+          if (!serverInstanceToSegmentsMap.isEmpty()) {
+            offlineRoutingTable = serverInstanceToSegmentsMap;
+          } else {
+            offlineBrokerRequest = null;
+          }
+          numPrunedSegmentsTotal += routingTable.getNumPrunedSegments();
         } else {
           offlineBrokerRequest = null;
         }
-        numPrunedSegmentsTotal += routingTable.getNumPrunedSegments();
-      } else {
-        offlineBrokerRequest = null;
       }
-    }
-    if (realtimeBrokerRequest != null) {
-      // NOTE: Routing table might be null if table is just removed
-      RoutingTable routingTable = _routingManager.getRoutingTable(realtimeBrokerRequest, requestId);
-      if (routingTable != null) {
-        unavailableSegments.addAll(routingTable.getUnavailableSegments());
-        Map<ServerInstance, List<String>> serverInstanceToSegmentsMap = routingTable.getServerInstanceToSegmentsMap();
-        if (!serverInstanceToSegmentsMap.isEmpty()) {
-          realtimeRoutingTable = serverInstanceToSegmentsMap;
+      if (realtimeBrokerRequest != null) {
+        // NOTE: Routing table might be null if table is just removed
+        RoutingTable routingTable = _routingManager.getRoutingTable(realtimeBrokerRequest, requestId);
+        if (routingTable != null) {
+          unavailableSegments.addAll(routingTable.getUnavailableSegments());
+          Map<ServerInstance, List<String>> serverInstanceToSegmentsMap = routingTable.getServerInstanceToSegmentsMap();
+          if (!serverInstanceToSegmentsMap.isEmpty()) {
+            realtimeRoutingTable = serverInstanceToSegmentsMap;
+          } else {
+            realtimeBrokerRequest = null;
+          }
+          numPrunedSegmentsTotal += routingTable.getNumPrunedSegments();
         } else {
           realtimeBrokerRequest = null;
         }
-        numPrunedSegmentsTotal += routingTable.getNumPrunedSegments();
-      } else {
-        realtimeBrokerRequest = null;
       }
-    }
-    int numUnavailableSegments = unavailableSegments.size();
-    requestContext.setNumUnavailableSegments(numUnavailableSegments);
+      int numUnavailableSegments = unavailableSegments.size();
+      requestContext.setNumUnavailableSegments(numUnavailableSegments);
+
+      List<ProcessingException> exceptions = new ArrayList<>();
+      if (numUnavailableSegments > 0) {
+        String errorMessage;
+        if (numUnavailableSegments > MAX_UNAVAILABLE_SEGMENTS_TO_PRINT_IN_QUERY_EXCEPTION) {
+          errorMessage = String.format("%d segments unavailable, sampling %d: %s", numUnavailableSegments,
+              MAX_UNAVAILABLE_SEGMENTS_TO_PRINT_IN_QUERY_EXCEPTION,
+              unavailableSegments.subList(0, MAX_UNAVAILABLE_SEGMENTS_TO_PRINT_IN_QUERY_EXCEPTION));
+        } else {
+          errorMessage = String.format("%d segments unavailable: %s", numUnavailableSegments, unavailableSegments);
+        }
+        exceptions.add(QueryException.getException(QueryException.BROKER_SEGMENT_UNAVAILABLE_ERROR, errorMessage));
+      }
 
-    List<ProcessingException> exceptions = new ArrayList<>();
-    if (numUnavailableSegments > 0) {
-      String errorMessage;
-      if (numUnavailableSegments > MAX_UNAVAILABLE_SEGMENTS_TO_PRINT_IN_QUERY_EXCEPTION) {
-        errorMessage = String.format("%d segments unavailable, sampling %d: %s", numUnavailableSegments,
-            MAX_UNAVAILABLE_SEGMENTS_TO_PRINT_IN_QUERY_EXCEPTION,
-            unavailableSegments.subList(0, MAX_UNAVAILABLE_SEGMENTS_TO_PRINT_IN_QUERY_EXCEPTION));
+      if (offlineBrokerRequest == null && realtimeBrokerRequest == null) {
+        if (!exceptions.isEmpty()) {
+          LOGGER.info("No server found for request {}: {}", requestId, query);
+          _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.NO_SERVER_FOUND_EXCEPTIONS, 1);
+          return new BrokerResponseNative(exceptions);
+        } else {
+          // When all segments have been pruned, we can just return an empty response.
+          return getEmptyBrokerOnlyResponse(requestId, query, requesterIdentity, requestContext, pinotQuery,
+              tableName);
+        }
+      }
+      long routingEndTimeNs = System.nanoTime();
+      _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.QUERY_ROUTING,
+          routingEndTimeNs - routingStartTimeNs);
+
+      // Set timeout in the requests
+      long timeSpentMs = TimeUnit.NANOSECONDS.toMillis(routingEndTimeNs - compilationStartTimeNs);
+      // Remaining time in milliseconds for the server query execution
+      // NOTE: For hybrid use case, in most cases offline table and real-time table should have the same query timeout
+      //       configured, but if necessary, we also allow different timeout for them.
+      //       If the timeout is not the same for offline table and real-time table, use the max of offline table
+      //       remaining time and realtime table remaining time. Server side will have different remaining time set for
+      //       each table type, and broker should wait for both types to return.
+      long remainingTimeMs = 0;
+      try {
+        if (offlineBrokerRequest != null) {
+          remainingTimeMs =
+              setQueryTimeout(offlineTableName, offlineBrokerRequest.getPinotQuery().getQueryOptions(), timeSpentMs);
+        }
+        if (realtimeBrokerRequest != null) {
+          remainingTimeMs = Math.max(remainingTimeMs,
+              setQueryTimeout(realtimeTableName, realtimeBrokerRequest.getPinotQuery().getQueryOptions(), timeSpentMs));
+        }
+      } catch (TimeoutException e) {
+        String errorMessage = e.getMessage();
+        LOGGER.info("{} {}: {}", errorMessage, requestId, query);
+        _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.REQUEST_TIMEOUT_BEFORE_SCATTERED_EXCEPTIONS, 1);
+        exceptions.add(QueryException.getException(QueryException.BROKER_TIMEOUT_ERROR, errorMessage));
+        return new BrokerResponseNative(exceptions);
+      }
+
+      // Execute the query
+      // TODO: Replace ServerStats with ServerRoutingStatsEntry.
+      ServerStats serverStats = new ServerStats();
+      // TODO: Handle broker specific operations for explain plan queries such as:
+      //       - Alias handling
+      //       - Compile time function invocation
+      //       - Literal only queries
+      //       - Any rewrites
+      if (pinotQuery.isExplain()) {
+        // Update routing tables to only send request to offline servers for OFFLINE and HYBRID tables.
+        // TODO: Assess if the Explain Plan Query should also be routed to REALTIME servers for HYBRID tables
+        if (offlineRoutingTable != null) {
+          // For OFFLINE and HYBRID tables, don't send EXPLAIN query to realtime servers.
+          realtimeBrokerRequest = null;
+          realtimeRoutingTable = null;
+        }
+      }
+      BrokerResponseNative brokerResponse;
+      if (_queriesById != null) {
+        // Start to track the running query for cancellation just before sending it out to servers to avoid any
+        // potential failures that could happen before sending it out, like failures to calculate the routing table etc.
+        // TODO: Even tracking the query as late as here, a potential race condition between calling cancel API and
+        //       query being sent out to servers can still happen. If cancel request arrives earlier than query being
+        //       sent out to servers, the servers miss the cancel request and continue to run the queries. The users
+        //       can always list the running queries and cancel query again until it ends. Just that such race
+        //       condition makes cancel API less reliable. This should be rare as it assumes sending queries out to
+        //       servers takes time, but will address later if needed.
+        _queriesById.put(requestId, new QueryServers(query, offlineRoutingTable, realtimeRoutingTable));
+        LOGGER.debug("Keep track of running query: {}", requestId);
+        try {
+          brokerResponse = processBrokerRequest(requestId, brokerRequest, serverBrokerRequest, offlineBrokerRequest,
+              offlineRoutingTable, realtimeBrokerRequest, realtimeRoutingTable, remainingTimeMs, serverStats,
+              requestContext);
+        } finally {
+          _queriesById.remove(requestId);
+          LOGGER.debug("Remove track of running query: {}", requestId);
+        }
       } else {
-        errorMessage = String.format("%d segments unavailable: %s", numUnavailableSegments, unavailableSegments);
+        brokerResponse =
+            processBrokerRequest(requestId, brokerRequest, serverBrokerRequest, offlineBrokerRequest,
+                offlineRoutingTable,
+                realtimeBrokerRequest, realtimeRoutingTable, remainingTimeMs, serverStats, requestContext);
       }
-      exceptions.add(QueryException.getException(QueryException.BROKER_SEGMENT_UNAVAILABLE_ERROR, errorMessage));
-    }
 
-    if (offlineBrokerRequest == null && realtimeBrokerRequest == null) {
-      LOGGER.info("No server found for request {}: {}", requestId, query);
-      _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.NO_SERVER_FOUND_EXCEPTIONS, 1);
-      return new BrokerResponseNative(exceptions);
-    }
-    long routingEndTimeNs = System.nanoTime();
-    _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.QUERY_ROUTING, routingEndTimeNs - routingStartTimeNs);
+      brokerResponse.setExceptions(exceptions);
+      brokerResponse.setNumSegmentsPrunedByBroker(numPrunedSegmentsTotal);
+      long executionEndTimeNs = System.nanoTime();
+      _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.QUERY_EXECUTION,
+          executionEndTimeNs - routingEndTimeNs);
 
-    // Set timeout in the requests
-    long timeSpentMs = TimeUnit.NANOSECONDS.toMillis(routingEndTimeNs - compilationStartTimeNs);
-    // Remaining time in milliseconds for the server query execution
-    // NOTE: For hybrid use case, in most cases offline table and real-time table should have the same query timeout
-    //       configured, but if necessary, we also allow different timeout for them.
-    //       If the timeout is not the same for offline table and real-time table, use the max of offline table
-    //       remaining time and realtime table remaining time. Server side will have different remaining time set for
-    //       each table type, and broker should wait for both types to return.
-    long remainingTimeMs = 0;
-    try {
-      if (offlineBrokerRequest != null) {
-        remainingTimeMs =
-            setQueryTimeout(offlineTableName, offlineBrokerRequest.getPinotQuery().getQueryOptions(), timeSpentMs);
+      // Track number of queries with number of groups limit reached
+      if (brokerResponse.isNumGroupsLimitReached()) {
+        _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.BROKER_RESPONSES_WITH_NUM_GROUPS_LIMIT_REACHED,
+            1);
       }
-      if (realtimeBrokerRequest != null) {
-        remainingTimeMs = Math.max(remainingTimeMs,
-            setQueryTimeout(realtimeTableName, realtimeBrokerRequest.getPinotQuery().getQueryOptions(), timeSpentMs));
-      }
-    } catch (TimeoutException e) {
-      String errorMessage = e.getMessage();
-      LOGGER.info("{} {}: {}", errorMessage, requestId, query);
-      _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.REQUEST_TIMEOUT_BEFORE_SCATTERED_EXCEPTIONS, 1);
-      exceptions.add(QueryException.getException(QueryException.BROKER_TIMEOUT_ERROR, errorMessage));
-      return new BrokerResponseNative(exceptions);
-    }
-
-    // Execute the query
-    // TODO: Replace ServerStats with ServerRoutingStatsEntry.
-    ServerStats serverStats = new ServerStats();
-    // TODO: Handle broker specific operations for explain plan queries such as:
-    //       - Alias handling
-    //       - Compile time function invocation
-    //       - Literal only queries
-    //       - Any rewrites
-    if (pinotQuery.isExplain()) {
-      // Update routing tables to only send request to offline servers for OFFLINE and HYBRID tables.
-      // TODO: Assess if the Explain Plan Query should also be routed to REALTIME servers for HYBRID tables
-      if (offlineRoutingTable != null) {
-        // For OFFLINE and HYBRID tables, don't send EXPLAIN query to realtime servers.
-        realtimeBrokerRequest = null;
-        realtimeRoutingTable = null;
-      }
-    }
-    BrokerResponseNative brokerResponse;
-    if (_queriesById != null) {
-      // Start to track the running query for cancellation just before sending it out to servers to avoid any potential
-      // failures that could happen before sending it out, like failures to calculate the routing table etc.
-      // TODO: Even tracking the query as late as here, a potential race condition between calling cancel API and
-      //       query being sent out to servers can still happen. If cancel request arrives earlier than query being
-      //       sent out to servers, the servers miss the cancel request and continue to run the queries. The users
-      //       can always list the running queries and cancel query again until it ends. Just that such race
-      //       condition makes cancel API less reliable. This should be rare as it assumes sending queries out to
-      //       servers takes time, but will address later if needed.
-      _queriesById.put(requestId, new QueryServers(query, offlineRoutingTable, realtimeRoutingTable));
-      LOGGER.debug("Keep track of running query: {}", requestId);
-      try {
-        brokerResponse = processBrokerRequest(requestId, brokerRequest, serverBrokerRequest, offlineBrokerRequest,
-            offlineRoutingTable, realtimeBrokerRequest, realtimeRoutingTable, remainingTimeMs, serverStats,
-            requestContext);
-      } finally {
-        _queriesById.remove(requestId);
-        LOGGER.debug("Remove track of running query: {}", requestId);
-      }
-    } else {
-      brokerResponse =
-          processBrokerRequest(requestId, brokerRequest, serverBrokerRequest, offlineBrokerRequest, offlineRoutingTable,
-              realtimeBrokerRequest, realtimeRoutingTable, remainingTimeMs, serverStats, requestContext);
-    }
 
-    brokerResponse.setExceptions(exceptions);
-    brokerResponse.setNumSegmentsPrunedByBroker(numPrunedSegmentsTotal);
-    long executionEndTimeNs = System.nanoTime();
-    _brokerMetrics.addPhaseTiming(rawTableName, BrokerQueryPhase.QUERY_EXECUTION,
-        executionEndTimeNs - routingEndTimeNs);
+      // Set total query processing time
+      long totalTimeMs = TimeUnit.NANOSECONDS.toMillis(executionEndTimeNs - compilationStartTimeNs);
+      brokerResponse.setTimeUsedMs(totalTimeMs);
+      requestContext.setQueryProcessingTime(totalTimeMs);
+      augmentStatistics(requestContext, brokerResponse);
+      _brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.QUERY_TOTAL_TIME_MS, totalTimeMs,
+          TimeUnit.MILLISECONDS);
 
-    // Track number of queries with number of groups limit reached
-    if (brokerResponse.isNumGroupsLimitReached()) {
-      _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.BROKER_RESPONSES_WITH_NUM_GROUPS_LIMIT_REACHED, 1);
+      // Extract source info from incoming request
+      _queryLogger.log(
+          new QueryLogger.QueryLogParams(requestId, query, requestContext, tableName, numUnavailableSegments,
+              serverStats,
+              brokerResponse, totalTimeMs, requesterIdentity));
+
+      return brokerResponse;
+    } finally {
+      Tracing.ThreadAccountantOps.clear();
     }
+  }
 
-    // Set total query processing time
-    long totalTimeMs = TimeUnit.NANOSECONDS.toMillis(executionEndTimeNs - compilationStartTimeNs);
-    brokerResponse.setTimeUsedMs(totalTimeMs);
-    requestContext.setQueryProcessingTime(totalTimeMs);
-    augmentStatistics(requestContext, brokerResponse);
-    _brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.QUERY_TOTAL_TIME_MS, totalTimeMs,
-        TimeUnit.MILLISECONDS);
+  private BrokerResponseNative getEmptyBrokerOnlyResponse(long requestId, String query,
+      RequesterIdentity requesterIdentity, RequestContext requestContext, PinotQuery pinotQuery, String tableName) {
+    if (pinotQuery.isExplain()) {
+      // EXPLAIN PLAN results to show that query is evaluated exclusively by Broker.
+      return BrokerResponseNative.BROKER_ONLY_EXPLAIN_PLAN_OUTPUT;
+    }
 
+    // Send empty response since we don't need to evaluate either offline or realtime request.
+    BrokerResponseNative brokerResponse = BrokerResponseNative.empty();
     // Extract source info from incoming request
-    _queryLogger.log(
-        new QueryLogger.QueryLogParams(requestId, query, requestContext, tableName, numUnavailableSegments, serverStats,
-            brokerResponse, totalTimeMs, requesterIdentity));
+    _queryLogger.log(new QueryLogger.QueryLogParams(requestId, query, requestContext, tableName, 0, new ServerStats(),
+        brokerResponse, System.nanoTime(), requesterIdentity));
     return brokerResponse;
   }
 
@@ -1322,6 +1374,10 @@ private void computeResultsForLiteral(Literal literal, List<String> columnNames,
         columnTypes.add(DataSchema.ColumnDataType.BYTES);
         row.add(BytesUtils.toHexString(literal.getBinaryValue()));
         break;
+      case NULL_VALUE:
+        columnTypes.add(DataSchema.ColumnDataType.UNKNOWN);
+        row.add(null);
+        break;
       default:
         break;
     }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
index 3e6a0598bea..360291ec69f 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
@@ -47,15 +47,15 @@ public class BrokerRequestHandlerDelegate implements BrokerRequestHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(BrokerRequestHandlerDelegate.class);
 
   private final BrokerRequestHandler _singleStageBrokerRequestHandler;
-  private final BrokerRequestHandler _multiStageWorkerRequestHandler;
+  private final BrokerRequestHandler _multiStageBrokerRequestHandler;
   private final BrokerMetrics _brokerMetrics;
   private final String _brokerId;
 
   public BrokerRequestHandlerDelegate(String brokerId, BrokerRequestHandler singleStageBrokerRequestHandler,
-      @Nullable BrokerRequestHandler multiStageWorkerRequestHandler, BrokerMetrics brokerMetrics) {
+      @Nullable BrokerRequestHandler multiStageBrokerRequestHandler, BrokerMetrics brokerMetrics) {
     _brokerId = brokerId;
     _singleStageBrokerRequestHandler = singleStageBrokerRequestHandler;
-    _multiStageWorkerRequestHandler = multiStageWorkerRequestHandler;
+    _multiStageBrokerRequestHandler = multiStageBrokerRequestHandler;
     _brokerMetrics = brokerMetrics;
   }
 
@@ -64,8 +64,8 @@ public void start() {
     if (_singleStageBrokerRequestHandler != null) {
       _singleStageBrokerRequestHandler.start();
     }
-    if (_multiStageWorkerRequestHandler != null) {
-      _multiStageWorkerRequestHandler.start();
+    if (_multiStageBrokerRequestHandler != null) {
+      _multiStageBrokerRequestHandler.start();
     }
   }
 
@@ -74,8 +74,8 @@ public void shutDown() {
     if (_singleStageBrokerRequestHandler != null) {
       _singleStageBrokerRequestHandler.shutDown();
     }
-    if (_multiStageWorkerRequestHandler != null) {
-      _multiStageWorkerRequestHandler.shutDown();
+    if (_multiStageBrokerRequestHandler != null) {
+      _multiStageBrokerRequestHandler.shutDown();
     }
   }
 
@@ -99,9 +99,9 @@ public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOption
           CommonConstants.Broker.Request.QUERY_OPTIONS));
     }
 
-    if (_multiStageWorkerRequestHandler != null && Boolean.parseBoolean(sqlNodeAndOptions.getOptions().get(
+    if (_multiStageBrokerRequestHandler != null && Boolean.parseBoolean(sqlNodeAndOptions.getOptions().get(
           CommonConstants.Broker.Request.QueryOptionKey.USE_MULTISTAGE_ENGINE))) {
-        return _multiStageWorkerRequestHandler.handleRequest(request, requesterIdentity, requestContext);
+        return _multiStageBrokerRequestHandler.handleRequest(request, requesterIdentity, requestContext);
     } else {
       return _singleStageBrokerRequestHandler.handleRequest(request, sqlNodeAndOptions, requesterIdentity,
           requestContext);
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestIdGenerator.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestIdGenerator.java
new file mode 100644
index 00000000000..c97ee44a0af
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestIdGenerator.java
@@ -0,0 +1,49 @@
+/**
+ * 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.pinot.broker.requesthandler;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * An ID generator to produce a global unique identifier for each query, used in v1/v2 engine for tracking and
+ * inter-stage communication(v2 only). It's guaranteed by:
+ * <ol>
+ *   <li>
+ *     Using a mask computed using the hash-code of the broker-id to ensure two brokers don't arrive at the same
+ *     requestId. This mask becomes the most significant 9 digits (in base-10).
+ *   </li>
+ *   <li>
+ *     Using a auto-incrementing counter for the least significant 9 digits (in base-10).
+ *   </li>
+ * </ol>
+ */
+public class BrokerRequestIdGenerator {
+  private static final long OFFSET = 1_000_000_000L;
+  private final long _mask;
+  private final AtomicLong _incrementingId = new AtomicLong(0);
+
+  public BrokerRequestIdGenerator(String brokerId) {
+    _mask = ((long) (brokerId.hashCode() & Integer.MAX_VALUE)) * OFFSET;
+  }
+
+  public long get() {
+    long normalized = (_incrementingId.getAndIncrement() & Long.MAX_VALUE) % OFFSET;
+    return _mask + normalized;
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
index f5295bad52f..27e48e2ed70 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
@@ -20,10 +20,15 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
 import org.apache.calcite.jdbc.CalciteSchemaBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.broker.api.RequesterIdentity;
@@ -34,29 +39,35 @@
 import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.common.metrics.BrokerMeter;
 import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.BrokerQueryPhase;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.response.BrokerResponse;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.broker.BrokerResponseNativeV2;
+import org.apache.pinot.common.response.broker.BrokerResponseStats;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.NamedThreadFactory;
 import org.apache.pinot.common.utils.config.QueryOptionsUtils;
 import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.core.query.reduce.ExecutionStatsAggregator;
 import org.apache.pinot.core.transport.ServerInstance;
 import org.apache.pinot.query.QueryEnvironment;
 import org.apache.pinot.query.catalog.PinotCatalog;
 import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.mailbox.MultiplexingMailboxService;
-import org.apache.pinot.query.planner.QueryPlan;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
 import org.apache.pinot.query.routing.WorkerManager;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
+import org.apache.pinot.query.runtime.executor.RoundRobinScheduler;
 import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.query.service.QueryDispatcher;
+import org.apache.pinot.query.service.dispatch.QueryDispatcher;
 import org.apache.pinot.query.type.TypeFactory;
 import org.apache.pinot.query.type.TypeSystem;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
 import org.apache.pinot.spi.trace.RequestContext;
 import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,7 +79,9 @@ public class MultiStageBrokerRequestHandler extends BaseBrokerRequestHandler {
   private final int _reducerPort;
   private final long _defaultBrokerTimeoutMs;
 
-  private final MailboxService<TransferableBlock> _mailboxService;
+  private final MailboxService _mailboxService;
+  private final OpChainSchedulerService _reducerScheduler;
+
   private final QueryEnvironment _queryEnvironment;
   private final QueryDispatcher _queryDispatcher;
 
@@ -83,12 +96,13 @@ public MultiStageBrokerRequestHandler(PinotConfiguration config, String brokerId
       // use broker ID as host name, but remove the
       String brokerId = brokerIdFromConfig;
       brokerId = brokerId.startsWith(CommonConstants.Helix.PREFIX_OF_BROKER_INSTANCE) ? brokerId.substring(
-          CommonConstants.Helix.SERVER_INSTANCE_PREFIX_LENGTH) : brokerId;
+          CommonConstants.Helix.BROKER_INSTANCE_PREFIX_LENGTH) : brokerId;
       brokerId = StringUtils.split(brokerId, "_").length > 1 ? StringUtils.split(brokerId, "_")[0] : brokerId;
       reducerHostname = brokerId;
     }
     _reducerHostname = reducerHostname;
-    _reducerPort = config.getProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, QueryConfig.DEFAULT_QUERY_RUNNER_PORT);
+    // This config has to be set to a valid port number.
+    _reducerPort = Integer.parseInt(config.getProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT));
     _defaultBrokerTimeoutMs = config.getProperty(CommonConstants.Broker.CONFIG_OF_BROKER_TIMEOUT_MS,
         CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS);
     _queryEnvironment = new QueryEnvironment(new TypeFactory(new TypeSystem()),
@@ -96,12 +110,14 @@ public MultiStageBrokerRequestHandler(PinotConfiguration config, String brokerId
         new WorkerManager(_reducerHostname, _reducerPort, routingManager), _tableCache);
     _queryDispatcher = new QueryDispatcher();
 
-    // it is OK to ignore the onDataAvailable callback because the broker top-level operators
-    // always run in-line (they don't have any scheduler)
-    _mailboxService = MultiplexingMailboxService.newInstance(_reducerHostname, _reducerPort, config, ignored -> {
-    });
+    long releaseMs = config.getProperty(QueryConfig.KEY_OF_SCHEDULER_RELEASE_TIMEOUT_MS,
+        QueryConfig.DEFAULT_SCHEDULER_RELEASE_TIMEOUT_MS);
+    _reducerScheduler = new OpChainSchedulerService(new RoundRobinScheduler(releaseMs),
+        Executors.newCachedThreadPool(new NamedThreadFactory("query_broker_reducer_" + _reducerPort + "_port")));
+    _mailboxService = new MailboxService(_reducerHostname, _reducerPort, config, _reducerScheduler::onDataAvailable);
 
     // TODO: move this to a startUp() function.
+    _reducerScheduler.startAsync();
     _mailboxService.start();
   }
 
@@ -109,7 +125,7 @@ public MultiStageBrokerRequestHandler(PinotConfiguration config, String brokerId
   public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOptions sqlNodeAndOptions,
       @Nullable RequesterIdentity requesterIdentity, RequestContext requestContext)
       throws Exception {
-    long requestId = _requestIdGenerator.incrementAndGet();
+    long requestId = _brokerIdGenerator.get();
     requestContext.setRequestId(requestId);
     requestContext.setRequestArrivalTimeMillis(System.currentTimeMillis());
 
@@ -120,7 +136,7 @@ public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOption
       _brokerMetrics.addMeteredGlobalValue(BrokerMeter.REQUEST_DROPPED_DUE_TO_ACCESS_ERROR, 1);
       LOGGER.info("Access denied for requestId {}", requestId);
       requestContext.setErrorCode(QueryException.ACCESS_DENIED_ERROR_CODE);
-      return new BrokerResponseNative(QueryException.ACCESS_DENIED_ERROR);
+      throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
     }
 
     JsonNode sql = request.get(CommonConstants.Broker.Request.SQL);
@@ -132,15 +148,14 @@ public BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOption
     return handleRequest(requestId, query, sqlNodeAndOptions, request, requesterIdentity, requestContext);
   }
 
-  private BrokerResponseNative handleRequest(long requestId, String query,
-      @Nullable SqlNodeAndOptions sqlNodeAndOptions, JsonNode request, @Nullable RequesterIdentity requesterIdentity,
-      RequestContext requestContext)
+  private BrokerResponse handleRequest(long requestId, String query, @Nullable SqlNodeAndOptions sqlNodeAndOptions,
+      JsonNode request, @Nullable RequesterIdentity requesterIdentity, RequestContext requestContext)
       throws Exception {
     LOGGER.debug("SQL query for request {}: {}", requestId, query);
 
     long compilationStartTimeNs;
     long queryTimeoutMs;
-    QueryPlan queryPlan;
+    QueryEnvironment.QueryPlannerResult queryPlanResult;
     try {
       // Parse the request
       sqlNodeAndOptions = sqlNodeAndOptions != null ? sqlNodeAndOptions : RequestUtils.parseQuery(query, request);
@@ -150,42 +165,140 @@ private BrokerResponseNative handleRequest(long requestId, String query,
       compilationStartTimeNs = System.nanoTime();
       switch (sqlNodeAndOptions.getSqlNode().getKind()) {
         case EXPLAIN:
-          String plan = _queryEnvironment.explainQuery(query, sqlNodeAndOptions);
+          queryPlanResult = _queryEnvironment.explainQuery(query, sqlNodeAndOptions, requestId);
+          String plan = queryPlanResult.getExplainPlan();
+          Set<String> tableNames = queryPlanResult.getTableNames();
+          if (!hasTableAccess(requesterIdentity, tableNames, requestId, requestContext)) {
+            throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
+          }
+
           return constructMultistageExplainPlan(query, plan);
         case SELECT:
         default:
-          queryPlan = _queryEnvironment.planQuery(query, sqlNodeAndOptions, requestId);
+          queryPlanResult = _queryEnvironment.planQuery(query, sqlNodeAndOptions, requestId);
           break;
       }
     } catch (Exception e) {
       LOGGER.info("Caught exception while compiling SQL request {}: {}, {}", requestId, query, e.getMessage());
       _brokerMetrics.addMeteredGlobalValue(BrokerMeter.REQUEST_COMPILATION_EXCEPTIONS, 1);
       requestContext.setErrorCode(QueryException.SQL_PARSING_ERROR_CODE);
-      return new BrokerResponseNative(QueryException.getException(QueryException.SQL_PARSING_ERROR, e));
+      return new BrokerResponseNative(QueryException.getException(QueryException.SQL_PARSING_ERROR, e.getMessage()));
+    }
+
+    DispatchableSubPlan dispatchableSubPlan = queryPlanResult.getQueryPlan();
+    Set<String> tableNames = queryPlanResult.getTableNames();
+
+    // Compilation Time. This includes the time taken for parsing, compiling, create stage plans and assigning workers.
+    long compilationEndTimeNs = System.nanoTime();
+    long compilationTimeNs = (compilationEndTimeNs - compilationStartTimeNs) + sqlNodeAndOptions.getParseTimeNs();
+    updatePhaseTimingForTables(tableNames, BrokerQueryPhase.REQUEST_COMPILATION, compilationTimeNs);
+
+    // Validate table access.
+    if (!hasTableAccess(requesterIdentity, tableNames, requestId, requestContext)) {
+      throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
+    }
+    updatePhaseTimingForTables(tableNames, BrokerQueryPhase.AUTHORIZATION, System.nanoTime() - compilationEndTimeNs);
+
+    // Validate QPS quota
+    if (hasExceededQPSQuota(tableNames, requestId, requestContext)) {
+      String errorMessage = String.format("Request %d: %s exceeds query quota.", requestId, query);
+      return new BrokerResponseNative(QueryException.getException(QueryException.QUOTA_EXCEEDED_ERROR, errorMessage));
     }
 
+    boolean traceEnabled = Boolean.parseBoolean(
+        request.has(CommonConstants.Broker.Request.TRACE) ? request.get(CommonConstants.Broker.Request.TRACE).asText()
+            : "false");
+
     ResultTable queryResults;
+    Map<Integer, ExecutionStatsAggregator> stageIdStatsMap = new HashMap<>();
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      stageIdStatsMap.put(stageId, new ExecutionStatsAggregator(traceEnabled));
+    }
+
+    long executionStartTimeNs = System.nanoTime();
     try {
-      queryResults = _queryDispatcher.submitAndReduce(requestId, queryPlan, _mailboxService, queryTimeoutMs,
-          sqlNodeAndOptions.getOptions());
-    } catch (Exception e) {
-      LOGGER.info("query execution failed", e);
-      return new BrokerResponseNative(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, e));
+      queryResults = _queryDispatcher.submitAndReduce(requestId, dispatchableSubPlan, _mailboxService,
+          _reducerScheduler,
+          queryTimeoutMs, sqlNodeAndOptions.getOptions(), stageIdStatsMap, traceEnabled);
+    } catch (Throwable t) {
+      LOGGER.error("query execution failed", t);
+      return new BrokerResponseNative(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, t));
     }
 
-    BrokerResponseNative brokerResponse = new BrokerResponseNative();
+    BrokerResponseNativeV2 brokerResponse = new BrokerResponseNativeV2();
     long executionEndTimeNs = System.nanoTime();
+    updatePhaseTimingForTables(tableNames, BrokerQueryPhase.QUERY_EXECUTION, executionEndTimeNs - executionStartTimeNs);
 
     // Set total query processing time
     long totalTimeMs = TimeUnit.NANOSECONDS.toMillis(
         sqlNodeAndOptions.getParseTimeNs() + (executionEndTimeNs - compilationStartTimeNs));
     brokerResponse.setTimeUsedMs(totalTimeMs);
     brokerResponse.setResultTable(queryResults);
+    brokerResponse.setRequestId(String.valueOf(requestId));
+
+    for (Map.Entry<Integer, ExecutionStatsAggregator> entry : stageIdStatsMap.entrySet()) {
+      if (entry.getKey() == 0) {
+        // Root stats are aggregated and added separately to broker response for backward compatibility
+        entry.getValue().setStats(brokerResponse);
+        continue;
+      }
+
+      BrokerResponseStats brokerResponseStats = new BrokerResponseStats();
+      if (!tableNames.isEmpty()) {
+        //TODO: Only using first table to assign broker metrics
+        // find a way to split metrics in case of multiple table
+        String rawTableName = TableNameBuilder.extractRawTableName(tableNames.iterator().next());
+        entry.getValue().setStageLevelStats(rawTableName, brokerResponseStats, _brokerMetrics);
+      } else {
+        entry.getValue().setStageLevelStats(null, brokerResponseStats, null);
+      }
+      brokerResponse.addStageStat(entry.getKey(), brokerResponseStats);
+    }
+
     requestContext.setQueryProcessingTime(totalTimeMs);
     augmentStatistics(requestContext, brokerResponse);
     return brokerResponse;
   }
 
+  /**
+   * Validates whether the requester has access to all the tables.
+   */
+  private boolean hasTableAccess(RequesterIdentity requesterIdentity, Set<String> tableNames, long requestId,
+      RequestContext requestContext) {
+    boolean hasAccess = _accessControlFactory.create().hasAccess(requesterIdentity, tableNames);
+    if (!hasAccess) {
+      _brokerMetrics.addMeteredGlobalValue(BrokerMeter.REQUEST_DROPPED_DUE_TO_ACCESS_ERROR, 1);
+      LOGGER.warn("Access denied for requestId {}", requestId);
+      requestContext.setErrorCode(QueryException.ACCESS_DENIED_ERROR_CODE);
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Returns true if the QPS quota of the tables has exceeded.
+   */
+  private boolean hasExceededQPSQuota(Set<String> tableNames, long requestId, RequestContext requestContext) {
+    for (String tableName : tableNames) {
+      if (!_queryQuotaManager.acquire(tableName)) {
+        LOGGER.warn("Request {}: query exceeds quota for table: {}", requestId, tableName);
+        requestContext.setErrorCode(QueryException.TOO_MANY_REQUESTS_ERROR_CODE);
+        String rawTableName = TableNameBuilder.extractRawTableName(tableName);
+        _brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.QUERY_QUOTA_EXCEEDED, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private void updatePhaseTimingForTables(Set<String> tableNames, BrokerQueryPhase phase, long time) {
+    for (String tableName : tableNames) {
+      String rawTableName = TableNameBuilder.extractRawTableName(tableName);
+      _brokerMetrics.addPhaseTiming(rawTableName, phase, time);
+    }
+  }
+
   private BrokerResponseNative constructMultistageExplainPlan(String sql, String plan) {
     BrokerResponseNative brokerResponse = BrokerResponseNative.empty();
     List<Object[]> rows = new ArrayList<>();
@@ -215,5 +328,6 @@ public void start() {
   public void shutDown() {
     _queryDispatcher.shutdown();
     _mailboxService.shutdown();
+    _reducerScheduler.stopAsync();
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/BrokerRoutingManager.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/BrokerRoutingManager.java
index 883e9cfb026..5ea2ea5373a 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/BrokerRoutingManager.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/BrokerRoutingManager.java
@@ -43,6 +43,9 @@
 import org.apache.pinot.broker.routing.adaptiveserverselector.AdaptiveServerSelectorFactory;
 import org.apache.pinot.broker.routing.instanceselector.InstanceSelector;
 import org.apache.pinot.broker.routing.instanceselector.InstanceSelectorFactory;
+import org.apache.pinot.broker.routing.segmentmetadata.SegmentZkMetadataFetchListener;
+import org.apache.pinot.broker.routing.segmentmetadata.SegmentZkMetadataFetcher;
+import org.apache.pinot.broker.routing.segmentpartition.SegmentPartitionMetadataManager;
 import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelector;
 import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelectorFactory;
 import org.apache.pinot.broker.routing.segmentpruner.SegmentPruner;
@@ -55,14 +58,20 @@
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.common.utils.config.TagNameUtils;
+import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.core.routing.RoutingManager;
 import org.apache.pinot.core.routing.RoutingTable;
+import org.apache.pinot.core.routing.TablePartitionInfo;
 import org.apache.pinot.core.routing.TimeBoundaryInfo;
 import org.apache.pinot.core.transport.ServerInstance;
 import org.apache.pinot.core.transport.server.routing.stats.ServerRoutingStatsManager;
+import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
 import org.apache.pinot.spi.config.table.QueryConfig;
+import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Helix;
 import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
 import org.apache.pinot.spi.utils.InstanceTypeUtils;
@@ -100,11 +109,16 @@ public class BrokerRoutingManager implements RoutingManager, ClusterChangeHandle
   private final ServerRoutingStatsManager _serverRoutingStatsManager;
   private final PinotConfiguration _pinotConfig;
 
+  // Map that contains the tableNameWithType as key and the enabled serverInstances that are tagged with the table's
+  // tenant.
+  private final Map<String, Map<String, ServerInstance>> _tableTenantServersMap = new ConcurrentHashMap<>();
+
   private BaseDataAccessor<ZNRecord> _zkDataAccessor;
   private String _externalViewPathPrefix;
   private String _idealStatePathPrefix;
   private String _instanceConfigsPath;
   private ZkHelixPropertyStore<ZNRecord> _propertyStore;
+  private HelixManager _helixManager;
 
   private Set<String> _routableServers;
 
@@ -123,6 +137,7 @@ public void init(HelixManager helixManager) {
     _idealStatePathPrefix = helixDataAccessor.keyBuilder().idealStates().getPath() + "/";
     _instanceConfigsPath = helixDataAccessor.keyBuilder().instanceConfigs().getPath();
     _propertyStore = helixManager.getHelixPropertyStore();
+    _helixManager = helixManager;
   }
 
   @Override
@@ -242,7 +257,8 @@ private void processInstanceConfigChange() {
         enabledServers.add(instanceId);
 
         // Always refresh the server instance with the latest instance config in case it changes
-        ServerInstance serverInstance = new ServerInstance(new InstanceConfig(instanceConfigZNRecord));
+        InstanceConfig instanceConfig = new InstanceConfig(instanceConfigZNRecord);
+        ServerInstance serverInstance = new ServerInstance(instanceConfig);
         if (_enabledServerInstanceMap.put(instanceId, serverInstance) == null) {
           newEnabledServers.add(instanceId);
 
@@ -250,6 +266,8 @@ private void processInstanceConfigChange() {
           if (_excludedServers.remove(instanceId)) {
             LOGGER.info("Got excluded server: {} re-enabled, including it into the routing", instanceId);
           }
+
+          addNewServerToTableTenantServerMap(instanceId, serverInstance, instanceConfig);
         }
       }
     }
@@ -257,6 +275,7 @@ private void processInstanceConfigChange() {
     for (String instance : _enabledServerInstanceMap.keySet()) {
       if (!enabledServers.contains(instance)) {
         newDisabledServers.add(instance);
+        deleteServerFromTableTenantServerMap(instance);
       }
     }
 
@@ -406,6 +425,9 @@ public synchronized void buildRouting(String tableNameWithType) {
     TableConfig tableConfig = ZKMetadataProvider.getTableConfig(_propertyStore, tableNameWithType);
     Preconditions.checkState(tableConfig != null, "Failed to find table config for table: %s", tableNameWithType);
 
+    // Build a mapping from the table to the list of servers assigned to the table's tenant.
+    buildTableTenantServerMap(tableNameWithType, tableConfig);
+
     String idealStatePath = getIdealStatePath(tableNameWithType);
     IdealState idealState = getIdealState(idealStatePath);
     Preconditions.checkState(idealState != null, "Failed to find ideal state for table: %s", tableNameWithType);
@@ -430,10 +452,10 @@ public synchronized void buildRouting(String tableNameWithType) {
     Set<String> preSelectedOnlineSegments = segmentPreSelector.preSelect(onlineSegments);
     SegmentSelector segmentSelector = SegmentSelectorFactory.getSegmentSelector(tableConfig);
     segmentSelector.init(idealState, externalView, preSelectedOnlineSegments);
+
+    // Register segment pruners and initialize segment zk metadata fetcher.
     List<SegmentPruner> segmentPruners = SegmentPrunerFactory.getSegmentPruners(tableConfig, _propertyStore);
-    for (SegmentPruner segmentPruner : segmentPruners) {
-      segmentPruner.init(idealState, externalView, preSelectedOnlineSegments);
-    }
+
     AdaptiveServerSelector adaptiveServerSelector =
         AdaptiveServerSelectorFactory.getAdaptiveServerSelector(_serverRoutingStatsManager, _pinotConfig);
     InstanceSelector instanceSelector =
@@ -485,13 +507,41 @@ public synchronized void buildRouting(String tableNameWithType) {
       }
     }
 
+    SegmentPartitionMetadataManager partitionMetadataManager = null;
+    // TODO: Support multiple partition columns
+    // TODO: Make partition pruner on top of the partition metadata manager to avoid keeping 2 copies of the metadata
+    if (_pinotConfig.getProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER,
+        CommonConstants.Broker.DEFAULT_ENABLE_PARTITION_METADATA_MANAGER)) {
+      SegmentPartitionConfig segmentPartitionConfig = tableConfig.getIndexingConfig().getSegmentPartitionConfig();
+      if (segmentPartitionConfig == null || segmentPartitionConfig.getColumnPartitionMap().size() != 1) {
+        LOGGER.warn("Cannot enable SegmentPartitionMetadataManager. "
+            + "Expecting SegmentPartitionConfig with exact 1 partition column");
+      } else {
+        Map.Entry<String, ColumnPartitionConfig> partitionConfig =
+            segmentPartitionConfig.getColumnPartitionMap().entrySet().iterator().next();
+        LOGGER.info("Enabling SegmentPartitionMetadataManager for table: {} on partition column: {}", tableNameWithType,
+            partitionConfig.getKey());
+        partitionMetadataManager = new SegmentPartitionMetadataManager(tableNameWithType, partitionConfig.getKey(),
+            partitionConfig.getValue().getFunctionName(), partitionConfig.getValue().getNumPartitions());
+      }
+    }
+
     QueryConfig queryConfig = tableConfig.getQueryConfig();
     Long queryTimeoutMs = queryConfig != null ? queryConfig.getTimeoutMs() : null;
 
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(tableNameWithType, _propertyStore);
+    for (SegmentZkMetadataFetchListener listener : segmentPruners) {
+      segmentZkMetadataFetcher.register(listener);
+    }
+    if (partitionMetadataManager != null) {
+      segmentZkMetadataFetcher.register(partitionMetadataManager);
+    }
+    segmentZkMetadataFetcher.init(idealState, externalView, preSelectedOnlineSegments);
+
     RoutingEntry routingEntry =
         new RoutingEntry(tableNameWithType, idealStatePath, externalViewPath, segmentPreSelector, segmentSelector,
-            segmentPruners, instanceSelector, idealStateVersion, externalViewVersion, timeBoundaryManager,
-            queryTimeoutMs);
+            segmentPruners, instanceSelector, idealStateVersion, externalViewVersion, segmentZkMetadataFetcher,
+            timeBoundaryManager, partitionMetadataManager, queryTimeoutMs);
     if (_routingEntryMap.put(tableNameWithType, routingEntry) == null) {
       LOGGER.info("Built routing for table: {}", tableNameWithType);
     } else {
@@ -537,6 +587,10 @@ public synchronized void removeRouting(String tableNameWithType) {
     } else {
       LOGGER.warn("Routing does not exist for table: {}, skipping removing routing", tableNameWithType);
     }
+
+    if (_tableTenantServersMap.remove(tableNameWithType) != null) {
+      LOGGER.info("Removed tenant servers for table: {}", tableNameWithType);
+    }
   }
 
   /**
@@ -595,6 +649,11 @@ public Map<String, ServerInstance> getEnabledServerInstanceMap() {
     return _enabledServerInstanceMap;
   }
 
+  @Override
+  public Map<String, ServerInstance> getEnabledServersForTableTenant(String tableNameWithType) {
+    return _tableTenantServersMap.getOrDefault(tableNameWithType, Collections.emptyMap());
+  }
+
   private String getIdealStatePath(String tableNameWithType) {
     return _idealStatePathPrefix + tableNameWithType;
   }
@@ -619,6 +678,17 @@ public TimeBoundaryInfo getTimeBoundaryInfo(String offlineTableName) {
     return timeBoundaryManager != null ? timeBoundaryManager.getTimeBoundaryInfo() : null;
   }
 
+  @Nullable
+  @Override
+  public TablePartitionInfo getTablePartitionInfo(String tableNameWithType) {
+    RoutingEntry routingEntry = _routingEntryMap.get(tableNameWithType);
+    if (routingEntry == null) {
+      return null;
+    }
+    SegmentPartitionMetadataManager partitionMetadataManager = routingEntry.getPartitionMetadataManager();
+    return partitionMetadataManager != null ? partitionMetadataManager.getTablePartitionInfo() : null;
+  }
+
   /**
    * Returns the table-level query timeout in milliseconds for the given table, or {@code null} if the timeout is not
    * configured in the table config.
@@ -636,8 +706,10 @@ private static class RoutingEntry {
     final SegmentPreSelector _segmentPreSelector;
     final SegmentSelector _segmentSelector;
     final List<SegmentPruner> _segmentPruners;
+    final SegmentPartitionMetadataManager _partitionMetadataManager;
     final InstanceSelector _instanceSelector;
     final Long _queryTimeoutMs;
+    final SegmentZkMetadataFetcher _segmentZkMetadataFetcher;
 
     // Cache IdealState and ExternalView version for the last update
     transient int _lastUpdateIdealStateVersion;
@@ -648,7 +720,8 @@ private static class RoutingEntry {
     RoutingEntry(String tableNameWithType, String idealStatePath, String externalViewPath,
         SegmentPreSelector segmentPreSelector, SegmentSelector segmentSelector, List<SegmentPruner> segmentPruners,
         InstanceSelector instanceSelector, int lastUpdateIdealStateVersion, int lastUpdateExternalViewVersion,
-        @Nullable TimeBoundaryManager timeBoundaryManager, @Nullable Long queryTimeoutMs) {
+        SegmentZkMetadataFetcher segmentZkMetadataFetcher, @Nullable TimeBoundaryManager timeBoundaryManager,
+        @Nullable SegmentPartitionMetadataManager partitionMetadataManager, @Nullable Long queryTimeoutMs) {
       _tableNameWithType = tableNameWithType;
       _idealStatePath = idealStatePath;
       _externalViewPath = externalViewPath;
@@ -659,7 +732,9 @@ private static class RoutingEntry {
       _lastUpdateIdealStateVersion = lastUpdateIdealStateVersion;
       _lastUpdateExternalViewVersion = lastUpdateExternalViewVersion;
       _timeBoundaryManager = timeBoundaryManager;
+      _partitionMetadataManager = partitionMetadataManager;
       _queryTimeoutMs = queryTimeoutMs;
+      _segmentZkMetadataFetcher = segmentZkMetadataFetcher;
     }
 
     String getTableNameWithType() {
@@ -683,6 +758,11 @@ TimeBoundaryManager getTimeBoundaryManager() {
       return _timeBoundaryManager;
     }
 
+    @Nullable
+    SegmentPartitionMetadataManager getPartitionMetadataManager() {
+      return _partitionMetadataManager;
+    }
+
     Long getQueryTimeoutMs() {
       return _queryTimeoutMs;
     }
@@ -693,10 +773,8 @@ Long getQueryTimeoutMs() {
     void onAssignmentChange(IdealState idealState, ExternalView externalView) {
       Set<String> onlineSegments = getOnlineSegments(idealState);
       Set<String> preSelectedOnlineSegments = _segmentPreSelector.preSelect(onlineSegments);
+      _segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, preSelectedOnlineSegments);
       _segmentSelector.onAssignmentChange(idealState, externalView, preSelectedOnlineSegments);
-      for (SegmentPruner segmentPruner : _segmentPruners) {
-        segmentPruner.onAssignmentChange(idealState, externalView, preSelectedOnlineSegments);
-      }
       _instanceSelector.onAssignmentChange(idealState, externalView, preSelectedOnlineSegments);
       if (_timeBoundaryManager != null) {
         _timeBoundaryManager.onAssignmentChange(idealState, externalView, preSelectedOnlineSegments);
@@ -710,9 +788,7 @@ void onInstancesChange(Set<String> enabledInstances, List<String> changedInstanc
     }
 
     void refreshSegment(String segment) {
-      for (SegmentPruner segmentPruner : _segmentPruners) {
-        segmentPruner.refreshSegment(segment);
-      }
+      _segmentZkMetadataFetcher.refreshSegment(segment);
       if (_timeBoundaryManager != null) {
         _timeBoundaryManager.refreshSegment(segment);
       }
@@ -728,8 +804,8 @@ InstanceSelector.SelectionResult calculateRouting(BrokerRequest brokerRequest, l
       }
       int numPrunedSegments = numTotalSelectedSegments - selectedSegments.size();
       if (!selectedSegments.isEmpty()) {
-        InstanceSelector.SelectionResult selectionResult = _instanceSelector.select(brokerRequest,
-            new ArrayList<>(selectedSegments), requestId);
+        InstanceSelector.SelectionResult selectionResult =
+            _instanceSelector.select(brokerRequest, new ArrayList<>(selectedSegments), requestId);
         selectionResult.setNumPrunedSegments(numPrunedSegments);
         return selectionResult;
       } else {
@@ -737,4 +813,54 @@ InstanceSelector.SelectionResult calculateRouting(BrokerRequest brokerRequest, l
       }
     }
   }
+
+  private void buildTableTenantServerMap(String tableNameWithType, TableConfig tableConfig) {
+    String serverTag = getServerTagForTable(tableNameWithType, tableConfig);
+    List<InstanceConfig> allInstanceConfigs = HelixHelper.getInstanceConfigs(_helixManager);
+    List<InstanceConfig> instanceConfigsWithTag = HelixHelper.getInstancesConfigsWithTag(allInstanceConfigs, serverTag);
+    Map<String, ServerInstance> serverInstances = new HashMap<>();
+    for (InstanceConfig serverInstanceConfig : instanceConfigsWithTag) {
+      serverInstances.put(serverInstanceConfig.getInstanceName(), new ServerInstance(serverInstanceConfig));
+    }
+    _tableTenantServersMap.put(tableNameWithType, serverInstances);
+    LOGGER.info("Built map for table={} with {} server instances.", tableNameWithType, serverInstances.size());
+  }
+
+  private void addNewServerToTableTenantServerMap(String instanceId, ServerInstance serverInstance,
+      InstanceConfig instanceConfig) {
+    List<String> tags = instanceConfig.getTags();
+
+    for (Map.Entry<String, Map<String, ServerInstance>> entry : _tableTenantServersMap.entrySet()) {
+      String tableNameWithType = entry.getKey();
+      TableConfig tableConfig = ZKMetadataProvider.getTableConfig(_propertyStore, tableNameWithType);
+      String tableServerTag = getServerTagForTable(tableNameWithType, tableConfig);
+
+      Map<String, ServerInstance> tenantServerMap = entry.getValue();
+
+      if (!tenantServerMap.containsKey(instanceId) && tags.contains(tableServerTag)) {
+        tenantServerMap.put(instanceId, serverInstance);
+      }
+    }
+  }
+
+  private String getServerTagForTable(String tableNameWithType, TableConfig tableConfig) {
+    String serverTenantName = tableConfig.getTenantConfig().getServer();
+    String serverTag;
+    if (TableNameBuilder.isOfflineTableResource(tableNameWithType)) {
+      serverTag = TagNameUtils.getOfflineTagForTenant(serverTenantName);
+    } else {
+      // Realtime table
+      serverTag = TagNameUtils.getRealtimeTagForTenant(serverTenantName);
+    }
+
+    return serverTag;
+  }
+
+  private void deleteServerFromTableTenantServerMap(String server) {
+    for (Map.Entry<String, Map<String, ServerInstance>> entry : _tableTenantServersMap.entrySet()) {
+      if (entry.getValue().remove(server) != null) {
+        LOGGER.info("Removing entry for server={}, table={}", server, entry.getKey());
+      }
+    }
+  }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BalancedInstanceSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BalancedInstanceSelector.java
index de5eb9f5300..17c9d5e5b8a 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BalancedInstanceSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BalancedInstanceSelector.java
@@ -18,10 +18,14 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import java.time.Clock;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.broker.routing.adaptiveserverselector.AdaptiveServerSelector;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.utils.HashUtil;
@@ -37,40 +41,54 @@
  *    Step1: Process seg1. Fetch server rankings. Pick the best server.
  *    Step2: Process seg2. Fetch server rankings (could have changed or not since Step 1). Pick the best server.
  *    Step3: Process seg3. Fetch server rankings (could have changed or not since Step 2). Pick the best server.
-
+ *
  * <p>If AdaptiveServerSelection is disabled, the selection algorithm will always evenly distribute the traffic to all
  * replicas of each segment, and will try to select different replica id for each segment. The algorithm is very
  * light-weight and will do best effort to balance the number of segments served by each selected server instance.
  */
 public class BalancedInstanceSelector extends BaseInstanceSelector {
 
-  public BalancedInstanceSelector(String tableNameWithType, BrokerMetrics brokerMetrics,
-      @Nullable AdaptiveServerSelector adaptiveServerSelector) {
-    super(tableNameWithType, brokerMetrics, adaptiveServerSelector);
+  public BalancedInstanceSelector(String tableNameWithType, ZkHelixPropertyStore<ZNRecord> propertyStore,
+      BrokerMetrics brokerMetrics, @Nullable AdaptiveServerSelector adaptiveServerSelector, Clock clock) {
+    super(tableNameWithType, propertyStore, brokerMetrics, adaptiveServerSelector, clock);
   }
 
   @Override
-  Map<String, String> select(List<String> segments, int requestId,
-      Map<String, List<String>> segmentToEnabledInstancesMap, Map<String, String> queryOptions) {
+  Map<String, String> select(List<String> segments, int requestId, SegmentStates segmentStates,
+      Map<String, String> queryOptions) {
     Map<String, String> segmentToSelectedInstanceMap = new HashMap<>(HashUtil.getHashMapCapacity(segments.size()));
-    for (String segment : segments) {
-      List<String> enabledInstances = segmentToEnabledInstancesMap.get(segment);
-      // NOTE: enabledInstances can be null when there is no enabled instances for the segment, or the instance selector
-      // has not been updated (we update all components for routing in sequence)
-      if (enabledInstances == null) {
-        continue;
+    if (_adaptiveServerSelector != null) {
+      for (String segment : segments) {
+        List<SegmentInstanceCandidate> candidates = segmentStates.getCandidates(segment);
+        // NOTE: candidates can be null when there is no enabled instances for the segment, or the instance selector has
+        // not been updated (we update all components for routing in sequence)
+        if (candidates == null) {
+          continue;
+        }
+        List<String> candidateInstances = new ArrayList<>(candidates.size());
+        for (SegmentInstanceCandidate candidate : candidates) {
+          candidateInstances.add(candidate.getInstance());
+        }
+        String selectedInstance = _adaptiveServerSelector.select(candidateInstances);
+        if (candidates.get(candidateInstances.indexOf(selectedInstance)).isOnline()) {
+          segmentToSelectedInstanceMap.put(segment, selectedInstance);
+        }
       }
-
-      String selectedServer;
-      if (_adaptiveServerSelector != null) {
-        selectedServer = _adaptiveServerSelector.select(enabledInstances);
-      } else {
-        selectedServer = enabledInstances.get(requestId++ % enabledInstances.size());
+    } else {
+      for (String segment : segments) {
+        List<SegmentInstanceCandidate> candidates = segmentStates.getCandidates(segment);
+        // NOTE: candidates can be null when there is no enabled instances for the segment, or the instance selector has
+        // not been updated (we update all components for routing in sequence)
+        if (candidates == null) {
+          continue;
+        }
+        int selectedIdx = requestId++ % candidates.size();
+        SegmentInstanceCandidate selectedCandidate = candidates.get(selectedIdx);
+        if (selectedCandidate.isOnline()) {
+          segmentToSelectedInstanceMap.put(segment, selectedCandidate.getInstance());
+        }
       }
-
-      segmentToSelectedInstanceMap.put(segment, selectedServer);
     }
-
     return segmentToSelectedInstanceMap;
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BaseInstanceSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BaseInstanceSelector.java
index 9325035aca1..667cc766d81 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BaseInstanceSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BaseInstanceSelector.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -26,11 +27,18 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import javax.annotation.Nullable;
+import org.apache.helix.AccessOption;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.broker.routing.adaptiveserverselector.AdaptiveServerSelector;
 import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelector;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.metrics.BrokerMeter;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.request.BrokerRequest;
@@ -41,239 +49,348 @@
 
 
 /**
- * Base implementation of instance selector which maintains a map from segment to enabled ONLINE/CONSUMING server
+ * Base implementation of instance selector. Selector maintains a map from segment to enabled ONLINE/CONSUMING server
  * instances that serves the segment and a set of unavailable segments (no enabled instance or all enabled instances are
- * in ERROR state).
+ * in OFFLINE/ERROR state).
+ * <p>
+ * Special handling of new segment: It is common for new segment to be partially available or not available at all in
+ * all instances.
+ * 1) We don't report new segment as unavailable segments.
+ * 2) To avoid creating hotspot instances, unavailable instances for new segment won't be excluded for instance
+ * selection. When it is selected, we don't serve the new segment.
+ * <p>
+ * Definition of new segment:
+ * 1) Segment pushed more than 5 minutes ago.
+ * - If we first see a segment via initialization, we look up segment push time from zookeeper.
+ * - If we first see a segment via onAssignmentChange initialization, we use the calling time of onAssignmentChange
+ * as approximation.
+ * 2) We retire new segment as old when:
+ * - The push time is more than 5 minutes ago
+ * - Any instance for new segment is in ERROR state
+ * - External view for segment converges with ideal state
+ *
+ * Note that this implementation means:
+ * 1) Inconsistent selection of new segments across queries (some queries will serve new segments and others won't).
+ * 2) When there is no state update from helix, new segments won't be retired because of the time passing (those with
+ * push time more than 5 minutes ago).
+ * TODO: refresh new/old segment state where there is no update from helix for long time.
  */
 abstract class BaseInstanceSelector implements InstanceSelector {
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseInstanceSelector.class);
-
   // To prevent int overflow, reset the request id once it reaches this value
   private static final long MAX_REQUEST_ID = 1_000_000_000;
 
-  private final String _tableNameWithType;
-  private final BrokerMetrics _brokerMetrics;
-  protected final AdaptiveServerSelector _adaptiveServerSelector;
+  final String _tableNameWithType;
+  final ZkHelixPropertyStore<ZNRecord> _propertyStore;
+  final BrokerMetrics _brokerMetrics;
+  final AdaptiveServerSelector _adaptiveServerSelector;
+  final Clock _clock;
 
-  // These 4 variables are the cached states to help accelerate the change processing
-  private Set<String> _enabledInstances;
-  private Map<String, List<String>> _segmentToOnlineInstancesMap;
-  private Map<String, List<String>> _segmentToOfflineInstancesMap;
-  private Map<String, List<String>> _instanceToSegmentsMap;
+  // These 3 variables are the cached states to help accelerate the change processing
+  Set<String> _enabledInstances;
+  // For old segments, all candidates are online
+  // Reduce this map to reduce garbage
+  final Map<String, List<SegmentInstanceCandidate>> _oldSegmentCandidatesMap = new HashMap<>();
+  Map<String, NewSegmentState> _newSegmentStateMap;
 
-  // These 2 variables are needed for instance selection (multi-threaded), so make them volatile
-  private volatile Map<String, List<String>> _segmentToEnabledInstancesMap;
-  private volatile Set<String> _unavailableSegments;
+  // _segmentStates is needed for instance selection (multi-threaded), so it is made volatile.
+  private volatile SegmentStates _segmentStates;
 
-  BaseInstanceSelector(String tableNameWithType, BrokerMetrics brokerMetrics,
-      @Nullable AdaptiveServerSelector adaptiveServerSelector) {
+  BaseInstanceSelector(String tableNameWithType, ZkHelixPropertyStore<ZNRecord> propertyStore,
+      BrokerMetrics brokerMetrics, @Nullable AdaptiveServerSelector adaptiveServerSelector, Clock clock) {
     _tableNameWithType = tableNameWithType;
+    _propertyStore = propertyStore;
     _brokerMetrics = brokerMetrics;
     _adaptiveServerSelector = adaptiveServerSelector;
+    _clock = clock;
   }
 
   @Override
   public void init(Set<String> enabledInstances, IdealState idealState, ExternalView externalView,
       Set<String> onlineSegments) {
     _enabledInstances = enabledInstances;
-    int segmentMapCapacity = HashUtil.getHashMapCapacity(onlineSegments.size());
-    _segmentToOnlineInstancesMap = new HashMap<>(segmentMapCapacity);
-    _segmentToOfflineInstancesMap = new HashMap<>(segmentMapCapacity);
-    _instanceToSegmentsMap = new HashMap<>();
-    onAssignmentChange(idealState, externalView, onlineSegments);
+    Map<String, Long> newSegmentPushTimeMap = getNewSegmentPushTimeMapFromZK(idealState, externalView, onlineSegments);
+    updateSegmentMaps(idealState, externalView, onlineSegments, newSegmentPushTimeMap);
+    refreshSegmentStates();
   }
 
   /**
-   * {@inheritDoc}
-   *
-   * <p>Updates the cached enabled instances and re-calculates {@code segmentToEnabledInstancesMap} and
-   * {@code unavailableSegments} based on the cached states.
+   * Returns whether the instance state is online for routing purpose (ONLINE/CONSUMING).
    */
-  @Override
-  public void onInstancesChange(Set<String> enabledInstances, List<String> changedInstances) {
-    _enabledInstances = enabledInstances;
+  static boolean isOnlineForRouting(@Nullable String state) {
+    return SegmentStateModel.ONLINE.equals(state) || SegmentStateModel.CONSUMING.equals(state);
+  }
 
-    // Update all segments served by the changed instances
-    Set<String> segmentsToUpdate = new HashSet<>();
-    for (String instance : changedInstances) {
-      List<String> segments = _instanceToSegmentsMap.get(instance);
-      if (segments != null) {
-        segmentsToUpdate.addAll(segments);
+  /**
+   * Returns a map from new segment to their push time based on the ZK metadata.
+   */
+  Map<String, Long> getNewSegmentPushTimeMapFromZK(IdealState idealState, ExternalView externalView,
+      Set<String> onlineSegments) {
+    List<String> potentialNewSegments = new ArrayList<>();
+    Map<String, Map<String, String>> idealStateAssignment = idealState.getRecord().getMapFields();
+    Map<String, Map<String, String>> externalViewAssignment = externalView.getRecord().getMapFields();
+    for (String segment : onlineSegments) {
+      assert idealStateAssignment.containsKey(segment);
+      if (isPotentialNewSegment(idealStateAssignment.get(segment), externalViewAssignment.get(segment))) {
+        potentialNewSegments.add(segment);
       }
     }
 
-    // Directly return if no segment needs to be updated
-    if (segmentsToUpdate.isEmpty()) {
-      return;
+    // Use push time in ZK metadata to determine whether the potential new segment is newly pushed
+    Map<String, Long> newSegmentPushTimeMap = new HashMap<>();
+    long nowMillis = _clock.millis();
+    String segmentZKMetadataPathPrefix =
+        ZKMetadataProvider.constructPropertyStorePathForResource(_tableNameWithType) + "/";
+    List<String> segmentZKMetadataPaths = new ArrayList<>(potentialNewSegments.size());
+    for (String segment : potentialNewSegments) {
+      segmentZKMetadataPaths.add(segmentZKMetadataPathPrefix + segment);
+    }
+    List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
+    for (ZNRecord record : znRecords) {
+      if (record == null) {
+        continue;
+      }
+      SegmentZKMetadata segmentZKMetadata = new SegmentZKMetadata(record);
+      long pushTimeMillis = segmentZKMetadata.getPushTime();
+      if (InstanceSelector.isNewSegment(pushTimeMillis, nowMillis)) {
+        newSegmentPushTimeMap.put(segmentZKMetadata.getSegmentName(), pushTimeMillis);
+      }
     }
+    return newSegmentPushTimeMap;
+  }
 
-    // Update the map from segment to enabled ONLINE/CONSUMING instances and set of unavailable segments (no enabled
-    // instance or all enabled instances are in ERROR state)
-    // NOTE: We can directly modify the map because we will only update the values without changing the map entries.
-    // Because the map is marked as volatile, the running queries (already accessed the map) might use the enabled
-    // instances either before or after the change, which is okay; the following queries (not yet accessed the map) will
-    // get the updated value.
-    Map<String, List<String>> segmentToEnabledInstancesMap = _segmentToEnabledInstancesMap;
-    Set<String> currentUnavailableSegments = _unavailableSegments;
-    Set<String> newUnavailableSegments = new HashSet<>();
-    for (Map.Entry<String, List<String>> entry : segmentToEnabledInstancesMap.entrySet()) {
-      String segment = entry.getKey();
-      if (segmentsToUpdate.contains(segment)) {
-        List<String> enabledInstancesForSegment =
-            calculateEnabledInstancesForSegment(segment, _segmentToOnlineInstancesMap.get(segment),
-                newUnavailableSegments);
-        entry.setValue(enabledInstancesForSegment);
-      } else {
-        if (currentUnavailableSegments.contains(segment)) {
-          newUnavailableSegments.add(segment);
+  /**
+   * Returns whether a segment is qualified as a new segment.
+   * A segment is count as old when:
+   * - Any instance for the segment is in ERROR state
+   * - External view for the segment converges with ideal state
+   */
+  static boolean isPotentialNewSegment(Map<String, String> idealStateInstanceStateMap,
+      @Nullable Map<String, String> externalViewInstanceStateMap) {
+    if (externalViewInstanceStateMap == null) {
+      return true;
+    }
+    boolean hasConverged = true;
+    // Only track ONLINE/CONSUMING instances within the ideal state
+    for (Map.Entry<String, String> entry : idealStateInstanceStateMap.entrySet()) {
+      if (isOnlineForRouting(entry.getValue())) {
+        String externalViewState = externalViewInstanceStateMap.get(entry.getKey());
+        if (externalViewState == null || externalViewState.equals(SegmentStateModel.OFFLINE)) {
+          hasConverged = false;
+        } else if (externalViewState.equals(SegmentStateModel.ERROR)) {
+          return false;
         }
       }
     }
-    _unavailableSegments = newUnavailableSegments;
+    return !hasConverged;
   }
 
   /**
-   * {@inheritDoc}
-   *
-   * <p>Updates the cached maps ({@code segmentToOnlineInstancesMap}, {@code segmentToOfflineInstancesMap} and
-   * {@code instanceToSegmentsMap}) and re-calculates {@code segmentToEnabledInstancesMap} and
-   * {@code unavailableSegments} based on the cached states.
+   * Returns the online instances for routing purpose.
    */
-  @Override
-  public void onAssignmentChange(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
-    _segmentToOnlineInstancesMap.clear();
-    _segmentToOfflineInstancesMap.clear();
-    _instanceToSegmentsMap.clear();
-
-    // Update the cached maps
-    updateSegmentMaps(idealState, externalView, onlineSegments, _segmentToOnlineInstancesMap,
-        _segmentToOfflineInstancesMap, _instanceToSegmentsMap);
-
-    // Generate a new map from segment to enabled ONLINE/CONSUMING instances and a new set of unavailable segments (no
-    // enabled instance or all enabled instances are in ERROR state)
-    Map<String, List<String>> segmentToEnabledInstancesMap =
-        new HashMap<>(HashUtil.getHashMapCapacity(_segmentToOnlineInstancesMap.size()));
-    Set<String> unavailableSegments = new HashSet<>();
-    // NOTE: Put null as the value when there is no enabled instances for a segment so that segmentToEnabledInstancesMap
-    // always contains all segments. With this, in onInstancesChange() we can directly iterate over
-    // segmentToEnabledInstancesMap.entrySet() and modify the value without changing the map entries.
-    for (Map.Entry<String, List<String>> entry : _segmentToOnlineInstancesMap.entrySet()) {
-      String segment = entry.getKey();
-      List<String> enabledInstancesForSegment =
-          calculateEnabledInstancesForSegment(segment, entry.getValue(), unavailableSegments);
-      segmentToEnabledInstancesMap.put(segment, enabledInstancesForSegment);
+  static TreeSet<String> getOnlineInstances(Map<String, String> idealStateInstanceStateMap,
+      Map<String, String> externalViewInstanceStateMap) {
+    TreeSet<String> onlineInstances = new TreeSet<>();
+    // Only track ONLINE/CONSUMING instances within the ideal state
+    for (Map.Entry<String, String> entry : idealStateInstanceStateMap.entrySet()) {
+      String instance = entry.getKey();
+      // NOTE: DO NOT check if EV matches IS because it is a valid state when EV is CONSUMING while IS is ONLINE
+      if (isOnlineForRouting(entry.getValue()) && isOnlineForRouting(externalViewInstanceStateMap.get(instance))) {
+        onlineInstances.add(instance);
+      }
     }
+    return onlineInstances;
+  }
 
-    _segmentToEnabledInstancesMap = segmentToEnabledInstancesMap;
-    _unavailableSegments = unavailableSegments;
+  /**
+   * Converts the given map into a sorted map if needed.
+   */
+  static SortedMap<String, String> convertToSortedMap(Map<String, String> map) {
+    if (map instanceof SortedMap) {
+      return (SortedMap<String, String>) map;
+    } else {
+      return new TreeMap<>(map);
+    }
   }
 
   /**
-   * Updates the segment maps based on the given ideal state, external view and online segments (segments with
-   * ONLINE/CONSUMING instances in the ideal state and pre-selected by the {@link SegmentPreSelector}).
+   * Updates the segment maps based on the given ideal state, external view, online segments (segments with
+   * ONLINE/CONSUMING instances in the ideal state and pre-selected by the {@link SegmentPreSelector}) and new segments.
+   * After this update:
+   * - Old segments' online instances should be tracked in _oldSegmentCandidatesMap
+   * - New segments' state (push time and candidate instances) should be tracked in _newSegmentStateMap
    */
   void updateSegmentMaps(IdealState idealState, ExternalView externalView, Set<String> onlineSegments,
-      Map<String, List<String>> segmentToOnlineInstancesMap, Map<String, List<String>> segmentToOfflineInstancesMap,
-      Map<String, List<String>> instanceToSegmentsMap) {
-    // Iterate over the external view instead of the online segments so that the map lookups are performed on the
-    // HashSet instead of the TreeSet for performance
-    // NOTE: Do not track segments not in the external view because it is a valid state when the segment is new added
-    Map<String, Map<String, String>> idealStateAssignment = idealState.getRecord().getMapFields();
-    for (Map.Entry<String, Map<String, String>> entry : externalView.getRecord().getMapFields().entrySet()) {
-      String segment = entry.getKey();
+      Map<String, Long> newSegmentPushTimeMap) {
+    _oldSegmentCandidatesMap.clear();
+    _newSegmentStateMap = new HashMap<>(HashUtil.getHashMapCapacity(newSegmentPushTimeMap.size()));
 
-      // Only track online segments
-      if (!onlineSegments.contains(segment)) {
-        continue;
+    Map<String, Map<String, String>> idealStateAssignment = idealState.getRecord().getMapFields();
+    Map<String, Map<String, String>> externalViewAssignment = externalView.getRecord().getMapFields();
+    for (String segment : onlineSegments) {
+      Map<String, String> idealStateInstanceStateMap = idealStateAssignment.get(segment);
+      Long newSegmentPushTimeMillis = newSegmentPushTimeMap.get(segment);
+      Map<String, String> externalViewInstanceStateMap = externalViewAssignment.get(segment);
+      if (externalViewInstanceStateMap == null) {
+        if (newSegmentPushTimeMillis != null) {
+          // New segment
+          List<SegmentInstanceCandidate> candidates = new ArrayList<>(idealStateInstanceStateMap.size());
+          for (Map.Entry<String, String> entry : convertToSortedMap(idealStateInstanceStateMap).entrySet()) {
+            if (isOnlineForRouting(entry.getValue())) {
+              candidates.add(new SegmentInstanceCandidate(entry.getKey(), false));
+            }
+          }
+          _newSegmentStateMap.put(segment, new NewSegmentState(newSegmentPushTimeMillis, candidates));
+        } else {
+          // Old segment
+          _oldSegmentCandidatesMap.put(segment, Collections.emptyList());
+        }
+      } else {
+        TreeSet<String> onlineInstances = getOnlineInstances(idealStateInstanceStateMap, externalViewInstanceStateMap);
+        if (newSegmentPushTimeMillis != null) {
+          // New segment
+          List<SegmentInstanceCandidate> candidates = new ArrayList<>(idealStateInstanceStateMap.size());
+          for (Map.Entry<String, String> entry : convertToSortedMap(idealStateInstanceStateMap).entrySet()) {
+            if (isOnlineForRouting(entry.getValue())) {
+              String instance = entry.getKey();
+              candidates.add(new SegmentInstanceCandidate(instance, onlineInstances.contains(instance)));
+            }
+          }
+          _newSegmentStateMap.put(segment, new NewSegmentState(newSegmentPushTimeMillis, candidates));
+        } else {
+          // Old segment
+          List<SegmentInstanceCandidate> candidates = new ArrayList<>(onlineInstances.size());
+          for (String instance : onlineInstances) {
+            candidates.add(new SegmentInstanceCandidate(instance, true));
+          }
+          _oldSegmentCandidatesMap.put(segment, candidates);
+        }
       }
+    }
+  }
 
-      Map<String, String> externalViewInstanceStateMap = entry.getValue();
-      Map<String, String> idealStateInstanceStateMap = idealStateAssignment.get(segment);
-      List<String> onlineInstances = new ArrayList<>(externalViewInstanceStateMap.size());
-      List<String> offlineInstances = new ArrayList<>();
-      segmentToOnlineInstancesMap.put(segment, onlineInstances);
-      segmentToOfflineInstancesMap.put(segment, offlineInstances);
-      for (Map.Entry<String, String> instanceStateEntry : externalViewInstanceStateMap.entrySet()) {
-        String instance = instanceStateEntry.getKey();
+  /**
+   * Refreshes the _segmentStates based on the in-memory states.
+   * Note that the whole _segmentStates has to be updated together to avoid partial state update.
+   **/
+  void refreshSegmentStates() {
+    Map<String, List<SegmentInstanceCandidate>> instanceCandidatesMap =
+        new HashMap<>(HashUtil.getHashMapCapacity(_oldSegmentCandidatesMap.size() + _newSegmentStateMap.size()));
+    Set<String> unavailableSegments = new HashSet<>();
 
-        // Only track instances within the ideal state
-        // NOTE: When an instance is not in the ideal state, the instance will drop the segment soon, and it is not safe
-        // to query this instance for the segment. This could happen when a segment is moved from one instance to
-        // another instance.
-        if (!idealStateInstanceStateMap.containsKey(instance)) {
-          continue;
+    for (Map.Entry<String, List<SegmentInstanceCandidate>> entry : _oldSegmentCandidatesMap.entrySet()) {
+      String segment = entry.getKey();
+      List<SegmentInstanceCandidate> candidates = entry.getValue();
+      List<SegmentInstanceCandidate> enabledCandidates = new ArrayList<>(candidates.size());
+      for (SegmentInstanceCandidate candidate : candidates) {
+        if (_enabledInstances.contains(candidate.getInstance())) {
+          enabledCandidates.add(candidate);
         }
-
-        String externalViewState = instanceStateEntry.getValue();
-        // Do not track instances in ERROR state
-        if (!externalViewState.equals(SegmentStateModel.ERROR)) {
-          instanceToSegmentsMap.computeIfAbsent(instance, k -> new ArrayList<>()).add(segment);
-          if (externalViewState.equals(SegmentStateModel.OFFLINE)) {
-            offlineInstances.add(instance);
-          } else {
-            onlineInstances.add(instance);
-          }
+      }
+      if (!enabledCandidates.isEmpty()) {
+        instanceCandidatesMap.put(segment, enabledCandidates);
+      } else {
+        List<String> candidateInstances = new ArrayList<>(candidates.size());
+        for (SegmentInstanceCandidate candidate : candidates) {
+          candidateInstances.add(candidate.getInstance());
         }
+        LOGGER.warn(
+            "Failed to find servers hosting segment: {} for table: {} (all candidate instances: {} are disabled, "
+                + "counting segment as unavailable)", segment, _tableNameWithType, candidateInstances);
+        unavailableSegments.add(segment);
+        _brokerMetrics.addMeteredTableValue(_tableNameWithType, BrokerMeter.NO_SERVING_HOST_FOR_SEGMENT, 1);
       }
+    }
 
-      // Sort the online instances for replica-group routing to work. For multiple segments with the same online
-      // instances, if the list is sorted, the same index in the list will always point to the same instance.
-      if (!(externalViewInstanceStateMap instanceof SortedMap)) {
-        onlineInstances.sort(null);
-        offlineInstances.sort(null);
+    for (Map.Entry<String, NewSegmentState> entry : _newSegmentStateMap.entrySet()) {
+      String segment = entry.getKey();
+      NewSegmentState newSegmentState = entry.getValue();
+      List<SegmentInstanceCandidate> candidates = newSegmentState.getCandidates();
+      List<SegmentInstanceCandidate> enabledCandidates = new ArrayList<>(candidates.size());
+      for (SegmentInstanceCandidate candidate : candidates) {
+        if (_enabledInstances.contains(candidate.getInstance())) {
+          enabledCandidates.add(candidate);
+        }
       }
+      if (!enabledCandidates.isEmpty()) {
+        instanceCandidatesMap.put(segment, enabledCandidates);
+      }
+      // Do not count new segment as unavailable
     }
+
+    _segmentStates = new SegmentStates(instanceCandidatesMap, unavailableSegments);
   }
 
   /**
-   * Calculates the enabled ONLINE/CONSUMING instances for the given segment, and updates the unavailable segments (no
-   * enabled instance or all enabled instances are in ERROR state).
+   * {@inheritDoc}
+   *
+   * <p>Updates the cached enabled instances and re-calculates {@code segmentToEnabledInstancesMap} and
+   * {@code unavailableSegments} based on the cached states.
    */
-  @Nullable
-  private List<String> calculateEnabledInstancesForSegment(String segment, List<String> onlineInstancesForSegment,
-      Set<String> unavailableSegments) {
-    List<String> enabledInstancesForSegment = new ArrayList<>(onlineInstancesForSegment.size());
-    for (String onlineInstance : onlineInstancesForSegment) {
-      if (_enabledInstances.contains(onlineInstance)) {
-        enabledInstancesForSegment.add(onlineInstance);
+  @Override
+  public void onInstancesChange(Set<String> enabledInstances, List<String> changedInstances) {
+    _enabledInstances = enabledInstances;
+    refreshSegmentStates();
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * <p>Updates the cached maps ({@code segmentToOnlineInstancesMap}, {@code segmentToOfflineInstancesMap} and
+   * {@code instanceToSegmentsMap}) and re-calculates {@code segmentToEnabledInstancesMap} and
+   * {@code unavailableSegments} based on the cached states.
+   */
+  @Override
+  public void onAssignmentChange(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
+    Map<String, Long> newSegmentPushTimeMap =
+        getNewSegmentPushTimeMapFromExistingStates(idealState, externalView, onlineSegments);
+    updateSegmentMaps(idealState, externalView, onlineSegments, newSegmentPushTimeMap);
+    refreshSegmentStates();
+  }
+
+  /**
+   * Returns a map from new segment to their push time based on the existing in-memory states.
+   */
+  Map<String, Long> getNewSegmentPushTimeMapFromExistingStates(IdealState idealState, ExternalView externalView,
+      Set<String> onlineSegments) {
+    Map<String, Long> newSegmentPushTimeMap = new HashMap<>();
+    long nowMillis = _clock.millis();
+    Map<String, Map<String, String>> idealStateAssignment = idealState.getRecord().getMapFields();
+    Map<String, Map<String, String>> externalViewAssignment = externalView.getRecord().getMapFields();
+    for (String segment : onlineSegments) {
+      NewSegmentState newSegmentState = _newSegmentStateMap.get(segment);
+      long pushTimeMillis = 0;
+      if (newSegmentState != null) {
+        // It was a new segment before, check the push time and segment state to see if it is still a new segment
+        if (InstanceSelector.isNewSegment(newSegmentState.getPushTimeMillis(), nowMillis)) {
+          pushTimeMillis = newSegmentState.getPushTimeMillis();
+        }
+      } else if (!_oldSegmentCandidatesMap.containsKey(segment)) {
+        // This is the first time we see this segment, use the current time as the push time
+        pushTimeMillis = nowMillis;
       }
-    }
-    if (!enabledInstancesForSegment.isEmpty()) {
-      return enabledInstancesForSegment;
-    } else {
-      // NOTE: When there are enabled instances in OFFLINE state, we don't count the segment as unavailable because it
-      //       is a valid state when the segment is new added.
-      List<String> offlineInstancesForSegment = _segmentToOfflineInstancesMap.get(segment);
-      for (String offlineInstance : offlineInstancesForSegment) {
-        if (_enabledInstances.contains(offlineInstance)) {
-          LOGGER.info(
-              "Failed to find servers hosting segment: {} for table: {} (all ONLINE/CONSUMING instances: {} are "
-                  + "disabled, but find enabled OFFLINE instance: {} from OFFLINE instances: {}, not counting the "
-                  + "segment as unavailable)", segment, _tableNameWithType, onlineInstancesForSegment, offlineInstance,
-              offlineInstancesForSegment);
-          return null;
+      // For recently pushed segment, check if it is qualified as new segment
+      if (pushTimeMillis > 0) {
+        assert idealStateAssignment.containsKey(segment);
+        if (isPotentialNewSegment(idealStateAssignment.get(segment), externalViewAssignment.get(segment))) {
+          newSegmentPushTimeMap.put(segment, pushTimeMillis);
         }
       }
-      LOGGER.warn(
-          "Failed to find servers hosting segment: {} for table: {} (all ONLINE/CONSUMING instances: {} and OFFLINE "
-              + "instances: {} are disabled, counting segment as unavailable)", segment, _tableNameWithType,
-          onlineInstancesForSegment, offlineInstancesForSegment);
-      unavailableSegments.add(segment);
-      _brokerMetrics.addMeteredTableValue(_tableNameWithType, BrokerMeter.NO_SERVING_HOST_FOR_SEGMENT, 1);
-      return null;
     }
+    return newSegmentPushTimeMap;
   }
 
   @Override
   public SelectionResult select(BrokerRequest brokerRequest, List<String> segments, long requestId) {
-    Map<String, String> queryOptions = (brokerRequest.getPinotQuery() != null
-        && brokerRequest.getPinotQuery().getQueryOptions() != null)
-        ? brokerRequest.getPinotQuery().getQueryOptions()
-        : Collections.emptyMap();
+    Map<String, String> queryOptions =
+        (brokerRequest.getPinotQuery() != null && brokerRequest.getPinotQuery().getQueryOptions() != null)
+            ? brokerRequest.getPinotQuery().getQueryOptions() : Collections.emptyMap();
     int requestIdInt = (int) (requestId % MAX_REQUEST_ID);
-    Map<String, String> segmentToInstanceMap = select(segments, requestIdInt, _segmentToEnabledInstancesMap,
-        queryOptions);
-    Set<String> unavailableSegments = _unavailableSegments;
+    // Copy the volatile reference so that segmentToInstanceMap and unavailableSegments can have a consistent view of
+    // the state.
+    SegmentStates segmentStates = _segmentStates;
+    Map<String, String> segmentToInstanceMap = select(segments, requestIdInt, segmentStates, queryOptions);
+    Set<String> unavailableSegments = segmentStates.getUnavailableSegments();
     if (unavailableSegments.isEmpty()) {
       return new SelectionResult(segmentToInstanceMap, Collections.emptyList());
     } else {
@@ -288,11 +405,9 @@ public SelectionResult select(BrokerRequest brokerRequest, List<String> segments
   }
 
   /**
-   * Selects the server instances for the given segments based on the request id and segment to enabled ONLINE/CONSUMING
-   * instances map, returns a map from segment to selected server instance hosting the segment.
-   * <p>NOTE: {@code segmentToEnabledInstancesMap} might contain {@code null} values (segment with no enabled
-   * ONLINE/CONSUMING instances). If enabled instances are not {@code null}, they are sorted in alphabetical order.
+   * Selects the server instances for the given segments based on the request id and segment states. Returns a map
+   * from segment to selected server instance hosting the segment.
    */
-  abstract Map<String, String> select(List<String> segments, int requestId,
-      Map<String, List<String>> segmentToEnabledInstancesMap, Map<String, String> queryOptions);
+  abstract Map<String, String> select(List<String> segments, int requestId, SegmentStates segmentStates,
+      Map<String, String> queryOptions);
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelector.java
index 4c96007fd62..12017c56c28 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelector.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
 import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelector;
@@ -31,6 +32,11 @@
  * The instance selector selects server instances to serve the query based on the selected segments.
  */
 public interface InstanceSelector {
+  long NEW_SEGMENT_EXPIRATION_MILLIS = TimeUnit.MINUTES.toMillis(5);
+
+  static boolean isNewSegment(long pushMillis, long nowMillis) {
+    return nowMillis - pushMillis <= NEW_SEGMENT_EXPIRATION_MILLIS;
+  }
 
   /**
    * Initializes the instance selector with the enabled instances, ideal state, external view and online segments
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java
index 8cc9f260f88..2428df02e54 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import java.time.Clock;
 import javax.annotation.Nullable;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
@@ -39,32 +40,44 @@ private InstanceSelectorFactory() {
   public static final String LEGACY_REPLICA_GROUP_OFFLINE_ROUTING = "PartitionAwareOffline";
   public static final String LEGACY_REPLICA_GROUP_REALTIME_ROUTING = "PartitionAwareRealtime";
 
+  public static InstanceSelector getInstanceSelector(TableConfig tableConfig,
+      ZkHelixPropertyStore<ZNRecord> propertyStore, BrokerMetrics brokerMetrics) {
+    return getInstanceSelector(tableConfig, propertyStore, brokerMetrics, null, Clock.systemUTC());
+  }
+
   public static InstanceSelector getInstanceSelector(TableConfig tableConfig,
       ZkHelixPropertyStore<ZNRecord> propertyStore, BrokerMetrics brokerMetrics,
       @Nullable AdaptiveServerSelector adaptiveServerSelector) {
+    return getInstanceSelector(tableConfig, propertyStore, brokerMetrics, adaptiveServerSelector, Clock.systemUTC());
+  }
+
+  public static InstanceSelector getInstanceSelector(TableConfig tableConfig,
+      ZkHelixPropertyStore<ZNRecord> propertyStore, BrokerMetrics brokerMetrics,
+      @Nullable AdaptiveServerSelector adaptiveServerSelector, Clock clock) {
     String tableNameWithType = tableConfig.getTableName();
     RoutingConfig routingConfig = tableConfig.getRoutingConfig();
     if (routingConfig != null) {
       if (RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE.equalsIgnoreCase(routingConfig.getInstanceSelectorType())
-          || (tableConfig.getTableType() == TableType.OFFLINE && LEGACY_REPLICA_GROUP_OFFLINE_ROUTING
-          .equalsIgnoreCase(routingConfig.getRoutingTableBuilderName())) || (
-          tableConfig.getTableType() == TableType.REALTIME && LEGACY_REPLICA_GROUP_REALTIME_ROUTING
-              .equalsIgnoreCase(routingConfig.getRoutingTableBuilderName()))) {
+          || (tableConfig.getTableType() == TableType.OFFLINE && LEGACY_REPLICA_GROUP_OFFLINE_ROUTING.equalsIgnoreCase(
+          routingConfig.getRoutingTableBuilderName())) || (tableConfig.getTableType() == TableType.REALTIME
+          && LEGACY_REPLICA_GROUP_REALTIME_ROUTING.equalsIgnoreCase(routingConfig.getRoutingTableBuilderName()))) {
         LOGGER.info("Using ReplicaGroupInstanceSelector for table: {}", tableNameWithType);
-        return new ReplicaGroupInstanceSelector(tableNameWithType, brokerMetrics, adaptiveServerSelector);
+        return new ReplicaGroupInstanceSelector(tableNameWithType, propertyStore, brokerMetrics, adaptiveServerSelector,
+            clock);
       }
-      if (RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE
-          .equalsIgnoreCase(routingConfig.getInstanceSelectorType())) {
+      if (RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE.equalsIgnoreCase(
+          routingConfig.getInstanceSelectorType())) {
         LOGGER.info("Using StrictReplicaGroupInstanceSelector for table: {}", tableNameWithType);
-        return new StrictReplicaGroupInstanceSelector(tableNameWithType, brokerMetrics, adaptiveServerSelector);
+        return new StrictReplicaGroupInstanceSelector(tableNameWithType, propertyStore, brokerMetrics,
+            adaptiveServerSelector, clock);
       }
       if (RoutingConfig.MULTI_STAGE_REPLICA_GROUP_SELECTOR_TYPE.equalsIgnoreCase(
           routingConfig.getInstanceSelectorType())) {
         LOGGER.info("Using {} for table: {}", routingConfig.getInstanceSelectorType(), tableNameWithType);
         return new MultiStageReplicaGroupSelector(tableNameWithType, propertyStore, brokerMetrics,
-            adaptiveServerSelector);
+            adaptiveServerSelector, clock);
       }
     }
-    return new BalancedInstanceSelector(tableNameWithType, brokerMetrics, adaptiveServerSelector);
+    return new BalancedInstanceSelector(tableNameWithType, propertyStore, brokerMetrics, adaptiveServerSelector, clock);
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/MultiStageReplicaGroupSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/MultiStageReplicaGroupSelector.java
index 0a6d66510cc..9be701ebe51 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/MultiStageReplicaGroupSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/MultiStageReplicaGroupSelector.java
@@ -20,6 +20,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import java.time.Clock;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -53,15 +54,11 @@
 public class MultiStageReplicaGroupSelector extends BaseInstanceSelector {
   private static final Logger LOGGER = LoggerFactory.getLogger(MultiStageReplicaGroupSelector.class);
 
-  private final String _tableNameWithType;
-  private final ZkHelixPropertyStore<ZNRecord> _propertyStore;
-  private InstancePartitions _instancePartitions;
+  private volatile InstancePartitions _instancePartitions;
 
   public MultiStageReplicaGroupSelector(String tableNameWithType, ZkHelixPropertyStore<ZNRecord> propertyStore,
-      BrokerMetrics brokerMetrics, @Nullable AdaptiveServerSelector adaptiveServerSelector) {
-    super(tableNameWithType, brokerMetrics, adaptiveServerSelector);
-    _tableNameWithType = tableNameWithType;
-    _propertyStore = propertyStore;
+      BrokerMetrics brokerMetrics, @Nullable AdaptiveServerSelector adaptiveServerSelector, Clock clock) {
+    super(tableNameWithType, propertyStore, brokerMetrics, adaptiveServerSelector, clock);
   }
 
   @Override
@@ -84,28 +81,28 @@ public void onAssignmentChange(IdealState idealState, ExternalView externalView,
   }
 
   @Override
-  Map<String, String> select(List<String> segments, int requestId,
-      Map<String, List<String>> segmentToEnabledInstancesMap, Map<String, String> queryOptions) {
+  Map<String, String> select(List<String> segments, int requestId, SegmentStates segmentStates,
+      Map<String, String> queryOptions) {
     // Create a copy of InstancePartitions to avoid race-condition with event-listeners above.
     InstancePartitions instancePartitions = _instancePartitions;
     int replicaGroupSelected = requestId % instancePartitions.getNumReplicaGroups();
     for (int iteration = 0; iteration < instancePartitions.getNumReplicaGroups(); iteration++) {
       int replicaGroup = (replicaGroupSelected + iteration) % instancePartitions.getNumReplicaGroups();
       try {
-        return tryAssigning(segmentToEnabledInstancesMap, instancePartitions, replicaGroup);
+        return tryAssigning(segments, segmentStates, instancePartitions, replicaGroup);
       } catch (Exception e) {
         LOGGER.warn("Unable to select replica-group {} for table: {}", replicaGroup, _tableNameWithType, e);
       }
     }
-    throw new RuntimeException(String.format("Unable to find any replica-group to serve table: %s",
-        _tableNameWithType));
+    throw new RuntimeException(
+        String.format("Unable to find any replica-group to serve table: %s", _tableNameWithType));
   }
 
   /**
    * Returns a map from the segmentName to the corresponding server in the given replica-group. If the is not enabled,
    * we throw an exception.
    */
-  private Map<String, String> tryAssigning(Map<String, List<String>> segmentToEnabledInstancesMap,
+  private Map<String, String> tryAssigning(List<String> segments, SegmentStates segmentStates,
       InstancePartitions instancePartitions, int replicaId) {
     Set<String> instanceLookUpSet = new HashSet<>();
     for (int partition = 0; partition < instancePartitions.getNumPartitions(); partition++) {
@@ -113,18 +110,23 @@ private Map<String, String> tryAssigning(Map<String, List<String>> segmentToEnab
       instanceLookUpSet.addAll(instances);
     }
     Map<String, String> result = new HashMap<>();
-    for (Map.Entry<String, List<String>> entry : segmentToEnabledInstancesMap.entrySet()) {
-      String segmentName = entry.getKey();
+    for (String segment : segments) {
+      List<SegmentInstanceCandidate> candidates = segmentStates.getCandidates(segment);
+      // If candidates are null, we will throw an exception and log a warning.
+      Preconditions.checkState(candidates != null, "Failed to find servers for segment: %s", segment);
       boolean found = false;
-      for (String enabledInstanceForSegment : entry.getValue()) {
-        if (instanceLookUpSet.contains(enabledInstanceForSegment)) {
+      for (SegmentInstanceCandidate candidate : candidates) {
+        String instance = candidate.getInstance();
+        if (instanceLookUpSet.contains(instance)) {
           found = true;
-          result.put(segmentName, enabledInstanceForSegment);
+          if (candidate.isOnline()) {
+            result.put(segment, instance);
+          }
           break;
         }
       }
       if (!found) {
-        throw new RuntimeException(String.format("Unable to find an enabled instance for segment: %s", segmentName));
+        throw new RuntimeException(String.format("Unable to find an enabled instance for segment: %s", segment));
       }
     }
     return result;
@@ -135,7 +137,7 @@ protected InstancePartitions getInstancePartitions() {
     // TODO: Evaluate whether we need to provide support for COMPLETE partitions.
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(_tableNameWithType);
     Preconditions.checkNotNull(tableType);
-    InstancePartitions instancePartitions = null;
+    InstancePartitions instancePartitions;
     if (tableType.equals(TableType.OFFLINE)) {
       instancePartitions = InstancePartitionsUtils.fetchInstancePartitions(_propertyStore,
           InstancePartitionsUtils.getInstancePartitionsName(_tableNameWithType, tableType.name()));
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/NewSegmentState.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/NewSegmentState.java
new file mode 100644
index 00000000000..c6c706e5a10
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/NewSegmentState.java
@@ -0,0 +1,51 @@
+/**
+ * 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.pinot.broker.routing.instanceselector;
+
+import java.util.List;
+import javax.annotation.concurrent.Immutable;
+
+
+/**
+ * Contains the push time and candidate instances for a new segment.
+ */
+@Immutable
+public class NewSegmentState {
+  // Segment push time. This could be
+  // 1) From ZK if we first see this segment via init call.
+  // 2) Use wall time, if first see this segment from onAssignmentChange call.
+  private final long _pushTimeMillis;
+
+  // List of SegmentInstanceCandidate: which contains instance name and online flags.
+  // The candidates have to be in instance sorted order.
+  private final List<SegmentInstanceCandidate> _candidates;
+
+  public NewSegmentState(long pushTimeMillis, List<SegmentInstanceCandidate> candidates) {
+    _pushTimeMillis = pushTimeMillis;
+    _candidates = candidates;
+  }
+
+  public long getPushTimeMillis() {
+    return _pushTimeMillis;
+  }
+
+  public List<SegmentInstanceCandidate> getCandidates() {
+    return _candidates;
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/ReplicaGroupInstanceSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/ReplicaGroupInstanceSelector.java
index 957e140c8e6..9aedaa8e664 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/ReplicaGroupInstanceSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/ReplicaGroupInstanceSelector.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import java.time.Clock;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,6 +27,8 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.broker.routing.adaptiveserverselector.AdaptiveServerSelector;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.utils.HashUtil;
@@ -60,20 +63,18 @@
  */
 public class ReplicaGroupInstanceSelector extends BaseInstanceSelector {
 
-  public ReplicaGroupInstanceSelector(String tableNameWithType, BrokerMetrics brokerMetrics,
-      @Nullable AdaptiveServerSelector adaptiveServerSelector) {
-    super(tableNameWithType, brokerMetrics, adaptiveServerSelector);
+  public ReplicaGroupInstanceSelector(String tableNameWithType, ZkHelixPropertyStore<ZNRecord> propertyStore,
+      BrokerMetrics brokerMetrics, @Nullable AdaptiveServerSelector adaptiveServerSelector, Clock clock) {
+    super(tableNameWithType, propertyStore, brokerMetrics, adaptiveServerSelector, clock);
   }
 
   @Override
-  Map<String, String> select(List<String> segments, int requestId,
-      Map<String, List<String>> segmentToEnabledInstancesMap, Map<String, String> queryOptions) {
-    Map<String, String> segmentToSelectedInstanceMap = new HashMap<>(HashUtil.getHashMapCapacity(segments.size()));
-
+  Map<String, String> select(List<String> segments, int requestId, SegmentStates segmentStates,
+      Map<String, String> queryOptions) {
     if (_adaptiveServerSelector != null) {
       // Adaptive Server Selection is enabled.
       List<String> serverRankList = new ArrayList<>();
-      List<String> candidateServers = fetchCandidateServersForQuery(segments, segmentToEnabledInstancesMap);
+      List<String> candidateServers = fetchCandidateServersForQuery(segments, segmentStates);
 
       // Fetch serverRankList before looping through all the segments. This is important to make sure that we pick
       // the least amount of instances for a query by referring to a single snapshot of the rankings.
@@ -82,97 +83,94 @@ Map<String, String> select(List<String> segments, int requestId,
       for (Pair<String, Double> entry : serverRankListWithScores) {
         serverRankList.add(entry.getLeft());
       }
-
-      selectServersUsingAdaptiverServerSelector(segments, requestId, segmentToSelectedInstanceMap,
-          segmentToEnabledInstancesMap, queryOptions, serverRankList);
+      return selectServersUsingAdaptiveServerSelector(segments, requestId, segmentStates, serverRankList);
     } else {
       // Adaptive Server Selection is NOT enabled.
-      selectServersUsingRoundRobin(segments, requestId, segmentToSelectedInstanceMap, segmentToEnabledInstancesMap,
-          queryOptions);
+      return selectServersUsingRoundRobin(segments, requestId, segmentStates, queryOptions);
     }
-
-    return segmentToSelectedInstanceMap;
   }
 
-  private void selectServersUsingRoundRobin(List<String> segments, int requestId,
-      Map<String, String> segmentToSelectedInstanceMap, Map<String, List<String>> segmentToEnabledInstancesMap,
-      Map<String, String> queryOptions) {
+  private Map<String, String> selectServersUsingRoundRobin(List<String> segments, int requestId,
+      SegmentStates segmentStates, Map<String, String> queryOptions) {
+    Map<String, String> selectedServers = new HashMap<>(HashUtil.getHashMapCapacity(segments.size()));
+    Integer numReplicaGroupsToQuery = QueryOptionsUtils.getNumReplicaGroupsToQuery(queryOptions);
+    int numReplicaGroups = numReplicaGroupsToQuery == null ? 1 : numReplicaGroupsToQuery;
     int replicaOffset = 0;
-    Integer replicaGroup = QueryOptionsUtils.getNumReplicaGroupsToQuery(queryOptions);
-    int numReplicaGroupsToQuery = replicaGroup == null ? 1 : replicaGroup;
-
     for (String segment : segments) {
-      // NOTE: enabledInstances can be null when there is no enabled instances for the segment, or the instance selector
-      // has not been updated (we update all components for routing in sequence)
-      List<String> enabledInstances = segmentToEnabledInstancesMap.get(segment);
-      if (enabledInstances == null) {
+      List<SegmentInstanceCandidate> candidates = segmentStates.getCandidates(segment);
+      // NOTE: candidates can be null when there is no enabled instances for the segment, or the instance selector has
+      // not been updated (we update all components for routing in sequence)
+      if (candidates == null) {
         continue;
       }
-
       // Round robin selection.
-      int numEnabledInstances = enabledInstances.size();
-      int instanceIdx = (requestId + replicaOffset) % numEnabledInstances;
-      String selectedInstance = enabledInstances.get(instanceIdx);
-
-      if (numReplicaGroupsToQuery > numEnabledInstances) {
-        numReplicaGroupsToQuery = numEnabledInstances;
+      int numCandidates = candidates.size();
+      int instanceIdx = (requestId + replicaOffset) % numCandidates;
+      SegmentInstanceCandidate selectedInstance = candidates.get(instanceIdx);
+      // Only put online instance.
+      // This can only be offline when it is a new segment.
+      if (selectedInstance.isOnline()) {
+        selectedServers.put(segment, selectedInstance.getInstance());
+      }
+      if (numReplicaGroups > numCandidates) {
+        numReplicaGroups = numCandidates;
       }
-      segmentToSelectedInstanceMap.put(segment, selectedInstance);
-      replicaOffset = (replicaOffset + 1) % numReplicaGroupsToQuery;
+      replicaOffset = (replicaOffset + 1) % numReplicaGroups;
     }
+    return selectedServers;
   }
 
-  private void selectServersUsingAdaptiverServerSelector(List<String> segments, int requestId,
-      Map<String, String> segmentToSelectedInstanceMap, Map<String, List<String>> segmentToEnabledInstancesMap,
-      Map<String, String> queryOptions, List<String> serverRankList) {
+  private Map<String, String> selectServersUsingAdaptiveServerSelector(List<String> segments, int requestId,
+      SegmentStates segmentStates, List<String> serverRankList) {
+    Map<String, String> selectedServers = new HashMap<>(HashUtil.getHashMapCapacity(segments.size()));
     for (String segment : segments) {
-      // NOTE: enabledInstances can be null when there is no enabled instances for the segment, or the instance selector
-      // has not been updated (we update all components for routing in sequence)
-      List<String> enabledInstances = segmentToEnabledInstancesMap.get(segment);
-      if (enabledInstances == null) {
+      // NOTE: candidates can be null when there is no enabled instances for the segment, or the instance selector has
+      // not been updated (we update all components for routing in sequence)
+      List<SegmentInstanceCandidate> candidates = segmentStates.getCandidates(segment);
+      if (candidates == null) {
         continue;
       }
-
       // Round Robin.
-      int numEnabledInstances = enabledInstances.size();
-      int instanceIdx = requestId % numEnabledInstances;
-      String selectedInstance = enabledInstances.get(instanceIdx);
-
+      int numCandidates = candidates.size();
+      int instanceIdx = requestId % numCandidates;
+      SegmentInstanceCandidate selectedInstance = candidates.get(instanceIdx);
       // Adaptive Server Selection
       // TODO: Support numReplicaGroupsToQuery with Adaptive Server Selection.
-      if (serverRankList.size() > 0) {
+      if (!serverRankList.isEmpty()) {
         int minIdx = Integer.MAX_VALUE;
-        for (int i = 0; i < numEnabledInstances; i++) {
-          int idx = serverRankList.indexOf(enabledInstances.get(i));
+        for (SegmentInstanceCandidate candidate : candidates) {
+          int idx = serverRankList.indexOf(candidate.getInstance());
           if (idx == -1) {
             // Let's use the round-robin approach until stats for all servers are populated.
-            selectedInstance = enabledInstances.get(instanceIdx);
+            selectedInstance = candidates.get(instanceIdx);
             break;
           }
           if (idx < minIdx) {
             minIdx = idx;
-            selectedInstance = enabledInstances.get(i);
+            selectedInstance = candidate;
           }
         }
       }
-
-      segmentToSelectedInstanceMap.put(segment, selectedInstance);
+      // Only put online instance.
+      // This can only be offline when it is a new segment.
+      if (selectedInstance.isOnline()) {
+        selectedServers.put(segment, selectedInstance.getInstance());
+      }
     }
+    return selectedServers;
   }
 
-  private List<String> fetchCandidateServersForQuery(List<String> segments,
-      Map<String, List<String>> segmentToEnabledInstancesMap) {
-    List<String> serversList = new ArrayList<>();
-
-    Set<String> tempServerSet = new HashSet<>();
+  private List<String> fetchCandidateServersForQuery(List<String> segments, SegmentStates segmentStates) {
+    Set<String> candidateServers = new HashSet<>();
     for (String segment : segments) {
-      List<String> enabledInstances = segmentToEnabledInstancesMap.get(segment);
-      if (enabledInstances != null) {
-        tempServerSet.addAll(enabledInstances);
+      List<SegmentInstanceCandidate> candidates = segmentStates.getCandidates(segment);
+      if (candidates == null) {
+        continue;
+      }
+      for (SegmentInstanceCandidate candidate : candidates) {
+        candidateServers.add(candidate.getInstance());
       }
     }
-
-    serversList.addAll(tempServerSet);
-    return serversList;
+    return new ArrayList<>(candidateServers);
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/SegmentInstanceCandidate.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/SegmentInstanceCandidate.java
new file mode 100644
index 00000000000..97c8f08f6b1
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/SegmentInstanceCandidate.java
@@ -0,0 +1,44 @@
+/**
+ * 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.pinot.broker.routing.instanceselector;
+
+import javax.annotation.concurrent.Immutable;
+
+
+/**
+ * Represents an instance candidate for a segment.
+ */
+@Immutable
+public class SegmentInstanceCandidate {
+  private final String _instance;
+  private final boolean _online;
+
+  public SegmentInstanceCandidate(String instance, boolean online) {
+    _instance = instance;
+    _online = online;
+  }
+
+  public String getInstance() {
+    return _instance;
+  }
+
+  public boolean isOnline() {
+    return _online;
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/SegmentStates.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/SegmentStates.java
new file mode 100644
index 00000000000..2f80d843e70
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/SegmentStates.java
@@ -0,0 +1,57 @@
+/**
+ * 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.pinot.broker.routing.instanceselector;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+
+/**
+ * The {@code SegmentStates} contains the candidate instances for each segment, and the unavailable segments for routing
+ * purpose.
+ *
+ * For old segments, the instance candidates should always have online flag set to true.
+ * For old segments without any enabled instance candidates, we report them as unavailable segments.
+ *
+ * For new segments, the online flag within the instance candidates indicates whether the instance is online or not.
+ * We don't report new segments as unavailable segments because it is valid for new segments to be offline.
+ */
+@Immutable
+public class SegmentStates {
+  private final Map<String, List<SegmentInstanceCandidate>> _instanceCandidatesMap;
+  private final Set<String> _unavailableSegments;
+
+  public SegmentStates(Map<String, List<SegmentInstanceCandidate>> instanceCandidatesMap,
+      Set<String> unavailableSegments) {
+    _instanceCandidatesMap = instanceCandidatesMap;
+    _unavailableSegments = unavailableSegments;
+  }
+
+  @Nullable
+  public List<SegmentInstanceCandidate> getCandidates(String segment) {
+    return _instanceCandidatesMap.get(segment);
+  }
+
+  public Set<String> getUnavailableSegments() {
+    return _unavailableSegments;
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/StrictReplicaGroupInstanceSelector.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/StrictReplicaGroupInstanceSelector.java
index 248cff0d1c6..b00cf851c70 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/StrictReplicaGroupInstanceSelector.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/StrictReplicaGroupInstanceSelector.java
@@ -18,19 +18,22 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import java.time.Clock;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 import javax.annotation.Nullable;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.broker.routing.adaptiveserverselector.AdaptiveServerSelector;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.utils.HashUtil;
-import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
 
 
 /**
@@ -58,128 +61,108 @@
  * transitioning/error scenario (external view does not match ideal state), if a segment is down on S1, we mark all
  * segments with the same assignment ([S1, S2, S3]) down on S1 to ensure that we always route the segments to the same
  * replica-group.
+ *
+ * Note that new segments won't be used to exclude instances from serving when the segment is unavailable.
  * </pre>
  */
 public class StrictReplicaGroupInstanceSelector extends ReplicaGroupInstanceSelector {
 
-  public StrictReplicaGroupInstanceSelector(String tableNameWithType, BrokerMetrics brokerMetrics, @Nullable
-      AdaptiveServerSelector adaptiveServerSelector) {
-    super(tableNameWithType, brokerMetrics, adaptiveServerSelector);
+  public StrictReplicaGroupInstanceSelector(String tableNameWithType, ZkHelixPropertyStore<ZNRecord> propertyStore,
+      BrokerMetrics brokerMetrics, @Nullable AdaptiveServerSelector adaptiveServerSelector, Clock clock) {
+    super(tableNameWithType, propertyStore, brokerMetrics, adaptiveServerSelector, clock);
   }
 
   /**
    * {@inheritDoc}
    *
    * <pre>
+   * Instances unavailable for any old segment should not exist in _oldSegmentCandidatesMap or _newSegmentStateMap for
+   * segments with the same instances in ideal state.
+   *
    * The maps are calculated in the following steps to meet the strict replica-group guarantee:
-   *   1. Create a map from online segment to set of instances hosting the segment based on the ideal state
-   *   2. Gather the online and offline instances for each online segment from the external view
-   *   3. Compare the instances from the ideal state and the external view and gather the unavailable instances for each
-   *      set of instances
-   *   4. Exclude the unavailable instances from the online instances map
+   *   1. Compute the online instances for both old and new segments
+   *   2. Compare online instances for old segments with instances in ideal state and gather the unavailable instances
+   *   for each set of instances
+   *   3. Exclude the unavailable instances from the online instances map for both old and new segment map
    * </pre>
    */
   @Override
   void updateSegmentMaps(IdealState idealState, ExternalView externalView, Set<String> onlineSegments,
-      Map<String, List<String>> segmentToOnlineInstancesMap, Map<String, List<String>> segmentToOfflineInstancesMap,
-      Map<String, List<String>> instanceToSegmentsMap) {
-    // TODO: Add support for AdaptiveServerSelection.
-    // Iterate over the ideal state to fill up 'idealStateSegmentToInstancesMap' which is a map from segment to set of
-    // instances hosting the segment in the ideal state
-    int segmentMapCapacity = HashUtil.getHashMapCapacity(onlineSegments.size());
-    Map<String, Set<String>> idealStateSegmentToInstancesMap = new HashMap<>(segmentMapCapacity);
-    for (Map.Entry<String, Map<String, String>> entry : idealState.getRecord().getMapFields().entrySet()) {
-      String segment = entry.getKey();
-      // Only track online segments
-      if (!onlineSegments.contains(segment)) {
-        continue;
-      }
-      idealStateSegmentToInstancesMap.put(segment, entry.getValue().keySet());
-    }
+      Map<String, Long> newSegmentPushTimeMap) {
+    _oldSegmentCandidatesMap.clear();
+    int newSegmentMapCapacity = HashUtil.getHashMapCapacity(newSegmentPushTimeMap.size());
+    _newSegmentStateMap = new HashMap<>(newSegmentMapCapacity);
 
-    // Iterate over the external view to fill up 'tempSegmentToOnlineInstancesMap' and 'segmentToOfflineInstancesMap'.
-    // 'tempSegmentToOnlineInstancesMap' is a temporary map from segment to set of instances that are in the ideal state
-    // and also ONLINE/CONSUMING in the external view. This map does not have the strict replica-group guarantee, and
-    // will be used to calculate the final 'segmentToOnlineInstancesMap'.
-    Map<String, Set<String>> tempSegmentToOnlineInstancesMap = new HashMap<>(segmentMapCapacity);
-    for (Map.Entry<String, Map<String, String>> entry : externalView.getRecord().getMapFields().entrySet()) {
-      String segment = entry.getKey();
-      Set<String> instancesInIdealState = idealStateSegmentToInstancesMap.get(segment);
-      // Only track online segments
-      if (instancesInIdealState == null) {
-        continue;
+    Map<String, Map<String, String>> idealStateAssignment = idealState.getRecord().getMapFields();
+    Map<String, Map<String, String>> externalViewAssignment = externalView.getRecord().getMapFields();
+
+    // Get the online instances for the segments
+    Map<String, Set<String>> oldSegmentToOnlineInstancesMap =
+        new HashMap<>(HashUtil.getHashMapCapacity(onlineSegments.size()));
+    Map<String, Set<String>> newSegmentToOnlineInstancesMap = new HashMap<>(newSegmentMapCapacity);
+    for (String segment : onlineSegments) {
+      Map<String, String> idealStateInstanceStateMap = idealStateAssignment.get(segment);
+      assert idealStateInstanceStateMap != null;
+      Map<String, String> externalViewInstanceStateMap = externalViewAssignment.get(segment);
+      Set<String> onlineInstances;
+      if (externalViewInstanceStateMap == null) {
+        onlineInstances = Collections.emptySet();
+      } else {
+        onlineInstances = getOnlineInstances(idealStateInstanceStateMap, externalViewInstanceStateMap);
       }
-      Map<String, String> instanceStateMap = entry.getValue();
-      Set<String> tempOnlineInstances = new TreeSet<>();
-      List<String> offlineInstances = new ArrayList<>();
-      tempSegmentToOnlineInstancesMap.put(segment, tempOnlineInstances);
-      segmentToOfflineInstancesMap.put(segment, offlineInstances);
-      for (Map.Entry<String, String> instanceStateEntry : instanceStateMap.entrySet()) {
-        String instance = instanceStateEntry.getKey();
-        // Only track instances within the ideal state
-        if (!instancesInIdealState.contains(instance)) {
-          continue;
-        }
-        String state = instanceStateEntry.getValue();
-        if (state.equals(SegmentStateModel.ONLINE) || state.equals(SegmentStateModel.CONSUMING)) {
-          tempOnlineInstances.add(instance);
-        } else if (state.equals(SegmentStateModel.OFFLINE)) {
-          offlineInstances.add(instance);
-          instanceToSegmentsMap.computeIfAbsent(instance, k -> new ArrayList<>()).add(segment);
-        }
+      if (newSegmentPushTimeMap.containsKey(segment)) {
+        newSegmentToOnlineInstancesMap.put(segment, onlineInstances);
+      } else {
+        oldSegmentToOnlineInstancesMap.put(segment, onlineInstances);
       }
     }
 
-    // Iterate over the 'tempSegmentToOnlineInstancesMap' to gather the unavailable instances for each set of instances
+    // Calculate the unavailable instances based on the old segments' online instances for each combination of instances
+    // in the ideal state
     Map<Set<String>, Set<String>> unavailableInstancesMap = new HashMap<>();
-    for (Map.Entry<String, Set<String>> entry : tempSegmentToOnlineInstancesMap.entrySet()) {
+    for (Map.Entry<String, Set<String>> entry : oldSegmentToOnlineInstancesMap.entrySet()) {
       String segment = entry.getKey();
-      Set<String> tempOnlineInstances = entry.getValue();
-      Set<String> instancesInIdealState = idealStateSegmentToInstancesMap.get(segment);
-      // NOTE: When a segment is unavailable on all the instances, do not count all the instances as unavailable because
-      //       this segment is unavailable and won't be included in the routing table, thus not breaking the requirement
-      //       of routing to the same replica-group. This is normal for new added segments, and we don't want to mark
-      //       all instances down on all segments with the same assignment.
-      if (tempOnlineInstances.size() == instancesInIdealState.size() || tempOnlineInstances.isEmpty()) {
-        continue;
-      }
+      Set<String> instancesInIdealState = idealStateAssignment.get(segment).keySet();
       Set<String> unavailableInstances =
-          unavailableInstancesMap.computeIfAbsent(instancesInIdealState, k -> new TreeSet<>());
+          unavailableInstancesMap.computeIfAbsent(instancesInIdealState, k -> new HashSet<>());
       for (String instance : instancesInIdealState) {
-        if (!tempOnlineInstances.contains(instance)) {
+        if (!entry.getValue().contains(instance)) {
           unavailableInstances.add(instance);
         }
       }
     }
 
-    // Iterate over the 'tempSegmentToOnlineInstancesMap' again to fill up the 'segmentToOnlineInstancesMap' which has
-    // the strict replica-group guarantee
-    for (Map.Entry<String, Set<String>> entry : tempSegmentToOnlineInstancesMap.entrySet()) {
+    // Iterate over the maps and exclude the unavailable instances
+    for (Map.Entry<String, Set<String>> entry : oldSegmentToOnlineInstancesMap.entrySet()) {
       String segment = entry.getKey();
-      Set<String> tempOnlineInstances = entry.getValue();
-      // NOTE: Instances will be sorted here because 'tempOnlineInstances' is a TreeSet. We need the online instances to
-      //       be sorted for replica-group routing to work. For multiple segments with the same online instances, if the
-      //       list is sorted, the same index in the list will always point to the same instance.
-      List<String> onlineInstances = new ArrayList<>(tempOnlineInstances.size());
-      segmentToOnlineInstancesMap.put(segment, onlineInstances);
-
-      Set<String> instancesInIdealState = idealStateSegmentToInstancesMap.get(segment);
-      Set<String> unavailableInstances = unavailableInstancesMap.get(instancesInIdealState);
-      if (unavailableInstances == null) {
-        // No unavailable instance, add all instances as online instance
-        for (String instance : tempOnlineInstances) {
-          onlineInstances.add(instance);
-          instanceToSegmentsMap.computeIfAbsent(instance, k -> new ArrayList<>()).add(segment);
+      // NOTE: onlineInstances is either a TreeSet or an EmptySet (sorted)
+      Set<String> onlineInstances = entry.getValue();
+      Map<String, String> idealStateInstanceStateMap = idealStateAssignment.get(segment);
+      Set<String> unavailableInstances =
+          unavailableInstancesMap.getOrDefault(idealStateInstanceStateMap.keySet(), Collections.emptySet());
+      List<SegmentInstanceCandidate> candidates = new ArrayList<>(onlineInstances.size());
+      for (String instance : onlineInstances) {
+        if (!unavailableInstances.contains(instance)) {
+          candidates.add(new SegmentInstanceCandidate(instance, true));
         }
-      } else {
-        // Some instances are unavailable, add the remaining instances as online instance
-        for (String instance : tempOnlineInstances) {
-          if (!unavailableInstances.contains(instance)) {
-            onlineInstances.add(instance);
-            instanceToSegmentsMap.computeIfAbsent(instance, k -> new ArrayList<>()).add(segment);
-          }
+      }
+      _oldSegmentCandidatesMap.put(segment, candidates);
+    }
+
+    for (Map.Entry<String, Set<String>> entry : newSegmentToOnlineInstancesMap.entrySet()) {
+      String segment = entry.getKey();
+      Set<String> onlineInstances = entry.getValue();
+      Map<String, String> idealStateInstanceStateMap = idealStateAssignment.get(segment);
+      Set<String> unavailableInstances =
+          unavailableInstancesMap.getOrDefault(idealStateInstanceStateMap.keySet(), Collections.emptySet());
+      List<SegmentInstanceCandidate> candidates = new ArrayList<>(idealStateInstanceStateMap.size());
+      for (Map.Entry<String, String> instanceStateEntry : convertToSortedMap(idealStateInstanceStateMap).entrySet()) {
+        String instance = instanceStateEntry.getKey();
+        if (!unavailableInstances.contains(instance) && isOnlineForRouting(instanceStateEntry.getValue())) {
+          candidates.add(new SegmentInstanceCandidate(instance, onlineInstances.contains(instance)));
         }
       }
+      _newSegmentStateMap.put(segment, new NewSegmentState(newSegmentPushTimeMap.get(segment), candidates));
     }
   }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetchListener.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetchListener.java
new file mode 100644
index 00000000000..138291089da
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetchListener.java
@@ -0,0 +1,56 @@
+/**
+ * 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.pinot.broker.routing.segmentmetadata;
+
+import java.util.List;
+import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelector;
+
+
+/**
+ * Interface to register with {@link SegmentZkMetadataFetcher}.
+ *
+ * <p>When registered, SegmentZKMetadataFetcher will fetch {@link ZNRecord} for associated {@code onlineSegments} list
+ * or refreshed {@code segment}. Thus batch up all ZK access for segment metadata.
+ */
+public interface SegmentZkMetadataFetchListener {
+
+  /**
+   * Initializes the segment pruner with the ideal state, external view and online segments (segments with
+   * ONLINE/CONSUMING instances in the ideal state and pre-selected by the {@link SegmentPreSelector}). Should be called
+   * only once before calling other methods.
+   */
+  void init(IdealState idealState, ExternalView externalView, List<String> onlineSegments, List<ZNRecord> znRecords);
+
+  /**
+   * Processes the segment assignment (ideal state or external view) change based on the given online segments (segments
+   * with ONLINE/CONSUMING instances in the ideal state and pre-selected by the {@link SegmentPreSelector}).
+   */
+  void onAssignmentChange(IdealState idealState, ExternalView externalView, Set<String> onlineSegments,
+      List<String> pulledSegments, List<ZNRecord> znRecords);
+
+  /**
+   * Refreshes the metadata for the given segment (called when segment is getting refreshed).
+   */
+  void refreshSegment(String segment, @Nullable ZNRecord znRecord);
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetcher.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetcher.java
new file mode 100644
index 00000000000..b6d996e8f45
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetcher.java
@@ -0,0 +1,133 @@
+/**
+ * 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.pinot.broker.routing.segmentmetadata;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.helix.AccessOption;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+
+
+/**
+ * {@code SegmentZkMetadataFetcher} is used to cache {@link ZNRecord} stored in {@link ZkHelixPropertyStore} for
+ * segments.
+ */
+public class SegmentZkMetadataFetcher {
+  private final String _tableNameWithType;
+  private final ZkHelixPropertyStore<ZNRecord> _propertyStore;
+  private final String _segmentZKMetadataPathPrefix;
+  private final List<SegmentZkMetadataFetchListener> _listeners;
+  private final Set<String> _onlineSegmentsCached;
+
+  private boolean _initialized;
+
+  public SegmentZkMetadataFetcher(String tableNameWithType, ZkHelixPropertyStore<ZNRecord> propertyStore) {
+    _tableNameWithType = tableNameWithType;
+    _propertyStore = propertyStore;
+    _segmentZKMetadataPathPrefix = ZKMetadataProvider.constructPropertyStorePathForResource(tableNameWithType) + "/";
+    _listeners = new ArrayList<>();
+    _onlineSegmentsCached = new HashSet<>();
+    _initialized = false;
+  }
+
+  public void register(SegmentZkMetadataFetchListener listener) {
+    if (!_initialized) {
+      _listeners.add(listener);
+    } else {
+      throw new RuntimeException(
+          "Segment ZK metadata fetcher has already been initialized! Unable to register more listeners.");
+    }
+  }
+
+  public List<SegmentZkMetadataFetchListener> getListeners() {
+    return _listeners;
+  }
+
+  public void init(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
+    if (!_initialized) {
+      _initialized = true;
+      if (!_listeners.isEmpty()) {
+        // Bulk load partition info for all online segments
+        int numSegments = onlineSegments.size();
+        List<String> segments = new ArrayList<>(numSegments);
+        List<String> segmentZKMetadataPaths = new ArrayList<>(numSegments);
+        for (String segment : onlineSegments) {
+          segments.add(segment);
+          segmentZKMetadataPaths.add(_segmentZKMetadataPathPrefix + segment);
+        }
+        List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
+        for (SegmentZkMetadataFetchListener listener : _listeners) {
+          listener.init(idealState, externalView, segments, znRecords);
+        }
+        for (int i = 0; i < numSegments; i++) {
+          if (znRecords.get(i) != null) {
+            _onlineSegmentsCached.add(segments.get(i));
+          }
+        }
+      }
+    } else {
+      throw new RuntimeException("Segment ZK metadata fetcher has already been initialized!");
+    }
+  }
+
+  public synchronized void onAssignmentChange(IdealState idealState, ExternalView externalView,
+      Set<String> onlineSegments) {
+    if (!_listeners.isEmpty()) {
+      List<String> segments = new ArrayList<>();
+      List<String> segmentZKMetadataPaths = new ArrayList<>();
+      for (String segment : onlineSegments) {
+        if (!_onlineSegmentsCached.contains(segment)) {
+          segments.add(segment);
+          segmentZKMetadataPaths.add(_segmentZKMetadataPathPrefix + segment);
+        }
+      }
+      List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
+      for (SegmentZkMetadataFetchListener listener : _listeners) {
+        listener.onAssignmentChange(idealState, externalView, onlineSegments, segments, znRecords);
+      }
+      int numSegments = segments.size();
+      for (int i = 0; i < numSegments; i++) {
+        if (znRecords.get(i) != null) {
+          _onlineSegmentsCached.add(segments.get(i));
+        }
+      }
+      _onlineSegmentsCached.retainAll(onlineSegments);
+    }
+  }
+
+  public synchronized void refreshSegment(String segment) {
+    if (!_listeners.isEmpty()) {
+      ZNRecord znRecord = _propertyStore.get(_segmentZKMetadataPathPrefix + segment, null, AccessOption.PERSISTENT);
+      for (SegmentZkMetadataFetchListener listener : _listeners) {
+        listener.refreshSegment(segment, znRecord);
+      }
+      if (znRecord != null) {
+        _onlineSegmentsCached.add(segment);
+      } else {
+        _onlineSegmentsCached.remove(segment);
+      }
+    }
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionInfo.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionInfo.java
new file mode 100644
index 00000000000..667c1f1c533
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionInfo.java
@@ -0,0 +1,48 @@
+/**
+ * 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.pinot.broker.routing.segmentpartition;
+
+import java.util.Set;
+import org.apache.pinot.segment.spi.partition.PartitionFunction;
+
+
+public class SegmentPartitionInfo {
+  private final String _partitionColumn;
+  private final PartitionFunction _partitionFunction;
+  private final Set<Integer> _partitions;
+
+  public SegmentPartitionInfo(String partitionColumn, PartitionFunction partitionFunction,
+      Set<Integer> partitions) {
+    _partitionColumn = partitionColumn;
+    _partitionFunction = partitionFunction;
+    _partitions = partitions;
+  }
+
+  public String getPartitionColumn() {
+    return _partitionColumn;
+  }
+
+  public PartitionFunction getPartitionFunction() {
+    return _partitionFunction;
+  }
+
+  public Set<Integer> getPartitions() {
+    return _partitions;
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionMetadataManager.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionMetadataManager.java
new file mode 100644
index 00000000000..0ed89225f38
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionMetadataManager.java
@@ -0,0 +1,217 @@
+/**
+ * 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.pinot.broker.routing.segmentpartition;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.broker.routing.segmentmetadata.SegmentZkMetadataFetchListener;
+import org.apache.pinot.core.routing.TablePartitionInfo;
+import org.apache.pinot.core.routing.TablePartitionInfo.PartitionInfo;
+import org.apache.pinot.segment.spi.partition.PartitionFunction;
+import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * The {@code PartitionDataManager} manages partitions of a table. It manages
+ *   1. all the online segments associated with the partition and their allocated servers
+ *   2. all the replica of a specific segment.
+ * It provides API to query
+ *   1. For each partition ID, what are the servers that contains ALL segments belong to this partition ID.
+ *   2. For each server, what are all the partition IDs and list of segments of those partition IDs on this server.
+ */
+public class SegmentPartitionMetadataManager implements SegmentZkMetadataFetchListener {
+  private static final Logger LOGGER = LoggerFactory.getLogger(SegmentPartitionMetadataManager.class);
+  private static final int INVALID_PARTITION_ID = -1;
+
+  private final String _tableNameWithType;
+
+  // static content, if anything changes for the following. a rebuild of routing table is needed.
+  private final String _partitionColumn;
+  private final String _partitionFunctionName;
+  private final int _numPartitions;
+
+  // cache-able content, only follow changes if onlineSegments list (of ideal-state) is changed.
+  private final Map<String, SegmentInfo> _segmentInfoMap = new HashMap<>();
+
+  // computed value based on status change.
+  private transient TablePartitionInfo _tablePartitionInfo;
+
+  public SegmentPartitionMetadataManager(String tableNameWithType, String partitionColumn, String partitionFunctionName,
+      int numPartitions) {
+    _tableNameWithType = tableNameWithType;
+    _partitionColumn = partitionColumn;
+    _partitionFunctionName = partitionFunctionName;
+    _numPartitions = numPartitions;
+  }
+
+  @Override
+  public void init(IdealState idealState, ExternalView externalView, List<String> onlineSegments,
+      List<ZNRecord> znRecords) {
+    int numSegments = onlineSegments.size();
+    for (int i = 0; i < numSegments; i++) {
+      String segment = onlineSegments.get(i);
+      SegmentPartitionInfo partitionInfo =
+          SegmentPartitionUtils.extractPartitionInfo(_tableNameWithType, _partitionColumn, segment, znRecords.get(i));
+      SegmentInfo segmentInfo = new SegmentInfo(getPartitionId(partitionInfo), getOnlineServers(externalView, segment));
+      _segmentInfoMap.put(segment, segmentInfo);
+    }
+    computeTablePartitionInfo();
+  }
+
+  private int getPartitionId(@Nullable SegmentPartitionInfo segmentPartitionInfo) {
+    if (segmentPartitionInfo == null || segmentPartitionInfo == SegmentPartitionUtils.INVALID_PARTITION_INFO) {
+      return INVALID_PARTITION_ID;
+    }
+    if (!_partitionColumn.equals(segmentPartitionInfo.getPartitionColumn())) {
+      return INVALID_PARTITION_ID;
+    }
+    PartitionFunction partitionFunction = segmentPartitionInfo.getPartitionFunction();
+    if (!_partitionFunctionName.equalsIgnoreCase(partitionFunction.getName())) {
+      return INVALID_PARTITION_ID;
+    }
+    if (_numPartitions != partitionFunction.getNumPartitions()) {
+      return INVALID_PARTITION_ID;
+    }
+    Set<Integer> partitions = segmentPartitionInfo.getPartitions();
+    if (partitions.size() != 1) {
+      return INVALID_PARTITION_ID;
+    }
+    return partitions.iterator().next();
+  }
+
+  private List<String> getOnlineServers(ExternalView externalView, String segment) {
+    Map<String, String> instanceStateMap = externalView.getStateMap(segment);
+    if (instanceStateMap == null) {
+      return Collections.emptyList();
+    }
+    List<String> onlineServers = new ArrayList<>(instanceStateMap.size());
+    for (Map.Entry<String, String> entry : instanceStateMap.entrySet()) {
+      String instanceState = entry.getValue();
+      if (instanceState.equals(SegmentStateModel.ONLINE) || instanceState.equals(SegmentStateModel.CONSUMING)) {
+        onlineServers.add(entry.getKey());
+      }
+    }
+    return onlineServers;
+  }
+
+  private void computeTablePartitionInfo() {
+    PartitionInfo[] partitionInfoMap = new PartitionInfo[_numPartitions];
+    Set<String> segmentsWithInvalidPartition = new HashSet<>();
+    for (Map.Entry<String, SegmentInfo> entry : _segmentInfoMap.entrySet()) {
+      String segment = entry.getKey();
+      SegmentInfo segmentInfo = entry.getValue();
+      int partitionId = segmentInfo._partitionId;
+      List<String> onlineServers = segmentInfo._onlineServers;
+      if (partitionId == INVALID_PARTITION_ID) {
+        segmentsWithInvalidPartition.add(segment);
+        continue;
+      }
+      PartitionInfo partitionInfo = partitionInfoMap[partitionId];
+      if (partitionInfo == null) {
+        Set<String> fullyReplicatedServers = new HashSet<>(onlineServers);
+        List<String> segments = new ArrayList<>();
+        segments.add(segment);
+        partitionInfo = new PartitionInfo(fullyReplicatedServers, segments);
+        partitionInfoMap[partitionId] = partitionInfo;
+      } else {
+        partitionInfo._fullyReplicatedServers.retainAll(onlineServers);
+        partitionInfo._segments.add(segment);
+      }
+    }
+    if (!segmentsWithInvalidPartition.isEmpty()) {
+      int numSegmentsWithInvalidPartition = segmentsWithInvalidPartition.size();
+      if (numSegmentsWithInvalidPartition <= 10) {
+        LOGGER.warn("Found {} segments: {} with invalid partition from table: {}", numSegmentsWithInvalidPartition,
+            segmentsWithInvalidPartition, _tableNameWithType);
+      } else {
+        LOGGER.warn("Found {} segments: {} with invalid partition from table: {}", numSegmentsWithInvalidPartition,
+            segmentsWithInvalidPartition, _tableNameWithType);
+      }
+    }
+    _tablePartitionInfo =
+        new TablePartitionInfo(_tableNameWithType, _partitionColumn, _partitionFunctionName, _numPartitions,
+            partitionInfoMap, segmentsWithInvalidPartition);
+  }
+
+  @Override
+  public synchronized void onAssignmentChange(IdealState idealState, ExternalView externalView,
+      Set<String> onlineSegments, List<String> pulledSegments, List<ZNRecord> znRecords) {
+    // Update segment partition id for the pulled segments
+    int numSegments = pulledSegments.size();
+    for (int i = 0; i < numSegments; i++) {
+      String segment = pulledSegments.get(i);
+      SegmentPartitionInfo partitionInfo =
+          SegmentPartitionUtils.extractPartitionInfo(_tableNameWithType, _partitionColumn, segment, znRecords.get(i));
+      SegmentInfo segmentInfo = new SegmentInfo(getPartitionId(partitionInfo), getOnlineServers(externalView, segment));
+      _segmentInfoMap.put(segment, segmentInfo);
+    }
+    // Update online servers for all online segments
+    for (String segment : onlineSegments) {
+      SegmentInfo segmentInfo = _segmentInfoMap.get(segment);
+      if (segmentInfo == null) {
+        segmentInfo = new SegmentInfo(INVALID_PARTITION_ID, getOnlineServers(externalView, segment));
+        _segmentInfoMap.put(segment, segmentInfo);
+      } else {
+        segmentInfo._onlineServers = getOnlineServers(externalView, segment);
+      }
+    }
+    _segmentInfoMap.keySet().retainAll(onlineSegments);
+    computeTablePartitionInfo();
+  }
+
+  @Override
+  public synchronized void refreshSegment(String segment, @Nullable ZNRecord znRecord) {
+    SegmentPartitionInfo partitionInfo =
+        SegmentPartitionUtils.extractPartitionInfo(_tableNameWithType, _partitionColumn, segment, znRecord);
+    int partitionId = getPartitionId(partitionInfo);
+    SegmentInfo segmentInfo = _segmentInfoMap.get(segment);
+    if (segmentInfo == null) {
+      segmentInfo = new SegmentInfo(partitionId, Collections.emptyList());
+      _segmentInfoMap.put(segment, segmentInfo);
+    } else {
+      segmentInfo._partitionId = partitionId;
+    }
+    computeTablePartitionInfo();
+  }
+
+  public TablePartitionInfo getTablePartitionInfo() {
+    return _tablePartitionInfo;
+  }
+
+  private static class SegmentInfo {
+    int _partitionId;
+    List<String> _onlineServers;
+
+    SegmentInfo(int partitionId, List<String> onlineServers) {
+      _partitionId = partitionId;
+      _onlineServers = onlineServers;
+    }
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionUtils.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionUtils.java
new file mode 100644
index 00000000000..ee3dac042b6
--- /dev/null
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionUtils.java
@@ -0,0 +1,139 @@
+/**
+ * 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.pinot.broker.routing.segmentpartition;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
+import org.apache.pinot.segment.spi.partition.metadata.ColumnPartitionMetadata;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SegmentPartitionUtils {
+  private SegmentPartitionUtils() {
+  }
+
+  public static final SegmentPartitionInfo INVALID_PARTITION_INFO = new SegmentPartitionInfo(null, null, null);
+  public static final Map<String, SegmentPartitionInfo> INVALID_COLUMN_PARTITION_INFO_MAP = Collections.emptyMap();
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(SegmentPartitionUtils.class);
+
+  /**
+   * Returns the partition info for a given segment with single partition column.
+   *
+   * NOTE: Returns {@code null} when the ZNRecord is missing (could be transient Helix issue). Returns
+   *       {@link #INVALID_PARTITION_INFO} when the segment does not have valid partition metadata in its ZK metadata,
+   *       in which case we won't retry later.
+   */
+  @Nullable
+  public static SegmentPartitionInfo extractPartitionInfo(String tableNameWithType, String partitionColumn,
+      String segment, @Nullable ZNRecord znRecord) {
+    if (znRecord == null) {
+      LOGGER.warn("Failed to find segment ZK metadata for segment: {}, table: {}", segment, tableNameWithType);
+      return null;
+    }
+
+    String partitionMetadataJson = znRecord.getSimpleField(CommonConstants.Segment.PARTITION_METADATA);
+    if (partitionMetadataJson == null) {
+      LOGGER.warn("Failed to find segment partition metadata for segment: {}, table: {}", segment, tableNameWithType);
+      return INVALID_PARTITION_INFO;
+    }
+
+    SegmentPartitionMetadata segmentPartitionMetadata;
+    try {
+      segmentPartitionMetadata = SegmentPartitionMetadata.fromJsonString(partitionMetadataJson);
+    } catch (Exception e) {
+      LOGGER.warn("Caught exception while extracting segment partition metadata for segment: {}, table: {}", segment,
+          tableNameWithType, e);
+      return INVALID_PARTITION_INFO;
+    }
+
+    ColumnPartitionMetadata columnPartitionMetadata =
+        segmentPartitionMetadata.getColumnPartitionMap().get(partitionColumn);
+    if (columnPartitionMetadata == null) {
+      LOGGER.warn("Failed to find column partition metadata for column: {}, segment: {}, table: {}", partitionColumn,
+          segment, tableNameWithType);
+      return INVALID_PARTITION_INFO;
+    }
+
+    return new SegmentPartitionInfo(partitionColumn,
+        PartitionFunctionFactory.getPartitionFunction(columnPartitionMetadata.getFunctionName(),
+            columnPartitionMetadata.getNumPartitions(), columnPartitionMetadata.getFunctionConfig()),
+        columnPartitionMetadata.getPartitions());
+  }
+
+  /**
+   * Returns a map from partition column name to partition info for a given segment with multiple partition columns.
+   *
+   * NOTE: Returns {@code null} when the ZNRecord is missing (could be transient Helix issue). Returns
+   *       {@link #INVALID_COLUMN_PARTITION_INFO_MAP} when the segment does not have valid partition metadata in its ZK
+   *       metadata, in which case we won't retry later.
+   */
+  @Nullable
+  public static Map<String, SegmentPartitionInfo> extractPartitionInfoMap(String tableNameWithType,
+      Set<String> partitionColumns, String segment, @Nullable ZNRecord znRecord) {
+    if (znRecord == null) {
+      LOGGER.warn("Failed to find segment ZK metadata for segment: {}, table: {}", segment, tableNameWithType);
+      return null;
+    }
+
+    String partitionMetadataJson = znRecord.getSimpleField(CommonConstants.Segment.PARTITION_METADATA);
+    if (partitionMetadataJson == null) {
+      LOGGER.warn("Failed to find segment partition metadata for segment: {}, table: {}", segment, tableNameWithType);
+      return INVALID_COLUMN_PARTITION_INFO_MAP;
+    }
+
+    SegmentPartitionMetadata segmentPartitionMetadata;
+    try {
+      segmentPartitionMetadata = SegmentPartitionMetadata.fromJsonString(partitionMetadataJson);
+    } catch (Exception e) {
+      LOGGER.warn("Caught exception while extracting segment partition metadata for segment: {}, table: {}", segment,
+          tableNameWithType, e);
+      return INVALID_COLUMN_PARTITION_INFO_MAP;
+    }
+
+    Map<String, SegmentPartitionInfo> columnSegmentPartitionInfoMap = new HashMap<>();
+    for (String partitionColumn : partitionColumns) {
+      ColumnPartitionMetadata columnPartitionMetadata =
+          segmentPartitionMetadata.getColumnPartitionMap().get(partitionColumn);
+      if (columnPartitionMetadata == null) {
+        LOGGER.warn("Failed to find column partition metadata for column: {}, segment: {}, table: {}", partitionColumn,
+            segment, tableNameWithType);
+        continue;
+      }
+      SegmentPartitionInfo segmentPartitionInfo = new SegmentPartitionInfo(partitionColumn,
+          PartitionFunctionFactory.getPartitionFunction(columnPartitionMetadata.getFunctionName(),
+              columnPartitionMetadata.getNumPartitions(), columnPartitionMetadata.getFunctionConfig()),
+          columnPartitionMetadata.getPartitions());
+      columnSegmentPartitionInfoMap.put(partitionColumn, segmentPartitionInfo);
+    }
+    if (columnSegmentPartitionInfoMap.size() == 1) {
+      String partitionColumn = columnSegmentPartitionInfoMap.keySet().iterator().next();
+      return Collections.singletonMap(partitionColumn, columnSegmentPartitionInfoMap.get(partitionColumn));
+    }
+    return columnSegmentPartitionInfoMap.isEmpty() ? INVALID_COLUMN_PARTITION_INFO_MAP : columnSegmentPartitionInfoMap;
+  }
+}
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java
index 7a7b66b0869..aeb6a01f2e9 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/EmptySegmentPruner.java
@@ -18,18 +18,14 @@
  */
 package org.apache.pinot.broker.routing.segmentpruner;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
-import org.apache.helix.AccessOption;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.utils.CommonConstants;
@@ -45,35 +41,23 @@ public class EmptySegmentPruner implements SegmentPruner {
   private static final Logger LOGGER = LoggerFactory.getLogger(EmptySegmentPruner.class);
 
   private final String _tableNameWithType;
-  private final ZkHelixPropertyStore<ZNRecord> _propertyStore;
-  private final String _segmentZKMetadataPathPrefix;
 
   private final Set<String> _segmentsLoaded = new HashSet<>();
   private final Set<String> _emptySegments = ConcurrentHashMap.newKeySet();
 
   private volatile ResultCache _resultCache;
 
-  public EmptySegmentPruner(TableConfig tableConfig, ZkHelixPropertyStore<ZNRecord> propertyStore) {
+  public EmptySegmentPruner(TableConfig tableConfig) {
     _tableNameWithType = tableConfig.getTableName();
-    _propertyStore = propertyStore;
-    _segmentZKMetadataPathPrefix = ZKMetadataProvider.constructPropertyStorePathForResource(_tableNameWithType) + "/";
   }
 
   @Override
-  public void init(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
+  public void init(IdealState idealState, ExternalView externalView, List<String> onlineSegments,
+      List<ZNRecord> znRecords) {
     // Bulk load info for all online segments
-    int numSegments = onlineSegments.size();
-    List<String> segments = new ArrayList<>(numSegments);
-    List<String> segmentZKMetadataPaths = new ArrayList<>(numSegments);
-    for (String segment : onlineSegments) {
-      segments.add(segment);
-      segmentZKMetadataPaths.add(_segmentZKMetadataPathPrefix + segment);
-    }
-    _segmentsLoaded.addAll(segments);
-    List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
-    for (int i = 0; i < numSegments; i++) {
-      String segment = segments.get(i);
-      if (isEmpty(segment, znRecords.get(i))) {
+    for (int idx = 0; idx < onlineSegments.size(); idx++) {
+      String segment = onlineSegments.get(idx);
+      if (isEmpty(segment, znRecords.get(idx))) {
         _emptySegments.add(segment);
       }
     }
@@ -81,14 +65,14 @@ public void init(IdealState idealState, ExternalView externalView, Set<String> o
 
   @Override
   public synchronized void onAssignmentChange(IdealState idealState, ExternalView externalView,
-      Set<String> onlineSegments) {
+      Set<String> onlineSegments, List<String> pulledSegments, List<ZNRecord> znRecords) {
     // NOTE: We don't update all the segment ZK metadata for every external view change, but only the new added/removed
     //       ones. The refreshed segment ZK metadata change won't be picked up.
     boolean emptySegmentsChanged = false;
-    for (String segment : onlineSegments) {
+    for (int idx = 0; idx < pulledSegments.size(); idx++) {
+      String segment = pulledSegments.get(idx);
       if (_segmentsLoaded.add(segment)) {
-        if (isEmpty(segment,
-            _propertyStore.get(_segmentZKMetadataPathPrefix + segment, null, AccessOption.PERSISTENT))) {
+        if (isEmpty(segment, znRecords.get(idx))) {
           emptySegmentsChanged |= _emptySegments.add(segment);
         }
       }
@@ -103,9 +87,9 @@ public synchronized void onAssignmentChange(IdealState idealState, ExternalView
   }
 
   @Override
-  public synchronized void refreshSegment(String segment) {
+  public synchronized void refreshSegment(String segment, @Nullable ZNRecord znRecord) {
     _segmentsLoaded.add(segment);
-    if (isEmpty(segment, _propertyStore.get(_segmentZKMetadataPathPrefix + segment, null, AccessOption.PERSISTENT))) {
+    if (isEmpty(segment, znRecord)) {
       if (_emptySegments.add(segment)) {
         // Reset the result cache when empty segments changed
         _resultCache = null;
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/MultiPartitionColumnsSegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/MultiPartitionColumnsSegmentPruner.java
index dd4edb686b8..b05ab4e55b9 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/MultiPartitionColumnsSegmentPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/MultiPartitionColumnsSegmentPruner.java
@@ -19,33 +19,22 @@
 package org.apache.pinot.broker.routing.segmentpruner;
 
 import com.google.common.annotations.VisibleForTesting;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
-import org.apache.helix.AccessOption;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+import org.apache.pinot.broker.routing.segmentpartition.SegmentPartitionInfo;
+import org.apache.pinot.broker.routing.segmentpartition.SegmentPartitionUtils;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.Identifier;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
-import org.apache.pinot.segment.spi.partition.metadata.ColumnPartitionMetadata;
-import org.apache.pinot.spi.utils.CommonConstants.Segment;
 import org.apache.pinot.sql.FilterKind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -53,111 +42,49 @@
  * pruner supports queries with filter (or nested filter) of EQUALITY and IN predicates.
  */
 public class MultiPartitionColumnsSegmentPruner implements SegmentPruner {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MultiPartitionColumnsSegmentPruner.class);
-  private static final Map<String, PartitionInfo> INVALID_COLUMN_PARTITION_INFO_MAP = Collections.emptyMap();
-
   private final String _tableNameWithType;
   private final Set<String> _partitionColumns;
-  private final ZkHelixPropertyStore<ZNRecord> _propertyStore;
-  private final String _segmentZKMetadataPathPrefix;
-  private final Map<String, Map<String, PartitionInfo>> _segmentColumnPartitionInfoMap = new ConcurrentHashMap<>();
+  private final Map<String, Map<String, SegmentPartitionInfo>> _segmentColumnPartitionInfoMap =
+      new ConcurrentHashMap<>();
 
-  public MultiPartitionColumnsSegmentPruner(String tableNameWithType, Set<String> partitionColumns,
-      ZkHelixPropertyStore<ZNRecord> propertyStore) {
+  public MultiPartitionColumnsSegmentPruner(String tableNameWithType, Set<String> partitionColumns) {
     _tableNameWithType = tableNameWithType;
     _partitionColumns = partitionColumns;
-    _propertyStore = propertyStore;
-    _segmentZKMetadataPathPrefix = ZKMetadataProvider.constructPropertyStorePathForResource(tableNameWithType) + "/";
   }
 
   @Override
-  public void init(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
+  public void init(IdealState idealState, ExternalView externalView, List<String> onlineSegments,
+      List<ZNRecord> znRecords) {
     // Bulk load partition info for all online segments
-    int numSegments = onlineSegments.size();
-    List<String> segments = new ArrayList<>(numSegments);
-    List<String> segmentZKMetadataPaths = new ArrayList<>(numSegments);
-    for (String segment : onlineSegments) {
-      segments.add(segment);
-      segmentZKMetadataPaths.add(_segmentZKMetadataPathPrefix + segment);
-    }
-    List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
-    for (int i = 0; i < numSegments; i++) {
-      String segment = segments.get(i);
-      Map<String, PartitionInfo> columnPartitionInfoMap =
-          extractColumnPartitionInfoMapFromSegmentZKMetadataZNRecord(segment, znRecords.get(i));
+    for (int idx = 0; idx < onlineSegments.size(); idx++) {
+      String segment = onlineSegments.get(idx);
+      Map<String, SegmentPartitionInfo> columnPartitionInfoMap =
+          SegmentPartitionUtils.extractPartitionInfoMap(_tableNameWithType, _partitionColumns, segment,
+              znRecords.get(idx));
       if (columnPartitionInfoMap != null) {
         _segmentColumnPartitionInfoMap.put(segment, columnPartitionInfoMap);
       }
     }
   }
 
-  /**
-   * NOTE: Returns {@code null} when the ZNRecord is missing (could be transient Helix issue). Returns
-   *       {@link #INVALID_COLUMN_PARTITION_INFO_MAP} when the segment does not have valid partition metadata in its ZK
-   *       metadata, in which case we won't retry later.
-   */
-  @Nullable
-  private Map<String, PartitionInfo> extractColumnPartitionInfoMapFromSegmentZKMetadataZNRecord(String segment,
-      @Nullable ZNRecord znRecord) {
-    if (znRecord == null) {
-      LOGGER.warn("Failed to find segment ZK metadata for segment: {}, table: {}", segment, _tableNameWithType);
-      return null;
-    }
-
-    String partitionMetadataJson = znRecord.getSimpleField(Segment.PARTITION_METADATA);
-    if (partitionMetadataJson == null) {
-      LOGGER.warn("Failed to find segment partition metadata for segment: {}, table: {}", segment, _tableNameWithType);
-      return INVALID_COLUMN_PARTITION_INFO_MAP;
-    }
-
-    SegmentPartitionMetadata segmentPartitionMetadata;
-    try {
-      segmentPartitionMetadata = SegmentPartitionMetadata.fromJsonString(partitionMetadataJson);
-    } catch (Exception e) {
-      LOGGER.warn("Caught exception while extracting segment partition metadata for segment: {}, table: {}", segment,
-          _tableNameWithType, e);
-      return INVALID_COLUMN_PARTITION_INFO_MAP;
-    }
-
-    Map<String, PartitionInfo> columnPartitionInfoMap = new HashMap<>();
-    for (String partitionColumn : _partitionColumns) {
-      ColumnPartitionMetadata columnPartitionMetadata =
-          segmentPartitionMetadata.getColumnPartitionMap().get(partitionColumn);
-      if (columnPartitionMetadata == null) {
-        LOGGER.warn("Failed to find column partition metadata for column: {}, segment: {}, table: {}", partitionColumn,
-            segment, _tableNameWithType);
-        continue;
-      }
-      PartitionInfo partitionInfo = new PartitionInfo(
-          PartitionFunctionFactory.getPartitionFunction(columnPartitionMetadata.getFunctionName(),
-              columnPartitionMetadata.getNumPartitions(), columnPartitionMetadata.getFunctionConfig()),
-          columnPartitionMetadata.getPartitions());
-      columnPartitionInfoMap.put(partitionColumn, partitionInfo);
-    }
-    if (columnPartitionInfoMap.size() == 1) {
-      String partitionColumn = columnPartitionInfoMap.keySet().iterator().next();
-      return Collections.singletonMap(partitionColumn, columnPartitionInfoMap.get(partitionColumn));
-    }
-    return columnPartitionInfoMap.isEmpty() ? INVALID_COLUMN_PARTITION_INFO_MAP : columnPartitionInfoMap;
-  }
-
   @Override
   public synchronized void onAssignmentChange(IdealState idealState, ExternalView externalView,
-      Set<String> onlineSegments) {
+      Set<String> onlineSegments, List<String> pulledSegments, List<ZNRecord> znRecords) {
     // NOTE: We don't update all the segment ZK metadata for every external view change, but only the new added/removed
     //       ones. The refreshed segment ZK metadata change won't be picked up.
-    for (String segment : onlineSegments) {
+    for (int idx = 0; idx < pulledSegments.size(); idx++) {
+      String segment = pulledSegments.get(idx);
+      ZNRecord znRecord = znRecords.get(idx);
       _segmentColumnPartitionInfoMap.computeIfAbsent(segment,
-          k -> extractColumnPartitionInfoMapFromSegmentZKMetadataZNRecord(k,
-              _propertyStore.get(_segmentZKMetadataPathPrefix + k, null, AccessOption.PERSISTENT)));
+          k -> SegmentPartitionUtils.extractPartitionInfoMap(_tableNameWithType, _partitionColumns, k, znRecord));
     }
     _segmentColumnPartitionInfoMap.keySet().retainAll(onlineSegments);
   }
 
   @Override
-  public synchronized void refreshSegment(String segment) {
-    Map<String, PartitionInfo> columnPartitionInfo = extractColumnPartitionInfoMapFromSegmentZKMetadataZNRecord(segment,
-        _propertyStore.get(_segmentZKMetadataPathPrefix + segment, null, AccessOption.PERSISTENT));
+  public synchronized void refreshSegment(String segment, @Nullable ZNRecord znRecord) {
+    Map<String, SegmentPartitionInfo> columnPartitionInfo =
+        SegmentPartitionUtils.extractPartitionInfoMap(_tableNameWithType, _partitionColumns, segment, znRecord);
     if (columnPartitionInfo != null) {
       _segmentColumnPartitionInfoMap.put(segment, columnPartitionInfo);
     } else {
@@ -173,9 +100,10 @@ public Set<String> prune(BrokerRequest brokerRequest, Set<String> segments) {
     }
     Set<String> selectedSegments = new HashSet<>();
     for (String segment : segments) {
-      Map<String, PartitionInfo> columnPartitionInfoMap = _segmentColumnPartitionInfoMap.get(segment);
-      if (columnPartitionInfoMap == null || columnPartitionInfoMap == INVALID_COLUMN_PARTITION_INFO_MAP
-          || isPartitionMatch(filterExpression, columnPartitionInfoMap)) {
+      Map<String, SegmentPartitionInfo> columnPartitionInfoMap = _segmentColumnPartitionInfoMap.get(segment);
+      if (columnPartitionInfoMap == null
+          || columnPartitionInfoMap == SegmentPartitionUtils.INVALID_COLUMN_PARTITION_INFO_MAP || isPartitionMatch(
+          filterExpression, columnPartitionInfoMap)) {
         selectedSegments.add(segment);
       }
     }
@@ -187,7 +115,8 @@ public Set<String> getPartitionColumns() {
     return _partitionColumns;
   }
 
-  private boolean isPartitionMatch(Expression filterExpression, Map<String, PartitionInfo> columnPartitionInfoMap) {
+  private boolean isPartitionMatch(Expression filterExpression,
+      Map<String, SegmentPartitionInfo> columnPartitionInfoMap) {
     Function function = filterExpression.getFunctionCall();
     FilterKind filterKind = FilterKind.valueOf(function.getOperator());
     List<Expression> operands = function.getOperands();
@@ -209,9 +138,9 @@ private boolean isPartitionMatch(Expression filterExpression, Map<String, Partit
       case EQUALS: {
         Identifier identifier = operands.get(0).getIdentifier();
         if (identifier != null) {
-          PartitionInfo partitionInfo = columnPartitionInfoMap.get(identifier.getName());
-          return partitionInfo == null || partitionInfo._partitions.contains(
-              partitionInfo._partitionFunction.getPartition(operands.get(1).getLiteral().getFieldValue()));
+          SegmentPartitionInfo partitionInfo = columnPartitionInfoMap.get(identifier.getName());
+          return partitionInfo == null || partitionInfo.getPartitions().contains(
+              partitionInfo.getPartitionFunction().getPartition(operands.get(1).getLiteral().getFieldValue()));
         } else {
           return true;
         }
@@ -219,14 +148,14 @@ private boolean isPartitionMatch(Expression filterExpression, Map<String, Partit
       case IN: {
         Identifier identifier = operands.get(0).getIdentifier();
         if (identifier != null) {
-          PartitionInfo partitionInfo = columnPartitionInfoMap.get(identifier.getName());
+          SegmentPartitionInfo partitionInfo = columnPartitionInfoMap.get(identifier.getName());
           if (partitionInfo == null) {
             return true;
           }
           int numOperands = operands.size();
           for (int i = 1; i < numOperands; i++) {
-            if (partitionInfo._partitions.contains(partitionInfo._partitionFunction.getPartition(
-                operands.get(i).getLiteral().getFieldValue().toString()))) {
+            if (partitionInfo.getPartitions().contains(partitionInfo.getPartitionFunction()
+                .getPartition(operands.get(i).getLiteral().getFieldValue().toString()))) {
               return true;
             }
           }
@@ -239,14 +168,4 @@ private boolean isPartitionMatch(Expression filterExpression, Map<String, Partit
         return true;
     }
   }
-
-  private static class PartitionInfo {
-    final PartitionFunction _partitionFunction;
-    final Set<Integer> _partitions;
-
-    PartitionInfo(PartitionFunction partitionFunction, Set<Integer> partitions) {
-      _partitionFunction = partitionFunction;
-      _partitions = partitions;
-    }
-  }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPruner.java
index 5893e6bd923..17e92e5c158 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPruner.java
@@ -19,34 +19,14 @@
 package org.apache.pinot.broker.routing.segmentpruner;
 
 import java.util.Set;
-import org.apache.helix.model.ExternalView;
-import org.apache.helix.model.IdealState;
-import org.apache.pinot.broker.routing.segmentpreselector.SegmentPreSelector;
+import org.apache.pinot.broker.routing.segmentmetadata.SegmentZkMetadataFetchListener;
 import org.apache.pinot.common.request.BrokerRequest;
 
 
 /**
  * The segment pruner prunes the selected segments based on the query.
  */
-public interface SegmentPruner {
-
-  /**
-   * Initializes the segment pruner with the ideal state, external view and online segments (segments with
-   * ONLINE/CONSUMING instances in the ideal state and pre-selected by the {@link SegmentPreSelector}). Should be called
-   * only once before calling other methods.
-   */
-  void init(IdealState idealState, ExternalView externalView, Set<String> onlineSegments);
-
-  /**
-   * Processes the segment assignment (ideal state or external view) change based on the given online segments (segments
-   * with ONLINE/CONSUMING instances in the ideal state and pre-selected by the {@link SegmentPreSelector}).
-   */
-  void onAssignmentChange(IdealState idealState, ExternalView externalView, Set<String> onlineSegments);
-
-  /**
-   * Refreshes the metadata for the given segment (called when segment is getting refreshed).
-   */
-  void refreshSegment(String segment);
+public interface SegmentPruner extends SegmentZkMetadataFetchListener {
 
   /**
    * Prunes the segments queried by the given broker request, returns the selected segments to be queried.
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java
index f34f55f3c3d..6135982e185 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerFactory.java
@@ -18,6 +18,8 @@
  */
 package org.apache.pinot.broker.routing.segmentpruner;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +28,7 @@
 import org.apache.commons.collections.MapUtils;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.segment.local.utils.TableConfigUtils;
 import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
 import org.apache.pinot.spi.config.table.RoutingConfig;
@@ -33,6 +36,9 @@
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.DateTimeFieldSpec;
+import org.apache.pinot.spi.data.DateTimeFormatSpec;
+import org.apache.pinot.spi.data.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +58,7 @@ public static List<SegmentPruner> getSegmentPruners(TableConfig tableConfig,
     boolean needsEmptySegment = TableConfigUtils.needsEmptySegmentPruner(tableConfig);
     if (needsEmptySegment) {
       // Add EmptySegmentPruner if needed
-      segmentPruners.add(new EmptySegmentPruner(tableConfig, propertyStore));
+      segmentPruners.add(new EmptySegmentPruner(tableConfig));
     }
 
     RoutingConfig routingConfig = tableConfig.getRoutingConfig();
@@ -113,8 +119,8 @@ private static SegmentPruner getPartitionSegmentPruner(TableConfig tableConfig,
     LOGGER.info("Using PartitionSegmentPruner on partition columns: {} for table: {}", partitionColumns,
         tableNameWithType);
     return partitionColumns.size() == 1 ? new SinglePartitionColumnSegmentPruner(tableNameWithType,
-        partitionColumns.iterator().next(), propertyStore)
-        : new MultiPartitionColumnsSegmentPruner(tableNameWithType, partitionColumns, propertyStore);
+        partitionColumns.iterator().next())
+        : new MultiPartitionColumnsSegmentPruner(tableNameWithType, partitionColumns);
   }
 
   @Nullable
@@ -131,9 +137,26 @@ private static TimeSegmentPruner getTimeSegmentPruner(TableConfig tableConfig,
       LOGGER.warn("Cannot enable time range pruning without time column for table: {}", tableNameWithType);
       return null;
     }
+    return createTimeSegmentPruner(tableConfig, propertyStore);
+  }
+
+  @VisibleForTesting
+  static TimeSegmentPruner createTimeSegmentPruner(TableConfig tableConfig,
+      ZkHelixPropertyStore<ZNRecord> propertyStore) {
+    String tableNameWithType = tableConfig.getTableName();
+    String timeColumn = tableConfig.getValidationConfig().getTimeColumnName();
+    Preconditions.checkNotNull(timeColumn, "Time column must be configured in table config for table: %s",
+        tableNameWithType);
+    Schema schema = ZKMetadataProvider.getTableSchema(propertyStore, tableNameWithType);
+    Preconditions.checkNotNull(schema, "Failed to find schema for table: %s", tableNameWithType);
+    DateTimeFieldSpec dateTimeSpec = schema.getSpecForTimeColumn(timeColumn);
+    Preconditions.checkNotNull(dateTimeSpec, "Field spec must be specified in schema for time column: %s of table: %s",
+        timeColumn, tableNameWithType);
+    DateTimeFormatSpec timeFormatSpec = dateTimeSpec.getFormatSpec();
 
-    LOGGER.info("Using TimeRangePruner on time column: {} for table: {}", timeColumn, tableNameWithType);
-    return new TimeSegmentPruner(tableConfig, propertyStore);
+    LOGGER.info("Using TimeRangePruner on time column: {} for table: {} with DateTimeFormatSpec: {}",
+        timeColumn, tableNameWithType, timeFormatSpec);
+    return new TimeSegmentPruner(tableConfig, timeColumn, timeFormatSpec);
   }
 
   private static List<SegmentPruner> sortSegmentPruners(List<SegmentPruner> pruners) {
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SinglePartitionColumnSegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SinglePartitionColumnSegmentPruner.java
index 2c75782ef3a..80ad4b7e3ed 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SinglePartitionColumnSegmentPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/SinglePartitionColumnSegmentPruner.java
@@ -18,31 +18,22 @@
  */
 package org.apache.pinot.broker.routing.segmentpruner;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
-import org.apache.helix.AccessOption;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
-import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+import org.apache.pinot.broker.routing.segmentpartition.SegmentPartitionInfo;
+import org.apache.pinot.broker.routing.segmentpartition.SegmentPartitionUtils;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.Identifier;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
-import org.apache.pinot.segment.spi.partition.metadata.ColumnPartitionMetadata;
-import org.apache.pinot.spi.utils.CommonConstants.Segment;
 import org.apache.pinot.sql.FilterKind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -50,99 +41,47 @@
  * pruner supports queries with filter (or nested filter) of EQUALITY and IN predicates.
  */
 public class SinglePartitionColumnSegmentPruner implements SegmentPruner {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SinglePartitionColumnSegmentPruner.class);
-  private static final PartitionInfo INVALID_PARTITION_INFO = new PartitionInfo(null, null);
-
   private final String _tableNameWithType;
   private final String _partitionColumn;
-  private final ZkHelixPropertyStore<ZNRecord> _propertyStore;
-  private final String _segmentZKMetadataPathPrefix;
-  private final Map<String, PartitionInfo> _partitionInfoMap = new ConcurrentHashMap<>();
+  private final Map<String, SegmentPartitionInfo> _partitionInfoMap = new ConcurrentHashMap<>();
 
-  public SinglePartitionColumnSegmentPruner(String tableNameWithType, String partitionColumn,
-      ZkHelixPropertyStore<ZNRecord> propertyStore) {
+  public SinglePartitionColumnSegmentPruner(String tableNameWithType, String partitionColumn) {
     _tableNameWithType = tableNameWithType;
     _partitionColumn = partitionColumn;
-    _propertyStore = propertyStore;
-    _segmentZKMetadataPathPrefix = ZKMetadataProvider.constructPropertyStorePathForResource(tableNameWithType) + "/";
   }
 
   @Override
-  public void init(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
+  public void init(IdealState idealState, ExternalView externalView, List<String> onlineSegments,
+      List<ZNRecord> znRecords) {
     // Bulk load partition info for all online segments
-    int numSegments = onlineSegments.size();
-    List<String> segments = new ArrayList<>(numSegments);
-    List<String> segmentZKMetadataPaths = new ArrayList<>(numSegments);
-    for (String segment : onlineSegments) {
-      segments.add(segment);
-      segmentZKMetadataPaths.add(_segmentZKMetadataPathPrefix + segment);
-    }
-    List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
-    for (int i = 0; i < numSegments; i++) {
-      String segment = segments.get(i);
-      PartitionInfo partitionInfo = extractPartitionInfoFromSegmentZKMetadataZNRecord(segment, znRecords.get(i));
+    for (int idx = 0; idx < onlineSegments.size(); idx++) {
+      String segment = onlineSegments.get(idx);
+      SegmentPartitionInfo partitionInfo =
+          SegmentPartitionUtils.extractPartitionInfo(_tableNameWithType, _partitionColumn, segment, znRecords.get(idx));
       if (partitionInfo != null) {
         _partitionInfoMap.put(segment, partitionInfo);
       }
     }
   }
 
-  /**
-   * NOTE: Returns {@code null} when the ZNRecord is missing (could be transient Helix issue). Returns
-   *       {@link #INVALID_PARTITION_INFO} when the segment does not have valid partition metadata in its ZK metadata,
-   *       in which case we won't retry later.
-   */
-  @Nullable
-  private PartitionInfo extractPartitionInfoFromSegmentZKMetadataZNRecord(String segment, @Nullable ZNRecord znRecord) {
-    if (znRecord == null) {
-      LOGGER.warn("Failed to find segment ZK metadata for segment: {}, table: {}", segment, _tableNameWithType);
-      return null;
-    }
-
-    String partitionMetadataJson = znRecord.getSimpleField(Segment.PARTITION_METADATA);
-    if (partitionMetadataJson == null) {
-      LOGGER.warn("Failed to find segment partition metadata for segment: {}, table: {}", segment, _tableNameWithType);
-      return INVALID_PARTITION_INFO;
-    }
-
-    SegmentPartitionMetadata segmentPartitionMetadata;
-    try {
-      segmentPartitionMetadata = SegmentPartitionMetadata.fromJsonString(partitionMetadataJson);
-    } catch (Exception e) {
-      LOGGER.warn("Caught exception while extracting segment partition metadata for segment: {}, table: {}", segment,
-          _tableNameWithType, e);
-      return INVALID_PARTITION_INFO;
-    }
-
-    ColumnPartitionMetadata columnPartitionMetadata =
-        segmentPartitionMetadata.getColumnPartitionMap().get(_partitionColumn);
-    if (columnPartitionMetadata == null) {
-      LOGGER.warn("Failed to find column partition metadata for column: {}, segment: {}, table: {}", _partitionColumn,
-          segment, _tableNameWithType);
-      return INVALID_PARTITION_INFO;
-    }
-
-    return new PartitionInfo(PartitionFunctionFactory.getPartitionFunction(columnPartitionMetadata.getFunctionName(),
-        columnPartitionMetadata.getNumPartitions(), columnPartitionMetadata.getFunctionConfig()),
-        columnPartitionMetadata.getPartitions());
-  }
-
   @Override
   public synchronized void onAssignmentChange(IdealState idealState, ExternalView externalView,
-      Set<String> onlineSegments) {
+      Set<String> onlineSegments, List<String> pulledSegments, List<ZNRecord> znRecords) {
     // NOTE: We don't update all the segment ZK metadata for every external view change, but only the new added/removed
     //       ones. The refreshed segment ZK metadata change won't be picked up.
-    for (String segment : onlineSegments) {
-      _partitionInfoMap.computeIfAbsent(segment, k -> extractPartitionInfoFromSegmentZKMetadataZNRecord(k,
-          _propertyStore.get(_segmentZKMetadataPathPrefix + k, null, AccessOption.PERSISTENT)));
+    for (int idx = 0; idx < pulledSegments.size(); idx++) {
+      String segment = pulledSegments.get(idx);
+      ZNRecord znRecord = znRecords.get(idx);
+      _partitionInfoMap.computeIfAbsent(segment,
+          k -> SegmentPartitionUtils.extractPartitionInfo(_tableNameWithType, _partitionColumn, k, znRecord));
     }
     _partitionInfoMap.keySet().retainAll(onlineSegments);
   }
 
   @Override
-  public synchronized void refreshSegment(String segment) {
-    PartitionInfo partitionInfo = extractPartitionInfoFromSegmentZKMetadataZNRecord(segment,
-        _propertyStore.get(_segmentZKMetadataPathPrefix + segment, null, AccessOption.PERSISTENT));
+  public synchronized void refreshSegment(String segment, @Nullable ZNRecord znRecord) {
+    SegmentPartitionInfo partitionInfo =
+        SegmentPartitionUtils.extractPartitionInfo(_tableNameWithType, _partitionColumn, segment, znRecord);
     if (partitionInfo != null) {
       _partitionInfoMap.put(segment, partitionInfo);
     } else {
@@ -158,16 +97,16 @@ public Set<String> prune(BrokerRequest brokerRequest, Set<String> segments) {
     }
     Set<String> selectedSegments = new HashSet<>();
     for (String segment : segments) {
-      PartitionInfo partitionInfo = _partitionInfoMap.get(segment);
-      if (partitionInfo == null || partitionInfo == INVALID_PARTITION_INFO || isPartitionMatch(filterExpression,
-          partitionInfo)) {
+      SegmentPartitionInfo partitionInfo = _partitionInfoMap.get(segment);
+      if (partitionInfo == null || partitionInfo == SegmentPartitionUtils.INVALID_PARTITION_INFO || isPartitionMatch(
+          filterExpression, partitionInfo)) {
         selectedSegments.add(segment);
       }
     }
     return selectedSegments;
   }
 
-  private boolean isPartitionMatch(Expression filterExpression, PartitionInfo partitionInfo) {
+  private boolean isPartitionMatch(Expression filterExpression, SegmentPartitionInfo partitionInfo) {
     Function function = filterExpression.getFunctionCall();
     FilterKind filterKind = FilterKind.valueOf(function.getOperator());
     List<Expression> operands = function.getOperands();
@@ -189,8 +128,8 @@ private boolean isPartitionMatch(Expression filterExpression, PartitionInfo part
       case EQUALS: {
         Identifier identifier = operands.get(0).getIdentifier();
         if (identifier != null && identifier.getName().equals(_partitionColumn)) {
-          return partitionInfo._partitions.contains(
-              partitionInfo._partitionFunction.getPartition(operands.get(1).getLiteral().getFieldValue().toString()));
+          return partitionInfo.getPartitions().contains(partitionInfo.getPartitionFunction()
+              .getPartition(operands.get(1).getLiteral().getFieldValue().toString()));
         } else {
           return true;
         }
@@ -200,8 +139,8 @@ private boolean isPartitionMatch(Expression filterExpression, PartitionInfo part
         if (identifier != null && identifier.getName().equals(_partitionColumn)) {
           int numOperands = operands.size();
           for (int i = 1; i < numOperands; i++) {
-            if (partitionInfo._partitions.contains(partitionInfo._partitionFunction.getPartition(
-                operands.get(i).getLiteral().getFieldValue().toString()))) {
+            if (partitionInfo.getPartitions().contains(partitionInfo.getPartitionFunction()
+                .getPartition(operands.get(i).getLiteral().getFieldValue().toString()))) {
               return true;
             }
           }
@@ -214,14 +153,4 @@ private boolean isPartitionMatch(Expression filterExpression, PartitionInfo part
         return true;
     }
   }
-
-  private static class PartitionInfo {
-    final PartitionFunction _partitionFunction;
-    final Set<Integer> _partitions;
-
-    PartitionInfo(PartitionFunction partitionFunction, Set<Integer> partitions) {
-      _partitionFunction = partitionFunction;
-      _partitions = partitions;
-    }
-  }
 }
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java
index c123c65a675..a7ac4fce4bd 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/routing/segmentpruner/TimeSegmentPruner.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pinot.broker.routing.segmentpruner;
 
-import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -29,22 +28,17 @@
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.helix.AccessOption;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.broker.routing.segmentpruner.interval.Interval;
 import org.apache.pinot.broker.routing.segmentpruner.interval.IntervalTree;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.Identifier;
 import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.DateTimeFieldSpec;
 import org.apache.pinot.spi.data.DateTimeFormatSpec;
-import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Query.Range;
 import org.apache.pinot.sql.FilterKind;
@@ -64,44 +58,25 @@ public class TimeSegmentPruner implements SegmentPruner {
   private static final Interval DEFAULT_INTERVAL = new Interval(MIN_START_TIME, MAX_END_TIME);
 
   private final String _tableNameWithType;
-  private final ZkHelixPropertyStore<ZNRecord> _propertyStore;
-  private final String _segmentZKMetadataPathPrefix;
   private final String _timeColumn;
   private final DateTimeFormatSpec _timeFormatSpec;
 
   private volatile IntervalTree<String> _intervalTree;
   private final Map<String, Interval> _intervalMap = new HashMap<>();
 
-  public TimeSegmentPruner(TableConfig tableConfig, ZkHelixPropertyStore<ZNRecord> propertyStore) {
+  public TimeSegmentPruner(TableConfig tableConfig, String timeColumn, DateTimeFormatSpec timeFormatSpec) {
     _tableNameWithType = tableConfig.getTableName();
-    _propertyStore = propertyStore;
-    _segmentZKMetadataPathPrefix = ZKMetadataProvider.constructPropertyStorePathForResource(_tableNameWithType) + "/";
-    _timeColumn = tableConfig.getValidationConfig().getTimeColumnName();
-    Preconditions.checkNotNull(_timeColumn, "Time column must be configured in table config for table: %s",
-        _tableNameWithType);
-
-    Schema schema = ZKMetadataProvider.getTableSchema(_propertyStore, _tableNameWithType);
-    Preconditions.checkNotNull(schema, "Failed to find schema for table: %s", _tableNameWithType);
-    DateTimeFieldSpec dateTimeSpec = schema.getSpecForTimeColumn(_timeColumn);
-    Preconditions.checkNotNull(dateTimeSpec, "Field spec must be specified in schema for time column: %s of table: %s",
-        _timeColumn, _tableNameWithType);
-    _timeFormatSpec = dateTimeSpec.getFormatSpec();
+    _timeColumn = timeColumn;
+    _timeFormatSpec = timeFormatSpec;
   }
 
   @Override
-  public void init(IdealState idealState, ExternalView externalView, Set<String> onlineSegments) {
+  public void init(IdealState idealState, ExternalView externalView, List<String> onlineSegments,
+      List<ZNRecord> znRecords) {
     // Bulk load time info for all online segments
-    int numSegments = onlineSegments.size();
-    List<String> segments = new ArrayList<>(numSegments);
-    List<String> segmentZKMetadataPaths = new ArrayList<>(numSegments);
-    for (String segment : onlineSegments) {
-      segments.add(segment);
-      segmentZKMetadataPaths.add(_segmentZKMetadataPathPrefix + segment);
-    }
-    List<ZNRecord> znRecords = _propertyStore.get(segmentZKMetadataPaths, null, AccessOption.PERSISTENT, false);
-    for (int i = 0; i < numSegments; i++) {
-      String segment = segments.get(i);
-      Interval interval = extractIntervalFromSegmentZKMetaZNRecord(segment, znRecords.get(i));
+    for (int idx = 0; idx < onlineSegments.size(); idx++) {
+      String segment = onlineSegments.get(idx);
+      Interval interval = extractIntervalFromSegmentZKMetaZNRecord(segment, znRecords.get(idx));
       _intervalMap.put(segment, interval);
     }
     _intervalTree = new IntervalTree<>(_intervalMap);
@@ -128,21 +103,21 @@ private Interval extractIntervalFromSegmentZKMetaZNRecord(String segment, @Nulla
 
   @Override
   public synchronized void onAssignmentChange(IdealState idealState, ExternalView externalView,
-      Set<String> onlineSegments) {
+      Set<String> onlineSegments, List<String> pulledSegments, List<ZNRecord> znRecords) {
     // NOTE: We don't update all the segment ZK metadata for every external view change, but only the new added/removed
     //       ones. The refreshed segment ZK metadata change won't be picked up.
-    for (String segment : onlineSegments) {
-      _intervalMap.computeIfAbsent(segment, k -> extractIntervalFromSegmentZKMetaZNRecord(k,
-          _propertyStore.get(_segmentZKMetadataPathPrefix + k, null, AccessOption.PERSISTENT)));
+    for (int idx = 0; idx < pulledSegments.size(); idx++) {
+      String segment = pulledSegments.get(idx);
+      ZNRecord zNrecord = znRecords.get(idx);
+      _intervalMap.computeIfAbsent(segment, k -> extractIntervalFromSegmentZKMetaZNRecord(k, zNrecord));
     }
     _intervalMap.keySet().retainAll(onlineSegments);
     _intervalTree = new IntervalTree<>(_intervalMap);
   }
 
   @Override
-  public synchronized void refreshSegment(String segment) {
-    Interval interval = extractIntervalFromSegmentZKMetaZNRecord(segment,
-        _propertyStore.get(_segmentZKMetadataPathPrefix + segment, null, AccessOption.PERSISTENT));
+  public synchronized void refreshSegment(String segment, @Nullable ZNRecord znRecord) {
+    Interval interval = extractIntervalFromSegmentZKMetaZNRecord(segment, znRecord);
     _intervalMap.put(segment, interval);
     _intervalTree = new IntervalTree<>(_intervalMap);
   }
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BasicAuthAccessControlTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BasicAuthAccessControlTest.java
index f9e60f47919..a491e4f402f 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BasicAuthAccessControlTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BasicAuthAccessControlTest.java
@@ -21,7 +21,9 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import org.apache.pinot.broker.api.AccessControl;
 import org.apache.pinot.broker.api.HttpRequesterIdentity;
 import org.apache.pinot.common.request.BrokerRequest;
@@ -40,13 +42,20 @@ public class BasicAuthAccessControlTest {
 
   private AccessControl _accessControl;
 
+  Set<String> _tableNames;
+
   @BeforeClass
   public void setup() {
     Map<String, Object> config = new HashMap<>();
     config.put("principals", "admin,user");
     config.put("principals.admin.password", "verysecret");
     config.put("principals.user.password", "secret");
-    config.put("principals.user.tables", "lessImportantStuff");
+    config.put("principals.user.tables", "lessImportantStuff,lesserImportantStuff,leastImportantStuff");
+
+    _tableNames = new HashSet<>();
+    _tableNames.add("lessImportantStuff");
+    _tableNames.add("lesserImportantStuff");
+    _tableNames.add("leastImportantStuff");
 
     AccessControlFactory factory = new BasicAuthAccessControlFactory();
     factory.init(new PinotConfiguration(config));
@@ -56,7 +65,7 @@ public void setup() {
 
   @Test(expectedExceptions = IllegalArgumentException.class)
   public void testNullEntity() {
-    _accessControl.hasAccess(null, null);
+    _accessControl.hasAccess(null, (BrokerRequest) null);
   }
 
   @Test
@@ -66,7 +75,7 @@ public void testNullToken() {
     HttpRequesterIdentity identity = new HttpRequesterIdentity();
     identity.setHttpHeaders(headers);
 
-    Assert.assertFalse(_accessControl.hasAccess(identity, null));
+    Assert.assertFalse(_accessControl.hasAccess(identity, (BrokerRequest) null));
   }
 
   @Test
@@ -84,6 +93,7 @@ public void testAllow() {
     request.setQuerySource(source);
 
     Assert.assertTrue(_accessControl.hasAccess(identity, request));
+    Assert.assertTrue(_accessControl.hasAccess(identity, _tableNames));
   }
 
   @Test
@@ -101,6 +111,14 @@ public void testDeny() {
     request.setQuerySource(source);
 
     Assert.assertFalse(_accessControl.hasAccess(identity, request));
+
+    Set<String> tableNames = new HashSet<>();
+    tableNames.add("veryImportantStuff");
+    Assert.assertFalse(_accessControl.hasAccess(identity, tableNames));
+    tableNames.add("lessImportantStuff");
+    Assert.assertFalse(_accessControl.hasAccess(identity, tableNames));
+    tableNames.add("lesserImportantStuff");
+    Assert.assertFalse(_accessControl.hasAccess(identity, tableNames));
   }
 
   @Test
@@ -118,6 +136,13 @@ public void testAllowAll() {
     request.setQuerySource(source);
 
     Assert.assertTrue(_accessControl.hasAccess(identity, request));
+
+    Set<String> tableNames = new HashSet<>();
+    tableNames.add("lessImportantStuff");
+    tableNames.add("veryImportantStuff");
+    tableNames.add("lesserImportantStuff");
+
+    Assert.assertTrue(_accessControl.hasAccess(identity, tableNames));
   }
 
   @Test
@@ -131,6 +156,9 @@ public void testAllowNonTable() {
     BrokerRequest request = new BrokerRequest();
 
     Assert.assertTrue(_accessControl.hasAccess(identity, request));
+
+    Set<String> tableNames = new HashSet<>();
+    Assert.assertTrue(_accessControl.hasAccess(identity, tableNames));
   }
 
   @Test
@@ -148,5 +176,6 @@ public void testNormalizeToken() {
     request.setQuerySource(source);
 
     Assert.assertTrue(_accessControl.hasAccess(identity, request));
+    Assert.assertTrue(_accessControl.hasAccess(identity, _tableNames));
   }
 }
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerManagedAsyncExecutorProviderTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerManagedAsyncExecutorProviderTest.java
new file mode 100644
index 00000000000..25c1d099ca7
--- /dev/null
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/BrokerManagedAsyncExecutorProviderTest.java
@@ -0,0 +1,134 @@
+/**
+ * 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.pinot.broker.broker;
+
+import java.util.Collections;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.ws.rs.ServiceUnavailableException;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.metrics.PinotMetricUtils;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+
+public class BrokerManagedAsyncExecutorProviderTest {
+
+  public static BrokerMetrics _brokerMetrics;
+
+  @BeforeClass
+  public void setUp() {
+    _brokerMetrics = new BrokerMetrics(CommonConstants.Broker.DEFAULT_METRICS_NAME_PREFIX,
+        PinotMetricUtils.getPinotMetricsRegistry(new PinotConfiguration()),
+        CommonConstants.Broker.DEFAULT_ENABLE_TABLE_LEVEL_METRICS, Collections.emptyList());
+  }
+
+  @Test
+  public void testExecutorService()
+      throws InterruptedException, ExecutionException {
+    // create a new instance of the executor provider
+    BrokerManagedAsyncExecutorProvider provider = new BrokerManagedAsyncExecutorProvider(2, 2, 2, _brokerMetrics);
+
+    // get the executor service
+    ThreadPoolExecutor executor = (ThreadPoolExecutor) provider.getExecutorService();
+
+    // submit a task to the executor service and wait for it to complete
+    Future<Integer> futureResult = executor.submit(() -> 1 + 1);
+    Integer result = futureResult.get();
+
+    // verify that the task was executed and returned the expected result
+    assertNotNull(result);
+    assertEquals((int) result, 2);
+
+    // wait for the executor service to shutdown
+    executor.shutdown();
+    executor.awaitTermination(1, TimeUnit.SECONDS);
+  }
+
+  @Test
+  public void testGet()
+      throws InterruptedException {
+    BrokerManagedAsyncExecutorProvider provider = new BrokerManagedAsyncExecutorProvider(1, 1, 1, _brokerMetrics);
+    ExecutorService executorService = provider.getExecutorService();
+
+    // verify that the executor has the expected properties
+    assertNotNull(executorService);
+    assertTrue(executorService instanceof ThreadPoolExecutor);
+
+    ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executorService;
+
+    assertEquals(1, threadPoolExecutor.getCorePoolSize());
+    assertEquals(1, threadPoolExecutor.getMaximumPoolSize());
+
+    BlockingQueue<Runnable> blockingQueue = threadPoolExecutor.getQueue();
+    assertNotNull(blockingQueue);
+    assertTrue(blockingQueue instanceof ArrayBlockingQueue);
+    assertEquals(0, blockingQueue.size());
+    assertEquals(1, blockingQueue.remainingCapacity());
+
+    RejectedExecutionHandler rejectedExecutionHandler = threadPoolExecutor.getRejectedExecutionHandler();
+    assertNotNull(rejectedExecutionHandler);
+    assertTrue(
+        rejectedExecutionHandler instanceof BrokerManagedAsyncExecutorProvider.BrokerThreadPoolRejectExecutionHandler);
+
+    // test that the executor actually executes tasks
+    AtomicInteger counter = new AtomicInteger();
+    CountDownLatch latch = new CountDownLatch(1);
+    for (int i = 0; i < 1; i++) {
+      threadPoolExecutor.execute(() -> {
+        counter.incrementAndGet();
+        latch.countDown();
+      });
+    }
+    latch.await();
+    assertEquals(counter.get(), 1);
+  }
+
+  @Test(expectedExceptions = ServiceUnavailableException.class)
+  public void testRejectHandler()
+      throws InterruptedException {
+    BrokerManagedAsyncExecutorProvider provider = new BrokerManagedAsyncExecutorProvider(1, 1, 1, _brokerMetrics);
+    ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) provider.getExecutorService();
+
+    // test the rejection policy
+    AtomicInteger counter = new AtomicInteger();
+    CountDownLatch latch = new CountDownLatch(10);
+    for (int i = 0; i < 10; i++) {
+      threadPoolExecutor.execute(() -> {
+        counter.incrementAndGet();
+        latch.countDown();
+      });
+    }
+    latch.await();
+  }
+}
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java
index 53e75d05571..4a7cee97ffe 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java
@@ -104,10 +104,14 @@ public void setUp()
     }
 
     TestUtils.waitForCondition(aVoid -> {
+      // should wait for both realtime and offline table external view to be live.
       ExternalView offlineTableExternalView =
           _helixAdmin.getResourceExternalView(getHelixClusterName(), OFFLINE_TABLE_NAME);
+      ExternalView realtimeTableExternalView =
+          _helixAdmin.getResourceExternalView(getHelixClusterName(), REALTIME_TABLE_NAME);
       return offlineTableExternalView != null
-          && offlineTableExternalView.getPartitionSet().size() == NUM_OFFLINE_SEGMENTS;
+          && offlineTableExternalView.getPartitionSet().size() == NUM_OFFLINE_SEGMENTS
+          && realtimeTableExternalView != null;
     }, 30_000L, "Failed to find all OFFLINE segments in the ExternalView");
   }
 
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandlerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandlerTest.java
index d2ea5c9b7aa..7f3cb79749f 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandlerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandlerTest.java
@@ -197,16 +197,18 @@ public void testCancelQuery()
     BrokerRoutingManager routingManager = mock(BrokerRoutingManager.class);
     when(routingManager.routingExists(anyString())).thenReturn(true);
     RoutingTable rt = mock(RoutingTable.class);
-    when(rt.getServerInstanceToSegmentsMap()).thenReturn(Collections
-        .singletonMap(new ServerInstance(new InstanceConfig("server01_9000")), Collections.singletonList("segment01")));
+    when(rt.getServerInstanceToSegmentsMap()).thenReturn(
+        Collections.singletonMap(new ServerInstance(new InstanceConfig("server01_9000")),
+            Collections.singletonList("segment01")));
     when(routingManager.getRoutingTable(any(), Mockito.anyLong())).thenReturn(rt);
     QueryQuotaManager queryQuotaManager = mock(QueryQuotaManager.class);
     when(queryQuotaManager.acquire(anyString())).thenReturn(true);
     CountDownLatch latch = new CountDownLatch(1);
+    final long[] testRequestId = {-1};
     PinotConfiguration config =
         new PinotConfiguration(Collections.singletonMap("pinot.broker.enable.query.cancellation", "true"));
     BaseBrokerRequestHandler requestHandler =
-        new BaseBrokerRequestHandler(config, null, routingManager, new AllowAllAccessControlFactory(),
+        new BaseBrokerRequestHandler(config, "testBrokerId", routingManager, new AllowAllAccessControlFactory(),
             queryQuotaManager, tableCache,
             new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet())) {
           @Override
@@ -225,6 +227,7 @@ protected BrokerResponseNative processBrokerRequest(long requestId, BrokerReques
               @Nullable Map<ServerInstance, List<String>> realtimeRoutingTable, long timeoutMs, ServerStats serverStats,
               RequestContext requestContext)
               throws Exception {
+            testRequestId[0] = requestId;
             latch.await();
             return null;
           }
@@ -239,12 +242,12 @@ protected BrokerResponseNative processBrokerRequest(long requestId, BrokerReques
         throw new RuntimeException(e);
       }
     });
-    TestUtils.waitForCondition((aVoid) -> requestHandler.getRunningServers(1).size() == 1, 500, 5000,
+    TestUtils.waitForCondition((aVoid) -> requestHandler.getRunningServers(testRequestId[0]).size() == 1, 500, 5000,
         "Failed to submit query");
     Map.Entry<Long, String> entry = requestHandler.getRunningQueries().entrySet().iterator().next();
-    Assert.assertEquals(entry.getKey().longValue(), 1);
+    Assert.assertEquals(entry.getKey().longValue(), testRequestId[0]);
     Assert.assertTrue(entry.getValue().contains("select * from myTable_OFFLINE limit 10"));
-    Set<ServerInstance> servers = requestHandler.getRunningServers(1);
+    Set<ServerInstance> servers = requestHandler.getRunningServers(testRequestId[0]);
     Assert.assertEquals(servers.size(), 1);
     Assert.assertEquals(servers.iterator().next().getHostname(), "server01");
     Assert.assertEquals(servers.iterator().next().getPort(), 9000);
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
index a9ee2a5deef..b85004c48f0 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
@@ -181,9 +181,9 @@ public void testLiteralOnlyWithAsBrokerRequestFromSQL() {
   public void testBrokerRequestHandler()
       throws Exception {
     SingleConnectionBrokerRequestHandler requestHandler =
-        new SingleConnectionBrokerRequestHandler(new PinotConfiguration(), null, null, ACCESS_CONTROL_FACTORY, null,
-            null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet()), null,
-            null, mock(ServerRoutingStatsManager.class));
+        new SingleConnectionBrokerRequestHandler(new PinotConfiguration(), "testBrokerId", null, ACCESS_CONTROL_FACTORY,
+            null, null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet()),
+            null, null, mock(ServerRoutingStatsManager.class));
 
     long randNum = RANDOM.nextLong();
     byte[] randBytes = new byte[12];
@@ -209,9 +209,9 @@ null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Co
   public void testBrokerRequestHandlerWithAsFunction()
       throws Exception {
     SingleConnectionBrokerRequestHandler requestHandler =
-        new SingleConnectionBrokerRequestHandler(new PinotConfiguration(), null, null, ACCESS_CONTROL_FACTORY, null,
-            null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet()), null,
-            null, mock(ServerRoutingStatsManager.class));
+        new SingleConnectionBrokerRequestHandler(new PinotConfiguration(), "testBrokerId", null, ACCESS_CONTROL_FACTORY,
+            null, null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet()),
+            null, null, mock(ServerRoutingStatsManager.class));
     long currentTsMin = System.currentTimeMillis();
     JsonNode request = JsonUtils.stringToJsonNode(
         "{\"sql\":\"SELECT now() as currentTs, fromDateTime('2020-01-01 UTC', 'yyyy-MM-dd z') as firstDayOf2020\"}");
@@ -416,9 +416,9 @@ null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Co
   public void testExplainPlanLiteralOnly()
       throws Exception {
     SingleConnectionBrokerRequestHandler requestHandler =
-        new SingleConnectionBrokerRequestHandler(new PinotConfiguration(), null, null, ACCESS_CONTROL_FACTORY, null,
-            null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet()), null,
-            null, mock(ServerRoutingStatsManager.class));
+        new SingleConnectionBrokerRequestHandler(new PinotConfiguration(), "testBrokerId", null, ACCESS_CONTROL_FACTORY,
+            null, null, new BrokerMetrics("", PinotMetricUtils.getPinotMetricsRegistry(), true, Collections.emptySet()),
+            null, null, mock(ServerRoutingStatsManager.class));
 
     // Test 1: select constant
     JsonNode request = JsonUtils.stringToJsonNode("{\"sql\":\"EXPLAIN PLAN FOR SELECT 1.5, 'test'\"}");
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandlerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandlerTest.java
new file mode 100644
index 00000000000..236cb2cdde1
--- /dev/null
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandlerTest.java
@@ -0,0 +1,102 @@
+/**
+ * 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.pinot.broker.requesthandler;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.pinot.broker.broker.AccessControlFactory;
+import org.apache.pinot.broker.broker.AllowAllAccessControlFactory;
+import org.apache.pinot.broker.queryquota.QueryQuotaManager;
+import org.apache.pinot.broker.routing.BrokerRoutingManager;
+import org.apache.pinot.common.config.provider.TableCache;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.query.service.QueryConfig;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.trace.DefaultRequestContext;
+import org.apache.pinot.spi.trace.RequestContext;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class MultiStageBrokerRequestHandlerTest {
+
+  private PinotConfiguration _config;
+  @Mock
+  private BrokerRoutingManager _routingManager;
+
+  private AccessControlFactory _accessControlFactory;
+  @Mock
+  private QueryQuotaManager _queryQuotaManager;
+  @Mock
+  private TableCache _tableCache;
+
+  @Mock
+  private BrokerMetrics _brokerMetrics;
+
+  private MultiStageBrokerRequestHandler _requestHandler;
+
+  @BeforeClass
+  public void setUp() {
+    MockitoAnnotations.openMocks(this);
+    _config = new PinotConfiguration();
+    _config.setProperty(CommonConstants.Broker.CONFIG_OF_BROKER_TIMEOUT_MS, "10000");
+    _config.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, "12345");
+    _accessControlFactory = new AllowAllAccessControlFactory();
+    _requestHandler =
+        new MultiStageBrokerRequestHandler(_config, "testBrokerId", _routingManager, _accessControlFactory,
+            _queryQuotaManager, _tableCache, _brokerMetrics);
+  }
+
+  @Test
+  public void testSetRequestId()
+      throws Exception {
+    String sampleSqlQuery = "SELECT * FROM testTable";
+    String sampleJsonRequest = String.format("{\"sql\":\"%s\"}", sampleSqlQuery);
+    ObjectMapper objectMapper = new ObjectMapper();
+    JsonNode jsonRequest = objectMapper.readTree(sampleJsonRequest);
+    RequestContext requestContext = new DefaultRequestContext();
+
+    List<Long> requestIds = new ArrayList<>();
+    // Request id should be unique each time, and there should be a difference of 1 between consecutive requestIds.
+    for (int iteration = 0; iteration < 10; iteration++) {
+      _requestHandler.handleRequest(jsonRequest, null, null, requestContext);
+      Assert.assertTrue(requestContext.getRequestId() >= 0, "Request ID should be non-negative");
+      requestIds.add(requestContext.getRequestId());
+      if (iteration != 0) {
+        Assert.assertEquals(1, requestIds.get(iteration) - requestIds.get(iteration - 1),
+            "Request Id should have difference of 1");
+      }
+    }
+    Assert.assertEquals(10, requestIds.stream().distinct().count(), "Request Id should be unique");
+    Assert.assertEquals(1, requestIds.stream().map(x -> (x >> 32)).distinct().count(),
+        "Request Id should have a broker-id specific mask for the 32 MSB");
+    Assert.assertTrue(requestIds.stream().noneMatch(x -> x < 0), "Request Id should not be negative");
+  }
+
+  @AfterClass
+  public void tearDown() {
+    _requestHandler.shutDown();
+  }
+}
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java
index 07efbe101ab..a9ff0f18192 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/instanceselector/InstanceSelectorTest.java
@@ -20,6 +20,13 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.mercateo.test.clock.TestClock;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -29,89 +36,206 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
-import org.apache.pinot.broker.routing.adaptiveserverselector.AdaptiveServerSelector;
 import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.spi.config.table.RoutingConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import static org.apache.pinot.broker.routing.instanceselector.InstanceSelector.NEW_SEGMENT_EXPIRATION_MILLIS;
+import static org.apache.pinot.spi.config.table.RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE;
+import static org.apache.pinot.spi.config.table.RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE;
 import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.CONSUMING;
 import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.ERROR;
 import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.OFFLINE;
 import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
 
+@SuppressWarnings("unchecked")
 public class InstanceSelectorTest {
-  private final static List<String> SEGMENTS = Arrays.asList("segment0", "segment1", "segment2", "segment3", "segment4",
-      "segment5", "segment6", "segment7", "segment8", "segment9", "segment10", "segment11");
+  private AutoCloseable _mocks;
+
+  @Mock
+  private ZkHelixPropertyStore<ZNRecord> _propertyStore;
+
+  @Mock
+  private BrokerMetrics _brokerMetrics;
+
+  @Mock
+  private BrokerRequest _brokerRequest;
+
+  @Mock
+  private PinotQuery _pinotQuery;
+
+  @Mock
+  private TableConfig _tableConfig;
+
+  private TestClock _mutableClock;
+
+  private static final String TABLE_NAME = "testTable_OFFLINE";
+
+  private static final String BALANCED_INSTANCE_SELECTOR = "balanced";
+
+  private static List<String> getSegments() {
+    return SEGMENTS;
+  }
+
+  private final static List<String> SEGMENTS =
+      Arrays.asList("segment0", "segment1", "segment2", "segment3", "segment4", "segment5", "segment6", "segment7",
+          "segment8", "segment9", "segment10", "segment11");
+
+  private void createSegments(List<Pair<String, Long>> segmentPushMillis) {
+    List<String> segmentZKMetadataPaths = new ArrayList<>();
+    List<ZNRecord> zkRecords = new ArrayList<>();
+    for (Pair<String, Long> segment : segmentPushMillis) {
+      SegmentZKMetadata offlineSegmentZKMetadata0 = new SegmentZKMetadata(segment.getLeft());
+      offlineSegmentZKMetadata0.setPushTime(segment.getRight());
+      offlineSegmentZKMetadata0.setTimeUnit(TimeUnit.MILLISECONDS);
+      ZNRecord record = offlineSegmentZKMetadata0.toZNRecord();
+      segmentZKMetadataPaths.add(
+          ZKMetadataProvider.constructPropertyStorePathForSegment(TABLE_NAME, segment.getLeft()));
+      zkRecords.add(record);
+    }
+    when(_propertyStore.get(eq(segmentZKMetadataPaths), any(), anyInt(), anyBoolean())).thenReturn(zkRecords);
+  }
+
+  private IdealState createIdealState(Map<String, List<Pair<String, String>>> segmentState) {
+    IdealState idealState = new IdealState(TABLE_NAME);
+    Map<String, Map<String, String>> idealStateSegmentAssignment = idealState.getRecord().getMapFields();
+    for (Map.Entry<String, List<Pair<String, String>>> entry : segmentState.entrySet()) {
+      Map<String, String> externalViewInstanceStateMap = new TreeMap<>();
+      for (Pair<String, String> instanceState : entry.getValue()) {
+        externalViewInstanceStateMap.put(instanceState.getLeft(), instanceState.getRight());
+      }
+      idealStateSegmentAssignment.put(entry.getKey(), externalViewInstanceStateMap);
+    }
+    return idealState;
+  }
+
+  private ExternalView createExternalView(Map<String, List<Pair<String, String>>> segmentState) {
+    ExternalView externalView = new ExternalView(TABLE_NAME);
+    Map<String, Map<String, String>> externalViewSegmentAssignment = externalView.getRecord().getMapFields();
+    for (Map.Entry<String, List<Pair<String, String>>> entry : segmentState.entrySet()) {
+      Map<String, String> externalViewInstanceStateMap = new TreeMap<>();
+      for (Pair<String, String> instanceState : entry.getValue()) {
+        externalViewInstanceStateMap.put(instanceState.getLeft(), instanceState.getRight());
+      }
+      externalViewSegmentAssignment.put(entry.getKey(), externalViewInstanceStateMap);
+    }
+    return externalView;
+  }
+
+  private static boolean isReplicaGroupType(String selectorType) {
+    return selectorType.equals(RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE) || selectorType.equals(
+        STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE);
+  }
+
+  private InstanceSelector createTestInstanceSelector(String selectorType) {
+    RoutingConfig config = new RoutingConfig(null, null, selectorType);
+    when(_tableConfig.getRoutingConfig()).thenReturn(config);
+    return InstanceSelectorFactory.getInstanceSelector(_tableConfig, _propertyStore, _brokerMetrics, null,
+        _mutableClock);
+  }
+
+  @DataProvider(name = "selectorType")
+  public Object[] getSelectorType() {
+    return new Object[]{
+        RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE, STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE,
+        BALANCED_INSTANCE_SELECTOR
+    };
+  }
+
+  @BeforeMethod
+  public void setUp() {
+    _mutableClock = TestClock.fixed(Instant.now(), ZoneId.systemDefault());
+    _mocks = MockitoAnnotations.openMocks(this);
+    when(_brokerRequest.getPinotQuery()).thenReturn(_pinotQuery);
+    when(_pinotQuery.getQueryOptions()).thenReturn(null);
+    when(_tableConfig.getTableName()).thenReturn(TABLE_NAME);
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    clearInvocations(_tableConfig);
+    _mocks.close();
+  }
 
   @Test
   public void testInstanceSelectorFactory() {
     TableConfig tableConfig = mock(TableConfig.class);
-    BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
     ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
-    AdaptiveServerSelector adaptiveServerSelector = null;
+    BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
 
     // Routing config is missing
-    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore, brokerMetrics,
-        adaptiveServerSelector) instanceof BalancedInstanceSelector);
+    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore,
+        brokerMetrics) instanceof BalancedInstanceSelector);
 
     // Instance selector type is not configured
     RoutingConfig routingConfig = mock(RoutingConfig.class);
     when(tableConfig.getRoutingConfig()).thenReturn(routingConfig);
-    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore, brokerMetrics,
-        adaptiveServerSelector) instanceof BalancedInstanceSelector);
+    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore,
+        brokerMetrics) instanceof BalancedInstanceSelector);
 
     // Replica-group instance selector should be returned
     when(routingConfig.getInstanceSelectorType()).thenReturn(RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE);
-    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore, brokerMetrics,
-        adaptiveServerSelector) instanceof ReplicaGroupInstanceSelector);
+    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore,
+        brokerMetrics) instanceof ReplicaGroupInstanceSelector);
 
     // Strict replica-group instance selector should be returned
-    when(routingConfig.getInstanceSelectorType()).thenReturn(RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE);
-    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore, brokerMetrics,
-        adaptiveServerSelector) instanceof StrictReplicaGroupInstanceSelector);
+    when(routingConfig.getInstanceSelectorType()).thenReturn(STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE);
+    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore,
+        brokerMetrics) instanceof StrictReplicaGroupInstanceSelector);
 
     // Should be backward-compatible with legacy config
     when(routingConfig.getInstanceSelectorType()).thenReturn(null);
     when(tableConfig.getTableType()).thenReturn(TableType.OFFLINE);
     when(routingConfig.getRoutingTableBuilderName()).thenReturn(
         InstanceSelectorFactory.LEGACY_REPLICA_GROUP_OFFLINE_ROUTING);
-    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore, brokerMetrics,
-        adaptiveServerSelector) instanceof ReplicaGroupInstanceSelector);
+    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore,
+        brokerMetrics) instanceof ReplicaGroupInstanceSelector);
     when(tableConfig.getTableType()).thenReturn(TableType.REALTIME);
     when(routingConfig.getRoutingTableBuilderName()).thenReturn(
         InstanceSelectorFactory.LEGACY_REPLICA_GROUP_REALTIME_ROUTING);
-    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore, brokerMetrics,
-        adaptiveServerSelector) instanceof ReplicaGroupInstanceSelector);
+    assertTrue(InstanceSelectorFactory.getInstanceSelector(tableConfig, propertyStore,
+        brokerMetrics) instanceof ReplicaGroupInstanceSelector);
   }
 
   @Test
   public void testInstanceSelector() {
     String offlineTableName = "testTable_OFFLINE";
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
     BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
-    AdaptiveServerSelector adaptiveServerSelector = null;
-    BalancedInstanceSelector balancedInstanceSelector = new BalancedInstanceSelector(offlineTableName, brokerMetrics,
-        adaptiveServerSelector);
+    BalancedInstanceSelector balancedInstanceSelector =
+        new BalancedInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
     ReplicaGroupInstanceSelector replicaGroupInstanceSelector =
-        new ReplicaGroupInstanceSelector(offlineTableName, brokerMetrics, adaptiveServerSelector);
+        new ReplicaGroupInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
     StrictReplicaGroupInstanceSelector strictReplicaGroupInstanceSelector =
-        new StrictReplicaGroupInstanceSelector(offlineTableName, brokerMetrics, adaptiveServerSelector);
+        new StrictReplicaGroupInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
 
     Set<String> enabledInstances = new HashSet<>();
     IdealState idealState = new IdealState(offlineTableName);
@@ -201,8 +325,8 @@ public void testInstanceSelector() {
     expectedBalancedInstanceSelectorResult.put(segment1, instance2);
     expectedBalancedInstanceSelectorResult.put(segment2, instance1);
     expectedBalancedInstanceSelectorResult.put(segment3, instance3);
-    InstanceSelector.SelectionResult selectionResult = balancedInstanceSelector.select(brokerRequest, segments,
-        requestId);
+    InstanceSelector.SelectionResult selectionResult =
+        balancedInstanceSelector.select(brokerRequest, segments, requestId);
     assertEquals(selectionResult.getSegmentToInstanceMap(), expectedBalancedInstanceSelectorResult);
     assertTrue(selectionResult.getUnavailableSegments().isEmpty());
     Map<String, String> expectedReplicaGroupInstanceSelectorResult = new HashMap<>();
@@ -392,6 +516,7 @@ public void testInstanceSelector() {
     assertTrue(selectionResult.getUnavailableSegments().isEmpty());
 
     // Process the changes
+    // segment4 is a newly added segment with 3 online instances in idealStage and 2 online instances in externalView.
     balancedInstanceSelector.onAssignmentChange(idealState, externalView, onlineSegments);
     replicaGroupInstanceSelector.onAssignmentChange(idealState, externalView, onlineSegments);
     strictReplicaGroupInstanceSelector.onAssignmentChange(idealState, externalView, onlineSegments);
@@ -551,6 +676,7 @@ public void testInstanceSelector() {
     //     segment2 -> instance1
     //     segment3 -> instance1
     //     segment4 -> instance0
+    //   instance0 is excluded from serving segment4 because instance0 has error for serving segment1
     //   StrictReplicaGroupInstanceSelector:
     //     segment1 -> instance2
     //     segment2 -> instance1
@@ -618,6 +744,7 @@ public void testInstanceSelector() {
   @Test
   public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQuery() {
     String offlineTableName = "testTable_OFFLINE";
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
     BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
     BrokerRequest brokerRequest = mock(BrokerRequest.class);
     PinotQuery pinotQuery = mock(PinotQuery.class);
@@ -626,10 +753,9 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQuery() {
     queryOptions.put("numReplicaGroupsToQuery", "2");
     when(brokerRequest.getPinotQuery()).thenReturn(pinotQuery);
     when(pinotQuery.getQueryOptions()).thenReturn(queryOptions);
-    AdaptiveServerSelector adaptiveServerSelector = null;
 
     ReplicaGroupInstanceSelector replicaGroupInstanceSelector =
-        new ReplicaGroupInstanceSelector(offlineTableName, brokerMetrics, adaptiveServerSelector);
+        new ReplicaGroupInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
 
     Set<String> enabledInstances = new HashSet<>();
     IdealState idealState = new IdealState(offlineTableName);
@@ -658,7 +784,7 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQuery() {
     List<String> segments = getSegments();
     // add all segments to both idealStateSegmentAssignment and externalViewSegmentAssignment maps and also to online
     // segments
-    for (String segment: segments) {
+    for (String segment : segments) {
       idealStateSegmentAssignment.put(segment, idealStateInstanceStateMap0);
       externalViewSegmentAssignment.put(segment, externalViewInstanceStateMap0);
       onlineSegments.add(segment);
@@ -700,18 +826,18 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQuery() {
   @Test
   public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQueryGreaterThanReplicas() {
     String offlineTableName = "testTable_OFFLINE";
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
     BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
     BrokerRequest brokerRequest = mock(BrokerRequest.class);
     PinotQuery pinotQuery = mock(PinotQuery.class);
     Map<String, String> queryOptions = new HashMap<>();
     queryOptions.put("numReplicaGroupsToQuery", "4");
-    AdaptiveServerSelector adaptiveServerSelector = null;
 
     when(brokerRequest.getPinotQuery()).thenReturn(pinotQuery);
     when(pinotQuery.getQueryOptions()).thenReturn(queryOptions);
 
     ReplicaGroupInstanceSelector replicaGroupInstanceSelector =
-        new ReplicaGroupInstanceSelector(offlineTableName, brokerMetrics, adaptiveServerSelector);
+        new ReplicaGroupInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
 
     Set<String> enabledInstances = new HashSet<>();
     IdealState idealState = new IdealState(offlineTableName);
@@ -741,7 +867,7 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQueryGreaterThanRe
 
     // add all segments to both idealStateSegmentAssignment and externalViewSegmentAssignment maps and also to online
     // segments
-    for (String segment: segments) {
+    for (String segment : segments) {
       idealStateSegmentAssignment.put(segment, idealStateInstanceStateMap0);
       externalViewSegmentAssignment.put(segment, externalViewInstanceStateMap0);
       onlineSegments.add(segment);
@@ -783,17 +909,17 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsToQueryGreaterThanRe
   @Test
   public void testReplicaGroupInstanceSelectorNumReplicaGroupsNotSet() {
     String offlineTableName = "testTable_OFFLINE";
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
     BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
     BrokerRequest brokerRequest = mock(BrokerRequest.class);
     PinotQuery pinotQuery = mock(PinotQuery.class);
     Map<String, String> queryOptions = new HashMap<>();
-    AdaptiveServerSelector adaptiveServerSelector = null;
 
     when(brokerRequest.getPinotQuery()).thenReturn(pinotQuery);
     when(pinotQuery.getQueryOptions()).thenReturn(queryOptions);
 
     ReplicaGroupInstanceSelector replicaGroupInstanceSelector =
-        new ReplicaGroupInstanceSelector(offlineTableName, brokerMetrics, adaptiveServerSelector);
+        new ReplicaGroupInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
 
     Set<String> enabledInstances = new HashSet<>();
     IdealState idealState = new IdealState(offlineTableName);
@@ -823,7 +949,7 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsNotSet() {
 
     // add all segments to both idealStateSegmentAssignment and externalViewSegmentAssignment maps and also to online
     // segments
-    for (String segment: segments) {
+    for (String segment : segments) {
       idealStateSegmentAssignment.put(segment, idealStateInstanceStateMap0);
       externalViewSegmentAssignment.put(segment, externalViewInstanceStateMap0);
       onlineSegments.add(segment);
@@ -834,13 +960,13 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsNotSet() {
     // 2nd query should go to next replica group
 
     Map<String, String> expectedReplicaGroupInstanceSelectorResult = new HashMap<>();
-    for (String segment: segments) {
+    for (String segment : segments) {
       expectedReplicaGroupInstanceSelectorResult.put(segment, instance0);
     }
     InstanceSelector.SelectionResult selectionResult = replicaGroupInstanceSelector.select(brokerRequest, segments, 0);
     assertEquals(selectionResult.getSegmentToInstanceMap(), expectedReplicaGroupInstanceSelectorResult);
 
-    for (String segment: segments) {
+    for (String segment : segments) {
       expectedReplicaGroupInstanceSelectorResult.put(segment, instance1);
     }
     selectionResult = replicaGroupInstanceSelector.select(brokerRequest, segments, 1);
@@ -850,27 +976,23 @@ public void testReplicaGroupInstanceSelectorNumReplicaGroupsNotSet() {
   @Test
   public void testMultiStageStrictReplicaGroupSelector() {
     String offlineTableName = "testTable_OFFLINE";
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
+    BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
     // Create instance-partitions with two replica-groups and 1 partition. Each replica-group has 2 instances.
     List<String> replicaGroup0 = ImmutableList.of("instance-0", "instance-1");
     List<String> replicaGroup1 = ImmutableList.of("instance-2", "instance-3");
-    Map<String, List<String>> partitionToInstances = ImmutableMap.of(
-        "0_0", replicaGroup0,
-        "0_1", replicaGroup1);
+    Map<String, List<String>> partitionToInstances = ImmutableMap.of("0_0", replicaGroup0, "0_1", replicaGroup1);
     InstancePartitions instancePartitions = new InstancePartitions(offlineTableName);
     instancePartitions.setInstances(0, 0, partitionToInstances.get("0_0"));
     instancePartitions.setInstances(0, 1, partitionToInstances.get("0_1"));
-    BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
     BrokerRequest brokerRequest = mock(BrokerRequest.class);
     PinotQuery pinotQuery = mock(PinotQuery.class);
     Map<String, String> queryOptions = new HashMap<>();
-
     when(brokerRequest.getPinotQuery()).thenReturn(pinotQuery);
     when(pinotQuery.getQueryOptions()).thenReturn(queryOptions);
 
-    ZkHelixPropertyStore<ZNRecord> propertyStore = (ZkHelixPropertyStore<ZNRecord>) mock(ZkHelixPropertyStore.class);
-
     MultiStageReplicaGroupSelector multiStageSelector =
-        new MultiStageReplicaGroupSelector(offlineTableName, propertyStore, brokerMetrics, null);
+        new MultiStageReplicaGroupSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
     multiStageSelector = spy(multiStageSelector);
     doReturn(instancePartitions).when(multiStageSelector).getInstancePartitions();
 
@@ -962,13 +1084,13 @@ public void testMultiStageStrictReplicaGroupSelector() {
   @Test
   public void testUnavailableSegments() {
     String offlineTableName = "testTable_OFFLINE";
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
     BrokerMetrics brokerMetrics = mock(BrokerMetrics.class);
-    AdaptiveServerSelector adaptiveServerSelector = null;
-    BalancedInstanceSelector balancedInstanceSelector = new BalancedInstanceSelector(offlineTableName, brokerMetrics,
-        adaptiveServerSelector);
+    BalancedInstanceSelector balancedInstanceSelector =
+        new BalancedInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
     // ReplicaGroupInstanceSelector has the same behavior as BalancedInstanceSelector for the unavailable segments
     StrictReplicaGroupInstanceSelector strictReplicaGroupInstanceSelector =
-        new StrictReplicaGroupInstanceSelector(offlineTableName, brokerMetrics, adaptiveServerSelector);
+        new StrictReplicaGroupInstanceSelector(offlineTableName, propertyStore, brokerMetrics, null, Clock.systemUTC());
 
     Set<String> enabledInstances = new HashSet<>();
     IdealState idealState = new IdealState(offlineTableName);
@@ -1154,10 +1276,11 @@ public void testUnavailableSegments() {
       strictReplicaGroupInstanceSelector.onAssignmentChange(idealState, externalView, onlineSegments);
       selectionResult = balancedInstanceSelector.select(brokerRequest, segments, 0);
       assertTrue(selectionResult.getSegmentToInstanceMap().isEmpty());
-      assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+      // segment1 and segment0 are considered old therefore we should report it as unavailable.
+      assertEquals(selectionResult.getUnavailableSegments(), Arrays.asList(segment0, segment1));
       selectionResult = strictReplicaGroupInstanceSelector.select(brokerRequest, segments, 0);
       assertTrue(selectionResult.getSegmentToInstanceMap().isEmpty());
-      assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+      assertEquals(selectionResult.getUnavailableSegments(), Arrays.asList(segment0, segment1));
 
       // Disable the OFFLINE instance, both segments should be unavailable
       // {
@@ -1181,8 +1304,8 @@ public void testUnavailableSegments() {
       assertEquals(selectionResult.getUnavailableSegments(), Arrays.asList(segment0, segment1));
 
       // Change the ERROR instance of segment0 to ONLINE, segment0 should be available
-      // (Note that for StrictReplicaGroupInstanceSelector, segment1 does not have any ONLINE/CONSUMING instance, so it
-      // won't mark instance down for segment0)
+      // (Note that for StrictReplicaGroupInstanceSelector, segment1 but it is old so it will mark instance down for
+      // segment0)
       // {
       //   segment0: {
       //     (disabled) instance: OFFLINE,
@@ -1200,8 +1323,8 @@ public void testUnavailableSegments() {
       assertEquals(selectionResult.getSegmentToInstanceMap().size(), 1);
       assertEquals(selectionResult.getUnavailableSegments(), Collections.singletonList(segment1));
       selectionResult = strictReplicaGroupInstanceSelector.select(brokerRequest, segments, 0);
-      assertEquals(selectionResult.getSegmentToInstanceMap().size(), 1);
-      assertEquals(selectionResult.getUnavailableSegments(), Collections.singletonList(segment1));
+      assertTrue(selectionResult.getSegmentToInstanceMap().isEmpty());
+      assertEquals(selectionResult.getUnavailableSegments(), Arrays.asList(segment0, segment1));
 
       // Disable the ONLINE instance, both segments should be unavailable
       // {
@@ -1250,7 +1373,567 @@ public void testUnavailableSegments() {
     }
   }
 
-  private static List<String> getSegments() {
-    return SEGMENTS;
+  @Test(dataProvider = "selectorType")
+  public void testNewSegmentFromZKMetadataSelection(String selectorType) {
+    String oldSeg = "segment0";
+    String newSeg = "segment1";
+    List<Pair<String, Long>> segmentPushTime = ImmutableList.of(Pair.of(newSeg, _mutableClock.millis() - 100));
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(oldSeg, newSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance1:online]
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance1, ONLINE)));
+
+    ExternalView externalView = createExternalView(externalViewMap);
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    {
+      int requestId = 0;
+      // First selection, we select instance0 for oldSeg and instance1 for newSeg in balance selector
+      // For replica group, we select instance0 for oldSeg and newSeg. Because newSeg is not online in instance0, so
+      // we exclude it from selection result.
+      Map<String, String> expectedSelectionResult;
+      if (isReplicaGroupType(selectorType)) {
+        expectedSelectionResult = ImmutableMap.of(oldSeg, instance0);
+      } else {
+        expectedSelectionResult = ImmutableMap.of(oldSeg, instance0, newSeg, instance1);
+      }
+      InstanceSelector.SelectionResult selectionResult =
+          selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+      assertEquals(selectionResult.getSegmentToInstanceMap(), expectedSelectionResult);
+      assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+    }
+    {
+      int requestId = 1;
+      // Second selection, we select instance1 for oldSeg and instance0 for newSeg in balance selector
+      // Because newSeg is not online in instance0, so we exclude it from selection result.
+      // For replica group, we select instance1 for oldSeg and newSeg.
+      Map<String, String> expectedSelectionResult;
+      switch (selectorType) {
+        case BALANCED_INSTANCE_SELECTOR:
+          expectedSelectionResult = ImmutableMap.of(oldSeg, instance1);
+          break;
+        case STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE: // fall through
+        case RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE:
+          expectedSelectionResult = ImmutableMap.of(oldSeg, instance1, newSeg, instance1);
+          break;
+        default:
+          throw new RuntimeException("unsupported selector type:" + selectorType);
+      }
+      InstanceSelector.SelectionResult selectionResult =
+          selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+      assertEquals(selectionResult.getSegmentToInstanceMap(), expectedSelectionResult);
+      assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+    }
+    // Advance the clock to make newSeg to old segment.
+    _mutableClock.fastForward(Duration.ofMillis(NEW_SEGMENT_EXPIRATION_MILLIS + 10));
+    // Upon re-initialization, newly old segments can only be served from online instances: instance1
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+    {
+      int requestId = 0;
+      Map<String, String> expectedSelectionResult;
+      switch (selectorType) {
+        case BALANCED_INSTANCE_SELECTOR: // fall through
+        case RoutingConfig.REPLICA_GROUP_INSTANCE_SELECTOR_TYPE:
+          expectedSelectionResult = ImmutableMap.of(oldSeg, instance0, newSeg, instance1);
+          break;
+        case STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE:
+          expectedSelectionResult = ImmutableMap.of(oldSeg, instance1, newSeg, instance1);
+          break;
+        default:
+          throw new RuntimeException("unsupported selector type:" + selectorType);
+      }
+      InstanceSelector.SelectionResult selectionResult =
+          selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+      assertEquals(selectionResult.getSegmentToInstanceMap(), expectedSelectionResult);
+      assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+    }
+    {
+      int requestId = 1;
+      Map<String, String> expectedSelectionResult = ImmutableMap.of(oldSeg, instance1, newSeg, instance1);
+      InstanceSelector.SelectionResult selectionResult =
+          selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+      assertEquals(selectionResult.getSegmentToInstanceMap(), expectedSelectionResult);
+      assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+    }
+  }
+
+  // Test that we don't report new segment as unavailable till it gets old.
+  @Test(dataProvider = "selectorType")
+  public void testNewSegmentFromZKMetadataReportingUnavailable(String selectorType) {
+    // Set segment0 as new segment
+    String newSeg = "segment0";
+    String oldSeg = "segment1";
+    List<Pair<String, Long>> segmentPushTime = ImmutableList.of(Pair.of(newSeg, _mutableClock.millis() - 100),
+        Pair.of(oldSeg, _mutableClock.millis() - NEW_SEGMENT_EXPIRATION_MILLIS - 100));
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(newSeg, oldSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+    // Set up ideal state:
+    // Ideal states for new segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for new segments
+    //   [segment0] -> []
+    //   [segment1] -> [instance0: online]
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(newSeg, ImmutableList.of(), oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE)));
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+    // We don't mark segment as unavailable.
+    int requestId = 0;
+    Map<String, String> expectedResult = ImmutableMap.of(oldSeg, instance0);
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+
+    // Advance the clock to make newSeg to old segment and we see newSeg is reported as unavailable segment.
+    _mutableClock.fastForward(Duration.ofMillis(NEW_SEGMENT_EXPIRATION_MILLIS + 10));
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+    selectionResult = selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    if (selectorType == STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE) {
+      expectedResult = ImmutableMap.of();
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(newSeg, oldSeg));
+    } else {
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(newSeg));
+    }
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+  }
+
+  @Test(dataProvider = "selectorType")
+  public void testNewSegmentGetsOldWithErrorState(String selectorType) {
+    // Set segment0 as old segment
+    String oldSeg = "segment0";
+    // Set segment1 as new segment
+    String newSeg = "segment1";
+    List<Pair<String, Long>> segmentPushTime = ImmutableList.of(Pair.of(newSeg, _mutableClock.millis() - 100));
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(oldSeg, newSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> []
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of());
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    // We don't mark segment as unavailable.
+    int requestId = 0;
+    Map<String, String> expectedResult = ImmutableMap.of(oldSeg, instance0);
+
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+
+    // Report error instance for segment1 since segment1 becomes old and we should report it as unavailable.
+    externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ERROR)));
+
+    externalView = createExternalView(externalViewMap);
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+    selectionResult = selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    if (selectorType == STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE) {
+      expectedResult = ImmutableMap.of();
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(oldSeg, newSeg));
+    } else {
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(newSeg));
+    }
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+
+    // Get segment1 back online in instance1
+    externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ERROR), Pair.of(instance1, ONLINE)));
+
+    externalView = createExternalView(externalViewMap);
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+    if (selectorType == STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE) {
+      expectedResult = ImmutableMap.of(oldSeg, instance1, newSeg, instance1);
+    } else {
+      expectedResult = ImmutableMap.of(oldSeg, instance0, newSeg, instance1);
+    }
+    selectionResult = selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+  }
+
+  // Test that we mark new segment as old when external view state converges with ideal state.
+  @Test(dataProvider = "selectorType")
+  public void testNewSegmentGetsOldWithStateConverge(String selectorType) {
+    // Set segment0 as old segment
+    String oldSeg = "segment0";
+    // Set segment1 as new segment
+    String newSeg = "segment1";
+    List<Pair<String, Long>> segmentPushTime = ImmutableList.of(Pair.of(newSeg, _mutableClock.millis() - 100));
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(oldSeg, newSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> []
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of());
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    // We don't mark segment as unavailable.
+    int requestId = 0;
+    Map<String, String> expectedBalancedInstanceSelectorResult = ImmutableMap.of(oldSeg, instance0);
+
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedBalancedInstanceSelectorResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+
+    // Segment1 is not old anymore with state converge.
+    externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    externalView = createExternalView(externalViewMap);
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+
+    // Segment1 becomes unavailable.
+    externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of());
+
+    externalView = createExternalView(externalViewMap);
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+    selectionResult = selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    if (selectorType == STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE) {
+      expectedBalancedInstanceSelectorResult = ImmutableMap.of();
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(oldSeg, newSeg));
+    } else {
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(newSeg));
+    }
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedBalancedInstanceSelectorResult);
+  }
+
+  @Test(dataProvider = "selectorType")
+  public void testNewSegmentsFromIDWithMissingEV(String selectorType) {
+    String oldSeg0 = "segment0";
+    String oldSeg1 = "segment1";
+    Set<String> onlineSegments = ImmutableSet.of(oldSeg0, oldSeg1);
+
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg0, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), oldSeg1,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(oldSeg0, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), oldSeg1,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    // Add a new segment to ideal state with missing external view.
+    String newSeg = "segment2";
+    onlineSegments = ImmutableSet.of(oldSeg0, oldSeg1, newSeg);
+    idealSateMap =
+        ImmutableMap.of(oldSeg0, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), oldSeg1,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    idealState = createIdealState(idealSateMap);
+    externalViewMap =
+        ImmutableMap.of(oldSeg0, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), oldSeg1,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    externalView = createExternalView(externalViewMap);
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+
+    int requestId = 0;
+    Map<String, String> expectedResult;
+    switch (selectorType) {
+      case BALANCED_INSTANCE_SELECTOR:
+        expectedResult = ImmutableMap.of(oldSeg0, instance0, oldSeg1, instance1);
+        break;
+      case REPLICA_GROUP_INSTANCE_SELECTOR_TYPE: // fall through
+      case STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE:
+        expectedResult = ImmutableMap.of(oldSeg0, instance0, oldSeg1, instance0);
+        break;
+      default:
+        throw new RuntimeException("unsupported type:" + selectorType);
+    }
+
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+
+    // Advance the clock to make newSeg to old segment.
+    // On state update, all segments become unavailable.
+    _mutableClock.fastForward(Duration.ofMillis(NEW_SEGMENT_EXPIRATION_MILLIS + 10));
+    selector.onAssignmentChange(idealState, externalView, onlineSegments);
+    selectionResult = selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    if (selectorType == STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE) {
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(oldSeg0, oldSeg1, newSeg));
+    } else {
+      assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(newSeg));
+    }
+  }
+
+  // Test that on instance change, we exclude not enabled instance from serving for new segments.
+  @Test(dataProvider = "selectorType")
+  public void testExcludeNotEnabledInstanceForNewSegment(String selectorType) {
+    // Set segment0 as old segment
+    String oldSeg = "segment0";
+    // Set segment1 as new segment
+    String newSeg = "segment1";
+    List<Pair<String, Long>> segmentPushTime = ImmutableList.of(Pair.of(newSeg, _mutableClock.millis() - 100));
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(oldSeg, newSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online]
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE)));
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    // First selection, we select instance1 for newSeg.
+    int requestId = 0;
+    Map<String, String> expectedResult;
+    switch (selectorType) {
+      case BALANCED_INSTANCE_SELECTOR:
+        expectedResult = ImmutableMap.of(oldSeg, instance0);
+        break;
+      case REPLICA_GROUP_INSTANCE_SELECTOR_TYPE:
+      case STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE:
+        expectedResult = ImmutableMap.of(oldSeg, instance0, newSeg, instance0);
+        break;
+      default:
+        throw new RuntimeException("Unsupported type:" + selectorType);
+    }
+
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+
+    // Remove instance0 from enabledInstances.
+    enabledInstances = ImmutableSet.of(instance1);
+    List<String> changeInstance = ImmutableList.of(instance0);
+    selector.onInstancesChange(enabledInstances, changeInstance);
+    selectionResult = selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    // We don't include instance0 in selection anymore.
+    expectedResult = ImmutableMap.of(oldSeg, instance1);
+
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
+  }
+
+  @Test(dataProvider = "selectorType")
+  public void testExcludeInstanceNotInIdealState(String selectorType) {
+    // Set segment0 as old segment
+    String oldSeg = "segment0";
+    // Set segment1 as new segment
+    String newSeg = "segment1";
+    List<Pair<String, Long>> segmentPushTime =
+        ImmutableList.of(Pair.of(oldSeg, _mutableClock.millis() - NEW_SEGMENT_EXPIRATION_MILLIS - 100),
+            Pair.of(newSeg, _mutableClock.millis() - 100));
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(oldSeg, newSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    String instance2 = "instance2";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1, instance2);
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:online]
+    //   [segment1] -> [instance0:online, instance1:online]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance2: online]
+    //   [segment1] -> [instance2: online]
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(oldSeg, ImmutableList.of(Pair.of(instance2, ONLINE)), newSeg,
+            ImmutableList.of(Pair.of(instance2, ONLINE)));
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    // No selection because the external view is not in ideal state.
+    int requestId = 0;
+    Map<String, String> expectedBalancedInstanceSelectorResult = ImmutableMap.of();
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedBalancedInstanceSelectorResult);
+    assertEquals(selectionResult.getUnavailableSegments(), ImmutableList.of(oldSeg));
+  }
+
+  @Test(dataProvider = "selectorType")
+  public void testExcludeIdealStateOffline(String selectorType) {
+    // Set segment0 as old segment
+    String newSeg = "segment0";
+    String oldSeg = "segment1";
+
+    List<Pair<String, Long>> segmentPushTime = ImmutableList.of(
+        Pair.of(newSeg, _mutableClock.millis() - 100),
+        Pair.of(oldSeg, _mutableClock.millis() - NEW_SEGMENT_EXPIRATION_MILLIS - 100));
+
+    createSegments(segmentPushTime);
+    Set<String> onlineSegments = ImmutableSet.of(newSeg, oldSeg);
+
+    // Set up instances
+    String instance0 = "instance0";
+    String instance1 = "instance1";
+    Set<String> enabledInstances = ImmutableSet.of(instance0, instance1);
+    // Set up ideal state:
+    // Ideal states for two segments
+    //   [segment0] -> [instance0:online, instance1:offline]
+    Map<String, List<Pair<String, String>>> idealSateMap =
+        ImmutableMap.of(
+            newSeg, ImmutableList.of(Pair.of(instance0, OFFLINE), Pair.of(instance1, ONLINE)),
+            oldSeg, ImmutableList.of(Pair.of(instance0, OFFLINE), Pair.of(instance1, ONLINE)));
+
+    IdealState idealState = createIdealState(idealSateMap);
+
+    // Set up external view:
+    // External view for two segments
+    //   [segment0] -> [instance0:offline, instance1:online]
+    Map<String, List<Pair<String, String>>> externalViewMap =
+        ImmutableMap.of(
+            newSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)),
+            oldSeg, ImmutableList.of(Pair.of(instance0, ONLINE), Pair.of(instance1, ONLINE)));
+
+    ExternalView externalView = createExternalView(externalViewMap);
+
+    InstanceSelector selector = createTestInstanceSelector(selectorType);
+    selector.init(enabledInstances, idealState, externalView, onlineSegments);
+
+    // We don't mark segment as unavailable.
+    int requestId = 0;
+    Map<String, String> expectedBalancedInstanceSelectorResult = ImmutableMap.of(oldSeg, instance1, newSeg, instance1);
+
+    InstanceSelector.SelectionResult selectionResult =
+        selector.select(_brokerRequest, Lists.newArrayList(onlineSegments), requestId);
+    assertEquals(selectionResult.getSegmentToInstanceMap(), expectedBalancedInstanceSelectorResult);
+    assertTrue(selectionResult.getUnavailableSegments().isEmpty());
   }
 }
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetcherTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetcherTest.java
new file mode 100644
index 00000000000..151b9f4689b
--- /dev/null
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentmetadata/SegmentZkMetadataFetcherTest.java
@@ -0,0 +1,175 @@
+/**
+ * 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.pinot.broker.routing.segmentmetadata;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.broker.routing.segmentpruner.SegmentPruner;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.controller.helix.ControllerTest;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.fail;
+
+
+public class SegmentZkMetadataFetcherTest extends ControllerTest {
+  private static final String OFFLINE_TABLE_NAME = "testTable_OFFLINE";
+
+  @Test
+  public void testSegmentZkMetadataFetcherShouldNotAllowIncorrectRegisterOrInitBehavior() {
+    ZkHelixPropertyStore<ZNRecord> mockPropertyStore = Mockito.mock(ZkHelixPropertyStore.class);
+    IdealState idealState = Mockito.mock(IdealState.class);
+    ExternalView externalView = Mockito.mock(ExternalView.class);
+
+    // empty listener at beginning
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher =
+        new SegmentZkMetadataFetcher(OFFLINE_TABLE_NAME, mockPropertyStore);
+    assertEquals(segmentZkMetadataFetcher.getListeners().size(), 0);
+
+    // should allow register new listener
+    segmentZkMetadataFetcher.register(mock(SegmentZkMetadataFetchListener.class));
+    assertEquals(segmentZkMetadataFetcher.getListeners().size(), 1);
+
+    // should not allow register new listener once initialized
+    segmentZkMetadataFetcher.init(idealState, externalView, Collections.emptySet());
+    try {
+      segmentZkMetadataFetcher.register(mock(SegmentZkMetadataFetchListener.class));
+      fail();
+    } catch (RuntimeException rte) {
+      assertTrue(rte.getMessage().contains("has already been initialized"));
+    }
+
+    // should not allow duplicate init either
+    try {
+      segmentZkMetadataFetcher.init(idealState, externalView, Collections.emptySet());
+      fail();
+    } catch (RuntimeException rte) {
+      assertTrue(rte.getMessage().contains("has already been initialized"));
+    }
+  }
+
+  @Test
+  public void testSegmentZkMetadataFetcherShouldNotPullZkWhenNoPrunerRegistered() {
+    ZkHelixPropertyStore<ZNRecord> mockPropertyStore = Mockito.mock(ZkHelixPropertyStore.class);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher =
+        new SegmentZkMetadataFetcher(OFFLINE_TABLE_NAME, mockPropertyStore);
+    // NOTE: Ideal state and external view are not used in the current implementation
+    IdealState idealState = Mockito.mock(IdealState.class);
+    ExternalView externalView = Mockito.mock(ExternalView.class);
+
+    assertEquals(segmentZkMetadataFetcher.getListeners().size(), 0);
+    segmentZkMetadataFetcher.init(idealState, externalView, Collections.singleton("foo"));
+    Mockito.verify(mockPropertyStore, times(0)).get(any(), any(), anyInt(), anyBoolean());
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, Collections.singleton("foo"));
+    Mockito.verify(mockPropertyStore, times(0)).get(any(), any(), anyInt(), anyBoolean());
+    segmentZkMetadataFetcher.refreshSegment("foo");
+    Mockito.verify(mockPropertyStore, times(0)).get(any(), any(), anyInt(), anyBoolean());
+  }
+
+  @Test
+  public void testSegmentZkMetadataFetcherShouldPullZkOnlyOncePerSegmentWhenMultiplePrunersRegistered() {
+    ZkHelixPropertyStore<ZNRecord> mockPropertyStore = mock(ZkHelixPropertyStore.class);
+    when(mockPropertyStore.get(any(), any(), anyInt(), anyBoolean())).thenAnswer(inv -> {
+      List<String> pathList = inv.getArgument(0);
+      List<ZNRecord> result = new ArrayList<>(pathList.size());
+      for (String path : pathList) {
+        String[] pathParts = path.split("/");
+        String segmentName = pathParts[pathParts.length - 1];
+        SegmentZKMetadata fakeSegmentZkMetadata = new SegmentZKMetadata(segmentName);
+        result.add(fakeSegmentZkMetadata.toZNRecord());
+      }
+      return result;
+    });
+    SegmentPruner pruner1 = mock(SegmentPruner.class);
+    SegmentPruner pruner2 = mock(SegmentPruner.class);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher =
+        new SegmentZkMetadataFetcher(OFFLINE_TABLE_NAME, mockPropertyStore);
+    segmentZkMetadataFetcher.register(pruner1);
+    segmentZkMetadataFetcher.register(pruner2);
+    // NOTE: Ideal state and external view are not used in the current implementation
+    IdealState idealState = mock(IdealState.class);
+    ExternalView externalView = mock(ExternalView.class);
+
+    assertEquals(segmentZkMetadataFetcher.getListeners().size(), 2);
+    // should call property store once for "foo" and "bar" as a batch
+    segmentZkMetadataFetcher.init(idealState, externalView, ImmutableSet.of("foo", "bar"));
+    verify(mockPropertyStore, times(1)).get(argThat(new ListMatcher("foo", "bar")), any(), anyInt(), anyBoolean());
+    verify(pruner1, times(1)).init(any(), any(), argThat(new ListMatcher("foo", "bar")), any());
+    verify(pruner2, times(1)).init(any(), any(), argThat(new ListMatcher("foo", "bar")), any());
+
+    // should call property store only once b/c "alice" was missing
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, ImmutableSet.of("bar", "alice"));
+    verify(mockPropertyStore, times(1)).get(argThat(new ListMatcher("alice")), any(), anyInt(), anyBoolean());
+    verify(pruner1, times(1)).onAssignmentChange(any(), any(), any(), argThat(new ListMatcher("alice")), any());
+    verify(pruner2, times(1)).onAssignmentChange(any(), any(), any(), argThat(new ListMatcher("alice")), any());
+
+    // should call property store once more b/c "foo" was cleared when onAssignmentChange called with "bar" and "alice"
+    segmentZkMetadataFetcher.refreshSegment("foo");
+    verify(mockPropertyStore, times(1)).get(endsWith("foo"), any(), anyInt());
+    verify(pruner1, times(1)).refreshSegment(eq("foo"), any());
+    verify(pruner2, times(1)).refreshSegment(eq("foo"), any());
+    clearInvocations(mockPropertyStore, pruner1, pruner2);
+
+    // update with all existing segments will call into property store and pruner with empty list
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, ImmutableSet.of("bar", "alice"));
+    verify(mockPropertyStore, times(1)).get(argThat(new ListMatcher()), any(), anyInt(), anyBoolean());
+    verify(pruner1, times(1)).onAssignmentChange(any(), any(), any(), argThat(new ListMatcher()), any());
+    verify(pruner2, times(1)).onAssignmentChange(any(), any(), any(), argThat(new ListMatcher()), any());
+
+    // calling refresh will still force pull from property store
+    segmentZkMetadataFetcher.refreshSegment("foo");
+    verify(mockPropertyStore, times(1)).get(endsWith("foo"), any(), anyInt());
+    verify(pruner1, times(1)).refreshSegment(eq("foo"), any());
+    verify(pruner2, times(1)).refreshSegment(eq("foo"), any());
+  }
+
+  private static class ListMatcher implements ArgumentMatcher<List<String>> {
+    private final List<String> _valueToMatch;
+
+    private ListMatcher(String... values) {
+      _valueToMatch = Arrays.asList(values);
+    }
+
+    @Override
+    public boolean matches(List<String> arg) {
+      if (arg.size() != _valueToMatch.size()) {
+        return false;
+      }
+      for (int i = 0; i < arg.size(); i++) {
+        if (!arg.get(i).endsWith(_valueToMatch.get(i))) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+}
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionMetadataManagerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionMetadataManagerTest.java
new file mode 100644
index 00000000000..6d5999707b4
--- /dev/null
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpartition/SegmentPartitionMetadataManagerTest.java
@@ -0,0 +1,260 @@
+/**
+ * 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.pinot.broker.routing.segmentpartition;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.apache.helix.manager.zk.ZkBaseDataAccessor;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
+import org.apache.helix.zookeeper.impl.client.ZkClient;
+import org.apache.pinot.broker.routing.segmentmetadata.SegmentZkMetadataFetcher;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.controller.helix.ControllerTest;
+import org.apache.pinot.core.routing.TablePartitionInfo;
+import org.apache.pinot.segment.spi.partition.metadata.ColumnPartitionMetadata;
+import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
+import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertEqualsNoOrder;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+
+public class SegmentPartitionMetadataManagerTest extends ControllerTest {
+  private static final String OFFLINE_TABLE_NAME = "testTable_OFFLINE";
+  private static final String PARTITION_COLUMN = "memberId";
+  private static final String PARTITION_COLUMN_FUNC = "Murmur";
+  private static final int NUM_PARTITIONS = 2;
+  private static final String PARTITION_COLUMN_FUNC_ALT = "Modulo";
+  private static final int NUM_PARTITIONS_ALT = 4;
+  private static final String SERVER_0 = "server0";
+  private static final String SERVER_1 = "server1";
+
+  private ZkClient _zkClient;
+  private ZkHelixPropertyStore<ZNRecord> _propertyStore;
+
+  @BeforeClass
+  public void setUp() {
+    startZk();
+    _zkClient = new ZkClient(getZkUrl(), ZkClient.DEFAULT_SESSION_TIMEOUT, ZkClient.DEFAULT_CONNECTION_TIMEOUT,
+        new ZNRecordSerializer());
+    _propertyStore =
+        new ZkHelixPropertyStore<>(new ZkBaseDataAccessor<>(_zkClient), "/TimeBoundaryManagerTest/PROPERTYSTORE", null);
+  }
+
+  @AfterClass
+  public void tearDown() {
+    _zkClient.close();
+    stopZk();
+  }
+
+  @Test
+  public void testPartitionMetadataManagerProcessingThroughSegmentChangesSinglePartitionTable() {
+    // NOTE: Ideal state and external view are not used in the current implementation
+    TableConfig tableConfig =
+        getTableConfig(new String[]{PARTITION_COLUMN}, new String[]{PARTITION_COLUMN_FUNC}, new int[]{NUM_PARTITIONS});
+    ExternalView externalView = new ExternalView(tableConfig.getTableName());
+    Map<String, Map<String, String>> segmentAssignment = externalView.getRecord().getMapFields();
+    Map<String, String> onlineInstanceStateMap = ImmutableMap.of(SERVER_0, ONLINE, SERVER_1, ONLINE);
+    Set<String> onlineSegments = new HashSet<>();
+    // NOTE: Ideal state is not used in the current implementation.
+    IdealState idealState = new IdealState("");
+
+    SegmentPartitionMetadataManager partitionMetadataManager =
+        new SegmentPartitionMetadataManager(OFFLINE_TABLE_NAME, PARTITION_COLUMN, PARTITION_COLUMN_FUNC,
+            NUM_PARTITIONS);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher =
+        new SegmentZkMetadataFetcher(OFFLINE_TABLE_NAME, _propertyStore);
+    segmentZkMetadataFetcher.register(partitionMetadataManager);
+
+    // Initial state should be all empty
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
+    TablePartitionInfo tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    assertEquals(tablePartitionInfo.getPartitionInfoMap(), new TablePartitionInfo.PartitionInfo[NUM_PARTITIONS]);
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Adding segment without partition metadata should be recorded in the invalid segments
+    String segmentWithoutPartitionMetadata = "segmentWithoutPartitionMetadata";
+    onlineSegments.add(segmentWithoutPartitionMetadata);
+    segmentAssignment.put(segmentWithoutPartitionMetadata, onlineInstanceStateMap);
+    SegmentZKMetadata segmentZKMetadataWithoutPartitionMetadata =
+        new SegmentZKMetadata(segmentWithoutPartitionMetadata);
+    ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, OFFLINE_TABLE_NAME,
+        segmentZKMetadataWithoutPartitionMetadata);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    assertEquals(tablePartitionInfo.getPartitionInfoMap(), new TablePartitionInfo.PartitionInfo[NUM_PARTITIONS]);
+    assertEquals(tablePartitionInfo.getSegmentsWithInvalidPartition(),
+        Collections.singletonList(segmentWithoutPartitionMetadata));
+
+    // Removing segment without partition metadata should remove it from the invalid segments
+    onlineSegments.remove(segmentWithoutPartitionMetadata);
+    segmentAssignment.remove(segmentWithoutPartitionMetadata);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    assertEquals(tablePartitionInfo.getPartitionInfoMap(), new TablePartitionInfo.PartitionInfo[NUM_PARTITIONS]);
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Adding segments inline with the partition column config should yield correct partition results
+    String segment0 = "segment0";
+    onlineSegments.add(segment0);
+    segmentAssignment.put(segment0, Collections.singletonMap(SERVER_0, ONLINE));
+    setSegmentZKPartitionMetadata(segment0, PARTITION_COLUMN_FUNC, NUM_PARTITIONS, 0);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    TablePartitionInfo.PartitionInfo[] partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertNull(partitionInfoMap[1]);
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Adding one more segments
+    String segment1 = "segment1";
+    onlineSegments.add(segment1);
+    segmentAssignment.put(segment1, Collections.singletonMap(SERVER_1, ONLINE));
+    setSegmentZKPartitionMetadata(segment1, PARTITION_COLUMN_FUNC, NUM_PARTITIONS, 1);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, Collections.singleton(SERVER_1));
+    assertEquals(partitionInfoMap[1]._segments, Collections.singleton(segment1));
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Updating partition metadata without refreshing should have no effect
+    setSegmentZKPartitionMetadata(segment0, PARTITION_COLUMN_FUNC_ALT, NUM_PARTITIONS_ALT, 0);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, Collections.singleton(SERVER_1));
+    assertEquals(partitionInfoMap[1]._segments, Collections.singleton(segment1));
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Refreshing the changed segment should update the partition info
+    segmentZkMetadataFetcher.refreshSegment(segment0);
+    // segment0 is no longer inline with the table config, and it should be recorded in the invalid segments
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertNull(partitionInfoMap[0]);
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, Collections.singleton(SERVER_1));
+    assertEquals(partitionInfoMap[1]._segments, Collections.singleton(segment1));
+    assertEquals(tablePartitionInfo.getSegmentsWithInvalidPartition(), Collections.singletonList(segment0));
+
+    // Refresh the changed segment back to inline, and both segments should now be back on the partition list
+    setSegmentZKPartitionMetadata(segment0, PARTITION_COLUMN_FUNC, NUM_PARTITIONS, 0);
+    segmentZkMetadataFetcher.refreshSegment(segment0);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, Collections.singleton(SERVER_1));
+    assertEquals(partitionInfoMap[1]._segments, Collections.singleton(segment1));
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Changing one of the segments to be on a different server should update the fully replicated servers
+    segmentAssignment.put(segment1, Collections.singletonMap(SERVER_0, ONLINE));
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[1]._segments, Collections.singleton(segment1));
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Adding one more segment to partition-1 but located on a different server will update the partition map, but
+    // remove the fully replicated server because it is no longer having full replica on a single server
+    String segment2 = "segment2";
+    onlineSegments.add(segment2);
+    segmentAssignment.put(segment2, Collections.singletonMap(SERVER_1, ONLINE));
+    setSegmentZKPartitionMetadata(segment2, PARTITION_COLUMN_FUNC, NUM_PARTITIONS, 1);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertTrue(partitionInfoMap[1]._fullyReplicatedServers.isEmpty());
+    assertEqualsNoOrder(partitionInfoMap[1]._segments.toArray(), new String[]{segment1, segment2});
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Updating the new segment to be replicated on 2 servers should add the fully replicated server back
+    segmentAssignment.put(segment2, ImmutableMap.of(SERVER_0, ONLINE, SERVER_1, ONLINE));
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, Collections.singleton(SERVER_0));
+    assertEqualsNoOrder(partitionInfoMap[1]._segments.toArray(), new String[]{segment1, segment2});
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+
+    // Making all of them replicated will show full list
+    segmentAssignment.put(segment0, ImmutableMap.of(SERVER_0, ONLINE, SERVER_1, ONLINE));
+    segmentAssignment.put(segment1, ImmutableMap.of(SERVER_0, ONLINE, SERVER_1, ONLINE));
+    segmentAssignment.put(segment2, ImmutableMap.of(SERVER_0, ONLINE, SERVER_1, ONLINE));
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
+    tablePartitionInfo = partitionMetadataManager.getTablePartitionInfo();
+    partitionInfoMap = tablePartitionInfo.getPartitionInfoMap();
+    assertEquals(partitionInfoMap[0]._fullyReplicatedServers, ImmutableSet.of(SERVER_0, SERVER_1));
+    assertEquals(partitionInfoMap[0]._segments, Collections.singleton(segment0));
+    assertEquals(partitionInfoMap[1]._fullyReplicatedServers, ImmutableSet.of(SERVER_0, SERVER_1));
+    assertEqualsNoOrder(partitionInfoMap[1]._segments.toArray(), new String[]{segment1, segment2});
+    assertTrue(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty());
+  }
+
+  private TableConfig getTableConfig(String[] partitionColumns, String[] partitionFunctions, int[] partitionSizes) {
+    Map<String, ColumnPartitionConfig> partitionColumnMetadataMap = new HashMap<>();
+    for (int idx = 0; idx < partitionColumns.length; idx++) {
+      partitionColumnMetadataMap.put(partitionColumns[idx],
+          new ColumnPartitionConfig(partitionFunctions[idx], partitionSizes[idx]));
+    }
+    return new TableConfigBuilder(TableType.OFFLINE).setTableName(OFFLINE_TABLE_NAME)
+        .setSegmentPartitionConfig(new SegmentPartitionConfig(partitionColumnMetadataMap)).build();
+  }
+
+  private void setSegmentZKPartitionMetadata(String segment, String partitionFunction, int numPartitions,
+      int partitionId) {
+    SegmentZKMetadata segmentZKMetadata = new SegmentZKMetadata(segment);
+    segmentZKMetadata.setPartitionMetadata(new SegmentPartitionMetadata(Collections.singletonMap(PARTITION_COLUMN,
+        new ColumnPartitionMetadata(partitionFunction, numPartitions, Collections.singleton(partitionId), null))));
+    ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, OFFLINE_TABLE_NAME, segmentZKMetadata);
+  }
+}
diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java
index cc60739d369..feaad35169b 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/routing/segmentpruner/SegmentPrunerTest.java
@@ -35,6 +35,7 @@
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
 import org.apache.helix.zookeeper.impl.client.ZkClient;
+import org.apache.pinot.broker.routing.segmentmetadata.SegmentZkMetadataFetcher;
 import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
@@ -263,9 +264,12 @@ public void testPartitionAwareSegmentPruner() {
     ExternalView externalView = Mockito.mock(ExternalView.class);
 
     SinglePartitionColumnSegmentPruner singlePartitionColumnSegmentPruner =
-        new SinglePartitionColumnSegmentPruner(OFFLINE_TABLE_NAME, PARTITION_COLUMN_1, _propertyStore);
+        new SinglePartitionColumnSegmentPruner(OFFLINE_TABLE_NAME, PARTITION_COLUMN_1);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(OFFLINE_TABLE_NAME,
+        _propertyStore);
+    segmentZkMetadataFetcher.register(singlePartitionColumnSegmentPruner);
     Set<String> onlineSegments = new HashSet<>();
-    singlePartitionColumnSegmentPruner.init(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(singlePartitionColumnSegmentPruner.prune(brokerRequest1, Collections.emptySet()),
         Collections.emptySet());
     assertEquals(singlePartitionColumnSegmentPruner.prune(brokerRequest2, Collections.emptySet()),
@@ -289,7 +293,7 @@ public void testPartitionAwareSegmentPruner() {
         new SegmentZKMetadata(segmentWithoutPartitionMetadata);
     ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, OFFLINE_TABLE_NAME,
         segmentZKMetadataWithoutPartitionMetadata);
-    singlePartitionColumnSegmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(singlePartitionColumnSegmentPruner.prune(brokerRequest1,
             new HashSet<>(Collections.singletonList(segmentWithoutPartitionMetadata))),
         Collections.singletonList(segmentWithoutPartitionMetadata));
@@ -309,7 +313,7 @@ public void testPartitionAwareSegmentPruner() {
     String segment1 = "segment1";
     onlineSegments.add(segment1);
     setSegmentZKPartitionMetadata(OFFLINE_TABLE_NAME, segment1, "Murmur", 4, 0);
-    singlePartitionColumnSegmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(
         singlePartitionColumnSegmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1))),
         new HashSet<>(Arrays.asList(segment0, segment1)));
@@ -322,7 +326,7 @@ public void testPartitionAwareSegmentPruner() {
 
     // Update partition metadata without refreshing should have no effect
     setSegmentZKPartitionMetadata(OFFLINE_TABLE_NAME, segment0, "Modulo", 4, 1);
-    singlePartitionColumnSegmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(
         singlePartitionColumnSegmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1))),
         new HashSet<>(Arrays.asList(segment0, segment1)));
@@ -334,7 +338,7 @@ public void testPartitionAwareSegmentPruner() {
         new HashSet<>(Collections.singletonList(segment1)));
 
     // Refresh the changed segment should update the segment pruner
-    singlePartitionColumnSegmentPruner.refreshSegment(segment0);
+    segmentZkMetadataFetcher.refreshSegment(segment0);
     assertEquals(
         singlePartitionColumnSegmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1))),
         new HashSet<>(Arrays.asList(segment0, segment1)));
@@ -348,8 +352,10 @@ public void testPartitionAwareSegmentPruner() {
     // Multi-column partitioned segment.
     MultiPartitionColumnsSegmentPruner multiPartitionColumnsSegmentPruner =
         new MultiPartitionColumnsSegmentPruner(OFFLINE_TABLE_NAME,
-            Stream.of(PARTITION_COLUMN_1, PARTITION_COLUMN_2).collect(Collectors.toSet()), _propertyStore);
-    multiPartitionColumnsSegmentPruner.init(idealState, externalView, onlineSegments);
+            Stream.of(PARTITION_COLUMN_1, PARTITION_COLUMN_2).collect(Collectors.toSet()));
+    segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(OFFLINE_TABLE_NAME, _propertyStore);
+    segmentZkMetadataFetcher.register(multiPartitionColumnsSegmentPruner);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(multiPartitionColumnsSegmentPruner.prune(brokerRequest1, Collections.emptySet()),
         Collections.emptySet());
     assertEquals(multiPartitionColumnsSegmentPruner.prune(brokerRequest2, Collections.emptySet()),
@@ -367,10 +373,10 @@ public void testPartitionAwareSegmentPruner() {
     Map<String, String> partitionColumn2FunctionConfig = new HashMap<>();
     partitionColumn2FunctionConfig.put("columnValues", "xyz|abc");
     partitionColumn2FunctionConfig.put("columnValuesDelimiter", "|");
-    columnPartitionMetadataMap.put(PARTITION_COLUMN_2,
-        new ColumnPartitionMetadata("BoundedColumnValue", 3, Collections.singleton(1), partitionColumn2FunctionConfig));
+    columnPartitionMetadataMap.put(PARTITION_COLUMN_2, new ColumnPartitionMetadata(
+        "BoundedColumnValue", 3, Collections.singleton(1), partitionColumn2FunctionConfig));
     setSegmentZKPartitionMetadata(OFFLINE_TABLE_NAME, segment2, columnPartitionMetadataMap);
-    multiPartitionColumnsSegmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(
         multiPartitionColumnsSegmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1))),
         new HashSet<>(Arrays.asList(segment0, segment1)));
@@ -399,10 +405,13 @@ public void testTimeSegmentPruner() {
 
     TableConfig tableConfig = getTableConfig(RAW_TABLE_NAME, TableType.REALTIME);
     setSchemaDateTimeFieldSpec(RAW_TABLE_NAME, TimeUnit.DAYS);
-
-    TimeSegmentPruner segmentPruner = new TimeSegmentPruner(tableConfig, _propertyStore);
+    TimeSegmentPruner segmentPruner = SegmentPrunerFactory.createTimeSegmentPruner(tableConfig,
+        _propertyStore);
     Set<String> onlineSegments = new HashSet<>();
-    segmentPruner.init(idealState, externalView, onlineSegments);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(REALTIME_TABLE_NAME,
+        _propertyStore);
+    segmentZkMetadataFetcher.register(segmentPruner);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, Collections.emptySet()), Collections.emptySet());
     assertEquals(segmentPruner.prune(brokerRequest2, Collections.emptySet()), Collections.emptySet());
     assertEquals(segmentPruner.prune(brokerRequest3, Collections.emptySet()), Collections.emptySet());
@@ -413,10 +422,12 @@ public void testTimeSegmentPruner() {
 
     // Initialize with non-empty onlineSegments
     // Segments without metadata (not updated yet) should not be pruned
-    segmentPruner = new TimeSegmentPruner(tableConfig, _propertyStore);
+    segmentPruner = SegmentPrunerFactory.createTimeSegmentPruner(tableConfig, _propertyStore);
+    segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(REALTIME_TABLE_NAME, _propertyStore);
+    segmentZkMetadataFetcher.register(segmentPruner);
     String newSegment = "newSegment";
     onlineSegments.add(newSegment);
-    segmentPruner.init(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, Collections.singleton(newSegment)),
         Collections.singletonList(newSegment));
     assertEquals(segmentPruner.prune(brokerRequest2, Collections.singleton(newSegment)),
@@ -440,7 +451,7 @@ public void testTimeSegmentPruner() {
     segmentZKMetadataWithoutTimeRangeMetadata.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
     ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, REALTIME_TABLE_NAME,
         segmentZKMetadataWithoutTimeRangeMetadata);
-    segmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(
         segmentPruner.prune(brokerRequest1, new HashSet<>(Collections.singletonList(segmentWithoutTimeRangeMetadata))),
         Collections.singletonList(segmentWithoutTimeRangeMetadata));
@@ -476,7 +487,7 @@ public void testTimeSegmentPruner() {
     onlineSegments.add(segment2);
     setSegmentZKTimeRangeMetadata(REALTIME_TABLE_NAME, segment2, 50, 65, TimeUnit.DAYS);
 
-    segmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
         new HashSet<>(Arrays.asList(segment0, segment1, segment2)));
     assertEquals(segmentPruner.prune(brokerRequest2, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
@@ -510,7 +521,7 @@ public void testTimeSegmentPruner() {
         Collections.emptySet());
 
     // Refresh the changed segment should update the segment pruner
-    segmentPruner.refreshSegment(segment2);
+    segmentZkMetadataFetcher.refreshSegment(segment2);
     assertEquals(segmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
         new HashSet<>(Arrays.asList(segment0, segment1, segment2)));
     assertEquals(segmentPruner.prune(brokerRequest2, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
@@ -541,7 +552,10 @@ public void testTimeSegmentPrunerSimpleDateFormat() {
     TableConfig tableConfig = getTableConfig(RAW_TABLE_NAME, TableType.REALTIME);
     setSchemaDateTimeFieldSpecSDF(RAW_TABLE_NAME, SDF_PATTERN);
 
-    TimeSegmentPruner segmentPruner = new TimeSegmentPruner(tableConfig, _propertyStore);
+    TimeSegmentPruner segmentPruner = SegmentPrunerFactory.createTimeSegmentPruner(tableConfig, _propertyStore);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(REALTIME_TABLE_NAME,
+        _propertyStore);
+    segmentZkMetadataFetcher.register(segmentPruner);
     Schema schema = ZKMetadataProvider.getTableSchema(_propertyStore, RAW_TABLE_NAME);
     DateTimeFormatSpec dateTimeFormatSpec = schema.getSpecForTimeColumn(TIME_COLUMN).getFormatSpec();
 
@@ -561,7 +575,7 @@ public void testTimeSegmentPrunerSimpleDateFormat() {
     setSegmentZKTimeRangeMetadata(REALTIME_TABLE_NAME, segment2, dateTimeFormatSpec.fromFormatToMillis("20200401"),
         dateTimeFormatSpec.fromFormatToMillis("20200430"), TimeUnit.MILLISECONDS);
 
-    segmentPruner.init(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, onlineSegments), Collections.singleton(segment0));
     assertEquals(segmentPruner.prune(brokerRequest2, onlineSegments), new HashSet<>(Arrays.asList(segment0, segment1)));
     assertEquals(segmentPruner.prune(brokerRequest3, onlineSegments), Collections.singleton(segment1));
@@ -581,7 +595,10 @@ public void testTimeSegmentPrunerSql() {
     TableConfig tableConfig = getTableConfig(RAW_TABLE_NAME, TableType.REALTIME);
     setSchemaDateTimeFieldSpec(RAW_TABLE_NAME, TimeUnit.DAYS);
 
-    TimeSegmentPruner segmentPruner = new TimeSegmentPruner(tableConfig, _propertyStore);
+    TimeSegmentPruner segmentPruner = SegmentPrunerFactory.createTimeSegmentPruner(tableConfig, _propertyStore);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(REALTIME_TABLE_NAME,
+        _propertyStore);
+    segmentZkMetadataFetcher.register(segmentPruner);
     Set<String> onlineSegments = new HashSet<>();
     String segment0 = "segment0";
     onlineSegments.add(segment0);
@@ -592,7 +609,7 @@ public void testTimeSegmentPrunerSql() {
     String segment2 = "segment2";
     onlineSegments.add(segment2);
     setSegmentZKTimeRangeMetadata(REALTIME_TABLE_NAME, segment2, 50, 65, TimeUnit.DAYS);
-    segmentPruner.init(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
 
     assertEquals(segmentPruner.prune(brokerRequest1, onlineSegments), new HashSet<>(Arrays.asList(segment0, segment2)));
     assertEquals(segmentPruner.prune(brokerRequest2, onlineSegments), new HashSet<>(Arrays.asList(segment0, segment1)));
@@ -610,7 +627,10 @@ public void testEmptySegmentPruner() {
     TableConfig tableConfig = getTableConfig(RAW_TABLE_NAME, TableType.REALTIME);
 
     // init with list of segments
-    EmptySegmentPruner segmentPruner = new EmptySegmentPruner(tableConfig, _propertyStore);
+    EmptySegmentPruner segmentPruner = new EmptySegmentPruner(tableConfig);
+    SegmentZkMetadataFetcher segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(REALTIME_TABLE_NAME,
+        _propertyStore);
+    segmentZkMetadataFetcher.register(segmentPruner);
     Set<String> onlineSegments = new HashSet<>();
     String segment0 = "segment0";
     onlineSegments.add(segment0);
@@ -618,7 +638,7 @@ public void testEmptySegmentPruner() {
     String segment1 = "segment1";
     onlineSegments.add(segment1);
     setSegmentZKTotalDocsMetadata(REALTIME_TABLE_NAME, segment1, 0);
-    segmentPruner.init(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1))),
         new HashSet<>(Collections.singletonList(segment0)));
     assertEquals(segmentPruner.prune(brokerRequest2, new HashSet<>(Arrays.asList(segment0, segment1))),
@@ -627,9 +647,11 @@ public void testEmptySegmentPruner() {
         new HashSet<>(Collections.singletonList(segment0)));
 
     // init with empty list of segments
-    segmentPruner = new EmptySegmentPruner(tableConfig, _propertyStore);
+    segmentPruner = new EmptySegmentPruner(tableConfig);
+    segmentZkMetadataFetcher = new SegmentZkMetadataFetcher(REALTIME_TABLE_NAME, _propertyStore);
+    segmentZkMetadataFetcher.register(segmentPruner);
     onlineSegments.clear();
-    segmentPruner.init(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.init(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, Collections.emptySet()), Collections.emptySet());
     assertEquals(segmentPruner.prune(brokerRequest2, Collections.emptySet()), Collections.emptySet());
     assertEquals(segmentPruner.prune(brokerRequest3, Collections.emptySet()), Collections.emptySet());
@@ -637,7 +659,7 @@ public void testEmptySegmentPruner() {
     // Segments without metadata (not updated yet) should not be pruned
     String newSegment = "newSegment";
     onlineSegments.add(newSegment);
-    segmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, Collections.singleton(newSegment)),
         Collections.singleton(newSegment));
     assertEquals(segmentPruner.prune(brokerRequest2, Collections.singleton(newSegment)),
@@ -654,7 +676,7 @@ public void testEmptySegmentPruner() {
     segmentZKMetadataWithoutTotalDocsMetadata.setStatus(CommonConstants.Segment.Realtime.Status.IN_PROGRESS);
     ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, REALTIME_TABLE_NAME,
         segmentZKMetadataWithoutTotalDocsMetadata);
-    segmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, Collections.singleton(segmentWithoutTotalDocsMetadata)),
         Collections.singleton(segmentWithoutTotalDocsMetadata));
     assertEquals(segmentPruner.prune(brokerRequest2, Collections.singleton(segmentWithoutTotalDocsMetadata)),
@@ -667,7 +689,7 @@ public void testEmptySegmentPruner() {
     String segmentWithNegativeTotalDocsMetadata = "segmentWithNegativeTotalDocsMetadata";
     onlineSegments.add(segmentWithNegativeTotalDocsMetadata);
     setSegmentZKTotalDocsMetadata(REALTIME_TABLE_NAME, segmentWithNegativeTotalDocsMetadata, -1);
-    segmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, Collections.singleton(segmentWithNegativeTotalDocsMetadata)),
         Collections.singleton(segmentWithNegativeTotalDocsMetadata));
     assertEquals(segmentPruner.prune(brokerRequest2, Collections.singleton(segmentWithNegativeTotalDocsMetadata)),
@@ -685,7 +707,7 @@ public void testEmptySegmentPruner() {
     onlineSegments.add(segment2);
     setSegmentZKTotalDocsMetadata(REALTIME_TABLE_NAME, segment2, -1);
 
-    segmentPruner.onAssignmentChange(idealState, externalView, onlineSegments);
+    segmentZkMetadataFetcher.onAssignmentChange(idealState, externalView, onlineSegments);
     assertEquals(segmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
         new HashSet<>(Arrays.asList(segment0, segment2)));
     assertEquals(segmentPruner.prune(brokerRequest2, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
@@ -704,7 +726,7 @@ public void testEmptySegmentPruner() {
         new HashSet<>(Arrays.asList(segment0, segment2)));
 
     // Refresh the changed segment should update the segment pruner
-    segmentPruner.refreshSegment(segment2);
+    segmentZkMetadataFetcher.refreshSegment(segment2);
     assertEquals(segmentPruner.prune(brokerRequest1, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
         new HashSet<>(Collections.singletonList(segment0)));
     assertEquals(segmentPruner.prune(brokerRequest2, new HashSet<>(Arrays.asList(segment0, segment1, segment2))),
diff --git a/pinot-clients/pinot-java-client/pom.xml b/pinot-clients/pinot-java-client/pom.xml
index df7f8f3d9d1..dcb1e1b5051 100644
--- a/pinot-clients/pinot-java-client/pom.xml
+++ b/pinot-clients/pinot-java-client/pom.xml
@@ -74,30 +74,10 @@
     <dependency>
       <groupId>org.asynchttpclient</groupId>
       <artifactId>async-http-client</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-unix-common</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.101tec</groupId>
       <artifactId>zkclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCache.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCache.java
index 7bc2bc9e6f7..530f59958d5 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCache.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCache.java
@@ -24,6 +24,7 @@
 import io.netty.handler.ssl.JdkSslContext;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -34,6 +35,7 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
+import org.apache.pinot.client.utils.BrokerSelectorUtils;
 import org.apache.pinot.client.utils.ConnectionUtils;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -188,9 +190,17 @@ protected void updateBrokerData()
     _brokerData = getBrokerData(responses);
   }
 
-  public String getBroker(String tableName) {
-    List<String> brokers =
-        (tableName == null) ? _brokerData.getBrokers() : _brokerData.getTableToBrokerMap().get(tableName);
+  public String getBroker(String... tableNames) {
+    List<String> brokers = null;
+    if (tableNames != null) {
+       // returning list of common brokers hosting all the tables.
+       brokers = BrokerSelectorUtils.getTablesCommonBrokers(Arrays.asList(tableNames),
+           _brokerData.getTableToBrokerMap());
+    }
+
+    if (brokers == null || brokers.isEmpty()) {
+      brokers = _brokerData.getBrokers();
+    }
     return brokers.get(_random.nextInt(brokers.size()));
   }
 
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCacheUpdaterPeriodic.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCacheUpdaterPeriodic.java
index 54d88ba8cd0..3c4080bac20 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCacheUpdaterPeriodic.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerCacheUpdaterPeriodic.java
@@ -65,7 +65,7 @@ public void run() {
     }
   }
 
-  public String getBroker(String tableName) {
+  public String getBroker(String... tableName) {
     return _brokerCache.getBroker(tableName);
   }
 
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerResponse.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerResponse.java
index 9422061395c..c8cd0b8ce39 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerResponse.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerResponse.java
@@ -24,7 +24,8 @@
 /**
  * Reimplementation of BrokerResponse from pinot-common, so that pinot-api does not depend on pinot-common.
  */
-class BrokerResponse {
+public class BrokerResponse {
+  private String _requestId;
   private JsonNode _aggregationResults;
   private JsonNode _selectionResults;
   private JsonNode _resultTable;
@@ -35,6 +36,7 @@ private BrokerResponse() {
   }
 
   private BrokerResponse(JsonNode brokerResponse) {
+    _requestId = brokerResponse.get("requestId") != null ? brokerResponse.get("requestId").asText() : "unknown";
     _aggregationResults = brokerResponse.get("aggregationResults");
     _exceptions = brokerResponse.get("exceptions");
     _selectionResults = brokerResponse.get("selectionResults");
@@ -81,4 +83,8 @@ static BrokerResponse fromJson(JsonNode json) {
   static BrokerResponse empty() {
     return new BrokerResponse();
   }
+
+  public String getRequestId() {
+    return _requestId;
+  }
 }
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerSelector.java
index 7da5948ea0b..6b43da27cd6 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerSelector.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerSelector.java
@@ -23,10 +23,10 @@
 public interface BrokerSelector {
   /**
    * Returns the broker address in the form host:port
-   * @param table
+   * @param tableNames
    * @return
    */
-  String selectBroker(String table);
+  String selectBroker(String... tableNames);
 
   /**
    * Returns list of all brokers.
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Connection.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Connection.java
index c236446d3d3..f43d4659158 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Connection.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Connection.java
@@ -20,12 +20,11 @@
 
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.CompletableFuture;
 import javax.annotation.Nullable;
-import org.apache.pinot.sql.parsers.CalciteSqlCompiler;
+import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.sql.parsers.CalciteSqlParser;
+import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,24 +36,24 @@ public class Connection {
   public static final String FAIL_ON_EXCEPTIONS = "failOnExceptions";
   private static final Logger LOGGER = LoggerFactory.getLogger(Connection.class);
 
-  private final PinotClientTransport _transport;
+  private final PinotClientTransport<?> _transport;
   private final BrokerSelector _brokerSelector;
   private final boolean _failOnExceptions;
 
-  Connection(List<String> brokerList, PinotClientTransport transport) {
+  Connection(List<String> brokerList, PinotClientTransport<?> transport) {
     this(new Properties(), new SimpleBrokerSelector(brokerList), transport);
   }
 
-  Connection(Properties properties, List<String> brokerList, PinotClientTransport transport) {
+  Connection(Properties properties, List<String> brokerList, PinotClientTransport<?> transport) {
     this(properties, new SimpleBrokerSelector(brokerList), transport);
     LOGGER.info("Created connection to broker list {}", brokerList);
   }
 
-  Connection(BrokerSelector brokerSelector, PinotClientTransport transport) {
+  Connection(BrokerSelector brokerSelector, PinotClientTransport<?> transport) {
     this(new Properties(), brokerSelector, transport);
   }
 
-  Connection(Properties properties, BrokerSelector brokerSelector, PinotClientTransport transport) {
+  Connection(Properties properties, BrokerSelector brokerSelector, PinotClientTransport<?> transport) {
     _brokerSelector = brokerSelector;
     _transport = transport;
 
@@ -116,8 +115,8 @@ public ResultSetGroup execute(Request request)
    */
   public ResultSetGroup execute(@Nullable String tableName, String query)
       throws PinotClientException {
-    tableName = tableName == null ? resolveTableName(query) : tableName;
-    String brokerHostPort = _brokerSelector.selectBroker(tableName);
+    String[] tableNames = (tableName == null) ? resolveTableName(query) : new String[]{tableName};
+    String brokerHostPort = _brokerSelector.selectBroker(tableNames);
     if (brokerHostPort == null) {
       throw new PinotClientException("Could not find broker to query for table: " + tableName);
     }
@@ -148,7 +147,7 @@ public ResultSetGroup execute(@Nullable String tableName, Request request)
    * @return A future containing the result of the query
    * @throws PinotClientException If an exception occurs while processing the query
    */
-  public Future<ResultSetGroup> executeAsync(String query)
+  public CompletableFuture<ResultSetGroup> executeAsync(String query)
       throws PinotClientException {
     return executeAsync(null, query);
   }
@@ -161,7 +160,7 @@ public Future<ResultSetGroup> executeAsync(String query)
    * @throws PinotClientException If an exception occurs while processing the query
    */
   @Deprecated
-  public Future<ResultSetGroup> executeAsync(Request request)
+  public CompletableFuture<ResultSetGroup> executeAsync(Request request)
       throws PinotClientException {
     return executeAsync(null, request.getQuery());
   }
@@ -173,24 +172,31 @@ public Future<ResultSetGroup> executeAsync(Request request)
    * @return A future containing the result of the query
    * @throws PinotClientException If an exception occurs while processing the query
    */
-  public Future<ResultSetGroup> executeAsync(@Nullable String tableName, String query)
+  public CompletableFuture<ResultSetGroup> executeAsync(@Nullable String tableName, String query)
       throws PinotClientException {
-    tableName = tableName == null ? resolveTableName(query) : tableName;
-    String brokerHostPort = _brokerSelector.selectBroker(tableName);
+    String[] tableNames = (tableName == null) ? resolveTableName(query) : new String[]{tableName};
+    String brokerHostPort = _brokerSelector.selectBroker(tableNames);
     if (brokerHostPort == null) {
       throw new PinotClientException("Could not find broker to query for statement: " + query);
     }
-    return new ResultSetGroupFuture(_transport.executeQueryAsync(brokerHostPort, query));
+    return _transport.executeQueryAsync(brokerHostPort, query).thenApply(ResultSetGroup::new);
   }
 
+  /**
+   * Returns the name of all the tables used in a sql query.
+   *
+   * @return name of all the tables used in a sql query.
+   */
   @Nullable
-  private static String resolveTableName(String query) {
+  private static String[] resolveTableName(String query) {
     try {
-      return CalciteSqlCompiler.compileToBrokerRequest(query).querySource.tableName;
+      SqlNodeAndOptions sqlNodeAndOptions = CalciteSqlParser.compileToSqlNodeAndOptions(query);
+      return RequestUtils.getTableNames(CalciteSqlParser.compileSqlNodeToPinotQuery(sqlNodeAndOptions.getSqlNode()))
+          .toArray(new String[0]);
     } catch (Exception e) {
-      LOGGER.error("Cannot parse table name from query: {}", query, e);
-      return null;
+      LOGGER.error("Cannot parse table name from query: {}. Fallback to broker selector default.", query, e);
     }
+    return null;
   }
 
   /**
@@ -213,43 +219,13 @@ public void close()
     _brokerSelector.close();
   }
 
-  private static class ResultSetGroupFuture implements Future<ResultSetGroup> {
-    private final Future<BrokerResponse> _responseFuture;
-
-    public ResultSetGroupFuture(Future<BrokerResponse> responseFuture) {
-      _responseFuture = responseFuture;
-    }
-
-    @Override
-    public boolean cancel(boolean mayInterruptIfRunning) {
-      return _responseFuture.cancel(mayInterruptIfRunning);
-    }
-
-    @Override
-    public boolean isCancelled() {
-      return _responseFuture.isCancelled();
-    }
-
-    @Override
-    public boolean isDone() {
-      return _responseFuture.isDone();
-    }
-
-    @Override
-    public ResultSetGroup get()
-        throws InterruptedException, ExecutionException {
-      try {
-        return get(60000L, TimeUnit.MILLISECONDS);
-      } catch (TimeoutException e) {
-        throw new ExecutionException(e);
-      }
-    }
-
-    @Override
-    public ResultSetGroup get(long timeout, TimeUnit unit)
-        throws InterruptedException, ExecutionException, TimeoutException {
-      BrokerResponse response = _responseFuture.get(timeout, unit);
-      return new ResultSetGroup(response);
-    }
+  /**
+   * Provides access to the underlying transport mechanism for this connection.
+   * There may be client metrics useful for monitoring and other observability goals.
+   *
+   * @return pinot client transport.
+   */
+  public PinotClientTransport<?> getTransport() {
+    return _transport;
   }
 }
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ConnectionFactory.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ConnectionFactory.java
index dbb798fbd45..1ed65dd2ebc 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ConnectionFactory.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ConnectionFactory.java
@@ -28,7 +28,7 @@
  * Creates connections to Pinot, given various initialization methods.
  */
 public class ConnectionFactory {
-  private static PinotClientTransport _defaultTransport;
+  private static volatile PinotClientTransport _defaultTransport;
 
   private ConnectionFactory() {
   }
@@ -126,6 +126,23 @@ public static Connection fromController(Properties properties, String controller
       throw new PinotClientException(e);
     }
   }
+
+  /**
+   * @param properties
+   * @param controllerUrl url host:port of the controller
+   * @param transport pinot transport
+   * @return A connection that connects to brokers as per the given controller
+   */
+  public static Connection fromController(Properties properties, String controllerUrl, PinotClientTransport transport) {
+    try {
+      return new Connection(properties,
+          new ControllerBasedBrokerSelector(properties, controllerUrl),
+          transport);
+    } catch (Exception e) {
+      throw new PinotClientException(e);
+    }
+  }
+
   /**
    * Creates a connection to a Pinot cluster, given its Zookeeper URL
    *
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ControllerBasedBrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ControllerBasedBrokerSelector.java
index d49ed48dec0..cdc2190454e 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ControllerBasedBrokerSelector.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ControllerBasedBrokerSelector.java
@@ -55,8 +55,8 @@ public ControllerBasedBrokerSelector(Properties properties, String controllerUrl
 
 
   @Override
-  public String selectBroker(String table) {
-    return _brokerCache.getBroker(table);
+  public String selectBroker(String... tableNames) {
+    return _brokerCache.getBroker(tableNames);
   }
 
   @Override
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
index 7c7fcfc8b63..729372ee330 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
@@ -21,6 +21,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +33,7 @@
 import org.I0Itec.zkclient.IZkDataListener;
 import org.I0Itec.zkclient.ZkClient;
 import org.I0Itec.zkclient.serialize.BytesPushThroughSerializer;
+import org.apache.pinot.client.utils.BrokerSelectorUtils;
 
 
 /**
@@ -86,24 +88,16 @@ private void refresh() {
 
   @Nullable
   @Override
-  public String selectBroker(String table) {
-    if (table != null) {
-      String tableName =
-          table.replace(ExternalViewReader.OFFLINE_SUFFIX, "").replace(ExternalViewReader.REALTIME_SUFFIX, "");
-      List<String> list = _tableToBrokerListMapRef.get().get(tableName);
-      if (list != null && !list.isEmpty()) {
-        return list.get(RANDOM.nextInt(list.size()));
-      }
-      // In case tableName is formatted as <db>.<table>
-      int idx = tableName.indexOf('.');
-      if (idx > 0) {
-        tableName = tableName.substring(idx + 1);
-      }
-      list = _tableToBrokerListMapRef.get().get(tableName);
+  public String selectBroker(String... tableNames) {
+    if (tableNames != null) {
+      // getting list of brokers hosting all the tables.
+      List<String> list = BrokerSelectorUtils.getTablesCommonBrokers(Arrays.asList(tableNames),
+          _tableToBrokerListMapRef.get());
       if (list != null && !list.isEmpty()) {
         return list.get(RANDOM.nextInt(list.size()));
       }
     }
+
     // Return a broker randomly if table is null or no broker is found for the specified table.
     List<String> list = _allBrokerListRef.get();
     if (list != null && !list.isEmpty()) {
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
index cd0e49139ad..c87ae3fd80f 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.client;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -28,8 +29,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
@@ -39,9 +40,9 @@
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.BoundRequestBuilder;
+import org.asynchttpclient.ClientStats;
 import org.asynchttpclient.DefaultAsyncHttpClientConfig.Builder;
 import org.asynchttpclient.Dsl;
-import org.asynchttpclient.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,7 +50,7 @@
 /**
  * JSON encoded Pinot client transport over AsyncHttpClient.
  */
-public class JsonAsyncHttpPinotClientTransport implements PinotClientTransport {
+public class JsonAsyncHttpPinotClientTransport implements PinotClientTransport<ClientStats> {
   private static final Logger LOGGER = LoggerFactory.getLogger(JsonAsyncHttpPinotClientTransport.class);
   private static final ObjectReader OBJECT_READER = JsonUtils.DEFAULT_READER;
   private static final String DEFAULT_EXTRA_QUERY_OPTION_STRING = "groupByMode=sql;responseFormat=sql";
@@ -66,7 +67,7 @@ public JsonAsyncHttpPinotClientTransport() {
     _headers = new HashMap<>();
     _scheme = CommonConstants.HTTP_PROTOCOL;
     _extraOptionStr = DEFAULT_EXTRA_QUERY_OPTION_STRING;
-    _httpClient = Dsl.asyncHttpClient();
+    _httpClient = Dsl.asyncHttpClient(Dsl.config().setRequestTimeout(_brokerReadTimeout));
   }
 
   public JsonAsyncHttpPinotClientTransport(Map<String, String> headers, String scheme, String extraOptionString,
@@ -82,7 +83,8 @@ public JsonAsyncHttpPinotClientTransport(Map<String, String> headers, String sch
       builder.setSslContext(new JdkSslContext(sslContext, true, ClientAuth.OPTIONAL));
     }
 
-    builder.setReadTimeout(connectionTimeouts.getReadTimeoutMs())
+    builder.setRequestTimeout(_brokerReadTimeout)
+        .setReadTimeout(connectionTimeouts.getReadTimeoutMs())
         .setConnectTimeout(connectionTimeouts.getConnectTimeoutMs())
         .setHandshakeTimeout(connectionTimeouts.getHandshakeTimeoutMs())
         .setUserAgent(ConnectionUtils.getUserAgentVersionFromClassPath("ua", appId))
@@ -103,7 +105,8 @@ public JsonAsyncHttpPinotClientTransport(Map<String, String> headers, String sch
       builder.setSslContext(sslContext);
     }
 
-    builder.setReadTimeout(connectionTimeouts.getReadTimeoutMs())
+    builder.setRequestTimeout(_brokerReadTimeout)
+        .setReadTimeout(connectionTimeouts.getReadTimeoutMs())
         .setConnectTimeout(connectionTimeouts.getConnectTimeoutMs())
         .setHandshakeTimeout(connectionTimeouts.getHandshakeTimeoutMs())
         .setUserAgent(ConnectionUtils.getUserAgentVersionFromClassPath("ua", appId))
@@ -122,7 +125,7 @@ public BrokerResponse executeQuery(String brokerAddress, String query)
   }
 
   @Override
-  public Future<BrokerResponse> executeQueryAsync(String brokerAddress, String query) {
+  public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, String query) {
     try {
       ObjectNode json = JsonNodeFactory.instance.objectNode();
       json.put("sql", query);
@@ -134,11 +137,23 @@ public Future<BrokerResponse> executeQueryAsync(String brokerAddress, String que
       if (_headers != null) {
         _headers.forEach((k, v) -> requestBuilder.addHeader(k, v));
       }
+      LOGGER.debug("Sending query {} to {}", query, url);
+      return requestBuilder.addHeader("Content-Type", "application/json; charset=utf-8").setBody(json.toString())
+              .execute().toCompletableFuture().thenApply(httpResponse -> {
+        LOGGER.debug("Completed query, HTTP status is {}", httpResponse.getStatusCode());
+
+        if (httpResponse.getStatusCode() != 200) {
+          throw new PinotClientException(
+                  "Pinot returned HTTP status " + httpResponse.getStatusCode() + ", expected 200");
+        }
 
-      Future<Response> response =
-          requestBuilder.addHeader("Content-Type", "application/json; charset=utf-8").setBody(json.toString())
-              .execute();
-      return new BrokerResponseFuture(response, query, url, _brokerReadTimeout);
+        String responseBody = httpResponse.getResponseBody(StandardCharsets.UTF_8);
+        try {
+          return BrokerResponse.fromJson(OBJECT_READER.readTree(responseBody));
+        } catch (JsonProcessingException e) {
+          throw new CompletionException(e);
+        }
+      });
     } catch (Exception e) {
       throw new PinotClientException(e);
     }
@@ -155,7 +170,7 @@ public BrokerResponse executeQuery(String brokerAddress, Request request)
   }
 
   @Override
-  public Future<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
+  public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
       throws PinotClientException {
     return executeQueryAsync(brokerAddress, request.getQuery());
   }
@@ -173,60 +188,8 @@ public void close()
     }
   }
 
-  private static class BrokerResponseFuture implements Future<BrokerResponse> {
-    private final Future<Response> _response;
-    private final String _query;
-    private final String _url;
-    private final long _brokerReadTimeout;
-
-    public BrokerResponseFuture(Future<Response> response, String query, String url, long brokerReadTimeout) {
-      _response = response;
-      _query = query;
-      _url = url;
-      _brokerReadTimeout = brokerReadTimeout;
-    }
-
-    @Override
-    public boolean cancel(boolean mayInterruptIfRunning) {
-      return _response.cancel(mayInterruptIfRunning);
-    }
-
-    @Override
-    public boolean isCancelled() {
-      return _response.isCancelled();
-    }
-
-    @Override
-    public boolean isDone() {
-      return _response.isDone();
-    }
-
-    @Override
-    public BrokerResponse get()
-        throws ExecutionException {
-      return get(_brokerReadTimeout, TimeUnit.MILLISECONDS);
-    }
-
-    @Override
-    public BrokerResponse get(long timeout, TimeUnit unit)
-        throws ExecutionException {
-      try {
-        LOGGER.debug("Sending query {} to {}", _query, _url);
-
-        Response httpResponse = _response.get(timeout, unit);
-
-        LOGGER.debug("Completed query, HTTP status is {}", httpResponse.getStatusCode());
-
-        if (httpResponse.getStatusCode() != 200) {
-          throw new PinotClientException(
-              "Pinot returned HTTP status " + httpResponse.getStatusCode() + ", expected 200");
-        }
-
-        String responseBody = httpResponse.getResponseBody(StandardCharsets.UTF_8);
-        return BrokerResponse.fromJson(OBJECT_READER.readTree(responseBody));
-      } catch (Exception e) {
-        throw new ExecutionException(e);
-      }
-    }
+  @Override
+  public ClientStats getClientMetrics() {
+    return _httpClient.getClientStats();
   }
 }
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransport.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransport.java
index fbd398906ad..9e4d2a6656c 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransport.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransport.java
@@ -18,18 +18,18 @@
  */
 package org.apache.pinot.client;
 
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 
 
 /**
  * Interface for plugging different client transports.
  */
-public interface PinotClientTransport {
+public interface PinotClientTransport<METRICS> {
 
   BrokerResponse executeQuery(String brokerAddress, String query)
       throws PinotClientException;
 
-  Future<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
+  CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
       throws PinotClientException;
 
   @Deprecated
@@ -37,9 +37,19 @@ BrokerResponse executeQuery(String brokerAddress, Request request)
       throws PinotClientException;
 
   @Deprecated
-  Future<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
+  CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
       throws PinotClientException;
 
   void close()
       throws PinotClientException;
+
+  /**
+   * Access to the client metrics implementation if any.
+   * This may be useful for observability into the client implementation.
+   *
+   * @return underlying client metrics if any
+   */
+  default METRICS getClientMetrics() {
+    throw new UnsupportedOperationException("No useful client metrics available");
+  }
 }
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PreparedStatement.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PreparedStatement.java
index 314c94989ba..600627f5fc4 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PreparedStatement.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PreparedStatement.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.client;
 
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 
 
 /**
@@ -72,7 +72,7 @@ public ResultSetGroup execute() {
    *
    * @return The query results
    */
-  public Future<ResultSetGroup> executeAsync() {
+  public CompletableFuture<ResultSetGroup> executeAsync() {
     return _connection.executeAsync(fillStatementWithParameters());
   }
 
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
index 51f55cfd1fe..547ba94ed31 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
@@ -37,7 +37,7 @@ public SimpleBrokerSelector(List<String> brokerList) {
   }
 
   @Override
-  public String selectBroker(String table) {
+  public String selectBroker(String... tableNames) {
     return _brokerList.get(_random.nextInt(_brokerList.size()));
   }
 
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/UpdatableBrokerCache.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/UpdatableBrokerCache.java
index 1e19dff7891..b3db7fff4d6 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/UpdatableBrokerCache.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/UpdatableBrokerCache.java
@@ -38,7 +38,7 @@ void init()
    * @param tableName
    * @return Broker address corresponding to the table
    */
-  String getBroker(String tableName);
+  String getBroker(String... tableName);
 
   /**
    * Returns all the brokers currently in the cache
diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java
new file mode 100644
index 00000000000..1ca15255cdc
--- /dev/null
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java
@@ -0,0 +1,72 @@
+/**
+ * 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.pinot.client.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.pinot.client.ExternalViewReader;
+
+
+public class BrokerSelectorUtils {
+
+  private BrokerSelectorUtils() {
+  }
+
+  /**
+   *
+   * @param tableNames: List of table names.
+   * @param brokerData: map holding data for table hosting on brokers.
+   * @return list of common brokers hosting all the tables.
+   */
+  public static List<String> getTablesCommonBrokers(List<String> tableNames, Map<String, List<String>> brokerData) {
+    List<List<String>> tablesBrokersList = new ArrayList<>();
+    for (String name: tableNames) {
+      String tableName = getTableNameWithoutSuffix(name);
+      int idx = tableName.indexOf('.');
+
+      if (brokerData.containsKey(tableName)) {
+        tablesBrokersList.add(brokerData.get(tableName));
+      } else if (idx > 0) {
+        // In case tableName is formatted as <db>.<table>
+        tableName = tableName.substring(idx + 1);
+        tablesBrokersList.add(brokerData.get(tableName));
+      }
+    }
+
+    // return null if tablesBrokersList is empty or contains null
+    if (tablesBrokersList.isEmpty()
+        || tablesBrokersList.stream().anyMatch(Objects::isNull)) {
+      return null;
+    }
+
+    List<String> commonBrokers = tablesBrokersList.get(0);
+    for (int i = 1; i < tablesBrokersList.size(); i++) {
+      commonBrokers.retainAll(tablesBrokersList.get(i));
+    }
+    return commonBrokers;
+  }
+
+  private static String getTableNameWithoutSuffix(String tableName) {
+    return
+        tableName.replace(ExternalViewReader.OFFLINE_SUFFIX, "").
+            replace(ExternalViewReader.REALTIME_SUFFIX, "");
+  }
+}
diff --git a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/BrokerResponseTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/BrokerResponseTest.java
new file mode 100644
index 00000000000..219c7a09480
--- /dev/null
+++ b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/BrokerResponseTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.pinot.client;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectReader;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class BrokerResponseTest {
+  private static final ObjectReader OBJECT_READER = JsonUtils.DEFAULT_READER;
+
+  @Test
+  public void parseResultWithRequestId()
+      throws JsonProcessingException {
+    String responseJson = "{\"requestId\":\"1\",\"traceInfo\":{},\"numDocsScanned\":36542,"
+        + "\"aggregationResults\":[{\"function\":\"count_star\",\"value\":\"36542\"}],\"timeUsedMs\":30,"
+        + "\"segmentStatistics\":[],\"exceptions\":[],\"totalDocs\":115545}";
+    BrokerResponse brokerResponse = BrokerResponse.fromJson(OBJECT_READER.readTree(responseJson));
+    Assert.assertEquals("1", brokerResponse.getRequestId());
+    Assert.assertTrue(!brokerResponse.hasExceptions());
+  }
+
+  @Test
+  public void parseResultWithoutRequestId()
+      throws JsonProcessingException {
+    String responseJson = "{\"traceInfo\":{},\"numDocsScanned\":36542,"
+        + "\"aggregationResults\":[{\"function\":\"count_star\",\"value\":\"36542\"}],\"timeUsedMs\":30,"
+        + "\"segmentStatistics\":[],\"exceptions\":[],\"totalDocs\":115545}";
+    BrokerResponse brokerResponse = BrokerResponse.fromJson(OBJECT_READER.readTree(responseJson));
+    Assert.assertEquals("unknown", brokerResponse.getRequestId());
+    Assert.assertTrue(!brokerResponse.hasExceptions());
+  }
+}
diff --git a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
index 037e8bc9af1..5a755afc558 100644
--- a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
+++ b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
@@ -101,6 +101,19 @@ public void testBrokerListWithHeaders() {
     Assert.assertEquals(connection.getBrokerList(), brokers);
   }
 
+  @Test
+  public void testConnectionTransport() {
+    // Create properties
+    Properties properties = new Properties();
+    properties.setProperty("brokerList", "127.0.0.1:1234,localhost:2345");
+
+    // Create the connection
+    Connection connection = ConnectionFactory.fromProperties(properties);
+
+    Assert.assertNotNull(connection.getTransport());
+    Assert.assertNotNull(connection.getTransport().getClientMetrics());
+  }
+
   // For testing DynamicBrokerSelector
 
   /**
diff --git a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/PreparedStatementTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
index 404b1b279ab..0da2a2f2605 100644
--- a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
+++ b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
@@ -19,7 +19,7 @@
 package org.apache.pinot.client;
 
 import java.util.Collections;
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -36,7 +36,8 @@ public class PreparedStatementTest {
   public void testPreparedStatementWithDynamicBroker() {
     // Create a connection with dynamic broker selector.
     BrokerSelector mockBrokerSelector = Mockito.mock(BrokerSelector.class);
-    Mockito.when(mockBrokerSelector.selectBroker(Mockito.anyString())).thenAnswer(i -> i.getArgument(0));
+    Mockito.when(mockBrokerSelector.selectBroker(Mockito.anyString()))
+        .thenAnswer(i -> i.getArgument(0));
     Connection connection = new Connection(mockBrokerSelector, _dummyPinotClientTransport);
 
     PreparedStatement preparedStatement = connection.prepareStatement("SELECT foo FROM bar WHERE baz = ?");
@@ -78,27 +79,21 @@ public BrokerResponse executeQuery(String brokerAddress, String query)
     }
 
     @Override
-    public Future<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
+    public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
         throws PinotClientException {
-      _lastBrokerAddress = brokerAddress;
-      _lastQuery = query;
-      return null;
+      return CompletableFuture.completedFuture(executeQuery(brokerAddress, query));
     }
 
     @Override
     public BrokerResponse executeQuery(String brokerAddress, Request request)
         throws PinotClientException {
-      _lastBrokerAddress = brokerAddress;
-      _lastQuery = request.getQuery();
-      return BrokerResponse.empty();
+      return executeQuery(brokerAddress, request.getQuery());
     }
 
     @Override
-    public Future<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
+    public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
         throws PinotClientException {
-      _lastBrokerAddress = brokerAddress;
-      _lastQuery = request.getQuery();
-      return null;
+      return executeQueryAsync(brokerAddress, request.getQuery());
     }
 
     public String getLastQuery() {
diff --git a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
index c5135876962..91590a413ca 100644
--- a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
+++ b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
@@ -21,7 +21,7 @@
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.Properties;
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -165,7 +165,7 @@ public BrokerResponse executeQuery(String brokerAddress, String query)
     }
 
     @Override
-    public Future<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
+    public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
         throws PinotClientException {
       return null;
     }
@@ -177,7 +177,7 @@ public BrokerResponse executeQuery(String brokerAddress, Request request)
     }
 
     @Override
-    public Future<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
+    public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
         throws PinotClientException {
       return null;
     }
diff --git a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregation.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregation.json
index ff9a775e749..511b7040497 100644
--- a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregation.json
+++ b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregation.json
@@ -1,4 +1,5 @@
 {
+  "requestId": "1",
   "traceInfo": {},
   "numDocsScanned": 36542,
   "aggregationResults": [
diff --git a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
index bfe0b26c259..b589cef4c01 100644
--- a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
+++ b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
@@ -1,4 +1,5 @@
 {
+  "requestId": "1",
   "traceInfo": {},
   "numDocsScanned": 22598,
   "aggregationResults": [
diff --git a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/exception.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/exception.json
index bc7c99ccb53..7a4e7e4fd5a 100644
--- a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/exception.json
+++ b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/exception.json
@@ -1,4 +1,5 @@
 {
+  "requestId": "1",
   "traceInfo": {},
   "numDocsScanned": 0,
   "aggregationResults": [],
diff --git a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/selection.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/selection.json
index e3068dc263c..7825e876209 100644
--- a/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/selection.json
+++ b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/selection.json
@@ -1,4 +1,5 @@
 {
+  "requestId": "1",
   "selectionResults": {
     "columns": [
       "ActualElapsedTime",
diff --git a/pinot-clients/pinot-jdbc-client/pom.xml b/pinot-clients/pinot-jdbc-client/pom.xml
index d4b2dd34d2b..e0c5e94be39 100644
--- a/pinot-clients/pinot-jdbc-client/pom.xml
+++ b/pinot-clients/pinot-jdbc-client/pom.xml
@@ -86,26 +86,10 @@
     <dependency>
       <groupId>org.asynchttpclient</groupId>
       <artifactId>async-http-client</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-unix-common</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.101tec</groupId>
       <artifactId>zkclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
index 68471226054..9e703b5f3e9 100644
--- a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
+++ b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
@@ -24,12 +24,15 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import org.apache.pinot.client.base.AbstractBaseConnection;
 import org.apache.pinot.client.controller.PinotControllerTransport;
 import org.apache.pinot.client.controller.PinotControllerTransportFactory;
 import org.apache.pinot.client.controller.response.ControllerTenantBrokerResponse;
+import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,10 +40,16 @@
 public class PinotConnection extends AbstractBaseConnection {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(Connection.class);
+  protected static final String[] POSSIBLE_QUERY_OPTIONS = {
+    QueryOptionKey.ENABLE_NULL_HANDLING,
+    QueryOptionKey.USE_MULTISTAGE_ENGINE
+  };
   private org.apache.pinot.client.Connection _session;
   private boolean _closed;
   private String _controllerURL;
   private PinotControllerTransport _controllerTransport;
+  private final Map<String, Object> _queryOptions = new HashMap<String, Object>();
+
   public static final String BROKER_LIST = "brokers";
 
   PinotConnection(String controllerURL, PinotClientTransport transport, String tenant,
@@ -64,12 +73,52 @@ public class PinotConnection extends AbstractBaseConnection {
       brokers = getBrokerList(controllerURL, tenant);
     }
     _session = new org.apache.pinot.client.Connection(properties, brokers, transport);
+
+    for (String possibleQueryOption: POSSIBLE_QUERY_OPTIONS) {
+      Object property = properties.getProperty(possibleQueryOption);
+      if (property != null) {
+        _queryOptions.put(possibleQueryOption, parseOptionValue(property));
+      }
+    }
+  }
+
+  private Object parseOptionValue(Object value) {
+    if (value instanceof String) {
+      String str = (String) value;
+
+      try {
+        Long numVal = Long.valueOf(str);
+        if (numVal != null) {
+            return numVal;
+        }
+      } catch (NumberFormatException e) {
+      }
+
+      try {
+          Double numVal = Double.valueOf(str);
+          if (numVal != null) {
+              return numVal;
+          }
+      } catch (NumberFormatException e) {
+      }
+
+      Boolean boolVal = Boolean.valueOf(str.toLowerCase());
+      if (boolVal != null) {
+          return boolVal;
+      }
+    }
+
+    return value;
   }
 
   public org.apache.pinot.client.Connection getSession() {
     return _session;
   }
 
+  public Map<String, Object> getQueryOptions() {
+    return _queryOptions;
+  }
+
   private List<String> getBrokerList(String controllerURL, String tenant) {
     ControllerTenantBrokerResponse controllerTenantBrokerResponse =
         _controllerTransport.getBrokersFromController(controllerURL, tenant);
diff --git a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotPreparedStatement.java b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotPreparedStatement.java
index e3b601859f5..8edac605d80 100644
--- a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotPreparedStatement.java
+++ b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotPreparedStatement.java
@@ -34,7 +34,7 @@
 public class PinotPreparedStatement extends AbstractBasePreparedStatement {
   private static final String LIMIT_STATEMENT = "LIMIT";
 
-  private Connection _connection;
+  private PinotConnection _connection;
   private org.apache.pinot.client.Connection _session;
   private ResultSetGroup _resultSetGroup;
   private PreparedStatement _preparedStatement;
@@ -51,6 +51,7 @@ public PinotPreparedStatement(PinotConnection connection, String query) {
     if (!DriverUtils.queryContainsLimitStatement(_query)) {
       _query += " " + LIMIT_STATEMENT + " " + _maxRows;
     }
+    _query = DriverUtils.enableQueryOptions(_query, _connection.getQueryOptions());
     _preparedStatement = new PreparedStatement(_session, _query);
   }
 
@@ -167,7 +168,6 @@ public boolean execute()
       _resultSet.beforeFirst();
       return true;
     } else {
-      _resultSet = null;
       return false;
     }
   }
@@ -177,7 +177,7 @@ public ResultSet executeQuery(String sql)
       throws SQLException {
     validateState();
     try {
-      _resultSetGroup = _session.execute(sql);
+      _resultSetGroup = _session.execute(DriverUtils.enableQueryOptions(sql, _connection.getQueryOptions()));
       if (_resultSetGroup.getResultSetCount() == 0) {
         _resultSet = PinotResultSet.empty();
         return _resultSet;
@@ -211,13 +211,7 @@ public ResultSet executeQuery()
   public boolean execute(String sql)
       throws SQLException {
     _resultSet = executeQuery(sql);
-    if (_resultSet.next()) {
-      _resultSet.beforeFirst();
-      return true;
-    } else {
-      _resultSet = null;
-      return false;
-    }
+    return _resultSet != null;
   }
 
   @Override
diff --git a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotResultSet.java b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotResultSet.java
index 3e900c64eab..4ceaa76094a 100644
--- a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotResultSet.java
+++ b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotResultSet.java
@@ -194,8 +194,7 @@ public BigDecimal getBigDecimal(int columnIndex, int scale)
       throws SQLException {
     try {
       String value = getString(columnIndex);
-      BigDecimal bigDecimal = new BigDecimal(value).setScale(scale);
-      return bigDecimal;
+      return value == null ? null : new BigDecimal(value).setScale(scale);
     } catch (Exception e) {
       throw new SQLException("Unable to fetch BigDecimal value", e);
     }
@@ -205,7 +204,8 @@ public BigDecimal getBigDecimal(int columnIndex, int scale)
   public boolean getBoolean(int columnIndex)
       throws SQLException {
     validateColumn(columnIndex);
-    return Boolean.parseBoolean(_resultSet.getString(_currentRow, columnIndex - 1));
+    String value = getString(columnIndex);
+    return value == null ? false : Boolean.parseBoolean(value);
   }
 
   @Override
@@ -213,7 +213,7 @@ public byte[] getBytes(int columnIndex)
       throws SQLException {
     try {
       String value = getString(columnIndex);
-      return Hex.decodeHex(value.toCharArray());
+      return value == null ? null : Hex.decodeHex(value.toCharArray());
     } catch (Exception e) {
       throw new SQLException(String.format("Unable to fetch value for column %d", columnIndex), e);
     }
@@ -232,7 +232,7 @@ public Date getDate(int columnIndex, Calendar cal)
       throws SQLException {
     try {
       String value = getString(columnIndex);
-      return DateTimeUtils.getDateFromString(value, cal);
+      return value == null ? null : DateTimeUtils.getDateFromString(value, cal);
     } catch (Exception e) {
       throw new SQLException("Unable to fetch date", e);
     }
@@ -242,32 +242,32 @@ public Date getDate(int columnIndex, Calendar cal)
   public double getDouble(int columnIndex)
       throws SQLException {
     validateColumn(columnIndex);
-
-    return _resultSet.getDouble(_currentRow, columnIndex - 1);
+    String value = getString(columnIndex);
+    return value == null ? 0.0 : Double.parseDouble(value);
   }
 
   @Override
   public float getFloat(int columnIndex)
       throws SQLException {
     validateColumn(columnIndex);
-
-    return _resultSet.getFloat(_currentRow, columnIndex - 1);
+    String value = getString(columnIndex);
+    return value == null ? 0.0f : Float.parseFloat(value);
   }
 
   @Override
   public int getInt(int columnIndex)
       throws SQLException {
     validateColumn(columnIndex);
-
-    return _resultSet.getInt(_currentRow, columnIndex - 1);
+    String value = getString(columnIndex);
+    return value == null ? 0 : Integer.parseInt(value);
   }
 
   @Override
   public long getLong(int columnIndex)
       throws SQLException {
     validateColumn(columnIndex);
-
-    return _resultSet.getLong(_currentRow, columnIndex - 1);
+    String value = getString(columnIndex);
+    return value == null ? 0 : Long.parseLong(value);
   }
 
   @Override
@@ -282,7 +282,7 @@ public int getRow()
   public short getShort(int columnIndex)
       throws SQLException {
     Integer value = getInt(columnIndex);
-    return value.shortValue();
+    return value == null ? null : value.shortValue();
   }
 
   @Override
@@ -359,7 +359,7 @@ public Time getTime(int columnIndex, Calendar cal)
       throws SQLException {
     try {
       String value = getString(columnIndex);
-      return DateTimeUtils.getTimeFromString(value, cal);
+      return value == null ? null : DateTimeUtils.getTimeFromString(value, cal);
     } catch (Exception e) {
       throw new SQLException("Unable to fetch date", e);
     }
@@ -370,7 +370,7 @@ public Timestamp getTimestamp(int columnIndex, Calendar cal)
       throws SQLException {
     try {
       String value = getString(columnIndex);
-      return DateTimeUtils.getTimestampFromString(value, cal);
+      return value == null ? null : DateTimeUtils.getTimestampFromString(value, cal);
     } catch (Exception e) {
       throw new SQLException("Unable to fetch date", e);
     }
diff --git a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotStatement.java b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotStatement.java
index dcedad18a93..cdfd155d047 100644
--- a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotStatement.java
+++ b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotStatement.java
@@ -28,7 +28,7 @@
 public class PinotStatement extends AbstractBaseStatement {
   private static final String LIMIT_STATEMENT = "LIMIT";
 
-  private final Connection _connection;
+  private final PinotConnection _connection;
   private final org.apache.pinot.client.Connection _session;
   private boolean _closed;
   private ResultSet _resultSet;
@@ -63,7 +63,8 @@ public ResultSet executeQuery(String sql)
       if (!DriverUtils.queryContainsLimitStatement(sql)) {
         sql += " " + LIMIT_STATEMENT + " " + _maxRows;
       }
-      ResultSetGroup resultSetGroup = _session.execute(sql);
+      String enabledSql = DriverUtils.enableQueryOptions(sql, _connection.getQueryOptions());
+      ResultSetGroup resultSetGroup = _session.execute(enabledSql);
       if (resultSetGroup.getResultSetCount() == 0) {
         _resultSet = PinotResultSet.empty();
         return _resultSet;
@@ -79,13 +80,7 @@ public ResultSet executeQuery(String sql)
   public boolean execute(String sql)
       throws SQLException {
     _resultSet = executeQuery(sql);
-    if (_resultSet.next()) {
-      _resultSet.beforeFirst();
-      return true;
-    } else {
-      _resultSet = null;
-      return false;
-    }
+    return _resultSet != null;
   }
 
   @Override
diff --git a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/utils/DriverUtils.java b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/utils/DriverUtils.java
index d995342be62..75bd6acc289 100644
--- a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/utils/DriverUtils.java
+++ b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/utils/DriverUtils.java
@@ -71,7 +71,7 @@ public static SSLContext getSSLContextFromJDBCProps(Properties properties) {
   public static void handleAuth(Properties info, Map<String, String> headers)
       throws SQLException {
 
-    if (info.contains(USER_PROPERTY) && !headers.containsKey(AUTH_HEADER)) {
+    if (info.containsKey(USER_PROPERTY) && !headers.containsKey(AUTH_HEADER)) {
       String username = info.getProperty(USER_PROPERTY);
       String password = info.getProperty(PASSWORD_PROPERTY, "");
       if (StringUtils.isAnyEmpty(username, password)) {
@@ -217,4 +217,38 @@ public static boolean queryContainsLimitStatement(String query) {
     Matcher matcher = pattern.matcher(query);
     return matcher.find();
   }
+
+  public static String enableQueryOptions(String sql, Map<String, Object> options) {
+    StringBuilder optionsBuilder = new StringBuilder();
+    for (Map.Entry<String, Object> optionEntry: options.entrySet()) {
+      if (!sql.contains(optionEntry.getKey())) {
+        optionsBuilder.append(DriverUtils.createSetQueryOptionString(optionEntry.getKey(), optionEntry.getValue()));
+      }
+    }
+    optionsBuilder.append(sql);
+    return optionsBuilder.toString();
+  }
+
+  public static String createSetQueryOptionString(String optionKey, Object optionValue) {
+    StringBuilder optionBuilder = new StringBuilder();
+    optionBuilder.append("SET ").append(optionKey);
+
+    if (optionValue != null) {
+      optionBuilder.append('=');
+
+      if (optionValue instanceof Boolean) {
+        optionBuilder.append(((Boolean) optionValue).booleanValue());
+      } else if (optionValue instanceof Integer || optionValue instanceof Long) {
+        optionBuilder.append(((Number) optionValue).longValue());
+      } else if (optionValue instanceof Float || optionValue instanceof Double) {
+        optionBuilder.append(((Number) optionValue).doubleValue());
+      } else {
+        throw new IllegalArgumentException(
+          "Option Type " + optionValue.getClass().getSimpleName() + " is not supported.");
+      }
+    }
+
+    optionBuilder.append(";\n");
+    return optionBuilder.toString();
+  }
 }
diff --git a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/DummyPinotClientTransport.java b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/DummyPinotClientTransport.java
index 86ad814ffab..40a0dbd768f 100644
--- a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/DummyPinotClientTransport.java
+++ b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/DummyPinotClientTransport.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.client;
 
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 
 
 public class DummyPinotClientTransport implements PinotClientTransport {
@@ -32,7 +32,7 @@ public BrokerResponse executeQuery(String brokerAddress, String query)
   }
 
   @Override
-  public Future<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
+  public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
       throws PinotClientException {
     _lastQuery = query;
     return null;
@@ -46,7 +46,7 @@ public BrokerResponse executeQuery(String brokerAddress, Request request)
   }
 
   @Override
-  public Future<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
+  public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
       throws PinotClientException {
     _lastQuery = request.getQuery();
     return null;
diff --git a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotPreparedStatementTest.java b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotPreparedStatementTest.java
index 0cc203a9943..2b77206c550 100644
--- a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotPreparedStatementTest.java
+++ b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotPreparedStatementTest.java
@@ -26,6 +26,8 @@
 import java.util.Properties;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.pinot.client.utils.DateTimeUtils;
+import org.apache.pinot.client.utils.DriverUtils;
+import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -35,6 +37,7 @@ public class PinotPreparedStatementTest {
       "SELECT * FROM dummy WHERE name = ? and age = ? and score = ? and ts = ? and eligible = ? and sub_score = ?";
   public static final String DATE_QUERY = "SELECT * FROM dummy WHERE date = ? and updated_at = ? and created_at = ?";
   public static final String SINGLE_STRING_QUERY = "SELECT * FROM dummy WHERE value = ?";
+  private static final String BASIC_TEST_QUERY = "SELECT * FROM dummy";
   private DummyPinotClientTransport _dummyPinotClientTransport = new DummyPinotClientTransport();
   private DummyPinotControllerTransport _dummyPinotControllerTransport = DummyPinotControllerTransport.create();
 
@@ -120,4 +123,32 @@ public void testSetAdditionalDataTypes()
     Assert.assertEquals(lastExecutedQuery.substring(0, lastExecutedQuery.indexOf("LIMIT")).trim(),
         String.format("SELECT * FROM dummy WHERE value = '%s'", Hex.encodeHexString(value.getBytes())));
   }
+
+  @Test
+  public void testSetEnableNullHandling()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.ENABLE_NULL_HANDLING, "true");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    PreparedStatement preparedStatement = pinotConnection.prepareStatement(BASIC_TEST_QUERY);
+    preparedStatement.executeQuery();
+    String expectedSql =
+        DriverUtils.createSetQueryOptionString(QueryOptionKey.ENABLE_NULL_HANDLING, true) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
+
+  @Test
+  public void testSetEnableNullHandling2()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.ENABLE_NULL_HANDLING, "true");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    PreparedStatement preparedStatement = pinotConnection.prepareStatement("");
+    preparedStatement.executeQuery(BASIC_TEST_QUERY);
+    String expectedSql =
+        DriverUtils.createSetQueryOptionString(QueryOptionKey.ENABLE_NULL_HANDLING, true) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
 }
diff --git a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotResultSetTest.java b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotResultSetTest.java
index 7e92cc10400..abcddfbe9e5 100644
--- a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotResultSetTest.java
+++ b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotResultSetTest.java
@@ -23,7 +23,7 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 import org.apache.commons.io.IOUtils;
 import org.apache.pinot.client.utils.DateTimeUtils;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -189,7 +189,7 @@ public BrokerResponse executeQuery(String brokerAddress, String query)
     }
 
     @Override
-    public Future<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
+    public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, String query)
         throws PinotClientException {
       return null;
     }
@@ -201,7 +201,7 @@ public BrokerResponse executeQuery(String brokerAddress, Request request)
     }
 
     @Override
-    public Future<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
+    public CompletableFuture<BrokerResponse> executeQueryAsync(String brokerAddress, Request request)
         throws PinotClientException {
       return null;
     }
diff --git a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotStatementTest.java b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotStatementTest.java
index db4e1dfbb0d..fd47c6db900 100644
--- a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotStatementTest.java
+++ b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotStatementTest.java
@@ -20,11 +20,15 @@
 
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Properties;
+import org.apache.pinot.client.utils.DriverUtils;
+import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 
 public class PinotStatementTest {
+  private static final String BASIC_TEST_QUERY = "SELECT * FROM dummy";
   private DummyPinotClientTransport _dummyPinotClientTransport = new DummyPinotClientTransport();
   private DummyPinotControllerTransport _dummyPinotControllerTransport = DummyPinotControllerTransport.create();
 
@@ -34,8 +38,116 @@ public void testExecuteQuery()
     PinotConnection connection =
         new PinotConnection("dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
     Statement statement = new PinotStatement(connection);
-    ResultSet resultSet = statement.executeQuery("select * from dummy");
+    ResultSet resultSet = statement.executeQuery(BASIC_TEST_QUERY);
     Assert.assertNotNull(resultSet);
     Assert.assertEquals(statement.getConnection(), connection);
   }
+
+  @Test
+  public void testSetEnableNullHandling()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.ENABLE_NULL_HANDLING, "true");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    statement.executeQuery(BASIC_TEST_QUERY);
+    String expectedSql =
+      DriverUtils.createSetQueryOptionString(QueryOptionKey.ENABLE_NULL_HANDLING, true) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
+
+  @Test
+  public void testSetDisableNullHandling()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.ENABLE_NULL_HANDLING, "false");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    statement.executeQuery(BASIC_TEST_QUERY);
+    String expectedSql =
+        DriverUtils.createSetQueryOptionString(QueryOptionKey.ENABLE_NULL_HANDLING, false) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
+
+  @Test
+  public void testPresetEnableNullHandling()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.ENABLE_NULL_HANDLING, "true");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    String presetSql =
+      DriverUtils.createSetQueryOptionString(QueryOptionKey.ENABLE_NULL_HANDLING, true) + BASIC_TEST_QUERY;
+    statement.executeQuery(presetSql);
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, presetSql.length()), presetSql);
+  }
+
+  @Test
+  public void testSetUseMultistageEngine()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.USE_MULTISTAGE_ENGINE, "true");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    statement.executeQuery(BASIC_TEST_QUERY);
+    String expectedSql =
+        DriverUtils.createSetQueryOptionString(QueryOptionKey.USE_MULTISTAGE_ENGINE, true) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
+
+  @Test
+  public void testSetMultipleQueryOptions()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.ENABLE_NULL_HANDLING, "true");
+    props.put(QueryOptionKey.USE_MULTISTAGE_ENGINE, "true");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    statement.executeQuery(BASIC_TEST_QUERY);
+    String resultingQuery = _dummyPinotClientTransport.getLastQuery();
+    Assert.assertTrue(
+      resultingQuery.contains(DriverUtils.createSetQueryOptionString(QueryOptionKey.ENABLE_NULL_HANDLING, true)));
+    Assert.assertTrue(
+      resultingQuery.contains(DriverUtils.createSetQueryOptionString(QueryOptionKey.USE_MULTISTAGE_ENGINE, true)));
+  }
+
+  @Test
+  public void testSetOptionAsInteger()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.USE_MULTISTAGE_ENGINE, "2");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    statement.executeQuery(BASIC_TEST_QUERY);
+    String expectedSql =
+        DriverUtils.createSetQueryOptionString(QueryOptionKey.USE_MULTISTAGE_ENGINE, 2) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
+
+  @Test
+  public void testSetOptionAsFloat()
+      throws Exception {
+    Properties props = new Properties();
+    props.put(QueryOptionKey.USE_MULTISTAGE_ENGINE, "2.5");
+    PinotConnection pinotConnection =
+        new PinotConnection(props, "dummy", _dummyPinotClientTransport, "dummy", _dummyPinotControllerTransport);
+    Statement statement = pinotConnection.createStatement();
+    Assert.assertNotNull(statement);
+    statement.executeQuery(BASIC_TEST_QUERY);
+    String expectedSql =
+        DriverUtils.createSetQueryOptionString(QueryOptionKey.USE_MULTISTAGE_ENGINE, 2.5) + BASIC_TEST_QUERY;
+    Assert.assertEquals(_dummyPinotClientTransport.getLastQuery().substring(0, expectedSql.length()), expectedSql);
+  }
 }
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 4315529ef98..6123b1a2eec 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -326,10 +326,6 @@
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
       <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>javax.xml.bind</groupId>
           <artifactId>jaxb-api</artifactId>
diff --git a/pinot-common/src/main/codegen/config.fmpp b/pinot-common/src/main/codegen/config.fmpp
index e6955766bc7..178029a3b8a 100644
--- a/pinot-common/src/main/codegen/config.fmpp
+++ b/pinot-common/src/main/codegen/config.fmpp
@@ -526,6 +526,7 @@ data: {
     # List of extended statement syntax to add
     statementParserMethods: [
       "SqlInsertFromFile()"
+      "SqlPhysicalExplain()"
     ]
 
     # List of custom function syntax to add
diff --git a/pinot-common/src/main/codegen/includes/parserImpls.ftl b/pinot-common/src/main/codegen/includes/parserImpls.ftl
index 449d8ab3b9a..79c1a30f44a 100644
--- a/pinot-common/src/main/codegen/includes/parserImpls.ftl
+++ b/pinot-common/src/main/codegen/includes/parserImpls.ftl
@@ -119,3 +119,34 @@ void SqlAtTimeZone(List<Object> list, ExprContext exprContext, Span s) :
         list.addAll(list2);
     }
 }
+
+SqlNode SqlPhysicalExplain() :
+{
+    SqlNode stmt;
+    SqlExplainLevel detailLevel = SqlExplainLevel.EXPPLAN_ATTRIBUTES;
+    SqlExplain.Depth depth = SqlExplain.Depth.PHYSICAL;
+    final SqlExplainFormat format;
+}
+{
+    <EXPLAIN> <IMPLEMENTATION> <PLAN>
+    [ detailLevel = ExplainDetailLevel() ]
+    (
+        LOOKAHEAD(2)
+        <AS> <XML> { format = SqlExplainFormat.XML; }
+    |
+        LOOKAHEAD(2)
+        <AS> <JSON> { format = SqlExplainFormat.JSON; }
+    |
+        <AS> <DOT_FORMAT> { format = SqlExplainFormat.DOT; }
+    |
+        { format = SqlExplainFormat.TEXT; }
+    )
+    <FOR> stmt = SqlQueryOrDml() {
+        return new SqlPhysicalExplain(getPos(),
+            stmt,
+            detailLevel.symbol(SqlParserPos.ZERO),
+            depth.symbol(SqlParserPos.ZERO),
+            format.symbol(SqlParserPos.ZERO),
+            nDynamicParams);
+    }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
index 6a0ae1188e3..b37429c527f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
@@ -44,11 +44,10 @@ private InstanceAssignmentConfigUtils() {
    * backward-compatibility) COMPLETED server tag is overridden to be different from the CONSUMING server tag.
    */
   public static boolean shouldRelocateCompletedSegments(TableConfig tableConfig) {
-    Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap =
-        tableConfig.getInstanceAssignmentConfigMap();
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
     return (instanceAssignmentConfigMap != null
-        && instanceAssignmentConfigMap.get(InstancePartitionsType.COMPLETED) != null) || TagNameUtils
-        .isRelocateCompletedSegments(tableConfig.getTenantConfig());
+        && instanceAssignmentConfigMap.get(InstancePartitionsType.COMPLETED.toString()) != null)
+        || TagNameUtils.isRelocateCompletedSegments(tableConfig.getTenantConfig());
   }
 
   /**
@@ -60,21 +59,20 @@ public static boolean allowInstanceAssignment(TableConfig tableConfig,
       return true;
     }
     TableType tableType = tableConfig.getTableType();
-    Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap =
-        tableConfig.getInstanceAssignmentConfigMap();
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
     switch (instancePartitionsType) {
       // Allow OFFLINE instance assignment if the offline table has it configured or (for backward-compatibility) is
       // using replica-group segment assignment
       case OFFLINE:
         return tableType == TableType.OFFLINE && ((instanceAssignmentConfigMap != null
-            && instanceAssignmentConfigMap.get(InstancePartitionsType.OFFLINE) != null)
+            && instanceAssignmentConfigMap.get(InstancePartitionsType.OFFLINE.toString()) != null)
             || AssignmentStrategy.REPLICA_GROUP_SEGMENT_ASSIGNMENT_STRATEGY
             .equalsIgnoreCase(tableConfig.getValidationConfig().getSegmentAssignmentStrategy()));
       // Allow CONSUMING/COMPLETED instance assignment if the real-time table has it configured
       case CONSUMING:
       case COMPLETED:
         return tableType == TableType.REALTIME && (instanceAssignmentConfigMap != null
-            && instanceAssignmentConfigMap.get(instancePartitionsType) != null);
+            && instanceAssignmentConfigMap.get(instancePartitionsType.toString()) != null);
       default:
         throw new IllegalStateException();
     }
@@ -89,10 +87,10 @@ public static InstanceAssignmentConfig getInstanceAssignmentConfig(TableConfig t
         "Instance assignment is not allowed for the given table config");
 
     // Use the instance assignment config from the table config if it exists
-    Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap =
-        tableConfig.getInstanceAssignmentConfigMap();
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
     if (instanceAssignmentConfigMap != null) {
-      InstanceAssignmentConfig instanceAssignmentConfig = instanceAssignmentConfigMap.get(instancePartitionsType);
+      InstanceAssignmentConfig instanceAssignmentConfig =
+          instanceAssignmentConfigMap.get(instancePartitionsType.toString());
       if (instanceAssignmentConfig != null) {
         return instanceAssignmentConfig;
       }
@@ -116,12 +114,12 @@ public static InstanceAssignmentConfig getInstanceAssignmentConfig(TableConfig t
       Preconditions.checkState(numPartitions > 0, "Number of partitions for column: %s is not properly configured",
           partitionColumn);
       replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, numPartitions,
-          replicaGroupStrategyConfig.getNumInstancesPerPartition(), minimizeDataMovement);
+          replicaGroupStrategyConfig.getNumInstancesPerPartition(), minimizeDataMovement, partitionColumn);
     } else {
       // If partition column is not configured, use replicaGroupStrategyConfig.getNumInstancesPerPartition() as
       // number of instances per replica-group for backward-compatibility
       replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups,
-          replicaGroupStrategyConfig.getNumInstancesPerPartition(), 0, 0, minimizeDataMovement);
+          replicaGroupStrategyConfig.getNumInstancesPerPartition(), 0, 0, minimizeDataMovement, null);
     }
 
     return new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig);
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java
index a296527e845..a67bb93ce08 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitions.java
@@ -25,6 +25,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -146,4 +147,22 @@ public String toJsonString() {
   public String toString() {
     return toJsonString();
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof InstancePartitions)) {
+      return false;
+    }
+    InstancePartitions other = (InstancePartitions) obj;
+    return Objects.equals(_instancePartitionsName, other._instancePartitionsName)
+            && Objects.equals(_partitionToInstancesMap, other._partitionToInstancesMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_instancePartitionsName, _partitionToInstancesMap);
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java
index a15554f3d3c..759d387af47 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstancePartitionsUtils.java
@@ -46,6 +46,7 @@ private InstancePartitionsUtils() {
   }
 
   public static final char TYPE_SUFFIX_SEPARATOR = '_';
+  public static final String TIER_SUFFIX = "__TIER__";
 
   /**
    * Returns the name of the instance partitions for the given table name (with or without type suffix) and instance
@@ -93,6 +94,11 @@ public static InstancePartitions fetchInstancePartitions(HelixPropertyStore<ZNRe
     return znRecord != null ? InstancePartitions.fromZNRecord(znRecord) : null;
   }
 
+  public static String getInstancePartitionsNameForTier(String tableName, String tierName) {
+    return TableNameBuilder.extractRawTableName(tableName) + TIER_SUFFIX + tierName;
+  }
+
+
   /**
    * Gets the instance partitions with the given name, and returns a re-named copy of the same.
    * This method is useful when we use a table with instancePartitionsMap since in that case
@@ -177,4 +183,14 @@ public static void removeInstancePartitions(HelixPropertyStore<ZNRecord> propert
       throw new ZkException("Failed to remove instance partitions: " + instancePartitionsName);
     }
   }
+
+  public static void removeTierInstancePartitions(HelixPropertyStore<ZNRecord> propertyStore,
+      String tableNameWithType) {
+    List<InstancePartitions> instancePartitions = ZKMetadataProvider.getAllInstancePartitions(propertyStore);
+    instancePartitions.stream().filter(instancePartition -> instancePartition.getInstancePartitionsName()
+            .startsWith(TableNameBuilder.extractRawTableName(tableNameWithType) + TIER_SUFFIX))
+        .forEach(instancePartition -> {
+          removeInstancePartitions(propertyStore, instancePartition.getInstancePartitionsName());
+        });
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/datablock/BaseDataBlock.java b/pinot-common/src/main/java/org/apache/pinot/common/datablock/BaseDataBlock.java
index 27f0b5f7320..f0492dbe80c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/datablock/BaseDataBlock.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/datablock/BaseDataBlock.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pinot.common.datablock;
 
-import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -27,6 +26,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
 import org.apache.pinot.common.CustomObject;
 import org.apache.pinot.common.datatable.DataTableImplV3;
 import org.apache.pinot.common.datatable.DataTableUtils;
@@ -186,15 +186,12 @@ public BaseDataBlock(ByteBuffer byteBuffer)
     }
 
     // Read variable size data.
+    _variableSizeDataBytes = new byte[variableSizeDataLength];
     if (variableSizeDataLength != 0) {
-      _variableSizeDataBytes = new byte[variableSizeDataLength];
       byteBuffer.position(variableSizeDataStart);
       byteBuffer.get(_variableSizeDataBytes);
-      _variableSizeData = ByteBuffer.wrap(_variableSizeDataBytes);
-    } else {
-      _variableSizeDataBytes = null;
-      _variableSizeData = null;
     }
+    _variableSizeData = ByteBuffer.wrap(_variableSizeDataBytes);
 
     // Read metadata.
     int metadataLength = byteBuffer.getInt();
@@ -390,7 +387,10 @@ public RoaringBitmap getNullRowIds(int colId) {
    */
   protected byte[] serializeStringDictionary()
       throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    if (_stringDictionary.length == 0) {
+      return new byte[4];
+    }
+    UnsynchronizedByteArrayOutputStream byteArrayOutputStream = new UnsynchronizedByteArrayOutputStream(1024);
     DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
 
     dataOutputStream.writeInt(_stringDictionary.length);
@@ -436,7 +436,7 @@ public byte[] toBytes()
       throws IOException {
     ThreadResourceUsageProvider threadResourceUsageProvider = new ThreadResourceUsageProvider();
 
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    UnsynchronizedByteArrayOutputStream byteArrayOutputStream = new UnsynchronizedByteArrayOutputStream(8192);
     DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
     writeLeadingSections(dataOutputStream);
 
@@ -536,7 +536,10 @@ private Map<String, String> deserializeMetadata(ByteBuffer buffer)
 
   private byte[] serializeExceptions()
       throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    if (_errCodeToExceptionMap.isEmpty()) {
+      return new byte[4];
+    }
+    UnsynchronizedByteArrayOutputStream byteArrayOutputStream = new UnsynchronizedByteArrayOutputStream(1024);
     DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
 
     dataOutputStream.writeInt(_errCodeToExceptionMap.size());
@@ -569,41 +572,13 @@ private Map<Integer, String> deserializeExceptions(ByteBuffer buffer)
   public String toString() {
     if (_dataSchema == null) {
       return _metadata.toString();
+    } else {
+      StringBuilder stringBuilder = new StringBuilder();
+      stringBuilder.append("resultSchema:").append('\n');
+      stringBuilder.append(_dataSchema).append('\n');
+      stringBuilder.append("numRows: ").append(_numRows).append('\n');
+      stringBuilder.append("metadata: ").append(_metadata.toString()).append('\n');
+      return stringBuilder.toString();
     }
-
-    StringBuilder stringBuilder = new StringBuilder();
-    stringBuilder.append(_dataSchema).append('\n');
-    stringBuilder.append("numRows: ").append(_numRows).append('\n');
-
-    DataSchema.ColumnDataType[] storedColumnDataTypes = _dataSchema.getStoredColumnDataTypes();
-    _fixedSizeData.position(0);
-    for (int rowId = 0; rowId < _numRows; rowId++) {
-      for (int colId = 0; colId < _numColumns; colId++) {
-        switch (storedColumnDataTypes[colId]) {
-          case INT:
-            stringBuilder.append(_fixedSizeData.getInt());
-            break;
-          case LONG:
-            stringBuilder.append(_fixedSizeData.getLong());
-            break;
-          case FLOAT:
-            stringBuilder.append(_fixedSizeData.getFloat());
-            break;
-          case DOUBLE:
-            stringBuilder.append(_fixedSizeData.getDouble());
-            break;
-          case STRING:
-            stringBuilder.append(_fixedSizeData.getInt());
-            break;
-          // Object and array.
-          default:
-            stringBuilder.append(String.format("(%s:%s)", _fixedSizeData.getInt(), _fixedSizeData.getInt()));
-            break;
-        }
-        stringBuilder.append("\t");
-      }
-      stringBuilder.append("\n");
-    }
-    return stringBuilder.toString();
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/datablock/DataBlockUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/datablock/DataBlockUtils.java
index cd9a729c8b5..99c3e4df46a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/datablock/DataBlockUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/datablock/DataBlockUtils.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.common.datablock;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -49,7 +50,7 @@ public static MetadataBlock getErrorDataBlock(Exception e) {
   }
 
   private static String extractErrorMsg(Throwable t) {
-    while (t.getMessage() == null) {
+    while (t.getCause() != null && t.getMessage() == null) {
       t = t.getCause();
     }
     return t.getMessage() + "\n" + QueryException.getTruncatedStackTrace(t);
@@ -68,6 +69,11 @@ public static MetadataBlock getEndOfStreamDataBlock() {
     return new MetadataBlock(MetadataBlock.MetadataBlockType.EOS);
   }
 
+  public static MetadataBlock getEndOfStreamDataBlock(Map<String, String> stats) {
+    // TODO: add query statistics metadata for the block.
+    return new MetadataBlock(MetadataBlock.MetadataBlockType.EOS, stats);
+  }
+
   public static MetadataBlock getNoOpBlock() {
     return new MetadataBlock(MetadataBlock.MetadataBlockType.NOOP);
   }
@@ -263,4 +269,295 @@ private static Object[] extractRowFromDataBlock(DataBlock dataBlock, int rowId,
     }
     return row;
   }
+
+  /**
+   * Given a datablock and the column index, extracts the integer values for the column. Prefer using this function over
+   * extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to the
+   * desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return int array of values in the column
+   */
+  public static int[] extractIntValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    int[] rows = new int[numRows];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+
+      switch (columnDataTypes[columnIndex]) {
+        case INT:
+        case BOOLEAN:
+          rows[rowId] = dataBlock.getInt(rowId, columnIndex);
+          break;
+        case LONG:
+          rows[rowId] = (int) dataBlock.getLong(rowId, columnIndex);
+          break;
+        case FLOAT:
+          rows[rowId] = (int) dataBlock.getFloat(rowId, columnIndex);
+          break;
+        case DOUBLE:
+          rows[rowId] = (int) dataBlock.getDouble(rowId, columnIndex);
+          break;
+        case BIG_DECIMAL:
+          rows[rowId] = dataBlock.getBigDecimal(rowId, columnIndex).intValue();
+          break;
+        default:
+          throw new IllegalStateException(
+              String.format("Unsupported data type: %s for column: %s", columnDataTypes[columnIndex], columnIndex));
+      }
+    }
+    return rows;
+  }
+
+  /**
+   * Given a datablock and the column index, extracts the long values for the column. Prefer using this function over
+   * extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to the
+   * desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return long array of values in the column
+   */
+  public static long[] extractLongValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    long[] rows = new long[numRows];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+
+      switch (columnDataTypes[columnIndex]) {
+        case INT:
+        case BOOLEAN:
+          rows[rowId] = dataBlock.getInt(rowId, columnIndex);
+          break;
+        case LONG:
+          rows[rowId] = dataBlock.getLong(rowId, columnIndex);
+          break;
+        case FLOAT:
+          rows[rowId] = (long) dataBlock.getFloat(rowId, columnIndex);
+          break;
+        case DOUBLE:
+          rows[rowId] = (long) dataBlock.getDouble(rowId, columnIndex);
+          break;
+        case BIG_DECIMAL:
+          rows[rowId] = dataBlock.getBigDecimal(rowId, columnIndex).longValue();
+          break;
+        default:
+          throw new IllegalStateException(
+              String.format("Unsupported data type: %s for column: %s", columnDataTypes[columnIndex], columnIndex));
+      }
+    }
+    return rows;
+  }
+
+  /**
+   * Given a datablock and the column index, extracts the float values for the column. Prefer using this function over
+   * extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to the
+   * desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return float array of values in the column
+   */
+  public static float[] extractFloatValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    float[] rows = new float[numRows];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+
+      switch (columnDataTypes[columnIndex]) {
+        case INT:
+        case BOOLEAN:
+          rows[rowId] = dataBlock.getInt(rowId, columnIndex);
+          break;
+        case LONG:
+          rows[rowId] = dataBlock.getLong(rowId, columnIndex);
+          break;
+        case FLOAT:
+          rows[rowId] = dataBlock.getFloat(rowId, columnIndex);
+          break;
+        case DOUBLE:
+          rows[rowId] = (float) dataBlock.getDouble(rowId, columnIndex);
+          break;
+        case BIG_DECIMAL:
+          rows[rowId] = dataBlock.getBigDecimal(rowId, columnIndex).floatValue();
+          break;
+        default:
+          throw new IllegalStateException(
+              String.format("Unsupported data type: %s for column: %s", columnDataTypes[columnIndex], columnIndex));
+      }
+    }
+
+    return rows;
+  }
+
+  /**
+   * Given a datablock and the column index, extracts the double values for the column. Prefer using this function over
+   * extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to the
+   * desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return double array of values in the column
+   */
+  public static double[] extractDoubleValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    double[] rows = new double[numRows];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+      switch (columnDataTypes[columnIndex]) {
+        case INT:
+        case BOOLEAN:
+          rows[rowId] = dataBlock.getInt(rowId, columnIndex);
+          break;
+        case LONG:
+          rows[rowId] = dataBlock.getLong(rowId, columnIndex);
+          break;
+        case FLOAT:
+          rows[rowId] = dataBlock.getFloat(rowId, columnIndex);
+          break;
+        case DOUBLE:
+          rows[rowId] = dataBlock.getDouble(rowId, columnIndex);
+          break;
+        case BIG_DECIMAL:
+          rows[rowId] = dataBlock.getBigDecimal(rowId, columnIndex).doubleValue();
+          break;
+        default:
+          throw new IllegalStateException(
+              String.format("Unsupported data type: %s for column: %s", columnDataTypes[columnIndex], columnIndex));
+      }
+    }
+
+    return rows;
+  }
+
+  /**
+   * Given a datablock and the column index, extracts the BigDecimal values for the column. Prefer using this function
+   * over extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to
+   * the desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return BigDecimal array of values in the column
+   */
+  public static BigDecimal[] extractBigDecimalValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    BigDecimal[] rows = new BigDecimal[numRows];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+
+      switch (columnDataTypes[columnIndex]) {
+        case INT:
+        case BOOLEAN:
+          rows[rowId] = BigDecimal.valueOf(dataBlock.getInt(rowId, columnIndex));
+          break;
+        case LONG:
+          rows[rowId] = BigDecimal.valueOf(dataBlock.getLong(rowId, columnIndex));
+          break;
+        case FLOAT:
+          rows[rowId] = BigDecimal.valueOf(dataBlock.getFloat(rowId, columnIndex));
+          break;
+        case DOUBLE:
+          rows[rowId] = BigDecimal.valueOf(dataBlock.getDouble(rowId, columnIndex));
+          break;
+        case BIG_DECIMAL:
+          rows[rowId] = BigDecimal.valueOf(dataBlock.getBigDecimal(rowId, columnIndex).doubleValue());
+          break;
+        default:
+          throw new IllegalStateException(
+              String.format("Unsupported data type: %s for column: %s", columnDataTypes[columnIndex], columnIndex));
+      }
+    }
+
+    return rows;
+  }
+
+  /**
+   * Given a datablock and the column index, extracts the String values for the column. Prefer using this function over
+   * extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to the
+   * desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return String array of values in the column
+   */
+  public static String[] extractStringValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    String[] rows = new String[numRows];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+      rows[rowId] = dataBlock.getString(rowId, columnIndex);
+    }
+
+    return rows;
+  }
+
+  /**
+   * Given a datablock and the column index, extracts the byte values for the column. Prefer using this function over
+   * extractRowFromDatablock if the desired datatype is known to prevent autoboxing to Object and later unboxing to the
+   * desired type.
+   * This only works on ROW format.
+   * TODO: Add support for COLUMNAR format.
+   * @return byte array of values in the column
+   */
+  public static byte[][] extractBytesValuesForColumn(DataBlock dataBlock, int columnIndex) {
+    DataSchema dataSchema = dataBlock.getDataSchema();
+    DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+
+    // Get null bitmap for the column.
+    RoaringBitmap nullBitmap = extractNullBitmaps(dataBlock)[columnIndex];
+    int numRows = dataBlock.getNumberOfRows();
+
+    byte[][] rows = new byte[numRows][];
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      if (nullBitmap != null && nullBitmap.contains(rowId)) {
+        continue;
+      }
+      rows[rowId] = dataBlock.getBytes(rowId, columnIndex).getBytes();
+    }
+
+    return rows;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/datablock/MetadataBlock.java b/pinot-common/src/main/java/org/apache/pinot/common/datablock/MetadataBlock.java
index 33f7ee965b3..2e19258d6cc 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/datablock/MetadataBlock.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/datablock/MetadataBlock.java
@@ -26,6 +26,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -76,15 +78,17 @@ public enum MetadataBlockType {
   static class Contents {
 
     private String _type;
+    private Map<String, String> _stats;
 
     @JsonCreator
-    public Contents(@JsonProperty("type") String type) {
+    public Contents(@JsonProperty("type") String type, @JsonProperty("stats") Map<String, String> stats) {
       _type = type;
+      _stats = stats;
     }
 
     @JsonCreator
     public Contents() {
-      _type = null;
+      this(null, new HashMap<>());
     }
 
     public String getType() {
@@ -94,13 +98,25 @@ public String getType() {
     public void setType(String type) {
       _type = type;
     }
+
+    public Map<String, String> getStats() {
+      return _stats;
+    }
+
+    public void setStats(Map<String, String> stats) {
+      _stats = stats;
+    }
   }
 
   private final Contents _contents;
 
   public MetadataBlock(MetadataBlockType type) {
-    super(0, null, new String[0], new byte[]{0}, toContents(new Contents(type.name())));
-    _contents = new Contents(type.name());
+    this(type, new HashMap<>());
+  }
+
+  public MetadataBlock(MetadataBlockType type, Map<String, String> stats) {
+    super(0, null, new String[0], new byte[]{0}, toContents(new Contents(type.name(), stats)));
+    _contents = new Contents(type.name(), stats);
   }
 
   private static byte[] toContents(Contents type) {
@@ -114,7 +130,7 @@ private static byte[] toContents(Contents type) {
   public MetadataBlock(ByteBuffer byteBuffer)
       throws IOException {
     super(byteBuffer);
-    if (_variableSizeDataBytes != null) {
+    if (_variableSizeDataBytes != null && _variableSizeDataBytes.length > 0) {
       _contents = JSON.readValue(_variableSizeDataBytes, Contents.class);
     } else {
       _contents = new Contents();
@@ -132,6 +148,10 @@ public MetadataBlockType getType() {
         : MetadataBlockType.valueOf(type);
   }
 
+  public Map<String, String> getStats() {
+    return _contents.getStats() != null ? _contents.getStats() : new HashMap<>();
+  }
+
   @Override
   public int getDataBlockVersionType() {
     return VERSION + (Type.METADATA.ordinal() << DataBlockUtils.VERSION_TYPE_SHIFT);
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTable.java b/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTable.java
index 9bac9706a7c..928834359f9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTable.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTable.java
@@ -102,7 +102,7 @@ enum MetadataValueType {
    */
   enum MetadataKey {
     UNKNOWN(0, "unknown", MetadataValueType.STRING),
-    TABLE(1, "table", MetadataValueType.STRING), // NOTE: this key is only used in PrioritySchedulerTest
+    TABLE(1, "table", MetadataValueType.STRING),
     NUM_DOCS_SCANNED(2, "numDocsScanned", MetadataValueType.LONG),
     NUM_ENTRIES_SCANNED_IN_FILTER(3, "numEntriesScannedInFilter", MetadataValueType.LONG),
     NUM_ENTRIES_SCANNED_POST_FILTER(4, "numEntriesScannedPostFilter", MetadataValueType.LONG),
@@ -110,8 +110,6 @@ enum MetadataKey {
     NUM_SEGMENTS_PROCESSED(6, "numSegmentsProcessed", MetadataValueType.INT),
     NUM_SEGMENTS_MATCHED(7, "numSegmentsMatched", MetadataValueType.INT),
     NUM_CONSUMING_SEGMENTS_QUERIED(8, "numConsumingSegmentsQueried", MetadataValueType.INT),
-    NUM_CONSUMING_SEGMENTS_PROCESSED(26, "numConsumingSegmentsProcessed", MetadataValueType.INT),
-    NUM_CONSUMING_SEGMENTS_MATCHED(27, "numConsumingSegmentsMatched", MetadataValueType.INT),
     MIN_CONSUMING_FRESHNESS_TIME_MS(9, "minConsumingFreshnessTimeMs", MetadataValueType.LONG),
     TOTAL_DOCS(10, "totalDocs", MetadataValueType.LONG),
     NUM_GROUPS_LIMIT_REACHED(11, "numGroupsLimitReached", MetadataValueType.STRING),
@@ -128,11 +126,19 @@ enum MetadataKey {
     NUM_SEGMENTS_PRUNED_BY_LIMIT(22, "numSegmentsPrunedByLimit", MetadataValueType.INT),
     NUM_SEGMENTS_PRUNED_BY_VALUE(23, "numSegmentsPrunedByValue", MetadataValueType.INT),
     EXPLAIN_PLAN_NUM_EMPTY_FILTER_SEGMENTS(24, "explainPlanNumEmptyFilterSegments", MetadataValueType.INT),
-    EXPLAIN_PLAN_NUM_MATCH_ALL_FILTER_SEGMENTS(25, "explainPlanNumMatchAllFilterSegments", MetadataValueType.INT);
+    EXPLAIN_PLAN_NUM_MATCH_ALL_FILTER_SEGMENTS(25, "explainPlanNumMatchAllFilterSegments", MetadataValueType.INT),
+    NUM_CONSUMING_SEGMENTS_PROCESSED(26, "numConsumingSegmentsProcessed", MetadataValueType.INT),
+    NUM_CONSUMING_SEGMENTS_MATCHED(27, "numConsumingSegmentsMatched", MetadataValueType.INT),
+    NUM_BLOCKS(28, "numBlocks", MetadataValueType.INT),
+    NUM_ROWS(29, "numRows", MetadataValueType.INT),
+    OPERATOR_EXECUTION_TIME_MS(30, "operatorExecutionTimeMs", MetadataValueType.LONG),
+    OPERATOR_ID(31, "operatorId", MetadataValueType.STRING),
+    OPERATOR_EXEC_START_TIME_MS(32, "operatorExecStartTimeMs", MetadataValueType.LONG),
+    OPERATOR_EXEC_END_TIME_MS(33, "operatorExecEndTimeMs", MetadataValueType.LONG);
 
     // We keep this constant to track the max id added so far for backward compatibility.
     // Increase it when adding new keys, but NEVER DECREASE IT!!!
-    private static final int MAX_ID = 27;
+    private static final int MAX_ID = 33;
 
     private static final MetadataKey[] ID_TO_ENUM_KEY_MAP = new MetadataKey[MAX_ID + 1];
     private static final Map<String, MetadataKey> NAME_TO_ENUM_KEY_MAP = new HashMap<>();
@@ -186,6 +192,7 @@ public MetadataValueType getValueType() {
         int id = key.getId();
         Preconditions.checkArgument(id >= 0 && id <= MAX_ID,
             "Invalid id: %s for MetadataKey: %s, must be in the range of [0, MAX_ID(%s)]", id, key, MAX_ID);
+
         Preconditions.checkArgument(ID_TO_ENUM_KEY_MAP[id] == null,
             "Duplicate id: %s defined for MetadataKey: %s and %s", id, ID_TO_ENUM_KEY_MAP[id], key);
         ID_TO_ENUM_KEY_MAP[id] = key;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV3.java b/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV3.java
index ececf03bd00..c855185a020 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV3.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV3.java
@@ -147,15 +147,12 @@ public DataTableImplV3(ByteBuffer byteBuffer)
     }
 
     // Read variable size data.
+    _variableSizeDataBytes = new byte[variableSizeDataLength];
     if (variableSizeDataLength != 0) {
-      _variableSizeDataBytes = new byte[variableSizeDataLength];
       byteBuffer.position(variableSizeDataStart);
       byteBuffer.get(_variableSizeDataBytes);
-      _variableSizeData = ByteBuffer.wrap(_variableSizeDataBytes);
-    } else {
-      _variableSizeDataBytes = null;
-      _variableSizeData = null;
     }
+    _variableSizeData = ByteBuffer.wrap(_variableSizeDataBytes);
 
     // Read metadata.
     int metadataLength = byteBuffer.getInt();
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV4.java b/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV4.java
index d4d27634f94..a4d69ee714e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV4.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/datatable/DataTableImplV4.java
@@ -150,15 +150,12 @@ public DataTableImplV4(ByteBuffer byteBuffer)
     }
 
     // Read variable size data.
+    _variableSizeDataBytes = new byte[variableSizeDataLength];
     if (variableSizeDataLength != 0) {
-      _variableSizeDataBytes = new byte[variableSizeDataLength];
       byteBuffer.position(variableSizeDataStart);
       byteBuffer.get(_variableSizeDataBytes);
-      _variableSizeData = ByteBuffer.wrap(_variableSizeDataBytes);
-    } else {
-      _variableSizeDataBytes = null;
-      _variableSizeData = null;
     }
+    _variableSizeData = ByteBuffer.wrap(_variableSizeDataBytes);
 
     // Read metadata.
     int metadataLength = byteBuffer.getInt();
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java b/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
index 5b2910a3004..a6a1a2bfa4b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/exception/QueryException.java
@@ -54,7 +54,7 @@ public static void setMaxLinesOfStackTrace(int maxLinesOfStackTracePerFrame) {
   public static final int ACCESS_DENIED_ERROR_CODE = 180;
   public static final int TABLE_DOES_NOT_EXIST_ERROR_CODE = 190;
   public static final int QUERY_EXECUTION_ERROR_CODE = 200;
-  public static final int QUERY_CANCELLATION_ERROR_CODE = 205;
+  public static final int QUERY_CANCELLATION_ERROR_CODE = 503;
   // TODO: Handle these errors in broker
   public static final int SERVER_SHUTTING_DOWN_ERROR_CODE = 210;
   public static final int SERVER_OUT_OF_CAPACITY_ERROR_CODE = 211;
@@ -130,6 +130,8 @@ public static void setMaxLinesOfStackTrace(int maxLinesOfStackTracePerFrame) {
   public static final ProcessingException UNKNOWN_COLUMN_ERROR = new ProcessingException(UNKNOWN_COLUMN_ERROR_CODE);
   public static final ProcessingException UNKNOWN_ERROR = new ProcessingException(UNKNOWN_ERROR_CODE);
   public static final ProcessingException QUOTA_EXCEEDED_ERROR = new ProcessingException(TOO_MANY_REQUESTS_ERROR_CODE);
+  public static final ProcessingException BROKER_REQUEST_SEND_ERROR =
+      new ProcessingException(BROKER_REQUEST_SEND_ERROR_CODE);
 
   static {
     JSON_PARSING_ERROR.setMessage("JsonParsingError");
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionInvoker.java b/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionInvoker.java
index 98fbbf0635f..59a91ca76e1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionInvoker.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionInvoker.java
@@ -32,12 +32,17 @@
  */
 public class FunctionInvoker {
   private final Method _method;
+  // If true, the function should return null if any of its argument is null
+  // Otherwise, the function should deal with null in its own implementation.
+  private final boolean _isNullIntolerant;
+
   private final Class<?>[] _parameterClasses;
   private final PinotDataType[] _parameterTypes;
   private final Object _instance;
 
   public FunctionInvoker(FunctionInfo functionInfo) {
     _method = functionInfo.getMethod();
+    _isNullIntolerant = !functionInfo.hasNullableParameters();
     Class<?>[] parameterClasses = _method.getParameterTypes();
     int numParameters = parameterClasses.length;
     _parameterClasses = new Class<?>[numParameters];
@@ -123,6 +128,13 @@ public Class<?> getResultClass() {
    * {@link #convertTypes(Object[])} to convert the argument types if needed before calling this method.
    */
   public Object invoke(Object[] arguments) {
+    if (_isNullIntolerant) {
+      for (Object arg : arguments) {
+        if (arg == null) {
+          return null;
+        }
+      }
+    }
     try {
       return _method.invoke(_instance, arguments);
     } catch (Exception e) {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java b/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
index 4a5f2bb60d8..2c2ba9a3244 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
@@ -187,7 +187,7 @@ public static Object jsonExtractScalar(String jsonFieldName, String jsonPath, St
     }
 
     @ScalarFunction(names = {"jsonExtractKey", "json_extract_key"}, isPlaceholder = true)
-    public static String jsonExtractKey(String jsonFieldName, String jsonPath) {
+    public static Object jsonExtractKey(String jsonFieldName, String jsonPath) {
       throw new UnsupportedOperationException("Placeholder scalar function, should not reach here");
     }
 
@@ -205,5 +205,16 @@ public static boolean textMatch(String text, String pattern) {
     public static boolean jsonMatch(String text, String pattern) {
       throw new UnsupportedOperationException("Placeholder scalar function, should not reach here");
     }
+
+    @ScalarFunction(names = {"clpDecode", "clp_decode"}, isPlaceholder = true)
+    public static Object clpDecode(String logtypeFieldName, String dictVarsFieldName, String encodedVarsFieldName) {
+      throw new UnsupportedOperationException("Placeholder scalar function, should not reach here");
+    }
+
+    @ScalarFunction(names = {"clpDecode", "clp_decode"}, isPlaceholder = true)
+    public static Object clpDecode(String logtypeFieldName, String dictVarsFieldName, String encodedVarsFieldName,
+        String defaultValue) {
+      throw new UnsupportedOperationException("Placeholder scalar function, should not reach here");
+    }
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java b/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
index 6c61fc89f10..2ae2f806037 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
@@ -18,10 +18,25 @@
  */
 package org.apache.pinot.common.function;
 
+import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlReturnTypeInference;
+import org.apache.calcite.sql.type.SqlTypeFamily;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.sql.type.SqlTypeTransforms;
+import org.apache.pinot.spi.data.DateTimeFieldSpec;
+import org.apache.pinot.spi.data.DateTimeFormatSpec;
 
 
 public enum TransformFunctionType {
@@ -76,13 +91,34 @@ public enum TransformFunctionType {
   CAST("cast"),
 
   // string functions
-  JSONEXTRACTSCALAR("jsonExtractScalar"),
-  JSONEXTRACTKEY("jsonExtractKey"),
+  JSONEXTRACTSCALAR("jsonExtractScalar",
+      ReturnTypes.cascade(opBinding -> positionalReturnTypeInferenceFromStringLiteral(opBinding, 2,
+          SqlTypeName.VARCHAR), SqlTypeTransforms.FORCE_NULLABLE),
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER,
+          SqlTypeFamily.CHARACTER), ordinal -> ordinal > 2), "json_extract_scalar"),
+  JSONEXTRACTKEY("jsonExtractKey", ReturnTypes.TO_ARRAY,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER)), "json_extract_key"),
 
   // date time functions
-  TIMECONVERT("timeConvert"),
-  DATETIMECONVERT("dateTimeConvert"),
-  DATETRUNC("dateTrunc"),
+  TIMECONVERT("timeConvert",
+      ReturnTypes.BIGINT_FORCE_NULLABLE,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER)),
+      "time_convert"),
+
+  DATETIMECONVERT("dateTimeConvert",
+      ReturnTypes.cascade(
+          opBinding -> dateTimeConverterReturnTypeInference(opBinding),
+          SqlTypeTransforms.FORCE_NULLABLE),
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER,
+          SqlTypeFamily.CHARACTER)), "date_time_convert"),
+
+  DATETRUNC("dateTrunc",
+      ReturnTypes.BIGINT_FORCE_NULLABLE,
+      OperandTypes.family(
+          ImmutableList.of(SqlTypeFamily.CHARACTER, SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER,
+              SqlTypeFamily.CHARACTER),
+          ordinal -> ordinal > 1)),
+
   YEAR("year"),
   YEAR_OF_WEEK("yearOfWeek", "yow"),
   QUARTER("quarter"),
@@ -107,15 +143,26 @@ public enum TransformFunctionType {
   ARRAYMAX("arrayMax"),
   ARRAYSUM("arraySum"),
   VALUEIN("valueIn"),
-  MAPVALUE("mapValue"),
+  MAPVALUE("mapValue", ReturnTypes.cascade(opBinding ->
+      opBinding.getOperandType(2).getComponentType(), SqlTypeTransforms.FORCE_NULLABLE),
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.ANY, SqlTypeFamily.ANY)),
+      "map_value"),
 
   // special functions
   INIDSET("inIdSet"),
   LOOKUP("lookUp"),
   GROOVY("groovy"),
+  CLPDECODE("clpDecode"),
 
   // Regexp functions
-  REGEXP_EXTRACT("regexpExtract"),
+  REGEXP_EXTRACT("regexpExtract", "regexp_extract"),
+  REGEXPREPLACE("regexpReplace",
+      ReturnTypes.VARCHAR_2000_NULLABLE,
+      OperandTypes.family(
+          ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER, SqlTypeFamily.CHARACTER,
+              SqlTypeFamily.INTEGER, SqlTypeFamily.INTEGER, SqlTypeFamily.CHARACTER),
+          ordinal -> ordinal > 2),
+      "regexp_replace"),
 
   // Special type for annotation based scalar functions
   SCALAR("scalar"),
@@ -161,22 +208,108 @@ public enum TransformFunctionType {
   RADIANS("radians");
 
   private final String _name;
-  private final List<String> _aliases;
+  private final List<String> _alternativeNames;
+  private final SqlKind _sqlKind;
+  private final SqlReturnTypeInference _returnTypeInference;
+  private final SqlOperandTypeChecker _operandTypeChecker;
+  private final SqlFunctionCategory _sqlFunctionCategory;
+
+  TransformFunctionType(String name, String... alternativeNames) {
+    this(name, null, null, null, null, alternativeNames);
+  }
+
+  TransformFunctionType(String name, SqlReturnTypeInference returnTypeInference,
+      SqlOperandTypeChecker operandTypeChecker, String... alternativeNames) {
+    this(name, SqlKind.OTHER_FUNCTION, returnTypeInference, operandTypeChecker,
+        SqlFunctionCategory.USER_DEFINED_FUNCTION, alternativeNames);
+  }
 
-  TransformFunctionType(String name, String... aliases) {
+  /**
+   * Constructor to use for transform functions which are supported in both v1 and multistage engines
+   */
+  TransformFunctionType(String name, SqlKind sqlKind, SqlReturnTypeInference returnTypeInference,
+      SqlOperandTypeChecker operandTypeChecker, SqlFunctionCategory sqlFunctionCategory, String... alternativeNames) {
     _name = name;
-    List<String> all = new ArrayList<>(aliases.length + 2);
+    List<String> all = new ArrayList<>(alternativeNames.length + 2);
     all.add(name);
     all.add(name());
-    all.addAll(Arrays.asList(aliases));
-    _aliases = Collections.unmodifiableList(all);
+    all.addAll(Arrays.asList(alternativeNames));
+    _alternativeNames = Collections.unmodifiableList(all);
+    _sqlKind = sqlKind;
+    _returnTypeInference = returnTypeInference;
+    _operandTypeChecker = operandTypeChecker;
+    _sqlFunctionCategory = sqlFunctionCategory;
   }
 
   public String getName() {
     return _name;
   }
 
-  public List<String> getAliases() {
-    return _aliases;
+  public List<String> getAlternativeNames() {
+    return _alternativeNames;
+  }
+
+  public SqlKind getSqlKind() {
+    return _sqlKind;
+  }
+
+  public SqlReturnTypeInference getReturnTypeInference() {
+    return _returnTypeInference;
+  }
+
+  public SqlOperandTypeChecker getOperandTypeChecker() {
+    return _operandTypeChecker;
+  }
+
+  public SqlFunctionCategory getSqlFunctionCategory() {
+    return _sqlFunctionCategory;
+  }
+
+  /** Returns the optional explicit returning type specification. */
+  private static RelDataType positionalReturnTypeInferenceFromStringLiteral(SqlOperatorBinding opBinding, int pos) {
+    return positionalReturnTypeInferenceFromStringLiteral(opBinding, pos, SqlTypeName.ANY);
+  }
+
+  private static RelDataType positionalReturnTypeInferenceFromStringLiteral(SqlOperatorBinding opBinding, int pos,
+      SqlTypeName defaultSqlType) {
+    if (opBinding.getOperandCount() > pos
+        && opBinding.isOperandLiteral(pos, false)) {
+      String operandType = opBinding.getOperandLiteralValue(pos, String.class).toUpperCase();
+      return inferTypeFromStringLiteral(operandType, opBinding.getTypeFactory());
+    }
+    return opBinding.getTypeFactory().createSqlType(defaultSqlType);
+  }
+
+  private static RelDataType dateTimeConverterReturnTypeInference(SqlOperatorBinding opBinding) {
+    int outputFormatPos = 2;
+    if (opBinding.getOperandCount() > outputFormatPos
+        && opBinding.isOperandLiteral(outputFormatPos, false)) {
+      String outputFormatStr = opBinding.getOperandLiteralValue(outputFormatPos, String.class).toUpperCase();
+      DateTimeFormatSpec dateTimeFormatSpec = new DateTimeFormatSpec(outputFormatStr);
+      if ((dateTimeFormatSpec.getTimeFormat() == DateTimeFieldSpec.TimeFormat.EPOCH) || (
+          dateTimeFormatSpec.getTimeFormat() == DateTimeFieldSpec.TimeFormat.TIMESTAMP)) {
+        return opBinding.getTypeFactory().createSqlType(SqlTypeName.BIGINT);
+      }
+    }
+    return opBinding.getTypeFactory().createSqlType(SqlTypeName.VARCHAR);
+  }
+
+  private static RelDataType inferTypeFromStringLiteral(String operandTypeStr, RelDataTypeFactory typeFactory) {
+    switch (operandTypeStr) {
+      case "INT":
+        return typeFactory.createSqlType(SqlTypeName.INTEGER);
+      case "LONG":
+        return typeFactory.createSqlType(SqlTypeName.BIGINT);
+      case "STRING":
+        return typeFactory.createSqlType(SqlTypeName.VARCHAR);
+      case "BYTES":
+        return typeFactory.createSqlType(SqlTypeName.VARBINARY);
+      default:
+        SqlTypeName sqlTypeName = SqlTypeName.get(operandTypeStr);
+        if (sqlTypeName == null) {
+          throw new IllegalArgumentException("Invalid type: " + operandTypeStr);
+        }
+        return typeFactory.createSqlType(sqlTypeName);
+    }
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/DateTimeFunctions.java b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/DateTimeFunctions.java
index cbd3d2e39ce..77db5d7fcdf 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/DateTimeFunctions.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/DateTimeFunctions.java
@@ -79,6 +79,15 @@ public static long toEpochSeconds(long millis) {
     return TimeUnit.MILLISECONDS.toSeconds(millis);
   }
 
+  @ScalarFunction
+  public static long[] toEpochSecondsMV(long[] millis) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochSeconds(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Convert epoch millis to epoch minutes
    */
@@ -87,6 +96,15 @@ public static long toEpochMinutes(long millis) {
     return TimeUnit.MILLISECONDS.toMinutes(millis);
   }
 
+  @ScalarFunction
+  public static long[] toEpochMinutesMV(long[] millis) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochMinutes(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Convert epoch millis to epoch hours
    */
@@ -95,6 +113,15 @@ public static long toEpochHours(long millis) {
     return TimeUnit.MILLISECONDS.toHours(millis);
   }
 
+  @ScalarFunction
+  public static long[] toEpochHoursMV(long[] millis) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochHours(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Convert epoch millis to epoch days
    */
@@ -103,6 +130,15 @@ public static long toEpochDays(long millis) {
     return TimeUnit.MILLISECONDS.toDays(millis);
   }
 
+  @ScalarFunction
+  public static long[] toEpochDaysMV(long[] millis) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochDays(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Convert epoch millis to epoch seconds, round to nearest rounding bucket
    */
@@ -111,6 +147,16 @@ public static long toEpochSecondsRounded(long millis, long roundToNearest) {
     return (TimeUnit.MILLISECONDS.toSeconds(millis) / roundToNearest) * roundToNearest;
   }
 
+  @ScalarFunction
+  public static long[] toEpochSecondsRoundedMV(long[] millis, long roundToNearest) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochSecondsRounded(millis[i], roundToNearest);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch minutes, round to nearest rounding bucket
    */
@@ -119,6 +165,16 @@ public static long toEpochMinutesRounded(long millis, long roundToNearest) {
     return (TimeUnit.MILLISECONDS.toMinutes(millis) / roundToNearest) * roundToNearest;
   }
 
+  @ScalarFunction
+  public static long[] toEpochMinutesRoundedMV(long[] millis, long roundToNearest) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochMinutesRounded(millis[i], roundToNearest);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch hours, round to nearest rounding bucket
    */
@@ -127,6 +183,16 @@ public static long toEpochHoursRounded(long millis, long roundToNearest) {
     return (TimeUnit.MILLISECONDS.toHours(millis) / roundToNearest) * roundToNearest;
   }
 
+  @ScalarFunction
+  public static long[] toEpochHoursRoundedMV(long[] millis, long roundToNearest) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochHoursRounded(millis[i], roundToNearest);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch days, round to nearest rounding bucket
    */
@@ -135,6 +201,16 @@ public static long toEpochDaysRounded(long millis, long roundToNearest) {
     return (TimeUnit.MILLISECONDS.toDays(millis) / roundToNearest) * roundToNearest;
   }
 
+  @ScalarFunction
+  public static long[] toEpochDaysRoundedMV(long[] millis, long roundToNearest) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochDaysRounded(millis[i], roundToNearest);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch seconds, divided by given bucket, to get nSecondsSinceEpoch
    */
@@ -143,6 +219,16 @@ public static long toEpochSecondsBucket(long millis, long bucket) {
     return TimeUnit.MILLISECONDS.toSeconds(millis) / bucket;
   }
 
+  @ScalarFunction
+  public static long[] toEpochSecondsBucketMV(long[] millis, long bucket) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochSecondsBucket(millis[i], bucket);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch minutes, divided by given bucket, to get nMinutesSinceEpoch
    */
@@ -151,6 +237,16 @@ public static long toEpochMinutesBucket(long millis, long bucket) {
     return TimeUnit.MILLISECONDS.toMinutes(millis) / bucket;
   }
 
+  @ScalarFunction
+  public static long[] toEpochMinutesBucketMV(long[] millis, long bucket) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochMinutesBucket(millis[i], bucket);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch hours, divided by given bucket, to get nHoursSinceEpoch
    */
@@ -159,6 +255,16 @@ public static long toEpochHoursBucket(long millis, long bucket) {
     return TimeUnit.MILLISECONDS.toHours(millis) / bucket;
   }
 
+  @ScalarFunction
+  public static long[] toEpochHoursBucketMV(long[] millis, long bucket) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochHoursBucket(millis[i], bucket);
+    }
+    return results;
+  }
+
+
   /**
    * Convert epoch millis to epoch days, divided by given bucket, to get nDaysSinceEpoch
    */
@@ -167,6 +273,16 @@ public static long toEpochDaysBucket(long millis, long bucket) {
     return TimeUnit.MILLISECONDS.toDays(millis) / bucket;
   }
 
+  @ScalarFunction
+  public static long[] toEpochDaysBucketMV(long[] millis, long bucket) {
+    long[] results = new long[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toEpochDaysBucket(millis[i], bucket);
+    }
+    return results;
+  }
+
+
   /**
    * Converts epoch seconds to epoch millis
    */
@@ -175,6 +291,15 @@ public static long fromEpochSeconds(long seconds) {
     return TimeUnit.SECONDS.toMillis(seconds);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochSecondsMV(long[] seconds) {
+    long[] results = new long[seconds.length];
+    for (int i = 0; i < seconds.length; i++) {
+      results[i] = fromEpochSeconds(seconds[i]);
+    }
+    return results;
+  }
+
   /**
    * Converts epoch minutes to epoch millis
    */
@@ -183,6 +308,15 @@ public static long fromEpochMinutes(long minutes) {
     return TimeUnit.MINUTES.toMillis(minutes);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochMinutesMV(long[] minutes) {
+    long[] results = new long[minutes.length];
+    for (int i = 0; i < minutes.length; i++) {
+      results[i] = fromEpochMinutes(minutes[i]);
+    }
+    return results;
+  }
+
   /**
    * Converts epoch hours to epoch millis
    */
@@ -191,6 +325,15 @@ public static long fromEpochHours(long hours) {
     return TimeUnit.HOURS.toMillis(hours);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochHoursMV(long[] hours) {
+    long[] results = new long[hours.length];
+    for (int i = 0; i < hours.length; i++) {
+      results[i] = fromEpochHours(hours[i]);
+    }
+    return results;
+  }
+
   /**
    * Converts epoch days to epoch millis
    */
@@ -199,6 +342,15 @@ public static long fromEpochDays(long days) {
     return TimeUnit.DAYS.toMillis(days);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochDaysMV(long[] days) {
+    long[] results = new long[days.length];
+    for (int i = 0; i < days.length; i++) {
+      results[i] = fromEpochDays(days[i]);
+    }
+    return results;
+  }
+
   /**
    * Converts nSecondsSinceEpoch (seconds that have been divided by a bucket), to epoch millis
    */
@@ -207,6 +359,15 @@ public static long fromEpochSecondsBucket(long seconds, long bucket) {
     return TimeUnit.SECONDS.toMillis(seconds * bucket);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochSecondsBucketMV(long[] seconds, long bucket) {
+    long[] results = new long[seconds.length];
+    for (int i = 0; i < seconds.length; i++) {
+      results[i] = fromEpochSecondsBucket(seconds[i], bucket);
+    }
+    return results;
+  }
+
   /**
    * Converts nMinutesSinceEpoch (minutes that have been divided by a bucket), to epoch millis
    */
@@ -215,6 +376,15 @@ public static long fromEpochMinutesBucket(long minutes, long bucket) {
     return TimeUnit.MINUTES.toMillis(minutes * bucket);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochMinutesBucketMV(long[] minutes, long bucket) {
+    long[] results = new long[minutes.length];
+    for (int i = 0; i < minutes.length; i++) {
+      results[i] = fromEpochMinutesBucket(minutes[i], bucket);
+    }
+    return results;
+  }
+
   /**
    * Converts nHoursSinceEpoch (hours that have been divided by a bucket), to epoch millis
    */
@@ -223,6 +393,15 @@ public static long fromEpochHoursBucket(long hours, long bucket) {
     return TimeUnit.HOURS.toMillis(hours * bucket);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochHoursBucketMV(long[] hours, long bucket) {
+    long[] results = new long[hours.length];
+    for (int i = 0; i < hours.length; i++) {
+      results[i] = fromEpochHoursBucket(hours[i], bucket);
+    }
+    return results;
+  }
+
   /**
    * Converts nDaysSinceEpoch (days that have been divided by a bucket), to epoch millis
    */
@@ -231,6 +410,15 @@ public static long fromEpochDaysBucket(long days, long bucket) {
     return TimeUnit.DAYS.toMillis(days * bucket);
   }
 
+  @ScalarFunction
+  public static long[] fromEpochDaysBucketMV(long[] days, long bucket) {
+    long[] results = new long[days.length];
+    for (int i = 0; i < days.length; i++) {
+      results[i] = fromEpochDaysBucket(days[i], bucket);
+    }
+    return results;
+  }
+
   /**
    * Converts epoch millis to Timestamp
    */
@@ -239,6 +427,15 @@ public static Timestamp toTimestamp(long millis) {
     return new Timestamp(millis);
   }
 
+  @ScalarFunction
+  public static Timestamp[] toTimestampMV(long[] millis) {
+    Timestamp[] results = new Timestamp[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toTimestamp(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Converts Timestamp to epoch millis
    */
@@ -247,6 +444,15 @@ public static long fromTimestamp(Timestamp timestamp) {
     return timestamp.getTime();
   }
 
+  @ScalarFunction
+  public static long[] fromTimestampMV(Timestamp[] timestamp) {
+    long[] results = new long[timestamp.length];
+    for (int i = 0; i < timestamp.length; i++) {
+      results[i] = fromTimestamp(timestamp[i]);
+    }
+    return results;
+  }
+
   /**
    * Converts epoch millis to DateTime string represented by pattern
    */
@@ -255,6 +461,15 @@ public static String toDateTime(long millis, String pattern) {
     return DateTimePatternHandler.parseEpochMillisToDateTimeString(millis, pattern);
   }
 
+  @ScalarFunction
+  public static String[] toDateTimeMV(long[] millis, String pattern) {
+    String[] results = new String[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toDateTime(millis[i], pattern);
+    }
+    return results;
+  }
+
   /**
    * Converts epoch millis to DateTime string represented by pattern and the time zone id.
    */
@@ -263,6 +478,15 @@ public static String toDateTime(long millis, String pattern, String timezoneId)
     return DateTimePatternHandler.parseEpochMillisToDateTimeString(millis, pattern, timezoneId);
   }
 
+  @ScalarFunction
+  public static String[] toDateTimeMV(long[] millis, String pattern, String timezoneId) {
+    String[] results = new String[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = toDateTime(millis[i], pattern, timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Converts DateTime string represented by pattern to epoch millis
    */
@@ -271,6 +495,15 @@ public static long fromDateTime(String dateTimeString, String pattern) {
     return DateTimePatternHandler.parseDateTimeStringToEpochMillis(dateTimeString, pattern);
   }
 
+  @ScalarFunction
+  public static long[] fromDateTimeMV(String[] dateTimeString, String pattern) {
+    long[] results = new long[dateTimeString.length];
+    for (int i = 0; i < dateTimeString.length; i++) {
+      results[i] = fromDateTime(dateTimeString[i], pattern);
+    }
+    return results;
+  }
+
   /**
    * Converts DateTime string represented by pattern to epoch millis
    */
@@ -279,6 +512,15 @@ public static long fromDateTime(String dateTimeString, String pattern, String ti
     return DateTimePatternHandler.parseDateTimeStringToEpochMillis(dateTimeString, pattern, timeZoneId);
   }
 
+  @ScalarFunction
+  public static long[] fromDateTimeMV(String[] dateTimeString, String pattern, String timeZoneId) {
+    long[] results = new long[dateTimeString.length];
+    for (int i = 0; i < dateTimeString.length; i++) {
+      results[i] = fromDateTime(dateTimeString[i], pattern, timeZoneId);
+    }
+    return results;
+  }
+
   /**
    * Round the given time value to nearest multiple
    * @return the original value but rounded to the nearest multiple of @param roundToNearest
@@ -288,6 +530,15 @@ public static long round(long timeValue, long roundToNearest) {
     return (timeValue / roundToNearest) * roundToNearest;
   }
 
+  @ScalarFunction
+  public static long[] roundMV(long[] timeValue, long roundToNearest) {
+    long[] results = new long[timeValue.length];
+    for (int i = 0; i < timeValue.length; i++) {
+      results[i] = round(timeValue[i], roundToNearest);
+    }
+    return results;
+  }
+
   /**
    * Return current time as epoch millis
    * TODO: Consider changing the return type to Timestamp
@@ -315,6 +566,15 @@ public static long ago(String periodString) {
     return System.currentTimeMillis() - period.toMillis();
   }
 
+  @ScalarFunction
+  public static long[] agoMV(String[] periodString) {
+    long[] results = new long[periodString.length];
+    for (int i = 0; i < periodString.length; i++) {
+      results[i] = ago(periodString[i]);
+    }
+    return results;
+  }
+
   /**
    * The {@code timezoneId} for the following methods must be of a Joda-Time format:
    * https://www.joda.org/joda-time/timezones.html
@@ -328,6 +588,14 @@ public static int timezoneHour(String timezoneId) {
     return timezoneHour(timezoneId, 0);
   }
 
+  @ScalarFunction
+  public static int[] timezoneHourMV(String[] timezoneId) {
+    int[] results = new int[timezoneId.length];
+    for (int i = 0; i < timezoneId.length; i++) {
+      results[i] = timezoneHour(timezoneId[i], 0);
+    }
+    return results;
+  }
   /**
    * Returns the hour of the time zone offset, for the UTC timestamp at {@code millis}. This will
    * properly handle daylight savings time.
@@ -337,6 +605,15 @@ public static int timezoneHour(String timezoneId, long millis) {
     return (int) TimeUnit.MILLISECONDS.toHours(DateTimeZone.forID(timezoneId).getOffset(millis));
   }
 
+  @ScalarFunction
+  public static int[] timezoneHourMV(String timezoneId, long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = timezoneHour(timezoneId, millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the minute of the time zone offset.
    */
@@ -345,6 +622,15 @@ public static int timezoneMinute(String timezoneId) {
     return timezoneMinute(timezoneId, 0);
   }
 
+  @ScalarFunction
+  public static int[] timezoneMinuteMV(String[] timezoneId) {
+    int[] results = new int[timezoneId.length];
+    for (int i = 0; i < timezoneId.length; i++) {
+      results[i] = timezoneMinute(timezoneId[i], 0);
+    }
+    return results;
+  }
+
   /**
    * Returns the minute of the time zone offset, for the UTC timestamp at {@code millis}. This will
    * properly handle daylight savings time
@@ -354,6 +640,15 @@ public static int timezoneMinute(String timezoneId, long millis) {
     return (int) TimeUnit.MILLISECONDS.toMinutes(DateTimeZone.forID(timezoneId).getOffset(millis)) % 60;
   }
 
+  @ScalarFunction
+  public static int[] timezoneMinuteMV(String timezoneId, long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = timezoneMinute(timezoneId, millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the year from the given epoch millis in UTC timezone.
    */
@@ -362,6 +657,15 @@ public static int year(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getYear();
   }
 
+  @ScalarFunction
+  public static int[] yearMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = year(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the year from the given epoch millis and timezone id.
    */
@@ -370,6 +674,15 @@ public static int year(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getYear();
   }
 
+  @ScalarFunction
+  public static int[] yearMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = year(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the year of the ISO week from the given epoch millis in UTC timezone.
    */
@@ -378,6 +691,15 @@ public static int yearOfWeek(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getWeekyear();
   }
 
+  @ScalarFunction(names = {"yearOfWeekMV", "year_of_week_mv", "yowmv"})
+  public static int[] yearOfWeekMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = yearOfWeek(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the year of the ISO week from the given epoch millis and timezone id.
    */
@@ -386,6 +708,15 @@ public static int yearOfWeek(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getWeekyear();
   }
 
+  @ScalarFunction(names = {"yearOfWeekMV", "year_of_week_mv", "yowmv"})
+  public static int[] yearOfWeekMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = yearOfWeek(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the quarter of the year from the given epoch millis in UTC timezone. The value ranges from 1 to 4.
    */
@@ -394,6 +725,15 @@ public static int quarter(long millis) {
     return (monthOfYear(millis) - 1) / 3 + 1;
   }
 
+  @ScalarFunction
+  public static int[] quarterMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = quarter(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the quarter of the year from the given epoch millis and timezone id. The value ranges from 1 to 4.
    */
@@ -402,6 +742,15 @@ public static int quarter(long millis, String timezoneId) {
     return (monthOfYear(millis, timezoneId) - 1) / 3 + 1;
   }
 
+  @ScalarFunction
+  public static int[] quarterMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = quarter(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the month of the year from the given epoch millis in UTC timezone. The value ranges from 1 to 12.
    */
@@ -410,6 +759,15 @@ public static int monthOfYear(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getMonthOfYear();
   }
 
+  @ScalarFunction(names = {"monthMV", "month_of_year_mv", "monthOfYearMV"})
+  public static int[] monthOfYearMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = monthOfYear(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the month of the year from the given epoch millis and timezone id. The value ranges from 1 to 12.
    */
@@ -418,6 +776,15 @@ public static int monthOfYear(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getMonthOfYear();
   }
 
+  @ScalarFunction(names = {"monthMV", "month_of_year_mv", "monthOfYearMV"})
+  public static int[] monthOfYearMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = monthOfYear(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the ISO week of the year from the given epoch millis in UTC timezone.The value ranges from 1 to 53.
    */
@@ -426,6 +793,15 @@ public static int weekOfYear(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getWeekOfWeekyear();
   }
 
+  @ScalarFunction(names = {"weekOfYearMV", "week_of_year_mv", "weekMV"})
+  public static int[] weekOfYearMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = weekOfYear(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the ISO week of the year from the given epoch millis and timezone id. The value ranges from 1 to 53.
    */
@@ -434,6 +810,15 @@ public static int weekOfYear(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getWeekOfWeekyear();
   }
 
+  @ScalarFunction(names = {"weekOfYearMV", "week_of_year_mv", "weekMV"})
+  public static int[] weekOfYearMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = weekOfYear(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the day of the year from the given epoch millis in UTC timezone. The value ranges from 1 to 366.
    */
@@ -442,6 +827,15 @@ public static int dayOfYear(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getDayOfYear();
   }
 
+  @ScalarFunction(names = {"dayOfYearMV", "day_of_year_mv", "doyMV"})
+  public static int[] dayOfYear(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = dayOfYear(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the day of the year from the given epoch millis and timezone id. The value ranges from 1 to 366.
    */
@@ -450,6 +844,15 @@ public static int dayOfYear(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getDayOfYear();
   }
 
+  @ScalarFunction(names = {"dayOfYearMV", "day_of_year_mv", "doyMV"})
+  public static int[] dayOfYear(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = dayOfYear(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the day of the month from the given epoch millis in UTC timezone. The value ranges from 1 to 31.
    */
@@ -458,6 +861,15 @@ public static int dayOfMonth(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getDayOfMonth();
   }
 
+  @ScalarFunction(names = {"dayMV", "dayOfMonthMV", "day_of_month_mv"})
+  public static int[] dayOfMonthMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = dayOfMonth(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the day of the month from the given epoch millis and timezone id. The value ranges from 1 to 31.
    */
@@ -466,6 +878,15 @@ public static int dayOfMonth(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getDayOfMonth();
   }
 
+  @ScalarFunction(names = {"dayMV", "dayOfMonthMV", "day_of_month_mv"})
+  public static int[] dayOfMonthMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = dayOfMonth(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the day of the week from the given epoch millis in UTC timezone. The value ranges from 1 (Monday) to 7
    * (Sunday).
@@ -475,6 +896,15 @@ public static int dayOfWeek(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getDayOfWeek();
   }
 
+  @ScalarFunction(names = {"dayOfWeekMV", "day_of_week_mv", "dowMV"})
+  public static int[] dayOfWeekMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = dayOfWeek(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the day of the week from the given epoch millis and timezone id. The value ranges from 1 (Monday) to 7
    * (Sunday).
@@ -484,6 +914,15 @@ public static int dayOfWeek(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getDayOfWeek();
   }
 
+  @ScalarFunction(names = {"dayOfWeekMV", "day_of_week_mv", "dowMV"})
+  public static int[] dayOfWeekMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = dayOfWeek(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the hour of the day from the given epoch millis in UTC timezone. The value ranges from 0 to 23.
    */
@@ -492,6 +931,15 @@ public static int hour(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getHourOfDay();
   }
 
+  @ScalarFunction
+  public static int[] hourMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = hour(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the hour of the day from the given epoch millis and timezone id. The value ranges from 0 to 23.
    */
@@ -500,6 +948,15 @@ public static int hour(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getHourOfDay();
   }
 
+  @ScalarFunction
+  public static int[] hourMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = hour(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the minute of the hour from the given epoch millis in UTC timezone. The value ranges from 0 to 59.
    */
@@ -508,6 +965,15 @@ public static int minute(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getMinuteOfHour();
   }
 
+  @ScalarFunction
+  public static int[] minuteMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = minute(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the minute of the hour from the given epoch millis and timezone id. The value ranges from 0 to 59.
    */
@@ -516,6 +982,15 @@ public static int minute(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getMinuteOfHour();
   }
 
+  @ScalarFunction
+  public static int[] minuteMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = minute(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the second of the minute from the given epoch millis in UTC timezone. The value ranges from 0 to 59.
    */
@@ -524,6 +999,15 @@ public static int second(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getSecondOfMinute();
   }
 
+  @ScalarFunction
+  public static int[] secondMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = second(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the second of the minute from the given epoch millis and timezone id. The value ranges from 0 to 59.
    */
@@ -532,6 +1016,15 @@ public static int second(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getSecondOfMinute();
   }
 
+  @ScalarFunction
+  public static int[] secondMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = second(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * Returns the millisecond of the second from the given epoch millis in UTC timezone. The value ranges from 0 to 999.
    */
@@ -540,6 +1033,15 @@ public static int millisecond(long millis) {
     return new DateTime(millis, DateTimeZone.UTC).getMillisOfSecond();
   }
 
+  @ScalarFunction
+  public static int[] millisecondMV(long[] millis) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = millisecond(millis[i]);
+    }
+    return results;
+  }
+
   /**
    * Returns the millisecond of the second from the given epoch millis and timezone id. The value ranges from 0 to 999.
    */
@@ -548,6 +1050,15 @@ public static int millisecond(long millis, String timezoneId) {
     return new DateTime(millis, DateTimeZone.forID(timezoneId)).getMillisOfSecond();
   }
 
+  @ScalarFunction
+  public static int[] millisecondMV(long[] millis, String timezoneId) {
+    int[] results = new int[millis.length];
+    for (int i = 0; i < millis.length; i++) {
+      results[i] = millisecond(millis[i], timezoneId);
+    }
+    return results;
+  }
+
   /**
    * The sql compatible date_trunc function for epoch time.
    *
@@ -557,7 +1068,17 @@ public static int millisecond(long millis, String timezoneId) {
    */
   @ScalarFunction
   public static long dateTrunc(String unit, long timeValue) {
-    return dateTrunc(unit, timeValue, TimeUnit.MILLISECONDS, ISOChronology.getInstanceUTC(), TimeUnit.MILLISECONDS);
+    return dateTrunc(unit, timeValue, TimeUnit.MILLISECONDS.name(), ISOChronology.getInstanceUTC(),
+        TimeUnit.MILLISECONDS.name());
+  }
+
+  @ScalarFunction
+  public static long[] dateTruncMV(String unit, long[] timeValue) {
+    long[] results = new long[timeValue.length];
+    for (int i = 0; i < timeValue.length; i++) {
+      results[i] = dateTrunc(unit, timeValue[i]);
+    }
+    return results;
   }
 
   /**
@@ -565,53 +1086,80 @@ public static long dateTrunc(String unit, long timeValue) {
    *
    * @param unit truncate to unit (millisecond, second, minute, hour, day, week, month, quarter, year)
    * @param timeValue value to truncate
-   * @param inputTimeUnitStr TimeUnit of value, expressed in Java's joda TimeUnit
+   * @param inputTimeUnit TimeUnit of value, expressed in Java's joda TimeUnit
    * @return truncated timeValue in same TimeUnit as the input
    */
   @ScalarFunction
-  public static long dateTrunc(String unit, long timeValue, String inputTimeUnitStr) {
-    TimeUnit inputTimeUnit = TimeUnit.valueOf(inputTimeUnitStr);
+  public static long dateTrunc(String unit, long timeValue, String inputTimeUnit) {
     return dateTrunc(unit, timeValue, inputTimeUnit, ISOChronology.getInstanceUTC(), inputTimeUnit);
   }
 
+  @ScalarFunction
+  public static long[] dateTruncMV(String unit, long[] timeValue, String inputTimeUnit) {
+    long[] results = new long[timeValue.length];
+    for (int i = 0; i < timeValue.length; i++) {
+      results[i] = dateTrunc(unit, timeValue[i], inputTimeUnit);
+    }
+    return results;
+  }
+
   /**
    * The sql compatible date_trunc function for epoch time.
    *
    * @param unit truncate to unit (millisecond, second, minute, hour, day, week, month, quarter, year)
    * @param timeValue value to truncate
-   * @param inputTimeUnitStr TimeUnit of value, expressed in Java's joda TimeUnit
+   * @param inputTimeUnit TimeUnit of value, expressed in Java's joda TimeUnit
    * @param timeZone timezone of the input
    * @return truncated timeValue in same TimeUnit as the input
    */
   @ScalarFunction
-  public static long dateTrunc(String unit, long timeValue, String inputTimeUnitStr, String timeZone) {
-    TimeUnit inputTimeUnit = TimeUnit.valueOf(inputTimeUnitStr);
+  public static long dateTrunc(String unit, long timeValue, String inputTimeUnit, String timeZone) {
     return dateTrunc(unit, timeValue, inputTimeUnit, DateTimeUtils.getChronology(TimeZoneKey.getTimeZoneKey(timeZone)),
         inputTimeUnit);
   }
 
+  @ScalarFunction
+  public static long[] dateTruncMV(String unit, long[] timeValue, String inputTimeUnit, String timeZone) {
+    long[] results = new long[timeValue.length];
+    for (int i = 0; i < timeValue.length; i++) {
+      results[i] = dateTrunc(unit, timeValue[i], inputTimeUnit, timeZone);
+    }
+    return results;
+  }
+
   /**
    * The sql compatible date_trunc function for epoch time.
    *
    * @param unit truncate to unit (millisecond, second, minute, hour, day, week, month, quarter, year)
    * @param timeValue value to truncate
-   * @param inputTimeUnitStr TimeUnit of value, expressed in Java's joda TimeUnit
+   * @param inputTimeUnit TimeUnit of value, expressed in Java's joda TimeUnit
    * @param timeZone timezone of the input
-   * @param outputTimeUnitStr TimeUnit to convert the output to
+   * @param outputTimeUnit TimeUnit to convert the output to
    * @return truncated timeValue
    *
    */
   @ScalarFunction
-  public static long dateTrunc(String unit, long timeValue, String inputTimeUnitStr, String timeZone,
-      String outputTimeUnitStr) {
-    return dateTrunc(unit, timeValue, TimeUnit.valueOf(inputTimeUnitStr),
-        DateTimeUtils.getChronology(TimeZoneKey.getTimeZoneKey(timeZone)), TimeUnit.valueOf(outputTimeUnitStr));
+  public static long dateTrunc(String unit, long timeValue, String inputTimeUnit, String timeZone,
+      String outputTimeUnit) {
+    return dateTrunc(unit, timeValue, inputTimeUnit,
+        DateTimeUtils.getChronology(TimeZoneKey.getTimeZoneKey(timeZone)), outputTimeUnit);
+  }
+
+  @ScalarFunction
+  public static long[] dateTruncMV(String unit, long[] timeValue, String inputTimeUnit, String timeZone,
+      String outputTimeUnit) {
+    long[] results = new long[timeValue.length];
+    for (int i = 0; i < timeValue.length; i++) {
+      results[i] = dateTrunc(unit, timeValue[i], inputTimeUnit, timeZone, outputTimeUnit);
+    }
+    return results;
   }
 
-  private static long dateTrunc(String unit, long timeValue, TimeUnit inputTimeUnit, ISOChronology chronology,
-      TimeUnit outputTimeUnit) {
-    return outputTimeUnit.convert(DateTimeUtils.getTimestampField(chronology, unit)
-        .roundFloor(TimeUnit.MILLISECONDS.convert(timeValue, inputTimeUnit)), TimeUnit.MILLISECONDS);
+  private static long dateTrunc(String unit, long timeValue, String inputTimeUnit, ISOChronology chronology,
+      String outputTimeUnit) {
+    return TimeUnit.valueOf(outputTimeUnit.toUpperCase()).convert(DateTimeUtils.getTimestampField(chronology, unit)
+            .roundFloor(TimeUnit.MILLISECONDS.convert(timeValue, TimeUnit.valueOf(inputTimeUnit.toUpperCase()))),
+        TimeUnit.MILLISECONDS);
   }
 
   /**
@@ -629,6 +1177,15 @@ public static long timestampAdd(String unit, long interval, long timestamp) {
     return millis;
   }
 
+  @ScalarFunction(names = {"timestampAddMV", "dateAddMV"})
+  public static long[] timestampAddMV(String unit, long interval, long[] timestamp) {
+    long[] results = new long[timestamp.length];
+    for (int i = 0; i < timestamp.length; i++) {
+      results[i] = timestampAdd(unit, interval, timestamp[i]);
+    }
+    return results;
+  }
+
   /**
    * Get difference between two timestamps and return the result in the specified timeunit.
    * e.g. timestampDiff('days', ago('10D'), ago('2D')) will return 8 i.e. 8 days
@@ -642,4 +1199,22 @@ public static long timestampDiff(String unit, long timestamp1, long timestamp2)
     ISOChronology chronology = ISOChronology.getInstanceUTC();
     return DateTimeUtils.getTimestampField(chronology, unit).getDifferenceAsLong(timestamp2, timestamp1);
   }
+
+  @ScalarFunction(names = {"timestampDiffMV", "dateDiffMV"})
+  public static long[] timestampDiffMV(String unit, long[] timestamp1, long timestamp2) {
+    long[] results = new long[timestamp1.length];
+    for (int i = 0; i < timestamp1.length; i++) {
+      results[i] = timestampDiff(unit, timestamp1[i], timestamp2);
+    }
+    return results;
+  }
+
+  @ScalarFunction(names = {"timestampDiffMVReverse", "dateDiffMVReverse"})
+  public static long[] timestampDiffMVReverse(String unit, long timestamp1, long[] timestamp2) {
+    long[] results = new long[timestamp2.length];
+    for (int i = 0; i < timestamp2.length; i++) {
+      results[i] = timestampDiff(unit, timestamp1, timestamp2[i]);
+    }
+    return results;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/JsonFunctions.java b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/JsonFunctions.java
index a81ec373b44..fa50cc6c486 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/JsonFunctions.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/JsonFunctions.java
@@ -128,6 +128,7 @@ private static Object[] convertObjectToArray(Object arrayObject) {
   /**
    * Extract from Json with path to String
    */
+  @Nullable
   @ScalarFunction
   public static String jsonPathString(Object object, String jsonPath)
       throws JsonProcessingException {
@@ -135,7 +136,7 @@ public static String jsonPathString(Object object, String jsonPath)
     if (jsonValue instanceof String) {
       return (String) jsonValue;
     }
-    return JsonUtils.objectToString(jsonValue);
+    return jsonValue == null ? null : JsonUtils.objectToString(jsonValue);
   }
 
   /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ObjectFunctions.java b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ObjectFunctions.java
index 143edd740f5..5cdc0b34d2f 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ObjectFunctions.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ObjectFunctions.java
@@ -94,33 +94,41 @@ private static Object coalesceVar(Object... objects) {
     return null;
   }
 
-  @ScalarFunction
-  public static Object caseWhen(boolean c1, Object o1, Object oe) {
+  @Nullable
+  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen", "case_when"})
+  public static Object caseWhen(boolean c1, @Nullable Object o1, @Nullable Object oe) {
     return caseWhenVar(c1, o1, oe);
   }
 
-  @ScalarFunction
-  public static Object caseWhen(boolean c1, Object o1, boolean c2, Object o2, Object oe) {
+  @Nullable
+  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen", "case_when"})
+  public static Object caseWhen(boolean c1, @Nullable Object o1, boolean c2, @Nullable Object o2, @Nullable Object oe) {
     return caseWhenVar(c1, o1, c2, o2, oe);
   }
 
-  @ScalarFunction
-  public static Object caseWhen(boolean c1, Object o1, boolean c2, Object o2, boolean c3, Object o3, Object oe) {
+  @Nullable
+  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen", "case_when"})
+  public static Object caseWhen(boolean c1, @Nullable Object o1, boolean c2, @Nullable Object o2, boolean c3,
+                                @Nullable Object o3, @Nullable Object oe) {
     return caseWhenVar(c1, o1, c2, o2, c3, o3, oe);
   }
 
-  @ScalarFunction
-  public static Object caseWhen(boolean c1, Object o1, boolean c2, Object o2, boolean c3, Object o3, boolean c4,
-      Object o4, Object oe) {
+  @Nullable
+  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen", "case_when"})
+  public static Object caseWhen(boolean c1, @Nullable Object o1, boolean c2, @Nullable Object o2, boolean c3,
+                                @Nullable Object o3, boolean c4, @Nullable Object o4, @Nullable Object oe) {
     return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, oe);
   }
 
-  @ScalarFunction
-  public static Object caseWhen(boolean c1, Object o1, boolean c2, Object o2, boolean c3, Object o3, boolean c4,
-      Object o4, boolean c5, Object o5, Object oe) {
+  @Nullable
+  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen", "case_when"})
+  public static Object caseWhen(boolean c1, @Nullable Object o1, boolean c2, @Nullable Object o2, boolean c3,
+                                @Nullable Object o3, boolean c4, @Nullable Object o4, boolean c5, @Nullable Object o5,
+                                @Nullable Object oe) {
     return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, oe);
   }
 
+  @Nullable
   private static Object caseWhenVar(Object... objs) {
     for (int i = 0; i < objs.length - 1; i += 2) {
       if (BooleanUtils.toBoolean(objs[i])) {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java
index eb445c973e9..b3776ddc9f2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineage.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -46,18 +47,22 @@
  */
 public class SegmentLineage {
   private static final String COMMA_SEPARATOR = ",";
+  private static final String CUSTOM_MAP_KEY = "custom.map";
 
   private final String _tableNameWithType;
   private final Map<String, LineageEntry> _lineageEntries;
+  private Map<String, String> _customMap = null;
 
   public SegmentLineage(String tableNameWithType) {
     _tableNameWithType = tableNameWithType;
     _lineageEntries = new HashMap<>();
   }
 
-  public SegmentLineage(String tableNameWithType, Map<String, LineageEntry> lineageEntries) {
+  public SegmentLineage(String tableNameWithType, Map<String, LineageEntry> lineageEntries,
+      @Nullable Map<String, String> customMap) {
     _tableNameWithType = tableNameWithType;
     _lineageEntries = lineageEntries;
+    _customMap = customMap;
   }
 
   public String getTableNameWithType() {
@@ -86,6 +91,10 @@ public void updateLineageEntry(String lineageEntryId, LineageEntry lineageEntry)
     _lineageEntries.put(lineageEntryId, lineageEntry);
   }
 
+  public Map<String, LineageEntry> getLineageEntries() {
+    return _lineageEntries;
+  }
+
   /**
    * Retrieve lineage entry
    * @param lineageEntryId the id for the lineage entry
@@ -111,6 +120,22 @@ public void deleteLineageEntry(String lineageEntryId) {
     _lineageEntries.remove(lineageEntryId);
   }
 
+  /**
+   * Retrieve custom map
+   * @return custom map
+   */
+  public Map<String, String> getCustomMap() {
+    return _customMap;
+  }
+
+  /**
+   * Set custom map
+   * @param customMap
+   */
+  public void setCustomMap(Map<String, String> customMap) {
+    _customMap = customMap;
+  }
+
   /**
    * Convert ZNRecord to segment lineage
    * @param record ZNRecord representation of the segment lineage
@@ -120,6 +145,7 @@ public static SegmentLineage fromZNRecord(ZNRecord record) {
     String tableNameWithType = record.getId();
     Map<String, LineageEntry> lineageEntries = new HashMap<>();
     Map<String, List<String>> listFields = record.getListFields();
+    Map<String, String> customMap = record.getMapField(CUSTOM_MAP_KEY);
     for (Map.Entry<String, List<String>> listField : listFields.entrySet()) {
       String lineageId = listField.getKey();
       List<String> value = listField.getValue();
@@ -130,7 +156,7 @@ public static SegmentLineage fromZNRecord(ZNRecord record) {
       long timestamp = Long.parseLong(value.get(3));
       lineageEntries.put(lineageId, new LineageEntry(segmentsFrom, segmentsTo, state, timestamp));
     }
-    return new SegmentLineage(tableNameWithType, lineageEntries);
+    return new SegmentLineage(tableNameWithType, lineageEntries, customMap);
   }
 
   /**
@@ -148,6 +174,9 @@ public ZNRecord toZNRecord() {
       List<String> listEntry = Arrays.asList(segmentsFrom, segmentsTo, state, timestamp);
       znRecord.setListField(entry.getKey(), listEntry);
     }
+    if (_customMap != null) {
+      znRecord.setMapField(CUSTOM_MAP_KEY, _customMap);
+    }
     return znRecord;
   }
 
@@ -163,6 +192,9 @@ public ObjectNode toJsonObject() {
         .sorted(Map.Entry.comparingByValue(Comparator.comparingLong(LineageEntry::getTimestamp)))
         .forEachOrdered(x -> sortedLineageEntries.put(x.getKey(), x.getValue()));
     jsonObject.set("lineageEntries", JsonUtils.objectToJsonNode(sortedLineageEntries));
+    if (_customMap != null) {
+      jsonObject.set("customMap", JsonUtils.objectToJsonNode(_customMap));
+    }
     return jsonObject;
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageUtils.java
index 458b2477ca8..073ff679b59 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/lineage/SegmentLineageUtils.java
@@ -26,7 +26,6 @@
  * Util class for Segment Lineage
  */
 public class SegmentLineageUtils {
-
   private SegmentLineageUtils() {
   }
 
@@ -45,12 +44,11 @@ public static String generateLineageEntryId() {
    */
   public static void filterSegmentsBasedOnLineageInPlace(Set<String> segments, SegmentLineage segmentLineage) {
     if (segmentLineage != null) {
-      for (String lineageEntryId : segmentLineage.getLineageEntryIds()) {
-        LineageEntry lineageEntry = segmentLineage.getLineageEntry(lineageEntryId);
+      for (LineageEntry lineageEntry : segmentLineage.getLineageEntries().values()) {
         if (lineageEntry.getState() == LineageEntryState.COMPLETED) {
-          segments.removeAll(lineageEntry.getSegmentsFrom());
+          lineageEntry.getSegmentsFrom().forEach(segments::remove);
         } else {
-          segments.removeAll(lineageEntry.getSegmentsTo());
+          lineageEntry.getSegmentsTo().forEach(segments::remove);
         }
       }
     }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java
index 623a8564542..c6425ca0e02 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/ZKMetadataProvider.java
@@ -26,9 +26,12 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.apache.helix.AccessOption;
+import org.apache.helix.store.HelixPropertyStore;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.helix.zookeeper.zkclient.exception.ZkBadVersionException;
+import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.common.metadata.controllerjob.ControllerJobType;
 import org.apache.pinot.common.metadata.instance.InstanceZKMetadata;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.utils.SchemaUtils;
@@ -110,14 +113,14 @@ public static String constructPropertyStorePathForInstancePartitions(String inst
     return StringUtil.join("/", PROPERTYSTORE_INSTANCE_PARTITIONS_PREFIX, instancePartitionsName);
   }
 
-  public static String constructPropertyStorePathForControllerJob() {
-    return StringUtil.join("/", PROPERTYSTORE_CONTROLLER_JOBS_PREFIX);
-  }
-
   public static String constructPropertyStorePathForResource(String resourceName) {
     return StringUtil.join("/", PROPERTYSTORE_SEGMENTS_PREFIX, resourceName);
   }
 
+  public static String constructPropertyStorePathForControllerJob(ControllerJobType jobType) {
+    return StringUtil.join("/", PROPERTYSTORE_CONTROLLER_JOBS_PREFIX, jobType.name());
+  }
+
   public static String constructPropertyStorePathForResourceConfig(String resourceName) {
     return StringUtil.join("/", PROPERTYSTORE_TABLE_CONFIGS_PREFIX, resourceName);
   }
@@ -261,6 +264,20 @@ public static UserConfig getUserConfig(ZkHelixPropertyStore<ZNRecord> propertySt
     }
   }
 
+  @Nullable
+  public static List<InstancePartitions> getAllInstancePartitions(HelixPropertyStore<ZNRecord> propertyStore) {
+    List<ZNRecord> znRecordss =
+        propertyStore.getChildren(PROPERTYSTORE_INSTANCE_PARTITIONS_PREFIX, null, AccessOption.PERSISTENT);
+
+    try {
+      return Optional.ofNullable(znRecordss).orElseGet(ArrayList::new).stream().map(InstancePartitions::fromZNRecord)
+          .collect(Collectors.toList());
+    } catch (Exception e) {
+      LOGGER.error("Caught exception while getting instance partitions", e);
+      return null;
+    }
+  }
+
   @Nullable
   public static List<UserConfig> getAllUserConfig(ZkHelixPropertyStore<ZNRecord> propertyStore) {
     List<ZNRecord> znRecordss =
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/controllerjob/ControllerJobType.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/controllerjob/ControllerJobType.java
index b62144fd378..aaad454787b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/controllerjob/ControllerJobType.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/controllerjob/ControllerJobType.java
@@ -19,7 +19,5 @@
 package org.apache.pinot.common.metadata.controllerjob;
 
 public enum ControllerJobType {
-  RELOAD_SEGMENT,
-  RELOAD_ALL_SEGMENTS,
-  FORCE_COMMIT
+  RELOAD_SEGMENT, FORCE_COMMIT, TABLE_REBALANCE
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
index f1044abd777..ff41b12abfc 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pinot.common.metrics;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -44,8 +43,6 @@
 
 /**
  * Common code for metrics implementations.
- * TODO: 1. With gauge updatable, we can remove _gaugeValues 2. Remove methods with callback in name since the callback
- *   function can not be updated.
  */
 public abstract class AbstractMetrics<QP extends AbstractMetrics.QueryPhase, M extends AbstractMetrics.Meter,
     G extends AbstractMetrics.Gauge, T extends AbstractMetrics.Timer> {
@@ -58,6 +55,9 @@ public abstract class AbstractMetrics<QP extends AbstractMetrics.QueryPhase, M e
 
   private final Class _clazz;
 
+  // The purpose of having _gaugeValues is to make gauge metric updatable.
+  // Since gauge metric itself is updatable now (https://github.com/apache/pinot/pull/9961), we can deprecate it.
+  @Deprecated
   private final Map<String, AtomicLong> _gaugeValues = new ConcurrentHashMap<String, AtomicLong>();
 
   private final boolean _isTableLevelMetricsEnabled;
@@ -93,6 +93,10 @@ public PinotMetricsRegistry getMetricsRegistry() {
 
   public interface QueryPhase {
     String getQueryPhaseName();
+
+    default String getDescription() {
+      return "";
+    }
   }
 
   public interface Meter {
@@ -101,6 +105,10 @@ public interface Meter {
     String getUnit();
 
     boolean isGlobal();
+
+    default String getDescription() {
+      return "";
+    }
   }
 
   public interface Gauge {
@@ -109,12 +117,18 @@ public interface Gauge {
     String getUnit();
 
     boolean isGlobal();
+    default String getDescription() {
+      return "";
+    }
   }
 
   public interface Timer {
     String getTimerName();
 
     boolean isGlobal();
+    default String getDescription() {
+      return "";
+    }
   }
 
   public void addPhaseTiming(String tableName, QP phase, long duration, TimeUnit timeUnit) {
@@ -326,12 +340,16 @@ public PinotMeter getMeteredTableValue(final String tableName, final M meter) {
   }
 
   /**
+   * @deprecated Please use addMeteredTableValue(final String tableName, final M meter, final long unitCount), which is
+   * designed for tracking count and rates.
+   *
    * Logs a value to a table gauge.
    *
    * @param tableName The table name
    * @param gauge The gauge to use
    * @param unitCount The number of units to add to the gauge
    */
+  @Deprecated
   public void addValueToTableGauge(final String tableName, final G gauge, final long unitCount) {
     final String fullGaugeName = composeTableGaugeName(tableName, gauge);
 
@@ -425,11 +443,15 @@ private void setValueOfGauge(long value, String gaugeName) {
   }
 
   /**
+   * @deprecated Please use addMeteredGlobalValue(final M meter, final long unitCount), which is designed for tracking
+   * count and rates.
+   *
    * Adds a value to a table gauge.
    *
    * @param gauge The gauge to use
    * @param unitCount The number of units to add to the gauge
    */
+  @Deprecated
   public void addValueToGlobalGauge(final G gauge, final long unitCount) {
     String gaugeName = gauge.getGaugeName();
 
@@ -448,19 +470,6 @@ public void addValueToGlobalGauge(final G gauge, final long unitCount) {
     }
   }
 
-  /**
-   * Gets the value of a table gauge.
-   *
-   * @param tableName The table name
-   * @param gauge The gauge to use
-   */
-  public long getValueOfTableGauge(final String tableName, final G gauge) {
-    final String fullGaugeName = composeTableGaugeName(tableName, gauge);
-
-    AtomicLong gaugeValue = _gaugeValues.get(fullGaugeName);
-    return gaugeValue == null ? 0 : gaugeValue.get();
-  }
-
   /**
    * Initializes all global meters (such as exceptions count) to zero.
    */
@@ -732,14 +741,4 @@ private void removeGaugeFromMetricRegistry(String metricName) {
   protected String getTableName(String tableName) {
     return _isTableLevelMetricsEnabled || _allowedTables.contains(tableName) ? tableName : "allTables";
   }
-
-  /**
-   * Check if the metric name appears in the gauge value map.
-   * @param metricName metric name
-   * @return True if the metric name appears on the gauge value map. False otherwise.
-   */
-  @VisibleForTesting
-  public boolean containsGauge(String metricName) {
-    return _gaugeValues.containsKey(metricName);
-  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java
index 44a9161bb4d..93bf03edbe9 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerGauge.java
@@ -34,7 +34,8 @@ public enum BrokerGauge implements AbstractMetrics.Gauge {
   REQUEST_SIZE("requestSize", false),
   RESIZE_TIME_MS("milliseconds", false),
   UNHEALTHY_SERVERS("servers", true),
-  TIME_BOUNDARY_DIFFERENCE("milliseconds", false);
+  TIME_BOUNDARY_DIFFERENCE("milliseconds", false),
+  JVM_HEAP_USED_BYTES("bytes", true);
 
   private final String _brokerGaugeName;
   private final String _unit;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
index 17f9ae53542..606eeb05a69 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
@@ -32,6 +32,8 @@ public enum BrokerMeter implements AbstractMetrics.Meter {
   QUERIES("queries", false),
 
   // These metrics track the exceptions caught during query execution in broker side.
+  // Query rejected by Jersey thread pool executor
+  QUERY_REJECTED_EXCEPTIONS("exceptions", true),
   // Query compile phase.
   REQUEST_COMPILATION_EXCEPTIONS("exceptions", true),
   // Get resource phase.
@@ -40,6 +42,8 @@ public enum BrokerMeter implements AbstractMetrics.Meter {
   QUERY_VALIDATION_EXCEPTIONS("exceptions", false),
   // Query validation phase.
   UNKNOWN_COLUMN_EXCEPTIONS("exceptions", false),
+  // Queries preempted by accountant
+  QUERIES_KILLED("query", true),
   // Scatter phase.
   NO_SERVER_FOUND_EXCEPTIONS("exceptions", false),
   REQUEST_TIMEOUT_BEFORE_SCATTERED_EXCEPTIONS("exceptions", false),
@@ -51,6 +55,8 @@ public enum BrokerMeter implements AbstractMetrics.Meter {
   DATA_TABLE_DESERIALIZATION_EXCEPTIONS("exceptions", false),
   // Reduce responses phase.
   RESPONSE_MERGE_EXCEPTIONS("exceptions", false),
+  HEAP_CRITICAL_LEVEL_EXCEEDED("count", true),
+  HEAP_PANIC_LEVEL_EXCEEDED("count", true),
 
   // These metrics track the number of bad broker responses.
   // This metric track the number of broker responses with processing exceptions inside.
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java
index 0a1c995dbb8..cf6a310eb21 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMetrics.java
@@ -20,6 +20,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.concurrent.atomic.AtomicReference;
 import org.apache.pinot.spi.metrics.PinotMetricsRegistry;
 
 import static org.apache.pinot.spi.utils.CommonConstants.Broker.DEFAULT_ENABLE_TABLE_LEVEL_METRICS;
@@ -32,6 +33,24 @@
  */
 public class BrokerMetrics extends AbstractMetrics<BrokerQueryPhase, BrokerMeter, BrokerGauge, BrokerTimer> {
 
+  private static final AtomicReference<BrokerMetrics> BROKER_METRICS_INSTANCE = new AtomicReference<>();
+
+  /**
+   * register the brokerMetrics onto this class, so that we don't need to pass it down as a parameter
+   */
+  public static boolean register(BrokerMetrics brokerMetrics) {
+    return BROKER_METRICS_INSTANCE.compareAndSet(null, brokerMetrics);
+  }
+
+  /**
+   * should always call after registration
+   */
+  public static BrokerMetrics get() {
+    BrokerMetrics ret = BROKER_METRICS_INSTANCE.get();
+    assert ret != null;
+    return ret;
+  }
+
   /**
    * Constructs the broker metrics.
    *
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java
index edd70ee6425..8de33d0e41a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ControllerMeter.java
@@ -56,7 +56,9 @@ public enum ControllerMeter implements AbstractMetrics.Meter {
   NUMBER_REVERT_REPLACE_FAILURE("NumRevertReplaceFailure", false),
   CRON_SCHEDULER_JOB_TRIGGERED("cronSchedulerJobTriggered", false),
   CRON_SCHEDULER_JOB_SKIPPED("cronSchedulerJobSkipped", false),
+  LLC_SEGMENTS_DEEP_STORE_UPLOAD_RETRY_SUCCESS("LLCSegmentDeepStoreUploadRetrySuccess", false),
   LLC_SEGMENTS_DEEP_STORE_UPLOAD_RETRY_ERROR("LLCSegmentDeepStoreUploadRetryError", false),
+  SEGMENT_MISSING_DEEP_STORE_LINK("RealtimeSegmentMissingDeepStoreLink", false),
   NUMBER_ADHOC_TASKS_SUBMITTED("adhocTasks", false);
 
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java
index db25ca0f173..376f86e55e5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java
@@ -24,12 +24,14 @@
 public enum MinionMeter implements AbstractMetrics.Meter {
   HEALTH_CHECK_GOOD_CALLS("healthChecks", true),
   HEALTH_CHECK_BAD_CALLS("healthChecks", true),
-
+  NUMBER_TASKS("tasks", false),
   NUMBER_TASKS_EXECUTED("tasks", false),
   NUMBER_TASKS_COMPLETED("tasks", false),
   NUMBER_TASKS_CANCELLED("tasks", false),
   NUMBER_TASKS_FAILED("tasks", false),
-  NUMBER_TASKS_FATAL_FAILED("tasks", false);
+  NUMBER_TASKS_FATAL_FAILED("tasks", false),
+  SEGMENT_UPLOAD_FAIL_COUNT("segments", false),
+  SEGMENT_DOWNLOAD_FAIL_COUNT("segments", false);
 
   private final String _meterName;
   private final String _unit;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java
index 7dd52e90eae..210d95fc2f5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerGauge.java
@@ -46,17 +46,25 @@ public enum ServerGauge implements AbstractMetrics.Gauge {
   DEDUP_PRIMARY_KEYS_COUNT("dedupPrimaryKeysCount", false),
   CONSUMPTION_QUOTA_UTILIZATION("ratio", false),
   JVM_HEAP_USED_BYTES("bytes", true),
-  // Ingestion delay metric
-  REALTIME_INGESTION_DELAY_MS("milliseconds", false);
+  // Ingestion delay metrics
+  REALTIME_INGESTION_DELAY_MS("milliseconds", false),
+  END_TO_END_REALTIME_INGESTION_DELAY_MS("milliseconds", false);
 
   private final String _gaugeName;
   private final String _unit;
   private final boolean _global;
 
+  private final String _description;
+
   ServerGauge(String unit, boolean global) {
+    this(unit, global, "");
+  }
+
+  ServerGauge(String unit, boolean global, String description) {
     _unit = unit;
     _global = global;
     _gaugeName = Utils.toCamelCase(name().toLowerCase());
+    _description = description;
   }
 
   @Override
@@ -78,4 +86,9 @@ public String getUnit() {
   public boolean isGlobal() {
     return _global;
   }
+
+  @Override
+  public String getDescription() {
+    return _description;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
index cce863623ec..4681b41659d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerMeter.java
@@ -35,6 +35,7 @@ public enum ServerMeter implements AbstractMetrics.Meter {
   DELETED_SEGMENT_COUNT("segments", false),
   DELETE_TABLE_FAILURES("tables", false),
   REALTIME_ROWS_CONSUMED("rows", true),
+  REALTIME_ROWS_FILTERED("rows", false),
   INVALID_REALTIME_ROWS_DROPPED("rows", false),
   INCOMPLETE_REALTIME_ROWS_CONSUMED("rows", false),
   REALTIME_CONSUMPTION_EXCEPTIONS("exceptions", true),
@@ -45,6 +46,7 @@ public enum ServerMeter implements AbstractMetrics.Meter {
   UPSERT_KEYS_IN_WRONG_SEGMENT("rows", false),
   PARTIAL_UPSERT_OUT_OF_ORDER("rows", false),
   PARTIAL_UPSERT_KEYS_NOT_REPLACED("rows", false),
+  UPSERT_OUT_OF_ORDER("rows", false),
   ROWS_WITH_ERRORS("rows", false),
   LLC_CONTROLLER_RESPONSE_NOT_SENT("messages", true),
   LLC_CONTROLLER_RESPONSE_COMMIT("messages", true),
@@ -68,24 +70,36 @@ public enum ServerMeter implements AbstractMetrics.Meter {
   RELOAD_FAILURES("segments", false),
   REFRESH_FAILURES("segments", false),
   UNTAR_FAILURES("segments", false),
-  SEGMENT_STREAMED_DOWNLOAD_UNTAR_FAILURES("segments", false),
+  SEGMENT_STREAMED_DOWNLOAD_UNTAR_FAILURES("segments", false, "Counts the number of segment "
+      + "fetch failures"),
   SEGMENT_DIR_MOVEMENT_FAILURES("segments", false),
   SEGMENT_DOWNLOAD_FAILURES("segments", false),
   SEGMENT_DOWNLOAD_FROM_REMOTE_FAILURES("segments", false),
   SEGMENT_DOWNLOAD_FROM_PEERS_FAILURES("segments", false),
+  SEGMENT_UPLOAD_FAILURE("segments", false),
+  SEGMENT_UPLOAD_SUCCESS("segments", false),
+  // Emitted only by Server to Deep-store segment uploader.
+  SEGMENT_UPLOAD_TIMEOUT("segments", false),
   NUM_RESIZES("numResizes", false),
   NO_TABLE_ACCESS("tables", true),
   INDEXING_FAILURES("attributeValues", true),
 
   READINESS_CHECK_OK_CALLS("readinessCheck", true),
   READINESS_CHECK_BAD_CALLS("readinessCheck", true),
-  QUERIES_PREEMPTED("query", true),
+  QUERIES_KILLED("query", true),
+  HEAP_CRITICAL_LEVEL_EXCEEDED("count", true),
+  HEAP_PANIC_LEVEL_EXCEEDED("count", true),
 
   // Netty connection metrics
   NETTY_CONNECTION_BYTES_RECEIVED("nettyConnection", true),
   NETTY_CONNECTION_RESPONSES_SENT("nettyConnection", true),
   NETTY_CONNECTION_BYTES_SENT("nettyConnection", true),
 
+  // GRPC related metrics
+  GRPC_QUERIES("grpcQueries", true),
+  GRPC_BYTES_RECEIVED("grpcBytesReceived", true),
+  GRPC_BYTES_SENT("grpcBytesSent", true),
+
   NUM_SEGMENTS_PRUNED_INVALID("numSegmentsPrunedInvalid", false),
   NUM_SEGMENTS_PRUNED_BY_LIMIT("numSegmentsPrunedByLimit", false),
   NUM_SEGMENTS_PRUNED_BY_VALUE("numSegmentsPrunedByValue", false),;
@@ -93,11 +107,17 @@ public enum ServerMeter implements AbstractMetrics.Meter {
   private final String _meterName;
   private final String _unit;
   private final boolean _global;
+  private final String _description;
 
   ServerMeter(String unit, boolean global) {
+    this(unit, global, "");
+  }
+
+  ServerMeter(String unit, boolean global, String description) {
     _unit = unit;
     _global = global;
     _meterName = Utils.toCamelCase(name().toLowerCase());
+    _description = description;
   }
 
   @Override
@@ -119,4 +139,9 @@ public String getUnit() {
   public boolean isGlobal() {
     return _global;
   }
+
+  @Override
+  public String getDescription() {
+    return _description;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java
index b6d83bcf6c7..aa0952730bd 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/ServerTimer.java
@@ -26,31 +26,41 @@
  *
  */
 public enum ServerTimer implements AbstractMetrics.Timer {
-  // metric tracking the freshness lag for consuming segments
-  FRESHNESS_LAG_MS("freshnessLagMs", false),
+  FRESHNESS_LAG_MS("freshnessLagMs", false, "Tracks the freshness lag for consuming segments. "
+      + "Computed as the time-period between when the data was last updated in the table and the current time."),
 
-  // The latency of sending the response from server to broker
-  NETTY_CONNECTION_SEND_RESPONSE_LATENCY("nettyConnection", false),
+  NETTY_CONNECTION_SEND_RESPONSE_LATENCY("nettyConnection", false,
+      "Latency of sending the response from server to broker. Computed as the time spent in sending "
+          + "response to brokers after the results are available."),
 
-  // Query cost (execution thread cpu time) for query processing on server
-  EXECUTION_THREAD_CPU_TIME_NS("nanoseconds", false),
+  EXECUTION_THREAD_CPU_TIME_NS("nanoseconds", false, "Query cost (execution thread cpu time) "
+      + "for query processing on server. Computed as time spent by all threads processing query and results "
+      + "(doesn't includes time spent in system activities)"),
 
-  // Query cost (system activities cpu time) for query processing on server
-  SYSTEM_ACTIVITIES_CPU_TIME_NS("nanoseconds", false),
+  SYSTEM_ACTIVITIES_CPU_TIME_NS("nanoseconds", false, "Query cost (system activities cpu time) "
+      + "for query processing on server. Computed as the time spent in processing query on the servers "
+      + "(only counts system acitivities such as GC, OS paging etc.)"),
 
-  // Query cost (response serialization cpu time) for query processing on server
-  RESPONSE_SER_CPU_TIME_NS("nanoseconds", false),
+  RESPONSE_SER_CPU_TIME_NS("nanoseconds", false, "Query cost (response serialization cpu time) "
+      + "for query processing on server. Computed as the time spent in serializing query response on servers"),
 
-  // Total query cost (thread cpu time + system activities cpu time + response serialization cpu time) for query
-  // processing on server
-  TOTAL_CPU_TIME_NS("nanoseconds", false);
+  SEGMENT_UPLOAD_TIME_MS("milliseconds", false),
+
+  TOTAL_CPU_TIME_NS("nanoseconds", false, "Total query cost (thread cpu time + system "
+      + "activities cpu time + response serialization cpu time) for query processing on server.");
 
   private final String _timerName;
   private final boolean _global;
+  private final String _description;
 
   ServerTimer(String unit, boolean global) {
+    this(unit, global, "");
+  }
+
+  ServerTimer(String unit, boolean global, String description) {
     _global = global;
     _timerName = Utils.toCamelCase(name().toLowerCase());
+    _description = description;
   }
 
   @Override
@@ -67,4 +77,9 @@ public String getTimerName() {
   public boolean isGlobal() {
     return _global;
   }
+
+  @Override
+  public String getDescription() {
+    return _description;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java b/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java
index 83c271ee166..c6f4864ccb4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java
@@ -25,25 +25,34 @@
 package org.apache.pinot.common.request;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
-public class DataSource implements org.apache.thrift.TBase<DataSource, DataSource._Fields>, java.io.Serializable, Cloneable, Comparable<DataSource> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataSource");
-
-  private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SUBQUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("subquery", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DataSourceStandardSchemeFactory();
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2023-03-14")
+public class DataSource
+    implements org.apache.thrift.TBase<DataSource, DataSource._Fields>, java.io.Serializable, Cloneable,
+               Comparable<DataSource> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC =
+      new org.apache.thrift.protocol.TStruct("DataSource");
+
+  private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short) 1);
+  private static final org.apache.thrift.protocol.TField SUBQUERY_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("subquery", org.apache.thrift.protocol.TType.STRUCT, (short) 2);
+  private static final org.apache.thrift.protocol.TField JOIN_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("join", org.apache.thrift.protocol.TType.STRUCT, (short) 3);
+
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY =
+      new DataSourceStandardSchemeFactory();
   private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DataSourceTupleSchemeFactory();
 
   public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // optional
   public @org.apache.thrift.annotation.Nullable PinotQuery subquery; // optional
+  public @org.apache.thrift.annotation.Nullable Join join; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    TABLE_NAME((short)1, "tableName"),
-    SUBQUERY((short)2, "subquery");
+    TABLE_NAME((short) 1, "tableName"), SUBQUERY((short) 2, "subquery"), JOIN((short) 3, "join");
 
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName =
+        new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -56,11 +65,13 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
      */
     @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
+      switch (fieldId) {
         case 1: // TABLE_NAME
           return TABLE_NAME;
         case 2: // SUBQUERY
           return SUBQUERY;
+        case 3: // JOIN
+          return JOIN;
         default:
           return null;
       }
@@ -72,7 +83,9 @@ public static _Fields findByThriftId(int fieldId) {
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) {
+        throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      }
       return fields;
     }
 
@@ -92,24 +105,33 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.TABLE_NAME,_Fields.SUBQUERY};
+  private static final _Fields optionals[] = {_Fields.TABLE_NAME, _Fields.SUBQUERY, _Fields.JOIN};
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SUBQUERY, new org.apache.thrift.meta_data.FieldMetaData("subquery", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "PinotQuery")));
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap =
+        new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.TABLE_NAME,
+        new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.SUBQUERY,
+        new org.apache.thrift.meta_data.FieldMetaData("subquery", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PinotQuery.class)));
+    tmpMap.put(_Fields.JOIN,
+        new org.apache.thrift.meta_data.FieldMetaData("join", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Join")));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataSource.class, metaDataMap);
   }
@@ -127,8 +149,12 @@ public DataSource(DataSource other) {
     if (other.isSetSubquery()) {
       this.subquery = new PinotQuery(other.subquery);
     }
+    if (other.isSetJoin()) {
+      this.join = new Join(other.join);
+    }
   }
 
+  @Override
   public DataSource deepCopy() {
     return new DataSource(this);
   }
@@ -137,6 +163,7 @@ public DataSource deepCopy() {
   public void clear() {
     this.tableName = null;
     this.subquery = null;
+    this.join = null;
   }
 
   @org.apache.thrift.annotation.Nullable
@@ -189,84 +216,141 @@ public void setSubqueryIsSet(boolean value) {
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
+  public Join getJoin() {
+    return this.join;
+  }
+
+  public DataSource setJoin(@org.apache.thrift.annotation.Nullable Join join) {
+    this.join = join;
+    return this;
+  }
+
+  public void unsetJoin() {
+    this.join = null;
+  }
+
+  /** Returns true if field join is set (has been assigned a value) and false otherwise */
+  public boolean isSetJoin() {
+    return this.join != null;
+  }
+
+  public void setJoinIsSet(boolean value) {
+    if (!value) {
+      this.join = null;
+    }
+  }
+
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
-    case TABLE_NAME:
-      if (value == null) {
-        unsetTableName();
-      } else {
-        setTableName((java.lang.String)value);
-      }
-      break;
+      case TABLE_NAME:
+        if (value == null) {
+          unsetTableName();
+        } else {
+          setTableName((java.lang.String) value);
+        }
+        break;
 
-    case SUBQUERY:
-      if (value == null) {
-        unsetSubquery();
-      } else {
-        setSubquery((PinotQuery)value);
-      }
-      break;
+      case SUBQUERY:
+        if (value == null) {
+          unsetSubquery();
+        } else {
+          setSubquery((PinotQuery) value);
+        }
+        break;
 
+      case JOIN:
+        if (value == null) {
+          unsetJoin();
+        } else {
+          setJoin((Join) value);
+        }
+        break;
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
-    case TABLE_NAME:
-      return getTableName();
+      case TABLE_NAME:
+        return getTableName();
 
-    case SUBQUERY:
-      return getSubquery();
+      case SUBQUERY:
+        return getSubquery();
 
+      case JOIN:
+        return getJoin();
     }
     throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
-    case TABLE_NAME:
-      return isSetTableName();
-    case SUBQUERY:
-      return isSetSubquery();
+      case TABLE_NAME:
+        return isSetTableName();
+      case SUBQUERY:
+        return isSetSubquery();
+      case JOIN:
+        return isSetJoin();
     }
     throw new java.lang.IllegalStateException();
   }
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that instanceof DataSource)
-      return this.equals((DataSource)that);
+    if (that instanceof DataSource) {
+      return this.equals((DataSource) that);
+    }
     return false;
   }
 
   public boolean equals(DataSource that) {
-    if (that == null)
+    if (that == null) {
       return false;
-    if (this == that)
+    }
+    if (this == that) {
       return true;
+    }
 
     boolean this_present_tableName = true && this.isSetTableName();
     boolean that_present_tableName = true && that.isSetTableName();
     if (this_present_tableName || that_present_tableName) {
-      if (!(this_present_tableName && that_present_tableName))
+      if (!(this_present_tableName && that_present_tableName)) {
         return false;
-      if (!this.tableName.equals(that.tableName))
+      }
+      if (!this.tableName.equals(that.tableName)) {
         return false;
+      }
     }
 
     boolean this_present_subquery = true && this.isSetSubquery();
     boolean that_present_subquery = true && that.isSetSubquery();
     if (this_present_subquery || that_present_subquery) {
-      if (!(this_present_subquery && that_present_subquery))
+      if (!(this_present_subquery && that_present_subquery)) {
+        return false;
+      }
+      if (!this.subquery.equals(that.subquery)) {
+        return false;
+      }
+    }
+
+    boolean this_present_join = true && this.isSetJoin();
+    boolean that_present_join = true && that.isSetJoin();
+    if (this_present_join || that_present_join) {
+      if (!(this_present_join && that_present_join)) {
         return false;
-      if (!this.subquery.equals(that.subquery))
+      }
+      if (!this.join.equals(that.join)) {
         return false;
+      }
     }
 
     return true;
@@ -277,12 +361,19 @@ public int hashCode() {
     int hashCode = 1;
 
     hashCode = hashCode * 8191 + ((isSetTableName()) ? 131071 : 524287);
-    if (isSetTableName())
+    if (isSetTableName()) {
       hashCode = hashCode * 8191 + tableName.hashCode();
+    }
 
     hashCode = hashCode * 8191 + ((isSetSubquery()) ? 131071 : 524287);
-    if (isSetSubquery())
+    if (isSetSubquery()) {
       hashCode = hashCode * 8191 + subquery.hashCode();
+    }
+
+    hashCode = hashCode * 8191 + ((isSetJoin()) ? 131071 : 524287);
+    if (isSetJoin()) {
+      hashCode = hashCode * 8191 + join.hashCode();
+    }
 
     return hashCode;
   }
@@ -315,19 +406,34 @@ public int compareTo(DataSource other) {
         return lastComparison;
       }
     }
+    lastComparison = java.lang.Boolean.compare(isSetJoin(), other.isSetJoin());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetJoin()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.join, other.join);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+  @Override
+  public void read(org.apache.thrift.protocol.TProtocol iprot)
+      throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  @Override
+  public void write(org.apache.thrift.protocol.TProtocol oprot)
+      throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
 
@@ -346,7 +452,9 @@ public java.lang.String toString() {
       first = false;
     }
     if (isSetSubquery()) {
-      if (!first) sb.append(", ");
+      if (!first) {
+        sb.append(", ");
+      }
       sb.append("subquery:");
       if (this.subquery == null) {
         sb.append("null");
@@ -355,16 +463,33 @@ public java.lang.String toString() {
       }
       first = false;
     }
+    if (isSetJoin()) {
+      if (!first) {
+        sb.append(", ");
+      }
+      sb.append("join:");
+      if (this.join == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.join);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate()
+      throws org.apache.thrift.TException {
     // check for required fields
     // check for sub-struct validity
+    if (subquery != null) {
+      subquery.validate();
+    }
   }
 
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+  private void writeObject(java.io.ObjectOutputStream out)
+      throws java.io.IOException {
     try {
       write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
     } catch (org.apache.thrift.TException te) {
@@ -372,7 +497,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in)
+      throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -381,6 +507,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class DataSourceStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DataSourceStandardScheme getScheme() {
       return new DataSourceStandardScheme();
     }
@@ -388,13 +515,14 @@ public DataSourceStandardScheme getScheme() {
 
   private static class DataSourceStandardScheme extends org.apache.thrift.scheme.StandardScheme<DataSource> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct) throws org.apache.thrift.TException {
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct)
+        throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
-      while (true)
-      {
+      while (true) {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -402,7 +530,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.tableName = iprot.readString();
               struct.setTableNameIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -411,7 +539,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct)
               struct.subquery = new PinotQuery();
               struct.subquery.read(iprot);
               struct.setSubqueryIsSet(true);
-            } else { 
+            } else {
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // JOIN
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.join = new Join();
+              struct.join.read(iprot);
+              struct.setJoinIsSet(true);
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -426,7 +563,9 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct)
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, DataSource struct) throws org.apache.thrift.TException {
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol oprot, DataSource struct)
+        throws org.apache.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -444,13 +583,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DataSource struct)
           oprot.writeFieldEnd();
         }
       }
+      if (struct.join != null) {
+        if (struct.isSetJoin()) {
+          oprot.writeFieldBegin(JOIN_FIELD_DESC);
+          struct.join.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
-
   }
 
   private static class DataSourceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public DataSourceTupleScheme getScheme() {
       return new DataSourceTupleScheme();
     }
@@ -459,7 +605,8 @@ public DataSourceTupleScheme getScheme() {
   private static class DataSourceTupleScheme extends org.apache.thrift.scheme.TupleScheme<DataSource> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, DataSource struct) throws org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol prot, DataSource struct)
+        throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetTableName()) {
@@ -468,19 +615,26 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DataSource struct)
       if (struct.isSetSubquery()) {
         optionals.set(1);
       }
-      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetJoin()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
       if (struct.isSetTableName()) {
         oprot.writeString(struct.tableName);
       }
       if (struct.isSetSubquery()) {
         struct.subquery.write(oprot);
       }
+      if (struct.isSetJoin()) {
+        struct.join.write(oprot);
+      }
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, DataSource struct) throws org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol prot, DataSource struct)
+        throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(2);
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.tableName = iprot.readString();
         struct.setTableNameIsSet(true);
@@ -490,11 +644,17 @@ public void read(org.apache.thrift.protocol.TProtocol prot, DataSource struct) t
         struct.subquery.read(iprot);
         struct.setSubqueryIsSet(true);
       }
+      if (incoming.get(2)) {
+        struct.join = new Join();
+        struct.join.read(iprot);
+        struct.setJoinIsSet(true);
+      }
     }
   }
 
   private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY
+        : TUPLE_SCHEME_FACTORY).getScheme();
   }
 }
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java
index e1f5dea0c88..219dbc5b87a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.15.0)
+ * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -25,7 +25,7 @@
 package org.apache.pinot.common.request;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.17.0)", date = "2023-02-08")
 public class Expression implements org.apache.thrift.TBase<Expression, Expression._Fields>, java.io.Serializable, Cloneable, Comparable<Expression> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Expression");
 
@@ -38,7 +38,7 @@ public class Expression implements org.apache.thrift.TBase<Expression, Expressio
   private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExpressionTupleSchemeFactory();
 
   /**
-   * 
+   *
    * @see ExpressionType
    */
   public @org.apache.thrift.annotation.Nullable ExpressionType type; // required
@@ -49,7 +49,7 @@ public class Expression implements org.apache.thrift.TBase<Expression, Expressio
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
-     * 
+     *
      * @see ExpressionType
      */
     TYPE((short)1, "type"),
@@ -110,10 +110,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -124,14 +126,14 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+    tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED,
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ExpressionType.class)));
-    tmpMap.put(_Fields.FUNCTION_CALL, new org.apache.thrift.meta_data.FieldMetaData("functionCall", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "Function")));
-    tmpMap.put(_Fields.LITERAL, new org.apache.thrift.meta_data.FieldMetaData("literal", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "Literal")));
-    tmpMap.put(_Fields.IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("identifier", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "Identifier")));
+    tmpMap.put(_Fields.FUNCTION_CALL, new org.apache.thrift.meta_data.FieldMetaData("functionCall", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Function.class)));
+    tmpMap.put(_Fields.LITERAL, new org.apache.thrift.meta_data.FieldMetaData("literal", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Literal.class)));
+    tmpMap.put(_Fields.IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("identifier", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Identifier.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Expression.class, metaDataMap);
   }
@@ -140,7 +142,7 @@ public Expression() {
   }
 
   public Expression(
-    ExpressionType type)
+      ExpressionType type)
   {
     this();
     this.type = type;
@@ -164,6 +166,7 @@ public Expression(Expression other) {
     }
   }
 
+  @Override
   public Expression deepCopy() {
     return new Expression(this);
   }
@@ -177,7 +180,7 @@ public void clear() {
   }
 
   /**
-   * 
+   *
    * @see ExpressionType
    */
   @org.apache.thrift.annotation.Nullable
@@ -186,7 +189,7 @@ public ExpressionType getType() {
   }
 
   /**
-   * 
+   *
    * @see ExpressionType
    */
   public Expression setType(@org.apache.thrift.annotation.Nullable ExpressionType type) {
@@ -284,77 +287,80 @@ public void setIdentifierIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
-    case TYPE:
-      if (value == null) {
-        unsetType();
-      } else {
-        setType((ExpressionType)value);
-      }
-      break;
+      case TYPE:
+        if (value == null) {
+          unsetType();
+        } else {
+          setType((ExpressionType)value);
+        }
+        break;
 
-    case FUNCTION_CALL:
-      if (value == null) {
-        unsetFunctionCall();
-      } else {
-        setFunctionCall((Function)value);
-      }
-      break;
+      case FUNCTION_CALL:
+        if (value == null) {
+          unsetFunctionCall();
+        } else {
+          setFunctionCall((Function)value);
+        }
+        break;
 
-    case LITERAL:
-      if (value == null) {
-        unsetLiteral();
-      } else {
-        setLiteral((Literal)value);
-      }
-      break;
+      case LITERAL:
+        if (value == null) {
+          unsetLiteral();
+        } else {
+          setLiteral((Literal)value);
+        }
+        break;
 
-    case IDENTIFIER:
-      if (value == null) {
-        unsetIdentifier();
-      } else {
-        setIdentifier((Identifier)value);
-      }
-      break;
+      case IDENTIFIER:
+        if (value == null) {
+          unsetIdentifier();
+        } else {
+          setIdentifier((Identifier)value);
+        }
+        break;
 
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
-    case TYPE:
-      return getType();
+      case TYPE:
+        return getType();
 
-    case FUNCTION_CALL:
-      return getFunctionCall();
+      case FUNCTION_CALL:
+        return getFunctionCall();
 
-    case LITERAL:
-      return getLiteral();
+      case LITERAL:
+        return getLiteral();
 
-    case IDENTIFIER:
-      return getIdentifier();
+      case IDENTIFIER:
+        return getIdentifier();
 
     }
     throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
-    case TYPE:
-      return isSetType();
-    case FUNCTION_CALL:
-      return isSetFunctionCall();
-    case LITERAL:
-      return isSetLiteral();
-    case IDENTIFIER:
-      return isSetIdentifier();
+      case TYPE:
+        return isSetType();
+      case FUNCTION_CALL:
+        return isSetFunctionCall();
+      case LITERAL:
+        return isSetLiteral();
+      case IDENTIFIER:
+        return isSetIdentifier();
     }
     throw new java.lang.IllegalStateException();
   }
@@ -486,14 +492,17 @@ public int compareTo(Expression other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -550,6 +559,12 @@ public void validate() throws org.apache.thrift.TException {
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' was not present! Struct: " + toString());
     }
     // check for sub-struct validity
+    if (functionCall != null) {
+      functionCall.validate();
+    }
+    if (identifier != null) {
+      identifier.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -569,6 +584,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class ExpressionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ExpressionStandardScheme getScheme() {
       return new ExpressionStandardScheme();
     }
@@ -576,13 +592,14 @@ public ExpressionStandardScheme getScheme() {
 
   private static class ExpressionStandardScheme extends org.apache.thrift.scheme.StandardScheme<Expression> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -590,7 +607,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.type = org.apache.pinot.common.request.ExpressionType.findByValue(iprot.readI32());
               struct.setTypeIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -599,7 +616,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct)
               struct.functionCall = new Function();
               struct.functionCall.read(iprot);
               struct.setFunctionCallIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -608,7 +625,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct)
               struct.literal = new Literal();
               struct.literal.read(iprot);
               struct.setLiteralIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -617,7 +634,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct)
               struct.identifier = new Identifier();
               struct.identifier.read(iprot);
               struct.setIdentifierIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -632,6 +649,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct)
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Expression struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -669,6 +687,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Expression struct)
   }
 
   private static class ExpressionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public ExpressionTupleScheme getScheme() {
       return new ExpressionTupleScheme();
     }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java b/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java
index 9e1d9823903..8822fbcbff5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.15.0)
+ * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -25,7 +25,7 @@
 package org.apache.pinot.common.request;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.17.0)", date = "2023-02-08")
 public enum ExpressionType implements org.apache.thrift.TEnum {
   LITERAL(0),
   IDENTIFIER(1),
@@ -40,6 +40,7 @@ private ExpressionType(int value) {
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
+  @Override
   public int getValue() {
     return value;
   }
@@ -49,7 +50,7 @@ public int getValue() {
    * @return null if the value is not found.
    */
   @org.apache.thrift.annotation.Nullable
-  public static ExpressionType findByValue(int value) { 
+  public static ExpressionType findByValue(int value) {
     switch (value) {
       case 0:
         return LITERAL;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java
index eaec734de15..12a8b8b295a 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.15.0)
+ * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -25,7 +25,7 @@
 package org.apache.pinot.common.request;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.17.0)", date = "2023-02-08")
 public class Function implements org.apache.thrift.TBase<Function, Function._Fields>, java.io.Serializable, Cloneable, Comparable<Function> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Function");
 
@@ -92,10 +92,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -106,10 +108,10 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+    tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.REQUIRED,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.OPERANDS, new org.apache.thrift.meta_data.FieldMetaData("operands", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+    tmpMap.put(_Fields.OPERANDS, new org.apache.thrift.meta_data.FieldMetaData("operands", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Function.class, metaDataMap);
@@ -119,7 +121,7 @@ public Function() {
   }
 
   public Function(
-    java.lang.String operator)
+      java.lang.String operator)
   {
     this();
     this.operator = operator;
@@ -141,6 +143,7 @@ public Function(Function other) {
     }
   }
 
+  @Override
   public Function deepCopy() {
     return new Function(this);
   }
@@ -217,51 +220,54 @@ public void setOperandsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
-    case OPERATOR:
-      if (value == null) {
-        unsetOperator();
-      } else {
-        setOperator((java.lang.String)value);
-      }
-      break;
+      case OPERATOR:
+        if (value == null) {
+          unsetOperator();
+        } else {
+          setOperator((java.lang.String)value);
+        }
+        break;
 
-    case OPERANDS:
-      if (value == null) {
-        unsetOperands();
-      } else {
-        setOperands((java.util.List<Expression>)value);
-      }
-      break;
+      case OPERANDS:
+        if (value == null) {
+          unsetOperands();
+        } else {
+          setOperands((java.util.List<Expression>)value);
+        }
+        break;
 
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
-    case OPERATOR:
-      return getOperator();
+      case OPERATOR:
+        return getOperator();
 
-    case OPERANDS:
-      return getOperands();
+      case OPERANDS:
+        return getOperands();
 
     }
     throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
-    case OPERATOR:
-      return isSetOperator();
-    case OPERANDS:
-      return isSetOperands();
+      case OPERATOR:
+        return isSetOperator();
+      case OPERANDS:
+        return isSetOperands();
     }
     throw new java.lang.IllegalStateException();
   }
@@ -347,14 +353,17 @@ public int compareTo(Function other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -410,6 +419,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class FunctionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FunctionStandardScheme getScheme() {
       return new FunctionStandardScheme();
     }
@@ -417,13 +427,14 @@ public FunctionStandardScheme getScheme() {
 
   private static class FunctionStandardScheme extends org.apache.thrift.scheme.StandardScheme<Function> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -431,7 +442,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) th
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.operator = iprot.readString();
               struct.setOperatorIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -450,7 +461,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) th
                 iprot.readListEnd();
               }
               struct.setOperandsIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -465,6 +476,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) th
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Function struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -495,6 +507,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Function struct) t
   }
 
   private static class FunctionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public FunctionTupleScheme getScheme() {
       return new FunctionTupleScheme();
     }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java
index 3387d144871..307e127f20e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.15.0)
+ * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -25,7 +25,7 @@
 package org.apache.pinot.common.request;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.17.0)", date = "2023-02-08")
 public class Identifier implements org.apache.thrift.TBase<Identifier, Identifier._Fields>, java.io.Serializable, Cloneable, Comparable<Identifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Identifier");
 
@@ -87,10 +87,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -100,7 +102,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Identifier.class, metaDataMap);
@@ -110,7 +112,7 @@ public Identifier() {
   }
 
   public Identifier(
-    java.lang.String name)
+      java.lang.String name)
   {
     this();
     this.name = name;
@@ -125,6 +127,7 @@ public Identifier(Identifier other) {
     }
   }
 
+  @Override
   public Identifier deepCopy() {
     return new Identifier(this);
   }
@@ -159,38 +162,41 @@ public void setNameIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((java.lang.String)value);
-      }
-      break;
+      case NAME:
+        if (value == null) {
+          unsetName();
+        } else {
+          setName((java.lang.String)value);
+        }
+        break;
 
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
-    case NAME:
-      return getName();
+      case NAME:
+        return getName();
 
     }
     throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
-    case NAME:
-      return isSetName();
+      case NAME:
+        return isSetName();
     }
     throw new java.lang.IllegalStateException();
   }
@@ -253,14 +259,17 @@ public int compareTo(Identifier other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -306,6 +315,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class IdentifierStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public IdentifierStandardScheme getScheme() {
       return new IdentifierStandardScheme();
     }
@@ -313,13 +323,14 @@ public IdentifierStandardScheme getScheme() {
 
   private static class IdentifierStandardScheme extends org.apache.thrift.scheme.StandardScheme<Identifier> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, Identifier struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -327,7 +338,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Identifier struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.setNameIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -342,6 +353,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Identifier struct)
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, Identifier struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -358,6 +370,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Identifier struct)
   }
 
   private static class IdentifierTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public IdentifierTupleScheme getScheme() {
       return new IdentifierTupleScheme();
     }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Join.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Join.java
new file mode 100644
index 00000000000..b618ad40477
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Join.java
@@ -0,0 +1,761 @@
+/**
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.15.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.pinot.common.request;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2023-03-14")
+public class Join
+    implements org.apache.thrift.TBase<Join, Join._Fields>, java.io.Serializable, Cloneable, Comparable<Join> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Join");
+
+  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short) 1);
+  private static final org.apache.thrift.protocol.TField LEFT_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("left", org.apache.thrift.protocol.TType.STRUCT, (short) 2);
+  private static final org.apache.thrift.protocol.TField RIGHT_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("right", org.apache.thrift.protocol.TType.STRUCT, (short) 3);
+  private static final org.apache.thrift.protocol.TField CONDITION_FIELD_DESC =
+      new org.apache.thrift.protocol.TField("condition", org.apache.thrift.protocol.TType.STRUCT, (short) 4);
+
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new JoinStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new JoinTupleSchemeFactory();
+
+  public @org.apache.thrift.annotation.Nullable JoinType type; // required
+  public @org.apache.thrift.annotation.Nullable DataSource left; // required
+  public @org.apache.thrift.annotation.Nullable DataSource right; // required
+  public @org.apache.thrift.annotation.Nullable Expression condition; // optional
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    TYPE((short) 1, "type"), LEFT((short) 2, "left"), RIGHT((short) 3, "right"), CONDITION((short) 4, "condition");
+
+    private static final java.util.Map<java.lang.String, _Fields> byName =
+        new java.util.HashMap<java.lang.String, _Fields>();
+
+    static {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByThriftId(int fieldId) {
+      switch (fieldId) {
+        case 1: // TYPE
+          return TYPE;
+        case 2: // LEFT
+          return LEFT;
+        case 3: // RIGHT
+          return RIGHT;
+        case 4: // CONDITION
+          return CONDITION;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) {
+        throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      }
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final java.lang.String _fieldName;
+
+    _Fields(short thriftId, java.lang.String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    @Override
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    @Override
+    public java.lang.String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final _Fields optionals[] = {_Fields.CONDITION};
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+
+  static {
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap =
+        new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.TYPE,
+        new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.ENUM, "JoinType")));
+    tmpMap.put(_Fields.LEFT,
+        new org.apache.thrift.meta_data.FieldMetaData("left", org.apache.thrift.TFieldRequirementType.REQUIRED,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DataSource.class)));
+    tmpMap.put(_Fields.RIGHT,
+        new org.apache.thrift.meta_data.FieldMetaData("right", org.apache.thrift.TFieldRequirementType.REQUIRED,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DataSource.class)));
+    tmpMap.put(_Fields.CONDITION,
+        new org.apache.thrift.meta_data.FieldMetaData("condition", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression")));
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Join.class, metaDataMap);
+  }
+
+  public Join() {
+  }
+
+  public Join(JoinType type, DataSource left, DataSource right) {
+    this();
+    this.type = type;
+    this.left = left;
+    this.right = right;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public Join(Join other) {
+    if (other.isSetType()) {
+      this.type = other.type;
+    }
+    if (other.isSetLeft()) {
+      this.left = new DataSource(other.left);
+    }
+    if (other.isSetRight()) {
+      this.right = new DataSource(other.right);
+    }
+    if (other.isSetCondition()) {
+      this.condition = new Expression(other.condition);
+    }
+  }
+
+  @Override
+  public Join deepCopy() {
+    return new Join(this);
+  }
+
+  @Override
+  public void clear() {
+    this.type = null;
+    this.left = null;
+    this.right = null;
+    this.condition = null;
+  }
+
+  @org.apache.thrift.annotation.Nullable
+  public JoinType getType() {
+    return this.type;
+  }
+
+  public Join setType(@org.apache.thrift.annotation.Nullable JoinType type) {
+    this.type = type;
+    return this;
+  }
+
+  public void unsetType() {
+    this.type = null;
+  }
+
+  /** Returns true if field type is set (has been assigned a value) and false otherwise */
+  public boolean isSetType() {
+    return this.type != null;
+  }
+
+  public void setTypeIsSet(boolean value) {
+    if (!value) {
+      this.type = null;
+    }
+  }
+
+  @org.apache.thrift.annotation.Nullable
+  public DataSource getLeft() {
+    return this.left;
+  }
+
+  public Join setLeft(@org.apache.thrift.annotation.Nullable DataSource left) {
+    this.left = left;
+    return this;
+  }
+
+  public void unsetLeft() {
+    this.left = null;
+  }
+
+  /** Returns true if field left is set (has been assigned a value) and false otherwise */
+  public boolean isSetLeft() {
+    return this.left != null;
+  }
+
+  public void setLeftIsSet(boolean value) {
+    if (!value) {
+      this.left = null;
+    }
+  }
+
+  @org.apache.thrift.annotation.Nullable
+  public DataSource getRight() {
+    return this.right;
+  }
+
+  public Join setRight(@org.apache.thrift.annotation.Nullable DataSource right) {
+    this.right = right;
+    return this;
+  }
+
+  public void unsetRight() {
+    this.right = null;
+  }
+
+  /** Returns true if field right is set (has been assigned a value) and false otherwise */
+  public boolean isSetRight() {
+    return this.right != null;
+  }
+
+  public void setRightIsSet(boolean value) {
+    if (!value) {
+      this.right = null;
+    }
+  }
+
+  @org.apache.thrift.annotation.Nullable
+  public Expression getCondition() {
+    return this.condition;
+  }
+
+  public Join setCondition(@org.apache.thrift.annotation.Nullable Expression condition) {
+    this.condition = condition;
+    return this;
+  }
+
+  public void unsetCondition() {
+    this.condition = null;
+  }
+
+  /** Returns true if field condition is set (has been assigned a value) and false otherwise */
+  public boolean isSetCondition() {
+    return this.condition != null;
+  }
+
+  public void setConditionIsSet(boolean value) {
+    if (!value) {
+      this.condition = null;
+    }
+  }
+
+  @Override
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+    switch (field) {
+      case TYPE:
+        if (value == null) {
+          unsetType();
+        } else {
+          setType((JoinType) value);
+        }
+        break;
+
+      case LEFT:
+        if (value == null) {
+          unsetLeft();
+        } else {
+          setLeft((DataSource) value);
+        }
+        break;
+
+      case RIGHT:
+        if (value == null) {
+          unsetRight();
+        } else {
+          setRight((DataSource) value);
+        }
+        break;
+
+      case CONDITION:
+        if (value == null) {
+          unsetCondition();
+        } else {
+          setCondition((Expression) value);
+        }
+        break;
+    }
+  }
+
+  @org.apache.thrift.annotation.Nullable
+  @Override
+  public java.lang.Object getFieldValue(_Fields field) {
+    switch (field) {
+      case TYPE:
+        return getType();
+
+      case LEFT:
+        return getLeft();
+
+      case RIGHT:
+        return getRight();
+
+      case CONDITION:
+        return getCondition();
+    }
+    throw new java.lang.IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new java.lang.IllegalArgumentException();
+    }
+
+    switch (field) {
+      case TYPE:
+        return isSetType();
+      case LEFT:
+        return isSetLeft();
+      case RIGHT:
+        return isSetRight();
+      case CONDITION:
+        return isSetCondition();
+    }
+    throw new java.lang.IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(java.lang.Object that) {
+    if (that instanceof Join) {
+      return this.equals((Join) that);
+    }
+    return false;
+  }
+
+  public boolean equals(Join that) {
+    if (that == null) {
+      return false;
+    }
+    if (this == that) {
+      return true;
+    }
+
+    boolean this_present_type = true && this.isSetType();
+    boolean that_present_type = true && that.isSetType();
+    if (this_present_type || that_present_type) {
+      if (!(this_present_type && that_present_type)) {
+        return false;
+      }
+      if (!this.type.equals(that.type)) {
+        return false;
+      }
+    }
+
+    boolean this_present_left = true && this.isSetLeft();
+    boolean that_present_left = true && that.isSetLeft();
+    if (this_present_left || that_present_left) {
+      if (!(this_present_left && that_present_left)) {
+        return false;
+      }
+      if (!this.left.equals(that.left)) {
+        return false;
+      }
+    }
+
+    boolean this_present_right = true && this.isSetRight();
+    boolean that_present_right = true && that.isSetRight();
+    if (this_present_right || that_present_right) {
+      if (!(this_present_right && that_present_right)) {
+        return false;
+      }
+      if (!this.right.equals(that.right)) {
+        return false;
+      }
+    }
+
+    boolean this_present_condition = true && this.isSetCondition();
+    boolean that_present_condition = true && that.isSetCondition();
+    if (this_present_condition || that_present_condition) {
+      if (!(this_present_condition && that_present_condition)) {
+        return false;
+      }
+      if (!this.condition.equals(that.condition)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType()) {
+      hashCode = hashCode * 8191 + type.getValue();
+    }
+
+    hashCode = hashCode * 8191 + ((isSetLeft()) ? 131071 : 524287);
+    if (isSetLeft()) {
+      hashCode = hashCode * 8191 + left.hashCode();
+    }
+
+    hashCode = hashCode * 8191 + ((isSetRight()) ? 131071 : 524287);
+    if (isSetRight()) {
+      hashCode = hashCode * 8191 + right.hashCode();
+    }
+
+    hashCode = hashCode * 8191 + ((isSetCondition()) ? 131071 : 524287);
+    if (isSetCondition()) {
+      hashCode = hashCode * 8191 + condition.hashCode();
+    }
+
+    return hashCode;
+  }
+
+  @Override
+  public int compareTo(Join other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+
+    lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetType()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = java.lang.Boolean.compare(isSetLeft(), other.isSetLeft());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLeft()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.left, other.left);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = java.lang.Boolean.compare(isSetRight(), other.isSetRight());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRight()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.right, other.right);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = java.lang.Boolean.compare(isSetCondition(), other.isSetCondition());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCondition()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.condition, other.condition);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  @org.apache.thrift.annotation.Nullable
+  @Override
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  @Override
+  public void read(org.apache.thrift.protocol.TProtocol iprot)
+      throws org.apache.thrift.TException {
+    scheme(iprot).read(iprot, this);
+  }
+
+  @Override
+  public void write(org.apache.thrift.protocol.TProtocol oprot)
+      throws org.apache.thrift.TException {
+    scheme(oprot).write(oprot, this);
+  }
+
+  @Override
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("Join(");
+    boolean first = true;
+
+    sb.append("type:");
+    if (this.type == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.type);
+    }
+    first = false;
+    if (!first) {
+      sb.append(", ");
+    }
+    sb.append("left:");
+    if (this.left == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.left);
+    }
+    first = false;
+    if (!first) {
+      sb.append(", ");
+    }
+    sb.append("right:");
+    if (this.right == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.right);
+    }
+    first = false;
+    if (isSetCondition()) {
+      if (!first) {
+        sb.append(", ");
+      }
+      sb.append("condition:");
+      if (this.condition == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.condition);
+      }
+      first = false;
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate()
+      throws org.apache.thrift.TException {
+    // check for required fields
+    if (type == null) {
+      throw new org.apache.thrift.protocol.TProtocolException(
+          "Required field 'type' was not present! Struct: " + toString());
+    }
+    if (left == null) {
+      throw new org.apache.thrift.protocol.TProtocolException(
+          "Required field 'left' was not present! Struct: " + toString());
+    }
+    if (right == null) {
+      throw new org.apache.thrift.protocol.TProtocolException(
+          "Required field 'right' was not present! Struct: " + toString());
+    }
+    // check for sub-struct validity
+    if (left != null) {
+      left.validate();
+    }
+    if (right != null) {
+      right.validate();
+    }
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out)
+      throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in)
+      throws java.io.IOException, java.lang.ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class JoinStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
+    public JoinStandardScheme getScheme() {
+      return new JoinStandardScheme();
+    }
+  }
+
+  private static class JoinStandardScheme extends org.apache.thrift.scheme.StandardScheme<Join> {
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol iprot, Join struct)
+        throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true) {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // TYPE
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.type = org.apache.pinot.common.request.JoinType.findByValue(iprot.readI32());
+              struct.setTypeIsSet(true);
+            } else {
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // LEFT
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.left = new DataSource();
+              struct.left.read(iprot);
+              struct.setLeftIsSet(true);
+            } else {
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // RIGHT
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.right = new DataSource();
+              struct.right.read(iprot);
+              struct.setRightIsSet(true);
+            } else {
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // CONDITION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.condition = new Expression();
+              struct.condition.read(iprot);
+              struct.setConditionIsSet(true);
+            } else {
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol oprot, Join struct)
+        throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.type != null) {
+        oprot.writeFieldBegin(TYPE_FIELD_DESC);
+        oprot.writeI32(struct.type.getValue());
+        oprot.writeFieldEnd();
+      }
+      if (struct.left != null) {
+        oprot.writeFieldBegin(LEFT_FIELD_DESC);
+        struct.left.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (struct.right != null) {
+        oprot.writeFieldBegin(RIGHT_FIELD_DESC);
+        struct.right.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (struct.condition != null) {
+        if (struct.isSetCondition()) {
+          oprot.writeFieldBegin(CONDITION_FIELD_DESC);
+          struct.condition.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+  }
+
+  private static class JoinTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
+    public JoinTupleScheme getScheme() {
+      return new JoinTupleScheme();
+    }
+  }
+
+  private static class JoinTupleScheme extends org.apache.thrift.scheme.TupleScheme<Join> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, Join struct)
+        throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      oprot.writeI32(struct.type.getValue());
+      struct.left.write(oprot);
+      struct.right.write(oprot);
+      java.util.BitSet optionals = new java.util.BitSet();
+      if (struct.isSetCondition()) {
+        optionals.set(0);
+      }
+      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetCondition()) {
+        struct.condition.write(oprot);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, Join struct)
+        throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      struct.type = org.apache.pinot.common.request.JoinType.findByValue(iprot.readI32());
+      struct.setTypeIsSet(true);
+      struct.left = new DataSource();
+      struct.left.read(iprot);
+      struct.setLeftIsSet(true);
+      struct.right = new DataSource();
+      struct.right.read(iprot);
+      struct.setRightIsSet(true);
+      java.util.BitSet incoming = iprot.readBitSet(1);
+      if (incoming.get(0)) {
+        struct.condition = new Expression();
+        struct.condition.read(iprot);
+        struct.setConditionIsSet(true);
+      }
+    }
+  }
+
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY
+        : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+}
+
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/JoinType.java b/pinot-common/src/main/java/org/apache/pinot/common/request/JoinType.java
new file mode 100644
index 00000000000..08efcf21bbc
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/JoinType.java
@@ -0,0 +1,67 @@
+/**
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.15.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.pinot.common.request;
+
+
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2023-03-14")
+public enum JoinType implements org.apache.thrift.TEnum {
+  INNER(0),
+  LEFT(1),
+  RIGHT(2),
+  FULL(3);
+
+  private final int value;
+
+  private JoinType(int value) {
+    this.value = value;
+  }
+
+  /**
+   * Get the integer value of this enum value, as defined in the Thrift IDL.
+   */
+  public int getValue() {
+    return value;
+  }
+
+  /**
+   * Find a the enum type by its integer value, as defined in the Thrift IDL.
+   * @return null if the value is not found.
+   */
+  @org.apache.thrift.annotation.Nullable
+  public static JoinType findByValue(int value) {
+    switch (value) {
+      case 0:
+        return INNER;
+      case 1:
+        return LEFT;
+      case 2:
+        return RIGHT;
+      case 3:
+        return FULL;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java
index 6378917b700..fcf523187ab 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.15.0)
+ * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -25,7 +25,7 @@
 package org.apache.pinot.common.request;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.17.0)", date = "2023-02-08")
 public class Literal extends org.apache.thrift.TUnion<Literal, Literal._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Literal");
   private static final org.apache.thrift.protocol.TField BOOL_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("boolValue", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -36,6 +36,7 @@ public class Literal extends org.apache.thrift.TUnion<Literal, Literal._Fields>
   private static final org.apache.thrift.protocol.TField DOUBLE_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("doubleValue", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
   private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRING, (short)7);
   private static final org.apache.thrift.protocol.TField BINARY_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryValue", org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField NULL_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("nullValue", org.apache.thrift.protocol.TType.BOOL, (short)9);
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -46,7 +47,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     LONG_VALUE((short)5, "longValue"),
     DOUBLE_VALUE((short)6, "doubleValue"),
     STRING_VALUE((short)7, "stringValue"),
-    BINARY_VALUE((short)8, "binaryValue");
+    BINARY_VALUE((short)8, "binaryValue"),
+    NULL_VALUE((short)9, "nullValue");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -78,6 +80,8 @@ public static _Fields findByThriftId(int fieldId) {
           return STRING_VALUE;
         case 8: // BINARY_VALUE
           return BINARY_VALUE;
+        case 9: // NULL_VALUE
+          return NULL_VALUE;
         default:
           return null;
       }
@@ -109,10 +113,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -121,22 +127,24 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.BYTE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("byteValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.BYTE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("byteValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
-    tmpMap.put(_Fields.SHORT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("shortValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.SHORT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("shortValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
-    tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.LONG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("longValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.LONG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("longValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("doubleValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("doubleValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BINARY_VALUE, new org.apache.thrift.meta_data.FieldMetaData("binaryValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.BINARY_VALUE, new org.apache.thrift.meta_data.FieldMetaData("binaryValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.NULL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("nullValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Literal.class, metaDataMap);
   }
@@ -152,6 +160,7 @@ public Literal(_Fields setField, java.lang.Object value) {
   public Literal(Literal other) {
     super(other);
   }
+  @Override
   public Literal deepCopy() {
     return new Literal(this);
   }
@@ -210,6 +219,12 @@ public static Literal binaryValue(byte[] value) {
     return x;
   }
 
+  public static Literal nullValue(boolean value) {
+    Literal x = new Literal();
+    x.setNullValue(value);
+    return x;
+  }
+
 
   @Override
   protected void checkType(_Fields setField, java.lang.Object value) throws java.lang.ClassCastException {
@@ -254,6 +269,11 @@ protected void checkType(_Fields setField, java.lang.Object value) throws java.l
           break;
         }
         throw new java.lang.ClassCastException("Was expecting value of type java.nio.ByteBuffer for field 'binaryValue', but got " + value.getClass().getSimpleName());
+      case NULL_VALUE:
+        if (value instanceof java.lang.Boolean) {
+          break;
+        }
+        throw new java.lang.ClassCastException("Was expecting value of type java.lang.Boolean for field 'nullValue', but got " + value.getClass().getSimpleName());
       default:
         throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
     }
@@ -336,6 +356,15 @@ protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TP
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
+        case NULL_VALUE:
+          if (field.type == NULL_VALUE_FIELD_DESC.type) {
+            java.lang.Boolean nullValue;
+            nullValue = iprot.readBool();
+            return nullValue;
+          } else {
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
@@ -380,6 +409,10 @@ protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol opr
         java.nio.ByteBuffer binaryValue = (java.nio.ByteBuffer)value_;
         oprot.writeBinary(binaryValue);
         return;
+      case NULL_VALUE:
+        java.lang.Boolean nullValue = (java.lang.Boolean)value_;
+        oprot.writeBool(nullValue);
+        return;
       default:
         throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
     }
@@ -422,6 +455,10 @@ protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProt
           java.nio.ByteBuffer binaryValue;
           binaryValue = iprot.readBinary();
           return binaryValue;
+        case NULL_VALUE:
+          java.lang.Boolean nullValue;
+          nullValue = iprot.readBool();
+          return nullValue;
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
@@ -465,6 +502,10 @@ protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot)
         java.nio.ByteBuffer binaryValue = (java.nio.ByteBuffer)value_;
         oprot.writeBinary(binaryValue);
         return;
+      case NULL_VALUE:
+        java.lang.Boolean nullValue = (java.lang.Boolean)value_;
+        oprot.writeBool(nullValue);
+        return;
       default:
         throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
     }
@@ -489,6 +530,8 @@ protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
         return STRING_VALUE_FIELD_DESC;
       case BINARY_VALUE:
         return BINARY_VALUE_FIELD_DESC;
+      case NULL_VALUE:
+        return NULL_VALUE_FIELD_DESC;
       default:
         throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
     }
@@ -505,6 +548,7 @@ protected _Fields enumForId(short id) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
@@ -624,6 +668,19 @@ public void setBinaryValue(java.nio.ByteBuffer value) {
     value_ = java.util.Objects.requireNonNull(value,"_Fields.BINARY_VALUE");
   }
 
+  public boolean getNullValue() {
+    if (getSetField() == _Fields.NULL_VALUE) {
+      return (java.lang.Boolean)getFieldValue();
+    } else {
+      throw new java.lang.RuntimeException("Cannot get field 'nullValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  public void setNullValue(boolean value) {
+    setField_ = _Fields.NULL_VALUE;
+    value_ = value;
+  }
+
   public boolean isSetBoolValue() {
     return setField_ == _Fields.BOOL_VALUE;
   }
@@ -664,6 +721,11 @@ public boolean isSetBinaryValue() {
   }
 
 
+  public boolean isSetNullValue() {
+    return setField_ == _Fields.NULL_VALUE;
+  }
+
+
   public boolean equals(java.lang.Object other) {
     if (other instanceof Literal) {
       return equals((Literal)other);
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java b/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java
index 4dcdf2bebcc..51b75bf6b99 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.15.0)
+ * Autogenerated by Thrift Compiler (0.17.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -25,7 +25,7 @@
 package org.apache.pinot.common.request;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-05-02")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.17.0)", date = "2023-02-08")
 public class PinotQuery implements org.apache.thrift.TBase<PinotQuery, PinotQuery._Fields>, java.io.Serializable, Cloneable, Comparable<PinotQuery> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PinotQuery");
 
@@ -147,10 +147,12 @@ public static _Fields findByName(java.lang.String name) {
       _fieldName = fieldName;
     }
 
+    @Override
     public short getThriftFieldId() {
       return _thriftId;
     }
 
+    @Override
     public java.lang.String getFieldName() {
       return _fieldName;
     }
@@ -166,41 +168,41 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.DATA_SOURCE, new org.apache.thrift.meta_data.FieldMetaData("dataSource", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.DATA_SOURCE, new org.apache.thrift.meta_data.FieldMetaData("dataSource", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DataSource.class)));
-    tmpMap.put(_Fields.SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("selectList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "Expression"))));
-    tmpMap.put(_Fields.FILTER_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("filterExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "Expression")));
-    tmpMap.put(_Fields.GROUP_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupByList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "Expression"))));
-    tmpMap.put(_Fields.ORDER_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("orderByList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "Expression"))));
-    tmpMap.put(_Fields.HAVING_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("havingExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "Expression")));
-    tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("selectList", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class))));
+    tmpMap.put(_Fields.FILTER_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("filterExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class)));
+    tmpMap.put(_Fields.GROUP_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupByList", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class))));
+    tmpMap.put(_Fields.ORDER_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("orderByList", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class))));
+    tmpMap.put(_Fields.HAVING_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("havingExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class)));
+    tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debugOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+    tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debugOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.QUERY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("queryOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+    tmpMap.put(_Fields.QUERY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("queryOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.EXPLAIN, new org.apache.thrift.meta_data.FieldMetaData("explain", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.EXPLAIN, new org.apache.thrift.meta_data.FieldMetaData("explain", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.EXPRESSION_OVERRIDE_HINTS, new org.apache.thrift.meta_data.FieldMetaData("expressionOverrideHints", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "Expression"), 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "Expression"))));
+    tmpMap.put(_Fields.EXPRESSION_OVERRIDE_HINTS, new org.apache.thrift.meta_data.FieldMetaData("expressionOverrideHints", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class),
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PinotQuery.class, metaDataMap);
   }
@@ -276,6 +278,7 @@ public PinotQuery(PinotQuery other) {
     }
   }
 
+  @Override
   public PinotQuery deepCopy() {
     return new PinotQuery(this);
   }
@@ -699,194 +702,197 @@ public void setExpressionOverrideHintsIsSet(boolean value) {
     }
   }
 
+  @Override
   public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
-    case VERSION:
-      if (value == null) {
-        unsetVersion();
-      } else {
-        setVersion((java.lang.Integer)value);
-      }
-      break;
+      case VERSION:
+        if (value == null) {
+          unsetVersion();
+        } else {
+          setVersion((java.lang.Integer)value);
+        }
+        break;
 
-    case DATA_SOURCE:
-      if (value == null) {
-        unsetDataSource();
-      } else {
-        setDataSource((DataSource)value);
-      }
-      break;
+      case DATA_SOURCE:
+        if (value == null) {
+          unsetDataSource();
+        } else {
+          setDataSource((DataSource)value);
+        }
+        break;
 
-    case SELECT_LIST:
-      if (value == null) {
-        unsetSelectList();
-      } else {
-        setSelectList((java.util.List<Expression>)value);
-      }
-      break;
+      case SELECT_LIST:
+        if (value == null) {
+          unsetSelectList();
+        } else {
+          setSelectList((java.util.List<Expression>)value);
+        }
+        break;
 
-    case FILTER_EXPRESSION:
-      if (value == null) {
-        unsetFilterExpression();
-      } else {
-        setFilterExpression((Expression)value);
-      }
-      break;
+      case FILTER_EXPRESSION:
+        if (value == null) {
+          unsetFilterExpression();
+        } else {
+          setFilterExpression((Expression)value);
+        }
+        break;
 
-    case GROUP_BY_LIST:
-      if (value == null) {
-        unsetGroupByList();
-      } else {
-        setGroupByList((java.util.List<Expression>)value);
-      }
-      break;
+      case GROUP_BY_LIST:
+        if (value == null) {
+          unsetGroupByList();
+        } else {
+          setGroupByList((java.util.List<Expression>)value);
+        }
+        break;
 
-    case ORDER_BY_LIST:
-      if (value == null) {
-        unsetOrderByList();
-      } else {
-        setOrderByList((java.util.List<Expression>)value);
-      }
-      break;
+      case ORDER_BY_LIST:
+        if (value == null) {
+          unsetOrderByList();
+        } else {
+          setOrderByList((java.util.List<Expression>)value);
+        }
+        break;
 
-    case HAVING_EXPRESSION:
-      if (value == null) {
-        unsetHavingExpression();
-      } else {
-        setHavingExpression((Expression)value);
-      }
-      break;
+      case HAVING_EXPRESSION:
+        if (value == null) {
+          unsetHavingExpression();
+        } else {
+          setHavingExpression((Expression)value);
+        }
+        break;
 
-    case LIMIT:
-      if (value == null) {
-        unsetLimit();
-      } else {
-        setLimit((java.lang.Integer)value);
-      }
-      break;
+      case LIMIT:
+        if (value == null) {
+          unsetLimit();
+        } else {
+          setLimit((java.lang.Integer)value);
+        }
+        break;
 
-    case OFFSET:
-      if (value == null) {
-        unsetOffset();
-      } else {
-        setOffset((java.lang.Integer)value);
-      }
-      break;
+      case OFFSET:
+        if (value == null) {
+          unsetOffset();
+        } else {
+          setOffset((java.lang.Integer)value);
+        }
+        break;
 
-    case DEBUG_OPTIONS:
-      if (value == null) {
-        unsetDebugOptions();
-      } else {
-        setDebugOptions((java.util.Map<java.lang.String,java.lang.String>)value);
-      }
-      break;
+      case DEBUG_OPTIONS:
+        if (value == null) {
+          unsetDebugOptions();
+        } else {
+          setDebugOptions((java.util.Map<java.lang.String,java.lang.String>)value);
+        }
+        break;
 
-    case QUERY_OPTIONS:
-      if (value == null) {
-        unsetQueryOptions();
-      } else {
-        setQueryOptions((java.util.Map<java.lang.String,java.lang.String>)value);
-      }
-      break;
+      case QUERY_OPTIONS:
+        if (value == null) {
+          unsetQueryOptions();
+        } else {
+          setQueryOptions((java.util.Map<java.lang.String,java.lang.String>)value);
+        }
+        break;
 
-    case EXPLAIN:
-      if (value == null) {
-        unsetExplain();
-      } else {
-        setExplain((java.lang.Boolean)value);
-      }
-      break;
+      case EXPLAIN:
+        if (value == null) {
+          unsetExplain();
+        } else {
+          setExplain((java.lang.Boolean)value);
+        }
+        break;
 
-    case EXPRESSION_OVERRIDE_HINTS:
-      if (value == null) {
-        unsetExpressionOverrideHints();
-      } else {
-        setExpressionOverrideHints((java.util.Map<Expression,Expression>)value);
-      }
-      break;
+      case EXPRESSION_OVERRIDE_HINTS:
+        if (value == null) {
+          unsetExpressionOverrideHints();
+        } else {
+          setExpressionOverrideHints((java.util.Map<Expression,Expression>)value);
+        }
+        break;
 
     }
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
-    case VERSION:
-      return getVersion();
+      case VERSION:
+        return getVersion();
 
-    case DATA_SOURCE:
-      return getDataSource();
+      case DATA_SOURCE:
+        return getDataSource();
 
-    case SELECT_LIST:
-      return getSelectList();
+      case SELECT_LIST:
+        return getSelectList();
 
-    case FILTER_EXPRESSION:
-      return getFilterExpression();
+      case FILTER_EXPRESSION:
+        return getFilterExpression();
 
-    case GROUP_BY_LIST:
-      return getGroupByList();
+      case GROUP_BY_LIST:
+        return getGroupByList();
 
-    case ORDER_BY_LIST:
-      return getOrderByList();
+      case ORDER_BY_LIST:
+        return getOrderByList();
 
-    case HAVING_EXPRESSION:
-      return getHavingExpression();
+      case HAVING_EXPRESSION:
+        return getHavingExpression();
 
-    case LIMIT:
-      return getLimit();
+      case LIMIT:
+        return getLimit();
 
-    case OFFSET:
-      return getOffset();
+      case OFFSET:
+        return getOffset();
 
-    case DEBUG_OPTIONS:
-      return getDebugOptions();
+      case DEBUG_OPTIONS:
+        return getDebugOptions();
 
-    case QUERY_OPTIONS:
-      return getQueryOptions();
+      case QUERY_OPTIONS:
+        return getQueryOptions();
 
-    case EXPLAIN:
-      return isExplain();
+      case EXPLAIN:
+        return isExplain();
 
-    case EXPRESSION_OVERRIDE_HINTS:
-      return getExpressionOverrideHints();
+      case EXPRESSION_OVERRIDE_HINTS:
+        return getExpressionOverrideHints();
 
     }
     throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  @Override
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
-    case VERSION:
-      return isSetVersion();
-    case DATA_SOURCE:
-      return isSetDataSource();
-    case SELECT_LIST:
-      return isSetSelectList();
-    case FILTER_EXPRESSION:
-      return isSetFilterExpression();
-    case GROUP_BY_LIST:
-      return isSetGroupByList();
-    case ORDER_BY_LIST:
-      return isSetOrderByList();
-    case HAVING_EXPRESSION:
-      return isSetHavingExpression();
-    case LIMIT:
-      return isSetLimit();
-    case OFFSET:
-      return isSetOffset();
-    case DEBUG_OPTIONS:
-      return isSetDebugOptions();
-    case QUERY_OPTIONS:
-      return isSetQueryOptions();
-    case EXPLAIN:
-      return isSetExplain();
-    case EXPRESSION_OVERRIDE_HINTS:
-      return isSetExpressionOverrideHints();
+      case VERSION:
+        return isSetVersion();
+      case DATA_SOURCE:
+        return isSetDataSource();
+      case SELECT_LIST:
+        return isSetSelectList();
+      case FILTER_EXPRESSION:
+        return isSetFilterExpression();
+      case GROUP_BY_LIST:
+        return isSetGroupByList();
+      case ORDER_BY_LIST:
+        return isSetOrderByList();
+      case HAVING_EXPRESSION:
+        return isSetHavingExpression();
+      case LIMIT:
+        return isSetLimit();
+      case OFFSET:
+        return isSetOffset();
+      case DEBUG_OPTIONS:
+        return isSetDebugOptions();
+      case QUERY_OPTIONS:
+        return isSetQueryOptions();
+      case EXPLAIN:
+        return isSetExplain();
+      case EXPRESSION_OVERRIDE_HINTS:
+        return isSetExpressionOverrideHints();
     }
     throw new java.lang.IllegalStateException();
   }
@@ -1225,14 +1231,17 @@ public int compareTo(PinotQuery other) {
   }
 
   @org.apache.thrift.annotation.Nullable
+  @Override
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
+  @Override
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
+  @Override
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
@@ -1365,6 +1374,12 @@ public void validate() throws org.apache.thrift.TException {
     if (dataSource != null) {
       dataSource.validate();
     }
+    if (filterExpression != null) {
+      filterExpression.validate();
+    }
+    if (havingExpression != null) {
+      havingExpression.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1386,6 +1401,7 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException
   }
 
   private static class PinotQueryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PinotQueryStandardScheme getScheme() {
       return new PinotQueryStandardScheme();
     }
@@ -1393,13 +1409,14 @@ public PinotQueryStandardScheme getScheme() {
 
   private static class PinotQueryStandardScheme extends org.apache.thrift.scheme.StandardScheme<PinotQuery> {
 
+    @Override
     public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -1407,7 +1424,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.version = iprot.readI32();
               struct.setVersionIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1416,7 +1433,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
               struct.dataSource = new DataSource();
               struct.dataSource.read(iprot);
               struct.setDataSourceIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1435,7 +1452,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
                 iprot.readListEnd();
               }
               struct.setSelectListIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1444,7 +1461,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
               struct.filterExpression = new Expression();
               struct.filterExpression.read(iprot);
               struct.setFilterExpressionIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1463,7 +1480,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
                 iprot.readListEnd();
               }
               struct.setGroupByListIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1482,7 +1499,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
                 iprot.readListEnd();
               }
               struct.setOrderByListIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1491,7 +1508,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
               struct.havingExpression = new Expression();
               struct.havingExpression.read(iprot);
               struct.setHavingExpressionIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1499,7 +1516,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.limit = iprot.readI32();
               struct.setLimitIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1507,7 +1524,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.offset = iprot.readI32();
               struct.setOffsetIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1527,7 +1544,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
                 iprot.readMapEnd();
               }
               struct.setDebugOptionsIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1547,7 +1564,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
                 iprot.readMapEnd();
               }
               struct.setQueryOptionsIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1555,7 +1572,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.explain = iprot.readBool();
               struct.setExplainIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1577,7 +1594,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
                 iprot.readMapEnd();
               }
               struct.setExpressionOverrideHintsIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -1592,6 +1609,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct)
       struct.validate();
     }
 
+    @Override
     public void write(org.apache.thrift.protocol.TProtocol oprot, PinotQuery struct) throws org.apache.thrift.TException {
       struct.validate();
 
@@ -1731,6 +1749,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PinotQuery struct)
   }
 
   private static class PinotQueryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    @Override
     public PinotQueryTupleScheme getScheme() {
       return new PinotQueryTupleScheme();
     }
@@ -1937,7 +1956,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TMap _map42 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+          org.apache.thrift.protocol.TMap _map42 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING);
           struct.debugOptions = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map42.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key43;
           @org.apache.thrift.annotation.Nullable java.lang.String _val44;
@@ -1952,7 +1971,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t
       }
       if (incoming.get(10)) {
         {
-          org.apache.thrift.protocol.TMap _map46 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+          org.apache.thrift.protocol.TMap _map46 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING);
           struct.queryOptions = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map46.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key47;
           @org.apache.thrift.annotation.Nullable java.lang.String _val48;
@@ -1971,7 +1990,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t
       }
       if (incoming.get(12)) {
         {
-          org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT); 
+          org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT);
           struct.expressionOverrideHints = new java.util.HashMap<Expression,Expression>(2*_map50.size);
           @org.apache.thrift.annotation.Nullable Expression _key51;
           @org.apache.thrift.annotation.Nullable Expression _val52;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/context/ExpressionContext.java b/pinot-common/src/main/java/org/apache/pinot/common/request/context/ExpressionContext.java
index daf586e4a7c..924c08f32a1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/context/ExpressionContext.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/context/ExpressionContext.java
@@ -65,15 +65,6 @@ private ExpressionContext(Type type, String identifier, FunctionContext function
     _literal = literal;
   }
 
-  // TODO: Refactor all of the usage for getLiteralString.
-  @Deprecated
-  public String getLiteralString() {
-    if (_literal == null || _literal.getValue() == null) {
-      return null;
-    }
-    return _literal.getValue().toString();
-  }
-
   public Type getType() {
     return _type;
   }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/context/LiteralContext.java b/pinot-common/src/main/java/org/apache/pinot/common/request/context/LiteralContext.java
index e8e00a53301..3436e826f3c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/context/LiteralContext.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/context/LiteralContext.java
@@ -18,10 +18,18 @@
  */
 package org.apache.pinot.common.request.context;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
 import java.util.Objects;
 import javax.annotation.Nullable;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.common.request.Literal;
+import org.apache.pinot.common.utils.PinotDataType;
 import org.apache.pinot.spi.data.FieldSpec;
 
 
@@ -34,71 +42,144 @@
  */
 public class LiteralContext {
   // TODO: Support all of the types for sql.
-  private FieldSpec.DataType _type;
-  private Object _value;
+  private final FieldSpec.DataType _type;
+  private final Object _value;
+  private final BigDecimal _bigDecimalValue;
 
-  // TODO: Support all data types.
-  private static FieldSpec.DataType convertThriftTypeToDataType(Literal._Fields fields) {
-    switch (fields) {
-      case LONG_VALUE:
-        return FieldSpec.DataType.LONG;
-      case BOOL_VALUE:
-        return FieldSpec.DataType.BOOLEAN;
-      case DOUBLE_VALUE:
-        return FieldSpec.DataType.DOUBLE;
-      case STRING_VALUE:
-        return FieldSpec.DataType.STRING;
+  private static BigDecimal getBigDecimalValue(FieldSpec.DataType type, Object value) {
+    switch (type) {
+      case BIG_DECIMAL:
+        return (BigDecimal) value;
+      case BOOLEAN:
+        return PinotDataType.BOOLEAN.toBigDecimal(value);
+      case TIMESTAMP:
+        return PinotDataType.TIMESTAMP.toBigDecimal(Timestamp.valueOf(value.toString()));
       default:
-        throw new UnsupportedOperationException("Unsupported literal type:" + fields);
+        if (type.isNumeric()) {
+          return new BigDecimal(value.toString());
+        }
+        return BigDecimal.ZERO;
     }
   }
 
-  private static Class<?> convertDataTypeToJavaType(FieldSpec.DataType dataType) {
-    switch (dataType) {
-      case INT:
-        return Integer.class;
-      case LONG:
-        return Long.class;
-      case BOOLEAN:
-        return Boolean.class;
-      case FLOAT:
-        return Float.class;
-      case DOUBLE:
-        return Double.class;
-      case STRING:
-        return String.class;
-      default:
-        throw new UnsupportedOperationException("Unsupported dataType:" + dataType);
+  @VisibleForTesting
+  static Pair<FieldSpec.DataType, Object> inferLiteralDataTypeAndValue(String literal) {
+    // Try to interpret the literal as number
+    try {
+      Number number = NumberUtils.createNumber(literal);
+      if (number instanceof BigDecimal || number instanceof BigInteger) {
+        return ImmutablePair.of(FieldSpec.DataType.BIG_DECIMAL, new BigDecimal(literal));
+      } else {
+        return ImmutablePair.of(FieldSpec.DataType.STRING, literal);
+      }
+    } catch (Exception e) {
+      // Ignored
     }
+
+    // Try to interpret the literal as TIMESTAMP
+    try {
+      Timestamp timestamp = Timestamp.valueOf(literal);
+      return ImmutablePair.of(FieldSpec.DataType.TIMESTAMP, timestamp);
+    } catch (Exception e) {
+      // Ignored
+    }
+    return ImmutablePair.of(FieldSpec.DataType.STRING, literal);
   }
 
   public LiteralContext(Literal literal) {
-    _type = convertThriftTypeToDataType(literal.getSetField());
-    _value = literal.getFieldValue();
+    Preconditions.checkState(literal.getFieldValue() != null,
+        "Field value cannot be null for field:" + literal.getSetField());
+    switch (literal.getSetField()) {
+      case BOOL_VALUE:
+        _type = FieldSpec.DataType.BOOLEAN;
+        _value = literal.getFieldValue();
+        _bigDecimalValue = PinotDataType.BOOLEAN.toBigDecimal(_value);
+        break;
+      case LONG_VALUE:
+        long longValue = literal.getLongValue();
+        if (longValue == (int) longValue) {
+          _type = FieldSpec.DataType.INT;
+          _value = (int) longValue;
+        } else {
+          _type = FieldSpec.DataType.LONG;
+          _value = longValue;
+        }
+        _bigDecimalValue = new BigDecimal(longValue);
+        break;
+      case DOUBLE_VALUE:
+        String stringValue = literal.getFieldValue().toString();
+        Number floatingNumber = NumberUtils.createNumber(stringValue);
+        if (floatingNumber instanceof Float) {
+          _type = FieldSpec.DataType.FLOAT;
+          _value = floatingNumber;
+        } else {
+          _type = FieldSpec.DataType.DOUBLE;
+          _value = literal.getDoubleValue();
+        }
+        _bigDecimalValue = new BigDecimal(stringValue);
+        break;
+      case STRING_VALUE:
+        Pair<FieldSpec.DataType, Object> typeAndValue =
+            inferLiteralDataTypeAndValue(literal.getFieldValue().toString());
+        _type = typeAndValue.getLeft();
+        _value = typeAndValue.getRight();
+        if (_type == FieldSpec.DataType.BIG_DECIMAL) {
+          _bigDecimalValue = (BigDecimal) _value;
+        } else if (_type == FieldSpec.DataType.TIMESTAMP) {
+          _bigDecimalValue = PinotDataType.TIMESTAMP.toBigDecimal(Timestamp.valueOf(_value.toString()));
+        } else {
+          _bigDecimalValue = BigDecimal.ZERO;
+        }
+        break;
+      case NULL_VALUE:
+        _type = FieldSpec.DataType.UNKNOWN;
+        _value = null;
+        _bigDecimalValue = BigDecimal.ZERO;
+        break;
+      default:
+        throw new UnsupportedOperationException("Unsupported data type:" + literal.getSetField());
+    }
   }
 
   public FieldSpec.DataType getType() {
     return _type;
   }
 
+  public int getIntValue() {
+    return _bigDecimalValue.intValue();
+  }
+
+  public double getDoubleValue() {
+    return _bigDecimalValue.doubleValue();
+  }
+
+  public BigDecimal getBigDecimalValue() {
+    return _bigDecimalValue;
+  }
+
+  public String getStringValue() {
+    return String.valueOf(_value);
+  }
+
   @Nullable
   public Object getValue() {
     return _value;
   }
 
+  // This ctor is only used for special handling in subquery.
   public LiteralContext(FieldSpec.DataType type, Object value) {
-    Preconditions.checkArgument(convertDataTypeToJavaType(type) == value.getClass(),
-        "Unmatched data type: " + type + " java type: " + value.getClass());
     _type = type;
-    _value = value;
+    if (type == FieldSpec.DataType.UNKNOWN) {
+      _value = null;
+    } else {
+      _value = value;
+    }
+    _bigDecimalValue = getBigDecimalValue(type, value);
   }
 
   @Override
   public int hashCode() {
-    if (_value == null) {
-      return 31 * _type.hashCode();
-    }
-    return 31 * _value.hashCode();
+    return Objects.hash(_value, _type);
   }
 
   @Override
@@ -115,10 +196,7 @@ public boolean equals(Object o) {
 
   @Override
   public String toString() {
-    if (_value == null) {
-      return "null";
-    }
     // TODO: print out the type.
-    return '\'' + _value.toString() + '\'';
+    return '\'' + String.valueOf(_value) + '\'';
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/context/OrderByExpressionContext.java b/pinot-common/src/main/java/org/apache/pinot/common/request/context/OrderByExpressionContext.java
index fbe1a83882f..765c8e707f1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/context/OrderByExpressionContext.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/context/OrderByExpressionContext.java
@@ -29,10 +29,18 @@
 public class OrderByExpressionContext {
   private final ExpressionContext _expression;
   private final boolean _isAsc;
+  private final Boolean _isNullsLast;
 
   public OrderByExpressionContext(ExpressionContext expression, boolean isAsc) {
     _expression = expression;
     _isAsc = isAsc;
+    _isNullsLast = null;
+  }
+
+  public OrderByExpressionContext(ExpressionContext expression, boolean isAsc, boolean isNullsLast) {
+    _expression = expression;
+    _isAsc = isAsc;
+    _isNullsLast = isNullsLast;
   }
 
   public ExpressionContext getExpression() {
@@ -47,6 +55,16 @@ public boolean isDesc() {
     return !_isAsc;
   }
 
+  public boolean isNullsLast() {
+    // By default, null values sort as if larger than any non-null value; that is, NULLS FIRST is the default for DESC
+    // order, and NULLS LAST otherwise.
+    if (_isNullsLast == null) {
+      return _isAsc;
+    } else {
+      return _isNullsLast;
+    }
+  }
+
   /**
    * Adds the columns (IDENTIFIER expressions) in the order-by expression to the given set.
    */
@@ -63,16 +81,20 @@ public boolean equals(Object o) {
       return false;
     }
     OrderByExpressionContext that = (OrderByExpressionContext) o;
-    return _isAsc == that._isAsc && Objects.equals(_expression, that._expression);
+    return Objects.equals(_expression, that._expression) && _isAsc == that._isAsc && _isNullsLast == that._isNullsLast;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(_expression, _isAsc);
+    return Objects.hash(_expression, _isAsc, _isNullsLast);
   }
 
   @Override
   public String toString() {
-    return _expression.toString() + (_isAsc ? " ASC" : " DESC");
+    if (_isNullsLast != null) {
+      return _expression.toString() + (_isAsc ? " ASC" : " DESC") + (_isNullsLast ? " NULLS LAST" : " NULLS FIRST");
+    } else {
+      return _expression.toString() + (_isAsc ? " ASC" : " DESC");
+    }
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/context/RequestContextUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/request/context/RequestContextUtils.java
index ad2340942f3..0014f5974e4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/request/context/RequestContextUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/request/context/RequestContextUtils.java
@@ -25,6 +25,7 @@
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
+import org.apache.pinot.common.request.Literal;
 import org.apache.pinot.common.request.context.predicate.EqPredicate;
 import org.apache.pinot.common.request.context.predicate.InPredicate;
 import org.apache.pinot.common.request.context.predicate.IsNotNullPredicate;
@@ -90,11 +91,6 @@ public static FunctionContext getFunction(Function thriftFunction) {
       for (Expression operand : operands) {
         arguments.add(getExpression(operand));
       }
-      // TODO(walterddr): a work-around for multi-stage query engine which might pass COUNT without argument, and
-      //  should be removed once that issue is fixed.
-      if (arguments.isEmpty() && functionName.equalsIgnoreCase(AggregationFunctionType.COUNT.getName())) {
-        arguments.add(ExpressionContext.forIdentifier("*"));
-      }
       return new FunctionContext(functionType, functionName, arguments);
     } else {
       return new FunctionContext(functionType, functionName, Collections.emptyList());
@@ -230,6 +226,9 @@ private static String getStringValue(Expression thriftExpression) {
       throw new BadQueryRequestException(
           "Pinot does not support column or function on the right-hand side of the predicate");
     }
+    if (thriftExpression.getLiteral().getSetField() == Literal._Fields.NULL_VALUE) {
+      return "null";
+    }
     return thriftExpression.getLiteral().getFieldValue().toString();
   }
 
@@ -356,6 +355,6 @@ private static String getStringValue(ExpressionContext expressionContext) {
       throw new BadQueryRequestException(
           "Pinot does not support column or function on the right-hand side of the predicate");
     }
-    return expressionContext.getLiteralString();
+    return expressionContext.getLiteral().getStringValue();
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
index e50ea2b2ee3..3ad49460bc0 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
@@ -325,4 +325,14 @@ String toJsonString()
    * Set the total number of segments with a MatchAllFilterOperator when Explain Plan is called
    */
   void setExplainPlanNumMatchAllFilterSegments(long explainPlanNumMatchAllFilterSegments);
+
+  /**
+   * get request ID for the query
+   */
+  String getRequestId();
+
+  /**
+   * set request ID generated by broker
+   */
+  void setRequestId(String requestId);
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
index 9c06d54b765..f2580b9cc33 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
@@ -41,7 +41,7 @@
  * Supports serialization via JSON.
  */
 @JsonPropertyOrder({
-    "resultTable", "exceptions", "numServersQueried", "numServersResponded", "numSegmentsQueried",
+    "resultTable", "requestId", "exceptions", "numServersQueried", "numServersResponded", "numSegmentsQueried",
     "numSegmentsProcessed", "numSegmentsMatched", "numConsumingSegmentsQueried", "numConsumingSegmentsProcessed",
     "numConsumingSegmentsMatched", "numDocsScanned", "numEntriesScannedInFilter", "numEntriesScannedPostFilter",
     "numGroupsLimitReached", "totalDocs", "timeUsedMs", "offlineThreadCpuTimeNs", "realtimeThreadCpuTimeNs",
@@ -57,6 +57,7 @@ public class BrokerResponseNative implements BrokerResponse {
       new BrokerResponseNative(QueryException.TABLE_DOES_NOT_EXIST_ERROR);
   public static final BrokerResponseNative BROKER_ONLY_EXPLAIN_PLAN_OUTPUT = getBrokerResponseExplainPlanOutput();
 
+  private String _requestId;
   private int _numServersQueried = 0;
   private int _numServersResponded = 0;
   private long _numDocsScanned = 0L;
@@ -321,7 +322,10 @@ public ResultTable getResultTable() {
   @Override
   public void setResultTable(ResultTable resultTable) {
     _resultTable = resultTable;
-    _numRowsResultSet = resultTable.getRows().size();
+    // If query level parameter is set to not return the results, then resultTable will be null.
+    if (resultTable != null) {
+      _numRowsResultSet = resultTable.getRows().size();
+    }
   }
 
   @JsonProperty("exceptions")
@@ -554,4 +558,16 @@ public void addToExceptions(QueryProcessingException processingException) {
   public int getExceptionsSize() {
     return _processingExceptions.size();
   }
+
+  @JsonProperty("requestId")
+  @Override
+  public String getRequestId() {
+    return _requestId;
+  }
+
+  @JsonProperty("requestId")
+  @Override
+  public void setRequestId(String requestId) {
+    _requestId = requestId;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNativeV2.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNativeV2.java
new file mode 100644
index 00000000000..95943881dc7
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNativeV2.java
@@ -0,0 +1,95 @@
+/**
+ * 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.pinot.common.response.broker;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.response.ProcessingException;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.spi.utils.JsonUtils;
+
+
+/**
+ * This class implements pinot-broker's response format for any given query.
+ * All fields either primitive data types, or native objects (as opposed to JSONObjects).
+ *
+ * Supports serialization via JSON.
+ */
+@JsonPropertyOrder({
+    "resultTable", "requestId", "stageStats", "exceptions", "numServersQueried", "numServersResponded",
+    "numSegmentsQueried", "numSegmentsProcessed", "numSegmentsMatched", "numConsumingSegmentsQueried",
+    "numConsumingSegmentsProcessed", "numConsumingSegmentsMatched", "numDocsScanned", "numEntriesScannedInFilter",
+    "numEntriesScannedPostFilter", "numGroupsLimitReached", "totalDocs", "timeUsedMs", "offlineThreadCpuTimeNs",
+    "realtimeThreadCpuTimeNs", "offlineSystemActivitiesCpuTimeNs", "realtimeSystemActivitiesCpuTimeNs",
+    "offlineResponseSerializationCpuTimeNs", "realtimeResponseSerializationCpuTimeNs", "offlineTotalCpuTimeNs",
+    "realtimeTotalCpuTimeNs", "segmentStatistics", "traceInfo"
+})
+public class BrokerResponseNativeV2 extends BrokerResponseNative {
+
+  private final Map<Integer, BrokerResponseStats> _stageIdStats = new HashMap<>();
+
+  public BrokerResponseNativeV2() {
+  }
+
+  public BrokerResponseNativeV2(ProcessingException exception) {
+    super(exception);
+  }
+
+  public BrokerResponseNativeV2(List<ProcessingException> exceptions) {
+    super(exceptions);
+  }
+
+  /** Generate EXPLAIN PLAN output when queries are evaluated by Broker without going to the Server. */
+  private static BrokerResponseNativeV2 getBrokerResponseExplainPlanOutput() {
+    BrokerResponseNativeV2 brokerResponse = BrokerResponseNativeV2.empty();
+    List<Object[]> rows = new ArrayList<>();
+    rows.add(new Object[]{"BROKER_EVALUATE", 0, -1});
+    brokerResponse.setResultTable(new ResultTable(DataSchema.EXPLAIN_RESULT_SCHEMA, rows));
+    return brokerResponse;
+  }
+
+  /**
+   * Get a new empty {@link BrokerResponseNativeV2}.
+   */
+  public static BrokerResponseNativeV2 empty() {
+    return new BrokerResponseNativeV2();
+  }
+
+  public static BrokerResponseNativeV2 fromJsonString(String jsonString)
+      throws IOException {
+    return JsonUtils.stringToObject(jsonString, BrokerResponseNativeV2.class);
+  }
+
+  public void addStageStat(Integer stageId, BrokerResponseStats brokerResponseStats) {
+    // StageExecutionWallTime will always be there, other stats are optional such as OperatorStats
+    if (brokerResponseStats.getStageExecWallTimeMs() != -1) {
+      _stageIdStats.put(stageId, brokerResponseStats);
+    }
+  }
+
+  @JsonProperty("stageStats")
+  public Map<Integer, BrokerResponseStats> getStageIdStats() {
+    return _stageIdStats;
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseStats.java b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseStats.java
new file mode 100644
index 00000000000..f2361a7908e
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseStats.java
@@ -0,0 +1,134 @@
+/**
+ * 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.pinot.common.response.broker;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.spi.utils.JsonUtils;
+
+
+// TODO: Decouple the execution stats aggregator logic and make it into a util that can aggregate 2 values with the
+//  same metadataKey
+// TODO: Replace member fields with a simple map of <MetadataKey, Object>
+// TODO: Add a subStat field, stage level subStats will contain each operator stats
+@JsonPropertyOrder({"requestId", "exceptions", "numBlocks", "numRows", "stageExecutionTimeMs", "stageExecutionUnit",
+    "stageExecWallTimeMs", "stageExecEndTimeMs", "numServersQueried", "numServersResponded", "numSegmentsQueried",
+    "numSegmentsProcessed", "numSegmentsMatched", "numConsumingSegmentsQueried", "numConsumingSegmentsProcessed",
+    "numConsumingSegmentsMatched", "numDocsScanned", "numEntriesScannedInFilter", "numEntriesScannedPostFilter",
+    "numGroupsLimitReached", "totalDocs", "timeUsedMs", "offlineThreadCpuTimeNs", "realtimeThreadCpuTimeNs",
+    "offlineSystemActivitiesCpuTimeNs", "realtimeSystemActivitiesCpuTimeNs", "offlineResponseSerializationCpuTimeNs",
+    "realtimeResponseSerializationCpuTimeNs", "offlineTotalCpuTimeNs", "realtimeTotalCpuTimeNs",
+    "traceInfo", "operatorStats", "tableNames"})
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
+public class BrokerResponseStats extends BrokerResponseNative {
+
+  private int _numBlocks = 0;
+  private int _numRows = 0;
+  private long _stageExecutionTimeMs = 0;
+  private int _stageExecutionUnit = 0;
+  private long _stageExecWallTimeMs = -1;
+  private Map<String, Map<String, String>> _operatorStats = new HashMap<>();
+  private List<String> _tableNames = new ArrayList<>();
+
+  @Override
+  public ResultTable getResultTable() {
+    return null;
+  }
+
+  @JsonProperty("numBlocks")
+  public int getNumBlocks() {
+    return _numBlocks;
+  }
+
+  @JsonProperty("numBlocks")
+  public void setNumBlocks(int numBlocks) {
+    _numBlocks = numBlocks;
+  }
+
+  @JsonProperty("numRows")
+  public int getNumRows() {
+    return _numRows;
+  }
+
+  @JsonProperty("numRows")
+  public void setNumRows(int numRows) {
+    _numRows = numRows;
+  }
+
+  @JsonProperty("stageExecutionTimeMs")
+  public long getStageExecutionTimeMs() {
+    return _stageExecutionTimeMs;
+  }
+
+  @JsonProperty("stageExecutionTimeMs")
+  public void setStageExecutionTimeMs(long stageExecutionTimeMs) {
+    _stageExecutionTimeMs = stageExecutionTimeMs;
+  }
+
+  @JsonProperty("stageExecWallTimeMs")
+  public long getStageExecWallTimeMs() {
+    return _stageExecWallTimeMs;
+  }
+
+  @JsonProperty("stageExecWallTimeMs")
+  public void setStageExecWallTimeMs(long stageExecWallTimeMs) {
+    _stageExecWallTimeMs = stageExecWallTimeMs;
+  }
+
+  @JsonProperty("stageExecutionUnit")
+  public long getStageExecutionUnit() {
+    return _stageExecutionUnit;
+  }
+
+  @JsonProperty("stageExecutionUnit")
+  public void setStageExecutionUnit(int stageExecutionUnit) {
+    _stageExecutionUnit = stageExecutionUnit;
+  }
+
+  public String toJsonString()
+      throws IOException {
+    return JsonUtils.objectToString(this);
+  }
+
+  @JsonProperty("operatorStats")
+  public Map<String, Map<String, String>> getOperatorStats() {
+    return _operatorStats;
+  }
+
+  @JsonProperty("operatorStats")
+  public void setOperatorStats(Map<String, Map<String, String>> operatorStats) {
+    _operatorStats = operatorStats;
+  }
+
+  @JsonProperty("tableNames")
+  public List<String> getTableNames() {
+    return _tableNames;
+  }
+
+  @JsonProperty("tableNames")
+  public void setTableNames(List<String> tableNames) {
+    _tableNames = tableNames;
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/EndReplaceSegmentsRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/EndReplaceSegmentsRequest.java
new file mode 100644
index 00000000000..7bcb4baf65f
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/EndReplaceSegmentsRequest.java
@@ -0,0 +1,59 @@
+/**
+ * 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.pinot.common.restlet.resources;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+/**
+ * Request object for endReplaceSegments API.
+ *
+ * 1. segmentsTo: The new segments that actually get created. Sometimes not all segments that are passed into
+ * startReplaceSegments can get created. If only a subset of the original list eventually gets created,
+ * we need to be able to supply that list to the replacement protocol, so that the remaining
+ * segments that did not get created can be ignored.
+ * 2. customMap : custom map.
+ */
+public class EndReplaceSegmentsRequest {
+  private final List<String> _segmentsTo;
+  private final Map<String, String> _customMap;
+
+  public EndReplaceSegmentsRequest(@JsonProperty("segmentsTo") @Nullable List<String> segmentsTo) {
+    this(segmentsTo, null);
+  }
+
+  @JsonCreator
+  public EndReplaceSegmentsRequest(@JsonProperty("segmentsTo") @Nullable List<String> segmentsTo,
+      @JsonProperty("customMap") @Nullable Map<String, String> customMap) {
+    _segmentsTo = (segmentsTo == null) ? Collections.emptyList() : segmentsTo;
+    _customMap = customMap;
+  }
+
+  public List<String> getSegmentsTo() {
+    return _segmentsTo;
+  }
+
+  public Map<String, String> getCustomMap() {
+    return _customMap;
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RevertReplaceSegmentsRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RevertReplaceSegmentsRequest.java
new file mode 100644
index 00000000000..b4ed79aaf26
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/RevertReplaceSegmentsRequest.java
@@ -0,0 +1,41 @@
+/**
+ * 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.pinot.common.restlet.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+/**
+ * Request object for revertReplaceSegments API.
+ *
+ * customMap : custom map.
+ */
+public class RevertReplaceSegmentsRequest {
+  private final Map<String, String> _customMap;
+
+  public RevertReplaceSegmentsRequest(@JsonProperty("customMap") @Nullable Map<String, String> customMap) {
+    _customMap = customMap;
+  }
+
+  public Map<String, String> getCustomMap() {
+    return _customMap;
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/StartReplaceSegmentsRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/StartReplaceSegmentsRequest.java
index 05479526bb2..9c78c68042b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/StartReplaceSegmentsRequest.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/restlet/resources/StartReplaceSegmentsRequest.java
@@ -18,10 +18,12 @@
  */
 package org.apache.pinot.common.restlet.resources;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Nullable;
 
 
@@ -31,17 +33,27 @@
  * 1. segmentsFrom : original segments. This field can be empty in case the user tries to upload the original segments
  *    and wants to achieve the atomic update of multiple segments.
  * 2. segmentsTo : merged segments.
+ * 3. customMap : custom map.
  */
 public class StartReplaceSegmentsRequest {
   private final List<String> _segmentsFrom;
   private final List<String> _segmentsTo;
+  private final Map<String, String> _customMap;
 
   public StartReplaceSegmentsRequest(@JsonProperty("segmentsFrom") @Nullable List<String> segmentsFrom,
-      @JsonProperty("segmentsTo") List<String> segmentsTo) {
+      @JsonProperty("segmentsTo") @Nullable List<String> segmentsTo) {
+    this(segmentsFrom, segmentsTo, null);
+  }
+
+  @JsonCreator
+  public StartReplaceSegmentsRequest(@JsonProperty("segmentsFrom") @Nullable List<String> segmentsFrom,
+      @JsonProperty("segmentsTo") @Nullable List<String> segmentsTo,
+      @JsonProperty("customMap") @Nullable Map<String, String> customMap) {
     _segmentsFrom = (segmentsFrom == null) ? Collections.emptyList() : segmentsFrom;
-    _segmentsTo = segmentsTo;
-    Preconditions
-        .checkArgument(segmentsTo != null && !segmentsTo.isEmpty(), "'segmentsTo' should not be null or empty");
+    _segmentsTo = (segmentsTo == null) ? Collections.emptyList() : segmentsTo;
+    Preconditions.checkArgument(!_segmentsFrom.isEmpty() || !_segmentsTo.isEmpty(),
+        "'segmentsFrom' and 'segmentsTo' cannot both be empty");
+    _customMap = customMap;
   }
 
   public List<String> getSegmentsFrom() {
@@ -51,4 +63,8 @@ public List<String> getSegmentsFrom() {
   public List<String> getSegmentsTo() {
     return _segmentsTo;
   }
+
+  public Map<String, String> getCustomMap() {
+    return _customMap;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/tier/TimeBasedTierSegmentSelector.java b/pinot-common/src/main/java/org/apache/pinot/common/tier/TimeBasedTierSegmentSelector.java
index 18a8a142e40..54317009bd7 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/tier/TimeBasedTierSegmentSelector.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/tier/TimeBasedTierSegmentSelector.java
@@ -57,6 +57,12 @@ public boolean selectSegment(String tableNameWithType, String segmentName) {
         .checkNotNull(segmentZKMetadata, "Could not find zk metadata for segment: {} of table: {}", segmentName,
             tableNameWithType);
 
+    // don't try to move consuming segments
+    if (!segmentZKMetadata.getStatus().isCompleted()) {
+      return false;
+    }
+
+
     // get segment end time to decide if segment gets selected
     long endTimeMs = segmentZKMetadata.getEndTimeMs();
     Preconditions
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java
index 4854f5bf22f..354ba8cd3c4 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/DataSchema.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.google.common.collect.Ordering;
 import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -101,67 +102,6 @@ public ColumnDataType[] getStoredColumnDataTypes() {
     return storedColumnDataTypes;
   }
 
-  /**
-   * Returns whether the given data schema is type compatible with this one.
-   * <ul>
-   *   <li>All numbers are type compatible with each other</li>
-   *   <li>Numbers are not type compatible with string</li>
-   *   <li>Non-array types are not type compatible with array types</li>
-   * </ul>
-   *
-   * @param anotherDataSchema Data schema to compare with
-   * @return Whether the two data schemas are type compatible
-   */
-  public boolean isTypeCompatibleWith(DataSchema anotherDataSchema) {
-    if (!Arrays.equals(_columnNames, anotherDataSchema._columnNames)) {
-      return false;
-    }
-    int numColumns = _columnNames.length;
-    for (int i = 0; i < numColumns; i++) {
-      if (!_columnDataTypes[i].isCompatible(anotherDataSchema._columnDataTypes[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Upgrade the current data schema to cover the column data types in the given data schema.
-   * <p>Data type <code>LONG</code> can cover <code>INT</code> and <code>LONG</code>.
-   * <p>Data type <code>DOUBLE</code> can cover all numbers, but with potential precision loss when use it to cover
-   * <code>LONG</code>.
-   * <p>NOTE: The given data schema should be type compatible with this one.
-   *
-   * @param originalSchema the original Data schema
-   * @param anotherDataSchema Data schema to cover
-   */
-  public static DataSchema upgradeToCover(DataSchema originalSchema, DataSchema anotherDataSchema) {
-    int numColumns = originalSchema._columnDataTypes.length;
-    ColumnDataType[] columnDataTypes = new ColumnDataType[numColumns];
-    for (int i = 0; i < numColumns; i++) {
-      ColumnDataType thisColumnDataType = originalSchema._columnDataTypes[i];
-      ColumnDataType thatColumnDataType = anotherDataSchema._columnDataTypes[i];
-      if (thisColumnDataType != thatColumnDataType) {
-        if (thisColumnDataType.isArray()) {
-          if (thisColumnDataType.isWholeNumberArray() && thatColumnDataType.isWholeNumberArray()) {
-            columnDataTypes[i] = ColumnDataType.LONG_ARRAY;
-          } else {
-            columnDataTypes[i] = ColumnDataType.DOUBLE_ARRAY;
-          }
-        } else {
-          if (thisColumnDataType.isWholeNumber() && thatColumnDataType.isWholeNumber()) {
-            columnDataTypes[i] = ColumnDataType.LONG;
-          } else {
-            columnDataTypes[i] = ColumnDataType.DOUBLE;
-          }
-        }
-      } else {
-        columnDataTypes[i] = originalSchema._columnDataTypes[i];
-      }
-    }
-    return new DataSchema(originalSchema._columnNames, columnDataTypes);
-  }
-
   public byte[] toBytes()
       throws IOException {
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -270,7 +210,8 @@ public enum ColumnDataType {
     BOOLEAN_ARRAY(INT_ARRAY, new int[0]),
     TIMESTAMP_ARRAY(LONG_ARRAY, new long[0]),
     STRING_ARRAY(new String[0]),
-    BYTES_ARRAY(new byte[0][]);
+    BYTES_ARRAY(new byte[0][]),
+    UNKNOWN(null);
 
     private static final EnumSet<ColumnDataType> NUMERIC_TYPES = EnumSet.of(INT, LONG, FLOAT, DOUBLE, BIG_DECIMAL);
     private static final Ordering<ColumnDataType> NUMERIC_TYPE_ORDERING = Ordering.explicit(INT, LONG, FLOAT, DOUBLE);
@@ -357,25 +298,35 @@ public boolean isSuperTypeOf(ColumnDataType subTypeCandidate) {
     public DataType toDataType() {
       switch (this) {
         case INT:
+        case INT_ARRAY:
           return DataType.INT;
         case LONG:
+        case LONG_ARRAY:
           return DataType.LONG;
         case FLOAT:
+        case FLOAT_ARRAY:
           return DataType.FLOAT;
         case DOUBLE:
+        case DOUBLE_ARRAY:
           return DataType.DOUBLE;
         case BIG_DECIMAL:
           return DataType.BIG_DECIMAL;
         case BOOLEAN:
+        case BOOLEAN_ARRAY:
           return DataType.BOOLEAN;
         case TIMESTAMP:
+        case TIMESTAMP_ARRAY:
           return DataType.TIMESTAMP;
         case STRING:
+        case STRING_ARRAY:
           return DataType.STRING;
         case JSON:
           return DataType.JSON;
         case BYTES:
+        case BYTES_ARRAY:
           return DataType.BYTES;
+        case UNKNOWN:
+          return DataType.UNKNOWN;
         default:
           throw new IllegalStateException(String.format("Cannot convert ColumnDataType: %s to DataType", this));
       }
@@ -422,6 +373,7 @@ public Serializable convert(Object value) {
           return toTimestampArray(value);
         case BYTES_ARRAY:
           return (byte[][]) value;
+        case UNKNOWN: // fall through
         case OBJECT:
           return (Serializable) value;
         default:
@@ -526,6 +478,8 @@ private static double[] toDoubleArray(Object value) {
     private static long[] toLongArray(Object value) {
       if (value instanceof long[]) {
         return (long[]) value;
+      } else if (value instanceof LongArrayList) {
+        return ((LongArrayList) value).elements();
       } else {
         int[] intValues = (int[]) value;
         int length = intValues.length;
@@ -586,6 +540,8 @@ public static ColumnDataType fromDataTypeSV(DataType dataType) {
           return JSON;
         case BYTES:
           return BYTES;
+        case UNKNOWN:
+          return UNKNOWN;
         default:
           throw new IllegalStateException("Unsupported data type: " + dataType);
       }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java
index 9a07435bf1d..e5456410b17 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java
@@ -55,8 +55,10 @@
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.pinot.common.auth.AuthProviderUtils;
 import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.restlet.resources.EndReplaceSegmentsRequest;
 import org.apache.pinot.common.restlet.resources.StartReplaceSegmentsRequest;
 import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.common.utils.http.HttpClientConfig;
 import org.apache.pinot.spi.auth.AuthProvider;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.utils.CommonConstants;
@@ -129,14 +131,49 @@ public FileUploadDownloadClient() {
     _httpClient = new HttpClient();
   }
 
+  public FileUploadDownloadClient(HttpClientConfig httpClientConfig) {
+    _httpClient = new HttpClient(httpClientConfig, null);
+  }
+
   public FileUploadDownloadClient(SSLContext sslContext) {
-    _httpClient = new HttpClient(sslContext);
+    _httpClient = new HttpClient(HttpClientConfig.DEFAULT_HTTP_CLIENT_CONFIG, sslContext);
+  }
+
+  public FileUploadDownloadClient(HttpClientConfig httpClientConfig, SSLContext sslContext) {
+    _httpClient = new HttpClient(httpClientConfig, sslContext);
   }
 
   public HttpClient getHttpClient() {
     return _httpClient;
   }
 
+  /**
+   * Extracts base URI from a URI, e.g., http://example.com:8000/a/b -> http://example.com:8000
+   * @param fullURI a full URI with
+   * @return a URI
+   * @throws URISyntaxException when there are problems generating the URI
+   */
+  public static URI extractBaseURI(URI fullURI)
+      throws URISyntaxException {
+    return getURI(fullURI.getScheme(), fullURI.getHost(), fullURI.getPort());
+  }
+
+  /**
+   * Generates a URI from the given protocol, host and port
+   * @param protocol the protocol part of the URI
+   * @param host the host part of the URI
+   * @param port the port part of the URI
+   * @return a URI
+   * @throws URISyntaxException when there are problems generating the URIg
+   */
+  public static URI getURI(String protocol, String host, int port)
+      throws URISyntaxException {
+    if (!SUPPORTED_PROTOCOLS.contains(protocol)) {
+      throw new IllegalArgumentException(String.format("Unsupported protocol '%s'", protocol));
+    }
+    return new URI(protocol, null, host, port, null, null, null);
+  }
+
   public static URI getURI(String protocol, String host, int port, String path)
       throws URISyntaxException {
     if (!SUPPORTED_PROTOCOLS.contains(protocol)) {
@@ -452,10 +489,13 @@ private static HttpUriRequest getStartReplaceSegmentsRequest(URI uri, String jso
     return requestBuilder.build();
   }
 
-  private static HttpUriRequest getEndReplaceSegmentsRequest(URI uri, int socketTimeoutMs,
+  private static HttpUriRequest getEndReplaceSegmentsRequest(URI uri, String jsonRequestBody, int socketTimeoutMs,
       @Nullable AuthProvider authProvider) {
     RequestBuilder requestBuilder = RequestBuilder.post(uri).setVersion(HttpVersion.HTTP_1_1)
         .setHeader(HttpHeaders.CONTENT_TYPE, HttpClient.JSON_CONTENT_TYPE);
+    if (jsonRequestBody != null) {
+      requestBuilder.setEntity(new StringEntity(jsonRequestBody, ContentType.APPLICATION_JSON));
+    }
     AuthProviderUtils.toRequestHeaders(authProvider).forEach(requestBuilder::addHeader);
     HttpClient.setTimeout(requestBuilder, socketTimeoutMs);
     return requestBuilder.build();
@@ -783,9 +823,54 @@ public SimpleHttpResponse uploadSegment(URI uri, String segmentName, InputStream
   /**
    * Returns a map from a given tableType to a list of segments for that given tableType (OFFLINE or REALTIME)
    * If tableType is left unspecified, both OFFLINE and REALTIME segments will be returned in the map.
+   * @param controllerBaseUri the base controller URI, e.g., https://example.com:8000
+   * @param rawTableName the raw table name without table type
+   * @param tableType the table type (OFFLINE or REALTIME)
+   * @param excludeReplacedSegments whether to exclude replaced segments (determined by segment lineage)
+   * @return a map from a given tableType to a list of segment names
+   * @throws Exception when failed to get segments from the controller
+   */
+  public Map<String, List<String>> getSegments(URI controllerBaseUri, String rawTableName,
+      @Nullable TableType tableType, boolean excludeReplacedSegments)
+      throws Exception {
+    return getSegments(controllerBaseUri, rawTableName, tableType, excludeReplacedSegments, null);
+  }
+
+  /**
+   * Returns a map from a given tableType to a list of segments for that given tableType (OFFLINE or REALTIME)
+   * If tableType is left unspecified, both OFFLINE and REALTIME segments will be returned in the map.
+   * @param controllerBaseUri the base controller URI, e.g., https://example.com:8000
+   * @param rawTableName the raw table name without table type
+   * @param tableType the table type (OFFLINE or REALTIME)
+   * @param excludeReplacedSegments whether to exclude replaced segments (determined by segment lineage)
+   * @param authProvider the {@link AuthProvider}
+   * @return a map from a given tableType to a list of segment names
+   * @throws Exception when failed to get segments from the controller
+   */
+  public Map<String, List<String>> getSegments(URI controllerBaseUri, String rawTableName,
+      @Nullable TableType tableType, boolean excludeReplacedSegments, @Nullable AuthProvider authProvider)
+      throws Exception {
+    return getSegments(controllerBaseUri, rawTableName, tableType, excludeReplacedSegments, Long.MIN_VALUE,
+        Long.MAX_VALUE, false, authProvider);
+  }
+
+  /**
+   * Returns a map from a given tableType to a list of segments for that given tableType (OFFLINE or REALTIME)
+   * If tableType is left unspecified, both OFFLINE and REALTIME segments will be returned in the map.
+   * @param controllerBaseUri the base controller URI, e.g., https://example.com:8000
+   * @param rawTableName the raw table name without table type
+   * @param tableType the table type (OFFLINE or REALTIME)
+   * @param excludeReplacedSegments whether to exclude replaced segments (determined by segment lineage)
+   * @param startTimestamp start timestamp in ms (inclusive)
+   * @param endTimestamp end timestamp in ms (exclusive)
+   * @param excludeOverlapping whether to exclude the segments overlapping with the timestamps, false by default
+   * @param authProvider the {@link AuthProvider}
+   * @return a map from a given tableType to a list of segment names
+   * @throws Exception when failed to get segments from the controller
    */
-  public Map<String, List<String>> getSegments(URI controllerUri, String rawTableName, @Nullable TableType tableType,
-      boolean excludeReplacedSegments)
+  public Map<String, List<String>> getSegments(URI controllerBaseUri, String rawTableName,
+      @Nullable TableType tableType, boolean excludeReplacedSegments, long startTimestamp, long endTimestamp,
+      boolean excludeOverlapping, @Nullable AuthProvider authProvider)
       throws Exception {
     List<String> tableTypes;
     if (tableType == null) {
@@ -794,13 +879,15 @@ public Map<String, List<String>> getSegments(URI controllerUri, String rawTableN
       tableTypes = Arrays.asList(tableType.toString());
     }
     ControllerRequestURLBuilder controllerRequestURLBuilder =
-        ControllerRequestURLBuilder.baseUrl(controllerUri.toString());
+        ControllerRequestURLBuilder.baseUrl(controllerBaseUri.toString());
     Map<String, List<String>> tableTypeToSegments = new HashMap<>();
     for (String tableTypeToFilter : tableTypes) {
       tableTypeToSegments.put(tableTypeToFilter, new ArrayList<>());
       String uri =
-          controllerRequestURLBuilder.forSegmentListAPI(rawTableName, tableTypeToFilter, excludeReplacedSegments);
+          controllerRequestURLBuilder.forSegmentListAPI(rawTableName, tableTypeToFilter, excludeReplacedSegments,
+              startTimestamp, endTimestamp, excludeOverlapping);
       RequestBuilder requestBuilder = RequestBuilder.get(uri).setVersion(HttpVersion.HTTP_1_1);
+      AuthProviderUtils.toRequestHeaders(authProvider).forEach(requestBuilder::addHeader);
       HttpClient.setTimeout(requestBuilder, HttpClient.DEFAULT_SOCKET_TIMEOUT_MS);
       RetryPolicies.exponentialBackoffRetryPolicy(5, 10_000L, 2.0).attempt(() -> {
         try {
@@ -984,10 +1071,13 @@ public SimpleHttpResponse startReplaceSegments(URI uri, StartReplaceSegmentsRequ
    * @throws IOException
    * @throws HttpErrorStatusException
    */
-  public SimpleHttpResponse endReplaceSegments(URI uri, int socketTimeoutMs, @Nullable AuthProvider authProvider)
+  public SimpleHttpResponse endReplaceSegments(URI uri, int socketTimeoutMs, @Nullable
+  EndReplaceSegmentsRequest endReplaceSegmentsRequest, @Nullable AuthProvider authProvider)
       throws IOException, HttpErrorStatusException {
+    String jsonBody = (endReplaceSegmentsRequest == null) ? null
+        : JsonUtils.objectToString(endReplaceSegmentsRequest);
     return HttpClient.wrapAndThrowHttpException(
-        _httpClient.sendRequest(getEndReplaceSegmentsRequest(uri, socketTimeoutMs, authProvider)));
+        _httpClient.sendRequest(getEndReplaceSegmentsRequest(uri, jsonBody, socketTimeoutMs, authProvider)));
   }
 
   /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java
index 8667d4c4446..2c1cb10c434 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUtils.java
@@ -114,4 +114,24 @@ public static void close(Closeable... closeables)
       throws IOException {
     close(Arrays.asList(closeables));
   }
+
+  /**
+   * Concatenates the folderDir and filename and validates that the resulting file path is still within the folderDir.
+   * @param folderDir the parent directory
+   * @param filename the filename to concatenate to the parent directory
+   * @param msg the error message if the resulting file path is not within the parent directory
+   * @param args the error message arguments
+   * @return File object representing the concatenated file path
+   * @throws IllegalArgumentException if the resulting file path is not within the parent directory
+   * @throws IOException if the resulting file path is invalid
+   */
+  public static File concatAndValidateFile(File folderDir, String filename, String msg, Object... args)
+      throws IllegalArgumentException, IOException {
+    File filePath = new File(folderDir, filename);
+    if (!filePath.getCanonicalPath().startsWith(folderDir.getCanonicalPath() + File.separator)) {
+      throw new IllegalArgumentException(String.format(msg, args));
+    }
+
+    return filePath;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/RegexpPatternConverterUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/RegexpPatternConverterUtils.java
index c62cf86f235..31a0d59d959 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/RegexpPatternConverterUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/RegexpPatternConverterUtils.java
@@ -18,6 +18,9 @@
  */
 package org.apache.pinot.common.utils;
 
+
+import com.google.common.primitives.Chars;
+
 /**
  * Utility for converting regex patterns.
  */
@@ -25,9 +28,14 @@ public class RegexpPatternConverterUtils {
   private RegexpPatternConverterUtils() {
   }
 
-  /* Represents all metacharacters to be processed */
-  public static final String[] REGEXP_METACHARACTERS =
-      {"\\", "^", "$", ".", "{", "}", "[", "]", "(", ")", "*", "+", "?", "|", "<", ">", "-", "&", "/"};
+  /*
+   * Represents all metacharacters to be processed.
+   * This excludes the \ (back slash) character as that doubles up as an escape character as well.
+   * So it is handled separately in the conversion logic.
+   */
+  public static final char[] REGEXP_METACHARACTERS = new char[]{
+          '^', '$', '.', '{', '}', '[', ']', '(', ')', '*', '+', '?', '|', '<', '>', '-', '&', '/'};
+  public static final char BACK_SLASH = '\\';
 
   /**
    * Converts a LIKE pattern into REGEXP_LIKE pattern.
@@ -64,24 +72,61 @@ public static String likeToRegexpLike(String likePattern) {
         break;
     }
 
-    String escaped = escapeMetaCharacters(likePattern.substring(start, end));
-    StringBuilder sb = new StringBuilder(escaped.length() + 2);
-    sb.append(prefix);
-    sb.append(escaped);
-    sb.append(suffix);
+    likePattern = likePattern.substring(start, end);
+    return escapeMetaCharsAndWildcards(likePattern, prefix, suffix);
+  }
 
+  /**
+   * Escapes the provided pattern by considering the following constraints:
+   * <ul>
+   *     <li> SQL wildcards escaping is handled (_, %) </li>
+   *     <li> Regex meta characters escaping is handled </li>
+   * </ul>
+   * @param input the provided input string
+   * @param prefix the prefix to be added to the output string
+   * @param suffix the suffix to be added to the output string
+   * @return the final output string
+   */
+  private static String escapeMetaCharsAndWildcards(String input, String prefix, String suffix) {
+    StringBuilder sb = new StringBuilder();
+    sb.append(prefix);
+    // handling SQL wildcards (_, %) by replacing them with corresponding regex equivalents
+    // we ignore them if the SQL wildcards are escaped
     int i = 0;
-    while (i < sb.length()) {
-      char c = sb.charAt(i);
-      if (c == '_') {
-        sb.replace(i, i + 1, ".");
-      } else if (c == '%') {
-        sb.replace(i, i + 1, ".*");
-        i++;
+    int len = input.length();
+    boolean isPrevCharBackSlash = false;
+    while (i < len) {
+      char c = input.charAt(i);
+      switch (c) {
+        case '_':
+          sb.append(isPrevCharBackSlash ? c : ".");
+          break;
+        case '%':
+          sb.append(isPrevCharBackSlash ? c : ".*");
+          break;
+        default:
+          // either the current character is a meta-character
+          // OR
+          // this means the previous character is a \
+          // but it was not used for escaping SQL wildcards
+          // so let's escape this \ in the output
+          // this case is separately handled outside the meta characters list
+          if (Chars.indexOf(REGEXP_METACHARACTERS, c) >= 0 || isPrevCharBackSlash) {
+            sb.append(BACK_SLASH);
+          }
+          sb.append(c);
+          break;
       }
+      isPrevCharBackSlash = (c == BACK_SLASH);
       i++;
     }
 
+    // handle trailing \
+    if (isPrevCharBackSlash) {
+      sb.append(BACK_SLASH);
+    }
+
+    sb.append(suffix);
     return sb.toString();
   }
 
@@ -103,18 +148,6 @@ private static int indexOfLastDifferent(String str, char character) {
     return -1;
   }
 
-  /**
-   * Add escape characters before special characters
-   */
-  private static String escapeMetaCharacters(String pattern) {
-    for (String metaCharacter : REGEXP_METACHARACTERS) {
-      if (pattern.contains(metaCharacter)) {
-        pattern = pattern.replace(metaCharacter, "\\" + metaCharacter);
-      }
-    }
-    return pattern;
-  }
-
   /**
    * Converts a REGEXP_LIKE pattern into Lucene REGEXP pattern.
    */
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpErrorInfo.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpErrorInfo.java
index 90597453d54..b424ada19f0 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpErrorInfo.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/SimpleHttpErrorInfo.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.common.utils;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
@@ -30,6 +31,7 @@ public class SimpleHttpErrorInfo {
   private String _error;
 
   @JsonCreator
+  @JsonIgnoreProperties(ignoreUnknown = true)
   public SimpleHttpErrorInfo(@JsonProperty("code") int code, @JsonProperty("error") String message) {
     _code = code;
     _error = message;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/URIUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/URIUtils.java
index 042427b772d..5aff60b07fe 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/URIUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/URIUtils.java
@@ -70,6 +70,19 @@ public static String getPath(String basePath, String... parts) {
     return stringJoiner.toString();
   }
 
+  /**
+   * Returns the last part for the given path split by the file separator.
+   * If the file separator is not found, returns the whole path as the last part.
+   */
+  public static String getLastPart(String path) {
+    if (path == null) {
+      return null;
+    }
+    int parameterIndex = path.indexOf("?");
+    path = parameterIndex >= 0 ? path.substring(0, parameterIndex) : path;
+    return path.substring(path.lastIndexOf(File.separator) + 1);
+  }
+
   /**
    * Returns the download URL with the segment name encoded.
    */
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
index 420924af0a8..2682eb927a1 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionValue;
 
@@ -190,4 +191,8 @@ public static Integer getGroupTrimThreshold(Map<String, String> queryOptions) {
     String groupByTrimThreshold = queryOptions.get(QueryOptionKey.GROUP_TRIM_THRESHOLD);
     return groupByTrimThreshold != null ? Integer.parseInt(groupByTrimThreshold) : null;
   }
+
+  public static boolean shouldDropResults(Map<String, String> queryOptions) {
+    return Boolean.parseBoolean(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.DROP_RESULTS));
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java
index 8abb0ea964f..0a59696b10e 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TableConfigUtils.java
@@ -20,13 +20,18 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.spi.config.table.DedupConfig;
 import org.apache.pinot.spi.config.table.DimensionTableConfig;
@@ -34,6 +39,7 @@
 import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.QueryConfig;
 import org.apache.pinot.spi.config.table.QuotaConfig;
+import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
 import org.apache.pinot.spi.config.table.RoutingConfig;
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -50,9 +56,13 @@
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
 import org.apache.pinot.spi.config.table.ingestion.StreamIngestionConfig;
 import org.apache.pinot.spi.utils.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class TableConfigUtils {
+  private static final Logger LOGGER = LoggerFactory.getLogger(TableConfigUtils.class);
+
   private TableConfigUtils() {
   }
 
@@ -113,11 +123,11 @@ public static TableConfig fromZNRecord(ZNRecord znRecord)
       queryConfig = JsonUtils.stringToObject(queryConfigString, QueryConfig.class);
     }
 
-    Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap = null;
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = null;
     String instanceAssignmentConfigMapString = simpleFields.get(TableConfig.INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY);
     if (instanceAssignmentConfigMapString != null) {
       instanceAssignmentConfigMap = JsonUtils.stringToObject(instanceAssignmentConfigMapString,
-          new TypeReference<Map<InstancePartitionsType, InstanceAssignmentConfig>>() {
+          new TypeReference<Map<String, InstanceAssignmentConfig>>() {
           });
     }
 
@@ -181,9 +191,9 @@ public static TableConfig fromZNRecord(ZNRecord znRecord)
     }
 
     return new TableConfig(tableName, tableType, validationConfig, tenantConfig, indexingConfig, customConfig,
-        quotaConfig, taskConfig, routingConfig, queryConfig, instanceAssignmentConfigMap,
-        fieldConfigList, upsertConfig, dedupConfig, dimensionTableConfig, ingestionConfig, tierConfigList, isDimTable,
-        tunerConfigList, instancePartitionsMap, segmentAssignmentConfigMap);
+        quotaConfig, taskConfig, routingConfig, queryConfig, instanceAssignmentConfigMap, fieldConfigList, upsertConfig,
+        dedupConfig, dimensionTableConfig, ingestionConfig, tierConfigList, isDimTable, tunerConfigList,
+        instancePartitionsMap, segmentAssignmentConfigMap);
   }
 
   public static ZNRecord toZNRecord(TableConfig tableConfig)
@@ -216,8 +226,7 @@ public static ZNRecord toZNRecord(TableConfig tableConfig)
     if (queryConfig != null) {
       simpleFields.put(TableConfig.QUERY_CONFIG_KEY, queryConfig.toJsonString());
     }
-    Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap =
-        tableConfig.getInstanceAssignmentConfigMap();
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
     if (instanceAssignmentConfigMap != null) {
       simpleFields
           .put(TableConfig.INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY, JsonUtils.objectToString(instanceAssignmentConfigMap));
@@ -332,6 +341,96 @@ public static void convertFromLegacyTableConfig(TableConfig tableConfig) {
     validationConfig.setSegmentPushType(null);
   }
 
+  /**
+   * Helper method to create a new TableConfig by overwriting the original TableConfig with tier specific configs, so
+   * that the consumers of TableConfig don't have to handle tier overwrites themselves. To begin with, we only
+   * consider to overwrite the index configs in `tableIndexConfig` and `fieldConfigList`, e.g.
+   *
+   * {
+   *   "tableIndexConfig": {
+   *     ... // configs allowed in IndexingConfig, for default tier
+   *     "tierOverwrites": {
+   *       "hotTier": {...}, // configs allowed in IndexingConfig, for hot tier
+   *       "coldTier": {...} // configs allowed in IndexingConfig, for cold tier
+   *     }
+   *   }
+   *   "fieldConfigList": [
+   *     {
+   *       ... // configs allowed in FieldConfig, for default tier
+   *       "tierOverwrites": {
+   *         "hotTier": {...}, // configs allowed in FieldConfig, for hot tier
+   *         "coldTier": {...} // configs allowed in FieldConfig, for cold tier
+   *       }
+   *     },
+   *     ...
+   *   ]
+   * }
+   *
+   * Overwriting is to extract tier specific configs from those `tierOverwrites` sections and replace the
+   * corresponding configs set for default tier.
+   *
+   * TODO: Other tier specific configs like segment assignment policy may be handled in this helper method too, to
+   *       keep tier overwrites transparent to consumers of TableConfig.
+   *
+   * @param tableConfig the input table config which is kept intact
+   * @param tier        the target tier to overwrite the table config
+   * @return a new table config overwritten for the tier, or the original table if overwriting doesn't happen.
+   */
+  public static TableConfig overwriteTableConfigForTier(TableConfig tableConfig, @Nullable String tier) {
+    if (tier == null) {
+      return tableConfig;
+    }
+    try {
+      boolean updated = false;
+      JsonNode tblCfgJson = tableConfig.toJsonNode();
+      // Apply tier specific overwrites for `tableIndexConfig`
+      JsonNode tblIdxCfgJson = tblCfgJson.get(TableConfig.INDEXING_CONFIG_KEY);
+      if (tblIdxCfgJson != null && tblIdxCfgJson.has(TableConfig.TIER_OVERWRITES_KEY)) {
+        JsonNode tierCfgJson = tblIdxCfgJson.get(TableConfig.TIER_OVERWRITES_KEY).get(tier);
+        if (tierCfgJson != null) {
+          LOGGER.debug("Got table index config overwrites: {} for tier: {}", tierCfgJson, tier);
+          overwriteConfig(tblIdxCfgJson, tierCfgJson);
+          updated = true;
+        }
+      }
+      // Apply tier specific overwrites for `fieldConfigList`
+      JsonNode fieldCfgListJson = tblCfgJson.get(TableConfig.FIELD_CONFIG_LIST_KEY);
+      if (fieldCfgListJson != null && fieldCfgListJson.isArray()) {
+        Iterator<JsonNode> fieldCfgListItr = fieldCfgListJson.elements();
+        while (fieldCfgListItr.hasNext()) {
+          JsonNode fieldCfgJson = fieldCfgListItr.next();
+          if (!fieldCfgJson.has(TableConfig.TIER_OVERWRITES_KEY)) {
+            continue;
+          }
+          JsonNode tierCfgJson = fieldCfgJson.get(TableConfig.TIER_OVERWRITES_KEY).get(tier);
+          if (tierCfgJson != null) {
+            LOGGER.debug("Got field index config overwrites: {} for tier: {}", tierCfgJson, tier);
+            overwriteConfig(fieldCfgJson, tierCfgJson);
+            updated = true;
+          }
+        }
+      }
+      if (updated) {
+        LOGGER.debug("Got overwritten table config: {} for tier: {}", tblCfgJson, tier);
+        return JsonUtils.jsonNodeToObject(tblCfgJson, TableConfig.class);
+      } else {
+        LOGGER.debug("No table config overwrites for tier: {}", tier);
+        return tableConfig;
+      }
+    } catch (IOException e) {
+      LOGGER.warn("Failed to overwrite table config for tier: {} for table: {}", tier, tableConfig.getTableName(), e);
+      return tableConfig;
+    }
+  }
+
+  private static void overwriteConfig(JsonNode oldCfg, JsonNode newCfg) {
+    Iterator<Map.Entry<String, JsonNode>> cfgItr = newCfg.fields();
+    while (cfgItr.hasNext()) {
+      Map.Entry<String, JsonNode> cfgEntry = cfgItr.next();
+      ((ObjectNode) oldCfg).set(cfgEntry.getKey(), cfgEntry.getValue());
+    }
+  }
+
   /**
    * Returns true if the table has pre-configured instance partitions for any type (OFFLINE/CONSUMING/COMPLETED).
    */
@@ -347,4 +446,27 @@ public static boolean hasPreConfiguredInstancePartitions(TableConfig tableConfig
     return hasPreConfiguredInstancePartitions(tableConfig)
         && tableConfig.getInstancePartitionsMap().containsKey(instancePartitionsType);
   }
+
+  /**
+   * Get the partition column from tableConfig instance assignment config map.
+   * @param tableConfig table config
+   * @return partition column
+   */
+  public static String getPartitionColumn(TableConfig tableConfig) {
+    // check InstanceAssignmentConfigMap is null or empty,
+    if (!MapUtils.isEmpty(tableConfig.getInstanceAssignmentConfigMap())) {
+      for (InstanceAssignmentConfig instanceAssignmentConfig : tableConfig.getInstanceAssignmentConfigMap().values()) {
+        //check InstanceAssignmentConfig has the InstanceReplicaGroupPartitionConfig with non-empty partitionColumn
+        if (StringUtils.isNotEmpty(instanceAssignmentConfig.getReplicaGroupPartitionConfig().getPartitionColumn())) {
+          return instanceAssignmentConfig.getReplicaGroupPartitionConfig().getPartitionColumn();
+        }
+      }
+    }
+
+    // for backward-compatibility, If partitionColumn value isn't there in InstanceReplicaGroupPartitionConfig
+    // check ReplicaGroupStrategyConfig for partitionColumn
+    ReplicaGroupStrategyConfig replicaGroupStrategyConfig =
+        tableConfig.getValidationConfig().getReplicaGroupStrategyConfig();
+    return replicaGroupStrategyConfig != null ? replicaGroupStrategyConfig.getPartitionColumn() : null;
+  }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java
index 15ed490dc8b..28a2e30d471 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TagNameUtils.java
@@ -102,6 +102,13 @@ public static String getRealtimeTagForTenant(@Nullable String tenantName) {
     return getTagForTenant(tenantName, REALTIME_SERVER_TAG_SUFFIX);
   }
 
+  /**
+   * Returns the server tag name for the given tenant and the given table type.
+   */
+  public static String getServerTagForTenant(@Nullable String tenantName, TableType type) {
+    return getTagForTenant(tenantName, String.format("_%s", type));
+  }
+
   private static String getTagForTenant(@Nullable String tenantName, String tagSuffix) {
     if (tenantName == null) {
       return DEFAULT_TENANT_NAME + tagSuffix;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TierConfigUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TierConfigUtils.java
index 835dddf67af..31e32113e73 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TierConfigUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/TierConfigUtils.java
@@ -18,16 +18,19 @@
  */
 package org.apache.pinot.common.utils.config;
 
-import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.helix.HelixManager;
+import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.common.assignment.InstancePartitionsUtils;
 import org.apache.pinot.common.tier.FixedTierSegmentSelector;
+import org.apache.pinot.common.tier.PinotServerTierStorage;
 import org.apache.pinot.common.tier.Tier;
 import org.apache.pinot.common.tier.TierFactory;
 import org.apache.pinot.common.tier.TierSegmentSelector;
@@ -59,10 +62,38 @@ public static String normalizeTierName(String tierName) {
     return tierName == null ? "default" : tierName;
   }
 
+  /**
+   * Consider configured tiers and compute default instance partitions for the segment
+   *
+   * @return InstancePartitions if the one can be derived from the given sorted tiers, null otherwise
+   */
+  @Nullable
+  public static InstancePartitions getTieredInstancePartitionsForSegment(String tableNameWithType,
+      String segmentName, @Nullable List<Tier> sortedTiers, HelixManager helixManager) {
+    if (CollectionUtils.isEmpty(sortedTiers)) {
+      return null;
+    }
+
+    // Find first applicable tier
+    for (Tier tier : sortedTiers) {
+      if (tier.getSegmentSelector().selectSegment(tableNameWithType, segmentName)) {
+        // Compute default instance partitions
+        PinotServerTierStorage storage = (PinotServerTierStorage) tier.getStorage();
+        return InstancePartitionsUtils.computeDefaultInstancePartitionsForTag(helixManager, tableNameWithType,
+            tier.getName(), storage.getServerTag());
+      }
+    }
+
+    // Tier not found
+    return null;
+  }
+
+  @Nullable
   public static String getDataDirForTier(TableConfig tableConfig, String tierName) {
     return getDataDirForTier(tableConfig, tierName, Collections.emptyMap());
   }
 
+  @Nullable
   public static String getDataDirForTier(TableConfig tableConfig, String tierName,
       Map<String, Map<String, String>> instanceTierConfigs) {
     String tableNameWithType = tableConfig.getTableName();
@@ -78,17 +109,17 @@ public static String getDataDirForTier(TableConfig tableConfig, String tierName,
       }
       if (tierCfg != null) {
         Map<String, String> backendProps = tierCfg.getTierBackendProperties();
-        if (backendProps != null) {
-          dataDir = backendProps.get(CommonConstants.Tier.BACKEND_PROP_DATA_DIR);
-        } else {
+        if (backendProps == null) {
           LOGGER.debug("No backend props for tier: {} in TableConfig of table: {}", tierName, tableNameWithType);
-        }
-        if (StringUtils.isNotEmpty(dataDir)) {
-          LOGGER.debug("Got dataDir: {} for tier: {} in TableConfig of table: {}", dataDir, tierName,
-              tableNameWithType);
-          return dataDir;
         } else {
-          LOGGER.debug("No dataDir for tier: {} in TableConfig of table: {}", tierName, tableNameWithType);
+          dataDir = backendProps.get(CommonConstants.Tier.BACKEND_PROP_DATA_DIR);
+          if (StringUtils.isNotEmpty(dataDir)) {
+            LOGGER.debug("Got dataDir: {} for tier: {} in TableConfig of table: {}", dataDir, tierName,
+                tableNameWithType);
+            return dataDir;
+          } else {
+            LOGGER.debug("No dataDir for tier: {} in TableConfig of table: {}", tierName, tableNameWithType);
+          }
         }
       }
     }
@@ -98,8 +129,6 @@ public static String getDataDirForTier(TableConfig tableConfig, String tierName,
       // All instance config names are lower cased while being passed down here.
       dataDir = instanceCfgs.get(CommonConstants.Tier.BACKEND_PROP_DATA_DIR.toLowerCase());
     }
-    Preconditions.checkState(StringUtils.isNotEmpty(dataDir), "No dataDir for tier: %s for table: %s", tierName,
-        tableNameWithType);
     LOGGER.debug("Got dataDir: {} for tier: {} for table: {} in instance configs", dataDir, tierName,
         tableNameWithType);
     return dataDir;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/BaseSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/BaseSegmentFetcher.java
index 2fadaffd0ac..d1756147d42 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/BaseSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/BaseSegmentFetcher.java
@@ -22,6 +22,7 @@
 import java.net.URI;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pinot.common.auth.AuthProviderUtils;
 import org.apache.pinot.spi.auth.AuthProvider;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -102,7 +103,8 @@ public void fetchSegmentToLocal(List<URI> uris, File dest)
     });
   }
 
-  public File fetchUntarSegmentToLocalStreamed(URI uri, File dest, long rateLimit)
+  public File fetchUntarSegmentToLocalStreamed(URI uri, File dest, long rateLimit,
+      AtomicInteger attempts)
       throws Exception {
     throw new UnsupportedOperationException();
   }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpSegmentFetcher.java
index 741ac18315a..be73c1908b6 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpSegmentFetcher.java
@@ -24,6 +24,7 @@
 import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
@@ -32,7 +33,10 @@
 import org.apache.pinot.common.exception.HttpErrorStatusException;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
 import org.apache.pinot.common.utils.RoundRobinURIProvider;
+import org.apache.pinot.common.utils.http.HttpClientConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.retry.AttemptsExceededException;
+import org.apache.pinot.spi.utils.retry.RetriableOperationException;
 import org.apache.pinot.spi.utils.retry.RetryPolicies;
 
 
@@ -41,7 +45,7 @@ public class HttpSegmentFetcher extends BaseSegmentFetcher {
 
   @Override
   protected void doInit(PinotConfiguration config) {
-    _httpClient = new FileUploadDownloadClient();
+    _httpClient = new FileUploadDownloadClient(HttpClientConfig.newBuilder(config).build());
   }
 
   @Override
@@ -51,8 +55,7 @@ public void fetchSegmentToLocal(URI downloadURI, File dest)
     // download from a same broken host as: 1) DNS may not RR the IP addresses 2) OS cache the DNS resolution result.
     RoundRobinURIProvider uriProvider = new RoundRobinURIProvider(downloadURI);
 
-    // Use the minimal value of configured retry count and number of IP addresses.
-    int retryCount = Math.min(_retryCount, uriProvider.numAddresses());
+    int retryCount = getRetryCount(uriProvider);
 
     _logger.info("Retry downloading for {} times. retryCount from pinot server config: {}, number of IP addresses for "
         + "download URI: {}", retryCount, _retryCount, uriProvider.numAddresses());
@@ -95,55 +98,74 @@ public void fetchSegmentToLocal(URI downloadURI, File dest)
     });
   }
 
+  private int getRetryCount(RoundRobinURIProvider uriProvider) {
+    // Use the minimal value of configured retry count and number of IP addresses.
+    return Math.min(_retryCount, uriProvider.numAddresses());
+  }
+
   @Override
-  public File fetchUntarSegmentToLocalStreamed(URI downloadURI, File dest, long maxStreamRateInByte)
+  public File fetchUntarSegmentToLocalStreamed(URI downloadURI, File dest, long maxStreamRateInByte,
+      AtomicInteger attempts)
       throws Exception {
-    // Create a RoundRobinURIProvider to round robin IP addresses when retry uploading. Otherwise may always try to
+    // Create a RoundRobinURIProvider to round robin IP addresses when retry uploading. Otherwise, may always try to
     // download from a same broken host as: 1) DNS may not RR the IP addresses 2) OS cache the DNS resolution result.
     RoundRobinURIProvider uriProvider = new RoundRobinURIProvider(downloadURI);
-    int retryCount = Math.max(_retryCount, uriProvider.numAddresses());
+
+    int retryCount = getRetryCount(uriProvider);
+
     AtomicReference<File> ret = new AtomicReference<>(); // return the untared segment directory
     _logger.info("Retry downloading for {} times. retryCount from pinot server config: {}, number of IP addresses for "
         + "download URI: {}", retryCount, _retryCount, uriProvider.numAddresses());
-    RetryPolicies.exponentialBackoffRetryPolicy(retryCount, _retryWaitMs, _retryDelayScaleFactor).attempt(() -> {
-      URI uri = uriProvider.next();
-      try {
-        String hostName = downloadURI.getHost();
-        int port = downloadURI.getPort();
-        // If the original download address is specified as host name, need add a "HOST" HTTP header to the HTTP
-        // request. Otherwise, if the download address is a LB address, when the LB be configured as "disallow direct
-        // access by IP address", downloading will fail.
-        List<Header> httpHeaders = new LinkedList<>();
-        if (!InetAddresses.isInetAddress(hostName)) {
-          httpHeaders.add(new BasicHeader(HttpHeaders.HOST, hostName + ":" + port));
-        }
-        ret.set(_httpClient.downloadUntarFileStreamed(uri, dest, _authProvider, httpHeaders, maxStreamRateInByte));
+    int tries;
+    try {
+      tries = RetryPolicies.exponentialBackoffRetryPolicy(retryCount, _retryWaitMs, _retryDelayScaleFactor).attempt(
+          () -> {
+        URI uri = uriProvider.next();
+        try {
+          String hostName = downloadURI.getHost();
+          int port = downloadURI.getPort();
+          // If the original download address is specified as host name, need add a "HOST" HTTP header to the HTTP
+          // request. Otherwise, if the download address is a LB address, when the LB be configured as "disallow direct
+          // access by IP address", downloading will fail.
+          List<Header> httpHeaders = new LinkedList<>();
+          if (!InetAddresses.isInetAddress(hostName)) {
+            httpHeaders.add(new BasicHeader(HttpHeaders.HOST, hostName + ":" + port));
+          }
+          ret.set(_httpClient.downloadUntarFileStreamed(uri, dest, _authProvider, httpHeaders, maxStreamRateInByte));
 
-        return true;
-      } catch (HttpErrorStatusException e) {
-        int statusCode = e.getStatusCode();
-        if (statusCode == HttpStatus.SC_NOT_FOUND || statusCode >= 500) {
-          // Temporary exception
-          // 404 is treated as a temporary exception, as the downloadURI may be backed by multiple hosts,
-          // if singe host is down, can retry with another host.
-          _logger.warn("Got temporary error status code: {} while downloading segment from: {} to: {}", statusCode, uri,
+          return true;
+        } catch (HttpErrorStatusException e) {
+          int statusCode = e.getStatusCode();
+          if (statusCode == HttpStatus.SC_NOT_FOUND || statusCode >= 500) {
+            // Temporary exception
+            // 404 is treated as a temporary exception, as the downloadURI may be backed by multiple hosts,
+            // if singe host is down, can retry with another host.
+            _logger.warn("Got temporary error status code: {} while downloading segment from: {} to: {}", statusCode,
+                uri, dest, e);
+            return false;
+          } else {
+            // Permanent exception
+            _logger.error("Got permanent error status code: {} while downloading segment from: {} to: {}, won't retry",
+                statusCode, uri, dest, e);
+            throw e;
+          }
+        } catch (IOException e) {
+          _logger.warn("Caught IOException while stream download-untarring segment from: {} to: {}, retrying", uri,
               dest, e);
           return false;
-        } else {
-          // Permanent exception
-          _logger.error("Got permanent error status code: {} while downloading segment from: {} to: {}, won't retry",
-              statusCode, uri, dest, e);
-          throw e;
+        } catch (Exception e) {
+          _logger.warn("Caught exception while downloading segment from: {} to: {}", uri, dest, e);
+          return false;
         }
-      } catch (IOException e) {
-        _logger.warn("Caught IOException while stream download-untarring segment from: {} to: {}, retrying",
-            uri, dest, e);
-        return false;
-      } catch (Exception e) {
-        _logger.warn("Caught exception while downloading segment from: {} to: {}", uri, dest, e);
-        return false;
-      }
-    });
+      });
+    } catch (AttemptsExceededException e) {
+      attempts.set(e.getAttempts());
+      throw e;
+    } catch (RetriableOperationException e) {
+      attempts.set(e.getAttempts());
+      throw e;
+    }
+    attempts.set(tries);
     return ret.get();
   }
 
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpsSegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpsSegmentFetcher.java
index 64dcb601c1e..71528595d8d 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpsSegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/HttpsSegmentFetcher.java
@@ -22,6 +22,7 @@
 import javax.net.ssl.SSLContext;
 import org.apache.pinot.common.utils.ClientSSLContextGenerator;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
+import org.apache.pinot.common.utils.http.HttpClientConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.CommonConstants;
 
@@ -69,6 +70,6 @@ protected void doInit(PinotConfiguration config) {
     }
 
     SSLContext sslContext = new ClientSSLContextGenerator(sslConfig).generate();
-    _httpClient = new FileUploadDownloadClient(sslContext);
+    _httpClient = new FileUploadDownloadClient(HttpClientConfig.newBuilder(config).build(), sslContext);
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcher.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcher.java
index da4936f4336..78d720751f5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcher.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcher.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.net.URI;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pinot.spi.env.PinotConfiguration;
 
 
@@ -40,7 +41,7 @@ void fetchSegmentToLocal(URI uri, File dest)
   /**
    * Fetches a segment from URI location and untar to local in a streamed manner
    */
-  File fetchUntarSegmentToLocalStreamed(URI uri, File dest, long rateLimit)
+  File fetchUntarSegmentToLocalStreamed(URI uri, File dest, long rateLimit, AtomicInteger attempts)
       throws Exception;
 
   /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactory.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactory.java
index 2fc0124cb42..3c3f66248cc 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactory.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactory.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pinot.common.auth.AuthConfig;
 import org.apache.pinot.common.auth.AuthProviderUtils;
 import org.apache.pinot.spi.crypt.PinotCrypter;
@@ -166,14 +167,17 @@ private void fetchSegmentToLocalInternal(URI uri, File dest)
    * @return the untared directory
    * @throws Exception
    */
-  public static File fetchAndStreamUntarToLocal(String uri, File tempRootDir, long maxStreamRateInByte)
+  public static File fetchAndStreamUntarToLocal(String uri, File tempRootDir,
+      long maxStreamRateInByte, AtomicInteger attempts)
       throws Exception {
-    return getInstance().fetchAndStreamUntarToLocalInternal(new URI(uri), tempRootDir, maxStreamRateInByte);
+    return getInstance().fetchAndStreamUntarToLocalInternal(new URI(uri), tempRootDir, maxStreamRateInByte, attempts);
   }
 
-  private File fetchAndStreamUntarToLocalInternal(URI uri, File tempRootDir, long maxStreamRateInByte)
+  private File fetchAndStreamUntarToLocalInternal(URI uri, File tempRootDir,
+      long maxStreamRateInByte, AtomicInteger attempts)
       throws Exception {
-    return getSegmentFetcher(uri.getScheme()).fetchUntarSegmentToLocalStreamed(uri, tempRootDir, maxStreamRateInByte);
+    return getSegmentFetcher(uri.getScheme()).fetchUntarSegmentToLocalStreamed(uri, tempRootDir, maxStreamRateInByte,
+        attempts);
   }
 
   /**
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java
index f39316cec99..4160dd44efc 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/helix/HelixHelper.java
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -78,6 +79,11 @@ private HelixHelper() {
 
   public static final String BROKER_RESOURCE = CommonConstants.Helix.BROKER_RESOURCE_INSTANCE;
 
+  private static int _minNumCharsInISToTurnOnCompression = -1;
+
+  public static synchronized void setMinNumCharsInISToTurnOnCompression(int minNumChars) {
+    _minNumCharsInISToTurnOnCompression = minNumChars;
+  }
   public static IdealState cloneIdealState(IdealState idealState) {
     return new IdealState(
         (ZNRecord) ZN_RECORD_SERIALIZER.deserialize(ZN_RECORD_SERIALIZER.serialize(idealState.getRecord())));
@@ -127,7 +133,7 @@ public Boolean call() {
             updatedIdealState.setNumPartitions(numPartitions);
 
             // If the ideal state is large enough, enable compression
-            boolean enableCompression = numPartitions > NUM_PARTITIONS_THRESHOLD_TO_ENABLE_COMPRESSION;
+            boolean enableCompression = shouldCompress(updatedIdealState);
             if (enableCompression) {
               updatedZNRecord.setBooleanField(ENABLE_COMPRESSIONS_KEY, true);
             } else {
@@ -163,6 +169,34 @@ public Boolean call() {
             return true;
           }
         }
+
+        private boolean shouldCompress(IdealState is) {
+          if (is.getNumPartitions() > NUM_PARTITIONS_THRESHOLD_TO_ENABLE_COMPRESSION) {
+            return true;
+          }
+
+          // Find the number of characters in one partition in idealstate, and extrapolate
+          // to estimate the number of characters.
+          // We could serialize the znode to determine the exact size, but that would mean serializing every
+          // idealstate znode twice. We avoid some extra GC by estimating the size instead. Such estimations
+          // should be good for most installations that have similar segment and instance names.
+          Iterator<String> it = is.getPartitionSet().iterator();
+          if (it.hasNext()) {
+            String partitionName = it.next();
+            int numChars = partitionName.length();
+            Map<String, String> stateMap = is.getInstanceStateMap(partitionName);
+            for (Map.Entry<String, String> entry : stateMap.entrySet()) {
+              numChars += entry.getKey().length();
+              numChars += entry.getValue().length();
+            }
+            numChars *= is.getNumPartitions();
+            if (_minNumCharsInISToTurnOnCompression > 0
+                && numChars > _minNumCharsInISToTurnOnCompression) {
+              return true;
+            }
+          }
+          return false;
+        }
       });
       return idealStateWrapper._idealState;
     } catch (Exception e) {
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClient.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClient.java
index 4bd7117ab83..06361da5e98 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClient.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClient.java
@@ -53,6 +53,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.apache.pinot.common.auth.AuthProviderUtils;
@@ -86,14 +87,18 @@ public class HttpClient implements AutoCloseable {
   private final CloseableHttpClient _httpClient;
 
   public HttpClient() {
-    this(null);
+    this(HttpClientConfig.DEFAULT_HTTP_CLIENT_CONFIG, null);
   }
 
   public HttpClient(@Nullable SSLContext sslContext) {
+    this(HttpClientConfig.DEFAULT_HTTP_CLIENT_CONFIG, sslContext);
+  }
+
+  public HttpClient(HttpClientConfig httpClientConfig, @Nullable SSLContext sslContext) {
     SSLContext context = sslContext != null ? sslContext : TlsUtils.getSslContext();
     // Set NoopHostnameVerifier to skip validating hostname when uploading/downloading segments.
     SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(context, NoopHostnameVerifier.INSTANCE);
-    _httpClient = HttpClients.custom().setSSLSocketFactory(csf).build();
+    _httpClient = buildCloseableHttpClient(httpClientConfig, csf);
   }
 
   public static HttpClient getInstance() {
@@ -101,7 +106,8 @@ public static HttpClient getInstance() {
   }
 
   private static final class HttpClientHolder {
-    static final HttpClient HTTP_CLIENT = new HttpClient(TlsUtils.getSslContext());
+    static final HttpClient HTTP_CLIENT =
+        new HttpClient(HttpClientConfig.DEFAULT_HTTP_CLIENT_CONFIG, TlsUtils.getSslContext());
   }
 
   // --------------------------------------------------------------------------
@@ -464,6 +470,18 @@ public static void setTimeout(RequestBuilder requestBuilder, int socketTimeoutMs
     requestBuilder.setConfig(requestConfig);
   }
 
+  private static CloseableHttpClient buildCloseableHttpClient(HttpClientConfig httpClientConfig,
+      SSLConnectionSocketFactory csf) {
+    HttpClientBuilder httpClientBuilder = HttpClients.custom().setSSLSocketFactory(csf);
+    if (httpClientConfig.getMaxConnTotal() > 0) {
+      httpClientBuilder.setMaxConnTotal(httpClientConfig.getMaxConnTotal());
+    }
+    if (httpClientConfig.getMaxConnPerRoute() > 0) {
+      httpClientBuilder.setMaxConnPerRoute(httpClientConfig.getMaxConnPerRoute());
+    }
+    return httpClientBuilder.build();
+  }
+
   private static String getErrorMessage(HttpUriRequest request, CloseableHttpResponse response) {
     String controllerHost = null;
     String controllerVersion = null;
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClientConfig.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClientConfig.java
new file mode 100644
index 00000000000..d424efbfaa6
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/http/HttpClientConfig.java
@@ -0,0 +1,107 @@
+/**
+ * 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.pinot.common.utils.http;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.spi.env.PinotConfiguration;
+
+
+public class HttpClientConfig {
+  // Default config uses default values which are same as what Apache Commons Http-Client uses.
+  public static final HttpClientConfig DEFAULT_HTTP_CLIENT_CONFIG = HttpClientConfig.newBuilder().build();
+
+  protected static final String MAX_CONNS_CONFIG_NAME = "http.client.maxConnTotal";
+  protected static final String MAX_CONNS_PER_ROUTE_CONFIG_NAME = "http.client.maxConnPerRoute";
+  protected static final String DISABLE_DEFAULT_USER_AGENT_CONFIG_NAME = "http.client.disableDefaultUserAgent";
+
+  private final int _maxConnTotal;
+  private final int _maxConnPerRoute;
+  private final boolean _disableDefaultUserAgent;
+
+  private HttpClientConfig(int maxConnTotal, int maxConnPerRoute, boolean disableDefaultUserAgent) {
+    _maxConnTotal = maxConnTotal;
+    _maxConnPerRoute = maxConnPerRoute;
+    _disableDefaultUserAgent = disableDefaultUserAgent;
+  }
+
+  public int getMaxConnTotal() {
+    return _maxConnTotal;
+  }
+
+  public int getMaxConnPerRoute() {
+    return _maxConnPerRoute;
+  }
+
+  public boolean isDisableDefaultUserAgent() {
+    return _disableDefaultUserAgent;
+  }
+
+  /**
+   * Creates a {@link HttpClientConfig.Builder} and initializes it with relevant configs from the provided
+   * configuration. Since http-clients are used in a bunch of places in the code, each use-case can have their own
+   * prefix for their config. The caller should call {@link PinotConfiguration#subset(String)} to remove their prefix
+   * and this builder will look for exact matches of its relevant configs.
+   */
+  public static Builder newBuilder(PinotConfiguration pinotConfiguration) {
+    Builder builder = new Builder();
+    String maxConns = pinotConfiguration.getProperty(MAX_CONNS_CONFIG_NAME);
+    if (StringUtils.isNotEmpty(maxConns)) {
+      builder.withMaxConns(Integer.parseInt(maxConns));
+    }
+    String maxConnsPerRoute = pinotConfiguration.getProperty(MAX_CONNS_PER_ROUTE_CONFIG_NAME);
+    if (StringUtils.isNotEmpty(maxConnsPerRoute)) {
+      builder.withMaxConnsPerRoute(Integer.parseInt(maxConnsPerRoute));
+    }
+    boolean disableDefaultUserAgent = pinotConfiguration.getProperty(DISABLE_DEFAULT_USER_AGENT_CONFIG_NAME, false);
+    builder.withDisableDefaultUserAgent(disableDefaultUserAgent);
+    return builder;
+  }
+
+  private static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public static class Builder {
+    private int _maxConns = -1;
+    private int _maxConnsPerRoute = -1;
+    private boolean _disableDefaultUserAgent = false;
+
+    private Builder() {
+    }
+
+    public Builder withMaxConns(int maxConns) {
+      _maxConns = maxConns;
+      return this;
+    }
+
+    public Builder withMaxConnsPerRoute(int maxConnsPerRoute) {
+      _maxConnsPerRoute = maxConnsPerRoute;
+      return this;
+    }
+
+    public Builder withDisableDefaultUserAgent(boolean disableDefaultUserAgent) {
+      _disableDefaultUserAgent = disableDefaultUserAgent;
+      return this;
+    }
+
+    public HttpClientConfig build() {
+      return new HttpClientConfig(_maxConns, _maxConnsPerRoute, _disableDefaultUserAgent);
+    }
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java
index deb26491b17..6ac7845c9d8 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/request/RequestUtils.java
@@ -19,13 +19,17 @@
 package org.apache.pinot.common.utils.request;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import org.apache.calcite.sql.SqlLiteral;
 import org.apache.calcite.sql.SqlNumericLiteral;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.request.DataSource;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
@@ -44,10 +48,16 @@
 
 public class RequestUtils {
   private static final Logger LOGGER = LoggerFactory.getLogger(RequestUtils.class);
+  private static final JsonNode EMPTY_OBJECT_NODE = new ObjectMapper().createObjectNode();
 
   private RequestUtils() {
   }
 
+  public static SqlNodeAndOptions parseQuery(String query)
+      throws SqlCompilationException {
+    return parseQuery(query, EMPTY_OBJECT_NODE);
+  }
+
   public static SqlNodeAndOptions parseQuery(String query, JsonNode request)
       throws SqlCompilationException {
     long parserStartTimeNs = System.nanoTime();
@@ -115,11 +125,13 @@ public static Expression getLiteralExpression(SqlLiteral node) {
         literal.setDoubleValue(node.bigDecimalValue().doubleValue());
       }
     } else {
-      // TODO: Support null literal and other types.
       switch (node.getTypeName()) {
         case BOOLEAN:
           literal.setBoolValue(node.booleanValue());
           break;
+        case NULL:
+          literal.setNullValue(true);
+          break;
         default:
           literal.setStringValue(StringUtils.replace(node.toValue(), "''", "'"));
           break;
@@ -166,7 +178,16 @@ public static Expression getLiteralExpression(byte[] value) {
     return expression;
   }
 
+  public static Expression getNullLiteralExpression() {
+    Expression expression = createNewLiteralExpression();
+    expression.getLiteral().setNullValue(true);
+    return expression;
+  }
+
   public static Expression getLiteralExpression(Object object) {
+    if (object == null) {
+      return getNullLiteralExpression();
+    }
     if (object instanceof Integer || object instanceof Long) {
       return RequestUtils.getLiteralExpression(((Number) object).longValue());
     }
@@ -247,11 +268,19 @@ public static String prettyPrint(Expression expression) {
     return null;
   }
 
-  public static String getTableName(PinotQuery pinotQuery) {
-    while (pinotQuery.getDataSource().getSubquery() != null) {
-      pinotQuery = pinotQuery.getDataSource().getSubquery();
+  private static Set<String> getTableNames(DataSource dataSource) {
+    if (dataSource.getSubquery() != null) {
+      return getTableNames(dataSource.getSubquery());
+    } else if (dataSource.isSetJoin()) {
+      return ImmutableSet.<String>builder()
+          .addAll(getTableNames(dataSource.getJoin().getLeft()))
+          .addAll(getTableNames(dataSource.getJoin().getLeft())).build();
     }
-    return pinotQuery.getDataSource().getTableName();
+    return ImmutableSet.of(dataSource.getTableName());
+  }
+
+  public static Set<String> getTableNames(PinotQuery pinotQuery) {
+    return getTableNames(pinotQuery.getDataSource());
   }
 
   public static Map<String, String> getOptionsFromJson(JsonNode request, String optionsKey) {
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
index 57721f62e54..5d7581874f2 100644
--- a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
@@ -20,6 +20,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,6 +37,7 @@
 import org.apache.calcite.sql.SqlDataTypeSpec;
 import org.apache.calcite.sql.SqlExplain;
 import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlJoin;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlLiteral;
 import org.apache.calcite.sql.SqlNode;
@@ -57,11 +59,12 @@
 import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.Identifier;
+import org.apache.pinot.common.request.Join;
+import org.apache.pinot.common.request.JoinType;
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.common.utils.config.QueryOptionsUtils;
 import org.apache.pinot.common.utils.request.RequestUtils;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
-import org.apache.pinot.spi.utils.Pairs;
 import org.apache.pinot.sql.FilterKind;
 import org.apache.pinot.sql.parsers.parser.SqlInsertFromFile;
 import org.apache.pinot.sql.parsers.parser.SqlParserImpl;
@@ -75,6 +78,11 @@ public class CalciteSqlParser {
   private CalciteSqlParser() {
   }
 
+  public static final String ASC = "asc";
+  public static final String DESC = "desc";
+  public static final String NULLS_LAST = "nullslast";
+  public static final String NULLS_FIRST = "nullsfirst";
+  public static final ImmutableSet<String> ORDER_BY_FUNCTIONS = ImmutableSet.of(ASC, DESC, NULLS_LAST, NULLS_FIRST);
   public static final List<QueryRewriter> QUERY_REWRITERS = new ArrayList<>(QueryRewriterFactory.getQueryRewriters());
   private static final Logger LOGGER = LoggerFactory.getLogger(CalciteSqlParser.class);
 
@@ -111,9 +119,6 @@ public static SqlNodeAndOptions compileToSqlNodeAndOptions(String sql)
       throws SqlCompilationException {
     long parseStartTimeNs = System.nanoTime();
 
-    // Remove the comments from the query
-    sql = removeComments(sql);
-
     // Remove the terminating semicolon from the query
     sql = removeTerminatingSemicolon(sql);
 
@@ -253,7 +258,7 @@ private static void validateDistinctQuery(PinotQuery pinotQuery)
           List<Expression> distinctExpressions = getAliasLeftExpressionsFromDistinctExpression(function);
           for (Expression orderByExpression : orderByList) {
             // NOTE: Order-by is always a Function with the ordering of the Expression
-            if (!distinctExpressions.contains(orderByExpression.getFunctionCall().getOperands().get(0))) {
+            if (!distinctExpressions.contains(removeOrderByFunctions(orderByExpression))) {
               throw new IllegalStateException("ORDER-BY columns should be included in the DISTINCT columns");
             }
           }
@@ -413,12 +418,7 @@ public static PinotQuery compileSqlNodeToPinotQuery(SqlNode sqlNode) {
     // FROM
     SqlNode fromNode = selectNode.getFrom();
     if (fromNode != null) {
-      DataSource dataSource = new DataSource();
-      dataSource.setTableName(fromNode.toString());
-      pinotQuery.setDataSource(dataSource);
-      if (fromNode instanceof SqlSelect || fromNode instanceof SqlOrderBy) {
-        dataSource.setSubquery(compileSqlNodeToPinotQuery(fromNode));
-      }
+      pinotQuery.setDataSource(compileToDataSource(fromNode));
     }
     // WHERE
     SqlNode whereNode = selectNode.getWhere();
@@ -455,6 +455,62 @@ public static PinotQuery compileSqlNodeToPinotQuery(SqlNode sqlNode) {
     return pinotQuery;
   }
 
+  private static DataSource compileToDataSource(SqlNode sqlNode) {
+    DataSource dataSource = new DataSource();
+    switch (sqlNode.getKind()) {
+      case IDENTIFIER:
+        dataSource.setTableName(sqlNode.toString());
+        break;
+      case AS:
+        List<SqlNode> operandList = ((SqlBasicCall) sqlNode).getOperandList();
+        dataSource.setSubquery(compileSqlNodeToPinotQuery(operandList.get(0)));
+        dataSource.setTableName(operandList.get(1).toString());
+        break;
+      case SELECT:
+      case ORDER_BY:
+        dataSource.setSubquery(compileSqlNodeToPinotQuery(sqlNode));
+        break;
+      case JOIN:
+        dataSource.setJoin(compileToJoin((SqlJoin) sqlNode));
+        break;
+      default:
+        throw new IllegalStateException("Unsupported SQL node kind as DataSource: " + sqlNode.getKind());
+    }
+    return dataSource;
+  }
+
+  private static Join compileToJoin(SqlJoin sqlJoin) {
+    Join join = new Join();
+    switch (sqlJoin.getJoinType()) {
+      case INNER:
+        join.setType(JoinType.INNER);
+        break;
+      case LEFT:
+        join.setType(JoinType.LEFT);
+        break;
+      case RIGHT:
+        join.setType(JoinType.RIGHT);
+        break;
+      case FULL:
+        join.setType(JoinType.FULL);
+        break;
+      default:
+        throw new IllegalStateException("Unsupported join type: " + sqlJoin.getJoinType());
+    }
+    join.setLeft(compileToDataSource(sqlJoin.getLeft()));
+    join.setRight(compileToDataSource(sqlJoin.getRight()));
+    switch (sqlJoin.getConditionType()) {
+      case ON:
+        join.setCondition(toExpression(sqlJoin.getCondition()));
+        break;
+      case NONE:
+        break;
+      default:
+        throw new IllegalStateException("Unsupported join condition type: " + sqlJoin.getConditionType());
+    }
+    return join;
+  }
+
   private static void queryRewrite(PinotQuery pinotQuery) {
     for (QueryRewriter queryRewriter : QUERY_REWRITERS) {
       pinotQuery = queryRewriter.rewrite(pinotQuery);
@@ -494,103 +550,6 @@ private static Map<String, String> extractOptionsMap(List<String> optionsStateme
     return options;
   }
 
-  /**
-   * Removes comments from the query.
-   * NOTE: Comment indicator within single quotes (literal) and double quotes (identifier) are ignored.
-   */
-  @VisibleForTesting
-  static String removeComments(String sql) {
-    boolean openSingleQuote = false;
-    boolean openDoubleQuote = false;
-    boolean commented = false;
-    boolean singleLineCommented = false;
-    boolean multiLineCommented = false;
-    int commentStartIndex = -1;
-    List<Pairs.IntPair> commentedParts = new ArrayList<>();
-
-    int length = sql.length();
-    int index = 0;
-    while (index < length) {
-      switch (sql.charAt(index)) {
-        case '\'':
-          if (!commented && !openDoubleQuote) {
-            openSingleQuote = !openSingleQuote;
-          }
-          break;
-        case '"':
-          if (!commented && !openSingleQuote) {
-            openDoubleQuote = !openDoubleQuote;
-          }
-          break;
-        case '-':
-          // Single line comment start indicator: --
-          if (!commented && !openSingleQuote && !openDoubleQuote && index < length - 1
-              && sql.charAt(index + 1) == '-') {
-            commented = true;
-            singleLineCommented = true;
-            commentStartIndex = index;
-            index++;
-          }
-          break;
-        case '\n':
-          // Single line comment end indicator: \n
-          if (singleLineCommented) {
-            commentedParts.add(new Pairs.IntPair(commentStartIndex, index + 1));
-            commented = false;
-            singleLineCommented = false;
-            commentStartIndex = -1;
-          }
-          break;
-        case '/':
-          // Multi-line comment start indicator: /*
-          if (!commented && !openSingleQuote && !openDoubleQuote && index < length - 1
-              && sql.charAt(index + 1) == '*') {
-            commented = true;
-            multiLineCommented = true;
-            commentStartIndex = index;
-            index++;
-          }
-          break;
-        case '*':
-          // Multi-line comment end indicator: */
-          if (multiLineCommented && index < length - 1 && sql.charAt(index + 1) == '/') {
-            commentedParts.add(new Pairs.IntPair(commentStartIndex, index + 2));
-            commented = false;
-            multiLineCommented = false;
-            commentStartIndex = -1;
-            index++;
-          }
-          break;
-        default:
-          break;
-      }
-      index++;
-    }
-
-    if (commentedParts.isEmpty()) {
-      if (singleLineCommented) {
-        return sql.substring(0, commentStartIndex);
-      } else {
-        return sql;
-      }
-    } else {
-      StringBuilder stringBuilder = new StringBuilder();
-      int startIndex = 0;
-      for (Pairs.IntPair commentedPart : commentedParts) {
-        stringBuilder.append(sql, startIndex, commentedPart.getLeft()).append(' ');
-        startIndex = commentedPart.getRight();
-      }
-      if (startIndex < length) {
-        if (singleLineCommented) {
-          stringBuilder.append(sql, startIndex, commentStartIndex);
-        } else {
-          stringBuilder.append(sql, startIndex, length);
-        }
-      }
-      return stringBuilder.toString();
-    }
-  }
-
   private static List<Expression> convertDistinctSelectList(SqlNodeList selectList) {
     List<Expression> selectExpr = new ArrayList<>();
     selectExpr.add(convertDistinctAndSelectListToFunctionExpression(selectList));
@@ -611,23 +570,34 @@ private static List<Expression> convertSelectList(SqlNodeList selectList) {
 
   private static List<Expression> convertOrderByList(SqlNodeList orderList) {
     List<Expression> orderByExpr = new ArrayList<>();
-    final Iterator<SqlNode> iterator = orderList.iterator();
-    while (iterator.hasNext()) {
-      final SqlNode next = iterator.next();
-      orderByExpr.add(convertOrderBy(next));
+    for (SqlNode sqlNode : orderList) {
+      orderByExpr.add(convertOrderBy(sqlNode, true));
     }
     return orderByExpr;
   }
 
-  private static Expression convertOrderBy(SqlNode node) {
+  private static Expression convertOrderBy(SqlNode node, boolean createAscExpression) {
+    // If the order is ASC, the SqlNode will not have an ASC operator. In this case we need to create an ASC function in
+    // the expression.
+    // The SqlNode puts the NULLS FIRST/LAST operator in an outer level of the DESC operator.
     Expression expression;
-    if (node.getKind() == SqlKind.DESCENDING) {
+    if (node.getKind() == SqlKind.NULLS_LAST) {
       SqlBasicCall basicCall = (SqlBasicCall) node;
-      expression = RequestUtils.getFunctionExpression("desc");
-      expression.getFunctionCall().addToOperands(toExpression(basicCall.getOperandList().get(0)));
-    } else {
-      expression = RequestUtils.getFunctionExpression("asc");
+      expression = RequestUtils.getFunctionExpression(NULLS_LAST);
+      expression.getFunctionCall().addToOperands(convertOrderBy(basicCall.getOperandList().get(0), true));
+    } else if (node.getKind() == SqlKind.NULLS_FIRST) {
+      SqlBasicCall basicCall = (SqlBasicCall) node;
+      expression = RequestUtils.getFunctionExpression(NULLS_FIRST);
+      expression.getFunctionCall().addToOperands(convertOrderBy(basicCall.getOperandList().get(0), true));
+    } else if (node.getKind() == SqlKind.DESCENDING) {
+      SqlBasicCall basicCall = (SqlBasicCall) node;
+      expression = RequestUtils.getFunctionExpression(DESC);
+      expression.getFunctionCall().addToOperands(convertOrderBy(basicCall.getOperandList().get(0), false));
+    } else if (createAscExpression) {
+      expression = RequestUtils.getFunctionExpression(ASC);
       expression.getFunctionCall().addToOperands(toExpression(node));
+    } else {
+      return toExpression(node);
     }
     return expression;
   }
@@ -713,15 +683,16 @@ private static Expression toExpression(SqlNode node) {
         SqlNode elseOperand = caseSqlNode.getElseOperand();
         Expression caseFuncExpr = RequestUtils.getFunctionExpression("case");
         Preconditions.checkState(whenOperands.size() == thenOperands.size());
-        for (int i = 0; i < whenOperands.size(); i++) {
-          SqlNode whenSqlNode = whenOperands.get(i);
+        // TODO: convert this to new format once 0.13 is released
+        for (SqlNode whenSqlNode : whenOperands.getList()) {
           Expression whenExpression = toExpression(whenSqlNode);
           if (isAggregateExpression(whenExpression)) {
             throw new SqlCompilationException(
                 "Aggregation functions inside WHEN Clause is not supported - " + whenSqlNode);
           }
           caseFuncExpr.getFunctionCall().addToOperands(whenExpression);
-          SqlNode thenSqlNode = thenOperands.get(i);
+        }
+        for (SqlNode thenSqlNode : thenOperands.getList()) {
           Expression thenExpression = toExpression(thenSqlNode);
           if (isAggregateExpression(thenExpression)) {
             throw new SqlCompilationException(
@@ -964,4 +935,11 @@ public static boolean isLiteralOnlyExpression(Expression e) {
     }
     return false;
   }
+
+  public static Expression removeOrderByFunctions(Expression expression) {
+    while (expression.isSetFunctionCall() && ORDER_BY_FUNCTIONS.contains(expression.getFunctionCall().operator)) {
+      expression = expression.getFunctionCall().getOperands().get(0);
+    }
+    return expression;
+  }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/hints/PinotRelationalHints.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/parser/SqlPhysicalExplain.java
similarity index 53%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/hints/PinotRelationalHints.java
rename to pinot-common/src/main/java/org/apache/pinot/sql/parsers/parser/SqlPhysicalExplain.java
index 2c4cb976a6b..2062a5af675 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/hints/PinotRelationalHints.java
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/parser/SqlPhysicalExplain.java
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.hints;
-
-import org.apache.calcite.rel.hint.RelHint;
+package org.apache.pinot.sql.parsers.parser;
 
+import org.apache.calcite.sql.SqlExplain;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.parser.SqlParserPos;
 
 /**
- * Provide certain relational hint to query planner for better optimization.
+ * Calcite extension for creating a physical plan sql node from a EXPLAIN IMPLEMENTATION query.
+ *
+ * <p>Syntax: EXPLAIN IMPLEMENTATION PLAN [ [INCLUDING | EXCLUDING] [ALL] ATTRIBUTES ] FOR SELECT</p>
  */
-public class PinotRelationalHints {
-  public static final RelHint USE_HASH_DISTRIBUTE = RelHint.builder("USE_HASH_DISTRIBUTE").build();
-  public static final RelHint USE_BROADCAST_DISTRIBUTE = RelHint.builder("USE_BROADCAST_DISTRIBUTE").build();
-  public static final RelHint AGG_INTERMEDIATE_STAGE = RelHint.builder("AGG_INTERMEDIATE_STAGE").build();
-  public static final RelHint AGG_LEAF_STAGE = RelHint.builder("AGG_LEAF_STAGE").build();
-
-  private PinotRelationalHints() {
-    // do not instantiate.
+public class SqlPhysicalExplain extends SqlExplain {
+  public SqlPhysicalExplain(SqlParserPos pos, SqlNode explicandum, SqlLiteral detailLevel, SqlLiteral depth,
+      SqlLiteral format, int dynamicParameterCount) {
+    super(pos, explicandum, detailLevel, depth, format, dynamicParameterCount);
   }
 }
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/ArgMinMaxRewriter.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/ArgMinMaxRewriter.java
new file mode 100644
index 00000000000..9fd29be69c8
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/ArgMinMaxRewriter.java
@@ -0,0 +1,192 @@
+/**
+ * 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.pinot.sql.parsers.rewriter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.pinot.common.request.Expression;
+import org.apache.pinot.common.request.ExpressionType;
+import org.apache.pinot.common.request.Function;
+import org.apache.pinot.common.request.Literal;
+import org.apache.pinot.common.request.PinotQuery;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+/**
+ * This rewriter rewrites ARG_MIN/ARG_MAX function, so that the functions with the same measuring expressions
+ * are consolidated and added as a single function with a list of projection expressions. For example, the query
+ * "SELECT ARG_MIN(col1, col2, col3), ARG_MIN(col1, col2, col4) FROM myTable" will be consolidated to a single
+ * function "PARENT_ARG_MIN(0, 2, col1, col2, col3, col4)". and added to the end of the selection list.
+ * While the original ARG_MIN(col1, col2, col3) and ARG_MIN(col1, col2, col4) will be rewritten to
+ * CHILD_ARG_MIN(0, col3, col1, col2, col3) and CHILD_ARG_MIN(0, col4, col1, col2, col4) respectively.
+ * The 2 new parameters for CHILD_ARG_MIN are the function ID (0) and the projection column (col1/col4),
+ * used as column key in the parent aggregation result, during result rewriting.
+ * PARENT_ARG_MIN(0, 2, col1, col2, col3, col4) means a parent aggregation function with function ID 0,
+ * 2 measuring columns (col1, col2), 2 projection columns (col3, col4). The function ID is unique for each
+ * consolidated function with the same function type and measuring columns.
+ * Later, the aggregation, result of the consolidated function will be filled into the corresponding
+ * columns of the original ARG_MIN/ARG_MAX. For more syntax details please refer to ParentAggregationFunction,
+ * ChildAggregationFunction and ChildAggregationResultRewriter.
+ */
+public class ArgMinMaxRewriter implements QueryRewriter {
+
+  private static final String ARG_MAX = "argmax";
+  private static final String ARG_MIN = "argmin";
+
+  private static final String ARG_MAX_PARENT =
+      CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX + ARG_MAX;
+  private static final String ARG_MIN_PARENT =
+      CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX + ARG_MIN;
+
+  @Override
+  public PinotQuery rewrite(PinotQuery pinotQuery) {
+    // This map stores the mapping from the list of measuring expressions to the set of projection expressions
+    HashMap<List<Expression>, Set<Expression>> argMinFunctionMap = new HashMap<>();
+    // This map stores the mapping from the list of measuring expressions to the function ID
+    HashMap<List<Expression>, Integer> argMinFunctionIDMap = new HashMap<>();
+
+    HashMap<List<Expression>, Set<Expression>> argMaxFunctionMap = new HashMap<>();
+    HashMap<List<Expression>, Integer> argMaxFunctionIDMap = new HashMap<>();
+
+    Iterator<Expression> iterator = pinotQuery.getSelectList().iterator();
+    while (iterator.hasNext()) {
+      boolean added = extractAndRewriteArgMinMaxFunctions(iterator.next(), argMaxFunctionMap, argMaxFunctionIDMap,
+          argMinFunctionMap, argMinFunctionIDMap);
+      // Remove the original function if it is not added, meaning it is a duplicate
+      if (!added) {
+        iterator.remove();
+      }
+    }
+
+    appendParentArgMinMaxFunctions(false, pinotQuery.getSelectList(), argMinFunctionMap, argMinFunctionIDMap);
+    appendParentArgMinMaxFunctions(true, pinotQuery.getSelectList(), argMaxFunctionMap, argMaxFunctionIDMap);
+
+    return pinotQuery;
+  }
+
+  /**
+   * This method appends the consolidated ARG_MIN/ARG_MAX functions to the end of the selection list.
+   * The consolidated function call will be in the following format:
+   * ARG_MAX(functionID, numMeasuringColumns, measuringColumn1, measuringColumn2, ... projectionColumn1,
+   * projectionColumn2, ...)
+   * where functionID is the ID of the consolidated function, numMeasuringColumns is the number of measuring
+   * columns, measuringColumn1, measuringColumn2, ... are the measuring columns, and projectionColumn1,
+   * projectionColumn2, ... are the projection columns.
+   * The number of projection columns is the same as the number of ARG_MIN/ARG_MAX functions with the same
+   * measuring columns.
+   */
+  private void appendParentArgMinMaxFunctions(boolean isMax, List<Expression> selectList,
+      HashMap<List<Expression>, Set<Expression>> argMinMaxFunctionMap,
+      HashMap<List<Expression>, Integer> argMinMaxFunctionIDMap) {
+    for (Map.Entry<List<Expression>, Set<Expression>> entry : argMinMaxFunctionMap.entrySet()) {
+      Literal functionID = new Literal();
+      functionID.setLongValue(argMinMaxFunctionIDMap.get(entry.getKey()));
+      Literal numMeasuringColumns = new Literal();
+      numMeasuringColumns.setLongValue(entry.getKey().size());
+
+      Function parentFunction = new Function(isMax ? ARG_MAX_PARENT : ARG_MIN_PARENT);
+      parentFunction.addToOperands(new Expression(ExpressionType.LITERAL).setLiteral(functionID));
+      parentFunction.addToOperands(new Expression(ExpressionType.LITERAL).setLiteral(numMeasuringColumns));
+      for (Expression expression : entry.getKey()) {
+        parentFunction.addToOperands(expression);
+      }
+      for (Expression expression : entry.getValue()) {
+        parentFunction.addToOperands(expression);
+      }
+      selectList.add(new Expression(ExpressionType.FUNCTION).setFunctionCall(parentFunction));
+    }
+  }
+
+  /**
+   * This method extracts the ARG_MIN/ARG_MAX functions from the given expression and rewrites the functions
+   * with the same measuring expressions to use the same function ID.
+   * @return true if the function is not duplicated, false otherwise.
+   */
+  private boolean extractAndRewriteArgMinMaxFunctions(Expression expression,
+      HashMap<List<Expression>, Set<Expression>> argMaxFunctionMap,
+      HashMap<List<Expression>, Integer> argMaxFunctionIDMap,
+      HashMap<List<Expression>, Set<Expression>> argMinFunctionMap,
+      HashMap<List<Expression>, Integer> argMinFunctionIDMap) {
+    Function function = expression.getFunctionCall();
+    if (function == null) {
+      return true;
+    }
+    String functionName = function.getOperator();
+    if (!(functionName.equals(ARG_MIN) || functionName.equals(ARG_MAX))) {
+      return true;
+    }
+    List<Expression> operands = function.getOperands();
+    if (operands.size() < 2) {
+      throw new IllegalStateException("Invalid number of arguments for " + functionName + ", argmin/argmax should "
+          + "have at least 2 arguments, got: " + operands.size());
+    }
+    List<Expression> argMinMaxMeasuringExpressions = new ArrayList<>();
+    for (int i = 0; i < operands.size() - 1; i++) {
+      argMinMaxMeasuringExpressions.add(operands.get(i));
+    }
+    Expression argMinMaxProjectionExpression = operands.get(operands.size() - 1);
+
+    if (functionName.equals(ARG_MIN)) {
+      return updateArgMinMaxFunctionMap(argMinMaxMeasuringExpressions, argMinMaxProjectionExpression, argMinFunctionMap,
+          argMinFunctionIDMap, function);
+    } else {
+      return updateArgMinMaxFunctionMap(argMinMaxMeasuringExpressions, argMinMaxProjectionExpression, argMaxFunctionMap,
+          argMaxFunctionIDMap, function);
+    }
+  }
+
+  /**
+   * This method rewrites the ARG_MIN/ARG_MAX function with the given measuring expressions to use the same
+   * function ID.
+   * @return true if the function is not duplicated, false otherwise.
+   */
+  private boolean updateArgMinMaxFunctionMap(List<Expression> argMinMaxMeasuringExpressions,
+      Expression argMinMaxProjectionExpression, HashMap<List<Expression>, Set<Expression>> argMinMaxFunctionMap,
+      HashMap<List<Expression>, Integer> argMinMaxFunctionIDMap, Function function) {
+    int size = argMinMaxFunctionIDMap.size();
+    int id = argMinMaxFunctionIDMap.computeIfAbsent(argMinMaxMeasuringExpressions, (k) -> size);
+
+    AtomicBoolean added = new AtomicBoolean(true);
+
+    argMinMaxFunctionMap.compute(argMinMaxMeasuringExpressions, (k, v) -> {
+      if (v == null) {
+        v = new HashSet<>();
+      }
+      added.set(v.add(argMinMaxProjectionExpression));
+      return v;
+    });
+
+    String operator = function.operator;
+    function.setOperator(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX + operator);
+
+    List<Expression> operands = function.getOperands();
+    operands.add(0, argMinMaxProjectionExpression);
+    Literal functionID = new Literal();
+    functionID.setLongValue(id);
+    operands.add(0, new Expression(ExpressionType.LITERAL).setLiteral(functionID));
+
+    return added.get();
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CLPDecodeRewriter.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CLPDecodeRewriter.java
new file mode 100644
index 00000000000..c870f84bb04
--- /dev/null
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CLPDecodeRewriter.java
@@ -0,0 +1,177 @@
+/**
+ * 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.pinot.sql.parsers.rewriter;
+
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.common.request.Expression;
+import org.apache.pinot.common.request.ExpressionType;
+import org.apache.pinot.common.request.Function;
+import org.apache.pinot.common.request.Identifier;
+import org.apache.pinot.common.request.Literal;
+import org.apache.pinot.common.request.PinotQuery;
+import org.apache.pinot.sql.parsers.SqlCompilationException;
+
+
+/**
+ * Query rewriter to rewrite clpDecode so that users can pass in the name of a CLP-encoded column group instead of the
+ * names of all the columns in the group.
+ * <p>
+ * Usage:
+ * <pre>
+ *   clpDecode("columnGroupName"[, defaultValue])
+ * </pre>
+ * which will be rewritten to:
+ * <pre>
+ *   clpDecode("columnGroupName_logtype", "columnGroupName_dictionaryVars", "columnGroupName_encodedVars"[,
+ *   defaultValue])
+ * </pre>
+ * The "defaultValue" is optional. See
+ * {@link org.apache.pinot.core.operator.transform.function.CLPDecodeTransformFunction} for its description.
+ * <p>
+ * Sample queries:
+ * <pre>
+ *   SELECT clpDecode("message") FROM table
+ *   SELECT clpDecode("message", 'null') FROM table
+ * </pre>
+ * See {@link org.apache.pinot.core.operator.transform.function.CLPDecodeTransformFunction} for details about the
+ * underlying clpDecode transformer.
+ */
+public class CLPDecodeRewriter implements QueryRewriter {
+  public static final String LOGTYPE_COLUMN_SUFFIX = "_logtype";
+  public static final String DICTIONARY_VARS_COLUMN_SUFFIX = "_dictionaryVars";
+  public static final String ENCODED_VARS_COLUMN_SUFFIX = "_encodedVars";
+
+  private static final String _CLPDECODE_LOWERCASE_TRANSFORM_NAME =
+      TransformFunctionType.CLPDECODE.getName().toLowerCase();
+
+  @Override
+  public PinotQuery rewrite(PinotQuery pinotQuery) {
+    List<Expression> selectExpressions = pinotQuery.getSelectList();
+    if (null != selectExpressions) {
+      for (Expression e : selectExpressions) {
+        tryRewritingExpression(e);
+      }
+    }
+    List<Expression> groupByExpressions = pinotQuery.getGroupByList();
+    if (null != groupByExpressions) {
+      for (Expression e : groupByExpressions) {
+        tryRewritingExpression(e);
+      }
+    }
+    List<Expression> orderByExpressions = pinotQuery.getOrderByList();
+    if (null != orderByExpressions) {
+      for (Expression e : orderByExpressions) {
+        tryRewritingExpression(e);
+      }
+    }
+    tryRewritingExpression(pinotQuery.getFilterExpression());
+    tryRewritingExpression(pinotQuery.getHavingExpression());
+    return pinotQuery;
+  }
+
+  /**
+   * Rewrites any instances of clpDecode in the given expression
+   * @param expression Expression which may contain instances of clpDecode
+   */
+  private void tryRewritingExpression(Expression expression) {
+    if (null == expression) {
+      return;
+    }
+    Function function = expression.getFunctionCall();
+    if (null == function) {
+      return;
+    }
+
+    String functionName = function.getOperator();
+    if (functionName.equals(_CLPDECODE_LOWERCASE_TRANSFORM_NAME)) {
+      rewriteCLPDecodeFunction(expression);
+      return;
+    }
+
+    // Function isn't a CLP function that needs rewriting, but the arguments might be, so we recursively process them.
+    for (Expression op : function.getOperands()) {
+      tryRewritingExpression(op);
+    }
+  }
+
+  /**
+   * Rewrites the given instance of clpDecode as described in the class' Javadoc
+   * @param expression clpDecode function expression
+   */
+  private void rewriteCLPDecodeFunction(Expression expression) {
+    Function function = expression.getFunctionCall();
+    List<Expression> arguments = function.getOperands();
+
+    // Validate clpDecode's arguments
+    int numArgs = arguments.size();
+    if (numArgs < 1 || numArgs > 2) {
+      // Too few/many args for this rewriter, so do nothing and let it pass through to the clpDecode transform function
+      return;
+    }
+
+    Expression arg0 = arguments.get(0);
+    if (ExpressionType.IDENTIFIER != arg0.getType()) {
+      throw new SqlCompilationException("clpDecode: 1st argument must be a column group name (identifier).");
+    }
+    String columnGroupName = arg0.getIdentifier().getName();
+
+    Literal defaultValueLiteral = null;
+    if (numArgs > 1) {
+      Expression arg1 = arguments.get(1);
+      if (ExpressionType.LITERAL != arg1.getType()) {
+        throw new SqlCompilationException("clpDecode: 2nd argument must be a default value (literal).");
+      }
+      defaultValueLiteral = arg1.getLiteral();
+    }
+
+    // Replace the columnGroup with the individual columns
+    arguments.clear();
+    addCLPDecodeOperands(columnGroupName, defaultValueLiteral, function);
+  }
+
+  /**
+   * Adds the CLPDecode transform function's operands to the given function
+   * @param columnGroupName Name of the CLP-encoded column group
+   * @param defaultValueLiteral Optional default value to pass through to the transform function
+   * @param clpDecode The function to add the operands to
+   */
+  private void addCLPDecodeOperands(String columnGroupName, @Nullable Literal defaultValueLiteral, Function clpDecode) {
+    Expression e;
+
+    e = new Expression(ExpressionType.IDENTIFIER);
+    e.setIdentifier(new Identifier(columnGroupName + LOGTYPE_COLUMN_SUFFIX));
+    clpDecode.addToOperands(e);
+
+    e = new Expression(ExpressionType.IDENTIFIER);
+    e.setIdentifier(new Identifier(columnGroupName + DICTIONARY_VARS_COLUMN_SUFFIX));
+    clpDecode.addToOperands(e);
+
+    e = new Expression(ExpressionType.IDENTIFIER);
+    e.setIdentifier(new Identifier(columnGroupName + ENCODED_VARS_COLUMN_SUFFIX));
+    clpDecode.addToOperands(e);
+
+    if (null != defaultValueLiteral) {
+      e = new Expression(ExpressionType.LITERAL);
+      e.setLiteral(defaultValueLiteral);
+      clpDecode.addToOperands(e);
+    }
+  }
+}
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CompileTimeFunctionsInvoker.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CompileTimeFunctionsInvoker.java
index 1c93d64e855..2cb89d5fe8b 100644
--- a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CompileTimeFunctionsInvoker.java
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/CompileTimeFunctionsInvoker.java
@@ -26,6 +26,7 @@
 import org.apache.pinot.common.function.FunctionRegistry;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.Function;
+import org.apache.pinot.common.request.Literal;
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.common.utils.request.RequestUtils;
 import org.apache.pinot.sql.parsers.SqlCompilationException;
@@ -74,7 +75,12 @@ protected static Expression invokeCompileTimeFunctionExpression(@Nullable Expres
       if (functionInfo != null) {
         Object[] arguments = new Object[numOperands];
         for (int i = 0; i < numOperands; i++) {
-          arguments[i] = function.getOperands().get(i).getLiteral().getFieldValue();
+          Literal literal = function.getOperands().get(i).getLiteral();
+          if (literal.isSetNullValue()) {
+            arguments[i] = null;
+          } else {
+            arguments[i] = function.getOperands().get(i).getLiteral().getFieldValue();
+          }
         }
         try {
           FunctionInvoker invoker = new FunctionInvoker(functionInfo);
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/QueryRewriterFactory.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/QueryRewriterFactory.java
index 4ae6c1bd93a..ef36ee1080c 100644
--- a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/QueryRewriterFactory.java
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/QueryRewriterFactory.java
@@ -33,7 +33,7 @@ private QueryRewriterFactory() {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(QueryRewriterFactory.class);
 
-  static final List<String> DEFAULT_QUERY_REWRITERS_CLASS_NAMES =
+  public static final List<String> DEFAULT_QUERY_REWRITERS_CLASS_NAMES =
       ImmutableList.of(CompileTimeFunctionsInvoker.class.getName(), SelectionsRewriter.class.getName(),
           PredicateComparisonRewriter.class.getName(), OrdinalsUpdater.class.getName(),
           AliasApplier.class.getName(), NonAggregationGroupByToDistinctQueryRewriter.class.getName());
diff --git a/pinot-common/src/main/proto/worker.proto b/pinot-common/src/main/proto/worker.proto
index 8f780bd260a..dfb1cd53eb0 100644
--- a/pinot-common/src/main/proto/worker.proto
+++ b/pinot-common/src/main/proto/worker.proto
@@ -44,12 +44,22 @@ import "plan.proto";
 service PinotQueryWorker {
   // Dispatch a QueryRequest to a PinotQueryWorker
   rpc Submit(QueryRequest) returns (QueryResponse);
+
+  rpc Cancel(CancelRequest) returns (CancelResponse);
+}
+
+message CancelRequest {
+  int64 requestId = 1;
 }
 
-// QueryRequest is the dispatched content for a specific query stage on a specific worker.
+message CancelResponse {
+  // intentionally left empty
+}
+
+// QueryRequest is the dispatched content for all query stages to a physical worker.
 message QueryRequest {
-  map<string, string> metadata = 1;
-  StagePlan stagePlan = 2;
+  repeated StagePlan stagePlan = 1;
+  map<string, string> metadata = 2;
 }
 
 // QueryResponse is the dispatched response from worker, it doesn't contain actual data, only dispatch status.
@@ -60,23 +70,25 @@ message QueryResponse {
 
 message StagePlan {
   int32 stageId = 1;
-  string instanceId = 2;
-  StageNode stageRoot = 3;
-  map<int32, StageMetadata> stageMetadata = 4;
+  StageNode stageRoot = 2;
+  StageMetadata stageMetadata = 3;
 }
 
 message StageMetadata {
-  repeated string instances = 1;
-  repeated string dataSources = 2;
-  map<string, SegmentMap> instanceToSegmentMap = 3;
-  string timeColumn = 4;
-  string timeValue = 5;
+  repeated WorkerMetadata workerMetadata = 1;
+  map<string, string> customProperty = 2;
+  string serverAddress = 3;
+  repeated int32 workerIds = 4;
 }
 
-message SegmentMap {
-  map<string, SegmentList> tableTypeToSegmentList = 1;
+message WorkerMetadata {
+  string virtualAddress = 1;
+  map<int32, MailboxMetadata> mailboxMetadata = 2;
+  map<string, string> customProperty = 3;
 }
 
-message SegmentList {
-  repeated string segments = 1;
+message MailboxMetadata {
+  repeated string mailboxId = 1;
+  repeated string virtualAddress = 2;
+  map<string, string> customProperty = 3;
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/datablock/MetadataBlockTest.java b/pinot-common/src/test/java/org/apache/pinot/common/datablock/MetadataBlockTest.java
index 1f055a4d09f..0f85f4a69ee 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/datablock/MetadataBlockTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/datablock/MetadataBlockTest.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.HashMap;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.*;
@@ -37,7 +38,7 @@ public void shouldEncodeContentsAsJSON()
     MetadataBlock metadataBlock = new MetadataBlock(type);
 
     // Then:
-    byte[] expected = new ObjectMapper().writeValueAsBytes(new MetadataBlock.Contents("EOS"));
+    byte[] expected = new ObjectMapper().writeValueAsBytes(new MetadataBlock.Contents("EOS", new HashMap<>()));
     assertEquals(metadataBlock._variableSizeDataBytes, expected);
   }
 
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/function/FunctionDefinitionRegistryTest.java b/pinot-common/src/test/java/org/apache/pinot/common/function/FunctionDefinitionRegistryTest.java
index f473a01011e..d5370fe79cf 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/function/FunctionDefinitionRegistryTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/function/FunctionDefinitionRegistryTest.java
@@ -42,9 +42,9 @@ public class FunctionDefinitionRegistryTest {
   );
   private static final List<String> IGNORED_FUNCTION_NAMES = ImmutableList.of(
       // functions we are not supporting post transform anyway
-      "valuein", "mapvalue", "inidset", "lookup", "groovy", "scalar", "geotoh3", "case", "not_in", "timeconvert",
+      "valuein", "mapvalue", "inidset", "lookup", "groovy", "scalar", "geotoh3", "not_in", "timeconvert",
       // functions not needed for register b/c they are in std sql table or they will not be composed directly.
-      "in", "and", "or", "not", "range", "extract"
+      "in", "and", "or", "range", "extract"
   );
 
   @Test
@@ -68,7 +68,7 @@ public void testCalciteFunctionMapAllRegistered() {
     }
     for (TransformFunctionType enumType : TransformFunctionType.values()) {
       if (!isIgnored(enumType.getName().toLowerCase())) {
-        for (String funcName : enumType.getAliases()) {
+        for (String funcName : enumType.getAlternativeNames()) {
           assertTrue(registeredCalciteFunctionNameIgnoreCase.contains(funcName.toLowerCase()),
               "Unable to find transform function signature for: " + funcName);
         }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/function/JsonFunctionsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/function/JsonFunctionsTest.java
index ee98705f107..9ca44e7fc60 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/function/JsonFunctionsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/function/JsonFunctionsTest.java
@@ -258,7 +258,7 @@ public void testJsonFunctionOnObjectArray()
   public static Object[][] jsonPathStringTestCases() {
     return new Object[][]{
         {ImmutableMap.of("foo", "x", "bar", ImmutableMap.of("foo", "y")), "$.foo", "x"},
-        {ImmutableMap.of("foo", "x", "bar", ImmutableMap.of("foo", "y")), "$.qux", "null"},
+        {ImmutableMap.of("foo", "x", "bar", ImmutableMap.of("foo", "y")), "$.qux", null},
         {ImmutableMap.of("foo", "x", "bar", ImmutableMap.of("foo", "y")), "$.bar", "{\"foo\":\"y\"}"},
     };
   }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/function/scalar/ArrayAwareJacksonJsonProviderTest.java b/pinot-common/src/test/java/org/apache/pinot/common/function/scalar/ArrayAwareJacksonJsonProviderTest.java
index 3f16ed83ddd..6a9f651ea2a 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/function/scalar/ArrayAwareJacksonJsonProviderTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/function/scalar/ArrayAwareJacksonJsonProviderTest.java
@@ -23,6 +23,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import org.apache.pinot.segment.spi.utils.JavaVersion;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.*;
@@ -105,7 +106,10 @@ public void testToIterable() {
     } catch (NullPointerException e) {
       // It's supposed to get a JsonPathException, but JsonPath library actually
       // has a bug leading to NullPointerException while creating the JsonPathException.
-      assertNull(e.getMessage());
+      if (JavaVersion.VERSION < 14) {
+        // In modern Java versions messages is something like "Cannot invoke "Object.getClass()" because "obj" is null"
+        assertNull(e.getMessage());
+      }
     }
   }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java b/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java
index 52f64c7902a..2c61962a3a5 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/lineage/SegmentLineageTest.java
@@ -111,4 +111,28 @@ public void testSegmentLineage() {
     }
     Assert.assertEquals(segmentLineage.getLineageEntryIds().size(), 0);
   }
+
+  @Test
+  public void teatSegmentLineageEntryEquals() {
+    LineageEntry expectedLineageEntry =
+        new LineageEntry(Arrays.asList("seg1", "seg2"), Arrays.asList("seg3", "seg4"), LineageEntryState.IN_PROGRESS,
+            12345L);
+    LineageEntry actualLineageEntry =
+        new LineageEntry(Arrays.asList("seg1", "seg2"), Arrays.asList("seg3", "seg4"), LineageEntryState.IN_PROGRESS,
+            12345L);
+    Assert.assertEquals(actualLineageEntry, expectedLineageEntry);
+    actualLineageEntry =
+        new LineageEntry(Arrays.asList("seg1", "seg2"), Arrays.asList("seg3", "seg4"), LineageEntryState.IN_PROGRESS,
+            12346L);
+    Assert.assertNotEquals(actualLineageEntry, expectedLineageEntry);
+    actualLineageEntry =
+        new LineageEntry(Arrays.asList("seg1"), Arrays.asList("seg3", "seg4"), LineageEntryState.IN_PROGRESS, 12345L);
+    Assert.assertNotEquals(actualLineageEntry, expectedLineageEntry);
+    actualLineageEntry =
+        new LineageEntry(Arrays.asList("seg1"), Arrays.asList("seg3", "seg4"), LineageEntryState.COMPLETED, 12345L);
+    Assert.assertNotEquals(actualLineageEntry, expectedLineageEntry);
+    actualLineageEntry =
+        new LineageEntry(Arrays.asList("seg1"), Arrays.asList("seg3", "seg4"), LineageEntryState.REVERTED, 12345L);
+    Assert.assertNotEquals(actualLineageEntry, expectedLineageEntry);
+  }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java
index c7dfccaa84d..b2a6236337e 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/metadata/MetadataEqualsHashCodeTest.java
@@ -39,15 +39,18 @@ public class MetadataEqualsHashCodeTest {
   public void testEqualsAndHashCode() {
     EqualsVerifier.forClass(InstanceZKMetadata.class).suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS)
         .usingGetClass().verify();
-    EqualsVerifier.forClass(Schema.class).suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS).usingGetClass()
+    EqualsVerifier.forClass(DimensionFieldSpec.class).suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS)
+        .usingGetClass().verify();
+    EqualsVerifier.forClass(MetricFieldSpec.class).suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS)
+        .usingGetClass().verify();
+    EqualsVerifier.forClass(TimeFieldSpec.class).suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS).usingGetClass()
+        .verify();
+    EqualsVerifier.forClass(DateTimeFieldSpec.class).suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS)
+        .usingGetClass().verify();
+    // NOTE: Suppress Warning.ALL_FIELDS_SHOULD_BE_USED because some fields are derived from other fields, but we cannot
+    //       declare them as transitive because they are still needed after ser/de
+    EqualsVerifier.forClass(Schema.class)
+        .suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED).usingGetClass()
         .verify();
-    EqualsVerifier.forClass(DimensionFieldSpec.class)
-        .suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS, Warning.TRANSIENT_FIELDS).usingGetClass().verify();
-    EqualsVerifier.forClass(MetricFieldSpec.class)
-        .suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS, Warning.TRANSIENT_FIELDS).usingGetClass().verify();
-    EqualsVerifier.forClass(TimeFieldSpec.class)
-        .suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS, Warning.TRANSIENT_FIELDS).usingGetClass().verify();
-    EqualsVerifier.forClass(DateTimeFieldSpec.class)
-        .suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS, Warning.TRANSIENT_FIELDS).usingGetClass().verify();
   }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/tier/TierConfigUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/tier/TierConfigUtilsTest.java
index 2b942a1cab7..75200fcb4ee 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/tier/TierConfigUtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/tier/TierConfigUtilsTest.java
@@ -192,30 +192,21 @@ public void testTierComparator() {
   @Test
   public void testGetDataDirForTier() {
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName("myTable").build();
-    try {
-      TierConfigUtils.getDataDirForTier(tableConfig, "tier1");
-    } catch (Exception e) {
-      Assert.assertEquals(e.getMessage(), "No dataDir for tier: tier1 for table: myTable_OFFLINE");
-    }
+    String dataDir = TierConfigUtils.getDataDirForTier(tableConfig, "tier1");
+    Assert.assertNull(dataDir);
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName("myTable").setTierConfigList(Lists
         .newArrayList(new TierConfig("myTier", TierFactory.TIME_SEGMENT_SELECTOR_TYPE, "10d", null,
             TierFactory.PINOT_SERVER_STORAGE_TYPE, "tag_OFFLINE", null, null))).build();
-    try {
-      TierConfigUtils.getDataDirForTier(tableConfig, "tier1");
-    } catch (Exception e) {
-      Assert.assertEquals(e.getMessage(), "No dataDir for tier: tier1 for table: myTable_OFFLINE");
-    }
-    try {
-      TierConfigUtils.getDataDirForTier(tableConfig, "myTier");
-    } catch (Exception e) {
-      Assert.assertEquals(e.getMessage(), "No dataDir for tier: myTier for table: myTable_OFFLINE");
-    }
+    dataDir = TierConfigUtils.getDataDirForTier(tableConfig, "tier1");
+    Assert.assertNull(dataDir);
+    dataDir = TierConfigUtils.getDataDirForTier(tableConfig, "myTier");
+    Assert.assertNull(dataDir);
     // Provide instance tierConfigs for the tier.
     Map<String, Map<String, String>> instanceTierConfigs = new HashMap<>();
     Map<String, String> tierCfgMap = new HashMap<>();
     tierCfgMap.put("datadir", "/abc/xyz");
     instanceTierConfigs.put("myTier", tierCfgMap);
-    String dataDir = TierConfigUtils.getDataDirForTier(tableConfig, "myTier", instanceTierConfigs);
+    dataDir = TierConfigUtils.getDataDirForTier(tableConfig, "myTier", instanceTierConfigs);
     Assert.assertEquals(dataDir, "/abc/xyz");
     // Table tierConfigs overwrite those from instance tierConfigs.
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName("myTable").setTierConfigList(Lists
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java b/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java
index 4a7d55c17a2..21c6fe5da13 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/tier/TierSegmentSelectorTest.java
@@ -114,6 +114,30 @@ public void testTimeBasedSegmentSelector() {
     Assert.assertFalse(segmentSelector.selectSegment(tableNameWithType, segmentName));
   }
 
+  @Test
+  public void testRealTimeConsumingSegmentShouldNotBeRelocated() {
+
+    long now = System.currentTimeMillis();
+
+    String segmentName = "myTable__4__1__" + now;
+    String tableNameWithType = "myTable_REALTIME";
+    SegmentZKMetadata realtimeSegmentZKMetadata = new SegmentZKMetadata(segmentName);
+    realtimeSegmentZKMetadata.setStatus(CommonConstants.Segment.Realtime.Status.IN_PROGRESS);
+
+    ZNRecord segmentZKMetadataZNRecord = realtimeSegmentZKMetadata.toZNRecord();
+
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
+    when(propertyStore
+            .get(eq(ZKMetadataProvider.constructPropertyStorePathForSegment(tableNameWithType, segmentName)), any(),
+                    anyInt())).thenReturn(segmentZKMetadataZNRecord);
+
+    HelixManager helixManager = mock(HelixManager.class);
+    when(helixManager.getHelixPropertyStore()).thenReturn(propertyStore);
+
+    TimeBasedTierSegmentSelector segmentSelector = new TimeBasedTierSegmentSelector(helixManager, "7d");
+    Assert.assertFalse(segmentSelector.selectSegment(tableNameWithType, segmentName));
+  }
+
   @Test
   public void testFixedSegmentSelector() {
 
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java
index 71b062452b2..e90842d9257 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/DataSchemaTest.java
@@ -34,14 +34,8 @@ public class DataSchemaTest {
       "string_array", "boolean_array", "timestamp_array", "bytes_array"
   };
   private static final int NUM_COLUMNS = COLUMN_NAMES.length;
-  private static final DataSchema.ColumnDataType[] COLUMN_DATA_TYPES =
-      {INT, LONG, FLOAT, DOUBLE, STRING, OBJECT, INT_ARRAY, LONG_ARRAY, FLOAT_ARRAY, DOUBLE_ARRAY, STRING_ARRAY,
-      BOOLEAN_ARRAY, TIMESTAMP_ARRAY, BYTES_ARRAY};
-  private static final DataSchema.ColumnDataType[] COMPATIBLE_COLUMN_DATA_TYPES =
-      {LONG, FLOAT, DOUBLE, INT, STRING, OBJECT, LONG_ARRAY, FLOAT_ARRAY, DOUBLE_ARRAY, INT_ARRAY, STRING_ARRAY,
-       BOOLEAN_ARRAY, TIMESTAMP_ARRAY, BYTES_ARRAY};
-  private static final DataSchema.ColumnDataType[] UPGRADED_COLUMN_DATA_TYPES = {
-      LONG, DOUBLE, DOUBLE, DOUBLE, STRING, OBJECT, LONG_ARRAY, DOUBLE_ARRAY, DOUBLE_ARRAY, DOUBLE_ARRAY, STRING_ARRAY,
+  private static final DataSchema.ColumnDataType[] COLUMN_DATA_TYPES = {
+      INT, LONG, FLOAT, DOUBLE, STRING, OBJECT, INT_ARRAY, LONG_ARRAY, FLOAT_ARRAY, DOUBLE_ARRAY, STRING_ARRAY,
       BOOLEAN_ARRAY, TIMESTAMP_ARRAY, BYTES_ARRAY
   };
 
@@ -72,22 +66,6 @@ public void testSerDe()
     Assert.assertEquals(dataSchema.hashCode(), dataSchemaAfterSerDe.hashCode());
   }
 
-  @Test
-  public void testTypeCompatible() {
-    DataSchema dataSchema = new DataSchema(COLUMN_NAMES, COLUMN_DATA_TYPES);
-    DataSchema compatibleDataSchema = new DataSchema(COLUMN_NAMES, COMPATIBLE_COLUMN_DATA_TYPES);
-    Assert.assertTrue(dataSchema.isTypeCompatibleWith(compatibleDataSchema));
-
-    String[] anotherColumnNames = new String[NUM_COLUMNS];
-    Arrays.fill(anotherColumnNames, "foo");
-    DataSchema incompatibleDataSchema = new DataSchema(anotherColumnNames, COLUMN_DATA_TYPES);
-    Assert.assertFalse(dataSchema.isTypeCompatibleWith(incompatibleDataSchema));
-
-    dataSchema = DataSchema.upgradeToCover(dataSchema, compatibleDataSchema);
-    DataSchema upgradedDataSchema = new DataSchema(COLUMN_NAMES, UPGRADED_COLUMN_DATA_TYPES);
-    Assert.assertEquals(dataSchema, upgradedDataSchema);
-  }
-
   @Test
   public void testSuperTypeCheckers() {
     List<DataSchema.ColumnDataType> numberTypeToTest = Arrays.asList(INT, LONG, FLOAT, DOUBLE);
@@ -207,8 +185,9 @@ public void testColumnDataType() {
       Assert.assertFalse(columnDataType.isCompatible(BYTES_ARRAY));
     }
 
-    for (DataSchema.ColumnDataType columnDataType : new DataSchema.ColumnDataType[]{STRING_ARRAY, BOOLEAN_ARRAY,
-        TIMESTAMP_ARRAY, BYTES_ARRAY}) {
+    for (DataSchema.ColumnDataType columnDataType : new DataSchema.ColumnDataType[]{
+        STRING_ARRAY, BOOLEAN_ARRAY, TIMESTAMP_ARRAY, BYTES_ARRAY
+    }) {
       Assert.assertFalse(columnDataType.isNumber());
       Assert.assertFalse(columnDataType.isWholeNumber());
       Assert.assertTrue(columnDataType.isArray());
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/LoopUtils.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientWithoutServerTest.java
similarity index 56%
rename from pinot-spi/src/main/java/org/apache/pinot/spi/utils/LoopUtils.java
rename to pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientWithoutServerTest.java
index 7ffaa26d80c..34426e95744 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/LoopUtils.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/FileUploadDownloadClientWithoutServerTest.java
@@ -16,23 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.spi.utils;
+package org.apache.pinot.common.utils;
 
-import org.apache.pinot.spi.exception.EarlyTerminationException;
-import org.apache.pinot.spi.trace.Tracing;
+import java.net.URI;
+import java.net.URISyntaxException;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 
-public class LoopUtils {
-
-  private LoopUtils() {
+public class FileUploadDownloadClientWithoutServerTest {
+  @Test
+  public void testExtractBaseURI()
+      throws URISyntaxException {
+    Assert.assertEquals(FileUploadDownloadClient.extractBaseURI(new URI("http://example.com:8000/a/b?c=d")),
+        new URI("http://example.com:8000"));
   }
-  public static final int MAX_ENTRIES_KEYS_MERGED_PER_INTERRUPTION_CHECK_MASK = 0b1_1111_1111_1111;
 
-  // Check for thread interruption, every time after merging 8192 keys
-  public static void checkMergePhaseInterruption(int mergedKeys) {
-    if ((mergedKeys & MAX_ENTRIES_KEYS_MERGED_PER_INTERRUPTION_CHECK_MASK) == 0
-        && (Tracing.ThreadAccountantOps.isInterrupted())) {
-      throw new EarlyTerminationException();
-    }
+  @Test
+  public void testGetURI()
+      throws URISyntaxException {
+    Assert.assertEquals(FileUploadDownloadClient.getURI("http", "example.com", 8000),
+        new URI("http://example.com:8000"));
   }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/RegexpPatternConverterUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/RegexpPatternConverterUtilsTest.java
index 8c94cb48865..0341ee76066 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/RegexpPatternConverterUtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/RegexpPatternConverterUtilsTest.java
@@ -125,4 +125,41 @@ public void testTrailingSize2() {
     String regexpLikePattern = RegexpPatternConverterUtils.likeToRegexpLike("z%");
     assertEquals(regexpLikePattern, "^z");
   }
+
+  @Test
+  public void testEscapedWildcard1() {
+    // the first underscore (_ in _b) is escaped, so it is meant to match an actual "_b" string in the provided
+    // string
+    // the second underscore (_ in b_) is not escaped, so it is a SQL wildcard that is used to match a single
+    // character, which in the regex space is "."
+    String regexpLikePattern = RegexpPatternConverterUtils.likeToRegexpLike("a\\_b_\\");
+    assertEquals(regexpLikePattern, "^a\\_b.\\\\$");
+    String luceneRegExpPattern = RegexpPatternConverterUtils.regexpLikeToLuceneRegExp(regexpLikePattern);
+    assertEquals(luceneRegExpPattern, "a\\_b.\\\\");
+  }
+
+  @Test
+  public void testEscapedWildcard2() {
+    // the % (% in %b) is escaped, so it is meant to match an actual "%b" string in the provided
+    // string
+    // the "\" before c is a normal "\", so it is meant to match an actual "\" string in the provided
+    // string, this is done because "c" is not a SQL wildcard - hence the "\" before that is used as-is
+    // and is not used for escaping "c"
+    // so, this "\" is escaped in the output as it is a regex metacharacter and the converted regex
+    // will match "a%b\cde" in the provided string
+    String regexpLikePattern = RegexpPatternConverterUtils.likeToRegexpLike("a\\%b\\cde");
+    assertEquals(regexpLikePattern, "^a\\%b\\\\cde$");
+    String luceneRegExpPattern = RegexpPatternConverterUtils.regexpLikeToLuceneRegExp(regexpLikePattern);
+    assertEquals(luceneRegExpPattern, "a\\%b\\\\cde");
+  }
+  @Test
+  public void testEscapedWildcard3() {
+    // here the "\" character is used to escape _, so _ here is not treated as a SQL wildcard
+    // but it is meant to actually match "_" in the provided string
+    // so the corresponding regex doesn't convert the "_" to "."
+    String regexpLikePattern = RegexpPatternConverterUtils.likeToRegexpLike("%2\\_2%");
+    assertEquals(regexpLikePattern, "2\\_2");
+    String luceneRegExpPattern = RegexpPatternConverterUtils.regexpLikeToLuceneRegExp(regexpLikePattern);
+    assertEquals(luceneRegExpPattern, ".*2\\_2.*");
+  }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/URIUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/URIUtilsTest.java
index 4cec446067f..18022a9d5bc 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/URIUtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/URIUtilsTest.java
@@ -28,6 +28,7 @@
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
 
 
 public class URIUtilsTest {
@@ -52,6 +53,18 @@ public void testGetPath() {
     assertEquals(URIUtils.getPath("file:/foo/bar", "table", "segment+%25"), "file:/foo/bar/table/segment+%25");
   }
 
+  @Test
+  public void testGetLastPart() {
+    assertNull(URIUtils.getLastPart(null));
+    assertEquals(URIUtils.getLastPart(""), "");
+    assertEquals(URIUtils.getLastPart("http://foo/bar"), "bar");
+    assertEquals(URIUtils.getLastPart("http://foo/bar?moo=x"), "bar");
+    assertEquals(URIUtils.getLastPart("?"), "");
+    assertEquals(URIUtils.getLastPart("?moo=x"), "");
+    assertEquals(URIUtils.getLastPart("/foo/bar"), "bar");
+    assertEquals(URIUtils.getLastPart("file:/foo/bar"), "bar");
+  }
+
   @Test
   public void testConstructDownloadUrl() {
     assertEquals(URIUtils.constructDownloadUrl("http://foo/bar", "table", "segment"),
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java
index aad62db8f74..eb1d31bab08 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigSerDeTest.java
@@ -64,11 +64,12 @@
 
 
 public class TableConfigSerDeTest {
-
+  private static final double NO_DICTIONARY_THRESHOLD_RATIO = 0.72;
   @Test
   public void testSerDe()
       throws IOException {
-    TableConfigBuilder tableConfigBuilder = new TableConfigBuilder(TableType.OFFLINE).setTableName("testTable");
+    TableConfigBuilder tableConfigBuilder = new TableConfigBuilder(TableType.OFFLINE).setTableName("testTable")
+        .setNoDictionarySizeRatioThreshold(NO_DICTIONARY_THRESHOLD_RATIO).setOptimizeDictionaryForMetrics(true);
     {
       // Default table config
       TableConfig tableConfig = tableConfigBuilder.build();
@@ -210,9 +211,9 @@ public void testSerDe()
       InstanceAssignmentConfig instanceAssignmentConfig =
           new InstanceAssignmentConfig(new InstanceTagPoolConfig("tenant_OFFLINE", true, 3, null),
               new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2")),
-              new InstanceReplicaGroupPartitionConfig(true, 0, 3, 5, 0, 0, false));
+              new InstanceReplicaGroupPartitionConfig(true, 0, 3, 5, 0, 0, false, null));
       TableConfig tableConfig = tableConfigBuilder.setInstanceAssignmentConfigMap(
-          Collections.singletonMap(InstancePartitionsType.OFFLINE, instanceAssignmentConfig)).build();
+          Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(), instanceAssignmentConfig)).build();
 
       checkInstanceAssignmentConfig(tableConfig);
 
@@ -367,6 +368,8 @@ private void checkDefaultTableConfig(TableConfig tableConfig) {
     assertNull(tableConfig.getInstanceAssignmentConfigMap());
     assertNull(tableConfig.getSegmentAssignmentConfigMap());
     assertNull(tableConfig.getFieldConfigList());
+    assertEquals(tableConfig.getIndexingConfig().isOptimizeDictionaryForMetrics(), true);
+    assertEquals(tableConfig.getIndexingConfig().getNoDictionarySizeRatioThreshold(), NO_DICTIONARY_THRESHOLD_RATIO);
 
     // Serialize
     ObjectNode tableConfigJson = (ObjectNode) tableConfig.toJsonNode();
@@ -488,12 +491,12 @@ private void checkTierConfigList(TableConfig tableConfig) {
   }
 
   private void checkInstanceAssignmentConfig(TableConfig tableConfig) {
-    Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap =
-        tableConfig.getInstanceAssignmentConfigMap();
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
     assertNotNull(instanceAssignmentConfigMap);
     assertEquals(instanceAssignmentConfigMap.size(), 1);
-    assertTrue(instanceAssignmentConfigMap.containsKey(InstancePartitionsType.OFFLINE));
-    InstanceAssignmentConfig instanceAssignmentConfig = instanceAssignmentConfigMap.get(InstancePartitionsType.OFFLINE);
+    assertTrue(instanceAssignmentConfigMap.containsKey(InstancePartitionsType.OFFLINE.toString()));
+    InstanceAssignmentConfig instanceAssignmentConfig =
+        instanceAssignmentConfigMap.get(InstancePartitionsType.OFFLINE.toString());
 
     InstanceTagPoolConfig tagPoolConfig = instanceAssignmentConfig.getTagPoolConfig();
     assertEquals(tagPoolConfig.getTag(), "tenant_OFFLINE");
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java
index 9fa44eda212..9d1f86dc233 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/config/TableConfigUtilsTest.java
@@ -18,10 +18,14 @@
  */
 package org.apache.pinot.common.utils.config;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
+import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.BatchIngestionConfig;
@@ -33,6 +37,7 @@
 import org.apache.pinot.spi.stream.StreamLevelConsumer;
 import org.apache.pinot.spi.stream.StreamMessageDecoder;
 import org.apache.pinot.spi.stream.StreamMetadataProvider;
+import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -44,6 +49,7 @@
 public class TableConfigUtilsTest {
 
   private static final String TABLE_NAME = "testTable";
+  private static final String PARTITION_COLUMN = "partitionColumn";
 
   /**
    * Test the {@link TableConfigUtils#convertFromLegacyTableConfig(TableConfig)} utility.
@@ -85,6 +91,80 @@ public void testConvertFromLegacyTableConfig() {
     Assert.assertNull(validationConfig.getSegmentPushType());
   }
 
+  @Test
+  public void testOverwriteTableConfigForTier()
+      throws Exception {
+    String col1CfgStr = "{"
+        + "  \"name\": \"col1\","
+        + "  \"encodingType\": \"DICTIONARY\","
+        + "  \"indexes\": {"
+        + "    \"bloom\": {\"enabled\": \"true\"}"
+        + "  },"
+        + "  \"tierOverwrites\": {"
+        + "    \"coldTier\": {"
+        + "      \"encodingType\": \"RAW\","
+        + "      \"indexes\": {}"
+        + "    }"
+        + "  }"
+        + "}";
+    FieldConfig col2Cfg = JsonUtils.stringToObject(col1CfgStr, FieldConfig.class);
+    String stIdxCfgStr = "{"
+        + "  \"dimensionsSplitOrder\": [\"col1\"],"
+        + "  \"functionColumnPairs\": [\"MAX__col1\"],"
+        + "  \"maxLeafRecords\": 10"
+        + "}";
+    StarTreeIndexConfig stIdxCfg = JsonUtils.stringToObject(stIdxCfgStr, StarTreeIndexConfig.class);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setStarTreeIndexConfigs(Collections.singletonList(stIdxCfg))
+        .setTierOverwrites(JsonUtils.stringToJsonNode("{\"coldTier\": {\"starTreeIndexConfigs\": []}}"))
+        .setFieldConfigList(Collections.singletonList(col2Cfg)).build();
+
+    TableConfig tierTblCfg = TableConfigUtils.overwriteTableConfigForTier(tableConfig, "unknownTier");
+    Assert.assertEquals(tierTblCfg, tableConfig);
+    tierTblCfg = TableConfigUtils.overwriteTableConfigForTier(tableConfig, null);
+    Assert.assertEquals(tierTblCfg, tableConfig);
+    // Check original TableConfig and tier specific TableConfig
+    Assert.assertEquals(tierTblCfg.getFieldConfigList().get(0).getEncodingType(), FieldConfig.EncodingType.DICTIONARY);
+    Assert.assertEquals(tierTblCfg.getFieldConfigList().get(0).getIndexes().size(), 1);
+    Assert.assertEquals(tierTblCfg.getIndexingConfig().getStarTreeIndexConfigs().size(), 1);
+    tierTblCfg = TableConfigUtils.overwriteTableConfigForTier(tableConfig, "coldTier");
+    Assert.assertEquals(tierTblCfg.getFieldConfigList().get(0).getEncodingType(), FieldConfig.EncodingType.RAW);
+    Assert.assertEquals(tierTblCfg.getFieldConfigList().get(0).getIndexes().size(), 0);
+    Assert.assertEquals(tierTblCfg.getIndexingConfig().getStarTreeIndexConfigs().size(), 0);
+  }
+
+  @Test
+  public void testOverwriteTableConfigForTierWithError()
+      throws Exception {
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setTierOverwrites(JsonUtils.stringToJsonNode("{\"coldTier\": {\"starTreeIndexConfigs\": {}}}")).build();
+    TableConfig tierTblCfg = TableConfigUtils.overwriteTableConfigForTier(tableConfig, "coldTier");
+    Assert.assertEquals(tierTblCfg, tableConfig);
+  }
+
+  @Test
+  public void testGetPartitionColumnWithoutAnyConfig() {
+    // without instanceAssignmentConfigMap
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).build();
+    Assert.assertNull(TableConfigUtils.getPartitionColumn(tableConfig));
+  }
+
+  @Test
+  public void testGetPartitionColumnWithReplicaGroupConfig() {
+    ReplicaGroupStrategyConfig replicaGroupStrategyConfig =
+        new ReplicaGroupStrategyConfig(PARTITION_COLUMN, 1);
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).build();
+
+    // setting up ReplicaGroupStrategyConfig for backward compatibility test.
+    SegmentsValidationAndRetentionConfig validationConfig = new SegmentsValidationAndRetentionConfig();
+    validationConfig.setReplicaGroupStrategyConfig(replicaGroupStrategyConfig);
+    tableConfig.setValidationConfig(validationConfig);
+
+    Assert.assertEquals(PARTITION_COLUMN, TableConfigUtils.getPartitionColumn(tableConfig));
+  }
+
   /**
    * Helper method to create a test StreamConfigs map.
    * @return Map containing Stream Configs
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactoryTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactoryTest.java
index 845ab40e7c4..389ccdc6d61 100644
--- a/pinot-common/src/test/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactoryTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/fetcher/SegmentFetcherFactoryTest.java
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pinot.spi.crypt.PinotCrypter;
 import org.apache.pinot.spi.crypt.PinotCrypterFactory;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -115,10 +116,11 @@ public void fetchSegmentToLocal(URI uri, File dest)
     }
 
     @Override
-    public File fetchUntarSegmentToLocalStreamed(URI uri, File dest, long rateLimit)
+    public File fetchUntarSegmentToLocalStreamed(URI uri, File dest, long rateLimit, AtomicInteger attempts)
         throws Exception {
       assertEquals(uri, new URI(TEST_URI));
       _fetchFileToLocalCalled++;
+      attempts.set(0);
       return new File("fakeSegmentIndexFile");
     }
 
diff --git a/pinot-common/src/test/java/org/apache/pinot/common/utils/http/HttpClientConfigTest.java b/pinot-common/src/test/java/org/apache/pinot/common/utils/http/HttpClientConfigTest.java
new file mode 100644
index 00000000000..f01340e0319
--- /dev/null
+++ b/pinot-common/src/test/java/org/apache/pinot/common/utils/http/HttpClientConfigTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.common.utils.http;
+
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class HttpClientConfigTest {
+
+  @Test
+  public void testNewBuilder() {
+    // Ensure config values are picked up by the builder.
+    PinotConfiguration pinotConfiguration = new PinotConfiguration();
+    pinotConfiguration.setProperty(HttpClientConfig.MAX_CONNS_CONFIG_NAME, "123");
+    pinotConfiguration.setProperty(HttpClientConfig.MAX_CONNS_PER_ROUTE_CONFIG_NAME, "11");
+    pinotConfiguration.setProperty(HttpClientConfig.DISABLE_DEFAULT_USER_AGENT_CONFIG_NAME, "true");
+    HttpClientConfig httpClientConfig = HttpClientConfig.newBuilder(pinotConfiguration).build();
+    Assert.assertEquals(123, httpClientConfig.getMaxConnTotal());
+    Assert.assertEquals(11, httpClientConfig.getMaxConnPerRoute());
+    Assert.assertTrue(httpClientConfig.isDisableDefaultUserAgent());
+
+    // Ensure default builder uses negative values
+    HttpClientConfig defaultConfig = HttpClientConfig.newBuilder(new PinotConfiguration()).build();
+    Assert.assertTrue(defaultConfig.getMaxConnTotal() < 0, "default value should be < 0");
+    Assert.assertTrue(defaultConfig.getMaxConnPerRoute() < 0, "default value should be < 0");
+    Assert.assertFalse(defaultConfig.isDisableDefaultUserAgent(), "Default user agent should be enabled by default");
+  }
+}
diff --git a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java
index 2164241f8ce..b951b737de7 100644
--- a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java
@@ -26,10 +26,13 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.calcite.sql.SqlNodeList;
 import org.apache.calcite.sql.SqlNumericLiteral;
+import org.apache.pinot.common.request.DataSource;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.Identifier;
+import org.apache.pinot.common.request.Join;
+import org.apache.pinot.common.request.JoinType;
 import org.apache.pinot.common.request.Literal;
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
@@ -93,11 +96,11 @@ public void testCaseWhenStatements() {
     Assert.assertEquals(greatThanFunc.getOperator(), FilterKind.GREATER_THAN.name());
     Assert.assertEquals(greatThanFunc.getOperands().get(0).getIdentifier().getName(), "Quantity");
     Assert.assertEquals(greatThanFunc.getOperands().get(1).getLiteral().getFieldValue(), 30L);
-    Assert.assertEquals(caseFunc.getOperands().get(1).getLiteral().getFieldValue(), "The quantity is greater than 30");
-    Function equalsFunc = caseFunc.getOperands().get(2).getFunctionCall();
+    Function equalsFunc = caseFunc.getOperands().get(1).getFunctionCall();
     Assert.assertEquals(equalsFunc.getOperator(), FilterKind.EQUALS.name());
     Assert.assertEquals(equalsFunc.getOperands().get(0).getIdentifier().getName(), "Quantity");
     Assert.assertEquals(equalsFunc.getOperands().get(1).getLiteral().getFieldValue(), 30L);
+    Assert.assertEquals(caseFunc.getOperands().get(2).getLiteral().getFieldValue(), "The quantity is greater than 30");
     Assert.assertEquals(caseFunc.getOperands().get(3).getLiteral().getFieldValue(), "The quantity is 30");
     Assert.assertEquals(caseFunc.getOperands().get(4).getLiteral().getFieldValue(), "The quantity is under 30");
 
@@ -124,16 +127,16 @@ public void testCaseWhenStatements() {
     Assert.assertEquals(greatThanFunc.getOperator(), FilterKind.GREATER_THAN.name());
     Assert.assertEquals(greatThanFunc.getOperands().get(0).getIdentifier().getName(), "Quantity");
     Assert.assertEquals(greatThanFunc.getOperands().get(1).getLiteral().getFieldValue(), 30L);
-    Assert.assertEquals(caseFunc.getOperands().get(1).getLiteral().getFieldValue(), 3L);
-    greatThanFunc = caseFunc.getOperands().get(2).getFunctionCall();
+    greatThanFunc = caseFunc.getOperands().get(1).getFunctionCall();
     Assert.assertEquals(greatThanFunc.getOperator(), FilterKind.GREATER_THAN.name());
     Assert.assertEquals(greatThanFunc.getOperands().get(0).getIdentifier().getName(), "Quantity");
     Assert.assertEquals(greatThanFunc.getOperands().get(1).getLiteral().getFieldValue(), 20L);
-    Assert.assertEquals(caseFunc.getOperands().get(3).getLiteral().getFieldValue(), 2L);
-    greatThanFunc = caseFunc.getOperands().get(4).getFunctionCall();
+    greatThanFunc = caseFunc.getOperands().get(2).getFunctionCall();
     Assert.assertEquals(greatThanFunc.getOperator(), FilterKind.GREATER_THAN.name());
     Assert.assertEquals(greatThanFunc.getOperands().get(0).getIdentifier().getName(), "Quantity");
     Assert.assertEquals(greatThanFunc.getOperands().get(1).getLiteral().getFieldValue(), 10L);
+    Assert.assertEquals(caseFunc.getOperands().get(3).getLiteral().getFieldValue(), 3L);
+    Assert.assertEquals(caseFunc.getOperands().get(4).getLiteral().getFieldValue(), 2L);
     Assert.assertEquals(caseFunc.getOperands().get(5).getLiteral().getFieldValue(), 1L);
     Assert.assertEquals(caseFunc.getOperands().get(6).getLiteral().getFieldValue(), 0L);
   }
@@ -866,15 +869,11 @@ public void testRemoveComments() {
     testRemoveComments("select * from myTable--hello\n", "select * from myTable");
     testRemoveComments("select * from--hello\nmyTable", "select * from myTable");
     testRemoveComments("select * from/*hello*/myTable", "select * from myTable");
-    // Multi-line comment must have end indicator
-    testRemoveComments("select * from myTable/*hello", "select * from myTable/*hello");
     testRemoveComments("select * from myTable--", "select * from myTable");
     testRemoveComments("select * from myTable--\n", "select * from myTable");
     testRemoveComments("select * from--\nmyTable", "select * from myTable");
     testRemoveComments("select * from/**/myTable", "select * from myTable");
-    // End indicator itself has no effect
     testRemoveComments("select * from\nmyTable", "select * from\nmyTable");
-    testRemoveComments("select * from*/myTable", "select * from*/myTable");
 
     // Mix of single line and multi-line comment indicators
     testRemoveComments("select * from myTable--hello--world", "select * from myTable");
@@ -906,7 +905,9 @@ public void testRemoveComments() {
   }
 
   private void testRemoveComments(String sqlWithComments, String expectedSqlWithoutComments) {
-    Assert.assertEquals(CalciteSqlParser.removeComments(sqlWithComments).trim(), expectedSqlWithoutComments.trim());
+    PinotQuery commentedResult = CalciteSqlParser.compileToPinotQuery(sqlWithComments);
+    PinotQuery expectedResult = CalciteSqlParser.compileToPinotQuery(expectedSqlWithoutComments);
+    Assert.assertEquals(commentedResult, expectedResult);
   }
 
   @Test
@@ -1059,7 +1060,7 @@ public void testSqlDistinctQueryCompilation() {
     Assert.assertEquals(selectListExpressions.get(0).getType(), ExpressionType.FUNCTION);
 
     Function distinctFunction = selectListExpressions.get(0).getFunctionCall();
-    Assert.assertEquals(distinctFunction.getOperator(), AggregationFunctionType.DISTINCT.getName());
+    Assert.assertEquals(distinctFunction.getOperator(), "distinct");
     Assert.assertEquals(distinctFunction.getOperands().size(), 1);
 
     Identifier c1 = distinctFunction.getOperands().get(0).getIdentifier();
@@ -1073,7 +1074,7 @@ public void testSqlDistinctQueryCompilation() {
     Assert.assertEquals(selectListExpressions.get(0).getType(), ExpressionType.FUNCTION);
 
     distinctFunction = selectListExpressions.get(0).getFunctionCall();
-    Assert.assertEquals(distinctFunction.getOperator(), AggregationFunctionType.DISTINCT.getName());
+    Assert.assertEquals(distinctFunction.getOperator(), "distinct");
     Assert.assertEquals(distinctFunction.getOperands().size(), 2);
 
     c1 = distinctFunction.getOperands().get(0).getIdentifier();
@@ -1090,7 +1091,7 @@ public void testSqlDistinctQueryCompilation() {
     Assert.assertEquals(selectListExpressions.get(0).getType(), ExpressionType.FUNCTION);
 
     distinctFunction = selectListExpressions.get(0).getFunctionCall();
-    Assert.assertEquals(distinctFunction.getOperator(), AggregationFunctionType.DISTINCT.getName());
+    Assert.assertEquals(distinctFunction.getOperator(), "distinct");
     Assert.assertEquals(distinctFunction.getOperands().size(), 3);
 
     final Expression filter = pinotQuery.getFilterExpression();
@@ -1207,7 +1208,7 @@ public void testSqlDistinctQueryCompilation() {
     Assert.assertEquals(selectListExpressions.get(0).getType(), ExpressionType.FUNCTION);
 
     distinctFunction = selectListExpressions.get(0).getFunctionCall();
-    Assert.assertEquals(distinctFunction.getOperator(), AggregationFunctionType.DISTINCT.getName());
+    Assert.assertEquals(distinctFunction.getOperator(), "distinct");
     Assert.assertEquals(distinctFunction.getOperands().size(), 1);
 
     Function add = distinctFunction.getOperands().get(0).getFunctionCall();
@@ -1226,7 +1227,7 @@ public void testSqlDistinctQueryCompilation() {
     Assert.assertEquals(selectListExpressions.get(0).getType(), ExpressionType.FUNCTION);
 
     distinctFunction = selectListExpressions.get(0).getFunctionCall();
-    Assert.assertEquals(distinctFunction.getOperator(), AggregationFunctionType.DISTINCT.getName());
+    Assert.assertEquals(distinctFunction.getOperator(), "distinct");
     Assert.assertEquals(distinctFunction.getOperands().size(), 2);
 
     // check for DISTINCT's first operand ADD(....)
@@ -1269,7 +1270,7 @@ public void testSqlDistinctQueryCompilation() {
     Assert.assertEquals(selectListExpressions.get(0).getType(), ExpressionType.FUNCTION);
 
     distinctFunction = selectListExpressions.get(0).getFunctionCall();
-    Assert.assertEquals(distinctFunction.getOperator(), AggregationFunctionType.DISTINCT.getName());
+    Assert.assertEquals(distinctFunction.getOperator(), "distinct");
     Assert.assertEquals(distinctFunction.getOperands().size(), 4);
 
     // check for DISTINCT's first operand ADD(....)
@@ -1831,7 +1832,7 @@ public void testDistinctSumRewrite() {
         "distinct_bar");
 
     query = "SELECT sum(distinct bar) AS distinct_bar, count(*), sum(a),min(a),max(b) FROM foo GROUP BY city ORDER BY "
-            + "distinct_bar";
+        + "distinct_bar";
     pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
     Assert.assertEquals(pinotQuery.getSelectList().size(), 5);
     Function selectFunctionCall = pinotQuery.getSelectList().get(0).getFunctionCall();
@@ -2239,9 +2240,8 @@ public void testCompilationInvokedFunction() {
     result = pinotQuery.getSelectList().get(0).getLiteral().getBoolValue();
     Assert.assertTrue(result);
 
-    query =
-        "select isSubnetOf('2001:db8:85a3::8a2e:370:7334/62', '2001:0db8:85a3:0003:ffff:ffff:ffff:ffff') from "
-            + "mytable";
+    query = "select isSubnetOf('2001:db8:85a3::8a2e:370:7334/62', '2001:0db8:85a3:0003:ffff:ffff:ffff:ffff') from "
+        + "mytable";
     pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
     result = pinotQuery.getSelectList().get(0).getLiteral().getBoolValue();
     Assert.assertTrue(result);
@@ -2949,13 +2949,24 @@ public void testInvalidQueryWithAggregateFunction() {
    * Test for customized components in src/main/codegen/parserImpls.ftl file.
    */
   @Test
-  public void testParserExtensionImpl() {
+  public void testParserExtensionImpl()
+      throws Exception {
     String customSql = "INSERT INTO db.tbl FROM FILE 'file:///tmp/file1', FILE 'file:///tmp/file2'";
     SqlNodeAndOptions sqlNodeAndOptions = testSqlWithCustomSqlParser(customSql);
     Assert.assertTrue(sqlNodeAndOptions.getSqlNode() instanceof SqlInsertFromFile);
     Assert.assertEquals(sqlNodeAndOptions.getSqlType(), PinotSqlType.DML);
   }
 
+  private static SqlNodeAndOptions testSqlWithCustomSqlParser(String sqlString)
+      throws Exception {
+    try (StringReader inStream = new StringReader(sqlString)) {
+      SqlParserImpl sqlParser = CalciteSqlParser.newSqlParser(inStream);
+      SqlNodeList sqlNodeList = sqlParser.SqlStmtsEof();
+      // Extract OPTION statements from sql.
+      return CalciteSqlParser.extractSqlNodeAndOptions(sqlString, sqlNodeList);
+    }
+  }
+
   @Test
   public void shouldParseBasicAtTimeZoneExtension() {
     // Given:
@@ -3012,15 +3023,105 @@ public void shouldParseOutsideExprAtTimeZoneExtension() {
     Assert.assertEquals(fun.operands.get(0).getFunctionCall().operands.get(1).getLiteral().getStringValue(), "pst");
   }
 
-  private static SqlNodeAndOptions testSqlWithCustomSqlParser(String sqlString) {
-    try (StringReader inStream = new StringReader(sqlString)) {
-      SqlParserImpl sqlParser = CalciteSqlParser.newSqlParser(inStream);
-      SqlNodeList sqlNodeList = sqlParser.SqlStmtsEof();
-      // Extract OPTION statements from sql.
-      return CalciteSqlParser.extractSqlNodeAndOptions(sqlString, sqlNodeList);
-    } catch (Exception e) {
-      Assert.fail("test custom sql parser failed", e);
-      return null;
-    }
+  @Test
+  public void testJoin() {
+    String query = "SELECT T1.a, T2.b FROM T1 JOIN T2";
+    PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    DataSource dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    Join join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.INNER);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    Assert.assertEquals(join.getRight().getTableName(), "T2");
+    Assert.assertNull(join.getCondition());
+
+    query = "SELECT T1.a, T2.b FROM T1 INNER JOIN T2 ON T1.key = T2.key";
+    pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.INNER);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    Assert.assertEquals(join.getRight().getTableName(), "T2");
+    Assert.assertEquals(join.getCondition(), CalciteSqlParser.compileToExpression("T1.key = T2.key"));
+
+    query = "SELECT T1.a, T2.b FROM T1 FULL JOIN T2 ON T1.key = T2.key";
+    pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.FULL);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    Assert.assertEquals(join.getRight().getTableName(), "T2");
+    Assert.assertEquals(join.getCondition(), CalciteSqlParser.compileToExpression("T1.key = T2.key"));
+
+    query = "SELECT T1.a, T2.b FROM T1 LEFT JOIN T2 ON T1.a > T2.b";
+    pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.LEFT);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    Assert.assertEquals(join.getRight().getTableName(), "T2");
+    Assert.assertEquals(join.getCondition(), CalciteSqlParser.compileToExpression("T1.a > T2.b"));
+
+    query =
+        "SELECT T1.a, T2.b FROM T1 RIGHT JOIN (SELECT a, COUNT(*) AS b FROM T3 GROUP BY a) AS T2 ON T1.key = T2.key";
+    pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.RIGHT);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    DataSource right = join.getRight();
+    Assert.assertEquals(right.getTableName(), "T2");
+    PinotQuery rightSubquery = right.getSubquery();
+    Assert.assertEquals(rightSubquery,
+        CalciteSqlParser.compileToPinotQuery("SELECT a, COUNT(*) AS b FROM T3 GROUP BY a"));
+    Assert.assertEquals(join.getCondition(), CalciteSqlParser.compileToExpression("T1.key = T2.key"));
+
+    query = "SELECT T1.a, T2.b FROM T1 JOIN (SELECT key, COUNT(*) AS b FROM T3 JOIN T4 GROUP BY key) AS T2 "
+        + "ON T1.key = T2.key";
+    pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.INNER);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    right = join.getRight();
+    Assert.assertEquals(right.getTableName(), "T2");
+    rightSubquery = right.getSubquery();
+    Assert.assertEquals(rightSubquery,
+        CalciteSqlParser.compileToPinotQuery("SELECT key, COUNT(*) AS b FROM T3 JOIN T4 GROUP BY key"));
+    Assert.assertEquals(join.getCondition(), CalciteSqlParser.compileToExpression("T1.key = T2.key"));
+
+    // test for self join queries.
+    query = "SELECT T1.a FROM T1 JOIN(SELECT key FROM T1) as self ON T1.key=self.key";
+    pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+    dataSource = pinotQuery.getDataSource();
+    Assert.assertNull(dataSource.getTableName());
+    Assert.assertNull(dataSource.getSubquery());
+    Assert.assertNotNull(dataSource.getJoin());
+    join = dataSource.getJoin();
+    Assert.assertEquals(join.getType(), JoinType.INNER);
+    Assert.assertEquals(join.getLeft().getTableName(), "T1");
+    right = join.getRight();
+    Assert.assertEquals(right.getTableName(), "self");
+    rightSubquery = right.getSubquery();
+    Assert.assertEquals(rightSubquery,
+        CalciteSqlParser.compileToPinotQuery("SELECT key FROM T1"));
+    Assert.assertEquals(join.getCondition(), CalciteSqlParser.compileToExpression("T1.key = self.key"));
   }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/ArgMinMaxRewriterTest.java b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/ArgMinMaxRewriterTest.java
new file mode 100644
index 00000000000..479f609146d
--- /dev/null
+++ b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/ArgMinMaxRewriterTest.java
@@ -0,0 +1,76 @@
+/**
+ * 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.pinot.sql.parsers.rewriter;
+
+import org.apache.pinot.sql.parsers.CalciteSqlParser;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class ArgMinMaxRewriterTest {
+  private static final QueryRewriter QUERY_REWRITER = new ArgMinMaxRewriter();
+
+  @Test
+  public void testQueryRewrite() {
+    testQueryRewrite("SELECT ARG_MIN(col1,col2), ARG_MIN(col1,col3) FROM myTable",
+        "SELECT CHILD_ARG_MIN(0,col2,col1,col2), "
+            + "CHILD_ARG_MIN(0,col3,col1,col3),"
+            + "PARENT_ARG_MIN(0,1,col1,col2,col3) FROM myTable");
+
+    testQueryRewrite("SELECT ARG_MIN(col1,col2), ARG_MIN(col1,col2) FROM myTable",
+        "SELECT CHILD_ARG_MIN(0,col2,col1,col2),"
+            + "PARENT_ARG_MIN(0,1,col1,col2) FROM myTable");
+
+    testQueryRewrite("SELECT ARG_MIN(col1,col2,col5), ARG_MIN(col1,col2,col6), ARG_MAX(col1,col2,col6) "
+            + "FROM myTable",
+        "SELECT CHILD_ARG_MIN(0,col5,col1,col2,col5), "
+            + "CHILD_ARG_MIN(0,col6,col1,col2,col6), "
+            + "CHILD_ARG_MAX(0,col6,col1,col2,col6),"
+            + "PARENT_ARG_MIN(0,2,col1,col2,col6,col5),"
+            + "PARENT_ARG_MAX(0,2,col1,col2,col6) FROM myTable");
+  }
+
+  @Test
+  public void testQueryRewriteWithOrderBy() {
+    testQueryRewrite("SELECT ARG_MIN(col1,col2,col5), ARG_MIN(col1,col3,col6),"
+            + "ARG_MIN(col3,col1,col6) FROM myTable GROUP BY col3 "
+            + "ORDER BY col3 DESC",
+        "SELECT CHILD_ARG_MIN(0,col5,col1,col2,col5), "
+            + "CHILD_ARG_MIN(1,col6,col1,col3,col6),"
+            + "CHILD_ARG_MIN(2,col6,col3,col1,col6),"
+            + "PARENT_ARG_MIN(1,2,col1,col3,col6),"
+            + "PARENT_ARG_MIN(0,2,col1,col2,col5),"
+            + "PARENT_ARG_MIN(2,2,col3,col1,col6)"
+            + "FROM myTable GROUP BY col3 ORDER BY col3 DESC");
+
+    testQueryRewrite("SELECT ARG_MIN(col1,col2,col5), ARG_MAX(col1,col2,col5) FROM myTable GROUP BY col3 "
+            + "ORDER BY ADD(co1, co3) DESC",
+        "SELECT CHILD_ARG_MIN(0,col5,col1,col2,col5),"
+            + "CHILD_ARG_MAX(0,col5,col1,col2,col5),"
+            + "PARENT_ARG_MIN(0,2,col1,col2,col5), "
+            + "PARENT_ARG_MAX(0,2,col1,col2,col5) "
+            + "FROM myTable GROUP BY col3 ORDER BY ADD(co1, co3) DESC");
+  }
+
+  private void testQueryRewrite(String original, String expected) {
+    assertEquals(QUERY_REWRITER.rewrite(CalciteSqlParser.compileToPinotQuery(original)),
+        CalciteSqlParser.compileToPinotQuery(expected));
+  }
+}
diff --git a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/CLPDecodeRewriterTest.java b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/CLPDecodeRewriterTest.java
new file mode 100644
index 00000000000..e6bdb8dff6a
--- /dev/null
+++ b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/CLPDecodeRewriterTest.java
@@ -0,0 +1,65 @@
+/**
+ * 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.pinot.sql.parsers.rewriter;
+
+import org.apache.pinot.sql.parsers.CalciteSqlParser;
+import org.apache.pinot.sql.parsers.SqlCompilationException;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+
+public class CLPDecodeRewriterTest {
+  private static final QueryRewriter _QUERY_REWRITER = new CLPDecodeRewriter();
+
+  @Test
+  public void testCLPDecodeRewrite() {
+    // clpDecode rewrite from column group to individual columns
+    testQueryRewrite("SELECT clpDecode(message) FROM clpTable",
+        "SELECT clpDecode(message_logtype, message_dictionaryVars, message_encodedVars) FROM clpTable");
+    testQueryRewrite("SELECT clpDecode(message, 'null') FROM clpTable",
+        "SELECT clpDecode(message_logtype, message_dictionaryVars, message_encodedVars, 'null') FROM clpTable");
+
+    // clpDecode passthrough
+    testQueryRewrite("SELECT clpDecode(message_logtype, message_dictionaryVars, message_encodedVars) FROM clpTable",
+        "SELECT clpDecode(message_logtype, message_dictionaryVars, message_encodedVars) FROM clpTable");
+    testQueryRewrite(
+        "SELECT clpDecode(message_logtype, message_dictionaryVars, message_encodedVars, 'null') FROM clpTable",
+        "SELECT clpDecode(message_logtype, message_dictionaryVars, message_encodedVars, 'null') FROM clpTable");
+  }
+
+  @Test
+  public void testUnsupportedCLPDecodeQueries() {
+    testUnsupportedQuery("SELECT clpDecode('message') FROM clpTable");
+    testUnsupportedQuery("SELECT clpDecode('message', 'default') FROM clpTable");
+    testUnsupportedQuery("SELECT clpDecode('message', default) FROM clpTable");
+    testUnsupportedQuery("SELECT clpDecode(message, default) FROM clpTable");
+  }
+
+  private void testQueryRewrite(String original, String expected) {
+    assertEquals(_QUERY_REWRITER.rewrite(CalciteSqlParser.compileToPinotQuery(original)),
+        CalciteSqlParser.compileToPinotQuery(expected));
+  }
+
+  private void testUnsupportedQuery(String query) {
+     assertThrows(SqlCompilationException.class,
+        () -> _QUERY_REWRITER.rewrite(CalciteSqlParser.compileToPinotQuery(query)));
+  }
+}
diff --git a/pinot-common/src/test/java/org/apache/pinot/util/TestUtils.java b/pinot-common/src/test/java/org/apache/pinot/util/TestUtils.java
index 60de17ae317..d98c27821d7 100644
--- a/pinot-common/src/test/java/org/apache/pinot/util/TestUtils.java
+++ b/pinot-common/src/test/java/org/apache/pinot/util/TestUtils.java
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.time.Duration;
+import java.time.Instant;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
@@ -110,6 +112,46 @@ public static void waitForCondition(Function<Void, Boolean> condition, long chec
     }
   }
 
+  /**
+   * Like {@link #waitForCondition(Function, long, long, String, boolean)}, but supports functions that throw checked
+   * exceptions.
+   *
+   * The first time every logPeriod that the function throws an exception, it is printed in the standard error.
+   */
+  public static void waitForCondition(SupplierWithException<Boolean> condition, long checkIntervalMs, long timeoutMs,
+      @Nullable String errorMessage, boolean raiseError, @Nullable Duration logPeriod) {
+    long endTime = System.currentTimeMillis() + timeoutMs;
+    Instant errorLogInstant = Instant.EPOCH;
+    String errorMessageSuffix = errorMessage != null ? ", error message: " + errorMessage : "";
+    Throwable lastError = null;
+    int numErrors = 0;
+    while (System.currentTimeMillis() < endTime) {
+      try {
+        if (Boolean.TRUE.equals(condition.get())) {
+          return;
+        }
+        Thread.sleep(checkIntervalMs);
+      } catch (InterruptedException e) {
+        lastError = e;
+        break;
+      } catch (Exception e) {
+        lastError = e;
+        if (logPeriod != null) {
+          numErrors++;
+          Instant now = Instant.now();
+          if (logPeriod.compareTo(Duration.between(errorLogInstant, now)) < 0) {
+            LOGGER.warn("Error while waiting for condition", e);
+            errorLogInstant = now;
+          }
+        }
+      }
+    }
+    if (raiseError) {
+      Assert.fail("Failed to meet condition in " + timeoutMs + "ms after " + numErrors + " errors"
+          + errorMessageSuffix, lastError);
+    }
+  }
+
   /**
    * Wait for a result to be returned
    *
@@ -120,12 +162,36 @@ public static void waitForCondition(Function<Void, Boolean> condition, long chec
    */
   public static <T> T waitForResult(SupplierWithException<T> supplier, long timeoutMs)
       throws InterruptedException {
+    return waitForResult(supplier, timeoutMs, null);
+  }
+
+  /**
+   * Like {@link #waitForResult(SupplierWithException, long)}, but optionally prints in stderr the first error found
+   * every given log period.
+   * @param supplier result value supplier
+   * @param timeoutMs timeout
+   * @param logPeriod how often logs will be printed. The longer the duration, the fewer the logs.
+   * @return result value (non-throwable)
+   * @throws InterruptedException if {@code Thread.sleep()} is interrupted
+   */
+  public static <T> T waitForResult(SupplierWithException<T> supplier, long timeoutMs, @Nullable Duration logPeriod)
+      throws InterruptedException {
     long tEnd = System.currentTimeMillis() + timeoutMs;
+    Instant lastError = Instant.now();
     while (tEnd > System.currentTimeMillis()) {
       try {
         return supplier.get();
-      } catch (Throwable ignore) {
-        // ignore
+      } catch (InterruptedException e) {
+        throw new IllegalStateException("Waiting interrupted after "
+            + (System.currentTimeMillis() + timeoutMs - tEnd) + "ms");
+      } catch (Throwable t) {
+        if (logPeriod != null) {
+          Instant now = Instant.now();
+          if (logPeriod.compareTo(Duration.between(lastError, now)) < 0) {
+            t.printStackTrace();
+          }
+          lastError = now;
+        }
       }
 
       Thread.sleep(1000);
diff --git a/pinot-common/src/test/resources/testConfigs/multipleIndexPartialUpsertConfig.json b/pinot-common/src/test/resources/testConfigs/multipleIndexPartialUpsertConfig.json
new file mode 100644
index 00000000000..8e273a05140
--- /dev/null
+++ b/pinot-common/src/test/resources/testConfigs/multipleIndexPartialUpsertConfig.json
@@ -0,0 +1,41 @@
+{
+  "tableName": "testTableUpsert",
+  "segmentsConfig": {
+    "replication": "1",
+    "schemaName": "testTable",
+    "timeColumnName": "time"
+  },
+  "fieldConfigList": [
+    {
+      "encodingType": "DICTIONARY",
+      "indexTypes": [
+        "INVERTED",
+        "RANGE"
+      ],
+      "name": "hits"
+    }
+  ],
+  "tableIndexConfig": {
+    "invertedIndexColumns": [
+      "hits"
+    ],
+    "rangeIndexColumns": [
+      "hits"
+    ],
+    "loadMode": "HEAP"
+  },
+  "tenants": {
+    "broker": "DefaultTenant",
+    "server": "DefaultTenant"
+  },
+  "tableType": "REALTIME",
+  "upsertConfig": {
+    "mode": "PARTIAL",
+    "comparisonColumn": "_comparison_column",
+    "partialUpsertStrategies": {},
+    "defaultPartialUpsertStrategy": "OVERWRITE",
+    "hashFunction": "MURMUR3",
+    "enableSnapshot": false
+  },
+  "metadata": {}
+}
diff --git a/pinot-common/src/test/resources/testConfigs/multipleIndexPartialUpsertMultipleComparisonColumnConfig.json b/pinot-common/src/test/resources/testConfigs/multipleIndexPartialUpsertMultipleComparisonColumnConfig.json
new file mode 100644
index 00000000000..06ac7c26241
--- /dev/null
+++ b/pinot-common/src/test/resources/testConfigs/multipleIndexPartialUpsertMultipleComparisonColumnConfig.json
@@ -0,0 +1,41 @@
+{
+  "tableName": "testTableUpsertMultiComparison",
+  "segmentsConfig": {
+    "replication": "1",
+    "schemaName": "testTable",
+    "timeColumnName": "time"
+  },
+  "fieldConfigList": [
+    {
+      "encodingType": "DICTIONARY",
+      "indexTypes": [
+        "INVERTED",
+        "RANGE"
+      ],
+      "name": "hits"
+    }
+  ],
+  "tableIndexConfig": {
+    "invertedIndexColumns": [
+      "hits"
+    ],
+    "rangeIndexColumns": [
+      "hits"
+    ],
+    "loadMode": "HEAP"
+  },
+  "tenants": {
+    "broker": "DefaultTenant",
+    "server": "DefaultTenant"
+  },
+  "tableType": "REALTIME",
+  "upsertConfig": {
+    "mode": "PARTIAL",
+    "comparisonColumns": ["_comparison_column", "foo"],
+    "partialUpsertStrategies": {},
+    "defaultPartialUpsertStrategy": "OVERWRITE",
+    "hashFunction": "MURMUR3",
+    "enableSnapshot": false
+  },
+  "metadata": {}
+}
diff --git a/pinot-common/src/thrift/query.thrift b/pinot-common/src/thrift/query.thrift
index 891098fd3c0..12a601c2df3 100644
--- a/pinot-common/src/thrift/query.thrift
+++ b/pinot-common/src/thrift/query.thrift
@@ -18,11 +18,6 @@
  */
 namespace java org.apache.pinot.common.request
 
-struct DataSource {
-  1: optional string tableName;
-  2: optional PinotQuery subquery;
-}
-
 struct PinotQuery {
   1: optional i32 version;
   2: optional DataSource dataSource;
@@ -39,10 +34,24 @@ struct PinotQuery {
   13: optional map<Expression, Expression> expressionOverrideHints;
 }
 
-enum ExpressionType {
-  LITERAL,
-  IDENTIFIER,
-  FUNCTION
+struct DataSource {
+  1: optional string tableName;
+  2: optional PinotQuery subquery;
+  3: optional Join join;
+}
+
+struct Join {
+  1: required JoinType type;
+  2: required DataSource left;
+  3: required DataSource right;
+  4: optional Expression condition;
+}
+
+enum JoinType {
+  INNER,
+  LEFT,
+  RIGHT,
+  FULL
 }
 
 struct Expression {
@@ -52,19 +61,27 @@ struct Expression {
   4: optional Identifier identifier;
 }
 
-struct Identifier {
-  1: required string name;
+enum ExpressionType {
+  LITERAL,
+  IDENTIFIER,
+  FUNCTION
 }
 
 union Literal {
   1: optional bool boolValue;
-  2: optional byte byteValue;
+  2: optional i8 byteValue;
   3: optional i16 shortValue;
   4: optional i32 intValue;
   5: optional i64 longValue;
   6: optional double doubleValue;
   7: optional string stringValue;
   8: optional binary binaryValue;
+  // Set to true when the literal value is a null.
+  9: optional bool nullValue;
+}
+
+struct Identifier {
+  1: required string name;
 }
 
 struct Function {
diff --git a/pinot-compatibility-verifier/pom.xml b/pinot-compatibility-verifier/pom.xml
index 5dd497062b4..07754e386d9 100644
--- a/pinot-compatibility-verifier/pom.xml
+++ b/pinot-compatibility-verifier/pom.xml
@@ -84,6 +84,10 @@
           <groupId>net.minidev</groupId>
           <artifactId>json-smart</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.typesafe.netty</groupId>
+          <artifactId>netty-reactive-streams</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -92,11 +96,28 @@
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.beust</groupId>
+          <artifactId>jcommander</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-controller</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>jakarta.activation</groupId>
+          <artifactId>jakarta.activation-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- Kafka  -->
     <dependency>
diff --git a/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/CompatibilityOpsRunner.java b/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/CompatibilityOpsRunner.java
index bd76f24064f..c7dee3dc3f0 100644
--- a/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/CompatibilityOpsRunner.java
+++ b/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/CompatibilityOpsRunner.java
@@ -18,14 +18,21 @@
  */
 package org.apache.pinot.compat;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.nodes.MappingNode;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.nodes.NodeTuple;
+import org.yaml.snakeyaml.nodes.ScalarNode;
+import org.yaml.snakeyaml.representer.Representer;
 
 
 public class CompatibilityOpsRunner {
@@ -46,8 +53,11 @@ private boolean runOps()
     _parentDir = path.getParent().toString();
     InputStream inputStream = Files.newInputStream(path);
 
-    ObjectMapper om = new ObjectMapper(new YAMLFactory());
-    CompatTestOperation operation = om.readValue(inputStream, CompatTestOperation.class);
+    Representer representer = new Representer(new DumperOptions());
+    representer.getPropertyUtils().setSkipMissingProperties(true);
+    Yaml yaml = new Yaml(new CustomConstructor(new LoaderOptions()), representer);
+
+    CompatTestOperation operation = yaml.loadAs(inputStream, CompatTestOperation.class);
     LOGGER.info("Running compat verifications from file:{} ({})", path.toString(), operation.getDescription());
 
     boolean passed = true;
@@ -79,4 +89,42 @@ public static void main(String[] args)
     }
     System.exit(exitStatus);
   }
+
+  public static class CustomConstructor extends Constructor {
+
+    public CustomConstructor(LoaderOptions loadingConfig) {
+      super(loadingConfig);
+    }
+
+    @Override
+    protected Object constructObject(Node node) {
+      if (node.getType() == BaseOp.class) {
+        MappingNode mappingNode = (MappingNode) node;
+        for (NodeTuple tuple : (mappingNode).getValue()) {
+          if (((ScalarNode) tuple.getKeyNode()).getValue().equals("type")) {
+            String type = ((ScalarNode) tuple.getValueNode()).getValue();
+            switch (type) {
+              case "segmentOp":
+                node.setType(SegmentOp.class);
+                break;
+              case "tableOp":
+                node.setType(TableOp.class);
+                break;
+              case "queryOp":
+                node.setType(QueryOp.class);
+                break;
+              case "streamOp":
+                node.setType(StreamOp.class);
+                break;
+              default:
+                throw new RuntimeException("Unknown type: " + type);
+            }
+            mappingNode.getValue().remove(tuple);
+            break;
+          }
+        }
+      }
+      return super.constructObject(node);
+    }
+  }
 }
diff --git a/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/StreamOp.java b/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/StreamOp.java
index ac69226211d..fa0e9e38bfa 100644
--- a/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/StreamOp.java
+++ b/pinot-compatibility-verifier/src/main/java/org/apache/pinot/compat/StreamOp.java
@@ -21,8 +21,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Function;
 import java.io.File;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,7 +30,7 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nullable;
+import java.util.concurrent.atomic.AtomicLong;
 import org.apache.commons.io.FileUtils;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
@@ -279,7 +279,9 @@ private long fetchExistingTotalDocs(String tableName)
       String errorMsg =
           String.format("Failed when running query: '%s'; got exceptions:\n%s\n", query, response.toPrettyString());
       JsonNode exceptions = response.get(EXCEPTIONS);
-      if (String.valueOf(QueryException.BROKER_INSTANCE_MISSING_ERROR).equals(exceptions.get(ERROR_CODE).toString())) {
+      JsonNode errorCode = exceptions.get(ERROR_CODE);
+      if (String.valueOf(QueryException.BROKER_INSTANCE_MISSING_ERROR).equals(String.valueOf(errorCode))
+          && errorCode != null) {
         LOGGER.warn(errorMsg + ".Trying again");
         return 0;
       }
@@ -304,16 +306,14 @@ private long fetchExistingTotalDocs(String tableName)
 
   private void waitForDocsLoaded(String tableName, long targetDocs, long timeoutMs) {
     LOGGER.info("Wait Doc to load ...");
-    TestUtils.waitForCondition(new Function<Void, Boolean>() {
-      @Nullable
-      @Override
-      public Boolean apply(@Nullable Void aVoid) {
-        try {
-          return fetchExistingTotalDocs(tableName) == targetDocs;
-        } catch (Exception e) {
-          return null;
-        }
-      }
-    }, 100L, timeoutMs, "Failed to load " + targetDocs + " documents", true);
+    AtomicLong loadedDocs = new AtomicLong(-1);
+    TestUtils.waitForCondition(
+        () -> {
+          long existingTotalDocs = fetchExistingTotalDocs(tableName);
+          loadedDocs.set(existingTotalDocs);
+          return existingTotalDocs == targetDocs;
+        }, 100L, timeoutMs,
+        "Failed to load " + targetDocs + " documents. Found " + loadedDocs.get() + " instead", true,
+        Duration.ofSeconds(1));
   }
 }
diff --git a/pinot-connectors/pinot-flink-connector/pom.xml b/pinot-connectors/pinot-flink-connector/pom.xml
index b6a3be32f92..608a0117f34 100644
--- a/pinot-connectors/pinot-flink-connector/pom.xml
+++ b/pinot-connectors/pinot-flink-connector/pom.xml
@@ -120,7 +120,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>3.2.1</version>
         <executions>
         </executions>
         <configuration>
diff --git a/pinot-connectors/pinot-flink-connector/src/test/java/org/apache/pinot/connector/flink/sink/PinotSinkIntegrationTest.java b/pinot-connectors/pinot-flink-connector/src/test/java/org/apache/pinot/connector/flink/sink/PinotSinkIntegrationTest.java
index a2bb529b1c7..e51d261a1c1 100644
--- a/pinot-connectors/pinot-flink-connector/src/test/java/org/apache/pinot/connector/flink/sink/PinotSinkIntegrationTest.java
+++ b/pinot-connectors/pinot-flink-connector/src/test/java/org/apache/pinot/connector/flink/sink/PinotSinkIntegrationTest.java
@@ -46,11 +46,12 @@
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.util.TestUtils;
-import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+
 
 public class PinotSinkIntegrationTest extends BaseClusterIntegrationTest {
   public static final String RAW_TABLE_NAME = "testTable";
@@ -78,7 +79,7 @@ public void setUp()
     Map<String, String> batchConfigs = new HashMap<>();
     batchConfigs.put(BatchConfigProperties.OUTPUT_DIR_URI, _tarDir.getAbsolutePath());
     batchConfigs.put(BatchConfigProperties.OVERWRITE_OUTPUT, "false");
-    batchConfigs.put(BatchConfigProperties.PUSH_CONTROLLER_URI, _controllerBaseApiUrl);
+    batchConfigs.put(BatchConfigProperties.PUSH_CONTROLLER_URI, getControllerBaseApiUrl());
     IngestionConfig ingestionConfig = new IngestionConfig();
     ingestionConfig.setBatchIngestionConfig(
         new BatchIngestionConfig(Collections.singletonList(batchConfigs), "APPEND", "HOURLY"));
@@ -90,11 +91,17 @@ public void setUp()
             .addSingleValueDimension("b", FieldSpec.DataType.LONG)
             .addSingleValueDimension("c", FieldSpec.DataType.STRING).setPrimaryKeyColumns(Lists.newArrayList("a"))
             .build();
+
+    addSchema(_schema);
+    addTableConfig(_tableConfig);
   }
 
   @AfterClass
   public void tearDown()
       throws Exception {
+    dropOfflineTable(OFFLINE_TABLE_NAME);
+    deleteSchema(RAW_TABLE_NAME);
+
     stopServer();
     stopBroker();
     stopController();
@@ -106,61 +113,38 @@ public void tearDown()
   @Test
   public void testPinotSinkWrite()
       throws Exception {
-    addSchema(_schema);
-    addTableConfig(_tableConfig);
-
+    // Single-thread write
     StreamExecutionEnvironment execEnv = StreamExecutionEnvironment.getExecutionEnvironment();
     execEnv.setParallelism(1);
     DataStream<Row> srcDs = execEnv.fromCollection(_data).returns(_typeInfo);
     srcDs.addSink(new PinotSinkFunction<>(new FlinkRowGenericRowConverter(_typeInfo), _tableConfig, _schema));
     execEnv.execute();
-    Assert.assertEquals(getNumSegments(), 1);
-    Assert.assertEquals(getTotalNumDocs(), 6);
+    verifySegments(1, 6);
 
-    deleteSchema(RAW_TABLE_NAME);
-    dropOfflineTable(OFFLINE_TABLE_NAME);
-  }
+    dropAllSegments(RAW_TABLE_NAME, TableType.OFFLINE);
 
-  @Test
-  public void testPinotSinkParallelWrite()
-      throws Exception {
-    addSchema(_schema);
-    addTableConfig(_tableConfig);
-
-    StreamExecutionEnvironment execEnv = StreamExecutionEnvironment.getExecutionEnvironment();
+    // Parallel write
+    execEnv = StreamExecutionEnvironment.getExecutionEnvironment();
     execEnv.setParallelism(2);
-    DataStream<Row> srcDs = execEnv.fromCollection(_data).returns(_typeInfo).keyBy(r -> r.getField(0));
+    srcDs = execEnv.fromCollection(_data).returns(_typeInfo).keyBy(r -> r.getField(0));
     srcDs.addSink(new PinotSinkFunction<>(new FlinkRowGenericRowConverter(_typeInfo), _tableConfig, _schema));
     execEnv.execute();
-    Assert.assertEquals(getNumSegments(), 2);
-    Assert.assertEquals(getTotalNumDocs(), 6);
-
-    deleteSchema(RAW_TABLE_NAME);
-    dropOfflineTable(OFFLINE_TABLE_NAME);
-  }
-
-  private int getNumSegments()
-      throws IOException {
-    String jsonOutputStr = sendGetRequest(
-        _controllerRequestURLBuilder.forSegmentListAPI(OFFLINE_TABLE_NAME, TableType.OFFLINE.toString()));
-    JsonNode array = JsonUtils.stringToJsonNode(jsonOutputStr);
-    return array.get(0).get("OFFLINE").size();
+    verifySegments(2, 6);
   }
 
-  private int getTotalNumDocs()
+  private void verifySegments(int numSegments, int numTotalDocs)
       throws IOException {
-    String jsonOutputStr = sendGetRequest(
-        _controllerRequestURLBuilder.forSegmentListAPI(OFFLINE_TABLE_NAME, TableType.OFFLINE.toString()));
-    JsonNode array = JsonUtils.stringToJsonNode(jsonOutputStr);
-    JsonNode segments = array.get(0).get("OFFLINE");
-    int totalDocCount = 0;
-    for (int i = 0; i < segments.size(); i++) {
+    JsonNode segments = JsonUtils.stringToJsonNode(sendGetRequest(
+            _controllerRequestURLBuilder.forSegmentListAPI(OFFLINE_TABLE_NAME, TableType.OFFLINE.toString()))).get(0)
+        .get("OFFLINE");
+    assertEquals(segments.size(), numSegments);
+    int actualNumTotalDocs = 0;
+    for (int i = 0; i < numSegments; i++) {
       String segmentName = segments.get(i).asText();
-      jsonOutputStr = sendGetRequest(
-          _controllerRequestURLBuilder.forSegmentMetadata(OFFLINE_TABLE_NAME, segmentName));
-      JsonNode metadata = JsonUtils.stringToJsonNode(jsonOutputStr);
-      totalDocCount += metadata.get("segment.total.docs").asInt();
+      actualNumTotalDocs += JsonUtils.stringToJsonNode(
+              sendGetRequest(_controllerRequestURLBuilder.forSegmentMetadata(OFFLINE_TABLE_NAME, segmentName)))
+          .get("segment.total.docs").asInt();
     }
-    return totalDocCount;
+    assertEquals(actualNumTotalDocs, numTotalDocs);
   }
 }
diff --git a/pinot-connectors/pinot-spark-connector/README.md b/pinot-connectors/pinot-spark-2-connector/README.md
similarity index 68%
rename from pinot-connectors/pinot-spark-connector/README.md
rename to pinot-connectors/pinot-spark-2-connector/README.md
index 771de871ae9..bbe02ab22a8 100644
--- a/pinot-connectors/pinot-spark-connector/README.md
+++ b/pinot-connectors/pinot-spark-2-connector/README.md
@@ -20,7 +20,7 @@
 -->
 # Spark-Pinot Connector
 
-Spark-pinot connector to read and write data from/to Pinot.
+Spark-pinot connector to read data from Pinot.
 
 Detailed read model documentation is here; [Spark-Pinot Connector Read Model](documentation/read_model.md)
 
@@ -28,12 +28,14 @@ Detailed read model documentation is here; [Spark-Pinot Connector Read Model](do
 ## Features
 - Query realtime, offline or hybrid tables
 - Distributed, parallel scan
+- Streaming reads using gRPC (optional)
 - SQL support instead of PQL
 - Column and filter push down to optimize performance
 - Overlap between realtime and offline segments is queried exactly once for hybrid tables
 - Schema discovery 
   - Dynamic inference
   - Static analysis of case class
+- Supports query options
 
 ## Quick Start
 ```scala
@@ -57,7 +59,23 @@ val data = spark.read
 data.show(100)
 ```
 
-For more examples, see `src/test/scala/example/ExampleSparkPinotConnectorTest.scala` 
+## Examples
+
+There are more examples included in `src/test/scala/.../ExampleSparkPinotConnectorTest.scala`.
+You can run the examples locally (e.g. using your IDE) in standalone mode by starting a local Pinot cluster. See: https://docs.pinot.apache.org/basics/getting-started/running-pinot-locally
+
+You can also run the tests in _cluster mode_ using following command:
+```shell
+export SPARK_CLUSTER=<YOUR_YARN_OR_SPARK_CLUSTER>
+
+# Edit the ExampleSparkPinotConnectorTest to get rid of `.master("local")` and rebuild the jar before running this command
+spark-submit \
+    --class org.apache.pinot.connector.spark.datasource.ExampleSparkPinotConnectorTest \
+    --jars ./target/pinot-spark-2-connector-0.13.0-SNAPSHOT-shaded.jar \
+    --master $SPARK_CLUSTER \
+    --deploy-mode cluster \
+  ./target/pinot-spark-2-connector-0.13.0-SNAPSHOT-tests.jar
+```
 
 Spark-Pinot connector uses Spark `DatasourceV2 API`. Please check the Databricks presentation for DatasourceV2 API;
 
diff --git a/pinot-connectors/pinot-spark-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg b/pinot-connectors/pinot-spark-2-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg
similarity index 100%
rename from pinot-connectors/pinot-spark-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg
rename to pinot-connectors/pinot-spark-2-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg
diff --git a/pinot-connectors/pinot-spark-connector/documentation/read_model.md b/pinot-connectors/pinot-spark-2-connector/documentation/read_model.md
similarity index 94%
rename from pinot-connectors/pinot-spark-connector/documentation/read_model.md
rename to pinot-connectors/pinot-spark-2-connector/documentation/read_model.md
index 547bd9eda37..675091871d1 100644
--- a/pinot-connectors/pinot-spark-connector/documentation/read_model.md
+++ b/pinot-connectors/pinot-spark-2-connector/documentation/read_model.md
@@ -74,7 +74,7 @@ If `segmentsPerSplit` is equal to 1, there will be created 6 Spark partition;
 
 If `segmentsPerSplit` value is too low, that means more parallelism. But this also mean that a lot of connection will be opened with Pinot servers, and will increase QPS on the Pinot servers. 
 
-If `segmetnsPerSplit` value is too high, that means less parallelism. Each Pinot server will scan more segments per request.  
+If `segmentsPerSplit` value is too high, that means less parallelism. Each Pinot server will scan more segments per request.  
 
 **Note:** Pinot servers prunes segments based on the segment metadata when query comes. In some cases(for example filtering based on the some columns), some servers may not return data. Therefore, some Spark partitions will be empty. In this cases, `repartition()` may be applied for efficient data analysis after loading data to Spark.
 
@@ -120,7 +120,7 @@ val df = spark.read
       .load()
       .filter($"DestStateName" === "Florida")
       .filter($"Origin" === "ORD")
-      .select($"Carrier")
+      .select($"DestStateName", $"Origin", $"Carrier")
 ```
 
 - Offline query: `select DestStateName, Origin, Carrier from airlineStats_OFFLINE where DestStateName = 'Florida and Origin = 'ORD' LIMIT {Int.MaxValue}`
@@ -137,6 +137,5 @@ val df = spark.read
 | usePushDownFilters | Push filters to pinot servers or not. If true, data exchange between pinot server and spark will be minimized. | No | true |
 | segmentsPerSplit | Represents the maximum segment count that will be scanned by pinot server in one connection | No | 3 | 
 | pinotServerTimeoutMs | The maximum timeout(ms) to get data from pinot server | No | 10 mins |
-
-
- 
\ No newline at end of file
+| useGrpcServer | Boolean value to enable reads via gRPC. This option is more memory efficient both on Pinot server and Spark executor side because it utilizes streaming. Requires gRPC to be enabled on Pinot server. | No | false |
+| queryOptions | Comma separated list of Pinot query options (e.g. "enableNullHandling=true,skipUpsert=true") | No | "" |
\ No newline at end of file
diff --git a/pinot-connectors/pinot-spark-2-connector/pom.xml b/pinot-connectors/pinot-spark-2-connector/pom.xml
new file mode 100644
index 00000000000..0275c98dee0
--- /dev/null
+++ b/pinot-connectors/pinot-spark-2-connector/pom.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>pinot-connectors</artifactId>
+    <groupId>org.apache.pinot</groupId>
+    <version>0.13.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>pinot-spark-2-connector</artifactId>
+  <name>Pinot Spark 2 Connector</name>
+  <url>https://pinot.apache.org/</url>
+  <properties>
+    <pinot.root>${basedir}/../..</pinot.root>
+    <spark.version>2.4.6</spark.version>
+    <paranamer.version>2.8</paranamer.version>
+    <scalaxml.version>1.3.0</scalaxml.version>
+    <scalatest.version>3.1.1</scalatest.version>
+    <shadeBase>org.apache.pinot.\$internal</shadeBase>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>scala-2.12</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <scala.version>2.12.11</scala.version>
+        <scala.compat.version>2.12</scala.compat.version>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.scala-lang.modules</groupId>
+          <artifactId>scala-xml_${scala.compat.version}</artifactId>
+          <version>${scalaxml.version}</version>
+          <exclusions>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-library</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>spark-sql_${scala.compat.version}</artifactId>
+          <version>${spark.version}</version>
+          <scope>provided</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.apache.curator</groupId>
+              <artifactId>curator-recipes</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>com.thoughtworks.paranamer</groupId>
+              <artifactId>paranamer</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang.modules</groupId>
+              <artifactId>scala-xml_${scala.compat.version}</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-library</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>com.zaxxer</groupId>
+              <artifactId>HikariCP-java7</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-library</artifactId>
+          <version>${scala.version}</version>
+          <scope>provided</scope>
+        </dependency>
+        <!-- tests -->
+        <dependency>
+          <groupId>org.scalatest</groupId>
+          <artifactId>scalatest_${scala.compat.version}</artifactId>
+          <version>${scalatest.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.scala-lang.modules</groupId>
+              <artifactId>scala-xml_${scala.compat.version}</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-library</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <!-- scala build -->
+          <plugin>
+            <artifactId>maven-shade-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>shade</goal>
+                </goals>
+                <configuration>
+                  <relocations>
+                    <relocation>
+                      <pattern>com</pattern>
+                      <shadedPattern>${shadeBase}.com</shadedPattern>
+                      <includes>
+                        <include>com.google.protobuf.**</include>
+                        <include>com.google.common.**</include>
+                      </includes>
+                    </relocation>
+                  </relocations>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>net.alchim31.maven</groupId>
+            <artifactId>scala-maven-plugin</artifactId>
+            <version>3.2.2</version>
+            <executions>
+              <execution>
+                <id>eclipse-add-source</id>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>scala-compile-first</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>scala-test-compile-first</id>
+                <phase>process-test-resources</phase>
+                <goals>
+                  <goal>testCompile</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>attach-scaladocs</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>doc-jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <scalaVersion>${scala.version}</scalaVersion>
+              <args>
+                <arg>-unchecked</arg>
+                <arg>-deprecation</arg>
+                <arg>-feature</arg>
+              </args>
+              <jvmArgs>
+                <jvmArg>-Xms1024m</jvmArg>
+                <jvmArg>-Xmx1024m</jvmArg>
+              </jvmArgs>
+              <javacArgs>
+                <javacArg>-source</javacArg>
+                <javacArg>${jdk.version}</javacArg>
+                <javacArg>-target</javacArg>
+                <javacArg>${jdk.version}</javacArg>
+                <javacArg>-Xlint:all,-serial,-path</javacArg>
+              </javacArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <build>
+        <plugins>
+          <plugin>
+            <!-- GPG signing. It's due to the fact that maven-source-plugin and scala-maven-plugin
+             have separate lifecycles, and the gpg files created by the former get deleted by the latter.
+             Thus, explicitly adding this plugin to a new profile to sign the files at the end all at once. -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <sourceDirectory>src/main/scala</sourceDirectory>
+    <testSourceDirectory>src/test/scala</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
+    <plugins>
+      <!-- disable surefire -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+      <!-- enable scalatest -->
+      <plugin>
+        <groupId>org.scalatest</groupId>
+        <artifactId>scalatest-maven-plugin</artifactId>
+        <version>1.0</version>
+        <configuration>
+          <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+          <junitxml>.</junitxml>
+          <parallel>false</parallel>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-spark-common</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pinot-connectors/pinot-spark-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/pinot-connectors/pinot-spark-2-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
similarity index 100%
rename from pinot-connectors/pinot-spark-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
rename to pinot-connectors/pinot-spark-2-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReader.scala b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReader.scala
similarity index 85%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReader.scala
rename to pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReader.scala
index f806a2b2685..d600764e7f7 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReader.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReader.scala
@@ -20,8 +20,10 @@ package org.apache.pinot.connector.spark.datasource
 
 import java.util.{List => JList}
 
-import org.apache.pinot.connector.spark.connector._
-import org.apache.pinot.connector.spark.connector.query.SQLSelectionQueryGenerator
+import org.apache.pinot.connector.spark.common.{InstanceInfo, PinotClusterClient, PinotDataSourceReadOptions}
+import org.apache.pinot.connector.spark.common.query.ScanQueryGenerator
+import org.apache.pinot.connector.spark.common.partition.PinotSplitter
+import org.apache.pinot.connector.spark.datasource.query.FilterPushDown
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.sources._
 import org.apache.spark.sql.sources.v2.DataSourceOptions
@@ -44,7 +46,7 @@ class PinotDataSourceReader(options: DataSourceOptions, userSchema: Option[Struc
   with SupportsPushDownFilters
   with SupportsPushDownRequiredColumns {
 
-  private val readParameters = PinotDataSourceReadOptions.from(options)
+  private val readParameters = PinotDataSourceReadOptions.from(options.asMap())
   private var acceptedFilters: Array[Filter] = Array.empty
   private var currentSchema: StructType = _
 
@@ -53,7 +55,7 @@ class PinotDataSourceReader(options: DataSourceOptions, userSchema: Option[Struc
       currentSchema = userSchema.getOrElse {
         val pinotTableSchema =
           PinotClusterClient.getTableSchema(readParameters.controller, readParameters.tableName)
-        PinotUtils.pinotSchemaToSparkSchema(pinotTableSchema)
+        TypeConverter.pinotSchemaToSparkSchema(pinotTableSchema)
       }
     }
     currentSchema
@@ -71,15 +73,16 @@ class PinotDataSourceReader(options: DataSourceOptions, userSchema: Option[Struc
       }
 
     val whereCondition = FilterPushDown.compileFiltersToSqlWhereClause(this.acceptedFilters)
-    val generatedSQLs = SQLSelectionQueryGenerator.generate(
+    val scanQuery = ScanQueryGenerator.generate(
       readParameters.tableName,
       readParameters.tableType,
       timeBoundaryInfo,
       schema.fieldNames,
-      whereCondition
+      whereCondition,
+      readParameters.queryOptions
     )
 
-    val routingTable = PinotClusterClient.getRoutingTable(readParameters.broker, generatedSQLs)
+    val routingTable = PinotClusterClient.getRoutingTable(readParameters.broker, scanQuery)
 
     val instanceInfo : Map[String, InstanceInfo] = Map()
     val instanceInfoReader = (instance:String) => { // cached reader to reduce network round trips
@@ -90,7 +93,7 @@ class PinotDataSourceReader(options: DataSourceOptions, userSchema: Option[Struc
     }
 
     PinotSplitter
-      .generatePinotSplits(generatedSQLs, routingTable, instanceInfoReader, readParameters)
+      .generatePinotSplits(scanQuery, routingTable, instanceInfoReader, readParameters)
       .zipWithIndex
       .map {
         case (pinotSplit, partitionId) =>
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceV2.scala b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceV2.scala
similarity index 100%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceV2.scala
rename to pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceV2.scala
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartition.scala b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartition.scala
similarity index 63%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartition.scala
rename to pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartition.scala
index d185f126e46..46909c1ecf3 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartition.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartition.scala
@@ -18,8 +18,10 @@
  */
 package org.apache.pinot.connector.spark.datasource
 
-import org.apache.pinot.connector.spark.connector.PinotSplit
-import org.apache.spark.internal.Logging
+import org.apache.pinot.common.datatable.DataTable
+import org.apache.pinot.connector.spark.common.PinotDataSourceReadOptions
+import org.apache.pinot.connector.spark.common.partition.PinotSplit
+import org.apache.pinot.connector.spark.common.reader.PinotAbstractPartitionReader
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.sources.v2.reader.{InputPartition, InputPartitionReader}
 import org.apache.spark.sql.types.StructType
@@ -29,10 +31,14 @@ class PinotInputPartition(
     partitionId: Int,
     pinotSplit: PinotSplit,
     dataSourceOptions: PinotDataSourceReadOptions)
-  extends InputPartition[InternalRow]
-  with Logging {
+  extends InputPartition[InternalRow] {
 
   override def createPartitionReader(): InputPartitionReader[InternalRow] = {
-    new PinotInputPartitionReader(schema, partitionId, pinotSplit, dataSourceOptions)
+    new InputPartitionReader[InternalRow] with PinotAbstractPartitionReader[InternalRow]  {
+      override def _partitionId: Int = partitionId
+      override def _pinotSplit: PinotSplit = pinotSplit
+      override def _dataSourceOptions: PinotDataSourceReadOptions = dataSourceOptions
+      override def _translator: DataTable => Seq[InternalRow] = TypeConverter.pinotDataTableToInternalRows(_, schema)
+    }
   }
 }
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotUtils.scala b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/TypeConverter.scala
similarity index 88%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotUtils.scala
rename to pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/TypeConverter.scala
index b7a61803c58..eef46d255d8 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotUtils.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/TypeConverter.scala
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.datasource
 
 import org.apache.pinot.common.datatable.DataTable
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType
-import org.apache.pinot.connector.spark.exceptions.PinotException
+import org.apache.pinot.connector.spark.common.PinotException
 import org.apache.pinot.spi.data.{FieldSpec, Schema}
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.util.ArrayData
@@ -32,7 +32,7 @@ import scala.collection.JavaConverters._
 /**
  * Helper methods for spark-pinot conversions
  */
-private[pinot] object PinotUtils {
+private[datasource] object TypeConverter {
 
   /** Convert a Pinot schema to Spark schema. */
   def pinotSchemaToSparkSchema(schema: Schema): StructType = {
@@ -66,6 +66,9 @@ private[pinot] object PinotUtils {
       dataTable: DataTable,
       sparkSchema: StructType): Seq[InternalRow] = {
     val dataTableColumnNames = dataTable.getDataSchema.getColumnNames
+    val nullRowIdsByColumn = (0 until dataTable.getDataSchema.size()).map{ col =>
+      dataTable.getNullRowIds(col)
+    }
     (0 until dataTable.getNumberOfRows).map { rowIndex =>
       // spark schema is used to ensure columns order
       val columns = sparkSchema.fields.map { field =>
@@ -73,10 +76,13 @@ private[pinot] object PinotUtils {
         if (colIndex < 0) {
           throw PinotException(s"'${field.name}' not found in Pinot server response")
         } else {
-          // pinot column data type can be used directly,
-          // because all of them is supported in spark schema
-          val columnDataType = dataTable.getDataSchema.getColumnDataType(colIndex)
-          readPinotColumnData(dataTable, columnDataType, rowIndex, colIndex)
+          if (nullRowIdsByColumn(colIndex) != null
+              && nullRowIdsByColumn(colIndex).contains(rowIndex)) {
+            null
+          } else {
+            val columnDataType = dataTable.getDataSchema.getColumnDataType(colIndex)
+            readPinotColumnData(dataTable, columnDataType, rowIndex, colIndex)
+          }
         }
       }
       InternalRow.fromSeq(columns)
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/FilterPushDown.scala b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/query/FilterPushDown.scala
similarity index 72%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/FilterPushDown.scala
rename to pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/query/FilterPushDown.scala
index 9d1290af8a1..331594663ad 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/FilterPushDown.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/query/FilterPushDown.scala
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.datasource.query
 
 import java.sql.{Date, Timestamp}
 
@@ -81,25 +81,29 @@ private[pinot] object FilterPushDown {
     case _ => value
   }
 
+  private def escapeAttr(attr: String): String = {
+    if (attr.contains("\"")) attr else s""""$attr""""
+  }
+
   private def compileFilter(filter: Filter): Option[String] = {
     val whereCondition = filter match {
-      case EqualTo(attr, value) => s"$attr = ${compileValue(value)}"
+      case EqualTo(attr, value) => s"${escapeAttr(attr)} = ${compileValue(value)}"
       case EqualNullSafe(attr, value) =>
-        s"NOT ($attr != ${compileValue(value)} OR $attr IS NULL OR " +
+        s"NOT (${escapeAttr(attr)} != ${compileValue(value)} OR ${escapeAttr(attr)} IS NULL OR " +
           s"${compileValue(value)} IS NULL) OR " +
-          s"($attr IS NULL AND ${compileValue(value)} IS NULL)"
-      case LessThan(attr, value) => s"$attr < ${compileValue(value)}"
-      case GreaterThan(attr, value) => s"$attr > ${compileValue(value)}"
-      case LessThanOrEqual(attr, value) => s"$attr <= ${compileValue(value)}"
-      case GreaterThanOrEqual(attr, value) => s"$attr >= ${compileValue(value)}"
-      case IsNull(attr) => s"$attr IS NULL"
-      case IsNotNull(attr) => s"$attr IS NOT NULL"
-      case StringStartsWith(attr, value) => s"$attr LIKE '$value%'"
-      case StringEndsWith(attr, value) => s"$attr LIKE '%$value'"
-      case StringContains(attr, value) => s"$attr LIKE '%$value%'"
+          s"(${escapeAttr(attr)} IS NULL AND ${compileValue(value)} IS NULL)"
+      case LessThan(attr, value) => s"${escapeAttr(attr)} < ${compileValue(value)}"
+      case GreaterThan(attr, value) => s"${escapeAttr(attr)} > ${compileValue(value)}"
+      case LessThanOrEqual(attr, value) => s"${escapeAttr(attr)} <= ${compileValue(value)}"
+      case GreaterThanOrEqual(attr, value) => s"${escapeAttr(attr)} >= ${compileValue(value)}"
+      case IsNull(attr) => s"${escapeAttr(attr)} IS NULL"
+      case IsNotNull(attr) => s"${escapeAttr(attr)} IS NOT NULL"
+      case StringStartsWith(attr, value) => s"${escapeAttr(attr)} LIKE '$value%'"
+      case StringEndsWith(attr, value) => s"${escapeAttr(attr)} LIKE '%$value'"
+      case StringContains(attr, value) => s"${escapeAttr(attr)} LIKE '%$value%'"
       case In(attr, value) if value.isEmpty =>
-        s"CASE WHEN $attr IS NULL THEN NULL ELSE FALSE END"
-      case In(attr, value) => s"$attr IN (${compileValue(value)})"
+        s"CASE WHEN ${escapeAttr(attr)} IS NULL THEN NULL ELSE FALSE END"
+      case In(attr, value) => s"${escapeAttr(attr)} IN (${compileValue(value)})"
       case Not(f) => compileFilter(f).map(p => s"NOT ($p)").orNull
       case Or(f1, f2) =>
         val or = Seq(f1, f2).flatMap(compileFilter)
diff --git a/pinot-connectors/pinot-spark-connector/src/test/resources/schema/pinot-schema.json b/pinot-connectors/pinot-spark-2-connector/src/test/resources/schema/pinot-schema.json
similarity index 100%
rename from pinot-connectors/pinot-spark-connector/src/test/resources/schema/pinot-schema.json
rename to pinot-connectors/pinot-spark-2-connector/src/test/resources/schema/pinot-schema.json
diff --git a/pinot-connectors/pinot-spark-connector/src/test/resources/schema/spark-schema.json b/pinot-connectors/pinot-spark-2-connector/src/test/resources/schema/spark-schema.json
similarity index 100%
rename from pinot-connectors/pinot-spark-connector/src/test/resources/schema/spark-schema.json
rename to pinot-connectors/pinot-spark-2-connector/src/test/resources/schema/spark-schema.json
diff --git a/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/BaseTest.scala b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/BaseTest.scala
new file mode 100644
index 00000000000..0754dcef2b3
--- /dev/null
+++ b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/BaseTest.scala
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.connector.spark.datasource
+
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
+
+trait BaseTest extends AnyFunSuite with Matchers
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/ExampleSparkPinotConnectorTest.scala b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/ExampleSparkPinotConnectorTest.scala
similarity index 98%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/ExampleSparkPinotConnectorTest.scala
rename to pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/ExampleSparkPinotConnectorTest.scala
index f05266990e2..b293cd12fa5 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/ExampleSparkPinotConnectorTest.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/ExampleSparkPinotConnectorTest.scala
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark
+package org.apache.pinot.connector.spark.datasource
 
-import org.apache.pinot.connector.spark.utils.Logging
+import org.apache.pinot.connector.spark.common.Logging
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.types.{DataTypes, StructField, StructType}
 
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/PinotUtilsTest.scala b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/TypeConverterTest.scala
similarity index 80%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/PinotUtilsTest.scala
rename to pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/TypeConverterTest.scala
index 673e7c982e8..1b04b322d5c 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/PinotUtilsTest.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/TypeConverterTest.scala
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.datasource
 
+import org.apache.pinot.common.datatable.DataTableFactory
 import org.apache.pinot.common.utils.DataSchema
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType
-import org.apache.pinot.connector.spark.BaseTest
-import org.apache.pinot.connector.spark.connector.PinotUtils._
-import org.apache.pinot.connector.spark.exceptions.PinotException
+import org.apache.pinot.connector.spark.common.PinotException
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory
 import org.apache.pinot.spi.data.Schema
 import org.apache.pinot.spi.utils.ByteArray
 import org.apache.spark.sql.catalyst.util.ArrayData
 import org.apache.spark.sql.types._
 import org.apache.spark.unsafe.types.UTF8String
+import org.roaringbitmap.RoaringBitmap
 
 import scala.io.Source
 
 /**
  * Test pinot/spark conversions like schema, data table etc.
  */
-class PinotUtilsTest extends BaseTest {
+class TypeConverterTest extends BaseTest {
 
   test("Pinot DataTable should be converted to Spark InternalRows") {
     val columnNames = Array(
@@ -115,7 +115,7 @@ class PinotUtilsTest extends BaseTest {
       )
     )
 
-    val result = pinotDataTableToInternalRows(dataTable, schema).head
+    val result = TypeConverter.pinotDataTableToInternalRows(dataTable, schema).head
     result.getArray(0) shouldEqual ArrayData.toArrayData(Seq(1, 2, 0))
     result.getInt(1) shouldEqual 5
     result.getArray(2) shouldEqual ArrayData.toArrayData(Seq(0d, 10.3d))
@@ -156,15 +156,44 @@ class PinotUtilsTest extends BaseTest {
     )
 
     val exception = intercept[PinotException] {
-      pinotDataTableToInternalRows(dataTable, schema)
+      TypeConverter.pinotDataTableToInternalRows(dataTable, schema)
     }
 
     exception.getMessage shouldEqual s"'longCol' not found in Pinot server response"
   }
 
+  test("Converter should identify and correctly return null columns") {
+    val columnNames = Array("strCol", "intCol")
+    val columnTypes = Array(ColumnDataType.STRING, ColumnDataType.INT)
+    val dataSchema = new DataSchema(columnNames, columnTypes)
+    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4)
+
+    val dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema)
+    dataTableBuilder.startRow()
+    dataTableBuilder.setColumn(0, "null")
+    dataTableBuilder.setColumn(1, 5)
+    dataTableBuilder.finishRow()
+
+    val nullRowIds = new RoaringBitmap()
+    nullRowIds.add(0)
+    dataTableBuilder.setNullRowIds(nullRowIds)
+    dataTableBuilder.setNullRowIds(null)
+    val dataTable = dataTableBuilder.build()
+
+    val schema = StructType(
+      Seq(
+        StructField("strCol", StringType, true),
+        StructField("intCol", IntegerType, true)
+      )
+    )
+
+    val result = TypeConverter.pinotDataTableToInternalRows(dataTable, schema).head
+    result.get(0, StringType) shouldEqual null
+  }
+
   test("Pinot schema should be converted to spark schema") {
     val pinotSchemaAsString = Source.fromResource("schema/pinot-schema.json").mkString
-    val resultSchema = pinotSchemaToSparkSchema(Schema.fromString(pinotSchemaAsString))
+    val resultSchema = TypeConverter.pinotSchemaToSparkSchema(Schema.fromString(pinotSchemaAsString))
     val sparkSchemaAsString = Source.fromResource("schema/spark-schema.json").mkString
     val sparkSchema = DataType.fromJson(sparkSchemaAsString).asInstanceOf[StructType]
     resultSchema.fields should contain theSameElementsAs sparkSchema.fields
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/FilterPushDownTest.scala b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/query/FilterPushDownTest.scala
similarity index 65%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/FilterPushDownTest.scala
rename to pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/query/FilterPushDownTest.scala
index 27d5008e639..eeb961ef25d 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/FilterPushDownTest.scala
+++ b/pinot-connectors/pinot-spark-2-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/query/FilterPushDownTest.scala
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.datasource.query
 
 import java.sql.{Date, Timestamp}
 
-import org.apache.pinot.connector.spark.BaseTest
+import org.apache.pinot.connector.spark.datasource.BaseTest
 import org.apache.spark.sql.sources._
 
 /**
@@ -61,15 +61,22 @@ class FilterPushDownTest extends BaseTest {
   test("SQL query should be created from spark filters") {
     val whereClause = FilterPushDown.compileFiltersToSqlWhereClause(filters)
     val expectedOutput =
-      s"(attr1 = 1) AND (attr2 IN ('1', '2', '''5''')) AND (attr3 < 1) AND (attr4 <= 3) AND (attr5 > 10) AND " +
-        s"(attr6 >= 15) AND (NOT (attr7 = '1')) AND ((attr8 < 10) AND (attr9 <= 3)) AND " +
-        s"((attr10 = 'hello') OR (attr11 >= 13)) AND (attr12 LIKE '%pinot%') AND (attr13 IN (10, 20)) AND " +
-        s"(NOT (attr20 != '123' OR attr20 IS NULL OR '123' IS NULL) OR (attr20 IS NULL AND '123' IS NULL)) AND " +
-        s"(attr14 IS NULL) AND (attr15 IS NOT NULL) AND (attr16 LIKE 'pinot1%') AND (attr17 LIKE '%pinot2') AND " +
-        s"(attr18 = '2020-01-01 00:00:15.0') AND (attr19 < '2020-01-01') AND (attr21 = List(1, 2)) AND " +
-        s"(attr22 = 10.5)"
+      s"""("attr1" = 1) AND ("attr2" IN ('1', '2', '''5''')) AND ("attr3" < 1) AND ("attr4" <= 3) AND ("attr5" > 10) AND """ +
+        s"""("attr6" >= 15) AND (NOT ("attr7" = '1')) AND (("attr8" < 10) AND ("attr9" <= 3)) AND """ +
+        s"""(("attr10" = 'hello') OR ("attr11" >= 13)) AND ("attr12" LIKE '%pinot%') AND ("attr13" IN (10, 20)) AND """ +
+        s"""(NOT ("attr20" != '123' OR "attr20" IS NULL OR '123' IS NULL) OR ("attr20" IS NULL AND '123' IS NULL)) AND """ +
+        s"""("attr14" IS NULL) AND ("attr15" IS NOT NULL) AND ("attr16" LIKE 'pinot1%') AND ("attr17" LIKE '%pinot2') AND """ +
+        s"""("attr18" = '2020-01-01 00:00:15.0') AND ("attr19" < '2020-01-01') AND ("attr21" = List(1, 2)) AND """ +
+        s"""("attr22" = 10.5)"""
 
     whereClause.get shouldEqual expectedOutput
   }
 
+  test("Shouldn't escape column names which are already escaped") {
+    val whereClause = FilterPushDown.compileFiltersToSqlWhereClause(
+      Array(EqualTo("\"some\".\"nested\".\"column\"", 1)))
+    val expectedOutput = "(\"some\".\"nested\".\"column\" = 1)"
+
+    whereClause.get shouldEqual expectedOutput
+  }
 }
diff --git a/pinot-connectors/pinot-spark-3-connector/README.md b/pinot-connectors/pinot-spark-3-connector/README.md
new file mode 100644
index 00000000000..9883c902596
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/README.md
@@ -0,0 +1,86 @@
+<!--
+
+    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.
+
+-->
+# Spark-Pinot Connector
+
+Spark-pinot connector to read data from Pinot.
+
+Detailed read model documentation is here; [Spark-Pinot Connector Read Model](documentation/read_model.md)
+
+
+## Features
+- Query realtime, offline or hybrid tables
+- Distributed, parallel scan
+- Streaming reads using gRPC (optional)
+- SQL support instead of PQL
+- Column and filter push down to optimize performance
+- Overlap between realtime and offline segments is queried exactly once for hybrid tables
+- Schema discovery 
+  - Dynamic inference
+  - Static analysis of case class
+- Supports query options
+
+## Quick Start
+```scala
+import org.apache.spark.sql.SparkSession
+
+val spark: SparkSession = SparkSession
+      .builder()
+      .appName("spark-pinot-connector-test")
+      .master("local")
+      .getOrCreate()
+
+import spark.implicits._
+
+val data = spark.read
+  .format("pinot")
+  .option("table", "airlineStats")
+  .option("tableType", "offline")
+  .load()
+  .filter($"DestStateName" === "Florida")
+
+data.show(100)
+```
+
+## Examples
+
+There are more examples included in `src/test/scala/.../ExampleSparkPinotConnectorTest.scala`.
+You can run the examples locally (e.g. using your IDE) in standalone mode by starting a local Pinot cluster. See: https://docs.pinot.apache.org/basics/getting-started/running-pinot-locally
+
+You can also run the tests in _cluster mode_ using following command:
+```shell
+export SPARK_CLUSTER=<YOUR_YARN_OR_SPARK_CLUSTER>
+
+# Edit the ExampleSparkPinotConnectorTest to get rid of `.master("local")` and rebuild the jar before running this command
+spark-submit \
+    --class org.apache.pinot.connector.spark.v3.datasource.ExampleSparkPinotConnectorTest \
+    --jars ./target/pinot-spark-3-connector-0.13.0-SNAPSHOT-shaded.jar \
+    --master $SPARK_CLUSTER \
+    --deploy-mode cluster \
+  ./target/pinot-spark-3-connector-0.13.0-SNAPSHOT-tests.jar
+```
+
+Spark-Pinot connector uses Spark `DatasourceV2 API`. Please check the Databricks presentation for DatasourceV2 API;
+
+https://www.slideshare.net/databricks/apache-spark-data-source-v2-with-wenchen-fan-and-gengliang-wang
+
+## Future Works
+- Add integration tests for read operation
+- Add write support(pinot segment write logic will be changed in later versions of pinot)
diff --git a/pinot-connectors/pinot-spark-3-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg b/pinot-connectors/pinot-spark-3-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg
new file mode 100644
index 00000000000..dc3b88ae68f
Binary files /dev/null and b/pinot-connectors/pinot-spark-3-connector/documentation/images/spark-pinot-connector-executor-server-interaction.jpg differ
diff --git a/pinot-connectors/pinot-spark-3-connector/documentation/read_model.md b/pinot-connectors/pinot-spark-3-connector/documentation/read_model.md
new file mode 100644
index 00000000000..c6fc1b085f8
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/documentation/read_model.md
@@ -0,0 +1,141 @@
+<!--
+
+    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.
+
+-->
+# Read Model
+
+Connector can scan offline, hybrid and realtime tables. Base two options <`table` and `tableType`> parameters have to given like below;
+- For offline table: `table: tbl`, `tableType: OFFLINE or offline`
+- For realtime table `table: tbl`, `tableType: REALTIME or realtime`
+- For hybrid table `table: tbl`, `tableType: HYBRID or hybrid`
+
+An example scan;
+
+```scala
+val df = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "offline")
+      .load()
+```
+
+Custom schema can be specified directly. If schema is not specified, connector read table schema from Pinot controller, and then convert to the Spark schema. 
+
+### Architecture
+
+Connector reads data from `Pinot Servers` directly. For this operation, firstly, connector creates query with given filters(if filter push down is enabled) and columns, then finds routing table for created query. It creates pinot splits that contains **ONE PINOT SERVER and ONE OR MORE SEGMENT per spark partition**, based on the routing table and `segmentsPerSplit`(detailed explain is defined below). Lastly, each partition read data from specified pinot server in parallel.
+
+![Spark-Pinot Connector Architecture](images/spark-pinot-connector-executor-server-interaction.jpg)
+
+Each Spark partition open connection with Pinot server, and read data. For example, assume that routing table informations for specified query is like that:
+
+```
+- realtime ->
+   - realtimeServer1 -> (segment1, segment2, segment3)
+   - realtimeServer2 -> (segment4)
+- offline ->
+   - offlineServer10 -> (segment10, segment20)
+```
+
+If `segmentsPerSplit` is equal to 3, there will be created 3 Spark partition like below;
+
+| Spark Partition  | Queried Pinot Server/Segments |
+| ------------- | ------------- |
+| partition1  | realtimeServer1 / segment1, segment2, segment3  |
+| partition2  | realtimeServer2 / segment4  |
+| partition3  | offlineServer10 / segment10, segment20 |
+
+If `segmentsPerSplit` is equal to 1, there will be created 6 Spark partition;
+
+| Spark Partition  | Queried Pinot Server/Segments |
+| ------------- | ------------- |
+| partition1  | realtimeServer1 / segment1 |
+| partition2  | realtimeServer1 / segment2  |
+| partition3  | realtimeServer1 / segment3 |
+| partition4  | realtimeServer2 / segment4 |
+| partition5  | offlineServer10 / segment10 |
+| partition6  | offlineServer10 / segment20 |
+
+If `segmentsPerSplit` value is too low, that means more parallelism. But this also mean that a lot of connection will be opened with Pinot servers, and will increase QPS on the Pinot servers. 
+
+If `segmentsPerSplit` value is too high, that means less parallelism. Each Pinot server will scan more segments per request.  
+
+**Note:** Pinot servers prunes segments based on the segment metadata when query comes. In some cases(for example filtering based on the some columns), some servers may not return data. Therefore, some Spark partitions will be empty. In this cases, `repartition()` may be applied for efficient data analysis after loading data to Spark.
+
+### Filter And Column Push Down
+Connector supports filter and column push down. Filters and columns are pushed to the pinot servers. Filter and column push down improves the performance while reading data because of its minimizing data transfer between Pinot and Spark. In default, filter push down enabled. If filters are desired to be applied in Spark, `usePushDownFilters` should be set as `false`.
+
+Connector uses SQL, as a result all sql filters are supported. 
+
+### Segment Pruning
+
+Connector receives routing table of given query to get information on which Pinot servers to will be queried and which segments will be scan. If partitioning is enabled for given Pinot table, and created query in Spark will be scan the specific partitions, only required Pinot server and segment informations will be got(that means segment pruning operation will be applied before data reading like Pinot brokers). For more information; [Optimizing Scatter and Gather in Pinot](https://docs.pinot.apache.org/operators/operating-pinot/tuning/routing#optimizing-scatter-and-gather)
+
+### Table Querying
+Connector uses SQL to query Pinot tables.
+
+Connector creates realtime and offline queries based on the filters and required columns. 
+- If queried table type is `OFFLINE` or `REALTIME`, routing table information will be got for specific table type. 
+- If queried table type is `HYBRID`, realtime and offline routing table information will be got. Also, connector receives `TimeBoundary` information for given table, and use it in query to ensure that the overlap between realtime and offline segment data is queried exactly once. For more information; [Pinot Broker](https://docs.pinot.apache.org/basics/components/broker)
+
+### Query Generation
+
+Example generated queries for given usages(assume that `airlineStats` table is hybrid and TimeBoundary information is `DaysSinceEpoch, 16084`); 
+
+```scala
+val df = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "hybrid")
+      .load()
+```
+
+For above usage, realtime and offline SQL queries will be created;
+
+- Offline query: `select * from airlineStats_OFFLINE where DaysSinceEpoch < 16084 LIMIT {Int.MaxValue}`
+
+- Realtime query: `select * from airlineStats_REALTIME where DaysSinceEpoch >= 16084 LIMIT {Int.MaxValue}`
+
+```scala
+val df = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "offline")
+      .load()
+      .filter($"DestStateName" === "Florida")
+      .filter($"Origin" === "ORD")
+      .select($"DestStateName", $"Origin", $"Carrier")
+```
+
+- Offline query: `select DestStateName, Origin, Carrier from airlineStats_OFFLINE where DestStateName = 'Florida and Origin = 'ORD' LIMIT {Int.MaxValue}`
+
+**Note: Limit is added to every query. Because, generated queries will be converted to the Pinot `BrokerRequest` class. In this operation, pinot sets limit to `10` automatically. Therefore, `LIMIT` was set to `Int.MaxValue` to prevent this issue.**
+
+### Connector Read Parameters
+| Configuration  | Description | Required | Default Value |
+| ------------- | ------------- | ------------- | ------------- |
+| table | Pinot table name without table type | Yes | - |
+| tableType | Pinot table type(`realtime`, `offline` or `hybrid`) | Yes | - |
+| controller | Pinot controller url and port. Input should be `url:port` format without schema. Connector does not support `https` schema for now. | No | localhost:9000 |
+| broker | Pinot broker url and port. Input should be `url:port` format without schema. If not specified, connector will find broker instances of table automatically. Connector does not support `https` schema for now | No | Fetch broker instances of table from Pinot Controller | 
+| usePushDownFilters | Push filters to pinot servers or not. If true, data exchange between pinot server and spark will be minimized. | No | true |
+| segmentsPerSplit | Represents the maximum segment count that will be scanned by pinot server in one connection | No | 3 | 
+| pinotServerTimeoutMs | The maximum timeout(ms) to get data from pinot server | No | 10 mins |
+| useGrpcServer | Boolean value to enable reads via gRPC. This option is more memory efficient both on Pinot server and Spark executor side because it utilizes streaming. Requires gRPC to be enabled on Pinot server. | No | false |
+| queryOptions | Comma separated list of Pinot query options (e.g. "enableNullHandling=true,skipUpsert=true") | No | "" |
diff --git a/pinot-connectors/pinot-spark-3-connector/pom.xml b/pinot-connectors/pinot-spark-3-connector/pom.xml
new file mode 100644
index 00000000000..7178465aee6
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/pom.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>pinot-connectors</artifactId>
+    <groupId>org.apache.pinot</groupId>
+    <version>0.13.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>pinot-spark-3-connector</artifactId>
+  <name>Pinot Spark 3 Connector</name>
+  <url>https://pinot.apache.org/</url>
+  <properties>
+    <pinot.root>${basedir}/../..</pinot.root>
+    <spark.version>3.4.0</spark.version>
+    <antlr-runtime.version>4.8</antlr-runtime.version>
+    <scalatest.version>3.1.1</scalatest.version>
+    <shadeBase>org.apache.pinot.\$internal</shadeBase>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>scala-2.12</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <scala.version>2.12.11</scala.version>
+        <scala.compat.version>2.12</scala.compat.version>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>spark-sql_${scala.compat.version}</artifactId>
+          <version>${spark.version}</version>
+          <scope>provided</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.antlr</groupId>
+              <artifactId>antlr4-runtime</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.apache.curator</groupId>
+              <artifactId>curator-recipes</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>com.thoughtworks.paranamer</groupId>
+              <artifactId>paranamer</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang.modules</groupId>
+              <artifactId>scala-xml_${scala.compat.version}</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-library</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>com.zaxxer</groupId>
+              <artifactId>HikariCP-java7</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+
+        <dependency>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-library</artifactId>
+          <version>${scala.version}</version>
+          <scope>provided</scope>
+        </dependency>
+        <!-- tests -->
+        <dependency>
+          <groupId>org.scalatest</groupId>
+          <artifactId>scalatest_${scala.compat.version}</artifactId>
+          <version>${scalatest.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.scala-lang.modules</groupId>
+              <artifactId>scala-xml_${scala.compat.version}</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-library</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-reflect</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <!-- scala build -->
+          <plugin>
+            <artifactId>maven-shade-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>shade</goal>
+                </goals>
+                <configuration>
+                  <relocations>
+                    <relocation>
+                      <pattern>com</pattern>
+                      <shadedPattern>${shadeBase}.com</shadedPattern>
+                      <includes>
+                        <include>com.google.protobuf.**</include>
+                        <include>com.google.common.**</include>
+                      </includes>
+                    </relocation>
+                  </relocations>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>net.alchim31.maven</groupId>
+            <artifactId>scala-maven-plugin</artifactId>
+            <version>3.2.2</version>
+            <executions>
+              <execution>
+                <id>eclipse-add-source</id>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>scala-compile-first</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>scala-test-compile-first</id>
+                <phase>process-test-resources</phase>
+                <goals>
+                  <goal>testCompile</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>attach-scaladocs</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>doc-jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <scalaVersion>${scala.version}</scalaVersion>
+              <args>
+                <arg>-unchecked</arg>
+                <arg>-deprecation</arg>
+                <arg>-feature</arg>
+              </args>
+              <jvmArgs>
+                <jvmArg>-Xms1024m</jvmArg>
+                <jvmArg>-Xmx1024m</jvmArg>
+              </jvmArgs>
+              <javacArgs>
+                <javacArg>-source</javacArg>
+                <javacArg>${jdk.version}</javacArg>
+                <javacArg>-target</javacArg>
+                <javacArg>${jdk.version}</javacArg>
+                <javacArg>-Xlint:all,-serial,-path</javacArg>
+              </javacArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <build>
+        <plugins>
+          <plugin>
+            <!-- GPG signing. It's due to the fact that maven-source-plugin and scala-maven-plugin
+             have separate lifecycles, and the gpg files created by the former get deleted by the latter.
+             Thus, explicitly adding this plugin to a new profile to sign the files at the end all at once. -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <sourceDirectory>src/main/scala</sourceDirectory>
+    <testSourceDirectory>src/test/scala</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
+    <plugins>
+      <!-- disable surefire -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+      <!-- enable scalatest -->
+      <plugin>
+        <groupId>org.scalatest</groupId>
+        <artifactId>scalatest-maven-plugin</artifactId>
+        <version>1.0</version>
+        <configuration>
+          <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+          <junitxml>.</junitxml>
+          <parallel>false</parallel>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-spark-common</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-core</artifactId>
+      <version>${project.parent.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <scope>provided</scope>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>${antlr-runtime.version}</version>
+    </dependency>
+    <dependency>
+      <scope>test</scope>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/pinot-connectors/pinot-spark-3-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
new file mode 100644
index 00000000000..6bf835b475e
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
@@ -0,0 +1 @@
+org.apache.pinot.connector.spark.v3.datasource.PinotDataSource
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotDataSource.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotDataSource.scala
new file mode 100644
index 00000000000..a551218cbbc
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotDataSource.scala
@@ -0,0 +1,55 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.{PinotClusterClient, PinotDataSourceReadOptions}
+import org.apache.spark.sql.connector.catalog.{Table, TableProvider}
+import org.apache.spark.sql.connector.expressions.Transform
+import org.apache.spark.sql.sources.DataSourceRegister
+import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.util.CaseInsensitiveStringMap
+
+import java.util
+
+/**
+ * PinotDataSource implements TableProvider interface of Spark DataSourceV2 API
+ * to provide read access to Pinot tables.
+ */
+class PinotDataSource extends TableProvider with DataSourceRegister {
+  override def shortName(): String = "pinot"
+
+  override def inferSchema(options: CaseInsensitiveStringMap): StructType = {
+    val readParameters = PinotDataSourceReadOptions.from(options)
+    val tableName = readParameters.tableName
+    val controller = readParameters.controller
+
+    val pinotTableSchema =
+      PinotClusterClient.getTableSchema(controller, tableName)
+    TypeConverter.pinotSchemaToSparkSchema(pinotTableSchema)
+  }
+
+  override def getTable(schema: StructType,
+                        partitioning: Array[Transform],
+                        properties: util.Map[String, String]): Table = {
+    val tableName = properties.get(PinotDataSourceReadOptions.CONFIG_TABLE_NAME)
+    new PinotTable(tableName, schema)
+  }
+
+  override def supportsExternalMetadata(): Boolean = true
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotInputPartition.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotInputPartition.scala
new file mode 100644
index 00000000000..b9b4596c3e1
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotInputPartition.scala
@@ -0,0 +1,42 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.PinotDataSourceReadOptions
+import org.apache.pinot.connector.spark.common.partition.PinotSplit
+import org.apache.spark.sql.connector.read.InputPartition
+import org.apache.spark.sql.types.StructType
+
+/**
+ * PinotInputPartition: Implements Spark's InputPartition which convey partition related information
+ * from Spark master to executors. This class is serialized and sent across the network so it should
+ * be kept lean for good performance.
+ *
+ * @param schema        Schema for the scan/read operation. This can be a subset of the tables schema
+ * @param partitionId   Integer which is used as requestId when sending query to Pinot servers
+ * @param pinotSplit    An instance of PinotSplit which encapsulates segment and query information
+ * @param dataSourceOptions PinotDataSourceReadOptions instance created for the read
+ */
+case class PinotInputPartition(
+    schema: StructType,
+    partitionId: Int,
+    pinotSplit: PinotSplit,
+    dataSourceOptions: PinotDataSourceReadOptions)
+  extends InputPartition {
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScan.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScan.scala
new file mode 100644
index 00000000000..a50967fe5e5
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScan.scala
@@ -0,0 +1,97 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.common.datatable.DataTable
+import org.apache.pinot.connector.spark.common.partition.{PinotSplit, PinotSplitter}
+import org.apache.pinot.connector.spark.common.query.ScanQuery
+import org.apache.pinot.connector.spark.common.reader.PinotAbstractPartitionReader
+import org.apache.pinot.connector.spark.common.{InstanceInfo, PinotClusterClient, PinotDataSourceReadOptions}
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.connector.read.{
+  Batch,
+  InputPartition,
+  PartitionReader,
+  PartitionReaderFactory,
+  Scan
+}
+import org.apache.spark.sql.types.StructType
+
+import scala.collection.mutable.Map
+
+/**
+ * PinotScan implements Spark's 'Scan', which is a logical representation of a scan operation,
+ * and also adds the 'Batch' mixin to support batch reads.
+ *
+ * @param query   An instance of ScanQuery which encapsulates SQL queries to be executed
+ * @param schema
+ * @param readParameters
+ */
+class PinotScan(
+    query: ScanQuery,
+    schema: StructType,
+    readParameters: PinotDataSourceReadOptions)
+  extends Scan with Batch {
+
+  override def readSchema(): StructType = schema
+
+  override def toBatch: Batch = this
+
+  override def planInputPartitions(): Array[InputPartition] = {
+    val routingTable = PinotClusterClient.getRoutingTable(readParameters.broker, query)
+
+    val instanceInfo : Map[String, InstanceInfo] = Map()
+    val instanceInfoReader = (instance:String) => { // cached reader to reduce network round trips
+      instanceInfo.getOrElseUpdate(
+        instance,
+        PinotClusterClient.getInstanceInfo(readParameters.controller, instance)
+      )
+    }
+
+    PinotSplitter
+      .generatePinotSplits(query, routingTable, instanceInfoReader, readParameters)
+      .zipWithIndex
+      .map {
+        case (pinotSplit, partitionId) =>
+          PinotInputPartition(readSchema(), partitionId, pinotSplit, readParameters)
+            .asInstanceOf[InputPartition]
+      }
+      .toArray
+  }
+
+  override def createReaderFactory(): PartitionReaderFactory = {
+    // necessary to make PartitionReaderFactory serializable
+    val _schema = this.schema
+
+    (partition: InputPartition) => {
+      partition match {
+        case p: PinotInputPartition =>
+          new PartitionReader[InternalRow] with PinotAbstractPartitionReader[InternalRow] {
+            override def _partitionId: Int = p.partitionId
+            override def _pinotSplit: PinotSplit = p.pinotSplit
+            override def _dataSourceOptions: PinotDataSourceReadOptions = p.dataSourceOptions
+            override def _translator: DataTable => Seq[InternalRow] =
+              TypeConverter.pinotDataTableToInternalRows(_, _schema)
+          }
+        case _ =>
+          throw new Exception("Unknown InputPartition type. Expecting PinotInputPartition")
+      }
+    }
+  }
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanBuilder.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanBuilder.scala
new file mode 100644
index 00000000000..ff2c0b68981
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanBuilder.scala
@@ -0,0 +1,82 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.query.ScanQueryGenerator
+import org.apache.pinot.connector.spark.common.{PinotClusterClient, PinotDataSourceReadOptions}
+import org.apache.pinot.connector.spark.v3.datasource.query.FilterPushDown
+import org.apache.spark.sql.connector.read.{Scan, ScanBuilder, SupportsPushDownFilters, SupportsPushDownRequiredColumns}
+import org.apache.spark.sql.sources.Filter
+import org.apache.spark.sql.types.StructType
+
+/**
+ * PinotScanBuilder: Implementation of Spark DataSourceV2 API's ScanBuilder interface.
+ * This is the main class in which various push down functionality is implemented.
+ * We currently support pushing down Filters (where clause) and RequiredColumns (selection).
+ *
+ * @param readParameters PinotDataSourceReadOptions instance for the read
+ */
+class PinotScanBuilder(readParameters: PinotDataSourceReadOptions)
+  extends ScanBuilder with SupportsPushDownFilters with SupportsPushDownRequiredColumns {
+
+  private var acceptedFilters: Array[Filter] = Array.empty
+  private var currentSchema: StructType = _
+
+  override def build(): Scan = {
+    // Time boundary is used when table is hybrid to ensure that the overlap
+    // between realtime and offline segment data is queried exactly once
+    val timeBoundaryInfo =
+      if (readParameters.tableType.isDefined) {
+        None
+      } else {
+        PinotClusterClient.getTimeBoundaryInfo(readParameters.broker, readParameters.tableName)
+      }
+
+    val whereCondition = FilterPushDown.compileFiltersToSqlWhereClause(this.acceptedFilters)
+    val scanQuery = ScanQueryGenerator.generate(
+      readParameters.tableName,
+      readParameters.tableType,
+      timeBoundaryInfo,
+      currentSchema.fieldNames,
+      whereCondition,
+      readParameters.queryOptions
+    )
+
+    new PinotScan(scanQuery, currentSchema, readParameters)
+  }
+
+  override def pushFilters(filters: Array[Filter]): Array[Filter] = {
+    if (readParameters.usePushDownFilters) {
+      val (acceptedFilters, postScanFilters) = FilterPushDown.acceptFilters(filters)
+      this.acceptedFilters = acceptedFilters
+      postScanFilters
+    } else {
+      filters
+    }
+  }
+
+  override def pushedFilters(): Array[Filter] = {
+    this.acceptedFilters
+  }
+
+  override def pruneColumns(requiredSchema: StructType): Unit = {
+    this.currentSchema = requiredSchema
+  }
+
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotTable.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotTable.scala
new file mode 100644
index 00000000000..28cced506e8
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/PinotTable.scala
@@ -0,0 +1,50 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.PinotDataSourceReadOptions
+import org.apache.spark.sql.connector.catalog.{SupportsRead, Table, TableCapability}
+import org.apache.spark.sql.connector.read.ScanBuilder
+import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.util.CaseInsensitiveStringMap
+
+import java.util
+
+/**
+ * PinotTable implements Spark's Table interface to expose a logical representation of a
+ * Pinot table. This is the interface where Spark discovers table capabilities such as
+ * 'SupportsRead'. For now Pinot tables only support batch reads.
+ *
+ * @param name    Pinot table name
+ * @param schema  Schema provided by Spark. This can be different than table schema
+ */
+class PinotTable(name: String, schema: StructType) extends Table with SupportsRead {
+  override def name(): String = name
+
+  override def schema(): StructType = schema
+
+  override def capabilities(): util.Set[TableCapability] = {
+    util.EnumSet.of(TableCapability.BATCH_READ)
+  }
+
+  override def newScanBuilder(options: CaseInsensitiveStringMap): ScanBuilder = {
+    val readParameters = PinotDataSourceReadOptions.from(options)
+    new PinotScanBuilder(readParameters)
+  }
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/TypeConverter.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/TypeConverter.scala
new file mode 100644
index 00000000000..a36fe6adc9d
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/TypeConverter.scala
@@ -0,0 +1,138 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.common.datatable.DataTable
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType
+import org.apache.pinot.connector.spark.common.PinotException
+import org.apache.pinot.spi.data.{FieldSpec, Schema}
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.util.ArrayData
+import org.apache.spark.sql.types._
+import org.apache.spark.unsafe.types.UTF8String
+
+import scala.collection.JavaConverters._
+
+/**
+ * Helper methods for spark-pinot conversions
+ */
+private[pinot] object TypeConverter {
+
+  /** Convert a Pinot schema to Spark schema. */
+  def pinotSchemaToSparkSchema(schema: Schema): StructType = {
+    val structFields = schema.getAllFieldSpecs.asScala.map { field =>
+      val sparkDataType = pinotDataTypeToSparkDataType(field.getDataType)
+      if (field.isSingleValueField) {
+        StructField(field.getName, sparkDataType)
+      } else {
+        StructField(field.getName, ArrayType(sparkDataType))
+      }
+    }
+    StructType(structFields.toList)
+  }
+
+  private def pinotDataTypeToSparkDataType(dataType: FieldSpec.DataType): DataType =
+    dataType match {
+      case FieldSpec.DataType.INT => IntegerType
+      case FieldSpec.DataType.LONG => LongType
+      case FieldSpec.DataType.FLOAT => FloatType
+      case FieldSpec.DataType.DOUBLE => DoubleType
+      case FieldSpec.DataType.STRING => StringType
+      case FieldSpec.DataType.BYTES => ArrayType(ByteType)
+      case FieldSpec.DataType.TIMESTAMP => LongType
+      case FieldSpec.DataType.BOOLEAN => BooleanType
+      case _ =>
+        throw PinotException(s"Unsupported pinot data type '$dataType")
+    }
+
+  /** Convert Pinot DataTable to Seq of InternalRow */
+  def pinotDataTableToInternalRows(
+      dataTable: DataTable,
+      sparkSchema: StructType): Seq[InternalRow] = {
+    val dataTableColumnNames = dataTable.getDataSchema.getColumnNames
+    val nullRowIdsByColumn = (0 until dataTable.getDataSchema.size()).map{ col =>
+      dataTable.getNullRowIds(col)
+    }
+    (0 until dataTable.getNumberOfRows).map { rowIndex =>
+      // spark schema is used to ensure columns order
+      val columns = sparkSchema.fields.map { field =>
+        val colIndex = dataTableColumnNames.indexOf(field.name)
+        if (colIndex < 0) {
+          throw PinotException(s"'${field.name}' not found in Pinot server response")
+        } else {
+          if (nullRowIdsByColumn(colIndex) != null
+              && nullRowIdsByColumn(colIndex).contains(rowIndex)) {
+            null
+          } else {
+            val columnDataType = dataTable.getDataSchema.getColumnDataType(colIndex)
+            readPinotColumnData(dataTable, columnDataType, rowIndex, colIndex)
+          }
+        }
+      }
+      InternalRow.fromSeq(columns)
+    }
+  }
+
+  private def readPinotColumnData(
+     dataTable: DataTable,
+     columnDataType: ColumnDataType,
+     rowIndex: Int,
+     colIndex: Int): Any = columnDataType match {
+    // single column types
+    case ColumnDataType.STRING =>
+      UTF8String.fromString(dataTable.getString(rowIndex, colIndex))
+    case ColumnDataType.INT =>
+      dataTable.getInt(rowIndex, colIndex)
+    case ColumnDataType.LONG =>
+      dataTable.getLong(rowIndex, colIndex)
+    case ColumnDataType.FLOAT =>
+      dataTable.getFloat(rowIndex, colIndex)
+    case ColumnDataType.DOUBLE =>
+      dataTable.getDouble(rowIndex, colIndex)
+    case ColumnDataType.TIMESTAMP =>
+      dataTable.getLong(rowIndex, colIndex)
+    case ColumnDataType.BOOLEAN =>
+      dataTable.getInt(rowIndex, colIndex) == 1
+
+    // array column types
+    case ColumnDataType.STRING_ARRAY =>
+      ArrayData.toArrayData(
+        dataTable.getStringArray(rowIndex, colIndex).map(UTF8String.fromString).toSeq
+      )
+    case ColumnDataType.INT_ARRAY =>
+      ArrayData.toArrayData(dataTable.getIntArray(rowIndex, colIndex).toSeq)
+    case ColumnDataType.LONG_ARRAY =>
+      ArrayData.toArrayData(dataTable.getLongArray(rowIndex, colIndex).toSeq)
+    case ColumnDataType.FLOAT_ARRAY =>
+      ArrayData.toArrayData(dataTable.getFloatArray(rowIndex, colIndex).toSeq)
+    case ColumnDataType.DOUBLE_ARRAY =>
+      ArrayData.toArrayData(dataTable.getDoubleArray(rowIndex, colIndex).toSeq)
+    case ColumnDataType.BYTES =>
+      ArrayData.toArrayData(dataTable.getBytes(rowIndex, colIndex).getBytes)
+    case ColumnDataType.TIMESTAMP_ARRAY =>
+      ArrayData.toArrayData(dataTable.getLongArray(rowIndex, colIndex).toSeq)
+    case ColumnDataType.BOOLEAN_ARRAY =>
+      ArrayData.toArrayData(
+        dataTable.getIntArray(rowIndex, colIndex).map(i => i == 1).toSeq
+      )
+
+    case _ =>
+      throw PinotException(s"'$columnDataType' is not supported")
+  }
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/query/FilterPushDown.scala b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/query/FilterPushDown.scala
new file mode 100644
index 00000000000..cac50ec0312
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/main/scala/org/apache/pinot/connector/spark/v3/datasource/query/FilterPushDown.scala
@@ -0,0 +1,127 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource.query
+
+import java.sql.{Date, Timestamp}
+
+import org.apache.spark.sql.sources._
+
+/**
+ * Helper methods to find valid filters, and convert spark filters to SQL where clause.
+ */
+private[pinot] object FilterPushDown {
+
+  /**
+   * Create SQL 'where clause' from Spark filters.
+   *
+   * @param filters Supported spark filters
+   * @return where clause, or None if filters does not exists
+   */
+  def compileFiltersToSqlWhereClause(filters: Array[Filter]): Option[String] = {
+    if (filters.isEmpty) {
+      None
+    } else {
+      Option(filters.flatMap(compileFilter).map(filter => s"($filter)").mkString(" AND "))
+    }
+  }
+
+  /**
+   * Accept only filters that supported in SQL.
+   *
+   * @param filters Spark filters that contains valid and/or invalid filters
+   * @return Supported and unsupported filters
+   */
+  def acceptFilters(filters: Array[Filter]): (Array[Filter], Array[Filter]) = {
+    filters.partition(isFilterSupported)
+  }
+
+  private def isFilterSupported(filter: Filter): Boolean = filter match {
+    case _: EqualTo => true
+    case _: EqualNullSafe => true
+    case _: In => true
+    case _: LessThan => true
+    case _: LessThanOrEqual => true
+    case _: GreaterThan => true
+    case _: GreaterThanOrEqual => true
+    case _: IsNull => true
+    case _: IsNotNull => true
+    case _: StringStartsWith => true
+    case _: StringEndsWith => true
+    case _: StringContains => true
+    case _: Not => true
+    case _: Or => true
+    case _: And => true
+    case _ => false
+  }
+
+  private def escapeSql(value: String): String =
+    if (value == null) null else value.replace("'", "''")
+
+  private def compileValue(value: Any): Any = value match {
+    case stringValue: String => s"'${escapeSql(stringValue)}'"
+    case timestampValue: Timestamp => "'" + timestampValue + "'"
+    case dateValue: Date => "'" + dateValue + "'"
+    case arrayValue: Array[Any] => arrayValue.map(compileValue).mkString(", ")
+    case _ => value
+  }
+
+  private def escapeAttr(attr: String): String = {
+    if (attr.contains("\"")) attr else s""""$attr""""
+  }
+
+  private def compileFilter(filter: Filter): Option[String] = {
+    val whereCondition = filter match {
+      case EqualTo(attr, value) => s"${escapeAttr(attr)} = ${compileValue(value)}"
+      case EqualNullSafe(attr, value) =>
+        s"NOT (${escapeAttr(attr)} != ${compileValue(value)} OR ${escapeAttr(attr)} IS NULL OR " +
+          s"${compileValue(value)} IS NULL) OR " +
+          s"(${escapeAttr(attr)} IS NULL AND ${compileValue(value)} IS NULL)"
+      case LessThan(attr, value) => s"${escapeAttr(attr)} < ${compileValue(value)}"
+      case GreaterThan(attr, value) => s"${escapeAttr(attr)} > ${compileValue(value)}"
+      case LessThanOrEqual(attr, value) => s"${escapeAttr(attr)} <= ${compileValue(value)}"
+      case GreaterThanOrEqual(attr, value) => s"${escapeAttr(attr)} >= ${compileValue(value)}"
+      case IsNull(attr) => s"${escapeAttr(attr)} IS NULL"
+      case IsNotNull(attr) => s"${escapeAttr(attr)} IS NOT NULL"
+      case StringStartsWith(attr, value) => s"${escapeAttr(attr)} LIKE '$value%'"
+      case StringEndsWith(attr, value) => s"${escapeAttr(attr)} LIKE '%$value'"
+      case StringContains(attr, value) => s"${escapeAttr(attr)} LIKE '%$value%'"
+      case In(attr, value) if value.isEmpty =>
+        s"CASE WHEN ${escapeAttr(attr)} IS NULL THEN NULL ELSE FALSE END"
+      case In(attr, value) => s"${escapeAttr(attr)} IN (${compileValue(value)})"
+      case Not(f) => compileFilter(f).map(p => s"NOT ($p)").orNull
+      case Or(f1, f2) =>
+        val or = Seq(f1, f2).flatMap(compileFilter)
+        if (or.size == 2) {
+          or.map(p => s"($p)").mkString(" OR ")
+        } else {
+          null
+        }
+      case And(f1, f2) =>
+        val and = Seq(f1, f2).flatMap(compileFilter)
+        if (and.size == 2) {
+          and.map(p => s"($p)").mkString(" AND ")
+        } else {
+          null
+        }
+      case _ => null
+    }
+    Option(whereCondition)
+  }
+
+}
diff --git a/pinot-connectors/pinot-spark-connector/src/test/resources/log4j2.xml b/pinot-connectors/pinot-spark-3-connector/src/test/resources/log4j2.xml
similarity index 100%
rename from pinot-connectors/pinot-spark-connector/src/test/resources/log4j2.xml
rename to pinot-connectors/pinot-spark-3-connector/src/test/resources/log4j2.xml
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/resources/schema/pinot-schema.json b/pinot-connectors/pinot-spark-3-connector/src/test/resources/schema/pinot-schema.json
new file mode 100644
index 00000000000..1cf62b28741
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/resources/schema/pinot-schema.json
@@ -0,0 +1,75 @@
+{
+  "schemaName" : "schemaName",
+  "dimensionFieldSpecs" : [ {
+    "name" : "stringDim",
+    "dataType" : "STRING"
+  }, {
+    "name" : "intDim",
+    "dataType" : "INT"
+  }, {
+    "name" : "floatDim",
+    "dataType" : "FLOAT",
+    "defaultNullValue" : 0.0
+  }, {
+    "name" : "doubleDim",
+    "dataType" : "DOUBLE"
+  }, {
+    "name" : "longDim",
+    "dataType" : "LONG"
+  }, {
+    "name": "boolDim",
+    "dataType": "BOOLEAN"
+  }, {
+    "name" : "stringArrayDim",
+    "dataType" : "STRING",
+    "singleValueField" : false
+  }, {
+    "name" : "floatArrayDim",
+    "dataType" : "FLOAT",
+    "singleValueField" : false
+  }, {
+    "name": "boolArrayDim",
+    "dataType": "BOOLEAN",
+    "singleValueField": false
+  } ],
+  "metricFieldSpecs" : [ {
+    "name" : "floatMetric",
+    "dataType" : "FLOAT"
+  }, {
+    "name" : "doubleMetric",
+    "dataType" : "DOUBLE"
+  }, {
+    "name" : "longMetric",
+    "dataType" : "LONG"
+  }, {
+    "name" : "intMetric",
+    "dataType" : "INT",
+    "defaultNullValue" : 10
+  }, {
+    "name" : "stringMetric",
+    "dataType" : "STRING"
+  }, {
+    "name" : "byteDim",
+    "dataType" : "BYTES"
+  } ],
+  "timeFieldSpec" : {
+    "incomingGranularitySpec" : {
+      "name" : "incomingTimeField",
+      "dataType" : "LONG",
+      "timeType" : "SECONDS"
+    },
+    "outgoingGranularitySpec" : {
+      "name" : "outgoingTimeField",
+      "dataType" : "INT",
+      "timeType" : "DAYS"
+    }
+  },
+  "dateTimeFieldSpecs": [
+    {
+      "name": "timestampField",
+      "dataType": "TIMESTAMP",
+      "format": "1:MILLISECONDS:EPOCH",
+      "granularity": "1:SECONDS"
+    }
+  ]
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/resources/schema/spark-schema.json b/pinot-connectors/pinot-spark-3-connector/src/test/resources/schema/spark-schema.json
new file mode 100644
index 00000000000..a8187fcf0fc
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/resources/schema/spark-schema.json
@@ -0,0 +1,105 @@
+{
+  "type" : "struct",
+  "fields" : [ {
+    "name" : "floatMetric",
+    "type" : "float",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "doubleMetric",
+    "type" : "double",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "longMetric",
+    "type" : "long",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "intMetric",
+    "type" : "integer",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "stringMetric",
+    "type" : "string",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "stringDim",
+    "type" : "string",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "intDim",
+    "type" : "integer",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "floatDim",
+    "type" : "float",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "doubleDim",
+    "type" : "double",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "longDim",
+    "type" : "long",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "boolDim",
+    "type" : "boolean",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "stringArrayDim",
+    "type" : {
+      "type" : "array",
+      "elementType" : "string",
+      "containsNull" : true
+    },
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "floatArrayDim",
+    "type" : {
+      "type" : "array",
+      "elementType" : "float",
+      "containsNull" : true
+    },
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "boolArrayDim",
+    "type" : {
+      "type" : "array",
+      "elementType" : "boolean",
+      "containsNull" : true
+    },
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "byteDim",
+    "type" : {
+      "type" : "array",
+      "elementType" : "byte",
+      "containsNull" : true
+    },
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "outgoingTimeField",
+    "type" : "integer",
+    "nullable" : true,
+    "metadata" : { }
+  }, {
+    "name" : "timestampField",
+    "type" : "long",
+    "nullable" : true,
+    "metadata" : { }
+  } ]
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/BaseTest.scala b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/BaseTest.scala
new file mode 100644
index 00000000000..30747a9b80b
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/BaseTest.scala
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.connector.spark.v3.datasource
+
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
+
+trait BaseTest extends AnyFunSuite with Matchers
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/ExampleSparkPinotConnectorTest.scala b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/ExampleSparkPinotConnectorTest.scala
new file mode 100644
index 00000000000..3c2755baf72
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/ExampleSparkPinotConnectorTest.scala
@@ -0,0 +1,213 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.Logging
+import org.apache.spark.sql.SparkSession
+import org.apache.spark.sql.types.{DataTypes, StructField, StructType}
+
+/**
+ * Example object to test connector with all of features.
+ * To run this class, first of all,
+ * run pinot locally(https://docs.pinot.apache.org/basics/getting-started/running-pinot-locally)
+ */
+object ExampleSparkPinotConnectorTest extends Logging {
+
+  def main(args: Array[String]): Unit = {
+    implicit val spark: SparkSession = SparkSession
+      .builder()
+      .appName("spark-pinot-connector-test")
+      .master("local")
+      .getOrCreate()
+
+    readOffline()
+    readHybrid()
+    readHybridWithSpecificSchema()
+    readHybridWithFilters()
+    readHybridViaGrpc()
+    readRealtimeViaGrpc()
+    readRealtimeWithFilterViaGrpc()
+    readHybridWithFiltersViaGrpc()
+    readRealtimeWithSelectionColumns()
+    applyJustSomeFilters()
+  }
+
+  def readOffline()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_OFFLINE` table... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "offline")
+      .load()
+
+    data.show()
+  }
+
+  def readHybrid()(implicit spark: SparkSession): Unit = {
+    log.info("## Reading `airlineStats_OFFLINE and airlineStats_REALTIME` tables... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "hybrid")
+      .load()
+
+    data.show()
+  }
+
+  def readHybridWithSpecificSchema()(implicit spark: SparkSession): Unit = {
+    log.info("## Reading `airlineStats_OFFLINE and airlineStats_REALTIME` tables with specific schema... ##")
+    val schema = StructType(
+      Seq(
+        StructField("Distance", DataTypes.IntegerType),
+        StructField("AirlineID", DataTypes.IntegerType),
+        StructField("DaysSinceEpoch", DataTypes.IntegerType),
+        StructField("DestStateName", DataTypes.StringType),
+        StructField("Origin", DataTypes.StringType),
+        StructField("Carrier", DataTypes.StringType)
+      )
+    )
+
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "HYBRID")
+      .schema(schema)
+      .load()
+
+    data.show()
+  }
+
+  def readOfflineWithFilters()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_OFFLINE` table with filter push down... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "OFFLINE")
+      .load()
+      .filter($"AirlineID" === 19805)
+      .filter($"DestStateName" === "Florida")
+      .filter($"DaysSinceEpoch".isin(16101, 16084, 16074))
+      .filter($"Origin" === "ORD")
+
+    data.show()
+  }
+
+  def readHybridWithFilters()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_OFFLINE and airlineStats_REALTIME` tables with filter push down... ##")
+    // should return 1 data, because connector ensure that the overlap
+    // between realtime and offline segment data is queried exactly once
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "hybrid")
+      .load()
+      .filter($"AirlineID" === 19805)
+      .filter($"DestStateName" === "Florida")
+      .filter($"DaysSinceEpoch".isin(16101, 16084, 16074))
+      .filter($"Origin" === "ORD")
+
+    data.show()
+  }
+
+  def readRealtimeWithSelectionColumns()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_REALTIME` table with column push down... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "realtime")
+      .load()
+      .select($"FlightNum", $"Origin", $"DestStateName")
+
+    data.show()
+  }
+
+  def readHybridViaGrpc()(implicit spark: SparkSession): Unit = {
+    log.info("## Reading `airlineStats` table... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "hybrid")
+      .option("useGrpcServer", "true")
+      .load()
+
+    data.show()
+  }
+
+  def readRealtimeViaGrpc()(implicit spark: SparkSession): Unit = {
+    log.info("## Reading `airlineStats_REALTIME` table... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "realtime")
+      .option("useGrpcServer", "true")
+      .load()
+
+    data.show()
+  }
+
+  def readRealtimeWithFilterViaGrpc()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_REALTIME` table... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "realtime")
+      .option("useGrpcServer", "true")
+      .load()
+      .filter($"DestWac" === 5)
+      .select($"FlightNum", $"Origin", $"DestStateName")
+
+    data.show()
+  }
+
+  def readHybridWithFiltersViaGrpc()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_OFFLINE` table with filter push down... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "hybrid")
+      .option("useGrpcServer", "true")
+      .load()
+      .filter($"DestStateName" === "Florida")
+
+    data.show()
+  }
+
+
+  def applyJustSomeFilters()(implicit spark: SparkSession): Unit = {
+    import spark.implicits._
+    log.info("## Reading `airlineStats_OFFLINE and airlineStats_REALTIME` tables with filter push down... ##")
+    val data = spark.read
+      .format("pinot")
+      .option("table", "airlineStats")
+      .option("tableType", "hybrid")
+      .load()
+      .filter($"DestStateName" === "Florida")
+      .filter($"Origin" === "ORD")
+      .select($"DestStateName", $"Origin", $"Distance", $"AirlineID")
+
+    data.show()
+  }
+
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanBuilderTest.scala b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanBuilderTest.scala
new file mode 100644
index 00000000000..bbcfd6fcffe
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanBuilderTest.scala
@@ -0,0 +1,51 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.PinotDataSourceReadOptions
+import org.apache.spark.sql.sources.{Filter, LessThan}
+import org.apache.spark.sql.types.{IntegerType, StructField, StructType}
+
+
+class PinotScanBuilderTest extends BaseTest {
+  test("Builder should build a PinotScan with given filters") {
+    val optMap = new java.util.HashMap[String, String]()
+    optMap.put("table", "myTable")
+    optMap.put("tableType", "REALTIME")
+    optMap.put("broker", "localhost:7177")
+    val readOptions = PinotDataSourceReadOptions.from(optMap)
+
+    // create a scan builder with custom schema
+    val builder = new PinotScanBuilder(readOptions)
+    builder.pruneColumns(StructType(
+      Seq(StructField("myCol",IntegerType))
+    ))
+
+    // push a filter
+    val lessThan = LessThan("myCol", 100)
+    builder.pushFilters(Array[Filter]{lessThan})
+    val pushedFilters = builder.pushedFilters()
+    pushedFilters.length shouldEqual 1
+    pushedFilters(0) shouldBe a [LessThan]
+
+    // run the builder
+    val scan = builder.build()
+    scan shouldBe a [PinotScan]
+  }
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanTest.scala b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanTest.scala
new file mode 100644
index 00000000000..717003ba4c9
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/PinotScanTest.scala
@@ -0,0 +1,51 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.connector.spark.common.PinotDataSourceReadOptions
+import org.apache.pinot.connector.spark.common.query.ScanQuery
+import org.apache.pinot.spi.config.table.TableType
+import org.apache.spark.sql.connector.read.PartitionReaderFactory
+import org.apache.spark.sql.types.{IntegerType, StructField, StructType}
+
+class PinotScanTest extends BaseTest {
+  test("Scan should build and return a partition reader") {
+    val optMap = new java.util.HashMap[String, String]()
+    optMap.put("table", "myTable")
+    optMap.put("tableType", "REALTIME")
+    optMap.put("broker", "localhost:7177")
+    val readOptions = PinotDataSourceReadOptions.from(optMap)
+    val schema = StructType(
+      Seq(StructField("myCol", IntegerType))
+    )
+    val scanQuery = ScanQuery(
+      "myTable",
+      Some(TableType.OFFLINE),
+      "select * from myTable",
+      "")
+
+    val scan = new PinotScan(scanQuery, schema, readOptions)
+    val readerFactory = scan.createReaderFactory()
+
+
+
+    // assert PinotScan creates a PartitionReaderFactory
+    readerFactory shouldBe a [PartitionReaderFactory]
+  }
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/TypeConverterTest.scala b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/TypeConverterTest.scala
new file mode 100644
index 00000000000..caee51d0a0f
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/TypeConverterTest.scala
@@ -0,0 +1,203 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource
+
+import org.apache.pinot.common.datatable.DataTableFactory
+import org.apache.pinot.common.utils.DataSchema
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType
+import org.apache.pinot.connector.spark.common.PinotException
+import org.apache.pinot.core.common.datatable.DataTableBuilderFactory
+import org.apache.pinot.spi.data.Schema
+import org.apache.pinot.spi.utils.ByteArray
+import org.apache.spark.sql.catalyst.util.ArrayData
+import org.apache.spark.sql.types._
+import org.apache.spark.unsafe.types.UTF8String
+import org.roaringbitmap.RoaringBitmap
+
+import scala.io.Source
+
+/**
+ * Test pinot/spark conversions like schema, data table etc.
+ */
+class TypeConverterTest extends BaseTest {
+
+  test("Pinot DataTable should be converted to Spark InternalRows") {
+    val columnNames = Array(
+      "strCol",
+      "intCol",
+      "longCol",
+      "floatCol",
+      "doubleCol",
+      "strArrayCol",
+      "intArrayCol",
+      "longArrayCol",
+      "floatArrayCol",
+      "doubleArrayCol",
+      "byteType",
+      "timestampArrayCol",
+      "timestampCol",
+      "booleanArrayCol",
+      "booleanCol",
+    )
+    val columnTypes = Array(
+      ColumnDataType.STRING,
+      ColumnDataType.INT,
+      ColumnDataType.LONG,
+      ColumnDataType.FLOAT,
+      ColumnDataType.DOUBLE,
+      ColumnDataType.STRING_ARRAY,
+      ColumnDataType.INT_ARRAY,
+      ColumnDataType.LONG_ARRAY,
+      ColumnDataType.FLOAT_ARRAY,
+      ColumnDataType.DOUBLE_ARRAY,
+      ColumnDataType.BYTES,
+      ColumnDataType.TIMESTAMP_ARRAY,
+      ColumnDataType.TIMESTAMP,
+      ColumnDataType.BOOLEAN_ARRAY,
+      ColumnDataType.BOOLEAN,
+    )
+    val dataSchema = new DataSchema(columnNames, columnTypes)
+
+    val dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema)
+    dataTableBuilder.startRow()
+    dataTableBuilder.setColumn(0, "strValueDim")
+    dataTableBuilder.setColumn(1, 5)
+    dataTableBuilder.setColumn(2, 3L)
+    dataTableBuilder.setColumn(3, 10.05f)
+    dataTableBuilder.setColumn(4, 2.3d)
+    dataTableBuilder.setColumn(5, Array[String]("strArr1", "null"))
+    dataTableBuilder.setColumn(6, Array[Int](1, 2, 0))
+    dataTableBuilder.setColumn(7, Array[Long](10L, 0))
+    dataTableBuilder.setColumn(8, Array[Float](0, 15.20f))
+    dataTableBuilder.setColumn(9, Array[Double](0, 10.3d))
+    dataTableBuilder.setColumn(10, new ByteArray("byte_test".getBytes))
+    dataTableBuilder.setColumn(11, Array[Long](123L,456L))
+    dataTableBuilder.setColumn(12, 123L)
+    dataTableBuilder.setColumn(13, Array[Int](1,0,1,0))
+    dataTableBuilder.setColumn(14, 1)
+
+    dataTableBuilder.finishRow()
+    val dataTable = dataTableBuilder.build()
+
+    val schema = StructType(
+      Seq(
+        StructField("intArrayCol", ArrayType(IntegerType)),
+        StructField("intCol", IntegerType),
+        StructField("doubleArrayCol", ArrayType(DoubleType)),
+        StructField("doubleCol", DoubleType),
+        StructField("strArrayCol", ArrayType(StringType)),
+        StructField("longCol", LongType),
+        StructField("longArrayCol", ArrayType(LongType)),
+        StructField("strCol", StringType),
+        StructField("floatArrayCol", ArrayType(FloatType)),
+        StructField("floatCol", FloatType),
+        StructField("byteType", ArrayType(ByteType)),
+        StructField("timestampArrayCol", ArrayType(LongType)),
+        StructField("timestampCol", LongType),
+        StructField("booleanArrayCol", ArrayType(BooleanType)),
+        StructField("booleanCol", BooleanType),
+      )
+    )
+
+    val result = TypeConverter.pinotDataTableToInternalRows(dataTable, schema).head
+    result.getArray(0) shouldEqual ArrayData.toArrayData(Seq(1, 2, 0))
+    result.getInt(1) shouldEqual 5
+    result.getArray(2) shouldEqual ArrayData.toArrayData(Seq(0d, 10.3d))
+    result.getDouble(3) shouldEqual 2.3d
+    result.getArray(4) shouldEqual ArrayData.toArrayData(
+      Seq("strArr1", "null").map(UTF8String.fromString)
+    )
+    result.getLong(5) shouldEqual 3L
+    result.getArray(6) shouldEqual ArrayData.toArrayData(Seq(10L, 0L))
+    result.getString(7) shouldEqual "strValueDim"
+    result.getArray(8) shouldEqual ArrayData.toArrayData(Seq(0f, 15.20f))
+    result.getFloat(9) shouldEqual 10.05f
+    result.getArray(10) shouldEqual ArrayData.toArrayData("byte_test".getBytes)
+    result.getArray(11) shouldEqual ArrayData.toArrayData(Seq(123L,456L))
+    result.getLong(12) shouldEqual 123L
+    result.getArray(13) shouldEqual ArrayData.toArrayData(Seq(true, false, true, false))
+    result.getBoolean(14) shouldEqual true
+  }
+
+  test("Method should throw field not found exception while converting pinot data table") {
+    val columnNames = Array("strCol", "intCol")
+    val columnTypes = Array(ColumnDataType.STRING, ColumnDataType.INT)
+    val dataSchema = new DataSchema(columnNames, columnTypes)
+
+    val dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema)
+    dataTableBuilder.startRow()
+    dataTableBuilder.setColumn(0, "strValueDim")
+    dataTableBuilder.setColumn(1, 5)
+    dataTableBuilder.finishRow()
+    val dataTable = dataTableBuilder.build()
+
+    val schema = StructType(
+      Seq(
+        StructField("strCol", StringType),
+        StructField("intCol", IntegerType),
+        StructField("longCol", LongType)
+      )
+    )
+
+    val exception = intercept[PinotException] {
+      TypeConverter.pinotDataTableToInternalRows(dataTable, schema)
+    }
+
+    exception.getMessage shouldEqual s"'longCol' not found in Pinot server response"
+  }
+
+  test("Converter should identify and correctly return null rows") {
+    val columnNames = Array("strCol", "intCol")
+    val columnTypes = Array(ColumnDataType.STRING, ColumnDataType.INT)
+    val dataSchema = new DataSchema(columnNames, columnTypes)
+    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4)
+
+    val dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema)
+    dataTableBuilder.startRow()
+    dataTableBuilder.setColumn(0, "null")
+    dataTableBuilder.setColumn(1, 5)
+    dataTableBuilder.finishRow()
+
+    val nullRowIds = new RoaringBitmap()
+    nullRowIds.add(0)
+    dataTableBuilder.setNullRowIds(nullRowIds)
+    dataTableBuilder.setNullRowIds(null)
+
+
+    val dataTable = dataTableBuilder.build()
+
+    val schema = StructType(
+      Seq(
+        StructField("strCol", StringType, true),
+        StructField("intCol", IntegerType, true)
+      )
+    )
+
+    val result = TypeConverter.pinotDataTableToInternalRows(dataTable, schema).head
+    result.get(0, StringType) shouldEqual null
+  }
+
+  test("Pinot schema should be converted to spark schema") {
+    val pinotSchemaAsString = Source.fromResource("schema/pinot-schema.json").mkString
+    val resultSchema = TypeConverter.pinotSchemaToSparkSchema(Schema.fromString(pinotSchemaAsString))
+    val sparkSchemaAsString = Source.fromResource("schema/spark-schema.json").mkString
+    val sparkSchema = DataType.fromJson(sparkSchemaAsString).asInstanceOf[StructType]
+    resultSchema.fields should contain theSameElementsAs sparkSchema.fields
+  }
+}
diff --git a/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/query/FilterPushDownTest.scala b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/query/FilterPushDownTest.scala
new file mode 100644
index 00000000000..1bf889ddee7
--- /dev/null
+++ b/pinot-connectors/pinot-spark-3-connector/src/test/scala/org/apache/pinot/connector/spark/v3/datasource/query/FilterPushDownTest.scala
@@ -0,0 +1,82 @@
+/**
+ * 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.pinot.connector.spark.v3.datasource.query
+
+import java.sql.{Date, Timestamp}
+
+import org.apache.pinot.connector.spark.v3.datasource.BaseTest
+import org.apache.spark.sql.sources._
+
+/**
+ * Test filter conversions => Spark filter to SQL where clause
+ */
+class FilterPushDownTest extends BaseTest {
+
+  private val filters: Array[Filter] = Array(
+    EqualTo("attr1", 1),
+    In("attr2", Array("1", "2", "'5'")),
+    LessThan("attr3", 1),
+    LessThanOrEqual("attr4", 3),
+    GreaterThan("attr5", 10),
+    GreaterThanOrEqual("attr6", 15),
+    Not(EqualTo("attr7", "1")),
+    And(LessThan("attr8", 10), LessThanOrEqual("attr9", 3)),
+    Or(EqualTo("attr10", "hello"), GreaterThanOrEqual("attr11", 13)),
+    StringContains("attr12", "pinot"),
+    In("attr13", Array(10, 20)),
+    EqualNullSafe("attr20", "123"),
+    IsNull("attr14"),
+    IsNotNull("attr15"),
+    StringStartsWith("attr16", "pinot1"),
+    StringEndsWith("attr17", "pinot2"),
+    EqualTo("attr18", Timestamp.valueOf("2020-01-01 00:00:15")),
+    LessThan("attr19", Date.valueOf("2020-01-01")),
+    EqualTo("attr21", Seq(1, 2)),
+    EqualTo("attr22", 10.5d)
+  )
+
+  test("Unsupported filters should be filtered") {
+    val (accepted, postScan) = FilterPushDown.acceptFilters(filters)
+
+    accepted should contain theSameElementsAs filters
+    postScan should contain theSameElementsAs Seq.empty
+  }
+
+  test("SQL query should be created from spark filters") {
+    val whereClause = FilterPushDown.compileFiltersToSqlWhereClause(filters)
+    val expectedOutput =
+      s"""("attr1" = 1) AND ("attr2" IN ('1', '2', '''5''')) AND ("attr3" < 1) AND ("attr4" <= 3) AND ("attr5" > 10) AND """ +
+        s"""("attr6" >= 15) AND (NOT ("attr7" = '1')) AND (("attr8" < 10) AND ("attr9" <= 3)) AND """ +
+        s"""(("attr10" = 'hello') OR ("attr11" >= 13)) AND ("attr12" LIKE '%pinot%') AND ("attr13" IN (10, 20)) AND """ +
+        s"""(NOT ("attr20" != '123' OR "attr20" IS NULL OR '123' IS NULL) OR ("attr20" IS NULL AND '123' IS NULL)) AND """ +
+        s"""("attr14" IS NULL) AND ("attr15" IS NOT NULL) AND ("attr16" LIKE 'pinot1%') AND ("attr17" LIKE '%pinot2') AND """ +
+        s"""("attr18" = '2020-01-01 00:00:15.0') AND ("attr19" < '2020-01-01') AND ("attr21" = List(1, 2)) AND """ +
+        s"""("attr22" = 10.5)"""
+
+    whereClause.get shouldEqual expectedOutput
+  }
+
+  test("Shouldn't escape column names which are already escaped") {
+    val whereClause = FilterPushDown.compileFiltersToSqlWhereClause(
+      Array(EqualTo("\"some\".\"nested\".\"column\"", 1)))
+    val expectedOutput = "(\"some\".\"nested\".\"column\" = 1)"
+
+    whereClause.get shouldEqual expectedOutput
+  }
+}
diff --git a/pinot-connectors/pinot-spark-connector/pom.xml b/pinot-connectors/pinot-spark-common/pom.xml
similarity index 83%
rename from pinot-connectors/pinot-spark-connector/pom.xml
rename to pinot-connectors/pinot-spark-common/pom.xml
index d6bf1dd57eb..030248871d9 100644
--- a/pinot-connectors/pinot-spark-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-common/pom.xml
@@ -28,20 +28,15 @@
     <version>0.13.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>pinot-spark-connector</artifactId>
-  <name>Pinot Spark Connector</name>
+  <artifactId>pinot-spark-common</artifactId>
+  <name>Pinot Spark Common</name>
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
-    <spark.version>2.4.5</spark.version>
-    <circe.version>0.13.0</circe.version>
+    <circe.version>0.14.2</circe.version>
     <paranameter.version>2.8</paranameter.version>
     <scalaxml.version>1.3.0</scalaxml.version>
     <scalatest.version>3.1.1</scalatest.version>
-    <shadeBase>org.apache.pinot.\$internal</shadeBase>
-
-    <!-- TODO: delete this prop once all the checkstyle warnings are fixed -->
-    <checkstyle.fail.on.violation>false</checkstyle.fail.on.violation>
   </properties>
 
   <profiles>
@@ -85,34 +80,6 @@
             </exclusion>
           </exclusions>
         </dependency>
-        <dependency>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-sql_${scala.compat.version}</artifactId>
-          <version>${spark.version}</version>
-          <scope>provided</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.apache.curator</groupId>
-              <artifactId>curator-recipes</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>com.thoughtworks.paranamer</groupId>
-              <artifactId>paranamer</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.scala-lang.modules</groupId>
-              <artifactId>scala-xml_${scala.compat.version}</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.scala-lang</groupId>
-              <artifactId>scala-library</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>com.zaxxer</groupId>
-              <artifactId>HikariCP-java7</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
         <dependency>
           <groupId>io.circe</groupId>
           <artifactId>circe-parser_${scala.compat.version}</artifactId>
@@ -156,6 +123,10 @@
               <groupId>org.scala-lang</groupId>
               <artifactId>scala-library</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>org.scala-lang</groupId>
+              <artifactId>scala-reflect</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
       </dependencies>
@@ -180,39 +151,20 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-shade-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <relocations>
-                    <relocation>
-                      <pattern>com</pattern>
-                      <shadedPattern>${shadeBase}.com</shadedPattern>
-                      <includes>
-                        <include>com.google.protobuf.**</include>
-                        <include>com.google.common.**</include>
-                      </includes>
-                    </relocation>
-                  </relocations>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <groupId>net.alchim31.maven</groupId>
             <artifactId>scala-maven-plugin</artifactId>
             <version>3.2.2</version>
             <executions>
               <execution>
-                <id>eclipse-add-source</id>
+                <id>add-source</id>
+                <phase>generate-sources</phase>
                 <goals>
                   <goal>add-source</goal>
                 </goals>
+                <configuration>
+                  <sourceDir>src/main/java</sourceDir>
+                </configuration>
               </execution>
               <execution>
                 <id>scala-compile-first</id>
diff --git a/pinot-connectors/pinot-spark-common/src/main/java/org/apache/pinot/connector/spark/common/CaseInsensitiveStringMap.java b/pinot-connectors/pinot-spark-common/src/main/java/org/apache/pinot/connector/spark/common/CaseInsensitiveStringMap.java
new file mode 100644
index 00000000000..4c8d804a6b6
--- /dev/null
+++ b/pinot-connectors/pinot-spark-common/src/main/java/org/apache/pinot/connector/spark/common/CaseInsensitiveStringMap.java
@@ -0,0 +1,201 @@
+/**
+ * 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.pinot.connector.spark.common;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Copied from Apache Spark repository org.apache.spark.sql.util package in order to re-use
+ * for Spark2 connectors besides Spark3.
+ * This class is compatible with DataSourceOptions class used in Spark2.
+ *
+ * Case-insensitive map of string keys to string values.
+ * <p>
+ * This is used to pass options to v2 implementations to ensure consistent case insensitivity.
+ * <p>
+ * Methods that return keys in this map, like {@link #entrySet()} and {@link #keySet()}, return
+ * keys converted to lower case. This map doesn't allow null key.
+ */
+public class CaseInsensitiveStringMap implements Map<String, String> {
+  private final Logger _logger = LoggerFactory.getLogger(CaseInsensitiveStringMap.class);
+
+  private String _unsupportedOperationMsg = "CaseInsensitiveStringMap is read-only.";
+
+  public static CaseInsensitiveStringMap empty() {
+    return new CaseInsensitiveStringMap(new HashMap<>(0));
+  }
+
+  private final Map<String, String> _original;
+
+  private final Map<String, String> _delegate;
+
+  public CaseInsensitiveStringMap(Map<String, String> originalMap) {
+    _original = new HashMap<>(originalMap);
+    _delegate = new HashMap<>(originalMap.size());
+    for (Map.Entry<String, String> entry : originalMap.entrySet()) {
+      String key = toLowerCase(entry.getKey());
+      if (_delegate.containsKey(key)) {
+        _logger.warn("Converting duplicated key " + entry.getKey()
+            + " into CaseInsensitiveStringMap.");
+      }
+      _delegate.put(key, entry.getValue());
+    }
+  }
+
+  @Override
+  public int size() {
+    return _delegate.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return _delegate.isEmpty();
+  }
+
+  private String toLowerCase(Object key) {
+    return key.toString().toLowerCase(Locale.ROOT);
+  }
+
+  @Override
+  public boolean containsKey(Object key) {
+    return _delegate.containsKey(toLowerCase(key));
+  }
+
+  @Override
+  public boolean containsValue(Object value) {
+    return _delegate.containsValue(value);
+  }
+
+  @Override
+  public String get(Object key) {
+    return _delegate.get(toLowerCase(key));
+  }
+
+  @Override
+  public String put(String key, String value) {
+    throw new UnsupportedOperationException(_unsupportedOperationMsg);
+  }
+
+  @Override
+  public String remove(Object key) {
+    throw new UnsupportedOperationException(_unsupportedOperationMsg);
+  }
+
+  @Override
+  public void putAll(Map<? extends String, ? extends String> m) {
+    throw new UnsupportedOperationException(_unsupportedOperationMsg);
+  }
+
+  @Override
+  public void clear() {
+    throw new UnsupportedOperationException(_unsupportedOperationMsg);
+  }
+
+  @Override
+  public Set<String> keySet() {
+    return _delegate.keySet();
+  }
+
+  @Override
+  public Collection<String> values() {
+    return _delegate.values();
+  }
+
+  @Override
+  public Set<Map.Entry<String, String>> entrySet() {
+    return _delegate.entrySet();
+  }
+
+  /**
+   * Returns the boolean value to which the specified key is mapped,
+   * or defaultValue if there is no mapping for the key. The key match is case-insensitive.
+   */
+  public boolean getBoolean(String key, boolean defaultValue) {
+    String value = get(key);
+    // We can't use `Boolean.parseBoolean` here, as it returns false for invalid strings.
+    if (value == null) {
+      return defaultValue;
+    } else if (value.equalsIgnoreCase("true")) {
+      return true;
+    } else if (value.equalsIgnoreCase("false")) {
+      return false;
+    } else {
+      throw new IllegalArgumentException(value + " is not a boolean string.");
+    }
+  }
+
+  /**
+   * Returns the integer value to which the specified key is mapped,
+   * or defaultValue if there is no mapping for the key. The key match is case-insensitive.
+   */
+  public int getInt(String key, int defaultValue) {
+    String value = get(key);
+    return value == null ? defaultValue : Integer.parseInt(value);
+  }
+
+  /**
+   * Returns the long value to which the specified key is mapped,
+   * or defaultValue if there is no mapping for the key. The key match is case-insensitive.
+   */
+  public long getLong(String key, long defaultValue) {
+    String value = get(key);
+    return value == null ? defaultValue : Long.parseLong(value);
+  }
+
+  /**
+   * Returns the double value to which the specified key is mapped,
+   * or defaultValue if there is no mapping for the key. The key match is case-insensitive.
+   */
+  public double getDouble(String key, double defaultValue) {
+    String value = get(key);
+    return value == null ? defaultValue : Double.parseDouble(value);
+  }
+
+  /**
+   * Returns the original case-sensitive map.
+   */
+  public Map<String, String> asCaseSensitiveMap() {
+    return Collections.unmodifiableMap(_original);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CaseInsensitiveStringMap that = (CaseInsensitiveStringMap) o;
+    return _delegate.equals(that._delegate);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_delegate);
+  }
+}
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/utils/HttpUtils.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/HttpUtils.scala
similarity index 95%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/utils/HttpUtils.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/HttpUtils.scala
index 20a72518635..03abe071f1f 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/utils/HttpUtils.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/HttpUtils.scala
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.utils
+package org.apache.pinot.connector.spark.common
 
 import java.net.URI
 
@@ -24,7 +24,6 @@ import org.apache.http.client.config.RequestConfig
 import org.apache.http.client.methods.{HttpUriRequest, RequestBuilder}
 import org.apache.http.impl.client.HttpClients
 import org.apache.http.util.EntityUtils
-import org.apache.pinot.connector.spark.exceptions.HttpStatusCodeException
 
 /**
  * Helper Http methods to get metadata information from Pinot controller/broker.
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/utils/Logging.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/Logging.scala
similarity index 97%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/utils/Logging.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/Logging.scala
index 2bc6a096ab5..15f6001960d 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/utils/Logging.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/Logging.scala
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.utils
+package org.apache.pinot.connector.spark.common
 
 import org.slf4j.{Logger, LoggerFactory}
 
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotClusterClient.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/PinotClusterClient.scala
similarity index 88%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotClusterClient.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/PinotClusterClient.scala
index b7642e1df8c..1c5dafe2a5b 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotClusterClient.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/PinotClusterClient.scala
@@ -16,15 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.common
 
 import java.net.{URI, URLEncoder}
 import io.circe.Decoder
 import io.circe.generic.auto._
-import org.apache.pinot.connector.spark.connector.query.GeneratedSQLs
-import org.apache.pinot.connector.spark.decodeTo
-import org.apache.pinot.connector.spark.exceptions.{HttpStatusCodeException, PinotException}
-import org.apache.pinot.connector.spark.utils.{HttpUtils, Logging}
+import org.apache.pinot.connector.spark.common.query.ScanQuery
 import org.apache.pinot.spi.config.table.TableType
 import org.apache.pinot.spi.data.Schema
 import org.apache.pinot.spi.utils.builder.TableNameBuilder
@@ -32,7 +29,7 @@ import org.apache.pinot.spi.utils.builder.TableNameBuilder
 import scala.util.{Failure, Success, Try}
 
 /**
- * Client that read/write/prepare required data from/to Pinot.
+ * PinotCusterClient reads metadata from Pinot controller.
  */
 private[pinot] object PinotClusterClient extends Logging {
   private val TABLE_SCHEMA_TEMPLATE = "http://%s/tables/%s/schema"
@@ -144,24 +141,23 @@ private[pinot] object PinotClusterClient extends Logging {
    *
    * @return realtime and/or offline routing table(s)
    */
-  def getRoutingTable(
-      brokerUrl: String,
-      generatedSQLs: GeneratedSQLs): Map[TableType, Map[String, List[String]]] = {
+  def getRoutingTable(brokerUrl: String,
+                      scanQuery: ScanQuery): Map[TableType, Map[String, List[String]]] = {
     val routingTables =
-      if (generatedSQLs.isTableOffline) {
+      if (scanQuery.isTableOffline) {
         val offlineRoutingTable =
-          getRoutingTableForQuery(brokerUrl, generatedSQLs.offlineSelectQuery)
+          getRoutingTableForQuery(brokerUrl, scanQuery.offlineSelectQuery)
         Map(TableType.OFFLINE -> offlineRoutingTable)
-      } else if (generatedSQLs.isTableRealtime) {
+      } else if (scanQuery.isTableRealtime) {
         val realtimeRoutingTable =
-          getRoutingTableForQuery(brokerUrl, generatedSQLs.realtimeSelectQuery)
+          getRoutingTableForQuery(brokerUrl, scanQuery.realtimeSelectQuery)
         Map(TableType.REALTIME -> realtimeRoutingTable)
       } else {
         // hybrid table
         val offlineRoutingTable =
-          getRoutingTableForQuery(brokerUrl, generatedSQLs.offlineSelectQuery)
+          getRoutingTableForQuery(brokerUrl, scanQuery.offlineSelectQuery)
         val realtimeRoutingTable =
-          getRoutingTableForQuery(brokerUrl, generatedSQLs.realtimeSelectQuery)
+          getRoutingTableForQuery(brokerUrl, scanQuery.realtimeSelectQuery)
         Map(
           TableType.OFFLINE -> offlineRoutingTable,
           TableType.REALTIME -> realtimeRoutingTable
@@ -217,9 +213,9 @@ private[pinot] object PinotClusterClient extends Logging {
 
 private[pinot] case class TimeBoundaryInfo(timeColumn: String, timeValue: String) {
 
-  def getOfflinePredicate: String = s"$timeColumn < $timeValue"
+  def getOfflinePredicate: String = s""""$timeColumn" < $timeValue"""
 
-  def getRealtimePredicate: String = s"$timeColumn >= $timeValue"
+  def getRealtimePredicate: String = s""""$timeColumn" >= $timeValue"""
 }
 
 private[pinot] case class InstanceInfo(instanceName: String,
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReadOptions.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/PinotDataSourceReadOptions.scala
similarity index 64%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReadOptions.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/PinotDataSourceReadOptions.scala
index 1aa643f99ae..271cb5d7cfb 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReadOptions.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/PinotDataSourceReadOptions.scala
@@ -16,13 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.datasource
+package org.apache.pinot.connector.spark.common
+
+import java.util
 
-import org.apache.pinot.connector.spark.connector.PinotClusterClient
-import org.apache.pinot.connector.spark.exceptions.PinotException
-import org.apache.pinot.connector.spark.scalafyOptional
 import org.apache.pinot.spi.config.table.TableType
-import org.apache.spark.sql.sources.v2.DataSourceOptions
 
 import scala.util.Random
 
@@ -30,6 +28,7 @@ import scala.util.Random
  * To create serializable datasource reader options from spark datasource options.
  */
 object PinotDataSourceReadOptions {
+  val CONFIG_TABLE_NAME = "table"
   val CONFIG_TABLE_TYPE = "tableType"
   val CONFIG_CONTROLLER = "controller"
   val CONFIG_BROKER = "broker"
@@ -37,6 +36,8 @@ object PinotDataSourceReadOptions {
   val CONFIG_SEGMENTS_PER_SPLIT = "segmentsPerSplit"
   val CONFIG_PINOT_SERVER_TIMEOUT_MS = "pinotServerTimeoutMs"
   var CONFIG_USE_GRPC_SERVER = "useGrpcServer"
+  val CONFIG_QUERY_OPTIONS = "queryOptions"
+  val QUERY_OPTIONS_DELIMITER = ","
   private[pinot] val DEFAULT_CONTROLLER: String = "localhost:9000"
   private[pinot] val DEFAULT_USE_PUSH_DOWN_FILTERS: Boolean = true
   private[pinot] val DEFAULT_SEGMENTS_PER_SPLIT: Int = 3
@@ -45,31 +46,37 @@ object PinotDataSourceReadOptions {
 
   private[pinot] val tableTypes = Seq("OFFLINE", "REALTIME", "HYBRID")
 
-  private[pinot] def from(options: DataSourceOptions): PinotDataSourceReadOptions = {
-    // tableName option
-    if (!options.tableName().isPresent) {
+  private[pinot] def from(optionsMap: util.Map[String, String]): PinotDataSourceReadOptions = {
+    this.from(new CaseInsensitiveStringMap(optionsMap))
+  }
+
+  private[pinot] def from(options: CaseInsensitiveStringMap): PinotDataSourceReadOptions = {
+    if (!options.containsKey(CONFIG_TABLE_NAME)) {
       throw new IllegalStateException(
         "Table name must be specified. eg: tbl_OFFLINE, tbl_REALTIME or tbl"
       )
     }
-    val tableName = options.tableName().get()
-    // tableType option
-    val tableType = scalafyOptional(options.get(CONFIG_TABLE_TYPE))
-      .map(_.toUpperCase)
-      .map { inputTableType =>
-        if (tableTypes.contains(inputTableType)) {
-          if (inputTableType == "HYBRID") None
-          else Some(TableType.valueOf(inputTableType))
-        } else {
-          throw PinotException(s"Unknown `tableType`: $inputTableType")
-        }
-      }
-      .getOrElse { throw PinotException("`tableType` should be specified") }
+    if (!options.containsKey(CONFIG_TABLE_TYPE)) {
+      throw PinotException("`tableType` should be specified")
+    }
+
+    val tableName = options.get(CONFIG_TABLE_NAME)
+    val tableTypeInput = options.get(CONFIG_TABLE_TYPE).toUpperCase()
+    val tableType = tableTypeInput match {
+      case "REALTIME" => Some(TableType.REALTIME)
+      case "OFFLINE" => Some(TableType.OFFLINE)
+      case "HYBRID" => None
+      case _ =>
+        throw PinotException(s"Unknown `tableType`: $tableTypeInput")
+    }
+
     // pinot cluster options
-    val controller = scalafyOptional(options.get(CONFIG_CONTROLLER)).getOrElse(DEFAULT_CONTROLLER)
-    val broker = scalafyOptional(options.get(PinotDataSourceReadOptions.CONFIG_BROKER)).getOrElse {
-      val brokerInstances = PinotClusterClient.getBrokerInstances(controller, tableName)
-      Random.shuffle(brokerInstances).head
+    val controller = options.getOrDefault(CONFIG_CONTROLLER, DEFAULT_CONTROLLER)
+    val broker = options.get(PinotDataSourceReadOptions.CONFIG_BROKER) match {
+      case s if s == null || s.isEmpty =>
+        val brokerInstances = PinotClusterClient.getBrokerInstances(controller, tableName)
+        Random.shuffle(brokerInstances).head
+      case s => s
     }
     // connector related options
     val usePushDownFilters =
@@ -78,6 +85,8 @@ object PinotDataSourceReadOptions {
     val pinotServerTimeoutMs =
       options.getLong(CONFIG_PINOT_SERVER_TIMEOUT_MS, DEFAULT_PINOT_SERVER_TIMEOUT_MS)
     val useGrpcServer = options.getBoolean(CONFIG_USE_GRPC_SERVER, DEFAULT_USE_GRPC_SERVER)
+    val queryOptions = options.getOrDefault(CONFIG_QUERY_OPTIONS, "")
+      .split(QUERY_OPTIONS_DELIMITER).filter(_.nonEmpty).toSet
 
     PinotDataSourceReadOptions(
       tableName,
@@ -87,7 +96,8 @@ object PinotDataSourceReadOptions {
       usePushDownFilters,
       segmentsPerSplit,
       pinotServerTimeoutMs,
-      useGrpcServer
+      useGrpcServer,
+      queryOptions
     )
   }
 }
@@ -101,4 +111,6 @@ private[pinot] case class PinotDataSourceReadOptions(
     usePushDownFilters: Boolean,
     segmentsPerSplit: Int,
     pinotServerTimeoutMs: Long,
-    useGrpcServer: Boolean)
+    useGrpcServer: Boolean,
+    queryOptions: Set[String])
+
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/exceptions/exceptions.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/exceptions.scala
similarity index 95%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/exceptions/exceptions.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/exceptions.scala
index 91ac44a4f26..d4b7e9ee051 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/exceptions/exceptions.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/exceptions.scala
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.exceptions
+package org.apache.pinot.connector.spark.common
 
 private[pinot] case class HttpStatusCodeException(message: String, statusCode: Int)
   extends Exception(message) {
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/package.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/package.scala
similarity index 95%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/package.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/package.scala
index 46ef45dcac4..0c3fecb80dd 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/package.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/package.scala
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector
+package org.apache.pinot.connector.spark
 
 import java.util.Optional
 
 import io.circe.{Decoder, parser}
 
-package object spark {
+package object common {
 
   /** Parse json string to given model. */
   def decodeTo[A: Decoder](jsonString: String): A = {
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotSplitter.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/partition/PinotSplitter.scala
similarity index 86%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotSplitter.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/partition/PinotSplitter.scala
index 1445b3c7672..5b8b392c738 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotSplitter.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/partition/PinotSplitter.scala
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.common.partition
 
-import org.apache.pinot.connector.spark.connector.query.GeneratedSQLs
-import org.apache.pinot.connector.spark.datasource.PinotDataSourceReadOptions
-import org.apache.pinot.connector.spark.utils.Logging
+import org.apache.pinot.connector.spark.common.query.ScanQuery
+import org.apache.pinot.connector.spark.common.{InstanceInfo, Logging, PinotDataSourceReadOptions}
 import org.apache.pinot.spi.config.table.TableType
 
 /**
@@ -36,7 +35,7 @@ import org.apache.pinot.spi.config.table.TableType
  *    - offline ->
  *          - offlineServer10 -> (segment10, segment20)
  *
- *  If `segmentsPerSplit` is equal to 1, total 6 spark partition will be created like below,
+ * If `segmentsPerSplit` is equal to 1, total 6 spark partition will be created like below,
  *    - partition1: realtimeServer1 -> segment1
  *    - partition2: realtimeServer1 -> segment2
  *    - partition3: realtimeServer1 -> segment3
@@ -47,7 +46,7 @@ import org.apache.pinot.spi.config.table.TableType
 private[pinot] object PinotSplitter extends Logging {
 
   def generatePinotSplits(
-      generatedSQLs: GeneratedSQLs,
+      query: ScanQuery,
       routingTable: Map[TableType, Map[String, List[String]]],
       instanceInfoReader: String => InstanceInfo,
       readParameters: PinotDataSourceReadOptions): List[PinotSplit] = {
@@ -59,7 +58,7 @@ private[pinot] object PinotSplitter extends Logging {
             case (instanceInfo, segments) =>
               createPinotSplitsFromSubSplits(
                 tableType,
-                generatedSQLs,
+                query,
                 instanceInfo,
                 segments,
                 readParameters.segmentsPerSplit)
@@ -69,7 +68,7 @@ private[pinot] object PinotSplitter extends Logging {
 
   private def createPinotSplitsFromSubSplits(
       tableType: TableType,
-      generatedSQLs: GeneratedSQLs,
+      query: ScanQuery,
       instanceInfo: InstanceInfo,
       segments: List[String],
       segmentsPerSplit: Int): Iterator[PinotSplit] = {
@@ -82,13 +81,13 @@ private[pinot] object PinotSplitter extends Logging {
           subSegments,
           tableType)
       }
-      PinotSplit(generatedSQLs, serverAndSegments)
+      PinotSplit(query, serverAndSegments)
     }
   }
 }
 
 private[pinot] case class PinotSplit(
-    generatedSQLs: GeneratedSQLs,
+    query: ScanQuery,
     serverAndSegments: PinotServerAndSegments)
 
 private[pinot] case class PinotServerAndSegments(
@@ -97,5 +96,6 @@ private[pinot] case class PinotServerAndSegments(
     serverGrpcPort: Int,
     segments: List[String],
     serverType: TableType) {
+
   override def toString: String = s"$serverHost:$serverPort($serverType)"
 }
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/query/GeneratedSQLs.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/query/ScanQuery.scala
similarity index 92%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/query/GeneratedSQLs.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/query/ScanQuery.scala
index b7e7823a92a..008e6777850 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/query/GeneratedSQLs.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/query/ScanQuery.scala
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector.query
+package org.apache.pinot.connector.spark.common.query
 
 import org.apache.pinot.spi.config.table.TableType
 
-private[pinot] case class GeneratedSQLs(
+private[pinot] case class ScanQuery(
     rawTableName: String,
     tableType: Option[TableType],
     offlineSelectQuery: String,
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/query/SQLSelectionQueryGenerator.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/query/ScanQueryGenerator.scala
similarity index 74%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/query/SQLSelectionQueryGenerator.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/query/ScanQueryGenerator.scala
index 513951cd6f8..e6c1afb9c89 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/query/SQLSelectionQueryGenerator.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/query/ScanQueryGenerator.scala
@@ -16,27 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector.query
+package org.apache.pinot.connector.spark.common.query
 
-import org.apache.pinot.connector.spark.connector.{PinotUtils, TimeBoundaryInfo}
+import org.apache.pinot.connector.spark.common.TimeBoundaryInfo
 import org.apache.pinot.spi.config.table.TableType
-import org.apache.pinot.spi.utils.builder.TableNameBuilder
 
 /**
  * Generate realtime and offline SQL queries for specified table with given columns and filters.
  */
-private[pinot] class SQLSelectionQueryGenerator(
+private[pinot] class ScanQueryGenerator(
     tableName: String,
     tableType: Option[TableType],
     timeBoundaryInfo: Option[TimeBoundaryInfo],
     columns: Array[String],
-    whereClause: Option[String]) {
+    whereClause: Option[String],
+    queryOptions: Set[String]) {
   private val columnsExpression = columnsAsExpression()
 
-  def generateSQLs(): GeneratedSQLs = {
+  def generateSQLs(): ScanQuery = {
     val offlineSelectQuery = buildSelectQuery(TableType.OFFLINE)
     val realtimeSelectQuery = buildSelectQuery(TableType.REALTIME)
-    GeneratedSQLs(
+    ScanQuery(
       tableName,
       tableType,
       offlineSelectQuery,
@@ -46,7 +46,11 @@ private[pinot] class SQLSelectionQueryGenerator(
 
   /** Get all columns if selecting columns empty(eg: resultDataFrame.count()) */
   private def columnsAsExpression(): String = {
-    if (columns.isEmpty) "*" else columns.mkString(",")
+    if (columns.isEmpty) "*" else columns.map(escapeCol).mkString(",")
+  }
+
+  private def escapeCol(col: String): String = {
+      if (col.contains("\"")) col else s""""$col""""
   }
 
   /** Build realtime or offline SQL selection query. */
@@ -57,7 +61,11 @@ private[pinot] class SQLSelectionQueryGenerator(
     }
 
     val tableNameWithType = s"${tableName}_${tableType.toString}"
-    val queryBuilder = new StringBuilder(s"SELECT $columnsExpression FROM $tableNameWithType")
+    val queryBuilder = new StringBuilder()
+
+    // add Query Options and SELECT clause
+    queryOptions.foreach(opt => queryBuilder.append(s"SET $opt;"))
+    queryBuilder.append(s"SELECT $columnsExpression FROM $tableNameWithType")
 
     // add where clause if exists
     whereClause.foreach(c => queryBuilder.append(s" WHERE $c"))
@@ -79,16 +87,15 @@ private[pinot] class SQLSelectionQueryGenerator(
 
 }
 
-private[pinot] object SQLSelectionQueryGenerator {
-
+private[pinot] object ScanQueryGenerator {
   def generate(
       tableName: String,
       tableType: Option[TableType],
       timeBoundaryInfo: Option[TimeBoundaryInfo],
       columns: Array[String],
-      whereClause: Option[String]): GeneratedSQLs = {
-    new SQLSelectionQueryGenerator(tableName, tableType, timeBoundaryInfo, columns, whereClause)
+      whereClause: Option[String],
+      queryOptions: Set[String]): ScanQuery = {
+    new ScanQueryGenerator(tableName, tableType, timeBoundaryInfo, columns, whereClause, queryOptions)
       .generateSQLs()
   }
-
 }
diff --git a/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotAbstractPartitionReader.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotAbstractPartitionReader.scala
new file mode 100644
index 00000000000..c321edadb17
--- /dev/null
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotAbstractPartitionReader.scala
@@ -0,0 +1,72 @@
+/**
+ * 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.pinot.connector.spark.common.reader
+
+import org.apache.pinot.common.datatable.DataTable
+import org.apache.pinot.connector.spark.common.PinotDataSourceReadOptions
+import org.apache.pinot.connector.spark.common.partition.PinotSplit
+
+import java.io.Closeable
+
+/**
+ * Abstract partition reader is designed to be shared between two concrete reader implementations
+ * for Spark2 and Spark3 connectors.
+ *
+ * @tparam RowType
+ */
+trait PinotAbstractPartitionReader[RowType] {
+  def _partitionId: Int
+  def _pinotSplit: PinotSplit
+  def _dataSourceOptions: PinotDataSourceReadOptions
+  def _translator: (DataTable) => Seq[RowType]
+
+  private val (responseIterator: Iterator[RowType], source: Closeable) = getIteratorAndSource()
+  private[this] var currentRow: RowType = _
+
+  def next(): Boolean = {
+    if (!responseIterator.hasNext) {
+      return false
+    }
+    currentRow = responseIterator.next()
+    true
+  }
+
+  def get(): RowType = {
+    currentRow
+  }
+
+  def close(): Unit = {
+    source.close()
+  }
+
+  private def getIteratorAndSource(): (Iterator[RowType], Closeable) = {
+    if (_dataSourceOptions.useGrpcServer) {
+      val dataFetcher = PinotGrpcServerDataFetcher(_pinotSplit)
+      val iterable = dataFetcher.fetchData()
+        .flatMap(_translator)
+      (iterable, dataFetcher)
+    } else {
+      (PinotServerDataFetcher(_partitionId, _pinotSplit, _dataSourceOptions)
+        .fetchData()
+        .flatMap(_translator)
+        .toIterator,
+        () => {})
+    }
+  }
+}
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotGrpcServerDataFetcher.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotGrpcServerDataFetcher.scala
similarity index 80%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotGrpcServerDataFetcher.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotGrpcServerDataFetcher.scala
index f543b5b7c99..ecd7b5e0ec3 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotGrpcServerDataFetcher.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotGrpcServerDataFetcher.scala
@@ -16,23 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.common.reader
 
 import io.grpc.ManagedChannelBuilder
 import org.apache.pinot.common.datatable.{DataTable, DataTableFactory}
 import org.apache.pinot.common.proto.PinotQueryServerGrpc
 import org.apache.pinot.common.proto.Server.ServerRequest
-import org.apache.pinot.connector.spark.utils.Logging
+import org.apache.pinot.connector.spark.common.Logging
+import org.apache.pinot.connector.spark.common.partition.PinotSplit
 import org.apache.pinot.spi.config.table.TableType
 
+import java.io.Closeable
 import scala.collection.JavaConverters._
 
 /**
- * Data fetcher from Pinot Grpc server with specific segments.
+ * Data fetcher from Pinot Grpc server for specific segments.
  * Eg: offline-server1: segment1, segment2, segment3
  */
-private[pinot] class PinotGrpcServerDataFetcher(pinotSplit: PinotSplit)
-  extends Logging {
+private[reader] class PinotGrpcServerDataFetcher(pinotSplit: PinotSplit)
+  extends Logging with Closeable {
 
   private val channel = ManagedChannelBuilder
     .forAddress(pinotSplit.serverAndSegments.serverHost, pinotSplit.serverAndSegments.serverGrpcPort)
@@ -41,35 +43,37 @@ private[pinot] class PinotGrpcServerDataFetcher(pinotSplit: PinotSplit)
     .asInstanceOf[ManagedChannelBuilder[_]].build()
   private val pinotServerBlockingStub = PinotQueryServerGrpc.newBlockingStub(channel)
 
-  def fetchData(): List[DataTable] = {
-    val requestStartTime = System.nanoTime()
+  def fetchData(): Iterator[DataTable] = {
     val request = ServerRequest.newBuilder()
       .putMetadata("enableStreaming", "true")
       .addAllSegments(pinotSplit.serverAndSegments.segments.asJava)
       .setSql(
         pinotSplit.serverAndSegments.serverType match {
           case TableType.OFFLINE =>
-            pinotSplit.generatedSQLs.offlineSelectQuery
+            pinotSplit.query.offlineSelectQuery
           case TableType.REALTIME =>
-            pinotSplit.generatedSQLs.realtimeSelectQuery
+            pinotSplit.query.realtimeSelectQuery
         }
       )
       .build()
     val serverResponse = pinotServerBlockingStub.submit(request)
-    logInfo(s"Pinot server total response time in millis: ${System.nanoTime() - requestStartTime}")
-
     try {
       val dataTables = for {
-        serverResponse <- serverResponse.asScala.toList
+        serverResponse <- serverResponse.asScala
         if serverResponse.getMetadataMap.get("responseType") == "data"
       } yield DataTableFactory.getDataTable(serverResponse.getPayload.toByteArray)
 
       dataTables.filter(_.getNumberOfRows > 0)
+
     } catch {
       case e: io.grpc.StatusRuntimeException =>
         logError(s"Caught exception when reading data from ${pinotSplit.serverAndSegments.serverHost}:${pinotSplit.serverAndSegments.serverGrpcPort}: ${e}")
         throw e
-    } finally {
+    }
+  }
+
+  def close(): Unit = {
+    if (!channel.isShutdown) {
       channel.shutdown()
       logInfo("Pinot server connection closed")
     }
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotServerDataFetcher.scala b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotServerDataFetcher.scala
similarity index 89%
rename from pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotServerDataFetcher.scala
rename to pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotServerDataFetcher.scala
index 81bb405d5ef..e6d88755c5f 100644
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/connector/PinotServerDataFetcher.scala
+++ b/pinot-connectors/pinot-spark-common/src/main/scala/org/apache/pinot/connector/spark/common/reader/PinotServerDataFetcher.scala
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.common.reader
 
 import org.apache.helix.model.InstanceConfig
 import org.apache.pinot.common.datatable.DataTable
 import org.apache.pinot.common.metrics.BrokerMetrics
 import org.apache.pinot.common.request.BrokerRequest
-import org.apache.pinot.connector.spark.datasource.PinotDataSourceReadOptions
-import org.apache.pinot.connector.spark.exceptions.PinotException
-import org.apache.pinot.connector.spark.utils.Logging
+import org.apache.pinot.connector.spark.common.partition.PinotSplit
+import org.apache.pinot.connector.spark.common.{Logging, PinotDataSourceReadOptions, PinotException}
 import org.apache.pinot.core.transport.server.routing.stats.ServerRoutingStatsManager
 import org.apache.pinot.core.transport.{AsyncQueryResponse, QueryRouter, ServerInstance}
 import org.apache.pinot.spi.config.table.TableType
@@ -39,7 +38,7 @@ import scala.collection.JavaConverters._
  * Actual data fetcher from Pinot server with specific segments.
  * Eg: offline-server1: segment1, segment2, segment3
  */
-private[pinot] class PinotServerDataFetcher(
+private[reader] class PinotServerDataFetcher(
     partitionId: Int,
     pinotSplit: PinotSplit,
     dataSourceOptions: PinotDataSourceReadOptions)
@@ -59,11 +58,11 @@ private[pinot] class PinotServerDataFetcher(
     val pinotServerAsyncQueryResponse = pinotSplit.serverAndSegments.serverType match {
       case TableType.REALTIME =>
         val realtimeBrokerRequest =
-          CalciteSqlCompiler.compileToBrokerRequest(pinotSplit.generatedSQLs.realtimeSelectQuery)
+          CalciteSqlCompiler.compileToBrokerRequest(pinotSplit.query.realtimeSelectQuery)
         submitRequestToPinotServer(null, null, realtimeBrokerRequest, routingTableForRequest)
       case TableType.OFFLINE =>
         val offlineBrokerRequest =
-          CalciteSqlCompiler.compileToBrokerRequest(pinotSplit.generatedSQLs.offlineSelectQuery)
+          CalciteSqlCompiler.compileToBrokerRequest(pinotSplit.query.offlineSelectQuery)
         submitRequestToPinotServer(offlineBrokerRequest, routingTableForRequest, null, null)
     }
 
@@ -110,10 +109,10 @@ private[pinot] class PinotServerDataFetcher(
       offlineRoutingTable: JMap[ServerInstance, JList[String]],
       realtimeBrokerRequest: BrokerRequest,
       realtimeRoutingTable: JMap[ServerInstance, JList[String]]): AsyncQueryResponse = {
-    logInfo(s"Request is sending to the ${pinotSplit.serverAndSegments.toString}")
+    logInfo(s"Sending request to ${pinotSplit.serverAndSegments.toString}")
     queryRouter.submitQuery(
       partitionId,
-      pinotSplit.generatedSQLs.rawTableName,
+      pinotSplit.query.rawTableName,
       offlineBrokerRequest,
       offlineRoutingTable,
       realtimeBrokerRequest,
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/resources/log4j2.xml b/pinot-connectors/pinot-spark-common/src/test/resources/log4j2.xml
similarity index 100%
rename from pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/resources/log4j2.xml
rename to pinot-connectors/pinot-spark-common/src/test/resources/log4j2.xml
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/BaseTest.scala b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/BaseTest.scala
similarity index 95%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/BaseTest.scala
rename to pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/BaseTest.scala
index f06ed45ecb4..e110c00954b 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/BaseTest.scala
+++ b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/BaseTest.scala
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark
+package org.apache.pinot.connector.spark.common
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReadOptionsTest.scala b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotDataSourceReadOptionsTest.scala
similarity index 80%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReadOptionsTest.scala
rename to pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotDataSourceReadOptionsTest.scala
index f395e0c5430..7c08351557b 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/datasource/PinotDataSourceReadOptionsTest.scala
+++ b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotDataSourceReadOptionsTest.scala
@@ -16,11 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.datasource
-
-import org.apache.pinot.connector.spark.{BaseTest, datasource}
-import org.apache.pinot.connector.spark.exceptions.PinotException
-import org.apache.spark.sql.sources.v2.DataSourceOptions
+package org.apache.pinot.connector.spark.common
 
 import scala.collection.JavaConverters._
 
@@ -31,17 +27,17 @@ class PinotDataSourceReadOptionsTest extends BaseTest {
 
   test("Spark DataSourceOptions should be converted to the PinotDataSourceReadOptions") {
     val options = Map(
-      DataSourceOptions.TABLE_KEY -> "tbl",
+      PinotDataSourceReadOptions.CONFIG_TABLE_NAME -> "tbl",
       PinotDataSourceReadOptions.CONFIG_TABLE_TYPE -> "hybrid",
       PinotDataSourceReadOptions.CONFIG_CONTROLLER -> "localhost:9000",
       PinotDataSourceReadOptions.CONFIG_BROKER -> "localhost:8000",
       PinotDataSourceReadOptions.CONFIG_SEGMENTS_PER_SPLIT -> "1",
       PinotDataSourceReadOptions.CONFIG_USE_PUSH_DOWN_FILTERS -> "false",
       PinotDataSourceReadOptions.CONFIG_USE_GRPC_SERVER -> "false",
+      PinotDataSourceReadOptions.CONFIG_QUERY_OPTIONS -> "a=1,b=2"
     )
 
-    val datasourceOptions = new DataSourceOptions(options.asJava)
-    val pinotDataSourceReadOptions = PinotDataSourceReadOptions.from(datasourceOptions)
+    val pinotDataSourceReadOptions = PinotDataSourceReadOptions.from(options.asJava)
 
     val expected =
       PinotDataSourceReadOptions(
@@ -52,7 +48,8 @@ class PinotDataSourceReadOptionsTest extends BaseTest {
         false,
         1,
         10000,
-        false
+        false,
+        Set("a=1", "b=2")
       )
 
     pinotDataSourceReadOptions shouldEqual expected
@@ -61,25 +58,25 @@ class PinotDataSourceReadOptionsTest extends BaseTest {
   test("Method should throw exception if `tableType` option is missing or wrong") {
     // missing
     val missingOption = Map(
-      DataSourceOptions.TABLE_KEY -> "tbl",
+      PinotDataSourceReadOptions.CONFIG_TABLE_NAME -> "tbl",
       PinotDataSourceReadOptions.CONFIG_CONTROLLER -> "localhost:9000",
       PinotDataSourceReadOptions.CONFIG_BROKER -> "localhost:8000"
     )
 
     // wrong input
     val wrongOption = Map(
-      DataSourceOptions.TABLE_KEY -> "tbl",
+      PinotDataSourceReadOptions.CONFIG_TABLE_NAME -> "tbl",
       PinotDataSourceReadOptions.CONFIG_TABLE_TYPE -> "offlinee",
       PinotDataSourceReadOptions.CONFIG_CONTROLLER -> "localhost:9000",
       PinotDataSourceReadOptions.CONFIG_BROKER -> "localhost:8000"
     )
 
     val missingException = intercept[PinotException] {
-      PinotDataSourceReadOptions.from(new DataSourceOptions(missingOption.asJava))
+      PinotDataSourceReadOptions.from(missingOption.asJava)
     }
 
     val wrongException = intercept[PinotException] {
-      PinotDataSourceReadOptions.from(new DataSourceOptions(wrongOption.asJava))
+      PinotDataSourceReadOptions.from(wrongOption.asJava)
     }
 
     missingException.getMessage shouldEqual "`tableType` should be specified"
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/PinotSplitterTest.scala b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotSplitterTest.scala
similarity index 80%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/PinotSplitterTest.scala
rename to pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotSplitterTest.scala
index 43ca40cd23c..9b5a057c7ae 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/PinotSplitterTest.scala
+++ b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotSplitterTest.scala
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector
+package org.apache.pinot.connector.spark.common
 
-import org.apache.pinot.connector.spark.BaseTest
-import org.apache.pinot.connector.spark.connector.query.GeneratedSQLs
-import org.apache.pinot.connector.spark.datasource.PinotDataSourceReadOptions
+import org.apache.pinot.connector.spark.common.partition.{PinotServerAndSegments, PinotSplit, PinotSplitter}
+import org.apache.pinot.connector.spark.common.query.ScanQuery
 import org.apache.pinot.spi.config.table.TableType
+
 import java.util.regex.Pattern
 
 /**
  * Test num of Spark partitions by routing table and input configs.
  */
 class PinotSplitterTest extends BaseTest {
-  private val generatedSql = GeneratedSQLs("tbl", None, "", "")
+  private val query = ScanQuery("tbl", None, "", "")
   private val mockInstanceInfoReader = (server: String) => {
     val matcher = Pattern.compile("Server_(.*)_(\\d+)").matcher(server)
     matcher.matches()
@@ -56,13 +56,14 @@ class PinotSplitterTest extends BaseTest {
       false,
       segmentsPerSplit,
       1000,
-      false)
+      false,
+      Set())
   }
 
   test("Total 5 partition splits should be created for maxNumSegmentPerServerRequest = 3") {
     val readOptions = getReadOptionsWithSegmentsPerSplit(3)
     val splitResults =
-      PinotSplitter.generatePinotSplits(generatedSql, routingTable, mockInstanceInfoReader, readOptions)
+      PinotSplitter.generatePinotSplits(query, routingTable, mockInstanceInfoReader, readOptions)
 
     splitResults.size shouldEqual 5
   }
@@ -70,7 +71,7 @@ class PinotSplitterTest extends BaseTest {
   test("Total 5 partition splits should be created for maxNumSegmentPerServerRequest = 90") {
     val readOptions = getReadOptionsWithSegmentsPerSplit(90)
     val splitResults =
-      PinotSplitter.generatePinotSplits(generatedSql, routingTable, mockInstanceInfoReader, readOptions)
+      PinotSplitter.generatePinotSplits(query, routingTable, mockInstanceInfoReader, readOptions)
 
     splitResults.size shouldEqual 5
   }
@@ -78,7 +79,7 @@ class PinotSplitterTest extends BaseTest {
   test("Total 10 partition splits should be created for maxNumSegmentPerServerRequest = 1") {
     val readOptions = getReadOptionsWithSegmentsPerSplit(1)
     val splitResults =
-      PinotSplitter.generatePinotSplits(generatedSql, routingTable, mockInstanceInfoReader, readOptions)
+      PinotSplitter.generatePinotSplits(query, routingTable, mockInstanceInfoReader, readOptions)
 
     splitResults.size shouldEqual 10
   }
@@ -89,10 +90,10 @@ class PinotSplitterTest extends BaseTest {
     )
     val readOptions = getReadOptionsWithSegmentsPerSplit(5)
 
-    val splitResults = PinotSplitter.generatePinotSplits(generatedSql, inputRoutingTable, mockInstanceInfoReader, readOptions)
+    val splitResults = PinotSplitter.generatePinotSplits(query, inputRoutingTable, mockInstanceInfoReader, readOptions)
     val expectedOutput = List(
       PinotSplit(
-        generatedSql,
+        query,
         PinotServerAndSegments("192.168.1.100", "9000", -1, List("segment1"), TableType.REALTIME)
       )
     )
@@ -112,17 +113,18 @@ class PinotSplitterTest extends BaseTest {
       false,
       1,
       1000,
-      true)
+      true,
+      Set())
 
     val inputGrpcPortReader = (server: String) => {
       InstanceInfo(server, "192.168.1.100", "9000", 8090)
     }
 
     val splitResults =
-      PinotSplitter.generatePinotSplits(generatedSql, inputRoutingTable, inputGrpcPortReader, inputReadOptions)
+      PinotSplitter.generatePinotSplits(query, inputRoutingTable, inputGrpcPortReader, inputReadOptions)
     val expectedOutput = List(
       PinotSplit(
-        generatedSql,
+        query,
         PinotServerAndSegments("192.168.1.100", "9000", 8090, List("segment1"), TableType.REALTIME)
       )
     )
diff --git a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/query/SQLSelectionQueryGeneratorTest.scala b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/query/ScanQueryGeneratorTest.scala
similarity index 55%
rename from pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/query/SQLSelectionQueryGeneratorTest.scala
rename to pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/query/ScanQueryGeneratorTest.scala
index 608d18e3f80..73fc9d85848 100644
--- a/pinot-connectors/pinot-spark-connector/src/test/scala/org/apache/pinot/connector/spark/connector/query/SQLSelectionQueryGeneratorTest.scala
+++ b/pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/query/ScanQueryGeneratorTest.scala
@@ -16,29 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.connector.spark.connector.query
+package org.apache.pinot.connector.spark.common.query
 
-import org.apache.pinot.connector.spark.BaseTest
-import org.apache.pinot.connector.spark.connector.TimeBoundaryInfo
+import org.apache.pinot.connector.spark.common.{BaseTest, TimeBoundaryInfo}
 import org.apache.pinot.spi.config.table.TableType
 
 /**
  * Test SQL query generation from spark push down filters, selection columns etc.
  */
-class SQLSelectionQueryGeneratorTest extends BaseTest {
-  private val columns = Array("c1, c2")
+class ScanQueryGeneratorTest extends BaseTest {
+  private val columns = Array("c1","c2")
   private val tableName = "tbl"
   private val tableType = Some(TableType.OFFLINE)
   private val whereClause = Some("c1 = 5 OR c2 = 'hello'")
-  private val limit = s"LIMIT ${Int.MaxValue}"
+  private val limit = s"""LIMIT ${Int.MaxValue}"""
 
   test("Queries should be created with given filters") {
     val pinotQueries =
-      SQLSelectionQueryGenerator.generate(tableName, tableType, None, columns, whereClause)
+      ScanQueryGenerator.generate(tableName, tableType, None, columns, whereClause, Set())
     val expectedRealtimeQuery =
-      s"SELECT c1, c2 FROM ${tableName}_REALTIME WHERE ${whereClause.get} $limit"
+      s"""SELECT "c1","c2" FROM ${tableName}_REALTIME WHERE ${whereClause.get} $limit"""
     val expectedOfflineQuery =
-      s"SELECT c1, c2 FROM ${tableName}_OFFLINE WHERE ${whereClause.get} $limit"
+      s"""SELECT "c1","c2" FROM ${tableName}_OFFLINE WHERE ${whereClause.get} $limit"""
 
     pinotQueries.realtimeSelectQuery shouldEqual expectedRealtimeQuery
     pinotQueries.offlineSelectQuery shouldEqual expectedOfflineQuery
@@ -46,15 +45,15 @@ class SQLSelectionQueryGeneratorTest extends BaseTest {
 
   test("Time boundary info should be added to existing where clause") {
     val timeBoundaryInfo = TimeBoundaryInfo("timeCol", "12345")
-    val pinotQueries = SQLSelectionQueryGenerator
-      .generate(tableName, tableType, Some(timeBoundaryInfo), columns, whereClause)
+    val pinotQueries = ScanQueryGenerator
+      .generate(tableName, tableType, Some(timeBoundaryInfo), columns, whereClause, Set())
 
-    val realtimeWhereClause = s"${whereClause.get} AND timeCol >= 12345"
-    val offlineWhereClause = s"${whereClause.get} AND timeCol < 12345"
+    val realtimeWhereClause = s"""${whereClause.get} AND "timeCol" >= 12345"""
+    val offlineWhereClause = s"""${whereClause.get} AND "timeCol" < 12345"""
     val expectedRealtimeQuery =
-      s"SELECT c1, c2 FROM ${tableName}_REALTIME WHERE $realtimeWhereClause $limit"
+      s"""SELECT "c1","c2" FROM ${tableName}_REALTIME WHERE $realtimeWhereClause $limit"""
     val expectedOfflineQuery =
-      s"SELECT c1, c2 FROM ${tableName}_OFFLINE WHERE $offlineWhereClause $limit"
+      s"""SELECT "c1","c2" FROM ${tableName}_OFFLINE WHERE $offlineWhereClause $limit"""
 
     pinotQueries.realtimeSelectQuery shouldEqual expectedRealtimeQuery
     pinotQueries.offlineSelectQuery shouldEqual expectedOfflineQuery
@@ -62,23 +61,23 @@ class SQLSelectionQueryGeneratorTest extends BaseTest {
 
   test("Time boundary info should be added to where clause") {
     val timeBoundaryInfo = TimeBoundaryInfo("timeCol", "12345")
-    val pinotQueries = SQLSelectionQueryGenerator
-      .generate(tableName, tableType, Some(timeBoundaryInfo), columns, None)
+    val pinotQueries = ScanQueryGenerator
+      .generate(tableName, tableType, Some(timeBoundaryInfo), columns, None, Set())
 
-    val realtimeWhereClause = s"timeCol >= 12345"
-    val offlineWhereClause = s"timeCol < 12345"
+    val realtimeWhereClause = s""""timeCol" >= 12345"""
+    val offlineWhereClause = s""""timeCol" < 12345"""
     val expectedRealtimeQuery =
-      s"SELECT c1, c2 FROM ${tableName}_REALTIME WHERE $realtimeWhereClause $limit"
+      s"""SELECT "c1","c2" FROM ${tableName}_REALTIME WHERE $realtimeWhereClause $limit"""
     val expectedOfflineQuery =
-      s"SELECT c1, c2 FROM ${tableName}_OFFLINE WHERE $offlineWhereClause $limit"
+      s"""SELECT "c1","c2" FROM ${tableName}_OFFLINE WHERE $offlineWhereClause $limit"""
 
     pinotQueries.realtimeSelectQuery shouldEqual expectedRealtimeQuery
     pinotQueries.offlineSelectQuery shouldEqual expectedOfflineQuery
   }
 
   test("Selection query should be created with '*' column expressions without filters") {
-    val pinotQueries = SQLSelectionQueryGenerator
-      .generate(tableName, tableType, None, Array.empty, None)
+    val pinotQueries = ScanQueryGenerator
+      .generate(tableName, tableType, None, Array.empty, None, Set())
 
     val expectedRealtimeQuery =
       s"SELECT * FROM ${tableName}_REALTIME $limit"
@@ -89,4 +88,18 @@ class SQLSelectionQueryGeneratorTest extends BaseTest {
     pinotQueries.offlineSelectQuery shouldEqual expectedOfflineQuery
   }
 
+  test("Query options should be added to the beginning of the query") {
+    val queryOptions = Set("enableNullHandling=true","skipUpsert=true")
+    val pinotQueries = ScanQueryGenerator
+      .generate(tableName, tableType, None, Array.empty, None, queryOptions)
+
+    val expectedRealtimeQuery =
+      s"SET enableNullHandling=true;SET skipUpsert=true;SELECT * FROM ${tableName}_REALTIME $limit"
+    val expectedOfflineQuery =
+      s"SET enableNullHandling=true;SET skipUpsert=true;SELECT * FROM ${tableName}_OFFLINE $limit"
+
+    pinotQueries.realtimeSelectQuery shouldEqual expectedRealtimeQuery
+    pinotQueries.offlineSelectQuery shouldEqual expectedOfflineQuery
+  }
+
 }
diff --git a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartitionReader.scala b/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartitionReader.scala
deleted file mode 100644
index de42b7a6cf8..00000000000
--- a/pinot-connectors/pinot-spark-connector/src/main/scala/org/apache/pinot/connector/spark/datasource/PinotInputPartitionReader.scala
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.connector.spark.datasource
-
-import org.apache.pinot.connector.spark.connector.{PinotGrpcServerDataFetcher, PinotServerDataFetcher, PinotSplit, PinotUtils}
-import org.apache.spark.sql.catalyst.InternalRow
-import org.apache.spark.sql.sources.v2.reader.InputPartitionReader
-import org.apache.spark.sql.types.StructType
-
-/**
- * Actual data reader on spark worker side.
- * Represents a spark partition, and is receive data from specified pinot server-segment list.
- */
-class PinotInputPartitionReader(
-    schema: StructType,
-    partitionId: Int,
-    pinotSplit: PinotSplit,
-    dataSourceOptions: PinotDataSourceReadOptions)
-  extends InputPartitionReader[InternalRow] {
-  private val responseIterator: Iterator[InternalRow] = fetchDataAndConvertToInternalRows()
-  private[this] var currentRow: InternalRow = _
-
-  override def next(): Boolean = {
-    if (!responseIterator.hasNext) {
-      return false
-    }
-    currentRow = responseIterator.next()
-    true
-  }
-
-  override def get(): InternalRow = {
-    currentRow
-  }
-
-  override def close(): Unit = {}
-
-  private def fetchDataAndConvertToInternalRows(): Iterator[InternalRow] = {
-    if (dataSourceOptions.useGrpcServer)
-      PinotGrpcServerDataFetcher(pinotSplit)
-        .fetchData()
-        .flatMap(PinotUtils.pinotDataTableToInternalRows(_, schema))
-        .toIterator
-    else
-      PinotServerDataFetcher(partitionId, pinotSplit, dataSourceOptions)
-        .fetchData()
-        .flatMap(PinotUtils.pinotDataTableToInternalRows(_, schema))
-        .toIterator
-  }
-}
diff --git a/pinot-connectors/pom.xml b/pinot-connectors/pom.xml
index f78958803fe..4d1cc66c2db 100644
--- a/pinot-connectors/pom.xml
+++ b/pinot-connectors/pom.xml
@@ -38,7 +38,9 @@
   </properties>
 
   <modules>
-    <module>pinot-spark-connector</module>
+    <module>pinot-spark-common</module>
+    <module>pinot-spark-2-connector</module>
+    <module>pinot-spark-3-connector</module>
     <module>pinot-flink-connector</module>
   </modules>
 
diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-java-client-jdk8/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-java-client-jdk8/pom.xml
deleted file mode 100644
index 0da8b1f8c48..00000000000
--- a/pinot-connectors/prestodb-pinot-dependencies/pinot-java-client-jdk8/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>prestodb-pinot-dependencies</artifactId>
-    <groupId>org.apache.pinot</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-
-  <artifactId>pinot-java-client-jdk8</artifactId>
-  <name>Pinot Java Client JDK 8</name>
-  <url>https://pinot.apache.org/</url>
-  <properties>
-    <pinot.root>${basedir}/../../..</pinot.root>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>true</reuseForks>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-spi-jdk8</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-common-jdk8</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.asynchttpclient</groupId>
-      <artifactId>async-http-client</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-unix-common</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.101tec</groupId>
-      <artifactId>zkclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-java-client-jdk8/src b/pinot-connectors/prestodb-pinot-dependencies/pinot-java-client-jdk8/src
deleted file mode 120000
index 6aa1a0560f9..00000000000
--- a/pinot-connectors/prestodb-pinot-dependencies/pinot-java-client-jdk8/src
+++ /dev/null
@@ -1 +0,0 @@
-../../../pinot-clients/pinot-java-client/src
\ No newline at end of file
diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml
index 576b286d55c..732b9017fca 100644
--- a/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml
+++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-segment-spi-jdk8/pom.xml
@@ -60,6 +60,18 @@
       <groupId>org.xerial.larray</groupId>
       <artifactId>larray-mmap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>posix</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>chronicle-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-core</artifactId>
+    </dependency>
 
     <!-- test -->
     <dependency>
diff --git a/pinot-connectors/prestodb-pinot-dependencies/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pom.xml
index b1ad5b6d7bb..54e6ec54fda 100644
--- a/pinot-connectors/prestodb-pinot-dependencies/pom.xml
+++ b/pinot-connectors/prestodb-pinot-dependencies/pom.xml
@@ -43,9 +43,7 @@
   <modules>
     <module>pinot-spi-jdk8</module>
     <module>pinot-common-jdk8</module>
-    <module>pinot-java-client-jdk8</module>
     <module>pinot-segment-spi-jdk8</module>
-    <module>presto-pinot-driver</module>
   </modules>
 
 
diff --git a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml
deleted file mode 100644
index bfc1a1b6226..00000000000
--- a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml
+++ /dev/null
@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-
-    <parent>
-        <artifactId>prestodb-pinot-dependencies</artifactId>
-        <groupId>org.apache.pinot</groupId>
-        <version>0.13.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <name>Presto Pinot Driver</name>
-    <groupId>org.apache.pinot</groupId>
-    <artifactId>presto-pinot-driver</artifactId>
-
-    <properties>
-        <pinot.root>${basedir}/../../..</pinot.root>
-        <shadeBase>org.apache.pinot.\$internal</shadeBase>
-        <jdk.version>8</jdk.version>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.pinot</groupId>
-            <artifactId>pinot-spi-jdk8</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.reflections</groupId>
-                    <artifactId>reflections</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-slf4j-impl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-1.2-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>it.unimi.dsi</groupId>
-                    <artifactId>fastutil</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka-clients</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka_2.10</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-mapper-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>joda-time</groupId>
-                    <artifactId>joda-time</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-core-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pinot</groupId>
-            <artifactId>pinot-common-jdk8</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-compat-qual</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.reflections</groupId>
-                    <artifactId>reflections</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jline</artifactId>
-                    <groupId>jline</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-slf4j-impl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-1.2-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka-clients</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-mapper-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka_2.10</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.hk2.external</groupId>
-                    <artifactId>jakarta.inject</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.ws.rs</groupId>
-                    <artifactId>jakarta.ws.rs-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.annotation</groupId>
-                    <artifactId>jakarta.annotation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>joda-time</groupId>
-                    <artifactId>joda-time</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-codec</groupId>
-                    <artifactId>commons-codec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.core</groupId>
-                    <artifactId>jersey-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.helix</groupId>
-            <artifactId>helix-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>it.unimi.dsi</groupId>
-                    <artifactId>fastutil</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka-clients</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka_2.10</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-mapper-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>joda-time</groupId>
-                    <artifactId>joda-time</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.jackson</groupId>
-                    <artifactId>jackson-core-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-codec</groupId>
-                    <artifactId>commons-codec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-api</artifactId>
-            <version>1.41.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>4.2.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <shadeSourcesContent>true</shadeSourcesContent>
-                            <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.google.guava:*</include>
-                                    <include>com.google.protobuf:*</include>
-                                    <include>com.yammer.metrics:*</include>
-                                    <include>commons-*:*</include>
-                                    <include>io.grpc:*</include>
-                                    <include>io.netty:*</include>
-                                    <include>org.apache.commons:*</include>
-                                    <include>org.apache.pinot:*</include>
-                                    <include>org.apache.http:*</include>
-                                    <include>org.antlr:*</include>
-                                    <include>org.apache.thrift:*</include>
-                                    <include>org.reflections:*</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <!-- everything except the stuff in pinot-spi, pinot-common is shaded -->
-                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>${shadeBase}.com.google</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.antlr</pattern>
-                                    <shadedPattern>${shadeBase}.org.antlr</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons</pattern>
-                                    <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.http</pattern>
-                                    <shadedPattern>${shadeBase}.org.apache.http</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.thrift</pattern>
-                                    <shadedPattern>${shadeBase}.org.apache.thrift</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>${shadeBase}.io.netty</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.jboss</pattern>
-                                    <shadedPattern>${shadeBase}.org.jboss</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.yammer</pattern>
-                                    <shadedPattern>${shadeBase}.com.yammer</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.reflections</pattern>
-                                    <shadedPattern>${shadeBase}.org.reflections</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <!-- exclude signed Manifests -->
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                        <exclude>META-INF/maven/**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java
deleted file mode 100644
index f6a9ccceb31..00000000000
--- a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/PinotStreamingQueryClient.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.connector.presto.grpc;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.apache.pinot.common.config.GrpcConfig;
-import org.apache.pinot.common.proto.Server;
-import org.apache.pinot.common.utils.grpc.GrpcQueryClient;
-import org.apache.pinot.common.utils.grpc.GrpcRequestBuilder;
-
-
-/**
- * Grpc based Pinot query client.
- */
-public class PinotStreamingQueryClient {
-  private final Map<String, GrpcQueryClient> _grpcQueryClientMap = new HashMap<>();
-  private final GrpcConfig _config;
-
-  public PinotStreamingQueryClient(GrpcConfig config) {
-    _config = config;
-  }
-
-  public Iterator<Server.ServerResponse> submit(String host, int port, GrpcRequestBuilder requestBuilder) {
-    GrpcQueryClient client = getOrCreateGrpcQueryClient(host, port);
-    return client.submit(requestBuilder.build());
-  }
-
-  private GrpcQueryClient getOrCreateGrpcQueryClient(String host, int port) {
-    String key = String.format("%s_%d", host, port);
-    if (!_grpcQueryClientMap.containsKey(key)) {
-      _grpcQueryClientMap.put(key, new GrpcQueryClient(host, port, _config));
-    }
-    return _grpcQueryClientMap.get(key);
-  }
-}
diff --git a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java
deleted file mode 100644
index f90e9ba8c76..00000000000
--- a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/grpc/Utils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed 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.pinot.connector.presto.grpc;
-
-import com.google.protobuf.ByteString;
-import org.apache.helix.model.InstanceConfig;
-
-
-/**
- * Utils used in Presto code to avoid the reference to internal shaded pinot class/objects.
- * E.g. protobuf, helix.
- *
- */
-public class Utils {
-  private Utils() {
-  }
-
-  public static ByteString toByteString(byte[] bytes) {
-    return ByteString.copyFrom(bytes);
-  }
-
-  public static InstanceConfig toInstanceConfig(String instanceId) {
-    return InstanceConfig.toInstanceConfig(instanceId);
-  }
-}
diff --git a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/plugin/metrics/NoopPinotMetricFactory.java b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/plugin/metrics/NoopPinotMetricFactory.java
deleted file mode 100644
index b7899139057..00000000000
--- a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/src/main/java/org/apache/pinot/connector/presto/plugin/metrics/NoopPinotMetricFactory.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.connector.presto.plugin.metrics;
-
-import com.google.common.collect.ImmutableMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import org.apache.pinot.spi.annotations.metrics.MetricsFactory;
-import org.apache.pinot.spi.annotations.metrics.PinotMetricsFactory;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.metrics.PinotCounter;
-import org.apache.pinot.spi.metrics.PinotGauge;
-import org.apache.pinot.spi.metrics.PinotHistogram;
-import org.apache.pinot.spi.metrics.PinotJmxReporter;
-import org.apache.pinot.spi.metrics.PinotMeter;
-import org.apache.pinot.spi.metrics.PinotMetric;
-import org.apache.pinot.spi.metrics.PinotMetricName;
-import org.apache.pinot.spi.metrics.PinotMetricsRegistry;
-import org.apache.pinot.spi.metrics.PinotMetricsRegistryListener;
-import org.apache.pinot.spi.metrics.PinotTimer;
-
-
-/**
- * This package name has to match the regex pattern: ".*\\.plugin\\.metrics\\..*"
- */
-@MetricsFactory
-public class NoopPinotMetricFactory implements PinotMetricsFactory {
-  private PinotMetricsRegistry _pinotMetricsRegistry;
-
-  @Override
-  public void init(PinotConfiguration pinotConfiguration) {
-  }
-
-  @Override
-  public PinotMetricsRegistry getPinotMetricsRegistry() {
-    if (_pinotMetricsRegistry == null) {
-      _pinotMetricsRegistry = new NoopPinotMetricsRegistry();
-    }
-    return _pinotMetricsRegistry;
-  }
-
-  @Override
-  public PinotMetricName makePinotMetricName(Class<?> aClass, String s) {
-    return new NoopPinotMetricName();
-  }
-
-  @Override
-  public <T> PinotGauge<T> makePinotGauge(Function<Void, T> function) {
-    return new NoopPinotGauge<T>();
-  }
-
-  @Override
-  public PinotJmxReporter makePinotJmxReporter(PinotMetricsRegistry pinotMetricsRegistry) {
-    return new NoopPinotJmxReporter();
-  }
-
-  @Override
-  public String getMetricsFactoryName() {
-    return "noop";
-  }
-
-  public static class NoopPinotMetricsRegistry implements PinotMetricsRegistry {
-    @Override
-    public void removeMetric(PinotMetricName pinotMetricName) {
-    }
-
-    @Override
-    public <T> PinotGauge<T> newGauge(PinotMetricName pinotMetricName, PinotGauge<T> pinotGauge) {
-      return new NoopPinotGauge<T>();
-    }
-
-    @Override
-    public PinotMeter newMeter(PinotMetricName pinotMetricName, String s, TimeUnit timeUnit) {
-      return new NoopPinotMeter();
-    }
-
-    @Override
-    public PinotCounter newCounter(PinotMetricName pinotMetricName) {
-      return new NoopPinotCounter();
-    }
-
-    @Override
-    public PinotTimer newTimer(PinotMetricName pinotMetricName, TimeUnit timeUnit, TimeUnit timeUnit1) {
-      return new NoopPinotTimer();
-    }
-
-    @Override
-    public PinotHistogram newHistogram(PinotMetricName pinotMetricName, boolean b) {
-      return new NoopPinotHistogram();
-    }
-
-    @Override
-    public Map<PinotMetricName, PinotMetric> allMetrics() {
-      return ImmutableMap.of();
-    }
-
-    @Override
-    public void addListener(PinotMetricsRegistryListener pinotMetricsRegistryListener) {
-    }
-
-    @Override
-    public Object getMetricsRegistry() {
-      return this;
-    }
-
-    @Override
-    public void shutdown() {
-    }
-  }
-
-  private static class NoopPinotJmxReporter implements PinotJmxReporter {
-    @Override
-    public void start() {
-    }
-  }
-
-  private static class NoopPinotMeter implements PinotMeter {
-    @Override
-    public void mark() {
-    }
-
-    @Override
-    public void mark(long l) {
-    }
-
-    @Override
-    public Object getMetered() {
-      return null;
-    }
-
-    @Override
-    public TimeUnit rateUnit() {
-      return null;
-    }
-
-    @Override
-    public String eventType() {
-      return null;
-    }
-
-    @Override
-    public long count() {
-      return 0;
-    }
-
-    @Override
-    public double fifteenMinuteRate() {
-      return 0;
-    }
-
-    @Override
-    public double fiveMinuteRate() {
-      return 0;
-    }
-
-    @Override
-    public double meanRate() {
-      return 0;
-    }
-
-    @Override
-    public double oneMinuteRate() {
-      return 0;
-    }
-
-    @Override
-    public Object getMetric() {
-      return null;
-    }
-  }
-
-  private static class NoopPinotMetricName implements PinotMetricName {
-    @Override
-    public Object getMetricName() {
-      return null;
-    }
-  }
-
-  private static class NoopPinotGauge<T> implements PinotGauge<T> {
-    @Override
-    public Object getGauge() {
-      return null;
-    }
-
-    @Override
-    public T value() {
-      return null;
-    }
-
-    @Override
-    public Object getMetric() {
-      return null;
-    }
-  }
-
-  private static class NoopPinotCounter implements PinotCounter {
-    @Override
-    public Object getCounter() {
-      return null;
-    }
-
-    @Override
-    public Object getMetric() {
-      return null;
-    }
-  }
-
-  private static class NoopPinotTimer implements PinotTimer {
-    @Override
-    public Object getMetered() {
-      return null;
-    }
-
-    @Override
-    public TimeUnit rateUnit() {
-      return null;
-    }
-
-    @Override
-    public String eventType() {
-      return null;
-    }
-
-    @Override
-    public long count() {
-      return 0;
-    }
-
-    @Override
-    public double fifteenMinuteRate() {
-      return 0;
-    }
-
-    @Override
-    public double fiveMinuteRate() {
-      return 0;
-    }
-
-    @Override
-    public double meanRate() {
-      return 0;
-    }
-
-    @Override
-    public double oneMinuteRate() {
-      return 0;
-    }
-
-    @Override
-    public Object getMetric() {
-      return null;
-    }
-
-    @Override
-    public void update(long duration, TimeUnit unit) {
-    }
-
-    @Override
-    public Object getTimer() {
-      return null;
-    }
-  }
-
-  private static class NoopPinotHistogram implements PinotHistogram {
-    @Override
-    public Object getHistogram() {
-      return null;
-    }
-
-    @Override
-    public Object getMetric() {
-      return null;
-    }
-  }
-}
diff --git a/pinot-controller/pom.xml b/pinot-controller/pom.xml
index d1acd2f61b4..e374a87c325 100644
--- a/pinot-controller/pom.xml
+++ b/pinot-controller/pom.xml
@@ -33,7 +33,7 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <npm.script>build</npm.script>
+    <npm.script>build-ci</npm.script>
   </properties>
   <dependencies>
     <dependency>
@@ -157,12 +157,6 @@
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.101tec</groupId>
@@ -186,6 +180,10 @@
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-query-planner</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -235,13 +233,13 @@
             </configuration>
           </execution>
           <execution>
-            <id>npm install</id>
+            <id>npm ci</id>
             <goals>
               <goal>npm</goal>
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-              <arguments>install</arguments>
+              <arguments>ci</arguments>
             </configuration>
           </execution>
           <execution>
@@ -277,4 +275,13 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>bin-dist</id>
+      <properties>
+        <npm.script>build</npm.script>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/BaseControllerStarter.java b/pinot-controller/src/main/java/org/apache/pinot/controller/BaseControllerStarter.java
index bc2284032c1..e32a419ecfd 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/BaseControllerStarter.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/BaseControllerStarter.java
@@ -60,6 +60,7 @@
 import org.apache.pinot.common.minion.InMemoryTaskManagerStatusCache;
 import org.apache.pinot.common.minion.TaskGeneratorMostRecentRunInfo;
 import org.apache.pinot.common.minion.TaskManagerStatusCache;
+import org.apache.pinot.common.utils.PinotAppConfigs;
 import org.apache.pinot.common.utils.ServiceStartableUtils;
 import org.apache.pinot.common.utils.ServiceStatus;
 import org.apache.pinot.common.utils.TlsUtils;
@@ -97,6 +98,7 @@
 import org.apache.pinot.core.periodictask.PeriodicTask;
 import org.apache.pinot.core.periodictask.PeriodicTaskScheduler;
 import org.apache.pinot.core.query.executor.sql.SqlQueryExecutor;
+import org.apache.pinot.core.segment.processing.lifecycle.PinotSegmentLifecycleEventListenerManager;
 import org.apache.pinot.core.transport.ListenerConfig;
 import org.apache.pinot.core.util.ListenerConfigUtil;
 import org.apache.pinot.spi.crypt.PinotCrypterFactory;
@@ -179,6 +181,7 @@ public void init(PinotConfiguration pinotConfiguration)
     ServiceStartableUtils.applyClusterConfig(_config, _helixZkURL, _helixClusterName, ServiceRole.CONTROLLER);
 
     setupHelixSystemProperties();
+    HelixHelper.setMinNumCharsInISToTurnOnCompression(_config.getMinNumCharsInISToTurnOnCompression());
     _listenerConfigs = ListenerConfigUtil.buildControllerConfigs(_config);
     _controllerMode = _config.getControllerMode();
     inferHostnameIfNeeded(_config);
@@ -242,19 +245,19 @@ private void setupHelixSystemProperties() {
     // NOTE: Helix will disconnect the manager and disable the instance if it detects flapping (too frequent disconnect
     // from ZooKeeper). Setting flapping time window to a small value can avoid this from happening. Helix ignores the
     // non-positive value, so set the default value as 1.
-    System.setProperty(SystemPropertyKeys.FLAPPING_TIME_WINDOW, _config
-        .getProperty(CommonConstants.Helix.CONFIG_OF_CONTROLLER_FLAPPING_TIME_WINDOW_MS,
+    System.setProperty(SystemPropertyKeys.FLAPPING_TIME_WINDOW,
+        _config.getProperty(CommonConstants.Helix.CONFIG_OF_CONTROLLER_FLAPPING_TIME_WINDOW_MS,
             CommonConstants.Helix.DEFAULT_FLAPPING_TIME_WINDOW_MS));
   }
 
   private void setupHelixClusterConstraints() {
-    String maxStateTransitions = _config
-        .getProperty(CommonConstants.Helix.CONFIG_OF_HELIX_INSTANCE_MAX_STATE_TRANSITIONS,
+    String maxStateTransitions =
+        _config.getProperty(CommonConstants.Helix.CONFIG_OF_HELIX_INSTANCE_MAX_STATE_TRANSITIONS,
             CommonConstants.Helix.DEFAULT_HELIX_INSTANCE_MAX_STATE_TRANSITIONS);
     Map<ClusterConstraints.ConstraintAttribute, String> constraintAttributes = new HashMap<>();
     constraintAttributes.put(ClusterConstraints.ConstraintAttribute.INSTANCE, ".*");
-    constraintAttributes
-        .put(ClusterConstraints.ConstraintAttribute.MESSAGE_TYPE, Message.MessageType.STATE_TRANSITION.name());
+    constraintAttributes.put(ClusterConstraints.ConstraintAttribute.MESSAGE_TYPE,
+        Message.MessageType.STATE_TRANSITION.name());
     ConstraintItem constraintItem = new ConstraintItem(constraintAttributes, maxStateTransitions);
 
     _helixControllerManager.getClusterManagmentTool()
@@ -319,6 +322,7 @@ public PinotConfiguration getConfig() {
   @Override
   public void start() {
     LOGGER.info("Starting Pinot controller in mode: {}. (Version: {})", _controllerMode.name(), PinotVersion.VERSION);
+    LOGGER.info("Controller configs: {}", new PinotAppConfigs(getConfig()).toJSONString());
     Utils.logVersions();
 
     // Set up controller metrics
@@ -367,8 +371,8 @@ private void setUpHelixController() {
   private void setUpPinotController() {
     // install default SSL context if necessary (even if not force-enabled everywhere)
     TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(_config, ControllerConf.CONTROLLER_TLS_PREFIX);
-    if (StringUtils.isNotBlank(tlsDefaults.getKeyStorePath()) || StringUtils
-        .isNotBlank(tlsDefaults.getTrustStorePath())) {
+    if (StringUtils.isNotBlank(tlsDefaults.getKeyStorePath()) || StringUtils.isNotBlank(
+        tlsDefaults.getTrustStorePath())) {
       LOGGER.info("Installing default SSL context for any client requests");
       TlsUtils.installDefaultSSLSocketFactory(tlsDefaults);
     }
@@ -388,8 +392,9 @@ private void setUpPinotController() {
         _config.getProperty(CommonConstants.Controller.CONFIG_OF_CONTROLLER_QUERY_REWRITER_CLASS_NAMES));
 
     LOGGER.info("Initializing Helix participant manager");
-    _helixParticipantManager = HelixManagerFactory
-        .getZKHelixManager(_helixClusterName, _helixParticipantInstanceId, InstanceType.PARTICIPANT, _helixZkURL);
+    _helixParticipantManager =
+        HelixManagerFactory.getZKHelixManager(_helixClusterName, _helixParticipantInstanceId, InstanceType.PARTICIPANT,
+            _helixZkURL);
 
     // LeadControllerManager needs to be initialized before registering as Helix participant.
     LOGGER.info("Initializing lead controller manager");
@@ -407,6 +412,9 @@ private void setUpPinotController() {
     LOGGER.info("Starting Pinot Helix resource manager and connecting to Zookeeper");
     _helixResourceManager.start(_helixParticipantManager);
 
+    // Initialize segment lifecycle event listeners
+    PinotSegmentLifecycleEventListenerManager.getInstance().init(_helixParticipantManager);
+
     LOGGER.info("Starting task resource manager");
     _helixTaskResourceManager =
         new PinotHelixTaskResourceManager(_helixResourceManager, new TaskDriver(_helixParticipantManager),
@@ -459,7 +467,7 @@ private void setUpPinotController() {
     }
 
     final MetadataEventNotifierFactory metadataEventNotifierFactory =
-        MetadataEventNotifierFactory.loadFactory(_config.subset(METADATA_EVENT_NOTIFIER_PREFIX));
+        MetadataEventNotifierFactory.loadFactory(_config.subset(METADATA_EVENT_NOTIFIER_PREFIX), _helixResourceManager);
 
     LOGGER.info("Controller download url base: {}", _config.generateVipUrl());
     LOGGER.info("Injecting configuration and resource managers to the API context");
@@ -665,7 +673,7 @@ protected List<PeriodicTask> setupControllerPeriodicTasks() {
     _taskManagerStatusCache = getTaskManagerStatusCache();
     _taskManager =
         new PinotTaskManager(_helixTaskResourceManager, _helixResourceManager, _leadControllerManager, _config,
-            _controllerMetrics, _taskManagerStatusCache);
+            _controllerMetrics, _taskManagerStatusCache, _executorService, _connectionManager);
     periodicTasks.add(_taskManager);
     _retentionManager =
         new RetentionManager(_helixResourceManager, _leadControllerManager, _config, _controllerMetrics);
@@ -685,8 +693,9 @@ protected List<PeriodicTask> setupControllerPeriodicTasks() {
         new SegmentStatusChecker(_helixResourceManager, _leadControllerManager, _config, _controllerMetrics,
             _executorService);
     periodicTasks.add(_segmentStatusChecker);
-    _realtimeConsumerMonitor = new RealtimeConsumerMonitor(_config, _helixResourceManager, _leadControllerManager,
-        _controllerMetrics, _executorService);
+    _realtimeConsumerMonitor =
+        new RealtimeConsumerMonitor(_config, _helixResourceManager, _leadControllerManager, _controllerMetrics,
+            _executorService);
     periodicTasks.add(_realtimeConsumerMonitor);
     _segmentRelocator = new SegmentRelocator(_helixResourceManager, _leadControllerManager, _config, _controllerMetrics,
         _executorService, _connectionManager);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
index bf6e9adc81a..e519f2b8f8a 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
@@ -27,6 +27,7 @@
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.configuration.Configuration;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.helix.controller.rebalancer.strategy.AutoRebalanceStrategy;
 import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -60,6 +61,7 @@ public class ControllerConf extends PinotConfiguration {
   public static final String ZK_STR = "controller.zk.str";
   // boolean: Update the statemodel on boot?
   public static final String UPDATE_SEGMENT_STATE_MODEL = "controller.update_segment_state_model";
+  public static final String MIN_NUM_CHARS_IN_IS_TO_TURN_ON_COMPRESSION = "controller.min_is_size_for_compression";
   public static final String HELIX_CLUSTER_NAME = "controller.helix.cluster.name";
   public static final String CLUSTER_TENANT_ISOLATION_ENABLE = "cluster.tenant.isolation.enable";
   public static final String CONSOLE_WEBAPP_ROOT_PATH = "controller.query.console";
@@ -75,6 +77,9 @@ public class ControllerConf extends PinotConfiguration {
   public static final String CONTROLLER_RESOURCE_PACKAGES = "controller.restlet.api.resource.packages";
   public static final String DEFAULT_CONTROLLER_RESOURCE_PACKAGES = "org.apache.pinot.controller.api.resources";
 
+  // Consider tierConfigs when assigning new offline segment
+  public static final String CONTROLLER_ENABLE_TIERED_SEGMENT_ASSIGNMENT = "controller.segment.enableTieredAssignment";
+
   public enum ControllerMode {
     DUAL, PINOT_ONLY, HELIX_ONLY
   }
@@ -208,6 +213,8 @@ public static class ControllerPeriodicTasksConf {
     // Default value is false.
     public static final String ENABLE_DEEP_STORE_RETRY_UPLOAD_LLC_SEGMENT =
         "controller.realtime.segment.deepStoreUploadRetryEnabled";
+    public static final String DEEP_STORE_RETRY_UPLOAD_TIMEOUT_MS =
+        "controller.realtime.segment.deepStoreUploadRetry.timeoutMs";
 
     public static final int MIN_INITIAL_DELAY_IN_SECONDS = 120;
     public static final int MAX_INITIAL_DELAY_IN_SECONDS = 300;
@@ -235,7 +242,6 @@ private static long getRandomInitialDelayInSeconds() {
 
     private static final int DEFAULT_SEGMENT_LEVEL_VALIDATION_INTERVAL_IN_SECONDS = 24 * 60 * 60;
     private static final int DEFAULT_SEGMENT_RELOCATOR_FREQUENCY_IN_SECONDS = 60 * 60;
-    private static final int DEFAULT_SEGMENT_TIER_ASSIGNER_FREQUENCY_IN_SECONDS = -1; // Disabled
 
     // Realtime Consumer Monitor
     private static final String RT_CONSUMER_MONITOR_FREQUENCY_PERIOD =
@@ -257,6 +263,7 @@ private static long getRandomInitialDelayInSeconds() {
   public static final String ACCESS_CONTROL_FACTORY_CLASS = "controller.admin.access.control.factory.class";
   public static final String ACCESS_CONTROL_USERNAME = "access.control.init.username";
   public static final String ACCESS_CONTROL_PASSWORD = "access.control.init.password";
+  public static final String LINEAGE_MANAGER_CLASS = "controller.lineage.manager.class";
   // Amount of the time the segment can take from the beginning of upload to the end of upload. Used when parallel push
   // protection is enabled. If the upload does not finish within the timeout, next upload can override the previous one.
   private static final String SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS = "controller.segment.upload.timeoutInMillis";
@@ -284,7 +291,10 @@ private static long getRandomInitialDelayInSeconds() {
       "org.apache.pinot.controller.api.access.AllowAllAccessFactory";
   private static final String DEFAULT_ACCESS_CONTROL_USERNAME = "admin";
   private static final String DEFAULT_ACCESS_CONTROL_PASSWORD = "admin";
+  private static final String DEFAULT_LINEAGE_MANAGER =
+      "org.apache.pinot.controller.helix.core.lineage.DefaultLineageManager";
   private static final long DEFAULT_SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS = 600_000L; // 10 minutes
+  private static final int DEFAULT_MIN_NUM_CHARS_IN_IS_TO_TURN_ON_COMPRESSION = -1;
   private static final int DEFAULT_REALTIME_SEGMENT_METADATA_COMMIT_NUMLOCKS = 64;
   private static final boolean DEFAULT_ENABLE_STORAGE_QUOTA_CHECK = true;
   private static final boolean DEFAULT_ENABLE_BATCH_MESSAGE_MODE = false;
@@ -374,7 +384,7 @@ public void setControllerPort(String port) {
   }
 
   public void setDataDir(String dataDir) {
-    setProperty(DATA_DIR, dataDir);
+    setProperty(DATA_DIR, StringUtils.removeEnd(dataDir, "/"));
   }
 
   public void setRealtimeSegmentCommitTimeoutSeconds(int timeoutSec) {
@@ -385,6 +395,10 @@ public void setUpdateSegmentStateModel(String updateStateModel) {
     setProperty(UPDATE_SEGMENT_STATE_MODEL, updateStateModel);
   }
 
+  public void setMinISSizeForCompression(int minSize) {
+    setProperty(MIN_NUM_CHARS_IN_IS_TO_TURN_ON_COMPRESSION, minSize);
+  }
+
   public void setZkStr(String zkStr) {
     setProperty(CommonConstants.Helix.CONFIG_OF_ZOOKEEPR_SERVER, zkStr);
   }
@@ -667,6 +681,14 @@ public void setSegmentRelocatorFrequencyInSeconds(int segmentRelocatorFrequencyI
         Integer.toString(segmentRelocatorFrequencyInSeconds));
   }
 
+  public boolean tieredSegmentAssignmentEnabled() {
+    return getProperty(CONTROLLER_ENABLE_TIERED_SEGMENT_ASSIGNMENT, false);
+  }
+
+  public void setTieredSegmentAssignmentEnabled(boolean enabled) {
+    setProperty(CONTROLLER_ENABLE_TIERED_SEGMENT_ASSIGNMENT, enabled);
+  }
+
   public boolean tenantIsolationEnabled() {
     return getProperty(CLUSTER_TENANT_ISOLATION_ENABLE, true);
   }
@@ -832,10 +854,22 @@ public void setAccessControlFactoryClass(String accessControlFactoryClass) {
     setProperty(ACCESS_CONTROL_FACTORY_CLASS, accessControlFactoryClass);
   }
 
+  public String getLineageManagerClass() {
+    return getProperty(LINEAGE_MANAGER_CLASS, DEFAULT_LINEAGE_MANAGER);
+  }
+
+  public void setLineageManagerClass(String lineageModifierClass) {
+    setProperty(LINEAGE_MANAGER_CLASS, lineageModifierClass);
+  }
+
   public long getSegmentUploadTimeoutInMillis() {
     return getProperty(SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS, DEFAULT_SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS);
   }
 
+  public int getMinNumCharsInISToTurnOnCompression() {
+    return getProperty(MIN_NUM_CHARS_IN_IS_TO_TURN_ON_COMPRESSION, DEFAULT_MIN_NUM_CHARS_IN_IS_TO_TURN_ON_COMPRESSION);
+  }
+
   public void setSegmentUploadTimeoutInMillis(long segmentUploadTimeoutInMillis) {
     setProperty(SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS, segmentUploadTimeoutInMillis);
   }
@@ -887,6 +921,10 @@ public boolean isDeepStoreRetryUploadLLCSegmentEnabled() {
     return getProperty(ControllerPeriodicTasksConf.ENABLE_DEEP_STORE_RETRY_UPLOAD_LLC_SEGMENT, false);
   }
 
+  public int getDeepStoreRetryUploadTimeoutMs() {
+    return getProperty(ControllerPeriodicTasksConf.DEEP_STORE_RETRY_UPLOAD_TIMEOUT_MS, -1);
+  }
+
   public long getPinotTaskManagerInitialDelaySeconds() {
     return getPeriodicTaskInitialDelayInSeconds();
   }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
index d1a77d67890..0673d892c8b 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
@@ -122,7 +122,7 @@ private void setupSwagger() {
     _httpServer.getServerConfiguration().addHttpHandler(apiStaticHttpHandler, "/api/");
     _httpServer.getServerConfiguration().addHttpHandler(apiStaticHttpHandler, "/help/");
 
-    URL swaggerDistLocation = loader.getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
+    URL swaggerDistLocation = loader.getResource(CommonConstants.CONFIG_OF_SWAGGER_RESOURCES_PATH);
     CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new URLClassLoader(new URL[]{swaggerDistLocation}));
     _httpServer.getServerConfiguration().addHttpHandler(swaggerDist, "/swaggerui-dist/");
   }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java
index aa148f47cee..b303c8cd23f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/DefaultMetadataEventNotifierFactory.java
@@ -18,15 +18,18 @@
  */
 package org.apache.pinot.controller.api.events;
 
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.spi.env.PinotConfiguration;
 
 
 public class DefaultMetadataEventNotifierFactory extends MetadataEventNotifierFactory {
 
-  public MetadataEventNotifier create() {
-    return new DefaultMetadataEventNotifier();
+  @Override
+  public void init(PinotConfiguration configuration, PinotHelixResourceManager pinotHelixResourceManager) {
   }
 
-  public void init(PinotConfiguration configuration) {
+  @Override
+  public MetadataEventNotifier create() {
+    return new DefaultMetadataEventNotifier();
   }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java
index 20ffc2a02b2..68626f9d2da 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/events/MetadataEventNotifierFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.controller.api.events;
 
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,21 +28,21 @@ public abstract class MetadataEventNotifierFactory {
   public static final Logger LOGGER = LoggerFactory.getLogger(MetadataEventNotifierFactory.class);
   public static final String METADATA_EVENT_CLASS_CONFIG = "factory.class";
 
-  public abstract void init(PinotConfiguration configuration);
+  public abstract void init(PinotConfiguration configuration, PinotHelixResourceManager pinotHelixResourceManager);
 
   public abstract MetadataEventNotifier create();
 
-  public static MetadataEventNotifierFactory loadFactory(PinotConfiguration configuration) {
+  public static MetadataEventNotifierFactory loadFactory(PinotConfiguration configuration, PinotHelixResourceManager
+      helixResourceManager) {
     MetadataEventNotifierFactory metadataEventNotifierFactory;
 
     String metadataEventNotifierClassName =
         configuration.getProperty(METADATA_EVENT_CLASS_CONFIG, DefaultMetadataEventNotifierFactory.class.getName());
-
     try {
       LOGGER.info("Instantiating metadata event notifier factory class {}", metadataEventNotifierClassName);
       metadataEventNotifierFactory =
           (MetadataEventNotifierFactory) Class.forName(metadataEventNotifierClassName).newInstance();
-      metadataEventNotifierFactory.init(configuration);
+      metadataEventNotifierFactory.init(configuration, helixResourceManager);
       return metadataEventNotifierFactory;
     } catch (Exception e) {
       throw new RuntimeException(e);
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/InstanceTagUpdateRequest.java
similarity index 54%
rename from pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java
rename to pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/InstanceTagUpdateRequest.java
index 307b3e56f39..c320387a4df 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/PushLocation.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/InstanceTagUpdateRequest.java
@@ -16,40 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.ingestion.utils;
+package org.apache.pinot.controller.api.resources;
 
-import java.io.Serializable;
-import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
 
 
-public class PushLocation implements Serializable {
-  private final String _host;
-  private final int _port;
+@ApiModel
+public class InstanceTagUpdateRequest {
+  @JsonProperty("instanceName")
+  @ApiModelProperty(example = "Server_a.b.com_20000")
+  private String _instanceName;
+  @JsonProperty("newTags")
+  private List<String> _newTags;
 
-  public PushLocation(String host, int port) {
-    _host = host;
-    _port = port;
+  public String getInstanceName() {
+    return _instanceName;
   }
 
-  public static List<PushLocation> getPushLocations(String[] hosts, int port) {
-    List<PushLocation> pushLocations = new ArrayList<>(hosts.length);
-    for (String host : hosts) {
-      pushLocations.add(new PushLocation(host, port));
-    }
-    return pushLocations;
+  public void setInstanceName(String instanceName) {
+    _instanceName = instanceName;
   }
 
-  public String getHost() {
-    return _host;
+  public List<String> getNewTags() {
+    return _newTags;
   }
 
-  public int getPort() {
-    return _port;
-  }
-
-  @Override
-  public String toString() {
-    return _host + ":" + _port;
+  public void setNewTags(List<String> newTags) {
+    _newTags = newTags;
   }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java
index c11bed4008b..b287f07dfc4 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/LLCSegmentCompletionHandlers.java
@@ -448,8 +448,10 @@ private static File extractSegmentFromFormToLocalTempFile(FormDataMultiPart form
           "Invalid multi-part for segment: %s", segmentName);
       FormDataBodyPart bodyPart = map.values().iterator().next().get(0);
 
-      File localTempFile = new File(ControllerFilePathProvider.getInstance().getFileUploadTempDir(),
-          getTempSegmentFileName(segmentName));
+      File localTempFile = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(
+          ControllerFilePathProvider.getInstance().getFileUploadTempDir(), getTempSegmentFileName(segmentName),
+          "Invalid segment name: %s", segmentName);
+
       try (InputStream inputStream = bodyPart.getValueAs(InputStream.class)) {
         Files.copy(inputStream, localTempFile.toPath());
       } catch (Exception e) {
@@ -468,8 +470,10 @@ private static File extractSegmentFromFormToLocalTempFile(FormDataMultiPart form
    */
   private static SegmentMetadataImpl extractMetadataFromLocalSegmentFile(File segmentFile)
       throws Exception {
-    File tempIndexDir =
-        new File(ControllerFilePathProvider.getInstance().getUntarredFileTempDir(), segmentFile.getName());
+    File tempIndexDir = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(
+        ControllerFilePathProvider.getInstance().getUntarredFileTempDir(), segmentFile.getName(),
+        "Invalid segment file: %s", segmentFile);
+
     try {
       FileUtils.forceMkdir(tempIndexDir);
 
@@ -494,8 +498,10 @@ private static SegmentMetadataImpl extractMetadataFromLocalSegmentFile(File segm
    */
   private static SegmentMetadataImpl extractSegmentMetadataFromForm(FormDataMultiPart form, String segmentName)
       throws IOException {
-    File tempIndexDir = new File(ControllerFilePathProvider.getInstance().getUntarredFileTempDir(),
-        getTempSegmentFileName(segmentName));
+    File tempIndexDir = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(
+        ControllerFilePathProvider.getInstance().getUntarredFileTempDir(), getTempSegmentFileName(segmentName),
+        "Invalid segment name: %s", segmentName);
+
     try {
       FileUtils.forceMkdir(tempIndexDir);
 
@@ -532,8 +538,10 @@ private static void extractFileFromForm(FormDataMultiPart form, String fileName,
    */
   private static SegmentMetadataImpl extractMetadataFromSegmentFileURI(URI segmentFileURI, String segmentName)
       throws Exception {
-    File localTempFile =
-        new File(ControllerFilePathProvider.getInstance().getFileUploadTempDir(), getTempSegmentFileName(segmentName));
+    File localTempFile = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(
+        ControllerFilePathProvider.getInstance().getFileUploadTempDir(), getTempSegmentFileName(segmentName),
+        "Invalid segment name: %s", segmentName);
+
     try {
       SegmentFetcherFactory.fetchSegmentToLocal(segmentFileURI, localTempFile);
       return extractMetadataFromLocalSegmentFile(localTempFile);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/OperationValidationResponse.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/OperationValidationResponse.java
new file mode 100644
index 00000000000..6b27e38e63d
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/OperationValidationResponse.java
@@ -0,0 +1,107 @@
+/**
+ * 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.pinot.controller.api.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class OperationValidationResponse {
+  private String _instanceName;
+  private boolean _safe;
+  private final List<ErrorWrapper> _issues = new ArrayList<>();
+
+  @JsonProperty("instanceName")
+  public String getInstanceName() {
+    return _instanceName;
+  }
+
+  public OperationValidationResponse setInstanceName(String instanceName) {
+    _instanceName = instanceName;
+    return this;
+  }
+
+  @JsonProperty("isSafe")
+  public boolean isSafe() {
+    return _safe;
+  }
+
+  public OperationValidationResponse setSafe(boolean safe) {
+    _safe = safe;
+    return this;
+  }
+
+  @JsonProperty("issues")
+  public List<ErrorWrapper> getIssues() {
+    return _issues;
+  }
+
+  public OperationValidationResponse putIssue(ErrorCode code, String... args) {
+    _issues.add(new ErrorWrapper(code, args));
+    return this;
+  }
+
+  public OperationValidationResponse putAllIssues(List<ErrorWrapper> issues) {
+    _issues.addAll(issues);
+    return this;
+  }
+
+  public String getIssueMessage(int index) {
+    return _issues.get(index).getMessage();
+  }
+
+  public static class ErrorWrapper {
+    @JsonProperty("code")
+    ErrorCode _code;
+    @JsonProperty("message")
+    String _message;
+
+    public ErrorWrapper() {
+    }
+
+    public ErrorWrapper(ErrorCode code, String... args) {
+      _code = code;
+      _message = String.format(code._description, args);
+    }
+
+    public ErrorCode getCode() {
+      return _code;
+    }
+
+    public String getMessage() {
+      return _message;
+    }
+  }
+
+  public enum ErrorCode {
+    IS_ALIVE("Instance %s is still live"),
+    CONTAINS_RESOURCE("Instance %s exists in ideal state for %s"),
+    MINIMUM_INSTANCE_UNSATISFIED(
+        "Tenant '%s' will not satisfy minimum '%s' requirement if tag '%s' is removed from %s instance '%s'."),
+    ALREADY_DEFICIENT_TENANT("Tenant '%s' is low on '%s' instances by %s even after allocating instance %s"),
+    UNRECOGNISED_TAG_TYPE("The tag '%s' does not follow the suffix convention of either broker or server");
+
+    public final String _description;
+
+    ErrorCode(String description) {
+      _description = description;
+    }
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerAuthResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerAuthResource.java
index 77b77479ca6..52e518cfed1 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerAuthResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerAuthResource.java
@@ -28,6 +28,7 @@
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
 import javax.inject.Inject;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -72,7 +73,7 @@ public class PinotControllerAuthResource {
       @ApiResponse(code = 500, message = "Verification error")
   })
   public boolean verify(@ApiParam(value = "Table name without type") @QueryParam("tableName") String tableName,
-      @ApiParam(value = "API access type") @QueryParam("accessType") AccessType accessType,
+      @ApiParam(value = "API access type") @DefaultValue("READ") @QueryParam("accessType") AccessType accessType,
       @ApiParam(value = "Endpoint URL") @QueryParam("endpointUrl") String endpointUrl) {
     AccessControl accessControl = _accessControlFactory.create();
     return accessControl.hasAccess(tableName, accessType, _httpHeaders, endpointUrl);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerLogger.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerLogger.java
index ae9c5db3218..d57746b4620 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerLogger.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotControllerLogger.java
@@ -36,6 +36,7 @@
 import java.util.Set;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -145,7 +146,8 @@ public Response downloadLogFile(
   @Path("/loggers/instances")
   @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation(value = "Collect log files from all the instances")
-  public Map<String, Set<String>> getLogFilesFromAllInstances() {
+  public Map<String, Set<String>> getLogFilesFromAllInstances(
+      @HeaderParam(HttpHeaders.AUTHORIZATION) String authorization) {
     if (_logFileServer == null || _logFileServer instanceof DummyLogFileServer) {
       throw new WebApplicationException("Root directory doesn't exist", Response.Status.INTERNAL_SERVER_ERROR);
     }
@@ -154,7 +156,7 @@ public Map<String, Set<String>> getLogFilesFromAllInstances() {
     onlineInstanceList.forEach(
         instance -> {
           try {
-            instancesToLogFilesMap.put(instance, getLogFilesFromInstance(instance));
+            instancesToLogFilesMap.put(instance, getLogFilesFromInstance(authorization, instance));
           } catch (Exception e) {
             // Skip the instance for any exception.
           }
@@ -167,10 +169,15 @@ public Map<String, Set<String>> getLogFilesFromAllInstances() {
   @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation(value = "Collect log files from a given instance")
   public Set<String> getLogFilesFromInstance(
+      @HeaderParam(HttpHeaders.AUTHORIZATION) String authorization,
       @ApiParam(value = "Instance Name", required = true) @PathParam("instanceName") String instanceName) {
     try {
       URI uri = new URI(getInstanceBaseUri(instanceName) + "/loggers/files");
-      SimpleHttpResponse simpleHttpResponse = _fileUploadDownloadClient.getHttpClient().sendGetRequest(uri);
+      Map<String, String> headers = new HashMap<>();
+      if (authorization != null) {
+        headers.put(HttpHeaders.AUTHORIZATION, authorization);
+      }
+      SimpleHttpResponse simpleHttpResponse = _fileUploadDownloadClient.getHttpClient().sendGetRequest(uri, headers);
       if (simpleHttpResponse.getStatusCode() >= 400) {
         throw new WebApplicationException("Failed to fetch logs from instance name: " + instanceName,
             Response.Status.fromStatusCode(simpleHttpResponse.getStatusCode()));
@@ -189,6 +196,7 @@ public Set<String> getLogFilesFromInstance(
   @Authenticate(AccessType.DELETE)
   @ApiOperation(value = "Download a log file from a given instance")
   public Response downloadLogFileFromInstance(
+      @HeaderParam(HttpHeaders.AUTHORIZATION) String authorization,
       @ApiParam(value = "Instance Name", required = true) @PathParam("instanceName") String instanceName,
       @ApiParam(value = "Log file path", required = true) @QueryParam("filePath") String filePath,
       @Context Map<String, String> headers) {
@@ -201,6 +209,9 @@ public Response downloadLogFileFromInstance(
           requestBuilder.addHeader(header.getKey(), header.getValue());
         }
       }
+      if (authorization != null) {
+        requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, authorization);
+      }
       CloseableHttpResponse httpResponse = _fileUploadDownloadClient.getHttpClient().execute(requestBuilder.build());
       if (httpResponse.getStatusLine().getStatusCode() >= 400) {
         throw new WebApplicationException(IOUtils.toString(httpResponse.getEntity().getContent(), "UTF-8"),
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java
index dfdaefafaa7..aee7df4e8a6 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceAssignmentRestletResource.java
@@ -26,6 +26,7 @@
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -45,6 +46,7 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.pinot.common.assignment.InstanceAssignmentConfigUtils;
 import org.apache.pinot.common.assignment.InstancePartitions;
@@ -57,6 +59,7 @@
 import org.apache.pinot.controller.helix.core.assignment.instance.InstanceAssignmentDriver;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.config.table.TierConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
@@ -80,39 +83,57 @@ public class PinotInstanceAssignmentRestletResource {
   @Produces(MediaType.APPLICATION_JSON)
   @Path("/tables/{tableName}/instancePartitions")
   @ApiOperation(value = "Get the instance partitions")
-  public Map<InstancePartitionsType, InstancePartitions> getInstancePartitions(
+  public Map<String, InstancePartitions> getInstancePartitions(
       @ApiParam(value = "Name of the table") @PathParam("tableName") String tableName,
-      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED") @QueryParam("type") @Nullable
-          InstancePartitionsType instancePartitionsType) {
-    Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap = new TreeMap<>();
+      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED|tier name") @QueryParam("type") @Nullable String type) {
+    Map<String, InstancePartitions> instancePartitionsMap = new TreeMap<>();
 
     String rawTableName = TableNameBuilder.extractRawTableName(tableName);
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
     if (tableType != TableType.REALTIME) {
-      if (instancePartitionsType == InstancePartitionsType.OFFLINE || instancePartitionsType == null) {
-        InstancePartitions offlineInstancePartitions = InstancePartitionsUtils
-            .fetchInstancePartitions(_resourceManager.getPropertyStore(),
+      if (InstancePartitionsType.OFFLINE.toString().equals(type) || type == null) {
+        InstancePartitions offlineInstancePartitions =
+            InstancePartitionsUtils.fetchInstancePartitions(_resourceManager.getPropertyStore(),
                 InstancePartitionsType.OFFLINE.getInstancePartitionsName(rawTableName));
         if (offlineInstancePartitions != null) {
-          instancePartitionsMap.put(InstancePartitionsType.OFFLINE, offlineInstancePartitions);
+          instancePartitionsMap.put(InstancePartitionsType.OFFLINE.toString(), offlineInstancePartitions);
         }
       }
     }
     if (tableType != TableType.OFFLINE) {
-      if (instancePartitionsType == InstancePartitionsType.CONSUMING || instancePartitionsType == null) {
-        InstancePartitions consumingInstancePartitions = InstancePartitionsUtils
-            .fetchInstancePartitions(_resourceManager.getPropertyStore(),
+      if (InstancePartitionsType.CONSUMING.toString().equals(type) || type == null) {
+        InstancePartitions consumingInstancePartitions =
+            InstancePartitionsUtils.fetchInstancePartitions(_resourceManager.getPropertyStore(),
                 InstancePartitionsType.CONSUMING.getInstancePartitionsName(rawTableName));
         if (consumingInstancePartitions != null) {
-          instancePartitionsMap.put(InstancePartitionsType.CONSUMING, consumingInstancePartitions);
+          instancePartitionsMap.put(InstancePartitionsType.CONSUMING.toString(), consumingInstancePartitions);
         }
       }
-      if (instancePartitionsType == InstancePartitionsType.COMPLETED || instancePartitionsType == null) {
-        InstancePartitions completedInstancePartitions = InstancePartitionsUtils
-            .fetchInstancePartitions(_resourceManager.getPropertyStore(),
+      if (InstancePartitionsType.COMPLETED.toString().equals(type) || type == null) {
+        InstancePartitions completedInstancePartitions =
+            InstancePartitionsUtils.fetchInstancePartitions(_resourceManager.getPropertyStore(),
                 InstancePartitionsType.COMPLETED.getInstancePartitionsName(rawTableName));
         if (completedInstancePartitions != null) {
-          instancePartitionsMap.put(InstancePartitionsType.COMPLETED, completedInstancePartitions);
+          instancePartitionsMap.put(InstancePartitionsType.COMPLETED.toString(), completedInstancePartitions);
+        }
+      }
+    }
+
+    List<TableConfig> tableConfigs = Arrays.asList(_resourceManager.getRealtimeTableConfig(tableName),
+        _resourceManager.getOfflineTableConfig(tableName));
+
+    for (TableConfig tableConfig : tableConfigs) {
+      if (tableConfig != null && CollectionUtils.isNotEmpty(tableConfig.getTierConfigsList())) {
+        for (TierConfig tierConfig : tableConfig.getTierConfigsList()) {
+          if (type == null || type.equals(tierConfig.getName())) {
+            InstancePartitions instancePartitions =
+                InstancePartitionsUtils.fetchInstancePartitions(_resourceManager.getPropertyStore(),
+                    InstancePartitionsUtils.getInstancePartitionsNameForTier(tableConfig.getTableName(),
+                        tierConfig.getName()));
+            if (instancePartitions != null) {
+              instancePartitionsMap.put(tierConfig.getName(), instancePartitions);
+            }
+          }
         }
       }
     }
@@ -130,22 +151,20 @@ public Map<InstancePartitionsType, InstancePartitions> getInstancePartitions(
   @Path("/tables/{tableName}/assignInstances")
   @Authenticate(AccessType.CREATE)
   @ApiOperation(value = "Assign server instances to a table")
-  public Map<InstancePartitionsType, InstancePartitions> assignInstances(
+  public Map<String, InstancePartitions> assignInstances(
       @ApiParam(value = "Name of the table") @PathParam("tableName") String tableName,
-      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED") @QueryParam("type") @Nullable
-          InstancePartitionsType instancePartitionsType,
+      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED|tier name") @QueryParam("type") @Nullable String type,
       @ApiParam(value = "Whether to do dry-run") @DefaultValue("false") @QueryParam("dryRun") boolean dryRun) {
-    Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap = new TreeMap<>();
+    Map<String, InstancePartitions> instancePartitionsMap = new TreeMap<>();
     List<InstanceConfig> instanceConfigs = _resourceManager.getAllHelixInstanceConfigs();
 
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
-    if (tableType != TableType.REALTIME && (instancePartitionsType == InstancePartitionsType.OFFLINE
-        || instancePartitionsType == null)) {
+    if (tableType != TableType.REALTIME && (InstancePartitionsType.OFFLINE.toString().equals(type) || type == null)) {
       TableConfig offlineTableConfig = _resourceManager.getOfflineTableConfig(tableName);
       if (offlineTableConfig != null) {
         try {
-          if (InstanceAssignmentConfigUtils
-              .allowInstanceAssignment(offlineTableConfig, InstancePartitionsType.OFFLINE)) {
+          if (InstanceAssignmentConfigUtils.allowInstanceAssignment(offlineTableConfig,
+              InstancePartitionsType.OFFLINE)) {
             assignInstancesForInstancePartitionsType(instancePartitionsMap, offlineTableConfig, instanceConfigs,
                 InstancePartitionsType.OFFLINE);
           }
@@ -158,20 +177,20 @@ public Map<InstancePartitionsType, InstancePartitions> assignInstances(
         }
       }
     }
-    if (tableType != TableType.OFFLINE && instancePartitionsType != InstancePartitionsType.OFFLINE) {
+    if (tableType != TableType.OFFLINE && !InstancePartitionsType.OFFLINE.toString().equals(type)) {
       TableConfig realtimeTableConfig = _resourceManager.getRealtimeTableConfig(tableName);
       if (realtimeTableConfig != null) {
         try {
-          if (instancePartitionsType == InstancePartitionsType.CONSUMING || instancePartitionsType == null) {
-            if (InstanceAssignmentConfigUtils
-                .allowInstanceAssignment(realtimeTableConfig, InstancePartitionsType.CONSUMING)) {
+          if (InstancePartitionsType.CONSUMING.toString().equals(type) || type == null) {
+            if (InstanceAssignmentConfigUtils.allowInstanceAssignment(realtimeTableConfig,
+                InstancePartitionsType.CONSUMING)) {
               assignInstancesForInstancePartitionsType(instancePartitionsMap, realtimeTableConfig, instanceConfigs,
                   InstancePartitionsType.CONSUMING);
             }
           }
-          if (instancePartitionsType == InstancePartitionsType.COMPLETED || instancePartitionsType == null) {
-            if (InstanceAssignmentConfigUtils
-                .allowInstanceAssignment(realtimeTableConfig, InstancePartitionsType.COMPLETED)) {
+          if (InstancePartitionsType.COMPLETED.toString().equals(type) || type == null) {
+            if (InstanceAssignmentConfigUtils.allowInstanceAssignment(realtimeTableConfig,
+                InstancePartitionsType.COMPLETED)) {
               assignInstancesForInstancePartitionsType(instancePartitionsMap, realtimeTableConfig, instanceConfigs,
                   InstancePartitionsType.COMPLETED);
             }
@@ -186,6 +205,16 @@ public Map<InstancePartitionsType, InstancePartitions> assignInstances(
       }
     }
 
+    TableConfig realtimeTableConfig = _resourceManager.getRealtimeTableConfig(tableName);
+    if (realtimeTableConfig != null) {
+      assignInstancesForTier(instancePartitionsMap, realtimeTableConfig, instanceConfigs, type);
+    }
+
+    TableConfig offlineTableConfig = _resourceManager.getOfflineTableConfig(tableName);
+    if (offlineTableConfig != null) {
+      assignInstancesForTier(instancePartitionsMap, offlineTableConfig, instanceConfigs, type);
+    }
+
     if (instancePartitionsMap.isEmpty()) {
       throw new ControllerApplicationException(LOGGER, "Failed to find the instance assignment config",
           Response.Status.NOT_FOUND);
@@ -207,22 +236,43 @@ public Map<InstancePartitionsType, InstancePartitions> assignInstances(
    * @param instanceConfigs list of instance configs
    * @param instancePartitionsType type of instancePartitions
    */
-  private void assignInstancesForInstancePartitionsType(
-      Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap, TableConfig tableConfig,
-      List<InstanceConfig> instanceConfigs, InstancePartitionsType instancePartitionsType) {
+  private void assignInstancesForInstancePartitionsType(Map<String, InstancePartitions> instancePartitionsMap,
+      TableConfig tableConfig, List<InstanceConfig> instanceConfigs, InstancePartitionsType instancePartitionsType) {
     String tableNameWithType = tableConfig.getTableName();
     if (TableConfigUtils.hasPreConfiguredInstancePartitions(tableConfig, instancePartitionsType)) {
       String rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
-      instancePartitionsMap.put(instancePartitionsType, InstancePartitionsUtils.fetchInstancePartitionsWithRename(
-          _resourceManager.getPropertyStore(), tableConfig.getInstancePartitionsMap().get(instancePartitionsType),
-          instancePartitionsType.getInstancePartitionsName(rawTableName)));
+      instancePartitionsMap.put(instancePartitionsType.toString(),
+          InstancePartitionsUtils.fetchInstancePartitionsWithRename(_resourceManager.getPropertyStore(),
+              tableConfig.getInstancePartitionsMap().get(instancePartitionsType),
+              instancePartitionsType.getInstancePartitionsName(rawTableName)));
       return;
     }
     InstancePartitions existingInstancePartitions =
         InstancePartitionsUtils.fetchInstancePartitions(_resourceManager.getHelixZkManager().getHelixPropertyStore(),
             InstancePartitionsUtils.getInstancePartitionsName(tableNameWithType, instancePartitionsType.toString()));
-    instancePartitionsMap.put(instancePartitionsType, new InstanceAssignmentDriver(tableConfig)
-        .assignInstances(instancePartitionsType, instanceConfigs, existingInstancePartitions));
+    instancePartitionsMap.put(instancePartitionsType.toString(),
+        new InstanceAssignmentDriver(tableConfig).assignInstances(instancePartitionsType, instanceConfigs,
+            existingInstancePartitions));
+  }
+
+  private void assignInstancesForTier(Map<String, InstancePartitions> instancePartitionsMap, TableConfig tableConfig,
+      List<InstanceConfig> instanceConfigs, String tierName) {
+    if (CollectionUtils.isNotEmpty(tableConfig.getTierConfigsList())
+        && tableConfig.getInstanceAssignmentConfigMap() != null) {
+      for (TierConfig tierConfig : tableConfig.getTierConfigsList()) {
+        if ((tierConfig.getName().equals(tierName) || tierName == null)
+            && tableConfig.getInstanceAssignmentConfigMap().get(tierConfig.getName()) != null) {
+          InstancePartitions existingInstancePartitions = InstancePartitionsUtils.fetchInstancePartitions(
+              _resourceManager.getHelixZkManager().getHelixPropertyStore(),
+              InstancePartitionsUtils.getInstancePartitionsNameForTier(tableConfig.getTableName(),
+                  tierConfig.getName()));
+
+          instancePartitionsMap.put(tierConfig.getName(),
+              new InstanceAssignmentDriver(tableConfig).assignInstances(tierConfig.getName(), instanceConfigs,
+                  existingInstancePartitions, tableConfig.getInstanceAssignmentConfigMap().get(tierConfig.getName())));
+        }
+      }
+    }
   }
 
   private void persistInstancePartitionsHelper(InstancePartitions instancePartitions) {
@@ -240,7 +290,7 @@ private void persistInstancePartitionsHelper(InstancePartitions instancePartitio
   @Path("/tables/{tableName}/instancePartitions")
   @Authenticate(AccessType.UPDATE)
   @ApiOperation(value = "Create/update the instance partitions")
-  public Map<InstancePartitionsType, InstancePartitions> setInstancePartitions(
+  public Map<String, InstancePartitions> setInstancePartitions(
       @ApiParam(value = "Name of the table") @PathParam("tableName") String tableName, String instancePartitionsStr) {
     InstancePartitions instancePartitions;
     try {
@@ -256,17 +306,32 @@ public Map<InstancePartitionsType, InstancePartitions> setInstancePartitions(
     if (tableType != TableType.REALTIME) {
       if (InstancePartitionsType.OFFLINE.getInstancePartitionsName(rawTableName).equals(instancePartitionsName)) {
         persistInstancePartitionsHelper(instancePartitions);
-        return Collections.singletonMap(InstancePartitionsType.OFFLINE, instancePartitions);
+        return Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(), instancePartitions);
       }
     }
     if (tableType != TableType.OFFLINE) {
       if (InstancePartitionsType.CONSUMING.getInstancePartitionsName(rawTableName).equals(instancePartitionsName)) {
         persistInstancePartitionsHelper(instancePartitions);
-        return Collections.singletonMap(InstancePartitionsType.CONSUMING, instancePartitions);
+        return Collections.singletonMap(InstancePartitionsType.CONSUMING.toString(), instancePartitions);
       }
       if (InstancePartitionsType.COMPLETED.getInstancePartitionsName(rawTableName).equals(instancePartitionsName)) {
         persistInstancePartitionsHelper(instancePartitions);
-        return Collections.singletonMap(InstancePartitionsType.COMPLETED, instancePartitions);
+        return Collections.singletonMap(InstancePartitionsType.COMPLETED.toString(), instancePartitions);
+      }
+    }
+
+    List<TableConfig> tableConfigs = Arrays.asList(_resourceManager.getRealtimeTableConfig(tableName),
+        _resourceManager.getOfflineTableConfig(tableName));
+
+    for (TableConfig tableConfig : tableConfigs) {
+      if (tableConfig != null && CollectionUtils.isNotEmpty(tableConfig.getTierConfigsList())) {
+        for (TierConfig tierConfig : tableConfig.getTierConfigsList()) {
+          if (InstancePartitionsUtils.getInstancePartitionsNameForTier(tableConfig.getTableName(), tierConfig.getName())
+              .equals(instancePartitionsName)) {
+            persistInstancePartitionsHelper(instancePartitions);
+            return Collections.singletonMap(tierConfig.getName(), instancePartitions);
+          }
+        }
       }
     }
 
@@ -281,22 +346,39 @@ public Map<InstancePartitionsType, InstancePartitions> setInstancePartitions(
   @ApiOperation(value = "Remove the instance partitions")
   public SuccessResponse removeInstancePartitions(
       @ApiParam(value = "Name of the table") @PathParam("tableName") String tableName,
-      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED") @QueryParam("type") @Nullable
-          InstancePartitionsType instancePartitionsType) {
+      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED|tier name") @QueryParam("type") @Nullable
+          String instancePartitionsType) {
     String rawTableName = TableNameBuilder.extractRawTableName(tableName);
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
-    if (tableType != TableType.REALTIME && (instancePartitionsType == InstancePartitionsType.OFFLINE
+    if (tableType != TableType.REALTIME && (InstancePartitionsType.OFFLINE.toString().equals(instancePartitionsType)
         || instancePartitionsType == null)) {
       removeInstancePartitionsHelper(InstancePartitionsType.OFFLINE.getInstancePartitionsName(rawTableName));
     }
     if (tableType != TableType.OFFLINE) {
-      if (instancePartitionsType == InstancePartitionsType.CONSUMING || instancePartitionsType == null) {
+      if (InstancePartitionsType.CONSUMING.toString().equals(instancePartitionsType)
+          || instancePartitionsType == null) {
         removeInstancePartitionsHelper(InstancePartitionsType.CONSUMING.getInstancePartitionsName(rawTableName));
       }
-      if (instancePartitionsType == InstancePartitionsType.COMPLETED || instancePartitionsType == null) {
+      if (InstancePartitionsType.COMPLETED.toString().equals(instancePartitionsType)
+          || instancePartitionsType == null) {
         removeInstancePartitionsHelper(InstancePartitionsType.COMPLETED.getInstancePartitionsName(rawTableName));
       }
     }
+
+    List<TableConfig> tableConfigs = Arrays.asList(_resourceManager.getRealtimeTableConfig(tableName),
+        _resourceManager.getOfflineTableConfig(tableName));
+
+    for (TableConfig tableConfig : tableConfigs) {
+      if (tableConfig != null && CollectionUtils.isNotEmpty(tableConfig.getTierConfigsList())) {
+        for (TierConfig tierConfig : tableConfig.getTierConfigsList()) {
+          if (instancePartitionsType == null || instancePartitionsType.equals(tierConfig.getName())) {
+            removeInstancePartitionsHelper(
+                InstancePartitionsUtils.getInstancePartitionsNameForTier(tableConfig.getTableName(),
+                    tierConfig.getName()));
+          }
+        }
+      }
+    }
     return new SuccessResponse("Instance partitions removed");
   }
 
@@ -315,16 +397,16 @@ private void removeInstancePartitionsHelper(String instancePartitionsName) {
   @Path("/tables/{tableName}/replaceInstance")
   @Authenticate(AccessType.CREATE)
   @ApiOperation(value = "Replace an instance in the instance partitions")
-  public Map<InstancePartitionsType, InstancePartitions> replaceInstance(
+  public Map<String, InstancePartitions> replaceInstance(
       @ApiParam(value = "Name of the table") @PathParam("tableName") String tableName,
-      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED") @QueryParam("type") @Nullable
-          InstancePartitionsType instancePartitionsType,
+      @ApiParam(value = "OFFLINE|CONSUMING|COMPLETED|tier name") @QueryParam("type") @Nullable
+          String type,
       @ApiParam(value = "Old instance to be replaced", required = true) @QueryParam("oldInstanceId")
           String oldInstanceId,
       @ApiParam(value = "New instance to replace with", required = true) @QueryParam("newInstanceId")
           String newInstanceId) {
-    Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap =
-        getInstancePartitions(tableName, instancePartitionsType);
+    Map<String, InstancePartitions> instancePartitionsMap =
+        getInstancePartitions(tableName, type);
     Iterator<InstancePartitions> iterator = instancePartitionsMap.values().iterator();
     while (iterator.hasNext()) {
       InstancePartitions instancePartitions = iterator.next();
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
index cff4a470a4b..06ca9ec92f6 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
@@ -20,6 +20,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Sets;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiKeyAuthDefinition;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +30,13 @@
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.ws.rs.ClientErrorException;
 import javax.ws.rs.Consumes;
@@ -48,6 +54,7 @@
 import javax.ws.rs.core.Response;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.pinot.common.utils.config.InstanceUtils;
+import org.apache.pinot.common.utils.config.TagNameUtils;
 import org.apache.pinot.controller.api.access.AccessType;
 import org.apache.pinot.controller.api.access.Authenticate;
 import org.apache.pinot.controller.api.exception.ControllerApplicationException;
@@ -215,6 +222,48 @@ public SuccessResponse addInstance(
     }
   }
 
+  @PUT
+  @Path("/instances/{instanceName}/state")
+  @Authenticate(AccessType.UPDATE)
+  @Produces(MediaType.APPLICATION_JSON)
+  @Consumes(MediaType.TEXT_PLAIN)
+  @ApiOperation(value = "Enable/disable an instance", notes = "Enable/disable an instance")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 400, message = "Bad Request"),
+      @ApiResponse(code = 404, message = "Instance not found"),
+      @ApiResponse(code = 500, message = "Internal error")
+  })
+  public SuccessResponse toggleInstanceState(
+      @ApiParam(value = "Instance name", required = true, example = "Server_a.b.com_20000 | Broker_my.broker.com_30000")
+      @PathParam("instanceName") String instanceName,
+      @ApiParam(value = "enable|disable", required = true) @QueryParam("state") String state) {
+    if (!_pinotHelixResourceManager.instanceExists(instanceName)) {
+      throw new ControllerApplicationException(LOGGER, "Instance '" + instanceName + "' does not exist",
+          Response.Status.NOT_FOUND);
+    }
+
+    if (StateType.ENABLE.name().equalsIgnoreCase(state)) {
+      PinotResourceManagerResponse response = _pinotHelixResourceManager.enableInstance(instanceName);
+      if (!response.isSuccessful()) {
+        throw new ControllerApplicationException(LOGGER,
+            "Failed to enable instance '" + instanceName + "': " + response.getMessage(),
+            Response.Status.INTERNAL_SERVER_ERROR);
+      }
+    } else if (StateType.DISABLE.name().equalsIgnoreCase(state)) {
+      PinotResourceManagerResponse response = _pinotHelixResourceManager.disableInstance(instanceName);
+      if (!response.isSuccessful()) {
+        throw new ControllerApplicationException(LOGGER,
+            "Failed to disable instance '" + instanceName + "': " + response.getMessage(),
+            Response.Status.INTERNAL_SERVER_ERROR);
+      }
+    } else {
+      throw new ControllerApplicationException(LOGGER, "Unknown state '" + state + "'", Response.Status.BAD_REQUEST);
+    }
+    return new SuccessResponse("Request to " + state + " instance '" + instanceName + "' is successful");
+  }
+
+  @Deprecated
   @POST
   @Path("/instances/{instanceName}/state")
   @Authenticate(AccessType.UPDATE)
@@ -228,7 +277,7 @@ public SuccessResponse addInstance(
       @ApiResponse(code = 409, message = "Instance cannot be dropped"),
       @ApiResponse(code = 500, message = "Internal error")
   })
-  public SuccessResponse toggleInstanceState(
+  public SuccessResponse toggleInstanceStateDeprecated(
       @ApiParam(value = "Instance name", required = true, example = "Server_a.b.com_20000 | Broker_my.broker.com_30000")
       @PathParam("instanceName") String instanceName, String state) {
     if (!_pinotHelixResourceManager.instanceExists(instanceName)) {
@@ -390,4 +439,172 @@ public SuccessResponse updateBrokerResource(
           Response.Status.INTERNAL_SERVER_ERROR, e);
     }
   }
+
+  @GET
+  @Path("/instances/dropInstance/validate")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation(value = "Check if it's safe to drop the given instances. If not list all the reasons why its not safe.")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 500, message = "Internal error")
+  })
+  public List<OperationValidationResponse> instanceDropSafetyCheck(
+      @ApiParam(value = "Instance names", required = true,
+          example = "Broker_my.broker.com_30000")
+      @QueryParam("instanceNames") List<String> instanceNames) {
+    LOGGER.info("Performing safety check on drop operation request received for instances: {}", instanceNames);
+    try {
+      return instanceNames.stream()
+              .map(instance -> _pinotHelixResourceManager.instanceDropSafetyCheck(instance))
+              .collect(Collectors.toList());
+    } catch (ClientErrorException e) {
+      throw new ControllerApplicationException(LOGGER, e.getMessage(), e.getResponse().getStatus());
+    } catch (Exception e) {
+      throw new ControllerApplicationException(LOGGER, "Failed to check the safety for instance drop operation.",
+          Response.Status.INTERNAL_SERVER_ERROR, e);
+    }
+  }
+
+  /**
+   * Endpoint to validate the safety of instance tag update requests.
+   * This is to ensure that any instance tag update operation that user wants to perform is safe and does not create any
+   * side effect on the cluster and disturb the cluster consistency.
+   * This operation does not perform any changes to the cluster, but surfaces the possible issues which might occur upon
+   * applying the intended changes.
+   * @param requests list if instance tag update requests
+   * @return list of {@link OperationValidationResponse} which denotes the validity of each request along with listing
+   * the issues if any.
+   */
+  @POST
+  @Path("/instances/updateTags/validate")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation(value = "Check if it's safe to update the tags of the given instances. If not list all the reasons.")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 500, message = "Internal error")
+  })
+  public List<OperationValidationResponse> instanceTagUpdateSafetyCheck(List<InstanceTagUpdateRequest> requests) {
+    LOGGER.info("Performing safety check on tag update request received for instances: {}",
+        requests.stream().map(InstanceTagUpdateRequest::getInstanceName).collect(Collectors.toList()));
+    Map<String, Integer> tagMinServerMap = _pinotHelixResourceManager.minimumInstancesRequiredForTags();
+    Map<String, Integer> tagToInstanceCountMap = getUpdatedTagToInstanceCountMap(requests);
+    Map<String, Integer> tagDeficiency = computeTagDeficiency(tagToInstanceCountMap, tagMinServerMap);
+
+    Map<String, List<OperationValidationResponse.ErrorWrapper>> responseMap = new HashMap<>(requests.size());
+    List<OperationValidationResponse.ErrorWrapper> tenantIssues = new ArrayList<>();
+    requests.forEach(request -> responseMap.put(request.getInstanceName(), new ArrayList<>()));
+    for (InstanceTagUpdateRequest request : requests) {
+      String name = request.getInstanceName();
+      Set<String> oldTags;
+      try {
+        oldTags = new HashSet<>(_pinotHelixResourceManager.getTagsForInstance(name));
+      } catch (NullPointerException exception) {
+        throw new ControllerApplicationException(LOGGER,
+            String.format("Instance %s is not a valid instance name.", name), Response.Status.PRECONDITION_FAILED);
+      }
+      Set<String> newTags = new HashSet<>(request.getNewTags());
+      // tags removed from instance
+      for (String tag : Sets.difference(oldTags, newTags)) {
+        Integer deficiency = tagDeficiency.get(tag);
+        if (deficiency != null && deficiency > 0) {
+          String tenant = TagNameUtils.getTenantFromTag(tag);
+          String tagType = getInstanceTypeFromTag(tag);
+          responseMap.get(name).add(new OperationValidationResponse.ErrorWrapper(
+              OperationValidationResponse.ErrorCode.MINIMUM_INSTANCE_UNSATISFIED, tenant, tagType, tag, tagType, name));
+          tagDeficiency.put(tag, deficiency - 1);
+        }
+      }
+      // newly added tags to instance
+      for (String tag : newTags) {
+        String tagType = getInstanceTypeFromTag(tag);
+        if (tagType == null && (name.startsWith(CommonConstants.Helix.PREFIX_OF_BROKER_INSTANCE)
+            || name.startsWith(CommonConstants.Helix.PREFIX_OF_SERVER_INSTANCE))) {
+          responseMap.get(name).add(new OperationValidationResponse.ErrorWrapper(
+              OperationValidationResponse.ErrorCode.UNRECOGNISED_TAG_TYPE, tag));
+          continue;
+        }
+        Integer deficiency = tagDeficiency.get(tag);
+        if (deficiency != null && deficiency > 0) {
+          tenantIssues.add(new OperationValidationResponse.ErrorWrapper(
+              OperationValidationResponse.ErrorCode.ALREADY_DEFICIENT_TENANT, TagNameUtils.getTenantFromTag(tag),
+              tagType, deficiency.toString(), name));
+        }
+      }
+    }
+
+    // consolidate all the issues based on instances
+    List<OperationValidationResponse> response = new ArrayList<>(requests.size());
+    responseMap.forEach((instance, issueList) -> response.add(issueList.isEmpty()
+        ? new OperationValidationResponse().setInstanceName(instance).setSafe(true)
+        : new OperationValidationResponse().putAllIssues(issueList).setInstanceName(instance).setSafe(false)));
+    // separate entry to group all the deficient tenant issues as it's not related to any instance
+    if (!tenantIssues.isEmpty()) {
+      response.add(new OperationValidationResponse().putAllIssues(tenantIssues).setSafe(false));
+    }
+    return response;
+  }
+
+  private String getInstanceTypeFromTag(String tag) {
+    if (TagNameUtils.isServerTag(tag)) {
+      return "server";
+    } else if (TagNameUtils.isBrokerTag(tag)) {
+      return "broker";
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Compute the number of deficient instances for each tag.
+   * The utility accepts two maps
+   * - map of tags and count of their intended tagged instances
+   * - map of tags and their minimum number of instance requirements
+   * And then compares these two maps to return a map of tags and the number of their deficient instances.
+   *
+   * @param tagToInstanceCountMap tags and count of their intended tagged instances
+   * @param tagToMinInstanceCountMap tags and their minimum number of instance requirements
+   * @return tags and the number of their deficient instances
+   */
+  private Map<String, Integer> computeTagDeficiency(Map<String, Integer> tagToInstanceCountMap,
+      Map<String, Integer> tagToMinInstanceCountMap) {
+    Map<String, Integer> tagDeficiency = new HashMap<>();
+    Map<String, Integer> tagToInstanceCountMapCopy = new HashMap<>(tagToInstanceCountMap);
+    // compute deficiency for each of the minimum instance requirement entry
+    tagToMinInstanceCountMap.forEach((tag, minInstances) -> {
+      Integer updatedInstances = tagToInstanceCountMapCopy.remove(tag);
+      // if tag is not present in the provided map its considered as if tag is not assigned to any instance
+      // hence deficiency = minimum instance requirement.
+      tagDeficiency.put(tag, minInstances - (updatedInstances != null ? updatedInstances : 0));
+    });
+    // tags for which minimum instance requirement is not specified are assumed to have no deficiency (deficiency = 0)
+    tagToInstanceCountMapCopy.forEach((tag, updatedInstances) -> tagDeficiency.put(tag, 0));
+    return tagDeficiency;
+  }
+
+  /**
+   * Utility to fetch the existing tags and count of their respective tagged instances and then apply the changes based
+   * on the provided list of {@link InstanceTagUpdateRequest} to get the updated map of tags and count of their
+   * respective tagged instances
+   * @param requests list of {@link InstanceTagUpdateRequest}
+   * @return map of tags and updated count of their respective tagged instances
+   */
+  private Map<String, Integer> getUpdatedTagToInstanceCountMap(List<InstanceTagUpdateRequest> requests) {
+    Map<String, Integer> updatedTagInstanceMap = new HashMap<>();
+    Set<String> visitedInstances = new HashSet<>();
+    // build the map of tags and their respective instance counts from the given tag update request list
+    requests.forEach(instance -> {
+      instance.getNewTags().forEach(tag ->
+          updatedTagInstanceMap.put(tag, updatedTagInstanceMap.getOrDefault(tag, 0) + 1));
+      visitedInstances.add(instance.getInstanceName());
+    });
+    // add the instance counts to tags for the rest of the instances apart from the ones mentioned in requests
+    _pinotHelixResourceManager.getAllInstances().forEach(instance -> {
+      if (!visitedInstances.contains(instance)) {
+        _pinotHelixResourceManager.getTagsForInstance(instance).forEach(tag ->
+            updatedTagInstanceMap.put(tag, updatedTagInstanceMap.getOrDefault(tag, 0) + 1));
+        visitedInstances.add(instance);
+      }
+    });
+    return updatedTagInstanceMap;
+  }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
index 6dd546c778d..3b3abb79811 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
@@ -30,9 +30,11 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -42,15 +44,18 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import org.apache.calcite.jdbc.CalciteSchemaBuilder;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.pinot.common.Utils;
 import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.utils.config.TagNameUtils;
+import org.apache.pinot.common.response.ProcessingException;
 import org.apache.pinot.common.utils.request.RequestUtils;
 import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.api.access.AccessControl;
@@ -59,6 +64,11 @@
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.core.auth.ManualAuthorization;
 import org.apache.pinot.core.query.executor.sql.SqlQueryExecutor;
+import org.apache.pinot.query.QueryEnvironment;
+import org.apache.pinot.query.catalog.PinotCatalog;
+import org.apache.pinot.query.type.TypeFactory;
+import org.apache.pinot.query.type.TypeSystem;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -66,6 +76,7 @@
 import org.apache.pinot.sql.parsers.CalciteSqlCompiler;
 import org.apache.pinot.sql.parsers.CalciteSqlParser;
 import org.apache.pinot.sql.parsers.PinotSqlType;
+import org.apache.pinot.sql.parsers.SqlCompilationException;
 import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,6 +116,12 @@ public String handlePostSql(String requestJsonStr, @Context HttpHeaders httpHead
       }
       LOGGER.debug("Trace: {}, Running query: {}", traceEnabled, sqlQuery);
       return executeSqlQuery(httpHeaders, sqlQuery, traceEnabled, queryOptions, "/sql");
+    } catch (ProcessingException pe) {
+      LOGGER.error("Caught exception while processing post request {}", pe.getMessage());
+      return pe.getMessage();
+    } catch (WebApplicationException wae) {
+      LOGGER.error("Caught exception while processing post request", wae);
+      throw wae;
     } catch (Exception e) {
       LOGGER.error("Caught exception while processing post request", e);
       return QueryException.getException(QueryException.INTERNAL_ERROR, e).toString();
@@ -118,6 +135,12 @@ public String handleGetSql(@QueryParam("sql") String sqlQuery, @QueryParam("trac
     try {
       LOGGER.debug("Trace: {}, Running query: {}", traceEnabled, sqlQuery);
       return executeSqlQuery(httpHeaders, sqlQuery, traceEnabled, queryOptions, "/sql");
+    } catch (ProcessingException pe) {
+      LOGGER.error("Caught exception while processing get request {}", pe.getMessage());
+      return pe.getMessage();
+    } catch (WebApplicationException wae) {
+      LOGGER.error("Caught exception while processing get request", wae);
+      throw wae;
     } catch (Exception e) {
       LOGGER.error("Caught exception while processing get request", e);
       return QueryException.getException(QueryException.INTERNAL_ERROR, e).toString();
@@ -127,7 +150,12 @@ public String handleGetSql(@QueryParam("sql") String sqlQuery, @QueryParam("trac
   private String executeSqlQuery(@Context HttpHeaders httpHeaders, String sqlQuery, String traceEnabled,
       @Nullable String queryOptions, String endpointUrl)
       throws Exception {
-    SqlNodeAndOptions sqlNodeAndOptions = CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery);
+    SqlNodeAndOptions sqlNodeAndOptions;
+    try {
+      sqlNodeAndOptions = CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery);
+    } catch (SqlCompilationException ex) {
+      throw QueryException.getException(QueryException.SQL_PARSING_ERROR, ex);
+    }
     Map<String, String> options = sqlNodeAndOptions.getOptions();
     if (queryOptions != null) {
       Map<String, String> optionsFromString = RequestUtils.getOptionsFromString(queryOptions);
@@ -138,7 +166,7 @@ private String executeSqlQuery(@Context HttpHeaders httpHeaders, String sqlQuery
     if (Boolean.parseBoolean(options.get(QueryOptionKey.USE_MULTISTAGE_ENGINE))) {
       if (_controllerConf.getProperty(CommonConstants.Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED,
           CommonConstants.Helix.DEFAULT_MULTI_STAGE_ENGINE_ENABLED)) {
-        return getMultiStageQueryResponse(sqlQuery, queryOptions, httpHeaders, endpointUrl);
+        return getMultiStageQueryResponse(sqlQuery, queryOptions, httpHeaders, endpointUrl, traceEnabled);
       } else {
         throw new UnsupportedOperationException("V2 Multi-Stage query engine not enabled. "
             + "Please see https://docs.pinot.apache.org/ for instruction to enable V2 engine.");
@@ -161,19 +189,44 @@ private String executeSqlQuery(@Context HttpHeaders httpHeaders, String sqlQuery
   }
 
   private String getMultiStageQueryResponse(String query, String queryOptions, HttpHeaders httpHeaders,
-      String endpointUrl) {
+      String endpointUrl, String traceEnabled) {
 
     // Validate data access
     // we don't have a cross table access control rule so only ADMIN can make request to multi-stage engine.
     AccessControl accessControl = _accessControlFactory.create();
     if (!accessControl.hasAccess(null, AccessType.READ, httpHeaders, endpointUrl)) {
-      return QueryException.ACCESS_DENIED_ERROR.toString();
+      throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
+    }
+
+    QueryEnvironment queryEnvironment = new QueryEnvironment(new TypeFactory(new TypeSystem()),
+        CalciteSchemaBuilder.asRootSchema(new PinotCatalog(_pinotHelixResourceManager.getTableCache())), null, null);
+    List<String> tableNames = queryEnvironment.getTableNamesForQuery(query);
+    String brokerTenant;
+    if (tableNames.size() != 0) {
+      List<TableConfig> tableConfigList = getListTableConfigs(tableNames);
+      if (tableConfigList == null || tableConfigList.size() == 0) {
+        return QueryException.getException(QueryException.TABLE_DOES_NOT_EXIST_ERROR,
+            new Exception("Unable to find table in cluster, table does not exist")).toString();
+      }
+
+      // When routing a query, there should be at least one common broker tenant for the table. However, the server
+      // tenants can be completely disjoint. The leaf stages which access segments will be processed on the respective
+      // server tenants for each table. The intermediate stages can be processed in either or all of the server tenants
+      // belonging to the tables.
+      brokerTenant = getCommonBrokerTenant(tableConfigList);
+      if (brokerTenant == null) {
+        return QueryException.getException(QueryException.BROKER_REQUEST_SEND_ERROR, new Exception(
+            String.format("Unable to dispatch multistage query with multiple tables : %s " + "on different tenant",
+                tableNames))).toString();
+      }
+    } else {
+      // TODO fail these queries going forward. Added this logic to take care of tautologies like BETWEEN 0 and -1.
+      List<String> allBrokerList = new ArrayList<>(_pinotHelixResourceManager.getAllBrokerTenantNames());
+      brokerTenant = allBrokerList.get(RANDOM.nextInt(allBrokerList.size()));
+      LOGGER.error("Unable to find table name from SQL {} thus dispatching to random broker.", query);
     }
+    List<String> instanceIds = new ArrayList<>(_pinotHelixResourceManager.getAllInstancesForBrokerTenant(brokerTenant));
 
-    // Get brokers, only DEFAULT tenant is supported for now.
-    // TODO: implement logic that only allows executing query where all accessed tables are within the same tenant.
-    List<String> instanceIds = new ArrayList<>(_pinotHelixResourceManager.getAllInstancesForBrokerTenant(
-        TagNameUtils.DEFAULT_TENANT_NAME));
     if (instanceIds.isEmpty()) {
       return QueryException.BROKER_RESOURCE_MISSING_ERROR.toString();
     }
@@ -185,7 +238,7 @@ private String getMultiStageQueryResponse(String query, String queryOptions, Htt
 
     // Send query to a random broker.
     String instanceId = instanceIds.get(RANDOM.nextInt(instanceIds.size()));
-    return sendRequestToBroker(query, instanceId, "false", queryOptions, httpHeaders);
+    return sendRequestToBroker(query, instanceId, traceEnabled, queryOptions, httpHeaders);
   }
 
   private String getQueryResponse(String query, @Nullable SqlNode sqlNode, String traceEnabled, String queryOptions,
@@ -194,8 +247,8 @@ private String getQueryResponse(String query, @Nullable SqlNode sqlNode, String
     String tableName;
     try {
       String inputTableName =
-          sqlNode != null ? RequestUtils.getTableName(CalciteSqlParser.compileSqlNodeToPinotQuery(sqlNode))
-              : CalciteSqlCompiler.compileToBrokerRequest(query).getQuerySource().getTableName();
+          sqlNode != null ? RequestUtils.getTableNames(CalciteSqlParser.compileSqlNodeToPinotQuery(sqlNode)).iterator()
+              .next() : CalciteSqlCompiler.compileToBrokerRequest(query).getQuerySource().getTableName();
       tableName = _pinotHelixResourceManager.getActualTableName(inputTableName);
     } catch (Exception e) {
       LOGGER.error("Caught exception while compiling query: {}", query, e);
@@ -226,6 +279,37 @@ private String getQueryResponse(String query, @Nullable SqlNode sqlNode, String
     return sendRequestToBroker(query, instanceId, traceEnabled, queryOptions, httpHeaders);
   }
 
+  // given a list of tables, returns the list of tableConfigs
+  private List<TableConfig> getListTableConfigs(List<String> tableNames) {
+    List<TableConfig> allTableConfigList = new ArrayList<>();
+    for (String tableName : tableNames) {
+      List<TableConfig> tableConfigList = new ArrayList<>();
+      if (_pinotHelixResourceManager.hasRealtimeTable(tableName)) {
+        tableConfigList.add(Objects.requireNonNull(_pinotHelixResourceManager.getRealtimeTableConfig(tableName)));
+      }
+      if (_pinotHelixResourceManager.hasOfflineTable(tableName)) {
+        tableConfigList.add(Objects.requireNonNull(_pinotHelixResourceManager.getOfflineTableConfig(tableName)));
+      }
+      if (tableConfigList.size() == 0) {
+        return null;
+      }
+      allTableConfigList.addAll(tableConfigList);
+    }
+    return allTableConfigList;
+  }
+
+  // return the brokerTenant if all table configs point to the same broker, else returns null
+  private String getCommonBrokerTenant(List<TableConfig> tableConfigList) {
+    Set<String> tableBrokers = new HashSet<>();
+    for (TableConfig tableConfig : tableConfigList) {
+      tableBrokers.add(tableConfig.getTenantConfig().getBroker());
+    }
+    if (tableBrokers.size() != 1) {
+      return null;
+    }
+    return (String) (tableBrokers.toArray()[0]);
+  }
+
   private String sendRequestToBroker(String query, String instanceId, String traceEnabled, String queryOptions,
       HttpHeaders httpHeaders) {
     InstanceConfig instanceConfig = _pinotHelixResourceManager.getHelixInstanceConfig(instanceId);
@@ -314,9 +398,13 @@ public String sendPostRaw(String urlStr, String requestStr, Map<String, String>
       /*if (LOG.isInfoEnabled()){
         LOGGER.info("The http response code is " + responseCode);
       }*/
-      if (responseCode != HttpURLConnection.HTTP_OK) {
-        throw new IOException("Failed : HTTP error code : " + responseCode + ". Root Cause: "
-            + IOUtils.toString(conn.getErrorStream(), StandardCharsets.UTF_8));
+      if (responseCode == HttpURLConnection.HTTP_FORBIDDEN) {
+        throw new WebApplicationException("Permission denied", Response.Status.FORBIDDEN);
+      } else if (responseCode != HttpURLConnection.HTTP_OK) {
+        InputStream errorStream = conn.getErrorStream();
+        throw new IOException(
+            "Failed : HTTP error code : " + responseCode + ". Root Cause: " + (errorStream != null ? IOUtils.toString(
+                errorStream, StandardCharsets.UTF_8) : "Unknown"));
       }
       final byte[] bytes = drain(new BufferedInputStream(conn.getInputStream()));
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotRealtimeTableResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotRealtimeTableResource.java
index 1b16fbc1c9a..26bd7256dd0 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotRealtimeTableResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotRealtimeTableResource.java
@@ -47,6 +47,7 @@
 import javax.ws.rs.core.Response;
 import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.helix.model.IdealState;
+import org.apache.pinot.common.metadata.controllerjob.ControllerJobType;
 import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.api.exception.ControllerApplicationException;
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
@@ -165,7 +166,8 @@ public JsonNode getForceCommitJobStatus(
       @ApiParam(value = "Force commit job id", required = true) @PathParam("jobId") String forceCommitJobId)
       throws Exception {
     Map<String, String> controllerJobZKMetadata =
-        _pinotHelixResourceManager.getControllerJobZKMetadata(forceCommitJobId);
+        _pinotHelixResourceManager.getControllerJobZKMetadata(forceCommitJobId,
+            ControllerJobType.FORCE_COMMIT);
     if (controllerJobZKMetadata == null) {
       throw new ControllerApplicationException(LOGGER, "Failed to find controller job id: " + forceCommitJobId,
           Response.Status.NOT_FOUND);
@@ -227,8 +229,8 @@ public ConsumingSegmentInfoReader.ConsumingSegmentsInfoMap getConsumingSegmentsI
       String tableNameWithType = TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(realtimeTableName);
       ConsumingSegmentInfoReader consumingSegmentInfoReader =
           new ConsumingSegmentInfoReader(_executor, _connectionManager, _pinotHelixResourceManager);
-      return consumingSegmentInfoReader
-          .getConsumingSegmentsInfo(tableNameWithType, _controllerConf.getServerAdminRequestTimeoutSeconds() * 1000);
+      return consumingSegmentInfoReader.getConsumingSegmentsInfo(tableNameWithType,
+          _controllerConf.getServerAdminRequestTimeoutSeconds() * 1000);
     } catch (Exception e) {
       throw new ControllerApplicationException(LOGGER,
           String.format("Failed to get consuming segments info for table %s. %s", realtimeTableName, e.getMessage()),
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java
index 41042561401..20bec1ba609 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResource.java
@@ -68,8 +68,10 @@
 import org.apache.pinot.core.auth.ManualAuthorization;
 import org.apache.pinot.segment.local.utils.SchemaUtils;
 import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.utils.JsonUtils;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
@@ -330,6 +332,22 @@ public String validateSchema(String schemaJsonString, @Context HttpHeaders httpH
     }
   }
 
+  /**
+   * Gets the metadata on the valid {@link org.apache.pinot.spi.data.FieldSpec.DataType} for each
+   * {@link org.apache.pinot.spi.data.FieldSpec.FieldType} and the default null values for each combination
+   */
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  @Path("/schemas/fieldSpec")
+  @ApiOperation(value = "Get fieldSpec metadata", notes = "Get fieldSpec metadata")
+  public String getFieldSpecMetadata() {
+    try {
+      return JsonUtils.objectToString(FieldSpec.FIELD_SPEC_METADATA);
+    } catch (Exception e) {
+      throw new ControllerApplicationException(LOGGER, e.getMessage(), Response.Status.INTERNAL_SERVER_ERROR, e);
+    }
+  }
+
   private void validateSchemaName(String schemaName) {
     if (StringUtils.isBlank(schemaName)) {
       throw new ControllerApplicationException(LOGGER, "Invalid schema. Reason: 'schemaName' should not be null",
@@ -341,7 +359,8 @@ private void validateSchemaInternal(Schema schema) {
     validateSchemaName(schema.getSchemaName());
     try {
       List<TableConfig> tableConfigs = _pinotHelixResourceManager.getTableConfigsForSchema(schema.getSchemaName());
-      SchemaUtils.validate(schema, tableConfigs);
+      boolean isIgnoreCase = _pinotHelixResourceManager.getTableCache().isIgnoreCase();
+      SchemaUtils.validate(schema, tableConfigs, isIgnoreCase);
     } catch (Exception e) {
       throw new ControllerApplicationException(LOGGER,
           "Invalid schema: " + schema.getSchemaName() + ". Reason: " + e.getMessage(), Response.Status.BAD_REQUEST, e);
@@ -396,7 +415,7 @@ private SuccessResponse updateSchema(String schemaName, Schema schema, boolean r
     }
 
     try {
-      _pinotHelixResourceManager.updateSchema(schema, reload);
+      _pinotHelixResourceManager.updateSchema(schema, reload, false);
       // Best effort notification. If controller fails at this point, no notification is given.
       LOGGER.info("Notifying metadata event for updating schema: {}", schemaName);
       _metadataEventNotifierFactory.create().notifyOnSchemaEvents(schema, SchemaEventType.UPDATE);
@@ -450,20 +469,28 @@ private void deleteSchemaInternal(String schemaName) {
     }
 
     // If the schema is associated with a table, we should not delete it.
-    List<String> tableNames = _pinotHelixResourceManager.getAllRealtimeTables();
-    for (String tableName : tableNames) {
-      TableConfig config = _pinotHelixResourceManager.getRealtimeTableConfig(tableName);
-      String tableSchema = config.getValidationConfig().getSchemaName();
-
-      if (schemaName.equals(tableSchema)) {
+    // TODO: Check OFFLINE tables as well. There are 2 side effects:
+    //       - Increases ZK read when there are lots of OFFLINE tables
+    //       - Behavior change since we don't allow deleting schema for OFFLINE tables
+    List<String> realtimeTables = _pinotHelixResourceManager.getAllRealtimeTables();
+    for (String realtimeTableName : realtimeTables) {
+      if (schemaName.equals(TableNameBuilder.extractRawTableName(realtimeTableName))) {
         throw new ControllerApplicationException(LOGGER,
-            String.format("Cannot delete schema %s, as it is associated with table %s", schemaName, tableName),
+            String.format("Cannot delete schema %s, as it is associated with table %s", schemaName, realtimeTableName),
             Response.Status.CONFLICT);
       }
+      TableConfig tableConfig = _pinotHelixResourceManager.getTableConfig(realtimeTableName);
+      if (tableConfig != null) {
+        if (schemaName.equals(tableConfig.getValidationConfig().getSchemaName())) {
+          throw new ControllerApplicationException(LOGGER,
+              String.format("Cannot delete schema %s, as it is associated with table %s", schemaName,
+                  realtimeTableName), Response.Status.CONFLICT);
+        }
+      }
     }
 
     LOGGER.info("Trying to delete schema {}", schemaName);
-    if (_pinotHelixResourceManager.deleteSchema(schema)) {
+    if (_pinotHelixResourceManager.deleteSchema(schemaName)) {
       LOGGER.info("Notifying metadata event for deleting schema: {}", schemaName);
       _metadataEventNotifierFactory.create().notifyOnSchemaEvents(schema, SchemaEventType.DELETE);
       LOGGER.info("Success: Deleted schema {}", schemaName);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java
index c467c3f8166..37b3bd1fa05 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResource.java
@@ -41,6 +41,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
@@ -103,6 +104,7 @@
  *       <li>"/segments/{tableName}/crc": get a map from segment to CRC of the segment (OFFLINE table only)</li>
  *       <li>"/segments/{tableName}/{segmentName}/metadata: get the metadata for a segment</li>
  *       <li>"/segments/{tableName}/metadata: get the metadata for all segments from the server</li>
+ *       <li>"/segments/{tableName}/zkmetadata: get the zk metadata for all segments of a table</li>
  *       <li>"/segments/{tableName}/{segmentName}/tiers": get storage tier for the segment in the table</li>
  *       <li>"/segments/{tableName}/tiers": get storage tier for all segments in the table</li>
  *     </ul>
@@ -196,19 +198,19 @@ public List<Map<TableType, List<String>>> getSegments(
       @ApiParam(value = "OFFLINE|REALTIME") @QueryParam("type") String tableTypeStr,
       @ApiParam(value = "Whether to exclude replaced segments in the response, which have been replaced"
           + " specified in the segment lineage entries and cannot be queried from the table")
-      @QueryParam("excludeReplacedSegments") String excludeReplacedSegments) {
-    List<String> tableNamesWithType = ResourceUtils
-        .getExistingTableNamesWithType(_pinotHelixResourceManager, tableName, Constants.validateTableType(tableTypeStr),
-            LOGGER);
+      @QueryParam("excludeReplacedSegments") String excludeReplacedSegments,
+      @ApiParam(value = "Start timestamp (inclusive)") @QueryParam("startTimestamp") @DefaultValue("")
+      String startTimestampStr,
+      @ApiParam(value = "End timestamp (exclusive)") @QueryParam("endTimestamp") @DefaultValue("")
+      String endTimestampStr,
+      @ApiParam(value = "Whether to exclude the segments overlapping with the timestamps, false by default")
+      @QueryParam("excludeOverlapping") @DefaultValue("false") boolean excludeOverlapping) {
     boolean shouldExcludeReplacedSegments = Boolean.parseBoolean(excludeReplacedSegments);
-    List<Map<TableType, List<String>>> resultList = new ArrayList<>(tableNamesWithType.size());
-    for (String tableNameWithType : tableNamesWithType) {
-      TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType);
-      List<String> segments =
-          _pinotHelixResourceManager.getSegmentsFor(tableNameWithType, shouldExcludeReplacedSegments);
-      resultList.add(Collections.singletonMap(tableType, segments));
-    }
-    return resultList;
+    return selectSegments(tableName, tableTypeStr, shouldExcludeReplacedSegments,
+        startTimestampStr, endTimestampStr, excludeOverlapping)
+        .stream()
+        .map(pair -> Collections.singletonMap(pair.getKey(), pair.getValue()))
+        .collect(Collectors.toList());
   }
 
   @GET
@@ -516,7 +518,7 @@ private String getExistingTable(String tableName, String segmentName) {
   @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation(
       value = "Resets a segment by first disabling it, waiting for external view to stabilize, and finally enabling "
-          + "it again", notes = "Resets a segment by disabling and then enabling the segment")
+          + "it again", notes = "Resets a segment by disabling and then enabling it")
   public SuccessResponse resetSegment(
       @ApiParam(value = "Name of the table with type", required = true) @PathParam("tableNameWithType")
           String tableNameWithType,
@@ -542,7 +544,7 @@ public SuccessResponse resetSegment(
   }
 
   /**
-   * Resets all segments of the given table
+   * Resets all segments or segments with Error state of the given table
    * This API will take segments to OFFLINE state, wait for External View to stabilize, and then back to
    * ONLINE/CONSUMING state,
    * thus effective in resetting segments or consumers in error states.
@@ -552,18 +554,21 @@ public SuccessResponse resetSegment(
   @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation(
-      value = "Resets all segments of the table, by first disabling them, waiting for external view to stabilize, and"
-          + " finally enabling the segments", notes = "Resets a segment by disabling and then enabling a segment")
-  public SuccessResponse resetAllSegments(
+      value = "Resets all segments (when errorSegmentsOnly = false) or segments with Error state (when "
+          + "errorSegmentsOnly = true) of the table, by first disabling them, waiting for external view to stabilize,"
+          + " and finally enabling them", notes = "Resets segments by disabling and then enabling them")
+  public SuccessResponse resetSegments(
       @ApiParam(value = "Name of the table with type", required = true) @PathParam("tableNameWithType")
           String tableNameWithType,
       @ApiParam(value = "Name of the target instance to reset") @QueryParam("targetInstance") @Nullable
-          String targetInstance) {
+          String targetInstance,
+      @ApiParam(value = "Whether to reset only segments with error state") @QueryParam("errorSegmentsOnly")
+      @DefaultValue("false") boolean errorSegmentsOnly) {
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType);
     try {
       Preconditions.checkState(tableType != null, "Must provide table name with type: %s", tableNameWithType);
-      _pinotHelixResourceManager.resetAllSegments(tableNameWithType, targetInstance);
-      return new SuccessResponse(String.format("Successfully reset all segments of table: %s", tableNameWithType));
+      _pinotHelixResourceManager.resetSegments(tableNameWithType, targetInstance, errorSegmentsOnly);
+      return new SuccessResponse(String.format("Successfully reset segments of table: %s", tableNameWithType));
     } catch (IllegalStateException e) {
       throw new ControllerApplicationException(LOGGER,
           String.format("Failed to reset segments in table: %s. %s", tableNameWithType, e.getMessage()),
@@ -619,7 +624,8 @@ public SuccessResponse reloadSegmentDeprecated2(
   public ServerReloadControllerJobStatusResponse getReloadJobStatus(
       @ApiParam(value = "Reload job id", required = true) @PathParam("jobId") String reloadJobId)
       throws Exception {
-    Map<String, String> controllerJobZKMetadata = _pinotHelixResourceManager.getControllerJobZKMetadata(reloadJobId);
+    Map<String, String> controllerJobZKMetadata = _pinotHelixResourceManager.
+            getControllerJobZKMetadata(reloadJobId, ControllerJobType.RELOAD_SEGMENT);
     if (controllerJobZKMetadata == null) {
       throw new ControllerApplicationException(LOGGER, "Failed to find controller job id: " + reloadJobId,
           Status.NOT_FOUND);
@@ -629,11 +635,10 @@ public ServerReloadControllerJobStatusResponse getReloadJobStatus(
         controllerJobZKMetadata.get(CommonConstants.ControllerJob.TABLE_NAME_WITH_TYPE);
     Map<String, List<String>> serverToSegments;
 
-    String singleSegmentName = null;
-    if (controllerJobZKMetadata.get(CommonConstants.ControllerJob.JOB_TYPE)
-        .equals(ControllerJobType.RELOAD_SEGMENT.toString())) {
+    String singleSegmentName =
+        controllerJobZKMetadata.get(CommonConstants.ControllerJob.SEGMENT_RELOAD_JOB_SEGMENT_NAME);
+    if (singleSegmentName != null) {
       // No need to query servers where this segment is not supposed to be hosted
-      singleSegmentName = controllerJobZKMetadata.get(CommonConstants.ControllerJob.SEGMENT_RELOAD_JOB_SEGMENT_NAME);
       serverToSegments = new HashMap<>();
       List<String> segmentList = Arrays.asList(singleSegmentName);
       _pinotHelixResourceManager.getServers(tableNameWithType, singleSegmentName).forEach(server -> {
@@ -860,6 +865,52 @@ public SuccessResponse deleteSegments(
     }
   }
 
+  @DELETE
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  @Path("/segments/{tableName}/choose")
+  @Authenticate(AccessType.DELETE)
+  @ApiOperation(value = "Delete selected segments. An optional 'excludeReplacedSegments' parameter is used to get the"
+      + " list of segments which has not yet been replaced (determined by segment lineage entries) and can be queried"
+      + " from the table. The value is false by default.",
+      // TODO: more and more filters can be added later on, like excludeErrorSegments, excludeConsumingSegments, etc.
+      notes = "List all segments")
+  public SuccessResponse deleteSegmentsWithTimeWindow(
+      @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
+      @ApiParam(value = "OFFLINE|REALTIME") @QueryParam("type") String tableTypeStr,
+      @ApiParam(value = "Whether to ignore replaced segments for deletion, which have been replaced"
+          + " specified in the segment lineage entries and cannot be queried from the table, false by default")
+      @QueryParam("excludeReplacedSegments") @DefaultValue("false") boolean excludeReplacedSegments,
+      @ApiParam(value = "Start timestamp (inclusive) in milliseconds", required = true) @QueryParam("startTimestamp")
+          String startTimestampStr,
+      @ApiParam(value = "End timestamp (exclusive) in milliseconds", required = true) @QueryParam("endTimestamp")
+          String endTimestampStr,
+      @ApiParam(value = "Whether to ignore segments that are partially overlapping with the [start, end)"
+          + "for deletion, true by default")
+      @QueryParam("excludeOverlapping") @DefaultValue("true") boolean excludeOverlapping,
+      @ApiParam(value = "Retention period for the table segments (e.g. 12h, 3d); If not set, the retention period "
+          + "will default to the first config that's not null: the table config, then to cluster setting, then '7d'. "
+          + "Using 0d or -1d will instantly delete segments without retention")
+      @QueryParam("retention") String retentionPeriod) {
+    if (Strings.isNullOrEmpty(startTimestampStr) || Strings.isNullOrEmpty(endTimestampStr)) {
+      throw new ControllerApplicationException(LOGGER, "start and end timestamp must by non empty", Status.BAD_REQUEST);
+    }
+
+    int numSegments = 0;
+    for (Pair<TableType, List<String>> tableTypeSegments : selectSegments(
+        tableName, tableTypeStr, excludeReplacedSegments, startTimestampStr, endTimestampStr, excludeOverlapping)) {
+      TableType tableType = tableTypeSegments.getLeft();
+      List<String> segments = tableTypeSegments.getRight();
+      numSegments += segments.size();
+      if (segments.isEmpty()) {
+        continue;
+      }
+      String tableNameWithType = TableNameBuilder.forType(tableType).tableNameWithType(tableName);
+      deleteSegmentsInternal(tableNameWithType, segments, retentionPeriod);
+    }
+    return new SuccessResponse("Deleted " + numSegments + " segments from table: " + tableName);
+  }
+
   private void deleteSegmentsInternal(String tableNameWithType, List<String> segments, String retentionPeriod) {
     PinotResourceManagerResponse response = _pinotHelixResourceManager.deleteSegments(tableNameWithType, segments,
         retentionPeriod);
@@ -898,6 +949,30 @@ public String getServerMetadata(
     return segmentsMetadata;
   }
 
+  @GET
+  @Path("segments/{tableName}/zkmetadata")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation(value = "Get the zookeeper metadata for all table segments", notes = "Get the zookeeper metadata for "
+      + "all table segments")
+  public Map<String, Map<String, String>> getZookeeperMetadata(
+      @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
+      @ApiParam(value = "OFFLINE|REALTIME") @QueryParam("type") String tableTypeStr)
+      throws JsonProcessingException {
+    LOGGER.info("Received a request to fetch zookeeper metadata for all segments for table {}", tableName);
+    TableType tableType = Constants.validateTableType(tableTypeStr);
+
+    String tableNameWithType =
+        ResourceUtils.getExistingTableNamesWithType(_pinotHelixResourceManager, tableName, tableType, LOGGER).get(0);
+    Map<String, Map<String, String>> segmentToMetadataMap = new HashMap<>();
+    List<SegmentZKMetadata> segmentZKMetadataList =
+        _pinotHelixResourceManager.getSegmentsZKMetadata(tableNameWithType);
+
+    for (SegmentZKMetadata segmentZKMetadata : segmentZKMetadataList) {
+      segmentToMetadataMap.put(segmentZKMetadata.getSegmentName(), segmentZKMetadata.toMap());
+    }
+    return segmentToMetadataMap;
+  }
+
   @GET
   @Path("segments/{tableName}/tiers")
   @Produces(MediaType.APPLICATION_JSON)
@@ -955,6 +1030,7 @@ private TableTierReader.TableTierDetails getTableTierInternal(String tableName,
     return tableTierDetails;
   }
 
+  @Deprecated
   @GET
   @Path("segments/{tableName}/select")
   @Produces(MediaType.APPLICATION_JSON)
@@ -969,14 +1045,22 @@ private TableTierReader.TableTierDetails getTableTierInternal(String tableName,
   public List<Map<TableType, List<String>>> getSelectedSegments(
       @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "OFFLINE|REALTIME") @QueryParam("type") String tableTypeStr,
-      @ApiParam(value = "Start timestamp (inclusive)") @QueryParam("startTimestamp") @DefaultValue("")
+      @ApiParam(value = "Start timestamp (inclusive) in milliseconds") @QueryParam("startTimestamp") @DefaultValue("")
           String startTimestampStr,
-      @ApiParam(value = "End timestamp (exclusive)") @QueryParam("endTimestamp") @DefaultValue("")
+      @ApiParam(value = "End timestamp (exclusive) in milliseconds") @QueryParam("endTimestamp") @DefaultValue("")
           String endTimestampStr,
       @ApiParam(value = "Whether to exclude the segments overlapping with the timestamps, false by default")
       @QueryParam("excludeOverlapping") @DefaultValue("false") boolean excludeOverlapping) {
-    long startTimestamp = Strings.isNullOrEmpty(startTimestampStr) ? Long.MIN_VALUE : Long.parseLong(startTimestampStr);
-    long endTimestamp = Strings.isNullOrEmpty(endTimestampStr) ? Long.MAX_VALUE : Long.parseLong(endTimestampStr);
+    long startTimestamp;
+    long endTimestamp;
+    try {
+      startTimestamp = Strings.isNullOrEmpty(startTimestampStr) ? Long.MIN_VALUE : Long.parseLong(startTimestampStr);
+      endTimestamp = Strings.isNullOrEmpty(endTimestampStr) ? Long.MAX_VALUE : Long.parseLong(endTimestampStr);
+    } catch (NumberFormatException e) {
+      throw new ControllerApplicationException(LOGGER,
+          "Failed to parse the start/end timestamp. Please make sure they are in 'millisSinceEpoch' format.",
+          Response.Status.BAD_REQUEST, e);
+    }
     Preconditions.checkArgument(startTimestamp < endTimestamp,
         "The value of startTimestamp should be smaller than the one of endTimestamp. Start timestamp: %d. End "
             + "timestamp: %d",
@@ -988,8 +1072,9 @@ public List<Map<TableType, List<String>>> getSelectedSegments(
     List<Map<TableType, List<String>>> resultList = new ArrayList<>(tableNamesWithType.size());
     for (String tableNameWithType : tableNamesWithType) {
       TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType);
-      List<String> segments = _pinotHelixResourceManager
-          .getSegmentsForTableWithTimestamps(tableNameWithType, startTimestamp, endTimestamp, excludeOverlapping);
+      List<String> segments =
+          _pinotHelixResourceManager.getSegmentsFor(tableNameWithType, true, startTimestamp, endTimestamp,
+              excludeOverlapping);
       resultList.add(Collections.singletonMap(tableType, segments));
     }
     return resultList;
@@ -1072,4 +1157,34 @@ private SuccessResponse updateZKTimeIntervalInternal(String tableNameWithType) {
       }
       return new SuccessResponse("Successfully updated time interval zk metadata for table: " + tableNameWithType);
   }
+
+  private List<Pair<TableType, List<String>>> selectSegments(
+      String tableName, String tableTypeStr, boolean excludeReplacedSegments, String startTimestampStr,
+      String endTimestampStr, boolean excludeOverlapping) {
+    long startTimestamp;
+    long endTimestamp;
+    try {
+      startTimestamp = Strings.isNullOrEmpty(startTimestampStr) ? Long.MIN_VALUE : Long.parseLong(startTimestampStr);
+      endTimestamp = Strings.isNullOrEmpty(endTimestampStr) ? Long.MAX_VALUE : Long.parseLong(endTimestampStr);
+    } catch (NumberFormatException e) {
+      throw new ControllerApplicationException(LOGGER,
+          "Failed to parse the start/end timestamp. Please make sure they are in 'millisSinceEpoch' format.",
+          Response.Status.BAD_REQUEST, e);
+    }
+    Preconditions.checkArgument(startTimestamp < endTimestamp,
+        "The value of startTimestamp should be smaller than the one of endTimestamp. Start timestamp: %d. End "
+            + "timestamp: %d", startTimestamp, endTimestamp);
+
+    List<String> tableNamesWithType = ResourceUtils.getExistingTableNamesWithType(_pinotHelixResourceManager, tableName,
+        Constants.validateTableType(tableTypeStr), LOGGER);
+    List<Pair<TableType, List<String>>> resultList = new ArrayList<>(tableNamesWithType.size());
+    for (String tableNameWithType : tableNamesWithType) {
+      TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType);
+      List<String> segments =
+          _pinotHelixResourceManager.getSegmentsFor(tableNameWithType, excludeReplacedSegments, startTimestamp,
+              endTimestamp, excludeOverlapping);
+      resultList.add(Pair.of(tableType, segments));
+    }
+    return resultList;
+  }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java
index 0d493ab3d01..90f6a663a1f 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java
@@ -69,6 +69,8 @@
 import org.apache.pinot.common.metrics.ControllerGauge;
 import org.apache.pinot.common.metrics.ControllerMeter;
 import org.apache.pinot.common.metrics.ControllerMetrics;
+import org.apache.pinot.common.restlet.resources.EndReplaceSegmentsRequest;
+import org.apache.pinot.common.restlet.resources.RevertReplaceSegmentsRequest;
 import org.apache.pinot.common.restlet.resources.StartReplaceSegmentsRequest;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
 import org.apache.pinot.common.utils.URIUtils;
@@ -94,7 +96,6 @@
 import org.apache.pinot.spi.filesystem.PinotFSFactory;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.JsonUtils;
-import org.apache.pinot.spi.utils.StringUtil;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
@@ -167,7 +168,12 @@ public Response downloadSegment(
     File segmentFile;
     // If the segment file is local, just use it as the return entity; otherwise copy it from remote to local first.
     if (CommonConstants.Segment.LOCAL_SEGMENT_SCHEME.equals(dataDirURI.getScheme())) {
-      segmentFile = new File(new File(dataDirURI), StringUtil.join(File.separator, tableName, segmentName));
+      File dataDir = new File(dataDirURI);
+      File tableDir = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(dataDir, tableName,
+          "Invalid table name: %s", tableName);
+      segmentFile = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(tableDir, segmentName,
+          "Invalid segment name: %s", segmentName);
+
       if (!segmentFile.exists()) {
         throw new ControllerApplicationException(LOGGER,
             "Segment " + segmentName + " or table " + tableName + " not found in " + segmentFile.getAbsolutePath(),
@@ -182,8 +188,13 @@ public Response downloadSegment(
             "Segment: " + segmentName + " of table: " + tableName + " not found at: " + remoteSegmentFileURI,
             Response.Status.NOT_FOUND);
       }
-      segmentFile = new File(new File(ControllerFilePathProvider.getInstance().getFileDownloadTempDir(), tableName),
-          segmentName + "-" + UUID.randomUUID());
+      File downloadTempDir = ControllerFilePathProvider.getInstance().getFileDownloadTempDir();
+      File tableDir = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(downloadTempDir, tableName,
+          "Invalid table name: %s", tableName);
+      segmentFile =
+          org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(tableDir, segmentName + "-" + UUID.randomUUID(),
+              "Invalid segment name: %s", segmentName);
+
       pinotFS.copyToLocalFile(remoteSegmentFileURI, segmentFile);
       // Streaming in the tmp file and delete it afterward.
       builder.entity((StreamingOutput) output -> {
@@ -629,7 +640,8 @@ public Response startReplaceSegments(
         ResourceUtils.getExistingTableNamesWithType(_pinotHelixResourceManager, tableName, tableType, LOGGER).get(0);
     try {
       String segmentLineageEntryId = _pinotHelixResourceManager.startReplaceSegments(tableNameWithType,
-          startReplaceSegmentsRequest.getSegmentsFrom(), startReplaceSegmentsRequest.getSegmentsTo(), forceCleanup);
+          startReplaceSegmentsRequest.getSegmentsFrom(), startReplaceSegmentsRequest.getSegmentsTo(), forceCleanup,
+          startReplaceSegmentsRequest.getCustomMap());
       return Response.ok(JsonUtils.newObjectNode().put("segmentLineageEntryId", segmentLineageEntryId)).build();
     } catch (Exception e) {
       _controllerMetrics.addMeteredTableValue(tableNameWithType, ControllerMeter.NUMBER_START_REPLACE_FAILURE, 1);
@@ -646,7 +658,9 @@ public Response endReplaceSegments(
       @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "OFFLINE|REALTIME", required = true) @QueryParam("type") String tableTypeStr,
       @ApiParam(value = "Segment lineage entry id returned by startReplaceSegments API", required = true)
-      @QueryParam("segmentLineageEntryId") String segmentLineageEntryId) {
+      @QueryParam("segmentLineageEntryId") String segmentLineageEntryId,
+      @ApiParam(value = "Fields belonging to end replace segment request", required = false)
+          EndReplaceSegmentsRequest endReplaceSegmentsRequest) {
     TableType tableType = Constants.validateTableType(tableTypeStr);
     if (tableType == null) {
       throw new ControllerApplicationException(LOGGER, "Table type should either be offline or realtime",
@@ -657,7 +671,8 @@ public Response endReplaceSegments(
     try {
       // Check that the segment lineage entry id is valid
       Preconditions.checkNotNull(segmentLineageEntryId, "'segmentLineageEntryId' should not be null");
-      _pinotHelixResourceManager.endReplaceSegments(tableNameWithType, segmentLineageEntryId);
+      _pinotHelixResourceManager.endReplaceSegments(tableNameWithType, segmentLineageEntryId,
+          endReplaceSegmentsRequest);
       return Response.ok().build();
     } catch (Exception e) {
       _controllerMetrics.addMeteredTableValue(tableNameWithType, ControllerMeter.NUMBER_END_REPLACE_FAILURE, 1);
@@ -676,7 +691,9 @@ public Response revertReplaceSegments(
       @ApiParam(value = "Segment lineage entry id to revert", required = true) @QueryParam("segmentLineageEntryId")
           String segmentLineageEntryId,
       @ApiParam(value = "Force revert in case the user knows that the lineage entry is interrupted")
-      @QueryParam("forceRevert") @DefaultValue("false") boolean forceRevert) {
+      @QueryParam("forceRevert") @DefaultValue("false") boolean forceRevert,
+      @ApiParam(value = "Fields belonging to revert replace segment request", required = false)
+          RevertReplaceSegmentsRequest revertReplaceSegmentsRequest) {
     TableType tableType = Constants.validateTableType(tableTypeStr);
     if (tableType == null) {
       throw new ControllerApplicationException(LOGGER, "Table type should either be offline or realtime",
@@ -687,7 +704,8 @@ public Response revertReplaceSegments(
     try {
       // Check that the segment lineage entry id is valid
       Preconditions.checkNotNull(segmentLineageEntryId, "'segmentLineageEntryId' should not be null");
-      _pinotHelixResourceManager.revertReplaceSegments(tableNameWithType, segmentLineageEntryId, forceRevert);
+      _pinotHelixResourceManager.revertReplaceSegments(tableNameWithType, segmentLineageEntryId, forceRevert,
+          revertReplaceSegmentsRequest);
       return Response.ok().build();
     } catch (Exception e) {
       _controllerMetrics.addMeteredTableValue(tableNameWithType, ControllerMeter.NUMBER_REVERT_REPLACE_FAILURE, 1);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
index cfa1cffe2d5..a5f7e26901a 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
@@ -28,6 +28,8 @@
 import io.swagger.annotations.ApiKeyAuthDefinition;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
@@ -76,6 +78,7 @@
 import org.apache.pinot.common.exception.SchemaNotFoundException;
 import org.apache.pinot.common.exception.TableNotFoundException;
 import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.controllerjob.ControllerJobType;
 import org.apache.pinot.common.metrics.ControllerMeter;
 import org.apache.pinot.common.metrics.ControllerMetrics;
 import org.apache.pinot.common.restlet.resources.TableSegmentValidationInfo;
@@ -89,8 +92,11 @@
 import org.apache.pinot.controller.api.exception.InvalidTableConfigException;
 import org.apache.pinot.controller.api.exception.TableAlreadyExistsException;
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.PinotResourceManagerResponse;
 import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
 import org.apache.pinot.controller.helix.core.rebalance.RebalanceResult;
+import org.apache.pinot.controller.helix.core.rebalance.TableRebalanceProgressStats;
+import org.apache.pinot.controller.helix.core.rebalance.TableRebalancer;
 import org.apache.pinot.controller.recommender.RecommenderDriver;
 import org.apache.pinot.controller.tuner.TableConfigTunerUtils;
 import org.apache.pinot.controller.util.CompletionServiceHelper;
@@ -176,8 +182,7 @@ public class PinotTableRestletResource {
   @Path("/tables")
   @ApiOperation(value = "Adds a table", notes = "Adds a table")
   @ManualAuthorization // performed after parsing table configs
-  public ConfigSuccessResponse addTable(
-      String tableConfigStr,
+  public ConfigSuccessResponse addTable(String tableConfigStr,
       @ApiParam(value = "comma separated list of validation type(s) to skip. supported types: (ALL|TASK|UPSERT)")
       @QueryParam("validationTypesToSkip") @Nullable String typesToSkip, @Context HttpHeaders httpHeaders,
       @Context Request request) {
@@ -204,10 +209,10 @@ public ConfigSuccessResponse addTable(
       TableConfigUtils.validate(tableConfig, schema, typesToSkip, _controllerConf.isDisableIngestionGroovy());
       // TableConfigUtils.validateTableName(...) checks table name rules.
       // So it won't affect already created tables.
-      boolean allowTableNameWithDatabase = _controllerConf.getProperty(
-          CommonConstants.Helix.ALLOW_TABLE_NAME_WITH_DATABASE,
-          CommonConstants.Helix.DEFAULT_ALLOW_TABLE_NAME_WITH_DATABASE);
-        TableConfigUtils.validateTableName(tableConfig, allowTableNameWithDatabase);
+      boolean allowTableNameWithDatabase =
+          _controllerConf.getProperty(CommonConstants.Helix.ALLOW_TABLE_NAME_WITH_DATABASE,
+              CommonConstants.Helix.DEFAULT_ALLOW_TABLE_NAME_WITH_DATABASE);
+      TableConfigUtils.validateTableName(tableConfig, allowTableNameWithDatabase);
     } catch (Exception e) {
       throw new ControllerApplicationException(LOGGER, e.getMessage(), Response.Status.BAD_REQUEST, e);
     }
@@ -322,7 +327,7 @@ public String listTables(@ApiParam(value = "realtime|offline") @QueryParam("type
           tableNamesWithType.set(j, tempTableName);
         };
         Arrays.quickSort(0, numTables, comparator, swapper);
-       tableNames = tableNamesWithType;
+        tableNames = tableNamesWithType;
       }
 
       return JsonUtils.newObjectNode().set("tables", JsonUtils.objectToJsonNode(tableNames)).toString();
@@ -361,9 +366,7 @@ private String listTableConfigs(String tableName, @Nullable String tableTypeStr)
   @GET
   @Produces(MediaType.APPLICATION_JSON)
   @Path("/tables/{tableName}")
-  @ApiOperation(value = "Get/Enable/Disable/Drop a table",
-      notes = "Get/Enable/Disable/Drop a table. If table name is the only parameter specified "
-          + ", the tableconfig will be printed")
+  @ApiOperation(value = "Lists the table configs")
   public String alterTableStateOrListTableConfig(
       @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "enable|disable|drop") @QueryParam("state") String stateStr,
@@ -374,13 +377,15 @@ public String alterTableStateOrListTableConfig(
         return listTableConfigs(tableName, tableTypeStr);
       }
 
+      // TODO: DO NOT allow toggling state with GET request
+
       StateType stateType = Constants.validateState(stateStr);
       TableType tableType = Constants.validateTableType(tableTypeStr);
 
       // validate if user has permission to change the table state
       String endpointUrl = request.getRequestURL().toString();
-      AccessControlUtils
-          .validatePermission(tableName, AccessType.UPDATE, httpHeaders, endpointUrl, _accessControlFactory.create());
+      AccessControlUtils.validatePermission(tableName, AccessType.UPDATE, httpHeaders, endpointUrl,
+          _accessControlFactory.create());
 
       ArrayNode ret = JsonUtils.newArrayNode();
       boolean tableExists = false;
@@ -540,8 +545,7 @@ public ConfigSuccessResponse updateTableConfig(
       notes = "This API returns the table config that matches the one you get from 'GET /tables/{tableName}'."
           + " This allows us to validate table config before apply.")
   @ManualAuthorization // performed after parsing TableConfig
-  public ObjectNode checkTableConfig(
-      String tableConfigStr,
+  public ObjectNode checkTableConfig(String tableConfigStr,
       @ApiParam(value = "comma separated list of validation type(s) to skip. supported types: (ALL|TASK|UPSERT)")
       @QueryParam("validationTypesToSkip") @Nullable String typesToSkip, @Context HttpHeaders httpHeaders,
       @Context Request request) {
@@ -577,8 +581,7 @@ public ObjectNode checkTableConfig(
           + "table name. This API returns the table config that matches the one you get from 'GET /tables/{tableName}'."
           + " This allows us to validate table config before apply.")
   @ManualAuthorization // performed after parsing TableAndSchemaConfig
-  public String validateTableAndSchema(
-      TableAndSchemaConfig tableSchemaConfig,
+  public String validateTableAndSchema(TableAndSchemaConfig tableSchemaConfig,
       @ApiParam(value = "comma separated list of validation type(s) to skip. supported types: (ALL|TASK|UPSERT)")
       @QueryParam("validationTypesToSkip") @Nullable String typesToSkip, @Context HttpHeaders httpHeaders,
       @Context Request request) {
@@ -627,7 +630,7 @@ public RebalanceResult rebalance(
       @ApiParam(value = "Name of the table to rebalance", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "OFFLINE|REALTIME", required = true) @QueryParam("type") String tableTypeStr,
       @ApiParam(value = "Whether to rebalance table in dry-run mode") @DefaultValue("false") @QueryParam("dryRun")
-          boolean dryRun,
+      boolean dryRun,
       @ApiParam(value = "Whether to reassign instances before reassigning segments") @DefaultValue("false")
       @QueryParam("reassignInstances") boolean reassignInstances,
       @ApiParam(value = "Whether to reassign CONSUMING segments for real-time table") @DefaultValue("false")
@@ -636,16 +639,18 @@ public RebalanceResult rebalance(
           + "segments in a round-robin fashion as if adding new segments to an empty table)") @DefaultValue("false")
   @QueryParam("bootstrap") boolean bootstrap,
       @ApiParam(value = "Whether to allow downtime for the rebalance") @DefaultValue("false") @QueryParam("downtime")
-          boolean downtime, @ApiParam(
-      value = "For no-downtime rebalance, minimum number of replicas to keep alive during rebalance, or maximum "
-          + "number of replicas allowed to be unavailable if value is negative") @DefaultValue("1")
+      boolean downtime,
+      @ApiParam(value = "For no-downtime rebalance, minimum number of replicas to keep alive during rebalance, or "
+          + "maximum number of replicas allowed to be unavailable if value is negative") @DefaultValue("1")
   @QueryParam("minAvailableReplicas") int minAvailableReplicas, @ApiParam(
       value = "Whether to use best-efforts to rebalance (not fail the rebalance when the no-downtime contract cannot "
           + "be achieved)") @DefaultValue("false") @QueryParam("bestEfforts") boolean bestEfforts, @ApiParam(
       value = "How often to check if external view converges with ideal states") @DefaultValue("1000")
   @QueryParam("externalViewCheckIntervalInMs") long externalViewCheckIntervalInMs,
       @ApiParam(value = "How long to wait till external view converges with ideal states") @DefaultValue("3600000")
-      @QueryParam("externalViewStabilizationTimeoutInMs") long externalViewStabilizationTimeoutInMs) {
+      @QueryParam("externalViewStabilizationTimeoutInMs") long externalViewStabilizationTimeoutInMs,
+      @ApiParam(value = "Whether to update segment target tier as part of the rebalance") @DefaultValue("false")
+      @QueryParam("updateTargetTier") boolean updateTargetTier) {
 
     String tableNameWithType = constructTableNameWithType(tableName, tableTypeStr);
 
@@ -661,29 +666,32 @@ public RebalanceResult rebalance(
         externalViewCheckIntervalInMs);
     rebalanceConfig.addProperty(RebalanceConfigConstants.EXTERNAL_VIEW_STABILIZATION_TIMEOUT_IN_MS,
         externalViewStabilizationTimeoutInMs);
+    rebalanceConfig.addProperty(RebalanceConfigConstants.UPDATE_TARGET_TIER, updateTargetTier);
+    rebalanceConfig.addProperty(RebalanceConfigConstants.JOB_ID, TableRebalancer.createUniqueRebalanceJobIdentifier());
 
     try {
       if (dryRun || downtime) {
         // For dry-run or rebalance with downtime, directly return the rebalance result as it should return immediately
-        return _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig);
+        return _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig, false);
       } else {
         // Make a dry-run first to get the target assignment
         rebalanceConfig.setProperty(RebalanceConfigConstants.DRY_RUN, true);
-        RebalanceResult dryRunResult = _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig);
+        RebalanceResult dryRunResult =
+            _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig, false);
 
         if (dryRunResult.getStatus() == RebalanceResult.Status.DONE) {
           // If dry-run succeeded, run rebalance asynchronously
           rebalanceConfig.setProperty(RebalanceConfigConstants.DRY_RUN, false);
           _executorService.submit(() -> {
             try {
-              _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig);
+              _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig, true);
             } catch (Throwable t) {
               LOGGER.error("Caught exception/error while rebalancing table: {}", tableNameWithType, t);
             }
           });
-          return new RebalanceResult(RebalanceResult.Status.IN_PROGRESS,
+          return new RebalanceResult(dryRunResult.getJobId(), RebalanceResult.Status.IN_PROGRESS,
               "In progress, check controller logs for updates", dryRunResult.getInstanceAssignment(),
-              dryRunResult.getSegmentAssignment());
+              dryRunResult.getTierInstanceAssignment(), dryRunResult.getSegmentAssignment());
         } else {
           // If dry-run failed or is no-op, return the dry-run result
           return dryRunResult;
@@ -712,6 +720,76 @@ public String getTableState(
     }
   }
 
+  @PUT
+  @Path("/tables/{tableName}/state")
+  @Authenticate(AccessType.UPDATE)
+  @Produces(MediaType.APPLICATION_JSON)
+  @Consumes(MediaType.TEXT_PLAIN)
+  @ApiOperation(value = "Enable/disable a table", notes = "Enable/disable a table")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 400, message = "Bad Request"),
+      @ApiResponse(code = 404, message = "Table not found"),
+      @ApiResponse(code = 500, message = "Internal error")
+  })
+  public SuccessResponse toggleTableState(
+      @ApiParam(value = "Table name", required = true) @PathParam("tableName") String tableName,
+      @ApiParam(value = "realtime|offline", required = true) @QueryParam("type") String tableTypeStr,
+      @ApiParam(value = "enable|disable", required = true) @QueryParam("state") String state) {
+    String tableNameWithType = constructTableNameWithType(tableName, tableTypeStr);
+    StateType stateType;
+    if (StateType.ENABLE.name().equalsIgnoreCase(state)) {
+      stateType = StateType.ENABLE;
+    } else if (StateType.DISABLE.name().equalsIgnoreCase(state)) {
+      stateType = StateType.DISABLE;
+    } else {
+      throw new ControllerApplicationException(LOGGER, "Unknown state '" + state + "'", Response.Status.BAD_REQUEST);
+    }
+    if (!_pinotHelixResourceManager.hasTable(tableNameWithType)) {
+      throw new ControllerApplicationException(LOGGER, "Table '" + tableName + "' does not exist",
+          Response.Status.NOT_FOUND);
+    }
+    PinotResourceManagerResponse response = _pinotHelixResourceManager.toggleTableState(tableNameWithType, stateType);
+    if (response.isSuccessful()) {
+      return new SuccessResponse("Request to " + state + " table '" + tableNameWithType + "' is successful");
+    } else {
+      throw new ControllerApplicationException(LOGGER,
+          "Failed to " + state + " table '" + tableNameWithType + "': " + response.getMessage(),
+          Response.Status.INTERNAL_SERVER_ERROR);
+    }
+  }
+
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  @Authenticate(AccessType.UPDATE)
+  @Path("/rebalanceStatus/{jobId}")
+  @ApiOperation(value = "Gets detailed stats of a rebalance operation",
+      notes = "Gets detailed stats of a rebalance operation")
+  public ServerRebalanceJobStatusResponse rebalanceStatus(
+      @ApiParam(value = "Rebalance Job Id", required = true) @PathParam("jobId") String jobId)
+      throws JsonProcessingException {
+    Map<String, String> controllerJobZKMetadata =
+        _pinotHelixResourceManager.getControllerJobZKMetadata(jobId, ControllerJobType.TABLE_REBALANCE);
+
+    if (controllerJobZKMetadata == null) {
+      throw new ControllerApplicationException(LOGGER, "Failed to find controller job id: " + jobId,
+          Response.Status.NOT_FOUND);
+    }
+    TableRebalanceProgressStats tableRebalanceProgressStats =
+        JsonUtils.stringToObject(controllerJobZKMetadata.get(RebalanceConfigConstants.REBALANCE_PROGRESS_STATS),
+            TableRebalanceProgressStats.class);
+    long timeSinceStartInSecs = 0L;
+    if (!tableRebalanceProgressStats.getStatus().equals(RebalanceResult.Status.DONE)) {
+      timeSinceStartInSecs =
+          (System.currentTimeMillis() - tableRebalanceProgressStats.getStartTimeMs()) / 1000;
+    }
+
+    ServerRebalanceJobStatusResponse serverRebalanceJobStatusResponse = new ServerRebalanceJobStatusResponse();
+    serverRebalanceJobStatusResponse.setTableRebalanceProgressStats(tableRebalanceProgressStats);
+    serverRebalanceJobStatusResponse.setTimeElapsedSinceStartInSeconds(timeSinceStartInSecs);
+    return serverRebalanceJobStatusResponse;
+  }
+
   @GET
   @Path("/tables/{tableName}/stats")
   @Produces(MediaType.APPLICATION_JSON)
@@ -720,14 +798,14 @@ public String getTableStats(
       @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "realtime|offline") @QueryParam("type") String tableTypeStr) {
     ObjectNode ret = JsonUtils.newObjectNode();
-    if ((tableTypeStr == null || TableType.OFFLINE.name().equalsIgnoreCase(tableTypeStr)) && _pinotHelixResourceManager
-        .hasOfflineTable(tableName)) {
+    if ((tableTypeStr == null || TableType.OFFLINE.name().equalsIgnoreCase(tableTypeStr))
+        && _pinotHelixResourceManager.hasOfflineTable(tableName)) {
       String tableNameWithType = TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(tableName);
       TableStats tableStats = _pinotHelixResourceManager.getTableStats(tableNameWithType);
       ret.set(TableType.OFFLINE.name(), JsonUtils.objectToJsonNode(tableStats));
     }
-    if ((tableTypeStr == null || TableType.REALTIME.name().equalsIgnoreCase(tableTypeStr)) && _pinotHelixResourceManager
-        .hasRealtimeTable(tableName)) {
+    if ((tableTypeStr == null || TableType.REALTIME.name().equalsIgnoreCase(tableTypeStr))
+        && _pinotHelixResourceManager.hasRealtimeTable(tableName)) {
       String tableNameWithType = TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(tableName);
       TableStats tableStats = _pinotHelixResourceManager.getTableStats(tableNameWithType);
       ret.set(TableType.REALTIME.name(), JsonUtils.objectToJsonNode(tableStats));
@@ -749,9 +827,8 @@ private String constructTableNameWithType(String tableName, String tableTypeStr)
   private void checkHybridTableConfig(String rawTableName, TableConfig tableConfig) {
     if (tableConfig.getTableType() == TableType.REALTIME) {
       if (_pinotHelixResourceManager.hasOfflineTable(rawTableName)) {
-        TableConfigUtils
-            .verifyHybridTableConfigs(rawTableName, _pinotHelixResourceManager.getOfflineTableConfig(rawTableName),
-                tableConfig);
+        TableConfigUtils.verifyHybridTableConfigs(rawTableName,
+            _pinotHelixResourceManager.getOfflineTableConfig(rawTableName), tableConfig);
       }
     } else {
       if (_pinotHelixResourceManager.hasRealtimeTable(rawTableName)) {
@@ -782,8 +859,8 @@ public String getTableStatus(
       }
       TableStatus.IngestionStatus ingestionStatus = null;
       if (TableType.OFFLINE == tableType) {
-        ingestionStatus = TableIngestionStatusHelper
-            .getOfflineTableIngestionStatus(tableNameWithType, _pinotHelixResourceManager,
+        ingestionStatus =
+            TableIngestionStatusHelper.getOfflineTableIngestionStatus(tableNameWithType, _pinotHelixResourceManager,
                 _pinotHelixTaskResourceManager);
       } else {
         ingestionStatus = TableIngestionStatusHelper.getRealtimeTableIngestionStatus(tableNameWithType,
@@ -808,7 +885,7 @@ public String getTableAggregateMetadata(
       @ApiParam(value = "Name of the table", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "OFFLINE|REALTIME") @QueryParam("type") String tableTypeStr,
       @ApiParam(value = "Columns name", allowMultiple = true) @QueryParam("columns") @DefaultValue("")
-          List<String> columns) {
+      List<String> columns) {
     LOGGER.info("Received a request to fetch aggregate metadata for a table {}", tableName);
     TableType tableType = Constants.validateTableType(tableTypeStr);
     if (tableType == TableType.REALTIME) {
@@ -861,13 +938,21 @@ public Map<String, Map<String, String>> getControllerJobs(
     List<String> tableNamesWithType =
         ResourceUtils.getExistingTableNamesWithType(_pinotHelixResourceManager, tableName, tableTypeFromRequest,
             LOGGER);
-    Set<String> jobTypesToFilter = null;
+    Set<ControllerJobType> validJobTypes =
+        java.util.Arrays.stream(ControllerJobType.values()).collect(Collectors.toSet());
+    Set<ControllerJobType> jobTypesToFilter = null;
     if (StringUtils.isNotEmpty(jobTypesString)) {
-      jobTypesToFilter = new HashSet<>(java.util.Arrays.asList(StringUtils.split(jobTypesString, ',')));
+      try {
+        jobTypesToFilter = new HashSet<>(java.util.Arrays.asList(StringUtils.split(jobTypesString, ','))).stream()
+            .map(type -> ControllerJobType.valueOf(type)).collect(Collectors.toSet());
+      } catch (IllegalArgumentException e) {
+        throw new IllegalArgumentException("Valid Types are: " + validJobTypes);
+      }
     }
     Map<String, Map<String, String>> result = new HashMap<>();
     for (String tableNameWithType : tableNamesWithType) {
-      result.putAll(_pinotHelixResourceManager.getAllJobsForTable(tableNameWithType, jobTypesToFilter));
+      result.putAll(_pinotHelixResourceManager.getAllJobsForTable(tableNameWithType,
+          jobTypesToFilter == null ? validJobTypes : jobTypesToFilter));
     }
 
     return result;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
index c2605c7614d..ae1a079c9c1 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
@@ -25,14 +25,18 @@
 import io.swagger.annotations.ApiKeyAuthDefinition;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -58,6 +62,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.task.TaskPartitionState;
@@ -69,7 +74,6 @@
 import org.apache.pinot.controller.api.access.AccessType;
 import org.apache.pinot.controller.api.access.Authenticate;
 import org.apache.pinot.controller.api.exception.ControllerApplicationException;
-import org.apache.pinot.controller.api.exception.NoTaskMetadataException;
 import org.apache.pinot.controller.api.exception.NoTaskScheduledException;
 import org.apache.pinot.controller.api.exception.TaskAlreadyExistsException;
 import org.apache.pinot.controller.api.exception.UnknownTaskTypeException;
@@ -153,6 +157,7 @@ public class PinotTaskRestletResource {
 
   @GET
   @Path("/tasks/tasktypes")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("List all task types")
   public Set<String> listTaskTypes() {
     return _pinotHelixTaskResourceManager.getTaskTypes();
@@ -161,6 +166,7 @@ public Set<String> listTaskTypes() {
   @Deprecated
   @GET
   @Path("/tasks/taskqueues")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("List all task queues (deprecated)")
   public Set<String> getTaskQueues() {
     return _pinotHelixTaskResourceManager.getTaskQueues();
@@ -168,6 +174,7 @@ public Set<String> getTaskQueues() {
 
   @GET
   @Path("/tasks/{taskType}/state")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the state (task queue state) for the given task type")
   public TaskState getTaskQueueState(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
@@ -177,6 +184,7 @@ public TaskState getTaskQueueState(
   @Deprecated
   @GET
   @Path("/tasks/taskqueuestate/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the state (task queue state) for the given task type (deprecated)")
   public StringResultResponse getTaskQueueStateDeprecated(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
@@ -185,6 +193,7 @@ public StringResultResponse getTaskQueueStateDeprecated(
 
   @GET
   @Path("/tasks/{taskType}/tasks")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("List all tasks for the given task type")
   public Set<String> getTasks(@ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
     return _pinotHelixTaskResourceManager.getTasks(taskType);
@@ -192,6 +201,7 @@ public Set<String> getTasks(@ApiParam(value = "Task type", required = true) @Pat
 
   @GET
   @Path("/tasks/{taskType}/{tableNameWithType}/state")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("List all tasks for the given task type")
   public Map<String, TaskState> getTaskStatesByTable(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType,
@@ -202,6 +212,7 @@ public Map<String, TaskState> getTaskStatesByTable(
 
   @GET
   @Path("/tasks/{taskType}/{tableNameWithType}/metadata")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get task metadata for the given task type and table")
   public String getTaskMetadataByTable(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType,
@@ -209,8 +220,6 @@ public String getTaskMetadataByTable(
           String tableNameWithType) {
     try {
       return _pinotHelixTaskResourceManager.getTaskMetadataByTable(taskType, tableNameWithType);
-    } catch (NoTaskMetadataException e) {
-      throw new ControllerApplicationException(LOGGER, e.getMessage(), Response.Status.NOT_FOUND);
     } catch (JsonProcessingException e) {
       throw new ControllerApplicationException(LOGGER, String
           .format("Failed to format task metadata into Json for task type: %s from table: %s", taskType,
@@ -220,6 +229,7 @@ public String getTaskMetadataByTable(
 
   @DELETE
   @Path("/tasks/{taskType}/{tableNameWithType}/metadata")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Delete task metadata for the given task type and table")
   public SuccessResponse deleteTaskMetadataByTable(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType,
@@ -232,6 +242,7 @@ public SuccessResponse deleteTaskMetadataByTable(
 
   @GET
   @Path("/tasks/{taskType}/taskcounts")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch count of sub-tasks for each of the tasks for the given task type")
   public Map<String, PinotHelixTaskResourceManager.TaskCount> getTaskCounts(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
@@ -240,6 +251,7 @@ public Map<String, PinotHelixTaskResourceManager.TaskCount> getTaskCounts(
 
   @GET
   @Path("/tasks/{taskType}/debug")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch information for all the tasks for the given task type")
   public Map<String, PinotHelixTaskResourceManager.TaskDebugInfo> getTasksDebugInfo(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType,
@@ -252,6 +264,7 @@ public Map<String, PinotHelixTaskResourceManager.TaskDebugInfo> getTasksDebugInf
 
   @GET
   @Path("/tasks/{taskType}/{tableNameWithType}/debug")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch information for all the tasks for the given task type and table")
   public Map<String, PinotHelixTaskResourceManager.TaskDebugInfo> getTasksDebugInfo(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType,
@@ -320,6 +333,7 @@ public String getTaskGenerationDebugInto(
 
   @GET
   @Path("/tasks/task/{taskName}/debug")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch information for the given task name")
   public PinotHelixTaskResourceManager.TaskDebugInfo getTaskDebugInfo(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName,
@@ -333,6 +347,7 @@ public PinotHelixTaskResourceManager.TaskDebugInfo getTaskDebugInfo(
   @Deprecated
   @GET
   @Path("/tasks/tasks/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("List all tasks for the given task type (deprecated)")
   public Set<String> getTasksDeprecated(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
@@ -341,6 +356,7 @@ public Set<String> getTasksDeprecated(
 
   @GET
   @Path("/tasks/{taskType}/taskstates")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get a map from task to task state for the given task type")
   public Map<String, TaskState> getTaskStates(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
@@ -350,6 +366,7 @@ public Map<String, TaskState> getTaskStates(
   @Deprecated
   @GET
   @Path("/tasks/taskstates/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get a map from task to task state for the given task type (deprecated)")
   public Map<String, TaskState> getTaskStatesDeprecated(
       @ApiParam(value = "Task type", required = true) @PathParam("taskType") String taskType) {
@@ -358,6 +375,7 @@ public Map<String, TaskState> getTaskStatesDeprecated(
 
   @GET
   @Path("/tasks/task/{taskName}/state")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the task state for the given task")
   public TaskState getTaskState(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName) {
@@ -367,6 +385,7 @@ public TaskState getTaskState(
   @Deprecated
   @GET
   @Path("/tasks/taskstate/{taskName}")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the task state for the given task (deprecated)")
   public StringResultResponse getTaskStateDeprecated(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName) {
@@ -375,6 +394,7 @@ public StringResultResponse getTaskStateDeprecated(
 
   @GET
   @Path("/tasks/subtask/{taskName}/state")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the states of all the sub tasks for the given task")
   public Map<String, TaskPartitionState> getSubtaskStates(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName) {
@@ -383,6 +403,7 @@ public Map<String, TaskPartitionState> getSubtaskStates(
 
   @GET
   @Path("/tasks/task/{taskName}/config")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the task config (a list of child task configs) for the given task")
   public List<PinotTaskConfig> getTaskConfigs(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName) {
@@ -391,6 +412,7 @@ public List<PinotTaskConfig> getTaskConfigs(
 
   @GET
   @Path("/tasks/task/{taskName}/runtime/config")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the task runtime config for the given task")
   public Map<String, String> getTaskConfig(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName) {
@@ -400,6 +422,7 @@ public Map<String, String> getTaskConfig(
   @Deprecated
   @GET
   @Path("/tasks/taskconfig/{taskName}")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the task config (a list of child task configs) for the given task (deprecated)")
   public List<PinotTaskConfig> getTaskConfigsDeprecated(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName) {
@@ -408,6 +431,7 @@ public List<PinotTaskConfig> getTaskConfigsDeprecated(
 
   @GET
   @Path("/tasks/subtask/{taskName}/config")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Get the configs of specified sub tasks for the given task")
   public Map<String, PinotTaskConfig> getSubtaskConfigs(
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName,
@@ -419,7 +443,7 @@ public Map<String, PinotTaskConfig> getSubtaskConfigs(
   @GET
   @Path("/tasks/subtask/{taskName}/progress")
   @Produces(MediaType.APPLICATION_JSON)
-  @ApiOperation("Get progress of specified sub tasks for the given task tracked by worker in memory")
+  @ApiOperation("Get progress of specified sub tasks for the given task tracked by minion worker in memory")
   public String getSubtaskProgress(@Context HttpHeaders httpHeaders,
       @ApiParam(value = "Task name", required = true) @PathParam("taskName") String taskName,
       @ApiParam(value = "Sub task names separated by comma") @QueryParam("subtaskNames") @Nullable
@@ -451,8 +475,52 @@ public String getSubtaskProgress(@Context HttpHeaders httpHeaders,
     }
   }
 
+  @GET
+  @Path("/tasks/subtask/workers/progress")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation("Get progress of all subtasks with specified state tracked by minion worker in memory")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"), @ApiResponse(code = 500, message = "Internal server error")
+  })
+  public String getSubtaskOnWorkerProgress(@Context HttpHeaders httpHeaders,
+      @ApiParam(value = "Subtask state (UNKNOWN,IN_PROGRESS,SUCCEEDED,CANCELLED,ERROR)", required = true)
+      @QueryParam("subTaskState") String subTaskState,
+      @ApiParam(value = "Minion worker IDs separated by comma") @QueryParam("minionWorkerIds") @Nullable
+          String minionWorkerIds) {
+    Set<String> selectedMinionWorkers = new HashSet<>();
+    if (StringUtils.isNotEmpty(minionWorkerIds)) {
+      selectedMinionWorkers.addAll(
+          Arrays.stream(StringUtils.split(minionWorkerIds, ',')).map(String::trim).collect(Collectors.toList()));
+    }
+    // Relying on original schema that was used to query the controller
+    String scheme = _uriInfo.getRequestUri().getScheme();
+    List<InstanceConfig> allMinionWorkerInstanceConfigs = _pinotHelixResourceManager.getAllMinionInstanceConfigs();
+    Map<String, String> selectedMinionWorkerEndpoints = new HashMap<>();
+    for (InstanceConfig worker : allMinionWorkerInstanceConfigs) {
+      if (selectedMinionWorkers.isEmpty() || selectedMinionWorkers.contains(worker.getId())) {
+        selectedMinionWorkerEndpoints.put(worker.getId(),
+            String.format("%s://%s:%d", scheme, worker.getHostName(), Integer.parseInt(worker.getPort())));
+      }
+    }
+    Map<String, String> requestHeaders = new HashMap<>();
+    httpHeaders.getRequestHeaders().keySet().forEach(header ->
+        requestHeaders.put(header, httpHeaders.getHeaderString(header)));
+    int timeoutMs = _controllerConf.getMinionAdminRequestTimeoutSeconds() * 1000;
+    try {
+      Map<String, Object> minionWorkerIdSubtaskProgressMap =
+          _pinotHelixTaskResourceManager.getSubtaskOnWorkerProgress(subTaskState, _executor, _connectionManager,
+              selectedMinionWorkerEndpoints, requestHeaders, timeoutMs);
+      return JsonUtils.objectToString(minionWorkerIdSubtaskProgressMap);
+    } catch (Exception e) {
+      throw new ControllerApplicationException(LOGGER,
+          String.format("Failed to get minion worker side progress for subtasks with state %s due to error: %s",
+              subTaskState, ExceptionUtils.getStackTrace(e)), Response.Status.INTERNAL_SERVER_ERROR, e);
+    }
+  }
+
   @GET
   @Path("/tasks/scheduler/information")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch cron scheduler information")
   public Map<String, Object> getCronSchedulerInformation()
       throws SchedulerException {
@@ -490,6 +558,7 @@ public Map<String, Object> getCronSchedulerInformation()
 
   @GET
   @Path("/tasks/scheduler/jobKeys")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch cron scheduler job keys")
   public List<JobKey> getCronSchedulerJobKeys()
       throws SchedulerException {
@@ -506,6 +575,7 @@ public List<JobKey> getCronSchedulerJobKeys()
 
   @GET
   @Path("/tasks/scheduler/jobDetails")
+  @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation("Fetch cron scheduler job keys")
   public Map<String, Object> getCronSchedulerJobDetails(
       @ApiParam(value = "Table name (with type suffix)") @QueryParam("tableName") String tableName,
@@ -562,6 +632,7 @@ public Map<String, Object> getCronSchedulerJobDetails(
 
   @POST
   @Path("/tasks/schedule")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Schedule tasks and return a map from task type to task name scheduled")
   public Map<String, String> scheduleTasks(@ApiParam(value = "Task type") @QueryParam("taskType") String taskType,
@@ -610,6 +681,7 @@ public void executeAdhocTask(AdhocTaskConfig adhocTaskConfig, @Suspended AsyncRe
   @Deprecated
   @PUT
   @Path("/tasks/scheduletasks")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Schedule tasks (deprecated)")
   public Map<String, String> scheduleTasksDeprecated() {
@@ -618,6 +690,7 @@ public Map<String, String> scheduleTasksDeprecated() {
 
   @PUT
   @Path("/tasks/{taskType}/cleanup")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Clean up finished tasks (COMPLETED, FAILED) for the given task type")
   public SuccessResponse cleanUpTasks(
@@ -629,6 +702,7 @@ public SuccessResponse cleanUpTasks(
   @Deprecated
   @PUT
   @Path("/tasks/cleanuptasks/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Clean up finished tasks (COMPLETED, FAILED) for the given task type (deprecated)")
   public SuccessResponse cleanUpTasksDeprecated(
@@ -639,6 +713,7 @@ public SuccessResponse cleanUpTasksDeprecated(
 
   @PUT
   @Path("/tasks/{taskType}/stop")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Stop all running/pending tasks (as well as the task queue) for the given task type")
   public SuccessResponse stopTasks(
@@ -649,6 +724,7 @@ public SuccessResponse stopTasks(
 
   @PUT
   @Path("/tasks/{taskType}/resume")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Resume all stopped tasks (as well as the task queue) for the given task type")
   public SuccessResponse resumeTasks(
@@ -660,6 +736,7 @@ public SuccessResponse resumeTasks(
   @Deprecated
   @PUT
   @Path("/tasks/taskqueue/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.UPDATE)
   @ApiOperation("Stop/resume a task queue (deprecated)")
   public SuccessResponse toggleTaskQueueState(
@@ -679,6 +756,7 @@ public SuccessResponse toggleTaskQueueState(
 
   @DELETE
   @Path("/tasks/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.DELETE)
   @ApiOperation("Delete all tasks (as well as the task queue) for the given task type")
   public SuccessResponse deleteTasks(
@@ -691,6 +769,7 @@ public SuccessResponse deleteTasks(
 
   @DELETE
   @Path("/tasks/task/{taskName}")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.DELETE)
   @ApiOperation("Delete a single task given its task name")
   public SuccessResponse deleteTask(
@@ -704,6 +783,7 @@ public SuccessResponse deleteTask(
   @Deprecated
   @DELETE
   @Path("/tasks/taskqueue/{taskType}")
+  @Produces(MediaType.APPLICATION_JSON)
   @Authenticate(AccessType.DELETE)
   @ApiOperation("Delete a task queue (deprecated)")
   public SuccessResponse deleteTaskQueue(
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java
index d1c89d206a3..7b14b6fb0f0 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResource.java
@@ -203,21 +203,37 @@ public TenantsList getAllTenants(
   @GET
   @Path("/tenants/{tenantName}")
   @Produces(MediaType.APPLICATION_JSON)
-  @ApiOperation(value = "List instance for a tenant, or enable/disable/drop a tenant")
+  @ApiOperation(value = "List instance for a tenant")
   @ApiResponses(value = {
       @ApiResponse(code = 200, message = "Success"),
       @ApiResponse(code = 500, message = "Error reading tenants list")
   })
-  public String listInstanceOrToggleTenantState(
+  public String listInstance(
       @ApiParam(value = "Tenant name", required = true) @PathParam("tenantName") String tenantName,
       @ApiParam(value = "Tenant type (server|broker)") @QueryParam("type") String tenantType,
-      @ApiParam(value = "Table type (offline|realtime)") @QueryParam("tableType") String tableType,
-      @ApiParam(value = "state") @QueryParam("state") String stateStr)
-      throws Exception {
-    if (stateStr == null) {
-      return listInstancesForTenant(tenantName, tenantType, tableType);
-    } else {
+      @ApiParam(value = "Table type (offline|realtime)") @QueryParam("tableType") String tableType) {
+    return listInstancesForTenant(tenantName, tenantType, tableType);
+  }
+
+  @POST
+  @Path("/tenants/{tenantName}")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation(value = "enable/disable a tenant")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 500, message = "Error applying state to tenant")
+  })
+  public SuccessResponse enableOrDisableTenant(
+      @ApiParam(value = "Tenant name", required = true) @PathParam("tenantName") String tenantName,
+      @ApiParam(value = "Tenant type (server|broker)") @QueryParam("type") String tenantType,
+      @ApiParam(value = "state (enable|disable)") @QueryParam("state") String stateStr) {
+    if (stateStr.equalsIgnoreCase(String.valueOf(StateType.ENABLE))
+        || stateStr.equalsIgnoreCase(String.valueOf(StateType.DISABLE))) {
       return toggleTenantState(tenantName, stateStr, tenantType);
+    } else {
+      throw new ControllerApplicationException(LOGGER,
+          "Error: State mentioned " + stateStr + " is wrong. Valid States: Enable, Disable",
+          Response.Status.BAD_REQUEST);
     }
   }
 
@@ -260,7 +276,7 @@ private String getTablesServedFromTenant(String tenantName) {
     return resourceGetRet.toString();
   }
 
-  private String toggleTenantState(String tenantName, String stateStr, @Nullable String tenantType) {
+  private SuccessResponse toggleTenantState(String tenantName, String stateStr, @Nullable String tenantType) {
     Set<String> serverInstances = new HashSet<>();
     Set<String> brokerInstances = new HashSet<>();
     ObjectNode instanceResult = JsonUtils.newObjectNode();
@@ -276,27 +292,17 @@ private String toggleTenantState(String tenantName, String stateStr, @Nullable S
     Set<String> allInstances = new HashSet<String>(serverInstances);
     allInstances.addAll(brokerInstances);
 
-    if (StateType.DROP.name().equalsIgnoreCase(stateStr)) {
-      if (!allInstances.isEmpty()) {
-        throw new ControllerApplicationException(LOGGER,
-            "Error: Tenant " + tenantName + " has live instances, cannot be dropped.", Response.Status.BAD_REQUEST);
+    if (StateType.DISABLE.name().equalsIgnoreCase(stateStr)) {
+      for (String instance : allInstances) {
+        instanceResult.put(instance, JsonUtils.objectToJsonNode(_pinotHelixResourceManager.disableInstance(instance)));
       }
-      _pinotHelixResourceManager.deleteBrokerTenantFor(tenantName);
-      _pinotHelixResourceManager.deleteOfflineServerTenantFor(tenantName);
-      _pinotHelixResourceManager.deleteRealtimeServerTenantFor(tenantName);
-      return new SuccessResponse("Dropped tenant " + tenantName + " successfully.").toString();
     }
-
-    boolean enable = StateType.ENABLE.name().equalsIgnoreCase(stateStr) ? true : false;
-    for (String instance : allInstances) {
-      if (enable) {
+    if (StateType.ENABLE.name().equalsIgnoreCase(stateStr)) {
+      for (String instance : allInstances) {
         instanceResult.put(instance, JsonUtils.objectToJsonNode(_pinotHelixResourceManager.enableInstance(instance)));
-      } else {
-        instanceResult.put(instance, JsonUtils.objectToJsonNode(_pinotHelixResourceManager.disableInstance(instance)));
       }
     }
-
-    return null;
+    return new SuccessResponse("Changed state of tenant " + tenantName + " to " + stateStr + " successfully.");
   }
 
   private String listInstancesForTenant(String tenantName, String tenantType, String tableTypeString) {
@@ -401,6 +407,7 @@ public static class TenantsList {
   // CHANGE-ALERT: This is not backward compatible. We've changed this API from GET to POST because:
   //   1. That is correct
   //   2. with GET, we need to write our own routing logic to avoid conflict since this is same as the API above
+  @Deprecated
   @POST
   @Path("/tenants/{tenantName}/metadata")
   @Authenticate(AccessType.UPDATE)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotUpsertRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotUpsertRestletResource.java
index 363b288ef62..0c0fdaa8e0b 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotUpsertRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotUpsertRestletResource.java
@@ -129,14 +129,25 @@ public String estimateHeapUsage(String tableSchemaConfigStr,
     // Estimated value space, it contains <segmentName, DocId, ComparisonValue(timestamp)> and overhead.
     // Here we only calculate the map content size. TODO: Add the map entry size and the array size within the map.
     int bytesPerValue = 60;
-    String comparisonColumn = tableConfig.getUpsertConfig().getComparisonColumn();
-    if (comparisonColumn != null) {
-      FieldSpec.DataType dt = schema.getFieldSpecFor(comparisonColumn).getDataType();
-      if (!dt.isFixedWidth()) {
-        String msg = "Not support data types for the comparison column";
-        throw new ControllerApplicationException(LOGGER, msg, Response.Status.BAD_REQUEST);
-      } else {
-        bytesPerValue = 52 + dt.size();
+    List<String> comparisonColumns = tableConfig.getUpsertConfig().getComparisonColumns();
+    if (comparisonColumns != null) {
+      int bytesPerArrayElem = 8;  // object ref
+      bytesPerValue = 52;
+      for (String columnName : comparisonColumns) {
+        FieldSpec.DataType dt = schema.getFieldSpecFor(columnName).getDataType();
+        if (!dt.isFixedWidth()) {
+          String msg = "Not support data types for the comparison column";
+          throw new ControllerApplicationException(LOGGER, msg, Response.Status.BAD_REQUEST);
+        } else {
+          if (comparisonColumns.size() == 1) {
+            bytesPerValue += dt.size();
+          } else {
+            bytesPerValue += bytesPerArrayElem + dt.size();
+          }
+        }
+      }
+      if (comparisonColumns.size() > 1) {
+        bytesPerValue += 48 + 4;  // array overhead + comparableIndex integer
       }
     }
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerRebalanceJobStatusResponse.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerRebalanceJobStatusResponse.java
new file mode 100644
index 00000000000..3018b4877e8
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerRebalanceJobStatusResponse.java
@@ -0,0 +1,44 @@
+/**
+ * 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.pinot.controller.api.resources;
+
+import org.apache.pinot.controller.helix.core.rebalance.TableRebalanceProgressStats;
+
+
+public class ServerRebalanceJobStatusResponse {
+  private long _timeElapsedSinceStartInSeconds;
+
+  private TableRebalanceProgressStats _tableRebalanceProgressStats;
+
+  public void setTimeElapsedSinceStartInSeconds(Long timeElapsedSinceStart) {
+    _timeElapsedSinceStartInSeconds = timeElapsedSinceStart;
+  }
+
+  public void setTableRebalanceProgressStats(TableRebalanceProgressStats tableRebalanceProgressStats) {
+    _tableRebalanceProgressStats = tableRebalanceProgressStats;
+  }
+
+  public TableRebalanceProgressStats getTableRebalanceProgressStats() {
+    return _tableRebalanceProgressStats;
+  }
+
+  public long getTimeElapsedSinceStartInSeconds() {
+    return _timeElapsedSinceStartInSeconds;
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java
index 64eb00c491c..6ba049d3db4 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ServerTableSizeReader.java
@@ -66,7 +66,8 @@ public Map<String, List<SegmentSizeInfo>> getSegmentSizeInfoFromServers(BiMap<St
     CompletionServiceHelper completionServiceHelper =
         new CompletionServiceHelper(_executor, _connectionManager, endpointsToServers);
     CompletionServiceHelper.CompletionServiceResponse serviceResponse =
-        completionServiceHelper.doMultiGetRequest(serverUrls, tableNameWithType, false, timeoutMs);
+        completionServiceHelper.doMultiGetRequest(serverUrls, tableNameWithType, false, timeoutMs,
+            "get segment size info from servers");
     Map<String, List<SegmentSizeInfo>> serverToSegmentSizeInfoListMap = new HashMap<>();
     int failedParses = 0;
     for (Map.Entry<String, String> streamResponse : serviceResponse._httpResponses.entrySet()) {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableConfigsRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableConfigsRestletResource.java
index 8d8daff4d53..6e1989339c5 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableConfigsRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableConfigsRestletResource.java
@@ -227,7 +227,7 @@ public ConfigSuccessResponse addConfig(
         // Invoke delete on tables whether they exist or not, to account for metadata/segments etc.
         _pinotHelixResourceManager.deleteRealtimeTable(rawTableName);
         _pinotHelixResourceManager.deleteOfflineTable(rawTableName);
-        _pinotHelixResourceManager.deleteSchema(schema);
+        _pinotHelixResourceManager.deleteSchema(schema.getSchemaName());
         throw e;
       }
 
@@ -271,12 +271,9 @@ public SuccessResponse deleteConfig(
       LOGGER.info("Deleted realtime table: {}", tableName);
       _pinotHelixResourceManager.deleteOfflineTable(tableName);
       LOGGER.info("Deleted offline table: {}", tableName);
-      Schema schema = _pinotHelixResourceManager.getSchema(tableName);
-      if (schema != null) {
-        _pinotHelixResourceManager.deleteSchema(schema);
-        LOGGER.info("Deleted schema: {}", tableName);
-      }
-      if (tableExists || schema != null) {
+      boolean schemaExists = _pinotHelixResourceManager.deleteSchema(tableName);
+      LOGGER.info("Deleted schema: {}", tableName);
+      if (tableExists || schemaExists) {
         return new SuccessResponse("Deleted TableConfigs: " + tableName);
       } else {
         return new SuccessResponse(
@@ -291,6 +288,9 @@ public SuccessResponse deleteConfig(
    * Updated the {@link TableConfigs} by updating the schema tableName,
    * then updating the offline tableConfig or creating a new one if it doesn't already exist in the cluster,
    * then updating the realtime tableConfig or creating a new one if it doesn't already exist in the cluster.
+   *
+   * The option to skip table config validation (validationTypesToSkip) and force update the table schema
+   * (forceTableSchemaUpdate) are provided for testing purposes and should be used with caution.
    */
   @PUT
   @Path("/tableConfigs/{tableName}")
@@ -304,8 +304,10 @@ public ConfigSuccessResponse updateConfig(
       @ApiParam(value = "comma separated list of validation type(s) to skip. supported types: (ALL|TASK|UPSERT)")
       @QueryParam("validationTypesToSkip") @Nullable String typesToSkip,
       @ApiParam(value = "Reload the table if the new schema is backward compatible") @DefaultValue("false")
-      @QueryParam("reload") boolean reload, String tableConfigsStr)
-      throws Exception {
+      @QueryParam("reload") boolean reload,
+      @ApiParam(value = "Force update the table schema") @DefaultValue("false")
+      @QueryParam("forceTableSchemaUpdate") boolean forceTableSchemaUpdate,
+      String tableConfigsStr) throws Exception {
     Pair<TableConfigs, Map<String, Object>> tableConfigsAndUnrecognizedProps;
     TableConfigs tableConfigs;
     try {
@@ -333,7 +335,7 @@ public ConfigSuccessResponse updateConfig(
     Schema schema = tableConfigs.getSchema();
 
     try {
-      _pinotHelixResourceManager.updateSchema(schema, reload);
+      _pinotHelixResourceManager.updateSchema(schema, reload, forceTableSchemaUpdate);
       LOGGER.info("Updated schema: {}", tableName);
 
       if (offlineTableConfig != null) {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java
index 4e28b7af147..a9071c89659 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableSize.java
@@ -29,12 +29,10 @@
 import io.swagger.annotations.SwaggerDefinition;
 import java.util.concurrent.Executor;
 import javax.inject.Inject;
-import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -72,18 +70,15 @@ public class TableSize {
   @GET
   @Path("/tables/{tableName}/size")
   @Produces(MediaType.APPLICATION_JSON)
-  @ApiOperation(value = "Read table sizes",
-      notes = "Get table size details. Table size is the size of untarred segments including replication")
+  @ApiOperation(value = "Read table sizes", notes = "Get table size details. Table size is the size of untarred "
+      + "segments including replication")
   @ApiResponses(value = {
-      @ApiResponse(code = 200, message = "Success"),
-      @ApiResponse(code = 404, message = "Table not found"),
+      @ApiResponse(code = 200, message = "Success"), @ApiResponse(code = 404, message = "Table not found"),
       @ApiResponse(code = 500, message = "Internal server error")
   })
   public TableSizeReader.TableSizeDetails getTableSize(
       @ApiParam(value = "Table name without type", required = true, example = "myTable | myTable_OFFLINE")
-      @PathParam("tableName") String tableName,
-      @ApiParam(value = "Get detailed information", required = false) @DefaultValue("true") @QueryParam("detailed")
-          boolean detailed) {
+      @PathParam("tableName") String tableName) {
     TableSizeReader tableSizeReader =
         new TableSizeReader(_executor, _connectionManager, _controllerMetrics, _pinotHelixResourceManager);
     TableSizeReader.TableSizeDetails tableSizeDetails = null;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java
index 2da40ef3e55..e6aa83dea15 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java
@@ -81,6 +81,16 @@ public Schema getSchema(String schemaName)
     }
   }
 
+  public void updateSchema(Schema schema)
+      throws IOException {
+    String url = _controllerRequestURLBuilder.forSchemaUpdate(schema.getSchemaName());
+    try {
+      HttpClient.wrapAndThrowHttpException(_httpClient.sendMultipartPutRequest(url, schema.toSingleLineJsonString()));
+    } catch (HttpErrorStatusException e) {
+      throw new IOException(e);
+    }
+  }
+
   public void deleteSchema(String schemaName)
       throws IOException {
     String url = _controllerRequestURLBuilder.forSchemaDelete(schemaName);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java
index 4eb14c59728..60ec5b24616 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/SegmentStatusChecker.java
@@ -298,7 +298,7 @@ private void updateSegmentMetrics(String tableNameWithType, TableConfig tableCon
         (nReplicasIdealMax > 0) ? (nReplicasExternal * 100 / nReplicasIdealMax) : 100);
     _controllerMetrics.setValueOfTableGauge(tableNameWithType, ControllerGauge.SEGMENTS_IN_ERROR_STATE, nErrors);
     _controllerMetrics.setValueOfTableGauge(tableNameWithType, ControllerGauge.PERCENT_SEGMENTS_AVAILABLE,
-        (nSegments > 0) ? (100 - (nOffline * 100 / nSegments)) : 100);
+        (nSegments > 0) ? (nSegments - nOffline) * 100 / nSegments : 100);
     _controllerMetrics.setValueOfTableGauge(tableNameWithType, ControllerGauge.TABLE_COMPRESSED_SIZE,
         tableCompressedSize);
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
index dda6b1de239..346a19a1d66 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
@@ -34,6 +34,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -47,7 +48,6 @@
 import java.util.TreeSet;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -112,12 +112,20 @@
 import org.apache.pinot.common.metadata.instance.InstanceZKMetadata;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.minion.MinionTaskMetadataUtils;
+import org.apache.pinot.common.restlet.resources.EndReplaceSegmentsRequest;
+import org.apache.pinot.common.restlet.resources.RevertReplaceSegmentsRequest;
+import org.apache.pinot.common.tier.Tier;
+import org.apache.pinot.common.tier.TierFactory;
+import org.apache.pinot.common.tier.TierSegmentSelector;
 import org.apache.pinot.common.utils.BcryptUtils;
 import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.common.utils.SegmentName;
 import org.apache.pinot.common.utils.config.AccessControlUserConfigUtils;
 import org.apache.pinot.common.utils.config.InstanceUtils;
 import org.apache.pinot.common.utils.config.TableConfigUtils;
 import org.apache.pinot.common.utils.config.TagNameUtils;
+import org.apache.pinot.common.utils.config.TierConfigUtils;
 import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.common.utils.helix.PinotHelixPropertyStoreZnRecordProvider;
 import org.apache.pinot.controller.ControllerConf;
@@ -126,15 +134,19 @@
 import org.apache.pinot.controller.api.exception.TableAlreadyExistsException;
 import org.apache.pinot.controller.api.exception.UserAlreadyExistsException;
 import org.apache.pinot.controller.api.resources.InstanceInfo;
+import org.apache.pinot.controller.api.resources.OperationValidationResponse;
 import org.apache.pinot.controller.api.resources.PeriodicTaskInvocationResponse;
 import org.apache.pinot.controller.api.resources.StateType;
 import org.apache.pinot.controller.helix.core.assignment.instance.InstanceAssignmentDriver;
 import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignment;
 import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentFactory;
 import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentUtils;
+import org.apache.pinot.controller.helix.core.lineage.LineageManager;
+import org.apache.pinot.controller.helix.core.lineage.LineageManagerFactory;
 import org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
 import org.apache.pinot.controller.helix.core.rebalance.RebalanceResult;
 import org.apache.pinot.controller.helix.core.rebalance.TableRebalancer;
+import org.apache.pinot.controller.helix.core.rebalance.ZkBasedTableRebalanceObserver;
 import org.apache.pinot.controller.helix.core.util.ZKMetadataUtils;
 import org.apache.pinot.controller.helix.starter.HelixConfig;
 import org.apache.pinot.segment.spi.SegmentMetadata;
@@ -148,6 +160,7 @@
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.TagOverrideConfig;
 import org.apache.pinot.spi.config.table.TenantConfig;
+import org.apache.pinot.spi.config.table.TierConfig;
 import org.apache.pinot.spi.config.table.UpsertConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
 import org.apache.pinot.spi.config.tenant.Tenant;
@@ -164,6 +177,7 @@
 import org.apache.pinot.spi.utils.IngestionConfigUtils;
 import org.apache.pinot.spi.utils.InstanceTypeUtils;
 import org.apache.pinot.spi.utils.JsonUtils;
+import org.apache.pinot.spi.utils.RebalanceConfigConstants;
 import org.apache.pinot.spi.utils.TimeUtils;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.spi.utils.retry.RetryPolicies;
@@ -177,10 +191,15 @@ public class PinotHelixResourceManager {
   private static final Logger LOGGER = LoggerFactory.getLogger(PinotHelixResourceManager.class);
   private static final long CACHE_ENTRY_EXPIRE_TIME_HOURS = 6L;
   private static final RetryPolicy DEFAULT_RETRY_POLICY = RetryPolicies.exponentialBackoffRetryPolicy(5, 1000L, 2.0f);
+  private static final int DEFAULT_SEGMENT_LINEAGE_UPDATE_NUM_RETRY = 10;
   public static final String APPEND = "APPEND";
   private static final int DEFAULT_TABLE_UPDATER_LOCKERS_SIZE = 100;
   private static final String API_REQUEST_ID_PREFIX = "api-";
 
+  private enum LineageUpdateType {
+    START, END, REVERT
+  }
+
   // TODO: make this configurable
   public static final long EXTERNAL_VIEW_ONLINE_SEGMENTS_MAX_WAIT_MS = 10 * 60_000L; // 10 minutes
   public static final long EXTERNAL_VIEW_CHECK_INTERVAL_MS = 1_000L; // 1 second
@@ -203,6 +222,7 @@ public class PinotHelixResourceManager {
   private final boolean _enableBatchMessageMode;
   private final boolean _allowHLCTables;
   private final int _deletedSegmentsRetentionInDays;
+  private final boolean _enableTieredSegmentAssignment;
 
   private HelixManager _helixZkManager;
   private HelixAdmin _helixAdmin;
@@ -212,10 +232,11 @@ public class PinotHelixResourceManager {
   private SegmentDeletionManager _segmentDeletionManager;
   private PinotLLCRealtimeSegmentManager _pinotLLCRealtimeSegmentManager;
   private TableCache _tableCache;
+  private final LineageManager _lineageManager;
 
   public PinotHelixResourceManager(String zkURL, String helixClusterName, @Nullable String dataDir,
       boolean isSingleTenantCluster, boolean enableBatchMessageMode, boolean allowHLCTables,
-      int deletedSegmentsRetentionInDays) {
+      int deletedSegmentsRetentionInDays, boolean enableTieredSegmentAssignment, LineageManager lineageManager) {
     _helixZkURL = HelixConfig.getAbsoluteZkPathForHelix(zkURL);
     _helixClusterName = helixClusterName;
     _dataDir = dataDir;
@@ -223,6 +244,7 @@ public PinotHelixResourceManager(String zkURL, String helixClusterName, @Nullabl
     _enableBatchMessageMode = enableBatchMessageMode;
     _deletedSegmentsRetentionInDays = deletedSegmentsRetentionInDays;
     _allowHLCTables = allowHLCTables;
+    _enableTieredSegmentAssignment = enableTieredSegmentAssignment;
     _instanceAdminEndpointCache =
         CacheBuilder.newBuilder().expireAfterWrite(CACHE_ENTRY_EXPIRE_TIME_HOURS, TimeUnit.HOURS)
             .build(new CacheLoader<String, String>() {
@@ -237,12 +259,14 @@ public String load(String instanceId) {
     for (int i = 0; i < _tableUpdaterLocks.length; i++) {
       _tableUpdaterLocks[i] = new Object();
     }
+    _lineageManager = lineageManager;
   }
 
   public PinotHelixResourceManager(ControllerConf controllerConf) {
     this(controllerConf.getZkStr(), controllerConf.getHelixClusterName(), controllerConf.getDataDir(),
         controllerConf.tenantIsolationEnabled(), controllerConf.getEnableBatchMessageMode(),
-        controllerConf.getHLCTablesAllowed(), controllerConf.getDeletedSegmentsRetentionInDays());
+        controllerConf.getHLCTablesAllowed(), controllerConf.getDeletedSegmentsRetentionInDays(),
+        controllerConf.tieredSegmentAssignmentEnabled(), LineageManagerFactory.create(controllerConf));
   }
 
   /**
@@ -252,6 +276,8 @@ public PinotHelixResourceManager(ControllerConf controllerConf) {
    * as PARTICIPANT,
    * which would be put to lead controller resource and mess up the leadership assignment. Those places should use
    * SPECTATOR other than PARTICIPANT.
+   * TODO:For the <a href="https://github.com/apache/pinot/pull/10451">backwards incompatible change</a>, this is a
+   * reminder to clean up old Zk nodes when the controller starts up.
    */
   public synchronized void start(HelixManager helixZkManager) {
     _helixZkManager = helixZkManager;
@@ -286,15 +312,13 @@ public void onInstanceConfigChange(List<InstanceConfig> instanceConfigs, Notific
     } catch (Exception e) {
       throw new RuntimeException("Caught exception while adding InstanceConfigChangeListener");
     }
-
     // Initialize TableCache
     HelixConfigScope helixConfigScope =
         new HelixConfigScopeBuilder(HelixConfigScope.ConfigScopeProperty.CLUSTER).forCluster(_helixClusterName).build();
     Map<String, String> configs = _helixAdmin.getConfig(helixConfigScope,
-        Arrays.asList(Helix.ENABLE_CASE_INSENSITIVE_KEY, Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY));
-    boolean caseInsensitive =
-        Boolean.parseBoolean(configs.get(Helix.ENABLE_CASE_INSENSITIVE_KEY)) || Boolean.parseBoolean(
-            configs.get(Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY));
+        Arrays.asList(Helix.ENABLE_CASE_INSENSITIVE_KEY));
+    boolean caseInsensitive = Boolean.parseBoolean(configs.getOrDefault(Helix.ENABLE_CASE_INSENSITIVE_KEY,
+            Boolean.toString(Helix.DEFAULT_ENABLE_CASE_INSENSITIVE)));
     _tableCache = new TableCache(_propertyStore, caseInsensitive);
   }
 
@@ -314,6 +338,15 @@ public String getHelixZkURL() {
     return _helixZkURL;
   }
 
+  /**
+   * Get the tablecache object.
+   *
+   * @return TableCache object
+   */
+  public TableCache getTableCache() {
+    return _tableCache;
+  }
+
   /**
    * Get the Helix cluster name.
    *
@@ -359,6 +392,15 @@ public ZkHelixPropertyStore<ZNRecord> getPropertyStore() {
     return _propertyStore;
   }
 
+  /**
+   * Get the linage manager.
+   *
+   * @return lineage manager
+   */
+  public LineageManager getLineageManager() {
+    return _lineageManager;
+  }
+
   /**
    * Instance related APIs
    */
@@ -738,36 +780,26 @@ public String getActualTableName(String tableName) {
    * @return List of segment names
    */
   public List<String> getSegmentsFor(String tableNameWithType, boolean shouldExcludeReplacedSegments) {
-    IdealState idealState = getTableIdealState(tableNameWithType);
-    Preconditions.checkState(idealState != null, "Failed to find ideal state for table: %s", tableNameWithType);
-    List<String> segments = new ArrayList<>(idealState.getPartitionSet());
-    return shouldExcludeReplacedSegments ? excludeReplacedSegments(tableNameWithType, segments) : segments;
+    return getSegmentsFor(tableNameWithType, shouldExcludeReplacedSegments, Long.MIN_VALUE, Long.MAX_VALUE, false);
   }
 
   /**
-   * Returns the segments for the given table from the property store. This API is useful to track the orphan segments
-   * that are removed from the ideal state but not the property store.
-   */
-  public List<String> getSegmentsFromPropertyStore(String tableNameWithType) {
-    return ZKMetadataProvider.getSegments(_propertyStore, tableNameWithType);
-  }
-
-  /**
-   * Returns the segments for the given table based on the start and end timestamp from the ideal state.
+   * Returns the segments for the given table from the ideal state.
    *
-   * @param tableNameWithType  Table name with type suffix
+   * @param tableNameWithType Table name with type suffix
+   * @param shouldExcludeReplacedSegments whether to return the list of segments that doesn't contain replaced segments.
    * @param startTimestamp  start timestamp in milliseconds (inclusive)
    * @param endTimestamp  end timestamp in milliseconds (exclusive)
    * @param excludeOverlapping  whether to exclude the segments overlapping with the timestamps
+   * @return List of segment names
    */
-  public List<String> getSegmentsForTableWithTimestamps(String tableNameWithType, long startTimestamp,
-      long endTimestamp, boolean excludeOverlapping) {
+  public List<String> getSegmentsFor(String tableNameWithType, boolean shouldExcludeReplacedSegments,
+      long startTimestamp, long endTimestamp, boolean excludeOverlapping) {
     IdealState idealState = getTableIdealState(tableNameWithType);
     Preconditions.checkState(idealState != null, "Failed to find ideal state for table: %s", tableNameWithType);
-    Set<String> segments = idealState.getPartitionSet();
-    // If no start and end timestamp specified, just select all the segments.
+    List<String> segments = new ArrayList<>(idealState.getPartitionSet());
     if (startTimestamp == Long.MIN_VALUE && endTimestamp == Long.MAX_VALUE) {
-      return excludeReplacedSegments(tableNameWithType, new ArrayList<>(segments));
+      return shouldExcludeReplacedSegments ? excludeReplacedSegments(tableNameWithType, segments) : segments;
     } else {
       List<String> selectedSegments = new ArrayList<>();
       List<SegmentZKMetadata> segmentZKMetadataList = getSegmentsZKMetadata(tableNameWithType);
@@ -778,10 +810,19 @@ public List<String> getSegmentsForTableWithTimestamps(String tableNameWithType,
           selectedSegments.add(segmentName);
         }
       }
-      return excludeReplacedSegments(tableNameWithType, selectedSegments);
+      return shouldExcludeReplacedSegments ? excludeReplacedSegments(tableNameWithType, selectedSegments)
+          : selectedSegments;
     }
   }
 
+  /**
+   * Returns the segments for the given table from the property store. This API is useful to track the orphan segments
+   * that are removed from the ideal state but not the property store.
+   */
+  public List<String> getSegmentsFromPropertyStore(String tableNameWithType) {
+    return ZKMetadataProvider.getSegments(_propertyStore, tableNameWithType);
+  }
+
   /**
    * Given the list of segment names, exclude all the replaced segments which cannot be queried.
    * @param tableNameWithType table name with type
@@ -843,6 +884,24 @@ public List<SegmentZKMetadata> getSegmentsZKMetadata(String tableNameWithType) {
     return ZKMetadataProvider.getSegmentsZKMetadata(_propertyStore, tableNameWithType);
   }
 
+  public Collection<String> getLastLLCCompletedSegments(String tableNameWithType) {
+    Map<Integer, String> partitionIdToLastLLCCompletedSegmentMap = new HashMap<>();
+    for (SegmentZKMetadata segMetadata : getSegmentsZKMetadata(tableNameWithType)) {
+      if (SegmentName.isLowLevelConsumerSegmentName(segMetadata.getSegmentName())
+          && segMetadata.getStatus() == CommonConstants.Segment.Realtime.Status.DONE) {
+        LLCSegmentName llcName = LLCSegmentName.of(segMetadata.getSegmentName());
+        int partitionGroupId = llcName.getPartitionGroupId();
+        int sequenceNumber = llcName.getSequenceNumber();
+        String lastCompletedSegName = partitionIdToLastLLCCompletedSegmentMap.get(partitionGroupId);
+        if (lastCompletedSegName == null
+            || LLCSegmentName.of(lastCompletedSegName).getSequenceNumber() < sequenceNumber) {
+          partitionIdToLastLLCCompletedSegmentMap.put(partitionGroupId, segMetadata.getSegmentName());
+        }
+      }
+    }
+    return partitionIdToLastLLCCompletedSegmentMap.values();
+  }
+
   public synchronized PinotResourceManagerResponse deleteSegments(String tableNameWithType, List<String> segmentNames) {
     return deleteSegments(tableNameWithType, segmentNames, null);
   }
@@ -1166,7 +1225,7 @@ public Set<String> getAllServerTenantNames() {
     return tenantSet;
   }
 
-  private List<String> getTagsForInstance(String instanceName) {
+  public List<String> getTagsForInstance(String instanceName) {
     InstanceConfig config = _helixDataAccessor.getProperty(_keyBuilder.instanceConfig(instanceName));
     return config.getTags();
   }
@@ -1329,7 +1388,7 @@ public void updateSegmentsZKTimeInterval(String tableNameWithType, DateTimeField
     }
   }
 
-  public void updateSchema(Schema schema, boolean reload)
+  public void updateSchema(Schema schema, boolean reload, boolean forceTableSchemaUpdate)
       throws SchemaNotFoundException, SchemaBackwardIncompatibleException, TableNotFoundException {
     String schemaName = schema.getSchemaName();
     LOGGER.info("Updating schema: {} with reload: {}", schemaName, reload);
@@ -1339,7 +1398,7 @@ public void updateSchema(Schema schema, boolean reload)
       throw new SchemaNotFoundException(String.format("Schema: %s does not exist", schemaName));
     }
 
-    updateSchema(schema, oldSchema, false);
+    updateSchema(schema, oldSchema, forceTableSchemaUpdate);
 
     if (reload) {
       LOGGER.info("Reloading tables with name: {}", schemaName);
@@ -1354,7 +1413,7 @@ public void updateSchema(Schema schema, boolean reload)
    * Helper method to update the schema, or throw SchemaBackwardIncompatibleException when the new schema is not
    * backward-compatible with the existing schema.
    */
-  private void updateSchema(Schema schema, Schema oldSchema, boolean force)
+  private void updateSchema(Schema schema, Schema oldSchema, boolean forceTableSchemaUpdate)
       throws SchemaBackwardIncompatibleException {
     String schemaName = schema.getSchemaName();
     schema.updateBooleanFieldsIfNeeded(oldSchema);
@@ -1364,7 +1423,7 @@ private void updateSchema(Schema schema, Schema oldSchema, boolean force)
     }
     boolean isBackwardCompatible = schema.isBackwardCompatibleWith(oldSchema);
     if (!isBackwardCompatible) {
-      if (force) {
+      if (forceTableSchemaUpdate) {
         LOGGER.warn("Force updated schema: {} which is backward incompatible with the existing schema", oldSchema);
       } else {
         // TODO: Add the reason of the incompatibility
@@ -1381,20 +1440,29 @@ private void updateSchema(Schema schema, Schema oldSchema, boolean force)
    * @param schema The schema to be deleted.
    * @return True on success, false otherwise.
    */
+  @Deprecated
   public boolean deleteSchema(Schema schema) {
     if (schema != null) {
-      String schemaName = schema.getSchemaName();
-      LOGGER.info("Deleting schema: {}", schemaName);
-      String propertyStorePath = ZKMetadataProvider.constructPropertyStorePathForSchema(schemaName);
-      if (_propertyStore.exists(propertyStorePath, AccessOption.PERSISTENT)) {
-        _propertyStore.remove(propertyStorePath, AccessOption.PERSISTENT);
-        LOGGER.info("Deleted schema: {}", schemaName);
-        return true;
-      }
+      deleteSchema(schema.getSchemaName());
     }
     return false;
   }
 
+  /**
+   * Deletes the given schema. Returns {@code true} when schema exists, {@code false} when schema does not exist.
+   */
+  public boolean deleteSchema(String schemaName) {
+    LOGGER.info("Deleting schema: {}", schemaName);
+    String propertyStorePath = ZKMetadataProvider.constructPropertyStorePathForSchema(schemaName);
+    if (_propertyStore.exists(propertyStorePath, AccessOption.PERSISTENT)) {
+      _propertyStore.remove(propertyStorePath, AccessOption.PERSISTENT);
+      LOGGER.info("Deleted schema: {}", schemaName);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   @Nullable
   public Schema getSchema(String schemaName) {
     return ZKMetadataProvider.getSchema(_propertyStore, schemaName);
@@ -1469,6 +1537,12 @@ public void addTable(TableConfig tableConfig)
           + " already exists. If this is unexpected, try deleting the table to remove all metadata associated"
           + " with it.");
     }
+    if (_helixAdmin.getResourceExternalView(_helixClusterName, tableNameWithType) != null) {
+      throw new TableAlreadyExistsException("External view for " + tableNameWithType
+          + " still exists. If the table is just deleted, please wait for the clean up to finish before recreating it. "
+          + "If the external view is not removed after a long time, try restarting the servers showing up in the "
+          + "external view");
+    }
 
     validateTableTenantConfig(tableConfig);
     TableType tableType = tableConfig.getTableType();
@@ -1477,8 +1551,9 @@ public void addTable(TableConfig tableConfig)
       case OFFLINE:
         // now lets build an ideal state
         LOGGER.info("building empty ideal state for table : " + tableNameWithType);
-        final IdealState offlineIdealState = PinotTableIdealStateBuilder.buildEmptyIdealStateFor(tableNameWithType,
-            tableConfig.getReplication(), _enableBatchMessageMode);
+        IdealState offlineIdealState =
+            PinotTableIdealStateBuilder.buildEmptyIdealStateFor(tableNameWithType, tableConfig.getReplication(),
+                _enableBatchMessageMode);
         LOGGER.info("adding table via the admin");
 
         try {
@@ -1619,6 +1694,17 @@ void validateTableTenantConfig(TableConfig tableConfig) {
             "Failed to find instances with tag: " + tag + " for table: " + tableNameWithType);
       }
     }
+    // Check if serverTags as configured in tierConfigs are valid.
+    List<TierConfig> tierConfigList = tableConfig.getTierConfigsList();
+    if (CollectionUtils.isNotEmpty(tierConfigList)) {
+      for (TierConfig tierConfig : tierConfigList) {
+        if (getInstancesWithTag(tierConfig.getServerTag()).isEmpty()) {
+          throw new InvalidTableConfigException(
+              String.format("Failed to find instances with tag: %s as used by tier: %s for table: %s",
+                  tierConfig.getServerTag(), tierConfig.getName(), tableNameWithType));
+        }
+      }
+    }
   }
 
   public boolean setZKData(String path, ZNRecord record, int expectedVersion, int accessOption) {
@@ -1733,10 +1819,10 @@ private void assignInstances(TableConfig tableConfig, boolean override) {
       }
     }
 
+    InstanceAssignmentDriver instanceAssignmentDriver = new InstanceAssignmentDriver(tableConfig);
+    List<InstanceConfig> instanceConfigs = getAllHelixInstanceConfigs();
     if (!instancePartitionsTypesToAssign.isEmpty()) {
       LOGGER.info("Assigning {} instances to table: {}", instancePartitionsTypesToAssign, tableNameWithType);
-      InstanceAssignmentDriver instanceAssignmentDriver = new InstanceAssignmentDriver(tableConfig);
-      List<InstanceConfig> instanceConfigs = getAllHelixInstanceConfigs();
       for (InstancePartitionsType instancePartitionsType : instancePartitionsTypesToAssign) {
         boolean hasPreConfiguredInstancePartitions =
             TableConfigUtils.hasPreConfiguredInstancePartitions(tableConfig, instancePartitionsType);
@@ -1756,6 +1842,26 @@ private void assignInstances(TableConfig tableConfig, boolean override) {
         }
       }
     }
+
+    // Process and persist tier config instancePartitions
+    if (CollectionUtils.isNotEmpty(tableConfig.getTierConfigsList())
+        && tableConfig.getInstanceAssignmentConfigMap() != null) {
+      for (TierConfig tierConfig : tableConfig.getTierConfigsList()) {
+        if (tableConfig.getInstanceAssignmentConfigMap().containsKey(tierConfig.getName())) {
+          if (override || InstancePartitionsUtils.fetchInstancePartitions(_propertyStore,
+              InstancePartitionsUtils.getInstancePartitionsNameForTier(tableNameWithType, tierConfig.getName()))
+              == null) {
+            LOGGER.info("Calculating instance partitions for tier: {}, table : {}", tierConfig.getName(),
+                tableNameWithType);
+            InstancePartitions instancePartitions =
+                instanceAssignmentDriver.assignInstances(tierConfig.getName(), instanceConfigs, null,
+                    tableConfig.getInstanceAssignmentConfigMap().get(tierConfig.getName()));
+            LOGGER.info("Persisting instance partitions: {}", instancePartitions);
+            InstancePartitionsUtils.persistInstancePartitions(_propertyStore, instancePartitions);
+          }
+        }
+      }
+    }
   }
 
   public void updateUserConfig(UserConfig userConfig)
@@ -1908,6 +2014,10 @@ public void deleteOfflineTable(String tableName, @Nullable String retentionPerio
     InstancePartitionsUtils.removeInstancePartitions(_propertyStore, offlineTableName);
     LOGGER.info("Deleting table {}: Removed instance partitions", offlineTableName);
 
+    // Remove tier instance partitions
+    InstancePartitionsUtils.removeTierInstancePartitions(_propertyStore, offlineTableName);
+    LOGGER.info("Deleting table {}: Removed tier instance partitions", offlineTableName);
+
     // Remove segment lineage
     SegmentLineageAccessHelper.deleteSegmentLineage(_propertyStore, offlineTableName);
     LOGGER.info("Deleting table {}: Removed segment lineage", offlineTableName);
@@ -1967,6 +2077,9 @@ public void deleteRealtimeTable(String tableName, @Nullable String retentionPeri
         InstancePartitionsType.COMPLETED.getInstancePartitionsName(rawTableName));
     LOGGER.info("Deleting table {}: Removed instance partitions", realtimeTableName);
 
+    InstancePartitionsUtils.removeTierInstancePartitions(_propertyStore, rawTableName);
+    LOGGER.info("Deleting table {}: Removed tier instance partitions", realtimeTableName);
+
     // Remove segment lineage
     SegmentLineageAccessHelper.deleteSegmentLineage(_propertyStore, realtimeTableName);
     LOGGER.info("Deleting table {}: Removed segment lineage", realtimeTableName);
@@ -2041,13 +2154,14 @@ private Set<String> getAllInstancesForTable(String tableNameWithType) {
   }
 
   /**
-   * Returns the ZK metdata for the given jobId
+   * Returns the ZK metdata for the given jobId and jobType
    * @param jobId the id of the job
+   * @param jobType Job Path
    * @return Map representing the job's ZK properties
    */
   @Nullable
-  public Map<String, String> getControllerJobZKMetadata(String jobId) {
-    String controllerJobResourcePath = ZKMetadataProvider.constructPropertyStorePathForControllerJob();
+  public Map<String, String> getControllerJobZKMetadata(String jobId, ControllerJobType jobType) {
+    String controllerJobResourcePath = ZKMetadataProvider.constructPropertyStorePathForControllerJob(jobType);
     ZNRecord taskResourceZnRecord = _propertyStore.get(controllerJobResourcePath, null, AccessOption.PERSISTENT);
     if (taskResourceZnRecord != null) {
       return taskResourceZnRecord.getMapFields().get(jobId);
@@ -2061,21 +2175,27 @@ public Map<String, String> getControllerJobZKMetadata(String jobId) {
    * @return A Map of jobId to job properties
    */
   public Map<String, Map<String, String>> getAllJobsForTable(String tableNameWithType,
-      @Nullable Set<String> jobTypesToFilter) {
-    String jobsResourcePath = ZKMetadataProvider.constructPropertyStorePathForControllerJob();
-    try {
-      ZNRecord tableJobsRecord = _propertyStore.get(jobsResourcePath, null, -1);
-      Map<String, Map<String, String>> controllerJobs = tableJobsRecord.getMapFields();
-      return controllerJobs.entrySet().stream().filter(
-              job -> job.getValue().get(CommonConstants.ControllerJob.TABLE_NAME_WITH_TYPE).equals(tableNameWithType)
-                  && (jobTypesToFilter == null || jobTypesToFilter.contains(
-                      job.getValue().get(CommonConstants.ControllerJob.JOB_TYPE))))
-          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-    } catch (ZkNoNodeException e) {
-      LOGGER.warn("Could not find controller job node for table : {}", tableNameWithType, e);
+      Set<ControllerJobType> jobTypes) {
+    Map<String, Map<String, String>> controllerJobs = new HashMap<>();
+    for (ControllerJobType jobType : jobTypes) {
+      String jobsResourcePath = ZKMetadataProvider.constructPropertyStorePathForControllerJob(jobType);
+      try {
+        ZNRecord znRecord = _propertyStore.get(jobsResourcePath, null, -1);
+        if (znRecord != null) {
+          Map<String, Map<String, String>> tableJobsRecord = znRecord.getMapFields();
+          for (Map.Entry<String, Map<String, String>> tableEntry : tableJobsRecord.entrySet()) {
+            if (tableEntry.getValue().get(CommonConstants.ControllerJob.JOB_TYPE).equals(jobType.name())
+                && tableEntry.getValue().get(CommonConstants.ControllerJob.TABLE_NAME_WITH_TYPE)
+                .equals(tableNameWithType)) {
+              controllerJobs.put(tableEntry.getKey(), tableEntry.getValue());
+            }
+          }
+        }
+      } catch (ZkNoNodeException e) {
+        LOGGER.warn("Could not find controller job node for table : {} jobType: {}", tableNameWithType, jobType, e);
+      }
     }
-
-    return Collections.emptyMap();
+    return controllerJobs;
   }
 
   /**
@@ -2095,7 +2215,8 @@ public boolean addNewReloadSegmentJob(String tableNameWithType, String segmentNa
     jobMetadata.put(CommonConstants.ControllerJob.SUBMISSION_TIME_MS, Long.toString(System.currentTimeMillis()));
     jobMetadata.put(CommonConstants.ControllerJob.MESSAGE_COUNT, Integer.toString(numMessagesSent));
     jobMetadata.put(CommonConstants.ControllerJob.SEGMENT_RELOAD_JOB_SEGMENT_NAME, segmentName);
-    return addControllerJobToZK(jobId, jobMetadata);
+    return addControllerJobToZK(jobId, jobMetadata,
+        ZKMetadataProvider.constructPropertyStorePathForControllerJob(ControllerJobType.RELOAD_SEGMENT));
   }
 
   public boolean addNewForceCommitJob(String tableNameWithType, String jobId, Set<String> consumingSegmentsCommitted)
@@ -2108,7 +2229,8 @@ public boolean addNewForceCommitJob(String tableNameWithType, String jobId, Set<
     jobMetadata.put(CommonConstants.ControllerJob.CONSUMING_SEGMENTS_FORCE_COMMITTED_LIST,
         JsonUtils.objectToString(consumingSegmentsCommitted));
 
-    return addControllerJobToZK(jobId, jobMetadata);
+    return addControllerJobToZK(jobId, jobMetadata,
+        ZKMetadataProvider.constructPropertyStorePathForControllerJob(ControllerJobType.FORCE_COMMIT));
   }
 
   /**
@@ -2122,14 +2244,16 @@ public boolean addNewReloadAllSegmentsJob(String tableNameWithType, String jobId
     Map<String, String> jobMetadata = new HashMap<>();
     jobMetadata.put(CommonConstants.ControllerJob.JOB_ID, jobId);
     jobMetadata.put(CommonConstants.ControllerJob.TABLE_NAME_WITH_TYPE, tableNameWithType);
-    jobMetadata.put(CommonConstants.ControllerJob.JOB_TYPE, ControllerJobType.RELOAD_ALL_SEGMENTS.toString());
+    jobMetadata.put(CommonConstants.ControllerJob.JOB_TYPE, ControllerJobType.RELOAD_SEGMENT.toString());
     jobMetadata.put(CommonConstants.ControllerJob.SUBMISSION_TIME_MS, Long.toString(System.currentTimeMillis()));
     jobMetadata.put(CommonConstants.ControllerJob.MESSAGE_COUNT, Integer.toString(numberOfMessagesSent));
-    return addControllerJobToZK(jobId, jobMetadata);
+    return addControllerJobToZK(jobId, jobMetadata,
+        ZKMetadataProvider.constructPropertyStorePathForControllerJob(ControllerJobType.RELOAD_SEGMENT));
   }
 
-  private boolean addControllerJobToZK(String jobId, Map<String, String> jobMetadata) {
-    String jobResourcePath = ZKMetadataProvider.constructPropertyStorePathForControllerJob();
+  public boolean addControllerJobToZK(String jobId, Map<String, String> jobMetadata, String jobResourcePath) {
+    Preconditions.checkState(jobMetadata.get(CommonConstants.ControllerJob.SUBMISSION_TIME_MS) != null,
+        "Submission Time in JobMetadata record not set. Cannot expire these records");
     Stat stat = new Stat();
     ZNRecord tableJobsZnRecord = _propertyStore.get(jobResourcePath, stat, AccessOption.PERSISTENT);
     if (tableJobsZnRecord != null) {
@@ -2137,8 +2261,8 @@ private boolean addControllerJobToZK(String jobId, Map<String, String> jobMetada
       tasks.put(jobId, jobMetadata);
       if (tasks.size() > CommonConstants.ControllerJob.MAXIMUM_CONTROLLER_JOBS_IN_ZK) {
         tasks = tasks.entrySet().stream().sorted((v1, v2) -> Long.compare(
-                Long.parseLong(v2.getValue().get(CommonConstants.ControllerJob.SUBMISSION_TIME_MS)),
-                Long.parseLong(v1.getValue().get(CommonConstants.ControllerJob.SUBMISSION_TIME_MS))))
+            Long.parseLong(v2.getValue().get(CommonConstants.ControllerJob.SUBMISSION_TIME_MS)),
+            Long.parseLong(v1.getValue().get(CommonConstants.ControllerJob.SUBMISSION_TIME_MS))))
             .collect(Collectors.toList()).subList(0, CommonConstants.ControllerJob.MAXIMUM_CONTROLLER_JOBS_IN_ZK)
             .stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
       }
@@ -2177,10 +2301,32 @@ public void assignTableSegment(String tableNameWithType, String segmentName) {
     try {
       TableConfig tableConfig = getTableConfig(tableNameWithType);
       Preconditions.checkState(tableConfig != null, "Failed to find table config for table: " + tableNameWithType);
+
       Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap =
           fetchOrComputeInstancePartitions(tableNameWithType, tableConfig);
+
+      // Initialize tier information only in case direct tier assignment is configured
+      if (_enableTieredSegmentAssignment && CollectionUtils.isNotEmpty(tableConfig.getTierConfigsList())) {
+        List<Tier> sortedTiers = TierConfigUtils.getSortedTiersForStorageType(tableConfig.getTierConfigsList(),
+            TierFactory.PINOT_SERVER_STORAGE_TYPE, _helixZkManager);
+
+        // Update segment tier to support direct assignment for multiple data directories
+        updateSegmentTargetTier(tableNameWithType, segmentName, sortedTiers);
+
+        InstancePartitions tierInstancePartitions =
+            TierConfigUtils.getTieredInstancePartitionsForSegment(tableNameWithType, segmentName, sortedTiers,
+                _helixZkManager);
+        if (tierInstancePartitions != null && TableNameBuilder.isOfflineTableResource(tableNameWithType)) {
+          // Override instance partitions for offline table
+          LOGGER.info("Overriding with tiered instance partitions: {} for segment: {} of table: {}",
+              tierInstancePartitions, segmentName, tableNameWithType);
+          instancePartitionsMap = Collections.singletonMap(InstancePartitionsType.OFFLINE, tierInstancePartitions);
+        }
+      }
+
       SegmentAssignment segmentAssignment = SegmentAssignmentFactory.getSegmentAssignment(_helixZkManager, tableConfig);
       synchronized (getTableUpdaterLock(tableNameWithType)) {
+        Map<InstancePartitionsType, InstancePartitions> finalInstancePartitionsMap = instancePartitionsMap;
         HelixHelper.updateIdealState(_helixZkManager, tableNameWithType, idealState -> {
           assert idealState != null;
           Map<String, Map<String, String>> currentAssignment = idealState.getRecord().getMapFields();
@@ -2189,7 +2335,8 @@ public void assignTableSegment(String tableNameWithType, String segmentName) {
                 tableNameWithType);
           } else {
             List<String> assignedInstances =
-                segmentAssignment.assignSegment(segmentName, currentAssignment, instancePartitionsMap);
+                segmentAssignment.assignSegment(segmentName, currentAssignment,
+                    finalInstancePartitionsMap);
             LOGGER.info("Assigning segment: {} to instances: {} for table: {}", segmentName, assignedInstances,
                 tableNameWithType);
             currentAssignment.put(segmentName,
@@ -2410,8 +2557,7 @@ public Pair<Integer, String> reloadSegment(String tableNameWithType, String segm
   /**
    * Resets a segment. This operation invoke resetPartition via state transition message.
    */
-  public void resetSegment(String tableNameWithType, String segmentName, @Nullable String targetInstance)
-      throws InterruptedException, TimeoutException {
+  public void resetSegment(String tableNameWithType, String segmentName, @Nullable String targetInstance) {
     IdealState idealState = getTableIdealState(tableNameWithType);
     Preconditions.checkState(idealState != null, "Could not find ideal state for table: %s", tableNameWithType);
     ExternalView externalView = getTableExternalView(tableNameWithType);
@@ -2421,7 +2567,7 @@ public void resetSegment(String tableNameWithType, String segmentName, @Nullable
 
     for (String instance : instanceSet) {
       if (externalViewStateMap == null || SegmentStateModel.OFFLINE.equals(externalViewStateMap.get(instance))) {
-        LOGGER.info("Skipping reset for segment: {} of table: {} on instance: {}", segmentName, tableNameWithType,
+        LOGGER.info("Skipping resetting for segment: {} of table: {} on instance: {}", segmentName, tableNameWithType,
             instance);
       } else {
         LOGGER.info("Resetting segment: {} of table: {} on instance: {}", segmentName, tableNameWithType, instance);
@@ -2431,10 +2577,10 @@ public void resetSegment(String tableNameWithType, String segmentName, @Nullable
   }
 
   /**
-   * Resets all segments of a table. This operation invoke resetPartition via state transition message.
+   * Resets all segments or segments with Error state of a table. This operation invoke resetPartition via state
+   * transition message.
    */
-  public void resetAllSegments(String tableNameWithType, @Nullable String targetInstance)
-      throws InterruptedException, TimeoutException {
+  public void resetSegments(String tableNameWithType, @Nullable String targetInstance, boolean errorSegmentsOnly) {
     IdealState idealState = getTableIdealState(tableNameWithType);
     Preconditions.checkState(idealState != null, "Could not find ideal state for table: %s", tableNameWithType);
     ExternalView externalView = getTableExternalView(tableNameWithType);
@@ -2447,15 +2593,26 @@ public void resetAllSegments(String tableNameWithType, @Nullable String targetIn
       Set<String> instanceSet = parseInstanceSet(idealState, segmentName, targetInstance);
       Map<String, String> externalViewStateMap = externalView.getStateMap(segmentName);
       for (String instance : instanceSet) {
-        if (externalViewStateMap == null || SegmentStateModel.OFFLINE.equals(externalViewStateMap.get(instance))) {
-          instanceToSkippedSegmentsMap.computeIfAbsent(instance, i -> new HashSet<>()).add(segmentName);
+        if (errorSegmentsOnly) {
+          if (externalViewStateMap != null && SegmentStateModel.ERROR.equals(externalViewStateMap.get(instance))) {
+            instanceToResetSegmentsMap.computeIfAbsent(instance, i -> new HashSet<>()).add(segmentName);
+          }
         } else {
-          instanceToResetSegmentsMap.computeIfAbsent(instance, i -> new HashSet<>()).add(segmentName);
+          if (externalViewStateMap == null || SegmentStateModel.OFFLINE.equals(externalViewStateMap.get(instance))) {
+            instanceToSkippedSegmentsMap.computeIfAbsent(instance, i -> new HashSet<>()).add(segmentName);
+          } else {
+            instanceToResetSegmentsMap.computeIfAbsent(instance, i -> new HashSet<>()).add(segmentName);
+          }
         }
       }
     }
 
-    LOGGER.info("Resetting all segments of table: {}", tableNameWithType);
+    if (instanceToResetSegmentsMap.isEmpty()) {
+      LOGGER.info("No segments to reset for table: {}", tableNameWithType);
+      return;
+    }
+
+    LOGGER.info("Resetting segments: {} of table: {}", instanceToResetSegmentsMap, tableNameWithType);
     for (Map.Entry<String, Set<String>> entry : instanceToResetSegmentsMap.entrySet()) {
       resetPartitionAllState(entry.getKey(), tableNameWithType, entry.getValue());
     }
@@ -2866,6 +3023,15 @@ public TableConfig getTableConfig(String tableNameWithType) {
     return ZKMetadataProvider.getTableConfig(_propertyStore, tableNameWithType);
   }
 
+  /**
+   * Get all table configs.
+   *
+   * @return List of table configs. Empty list in case of tables configs does not exist.
+   */
+  public List<TableConfig> getAllTableConfigs() {
+    return ZKMetadataProvider.getAllTableConfigs(_propertyStore);
+  }
+
   /**
    * Get the offline table config for the given table name.
    *
@@ -2966,20 +3132,9 @@ public PinotResourceManagerResponse disableInstance(String instanceName) {
    * </ul>
    */
   public PinotResourceManagerResponse dropInstance(String instanceName) {
-    // Check if the instance is live
-    if (_helixDataAccessor.getProperty(_keyBuilder.liveInstance(instanceName)) != null) {
-      return PinotResourceManagerResponse.failure("Instance " + instanceName + " is still live");
-    }
-
-    // Check if any ideal state includes the instance
-    for (String resource : getAllResources()) {
-      IdealState idealState = _helixAdmin.getResourceIdealState(_helixClusterName, resource);
-      for (String partition : idealState.getPartitionSet()) {
-        if (idealState.getInstanceSet(partition).contains(instanceName)) {
-          return PinotResourceManagerResponse.failure(
-              "Instance " + instanceName + " exists in ideal state for " + resource);
-        }
-      }
+    OperationValidationResponse check = instanceDropSafetyCheck(instanceName);
+    if (!check.isSafe()) {
+      return PinotResourceManagerResponse.failure(check.getIssueMessage(0));
     }
 
     // Remove '/INSTANCES/<instanceName>'
@@ -3001,6 +3156,31 @@ public PinotResourceManagerResponse dropInstance(String instanceName) {
     return PinotResourceManagerResponse.success("Instance " + instanceName + " dropped");
   }
 
+  /**
+   * Utility to perform a safety check of the operation to drop an instance.
+   * If the resource is not safe to drop the utility lists all the possible reasons.
+   * @param instanceName Pinot instance name
+   * @return {@link OperationValidationResponse}
+   */
+  public OperationValidationResponse instanceDropSafetyCheck(String instanceName) {
+    OperationValidationResponse response = new OperationValidationResponse().setInstanceName(instanceName);
+    // Check if the instance is live
+    if (_helixDataAccessor.getProperty(_keyBuilder.liveInstance(instanceName)) != null) {
+      response.putIssue(OperationValidationResponse.ErrorCode.IS_ALIVE, instanceName);
+    }
+    // Check if any ideal state includes the instance
+    getAllResources().forEach(resource -> {
+      IdealState idealState = _helixAdmin.getResourceIdealState(_helixClusterName, resource);
+      for (String partition : idealState.getPartitionSet()) {
+        if (idealState.getInstanceSet(partition).contains(instanceName)) {
+          response.putIssue(OperationValidationResponse.ErrorCode.CONTAINS_RESOURCE, instanceName, resource);
+          break;
+        }
+      }
+    });
+    return response.setSafe(response.getIssues().isEmpty());
+  }
+
   /**
    * Toggle the status of an Instance between OFFLINE and ONLINE.
    * Keeps checking until ideal-state is successfully updated or times out.
@@ -3085,13 +3265,85 @@ private PinotResourceManagerResponse enableInstance(String instanceName, boolean
         "Instance: " + instanceName + (enableInstance ? " enable" : " disable") + " failed, timeout");
   }
 
-  public RebalanceResult rebalanceTable(String tableNameWithType, Configuration rebalanceConfig)
+  /**
+   * Entry point for table Rebalacing.
+   * @param tableNameWithType
+   * @param rebalanceConfig
+   * @param trackRebalanceProgress - Do we want to track rebalance progress stats
+   * @return RebalanceResult
+   * @throws TableNotFoundException
+   */
+  public RebalanceResult rebalanceTable(String tableNameWithType, Configuration rebalanceConfig,
+      boolean trackRebalanceProgress)
       throws TableNotFoundException {
     TableConfig tableConfig = getTableConfig(tableNameWithType);
     if (tableConfig == null) {
       throw new TableNotFoundException("Failed to find table config for table: " + tableNameWithType);
     }
-    return new TableRebalancer(_helixZkManager).rebalance(tableConfig, rebalanceConfig);
+    String rebalanceJobId = rebalanceConfig.getString(RebalanceConfigConstants.JOB_ID);
+    Preconditions.checkState(rebalanceJobId != null, "RebalanceId not populated in the rebalanceConfig ");
+    if (rebalanceConfig.getBoolean(RebalanceConfigConstants.UPDATE_TARGET_TIER,
+        RebalanceConfigConstants.DEFAULT_UPDATE_TARGET_TIER)) {
+      updateTargetTier(rebalanceJobId, tableNameWithType, tableConfig);
+    }
+    ZkBasedTableRebalanceObserver zkBasedTableRebalanceObserver = null;
+    if (trackRebalanceProgress) {
+      zkBasedTableRebalanceObserver = new ZkBasedTableRebalanceObserver(tableNameWithType, rebalanceJobId, this);
+    }
+    TableRebalancer tableRebalancer = new TableRebalancer(_helixZkManager, zkBasedTableRebalanceObserver);
+    return tableRebalancer.rebalance(tableConfig, rebalanceConfig);
+  }
+
+  /**
+   * Calculate the target tier the segment belongs to and set it in segment ZK metadata as goal state, which can be
+   * checked by servers when loading the segment to put it onto the target storage tier.
+   */
+  @VisibleForTesting
+  void updateTargetTier(String rebalanceJobId, String tableNameWithType, TableConfig tableConfig) {
+    List<TierConfig> tierCfgs = tableConfig.getTierConfigsList();
+    List<Tier> sortedTiers = tierCfgs == null ? Collections.emptyList()
+        : TierConfigUtils.getSortedTiers(tierCfgs, _helixZkManager);
+    LOGGER.info("For rebalanceId: {}, updating target tiers for segments of table: {} with tierConfigs: {}",
+        rebalanceJobId, tableNameWithType, sortedTiers);
+    for (String segmentName : getSegmentsFor(tableNameWithType, true)) {
+      updateSegmentTargetTier(tableNameWithType, segmentName, sortedTiers);
+    }
+  }
+
+  private void updateSegmentTargetTier(String tableNameWithType, String segmentName, List<Tier> sortedTiers) {
+    ZNRecord segmentMetadataZNRecord = getSegmentMetadataZnRecord(tableNameWithType, segmentName);
+    if (segmentMetadataZNRecord == null) {
+      LOGGER.debug("No ZK metadata for segment: {} of table: {}", segmentName, tableNameWithType);
+      return;
+    }
+    Tier targetTier = null;
+    for (Tier tier : sortedTiers) {
+      TierSegmentSelector tierSegmentSelector = tier.getSegmentSelector();
+      if (tierSegmentSelector.selectSegment(tableNameWithType, segmentName)) {
+        targetTier = tier;
+        break;
+      }
+    }
+    SegmentZKMetadata segmentZKMetadata = new SegmentZKMetadata(segmentMetadataZNRecord);
+    String targetTierName = null;
+    if (targetTier == null) {
+      if (segmentZKMetadata.getTier() == null) {
+        LOGGER.debug("Segment: {} of table: {} is already set to go to default tier", segmentName, tableNameWithType);
+        return;
+      }
+      LOGGER.info("Segment: {} of table: {} is put back on default tier", segmentName, tableNameWithType);
+    } else {
+      targetTierName = targetTier.getName();
+      if (targetTierName.equals(segmentZKMetadata.getTier())) {
+        LOGGER.debug("Segment: {} of table: {} is already set to go to target tier: {}", segmentName, tableNameWithType,
+            targetTierName);
+        return;
+      }
+      LOGGER.info("Segment: {} of table: {} is put onto new tier: {}", segmentName, tableNameWithType, targetTierName);
+    }
+    // Update the tier in segment ZK metadata and write it back to ZK.
+    segmentZKMetadata.setTier(targetTierName);
+    updateZkMetadata(tableNameWithType, segmentZKMetadata, segmentMetadataZNRecord.getVersion());
   }
 
   /**
@@ -3225,52 +3477,59 @@ public List<String> getExistingTableNamesWithType(String tableName, @Nullable Ta
    * @param segmentsFrom a list of segments to be merged
    * @param segmentsTo a list of merged segments
    * @param forceCleanup True for enabling the force segment cleanup
+   * @param customMap
    * @return Segment lineage entry id
    *
    * @throws InvalidConfigException
    */
   public String startReplaceSegments(String tableNameWithType, List<String> segmentsFrom, List<String> segmentsTo,
-      boolean forceCleanup) {
+      boolean forceCleanup, Map<String, String> customMap) {
     // Create a segment lineage entry id
     String segmentLineageEntryId = SegmentLineageUtils.generateLineageEntryId();
 
     // Check that all the segments from 'segmentsFrom' exist in the table
     Set<String> segmentsForTable = new HashSet<>(getSegmentsFor(tableNameWithType, true));
-    Preconditions.checkArgument(segmentsForTable.containsAll(segmentsFrom), String.format(
-        "Not all segments from 'segmentsFrom' are available in the table. (tableName = '%s', segmentsFrom = '%s', "
-            + "segmentsTo = '%s', segmentsFromTable = '%s')", tableNameWithType, segmentsFrom, segmentsTo,
-        segmentsForTable));
+    for (String segment : segmentsFrom) {
+      Preconditions.checkState(segmentsForTable.contains(segment),
+          "Segment: %s from 'segmentsFrom' does not exist in table: %s", segment, tableNameWithType);
+    }
 
-    // Check that all the segments from 'segmentTo' does not exist in the table.
-    Preconditions.checkArgument(Collections.disjoint(segmentsForTable, segmentsTo), String.format(
-        "Any segments from 'segmentsTo' should not be available in the table at this point. (tableName = '%s', "
-            + "segmentsFrom = '%s', segmentsTo = '%s', segmentsFromTable = '%s')", tableNameWithType, segmentsFrom,
-        segmentsTo, segmentsForTable));
+    // Check that all the segments from 'segmentTo' does not exist in the table
+    for (String segment : segmentsTo) {
+      Preconditions.checkState(!segmentsForTable.contains(segment), "Segment: %s from 'segmentsTo' exists in table: %s",
+          segment, tableNameWithType);
+    }
 
     try {
       DEFAULT_RETRY_POLICY.attempt(() -> {
         // Fetch table config
         TableConfig tableConfig = ZKMetadataProvider.getTableConfig(_propertyStore, tableNameWithType);
-        Preconditions.checkNotNull(tableConfig, "Table config is not available for table '%s'", tableNameWithType);
+        Preconditions.checkState(tableConfig != null, "Failed to find table config for table: %s", tableNameWithType);
 
         // Fetch the segment lineage metadata
         ZNRecord segmentLineageZNRecord =
             SegmentLineageAccessHelper.getSegmentLineageZNRecord(_propertyStore, tableNameWithType);
         SegmentLineage segmentLineage;
-        int expectedVersion = -1;
+        int expectedVersion;
         if (segmentLineageZNRecord == null) {
           segmentLineage = new SegmentLineage(tableNameWithType);
+          expectedVersion = -1;
         } else {
           segmentLineage = SegmentLineage.fromZNRecord(segmentLineageZNRecord);
           expectedVersion = segmentLineageZNRecord.getVersion();
         }
-        // Check that the segment lineage entry id doesn't exists in the segment lineage
-        Preconditions.checkArgument(segmentLineage.getLineageEntry(segmentLineageEntryId) == null,
-            String.format("SegmentLineageEntryId (%s) already exists in the segment lineage.", segmentLineageEntryId));
+        // Check that the segment lineage entry id doesn't exist in the segment lineage
+        Preconditions.checkState(segmentLineage.getLineageEntry(segmentLineageEntryId) == null,
+            "Entry id: %s already exists in the segment lineage for table: %s", segmentLineageEntryId,
+            tableNameWithType);
 
         List<String> segmentsToCleanUp = new ArrayList<>();
-        for (String entryId : segmentLineage.getLineageEntryIds()) {
-          LineageEntry lineageEntry = segmentLineage.getLineageEntry(entryId);
+        Iterator<Map.Entry<String, LineageEntry>> entryIterator =
+            segmentLineage.getLineageEntries().entrySet().iterator();
+        while (entryIterator.hasNext()) {
+          Map.Entry<String, LineageEntry> entry = entryIterator.next();
+          String entryId = entry.getKey();
+          LineageEntry lineageEntry = entry.getValue();
 
           // If the lineage entry is in 'REVERTED' state, no need to go through the validation because we can regard
           // the entry as not existing.
@@ -3301,14 +3560,30 @@ public String startReplaceSegments(String tableNameWithType, List<String> segmen
                   lineageEntry.getSegmentsFrom(), lineageEntry.getSegmentsTo());
 
               // Delete the 'IN_PROGRESS' entry or update it to 'REVERTED'
-              List<String> segmentsToForRevertedEntry =
-                  deleteOrUpdateSegmentLineageEntryToReverted(tableNameWithType, segmentLineage, entryId, lineageEntry,
-                      segmentsTo);
+              // Delete or update segmentsTo of the entry to revert to handle the case of rerunning the protocol:
+              // Initial state:
+              //   Entry1: { segmentsFrom: [s1, s2], segmentsTo: [s3, s4], status: IN_PROGRESS}
+              // 1. Rerunning the protocol with s4 and s5, s4 should not be deleted to avoid race conditions of
+              // concurrent data pushes and deletions:
+              //   Entry1: { segmentsFrom: [s1, s2], segmentsTo: [s3], status: REVERTED}
+              //   Entry2: { segmentsFrom: [s1, s2], segmentsTo: [s4, s5], status: IN_PROGRESS}
+              // 2. Rerunning the protocol with s3 and s4, we can simply remove the 'IN_PROGRESS' entry:
+              //   Entry2: { segmentsFrom: [s1, s2], segmentsTo: [s3, s4], status: IN_PROGRESS}
+              List<String> segmentsToForEntryToRevert = new ArrayList<>(lineageEntry.getSegmentsTo());
+              segmentsToForEntryToRevert.removeAll(segmentsTo);
+              if (segmentsToForEntryToRevert.isEmpty()) {
+                // Delete 'IN_PROGRESS' entry if the segmentsTo is empty
+                entryIterator.remove();
+              } else {
+                // Update the lineage entry to 'REVERTED'
+                entry.setValue(new LineageEntry(lineageEntry.getSegmentsFrom(), segmentsToForEntryToRevert,
+                    LineageEntryState.REVERTED, System.currentTimeMillis()));
+              }
 
               // Add segments for proactive clean-up.
-              segmentsToCleanUp.addAll(segmentsToForRevertedEntry);
+              segmentsToCleanUp.addAll(segmentsToForEntryToRevert);
             } else if (lineageEntry.getState() == LineageEntryState.COMPLETED
-                && IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig).equalsIgnoreCase("REFRESH")
+                && "REFRESH".equalsIgnoreCase(IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig))
                 && CollectionUtils.isEqualCollection(segmentsFrom, lineageEntry.getSegmentsTo())) {
               // This part of code assumes that we only allow at most 2 data snapshots at a time by proactively
               // deleting the older snapshots (for REFRESH tables).
@@ -3330,16 +3605,27 @@ public String startReplaceSegments(String tableNameWithType, List<String> segmen
             }
           } else {
             // Check that any segment from 'segmentsFrom' does not appear twice.
-            Preconditions.checkArgument(Collections.disjoint(lineageEntry.getSegmentsFrom(), segmentsFrom),
-                String.format("It is not allowed to replace segments that are already replaced. (tableName = %s, "
-                        + "segmentsFrom from the existing lineage entry = %s, requested segmentsFrom = %s)",
-                    tableNameWithType, lineageEntry.getSegmentsFrom(), segmentsFrom));
-
-            // Check that any segment from 'segmentTo' does not appear twice.
-            Preconditions.checkArgument(Collections.disjoint(lineageEntry.getSegmentsTo(), segmentsTo), String.format(
-                "It is not allowed to have the same segment name for segments in 'segmentsTo'. (tableName = %s, "
-                    + "segmentsTo from the existing lineage entry = %s, requested segmentsTo = %s)", tableNameWithType,
-                lineageEntry.getSegmentsTo(), segmentsTo));
+            if (!segmentsFrom.isEmpty()) {
+              Set<String> segmentsFromInLineageEntry = new HashSet<>(lineageEntry.getSegmentsFrom());
+              if (!segmentsFromInLineageEntry.isEmpty()) {
+                for (String segment : segmentsFrom) {
+                  Preconditions.checkState(!segmentsFromInLineageEntry.contains(segment),
+                      "Segment: %s from 'segmentsFrom' exists in table: %s, entry id: %s as 'segmentsFrom'"
+                          + " (replacing a replaced segment)", segment, tableNameWithType, entryId);
+                }
+              }
+            }
+
+            if (!segmentsTo.isEmpty()) {
+              Set<String> segmentsToInLineageEntry = new HashSet<>(lineageEntry.getSegmentsTo());
+              if (!segmentsToInLineageEntry.isEmpty()) {
+                for (String segment : segmentsTo) {
+                  Preconditions.checkState(!segmentsToInLineageEntry.contains(segment),
+                      "Segment: %s from 'segmentsTo' exists in table: %s, entry id: %s as 'segmentTo'"
+                          + " (name conflict)", segment, tableNameWithType, entryId);
+                }
+              }
+            }
           }
         }
 
@@ -3347,6 +3633,8 @@ public String startReplaceSegments(String tableNameWithType, List<String> segmen
         segmentLineage.addLineageEntry(segmentLineageEntryId,
             new LineageEntry(segmentsFrom, segmentsTo, LineageEntryState.IN_PROGRESS, System.currentTimeMillis()));
 
+        _lineageManager
+            .updateLineageForStartReplaceSegments(tableConfig, segmentLineageEntryId, customMap, segmentLineage);
         // Write back to the lineage entry to the property store
         if (SegmentLineageAccessHelper.writeSegmentLineage(_propertyStore, segmentLineage, expectedVersion)) {
           // Trigger the proactive segment clean up if needed. Once the lineage is updated in the property store, it
@@ -3357,6 +3645,7 @@ public String startReplaceSegments(String tableNameWithType, List<String> segmen
           }
           return true;
         } else {
+          LOGGER.warn("Failed to write segment lineage for table: {}", tableNameWithType);
           return false;
         }
       });
@@ -3382,29 +3671,22 @@ public String startReplaceSegments(String tableNameWithType, List<String> segmen
    *
    * Update is done with retry logic along with read-modify-write block for achieving atomic update of the lineage
    * metadata.
-   *
    * @param tableNameWithType
    * @param segmentLineageEntryId
+   * @param endReplaceSegmentsRequest
    */
-  public void endReplaceSegments(String tableNameWithType, String segmentLineageEntryId) {
+  public void endReplaceSegments(String tableNameWithType, String segmentLineageEntryId,
+      @Nullable EndReplaceSegmentsRequest endReplaceSegmentsRequest) {
     try {
       DEFAULT_RETRY_POLICY.attempt(() -> {
-        // Fetch the segment lineage metadata
-        ZNRecord segmentLineageZNRecord =
-            SegmentLineageAccessHelper.getSegmentLineageZNRecord(_propertyStore, tableNameWithType);
-        SegmentLineage segmentLineage;
-        int expectedVersion = -1;
-        Preconditions.checkArgument(segmentLineageZNRecord != null,
-            String.format("Segment lineage does not exist. (tableNameWithType = '%s', segmentLineageEntryId = '%s')",
-                tableNameWithType, segmentLineageEntryId));
-        segmentLineage = SegmentLineage.fromZNRecord(segmentLineageZNRecord);
-        expectedVersion = segmentLineageZNRecord.getVersion();
+        // Fetch the segment lineage and look up the lineage entry based on the entry id.
+        SegmentLineage segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, tableNameWithType);
+        Preconditions.checkState(segmentLineage != null, "Failed to find segment lineage for table: %s",
+            tableNameWithType);
 
-        // Look up the lineage entry based on the segment lineage entry id
         LineageEntry lineageEntry = segmentLineage.getLineageEntry(segmentLineageEntryId);
-        Preconditions.checkArgument(lineageEntry != null,
-            String.format("Invalid segment lineage entry id (tableName='%s', segmentLineageEntryId='%s')",
-                tableNameWithType, segmentLineageEntryId));
+        Preconditions.checkState(lineageEntry != null, "Failed to find entry id: %s from segment lineage for table: %s",
+            segmentLineageEntryId, tableNameWithType);
 
         // NO-OPS if the entry is already 'COMPLETED', reject if the entry is 'REVERTED'
         if (lineageEntry.getState() == LineageEntryState.COMPLETED) {
@@ -3420,36 +3702,47 @@ public void endReplaceSegments(String tableNameWithType, String segmentLineageEn
           throw new RuntimeException(errorMsg);
         }
 
-        // Check that all the segments from 'segmentsTo' exist in the table
         Set<String> segmentsForTable = new HashSet<>(getSegmentsFor(tableNameWithType, false));
-        Preconditions.checkArgument(segmentsForTable.containsAll(lineageEntry.getSegmentsTo()), String.format(
-            "Not all segments from 'segmentsTo' are available in the table. (tableName = '%s', segmentsTo = '%s', "
-                + "segmentsFromTable = '%s')", tableNameWithType, lineageEntry.getSegmentsTo(), segmentsForTable));
+        List<String> segmentsTo = lineageEntry.getSegmentsTo();
+        if (endReplaceSegmentsRequest != null && !endReplaceSegmentsRequest.getSegmentsTo().isEmpty()) {
+          Set<String> segmentsToInSet = new HashSet<>(segmentsTo);
+          // Check that the segments generated is a subset of the original segmentsTo list.
+          for (String segment : endReplaceSegmentsRequest.getSegmentsTo()) {
+            Preconditions.checkState(segmentsToInSet.contains(segment),
+                "Segment: %s from EndReplaceSegmentsRequest does not exist in original segmentsTo list "
+                    + "used while starting segment replacement: %s", segment, tableNameWithType);
+          }
+          segmentsTo = endReplaceSegmentsRequest.getSegmentsTo();
+        }
+
+        // Check that all the segments from 'segmentsTo' exist in the table
+        for (String segment : segmentsTo) {
+          Preconditions.checkState(segmentsForTable.contains(segment),
+              "Segment: %s from 'segmentsTo' does not exist in table: %s", segment, tableNameWithType);
+        }
 
         // Check that all the segments from 'segmentsTo' become ONLINE in the external view
-        try {
-          waitForSegmentsBecomeOnline(tableNameWithType, new HashSet<>(lineageEntry.getSegmentsTo()));
-        } catch (TimeoutException e) {
-          LOGGER.warn(String.format(
-              "Time out while waiting segments become ONLINE. (tableNameWithType = %s, segmentsToCheck = %s)",
-              tableNameWithType, lineageEntry.getSegmentsTo()), e);
+        if (!waitForSegmentsBecomeOnline(tableNameWithType, segmentsTo)) {
           return false;
         }
 
         // Update lineage entry
-        LineageEntry newLineageEntry =
-            new LineageEntry(lineageEntry.getSegmentsFrom(), lineageEntry.getSegmentsTo(), LineageEntryState.COMPLETED,
+        LineageEntry lineageEntryToUpdate =
+            new LineageEntry(lineageEntry.getSegmentsFrom(), segmentsTo, LineageEntryState.COMPLETED,
                 System.currentTimeMillis());
-        segmentLineage.updateLineageEntry(segmentLineageEntryId, newLineageEntry);
 
-        // Write back to the lineage entry
-        if (SegmentLineageAccessHelper.writeSegmentLineage(_propertyStore, segmentLineage, expectedVersion)) {
+        TableConfig tableConfig = ZKMetadataProvider.getTableConfig(_propertyStore, tableNameWithType);
+        Map<String, String> customMap =
+            endReplaceSegmentsRequest == null ? null : endReplaceSegmentsRequest.getCustomMap();
+        if (writeLineageEntryWithTightLoop(tableConfig, segmentLineageEntryId, lineageEntryToUpdate, lineageEntry,
+            _propertyStore, LineageUpdateType.END, customMap)) {
           // If the segment lineage metadata is successfully updated, we need to trigger brokers to rebuild the
           // routing table because it is possible that there has been no EV change but the routing result may be
           // different after updating the lineage entry.
           sendRoutingTableRebuildMessage(tableNameWithType);
           return true;
         } else {
+          LOGGER.warn("Failed to write segment lineage for table: {}", tableNameWithType);
           return false;
         }
       });
@@ -3482,74 +3775,92 @@ public SegmentLineage listSegmentLineage(String tableNameWithType) {
    *
    * Update is done with retry logic along with read-modify-write block for achieving atomic update of the lineage
    * metadata.
-   *
    * @param tableNameWithType
    * @param segmentLineageEntryId
+   * @param revertReplaceSegmentsRequest
    */
-  public void revertReplaceSegments(String tableNameWithType, String segmentLineageEntryId, boolean forceRevert) {
+  public void revertReplaceSegments(String tableNameWithType, String segmentLineageEntryId, boolean forceRevert,
+      @Nullable RevertReplaceSegmentsRequest revertReplaceSegmentsRequest) {
     try {
       DEFAULT_RETRY_POLICY.attempt(() -> {
         // Fetch the segment lineage metadata
         ZNRecord segmentLineageZNRecord =
             SegmentLineageAccessHelper.getSegmentLineageZNRecord(_propertyStore, tableNameWithType);
-        Preconditions.checkArgument(segmentLineageZNRecord != null,
-            String.format("Segment lineage does not exist. (tableNameWithType = '%s', segmentLineageEntryId = '%s')",
-                tableNameWithType, segmentLineageEntryId));
+        Preconditions.checkState(segmentLineageZNRecord != null, "Failed to find segment lineage for table: %s",
+            tableNameWithType);
         SegmentLineage segmentLineage = SegmentLineage.fromZNRecord(segmentLineageZNRecord);
         int expectedVersion = segmentLineageZNRecord.getVersion();
 
         // Look up the lineage entry based on the segment lineage entry id
         LineageEntry lineageEntry = segmentLineage.getLineageEntry(segmentLineageEntryId);
-        Preconditions.checkArgument(lineageEntry != null,
-            String.format("Invalid segment lineage entry id (tableName='%s', segmentLineageEntryId='%s')",
-                tableNameWithType, segmentLineageEntryId));
-
-        // We do not allow to revert the lineage entry with 'REVERTED' state. For 'IN_PROGRESS", we only allow to
-        // revert when 'forceRevert' is set to true.
-        if (lineageEntry.getState() == LineageEntryState.REVERTED || (
-            lineageEntry.getState() == LineageEntryState.IN_PROGRESS && !forceRevert)) {
-          String errorMsg = String.format(
-              "Lineage state is not valid. Cannot update the lineage entry to be 'REVERTED'. (tableNameWithType=%s, "
-                  + "segmentLineageEntryId=%s, segmentLineageEntryState=%s, forceRevert=%s)", tableNameWithType,
-              segmentLineageEntryId, lineageEntry.getState(), forceRevert);
-          throw new RuntimeException(errorMsg);
+        Preconditions.checkState(lineageEntry != null, "Failed to find entry id: %s from segment lineage for table: %s",
+            segmentLineageEntryId, tableNameWithType);
+
+        // Do not allow reverting 'REVERTED' lineage entry. Allow reverting 'IN_PROGRESS' lineage entry only when
+        // 'forceRevert' is set to true
+        Preconditions.checkState(lineageEntry.getState() != LineageEntryState.REVERTED && (
+                lineageEntry.getState() != LineageEntryState.IN_PROGRESS || forceRevert),
+            "Lineage state is not valid. Cannot update the lineage entry to be 'REVERTED'. (tableNameWithType=%s, "
+                + "segmentLineageEntryId=%s, segmentLineageEntryState=%s, forceRevert=%s)", tableNameWithType,
+            segmentLineageEntryId, lineageEntry.getState(), forceRevert);
+
+        // Do not allow reverting 'COMPLETED' lineage entry when 'segmentsFrom' do not exist in the ideal state
+        if (lineageEntry.getState() == LineageEntryState.COMPLETED) {
+          Set<String> onlineSegments = getOnlineSegmentsFromIdealState(tableNameWithType, true);
+          for (String segment : lineageEntry.getSegmentsFrom()) {
+            Preconditions.checkState(onlineSegments.contains(segment),
+                "Segment: %s from 'segmentsFrom' does not exist in table: %s (reverting a deleted segment)", segment,
+                tableNameWithType);
+          }
         }
 
-        // We do not allow to revert the lineage entry which segments in 'segmentsTo' appear in 'segmentsFrom' of other
+        // Do not allow reverting the lineage entry which segments in 'segmentsTo' appear in 'segmentsFrom' of other
         // 'IN_PROGRESS' or 'COMPLETED' entries. E.g. we do not allow reverting entry1 because it will block reverting
         // entry2.
         // entry1: {(Seg_0, Seg_1, Seg_2) -> (Seg_3, Seg_4, Seg_5), COMPLETED}
         // entry2: {(Seg_3, Seg_4, Seg_5) -> (Seg_6, Seg_7, Seg_8), IN_PROGRESS/COMPLETED}
         // TODO: need to expand the logic to revert multiple entries in one go when we support > 2 data snapshots
-        for (String currentEntryId : segmentLineage.getLineageEntryIds()) {
-          LineageEntry currentLineageEntry = segmentLineage.getLineageEntry(currentEntryId);
-          if (currentLineageEntry.getState() == LineageEntryState.IN_PROGRESS
-              || currentLineageEntry.getState() == LineageEntryState.COMPLETED) {
-            Preconditions.checkArgument(
-                Collections.disjoint(lineageEntry.getSegmentsTo(), currentLineageEntry.getSegmentsFrom()),
-                String.format("Cannot revert lineage entry, found segments from 'segmentsTo' "
-                        + "appear in 'segmentsFrom' of another lineage entry. (tableNameWithType='%s', "
-                        + "segmentLineageEntryId='%s', segmentsTo = '%s', segmentLineageEntryId='%s' "
-                        + "segmentsFrom = '%s')", tableNameWithType, segmentLineageEntryId,
-                    lineageEntry.getSegmentsTo(),
-                    currentEntryId, currentLineageEntry.getSegmentsFrom()));
+        List<String> segmentsTo = lineageEntry.getSegmentsTo();
+        if (!segmentsTo.isEmpty()) {
+          for (Map.Entry<String, LineageEntry> entry : segmentLineage.getLineageEntries().entrySet()) {
+            String currentEntryId = entry.getKey();
+            LineageEntry currentLineageEntry = entry.getValue();
+            if (currentLineageEntry.getState() == LineageEntryState.IN_PROGRESS
+                || currentLineageEntry.getState() == LineageEntryState.COMPLETED) {
+              Set<String> segmentsFromInLineageEntry = new HashSet<>(currentLineageEntry.getSegmentsFrom());
+              if (!segmentsFromInLineageEntry.isEmpty()) {
+                for (String segment : segmentsTo) {
+                  Preconditions.checkState(!segmentsFromInLineageEntry.contains(segment),
+                      "Segment: %s from 'segmentsTo' exists in table: %s, entry id: %s as 'segmentsTo'"
+                          + " (reverting a merged segment)", segment, tableNameWithType, currentEntryId);
+                }
+              }
+            }
           }
         }
 
         // Update segment lineage entry to 'REVERTED'
-        updateSegmentLineageEntryToReverted(tableNameWithType, segmentLineage, segmentLineageEntryId, lineageEntry);
+        LineageEntry lineageEntryToUpdate =
+            new LineageEntry(lineageEntry.getSegmentsFrom(), lineageEntry.getSegmentsTo(), LineageEntryState.REVERTED,
+                System.currentTimeMillis());
 
-        // Write back to the lineage entry
-        if (SegmentLineageAccessHelper.writeSegmentLineage(_propertyStore, segmentLineage, expectedVersion)) {
+        TableConfig tableConfig = ZKMetadataProvider.getTableConfig(_propertyStore, tableNameWithType);
+        Map<String, String> customMap =
+            revertReplaceSegmentsRequest == null ? null : revertReplaceSegmentsRequest.getCustomMap();
+        if (writeLineageEntryWithTightLoop(tableConfig, segmentLineageEntryId, lineageEntryToUpdate, lineageEntry,
+            _propertyStore, LineageUpdateType.REVERT, customMap)) {
           // If the segment lineage metadata is successfully updated, we need to trigger brokers to rebuild the
           // routing table because it is possible that there has been no EV change but the routing result may be
           // different after updating the lineage entry.
           sendRoutingTableRebuildMessage(tableNameWithType);
 
           // Invoke the proactive clean-up for segments that we no longer needs
-          deleteSegments(tableNameWithType, lineageEntry.getSegmentsTo());
+          if (!segmentsTo.isEmpty()) {
+            deleteSegments(tableNameWithType, segmentsTo);
+          }
           return true;
         } else {
+          LOGGER.warn("Failed to write segment lineage for table: {}", tableNameWithType);
           return false;
         }
       });
@@ -3565,63 +3876,84 @@ public void revertReplaceSegments(String tableNameWithType, String segmentLineag
         tableNameWithType, segmentLineageEntryId);
   }
 
-  private void updateSegmentLineageEntryToReverted(String tableNameWithType, SegmentLineage segmentLineage,
-      String segmentLineageEntryId, LineageEntry lineageEntry) {
-    if (lineageEntry.getState() == LineageEntryState.COMPLETED) {
-      // Check that all segments from 'segmentsFrom' are in ONLINE state in the external view.
-      Set<String> onlineSegments = getOnlineSegmentsFromExternalView(tableNameWithType);
-      Preconditions.checkArgument(onlineSegments.containsAll(lineageEntry.getSegmentsFrom()), String.format(
-          "Failed to update the lineage to be 'REVERTED'. Not all segments from 'segmentFrom' are in ONLINE state "
-              + "in the external view. (tableName = '%s', segmentsFrom = '%s', onlineSegments = '%s'",
-          tableNameWithType, lineageEntry.getSegmentsFrom(), onlineSegments));
-    }
-
-    // Update lineage entry
-    segmentLineage.updateLineageEntry(segmentLineageEntryId,
-        new LineageEntry(lineageEntry.getSegmentsFrom(), lineageEntry.getSegmentsTo(), LineageEntryState.REVERTED,
-            System.currentTimeMillis()));
-  }
-
-  private List<String> deleteOrUpdateSegmentLineageEntryToReverted(String tableNameWithType,
-      SegmentLineage segmentLineage, String segmentLineageEntryId, LineageEntry lineageEntry,
-      List<String> newSegments) {
-    // Delete or update segmentsTo of the entry to revert to handle the case of rerunning the protocol:
-    // Initial state:
-    //   Entry1: { segmentsFrom: [s1, s2], segmentsTo: [s3, s4], status: IN_PROGRESS}
-    // 1. Rerunning the protocol with s4 and s5, s4 should not be deleted to avoid race conditions of concurrent data
-    // pushes and deletions:
-    //   Entry1: { segmentsFrom: [s1, s2], segmentsTo: [s3], status: REVERTED}
-    //   Entry2: { segmentsFrom: [s1, s2], segmentsTo: [s4, s5], status: IN_PROGRESS}
-    // 2. Rerunning the protocol with s3 and s4, we can simply remove the 'IN_PROGRESS' entry:
-    //   Entry2: { segmentsFrom: [s1, s2], segmentsTo: [s3, s4], status: IN_PROGRESS}
-    List<String> segmentsToForEntryToRevert = new ArrayList<>(lineageEntry.getSegmentsTo());
-    segmentsToForEntryToRevert.removeAll(newSegments);
-
-    if (segmentsToForEntryToRevert.isEmpty()) {
-      // Delete 'IN_PROGRESS' entry if the segmentsTo is empty
-      segmentLineage.deleteLineageEntry(segmentLineageEntryId);
-    } else {
-      // Update the lineage entry to 'REVERTED'
-      segmentLineage.updateLineageEntry(segmentLineageEntryId,
-          new LineageEntry(lineageEntry.getSegmentsFrom(), segmentsToForEntryToRevert, LineageEntryState.REVERTED,
-              System.currentTimeMillis()));
+  /**
+   * Update the lineage entry with the tight loop to increase the chance for successful ZK write.
+   * @param tableConfig table config
+   * @param lineageEntryId lineage entry id
+   * @param lineageEntryToUpdate lineage entry that needs to be updated
+   * @param lineageEntryToMatch lineage entry that needs to match with the entry from the newly fetched segment lineage.
+   * @param propertyStore property store
+   * @param lineageUpdateType
+   * @param customMap
+   */
+  private boolean writeLineageEntryWithTightLoop(TableConfig tableConfig, String lineageEntryId,
+      LineageEntry lineageEntryToUpdate, LineageEntry lineageEntryToMatch,
+      ZkHelixPropertyStore<ZNRecord> propertyStore,
+      LineageUpdateType lineageUpdateType, Map<String, String> customMap) {
+    for (int i = 0; i < DEFAULT_SEGMENT_LINEAGE_UPDATE_NUM_RETRY; i++) {
+      // Fetch the segment lineage
+      ZNRecord segmentLineageToUpdateZNRecord =
+          SegmentLineageAccessHelper.getSegmentLineageZNRecord(propertyStore, tableConfig.getTableName());
+      int expectedVersion = segmentLineageToUpdateZNRecord.getVersion();
+      SegmentLineage segmentLineageToUpdate = SegmentLineage.fromZNRecord(segmentLineageToUpdateZNRecord);
+      LineageEntry currentLineageEntry = segmentLineageToUpdate.getLineageEntry(lineageEntryId);
+
+      // If the lineage entry doesn't match with the previously fetched lineage, we need to fail the request.
+      if (!currentLineageEntry.equals(lineageEntryToMatch)) {
+        String errorMsg = String.format(
+            "Aborting the to update lineage entry since we find that the entry has been modified for table %s, "
+                + "entry id: %s", tableConfig.getTableName(), lineageEntryId);
+        LOGGER.error(errorMsg);
+        throw new RuntimeException(errorMsg);
+      }
+
+      // Update lineage entry
+      segmentLineageToUpdate.updateLineageEntry(lineageEntryId, lineageEntryToUpdate);
+      switch (lineageUpdateType) {
+        case START:
+          _lineageManager
+              .updateLineageForStartReplaceSegments(tableConfig, lineageEntryId, customMap, segmentLineageToUpdate);
+          break;
+        case END:
+          _lineageManager
+              .updateLineageForEndReplaceSegments(tableConfig, lineageEntryId, customMap, segmentLineageToUpdate);
+          break;
+        case REVERT:
+          _lineageManager
+              .updateLineageForRevertReplaceSegments(tableConfig, lineageEntryId, customMap, segmentLineageToUpdate);
+          break;
+        default:
+      }
+
+      // Write back to the lineage entry
+      if (SegmentLineageAccessHelper.writeSegmentLineage(propertyStore, segmentLineageToUpdate, expectedVersion)) {
+        return true;
+      }
     }
-    return segmentsToForEntryToRevert;
+    return false;
   }
 
-  private void waitForSegmentsBecomeOnline(String tableNameWithType, Set<String> segmentsToCheck)
-      throws InterruptedException, TimeoutException {
+  private boolean waitForSegmentsBecomeOnline(String tableNameWithType, List<String> segmentsToCheck)
+      throws InterruptedException {
     long endTimeMs = System.currentTimeMillis() + EXTERNAL_VIEW_ONLINE_SEGMENTS_MAX_WAIT_MS;
+    String segmentNotOnline;
     do {
+      segmentNotOnline = null;
       Set<String> onlineSegments = getOnlineSegmentsFromExternalView(tableNameWithType);
-      if (onlineSegments.containsAll(segmentsToCheck)) {
-        return;
+      for (String segment : segmentsToCheck) {
+        if (!onlineSegments.contains(segment)) {
+          segmentNotOnline = segment;
+          break;
+        }
+      }
+      if (segmentNotOnline == null) {
+        return true;
       }
       Thread.sleep(EXTERNAL_VIEW_CHECK_INTERVAL_MS);
     } while (System.currentTimeMillis() < endTimeMs);
-    throw new TimeoutException(
-        String.format("Time out while waiting segments become ONLINE. (tableNameWithType = %s, segmentsToCheck = %s)",
-            tableNameWithType, segmentsToCheck));
+    LOGGER.warn("Timed out while waiting for segment: {} to become ONLINE for table: {}", segmentNotOnline,
+        tableNameWithType);
+    return false;
   }
 
   public Set<String> getOnlineSegmentsFromIdealState(String tableNameWithType, boolean includeConsuming) {
@@ -3805,6 +4137,31 @@ public PeriodicTaskInvocationResponse invokeControllerPeriodicTask(String tableN
     return new PeriodicTaskInvocationResponse(periodicTaskRequestId, messageCount > 0);
   }
 
+  /**
+   * Construct a map of all the tags and their respective minimum instance requirements.
+   * The minimum instance requirement is computed by
+   * - for BROKER tenant tag set it to 1 if it hosts any table else set it to 0
+   * - for SERVER tenant tag iterate over all the tables of that tenant and find the maximum table replication.
+   * - for rest of the tags just set it to 0
+   * @return map of tags and their minimum instance requirements
+   */
+  public Map<String, Integer> minimumInstancesRequiredForTags() {
+    Map<String, Integer> tagMinInstanceMap = new HashMap<>();
+    for (InstanceConfig instanceConfig : getAllHelixInstanceConfigs()) {
+      for (String tag : instanceConfig.getTags()) {
+        tagMinInstanceMap.put(tag, 0);
+      }
+    }
+    for (TableConfig tableConfig : getAllTableConfigs()) {
+      String tag = TagNameUtils.getServerTagForTenant(tableConfig.getTenantConfig().getServer(),
+          tableConfig.getTableType());
+      tagMinInstanceMap.put(tag, Math.max(tagMinInstanceMap.getOrDefault(tag, 0), tableConfig.getReplication()));
+      String brokerTag = TagNameUtils.getBrokerTagForTenant(tableConfig.getTenantConfig().getBroker());
+      tagMinInstanceMap.put(brokerTag, 1);
+    }
+    return tagMinInstanceMap;
+  }
+
   /*
    * Uncomment and use for testing on a real cluster
   public static void main(String[] args) throws Exception {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
index ff74bea7086..ebde702b09e 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
@@ -44,6 +44,9 @@
 import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.common.utils.SegmentName;
 import org.apache.pinot.common.utils.URIUtils;
+import org.apache.pinot.controller.LeadControllerManager;
+import org.apache.pinot.core.segment.processing.lifecycle.PinotSegmentLifecycleEventListenerManager;
+import org.apache.pinot.core.segment.processing.lifecycle.impl.SegmentDeletionEventDetails;
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.filesystem.PinotFS;
@@ -165,6 +168,10 @@ protected synchronized void deleteSegmentFromPropertyStoreAndLocal(String tableN
         propStorePathList.add(segmentPropertyStorePath);
       }
 
+      // Notify all active listeners here
+      PinotSegmentLifecycleEventListenerManager.getInstance()
+          .notifyListeners(new SegmentDeletionEventDetails(tableName, segmentsToDelete));
+
       boolean[] deleteSuccessful = _propertyStore.remove(propStorePathList, AccessOption.PERSISTENT);
       List<String> propStoreFailedSegs = new ArrayList<>(segmentsToDelete.size());
       for (int i = 0; i < deleteSuccessful.length; i++) {
@@ -264,7 +271,7 @@ protected void removeSegmentFromStore(String tableNameWithType, String segmentId
   /**
    * Removes aged deleted segments from the deleted directory
    */
-  public void removeAgedDeletedSegments() {
+  public void removeAgedDeletedSegments(LeadControllerManager leadControllerManager) {
     if (_dataDir != null) {
       URI deletedDirURI = URIUtils.getUri(_dataDir, DELETED_SEGMENTS);
       PinotFS pinotFS = PinotFSFactory.create(deletedDirURI.getScheme());
@@ -287,26 +294,29 @@ public void removeAgedDeletedSegments() {
         }
 
         for (String tableNameDir : tableNameDirs) {
-          URI tableNameURI = URIUtils.getUri(tableNameDir);
-          // Get files that are aged
-          final String[] targetFiles = pinotFS.listFiles(tableNameURI, false);
-          int numFilesDeleted = 0;
-          for (String targetFile : targetFiles) {
-            URI targetURI = URIUtils.getUri(targetFile);
-            long deletionTimeMs = getDeletionTimeMsFromFile(targetFile, pinotFS.lastModified(targetURI));
-            if (System.currentTimeMillis() >= deletionTimeMs) {
-              if (!pinotFS.delete(targetURI, true)) {
-                LOGGER.warn("Cannot remove file {} from deleted directory.", targetURI.toString());
-              } else {
-                numFilesDeleted++;
+          String tableName = URIUtils.getLastPart(tableNameDir);
+          if (leadControllerManager.isLeaderForTable(tableName)) {
+            URI tableNameURI = URIUtils.getUri(tableNameDir);
+            // Get files that are aged
+            final String[] targetFiles = pinotFS.listFiles(tableNameURI, false);
+            int numFilesDeleted = 0;
+            for (String targetFile : targetFiles) {
+              URI targetURI = URIUtils.getUri(targetFile);
+              long deletionTimeMs = getDeletionTimeMsFromFile(targetFile, pinotFS.lastModified(targetURI));
+              if (System.currentTimeMillis() >= deletionTimeMs) {
+                if (!pinotFS.delete(targetURI, true)) {
+                  LOGGER.warn("Cannot remove file {} from deleted directory.", targetURI);
+                } else {
+                  numFilesDeleted++;
+                }
               }
             }
-          }
 
-          if (numFilesDeleted == targetFiles.length) {
-            // Delete directory if it's empty
-            if (!pinotFS.delete(tableNameURI, false)) {
-              LOGGER.warn("The directory {} cannot be removed.", tableNameDir);
+            if (numFilesDeleted == targetFiles.length) {
+              // Delete directory if it's empty
+              if (!pinotFS.delete(tableNameURI, false)) {
+                LOGGER.warn("The directory {} cannot be removed.", tableNameDir);
+              }
             }
           }
         }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java
index ba73f7bd6dc..7a5c9010293 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentDriver.java
@@ -25,6 +25,7 @@
 import org.apache.helix.model.InstanceConfig;
 import org.apache.pinot.common.assignment.InstanceAssignmentConfigUtils;
 import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.common.assignment.InstancePartitionsUtils;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig;
 import org.apache.pinot.spi.config.table.assignment.InstanceConstraintConfig;
@@ -55,15 +56,31 @@ public InstanceAssignmentDriver(TableConfig tableConfig) {
   public InstancePartitions assignInstances(InstancePartitionsType instancePartitionsType,
       List<InstanceConfig> instanceConfigs, @Nullable InstancePartitions existingInstancePartitions) {
     String tableNameWithType = _tableConfig.getTableName();
-    LOGGER.info("Starting {} instance assignment for table: {}", instancePartitionsType, tableNameWithType);
-
     InstanceAssignmentConfig assignmentConfig =
         InstanceAssignmentConfigUtils.getInstanceAssignmentConfig(_tableConfig, instancePartitionsType);
+    return getInstancePartitions(
+        instancePartitionsType.getInstancePartitionsName(TableNameBuilder.extractRawTableName(tableNameWithType)),
+        assignmentConfig, instanceConfigs, existingInstancePartitions);
+  }
+
+  public InstancePartitions assignInstances(String tierName, List<InstanceConfig> instanceConfigs,
+      @Nullable InstancePartitions existingInstancePartitions, InstanceAssignmentConfig instanceAssignmentConfig) {
+    return getInstancePartitions(
+        InstancePartitionsUtils.getInstancePartitionsNameForTier(_tableConfig.getTableName(), tierName),
+        instanceAssignmentConfig, instanceConfigs, existingInstancePartitions);
+  }
+
+  private InstancePartitions getInstancePartitions(String instancePartitionsName,
+      InstanceAssignmentConfig instanceAssignmentConfig, List<InstanceConfig> instanceConfigs,
+      @Nullable InstancePartitions existingInstancePartitions) {
+    String tableNameWithType = _tableConfig.getTableName();
+    LOGGER.info("Starting {} instance assignment for table {}", instancePartitionsName, tableNameWithType);
+
     InstanceTagPoolSelector tagPoolSelector =
-        new InstanceTagPoolSelector(assignmentConfig.getTagPoolConfig(), tableNameWithType);
+        new InstanceTagPoolSelector(instanceAssignmentConfig.getTagPoolConfig(), tableNameWithType);
     Map<Integer, List<InstanceConfig>> poolToInstanceConfigsMap = tagPoolSelector.selectInstances(instanceConfigs);
 
-    InstanceConstraintConfig constraintConfig = assignmentConfig.getConstraintConfig();
+    InstanceConstraintConfig constraintConfig = instanceAssignmentConfig.getConstraintConfig();
     List<InstanceConstraintApplier> constraintAppliers = new ArrayList<>();
     if (constraintConfig == null) {
       LOGGER.info("No instance constraint is configured, using default hash-based-rotate instance constraint");
@@ -75,10 +92,9 @@ public InstancePartitions assignInstances(InstancePartitionsType instancePartiti
     }
 
     InstancePartitionSelector instancePartitionSelector =
-        InstancePartitionSelectorFactory.getInstance(assignmentConfig.getPartitionSelector(),
-            assignmentConfig.getReplicaGroupPartitionConfig(), tableNameWithType, existingInstancePartitions);
-    InstancePartitions instancePartitions = new InstancePartitions(
-        instancePartitionsType.getInstancePartitionsName(TableNameBuilder.extractRawTableName(tableNameWithType)));
+        InstancePartitionSelectorFactory.getInstance(instanceAssignmentConfig.getPartitionSelector(),
+            instanceAssignmentConfig.getReplicaGroupPartitionConfig(), tableNameWithType, existingInstancePartitions);
+    InstancePartitions instancePartitions = new InstancePartitions(instancePartitionsName);
     instancePartitionSelector.selectInstances(poolToInstanceConfigsMap, instancePartitions);
     return instancePartitions;
   }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java
index fc66bce53e2..b89fd497be9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java
@@ -28,9 +28,9 @@
 import org.apache.helix.HelixManager;
 import org.apache.pinot.common.assignment.InstancePartitions;
 import org.apache.pinot.common.tier.Tier;
+import org.apache.pinot.common.utils.config.TableConfigUtils;
 import org.apache.pinot.controller.helix.core.assignment.segment.strategy.SegmentAssignmentStrategy;
 import org.apache.pinot.controller.helix.core.assignment.segment.strategy.SegmentAssignmentStrategyFactory;
-import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
 import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
@@ -76,9 +76,7 @@ public void init(HelixManager helixManager, TableConfig tableConfig) {
     _tableNameWithType = tableConfig.getTableName();
     _tableConfig = tableConfig;
     _replication = tableConfig.getReplication();
-    ReplicaGroupStrategyConfig replicaGroupStrategyConfig =
-        tableConfig.getValidationConfig().getReplicaGroupStrategyConfig();
-    _partitionColumn = replicaGroupStrategyConfig != null ? replicaGroupStrategyConfig.getPartitionColumn() : null;
+    _partitionColumn = TableConfigUtils.getPartitionColumn(_tableConfig);
 
     if (_partitionColumn == null) {
       _logger.info("Initialized with replication: {} without partition column for table: {} ", _replication,
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/ReplicaGroupSegmentAssignmentStrategy.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/ReplicaGroupSegmentAssignmentStrategy.java
index d5a4d0e027b..3ff08072200 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/ReplicaGroupSegmentAssignmentStrategy.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/ReplicaGroupSegmentAssignmentStrategy.java
@@ -27,8 +27,8 @@
 import java.util.TreeMap;
 import org.apache.helix.HelixManager;
 import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.common.utils.config.TableConfigUtils;
 import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentUtils;
-import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -54,9 +54,7 @@ public void init(HelixManager helixManager, TableConfig tableConfig) {
     SegmentsValidationAndRetentionConfig validationAndRetentionConfig = tableConfig.getValidationConfig();
     Preconditions.checkState(validationAndRetentionConfig != null, "Validation Config is null");
     _replication = tableConfig.getReplication();
-    ReplicaGroupStrategyConfig replicaGroupStrategyConfig =
-        validationAndRetentionConfig.getReplicaGroupStrategyConfig();
-    _partitionColumn = replicaGroupStrategyConfig != null ? replicaGroupStrategyConfig.getPartitionColumn() : null;
+    _partitionColumn = TableConfigUtils.getPartitionColumn(_tableConfig);
     if (_partitionColumn == null) {
       LOGGER.info("Initialized ReplicaGroupSegmentAssignmentStrategy "
           + "with replication: {} without partition column for table: {} ", _replication, _tableName);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/DefaultLineageManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/DefaultLineageManager.java
new file mode 100644
index 00000000000..225c65b7178
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/DefaultLineageManager.java
@@ -0,0 +1,130 @@
+/**
+ * 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.pinot.controller.helix.core.lineage;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.lineage.LineageEntry;
+import org.apache.pinot.common.lineage.LineageEntryState;
+import org.apache.pinot.common.lineage.SegmentLineage;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.utils.IngestionConfigUtils;
+
+
+public class DefaultLineageManager implements LineageManager {
+  private static final long REPLACED_SEGMENTS_RETENTION_IN_MILLIS = TimeUnit.DAYS.toMillis(1L); // 1 day
+  private static final long LINEAGE_ENTRY_CLEANUP_RETENTION_IN_MILLIS = TimeUnit.DAYS.toMillis(1L); // 1 day
+
+  protected ControllerConf _controllerConf;
+
+  public DefaultLineageManager(ControllerConf controllerConf) {
+    _controllerConf = controllerConf;
+  }
+
+  @Override
+  public void updateLineageForStartReplaceSegments(TableConfig tableConfig, String lineageEntryId,
+      Map<String, String> customMap, SegmentLineage lineage) {
+  }
+
+  @Override
+  public void updateLineageForEndReplaceSegments(TableConfig tableConfig, String lineageEntryId,
+      Map<String, String> customMap, SegmentLineage lineage) {
+  }
+
+  @Override
+  public void updateLineageForRevertReplaceSegments(TableConfig tableConfig, String lineageEntryId,
+      Map<String, String> customMap, SegmentLineage lineage) {
+  }
+
+  /**
+   * This method:
+   * 1. Update lineage metadata by removing lineage entries
+   * 2. Find segments that need to be deleted
+   */
+  @Override
+  public void updateLineageForRetention(TableConfig tableConfig, SegmentLineage lineage, List<String> allSegments,
+      List<String> segmentsToDelete, Set<String> consumingSegments) {
+    // 1. The original segments can be deleted once the merged segments are successfully uploaded
+    // 2. The zombie lineage entry & merged segments should be deleted if the segment replacement failed in
+    //    the middle
+    Set<String> segmentsForTable = new HashSet<>(allSegments);
+    Iterator<LineageEntry> lineageEntryIterator = lineage.getLineageEntries().values().iterator();
+    while (lineageEntryIterator.hasNext()) {
+      LineageEntry lineageEntry = lineageEntryIterator.next();
+      if (lineageEntry.getState() == LineageEntryState.COMPLETED) {
+        Set<String> sourceSegments = new HashSet<>(lineageEntry.getSegmentsFrom());
+        sourceSegments.retainAll(segmentsForTable);
+        if (sourceSegments.isEmpty()) {
+          // If the lineage state is 'COMPLETED' and segmentFrom are removed, it is safe clean up the lineage entry
+          lineageEntryIterator.remove();
+        } else {
+          // If the lineage state is 'COMPLETED' and we already preserved the original segments for the required
+          // retention, it is safe to delete all segments from 'segmentsFrom'
+          if (shouldDeleteReplacedSegments(tableConfig, lineageEntry)) {
+            segmentsToDelete.addAll(sourceSegments);
+          }
+        }
+      } else if (lineageEntry.getState() == LineageEntryState.REVERTED || (
+          lineageEntry.getState() == LineageEntryState.IN_PROGRESS && lineageEntry.getTimestamp()
+              < System.currentTimeMillis() - LINEAGE_ENTRY_CLEANUP_RETENTION_IN_MILLIS)) {
+        // If the lineage state is 'IN_PROGRESS' or 'REVERTED', we need to clean up the zombie lineage
+        // entry and its segments
+        Set<String> destinationSegments = new HashSet<>(lineageEntry.getSegmentsTo());
+        destinationSegments.retainAll(segmentsForTable);
+        if (destinationSegments.isEmpty()) {
+          // If the lineage state is 'IN_PROGRESS or REVERTED' and source segments are already removed, it is safe
+          // to clean up the lineage entry. Deleting lineage will allow the task scheduler to re-schedule the source
+          // segments to be merged again.
+          lineageEntryIterator.remove();
+        } else {
+          // If the lineage state is 'IN_PROGRESS', it is safe to delete all segments from 'segmentsTo'
+          segmentsToDelete.addAll(destinationSegments);
+        }
+      }
+    }
+  }
+
+
+  /**
+   * Helper function to decide whether we should delete segmentsFrom (replaced segments) given a lineage entry.
+   *
+   * The replaced segments are safe to delete if the following conditions are all satisfied
+   * 1) Table is "APPEND"
+   * 2) It has been more than 24 hours since the lineage entry became "COMPLETED" state.
+   *
+   * @param tableConfig a table config
+   * @param lineageEntry lineage entry
+   * @return True if we can safely delete the replaced segments. False otherwise.
+   */
+  private boolean shouldDeleteReplacedSegments(TableConfig tableConfig, LineageEntry lineageEntry) {
+    // TODO: Currently, we preserve the replaced segments for 1 day for REFRESH tables only. Once we support
+    // data rollback for APPEND tables, we should remove this check.
+    String batchSegmentIngestionType = IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig);
+    if (!batchSegmentIngestionType.equalsIgnoreCase("REFRESH")
+        || lineageEntry.getTimestamp() < System.currentTimeMillis() - REPLACED_SEGMENTS_RETENTION_IN_MILLIS) {
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/LineageManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/LineageManager.java
new file mode 100644
index 00000000000..c829ef243b8
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/LineageManager.java
@@ -0,0 +1,73 @@
+/**
+ * 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.pinot.controller.helix.core.lineage;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.pinot.common.lineage.SegmentLineage;
+import org.apache.pinot.spi.config.table.TableConfig;
+
+
+/**
+ * Interface to update lineage metadata based on custom inputs and garbage collect lineage entries
+ */
+public interface LineageManager {
+
+  /**
+   * Update lineage based on customMap for start replace calls
+   * @param tableConfig
+   * @param lineageEntryId
+   * @param customMap
+   * @param lineage
+   */
+  void updateLineageForStartReplaceSegments(TableConfig tableConfig, String lineageEntryId,
+      Map<String, String> customMap, SegmentLineage lineage);
+
+  /**
+   * Update lineage based on customMap for end replace calls
+   * @param tableConfig
+   * @param lineageEntryId
+   * @param customMap
+   * @param lineage
+   */
+  void updateLineageForEndReplaceSegments(TableConfig tableConfig, String lineageEntryId, Map<String, String> customMap,
+      SegmentLineage lineage);
+
+  /**
+   * Update lineage based on customMap for revert replace calls
+   * @param tableConfig
+   * @param lineageEntryId
+   * @param customMap
+   * @param lineage
+   */
+  void updateLineageForRevertReplaceSegments(TableConfig tableConfig, String lineageEntryId,
+      Map<String, String> customMap, SegmentLineage lineage);
+
+  /**
+   * Update lineage for retention purposes
+   * @param tableConfig
+   * @param lineage
+   * @param allSegments
+   * @param segmentsToDelete
+   * @param consumingSegments
+   */
+  void updateLineageForRetention(TableConfig tableConfig, SegmentLineage lineage, List<String> allSegments,
+      List<String> segmentsToDelete, Set<String> consumingSegments);
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/LineageManagerFactory.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/LineageManagerFactory.java
new file mode 100644
index 00000000000..1a07dfefacd
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/lineage/LineageManagerFactory.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.controller.helix.core.lineage;
+
+import org.apache.pinot.controller.ControllerConf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Factory class to create {@link LineageManager} based on controller configs
+ */
+public class LineageManagerFactory {
+  private static final Logger LOGGER = LoggerFactory.getLogger(LineageManagerFactory.class);
+
+  private LineageManagerFactory() {
+  }
+
+  public static LineageManager create(ControllerConf controllerConf) {
+    String lineageManagerClassName = controllerConf.getLineageManagerClass();
+    try {
+      return (LineageManager) Class.forName(lineageManagerClassName).getConstructor(ControllerConf.class)
+          .newInstance(controllerConf);
+    } catch (Exception e) {
+      LOGGER.error("LineageManager not found: {}", lineageManagerClassName);
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java
index bcb14919887..5551c04d7cc 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/ClusterInfoAccessor.java
@@ -21,7 +21,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executor;
 import javax.annotation.Nullable;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.helix.model.HelixConfigScope;
 import org.apache.helix.model.builder.HelixConfigScopeBuilder;
 import org.apache.helix.task.TaskState;
@@ -51,15 +53,20 @@ public class ClusterInfoAccessor {
   private final ControllerConf _controllerConf;
   private final ControllerMetrics _controllerMetrics;
   private final LeadControllerManager _leadControllerManager;
+  private final Executor _executor;
+  private final MultiThreadedHttpConnectionManager _connectionManager;
 
   public ClusterInfoAccessor(PinotHelixResourceManager pinotHelixResourceManager,
       PinotHelixTaskResourceManager pinotHelixTaskResourceManager, ControllerConf controllerConf,
-      ControllerMetrics controllerMetrics, LeadControllerManager leadControllerManager) {
+      ControllerMetrics controllerMetrics, LeadControllerManager leadControllerManager, Executor executor,
+      MultiThreadedHttpConnectionManager connectionManager) {
     _pinotHelixResourceManager = pinotHelixResourceManager;
     _pinotHelixTaskResourceManager = pinotHelixTaskResourceManager;
     _controllerConf = controllerConf;
     _controllerMetrics = controllerMetrics;
     _leadControllerManager = leadControllerManager;
+    _executor = executor;
+    _connectionManager = connectionManager;
   }
 
   /**
@@ -94,6 +101,20 @@ public List<SegmentZKMetadata> getSegmentsZKMetadata(String tableNameWithType) {
     return ZKMetadataProvider.getSegmentsZKMetadata(_pinotHelixResourceManager.getPropertyStore(), tableNameWithType);
   }
 
+  /**
+   * Get shared executor
+   */
+  public Executor getExecutor() {
+    return _executor;
+  }
+
+  /**
+   * Get shared connection manager
+   */
+  public MultiThreadedHttpConnectionManager getConnectionManager() {
+    return _connectionManager;
+  }
+
   /**
    * Fetches the ZNRecord under MINION_TASK_METADATA/${tableNameWithType}/${taskType} for the given
    * taskType and tableNameWithType
@@ -114,8 +135,8 @@ public ZNRecord getMinionTaskMetadataZNRecord(String taskType, String tableNameW
    */
   @Nullable
   public SegmentLineage getSegmentLineage(String tableNameWithType) {
-    return SegmentLineageAccessHelper
-        .getSegmentLineage(_pinotHelixResourceManager.getPropertyStore(), tableNameWithType);
+    return SegmentLineageAccessHelper.getSegmentLineage(_pinotHelixResourceManager.getPropertyStore(),
+        tableNameWithType);
   }
 
   /**
@@ -127,8 +148,8 @@ public SegmentLineage getSegmentLineage(String tableNameWithType) {
    * @param expectedVersion The expected version of data to be overwritten. Set to -1 to override version check.
    */
   public void setMinionTaskMetadata(BaseTaskMetadata taskMetadata, String taskType, int expectedVersion) {
-    MinionTaskMetadataUtils
-        .persistTaskMetadata(_pinotHelixResourceManager.getPropertyStore(), taskType, taskMetadata, expectedVersion);
+    MinionTaskMetadataUtils.persistTaskMetadata(_pinotHelixResourceManager.getPropertyStore(), taskType, taskMetadata,
+        expectedVersion);
   }
 
   /**
@@ -175,8 +196,9 @@ public String getDataDir() {
    * @return cluster config
    */
   public String getClusterConfig(String configName) {
-    HelixConfigScope helixConfigScope = new HelixConfigScopeBuilder(HelixConfigScope.ConfigScopeProperty.CLUSTER)
-        .forCluster(_pinotHelixResourceManager.getHelixClusterName()).build();
+    HelixConfigScope helixConfigScope =
+        new HelixConfigScopeBuilder(HelixConfigScope.ConfigScopeProperty.CLUSTER).forCluster(
+            _pinotHelixResourceManager.getHelixClusterName()).build();
     Map<String, String> configMap =
         _pinotHelixResourceManager.getHelixAdmin().getConfig(helixConfigScope, Collections.singletonList(configName));
     return configMap != null ? configMap.get(configName) : null;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
index f7441593c90..4b62b143af8 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
@@ -37,6 +37,7 @@
 import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.lang3.StringUtils;
@@ -53,7 +54,6 @@
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.minion.MinionTaskMetadataUtils;
 import org.apache.pinot.common.utils.DateTimeUtils;
-import org.apache.pinot.controller.api.exception.NoTaskMetadataException;
 import org.apache.pinot.controller.api.exception.NoTaskScheduledException;
 import org.apache.pinot.controller.api.exception.UnknownTaskTypeException;
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
@@ -620,6 +620,59 @@ Map<String, Object> getSubtaskProgress(String taskName, @Nullable String subtask
     return subtaskProgressMap;
   }
 
+  /**
+   * Gets progress of all subtasks with specified state tracked by given minion workers in memory
+   * @param subtaskState a specified subtask state, valid values are in org.apache.pinot.minion.event.MinionTaskState
+   * @param executor an {@link Executor} used to run logic on
+   * @param connMgr a {@link HttpConnectionManager} used to manage http connections
+   * @param selectedMinionWorkerEndpoints a map of worker id to http endpoint for minions to get subtask progress from
+   * @param requestHeaders http headers used to send requests to minion workers
+   * @param timeoutMs timeout (in millisecond) for requests sent to minion workers
+   * @return a map of minion worker id to subtask progress
+   */
+  public synchronized Map<String, Object> getSubtaskOnWorkerProgress(String subtaskState,
+      Executor executor, HttpConnectionManager connMgr, Map<String, String> selectedMinionWorkerEndpoints,
+      Map<String, String> requestHeaders, int timeoutMs)
+      throws JsonProcessingException {
+    return getSubtaskOnWorkerProgress(subtaskState,
+        new CompletionServiceHelper(executor, connMgr, HashBiMap.create(0)), selectedMinionWorkerEndpoints,
+        requestHeaders, timeoutMs);
+  }
+
+  @VisibleForTesting
+  Map<String, Object> getSubtaskOnWorkerProgress(String subtaskState,
+      CompletionServiceHelper completionServiceHelper, Map<String, String> selectedMinionWorkerEndpoints,
+      Map<String, String> requestHeaders, int timeoutMs)
+      throws JsonProcessingException {
+    Map<String, Object> minionWorkerIdSubtaskProgressMap = new HashMap<>();
+    if (selectedMinionWorkerEndpoints.isEmpty()) {
+      return minionWorkerIdSubtaskProgressMap;
+    }
+    Map<String, String> minionWorkerUrlToWorkerIdMap = selectedMinionWorkerEndpoints.entrySet().stream()
+        .collect(Collectors.toMap(
+            entry -> String.format("%s/tasks/subtask/state/progress?subTaskState=%s", entry.getValue(), subtaskState),
+            Map.Entry::getKey));
+    List<String> workerUrls = new ArrayList<>(minionWorkerUrlToWorkerIdMap.keySet());
+    LOGGER.debug("Getting task progress with workerUrls: {}", workerUrls);
+    // Scatter and gather progress from multiple workers.
+    CompletionServiceHelper.CompletionServiceResponse serviceResponse =
+        completionServiceHelper.doMultiGetRequest(workerUrls, null, true, requestHeaders, timeoutMs);
+    for (Map.Entry<String, String> entry : serviceResponse._httpResponses.entrySet()) {
+      String worker = entry.getKey();
+      String resp = entry.getValue();
+      LOGGER.debug("Got resp: {} from worker: {}", resp, worker);
+      minionWorkerIdSubtaskProgressMap
+          .put(minionWorkerUrlToWorkerIdMap.get(worker), JsonUtils.stringToObject(resp, Map.class));
+    }
+    if (serviceResponse._failedResponseCount > 0) {
+      // Instead of aborting, subtasks without worker side progress return the task status tracked by Helix.
+      // The detailed worker failure response is logged as error by CompletionServiceResponse for debugging.
+      LOGGER.warn("There were {} workers failed to report task progress. Got partial progress info: {}",
+          serviceResponse._failedResponseCount, minionWorkerIdSubtaskProgressMap);
+    }
+    return minionWorkerIdSubtaskProgressMap;
+  }
+
   /**
    * Helper method to return a map of task names to corresponding task state
    * where the task corresponds to the given Pinot table name. This is used to
@@ -864,8 +917,7 @@ public String getTaskMetadataByTable(String taskType, String tableNameWithType)
     ZkHelixPropertyStore<ZNRecord> propertyStore = _helixResourceManager.getPropertyStore();
     ZNRecord raw = MinionTaskMetadataUtils.fetchTaskMetadata(propertyStore, taskType, tableNameWithType);
     if (raw == null) {
-      throw new NoTaskMetadataException(
-          String.format("No task metadata for task type: %s from table: %s", taskType, tableNameWithType));
+      return JsonUtils.objectToString(JsonUtils.newObjectNode());
     }
     return JsonUtils.objectToString(raw);
   }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
index e7a7584b768..4f10b6a5c50 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
@@ -32,8 +32,10 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
 import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.helix.AccessOption;
 import org.apache.helix.task.TaskState;
 import org.apache.helix.zookeeper.zkclient.IZkChildListener;
@@ -114,7 +116,8 @@ public class PinotTaskManager extends ControllerPeriodicTask<Void> {
   public PinotTaskManager(PinotHelixTaskResourceManager helixTaskResourceManager,
       PinotHelixResourceManager helixResourceManager, LeadControllerManager leadControllerManager,
       ControllerConf controllerConf, ControllerMetrics controllerMetrics,
-      TaskManagerStatusCache<TaskGeneratorMostRecentRunInfo> taskManagerStatusCache) {
+      TaskManagerStatusCache<TaskGeneratorMostRecentRunInfo> taskManagerStatusCache, Executor executor,
+      MultiThreadedHttpConnectionManager connectionManager) {
     super("PinotTaskManager", controllerConf.getTaskManagerFrequencyInSeconds(),
         controllerConf.getPinotTaskManagerInitialDelaySeconds(), helixResourceManager, leadControllerManager,
         controllerMetrics);
@@ -122,7 +125,7 @@ public PinotTaskManager(PinotHelixTaskResourceManager helixTaskResourceManager,
     _taskManagerStatusCache = taskManagerStatusCache;
     _clusterInfoAccessor =
         new ClusterInfoAccessor(helixResourceManager, helixTaskResourceManager, controllerConf, controllerMetrics,
-            leadControllerManager);
+            leadControllerManager, executor, connectionManager);
     _taskGeneratorRegistry = new TaskGeneratorRegistry(_clusterInfoAccessor);
     _skipLateCronSchedule = controllerConf.isSkipLateCronSchedule();
     _maxCronScheduleDelayInSeconds = controllerConf.getMaxCronScheduleDelayInSeconds();
@@ -561,8 +564,8 @@ private String scheduleTask(PinotTaskGenerator taskGenerator, List<TableConfig>
       long successRunTimestamp = System.currentTimeMillis();
       for (TableConfig tableConfig : enabledTableConfigs) {
         _taskManagerStatusCache.saveTaskGeneratorInfo(tableConfig.getTableName(), taskGenerator.getTaskType(),
-            taskGeneratorMostRecentRunInfo -> taskGeneratorMostRecentRunInfo.addErrorRunMessage(
-                successRunTimestamp, errors.toString()));
+            taskGeneratorMostRecentRunInfo -> taskGeneratorMostRecentRunInfo.addErrorRunMessage(successRunTimestamp,
+                errors.toString()));
         // before the first task schedule, the follow gauge metric will be empty
         // TODO: find a better way to report task generation information
         _controllerMetrics.setOrUpdateTableGauge(tableConfig.getTableName(), taskGenerator.getTaskType(),
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
index 861d903d3d4..d2a28604406 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
@@ -36,6 +36,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
+import org.apache.commons.lang.StringUtils;
 import org.apache.helix.AccessOption;
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixAdmin;
@@ -166,6 +167,7 @@ public class PinotLLCRealtimeSegmentManager {
   private final Lock[] _idealStateUpdateLocks;
   private final FlushThresholdUpdateManager _flushThresholdUpdateManager;
   private final boolean _isDeepStoreLLCSegmentUploadRetryEnabled;
+  private final int _deepstoreUploadRetryTimeoutMs;
   private final FileUploadDownloadClient _fileUploadDownloadClient;
   private final AtomicInteger _numCompletingSegments = new AtomicInteger(0);
 
@@ -181,7 +183,8 @@ public PinotLLCRealtimeSegmentManager(PinotHelixResourceManager helixResourceMan
     _controllerConf = controllerConf;
     _controllerMetrics = controllerMetrics;
     _metadataEventNotifierFactory =
-        MetadataEventNotifierFactory.loadFactory(controllerConf.subset(METADATA_EVENT_NOTIFIER_PREFIX));
+        MetadataEventNotifierFactory.loadFactory(controllerConf.subset(METADATA_EVENT_NOTIFIER_PREFIX),
+            helixResourceManager);
     _numIdealStateUpdateLocks = controllerConf.getRealtimeSegmentMetadataCommitNumLocks();
     _idealStateUpdateLocks = new Lock[_numIdealStateUpdateLocks];
     for (int i = 0; i < _numIdealStateUpdateLocks; i++) {
@@ -189,6 +192,7 @@ public PinotLLCRealtimeSegmentManager(PinotHelixResourceManager helixResourceMan
     }
     _flushThresholdUpdateManager = new FlushThresholdUpdateManager();
     _isDeepStoreLLCSegmentUploadRetryEnabled = controllerConf.isDeepStoreRetryUploadLLCSegmentEnabled();
+    _deepstoreUploadRetryTimeoutMs = controllerConf.getDeepStoreRetryUploadTimeoutMs();
     _fileUploadDownloadClient = _isDeepStoreLLCSegmentUploadRetryEnabled ? initFileUploadDownloadClient() : null;
   }
 
@@ -479,12 +483,10 @@ public void commitSegmentFile(String realtimeTableName, CommittingSegmentDescrip
       LOGGER.info("No moving needed for segment on peer servers: {}", segmentLocation);
       return;
     }
-    URI segmentFileURI = URIUtils.getUri(segmentLocation);
+
     URI tableDirURI = URIUtils.getUri(_controllerConf.getDataDir(), rawTableName);
-    URI uriToMoveTo = URIUtils.getUri(_controllerConf.getDataDir(), rawTableName, URIUtils.encode(segmentName));
     PinotFS pinotFS = PinotFSFactory.create(tableDirURI.getScheme());
-    Preconditions.checkState(pinotFS.move(segmentFileURI, uriToMoveTo, true),
-        "Failed to move segment file for segment: %s from: %s to: %s", segmentName, segmentLocation, uriToMoveTo);
+    String uriToMoveTo = moveSegmentFile(rawTableName, segmentName, segmentLocation, pinotFS);
 
     // Cleans up tmp segment files under table dir.
     // We only clean up tmp segment files in table level dir, so there's no need to list recursively.
@@ -500,7 +502,7 @@ public void commitSegmentFile(String realtimeTableName, CommittingSegmentDescrip
     } catch (Exception e) {
       LOGGER.warn("Caught exception while deleting temporary segment files for segment: {}", segmentName, e);
     }
-    committingSegmentDescriptor.setSegmentLocation(uriToMoveTo.toString());
+    committingSegmentDescriptor.setSegmentLocation(uriToMoveTo);
   }
 
   /**
@@ -605,6 +607,10 @@ private void commitSegmentMetadataInternal(String realtimeTableName,
 
     // Trigger the metadata event notifier
     _metadataEventNotifierFactory.create().notifyOnSegmentFlush(tableConfig);
+
+    if (StringUtils.isBlank(committingSegmentDescriptor.getSegmentLocation())) {
+      _controllerMetrics.addMeteredTableValue(realtimeTableName, ControllerMeter.SEGMENT_MISSING_DEEP_STORE_LINK, 1);
+    }
   }
 
   /**
@@ -1386,6 +1392,7 @@ public void uploadToDeepStoreIfMissing(TableConfig tableConfig, List<SegmentZKMe
     Preconditions.checkState(!_isStopping, "Segment manager is stopping");
 
     String realtimeTableName = tableConfig.getTableName();
+    String rawTableName = TableNameBuilder.extractRawTableName(realtimeTableName);
 
     // Use this retention value to avoid the data racing between segment upload and retention management.
     RetentionStrategy retentionStrategy = null;
@@ -1398,6 +1405,8 @@ public void uploadToDeepStoreIfMissing(TableConfig tableConfig, List<SegmentZKMe
           retentionMs - MIN_TIME_BEFORE_SEGMENT_EXPIRATION_FOR_FIXING_DEEP_STORE_COPY_MILLIS);
     }
 
+    PinotFS pinotFS = PinotFSFactory.create(URIUtils.getUri(_controllerConf.getDataDir()).getScheme());
+
     // Iterate through LLC segments and upload missing deep store copy by following steps:
     //  1. Ask servers which have online segment replica to upload to deep store.
     //     Servers return deep store download url after successful uploading.
@@ -1432,9 +1441,13 @@ public void uploadToDeepStoreIfMissing(TableConfig tableConfig, List<SegmentZKMe
         // Randomly ask one server to upload
         URI uri = peerSegmentURIs.get(RANDOM.nextInt(peerSegmentURIs.size()));
         String serverUploadRequestUrl = StringUtil.join("/", uri.toString(), "upload");
+        serverUploadRequestUrl =
+            String.format("%s?uploadTimeoutMs=%d", serverUploadRequestUrl, _deepstoreUploadRetryTimeoutMs);
         LOGGER.info("Ask server to upload LLC segment {} to deep store by this path: {}", segmentName,
             serverUploadRequestUrl);
-        String segmentDownloadUrl = _fileUploadDownloadClient.uploadToSegmentStore(serverUploadRequestUrl);
+        String tempSegmentDownloadUrl = _fileUploadDownloadClient.uploadToSegmentStore(serverUploadRequestUrl);
+        String segmentDownloadUrl =
+            moveSegmentFile(rawTableName, segmentName, tempSegmentDownloadUrl, pinotFS);
         LOGGER.info("Updating segment {} download url in ZK to be {}", segmentName, segmentDownloadUrl);
         // Update segment ZK metadata by adding the download URL
         segmentZKMetadata.setDownloadUrl(segmentDownloadUrl);
@@ -1442,6 +1455,8 @@ public void uploadToDeepStoreIfMissing(TableConfig tableConfig, List<SegmentZKMe
         persistSegmentZKMetadata(realtimeTableName, segmentZKMetadata, -1);
         LOGGER.info("Successfully uploaded LLC segment {} to deep store with download url: {}", segmentName,
             segmentDownloadUrl);
+        _controllerMetrics.addMeteredTableValue(realtimeTableName,
+            ControllerMeter.LLC_SEGMENTS_DEEP_STORE_UPLOAD_RETRY_SUCCESS, 1L);
       } catch (Exception e) {
         _controllerMetrics.addMeteredTableValue(realtimeTableName,
             ControllerMeter.LLC_SEGMENTS_DEEP_STORE_UPLOAD_RETRY_ERROR, 1L);
@@ -1549,4 +1564,19 @@ public PauseStatus getPauseStatus(String tableNameWithType) {
     Set<String> consumingSegments = findConsumingSegments(idealState);
     return new PauseStatus(Boolean.parseBoolean(isTablePausedStr), consumingSegments, null);
   }
+
+  @VisibleForTesting
+  String moveSegmentFile(String rawTableName, String segmentName, String segmentLocation, PinotFS pinotFS)
+      throws IOException {
+    URI segmentFileURI = URIUtils.getUri(segmentLocation);
+    URI uriToMoveTo = createSegmentPath(rawTableName, segmentName);
+    Preconditions.checkState(pinotFS.move(segmentFileURI, uriToMoveTo, true),
+        "Failed to move segment file for segment: %s from: %s to: %s", segmentName, segmentLocation, uriToMoveTo);
+    return uriToMoveTo.toString();
+  }
+
+  @VisibleForTesting
+  URI createSegmentPath(String rawTableName, String segmentName) {
+    return URIUtils.getUri(_controllerConf.getDataDir(), rawTableName, URIUtils.encode(segmentName));
+  }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java
index 28ad0646013..7f5f7185a9c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionManager.java
@@ -1170,8 +1170,7 @@ private SegmentCompletionProtocol.Response processCommitWhileHoldingOrPartialCon
      */
     private boolean isWinnerPicked(String preferredInstance, long now, final String stopReason) {
       if ((SegmentCompletionProtocol.REASON_ROW_LIMIT.equals(stopReason)
-          || SegmentCompletionProtocol.REASON_END_OF_PARTITION_GROUP.equals(stopReason)
-          || SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED.equals(stopReason))
+          || SegmentCompletionProtocol.REASON_END_OF_PARTITION_GROUP.equals(stopReason))
           && _commitStateMap.size() == 1) {
         _winner = preferredInstance;
         _winningOffset = _commitStateMap.get(preferredInstance);
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FieldExtractor.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/NoOpTableRebalanceObserver.java
similarity index 63%
rename from pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FieldExtractor.java
rename to pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/NoOpTableRebalanceObserver.java
index c915e570ec7..9bb9179c90e 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FieldExtractor.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/NoOpTableRebalanceObserver.java
@@ -16,28 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.hadoop.io;
+package org.apache.pinot.controller.helix.core.rebalance;
 
-import java.io.IOException;
 import java.util.Map;
-import java.util.Set;
-import org.apache.hadoop.conf.Configuration;
-
 
 /**
- * The FieldExtractor extracts fields from the records.
- * @param <T> Type of the record
+ * Default No-op TableRebalanceObserver.
  */
-public interface FieldExtractor<T> {
+public class NoOpTableRebalanceObserver implements TableRebalanceObserver {
+  @Override
+  public void onTrigger(TableRebalanceObserver.Trigger trigger, Map<String, Map<String, String>> initialState,
+      Map<String, Map<String, String>> targetState) {
+  }
 
-  /**
-   * Initializes the FieldExtractor.
-   */
-  void init(Configuration conf, Set<String> fields);
+  @Override
+  public void onSuccess(String msg) {
+  }
 
-  /**
-   * Extracts the fields from the given record.
-   */
-  Map<String, Object> extractFields(T record)
-      throws IOException;
+  @Override
+  public void onError(String errorMsg) {
+  }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java
index a2d6d630d02..c76d06fcaf3 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/RebalanceResult.java
@@ -29,22 +29,33 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RebalanceResult {
+  private final String _jobId;
   private final Status _status;
   private final Map<InstancePartitionsType, InstancePartitions> _instanceAssignment;
+  private final Map<String, InstancePartitions> _tierInstanceAssignment;
   private final Map<String, Map<String, String>> _segmentAssignment;
   private final String _description;
 
   @JsonCreator
-  public RebalanceResult(@JsonProperty(value = "status", required = true) Status status,
+  public RebalanceResult(@JsonProperty(value = "jobId", required = true) String jobId,
+      @JsonProperty(value = "status", required = true) Status status,
       @JsonProperty(value = "description", required = true) String description,
       @JsonProperty("instanceAssignment") @Nullable Map<InstancePartitionsType, InstancePartitions> instanceAssignment,
+      @JsonProperty("tierInstanceAssignment") @Nullable Map<String, InstancePartitions> tierInstanceAssignment,
       @JsonProperty("segmentAssignment") @Nullable Map<String, Map<String, String>> segmentAssignment) {
+    _jobId = jobId;
     _status = status;
     _description = description;
     _instanceAssignment = instanceAssignment;
+    _tierInstanceAssignment = tierInstanceAssignment;
     _segmentAssignment = segmentAssignment;
   }
 
+  @JsonProperty
+  public String getJobId() {
+    return _jobId;
+  }
+
   @JsonProperty
   public Status getStatus() {
     return _status;
@@ -60,6 +71,11 @@ public Map<InstancePartitionsType, InstancePartitions> getInstanceAssignment() {
     return _instanceAssignment;
   }
 
+  @JsonProperty
+  public Map<String, InstancePartitions> getTierInstanceAssignment() {
+    return _tierInstanceAssignment;
+  }
+
   @JsonProperty
   public Map<String, Map<String, String>> getSegmentAssignment() {
     return _segmentAssignment;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalanceObserver.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalanceObserver.java
new file mode 100644
index 00000000000..d52dce1f6e6
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalanceObserver.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.controller.helix.core.rebalance;
+
+import java.util.Map;
+
+
+/**
+ * The <code>TableRebalanceObserver</code> interface provides callbacks to take actions
+ * during critical triggers. The 3 main triggers during a rebalance operation are show below.
+ * For example, we can track stats + status of rebalance during these triggers.
+ */
+
+public interface TableRebalanceObserver {
+  enum Trigger {
+    // Start of rebalance Trigger
+    START_TRIGGER,
+    // Waiting for external view to converge towards ideal state
+    EXTERNAL_VIEW_TO_IDEAL_STATE_CONVERGENCE_TRIGGER,
+    // Ideal state changes due to external events and new target for rebalance is computed
+    IDEAL_STATE_CHANGE_TRIGGER,
+  }
+
+  void onTrigger(Trigger trigger, Map<String, Map<String, String>> currentState,
+      Map<String, Map<String, String>> targetState);
+
+  void onSuccess(String msg);
+
+  void onError(String errorMsg);
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalanceProgressStats.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalanceProgressStats.java
new file mode 100644
index 00000000000..6d6f70b5c76
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalanceProgressStats.java
@@ -0,0 +1,130 @@
+/**
+ * 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.pinot.controller.helix.core.rebalance;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * These are rebalance stats as to how the current state is, when compared to the target state.
+ * Eg: If the current has 4 segments whose replicas (16) don't match the target state, _segmentsToRebalance
+ * is 4 and _replicasToRebalance is 16.
+ */
+public class TableRebalanceProgressStats {
+  public static class RebalanceStateStats {
+    public int _segmentsMissing;
+    public int _segmentsToRebalance;
+    public double _percentSegmentsToRebalance;
+    public int _replicasToRebalance;
+
+    RebalanceStateStats() {
+      _segmentsMissing = 0;
+      _segmentsToRebalance = 0;
+      _replicasToRebalance = 0;
+      _percentSegmentsToRebalance = 0.0;
+    }
+  }
+
+  // Done/In_progress/Failed
+  private String _status;
+  // When did Rebalance start
+  private long _startTimeMs;
+  // How long did rebalance take
+  private long _timeToFinishInSeconds;
+  // Success/failure message
+  private String _completionStatusMsg;
+  @JsonProperty("initialToTargetStateConvergence")
+  private RebalanceStateStats _initialToTargetStateConvergence;
+  @JsonProperty("currentToTargetConvergence")
+  private RebalanceStateStats _currentToTargetConvergence;
+  @JsonProperty("externalViewToIdealStateConvergence")
+  private RebalanceStateStats _externalViewToIdealStateConvergence;
+
+  public TableRebalanceProgressStats() {
+    _currentToTargetConvergence = new RebalanceStateStats();
+    _externalViewToIdealStateConvergence = new RebalanceStateStats();
+    _initialToTargetStateConvergence = new RebalanceStateStats();
+  }
+
+  public void setStatus(String status) {
+    _status = status;
+  }
+
+  public void setInitialToTargetStateConvergence(RebalanceStateStats initialToTargetStateConvergence) {
+    _initialToTargetStateConvergence = initialToTargetStateConvergence;
+  }
+
+  public void setStartTimeMs(long startTimeMs) {
+    _startTimeMs = startTimeMs;
+  }
+
+  public void setTimeToFinishInSeconds(Long timeToFinishInSeconds) {
+    _timeToFinishInSeconds = timeToFinishInSeconds;
+  }
+
+  public void setExternalViewToIdealStateConvergence(RebalanceStateStats externalViewToIdealStateConvergence) {
+    _externalViewToIdealStateConvergence = externalViewToIdealStateConvergence;
+  }
+
+  public void setCurrentToTargetConvergence(RebalanceStateStats currentToTargetConvergence) {
+    _currentToTargetConvergence = currentToTargetConvergence;
+  }
+
+  public void setCompletionStatusMsg(String completionStatusMsg) {
+    _completionStatusMsg = completionStatusMsg;
+  }
+
+  public String getStatus() {
+    return _status;
+  }
+
+  public String getCompletionStatusMsg() {
+    return _completionStatusMsg;
+  }
+
+  public RebalanceStateStats getInitialToTargetStateConvergence() {
+    return _initialToTargetStateConvergence;
+  }
+
+  public long getStartTimeMs() {
+    return _startTimeMs;
+  }
+
+  public long getTimeToFinishInSeconds() {
+    return _timeToFinishInSeconds;
+  }
+
+  public RebalanceStateStats getExternalViewToIdealStateConvergence() {
+    return _externalViewToIdealStateConvergence;
+  }
+
+  public RebalanceStateStats getCurrentToTargetConvergence() {
+    return _currentToTargetConvergence;
+  }
+
+  public static boolean statsDiffer(RebalanceStateStats base, RebalanceStateStats compare) {
+    if (base._replicasToRebalance != compare._replicasToRebalance
+        || base._segmentsToRebalance != compare._segmentsToRebalance
+        || base._segmentsMissing != compare._segmentsMissing
+        || base._percentSegmentsToRebalance != compare._percentSegmentsToRebalance) {
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java
index 4a1bc13b52c..88700e427b2 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancer.java
@@ -28,6 +28,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 import java.util.function.ToIntFunction;
 import javax.annotation.Nullable;
@@ -59,12 +60,12 @@
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.TierConfig;
+import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
 import org.apache.pinot.spi.stream.StreamConfig;
 import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
 import org.apache.pinot.spi.utils.IngestionConfigUtils;
 import org.apache.pinot.spi.utils.RebalanceConfigConstants;
-import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -115,15 +116,35 @@ public class TableRebalancer {
   private static final Logger LOGGER = LoggerFactory.getLogger(TableRebalancer.class);
   private final HelixManager _helixManager;
   private final HelixDataAccessor _helixDataAccessor;
+  private final TableRebalanceObserver _tableRebalanceObserver;
 
-  public TableRebalancer(HelixManager helixManager) {
+  public TableRebalancer(HelixManager helixManager, @Nullable TableRebalanceObserver tableRebalanceObserver) {
     _helixManager = helixManager;
+    if (tableRebalanceObserver != null) {
+      _tableRebalanceObserver = tableRebalanceObserver;
+    } else {
+      _tableRebalanceObserver = new NoOpTableRebalanceObserver();
+    }
     _helixDataAccessor = helixManager.getHelixDataAccessor();
   }
 
+  public TableRebalancer(HelixManager helixManager) {
+    this(helixManager, null);
+  }
+
+  public static String createUniqueRebalanceJobIdentifier() {
+    return UUID.randomUUID().toString();
+  }
+
   public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanceConfig) {
     long startTimeMs = System.currentTimeMillis();
     String tableNameWithType = tableConfig.getTableName();
+    String rebalanceJobId = rebalanceConfig.getString(RebalanceConfigConstants.JOB_ID);
+    if (rebalanceJobId == null) {
+      // If not passed along, create one.
+      // TODO - Add rebalanceJobId to all log messages for easy tracking.
+      rebalanceJobId = createUniqueRebalanceJobIdentifier();
+    }
 
     boolean dryRun =
         rebalanceConfig.getBoolean(RebalanceConfigConstants.DRY_RUN, RebalanceConfigConstants.DEFAULT_DRY_RUN);
@@ -152,25 +173,26 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
     LOGGER.info(
         "Start rebalancing table: {} with dryRun: {}, reassignInstances: {}, includeConsuming: {}, bootstrap: {}, "
             + "downtime: {}, minReplicasToKeepUpForNoDowntime: {}, enableStrictReplicaGroup: {}, bestEfforts: {}, "
-            + "externalViewCheckIntervalInMs: {}, externalViewStabilizationTimeoutInMs: {}",
-        tableNameWithType, dryRun, reassignInstances, includeConsuming, bootstrap, downtime,
-        minReplicasToKeepUpForNoDowntime, enableStrictReplicaGroup, bestEfforts, externalViewCheckIntervalInMs,
-        externalViewStabilizationTimeoutInMs);
+            + "externalViewCheckIntervalInMs: {}, externalViewStabilizationTimeoutInMs: {}", tableNameWithType, dryRun,
+        reassignInstances, includeConsuming, bootstrap, downtime, minReplicasToKeepUpForNoDowntime,
+        enableStrictReplicaGroup, bestEfforts, externalViewCheckIntervalInMs, externalViewStabilizationTimeoutInMs);
 
     // Validate table config
     try {
       // Do not allow rebalancing HLC real-time table
       if (tableConfig.getTableType() == TableType.REALTIME && new StreamConfig(tableNameWithType,
           IngestionConfigUtils.getStreamConfigMap(tableConfig)).hasHighLevelConsumerType()) {
-        LOGGER.warn("Cannot rebalance table: {} with high-level consumer, aborting the rebalance", tableNameWithType);
-        return new RebalanceResult(RebalanceResult.Status.FAILED, "Cannot rebalance table with high-level consumer",
-            null, null);
+        LOGGER.warn("For rebalanceId: {}, cannot rebalance table: {} with high-level consumer, aborting the rebalance",
+            rebalanceJobId, tableNameWithType);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+            "Cannot rebalance table with high-level consumer", null, null, null);
       }
     } catch (Exception e) {
-      LOGGER.warn("Caught exception while validating table config for table: {}, aborting the rebalance",
-          tableNameWithType, e);
-      return new RebalanceResult(RebalanceResult.Status.FAILED, "Caught exception while validating table config: " + e,
-          null, null);
+      LOGGER.warn(
+          "For rebalanceId: {}, caught exception while validating table config for table: {}, aborting the rebalance",
+          rebalanceJobId, tableNameWithType, e);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+          "Caught exception while validating table config: " + e, null, null, null);
     }
 
     // Fetch ideal state
@@ -179,42 +201,62 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
     try {
       currentIdealState = _helixDataAccessor.getProperty(idealStatePropertyKey);
     } catch (Exception e) {
-      LOGGER.warn("Caught exception while fetching IdealState for table: {}, aborting the rebalance", tableNameWithType,
-          e);
-      return new RebalanceResult(RebalanceResult.Status.FAILED, "Caught exception while fetching IdealState: " + e,
-          null, null);
+      LOGGER.warn(
+          "For rebalanceId: {}, caught exception while fetching IdealState for table: {}, aborting the rebalance",
+          rebalanceJobId, tableNameWithType, e);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+          "Caught exception while fetching IdealState: " + e, null, null, null);
     }
     if (currentIdealState == null) {
-      LOGGER.warn("Cannot find the IdealState for table: {}, aborting the rebalance", tableNameWithType);
-      return new RebalanceResult(RebalanceResult.Status.FAILED, "Cannot find the IdealState for table", null, null);
+      LOGGER.warn("For rebalanceId: {}, cannot find the IdealState for table: {}, aborting the rebalance",
+          rebalanceJobId, tableNameWithType);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED, "Cannot find the IdealState for table",
+          null, null, null);
     }
     if (!currentIdealState.isEnabled() && !downtime) {
-      LOGGER.warn("Cannot rebalance disabled table: {} without downtime, aborting the rebalance", tableNameWithType);
-      return new RebalanceResult(RebalanceResult.Status.FAILED, "Cannot rebalance disabled table without downtime",
-          null, null);
+      LOGGER.warn("For rebalanceId: {}, cannot rebalance disabled table: {} without downtime, aborting the rebalance",
+          rebalanceJobId, tableNameWithType);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+          "Cannot rebalance disabled table without downtime", null, null, null);
     }
 
-    LOGGER.info("Fetching/computing instance partitions, reassigning instances if configured for table: {}",
-        tableNameWithType);
+    LOGGER.info("For rebalanceId: {}, processing instance partitions for table: {}", rebalanceJobId, tableNameWithType);
 
     // Calculate instance partitions map
     Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap;
+    boolean instancePartitionsUnchanged;
     try {
-      instancePartitionsMap = getInstancePartitionsMap(tableConfig, reassignInstances, dryRun);
+      Pair<Map<InstancePartitionsType, InstancePartitions>, Boolean> instancePartitionsMapAndUnchanged =
+          getInstancePartitionsMap(tableConfig, reassignInstances, bootstrap, dryRun);
+      instancePartitionsMap = instancePartitionsMapAndUnchanged.getLeft();
+      instancePartitionsUnchanged = instancePartitionsMapAndUnchanged.getRight();
     } catch (Exception e) {
-      LOGGER.warn(
-          "Caught exception while fetching/calculating instance partitions for table: {}, aborting the rebalance",
-          tableNameWithType, e);
-      return new RebalanceResult(RebalanceResult.Status.FAILED,
-          "Caught exception while fetching/calculating instance partitions: " + e, null, null);
+      LOGGER.warn("For rebalanceId: {}, caught exception while fetching/calculating instance partitions for table: {}, "
+          + "aborting the rebalance", rebalanceJobId, tableNameWithType, e);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+          "Caught exception while fetching/calculating instance partitions: " + e, null, null, null);
     }
 
     // Calculate instance partitions for tiers if configured
-    List<Tier> sortedTiers = getSortedTiers(tableConfig);
-    Map<String, InstancePartitions> tierToInstancePartitionsMap =
-        getTierToInstancePartitionsMap(tableNameWithType, sortedTiers);
+    List<Tier> sortedTiers;
+    Map<String, InstancePartitions> tierToInstancePartitionsMap;
+    boolean tierInstancePartitionsUnchanged;
+    try {
+      sortedTiers = getSortedTiers(tableConfig);
+      Pair<Map<String, InstancePartitions>, Boolean> tierToInstancePartitionsMapAndUnchanged =
+          getTierToInstancePartitionsMap(tableConfig, sortedTiers, reassignInstances, bootstrap, dryRun);
+      tierToInstancePartitionsMap = tierToInstancePartitionsMapAndUnchanged.getLeft();
+      tierInstancePartitionsUnchanged = tierToInstancePartitionsMapAndUnchanged.getRight();
+    } catch (Exception e) {
+      LOGGER.warn(
+          "For rebalanceId: {}, caught exception while fetching/calculating tier instance partitions for table: {}, "
+              + "aborting the rebalance", rebalanceJobId, tableNameWithType, e);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+          "Caught exception while fetching/calculating tier instance partitions: " + e, null, null, null);
+    }
 
-    LOGGER.info("Calculating the target assignment for table: {}", tableNameWithType);
+    LOGGER.info("For rebalanceId: {}, calculating the target assignment for table: {}", rebalanceJobId,
+        tableNameWithType);
     SegmentAssignment segmentAssignment = SegmentAssignmentFactory.getSegmentAssignment(_helixManager, tableConfig);
     Map<String, Map<String, String>> currentAssignment = currentIdealState.getRecord().getMapFields();
     Map<String, Map<String, String>> targetAssignment;
@@ -222,36 +264,45 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
       targetAssignment = segmentAssignment.rebalanceTable(currentAssignment, instancePartitionsMap, sortedTiers,
           tierToInstancePartitionsMap, rebalanceConfig);
     } catch (Exception e) {
-      LOGGER.warn("Caught exception while calculating target assignment for table: {}, aborting the rebalance",
-          tableNameWithType, e);
-      return new RebalanceResult(RebalanceResult.Status.FAILED,
-          "Caught exception while calculating target assignment: " + e, instancePartitionsMap, null);
+      LOGGER.warn("For rebalanceId: {}, caught exception while calculating target assignment for table: {}, "
+          + "aborting the rebalance", rebalanceJobId, tableNameWithType, e);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+          "Caught exception while calculating target assignment: " + e, instancePartitionsMap,
+          tierToInstancePartitionsMap, null);
     }
 
-    if (currentAssignment.equals(targetAssignment)) {
+    boolean segmentAssignmentUnchanged = currentAssignment.equals(targetAssignment);
+    LOGGER.info("For rebalanceId: {}, instancePartitionsUnchanged: {}, tierInstancePartitionsUnchanged: {}, "
+            + "segmentAssignmentUnchanged: {} for table: {}", rebalanceJobId, instancePartitionsUnchanged,
+        tierInstancePartitionsUnchanged, segmentAssignmentUnchanged, tableNameWithType);
+
+    if (segmentAssignmentUnchanged) {
       LOGGER.info("Table: {} is already balanced", tableNameWithType);
-      if (reassignInstances) {
+      if (instancePartitionsUnchanged && tierInstancePartitionsUnchanged) {
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.NO_OP, "Table is already balanced",
+            instancePartitionsMap, tierToInstancePartitionsMap, targetAssignment);
+      } else {
         if (dryRun) {
-          return new RebalanceResult(RebalanceResult.Status.DONE,
+          return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.DONE,
               "Instance reassigned in dry-run mode, table is already balanced", instancePartitionsMap,
-              targetAssignment);
+              tierToInstancePartitionsMap, targetAssignment);
         } else {
-          return new RebalanceResult(RebalanceResult.Status.DONE, "Instance reassigned, table is already balanced",
-              instancePartitionsMap, targetAssignment);
+          return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.DONE,
+              "Instance reassigned, table is already balanced", instancePartitionsMap, tierToInstancePartitionsMap,
+              targetAssignment);
         }
-      } else {
-        return new RebalanceResult(RebalanceResult.Status.NO_OP, "Table is already balanced", instancePartitionsMap,
-            targetAssignment);
       }
     }
 
     if (dryRun) {
-      LOGGER.info("Rebalancing table: {} in dry-run mode, returning the target assignment", tableNameWithType);
-      return new RebalanceResult(RebalanceResult.Status.DONE, "Dry-run mode", instancePartitionsMap, targetAssignment);
+      LOGGER.info("For rebalanceId: {}, rebalancing table: {} in dry-run mode, returning the target assignment",
+          rebalanceJobId, tableNameWithType);
+      return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.DONE, "Dry-run mode", instancePartitionsMap,
+          tierToInstancePartitionsMap, targetAssignment);
     }
 
     if (downtime) {
-      LOGGER.info("Rebalancing table: {} with downtime", tableNameWithType);
+      LOGGER.info("For rebalanceId: {}, rebalancing table: {} with downtime", rebalanceJobId, tableNameWithType);
 
       // Reuse current IdealState to update the IdealState in cluster
       ZNRecord idealStateRecord = currentIdealState.getRecord();
@@ -264,19 +315,26 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
         Preconditions.checkState(_helixDataAccessor.getBaseDataAccessor()
             .set(idealStatePropertyKey.getPath(), idealStateRecord, idealStateRecord.getVersion(),
                 AccessOption.PERSISTENT), "Failed to update IdealState");
-        LOGGER.info("Finished rebalancing table: {} with downtime in {}ms.", tableNameWithType,
-            System.currentTimeMillis() - startTimeMs);
-        return new RebalanceResult(RebalanceResult.Status.DONE,
+        LOGGER.info("For rebalanceId: {}, finished rebalancing table: {} with downtime in {}ms.", rebalanceJobId,
+            tableNameWithType, System.currentTimeMillis() - startTimeMs);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.DONE,
             "Success with downtime (replaced IdealState with the target segment assignment, ExternalView might not "
-                + "reach the target segment assignment yet)", instancePartitionsMap, targetAssignment);
+                + "reach the target segment assignment yet)", instancePartitionsMap, tierToInstancePartitionsMap,
+            targetAssignment);
       } catch (Exception e) {
-        LOGGER.warn("Caught exception while updating IdealState for table: {}, aborting the rebalance",
-            tableNameWithType, e);
-        return new RebalanceResult(RebalanceResult.Status.FAILED, "Caught exception while updating IdealState: " + e,
-            instancePartitionsMap, targetAssignment);
+        LOGGER.warn(
+            "For rebalanceId: {}, caught exception while updating IdealState for table: {}, aborting the rebalance",
+            rebalanceJobId, tableNameWithType, e);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+            "Caught exception while updating IdealState: " + e, instancePartitionsMap, tierToInstancePartitionsMap,
+            targetAssignment);
       }
     }
 
+    // Record the beginning of rebalance
+    _tableRebalanceObserver.onTrigger(TableRebalanceObserver.Trigger.START_TRIGGER, currentAssignment,
+        targetAssignment);
+
     // Calculate the min available replicas for no-downtime rebalance
     // NOTE: The calculation is based on the number of replicas of the target assignment. In case of increasing the
     //       number of replicas for the current assignment, the current instance state map might not have enough
@@ -291,12 +349,15 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
     if (minReplicasToKeepUpForNoDowntime >= 0) {
       // For non-negative value, use it as min available replicas
       if (minReplicasToKeepUpForNoDowntime >= numReplicas) {
-        LOGGER.warn(
-            "Illegal config for minReplicasToKeepUpForNoDowntime: {} for table: {}, must be less than number of "
-                + "replicas: {}, aborting the rebalance", minReplicasToKeepUpForNoDowntime, tableNameWithType,
-            numReplicas);
-        return new RebalanceResult(RebalanceResult.Status.FAILED, "Illegal min available replicas config",
-            instancePartitionsMap, targetAssignment);
+        String errorMsg = String.format(
+            "For rebalanceId: %s, Illegal config for minReplicasToKeepUpForNoDowntime: %d for table: %s, "
+                + "must be less than number of replicas: %d, aborting the rebalance", rebalanceJobId,
+            minReplicasToKeepUpForNoDowntime, tableNameWithType, numReplicas);
+        LOGGER.warn(errorMsg);
+        _tableRebalanceObserver.onError(errorMsg);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+            "Illegal min available replicas config", instancePartitionsMap, tierToInstancePartitionsMap,
+            targetAssignment);
       }
       minAvailableReplicas = minReplicasToKeepUpForNoDowntime;
     } else {
@@ -304,11 +365,13 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
       minAvailableReplicas = Math.max(numReplicas + minReplicasToKeepUpForNoDowntime, 0);
     }
 
-    LOGGER.info("Rebalancing table: {} with minAvailableReplicas: {}, enableStrictReplicaGroup: {}, bestEfforts: {}, "
-            + "externalViewCheckIntervalInMs: {}, externalViewStabilizationTimeoutInMs: {}", tableNameWithType,
-        minAvailableReplicas, enableStrictReplicaGroup, bestEfforts, externalViewCheckIntervalInMs,
-        externalViewStabilizationTimeoutInMs);
+    LOGGER.info(
+        "For rebalanceId: {}, rebalancing table: {} with minAvailableReplicas: {}, enableStrictReplicaGroup: {}, "
+            + "bestEfforts: {}, externalViewCheckIntervalInMs: {}, externalViewStabilizationTimeoutInMs: {}",
+        rebalanceJobId, tableNameWithType, minAvailableReplicas, enableStrictReplicaGroup, bestEfforts,
+        externalViewCheckIntervalInMs, externalViewStabilizationTimeoutInMs);
     int expectedVersion = currentIdealState.getRecord().getVersion();
+
     while (true) {
       // Wait for ExternalView to converge before updating the next IdealState
       Set<String> segmentsToMove = SegmentAssignmentUtils.getSegmentsToMove(currentAssignment, targetAssignment);
@@ -318,19 +381,22 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
             waitForExternalViewToConverge(tableNameWithType, bestEfforts, segmentsToMove, externalViewCheckIntervalInMs,
                 externalViewStabilizationTimeoutInMs);
       } catch (Exception e) {
-        LOGGER.warn("Caught exception while waiting for ExternalView to converge for table: {}, aborting the rebalance",
-            tableNameWithType, e);
-        return new RebalanceResult(RebalanceResult.Status.FAILED,
+        String errorMsg = String.format(
+            "For rebalanceId: %s, caught exception while waiting for ExternalView to converge for table: %s, "
+                + "aborting the rebalance", rebalanceJobId, tableNameWithType);
+        LOGGER.warn(errorMsg, e);
+        _tableRebalanceObserver.onError(errorMsg);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
             "Caught exception while waiting for ExternalView to converge: " + e, instancePartitionsMap,
-            targetAssignment);
+            tierToInstancePartitionsMap, targetAssignment);
       }
 
       // Re-calculate the target assignment if IdealState changed while waiting for ExternalView to converge
       ZNRecord idealStateRecord = idealState.getRecord();
       if (idealStateRecord.getVersion() != expectedVersion) {
         LOGGER.info(
-            "IdealState version changed while waiting for ExternalView to converge for table: {}, re-calculating the "
-                + "target assignment", tableNameWithType);
+            "For rebalanceId: {}, idealState version changed while waiting for ExternalView to converge for table: {}, "
+                + "re-calculating the target assignment", rebalanceJobId, tableNameWithType);
         Map<String, Map<String, String>> oldAssignment = currentAssignment;
         currentAssignment = idealStateRecord.getMapFields();
         expectedVersion = idealStateRecord.getVersion();
@@ -343,9 +409,9 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
           Map<String, String> currentInstanceStateMap = currentAssignment.get(segment);
           if (!oldInstanceStateMap.equals(currentInstanceStateMap)) {
             LOGGER.info(
-                "Segment state changed in IdealState from: {} to: {} for table: {}, segment: {}, re-calculating the "
-                    + "target assignment based on the new IdealState", oldInstanceStateMap, currentInstanceStateMap,
-                tableNameWithType, segment);
+                "For rebalanceId: {}, segment state changed in IdealState from: {} to: {} for table: {}, segment: {}, "
+                    + "re-calculating the target assignment based on the new IdealState", rebalanceJobId,
+                oldInstanceStateMap, currentInstanceStateMap, tableNameWithType, segment);
             segmentsToMoveChanged = true;
             break;
           }
@@ -353,22 +419,27 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
         if (segmentsToMoveChanged) {
           try {
             // Re-calculate the instance partitions in case the instance configs changed during the rebalance
-            instancePartitionsMap = getInstancePartitionsMap(tableConfig, reassignInstances, false);
-            tierToInstancePartitionsMap = getTierToInstancePartitionsMap(tableNameWithType, sortedTiers);
+            instancePartitionsMap =
+                getInstancePartitionsMap(tableConfig, reassignInstances, bootstrap, false).getLeft();
+            tierToInstancePartitionsMap =
+                getTierToInstancePartitionsMap(tableConfig, sortedTiers, reassignInstances, bootstrap,
+                    dryRun).getLeft();
             targetAssignment = segmentAssignment.rebalanceTable(currentAssignment, instancePartitionsMap, sortedTiers,
                 tierToInstancePartitionsMap, rebalanceConfig);
           } catch (Exception e) {
-            LOGGER.warn(
-                "Caught exception while re-calculating the target assignment for table: {}, aborting the rebalance",
-                tableNameWithType, e);
-            return new RebalanceResult(RebalanceResult.Status.FAILED,
+            String errorMsg = String.format(
+                "For rebalanceId: %s, caught exception while re-calculating the target assignment for table: %s, "
+                    + "aborting the rebalance", rebalanceJobId, tableNameWithType);
+            LOGGER.warn(errorMsg, e);
+            _tableRebalanceObserver.onError(errorMsg);
+            return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
                 "Caught exception while re-calculating the target assignment: " + e, instancePartitionsMap,
-                targetAssignment);
+                tierToInstancePartitionsMap, targetAssignment);
           }
         } else {
-          LOGGER.info(
-              "No state change found for segments to be moved, re-calculating the target assignment based on the "
-                  + "previous target assignment for table: {}", tableNameWithType);
+          LOGGER.info("For rebalanceId:{}, no state change found for segments to be moved, "
+                  + "re-calculating the target assignment based on the previous target assignment for table: {}",
+              rebalanceJobId, tableNameWithType);
           Map<String, Map<String, String>> oldTargetAssignment = targetAssignment;
           targetAssignment = new HashMap<>(currentAssignment);
           for (String segment : segmentsToMove) {
@@ -378,20 +449,25 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
       }
 
       if (currentAssignment.equals(targetAssignment)) {
-        LOGGER.info(
-            "Finished rebalancing table: {} with minAvailableReplicas: {}, enableStrictReplicaGroup: {}, bestEfforts:"
-                + " {} in {}ms.", tableNameWithType, minAvailableReplicas, enableStrictReplicaGroup, bestEfforts,
-            System.currentTimeMillis() - startTimeMs);
-        return new RebalanceResult(RebalanceResult.Status.DONE,
+        String msg = String.format("For rebalanceId: %s, finished rebalancing table: %s with minAvailableReplicas: %d, "
+                + "enableStrictReplicaGroup: %b, bestEfforts: %b in %d ms.", rebalanceJobId, tableNameWithType,
+            minAvailableReplicas, enableStrictReplicaGroup, bestEfforts, System.currentTimeMillis() - startTimeMs);
+        LOGGER.info(msg);
+        // Record completion
+        _tableRebalanceObserver.onSuccess(msg);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.DONE,
             "Success with minAvailableReplicas: " + minAvailableReplicas
                 + " (both IdealState and ExternalView should reach the target segment assignment)",
-            instancePartitionsMap, targetAssignment);
+            instancePartitionsMap, tierToInstancePartitionsMap, targetAssignment);
       }
 
+      // Record change of current ideal state and the new target
+      _tableRebalanceObserver.onTrigger(TableRebalanceObserver.Trigger.IDEAL_STATE_CHANGE_TRIGGER, currentAssignment,
+          targetAssignment);
       Map<String, Map<String, String>> nextAssignment =
           getNextAssignment(currentAssignment, targetAssignment, minAvailableReplicas, enableStrictReplicaGroup);
-      LOGGER.info("Got the next assignment for table: {} with number of segments to be moved to each instance: {}",
-          tableNameWithType,
+      LOGGER.info("For rebalanceId: {}, got the next assignment for table: {} with number of segments to be moved to "
+              + "each instance: {}", rebalanceJobId, tableNameWithType,
           SegmentAssignmentUtils.getNumSegmentsToBeMovedPerInstance(currentAssignment, nextAssignment));
 
       // Reuse current IdealState to update the IdealState in cluster
@@ -406,34 +482,50 @@ public RebalanceResult rebalance(TableConfig tableConfig, Configuration rebalanc
             "Failed to update IdealState");
         currentAssignment = nextAssignment;
         expectedVersion++;
-        LOGGER.info("Successfully updated the IdealState for table: {}", tableNameWithType);
+        LOGGER.info("For rebalanceId: {}, successfully updated the IdealState for table: {}", rebalanceJobId,
+            tableNameWithType);
       } catch (ZkBadVersionException e) {
-        LOGGER.info("Version changed while updating IdealState for table: {}", tableNameWithType);
+        LOGGER.info("For rebalanceId: {}, version changed while updating IdealState for table: {}", rebalanceJobId,
+            tableNameWithType);
       } catch (Exception e) {
-        LOGGER.warn("Caught exception while updating IdealState for table: {}, aborting the rebalance",
-            tableNameWithType, e);
-        return new RebalanceResult(RebalanceResult.Status.FAILED, "Caught exception while updating IdealState: " + e,
-            instancePartitionsMap, targetAssignment);
+        String errorMsg = String.format(
+            "For rebalanceId: %s, caught exception while updating IdealState for table: %s, "
+                + "aborting the rebalance", rebalanceJobId, tableNameWithType);
+        LOGGER.warn(errorMsg, e);
+        _tableRebalanceObserver.onError(errorMsg);
+        return new RebalanceResult(rebalanceJobId, RebalanceResult.Status.FAILED,
+            "Caught exception while updating IdealState: " + e, instancePartitionsMap, tierToInstancePartitionsMap,
+            targetAssignment);
       }
     }
   }
 
-  private Map<InstancePartitionsType, InstancePartitions> getInstancePartitionsMap(TableConfig tableConfig,
-      boolean reassignInstances, boolean dryRun) {
+  /**
+   * Gets the instance partitions for instance partition types and also returns a boolean for whether they are unchanged
+   */
+  private Pair<Map<InstancePartitionsType, InstancePartitions>, Boolean> getInstancePartitionsMap(
+      TableConfig tableConfig, boolean reassignInstances, boolean bootstrap, boolean dryRun) {
+    boolean instancePartitionsUnchanged;
     Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap = new TreeMap<>();
     if (tableConfig.getTableType() == TableType.OFFLINE) {
-      instancePartitionsMap.put(InstancePartitionsType.OFFLINE,
-          getInstancePartitions(tableConfig, InstancePartitionsType.OFFLINE, reassignInstances, dryRun));
+      Pair<InstancePartitions, Boolean> partitionAndUnchangedForOffline =
+          getInstancePartitions(tableConfig, InstancePartitionsType.OFFLINE, reassignInstances, bootstrap, dryRun);
+      instancePartitionsMap.put(InstancePartitionsType.OFFLINE, partitionAndUnchangedForOffline.getLeft());
+      instancePartitionsUnchanged = partitionAndUnchangedForOffline.getRight();
     } else {
-      instancePartitionsMap.put(InstancePartitionsType.CONSUMING,
-          getInstancePartitions(tableConfig, InstancePartitionsType.CONSUMING, reassignInstances, dryRun));
+      Pair<InstancePartitions, Boolean> partitionAndUnchangedForConsuming =
+          getInstancePartitions(tableConfig, InstancePartitionsType.CONSUMING, reassignInstances, bootstrap, dryRun);
+      instancePartitionsMap.put(InstancePartitionsType.CONSUMING, partitionAndUnchangedForConsuming.getLeft());
+      instancePartitionsUnchanged = partitionAndUnchangedForConsuming.getRight();
       String tableNameWithType = tableConfig.getTableName();
       if (InstanceAssignmentConfigUtils.shouldRelocateCompletedSegments(tableConfig)) {
+        Pair<InstancePartitions, Boolean> partitionAndUnchangedForCompleted =
+            getInstancePartitions(tableConfig, InstancePartitionsType.COMPLETED, reassignInstances, bootstrap, dryRun);
         LOGGER.info(
             "COMPLETED segments should be relocated, fetching/computing COMPLETED instance partitions for table: {}",
             tableNameWithType);
-        instancePartitionsMap.put(InstancePartitionsType.COMPLETED,
-            getInstancePartitions(tableConfig, InstancePartitionsType.COMPLETED, reassignInstances, dryRun));
+        instancePartitionsMap.put(InstancePartitionsType.COMPLETED, partitionAndUnchangedForCompleted.getLeft());
+        instancePartitionsUnchanged &= partitionAndUnchangedForCompleted.getRight();
       } else {
         LOGGER.info(
             "COMPLETED segments should not be relocated, skipping fetching/computing COMPLETED instance partitions "
@@ -447,65 +539,70 @@ private Map<InstancePartitionsType, InstancePartitions> getInstancePartitionsMap
         }
       }
     }
-    return instancePartitionsMap;
+    return Pair.of(instancePartitionsMap, instancePartitionsUnchanged);
   }
 
-  private InstancePartitions getInstancePartitions(TableConfig tableConfig,
-      InstancePartitionsType instancePartitionsType, boolean reassignInstances, boolean dryRun) {
+  /**
+   * Fetches/computes the instance partitions and also returns a boolean for whether they are unchanged
+   */
+  private Pair<InstancePartitions, Boolean> getInstancePartitions(TableConfig tableConfig,
+      InstancePartitionsType instancePartitionsType, boolean reassignInstances, boolean bootstrap, boolean dryRun) {
     String tableNameWithType = tableConfig.getTableName();
-    if (InstanceAssignmentConfigUtils.allowInstanceAssignment(tableConfig, instancePartitionsType)) {
-      if (reassignInstances) {
-        String rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
-        boolean hasPreConfiguredInstancePartitions = TableConfigUtils.hasPreConfiguredInstancePartitions(tableConfig,
-            instancePartitionsType);
+    String instancePartitionsName =
+        InstancePartitionsUtils.getInstancePartitionsName(tableNameWithType, instancePartitionsType.toString());
+    InstancePartitions existingInstancePartitions =
+        InstancePartitionsUtils.fetchInstancePartitions(_helixManager.getHelixPropertyStore(), instancePartitionsName);
+
+    if (reassignInstances) {
+      if (InstanceAssignmentConfigUtils.allowInstanceAssignment(tableConfig, instancePartitionsType)) {
+        boolean hasPreConfiguredInstancePartitions =
+            TableConfigUtils.hasPreConfiguredInstancePartitions(tableConfig, instancePartitionsType);
         if (hasPreConfiguredInstancePartitions) {
           String referenceInstancePartitionsName = tableConfig.getInstancePartitionsMap().get(instancePartitionsType);
-          InstancePartitions instancePartitions = InstancePartitionsUtils.fetchInstancePartitionsWithRename(
-              _helixManager.getHelixPropertyStore(), referenceInstancePartitionsName,
-              instancePartitionsType.getInstancePartitionsName(rawTableName));
-          if (!dryRun) {
+          InstancePartitions instancePartitions =
+              InstancePartitionsUtils.fetchInstancePartitionsWithRename(_helixManager.getHelixPropertyStore(),
+                  referenceInstancePartitionsName, instancePartitionsName);
+          boolean instancePartitionsUnchanged = instancePartitions.equals(existingInstancePartitions);
+          if (!dryRun && !instancePartitionsUnchanged) {
             LOGGER.info("Persisting instance partitions: {} (referencing {})", instancePartitions,
                 referenceInstancePartitionsName);
             InstancePartitionsUtils.persistInstancePartitions(_helixManager.getHelixPropertyStore(),
                 instancePartitions);
           }
-          return instancePartitions;
+          return Pair.of(instancePartitions, instancePartitionsUnchanged);
         }
-        InstancePartitions existingInstancePartitions =
-            InstancePartitionsUtils.fetchInstancePartitions(_helixManager.getHelixPropertyStore(),
-                InstancePartitionsUtils.getInstancePartitionsName(tableNameWithType,
-                    instancePartitionsType.toString()));
         LOGGER.info("Reassigning {} instances for table: {}", instancePartitionsType, tableNameWithType);
         InstanceAssignmentDriver instanceAssignmentDriver = new InstanceAssignmentDriver(tableConfig);
+        // Assign instances with existing instance partition to null if bootstrap mode is enabled, so that the instance
+        // partition map can be fully recalculated.
         InstancePartitions instancePartitions = instanceAssignmentDriver.assignInstances(instancePartitionsType,
             _helixDataAccessor.getChildValues(_helixDataAccessor.keyBuilder().instanceConfigs(), true),
-            existingInstancePartitions);
-        if (!dryRun) {
+            bootstrap ? null : existingInstancePartitions);
+        boolean instancePartitionsUnchanged = instancePartitions.equals(existingInstancePartitions);
+        if (!dryRun && !instancePartitionsUnchanged) {
           LOGGER.info("Persisting instance partitions: {} to ZK", instancePartitions);
           InstancePartitionsUtils.persistInstancePartitions(_helixManager.getHelixPropertyStore(), instancePartitions);
         }
-        return instancePartitions;
+        return Pair.of(instancePartitions, instancePartitionsUnchanged);
       } else {
-        LOGGER.info("Fetching/computing {} instance partitions for table: {}", instancePartitionsType,
-            tableNameWithType);
-        return InstancePartitionsUtils.fetchOrComputeInstancePartitions(_helixManager, tableConfig,
-            instancePartitionsType);
-      }
-    } else {
-      LOGGER.info("{} instance assignment is not allowed, using default instance partitions for table: {}",
-          instancePartitionsType, tableNameWithType);
-      if (reassignInstances) {
-        LOGGER.warn("Cannot reassign {} instances (instance assignment is not allowed) for table: {}",
+        LOGGER.info("{} instance assignment is not allowed, using default instance partitions for table: {}",
             instancePartitionsType, tableNameWithType);
+        InstancePartitions instancePartitions =
+            InstancePartitionsUtils.computeDefaultInstancePartitions(_helixManager, tableConfig,
+                instancePartitionsType);
+        boolean noExistingInstancePartitions = existingInstancePartitions == null;
+        if (!dryRun && !noExistingInstancePartitions) {
+          LOGGER.info("Removing instance partitions: {} from ZK", instancePartitionsName);
+          InstancePartitionsUtils.removeInstancePartitions(_helixManager.getHelixPropertyStore(),
+              instancePartitionsName);
+        }
+        return Pair.of(instancePartitions, noExistingInstancePartitions);
       }
-      InstancePartitions instancePartitions =
-          InstancePartitionsUtils.computeDefaultInstancePartitions(_helixManager, tableConfig, instancePartitionsType);
-      if (!dryRun) {
-        String instancePartitionsName = instancePartitions.getInstancePartitionsName();
-        LOGGER.info("Removing instance partitions: {} from ZK if it exists", instancePartitionsName);
-        InstancePartitionsUtils.removeInstancePartitions(_helixManager.getHelixPropertyStore(), instancePartitionsName);
-      }
-      return instancePartitions;
+    } else {
+      LOGGER.info("Fetching/computing {} instance partitions for table: {}", instancePartitionsType, tableNameWithType);
+      return Pair.of(
+          InstancePartitionsUtils.fetchOrComputeInstancePartitions(_helixManager, tableConfig, instancePartitionsType),
+          true);
     }
   }
 
@@ -522,32 +619,86 @@ private List<Tier> getSortedTiers(TableConfig tableConfig) {
     }
   }
 
-  @Nullable
-  private Map<String, InstancePartitions> getTierToInstancePartitionsMap(String tableNameWithType,
-      @Nullable List<Tier> sortedTiers) {
+  /**
+   * Fetches/computes the instance partitions for sorted tiers and also returns a boolean for whether the
+   * instance partitions are unchanged.
+   */
+  private Pair<Map<String, InstancePartitions>, Boolean> getTierToInstancePartitionsMap(TableConfig tableConfig,
+      @Nullable List<Tier> sortedTiers, boolean reassignInstances, boolean bootstrap, boolean dryRun) {
     if (sortedTiers == null) {
-      return null;
+      return Pair.of(null, true);
     }
+    boolean instancePartitionsUnchanged = true;
     Map<String, InstancePartitions> tierToInstancePartitionsMap = new HashMap<>();
     for (Tier tier : sortedTiers) {
       LOGGER.info("Fetching/computing instance partitions for tier: {} of table: {}", tier.getName(),
-          tableNameWithType);
-      tierToInstancePartitionsMap.put(tier.getName(), getInstancePartitionsForTier(tier, tableNameWithType));
+          tableConfig.getTableName());
+      Pair<InstancePartitions, Boolean> partitionsAndUnchanged =
+          getInstancePartitionsForTier(tableConfig, tier, reassignInstances, bootstrap, dryRun);
+      tierToInstancePartitionsMap.put(tier.getName(), partitionsAndUnchanged.getLeft());
+      instancePartitionsUnchanged = instancePartitionsUnchanged && partitionsAndUnchanged.getRight();
     }
-    return tierToInstancePartitionsMap;
+    return Pair.of(tierToInstancePartitionsMap, instancePartitionsUnchanged);
   }
 
   /**
-   * Creates a default instance assignment for the tier.
-   * TODO: We only support default server-tag based assignment currently.
-   *  In next iteration, we will add InstanceAssignmentConfig to the TierConfig and also support persisting of the
-   *  InstancePartitions to zk.
-   *  Then we'll be able to support replica group assignment while creating InstancePartitions for tiers
+   * Computes the instance partitions for the given tier. If table's instanceAssignmentConfigMap has an entry for the
+   * tier, it's used to calculate the instance partitions. Else default instance partitions are returned. Also returns
+   * a boolean for whether the instance partition is unchanged.
    */
-  private InstancePartitions getInstancePartitionsForTier(Tier tier, String tableNameWithType) {
-    PinotServerTierStorage storage = (PinotServerTierStorage) tier.getStorage();
-    return InstancePartitionsUtils.computeDefaultInstancePartitionsForTag(_helixManager, tableNameWithType,
-        tier.getName(), storage.getServerTag());
+  private Pair<InstancePartitions, Boolean> getInstancePartitionsForTier(TableConfig tableConfig, Tier tier,
+      boolean reassignInstances, boolean bootstrap, boolean dryRun) {
+    String tableNameWithType = tableConfig.getTableName();
+    String tierName = tier.getName();
+    String instancePartitionsName =
+        InstancePartitionsUtils.getInstancePartitionsNameForTier(tableNameWithType, tierName);
+    InstancePartitions existingInstancePartitions =
+        InstancePartitionsUtils.fetchInstancePartitions(_helixManager.getHelixPropertyStore(), instancePartitionsName);
+
+    if (reassignInstances) {
+      Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
+      InstanceAssignmentConfig instanceAssignmentConfig =
+          instanceAssignmentConfigMap != null ? instanceAssignmentConfigMap.get(tierName) : null;
+      if (instanceAssignmentConfig == null) {
+        LOGGER.info(
+            "Instance assignment config for tier: {} does not exist for table: {}, using default instance partitions",
+            tierName, tableNameWithType);
+        PinotServerTierStorage storage = (PinotServerTierStorage) tier.getStorage();
+        InstancePartitions instancePartitions =
+            InstancePartitionsUtils.computeDefaultInstancePartitionsForTag(_helixManager, tableNameWithType, tierName,
+                storage.getServerTag());
+        boolean noExistingInstancePartitions = existingInstancePartitions == null;
+        if (!dryRun && !noExistingInstancePartitions) {
+          LOGGER.info("Removing instance partitions: {} from ZK", instancePartitionsName);
+          InstancePartitionsUtils.removeInstancePartitions(_helixManager.getHelixPropertyStore(),
+              instancePartitionsName);
+        }
+        return Pair.of(instancePartitions, noExistingInstancePartitions);
+      } else {
+        InstanceAssignmentDriver instanceAssignmentDriver = new InstanceAssignmentDriver(tableConfig);
+        // Assign instances with existing instance partition to null if bootstrap mode is enabled, so that the instance
+        // partition map can be fully recalculated.
+        InstancePartitions instancePartitions = instanceAssignmentDriver.assignInstances(tierName,
+            _helixDataAccessor.getChildValues(_helixDataAccessor.keyBuilder().instanceConfigs(), true),
+            bootstrap ? null : existingInstancePartitions, instanceAssignmentConfig);
+        boolean instancePartitionsUnchanged = instancePartitions.equals(existingInstancePartitions);
+        if (!dryRun && !instancePartitionsUnchanged) {
+          LOGGER.info("Persisting instance partitions: {} to ZK", instancePartitions);
+          InstancePartitionsUtils.persistInstancePartitions(_helixManager.getHelixPropertyStore(), instancePartitions);
+        }
+        return Pair.of(instancePartitions, instancePartitionsUnchanged);
+      }
+    } else {
+      if (existingInstancePartitions != null) {
+        return Pair.of(existingInstancePartitions, true);
+      } else {
+        PinotServerTierStorage storage = (PinotServerTierStorage) tier.getStorage();
+        InstancePartitions instancePartitions =
+            InstancePartitionsUtils.computeDefaultInstancePartitionsForTag(_helixManager, tableNameWithType, tierName,
+                storage.getServerTag());
+        return Pair.of(instancePartitions, true);
+      }
+    }
   }
 
   private IdealState waitForExternalViewToConverge(String tableNameWithType, boolean bestEfforts,
@@ -566,6 +717,10 @@ private IdealState waitForExternalViewToConverge(String tableNameWithType, boole
           _helixDataAccessor.getProperty(_helixDataAccessor.keyBuilder().externalView(tableNameWithType));
       // ExternalView might be null when table is just created, skipping check for this iteration
       if (externalView != null) {
+        // Record external view and ideal state convergence status
+        _tableRebalanceObserver.onTrigger(
+            TableRebalanceObserver.Trigger.EXTERNAL_VIEW_TO_IDEAL_STATE_CONVERGENCE_TRIGGER,
+            externalView.getRecord().getMapFields(), idealState.getRecord().getMapFields());
         if (isExternalViewConverged(tableNameWithType, externalView.getRecord().getMapFields(),
             idealState.getRecord().getMapFields(), bestEfforts, segmentsToMonitor)) {
           LOGGER.info("ExternalView converged for table: {}", tableNameWithType);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ZkBasedTableRebalanceObserver.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ZkBasedTableRebalanceObserver.java
new file mode 100644
index 00000000000..5db4bebf588
--- /dev/null
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/rebalance/ZkBasedTableRebalanceObserver.java
@@ -0,0 +1,197 @@
+/**
+ * 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.pinot.controller.helix.core.rebalance;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Preconditions;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.controllerjob.ControllerJobType;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.apache.pinot.spi.utils.RebalanceConfigConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <code>ZkBasedTableRebalanceObserver</code> observes rebalance progress and tracks rebalance status,
+ * stats in Zookeeper. This will be used to show the progress of rebalance to users via rebalanceStatus API.
+ */
+public class ZkBasedTableRebalanceObserver implements TableRebalanceObserver {
+  private static final Logger LOGGER = LoggerFactory.getLogger(ZkBasedTableRebalanceObserver.class);
+  private final String _tableNameWithType;
+  private final String _rebalanceJobId;
+  private final PinotHelixResourceManager _pinotHelixResourceManager;
+  private TableRebalanceProgressStats _tableRebalanceProgressStats;
+  // Keep track of number of updates. Useful during debugging.
+  private int _numUpdatesToZk;
+
+  public ZkBasedTableRebalanceObserver(String tableNameWithType, String rebalanceJobId,
+      PinotHelixResourceManager pinotHelixResourceManager) {
+    Preconditions.checkState(tableNameWithType != null, "Table name cannot be null");
+    Preconditions.checkState(rebalanceJobId != null, "rebalanceId cannot be null");
+    Preconditions.checkState(pinotHelixResourceManager != null, "PinotHelixManager cannot be null");
+    _tableNameWithType = tableNameWithType;
+    _rebalanceJobId = rebalanceJobId;
+    _pinotHelixResourceManager = pinotHelixResourceManager;
+    _tableRebalanceProgressStats = new TableRebalanceProgressStats();
+    _numUpdatesToZk = 0;
+  }
+
+  @Override
+  public void onTrigger(Trigger trigger, Map<String, Map<String, String>> currentState,
+      Map<String, Map<String, String>> targetState) {
+    switch (trigger) {
+      case START_TRIGGER:
+        updateOnStart(currentState, targetState);
+        trackStatsInZk();
+        break;
+      // Write to Zk if there's change since previous stats computation
+      case IDEAL_STATE_CHANGE_TRIGGER:
+        TableRebalanceProgressStats.RebalanceStateStats latest =
+            getDifferenceBetweenTableRebalanceStates(targetState, currentState);
+        if (TableRebalanceProgressStats.statsDiffer(_tableRebalanceProgressStats.getCurrentToTargetConvergence(),
+            latest)) {
+          _tableRebalanceProgressStats.setCurrentToTargetConvergence(latest);
+          trackStatsInZk();
+        }
+        break;
+      case EXTERNAL_VIEW_TO_IDEAL_STATE_CONVERGENCE_TRIGGER:
+        latest = getDifferenceBetweenTableRebalanceStates(targetState, currentState);
+        if (TableRebalanceProgressStats.statsDiffer(
+            _tableRebalanceProgressStats.getExternalViewToIdealStateConvergence(), latest)) {
+          _tableRebalanceProgressStats.setExternalViewToIdealStateConvergence(latest);
+          trackStatsInZk();
+        }
+        break;
+      default:
+        throw new IllegalArgumentException("Unimplemented trigger: " + trigger);
+    }
+  }
+
+  private void updateOnStart(Map<String, Map<String, String>> currentState,
+      Map<String, Map<String, String>> targetState) {
+    Preconditions.checkState(_tableRebalanceProgressStats.getStatus() != RebalanceResult.Status.IN_PROGRESS.toString(),
+        "Rebalance Observer onStart called multiple times");
+    _tableRebalanceProgressStats.setStatus(RebalanceResult.Status.IN_PROGRESS.toString());
+    _tableRebalanceProgressStats.setInitialToTargetStateConvergence(
+        getDifferenceBetweenTableRebalanceStates(targetState, currentState));
+    _tableRebalanceProgressStats.setStartTimeMs(System.currentTimeMillis());
+  }
+
+  @Override
+  public void onSuccess(String msg) {
+    Preconditions.checkState(_tableRebalanceProgressStats.getStatus() != RebalanceResult.Status.DONE.toString(),
+        "Table Rebalance already completed");
+    long timeToFinishInSeconds =
+         (System.currentTimeMillis() - _tableRebalanceProgressStats.getStartTimeMs()) / 1000L;
+    _tableRebalanceProgressStats.setCompletionStatusMsg(msg);
+    _tableRebalanceProgressStats.setTimeToFinishInSeconds(timeToFinishInSeconds);
+    _tableRebalanceProgressStats.setStatus(RebalanceResult.Status.DONE.toString());
+    // Zero out the in_progress convergence stats
+    TableRebalanceProgressStats.RebalanceStateStats stats = new TableRebalanceProgressStats.RebalanceStateStats();
+    _tableRebalanceProgressStats.setExternalViewToIdealStateConvergence(stats);
+    _tableRebalanceProgressStats.setCurrentToTargetConvergence(stats);
+    trackStatsInZk();
+  }
+
+  @Override
+  public void onError(String errorMsg) {
+    long timeToFinishInSeconds =
+        (long) (System.currentTimeMillis() - _tableRebalanceProgressStats.getStartTimeMs()) / 1000;
+    _tableRebalanceProgressStats.setTimeToFinishInSeconds(timeToFinishInSeconds);
+    _tableRebalanceProgressStats.setStatus(RebalanceResult.Status.FAILED.toString());
+    _tableRebalanceProgressStats.setCompletionStatusMsg(errorMsg);
+    trackStatsInZk();
+  }
+
+  public int getNumUpdatesToZk() {
+    return _numUpdatesToZk;
+  }
+
+  private void trackStatsInZk() {
+    Map<String, String> jobMetadata = new HashMap<>();
+    jobMetadata.put(CommonConstants.ControllerJob.TABLE_NAME_WITH_TYPE, _tableNameWithType);
+    jobMetadata.put(CommonConstants.ControllerJob.JOB_ID, _rebalanceJobId);
+    jobMetadata.put(CommonConstants.ControllerJob.SUBMISSION_TIME_MS, Long.toString(System.currentTimeMillis()));
+    jobMetadata.put(CommonConstants.ControllerJob.JOB_TYPE, ControllerJobType.TABLE_REBALANCE.name());
+    try {
+      jobMetadata.put(RebalanceConfigConstants.REBALANCE_PROGRESS_STATS,
+          JsonUtils.objectToString(_tableRebalanceProgressStats));
+    } catch (JsonProcessingException e) {
+      LOGGER.error("Error serialising rebalance stats to JSON for persisting to ZK {}", _rebalanceJobId, e);
+    }
+    _pinotHelixResourceManager.addControllerJobToZK(_rebalanceJobId, jobMetadata,
+        ZKMetadataProvider.constructPropertyStorePathForControllerJob(ControllerJobType.TABLE_REBALANCE));
+    _numUpdatesToZk++;
+    LOGGER.debug("Number of updates to Zk: {} for rebalanceJob: {}  ", _numUpdatesToZk, _rebalanceJobId);
+  }
+
+  /**
+   * Takes in targetState and sourceState and computes stats based on the comparison
+   * between sourceState and targetState.This captures how far the source state is from
+   * the target state. Example - if there are 4 segments and 16 replicas in the source state
+   * not matching the target state, _segmentsToRebalance is 4 and _replicasToRebalance is 16.
+   * @param targetState- The state that we want to get to
+   * @param sourceState - A given state that needs to converge to targetState
+   * @return RebalanceStats
+   */
+  public static TableRebalanceProgressStats.RebalanceStateStats getDifferenceBetweenTableRebalanceStates(
+      Map<String, Map<String, String>> targetState, Map<String, Map<String, String>> sourceState) {
+
+    TableRebalanceProgressStats.RebalanceStateStats rebalanceStats =
+        new TableRebalanceProgressStats.RebalanceStateStats();
+
+    for (Map.Entry<String, Map<String, String>> entry : targetState.entrySet()) {
+      String segmentName = entry.getKey();
+      Map<String, String> sourceInstanceStateMap = sourceState.get(segmentName);
+      if (sourceInstanceStateMap == null) {
+        // Skip the missing segment
+        rebalanceStats._segmentsMissing++;
+        rebalanceStats._segmentsToRebalance++;
+        continue;
+      }
+      Map<String, String> targetStateInstanceStateMap = entry.getValue();
+      boolean hasSegmentConverged = true;
+      for (Map.Entry<String, String> instanceStateEntry : targetStateInstanceStateMap.entrySet()) {
+        // Ignore OFFLINE state in target state
+        String targetStateInstanceState = instanceStateEntry.getValue();
+        if (targetStateInstanceState.equals(CommonConstants.Helix.StateModel.SegmentStateModel.OFFLINE)) {
+          continue;
+        }
+        // Check whether the instance state in source matches the target
+        String instanceName = instanceStateEntry.getKey();
+        String sourceInstanceState = sourceInstanceStateMap.get(instanceName);
+        if (!targetStateInstanceState.equals(sourceInstanceState)) {
+          rebalanceStats._replicasToRebalance++;
+          hasSegmentConverged = false;
+        }
+      }
+      if (!hasSegmentConverged) {
+        rebalanceStats._segmentsToRebalance++;
+      }
+    }
+    int totalSegments = targetState.size();
+    rebalanceStats._percentSegmentsToRebalance =
+        (totalSegments == 0) ? 0 : ((double) rebalanceStats._segmentsToRebalance / totalSegments) * 100.0;
+    return rebalanceStats;
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocator.java
index 4e2d50db9ea..cd481ec66df 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocator.java
@@ -21,10 +21,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
@@ -38,13 +36,9 @@
 import org.apache.helix.ClusterMessagingService;
 import org.apache.helix.Criteria;
 import org.apache.helix.InstanceType;
-import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.assignment.InstanceAssignmentConfigUtils;
 import org.apache.pinot.common.messages.SegmentReloadMessage;
-import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.tier.Tier;
-import org.apache.pinot.common.tier.TierSegmentSelector;
 import org.apache.pinot.common.utils.config.TierConfigUtils;
 import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.LeadControllerManager;
@@ -54,7 +48,6 @@
 import org.apache.pinot.controller.helix.core.rebalance.TableRebalancer;
 import org.apache.pinot.controller.util.TableTierReader;
 import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TierConfig;
 import org.apache.pinot.spi.stream.StreamConfig;
 import org.apache.pinot.spi.utils.IngestionConfigUtils;
 import org.apache.pinot.spi.utils.RebalanceConfigConstants;
@@ -175,10 +168,6 @@ private void rebalanceTable(String tableNameWithType) {
       relocate = true;
       LOGGER.info("Relocating COMPLETED segments for table: {}", tableNameWithType);
     }
-    if (_enableLocalTierMigration) {
-      relocate = true;
-      LOGGER.info("Migrating segment tiers on servers locally for table: {}", tableNameWithType);
-    }
     if (!relocate) {
       LOGGER.debug("No need to relocate segments of table: {}", tableNameWithType);
       return;
@@ -191,22 +180,18 @@ private void rebalanceTable(String tableNameWithType) {
         _externalViewCheckIntervalInMs);
     rebalanceConfig.addProperty(RebalanceConfigConstants.EXTERNAL_VIEW_STABILIZATION_TIMEOUT_IN_MS,
         _externalViewStabilizationTimeoutInMs);
+    rebalanceConfig.addProperty(RebalanceConfigConstants.UPDATE_TARGET_TIER,
+        TierConfigUtils.shouldRelocateToTiers(tableConfig));
+    rebalanceConfig.addProperty(RebalanceConfigConstants.JOB_ID, TableRebalancer.createUniqueRebalanceJobIdentifier());
 
     try {
       // Relocating segments to new tiers needs two sequential actions: table rebalance and local tier migration.
       // Table rebalance moves segments to the new ideal servers, which can change for a segment when its target
       // tier is updated. New servers can put segments onto the right tier when loading the segments. After that,
       // all segments are put on the right servers. If any segments are not on their target tier, the server local
-      // tier migration is triggered for them, basically asking the hosting servers to reload them.
-      //
-      // We assume segment target tier is not changed between the two actions, so update target tier here as well,
-      // instead of using a separate task.
-      // TODO: can add some sanity checks on the server side when reloading segments to be more defensive, e.g. only
-      //       migrating segment to new tier when the hosting server is in the server pool configured for that tier.
-      updateTargetTier(tableNameWithType);
-
-      RebalanceResult rebalance =
-          new TableRebalancer(_pinotHelixResourceManager.getHelixZkManager()).rebalance(tableConfig, rebalanceConfig);
+      // tier migration is triggered for them, basically asking the hosting servers to reload them. The segment
+      // target tier may get changed between the two sequential actions, but cluster states converge eventually.
+      RebalanceResult rebalance = _pinotHelixResourceManager.rebalanceTable(tableNameWithType, rebalanceConfig, false);
       switch (rebalance.getStatus()) {
         case NO_OP:
           LOGGER.info("All segments are already relocated for table: {}", tableNameWithType);
@@ -225,26 +210,6 @@ private void rebalanceTable(String tableNameWithType) {
     }
   }
 
-  /**
-   * Calculate the target tier the segment belongs to and set it in segment ZK metadata as goal state, which can be
-   * checked by servers when loading the segment to put it onto the target storage tier.
-   */
-  private void updateTargetTier(String tableNameWithType) {
-    if (!_enableLocalTierMigration) {
-      LOGGER.debug("Skipping updating target tier for segments of table: {}", tableNameWithType);
-      return;
-    }
-    TableConfig tableConfig = _pinotHelixResourceManager.getTableConfig(tableNameWithType);
-    Preconditions.checkState(tableConfig != null, "Failed to find table config for table: {}", tableNameWithType);
-    List<TierConfig> tierCfgs = tableConfig.getTierConfigsList();
-    List<Tier> sortedTiers = tierCfgs == null ? Collections.emptyList()
-        : TierConfigUtils.getSortedTiers(tierCfgs, _pinotHelixResourceManager.getHelixZkManager());
-    LOGGER.info("Updating target tiers for segments of table: {} with tierConfigs: {}", tableNameWithType, sortedTiers);
-    for (String segmentName : _pinotHelixResourceManager.getSegmentsFor(tableNameWithType, true)) {
-      updateSegmentTargetTier(tableNameWithType, segmentName, sortedTiers, _pinotHelixResourceManager);
-    }
-  }
-
   /**
    * Migrate segment tiers on their hosting servers locally. Once table is balanced, i.e. segments are on their ideal
    * servers, we check if any segment needs to move to a new tier on its hosting servers, i.e. doing local tier
@@ -268,46 +233,6 @@ private void migrateToTargetTier(String tableNameWithType) {
     }
   }
 
-  @VisibleForTesting
-  static void updateSegmentTargetTier(String tableNameWithType, String segmentName, List<Tier> sortedTiers,
-      PinotHelixResourceManager pinotHelixResourceManager) {
-    ZNRecord segmentMetadataZNRecord =
-        pinotHelixResourceManager.getSegmentMetadataZnRecord(tableNameWithType, segmentName);
-    if (segmentMetadataZNRecord == null) {
-      LOGGER.debug("No ZK metadata for segment: {} of table: {}", segmentName, tableNameWithType);
-      return;
-    }
-    Tier targetTier = null;
-    for (Tier tier : sortedTiers) {
-      TierSegmentSelector tierSegmentSelector = tier.getSegmentSelector();
-      if (tierSegmentSelector.selectSegment(tableNameWithType, segmentName)) {
-        targetTier = tier;
-        break;
-      }
-    }
-    SegmentZKMetadata segmentZKMetadata = new SegmentZKMetadata(segmentMetadataZNRecord);
-    String targetTierName = null;
-    if (targetTier == null) {
-      if (segmentZKMetadata.getTier() == null) {
-        LOGGER.debug("Segment: {} of table: {} is already set to go to default tier", segmentName, tableNameWithType);
-        return;
-      }
-      LOGGER.info("Segment: {} of table: {} is put back on default tier", segmentName, tableNameWithType);
-    } else {
-      targetTierName = targetTier.getName();
-      if (targetTierName.equals(segmentZKMetadata.getTier())) {
-        LOGGER.debug("Segment: {} of table: {} is already set to go to target tier: {}", segmentName, tableNameWithType,
-            targetTierName);
-        return;
-      }
-      LOGGER.info("Segment: {} of table: {} is put onto new tier: {}", segmentName, tableNameWithType, targetTierName);
-    }
-    // Update the tier in segment ZK metadata and write it back to ZK.
-    segmentZKMetadata.setTier(targetTierName);
-    pinotHelixResourceManager.updateZkMetadata(tableNameWithType, segmentZKMetadata,
-        segmentMetadataZNRecord.getVersion());
-  }
-
   @VisibleForTesting
   static void triggerLocalTierMigration(String tableNameWithType, TableTierReader.TableTierDetails tableTiers,
       ClusterMessagingService messagingService) {
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java
index 624ee914d7c..93c7d8573b7 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/retention/RetentionManager.java
@@ -26,8 +26,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
-import org.apache.pinot.common.lineage.LineageEntry;
-import org.apache.pinot.common.lineage.LineageEntryState;
 import org.apache.pinot.common.lineage.SegmentLineage;
 import org.apache.pinot.common.lineage.SegmentLineageAccessHelper;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
@@ -58,8 +56,6 @@
  */
 public class RetentionManager extends ControllerPeriodicTask<Void> {
   public static final long OLD_LLC_SEGMENTS_RETENTION_IN_MILLIS = TimeUnit.DAYS.toMillis(5L);
-  private static final long REPLACED_SEGMENTS_RETENTION_IN_MILLIS = TimeUnit.DAYS.toMillis(1L); // 1 day
-  public static final long LINEAGE_ENTRY_CLEANUP_RETENTION_IN_MILLIS = TimeUnit.DAYS.toMillis(1L); // 1 day
   private static final RetryPolicy DEFAULT_RETRY_POLICY = RetryPolicies.exponentialBackoffRetryPolicy(5, 1000L, 2.0f);
 
   private static final Logger LOGGER = LoggerFactory.getLogger(RetentionManager.class);
@@ -94,7 +90,7 @@ protected void processTable(String tableNameWithType) {
   @Override
   protected void postprocess() {
     LOGGER.info("Removing aged deleted segments for all tables");
-    _pinotHelixResourceManager.getSegmentDeletionManager().removeAgedDeletedSegments();
+    _pinotHelixResourceManager.getSegmentDeletionManager().removeAgedDeletedSegments(_leadControllerManager);
   }
 
   private void manageRetentionForTable(TableConfig tableConfig) {
@@ -163,6 +159,10 @@ private void manageRetentionForRealtimeTable(String realtimeTableName, Retention
         }
       }
     }
+
+    // Remove last sealed segments such that the table can still create new consuming segments if it's paused
+    segmentsToDelete.removeAll(_pinotHelixResourceManager.getLastLLCCompletedSegments(realtimeTableName));
+
     if (!segmentsToDelete.isEmpty()) {
       LOGGER.info("Deleting {} segments from table: {}", segmentsToDelete.size(), realtimeTableName);
       _pinotHelixResourceManager.deleteSegments(realtimeTableName, segmentsToDelete);
@@ -198,8 +198,9 @@ private void manageSegmentLineageCleanupForTable(TableConfig tableConfig) {
     try {
       DEFAULT_RETRY_POLICY.attempt(() -> {
         // Fetch segment lineage
-        ZNRecord segmentLineageZNRecord = SegmentLineageAccessHelper
-            .getSegmentLineageZNRecord(_pinotHelixResourceManager.getPropertyStore(), tableNameWithType);
+        ZNRecord segmentLineageZNRecord =
+            SegmentLineageAccessHelper.getSegmentLineageZNRecord(_pinotHelixResourceManager.getPropertyStore(),
+                tableNameWithType);
         if (segmentLineageZNRecord == null) {
           return true;
         }
@@ -208,50 +209,19 @@ private void manageSegmentLineageCleanupForTable(TableConfig tableConfig) {
         SegmentLineage segmentLineage = SegmentLineage.fromZNRecord(segmentLineageZNRecord);
         int expectedVersion = segmentLineageZNRecord.getVersion();
 
-        // 1. The original segments can be deleted once the merged segments are successfully uploaded
-        // 2. The zombie lineage entry & merged segments should be deleted if the segment replacement failed in
-        //    the middle
-        Set<String> segmentsForTable =
-            new HashSet<>(_pinotHelixResourceManager.getSegmentsFor(tableNameWithType, false));
+        List<String> segmentsForTable = _pinotHelixResourceManager.getSegmentsFor(tableNameWithType, false);
         List<String> segmentsToDelete = new ArrayList<>();
-        for (String lineageEntryId : segmentLineage.getLineageEntryIds()) {
-          LineageEntry lineageEntry = segmentLineage.getLineageEntry(lineageEntryId);
-          if (lineageEntry.getState() == LineageEntryState.COMPLETED) {
-            Set<String> sourceSegments = new HashSet<>(lineageEntry.getSegmentsFrom());
-            sourceSegments.retainAll(segmentsForTable);
-            if (sourceSegments.isEmpty()) {
-              // If the lineage state is 'COMPLETED' and segmentFrom are removed, it is safe clean up
-              // the lineage entry
-              segmentLineage.deleteLineageEntry(lineageEntryId);
-            } else {
-              // If the lineage state is 'COMPLETED' and we already preserved the original segments for the required
-              // retention, it is safe to delete all segments from 'segmentsFrom'
-              if (shouldDeleteReplacedSegments(tableConfig, lineageEntry)) {
-                segmentsToDelete.addAll(sourceSegments);
-              }
-            }
-          } else if (lineageEntry.getState() == LineageEntryState.REVERTED || (
-              lineageEntry.getState() == LineageEntryState.IN_PROGRESS && lineageEntry.getTimestamp()
-                  < System.currentTimeMillis() - LINEAGE_ENTRY_CLEANUP_RETENTION_IN_MILLIS)) {
-            // If the lineage state is 'IN_PROGRESS' or 'REVERTED', we need to clean up the zombie lineage
-            // entry and its segments
-            Set<String> destinationSegments = new HashSet<>(lineageEntry.getSegmentsTo());
-            destinationSegments.retainAll(segmentsForTable);
-            if (destinationSegments.isEmpty()) {
-              // If the lineage state is 'IN_PROGRESS or REVERTED' and source segments are already removed, it is safe
-              // to clean up the lineage entry. Deleting lineage will allow the task scheduler to re-schedule the source
-              // segments to be merged again.
-              segmentLineage.deleteLineageEntry(lineageEntryId);
-            } else {
-              // If the lineage state is 'IN_PROGRESS', it is safe to delete all segments from 'segmentsTo'
-              segmentsToDelete.addAll(destinationSegments);
-            }
-          }
-        }
+        _pinotHelixResourceManager.getLineageManager()
+            .updateLineageForRetention(tableConfig, segmentLineage, segmentsForTable, segmentsToDelete,
+                _pinotHelixResourceManager.getConsumingSegments(tableNameWithType));
 
         // Write back to the lineage entry
-        if (SegmentLineageAccessHelper
-            .writeSegmentLineage(_pinotHelixResourceManager.getPropertyStore(), segmentLineage, expectedVersion)) {
+        if (SegmentLineageAccessHelper.writeSegmentLineage(_pinotHelixResourceManager.getPropertyStore(),
+            segmentLineage, expectedVersion)) {
+          // Remove last sealed segments such that the table can still create new consuming segments if it's paused
+          if (TableNameBuilder.isRealtimeTableResource(tableNameWithType)) {
+            segmentsToDelete.removeAll(_pinotHelixResourceManager.getLastLLCCompletedSegments(tableNameWithType));
+          }
           // Delete segments based on the segment lineage
           if (!segmentsToDelete.isEmpty()) {
             _pinotHelixResourceManager.deleteSegments(tableNameWithType, segmentsToDelete);
@@ -272,26 +242,4 @@ private void manageSegmentLineageCleanupForTable(TableConfig tableConfig) {
     }
     LOGGER.info("Segment lineage metadata clean-up is successfully processed for table: {}", tableNameWithType);
   }
-
-  /**
-   * Helper function to decide whether we should delete segmentsFrom (replaced segments) given a lineage entry.
-   *
-   * The replaced segments are safe to delete if the following conditions are all satisfied
-   * 1) Table is "APPEND"
-   * 2) It has been more than 24 hours since the lineage entry became "COMPLETED" state.
-   *
-   * @param tableConfig a table config
-   * @param lineageEntry lineage entry
-   * @return True if we can safely delete the replaced segments. False otherwise.
-   */
-  private boolean shouldDeleteReplacedSegments(TableConfig tableConfig, LineageEntry lineageEntry) {
-    // TODO: Currently, we preserve the replaced segments for 1 day for REFRESH tables only. Once we support
-    // data rollback for APPEND tables, we should remove this check.
-    String batchSegmentIngestionType = IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig);
-    if (!batchSegmentIngestionType.equalsIgnoreCase("REFRESH")
-        || lineageEntry.getTimestamp() < System.currentTimeMillis() - REPLACED_SEGMENTS_RETENTION_IN_MILLIS) {
-      return true;
-    }
-    return false;
-  }
 }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
index d42fe6a36bf..ea4d8885893 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
@@ -79,7 +79,7 @@ private static void setupHelixClusterIfNeeded(String helixClusterName, String zk
             new HelixConfigScopeBuilder(ConfigScopeProperty.CLUSTER).forCluster(helixClusterName).build();
         Map<String, String> configMap = new HashMap<>();
         configMap.put(ZKHelixManager.ALLOW_PARTICIPANT_AUTO_JOIN, Boolean.toString(true));
-        configMap.put(ENABLE_CASE_INSENSITIVE_KEY, Boolean.toString(false));
+        configMap.put(ENABLE_CASE_INSENSITIVE_KEY, Boolean.toString(DEFAULT_ENABLE_CASE_INSENSITIVE));
         configMap.put(DEFAULT_HYPERLOGLOG_LOG2M_KEY, Integer.toString(DEFAULT_HYPERLOGLOG_LOG2M));
         configMap.put(CommonConstants.Broker.CONFIG_OF_ENABLE_QUERY_LIMIT_OVERRIDE, Boolean.toString(false));
         admin.setConfig(configScope, configMap);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/io/InputManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/io/InputManager.java
index 4436fc356c9..4834866c518 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/io/InputManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/io/InputManager.java
@@ -170,6 +170,8 @@ private void validateQueries() {
     for (String queryString : _queryWeightMap.keySet()) {
       try {
         PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(queryString);
+        // TODO: we should catch and log errors here so we don't fail queries on optimization.
+        // For now, because this modifies the query in place, we let the error propagate.
         _queryOptimizer.optimize(pinotQuery, _schema);
         QueryContext queryContext = QueryContextConverterUtils.getQueryContext(pinotQuery);
 
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/realtime/provisioning/MemoryEstimator.java b/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/realtime/provisioning/MemoryEstimator.java
index baa2ea4b52b..9873d17ad81 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/realtime/provisioning/MemoryEstimator.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/recommender/realtime/provisioning/MemoryEstimator.java
@@ -23,14 +23,12 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.controller.recommender.data.generator.DataGenerator;
@@ -52,7 +50,9 @@
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.DateTimeFormatSpec;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -77,22 +77,20 @@ public class MemoryEstimator {
 
   private final TableConfig _tableConfig;
   private final String _tableNameWithType;
+  private final Schema _schema;
   private final File _sampleCompletedSegment;
   private final long _sampleSegmentConsumedSeconds;
   private final int _totalDocsInSampleSegment;
   private final long _maxUsableHostMemory;
   private final int _tableRetentionHours;
 
-  private SegmentMetadataImpl _segmentMetadata;
-  private long _sampleCompletedSegmentSizeBytes;
-  private Set<String> _invertedIndexColumns = new HashSet<>();
-  private Set<String> _noDictionaryColumns = new HashSet<>();
-  private Set<String> _varLengthDictionaryColumns = new HashSet<>();
+  private final SegmentMetadataImpl _segmentMetadata;
+  private final long _sampleCompletedSegmentSizeBytes;
   int _avgMultiValues;
 
   // Working dir will contain statsFile and also the generated segment if requested.
   // It will get deleted after memory estimation is done.
-  private File _workingDir;
+  private final File _workingDir;
 
   private String[][] _activeMemoryPerHost;
   private String[][] _optimalSegmentSize;
@@ -103,11 +101,12 @@ public class MemoryEstimator {
   /**
    * Constructor used for processing the given completed segment
    */
-  public MemoryEstimator(TableConfig tableConfig, File sampleCompletedSegment, double ingestionRatePerPartition,
-      long maxUsableHostMemory, int tableRetentionHours, File workingDir) {
+  public MemoryEstimator(TableConfig tableConfig, Schema schema, File sampleCompletedSegment,
+      double ingestionRatePerPartition, long maxUsableHostMemory, int tableRetentionHours, File workingDir) {
     _maxUsableHostMemory = maxUsableHostMemory;
     _tableConfig = tableConfig;
     _tableNameWithType = tableConfig.getTableName();
+    _schema = schema;
     _sampleCompletedSegment = sampleCompletedSegment;
     _tableRetentionHours = tableRetentionHours;
 
@@ -120,15 +119,6 @@ public MemoryEstimator(TableConfig tableConfig, File sampleCompletedSegment, dou
     _totalDocsInSampleSegment = _segmentMetadata.getTotalDocs();
     _sampleSegmentConsumedSeconds = (int) (_totalDocsInSampleSegment / ingestionRatePerPartition);
 
-    if (CollectionUtils.isNotEmpty(_tableConfig.getIndexingConfig().getNoDictionaryColumns())) {
-      _noDictionaryColumns.addAll(_tableConfig.getIndexingConfig().getNoDictionaryColumns());
-    }
-    if (CollectionUtils.isNotEmpty(_tableConfig.getIndexingConfig().getVarLengthDictionaryColumns())) {
-      _varLengthDictionaryColumns.addAll(_tableConfig.getIndexingConfig().getVarLengthDictionaryColumns());
-    }
-    if (CollectionUtils.isNotEmpty(_tableConfig.getIndexingConfig().getInvertedIndexColumns())) {
-      _invertedIndexColumns.addAll(_tableConfig.getIndexingConfig().getInvertedIndexColumns());
-    }
     _avgMultiValues = getAvgMultiValues();
     _workingDir = workingDir;
   }
@@ -139,7 +129,8 @@ public MemoryEstimator(TableConfig tableConfig, File sampleCompletedSegment, dou
   public MemoryEstimator(TableConfig tableConfig, Schema schema, SchemaWithMetaData schemaWithMetadata,
       int numberOfRows, double ingestionRatePerPartition, long maxUsableHostMemory, int tableRetentionHours,
       File workingDir) {
-    this(tableConfig, generateCompletedSegment(schemaWithMetadata, schema, tableConfig, numberOfRows, workingDir),
+    this(tableConfig, schema,
+        generateCompletedSegment(schemaWithMetadata, schema, tableConfig, numberOfRows, workingDir),
         ingestionRatePerPartition, maxUsableHostMemory, tableRetentionHours, workingDir);
   }
 
@@ -167,13 +158,11 @@ public File initializeStatsHistory() {
 
     // create a config
     RealtimeSegmentConfig.Builder realtimeSegmentConfigBuilder =
-        new RealtimeSegmentConfig.Builder().setTableNameWithType(_tableNameWithType)
+        new RealtimeSegmentConfig.Builder(_tableConfig, _schema).setTableNameWithType(_tableNameWithType)
             .setSegmentName(_segmentMetadata.getName()).setStreamName(_tableNameWithType)
             .setSchema(_segmentMetadata.getSchema()).setCapacity(_segmentMetadata.getTotalDocs())
-            .setAvgNumMultiValues(_avgMultiValues).setNoDictionaryColumns(_noDictionaryColumns)
-            .setVarLengthDictionaryColumns(_varLengthDictionaryColumns).setInvertedIndexColumns(_invertedIndexColumns)
-            .setSegmentZKMetadata(segmentZKMetadata).setOffHeap(true).setMemoryManager(memoryManager)
-            .setStatsHistory(sampleStatsHistory);
+            .setAvgNumMultiValues(_avgMultiValues).setSegmentZKMetadata(segmentZKMetadata).setOffHeap(true)
+            .setMemoryManager(memoryManager).setStatsHistory(sampleStatsHistory);
 
     // create mutable segment impl
     MutableSegmentImpl mutableSegmentImpl = new MutableSegmentImpl(realtimeSegmentConfigBuilder.build(), null);
@@ -256,12 +245,14 @@ public void estimateMemoryUsed(File statsFile, int[] numHosts, int[] numHours, f
     }
 
     try {
+      int invertedColumnsCount = countInvertedColumns();
+
       for (int i = 0; i < numHours.length; i++) {
         int numHoursToConsume = numHours[i];
         if (numHoursToConsume > retentionHours) {
           continue;
         }
-        long secondsToConsume = numHoursToConsume * 3600;
+        long secondsToConsume = numHoursToConsume * 3600L;
         // consuming for _numHoursSampleSegmentConsumed, gives size sampleCompletedSegmentSizeBytes
         // hence, consuming for numHoursToConsume would give:
         long completedSegmentSizeBytes =
@@ -272,7 +263,8 @@ public void estimateMemoryUsed(File statsFile, int[] numHosts, int[] numHours, f
         int totalDocs = (int) (((double) secondsToConsume / _sampleSegmentConsumedSeconds) * _totalDocsInSampleSegment);
         long memoryForConsumingSegmentPerPartition = getMemoryForConsumingSegmentPerPartition(statsFile, totalDocs);
 
-        memoryForConsumingSegmentPerPartition += getMemoryForInvertedIndex(memoryForConsumingSegmentPerPartition);
+        memoryForConsumingSegmentPerPartition += getMemoryForInvertedIndex(
+            memoryForConsumingSegmentPerPartition, invertedColumnsCount);
 
         int numActiveSegmentsPerPartition = (retentionHours + numHoursToConsume - 1) / numHoursToConsume;
         long activeMemoryForCompletedSegmentsPerPartition =
@@ -329,11 +321,10 @@ private long getMemoryForConsumingSegmentPerPartition(File statsFile, int totalD
     SegmentZKMetadata segmentZKMetadata = getSegmentZKMetadata(_segmentMetadata, totalDocs);
 
     RealtimeSegmentConfig.Builder realtimeSegmentConfigBuilder =
-        new RealtimeSegmentConfig.Builder().setTableNameWithType(_tableNameWithType)
+        new RealtimeSegmentConfig.Builder(_tableConfig, _schema).setTableNameWithType(_tableNameWithType)
             .setSegmentName(_segmentMetadata.getName()).setStreamName(_tableNameWithType)
             .setSchema(_segmentMetadata.getSchema()).setCapacity(totalDocs).setAvgNumMultiValues(_avgMultiValues)
-            .setNoDictionaryColumns(_noDictionaryColumns).setVarLengthDictionaryColumns(_varLengthDictionaryColumns)
-            .setInvertedIndexColumns(_invertedIndexColumns).setSegmentZKMetadata(segmentZKMetadata).setOffHeap(true)
+            .setSegmentZKMetadata(segmentZKMetadata).setOffHeap(true)
             .setMemoryManager(memoryManager).setStatsHistory(statsHistory);
 
     // create mutable segment impl
@@ -384,16 +375,23 @@ private int getAvgMultiValues() {
    * @param totalMemoryForConsumingSegment
    * @return
    */
-  private long getMemoryForInvertedIndex(long totalMemoryForConsumingSegment) {
+  private long getMemoryForInvertedIndex(long totalMemoryForConsumingSegment, int invertedColumnsCount) {
     // TODO: better way to estimate inverted indexes memory utilization
     long totalInvertedIndexSizeBytes = 0;
-    if (!_invertedIndexColumns.isEmpty()) {
+    if (invertedColumnsCount > 0) {
       long memoryForEachColumn = totalMemoryForConsumingSegment / _segmentMetadata.getAllColumns().size();
-      totalInvertedIndexSizeBytes = (long) (memoryForEachColumn * 0.3 * _invertedIndexColumns.size());
+      totalInvertedIndexSizeBytes = (long) (memoryForEachColumn * 0.3 * invertedColumnsCount);
     }
     return totalInvertedIndexSizeBytes;
   }
 
+  private int countInvertedColumns() {
+    Map<String, IndexConfig> invertedConfig = StandardIndexes.inverted().getConfig(_tableConfig, _schema);
+    return (int) invertedConfig.values().stream()
+        .filter(IndexConfig::isEnabled)
+        .count();
+  }
+
   /**
    * Creates a sample segment ZK metadata for the given segment metadata
    * @param segmentMetadata
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/CompletionServiceHelper.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/CompletionServiceHelper.java
index 8ec3b282380..c311ef379f7 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/CompletionServiceHelper.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/CompletionServiceHelper.java
@@ -57,7 +57,7 @@ public CompletionServiceHelper(Executor executor, HttpConnectionManager httpConn
 
   public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, String tableNameWithType,
       boolean multiRequestPerServer, int timeoutMs) {
-    return doMultiGetRequest(serverURLs, tableNameWithType, multiRequestPerServer, null, timeoutMs);
+    return doMultiGetRequest(serverURLs, tableNameWithType, multiRequestPerServer, null, timeoutMs, null);
   }
 
   /**
@@ -70,11 +70,14 @@ public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, Stri
    *                              get response.
    * @param requestHeaders Headers to be set when making the http calls.
    * @param timeoutMs timeout in milliseconds to wait per request.
+   * @param useCase the use case initiating the multi-get request. If not null and an exception is thrown, only the
+   *                error message and the use case are logged instead of the full stack trace.
    * @return CompletionServiceResponse Map of the endpoint(server instance, or full request path if
    * multiRequestPerServer is true) to the response from that endpoint.
    */
   public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, String tableNameWithType,
-      boolean multiRequestPerServer, @Nullable Map<String, String> requestHeaders, int timeoutMs) {
+      boolean multiRequestPerServer, @Nullable Map<String, String> requestHeaders, int timeoutMs,
+      @Nullable String useCase) {
     CompletionServiceResponse completionServiceResponse = new CompletionServiceResponse();
 
     // TODO: use some service other than completion service so that we know which server encounters the error
@@ -95,7 +98,8 @@ public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, Stri
         completionServiceResponse._httpResponses
             .put(multiRequestPerServer ? uri.toString() : instance, getMethod.getResponseBodyAsString());
       } catch (Exception e) {
-        LOGGER.error("Connection error", e);
+        String reason = useCase == null ? "" : String.format(" in '%s'", useCase);
+        LOGGER.error("Connection error{}. Details: {}", reason, e.getMessage());
         completionServiceResponse._failedResponseCount++;
       } finally {
         if (getMethod != null) {
@@ -114,6 +118,17 @@ public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, Stri
     return completionServiceResponse;
   }
 
+  public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, String tableNameWithType,
+      boolean multiRequestPerServer, int timeoutMs, @Nullable String useCase) {
+    return doMultiGetRequest(serverURLs, tableNameWithType, multiRequestPerServer, null, timeoutMs, useCase);
+  }
+
+  public CompletionServiceResponse doMultiGetRequest(List<String> serverURLs, String tableNameWithType,
+      boolean multiRequestPerServer, @Nullable Map<String, String> requestHeaders, int timeoutMs) {
+    return doMultiGetRequest(serverURLs, tableNameWithType, multiRequestPerServer, requestHeaders, timeoutMs, null);
+  }
+
+
   /**
    * Helper class to maintain the completion service response to be sent back to the caller.
    */
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
index 5ef3bc43ce0..e9ee2f902a9 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
@@ -92,9 +92,9 @@ public SuccessResponse buildSegmentAndPush(DataPayload payload)
     String tableNameWithType = _tableConfig.getTableName();
     // 1. append a timestamp for easy debugging
     // 2. append a random string to avoid using the same working directory when multiple tasks are running in parallel
-    File workingDir = new File(_ingestionDir,
+    File workingDir = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(_ingestionDir,
         String.format("%s_%s_%d_%s", WORKING_DIR_PREFIX, tableNameWithType, System.currentTimeMillis(),
-            RandomStringUtils.random(10, true, false)));
+            RandomStringUtils.random(10, true, false)), "Invalid table name: %S", tableNameWithType);
     LOGGER.info("Starting ingestion of {} payload to table: {} using working dir: {}", payload._payloadType,
         tableNameWithType, workingDir.getAbsolutePath());
 
@@ -179,8 +179,7 @@ public static void copyURIToLocal(Map<String, String> batchConfigMap, URI source
     String sourceFileURIScheme = sourceFileURI.getScheme();
     if (!PinotFSFactory.isSchemeSupported(sourceFileURIScheme)) {
       PinotFSFactory.register(sourceFileURIScheme, batchConfigMap.get(BatchConfigProperties.INPUT_FS_CLASS),
-          IngestionConfigUtils.getInputFsProps(IngestionConfigUtils.getConfigMapWithPrefix(
-              batchConfigMap, BatchConfigProperties.INPUT_FS_PROP_PREFIX)));
+          IngestionConfigUtils.getInputFsProps(batchConfigMap));
     }
     PinotFSFactory.create(sourceFileURIScheme).copyToLocalFile(sourceFileURI, destFile);
   }
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java
index 5d48ad54ea9..d03160536dc 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/TableSizeReader.java
@@ -85,21 +85,30 @@ public TableSizeDetails getTableSizeDetails(@Nonnull String tableName, @Nonnegat
     TableConfig realtimeTableConfig =
         ZKMetadataProvider.getRealtimeTableConfig(_helixResourceManager.getPropertyStore(), tableName);
 
-    if (offlineTableConfig == null && realtimeTableConfig == null) {
+    boolean hasRealtimeTableConfig = (realtimeTableConfig != null);
+    boolean hasOfflineTableConfig = (offlineTableConfig != null);
+    boolean isMissingAllRealtimeSegments = false;
+    boolean isMissingAllOfflineSegments = false;
+
+    if (!hasRealtimeTableConfig && !hasOfflineTableConfig) {
       return null;
     }
     TableSizeDetails tableSizeDetails = new TableSizeDetails(tableName);
-    if (realtimeTableConfig != null) {
+    if (hasRealtimeTableConfig) {
       String realtimeTableName = TableNameBuilder.REALTIME.tableNameWithType(tableName);
       tableSizeDetails._realtimeSegments = getTableSubtypeSize(realtimeTableName, timeoutMsec);
-      tableSizeDetails._reportedSizeInBytes += tableSizeDetails._realtimeSegments._reportedSizeInBytes;
-      tableSizeDetails._estimatedSizeInBytes += tableSizeDetails._realtimeSegments._estimatedSizeInBytes;
-
+      // taking max(0,value) as values as set to -1 if all the segments are in error
+      tableSizeDetails._reportedSizeInBytes += Math.max(tableSizeDetails._realtimeSegments._reportedSizeInBytes, 0L);
+      tableSizeDetails._estimatedSizeInBytes += Math.max(tableSizeDetails._realtimeSegments._estimatedSizeInBytes, 0L);
+      tableSizeDetails._reportedSizePerReplicaInBytes +=
+          Math.max(tableSizeDetails._realtimeSegments._reportedSizePerReplicaInBytes, 0L);
+      isMissingAllRealtimeSegments =
+          (tableSizeDetails._realtimeSegments._missingSegments == tableSizeDetails._realtimeSegments._segments.size());
       _controllerMetrics.setValueOfTableGauge(realtimeTableName, ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER,
           tableSizeDetails._realtimeSegments._estimatedSizeInBytes);
       _controllerMetrics.setValueOfTableGauge(realtimeTableName, ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER,
-          tableSizeDetails._realtimeSegments._estimatedSizeInBytes / _helixResourceManager.getNumReplicas(
-              realtimeTableConfig));
+          tableSizeDetails._realtimeSegments._estimatedSizeInBytes / _helixResourceManager
+              .getNumReplicas(realtimeTableConfig));
 
       long largestSegmentSizeOnServer = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
       for (SegmentSizeDetails segmentSizeDetail : tableSizeDetails._realtimeSegments._segments.values()) {
@@ -108,22 +117,25 @@ public TableSizeDetails getTableSizeDetails(@Nonnull String tableName, @Nonnegat
         }
       }
       if (largestSegmentSizeOnServer != DEFAULT_SIZE_WHEN_MISSING_OR_ERROR) {
-        _controllerMetrics.setValueOfTableGauge(realtimeTableName,
-            ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER,
+        _controllerMetrics.setValueOfTableGauge(realtimeTableName, ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER,
             largestSegmentSizeOnServer);
       }
     }
-    if (offlineTableConfig != null) {
+    if (hasOfflineTableConfig) {
       String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(tableName);
       tableSizeDetails._offlineSegments = getTableSubtypeSize(offlineTableName, timeoutMsec);
-      tableSizeDetails._reportedSizeInBytes += tableSizeDetails._offlineSegments._reportedSizeInBytes;
-      tableSizeDetails._estimatedSizeInBytes += tableSizeDetails._offlineSegments._estimatedSizeInBytes;
-
+      // taking max(0,value) as values as set to -1 if all the segments are in error
+      tableSizeDetails._reportedSizeInBytes += Math.max(tableSizeDetails._offlineSegments._reportedSizeInBytes, 0L);
+      tableSizeDetails._estimatedSizeInBytes += Math.max(tableSizeDetails._offlineSegments._estimatedSizeInBytes, 0L);
+      tableSizeDetails._reportedSizePerReplicaInBytes +=
+          Math.max(tableSizeDetails._offlineSegments._reportedSizePerReplicaInBytes, 0L);
+      isMissingAllOfflineSegments =
+          (tableSizeDetails._offlineSegments._missingSegments == tableSizeDetails._offlineSegments._segments.size());
       _controllerMetrics.setValueOfTableGauge(offlineTableName, ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER,
           tableSizeDetails._offlineSegments._estimatedSizeInBytes);
       _controllerMetrics.setValueOfTableGauge(offlineTableName, ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER,
-          tableSizeDetails._offlineSegments._estimatedSizeInBytes / _helixResourceManager.getNumReplicas(
-              offlineTableConfig));
+          tableSizeDetails._offlineSegments._estimatedSizeInBytes / _helixResourceManager
+              .getNumReplicas(offlineTableConfig));
 
       long largestSegmentSizeOnServer = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
       for (SegmentSizeDetails segmentSizeDetail : tableSizeDetails._offlineSegments._segments.values()) {
@@ -132,12 +144,19 @@ public TableSizeDetails getTableSizeDetails(@Nonnull String tableName, @Nonnegat
         }
       }
       if (largestSegmentSizeOnServer != DEFAULT_SIZE_WHEN_MISSING_OR_ERROR) {
-        _controllerMetrics.setValueOfTableGauge(offlineTableName,
-            ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER,
+        _controllerMetrics.setValueOfTableGauge(offlineTableName, ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER,
             largestSegmentSizeOnServer);
       }
     }
 
+    // Set the top level sizes to  DEFAULT_SIZE_WHEN_MISSING_OR_ERROR when all segments are error
+    if ((hasRealtimeTableConfig && hasOfflineTableConfig && isMissingAllRealtimeSegments && isMissingAllOfflineSegments)
+        || (hasOfflineTableConfig && !hasRealtimeTableConfig && isMissingAllOfflineSegments) || (hasRealtimeTableConfig
+        && !hasOfflineTableConfig && isMissingAllRealtimeSegments)) {
+      tableSizeDetails._reportedSizeInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
+      tableSizeDetails._estimatedSizeInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
+      tableSizeDetails._reportedSizePerReplicaInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
+    }
     return tableSizeDetails;
   }
 
@@ -158,6 +177,10 @@ static public class TableSizeDetails {
     @JsonProperty("estimatedSizeInBytes")
     public long _estimatedSizeInBytes = 0;
 
+    // reported size per replica
+    @JsonProperty("reportedSizePerReplicaInBytes")
+    public long _reportedSizePerReplicaInBytes = 0;
+
     @JsonProperty("offlineSegments")
     public TableSubTypeSizeDetails _offlineSegments;
 
@@ -186,6 +209,10 @@ static public class TableSubTypeSizeDetails {
     @JsonProperty("missingSegments")
     public int _missingSegments = 0;
 
+    // reported size per replica
+    @JsonProperty("reportedSizePerReplicaInBytes")
+    public long _reportedSizePerReplicaInBytes = 0;
+
     @JsonProperty("segments")
     public Map<String, SegmentSizeDetails> _segments = new HashMap<>();
   }
@@ -198,6 +225,10 @@ static public class SegmentSizeDetails {
     @JsonProperty("estimatedSizeInBytes")
     public long _estimatedSizeInBytes = 0;
 
+    // Max Reported size per replica
+    @JsonProperty("maxReportedSizePerReplicaInBytes")
+    public long _maxReportedSizePerReplicaInBytes = 0;
+
     @JsonProperty("serverInfo")
     public Map<String, SegmentSizeInfo> _serverInfo = new HashMap<>();
   }
@@ -248,12 +279,13 @@ public TableSubTypeSizeDetails getTableSubtypeSize(String tableNameWithType, int
       String segment = entry.getKey();
       SegmentSizeDetails sizeDetails = entry.getValue();
       // Iterate over all segment size info, update reported size, track max segment size and number of errored servers
-      long segmentLevelMax = -1L;
+      sizeDetails._maxReportedSizePerReplicaInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
       int errors = 0;
       for (SegmentSizeInfo sizeInfo : sizeDetails._serverInfo.values()) {
         if (sizeInfo.getDiskSizeInBytes() != DEFAULT_SIZE_WHEN_MISSING_OR_ERROR) {
           sizeDetails._reportedSizeInBytes += sizeInfo.getDiskSizeInBytes();
-          segmentLevelMax = Math.max(segmentLevelMax, sizeInfo.getDiskSizeInBytes());
+          sizeDetails._maxReportedSizePerReplicaInBytes =
+              Math.max(sizeDetails._maxReportedSizePerReplicaInBytes, sizeInfo.getDiskSizeInBytes());
         } else {
           errors++;
         }
@@ -261,12 +293,15 @@ public TableSubTypeSizeDetails getTableSubtypeSize(String tableNameWithType, int
       // Update estimated size, track segments that are missing from all servers
       if (errors != sizeDetails._serverInfo.size()) {
         // Use max segment size from other servers to estimate the segment size not reported
-        sizeDetails._estimatedSizeInBytes = sizeDetails._reportedSizeInBytes + errors * segmentLevelMax;
+        sizeDetails._estimatedSizeInBytes =
+            sizeDetails._reportedSizeInBytes + (errors * sizeDetails._maxReportedSizePerReplicaInBytes);
         subTypeSizeDetails._reportedSizeInBytes += sizeDetails._reportedSizeInBytes;
         subTypeSizeDetails._estimatedSizeInBytes += sizeDetails._estimatedSizeInBytes;
+        subTypeSizeDetails._reportedSizePerReplicaInBytes += sizeDetails._maxReportedSizePerReplicaInBytes;
       } else {
         // Segment is missing from all servers
         missingSegments.add(segment);
+        sizeDetails._maxReportedSizePerReplicaInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
         sizeDetails._reportedSizeInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
         sizeDetails._estimatedSizeInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
         subTypeSizeDetails._missingSegments++;
@@ -284,6 +319,7 @@ public TableSubTypeSizeDetails getTableSubtypeSize(String tableNameWithType, int
         LOGGER.warn("Failed to get size report for all {} segments of table: {}", numSegments, tableNameWithType);
         subTypeSizeDetails._reportedSizeInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
         subTypeSizeDetails._estimatedSizeInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
+        subTypeSizeDetails._reportedSizePerReplicaInBytes = DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
       } else {
         LOGGER.warn("Missing size report for {} out of {} segments for table {}", subTypeSizeDetails._missingSegments,
             numSegments, tableNameWithType);
diff --git a/pinot-controller/src/main/resources/app/App.tsx b/pinot-controller/src/main/resources/app/App.tsx
index af04a0cd4bc..7645957787b 100644
--- a/pinot-controller/src/main/resources/app/App.tsx
+++ b/pinot-controller/src/main/resources/app/App.tsx
@@ -17,49 +17,48 @@
  * under the License.
  */
 
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import { CircularProgress, createStyles, makeStyles, MuiThemeProvider } from '@material-ui/core';
-import { Switch, Route, HashRouter as Router, Redirect } from 'react-router-dom';
-import theme from './theme';
+import React, { useEffect, useState } from 'react';
+import { Switch, Route, Redirect, useHistory } from 'react-router-dom';
 import Layout from './components/Layout';
 import RouterData from './router';
 import PinotMethodUtils from './utils/PinotMethodUtils';
-import CustomNotification from './components/CustomNotification';
-import { NotificationContextProvider } from './components/Notification/NotificationContextProvider';
 import app_state from './app_state';
+import { useAuthProvider } from './components/auth/AuthProvider';
+import { AppLoadingIndicator } from './components/AppLoadingIndicator';
 import { AuthWorkflow } from 'Models';
 
-const useStyles = makeStyles(() =>
-  createStyles({
-    loader: {
-      position: 'fixed',
-      left: '50%',
-      top: '30%'
-    },
-  })
-);
+export const App = () => {
+  const [clusterName, setClusterName] = useState('');
+  const [loading, setLoading] = useState(true);
+  const [isAuthenticated, setIsAuthenticated] = useState(null);
+  const [role, setRole] = useState('');
+  const { authUserName, authUserEmail, authenticated, authWorkflow } = useAuthProvider();
+  const history = useHistory();
+
+  useEffect(() => {
+    // authentication already handled by authProvider
+    if (authUserEmail && authenticated) {
+      // Authenticated with an auth method that supports user identity
+      // Any code that needs user identity can go here
+    }
 
-const App = () => {
-  const [clusterName, setClusterName] = React.useState('');
-  const [loading, setLoading] = React.useState(true);
-  const oidcSignInFormRef = React.useRef<HTMLFormElement>(null);
-  const [isAuthenticated, setIsAuthenticated] = React.useState(null);
-  const [issuer, setIssuer] = React.useState(null);
-  const [redirectUri, setRedirectUri] = React.useState(null);
-  const [clientId, setClientId] = React.useState(null);
-  const [authWorkflow, setAuthWorkflow] = React.useState(null);
-  const [authorizationEndpoint, setAuthorizationEndpoint] = React.useState(
-    null
-  );
-  const [role, setRole] = React.useState('');
+    if (authenticated) {
+      setIsAuthenticated(true);
+    }
+  }, [authUserName, authUserEmail, authenticated]);
 
-  const fetchUserRole = async()=>{
+  useEffect(() => {
+    if(authWorkflow === AuthWorkflow.BASIC) {
+      setLoading(false);
+    }
+  }, [authWorkflow])
+
+  const fetchUserRole = async () => {
     const userListResponse = await PinotMethodUtils.getUserList();
     let userObj = userListResponse.users;
     let userData = [];
     for (let key in userObj) {
-      if(userObj.hasOwnProperty(key)){
+      if (userObj.hasOwnProperty(key)) {
         userData.push(userObj[key]);
       }
     }
@@ -91,8 +90,8 @@ const App = () => {
   };
 
   const getRouterData = () => {
-    if(app_state.queryConsoleOnlyView){
-      return RouterData.filter((routeObj)=>{return routeObj.path === '/query'});
+    if (app_state.queryConsoleOnlyView) {
+      return RouterData.filter((routeObj) => { return routeObj.path === '/query' });
     }
     if (app_state.hideQueryConsoleTab) {
       return RouterData.filter((routeObj) => routeObj.path !== '/query');
@@ -100,85 +99,7 @@ const App = () => {
     return RouterData;
   };
 
-  const getAuthInfo = async () => {
-    const authInfoResponse = await PinotMethodUtils.getAuthInfo();
-    // Issuer URL, if available
-    setIssuer(
-      authInfoResponse && authInfoResponse.issuer ? authInfoResponse.issuer : ''
-    );
-    // Redirect URI, if available
-    setRedirectUri(
-      authInfoResponse && authInfoResponse.redirectUri
-        ? authInfoResponse.redirectUri
-        : ''
-    );
-    // Client Id, if available
-    setClientId(
-      authInfoResponse && authInfoResponse.clientId
-        ? authInfoResponse.clientId
-        : ''
-    );
-    // Authentication workflow
-    setAuthWorkflow(
-      authInfoResponse && authInfoResponse.workflow
-        ? authInfoResponse.workflow
-        : AuthWorkflow.NONE
-    );
-  };
-
-  const initAuthWorkflow = async () => {
-    switch (authWorkflow) {
-      case AuthWorkflow.NONE: {
-        // No authentication required
-        setIsAuthenticated(true);
-
-        break;
-      }
-      case AuthWorkflow.BASIC: {
-        // Basic authentication, handled by login page
-        setLoading(false);
-
-        break;
-      }
-      case AuthWorkflow.OIDC: {
-        // OIDC authentication, check to see if access token is available in the URL
-        const accessToken = PinotMethodUtils.getAccessTokenFromHashParams();
-        if (accessToken) {
-          app_state.authWorkflow = AuthWorkflow.OIDC;
-          app_state.authToken = accessToken;
-
-          setIsAuthenticated(true);
-        } else {
-          // Set authorization endpoint
-          setAuthorizationEndpoint(`${issuer}/auth`);
-
-          setLoading(false);
-        }
-
-        break;
-      }
-      default: {
-        // Empty
-      }
-    }
-  };
-
-  React.useEffect(() => {
-    getAuthInfo();
-  }, []);
-
-  React.useEffect(() => {
-    initAuthWorkflow();
-  }, [authWorkflow]);
-
-  React.useEffect(() => {
-    if (authorizationEndpoint && oidcSignInFormRef && oidcSignInFormRef.current) {
-      // Authorization endpoint available; submit sign in form
-      oidcSignInFormRef.current.submit();
-    }
-  }, [authorizationEndpoint]);
-
-  React.useEffect(() => {
+  useEffect(() => {
     if (isAuthenticated) {
       fetchClusterConfig();
       fetchClusterName();
@@ -187,9 +108,14 @@ const App = () => {
   }, [isAuthenticated]);
 
   const loginRender = (Component, props) => {
+    if(isAuthenticated) {
+      history.push("/");
+      return;
+    }
+
     return (
       <div className="p-8">
-        <Component {...props} setIsAuthenticated={setIsAuthenticated}/>
+        <Component {...props} setIsAuthenticated={setIsAuthenticated} />
       </div>
     )
   };
@@ -204,71 +130,36 @@ const App = () => {
     )
   };
 
-  const classes = useStyles();
+  if (loading) {
+    return <AppLoadingIndicator />;
+  }
 
   return (
-    <MuiThemeProvider theme={theme}>
-      <NotificationContextProvider>
-        <CustomNotification />
-        {/* OIDC auth workflow */}
-        {authWorkflow && authWorkflow === AuthWorkflow.OIDC && !isAuthenticated ? (
-          <>
-            {/* OIDC sign in form */}
-            <form
-              hidden
-              action={authorizationEndpoint}
-              method="post"
-              ref={oidcSignInFormRef}
-            >
-              <input readOnly name="client_id" value={clientId} />
-              <input readOnly name="redirect_uri" value={redirectUri} />
-              <input readOnly name="scope" value="email openid" />
-              <input readOnly name="state" value="true-redirect-uri" />
-              <input readOnly name="response_type" value="id_token token" />
-              <input readOnly name="nonce" value="random_string" />
-              <input type="submit" value="" />
-            </form>
-          </>
-        ) : (
-          <>
-            {/* Non-OIDC/authenticated workflow */}
-            {loading ? (
-              <CircularProgress className={classes.loader} size={80} />
-            ) : (
-              <Router>
-                <Switch>
-                  {getRouterData().map(({ path, Component }, key) => (
-                    <Route
-                      exact
-                      path={path}
-                      key={key}
-                      render={(props) => {
-                        if (path === '/login') {
-                          return loginRender(Component, props);
-                        } else if (isAuthenticated) {
-                          // default render
-                          return componentRender(Component, props, role);
-                        } else {
-                          return <Redirect to="/login" />;
-                        }
-                      }}
-                    />
-                  ))}
-                  <Route path="*">
-                    <Redirect
-                      to={PinotMethodUtils.getURLWithoutAccessToken(
-                        app_state.queryConsoleOnlyView ? '/query' : '/'
-                      )}
-                    />
-                  </Route>
-                </Switch>
-              </Router>
-            )}
-          </>
-        )}
-      </NotificationContextProvider>
-    </MuiThemeProvider>
+    <Switch>
+      {getRouterData().map(({ path, Component }, key) => (
+        <Route
+          exact
+          path={path}
+          key={key}
+          render={(props) => {
+            if (path === '/login') {
+              return loginRender(Component, props);
+            } else if (isAuthenticated) {
+              // default render
+              return componentRender(Component, props, role);
+            } else {
+              return <Redirect to="/login" />;
+            }
+          }}
+        />
+      ))}
+      <Route path="*">
+        <Redirect
+          to={PinotMethodUtils.getURLWithoutAccessToken(
+            app_state.queryConsoleOnlyView ? '/query' : '/'
+          )}
+        />
+      </Route>
+    </Switch>
   );
 };
-
-ReactDOM.render(<App />, document.getElementById('app'));
diff --git a/pinot-controller/src/main/resources/app/components/AppLoadingIndicator.tsx b/pinot-controller/src/main/resources/app/components/AppLoadingIndicator.tsx
new file mode 100644
index 00000000000..773b21aabfe
--- /dev/null
+++ b/pinot-controller/src/main/resources/app/components/AppLoadingIndicator.tsx
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+
+import React from 'react';
+import { CircularProgress, makeStyles } from "@material-ui/core";
+
+export const useAppLoadingIndicatorStyles = makeStyles({
+  appLoadingIndicator: {
+    height: "100vh",
+    width: "100%",
+    display: "flex",
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+});
+
+export const AppLoadingIndicator = () => {
+  const classes = useAppLoadingIndicatorStyles();
+  return (
+    <div
+      className={classes.appLoadingIndicator}
+    >
+      <CircularProgress size={80} color="primary" />
+    </div>
+  )
+}
diff --git a/pinot-controller/src/main/resources/app/components/Query/QuerySideBar.tsx b/pinot-controller/src/main/resources/app/components/Query/QuerySideBar.tsx
index d886d3b1286..8e73d422d7c 100644
--- a/pinot-controller/src/main/resources/app/components/Query/QuerySideBar.tsx
+++ b/pinot-controller/src/main/resources/app/components/Query/QuerySideBar.tsx
@@ -66,7 +66,8 @@ const useStyles = makeStyles((theme: Theme) =>
     },
     leftPanel: {
       width: 300,
-      padding: '0 20px'
+      padding: '0 20px',
+      wordBreak: 'break-all',
     },
   }),
 );
@@ -101,6 +102,7 @@ const Sidebar = ({ tableList, fetchSQLData, tableSchema, selectedTable, queryLoa
               cellClickCallback={fetchSQLData}
               isCellClickable
               showSearchBox={true}
+              inAccordionFormat
             />
 
             {!queryLoader && tableSchema.records.length ? (
@@ -109,6 +111,7 @@ const Sidebar = ({ tableList, fetchSQLData, tableSchema, selectedTable, queryLoa
                 data={tableSchema}
                 highlightBackground
                 showSearchBox={true}
+                inAccordionFormat
               />
             ) : null}
           </Grid>
diff --git a/pinot-controller/src/main/resources/app/components/Table.tsx b/pinot-controller/src/main/resources/app/components/Table.tsx
index acb7171493b..b145bfab6d2 100644
--- a/pinot-controller/src/main/resources/app/components/Table.tsx
+++ b/pinot-controller/src/main/resources/app/components/Table.tsx
@@ -281,7 +281,7 @@ export default function CustomizedTables({
   accordionToggleObject,
   tooltipData
 }: Props) {
-  // Separate the initial and final data into two separte state variables.
+  // Separate the initial and final data into two separated state variables.
   // This way we can filter and sort the data without affecting the original data.
   // If the component receives new data, we can simply set the new data to the initial data,
   // and the filters and sorts will be applied to the new data.
@@ -333,7 +333,8 @@ export default function CustomizedTables({
         }
         return false;
       });
-      setFinalData(filteredRescords);
+      let filteredData = {...initialData, records: filteredRescords};
+      setFinalData(Utils.tableFormat(filteredData));
     }
   }, [initialData, setFinalData]);
 
@@ -341,6 +342,9 @@ export default function CustomizedTables({
     clearTimeout(timeoutId.current);
     timeoutId.current = setTimeout(() => {
       filterSearchResults(search.toLowerCase());
+      // Table.tsx currently doesn't support sorting after filtering. So for now, we just
+      // remove the visual indicator of the sorted column until users sort again.
+      setColumnClicked('')
     }, 200);
 
     return () => {
@@ -394,6 +398,9 @@ export default function CustomizedTables({
         />
       );
     }
+    if (str.search('\n') !== -1) {
+      return (<pre>{str.toString()}</pre>);
+    }
     return (<span>{str.toString()}</span>);
   };
 
diff --git a/pinot-controller/src/main/resources/app/components/auth/AuthProvider.tsx b/pinot-controller/src/main/resources/app/components/auth/AuthProvider.tsx
new file mode 100644
index 00000000000..c510438bc0d
--- /dev/null
+++ b/pinot-controller/src/main/resources/app/components/auth/AuthProvider.tsx
@@ -0,0 +1,281 @@
+/**
+ * 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.
+ */
+
+import { AuthLocalStorageKeys, AuthWorkflow } from 'Models';
+import React, { createContext, useContext, useEffect, useState } from 'react'
+import { useHistory, useLocation } from 'react-router';
+import { baseApi, getAxiosErrorInterceptor, getAxiosRequestInterceptor, getAxiosResponseInterceptor, transformApi } from '../../utils/axios-config';
+import PinotMethodUtils from '../../utils/PinotMethodUtils';
+import { AppLoadingIndicator } from '../AppLoadingIndicator';
+
+interface AuthProviderContextProps {
+    accessToken: string;
+    authUserName: string;
+    authUserEmail: string;
+    authenticated: boolean;
+    authWorkflow: AuthWorkflow
+}
+
+export const AuthProvider = ({ children }) => {
+    const [loading, setLoading] = useState<boolean>(true);
+    const [redirectUri, setRedirectUri] = useState<string | null>(null);
+    const [clientId, setClientId] = useState<string | null>(null);
+    const [authWorkflow, setAuthWorkflow] = useState<AuthWorkflow | null>(null);
+    const [accessToken, setAccessToken] = useState<string>("");
+    const [authUserName, setAuthUserName] = useState<string>("");
+    const [authUserEmail, setAuthUserEmail] = useState<string>("");
+    const [authenticated, setAuthenticated] = useState<boolean>(false);
+    const [authorizationEndpoint, setAuthorizationEndpoint] = useState<string | null>(null);
+    const [autoLogout, setAutoLogout] = useState<boolean>(false);
+    const history = useHistory();
+    const location = useLocation();
+    const [axiosRequestInterceptorIds, setAxiosRequestInterceptorIds] =
+        useState([0, 1]);
+    const [axiosResponseInterceptorIds, setAxiosResponseInterceptorIds] =
+        useState([0, 1]);
+    const oidcSignInFormRef = React.useRef<HTMLFormElement>(null);
+
+    useEffect(() => {
+        initAuthDetails();
+    }, []);
+
+    useEffect(() => {
+        if (loading || authenticated) {
+            return;
+        }
+
+        initOidcAuth();
+    }, [loading, authenticated]);
+
+    useEffect(() => {
+        if (!autoLogout) {
+            return;
+        }
+
+        submitLoginForm();
+    }, [autoLogout])
+
+    const initAuthDetails = async () => {
+        // fetch auth info details
+        const authInfoResponse = await PinotMethodUtils.getAuthInfo();
+
+        const authWorkFlowInternal =
+            authInfoResponse && authInfoResponse.workflow
+                ? authInfoResponse.workflow
+                : AuthWorkflow.NONE;
+
+        // set auth workflow
+        setAuthWorkflow(authWorkFlowInternal);
+
+        if (authWorkFlowInternal === AuthWorkflow.NONE) {
+            // No authentication required
+            setAuthenticated(true);
+        }
+
+        if (authWorkFlowInternal === AuthWorkflow.BASIC) {
+            // basic auth is handled by login page
+        }
+
+        // set OIDC auth details 
+        if (authWorkFlowInternal === AuthWorkflow.OIDC) {
+            const issuer =
+                authInfoResponse && authInfoResponse.issuer ? authInfoResponse.issuer : '';
+
+            setAuthorizationEndpoint(`${issuer}/auth`);
+            setRedirectUri(
+                authInfoResponse && authInfoResponse.redirectUri
+                    ? authInfoResponse.redirectUri
+                    : ''
+            );
+            setClientId(
+                authInfoResponse && authInfoResponse.clientId
+                    ? authInfoResponse.clientId
+                    : ''
+            );
+        }
+
+        // auth loading complete
+        setLoading(false);
+    }
+
+    const initOidcAuth = () => {
+        // access token already available in the localStorage
+        const accessToken = getAuthLocalStorageValue(AuthLocalStorageKeys.AccessToken);
+        if (accessToken) {
+            setAccessToken(accessToken);
+            setAuthUserName(PinotMethodUtils.getAuthUserNameFromAccessToken(accessToken.replace("Bearer ", "")))
+            setAuthUserEmail(PinotMethodUtils.getAuthUserEmailFromAccessToken(accessToken.replace("Bearer ", "")))
+            
+            initAxios(accessToken);
+            setAuthenticated(true);
+
+            return;
+        }
+
+        // access token available in hash params
+        const accessTokenFromHashParam = PinotMethodUtils.getAccessTokenFromHashParams();
+        if (accessTokenFromHashParam) {
+            const accessToken = `Bearer ${accessTokenFromHashParam}`;
+            setAccessToken(accessToken);
+            setAuthUserName(PinotMethodUtils.getAuthUserNameFromAccessToken(accessTokenFromHashParam))
+            setAuthUserEmail(PinotMethodUtils.getAuthUserEmailFromAccessToken(accessTokenFromHashParam))
+
+            setAuthLocalStorageValue(AuthLocalStorageKeys.AccessToken, accessToken);
+            initAxios(accessToken);
+            setAuthenticated(true);
+            redirectToApp();
+
+            return;
+        }
+
+        // no access token available
+        const redirectPathAfterLogin = location.pathname;
+        // save current path to redirect after login
+        setAuthLocalStorageValue(AuthLocalStorageKeys.RedirectLocation, redirectPathAfterLogin);
+        // login
+        submitLoginForm();
+    }
+
+    const submitLoginForm = () => {
+        // submit auth login form
+        if (clientId && authorizationEndpoint && redirectUri && oidcSignInFormRef && oidcSignInFormRef.current) {
+            oidcSignInFormRef.current.submit();
+        }
+    }
+
+    const handleUnauthenticatedAccess = () => {
+        setAuthLocalStorageValue(AuthLocalStorageKeys.AccessToken, "");
+        setAuthLocalStorageValue(AuthLocalStorageKeys.RedirectLocation, "");
+
+        setAutoLogout(true);
+    }
+
+    // initialize axios instance with authToken
+    const initAxios = (accessToken: string) => {
+
+        // Clear existing interceptors
+        baseApi.interceptors.request.eject(axiosRequestInterceptorIds[0]);
+        baseApi.interceptors.response.eject(axiosResponseInterceptorIds[0]);
+
+        transformApi.interceptors.request.eject(axiosRequestInterceptorIds[1]);
+        transformApi.interceptors.response.eject(axiosResponseInterceptorIds[1]);
+
+        const requestInterceptorId1 = baseApi.interceptors.request.use(
+            getAxiosRequestInterceptor(accessToken),
+            getAxiosErrorInterceptor(handleUnauthenticatedAccess)
+        );
+
+        const requestInterceptorId2 = transformApi.interceptors.request.use(
+            getAxiosRequestInterceptor(accessToken),
+            getAxiosErrorInterceptor(handleUnauthenticatedAccess)
+        );
+
+        const responseInterceptor1 = baseApi.interceptors.response.use(
+            getAxiosResponseInterceptor(),
+            getAxiosErrorInterceptor(handleUnauthenticatedAccess)
+        );
+
+        const responseInterceptor2 = transformApi.interceptors.response.use(
+            getAxiosResponseInterceptor(),
+            getAxiosErrorInterceptor(handleUnauthenticatedAccess)
+        );
+
+        // Set new interceptors
+        setAxiosRequestInterceptorIds([requestInterceptorId1, requestInterceptorId2]);
+        setAxiosResponseInterceptorIds([responseInterceptor1, responseInterceptor2]);
+    }
+
+    // redirect to app with appropriate location after login
+    const redirectToApp = () => {
+        const redirectLocation = getAuthLocalStorageValue(AuthLocalStorageKeys.RedirectLocation);
+        if (redirectLocation && redirectLocation !== "/login" && redirectLocation !== "/logout") {
+            setAuthLocalStorageValue(AuthLocalStorageKeys.RedirectLocation, "");
+            history.push(redirectLocation);
+        }
+    }
+
+    const getAuthLocalStorageValue = (key: AuthLocalStorageKeys) => {
+        return (localStorage.getItem(key) || "");
+    }
+
+    const setAuthLocalStorageValue = (key: AuthLocalStorageKeys, value: string) => {
+        localStorage.setItem(key, value);
+    }
+
+    const authProvider: AuthProviderContextProps = {
+        authWorkflow: authWorkflow,
+        accessToken: accessToken,
+        authUserName: authUserName,
+        authUserEmail: authUserEmail,
+        authenticated: authenticated
+    }
+
+    if (loading) {
+        return <AppLoadingIndicator />
+    }
+
+
+    return (
+        <AuthProviderContext.Provider value={authProvider}>
+            {children}
+
+            {authWorkflow === AuthWorkflow.OIDC && (<div>
+                {/* Login form */}
+                <form
+                    hidden
+                    // When the user is automatically logged out, attaching automatic-logout=true
+                    // query parameter displays appropriate message to the user (dex only)
+                    action={`${authorizationEndpoint && authorizationEndpoint
+                        }?automatic-logout=${autoLogout}`
+                    }
+                    method="post"
+                    ref={oidcSignInFormRef}
+                >
+                    <input
+                        readOnly
+                        name="response_type"
+                        value="token id_token"
+                    />
+                    <input readOnly name="client_id" value={clientId} />
+                    <input
+                        readOnly
+                        name="redirect_uri"
+                        value={redirectUri}
+                    />
+                    <input
+                        readOnly
+                        name="scope"
+                        value="openid email profile groups"
+                    />
+                    <input readOnly name="state" value="true-redirect-uri" />
+                    <input readOnly name="nonce" value="random_string" />
+                    <input type="submit" value="" />
+                </form>
+            </div>)}
+        </AuthProviderContext.Provider>
+    )
+}
+
+const AuthProviderContext = createContext<AuthProviderContextProps>(
+    {} as AuthProviderContextProps
+);
+
+export const useAuthProvider = (): AuthProviderContextProps => {
+    return useContext(AuthProviderContext);
+};
diff --git a/pinot-controller/src/main/resources/app/index.tsx b/pinot-controller/src/main/resources/app/index.tsx
new file mode 100644
index 00000000000..d06d57bbc49
--- /dev/null
+++ b/pinot-controller/src/main/resources/app/index.tsx
@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+
+import { MuiThemeProvider } from "@material-ui/core";
+import { AuthProvider } from "./components/auth/AuthProvider";
+import CustomNotification from "./components/CustomNotification";
+import { NotificationContextProvider } from "./components/Notification/NotificationContextProvider";
+import theme from "./theme";
+import React from "react";
+import ReactDOM from "react-dom";
+import { App } from "./App";
+import { HashRouter } from "react-router-dom";
+
+ReactDOM.render(
+    <HashRouter>
+        <MuiThemeProvider theme={theme}>
+            <NotificationContextProvider>
+                <CustomNotification />
+                <AuthProvider>
+                    <App />
+                </AuthProvider>
+            </NotificationContextProvider>
+        </MuiThemeProvider>
+    </HashRouter>, 
+    document.getElementById('app')
+);
diff --git a/pinot-controller/src/main/resources/app/interfaces/types.d.ts b/pinot-controller/src/main/resources/app/interfaces/types.d.ts
index 4be7e6f76bc..e24b58456e4 100644
--- a/pinot-controller/src/main/resources/app/interfaces/types.d.ts
+++ b/pinot-controller/src/main/resources/app/interfaces/types.d.ts
@@ -47,6 +47,11 @@ declare module 'Models' {
     hostName: string;
     enabled: boolean;
     port: number;
+    grpcPort: number;
+    adminPort: number;
+    queryServicePort: number;
+    queryMailboxPort: number;
+    queriesDisabled: boolean;
     tags: Array<string>;
     pools?: string;
   };
@@ -165,6 +170,11 @@ declare module 'Models' {
     OIDC = 'OIDC',
   }
 
+  export const enum AuthLocalStorageKeys {
+    RedirectLocation = "redirectLocation",
+    AccessToken = "AccessToken",
+  }
+
   export type TableList = {
     tables: Array<string>
   }
diff --git a/pinot-controller/src/main/resources/app/pages/InstanceDetails.tsx b/pinot-controller/src/main/resources/app/pages/InstanceDetails.tsx
index ca1e83c909c..1039655a3dd 100644
--- a/pinot-controller/src/main/resources/app/pages/InstanceDetails.tsx
+++ b/pinot-controller/src/main/resources/app/pages/InstanceDetails.tsx
@@ -120,6 +120,11 @@ const InstanceDetails = ({ match }: RouteComponentProps<Props>) => {
       type: instanceType,
       tags: instanceDetails.tags,
       pools: instanceDetails.pools,
+      grpcPort: instanceDetails.grpcPort,
+      adminPort: instanceDetails.adminPort,
+      queryServicePort: instanceDetails.queryServicePort,
+      queryMailboxPort: instanceDetails.queryMailboxPort,
+      queriesDisabled: instanceDetails.queriesDisabled,
     };
     setState({enabled: instanceDetails.enabled});
     setInstanceDetails(JSON.stringify(instancePutObj, null, 2));
diff --git a/pinot-controller/src/main/resources/app/pages/TenantDetails.tsx b/pinot-controller/src/main/resources/app/pages/TenantDetails.tsx
index 9d3d7632dd3..b554bd8376f 100644
--- a/pinot-controller/src/main/resources/app/pages/TenantDetails.tsx
+++ b/pinot-controller/src/main/resources/app/pages/TenantDetails.tsx
@@ -384,7 +384,7 @@ const TenantPageDetails = ({ match }: RouteComponentProps<Props>) => {
       setShowReloadStatusModal(true);
       const [reloadStatusData, tableJobsData] = await Promise.all([
         PinotMethodUtils.reloadStatusOp(tableName, tableType),
-        PinotMethodUtils.fetchTableJobs(tableName, "RELOAD_SEGMENT,RELOAD_ALL_SEGMENTS"),
+        PinotMethodUtils.fetchTableJobs(tableName, "RELOAD_SEGMENT"),
       ]);
 
       if(reloadStatusData.error || tableJobsData.error) {
diff --git a/pinot-controller/src/main/resources/app/utils/PinotMethodUtils.ts b/pinot-controller/src/main/resources/app/utils/PinotMethodUtils.ts
index cf7defca44e..07175ad49c1 100644
--- a/pinot-controller/src/main/resources/app/utils/PinotMethodUtils.ts
+++ b/pinot-controller/src/main/resources/app/utils/PinotMethodUtils.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import jwtDecode from "jwt-decode";
 import { get, map, each, isEqual, isArray, keys, union } from 'lodash';
 import { DataTable, SQLResult } from 'Models';
 import moment from 'moment';
@@ -577,6 +578,7 @@ const getSegmentDetails = (tableName, segmentName) => {
     const segmentMetaDataJson = { ...segmentMetaData }
     delete segmentMetaDataJson.indexes
     delete segmentMetaDataJson.columns
+    const indexes = get(segmentMetaData, 'indexes', {})
 
     return {
       replicaSet: {
@@ -585,7 +587,7 @@ const getSegmentDetails = (tableName, segmentName) => {
       },
       indexes: {
         columns: ['Field Name', 'Bloom Filter', 'Dictionary', 'Forward Index', 'Sorted', 'Inverted Index', 'JSON Index', 'Null Value Vector Reader', 'Range Index'],
-        records: Object.keys(segmentMetaData.indexes).map(fieldName => [
+        records: Object.keys(indexes).map(fieldName => [
           fieldName,
           segmentMetaData.indexes[fieldName]["bloom-filter"] === "YES",
           segmentMetaData.indexes[fieldName]["dictionary"] === "YES",
@@ -1002,7 +1004,9 @@ const verifyAuth = (authToken) => {
 
 const getAccessTokenFromHashParams = () => {
   let accessToken = '';
-  const urlSearchParams = new URLSearchParams(location.hash.substr(1));
+  const hashParam = removeAllLeadingForwardSlash(location.hash.substring(1));
+  
+  const urlSearchParams = new URLSearchParams(hashParam);
   if (urlSearchParams.has('access_token')) {
     accessToken = urlSearchParams.get('access_token') as string;
   }
@@ -1010,6 +1014,13 @@ const getAccessTokenFromHashParams = () => {
   return accessToken;
 };
 
+const removeAllLeadingForwardSlash = (string: string) => {
+  if(!string) {
+    return "";
+  }
+
+  return string.replace(new RegExp("^/+", "g"), "");
+}
 
 // validates app redirect path with known routes
 const validateRedirectPath = (path: string): boolean => {
@@ -1144,6 +1155,52 @@ const updateUser = (userObject, passwordChanged) =>{
   })
 }
 
+const getAuthUserNameFromAccessToken = (
+  accessToken: string
+): string => {
+  if (!accessToken) {
+      return "";
+  }
+
+  let decoded;
+  try {
+      decoded = jwtDecode(accessToken);
+  } catch (e) {
+      return "";
+  }
+
+  if (!decoded) {
+      return "";
+  }
+
+  const name = get(decoded, "name") || "";
+  return name;
+};
+
+const getAuthUserEmailFromAccessToken = (
+  accessToken: string
+): string => {
+  if (!accessToken) {
+      return "";
+  }
+
+  let decoded;
+  try {
+      decoded = jwtDecode(accessToken);
+  } catch (e) {
+      return "";
+  }
+
+  if (!decoded) {
+      return "";
+  }
+
+  const email =
+      get(decoded, "email") || "";
+
+  return email;
+};
+
 export default {
   getTenantsData,
   getAllInstances,
@@ -1226,5 +1283,7 @@ export default {
   getUserList,
   addUser,
   deleteUser,
-  updateUser
+  updateUser,
+  getAuthUserNameFromAccessToken,
+  getAuthUserEmailFromAccessToken
 };
diff --git a/pinot-controller/src/main/resources/app/utils/Utils.tsx b/pinot-controller/src/main/resources/app/utils/Utils.tsx
index 2153c9175bd..582b897033f 100644
--- a/pinot-controller/src/main/resources/app/utils/Utils.tsx
+++ b/pinot-controller/src/main/resources/app/utils/Utils.tsx
@@ -22,7 +22,7 @@ import React from 'react';
 import ReactDiffViewer, {DiffMethod} from 'react-diff-viewer';
 import { map, isEqual, findIndex, findLast } from 'lodash';
 import app_state from '../app_state';
-import { DISPLAY_SEGMENT_STATUS, SEGMENT_STATUS } from 'Models';
+import {DISPLAY_SEGMENT_STATUS, SEGMENT_STATUS, TableData} from 'Models';
 
 const sortArray = function (sortingArr, keyName, ascendingFlag) {
   if (ascendingFlag) {
@@ -47,13 +47,13 @@ const sortArray = function (sortingArr, keyName, ascendingFlag) {
   });
 };
 
-const tableFormat = (data) => {
+const tableFormat = (data: TableData): Array<{ [key: string]: any }> => {
   const rows = data.records;
   const header = data.columns;
 
-  const results = [];
+  const results: Array<{ [key: string]: any }> = [];
   rows.forEach((singleRow) => {
-    const obj = {};
+    const obj: { [key: string]: any } = {};
     singleRow.forEach((val: any, index: number) => {
       obj[header[index]+app_state.columnNameSeparator+index] = val;
     });
diff --git a/pinot-controller/src/main/resources/app/utils/axios-config.ts b/pinot-controller/src/main/resources/app/utils/axios-config.ts
index 595628c4fe4..491c5e270b2 100644
--- a/pinot-controller/src/main/resources/app/utils/axios-config.ts
+++ b/pinot-controller/src/main/resources/app/utils/axios-config.ts
@@ -17,60 +17,81 @@
  * under the License.
  */
 
-/* eslint-disable no-console */
-
 import axios from 'axios';
 import { AuthWorkflow } from 'Models';
 import app_state from '../app_state';
+import { AxiosError, AxiosRequestConfig } from "axios";
 
 const isDev = process.env.NODE_ENV !== 'production';
 
-const handleError = (error: any) => {
-  if (isDev) {
-    console.log(error);
-  }
-  return error.response || error;
-};
+// Returns axios request interceptor
+export const getAxiosRequestInterceptor = (
+    accessToken?: string
+): ((requestConfig: AxiosRequestConfig) => AxiosRequestConfig) => {
+    const requestInterceptor = (
+        requestConfig: AxiosRequestConfig
+    ): AxiosRequestConfig => {
+        // If access token is available, attach it to the request
+        // basic auth
+        if (app_state.authWorkflow === AuthWorkflow.BASIC && app_state.authToken) {
+            requestConfig.headers = {
+                Authorization: app_state.authToken,
+            };
+        }
+
+        // OIDC auth
+        if (accessToken) {
+            requestConfig.headers = {
+                Authorization: accessToken,
+            };
+        }
 
-const handleResponse = (response: any) => {
-  if (isDev) {
-    console.log(response);
-  }
-  return response;
+        return requestConfig;
+    };
+
+    return requestInterceptor;
 };
 
-const handleConfig = (config: any) => {
-  // Attach auth token for basic auth
-  if (app_state.authWorkflow === AuthWorkflow.BASIC && app_state.authToken) {
-    Object.assign(config.headers, { Authorization: app_state.authToken });
-  }
+// Returns axios rejected response interceptor
+export const getAxiosErrorInterceptor = (
+    unauthenticatedAccessFn?: () => void
+): ((error: AxiosError) => void) => {
+    const rejectedResponseInterceptor = (error: AxiosError): any => {
+        if (error && error.response && (error.response.status === 401 || error.response.status === 403)) {
+            // Unauthenticated access
+            unauthenticatedAccessFn && unauthenticatedAccessFn();
+        }
+
+        return error.response || error;
+    };
 
-  // Attach auth token for OIDC auth
-  if (app_state.authWorkflow === AuthWorkflow.OIDC && app_state.authToken) {
-    Object.assign(config.headers, {
-      Authorization: `Bearer ${app_state.authToken}`,
-    });
-  }
+    return rejectedResponseInterceptor;
+};
 
-  if (isDev) {
-    console.log(config);
-  }
+// Returns axios fulfilled response interceptor
+export const getAxiosResponseInterceptor = (): (<T>(
+    response: T
+) => T | Promise<T>) => {
+    const fulfilledResponseInterceptor = <T>(response: T): T | Promise<T> => {
+        // Forward the fulfilled response
+        return response;
+    };
 
-  return config;
+    return fulfilledResponseInterceptor;
 };
 
 export const baseApi = axios.create({ baseURL: '/' });
-baseApi.interceptors.request.use(handleConfig, handleError);
-baseApi.interceptors.response.use(handleResponse, handleError);
+baseApi.interceptors.request.use(getAxiosRequestInterceptor(), getAxiosErrorInterceptor());
+baseApi.interceptors.response.use(getAxiosResponseInterceptor(), getAxiosErrorInterceptor());
 
 export const transformApi = axios.create({baseURL: '/', transformResponse: [data => data]});
-transformApi.interceptors.request.use(handleConfig, handleError);
-transformApi.interceptors.response.use(handleResponse, handleError);
+transformApi.interceptors.request.use(getAxiosRequestInterceptor(), getAxiosErrorInterceptor());
+transformApi.interceptors.response.use(getAxiosResponseInterceptor(), getAxiosErrorInterceptor());
 
 // baseApi axios instance does not throw an error when API fails hence the control will never go to catch block
 // changing the handleError method of baseApi will cause current UI to break (as UI might have not handle error properly)
 // creating a new axios instance baseApiWithErrors which can be used when adding new API's
 // NOTE: It is an add-on utility and can be used in case you want to handle/show UI when API fails.
 export const baseApiWithErrors = axios.create({ baseURL: '/' });
-baseApiWithErrors.interceptors.request.use(handleConfig);
-baseApiWithErrors.interceptors.response.use(handleResponse);
+baseApiWithErrors.interceptors.request.use(getAxiosRequestInterceptor());
+baseApiWithErrors.interceptors.response.use(getAxiosResponseInterceptor());
diff --git a/pinot-controller/src/main/resources/package-lock.json b/pinot-controller/src/main/resources/package-lock.json
index f755f3ab855..dc5f099f980 100644
--- a/pinot-controller/src/main/resources/package-lock.json
+++ b/pinot-controller/src/main/resources/package-lock.json
@@ -5419,6 +5419,11 @@
         "object.assign": "^4.1.0"
       }
     },
+    "jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
diff --git a/pinot-controller/src/main/resources/package.json b/pinot-controller/src/main/resources/package.json
index fa905012071..f886dfb40fd 100644
--- a/pinot-controller/src/main/resources/package.json
+++ b/pinot-controller/src/main/resources/package.json
@@ -7,6 +7,7 @@
     "start": "npm-run-all --parallel lint dev",
     "build": "webpack --mode production",
     "build-dev": "webpack --mode development",
+    "build-ci": "if [ \"$CI\" = true ]; then npm run-script build; else npm run-script build-dev; fi",
     "build-analyze": "webpack --mode production --analyze",
     "lint": "eslint 'app/**/*.{js,ts,tsx,jsx}' --quiet --fix",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -78,6 +79,7 @@
     "file": "0.2.2",
     "json-bigint": "1.0.0",
     "jsonlint": "1.6.3",
+    "jwt-decode": "^3.1.2",
     "lodash": "4.17.21",
     "moment": "2.29.3",
     "prop-types": "15.8.1",
diff --git a/pinot-controller/src/main/resources/webpack.config.js b/pinot-controller/src/main/resources/webpack.config.js
index 6ed7a39660b..65e89e366ab 100644
--- a/pinot-controller/src/main/resources/webpack.config.js
+++ b/pinot-controller/src/main/resources/webpack.config.js
@@ -38,7 +38,7 @@ module.exports = (env, argv) => {
       extensions: ['.ts', '.tsx', '.js'],
       modules: ['./app', 'node_modules'],
     },
-    entry: './app/App.tsx',
+    entry: './app/index.tsx',
     output: {
       path: path.resolve(__dirname, 'dist/webapp'),
       filename: './js/main.js'
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerConfTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerConfTest.java
index 159af6dc004..49494b914e3 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerConfTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/ControllerConfTest.java
@@ -158,6 +158,29 @@ public void shouldBeAbleToDisableUsingNewConfig() {
     Assert.assertEquals(conf.getTaskManagerFrequencyInSeconds(), -1);
   }
 
+  @Test
+  public void shouldBeAbleToSetDataDir() {
+    Map<String, Object> controllerConfig = new HashMap<>();
+    ControllerConf conf = new ControllerConf(controllerConfig);
+    Assert.assertEquals(conf.getDataDir(), null);
+
+    // test for the dataDir s3 value with ending slash
+    conf.setDataDir("s3://<bucket_name>/controller/");
+    Assert.assertEquals(conf.getDataDir(), "s3://<bucket_name>/controller");
+
+    // test for the dataDir s3 value without ending slash
+    conf.setDataDir("s3://<bucket_name>/controller");
+    Assert.assertEquals(conf.getDataDir(), "s3://<bucket_name>/controller");
+
+    // test for the dataDir non-s3 value without ending slash
+    conf.setDataDir("/tmp/PinotController");
+    Assert.assertEquals(conf.getDataDir(), "/tmp/PinotController");
+
+    // test for the dataDir non-s3 value with ending slash
+    conf.setDataDir("/tmp/PinotController/");
+    Assert.assertEquals(conf.getDataDir(), "/tmp/PinotController");
+  }
+
   private void assertOnDurations(ControllerConf conf, long expectedDuration, Map<String, Object> controllerConfig) {
     int segmentLevelValidationIntervalInSeconds = conf.getSegmentLevelValidationIntervalInSeconds();
     int segmentRelocatorFrequencyInSeconds = conf.getSegmentRelocatorFrequencyInSeconds();
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceStatelessTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceStatelessTest.java
index 38334bb25a8..570c59438cf 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceStatelessTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceAssignmentRestletResourceStatelessTest.java
@@ -21,15 +21,19 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.common.assignment.InstancePartitionsUtils;
+import org.apache.pinot.common.tier.TierFactory;
 import org.apache.pinot.common.utils.config.TagNameUtils;
 import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.helix.ControllerTest;
 import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConfigUtils;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.config.table.TierConfig;
 import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
 import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig;
@@ -59,6 +63,8 @@ public class PinotInstanceAssignmentRestletResourceStatelessTest extends Control
   private static final String RAW_TABLE_NAME = "testTable";
   private static final String TIME_COLUMN_NAME = "daysSinceEpoch";
 
+  private static final String TIER_NAME = "tier1";
+
   @BeforeClass
   public void setUp()
       throws Exception {
@@ -112,15 +118,15 @@ public void testInstanceAssignment()
     // Add OFFLINE instance assignment config to the offline table config
     InstanceAssignmentConfig offlineInstanceAssignmentConfig = new InstanceAssignmentConfig(
         new InstanceTagPoolConfig(TagNameUtils.getOfflineTagForTenant(SERVER_TENANT_NAME), false, 0, null), null,
-        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false));
+        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false, null));
     offlineTableConfig.setInstanceAssignmentConfigMap(
-        Collections.singletonMap(InstancePartitionsType.OFFLINE, offlineInstanceAssignmentConfig));
+        Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(), offlineInstanceAssignmentConfig));
     _helixResourceManager.setExistingTableConfig(offlineTableConfig);
 
     // OFFLINE instance partitions should be generated
-    Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap = getInstancePartitionsMap();
+    Map<String, InstancePartitions> instancePartitionsMap = getInstancePartitionsMap();
     assertEquals(instancePartitionsMap.size(), 1);
-    InstancePartitions offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+    InstancePartitions offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE.toString());
     assertNotNull(offlineInstancePartitions);
     assertEquals(offlineInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(offlineInstancePartitions.getNumPartitions(), 1);
@@ -130,74 +136,110 @@ public void testInstanceAssignment()
     // Add CONSUMING instance assignment config to the real-time table config
     InstanceAssignmentConfig consumingInstanceAssignmentConfig = new InstanceAssignmentConfig(
         new InstanceTagPoolConfig(TagNameUtils.getRealtimeTagForTenant(SERVER_TENANT_NAME), false, 0, null), null,
-        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false));
+        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false, null));
     realtimeTableConfig.setInstanceAssignmentConfigMap(
-        Collections.singletonMap(InstancePartitionsType.CONSUMING, consumingInstanceAssignmentConfig));
+        Collections.singletonMap(InstancePartitionsType.CONSUMING.toString(), consumingInstanceAssignmentConfig));
     _helixResourceManager.setExistingTableConfig(realtimeTableConfig);
 
     // CONSUMING instance partitions should be generated
     instancePartitionsMap = getInstancePartitionsMap();
     assertEquals(instancePartitionsMap.size(), 2);
-    offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+    offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE.toString());
     assertNotNull(offlineInstancePartitions);
     assertEquals(offlineInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(offlineInstancePartitions.getNumPartitions(), 1);
     assertEquals(offlineInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
-    InstancePartitions consumingInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.CONSUMING);
+    InstancePartitions consumingInstancePartitions =
+        instancePartitionsMap.get(InstancePartitionsType.CONSUMING.toString());
     assertNotNull(consumingInstancePartitions);
     assertEquals(consumingInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(consumingInstancePartitions.getNumPartitions(), 1);
     assertEquals(consumingInstancePartitions.getInstances(0, 0).size(), 1);
     String consumingInstanceId = consumingInstancePartitions.getInstances(0, 0).get(0);
 
+    // Add tier config and tier instance assignment config to the offline table config
+    offlineTableConfig.setTierConfigsList(Collections.singletonList(
+        new TierConfig(TIER_NAME, TierFactory.TIME_SEGMENT_SELECTOR_TYPE, "7d", null,
+            TierFactory.PINOT_SERVER_STORAGE_TYPE, TagNameUtils.getOfflineTagForTenant(SERVER_TENANT_NAME), null,
+            null)));
+    InstanceAssignmentConfig tierInstanceAssignmentConfig = new InstanceAssignmentConfig(
+        new InstanceTagPoolConfig(TagNameUtils.getOfflineTagForTenant(SERVER_TENANT_NAME), false, 0, null), null,
+        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false, null));
+    Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap = new HashMap<>();
+    instanceAssignmentConfigMap.put(InstancePartitionsType.OFFLINE.toString(), offlineInstanceAssignmentConfig);
+    instanceAssignmentConfigMap.put(TIER_NAME, tierInstanceAssignmentConfig);
+    offlineTableConfig.setInstanceAssignmentConfigMap(instanceAssignmentConfigMap);
+    _helixResourceManager.setExistingTableConfig(offlineTableConfig);
+
+    // tier instance partitions should be generated
+    Map<String, InstancePartitions> tierInstancePartitionsMap = getInstancePartitionsMap();
+    assertEquals(tierInstancePartitionsMap.size(), 3);
+    InstancePartitions tierInstancePartitions = tierInstancePartitionsMap.get(TIER_NAME);
+    assertNotNull(tierInstancePartitions);
+    assertEquals(tierInstancePartitions.getNumReplicaGroups(), 1);
+    assertEquals(tierInstancePartitions.getNumPartitions(), 1);
+    assertEquals(tierInstancePartitions.getInstances(0, 0).size(), 1);
+
     // Use OFFLINE instance assignment config as the COMPLETED instance assignment config
-    realtimeTableConfig.setInstanceAssignmentConfigMap(
-        new TreeMap<InstancePartitionsType, InstanceAssignmentConfig>() {{
-          put(InstancePartitionsType.CONSUMING, consumingInstanceAssignmentConfig);
-          put(InstancePartitionsType.COMPLETED, offlineInstanceAssignmentConfig);
-        }});
+    realtimeTableConfig.setInstanceAssignmentConfigMap(new TreeMap<String, InstanceAssignmentConfig>() {{
+      put(InstancePartitionsType.CONSUMING.toString(), consumingInstanceAssignmentConfig);
+      put(InstancePartitionsType.COMPLETED.toString(), offlineInstanceAssignmentConfig);
+    }});
     _helixResourceManager.setExistingTableConfig(realtimeTableConfig);
 
     // COMPLETED instance partitions should be generated
     instancePartitionsMap = getInstancePartitionsMap();
-    assertEquals(instancePartitionsMap.size(), 3);
-    offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+    assertEquals(instancePartitionsMap.size(), 4);
+    offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE.toString());
     assertNotNull(offlineInstancePartitions);
     assertEquals(offlineInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(offlineInstancePartitions.getNumPartitions(), 1);
     assertEquals(offlineInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
-    consumingInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.CONSUMING);
+    consumingInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.CONSUMING.toString());
     assertNotNull(consumingInstancePartitions);
     assertEquals(consumingInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(consumingInstancePartitions.getNumPartitions(), 1);
     assertEquals(consumingInstancePartitions.getInstances(0, 0), Collections.singletonList(consumingInstanceId));
-    InstancePartitions completedInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.COMPLETED);
+    InstancePartitions completedInstancePartitions =
+        instancePartitionsMap.get(InstancePartitionsType.COMPLETED.toString());
     assertEquals(completedInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(completedInstancePartitions.getNumPartitions(), 1);
     assertEquals(completedInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
+    InstancePartitions tInstancePartitions = instancePartitionsMap.get(TIER_NAME);
+    assertEquals(tInstancePartitions.getNumReplicaGroups(), 1);
+    assertEquals(tInstancePartitions.getNumPartitions(), 1);
+    assertEquals(tInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
 
     // Test fetching instance partitions by table name with type suffix
     instancePartitionsMap = deserializeInstancePartitionsMap(sendGetRequest(
         _controllerRequestURLBuilder.forInstancePartitions(TableNameBuilder.OFFLINE.tableNameWithType(RAW_TABLE_NAME),
             null)));
-    assertEquals(instancePartitionsMap.size(), 1);
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.OFFLINE));
+    assertEquals(instancePartitionsMap.size(), 2);
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.OFFLINE.toString()));
+    assertTrue(instancePartitionsMap.containsKey(TIER_NAME));
     instancePartitionsMap = deserializeInstancePartitionsMap(sendGetRequest(
         _controllerRequestURLBuilder.forInstancePartitions(TableNameBuilder.REALTIME.tableNameWithType(RAW_TABLE_NAME),
             null)));
     assertEquals(instancePartitionsMap.size(), 2);
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.CONSUMING));
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED));
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.CONSUMING.toString()));
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED.toString()));
 
     // Test fetching instance partitions by table name and instance partitions type
     for (InstancePartitionsType instancePartitionsType : InstancePartitionsType.values()) {
-      instancePartitionsMap = deserializeInstancePartitionsMap(
-          sendGetRequest(_controllerRequestURLBuilder.forInstancePartitions(RAW_TABLE_NAME, instancePartitionsType)));
+      instancePartitionsMap = deserializeInstancePartitionsMap(sendGetRequest(
+          _controllerRequestURLBuilder.forInstancePartitions(RAW_TABLE_NAME, instancePartitionsType.toString())));
       assertEquals(instancePartitionsMap.size(), 1);
-      assertEquals(instancePartitionsMap.get(instancePartitionsType).getInstancePartitionsName(),
+      assertEquals(instancePartitionsMap.get(instancePartitionsType.toString()).getInstancePartitionsName(),
           instancePartitionsType.getInstancePartitionsName(RAW_TABLE_NAME));
     }
 
+    // Test fetching instance partitions by table name and tier name
+    instancePartitionsMap = deserializeInstancePartitionsMap(
+        sendGetRequest(_controllerRequestURLBuilder.forInstancePartitions(RAW_TABLE_NAME, TIER_NAME)));
+    assertEquals(instancePartitionsMap.size(), 1);
+    assertEquals(instancePartitionsMap.get(TIER_NAME).getInstancePartitionsName(),
+        InstancePartitionsUtils.getInstancePartitionsNameForTier(RAW_TABLE_NAME, TIER_NAME));
+
     // Remove the instance partitions for both offline and real-time table
     sendDeleteRequest(_controllerRequestURLBuilder.forInstancePartitions(RAW_TABLE_NAME, null));
     try {
@@ -210,21 +252,25 @@ public void testInstanceAssignment()
     // Assign instances without instance partitions type (dry run)
     instancePartitionsMap = deserializeInstancePartitionsMap(
         sendPostRequest(_controllerRequestURLBuilder.forInstanceAssign(RAW_TABLE_NAME, null, true), null));
-    assertEquals(instancePartitionsMap.size(), 3);
-    offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+    assertEquals(instancePartitionsMap.size(), 4);
+    offlineInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.OFFLINE.toString());
     assertNotNull(offlineInstancePartitions);
     assertEquals(offlineInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(offlineInstancePartitions.getNumPartitions(), 1);
     assertEquals(offlineInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
-    consumingInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.CONSUMING);
+    consumingInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.CONSUMING.toString());
     assertNotNull(consumingInstancePartitions);
     assertEquals(consumingInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(consumingInstancePartitions.getNumPartitions(), 1);
     assertEquals(consumingInstancePartitions.getInstances(0, 0), Collections.singletonList(consumingInstanceId));
-    completedInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.COMPLETED);
+    completedInstancePartitions = instancePartitionsMap.get(InstancePartitionsType.COMPLETED.toString());
     assertEquals(completedInstancePartitions.getNumReplicaGroups(), 1);
     assertEquals(completedInstancePartitions.getNumPartitions(), 1);
     assertEquals(completedInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
+    tInstancePartitions = instancePartitionsMap.get(TIER_NAME);
+    assertEquals(tInstancePartitions.getNumReplicaGroups(), 1);
+    assertEquals(tInstancePartitions.getNumPartitions(), 1);
+    assertEquals(tInstancePartitions.getInstances(0, 0), Collections.singletonList(offlineInstanceId));
 
     // Instance partitions should not be persisted
     try {
@@ -239,34 +285,36 @@ public void testInstanceAssignment()
 
     // Instance partitions should be persisted
     instancePartitionsMap = getInstancePartitionsMap();
-    assertEquals(instancePartitionsMap.size(), 3);
+    assertEquals(instancePartitionsMap.size(), 4);
 
     // Remove the instance partitions for real-time table
     sendDeleteRequest(
         _controllerRequestURLBuilder.forInstancePartitions(TableNameBuilder.REALTIME.tableNameWithType(RAW_TABLE_NAME),
             null));
     instancePartitionsMap = getInstancePartitionsMap();
-    assertEquals(instancePartitionsMap.size(), 1);
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.OFFLINE));
+    assertEquals(instancePartitionsMap.size(), 2);
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.OFFLINE.toString()));
+    assertTrue(instancePartitionsMap.containsKey(TIER_NAME));
 
     // Assign instances for COMPLETED segments
     instancePartitionsMap = deserializeInstancePartitionsMap(sendPostRequest(
         _controllerRequestURLBuilder.forInstanceAssign(RAW_TABLE_NAME, InstancePartitionsType.COMPLETED, false), null));
     assertEquals(instancePartitionsMap.size(), 1);
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED));
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED.toString()));
 
     // There should be OFFLINE and COMPLETED instance partitions persisted
     instancePartitionsMap = getInstancePartitionsMap();
-    assertEquals(instancePartitionsMap.size(), 2);
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.OFFLINE));
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED));
+    assertEquals(instancePartitionsMap.size(), 3);
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.OFFLINE.toString()));
+    assertTrue(instancePartitionsMap.containsKey(TIER_NAME));
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED.toString()));
 
     // Replace OFFLINE instance with CONSUMING instance for COMPLETED instance partitions
     instancePartitionsMap = deserializeInstancePartitionsMap(sendPostRequest(
         _controllerRequestURLBuilder.forInstanceReplace(RAW_TABLE_NAME, InstancePartitionsType.COMPLETED,
             offlineInstanceId, consumingInstanceId), null));
     assertEquals(instancePartitionsMap.size(), 1);
-    assertEquals(instancePartitionsMap.get(InstancePartitionsType.COMPLETED).getInstances(0, 0),
+    assertEquals(instancePartitionsMap.get(InstancePartitionsType.COMPLETED.toString()).getInstances(0, 0),
         Collections.singletonList(consumingInstanceId));
 
     // Replace the instance again using real-time table name (old instance does not exist)
@@ -284,26 +332,27 @@ public void testInstanceAssignment()
         sendPutRequest(_controllerRequestURLBuilder.forInstancePartitions(RAW_TABLE_NAME, null),
             consumingInstancePartitions.toJsonString()));
     assertEquals(instancePartitionsMap.size(), 1);
-    assertEquals(instancePartitionsMap.get(InstancePartitionsType.CONSUMING).getInstances(0, 0),
+    assertEquals(instancePartitionsMap.get(InstancePartitionsType.CONSUMING.toString()).getInstances(0, 0),
         Collections.singletonList(consumingInstanceId));
 
     // OFFLINE instance partitions should have OFFLINE instance, CONSUMING and COMPLETED instance partitions should have
     // CONSUMING instance
     instancePartitionsMap = getInstancePartitionsMap();
-    assertEquals(instancePartitionsMap.size(), 3);
-    assertEquals(instancePartitionsMap.get(InstancePartitionsType.OFFLINE).getInstances(0, 0),
+    assertEquals(instancePartitionsMap.size(), 4);
+    assertEquals(instancePartitionsMap.get(InstancePartitionsType.OFFLINE.toString()).getInstances(0, 0),
         Collections.singletonList(offlineInstanceId));
-    assertEquals(instancePartitionsMap.get(InstancePartitionsType.CONSUMING).getInstances(0, 0),
+    assertEquals(instancePartitionsMap.get(TIER_NAME).getInstances(0, 0), Collections.singletonList(offlineInstanceId));
+    assertEquals(instancePartitionsMap.get(InstancePartitionsType.CONSUMING.toString()).getInstances(0, 0),
         Collections.singletonList(consumingInstanceId));
-    assertEquals(instancePartitionsMap.get(InstancePartitionsType.COMPLETED).getInstances(0, 0),
+    assertEquals(instancePartitionsMap.get(InstancePartitionsType.COMPLETED.toString()).getInstances(0, 0),
         Collections.singletonList(consumingInstanceId));
 
     // Delete the offline table
     _helixResourceManager.deleteOfflineTable(RAW_TABLE_NAME);
     instancePartitionsMap = getInstancePartitionsMap();
     assertEquals(instancePartitionsMap.size(), 2);
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.CONSUMING));
-    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED));
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.CONSUMING.toString()));
+    assertTrue(instancePartitionsMap.containsKey(InstancePartitionsType.COMPLETED.toString()));
 
     // Delete the real-time table
     _helixResourceManager.deleteRealtimeTable(RAW_TABLE_NAME);
@@ -315,18 +364,16 @@ public void testInstanceAssignment()
     }
   }
 
-  private Map<InstancePartitionsType, InstancePartitions> getInstancePartitionsMap()
+  private Map<String, InstancePartitions> getInstancePartitionsMap()
       throws Exception {
     return deserializeInstancePartitionsMap(
         sendGetRequest(_controllerRequestURLBuilder.forInstancePartitions(RAW_TABLE_NAME, null)));
   }
 
-  private Map<InstancePartitionsType, InstancePartitions> deserializeInstancePartitionsMap(
-      String instancePartitionsMapString)
+  private Map<String, InstancePartitions> deserializeInstancePartitionsMap(String instancePartitionsMapString)
       throws Exception {
-    return JsonUtils.stringToObject(instancePartitionsMapString,
-        new TypeReference<Map<InstancePartitionsType, InstancePartitions>>() {
-        });
+    return JsonUtils.stringToObject(instancePartitionsMapString, new TypeReference<Map<String, InstancePartitions>>() {
+    });
   }
 
   @AfterClass
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java
index 9b84c134ebb..3bf0e2c70dd 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java
@@ -19,24 +19,34 @@
 package org.apache.pinot.controller.api;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import javax.annotation.Nullable;
+import org.apache.pinot.controller.api.resources.InstanceTagUpdateRequest;
+import org.apache.pinot.controller.api.resources.OperationValidationResponse;
 import org.apache.pinot.controller.helix.ControllerTest;
 import org.apache.pinot.spi.config.instance.Instance;
 import org.apache.pinot.spi.config.instance.InstanceType;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.utils.CommonConstants.Helix;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.ControllerRequestURLBuilder;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
@@ -47,22 +57,24 @@
  */
 public class PinotInstanceRestletResourceTest extends ControllerTest {
 
+  private ControllerRequestURLBuilder _urlBuilder = null;
+
   @BeforeClass
   public void setUp()
       throws Exception {
     DEFAULT_INSTANCE.setupSharedStateAndValidate();
+    _urlBuilder = DEFAULT_INSTANCE.getControllerRequestURLBuilder();
   }
 
   @Test
   public void testInstanceListingAndCreation()
       throws Exception {
-    ControllerRequestURLBuilder requestURLBuilder = DEFAULT_INSTANCE.getControllerRequestURLBuilder();
-    String listInstancesUrl = requestURLBuilder.forInstanceList();
+    String listInstancesUrl = _urlBuilder.forInstanceList();
     int expectedNumInstances = 1 + DEFAULT_NUM_BROKER_INSTANCES + DEFAULT_NUM_SERVER_INSTANCES;
     checkNumInstances(listInstancesUrl, expectedNumInstances);
 
     // Create untagged broker and server instances
-    String createInstanceUrl = requestURLBuilder.forInstanceCreate();
+    String createInstanceUrl = _urlBuilder.forInstanceCreate();
     Instance brokerInstance1 = new Instance("1.2.3.4", 1234, InstanceType.BROKER, null, null, 0, 0, 0, 0, false);
     sendPostRequest(createInstanceUrl, brokerInstance1.toJsonString());
     Instance serverInstance1 =
@@ -110,14 +122,14 @@ public void testInstanceListingAndCreation()
         new Instance("1.2.3.4", 1234, InstanceType.BROKER, Collections.singletonList(newBrokerTag), null, 0, 0, 0, 0,
             false);
     String brokerInstanceId = "Broker_1.2.3.4_1234";
-    String brokerInstanceUrl = requestURLBuilder.forInstance(brokerInstanceId);
+    String brokerInstanceUrl = _urlBuilder.forInstance(brokerInstanceId);
     sendPutRequest(brokerInstanceUrl, newBrokerInstance.toJsonString());
     String newServerTag = "new-server-tag";
     Instance newServerInstance =
         new Instance("1.2.3.4", 2345, InstanceType.SERVER, Collections.singletonList(newServerTag), null, 28090, 28091,
             28092, 28093, true);
     String serverInstanceId = "Server_1.2.3.4_2345";
-    String serverInstanceUrl = requestURLBuilder.forInstance(serverInstanceId);
+    String serverInstanceUrl = _urlBuilder.forInstance(serverInstanceId);
     sendPutRequest(serverInstanceUrl, newServerInstance.toJsonString());
 
     checkInstanceInfo(brokerInstanceId, "1.2.3.4", 1234, new String[]{newBrokerTag}, null, -1, -1, -1, -1, false);
@@ -126,9 +138,9 @@ public void testInstanceListingAndCreation()
 
     // Test Instance updateTags API
     String brokerInstanceUpdateTagsUrl =
-        requestURLBuilder.forInstanceUpdateTags(brokerInstanceId, Lists.newArrayList("tag_BROKER", "newTag_BROKER"));
+        _urlBuilder.forInstanceUpdateTags(brokerInstanceId, Lists.newArrayList("tag_BROKER", "newTag_BROKER"));
     sendPutRequest(brokerInstanceUpdateTagsUrl);
-    String serverInstanceUpdateTagsUrl = requestURLBuilder.forInstanceUpdateTags(serverInstanceId,
+    String serverInstanceUpdateTagsUrl = _urlBuilder.forInstanceUpdateTags(serverInstanceId,
         Lists.newArrayList("tag_REALTIME", "newTag_OFFLINE", "newTag_REALTIME"));
     sendPutRequest(serverInstanceUpdateTagsUrl);
     checkInstanceInfo(brokerInstanceId, "1.2.3.4", 1234, new String[]{"tag_BROKER", "newTag_BROKER"}, null, -1, -1, -1,
@@ -137,10 +149,10 @@ public void testInstanceListingAndCreation()
         new String[]{"tag_REALTIME", "newTag_OFFLINE", "newTag_REALTIME"}, null, 28090, 28091, 28092, 28093, true);
 
     // Test DELETE instance API
-    sendDeleteRequest(requestURLBuilder.forInstance("Broker_1.2.3.4_1234"));
-    sendDeleteRequest(requestURLBuilder.forInstance("Server_1.2.3.4_2345"));
-    sendDeleteRequest(requestURLBuilder.forInstance("Broker_2.3.4.5_1234"));
-    sendDeleteRequest(requestURLBuilder.forInstance("Server_2.3.4.5_2345"));
+    sendDeleteRequest(_urlBuilder.forInstance("Broker_1.2.3.4_1234"));
+    sendDeleteRequest(_urlBuilder.forInstance("Server_1.2.3.4_2345"));
+    sendDeleteRequest(_urlBuilder.forInstance("Broker_2.3.4.5_1234"));
+    sendDeleteRequest(_urlBuilder.forInstance("Server_2.3.4.5_2345"));
     checkNumInstances(listInstancesUrl, expectedNumInstances);
   }
 
@@ -163,7 +175,7 @@ private void checkInstanceInfo(String instanceName, String hostName, int port, S
       boolean queriesDisabled)
       throws Exception {
     JsonNode response = JsonUtils.stringToJsonNode(
-        ControllerTest.sendGetRequest(DEFAULT_INSTANCE.getControllerRequestURLBuilder().forInstance(instanceName)));
+        ControllerTest.sendGetRequest(_urlBuilder.forInstance(instanceName)));
     assertEquals(response.get("instanceName").asText(), instanceName);
     assertEquals(response.get("hostName").asText(), hostName);
     assertTrue(response.get("enabled").asBoolean());
@@ -193,6 +205,95 @@ private void checkInstanceInfo(String instanceName, String hostName, int port, S
     }
   }
 
+  @Test
+  public void instanceRetagHappyPathTest()
+      throws IOException {
+    Map<String, List<String>> currentInstanceTagsMap = getCurrentInstanceTagsMap();
+    List<InstanceTagUpdateRequest> request = new ArrayList<>();
+    currentInstanceTagsMap.forEach((instance, tags) -> {
+      if (instance.startsWith(Helix.PREFIX_OF_SERVER_INSTANCE)
+          || instance.startsWith(Helix.PREFIX_OF_BROKER_INSTANCE)) {
+        InstanceTagUpdateRequest payload = new InstanceTagUpdateRequest();
+        payload.setInstanceName(instance);
+        payload.setNewTags(tags);
+        request.add(payload);
+      }
+    });
+    List<OperationValidationResponse> response = Arrays.asList(new ObjectMapper().readValue(
+        sendPostRequest(_urlBuilder.forUpdateTagsValidation(), JsonUtils.objectToString(request)),
+        OperationValidationResponse[].class));
+    assertNotNull(response);
+    response.forEach(item -> assertTrue(item.isSafe()));
+  }
+
+  @Test
+  public void instanceRetagServerDeficiencyTest()
+      throws Exception {
+    String tableName = "testTable";
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(tableName)
+        .setNumReplicas(2).build();
+    // create table with replication as 2 so that DefaultTenant has a minimum server requirement as 2.
+    DEFAULT_INSTANCE.addTableConfig(tableConfig);
+    Map<String, List<String>> currentInstanceTagsMap = getCurrentInstanceTagsMap();
+    List<InstanceTagUpdateRequest> request = new ArrayList<>();
+    currentInstanceTagsMap.forEach((instance, tags) -> {
+      if (instance.startsWith(Helix.PREFIX_OF_SERVER_INSTANCE)
+          || instance.startsWith(Helix.PREFIX_OF_BROKER_INSTANCE)) {
+        InstanceTagUpdateRequest payload = new InstanceTagUpdateRequest();
+        payload.setInstanceName(instance);
+        payload.setNewTags(Lists.newArrayList());
+        request.add(payload);
+      }
+    });
+    List<OperationValidationResponse> response = Arrays.asList(new ObjectMapper().readValue(
+        sendPostRequest(_urlBuilder.forUpdateTagsValidation(), JsonUtils.objectToString(request)),
+        OperationValidationResponse[].class));
+    assertNotNull(response);
+
+    int deficientServers = 2;
+    int deficientBrokers = 1;
+    for (OperationValidationResponse item : response) {
+      String instanceName = item.getInstanceName();
+      boolean validity = item.isSafe();
+      if (!validity) {
+        List<OperationValidationResponse.ErrorWrapper> issues = item.getIssues();
+        assertEquals(issues.size(), 1);
+        assertEquals(issues.get(0).getCode(), OperationValidationResponse.ErrorCode.MINIMUM_INSTANCE_UNSATISFIED);
+        if (instanceName.startsWith(Helix.PREFIX_OF_SERVER_INSTANCE)) {
+          deficientServers--;
+        } else if (instanceName.startsWith(Helix.PREFIX_OF_BROKER_INSTANCE)) {
+          deficientBrokers--;
+        }
+      }
+    }
+    assertEquals(deficientServers, 0);
+    assertEquals(deficientBrokers, 0);
+    DEFAULT_INSTANCE.dropOfflineTable(tableName);
+  }
+
+  private Map<String, List<String>> getCurrentInstanceTagsMap()
+      throws IOException {
+    String listInstancesUrl = _urlBuilder.forInstanceList();
+    JsonNode response = JsonUtils.stringToJsonNode(sendGetRequest(listInstancesUrl));
+    JsonNode instances = response.get("instances");
+    Map<String, List<String>> map = new HashMap<>(instances.size());
+    for (int i = 0; i < instances.size(); i++) {
+      String instance = instances.get(i).asText();
+      map.put(instance, getInstanceTags(instance));
+    }
+    return map;
+  }
+
+  private List<String> getInstanceTags(String instance)
+      throws IOException {
+    String getInstancesUrl = _urlBuilder.forInstance(instance);
+    List<String> tags = new ArrayList<>();
+    for (JsonNode tag : JsonUtils.stringToJsonNode(sendGetRequest(getInstancesUrl)).get("tags")) {
+      tags.add(tag.asText());
+    }
+    return tags;
+  }
+
   @AfterClass
   public void tearDown()
       throws Exception {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java
index d0903160315..c8ba1dbd73a 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java
@@ -20,15 +20,19 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.apache.pinot.controller.helix.ControllerTest;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
 import org.apache.pinot.segment.spi.SegmentMetadata;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.utils.JsonUtils;
+import org.apache.pinot.spi.utils.builder.ControllerRequestURLBuilder;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.testng.annotations.AfterClass;
@@ -36,14 +40,13 @@
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
 
 public class PinotSegmentRestletResourceTest {
   private static final ControllerTest TEST_INSTANCE = ControllerTest.getInstance();
-  private static final String TABLE_NAME = "pinotSegmentRestletResourceTestTable";
-  private static final String TABLE_NAME_OFFLINE = TABLE_NAME + "_OFFLINE";
 
   @BeforeClass
   public void setUp()
@@ -55,45 +58,42 @@ public void setUp()
   public void testListSegmentLineage()
       throws Exception {
     // Adding table
+    String rawTableName = "lineageTestTable";
+    String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(rawTableName);
     TableConfig tableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).setNumReplicas(1).build();
-    TEST_INSTANCE.getHelixResourceManager().addTable(tableConfig);
-
-    // Wait for the table addition
-    while (!TEST_INSTANCE.getHelixResourceManager().hasOfflineTable(TABLE_NAME)) {
-      Thread.sleep(100);
-    }
-
-    Map<String, SegmentMetadata> segmentMetadataTable = new HashMap<>();
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(rawTableName).setNumReplicas(1).build();
+    PinotHelixResourceManager resourceManager = TEST_INSTANCE.getHelixResourceManager();
+    resourceManager.addTable(tableConfig);
 
     // Upload Segments
+    Map<String, SegmentMetadata> segmentMetadataTable = new HashMap<>();
     for (int i = 0; i < 4; i++) {
-      SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(TABLE_NAME, "s" + i);
-      TEST_INSTANCE.getHelixResourceManager()
-          .addNewSegment(TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME), segmentMetadata, "downloadUrl");
+      SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(rawTableName, "s" + i);
+      resourceManager.addNewSegment(offlineTableName, segmentMetadata, "downloadUrl");
       segmentMetadataTable.put(segmentMetadata.getName(), segmentMetadata);
     }
 
     // There should be no segment lineage at this point.
-    String segmentLineageResponse = ControllerTest.sendGetRequest(TEST_INSTANCE.getControllerRequestURLBuilder()
-        .forListAllSegmentLineages(TABLE_NAME, TableType.OFFLINE.toString()));
+    ControllerRequestURLBuilder urlBuilder = TEST_INSTANCE.getControllerRequestURLBuilder();
+    String segmentLineageResponse =
+        ControllerTest.sendGetRequest(urlBuilder.forListAllSegmentLineages(rawTableName, TableType.OFFLINE.name()));
     assertEquals(segmentLineageResponse, "");
 
     // Now starts to replace segments.
     List<String> segmentsFrom = Arrays.asList("s0", "s1");
-    List<String> segmentsTo = Arrays.asList("some_segment");
-    String segmentLineageId = TEST_INSTANCE.getHelixResourceManager()
-        .startReplaceSegments(TABLE_NAME_OFFLINE, segmentsFrom, segmentsTo, false);
+    List<String> segmentsTo = Collections.singletonList("some_segment");
+    String segmentLineageId = resourceManager.startReplaceSegments(offlineTableName, segmentsFrom, segmentsTo, false,
+        null);
 
     // Replace more segments to add another entry to segment lineage.
     segmentsFrom = Arrays.asList("s2", "s3");
-    segmentsTo = Arrays.asList("another_segment");
-    String nextSegmentLineageId = TEST_INSTANCE.getHelixResourceManager()
-        .startReplaceSegments(TABLE_NAME_OFFLINE, segmentsFrom, segmentsTo, false);
+    segmentsTo = Collections.singletonList("another_segment");
+    String nextSegmentLineageId =
+        resourceManager.startReplaceSegments(offlineTableName, segmentsFrom, segmentsTo, false, null);
 
     // There should now be two segment lineage entries resulting from the operations above.
-    segmentLineageResponse = ControllerTest.sendGetRequest(TEST_INSTANCE.getControllerRequestURLBuilder()
-        .forListAllSegmentLineages(TABLE_NAME, TableType.OFFLINE.toString()));
+    segmentLineageResponse =
+        ControllerTest.sendGetRequest(urlBuilder.forListAllSegmentLineages(rawTableName, TableType.OFFLINE.toString()));
     assertTrue(segmentLineageResponse.contains("\"state\":\"IN_PROGRESS\""));
     assertTrue(segmentLineageResponse.contains("\"segmentsFrom\":[\"s0\",\"s1\"]"));
     assertTrue(segmentLineageResponse.contains("\"segmentsTo\":[\"some_segment\"]"));
@@ -103,93 +103,110 @@ public void testListSegmentLineage()
     assertTrue(segmentLineageResponse.indexOf(segmentLineageId) < segmentLineageResponse.indexOf(nextSegmentLineageId));
 
     // List segment lineage should fail for non-existing table
-    assertThrows(IOException.class, () -> ControllerTest.sendGetRequest(TEST_INSTANCE.getControllerRequestURLBuilder()
-        .forListAllSegmentLineages("non-existing-table", TableType.OFFLINE.toString())));
-
-    // List segment lineage should also fail for invalid table type.
     assertThrows(IOException.class, () -> ControllerTest.sendGetRequest(
-        TEST_INSTANCE.getControllerRequestURLBuilder().forListAllSegmentLineages(TABLE_NAME, "invalid-type")));
-
-    // Delete segments
-    TEST_INSTANCE.getHelixResourceManager().deleteSegment(TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME),
-        segmentMetadataTable.values().iterator().next().getName());
+        urlBuilder.forListAllSegmentLineages("non-existing-table", TableType.OFFLINE.toString())));
 
-    // Delete offline table
-    TEST_INSTANCE.getHelixResourceManager().deleteOfflineTable(TABLE_NAME);
+    // List segment lineage should also fail for invalid table type.
+    assertThrows(IOException.class,
+        () -> ControllerTest.sendGetRequest(urlBuilder.forListAllSegmentLineages(rawTableName, "invalid-type")));
   }
 
   @Test
   public void testSegmentCrcApi()
       throws Exception {
     // Adding table
+    String rawTableName = "crcTestTable";
+    String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(rawTableName);
     TableConfig tableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).setNumReplicas(1).build();
-    TEST_INSTANCE.getHelixResourceManager().addTable(tableConfig);
-
-    // Wait for the table addition
-    while (!TEST_INSTANCE.getHelixResourceManager().hasOfflineTable(TABLE_NAME)) {
-      Thread.sleep(100);
-    }
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(rawTableName).setNumReplicas(1).build();
+    PinotHelixResourceManager resourceManager = TEST_INSTANCE.getHelixResourceManager();
+    resourceManager.addTable(tableConfig);
 
     // Check when there is no segment.
     Map<String, SegmentMetadata> segmentMetadataTable = new HashMap<>();
-    checkCrcRequest(segmentMetadataTable, 0);
+    checkCrcRequest(rawTableName, segmentMetadataTable, 0);
 
     // Upload Segments
     for (int i = 0; i < 5; i++) {
-      SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(TABLE_NAME);
-      TEST_INSTANCE.getHelixResourceManager()
-          .addNewSegment(TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME), segmentMetadata, "downloadUrl");
+      SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(rawTableName);
+      resourceManager.addNewSegment(offlineTableName, segmentMetadata, "downloadUrl");
       segmentMetadataTable.put(segmentMetadata.getName(), segmentMetadata);
     }
 
     // Get crc info from API and check that they are correct.
-    checkCrcRequest(segmentMetadataTable, 5);
+    checkCrcRequest(rawTableName, segmentMetadataTable, 5);
 
     // validate the segment metadata
-    Map.Entry<String, SegmentMetadata> entry =
-        (Map.Entry<String, SegmentMetadata>) segmentMetadataTable.entrySet().toArray()[0];
+    String sampleSegment = segmentMetadataTable.keySet().iterator().next();
     String resp = ControllerTest.sendGetRequest(
-        TEST_INSTANCE.getControllerRequestURLBuilder().forSegmentMetadata(TABLE_NAME, entry.getKey()));
+        TEST_INSTANCE.getControllerRequestURLBuilder().forSegmentMetadata(rawTableName, sampleSegment));
     Map<String, String> fetchedMetadata = JsonUtils.stringToObject(resp, Map.class);
     assertEquals(fetchedMetadata.get("segment.download.url"), "downloadUrl");
 
     // use table name with table type
     resp = ControllerTest.sendGetRequest(
-        TEST_INSTANCE.getControllerRequestURLBuilder().forSegmentMetadata(TABLE_NAME + "_OFFLINE", entry.getKey()));
+        TEST_INSTANCE.getControllerRequestURLBuilder().forSegmentMetadata(offlineTableName, sampleSegment));
     fetchedMetadata = JsonUtils.stringToObject(resp, Map.class);
     assertEquals(fetchedMetadata.get("segment.download.url"), "downloadUrl");
 
     // Add more segments
     for (int i = 0; i < 5; i++) {
-      SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(TABLE_NAME);
-      TEST_INSTANCE.getHelixResourceManager()
-          .addNewSegment(TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME), segmentMetadata, "downloadUrl");
+      SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(rawTableName);
+      resourceManager.addNewSegment(offlineTableName, segmentMetadata, "downloadUrl");
       segmentMetadataTable.put(segmentMetadata.getName(), segmentMetadata);
     }
 
     // Get crc info from API and check that they are correct.
-    checkCrcRequest(segmentMetadataTable, 10);
+    checkCrcRequest(rawTableName, segmentMetadataTable, 10);
 
-    // Delete segments
-    TEST_INSTANCE.getHelixResourceManager().deleteSegment(TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME),
-        segmentMetadataTable.values().iterator().next().getName());
+    // Delete one segment
+    resourceManager.deleteSegment(offlineTableName, sampleSegment);
 
     // Check crc api
-    checkCrcRequest(segmentMetadataTable, 9);
+    checkCrcRequest(rawTableName, segmentMetadataTable, 9);
+  }
 
-    // Delete offline table
-    TEST_INSTANCE.getHelixResourceManager().deleteOfflineTable(TABLE_NAME);
+  @Test
+  public void testDeleteSegmentsWithTimeWindow()
+      throws Exception {
+    // Adding table and segment
+    String rawTableName = "deleteWithTimeWindowTestTable";
+    String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(rawTableName);
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(rawTableName).setNumReplicas(1)
+            .setDeletedSegmentsRetentionPeriod("0d").build();
+    PinotHelixResourceManager resourceManager = TEST_INSTANCE.getHelixResourceManager();
+    resourceManager.addTable(tableConfig);
+    SegmentMetadata segmentMetadata = SegmentMetadataMockUtils.mockSegmentMetadata(rawTableName,
+        10L, 20L, TimeUnit.MILLISECONDS);
+    resourceManager.addNewSegment(offlineTableName, segmentMetadata, "downloadUrl");
+
+    // Send query and verify
+    ControllerRequestURLBuilder urlBuilder = TEST_INSTANCE.getControllerRequestURLBuilder();
+    // case 1: no overlapping
+    String reply = ControllerTest.sendDeleteRequest(urlBuilder.forSegmentDeleteWithTimeWindowAPI(
+        rawTableName, 0L, 10L));
+    assertTrue(reply.contains("Deleted 0 segments"));
+
+    // case 2: partial overlapping
+    reply = ControllerTest.sendDeleteRequest(urlBuilder.forSegmentDeleteWithTimeWindowAPI(
+        rawTableName, 10L, 20L));
+    assertTrue(reply.contains("Deleted 0 segments"));
+
+    // case 3: fully within the time window
+    reply = ControllerTest.sendDeleteRequest(urlBuilder.forSegmentDeleteWithTimeWindowAPI(
+        rawTableName, 10L, 21L));
+    assertTrue(reply.contains("Deleted 1 segments"));
   }
 
-  private void checkCrcRequest(Map<String, SegmentMetadata> metadataTable, int expectedSize)
+  private void checkCrcRequest(String tableName, Map<String, SegmentMetadata> metadataTable, int expectedSize)
       throws Exception {
     String crcMapStr = ControllerTest.sendGetRequest(
-        TEST_INSTANCE.getControllerRequestURLBuilder().forListAllCrcInformationForTable(TABLE_NAME));
+        TEST_INSTANCE.getControllerRequestURLBuilder().forListAllCrcInformationForTable(tableName));
     Map<String, String> crcMap = JsonUtils.stringToObject(crcMapStr, Map.class);
     for (String segmentName : crcMap.keySet()) {
       SegmentMetadata metadata = metadataTable.get(segmentName);
-      assertTrue(metadata != null);
+      assertNotNull(metadata);
       assertEquals(crcMap.get(segmentName), metadata.getCrc());
     }
     assertEquals(crcMap.size(), expectedSize);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java
index d34c5e6806e..a55e2235513 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java
@@ -19,24 +19,33 @@
 package org.apache.pinot.controller.api;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.utils.config.TagNameUtils;
 import org.apache.pinot.controller.helix.ControllerTest;
+import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 
-public class PinotTenantRestletResourceTest {
+public class PinotTenantRestletResourceTest extends ControllerTest {
   private static final ControllerTest TEST_INSTANCE = ControllerTest.getInstance();
   private static final String TABLE_NAME = "restletTable_OFFLINE";
+  private static final String RAW_TABLE_NAME = "toggleTable";
+  private static final String OFFLINE_TABLE_NAME = TableNameBuilder.OFFLINE.tableNameWithType(RAW_TABLE_NAME);
+
 
   @BeforeClass
   public void setUp()
@@ -82,6 +91,83 @@ public void testTableListForTenant()
     assertEquals(tables.size(), 0);
   }
 
+  @Test
+  public void testListInstance()
+      throws Exception {
+    String listInstancesUrl =
+        TEST_INSTANCE.getControllerRequestURLBuilder().forTenantGet(TagNameUtils.DEFAULT_TENANT_NAME);
+    JsonNode instanceList = JsonUtils.stringToJsonNode(ControllerTest.sendGetRequest(listInstancesUrl));
+    assertEquals(instanceList.get("ServerInstances").size(), DEFAULT_NUM_SERVER_INSTANCES);
+    assertEquals(instanceList.get("BrokerInstances").size(), DEFAULT_NUM_BROKER_INSTANCES);
+  }
+
+  @Test
+  public void testToggleTenantState()
+    throws Exception {
+    // Create an offline table
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setNumReplicas(DEFAULT_MIN_NUM_REPLICAS)
+            .build();
+    sendPostRequest(TEST_INSTANCE.getControllerRequestURLBuilder().forTableCreate(), tableConfig.toJsonString());
+    assertEquals(TEST_INSTANCE.getHelixAdmin()
+        .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(), CommonConstants.Helix.BROKER_RESOURCE_INSTANCE)
+        .getInstanceSet(OFFLINE_TABLE_NAME).size(), DEFAULT_NUM_BROKER_INSTANCES);
+
+    // Add segments
+    for (int i = 0; i < DEFAULT_NUM_SERVER_INSTANCES; i++) {
+      TEST_INSTANCE.getHelixResourceManager()
+          .addNewSegment(OFFLINE_TABLE_NAME, SegmentMetadataMockUtils.mockSegmentMetadata(RAW_TABLE_NAME),
+              "downloadUrl");
+      assertEquals(TEST_INSTANCE.getHelixAdmin()
+          .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(), OFFLINE_TABLE_NAME).getNumPartitions(), i + 1);
+    }
+
+    // Disable server instances
+    String disableServerInstanceUrl =
+        TEST_INSTANCE.getControllerRequestURLBuilder().forTenantInstancesToggle(TagNameUtils.DEFAULT_TENANT_NAME,
+            "server", "disable");
+    JsonUtils.stringToJsonNode(ControllerTest.sendPostRequest(disableServerInstanceUrl));
+    checkNumOnlineInstancesFromExternalView(OFFLINE_TABLE_NAME, 0);
+
+    // Enable server instances
+    String enableServerInstanceUrl =
+        TEST_INSTANCE.getControllerRequestURLBuilder().forTenantInstancesToggle(TagNameUtils.DEFAULT_TENANT_NAME,
+            "server", "enable");
+    JsonUtils.stringToJsonNode(ControllerTest.sendPostRequest(enableServerInstanceUrl));
+    checkNumOnlineInstancesFromExternalView(OFFLINE_TABLE_NAME, DEFAULT_NUM_SERVER_INSTANCES);
+
+    // Disable broker instances
+    String disableBrokerInstanceUrl =
+        TEST_INSTANCE.getControllerRequestURLBuilder().forTenantInstancesToggle(TagNameUtils.DEFAULT_TENANT_NAME,
+            "broker", "disable");
+    JsonUtils.stringToJsonNode(ControllerTest.sendPostRequest(disableBrokerInstanceUrl));
+    checkNumOnlineInstancesFromExternalView(CommonConstants.Helix.BROKER_RESOURCE_INSTANCE, 0);
+
+    // Enable broker instances
+    String enableBrokerInstanceUrl =
+        TEST_INSTANCE.getControllerRequestURLBuilder().forTenantInstancesToggle(TagNameUtils.DEFAULT_TENANT_NAME,
+            "broker", "enable");
+    JsonUtils.stringToJsonNode(ControllerTest.sendPostRequest(enableBrokerInstanceUrl));
+    checkNumOnlineInstancesFromExternalView(CommonConstants.Helix.BROKER_RESOURCE_INSTANCE,
+        DEFAULT_NUM_BROKER_INSTANCES);
+
+    // Delete table
+    sendDeleteRequest(TEST_INSTANCE.getControllerRequestURLBuilder().forTableDelete(RAW_TABLE_NAME));
+
+    // Check exception in case of enum mismatch of State
+    try {
+      String mismatchStateBrokerInstanceUrl =
+          TEST_INSTANCE.getControllerRequestURLBuilder().forTenantInstancesToggle(TagNameUtils.DEFAULT_TENANT_NAME,
+              "broker", "random");
+      sendPostRequest(mismatchStateBrokerInstanceUrl);
+      fail("Passing invalid state to tenant toggle state does not fail.");
+    } catch (IOException e) {
+      // Expected 500 Bad Request
+      assertTrue(e.getMessage().contains("Error: State mentioned random is wrong. "
+          + "Valid States: Enable, Disable"));
+    }
+  }
+
   @AfterClass
   public void tearDown() {
     TEST_INSTANCE.cleanup();
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableConfigsRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableConfigsRestletResourceTest.java
index a506f38ac32..2ee5bb13617 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableConfigsRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableConfigsRestletResourceTest.java
@@ -485,6 +485,46 @@ public void testUpdateConfig()
     sendDeleteRequest(DEFAULT_INSTANCE.getControllerRequestURLBuilder().forTableConfigsDelete(tableName));
   }
 
+  @Test
+  public void testForceUpdateTableSchemaAndConfigs()
+      throws IOException {
+    String tableName = "testUpdate1";
+    TableConfig offlineTableConfig = createOfflineTableConfig(tableName);
+    Schema schema = createDummySchema(tableName);
+    TableConfigs tableConfigs = new TableConfigs(tableName, schema, offlineTableConfig, null);
+
+    sendPostRequest(_createTableConfigsUrl, tableConfigs.toPrettyJsonString());
+    String response = sendGetRequest(DEFAULT_INSTANCE.getControllerRequestURLBuilder().forTableConfigsGet(tableName));
+    TableConfigs tableConfigsResponse = JsonUtils.stringToObject(response, TableConfigs.class);
+    Assert.assertNotNull(tableConfigs.getOffline());
+
+    // Remove field from schema and try to update schema without the 'forceTableSchemaUpdate' option
+    schema.removeField("dimA");
+    tableConfigs =
+        new TableConfigs(tableName, schema, tableConfigsResponse.getOffline(), tableConfigsResponse.getRealtime());
+
+    String tableConfigUpdateUrl = DEFAULT_INSTANCE.getControllerRequestURLBuilder().forTableConfigsUpdate(tableName);
+    try {
+      sendPutRequest(tableConfigUpdateUrl, tableConfigs.toPrettyJsonString());
+    } catch (IOException e) {
+      Assert.assertTrue(e.getMessage().contains("is not backward-compatible with the existing schema"));
+    }
+
+    // Skip validate table configs – Exception is still thrown
+    String newTableConfigUpdateUrl = tableConfigUpdateUrl + "?validationTypesToSkip=ALL";
+    try {
+      sendPutRequest(newTableConfigUpdateUrl, tableConfigs.toPrettyJsonString());
+    } catch (IOException e) {
+      Assert.assertTrue(e.getMessage().contains("is not backward-compatible with the existing schema"));
+    }
+
+    // Skip table config validation as well as force update the table schema – no exceptions are thrown
+    newTableConfigUpdateUrl = tableConfigUpdateUrl + "?validationTypesToSkip=ALL&forceTableSchemaUpdate=true";
+    response = sendPutRequest(newTableConfigUpdateUrl, tableConfigs.toPrettyJsonString());
+    Assert.assertTrue(response.contains("TableConfigs updated for testUpdate1"));
+    sendDeleteRequest(DEFAULT_INSTANCE.getControllerRequestURLBuilder().forTableConfigsDelete(tableName));
+  }
+
   @Test
   public void testDeleteConfig()
       throws Exception {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java
index 7b460161dbd..dc82319ed7c 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java
@@ -81,25 +81,25 @@ public class TableSizeReaderTest {
   private PinotHelixResourceManager _helix;
 
   @BeforeClass
-  public void setUp()
-      throws IOException {
+  public void setUp() throws IOException {
     _helix = mock(PinotHelixResourceManager.class);
 
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName("myTable").setNumReplicas(NUM_REPLICAS).build();
     ZkHelixPropertyStore mockPropertyStore = mock(ZkHelixPropertyStore.class);
 
-    when(mockPropertyStore.get(ArgumentMatchers.anyString(), ArgumentMatchers.eq(null),
-        ArgumentMatchers.eq(AccessOption.PERSISTENT))).thenAnswer((Answer) invocationOnMock -> {
-      String path = (String) invocationOnMock.getArguments()[0];
-      if (path.contains("realtime_REALTIME")) {
-        return TableConfigUtils.toZNRecord(tableConfig);
-      }
-      if (path.contains("offline_OFFLINE")) {
-        return TableConfigUtils.toZNRecord(tableConfig);
-      }
-      return null;
-    });
+    when(mockPropertyStore
+        .get(ArgumentMatchers.anyString(), ArgumentMatchers.eq(null), ArgumentMatchers.eq(AccessOption.PERSISTENT)))
+        .thenAnswer((Answer) invocationOnMock -> {
+          String path = (String) invocationOnMock.getArguments()[0];
+          if (path.contains("realtime_REALTIME")) {
+            return TableConfigUtils.toZNRecord(tableConfig);
+          }
+          if (path.contains("offline_OFFLINE")) {
+            return TableConfigUtils.toZNRecord(tableConfig);
+          }
+          return null;
+        });
 
     when(_helix.getPropertyStore()).thenReturn(mockPropertyStore);
     when(_helix.getNumReplicas(ArgumentMatchers.eq(tableConfig))).thenReturn(NUM_REPLICAS);
@@ -152,8 +152,7 @@ public void tearDown() {
   private HttpHandler createHandler(final int status, final List<SegmentSizeInfo> segmentSizes, final int sleepTimeMs) {
     return new HttpHandler() {
       @Override
-      public void handle(HttpExchange httpExchange)
-          throws IOException {
+      public void handle(HttpExchange httpExchange) throws IOException {
         if (sleepTimeMs > 0) {
           try {
             Thread.sleep(sleepTimeMs);
@@ -219,8 +218,7 @@ private BiMap<String, String> serverEndpoints(String... servers) {
   }
 
   @Test
-  public void testNoSuchTable()
-      throws InvalidConfigException {
+  public void testNoSuchTable() throws InvalidConfigException {
     TableSizeReader reader = new TableSizeReader(_executor, _connectionManager, _controllerMetrics, _helix);
     assertNull(reader.getTableSizeDetails("mytable", 5000));
   }
@@ -229,16 +227,14 @@ private TableSizeReader.TableSizeDetails testRunner(final String[] servers, Stri
       throws InvalidConfigException {
     when(_helix.getServerToSegmentsMap(anyString())).thenAnswer(new Answer<Object>() {
       @Override
-      public Object answer(InvocationOnMock invocationOnMock)
-          throws Throwable {
+      public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
         return subsetOfServerSegments(servers);
       }
     });
 
     when(_helix.getDataInstanceAdminEndpoints(ArgumentMatchers.anySet())).thenAnswer(new Answer<Object>() {
       @Override
-      public Object answer(InvocationOnMock invocationOnMock)
-          throws Throwable {
+      public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
         return serverEndpoints(servers);
       }
     });
@@ -252,11 +248,7 @@ private Map<String, List<String>> segmentToServers(final String... servers) {
     for (String server : servers) {
       List<String> segments = _serverMap.get(server)._segments;
       for (String segment : segments) {
-        List<String> segServers = segmentServers.get(segment);
-        if (segServers == null) {
-          segServers = new ArrayList<String>();
-          segmentServers.put(segment, segServers);
-        }
+        List<String> segServers = segmentServers.computeIfAbsent(segment, k -> new ArrayList<String>());
         segServers.add(server);
       }
     }
@@ -267,7 +259,7 @@ private void validateTableSubTypeSize(String[] servers, TableSizeReader.TableSub
     Map<String, List<String>> segmentServers = segmentToServers(servers);
     long reportedSize = 0;
     long estimatedSize = 0;
-    long maxSegmentSize = 0;
+    long reportedSizePerReplica = 0L;
     boolean hasErrors = false;
     for (Map.Entry<String, List<String>> segmentEntry : segmentServers.entrySet()) {
       final String segmentName = segmentEntry.getKey();
@@ -278,6 +270,9 @@ private void validateTableSubTypeSize(String[] servers, TableSizeReader.TableSub
       if (segmentDetails._estimatedSizeInBytes != TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR) {
         estimatedSize += segmentDetails._estimatedSizeInBytes;
       }
+      if (segmentDetails._maxReportedSizePerReplicaInBytes != TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR) {
+        reportedSizePerReplica += segmentDetails._maxReportedSizePerReplicaInBytes;
+      }
 
       assertNotNull(segmentDetails);
       final List<String> expectedServers = segmentEntry.getValue();
@@ -293,13 +288,17 @@ private void validateTableSubTypeSize(String[] servers, TableSizeReader.TableSub
       if (numResponses != 0) {
         assertEquals(segmentDetails._reportedSizeInBytes, numResponses * expectedSegmentSize);
         assertEquals(segmentDetails._estimatedSizeInBytes, expectedServers.size() * expectedSegmentSize);
+        assertEquals(segmentDetails._maxReportedSizePerReplicaInBytes, expectedSegmentSize);
       } else {
         assertEquals(segmentDetails._reportedSizeInBytes, TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR);
         assertEquals(segmentDetails._estimatedSizeInBytes, TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR);
+        assertEquals(segmentDetails._maxReportedSizePerReplicaInBytes,
+            TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR);
       }
     }
     assertEquals(tableSize._reportedSizeInBytes, reportedSize);
     assertEquals(tableSize._estimatedSizeInBytes, estimatedSize);
+    assertEquals(tableSize._reportedSizePerReplicaInBytes, reportedSizePerReplica);
     if (hasErrors) {
       assertTrue(tableSize._reportedSizeInBytes != tableSize._estimatedSizeInBytes);
       assertTrue(tableSize._missingSegments > 0);
@@ -307,8 +306,7 @@ private void validateTableSubTypeSize(String[] servers, TableSizeReader.TableSub
   }
 
   @Test
-  public void testGetTableSubTypeSizeAllSuccess()
-      throws InvalidConfigException {
+  public void testGetTableSubTypeSizeAllSuccess() throws InvalidConfigException {
     final String[] servers = {"server0", "server1"};
     String table = "offline";
     TableSizeReader.TableSizeDetails tableSizeDetails = testRunner(servers, table);
@@ -320,23 +318,24 @@ public void testGetTableSubTypeSizeAllSuccess()
     assertNull(tableSizeDetails._realtimeSegments);
     assertEquals(tableSizeDetails._reportedSizeInBytes, offlineSizes._reportedSizeInBytes);
     assertEquals(tableSizeDetails._estimatedSizeInBytes, offlineSizes._estimatedSizeInBytes);
+    assertEquals(tableSizeDetails._reportedSizePerReplicaInBytes, offlineSizes._reportedSizePerReplicaInBytes);
     String tableNameWithType = TableNameBuilder.OFFLINE.tableNameWithType(table);
     assertEquals(MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
         ControllerGauge.TABLE_STORAGE_EST_MISSING_SEGMENT_PERCENT), 0);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER), offlineSizes._estimatedSizeInBytes / NUM_REPLICAS);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER), offlineSizes._estimatedSizeInBytes);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER), 160);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType,
+                ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER),
+        offlineSizes._estimatedSizeInBytes / NUM_REPLICAS);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER),
+        offlineSizes._estimatedSizeInBytes);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER),
+        160);
   }
 
   @Test
-  public void testGetTableSubTypeSizeAllErrors()
-      throws InvalidConfigException {
+  public void testGetTableSubTypeSizeAllErrors() throws InvalidConfigException {
     final String[] servers = {"server2", "server5"};
     String table = "offline";
     TableSizeReader.TableSizeDetails tableSizeDetails = testRunner(servers, table);
@@ -346,24 +345,23 @@ public void testGetTableSubTypeSizeAllErrors()
     assertEquals(offlineSizes._segments.size(), 3);
     assertEquals(offlineSizes._reportedSizeInBytes, TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR);
     assertEquals(tableSizeDetails._estimatedSizeInBytes, TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR);
+    assertEquals(tableSizeDetails._reportedSizePerReplicaInBytes, TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR);
     String tableNameWithType = TableNameBuilder.OFFLINE.tableNameWithType(table);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_STORAGE_EST_MISSING_SEGMENT_PERCENT), 100);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER), offlineSizes._estimatedSizeInBytes / NUM_REPLICAS);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER), offlineSizes._estimatedSizeInBytes);
-    assertFalse(
-        MetricValueUtils.tableGaugeExists(_controllerMetrics, tableNameWithType,
-            ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER));
+    assertEquals(MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
+        ControllerGauge.TABLE_STORAGE_EST_MISSING_SEGMENT_PERCENT), 100);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType,
+                ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER),
+        offlineSizes._estimatedSizeInBytes / NUM_REPLICAS);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER),
+        offlineSizes._estimatedSizeInBytes);
+    assertFalse(MetricValueUtils
+        .tableGaugeExists(_controllerMetrics, tableNameWithType, ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER));
   }
 
   @Test
-  public void testGetTableSubTypeSizesWithErrors()
-      throws InvalidConfigException {
+  public void testGetTableSubTypeSizesWithErrors() throws InvalidConfigException {
     final String[] servers = {"server0", "server1", "server2", "server5"};
     String table = "offline";
     TableSizeReader.TableSizeDetails tableSizeDetails = testRunner(servers, "offline");
@@ -374,23 +372,25 @@ public void testGetTableSubTypeSizesWithErrors()
     validateTableSubTypeSize(servers, offlineSizes);
     assertNull(tableSizeDetails._realtimeSegments);
     String tableNameWithType = TableNameBuilder.OFFLINE.tableNameWithType(table);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_STORAGE_EST_MISSING_SEGMENT_PERCENT), 20);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER), offlineSizes._estimatedSizeInBytes / NUM_REPLICAS);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER), offlineSizes._estimatedSizeInBytes);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER), 160);
+    assertEquals(tableSizeDetails._reportedSizeInBytes, offlineSizes._reportedSizeInBytes);
+    assertEquals(tableSizeDetails._estimatedSizeInBytes, offlineSizes._estimatedSizeInBytes);
+    assertEquals(tableSizeDetails._reportedSizePerReplicaInBytes, offlineSizes._reportedSizePerReplicaInBytes);
+    assertEquals(MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
+        ControllerGauge.TABLE_STORAGE_EST_MISSING_SEGMENT_PERCENT), 20);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType,
+                ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER),
+        offlineSizes._estimatedSizeInBytes / NUM_REPLICAS);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER),
+        offlineSizes._estimatedSizeInBytes);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER),
+        160);
   }
 
   @Test
-  public void getTableSizeDetailsRealtimeOnly()
-      throws InvalidConfigException {
+  public void getTableSizeDetailsRealtimeOnly() throws InvalidConfigException {
     final String[] servers = {"server3", "server4"};
     String table = "realtime";
     TableSizeReader.TableSizeDetails tableSizeDetails = testRunner(servers, table);
@@ -399,15 +399,19 @@ public void getTableSizeDetailsRealtimeOnly()
     assertEquals(realtimeSegments._segments.size(), 2);
     assertEquals(realtimeSegments._estimatedSizeInBytes, realtimeSegments._reportedSizeInBytes);
     validateTableSubTypeSize(servers, realtimeSegments);
+    assertEquals(tableSizeDetails._reportedSizeInBytes, realtimeSegments._reportedSizeInBytes);
+    assertEquals(tableSizeDetails._estimatedSizeInBytes, realtimeSegments._estimatedSizeInBytes);
+    assertEquals(tableSizeDetails._reportedSizePerReplicaInBytes, realtimeSegments._reportedSizePerReplicaInBytes);
     String tableNameWithType = TableNameBuilder.REALTIME.tableNameWithType(table);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER), realtimeSegments._estimatedSizeInBytes / NUM_REPLICAS);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER), realtimeSegments._estimatedSizeInBytes);
-    assertEquals(
-        MetricValueUtils.getTableGaugeValue(_controllerMetrics, tableNameWithType,
-            ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER), 120);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType,
+                ControllerGauge.TABLE_SIZE_PER_REPLICA_ON_SERVER),
+        realtimeSegments._estimatedSizeInBytes / NUM_REPLICAS);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.TABLE_TOTAL_SIZE_ON_SERVER),
+        realtimeSegments._estimatedSizeInBytes);
+    assertEquals(MetricValueUtils
+            .getTableGaugeValue(_controllerMetrics, tableNameWithType, ControllerGauge.LARGEST_SEGMENT_SIZE_ON_SERVER),
+        120);
   }
 }
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResourceTest.java
new file mode 100644
index 00000000000..764b1d53d16
--- /dev/null
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResourceTest.java
@@ -0,0 +1,139 @@
+/**
+ * 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.pinot.controller.api.resources;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.Map;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.UriInfo;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.api.exception.ControllerApplicationException;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+
+public class PinotTaskRestletResourceTest {
+  @Mock
+  PinotHelixResourceManager _pinotHelixResourceManager;
+  @Mock
+  PinotHelixTaskResourceManager _pinotHelixTaskResourceManager;
+  @Mock
+  ControllerConf _controllerConf;
+  @Mock
+  UriInfo _uriInfo;
+
+  @InjectMocks
+  PinotTaskRestletResource _pinotTaskRestletResource;
+
+  @BeforeMethod
+  public void init()
+      throws URISyntaxException {
+    MockitoAnnotations.openMocks(this);
+    when(_uriInfo.getRequestUri()).thenReturn(new URI("http://localhost:9000"));
+  }
+
+  @Test
+  public void testGetSubtaskWithGivenStateProgressWhenMinionWorkerIdsAreNotSpecified()
+      throws JsonProcessingException {
+    Map<String, String> minionWorkerEndpoints
+        = invokeGetSubtaskWithGivenStateProgressAndReturnCapturedMinionWorkerEndpoints(null);
+    assertEquals(minionWorkerEndpoints,
+        ImmutableMap.of("minion1", "http://minion1:9514", "minion2", "http://minion2:9514"));
+  }
+
+  @Test
+  public void testGetSubtaskWithGivenStateProgressWhenAllMinionWorkerIdsAreSpecified()
+      throws JsonProcessingException {
+    // use minion worker ids with spaces ensure they will be trimmed.
+    Map<String, String> minionWorkerEndpoints
+        = invokeGetSubtaskWithGivenStateProgressAndReturnCapturedMinionWorkerEndpoints(" minion1 , minion2 ");
+    assertEquals(minionWorkerEndpoints,
+        ImmutableMap.of("minion1", "http://minion1:9514", "minion2", "http://minion2:9514"));
+  }
+
+  @Test
+  public void testGetSubtaskWithGivenStateProgressWhenOneMinionWorkerIdIsSpecified()
+      throws JsonProcessingException {
+    Map<String, String> minionWorkerEndpoints
+        = invokeGetSubtaskWithGivenStateProgressAndReturnCapturedMinionWorkerEndpoints("minion1");
+    assertEquals(minionWorkerEndpoints,
+        ImmutableMap.of("minion1", "http://minion1:9514"));
+  }
+
+  private Map<String, String> invokeGetSubtaskWithGivenStateProgressAndReturnCapturedMinionWorkerEndpoints(
+      String minionWorkerIds)
+      throws JsonProcessingException {
+    InstanceConfig minion1 = createInstanceConfig("minion1", "minion1", "9514");
+    InstanceConfig minion2 = createInstanceConfig("minion2", "minion2", "9514");
+    when(_pinotHelixResourceManager.getAllMinionInstanceConfigs()).thenReturn(ImmutableList.of(minion1, minion2));
+    HttpHeaders httpHeaders = Mockito.mock(HttpHeaders.class);
+    when(httpHeaders.getRequestHeaders()).thenReturn(new MultivaluedHashMap<>());
+    ArgumentCaptor<Map<String, String>> minionWorkerEndpointsCaptor = ArgumentCaptor.forClass(Map.class);
+    when(_pinotHelixTaskResourceManager.getSubtaskOnWorkerProgress(anyString(), any(), any(),
+        minionWorkerEndpointsCaptor.capture(), anyMap(), anyInt()))
+        .thenReturn(Collections.emptyMap());
+    String progress =
+        _pinotTaskRestletResource.getSubtaskOnWorkerProgress(httpHeaders, "IN_PROGRESS", minionWorkerIds);
+    assertEquals(progress, "{}");
+    return minionWorkerEndpointsCaptor.getValue();
+  }
+
+  private InstanceConfig createInstanceConfig(String instanceId, String hostName, String port) {
+    InstanceConfig instanceConfig = new InstanceConfig(instanceId);
+    instanceConfig.setHostName(hostName);
+    instanceConfig.setPort(port);
+    return instanceConfig;
+  }
+
+
+  @Test
+  public void testGetSubtaskWithGivenStateProgressWithException()
+      throws JsonProcessingException {
+    when(_pinotHelixResourceManager.getAllMinionInstanceConfigs()).thenReturn(Collections.emptyList());
+    HttpHeaders httpHeaders = Mockito.mock(HttpHeaders.class);
+    when(httpHeaders.getRequestHeaders()).thenReturn(new MultivaluedHashMap<>());
+    when(_pinotHelixTaskResourceManager
+        .getSubtaskOnWorkerProgress(anyString(), any(), any(), anyMap(), anyMap(), anyInt()))
+        .thenThrow(new RuntimeException());
+    assertThrows(ControllerApplicationException.class,
+        () -> _pinotTaskRestletResource.getSubtaskOnWorkerProgress(httpHeaders, "IN_PROGRESS", null));
+  }
+}
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java
index 746966ec47d..6fe3e565761 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerInstanceToggleTest.java
@@ -19,10 +19,7 @@
 package org.apache.pinot.controller.helix;
 
 import java.io.IOException;
-import java.util.Set;
-import org.apache.helix.model.ExternalView;
 import org.apache.pinot.common.utils.config.TagNameUtils;
-import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -35,7 +32,6 @@
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
 
 
 public class ControllerInstanceToggleTest extends ControllerTest {
@@ -120,7 +116,8 @@ private void toggleInstanceState(String instanceName, String state) {
     // It may take time for an instance to toggle the state.
     TestUtils.waitForCondition(aVoid -> {
       try {
-        sendPostRequest(DEFAULT_INSTANCE.getControllerRequestURLBuilder().forInstanceState(instanceName), state);
+        sendPutRequest(
+            DEFAULT_INSTANCE.getControllerRequestURLBuilder().forInstanceState(instanceName) + "?state=" + state);
       } catch (IOException ioe) {
         // receive non-200 status code
         return false;
@@ -129,21 +126,6 @@ private void toggleInstanceState(String instanceName, String state) {
     }, TIMEOUT_MS, "Failed to toggle instance state: '" + state + "' for instance: " + instanceName);
   }
 
-  private void checkNumOnlineInstancesFromExternalView(String resourceName, int expectedNumOnlineInstances)
-      throws InterruptedException {
-    long endTime = System.currentTimeMillis() + TIMEOUT_MS;
-    while (System.currentTimeMillis() < endTime) {
-      ExternalView resourceExternalView = DEFAULT_INSTANCE.getHelixAdmin()
-          .getResourceExternalView(DEFAULT_INSTANCE.getHelixClusterName(), resourceName);
-      Set<String> instanceSet = HelixHelper.getOnlineInstanceFromExternalView(resourceExternalView);
-      if (instanceSet.size() == expectedNumOnlineInstances) {
-        return;
-      }
-      Thread.sleep(100L);
-    }
-    fail("Failed to reach " + expectedNumOnlineInstances + " online instances for resource: " + resourceName);
-  }
-
   @AfterClass
   public void tearDown() {
     DEFAULT_INSTANCE.cleanup();
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
index 3259c5148fa..43aef8af8bf 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -42,6 +43,7 @@
 import org.apache.helix.InstanceType;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.ClusterConfig;
+import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.HelixConfigScope;
 import org.apache.helix.model.Message;
 import org.apache.helix.model.ResourceConfig;
@@ -57,6 +59,7 @@
 import org.apache.pinot.common.utils.SimpleHttpResponse;
 import org.apache.pinot.common.utils.ZkStarter;
 import org.apache.pinot.common.utils.config.TagNameUtils;
+import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.common.utils.http.HttpClient;
 import org.apache.pinot.controller.BaseControllerStarter;
 import org.apache.pinot.controller.ControllerConf;
@@ -76,6 +79,7 @@
 import org.apache.pinot.spi.utils.NetUtils;
 import org.apache.pinot.spi.utils.builder.ControllerRequestURLBuilder;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.apache.pinot.util.TestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,6 +88,7 @@
 import static org.apache.pinot.spi.utils.CommonConstants.Server.DEFAULT_ADMIN_API_PORT;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.fail;
 
 
 public class ControllerTest {
@@ -103,6 +108,8 @@ public class ControllerTest {
   // NOTE: To add HLC realtime table, number of Server instances must be multiple of replicas
   public static final int DEFAULT_NUM_SERVER_INSTANCES = 4;
 
+  public static final long TIMEOUT_MS = 10_000L;
+
   /**
    * default static instance used to access all wrapped static instances.
    */
@@ -112,8 +119,8 @@ public class ControllerTest {
 
   protected static HttpClient _httpClient = null;
 
-  protected int _controllerPort;
-  protected String _controllerBaseApiUrl;
+  private int _controllerPort;
+  private String _controllerBaseApiUrl;
   protected ControllerConf _controllerConfig;
   protected ControllerRequestURLBuilder _controllerRequestURLBuilder;
 
@@ -210,9 +217,14 @@ public Map<String, Object> getDefaultControllerConfiguration() {
     properties.put(ControllerConf.HELIX_CLUSTER_NAME, getHelixClusterName());
     // Enable groovy on the controller
     properties.put(ControllerConf.DISABLE_GROOVY, false);
+    overrideControllerConf(properties);
     return properties;
   }
 
+  protected void overrideControllerConf(Map<String, Object> properties) {
+    // do nothing, to be overridden by tests if they need something specific
+  }
+
   public void startController()
       throws Exception {
     startController(getDefaultControllerConfiguration());
@@ -615,6 +627,11 @@ public void addSchema(Schema schema)
     getControllerRequestClient().addSchema(schema);
   }
 
+  public void updateSchema(Schema schema)
+      throws IOException {
+    getControllerRequestClient().updateSchema(schema);
+  }
+
   public Schema getSchema(String schemaName) {
     Schema schema = _helixResourceManager.getSchema(schemaName);
     assertNotNull(schema);
@@ -658,6 +675,11 @@ public void dropRealtimeTable(String tableName)
     getControllerRequestClient().deleteTable(TableNameBuilder.REALTIME.tableNameWithType(tableName));
   }
 
+  public void waitForEVToDisappear(String tableNameWithType) {
+    TestUtils.waitForCondition(aVoid -> _helixResourceManager.getTableExternalView(tableNameWithType) == null, 60_000L,
+        "Failed to clean up the external view for table: " + tableNameWithType);
+  }
+
   public List<String> listSegments(String tableName)
       throws IOException {
     return listSegments(tableName, null, false);
@@ -754,6 +776,10 @@ public static String sendGetRequestRaw(String urlString)
     return IOUtils.toString(new URL(urlString).openStream());
   }
 
+  public static String sendPostRequest(String urlString)
+    throws IOException {
+    return sendPostRequest(urlString, null);
+  }
   public static String sendPostRequest(String urlString, String payload)
       throws IOException {
     return sendPostRequest(urlString, payload, Collections.emptyMap());
@@ -948,6 +974,24 @@ public void stopSharedTestSetup() {
     stopZk();
   }
 
+  /**
+   * Checks if the number of online instances for a given resource matches the expected num of instances or not.
+   */
+  public void checkNumOnlineInstancesFromExternalView(String resourceName, int expectedNumOnlineInstances)
+      throws InterruptedException {
+    long endTime = System.currentTimeMillis() + TIMEOUT_MS;
+    while (System.currentTimeMillis() < endTime) {
+      ExternalView resourceExternalView = DEFAULT_INSTANCE.getHelixAdmin()
+          .getResourceExternalView(DEFAULT_INSTANCE.getHelixClusterName(), resourceName);
+      Set<String> instanceSet = HelixHelper.getOnlineInstanceFromExternalView(resourceExternalView);
+      if (instanceSet.size() == expectedNumOnlineInstances) {
+        return;
+      }
+      Thread.sleep(100L);
+    }
+    fail("Failed to reach " + expectedNumOnlineInstances + " online instances for resource: " + resourceName);
+  }
+
   /**
    * Make sure shared state is setup and valid before each test case class is run.
    */
@@ -979,19 +1023,28 @@ public void setupSharedStateAndValidate()
    * test functionality.
    */
   public void cleanup() {
-
-    // Delete all tables.
-    List<String> tables = getHelixResourceManager().getAllTables();
-    for (String table : tables) {
-      getHelixResourceManager().deleteOfflineTable(table);
-      getHelixResourceManager().deleteRealtimeTable(table);
+    // Delete all tables
+    List<String> tables = _helixResourceManager.getAllTables();
+    for (String tableNameWithType : tables) {
+      if (TableNameBuilder.isOfflineTableResource(tableNameWithType)) {
+        _helixResourceManager.deleteOfflineTable(tableNameWithType);
+      } else {
+        _helixResourceManager.deleteRealtimeTable(tableNameWithType);
+      }
     }
 
+    // Wait for all external views to disappear
+    Set<String> tablesWithEV = new HashSet<>(tables);
+    TestUtils.waitForCondition(aVoid -> {
+      tablesWithEV.removeIf(t -> _helixResourceManager.getTableExternalView(t) == null);
+      return tablesWithEV.isEmpty();
+    }, 60_000L, "Failed to clean up all the external views");
+
     // Delete all schemas.
-    List<String> schemaNames = getHelixResourceManager().getSchemaNames();
+    List<String> schemaNames = _helixResourceManager.getSchemaNames();
     if (CollectionUtils.isNotEmpty(schemaNames)) {
       for (String schemaName : schemaNames) {
-        getHelixResourceManager().deleteSchema(getHelixResourceManager().getSchema(schemaName));
+        getHelixResourceManager().deleteSchema(schemaName);
       }
     }
   }
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java
index 445e43a8712..6f4c87de04c 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java
@@ -23,10 +23,12 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Future;
 import org.apache.helix.model.IdealState;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
 import org.apache.pinot.core.realtime.impl.fakestream.FakeStreamConfigUtils;
 import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
@@ -36,65 +38,64 @@
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
-import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.*;
+
 
 public class PinotResourceManagerTest {
-  private static final ControllerTest TEST_INSTANCE = ControllerTest.getInstance();
-  private static final String OFFLINE_TABLE_NAME = "offlineResourceManagerTestTable_OFFLINE";
-  private static final String REALTIME_TABLE_NAME = "realtimeResourceManagerTestTable_REALTIME";
-  private static final String NUM_REPLICAS_STRING = "2";
-  private static final String PARTITION_COLUMN = "Partition_Column";
+  private static final String RAW_TABLE_NAME = "testTable";
+  private static final String OFFLINE_TABLE_NAME = TableNameBuilder.OFFLINE.tableNameWithType(RAW_TABLE_NAME);
+  private static final String REALTIME_TABLE_NAME = TableNameBuilder.REALTIME.tableNameWithType(RAW_TABLE_NAME);
+  private static final int NUM_REPLICAS = 2;
+  private static final String PARTITION_COLUMN = "partitionColumn";
+
+  private final ControllerTest _testInstance = ControllerTest.getInstance();
+  private PinotHelixResourceManager _resourceManager;
 
   @BeforeClass
   public void setUp()
       throws Exception {
-    TEST_INSTANCE.setupSharedStateAndValidate();
+    _testInstance.setupSharedStateAndValidate();
+    _resourceManager = _testInstance.getHelixResourceManager();
 
     // Adding an offline table
-    TableConfig offlineTableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(OFFLINE_TABLE_NAME).build();
-    TEST_INSTANCE.getHelixResourceManager().addTable(offlineTableConfig);
+    TableConfig offlineTableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    _resourceManager.addTable(offlineTableConfig);
 
     // Adding an upsert enabled realtime table which consumes from a stream with 2 partitions
-    Schema dummySchema = TEST_INSTANCE.createDummySchema(REALTIME_TABLE_NAME);
-    TEST_INSTANCE.addSchema(dummySchema);
+    Schema dummySchema = ControllerTest.createDummySchema(RAW_TABLE_NAME);
+    _testInstance.addSchema(dummySchema);
     Map<String, String> streamConfigs = FakeStreamConfigUtils.getDefaultLowLevelStreamConfigs().getStreamConfigsMap();
     TableConfig realtimeTableConfig =
-        new TableConfigBuilder(TableType.REALTIME).setStreamConfigs(streamConfigs).setTableName(REALTIME_TABLE_NAME)
-            .setSchemaName(dummySchema.getSchemaName()).build();
-    realtimeTableConfig.getValidationConfig().setReplicasPerPartition(NUM_REPLICAS_STRING);
-    realtimeTableConfig.getValidationConfig()
-        .setReplicaGroupStrategyConfig(new ReplicaGroupStrategyConfig(PARTITION_COLUMN, 1));
-    realtimeTableConfig.setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL));
-    TEST_INSTANCE.getHelixResourceManager().addTable(realtimeTableConfig);
+        new TableConfigBuilder(TableType.REALTIME).setTableName(RAW_TABLE_NAME).setNumReplicas(NUM_REPLICAS)
+            .setStreamConfigs(streamConfigs)
+            .setReplicaGroupStrategyConfig(new ReplicaGroupStrategyConfig(PARTITION_COLUMN, 1))
+            .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL)).build();
+    _resourceManager.addTable(realtimeTableConfig);
   }
 
   @Test
   public void testTableCleanupAfterRealtimeClusterException()
       throws Exception {
-    String invalidRealtimeTable = "invalidTable_REALTIME";
-    Schema dummySchema = TEST_INSTANCE.createDummySchema(invalidRealtimeTable);
-    TEST_INSTANCE.addSchema(dummySchema);
+    String invalidRawTableName = "invalidTable";
+    Schema dummySchema = ControllerTest.createDummySchema(invalidRawTableName);
+    _testInstance.addSchema(dummySchema);
 
-    // Missing replicasPerPartition
+    // Missing stream config
     TableConfig invalidRealtimeTableConfig =
-        new TableConfigBuilder(TableType.REALTIME).setTableName(invalidRealtimeTable)
-            .setSchemaName(dummySchema.getSchemaName()).build();
-
+        new TableConfigBuilder(TableType.REALTIME).setTableName(invalidRawTableName).build();
     try {
-      TEST_INSTANCE.getHelixResourceManager().addTable(invalidRealtimeTableConfig);
-      Assert.fail(
-          "Table creation should have thrown exception due to missing stream config and replicasPerPartition in "
-              + "validation config");
+      _resourceManager.addTable(invalidRealtimeTableConfig);
+      fail("Table creation should have thrown exception due to missing stream config in validation config");
     } catch (Exception e) {
       // expected
     }
 
     // Verify invalid table config is cleaned up
-    Assert.assertNull(TEST_INSTANCE.getHelixResourceManager().getTableConfig(invalidRealtimeTable));
+    assertNull(_resourceManager.getTableConfig(invalidRealtimeTableConfig.getTableName()));
   }
 
   @Test
@@ -102,144 +103,130 @@ public void testUpdateSegmentZKMetadata() {
     SegmentZKMetadata segmentZKMetadata = new SegmentZKMetadata("testSegment");
 
     // Segment ZK metadata does not exist
-    Assert.assertFalse(TEST_INSTANCE.getHelixResourceManager()
-        .updateZkMetadata(OFFLINE_TABLE_NAME + "_OFFLINE", segmentZKMetadata, 0));
+    assertFalse(_resourceManager.updateZkMetadata(OFFLINE_TABLE_NAME, segmentZKMetadata, 0));
 
     // Set segment ZK metadata
-    Assert.assertTrue(TEST_INSTANCE.getHelixResourceManager()
-        .updateZkMetadata(OFFLINE_TABLE_NAME + "_OFFLINE", segmentZKMetadata));
+    assertTrue(_resourceManager.updateZkMetadata(OFFLINE_TABLE_NAME, segmentZKMetadata));
 
     // Update ZK metadata
-    Assert.assertEquals(TEST_INSTANCE.getHelixResourceManager()
-        .getSegmentMetadataZnRecord(OFFLINE_TABLE_NAME + "_OFFLINE", "testSegment").getVersion(), 0);
-    Assert.assertTrue(TEST_INSTANCE.getHelixResourceManager()
-        .updateZkMetadata(OFFLINE_TABLE_NAME + "_OFFLINE", segmentZKMetadata, 0));
-    Assert.assertEquals(TEST_INSTANCE.getHelixResourceManager()
-        .getSegmentMetadataZnRecord(OFFLINE_TABLE_NAME + "_OFFLINE", "testSegment").getVersion(), 1);
-    Assert.assertFalse(TEST_INSTANCE.getHelixResourceManager()
-        .updateZkMetadata(OFFLINE_TABLE_NAME + "_OFFLINE", segmentZKMetadata, 0));
+    ZNRecord segmentMetadataZnRecord = _resourceManager.getSegmentMetadataZnRecord(OFFLINE_TABLE_NAME, "testSegment");
+    assertNotNull(segmentMetadataZnRecord);
+    assertEquals(segmentMetadataZnRecord.getVersion(), 0);
+    assertTrue(_resourceManager.updateZkMetadata(OFFLINE_TABLE_NAME, segmentZKMetadata, 0));
+    segmentMetadataZnRecord = _resourceManager.getSegmentMetadataZnRecord(OFFLINE_TABLE_NAME, "testSegment");
+    assertNotNull(segmentMetadataZnRecord);
+    assertEquals(segmentMetadataZnRecord.getVersion(), 1);
+    assertFalse(_resourceManager.updateZkMetadata(OFFLINE_TABLE_NAME, segmentZKMetadata, 0));
   }
 
   /**
    * First tests basic segment adding/deleting.
-   * Then creates 3 threads that concurrently try to add 10 segments each, and asserts that we have
-   * 100 segments in the end. Then launches 5 threads again that concurrently try to delete all segments,
-   * and makes sure that we have zero segments left in the end.
-   * @throws Exception
+   * Then creates 3 threads that concurrently try to add 10 segments each, and asserts that we have 30 segments in the
+   * end. Then launches 3 threads again that concurrently try to delete all segments, and makes sure that we have 0
+   * segments left in the end.
    */
-
   @Test
   public void testBasicAndConcurrentAddingAndDeletingSegments()
       throws Exception {
-    final String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(OFFLINE_TABLE_NAME);
+    PinotHelixResourceManager resourceManager = _resourceManager;
 
-    // Basic add/delete case
+    // Basic add/delete
     for (int i = 1; i <= 2; i++) {
-      TEST_INSTANCE.getHelixResourceManager()
-          .addNewSegment(OFFLINE_TABLE_NAME, SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME),
-              "downloadUrl");
+      resourceManager.addNewSegment(OFFLINE_TABLE_NAME,
+          SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME), "downloadUrl");
     }
-    IdealState idealState = TEST_INSTANCE.getHelixAdmin()
-        .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(), offlineTableName);
+    IdealState idealState = resourceManager.getTableIdealState(OFFLINE_TABLE_NAME);
+    assertNotNull(idealState);
     Set<String> segments = idealState.getPartitionSet();
-    Assert.assertEquals(segments.size(), 2);
+    assertEquals(segments.size(), 2);
 
     for (String segmentName : segments) {
-      TEST_INSTANCE.getHelixResourceManager().deleteSegment(offlineTableName, segmentName);
+      resourceManager.deleteSegment(OFFLINE_TABLE_NAME, segmentName);
     }
-    idealState = TEST_INSTANCE.getHelixAdmin()
-        .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(), offlineTableName);
-    Assert.assertEquals(idealState.getPartitionSet().size(), 0);
+    idealState = resourceManager.getTableIdealState(OFFLINE_TABLE_NAME);
+    assertNotNull(idealState);
+    assertEquals(idealState.getNumPartitions(), 0);
 
-    // Concurrent segment deletion
-    ExecutorService addSegmentExecutor = Executors.newFixedThreadPool(3);
+    // Concurrent add/deletion
+    ExecutorService executor = Executors.newFixedThreadPool(3);
+    Future<?>[] futures = new Future[3];
     for (int i = 0; i < 3; i++) {
-      addSegmentExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          for (int i = 0; i < 10; i++) {
-            TEST_INSTANCE.getHelixResourceManager()
-                .addNewSegment(OFFLINE_TABLE_NAME, SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME),
-                    "downloadUrl");
-          }
+      futures[i] = executor.submit(() -> {
+        for (int i1 = 0; i1 < 10; i1++) {
+          resourceManager.addNewSegment(OFFLINE_TABLE_NAME,
+              SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME), "downloadUrl");
         }
       });
     }
-    addSegmentExecutor.shutdown();
-    addSegmentExecutor.awaitTermination(1, TimeUnit.MINUTES);
-
-    idealState = TEST_INSTANCE.getHelixAdmin()
-        .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(), offlineTableName);
-    Assert.assertEquals(idealState.getPartitionSet().size(), 30);
-
-    ExecutorService deleteSegmentExecutor = Executors.newFixedThreadPool(3);
-    for (final String segmentName : idealState.getPartitionSet()) {
-      deleteSegmentExecutor.execute(new Runnable() {
-        @Override
-        public void run() {
-          TEST_INSTANCE.getHelixResourceManager().deleteSegment(offlineTableName, segmentName);
-        }
-      });
+    for (int i = 0; i < 3; i++) {
+      futures[i].get();
+    }
+    idealState = resourceManager.getTableIdealState(OFFLINE_TABLE_NAME);
+    assertNotNull(idealState);
+    segments = idealState.getPartitionSet();
+    assertEquals(segments.size(), 30);
+
+    futures = new Future[30];
+    int index = 0;
+    for (String segment : segments) {
+      futures[index++] = executor.submit(() -> resourceManager.deleteSegment(OFFLINE_TABLE_NAME, segment));
+    }
+    for (int i = 0; i < 30; i++) {
+      futures[i].get();
     }
-    deleteSegmentExecutor.shutdown();
-    deleteSegmentExecutor.awaitTermination(1, TimeUnit.MINUTES);
+    idealState = resourceManager.getTableIdealState(OFFLINE_TABLE_NAME);
+    assertNotNull(idealState);
+    assertEquals(idealState.getNumPartitions(), 0);
 
-    idealState = TEST_INSTANCE.getHelixAdmin()
-        .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(), offlineTableName);
-    Assert.assertEquals(idealState.getPartitionSet().size(), 0);
+    executor.shutdown();
   }
 
   @Test
   public void testAddingRealtimeTableSegmentsWithPartitionIdInZkMetadata() {
     // Add three segments: two from partition 0 and 1 from partition 1;
-    String partition0Segment0 = "realtimeResourceManagerTestTable__aa";
-    String partition0Segment1 = "realtimeResourceManagerTestTable__bb";
-    String partition1Segment1 = "realtimeResourceManagerTestTable__cc";
-    TEST_INSTANCE.getHelixResourceManager().addNewSegment(REALTIME_TABLE_NAME, SegmentMetadataMockUtils
-            .mockSegmentMetadataWithPartitionInfo(REALTIME_TABLE_NAME, partition0Segment0, PARTITION_COLUMN, 0),
-        "downloadUrl");
-    TEST_INSTANCE.getHelixResourceManager().addNewSegment(REALTIME_TABLE_NAME, SegmentMetadataMockUtils
-            .mockSegmentMetadataWithPartitionInfo(REALTIME_TABLE_NAME, partition0Segment1, PARTITION_COLUMN, 0),
-        "downloadUrl");
-    TEST_INSTANCE.getHelixResourceManager().addNewSegment(REALTIME_TABLE_NAME, SegmentMetadataMockUtils
-            .mockSegmentMetadataWithPartitionInfo(REALTIME_TABLE_NAME, partition1Segment1, PARTITION_COLUMN, 1),
-        "downloadUrl");
-    Map<String, Integer> segment2PartitionId = new HashMap<>();
-    segment2PartitionId.put(partition0Segment0, 0);
-    segment2PartitionId.put(partition0Segment1, 0);
-    segment2PartitionId.put(partition1Segment1, 1);
-
-    IdealState idealState = TEST_INSTANCE.getHelixAdmin()
-        .getResourceIdealState(TEST_INSTANCE.getHelixClusterName(),
-            TableNameBuilder.REALTIME.tableNameWithType(REALTIME_TABLE_NAME));
+    String partition0Segment0 = "p0s0";
+    String partition0Segment1 = "p0s1";
+    String partition1Segment0 = "p1s0";
+    _resourceManager.addNewSegment(REALTIME_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadataWithPartitionInfo(RAW_TABLE_NAME, partition0Segment0,
+            PARTITION_COLUMN, 0), "downloadUrl");
+    _resourceManager.addNewSegment(REALTIME_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadataWithPartitionInfo(RAW_TABLE_NAME, partition0Segment1,
+            PARTITION_COLUMN, 0), "downloadUrl");
+    _resourceManager.addNewSegment(REALTIME_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadataWithPartitionInfo(RAW_TABLE_NAME, partition1Segment0,
+            PARTITION_COLUMN, 1), "downloadUrl");
+
+    IdealState idealState = _resourceManager.getTableIdealState(REALTIME_TABLE_NAME);
+    assertNotNull(idealState);
     Set<String> segments = idealState.getPartitionSet();
-    Assert.assertEquals(segments.size(), 5);
-    Assert.assertTrue(segments.contains(partition0Segment0));
-    Assert.assertTrue(segments.contains(partition0Segment1));
-    Assert.assertTrue(segments.contains(partition1Segment1));
+    // 2 consuming segments, 3 uploaded segments
+    assertEquals(segments.size(), 5);
+    assertTrue(segments.contains(partition0Segment0));
+    assertTrue(segments.contains(partition0Segment1));
+    assertTrue(segments.contains(partition1Segment0));
 
     // Check the segments of the same partition is assigned to the same set of servers.
-    Map<Integer, Set<String>> segmentAssignment = new HashMap<>();
+    Map<Integer, Set<String>> partitionIdToServersMap = new HashMap<>();
     for (String segment : segments) {
-      Integer partitionId;
+      int partitionId;
       LLCSegmentName llcSegmentName = LLCSegmentName.of(segment);
       if (llcSegmentName != null) {
         partitionId = llcSegmentName.getPartitionGroupId();
       } else {
-        partitionId = segment2PartitionId.get(segment);
+        partitionId = Integer.parseInt(segment.substring(1, 2));
       }
-      Assert.assertNotNull(partitionId);
       Set<String> instances = idealState.getInstanceSet(segment);
-      if (segmentAssignment.containsKey(partitionId)) {
-        Assert.assertEquals(instances, segmentAssignment.get(partitionId));
+      if (partitionIdToServersMap.containsKey(partitionId)) {
+        assertEquals(instances, partitionIdToServersMap.get(partitionId));
       } else {
-        segmentAssignment.put(partitionId, instances);
+        partitionIdToServersMap.put(partitionId, instances);
       }
     }
   }
 
   @AfterClass
   public void tearDown() {
-    TEST_INSTANCE.cleanup();
+    _testInstance.cleanup();
   }
 }
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java
index a2ae5aaa963..22ddedd2573 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/SegmentStatusCheckerTest.java
@@ -696,6 +696,69 @@ public void noSegments()
     noSegmentsInternal(-1);
   }
 
+  @Test
+  public void lessThanOnePercentSegmentsUnavailableTest()
+          throws Exception {
+    String tableName = "myTable_OFFLINE";
+    int numSegments = 200;
+    List<String> allTableNames = new ArrayList<String>();
+    allTableNames.add(tableName);
+    TableConfig tableConfig =
+            new TableConfigBuilder(TableType.OFFLINE).setTableName(tableName).setNumReplicas(1).build();
+
+    IdealState idealState = new IdealState(tableName);
+    for (int i = 0; i < numSegments; i++) {
+      idealState.setPartitionState("myTable_" + i, "pinot1", "ONLINE");
+    }
+    idealState.setReplicas("1");
+    idealState.setRebalanceMode(IdealState.RebalanceMode.CUSTOMIZED);
+
+    ExternalView externalView = new ExternalView(tableName);
+    externalView.setState("myTable_0", "pinot1", "OFFLINE");
+    for (int i = 1; i < numSegments; i++) {
+      externalView.setState("myTable_" + i, "pinot1", "ONLINE");
+    }
+
+    {
+      _helixResourceManager = mock(PinotHelixResourceManager.class);
+      when(_helixResourceManager.getAllTables()).thenReturn(allTableNames);
+      when(_helixResourceManager.getTableConfig(tableName)).thenReturn(tableConfig);
+      when(_helixResourceManager.getTableIdealState(tableName)).thenReturn(idealState);
+      when(_helixResourceManager.getTableExternalView(tableName)).thenReturn(externalView);
+    }
+    {
+      _helixPropertyStore = mock(ZkHelixPropertyStore.class);
+      when(_helixResourceManager.getPropertyStore()).thenReturn(_helixPropertyStore);
+      SegmentLineage segmentLineage = new SegmentLineage(tableName);
+      when(_helixPropertyStore.get(eq("/SEGMENT_LINEAGE/" + tableName), any(), eq(AccessOption.PERSISTENT)))
+              .thenReturn(segmentLineage.toZNRecord());
+    }
+    {
+      _config = mock(ControllerConf.class);
+      when(_config.getStatusCheckerFrequencyInSeconds()).thenReturn(300);
+      when(_config.getStatusCheckerWaitForPushTimeInSeconds()).thenReturn(300);
+    }
+    {
+      _leadControllerManager = mock(LeadControllerManager.class);
+      when(_leadControllerManager.isLeaderForTable(anyString())).thenReturn(true);
+    }
+    {
+      _tableSizeReader = mock(TableSizeReader.class);
+      when(_tableSizeReader.getTableSizeDetails(anyString(), anyInt())).thenReturn(null);
+    }
+    PinotMetricUtils.cleanUp();
+    _metricsRegistry = PinotMetricUtils.getPinotMetricsRegistry();
+    _controllerMetrics = new ControllerMetrics(_metricsRegistry);
+    _segmentStatusChecker =
+            new SegmentStatusChecker(_helixResourceManager, _leadControllerManager, _config, _controllerMetrics,
+                    _executorService);
+    _segmentStatusChecker.setTableSizeReader(_tableSizeReader);
+    _segmentStatusChecker.start();
+    _segmentStatusChecker.run();
+    Assert.assertEquals(MetricValueUtils.getTableGaugeValue(_controllerMetrics, externalView.getId(),
+            ControllerGauge.PERCENT_SEGMENTS_AVAILABLE), 99);
+  }
+
   public void noSegmentsInternal(final int nReplicas)
       throws Exception {
     final String tableName = "myTable_REALTIME";
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/TableCacheTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/TableCacheTest.java
index 9f2024dd99c..17880643e02 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/TableCacheTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/TableCacheTest.java
@@ -98,6 +98,7 @@ public void testTableCache(boolean isCaseInsensitive)
     // Add a table config
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setSchemaName(SCHEMA_NAME).build();
+    TEST_INSTANCE.waitForEVToDisappear(tableConfig.getTableName());
     TEST_INSTANCE.getHelixResourceManager().addTable(tableConfig);
     // Wait for at most 10 seconds for the callback to add the table config to the cache
     TestUtils.waitForCondition(
@@ -128,7 +129,7 @@ public void testTableCache(boolean isCaseInsensitive)
 
     // Update the schema
     schema.addField(new DimensionFieldSpec("newColumn", DataType.LONG, true));
-    TEST_INSTANCE.getHelixResourceManager().updateSchema(schema, false);
+    TEST_INSTANCE.getHelixResourceManager().updateSchema(schema, false, false);
     // Wait for at most 10 seconds for the callback to update the schema in the cache
     // NOTE:
     // - Schema should never be null during the transitioning
@@ -196,7 +197,7 @@ public void testTableCache(boolean isCaseInsensitive)
     assertNull(tableCache.getColumnNameMap(RAW_TABLE_NAME));
 
     // Remove the schema
-    TEST_INSTANCE.getHelixResourceManager().deleteSchema(schema);
+    TEST_INSTANCE.getHelixResourceManager().deleteSchema(SCHEMA_NAME);
     // Wait for at most 10 seconds for the callback to remove the schema from the cache
     // NOTE:
     // - Verify if the callback is fully done by checking the schema change lister because it is the last step of the
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerAssignmentTest.java
new file mode 100644
index 00000000000..2c3b92ebc58
--- /dev/null
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerAssignmentTest.java
@@ -0,0 +1,167 @@
+/**
+ * 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.pinot.controller.helix.core;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.tier.TierFactory;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.helix.ControllerTest;
+import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.config.table.TierConfig;
+import org.apache.pinot.spi.config.tenant.Tenant;
+import org.apache.pinot.spi.config.tenant.TenantRole;
+import org.apache.pinot.spi.utils.CommonConstants.Helix;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+
+@Test(groups = "stateless")
+public class PinotHelixResourceManagerAssignmentTest extends ControllerTest {
+  private static final int NUM_BROKER_INSTANCES = 3;
+  private static final int NUM_OFFLINE_SERVER_INSTANCES = 2;
+  private static final int NUM_OFFLINE_COLD_SERVER_INSTANCES = 2;
+  private static final int NUM_REALTIME_SERVER_INSTANCES = 2;
+  private static final int NUM_SERVER_INSTANCES =
+      NUM_OFFLINE_SERVER_INSTANCES + NUM_REALTIME_SERVER_INSTANCES + NUM_OFFLINE_COLD_SERVER_INSTANCES;
+  private static final String BROKER_TENANT_NAME = "brokerTenant";
+  private static final String SERVER_TENANT_NAME = "serverTenant";
+  private static final String SERVER_COLD_TENANT_NAME = "coldServerTenant";
+
+  private static final String RAW_TABLE_NAME = "testTable";
+  private static final String OFFLINE_TABLE_NAME = TableNameBuilder.OFFLINE.tableNameWithType(RAW_TABLE_NAME);
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    startZk();
+
+    Map<String, Object> properties = getDefaultControllerConfiguration();
+    properties.put(ControllerConf.CONTROLLER_ENABLE_TIERED_SEGMENT_ASSIGNMENT, true);
+    properties.put(ControllerConf.CLUSTER_TENANT_ISOLATION_ENABLE, false);
+    startController(properties);
+
+    addFakeBrokerInstancesToAutoJoinHelixCluster(NUM_BROKER_INSTANCES, false);
+    addFakeServerInstancesToAutoJoinHelixCluster(NUM_SERVER_INSTANCES, false);
+
+    resetBrokerTags();
+    resetServerTags();
+  }
+
+  private void untagBrokers() {
+    for (String brokerInstance : _helixResourceManager.getAllInstancesForBrokerTenant(BROKER_TENANT_NAME)) {
+      _helixResourceManager.updateInstanceTags(brokerInstance, Helix.UNTAGGED_BROKER_INSTANCE, false);
+    }
+  }
+
+  private void resetBrokerTags() {
+    untagBrokers();
+    assertEquals(_helixResourceManager.getOnlineUnTaggedBrokerInstanceList().size(), NUM_BROKER_INSTANCES);
+    Tenant brokerTenant = new Tenant(TenantRole.BROKER, BROKER_TENANT_NAME, NUM_BROKER_INSTANCES, 0, 0);
+    _helixResourceManager.createBrokerTenant(brokerTenant);
+    assertEquals(_helixResourceManager.getOnlineUnTaggedBrokerInstanceList().size(), 0);
+  }
+
+  private void untagServers() {
+    for (String serverInstance : _helixResourceManager.getAllInstancesForServerTenant(SERVER_TENANT_NAME)) {
+      _helixResourceManager.updateInstanceTags(serverInstance, Helix.UNTAGGED_SERVER_INSTANCE, false);
+    }
+
+    for (String serverInstance : _helixResourceManager.getAllInstancesForServerTenant(SERVER_COLD_TENANT_NAME)) {
+      _helixResourceManager.updateInstanceTags(serverInstance, Helix.UNTAGGED_SERVER_INSTANCE, false);
+    }
+  }
+
+  private void resetServerTags() {
+    untagServers();
+    assertEquals(_helixResourceManager.getOnlineUnTaggedServerInstanceList().size(), NUM_SERVER_INSTANCES);
+
+    // Create default tenant
+    Tenant serverTenant =
+        new Tenant(TenantRole.SERVER, SERVER_TENANT_NAME, NUM_SERVER_INSTANCES - NUM_OFFLINE_COLD_SERVER_INSTANCES,
+            NUM_OFFLINE_SERVER_INSTANCES, NUM_REALTIME_SERVER_INSTANCES);
+    _helixResourceManager.createServerTenant(serverTenant);
+
+    // Create cold tenant
+    Tenant coldTenant =
+        new Tenant(TenantRole.SERVER, SERVER_COLD_TENANT_NAME, NUM_OFFLINE_COLD_SERVER_INSTANCES,
+            NUM_OFFLINE_COLD_SERVER_INSTANCES, 0);
+    _helixResourceManager.createServerTenant(coldTenant);
+
+    assertEquals(_helixResourceManager.getOnlineUnTaggedServerInstanceList().size(), 0);
+  }
+
+  @Test
+  public void testAssignTargetTier()
+      throws Exception {
+    String coldOfflineServerTag = SERVER_COLD_TENANT_NAME + "_OFFLINE";
+    TierConfig tierConfig =
+        new TierConfig("tier1", TierFactory.FIXED_SEGMENT_SELECTOR_TYPE, null, Collections.singletonList("testSegment"),
+            TierFactory.PINOT_SERVER_STORAGE_TYPE, coldOfflineServerTag, null, null);
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
+            .setTierConfigList(Collections.singletonList(tierConfig)).setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(tableConfig.getTableName());
+    _helixResourceManager.addTable(tableConfig);
+
+    String segmentName = "testSegment";
+    ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, OFFLINE_TABLE_NAME, new SegmentZKMetadata(segmentName));
+    _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, segmentName), "downloadUrl");
+
+    List<SegmentZKMetadata> retrievedSegmentsZKMetadata =
+        _helixResourceManager.getSegmentsZKMetadata(OFFLINE_TABLE_NAME);
+    SegmentZKMetadata retrievedSegmentZKMetadata = retrievedSegmentsZKMetadata.get(0);
+    assertEquals(retrievedSegmentZKMetadata.getSegmentName(), segmentName);
+    assertEquals(retrievedSegmentZKMetadata.getTier(), "tier1");
+
+    // Retrieve current assignment of the table and ensure segment's presence there
+    IdealState idealState = HelixHelper.getTableIdealState(_helixManager, OFFLINE_TABLE_NAME);
+    assertNotNull(idealState);
+    Map<String, Map<String, String>> currentAssignment = idealState.getRecord().getMapFields();
+    assertTrue(currentAssignment.size() == 1 && currentAssignment.get(segmentName).size() == 1);
+
+    // Ensure that the server instance belongs to the cold tenant
+    String coldServerName = currentAssignment.get(segmentName).keySet().iterator().next();
+    InstanceConfig coldServerConfig = HelixHelper.getInstanceConfig(_helixManager, coldServerName);
+    assertTrue(coldServerConfig.containsTag(coldOfflineServerTag));
+  }
+
+  @AfterClass
+  public void tearDown() {
+    stopFakeInstances();
+    stopController();
+    stopZk();
+  }
+}
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java
index 3e66b5c6aca..5a96a4eea97 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java
@@ -46,6 +46,8 @@
 import org.apache.pinot.common.lineage.SegmentLineageAccessHelper;
 import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.restlet.resources.EndReplaceSegmentsRequest;
+import org.apache.pinot.common.tier.TierFactory;
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.common.utils.config.InstanceUtils;
 import org.apache.pinot.common.utils.config.TagNameUtils;
@@ -63,6 +65,7 @@
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.TagOverrideConfig;
 import org.apache.pinot.spi.config.table.TenantConfig;
+import org.apache.pinot.spi.config.table.TierConfig;
 import org.apache.pinot.spi.config.table.ingestion.BatchIngestionConfig;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
 import org.apache.pinot.spi.config.tenant.Tenant;
@@ -239,6 +242,7 @@ public void testUpdateBrokerResource()
     TableConfig offlineTableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(offlineTableConfig.getTableName());
     _helixResourceManager.addTable(offlineTableConfig);
     checkBrokerResource(taggedBrokers);
 
@@ -296,6 +300,7 @@ public void testRebuildBrokerResourceFromHelixTags()
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     _helixResourceManager.addTable(tableConfig);
 
     // Untag all Brokers assigned to broker tenant
@@ -334,6 +339,7 @@ public void testGetLiveBrokers()
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     _helixResourceManager.addTable(tableConfig);
     waitForTableOnlineInBrokerResourceEV(OFFLINE_TABLE_NAME);
 
@@ -362,6 +368,7 @@ public void testGetLiveBrokers()
         new TableConfigBuilder(TableType.REALTIME).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME)
             .setStreamConfigs(FakeStreamConfigUtils.getDefaultHighLevelStreamConfigs().getStreamConfigsMap()).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     _helixResourceManager.addTable(tableConfig);
     waitForTableOnlineInBrokerResourceEV(REALTIME_TABLE_NAME);
 
@@ -533,6 +540,26 @@ public void testValidateTenantConfig() {
     // Valid tenant config without tagOverrideConfig
     _helixResourceManager.validateTableTenantConfig(offlineTableConfig);
 
+    // Invalid serverTag in tierConfigs
+    TierConfig tierConfig = new TierConfig("myTier", TierFactory.TIME_SEGMENT_SELECTOR_TYPE, "10d", null,
+        TierFactory.PINOT_SERVER_STORAGE_TYPE, "Unknown_OFFLINE", null, null);
+    offlineTableConfig.setTierConfigsList(Collections.singletonList(tierConfig));
+    assertThrows(InvalidTableConfigException.class,
+        () -> _helixResourceManager.validateTableTenantConfig(offlineTableConfig));
+
+    // A null serverTag has no instances associated with it, so it's invalid.
+    tierConfig = new TierConfig("myTier", TierFactory.TIME_SEGMENT_SELECTOR_TYPE, "10d", null,
+        TierFactory.PINOT_SERVER_STORAGE_TYPE, null, null, null);
+    offlineTableConfig.setTierConfigsList(Collections.singletonList(tierConfig));
+    assertThrows(InvalidTableConfigException.class,
+        () -> _helixResourceManager.validateTableTenantConfig(offlineTableConfig));
+
+    // Valid serverTag in tierConfigs
+    tierConfig = new TierConfig("myTier", TierFactory.TIME_SEGMENT_SELECTOR_TYPE, "10d", null,
+        TierFactory.PINOT_SERVER_STORAGE_TYPE, SERVER_TENANT_NAME + "_OFFLINE", null, null);
+    offlineTableConfig.setTierConfigsList(Collections.singletonList(tierConfig));
+    _helixResourceManager.validateTableTenantConfig(offlineTableConfig);
+
     TableConfig realtimeTableConfig =
         new TableConfigBuilder(TableType.REALTIME).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME).build();
@@ -652,7 +679,7 @@ public void testLeadControllerResource() {
         if (stateMap.size() != 1) {
           return false;
         }
-        String instanceId = LeadControllerUtils.generateParticipantInstanceId(LOCAL_HOST, _controllerPort);
+        String instanceId = LeadControllerUtils.generateParticipantInstanceId(LOCAL_HOST, getControllerPort());
         return MasterSlaveSMD.States.MASTER.name().equals(stateMap.get(instanceId));
       }
       return true;
@@ -724,6 +751,81 @@ public void testLeadControllerAssignment() {
     }
   }
 
+  @Test
+  public void testUpdateTargetTier()
+      throws Exception {
+    TierConfig tierConfig =
+        new TierConfig("tier1", TierFactory.FIXED_SEGMENT_SELECTOR_TYPE, null, Collections.singletonList("testSegment"),
+            TierFactory.PINOT_SERVER_STORAGE_TYPE, SERVER_TENANT_NAME + "_OFFLINE", null, null);
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
+            .setTierConfigList(Collections.singletonList(tierConfig)).setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(tableConfig.getTableName());
+    _helixResourceManager.addTable(tableConfig);
+
+    String segmentName = "testSegment";
+    SegmentZKMetadata segmentZKMetadata = new SegmentZKMetadata(segmentName);
+    ZKMetadataProvider.setSegmentZKMetadata(_propertyStore, OFFLINE_TABLE_NAME, segmentZKMetadata);
+    _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "testSegment"), "downloadUrl");
+    assertNull(segmentZKMetadata.getTier());
+
+    // Move on to new tier
+    _helixResourceManager.updateTargetTier("j1", tableConfig.getTableName(), tableConfig);
+    List<SegmentZKMetadata> retrievedSegmentsZKMetadata =
+        _helixResourceManager.getSegmentsZKMetadata(OFFLINE_TABLE_NAME);
+    SegmentZKMetadata retrievedSegmentZKMetadata = retrievedSegmentsZKMetadata.get(0);
+    assertEquals(retrievedSegmentZKMetadata.getTier(), "tier1");
+
+    // Move back to default tier
+    tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
+            .setServerTenant(SERVER_TENANT_NAME).build();
+    _helixResourceManager.updateTableConfig(tableConfig);
+    _helixResourceManager.updateTargetTier("j2", tableConfig.getTableName(), tableConfig);
+    retrievedSegmentsZKMetadata = _helixResourceManager.getSegmentsZKMetadata(OFFLINE_TABLE_NAME);
+    retrievedSegmentZKMetadata = retrievedSegmentsZKMetadata.get(0);
+    assertNull(retrievedSegmentZKMetadata.getTier());
+  }
+
+  /**
+   * Tests the code path where a subset of merged segments (from the original segmentsTo list)
+   * is passed to the endReplace API.
+   * @throws Exception
+   */
+  @Test
+  public void testSegmentReplacementWithCustomToSegments() throws Exception {
+    // Create the table
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
+            .setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(tableConfig.getTableName());
+    _helixResourceManager.addTable(tableConfig);
+
+    List<String> segmentsFrom = Collections.emptyList();
+    List<String> segmentsTo = Arrays.asList("s20", "s21");
+    String lineageEntryId =
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom, segmentsTo, false, null);
+    assertThrows(RuntimeException.class,
+        () -> _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId,
+            new EndReplaceSegmentsRequest(Arrays.asList("s9", "s6"), null)));
+    // Try after new segments added to the table
+    _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s20"), "downloadUrl");
+    _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
+        SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s21"), "downloadUrl");
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId,
+        new EndReplaceSegmentsRequest(Arrays.asList("s21"), null));
+    SegmentLineage segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
+    assertEquals(segmentLineage.getLineageEntryIds(), Collections.singleton(lineageEntryId));
+    assertEquals(segmentLineage.getLineageEntry(lineageEntryId).getSegmentsFrom(), segmentsFrom);
+    assertEquals(segmentLineage.getLineageEntry(lineageEntryId).getState(), LineageEntryState.COMPLETED);
+    // Delete the table
+    _helixResourceManager.deleteOfflineTable(RAW_TABLE_NAME);
+    segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
+    assertNull(segmentLineage);
+  }
+
   @Test
   public void testSegmentReplacementRegular()
       throws Exception {
@@ -731,6 +833,7 @@ public void testSegmentReplacementRegular()
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     _helixResourceManager.addTable(tableConfig);
 
     // Add 5 segments
@@ -744,7 +847,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom1 = Collections.emptyList();
     List<String> segmentsTo1 = Arrays.asList("s5", "s6");
     String lineageEntryId1 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom1, segmentsTo1, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom1, segmentsTo1, false, null);
     SegmentLineage segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds(), Collections.singleton(lineageEntryId1));
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId1).getSegmentsFrom(), segmentsFrom1);
@@ -752,35 +855,39 @@ public void testSegmentReplacementRegular()
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId1).getState(), LineageEntryState.IN_PROGRESS);
 
     // Check invalid segmentsTo
-    assertThrows(IllegalArgumentException.class,
+    assertThrows(IllegalStateException.class,
         () -> _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, Arrays.asList("s1", "s2"),
-            Arrays.asList("s3", "s4"), false));
-    assertThrows(IllegalArgumentException.class,
+            Arrays.asList("s3", "s4"), false, null));
+    assertThrows(IllegalStateException.class,
         () -> _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, Arrays.asList("s1", "s2"),
-            Collections.singletonList("s2"), false));
+            Collections.singletonList("s2"), false, null));
 
     // Check invalid segmentsFrom
-    assertThrows(IllegalArgumentException.class,
+    assertThrows(IllegalStateException.class,
         () -> _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, Arrays.asList("s1", "s6"),
-            Collections.singletonList("s7"), false));
+            Collections.singletonList("s7"), false, null));
 
     // Invalid table
     assertThrows(RuntimeException.class,
-        () -> _helixResourceManager.endReplaceSegments(REALTIME_TABLE_NAME, lineageEntryId1));
+        () -> _helixResourceManager.endReplaceSegments(REALTIME_TABLE_NAME, lineageEntryId1, null));
 
+    // Invalid table
+    assertThrows(RuntimeException.class,
+        () -> _helixResourceManager.endReplaceSegments(REALTIME_TABLE_NAME, lineageEntryId1, null));
     // Invalid lineage entry id
-    assertThrows(RuntimeException.class, () -> _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, "invalid"));
+    assertThrows(RuntimeException.class, () -> _helixResourceManager.
+        endReplaceSegments(OFFLINE_TABLE_NAME, "invalid", null));
 
     // New segments not available in the table
     assertThrows(RuntimeException.class,
-        () -> _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1));
+        () -> _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1, null));
 
     // Try after new segments added to the table
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s5"), "downloadUrl");
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s6"), "downloadUrl");
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds(), Collections.singleton(lineageEntryId1));
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId1).getSegmentsFrom(), segmentsFrom1);
@@ -791,7 +898,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom2 = Arrays.asList("s1", "s2");
     List<String> segmentsTo2 = Arrays.asList("merged_t1_0", "merged_t1_1");
     String lineageEntryId2 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom2, segmentsTo2, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom2, segmentsTo2, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertSetEquals(segmentLineage.getLineageEntryIds(), lineageEntryId1, lineageEntryId2);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId2).getSegmentsFrom(), segmentsFrom2);
@@ -807,10 +914,10 @@ public void testSegmentReplacementRegular()
 
     // Revert the entry with partial data uploaded without forceRevert
     assertThrows(RuntimeException.class,
-        () -> _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId2, false));
+        () -> _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId2, false, null));
 
     // Revert the entry with partial data uploaded with forceRevert
-    _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId2, true);
+    _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId2, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId2).getState(), LineageEntryState.REVERTED);
 
@@ -823,7 +930,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom3 = Arrays.asList("s1", "s2");
     List<String> segmentsTo3 = Arrays.asList("merged_t2_0", "merged_t2_1");
     String lineageEntryId3 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom3, segmentsTo3, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom3, segmentsTo3, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertSetEquals(segmentLineage.getLineageEntryIds(), lineageEntryId1, lineageEntryId2, lineageEntryId3);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId3).getSegmentsFrom(), segmentsFrom3);
@@ -838,11 +945,11 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom4 = Arrays.asList("s1", "s2");
     List<String> segmentsTo4 = Arrays.asList("merged_t3_0", "merged_t3_1");
     assertThrows(RuntimeException.class,
-        () -> _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom4, segmentsTo4, false));
+        () -> _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom4, segmentsTo4, false, null));
 
     // Test force clean up case
     String lineageEntryId4 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom4, segmentsTo4, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom4, segmentsTo4, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertSetEquals(segmentLineage.getLineageEntryIds(), lineageEntryId1, lineageEntryId2, lineageEntryId3,
         lineageEntryId4);
@@ -865,7 +972,7 @@ public void testSegmentReplacementRegular()
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "merged_t3_1"), "downloadUrl");
 
     // Finish the replacement
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId4);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId4, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertSetEquals(segmentLineage.getLineageEntryIds(), lineageEntryId1, lineageEntryId2, lineageEntryId3,
         lineageEntryId4);
@@ -878,7 +985,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom5 = Collections.emptyList();
     List<String> segmentsTo5 = Arrays.asList("s7", "s8");
     String lineageEntryId5 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom5, segmentsTo5, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom5, segmentsTo5, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertSetEquals(segmentLineage.getLineageEntryIds(), lineageEntryId1, lineageEntryId2, lineageEntryId3,
         lineageEntryId4, lineageEntryId5);
@@ -891,7 +998,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom6 = Collections.emptyList();
     List<String> segmentsTo6 = Arrays.asList("s7", "s8");
     String lineageEntryId6 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom6, segmentsTo6, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom6, segmentsTo6, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertSetEquals(segmentLineage.getLineageEntryIds(), lineageEntryId1, lineageEntryId2, lineageEntryId3,
         lineageEntryId4, lineageEntryId6);
@@ -908,7 +1015,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom7 = Collections.emptyList();
     List<String> segmentsTo7 = Arrays.asList("s9", "s10");
     String lineageEntryId7 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom7, segmentsTo7, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom7, segmentsTo7, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 6);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId6).getState(), LineageEntryState.IN_PROGRESS);
@@ -919,7 +1026,7 @@ public void testSegmentReplacementRegular()
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s9"), "downloadUrl");
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s10"), "downloadUrl");
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId7);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId7, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 6);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId6).getState(), LineageEntryState.IN_PROGRESS);
@@ -932,7 +1039,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom8 = Arrays.asList("s9", "s10");
     List<String> segmentsTo8 = Arrays.asList("s11", "s12");
     String lineageEntryId8 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom8, segmentsTo8, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom8, segmentsTo8, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 7);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId8).getSegmentsFrom(), segmentsFrom8);
@@ -948,7 +1055,7 @@ public void testSegmentReplacementRegular()
     List<String> segmentsFrom9 = Arrays.asList("s0", "s9");
     List<String> segmentsTo9 = Arrays.asList("s13", "s14");
     String lineageEntryId9 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom9, segmentsTo9, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom9, segmentsTo9, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 8);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId8).getState(), LineageEntryState.REVERTED);
@@ -959,7 +1066,7 @@ public void testSegmentReplacementRegular()
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s13"), "downloadUrl");
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s14"), "downloadUrl");
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId9);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId9, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 8);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getSegmentsFrom(), segmentsFrom9);
@@ -967,9 +1074,23 @@ public void testSegmentReplacementRegular()
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getState(), LineageEntryState.COMPLETED);
 
     // Check endReplaceSegments is idempotent
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId9);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId9, null);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getState(), LineageEntryState.COMPLETED);
 
+    // Test empty segmentsTo. This is a special case where we are atomically removing segments.
+    List<String> segmentsFrom10 = Arrays.asList("s13", "s14");
+    List<String> segmentsTo10 = Collections.emptyList();
+    String lineageEntryId10 =
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom10, segmentsTo10, true, null);
+    segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
+    assertEquals(segmentLineage.getLineageEntryIds().size(), 9);
+    assertEquals(segmentLineage.getLineageEntry(lineageEntryId10).getState(), LineageEntryState.IN_PROGRESS);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId10, null);
+    segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
+    assertEquals(segmentLineage.getLineageEntry(lineageEntryId10).getSegmentsFrom(), segmentsFrom10);
+    assertEquals(segmentLineage.getLineageEntry(lineageEntryId10).getSegmentsTo(), segmentsTo10);
+    assertEquals(segmentLineage.getLineageEntry(lineageEntryId10).getState(), LineageEntryState.COMPLETED);
+
     // Delete the table
     _helixResourceManager.deleteOfflineTable(RAW_TABLE_NAME);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
@@ -985,6 +1106,7 @@ public void testSegmentReplacementForRefresh()
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setBrokerTenant(BROKER_TENANT_NAME)
             .setServerTenant(SERVER_TENANT_NAME).setIngestionConfig(ingestionConfig).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     _helixResourceManager.addTable(tableConfig);
 
     // Add 3 segments
@@ -999,7 +1121,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom1 = Arrays.asList("s0", "s1", "s2");
     List<String> segmentsTo1 = Arrays.asList("s3", "s4", "s5");
     String lineageEntryId1 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom1, segmentsTo1, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom1, segmentsTo1, false, null);
     SegmentLineage segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds(), Collections.singleton(lineageEntryId1));
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId1).getSegmentsFrom(), segmentsFrom1);
@@ -1017,7 +1139,7 @@ public void testSegmentReplacementForRefresh()
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, true), "s0", "s1", "s2");
 
     // Call end segment replacements
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1, null);
     assertEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, false).size(), 6);
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, true), "s3", "s4", "s5");
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
@@ -1031,7 +1153,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom2 = Arrays.asList("s3", "s4", "s5");
     List<String> segmentsTo2 = Arrays.asList("s6", "s7", "s8");
     String lineageEntryId2 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom2, segmentsTo2, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom2, segmentsTo2, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 2);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId2).getSegmentsFrom(), segmentsFrom2);
@@ -1042,7 +1164,7 @@ public void testSegmentReplacementForRefresh()
 
     // Reverting the first entry should fail
     assertThrows(RuntimeException.class,
-        () -> _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1, false));
+        () -> _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId1, false, null));
 
     // Add partial segments to indicate incomplete protocol
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
@@ -1058,7 +1180,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom3 = Arrays.asList("s3", "s4", "s5");
     List<String> segmentsTo3 = Arrays.asList("s9", "s10", "s11");
     String lineageEntryId3 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom3, segmentsTo3, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom3, segmentsTo3, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntryIds().size(), 3);
 
@@ -1074,7 +1196,7 @@ public void testSegmentReplacementForRefresh()
 
     // Invoking end segment replacement for the reverted entry should fail
     assertThrows(RuntimeException.class,
-        () -> _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId2));
+        () -> _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId2, null));
 
     // Add new segments
     for (int i = 9; i < 12; i++) {
@@ -1083,7 +1205,7 @@ public void testSegmentReplacementForRefresh()
     }
 
     // Call end segment replacements
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId3);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId3, null);
     assertEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, false).size(), 6);
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, true), "s9", "s10", "s11");
 
@@ -1093,7 +1215,7 @@ public void testSegmentReplacementForRefresh()
 
     // Call revert segment replacements (s3, s4, s5) <- (s9, s10, s11) to check if the revertReplaceSegments correctly
     // deleted (s9, s10, s11).
-    _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId3, false);
+    _helixResourceManager.revertReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId3, false, null);
     assertEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, false).size(), 3);
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, true), "s3", "s4", "s5");
 
@@ -1109,7 +1231,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom4 = Arrays.asList("s3", "s4", "s5");
     List<String> segmentsTo4 = Arrays.asList("s12", "s13", "s14");
     String lineageEntryId4 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom4, segmentsTo4, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom4, segmentsTo4, true, null);
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, false), "s3", "s4", "s5");
 
     // Upload the new segments (s12, s13, s14)
@@ -1119,7 +1241,7 @@ public void testSegmentReplacementForRefresh()
     }
 
     // Call endReplaceSegments to start to use (s12, s13, s14)
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId4);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId4, null);
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, false), "s3", "s4", "s5", "s12", "s13",
         "s14");
     assertSetEquals(_helixResourceManager.getSegmentsFor(OFFLINE_TABLE_NAME, true), "s12", "s13", "s14");
@@ -1129,7 +1251,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom5 = Collections.emptyList();
     List<String> segmentsTo5 = Arrays.asList("s15", "s16");
     String lineageEntryId5 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom5, segmentsTo5, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom5, segmentsTo5, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getSegmentsFrom(), segmentsFrom5);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getSegmentsTo(), segmentsTo5);
@@ -1144,7 +1266,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom6 = Collections.emptyList();
     List<String> segmentsTo6 = Arrays.asList("s17", "s18");
     String lineageEntryId6 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom6, segmentsTo6, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom6, segmentsTo6, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getState(), LineageEntryState.IN_PROGRESS);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId6).getState(), LineageEntryState.IN_PROGRESS);
@@ -1154,7 +1276,7 @@ public void testSegmentReplacementForRefresh()
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s17"), "downloadUrl");
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s18"), "downloadUrl");
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId6);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId6, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId6).getSegmentsFrom(), segmentsFrom6);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId6).getSegmentsTo(), segmentsTo6);
@@ -1165,7 +1287,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom7 = Arrays.asList("s17", "s18");
     List<String> segmentsTo7 = Arrays.asList("s19", "s20");
     String lineageEntryId7 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom7, segmentsTo7, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom7, segmentsTo7, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId7).getSegmentsFrom(), segmentsFrom7);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId7).getSegmentsTo(), segmentsTo7);
@@ -1180,7 +1302,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom8 = Arrays.asList("s14", "s17");
     List<String> segmentsTo8 = Arrays.asList("s21", "s22");
     String lineageEntryId8 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom8, segmentsTo8, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom8, segmentsTo8, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId7).getState(), LineageEntryState.REVERTED);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId8).getState(), LineageEntryState.IN_PROGRESS);
@@ -1191,7 +1313,7 @@ public void testSegmentReplacementForRefresh()
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s22"), "downloadUrl");
 
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId8);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId8, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId8).getSegmentsFrom(), segmentsFrom8);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId8).getSegmentsTo(), segmentsTo8);
@@ -1202,7 +1324,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom9 = Arrays.asList("s21", "s22");
     List<String> segmentsTo9 = Arrays.asList("s23", "s24");
     String lineageEntryId9 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom9, segmentsTo9, false);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom9, segmentsTo9, false, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getSegmentsFrom(), segmentsFrom9);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getSegmentsTo(), segmentsTo9);
@@ -1219,7 +1341,7 @@ public void testSegmentReplacementForRefresh()
     List<String> segmentsFrom10 = Arrays.asList("s21", "s22");
     List<String> segmentsTo10 = Arrays.asList("s24", "s25");
     String lineageEntryId10 =
-        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom10, segmentsTo10, true);
+        _helixResourceManager.startReplaceSegments(OFFLINE_TABLE_NAME, segmentsFrom10, segmentsTo10, true, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getSegmentsFrom(), segmentsFrom9);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId9).getSegmentsTo(), Collections.singletonList("s23"));
@@ -1233,7 +1355,7 @@ public void testSegmentReplacementForRefresh()
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s24"), "downloadUrl");
     _helixResourceManager.addNewSegment(OFFLINE_TABLE_NAME,
         SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_TABLE_NAME, "s25"), "downloadUrl");
-    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId10);
+    _helixResourceManager.endReplaceSegments(OFFLINE_TABLE_NAME, lineageEntryId10, null);
     segmentLineage = SegmentLineageAccessHelper.getSegmentLineage(_propertyStore, OFFLINE_TABLE_NAME);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId10).getSegmentsFrom(), segmentsFrom10);
     assertEquals(segmentLineage.getLineageEntry(lineageEntryId10).getSegmentsTo(), segmentsTo10);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java
index 4715271fc55..4335d80b147 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/assignment/instance/InstanceAssignmentTest.java
@@ -350,9 +350,9 @@ public void testPoolBased() {
     // Assign to 2 replica-groups so that each replica-group is assigned to one pool
     int numReplicaGroups = numPools;
     InstanceReplicaGroupPartitionConfig replicaPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, false);
+        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, false, null);
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME)
-        .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
             new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig))).build();
     InstanceAssignmentDriver driver = new InstanceAssignmentDriver(tableConfig);
 
@@ -405,7 +405,7 @@ public void testPoolBased() {
 
     // Select all 3 pools in pool selection
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, numPools, null);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
 
     // Math.abs("myTable_OFFLINE".hashCode()) % 3 = 2
@@ -427,7 +427,7 @@ public void testPoolBased() {
 
     // Select pool 0 and 1 in pool selection
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, 0, Arrays.asList(0, 1));
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
 
     // Math.abs("myTable_OFFLINE".hashCode()) % 2 = 0
@@ -448,8 +448,8 @@ public void testPoolBased() {
 
     // Assign instances from 2 pools to 3 replica-groups
     numReplicaGroups = numPools;
-    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
 
     // Math.abs("myTable_OFFLINE".hashCode()) % 2 = 0
@@ -477,9 +477,9 @@ public void testPoolBased() {
     // Reset the number of replica groups to 2 and pools to 2.
     numReplicaGroups = 2;
     numPools = 2;
-    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, true);
+    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, true, null);
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, numPools, null);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
     // Reset the instance configs to have only two pools.
     instanceConfigs.clear();
@@ -528,7 +528,7 @@ public void testPoolBased() {
 
     // Select pool 0 and 1 in pool selection
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, 0, Arrays.asList(0, 1));
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
 
     // Get the latest existingInstancePartitions from last computation.
@@ -554,8 +554,8 @@ public void testPoolBased() {
 
     // Assign instances from 2 pools to 3 replica-groups
     numReplicaGroups = 3;
-    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, true);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, true, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
 
     // Get the latest existingInstancePartitions from last computation.
@@ -633,8 +633,8 @@ public void testPoolBased() {
 
     // Reduce number of replica groups from 3 to 2.
     numReplicaGroups = 2;
-    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, true);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, 0, 0, 0, true, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig)));
 
     // Get the latest existingInstancePartitions from last computation.
@@ -760,8 +760,8 @@ public void testIllegalConfig() {
 
     InstanceTagPoolConfig tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, false, 0, null);
     InstanceReplicaGroupPartitionConfig replicaGroupPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        new InstanceReplicaGroupPartitionConfig(false, 0, 0, 0, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // No instance with correct tag
@@ -791,7 +791,7 @@ public void testIllegalConfig() {
 
     // Enable pool
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, 0, null);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // No instance has correct pool configured
@@ -825,7 +825,7 @@ public void testIllegalConfig() {
     assertEquals(instancePartitions.getInstances(0, 0), expectedInstances);
 
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, 3, null);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Ask for too many pools
@@ -837,7 +837,7 @@ public void testIllegalConfig() {
     }
 
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, 0, Arrays.asList(0, 2));
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Ask for pool that does not exist
@@ -849,8 +849,9 @@ public void testIllegalConfig() {
     }
 
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, 0, null);
-    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(false, 6, 0, 0, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(false, 6, 0, 0, 0, 0, false, null
+    );
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Ask for too many instances
@@ -862,8 +863,9 @@ public void testIllegalConfig() {
     }
 
     // Enable replica-group
-    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 0, 0, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 0, 0, 0, 0, false, null
+    );
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Number of replica-groups must be positive
@@ -874,8 +876,8 @@ public void testIllegalConfig() {
       assertEquals(e.getMessage(), "Number of replica-groups must be positive");
     }
 
-    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 11, 0, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 11, 0, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Ask for too many replica-groups
@@ -887,8 +889,8 @@ public void testIllegalConfig() {
           "Not enough qualified instances from pool: 0, cannot select 6 replica-groups from 5 instances");
     }
 
-    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 3, 3, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 3, 3, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Ask for too many instances
@@ -899,8 +901,8 @@ public void testIllegalConfig() {
       assertEquals(e.getMessage(), "Not enough qualified instances from pool: 0 (5 in the pool, asked for 6)");
     }
 
-    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 3, 2, 0, 3, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 3, 2, 0, 3, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Ask for too many instances per partition
@@ -912,8 +914,8 @@ public void testIllegalConfig() {
           "Number of instances per partition: 3 must be smaller or equal to number of instances per replica-group: 2");
     }
 
-    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 3, 2, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+    replicaGroupPartitionConfig = new InstanceReplicaGroupPartitionConfig(true, 0, 3, 2, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
 
     // Math.abs("myTable_OFFLINE".hashCode()) % 5 = 3
@@ -948,11 +950,12 @@ public void testIllegalConfig() {
     }
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, numPools, null);
     InstanceReplicaGroupPartitionConfig replicaPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, 0, 0, false);
+        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, 0,
+            0, false, null);
 
     try {
       tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME)
-          .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+          .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
               new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig, "ILLEGAL_SELECTOR"))).build();
     } catch (IllegalArgumentException e) {
       assertEquals(e.getMessage(),
@@ -977,9 +980,10 @@ public void testIllegalConfig() {
     }
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, numPools, null);
     replicaPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, 0, 0, false);
+        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup,
+            0, 0, false, null);
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setInstanceAssignmentConfigMap(
-        Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
             new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig,
                 InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString()))).build();
     driver = new InstanceAssignmentDriver(tableConfig);
@@ -1009,9 +1013,10 @@ public void testIllegalConfig() {
     }
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, numPools, null);
     replicaPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, 0, 0, false);
+        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups,
+            numInstancesPerReplicaGroup, 0, 0, false, null);
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setInstanceAssignmentConfigMap(
-        Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
             new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig,
                 InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString()))).build();
     driver = new InstanceAssignmentDriver(tableConfig);
@@ -1049,9 +1054,10 @@ public void testIllegalConfig() {
 
     tagPoolConfig = new InstanceTagPoolConfig(OFFLINE_TAG, true, numPools, null);
     replicaPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, 0, 0, false);
+        new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups,
+            numInstancesPerReplicaGroup, 0, 0, false, null);
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setInstanceAssignmentConfigMap(
-        Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
             new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig,
                 InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString()))).build();
     driver = new InstanceAssignmentDriver(tableConfig);
@@ -1087,9 +1093,9 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 7 instances
     InstanceReplicaGroupPartitionConfig replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, false);
+            numInstancesPerPartition, false, null);
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME)
-        .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
             new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig,
                 InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString()))).build();
     InstanceAssignmentDriver driver = new InstanceAssignmentDriver(tableConfig);
@@ -1159,9 +1165,9 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 7 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, true);
+            numInstancesPerPartition, true, null);
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setInstanceAssignmentConfigMap(
-        Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
             new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig,
                 InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString()))).build();
     driver = new InstanceAssignmentDriver(tableConfig);
@@ -1237,12 +1243,12 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 7 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, false);
+            numInstancesPerPartition, false, null);
     String partitionColumnName = "partition";
     SegmentPartitionConfig segmentPartitionConfig = new SegmentPartitionConfig(
         Collections.singletonMap(partitionColumnName, new ColumnPartitionConfig("Modulo", numPartitionsSegment, null)));
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setInstanceAssignmentConfigMap(
-            Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, null, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
         .setReplicaGroupStrategyConfig(new ReplicaGroupStrategyConfig(partitionColumnName, numInstancesPerReplicaGroup))
@@ -1310,13 +1316,13 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 3 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, false);
+            numInstancesPerPartition, false, null);
     // Do not rotate for testing
     InstanceConstraintConfig instanceConstraintConfig =
         new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
@@ -1367,12 +1373,12 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 3 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, true);
+            numInstancesPerPartition, true, null);
     // Do not rotate for testing
     instanceConstraintConfig = new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
@@ -1433,13 +1439,13 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 5 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, false);
+            numInstancesPerPartition, false, null);
     // Do not rotate instance sequence in pool (for testing)
     instanceConstraintConfig = new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     // Do not rotate pool sequence (for testing)
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
@@ -1499,13 +1505,13 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 5 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, true);
+            numInstancesPerPartition, true, null);
     // Do not rotate instance sequence in pool (for testing)
     instanceConstraintConfig = new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     // Do not rotate pool sequence (for testing)
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
@@ -1571,12 +1577,12 @@ public void testPoolBasedFDAware() {
     // Assign to 3 replica-groups so that each replica-group is assigned 1 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, false);
+            numInstancesPerPartition, false, null);
     // Do not rotate for testing
     instanceConstraintConfig = new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
@@ -1621,13 +1627,13 @@ public void testPoolBasedFDAware() {
     // Assign to 6 replica-groups so that each replica-group is assigned 2 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, false);
+            numInstancesPerPartition, false, null);
     // Do not rotate instance sequence in pool (for testing)
     instanceConstraintConfig = new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     // Do not rotate pool sequence (for testing)
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
@@ -1685,13 +1691,13 @@ public void testPoolBasedFDAware() {
     // Assign to 6 replica-groups so that each replica-group is assigned 2 instances
     replicaPartitionConfig =
         new InstanceReplicaGroupPartitionConfig(true, 0, numReplicaGroups, numInstancesPerReplicaGroup, numPartitions,
-            numInstancesPerPartition, true);
+            numInstancesPerPartition, true, null);
     // Do not rotate instance sequence in pool (for testing)
     instanceConstraintConfig = new InstanceConstraintConfig(Arrays.asList("constraint1", "constraint2"));
     // Do not rotate pool sequence (for testing)
     tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME + TABLE_NAME_ZERO_HASH_COMPLEMENT)
-            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+            .setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
                 new InstanceAssignmentConfig(tagPoolConfig, instanceConstraintConfig, replicaPartitionConfig,
                     InstanceAssignmentConfig.PartitionSelector.FD_AWARE_INSTANCE_PARTITION_SELECTOR.toString())))
             .build();
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManagerTest.java
index 981472feff0..5706d402abf 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManagerTest.java
@@ -18,13 +18,17 @@
  */
 package org.apache.pinot.controller.helix.core.minion;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
@@ -35,6 +39,8 @@
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.controller.util.CompletionServiceHelper;
 import org.apache.pinot.spi.utils.JsonUtils;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -42,6 +48,7 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
@@ -199,6 +206,72 @@ public void testGetSubtaskProgressPending()
     assertEquals(taskProgress, "No worker has run this subtask");
   }
 
+  @Test
+  public void testGetSubtaskWithGivenStateProgressNoWorker()
+      throws JsonProcessingException {
+    CompletionServiceHelper httpHelper = mock(CompletionServiceHelper.class);
+    PinotHelixTaskResourceManager mgr =
+        new PinotHelixTaskResourceManager(mock(PinotHelixResourceManager.class), mock(TaskDriver.class));
+    // No worker to run subtasks.
+    Map<String, String> selectedMinionWorkerEndpoints = new HashMap<>();
+    Map<String, Object> progress =
+        mgr.getSubtaskOnWorkerProgress("IN_PROGRESS", httpHelper,
+            selectedMinionWorkerEndpoints, Collections.emptyMap(), 1000);
+    assertTrue(progress.isEmpty());
+    verify(httpHelper, Mockito.never()).doMultiGetRequest(any(), any(), anyBoolean(), any(), anyInt());
+  }
+
+  @Test
+  public void testGetSubtaskWithGivenStateProgress()
+      throws IOException {
+    CompletionServiceHelper httpHelper = mock(CompletionServiceHelper.class);
+    CompletionServiceHelper.CompletionServiceResponse httpResp =
+        new CompletionServiceHelper.CompletionServiceResponse();
+    String taskIdPrefix = "Task_SegmentGenerationAndPushTask_someone";
+    String workerIdPrefix = "worker";
+    String[] subtaskIds = new String[6];
+    String[] workerIds = new String[3];
+    Map<String, String> selectedMinionWorkerEndpoints = new HashMap<>();
+    for (int i = 0; i < 3; i++) {
+      workerIds[i] = workerIdPrefix + i;
+      String workerEndpoint = "http://" + workerIds[i] + ":9000";
+      selectedMinionWorkerEndpoints.put(workerIds[i], workerEndpoint);
+
+      subtaskIds[2 * i] = taskIdPrefix + "_" + (2 * i);
+      subtaskIds[2 * i + 1] = taskIdPrefix + "_" + (2 * i + 1);
+      // Notice that for testing purpose, we map subtask names to empty strings. In reality, subtask names will be
+      // mapped to jsonized org.apache.pinot.minion.event.MinionEventObserver
+      httpResp._httpResponses.put(
+          String.format("%s/tasks/subtask/state/progress?subTaskState=IN_PROGRESS", workerEndpoint),
+          JsonUtils.objectToString(ImmutableMap.of(subtaskIds[2 * i], "", subtaskIds[2 * i + 1], "")));
+    }
+    httpResp._failedResponseCount = 1;
+    ArgumentCaptor<List<String>> workerEndpointCaptor = ArgumentCaptor.forClass(List.class);
+    when(httpHelper.doMultiGetRequest(workerEndpointCaptor.capture(), any(), anyBoolean(), any(), anyInt()))
+        .thenReturn(httpResp);
+
+    PinotHelixTaskResourceManager mgr =
+        new PinotHelixTaskResourceManager(mock(PinotHelixResourceManager.class), mock(TaskDriver.class));
+
+    Map<String, Object> progress =
+        mgr.getSubtaskOnWorkerProgress("IN_PROGRESS", httpHelper, selectedMinionWorkerEndpoints,
+            Collections.emptyMap(), 1000);
+    List<String> value = workerEndpointCaptor.getValue();
+    Set<String> expectedWorkerUrls = selectedMinionWorkerEndpoints.values().stream()
+        .map(workerEndpoint
+            -> String.format("%s/tasks/subtask/state/progress?subTaskState=IN_PROGRESS", workerEndpoint))
+        .collect(Collectors.toSet());
+    assertEquals(new HashSet<>(value), expectedWorkerUrls);
+    assertEquals(progress.size(), 3);
+    for (int i = 0; i < 3; i++) {
+      Object responseFromMinionWorker = progress.get(workerIds[i]);
+      Map<String, Object> subtaskProgressMap = (Map<String, Object>) responseFromMinionWorker;
+      assertEquals(subtaskProgressMap.size(), 2);
+      assertTrue(subtaskProgressMap.containsKey(subtaskIds[2 * i]));
+      assertTrue(subtaskProgressMap.containsKey(subtaskIds[2 * i + 1]));
+    }
+  }
+
   @Test
   public void testGetTableTaskCount() {
     String taskType = "TestTask";
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManagerStatelessTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManagerStatelessTest.java
index 6b6e0406ef9..85e49766399 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManagerStatelessTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManagerStatelessTest.java
@@ -25,6 +25,7 @@
 import java.util.function.Predicate;
 import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.helix.ControllerTest;
+import org.apache.pinot.controller.util.TableSizeReader;
 import org.apache.pinot.core.common.MinionConstants;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableTaskConfig;
@@ -95,6 +96,7 @@ public void testSkipLateCronSchedule()
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setTaskConfig(
         new TableTaskConfig(
             ImmutableMap.of("SegmentGenerationAndPushTask", ImmutableMap.of("schedule", "0 * * ? * * *")))).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     addTableConfig(tableConfig);
     waitForJobGroupNames(_controllerStarter.getTaskManager(),
         jgn -> jgn.size() == 1 && jgn.contains(MinionConstants.SegmentGenerationAndPushTask.TASK_TYPE),
@@ -128,6 +130,7 @@ public void testPinotTaskManagerSchedulerWithUpdate()
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setTaskConfig(
         new TableTaskConfig(
             ImmutableMap.of("SegmentGenerationAndPushTask", ImmutableMap.of("schedule", "0 */10 * ? * * *")))).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     addTableConfig(tableConfig);
     waitForJobGroupNames(_controllerStarter.getTaskManager(),
         jgn -> jgn.size() == 1 && jgn.contains(MinionConstants.SegmentGenerationAndPushTask.TASK_TYPE),
@@ -193,6 +196,7 @@ public void testPinotTaskManagerSchedulerWithRestart()
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setTaskConfig(
         new TableTaskConfig(
             ImmutableMap.of("SegmentGenerationAndPushTask", ImmutableMap.of("schedule", "0 */10 * ? * * *")))).build();
+    waitForEVToDisappear(tableConfig.getTableName());
     addTableConfig(tableConfig);
     waitForJobGroupNames(_controllerStarter.getTaskManager(),
         jgn -> jgn.size() == 1 && jgn.contains(MinionConstants.SegmentGenerationAndPushTask.TASK_TYPE),
@@ -206,7 +210,7 @@ public void testPinotTaskManagerSchedulerWithRestart()
     TestUtils.waitForCondition((aVoid) -> {
       try {
         long tableSize = getTableSize(OFFLINE_TABLE_NAME);
-        return tableSize >= 0;
+        return tableSize == TableSizeReader.DEFAULT_SIZE_WHEN_MISSING_OR_ERROR;
       } catch (Exception e) {
         return false;
       }
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java
index eee1f2a8a80..2223c9e3414 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManagerTest.java
@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -89,7 +90,12 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 
 public class PinotLLCRealtimeSegmentManagerTest {
@@ -948,6 +954,7 @@ public void testUploadToSegmentStore()
     ControllerConf controllerConfig = new ControllerConf();
     controllerConfig.setProperty(
         ControllerConf.ControllerPeriodicTasksConf.ENABLE_DEEP_STORE_RETRY_UPLOAD_LLC_SEGMENT, true);
+    controllerConfig.setDataDir(TEMP_DIR.toString());
     FakePinotLLCRealtimeSegmentManager segmentManager =
         new FakePinotLLCRealtimeSegmentManager(pinotHelixResourceManager, controllerConfig);
     Assert.assertTrue(segmentManager.isDeepStoreLLCSegmentUploadRetryEnabled());
@@ -990,11 +997,17 @@ public void testUploadToSegmentStore()
             "segments",
             REALTIME_TABLE_NAME,
             segmentsZKMetadata.get(0).getSegmentName(),
-            "upload");
-    String segmentDownloadUrl0 = String.format("segmentDownloadUr_%s", segmentsZKMetadata.get(0)
-        .getSegmentName());
+            "upload") + "?uploadTimeoutMs=-1";
+    // tempSegmentFileLocation is the location where the segment uploader will upload the segment. This usually ends
+    // with a random UUID
+    File tempSegmentFileLocation = new File(TEMP_DIR, segmentsZKMetadata.get(0).getSegmentName() + UUID.randomUUID());
+    FileUtils.write(tempSegmentFileLocation, "test");
+    // After the deep-store retry task gets the segment location returned by Pinot server, it will move the segment to
+    // its final location. This is the expected segment location.
+    String expectedSegmentLocation = segmentManager.createSegmentPath(RAW_TABLE_NAME,
+        segmentsZKMetadata.get(0).getSegmentName()).toString();
     when(segmentManager._mockedFileUploadDownloadClient
-        .uploadToSegmentStore(serverUploadRequestUrl0)).thenReturn(segmentDownloadUrl0);
+        .uploadToSegmentStore(serverUploadRequestUrl0)).thenReturn(tempSegmentFileLocation.getPath());
 
     // Change 2nd segment status to be DONE, but with default peer download url.
     // Verify later the download url isn't fixed after upload failure.
@@ -1013,7 +1026,7 @@ public void testUploadToSegmentStore()
             "segments",
             REALTIME_TABLE_NAME,
             segmentsZKMetadata.get(1).getSegmentName(),
-            "upload");
+            "upload") + "?uploadTimeoutMs=-1";
     when(segmentManager._mockedFileUploadDownloadClient
         .uploadToSegmentStore(serverUploadRequestUrl1))
         .thenThrow(new HttpErrorStatusException(
@@ -1041,11 +1054,15 @@ public void testUploadToSegmentStore()
     when(pinotHelixResourceManager.getTableConfig(REALTIME_TABLE_NAME))
         .thenReturn(segmentManager._tableConfig);
 
+
     // Verify the result
     segmentManager.uploadToDeepStoreIfMissing(segmentManager._tableConfig, segmentsZKMetadata);
     assertEquals(
         segmentManager.getSegmentZKMetadata(REALTIME_TABLE_NAME, segmentNames.get(0), null).getDownloadUrl(),
-        segmentDownloadUrl0);
+        expectedSegmentLocation);
+    assertFalse(tempSegmentFileLocation.exists(),
+        "Deep-store retry task should move the file from temp location to permanent location");
+
     assertEquals(
         segmentManager.getSegmentZKMetadata(REALTIME_TABLE_NAME, segmentNames.get(1), null).getDownloadUrl(),
         CommonConstants.Segment.METADATA_URI_FOR_PEER_DOWNLOAD);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java
index 2ada570ac87..4d85223b411 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/realtime/SegmentCompletionTest.java
@@ -659,6 +659,81 @@ public void testWinnerOnTimeLimit()
     Assert.assertEquals(response.getStatus(), SegmentCompletionProtocol.ControllerResponseStatus.HOLD);
   }
 
+  @Test
+  public void testWinnerOnForceCommit()
+      throws Exception {
+    SegmentCompletionProtocol.Response response;
+    Request.Params params;
+    // S1 comes to force commit
+    _segmentCompletionMgr._seconds = 10L;
+    params = new Request.Params().withInstanceId(S_1).withStreamPartitionMsgOffset(_s1Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // Still need to wait since we haven't hit time limit or heard from all servers
+    Assert.assertEquals(response.getStatus(), SegmentCompletionProtocol.ControllerResponseStatus.HOLD);
+
+    // S2 comes with a higher offset 1 second later
+    _segmentCompletionMgr._seconds += 1;
+    params = new Request.Params().withInstanceId(S_2).withStreamPartitionMsgOffset(_s2Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // Still need to wait since we haven't hit time limit or heard from all servers
+    Assert.assertEquals(response.getStatus(), ControllerResponseStatus.HOLD);
+
+    // S3 comes with a lower offset than S2 3 seconds later
+    _segmentCompletionMgr._seconds += 3;
+    params = new Request.Params().withInstanceId(S_3).withStreamPartitionMsgOffset(_s3Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // We've met winner criteria, but it should be S_2 with the highest offset. S_3 should catch up.
+    Assert.assertEquals(response.getStatus(), ControllerResponseStatus.CATCH_UP);
+
+    // S1 comes back at the same offset
+    _segmentCompletionMgr._seconds += 1;
+    params = new Request.Params().withInstanceId(S_1).withStreamPartitionMsgOffset(_s1Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // We've met winner criteria, but it should be S2 with the highest offset. S1 should catch up.
+    Assert.assertEquals(response.getStatus(), ControllerResponseStatus.CATCH_UP);
+
+    // S2 comes back at the same offset
+    _segmentCompletionMgr._seconds += 1;
+    params = new Request.Params().withInstanceId(S_2).withStreamPartitionMsgOffset(_s2Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // S2 is told to commit
+    Assert.assertEquals(response.getStatus(), ControllerResponseStatus.COMMIT);
+
+    // S2 comes back to commit the segment
+    _segmentCompletionMgr._seconds += 1;
+    params = new Request.Params().withInstanceId(S_2).withStreamPartitionMsgOffset(_s2Offset.toString())
+        .withSegmentName(_segmentNameStr);
+    response = _segmentCompletionMgr.segmentCommitStart(params);
+    Assert.assertEquals(response.getStatus(), SegmentCompletionProtocol.ControllerResponseStatus.COMMIT_CONTINUE);
+    _segmentCompletionMgr._seconds += 5;
+    params = new Request.Params().withInstanceId(S_2).withStreamPartitionMsgOffset(_s2Offset.toString())
+        .withSegmentName(_segmentNameStr).withSegmentLocation("location");
+    response = _segmentCompletionMgr
+        .segmentCommitEnd(params, true, false, CommittingSegmentDescriptor.fromSegmentCompletionReqParams(params));
+    Assert.assertEquals(response.getStatus(), SegmentCompletionProtocol.ControllerResponseStatus.COMMIT_SUCCESS);
+
+    // S3 comes back at the latest offset
+    _segmentCompletionMgr._seconds += 1;
+    params = new Request.Params().withInstanceId(S_3).withStreamPartitionMsgOffset(_s2Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // S3 is told to keep since it caught up
+    Assert.assertEquals(response.getStatus(), ControllerResponseStatus.KEEP);
+
+    // S1 comes back with a higher offset than before, but still not caught up
+    _segmentCompletionMgr._seconds += 1;
+    params = new Request.Params().withInstanceId(S_1).withStreamPartitionMsgOffset(_s3Offset.toString())
+        .withSegmentName(_segmentNameStr).withReason(SegmentCompletionProtocol.REASON_FORCE_COMMIT_MESSAGE_RECEIVED);
+    response = _segmentCompletionMgr.segmentConsumed(params);
+    // S1 is told to discard since S2 already uploaded
+    Assert.assertEquals(response.getStatus(), ControllerResponseStatus.DISCARD);
+  }
+
   @Test
   public void testWinnerOnRowLimit()
       throws Exception {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterStatelessTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterStatelessTest.java
index 4c006967d18..8d6da2681a8 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterStatelessTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TableRebalancerClusterStatelessTest.java
@@ -195,8 +195,8 @@ public void testRebalance()
     InstanceTagPoolConfig tagPoolConfig =
         new InstanceTagPoolConfig(TagNameUtils.getOfflineTagForTenant(null), false, 0, null);
     InstanceReplicaGroupPartitionConfig replicaGroupPartitionConfig =
-        new InstanceReplicaGroupPartitionConfig(true, 0, NUM_REPLICAS, 0, 0, 0, false);
-    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE,
+        new InstanceReplicaGroupPartitionConfig(true, 0, NUM_REPLICAS, 0, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(InstancePartitionsType.OFFLINE.toString(),
         new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
     _helixResourceManager.updateTableConfig(tableConfig);
 
@@ -246,13 +246,15 @@ public void testRebalance()
     tableConfig.setInstanceAssignmentConfigMap(null);
     _helixResourceManager.updateTableConfig(tableConfig);
 
-    // Without instances reassignment, the rebalance should return status NO_OP as instance partitions are already
-    // generated
+    // Without instances reassignment, the rebalance should return status NO_OP, and the existing instance partitions
+    // should be used
     rebalanceResult = tableRebalancer.rebalance(tableConfig, new BaseConfiguration());
     assertEquals(rebalanceResult.getStatus(), RebalanceResult.Status.NO_OP);
+    assertEquals(rebalanceResult.getInstanceAssignment(), instanceAssignment);
+    assertEquals(rebalanceResult.getSegmentAssignment(), newSegmentAssignment);
 
-    // With instances reassignment, the instance partitions should be removed, and the default instance partitions
-    // should be used for segment assignment
+    // With instances reassignment, the rebalance should return status DONE, the existing instance partitions should be
+    // removed, and the default instance partitions should be used
     rebalanceConfig = new BaseConfiguration();
     rebalanceConfig.addProperty(RebalanceConfigConstants.REASSIGN_INSTANCES, true);
     rebalanceResult = tableRebalancer.rebalance(tableConfig, rebalanceConfig);
@@ -403,6 +405,131 @@ public void testRebalanceWithTiers()
         assertTrue(instance.startsWith(expectedPrefix));
       }
     }
+    _helixResourceManager.deleteOfflineTable(TIERED_TABLE_NAME);
+  }
+
+  @Test
+  public void testRebalanceWithTiersAndInstanceAssignments()
+      throws Exception {
+    int numServers = 3;
+    for (int i = 0; i < numServers; i++) {
+      addFakeServerInstanceToAutoJoinHelixCluster(
+          "replicaAssignment" + NO_TIER_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + i, false);
+    }
+    _helixResourceManager.createServerTenant(
+        new Tenant(TenantRole.SERVER, "replicaAssignment" + NO_TIER_NAME, numServers, numServers, 0));
+
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(TIERED_TABLE_NAME).setNumReplicas(NUM_REPLICAS)
+            .setServerTenant("replicaAssignment" + NO_TIER_NAME).build();
+    // Create the table
+    _helixResourceManager.addTable(tableConfig);
+
+    // Add the segments
+    int numSegments = 10;
+    long nowInDays = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis());
+
+    for (int i = 0; i < numSegments; i++) {
+      _helixResourceManager.addNewSegment(OFFLINE_TIERED_TABLE_NAME,
+          SegmentMetadataMockUtils.mockSegmentMetadataWithEndTimeInfo(TIERED_TABLE_NAME, SEGMENT_NAME_PREFIX + i,
+              nowInDays), null);
+    }
+    Map<String, Map<String, String>> oldSegmentAssignment =
+        _helixResourceManager.getTableIdealState(OFFLINE_TIERED_TABLE_NAME).getRecord().getMapFields();
+
+    TableRebalancer tableRebalancer = new TableRebalancer(_helixManager);
+    RebalanceResult rebalanceResult = tableRebalancer.rebalance(tableConfig, new BaseConfiguration());
+    assertEquals(rebalanceResult.getStatus(), RebalanceResult.Status.NO_OP);
+    // Segment assignment should not change
+    assertEquals(rebalanceResult.getSegmentAssignment(), oldSegmentAssignment);
+
+    // add 6 nodes tierA
+    for (int i = 0; i < 6; i++) {
+      addFakeServerInstanceToAutoJoinHelixCluster(
+          "replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + i, false);
+    }
+    _helixResourceManager.createServerTenant(new Tenant(TenantRole.SERVER, "replicaAssignment" + TIER_A_NAME, 6, 6, 0));
+    // rebalance is NOOP and no change in assignment caused by new instances
+    rebalanceResult = tableRebalancer.rebalance(tableConfig, new BaseConfiguration());
+    assertEquals(rebalanceResult.getStatus(), RebalanceResult.Status.NO_OP);
+    // Segment assignment should not change
+    assertEquals(rebalanceResult.getSegmentAssignment(), oldSegmentAssignment);
+
+    // add tier config
+    tableConfig.setTierConfigsList(Lists.newArrayList(
+        new TierConfig(TIER_A_NAME, TierFactory.TIME_SEGMENT_SELECTOR_TYPE, "0d", null,
+            TierFactory.PINOT_SERVER_STORAGE_TYPE, "replicaAssignment" + TIER_A_NAME + "_OFFLINE", null, null)));
+    _helixResourceManager.updateTableConfig(tableConfig);
+
+    // rebalance should change assignment
+    rebalanceResult = tableRebalancer.rebalance(tableConfig, new BaseConfiguration());
+    assertEquals(rebalanceResult.getStatus(), RebalanceResult.Status.DONE);
+
+    // check that segments have moved to tier a
+    Map<String, Map<String, String>> tierSegmentAssignment = rebalanceResult.getSegmentAssignment();
+    for (Map.Entry<String, Map<String, String>> entry : tierSegmentAssignment.entrySet()) {
+      Map<String, String> instanceStateMap = entry.getValue();
+      for (String instance : instanceStateMap.keySet()) {
+        assertTrue(instance.startsWith("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX));
+      }
+    }
+
+    // Test rebalance with tier instance assignment
+    InstanceTagPoolConfig tagPoolConfig =
+        new InstanceTagPoolConfig(TagNameUtils.getOfflineTagForTenant("replicaAssignment" + TIER_A_NAME), false, 0,
+            null);
+    InstanceReplicaGroupPartitionConfig replicaGroupPartitionConfig =
+        new InstanceReplicaGroupPartitionConfig(true, 0, NUM_REPLICAS, 0, 0, 0, false, null);
+    tableConfig.setInstanceAssignmentConfigMap(Collections.singletonMap(TIER_A_NAME,
+        new InstanceAssignmentConfig(tagPoolConfig, null, replicaGroupPartitionConfig)));
+    _helixResourceManager.updateTableConfig(tableConfig);
+
+    rebalanceResult = tableRebalancer.rebalance(tableConfig, new BaseConfiguration());
+    assertEquals(rebalanceResult.getStatus(), RebalanceResult.Status.DONE);
+    assertTrue(rebalanceResult.getTierInstanceAssignment().containsKey(TIER_A_NAME));
+
+    InstancePartitions instancePartitions = rebalanceResult.getTierInstanceAssignment().get(TIER_A_NAME);
+
+    // Math.abs("testTable_OFFLINE".hashCode()) % 6 = 2
+    // [i2, i3, i4, i5, i0, i1]
+    //  r0  r1  r2  r0  r1  r2
+    assertEquals(instancePartitions.getInstances(0, 0),
+        Arrays.asList("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 2,
+            "replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 5));
+    assertEquals(instancePartitions.getInstances(0, 1),
+        Arrays.asList("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 3,
+            "replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 0));
+    assertEquals(instancePartitions.getInstances(0, 2),
+        Arrays.asList("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 4,
+            "replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 1));
+
+    // The assignment are based on replica-group 0 and mirrored to all the replica-groups, so server of index 0, 1, 5
+    // should have the same segments assigned, and server of index 2, 3, 4 should have the same segments assigned, each
+    // with 5 segments
+    Map<String, Map<String, String>> newSegmentAssignment = rebalanceResult.getSegmentAssignment();
+    int numSegmentsOnServer0 = 0;
+    for (int i = 0; i < numSegments; i++) {
+      String segmentName = SEGMENT_NAME_PREFIX + i;
+      Map<String, String> instanceStateMap = newSegmentAssignment.get(segmentName);
+      assertEquals(instanceStateMap.size(), NUM_REPLICAS);
+      if (instanceStateMap.containsKey("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 0)) {
+        numSegmentsOnServer0++;
+        assertEquals(instanceStateMap.get("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 0),
+            ONLINE);
+        assertEquals(instanceStateMap.get("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 1),
+            ONLINE);
+        assertEquals(instanceStateMap.get("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 5),
+            ONLINE);
+      } else {
+        assertEquals(instanceStateMap.get("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 2),
+            ONLINE);
+        assertEquals(instanceStateMap.get("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 3),
+            ONLINE);
+        assertEquals(instanceStateMap.get("replicaAssignment" + TIER_A_NAME + "_" + SERVER_INSTANCE_ID_PREFIX + 4),
+            ONLINE);
+      }
+    }
+    assertEquals(numSegmentsOnServer0, numSegments / 2);
 
     _helixResourceManager.deleteOfflineTable(TIERED_TABLE_NAME);
   }
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TestZkBasedTableRebalanceObserver.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TestZkBasedTableRebalanceObserver.java
new file mode 100644
index 00000000000..74b8a4367f7
--- /dev/null
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/rebalance/TestZkBasedTableRebalanceObserver.java
@@ -0,0 +1,106 @@
+/**
+ * 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.pinot.controller.helix.core.rebalance;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.TreeMap;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentUtils;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.ERROR;
+import static org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+
+public class TestZkBasedTableRebalanceObserver {
+
+  @Test
+    // This is a test to verify if Zk stats are pushed out correctly
+  void testZkObserverTracking() {
+    PinotHelixResourceManager pinotHelixResourceManager = mock(PinotHelixResourceManager.class);
+    // Mocking this. We will verify using numZkUpdate stat
+    when(pinotHelixResourceManager.addControllerJobToZK(any(), any(), any())).thenReturn(true);
+    ZkBasedTableRebalanceObserver observer =
+        new ZkBasedTableRebalanceObserver("dummy", "dummyId", pinotHelixResourceManager);
+    Map<String, Map<String, String>> source = new TreeMap<>();
+    Map<String, Map<String, String>> target = new TreeMap<>();
+    target.put("segment1",
+        SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host1", "host2", "host3"), ONLINE));
+    source.put("segment2",
+        SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host2", "host3", "host4"), ONLINE));
+
+    observer.onTrigger(TableRebalanceObserver.Trigger.START_TRIGGER, source, target);
+    assertEquals(observer.getNumUpdatesToZk(), 1);
+    observer.onTrigger(TableRebalanceObserver.Trigger.IDEAL_STATE_CHANGE_TRIGGER, source, source);
+    observer.onTrigger(TableRebalanceObserver.Trigger.EXTERNAL_VIEW_TO_IDEAL_STATE_CONVERGENCE_TRIGGER, source, source);
+    assertEquals(observer.getNumUpdatesToZk(), 1);
+    observer.onTrigger(TableRebalanceObserver.Trigger.IDEAL_STATE_CHANGE_TRIGGER, source, target);
+    observer.onTrigger(TableRebalanceObserver.Trigger.EXTERNAL_VIEW_TO_IDEAL_STATE_CONVERGENCE_TRIGGER, source, target);
+    assertEquals(observer.getNumUpdatesToZk(), 3);
+  }
+
+  @Test
+  void testDifferenceBetweenTableRebalanceStates() {
+    Map<String, Map<String, String>> target = new TreeMap<>();
+    target.put("segment1",
+        SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host1", "host2", "host3"), ONLINE));
+    target.put("segment2",
+        SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host2", "host3", "host4"), ONLINE));
+
+    // Stats when there's nothing to rebalance
+    TableRebalanceProgressStats.RebalanceStateStats stats =
+        ZkBasedTableRebalanceObserver.getDifferenceBetweenTableRebalanceStates(target, target);
+    assertEquals(stats._segmentsToRebalance, 0);
+    assertEquals(stats._segmentsMissing, 0);
+    assertEquals(stats._percentSegmentsToRebalance, 0.0);
+
+    // Stats when there's something to converge
+    Map<String, Map<String, String>> current = new TreeMap<>();
+    current.put("segment1", SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host1"), ONLINE));
+    current.put("segment2", SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host2"), ONLINE));
+
+    stats = ZkBasedTableRebalanceObserver.getDifferenceBetweenTableRebalanceStates(target, current);
+    assertEquals(stats._segmentsToRebalance, 2);
+    assertEquals(stats._percentSegmentsToRebalance, 100.0);
+    assertEquals(stats._replicasToRebalance, 4);
+
+    // Stats when there are errors
+    current = new TreeMap<>();
+    current.put("segment1", SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host1"), ERROR));
+
+    stats = ZkBasedTableRebalanceObserver.getDifferenceBetweenTableRebalanceStates(target, current);
+    assertEquals(stats._segmentsToRebalance, 2);
+    assertEquals(stats._segmentsMissing, 1);
+    assertEquals(stats._replicasToRebalance, 3);
+
+    // Stats when partially converged
+    current = new TreeMap<>();
+    current.put("segment1",
+        SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host1", "host2", "host3"), ONLINE));
+    current.put("segment2", SegmentAssignmentUtils.getInstanceStateMap(Arrays.asList("host2", "host3"), ONLINE));
+
+    stats = ZkBasedTableRebalanceObserver.getDifferenceBetweenTableRebalanceStates(target, current);
+    assertEquals(stats._percentSegmentsToRebalance, 50.0);
+  }
+}
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocatorTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocatorTest.java
index 852f69337b1..f84be9f029b 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocatorTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/relocation/SegmentRelocatorTest.java
@@ -18,9 +18,7 @@
  */
 package org.apache.pinot.controller.helix.core.relocation;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -35,10 +33,7 @@
 import org.apache.helix.Criteria;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.messages.SegmentReloadMessage;
-import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.metrics.ControllerMetrics;
-import org.apache.pinot.common.tier.FixedTierSegmentSelector;
-import org.apache.pinot.common.tier.Tier;
 import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.LeadControllerManager;
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
@@ -54,7 +49,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -119,39 +113,6 @@ public void testTriggerLocalTierMigration() {
     }
   }
 
-  @Test
-  public void testUpdateSegmentTargetTierBackToDefault() {
-    String tableName = "table01_OFFLINE";
-    String segmentName = "seg01";
-    PinotHelixResourceManager helixMgrMock = mock(PinotHelixResourceManager.class);
-    when(helixMgrMock.getSegmentMetadataZnRecord(tableName, segmentName)).thenReturn(
-        createSegmentMetadataZNRecord(segmentName, "hotTier"));
-    // Move back to default as not tier configs.
-    List<Tier> sortedTiers = new ArrayList<>();
-    SegmentRelocator.updateSegmentTargetTier(tableName, "seg01", sortedTiers, helixMgrMock);
-    ArgumentCaptor<SegmentZKMetadata> recordCapture = ArgumentCaptor.forClass(SegmentZKMetadata.class);
-    verify(helixMgrMock).updateZkMetadata(eq(tableName), recordCapture.capture(), eq(10));
-    SegmentZKMetadata record = recordCapture.getValue();
-    assertNull(record.getTier());
-  }
-
-  @Test
-  public void testUpdateSegmentTargetTierToNewTier() {
-    String tableName = "table01_OFFLINE";
-    String segmentName = "seg01";
-    PinotHelixResourceManager helixMgrMock = mock(PinotHelixResourceManager.class);
-    when(helixMgrMock.getSegmentMetadataZnRecord(tableName, segmentName)).thenReturn(
-        createSegmentMetadataZNRecord(segmentName, "hotTier"));
-    // Move to new tier as set in tier configs.
-    List<Tier> sortedTiers = Collections.singletonList(
-        new Tier("coldTier", new FixedTierSegmentSelector(null, Collections.singleton("seg01")), null));
-    SegmentRelocator.updateSegmentTargetTier(tableName, "seg01", sortedTiers, helixMgrMock);
-    ArgumentCaptor<SegmentZKMetadata> recordCapture = ArgumentCaptor.forClass(SegmentZKMetadata.class);
-    verify(helixMgrMock).updateZkMetadata(eq(tableName), recordCapture.capture(), eq(10));
-    SegmentZKMetadata record = recordCapture.getValue();
-    assertEquals(record.getTier(), "coldTier");
-  }
-
   @Test
   public void testRebalanceTablesSequentially()
       throws InterruptedException {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java
index 85aba90f36d..2f16f830b96 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/retention/RetentionManagerTest.java
@@ -77,11 +77,10 @@ private void testDifferentTimeUnits(long pastTimeStamp, TimeUnit timeUnit, long
       segmentsZKMetadata.add(segmentZKMetadata);
     }
     final TableConfig tableConfig = createOfflineTableConfig();
-    PinotHelixResourceManager pinotHelixResourceManager = mock(PinotHelixResourceManager.class);
-    setupPinotHelixResourceManager(tableConfig, removedSegments, pinotHelixResourceManager);
-
     LeadControllerManager leadControllerManager = mock(LeadControllerManager.class);
     when(leadControllerManager.isLeaderForTable(anyString())).thenReturn(true);
+    PinotHelixResourceManager pinotHelixResourceManager = mock(PinotHelixResourceManager.class);
+    setupPinotHelixResourceManager(tableConfig, removedSegments, pinotHelixResourceManager, leadControllerManager);
 
     when(pinotHelixResourceManager.getTableConfig(OFFLINE_TABLE_NAME)).thenReturn(tableConfig);
     when(pinotHelixResourceManager.getSegmentsZKMetadata(OFFLINE_TABLE_NAME)).thenReturn(segmentsZKMetadata);
@@ -98,7 +97,7 @@ private void testDifferentTimeUnits(long pastTimeStamp, TimeUnit timeUnit, long
     SegmentDeletionManager deletionManager = pinotHelixResourceManager.getSegmentDeletionManager();
 
     // Verify that the removeAgedDeletedSegments() method in deletion manager is actually called.
-    verify(deletionManager, times(1)).removeAgedDeletedSegments();
+    verify(deletionManager, times(1)).removeAgedDeletedSegments(leadControllerManager);
 
     // Verify that the deleteSegments method is actually called.
     verify(pinotHelixResourceManager, times(1)).deleteSegments(anyString(), anyList());
@@ -161,7 +160,7 @@ private TableConfig createRealtimeTableConfig1(int replicaCount) {
   }
 
   private void setupPinotHelixResourceManager(TableConfig tableConfig, final List<String> removedSegments,
-      PinotHelixResourceManager resourceManager) {
+      PinotHelixResourceManager resourceManager, LeadControllerManager leadControllerManager) {
     final String tableNameWithType = tableConfig.getTableName();
     when(resourceManager.getAllTables()).thenReturn(Collections.singletonList(tableNameWithType));
 
@@ -177,7 +176,7 @@ public Void answer(InvocationOnMock invocationOnMock)
           throws Throwable {
         return null;
       }
-    }).when(deletionManager).removeAgedDeletedSegments();
+    }).when(deletionManager).removeAgedDeletedSegments(leadControllerManager);
     when(resourceManager.getSegmentDeletionManager()).thenReturn(deletionManager);
 
     // If and when PinotHelixResourceManager.deleteSegments() is invoked, make sure that the segments deleted
@@ -210,12 +209,44 @@ public void testRealtimeLLCCleanup()
 
     TableConfig tableConfig = createRealtimeTableConfig1(replicaCount);
     List<String> removedSegments = new ArrayList<>();
+    LeadControllerManager leadControllerManager = mock(LeadControllerManager.class);
+    when(leadControllerManager.isLeaderForTable(anyString())).thenReturn(true);
     PinotHelixResourceManager pinotHelixResourceManager =
         setupSegmentMetadata(tableConfig, now, initialNumSegments, removedSegments);
-    setupPinotHelixResourceManager(tableConfig, removedSegments, pinotHelixResourceManager);
+    setupPinotHelixResourceManager(tableConfig, removedSegments, pinotHelixResourceManager, leadControllerManager);
+
+    ControllerConf conf = new ControllerConf();
+    ControllerMetrics controllerMetrics = new ControllerMetrics(PinotMetricUtils.getPinotMetricsRegistry());
+    conf.setRetentionControllerFrequencyInSeconds(0);
+    conf.setDeletedSegmentsRetentionInDays(0);
+    RetentionManager retentionManager =
+        new RetentionManager(pinotHelixResourceManager, leadControllerManager, conf, controllerMetrics);
+    retentionManager.start();
+    retentionManager.run();
+
+    SegmentDeletionManager deletionManager = pinotHelixResourceManager.getSegmentDeletionManager();
+
+    // Verify that the removeAgedDeletedSegments() method in deletion manager is actually called.
+    verify(deletionManager, times(1)).removeAgedDeletedSegments(leadControllerManager);
+
+    // Verify that the deleteSegments method is actually called.
+    verify(pinotHelixResourceManager, times(1)).deleteSegments(anyString(), anyList());
+  }
+
+  // This test makes sure that we do not clean up last llc completed segments
+  @Test
+  public void testRealtimeLastLLCCleanup()
+      throws Exception {
+    final long now = System.currentTimeMillis();
+    final int replicaCount = 1;
 
+    TableConfig tableConfig = createRealtimeTableConfig1(replicaCount);
+    List<String> removedSegments = new ArrayList<>();
     LeadControllerManager leadControllerManager = mock(LeadControllerManager.class);
     when(leadControllerManager.isLeaderForTable(anyString())).thenReturn(true);
+    PinotHelixResourceManager pinotHelixResourceManager =
+        setupSegmentMetadataForPausedTable(tableConfig, now, removedSegments);
+    setupPinotHelixResourceManager(tableConfig, removedSegments, pinotHelixResourceManager, leadControllerManager);
 
     ControllerConf conf = new ControllerConf();
     ControllerMetrics controllerMetrics = new ControllerMetrics(PinotMetricUtils.getPinotMetricsRegistry());
@@ -229,7 +260,7 @@ public void testRealtimeLLCCleanup()
     SegmentDeletionManager deletionManager = pinotHelixResourceManager.getSegmentDeletionManager();
 
     // Verify that the removeAgedDeletedSegments() method in deletion manager is actually called.
-    verify(deletionManager, times(1)).removeAgedDeletedSegments();
+    verify(deletionManager, times(1)).removeAgedDeletedSegments(leadControllerManager);
 
     // Verify that the deleteSegments method is actually called.
     verify(pinotHelixResourceManager, times(1)).deleteSegments(anyString(), anyList());
@@ -299,6 +330,50 @@ private PinotHelixResourceManager setupSegmentMetadata(TableConfig tableConfig,
     return pinotHelixResourceManager;
   }
 
+  private PinotHelixResourceManager setupSegmentMetadataForPausedTable(TableConfig tableConfig, final long now,
+      List<String> segmentsToBeDeleted) {
+    final int replicaCount = tableConfig.getReplication();
+
+    List<SegmentZKMetadata> segmentsZKMetadata = new ArrayList<>();
+
+    IdealState idealState =
+        PinotTableIdealStateBuilder.buildEmptyRealtimeIdealStateFor(REALTIME_TABLE_NAME, replicaCount, true);
+
+    final int kafkaPartition = 5;
+    final long millisInDays = TimeUnit.DAYS.toMillis(1);
+    final String serverName = "Server_localhost_0";
+    LLCSegmentName llcSegmentName0 = new LLCSegmentName(TEST_TABLE_NAME, kafkaPartition, 0, now);
+    SegmentZKMetadata segmentZKMetadata0 = createSegmentZKMetadata(llcSegmentName0.getSegmentName(), replicaCount, now);
+    segmentZKMetadata0.setTimeUnit(TimeUnit.MILLISECONDS);
+    segmentZKMetadata0.setStartTime(now - 30 * millisInDays);
+    segmentZKMetadata0.setEndTime(now - 20 * millisInDays);
+    segmentZKMetadata0.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
+    segmentsZKMetadata.add(segmentZKMetadata0);
+    idealState.setPartitionState(llcSegmentName0.getSegmentName(), serverName, "ONLINE");
+    segmentsToBeDeleted.add(llcSegmentName0.getSegmentName());
+
+    LLCSegmentName llcSegmentName1 = new LLCSegmentName(TEST_TABLE_NAME, kafkaPartition, 1, now);
+    SegmentZKMetadata segmentZKMetadata1 = createSegmentZKMetadata(llcSegmentName1.getSegmentName(), replicaCount, now);
+    segmentZKMetadata1.setTimeUnit(TimeUnit.MILLISECONDS);
+    segmentZKMetadata1.setStartTime(now - 20 * millisInDays);
+    segmentZKMetadata1.setEndTime(now - 10 * millisInDays);
+    segmentZKMetadata1.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
+    segmentsZKMetadata.add(segmentZKMetadata1);
+    idealState.setPartitionState(llcSegmentName1.getSegmentName(), serverName, "ONLINE");
+
+    PinotHelixResourceManager pinotHelixResourceManager = mock(PinotHelixResourceManager.class);
+    when(pinotHelixResourceManager.getTableConfig(REALTIME_TABLE_NAME)).thenReturn(tableConfig);
+    when(pinotHelixResourceManager.getSegmentsZKMetadata(REALTIME_TABLE_NAME)).thenReturn(segmentsZKMetadata);
+    when(pinotHelixResourceManager.getHelixClusterName()).thenReturn(HELIX_CLUSTER_NAME);
+    when(pinotHelixResourceManager.getLastLLCCompletedSegments(REALTIME_TABLE_NAME)).thenCallRealMethod();
+
+    HelixAdmin helixAdmin = mock(HelixAdmin.class);
+    when(helixAdmin.getResourceIdealState(HELIX_CLUSTER_NAME, REALTIME_TABLE_NAME)).thenReturn(idealState);
+    when(pinotHelixResourceManager.getHelixAdmin()).thenReturn(helixAdmin);
+
+    return pinotHelixResourceManager;
+  }
+
   private SegmentZKMetadata createSegmentZKMetadata(String segmentName, int replicaCount, long segmentCreationTime) {
     SegmentZKMetadata segmentMetadata = new SegmentZKMetadata(segmentName);
     segmentMetadata.setCreationTime(segmentCreationTime);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
index a617dd8612a..b4d0356c5af 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
@@ -38,6 +38,7 @@
 import org.apache.helix.model.IdealState;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.controller.LeadControllerManager;
 import org.apache.pinot.controller.helix.core.SegmentDeletionManager;
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -228,9 +229,11 @@ public void testRemoveDeletedSegments()
     tempDir.deleteOnExit();
     FakeDeletionManager deletionManager = new FakeDeletionManager(
         tempDir.getAbsolutePath(), helixAdmin, propertyStore, 7);
+    LeadControllerManager leadControllerManager = mock(LeadControllerManager.class);
+    when(leadControllerManager.isLeaderForTable(anyString())).thenReturn(true);
 
     // Test delete when deleted segments directory does not exists
-    deletionManager.removeAgedDeletedSegments();
+    deletionManager.removeAgedDeletedSegments(leadControllerManager);
 
     // Create deleted directory
     String deletedDirectoryPath = tempDir + File.separator + "Deleted_Segments";
@@ -238,7 +241,7 @@ public void testRemoveDeletedSegments()
     deletedDirectory.mkdir();
 
     // Test delete when deleted segments directory is empty
-    deletionManager.removeAgedDeletedSegments();
+    deletionManager.removeAgedDeletedSegments(leadControllerManager);
 
     // Create dummy directories and files
     File dummyDir1 = new File(deletedDirectoryPath + File.separator + "dummy1");
@@ -249,7 +252,7 @@ public void testRemoveDeletedSegments()
     dummyDir3.mkdir();
 
     // Test delete when there is no files but some directories exist
-    deletionManager.removeAgedDeletedSegments();
+    deletionManager.removeAgedDeletedSegments(leadControllerManager);
     Assert.assertEquals(dummyDir1.exists(), false);
     Assert.assertEquals(dummyDir2.exists(), false);
     Assert.assertEquals(dummyDir3.exists(), false);
@@ -279,7 +282,7 @@ public void testRemoveDeletedSegments()
     Assert.assertEquals(dummyDir3.list().length, 3);
 
     // Try to remove files with the retention of 1 days.
-    deletionManager.removeAgedDeletedSegments();
+    deletionManager.removeAgedDeletedSegments(leadControllerManager);
 
     // Check that only 1 day retention file is remaining
     Assert.assertEquals(dummyDir1.list().length, 1);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java b/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java
index 6c769d620a5..a604e7e70e1 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/utils/SegmentMetadataMockUtils.java
@@ -19,9 +19,8 @@
 package org.apache.pinot.controller.utils;
 
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.segment.spi.ColumnMetadata;
@@ -40,26 +39,38 @@ private SegmentMetadataMockUtils() {
   }
 
   public static SegmentMetadata mockSegmentMetadata(String tableName, String segmentName, int numTotalDocs,
-      String crc) {
+      String crc, long startTime, long endTime, TimeUnit timeUnit) {
     SegmentMetadata segmentMetadata = Mockito.mock(SegmentMetadata.class);
     Mockito.when(segmentMetadata.getTableName()).thenReturn(tableName);
     Mockito.when(segmentMetadata.getName()).thenReturn(segmentName);
     Mockito.when(segmentMetadata.getTotalDocs()).thenReturn(numTotalDocs);
     Mockito.when(segmentMetadata.getCrc()).thenReturn(crc);
-    Mockito.when(segmentMetadata.getStartTime()).thenReturn(1L);
-    Mockito.when(segmentMetadata.getEndTime()).thenReturn(10L);
+    Mockito.when(segmentMetadata.getStartTime()).thenReturn(startTime);
+    Mockito.when(segmentMetadata.getEndTime()).thenReturn(endTime);
     Mockito.when(segmentMetadata.getTimeInterval()).thenReturn(
-        new Interval(TimeUnit.MILLISECONDS.convert(1, TimeUnit.DAYS),
-            TimeUnit.MILLISECONDS.convert(10, TimeUnit.DAYS)));
-    Mockito.when(segmentMetadata.getTimeUnit()).thenReturn(TimeUnit.DAYS);
+        new Interval(TimeUnit.MILLISECONDS.convert(startTime, timeUnit),
+            TimeUnit.MILLISECONDS.convert(endTime, timeUnit)));
+    Mockito.when(segmentMetadata.getTimeUnit()).thenReturn(timeUnit);
     return segmentMetadata;
   }
 
+  public static SegmentMetadata mockSegmentMetadata(String tableName, String segmentName, int numTotalDocs,
+      String crc) {
+    return mockSegmentMetadata(tableName, segmentName, numTotalDocs, crc, 1L, 10L, TimeUnit.DAYS);
+  }
+
   public static SegmentMetadata mockSegmentMetadata(String tableName) {
     String uniqueNumericString = Long.toString(System.nanoTime());
     return mockSegmentMetadata(tableName, tableName + uniqueNumericString, 100, uniqueNumericString);
   }
 
+  public static SegmentMetadata mockSegmentMetadata(String tableName, long startTime,
+      long endTime, TimeUnit timeUnit) {
+    String uniqueNumericString = Long.toString(System.nanoTime());
+    return mockSegmentMetadata(tableName, tableName + uniqueNumericString, 100,
+        uniqueNumericString, startTime, endTime, timeUnit);
+  }
+
   public static SegmentMetadata mockSegmentMetadata(String tableName, String segmentName) {
     String uniqueNumericString = Long.toString(System.nanoTime());
     return mockSegmentMetadata(tableName, segmentName, 100, uniqueNumericString);
@@ -72,7 +83,7 @@ public static SegmentZKMetadata mockSegmentZKMetadata(String segmentName, long n
     return segmentZKMetadata;
   }
 
-  public static SegmentMetadata mockSegmentMetadataWithPartitionInfo(String tableName, String segmentName,
+  public static SegmentMetadata mockSegmentMetadataWithPartitionInfo(String rawTableName, String segmentName,
       String columnName, int partitionNumber) {
     ColumnMetadata columnMetadata = mock(ColumnMetadata.class);
     Set<Integer> partitions = Collections.singleton(partitionNumber);
@@ -83,11 +94,11 @@ public static SegmentMetadata mockSegmentMetadataWithPartitionInfo(String tableN
     if (columnName != null) {
       when(segmentMetadata.getColumnMetadataFor(columnName)).thenReturn(columnMetadata);
     }
-    when(segmentMetadata.getTableName()).thenReturn(tableName);
+    when(segmentMetadata.getTableName()).thenReturn(rawTableName);
     when(segmentMetadata.getName()).thenReturn(segmentName);
     when(segmentMetadata.getCrc()).thenReturn("0");
 
-    Map<String, ColumnMetadata> columnMetadataMap = new HashMap<>();
+    TreeMap<String, ColumnMetadata> columnMetadataMap = new TreeMap<>();
     columnMetadataMap.put(columnName, columnMetadata);
     when(segmentMetadata.getColumnMetadataMap()).thenReturn(columnMetadataMap);
     return segmentMetadata;
diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
index 3c8463a05be..1a2ce38efd4 100644
--- a/pinot-core/pom.xml
+++ b/pinot-core/pom.xml
@@ -55,6 +55,10 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>com.yscope.clp</groupId>
+      <artifactId>clp-ffi</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.uber</groupId>
       <artifactId>h3</artifactId>
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/accounting/CPUMemThreadLevelAccountingObjects.java b/pinot-core/src/main/java/org/apache/pinot/core/accounting/CPUMemThreadLevelAccountingObjects.java
index 0cf6688e489..431643942aa 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/accounting/CPUMemThreadLevelAccountingObjects.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/accounting/CPUMemThreadLevelAccountingObjects.java
@@ -18,8 +18,6 @@
  */
 package org.apache.pinot.core.accounting;
 
-import java.util.HashMap;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -32,33 +30,47 @@
  */
 public class CPUMemThreadLevelAccountingObjects {
 
-  public static class StatsDigest {
-
-    // The current usage sampling for each thread
-    final long[] _currentStatsSample;
-    // The previous usage sampling for each thread
-    final long[] _lastStatSample;
-    // The aggregated usage sampling for the finished tasks of a (still) running queries
-    final HashMap<String, Long> _finishedTaskStatAggregator;
-
-    StatsDigest(int numThreads) {
-      _currentStatsSample = new long[numThreads];
-      _lastStatSample = new long[numThreads];
-      _finishedTaskStatAggregator = new HashMap<>();
-    }
-  }
-
   /**
-   * Entry to track the task execution status of a worker/runner given thread
+   * Entry to track the task execution status and usage stats of a Thread
+   * (including but not limited to server worker thread, runner thread, broker jetty thread, or broker netty thread)
    */
-  public static class TaskEntryHolder {
-    AtomicReference<TaskEntry> _threadTaskStatus = new AtomicReference<>(null);
+  public static class ThreadEntry {
+    // current query_id, task_id of the thread; this field is accessed by the thread itself and the accountant
+    AtomicReference<TaskEntry> _currentThreadTaskStatus = new AtomicReference<>();
+    // current sample of thread memory usage/cputime ; this field is accessed by the thread itself and the accountant
+    volatile long _currentThreadCPUTimeSampleMS = 0;
+    volatile long _currentThreadMemoryAllocationSampleBytes = 0;
+
+    // previous query_id, task_id of the thread, this field should only be accessed by the accountant
+    TaskEntry _previousThreadTaskStatus = null;
+    // previous cpu time and memory allocation of the thread
+    // these fields should only be accessed by the accountant
+    long _previousThreadCPUTimeSampleMS = 0;
+    long _previousThreadMemoryAllocationSampleBytes = 0;
+
+    // error message store per runner/worker thread,
+    // will put preemption reasons in this for the killed thread to pickup
+    AtomicReference<Exception> _errorStatus = new AtomicReference<>();
+
+    @Override
+    public String toString() {
+      TaskEntry taskEntry = _currentThreadTaskStatus.get();
+      return "ThreadEntry{"
+          + "_currentThreadTaskStatus=" + (taskEntry == null ? "idle" : taskEntry.toString())
+          + ", _errorStatus=" + _errorStatus
+          + '}';
+    }
 
     /**
-     * set the thread tracking info to null
+     * set the thread tracking info to null and usage samples to zero
      */
     public void setToIdle() {
-      _threadTaskStatus.set(null);
+      // clear task info
+      _currentThreadTaskStatus.set(null);
+      // clear CPU time
+      _currentThreadCPUTimeSampleMS = 0;
+      // clear memory usage
+      _currentThreadMemoryAllocationSampleBytes = 0;
     }
 
     /**
@@ -66,16 +78,20 @@ public void setToIdle() {
      * @return the current query id on the thread, {@code null} if idle
      */
     @Nullable
-    public TaskEntry getThreadTaskStatus() {
-      return _threadTaskStatus.get();
+    public TaskEntry getCurrentThreadTaskStatus() {
+      return _currentThreadTaskStatus.get();
     }
 
-    public TaskEntryHolder setThreadTaskStatus(@Nonnull String queryId, int taskId, @Nonnull Thread thread) {
-      _threadTaskStatus.set(new TaskEntry(queryId, taskId, thread));
-      return this;
+    public void setThreadTaskStatus(@Nonnull String queryId, int taskId, @Nonnull Thread anchorThread) {
+      _currentThreadTaskStatus.set(new TaskEntry(queryId, taskId, anchorThread));
     }
   }
 
+  /**
+   * Class to track the execution status of a thread. query_id is an instance level unique query_id,
+   * taskId is the worker thread id when we have a runner-worker thread model
+   * anchor thread refers to the runner in runner-worker thread model
+   */
   public static class TaskEntry implements ThreadExecutionContext {
     private final String _queryId;
     private final int _taskId;
@@ -91,17 +107,6 @@ public TaskEntry(String queryId, int taskId, Thread anchorThread) {
       _anchorThread = anchorThread;
     }
 
-    public static boolean isSameTask(TaskEntry currentTaskStatus, TaskEntry lastQueryTask) {
-      if (currentTaskStatus == null) {
-        return lastQueryTask == null;
-      } else if (lastQueryTask == null) {
-        return false;
-      } else {
-        return Objects.equals(currentTaskStatus.getQueryId(), lastQueryTask.getQueryId())
-            || currentTaskStatus.getTaskId() == lastQueryTask.getTaskId();
-      }
-    }
-
     public String getQueryId() {
       return _queryId;
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/accounting/HeapUsagePublishingAccountantFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/accounting/HeapUsagePublishingAccountantFactory.java
index 03d510b949e..e29d33d0445 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/accounting/HeapUsagePublishingAccountantFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/accounting/HeapUsagePublishingAccountantFactory.java
@@ -38,8 +38,8 @@
 public class HeapUsagePublishingAccountantFactory implements ThreadAccountantFactory {
 
   @Override
-  public ThreadResourceUsageAccountant init(int numRunnerThreads, int numWorkerThreads, PinotConfiguration config) {
-    int period = config.getProperty(CommonConstants.Accounting.CONFIG_OF_HEAP_USAGE_PUBLISH_PERIOD,
+  public ThreadResourceUsageAccountant init(PinotConfiguration config, String instanceId) {
+    int period = config.getProperty(CommonConstants.Accounting.CONFIG_OF_HEAP_USAGE_PUBLISHING_PERIOD_MS,
         CommonConstants.Accounting.DEFAULT_HEAP_USAGE_PUBLISH_PERIOD);
     return new HeapUsagePublishingResourceUsageAccountant(period);
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactory.java
index 4f488deca70..5b724f4a0fb 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactory.java
@@ -20,27 +20,31 @@
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.annotation.Nullable;
+import org.apache.pinot.common.metrics.AbstractMetrics;
+import org.apache.pinot.common.metrics.BrokerGauge;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.metrics.ServerGauge;
 import org.apache.pinot.common.metrics.ServerMeter;
 import org.apache.pinot.common.metrics.ServerMetrics;
-import org.apache.pinot.core.accounting.utils.RunnerWorkerThreadOffsetProvider;
 import org.apache.pinot.spi.accounting.ThreadAccountantFactory;
 import org.apache.pinot.spi.accounting.ThreadExecutionContext;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageAccountant;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
+import org.apache.pinot.spi.config.instance.InstanceType;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.metrics.PinotMetricUtils;
 import org.apache.pinot.spi.trace.Tracing;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
@@ -55,8 +59,8 @@
 public class PerQueryCPUMemAccountantFactory implements ThreadAccountantFactory {
 
   @Override
-  public ThreadResourceUsageAccountant init(int numRunnerThreads, int numWorkerThreads, PinotConfiguration config) {
-    return new PerQueryCPUMemResourceUsageAccountant(numRunnerThreads + numWorkerThreads, config);
+  public ThreadResourceUsageAccountant init(PinotConfiguration config, String instanceId) {
+    return new PerQueryCPUMemResourceUsageAccountant(config, instanceId);
   }
 
   public static class PerQueryCPUMemResourceUsageAccountant extends Tracing.DefaultThreadResourceUsageAccountant {
@@ -66,6 +70,7 @@ public static class PerQueryCPUMemResourceUsageAccountant extends Tracing.Defaul
      */
     static final MemoryMXBean MEMORY_MX_BEAN = ManagementFactory.getMemoryMXBean();
     private static final Logger LOGGER = LoggerFactory.getLogger(PerQueryCPUMemResourceUsageAccountant.class);
+    private static final boolean IS_DEBUG_MODE_ENABLED = LOGGER.isDebugEnabled();
     /**
      * Executor service for the thread accounting task, slightly higher priority than normal priority
      */
@@ -79,44 +84,55 @@ public static class PerQueryCPUMemResourceUsageAccountant extends Tracing.Defaul
       return thread;
     });
 
-    // number of total threads
-    private final int _numThreads;
     private final PinotConfiguration _config;
-    private final RunnerWorkerThreadOffsetProvider _runnerWorkerThreadOffsetProvider;
 
-    // query_id, task_id per runner/worker thread
-    private final CPUMemThreadLevelAccountingObjects.TaskEntryHolder[] _taskStatus;
+    // the map to track stats entry for each thread, the entry will automatically be added when one calls
+    // setThreadResourceUsageProvider on the thread, including but not limited to
+    // server worker thread, runner thread, broker jetty thread, or broker netty thread
+    private final ConcurrentHashMap<Thread, CPUMemThreadLevelAccountingObjects.ThreadEntry> _threadEntriesMap
+        = new ConcurrentHashMap<>();
+
+    // For one time concurrent update of stats. This is to provide stats collection for parts that are not
+    // performance sensitive and query_id is not known beforehand (e.g. broker inbound netty thread)
+    private final ConcurrentHashMap<String, Long> _concurrentTaskCPUStatsAggregator = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, Long> _concurrentTaskMemStatsAggregator = new ConcurrentHashMap<>();
+
+    // for stats aggregation of finished (worker) threads when the runner is still running
+    private final HashMap<String, Long> _finishedTaskCPUStatsAggregator = new HashMap<>();
+    private final HashMap<String, Long> _finishedTaskMemStatsAggregator = new HashMap<>();
+
+    private final ThreadLocal<CPUMemThreadLevelAccountingObjects.ThreadEntry> _threadLocalEntry
+        = ThreadLocal.withInitial(() -> {
+          CPUMemThreadLevelAccountingObjects.ThreadEntry ret =
+              new CPUMemThreadLevelAccountingObjects.ThreadEntry();
+          _threadEntriesMap.put(Thread.currentThread(), ret);
+          LOGGER.info("Adding thread to _threadLocalEntry: {}", Thread.currentThread().getName());
+          return ret;
+        }
+    );
 
     // ThreadResourceUsageProvider(ThreadMXBean wrapper) per runner/worker thread
     private final ThreadLocal<ThreadResourceUsageProvider> _threadResourceUsageProvider;
 
     // track thread cpu time
     private final boolean _isThreadCPUSamplingEnabled;
-    // cpu time samples per runner/worker thread
-    private final CPUMemThreadLevelAccountingObjects.StatsDigest _cpuTimeSamplesNS;
 
     // track memory usage
     private final boolean _isThreadMemorySamplingEnabled;
-    // memory usage samples per runner/worker thread
-    private final CPUMemThreadLevelAccountingObjects.StatsDigest _memorySamplesBytes;
-
-    // the last seen task_id-query_id
-    private final CPUMemThreadLevelAccountingObjects.TaskEntry[] _lastQueryTask;
 
     private final Set<String> _inactiveQuery;
-    // error message store per runner/worker thread,
-    // will put preemption reasons in this for the killed thread to pickup
-    private final List<AtomicReference<Exception>> _errorStatus;
 
     // the periodical task that aggregates and preempts queries
     private final WatcherTask _watcherTask;
 
-    public PerQueryCPUMemResourceUsageAccountant(int numThreads, PinotConfiguration config) {
+    // instance id of the current instance, for logging purpose
+    private final String _instanceId;
+
+    public PerQueryCPUMemResourceUsageAccountant(PinotConfiguration config, String instanceId) {
 
       LOGGER.info("Initializing PerQueryCPUMemResourceUsageAccountant");
-      _numThreads = numThreads;
       _config = config;
-      _runnerWorkerThreadOffsetProvider = new RunnerWorkerThreadOffsetProvider();
+      _instanceId = instanceId;
 
       boolean threadCpuTimeMeasurementEnabled = ThreadResourceUsageProvider.isThreadCpuTimeMeasurementEnabled();
       boolean threadMemoryMeasurementEnabled = ThreadResourceUsageProvider.isThreadMemoryMeasurementEnabled();
@@ -137,29 +153,10 @@ public PerQueryCPUMemResourceUsageAccountant(int numThreads, PinotConfiguration
       LOGGER.info("_isThreadCPUSamplingEnabled: {}, _isThreadMemorySamplingEnabled: {}", _isThreadCPUSamplingEnabled,
           _isThreadMemorySamplingEnabled);
 
-      _taskStatus = new CPUMemThreadLevelAccountingObjects.TaskEntryHolder[_numThreads];
-      _errorStatus = new ArrayList<>(_numThreads);
-      for (int i = 0; i < _numThreads; i++) {
-        _taskStatus[i] = new CPUMemThreadLevelAccountingObjects.TaskEntryHolder();
-        _errorStatus.add(new AtomicReference<>(null));
-      }
-
-      if (_isThreadCPUSamplingEnabled) {
-        _cpuTimeSamplesNS = new CPUMemThreadLevelAccountingObjects.StatsDigest(_numThreads);
-      } else {
-        _cpuTimeSamplesNS = null;
-      }
-      if (_isThreadMemorySamplingEnabled) {
-        _memorySamplesBytes = new CPUMemThreadLevelAccountingObjects.StatsDigest(_numThreads);
-      } else {
-        _memorySamplesBytes = null;
-      }
-
       // ThreadMXBean wrapper
       _threadResourceUsageProvider = new ThreadLocal<>();
 
       // task/query tracking
-      _lastQueryTask = new CPUMemThreadLevelAccountingObjects.TaskEntry[_numThreads];
       _inactiveQuery = new HashSet<>();
 
       _watcherTask = new WatcherTask();
@@ -171,6 +168,28 @@ public void sampleUsage() {
       sampleThreadCPUTime();
     }
 
+    /**
+     * for testing only
+     */
+    public int getEntryCount() {
+      return _threadEntriesMap.size();
+    }
+
+    @Override
+    public void updateQueryUsageConcurrently(String queryId) {
+      if (_isThreadCPUSamplingEnabled) {
+        long cpuUsageNS = getThreadResourceUsageProvider().getThreadTimeNs();
+        _concurrentTaskCPUStatsAggregator.compute(queryId,
+            (key, value) -> (value == null) ? cpuUsageNS : (value + cpuUsageNS));
+      }
+      if (_isThreadMemorySamplingEnabled) {
+        long memoryAllocatedBytes = getThreadResourceUsageProvider().getThreadAllocatedBytes();
+        _concurrentTaskMemStatsAggregator.compute(queryId,
+            (key, value) -> (value == null) ? memoryAllocatedBytes : (value + memoryAllocatedBytes));
+      }
+    }
+
+
     /**
      * The thread would need to do {@code setThreadResourceUsageProvider} first upon it is scheduled.
      * This is to be called from a worker or a runner thread to update its corresponding cpu usage entry
@@ -178,8 +197,7 @@ public void sampleUsage() {
     @SuppressWarnings("ConstantConditions")
     public void sampleThreadCPUTime() {
       if (_isThreadCPUSamplingEnabled) {
-        int tid = _runnerWorkerThreadOffsetProvider.get();
-        _cpuTimeSamplesNS._currentStatsSample[tid] = getThreadResourceUsageProvider().getThreadTimeNs();
+        _threadLocalEntry.get()._currentThreadCPUTimeSampleMS = getThreadResourceUsageProvider().getThreadTimeNs();
       }
     }
 
@@ -190,8 +208,8 @@ public void sampleThreadCPUTime() {
     @SuppressWarnings("ConstantConditions")
     public void sampleThreadBytesAllocated() {
       if (_isThreadMemorySamplingEnabled) {
-        int tid = _runnerWorkerThreadOffsetProvider.get();
-        _memorySamplesBytes._currentStatsSample[tid] = getThreadResourceUsageProvider().getThreadAllocatedBytes();
+        _threadLocalEntry.get()._currentThreadMemoryAllocationSampleBytes
+            = getThreadResourceUsageProvider().getThreadAllocatedBytes();
       }
     }
 
@@ -207,22 +225,22 @@ public void setThreadResourceUsageProvider(ThreadResourceUsageProvider threadRes
     @Override
     public void createExecutionContextInner(@Nullable String queryId, int taskId, @Nullable
         ThreadExecutionContext parentContext) {
-      int tid = _runnerWorkerThreadOffsetProvider.get();
+      _threadLocalEntry.get()._errorStatus.set(null);
       if (parentContext == null) {
         // is anchor thread
         assert queryId != null;
-        _taskStatus[tid].setThreadTaskStatus(queryId, CommonConstants.Accounting.ANCHOR_TASK_ID,
+        _threadLocalEntry.get().setThreadTaskStatus(queryId, CommonConstants.Accounting.ANCHOR_TASK_ID,
             Thread.currentThread());
       } else {
         // not anchor thread
-        _taskStatus[tid].setThreadTaskStatus(parentContext.getQueryId(), taskId, parentContext.getAnchorThread());
+        _threadLocalEntry.get().setThreadTaskStatus(parentContext.getQueryId(), taskId,
+            parentContext.getAnchorThread());
       }
     }
 
     @Override
     public ThreadExecutionContext getThreadExecutionContext() {
-      int tid = _runnerWorkerThreadOffsetProvider.get();
-      return _taskStatus[tid].getThreadTaskStatus();
+      return _threadLocalEntry.get().getCurrentThreadTaskStatus();
     }
 
     /**
@@ -231,20 +249,12 @@ public ThreadExecutionContext getThreadExecutionContext() {
     @SuppressWarnings("ConstantConditions")
     @Override
     public void clear() {
-      int tid = _runnerWorkerThreadOffsetProvider.get();
-      // clear task info
-      _taskStatus[tid].setToIdle();
-      // clear CPU time
-      if (_isThreadCPUSamplingEnabled) {
-        _cpuTimeSamplesNS._currentStatsSample[tid] = 0;
-      }
-      // clear memory usage
-      if (_isThreadMemorySamplingEnabled) {
-        _memorySamplesBytes._currentStatsSample[tid] = 0;
-      }
+      CPUMemThreadLevelAccountingObjects.ThreadEntry threadEntry = _threadLocalEntry.get();
+      // clear task info + stats
+      threadEntry.setToIdle();
       // clear threadResourceUsageProvider
       _threadResourceUsageProvider.set(null);
-      // clear _rootThread
+      // clear _anchorThread
       super.clear();
     }
 
@@ -259,18 +269,22 @@ public void startWatcherTask() {
     public void cleanInactive() {
       for (String inactiveQueryId : _inactiveQuery) {
         if (_isThreadCPUSamplingEnabled) {
-          _cpuTimeSamplesNS._finishedTaskStatAggregator.remove(inactiveQueryId);
+          _finishedTaskCPUStatsAggregator.remove(inactiveQueryId);
+          _concurrentTaskCPUStatsAggregator.remove(inactiveQueryId);
         }
         if (_isThreadMemorySamplingEnabled) {
-          _memorySamplesBytes._finishedTaskStatAggregator.remove(inactiveQueryId);
+          _finishedTaskMemStatsAggregator.remove(inactiveQueryId);
+          _concurrentTaskMemStatsAggregator.remove(inactiveQueryId);
         }
       }
       _inactiveQuery.clear();
       if (_isThreadCPUSamplingEnabled) {
-        _inactiveQuery.addAll(_cpuTimeSamplesNS._finishedTaskStatAggregator.keySet());
+        _inactiveQuery.addAll(_finishedTaskCPUStatsAggregator.keySet());
+        _inactiveQuery.addAll(_concurrentTaskCPUStatsAggregator.keySet());
       }
       if (_isThreadMemorySamplingEnabled) {
-        _inactiveQuery.addAll(_memorySamplesBytes._finishedTaskStatAggregator.keySet());
+        _inactiveQuery.addAll(_finishedTaskMemStatsAggregator.keySet());
+        _inactiveQuery.addAll(_concurrentTaskMemStatsAggregator.keySet());
       }
     }
 
@@ -286,43 +300,45 @@ public Map<String, AggregatedStats> aggregate(boolean isTriggered) {
       }
 
       // for each {pqr, pqw}
-      for (int threadId = 0; threadId < _numThreads; threadId++) {
+      for (Map.Entry<Thread, CPUMemThreadLevelAccountingObjects.ThreadEntry> entry : _threadEntriesMap.entrySet()) {
         // sample current usage
+        CPUMemThreadLevelAccountingObjects.ThreadEntry threadEntry = entry.getValue();
         long currentCPUSample = _isThreadCPUSamplingEnabled
-            ? _cpuTimeSamplesNS._currentStatsSample[threadId] : 0;
+            ? threadEntry._currentThreadCPUTimeSampleMS : 0;
         long currentMemSample = _isThreadMemorySamplingEnabled
-            ? _memorySamplesBytes._currentStatsSample[threadId] : 0;
+            ? threadEntry._currentThreadMemoryAllocationSampleBytes : 0;
         // sample current running task status
-        CPUMemThreadLevelAccountingObjects.TaskEntry currentTaskStatus = _taskStatus[threadId].getThreadTaskStatus();
-        LOGGER.trace("tid: {}, task: {}", threadId, currentTaskStatus);
+        CPUMemThreadLevelAccountingObjects.TaskEntry currentTaskStatus = threadEntry.getCurrentThreadTaskStatus();
+        Thread thread = entry.getKey();
+        LOGGER.trace("tid: {}, task: {}", thread.getId(), currentTaskStatus);
 
         // get last task on the thread
-        CPUMemThreadLevelAccountingObjects.TaskEntry lastQueryTask = _lastQueryTask[threadId];
+        CPUMemThreadLevelAccountingObjects.TaskEntry lastQueryTask = threadEntry._previousThreadTaskStatus;
 
         // accumulate recorded previous stat to it's _finishedTaskStatAggregator
         // if the last task on the same thread has finished
-        if (!CPUMemThreadLevelAccountingObjects.TaskEntry.isSameTask(currentTaskStatus, lastQueryTask)) {
+        if (!(currentTaskStatus == lastQueryTask)) {
           // set previous value to current task stats
-          _lastQueryTask[threadId] = currentTaskStatus;
+          threadEntry._previousThreadTaskStatus = currentTaskStatus;
           if (lastQueryTask != null) {
             String lastQueryId = lastQueryTask.getQueryId();
             if (_isThreadCPUSamplingEnabled) {
-              long lastSample = _cpuTimeSamplesNS._lastStatSample[threadId];
-              _cpuTimeSamplesNS._finishedTaskStatAggregator.merge(lastQueryId, lastSample, Long::sum);
+              long lastSample = threadEntry._previousThreadCPUTimeSampleMS;
+              _finishedTaskCPUStatsAggregator.merge(lastQueryId, lastSample, Long::sum);
             }
             if (_isThreadMemorySamplingEnabled) {
-              long lastSample = _memorySamplesBytes._lastStatSample[threadId];
-              _memorySamplesBytes._finishedTaskStatAggregator.merge(lastQueryId, lastSample, Long::sum);
+              long lastSample = threadEntry._previousThreadMemoryAllocationSampleBytes;
+              _finishedTaskMemStatsAggregator.merge(lastQueryId, lastSample, Long::sum);
             }
           }
         }
 
         // record current usage values for future accumulation if this task is done
         if (_isThreadCPUSamplingEnabled) {
-          _cpuTimeSamplesNS._lastStatSample[threadId] = currentCPUSample;
+          threadEntry._previousThreadCPUTimeSampleMS = currentCPUSample;
         }
         if (_isThreadMemorySamplingEnabled) {
-          _memorySamplesBytes._lastStatSample[threadId] = currentMemSample;
+          threadEntry._previousThreadMemoryAllocationSampleBytes = currentMemSample;
         }
 
         // if current thread is not idle
@@ -333,15 +349,19 @@ public Map<String, AggregatedStats> aggregate(boolean isTriggered) {
           _inactiveQuery.remove(queryId);
           // if triggered, accumulate active query task stats
           if (isTriggered) {
-            Thread thread = currentTaskStatus.getAnchorThread();
-            int finalThreadId = threadId;
+            Thread anchorThread = currentTaskStatus.getAnchorThread();
             boolean isAnchorThread = currentTaskStatus.isAnchorThread();
             ret.compute(queryId, (k, v) -> v == null
-                ? new AggregatedStats(currentCPUSample, currentMemSample, thread, isAnchorThread,
-                finalThreadId, queryId)
-                : v.merge(currentCPUSample, currentMemSample, isAnchorThread, finalThreadId));
+                ? new AggregatedStats(currentCPUSample, currentMemSample, anchorThread,
+                isAnchorThread, threadEntry._errorStatus, queryId)
+                : v.merge(currentCPUSample, currentMemSample, isAnchorThread, threadEntry._errorStatus));
           }
         }
+
+        if (!thread.isAlive()) {
+          _threadEntriesMap.remove(thread);
+          LOGGER.info("Removing thread from _threadLocalEntry: {}", thread.getName());
+        }
       }
 
       // if triggered, accumulate stats of finished tasks of each active query
@@ -349,19 +369,26 @@ public Map<String, AggregatedStats> aggregate(boolean isTriggered) {
         for (Map.Entry<String, AggregatedStats> queryIdResult : ret.entrySet()) {
           String activeQueryId = queryIdResult.getKey();
           long accumulatedCPUValue = _isThreadCPUSamplingEnabled
-              ? _cpuTimeSamplesNS._finishedTaskStatAggregator.getOrDefault(activeQueryId, 0L) : 0;
+              ? _finishedTaskCPUStatsAggregator.getOrDefault(activeQueryId, 0L) : 0;
+          long concurrentCPUValue = _isThreadCPUSamplingEnabled
+              ? _concurrentTaskCPUStatsAggregator.getOrDefault(activeQueryId, 0L) : 0;
           long accumulatedMemValue = _isThreadMemorySamplingEnabled
-              ? _memorySamplesBytes._finishedTaskStatAggregator.getOrDefault(activeQueryId, 0L) : 0;
-          queryIdResult.getValue().merge(accumulatedCPUValue, accumulatedMemValue,
-              false, CommonConstants.Accounting.IGNORED_TASK_ID);
+              ? _finishedTaskMemStatsAggregator.getOrDefault(activeQueryId, 0L) : 0;
+          long concurrentMemValue = _isThreadMemorySamplingEnabled
+              ? _concurrentTaskMemStatsAggregator.getOrDefault(activeQueryId, 0L) : 0;
+          queryIdResult.getValue().merge(accumulatedCPUValue + concurrentCPUValue,
+              accumulatedMemValue + concurrentMemValue, false, null);
         }
       }
       return ret;
     }
 
+    public void postAggregation(Map<String, AggregatedStats> aggregatedUsagePerActiveQuery) {
+    }
+
     @Override
     public Exception getErrorStatus() {
-      return _errorStatus.get(_runnerWorkerThreadOffsetProvider.get()).getAndSet(null);
+      return _threadLocalEntry.get()._errorStatus.getAndSet(null);
     }
 
     /**
@@ -369,39 +396,39 @@ public Exception getErrorStatus() {
      * the ordinal Normal(0) does not trigger any action.
      */
     enum TriggeringLevel {
-      Normal, HeapMemoryAlarmingVerbose, HeapMemoryCritical, HeapMemoryPanic
+      Normal, HeapMemoryAlarmingVerbose, CPUTimeBasedKilling, HeapMemoryCritical, HeapMemoryPanic
     }
 
     /**
      * aggregated usage of a query, _thread is the runner
      */
-    static class AggregatedStats {
+    protected static class AggregatedStats {
       final String _queryId;
-      final Thread _thread;
-      int _threadId;
+      final Thread _anchorThread;
       boolean _isAnchorThread;
+      AtomicReference<Exception> _exceptionAtomicReference;
       long _allocatedBytes;
       long _cpuNS;
 
-
-      public AggregatedStats(long cpuNS, long allocatedBytes, Thread thread, Boolean isAnchorThread, int threadId,
-          String queryId) {
+      public AggregatedStats(long cpuNS, long allocatedBytes, Thread anchorThread, boolean isAnchorThread,
+          AtomicReference<Exception> exceptionAtomicReference, String queryId) {
         _cpuNS = cpuNS;
         _allocatedBytes = allocatedBytes;
-        _thread = thread;
-        _threadId = threadId;
-        _queryId = queryId;
+        _anchorThread = anchorThread;
         _isAnchorThread = isAnchorThread;
+        _exceptionAtomicReference = exceptionAtomicReference;
+        _queryId = queryId;
       }
 
       @Override
       public String toString() {
         return "AggregatedStats{"
             + "_queryId='" + _queryId + '\''
+            + ", _anchorThread=" + _anchorThread
+            + ", _isAnchorThread=" + _isAnchorThread
+            + ", _exceptionAtomicReference=" + _exceptionAtomicReference
             + ", _allocatedBytes=" + _allocatedBytes
             + ", _cpuNS=" + _cpuNS
-            + ", _thread=" + _thread
-            + ", _threadId=" + _threadId
             + '}';
       }
 
@@ -413,19 +440,21 @@ public long getAllocatedBytes() {
         return _allocatedBytes;
       }
 
-      public Thread getThread() {
-        return _thread;
+      public Thread getAnchorThread() {
+        return _anchorThread;
       }
 
-      public AggregatedStats merge(long cpuNS, long memoryBytes, boolean isAnchorThread, int threadId) {
+      public AggregatedStats merge(long cpuNS, long memoryBytes, boolean isAnchorThread,
+          AtomicReference<Exception> exceptionAtomicReference) {
         _cpuNS += cpuNS;
         _allocatedBytes += memoryBytes;
 
         // the merging results is from an anchor thread
         if (isAnchorThread) {
           _isAnchorThread = true;
-          _threadId = threadId;
+          _exceptionAtomicReference = exceptionAtomicReference;
         }
+
         // everything else is already set during creation
         return this;
       }
@@ -454,8 +483,17 @@ class WatcherTask implements Runnable {
           * _config.getProperty(CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO,
           CommonConstants.Accounting.DEFAULT_CRITICAL_LEVEL_HEAP_USAGE_RATIO));
 
+      // if after gc the heap usage is still above this, kill the most expensive query
+      // use this to prevent heap size oscillation and repeatedly triggering gc
+      private final long _criticalLevelAfterGC = _criticalLevel - (long) (_maxHeapSize
+          * _config.getProperty(CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO_DELTA_AFTER_GC,
+          CommonConstants.Accounting.DEFAULT_CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO_DELTA_AFTER_GC));
+
       // trigger gc if consecutively kill more than some number of queries
-      private final int _gcTriggerCount =
+      // set this to 0 to always trigger gc before killing a query to give gc a second chance
+      // as would minimize the chance of false positive killing in some usecases
+      // should consider use -XX:+ExplicitGCInvokesConcurrent to avoid STW for some gc algorithms
+      private final int _gcBackoffCount =
           _config.getProperty(CommonConstants.Accounting.CONFIG_OF_GC_BACKOFF_COUNT,
               CommonConstants.Accounting.DEFAULT_GC_BACKOFF_COUNT);
 
@@ -467,8 +505,16 @@ class WatcherTask implements Runnable {
 
       // normal sleep time
       private final int _normalSleepTime =
-          _config.getProperty(CommonConstants.Accounting.CONFIG_OF_SLEEP_TIME,
-              CommonConstants.Accounting.DEFAULT_SLEEP_TIME);
+          _config.getProperty(CommonConstants.Accounting.CONFIG_OF_SLEEP_TIME_MS,
+              CommonConstants.Accounting.DEFAULT_SLEEP_TIME_MS);
+
+      // wait for gc to complete, according to system.gc() javadoc, when control returns from the method call,
+      // the Java Virtual Machine has made a best effort to reclaim space from all discarded objects.
+      // Therefore, we default this to 0.
+      // Tested with Shenandoah GC and G1GC, with -XX:+ExplicitGCInvokesConcurrent
+      private final int _gcWaitTime =
+          _config.getProperty(CommonConstants.Accounting.CONFIG_OF_GC_WAIT_TIME_MS,
+              CommonConstants.Accounting.DEFAULT_CONFIG_OF_GC_WAIT_TIME_MS);
 
       // alarming sleep time denominator, should be > 1 to sample more frequent at alarming level
       private final int _alarmingSleepTimeDenominator =
@@ -488,18 +534,84 @@ class WatcherTask implements Runnable {
           _config.getProperty(CommonConstants.Accounting.CONFIG_OF_PUBLISHING_JVM_USAGE,
               CommonConstants.Accounting.DEFAULT_PUBLISHING_JVM_USAGE);
 
+      // if we want kill query based on CPU time
+      private final boolean _isCPUTimeBasedKillingEnabled =
+          _config.getProperty(CommonConstants.Accounting.CONFIG_OF_CPU_TIME_BASED_KILLING_ENABLED,
+              CommonConstants.Accounting.DEFAULT_CPU_TIME_BASED_KILLING_ENABLED) && _isThreadCPUSamplingEnabled;
+
+      // CPU time based killing threshold
+      private final long _cpuTimeBasedKillingThresholdNS =
+          _config.getProperty(CommonConstants.Accounting.CONFIG_OF_CPU_TIME_BASED_KILLING_THRESHOLD_MS,
+              CommonConstants.Accounting.DEFAULT_CPU_TIME_BASED_KILLING_THRESHOLD_MS) * 1000_000L;
+
+      //
+      private final boolean _isQueryKilledMetricEnabled =
+          _config.getProperty(CommonConstants.Accounting.CONFIG_OF_QUERY_KILLED_METRIC_ENABLED,
+              CommonConstants.Accounting.DEFAULT_QUERY_KILLED_METRIC_ENABLED);
+
+      private final InstanceType _instanceType =
+          InstanceType.valueOf(_config.getProperty(CommonConstants.Accounting.CONFIG_OF_INSTANCE_TYPE,
+          CommonConstants.Accounting.DEFAULT_CONFIG_OF_INSTANCE_TYPE.toString()));
+
       private long _usedBytes;
       private int _sleepTime;
       private int _numQueriesKilledConsecutively = 0;
-      private Map<String, AggregatedStats> _aggregatedUsagePerActiveQuery;
+      protected Map<String, AggregatedStats> _aggregatedUsagePerActiveQuery;
       private TriggeringLevel _triggeringLevel;
 
+      // metrics class
+      private final AbstractMetrics _metrics;
+      private final AbstractMetrics.Meter _queryKilledMeter;
+      private final AbstractMetrics.Meter _heapMemoryCriticalExceededMeter;
+      private final AbstractMetrics.Meter _heapMemoryPanicExceededMeter;
+      private final AbstractMetrics.Gauge _memoryUsageGauge;
+
+      WatcherTask() {
+        switch (_instanceType) {
+          case SERVER:
+            _metrics = ServerMetrics.get();
+            _queryKilledMeter = ServerMeter.QUERIES_KILLED;
+            _memoryUsageGauge = ServerGauge.JVM_HEAP_USED_BYTES;
+            _heapMemoryCriticalExceededMeter = ServerMeter.HEAP_CRITICAL_LEVEL_EXCEEDED;
+            _heapMemoryPanicExceededMeter = ServerMeter.HEAP_PANIC_LEVEL_EXCEEDED;
+            break;
+          case BROKER:
+            _metrics = BrokerMetrics.get();
+            _queryKilledMeter = BrokerMeter.QUERIES_KILLED;
+            _memoryUsageGauge = BrokerGauge.JVM_HEAP_USED_BYTES;
+            _heapMemoryCriticalExceededMeter = BrokerMeter.HEAP_CRITICAL_LEVEL_EXCEEDED;
+            _heapMemoryPanicExceededMeter = BrokerMeter.HEAP_PANIC_LEVEL_EXCEEDED;
+            break;
+          default:
+            LOGGER.error("instanceType: {} not supported, using server metrics", _instanceType);
+            _metrics = new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry());
+            _queryKilledMeter = ServerMeter.QUERIES_KILLED;
+            _memoryUsageGauge = ServerGauge.JVM_HEAP_USED_BYTES;
+            _heapMemoryCriticalExceededMeter = ServerMeter.HEAP_CRITICAL_LEVEL_EXCEEDED;
+            _heapMemoryPanicExceededMeter = ServerMeter.HEAP_PANIC_LEVEL_EXCEEDED;
+            break;
+        }
+      }
+
       @Override
       public void run() {
+        // Log info for the accountant configs
         LOGGER.info("Starting accountant task for PerQueryCPUMemAccountant.");
         LOGGER.info("Xmx is {}", _maxHeapSize);
+        LOGGER.info("_instanceType is {}", _instanceType);
         LOGGER.info("_alarmingLevel of on heap memory is {}", _alarmingLevel);
         LOGGER.info("_criticalLevel of on heap memory is {}", _criticalLevel);
+        LOGGER.info("_criticalLevelAfterGC of on heap memory is {}", _criticalLevelAfterGC);
+        LOGGER.info("_panicLevel of on heap memory is {}", _panicLevel);
+        LOGGER.info("_gcBackoffCount is {}", _gcBackoffCount);
+        LOGGER.info("_gcWaitTime is {}", _gcWaitTime);
+        LOGGER.info("_normalSleepTime is {}", _normalSleepTime);
+        LOGGER.info("_alarmingSleepTime is {}", _alarmingSleepTime);
+        LOGGER.info("_oomKillQueryEnabled: {}", _oomKillQueryEnabled);
+        LOGGER.info("_minMemoryFootprintForKill: {}", _minMemoryFootprintForKill);
+        LOGGER.info("_isCPUTimeBasedKillingEnabled: {}, _cpuTimeBasedKillingThresholdNS: {}",
+            _isCPUTimeBasedKillingEnabled, _cpuTimeBasedKillingThresholdNS);
+
         while (true) {
           LOGGER.debug("Running timed task for PerQueryCPUMemAccountant.");
           _triggeringLevel = TriggeringLevel.Normal;
@@ -516,17 +628,20 @@ public void run() {
             evalTriggers();
             // Refresh thread usage and aggregate to per query usage if triggered
             _aggregatedUsagePerActiveQuery = aggregate(_triggeringLevel.ordinal() > TriggeringLevel.Normal.ordinal());
+            // post aggregation function
+            postAggregation(_aggregatedUsagePerActiveQuery);
             // Act on one triggered actions
             triggeredActions();
           } catch (Exception e) {
             LOGGER.error("Caught exception while executing stats aggregation and query kill", e);
           } finally {
-            if (_aggregatedUsagePerActiveQuery != null) {
-              LOGGER.debug(_aggregatedUsagePerActiveQuery.toString());
-            }
+            LOGGER.debug(_aggregatedUsagePerActiveQuery == null ? "_aggregatedUsagePerActiveQuery : null"
+                : _aggregatedUsagePerActiveQuery.toString());
+            LOGGER.debug("_threadEntriesMap size: {}", _threadEntriesMap.size());
+
             // Publish server heap usage metrics
             if (_publishHeapUsageMetric) {
-              ServerMetrics.get().setValueOfGlobalGauge(ServerGauge.JVM_HEAP_USED_BYTES, _usedBytes);
+              _metrics.setValueOfGlobalGauge(_memoryUsageGauge, _usedBytes);
             }
             // Clean inactive query stats
             cleanInactive();
@@ -551,6 +666,7 @@ private boolean outOfMemoryPanicTrigger() {
         if (_usedBytes >= _panicLevel) {
           killAllQueries();
           _triggeringLevel = TriggeringLevel.HeapMemoryPanic;
+          _metrics.addMeteredGlobalValue(_heapMemoryPanicExceededMeter, 1);
           LOGGER.error("Heap used bytes {}, greater than _panicLevel {}, Killed all queries and triggered gc!",
               _usedBytes, _panicLevel);
           // call aggregate here as will throw exception and
@@ -565,11 +681,18 @@ private boolean outOfMemoryPanicTrigger() {
        * Triggers should be mutually exclusive and evaluated following level high -> low
        */
       private void evalTriggers() {
+        if (_isCPUTimeBasedKillingEnabled) {
+          _triggeringLevel = TriggeringLevel.CPUTimeBasedKilling;
+        }
+
         if (_usedBytes > _criticalLevel) {
           _triggeringLevel = TriggeringLevel.HeapMemoryCritical;
+          _metrics.addMeteredGlobalValue(_heapMemoryCriticalExceededMeter, 1);
         } else if (_usedBytes > _alarmingLevel) {
-          _triggeringLevel = LOGGER.isDebugEnabled() ? TriggeringLevel.HeapMemoryAlarmingVerbose : _triggeringLevel;
           _sleepTime = _alarmingSleepTime;
+          // For debugging
+          _triggeringLevel = (IS_DEBUG_MODE_ENABLED && _triggeringLevel == TriggeringLevel.Normal)
+              ? TriggeringLevel.HeapMemoryAlarmingVerbose : _triggeringLevel;
         }
       }
 
@@ -579,9 +702,12 @@ private void evalTriggers() {
       private void triggeredActions() {
         switch (_triggeringLevel) {
           case HeapMemoryCritical:
-            LOGGER.debug("Heap used bytes {} exceeds critical level", _usedBytes);
+            LOGGER.warn("Heap used bytes {} exceeds critical level {}", _usedBytes, _criticalLevel);
             killMostExpensiveQuery();
             break;
+          case CPUTimeBasedKilling:
+            killCPUTimeExceedQueries();
+            break;
           case HeapMemoryAlarmingVerbose:
             LOGGER.warn("Heap used bytes {} exceeds alarming level", _usedBytes);
             LOGGER.warn("Query usage aggregation results {}", _aggregatedUsagePerActiveQuery.toString());
@@ -603,16 +729,19 @@ void reschedule() {
       void killAllQueries() {
         if (_oomKillQueryEnabled) {
           int killedCount = 0;
-          for (int i = 0; i < _numThreads; i++) {
-            CPUMemThreadLevelAccountingObjects.TaskEntry
-                taskEntry = _taskStatus[i].getThreadTaskStatus();
+          for (Map.Entry<Thread, CPUMemThreadLevelAccountingObjects.ThreadEntry> entry : _threadEntriesMap.entrySet()) {
+            CPUMemThreadLevelAccountingObjects.ThreadEntry threadEntry = entry.getValue();
+            CPUMemThreadLevelAccountingObjects.TaskEntry taskEntry = threadEntry.getCurrentThreadTaskStatus();
             if (taskEntry != null && taskEntry.isAnchorThread()) {
-              _errorStatus.get(i).set(new RuntimeException("Query killed due to server out of memory!"));
+              threadEntry._errorStatus
+                  .set(new RuntimeException(String.format("Query killed due to %s out of memory!", _instanceType)));
               taskEntry.getAnchorThread().interrupt();
               killedCount += 1;
             }
           }
-          ServerMetrics.get().addMeteredGlobalValue(ServerMeter.QUERIES_PREEMPTED, killedCount);
+          if (_isQueryKilledMetricEnabled) {
+            _metrics.addMeteredGlobalValue(_queryKilledMeter, killedCount);
+          }
           try {
             Thread.sleep(_normalSleepTime);
           } catch (InterruptedException ignored) {
@@ -629,26 +758,27 @@ void killAllQueries() {
        * use XX:+ExplicitGCInvokesConcurrent to avoid a full gc when system.gc is triggered
        */
       private void killMostExpensiveQuery() {
-        if (!_aggregatedUsagePerActiveQuery.isEmpty() && _numQueriesKilledConsecutively >= _gcTriggerCount) {
-          System.gc();
+        if (!_aggregatedUsagePerActiveQuery.isEmpty() && _numQueriesKilledConsecutively >= _gcBackoffCount) {
           _numQueriesKilledConsecutively = 0;
+          System.gc();
           try {
-            Thread.sleep(_normalSleepTime);
+            Thread.sleep(_gcWaitTime);
           } catch (InterruptedException ignored) {
           }
           _usedBytes = MEMORY_MX_BEAN.getHeapMemoryUsage().getUsed();
-          if (_usedBytes < _criticalLevel) {
+          if (_usedBytes < _criticalLevelAfterGC) {
             return;
           }
+          LOGGER.error("After GC, heap used bytes {} still exceeds _criticalLevelAfterGC level {}",
+              _usedBytes, _criticalLevelAfterGC);
         }
         if (!(_isThreadMemorySamplingEnabled || _isThreadCPUSamplingEnabled)) {
-          LOGGER.warn("Heap used bytes {} exceeds critical level", _usedBytes);
           LOGGER.warn("But unable to kill query because neither memory nor cpu tracking is enabled");
           return;
         }
         // Critical heap memory usage while no queries running
         if (_aggregatedUsagePerActiveQuery.isEmpty()) {
-          LOGGER.debug("Heap used bytes {} exceeds critical level, but no active queries", _usedBytes);
+          LOGGER.debug("No active queries to kill");
           return;
         }
         AggregatedStats maxUsageTuple;
@@ -657,33 +787,63 @@ private void killMostExpensiveQuery() {
               Comparator.comparing(AggregatedStats::getAllocatedBytes));
           boolean shouldKill = _oomKillQueryEnabled && maxUsageTuple._allocatedBytes > _minMemoryFootprintForKill;
           if (shouldKill) {
-            _errorStatus.get(maxUsageTuple._threadId)
-                .set(new RuntimeException(String.format(" Query %s got killed because using %d bytes of memory, "
-                        + "exceeding the quota", maxUsageTuple._queryId, maxUsageTuple.getAllocatedBytes())));
-            interruptRunnerThread(maxUsageTuple.getThread());
+            maxUsageTuple._exceptionAtomicReference
+                .set(new RuntimeException(String.format(
+                    " Query %s got killed because using %d bytes of memory on %s: %s, exceeding the quota",
+                    maxUsageTuple._queryId, maxUsageTuple.getAllocatedBytes(), _instanceType, _instanceId)));
+            interruptRunnerThread(maxUsageTuple.getAnchorThread());
+            LOGGER.error("Query {} got picked because using {} bytes of memory, actual kill committed true}",
+                maxUsageTuple._queryId, maxUsageTuple._allocatedBytes);
+            LOGGER.error("Current task status recorded is {}", _threadEntriesMap);
+          } else if (!_oomKillQueryEnabled) {
+            LOGGER.warn("Query {} got picked because using {} bytes of memory, actual kill committed false "
+                    + "because oomKillQueryEnabled is false",
+                maxUsageTuple._queryId, maxUsageTuple._allocatedBytes);
+          } else {
+            LOGGER.warn("But all queries are below quota, no query killed");
           }
-          LOGGER.error("Heap used bytes {} exceeds critical level {}", _usedBytes, _criticalLevel);
-          LOGGER.error("Query {} got picked because using {} bytes of memory, actual kill committed {}",
-              maxUsageTuple._queryId, maxUsageTuple._allocatedBytes, shouldKill);
         } else {
           maxUsageTuple = Collections.max(_aggregatedUsagePerActiveQuery.values(),
               Comparator.comparing(AggregatedStats::getCpuNS));
           if (_oomKillQueryEnabled) {
-            _errorStatus.get(maxUsageTuple._threadId)
-                .set(new RuntimeException(String.format(" Query %s got killed because server memory pressure, using "
-                        + "%d ns of CPU time", maxUsageTuple._queryId, maxUsageTuple.getAllocatedBytes())));
-            interruptRunnerThread(maxUsageTuple.getThread());
+            maxUsageTuple._exceptionAtomicReference
+                .set(new RuntimeException(String.format(
+                    " Query %s got killed because memory pressure, using %d ns of CPU time on %s: %s",
+                    maxUsageTuple._queryId, maxUsageTuple.getAllocatedBytes(), _instanceType, _instanceId)));
+            interruptRunnerThread(maxUsageTuple.getAnchorThread());
+            LOGGER.error("Query {} got picked because using {} ns of cpu time, actual kill committed true",
+                maxUsageTuple._allocatedBytes, maxUsageTuple._queryId);
+            LOGGER.error("Current task status recorded is {}", _threadEntriesMap);
+          } else {
+            LOGGER.warn("Query {} got picked because using {} bytes of memory, actual kill committed false "
+                    + "because oomKillQueryEnabled is false",
+                maxUsageTuple._queryId, maxUsageTuple._allocatedBytes);
+          }
+        }
+        LOGGER.warn("Query aggregation results {} for the previous kill.", _aggregatedUsagePerActiveQuery.toString());
+      }
+
+      private void killCPUTimeExceedQueries() {
+        for (Map.Entry<String, AggregatedStats> entry : _aggregatedUsagePerActiveQuery.entrySet()) {
+          AggregatedStats value = entry.getValue();
+          if (value._cpuNS > _cpuTimeBasedKillingThresholdNS) {
+            LOGGER.error("Query {} got picked because using {} ns of cpu time, greater than threshold {}",
+                value._queryId, value.getCpuNS(), _cpuTimeBasedKillingThresholdNS);
+            value._exceptionAtomicReference.set(new RuntimeException(
+                String.format("Query %s got killed on %s: %s because using %d "
+                        + "CPU time exceeding limit of %d ns CPU time",
+                    value._queryId, _instanceType, _instanceId, value.getCpuNS(), _cpuTimeBasedKillingThresholdNS)));
+            interruptRunnerThread(value.getAnchorThread());
           }
-          LOGGER.error("Heap used bytes {} exceeds critical level {}", _usedBytes, _criticalLevel);
-          LOGGER.error("Query {} got picked because using {} ns of cpu time, actual kill committed {}",
-              maxUsageTuple._allocatedBytes, maxUsageTuple._queryId, _oomKillQueryEnabled);
         }
-        LOGGER.error("Query aggregation results {} for the previous kill.", _aggregatedUsagePerActiveQuery.toString());
+        LOGGER.error("Current task status recorded is {}", _threadEntriesMap);
       }
 
       private void interruptRunnerThread(Thread thread) {
         thread.interrupt();
-        ServerMetrics.get().addMeteredGlobalValue(ServerMeter.QUERIES_PREEMPTED, 1);
+        if (_isQueryKilledMetricEnabled) {
+          _metrics.addMeteredGlobalValue(_queryKilledMeter, 1);
+        }
         _numQueriesKilledConsecutively += 1;
       }
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactoryForTest.java b/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactoryForTest.java
new file mode 100644
index 00000000000..3e6c9004a88
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/accounting/PerQueryCPUMemAccountantFactoryForTest.java
@@ -0,0 +1,49 @@
+/**
+ * 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.pinot.core.accounting;
+
+import java.util.Map;
+import org.apache.pinot.core.query.utils.QueryIdUtils;
+import org.apache.pinot.spi.accounting.ThreadAccountantFactory;
+import org.apache.pinot.spi.accounting.ThreadResourceUsageAccountant;
+import org.apache.pinot.spi.env.PinotConfiguration;
+
+
+/**
+ * For broker integration test, remove tracking for severs
+ */
+public class PerQueryCPUMemAccountantFactoryForTest implements ThreadAccountantFactory {
+  @Override
+  public ThreadResourceUsageAccountant init(PinotConfiguration config, String instanceId) {
+    return new PerQueryCPUMemResourceUsageAccountantBrokerKillingTest(config, instanceId);
+  }
+
+  public static class PerQueryCPUMemResourceUsageAccountantBrokerKillingTest
+      extends PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant {
+    public PerQueryCPUMemResourceUsageAccountantBrokerKillingTest(PinotConfiguration config, String instanceId) {
+      super(config, instanceId);
+    }
+
+    public void postAggregation(Map<String, AggregatedStats> aggregatedUsagePerActiveQuery) {
+      if (aggregatedUsagePerActiveQuery != null) {
+        aggregatedUsagePerActiveQuery.entrySet().removeIf(item -> item.getKey().endsWith(QueryIdUtils.OFFLINE_SUFFIX));
+      }
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/accounting/utils/RunnerWorkerThreadOffsetProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/accounting/utils/RunnerWorkerThreadOffsetProvider.java
deleted file mode 100644
index 3fe00a58dd8..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/accounting/utils/RunnerWorkerThreadOffsetProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.accounting.utils;
-
-import com.google.common.annotations.VisibleForTesting;
-import java.util.concurrent.atomic.AtomicInteger;
-
-
-/**
- * map each thread to a unique id, starting from zero, used as its offset to access
- * cputime/memory/job status, etc
- */
-public class RunnerWorkerThreadOffsetProvider {
-
-  // Thread local variable containing each thread's ID
-  private final AtomicInteger _atomicInteger = new AtomicInteger(0);
-  private final ThreadLocal<Integer> _threadId = ThreadLocal.withInitial(_atomicInteger::getAndIncrement);
-
-  public RunnerWorkerThreadOffsetProvider() {
-  }
-
-  @VisibleForTesting
-  public void reset() {
-    _atomicInteger.set(0);
-  }
-
-  // TODO: make this not dependent on numRunnerThreads
-  /**
-   * Returns the current thread's unique ID, assigning it if necessary
-   */
-  public int get() {
-    return _threadId.get();
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/Block.java b/pinot-core/src/main/java/org/apache/pinot/core/common/Block.java
index 03397a59481..2ee6585ecf4 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/Block.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/Block.java
@@ -19,41 +19,8 @@
 package org.apache.pinot.core.common;
 
 /**
- *
- * A block represents a set of rows.A segment will contain one or more blocks
- * Currently, it assumes only one column per block. We might change this in
- * future
+ * A {@code Block} represents the data block returned by the {@link Operator}. Each operator can return multiple blocks.
+ * It can contain document ids, column values or result rows depending on the operator.
  */
 public interface Block {
-
-  /**
-   * Returns valset that allows one to iterate over the docId. If no predicate
-   * is provided, this will consists of all docIds within the block
-   *
-   * @return {@link BlockDocIdSet}
-   */
-
-  BlockDocIdSet getBlockDocIdSet();
-
-  /**
-   * Returns valset that allows one to iterate over the values
-   *
-   * @return {@link BlockValSet}
-   */
-  BlockValSet getBlockValueSet();
-
-  /**
-   * Allows one to iterate over the DocId And Value in parallel
-   *
-   * @return
-   */
-  BlockDocIdValueSet getBlockDocIdValueSet();
-
-  /**
-   * For future optimizations. The metadata can consists of bloom filter,
-   * min/max, sum, count etc that can be used in filtering, aggregation
-   *
-   * @return
-   */
-  BlockMetadata getMetadata();
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdSet.java
index bedff54d833..dec522db9a6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdSet.java
@@ -18,9 +18,21 @@
  */
 package org.apache.pinot.core.common;
 
+import org.apache.pinot.core.operator.blocks.FilterBlock;
+import org.apache.pinot.core.operator.dociditerators.AndDocIdIterator;
+import org.apache.pinot.core.operator.dociditerators.BitmapDocIdIterator;
+import org.apache.pinot.core.operator.dociditerators.OrDocIdIterator;
+import org.apache.pinot.core.operator.dociditerators.RangelessBitmapDocIdIterator;
+import org.apache.pinot.core.operator.dociditerators.ScanBasedDocIdIterator;
+import org.apache.pinot.core.operator.docidsets.BitmapDocIdSet;
+import org.apache.pinot.core.operator.docidsets.RangelessBitmapDocIdSet;
+import org.apache.pinot.segment.spi.Constants;
+import org.roaringbitmap.RoaringBitmapWriter;
+import org.roaringbitmap.buffer.MutableRoaringBitmap;
+
+
 /**
- * The interface {@code BlockDocIdSet} represents all the matching document ids for a predicate.
- * TODO: Redesign the filtering to skip the BlockDocIdSet and directly use BlockDocIdIterator
+ * The {@code BlockDocIdSet} contains the matching document ids returned by the {@link FilterBlock}.
  */
 public interface BlockDocIdSet {
 
@@ -29,4 +41,41 @@ public interface BlockDocIdSet {
    * ascending order.
    */
   BlockDocIdIterator iterator();
+
+  /**
+   * Returns the number of entries (SV value contains one entry, MV value contains multiple entries) scanned in the
+   * filtering phase. This method should be called after the filtering is done.
+   */
+  long getNumEntriesScannedInFilter();
+
+  /**
+   * For scan-based FilterBlockDocIdSet, pre-scans the documents and returns a non-scan-based FilterBlockDocIdSet.
+   */
+  default BlockDocIdSet toNonScanDocIdSet() {
+    BlockDocIdIterator docIdIterator = iterator();
+
+    // NOTE: AND and OR DocIdIterator might contain scan-based DocIdIterator
+    // TODO: This scan is not counted in the execution stats
+    if (docIdIterator instanceof ScanBasedDocIdIterator || docIdIterator instanceof AndDocIdIterator
+        || docIdIterator instanceof OrDocIdIterator) {
+      RoaringBitmapWriter<MutableRoaringBitmap> bitmapWriter =
+          RoaringBitmapWriter.bufferWriter().runCompress(false).get();
+      int docId;
+      while ((docId = docIdIterator.next()) != Constants.EOF) {
+        bitmapWriter.add(docId);
+      }
+      return new RangelessBitmapDocIdSet(bitmapWriter.get());
+    }
+
+    // NOTE: AND and OR DocIdSet might return BitmapBasedDocIdIterator after processing the iterators. Create a new
+    //       DocIdSet to prevent processing the iterators again
+    if (docIdIterator instanceof RangelessBitmapDocIdIterator) {
+      return new RangelessBitmapDocIdSet((RangelessBitmapDocIdIterator) docIdIterator);
+    }
+    if (docIdIterator instanceof BitmapDocIdIterator) {
+      return new BitmapDocIdSet((BitmapDocIdIterator) docIdIterator);
+    }
+
+    return this;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/IntermediateStageBlockValSet.java b/pinot-core/src/main/java/org/apache/pinot/core/common/IntermediateStageBlockValSet.java
new file mode 100644
index 00000000000..7ddaaf04c93
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/IntermediateStageBlockValSet.java
@@ -0,0 +1,155 @@
+/**
+ * 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.pinot.core.common;
+
+import java.math.BigDecimal;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.datablock.DataBlockUtils;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.roaringbitmap.RoaringBitmap;
+
+/**
+ * In the multistage engine, the leaf stage servers process the data in columnar fashion. By the time the
+ * intermediate stage receives the projected column, they are converted to a row based format. This class provides
+ * the capability to convert the row based representation into columnar blocks so that they can be used to process
+ * aggregations using v1 aggregation functions.
+ * TODO: Support MV
+ */
+public class IntermediateStageBlockValSet implements BlockValSet {
+  private final FieldSpec.DataType _dataType;
+  private final DataBlock _dataBlock;
+  private final int _index;
+  private final RoaringBitmap _nullBitMap;
+
+  public IntermediateStageBlockValSet(DataSchema.ColumnDataType columnDataType, DataBlock dataBlock, int colIndex) {
+    _dataType = columnDataType.toDataType();
+    _dataBlock = dataBlock;
+    _index = colIndex;
+    _nullBitMap = dataBlock.getNullRowIds(colIndex);
+  }
+
+  /**
+   * Returns a bitmap of indices where null values are found.
+   */
+  @Nullable
+  @Override
+  public RoaringBitmap getNullBitmap() {
+    return _nullBitMap;
+  }
+
+  @Override
+  public FieldSpec.DataType getValueType() {
+    return _dataType;
+  }
+
+  @Override
+  public boolean isSingleValue() {
+    // TODO: Needs to be changed when we start supporting MV in multistage
+    return true;
+  }
+
+  @Nullable
+  @Override
+  public Dictionary getDictionary() {
+    return null;
+  }
+
+  @Override
+  public int[] getDictionaryIdsSV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public int[] getIntValuesSV() {
+    return DataBlockUtils.extractIntValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public long[] getLongValuesSV() {
+    return DataBlockUtils.extractLongValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public float[] getFloatValuesSV() {
+    return DataBlockUtils.extractFloatValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public double[] getDoubleValuesSV() {
+    return DataBlockUtils.extractDoubleValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public BigDecimal[] getBigDecimalValuesSV() {
+    return DataBlockUtils.extractBigDecimalValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public String[] getStringValuesSV() {
+    return DataBlockUtils.extractStringValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public byte[][] getBytesValuesSV() {
+    return DataBlockUtils.extractBytesValuesForColumn(_dataBlock, _index);
+  }
+
+  @Override
+  public int[][] getDictionaryIdsMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public int[][] getIntValuesMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public long[][] getLongValuesMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public float[][] getFloatValuesMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public double[][] getDoubleValuesMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public String[][] getStringValuesMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public byte[][][] getBytesValuesMV() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public int[] getNumMVEntries() {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/MinionConstants.java b/pinot-core/src/main/java/org/apache/pinot/core/common/MinionConstants.java
index 86bfa4829db..25c5427cf63 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/MinionConstants.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/MinionConstants.java
@@ -91,6 +91,9 @@ public static abstract class MergeTask {
     // Merge config
     public static final String MERGE_TYPE_KEY = "mergeType";
     public static final String AGGREGATION_TYPE_KEY_SUFFIX = ".aggregationType";
+    public static final String MODE = "mode";
+    public static final String PROCESS_FROM_WATERMARK_MODE = "processFromWatermark";
+    public static final String PROCESS_ALL_MODE = "processAll";
 
     // Segment config
     public static final String MAX_NUM_RECORDS_PER_TASK_KEY = "maxNumRecordsPerTask";
@@ -115,6 +118,9 @@ public static class MergeRollupTask extends MergeTask {
     public static final String SEGMENT_ZK_METADATA_TIME_KEY = TASK_TYPE + TASK_TIME_SUFFIX;
 
     public static final String MERGED_SEGMENT_NAME_PREFIX = "merged_";
+
+    // Custom segment group manager class name
+    public static final String SEGMENT_GROUP_MANAGER_CLASS_NAME_KEY = "segment.group.manager.class.name";
   }
 
   /**
@@ -133,4 +139,23 @@ public static class SegmentGenerationAndPushTask {
     public static final String CONFIG_NUMBER_CONCURRENT_TASKS_PER_INSTANCE =
         "SegmentGenerationAndPushTask.numConcurrentTasksPerInstance";
   }
+
+  public static class UpsertCompactionTask {
+    public static final String TASK_TYPE = "UpsertCompactionTask";
+    /**
+     * The time period to wait before picking segments for this task
+     * e.g. if set to "2d", no task will be scheduled for a time window younger than 2 days
+     */
+    public static final String BUFFER_TIME_PERIOD_KEY = "bufferTimePeriod";
+    /**
+     * The maximum percent of old records allowed for a completed segment.
+     * e.g. if the percent surpasses 30, then the segment may be compacted
+     */
+    public static final String INVALID_RECORDS_THRESHOLD_PERCENT = "invalidRecordsThresholdPercent";
+    /**
+     * The maximum count of old records for a completed segment
+     * e.g. if the count surpasses 100k, then the segment may be compacted
+     */
+    public static final String INVALID_RECORDS_THRESHOLD_COUNT = "invalidRecordsThresholdCount";
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/ObjectSerDeUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/common/ObjectSerDeUtils.java
index a01f02a5c90..d93ea17ee94 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/ObjectSerDeUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/ObjectSerDeUtils.java
@@ -57,9 +57,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.datasketches.kll.KllDoublesSketch;
 import org.apache.datasketches.memory.Memory;
 import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.datasketches.tuple.aninteger.IntegerSummaryDeserializer;
 import org.apache.pinot.common.CustomObject;
+import org.apache.pinot.core.query.aggregation.utils.argminmax.ArgMinMaxObject;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.core.query.utils.idset.IdSet;
 import org.apache.pinot.core.query.utils.idset.IdSets;
@@ -127,7 +131,10 @@ public enum ObjectType {
     StringLongPair(31),
     CovarianceTuple(32),
     VarianceTuple(33),
-    PinotFourthMoment(34);
+    PinotFourthMoment(34),
+    ArgMinMaxObject(35),
+    KllDataSketch(36),
+    IntegerTupleSketch(37);
 
     private final int _value;
 
@@ -176,6 +183,8 @@ public static ObjectType getObjectType(Object value) {
         return ObjectType.DistinctTable;
       } else if (value instanceof Sketch) {
         return ObjectType.DataSketch;
+      } else if (value instanceof KllDoublesSketch) {
+        return ObjectType.KllDataSketch;
       } else if (value instanceof Geometry) {
         return ObjectType.Geometry;
       } else if (value instanceof RoaringBitmap) {
@@ -213,6 +222,10 @@ public static ObjectType getObjectType(Object value) {
         return ObjectType.VarianceTuple;
       } else if (value instanceof PinotFourthMoment) {
         return ObjectType.PinotFourthMoment;
+      } else if (value instanceof org.apache.datasketches.tuple.Sketch) {
+        return ObjectType.IntegerTupleSketch;
+      } else if (value instanceof ArgMinMaxObject) {
+        return ObjectType.ArgMinMaxObject;
       } else {
         throw new IllegalArgumentException("Unsupported type of value: " + value.getClass().getSimpleName());
       }
@@ -918,6 +931,48 @@ public Sketch deserialize(ByteBuffer byteBuffer) {
     }
   };
 
+  public static final ObjectSerDe<org.apache.datasketches.tuple.Sketch<IntegerSummary>> DATA_SKETCH_INT_TUPLE_SER_DE =
+      new ObjectSerDe<org.apache.datasketches.tuple.Sketch<IntegerSummary>>() {
+        @Override
+        public byte[] serialize(org.apache.datasketches.tuple.Sketch<IntegerSummary> value) {
+          return value.compact().toByteArray();
+        }
+
+        @Override
+        public org.apache.datasketches.tuple.Sketch<IntegerSummary> deserialize(byte[] bytes) {
+          return org.apache.datasketches.tuple.Sketches.heapifySketch(Memory.wrap(bytes),
+              new IntegerSummaryDeserializer());
+        }
+
+        @Override
+        public org.apache.datasketches.tuple.Sketch<IntegerSummary> deserialize(ByteBuffer byteBuffer) {
+          byte[] bytes = new byte[byteBuffer.remaining()];
+          byteBuffer.get(bytes);
+          return org.apache.datasketches.tuple.Sketches.heapifySketch(Memory.wrap(bytes),
+              new IntegerSummaryDeserializer());
+        }
+      };
+
+  public static final ObjectSerDe<KllDoublesSketch> KLL_SKETCH_SER_DE = new ObjectSerDe<KllDoublesSketch>() {
+
+    @Override
+    public byte[] serialize(KllDoublesSketch value) {
+      return value.toByteArray();
+    }
+
+    @Override
+    public KllDoublesSketch deserialize(byte[] bytes) {
+      return KllDoublesSketch.wrap(Memory.wrap(bytes));
+    }
+
+    @Override
+    public KllDoublesSketch deserialize(ByteBuffer byteBuffer) {
+      byte[] bytes = new byte[byteBuffer.remaining()];
+      byteBuffer.get(bytes);
+      return KllDoublesSketch.wrap(Memory.wrap(bytes));
+    }
+  };
+
   public static final ObjectSerDe<Geometry> GEOMETRY_SER_DE = new ObjectSerDe<Geometry>() {
 
     @Override
@@ -1199,6 +1254,37 @@ public Double2LongOpenHashMap deserialize(ByteBuffer byteBuffer) {
     }
   };
 
+  public static final ObjectSerDe<ArgMinMaxObject> ARG_MIN_MAX_OBJECT_SER_DE =
+      new ObjectSerDe<ArgMinMaxObject>() {
+
+        @Override
+        public byte[] serialize(ArgMinMaxObject value) {
+          try {
+            return value.toBytes();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        }
+
+        @Override
+        public ArgMinMaxObject deserialize(byte[] bytes) {
+          try {
+            return ArgMinMaxObject.fromBytes(bytes);
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        }
+
+        @Override
+        public ArgMinMaxObject deserialize(ByteBuffer byteBuffer) {
+          try {
+            return ArgMinMaxObject.fromByteBuffer(byteBuffer);
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        }
+      };
+
   // NOTE: DO NOT change the order, it has to be the same order as the ObjectType
   //@formatter:off
   private static final ObjectSerDe[] SER_DES = {
@@ -1236,7 +1322,10 @@ public Double2LongOpenHashMap deserialize(ByteBuffer byteBuffer) {
       STRING_LONG_PAIR_SER_DE,
       COVARIANCE_TUPLE_OBJECT_SER_DE,
       VARIANCE_TUPLE_OBJECT_SER_DE,
-      PINOT_FOURTH_MOMENT_OBJECT_SER_DE
+      PINOT_FOURTH_MOMENT_OBJECT_SER_DE,
+      ARG_MIN_MAX_OBJECT_SER_DE,
+      KLL_SKETCH_SER_DE,
+      DATA_SKETCH_INT_TUPLE_SER_DE,
   };
   //@formatter:on
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java b/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java
index f86caf9798e..e8b812306d8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java
@@ -48,6 +48,26 @@ public interface Operator<T extends Block> {
   @Nullable
   String toExplainString();
 
+  default void prepareForExplainPlan(ExplainPlanRows explainPlanRows) {
+  }
+
+  default void explainPlan(ExplainPlanRows explainPlanRows, int[] globalId, int parentId) {
+    prepareForExplainPlan(explainPlanRows);
+    String explainPlanString = toExplainString();
+    if (explainPlanString != null) {
+      ExplainPlanRowData explainPlanRowData = new ExplainPlanRowData(explainPlanString, globalId[0], parentId);
+      parentId = globalId[0]++;
+      explainPlanRows.appendExplainPlanRowData(explainPlanRowData);
+    }
+
+    List<? extends Operator> children = getChildOperators();
+    for (Operator child : children) {
+      if (child != null) {
+        child.explainPlan(explainPlanRows, globalId, parentId);
+      }
+    }
+  }
+
   /**
    * Returns the index segment associated with the operator.
    */
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/RowBasedBlockValueFetcher.java b/pinot-core/src/main/java/org/apache/pinot/core/common/RowBasedBlockValueFetcher.java
index 64a3f6a788d..21c6d34f049 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/RowBasedBlockValueFetcher.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/RowBasedBlockValueFetcher.java
@@ -67,6 +67,8 @@ private ValueFetcher createFetcher(BlockValSet blockValSet) {
           return new StringSingleValueFetcher(blockValSet.getStringValuesSV());
         case BYTES:
           return new BytesValueFetcher(blockValSet.getBytesValuesSV());
+        case UNKNOWN:
+          return new UnknownValueFetcher();
         default:
           throw new IllegalStateException("Unsupported value type: " + storedType + " for single-value column");
       }
@@ -235,4 +237,13 @@ public String[] getValue(int docId) {
       return _values[docId];
     }
   }
+
+  private static class UnknownValueFetcher implements ValueFetcher {
+    UnknownValueFetcher() {
+    }
+
+    public Object getValue(int docId) {
+      return null;
+    }
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/datablock/DataBlockBuilder.java b/pinot-core/src/main/java/org/apache/pinot/core/common/datablock/DataBlockBuilder.java
index 573b3beadf7..8b486b40121 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/datablock/DataBlockBuilder.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/datablock/DataBlockBuilder.java
@@ -20,7 +20,6 @@
 
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -28,6 +27,7 @@
 import java.sql.Timestamp;
 import java.util.List;
 import javax.annotation.Nullable;
+import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
 import org.apache.pinot.common.CustomObject;
 import org.apache.pinot.common.datablock.ColumnarDataBlock;
 import org.apache.pinot.common.datablock.DataBlock;
@@ -56,29 +56,40 @@ public class DataBlockBuilder {
   private int _numColumns;
 
   private final Object2IntOpenHashMap<String> _dictionary = new Object2IntOpenHashMap<>();
-  private final ByteArrayOutputStream _fixedSizeDataByteArrayOutputStream = new ByteArrayOutputStream();
-  private final DataOutputStream _fixedSizeDataOutputStream = new DataOutputStream(_fixedSizeDataByteArrayOutputStream);
-  private final ByteArrayOutputStream _variableSizeDataByteArrayOutputStream = new ByteArrayOutputStream();
+  private final UnsynchronizedByteArrayOutputStream _fixedSizeDataByteArrayOutputStream;
+  private final DataOutputStream _fixedSizeDataOutputStream;
+  private final UnsynchronizedByteArrayOutputStream _variableSizeDataByteArrayOutputStream
+      = new UnsynchronizedByteArrayOutputStream(8192);
   private final DataOutputStream _variableSizeDataOutputStream =
       new DataOutputStream(_variableSizeDataByteArrayOutputStream);
 
-  private DataBlockBuilder(DataSchema dataSchema, DataBlock.Type blockType) {
+  private DataBlockBuilder(DataSchema dataSchema, DataBlock.Type blockType, int numRows) {
     _dataSchema = dataSchema;
     _columnDataTypes = dataSchema.getColumnDataTypes();
     _blockType = blockType;
     _numColumns = dataSchema.size();
-    if (_blockType == DataBlock.Type.COLUMNAR) {
-      _cumulativeColumnOffsetSizeInBytes = new int[_numColumns];
-      _columnSizeInBytes = new int[_numColumns];
-      DataBlockUtils.computeColumnSizeInBytes(_dataSchema, _columnSizeInBytes);
-      int cumulativeColumnOffset = 0;
-      for (int i = 0; i < _numColumns; i++) {
-        _cumulativeColumnOffsetSizeInBytes[i] = cumulativeColumnOffset;
-        cumulativeColumnOffset += _columnSizeInBytes[i] * _numRows;
-      }
-    } else if (_blockType == DataBlock.Type.ROW) {
+    if (_blockType == DataBlock.Type.ROW) {
       _columnOffsets = new int[_numColumns];
       _rowSizeInBytes = DataBlockUtils.computeColumnOffsets(dataSchema, _columnOffsets);
+
+      int nullBytes = _numColumns * 8; // we need 2 ints per column to store the roaring bitmaps offsets
+      int expectedFixedSizeStreamSize = (_rowSizeInBytes + nullBytes) * numRows;
+      _fixedSizeDataByteArrayOutputStream = new UnsynchronizedByteArrayOutputStream(expectedFixedSizeStreamSize);
+      _fixedSizeDataOutputStream = new DataOutputStream(_fixedSizeDataByteArrayOutputStream);
+    } else {
+      _fixedSizeDataByteArrayOutputStream = new UnsynchronizedByteArrayOutputStream(8192);
+      _fixedSizeDataOutputStream = new DataOutputStream(_fixedSizeDataByteArrayOutputStream);
+
+      if (_blockType == DataBlock.Type.COLUMNAR) {
+        _cumulativeColumnOffsetSizeInBytes = new int[_numColumns];
+        _columnSizeInBytes = new int[_numColumns];
+        DataBlockUtils.computeColumnSizeInBytes(_dataSchema, _columnSizeInBytes);
+        int cumulativeColumnOffset = 0;
+        for (int i = 0; i < _numColumns; i++) {
+          _cumulativeColumnOffsetSizeInBytes[i] = cumulativeColumnOffset;
+          cumulativeColumnOffset += _columnSizeInBytes[i] * _numRows;
+        }
+      }
     }
   }
 
@@ -96,7 +107,7 @@ public void setNullRowIds(@Nullable RoaringBitmap nullRowIds)
 
   public static RowDataBlock buildFromRows(List<Object[]> rows, DataSchema dataSchema)
       throws IOException {
-    DataBlockBuilder rowBuilder = new DataBlockBuilder(dataSchema, DataBlock.Type.ROW);
+    DataBlockBuilder rowBuilder = new DataBlockBuilder(dataSchema, DataBlock.Type.ROW, rows.size());
     // TODO: consolidate these null utils into data table utils.
     // Selection / Agg / Distinct all have similar code.
     int numColumns = rowBuilder._numColumns;
@@ -109,9 +120,10 @@ public static RowDataBlock buildFromRows(List<Object[]> rows, DataSchema dataSch
       nullPlaceholders[colId] = columnDataTypes[colId].convert(storedColumnDataTypes[colId].getNullPlaceholder());
     }
     rowBuilder._numRows = rows.size();
+    ByteBuffer byteBuffer = ByteBuffer.allocate(rowBuilder._rowSizeInBytes);
     for (int rowId = 0; rowId < rows.size(); rowId++) {
+      byteBuffer.clear();
       Object[] row = rows.get(rowId);
-      ByteBuffer byteBuffer = ByteBuffer.allocate(rowBuilder._rowSizeInBytes);
       for (int colId = 0; colId < rowBuilder._numColumns; colId++) {
         Object value = row[colId];
         if (value == null) {
@@ -217,6 +229,9 @@ public static RowDataBlock buildFromRows(List<Object[]> rows, DataSchema dataSch
             ArrayCopyUtils.copy(timestamps, longs, length);
             setColumn(rowBuilder, byteBuffer, longs);
             break;
+          case UNKNOWN:
+            setColumn(rowBuilder, byteBuffer, (Object) null);
+            break;
           default:
             throw new IllegalStateException(
                 String.format("Unsupported data type: %s for column: %s", rowBuilder._columnDataTypes[colId],
@@ -234,7 +249,8 @@ public static RowDataBlock buildFromRows(List<Object[]> rows, DataSchema dataSch
 
   public static ColumnarDataBlock buildFromColumns(List<Object[]> columns, DataSchema dataSchema)
       throws IOException {
-    DataBlockBuilder columnarBuilder = new DataBlockBuilder(dataSchema, DataBlock.Type.COLUMNAR);
+    int numRows = columns.isEmpty() ? 0 : columns.get(0).length;
+    DataBlockBuilder columnarBuilder = new DataBlockBuilder(dataSchema, DataBlock.Type.COLUMNAR, numRows);
 
     // TODO: consolidate these null utils into data table utils.
     // Selection / Agg / Distinct all have similar code.
@@ -462,6 +478,11 @@ public static ColumnarDataBlock buildFromColumns(List<Object[]> columns, DataSch
             setColumn(columnarBuilder, byteBuffer, (String[]) value);
           }
           break;
+        case UNKNOWN:
+          for (int rowId = 0; rowId < columnarBuilder._numRows; rowId++) {
+            setColumn(columnarBuilder, byteBuffer, (Object) null);
+          }
+          break;
         default:
           throw new IllegalStateException(
               String.format("Unsupported data type: %s for column: %s", columnarBuilder._columnDataTypes[colId],
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/datatable/DataTableBuilderFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/common/datatable/DataTableBuilderFactory.java
index 2bf0426a787..967233b2ee5 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/datatable/DataTableBuilderFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/datatable/DataTableBuilderFactory.java
@@ -34,7 +34,7 @@ private DataTableBuilderFactory() {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(DataTableBuilderFactory.class);
 
-  public static final int DEFAULT_VERSION = DataTableFactory.VERSION_3;
+  public static final int DEFAULT_VERSION = DataTableFactory.VERSION_4;
 
   private static int _version = DEFAULT_VERSION;
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java
index ff5a7693f64..04059f94c1b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/BaseTableDataManager.java
@@ -32,14 +32,17 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationConverter;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.helix.HelixManager;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
@@ -97,6 +100,7 @@ public abstract class BaseTableDataManager implements TableDataManager {
   protected File _resourceTmpDir;
   protected Logger _logger;
   protected HelixManager _helixManager;
+  protected ExecutorService _segmentPreloadExecutor;
   protected AuthProvider _authProvider;
   protected long _streamSegmentDownloadUntarRateLimitBytesPerSec;
   protected boolean _isStreamSegmentDownloadUntar;
@@ -107,9 +111,12 @@ public abstract class BaseTableDataManager implements TableDataManager {
   // Cache used for identifying segments which could not be acquired since they were recently deleted.
   protected Cache<String, String> _recentlyDeletedSegments;
 
+  protected volatile boolean _shutDown;
+
   @Override
   public void init(TableDataManagerConfig tableDataManagerConfig, String instanceId,
       ZkHelixPropertyStore<ZNRecord> propertyStore, ServerMetrics serverMetrics, HelixManager helixManager,
+      @Nullable ExecutorService segmentPreloadExecutor,
       @Nullable LoadingCache<Pair<String, String>, SegmentErrorInfo> errorCache,
       TableDataManagerParams tableDataManagerParams) {
     LOGGER.info("Initializing table data manager for table: {}", tableDataManagerConfig.getTableName());
@@ -119,6 +126,7 @@ public void init(TableDataManagerConfig tableDataManagerConfig, String instanceI
     _propertyStore = propertyStore;
     _serverMetrics = serverMetrics;
     _helixManager = helixManager;
+    _segmentPreloadExecutor = segmentPreloadExecutor;
 
     _authProvider =
         AuthProviderUtils.extractAuthProvider(toPinotConfiguration(_tableDataManagerConfig.getAuthConfig()), null);
@@ -182,12 +190,18 @@ public void start() {
   @Override
   public void shutDown() {
     _logger.info("Shutting down table data manager for table: {}", _tableNameWithType);
+    _shutDown = true;
     doShutdown();
     _logger.info("Shut down table data manager for table: {}", _tableNameWithType);
   }
 
   protected abstract void doShutdown();
 
+  @Override
+  public boolean isShutDown() {
+    return _shutDown;
+  }
+
   /**
    * {@inheritDoc}
    * <p>If one segment already exists with the same name, replaces it with the new one.
@@ -355,14 +369,13 @@ public void reloadSegment(String segmentName, IndexLoadingConfig indexLoadingCon
     indexLoadingConfig.setInstanceTierConfigs(_tableDataManagerConfig.getInstanceTierConfigs());
     File indexDir = getSegmentDataDir(segmentName, segmentTier, indexLoadingConfig.getTableConfig());
     try {
-      // Create backup directory to handle failure of segment reloading.
-      createBackup(indexDir);
-
       // Download segment from deep store if CRC changes or forced to download;
       // otherwise, copy backup directory back to the original index directory.
       // And then continue to load the segment from the index directory.
       boolean shouldDownload = forceDownload || !hasSameCRC(zkMetadata, localMetadata);
       if (shouldDownload && allowDownload(segmentName, zkMetadata)) {
+        // Create backup directory to handle failure of segment reloading.
+        createBackup(indexDir);
         if (forceDownload) {
           LOGGER.info("Segment: {} of table: {} is forced to download", segmentName, _tableNameWithType);
         } else {
@@ -373,12 +386,27 @@ public void reloadSegment(String segmentName, IndexLoadingConfig indexLoadingCon
       } else {
         LOGGER.info("Reload existing segment: {} of table: {} on tier: {}", segmentName, _tableNameWithType,
             TierConfigUtils.normalizeTierName(segmentTier));
+        SegmentDirectory segmentDirectory =
+            initSegmentDirectory(segmentName, String.valueOf(zkMetadata.getCrc()), indexLoadingConfig);
+        // We should first try to reuse existing segment directory
+        if (canReuseExistingDirectoryForReload(zkMetadata, segmentTier, segmentDirectory, indexLoadingConfig,
+            schema)) {
+          LOGGER.info("Reloading segment: {} of table: {} using existing segment directory as no reprocessing needed",
+              segmentName, _tableNameWithType);
+          // No reprocessing needed, reuse the same segment
+          ImmutableSegment segment = ImmutableSegmentLoader.load(segmentDirectory, indexLoadingConfig, schema);
+          addSegment(segment);
+          return;
+        }
+        // Create backup directory to handle failure of segment reloading.
+        createBackup(indexDir);
         // The indexDir is empty after calling createBackup, as it's renamed to a backup directory.
         // The SegmentDirectory should initialize accordingly. Like for SegmentLocalFSDirectory, it
         // doesn't load anything from an empty indexDir, but gets the info to complete the copyTo.
-        try (SegmentDirectory segmentDirectory = initSegmentDirectory(segmentName, String.valueOf(zkMetadata.getCrc()),
-            indexLoadingConfig)) {
+        try {
           segmentDirectory.copyTo(indexDir);
+        } finally {
+          segmentDirectory.close();
         }
       }
 
@@ -403,6 +431,16 @@ public void reloadSegment(String segmentName, IndexLoadingConfig indexLoadingCon
     }
   }
 
+  private boolean canReuseExistingDirectoryForReload(SegmentZKMetadata segmentZKMetadata,
+      String currentSegmentTier, SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig,
+      Schema schema)
+      throws Exception {
+    SegmentDirectoryLoader segmentDirectoryLoader =
+        SegmentDirectoryLoaderRegistry.getSegmentDirectoryLoader(indexLoadingConfig.getSegmentDirectoryLoader());
+    return !segmentDirectoryLoader.needsTierMigration(segmentZKMetadata.getTier(), currentSegmentTier)
+        && !ImmutableSegmentLoader.needPreprocess(segmentDirectory, indexLoadingConfig, schema);
+  }
+
   @Override
   public void addOrReplaceSegment(String segmentName, IndexLoadingConfig indexLoadingConfig,
       SegmentZKMetadata zkMetadata, @Nullable SegmentMetadata localMetadata)
@@ -595,14 +633,21 @@ private File downloadAndStreamUntarWithRateLimit(String segmentName, SegmentZKMe
     LOGGER.info("Trying to download segment {} using streamed download-untar with maxStreamRateInByte {}", segmentName,
         maxStreamRateInByte);
     String uri = zkMetadata.getDownloadUrl();
+    AtomicInteger attempts = new AtomicInteger(0);
     try {
-      File ret = SegmentFetcherFactory.fetchAndStreamUntarToLocal(uri, tempRootDir, maxStreamRateInByte);
-      LOGGER.info("Download and untarred segment: {} for table: {} from: {}", segmentName, _tableNameWithType, uri);
-      return ret;
-    } catch (AttemptsExceededException e) {
-      LOGGER.error("Attempts exceeded when stream download-untarring segment: {} for table: {} from: {} to: {}",
-          segmentName, _tableNameWithType, uri, tempRootDir);
-      _serverMetrics.addMeteredTableValue(_tableNameWithType, ServerMeter.SEGMENT_STREAMED_DOWNLOAD_UNTAR_FAILURES, 1L);
+        File ret = SegmentFetcherFactory.fetchAndStreamUntarToLocal(uri, tempRootDir, maxStreamRateInByte, attempts);
+        _serverMetrics.addMeteredTableValue(_tableNameWithType, ServerMeter.SEGMENT_STREAMED_DOWNLOAD_UNTAR_FAILURES,
+            attempts.get());
+        LOGGER.info("Downloaded and untarred segment: {} for table: {} from: {} attempts: {}", segmentName,
+            _tableNameWithType, uri, attempts.get());
+        return ret;
+    } catch (Exception e) {
+      _serverMetrics.addMeteredTableValue(_tableNameWithType, ServerMeter.SEGMENT_STREAMED_DOWNLOAD_UNTAR_FAILURES,
+          attempts.get());
+      if (e instanceof AttemptsExceededException) {
+        LOGGER.error("Attempts exceeded when stream download-untarring segment: {} for table: {} from: {} to: {}",
+            segmentName, _tableNameWithType, uri, tempRootDir);
+      }
       throw e;
     } finally {
       if (_segmentDownloadSemaphore != null) {
@@ -640,21 +685,18 @@ File getSegmentDataDir(String segmentName) {
     return new File(_indexDir, segmentName);
   }
 
-  @VisibleForTesting
-  File getSegmentDataDir(String segmentName, @Nullable String segmentTier, TableConfig tableConfig) {
+  @Override
+  public File getSegmentDataDir(String segmentName, @Nullable String segmentTier, TableConfig tableConfig) {
     if (segmentTier == null) {
       return getSegmentDataDir(segmentName);
     }
-    try {
-      String tierDataDir =
-          TierConfigUtils.getDataDirForTier(tableConfig, segmentTier, _tableDataManagerConfig.getInstanceTierConfigs());
-      File tierTableDataDir = new File(tierDataDir, _tableNameWithType);
-      return new File(tierTableDataDir, segmentName);
-    } catch (Exception e) {
-      LOGGER.warn("Failed to get dataDir for segment: {} of table: {} on tier: {} due to error: {}", segmentName,
-          _tableNameWithType, segmentTier, e.getMessage());
+    String tierDataDir =
+        TierConfigUtils.getDataDirForTier(tableConfig, segmentTier, _tableDataManagerConfig.getInstanceTierConfigs());
+    if (StringUtils.isEmpty(tierDataDir)) {
       return getSegmentDataDir(segmentName);
     }
+    File tierTableDataDir = new File(tierDataDir, _tableNameWithType);
+    return new File(tierTableDataDir, segmentName);
   }
 
   @Nullable
@@ -725,7 +767,8 @@ private void removeBackup(File indexDir)
    * object may be created when trying to load the segment, but it's closed if the method
    * returns false; otherwise it's opened and to be referred by ImmutableSegment object.
    */
-  protected boolean tryLoadExistingSegment(String segmentName, IndexLoadingConfig indexLoadingConfig,
+  @Override
+  public boolean tryLoadExistingSegment(String segmentName, IndexLoadingConfig indexLoadingConfig,
       SegmentZKMetadata zkMetadata) {
     // Try to recover the segment from potential segment reloading failure.
     String segmentTier = zkMetadata.getTier();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java
index 0e041021d27..bbc392d4d0c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/InstanceDataManager.java
@@ -46,6 +46,7 @@ public interface InstanceDataManager {
   /**
    * Initializes the data manager.
    * <p>Should be called only once and before calling any other method.
+   * <p>NOTE: The config is the subset of server config with prefix 'pinot.server.instance'
    */
   void init(PinotConfiguration config, HelixManager helixManager, ServerMetrics serverMetrics)
       throws ConfigurationException;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/ImmutableSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/ImmutableSegmentDataManager.java
index 71c79b941b6..1646ba77b9b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/ImmutableSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/ImmutableSegmentDataManager.java
@@ -44,7 +44,7 @@ public ImmutableSegment getSegment() {
   }
 
   @Override
-  public void destroy() {
+  protected void doDestroy() {
     _immutableSegment.destroy();
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/MemoryOptimizedDimensionTable.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/MemoryOptimizedDimensionTable.java
index 8f74015f018..ecaa4342b83 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/MemoryOptimizedDimensionTable.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/MemoryOptimizedDimensionTable.java
@@ -37,7 +37,7 @@ class MemoryOptimizedDimensionTable implements DimensionTable {
   private final Map<PrimaryKey, LookupRecordLocation> _lookupTable;
   private final Schema _tableSchema;
   private final List<String> _primaryKeyColumns;
-  private final GenericRow _reuse = new GenericRow();
+  private final ThreadLocal<GenericRow> _reuse = ThreadLocal.withInitial(GenericRow::new);
   private final List<SegmentDataManager> _segmentDataManagers;
   private final TableDataManager _tableDataManager;
 
@@ -62,7 +62,9 @@ public GenericRow get(PrimaryKey pk) {
     if (lookupRecordLocation == null) {
       return null;
     }
-    return lookupRecordLocation.getRecord(_reuse);
+    GenericRow reuse = _reuse.get();
+    reuse.clear();
+    return lookupRecordLocation.getRecord(reuse);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java
index 2a2671047a5..946ecf1565e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/offline/TableDataManagerProvider.java
@@ -19,8 +19,12 @@
 package org.apache.pinot.core.data.manager.offline;
 
 import com.google.common.cache.LoadingCache;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.helix.HelixManager;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
@@ -32,6 +36,9 @@
 import org.apache.pinot.segment.local.data.manager.TableDataManagerConfig;
 import org.apache.pinot.segment.local.data.manager.TableDataManagerParams;
 import org.apache.pinot.spi.config.instance.InstanceDataManagerConfig;
+import org.apache.pinot.spi.stream.StreamConfigProperties;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.IngestionConfigUtils;
 
 
 /**
@@ -55,13 +62,14 @@ public static void init(InstanceDataManagerConfig instanceDataManagerConfig) {
   public static TableDataManager getTableDataManager(TableDataManagerConfig tableDataManagerConfig, String instanceId,
       ZkHelixPropertyStore<ZNRecord> propertyStore, ServerMetrics serverMetrics, HelixManager helixManager,
       LoadingCache<Pair<String, String>, SegmentErrorInfo> errorCache) {
-    return getTableDataManager(tableDataManagerConfig, instanceId, propertyStore, serverMetrics, helixManager,
+    return getTableDataManager(tableDataManagerConfig, instanceId, propertyStore, serverMetrics, helixManager, null,
         errorCache, () -> true);
   }
 
   public static TableDataManager getTableDataManager(TableDataManagerConfig tableDataManagerConfig, String instanceId,
       ZkHelixPropertyStore<ZNRecord> propertyStore, ServerMetrics serverMetrics, HelixManager helixManager,
-      LoadingCache<Pair<String, String>, SegmentErrorInfo> errorCache, Supplier<Boolean> isServerReadyToServeQueries) {
+      @Nullable ExecutorService segmentPreloadExecutor, LoadingCache<Pair<String, String>, SegmentErrorInfo> errorCache,
+      Supplier<Boolean> isServerReadyToServeQueries) {
     TableDataManager tableDataManager;
     switch (tableDataManagerConfig.getTableType()) {
       case OFFLINE:
@@ -72,13 +80,21 @@ public static TableDataManager getTableDataManager(TableDataManagerConfig tableD
         }
         break;
       case REALTIME:
+        Map<String, String> streamConfigMap = IngestionConfigUtils.getStreamConfigMap(
+            tableDataManagerConfig.getTableConfig());
+        if (Boolean.parseBoolean(streamConfigMap.get(StreamConfigProperties.SERVER_UPLOAD_TO_DEEPSTORE))
+            && StringUtils.isEmpty(tableDataManagerConfig.getInstanceDataManagerConfig().getSegmentStoreUri())) {
+          throw new IllegalStateException(String.format("Table has enabled %s config. But the server has not "
+              + "configured the segmentstore uri. Configure the server config %s",
+              StreamConfigProperties.SERVER_UPLOAD_TO_DEEPSTORE, CommonConstants.Server.CONFIG_OF_SEGMENT_STORE_URI));
+        }
         tableDataManager = new RealtimeTableDataManager(_segmentBuildSemaphore, isServerReadyToServeQueries);
         break;
       default:
         throw new IllegalStateException();
     }
-    tableDataManager.init(tableDataManagerConfig, instanceId, propertyStore, serverMetrics, helixManager, errorCache,
-        _tableDataManagerParams);
+    tableDataManager.init(tableDataManagerConfig, instanceId, propertyStore, serverMetrics, helixManager,
+        segmentPreloadExecutor, errorCache, _tableDataManagerParams);
     return tableDataManager;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java
index aa16a321470..0e9538f2517 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java
@@ -143,13 +143,13 @@ public HLRealtimeSegmentDataManager(final SegmentZKMetadata segmentZKMetadata, f
     }
 
     // Inverted index columns
-    Set<String> invertedIndexColumns = indexLoadingConfig.getInvertedIndexColumns();
     // We need to add sorted column into inverted index columns because when we convert realtime in memory segment into
     // offline segment, we use sorted column's inverted index to maintain the order of the records so that the records
     // are sorted on the sorted column.
     if (_sortedColumn != null) {
-      invertedIndexColumns.add(_sortedColumn);
+      indexLoadingConfig.addInvertedIndexColumns(_sortedColumn);
     }
+    Set<String> invertedIndexColumns = indexLoadingConfig.getInvertedIndexColumns();
     _invertedIndexColumns = new ArrayList<>(invertedIndexColumns);
     _streamConfig = new StreamConfig(_tableNameWithType, IngestionConfigUtils.getStreamConfigMap(tableConfig));
 
@@ -159,7 +159,7 @@ public HLRealtimeSegmentDataManager(final SegmentZKMetadata segmentZKMetadata, f
         invertedIndexColumns);
 
     _segmentEndTimeThreshold = _start + _streamConfig.getFlushThresholdTimeMillis();
-    _resourceTmpDir = new File(resourceDataDir, "_tmp");
+    _resourceTmpDir = new File(resourceDataDir, RESOURCE_TEMP_DIR_NAME);
     if (!_resourceTmpDir.exists()) {
       _resourceTmpDir.mkdirs();
     }
@@ -180,19 +180,19 @@ public HLRealtimeSegmentDataManager(final SegmentZKMetadata segmentZKMetadata, f
     // lets create a new realtime segment
     _segmentLogger.info("Started {} stream provider", _streamConfig.getType());
     final int capacity = _streamConfig.getFlushThresholdRows();
+    boolean nullHandlingEnabled = indexingConfig != null && indexingConfig.isNullHandlingEnabled();
     RealtimeSegmentConfig realtimeSegmentConfig =
-        new RealtimeSegmentConfig.Builder().setTableNameWithType(_tableNameWithType).setSegmentName(_segmentName)
+        new RealtimeSegmentConfig.Builder(indexLoadingConfig).setTableNameWithType(_tableNameWithType)
+            .setSegmentName(_segmentName)
             .setStreamName(_streamConfig.getTopicName()).setSchema(schema).setTimeColumnName(_timeColumnName)
             .setCapacity(capacity).setAvgNumMultiValues(indexLoadingConfig.getRealtimeAvgMultiValueCount())
-            .setNoDictionaryColumns(indexLoadingConfig.getNoDictionaryColumns())
-            .setVarLengthDictionaryColumns(indexLoadingConfig.getVarLengthDictionaryColumns())
-            .setInvertedIndexColumns(invertedIndexColumns).setSegmentZKMetadata(segmentZKMetadata)
+            .setSegmentZKMetadata(segmentZKMetadata)
             .setOffHeap(indexLoadingConfig.isRealtimeOffHeapAllocation()).setMemoryManager(
             getMemoryManager(realtimeTableDataManager.getConsumerDir(), _segmentName,
                 indexLoadingConfig.isRealtimeOffHeapAllocation(),
                 indexLoadingConfig.isDirectRealtimeOffHeapAllocation(), serverMetrics))
             .setStatsHistory(realtimeTableDataManager.getStatsHistory())
-            .setNullHandlingEnabled(indexingConfig.isNullHandlingEnabled()).build();
+            .setNullHandlingEnabled(nullHandlingEnabled).build();
     _realtimeSegment = new MutableSegmentImpl(realtimeSegmentConfig, serverMetrics);
 
     _notifier = realtimeTableDataManager;
@@ -469,7 +469,7 @@ private void updateCurrentDocumentCountMetrics() {
   }
 
   @Override
-  public void destroy() {
+  protected void doDestroy() {
     LOGGER.info("Trying to shutdown RealtimeSegmentDataManager : {}!", _segmentName);
     _isShuttingDown = true;
     try {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTracker.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTracker.java
index 64528661954..57ca21def13 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTracker.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTracker.java
@@ -76,6 +76,15 @@
 
 public class IngestionDelayTracker {
 
+  // Class to wrap supported timestamps collected for an ingested event
+  private static class IngestionTimestamps {
+    IngestionTimestamps(long ingestionTimesMs, long firstStreamIngestionTimeMs) {
+      _ingestionTimeMs = ingestionTimesMs;
+      _firstStreamIngestionTimeMs = firstStreamIngestionTimeMs;
+    }
+    private final long _ingestionTimeMs;
+    private final long _firstStreamIngestionTimeMs;
+  }
   // Sleep interval for timer thread that triggers read of ideal state
   private static final int TIMER_THREAD_TICK_INTERVAL_MS = 300000; // 5 minutes +/- precision in timeouts
   // Once a partition is marked for verification, we wait 10 minutes to pull its ideal state.
@@ -85,7 +94,7 @@ public class IngestionDelayTracker {
   private static final Logger _logger = LoggerFactory.getLogger(IngestionDelayTracker.class.getSimpleName());
 
   // HashMap used to store ingestion time measures for all partitions active for the current table.
-  private final Map<Integer, Long> _partitionToIngestionTimeMsMap = new ConcurrentHashMap<>();
+  private final Map<Integer, IngestionTimestamps> _partitionToIngestionTimestampsMap = new ConcurrentHashMap<>();
   // We mark partitions that go from CONSUMING to ONLINE in _partitionsMarkedForVerification: if they do not
   // go back to CONSUMING in some period of time, we verify whether they are still hosted in this server by reading
   // ideal state. This is done with the goal of minimizing reading ideal state for efficiency reasons.
@@ -141,9 +150,9 @@ public IngestionDelayTracker(ServerMetrics serverMetrics, String tableNameWithTy
    *
    * @param ingestionTimeMs original ingestion time in milliseconds.
    */
-  private long getIngestionDelayMs(Long ingestionTimeMs) {
-    if (ingestionTimeMs == null) {
-      return 0; // return 0 when not initialized
+  private long getIngestionDelayMs(long ingestionTimeMs) {
+    if (ingestionTimeMs < 0) {
+      return 0;
     }
     // Compute aged delay for current partition
     long agedIngestionDelayMs = _clock.millis() - ingestionTimeMs;
@@ -159,7 +168,7 @@ private long getIngestionDelayMs(Long ingestionTimeMs) {
    * @param partitionGroupId partition ID which we should stop tracking.
    */
   private void removePartitionId(int partitionGroupId) {
-    _partitionToIngestionTimeMsMap.remove(partitionGroupId);
+    _partitionToIngestionTimestampsMap.remove(partitionGroupId);
     // If we are removing a partition we should stop reading its ideal state.
     _partitionsMarkedForVerification.remove(partitionGroupId);
     _serverMetrics.removePartitionGauge(_metricName, partitionGroupId, ServerGauge.REALTIME_INGESTION_DELAY_MS);
@@ -196,21 +205,36 @@ void setClock(Clock clock) {
    * Called by LLRealTimeSegmentDataManagers to post ingestion time updates to this tracker class.
    *
    * @param ingestionTimeMs ingestion time being recorded.
+   * @param firstStreamIngestionTimeMs time the event was ingested in the first stage of the ingestion pipeline.
    * @param partitionGroupId partition ID for which this ingestion time is being recorded.
    */
-  public void updateIngestionDelay(long ingestionTimeMs, int partitionGroupId) {
+  public void updateIngestionDelay(long ingestionTimeMs, long firstStreamIngestionTimeMs, int partitionGroupId) {
     // Store new measure and wipe old one for this partition
-    // TODO: see if we can install gauges after the server is ready.
     if (!_isServerReadyToServeQueries.get()) {
       // Do not update the ingestion delay metrics during server startup period
       return;
     }
-    Long previousMeasure = _partitionToIngestionTimeMsMap.put(partitionGroupId,
-        ingestionTimeMs);
+    if ((ingestionTimeMs < 0) && (firstStreamIngestionTimeMs < 0)) {
+      // If stream does not return a valid ingestion timestamps don't publish a metric
+      return;
+    }
+    IngestionTimestamps previousMeasure = _partitionToIngestionTimestampsMap.put(partitionGroupId,
+        new IngestionTimestamps(ingestionTimeMs, firstStreamIngestionTimeMs));
     if (previousMeasure == null) {
       // First time we start tracking a partition we should start tracking it via metric
-      _serverMetrics.setOrUpdatePartitionGauge(_metricName, partitionGroupId,
-          ServerGauge.REALTIME_INGESTION_DELAY_MS, () -> getPartitionIngestionDelayMs(partitionGroupId));
+      // Only publish the metric if supported by the underlying stream. If not supported the stream
+      // returns Long.MIN_VALUE
+      if (ingestionTimeMs >= 0) {
+        _serverMetrics.setOrUpdatePartitionGauge(_metricName, partitionGroupId, ServerGauge.REALTIME_INGESTION_DELAY_MS,
+            () -> getPartitionIngestionDelayMs(partitionGroupId));
+      }
+      if (firstStreamIngestionTimeMs >= 0) {
+        // Only publish this metric when creation time is supported by the underlying stream
+        // When this timestamp is not supported it always returns the value Long.MIN_VALUE
+        _serverMetrics.setOrUpdatePartitionGauge(_metricName, partitionGroupId,
+            ServerGauge.END_TO_END_REALTIME_INGESTION_DELAY_MS,
+            () -> getPartitionEndToEndIngestionDelayMs(partitionGroupId));
+      }
     }
     // If we are consuming we do not need to track this partition for removal.
     _partitionsMarkedForVerification.remove(partitionGroupId);
@@ -283,8 +307,27 @@ public void markPartitionForVerification(int partitionGroupId) {
    */
   public long getPartitionIngestionDelayMs(int partitionGroupId) {
     // Not protected as this will only be invoked when metric is installed which happens after server ready
-    Long currentMeasure = _partitionToIngestionTimeMsMap.get(partitionGroupId);
-    return getIngestionDelayMs(currentMeasure);
+    IngestionTimestamps currentMeasure = _partitionToIngestionTimestampsMap.get(partitionGroupId);
+    if (currentMeasure == null) { // Guard just in case we read the metric without initializing it
+      return 0;
+    }
+    return getIngestionDelayMs(currentMeasure._ingestionTimeMs);
+  }
+
+  /*
+   * Method to get end to end ingestion delay for a given partition.
+   *
+   * @param partitionGroupId partition for which we are retrieving the delay
+   *
+   * @return End to end ingestion delay in milliseconds for the given partition ID.
+   */
+  public long getPartitionEndToEndIngestionDelayMs(int partitionGroupId) {
+    // Not protected as this will only be invoked when metric is installed which happens after server ready
+    IngestionTimestamps currentMeasure = _partitionToIngestionTimestampsMap.get(partitionGroupId);
+    if (currentMeasure == null) { // Guard just in case we read the metric without initializing it
+      return 0;
+    }
+    return getIngestionDelayMs(currentMeasure._firstStreamIngestionTimeMs);
   }
 
   /*
@@ -299,7 +342,7 @@ public void shutdown() {
       return;
     }
     // Remove partitions so their related metrics get uninstalled.
-    for (Map.Entry<Integer, Long> entry : _partitionToIngestionTimeMsMap.entrySet()) {
+    for (Map.Entry<Integer, IngestionTimestamps> entry : _partitionToIngestionTimestampsMap.entrySet()) {
       removePartitionId(entry.getKey());
     }
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
index 45570b59a42..6b9905ab168 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BooleanSupplier;
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.common.Utils;
@@ -230,8 +231,9 @@ public void deleteSegmentFile() {
   // modify the permit. This boolean make sure the semaphore gets released only once when the partition group stops
   // consuming.
   private final AtomicBoolean _acquiredConsumerSemaphore;
-  private final String _metricKeyName;
   private final ServerMetrics _serverMetrics;
+  private final PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
+  private final BooleanSupplier _isReadyToConsumeData;
   private final MutableSegmentImpl _realtimeSegment;
   private volatile StreamPartitionMsgOffset _currentOffset;
   private volatile State _state;
@@ -263,7 +265,6 @@ public void deleteSegmentFile() {
   private final int _partitionGroupId;
   private final PartitionGroupConsumptionStatus _partitionGroupConsumptionStatus;
   final String _clientId;
-  private final LLCSegmentName _llcSegmentName;
   private final TransformPipeline _transformPipeline;
   private PartitionGroupConsumer _partitionGroupConsumer = null;
   private StreamMetadataProvider _partitionMetadataProvider = null;
@@ -293,6 +294,7 @@ public void deleteSegmentFile() {
   private final ConsumptionRateLimiter _rateLimiter;
 
   private final StreamPartitionMsgOffset _latestStreamOffsetAtStartupTime;
+  private final CompletionMode _segmentCompletionMode;
 
   // TODO each time this method is called, we print reason for stop. Good to print only once.
   private boolean endCriteriaReached() {
@@ -395,6 +397,10 @@ private void handleTransientStreamErrors(Exception e)
 
   protected boolean consumeLoop()
       throws Exception {
+    // At this point, we know that we can potentially move the offset, so the old saved segment file is not valid
+    // anymore. Remove the file if it exists.
+    removeSegmentFile();
+
     _numRowsErrored = 0;
     final long idlePipeSleepTimeMillis = 100;
     final long idleTimeoutMillis = _partitionLevelStreamConfig.getIdleTimeoutMillis();
@@ -403,9 +409,6 @@ protected boolean consumeLoop()
 
     StreamPartitionMsgOffset lastUpdatedOffset = _streamPartitionMsgOffsetFactory
         .create(_currentOffset);  // so that we always update the metric when we enter this method.
-    // At this point, we know that we can potentially move the offset, so the old saved segment file is not valid
-    // anymore. Remove the file if it exists.
-    removeSegmentFile();
 
     _segmentLogger.info("Starting consumption loop start offset {}, finalOffset {}", _currentOffset, _finalOffset);
     while (!_shouldStop && !endCriteriaReached()) {
@@ -445,10 +448,10 @@ protected boolean consumeLoop()
         // TODO Issue 5359 Need to find a way to bump metrics without getting actual offset value.
         if (_currentOffset instanceof LongMsgOffset) {
           // TODO: only LongMsgOffset supplies long offset value.
-          _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.HIGHEST_STREAM_OFFSET_CONSUMED,
+          _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.HIGHEST_STREAM_OFFSET_CONSUMED,
               ((LongMsgOffset) _currentOffset).getOffset());
         }
-        _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 1);
+        _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 1);
         lastUpdatedOffset = _streamPartitionMsgOffsetFactory.create(_currentOffset);
       } else if (endCriteriaReached) {
         // At this point current offset has not moved because processStreamEvents() has exited before processing a
@@ -479,7 +482,7 @@ protected boolean consumeLoop()
           if (totalIdleTimeMillis > idleTimeoutMillis) {
             // Update the partition-consuming metric only if we have been idling beyond idle timeout.
             // Create a new stream consumer wrapper, in case we are stuck on something.
-            _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 1);
+            _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 1);
             recreateStreamConsumer(
                 String.format("Total idle time: %d ms exceeded idle timeout: %d ms", totalIdleTimeMillis,
                     idleTimeoutMillis));
@@ -495,7 +498,7 @@ protected boolean consumeLoop()
     }
 
     if (_numRowsErrored > 0) {
-      _serverMetrics.addMeteredTableValue(_metricKeyName, ServerMeter.ROWS_WITH_ERRORS, _numRowsErrored);
+      _serverMetrics.addMeteredTableValue(_clientId, ServerMeter.ROWS_WITH_ERRORS, _numRowsErrored);
       _serverMetrics.addMeteredTableValue(_tableStreamName, ServerMeter.ROWS_WITH_ERRORS, _numRowsErrored);
     }
     return true;
@@ -518,9 +521,12 @@ private boolean processStreamEvents(MessageBatch messagesAndOffsets, long idlePi
     int indexedMessageCount = 0;
     int streamMessageCount = 0;
     boolean canTakeMore = true;
+    boolean hasTransformedRows = false;
 
     TransformPipeline.Result reusedResult = new TransformPipeline.Result();
     boolean prematureExit = false;
+    RowMetadata msgMetadata = null;
+
     for (int index = 0; index < messageCount; index++) {
       prematureExit = _shouldStop || endCriteriaReached();
       if (prematureExit) {
@@ -553,13 +559,14 @@ private boolean processStreamEvents(MessageBatch messagesAndOffsets, long idlePi
 
       // Decode message
       StreamDataDecoderResult decodedRow = _streamDataDecoder.decode(messagesAndOffsets.getStreamMessage(index));
-      RowMetadata msgMetadata = messagesAndOffsets.getStreamMessage(index).getMetadata();
+      msgMetadata = messagesAndOffsets.getStreamMessage(index).getMetadata();
       if (decodedRow.getException() != null) {
         // TODO: based on a config, decide whether the record should be silently dropped or stop further consumption on
         // decode error
         realtimeRowsDroppedMeter =
-            _serverMetrics.addMeteredTableValue(_metricKeyName, ServerMeter.INVALID_REALTIME_ROWS_DROPPED, 1,
+            _serverMetrics.addMeteredTableValue(_clientId, ServerMeter.INVALID_REALTIME_ROWS_DROPPED, 1,
                 realtimeRowsDroppedMeter);
+        _numRowsErrored++;
       } else {
         try {
           _transformPipeline.processRow(decodedRow.getResult(), reusedResult);
@@ -569,27 +576,30 @@ private boolean processStreamEvents(MessageBatch messagesAndOffsets, long idlePi
           reusedResult.getTransformedRows().clear();
           String errorMessage = String.format("Caught exception while transforming the record: %s", decodedRow);
           _segmentLogger.error(errorMessage, e);
-          _realtimeTableDataManager.addSegmentError(_segmentNameStr,
-              new SegmentErrorInfo(now(), errorMessage, e));
+          _realtimeTableDataManager.addSegmentError(_segmentNameStr, new SegmentErrorInfo(now(), errorMessage, e));
         }
         if (reusedResult.getSkippedRowCount() > 0) {
           realtimeRowsDroppedMeter =
-              _serverMetrics.addMeteredTableValue(_metricKeyName, ServerMeter.INVALID_REALTIME_ROWS_DROPPED,
+              _serverMetrics.addMeteredTableValue(_clientId, ServerMeter.REALTIME_ROWS_FILTERED,
                   reusedResult.getSkippedRowCount(), realtimeRowsDroppedMeter);
         }
         if (reusedResult.getIncompleteRowCount() > 0) {
           realtimeIncompleteRowsConsumedMeter =
-              _serverMetrics.addMeteredTableValue(_metricKeyName, ServerMeter.INCOMPLETE_REALTIME_ROWS_CONSUMED,
+              _serverMetrics.addMeteredTableValue(_clientId, ServerMeter.INCOMPLETE_REALTIME_ROWS_CONSUMED,
                   reusedResult.getIncompleteRowCount(), realtimeIncompleteRowsConsumedMeter);
         }
-        for (GenericRow transformedRow : reusedResult.getTransformedRows()) {
+        List<GenericRow> transformedRows = reusedResult.getTransformedRows();
+        if (transformedRows.size() > 0) {
+          hasTransformedRows = true;
+        }
+        for (GenericRow transformedRow : transformedRows) {
           try {
             canTakeMore = _realtimeSegment.index(transformedRow, msgMetadata);
             indexedMessageCount++;
             _lastRowMetadata = msgMetadata;
             _lastConsumedTimestampMs = System.currentTimeMillis();
             realtimeRowsConsumedMeter =
-                _serverMetrics.addMeteredTableValue(_metricKeyName, ServerMeter.REALTIME_ROWS_CONSUMED, 1,
+                _serverMetrics.addMeteredTableValue(_clientId, ServerMeter.REALTIME_ROWS_CONSUMED, 1,
                     realtimeRowsConsumedMeter);
           } catch (Exception e) {
             _numRowsErrored++;
@@ -605,17 +615,31 @@ private boolean processStreamEvents(MessageBatch messagesAndOffsets, long idlePi
       _numRowsConsumed++;
       streamMessageCount++;
     }
-    updateIngestionDelay(indexedMessageCount);
+
+    if (indexedMessageCount > 0) {
+      // Record Ingestion delay for this partition with metadata for last message we processed
+      updateIngestionDelay(_lastRowMetadata);
+    } else if (!hasTransformedRows && (msgMetadata != null)) {
+      // If all messages were filtered by transformation, we still attempt to update ingestion delay using
+      // the metadata for the last message we processed if any.
+      updateIngestionDelay(msgMetadata);
+    }
+
     updateCurrentDocumentCountMetrics();
     if (messagesAndOffsets.getUnfilteredMessageCount() > 0) {
       _hasMessagesFetched = true;
+      if (messageCount == 0) {
+        // If we received events from the stream but all were filtered, we attempt to estimate the ingestion
+        // delay from the metadata of the last filtered message received.
+        updateIngestionDelay(messagesAndOffsets.getLastMessageMetadata());
+      }
       if (streamMessageCount > 0 && _segmentLogger.isDebugEnabled()) {
         _segmentLogger.debug("Indexed {} messages ({} messages read from stream) current offset {}",
             indexedMessageCount, streamMessageCount, _currentOffset);
       }
     } else if (!prematureExit) {
       // Record Pinot ingestion delay as zero since we are up-to-date and no new events
-      _realtimeTableDataManager.updateIngestionDelay(System.currentTimeMillis(), _partitionGroupId);
+      setIngestionDelayToZero();
       if (_segmentLogger.isDebugEnabled()) {
         _segmentLogger.debug("empty batch received - sleeping for {}ms", idlePipeSleepTimeMillis);
       }
@@ -632,24 +656,47 @@ public void run() {
       long catchUpTimeMillis = 0L;
       _startTimeMs = now();
       try {
+        if (!_isReadyToConsumeData.getAsBoolean()) {
+          do {
+            //noinspection BusyWait
+            Thread.sleep(RealtimeTableDataManager.READY_TO_CONSUME_DATA_CHECK_INTERVAL_MS);
+          } while (!_shouldStop && !_isReadyToConsumeData.getAsBoolean());
+        }
+
+        // TODO:
+        //   When reaching here, the current consuming segment has already acquired the consumer semaphore, but there is
+        //   no guarantee that the previous consuming segment is already persisted (replaced with immutable segment). It
+        //   can potentially cause the following problems:
+        //   1. The snapshot for the previous consuming segment might not be taken since it is not persisted yet
+        //   2. If the previous consuming segment is dropped but immutable segment is not downloaded and replaced yet,
+        //      it might cause inconsistency (especially for partial upsert because events are not consumed in sequence)
+        //   To address this problem, we should consider releasing the consumer semaphore after the consuming segment is
+        //   persisted.
+        // Take upsert snapshot before starting consuming events
+        if (_partitionUpsertMetadataManager != null) {
+          _partitionUpsertMetadataManager.takeSnapshot();
+          // If upsertTTL is enabled, we will remove expired primary keys from upsertMetadata after taking snapshot.
+          _partitionUpsertMetadataManager.removeExpiredPrimaryKeys();
+        }
+
         while (!_state.isFinal()) {
           if (_state.shouldConsume()) {
             consumeLoop();  // Consume until we reached the end criteria, or we are stopped.
           }
-          _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 0);
+          _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 0);
           if (_shouldStop) {
             break;
           }
 
           if (_state == State.INITIAL_CONSUMING) {
             initialConsumptionEnd = now();
-            _serverMetrics.setValueOfTableGauge(_metricKeyName,
+            _serverMetrics.setValueOfTableGauge(_clientId,
                 ServerGauge.LAST_REALTIME_SEGMENT_INITIAL_CONSUMPTION_DURATION_SECONDS,
                 TimeUnit.MILLISECONDS.toSeconds(initialConsumptionEnd - _startTimeMs));
           } else if (_state == State.CATCHING_UP) {
             catchUpTimeMillis += now() - lastCatchUpStart;
             _serverMetrics
-                .setValueOfTableGauge(_metricKeyName, ServerGauge.LAST_REALTIME_SEGMENT_CATCHUP_DURATION_SECONDS,
+                .setValueOfTableGauge(_clientId, ServerGauge.LAST_REALTIME_SEGMENT_CATCHUP_DURATION_SECONDS,
                     TimeUnit.MILLISECONDS.toSeconds(catchUpTimeMillis));
           }
 
@@ -657,7 +704,6 @@ public void run() {
           _state = State.HOLDING;
           SegmentCompletionProtocol.Response response = postSegmentConsumedMsg();
           SegmentCompletionProtocol.ControllerResponseStatus status = response.getStatus();
-          StreamPartitionMsgOffset rspOffset = extractOffset(response);
           boolean success;
           switch (status) {
             case NOT_LEADER:
@@ -666,6 +712,7 @@ public void run() {
               hold();
               break;
             case CATCH_UP:
+              StreamPartitionMsgOffset rspOffset = extractOffset(response);
               if (rspOffset.compareTo(_currentOffset) <= 0) {
                 // Something wrong with the controller. Back off and try again.
                 _segmentLogger.error("Invalid catchup offset {} in controller response, current offset {}", rspOffset,
@@ -687,8 +734,7 @@ public void run() {
               break;
             case KEEP:
               _state = State.RETAINING;
-              CompletionMode segmentCompletionMode = getSegmentCompletionMode();
-              switch (segmentCompletionMode) {
+              switch (_segmentCompletionMode) {
                 case DOWNLOAD:
                   _state = State.DISCARDED;
                   break;
@@ -742,7 +788,7 @@ public void run() {
         _state = State.ERROR;
         _realtimeTableDataManager
             .addSegmentError(_segmentNameStr, new SegmentErrorInfo(now(), errorMessage, e));
-        _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 0);
+        _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 0);
         return;
       }
 
@@ -750,7 +796,7 @@ public void run() {
 
       if (initialConsumptionEnd != 0L) {
         _serverMetrics
-            .setValueOfTableGauge(_metricKeyName, ServerGauge.LAST_REALTIME_SEGMENT_COMPLETION_DURATION_SECONDS,
+            .setValueOfTableGauge(_clientId, ServerGauge.LAST_REALTIME_SEGMENT_COMPLETION_DURATION_SECONDS,
                 TimeUnit.MILLISECONDS.toSeconds(now() - initialConsumptionEnd));
       }
       // There is a race condition that the destroy() method can be called which ends up calling stop on the consumer.
@@ -760,24 +806,11 @@ public void run() {
       // so it is ok not to mark it non-consuming, as the main thread will clean up this metric in destroy() method
       // as the final step.
       if (!_shouldStop) {
-        _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 0);
+        _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 0);
       }
     }
   }
 
-  /**
-   * Fetches the completion mode for the segment completion for the given realtime table
-   */
-  private CompletionMode getSegmentCompletionMode() {
-    CompletionConfig completionConfig = _tableConfig.getValidationConfig().getCompletionConfig();
-    if (completionConfig != null) {
-      if (CompletionMode.DOWNLOAD.toString().equalsIgnoreCase(completionConfig.getCompletionMode())) {
-        return CompletionMode.DOWNLOAD;
-      }
-    }
-    return CompletionMode.DEFAULT;
-  }
-
   @VisibleForTesting
   protected StreamPartitionMsgOffset extractOffset(SegmentCompletionProtocol.Response response) {
     if (response.getStreamPartitionMsgOffset() != null) {
@@ -847,7 +880,6 @@ public Map<String, PartitionLagState> getPartitionToLagState(
     if (_partitionMetadataProvider == null) {
       createPartitionMetadataProvider("Get Partition Lag State");
     }
-    ;
     return _partitionMetadataProvider.getCurrentPartitionLagState(consumerPartitionStateMap);
   }
 
@@ -876,6 +908,11 @@ protected AtomicBoolean getAcquiredConsumerSemaphore() {
 
   protected SegmentBuildDescriptor buildSegmentInternal(boolean forCommit) {
     closeStreamConsumers();
+    // Do not allow building segment when table data manager is already shut down
+    if (_realtimeTableDataManager.isShutDown()) {
+      _segmentLogger.warn("Table data manager is already shut down");
+      return null;
+    }
     try {
       final long startTimeMillis = now();
       if (_segBuildSemaphore != null) {
@@ -934,9 +971,9 @@ protected SegmentBuildDescriptor buildSegmentInternal(boolean forCommit) {
       }
 
       long segmentSizeBytes = FileUtils.sizeOfDirectory(indexDir);
-      _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LAST_REALTIME_SEGMENT_CREATION_DURATION_SECONDS,
+      _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LAST_REALTIME_SEGMENT_CREATION_DURATION_SECONDS,
           TimeUnit.MILLISECONDS.toSeconds(buildTimeMillis));
-      _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LAST_REALTIME_SEGMENT_CREATION_WAIT_TIME_SECONDS,
+      _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LAST_REALTIME_SEGMENT_CREATION_WAIT_TIME_SECONDS,
           TimeUnit.MILLISECONDS.toSeconds(waitTimeMillis));
 
       if (forCommit) {
@@ -1003,6 +1040,8 @@ protected boolean commitSegment(String controllerVipUrl, boolean isSplitCommit)
     SegmentCompletionProtocol.Response commitResponse = commit(controllerVipUrl, isSplitCommit);
 
     if (!commitResponse.getStatus().equals(SegmentCompletionProtocol.ControllerResponseStatus.COMMIT_SUCCESS)) {
+      _segmentLogger.warn("Controller response was {} and not {}", commitResponse.getStatus(),
+          SegmentCompletionProtocol.ControllerResponseStatus.COMMIT_SUCCESS);
       return false;
     }
 
@@ -1078,7 +1117,7 @@ private void closePartitionMetadataProvider() {
    * which no longer resides in this host any more, thus causes false positive information to the metric system.
    */
   private void cleanupMetrics() {
-    _serverMetrics.removeTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING);
+    _serverMetrics.removeTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING);
   }
 
   protected void hold() {
@@ -1127,7 +1166,7 @@ private void removeSegmentFile() {
 
   public void goOnlineFromConsuming(SegmentZKMetadata segmentZKMetadata)
       throws InterruptedException {
-    _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 0);
+    _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 0);
     try {
       // Remove the segment file before we do anything else.
       removeSegmentFile();
@@ -1154,11 +1193,10 @@ public void goOnlineFromConsuming(SegmentZKMetadata segmentZKMetadata)
         case CATCHING_UP:
         case HOLDING:
         case INITIAL_CONSUMING:
-          CompletionMode segmentCompletionMode = getSegmentCompletionMode();
-          switch (segmentCompletionMode) {
+          switch (_segmentCompletionMode) {
             case DOWNLOAD:
               _segmentLogger.info("State {}. CompletionMode {}. Downloading to replace", _state.toString(),
-                  segmentCompletionMode);
+                  _segmentCompletionMode);
               downloadSegmentAndReplace(segmentZKMetadata);
               break;
             case DEFAULT:
@@ -1199,7 +1237,7 @@ public void goOnlineFromConsuming(SegmentZKMetadata segmentZKMetadata)
     } catch (Exception e) {
       Utils.rethrowException(e);
     } finally {
-      _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 0);
+      _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 0);
     }
   }
 
@@ -1225,7 +1263,7 @@ private boolean catchupToFinalOffset(StreamPartitionMsgOffset endOffset, long ti
       _segmentLogger.warn("Exception when catching up to final offset", e);
       return false;
     } finally {
-      _serverMetrics.setValueOfTableGauge(_metricKeyName, ServerGauge.LLC_PARTITION_CONSUMING, 0);
+      _serverMetrics.setValueOfTableGauge(_clientId, ServerGauge.LLC_PARTITION_CONSUMING, 0);
     }
     if (_currentOffset.compareTo(endOffset) != 0) {
       // Timeout?
@@ -1236,7 +1274,7 @@ private boolean catchupToFinalOffset(StreamPartitionMsgOffset endOffset, long ti
     return true;
   }
 
-  public void destroy() {
+  protected void doDestroy() {
     try {
       stop();
     } catch (InterruptedException e) {
@@ -1277,7 +1315,7 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
       RealtimeTableDataManager realtimeTableDataManager, String resourceDataDir, IndexLoadingConfig indexLoadingConfig,
       Schema schema, LLCSegmentName llcSegmentName, Semaphore partitionGroupConsumerSemaphore,
       ServerMetrics serverMetrics, @Nullable PartitionUpsertMetadataManager partitionUpsertMetadataManager,
-      @Nullable PartitionDedupMetadataManager partitionDedupMetadataManager) {
+      @Nullable PartitionDedupMetadataManager partitionDedupMetadataManager, BooleanSupplier isReadyToConsumeData) {
     _segBuildSemaphore = realtimeTableDataManager.getSegmentBuildSemaphore();
     _segmentZKMetadata = segmentZKMetadata;
     _tableConfig = tableConfig;
@@ -1287,10 +1325,16 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
     _indexLoadingConfig = indexLoadingConfig;
     _schema = schema;
     _serverMetrics = serverMetrics;
+    _partitionUpsertMetadataManager = partitionUpsertMetadataManager;
+    _isReadyToConsumeData = isReadyToConsumeData;
     _segmentVersion = indexLoadingConfig.getSegmentVersion();
     _instanceId = _realtimeTableDataManager.getServerInstance();
     _leaseExtender = SegmentBuildTimeLeaseExtender.getLeaseExtender(_tableNameWithType);
     _protocolHandler = new ServerSegmentCompletionProtocolHandler(_serverMetrics, _tableNameWithType);
+    CompletionConfig completionConfig = _tableConfig.getValidationConfig().getCompletionConfig();
+    _segmentCompletionMode = completionConfig != null
+        && CompletionMode.DOWNLOAD.toString().equalsIgnoreCase(completionConfig.getCompletionMode())
+        ? CompletionMode.DOWNLOAD : CompletionMode.DEFAULT;
 
     String timeColumnName = tableConfig.getValidationConfig().getTimeColumnName();
     // TODO Validate configs
@@ -1301,17 +1345,16 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
     _streamPartitionMsgOffsetFactory = _streamConsumerFactory.createStreamMsgOffsetFactory();
     String streamTopic = _partitionLevelStreamConfig.getTopicName();
     _segmentNameStr = _segmentZKMetadata.getSegmentName();
-    _llcSegmentName = llcSegmentName;
-    _partitionGroupId = _llcSegmentName.getPartitionGroupId();
+    _partitionGroupId = llcSegmentName.getPartitionGroupId();
     _partitionGroupConsumptionStatus =
-        new PartitionGroupConsumptionStatus(_partitionGroupId, _llcSegmentName.getSequenceNumber(),
+        new PartitionGroupConsumptionStatus(_partitionGroupId, llcSegmentName.getSequenceNumber(),
             _streamPartitionMsgOffsetFactory.create(_segmentZKMetadata.getStartOffset()),
             _segmentZKMetadata.getEndOffset() == null ? null
                 : _streamPartitionMsgOffsetFactory.create(_segmentZKMetadata.getEndOffset()),
             _segmentZKMetadata.getStatus().toString());
     _partitionGroupConsumerSemaphore = partitionGroupConsumerSemaphore;
     _acquiredConsumerSemaphore = new AtomicBoolean(false);
-    _metricKeyName = _tableNameWithType + "-" + streamTopic + "-" + _partitionGroupId;
+    _clientId = _tableNameWithType + "-" + streamTopic + "-" + _partitionGroupId;
     _segmentLogger = LoggerFactory.getLogger(LLRealtimeSegmentDataManager.class.getName() + "_" + _segmentNameStr);
     _tableStreamName = _tableNameWithType + "_" + streamTopic;
     _memoryManager = getMemoryManager(realtimeTableDataManager.getConsumerDir(), _segmentNameStr,
@@ -1319,34 +1362,33 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
         serverMetrics);
 
     _rateLimiter = RealtimeConsumptionRateManager.getInstance()
-        .createRateLimiter(_partitionLevelStreamConfig, _tableNameWithType, _serverMetrics, _metricKeyName);
+        .createRateLimiter(_partitionLevelStreamConfig, _tableNameWithType, _serverMetrics, _clientId);
 
     List<String> sortedColumns = indexLoadingConfig.getSortedColumns();
     String sortedColumn;
     if (sortedColumns.isEmpty()) {
       _segmentLogger.info("RealtimeDataResourceZKMetadata contains no information about sorted column for segment {}",
-          _llcSegmentName);
+          llcSegmentName);
       sortedColumn = null;
     } else {
       String firstSortedColumn = sortedColumns.get(0);
       if (_schema.hasColumn(firstSortedColumn)) {
         _segmentLogger.info("Setting sorted column name: {} from RealtimeDataResourceZKMetadata for segment {}",
-            firstSortedColumn, _llcSegmentName);
+            firstSortedColumn, llcSegmentName);
         sortedColumn = firstSortedColumn;
       } else {
         _segmentLogger
             .warn("Sorted column name: {} from RealtimeDataResourceZKMetadata is not existed in schema for segment {}.",
-                firstSortedColumn, _llcSegmentName);
+                firstSortedColumn, llcSegmentName);
         sortedColumn = null;
       }
     }
     // Inverted index columns
-    Set<String> invertedIndexColumns = indexLoadingConfig.getInvertedIndexColumns();
     // We need to add sorted column into inverted index columns because when we convert realtime in memory segment into
     // offline segment, we use sorted column's inverted index to maintain the order of the records so that the records
     // are sorted on the sorted column.
     if (sortedColumn != null) {
-      invertedIndexColumns.add(sortedColumn);
+      indexLoadingConfig.addInvertedIndexColumns(sortedColumn);
     }
 
     // Read the max number of rows
@@ -1362,7 +1404,7 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
     _nullHandlingEnabled = indexingConfig.isNullHandlingEnabled();
 
     _columnIndicesForRealtimeTable = new ColumnIndicesForRealtimeTable(sortedColumn,
-        new ArrayList<>(invertedIndexColumns),
+        new ArrayList<>(indexLoadingConfig.getInvertedIndexColumns()),
         new ArrayList<>(indexLoadingConfig.getTextIndexColumns()),
         new ArrayList<>(indexLoadingConfig.getFSTIndexColumns()),
         new ArrayList<>(indexLoadingConfig.getNoDictionaryColumns()),
@@ -1371,15 +1413,11 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
     // Start new realtime segment
     String consumerDir = realtimeTableDataManager.getConsumerDir();
     RealtimeSegmentConfig.Builder realtimeSegmentConfigBuilder =
-        new RealtimeSegmentConfig.Builder().setTableNameWithType(_tableNameWithType).setSegmentName(_segmentNameStr)
+        new RealtimeSegmentConfig.Builder(indexLoadingConfig).setTableNameWithType(_tableNameWithType)
+            .setSegmentName(_segmentNameStr)
             .setStreamName(streamTopic).setSchema(_schema).setTimeColumnName(timeColumnName)
             .setCapacity(_segmentMaxRowCount).setAvgNumMultiValues(indexLoadingConfig.getRealtimeAvgMultiValueCount())
-            .setNoDictionaryColumns(indexLoadingConfig.getNoDictionaryColumns())
-            .setVarLengthDictionaryColumns(indexLoadingConfig.getVarLengthDictionaryColumns())
-            .setInvertedIndexColumns(invertedIndexColumns).setTextIndexColumns(indexLoadingConfig.getTextIndexColumns())
-            .setFSTIndexColumns(indexLoadingConfig.getFSTIndexColumns())
-            .setJsonIndexConfigs(indexLoadingConfig.getJsonIndexConfigs())
-            .setH3IndexConfigs(indexLoadingConfig.getH3IndexConfigs()).setSegmentZKMetadata(segmentZKMetadata)
+            .setSegmentZKMetadata(segmentZKMetadata)
             .setOffHeap(_isOffHeap).setMemoryManager(_memoryManager)
             .setStatsHistory(realtimeTableDataManager.getStatsHistory())
             .setAggregateMetrics(indexingConfig.isAggregateMetrics())
@@ -1388,15 +1426,21 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
             .setConsumerDir(consumerDir).setUpsertMode(tableConfig.getUpsertMode())
             .setPartitionUpsertMetadataManager(partitionUpsertMetadataManager)
             .setPartitionDedupMetadataManager(partitionDedupMetadataManager)
-            .setUpsertComparisonColumn(tableConfig.getUpsertComparisonColumn())
+            .setUpsertComparisonColumns(tableConfig.getUpsertComparisonColumns())
+            .setUpsertDeleteRecordColumn(tableConfig.getUpsertDeleteRecordColumn())
             .setFieldConfigList(tableConfig.getFieldConfigList());
 
     // Create message decoder
     Set<String> fieldsToRead = IngestionUtils.getFieldsForRecordExtractor(_tableConfig.getIngestionConfig(), _schema);
-    StreamMessageDecoder streamMessageDecoder = StreamDecoderProvider.create(_partitionLevelStreamConfig, fieldsToRead);
-    _streamDataDecoder = new StreamDataDecoderImpl(streamMessageDecoder);
-    _clientId = streamTopic + "-" + _partitionGroupId;
-
+    try {
+      StreamMessageDecoder streamMessageDecoder =
+          StreamDecoderProvider.create(_partitionLevelStreamConfig, fieldsToRead);
+      _streamDataDecoder = new StreamDataDecoderImpl(streamMessageDecoder);
+    } catch (Exception e) {
+      _realtimeTableDataManager.addSegmentError(_segmentNameStr,
+          new SegmentErrorInfo(now(), "Failed to initialize the StreamMessageDecoder", e));
+      throw e;
+    }
     _transformPipeline = new TransformPipeline(tableConfig, schema);
     // Acquire semaphore to create stream consumers
     try {
@@ -1415,7 +1459,7 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
       createPartitionMetadataProvider("Starting");
       setPartitionParameters(realtimeSegmentConfigBuilder, indexingConfig.getSegmentPartitionConfig());
       _realtimeSegment = new MutableSegmentImpl(realtimeSegmentConfigBuilder.build(), serverMetrics);
-      _resourceTmpDir = new File(resourceDataDir, "_tmp");
+      _resourceTmpDir = new File(resourceDataDir, RESOURCE_TEMP_DIR_NAME);
       if (!_resourceTmpDir.exists()) {
         _resourceTmpDir.mkdirs();
       }
@@ -1426,7 +1470,7 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
       _segmentCommitterFactory =
           new SegmentCommitterFactory(_segmentLogger, _protocolHandler, tableConfig, indexLoadingConfig, serverMetrics);
       _segmentLogger
-          .info("Starting consumption on realtime consuming segment {} maxRowCount {} maxEndTime {}", _llcSegmentName,
+          .info("Starting consumption on realtime consuming segment {} maxRowCount {} maxEndTime {}", llcSegmentName,
               _segmentMaxRowCount, new DateTime(_consumeEndTime, DateTimeZone.UTC));
       startConsumerThread();
     } catch (Exception e) {
@@ -1434,6 +1478,12 @@ public LLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, TableCo
       // ERROR -> OFFLINE -> CONSUMING via Helix Admin fails because the semaphore is acquired, but not released.
       // Hence releasing the semaphore here to unblock reset operation via Helix Admin.
       _partitionGroupConsumerSemaphore.release();
+      _realtimeTableDataManager.addSegmentError(_segmentNameStr, new SegmentErrorInfo(now(),
+          "Failed to initialize segment data manager", e));
+      _segmentLogger.warn(
+          "Calling controller to mark the segment as OFFLINE in Ideal State because of initialization error: '{}'",
+          e.getMessage());
+      postStopConsumedMsg("Consuming segment initialization error");
       throw e;
     }
   }
@@ -1562,17 +1612,19 @@ private void createPartitionMetadataProvider(String reason) {
     _partitionMetadataProvider = _streamConsumerFactory.createPartitionMetadataProvider(_clientId, _partitionGroupId);
   }
 
+  private void updateIngestionDelay(RowMetadata metadata) {
+    if (metadata != null) {
+      _realtimeTableDataManager.updateIngestionDelay(metadata.getRecordIngestionTimeMs(),
+          metadata.getFirstStreamRecordIngestionTimeMs(), _partitionGroupId);
+    }
+  }
+
   /*
-   * Updates the ingestion delay if messages were processed using the time stamp for the last consumed event.
-   *
-   * @param indexedMessagesCount
+   * Sets ingestion delay to zero in situations where we are caught up processing events.
    */
-  private void updateIngestionDelay(int indexedMessageCount) {
-    if ((indexedMessageCount > 0) && (_lastRowMetadata != null)) {
-      // Record Ingestion delay for this partition
-      _realtimeTableDataManager.updateIngestionDelay(_lastRowMetadata.getRecordIngestionTimeMs(),
-          _partitionGroupId);
-    }
+  private void setIngestionDelayToZero() {
+    long currentTimeMs = System.currentTimeMillis();
+    _realtimeTableDataManager.updateIngestionDelay(currentTimeMs, currentTimeMs, _partitionGroupId);
   }
 
   // This should be done during commit? We may not always commit when we build a segment....
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploader.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploader.java
index 909d863b987..4f173521c9e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploader.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploader.java
@@ -26,10 +26,15 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.pinot.common.metrics.ServerMeter;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.metrics.ServerTimer;
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.spi.filesystem.PinotFS;
 import org.apache.pinot.spi.filesystem.PinotFSFactory;
 import org.apache.pinot.spi.utils.StringUtil;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,22 +48,34 @@ public class PinotFSSegmentUploader implements SegmentUploader {
   private static final Logger LOGGER = LoggerFactory.getLogger(PinotFSSegmentUploader.class);
   public static final int DEFAULT_SEGMENT_UPLOAD_TIMEOUT_MILLIS = 10 * 1000;
 
-  private String _segmentStoreUriStr;
-  private ExecutorService _executorService = Executors.newCachedThreadPool();
-  private int _timeoutInMs;
+  private final String _segmentStoreUriStr;
+  private final ExecutorService _executorService = Executors.newCachedThreadPool();
+  private final int _timeoutInMs;
+  private final ServerMetrics _serverMetrics;
 
-  public PinotFSSegmentUploader(String segmentStoreDirUri, int timeoutMillis) {
+  public PinotFSSegmentUploader(String segmentStoreDirUri, int timeoutMillis, ServerMetrics serverMetrics) {
     _segmentStoreUriStr = segmentStoreDirUri;
     _timeoutInMs = timeoutMillis;
+    _serverMetrics = serverMetrics;
   }
 
+  @Override
   public URI uploadSegment(File segmentFile, LLCSegmentName segmentName) {
+    return uploadSegment(segmentFile, segmentName, _timeoutInMs);
+  }
+
+  @Override
+  public URI uploadSegment(File segmentFile, LLCSegmentName segmentName, int timeoutInMillis) {
     if (_segmentStoreUriStr == null || _segmentStoreUriStr.isEmpty()) {
+      LOGGER.error("Missing segment store uri. Failed to upload segment file {} for {}.", segmentFile.getName(),
+          segmentName.getSegmentName());
       return null;
     }
+    final String rawTableName = TableNameBuilder.extractRawTableName(segmentName.getTableName());
     Callable<URI> uploadTask = () -> {
       URI destUri = new URI(StringUtil.join(File.separator, _segmentStoreUriStr, segmentName.getTableName(),
           segmentName.getSegmentName() + UUID.randomUUID().toString()));
+      long startTime = System.currentTimeMillis();
       try {
         PinotFS pinotFS = PinotFSFactory.create(new URI(_segmentStoreUriStr).getScheme());
         // Check and delete any existing segment file.
@@ -69,21 +86,32 @@ public URI uploadSegment(File segmentFile, LLCSegmentName segmentName) {
         return destUri;
       } catch (Exception e) {
         LOGGER.warn("Failed copy segment tar file {} to segment store {}: {}", segmentFile.getName(), destUri, e);
+      } finally {
+        long duration = System.currentTimeMillis() - startTime;
+        _serverMetrics.addTimedTableValue(rawTableName, ServerTimer.SEGMENT_UPLOAD_TIME_MS, duration,
+            TimeUnit.MILLISECONDS);
       }
       return null;
     };
     Future<URI> future = _executorService.submit(uploadTask);
     try {
-      URI segmentLocation = future.get(_timeoutInMs, TimeUnit.MILLISECONDS);
+      URI segmentLocation = future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
       LOGGER.info("Successfully upload segment {} to {}.", segmentName, segmentLocation);
+      _serverMetrics.addMeteredTableValue(rawTableName,
+          segmentLocation == null ? ServerMeter.SEGMENT_UPLOAD_FAILURE : ServerMeter.SEGMENT_UPLOAD_SUCCESS, 1);
       return segmentLocation;
     } catch (InterruptedException e) {
       LOGGER.info("Interrupted while waiting for segment upload of {} to {}.", segmentName, _segmentStoreUriStr);
       Thread.currentThread().interrupt();
+    } catch (TimeoutException e) {
+      // Emit a separate metric for timeout since this is relatively more common than other errors.
+      _serverMetrics.addMeteredTableValue(rawTableName, ServerMeter.SEGMENT_UPLOAD_TIMEOUT, 1);
+      LOGGER.warn("Timed out waiting to upload segment: {} for table: {}", segmentName.getSegmentName(), rawTableName);
     } catch (Exception e) {
       LOGGER
           .warn("Failed to upload file {} of segment {} for table {} ", segmentFile.getAbsolutePath(), segmentName, e);
     }
+    _serverMetrics.addMeteredTableValue(rawTableName, ServerMeter.SEGMENT_UPLOAD_FAILURE, 1);
 
     return null;
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
index e1e06c90810..3111d284182 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
@@ -31,6 +31,7 @@
 
 
 public abstract class RealtimeSegmentDataManager extends SegmentDataManager {
+  public static final String RESOURCE_TEMP_DIR_NAME = "_tmp";
 
   @Override
   public abstract MutableSegment getSegment();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java
index 4ae54b6bbc6..a7ee82b9ebd 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManager.java
@@ -29,11 +29,9 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 import javax.annotation.concurrent.ThreadSafe;
 import org.apache.commons.collections.CollectionUtils;
@@ -45,7 +43,6 @@
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.metrics.ServerGauge;
 import org.apache.pinot.common.utils.LLCSegmentName;
-import org.apache.pinot.common.utils.NamedThreadFactory;
 import org.apache.pinot.common.utils.SegmentName;
 import org.apache.pinot.common.utils.SegmentUtils;
 import org.apache.pinot.common.utils.TarGzCompressionUtils;
@@ -56,6 +53,7 @@
 import org.apache.pinot.segment.local.data.manager.SegmentDataManager;
 import org.apache.pinot.segment.local.dedup.PartitionDedupMetadataManager;
 import org.apache.pinot.segment.local.dedup.TableDedupMetadataManager;
+import org.apache.pinot.segment.local.dedup.TableDedupMetadataManagerFactory;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentImpl;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
 import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
@@ -87,8 +85,6 @@
 
 @ThreadSafe
 public class RealtimeTableDataManager extends BaseTableDataManager {
-  private final ExecutorService _segmentAsyncExecutorService =
-      Executors.newSingleThreadExecutor(new NamedThreadFactory("SegmentAsyncExecutorService"));
   private SegmentBuildTimeLeaseExtender _leaseExtender;
   private RealtimeSegmentStatsHistory _statsHistory;
   private final Semaphore _segmentBuildSemaphore;
@@ -119,13 +115,17 @@ public class RealtimeTableDataManager extends BaseTableDataManager {
   // likely that we get fresh data each time instead of multiple copies of roughly same data.
   private static final int MIN_INTERVAL_BETWEEN_STATS_UPDATES_MINUTES = 30;
 
-  private final AtomicBoolean _allSegmentsLoaded = new AtomicBoolean();
+  public static final long READY_TO_CONSUME_DATA_CHECK_INTERVAL_MS = TimeUnit.SECONDS.toMillis(5);
+
+  // TODO: Change it to BooleanSupplier
+  private final Supplier<Boolean> _isServerReadyToServeQueries;
 
-  private TableDedupMetadataManager _tableDedupMetadataManager;
-  private TableUpsertMetadataManager _tableUpsertMetadataManager;
   // Object to track ingestion delay for all partitions
   private IngestionDelayTracker _ingestionDelayTracker;
-  private final Supplier<Boolean> _isServerReadyToServeQueries;
+
+  private TableDedupMetadataManager _tableDedupMetadataManager;
+  private TableUpsertMetadataManager _tableUpsertMetadataManager;
+  private BooleanSupplier _isTableReadyToConsumeData;
 
   public RealtimeTableDataManager(Semaphore segmentBuildSemaphore) {
     this(segmentBuildSemaphore, () -> true);
@@ -140,8 +140,8 @@ public RealtimeTableDataManager(Semaphore segmentBuildSemaphore, Supplier<Boolea
   protected void doInit() {
     _leaseExtender = SegmentBuildTimeLeaseExtender.getOrCreate(_instanceId, _serverMetrics, _tableNameWithType);
     // Tracks ingestion delay of all partitions being served for this table
-    _ingestionDelayTracker = new IngestionDelayTracker(_serverMetrics, _tableNameWithType, this,
-        _isServerReadyToServeQueries);
+    _ingestionDelayTracker =
+        new IngestionDelayTracker(_serverMetrics, _tableNameWithType, this, _isServerReadyToServeQueries);
     File statsFile = new File(_tableDataDir, STATS_FILE_NAME);
     try {
       _statsHistory = RealtimeSegmentStatsHistory.deserialzeFrom(statsFile);
@@ -196,8 +196,7 @@ protected void doInit() {
       List<String> primaryKeyColumns = schema.getPrimaryKeyColumns();
       Preconditions.checkState(!CollectionUtils.isEmpty(primaryKeyColumns),
           "Primary key columns must be configured for dedup");
-      _tableDedupMetadataManager = new TableDedupMetadataManager(_tableNameWithType, primaryKeyColumns, _serverMetrics,
-          dedupConfig.getHashFunction());
+      _tableDedupMetadataManager = TableDedupMetadataManagerFactory.create(tableConfig, schema, this, _serverMetrics);
     }
 
     UpsertConfig upsertConfig = tableConfig.getUpsertConfig();
@@ -206,7 +205,41 @@ protected void doInit() {
           _tableUpsertMetadataManager);
       Schema schema = ZKMetadataProvider.getTableSchema(_propertyStore, _tableNameWithType);
       Preconditions.checkState(schema != null, "Failed to find schema for table: %s", _tableNameWithType);
-      _tableUpsertMetadataManager = TableUpsertMetadataManagerFactory.create(tableConfig, schema, this, _serverMetrics);
+      // NOTE: Set _tableUpsertMetadataManager before initializing it because when preloading is enabled, we need to
+      //       load segments into it
+      _tableUpsertMetadataManager = TableUpsertMetadataManagerFactory.create(tableConfig);
+      _tableUpsertMetadataManager.init(tableConfig, schema, this, _serverMetrics, _helixManager,
+          _segmentPreloadExecutor);
+    }
+
+    // For dedup and partial-upsert, need to wait for all segments loaded before starting consuming data
+    if (isDedupEnabled() || isPartialUpsertEnabled()) {
+      _isTableReadyToConsumeData = new BooleanSupplier() {
+        volatile boolean _allSegmentsLoaded;
+        long _lastCheckTimeMs;
+
+        @Override
+        public boolean getAsBoolean() {
+          if (_allSegmentsLoaded) {
+            return true;
+          } else {
+            synchronized (this) {
+              if (_allSegmentsLoaded) {
+                return true;
+              }
+              long currentTimeMs = System.currentTimeMillis();
+              if (currentTimeMs - _lastCheckTimeMs <= READY_TO_CONSUME_DATA_CHECK_INTERVAL_MS) {
+                return false;
+              }
+              _lastCheckTimeMs = currentTimeMs;
+              _allSegmentsLoaded = TableStateUtils.isAllSegmentsLoaded(_helixManager, _tableNameWithType);
+              return _allSegmentsLoaded;
+            }
+          }
+        }
+      };
+    } else {
+      _isTableReadyToConsumeData = () -> true;
     }
   }
 
@@ -216,16 +249,21 @@ protected void doStart() {
 
   @Override
   protected void doShutdown() {
-    _segmentAsyncExecutorService.shutdown();
     if (_tableUpsertMetadataManager != null) {
+      // Stop the upsert metadata manager first to prevent removing metadata when destroying segments
+      _tableUpsertMetadataManager.stop();
+      for (SegmentDataManager segmentDataManager : _segmentDataManagerMap.values()) {
+        segmentDataManager.destroy();
+      }
       try {
         _tableUpsertMetadataManager.close();
       } catch (IOException e) {
         _logger.warn("Cannot close upsert metadata manager properly for table: {}", _tableNameWithType, e);
       }
-    }
-    for (SegmentDataManager segmentDataManager : _segmentDataManagerMap.values()) {
-      segmentDataManager.destroy();
+    } else {
+      for (SegmentDataManager segmentDataManager : _segmentDataManagerMap.values()) {
+        segmentDataManager.destroy();
+      }
     }
     if (_leaseExtender != null) {
       _leaseExtender.shutDown();
@@ -240,8 +278,8 @@ protected void doShutdown() {
    * @param ingestionTimeMs Ingestion delay being reported.
    * @param partitionGroupId Partition ID for which delay is being updated.
    */
-  public void updateIngestionDelay(long ingestionTimeMs, int partitionGroupId) {
-    _ingestionDelayTracker.updateIngestionDelay(ingestionTimeMs, partitionGroupId);
+  public void updateIngestionDelay(long ingestionTimeMs, long firstStreamIngestionTimeMs, int partitionGroupId) {
+    _ingestionDelayTracker.updateIngestionDelay(ingestionTimeMs, firstStreamIngestionTimeMs, partitionGroupId);
   }
 
   /*
@@ -271,7 +309,7 @@ public void onConsumingToOnline(String segmentNameStr) {
 
   /**
    * Returns all partitionGroupIds for the partitions hosted by this server for current table.
-   * @apiNote  this involves Zookeeper read and should not be used frequently due to efficiency concerns.
+   * @apiNote this involves Zookeeper read and should not be used frequently due to efficiency concerns.
    */
   public Set<Integer> getHostedPartitionsGroupIds() {
     Set<Integer> partitionsHostedByThisServer = new HashSet<>();
@@ -407,22 +445,10 @@ public void addSegment(String segmentName, IndexLoadingConfig indexLoadingConfig
       PartitionDedupMetadataManager partitionDedupMetadataManager =
           _tableDedupMetadataManager != null ? _tableDedupMetadataManager.getOrCreatePartitionManager(partitionGroupId)
               : null;
-      // For dedup and partial-upsert, wait for all segments loaded before creating the consuming segment
-      if (isDedupEnabled() || isPartialUpsertEnabled()) {
-        if (!_allSegmentsLoaded.get()) {
-          synchronized (_allSegmentsLoaded) {
-            if (!_allSegmentsLoaded.get()) {
-              TableStateUtils.waitForAllSegmentsLoaded(_helixManager, _tableNameWithType);
-              _allSegmentsLoaded.set(true);
-            }
-          }
-        }
-      }
-
       segmentDataManager =
           new LLRealtimeSegmentDataManager(segmentZKMetadata, tableConfig, this, _indexDir.getAbsolutePath(),
               indexLoadingConfig, schema, llcSegmentName, semaphore, _serverMetrics, partitionUpsertMetadataManager,
-              partitionDedupMetadataManager);
+              partitionDedupMetadataManager, _isTableReadyToConsumeData);
     } else {
       InstanceZKMetadata instanceZKMetadata = ZKMetadataProvider.getInstanceZKMetadata(_propertyStore, _instanceId);
       segmentDataManager = new HLRealtimeSegmentDataManager(segmentZKMetadata, tableConfig, instanceZKMetadata, this,
@@ -511,7 +537,11 @@ private void handleUpsert(ImmutableSegment immutableSegment) {
     ImmutableSegmentDataManager newSegmentManager = new ImmutableSegmentDataManager(immutableSegment);
     SegmentDataManager oldSegmentManager = registerSegment(segmentName, newSegmentManager);
     if (oldSegmentManager == null) {
-      partitionUpsertMetadataManager.addSegment(immutableSegment);
+      if (_tableUpsertMetadataManager.isPreloading()) {
+        partitionUpsertMetadataManager.preloadSegment(immutableSegment);
+      } else {
+        partitionUpsertMetadataManager.addSegment(immutableSegment);
+      }
       _logger.info("Added new immutable segment: {} to upsert-enabled table: {}", segmentName, _tableNameWithType);
     } else {
       IndexSegment oldSegment = oldSegmentManager.getSegment();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactory.java
index 5a52103efcf..297f30482be 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactory.java
@@ -69,16 +69,18 @@ public SegmentCommitter createSegmentCommitter(boolean isSplitCommit, SegmentCom
 
     boolean uploadToFs = _streamConfig.isServerUploadToDeepStore();
     String peerSegmentDownloadScheme = _tableConfig.getValidationConfig().getPeerSegmentDownloadScheme();
-    // TODO: exists for backwards compatibility. remove peerDownloadScheme non-null check once users have migrated
+    String segmentStoreUri = _indexLoadingConfig.getSegmentStoreURI();
+
     if (uploadToFs || peerSegmentDownloadScheme != null) {
-      segmentUploader = new PinotFSSegmentUploader(_indexLoadingConfig.getSegmentStoreURI(),
-          PinotFSSegmentUploader.DEFAULT_SEGMENT_UPLOAD_TIMEOUT_MILLIS);
+      // TODO: peer scheme non-null check exists for backwards compatibility. remove check once users have migrated
+      segmentUploader = new PinotFSSegmentUploader(segmentStoreUri,
+          ServerSegmentCompletionProtocolHandler.getSegmentUploadRequestTimeoutMs(), _serverMetrics);
     } else {
       segmentUploader = new Server2ControllerSegmentUploader(_logger,
           _protocolHandler.getFileUploadDownloadClient(),
           _protocolHandler.getSegmentCommitUploadURL(params, controllerVipUrl), params.getSegmentName(),
           ServerSegmentCompletionProtocolHandler.getSegmentUploadRequestTimeoutMs(), _serverMetrics,
-          _protocolHandler.getAuthProvider());
+          _protocolHandler.getAuthProvider(), _tableConfig.getTableName());
     }
 
     return new SplitSegmentCommitter(_logger, _protocolHandler, params, segmentUploader, peerSegmentDownloadScheme);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentUploader.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentUploader.java
index 44d0a360679..63bbe99a5bf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentUploader.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentUploader.java
@@ -24,6 +24,15 @@
 
 
 public interface SegmentUploader {
-  // Returns the URI of the uploaded segment. null if the upload fails.
+
+  /**
+   * Uploads the given segmentFile to the deep-store. Returns the URI where the segment is uploaded.
+   */
   URI uploadSegment(File segmentFile, LLCSegmentName segmentName);
+
+  /**
+   * Uploads the given segmentFile to the deep-store. Returns the URI where the segment is uploaded. The upload will
+   * wait for the specified timeout.
+   */
+  URI uploadSegment(File segmentFile, LLCSegmentName segmentName, int timeoutInMillis);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploader.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploader.java
index 2559616b49f..4b00563125a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploader.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploader.java
@@ -21,14 +21,18 @@
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.concurrent.TimeUnit;
 import org.apache.pinot.common.auth.AuthProviderUtils;
+import org.apache.pinot.common.metrics.ServerMeter;
 import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.metrics.ServerTimer;
 import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.core.util.SegmentCompletionProtocolUtils;
 import org.apache.pinot.server.realtime.ControllerLeaderLocator;
 import org.apache.pinot.spi.auth.AuthProvider;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.slf4j.Logger;
 
 
@@ -42,10 +46,11 @@ public class Server2ControllerSegmentUploader implements SegmentUploader {
   private final int _segmentUploadRequestTimeoutMs;
   private final ServerMetrics _serverMetrics;
   private final AuthProvider _authProvider;
+  private final String _rawTableName;
 
   public Server2ControllerSegmentUploader(Logger segmentLogger, FileUploadDownloadClient fileUploadDownloadClient,
       String controllerSegmentUploadCommitUrl, String segmentName, int segmentUploadRequestTimeoutMs,
-      ServerMetrics serverMetrics, AuthProvider authProvider)
+      ServerMetrics serverMetrics, AuthProvider authProvider, String tableName)
       throws URISyntaxException {
     _segmentLogger = segmentLogger;
     _fileUploadDownloadClient = fileUploadDownloadClient;
@@ -54,27 +59,41 @@ public Server2ControllerSegmentUploader(Logger segmentLogger, FileUploadDownload
     _segmentUploadRequestTimeoutMs = segmentUploadRequestTimeoutMs;
     _serverMetrics = serverMetrics;
     _authProvider = authProvider;
+    _rawTableName = TableNameBuilder.extractRawTableName(tableName);
   }
 
   @Override
   public URI uploadSegment(File segmentFile, LLCSegmentName segmentName) {
-    SegmentCompletionProtocol.Response response = uploadSegmentToController(segmentFile);
+    return uploadSegment(segmentFile, segmentName, _segmentUploadRequestTimeoutMs);
+  }
+
+  @Override
+  public URI uploadSegment(File segmentFile, LLCSegmentName segmentName, int timeoutInMillis) {
+    SegmentCompletionProtocol.Response response = uploadSegmentToController(segmentFile, timeoutInMillis);
     if (response.getStatus() == SegmentCompletionProtocol.ControllerResponseStatus.UPLOAD_SUCCESS) {
       try {
-        return new URI(response.getSegmentLocation());
+        URI uri = new URI(response.getSegmentLocation());
+        _serverMetrics.addMeteredTableValue(_rawTableName, ServerMeter.SEGMENT_UPLOAD_SUCCESS, 1);
+        return uri;
       } catch (URISyntaxException e) {
         _segmentLogger.error("Error in segment location format: ", e);
       }
     }
+    _serverMetrics.addMeteredTableValue(_rawTableName, ServerMeter.SEGMENT_UPLOAD_FAILURE, 1);
     return null;
   }
 
   public SegmentCompletionProtocol.Response uploadSegmentToController(File segmentFile) {
+    return uploadSegmentToController(segmentFile, _segmentUploadRequestTimeoutMs);
+  }
+
+  private SegmentCompletionProtocol.Response uploadSegmentToController(File segmentFile, int timeoutInMillis) {
     SegmentCompletionProtocol.Response response;
+    long startTime = System.currentTimeMillis();
     try {
       String responseStr = _fileUploadDownloadClient
           .uploadSegment(_controllerSegmentUploadCommitUrl, _segmentName, segmentFile,
-              AuthProviderUtils.toRequestHeaders(_authProvider), null, _segmentUploadRequestTimeoutMs).getResponse();
+              AuthProviderUtils.toRequestHeaders(_authProvider), null, timeoutInMillis).getResponse();
       response = SegmentCompletionProtocol.Response.fromJsonString(responseStr);
       _segmentLogger.info("Controller response {} for {}", response.toJsonString(), _controllerSegmentUploadCommitUrl);
       if (response.getStatus().equals(SegmentCompletionProtocol.ControllerResponseStatus.NOT_LEADER)) {
@@ -88,6 +107,10 @@ public SegmentCompletionProtocol.Response uploadSegmentToController(File segment
       // hence unable to send {@link SegmentCompletionProtocol.ControllerResponseStatus.NOT_LEADER}
       // If cache is not invalidated, we will not recover from exceptions until the controller comes back up
       ControllerLeaderLocator.getInstance().invalidateCachedControllerLeader();
+    } finally {
+      long duration = System.currentTimeMillis() - startTime;
+      _serverMetrics.addTimedTableValue(_rawTableName, ServerTimer.SEGMENT_UPLOAD_TIME_MS, duration,
+          TimeUnit.MILLISECONDS);
     }
     SegmentCompletionProtocolUtils.raiseSegmentCompletionProtocolResponseMetric(_serverMetrics, response);
     return response;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/table/TableResizer.java b/pinot-core/src/main/java/org/apache/pinot/core/data/table/TableResizer.java
index cbbe6abdce5..4299e5665ee 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/table/TableResizer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/table/TableResizer.java
@@ -86,10 +86,12 @@ public TableResizer(DataSchema dataSchema, QueryContext queryContext) {
     _numOrderByExpressions = orderByExpressions.size();
     _orderByValueExtractors = new OrderByValueExtractor[_numOrderByExpressions];
     Comparator[] comparators = new Comparator[_numOrderByExpressions];
+    int[] nullComparisonResults = new int[_numOrderByExpressions];
     for (int i = 0; i < _numOrderByExpressions; i++) {
       OrderByExpressionContext orderByExpression = orderByExpressions.get(i);
       _orderByValueExtractors[i] = getOrderByValueExtractor(orderByExpression.getExpression());
       comparators[i] = orderByExpression.isAsc() ? Comparator.naturalOrder() : Comparator.reverseOrder();
+      nullComparisonResults[i] = orderByExpression.isNullsLast() ? -1 : 1;
     }
     boolean nullHandlingEnabled = queryContext.isNullHandlingEnabled();
     if (nullHandlingEnabled) {
@@ -101,10 +103,9 @@ public TableResizer(DataSchema dataSchema, QueryContext queryContext) {
             if (v2 == null) {
               continue;
             }
-            // The default null ordering is NULLS LAST, regardless of the ordering direction.
-            return 1;
+            return -nullComparisonResults[i];
           } else if (v2 == null) {
-            return -1;
+            return nullComparisonResults[i];
           }
           int result = comparators[i].compare(v1, v2);
           if (result != 0) {
@@ -131,7 +132,7 @@ public TableResizer(DataSchema dataSchema, QueryContext queryContext) {
    */
   private OrderByValueExtractor getOrderByValueExtractor(ExpressionContext expression) {
     if (expression.getType() == ExpressionContext.Type.LITERAL) {
-      return new LiteralExtractor(expression.getLiteralString());
+      return new LiteralExtractor(expression.getLiteral().getStringValue());
     }
     Integer groupByExpressionIndex = _groupByExpressionIndexMap.get(expression);
     if (groupByExpressionIndex != null) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/function/scalar/SketchFunctions.java b/pinot-core/src/main/java/org/apache/pinot/core/function/scalar/SketchFunctions.java
new file mode 100644
index 00000000000..f6245bec6f7
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/function/scalar/SketchFunctions.java
@@ -0,0 +1,187 @@
+/**
+ * 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.pinot.core.function.scalar;
+
+import com.clearspring.analytics.stream.cardinality.HyperLogLog;
+import java.math.BigDecimal;
+import javax.annotation.Nullable;
+import org.apache.datasketches.theta.Sketches;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+import org.apache.pinot.spi.annotations.ScalarFunction;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+/**
+ * Inbuilt Sketch Transformation Functions
+ * The functions can be used as UDFs in Query when added in the FunctionRegistry.
+ * @ScalarFunction annotation is used with each method for the registration
+ *
+ * Note these will just make sketches that contain a single item, these are intended to be used during ingestion to
+ * create sketches from raw data, which can be rolled up later.
+ *
+ * Note this is defined in pinot-core rather than pinot-common because pinot-core has dependencies on
+ * datasketches/clearspring analytics.
+ *
+ * Example usage:
+ *
+ * {
+ *   "transformConfigs": [
+ *     {
+ *       "columnName": "players",
+ *       "transformFunction": "toThetaSketch(playerID)"
+ *     },
+ *     {
+ *       "columnName": "players",
+ *       "transformFunction": "toThetaSketch(playerID, 1024)"
+ *     },
+ *     {
+ *       "columnName": "names",
+ *       "transformFunction": "toHLL(playerName)"
+ *     },
+ *     {
+ *       "columnName": "names",
+ *       "transformFunction": "toHLL(playerName, 8)"
+ *     }
+ *   ]
+ * }
+ */
+public class SketchFunctions {
+  private SketchFunctions() {
+  }
+
+  /**
+   * Create a Theta Sketch containing the input
+   *
+   * @param input an Object we want to insert into the sketch, may be null to return an empty sketch
+   * @return serialized theta sketch as bytes
+   */
+  @ScalarFunction(nullableParameters = true)
+  public static byte[] toThetaSketch(@Nullable Object input) {
+    return toThetaSketch(input, CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES);
+  }
+
+  /**
+   * Create a Theta Sketch containing the input, with a configured nominal entries
+   *
+   * @param input an Object we want to insert into the sketch, may be null to return an empty sketch
+   * @param nominalEntries number of nominal entries the sketch is configured to keep
+   * @return serialized theta sketch as bytes
+   */
+  @ScalarFunction(nullableParameters = true)
+  public static byte[] toThetaSketch(@Nullable Object input, int nominalEntries) {
+    UpdateSketch sketch = Sketches.updateSketchBuilder().setNominalEntries(nominalEntries).build();
+    if (input != null) {
+      if (input instanceof Integer) {
+        sketch.update((Integer) input);
+      } else if (input instanceof Long) {
+        sketch.update((Long) input);
+      } else if (input instanceof Float) {
+        sketch.update((Float) input);
+      } else if (input instanceof Double) {
+        sketch.update((Double) input);
+      } else if (input instanceof BigDecimal) {
+        sketch.update(((BigDecimal) input).toString());
+      } else if (input instanceof String) {
+        sketch.update((String) input);
+      } else if (input instanceof byte[]) {
+        sketch.update((byte[]) input);
+      } else {
+        throw new IllegalArgumentException("Unrecognised input type for Theta sketch: " + input.getClass().getName());
+      }
+    }
+    return ObjectSerDeUtils.DATA_SKETCH_SER_DE.serialize(sketch.compact());
+  }
+
+  /**
+   * Create a HyperLogLog containing the input
+   *
+   * @param input an Object we want to insert into the HLL, may be null to return an empty HLL
+   * @return serialized HLL as bytes
+   */
+  @ScalarFunction(nullableParameters = true)
+  public static byte[] toHLL(@Nullable Object input) {
+    return toHLL(input, CommonConstants.Helix.DEFAULT_HYPERLOGLOG_LOG2M);
+  }
+
+  /**
+   * Create a HyperLogLog containing the input, with a configurable log2m
+   *
+   * @param input an Object we want to insert into the HLL, may be null to return an empty HLL
+   * @param log2m the log2m value for the created HyperLogLog
+   * @return serialized HLL as bytes
+   */
+  @ScalarFunction(nullableParameters = true)
+  public static byte[] toHLL(@Nullable Object input, int log2m) {
+    HyperLogLog hll = new HyperLogLog(log2m);
+    if (input != null) {
+      hll.offer(input);
+    }
+    return ObjectSerDeUtils.HYPER_LOG_LOG_SER_DE.serialize(hll);
+  }
+
+  /**
+   * Create a Tuple Sketch containing the key and value supplied
+   *
+   * @param key an Object we want to insert as the key of the sketch, may be null to return an empty sketch
+   * @param value an Integer we want to associate as the value to go along with the key, may be null to return an
+   *              empty sketch
+   * @return serialized tuple sketch as bytes
+   */
+  @ScalarFunction(nullableParameters = true)
+  public static byte[] toIntegerSumTupleSketch(@Nullable Object key, @Nullable Integer value) {
+    return toIntegerSumTupleSketch(key, value, CommonConstants.Helix.DEFAULT_TUPLE_SKETCH_LGK);
+  }
+
+  /**
+   * Create a Tuple Sketch containing the key and value supplied
+   *
+   * @param key an Object we want to insert as the key of the sketch, may be null to return an empty sketch
+   * @param value an Integer we want to associate as the value to go along with the key, may be null to return an
+   *              empty sketch
+   * @param lgK integer representing the log of the maximum number of retained entries in the sketch, between 4 and 26
+   * @return serialized tuple sketch as bytes
+   */
+  @ScalarFunction(nullableParameters = true)
+  public static byte[] toIntegerSumTupleSketch(@Nullable Object key, Integer value, int lgK) {
+    IntegerSketch is = new IntegerSketch(lgK, IntegerSummary.Mode.Sum);
+    if (value != null && key != null) {
+      if (key instanceof Integer) {
+        is.update((Integer) key, value);
+      } else if (key instanceof Long) {
+        is.update((Long) key, value);
+      } else if (key instanceof Float) {
+        is.update((float) key, value);
+      } else if (key instanceof Double) {
+        is.update((double) key, value);
+      } else if (key instanceof BigDecimal) {
+        is.update(((BigDecimal) key).toString(), value);
+      } else if (key instanceof String) {
+        is.update((String) key, value);
+      } else if (key instanceof byte[]) {
+        is.update((byte[]) key, value);
+      } else {
+        throw new IllegalArgumentException("Unrecognised key type for Theta sketch: " + key.getClass().getName());
+      }
+    }
+    return ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.serialize(is.compact());
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/BaseBinaryGeoTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/BaseBinaryGeoTransformFunction.java
index c528cedb51d..347abeb0f02 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/BaseBinaryGeoTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/BaseBinaryGeoTransformFunction.java
@@ -22,13 +22,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.LiteralTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.locationtech.jts.geom.Geometry;
@@ -46,20 +46,18 @@ public abstract class BaseBinaryGeoTransformFunction extends BaseTransformFuncti
   private double[] _doubleResults;
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
-    Preconditions
-        .checkArgument(arguments.size() == 2, "2 arguments are required for transform function: %s", getName());
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    Preconditions.checkArgument(arguments.size() == 2, "2 arguments are required for transform function: %s",
+        getName());
     TransformFunction transformFunction = arguments.get(0);
     Preconditions.checkArgument(transformFunction.getResultMetadata().isSingleValue(),
         "First argument must be single-valued for transform function: %s", getName());
     Preconditions.checkArgument(transformFunction.getResultMetadata().getDataType() == FieldSpec.DataType.BYTES
             || transformFunction instanceof LiteralTransformFunction,
-        "The first argument must be of type BYTES , but was %s",
-            transformFunction.getResultMetadata().getDataType()
-        );
+        "The first argument must be of type BYTES , but was %s", transformFunction.getResultMetadata().getDataType());
     if (transformFunction instanceof LiteralTransformFunction) {
       _firstLiteral = GeometrySerializer.deserialize(
-          BytesUtils.toBytes(((LiteralTransformFunction) transformFunction).getLiteral()));
+          BytesUtils.toBytes(((LiteralTransformFunction) transformFunction).getStringLiteral()));
     } else {
       _firstArgument = transformFunction;
     }
@@ -68,40 +66,38 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
         "Second argument must be single-valued for transform function: %s", getName());
     Preconditions.checkArgument(transformFunction.getResultMetadata().getDataType() == FieldSpec.DataType.BYTES
             || transformFunction instanceof LiteralTransformFunction,
-        "The second argument must be of type BYTES , but was %s",
-            transformFunction.getResultMetadata().getDataType()
-        );
+        "The second argument must be of type BYTES , but was %s", transformFunction.getResultMetadata().getDataType());
     if (transformFunction instanceof LiteralTransformFunction) {
       _secondLiteral = GeometrySerializer.deserialize(
-          BytesUtils.toBytes(((LiteralTransformFunction) transformFunction).getLiteral()));
+          BytesUtils.toBytes(((LiteralTransformFunction) transformFunction).getStringLiteral()));
     } else {
       _secondArgument = transformFunction;
     }
   }
 
-  protected int[] transformGeometryToIntValuesSV(ProjectionBlock projectionBlock) {
+  protected int[] transformGeometryToIntValuesSV(ValueBlock valueBlock) {
     if (_intResults == null) {
       _intResults = new int[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
     byte[][] firstValues;
     byte[][] secondValues;
     if (_firstArgument == null && _secondArgument == null) {
-      _intResults = new int[Math.min(projectionBlock.getNumDocs(), DocIdSetPlanNode.MAX_DOC_PER_CALL)];
+      _intResults = new int[Math.min(valueBlock.getNumDocs(), DocIdSetPlanNode.MAX_DOC_PER_CALL)];
       Arrays.fill(_intResults, transformGeometryToInt(_firstLiteral, _secondLiteral));
     } else if (_firstArgument == null) {
-      secondValues = _secondArgument.transformToBytesValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _intResults[i] = transformGeometryToInt(_firstLiteral, GeometrySerializer.deserialize(secondValues[i]));
       }
     } else if (_secondArgument == null) {
-      firstValues = _firstArgument.transformToBytesValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _intResults[i] = transformGeometryToInt(GeometrySerializer.deserialize(firstValues[i]), _secondLiteral);
       }
     } else {
-      firstValues = _firstArgument.transformToBytesValuesSV(projectionBlock);
-      secondValues = _secondArgument.transformToBytesValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
+      secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _intResults[i] = transformGeometryToInt(GeometrySerializer.deserialize(firstValues[i]),
             GeometrySerializer.deserialize(secondValues[i]));
       }
@@ -109,29 +105,29 @@ protected int[] transformGeometryToIntValuesSV(ProjectionBlock projectionBlock)
     return _intResults;
   }
 
-  protected double[] transformGeometryToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  protected double[] transformGeometryToDoubleValuesSV(ValueBlock valueBlock) {
     if (_doubleResults == null) {
       _doubleResults = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
     byte[][] firstValues;
     byte[][] secondValues;
     if (_firstArgument == null && _secondArgument == null) {
-      _doubleResults = new double[Math.min(projectionBlock.getNumDocs(), DocIdSetPlanNode.MAX_DOC_PER_CALL)];
+      _doubleResults = new double[Math.min(valueBlock.getNumDocs(), DocIdSetPlanNode.MAX_DOC_PER_CALL)];
       Arrays.fill(_doubleResults, transformGeometryToDouble(_firstLiteral, _secondLiteral));
     } else if (_firstArgument == null) {
-      secondValues = _secondArgument.transformToBytesValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _doubleResults[i] = transformGeometryToDouble(_firstLiteral, GeometrySerializer.deserialize(secondValues[i]));
       }
     } else if (_secondArgument == null) {
-      firstValues = _firstArgument.transformToBytesValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _doubleResults[i] = transformGeometryToDouble(GeometrySerializer.deserialize(firstValues[i]), _secondLiteral);
       }
     } else {
-      firstValues = _firstArgument.transformToBytesValuesSV(projectionBlock);
-      secondValues = _secondArgument.transformToBytesValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
+      secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _doubleResults[i] = transformGeometryToDouble(GeometrySerializer.deserialize(firstValues[i]),
             GeometrySerializer.deserialize(secondValues[i]));
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromTextFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromTextFunction.java
index d0ff874aee3..189aed33cf3 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromTextFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromTextFunction.java
@@ -22,13 +22,13 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.Utils;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.io.ParseException;
@@ -44,7 +44,7 @@ abstract class ConstructFromTextFunction extends BaseTransformFunction {
   protected WKTReader _reader;
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s",
         getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -64,12 +64,12 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
     }
-    String[] argumentValues = _transformFunction.transformToStringValuesSV(projectionBlock);
-    int length = projectionBlock.getNumDocs();
+    String[] argumentValues = _transformFunction.transformToStringValuesSV(valueBlock);
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       try {
         Geometry geometry = _reader.read(argumentValues[i]);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromWKBFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromWKBFunction.java
index 761fe06a927..29ac9f8244e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromWKBFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ConstructFromWKBFunction.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.locationtech.jts.geom.Geometry;
@@ -44,7 +44,7 @@ abstract class ConstructFromWKBFunction extends BaseTransformFunction {
   private WKBReader _reader;
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s",
         getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -64,12 +64,12 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
     }
-    byte[][] argumentValues = _transformFunction.transformToBytesValuesSV(projectionBlock);
-    for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+    byte[][] argumentValues = _transformFunction.transformToBytesValuesSV(valueBlock);
+    for (int i = 0; i < valueBlock.getNumDocs(); i++) {
       try {
         Geometry geometry = _reader.read(argumentValues[i]);
         _results[i] = GeometrySerializer.serialize(geometry);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/GeoToH3Function.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/GeoToH3Function.java
index 75f46c7b2cc..c716b6e677b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/GeoToH3Function.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/GeoToH3Function.java
@@ -21,14 +21,14 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.LiteralTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.locationtech.jts.geom.Geometry;
 
@@ -51,7 +51,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 3 || arguments.size() == 2,
         "Transform function %s requires 2 or 3 arguments", getName());
     if (arguments.size() == 3) {
@@ -95,23 +95,23 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new long[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
 
     if (_thirdArgument == null) {
-      byte[][] geoValues = _firstArgument.transformToBytesValuesSV(projectionBlock);
-      int[] resValues = _secondArgument.transformToIntValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      byte[][] geoValues = _firstArgument.transformToBytesValuesSV(valueBlock);
+      int[] resValues = _secondArgument.transformToIntValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         Geometry geometry = GeometrySerializer.deserialize(geoValues[i]);
         _results[i] = ScalarFunctions.geoToH3(geometry.getCoordinate().x, geometry.getCoordinate().y, resValues[i]);
       }
     } else {
-      double[] lonValues = _firstArgument.transformToDoubleValuesSV(projectionBlock);
-      double[] latValues = _secondArgument.transformToDoubleValuesSV(projectionBlock);
-      int[] resValues = _thirdArgument.transformToIntValuesSV(projectionBlock);
-      for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+      double[] lonValues = _firstArgument.transformToDoubleValuesSV(valueBlock);
+      double[] latValues = _secondArgument.transformToDoubleValuesSV(valueBlock);
+      int[] resValues = _thirdArgument.transformToIntValuesSV(valueBlock);
+      for (int i = 0; i < valueBlock.getNumDocs(); i++) {
         _results[i] = ScalarFunctions.geoToH3(lonValues[i], latValues[i], resValues[i]);
       }
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAreaFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAreaFunction.java
index 5ac874335c8..5102582024d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAreaFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAreaFunction.java
@@ -21,7 +21,8 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.LiteralTransformFunction;
@@ -29,7 +30,6 @@
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.LineString;
@@ -57,7 +57,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions
         .checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s", getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -76,13 +76,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
 
-    byte[][] values = _transformFunction.transformToBytesValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    byte[][] values = _transformFunction.transformToBytesValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Geometry geometry = GeometrySerializer.deserialize(values[i]);
       _results[i] = GeometryUtils.isGeography(geometry) ? calculateGeographyArea(geometry) : geometry.getArea();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsBinaryFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsBinaryFunction.java
index 66e399925d8..4c9da0c2aa2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsBinaryFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsBinaryFunction.java
@@ -21,14 +21,14 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.locationtech.jts.geom.Geometry;
 
@@ -48,7 +48,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s",
         getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -65,13 +65,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
     }
-    byte[][] values = _transformFunction.transformToBytesValuesSV(projectionBlock);
+    byte[][] values = _transformFunction.transformToBytesValuesSV(valueBlock);
     Geometry geometry;
-    for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+    for (int i = 0; i < valueBlock.getNumDocs(); i++) {
       geometry = GeometrySerializer.deserialize(values[i]);
       _results[i] = GeometryUtils.WKB_WRITER.write(geometry);
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsTextFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsTextFunction.java
index 4f277fb3232..75e8f9acd4c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsTextFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StAsTextFunction.java
@@ -21,14 +21,14 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.locationtech.jts.geom.Geometry;
 
@@ -48,7 +48,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s",
         getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -65,13 +65,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new String[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
-    byte[][] values = _transformFunction.transformToBytesValuesSV(projectionBlock);
+    byte[][] values = _transformFunction.transformToBytesValuesSV(valueBlock);
     Geometry geometry;
-    for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+    for (int i = 0; i < valueBlock.getNumDocs(); i++) {
       geometry = GeometrySerializer.deserialize(values[i]);
       _results[i] = GeometryUtils.WKT_WRITER.write(geometry);
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StContainsFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StContainsFunction.java
index 210215c7e6d..1045da58bb9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StContainsFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StContainsFunction.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.geospatial.transform.function;
 
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
 import org.locationtech.jts.geom.Geometry;
@@ -43,8 +43,8 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    return transformGeometryToIntValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    return transformGeometryToIntValuesSV(valueBlock);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StDistanceFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StDistanceFunction.java
index a28b0ad40a9..1802d7698ac 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StDistanceFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StDistanceFunction.java
@@ -19,7 +19,7 @@
 package org.apache.pinot.core.geospatial.transform.function;
 
 import com.google.common.base.Preconditions;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
 import org.locationtech.jts.geom.Geometry;
@@ -49,8 +49,8 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    return transformGeometryToDoubleValuesSV(projectionBlock);
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    return transformGeometryToDoubleValuesSV(valueBlock);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StEqualsFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StEqualsFunction.java
index 45b4f269e1a..73d5e06c2a0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StEqualsFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StEqualsFunction.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.geospatial.transform.function;
 
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.locationtech.jts.geom.Geometry;
 
@@ -40,8 +40,8 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    return transformGeometryToIntValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    return transformGeometryToIntValuesSV(valueBlock);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StGeometryTypeFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StGeometryTypeFunction.java
index 27b1a203a1a..4fa9bf814f9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StGeometryTypeFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StGeometryTypeFunction.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.locationtech.jts.geom.Geometry;
 
@@ -46,7 +46,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions
         .checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s", getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -63,13 +63,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new String[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
-    byte[][] values = _transformFunction.transformToBytesValuesSV(projectionBlock);
+    byte[][] values = _transformFunction.transformToBytesValuesSV(valueBlock);
     Geometry geometry;
-    for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+    for (int i = 0; i < valueBlock.getNumDocs(); i++) {
       geometry = GeometrySerializer.deserialize(values[i]);
       _results[i] = geometry.getGeometryType();
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPointFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPointFunction.java
index a780c475017..b1bb8424845 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPointFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPointFunction.java
@@ -21,14 +21,13 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
 import org.apache.pinot.core.operator.transform.function.LiteralTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.spi.utils.BooleanUtils;
 
 
 /**
@@ -47,7 +46,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 2 || arguments.size() == 3,
         "2 or 3 arguments are required for transform function: %s", getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -62,7 +61,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       transformFunction = arguments.get(2);
       Preconditions.checkArgument(transformFunction instanceof LiteralTransformFunction,
           "Third argument must be a literal of integer: %s", getName());
-      _isGeography = BooleanUtils.toBoolean(((LiteralTransformFunction) transformFunction).getLiteral());
+      _isGeography = ((LiteralTransformFunction) transformFunction).getBooleanLiteral();
     }
   }
 
@@ -72,13 +71,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
     }
-    double[] firstValues = _firstArgument.transformToDoubleValuesSV(projectionBlock);
-    double[] secondValues = _secondArgument.transformToDoubleValuesSV(projectionBlock);
-    for (int i = 0; i < projectionBlock.getNumDocs(); i++) {
+    double[] firstValues = _firstArgument.transformToDoubleValuesSV(valueBlock);
+    double[] secondValues = _secondArgument.transformToDoubleValuesSV(valueBlock);
+    for (int i = 0; i < valueBlock.getNumDocs(); i++) {
       _results[i] = ScalarFunctions.stPoint(firstValues[i], secondValues[i], _isGeography);
     }
     return _results;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPolygonFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPolygonFunction.java
index 6f477662d2f..7680eafa535 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPolygonFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPolygonFunction.java
@@ -19,7 +19,7 @@
 package org.apache.pinot.core.geospatial.transform.function;
 
 import com.google.common.base.Preconditions;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
@@ -46,12 +46,12 @@ public String getName() {
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_results == null) {
       _results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
     }
-    String[] argumentValues = _transformFunction.transformToStringValuesSV(projectionBlock);
-    int length = projectionBlock.getNumDocs();
+    String[] argumentValues = _transformFunction.transformToStringValuesSV(valueBlock);
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       try {
         Geometry geometry = _reader.read(argumentValues[i]);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StWithinFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StWithinFunction.java
index 474af0d2280..60b76ac65ad 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StWithinFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StWithinFunction.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.geospatial.transform.function;
 
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
 import org.locationtech.jts.geom.Geometry;
@@ -42,8 +42,8 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    return transformGeometryToIntValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    return transformGeometryToIntValuesSV(valueBlock);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentPurger.java b/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentPurger.java
index 2b655085859..4faf6955220 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentPurger.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/minion/SegmentPurger.java
@@ -28,9 +28,11 @@
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordReader;
 import org.apache.pinot.spi.data.readers.RecordReaderConfig;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,19 +47,21 @@ public class SegmentPurger {
   private final File _indexDir;
   private final File _workingDir;
   private final TableConfig _tableConfig;
+  private final Schema _schema;
   private final RecordPurger _recordPurger;
   private final RecordModifier _recordModifier;
 
   private int _numRecordsPurged;
   private int _numRecordsModified;
 
-  public SegmentPurger(File indexDir, File workingDir, TableConfig tableConfig, @Nullable RecordPurger recordPurger,
-      @Nullable RecordModifier recordModifier) {
+  public SegmentPurger(File indexDir, File workingDir, TableConfig tableConfig, Schema schema,
+      @Nullable RecordPurger recordPurger, @Nullable RecordModifier recordModifier) {
     Preconditions.checkArgument(recordPurger != null || recordModifier != null,
         "At least one of record purger and modifier should be non-null");
     _indexDir = indexDir;
     _workingDir = workingDir;
     _tableConfig = tableConfig;
+    _schema = schema;
     _recordPurger = recordPurger;
     _recordModifier = recordModifier;
   }
@@ -79,7 +83,7 @@ public File purgeSegment()
         return null;
       }
 
-      SegmentGeneratorConfig config = new SegmentGeneratorConfig(_tableConfig, segmentMetadata.getSchema());
+      SegmentGeneratorConfig config = new SegmentGeneratorConfig(_tableConfig, _schema);
       config.setOutDir(_workingDir.getPath());
       config.setSegmentName(segmentName);
 
@@ -227,6 +231,13 @@ public interface RecordPurgerFactory {
      * Get the {@link RecordPurger} for the given table.
      */
     RecordPurger getRecordPurger(String rawTableName);
+
+    /**
+     * Get the {@link RecordPurger} associated with the given taskConfig, tableConfig and tableSchema
+     */
+    default RecordPurger getRecordPurger(PinotTaskConfig taskConfig, TableConfig tableConfig, Schema tableSchema) {
+      return getRecordPurger(TableNameBuilder.extractRawTableName(tableConfig.getTableName()));
+    }
   }
 
   /**
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java
index 4d79eeea4ab..2b722924314 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import org.apache.pinot.core.common.ExplainPlanRows;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
 import org.apache.pinot.core.plan.PlanNode;
@@ -54,12 +55,16 @@ public AcquireReleaseColumnsSegmentOperator(PlanNode planNode, IndexSegment inde
     _fetchContext = fetchContext;
   }
 
+  public void materializeChildOperator() {
+    _childOperator = (Operator<BaseResultsBlock>) _planNode.run();
+  }
+
   /**
    * Runs the planNode to get the childOperator, and then proceeds with execution.
    */
   @Override
   protected BaseResultsBlock getNextBlock() {
-    _childOperator = (Operator<BaseResultsBlock>) _planNode.run();
+    materializeChildOperator();
     return _childOperator.nextBlock();
   }
 
@@ -69,7 +74,7 @@ protected BaseResultsBlock getNextBlock() {
   public void acquire() {
     // do not acquire if interrupted (similar to the check inside the nextBlock())
     if (Thread.interrupted()) {
-      throw new EarlyTerminationException();
+      throw new EarlyTerminationException("Interrupted while acquiring segment");
     }
     _indexSegment.acquire(_fetchContext);
   }
@@ -81,6 +86,11 @@ public void release() {
     _indexSegment.release(_fetchContext);
   }
 
+  @Override
+  public void prepareForExplainPlan(ExplainPlanRows explainPlanRows) {
+    acquire();
+    materializeChildOperator();
+  }
 
   @Override
   public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/BaseOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/BaseOperator.java
index b0694bcd75f..c9ab35457d8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/BaseOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/BaseOperator.java
@@ -37,7 +37,7 @@ public final T nextBlock() {
        itself will cancel all worker's futures. Therefore, the worker will interrupt even if we only kill the runner
        thread. */
     if (Tracing.ThreadAccountantOps.isInterrupted()) {
-      throw new EarlyTerminationException();
+      throw new EarlyTerminationException("Interrupted while processing next block");
     }
     try (InvocationScope ignored = Tracing.getTracer().createScope(getClass())) {
       return getNextBlock();
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/JsonIndexReaderProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/BaseProjectOperator.java
similarity index 52%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/JsonIndexReaderProvider.java
rename to pinot-core/src/main/java/org/apache/pinot/core/operator/BaseProjectOperator.java
index 8f048613b82..aaaa8cc4155 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/JsonIndexReaderProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/BaseProjectOperator.java
@@ -16,23 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.index.reader.provider;
+package org.apache.pinot.core.operator;
 
-import java.io.IOException;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import java.util.Map;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 
 
-public interface JsonIndexReaderProvider {
+public abstract class BaseProjectOperator<T extends ValueBlock> extends BaseOperator<T> {
 
   /**
-   * Creates a {@see JsonIndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a JSON index reader
-   * @throws IOException if reading from the buffer fails.
+   * Returns a map from source column name to context.
    */
-  JsonIndexReader newJsonIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
+  public abstract Map<String, ColumnContext> getSourceColumnContextMap();
+
+  /**
+   * Returns the result column context. Without transform, the source and result column context are the same.
+   */
+  public abstract ColumnContext getResultColumnContext(ExpressionContext expression);
+
+  /**
+   * Returns the number of columns projected.
+   */
+  public int getNumColumnsProjected() {
+    return getSourceColumnContextMap().size();
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java
index b251c552d89..4f203599c1e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java
@@ -52,6 +52,11 @@ public BitmapDocIdSetOperator(ImmutableBitmapDataProvider bitmap, int numDocs) {
     _docIdBuffer = new int[Math.min(numDocs, DocIdSetPlanNode.MAX_DOC_PER_CALL)];
   }
 
+  public BitmapDocIdSetOperator(IntIterator intIterator, int[] docIdBuffer) {
+    _intIterator = intIterator;
+    _docIdBuffer = docIdBuffer;
+  }
+
   public BitmapDocIdSetOperator(ImmutableBitmapDataProvider bitmap, int[] docIdBuffer) {
     _intIterator = bitmap.getIntIterator();
     _docIdBuffer = docIdBuffer;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/ColumnContext.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/ColumnContext.java
new file mode 100644
index 00000000000..878ef0b3f95
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/ColumnContext.java
@@ -0,0 +1,73 @@
+/**
+ * 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.pinot.core.operator;
+
+import javax.annotation.Nullable;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.operator.transform.function.TransformFunction;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+
+
+public class ColumnContext {
+  private final DataType _dataType;
+  private final boolean _isSingleValue;
+  private final Dictionary _dictionary;
+  private final DataSource _dataSource;
+
+  private ColumnContext(DataType dataType, boolean isSingleValue, @Nullable Dictionary dictionary,
+      @Nullable DataSource dataSource) {
+    _dataType = dataType;
+    _isSingleValue = isSingleValue;
+    _dictionary = dictionary;
+    _dataSource = dataSource;
+  }
+
+  public DataType getDataType() {
+    return _dataType;
+  }
+
+  public boolean isSingleValue() {
+    return _isSingleValue;
+  }
+
+  @Nullable
+  public Dictionary getDictionary() {
+    return _dictionary;
+  }
+
+  @Nullable
+  public DataSource getDataSource() {
+    return _dataSource;
+  }
+
+  public static ColumnContext fromDataSource(DataSource dataSource) {
+    DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
+    return new ColumnContext(dataSourceMetadata.getDataType(), dataSourceMetadata.isSingleValue(),
+        dataSource.getDictionary(), dataSource);
+  }
+
+  public static ColumnContext fromTransformFunction(TransformFunction transformFunction) {
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    return new ColumnContext(resultMetadata.getDataType(), resultMetadata.isSingleValue(),
+        transformFunction.getDictionary(), null);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java
index 6ee1314459f..2d6e9acc67d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java
@@ -22,9 +22,9 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.DocIdSetBlock;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.core.operator.filter.BaseFilterOperator;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.spi.Constants;
@@ -45,7 +45,7 @@ public class DocIdSetOperator extends BaseOperator<DocIdSetBlock> {
   private final BaseFilterOperator _filterOperator;
   private final int _maxSizeOfDocIdSet;
 
-  private FilterBlockDocIdSet _filterBlockDocIdSet;
+  private BlockDocIdSet _blockDocIdSet;
   private BlockDocIdIterator _blockDocIdIterator;
   private int _currentDocId = 0;
 
@@ -61,11 +61,10 @@ protected DocIdSetBlock getNextBlock() {
       return null;
     }
 
-
     // Initialize filter block document Id set
-    if (_filterBlockDocIdSet == null) {
-      _filterBlockDocIdSet = _filterOperator.nextBlock().getBlockDocIdSet();
-      _blockDocIdIterator = _filterBlockDocIdSet.iterator();
+    if (_blockDocIdSet == null) {
+      _blockDocIdSet = _filterOperator.nextBlock().getBlockDocIdSet();
+      _blockDocIdIterator = _blockDocIdSet.iterator();
     }
 
     Tracing.ThreadAccountantOps.sample();
@@ -86,7 +85,6 @@ protected DocIdSetBlock getNextBlock() {
     }
   }
 
-
   @Override
   public String toExplainString() {
     return EXPLAIN_NAME;
@@ -99,8 +97,7 @@ public List<Operator> getChildOperators() {
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter =
-        _filterBlockDocIdSet != null ? _filterBlockDocIdSet.getNumEntriesScannedInFilter() : 0;
+    long numEntriesScannedInFilter = _blockDocIdSet != null ? _blockDocIdSet.getNumEntriesScannedInFilter() : 0;
     return new ExecutionStatistics(0, numEntriesScannedInFilter, 0, 0);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java
index e0ca51302fc..75f6c46103f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java
@@ -20,25 +20,30 @@
 
 import java.util.Collections;
 import java.util.List;
+import org.apache.commons.lang.StringUtils;
 import org.apache.pinot.common.datatable.DataTable.MetadataKey;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.InstanceResponseBlock;
 import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
 import org.apache.pinot.core.operator.combine.BaseCombineOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.FetchContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.apache.pinot.spi.exception.QueryCancelledException;
+import org.apache.pinot.spi.trace.Tracing;
 
 
 public class InstanceResponseOperator extends BaseOperator<InstanceResponseBlock> {
   private static final String EXPLAIN_NAME = "INSTANCE_RESPONSE";
 
-  private final BaseCombineOperator<?> _combineOperator;
-  private final List<IndexSegment> _indexSegments;
-  private final List<FetchContext> _fetchContexts;
-  private final int _fetchContextSize;
-  private final QueryContext _queryContext;
+  protected final BaseCombineOperator<?> _combineOperator;
+  protected final List<IndexSegment> _indexSegments;
+  protected final List<FetchContext> _fetchContexts;
+  protected final int _fetchContextSize;
+  protected final QueryContext _queryContext;
 
   public InstanceResponseOperator(BaseCombineOperator<?> combineOperator, List<IndexSegment> indexSegments,
       List<FetchContext> fetchContexts, QueryContext queryContext) {
@@ -111,18 +116,23 @@ private BaseResultsBlock getCombinedResults() {
     try {
       prefetchAll();
       return _combineOperator.nextBlock();
+    } catch (EarlyTerminationException e) {
+      Exception killedErrorMsg = Tracing.getThreadAccountant().getErrorStatus();
+      return new ExceptionResultsBlock(new QueryCancelledException(
+          "Cancelled while combining results" + (killedErrorMsg == null ? StringUtils.EMPTY : " " + killedErrorMsg),
+          e));
     } finally {
       releaseAll();
     }
   }
 
-  private void prefetchAll() {
+  public void prefetchAll() {
     for (int i = 0; i < _fetchContextSize; i++) {
       _indexSegments.get(i).prefetch(_fetchContexts.get(i));
     }
   }
 
-  private void releaseAll() {
+  public void releaseAll() {
     for (int i = 0; i < _fetchContextSize; i++) {
       _indexSegments.get(i).release(_fetchContexts.get(i));
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java
index fb3c26df75d..3a48d6ed929 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java
@@ -19,9 +19,12 @@
 package org.apache.pinot.core.operator;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.HashUtil;
 import org.apache.pinot.core.common.DataBlockCache;
 import org.apache.pinot.core.common.DataFetcher;
 import org.apache.pinot.core.common.Operator;
@@ -31,28 +34,33 @@
 import org.apache.pinot.spi.trace.Tracing;
 
 
-public class ProjectionOperator extends BaseOperator<ProjectionBlock> {
-
+public class ProjectionOperator extends BaseProjectOperator<ProjectionBlock> {
   private static final String EXPLAIN_NAME = "PROJECT";
 
   private final Map<String, DataSource> _dataSourceMap;
   private final BaseOperator<DocIdSetBlock> _docIdSetOperator;
   private final DataBlockCache _dataBlockCache;
+  private final Map<String, ColumnContext> _columnContextMap;
 
   public ProjectionOperator(Map<String, DataSource> dataSourceMap,
       @Nullable BaseOperator<DocIdSetBlock> docIdSetOperator) {
     _dataSourceMap = dataSourceMap;
     _docIdSetOperator = docIdSetOperator;
     _dataBlockCache = new DataBlockCache(new DataFetcher(dataSourceMap));
+    _columnContextMap = new HashMap<>(HashUtil.getHashMapCapacity(dataSourceMap.size()));
+    dataSourceMap.forEach(
+        (column, dataSource) -> _columnContextMap.put(column, ColumnContext.fromDataSource(dataSource)));
+  }
+
+  @Override
+  public Map<String, ColumnContext> getSourceColumnContextMap() {
+    return _columnContextMap;
   }
 
-  /**
-   * Returns the map from column to data source.
-   *
-   * @return Map from column to data source
-   */
-  public Map<String, DataSource> getDataSourceMap() {
-    return _dataSourceMap;
+  @Override
+  public ColumnContext getResultColumnContext(ExpressionContext expression) {
+    assert expression.getType() == ExpressionContext.Type.IDENTIFIER;
+    return _columnContextMap.get(expression.getIdentifier());
   }
 
   @Override
@@ -64,14 +72,13 @@ protected ProjectionBlock getNextBlock() {
       return null;
     } else {
       Tracing.activeRecording().setNumChildren(_dataSourceMap.size());
-      _dataBlockCache.initNewBlock(docIdSetBlock.getDocIdSet(), docIdSetBlock.getSearchableLength());
+      _dataBlockCache.initNewBlock(docIdSetBlock.getDocIds(), docIdSetBlock.getLength());
       return new ProjectionBlock(_dataSourceMap, _dataBlockCache);
     }
   }
 
-
   @Override
-  public List<Operator> getChildOperators() {
+  public List<Operator<DocIdSetBlock>> getChildOperators() {
     return Collections.singletonList(_docIdSetOperator);
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/DocIdSetBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/DocIdSetBlock.java
index bf2528bbb88..d4bb1562769 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/DocIdSetBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/DocIdSetBlock.java
@@ -19,48 +19,27 @@
 package org.apache.pinot.core.operator.blocks;
 
 import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.docidsets.ArrayBasedDocIdSet;
+import org.apache.pinot.core.operator.DocIdSetOperator;
 
 
+/**
+ * The {@code DocIdSetBlock} contains a block of document ids (sorted), and is returned from {@link DocIdSetOperator}.
+ * Each {@code DocIdSetOperator} can return multiple {@code DocIdSetBlock}s.
+ */
 public class DocIdSetBlock implements Block {
+  private final int[] _docIds;
+  private final int _length;
 
-  private final int[] _docIdArray;
-  private final int _searchableLength;
-
-  public DocIdSetBlock(int[] docIdSet, int searchableLength) {
-    _docIdArray = docIdSet;
-    _searchableLength = searchableLength;
-  }
-
-  public int[] getDocIdSet() {
-    return _docIdArray;
-  }
-
-  public int getSearchableLength() {
-    return _searchableLength;
-  }
-
-  @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
+  public DocIdSetBlock(int[] docIds, int length) {
+    _docIds = docIds;
+    _length = length;
   }
 
-  @Override
-  public BlockDocIdSet getBlockDocIdSet() {
-    return new ArrayBasedDocIdSet(_docIdArray, _searchableLength);
+  public int[] getDocIds() {
+    return _docIds;
   }
 
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
+  public int getLength() {
+    return _length;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/FilterBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/FilterBlock.java
index 8afdd8cd3d6..185939283bf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/FilterBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/FilterBlock.java
@@ -19,50 +19,31 @@
 package org.apache.pinot.core.operator.blocks;
 
 import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
+import org.apache.pinot.core.common.BlockDocIdSet;
 
 
 /**
  * The {@code FilterBlock} class is the block holding the document Ids returned from the filter operator.
  */
 public class FilterBlock implements Block {
-  private final FilterBlockDocIdSet _filterBlockDocIdSet;
-  private FilterBlockDocIdSet _nonScanFilterBlockDocIdSet;
+  private final BlockDocIdSet _blockDocIdSet;
+  private BlockDocIdSet _nonScanBlockDocIdSet;
 
-  public FilterBlock(FilterBlockDocIdSet filterBlockDocIdSet) {
-    _filterBlockDocIdSet = filterBlockDocIdSet;
+  public FilterBlock(BlockDocIdSet blockDocIdSet) {
+    _blockDocIdSet = blockDocIdSet;
   }
 
   /**
    * Pre-scans the documents if needed, and returns a non-scan-based FilterBlockDocIdSet.
    */
-  public FilterBlockDocIdSet getNonScanFilterBLockDocIdSet() {
-    if (_nonScanFilterBlockDocIdSet == null) {
-      _nonScanFilterBlockDocIdSet = _filterBlockDocIdSet.toNonScanDocIdSet();
+  public BlockDocIdSet getNonScanFilterBLockDocIdSet() {
+    if (_nonScanBlockDocIdSet == null) {
+      _nonScanBlockDocIdSet = _blockDocIdSet.toNonScanDocIdSet();
     }
-    return _nonScanFilterBlockDocIdSet;
+    return _nonScanBlockDocIdSet;
   }
 
-  @Override
-  public FilterBlockDocIdSet getBlockDocIdSet() {
-    return _nonScanFilterBlockDocIdSet != null ? _nonScanFilterBlockDocIdSet : _filterBlockDocIdSet;
-  }
-
-  @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
+  public BlockDocIdSet getBlockDocIdSet() {
+    return _nonScanBlockDocIdSet != null ? _nonScanBlockDocIdSet : _blockDocIdSet;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/InstanceResponseBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/InstanceResponseBlock.java
index 4708d5cf832..9c923ecfc7e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/InstanceResponseBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/InstanceResponseBlock.java
@@ -28,10 +28,6 @@
 import org.apache.pinot.common.response.ProcessingException;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
-import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
 import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
 import org.apache.pinot.core.query.request.context.QueryContext;
@@ -145,24 +141,4 @@ private void attachMetadata(DataTable dataTable) {
     }
     dataTable.getMetadata().putAll(_metadata);
   }
-
-  @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdSet getBlockDocIdSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ProjectionBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ProjectionBlock.java
index 066d27b350d..efef8693d03 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ProjectionBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ProjectionBlock.java
@@ -20,10 +20,7 @@
 
 import java.math.BigDecimal;
 import java.util.Map;
-import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
+import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.common.DataBlockCache;
 import org.apache.pinot.core.operator.docvalsets.ProjectionBlockValSet;
@@ -35,7 +32,7 @@
  * ProjectionBlock holds a column name to Block Map.
  * It provides DocIdSetBlock for a given column.
  */
-public class ProjectionBlock implements Block {
+public class ProjectionBlock implements ValueBlock {
   private final Map<String, DataSource> _dataSourceMap;
   private final DataBlockCache _dataBlockCache;
 
@@ -44,36 +41,25 @@ public ProjectionBlock(Map<String, DataSource> dataSourceMap, DataBlockCache dat
     _dataBlockCache = dataBlockCache;
   }
 
+  @Override
   public int getNumDocs() {
     return _dataBlockCache.getNumDocs();
   }
 
+  @Override
   public int[] getDocIds() {
     return _dataBlockCache.getDocIds();
   }
 
-  public BlockValSet getBlockValueSet(String column) {
-    return new ProjectionBlockValSet(_dataBlockCache, column, _dataSourceMap.get(column));
-  }
-
-  @Override
-  public BlockDocIdSet getBlockDocIdSet() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
+  public BlockValSet getBlockValueSet(ExpressionContext expression) {
+    assert expression.getType() == ExpressionContext.Type.IDENTIFIER;
+    return getBlockValueSet(expression.getIdentifier());
   }
 
   @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
+  public BlockValSet getBlockValueSet(String column) {
+    return new ProjectionBlockValSet(_dataBlockCache, column, _dataSourceMap.get(column));
   }
 
   /**
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/TransformBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/TransformBlock.java
index 5625a5704d4..65460d857c9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/TransformBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/TransformBlock.java
@@ -19,67 +19,47 @@
 package org.apache.pinot.core.operator.blocks;
 
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
 import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.operator.docvalsets.TransformBlockValSet;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 
 
 /**
- * Transform Block holds blocks of transformed columns.
- * <p>In absence of transforms, it servers as a pass-through to projection block.
+ * The {@code TransformBlock} contains values of the transformed columns.
  */
-public class TransformBlock implements Block {
-  protected final ProjectionBlock _projectionBlock;
+public class TransformBlock implements ValueBlock {
+  protected final ValueBlock _sourceBlock;
   protected final Map<ExpressionContext, TransformFunction> _transformFunctionMap;
 
-  public TransformBlock(ProjectionBlock projectionBlock,
-      Map<ExpressionContext, TransformFunction> transformFunctionMap) {
-    _projectionBlock = projectionBlock;
+  public TransformBlock(ValueBlock sourceBlock, Map<ExpressionContext, TransformFunction> transformFunctionMap) {
+    _sourceBlock = sourceBlock;
     _transformFunctionMap = transformFunctionMap;
   }
 
+  @Override
   public int getNumDocs() {
-    return _projectionBlock.getNumDocs();
+    return _sourceBlock.getNumDocs();
   }
 
+  @Nullable
+  @Override
   public int[] getDocIds() {
-    return _projectionBlock.getDocIds();
+    return _sourceBlock.getDocIds();
   }
 
+  @Override
   public BlockValSet getBlockValueSet(ExpressionContext expression) {
     if (expression.getType() == ExpressionContext.Type.IDENTIFIER) {
-      return _projectionBlock.getBlockValueSet(expression.getIdentifier());
+      return _sourceBlock.getBlockValueSet(expression);
     } else {
-      return new TransformBlockValSet(_projectionBlock, _transformFunctionMap.get(expression), expression);
+      return new TransformBlockValSet(_sourceBlock, _transformFunctionMap.get(expression));
     }
   }
 
-  public BlockValSet getBlockValueSet(String column) {
-    return _projectionBlock.getBlockValueSet(column);
-  }
-
-  @Override
-  public BlockDocIdSet getBlockDocIdSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
+  public BlockValSet getBlockValueSet(String column) {
+    return _sourceBlock.getBlockValueSet(column);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/PassThroughTransformBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ValueBlock.java
similarity index 59%
rename from pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/PassThroughTransformBlock.java
rename to pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ValueBlock.java
index c9f7d0d7e19..a135c1edf09 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/PassThroughTransformBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/ValueBlock.java
@@ -18,24 +18,35 @@
  */
 package org.apache.pinot.core.operator.blocks;
 
-import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.core.common.Block;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.transform.function.TransformFunction;
 
 
 /**
- * Transform Block servers as a pass-through to projection block.
+ * The {@code ValueBlock} contains a block of values for multiple expressions.
  */
-public class PassThroughTransformBlock extends TransformBlock {
+public interface ValueBlock extends Block {
 
-  public PassThroughTransformBlock(ProjectionBlock projectionBlock,
-      Map<ExpressionContext, TransformFunction> transformFunctionMap) {
-    super(projectionBlock, transformFunctionMap);
-  }
+  /**
+   * Returns the number of documents within the block.
+   */
+  int getNumDocs();
 
-  @Override
-  public BlockValSet getBlockValueSet(ExpressionContext expression) {
-    return _projectionBlock.getBlockValueSet(expression.getIdentifier());
-  }
+  /**
+   * Returns the document ids from the segment, or {@code null} if it is not available.
+   */
+  @Nullable
+  int[] getDocIds();
+
+  /**
+   * Returns the values for a given expression.
+   */
+  BlockValSet getBlockValueSet(ExpressionContext expression);
+
+  /**
+   * Returns the values for a given column (identifier).
+   */
+  BlockValSet getBlockValueSet(String column);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/AggregationResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/AggregationResultsBlock.java
index 54fa0b9558b..1b300aeb118 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/AggregationResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/AggregationResultsBlock.java
@@ -19,17 +19,20 @@
 package org.apache.pinot.core.operator.blocks.results;
 
 import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.common.request.context.FilterContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.common.datatable.DataTableBuilder;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.roaringbitmap.RoaringBitmap;
@@ -63,13 +66,17 @@ public int getNumRows() {
 
   @Override
   public DataSchema getDataSchema(QueryContext queryContext) {
-    boolean returnFinalResult = queryContext.isServerReturnFinalResult();
-    int numColumns = _aggregationFunctions.length;
+    List<Pair<AggregationFunction, FilterContext>> filteredAggregationFunctions =
+        queryContext.getFilteredAggregationFunctions();
+    assert filteredAggregationFunctions != null;
+    int numColumns = filteredAggregationFunctions.size();
     String[] columnNames = new String[numColumns];
     ColumnDataType[] columnDataTypes = new ColumnDataType[numColumns];
+    boolean returnFinalResult = queryContext.isServerReturnFinalResult();
     for (int i = 0; i < numColumns; i++) {
-      AggregationFunction aggregationFunction = _aggregationFunctions[i];
-      columnNames[i] = aggregationFunction.getColumnName();
+      Pair<AggregationFunction, FilterContext> pair = filteredAggregationFunctions.get(i);
+      AggregationFunction aggregationFunction = pair.getLeft();
+      columnNames[i] = AggregationFunctionUtils.getResultColumnName(aggregationFunction, pair.getRight());
       columnDataTypes[i] = returnFinalResult ? aggregationFunction.getFinalResultColumnType()
           : aggregationFunction.getIntermediateResultColumnType();
     }
@@ -77,19 +84,19 @@ public DataSchema getDataSchema(QueryContext queryContext) {
   }
 
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     return Collections.singletonList(_results.toArray());
   }
 
   @Override
   public DataTable getDataTable(QueryContext queryContext)
       throws IOException {
-    boolean returnFinalResult = queryContext.isServerReturnFinalResult();
     DataSchema dataSchema = getDataSchema(queryContext);
     assert dataSchema != null;
     ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
     int numColumns = columnDataTypes.length;
     DataTableBuilder dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema);
+    boolean returnFinalResult = queryContext.isServerReturnFinalResult();
     if (queryContext.isNullHandlingEnabled()) {
       RoaringBitmap[] nullBitmaps = new RoaringBitmap[numColumns];
       for (int i = 0; i < numColumns; i++) {
@@ -133,6 +140,9 @@ private void setIntermediateResult(DataTableBuilder dataTableBuilder, ColumnData
       throws IOException {
     ColumnDataType columnDataType = columnDataTypes[index];
     switch (columnDataType) {
+      case INT:
+        dataTableBuilder.setColumn(index, (int) result);
+        break;
       case LONG:
         dataTableBuilder.setColumn(index, (long) result);
         break;
@@ -151,7 +161,7 @@ private void setFinalResult(DataTableBuilder dataTableBuilder, ColumnDataType[]
       Object result)
       throws IOException {
     ColumnDataType columnDataType = columnDataTypes[index];
-    switch (columnDataType) {
+    switch (columnDataType.getStoredType()) {
       case INT:
         dataTableBuilder.setColumn(index, (int) result);
         break;
@@ -176,6 +186,9 @@ private void setFinalResult(DataTableBuilder dataTableBuilder, ColumnDataType[]
       case DOUBLE_ARRAY:
         dataTableBuilder.setColumn(index, ((DoubleArrayList) result).elements());
         break;
+      case LONG_ARRAY:
+        dataTableBuilder.setColumn(index, ((LongArrayList) result).elements());
+        break;
       default:
         throw new IllegalStateException("Illegal column data type in final result: " + columnDataType);
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/BaseResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/BaseResultsBlock.java
index 7c17a7abb65..b611430d506 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/BaseResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/BaseResultsBlock.java
@@ -21,7 +21,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,10 +30,6 @@
 import org.apache.pinot.common.response.ProcessingException;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
-import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.query.request.context.QueryContext;
 
 
@@ -175,7 +170,7 @@ public void setNumServerThreads(int numServerThreads) {
    * Returns the rows for the results. Return {@code null} when the block only contains metadata.
    */
   @Nullable
-  public abstract Collection<Object[]> getRows(QueryContext queryContext);
+  public abstract List<Object[]> getRows(QueryContext queryContext);
 
   /**
    * Returns a data table without metadata or exception attached.
@@ -199,24 +194,4 @@ public Map<String, String> getResultsMetadata() {
     metadata.put(MetadataKey.NUM_CONSUMING_SEGMENTS_MATCHED.getName(), Integer.toString(_numConsumingSegmentsMatched));
     return metadata;
   }
-
-  @Override
-  public BlockDocIdSet getBlockDocIdSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/DistinctResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/DistinctResultsBlock.java
index 99a0f868c6b..b1d4fc3ade9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/DistinctResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/DistinctResultsBlock.java
@@ -25,7 +25,6 @@
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.data.table.Record;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
@@ -35,11 +34,9 @@
  * Results block for distinct queries.
  */
 public class DistinctResultsBlock extends BaseResultsBlock {
-  private final DistinctAggregationFunction _distinctFunction;
   private DistinctTable _distinctTable;
 
-  public DistinctResultsBlock(DistinctAggregationFunction distinctFunction, DistinctTable distinctTable) {
-    _distinctFunction = distinctFunction;
+  public DistinctResultsBlock(DistinctTable distinctTable) {
     _distinctTable = distinctTable;
   }
 
@@ -62,7 +59,7 @@ public DataSchema getDataSchema(QueryContext queryContext) {
   }
 
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     List<Object[]> rows = new ArrayList<>(_distinctTable.size());
     for (Record record : _distinctTable.getRecords()) {
       rows.add(record.getValues());
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExceptionResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExceptionResultsBlock.java
index 783c7c22a4e..0b7e6e05d06 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExceptionResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExceptionResultsBlock.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.operator.blocks.results;
 
-import java.util.Collection;
+import java.util.List;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.exception.QueryException;
@@ -26,6 +26,7 @@
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
 import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.spi.exception.QueryCancelledException;
 
 
 public class ExceptionResultsBlock extends BaseResultsBlock {
@@ -38,6 +39,10 @@ public ExceptionResultsBlock(Throwable t) {
     this(QueryException.QUERY_EXECUTION_ERROR, t);
   }
 
+  public ExceptionResultsBlock(QueryCancelledException t) {
+    this(QueryException.QUERY_CANCELLATION_ERROR, t);
+  }
+
   @Override
   public int getNumRows() {
     return 0;
@@ -51,7 +56,7 @@ public DataSchema getDataSchema(QueryContext queryContext) {
 
   @Nullable
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     return null;
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExplainResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExplainResultsBlock.java
index bb3e71958be..5789c9ba76a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExplainResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ExplainResultsBlock.java
@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,7 +51,7 @@ public int getNumRows() {
   }
 
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     List<Object[]> rows = new ArrayList<>(_entries.size());
     for (ExplainEntry entry : _entries) {
       rows.add(entry.toRow());
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/GroupByResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/GroupByResultsBlock.java
index f431f4bd6f7..7e5057b4d42 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/GroupByResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/GroupByResultsBlock.java
@@ -149,7 +149,7 @@ public DataSchema getDataSchema(QueryContext queryContext) {
 
   @Nullable
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     if (_table == null) {
       return Collections.emptyList();
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/MetadataResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/MetadataResultsBlock.java
index 3ef747d2a14..97b941f3d64 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/MetadataResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/MetadataResultsBlock.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.operator.blocks.results;
 
-import java.util.Collection;
+import java.util.List;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -41,7 +41,7 @@ public DataSchema getDataSchema(QueryContext queryContext) {
 
   @Nullable
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     return null;
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtils.java
index 6fe8346a8b0..ed59ffbcc6d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtils.java
@@ -29,7 +29,6 @@
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextUtils;
@@ -43,16 +42,16 @@ private ResultsBlockUtils() {
   public static BaseResultsBlock buildEmptyQueryResults(QueryContext queryContext) {
     if (QueryContextUtils.isSelectionQuery(queryContext)) {
       return buildEmptySelectionQueryResults(queryContext);
-    } else if (QueryContextUtils.isAggregationQuery(queryContext)) {
+    }
+    if (QueryContextUtils.isAggregationQuery(queryContext)) {
       if (queryContext.getGroupByExpressions() == null) {
         return buildEmptyAggregationQueryResults(queryContext);
       } else {
         return buildEmptyGroupByQueryResults(queryContext);
       }
-    } else {
-      assert QueryContextUtils.isDistinctQuery(queryContext);
-      return buildEmptyDistinctQueryResults(queryContext);
     }
+    assert QueryContextUtils.isDistinctQuery(queryContext);
+    return buildEmptyDistinctQueryResults(queryContext);
   }
 
   private static SelectionResultsBlock buildEmptySelectionQueryResults(QueryContext queryContext) {
@@ -71,8 +70,6 @@ private static SelectionResultsBlock buildEmptySelectionQueryResults(QueryContex
 
   private static AggregationResultsBlock buildEmptyAggregationQueryResults(QueryContext queryContext) {
     AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
-    List<Pair<AggregationFunction, FilterContext>> filteredAggregationFunctions =
-        queryContext.getFilteredAggregationFunctions();
     assert aggregationFunctions != null;
     int numAggregations = aggregationFunctions.length;
     List<Object> results = new ArrayList<>(numAggregations);
@@ -85,9 +82,8 @@ private static AggregationResultsBlock buildEmptyAggregationQueryResults(QueryCo
   private static GroupByResultsBlock buildEmptyGroupByQueryResults(QueryContext queryContext) {
     List<Pair<AggregationFunction, FilterContext>> filteredAggregationFunctions =
         queryContext.getFilteredAggregationFunctions();
-
     List<ExpressionContext> groupByExpressions = queryContext.getGroupByExpressions();
-    assert groupByExpressions != null;
+    assert filteredAggregationFunctions != null && groupByExpressions != null;
     int numColumns = groupByExpressions.size() + filteredAggregationFunctions.size();
     String[] columnNames = new String[numColumns];
     ColumnDataType[] columnDataTypes = new ColumnDataType[numColumns];
@@ -98,12 +94,9 @@ private static GroupByResultsBlock buildEmptyGroupByQueryResults(QueryContext qu
       columnDataTypes[index] = ColumnDataType.STRING;
       index++;
     }
-    for (Pair<AggregationFunction, FilterContext> aggFilterPair : filteredAggregationFunctions) {
-      // NOTE: Use AggregationFunction.getResultColumnName() for SQL format response
-      AggregationFunction aggregationFunction = aggFilterPair.getLeft();
-      String columnName =
-          AggregationFunctionUtils.getResultColumnName(aggregationFunction, aggFilterPair.getRight());
-      columnNames[index] = columnName;
+    for (Pair<AggregationFunction, FilterContext> pair : filteredAggregationFunctions) {
+      AggregationFunction aggregationFunction = pair.getLeft();
+      columnNames[index] = AggregationFunctionUtils.getResultColumnName(aggregationFunction, pair.getRight());
       columnDataTypes[index] = aggregationFunction.getIntermediateResultColumnType();
       index++;
     }
@@ -111,17 +104,17 @@ private static GroupByResultsBlock buildEmptyGroupByQueryResults(QueryContext qu
   }
 
   private static DistinctResultsBlock buildEmptyDistinctQueryResults(QueryContext queryContext) {
-    AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
-    assert aggregationFunctions != null && aggregationFunctions.length == 1
-        && aggregationFunctions[0] instanceof DistinctAggregationFunction;
-    DistinctAggregationFunction distinctAggregationFunction = (DistinctAggregationFunction) aggregationFunctions[0];
-    String[] columnNames = distinctAggregationFunction.getColumns();
-    ColumnDataType[] columnDataTypes = new ColumnDataType[columnNames.length];
+    List<ExpressionContext> expressions = queryContext.getSelectExpressions();
+    int numExpressions = expressions.size();
+    String[] columns = new String[numExpressions];
+    for (int i = 0; i < numExpressions; i++) {
+      columns[i] = expressions.get(i).toString();
+    }
+    ColumnDataType[] columnDataTypes = new ColumnDataType[numExpressions];
     // NOTE: Use STRING column data type as default for distinct query
     Arrays.fill(columnDataTypes, ColumnDataType.STRING);
-    DistinctTable distinctTable =
-        new DistinctTable(new DataSchema(columnNames, columnDataTypes), Collections.emptySet(),
-            queryContext.isNullHandlingEnabled());
-    return new DistinctResultsBlock(distinctAggregationFunction, distinctTable);
+    DistinctTable distinctTable = new DistinctTable(new DataSchema(columns, columnDataTypes), Collections.emptySet(),
+        queryContext.isNullHandlingEnabled());
+    return new DistinctResultsBlock(distinctTable);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/SelectionResultsBlock.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/SelectionResultsBlock.java
index 363cd1a4f5a..b19c9898c69 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/SelectionResultsBlock.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/blocks/results/SelectionResultsBlock.java
@@ -18,12 +18,9 @@
  */
 package org.apache.pinot.core.operator.blocks.results;
 
-import com.google.common.base.Preconditions;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import java.util.PriorityQueue;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -36,32 +33,37 @@
  */
 public class SelectionResultsBlock extends BaseResultsBlock {
   private final DataSchema _dataSchema;
-  private final Collection<Object[]> _rows;
   private final Comparator<? super Object[]> _comparator;
+  private List<Object[]> _rows;
 
-  public SelectionResultsBlock(DataSchema dataSchema, List<Object[]> rows) {
-    this(dataSchema, rows, null);
-  }
-
-  public SelectionResultsBlock(DataSchema dataSchema, PriorityQueue<Object[]> rows) {
-    this(dataSchema, rows, rows.comparator());
-  }
-
-  public SelectionResultsBlock(DataSchema dataSchema, Collection<Object[]> rows,
+  public SelectionResultsBlock(DataSchema dataSchema, List<Object[]> rows,
       @Nullable Comparator<? super Object[]> comparator) {
     _dataSchema = dataSchema;
     _rows = rows;
     _comparator = comparator;
   }
 
+  public SelectionResultsBlock(DataSchema dataSchema, List<Object[]> rows) {
+    this(dataSchema, rows, null);
+  }
+
   public DataSchema getDataSchema() {
     return _dataSchema;
   }
 
-  public Collection<Object[]> getRows() {
+  public List<Object[]> getRows() {
     return _rows;
   }
 
+  public void setRows(List<Object[]> rows) {
+    _rows = rows;
+  }
+
+  @Nullable
+  public Comparator<? super Object[]> getComparator() {
+    return _comparator;
+  }
+
   @Override
   public int getNumRows() {
     return _rows.size();
@@ -73,25 +75,10 @@ public DataSchema getDataSchema(QueryContext queryContext) {
   }
 
   @Override
-  public Collection<Object[]> getRows(QueryContext queryContext) {
+  public List<Object[]> getRows(QueryContext queryContext) {
     return _rows;
   }
 
-  public SelectionResultsBlock convertToPriorityQueueBased() {
-    if (_rows instanceof PriorityQueue) {
-      return this;
-    }
-    Preconditions.checkState(_comparator != null, "No comparator specified in the results block");
-    PriorityQueue<Object[]> result = new PriorityQueue<>(_comparator);
-    result.addAll(_rows);
-    return new SelectionResultsBlock(_dataSchema, result);
-  }
-
-  public PriorityQueue<Object[]> getRowsAsPriorityQueue() {
-    Preconditions.checkState(_rows instanceof PriorityQueue, "The results block is not backed by a priority queue");
-    return (PriorityQueue<Object[]>) _rows;
-  }
-
   @Override
   public DataTable getDataTable(QueryContext queryContext)
       throws IOException {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationCombineOperator.java
index 6dbb6fd839b..e7f888ef006 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationCombineOperator.java
@@ -22,37 +22,24 @@
 import java.util.concurrent.ExecutorService;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
-import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.core.operator.combine.merger.AggregationResultsBlockMerger;
 import org.apache.pinot.core.query.request.context.QueryContext;
 
 
 /**
  * Combine operator for aggregation queries.
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class AggregationCombineOperator extends BaseCombineOperator<AggregationResultsBlock> {
+@SuppressWarnings({"rawtypes"})
+public class AggregationCombineOperator extends BaseSingleBlockCombineOperator<AggregationResultsBlock> {
   private static final String EXPLAIN_NAME = "COMBINE_AGGREGATE";
 
   public AggregationCombineOperator(List<Operator> operators, QueryContext queryContext,
       ExecutorService executorService) {
-    super(operators, queryContext, executorService);
+    super(new AggregationResultsBlockMerger(queryContext), operators, queryContext, executorService);
   }
 
   @Override
   public String toExplainString() {
     return EXPLAIN_NAME;
   }
-
-  @Override
-  protected void mergeResultsBlocks(AggregationResultsBlock mergedBlock, AggregationResultsBlock blockToMerge) {
-    AggregationFunction[] aggregationFunctions = mergedBlock.getAggregationFunctions();
-    List<Object> mergedResults = mergedBlock.getResults();
-    List<Object> resultsToMerge = blockToMerge.getResults();
-    assert aggregationFunctions != null && mergedResults != null && resultsToMerge != null;
-
-    int numAggregationFunctions = aggregationFunctions.length;
-    for (int i = 0; i < numAggregationFunctions; i++) {
-      mergedResults.set(i, aggregationFunctions[i].merge(mergedResults.get(i), resultsToMerge.get(i)));
-    }
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseCombineOperator.java
index 49e7502aa2f..b4babb28a3d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseCombineOperator.java
@@ -24,24 +24,22 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Phaser;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.lang.StringUtils;
+import java.util.concurrent.atomic.AtomicReference;
 import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.core.common.Operator;
-import org.apache.pinot.core.operator.AcquireReleaseColumnsSegmentOperator;
 import org.apache.pinot.core.operator.BaseOperator;
 import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.ResultsBlockMerger;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.core.util.QueryMultiThreadingUtils;
 import org.apache.pinot.core.util.trace.TraceRunnable;
 import org.apache.pinot.spi.accounting.ThreadExecutionContext;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
 import org.apache.pinot.spi.exception.EarlyTerminationException;
-import org.apache.pinot.spi.exception.QueryCancelledException;
 import org.apache.pinot.spi.trace.Tracing;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,23 +51,31 @@
  * the results blocks from the processed segments. It can early-terminate the query to save the system resources if it
  * detects that the merged results can already satisfy the query, or the query is already errored out or timed out.
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
+@SuppressWarnings({"rawtypes"})
 public abstract class BaseCombineOperator<T extends BaseResultsBlock> extends BaseOperator<BaseResultsBlock> {
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseCombineOperator.class);
 
+  protected final ResultsBlockMerger<T> _resultsBlockMerger;
   protected final List<Operator> _operators;
   protected final int _numOperators;
   protected final QueryContext _queryContext;
   protected final ExecutorService _executorService;
   protected final int _numTasks;
+  protected final Phaser _phaser;
   protected final Future[] _futures;
+
   // Use an AtomicInteger to track the next operator to execute
   protected final AtomicInteger _nextOperatorId = new AtomicInteger();
   // Use a BlockingQueue to store the intermediate results blocks
   protected final BlockingQueue<BaseResultsBlock> _blockingQueue = new LinkedBlockingQueue<>();
+  // Use an AtomicReference to track the exception/error during segment processing
+  protected final AtomicReference<Throwable> _processingException = new AtomicReference<>();
+
   protected final AtomicLong _totalWorkerThreadCpuTimeNs = new AtomicLong(0);
 
-  protected BaseCombineOperator(List<Operator> operators, QueryContext queryContext, ExecutorService executorService) {
+  protected BaseCombineOperator(ResultsBlockMerger<T> resultsBlockMerger, List<Operator> operators,
+      QueryContext queryContext, ExecutorService executorService) {
+    _resultsBlockMerger = resultsBlockMerger;
     _operators = operators;
     _numOperators = _operators.size();
     _queryContext = queryContext;
@@ -78,17 +84,20 @@ protected BaseCombineOperator(List<Operator> operators, QueryContext queryContex
     // NOTE: We split the query execution into multiple tasks, where each task handles the query execution on multiple
     //       (>=1) segments. These tasks are assigned to multiple execution threads so that they can run in parallel.
     //       The parallelism is bounded by the task count.
-    _numTasks = CombineOperatorUtils.getNumTasksForQuery(operators.size(), queryContext.getMaxExecutionThreads());
-    _futures = new Future[_numTasks];
-  }
+    _numTasks = QueryMultiThreadingUtils.getNumTasksForQuery(operators.size(), queryContext.getMaxExecutionThreads());
 
-  @Override
-  protected BaseResultsBlock getNextBlock() {
     // Use a Phaser to ensure all the Futures are done (not scheduled, finished or interrupted) before the main thread
     // returns. We need to ensure this because the main thread holds the reference to the segments. If a segment is
     // deleted/refreshed, the segment will be released after the main thread returns, which would lead to undefined
     // behavior (even JVM crash) when processing queries against it.
-    Phaser phaser = new Phaser(1);
+    _phaser = new Phaser(1);
+    _futures = new Future[_numTasks];
+  }
+
+  /**
+   * Start the combine operator process. This will spin up multiple threads to process data segments in parallel.
+   */
+  protected void startProcess() {
     Tracing.activeRecording().setNumTasks(_numTasks);
     ThreadExecutionContext parentContext = Tracing.getThreadAccountant().getThreadExecutionContext();
     for (int i = 0; i < _numTasks; i++) {
@@ -104,7 +113,7 @@ public void runJob() {
           // NOTE: If the phaser is terminated (returning negative value) when trying to register the task, that means
           //       the query execution has finished, and the main thread has deregistered itself and returned the
           //       result. Directly return as no execution result will be taken.
-          if (phaser.register() < 0) {
+          if (_phaser.register() < 0) {
             Tracing.ThreadAccountantOps.clear();
             return;
           }
@@ -122,10 +131,10 @@ public void runJob() {
             } else {
               LOGGER.error("Caught serious error while processing query: " + _queryContext, t);
             }
-            onException(t);
+            onProcessSegmentsException(t);
           } finally {
-            onFinish();
-            phaser.arriveAndDeregister();
+            onProcessSegmentsFinish();
+            _phaser.arriveAndDeregister();
             Tracing.ThreadAccountantOps.clear();
           }
 
@@ -133,155 +142,46 @@ public void runJob() {
         }
       });
     }
-
-    BaseResultsBlock mergedBlock;
-    try {
-      mergedBlock = mergeResults();
-    } catch (InterruptedException | EarlyTerminationException e) {
-      Exception killedErrorMsg = Tracing.getThreadAccountant().getErrorStatus();
-      throw new QueryCancelledException(
-          "Cancelled while merging results blocks"
-              + (killedErrorMsg == null ? StringUtils.EMPTY : " " + killedErrorMsg), e);
-    } catch (Exception e) {
-      LOGGER.error("Caught exception while merging results blocks (query: {})", _queryContext, e);
-      mergedBlock = new ExceptionResultsBlock(QueryException.getException(QueryException.INTERNAL_ERROR, e));
-    } finally {
-      // Cancel all ongoing jobs
-      for (Future future : _futures) {
-        if (!future.isDone()) {
-          future.cancel(true);
-        }
-      }
-      // Deregister the main thread and wait for all threads done
-      phaser.awaitAdvance(phaser.arriveAndDeregister());
-    }
-    /*
-     * _numTasks are number of async tasks submitted to the _executorService, but it does not mean Pinot server
-     * use those number of threads to concurrently process segments. Instead, if _executorService thread pool has
-     * less number of threads than _numTasks, the number of threads that used to concurrently process segments equals
-     * to the pool size.
-     * TODO: Get the actual number of query worker threads instead of using the default value.
-     */
-    int numServerThreads = Math.min(_numTasks, ResourceManager.DEFAULT_QUERY_WORKER_THREADS);
-    CombineOperatorUtils.setExecutionStatistics(mergedBlock, _operators, _totalWorkerThreadCpuTimeNs.get(),
-        numServerThreads);
-    return mergedBlock;
-  }
-
-  /**
-   * Executes query on one or more segments in a worker thread.
-   */
-  protected void processSegments() {
-    int operatorId;
-    while ((operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
-      Operator operator = _operators.get(operatorId);
-      T resultsBlock;
-      try {
-        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
-          ((AcquireReleaseColumnsSegmentOperator) operator).acquire();
-        }
-        resultsBlock = (T) operator.nextBlock();
-      } finally {
-        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
-          ((AcquireReleaseColumnsSegmentOperator) operator).release();
-        }
-      }
-
-      if (isQuerySatisfied(resultsBlock)) {
-        // Query is satisfied, skip processing the remaining segments
-        _blockingQueue.offer(resultsBlock);
-        return;
-      } else {
-        _blockingQueue.offer(resultsBlock);
-      }
-    }
-  }
-
-  /**
-   * Invoked when {@link #processSegments()} throws exception/error.
-   */
-  protected void onException(Throwable t) {
-    _blockingQueue.offer(new ExceptionResultsBlock(t));
-  }
-
-  /**
-   * Invoked when {@link #processSegments()} is finished (called in the finally block).
-   */
-  protected void onFinish() {
   }
 
   /**
-   * Merges the results from the worker threads into a results block.
+   * Stop the combine operator process. This will stop all sub-tasks that were spun up to process data segments.
    */
-  protected BaseResultsBlock mergeResults()
-      throws Exception {
-    T mergedBlock = null;
-    int numBlocksMerged = 0;
-    long endTimeMs = _queryContext.getEndTimeMs();
-    while (numBlocksMerged < _numOperators) {
-      // Timeout has reached, shouldn't continue to process. `_blockingQueue.poll` will continue to return blocks even
-      // if negative timeout is provided; therefore an extra check is needed
-      long waitTimeMs = endTimeMs - System.currentTimeMillis();
-      if (waitTimeMs <= 0) {
-        return getTimeoutResultsBlock(numBlocksMerged);
-      }
-      BaseResultsBlock blockToMerge = _blockingQueue.poll(waitTimeMs, TimeUnit.MILLISECONDS);
-      if (blockToMerge == null) {
-        return getTimeoutResultsBlock(numBlocksMerged);
-      }
-      if (blockToMerge.getProcessingExceptions() != null) {
-        // Caught exception while processing segment, skip merging the remaining results blocks and directly return the
-        // exception
-        return blockToMerge;
-      }
-      if (mergedBlock == null) {
-        mergedBlock = convertToMergeableBlock((T) blockToMerge);
-      } else {
-        mergeResultsBlocks(mergedBlock, (T) blockToMerge);
-      }
-      numBlocksMerged++;
-      if (isQuerySatisfied(mergedBlock)) {
-        // Query is satisfied, skip merging the remaining results blocks
-        return mergedBlock;
+  protected void stopProcess() {
+    // Cancel all ongoing jobs
+    for (Future future : _futures) {
+      if (future != null && !future.isDone()) {
+        future.cancel(true);
       }
     }
-    return mergedBlock;
+    // Deregister the main thread and wait for all threads done
+    _phaser.awaitAdvance(_phaser.arriveAndDeregister());
   }
 
-  private ExceptionResultsBlock getTimeoutResultsBlock(int numBlocksMerged) {
+  protected ExceptionResultsBlock getTimeoutResultsBlock(int numBlocksMerged) {
     LOGGER.error("Timed out while polling results block, numBlocksMerged: {} (query: {})", numBlocksMerged,
         _queryContext);
     return new ExceptionResultsBlock(QueryException.EXECUTION_TIMEOUT_ERROR,
         new TimeoutException("Timed out while polling results block"));
   }
 
-  /**
-   * Can be overridden for early termination. The input results block might not be mergeable.
-   */
-  protected boolean isQuerySatisfied(T resultsBlock) {
-    return false;
+  @Override
+  public List<Operator> getChildOperators() {
+    return _operators;
   }
 
   /**
-   * Merges a results block into the main mergeable results block.
-   * <p>NOTE: {@code blockToMerge} should contain the result for a segment without any exception. The errored segment
-   * result is already handled.
-   *
-   * @param mergedBlock The block that accumulates previous results. It should be modified to add the information of the
-   *                    other block.
-   * @param blockToMerge The new block that needs to be merged into the mergedBlock.
+   * Executes query on one or more segments in a worker thread.
    */
-  protected abstract void mergeResultsBlocks(T mergedBlock, T blockToMerge);
+  protected abstract void processSegments();
 
   /**
-   * Converts the given results block into a mergeable results block if necessary.
+   * Invoked when {@link #processSegments()} throws exception/error.
    */
-  protected T convertToMergeableBlock(T resultsBlock) {
-    return resultsBlock;
-  }
+  protected abstract void onProcessSegmentsException(Throwable t);
 
-  @Override
-  public List<Operator> getChildOperators() {
-    return _operators;
-  }
+  /**
+   * Invoked when {@link #processSegments()} is finished (called in the finally block).
+   */
+  protected abstract void onProcessSegmentsFinish();
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseSingleBlockCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseSingleBlockCombineOperator.java
new file mode 100644
index 00000000000..f3dd847fbaa
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/BaseSingleBlockCombineOperator.java
@@ -0,0 +1,152 @@
+/**
+ * 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.pinot.core.operator.combine;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.AcquireReleaseColumnsSegmentOperator;
+import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.ResultsBlockMerger;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Base implementation of the combine operator.
+ * <p>Combine operator uses multiple worker threads to process segments in parallel, and uses the main thread to merge
+ * the results blocks from the processed segments. It can early-terminate the query to save the system resources if it
+ * detects that the merged results can already satisfy the query, or the query is already errored out or timed out.
+ */
+@SuppressWarnings({"rawtypes", "unchecked"})
+public abstract class BaseSingleBlockCombineOperator<T extends BaseResultsBlock>
+    extends BaseCombineOperator<T> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(BaseSingleBlockCombineOperator.class);
+
+  protected BaseSingleBlockCombineOperator(ResultsBlockMerger<T> resultsBlockMerger, List<Operator> operators,
+      QueryContext queryContext, ExecutorService executorService) {
+    super(resultsBlockMerger, operators, queryContext, executorService);
+  }
+
+  @Override
+  protected BaseResultsBlock getNextBlock() {
+    BaseResultsBlock mergedBlock;
+    try {
+      startProcess();
+      mergedBlock = mergeResults();
+    } catch (InterruptedException e) {
+      throw new EarlyTerminationException("Interrupted while merging results blocks", e);
+    } catch (Exception e) {
+      LOGGER.error("Caught exception while merging results blocks (query: {})", _queryContext, e);
+      mergedBlock = new ExceptionResultsBlock(QueryException.getException(QueryException.INTERNAL_ERROR, e));
+    } finally {
+      stopProcess();
+    }
+    /*
+     * _numTasks are number of async tasks submitted to the _executorService, but it does not mean Pinot server
+     * use those number of threads to concurrently process segments. Instead, if _executorService thread pool has
+     * less number of threads than _numTasks, the number of threads that used to concurrently process segments equals
+     * to the pool size.
+     * TODO: Get the actual number of query worker threads instead of using the default value.
+     */
+    int numServerThreads = Math.min(_numTasks, ResourceManager.DEFAULT_QUERY_WORKER_THREADS);
+    CombineOperatorUtils.setExecutionStatistics(mergedBlock, _operators, _totalWorkerThreadCpuTimeNs.get(),
+        numServerThreads);
+    return mergedBlock;
+  }
+
+  @Override
+  protected void processSegments() {
+    int operatorId;
+    while (_processingException.get() == null && (operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
+      Operator operator = _operators.get(operatorId);
+      T resultsBlock;
+      try {
+        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
+          ((AcquireReleaseColumnsSegmentOperator) operator).acquire();
+        }
+        resultsBlock = (T) operator.nextBlock();
+      } finally {
+        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
+          ((AcquireReleaseColumnsSegmentOperator) operator).release();
+        }
+      }
+      _blockingQueue.offer(resultsBlock);
+      // When query is satisfied, skip processing the remaining segments
+      if (_resultsBlockMerger.isQuerySatisfied(resultsBlock)) {
+        _nextOperatorId.set(_numOperators);
+        return;
+      }
+    }
+  }
+
+  @Override
+  protected void onProcessSegmentsException(Throwable t) {
+    _processingException.compareAndSet(null, t);
+    _blockingQueue.offer(new ExceptionResultsBlock(t));
+  }
+
+  @Override
+  protected void onProcessSegmentsFinish() {
+  }
+
+  /**
+   * Merges the results from the worker threads into a results block.
+   */
+  protected BaseResultsBlock mergeResults()
+      throws Exception {
+    T mergedBlock = null;
+    int numBlocksMerged = 0;
+    long endTimeMs = _queryContext.getEndTimeMs();
+    while (numBlocksMerged < _numOperators) {
+      // Timeout has reached, shouldn't continue to process. `_blockingQueue.poll` will continue to return blocks even
+      // if negative timeout is provided; therefore an extra check is needed
+      long waitTimeMs = endTimeMs - System.currentTimeMillis();
+      if (waitTimeMs <= 0) {
+        return getTimeoutResultsBlock(numBlocksMerged);
+      }
+      BaseResultsBlock blockToMerge = _blockingQueue.poll(waitTimeMs, TimeUnit.MILLISECONDS);
+      if (blockToMerge == null) {
+        return getTimeoutResultsBlock(numBlocksMerged);
+      }
+      if (blockToMerge.getProcessingExceptions() != null) {
+        // Caught exception while processing segment, skip merging the remaining results blocks and directly return the
+        // exception
+        return blockToMerge;
+      }
+      if (mergedBlock == null) {
+        mergedBlock = (T) blockToMerge;
+      } else {
+        _resultsBlockMerger.mergeResultsBlocks(mergedBlock, (T) blockToMerge);
+      }
+      numBlocksMerged++;
+      if (_resultsBlockMerger.isQuerySatisfied(mergedBlock)) {
+        // Query is satisfied, skip merging the remaining results blocks
+        return mergedBlock;
+      }
+    }
+    return mergedBlock;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/CombineOperatorUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/CombineOperatorUtils.java
index 842f5053f79..eae5678f61f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/CombineOperatorUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/CombineOperatorUtils.java
@@ -30,26 +30,6 @@ public class CombineOperatorUtils {
   private CombineOperatorUtils() {
   }
 
-  /**
-   * Use at most 10 or half of the processors threads for each query. If there are less than 2 processors, use 1 thread.
-   * <p>NOTE: Runtime.getRuntime().availableProcessors() may return value < 2 in container based environment, e.g.
-   *          Kubernetes.
-   */
-  public static final int MAX_NUM_THREADS_PER_QUERY =
-      Math.max(1, Math.min(10, Runtime.getRuntime().availableProcessors() / 2));
-
-  /**
-   * Returns the number of tasks for the query execution. The tasks can be assigned to multiple execution threads so
-   * that they can run in parallel. The parallelism is bounded by the task count.
-   */
-  public static int getNumTasksForQuery(int numOperators, int maxExecutionThreads) {
-    if (maxExecutionThreads > 0) {
-      return Math.min(numOperators, maxExecutionThreads);
-    } else {
-      return Math.min(numOperators, MAX_NUM_THREADS_PER_QUERY);
-    }
-  }
-
   /**
    * Sets the execution statistics into the results block.
    */
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java
index 2014350359d..6d3bb77a2df 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.ExecutorService;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
-import org.apache.pinot.core.query.distinct.DistinctTable;
+import org.apache.pinot.core.operator.combine.merger.DistinctResultsBlockMerger;
 import org.apache.pinot.core.query.request.context.QueryContext;
 
 
@@ -30,45 +30,15 @@
  * Combine operator for distinct queries.
  */
 @SuppressWarnings("rawtypes")
-public class DistinctCombineOperator extends BaseCombineOperator<DistinctResultsBlock> {
+public class DistinctCombineOperator extends BaseSingleBlockCombineOperator<DistinctResultsBlock> {
   private static final String EXPLAIN_NAME = "COMBINE_DISTINCT";
 
-  private final boolean _hasOrderBy;
-
   public DistinctCombineOperator(List<Operator> operators, QueryContext queryContext, ExecutorService executorService) {
-    super(operators, queryContext, executorService);
-    _hasOrderBy = queryContext.getOrderByExpressions() != null;
+    super(new DistinctResultsBlockMerger(queryContext), operators, queryContext, executorService);
   }
 
   @Override
   public String toExplainString() {
     return EXPLAIN_NAME;
   }
-
-  @Override
-  protected boolean isQuerySatisfied(DistinctResultsBlock resultsBlock) {
-    if (_hasOrderBy) {
-      return false;
-    }
-    return resultsBlock.getDistinctTable().size() >= _queryContext.getLimit();
-  }
-
-  @Override
-  protected void mergeResultsBlocks(DistinctResultsBlock mergedBlock, DistinctResultsBlock blockToMerge) {
-    DistinctTable mergedDistinctTable = mergedBlock.getDistinctTable();
-    DistinctTable distinctTableToMerge = blockToMerge.getDistinctTable();
-    assert mergedDistinctTable != null && distinctTableToMerge != null;
-
-    // Convert the merged table into a main table if necessary in order to merge other tables
-    if (!mergedDistinctTable.isMainTable()) {
-      DistinctTable mainDistinctTable =
-          new DistinctTable(distinctTableToMerge.getDataSchema(), _queryContext.getOrderByExpressions(),
-              _queryContext.getLimit(), _queryContext.isNullHandlingEnabled());
-      mainDistinctTable.mergeTable(mergedDistinctTable);
-      mergedBlock.setDistinctTable(mainDistinctTable);
-      mergedDistinctTable = mainDistinctTable;
-    }
-
-    mergedDistinctTable.mergeTable(distinctTableToMerge);
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java
index 643962dc9d7..88fe1a702d8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java
@@ -18,18 +18,14 @@
  */
 package org.apache.pinot.core.operator.combine;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.response.ProcessingException;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.data.table.ConcurrentIndexedTable;
@@ -47,7 +43,7 @@
 import org.apache.pinot.core.query.aggregation.groupby.GroupKeyGenerator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.util.GroupByUtils;
-import org.apache.pinot.spi.utils.LoopUtils;
+import org.apache.pinot.spi.trace.Tracing;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,9 +54,8 @@
  *       all threads
  */
 @SuppressWarnings("rawtypes")
-public class GroupByCombineOperator extends BaseCombineOperator<GroupByResultsBlock> {
+public class GroupByCombineOperator extends BaseSingleBlockCombineOperator<GroupByResultsBlock> {
   public static final int MAX_TRIM_THRESHOLD = 1_000_000_000;
-  public static final int MAX_GROUP_BY_KEYS_MERGED_PER_INTERRUPTION_CHECK = 10_000;
 
   private static final Logger LOGGER = LoggerFactory.getLogger(GroupByCombineOperator.class);
   private static final String EXPLAIN_NAME = "COMBINE_GROUP_BY";
@@ -70,7 +65,6 @@ public class GroupByCombineOperator extends BaseCombineOperator<GroupByResultsBl
   private final int _numAggregationFunctions;
   private final int _numGroupByExpressions;
   private final int _numColumns;
-  private final ConcurrentLinkedQueue<ProcessingException> _mergedProcessingExceptions = new ConcurrentLinkedQueue<>();
   // We use a CountDownLatch to track if all Futures are finished by the query timeout, and cancel the unfinished
   // _futures (try to interrupt the execution if it already started).
   private final CountDownLatch _operatorLatch;
@@ -79,7 +73,7 @@ public class GroupByCombineOperator extends BaseCombineOperator<GroupByResultsBl
   private volatile boolean _numGroupsLimitReached;
 
   public GroupByCombineOperator(List<Operator> operators, QueryContext queryContext, ExecutorService executorService) {
-    super(operators, overrideMaxExecutionThreads(queryContext, operators.size()), executorService);
+    super(null, operators, overrideMaxExecutionThreads(queryContext, operators.size()), executorService);
 
     int minTrimSize = queryContext.getMinServerGroupTrimSize();
     if (minTrimSize > 0) {
@@ -130,7 +124,7 @@ public String toExplainString() {
   @Override
   protected void processSegments() {
     int operatorId;
-    while ((operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
+    while (_processingException.get() == null && (operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
       Operator operator = _operators.get(operatorId);
       try {
         if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
@@ -156,12 +150,6 @@ protected void processSegments() {
           }
         }
 
-        // Merge processing exceptions.
-        List<ProcessingException> processingExceptionsToMerge = resultsBlock.getProcessingExceptions();
-        if (processingExceptionsToMerge != null) {
-          _mergedProcessingExceptions.addAll(processingExceptionsToMerge);
-        }
-
         // Set groups limit reached flag.
         if (resultsBlock.isNumGroupsLimitReached()) {
           _numGroupsLimitReached = true;
@@ -188,16 +176,16 @@ protected void processSegments() {
                 values[_numGroupByExpressions + i] = aggregationGroupByResult.getResultForGroupId(i, groupId);
               }
               _indexedTable.upsert(new Key(keys), new Record(values));
+              Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(mergedKeys);
               mergedKeys++;
-              LoopUtils.checkMergePhaseInterruption(mergedKeys);
             }
           }
         } else {
           for (IntermediateRecord intermediateResult : intermediateRecords) {
             //TODO: change upsert api so that it accepts intermediateRecord directly
             _indexedTable.upsert(intermediateResult._key, intermediateResult._record);
+            Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(mergedKeys);
             mergedKeys++;
-            LoopUtils.checkMergePhaseInterruption(mergedKeys);
           }
         }
       } finally {
@@ -209,12 +197,12 @@ protected void processSegments() {
   }
 
   @Override
-  protected void onException(Throwable t) {
-    _mergedProcessingExceptions.add(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, t));
+  public void onProcessSegmentsException(Throwable t) {
+    _processingException.compareAndSet(null, t);
   }
 
   @Override
-  protected void onFinish() {
+  public void onProcessSegmentsFinish() {
     _operatorLatch.countDown();
   }
 
@@ -232,7 +220,7 @@ protected void onFinish() {
    * </ul>
    */
   @Override
-  protected BaseResultsBlock mergeResults()
+  public BaseResultsBlock mergeResults()
       throws Exception {
     long timeoutMs = _queryContext.getEndTimeMs() - System.currentTimeMillis();
     boolean opCompleted = _operatorLatch.await(timeoutMs, TimeUnit.MILLISECONDS);
@@ -245,6 +233,11 @@ protected BaseResultsBlock mergeResults()
       return new ExceptionResultsBlock(new TimeoutException(errorMessage));
     }
 
+    Throwable processingException = _processingException.get();
+    if (processingException != null) {
+      return new ExceptionResultsBlock(processingException);
+    }
+
     IndexedTable indexedTable = _indexedTable;
     if (!_queryContext.isServerReturnFinalResult()) {
       indexedTable.finish(false);
@@ -255,16 +248,6 @@ protected BaseResultsBlock mergeResults()
     mergedBlock.setNumGroupsLimitReached(_numGroupsLimitReached);
     mergedBlock.setNumResizes(indexedTable.getNumResizes());
     mergedBlock.setResizeTimeMs(indexedTable.getResizeTimeMs());
-
-    // Set the processing exceptions.
-    if (!_mergedProcessingExceptions.isEmpty()) {
-      mergedBlock.setProcessingExceptions(new ArrayList<>(_mergedProcessingExceptions));
-    }
-
     return mergedBlock;
   }
-
-  @Override
-  protected void mergeResultsBlocks(GroupByResultsBlock mergedBlock, GroupByResultsBlock blockToMerge) {
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java
index 3f0690d8fe3..a5e744fc6d3 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java
@@ -55,7 +55,8 @@
  * </ul>
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
-public class MinMaxValueBasedSelectionOrderByCombineOperator extends BaseCombineOperator<SelectionResultsBlock> {
+public class MinMaxValueBasedSelectionOrderByCombineOperator
+    extends BaseSingleBlockCombineOperator<SelectionResultsBlock> {
   private static final Logger LOGGER = LoggerFactory.getLogger(MinMaxValueBasedSelectionOrderByCombineOperator.class);
 
   private static final String EXPLAIN_NAME = "COMBINE_SELECT_ORDERBY_MINMAX";
@@ -74,7 +75,7 @@ public class MinMaxValueBasedSelectionOrderByCombineOperator extends BaseCombine
 
   public MinMaxValueBasedSelectionOrderByCombineOperator(List<Operator> operators, QueryContext queryContext,
       ExecutorService executorService) {
-    super(operators, queryContext, executorService);
+    super(null, operators, queryContext, executorService);
     _endOperatorId = new AtomicInteger(_numOperators);
     _numRowsToKeep = queryContext.getLimit() + queryContext.getOffset();
 
@@ -146,7 +147,7 @@ protected void processSegments() {
     Comparable threadBoundaryValue = null;
 
     int operatorId;
-    while ((operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
+    while (_processingException.get() == null && (operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
       if (operatorId >= _endOperatorId.get()) {
         _blockingQueue.offer(EMPTY_RESULTS_BLOCK);
         continue;
@@ -284,23 +285,21 @@ protected BaseResultsBlock mergeResults()
         return blockToMerge;
       }
       if (mergedBlock == null) {
-        mergedBlock = convertToMergeableBlock((SelectionResultsBlock) blockToMerge);
+        mergedBlock = (SelectionResultsBlock) blockToMerge;
       } else {
         mergeResultsBlocks(mergedBlock, (SelectionResultsBlock) blockToMerge);
       }
       numBlocksMerged++;
 
       // Update the boundary value if enough rows are collected
-      PriorityQueue<Object[]> selectionResult = mergedBlock.getRowsAsPriorityQueue();
-      if (selectionResult != null && selectionResult.size() == _numRowsToKeep) {
-        assert selectionResult.peek() != null;
-        _globalBoundaryValue.set((Comparable) selectionResult.peek()[0]);
+      List<Object[]> rows = mergedBlock.getRows();
+      if (rows.size() == _numRowsToKeep) {
+        _globalBoundaryValue.set((Comparable) rows.get(_numRowsToKeep - 1)[0]);
       }
     }
     return mergedBlock;
   }
 
-  @Override
   protected void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge) {
     DataSchema mergedDataSchema = mergedBlock.getDataSchema();
     DataSchema dataSchemaToMerge = blockToMerge.getDataSchema();
@@ -315,18 +314,7 @@ protected void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionRe
           QueryException.getException(QueryException.MERGE_RESPONSE_ERROR, errorMessage));
       return;
     }
-
-    PriorityQueue<Object[]> mergedRows = mergedBlock.getRowsAsPriorityQueue();
-    Collection<Object[]> rowsToMerge = blockToMerge.getRows();
-    assert mergedRows != null && rowsToMerge != null;
-    SelectionOperatorUtils.mergeWithOrdering(mergedRows, rowsToMerge, _numRowsToKeep);
-  }
-
-  @Override
-  protected SelectionResultsBlock convertToMergeableBlock(SelectionResultsBlock resultsBlock) {
-    // This may create a copy or return the same instance. Anyway, this operator is the owner of the
-    // value now, so it can mutate it.
-    return resultsBlock.convertToPriorityQueueBased();
+    SelectionOperatorUtils.mergeWithOrdering(mergedBlock, blockToMerge, _numRowsToKeep);
   }
 
   private static class MinMaxValueContext {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java
index d0e3461b15a..9f8b84c0daf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java
@@ -18,18 +18,13 @@
  */
 package org.apache.pinot.core.operator.combine;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.SelectionOnlyResultsBlockMerger;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -39,16 +34,13 @@
  * <p>NOTE: Selection order-by query with LIMIT 0 is treated as selection only query.
  */
 @SuppressWarnings("rawtypes")
-public class SelectionOnlyCombineOperator extends BaseCombineOperator<SelectionResultsBlock> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SelectionOnlyCombineOperator.class);
-
+public class SelectionOnlyCombineOperator extends BaseSingleBlockCombineOperator<SelectionResultsBlock> {
   private static final String EXPLAIN_NAME = "COMBINE_SELECT";
-
   private final int _numRowsToKeep;
 
   public SelectionOnlyCombineOperator(List<Operator> operators, QueryContext queryContext,
       ExecutorService executorService) {
-    super(operators, queryContext, executorService);
+    super(new SelectionOnlyResultsBlockMerger(queryContext), operators, queryContext, executorService);
     _numRowsToKeep = queryContext.getLimit();
   }
 
@@ -68,31 +60,4 @@ protected BaseResultsBlock getNextBlock() {
 
     return super.getNextBlock();
   }
-
-  @Override
-  protected boolean isQuerySatisfied(SelectionResultsBlock resultsBlock) {
-    return resultsBlock.getRows().size() == _numRowsToKeep;
-  }
-
-  @Override
-  protected void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge) {
-    DataSchema mergedDataSchema = mergedBlock.getDataSchema();
-    DataSchema dataSchemaToMerge = blockToMerge.getDataSchema();
-    assert mergedDataSchema != null && dataSchemaToMerge != null;
-    if (!mergedDataSchema.equals(dataSchemaToMerge)) {
-      String errorMessage =
-          String.format("Data schema mismatch between merged block: %s and block to merge: %s, drop block to merge",
-              mergedDataSchema, dataSchemaToMerge);
-      // NOTE: This is segment level log, so log at debug level to prevent flooding the log.
-      LOGGER.debug(errorMessage);
-      mergedBlock.addToProcessingExceptions(
-          QueryException.getException(QueryException.MERGE_RESPONSE_ERROR, errorMessage));
-      return;
-    }
-
-    Collection<Object[]> mergedRows = mergedBlock.getRows();
-    Collection<Object[]> rowsToMerge = blockToMerge.getRows();
-    assert mergedRows != null && rowsToMerge != null;
-    SelectionOperatorUtils.mergeWithoutOrdering(mergedRows, rowsToMerge, _numRowsToKeep);
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
index 3f799d266f4..583916fa75b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
@@ -18,19 +18,12 @@
  */
 package org.apache.pinot.core.operator.combine;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.PriorityQueue;
 import java.util.concurrent.ExecutorService;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.SelectionOrderByResultsBlockMerger;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 /**
  * Combine operator for selection order-by queries.
@@ -40,50 +33,16 @@
  * (process all segments).
  */
 @SuppressWarnings("rawtypes")
-public class SelectionOrderByCombineOperator extends BaseCombineOperator<SelectionResultsBlock> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SelectionOrderByCombineOperator.class);
-
+public class SelectionOrderByCombineOperator extends BaseSingleBlockCombineOperator<SelectionResultsBlock> {
   private static final String EXPLAIN_NAME = "COMBINE_SELECT_ORDERBY";
 
-  private final int _numRowsToKeep;
-
   public SelectionOrderByCombineOperator(List<Operator> operators, QueryContext queryContext,
       ExecutorService executorService) {
-    super(operators, queryContext, executorService);
-    _numRowsToKeep = queryContext.getLimit() + queryContext.getOffset();
+    super(new SelectionOrderByResultsBlockMerger(queryContext), operators, queryContext, executorService);
   }
 
   @Override
   public String toExplainString() {
     return EXPLAIN_NAME;
   }
-
-  @Override
-  protected void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge) {
-    DataSchema mergedDataSchema = mergedBlock.getDataSchema();
-    DataSchema dataSchemaToMerge = blockToMerge.getDataSchema();
-    assert mergedDataSchema != null && dataSchemaToMerge != null;
-    if (!mergedDataSchema.equals(dataSchemaToMerge)) {
-      String errorMessage =
-          String.format("Data schema mismatch between merged block: %s and block to merge: %s, drop block to merge",
-              mergedDataSchema, dataSchemaToMerge);
-      // NOTE: This is segment level log, so log at debug level to prevent flooding the log.
-      LOGGER.debug(errorMessage);
-      mergedBlock.addToProcessingExceptions(
-          QueryException.getException(QueryException.MERGE_RESPONSE_ERROR, errorMessage));
-      return;
-    }
-
-    PriorityQueue<Object[]> mergedRows = mergedBlock.getRowsAsPriorityQueue();
-    Collection<Object[]> rowsToMerge = blockToMerge.getRows();
-    assert mergedRows != null && rowsToMerge != null;
-    SelectionOperatorUtils.mergeWithOrdering(mergedRows, rowsToMerge, _numRowsToKeep);
-  }
-
-  @Override
-  protected SelectionResultsBlock convertToMergeableBlock(SelectionResultsBlock resultsBlock) {
-    // This may create a copy or return the same instance. Anyway, this operator is the owner of the
-    // value now, so it can mutate it.
-    return resultsBlock.convertToPriorityQueueBased();
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/AggregationResultsBlockMerger.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/AggregationResultsBlockMerger.java
new file mode 100644
index 00000000000..ccdf86bd3c3
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/AggregationResultsBlockMerger.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.core.operator.combine.merger;
+
+import java.util.List;
+import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.core.query.request.context.QueryContext;
+
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class AggregationResultsBlockMerger implements ResultsBlockMerger<AggregationResultsBlock> {
+
+  public AggregationResultsBlockMerger(QueryContext queryContext) {
+  }
+
+  @Override
+  public void mergeResultsBlocks(AggregationResultsBlock mergedBlock, AggregationResultsBlock blockToMerge) {
+    AggregationFunction[] aggregationFunctions = mergedBlock.getAggregationFunctions();
+    List<Object> mergedResults = mergedBlock.getResults();
+    List<Object> resultsToMerge = blockToMerge.getResults();
+    assert aggregationFunctions != null && mergedResults != null && resultsToMerge != null;
+
+    int numAggregationFunctions = aggregationFunctions.length;
+    for (int i = 0; i < numAggregationFunctions; i++) {
+      mergedResults.set(i, aggregationFunctions[i].merge(mergedResults.get(i), resultsToMerge.get(i)));
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/DistinctResultsBlockMerger.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/DistinctResultsBlockMerger.java
new file mode 100644
index 00000000000..28c41feaf3d
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/DistinctResultsBlockMerger.java
@@ -0,0 +1,61 @@
+/**
+ * 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.pinot.core.operator.combine.merger;
+
+import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
+import org.apache.pinot.core.query.distinct.DistinctTable;
+import org.apache.pinot.core.query.request.context.QueryContext;
+
+
+public class DistinctResultsBlockMerger implements ResultsBlockMerger<DistinctResultsBlock> {
+  private final QueryContext _queryContext;
+  private final boolean _hasOrderBy;
+
+  public DistinctResultsBlockMerger(QueryContext queryContext) {
+    _queryContext = queryContext;
+    _hasOrderBy = queryContext.getOrderByExpressions() != null;
+  }
+
+  @Override
+  public boolean isQuerySatisfied(DistinctResultsBlock resultsBlock) {
+    if (_hasOrderBy) {
+      return false;
+    }
+    return resultsBlock.getDistinctTable().size() >= _queryContext.getLimit();
+  }
+
+  @Override
+  public void mergeResultsBlocks(DistinctResultsBlock mergedBlock, DistinctResultsBlock blockToMerge) {
+    DistinctTable mergedDistinctTable = mergedBlock.getDistinctTable();
+    DistinctTable distinctTableToMerge = blockToMerge.getDistinctTable();
+    assert mergedDistinctTable != null && distinctTableToMerge != null;
+
+    // Convert the merged table into a main table if necessary in order to merge other tables
+    if (!mergedDistinctTable.isMainTable()) {
+      DistinctTable mainDistinctTable =
+          new DistinctTable(distinctTableToMerge.getDataSchema(), _queryContext.getOrderByExpressions(),
+              _queryContext.getLimit(), _queryContext.isNullHandlingEnabled());
+      mainDistinctTable.mergeTable(mergedDistinctTable);
+      mergedBlock.setDistinctTable(mainDistinctTable);
+      mergedDistinctTable = mainDistinctTable;
+    }
+
+    mergedDistinctTable.mergeTable(distinctTableToMerge);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/ResultsBlockMerger.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/ResultsBlockMerger.java
new file mode 100644
index 00000000000..318dfd2bd00
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/ResultsBlockMerger.java
@@ -0,0 +1,47 @@
+/**
+ * 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.pinot.core.operator.combine.merger;
+
+import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
+
+
+public interface ResultsBlockMerger<T extends BaseResultsBlock> {
+
+  /**
+   * Merges a results block into the main mergeable results block.
+   *
+   * <p>NOTE: {@code blockToMerge} should contain the result for a segment without any exception. The errored segment
+   * results are handled by {@link org.apache.pinot.core.operator.combine.BaseCombineOperator}.
+   *
+   * @param mergedBlock The block that accumulates previous results. It should be modified to add the information of the
+   *                    other block.
+   * @param blockToMerge The new block that needs to be merged into the mergedBlock.
+   */
+  void mergeResultsBlocks(T mergedBlock, T blockToMerge);
+
+  /**
+   * Determine if a block satisfies the query result requirement. This is mostly used to determine early termination
+   * conditions. Default to always false and terminate should be done normally by processing all blocks.
+   *
+   * <p>The input results block might not be mergeable.
+   */
+  default boolean isQuerySatisfied(T resultsBlock) {
+    return false;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOnlyResultsBlockMerger.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOnlyResultsBlockMerger.java
new file mode 100644
index 00000000000..aec95823c83
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOnlyResultsBlockMerger.java
@@ -0,0 +1,60 @@
+/**
+ * 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.pinot.core.operator.combine.merger;
+
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SelectionOnlyResultsBlockMerger implements ResultsBlockMerger<SelectionResultsBlock> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(SelectionOnlyResultsBlockMerger.class);
+  private final int _numRowsToKeep;
+
+  public SelectionOnlyResultsBlockMerger(QueryContext queryContext) {
+    _numRowsToKeep = queryContext.getLimit();
+  }
+
+  @Override
+  public boolean isQuerySatisfied(SelectionResultsBlock resultsBlock) {
+    return resultsBlock.getRows().size() >= _numRowsToKeep;
+  }
+
+  @Override
+  public void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge) {
+    DataSchema mergedDataSchema = mergedBlock.getDataSchema();
+    DataSchema dataSchemaToMerge = blockToMerge.getDataSchema();
+    assert mergedDataSchema != null && dataSchemaToMerge != null;
+    if (!mergedDataSchema.equals(dataSchemaToMerge)) {
+      String errorMessage =
+          String.format("Data schema mismatch between merged block: %s and block to merge: %s, drop block to merge",
+              mergedDataSchema, dataSchemaToMerge);
+      // NOTE: This is segment level log, so log at debug level to prevent flooding the log.
+      LOGGER.debug(errorMessage);
+      mergedBlock.addToProcessingExceptions(
+          QueryException.getException(QueryException.MERGE_RESPONSE_ERROR, errorMessage));
+      return;
+    }
+    SelectionOperatorUtils.mergeWithoutOrdering(mergedBlock, blockToMerge, _numRowsToKeep);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOrderByResultsBlockMerger.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOrderByResultsBlockMerger.java
new file mode 100644
index 00000000000..a5483853cbe
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOrderByResultsBlockMerger.java
@@ -0,0 +1,55 @@
+/**
+ * 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.pinot.core.operator.combine.merger;
+
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SelectionOrderByResultsBlockMerger implements ResultsBlockMerger<SelectionResultsBlock> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(SelectionOrderByResultsBlockMerger.class);
+  private final int _numRowsToKeep;
+
+  public SelectionOrderByResultsBlockMerger(QueryContext queryContext) {
+    _numRowsToKeep = queryContext.getLimit() + queryContext.getOffset();
+  }
+
+  @Override
+  public void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge) {
+    DataSchema mergedDataSchema = mergedBlock.getDataSchema();
+    DataSchema dataSchemaToMerge = blockToMerge.getDataSchema();
+    assert mergedDataSchema != null && dataSchemaToMerge != null;
+    if (!mergedDataSchema.equals(dataSchemaToMerge)) {
+      String errorMessage =
+          String.format("Data schema mismatch between merged block: %s and block to merge: %s, drop block to merge",
+              mergedDataSchema, dataSchemaToMerge);
+      // NOTE: This is segment level log, so log at debug level to prevent flooding the log.
+      LOGGER.debug(errorMessage);
+      mergedBlock.addToProcessingExceptions(
+          QueryException.getException(QueryException.MERGE_RESPONSE_ERROR, errorMessage));
+      return;
+    }
+    SelectionOperatorUtils.mergeWithOrdering(mergedBlock, blockToMerge, _numRowsToKeep);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java
index 64987293bc2..6d9e770a707 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java
@@ -18,9 +18,11 @@
  */
 package org.apache.pinot.core.operator.dociditerators;
 
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.OptionalInt;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.BaseOperator;
 import org.apache.pinot.core.operator.BitmapDocIdSetOperator;
@@ -33,7 +35,9 @@
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.spi.Constants;
 import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.roaringbitmap.BatchIterator;
 import org.roaringbitmap.BitmapDataProvider;
+import org.roaringbitmap.IntIterator;
 import org.roaringbitmap.PeekableIntIterator;
 import org.roaringbitmap.RoaringBitmap;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
@@ -110,6 +114,19 @@ public int advance(int targetDocId) {
     return next();
   }
 
+  @Override
+  public MutableRoaringBitmap applyAnd(BatchIterator batchIterator, OptionalInt firstDoc, OptionalInt lastDoc) {
+    IntIterator intIterator = batchIterator.asIntIterator(new int[OPTIMAL_ITERATOR_BATCH_SIZE]);
+    ProjectionOperator projectionOperator =
+        new ProjectionOperator(_dataSourceMap, new BitmapDocIdSetOperator(intIterator, _docIdBuffer));
+    MutableRoaringBitmap matchingDocIds = new MutableRoaringBitmap();
+    ProjectionBlock projectionBlock;
+    while ((projectionBlock = projectionOperator.nextBlock()) != null) {
+      processProjectionBlock(projectionBlock, matchingDocIds);
+    }
+    return matchingDocIds;
+  }
+
   @Override
   public MutableRoaringBitmap applyAnd(ImmutableRoaringBitmap docIds) {
     ProjectionOperator projectionOperator =
@@ -184,6 +201,14 @@ private void processProjectionBlock(ProjectionBlock projectionBlock, BitmapDataP
               }
             }
             break;
+          case BIG_DECIMAL:
+            BigDecimal[] bigDecimalValues = _transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+            for (int i = 0; i < numDocs; i++) {
+              if (_predicateEvaluator.applySV(bigDecimalValues[i])) {
+                matchingDocIds.add(_docIdBuffer[i]);
+              }
+            }
+            break;
           default:
             throw new IllegalStateException();
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/MVScanDocIdIterator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/MVScanDocIdIterator.java
index 558c4003d9e..1c794e81c00 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/MVScanDocIdIterator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/MVScanDocIdIterator.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.core.operator.dociditerators;
 
+import java.util.OptionalInt;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.segment.spi.Constants;
 import org.apache.pinot.segment.spi.datasource.DataSource;
@@ -26,7 +27,6 @@
 import org.apache.pinot.spi.utils.CommonConstants.Query.OptimizationConstants;
 import org.roaringbitmap.BatchIterator;
 import org.roaringbitmap.RoaringBitmapWriter;
-import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
 
@@ -79,13 +79,21 @@ public int advance(int targetDocId) {
   }
 
   @Override
-  public MutableRoaringBitmap applyAnd(ImmutableRoaringBitmap docIds) {
-    if (docIds.isEmpty()) {
+  public MutableRoaringBitmap applyAnd(BatchIterator docIdIterator, OptionalInt firstDoc, OptionalInt lastDoc) {
+    if (!docIdIterator.hasNext()) {
       return new MutableRoaringBitmap();
     }
-    RoaringBitmapWriter<MutableRoaringBitmap> result = RoaringBitmapWriter.bufferWriter()
-        .expectedRange(docIds.first(), docIds.last()).runCompress(false).get();
-    BatchIterator docIdIterator = docIds.getBatchIterator();
+    RoaringBitmapWriter<MutableRoaringBitmap> result;
+    if (firstDoc.isPresent() && lastDoc.isPresent()) {
+      result = RoaringBitmapWriter.bufferWriter()
+          .expectedRange(firstDoc.getAsInt(), lastDoc.getAsInt())
+          .runCompress(false)
+          .get();
+    } else {
+      result = RoaringBitmapWriter.bufferWriter()
+          .runCompress(false)
+          .get();
+    }
     int[] buffer = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
     while (docIdIterator.hasNext()) {
       int limit = docIdIterator.nextBatch(buffer);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/SVScanDocIdIterator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/SVScanDocIdIterator.java
index 1a4f9c2c543..baf07c16aa9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/SVScanDocIdIterator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/SVScanDocIdIterator.java
@@ -18,7 +18,9 @@
  */
 package org.apache.pinot.core.operator.dociditerators;
 
+import java.util.OptionalInt;
 import javax.annotation.Nullable;
+import org.apache.pinot.core.common.BlockDocIdIterator;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.segment.spi.Constants;
 import org.apache.pinot.segment.spi.datasource.DataSource;
@@ -44,7 +46,7 @@ public final class SVScanDocIdIterator implements ScanBasedDocIdIterator {
   private final ForwardIndexReaderContext _readerContext;
   private final int _numDocs;
   private final ValueMatcher _valueMatcher;
-  private final int[] _batch = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
+  private final int[] _batch;
   private int _firstMismatch;
   private int _cursor;
   private final int _cardinality;
@@ -53,7 +55,8 @@ public final class SVScanDocIdIterator implements ScanBasedDocIdIterator {
   private long _numEntriesScanned = 0L;
 
   public SVScanDocIdIterator(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs,
-      @Nullable NullValueVectorReader nullValueReader) {
+      @Nullable NullValueVectorReader nullValueReader, int batchSize) {
+    _batch = new int[batchSize];
     _predicateEvaluator = predicateEvaluator;
     _reader = dataSource.getForwardIndex();
     _readerContext = _reader.createContext();
@@ -69,6 +72,7 @@ public SVScanDocIdIterator(PredicateEvaluator predicateEvaluator, DataSource dat
   // for testing
   public SVScanDocIdIterator(PredicateEvaluator predicateEvaluator, ForwardIndexReader reader, int numDocs,
       @Nullable NullValueVectorReader nullValueReader) {
+    _batch = new int[BlockDocIdIterator.OPTIMAL_ITERATOR_BATCH_SIZE];
     _predicateEvaluator = predicateEvaluator;
     _reader = reader;
     _readerContext = reader.createContext();
@@ -87,7 +91,7 @@ public int next() {
       int limit;
       int batchSize = 0;
       do {
-        limit = Math.min(_numDocs - _nextDocId, OPTIMAL_ITERATOR_BATCH_SIZE);
+        limit = Math.min(_numDocs - _nextDocId, _batch.length);
         if (limit > 0) {
           for (int i = 0; i < limit; i++) {
             _batch[i] = _nextDocId + i;
@@ -121,14 +125,22 @@ public int advance(int targetDocId) {
   }
 
   @Override
-  public MutableRoaringBitmap applyAnd(ImmutableRoaringBitmap docIds) {
-    if (docIds.isEmpty()) {
+  public MutableRoaringBitmap applyAnd(BatchIterator docIdIterator, OptionalInt firstDoc, OptionalInt lastDoc) {
+    if (!docIdIterator.hasNext()) {
       return new MutableRoaringBitmap();
     }
-    RoaringBitmapWriter<MutableRoaringBitmap> result = RoaringBitmapWriter.bufferWriter()
-        .expectedRange(docIds.first(), docIds.last()).runCompress(false).get();
-    BatchIterator docIdIterator = docIds.getBatchIterator();
-    int[] buffer = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
+    RoaringBitmapWriter<MutableRoaringBitmap> result;
+    if (firstDoc.isPresent() && lastDoc.isPresent()) {
+      result = RoaringBitmapWriter.bufferWriter()
+          .expectedRange(firstDoc.getAsInt(), lastDoc.getAsInt())
+          .runCompress(false)
+          .get();
+    } else {
+      result = RoaringBitmapWriter.bufferWriter()
+          .runCompress(false)
+          .get();
+    }
+    int[] buffer = new int[_batch.length];
     while (docIdIterator.hasNext()) {
       int limit = docIdIterator.nextBatch(buffer);
       if (limit > 0) {
@@ -264,7 +276,7 @@ public static int removeNullDocs(int[] docIds, double[] values, int limit, Immut
 
   private class DictIdMatcher implements ValueMatcher {
 
-    private final int[] _buffer = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final int[] _buffer = new int[_batch.length];
 
     @Override
     public boolean doesValueMatch(int docId) {
@@ -280,7 +292,7 @@ public int matchValues(int limit, int[] docIds) {
 
   private class DictIdMatcherAndNullHandler implements ValueMatcher {
 
-    private final int[] _buffer = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final int[] _buffer = new int[_batch.length];
     private final ImmutableRoaringBitmap _nullBitmap;
 
     public DictIdMatcherAndNullHandler(ImmutableRoaringBitmap nullBitmap) {
@@ -308,7 +320,7 @@ public int matchValues(int limit, int[] docIds) {
 
   private class IntMatcher implements ValueMatcher {
 
-    private final int[] _buffer = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final int[] _buffer = new int[_batch.length];
 
     @Override
     public boolean doesValueMatch(int docId) {
@@ -325,7 +337,7 @@ public int matchValues(int limit, int[] docIds) {
   private class IntMatcherAndNullHandler implements ValueMatcher {
 
     private final ImmutableRoaringBitmap _nullBitmap;
-    private final int[] _buffer = new int[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final int[] _buffer = new int[_batch.length];
 
     public IntMatcherAndNullHandler(ImmutableRoaringBitmap nullBitmap) {
       _nullBitmap = nullBitmap;
@@ -349,7 +361,7 @@ public int matchValues(int limit, int[] docIds) {
 
   private class LongMatcher implements ValueMatcher {
 
-    private final long[] _buffer = new long[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final long[] _buffer = new long[_batch.length];
 
     @Override
     public boolean doesValueMatch(int docId) {
@@ -366,7 +378,7 @@ public int matchValues(int limit, int[] docIds) {
   private class LongMatcherAndNullHandler implements ValueMatcher {
 
     private final ImmutableRoaringBitmap _nullBitmap;
-    private final long[] _buffer = new long[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final long[] _buffer = new long[_batch.length];
 
     public LongMatcherAndNullHandler(ImmutableRoaringBitmap nullBitmap) {
       _nullBitmap = nullBitmap;
@@ -390,7 +402,7 @@ public int matchValues(int limit, int[] docIds) {
 
   private class FloatMatcher implements ValueMatcher {
 
-    private final float[] _buffer = new float[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final float[] _buffer = new float[_batch.length];
 
     @Override
     public boolean doesValueMatch(int docId) {
@@ -407,7 +419,7 @@ public int matchValues(int limit, int[] docIds) {
   private class FloatMatcherAndNullHandler implements ValueMatcher {
 
     private final ImmutableRoaringBitmap _nullBitmap;
-    private final float[] _buffer = new float[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final float[] _buffer = new float[_batch.length];
 
     public FloatMatcherAndNullHandler(ImmutableRoaringBitmap nullBitmap) {
       _nullBitmap = nullBitmap;
@@ -431,7 +443,7 @@ public int matchValues(int limit, int[] docIds) {
 
   private class DoubleMatcher implements ValueMatcher {
 
-    private final double[] _buffer = new double[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final double[] _buffer = new double[_batch.length];
 
     @Override
     public boolean doesValueMatch(int docId) {
@@ -448,7 +460,7 @@ public int matchValues(int limit, int[] docIds) {
   private class DoubleMatcherAndNullHandler implements ValueMatcher {
 
     private final ImmutableRoaringBitmap _nullBitmap;
-    private final double[] _buffer = new double[OPTIMAL_ITERATOR_BATCH_SIZE];
+    private final double[] _buffer = new double[_batch.length];
 
     public DoubleMatcherAndNullHandler(ImmutableRoaringBitmap nullBitmap) {
       _nullBitmap = nullBitmap;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ScanBasedDocIdIterator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ScanBasedDocIdIterator.java
index 1ed890cc834..1caa5264443 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ScanBasedDocIdIterator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ScanBasedDocIdIterator.java
@@ -18,7 +18,9 @@
  */
 package org.apache.pinot.core.operator.dociditerators;
 
+import java.util.OptionalInt;
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.roaringbitmap.BatchIterator;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
@@ -34,10 +36,17 @@
  */
 public interface ScanBasedDocIdIterator extends BlockDocIdIterator {
 
+  MutableRoaringBitmap applyAnd(BatchIterator batchIterator, OptionalInt firstDoc, OptionalInt lastDoc);
+
   /**
    * Applies AND operation to the given bitmap of document ids, returns a bitmap of the matching document ids.
    */
-  MutableRoaringBitmap applyAnd(ImmutableRoaringBitmap docIds);
+  default MutableRoaringBitmap applyAnd(ImmutableRoaringBitmap docIds) {
+    if (docIds.isEmpty()) {
+      return new MutableRoaringBitmap();
+    }
+    return applyAnd(docIds.getBatchIterator(), OptionalInt.of(docIds.first()), OptionalInt.of(docIds.last()));
+  }
 
   /**
    * Returns the number of entries (SV value contains one entry, MV value contains multiple entries) scanned during the
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/AndDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/AndDocIdSet.java
index 8b43b7d3406..29f267c4a13 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/AndDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/AndDocIdSet.java
@@ -25,6 +25,7 @@
 import org.apache.commons.collections.MapUtils;
 import org.apache.pinot.common.utils.config.QueryOptionsUtils;
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.AndDocIdIterator;
 import org.apache.pinot.core.operator.dociditerators.BitmapBasedDocIdIterator;
 import org.apache.pinot.core.operator.dociditerators.RangelessBitmapDocIdIterator;
@@ -37,9 +38,9 @@
 
 
 /**
- * The FilterBlockDocIdSet to perform AND on all child FilterBlockDocIdSets.
+ * The BlockDocIdSet to perform AND on all child BlockDocIdSets.
  * <p>The AndBlockDocIdSet will construct the BlockDocIdIterator based on the BlockDocIdIterators from the child
- * FilterBlockDocIdSets:
+ * BlockDocIdSets:
  * <ul>
  *   <li>
  *     When there are at least one index-base BlockDocIdIterator (SortedDocIdIterator or BitmapBasedDocIdIterator) and
@@ -53,11 +54,11 @@
  *   </li>
  * </ul>
  */
-public final class AndDocIdSet implements FilterBlockDocIdSet {
-  private final List<FilterBlockDocIdSet> _docIdSets;
+public final class AndDocIdSet implements BlockDocIdSet {
+  private final List<BlockDocIdSet> _docIdSets;
   private final boolean _cardinalityBasedRankingForScan;
 
-  public AndDocIdSet(List<FilterBlockDocIdSet> docIdSets, Map<String, String> queryOptions) {
+  public AndDocIdSet(List<BlockDocIdSet> docIdSets, Map<String, String> queryOptions) {
     _docIdSets = docIdSets;
     _cardinalityBasedRankingForScan =
         !MapUtils.isEmpty(queryOptions) && QueryOptionsUtils.isAndScanReorderingEnabled(queryOptions);
@@ -66,7 +67,7 @@ public AndDocIdSet(List<FilterBlockDocIdSet> docIdSets, Map<String, String> quer
   @Override
   public BlockDocIdIterator iterator() {
     int numDocIdSets = _docIdSets.size();
-    // NOTE: Keep the order of FilterBlockDocIdSets to preserve the order decided within FilterOperatorUtils.
+    // NOTE: Keep the order of BlockDocIdSets to preserve the order decided within FilterOperatorUtils.
     // TODO: Consider deciding the order based on the stats of BlockDocIdIterators
     BlockDocIdIterator[] allDocIdIterators = new BlockDocIdIterator[numDocIdSets];
     List<SortedDocIdIterator> sortedDocIdIterators = new ArrayList<>();
@@ -170,7 +171,7 @@ public BlockDocIdIterator iterator() {
   @Override
   public long getNumEntriesScannedInFilter() {
     long numEntriesScannedInFilter = 0L;
-    for (FilterBlockDocIdSet child : _docIdSets) {
+    for (BlockDocIdSet child : _docIdSets) {
       numEntriesScannedInFilter += child.getNumEntriesScannedInFilter();
     }
     return numEntriesScannedInFilter;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/BitmapDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/BitmapDocIdSet.java
index a69ac0066a8..6abf65545b0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/BitmapDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/BitmapDocIdSet.java
@@ -18,11 +18,12 @@
  */
 package org.apache.pinot.core.operator.docidsets;
 
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.BitmapDocIdIterator;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 
 
-public class BitmapDocIdSet implements FilterBlockDocIdSet {
+public class BitmapDocIdSet implements BlockDocIdSet {
   private final BitmapDocIdIterator _iterator;
 
   public BitmapDocIdSet(ImmutableRoaringBitmap docIds, int numDocs) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/EmptyDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/EmptyDocIdSet.java
index fc78df51a38..1db64ff5577 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/EmptyDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/EmptyDocIdSet.java
@@ -18,13 +18,14 @@
  */
 package org.apache.pinot.core.operator.docidsets;
 
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.EmptyDocIdIterator;
 
 
 /**
- * Singleton class which extends {@link FilterBlockDocIdSet} that is empty, i.e. does not contain any document.
+ * Singleton class which extends {@link BlockDocIdSet} that is empty, i.e. does not contain any document.
  */
-public final class EmptyDocIdSet implements FilterBlockDocIdSet {
+public final class EmptyDocIdSet implements BlockDocIdSet {
   private EmptyDocIdSet() {
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ExpressionFilterDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ExpressionDocIdSet.java
similarity index 88%
rename from pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ExpressionFilterDocIdSet.java
rename to pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ExpressionDocIdSet.java
index 3fbdf475232..70322ac5258 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ExpressionFilterDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ExpressionDocIdSet.java
@@ -19,16 +19,17 @@
 package org.apache.pinot.core.operator.docidsets;
 
 import java.util.Map;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.ExpressionScanDocIdIterator;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
-public final class ExpressionFilterDocIdSet implements FilterBlockDocIdSet {
+public final class ExpressionDocIdSet implements BlockDocIdSet {
   private final ExpressionScanDocIdIterator _docIdIterator;
 
-  public ExpressionFilterDocIdSet(TransformFunction transformFunction, PredicateEvaluator predicateEvaluator,
+  public ExpressionDocIdSet(TransformFunction transformFunction, PredicateEvaluator predicateEvaluator,
       Map<String, DataSource> dataSourceMap, int numDocs) {
     _docIdIterator = new ExpressionScanDocIdIterator(transformFunction, predicateEvaluator, dataSourceMap, numDocs);
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/FilterBlockDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/FilterBlockDocIdSet.java
deleted file mode 100644
index 18dab2b21c0..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/FilterBlockDocIdSet.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.operator.docidsets;
-
-import org.apache.pinot.core.common.BlockDocIdIterator;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.operator.dociditerators.AndDocIdIterator;
-import org.apache.pinot.core.operator.dociditerators.BitmapDocIdIterator;
-import org.apache.pinot.core.operator.dociditerators.OrDocIdIterator;
-import org.apache.pinot.core.operator.dociditerators.RangelessBitmapDocIdIterator;
-import org.apache.pinot.core.operator.dociditerators.ScanBasedDocIdIterator;
-import org.apache.pinot.segment.spi.Constants;
-import org.roaringbitmap.RoaringBitmapWriter;
-import org.roaringbitmap.buffer.MutableRoaringBitmap;
-
-
-/**
- * The <code>FilterBlockDocIdSet</code> interface represents the <code>BlockDocIdSet</code> returned by the
- * <code>BaseFilterBlock</code>.
- */
-public interface FilterBlockDocIdSet extends BlockDocIdSet {
-
-  /**
-   * Returns the number of entries (SV value contains one entry, MV value contains multiple entries) scanned in the
-   * filtering phase. This method should be called after the filtering is done.
-   */
-  long getNumEntriesScannedInFilter();
-
-  /**
-   * For scan-based FilterBlockDocIdSet, pre-scans the documents and returns a non-scan-based FilterBlockDocIdSet.
-   */
-  default FilterBlockDocIdSet toNonScanDocIdSet() {
-    BlockDocIdIterator docIdIterator = iterator();
-
-    // NOTE: AND and OR DocIdIterator might contain scan-based DocIdIterator
-    // TODO: This scan is not counted in the execution stats
-    if (docIdIterator instanceof ScanBasedDocIdIterator || docIdIterator instanceof AndDocIdIterator
-        || docIdIterator instanceof OrDocIdIterator) {
-      RoaringBitmapWriter<MutableRoaringBitmap> bitmapWriter =
-          RoaringBitmapWriter.bufferWriter().runCompress(false).get();
-      int docId;
-      while ((docId = docIdIterator.next()) != Constants.EOF) {
-        bitmapWriter.add(docId);
-      }
-      return new RangelessBitmapDocIdSet(bitmapWriter.get());
-    }
-
-    // NOTE: AND and OR DocIdSet might return BitmapBasedDocIdIterator after processing the iterators. Create a new
-    //       DocIdSet to prevent processing the iterators again
-    if (docIdIterator instanceof RangelessBitmapDocIdIterator) {
-      return new RangelessBitmapDocIdSet((RangelessBitmapDocIdIterator) docIdIterator);
-    }
-    if (docIdIterator instanceof BitmapDocIdIterator) {
-      return new BitmapDocIdSet((BitmapDocIdIterator) docIdIterator);
-    }
-
-    return this;
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MVScanDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MVScanDocIdSet.java
index 6f85c2b946e..dc9361e0d81 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MVScanDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MVScanDocIdSet.java
@@ -18,12 +18,13 @@
  */
 package org.apache.pinot.core.operator.docidsets;
 
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.MVScanDocIdIterator;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
-public final class MVScanDocIdSet implements FilterBlockDocIdSet {
+public final class MVScanDocIdSet implements BlockDocIdSet {
   private final MVScanDocIdIterator _docIdIterator;
 
   public MVScanDocIdSet(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MatchAllDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MatchAllDocIdSet.java
index 8e6b1bdccb4..497be02bd4f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MatchAllDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/MatchAllDocIdSet.java
@@ -18,10 +18,11 @@
  */
 package org.apache.pinot.core.operator.docidsets;
 
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.MatchAllDocIdIterator;
 
 
-public final class MatchAllDocIdSet implements FilterBlockDocIdSet {
+public final class MatchAllDocIdSet implements BlockDocIdSet {
   private final int _numDocs;
 
   public MatchAllDocIdSet(int numDocs) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/NotDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/NotDocIdSet.java
index 1fe6462b684..c874722e43c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/NotDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/NotDocIdSet.java
@@ -19,14 +19,15 @@
 package org.apache.pinot.core.operator.docidsets;
 
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.NotDocIdIterator;
 
 
-public class NotDocIdSet implements FilterBlockDocIdSet {
-  private final FilterBlockDocIdSet _childDocIdSet;
+public class NotDocIdSet implements BlockDocIdSet {
+  private final BlockDocIdSet _childDocIdSet;
   private final int _numDocs;
 
-  public NotDocIdSet(FilterBlockDocIdSet childDocIdSet, int numDocs) {
+  public NotDocIdSet(BlockDocIdSet childDocIdSet, int numDocs) {
     _childDocIdSet = childDocIdSet;
     _numDocs = numDocs;
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/OrDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/OrDocIdSet.java
index 6ead802acf5..9464d541bbf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/OrDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/OrDocIdSet.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.BitmapBasedDocIdIterator;
 import org.apache.pinot.core.operator.dociditerators.BitmapDocIdIterator;
 import org.apache.pinot.core.operator.dociditerators.OrDocIdIterator;
@@ -30,9 +31,9 @@
 
 
 /**
- * The FilterBlockDocIdSet to perform OR on all child FilterBlockDocIdSets.
+ * The BlockDocIdSet to perform OR on all child BlockDocIdSets.
  * <p>The OrBlockDocIdSet will construct the BlockDocIdIterator based on the BlockDocIdIterators from the child
- * FilterBlockDocIdSets:
+ * BlockDocIdSets:
  * <ul>
  *   <li>
  *     When there are more than one index-base BlockDocIdIterator (SortedDocIdIterator or BitmapBasedDocIdIterator),
@@ -45,11 +46,11 @@
  *   </li>
  * </ul>
  */
-public final class OrDocIdSet implements FilterBlockDocIdSet {
-  private final List<FilterBlockDocIdSet> _docIdSets;
+public final class OrDocIdSet implements BlockDocIdSet {
+  private final List<BlockDocIdSet> _docIdSets;
   private final int _numDocs;
 
-  public OrDocIdSet(List<FilterBlockDocIdSet> docIdSets, int numDocs) {
+  public OrDocIdSet(List<BlockDocIdSet> docIdSets, int numDocs) {
     _docIdSets = docIdSets;
     _numDocs = numDocs;
   }
@@ -112,7 +113,7 @@ public BlockDocIdIterator iterator() {
   @Override
   public long getNumEntriesScannedInFilter() {
     long numEntriesScannedInFilter = 0L;
-    for (FilterBlockDocIdSet docIdSet : _docIdSets) {
+    for (BlockDocIdSet docIdSet : _docIdSets) {
       numEntriesScannedInFilter += docIdSet.getNumEntriesScannedInFilter();
     }
     return numEntriesScannedInFilter;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/RangelessBitmapDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/RangelessBitmapDocIdSet.java
index 463a2df84ab..20fb0af6f57 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/RangelessBitmapDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/RangelessBitmapDocIdSet.java
@@ -18,11 +18,12 @@
  */
 package org.apache.pinot.core.operator.docidsets;
 
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.RangelessBitmapDocIdIterator;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 
 
-public class RangelessBitmapDocIdSet implements FilterBlockDocIdSet {
+public class RangelessBitmapDocIdSet implements BlockDocIdSet {
   private final RangelessBitmapDocIdIterator _iterator;
 
   public RangelessBitmapDocIdSet(ImmutableRoaringBitmap docIds) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SVScanDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SVScanDocIdSet.java
index 9167304561b..40fc00a6213 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SVScanDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SVScanDocIdSet.java
@@ -18,19 +18,20 @@
  */
 package org.apache.pinot.core.operator.docidsets;
 
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.SVScanDocIdIterator;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
 
 
-public final class SVScanDocIdSet implements FilterBlockDocIdSet {
+public final class SVScanDocIdSet implements BlockDocIdSet {
   private final SVScanDocIdIterator _docIdIterator;
 
   public SVScanDocIdSet(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs,
-      boolean nullHandlingEnabled) {
+      boolean nullHandlingEnabled, int batchSize) {
     NullValueVectorReader nullValueVector = nullHandlingEnabled ? dataSource.getNullValueVector() : null;
-    _docIdIterator = new SVScanDocIdIterator(predicateEvaluator, dataSource, numDocs, nullValueVector);
+    _docIdIterator = new SVScanDocIdIterator(predicateEvaluator, dataSource, numDocs, nullValueVector, batchSize);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SortedDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SortedDocIdSet.java
index 2c57caf2357..280f9daeb99 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SortedDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/SortedDocIdSet.java
@@ -19,11 +19,12 @@
 package org.apache.pinot.core.operator.docidsets;
 
 import java.util.List;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.dociditerators.SortedDocIdIterator;
 import org.apache.pinot.spi.utils.Pairs.IntPair;
 
 
-public final class SortedDocIdSet implements FilterBlockDocIdSet {
+public final class SortedDocIdSet implements BlockDocIdSet {
   private final List<IntPair> _docIdRanges;
 
   // NOTE: No need to track numDocs because sorted index can only apply to ImmutableSegment, so the document ids are
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docvalsets/TransformBlockValSet.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/docvalsets/TransformBlockValSet.java
index 97a767cf19c..6ae584a486a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docvalsets/TransformBlockValSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/docvalsets/TransformBlockValSet.java
@@ -19,12 +19,9 @@
 package org.apache.pinot.core.operator.docvalsets;
 
 import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Set;
 import javax.annotation.Nullable;
-import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
@@ -42,51 +39,26 @@
  * <p>Caller is responsible for calling the correct method based on the data source metadata for the block value set.
  */
 public class TransformBlockValSet implements BlockValSet {
-  private final ProjectionBlock _projectionBlock;
+  private final ValueBlock _valueBlock;
   private final TransformFunction _transformFunction;
-  private final ExpressionContext _expression;
 
   private boolean _nullBitmapSet;
   private RoaringBitmap _nullBitmap;
 
   private int[] _numMVEntries;
 
-  public TransformBlockValSet(ProjectionBlock projectionBlock, TransformFunction transformFunction,
-      ExpressionContext expression) {
-    _projectionBlock = projectionBlock;
+  public TransformBlockValSet(ValueBlock valueBlock, TransformFunction transformFunction) {
+    _valueBlock = valueBlock;
     _transformFunction = transformFunction;
-    _expression = expression;
   }
 
   @Nullable
   @Override
   public RoaringBitmap getNullBitmap() {
     if (!_nullBitmapSet) {
-      RoaringBitmap nullBitmap = null;
-      if (_expression.getType() == ExpressionContext.Type.FUNCTION) {
-        Set<String> columns = new HashSet<>();
-        _expression.getFunction().getColumns(columns);
-        for (String column : columns) {
-          BlockValSet blockValSet = _projectionBlock.getBlockValueSet(column);
-          RoaringBitmap columnNullBitmap = blockValSet.getNullBitmap();
-          if (columnNullBitmap != null) {
-            if (nullBitmap == null) {
-              nullBitmap = columnNullBitmap.clone();
-            }
-            nullBitmap.or(columnNullBitmap);
-          }
-        }
-      }
-      _nullBitmap = nullBitmap;
+      _nullBitmap = _transformFunction.getNullBitmap(_valueBlock);
       _nullBitmapSet = true;
     }
-
-    // The assumption is that any transformation applied to null values will result in null values.
-    // Examples:
-    //  CAST(null as STRING) -> null. This is similar to Presto behaviour.
-    //  YEAR(null) -> null. This is similar to Presto behaviour.
-    // TODO(nhejazi): revisit this part in the future because some transform functions can take null input and return
-    //  non-null result (e.g. isNull()), and we should move this logic into the specific transform function.
     return _nullBitmap;
   }
 
@@ -110,7 +82,7 @@ public Dictionary getDictionary() {
   public int[] getDictionaryIdsSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.INT, true);
-      return _transformFunction.transformToDictIdsSV(_projectionBlock);
+      return _transformFunction.transformToDictIdsSV(_valueBlock);
     }
   }
 
@@ -118,7 +90,7 @@ public int[] getDictionaryIdsSV() {
   public int[] getIntValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.INT, true);
-      return _transformFunction.transformToIntValuesSV(_projectionBlock);
+      return _transformFunction.transformToIntValuesSV(_valueBlock);
     }
   }
 
@@ -126,7 +98,7 @@ public int[] getIntValuesSV() {
   public long[] getLongValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.LONG, true);
-      return _transformFunction.transformToLongValuesSV(_projectionBlock);
+      return _transformFunction.transformToLongValuesSV(_valueBlock);
     }
   }
 
@@ -134,7 +106,7 @@ public long[] getLongValuesSV() {
   public float[] getFloatValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.FLOAT, true);
-      return _transformFunction.transformToFloatValuesSV(_projectionBlock);
+      return _transformFunction.transformToFloatValuesSV(_valueBlock);
     }
   }
 
@@ -142,7 +114,7 @@ public float[] getFloatValuesSV() {
   public double[] getDoubleValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.DOUBLE, true);
-      return _transformFunction.transformToDoubleValuesSV(_projectionBlock);
+      return _transformFunction.transformToDoubleValuesSV(_valueBlock);
     }
   }
 
@@ -150,7 +122,7 @@ public double[] getDoubleValuesSV() {
   public BigDecimal[] getBigDecimalValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.BIG_DECIMAL, true);
-      return _transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
+      return _transformFunction.transformToBigDecimalValuesSV(_valueBlock);
     }
   }
 
@@ -158,7 +130,7 @@ public BigDecimal[] getBigDecimalValuesSV() {
   public String[] getStringValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.STRING, true);
-      return _transformFunction.transformToStringValuesSV(_projectionBlock);
+      return _transformFunction.transformToStringValuesSV(_valueBlock);
     }
   }
 
@@ -166,7 +138,7 @@ public String[] getStringValuesSV() {
   public byte[][] getBytesValuesSV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.BYTES, true);
-      return _transformFunction.transformToBytesValuesSV(_projectionBlock);
+      return _transformFunction.transformToBytesValuesSV(_valueBlock);
     }
   }
 
@@ -174,7 +146,7 @@ public byte[][] getBytesValuesSV() {
   public int[][] getDictionaryIdsMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.INT, false);
-      return _transformFunction.transformToDictIdsMV(_projectionBlock);
+      return _transformFunction.transformToDictIdsMV(_valueBlock);
     }
   }
 
@@ -182,7 +154,7 @@ public int[][] getDictionaryIdsMV() {
   public int[][] getIntValuesMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.INT, false);
-      return _transformFunction.transformToIntValuesMV(_projectionBlock);
+      return _transformFunction.transformToIntValuesMV(_valueBlock);
     }
   }
 
@@ -190,7 +162,7 @@ public int[][] getIntValuesMV() {
   public long[][] getLongValuesMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.LONG, false);
-      return _transformFunction.transformToLongValuesMV(_projectionBlock);
+      return _transformFunction.transformToLongValuesMV(_valueBlock);
     }
   }
 
@@ -198,7 +170,7 @@ public long[][] getLongValuesMV() {
   public float[][] getFloatValuesMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.FLOAT, false);
-      return _transformFunction.transformToFloatValuesMV(_projectionBlock);
+      return _transformFunction.transformToFloatValuesMV(_valueBlock);
     }
   }
 
@@ -206,7 +178,7 @@ public float[][] getFloatValuesMV() {
   public double[][] getDoubleValuesMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.DOUBLE, false);
-      return _transformFunction.transformToDoubleValuesMV(_projectionBlock);
+      return _transformFunction.transformToDoubleValuesMV(_valueBlock);
     }
   }
 
@@ -214,7 +186,7 @@ public double[][] getDoubleValuesMV() {
   public String[][] getStringValuesMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.STRING, false);
-      return _transformFunction.transformToStringValuesMV(_projectionBlock);
+      return _transformFunction.transformToStringValuesMV(_valueBlock);
     }
   }
 
@@ -222,7 +194,7 @@ public String[][] getStringValuesMV() {
   public byte[][][] getBytesValuesMV() {
     try (InvocationScope scope = Tracing.getTracer().createScope(TransformBlockValSet.class)) {
       recordTransformValues(scope, DataType.BYTES, false);
-      return _transformFunction.transformToBytesValuesMV(_projectionBlock);
+      return _transformFunction.transformToBytesValuesMV(_valueBlock);
     }
   }
 
@@ -231,7 +203,7 @@ public int[] getNumMVEntries() {
     if (_numMVEntries == null) {
       _numMVEntries = new int[DocIdSetPlanNode.MAX_DOC_PER_CALL];
     }
-    int numDocs = _projectionBlock.getNumDocs();
+    int numDocs = _valueBlock.getNumDocs();
     TransformResultMetadata resultMetadata = _transformFunction.getResultMetadata();
     if (resultMetadata.hasDictionary()) {
       int[][] dictionaryIds = getDictionaryIdsMV();
@@ -279,7 +251,7 @@ public int[] getNumMVEntries() {
 
   private void recordTransformValues(InvocationRecording recording, DataType dataType, boolean singleValue) {
     if (recording.isEnabled()) {
-      int numDocs = _projectionBlock.getNumDocs();
+      int numDocs = _valueBlock.getNumDocs();
       recording.setNumDocsScanned(numDocs);
       recording.setFunctionName(_transformFunction.getName());
       recording.setOutputDataType(dataType, singleValue);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java
index de2062fd6c6..38da261c52c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.operator.docidsets.AndDocIdSet;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.buffer.BufferFastAggregation;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
@@ -48,11 +48,11 @@ public AndFilterOperator(List<BaseFilterOperator> filterOperators) {
   @Override
   protected FilterBlock getNextBlock() {
     Tracing.activeRecording().setNumChildren(_filterOperators.size());
-    List<FilterBlockDocIdSet> filterBlockDocIdSets = new ArrayList<>(_filterOperators.size());
+    List<BlockDocIdSet> blockDocIdSets = new ArrayList<>(_filterOperators.size());
     for (BaseFilterOperator filterOperator : _filterOperators) {
-      filterBlockDocIdSets.add(filterOperator.nextBlock().getBlockDocIdSet());
+      blockDocIdSets.add(filterOperator.nextBlock().getBlockDocIdSet());
     }
-    return new FilterBlock(new AndDocIdSet(filterBlockDocIdSets, _queryOptions));
+    return new FilterBlock(new AndDocIdSet(blockDocIdSets, _queryOptions));
   }
 
   @Override
@@ -77,7 +77,6 @@ public int getNumMatchingDocs() {
     return BufferFastAggregation.andCardinality(bitmaps);
   }
 
-
   @Override
   public List<Operator> getChildOperators() {
     return new ArrayList<>(_filterOperators);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java
index bd8fb41ce1f..91cb33879bc 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java
@@ -20,43 +20,20 @@
 
 import java.util.Collections;
 import java.util.List;
-import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.core.common.Operator;
-import org.apache.pinot.core.operator.blocks.EmptyFilterBlock;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.operator.docidsets.BitmapDocIdSet;
-import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.spi.trace.FilterType;
-import org.apache.pinot.spi.trace.InvocationRecording;
-import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
-import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
 
-@SuppressWarnings("rawtypes")
 public class BitmapBasedFilterOperator extends BaseFilterOperator {
-  private static final String EXPLAIN_NAME = "FILTER_INVERTED_INDEX";
+  private static final String EXPLAIN_NAME = "FILTER_BITMAP";
 
-  private final PredicateEvaluator _predicateEvaluator;
-  private final InvertedIndexReader<ImmutableRoaringBitmap> _invertedIndexReader;
   private final ImmutableRoaringBitmap _docIds;
   private final boolean _exclusive;
   private final int _numDocs;
 
-  @SuppressWarnings("unchecked")
-  BitmapBasedFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs) {
-    _predicateEvaluator = predicateEvaluator;
-    _invertedIndexReader = (InvertedIndexReader<ImmutableRoaringBitmap>) dataSource.getInvertedIndex();
-    _docIds = null;
-    _exclusive = predicateEvaluator.isExclusive();
-    _numDocs = numDocs;
-  }
-
   public BitmapBasedFilterOperator(ImmutableRoaringBitmap docIds, boolean exclusive, int numDocs) {
-    _predicateEvaluator = null;
-    _invertedIndexReader = null;
     _docIds = docIds;
     _exclusive = exclusive;
     _numDocs = numDocs;
@@ -64,48 +41,10 @@ public BitmapBasedFilterOperator(ImmutableRoaringBitmap docIds, boolean exclusiv
 
   @Override
   protected FilterBlock getNextBlock() {
-    if (_docIds != null) {
-      if (_exclusive) {
-        return new FilterBlock(new BitmapDocIdSet(ImmutableRoaringBitmap.flip(_docIds, 0L, _numDocs), _numDocs));
-      } else {
-        return new FilterBlock(new BitmapDocIdSet(_docIds, _numDocs));
-      }
-    }
-
-    int[] dictIds = _exclusive ? _predicateEvaluator.getNonMatchingDictIds() : _predicateEvaluator.getMatchingDictIds();
-    int numDictIds = dictIds.length;
-    if (numDictIds == 0) {
-      return EmptyFilterBlock.getInstance();
-    }
-    if (numDictIds == 1) {
-      ImmutableRoaringBitmap docIds = _invertedIndexReader.getDocIds(dictIds[0]);
-      if (_exclusive) {
-        if (docIds instanceof MutableRoaringBitmap) {
-          MutableRoaringBitmap mutableRoaringBitmap = (MutableRoaringBitmap) docIds;
-          mutableRoaringBitmap.flip(0L, _numDocs);
-          return new FilterBlock(new BitmapDocIdSet(mutableRoaringBitmap, _numDocs));
-        } else {
-          return new FilterBlock(new BitmapDocIdSet(ImmutableRoaringBitmap.flip(docIds, 0L, _numDocs), _numDocs));
-        }
-      } else {
-        return new FilterBlock(new BitmapDocIdSet(docIds, _numDocs));
-      }
+    if (_exclusive) {
+      return new FilterBlock(new BitmapDocIdSet(ImmutableRoaringBitmap.flip(_docIds, 0L, _numDocs), _numDocs));
     } else {
-      ImmutableRoaringBitmap[] bitmaps = new ImmutableRoaringBitmap[numDictIds];
-      for (int i = 0; i < numDictIds; i++) {
-        bitmaps[i] = _invertedIndexReader.getDocIds(dictIds[i]);
-      }
-      MutableRoaringBitmap docIds = ImmutableRoaringBitmap.or(bitmaps);
-      if (_exclusive) {
-        docIds.flip(0L, _numDocs);
-      }
-      InvocationRecording recording = Tracing.activeRecording();
-      if (recording.isEnabled()) {
-        recording.setColumnName(_predicateEvaluator.getPredicate().getLhs().getIdentifier());
-        recording.setNumDocsMatchingAfterFilter(docIds.getCardinality());
-        recording.setFilter(FilterType.INDEX, String.valueOf(_predicateEvaluator.getPredicateType()));
-      }
-      return new FilterBlock(new BitmapDocIdSet(docIds, _numDocs));
+      return new FilterBlock(new BitmapDocIdSet(_docIds, _numDocs));
     }
   }
 
@@ -116,36 +55,7 @@ public boolean canOptimizeCount() {
 
   @Override
   public int getNumMatchingDocs() {
-    int count = 0;
-    if (_docIds == null) {
-      int[] dictIds = _exclusive
-          ? _predicateEvaluator.getNonMatchingDictIds()
-          : _predicateEvaluator.getMatchingDictIds();
-      switch (dictIds.length) {
-        case 0:
-          break;
-        case 1: {
-          count = _invertedIndexReader.getDocIds(dictIds[0]).getCardinality();
-          break;
-        }
-        case 2: {
-          count = ImmutableRoaringBitmap.orCardinality(_invertedIndexReader.getDocIds(dictIds[0]),
-              _invertedIndexReader.getDocIds(dictIds[1]));
-          break;
-        }
-        default: {
-          // this could be optimised if the bitmaps are known to be disjoint (as in a single value bitmap index)
-          MutableRoaringBitmap bitmap = new MutableRoaringBitmap();
-          for (int dictId : dictIds) {
-            bitmap.or(_invertedIndexReader.getDocIds(dictId));
-          }
-          count = bitmap.getCardinality();
-          break;
-        }
-      }
-    } else {
-      count = _docIds.getCardinality();
-    }
+    int count = _docIds.getCardinality();
     return _exclusive ? _numDocs - count : count;
   }
 
@@ -156,34 +66,18 @@ public boolean canProduceBitmaps() {
 
   @Override
   public BitmapCollection getBitmaps() {
-    if (_docIds == null) {
-      int[] dictIds = _exclusive
-          ? _predicateEvaluator.getNonMatchingDictIds()
-          : _predicateEvaluator.getMatchingDictIds();
-      ImmutableRoaringBitmap[] bitmaps = new ImmutableRoaringBitmap[dictIds.length];
-      for (int i = 0; i < dictIds.length; i++) {
-        bitmaps[i] = _invertedIndexReader.getDocIds(dictIds[i]);
-      }
-      return new BitmapCollection(_numDocs, _exclusive, bitmaps);
-    } else {
-      return new BitmapCollection(_numDocs, _exclusive, _docIds);
-    }
+    return new BitmapCollection(_numDocs, _exclusive, _docIds);
   }
 
 
   @Override
+  @SuppressWarnings("rawtypes")
   public List<Operator> getChildOperators() {
     return Collections.emptyList();
   }
 
   @Override
   public String toExplainString() {
-    StringBuilder stringBuilder = new StringBuilder(EXPLAIN_NAME).append("(indexLookUp:inverted_index");
-    Predicate predicate = _predicateEvaluator != null ? _predicateEvaluator.getPredicate() : null;
-    if (predicate != null) {
-      stringBuilder.append(",operator:").append(predicate.getType());
-      stringBuilder.append(",predicate:").append(predicate.toString());
-    }
-    return stringBuilder.append(')').toString();
+    return EXPLAIN_NAME;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java
index 89b856d9b65..4c4f2a689de 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java
@@ -21,10 +21,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.operator.docidsets.AndDocIdSet;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.spi.trace.Tracing;
 
 
@@ -41,13 +40,15 @@ public class CombinedFilterOperator extends BaseFilterOperator {
 
   public CombinedFilterOperator(BaseFilterOperator mainFilterOperator, BaseFilterOperator subFilterOperator,
       Map<String, String> queryOptions) {
+    assert !mainFilterOperator.isResultEmpty() && !mainFilterOperator.isResultMatchingAll()
+        && !subFilterOperator.isResultEmpty() && !subFilterOperator.isResultMatchingAll();
     _mainFilterOperator = mainFilterOperator;
     _subFilterOperator = subFilterOperator;
     _queryOptions = queryOptions;
   }
 
   @Override
-  public List<Operator> getChildOperators() {
+  public List<BaseFilterOperator> getChildOperators() {
     return Arrays.asList(_mainFilterOperator, _subFilterOperator);
   }
 
@@ -59,8 +60,8 @@ public String toExplainString() {
   @Override
   protected FilterBlock getNextBlock() {
     Tracing.activeRecording().setNumChildren(2);
-    FilterBlockDocIdSet mainFilterDocIdSet = _mainFilterOperator.nextBlock().getNonScanFilterBLockDocIdSet();
-    FilterBlockDocIdSet subFilterDocIdSet = _subFilterOperator.nextBlock().getBlockDocIdSet();
+    BlockDocIdSet mainFilterDocIdSet = _mainFilterOperator.nextBlock().getNonScanFilterBLockDocIdSet();
+    BlockDocIdSet subFilterDocIdSet = _subFilterOperator.nextBlock().getBlockDocIdSet();
     return new FilterBlock(new AndDocIdSet(Arrays.asList(mainFilterDocIdSet, subFilterDocIdSet), _queryOptions));
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java
index 974eff26f43..66fe22b110c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import org.apache.pinot.core.common.ExplainPlanRows;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.EmptyFilterBlock;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
@@ -71,4 +72,9 @@ public String toExplainString() {
   public List<Operator> getChildOperators() {
     return Collections.emptyList();
   }
+
+  @Override
+  public void prepareForExplainPlan(ExplainPlanRows explainPlanRows) {
+    explainPlanRows.setHasEmptyFilter(true);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java
index 9342dc80472..9001e48fe24 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java
@@ -26,13 +26,16 @@
 import java.util.Set;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.predicate.Predicate;
+import org.apache.pinot.common.utils.HashUtil;
 import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
-import org.apache.pinot.core.operator.docidsets.ExpressionFilterDocIdSet;
+import org.apache.pinot.core.operator.docidsets.ExpressionDocIdSet;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluatorProvider;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunctionFactory;
+import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 
@@ -45,32 +48,33 @@ public class ExpressionFilterOperator extends BaseFilterOperator {
   private final TransformFunction _transformFunction;
   private final PredicateEvaluator _predicateEvaluator;
 
-  public ExpressionFilterOperator(IndexSegment segment, Predicate predicate, int numDocs) {
+  public ExpressionFilterOperator(IndexSegment segment, QueryContext queryContext, Predicate predicate, int numDocs) {
     _numDocs = numDocs;
 
-    _dataSourceMap = new HashMap<>();
     Set<String> columns = new HashSet<>();
     ExpressionContext lhs = predicate.getLhs();
     lhs.getColumns(columns);
-    for (String column : columns) {
-      _dataSourceMap.put(column, segment.getDataSource(column));
-    }
-
-    _transformFunction = TransformFunctionFactory.get(lhs, _dataSourceMap);
-    _predicateEvaluator = PredicateEvaluatorProvider
-        .getPredicateEvaluator(predicate, _transformFunction.getDictionary(),
+    int mapCapacity = HashUtil.getHashMapCapacity(columns.size());
+    _dataSourceMap = new HashMap<>(mapCapacity);
+    Map<String, ColumnContext> columnContextMap = new HashMap<>(mapCapacity);
+    columns.forEach(column -> {
+      DataSource dataSource = segment.getDataSource(column);
+      _dataSourceMap.put(column, dataSource);
+      columnContextMap.put(column, ColumnContext.fromDataSource(dataSource));
+    });
+    _transformFunction = TransformFunctionFactory.get(lhs, columnContextMap, queryContext);
+    _predicateEvaluator =
+        PredicateEvaluatorProvider.getPredicateEvaluator(predicate, _transformFunction.getDictionary(),
             _transformFunction.getResultMetadata().getDataType());
   }
 
   @Override
   protected FilterBlock getNextBlock() {
-    return new FilterBlock(
-        new ExpressionFilterDocIdSet(_transformFunction, _predicateEvaluator, _dataSourceMap, _numDocs));
+    return new FilterBlock(new ExpressionDocIdSet(_transformFunction, _predicateEvaluator, _dataSourceMap, _numDocs));
   }
 
-
   @Override
-  public List<Operator> getChildOperators() {
+  public List<Operator<?>> getChildOperators() {
     return Collections.emptyList();
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/FilterOperatorUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/FilterOperatorUtils.java
index aa738beab4f..7e00400eeec 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/FilterOperatorUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/FilterOperatorUtils.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.OptionalInt;
 import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.core.query.request.context.QueryContext;
@@ -28,9 +29,221 @@
 
 
 public class FilterOperatorUtils {
+
+  private static Implementation _instance = new DefaultImplementation();
+
   private FilterOperatorUtils() {
   }
 
+  public static void setImplementation(Implementation newImplementation) {
+    _instance = newImplementation;
+  }
+
+  public interface Implementation {
+
+    /**
+     * Returns the leaf filter operator (i.e. not {@link AndFilterOperator} or {@link OrFilterOperator}).
+     */
+    BaseFilterOperator getLeafFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource,
+        int numDocs, boolean nullHandlingEnabled);
+
+    /**
+     * Returns the AND filter operator or equivalent filter operator.
+     */
+    BaseFilterOperator getAndFilterOperator(QueryContext queryContext,
+        List<BaseFilterOperator> filterOperators, int numDocs);
+
+    /**
+     * Returns the OR filter operator or equivalent filter operator.
+     */
+    BaseFilterOperator getOrFilterOperator(QueryContext queryContext,
+        List<BaseFilterOperator> filterOperators, int numDocs);
+
+    /**
+     * Returns the NOT filter operator or equivalent filter operator.
+     */
+    BaseFilterOperator getNotFilterOperator(QueryContext queryContext, BaseFilterOperator filterOperator,
+        int numDocs);
+  }
+
+  public static class DefaultImplementation implements Implementation {
+    @Override
+    public BaseFilterOperator getLeafFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource,
+        int numDocs, boolean nullHandlingEnabled) {
+      if (predicateEvaluator.isAlwaysFalse()) {
+        return EmptyFilterOperator.getInstance();
+      } else if (predicateEvaluator.isAlwaysTrue()) {
+        return new MatchAllFilterOperator(numDocs);
+      }
+
+      // Currently sorted index based filtering is supported only for
+      // dictionary encoded columns. The on-disk segment metadata
+      // will indicate if the column is sorted or not regardless of
+      // whether it is raw or dictionary encoded. Here when creating
+      // the filter operator, we need to make sure that sort filter
+      // operator is used only if the column is sorted and has dictionary.
+      Predicate.Type predicateType = predicateEvaluator.getPredicateType();
+      if (predicateType == Predicate.Type.RANGE) {
+        if (dataSource.getDataSourceMetadata().isSorted() && dataSource.getDictionary() != null) {
+          return new SortedIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        if (RangeIndexBasedFilterOperator.canEvaluate(predicateEvaluator, dataSource)) {
+          return new RangeIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        return new ScanBasedFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
+      } else if (predicateType == Predicate.Type.REGEXP_LIKE) {
+        if (dataSource.getFSTIndex() != null && dataSource.getDataSourceMetadata().isSorted()) {
+          return new SortedIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        if (dataSource.getFSTIndex() != null && dataSource.getInvertedIndex() != null) {
+          return new InvertedIndexFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        return new ScanBasedFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
+      } else {
+        if (dataSource.getDataSourceMetadata().isSorted() && dataSource.getDictionary() != null) {
+          return new SortedIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        if (dataSource.getInvertedIndex() != null) {
+          return new InvertedIndexFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        if (RangeIndexBasedFilterOperator.canEvaluate(predicateEvaluator, dataSource)) {
+          return new RangeIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
+        }
+        return new ScanBasedFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
+      }
+    }
+
+    @Override
+    public BaseFilterOperator getAndFilterOperator(QueryContext queryContext, List<BaseFilterOperator> filterOperators,
+        int numDocs) {
+      List<BaseFilterOperator> childFilterOperators = new ArrayList<>(filterOperators.size());
+      for (BaseFilterOperator filterOperator : filterOperators) {
+        if (filterOperator.isResultEmpty()) {
+          return EmptyFilterOperator.getInstance();
+        } else if (!filterOperator.isResultMatchingAll()) {
+          childFilterOperators.add(filterOperator);
+        }
+      }
+      int numChildFilterOperators = childFilterOperators.size();
+      if (numChildFilterOperators == 0) {
+        // Return match all filter operator if all child filter operators match all records
+        return new MatchAllFilterOperator(numDocs);
+      } else if (numChildFilterOperators == 1) {
+        // Return the child filter operator if only one left
+        return childFilterOperators.get(0);
+      } else {
+        // Return the AND filter operator with re-ordered child filter operators
+        reorderAndFilterChildOperators(queryContext, childFilterOperators);
+        return new AndFilterOperator(childFilterOperators, queryContext.getQueryOptions());
+      }
+    }
+
+    @Override
+    public BaseFilterOperator getOrFilterOperator(QueryContext queryContext,
+        List<BaseFilterOperator> filterOperators, int numDocs) {
+      List<BaseFilterOperator> childFilterOperators = new ArrayList<>(filterOperators.size());
+      for (BaseFilterOperator filterOperator : filterOperators) {
+        if (filterOperator.isResultMatchingAll()) {
+          return new MatchAllFilterOperator(numDocs);
+        } else if (!filterOperator.isResultEmpty()) {
+          childFilterOperators.add(filterOperator);
+        }
+      }
+      int numChildFilterOperators = childFilterOperators.size();
+      if (numChildFilterOperators == 0) {
+        // Return empty filter operator if all child filter operators's result is empty
+        return EmptyFilterOperator.getInstance();
+      } else if (numChildFilterOperators == 1) {
+        // Return the child filter operator if only one left
+        return childFilterOperators.get(0);
+      } else {
+        // Return the OR filter operator with child filter operators
+        return new OrFilterOperator(childFilterOperators, numDocs);
+      }
+    }
+
+    @Override
+    public BaseFilterOperator getNotFilterOperator(QueryContext queryContext, BaseFilterOperator filterOperator,
+        int numDocs) {
+      if (filterOperator.isResultMatchingAll()) {
+        return EmptyFilterOperator.getInstance();
+      } else if (filterOperator.isResultEmpty()) {
+        return new MatchAllFilterOperator(numDocs);
+      }
+
+      return new NotFilterOperator(filterOperator, numDocs);
+    }
+
+
+    /**
+     * For AND filter operator, reorders its child filter operators based on their cost and puts the ones with
+     * inverted index first in order to reduce the number of documents to be processed.
+     * <p>Special filter operators such as {@link MatchAllFilterOperator} and {@link EmptyFilterOperator} should be
+     * removed from the list before calling this method.
+     */
+    protected void reorderAndFilterChildOperators(QueryContext queryContext, List<BaseFilterOperator> filterOperators) {
+      filterOperators.sort(new Comparator<BaseFilterOperator>() {
+        @Override
+        public int compare(BaseFilterOperator o1, BaseFilterOperator o2) {
+          return getPriority(o1) - getPriority(o2);
+        }
+
+        int getPriority(BaseFilterOperator filterOperator) {
+          if (filterOperator instanceof PrioritizedFilterOperator) {
+            OptionalInt priority = ((PrioritizedFilterOperator<?>) filterOperator).getPriority();
+            if (priority.isPresent()) {
+              return priority.getAsInt();
+            }
+          }
+          if (filterOperator instanceof SortedIndexBasedFilterOperator) {
+            return PrioritizedFilterOperator.HIGH_PRIORITY;
+          }
+          if (filterOperator instanceof BitmapBasedFilterOperator) {
+            return PrioritizedFilterOperator.MEDIUM_PRIORITY;
+          }
+          if (filterOperator instanceof RangeIndexBasedFilterOperator
+              || filterOperator instanceof TextContainsFilterOperator
+              || filterOperator instanceof TextMatchFilterOperator || filterOperator instanceof JsonMatchFilterOperator
+              || filterOperator instanceof H3IndexFilterOperator
+              || filterOperator instanceof H3InclusionIndexFilterOperator) {
+            return PrioritizedFilterOperator.LOW_PRIORITY;
+          }
+          if (filterOperator instanceof AndFilterOperator) {
+            return PrioritizedFilterOperator.AND_PRIORITY;
+          }
+          if (filterOperator instanceof OrFilterOperator) {
+            return PrioritizedFilterOperator.OR_PRIORITY;
+          }
+          if (filterOperator instanceof NotFilterOperator) {
+            return getPriority(((NotFilterOperator) filterOperator).getChildFilterOperator());
+          }
+          if (filterOperator instanceof ScanBasedFilterOperator) {
+            int basePriority = PrioritizedFilterOperator.SCAN_PRIORITY;
+            return getScanBasedFilterPriority(queryContext, (ScanBasedFilterOperator) filterOperator, basePriority);
+          }
+          if (filterOperator instanceof ExpressionFilterOperator) {
+            return PrioritizedFilterOperator.EXPRESSION_PRIORITY;
+          }
+          return PrioritizedFilterOperator.UNKNOWN_FILTER_PRIORITY;
+        }
+      });
+    }
+
+    public static int getScanBasedFilterPriority(QueryContext queryContext,
+        ScanBasedFilterOperator scanBasedFilterOperator, int basePriority) {
+      if (queryContext.isSkipScanFilterReorder()) {
+        return basePriority;
+      }
+
+      if (scanBasedFilterOperator.getDataSourceMetadata().isSingleValue()) {
+        return basePriority;
+      } else {
+        // Lower priority for multi-value column
+        return basePriority + 50;
+      }
+    }
+  }
+
   /**
    * Returns the leaf filter operator (i.e. not {@link AndFilterOperator} or {@link OrFilterOperator}).
    */
@@ -44,47 +257,7 @@ public static BaseFilterOperator getLeafFilterOperator(PredicateEvaluator predic
    */
   public static BaseFilterOperator getLeafFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource,
       int numDocs, boolean nullHandlingEnabled) {
-    if (predicateEvaluator.isAlwaysFalse()) {
-      return EmptyFilterOperator.getInstance();
-    } else if (predicateEvaluator.isAlwaysTrue()) {
-      return new MatchAllFilterOperator(numDocs);
-    }
-
-    // Currently sorted index based filtering is supported only for
-    // dictionary encoded columns. The on-disk segment metadata
-    // will indicate if the column is sorted or not regardless of
-    // whether it is raw or dictionary encoded. Here when creating
-    // the filter operator, we need to make sure that sort filter
-    // operator is used only if the column is sorted and has dictionary.
-    Predicate.Type predicateType = predicateEvaluator.getPredicateType();
-    if (predicateType == Predicate.Type.RANGE) {
-      if (dataSource.getDataSourceMetadata().isSorted() && dataSource.getDictionary() != null) {
-        return new SortedIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      if (RangeIndexBasedFilterOperator.canEvaluate(predicateEvaluator, dataSource)) {
-        return new RangeIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      return new ScanBasedFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
-    } else if (predicateType == Predicate.Type.REGEXP_LIKE) {
-      if (dataSource.getFSTIndex() != null && dataSource.getDataSourceMetadata().isSorted()) {
-        return new SortedIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      if (dataSource.getFSTIndex() != null && dataSource.getInvertedIndex() != null) {
-        return new BitmapBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      return new ScanBasedFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
-    } else {
-      if (dataSource.getDataSourceMetadata().isSorted() && dataSource.getDictionary() != null) {
-        return new SortedIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      if (dataSource.getInvertedIndex() != null) {
-        return new BitmapBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      if (RangeIndexBasedFilterOperator.canEvaluate(predicateEvaluator, dataSource)) {
-        return new RangeIndexBasedFilterOperator(predicateEvaluator, dataSource, numDocs);
-      }
-      return new ScanBasedFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
-    }
+    return _instance.getLeafFilterOperator(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled);
   }
 
   /**
@@ -92,26 +265,7 @@ public static BaseFilterOperator getLeafFilterOperator(PredicateEvaluator predic
    */
   public static BaseFilterOperator getAndFilterOperator(QueryContext queryContext,
       List<BaseFilterOperator> filterOperators, int numDocs) {
-    List<BaseFilterOperator> childFilterOperators = new ArrayList<>(filterOperators.size());
-    for (BaseFilterOperator filterOperator : filterOperators) {
-      if (filterOperator.isResultEmpty()) {
-        return EmptyFilterOperator.getInstance();
-      } else if (!filterOperator.isResultMatchingAll()) {
-        childFilterOperators.add(filterOperator);
-      }
-    }
-    int numChildFilterOperators = childFilterOperators.size();
-    if (numChildFilterOperators == 0) {
-      // Return match all filter operator if all child filter operators match all records
-      return new MatchAllFilterOperator(numDocs);
-    } else if (numChildFilterOperators == 1) {
-      // Return the child filter operator if only one left
-      return childFilterOperators.get(0);
-    } else {
-      // Return the AND filter operator with re-ordered child filter operators
-      FilterOperatorUtils.reorderAndFilterChildOperators(queryContext, childFilterOperators);
-      return new AndFilterOperator(childFilterOperators, queryContext.getQueryOptions());
-    }
+    return _instance.getAndFilterOperator(queryContext, filterOperators, numDocs);
   }
 
   /**
@@ -119,25 +273,7 @@ public static BaseFilterOperator getAndFilterOperator(QueryContext queryContext,
    */
   public static BaseFilterOperator getOrFilterOperator(QueryContext queryContext,
       List<BaseFilterOperator> filterOperators, int numDocs) {
-    List<BaseFilterOperator> childFilterOperators = new ArrayList<>(filterOperators.size());
-    for (BaseFilterOperator filterOperator : filterOperators) {
-      if (filterOperator.isResultMatchingAll()) {
-        return new MatchAllFilterOperator(numDocs);
-      } else if (!filterOperator.isResultEmpty()) {
-        childFilterOperators.add(filterOperator);
-      }
-    }
-    int numChildFilterOperators = childFilterOperators.size();
-    if (numChildFilterOperators == 0) {
-      // Return empty filter operator if all child filter operators's result is empty
-      return EmptyFilterOperator.getInstance();
-    } else if (numChildFilterOperators == 1) {
-      // Return the child filter operator if only one left
-      return childFilterOperators.get(0);
-    } else {
-      // Return the OR filter operator with child filter operators
-      return new OrFilterOperator(childFilterOperators, numDocs);
-    }
+    return _instance.getOrFilterOperator(queryContext, filterOperators, numDocs);
   }
 
   /**
@@ -145,84 +281,6 @@ public static BaseFilterOperator getOrFilterOperator(QueryContext queryContext,
    */
   public static BaseFilterOperator getNotFilterOperator(QueryContext queryContext, BaseFilterOperator filterOperator,
       int numDocs) {
-    if (filterOperator.isResultMatchingAll()) {
-      return EmptyFilterOperator.getInstance();
-    } else if (filterOperator.isResultEmpty()) {
-      return new MatchAllFilterOperator(numDocs);
-    }
-
-    return new NotFilterOperator(filterOperator, numDocs);
-  }
-
-  /**
-   * For AND filter operator, reorders its child filter operators based on the their cost and puts the ones with
-   * inverted index first in order to reduce the number of documents to be processed.
-   * <p>Special filter operators such as {@link MatchAllFilterOperator} and {@link EmptyFilterOperator} should be
-   * removed from the list before calling this method.
-   */
-  private static void reorderAndFilterChildOperators(QueryContext queryContext,
-      List<BaseFilterOperator> filterOperators) {
-    filterOperators.sort(new Comparator<BaseFilterOperator>() {
-      @Override
-      public int compare(BaseFilterOperator o1, BaseFilterOperator o2) {
-        return getPriority(o1) - getPriority(o2);
-      }
-
-      int getPriority(BaseFilterOperator filterOperator) {
-        if (filterOperator instanceof SortedIndexBasedFilterOperator) {
-          return 0;
-        }
-        if (filterOperator instanceof BitmapBasedFilterOperator) {
-          return 1;
-        }
-        if (filterOperator instanceof RangeIndexBasedFilterOperator
-            || filterOperator instanceof TextContainsFilterOperator || filterOperator instanceof TextMatchFilterOperator
-            || filterOperator instanceof JsonMatchFilterOperator || filterOperator instanceof H3IndexFilterOperator
-            || filterOperator instanceof H3InclusionIndexFilterOperator) {
-          return 2;
-        }
-        if (filterOperator instanceof AndFilterOperator) {
-          return 3;
-        }
-        if (filterOperator instanceof OrFilterOperator) {
-          return 4;
-        }
-        if (filterOperator instanceof NotFilterOperator) {
-          return getPriority(((NotFilterOperator) filterOperator).getChildFilterOperator());
-        }
-        if (filterOperator instanceof ScanBasedFilterOperator) {
-          return getScanBasedFilterPriority(queryContext, (ScanBasedFilterOperator) filterOperator, 5);
-        }
-        if (filterOperator instanceof ExpressionFilterOperator) {
-          return 10;
-        }
-        throw new IllegalStateException(filterOperator.getClass().getSimpleName()
-            + " should not be reordered, remove it from the list before calling this method");
-      }
-    });
-  }
-
-  /**
-   * Returns the priority for scan based filtering. Multivalue column evaluation is costly, so
-   * reorder such that multivalue columns are evaluated after single value columns.
-   *
-   * TODO: additional cost based prioritization to be added
-   *
-   * @param scanBasedFilterOperator the filter operator to prioritize
-   * @param queryContext query context
-   * @return the priority to be associated with the filter
-   */
-  private static int getScanBasedFilterPriority(QueryContext queryContext,
-      ScanBasedFilterOperator scanBasedFilterOperator, int basePriority) {
-    if (queryContext.isSkipScanFilterReorder()) {
-      return basePriority;
-    }
-
-    if (scanBasedFilterOperator.getDataSourceMetadata().isSingleValue()) {
-      return basePriority;
-    } else {
-      // Lower priority for multi-value column
-      return basePriority + 1;
-    }
+    return _instance.getNotFilterOperator(queryContext, filterOperator, numDocs);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3InclusionIndexFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3InclusionIndexFilterOperator.java
index 081afdf2716..3df7a880884 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3InclusionIndexFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3InclusionIndexFilterOperator.java
@@ -47,24 +47,23 @@
  * A filter operator that uses H3 index for geospatial data inclusion
  */
 public class H3InclusionIndexFilterOperator extends BaseFilterOperator {
-
   private static final String EXPLAIN_NAME = "INCLUSION_FILTER_H3_INDEX";
   private static final String LITERAL_H3_CELLS_CACHE_NAME = "st_contain_literal_h3_cells";
 
   private final IndexSegment _segment;
+  private final QueryContext _queryContext;
   private final Predicate _predicate;
   private final int _numDocs;
   private final H3IndexReader _h3IndexReader;
   private final Geometry _geometry;
   private final boolean _isPositiveCheck;
-  private final QueryContext _queryContext;
 
-  public H3InclusionIndexFilterOperator(IndexSegment segment, Predicate predicate, QueryContext queryContext,
+  public H3InclusionIndexFilterOperator(IndexSegment segment, QueryContext queryContext, Predicate predicate,
       int numDocs) {
     _segment = segment;
+    _queryContext = queryContext;
     _predicate = predicate;
     _numDocs = numDocs;
-    _queryContext = queryContext;
 
     List<ExpressionContext> arguments = predicate.getLhs().getFunction().getArguments();
     EqPredicate eqPredicate = (EqPredicate) predicate;
@@ -72,10 +71,10 @@ public H3InclusionIndexFilterOperator(IndexSegment segment, Predicate predicate,
 
     if (arguments.get(0).getType() == ExpressionContext.Type.IDENTIFIER) {
       _h3IndexReader = segment.getDataSource(arguments.get(0).getIdentifier()).getH3Index();
-      _geometry = GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(1).getLiteralString()));
+      _geometry = GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(1).getLiteral().getStringValue()));
     } else {
       _h3IndexReader = segment.getDataSource(arguments.get(1).getIdentifier()).getH3Index();
-      _geometry = GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(0).getLiteralString()));
+      _geometry = GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(0).getLiteral().getStringValue()));
     }
     // must be some h3 index
     assert _h3IndexReader != null : "the column must have H3 index setup.";
@@ -125,7 +124,8 @@ protected FilterBlock getNextBlock() {
    * Returns the filter block based on the given the partial match doc ids.
    */
   private FilterBlock getFilterBlock(MutableRoaringBitmap fullMatchDocIds, MutableRoaringBitmap partialMatchDocIds) {
-    ExpressionFilterOperator expressionFilterOperator = new ExpressionFilterOperator(_segment, _predicate, _numDocs);
+    ExpressionFilterOperator expressionFilterOperator =
+        new ExpressionFilterOperator(_segment, _queryContext, _predicate, _numDocs);
     ScanBasedDocIdIterator docIdIterator =
         (ScanBasedDocIdIterator) expressionFilterOperator.getNextBlock().getBlockDocIdSet().iterator();
     MutableRoaringBitmap result = docIdIterator.applyAnd(partialMatchDocIds);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java
index 9f91127c121..96109ba5499 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java
@@ -33,6 +33,7 @@
 import org.apache.pinot.core.operator.docidsets.BitmapDocIdSet;
 import org.apache.pinot.core.operator.docidsets.EmptyDocIdSet;
 import org.apache.pinot.core.operator.docidsets.MatchAllDocIdSet;
+import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.H3Utils;
 import org.apache.pinot.segment.spi.IndexSegment;
@@ -46,9 +47,10 @@
  * A filter operator that uses H3 index for geospatial data retrieval
  */
 public class H3IndexFilterOperator extends BaseFilterOperator {
-
   private static final String EXPLAIN_NAME = "FILTER_H3_INDEX";
+
   private final IndexSegment _segment;
+  private final QueryContext _queryContext;
   private final Predicate _predicate;
   private final int _numDocs;
   private final H3IndexReader _h3IndexReader;
@@ -57,8 +59,9 @@ public class H3IndexFilterOperator extends BaseFilterOperator {
   private final double _lowerBound;
   private final double _upperBound;
 
-  public H3IndexFilterOperator(IndexSegment segment, Predicate predicate, int numDocs) {
+  public H3IndexFilterOperator(IndexSegment segment, QueryContext queryContext, Predicate predicate, int numDocs) {
     _segment = segment;
+    _queryContext = queryContext;
     _predicate = predicate;
     _numDocs = numDocs;
 
@@ -67,12 +70,12 @@ public H3IndexFilterOperator(IndexSegment segment, Predicate predicate, int numD
     Coordinate coordinate;
     if (arguments.get(0).getType() == ExpressionContext.Type.IDENTIFIER) {
       _h3IndexReader = segment.getDataSource(arguments.get(0).getIdentifier()).getH3Index();
-      coordinate =
-          GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(1).getLiteralString())).getCoordinate();
+      coordinate = GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(1).getLiteral().getStringValue()))
+          .getCoordinate();
     } else {
       _h3IndexReader = segment.getDataSource(arguments.get(1).getIdentifier()).getH3Index();
-      coordinate =
-          GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(0).getLiteralString())).getCoordinate();
+      coordinate = GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(0).getLiteral().getStringValue()))
+          .getCoordinate();
     }
     assert _h3IndexReader != null;
     int resolution = _h3IndexReader.getH3IndexResolution().getLowestResolution();
@@ -182,7 +185,7 @@ protected FilterBlock getNextBlock() {
       return getFilterBlock(fullMatchDocIds, partialMatchDocIds);
     } catch (Exception e) {
       // Fall back to ExpressionFilterOperator when the execution encounters exception (e.g. numRings is too large)
-      return new ExpressionFilterOperator(_segment, _predicate, _numDocs).getNextBlock();
+      return new ExpressionFilterOperator(_segment, _queryContext, _predicate, _numDocs).getNextBlock();
     }
   }
 
@@ -229,7 +232,8 @@ private List<Long> getH3Ids(int numRings) {
    * Returns the filter block based on the given full match doc ids and the partial match doc ids.
    */
   private FilterBlock getFilterBlock(MutableRoaringBitmap fullMatchDocIds, MutableRoaringBitmap partialMatchDocIds) {
-    ExpressionFilterOperator expressionFilterOperator = new ExpressionFilterOperator(_segment, _predicate, _numDocs);
+    ExpressionFilterOperator expressionFilterOperator =
+        new ExpressionFilterOperator(_segment, _queryContext, _predicate, _numDocs);
     ScanBasedDocIdIterator docIdIterator =
         (ScanBasedDocIdIterator) expressionFilterOperator.getNextBlock().getBlockDocIdSet().iterator();
     MutableRoaringBitmap result = docIdIterator.applyAnd(partialMatchDocIds);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/InvertedIndexFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/InvertedIndexFilterOperator.java
new file mode 100644
index 00000000000..8f617417a3a
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/InvertedIndexFilterOperator.java
@@ -0,0 +1,158 @@
+/**
+ * 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.pinot.core.operator.filter;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.pinot.common.request.context.predicate.Predicate;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.EmptyFilterBlock;
+import org.apache.pinot.core.operator.blocks.FilterBlock;
+import org.apache.pinot.core.operator.docidsets.BitmapDocIdSet;
+import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
+import org.apache.pinot.spi.trace.FilterType;
+import org.apache.pinot.spi.trace.InvocationRecording;
+import org.apache.pinot.spi.trace.Tracing;
+import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
+import org.roaringbitmap.buffer.MutableRoaringBitmap;
+
+
+public class InvertedIndexFilterOperator extends BaseFilterOperator {
+  private static final String EXPLAIN_NAME = "FILTER_INVERTED_INDEX";
+
+  private final PredicateEvaluator _predicateEvaluator;
+  private final InvertedIndexReader<ImmutableRoaringBitmap> _invertedIndexReader;
+  private final boolean _exclusive;
+  private final int _numDocs;
+
+  InvertedIndexFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs) {
+    _predicateEvaluator = predicateEvaluator;
+    @SuppressWarnings("unchecked")
+    InvertedIndexReader<ImmutableRoaringBitmap> invertedIndexReader =
+        (InvertedIndexReader<ImmutableRoaringBitmap>) dataSource.getInvertedIndex();
+    _invertedIndexReader = invertedIndexReader;
+    _exclusive = predicateEvaluator.isExclusive();
+    _numDocs = numDocs;
+  }
+
+  @Override
+  protected FilterBlock getNextBlock() {
+    int[] dictIds = _exclusive ? _predicateEvaluator.getNonMatchingDictIds() : _predicateEvaluator.getMatchingDictIds();
+    int numDictIds = dictIds.length;
+    if (numDictIds == 0) {
+      return EmptyFilterBlock.getInstance();
+    }
+    if (numDictIds == 1) {
+      ImmutableRoaringBitmap docIds = _invertedIndexReader.getDocIds(dictIds[0]);
+      if (_exclusive) {
+        if (docIds instanceof MutableRoaringBitmap) {
+          MutableRoaringBitmap mutableRoaringBitmap = (MutableRoaringBitmap) docIds;
+          mutableRoaringBitmap.flip(0L, _numDocs);
+          return new FilterBlock(new BitmapDocIdSet(mutableRoaringBitmap, _numDocs));
+        } else {
+          return new FilterBlock(new BitmapDocIdSet(ImmutableRoaringBitmap.flip(docIds, 0L, _numDocs), _numDocs));
+        }
+      } else {
+        return new FilterBlock(new BitmapDocIdSet(docIds, _numDocs));
+      }
+    } else {
+      ImmutableRoaringBitmap[] bitmaps = new ImmutableRoaringBitmap[numDictIds];
+      for (int i = 0; i < numDictIds; i++) {
+        bitmaps[i] = _invertedIndexReader.getDocIds(dictIds[i]);
+      }
+      MutableRoaringBitmap docIds = ImmutableRoaringBitmap.or(bitmaps);
+      if (_exclusive) {
+        docIds.flip(0L, _numDocs);
+      }
+      InvocationRecording recording = Tracing.activeRecording();
+      if (recording.isEnabled()) {
+        recording.setColumnName(_predicateEvaluator.getPredicate().getLhs().getIdentifier());
+        recording.setNumDocsMatchingAfterFilter(docIds.getCardinality());
+        recording.setFilter(FilterType.INDEX, String.valueOf(_predicateEvaluator.getPredicateType()));
+      }
+      return new FilterBlock(new BitmapDocIdSet(docIds, _numDocs));
+    }
+  }
+
+  @Override
+  public boolean canOptimizeCount() {
+    return true;
+  }
+
+  @Override
+  public int getNumMatchingDocs() {
+    int count = 0;
+    int[] dictIds = _exclusive ? _predicateEvaluator.getNonMatchingDictIds() : _predicateEvaluator.getMatchingDictIds();
+    switch (dictIds.length) {
+      case 0:
+        break;
+      case 1: {
+        count = _invertedIndexReader.getDocIds(dictIds[0]).getCardinality();
+        break;
+      }
+      case 2: {
+        count = ImmutableRoaringBitmap.orCardinality(_invertedIndexReader.getDocIds(dictIds[0]),
+            _invertedIndexReader.getDocIds(dictIds[1]));
+        break;
+      }
+      default: {
+        // this could be optimised if the bitmaps are known to be disjoint (as in a single value bitmap index)
+        MutableRoaringBitmap bitmap = new MutableRoaringBitmap();
+        for (int dictId : dictIds) {
+          bitmap.or(_invertedIndexReader.getDocIds(dictId));
+        }
+        count = bitmap.getCardinality();
+        break;
+      }
+    }
+    return _exclusive ? _numDocs - count : count;
+  }
+
+  @Override
+  public boolean canProduceBitmaps() {
+    return true;
+  }
+
+  @Override
+  public BitmapCollection getBitmaps() {
+    int[] dictIds = _exclusive ? _predicateEvaluator.getNonMatchingDictIds() : _predicateEvaluator.getMatchingDictIds();
+    ImmutableRoaringBitmap[] bitmaps = new ImmutableRoaringBitmap[dictIds.length];
+    for (int i = 0; i < dictIds.length; i++) {
+      bitmaps[i] = _invertedIndexReader.getDocIds(dictIds[i]);
+    }
+    return new BitmapCollection(_numDocs, _exclusive, bitmaps);
+  }
+
+  @Override
+  @SuppressWarnings("rawtypes")
+  public List<Operator> getChildOperators() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public String toExplainString() {
+    StringBuilder stringBuilder = new StringBuilder(EXPLAIN_NAME).append("(indexLookUp:inverted_index");
+    Predicate predicate = _predicateEvaluator.getPredicate();
+    stringBuilder.append(",operator:").append(predicate.getType());
+    stringBuilder.append(",predicate:").append(predicate.toString());
+    return stringBuilder.append(')').toString();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java
index 490851db8a7..e4f5d9f6622 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import org.apache.pinot.core.common.ExplainPlanRows;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.operator.docidsets.MatchAllDocIdSet;
@@ -63,4 +64,9 @@ public int getNumMatchingDocs() {
   public String toExplainString() {
     return new StringBuilder(EXPLAIN_NAME).append("(docs:").append(_numDocs).append(')').toString();
   }
+
+  @Override
+  public void prepareForExplainPlan(ExplainPlanRows explainPlanRows) {
+    explainPlanRows.setHasMatchAllFilter(true);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java
index 3d262d5f017..114703ec062 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java
@@ -20,9 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.core.operator.docidsets.OrDocIdSet;
 import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.buffer.BufferFastAggregation;
@@ -30,8 +30,8 @@
 
 
 public class OrFilterOperator extends BaseFilterOperator {
-
   private static final String EXPLAIN_NAME = "FILTER_OR";
+
   private final List<BaseFilterOperator> _filterOperators;
   private final int _numDocs;
 
@@ -43,14 +43,13 @@ public OrFilterOperator(List<BaseFilterOperator> filterOperators, int numDocs) {
   @Override
   protected FilterBlock getNextBlock() {
     Tracing.activeRecording().setNumChildren(_filterOperators.size());
-    List<FilterBlockDocIdSet> filterBlockDocIdSets = new ArrayList<>(_filterOperators.size());
+    List<BlockDocIdSet> blockDocIdSets = new ArrayList<>(_filterOperators.size());
     for (BaseFilterOperator filterOperator : _filterOperators) {
-      filterBlockDocIdSets.add(filterOperator.nextBlock().getBlockDocIdSet());
+      blockDocIdSets.add(filterOperator.nextBlock().getBlockDocIdSet());
     }
-    return new FilterBlock(new OrDocIdSet(filterBlockDocIdSets, _numDocs));
+    return new FilterBlock(new OrDocIdSet(blockDocIdSets, _numDocs));
   }
 
-
   @Override
   public String toExplainString() {
     return EXPLAIN_NAME;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/PrioritizedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/PrioritizedFilterOperator.java
new file mode 100644
index 00000000000..d847a34a6d3
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/PrioritizedFilterOperator.java
@@ -0,0 +1,52 @@
+/**
+ * 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.pinot.core.operator.filter;
+
+import java.util.OptionalInt;
+import org.apache.pinot.core.common.Block;
+import org.apache.pinot.core.common.Operator;
+
+
+/**
+ * Operators that implements this interface can define how to be sorted in an AND, as defined in
+ * {@link FilterOperatorUtils.Implementation#}.
+ */
+public interface PrioritizedFilterOperator<T extends Block> extends Operator<T> {
+
+  int HIGH_PRIORITY = 0;
+  int MEDIUM_PRIORITY = 100;
+  int LOW_PRIORITY = 200;
+  int AND_PRIORITY = 300;
+  int OR_PRIORITY = 400;
+  int SCAN_PRIORITY = 500;
+  int EXPRESSION_PRIORITY = 1000;
+  int UNKNOWN_FILTER_PRIORITY = 10000;
+
+  /**
+   * Priority is a number that is used to compare different filters. Some predicates, like AND, sort their sub
+   * predicates in order to first apply the ones that should be more efficient.
+   *
+   * For example, {@link SortedIndexBasedFilterOperator} is assigned to {@link #HIGH_PRIORITY},
+   * {@link BitmapBasedFilterOperator} is assigned to {@link #MEDIUM_PRIORITY} and {@link H3IndexFilterOperator} to
+   * {@link #LOW_PRIORITY}
+   *
+   * @return the priority of this filter operator or an empty optional if no special priority should be used.
+   */
+  OptionalInt getPriority();
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java
index 277fa4429fe..244718998c2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java
@@ -21,11 +21,11 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.pinot.common.request.context.predicate.Predicate;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.operator.dociditerators.ScanBasedDocIdIterator;
 import org.apache.pinot.core.operator.docidsets.BitmapDocIdSet;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.core.operator.filter.predicate.PredicateEvaluator;
 import org.apache.pinot.core.operator.filter.predicate.traits.DoubleRange;
 import org.apache.pinot.core.operator.filter.predicate.traits.DoubleValue;
@@ -95,7 +95,7 @@ private FilterBlock evaluateLegacyRangeFilter() {
     // Need to scan the first and last range as they might be partially matched
     ScanBasedFilterOperator scanBasedFilterOperator =
         new ScanBasedFilterOperator(_predicateEvaluator, _dataSource, _numDocs, false);
-    FilterBlockDocIdSet scanBasedDocIdSet = scanBasedFilterOperator.getNextBlock().getBlockDocIdSet();
+    BlockDocIdSet scanBasedDocIdSet = scanBasedFilterOperator.getNextBlock().getBlockDocIdSet();
     MutableRoaringBitmap docIds = ((ScanBasedDocIdIterator) scanBasedDocIdSet.iterator()).applyAnd(partialMatches);
     if (matches != null) {
       docIds.or(matches);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java
index 89305d24fb1..b2241cfc6f2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java
@@ -21,6 +21,7 @@
 import com.google.common.base.Preconditions;
 import java.util.Collections;
 import java.util.List;
+import org.apache.pinot.core.common.BlockDocIdIterator;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.operator.docidsets.MVScanDocIdSet;
@@ -37,9 +38,15 @@ public class ScanBasedFilterOperator extends BaseFilterOperator {
   private final DataSource _dataSource;
   private final int _numDocs;
   private final boolean _nullHandlingEnabled;
+  private final int _batchSize;
 
-  ScanBasedFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs,
+  public ScanBasedFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs,
       boolean nullHandlingEnabled) {
+    this(predicateEvaluator, dataSource, numDocs, nullHandlingEnabled, BlockDocIdIterator.OPTIMAL_ITERATOR_BATCH_SIZE);
+  }
+
+  public ScanBasedFilterOperator(PredicateEvaluator predicateEvaluator, DataSource dataSource, int numDocs,
+      boolean nullHandlingEnabled, int batchSize) {
     _predicateEvaluator = predicateEvaluator;
     _dataSource = dataSource;
     _numDocs = numDocs;
@@ -47,13 +54,15 @@ public class ScanBasedFilterOperator extends BaseFilterOperator {
     Preconditions.checkState(_dataSource.getForwardIndex() != null,
         "Forward index disabled for column: %s, scan based filtering not supported!",
         _dataSource.getDataSourceMetadata().getFieldSpec().getName());
+    _batchSize = batchSize;
   }
 
   @Override
   protected FilterBlock getNextBlock() {
     DataSourceMetadata dataSourceMetadata = _dataSource.getDataSourceMetadata();
     if (dataSourceMetadata.isSingleValue()) {
-      return new FilterBlock(new SVScanDocIdSet(_predicateEvaluator, _dataSource, _numDocs, _nullHandlingEnabled));
+      return new FilterBlock(new SVScanDocIdSet(_predicateEvaluator, _dataSource, _numDocs, _nullHandlingEnabled,
+          _batchSize));
     } else {
       return new FilterBlock(new MVScanDocIdSet(_predicateEvaluator, _dataSource, _numDocs));
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/EqualsPredicateEvaluatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/EqualsPredicateEvaluatorFactory.java
index dcc3f34f65b..14616b36be7 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/EqualsPredicateEvaluatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/EqualsPredicateEvaluatorFactory.java
@@ -21,12 +21,15 @@
 import java.math.BigDecimal;
 import java.util.Arrays;
 import org.apache.pinot.common.request.context.predicate.EqPredicate;
+import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.core.operator.filter.predicate.traits.DoubleValue;
 import org.apache.pinot.core.operator.filter.predicate.traits.FloatValue;
 import org.apache.pinot.core.operator.filter.predicate.traits.IntValue;
 import org.apache.pinot.core.operator.filter.predicate.traits.LongValue;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.data.MultiValueVisitor;
+import org.apache.pinot.spi.data.SingleValueVisitor;
 import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.apache.pinot.spi.utils.TimestampUtils;
@@ -59,7 +62,7 @@ public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(
    * @param dataType Data type for the column
    * @return Raw value based EQ predicate evaluator
    */
-  public static BaseRawValueBasedPredicateEvaluator newRawValueBasedEvaluator(EqPredicate eqPredicate,
+  public static EqRawPredicateEvaluator newRawValueBasedEvaluator(EqPredicate eqPredicate,
       DataType dataType) {
     String value = eqPredicate.getValue();
     switch (dataType) {
@@ -140,8 +143,25 @@ public int getInt() {
     }
   }
 
-  private static final class IntRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator
-      implements IntValue {
+  public static abstract class EqRawPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+    public EqRawPredicateEvaluator(Predicate predicate) {
+      super(predicate);
+    }
+
+    /**
+     * Visits the matching value of this predicate.
+     */
+    public abstract <R> R accept(SingleValueVisitor<R> visitor);
+
+    /**
+     * Visits the matching value of this predicate, which will be transformed into an array with a single value.
+     */
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return accept(visitor.asSingleValueVisitor());
+    }
+  }
+
+  private static final class IntRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator implements IntValue {
     final int _matchingValue;
 
     IntRawValueBasedEqPredicateEvaluator(EqPredicate eqPredicate, int matchingValue) {
@@ -149,6 +169,11 @@ private static final class IntRawValueBasedEqPredicateEvaluator extends BaseRawV
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitInt(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
@@ -183,7 +208,7 @@ public int getInt() {
     }
   }
 
-  private static final class LongRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator
+  private static final class LongRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator
       implements LongValue {
     final long _matchingValue;
 
@@ -192,6 +217,16 @@ private static final class LongRawValueBasedEqPredicateEvaluator extends BaseRaw
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitLong(_matchingValue);
+    }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.asSingleValueVisitor().visitLong(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
@@ -226,7 +261,7 @@ public long getLong() {
     }
   }
 
-  private static final class FloatRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator
+  private static final class FloatRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator
       implements FloatValue {
     final float _matchingValue;
 
@@ -235,6 +270,11 @@ private static final class FloatRawValueBasedEqPredicateEvaluator extends BaseRa
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitFloat(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
@@ -269,7 +309,7 @@ public float getFloat() {
     }
   }
 
-  private static final class DoubleRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator
+  private static final class DoubleRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator
       implements DoubleValue {
     final double _matchingValue;
 
@@ -278,6 +318,11 @@ private static final class DoubleRawValueBasedEqPredicateEvaluator extends BaseR
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitDouble(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
@@ -312,7 +357,7 @@ public double getDouble() {
     }
   }
 
-  private static final class BigDecimalRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BigDecimalRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator {
     final BigDecimal _matchingValue;
 
     BigDecimalRawValueBasedEqPredicateEvaluator(EqPredicate eqPredicate, BigDecimal matchingValue) {
@@ -320,6 +365,11 @@ private static final class BigDecimalRawValueBasedEqPredicateEvaluator extends B
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitBigDecimal(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
@@ -336,7 +386,7 @@ public boolean applySV(BigDecimal value) {
     }
   }
 
-  private static final class StringRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class StringRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator {
     final String _matchingValue;
 
     StringRawValueBasedEqPredicateEvaluator(EqPredicate eqPredicate, String matchingValue) {
@@ -344,6 +394,11 @@ private static final class StringRawValueBasedEqPredicateEvaluator extends BaseR
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitString(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
@@ -360,7 +415,7 @@ public boolean applySV(String value) {
     }
   }
 
-  private static final class BytesRawValueBasedEqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BytesRawValueBasedEqPredicateEvaluator extends EqRawPredicateEvaluator {
     final byte[] _matchingValue;
 
     BytesRawValueBasedEqPredicateEvaluator(EqPredicate eqPredicate, byte[] matchingValue) {
@@ -368,6 +423,11 @@ private static final class BytesRawValueBasedEqPredicateEvaluator extends BaseRa
       _matchingValue = matchingValue;
     }
 
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitBytes(_matchingValue);
+    }
+
     @Override
     public int getNumMatchingItems() {
       return 1;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactory.java
index 6559ba502ff..9ad0a78014c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactory.java
@@ -32,10 +32,14 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.predicate.InPredicate;
+import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.data.MultiValueVisitor;
 import org.apache.pinot.spi.utils.ByteArray;
 
 
@@ -49,14 +53,15 @@ private InPredicateEvaluatorFactory() {
   /**
    * Create a new instance of dictionary based IN predicate evaluator.
    *
-   * @param inPredicate IN predicate to evaluate
-   * @param dictionary Dictionary for the column
-   * @param dataType Data type for the column
+   * @param inPredicate  IN predicate to evaluate
+   * @param dictionary   Dictionary for the column
+   * @param dataType     Data type for the column
+   * @param queryContext Query context
    * @return Dictionary based IN predicate evaluator
    */
   public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(InPredicate inPredicate,
-      Dictionary dictionary, DataType dataType) {
-    return new DictionaryBasedInPredicateEvaluator(inPredicate, dictionary, dataType);
+      Dictionary dictionary, DataType dataType, @Nullable QueryContext queryContext) {
+    return new DictionaryBasedInPredicateEvaluator(inPredicate, dictionary, dataType, queryContext);
   }
 
   /**
@@ -66,7 +71,7 @@ public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(
    * @param dataType Data type for the column
    * @return Raw value based IN predicate evaluator
    */
-  public static BaseRawValueBasedPredicateEvaluator newRawValueBasedEvaluator(InPredicate inPredicate,
+  public static InRawPredicateEvaluator newRawValueBasedEvaluator(InPredicate inPredicate,
       DataType dataType) {
     switch (dataType) {
       case INT: {
@@ -155,9 +160,10 @@ private static final class DictionaryBasedInPredicateEvaluator extends BaseDicti
     final int _numMatchingDictIds;
     int[] _matchingDictIds;
 
-    DictionaryBasedInPredicateEvaluator(InPredicate inPredicate, Dictionary dictionary, DataType dataType) {
+    DictionaryBasedInPredicateEvaluator(InPredicate inPredicate, Dictionary dictionary, DataType dataType,
+        @Nullable QueryContext queryContext) {
       super(inPredicate);
-      _matchingDictIdSet = PredicateUtils.getDictIdSet(inPredicate, dictionary, dataType);
+      _matchingDictIdSet = PredicateUtils.getDictIdSet(inPredicate, dictionary, dataType, queryContext);
       _numMatchingDictIds = _matchingDictIdSet.size();
       if (_numMatchingDictIds == 0) {
         _alwaysFalse = true;
@@ -203,7 +209,18 @@ public int applySV(int limit, int[] docIds, int[] values) {
     }
   }
 
-  private static final class IntRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  public static abstract class InRawPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+    public InRawPredicateEvaluator(Predicate predicate) {
+      super(predicate);
+    }
+
+    /**
+     * Visits the matching value of this predicate.
+     */
+    public abstract <R> R accept(MultiValueVisitor<R> visitor);
+  }
+
+  private static final class IntRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     final IntSet _matchingValues;
 
     IntRawValueBasedInPredicateEvaluator(InPredicate inPredicate, IntSet matchingValues) {
@@ -238,9 +255,14 @@ public int applySV(int limit, int[] docIds, int[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitInt(_matchingValues.toIntArray());
+    }
   }
 
-  private static final class LongRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class LongRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     final LongSet _matchingValues;
 
     LongRawValueBasedInPredicateEvaluator(InPredicate inPredicate, LongSet matchingValues) {
@@ -275,9 +297,14 @@ public int applySV(int limit, int[] docIds, long[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitLong(_matchingValues.toLongArray());
+    }
   }
 
-  private static final class FloatRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class FloatRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     final FloatSet _matchingValues;
 
     FloatRawValueBasedInPredicateEvaluator(InPredicate inPredicate, FloatSet matchingValues) {
@@ -312,9 +339,14 @@ public int applySV(int limit, int[] docIds, float[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitFloat(_matchingValues.toFloatArray());
+    }
   }
 
-  private static final class DoubleRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class DoubleRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     final DoubleSet _matchingValues;
 
     DoubleRawValueBasedInPredicateEvaluator(InPredicate inPredicate, DoubleSet matchingValues) {
@@ -349,9 +381,14 @@ public int applySV(int limit, int[] docIds, double[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitDouble(_matchingValues.toDoubleArray());
+    }
   }
 
-  private static final class BigDecimalRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BigDecimalRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     // Note: BigDecimal's compareTo is not consistent with equals (e.g. compareTo(3.0, 3) returns zero when
     //   equals(3.0, 3) returns false).
     // - HashSet implementation consider both hashCode() and equals() for the key.
@@ -379,9 +416,14 @@ public DataType getDataType() {
     public boolean applySV(BigDecimal value) {
       return _matchingValues.contains(value);
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitBigDecimal(_matchingValues.toArray(new BigDecimal[0]));
+    }
   }
 
-  private static final class StringRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class StringRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     final Set<String> _matchingValues;
 
     StringRawValueBasedInPredicateEvaluator(InPredicate inPredicate, Set<String> matchingValues) {
@@ -403,9 +445,14 @@ public DataType getDataType() {
     public boolean applySV(String value) {
       return _matchingValues.contains(value);
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitString(_matchingValues.toArray(new String[0]));
+    }
   }
 
-  private static final class BytesRawValueBasedInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BytesRawValueBasedInPredicateEvaluator extends InRawPredicateEvaluator {
     final Set<ByteArray> _matchingValues;
 
     BytesRawValueBasedInPredicateEvaluator(InPredicate inPredicate, Set<ByteArray> matchingValues) {
@@ -427,5 +474,13 @@ public DataType getDataType() {
     public boolean applySV(byte[] value) {
       return _matchingValues.contains(new ByteArray(value));
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      byte[][] bytes = _matchingValues.stream()
+          .map(ByteArray::getBytes)
+          .toArray(byte[][]::new);
+      return visitor.visitBytes(bytes);
+    }
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotEqualsPredicateEvaluatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotEqualsPredicateEvaluatorFactory.java
index f091039f1df..54ce7df58cb 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotEqualsPredicateEvaluatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotEqualsPredicateEvaluatorFactory.java
@@ -21,8 +21,11 @@
 import java.math.BigDecimal;
 import java.util.Arrays;
 import org.apache.pinot.common.request.context.predicate.NotEqPredicate;
+import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.data.MultiValueVisitor;
+import org.apache.pinot.spi.data.SingleValueVisitor;
 import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.apache.pinot.spi.utils.TimestampUtils;
@@ -55,7 +58,7 @@ public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(
    * @param dataType Data type for the column
    * @return Raw value based NOT_EQ predicate evaluator
    */
-  public static BaseRawValueBasedPredicateEvaluator newRawValueBasedEvaluator(NotEqPredicate notEqPredicate,
+  public static NeqRawPredicateEvaluator newRawValueBasedEvaluator(NotEqPredicate notEqPredicate,
       DataType dataType) {
     String value = notEqPredicate.getValue();
     switch (dataType) {
@@ -155,7 +158,25 @@ public int[] getNonMatchingDictIds() {
     }
   }
 
-  private static final class IntRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  public static abstract class NeqRawPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+    public NeqRawPredicateEvaluator(Predicate predicate) {
+      super(predicate);
+    }
+
+    /**
+     * Visits the not matching value of this predicate.
+     */
+    public abstract <R> R accept(SingleValueVisitor<R> visitor);
+
+    /**
+     * Visits the not matching value of this predicate, which will be transformed into an array with a single value.
+     */
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return accept(visitor.asSingleValueVisitor());
+    }
+  }
+
+  private static final class IntRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final int _nonMatchingValue;
 
     IntRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, int nonMatchingValue) {
@@ -190,9 +211,14 @@ public int applySV(int limit, int[] docIds, int[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitInt(_nonMatchingValue);
+    }
   }
 
-  private static final class LongRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class LongRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final long _nonMatchingValue;
 
     LongRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, long nonMatchingValue) {
@@ -227,9 +253,14 @@ public int applySV(int limit, int[] docIds, long[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitLong(_nonMatchingValue);
+    }
   }
 
-  private static final class FloatRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class FloatRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final float _nonMatchingValue;
 
     FloatRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, float nonMatchingValue) {
@@ -264,9 +295,14 @@ public int applySV(int limit, int[] docIds, float[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitFloat(_nonMatchingValue);
+    }
   }
 
-  private static final class DoubleRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class DoubleRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final double _nonMatchingValue;
 
     DoubleRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, double nonMatchingValue) {
@@ -301,9 +337,14 @@ public int applySV(int limit, int[] docIds, double[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitDouble(_nonMatchingValue);
+    }
   }
 
-  private static final class BigDecimalRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BigDecimalRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final BigDecimal _nonMatchingValue;
 
     BigDecimalRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, BigDecimal nonMatchingValue) {
@@ -325,9 +366,14 @@ public DataType getDataType() {
     public boolean applySV(BigDecimal value) {
       return _nonMatchingValue.compareTo(value) != 0;
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitBigDecimal(_nonMatchingValue);
+    }
   }
 
-  private static final class StringRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class StringRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final String _nonMatchingValue;
 
     StringRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, String nonMatchingValue) {
@@ -349,9 +395,14 @@ public DataType getDataType() {
     public boolean applySV(String value) {
       return !_nonMatchingValue.equals(value);
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitString(_nonMatchingValue);
+    }
   }
 
-  private static final class BytesRawValueBasedNeqPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BytesRawValueBasedNeqPredicateEvaluator extends NeqRawPredicateEvaluator {
     final byte[] _nonMatchingValue;
 
     BytesRawValueBasedNeqPredicateEvaluator(NotEqPredicate notEqPredicate, byte[] nonMatchingValue) {
@@ -373,5 +424,10 @@ public DataType getDataType() {
     public boolean applySV(byte[] value) {
       return !Arrays.equals(_nonMatchingValue, value);
     }
+
+    @Override
+    public <R> R accept(SingleValueVisitor<R> visitor) {
+      return visitor.visitBytes(_nonMatchingValue);
+    }
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotInPredicateEvaluatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotInPredicateEvaluatorFactory.java
index b3666b932f1..5fe7b51d357 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotInPredicateEvaluatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/NotInPredicateEvaluatorFactory.java
@@ -32,10 +32,14 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.predicate.NotInPredicate;
+import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.data.MultiValueVisitor;
 import org.apache.pinot.spi.utils.ByteArray;
 
 
@@ -50,13 +54,14 @@ private NotInPredicateEvaluatorFactory() {
    * Create a new instance of dictionary based NOT_IN predicate evaluator.
    *
    * @param notInPredicate NOT_IN predicate to evaluate
-   * @param dictionary Dictionary for the column
-   * @param dataType Data type for the column
+   * @param dictionary     Dictionary for the column
+   * @param dataType       Data type for the column
+   * @param queryContext   Query context
    * @return Dictionary based NOT_IN predicate evaluator
    */
   public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(NotInPredicate notInPredicate,
-      Dictionary dictionary, DataType dataType) {
-    return new DictionaryBasedNotInPredicateEvaluator(notInPredicate, dictionary, dataType);
+      Dictionary dictionary, DataType dataType, @Nullable QueryContext queryContext) {
+    return new DictionaryBasedNotInPredicateEvaluator(notInPredicate, dictionary, dataType, queryContext);
   }
 
   /**
@@ -66,7 +71,7 @@ public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(
    * @param dataType Data type for the column
    * @return Raw value based NOT_IN predicate evaluator
    */
-  public static BaseRawValueBasedPredicateEvaluator newRawValueBasedEvaluator(NotInPredicate notInPredicate,
+  public static NotInRawPredicateEvaluator newRawValueBasedEvaluator(NotInPredicate notInPredicate,
       DataType dataType) {
     switch (dataType) {
       case INT: {
@@ -157,9 +162,10 @@ public static final class DictionaryBasedNotInPredicateEvaluator extends BaseDic
     int[] _matchingDictIds;
     int[] _nonMatchingDictIds;
 
-    DictionaryBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, Dictionary dictionary, DataType dataType) {
+    DictionaryBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, Dictionary dictionary, DataType dataType,
+        @Nullable QueryContext queryContext) {
       super(notInPredicate);
-      _nonMatchingDictIdSet = PredicateUtils.getDictIdSet(notInPredicate, dictionary, dataType);
+      _nonMatchingDictIdSet = PredicateUtils.getDictIdSet(notInPredicate, dictionary, dataType, queryContext);
       _numNonMatchingDictIds = _nonMatchingDictIdSet.size();
       if (_numNonMatchingDictIds == 0) {
         _alwaysTrue = true;
@@ -221,7 +227,18 @@ public int[] getNonMatchingDictIds() {
     }
   }
 
-  private static final class IntRawValueBasedNotInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  public static abstract class NotInRawPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+    public NotInRawPredicateEvaluator(Predicate predicate) {
+      super(predicate);
+    }
+
+    /**
+     * Visits the not matching value of this predicate.
+     */
+    public abstract <R> R accept(MultiValueVisitor<R> visitor);
+  }
+
+  private static final class IntRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     final IntSet _nonMatchingValues;
 
     IntRawValueBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, IntSet nonMatchingValues) {
@@ -256,9 +273,14 @@ public int applySV(int limit, int[] docIds, int[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitInt(_nonMatchingValues.toIntArray());
+    }
   }
 
-  private static final class LongRawValueBasedNotInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class LongRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     final LongSet _nonMatchingValues;
 
     LongRawValueBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, LongSet nonMatchingValues) {
@@ -293,9 +315,14 @@ public int applySV(int limit, int[] docIds, long[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitLong(_nonMatchingValues.toLongArray());
+    }
   }
 
-  private static final class FloatRawValueBasedNotInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class FloatRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     final FloatSet _nonMatchingValues;
 
     FloatRawValueBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, FloatSet nonMatchingValues) {
@@ -330,9 +357,14 @@ public int applySV(int limit, int[] docIds, float[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitFloat(_nonMatchingValues.toFloatArray());
+    }
   }
 
-  private static final class DoubleRawValueBasedNotInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class DoubleRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     final DoubleSet _nonMatchingValues;
 
     DoubleRawValueBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, DoubleSet nonMatchingValues) {
@@ -367,10 +399,14 @@ public int applySV(int limit, int[] docIds, double[] values) {
       }
       return matches;
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitDouble(_nonMatchingValues.toDoubleArray());
+    }
   }
 
-  private static final class BigDecimalRawValueBasedNotInPredicateEvaluator
-      extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BigDecimalRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     // See: BigDecimalRawValueBasedInPredicateEvaluator.
     final TreeSet<BigDecimal> _nonMatchingValues;
 
@@ -394,9 +430,14 @@ public DataType getDataType() {
     public boolean applySV(BigDecimal value) {
       return !_nonMatchingValues.contains(value);
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitBigDecimal(_nonMatchingValues.toArray(new BigDecimal[0]));
+    }
   }
 
-  private static final class StringRawValueBasedNotInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class StringRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     final Set<String> _nonMatchingValues;
 
     StringRawValueBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, Set<String> nonMatchingValues) {
@@ -418,9 +459,14 @@ public DataType getDataType() {
     public boolean applySV(String value) {
       return !_nonMatchingValues.contains(value);
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      return visitor.visitString(_nonMatchingValues.toArray(new String[0]));
+    }
   }
 
-  private static final class BytesRawValueBasedNotInPredicateEvaluator extends BaseRawValueBasedPredicateEvaluator {
+  private static final class BytesRawValueBasedNotInPredicateEvaluator extends NotInRawPredicateEvaluator {
     final Set<ByteArray> _nonMatchingValues;
 
     BytesRawValueBasedNotInPredicateEvaluator(NotInPredicate notInPredicate, Set<ByteArray> nonMatchingValues) {
@@ -442,5 +488,13 @@ public DataType getDataType() {
     public boolean applySV(byte[] value) {
       return !_nonMatchingValues.contains(new ByteArray(value));
     }
+
+    @Override
+    public <R> R accept(MultiValueVisitor<R> visitor) {
+      byte[][] bytes = _nonMatchingValues.stream()
+          .map(ByteArray::getBytes)
+          .toArray(byte[][]::new);
+      return visitor.visitBytes(bytes);
+    }
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateEvaluatorProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateEvaluatorProvider.java
index 0a3bc7f952f..519168818b8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateEvaluatorProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateEvaluatorProvider.java
@@ -26,6 +26,8 @@
 import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.common.request.context.predicate.RangePredicate;
 import org.apache.pinot.common.request.context.predicate.RegexpLikePredicate;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
@@ -37,6 +39,11 @@ private PredicateEvaluatorProvider() {
 
   public static PredicateEvaluator getPredicateEvaluator(Predicate predicate, @Nullable Dictionary dictionary,
       DataType dataType) {
+    return getPredicateEvaluator(predicate, dictionary, dataType, null);
+  }
+
+  public static PredicateEvaluator getPredicateEvaluator(Predicate predicate, @Nullable Dictionary dictionary,
+      DataType dataType, @Nullable QueryContext queryContext) {
     try {
       if (dictionary != null) {
         // dictionary based predicate evaluators
@@ -48,11 +55,11 @@ public static PredicateEvaluator getPredicateEvaluator(Predicate predicate, @Nul
             return NotEqualsPredicateEvaluatorFactory
                 .newDictionaryBasedEvaluator((NotEqPredicate) predicate, dictionary, dataType);
           case IN:
-            return InPredicateEvaluatorFactory
-                .newDictionaryBasedEvaluator((InPredicate) predicate, dictionary, dataType);
+            return InPredicateEvaluatorFactory.newDictionaryBasedEvaluator((InPredicate) predicate, dictionary,
+                dataType, queryContext);
           case NOT_IN:
-            return NotInPredicateEvaluatorFactory
-                .newDictionaryBasedEvaluator((NotInPredicate) predicate, dictionary, dataType);
+            return NotInPredicateEvaluatorFactory.newDictionaryBasedEvaluator((NotInPredicate) predicate, dictionary,
+                dataType, queryContext);
           case RANGE:
             return RangePredicateEvaluatorFactory
                 .newDictionaryBasedEvaluator((RangePredicate) predicate, dictionary, dataType);
@@ -87,4 +94,10 @@ public static PredicateEvaluator getPredicateEvaluator(Predicate predicate, @Nul
       throw new BadQueryRequestException(e);
     }
   }
+
+  public static PredicateEvaluator getPredicateEvaluator(Predicate predicate, DataSource dataSource,
+      QueryContext queryContext) {
+    return getPredicateEvaluator(predicate, dataSource.getDictionary(),
+        dataSource.getDataSourceMetadata().getDataType(), queryContext);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateUtils.java
index a487d36654f..52dffb5f042 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/PredicateUtils.java
@@ -18,16 +18,21 @@
  */
 package org.apache.pinot.core.operator.filter.predicate;
 
+import com.google.common.base.Equivalence;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.predicate.BaseInPredicate;
 import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.ByteArray;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.TimestampUtils;
 
 
@@ -70,7 +75,8 @@ public static String getStoredTimestampValue(String timestampValue) {
   /**
    * Returns a dictionary id set of the values in the given IN/NOT_IN predicate.
    */
-  public static IntSet getDictIdSet(BaseInPredicate inPredicate, Dictionary dictionary, DataType dataType) {
+  public static IntSet getDictIdSet(BaseInPredicate inPredicate, Dictionary dictionary, DataType dataType,
+      @Nullable QueryContext queryContext) {
     List<String> values = inPredicate.getValues();
     int hashSetSize = Integer.min(HashUtil.getMinHashSetSize(values.size()), MAX_INITIAL_DICT_ID_SET_SIZE);
     IntSet dictIdSet = new IntOpenHashSet(hashSetSize);
@@ -139,11 +145,23 @@ public static IntSet getDictIdSet(BaseInPredicate inPredicate, Dictionary dictio
         }
         break;
       case STRING:
-        for (String value : values) {
-          int dictId = dictionary.indexOf(value);
-          if (dictId >= 0) {
-            dictIdSet.add(dictId);
+        if (queryContext == null || values.size() <= Integer.parseInt(queryContext.getQueryOptions()
+            .getOrDefault(CommonConstants.Broker.Request.QueryOptionKey.IN_PREDICATE_SORT_THRESHOLD,
+                CommonConstants.Broker.Request.QueryOptionValue.DEFAULT_IN_PREDICATE_SORT_THRESHOLD))) {
+          for (String value : values) {
+            int dictId = dictionary.indexOf(value);
+            if (dictId >= 0) {
+              dictIdSet.add(dictId);
+            }
           }
+        } else {
+          List<String> sortedValues =
+              queryContext.getOrComputeSharedValue(List.class, Equivalence.identity().wrap(inPredicate), k -> {
+                List<String> copyValues = new ArrayList<>(values);
+                copyValues.sort(null);
+                return copyValues;
+              });
+          dictionary.getDictIds(sortedValues, dictIdSet);
         }
         break;
       case BYTES:
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RangePredicateEvaluatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RangePredicateEvaluatorFactory.java
index 346b8440e1e..ca8e1f126a2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RangePredicateEvaluatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RangePredicateEvaluatorFactory.java
@@ -288,12 +288,14 @@ public boolean applySV(int dictId) {
             return _rawValueBasedEvaluator.applySV(_dictionary.getFloatValue(dictId));
           case DOUBLE:
             return _rawValueBasedEvaluator.applySV(_dictionary.getDoubleValue(dictId));
+          case BIG_DECIMAL:
+            return _rawValueBasedEvaluator.applySV(_dictionary.getBigDecimalValue(dictId));
           case STRING:
             return _rawValueBasedEvaluator.applySV(_dictionary.getStringValue(dictId));
           case BYTES:
             return _rawValueBasedEvaluator.applySV(_dictionary.getBytesValue(dictId));
           default:
-            throw new IllegalStateException();
+            throw new IllegalStateException("Unsupported value type: " + _dictionary.getValueType());
         }
       }
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RegexpLikePredicateEvaluatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RegexpLikePredicateEvaluatorFactory.java
index a3af9de1949..82477c35600 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RegexpLikePredicateEvaluatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/RegexpLikePredicateEvaluatorFactory.java
@@ -44,7 +44,8 @@ private RegexpLikePredicateEvaluatorFactory() {
    */
   public static BaseDictionaryBasedPredicateEvaluator newDictionaryBasedEvaluator(
       RegexpLikePredicate regexpLikePredicate, Dictionary dictionary, DataType dataType) {
-    Preconditions.checkArgument(dataType == DataType.STRING, "Unsupported data type: " + dataType);
+    boolean condition = (dataType == DataType.STRING || dataType == DataType.JSON);
+    Preconditions.checkArgument(condition, "Unsupported data type: " + dataType);
     return new DictionaryBasedRegexpLikePredicateEvaluator(regexpLikePredicate, dictionary);
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java
index 97d81b61cfa..01d743b2699 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java
@@ -20,12 +20,11 @@
 
 import java.util.Collections;
 import java.util.List;
-import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.aggregation.AggregationExecutor;
 import org.apache.pinot.core.query.aggregation.DefaultAggregationExecutor;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
@@ -40,16 +39,16 @@ public class AggregationOperator extends BaseOperator<AggregationResultsBlock> {
   private static final String EXPLAIN_NAME = "AGGREGATE";
 
   private final AggregationFunction[] _aggregationFunctions;
-  private final TransformOperator _transformOperator;
+  private final BaseProjectOperator<?> _projectOperator;
   private final long _numTotalDocs;
   private final boolean _useStarTree;
 
   private int _numDocsScanned = 0;
 
-  public AggregationOperator(AggregationFunction[] aggregationFunctions, TransformOperator transformOperator,
+  public AggregationOperator(AggregationFunction[] aggregationFunctions, BaseProjectOperator<?> projectOperator,
       long numTotalDocs, boolean useStarTree) {
     _aggregationFunctions = aggregationFunctions;
-    _transformOperator = transformOperator;
+    _projectOperator = projectOperator;
     _numTotalDocs = numTotalDocs;
     _useStarTree = useStarTree;
   }
@@ -63,10 +62,10 @@ protected AggregationResultsBlock getNextBlock() {
     } else {
       aggregationExecutor = new DefaultAggregationExecutor(_aggregationFunctions);
     }
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
-      _numDocsScanned += transformBlock.getNumDocs();
-      aggregationExecutor.aggregate(transformBlock);
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
+      _numDocsScanned += valueBlock.getNumDocs();
+      aggregationExecutor.aggregate(valueBlock);
     }
 
     // Build intermediate result block based on aggregation result from the executor
@@ -74,14 +73,14 @@ protected AggregationResultsBlock getNextBlock() {
   }
 
   @Override
-  public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+  public List<BaseProjectOperator<?>> getChildOperators() {
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-    long numEntriesScannedPostFilter = (long) _numDocsScanned * _transformOperator.getNumColumnsProjected();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedPostFilter = (long) _numDocsScanned * _projectOperator.getNumColumnsProjected();
     return new ExecutionStatistics(_numDocsScanned, numEntriesScannedInFilter, numEntriesScannedPostFilter,
         _numTotalDocs);
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java
index e8f1e015ca0..2ab339cb21c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Operator;
@@ -29,11 +28,12 @@
 import org.apache.pinot.core.operator.BaseOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
 import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.distinct.DistinctTable;
-import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
-import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.trace.Tracing;
 
 
 /**
@@ -42,96 +42,77 @@
 public class DictionaryBasedDistinctOperator extends BaseOperator<DistinctResultsBlock> {
   private static final String EXPLAIN_NAME = "DISTINCT_DICTIONARY";
 
-  private final DistinctAggregationFunction _distinctAggregationFunction;
-  private final Dictionary _dictionary;
-  private final int _numTotalDocs;
-  private final boolean _nullHandlingEnabled;
-  private final FieldSpec.DataType _dataType;
+  private final DataSource _dataSource;
+  private final QueryContext _queryContext;
 
-  private boolean _hasOrderBy;
-  private boolean _isAscending;
   private int _numDocsScanned;
 
-  public DictionaryBasedDistinctOperator(FieldSpec.DataType dataType,
-      DistinctAggregationFunction distinctAggregationFunction, Dictionary dictionary, int numTotalDocs,
-      boolean nullHandlingEnabled) {
-    _dataType = dataType;
-    _distinctAggregationFunction = distinctAggregationFunction;
-    _dictionary = dictionary;
-    _numTotalDocs = numTotalDocs;
-    _nullHandlingEnabled = nullHandlingEnabled;
-
-    List<OrderByExpressionContext> orderByExpressionContexts = _distinctAggregationFunction.getOrderByExpressions();
-    if (orderByExpressionContexts != null) {
-      OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
-      _isAscending = orderByExpressionContext.isAsc();
-      _hasOrderBy = true;
-    }
+  public DictionaryBasedDistinctOperator(DataSource dataSource, QueryContext queryContext) {
+    _dataSource = dataSource;
+    _queryContext = queryContext;
   }
 
   @Override
   protected DistinctResultsBlock getNextBlock() {
-    return new DistinctResultsBlock(_distinctAggregationFunction, buildResult());
-  }
-
-  /**
-   * Build the final result for this operation
-   */
-  private DistinctTable buildResult() {
-
-    assert _distinctAggregationFunction.getType() == AggregationFunctionType.DISTINCT;
-
-    List<ExpressionContext> expressions = _distinctAggregationFunction.getInputExpressions();
-    ExpressionContext expression = expressions.get(0);
-    DataSchema dataSchema = new DataSchema(new String[]{expression.toString()},
-        new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.fromDataTypeSV(_dataType)});
-    int dictLength = _dictionary.length();
-    List<Record> records;
-
-    int limit = _distinctAggregationFunction.getLimit();
-    int actualLimit = Math.min(limit, dictLength);
+    String column = _queryContext.getSelectExpressions().get(0).getIdentifier();
+    Dictionary dictionary = _dataSource.getDictionary();
+    assert dictionary != null;
+    DataSourceMetadata dataSourceMetadata = _dataSource.getDataSourceMetadata();
+    DataSchema dataSchema = new DataSchema(new String[]{column},
+        new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.fromDataTypeSV(dataSourceMetadata.getDataType())});
+    int limit = _queryContext.getLimit();
+    int dictLength = dictionary.length();
+    int numValuesToKeep = Math.min(limit, dictLength);
+    boolean nullHandlingEnabled = _queryContext.isNullHandlingEnabled();
 
     // If ORDER BY is not present, we read the first limit values from the dictionary and return.
     // If ORDER BY is present and the dictionary is sorted, then we read the first/last limit values
     // from the dictionary. If not sorted, then we read the entire dictionary and return it.
-    if (!_hasOrderBy) {
-      records = new ArrayList<>(actualLimit);
-
-      _numDocsScanned = actualLimit;
-
-      for (int i = 0; i < actualLimit; i++) {
-        records.add(new Record(new Object[]{_dictionary.getInternal(i)}));
-      }
+    DistinctTable distinctTable;
+    List<OrderByExpressionContext> orderByExpressions = _queryContext.getOrderByExpressions();
+    if (orderByExpressions == null) {
+      distinctTable =
+          new DistinctTable(dataSchema, iterateOnDictionary(dictionary, numValuesToKeep), nullHandlingEnabled);
+      _numDocsScanned = numValuesToKeep;
     } else {
-      if (_dictionary.isSorted()) {
-        records = new ArrayList<>(actualLimit);
-        if (_isAscending) {
-          _numDocsScanned = actualLimit;
-          for (int i = 0; i < actualLimit; i++) {
-            records.add(new Record(new Object[]{_dictionary.getInternal(i)}));
-          }
+      if (dictionary.isSorted()) {
+        if (orderByExpressions.get(0).isAsc()) {
+          distinctTable =
+              new DistinctTable(dataSchema, iterateOnDictionary(dictionary, numValuesToKeep), nullHandlingEnabled);
         } else {
-          _numDocsScanned = actualLimit;
-          for (int i = dictLength - 1; i >= (dictLength - actualLimit); i--) {
-            records.add(new Record(new Object[]{_dictionary.getInternal(i)}));
-          }
+          distinctTable =
+              new DistinctTable(dataSchema, iterateOnDictionaryDesc(dictionary, numValuesToKeep), nullHandlingEnabled);
         }
+        _numDocsScanned = numValuesToKeep;
       } else {
-        // DictionaryBasedDistinctOperator cannot handle nulls.
-        DistinctTable distinctTable =
-            new DistinctTable(dataSchema, _distinctAggregationFunction.getOrderByExpressions(), limit,
-                _nullHandlingEnabled);
-
-        _numDocsScanned = dictLength;
+        distinctTable = new DistinctTable(dataSchema, orderByExpressions, limit, nullHandlingEnabled);
         for (int i = 0; i < dictLength; i++) {
-          distinctTable.addWithOrderBy(new Record(new Object[]{_dictionary.getInternal(i)}));
+          distinctTable.addWithOrderBy(new Record(new Object[]{dictionary.getInternal(i)}));
         }
-
-        return distinctTable;
+        _numDocsScanned = dictLength;
       }
     }
 
-    return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
+    return new DistinctResultsBlock(distinctTable);
+  }
+
+  private static List<Record> iterateOnDictionary(Dictionary dictionary, int length) {
+    List<Record> records = new ArrayList<>(length);
+    for (int i = 0; i < length; i++) {
+      Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(i);
+      records.add(new Record(new Object[]{dictionary.getInternal(i)}));
+    }
+    return records;
+  }
+
+  private static List<Record> iterateOnDictionaryDesc(Dictionary dictionary, int length) {
+    List<Record> records = new ArrayList<>(length);
+    int dictLength = dictionary.length();
+    for (int i = dictLength - 1, j = 0; i >= (dictLength - length); i--, j++) {
+      Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(j);
+      records.add(new Record(new Object[]{dictionary.getInternal(i)}));
+    }
+    return records;
   }
 
   @Override
@@ -147,6 +128,7 @@ public List<Operator> getChildOperators() {
   @Override
   public ExecutionStatistics getExecutionStatistics() {
     // NOTE: Set numDocsScanned to numTotalDocs for backward compatibility.
-    return new ExecutionStatistics(_numDocsScanned, 0, _numDocsScanned, _numTotalDocs);
+    return new ExecutionStatistics(_numDocsScanned, 0, _numDocsScanned,
+        _dataSource.getDataSourceMetadata().getNumDocs());
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java
index 9ba1a65e86b..3d95a0c5473 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java
@@ -20,13 +20,12 @@
 
 import java.util.Collections;
 import java.util.List;
-import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctExecutorFactory;
 import org.apache.pinot.core.query.request.context.QueryContext;
@@ -40,36 +39,34 @@ public class DistinctOperator extends BaseOperator<DistinctResultsBlock> {
   private static final String EXPLAIN_NAME = "DISTINCT";
 
   private final IndexSegment _indexSegment;
-  private final DistinctAggregationFunction _distinctAggregationFunction;
-  private final TransformOperator _transformOperator;
-  private final DistinctExecutor _distinctExecutor;
+  private final BaseProjectOperator<?> _projectOperator;
+  private final QueryContext _queryContext;
 
   private int _numDocsScanned = 0;
 
-  public DistinctOperator(IndexSegment indexSegment, DistinctAggregationFunction distinctAggregationFunction,
-      TransformOperator transformOperator, QueryContext queryContext) {
+  public DistinctOperator(IndexSegment indexSegment, BaseProjectOperator<?> projectOperator,
+      QueryContext queryContext) {
     _indexSegment = indexSegment;
-    _distinctAggregationFunction = distinctAggregationFunction;
-    _transformOperator = transformOperator;
-    _distinctExecutor = DistinctExecutorFactory.getDistinctExecutor(distinctAggregationFunction, transformOperator,
-        queryContext.isNullHandlingEnabled());
+    _projectOperator = projectOperator;
+    _queryContext = queryContext;
   }
 
   @Override
   protected DistinctResultsBlock getNextBlock() {
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
-      _numDocsScanned += transformBlock.getNumDocs();
-      if (_distinctExecutor.process(transformBlock)) {
+    DistinctExecutor executor = DistinctExecutorFactory.getDistinctExecutor(_projectOperator, _queryContext);
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
+      _numDocsScanned += valueBlock.getNumDocs();
+      if (executor.process(valueBlock)) {
         break;
       }
     }
-    return new DistinctResultsBlock(_distinctAggregationFunction, _distinctExecutor.getResult());
+    return new DistinctResultsBlock(executor.getResult());
   }
 
   @Override
-  public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+  public List<BaseProjectOperator<?>> getChildOperators() {
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
@@ -79,8 +76,8 @@ public IndexSegment getIndexSegment() {
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-    long numEntriesScannedPostFilter = (long) _numDocsScanned * _transformOperator.getNumColumnsProjected();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedPostFilter = (long) _numDocsScanned * _projectOperator.getNumColumnsProjected();
     int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
     return new ExecutionStatistics(_numDocsScanned, numEntriesScannedInFilter, numEntriesScannedPostFilter,
         numTotalDocs);
@@ -88,13 +85,12 @@ public ExecutionStatistics getExecutionStatistics() {
 
   @Override
   public String toExplainString() {
-    String[] keys = _distinctAggregationFunction.getColumns();
+    List<ExpressionContext> expressions = _queryContext.getSelectExpressions();
+    int numExpressions = expressions.size();
     StringBuilder stringBuilder = new StringBuilder(EXPLAIN_NAME).append("(keyColumns:");
-    if (keys.length > 0) {
-      stringBuilder.append(keys[0]);
-      for (int i = 1; i < keys.length; i++) {
-        stringBuilder.append(", ").append(keys[i]);
-      }
+    stringBuilder.append(expressions.get(0).toString());
+    for (int i = 1; i < numExpressions; i++) {
+      stringBuilder.append(", ").append(expressions.get(i).toString());
     }
     return stringBuilder.append(')').toString();
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java
index f2bb79b384c..fa11d3dc39c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java
@@ -22,12 +22,11 @@
 import java.util.List;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.ExecutionStatistics;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.segment.spi.IndexSegment;
 
 
@@ -37,25 +36,25 @@
  * <p>NOTE: this operator short circuit underlying operators and directly returns the data schema without any rows.
  */
 public class EmptySelectionOperator extends BaseOperator<SelectionResultsBlock> {
-
   private static final String EXPLAIN_NAME = "SELECT_EMPTY";
 
+  private final BaseProjectOperator<?> _projectOperator;
   private final DataSchema _dataSchema;
   private final ExecutionStatistics _executionStatistics;
-  private final TransformOperator _transformOperator;
 
   public EmptySelectionOperator(IndexSegment indexSegment, List<ExpressionContext> expressions,
-      TransformOperator transformOperator) {
+      BaseProjectOperator<?> projectOperator) {
+    _projectOperator = projectOperator;
+
     int numExpressions = expressions.size();
     String[] columnNames = new String[numExpressions];
-    _transformOperator = transformOperator;
     DataSchema.ColumnDataType[] columnDataTypes = new DataSchema.ColumnDataType[numExpressions];
     for (int i = 0; i < numExpressions; i++) {
       ExpressionContext expression = expressions.get(i);
-      TransformResultMetadata expressionMetadata = _transformOperator.getResultMetadata(expression);
       columnNames[i] = expression.toString();
+      ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
       columnDataTypes[i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+          DataSchema.ColumnDataType.fromDataType(columnContext.getDataType(), columnContext.isSingleValue());
     }
     _dataSchema = new DataSchema(columnNames, columnDataTypes);
 
@@ -73,8 +72,8 @@ public String toExplainString() {
   }
 
   @Override
-  public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+  public List<BaseProjectOperator<?>> getChildOperators() {
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java
index f478f36d921..1237013fb15 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java
@@ -25,10 +25,10 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.aggregation.AggregationExecutor;
 import org.apache.pinot.core.query.aggregation.DefaultAggregationExecutor;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
@@ -45,19 +45,17 @@ public class FilteredAggregationOperator extends BaseOperator<AggregationResults
   private static final String EXPLAIN_NAME = "AGGREGATE_FILTERED";
 
   private final AggregationFunction[] _aggregationFunctions;
-  private final List<Pair<AggregationFunction[], TransformOperator>> _aggFunctionsWithTransformOperator;
+  private final List<Pair<AggregationFunction[], BaseProjectOperator<?>>> _projectOperators;
   private final long _numTotalDocs;
 
   private long _numDocsScanned;
   private long _numEntriesScannedInFilter;
   private long _numEntriesScannedPostFilter;
 
-  // We can potentially do away with aggregationFunctions parameter, but its cleaner to pass it in than to construct
-  // it from aggFunctionsWithTransformOperator
   public FilteredAggregationOperator(AggregationFunction[] aggregationFunctions,
-      List<Pair<AggregationFunction[], TransformOperator>> aggFunctionsWithTransformOperator, long numTotalDocs) {
+      List<Pair<AggregationFunction[], BaseProjectOperator<?>>> projectOperators, long numTotalDocs) {
     _aggregationFunctions = aggregationFunctions;
-    _aggFunctionsWithTransformOperator = aggFunctionsWithTransformOperator;
+    _projectOperators = projectOperators;
     _numTotalDocs = numTotalDocs;
   }
 
@@ -70,15 +68,15 @@ protected AggregationResultsBlock getNextBlock() {
       resultIndexMap.put(_aggregationFunctions[i], i);
     }
 
-    for (Pair<AggregationFunction[], TransformOperator> filteredAggregation : _aggFunctionsWithTransformOperator) {
-      AggregationFunction[] aggregationFunctions = filteredAggregation.getLeft();
+    for (Pair<AggregationFunction[], BaseProjectOperator<?>> pair : _projectOperators) {
+      AggregationFunction[] aggregationFunctions = pair.getLeft();
       AggregationExecutor aggregationExecutor = new DefaultAggregationExecutor(aggregationFunctions);
-      TransformOperator transformOperator = filteredAggregation.getRight();
-      TransformBlock transformBlock;
+      BaseProjectOperator<?> projectOperator = pair.getRight();
+      ValueBlock valueBlock;
       int numDocsScanned = 0;
-      while ((transformBlock = transformOperator.nextBlock()) != null) {
-        aggregationExecutor.aggregate(transformBlock);
-        numDocsScanned += transformBlock.getNumDocs();
+      while ((valueBlock = projectOperator.nextBlock()) != null) {
+        aggregationExecutor.aggregate(valueBlock);
+        numDocsScanned += valueBlock.getNumDocs();
       }
       List<Object> filteredResult = aggregationExecutor.getResult();
 
@@ -86,15 +84,15 @@ protected AggregationResultsBlock getNextBlock() {
         result[resultIndexMap.get(aggregationFunctions[i])] = filteredResult.get(i);
       }
       _numDocsScanned += numDocsScanned;
-      _numEntriesScannedInFilter += transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-      _numEntriesScannedPostFilter += (long) numDocsScanned * transformOperator.getNumColumnsProjected();
+      _numEntriesScannedInFilter += projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+      _numEntriesScannedPostFilter += (long) numDocsScanned * projectOperator.getNumColumnsProjected();
     }
     return new AggregationResultsBlock(_aggregationFunctions, Arrays.asList(result));
   }
 
   @Override
   public List<Operator> getChildOperators() {
-    return _aggFunctionsWithTransformOperator.stream().map(Pair::getRight).collect(Collectors.toList());
+    return _projectOperators.stream().map(Pair::getRight).collect(Collectors.toList());
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredGroupByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredGroupByOperator.java
index 872a999f546..9be251ae23e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredGroupByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredGroupByOperator.java
@@ -30,10 +30,10 @@
 import org.apache.pinot.core.data.table.IntermediateRecord;
 import org.apache.pinot.core.data.table.TableResizer;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.aggregation.groupby.AggregationGroupByResult;
@@ -53,48 +53,48 @@
 public class FilteredGroupByOperator extends BaseOperator<GroupByResultsBlock> {
   private static final String EXPLAIN_NAME = "GROUP_BY_FILTERED";
 
+  private final QueryContext _queryContext;
   private final AggregationFunction[] _aggregationFunctions;
-  private final List<Pair<AggregationFunction[], TransformOperator>> _aggFunctionsWithTransformOperator;
   private final ExpressionContext[] _groupByExpressions;
+  private final List<Pair<AggregationFunction[], BaseProjectOperator<?>>> _projectOperators;
   private final long _numTotalDocs;
+  private final DataSchema _dataSchema;
+
   private long _numDocsScanned;
   private long _numEntriesScannedInFilter;
   private long _numEntriesScannedPostFilter;
-  private final DataSchema _dataSchema;
-  private final QueryContext _queryContext;
 
-  public FilteredGroupByOperator(AggregationFunction[] aggregationFunctions,
-      List<Pair<AggregationFunction, FilterContext>> filteredAggregationFunctions,
-      List<Pair<AggregationFunction[], TransformOperator>> aggFunctionsWithTransformOperator,
-      ExpressionContext[] groupByExpressions, long numTotalDocs, QueryContext queryContext) {
-    _aggregationFunctions = aggregationFunctions;
-    _aggFunctionsWithTransformOperator = aggFunctionsWithTransformOperator;
-    _groupByExpressions = groupByExpressions;
-    _numTotalDocs = numTotalDocs;
+  public FilteredGroupByOperator(QueryContext queryContext,
+      List<Pair<AggregationFunction[], BaseProjectOperator<?>>> projectOperators, long numTotalDocs) {
+    assert queryContext.getAggregationFunctions() != null && queryContext.getFilteredAggregationFunctions() != null
+        && queryContext.getGroupByExpressions() != null;
     _queryContext = queryContext;
+    _aggregationFunctions = queryContext.getAggregationFunctions();
+    _groupByExpressions = queryContext.getGroupByExpressions().toArray(new ExpressionContext[0]);
+    _projectOperators = projectOperators;
+    _numTotalDocs = numTotalDocs;
 
     // NOTE: The indexedTable expects that the data schema will have group by columns before aggregation columns
-    int numGroupByExpressions = groupByExpressions.length;
-    int numAggregationFunctions = aggregationFunctions.length;
+    int numGroupByExpressions = _groupByExpressions.length;
+    int numAggregationFunctions = _aggregationFunctions.length;
     int numColumns = numGroupByExpressions + numAggregationFunctions;
     String[] columnNames = new String[numColumns];
     DataSchema.ColumnDataType[] columnDataTypes = new DataSchema.ColumnDataType[numColumns];
 
     // Extract column names and data types for group-by columns
     for (int i = 0; i < numGroupByExpressions; i++) {
-      ExpressionContext groupByExpression = groupByExpressions[i];
+      ExpressionContext groupByExpression = _groupByExpressions[i];
       columnNames[i] = groupByExpression.toString();
       columnDataTypes[i] = DataSchema.ColumnDataType.fromDataTypeSV(
-          aggFunctionsWithTransformOperator.get(i).getRight().getResultMetadata(groupByExpression).getDataType());
+          projectOperators.get(i).getRight().getResultColumnContext(groupByExpression).getDataType());
     }
 
     // Extract column names and data types for aggregation functions
     for (int i = 0; i < numAggregationFunctions; i++) {
       int index = numGroupByExpressions + i;
-      Pair<AggregationFunction, FilterContext> filteredAggPair = filteredAggregationFunctions.get(i);
-      AggregationFunction aggregationFunction = filteredAggPair.getLeft();
-      String columnName =
-          AggregationFunctionUtils.getResultColumnName(aggregationFunction, filteredAggPair.getRight());
+      Pair<AggregationFunction, FilterContext> pair = queryContext.getFilteredAggregationFunctions().get(i);
+      AggregationFunction aggregationFunction = pair.getLeft();
+      String columnName = AggregationFunctionUtils.getResultColumnName(aggregationFunction, pair.getRight());
       columnNames[index] = columnName;
       columnDataTypes[index] = aggregationFunction.getIntermediateResultColumnType();
     }
@@ -115,9 +115,9 @@ protected GroupByResultsBlock getNextBlock() {
     }
 
     GroupKeyGenerator groupKeyGenerator = null;
-    for (Pair<AggregationFunction[], TransformOperator> filteredAggregation : _aggFunctionsWithTransformOperator) {
-      TransformOperator transformOperator = filteredAggregation.getRight();
-      AggregationFunction[] filteredAggFunctions = filteredAggregation.getLeft();
+    for (Pair<AggregationFunction[], BaseProjectOperator<?>> pair : _projectOperators) {
+      AggregationFunction[] aggregationFunctions = pair.getLeft();
+      BaseProjectOperator<?> projectOperator = pair.getRight();
 
       // Perform aggregation group-by on all the blocks
       DefaultGroupByExecutor groupByExecutor;
@@ -130,27 +130,27 @@ protected GroupByResultsBlock getNextBlock() {
         // GroupByExecutor with a pre-existing GroupKeyGenerator so that the GroupKeyGenerator can be shared across
         // loop iterations i.e. across all aggs.
         groupByExecutor =
-            new DefaultGroupByExecutor(_queryContext, filteredAggFunctions, _groupByExpressions, transformOperator);
+            new DefaultGroupByExecutor(_queryContext, aggregationFunctions, _groupByExpressions, projectOperator);
         groupKeyGenerator = groupByExecutor.getGroupKeyGenerator();
       } else {
         groupByExecutor =
-            new DefaultGroupByExecutor(_queryContext, filteredAggFunctions, _groupByExpressions, transformOperator,
+            new DefaultGroupByExecutor(_queryContext, aggregationFunctions, _groupByExpressions, projectOperator,
                 groupKeyGenerator);
       }
 
       int numDocsScanned = 0;
-      TransformBlock transformBlock;
-      while ((transformBlock = transformOperator.nextBlock()) != null) {
-        numDocsScanned += transformBlock.getNumDocs();
-        groupByExecutor.process(transformBlock);
+      ValueBlock valueBlock;
+      while ((valueBlock = projectOperator.nextBlock()) != null) {
+        numDocsScanned += valueBlock.getNumDocs();
+        groupByExecutor.process(valueBlock);
       }
 
       _numDocsScanned += numDocsScanned;
-      _numEntriesScannedInFilter += transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-      _numEntriesScannedPostFilter += (long) numDocsScanned * transformOperator.getNumColumnsProjected();
+      _numEntriesScannedInFilter += projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+      _numEntriesScannedPostFilter += (long) numDocsScanned * projectOperator.getNumColumnsProjected();
       GroupByResultHolder[] filterGroupByResults = groupByExecutor.getGroupByResultHolders();
-      for (int i = 0; i < filteredAggFunctions.length; i++) {
-        groupByResultHolders[resultHolderIndexMap.get(filteredAggFunctions[i])] = filterGroupByResults[i];
+      for (int i = 0; i < aggregationFunctions.length; i++) {
+        groupByResultHolders[resultHolderIndexMap.get(aggregationFunctions[i])] = filterGroupByResults[i];
       }
     }
     assert groupKeyGenerator != null;
@@ -190,7 +190,7 @@ protected GroupByResultsBlock getNextBlock() {
 
   @Override
   public List<Operator> getChildOperators() {
-    return _aggFunctionsWithTransformOperator.stream().map(Pair::getRight).collect(Collectors.toList());
+    return _projectOperators.stream().map(Pair::getRight).collect(Collectors.toList());
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/GroupByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/GroupByOperator.java
index 463cc60d441..3465f653e9f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/GroupByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/GroupByOperator.java
@@ -27,10 +27,10 @@
 import org.apache.pinot.core.data.table.IntermediateRecord;
 import org.apache.pinot.core.data.table.TableResizer;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.groupby.DefaultGroupByExecutor;
 import org.apache.pinot.core.query.aggregation.groupby.GroupByExecutor;
@@ -49,7 +49,7 @@ public class GroupByOperator extends BaseOperator<GroupByResultsBlock> {
 
   private final AggregationFunction[] _aggregationFunctions;
   private final ExpressionContext[] _groupByExpressions;
-  private final TransformOperator _transformOperator;
+  private final BaseProjectOperator<?> _projectOperator;
   private final long _numTotalDocs;
   private final boolean _useStarTree;
   private final DataSchema _dataSchema;
@@ -58,10 +58,10 @@ public class GroupByOperator extends BaseOperator<GroupByResultsBlock> {
   private int _numDocsScanned = 0;
 
   public GroupByOperator(AggregationFunction[] aggregationFunctions, ExpressionContext[] groupByExpressions,
-      TransformOperator transformOperator, long numTotalDocs, QueryContext queryContext, boolean useStarTree) {
+      BaseProjectOperator<?> projectOperator, long numTotalDocs, QueryContext queryContext, boolean useStarTree) {
     _aggregationFunctions = aggregationFunctions;
     _groupByExpressions = groupByExpressions;
-    _transformOperator = transformOperator;
+    _projectOperator = projectOperator;
     _numTotalDocs = numTotalDocs;
     _useStarTree = useStarTree;
     _queryContext = queryContext;
@@ -78,7 +78,7 @@ public GroupByOperator(AggregationFunction[] aggregationFunctions, ExpressionCon
       ExpressionContext groupByExpression = groupByExpressions[i];
       columnNames[i] = groupByExpression.toString();
       columnDataTypes[i] = DataSchema.ColumnDataType.fromDataTypeSV(
-          _transformOperator.getResultMetadata(groupByExpression).getDataType());
+          _projectOperator.getResultColumnContext(groupByExpression).getDataType());
     }
 
     // Extract column names and data types for aggregation functions
@@ -97,14 +97,14 @@ protected GroupByResultsBlock getNextBlock() {
     // Perform aggregation group-by on all the blocks
     GroupByExecutor groupByExecutor;
     if (_useStarTree) {
-      groupByExecutor = new StarTreeGroupByExecutor(_queryContext, _groupByExpressions, _transformOperator);
+      groupByExecutor = new StarTreeGroupByExecutor(_queryContext, _groupByExpressions, _projectOperator);
     } else {
-      groupByExecutor = new DefaultGroupByExecutor(_queryContext, _groupByExpressions, _transformOperator);
+      groupByExecutor = new DefaultGroupByExecutor(_queryContext, _groupByExpressions, _projectOperator);
     }
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
-      _numDocsScanned += transformBlock.getNumDocs();
-      groupByExecutor.process(transformBlock);
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
+      _numDocsScanned += valueBlock.getNumDocs();
+      groupByExecutor.process(valueBlock);
     }
 
     // Check if the groups limit is reached
@@ -136,13 +136,13 @@ protected GroupByResultsBlock getNextBlock() {
 
   @Override
   public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-    long numEntriesScannedPostFilter = (long) _numDocsScanned * _transformOperator.getNumColumnsProjected();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedPostFilter = (long) _numDocsScanned * _projectOperator.getNumColumnsProjected();
     return new ExecutionStatistics(_numDocsScanned, numEntriesScannedInFilter, numEntriesScannedPostFilter,
         _numTotalDocs);
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperator.java
index e9fe801262b..b0904508a10 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperator.java
@@ -32,14 +32,13 @@
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.common.RowBasedBlockValueFetcher;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.core.query.utils.OrderByComparatorFactory;
@@ -70,28 +69,23 @@ public abstract class LinearSelectionOrderByOperator extends BaseOperator<Select
   protected final List<ExpressionContext> _alreadySorted;
   protected final List<ExpressionContext> _toSort;
 
-  protected final TransformOperator _transformOperator;
+  protected final BaseProjectOperator<?> _projectOperator;
   protected final List<OrderByExpressionContext> _orderByExpressions;
-  protected final TransformResultMetadata[] _expressionsMetadata;
+  protected final ColumnContext[] _columnContexts;
   protected final int _numRowsToKeep;
-  private final Supplier<ListBuilder> _listBuilderSupplier;
-  protected boolean _used = false;
-  /**
-   * The comparator used to build the resulting {@link SelectionResultsBlock}, which sorts rows in reverse order to the
-   * one specified in the query.
-   */
-  protected Comparator<Object[]> _comparator;
+  protected final Comparator<Object[]> _comparator;
+  protected final Supplier<ListBuilder> _listBuilderSupplier;
 
   /**
-   * @param expressions Order-by expressions must be at the head of the list.
+   * @param expressions          Order-by expressions must be at the head of the list.
    * @param numSortedExpressions Number of expressions in the order-by expressions that are sorted.
    */
   public LinearSelectionOrderByOperator(IndexSegment indexSegment, QueryContext queryContext,
-      List<ExpressionContext> expressions, TransformOperator transformOperator, int numSortedExpressions) {
+      List<ExpressionContext> expressions, BaseProjectOperator<?> projectOperator, int numSortedExpressions) {
     _indexSegment = indexSegment;
     _nullHandlingEnabled = queryContext.isNullHandlingEnabled();
     _expressions = expressions;
-    _transformOperator = transformOperator;
+    _projectOperator = projectOperator;
 
     _orderByExpressions = queryContext.getOrderByExpressions();
     assert _orderByExpressions != null;
@@ -100,28 +94,26 @@ public LinearSelectionOrderByOperator(IndexSegment indexSegment, QueryContext qu
     _alreadySorted = expressions.subList(0, numSortedExpressions);
     _toSort = expressions.subList(numSortedExpressions, numOrderByExpressions);
 
-    _expressionsMetadata = new TransformResultMetadata[_expressions.size()];
-    for (int i = 0; i < _expressionsMetadata.length; i++) {
+    _columnContexts = new ColumnContext[_expressions.size()];
+    for (int i = 0; i < _columnContexts.length; i++) {
       ExpressionContext expression = _expressions.get(i);
-      _expressionsMetadata[i] = _transformOperator.getResultMetadata(expression);
+      _columnContexts[i] = _projectOperator.getResultColumnContext(expression);
     }
 
     _numRowsToKeep = queryContext.getOffset() + queryContext.getLimit();
+    _comparator = OrderByComparatorFactory.getComparator(_orderByExpressions, _columnContexts, _nullHandlingEnabled);
 
     if (_toSort.isEmpty()) {
       _listBuilderSupplier = () -> new TotallySortedListBuilder(_numRowsToKeep);
     } else {
       Comparator<Object[]> sortedComparator =
-          OrderByComparatorFactory.getComparator(_orderByExpressions, _expressionsMetadata, false, _nullHandlingEnabled,
-              0, numSortedExpressions);
+          OrderByComparatorFactory.getComparator(_orderByExpressions, _columnContexts, _nullHandlingEnabled, 0,
+              numSortedExpressions);
       Comparator<Object[]> unsortedComparator =
-          OrderByComparatorFactory.getComparator(_orderByExpressions, _expressionsMetadata, true, _nullHandlingEnabled,
+          OrderByComparatorFactory.getComparator(_orderByExpressions, _columnContexts, _nullHandlingEnabled,
               numSortedExpressions, numOrderByExpressions);
       _listBuilderSupplier = () -> new PartiallySortedListBuilder(_numRowsToKeep, sortedComparator, unsortedComparator);
     }
-
-    _comparator =
-        OrderByComparatorFactory.getComparator(_orderByExpressions, _expressionsMetadata, true, _nullHandlingEnabled);
   }
 
   @Override
@@ -131,20 +123,20 @@ public IndexSegment getIndexSegment() {
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
     int numDocsScanned = getNumDocsScanned();
-    long numEntriesScannedPostFilter = (long) numDocsScanned * _transformOperator.getNumColumnsProjected();
+    long numEntriesScannedPostFilter = (long) numDocsScanned * _projectOperator.getNumColumnsProjected();
     int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
     return new ExecutionStatistics(numDocsScanned, numEntriesScannedInFilter, numEntriesScannedPostFilter,
         numTotalDocs);
   }
 
-  protected IntFunction<Object[]> fetchBlock(TransformBlock transformBlock, BlockValSet[] blockValSets) {
+  protected IntFunction<Object[]> fetchBlock(ValueBlock valueBlock, BlockValSet[] blockValSets) {
     int numExpressions = _expressions.size();
 
     for (int i = 0; i < numExpressions; i++) {
       ExpressionContext expression = _expressions.get(i);
-      blockValSets[i] = transformBlock.getBlockValueSet(expression);
+      blockValSets[i] = valueBlock.getBlockValueSet(expression);
     }
     RowBasedBlockValueFetcher blockValueFetcher = new RowBasedBlockValueFetcher(blockValSets);
 
@@ -184,8 +176,8 @@ protected IntFunction<Object[]> fetchBlock(TransformBlock transformBlock, BlockV
   protected abstract List<Object[]> fetch(Supplier<ListBuilder> listBuilderSupplier);
 
   @Override
-  public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+  public List<BaseProjectOperator<?>> getChildOperators() {
+    return Collections.singletonList(_projectOperator);
   }
 
   protected abstract String getExplainName();
@@ -221,17 +213,7 @@ private void concatList(StringBuilder sb, List<?> list) {
 
   @Override
   protected SelectionResultsBlock getNextBlock() {
-    Preconditions.checkState(!_used, "nextBlock was called more than once");
-    _used = true;
-    List<Object[]> list = fetch(_listBuilderSupplier);
-
-    DataSchema dataSchema = createDataSchema();
-
-    if (list.size() > _numRowsToKeep) {
-      list = new ArrayList<>(list.subList(0, _numRowsToKeep));
-    }
-
-    return new SelectionResultsBlock(dataSchema, list, _comparator);
+    return new SelectionResultsBlock(createDataSchema(), fetch(_listBuilderSupplier), _comparator);
   }
 
   protected DataSchema createDataSchema() {
@@ -244,9 +226,8 @@ protected DataSchema createDataSchema() {
       columnNames[i] = _expressions.get(i).toString();
     }
     for (int i = 0; i < numExpressions; i++) {
-      TransformResultMetadata expressionMetadata = _expressionsMetadata[i];
       columnDataTypes[i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+          DataSchema.ColumnDataType.fromDataType(_columnContexts[i].getDataType(), _columnContexts[i].isSingleValue());
     }
     return new DataSchema(columnNames, columnDataTypes);
   }
@@ -335,25 +316,28 @@ public List<Object[]> build() {
    */
   @VisibleForTesting
   static class PartiallySortedListBuilder implements ListBuilder {
-    /**
-     * A list with all the elements that have been already sorted.
-     */
-    private final ArrayList<Object[]> _sorted;
-    /**
-     * This attribute is used to store the last partition when the builder already contains {@link #_maxNumRows} rows.
-     */
-    private PriorityQueue<Object[]> _lastPartitionQueue;
+
+    private final int _maxNumRows;
+
     /**
      * The comparator that defines the partitions and the one that impose in which order add has to be called.
      */
     private final Comparator<Object[]> _partitionComparator;
+
     /**
-     * The comparator that sorts different rows on each partition, which sorts rows in reverse order to the one
-     * specified in the query.
+     * The comparator that sorts different rows on each partition.
      */
     private final Comparator<Object[]> _unsortedComparator;
 
-    private final int _maxNumRows;
+    /**
+     * List of rows, where the first _numSortedRows are sorted.
+     */
+    private final ArrayList<Object[]> _rows;
+
+    /**
+     * This attribute is used to store the last partition when the builder already contains {@link #_maxNumRows} rows.
+     */
+    private PriorityQueue<Object[]> _lastPartitionQueue;
 
     private Object[] _lastPartitionRow;
     private int _numSortedRows;
@@ -361,50 +345,52 @@ static class PartiallySortedListBuilder implements ListBuilder {
     public PartiallySortedListBuilder(int maxNumRows, Comparator<Object[]> partitionComparator,
         Comparator<Object[]> unsortedComparator) {
       _maxNumRows = maxNumRows;
-      _sorted = new ArrayList<>(Integer.min(maxNumRows, SelectionOperatorUtils.MAX_ROW_HOLDER_INITIAL_CAPACITY));
       _partitionComparator = partitionComparator;
       _unsortedComparator = unsortedComparator;
+      _rows = new ArrayList<>(Integer.min(maxNumRows, SelectionOperatorUtils.MAX_ROW_HOLDER_INITIAL_CAPACITY));
     }
 
     @Override
     public boolean add(Object[] row) {
       if (_lastPartitionRow == null) {
         _lastPartitionRow = row;
-        _sorted.add(row);
+        _rows.add(row);
         return false;
       }
-      int cmp = _partitionComparator.compare(row, _lastPartitionRow);
-      if (cmp < 0) {
-        throw new IllegalArgumentException(
-            "Row with docId " + _sorted.size() + " is not sorted compared to the previous one");
-      }
+      int compareResult = _partitionComparator.compare(row, _lastPartitionRow);
+      Preconditions.checkState(compareResult >= 0, "Rows are not sorted");
 
-      boolean newPartition = cmp > 0;
-      if (_sorted.size() < _maxNumRows) {
+      boolean newPartition = compareResult > 0;
+      int numRows = _rows.size();
+      if (numRows < _maxNumRows) {
         // we don't have enough rows yet
         if (newPartition) {
           _lastPartitionRow = row;
-          _numSortedRows = _sorted.size();
+          if (numRows - _numSortedRows > 1) {
+            _rows.subList(_numSortedRows, numRows).sort(_unsortedComparator);
+          }
+          _numSortedRows = numRows;
         }
         // just add the new row to the result list
-        _sorted.add(row);
+        _rows.add(row);
         return false;
       }
 
       // enough rows have been collected
-      assert _sorted.size() == _maxNumRows;
-      if (newPartition) { // and the new element belongs to a new partition, so we can just ignore it
+      assert numRows == _maxNumRows;
+      if (newPartition) {
+        // new element belongs to a new partition, so we can just ignore it
         return true;
       }
       // new element doesn't belong to a new partition, so we may need to add it
-      if (_lastPartitionQueue == null) { // we have exactly _numRows rows, and the new belongs to the last partition
+      if (_lastPartitionQueue == null) {
         // we need to prepare the priority queue
-        int numRowsInPriorityQueue = _maxNumRows - _numSortedRows;
-        _lastPartitionQueue = new PriorityQueue<>(numRowsInPriorityQueue, _unsortedComparator);
-        _lastPartitionQueue.addAll(_sorted.subList(_numSortedRows, _maxNumRows));
+        int numRowsInPriorityQueue = numRows - _numSortedRows;
+        _lastPartitionQueue = new PriorityQueue<>(numRowsInPriorityQueue, _unsortedComparator.reversed());
+        _lastPartitionQueue.addAll(_rows.subList(_numSortedRows, numRows));
       }
       // add the new element if it is lower than the greatest element stored in the partition
-      if (_unsortedComparator.compare(row, _lastPartitionQueue.peek()) > 0) {
+      if (_unsortedComparator.compare(row, _lastPartitionQueue.peek()) < 0) {
         _lastPartitionQueue.poll();
         _lastPartitionQueue.offer(row);
       }
@@ -413,14 +399,18 @@ public boolean add(Object[] row) {
 
     @Override
     public List<Object[]> build() {
-      if (_lastPartitionQueue != null) {
-        assert _lastPartitionQueue.size() == _maxNumRows - _numSortedRows;
-        Iterator<Object[]> lastPartitionIt = _lastPartitionQueue.iterator();
-        for (int i = _numSortedRows; i < _maxNumRows; i++) {
-          _sorted.set(i, lastPartitionIt.next());
+      int numRows = _rows.size();
+      if (_lastPartitionQueue == null) {
+        if (numRows - _numSortedRows > 1) {
+          _rows.subList(_numSortedRows, numRows).sort(_unsortedComparator);
+        }
+      } else {
+        assert numRows == _maxNumRows && _lastPartitionQueue.size() == numRows - _numSortedRows;
+        for (int i = numRows - 1; i >= _numSortedRows; i--) {
+          _rows.set(i, _lastPartitionQueue.poll());
         }
       }
-      return _sorted;
+      return _rows;
     }
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java
index 6db1f4e3522..77ba15b6c23 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java
@@ -27,11 +27,11 @@
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.common.RowBasedBlockValueFetcher;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.segment.spi.IndexSegment;
@@ -44,33 +44,33 @@ public class SelectionOnlyOperator extends BaseOperator<SelectionResultsBlock> {
 
   private final IndexSegment _indexSegment;
   private final boolean _nullHandlingEnabled;
-  private final TransformOperator _transformOperator;
+  private final BaseProjectOperator<?> _projectOperator;
   private final List<ExpressionContext> _expressions;
   private final BlockValSet[] _blockValSets;
   private final DataSchema _dataSchema;
   private final int _numRowsToKeep;
-  private final List<Object[]> _rows;
+  private final ArrayList<Object[]> _rows;
   private final RoaringBitmap[] _nullBitmaps;
 
   private int _numDocsScanned = 0;
 
   public SelectionOnlyOperator(IndexSegment indexSegment, QueryContext queryContext,
-      List<ExpressionContext> expressions, TransformOperator transformOperator) {
+      List<ExpressionContext> expressions, BaseProjectOperator<?> projectOperator) {
     _indexSegment = indexSegment;
     _nullHandlingEnabled = queryContext.isNullHandlingEnabled();
-    _transformOperator = transformOperator;
+    _projectOperator = projectOperator;
     _expressions = expressions;
 
-    int numExpressions = _expressions.size();
+    int numExpressions = expressions.size();
     _blockValSets = new BlockValSet[numExpressions];
     String[] columnNames = new String[numExpressions];
     DataSchema.ColumnDataType[] columnDataTypes = new DataSchema.ColumnDataType[numExpressions];
     for (int i = 0; i < numExpressions; i++) {
-      ExpressionContext expression = _expressions.get(i);
-      TransformResultMetadata expressionMetadata = _transformOperator.getResultMetadata(expression);
+      ExpressionContext expression = expressions.get(i);
       columnNames[i] = expression.toString();
+      ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
       columnDataTypes[i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+          DataSchema.ColumnDataType.fromDataType(columnContext.getDataType(), columnContext.isSingleValue());
     }
     _dataSchema = new DataSchema(columnNames, columnDataTypes);
 
@@ -93,15 +93,16 @@ public String toExplainString() {
 
   @Override
   protected SelectionResultsBlock getNextBlock() {
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
       int numExpressions = _expressions.size();
       for (int i = 0; i < numExpressions; i++) {
-        _blockValSets[i] = transformBlock.getBlockValueSet(_expressions.get(i));
+        _blockValSets[i] = valueBlock.getBlockValueSet(_expressions.get(i));
       }
       RowBasedBlockValueFetcher blockValueFetcher = new RowBasedBlockValueFetcher(_blockValSets);
 
-      int numDocsToAdd = Math.min(_numRowsToKeep - _rows.size(), transformBlock.getNumDocs());
+      int numDocsToAdd = Math.min(_numRowsToKeep - _rows.size(), valueBlock.getNumDocs());
+      _rows.ensureCapacity(_rows.size() + numDocsToAdd);
       _numDocsScanned += numDocsToAdd;
       if (_nullHandlingEnabled) {
         for (int i = 0; i < numExpressions; i++) {
@@ -131,7 +132,7 @@ protected SelectionResultsBlock getNextBlock() {
 
   @Override
   public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
@@ -141,8 +142,8 @@ public IndexSegment getIndexSegment() {
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-    long numEntriesScannedPostFilter = (long) _numDocsScanned * _transformOperator.getNumColumnsProjected();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedPostFilter = (long) _numDocsScanned * _projectOperator.getNumColumnsProjected();
     int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
     return new ExecutionStatistics(_numDocsScanned, numEntriesScannedInFilter, numEntriesScannedPostFilter,
         numTotalDocs);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java
index d45652bba82..3459b1122b7 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.core.operator.query;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -34,13 +35,14 @@
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.common.RowBasedBlockValueFetcher;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.BitmapDocIdSetOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.ExecutionStatistics;
 import org.apache.pinot.core.operator.ProjectionOperator;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
 import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.core.query.utils.OrderByComparatorFactory;
@@ -68,44 +70,45 @@
  * </ul>
  */
 public class SelectionOrderByOperator extends BaseOperator<SelectionResultsBlock> {
-
   private static final String EXPLAIN_NAME = "SELECT_ORDERBY";
 
   private final IndexSegment _indexSegment;
+  private final QueryContext _queryContext;
   private final boolean _nullHandlingEnabled;
   // Deduped order-by expressions followed by output expressions from SelectionOperatorUtils.extractExpressions()
   private final List<ExpressionContext> _expressions;
-  private final TransformOperator _transformOperator;
+  private final BaseProjectOperator<?> _projectOperator;
   private final List<OrderByExpressionContext> _orderByExpressions;
-  private final TransformResultMetadata[] _orderByExpressionMetadata;
+  private final ColumnContext[] _orderByColumnContexts;
   private final int _numRowsToKeep;
+  private final Comparator<Object[]> _comparator;
   private final PriorityQueue<Object[]> _rows;
 
   private int _numDocsScanned = 0;
   private long _numEntriesScannedPostFilter = 0;
 
   public SelectionOrderByOperator(IndexSegment indexSegment, QueryContext queryContext,
-      List<ExpressionContext> expressions, TransformOperator transformOperator) {
+      List<ExpressionContext> expressions, BaseProjectOperator<?> projectOperator) {
     _indexSegment = indexSegment;
+    _queryContext = queryContext;
     _nullHandlingEnabled = queryContext.isNullHandlingEnabled();
     _expressions = expressions;
-    _transformOperator = transformOperator;
+    _projectOperator = projectOperator;
 
     _orderByExpressions = queryContext.getOrderByExpressions();
     assert _orderByExpressions != null;
     int numOrderByExpressions = _orderByExpressions.size();
-    _orderByExpressionMetadata = new TransformResultMetadata[numOrderByExpressions];
+    _orderByColumnContexts = new ColumnContext[numOrderByExpressions];
     for (int i = 0; i < numOrderByExpressions; i++) {
       ExpressionContext expression = _orderByExpressions.get(i).getExpression();
-      _orderByExpressionMetadata[i] = _transformOperator.getResultMetadata(expression);
+      _orderByColumnContexts[i] = _projectOperator.getResultColumnContext(expression);
     }
 
     _numRowsToKeep = queryContext.getOffset() + queryContext.getLimit();
-    Comparator<Object[]> comparator =
-        OrderByComparatorFactory.getComparator(_orderByExpressions, _orderByExpressionMetadata, true,
-            _nullHandlingEnabled);
+    _comparator =
+        OrderByComparatorFactory.getComparator(_orderByExpressions, _orderByColumnContexts, _nullHandlingEnabled);
     _rows = new PriorityQueue<>(Math.min(_numRowsToKeep, SelectionOperatorUtils.MAX_ROW_HOLDER_INITIAL_CAPACITY),
-        comparator);
+        _comparator.reversed());
   }
 
   @Override
@@ -137,15 +140,15 @@ private SelectionResultsBlock computeAllOrdered() {
 
     // Fetch all the expressions and insert them into the priority queue
     BlockValSet[] blockValSets = new BlockValSet[numExpressions];
-    int numColumnsProjected = _transformOperator.getNumColumnsProjected();
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
+    int numColumnsProjected = _projectOperator.getNumColumnsProjected();
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
       for (int i = 0; i < numExpressions; i++) {
         ExpressionContext expression = _expressions.get(i);
-        blockValSets[i] = transformBlock.getBlockValueSet(expression);
+        blockValSets[i] = valueBlock.getBlockValueSet(expression);
       }
       RowBasedBlockValueFetcher blockValueFetcher = new RowBasedBlockValueFetcher(blockValSets);
-      int numDocsFetched = transformBlock.getNumDocs();
+      int numDocsFetched = valueBlock.getNumDocs();
       if (_nullHandlingEnabled) {
         RoaringBitmap[] nullBitmaps = new RoaringBitmap[numExpressions];
         for (int i = 0; i < numExpressions; i++) {
@@ -175,13 +178,12 @@ private SelectionResultsBlock computeAllOrdered() {
     DataSchema.ColumnDataType[] columnDataTypes = new DataSchema.ColumnDataType[numExpressions];
     for (int i = 0; i < numExpressions; i++) {
       columnNames[i] = _expressions.get(i).toString();
-      TransformResultMetadata expressionMetadata = _orderByExpressionMetadata[i];
-      columnDataTypes[i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+      columnDataTypes[i] = DataSchema.ColumnDataType.fromDataType(_orderByColumnContexts[i].getDataType(),
+          _orderByColumnContexts[i].isSingleValue());
     }
     DataSchema dataSchema = new DataSchema(columnNames, columnDataTypes);
 
-    return new SelectionResultsBlock(dataSchema, _rows);
+    return new SelectionResultsBlock(dataSchema, getSortedRows(), _comparator);
   }
 
   /**
@@ -193,16 +195,16 @@ private SelectionResultsBlock computePartiallyOrdered() {
 
     // Fetch the order-by expressions and docIds and insert them into the priority queue
     BlockValSet[] blockValSets = new BlockValSet[numOrderByExpressions];
-    int numColumnsProjected = _transformOperator.getNumColumnsProjected();
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
+    int numColumnsProjected = _projectOperator.getNumColumnsProjected();
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
       for (int i = 0; i < numOrderByExpressions; i++) {
         ExpressionContext expression = _orderByExpressions.get(i).getExpression();
-        blockValSets[i] = transformBlock.getBlockValueSet(expression);
+        blockValSets[i] = valueBlock.getBlockValueSet(expression);
       }
       RowBasedBlockValueFetcher blockValueFetcher = new RowBasedBlockValueFetcher(blockValSets);
-      int numDocsFetched = transformBlock.getNumDocs();
-      int[] docIds = transformBlock.getDocIds();
+      int numDocsFetched = valueBlock.getNumDocs();
+      int[] docIds = valueBlock.getDocIds();
       if (_nullHandlingEnabled) {
         RoaringBitmap[] nullBitmaps = new RoaringBitmap[numOrderByExpressions];
         for (int i = 0; i < numOrderByExpressions; i++) {
@@ -262,19 +264,20 @@ private SelectionResultsBlock computePartiallyOrdered() {
     }
     ProjectionOperator projectionOperator =
         new ProjectionOperator(dataSourceMap, new BitmapDocIdSetOperator(docIds, numRows));
-    TransformOperator transformOperator = new TransformOperator(projectionOperator, nonOrderByExpressions);
+    TransformOperator transformOperator =
+        new TransformOperator(_queryContext, projectionOperator, nonOrderByExpressions);
 
     // Fill the non-order-by expression values
     int numNonOrderByExpressions = nonOrderByExpressions.size();
     blockValSets = new BlockValSet[numNonOrderByExpressions];
     int rowBaseId = 0;
-    while ((transformBlock = transformOperator.nextBlock()) != null) {
+    while ((valueBlock = transformOperator.nextBlock()) != null) {
       for (int i = 0; i < numNonOrderByExpressions; i++) {
         ExpressionContext expression = nonOrderByExpressions.get(i);
-        blockValSets[i] = transformBlock.getBlockValueSet(expression);
+        blockValSets[i] = valueBlock.getBlockValueSet(expression);
       }
       RowBasedBlockValueFetcher blockValueFetcher = new RowBasedBlockValueFetcher(blockValSets);
-      int numDocsFetched = transformBlock.getNumDocs();
+      int numDocsFetched = valueBlock.getNumDocs();
       for (int i = 0; i < numDocsFetched; i++) {
         blockValueFetcher.getRow(i, rowList.get(rowBaseId + i), numOrderByExpressions);
       }
@@ -289,23 +292,31 @@ private SelectionResultsBlock computePartiallyOrdered() {
       columnNames[i] = _expressions.get(i).toString();
     }
     for (int i = 0; i < numOrderByExpressions; i++) {
-      TransformResultMetadata expressionMetadata = _orderByExpressionMetadata[i];
-      columnDataTypes[i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+      columnDataTypes[i] = DataSchema.ColumnDataType.fromDataType(_orderByColumnContexts[i].getDataType(),
+          _orderByColumnContexts[i].isSingleValue());
     }
     for (int i = 0; i < numNonOrderByExpressions; i++) {
-      TransformResultMetadata expressionMetadata = transformOperator.getResultMetadata(nonOrderByExpressions.get(i));
+      ColumnContext columnContext = transformOperator.getResultColumnContext(nonOrderByExpressions.get(i));
       columnDataTypes[numOrderByExpressions + i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+          DataSchema.ColumnDataType.fromDataType(columnContext.getDataType(), columnContext.isSingleValue());
     }
     DataSchema dataSchema = new DataSchema(columnNames, columnDataTypes);
 
-    return new SelectionResultsBlock(dataSchema, _rows);
+    return new SelectionResultsBlock(dataSchema, getSortedRows(), _comparator);
+  }
+
+  private List<Object[]> getSortedRows() {
+    int numRows = _rows.size();
+    Object[][] sortedRows = new Object[numRows][];
+    for (int i = numRows - 1; i >= 0; i--) {
+      sortedRows[i] = _rows.poll();
+    }
+    return Arrays.asList(sortedRows);
   }
 
   @Override
   public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
@@ -315,7 +326,7 @@ public IndexSegment getIndexSegment() {
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
     int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
     return new ExecutionStatistics(_numDocsScanned, numEntriesScannedInFilter, _numEntriesScannedPostFilter,
         numTotalDocs);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByAscOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByAscOperator.java
index 62de4824cd8..bc4d42a20c2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByAscOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByAscOperator.java
@@ -24,8 +24,8 @@
 import java.util.function.Supplier;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 
@@ -41,8 +41,8 @@ public class SelectionPartiallyOrderedByAscOperator extends LinearSelectionOrder
   private int _numDocsScanned = 0;
 
   public SelectionPartiallyOrderedByAscOperator(IndexSegment indexSegment, QueryContext queryContext,
-      List<ExpressionContext> expressions, TransformOperator transformOperator, int numSortedExpressions) {
-    super(indexSegment, queryContext, expressions, transformOperator, numSortedExpressions);
+      List<ExpressionContext> expressions, BaseProjectOperator<?> projectOperator, int numSortedExpressions) {
+    super(indexSegment, queryContext, expressions, projectOperator, numSortedExpressions);
     Preconditions.checkArgument(queryContext.getOrderByExpressions().stream()
             .filter(expr -> expr.getExpression().getType() == ExpressionContext.Type.IDENTIFIER)
             .findFirst()
@@ -56,10 +56,10 @@ protected List<Object[]> fetch(Supplier<ListBuilder> listBuilderSupplier) {
     int numExpressions = _expressions.size();
     BlockValSet[] blockValSets = new BlockValSet[numExpressions];
     ListBuilder listBuilder = listBuilderSupplier.get();
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
-      IntFunction<Object[]> rowFetcher = fetchBlock(transformBlock, blockValSets);
-      int numDocsFetched = transformBlock.getNumDocs();
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
+      IntFunction<Object[]> rowFetcher = fetchBlock(valueBlock, blockValSets);
+      int numDocsFetched = valueBlock.getNumDocs();
       _numDocsScanned += numDocsFetched;
       for (int i = 0; i < numDocsFetched; i++) {
         if (listBuilder.add(rowFetcher.apply(i))) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByDescOperation.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByDescOperation.java
index 5322e0a6e66..2bfa9b3a710 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByDescOperation.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionPartiallyOrderedByDescOperation.java
@@ -26,8 +26,8 @@
 import java.util.function.Supplier;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 
@@ -44,8 +44,8 @@ public class SelectionPartiallyOrderedByDescOperation extends LinearSelectionOrd
   private int _numDocsScanned = 0;
 
   public SelectionPartiallyOrderedByDescOperation(IndexSegment indexSegment, QueryContext queryContext,
-      List<ExpressionContext> expressions, TransformOperator transformOperator, int numSortedExpressions) {
-    super(indexSegment, queryContext, expressions, transformOperator, numSortedExpressions);
+      List<ExpressionContext> expressions, BaseProjectOperator<?> projectOperator, int numSortedExpressions) {
+    super(indexSegment, queryContext, expressions, projectOperator, numSortedExpressions);
     assert queryContext.getOrderByExpressions() != null;
     Preconditions.checkArgument(queryContext.getOrderByExpressions().stream()
             .filter(expr -> expr.getExpression().getType() == ExpressionContext.Type.IDENTIFIER).findFirst()
@@ -64,10 +64,10 @@ protected List<Object[]> fetch(Supplier<ListBuilder> listBuilderSupplier) {
     int numExpressions = _expressions.size();
     BlockValSet[] blockValSets = new BlockValSet[numExpressions];
     List<Object[]> localBestRows = new ArrayList<>();
-    TransformBlock transformBlock;
-    while ((transformBlock = _transformOperator.nextBlock()) != null) {
-      IntFunction<Object[]> rowFetcher = fetchBlock(transformBlock, blockValSets);
-      int numDocsFetched = transformBlock.getNumDocs();
+    ValueBlock valueBlock;
+    while ((valueBlock = _projectOperator.nextBlock()) != null) {
+      IntFunction<Object[]> rowFetcher = fetchBlock(valueBlock, blockValSets);
+      int numDocsFetched = valueBlock.getNumDocs();
       _numDocsScanned += numDocsFetched;
       ListBuilder listBuilder = listBuilderSupplier.get();
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/BaseStreamingCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/BaseStreamingCombineOperator.java
new file mode 100644
index 00000000000..10c547d7807
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/BaseStreamingCombineOperator.java
@@ -0,0 +1,182 @@
+/**
+ * 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.pinot.core.operator.streaming;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.AcquireReleaseColumnsSegmentOperator;
+import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.MetadataResultsBlock;
+import org.apache.pinot.core.operator.combine.BaseCombineOperator;
+import org.apache.pinot.core.operator.combine.CombineOperatorUtils;
+import org.apache.pinot.core.operator.combine.merger.ResultsBlockMerger;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public abstract class BaseStreamingCombineOperator<T extends BaseResultsBlock>
+    extends BaseCombineOperator<T> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(BaseStreamingCombineOperator.class);
+
+  // Use a special results block to indicate that this is the last results block for a child operator in the list
+  public static final MetadataResultsBlock LAST_RESULTS_BLOCK = new MetadataResultsBlock();
+
+  protected int _numOperatorsFinished;
+  protected boolean _querySatisfied;
+
+  public BaseStreamingCombineOperator(ResultsBlockMerger<T> resultsBlockMerger, List<Operator> operators,
+      QueryContext queryContext, ExecutorService executorService) {
+    super(resultsBlockMerger, operators, queryContext, executorService);
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * When all the results blocks are returned, returns a final metadata block. Caller shouldn't call this method after
+   * it returns the metadata block or exception block.
+   */
+  @Override
+  protected BaseResultsBlock getNextBlock() {
+    long endTimeMs = _queryContext.getEndTimeMs();
+    Object querySatisfiedTracker = createQuerySatisfiedTracker();
+    while (!_querySatisfied && _numOperatorsFinished < _numOperators) {
+      try {
+        BaseResultsBlock resultsBlock =
+            _blockingQueue.poll(endTimeMs - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+        if (resultsBlock == null) {
+          // Query times out, skip streaming the remaining results blocks
+          LOGGER.error("Timed out while polling results block (query: {})", _queryContext);
+          return new ExceptionResultsBlock(QueryException.getException(QueryException.EXECUTION_TIMEOUT_ERROR,
+              new TimeoutException("Timed out while polling results block")));
+        }
+        if (resultsBlock.getProcessingExceptions() != null) {
+          // Caught exception while processing segment, skip streaming the remaining results blocks and directly return
+          // the exception
+          return resultsBlock;
+        }
+        if (resultsBlock == LAST_RESULTS_BLOCK) {
+          // Caught LAST_RESULTS_BLOCK from a specific task, indicated it has finished.
+          // Skip returning this metadata block and continue to process the next from the _blockingQueue.
+          _numOperatorsFinished++;
+          continue;
+        }
+        _querySatisfied = isQuerySatisfied((T) resultsBlock, querySatisfiedTracker);
+        return resultsBlock;
+      } catch (InterruptedException e) {
+        throw new EarlyTerminationException("Interrupted while streaming results blocks", e);
+      } catch (Exception e) {
+        LOGGER.error("Caught exception while streaming results blocks (query: {})", _queryContext, e);
+        return new ExceptionResultsBlock(QueryException.getException(QueryException.INTERNAL_ERROR, e));
+      }
+    }
+    // Setting the execution stats for the final return
+    BaseResultsBlock finalBlock = new MetadataResultsBlock();
+    int numServerThreads = Math.min(_numTasks, ResourceManager.DEFAULT_QUERY_WORKER_THREADS);
+    CombineOperatorUtils.setExecutionStatistics(finalBlock, _operators, _totalWorkerThreadCpuTimeNs.get(),
+        numServerThreads);
+    return finalBlock;
+  }
+
+  @Override
+  protected void processSegments() {
+    int operatorId;
+    Object tracker = createQuerySatisfiedTracker();
+    while (_processingException.get() == null && (operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
+      Operator<T> operator = _operators.get(operatorId);
+      try {
+        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
+          ((AcquireReleaseColumnsSegmentOperator) operator).acquire();
+        }
+        if (isChildOperatorSingleBlock()) {
+          T resultsBlock = operator.nextBlock();
+          _blockingQueue.offer(resultsBlock);
+          // When query is satisfied, skip processing the remaining segments
+          if (isQuerySatisfied(resultsBlock, tracker)) {
+            _nextOperatorId.set(_numOperators);
+            return;
+          }
+        } else {
+          T resultsBlock;
+          while ((resultsBlock = operator.nextBlock()) != null) {
+            _blockingQueue.offer(resultsBlock);
+            // When query is satisfied, skip processing the remaining segments
+            if (isQuerySatisfied(resultsBlock, tracker)) {
+              _nextOperatorId.set(_numOperators);
+              return;
+            }
+          }
+        }
+      } finally {
+        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
+          ((AcquireReleaseColumnsSegmentOperator) operator).release();
+        }
+      }
+      // offer the LAST_RESULTS_BLOCK indicate finish of the current operator.
+      _blockingQueue.offer(LAST_RESULTS_BLOCK);
+    }
+  }
+
+  @Override
+  protected void onProcessSegmentsException(Throwable t) {
+    _processingException.compareAndSet(null, t);
+    _blockingQueue.offer(new ExceptionResultsBlock(t));
+  }
+
+  @Override
+  protected void onProcessSegmentsFinish() {
+  }
+
+  /**
+   * Returns whether the child operator returns only a single block.
+   */
+  protected boolean isChildOperatorSingleBlock() {
+    return true;
+  }
+
+  /**
+   * Creates a tracker object to track if the query is satisfied.
+   */
+  protected Object createQuerySatisfiedTracker() {
+    return null;
+  }
+
+  /**
+   * Returns {@code true} if the query is already satisfied with the results block.
+   */
+  protected boolean isQuerySatisfied(T resultsBlock, Object tracker) {
+    return _resultsBlockMerger.isQuerySatisfied(resultsBlock);
+  }
+
+  public void start() {
+    startProcess();
+  }
+
+  public void stop() {
+    stopProcess();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingAggregationCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingAggregationCombineOperator.java
new file mode 100644
index 00000000000..ff5820611dc
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingAggregationCombineOperator.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.core.operator.streaming;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.AggregationResultsBlockMerger;
+import org.apache.pinot.core.query.request.context.QueryContext;
+
+
+/**
+ * Combine operator for aggregation queries with streaming response.
+ */
+@SuppressWarnings("rawtypes")
+public class StreamingAggregationCombineOperator extends BaseStreamingCombineOperator<AggregationResultsBlock> {
+  private static final String EXPLAIN_NAME = "STREAMING_COMBINE_AGGREGATE";
+
+  public StreamingAggregationCombineOperator(List<Operator> operators, QueryContext queryContext,
+      ExecutorService executorService) {
+    super(new AggregationResultsBlockMerger(queryContext), operators, queryContext, executorService);
+  }
+
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingDistinctCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingDistinctCombineOperator.java
new file mode 100644
index 00000000000..6834e30145f
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingDistinctCombineOperator.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.core.operator.streaming;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.DistinctResultsBlockMerger;
+import org.apache.pinot.core.query.request.context.QueryContext;
+
+
+/**
+ * Combine operator for distinct queries with streaming response.
+ */
+@SuppressWarnings("rawtypes")
+public class StreamingDistinctCombineOperator extends BaseStreamingCombineOperator<DistinctResultsBlock> {
+  private static final String EXPLAIN_NAME = "STREAMING_COMBINE_DISTINCT";
+
+  public StreamingDistinctCombineOperator(List<Operator> operators, QueryContext queryContext,
+      ExecutorService executorService) {
+    super(new DistinctResultsBlockMerger(queryContext), operators, queryContext, executorService);
+  }
+
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingGroupByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingGroupByCombineOperator.java
new file mode 100644
index 00000000000..53d0a3820b1
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingGroupByCombineOperator.java
@@ -0,0 +1,268 @@
+/**
+ * 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.pinot.core.operator.streaming;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.data.table.ConcurrentIndexedTable;
+import org.apache.pinot.core.data.table.IndexedTable;
+import org.apache.pinot.core.data.table.IntermediateRecord;
+import org.apache.pinot.core.data.table.Key;
+import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.data.table.UnboundedConcurrentIndexedTable;
+import org.apache.pinot.core.operator.AcquireReleaseColumnsSegmentOperator;
+import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.MetadataResultsBlock;
+import org.apache.pinot.core.operator.combine.CombineOperatorUtils;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.core.query.aggregation.groupby.AggregationGroupByResult;
+import org.apache.pinot.core.query.aggregation.groupby.GroupKeyGenerator;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.core.util.GroupByUtils;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.apache.pinot.spi.trace.Tracing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Combine operator for group-by queries.
+ * TODO: Use CombineOperatorUtils.getNumThreadsForQuery() to get the parallelism of the query instead of using
+ *       all threads
+ */
+@SuppressWarnings("rawtypes")
+public class StreamingGroupByCombineOperator extends BaseStreamingCombineOperator<GroupByResultsBlock> {
+  public static final int MAX_TRIM_THRESHOLD = 1_000_000_000;
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(StreamingGroupByCombineOperator.class);
+  private static final String EXPLAIN_NAME = "STREAMING_COMBINE_GROUP_BY";
+
+  private final int _trimSize;
+  private final int _trimThreshold;
+  private final int _numAggregationFunctions;
+  private final int _numGroupByExpressions;
+  private final int _numColumns;
+  // We use a CountDownLatch to track if all Futures are finished by the query timeout, and cancel the unfinished
+  // _futures (try to interrupt the execution if it already started).
+  private final CountDownLatch _operatorLatch;
+  private boolean _opCompleted;
+
+  private volatile IndexedTable _indexedTable;
+  private volatile boolean _numGroupsLimitReached;
+
+  public StreamingGroupByCombineOperator(List<Operator> operators, QueryContext queryContext,
+      ExecutorService executorService) {
+    super(null, operators, overrideMaxExecutionThreads(queryContext, operators.size()), executorService);
+
+    int minTrimSize = queryContext.getMinServerGroupTrimSize();
+    if (minTrimSize > 0) {
+      int limit = queryContext.getLimit();
+      if ((!queryContext.isServerReturnFinalResult() && queryContext.getOrderByExpressions() != null)
+          || queryContext.getHavingFilter() != null) {
+        _trimSize = GroupByUtils.getTableCapacity(limit, minTrimSize);
+      } else {
+        // TODO: Keeping only 'LIMIT' groups can cause inaccurate result because the groups are randomly selected
+        //       without ordering. Consider ordering on group-by columns if no ordering is specified.
+        _trimSize = limit;
+      }
+      _trimThreshold = queryContext.getGroupTrimThreshold();
+    } else {
+      // Server trim is disabled
+      _trimSize = Integer.MAX_VALUE;
+      _trimThreshold = Integer.MAX_VALUE;
+    }
+
+    AggregationFunction[] aggregationFunctions = _queryContext.getAggregationFunctions();
+    assert aggregationFunctions != null;
+    _numAggregationFunctions = aggregationFunctions.length;
+    assert _queryContext.getGroupByExpressions() != null;
+    _numGroupByExpressions = _queryContext.getGroupByExpressions().size();
+    _numColumns = _numGroupByExpressions + _numAggregationFunctions;
+    _operatorLatch = new CountDownLatch(_numTasks);
+    _opCompleted = false;
+  }
+
+  @Override
+  protected BaseResultsBlock getNextBlock() {
+    if (!_opCompleted) {
+      try {
+        return getFinalResult();
+      } catch (InterruptedException e) {
+        throw new EarlyTerminationException("Interrupted while merging results blocks", e);
+      } catch (Exception e) {
+        LOGGER.error("Caught exception while merging results blocks (query: {})", _queryContext, e);
+        return new ExceptionResultsBlock(QueryException.getException(QueryException.INTERNAL_ERROR, e));
+      }
+    }
+    // Setting the execution stats for the final return
+    BaseResultsBlock finalBlock = new MetadataResultsBlock();
+    int numServerThreads = Math.min(_numTasks, ResourceManager.DEFAULT_QUERY_WORKER_THREADS);
+    CombineOperatorUtils.setExecutionStatistics(finalBlock, _operators, _totalWorkerThreadCpuTimeNs.get(),
+        numServerThreads);
+    return finalBlock;
+  }
+
+  /**
+   * For group-by queries, when maxExecutionThreads is not explicitly configured, create one task per operator.
+   */
+  private static QueryContext overrideMaxExecutionThreads(QueryContext queryContext, int numOperators) {
+    int maxExecutionThreads = queryContext.getMaxExecutionThreads();
+    if (maxExecutionThreads <= 0) {
+      queryContext.setMaxExecutionThreads(numOperators);
+    }
+    return queryContext;
+  }
+
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+
+  /**
+   * Executes query on one segment in a worker thread and merges the results into the indexed table.
+   */
+  @Override
+  public void processSegments() {
+    int operatorId;
+    while (_processingException.get() == null && (operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
+      Operator operator = _operators.get(operatorId);
+      try {
+        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
+          ((AcquireReleaseColumnsSegmentOperator) operator).acquire();
+        }
+        GroupByResultsBlock resultsBlock = (GroupByResultsBlock) operator.nextBlock();
+        if (_indexedTable == null) {
+          synchronized (this) {
+            if (_indexedTable == null) {
+              DataSchema dataSchema = resultsBlock.getDataSchema();
+              // NOTE: Use trimSize as resultSize on server size.
+              if (_trimThreshold >= MAX_TRIM_THRESHOLD) {
+                // special case of trim threshold where it is set to max value.
+                // there won't be any trimming during upsert in this case.
+                // thus we can avoid the overhead of read-lock and write-lock
+                // in the upsert method.
+                _indexedTable = new UnboundedConcurrentIndexedTable(dataSchema, _queryContext, _trimSize);
+              } else {
+                _indexedTable =
+                    new ConcurrentIndexedTable(dataSchema, _queryContext, _trimSize, _trimSize, _trimThreshold);
+              }
+            }
+          }
+        }
+
+        // Set groups limit reached flag.
+        if (resultsBlock.isNumGroupsLimitReached()) {
+          _numGroupsLimitReached = true;
+        }
+
+        // Merge aggregation group-by result.
+        // Iterate over the group-by keys, for each key, update the group-by result in the indexedTable
+        Collection<IntermediateRecord> intermediateRecords = resultsBlock.getIntermediateRecords();
+        // Count the number of merged keys
+        int mergedKeys = 0;
+        // For now, only GroupBy OrderBy query has pre-constructed intermediate records
+        if (intermediateRecords == null) {
+          // Merge aggregation group-by result.
+          AggregationGroupByResult aggregationGroupByResult = resultsBlock.getAggregationGroupByResult();
+          if (aggregationGroupByResult != null) {
+            // Iterate over the group-by keys, for each key, update the group-by result in the indexedTable
+            Iterator<GroupKeyGenerator.GroupKey> dicGroupKeyIterator = aggregationGroupByResult.getGroupKeyIterator();
+            while (dicGroupKeyIterator.hasNext()) {
+              GroupKeyGenerator.GroupKey groupKey = dicGroupKeyIterator.next();
+              Object[] keys = groupKey._keys;
+              Object[] values = Arrays.copyOf(keys, _numColumns);
+              int groupId = groupKey._groupId;
+              for (int i = 0; i < _numAggregationFunctions; i++) {
+                values[_numGroupByExpressions + i] = aggregationGroupByResult.getResultForGroupId(i, groupId);
+              }
+              _indexedTable.upsert(new Key(keys), new Record(values));
+              Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(mergedKeys);
+              mergedKeys++;
+            }
+          }
+        } else {
+          for (IntermediateRecord intermediateResult : intermediateRecords) {
+            //TODO: change upsert api so that it accepts intermediateRecord directly
+            _indexedTable.upsert(intermediateResult._key, intermediateResult._record);
+            Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(mergedKeys);
+            mergedKeys++;
+          }
+        }
+      } finally {
+        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
+          ((AcquireReleaseColumnsSegmentOperator) operator).release();
+        }
+      }
+    }
+  }
+
+  // TODO: combine this with the single block group by combine operator
+  private BaseResultsBlock getFinalResult()
+      throws InterruptedException {
+    long timeoutMs = _queryContext.getEndTimeMs() - System.currentTimeMillis();
+    _opCompleted = _operatorLatch.await(timeoutMs, TimeUnit.MILLISECONDS);
+    if (!_opCompleted) {
+      // If this happens, the broker side should already timed out, just log the error and return
+      String errorMessage =
+          String.format("Timed out while combining group-by order-by results after %dms, queryContext = %s", timeoutMs,
+              _queryContext);
+      LOGGER.error(errorMessage);
+      return new ExceptionResultsBlock(new TimeoutException(errorMessage));
+    }
+
+    Throwable processingException = _processingException.get();
+    if (processingException != null) {
+      return new ExceptionResultsBlock(processingException);
+    }
+
+    IndexedTable indexedTable = _indexedTable;
+    if (!_queryContext.isServerReturnFinalResult()) {
+      indexedTable.finish(false);
+    } else {
+      indexedTable.finish(true, true);
+    }
+    GroupByResultsBlock mergedBlock = new GroupByResultsBlock(indexedTable);
+    mergedBlock.setNumGroupsLimitReached(_numGroupsLimitReached);
+    mergedBlock.setNumResizes(indexedTable.getNumResizes());
+    mergedBlock.setResizeTimeMs(indexedTable.getResizeTimeMs());
+    return mergedBlock;
+  }
+
+  @Override
+  public void onProcessSegmentsException(Throwable t) {
+    _processingException.compareAndSet(null, t);
+  }
+
+  @Override
+  public void onProcessSegmentsFinish() {
+    _operatorLatch.countDown();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingInstanceResponseOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingInstanceResponseOperator.java
index 4bbd21ba3c9..98688fb9542 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingInstanceResponseOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingInstanceResponseOperator.java
@@ -18,20 +18,32 @@
  */
 package org.apache.pinot.core.operator.streaming;
 
+import com.google.common.base.Preconditions;
 import io.grpc.stub.StreamObserver;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
+import org.apache.commons.lang.StringUtils;
+import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.common.proto.Server;
+import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.operator.InstanceResponseOperator;
 import org.apache.pinot.core.operator.blocks.InstanceResponseBlock;
+import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.MetadataResultsBlock;
 import org.apache.pinot.core.operator.combine.BaseCombineOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.FetchContext;
 import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.apache.pinot.spi.exception.QueryCancelledException;
+import org.apache.pinot.spi.trace.Tracing;
 
 
 public class StreamingInstanceResponseOperator extends InstanceResponseOperator {
+  private static final String EXPLAIN_NAME = "STREAMING_INSTANCE_RESPONSE";
 
   private final StreamObserver<Server.ServerResponse> _streamObserver;
 
@@ -42,17 +54,48 @@ public StreamingInstanceResponseOperator(BaseCombineOperator<?> combinedOperator
     _streamObserver = streamObserver;
   }
 
+  @SuppressWarnings("rawtypes")
   @Override
   protected InstanceResponseBlock getNextBlock() {
-    InstanceResponseBlock responseBlock = super.getNextBlock();
-    InstanceResponseBlock metadataOnlyResponseBlock = responseBlock.toMetadataOnlyResponseBlock();
+    BaseStreamingCombineOperator<?> streamingCombineOperator = (BaseStreamingCombineOperator) _combineOperator;
     try {
-      _streamObserver.onNext(StreamingResponseUtils.getDataResponse(responseBlock.toDataOnlyDataTable()));
-    } catch (IOException e) {
-      metadataOnlyResponseBlock.addException(
-          QueryException.getException(QueryException.DATA_TABLE_SERIALIZATION_ERROR, e));
+      prefetchAll();
+      streamingCombineOperator.start();
+      BaseResultsBlock resultsBlock = streamingCombineOperator.nextBlock();
+      while (!(resultsBlock instanceof MetadataResultsBlock)) {
+        if (resultsBlock instanceof ExceptionResultsBlock) {
+          return new InstanceResponseBlock(resultsBlock, _queryContext);
+        }
+        sendBlock(resultsBlock);
+        resultsBlock = streamingCombineOperator.nextBlock();
+      }
+      // Return a metadata-only block
+      return new InstanceResponseBlock(resultsBlock, _queryContext);
+    } catch (EarlyTerminationException e) {
+      Exception killedErrorMsg = Tracing.getThreadAccountant().getErrorStatus();
+      return new InstanceResponseBlock(new ExceptionResultsBlock(new QueryCancelledException(
+          "Cancelled while streaming results" + (killedErrorMsg == null ? StringUtils.EMPTY : " " + killedErrorMsg),
+          e)), _queryContext);
+    } catch (Exception e) {
+      return new InstanceResponseBlock(new ExceptionResultsBlock(QueryException.DATA_TABLE_SERIALIZATION_ERROR, e),
+          _queryContext);
+    } finally {
+      streamingCombineOperator.stop();
+      releaseAll();
     }
-    // return a metadata-only block.
-    return metadataOnlyResponseBlock;
+  }
+
+  private void sendBlock(BaseResultsBlock baseResultBlock)
+      throws IOException {
+    DataSchema dataSchema = baseResultBlock.getDataSchema(_queryContext);
+    Collection<Object[]> rows = baseResultBlock.getRows(_queryContext);
+    Preconditions.checkState(dataSchema != null && rows != null, "Malformed data block");
+    DataTable dataTable = baseResultBlock.getDataTable(_queryContext);
+    _streamObserver.onNext(StreamingResponseUtils.getDataResponse(dataTable));
+  }
+
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java
index 771eefdee4f..ca41a7c07ef 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java
@@ -18,50 +18,26 @@
  */
 package org.apache.pinot.core.operator.streaming;
 
-import io.grpc.stub.StreamObserver;
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
-import org.apache.pinot.common.datatable.DataTable;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.proto.Server;
-import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Operator;
-import org.apache.pinot.core.operator.AcquireReleaseColumnsSegmentOperator;
-import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
-import org.apache.pinot.core.operator.blocks.results.ExceptionResultsBlock;
-import org.apache.pinot.core.operator.blocks.results.MetadataResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
-import org.apache.pinot.core.operator.combine.BaseCombineOperator;
+import org.apache.pinot.core.operator.combine.merger.SelectionOnlyResultsBlockMerger;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
- * Combine operator for selection only streaming queries.
+ * Combine operator for selection queries with streaming response.
  */
 @SuppressWarnings("rawtypes")
-public class StreamingSelectionOnlyCombineOperator extends BaseCombineOperator<SelectionResultsBlock> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(StreamingSelectionOnlyCombineOperator.class);
-
-  private static final String EXPLAIN_NAME = "SELECT_STREAMING_COMBINE";
-
-  // Special results block to indicate that this is the last results block for an operator
-  private static final MetadataResultsBlock LAST_RESULTS_BLOCK = new MetadataResultsBlock();
-
-  private final StreamObserver<Server.ServerResponse> _streamObserver;
+public class StreamingSelectionOnlyCombineOperator extends BaseStreamingCombineOperator<SelectionResultsBlock> {
+  private static final String EXPLAIN_NAME = "STREAMING_COMBINE_SELECT";
   private final int _limit;
-  private final AtomicLong _numRowsCollected = new AtomicLong();
 
   public StreamingSelectionOnlyCombineOperator(List<Operator> operators, QueryContext queryContext,
-      ExecutorService executorService, StreamObserver<Server.ServerResponse> streamObserver) {
-    super(operators, queryContext, executorService);
-    _streamObserver = streamObserver;
+      ExecutorService executorService) {
+    super(new SelectionOnlyResultsBlockMerger(queryContext), operators, queryContext, executorService);
     _limit = queryContext.getLimit();
   }
 
@@ -71,71 +47,17 @@ public String toExplainString() {
   }
 
   @Override
-  protected void processSegments() {
-    int operatorId;
-    while ((operatorId = _nextOperatorId.getAndIncrement()) < _numOperators) {
-      Operator operator = _operators.get(operatorId);
-      SelectionResultsBlock resultsBlock;
-      try {
-        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
-          ((AcquireReleaseColumnsSegmentOperator) operator).acquire();
-        }
-        while ((resultsBlock = (SelectionResultsBlock) operator.nextBlock()) != null) {
-          Collection<Object[]> rows = resultsBlock.getRows();
-          assert rows != null;
-          long numRowsCollected = _numRowsCollected.addAndGet(rows.size());
-          _blockingQueue.offer(resultsBlock);
-          if (numRowsCollected >= _limit) {
-            return;
-          }
-        }
-      } finally {
-        if (operator instanceof AcquireReleaseColumnsSegmentOperator) {
-          ((AcquireReleaseColumnsSegmentOperator) operator).release();
-        }
-      }
-      _blockingQueue.offer(LAST_RESULTS_BLOCK);
-    }
+  protected boolean isChildOperatorSingleBlock() {
+    return false;
   }
 
   @Override
-  protected BaseResultsBlock mergeResults()
-      throws Exception {
-    long numRowsCollected = 0;
-    int numOperatorsFinished = 0;
-    long endTimeMs = _queryContext.getEndTimeMs();
-    while (numRowsCollected < _limit && numOperatorsFinished < _numOperators) {
-      BaseResultsBlock resultsBlock =
-          _blockingQueue.poll(endTimeMs - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
-      if (resultsBlock == null) {
-        // Query times out, skip streaming the remaining results blocks
-        LOGGER.error("Timed out while polling results block (query: {})", _queryContext);
-        return new ExceptionResultsBlock(QueryException.getException(QueryException.EXECUTION_TIMEOUT_ERROR,
-            new TimeoutException("Timed out while polling results block")));
-      }
-      if (resultsBlock.getProcessingExceptions() != null) {
-        // Caught exception while processing segment, skip streaming the remaining results blocks and directly return
-        // the exception
-        return resultsBlock;
-      }
-      if (resultsBlock == LAST_RESULTS_BLOCK) {
-        numOperatorsFinished++;
-        continue;
-      }
-      SelectionResultsBlock selectionResultsBlock = (SelectionResultsBlock) resultsBlock;
-      DataSchema dataSchema = selectionResultsBlock.getDataSchema();
-      Collection<Object[]> rows = selectionResultsBlock.getRows();
-      assert dataSchema != null && rows != null;
-      numRowsCollected += rows.size();
-      DataTable dataTable =
-          SelectionOperatorUtils.getDataTableFromRows(rows, dataSchema, _queryContext.isNullHandlingEnabled());
-      _streamObserver.onNext(StreamingResponseUtils.getDataResponse(dataTable));
-    }
-    // Return a metadata results block in the end
-    return new MetadataResultsBlock();
+  protected Object createQuerySatisfiedTracker() {
+    return new AtomicLong();
   }
 
   @Override
-  protected void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge) {
+  protected boolean isQuerySatisfied(SelectionResultsBlock resultsBlock, Object tracker) {
+    return ((AtomicLong) tracker).addAndGet(resultsBlock.getNumRows()) >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java
index 504a8cfe330..2527e63a2e2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java
@@ -25,36 +25,44 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.common.RowBasedBlockValueFetcher;
 import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
+import org.roaringbitmap.RoaringBitmap;
 
 
+/**
+ * Streaming only selection operator returns one block at a time not one block per-segment.
+ * This is for efficient streaming of data return on a selection-only situation.
+ *
+ * This optimization doesn't apply to any other combine/merge required operators.
+ */
 public class StreamingSelectionOnlyOperator extends BaseOperator<SelectionResultsBlock> {
-
   private static final String EXPLAIN_NAME = "SELECT_STREAMING";
 
   private final IndexSegment _indexSegment;
-  private final TransformOperator _transformOperator;
   private final List<ExpressionContext> _expressions;
+  private final BaseProjectOperator<?> _projectOperator;
   private final BlockValSet[] _blockValSets;
   private final DataSchema _dataSchema;
   private final int _limit;
+  private final boolean _nullHandlingEnabled;
+  private final RoaringBitmap[] _nullBitmaps;
 
   private int _numDocsScanned = 0;
 
   public StreamingSelectionOnlyOperator(IndexSegment indexSegment, QueryContext queryContext,
-      List<ExpressionContext> expressions, TransformOperator transformOperator) {
+      List<ExpressionContext> expressions, BaseProjectOperator<?> projectOperator) {
     _indexSegment = indexSegment;
-    _transformOperator = transformOperator;
     _expressions = expressions;
+    _projectOperator = projectOperator;
+    _nullHandlingEnabled = queryContext.isNullHandlingEnabled();
 
     int numExpressions = expressions.size();
     _blockValSets = new BlockValSet[numExpressions];
@@ -62,13 +70,13 @@ public StreamingSelectionOnlyOperator(IndexSegment indexSegment, QueryContext qu
     DataSchema.ColumnDataType[] columnDataTypes = new DataSchema.ColumnDataType[numExpressions];
     for (int i = 0; i < numExpressions; i++) {
       ExpressionContext expression = expressions.get(i);
-      TransformResultMetadata expressionMetadata = transformOperator.getResultMetadata(expression);
       columnNames[i] = expression.toString();
+      ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
       columnDataTypes[i] =
-          DataSchema.ColumnDataType.fromDataType(expressionMetadata.getDataType(), expressionMetadata.isSingleValue());
+          DataSchema.ColumnDataType.fromDataType(columnContext.getDataType(), columnContext.isSingleValue());
     }
     _dataSchema = new DataSchema(columnNames, columnDataTypes);
-
+    _nullBitmaps = _nullHandlingEnabled ? new RoaringBitmap[numExpressions] : null;
     _limit = queryContext.getLimit();
   }
 
@@ -79,20 +87,35 @@ protected SelectionResultsBlock getNextBlock() {
       // Already returned enough documents
       return null;
     }
-    TransformBlock transformBlock = _transformOperator.nextBlock();
-    if (transformBlock == null) {
+    ValueBlock valueBlock = _projectOperator.nextBlock();
+    if (valueBlock == null) {
       return null;
     }
     int numExpressions = _expressions.size();
     for (int i = 0; i < numExpressions; i++) {
-      _blockValSets[i] = transformBlock.getBlockValueSet(_expressions.get(i));
+      _blockValSets[i] = valueBlock.getBlockValueSet(_expressions.get(i));
     }
     RowBasedBlockValueFetcher blockValueFetcher = new RowBasedBlockValueFetcher(_blockValSets);
-    int numDocs = transformBlock.getNumDocs();
+    int numDocs = valueBlock.getNumDocs();
     int numDocsToReturn = Math.min(_limit - _numDocsScanned, numDocs);
     List<Object[]> rows = new ArrayList<>(numDocsToReturn);
-    for (int i = 0; i < numDocsToReturn; i++) {
-      rows.add(blockValueFetcher.getRow(i));
+    if (_nullHandlingEnabled) {
+      for (int i = 0; i < numExpressions; i++) {
+        _nullBitmaps[i] = _blockValSets[i].getNullBitmap();
+      }
+      for (int docId = 0; docId < numDocsToReturn; docId++) {
+        Object[] values = blockValueFetcher.getRow(docId);
+        for (int colId = 0; colId < numExpressions; colId++) {
+          if (_nullBitmaps[colId] != null && _nullBitmaps[colId].contains(docId)) {
+            values[colId] = null;
+          }
+        }
+        rows.add(values);
+      }
+    } else {
+      for (int i = 0; i < numDocsToReturn; i++) {
+        rows.add(blockValueFetcher.getRow(i));
+      }
     }
     _numDocsScanned += numDocs;
     return new SelectionResultsBlock(_dataSchema, rows);
@@ -104,14 +127,14 @@ public String toExplainString() {
   }
 
   @Override
-  public List<Operator> getChildOperators() {
-    return Collections.singletonList(_transformOperator);
+  public List<BaseProjectOperator<?>> getChildOperators() {
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    long numEntriesScannedInFilter = _transformOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
-    long numEntriesScannedPostFilter = (long) _numDocsScanned * _transformOperator.getNumColumnsProjected();
+    long numEntriesScannedInFilter = _projectOperator.getExecutionStatistics().getNumEntriesScannedInFilter();
+    long numEntriesScannedPostFilter = (long) _numDocsScanned * _projectOperator.getNumColumnsProjected();
     int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
     return new ExecutionStatistics(_numDocsScanned, numEntriesScannedInFilter, numEntriesScannedPostFilter,
         numTotalDocs);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOrderByCombineOperator.java
new file mode 100644
index 00000000000..064b2ebf3aa
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOrderByCombineOperator.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.core.operator.streaming;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.operator.combine.merger.SelectionOrderByResultsBlockMerger;
+import org.apache.pinot.core.query.request.context.QueryContext;
+
+
+/**
+ * Combine operator for selection queries with order-by, with streaming response.
+ */
+@SuppressWarnings("rawtypes")
+public class StreamingSelectionOrderByCombineOperator extends BaseStreamingCombineOperator<SelectionResultsBlock> {
+  private static final String EXPLAIN_NAME = "STREAMING_COMBINE_SELECT_ORDERBY";
+
+  public StreamingSelectionOrderByCombineOperator(List<Operator> operators, QueryContext queryContext,
+      ExecutorService executorService) {
+    super(new SelectionOrderByResultsBlockMerger(queryContext), operators, queryContext, executorService);
+  }
+
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java
deleted file mode 100644
index 75991bf7eaa..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.operator.transform;
-
-import java.util.Collection;
-import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.operator.ProjectionOperator;
-import org.apache.pinot.core.operator.blocks.PassThroughTransformBlock;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
-
-
-/**
- * Class for evaluating pass through transform expressions.
- */
-public class PassThroughTransformOperator extends TransformOperator {
-
-  private static final String EXPLAIN_NAME = "TRANSFORM_PASSTHROUGH";
-
-  /**
-   * Constructor for the class
-   *
-   * @param projectionOperator Projection operator
-   * @param expressions Collection of expressions to evaluate
-   */
-  public PassThroughTransformOperator(ProjectionOperator projectionOperator,
-      Collection<ExpressionContext> expressions) {
-    super(projectionOperator, expressions);
-  }
-
-  @Override
-  protected PassThroughTransformBlock getNextBlock() {
-    ProjectionBlock projectionBlock = _projectionOperator.nextBlock();
-    if (projectionBlock == null) {
-      return null;
-    } else {
-      return new PassThroughTransformBlock(projectionBlock, _transformFunctionMap);
-    }
-  }
-
-
-  @Override
-  public String toExplainString() {
-    return toExplainString(EXPLAIN_NAME);
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java
index 9f52fe839d9..90576a4893c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java
@@ -18,133 +18,84 @@
  */
 package org.apache.pinot.core.operator.transform;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.Operator;
-import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.ExecutionStatistics;
-import org.apache.pinot.core.operator.ProjectionOperator;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
 import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.function.TransformFunction;
 import org.apache.pinot.core.operator.transform.function.TransformFunctionFactory;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.trace.Tracing;
 
 
 /**
  * Class for evaluating transform expressions.
  */
-public class TransformOperator extends BaseOperator<TransformBlock> {
+public class TransformOperator extends BaseProjectOperator<TransformBlock> {
   private static final String EXPLAIN_NAME = "TRANSFORM";
 
-  protected final ProjectionOperator _projectionOperator;
-  protected final Map<String, DataSource> _dataSourceMap;
-  protected final Map<ExpressionContext, TransformFunction> _transformFunctionMap = new HashMap<>();
+  private final BaseProjectOperator<?> _projectOperator;
+  private final Map<ExpressionContext, TransformFunction> _transformFunctionMap;
 
-  /**
-   *
-   * @param queryContext the query context
-   * @param projectionOperator Projection operator
-   * @param expressions Collection of expressions to evaluate
-   */
-  public TransformOperator(@Nullable QueryContext queryContext, ProjectionOperator projectionOperator,
+  public TransformOperator(QueryContext queryContext, BaseProjectOperator<?> projectOperator,
       Collection<ExpressionContext> expressions) {
-    _projectionOperator = projectionOperator;
-    _dataSourceMap = projectionOperator.getDataSourceMap();
+    _projectOperator = projectOperator;
+    _transformFunctionMap = new HashMap<>(HashUtil.getHashMapCapacity(expressions.size()));
     for (ExpressionContext expression : expressions) {
-      TransformFunction transformFunction = TransformFunctionFactory.get(queryContext, expression, _dataSourceMap);
+      TransformFunction transformFunction =
+          TransformFunctionFactory.get(expression, projectOperator.getSourceColumnContextMap(), queryContext);
       _transformFunctionMap.put(expression, transformFunction);
     }
   }
 
-  /**
-   *
-   * @param projectionOperator Projection operator
-   * @param expressions Collection of expressions to evaluate
-   */
-  public TransformOperator(ProjectionOperator projectionOperator, Collection<ExpressionContext> expressions) {
-    this(null, projectionOperator, expressions);
-  }
-
-  /**
-   * Returns the number of columns projected.
-   *
-   * @return Number of columns projected
-   */
-  public int getNumColumnsProjected() {
-    return _dataSourceMap.size();
-  }
-
-  /**
-   * Returns the transform result metadata associated with the given expression.
-   *
-   * @param expression Expression
-   * @return Transform result metadata
-   */
-  public TransformResultMetadata getResultMetadata(ExpressionContext expression) {
-    return _transformFunctionMap.get(expression).getResultMetadata();
+  @Override
+  public Map<String, ColumnContext> getSourceColumnContextMap() {
+    return _projectOperator.getSourceColumnContextMap();
   }
 
-  /**
-   * Returns the dictionary associated with the given expression if the transform result is dictionary-encoded, or
-   * {@code null} if not.
-   *
-   * @return Dictionary
-   */
-  public Dictionary getDictionary(ExpressionContext expression) {
-    return _transformFunctionMap.get(expression).getDictionary();
+  @Override
+  public ColumnContext getResultColumnContext(ExpressionContext expression) {
+    return ColumnContext.fromTransformFunction(_transformFunctionMap.get(expression));
   }
 
   @Override
   protected TransformBlock getNextBlock() {
-    ProjectionBlock projectionBlock = _projectionOperator.nextBlock();
-    if (projectionBlock == null) {
+    ValueBlock sourceBlock = _projectOperator.nextBlock();
+    if (sourceBlock == null) {
       return null;
-    } else {
-      Tracing.activeRecording().setNumChildren(_dataSourceMap.size());
-      return new TransformBlock(projectionBlock, _transformFunctionMap);
     }
+    Tracing.activeRecording().setNumChildren(_transformFunctionMap.size());
+    return new TransformBlock(sourceBlock, _transformFunctionMap);
   }
 
-
   @Override
   public String toExplainString() {
-    return toExplainString(EXPLAIN_NAME);
+    List<String> expressions =
+        _transformFunctionMap.keySet().stream().map(ExpressionContext::toString).sorted().collect(Collectors.toList());
+    return getExplainName() + "(" + StringUtils.join(expressions, ", ") + ")";
   }
-  public String toExplainString(String explainName) {
-    ExpressionContext[] functions = _transformFunctionMap.keySet().toArray(new ExpressionContext[0]);
-
-    // Sort to make the order, in which names appear within the operator, deterministic.
-    Arrays.sort(functions, Comparator.comparing(ExpressionContext::toString));
-
-    StringBuilder stringBuilder = new StringBuilder(explainName).append("(");
-    if (functions != null && functions.length > 0) {
-      stringBuilder.append(functions[0].toString());
-      for (int i = 1; i < functions.length; i++) {
-        stringBuilder.append(", ").append(functions[i].toString());
-      }
-    }
 
-    return stringBuilder.append(')').toString();
+  protected String getExplainName() {
+    return EXPLAIN_NAME;
   }
 
   @Override
-  public List<Operator> getChildOperators() {
-    return Collections.singletonList(_projectionOperator);
+  public List<BaseProjectOperator<?>> getChildOperators() {
+    return Collections.singletonList(_projectOperator);
   }
 
   @Override
   public ExecutionStatistics getExecutionStatistics() {
-    return _projectionOperator.getExecutionStatistics();
+    return _projectOperator.getExecutionStatistics();
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunction.java
index 5cd0a3ab741..101afec48f1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunction.java
@@ -23,9 +23,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are more than 1 arguments
     if (arguments.size() < 2) {
       throw new IllegalArgumentException("At least 2 arguments are required for ADD transform function");
@@ -56,10 +57,10 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
         LiteralTransformFunction literalTransformFunction = (LiteralTransformFunction) argument;
         DataType dataType = literalTransformFunction.getResultMetadata().getDataType();
         if (dataType == DataType.BIG_DECIMAL) {
-          _literalBigDecimalSum = _literalBigDecimalSum.add(new BigDecimal(literalTransformFunction.getLiteral()));
+          _literalBigDecimalSum = _literalBigDecimalSum.add(literalTransformFunction.getBigDecimalLiteral());
           _resultDataType = DataType.BIG_DECIMAL;
         } else {
-          _literalDoubleSum += Double.parseDouble(((LiteralTransformFunction) argument).getLiteral());
+          _literalDoubleSum += ((LiteralTransformFunction) argument).getDoubleLiteral();
         }
       } else {
         if (!argument.getResultMetadata().isSingleValue()) {
@@ -85,18 +86,16 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     if (_resultDataType == DataType.BIG_DECIMAL) {
-      BigDecimal[] values = transformToBigDecimalValuesSV(projectionBlock);
+      BigDecimal[] values = transformToBigDecimalValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _doubleValuesSV, length);
     } else {
       Arrays.fill(_doubleValuesSV, 0, length, _literalDoubleSum);
       for (TransformFunction transformFunction : _transformFunctions) {
-        double[] values = transformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] values = transformFunction.transformToDoubleValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _doubleValuesSV[i] += values[i];
         }
@@ -106,18 +105,16 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     if (_resultDataType == DataType.DOUBLE) {
-      double[] values = transformToDoubleValuesSV(projectionBlock);
+      double[] values = transformToDoubleValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _bigDecimalValuesSV, length);
     } else {
       Arrays.fill(_bigDecimalValuesSV, 0, length, _literalBigDecimalSum);
       for (TransformFunction transformFunction : _transformFunctions) {
-        BigDecimal[] values = transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] values = transformFunction.transformToBigDecimalValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _bigDecimalValuesSV[i] = _bigDecimalValuesSV[i].add(values[i]);
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayAverageTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayAverageTransformFunction.java
index 3767b423d80..2ef7a5f6b40 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayAverageTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayAverageTransformFunction.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 /**
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there is only 1 argument
     if (arguments.size() != 1) {
       throw new IllegalArgumentException("Exactly 1 argument is required for ArrayAverage transform function");
@@ -68,14 +69,12 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     switch (_argument.getResultMetadata().getDataType().getStoredType()) {
       case INT:
-        int[][] intValuesMV = _argument.transformToIntValuesMV(projectionBlock);
+        int[][] intValuesMV = _argument.transformToIntValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           double sumRes = 0;
           for (int value : intValuesMV[i]) {
@@ -85,7 +84,7 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
         }
         break;
       case LONG:
-        long[][] longValuesMV = _argument.transformToLongValuesMV(projectionBlock);
+        long[][] longValuesMV = _argument.transformToLongValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           double sumRes = 0;
           for (long value : longValuesMV[i]) {
@@ -95,7 +94,7 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
         }
         break;
       case FLOAT:
-        float[][] floatValuesMV = _argument.transformToFloatValuesMV(projectionBlock);
+        float[][] floatValuesMV = _argument.transformToFloatValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           double sumRes = 0;
           for (float value : floatValuesMV[i]) {
@@ -105,7 +104,7 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
         }
         break;
       case DOUBLE:
-        double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(projectionBlock);
+        double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           double sumRes = 0;
           for (double value : doubleValuesMV[i]) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayLengthTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayLengthTransformFunction.java
index 7cd8e4e1bdf..8b65c42f268 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayLengthTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayLengthTransformFunction.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 /**
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there is only 1 argument
     if (arguments.size() != 1) {
       throw new IllegalArgumentException("Exactly 1 argument is required for ARRAYLENGTH transform function");
@@ -65,38 +66,36 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     switch (_argument.getResultMetadata().getDataType().getStoredType()) {
       case INT:
-        int[][] intValuesMV = _argument.transformToIntValuesMV(projectionBlock);
+        int[][] intValuesMV = _argument.transformToIntValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = intValuesMV[i].length;
         }
         break;
       case LONG:
-        long[][] longValuesMV = _argument.transformToLongValuesMV(projectionBlock);
+        long[][] longValuesMV = _argument.transformToLongValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = longValuesMV[i].length;
         }
         break;
       case FLOAT:
-        float[][] floatValuesMV = _argument.transformToFloatValuesMV(projectionBlock);
+        float[][] floatValuesMV = _argument.transformToFloatValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = floatValuesMV[i].length;
         }
         break;
       case DOUBLE:
-        double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(projectionBlock);
+        double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = doubleValuesMV[i].length;
         }
         break;
       case STRING:
-        String[][] stringValuesMV = _argument.transformToStringValuesMV(projectionBlock);
+        String[][] stringValuesMV = _argument.transformToStringValuesMV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = stringValuesMV[i].length;
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMaxTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMaxTransformFunction.java
index bc831e70e2e..68c95bce3ca 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMaxTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMaxTransformFunction.java
@@ -21,9 +21,9 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
 
@@ -47,7 +47,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there is only 1 argument
     if (arguments.size() != 1) {
       throw new IllegalArgumentException("Exactly 1 argument is required for ArrayMax transform function");
@@ -69,15 +70,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesSV(projectionBlock);
+      return super.transformToIntValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
-    int[][] intValuesMV = _argument.transformToIntValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
+    int[][] intValuesMV = _argument.transformToIntValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       int maxRes = Integer.MIN_VALUE;
       for (int value : intValuesMV[i]) {
@@ -89,15 +88,13 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
+      return super.transformToLongValuesSV(valueBlock);
     }
-    long[][] longValuesMV = _argument.transformToLongValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
+    long[][] longValuesMV = _argument.transformToLongValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       long maxRes = Long.MIN_VALUE;
       for (long value : longValuesMV[i]) {
@@ -109,15 +106,13 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[length];
+      return super.transformToFloatValuesSV(valueBlock);
     }
-    float[][] floatValuesMV = _argument.transformToFloatValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initFloatValuesSV(length);
+    float[][] floatValuesMV = _argument.transformToFloatValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       float maxRes = Float.NEGATIVE_INFINITY;
       for (float value : floatValuesMV[i]) {
@@ -129,15 +124,13 @@ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesSV(projectionBlock);
+      return super.transformToDoubleValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       double maxRes = Double.NEGATIVE_INFINITY;
       for (double value : doubleValuesMV[i]) {
@@ -149,15 +142,13 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
+      return super.transformToStringValuesSV(valueBlock);
     }
-    String[][] stringValuesMV = _argument.transformToStringValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
+    String[][] stringValuesMV = _argument.transformToStringValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       String maxRes = null;
       for (String value : stringValuesMV[i]) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMinTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMinTransformFunction.java
index 1dca59c6bdf..bf0018753cc 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMinTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArrayMinTransformFunction.java
@@ -21,9 +21,9 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
 
@@ -47,7 +47,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there is only 1 argument
     if (arguments.size() != 1) {
       throw new IllegalArgumentException("Exactly 1 argument is required for ArrayMin transform function");
@@ -69,15 +70,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesSV(projectionBlock);
+      return super.transformToIntValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
-    int[][] intValuesMV = _argument.transformToIntValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
+    int[][] intValuesMV = _argument.transformToIntValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       int minRes = Integer.MAX_VALUE;
       for (int value : intValuesMV[i]) {
@@ -89,15 +88,13 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
+      return super.transformToLongValuesSV(valueBlock);
     }
-    long[][] longValuesMV = _argument.transformToLongValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
+    long[][] longValuesMV = _argument.transformToLongValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       long minRes = Long.MAX_VALUE;
       for (long value : longValuesMV[i]) {
@@ -109,15 +106,13 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[length];
+      return super.transformToFloatValuesSV(valueBlock);
     }
-    float[][] floatValuesMV = _argument.transformToFloatValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initFloatValuesSV(length);
+    float[][] floatValuesMV = _argument.transformToFloatValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       float minRes = Float.POSITIVE_INFINITY;
       for (float value : floatValuesMV[i]) {
@@ -129,15 +124,13 @@ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesSV(projectionBlock);
+      return super.transformToDoubleValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       double minRes = Double.POSITIVE_INFINITY;
       for (double value : doubleValuesMV[i]) {
@@ -149,15 +142,13 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_argument.getResultMetadata().getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
+      return super.transformToStringValuesSV(valueBlock);
     }
-    String[][] stringValuesMV = _argument.transformToStringValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
+    String[][] stringValuesMV = _argument.transformToStringValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       String minRes = null;
       for (String value : stringValuesMV[i]) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArraySumTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArraySumTransformFunction.java
index 143cce2204f..3ad7c1b7bce 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArraySumTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ArraySumTransformFunction.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 /**
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there is only 1 argument
     if (arguments.size() != 1) {
       throw new IllegalArgumentException("Exactly 1 argument is required for ArraySum transform function");
@@ -68,12 +69,10 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(projectionBlock);
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    double[][] doubleValuesMV = _argument.transformToDoubleValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       double sumRes = 0;
       for (double value : doubleValuesMV[i]) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunction.java
index b40f1c6a9ba..caa97f60bc6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunction.java
@@ -19,11 +19,18 @@
 package org.apache.pinot.core.operator.transform.function;
 
 import java.math.BigDecimal;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -70,9 +77,10 @@ public abstract class BaseTransformFunction implements TransformFunction {
       new TransformResultMetadata(DataType.STRING, false, false);
   protected static final TransformResultMetadata JSON_MV_NO_DICTIONARY_METADATA =
       new TransformResultMetadata(DataType.JSON, false, false);
-  // TODO: Support MV BYTES
   protected static final TransformResultMetadata BYTES_MV_NO_DICTIONARY_METADATA =
       new TransformResultMetadata(DataType.BYTES, false, false);
+  protected static final TransformResultMetadata UNKNOWN_METADATA =
+      new TransformResultMetadata(DataType.UNKNOWN, true, false);
 
   // These buffers are used to hold the result for different result types. When the subclass overrides a method, it can
   // reuse the buffer for that method. E.g. if transformToIntValuesSV is overridden, the result can be written into
@@ -91,54 +99,94 @@ public abstract class BaseTransformFunction implements TransformFunction {
   protected String[][] _stringValuesMV;
   protected byte[][][] _bytesValuesMV;
 
+  protected List<TransformFunction> _arguments;
+  protected boolean _nullHandlingEnabled;
+
+  protected void fillResultUnknown(int length) {
+    for (int i = 0; i < length; i++) {
+      _intValuesSV[i] = (int) DataSchema.ColumnDataType.INT.getNullPlaceholder();
+    }
+  }
+
+  // NOTE: this init has to be called for default getNullBitmap() implementation to be effective.
+  @Override
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    _arguments = arguments;
+  }
+
+  @Override
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap,
+      boolean nullHandlingEnabled) {
+    init(arguments, columnContextMap);
+    _nullHandlingEnabled = nullHandlingEnabled;
+  }
+
   @Override
   public Dictionary getDictionary() {
     return null;
   }
 
   @Override
-  public int[] transformToDictIdsSV(ProjectionBlock projectionBlock) {
+  public int[] transformToDictIdsSV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public int[][] transformToDictIdsMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToDictIdsMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
+  protected void initIntValuesSV(int length) {
+    if (_intValuesSV == null || _intValuesSV.length < length) {
       _intValuesSV = new int[length];
     }
+  }
+
+  protected void initZeroFillingIntValuesSV(int length) {
+    if (_intValuesSV == null || _intValuesSV.length < length) {
+      _intValuesSV = new int[length];
+    } else {
+      Arrays.fill(_intValuesSV, 0, length, 0);
+    }
+  }
+
+  @Override
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readIntValues(dictIds, length, _intValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case LONG:
-          long[] longValues = transformToLongValuesSV(projectionBlock);
+          long[] longValues = transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copy(longValues, _intValuesSV, length);
           break;
         case FLOAT:
-          float[] floatValues = transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = transformToFloatValuesSV(valueBlock);
           ArrayCopyUtils.copy(floatValues, _intValuesSV, length);
           break;
         case DOUBLE:
-          double[] doubleValues = transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = transformToDoubleValuesSV(valueBlock);
           ArrayCopyUtils.copy(doubleValues, _intValuesSV, length);
           break;
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _intValuesSV, length);
           break;
         case STRING:
-          String[] stringValues = transformToStringValuesSV(projectionBlock);
+          String[] stringValues = transformToStringValuesSV(valueBlock);
           ArrayCopyUtils.copy(stringValues, _intValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _intValuesSV[i] = (int) DataSchema.ColumnDataType.INT.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as INT", resultDataType));
       }
@@ -146,39 +194,49 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
     return _intValuesSV;
   }
 
-  @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
+  protected void initLongValuesSV(int length) {
+    if (_longValuesSV == null || _longValuesSV.length < length) {
       _longValuesSV = new long[length];
     }
+  }
+
+  @Override
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readLongValues(dictIds, length, _longValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[] intValues = transformToIntValuesSV(projectionBlock);
+          int[] intValues = transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copy(intValues, _longValuesSV, length);
           break;
         case FLOAT:
-          float[] floatValues = transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = transformToFloatValuesSV(valueBlock);
           ArrayCopyUtils.copy(floatValues, _longValuesSV, length);
           break;
         case DOUBLE:
-          double[] doubleValues = transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = transformToDoubleValuesSV(valueBlock);
           ArrayCopyUtils.copy(doubleValues, _longValuesSV, length);
           break;
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _longValuesSV, length);
           break;
         case STRING:
-          String[] stringValues = transformToStringValuesSV(projectionBlock);
+          String[] stringValues = transformToStringValuesSV(valueBlock);
           ArrayCopyUtils.copy(stringValues, _longValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _longValuesSV[i] = (long) DataSchema.ColumnDataType.LONG.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as LONG", resultDataType));
       }
@@ -186,39 +244,49 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
     return _longValuesSV;
   }
 
-  @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
+  protected void initFloatValuesSV(int length) {
+    if (_floatValuesSV == null || _floatValuesSV.length < length) {
       _floatValuesSV = new float[length];
     }
+  }
+
+  @Override
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initFloatValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readFloatValues(dictIds, length, _floatValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[] intValues = transformToIntValuesSV(projectionBlock);
+          int[] intValues = transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copy(intValues, _floatValuesSV, length);
           break;
         case LONG:
-          long[] longValues = transformToLongValuesSV(projectionBlock);
+          long[] longValues = transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copy(longValues, _floatValuesSV, length);
           break;
         case DOUBLE:
-          double[] doubleValues = transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = transformToDoubleValuesSV(valueBlock);
           ArrayCopyUtils.copy(doubleValues, _floatValuesSV, length);
           break;
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _floatValuesSV, length);
           break;
         case STRING:
-          String[] stringValues = transformToStringValuesSV(projectionBlock);
+          String[] stringValues = transformToStringValuesSV(valueBlock);
           ArrayCopyUtils.copy(stringValues, _floatValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _floatValuesSV[i] = (float) DataSchema.ColumnDataType.FLOAT.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as FLOAT", resultDataType));
       }
@@ -226,39 +294,49 @@ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
     return _floatValuesSV;
   }
 
-  @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
+  protected void initDoubleValuesSV(int length) {
+    if (_doubleValuesSV == null || _doubleValuesSV.length < length) {
       _doubleValuesSV = new double[length];
     }
+  }
+
+  @Override
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readDoubleValues(dictIds, length, _doubleValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[] intValues = transformToIntValuesSV(projectionBlock);
+          int[] intValues = transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copy(intValues, _doubleValuesSV, length);
           break;
         case LONG:
-          long[] longValues = transformToLongValuesSV(projectionBlock);
+          long[] longValues = transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copy(longValues, _doubleValuesSV, length);
           break;
         case FLOAT:
-          float[] floatValues = transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = transformToFloatValuesSV(valueBlock);
           ArrayCopyUtils.copy(floatValues, _doubleValuesSV, length);
           break;
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _doubleValuesSV, length);
           break;
         case STRING:
-          String[] stringValues = transformToStringValuesSV(projectionBlock);
+          String[] stringValues = transformToStringValuesSV(valueBlock);
           ArrayCopyUtils.copy(stringValues, _doubleValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _doubleValuesSV[i] = (double) DataSchema.ColumnDataType.DOUBLE.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as DOUBLE", resultDataType));
       }
@@ -266,43 +344,53 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
     return _doubleValuesSV;
   }
 
-  @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
+  protected void initBigDecimalValuesSV(int length) {
+    if (_bigDecimalValuesSV == null || _bigDecimalValuesSV.length < length) {
       _bigDecimalValuesSV = new BigDecimal[length];
     }
+  }
+
+  @Override
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readBigDecimalValues(dictIds, length, _bigDecimalValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[] intValues = transformToIntValuesSV(projectionBlock);
+          int[] intValues = transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copy(intValues, _bigDecimalValuesSV, length);
           break;
         case LONG:
-          long[] longValues = transformToLongValuesSV(projectionBlock);
+          long[] longValues = transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copy(longValues, _bigDecimalValuesSV, length);
           break;
         case FLOAT:
-          float[] floatValues = transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = transformToFloatValuesSV(valueBlock);
           ArrayCopyUtils.copy(floatValues, _bigDecimalValuesSV, length);
           break;
         case DOUBLE:
-          double[] doubleValues = transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = transformToDoubleValuesSV(valueBlock);
           ArrayCopyUtils.copy(doubleValues, _bigDecimalValuesSV, length);
           break;
         case STRING:
-          String[] stringValues = transformToStringValuesSV(projectionBlock);
+          String[] stringValues = transformToStringValuesSV(valueBlock);
           ArrayCopyUtils.copy(stringValues, _bigDecimalValuesSV, length);
           break;
         case BYTES:
-          byte[][] bytesValues = transformToBytesValuesSV(projectionBlock);
+          byte[][] bytesValues = transformToBytesValuesSV(valueBlock);
           ArrayCopyUtils.copy(bytesValues, _bigDecimalValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _bigDecimalValuesSV[i] = (BigDecimal) DataSchema.ColumnDataType.BIG_DECIMAL.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as BIG_DECIMAL", resultDataType));
       }
@@ -310,43 +398,53 @@ public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBloc
     return _bigDecimalValuesSV;
   }
 
-  @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
+  protected void initStringValuesSV(int length) {
+    if (_stringValuesSV == null || _stringValuesSV.length < length) {
       _stringValuesSV = new String[length];
     }
+  }
+
+  @Override
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readStringValues(dictIds, length, _stringValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[] intValues = transformToIntValuesSV(projectionBlock);
+          int[] intValues = transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copy(intValues, _stringValuesSV, length);
           break;
         case LONG:
-          long[] longValues = transformToLongValuesSV(projectionBlock);
+          long[] longValues = transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copy(longValues, _stringValuesSV, length);
           break;
         case FLOAT:
-          float[] floatValues = transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = transformToFloatValuesSV(valueBlock);
           ArrayCopyUtils.copy(floatValues, _stringValuesSV, length);
           break;
         case DOUBLE:
-          double[] doubleValues = transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = transformToDoubleValuesSV(valueBlock);
           ArrayCopyUtils.copy(doubleValues, _stringValuesSV, length);
           break;
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _stringValuesSV, length);
           break;
         case BYTES:
-          byte[][] bytesValues = transformToBytesValuesSV(projectionBlock);
+          byte[][] bytesValues = transformToBytesValuesSV(valueBlock);
           ArrayCopyUtils.copy(bytesValues, _stringValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _stringValuesSV[i] = (String) DataSchema.ColumnDataType.STRING.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as STRING", resultDataType));
       }
@@ -354,27 +452,37 @@ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
     return _stringValuesSV;
   }
 
-  @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bytesValuesSV == null) {
+  protected void initBytesValuesSV(int length) {
+    if (_bytesValuesSV == null || _bytesValuesSV.length < length) {
       _bytesValuesSV = new byte[length][];
     }
+  }
+
+  @Override
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBytesValuesSV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[] dictIds = transformToDictIdsSV(projectionBlock);
+      int[] dictIds = transformToDictIdsSV(valueBlock);
       dictionary.readBytesValues(dictIds, length, _bytesValuesSV);
     } else {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _bytesValuesSV, length);
           break;
         case STRING:
-          String[] stringValues = transformToStringValuesSV(projectionBlock);
+          String[] stringValues = transformToStringValuesSV(valueBlock);
           ArrayCopyUtils.copy(stringValues, _bytesValuesSV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _bytesValuesSV[i] = (byte[]) DataSchema.ColumnDataType.BYTES.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read SV %s as BYTES", resultDataType));
       }
@@ -382,15 +490,19 @@ public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
     return _bytesValuesSV;
   }
 
-  @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesMV == null) {
+  protected void initIntValuesMV(int length) {
+    if (_intValuesMV == null || _intValuesMV.length < length) {
       _intValuesMV = new int[length][];
     }
+  }
+
+  @Override
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesMV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[][] dictIdsMV = transformToDictIdsMV(projectionBlock);
+      int[][] dictIdsMV = transformToDictIdsMV(valueBlock);
       for (int i = 0; i < length; i++) {
         int[] dictIds = dictIdsMV[i];
         int numValues = dictIds.length;
@@ -402,21 +514,27 @@ public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case LONG:
-          long[][] longValuesMV = transformToLongValuesMV(projectionBlock);
+          long[][] longValuesMV = transformToLongValuesMV(valueBlock);
           ArrayCopyUtils.copy(longValuesMV, _intValuesMV, length);
           break;
         case FLOAT:
-          float[][] floatValuesMV = transformToFloatValuesMV(projectionBlock);
+          float[][] floatValuesMV = transformToFloatValuesMV(valueBlock);
           ArrayCopyUtils.copy(floatValuesMV, _intValuesMV, length);
           break;
         case DOUBLE:
-          double[][] doubleValuesMV = transformToDoubleValuesMV(projectionBlock);
+          double[][] doubleValuesMV = transformToDoubleValuesMV(valueBlock);
           ArrayCopyUtils.copy(doubleValuesMV, _intValuesMV, length);
           break;
         case STRING:
-          String[][] stringValuesMV = transformToStringValuesMV(projectionBlock);
+          String[][] stringValuesMV = transformToStringValuesMV(valueBlock);
           ArrayCopyUtils.copy(stringValuesMV, _intValuesMV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _intValuesMV[i] = (int[]) DataSchema.ColumnDataType.INT_ARRAY.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read MV %s as INT", resultDataType));
       }
@@ -424,15 +542,19 @@ public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
     return _intValuesMV;
   }
 
-  @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesMV == null) {
+  protected void initLongValuesMV(int length) {
+    if (_longValuesMV == null || _longValuesMV.length < length) {
       _longValuesMV = new long[length][];
     }
+  }
+
+  @Override
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesMV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[][] dictIdsMV = transformToDictIdsMV(projectionBlock);
+      int[][] dictIdsMV = transformToDictIdsMV(valueBlock);
       for (int i = 0; i < length; i++) {
         int[] dictIds = dictIdsMV[i];
         int numValues = dictIds.length;
@@ -444,21 +566,27 @@ public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[][] intValuesMV = transformToIntValuesMV(projectionBlock);
+          int[][] intValuesMV = transformToIntValuesMV(valueBlock);
           ArrayCopyUtils.copy(intValuesMV, _longValuesMV, length);
           break;
         case FLOAT:
-          float[][] floatValuesMV = transformToFloatValuesMV(projectionBlock);
+          float[][] floatValuesMV = transformToFloatValuesMV(valueBlock);
           ArrayCopyUtils.copy(floatValuesMV, _longValuesMV, length);
           break;
         case DOUBLE:
-          double[][] doubleValuesMV = transformToDoubleValuesMV(projectionBlock);
+          double[][] doubleValuesMV = transformToDoubleValuesMV(valueBlock);
           ArrayCopyUtils.copy(doubleValuesMV, _longValuesMV, length);
           break;
         case STRING:
-          String[][] stringValuesMV = transformToStringValuesMV(projectionBlock);
+          String[][] stringValuesMV = transformToStringValuesMV(valueBlock);
           ArrayCopyUtils.copy(stringValuesMV, _longValuesMV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _longValuesMV[i] = (long[]) DataSchema.ColumnDataType.LONG_ARRAY.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read MV %s as LONG", resultDataType));
       }
@@ -466,15 +594,19 @@ public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
     return _longValuesMV;
   }
 
-  @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesMV == null) {
+  protected void initFloatValuesMV(int length) {
+    if (_floatValuesMV == null || _floatValuesMV.length < length) {
       _floatValuesMV = new float[length][];
     }
+  }
+
+  @Override
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initFloatValuesMV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[][] dictIdsMV = transformToDictIdsMV(projectionBlock);
+      int[][] dictIdsMV = transformToDictIdsMV(valueBlock);
       for (int i = 0; i < length; i++) {
         int[] dictIds = dictIdsMV[i];
         int numValues = dictIds.length;
@@ -486,21 +618,27 @@ public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[][] intValuesMV = transformToIntValuesMV(projectionBlock);
+          int[][] intValuesMV = transformToIntValuesMV(valueBlock);
           ArrayCopyUtils.copy(intValuesMV, _floatValuesMV, length);
           break;
         case LONG:
-          long[][] longValuesMV = transformToLongValuesMV(projectionBlock);
+          long[][] longValuesMV = transformToLongValuesMV(valueBlock);
           ArrayCopyUtils.copy(longValuesMV, _floatValuesMV, length);
           break;
         case DOUBLE:
-          double[][] doubleValuesMV = transformToDoubleValuesMV(projectionBlock);
+          double[][] doubleValuesMV = transformToDoubleValuesMV(valueBlock);
           ArrayCopyUtils.copy(doubleValuesMV, _floatValuesMV, length);
           break;
         case STRING:
-          String[][] stringValuesMV = transformToStringValuesMV(projectionBlock);
+          String[][] stringValuesMV = transformToStringValuesMV(valueBlock);
           ArrayCopyUtils.copy(stringValuesMV, _floatValuesMV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _floatValuesMV[i] = (float[]) DataSchema.ColumnDataType.FLOAT_ARRAY.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read MV %s as FLOAT", resultDataType));
       }
@@ -508,15 +646,19 @@ public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
     return _floatValuesMV;
   }
 
-  @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesMV == null) {
+  protected void initDoubleValuesMV(int length) {
+    if (_doubleValuesMV == null || _doubleValuesMV.length < length) {
       _doubleValuesMV = new double[length][];
     }
+  }
+
+  @Override
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesMV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[][] dictIdsMV = transformToDictIdsMV(projectionBlock);
+      int[][] dictIdsMV = transformToDictIdsMV(valueBlock);
       for (int i = 0; i < length; i++) {
         int[] dictIds = dictIdsMV[i];
         int numValues = dictIds.length;
@@ -528,21 +670,27 @@ public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType.getStoredType()) {
         case INT:
-          int[][] intValuesMV = transformToIntValuesMV(projectionBlock);
+          int[][] intValuesMV = transformToIntValuesMV(valueBlock);
           ArrayCopyUtils.copy(intValuesMV, _doubleValuesMV, length);
           break;
         case LONG:
-          long[][] longValuesMV = transformToLongValuesMV(projectionBlock);
+          long[][] longValuesMV = transformToLongValuesMV(valueBlock);
           ArrayCopyUtils.copy(longValuesMV, _doubleValuesMV, length);
           break;
         case FLOAT:
-          float[][] floatValuesMV = transformToFloatValuesMV(projectionBlock);
+          float[][] floatValuesMV = transformToFloatValuesMV(valueBlock);
           ArrayCopyUtils.copy(floatValuesMV, _doubleValuesMV, length);
           break;
         case STRING:
-          String[][] stringValuesMV = transformToStringValuesMV(projectionBlock);
+          String[][] stringValuesMV = transformToStringValuesMV(valueBlock);
           ArrayCopyUtils.copy(stringValuesMV, _doubleValuesMV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _doubleValuesMV[i] = (double[]) DataSchema.ColumnDataType.DOUBLE_ARRAY.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read MV %s as DOUBLE", resultDataType));
       }
@@ -550,15 +698,19 @@ public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
     return _doubleValuesMV;
   }
 
-  @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesMV == null) {
+  protected void initStringValuesMV(int length) {
+    if (_stringValuesMV == null || _stringValuesMV.length < length) {
       _stringValuesMV = new String[length][];
     }
+  }
+
+  @Override
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesMV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[][] dictIdsMV = transformToDictIdsMV(projectionBlock);
+      int[][] dictIdsMV = transformToDictIdsMV(valueBlock);
       for (int i = 0; i < length; i++) {
         int[] dictIds = dictIdsMV[i];
         int numValues = dictIds.length;
@@ -570,21 +722,27 @@ public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
       DataType resultDataType = getResultMetadata().getDataType();
       switch (resultDataType) {
         case INT:
-          int[][] intValuesMV = transformToIntValuesMV(projectionBlock);
+          int[][] intValuesMV = transformToIntValuesMV(valueBlock);
           ArrayCopyUtils.copy(intValuesMV, _stringValuesMV, length);
           break;
         case LONG:
-          long[][] longValuesMV = transformToLongValuesMV(projectionBlock);
+          long[][] longValuesMV = transformToLongValuesMV(valueBlock);
           ArrayCopyUtils.copy(longValuesMV, _stringValuesMV, length);
           break;
         case FLOAT:
-          float[][] floatValuesMV = transformToFloatValuesMV(projectionBlock);
+          float[][] floatValuesMV = transformToFloatValuesMV(valueBlock);
           ArrayCopyUtils.copy(floatValuesMV, _stringValuesMV, length);
           break;
         case DOUBLE:
-          double[][] doubleValuesMV = transformToDoubleValuesMV(projectionBlock);
+          double[][] doubleValuesMV = transformToDoubleValuesMV(valueBlock);
           ArrayCopyUtils.copy(doubleValuesMV, _stringValuesMV, length);
           break;
+        case UNKNOWN:
+          // Copy the values to ensure behaviour consistency with non null-handling.
+          for (int i = 0; i < length; i++) {
+            _stringValuesMV[i] = (String[]) DataSchema.ColumnDataType.STRING_ARRAY.getNullPlaceholder();
+          }
+          break;
         default:
           throw new IllegalStateException(String.format("Cannot read MV %s as STRING", resultDataType));
       }
@@ -592,15 +750,19 @@ public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
     return _stringValuesMV;
   }
 
-  @Override
-  public byte[][][] transformToBytesValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bytesValuesMV == null) {
+  protected void initBytesValuesMV(int length) {
+    if (_bytesValuesMV == null || _bytesValuesMV.length < length) {
       _bytesValuesMV = new byte[length][][];
     }
+  }
+
+  @Override
+  public byte[][][] transformToBytesValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBytesValuesMV(length);
     Dictionary dictionary = getDictionary();
     if (dictionary != null) {
-      int[][] dictIdsMV = transformToDictIdsMV(projectionBlock);
+      int[][] dictIdsMV = transformToDictIdsMV(valueBlock);
       for (int i = 0; i < length; i++) {
         int[] dictIds = dictIdsMV[i];
         int numValues = dictIds.length;
@@ -610,9 +772,29 @@ public byte[][][] transformToBytesValuesMV(ProjectionBlock projectionBlock) {
       }
     } else {
       assert getResultMetadata().getDataType().getStoredType() == DataType.STRING;
-      String[][] stringValuesMV = transformToStringValuesMV(projectionBlock);
+      String[][] stringValuesMV = transformToStringValuesMV(valueBlock);
       ArrayCopyUtils.copy(stringValuesMV, _bytesValuesMV, length);
     }
     return _bytesValuesMV;
   }
+
+  @Nullable
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    // TODO: _arguments shouldn't be null if all the transform functions call the init().
+    if (_arguments == null) {
+      return null;
+    }
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (TransformFunction arg : _arguments) {
+      RoaringBitmap argBitmap = arg.getNullBitmap(valueBlock);
+      if (argBitmap != null) {
+        bitmap.or(argBitmap);
+      }
+    }
+    if (bitmap.isEmpty()) {
+      return null;
+    }
+    return bitmap;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunction.java
index d056322442e..24850868e9d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunction.java
@@ -23,9 +23,9 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
 
@@ -82,7 +82,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are exact 2 arguments
     Preconditions.checkArgument(arguments.size() == 2,
         "Exact 2 arguments are required for binary operator transform function");
@@ -105,37 +106,38 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    fillResultArray(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    fillResultArray(valueBlock);
     return _intValuesSV;
   }
 
-  private void fillResultArray(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
+  private void fillResultArray(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     switch (_leftStoredType) {
       case INT:
-        fillResultInt(projectionBlock, length);
+        fillResultInt(valueBlock, length);
         break;
       case LONG:
-        fillResultLong(projectionBlock, length);
+        fillResultLong(valueBlock, length);
         break;
       case FLOAT:
-        fillResultFloat(projectionBlock, length);
+        fillResultFloat(valueBlock, length);
         break;
       case DOUBLE:
-        fillResultDouble(projectionBlock, length);
+        fillResultDouble(valueBlock, length);
         break;
       case BIG_DECIMAL:
-        fillResultBigDecimal(projectionBlock, length);
+        fillResultBigDecimal(valueBlock, length);
         break;
       case STRING:
-        fillResultString(projectionBlock, length);
+        fillResultString(valueBlock, length);
         break;
       case BYTES:
-        fillResultBytes(projectionBlock, length);
+        fillResultBytes(valueBlock, length);
+        break;
+      case UNKNOWN:
+        fillResultUnknown(length);
         break;
       // NOTE: Multi-value columns are not comparable, so we should not reach here
       default:
@@ -143,130 +145,145 @@ private void fillResultArray(ProjectionBlock projectionBlock) {
     }
   }
 
-  private void fillResultInt(ProjectionBlock projectionBlock, int length) {
-    int[] leftIntValues = _leftTransformFunction.transformToIntValuesSV(projectionBlock);
+  private void fillResultInt(ValueBlock valueBlock, int length) {
+    int[] leftIntValues = _leftTransformFunction.transformToIntValuesSV(valueBlock);
     switch (_rightStoredType) {
       case INT:
-        fillIntResultArray(projectionBlock, leftIntValues, length);
+        fillIntResultArray(valueBlock, leftIntValues, length);
         break;
       case LONG:
-        fillLongResultArray(projectionBlock, leftIntValues, length);
+        fillLongResultArray(valueBlock, leftIntValues, length);
         break;
       case FLOAT:
-        fillFloatResultArray(projectionBlock, leftIntValues, length);
+        fillFloatResultArray(valueBlock, leftIntValues, length);
         break;
       case DOUBLE:
-        fillDoubleResultArray(projectionBlock, leftIntValues, length);
+        fillDoubleResultArray(valueBlock, leftIntValues, length);
         break;
       case BIG_DECIMAL:
-        fillBigDecimalResultArray(projectionBlock, leftIntValues, length);
+        fillBigDecimalResultArray(valueBlock, leftIntValues, length);
         break;
       case STRING:
-        fillStringResultArray(projectionBlock, leftIntValues, length);
+        fillStringResultArray(valueBlock, leftIntValues, length);
+        break;
+      case UNKNOWN:
+        fillResultUnknown(length);
         break;
       default:
         throw illegalState();
     }
   }
 
-  private void fillResultLong(ProjectionBlock projectionBlock, int length) {
-    long[] leftLongValues = _leftTransformFunction.transformToLongValuesSV(projectionBlock);
+  private void fillResultLong(ValueBlock valueBlock, int length) {
+    long[] leftLongValues = _leftTransformFunction.transformToLongValuesSV(valueBlock);
     switch (_rightStoredType) {
       case INT:
-        fillIntResultArray(projectionBlock, leftLongValues, length);
+        fillIntResultArray(valueBlock, leftLongValues, length);
         break;
       case LONG:
-        fillLongResultArray(projectionBlock, leftLongValues, length);
+        fillLongResultArray(valueBlock, leftLongValues, length);
         break;
       case FLOAT:
-        fillFloatResultArray(projectionBlock, leftLongValues, length);
+        fillFloatResultArray(valueBlock, leftLongValues, length);
         break;
       case DOUBLE:
-        fillDoubleResultArray(projectionBlock, leftLongValues, length);
+        fillDoubleResultArray(valueBlock, leftLongValues, length);
         break;
       case BIG_DECIMAL:
-        fillBigDecimalResultArray(projectionBlock, leftLongValues, length);
+        fillBigDecimalResultArray(valueBlock, leftLongValues, length);
         break;
       case STRING:
-        fillStringResultArray(projectionBlock, leftLongValues, length);
+        fillStringResultArray(valueBlock, leftLongValues, length);
+        break;
+      case UNKNOWN:
+        fillResultUnknown(length);
         break;
       default:
         throw illegalState();
     }
   }
 
-  private void fillResultFloat(ProjectionBlock projectionBlock, int length) {
-    float[] leftFloatValues = _leftTransformFunction.transformToFloatValuesSV(projectionBlock);
+  private void fillResultFloat(ValueBlock valueBlock, int length) {
+    float[] leftFloatValues = _leftTransformFunction.transformToFloatValuesSV(valueBlock);
     switch (_rightStoredType) {
       case INT:
-        fillIntResultArray(projectionBlock, leftFloatValues, length);
+        fillIntResultArray(valueBlock, leftFloatValues, length);
         break;
       case LONG:
-        fillLongResultArray(projectionBlock, leftFloatValues, length);
+        fillLongResultArray(valueBlock, leftFloatValues, length);
         break;
       case FLOAT:
-        fillFloatResultArray(projectionBlock, leftFloatValues, length);
+        fillFloatResultArray(valueBlock, leftFloatValues, length);
         break;
       case DOUBLE:
-        fillDoubleResultArray(projectionBlock, leftFloatValues, length);
+        fillDoubleResultArray(valueBlock, leftFloatValues, length);
         break;
       case BIG_DECIMAL:
-        fillBigDecimalResultArray(projectionBlock, leftFloatValues, length);
+        fillBigDecimalResultArray(valueBlock, leftFloatValues, length);
         break;
       case STRING:
-        fillStringResultArray(projectionBlock, leftFloatValues, length);
+        fillStringResultArray(valueBlock, leftFloatValues, length);
+        break;
+      case UNKNOWN:
+        fillResultUnknown(length);
         break;
       default:
         throw illegalState();
     }
   }
 
-  private void fillResultDouble(ProjectionBlock projectionBlock, int length) {
-    double[] leftDoubleValues = _leftTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  private void fillResultDouble(ValueBlock valueBlock, int length) {
+    double[] leftDoubleValues = _leftTransformFunction.transformToDoubleValuesSV(valueBlock);
     switch (_rightStoredType) {
       case INT:
-        fillIntResultArray(projectionBlock, leftDoubleValues, length);
+        fillIntResultArray(valueBlock, leftDoubleValues, length);
         break;
       case LONG:
-        fillLongResultArray(projectionBlock, leftDoubleValues, length);
+        fillLongResultArray(valueBlock, leftDoubleValues, length);
         break;
       case FLOAT:
-        fillFloatResultArray(projectionBlock, leftDoubleValues, length);
+        fillFloatResultArray(valueBlock, leftDoubleValues, length);
         break;
       case DOUBLE:
-        fillDoubleResultArray(projectionBlock, leftDoubleValues, length);
+        fillDoubleResultArray(valueBlock, leftDoubleValues, length);
         break;
       case BIG_DECIMAL:
-        fillBigDecimalResultArray(projectionBlock, leftDoubleValues, length);
+        fillBigDecimalResultArray(valueBlock, leftDoubleValues, length);
         break;
       case STRING:
-        fillStringResultArray(projectionBlock, leftDoubleValues, length);
+        fillStringResultArray(valueBlock, leftDoubleValues, length);
+        break;
+      case UNKNOWN:
+        fillResultUnknown(length);
         break;
       default:
         throw illegalState();
     }
   }
 
-  private void fillResultBigDecimal(ProjectionBlock projectionBlock, int length) {
-    BigDecimal[] leftBigDecimalValues = _leftTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+  private void fillResultBigDecimal(ValueBlock valueBlock, int length) {
+    BigDecimal[] leftBigDecimalValues = _leftTransformFunction.transformToBigDecimalValuesSV(valueBlock);
     switch (_rightStoredType) {
       case INT:
-        fillIntResultArray(projectionBlock, leftBigDecimalValues, length);
+        fillIntResultArray(valueBlock, leftBigDecimalValues, length);
         break;
       case LONG:
-        fillLongResultArray(projectionBlock, leftBigDecimalValues, length);
+        fillLongResultArray(valueBlock, leftBigDecimalValues, length);
         break;
       case FLOAT:
-        fillFloatResultArray(projectionBlock, leftBigDecimalValues, length);
+        fillFloatResultArray(valueBlock, leftBigDecimalValues, length);
         break;
       case DOUBLE:
-        fillDoubleResultArray(projectionBlock, leftBigDecimalValues, length);
+        fillDoubleResultArray(valueBlock, leftBigDecimalValues, length);
         break;
       case STRING:
-        fillStringResultArray(projectionBlock, leftBigDecimalValues, length);
+        fillStringResultArray(valueBlock, leftBigDecimalValues, length);
         break;
       case BIG_DECIMAL:
-        fillBigDecimalResultArray(projectionBlock, leftBigDecimalValues, length);
+        fillBigDecimalResultArray(valueBlock, leftBigDecimalValues, length);
+        break;
+      case UNKNOWN:
+        fillResultUnknown(length);
         break;
       default:
         throw illegalState();
@@ -280,59 +297,59 @@ private IllegalStateException illegalState() {
         _rightTransformFunction.getName(), _rightStoredType));
   }
 
-  private void fillResultString(ProjectionBlock projectionBlock, int length) {
-    String[] leftStringValues = _leftTransformFunction.transformToStringValuesSV(projectionBlock);
-    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(projectionBlock);
+  private void fillResultString(ValueBlock valueBlock, int length) {
+    String[] leftStringValues = _leftTransformFunction.transformToStringValuesSV(valueBlock);
+    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftStringValues[i].compareTo(rightStringValues[i]));
     }
   }
 
-  private void fillResultBytes(ProjectionBlock projectionBlock, int length) {
-    byte[][] leftBytesValues = _leftTransformFunction.transformToBytesValuesSV(projectionBlock);
-    byte[][] rightBytesValues = _rightTransformFunction.transformToBytesValuesSV(projectionBlock);
+  private void fillResultBytes(ValueBlock valueBlock, int length) {
+    byte[][] leftBytesValues = _leftTransformFunction.transformToBytesValuesSV(valueBlock);
+    byte[][] rightBytesValues = _rightTransformFunction.transformToBytesValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult((ByteArray.compare(leftBytesValues[i], rightBytesValues[i])));
     }
   }
 
-  private void fillIntResultArray(ProjectionBlock projectionBlock, int[] leftIntValues, int length) {
-    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+  private void fillIntResultArray(ValueBlock valueBlock, int[] leftIntValues, int length) {
+    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Integer.compare(leftIntValues[i], rightIntValues[i]));
     }
   }
 
-  private void fillLongResultArray(ProjectionBlock projectionBlock, int[] leftValues, int length) {
-    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(projectionBlock);
+  private void fillLongResultArray(ValueBlock valueBlock, int[] leftValues, int length) {
+    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Long.compare(leftValues[i], rightValues[i]));
     }
   }
 
-  private void fillFloatResultArray(ProjectionBlock projectionBlock, int[] leftValues, int length) {
-    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(projectionBlock);
+  private void fillFloatResultArray(ValueBlock valueBlock, int[] leftValues, int length) {
+    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightFloatValues[i]));
     }
   }
 
-  private void fillDoubleResultArray(ProjectionBlock projectionBlock, int[] leftValues, int length) {
-    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  private void fillDoubleResultArray(ValueBlock valueBlock, int[] leftValues, int length) {
+    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightDoubleValues[i]));
     }
   }
 
-  private void fillBigDecimalResultArray(ProjectionBlock projectionBlock, int[] leftValues, int length) {
-    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+  private void fillBigDecimalResultArray(ValueBlock valueBlock, int[] leftValues, int length) {
+    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(BigDecimal.valueOf(leftValues[i]).compareTo(rightBigDecimalValues[i]));
     }
   }
 
-  private void fillStringResultArray(ProjectionBlock projectionBlock, int[] leftValues, int length) {
-    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(projectionBlock);
+  private void fillStringResultArray(ValueBlock valueBlock, int[] leftValues, int length) {
+    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       try {
         _intValuesSV[i] =
@@ -343,43 +360,43 @@ private void fillStringResultArray(ProjectionBlock projectionBlock, int[] leftVa
     }
   }
 
-  private void fillIntResultArray(ProjectionBlock projectionBlock, long[] leftIntValues, int length) {
-    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+  private void fillIntResultArray(ValueBlock valueBlock, long[] leftIntValues, int length) {
+    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Long.compare(leftIntValues[i], rightIntValues[i]));
     }
   }
 
-  private void fillLongResultArray(ProjectionBlock projectionBlock, long[] leftValues, int length) {
-    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(projectionBlock);
+  private void fillLongResultArray(ValueBlock valueBlock, long[] leftValues, int length) {
+    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Long.compare(leftValues[i], rightValues[i]));
     }
   }
 
-  private void fillFloatResultArray(ProjectionBlock projectionBlock, long[] leftValues, int length) {
-    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(projectionBlock);
+  private void fillFloatResultArray(ValueBlock valueBlock, long[] leftValues, int length) {
+    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(compare(leftValues[i], rightFloatValues[i]));
     }
   }
 
-  private void fillDoubleResultArray(ProjectionBlock projectionBlock, long[] leftValues, int length) {
-    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  private void fillDoubleResultArray(ValueBlock valueBlock, long[] leftValues, int length) {
+    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(compare(leftValues[i], rightDoubleValues[i]));
     }
   }
 
-  private void fillBigDecimalResultArray(ProjectionBlock projectionBlock, long[] leftValues, int length) {
-    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+  private void fillBigDecimalResultArray(ValueBlock valueBlock, long[] leftValues, int length) {
+    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(BigDecimal.valueOf(leftValues[i]).compareTo(rightBigDecimalValues[i]));
     }
   }
 
-  private void fillStringResultArray(ProjectionBlock projectionBlock, long[] leftValues, int length) {
-    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(projectionBlock);
+  private void fillStringResultArray(ValueBlock valueBlock, long[] leftValues, int length) {
+    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       try {
         _intValuesSV[i] =
@@ -390,43 +407,43 @@ private void fillStringResultArray(ProjectionBlock projectionBlock, long[] leftV
     }
   }
 
-  private void fillIntResultArray(ProjectionBlock projectionBlock, float[] leftValues, int length) {
-    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+  private void fillIntResultArray(ValueBlock valueBlock, float[] leftValues, int length) {
+    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightIntValues[i]));
     }
   }
 
-  private void fillLongResultArray(ProjectionBlock projectionBlock, float[] leftValues, int length) {
-    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(projectionBlock);
+  private void fillLongResultArray(ValueBlock valueBlock, float[] leftValues, int length) {
+    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(compare(leftValues[i], rightValues[i]));
     }
   }
 
-  private void fillFloatResultArray(ProjectionBlock projectionBlock, float[] leftValues, int length) {
-    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(projectionBlock);
+  private void fillFloatResultArray(ValueBlock valueBlock, float[] leftValues, int length) {
+    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Float.compare(leftValues[i], rightFloatValues[i]));
     }
   }
 
-  private void fillDoubleResultArray(ProjectionBlock projectionBlock, float[] leftValues, int length) {
-    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  private void fillDoubleResultArray(ValueBlock valueBlock, float[] leftValues, int length) {
+    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightDoubleValues[i]));
     }
   }
 
-  private void fillBigDecimalResultArray(ProjectionBlock projectionBlock, float[] leftValues, int length) {
-    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+  private void fillBigDecimalResultArray(ValueBlock valueBlock, float[] leftValues, int length) {
+    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(BigDecimal.valueOf(leftValues[i]).compareTo(rightBigDecimalValues[i]));
     }
   }
 
-  private void fillStringResultArray(ProjectionBlock projectionBlock, float[] leftValues, int length) {
-    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(projectionBlock);
+  private void fillStringResultArray(ValueBlock valueBlock, float[] leftValues, int length) {
+    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       try {
         _intValuesSV[i] =
@@ -437,43 +454,43 @@ private void fillStringResultArray(ProjectionBlock projectionBlock, float[] left
     }
   }
 
-  private void fillIntResultArray(ProjectionBlock projectionBlock, double[] leftValues, int length) {
-    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+  private void fillIntResultArray(ValueBlock valueBlock, double[] leftValues, int length) {
+    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightIntValues[i]));
     }
   }
 
-  private void fillLongResultArray(ProjectionBlock projectionBlock, double[] leftValues, int length) {
-    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(projectionBlock);
+  private void fillLongResultArray(ValueBlock valueBlock, double[] leftValues, int length) {
+    long[] rightValues = _rightTransformFunction.transformToLongValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(compare(leftValues[i], rightValues[i]));
     }
   }
 
-  private void fillFloatResultArray(ProjectionBlock projectionBlock, double[] leftValues, int length) {
-    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(projectionBlock);
+  private void fillFloatResultArray(ValueBlock valueBlock, double[] leftValues, int length) {
+    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightFloatValues[i]));
     }
   }
 
-  private void fillDoubleResultArray(ProjectionBlock projectionBlock, double[] leftValues, int length) {
-    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  private void fillDoubleResultArray(ValueBlock valueBlock, double[] leftValues, int length) {
+    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(Double.compare(leftValues[i], rightDoubleValues[i]));
     }
   }
 
-  private void fillBigDecimalResultArray(ProjectionBlock projectionBlock, double[] leftValues, int length) {
-    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+  private void fillBigDecimalResultArray(ValueBlock valueBlock, double[] leftValues, int length) {
+    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(BigDecimal.valueOf(leftValues[i]).compareTo(rightBigDecimalValues[i]));
     }
   }
 
-  private void fillStringResultArray(ProjectionBlock projectionBlock, double[] leftValues, int length) {
-    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(projectionBlock);
+  private void fillStringResultArray(ValueBlock valueBlock, double[] leftValues, int length) {
+    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       try {
         _intValuesSV[i] =
@@ -484,43 +501,43 @@ private void fillStringResultArray(ProjectionBlock projectionBlock, double[] lef
     }
   }
 
-  private void fillIntResultArray(ProjectionBlock projectionBlock, BigDecimal[] leftValues, int length) {
-    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+  private void fillIntResultArray(ValueBlock valueBlock, BigDecimal[] leftValues, int length) {
+    int[] rightIntValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftValues[i].compareTo(BigDecimal.valueOf(rightIntValues[i])));
     }
   }
 
-  private void fillLongResultArray(ProjectionBlock projectionBlock, BigDecimal[] leftValues, int length) {
-    long[] rightLongValues = _rightTransformFunction.transformToLongValuesSV(projectionBlock);
+  private void fillLongResultArray(ValueBlock valueBlock, BigDecimal[] leftValues, int length) {
+    long[] rightLongValues = _rightTransformFunction.transformToLongValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftValues[i].compareTo(BigDecimal.valueOf(rightLongValues[i])));
     }
   }
 
-  private void fillFloatResultArray(ProjectionBlock projectionBlock, BigDecimal[] leftValues, int length) {
-    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(projectionBlock);
+  private void fillFloatResultArray(ValueBlock valueBlock, BigDecimal[] leftValues, int length) {
+    float[] rightFloatValues = _rightTransformFunction.transformToFloatValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftValues[i].compareTo(BigDecimal.valueOf(rightFloatValues[i])));
     }
   }
 
-  private void fillDoubleResultArray(ProjectionBlock projectionBlock, BigDecimal[] leftValues, int length) {
-    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  private void fillDoubleResultArray(ValueBlock valueBlock, BigDecimal[] leftValues, int length) {
+    double[] rightDoubleValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftValues[i].compareTo(BigDecimal.valueOf(rightDoubleValues[i])));
     }
   }
 
-  private void fillBigDecimalResultArray(ProjectionBlock projectionBlock, BigDecimal[] leftValues, int length) {
-    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+  private void fillBigDecimalResultArray(ValueBlock valueBlock, BigDecimal[] leftValues, int length) {
+    BigDecimal[] rightBigDecimalValues = _rightTransformFunction.transformToBigDecimalValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftValues[i].compareTo(rightBigDecimalValues[i]));
     }
   }
 
-  private void fillStringResultArray(ProjectionBlock projectionBlock, BigDecimal[] leftValues, int length) {
-    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(projectionBlock);
+  private void fillStringResultArray(ValueBlock valueBlock, BigDecimal[] leftValues, int length) {
+    String[] rightStringValues = _rightTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesSV[i] = getIntResult(leftValues[i].compareTo(new BigDecimal(rightStringValues[i])));
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CLPDecodeTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CLPDecodeTransformFunction.java
new file mode 100644
index 00000000000..2a6f7ff952f
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CLPDecodeTransformFunction.java
@@ -0,0 +1,131 @@
+/**
+ * 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.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import com.yscope.clp.compressorfrontend.BuiltInVariableHandlingRuleVersions;
+import com.yscope.clp.compressorfrontend.MessageDecoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.pinot.spi.data.FieldSpec.DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+
+
+/**
+ * Decodes a CLP-encoded column group into the original value. In Pinot, a CLP-encoded field is encoded into three
+ * Pinot columns, what we collectively refer to as a column group. E.g., A CLP-encoded "message" field would be
+ * stored in three columns: "message_logtype", "message_dictionaryVars", and "message_encodedVars".
+ * <p>
+ * Usage:
+ * <pre>
+ *   clpDecode("columnGroupName_logtype", "columnGroupName_dictionaryVars",
+ *             "columnGroupName_encodedVars"[, defaultValue])
+ * </pre>
+ * The "defaultValue" is optional and is used when a column group can't be decoded for some reason.
+ * <p>
+ * Sample queries:
+ * <pre>
+ *   SELECT clpDecode("message_logtype", "message_dictionaryVars", "message_encodedVars") FROM table
+ *   SELECT clpDecode("message_logtype", "message_dictionaryVars", "message_encodedVars", 'null') FROM table
+ * </pre>
+ * For instance, consider a record that contains a "message" field with this value:
+ * <pre>INFO Task task_12 assigned to container: [ContainerID:container_15], operation took 0.335 seconds. 8 tasks
+ * remaining.</pre>
+ * {@link org.apache.pinot.plugin.inputformat.clplog.CLPLogMessageDecoder} will encode it into 3 columns:
+ * <ul>
+ *   <li>message_logtype: "INFO Task \x12 assigned to container: [ContainerID:\x12], operation took \x13 seconds.
+ *   \x11 tasks remaining."</li>
+ *   <li>message_dictionaryVars: [“task_12”, “container_15”]</li>
+ *   <li>message_encodedVars: [[0x190000000000014f, 8]]</li>
+ * </ul>
+ * Then we can use the sample queries above to decode the columns back into the original value of the "message" field.
+ */
+public class CLPDecodeTransformFunction extends BaseTransformFunction {
+  private static final Logger _logger = LoggerFactory.getLogger(CLPDecodeTransformFunction.class);
+  private final List<TransformFunction> _transformFunctions = new ArrayList<>();
+  private String _defaultValue = DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+
+  @Override
+  public String getName() {
+    return TransformFunctionType.CLPDECODE.getName();
+  }
+
+  @Override
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    int numArgs = arguments.size();
+    Preconditions.checkArgument(3 == numArgs || 4 == numArgs,
+        "Syntax error: clpDecode takes 3 or 4 arguments - "
+            + "clpDecode(ColumnGroupName_logtype, ColumnGroupName_dictionaryVars, ColumnGroupName_encodedVars, "
+            + "defaultValue)");
+
+    int i;
+    for (i = 0; i < 3; i++) {
+      TransformFunction f = arguments.get(i);
+      Preconditions.checkArgument(f instanceof IdentifierTransformFunction,
+          "Argument " + i + " must be a column name (identifier)");
+      _transformFunctions.add(f);
+    }
+    if (i < numArgs) {
+      TransformFunction f = arguments.get(i++);
+      Preconditions.checkArgument(f instanceof LiteralTransformFunction,
+          "Argument " + i + " must be a default value (literal)");
+      _defaultValue = ((LiteralTransformFunction) f).getStringLiteral();
+    }
+  }
+
+  @Override
+  public TransformResultMetadata getResultMetadata() {
+    return new TransformResultMetadata(FieldSpec.DataType.STRING, true, false);
+  }
+
+  @Override
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
+
+    int functionIdx = 0;
+    TransformFunction logtypeTransformFunction = _transformFunctions.get(functionIdx++);
+    TransformFunction dictionaryVarsTransformFunction = _transformFunctions.get(functionIdx++);
+    TransformFunction encodedVarsTransformFunction = _transformFunctions.get(functionIdx);
+    String[] logtypes = logtypeTransformFunction.transformToStringValuesSV(valueBlock);
+    String[][] dictionaryVars = dictionaryVarsTransformFunction.transformToStringValuesMV(valueBlock);
+    long[][] encodedVars = encodedVarsTransformFunction.transformToLongValuesMV(valueBlock);
+
+    MessageDecoder clpMessageDecoder = new MessageDecoder(BuiltInVariableHandlingRuleVersions.VariablesSchemaV2,
+        BuiltInVariableHandlingRuleVersions.VariableEncodingMethodsV1);
+    for (int i = 0; i < length; i++) {
+      try {
+        _stringValuesSV[i] = clpMessageDecoder.decodeMessage(logtypes[i], dictionaryVars[i], encodedVars[i]);
+      } catch (Exception ex) {
+        _logger.error("Failed to decode CLP-encoded field.", ex);
+        _stringValuesSV[i] = _defaultValue;
+      }
+    }
+
+    return _stringValuesSV;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunction.java
index 580c608bf30..f4ff9330b36 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunction.java
@@ -22,45 +22,46 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
+import java.util.BitSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
  * The <code>CaseTransformFunction</code> class implements the CASE-WHEN-THEN-ELSE transformation.
- *
- * The SQL Syntax is:
- *    CASE
- *        WHEN condition1 THEN result1
- *        WHEN condition2 THEN result2
- *        WHEN conditionN THEN resultN
- *        ELSE result
- *    END;
- *
- * Usage:
- *    case(${WHEN_STATEMENT_1}, ..., ${WHEN_STATEMENT_N},
- *         ${THEN_EXPRESSION_1}, ..., ${THEN_EXPRESSION_N},
- *         ${ELSE_EXPRESSION})
- *
+ * <p>
+ * The SQL Syntax is: CASE WHEN condition1 THEN result1 WHEN condition2 THEN result2 WHEN conditionN THEN resultN ELSE
+ * result END;
+ * <p>
+ * Usage: case(${WHEN_STATEMENT_1}, ..., ${WHEN_STATEMENT_N}, ${THEN_EXPRESSION_1}, ..., ${THEN_EXPRESSION_N},
+ * ${ELSE_EXPRESSION})
+ * <p>
  * There are 2 * N + 1 arguments:
- *    <code>WHEN_STATEMENT_$i</code> is a <code>BinaryOperatorTransformFunction</code> represents
- *    <code>condition$i</code>
- *    <code>THEN_EXPRESSION_$i</code> is a <code>TransformFunction</code> represents <code>result$i</code>
- *    <code>ELSE_EXPRESSION</code> is a <code>TransformFunction</code> represents <code>result</code>
- *
+ * <code>WHEN_STATEMENT_$i</code> is a <code>BinaryOperatorTransformFunction</code> represents
+ * <code>condition$i</code>
+ * <code>THEN_EXPRESSION_$i</code> is a <code>TransformFunction</code> represents <code>result$i</code>
+ * <code>ELSE_EXPRESSION</code> is a <code>TransformFunction</code> represents <code>result</code>
+ * <p>
+ * ELSE_EXPRESSION can be omitted. When none of when statements is evaluated to be true, and there is no else
+ * expression, we output null. Note that when statement is considered as false if it is evaluated to be null.
  */
-public class CaseTransformFunction extends BaseTransformFunction {
+public class CaseTransformFunction extends ComputeDifferentlyWhenNullHandlingEnabledTransformFunction {
   public static final String FUNCTION_NAME = "case";
 
   private List<TransformFunction> _whenStatements = new ArrayList<>();
-  private List<TransformFunction> _elseThenStatements = new ArrayList<>();
-  private boolean[] _selections;
-  private int _numSelections;
+  private List<TransformFunction> _thenStatements = new ArrayList<>();
+  private TransformFunction _elseStatement;
+
+  private boolean[] _computeThenStatements;
   private TransformResultMetadata _resultMetadata;
   private int[] _selectedResults;
 
@@ -70,18 +71,19 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
-    // Check that there are more than 1 arguments
-    if (arguments.size() % 2 != 1 || arguments.size() < 3) {
-      throw new IllegalArgumentException("At least 3 odd number of arguments are required for CASE-WHEN-ELSE function");
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap,
+      boolean nullHandlingEnabled) {
+    super.init(arguments, columnContextMap, nullHandlingEnabled);
+    // Check that there are more than 2 arguments
+    // Else statement can be omitted.
+    if (arguments.size() < 2) {
+      throw new IllegalArgumentException("At least two arguments are required for CASE-WHEN function");
     }
     int numWhenStatements = arguments.size() / 2;
     _whenStatements = new ArrayList<>(numWhenStatements);
-    _elseThenStatements = new ArrayList<>(numWhenStatements + 1);
+    _thenStatements = new ArrayList<>(numWhenStatements);
     constructStatementList(arguments);
-    _selections = new boolean[_elseThenStatements.size()];
-    Collections.reverse(_elseThenStatements);
-    Collections.reverse(_whenStatements);
+    _computeThenStatements = new boolean[_thenStatements.size()];
     _resultMetadata = calculateResultMetadata();
   }
 
@@ -109,9 +111,11 @@ private void constructStatementListCalcite(List<TransformFunction> arguments) {
     // alternating WHEN and THEN clause, last one ELSE
     for (int i = 0; i < numWhenStatements; i++) {
       _whenStatements.add(arguments.get(i * 2));
-      _elseThenStatements.add(arguments.get(i * 2 + 1));
+      _thenStatements.add(arguments.get(i * 2 + 1));
+    }
+    if (arguments.size() % 2 != 0) {
+      _elseStatement = arguments.get(arguments.size() - 1);
     }
-    _elseThenStatements.add(arguments.get(arguments.size() - 1));
   }
 
   // TODO: Legacy format, this is here for backward compatibility support, remove after release 0.12
@@ -121,20 +125,22 @@ private void constructStatementListLegacy(List<TransformFunction> arguments) {
     for (int i = 0; i < numWhenStatements; i++) {
       _whenStatements.add(arguments.get(i));
     }
-    for (int i = numWhenStatements; i < numWhenStatements * 2 + 1; i++) {
-      _elseThenStatements.add(arguments.get(i));
+    for (int i = numWhenStatements; i < numWhenStatements * 2; i++) {
+      _thenStatements.add(arguments.get(i));
+    }
+    if (arguments.size() % 2 != 0) {
+      _elseStatement = arguments.get(arguments.size() - 1);
     }
   }
 
   private TransformResultMetadata calculateResultMetadata() {
-    TransformFunction elseStatement = _elseThenStatements.get(0);
-    TransformResultMetadata elseStatementResultMetadata = elseStatement.getResultMetadata();
+    TransformResultMetadata elseStatementResultMetadata = _elseStatement.getResultMetadata();
     DataType dataType = elseStatementResultMetadata.getDataType();
     Preconditions.checkState(elseStatementResultMetadata.isSingleValue(),
         "Unsupported multi-value expression in the ELSE clause");
-    int numThenStatements = _elseThenStatements.size() - 1;
+    int numThenStatements = _thenStatements.size();
     for (int i = 0; i < numThenStatements; i++) {
-      TransformFunction thenStatement = _elseThenStatements.get(i + 1);
+      TransformFunction thenStatement = _thenStatements.get(i);
       TransformResultMetadata thenStatementResultMetadata = thenStatement.getResultMetadata();
       if (!thenStatementResultMetadata.isSingleValue()) {
         throw new IllegalStateException("Unsupported multi-value expression in the THEN clause of index: " + i);
@@ -149,6 +155,7 @@ private TransformResultMetadata calculateResultMetadata() {
       // - FLOAT & DOUBLE -> DOUBLE
       // - Any numeric data type with BIG_DECIMAL -> BIG_DECIMAL
       // Use STRING to handle non-numeric types
+      // UNKNOWN data type is ignored unless all data types are unknown, we return unknown types.
       if (thenStatementDataType == dataType) {
         continue;
       }
@@ -165,6 +172,8 @@ private TransformResultMetadata calculateResultMetadata() {
             case BIG_DECIMAL:
               dataType = DataType.BIG_DECIMAL;
               break;
+            case UNKNOWN:
+              break;
             default:
               dataType = DataType.STRING;
               break;
@@ -172,7 +181,8 @@ private TransformResultMetadata calculateResultMetadata() {
           break;
         case LONG:
           switch (thenStatementDataType) {
-            case INT:
+            case INT: // fall through
+            case UNKNOWN:
               break;
             case FLOAT:
             case DOUBLE:
@@ -196,6 +206,8 @@ private TransformResultMetadata calculateResultMetadata() {
             case BIG_DECIMAL:
               dataType = DataType.BIG_DECIMAL;
               break;
+            case UNKNOWN:
+              break;
             default:
               dataType = DataType.STRING;
               break;
@@ -206,6 +218,7 @@ private TransformResultMetadata calculateResultMetadata() {
             case INT:
             case FLOAT:
             case LONG:
+            case UNKNOWN:
               break;
             case BIG_DECIMAL:
               dataType = DataType.BIG_DECIMAL;
@@ -221,12 +234,16 @@ private TransformResultMetadata calculateResultMetadata() {
             case FLOAT:
             case LONG:
             case DOUBLE:
+            case UNKNOWN:
               break;
             default:
               dataType = DataType.STRING;
               break;
           }
           break;
+        case UNKNOWN:
+          dataType = thenStatementDataType;
+          break;
         default:
           dataType = DataType.STRING;
           break;
@@ -241,62 +258,136 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   /**
-   * Evaluate the ProjectionBlock for the WHEN statements, returns an array with the
-   * index(1 to N) of matched WHEN clause ordered by match priority, 0 means nothing
-   * matched, so go to ELSE.
+   * Evaluate the ValueBlock for the WHEN statements, returns an array with the index(1 to N) of matched WHEN clause -1
+   * means there is no match.
    */
-  private int[] getSelectedArray(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  private int[] getSelectedArray(ValueBlock valueBlock, boolean nullHandlingEnabled) {
+    int numDocs = valueBlock.getNumDocs();
     if (_selectedResults == null || _selectedResults.length < numDocs) {
       _selectedResults = new int[numDocs];
-    } else {
-      Arrays.fill(_selectedResults, 0, numDocs, 0);
-      Arrays.fill(_selections, false);
     }
+    Arrays.fill(_selectedResults, -1);
+    Arrays.fill(_computeThenStatements, false);
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
     int numWhenStatements = _whenStatements.size();
-    for (int i = numWhenStatements - 1; i >= 0; i--) {
+    for (int i = 0; i < numWhenStatements; i++) {
       TransformFunction whenStatement = _whenStatements.get(i);
-      int[] conditions = whenStatement.transformToIntValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < conditions.length; j++) {
-        _selectedResults[j] = Math.max(conditions[j] * (i + 1), _selectedResults[j]);
+      int[] conditions = getWhenConditions(whenStatement, valueBlock, nullHandlingEnabled);
+      for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+        if (conditions[docId] == 1) {
+          unselectedDocs.clear(docId);
+          _selectedResults[docId] = i;
+        }
+      }
+      if (unselectedDocs.isEmpty()) {
+        break;
       }
     }
     // try to prune clauses now
     for (int i = 0; i < numDocs; i++) {
-      _selections[_selectedResults[i]] = true;
-    }
-    int numSelections = 0;
-    for (boolean selection : _selections) {
-      if (selection) {
-        numSelections++;
+      if (_selectedResults[i] != -1) {
+        _computeThenStatements[_selectedResults[i]] = true;
       }
     }
-    _numSelections = numSelections;
     return _selectedResults;
   }
 
+  // Returns an array of valueBlock length to indicate whether a row is selected or not.
+  // When nullHandlingEnabled is set to true, we also check whether the row is null and set to false if null.
+  private static int[] getWhenConditions(TransformFunction whenStatement, ValueBlock valueBlock,
+      boolean nullHandlingEnabled) {
+    if (!nullHandlingEnabled) {
+      return whenStatement.transformToIntValuesSV(valueBlock);
+    }
+    int[] intResult = whenStatement.transformToIntValuesSV(valueBlock);
+    RoaringBitmap bitmap = whenStatement.getNullBitmap(valueBlock);
+    if (bitmap != null) {
+      for (int i : bitmap) {
+        intResult[i] = 0;
+      }
+    }
+    return intResult;
+  }
+
+  @Override
+  protected int[] transformToIntValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, int[]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToIntValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _intValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _intValuesSV[docId] = (int) DataSchema.ColumnDataType.INT.getNullPlaceholder();
+        }
+      } else {
+        int[] intValuesSV = _elseStatement.transformToIntValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _intValuesSV[docId] = intValuesSV[docId];
+        }
+      }
+    }
+    return _intValuesSV;
+  }
+
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        int[] intValues = transformFunction.transformToIntValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(intValues, 0, _intValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _intValuesSV[j] = intValues[j];
-            }
+  protected int[] transformToIntValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<int[], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, ImmutablePair.of(_thenStatements.get(i).transformToIntValuesSV(valueBlock),
+            _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<int[], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _intValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _intValuesSV[docId] = (int) DataSchema.ColumnDataType.INT.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        int[] intValues = _elseStatement.transformToIntValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _intValuesSV[docId] = intValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
@@ -305,27 +396,83 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[numDocs];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        long[] longValues = transformFunction.transformToLongValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(longValues, 0, _longValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _longValuesSV[j] = longValues[j];
-            }
+  protected long[] transformToLongValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initLongValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, long[]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToLongValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _longValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _longValuesSV[docId] = (long) DataSchema.ColumnDataType.LONG.getNullPlaceholder();
+        }
+      } else {
+        long[] longValuesSV = _elseStatement.transformToLongValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _longValuesSV[docId] = longValuesSV[docId];
+        }
+      }
+    }
+    return _longValuesSV;
+  }
+
+  @Override
+  protected long[] transformToLongValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initLongValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<long[], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, ImmutablePair.of(_thenStatements.get(i).transformToLongValuesSV(valueBlock),
+            _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<long[], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _longValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _longValuesSV[docId] = (long) DataSchema.ColumnDataType.LONG.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        long[] longValues = _elseStatement.transformToLongValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _longValuesSV[docId] = longValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
@@ -334,27 +481,83 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[numDocs];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        float[] floatValues = transformFunction.transformToFloatValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(floatValues, 0, _floatValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _floatValuesSV[j] = floatValues[j];
-            }
+  protected float[] transformToFloatValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initFloatValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, float[]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToFloatValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _floatValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _floatValuesSV[docId] = (float) DataSchema.ColumnDataType.FLOAT.getNullPlaceholder();
+        }
+      } else {
+        float[] floatValuesSV = _elseStatement.transformToFloatValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _floatValuesSV[docId] = floatValuesSV[docId];
+        }
+      }
+    }
+    return _floatValuesSV;
+  }
+
+  @Override
+  protected float[] transformToFloatValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initFloatValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<float[], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, ImmutablePair.of(_thenStatements.get(i).transformToFloatValuesSV(valueBlock),
+            _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<float[], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _floatValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _floatValuesSV[docId] = (float) DataSchema.ColumnDataType.FLOAT.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        float[] floatValues = _elseStatement.transformToFloatValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _floatValuesSV[docId] = floatValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
@@ -363,27 +566,84 @@ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[numDocs];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        double[] doubleValues = transformFunction.transformToDoubleValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(doubleValues, 0, _doubleValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _doubleValuesSV[j] = doubleValues[j];
-            }
+  protected double[] transformToDoubleValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initDoubleValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, double[]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToDoubleValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _doubleValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _doubleValuesSV[docId] = (double) DataSchema.ColumnDataType.DOUBLE.getNullPlaceholder();
+        }
+      } else {
+        float[] doubleValuesSV = _elseStatement.transformToFloatValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _doubleValuesSV[docId] = doubleValuesSV[docId];
+        }
+      }
+    }
+    return _doubleValuesSV;
+  }
+
+  @Override
+  protected double[] transformToDoubleValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initDoubleValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<double[], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i,
+            ImmutablePair.of(_thenStatements.get(i).transformToDoubleValuesSV(valueBlock),
+                _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<double[], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _doubleValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _doubleValuesSV[docId] = (double) DataSchema.ColumnDataType.DOUBLE.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        double[] doubleValues = _elseStatement.transformToDoubleValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _doubleValuesSV[docId] = doubleValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
@@ -392,27 +652,84 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType() != DataType.BIG_DECIMAL) {
-      return super.transformToBigDecimalValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[numDocs];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        BigDecimal[] bigDecimalValues = transformFunction.transformToBigDecimalValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(bigDecimalValues, 0, _bigDecimalValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _bigDecimalValuesSV[j] = bigDecimalValues[j];
-            }
+  protected BigDecimal[] transformToBigDecimalValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, BigDecimal[]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToBigDecimalValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _bigDecimalValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bigDecimalValuesSV[docId] = (BigDecimal) DataSchema.ColumnDataType.BIG_DECIMAL.getNullPlaceholder();
+        }
+      } else {
+        BigDecimal[] bigDecimalValuesSV = _elseStatement.transformToBigDecimalValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bigDecimalValuesSV[docId] = bigDecimalValuesSV[docId];
+        }
+      }
+    }
+    return _bigDecimalValuesSV;
+  }
+
+  @Override
+  protected BigDecimal[] transformToBigDecimalValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<BigDecimal[], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i,
+            ImmutablePair.of(_thenStatements.get(i).transformToBigDecimalValuesSV(valueBlock),
+                _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<BigDecimal[], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _bigDecimalValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bigDecimalValuesSV[docId] = (BigDecimal) DataSchema.ColumnDataType.BIG_DECIMAL.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        BigDecimal[] bigDecimalValues = _elseStatement.transformToBigDecimalValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bigDecimalValuesSV[docId] = bigDecimalValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
@@ -421,27 +738,84 @@ public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBloc
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[numDocs];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        String[] stringValues = transformFunction.transformToStringValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(stringValues, 0, _stringValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _stringValuesSV[j] = stringValues[j];
-            }
+  protected String[] transformToStringValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initStringValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, String[]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToStringValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _stringValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _stringValuesSV[docId] = (String) DataSchema.ColumnDataType.STRING.getNullPlaceholder();
+        }
+      } else {
+        String[] stringValuesSV = _elseStatement.transformToStringValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _stringValuesSV[docId] = stringValuesSV[docId];
+        }
+      }
+    }
+    return _stringValuesSV;
+  }
+
+  @Override
+  protected String[] transformToStringValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initStringValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<String[], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i,
+            ImmutablePair.of(_thenStatements.get(i).transformToStringValuesSV(valueBlock),
+                _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<String[], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _stringValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _stringValuesSV[docId] = (String) DataSchema.ColumnDataType.STRING.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        String[] stringValues = _elseStatement.transformToStringValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _stringValuesSV[docId] = stringValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
@@ -450,31 +824,130 @@ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
-    if (_resultMetadata.getDataType().getStoredType() != DataType.BYTES) {
-      return super.transformToBytesValuesSV(projectionBlock);
-    }
-    int[] selected = getSelectedArray(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
-    if (_bytesValuesSV == null) {
-      _bytesValuesSV = new byte[numDocs][];
-    }
-    int numElseThenStatements = _elseThenStatements.size();
-    for (int i = 0; i < numElseThenStatements; i++) {
-      if (_selections[i]) {
-        TransformFunction transformFunction = _elseThenStatements.get(i);
-        byte[][] bytesValues = transformFunction.transformToBytesValuesSV(projectionBlock);
-        if (_numSelections == 1) {
-          System.arraycopy(bytesValues, 0, _bytesValuesSV, 0, numDocs);
-        } else {
-          for (int j = 0; j < numDocs; j++) {
-            if (selected[j] == i) {
-              _bytesValuesSV[j] = bytesValues[j];
-            }
+  protected byte[][] transformToBytesValuesSVUsingValue(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, false);
+    int numDocs = valueBlock.getNumDocs();
+    initBytesValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, byte[][]> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).transformToBytesValuesSV(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        _bytesValuesSV[docId] = thenStatementsIndexToValues.get(selected[docId])[docId];
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bytesValuesSV[docId] = (byte[]) DataSchema.ColumnDataType.BYTES.getNullPlaceholder();
+        }
+      } else {
+        byte[][] byteValuesSV = _elseStatement.transformToBytesValuesSV(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bytesValuesSV[docId] = byteValuesSV[docId];
+        }
+      }
+    }
+    return _bytesValuesSV;
+  }
+
+  @Override
+  protected byte[][] transformToBytesValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    initStringValuesSV(numDocs);
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    Map<Integer, Pair<byte[][], RoaringBitmap>> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, ImmutablePair.of(_thenStatements.get(i).transformToBytesValuesSV(valueBlock),
+            _thenStatements.get(i).getNullBitmap(valueBlock)));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        Pair<byte[][], RoaringBitmap> nullValuePair = thenStatementsIndexToValues.get(selected[docId]);
+        _bytesValuesSV[docId] = nullValuePair.getLeft()[docId];
+        RoaringBitmap nullBitmap = nullValuePair.getRight();
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+        if (unselectedDocs.isEmpty()) {
+          break;
+        }
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bytesValuesSV[docId] = (byte[]) DataSchema.ColumnDataType.BYTES.getNullPlaceholder();
+          bitmap.add(docId);
+        }
+      } else {
+        byte[][] byteValues = _elseStatement.transformToBytesValuesSV(valueBlock);
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          _bytesValuesSV[docId] = byteValues[docId];
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
           }
         }
       }
     }
     return _bytesValuesSV;
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    int[] selected = getSelectedArray(valueBlock, true);
+    int numDocs = valueBlock.getNumDocs();
+    int numThenStatements = _thenStatements.size();
+    BitSet unselectedDocs = new BitSet();
+    unselectedDocs.set(0, numDocs);
+    final RoaringBitmap bitmap = new RoaringBitmap();
+    Map<Integer, RoaringBitmap> thenStatementsIndexToValues = new HashMap<>();
+    for (int i = 0; i < numThenStatements; i++) {
+      if (_computeThenStatements[i]) {
+        thenStatementsIndexToValues.put(i, _thenStatements.get(i).getNullBitmap(valueBlock));
+      }
+    }
+    for (int docId = 0; docId < numDocs; docId++) {
+      if (selected[docId] >= 0) {
+        RoaringBitmap nullBitmap = thenStatementsIndexToValues.get(selected[docId]);
+        if (nullBitmap != null && nullBitmap.contains(docId)) {
+          bitmap.add(docId);
+        }
+        unselectedDocs.clear(docId);
+      }
+    }
+    if (!unselectedDocs.isEmpty()) {
+      if (_elseStatement == null) {
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          bitmap.add(docId);
+        }
+      } else {
+        RoaringBitmap nullBitmap = _elseStatement.getNullBitmap(valueBlock);
+        for (int docId = unselectedDocs.nextSetBit(0); docId >= 0; docId = unselectedDocs.nextSetBit(docId + 1)) {
+          if (nullBitmap != null && nullBitmap.contains(docId)) {
+            bitmap.add(docId);
+          }
+        }
+      }
+    }
+    if (bitmap.isEmpty()) {
+      return null;
+    }
+    return bitmap;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CastTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CastTransformFunction.java
index 52ab528e897..f500e601f77 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CastTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CastTransformFunction.java
@@ -22,9 +22,9 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 
@@ -42,7 +42,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are more than 1 arguments
     if (arguments.size() != 2) {
       throw new IllegalArgumentException("Exactly 2 arguments are required for CAST transform function");
@@ -54,7 +55,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     boolean sourceSV = sourceMetadata.isSingleValue();
     TransformFunction castFormatTransformFunction = arguments.get(1);
     if (castFormatTransformFunction instanceof LiteralTransformFunction) {
-      String targetType = ((LiteralTransformFunction) castFormatTransformFunction).getLiteral().toUpperCase();
+      String targetType = ((LiteralTransformFunction) castFormatTransformFunction).getStringLiteral().toUpperCase();
       switch (targetType) {
         case "INT":
         case "INTEGER":
@@ -104,46 +105,44 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
     switch (_resultMetadata.getDataType()) {
       case INT:
-        return _transformFunction.transformToIntValuesSV(projectionBlock);
+        return _transformFunction.transformToIntValuesSV(valueBlock);
       case BOOLEAN:
-        return transformToBooleanValuesSV(projectionBlock);
+        return transformToBooleanValuesSV(valueBlock);
       default:
-        return super.transformToIntValuesSV(projectionBlock);
+        return super.transformToIntValuesSV(valueBlock);
     }
   }
 
   // TODO: Add it to the interface
-  private int[] transformToBooleanValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
+  private int[] transformToBooleanValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     switch (_sourceDataType.getStoredType()) {
       case INT:
-        int[] intValues = _transformFunction.transformToIntValuesSV(projectionBlock);
+        int[] intValues = _transformFunction.transformToIntValuesSV(valueBlock);
         ArrayCopyUtils.copyToBoolean(intValues, _intValuesSV, length);
         break;
       case LONG:
-        long[] longValues = _transformFunction.transformToLongValuesSV(projectionBlock);
+        long[] longValues = _transformFunction.transformToLongValuesSV(valueBlock);
         ArrayCopyUtils.copyToBoolean(longValues, _intValuesSV, length);
         break;
       case FLOAT:
-        float[] floatValues = _transformFunction.transformToFloatValuesSV(projectionBlock);
+        float[] floatValues = _transformFunction.transformToFloatValuesSV(valueBlock);
         ArrayCopyUtils.copyToBoolean(floatValues, _intValuesSV, length);
         break;
       case DOUBLE:
-        double[] doubleValues = _transformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] doubleValues = _transformFunction.transformToDoubleValuesSV(valueBlock);
         ArrayCopyUtils.copyToBoolean(doubleValues, _intValuesSV, length);
         break;
       case BIG_DECIMAL:
-        BigDecimal[] bigDecimalValues = _transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] bigDecimalValues = _transformFunction.transformToBigDecimalValuesSV(valueBlock);
         ArrayCopyUtils.copyToBoolean(bigDecimalValues, _intValuesSV, length);
         break;
       case STRING:
-        String[] stringValues = _transformFunction.transformToStringValuesSV(projectionBlock);
+        String[] stringValues = _transformFunction.transformToStringValuesSV(valueBlock);
         ArrayCopyUtils.copyToBoolean(stringValues, _intValuesSV, length);
         break;
       default:
@@ -153,119 +152,111 @@ private int[] transformToBooleanValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     switch (_resultMetadata.getDataType()) {
       case LONG:
-        return _transformFunction.transformToLongValuesSV(projectionBlock);
+        return _transformFunction.transformToLongValuesSV(valueBlock);
       case TIMESTAMP:
-        return transformToTimestampValuesSV(projectionBlock);
+        return transformToTimestampValuesSV(valueBlock);
       default:
-        return super.transformToLongValuesSV(projectionBlock);
+        return super.transformToLongValuesSV(valueBlock);
     }
   }
 
   // TODO: Add it to the interface
-  private long[] transformToTimestampValuesSV(ProjectionBlock projectionBlock) {
+  private long[] transformToTimestampValuesSV(ValueBlock valueBlock) {
     if (_sourceDataType.getStoredType() == DataType.STRING) {
-      int length = projectionBlock.getNumDocs();
-      if (_longValuesSV == null) {
-        _longValuesSV = new long[length];
-      }
-      String[] stringValues = _transformFunction.transformToStringValuesSV(projectionBlock);
+      int length = valueBlock.getNumDocs();
+      initLongValuesSV(length);
+      String[] stringValues = _transformFunction.transformToStringValuesSV(valueBlock);
       ArrayCopyUtils.copyToTimestamp(stringValues, _longValuesSV, length);
       return _longValuesSV;
     } else {
-      return _transformFunction.transformToLongValuesSV(projectionBlock);
+      return _transformFunction.transformToLongValuesSV(valueBlock);
     }
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() == DataType.FLOAT) {
-      return _transformFunction.transformToFloatValuesSV(projectionBlock);
+      return _transformFunction.transformToFloatValuesSV(valueBlock);
     } else {
-      return super.transformToFloatValuesSV(projectionBlock);
+      return super.transformToFloatValuesSV(valueBlock);
     }
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() == DataType.DOUBLE) {
-      return _transformFunction.transformToDoubleValuesSV(projectionBlock);
+      return _transformFunction.transformToDoubleValuesSV(valueBlock);
     } else {
-      return super.transformToDoubleValuesSV(projectionBlock);
+      return super.transformToDoubleValuesSV(valueBlock);
     }
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() == DataType.BIG_DECIMAL) {
-      return _transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+      return _transformFunction.transformToBigDecimalValuesSV(valueBlock);
     } else {
-      return super.transformToBigDecimalValuesSV(projectionBlock);
+      return super.transformToBigDecimalValuesSV(valueBlock);
     }
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     DataType resultDataType = _resultMetadata.getDataType();
     if (resultDataType.getStoredType() == DataType.STRING) {
       switch (_sourceDataType) {
         case BOOLEAN:
-          int length = projectionBlock.getNumDocs();
-          if (_stringValuesSV == null) {
-            _stringValuesSV = new String[length];
-          }
-          int[] intValues = _transformFunction.transformToIntValuesSV(projectionBlock);
+          int length = valueBlock.getNumDocs();
+          initStringValuesSV(length);
+          int[] intValues = _transformFunction.transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copyFromBoolean(intValues, _stringValuesSV, length);
           return _stringValuesSV;
         case TIMESTAMP:
-          length = projectionBlock.getNumDocs();
-          if (_stringValuesSV == null) {
-            _stringValuesSV = new String[length];
-          }
-          long[] longValues = _transformFunction.transformToLongValuesSV(projectionBlock);
+          length = valueBlock.getNumDocs();
+          initStringValuesSV(length);
+          long[] longValues = _transformFunction.transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copyFromTimestamp(longValues, _stringValuesSV, length);
           return _stringValuesSV;
         default:
-          return _transformFunction.transformToStringValuesSV(projectionBlock);
+          return _transformFunction.transformToStringValuesSV(valueBlock);
       }
     } else {
-      int length = projectionBlock.getNumDocs();
-      if (_stringValuesSV == null) {
-        _stringValuesSV = new String[length];
-      }
+      int length = valueBlock.getNumDocs();
+      initStringValuesSV(length);
       switch (resultDataType) {
         case INT:
-          int[] intValues = _transformFunction.transformToIntValuesSV(projectionBlock);
+          int[] intValues = _transformFunction.transformToIntValuesSV(valueBlock);
           ArrayCopyUtils.copy(intValues, _stringValuesSV, length);
           break;
         case LONG:
-          long[] longValues = _transformFunction.transformToLongValuesSV(projectionBlock);
+          long[] longValues = _transformFunction.transformToLongValuesSV(valueBlock);
           ArrayCopyUtils.copy(longValues, _stringValuesSV, length);
           break;
         case FLOAT:
-          float[] floatValues = _transformFunction.transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = _transformFunction.transformToFloatValuesSV(valueBlock);
           ArrayCopyUtils.copy(floatValues, _stringValuesSV, length);
           break;
         case DOUBLE:
-          double[] doubleValues = _transformFunction.transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = _transformFunction.transformToDoubleValuesSV(valueBlock);
           ArrayCopyUtils.copy(doubleValues, _stringValuesSV, length);
           break;
         case BIG_DECIMAL:
-          BigDecimal[] bigDecimalValues = _transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+          BigDecimal[] bigDecimalValues = _transformFunction.transformToBigDecimalValuesSV(valueBlock);
           ArrayCopyUtils.copy(bigDecimalValues, _stringValuesSV, length);
           break;
         case BOOLEAN:
-          intValues = transformToBooleanValuesSV(projectionBlock);
+          intValues = transformToBooleanValuesSV(valueBlock);
           ArrayCopyUtils.copyFromBoolean(intValues, _stringValuesSV, length);
           break;
         case TIMESTAMP:
-          longValues = transformToTimestampValuesSV(projectionBlock);
+          longValues = transformToTimestampValuesSV(valueBlock);
           ArrayCopyUtils.copyFromTimestamp(longValues, _stringValuesSV, length);
           break;
         case BYTES:
-          byte[][] bytesValues = transformToBytesValuesSV(projectionBlock);
+          byte[][] bytesValues = transformToBytesValuesSV(valueBlock);
           ArrayCopyUtils.copy(bytesValues, _stringValuesSV, length);
           break;
         default:
@@ -276,42 +267,40 @@ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
     switch (_resultMetadata.getDataType()) {
       case INT:
-        return _transformFunction.transformToIntValuesMV(projectionBlock);
+        return _transformFunction.transformToIntValuesMV(valueBlock);
       case BOOLEAN:
-        return transformToBooleanValuesMV(projectionBlock);
+        return transformToBooleanValuesMV(valueBlock);
       default:
-        return super.transformToIntValuesMV(projectionBlock);
+        return super.transformToIntValuesMV(valueBlock);
     }
   }
 
   // TODO: Add it to the interface
-  private int[][] transformToBooleanValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesMV == null) {
-      _intValuesMV = new int[length][];
-    }
+  private int[][] transformToBooleanValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesMV(length);
     switch (_sourceDataType.getStoredType()) {
       case INT:
-        int[][] intValuesMV = _transformFunction.transformToIntValuesMV(projectionBlock);
+        int[][] intValuesMV = _transformFunction.transformToIntValuesMV(valueBlock);
         ArrayCopyUtils.copyToBoolean(intValuesMV, _intValuesMV, length);
         break;
       case LONG:
-        long[][] longValuesMV = _transformFunction.transformToLongValuesMV(projectionBlock);
+        long[][] longValuesMV = _transformFunction.transformToLongValuesMV(valueBlock);
         ArrayCopyUtils.copyToBoolean(longValuesMV, _intValuesMV, length);
         break;
       case FLOAT:
-        float[][] floatValuesMV = _transformFunction.transformToFloatValuesMV(projectionBlock);
+        float[][] floatValuesMV = _transformFunction.transformToFloatValuesMV(valueBlock);
         ArrayCopyUtils.copyToBoolean(floatValuesMV, _intValuesMV, length);
         break;
       case DOUBLE:
-        double[][] doubleValuesMV = _transformFunction.transformToDoubleValuesMV(projectionBlock);
+        double[][] doubleValuesMV = _transformFunction.transformToDoubleValuesMV(valueBlock);
         ArrayCopyUtils.copyToBoolean(doubleValuesMV, _intValuesMV, length);
         break;
       case STRING:
-        String[][] stringValuesMV = _transformFunction.transformToStringValuesMV(projectionBlock);
+        String[][] stringValuesMV = _transformFunction.transformToStringValuesMV(valueBlock);
         ArrayCopyUtils.copyToBoolean(stringValuesMV, _intValuesMV, length);
         break;
       default:
@@ -321,102 +310,94 @@ private int[][] transformToBooleanValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
     switch (_resultMetadata.getDataType()) {
       case LONG:
-        return _transformFunction.transformToLongValuesMV(projectionBlock);
+        return _transformFunction.transformToLongValuesMV(valueBlock);
       case TIMESTAMP:
-        return transformToTimestampValuesMV(projectionBlock);
+        return transformToTimestampValuesMV(valueBlock);
       default:
-        return super.transformToLongValuesMV(projectionBlock);
+        return super.transformToLongValuesMV(valueBlock);
     }
   }
 
   // TODO: Add it to the interface
-  private long[][] transformToTimestampValuesMV(ProjectionBlock projectionBlock) {
+  private long[][] transformToTimestampValuesMV(ValueBlock valueBlock) {
     if (_sourceDataType.getStoredType() == DataType.STRING) {
-      int length = projectionBlock.getNumDocs();
-      if (_longValuesMV == null) {
-        _longValuesMV = new long[length][];
-      }
-      String[][] stringValuesMV = _transformFunction.transformToStringValuesMV(projectionBlock);
+      int length = valueBlock.getNumDocs();
+      initLongValuesMV(length);
+      String[][] stringValuesMV = _transformFunction.transformToStringValuesMV(valueBlock);
       ArrayCopyUtils.copyToTimestamp(stringValuesMV, _longValuesMV, length);
       return _longValuesMV;
     } else {
-      return _transformFunction.transformToLongValuesMV(projectionBlock);
+      return _transformFunction.transformToLongValuesMV(valueBlock);
     }
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() == DataType.FLOAT) {
-      return _transformFunction.transformToFloatValuesMV(projectionBlock);
+      return _transformFunction.transformToFloatValuesMV(valueBlock);
     } else {
-      return super.transformToFloatValuesMV(projectionBlock);
+      return super.transformToFloatValuesMV(valueBlock);
     }
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() == DataType.DOUBLE) {
-      return _transformFunction.transformToDoubleValuesMV(projectionBlock);
+      return _transformFunction.transformToDoubleValuesMV(valueBlock);
     } else {
-      return super.transformToDoubleValuesMV(projectionBlock);
+      return super.transformToDoubleValuesMV(valueBlock);
     }
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
     DataType resultDataType = _resultMetadata.getDataType();
     if (resultDataType.getStoredType() == DataType.STRING) {
       switch (_sourceDataType) {
         case BOOLEAN:
-          int length = projectionBlock.getNumDocs();
-          if (_stringValuesMV == null) {
-            _stringValuesMV = new String[length][];
-          }
-          int[][] intValuesMV = _transformFunction.transformToIntValuesMV(projectionBlock);
+          int length = valueBlock.getNumDocs();
+          initStringValuesMV(length);
+          int[][] intValuesMV = _transformFunction.transformToIntValuesMV(valueBlock);
           ArrayCopyUtils.copyFromBoolean(intValuesMV, _stringValuesMV, length);
           return _stringValuesMV;
         case TIMESTAMP:
-          length = projectionBlock.getNumDocs();
-          if (_stringValuesMV == null) {
-            _stringValuesMV = new String[length][];
-          }
-          long[][] longValuesMV = _transformFunction.transformToLongValuesMV(projectionBlock);
+          length = valueBlock.getNumDocs();
+          initStringValuesMV(length);
+          long[][] longValuesMV = _transformFunction.transformToLongValuesMV(valueBlock);
           ArrayCopyUtils.copyFromTimestamp(longValuesMV, _stringValuesMV, length);
           return _stringValuesMV;
         default:
-          return _transformFunction.transformToStringValuesMV(projectionBlock);
+          return _transformFunction.transformToStringValuesMV(valueBlock);
       }
     } else {
-      int length = projectionBlock.getNumDocs();
-      if (_stringValuesMV == null) {
-        _stringValuesMV = new String[length][];
-      }
+      int length = valueBlock.getNumDocs();
+      initStringValuesMV(length);
       switch (resultDataType) {
         case INT:
-          int[][] intValuesMV = _transformFunction.transformToIntValuesMV(projectionBlock);
+          int[][] intValuesMV = _transformFunction.transformToIntValuesMV(valueBlock);
           ArrayCopyUtils.copy(intValuesMV, _stringValuesMV, length);
           break;
         case LONG:
-          long[][] longValuesMV = _transformFunction.transformToLongValuesMV(projectionBlock);
+          long[][] longValuesMV = _transformFunction.transformToLongValuesMV(valueBlock);
           ArrayCopyUtils.copy(longValuesMV, _stringValuesMV, length);
           break;
         case FLOAT:
-          float[][] floatValuesMV = _transformFunction.transformToFloatValuesMV(projectionBlock);
+          float[][] floatValuesMV = _transformFunction.transformToFloatValuesMV(valueBlock);
           ArrayCopyUtils.copy(floatValuesMV, _stringValuesMV, length);
           break;
         case DOUBLE:
-          double[][] doubleValuesMV = _transformFunction.transformToDoubleValuesMV(projectionBlock);
+          double[][] doubleValuesMV = _transformFunction.transformToDoubleValuesMV(valueBlock);
           ArrayCopyUtils.copy(doubleValuesMV, _stringValuesMV, length);
           break;
         case BOOLEAN:
-          intValuesMV = transformToBooleanValuesMV(projectionBlock);
+          intValuesMV = transformToBooleanValuesMV(valueBlock);
           ArrayCopyUtils.copyFromBoolean(intValuesMV, _stringValuesMV, length);
           break;
         case TIMESTAMP:
-          longValuesMV = transformToTimestampValuesMV(projectionBlock);
+          longValuesMV = transformToTimestampValuesMV(valueBlock);
           ArrayCopyUtils.copyFromTimestamp(longValuesMV, _stringValuesMV, length);
           break;
         default:
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunction.java
index 7a5b477764f..ba677c25799 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunction.java
@@ -23,9 +23,10 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.roaringbitmap.RoaringBitmap;
 
@@ -33,66 +34,78 @@
 /**
  * The <code>CoalesceTransformFunction</code> implements the Coalesce operator.
  *
- * The results are in String format for first non-null value in the argument list.
- * If all arguments are null, return a 'null' string.
- * Note: arguments have to be column names and single type. The type can be either numeric or string.
+ * The result is first non-null value in the argument list.
+ * If all arguments are null, return null.
+ *
+ * Note: arguments have to be compatible type.
  * Number of arguments has to be greater than 0.
  *
  * Expected result:
  * Coalesce(nullColumn, columnA): columnA
- * Coalesce(columnA, nullColumn): nullColumn
- * Coalesce(nullColumnA, nullColumnB): "null"
+ * Coalesce(columnA, nullColumn): columnA
+ * Coalesce(nullColumnA, nullColumnB): null
  *
- * Note this operator only takes column names for now.
- * SQL Syntax:
- *    Coalesce(columnA, columnB)
  */
 public class CoalesceTransformFunction extends BaseTransformFunction {
-  public static final int NULL_INT = Integer.MIN_VALUE;
-  public static final long NULL_LONG = Long.MIN_VALUE;
-  public static final float NULL_FLOAT = Float.NEGATIVE_INFINITY;
-  public static final double NULL_DOUBLE = Double.NEGATIVE_INFINITY;
-  public static final BigDecimal NULL_BIG_DECIMAL = BigDecimal.valueOf(Long.MIN_VALUE);
-  public static final String NULL_STRING = "null";
-
   private TransformFunction[] _transformFunctions;
   private DataType _dataType;
   private TransformResultMetadata _resultMetadata;
 
   /**
-   * Returns a bit map of corresponding column.
-   * Returns an empty bitmap by default if null option is disabled.
+   * Returns a bit map of corresponding column. Returns an empty bitmap by default if null option is disabled.
    */
-  private static RoaringBitmap[] getNullBitMaps(ProjectionBlock projectionBlock,
-      TransformFunction[] transformFunctions) {
+  private static RoaringBitmap[] getNullBitMaps(ValueBlock valueBlock, TransformFunction[] transformFunctions) {
     RoaringBitmap[] roaringBitmaps = new RoaringBitmap[transformFunctions.length];
     for (int i = 0; i < roaringBitmaps.length; i++) {
       TransformFunction func = transformFunctions[i];
-      if (func instanceof IdentifierTransformFunction) {
-        String columnName = ((IdentifierTransformFunction) func).getColumnName();
-        RoaringBitmap nullBitmap = projectionBlock.getBlockValueSet(columnName).getNullBitmap();
-        roaringBitmaps[i] = nullBitmap;
-      } else {
-        // Consider literal as not null.
-        roaringBitmaps[i] = new RoaringBitmap();
-      }
+      roaringBitmaps[i] = func.getNullBitmap(valueBlock);
     }
     return roaringBitmaps;
   }
 
   /**
-   * Get transform int results based on store type.
-   * @param projectionBlock
+   * Get compatible data type of left and right.
+   * When left or right is numerical, we check both data types are numerical and widen the type.
+   * Otherwise, return string type.
+   *
+   * @param left  data type
+   * @param right data type
+   * @return compatible data type.
    */
-  private int[] getIntTransformResults(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
+  private static DataType getCompatibleType(DataType left, DataType right) {
+    if (left.isNumeric() && right.isNumeric()) {
+      if (left == DataType.BIG_DECIMAL || right == DataType.BIG_DECIMAL) {
+        return DataType.BIG_DECIMAL;
+      }
+      if (left == DataType.DOUBLE || right == DataType.DOUBLE) {
+        return DataType.DOUBLE;
+      }
+      if (left == DataType.FLOAT || right == DataType.FLOAT) {
+        return DataType.FLOAT;
+      }
+      if (left == DataType.LONG || right == DataType.LONG) {
+        return DataType.LONG;
+      }
+      return DataType.INT;
+    }
+    if (left == DataType.UNKNOWN) {
+      return right;
     }
+    if (right == DataType.UNKNOWN) {
+      return left;
+    }
+    return DataType.STRING;
+  }
+
+  /**
+   * Get transform int results based on store type.
+   */
+  private int[] getIntTransformResults(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     int width = _transformFunctions.length;
-    RoaringBitmap[] nullBitMaps = getNullBitMaps(projectionBlock, _transformFunctions);
-    int[][] data = new int[width][length];
-    RoaringBitmap filledData = new RoaringBitmap();
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    int[][] data = new int[width][];
     for (int i = 0; i < length; i++) {
       boolean hasNonNullValue = false;
       for (int j = 0; j < width; j++) {
@@ -100,16 +113,15 @@ private int[] getIntTransformResults(ProjectionBlock projectionBlock) {
         if (nullBitMaps[j] != null && nullBitMaps[j].contains(i)) {
           continue;
         }
-        if (!filledData.contains(j)) {
-          filledData.add(j);
-          data[j] = _transformFunctions[j].transformToIntValuesSV(projectionBlock);
+        if (data[j] == null) {
+          data[j] = _transformFunctions[j].transformToIntValuesSV(valueBlock);
         }
         hasNonNullValue = true;
         _intValuesSV[i] = data[j][i];
         break;
       }
       if (!hasNonNullValue) {
-        _intValuesSV[i] = NULL_INT;
+        _intValuesSV[i] = (int) DataSchema.ColumnDataType.INT.getNullPlaceholder();
       }
     }
     return _intValuesSV;
@@ -117,17 +129,13 @@ private int[] getIntTransformResults(ProjectionBlock projectionBlock) {
 
   /**
    * Get transform long results based on store type.
-   * @param projectionBlock
    */
-  private long[] getLongTransformResults(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
-    }
+  private long[] getLongTransformResults(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
     int width = _transformFunctions.length;
-    RoaringBitmap[] nullBitMaps = getNullBitMaps(projectionBlock, _transformFunctions);
-    long[][] data = new long[width][length];
-    RoaringBitmap filledData = new RoaringBitmap(); // indicates whether certain column has be filled in data.
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    long[][] data = new long[width][];
     for (int i = 0; i < length; i++) {
       boolean hasNonNullValue = false;
       for (int j = 0; j < width; j++) {
@@ -135,16 +143,15 @@ private long[] getLongTransformResults(ProjectionBlock projectionBlock) {
         if (nullBitMaps[j] != null && nullBitMaps[j].contains(i)) {
           continue;
         }
-        if (!filledData.contains(j)) {
-          filledData.add(j);
-          data[j] = _transformFunctions[j].transformToLongValuesSV(projectionBlock);
+        if (data[j] == null) {
+          data[j] = _transformFunctions[j].transformToLongValuesSV(valueBlock);
         }
         hasNonNullValue = true;
         _longValuesSV[i] = data[j][i];
         break;
       }
       if (!hasNonNullValue) {
-        _longValuesSV[i] = NULL_LONG;
+        _longValuesSV[i] = (long) DataSchema.ColumnDataType.LONG.getNullPlaceholder();
       }
     }
     return _longValuesSV;
@@ -152,17 +159,13 @@ private long[] getLongTransformResults(ProjectionBlock projectionBlock) {
 
   /**
    * Get transform float results based on store type.
-   * @param projectionBlock
    */
-  private float[] getFloatTransformResults(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[length];
-    }
+  private float[] getFloatTransformResults(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initFloatValuesSV(length);
     int width = _transformFunctions.length;
-    RoaringBitmap[] nullBitMaps = getNullBitMaps(projectionBlock, _transformFunctions);
-    float[][] data = new float[width][length];
-    RoaringBitmap filledData = new RoaringBitmap(); // indicates whether certain column has be filled in data.
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    float[][] data = new float[width][];
     for (int i = 0; i < length; i++) {
       boolean hasNonNullValue = false;
       for (int j = 0; j < width; j++) {
@@ -170,16 +173,15 @@ private float[] getFloatTransformResults(ProjectionBlock projectionBlock) {
         if (nullBitMaps[j] != null && nullBitMaps[j].contains(i)) {
           continue;
         }
-        if (!filledData.contains(j)) {
-          filledData.add(j);
-          data[j] = _transformFunctions[j].transformToFloatValuesSV(projectionBlock);
+        if (data[j] == null) {
+          data[j] = _transformFunctions[j].transformToFloatValuesSV(valueBlock);
         }
         hasNonNullValue = true;
         _floatValuesSV[i] = data[j][i];
         break;
       }
       if (!hasNonNullValue) {
-        _floatValuesSV[i] = NULL_FLOAT;
+        _floatValuesSV[i] = (float) DataSchema.ColumnDataType.FLOAT.getNullPlaceholder();
       }
     }
     return _floatValuesSV;
@@ -187,17 +189,13 @@ private float[] getFloatTransformResults(ProjectionBlock projectionBlock) {
 
   /**
    * Get transform double results based on store type.
-   * @param projectionBlock
    */
-  private double[] getDoubleTransformResults(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  private double[] getDoubleTransformResults(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     int width = _transformFunctions.length;
-    RoaringBitmap[] nullBitMaps = getNullBitMaps(projectionBlock, _transformFunctions);
-    double[][] data = new double[width][length];
-    RoaringBitmap filledData = new RoaringBitmap(); // indicates whether certain column has be filled in data.
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    double[][] data = new double[width][];
     for (int i = 0; i < length; i++) {
       boolean hasNonNullValue = false;
       for (int j = 0; j < width; j++) {
@@ -205,16 +203,15 @@ private double[] getDoubleTransformResults(ProjectionBlock projectionBlock) {
         if (nullBitMaps[j] != null && nullBitMaps[j].contains(i)) {
           continue;
         }
-        if (!filledData.contains(j)) {
-          filledData.add(j);
-          data[j] = _transformFunctions[j].transformToDoubleValuesSV(projectionBlock);
+        if (data[j] == null) {
+          data[j] = _transformFunctions[j].transformToDoubleValuesSV(valueBlock);
         }
         hasNonNullValue = true;
         _doubleValuesSV[i] = data[j][i];
         break;
       }
       if (!hasNonNullValue) {
-        _doubleValuesSV[i] = NULL_DOUBLE;
+        _doubleValuesSV[i] = (double) DataSchema.ColumnDataType.DOUBLE.getNullPlaceholder();
       }
     }
     return _doubleValuesSV;
@@ -222,17 +219,13 @@ private double[] getDoubleTransformResults(ProjectionBlock projectionBlock) {
 
   /**
    * Get transform BigDecimal results based on store type.
-   * @param projectionBlock
    */
-  private BigDecimal[] getBigDecimalTransformResults(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  private BigDecimal[] getBigDecimalTransformResults(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     int width = _transformFunctions.length;
-    RoaringBitmap[] nullBitMaps = getNullBitMaps(projectionBlock, _transformFunctions);
-    BigDecimal[][] data = new BigDecimal[width][length];
-    RoaringBitmap filledData = new RoaringBitmap(); // indicates whether certain column has be filled in data.
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    BigDecimal[][] data = new BigDecimal[width][];
     for (int i = 0; i < length; i++) {
       boolean hasNonNullValue = false;
       for (int j = 0; j < width; j++) {
@@ -240,16 +233,15 @@ private BigDecimal[] getBigDecimalTransformResults(ProjectionBlock projectionBlo
         if (nullBitMaps[j] != null && nullBitMaps[j].contains(i)) {
           continue;
         }
-        if (!filledData.contains(j)) {
-          filledData.add(j);
-          data[j] = _transformFunctions[j].transformToBigDecimalValuesSV(projectionBlock);
+        if (data[j] == null) {
+          data[j] = _transformFunctions[j].transformToBigDecimalValuesSV(valueBlock);
         }
         hasNonNullValue = true;
         _bigDecimalValuesSV[i] = data[j][i];
         break;
       }
       if (!hasNonNullValue) {
-        _bigDecimalValuesSV[i] = NULL_BIG_DECIMAL;
+        _bigDecimalValuesSV[i] = (BigDecimal) DataSchema.ColumnDataType.BIG_DECIMAL.getNullPlaceholder();
       }
     }
     return _bigDecimalValuesSV;
@@ -257,17 +249,13 @@ private BigDecimal[] getBigDecimalTransformResults(ProjectionBlock projectionBlo
 
   /**
    * Get transform String results based on store type.
-   * @param projectionBlock
    */
-  private String[] getStringTransformResults(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
-    }
+  private String[] getStringTransformResults(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
     int width = _transformFunctions.length;
-    RoaringBitmap[] nullBitMaps = getNullBitMaps(projectionBlock, _transformFunctions);
-    String[][] data = new String[width][length];
-    RoaringBitmap filledData = new RoaringBitmap(); // indicates whether certain column has be filled in data.
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    String[][] data = new String[width][];
     for (int i = 0; i < length; i++) {
       boolean hasNonNullValue = false;
       for (int j = 0; j < width; j++) {
@@ -275,16 +263,15 @@ private String[] getStringTransformResults(ProjectionBlock projectionBlock) {
         if (nullBitMaps[j] != null && nullBitMaps[j].contains(i)) {
           continue;
         }
-        if (!filledData.contains(j)) {
-          filledData.add(j);
-          data[j] = _transformFunctions[j].transformToStringValuesSV(projectionBlock);
+        if (data[j] == null) {
+          data[j] = _transformFunctions[j].transformToStringValuesSV(valueBlock);
         }
         hasNonNullValue = true;
         _stringValuesSV[i] = data[j][i];
         break;
       }
       if (!hasNonNullValue) {
-        _stringValuesSV[i] = NULL_STRING;
+        _stringValuesSV[i] = (String) DataSchema.ColumnDataType.STRING.getNullPlaceholder();
       }
     }
     return _stringValuesSV;
@@ -296,20 +283,17 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     int argSize = arguments.size();
     Preconditions.checkArgument(argSize > 0, "COALESCE needs to have at least one argument.");
     _transformFunctions = new TransformFunction[argSize];
     for (int i = 0; i < argSize; i++) {
       TransformFunction func = arguments.get(i);
-      Preconditions.checkArgument(
-          func instanceof IdentifierTransformFunction || func instanceof LiteralTransformFunction,
-          "Only column names and literals are supported in COALESCE.");
       DataType dataType = func.getResultMetadata().getDataType();
-      if (_dataType == null) {
-        _dataType = dataType;
+      if (_dataType != null) {
+        _dataType = getCompatibleType(_dataType, dataType);
       } else {
-        Preconditions.checkArgument(dataType == _dataType, "Argument types have to be the same.");
+        _dataType = dataType;
       }
       _transformFunctions[i] = func;
     }
@@ -333,6 +317,9 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       case STRING:
         _resultMetadata = STRING_SV_NO_DICTIONARY_METADATA;
         break;
+      case UNKNOWN:
+        _resultMetadata = UNKNOWN_METADATA;
+        break;
       default:
         throw new UnsupportedOperationException("Coalesce only supports numerical and string data type");
     }
@@ -344,50 +331,70 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
     if (_dataType != DataType.INT) {
-      return super.transformToIntValuesSV(projectionBlock);
+      return super.transformToIntValuesSV(valueBlock);
     }
-    return getIntTransformResults(projectionBlock);
+    return getIntTransformResults(valueBlock);
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_dataType != DataType.LONG) {
-      return super.transformToLongValuesSV(projectionBlock);
+      return super.transformToLongValuesSV(valueBlock);
     }
-    return getLongTransformResults(projectionBlock);
+    return getLongTransformResults(valueBlock);
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
     if (_dataType != DataType.FLOAT) {
-      return super.transformToFloatValuesSV(projectionBlock);
+      return super.transformToFloatValuesSV(valueBlock);
     }
-    return getFloatTransformResults(projectionBlock);
+    return getFloatTransformResults(valueBlock);
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_dataType != DataType.DOUBLE) {
-      return super.transformToDoubleValuesSV(projectionBlock);
+      return super.transformToDoubleValuesSV(valueBlock);
     }
-    return getDoubleTransformResults(projectionBlock);
+    return getDoubleTransformResults(valueBlock);
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
     if (_dataType != DataType.BIG_DECIMAL) {
-      return super.transformToBigDecimalValuesSV(projectionBlock);
+      return super.transformToBigDecimalValuesSV(valueBlock);
     }
-    return getBigDecimalTransformResults(projectionBlock);
+    return getBigDecimalTransformResults(valueBlock);
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_dataType != DataType.STRING) {
-      return super.transformToStringValuesSV(projectionBlock);
+      return super.transformToStringValuesSV(valueBlock);
+    }
+    return getStringTransformResults(valueBlock);
+  }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    RoaringBitmap[] nullBitMaps = getNullBitMaps(valueBlock, _transformFunctions);
+    RoaringBitmap bitmap = nullBitMaps[0];
+    if (bitmap == null || bitmap.isEmpty()) {
+      return null;
+    }
+    for (int i = 1; i < nullBitMaps.length; i++) {
+      RoaringBitmap curBitmap = nullBitMaps[i];
+      if (curBitmap == null || curBitmap.isEmpty()) {
+        return null;
+      }
+      bitmap.and(curBitmap);
+    }
+    if (bitmap == null || bitmap.isEmpty()) {
+      return null;
     }
-    return getStringTransformResults(projectionBlock);
+    return bitmap;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ComputeDifferentlyWhenNullHandlingEnabledTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ComputeDifferentlyWhenNullHandlingEnabledTransformFunction.java
new file mode 100644
index 00000000000..5d2d6b8da66
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ComputeDifferentlyWhenNullHandlingEnabledTransformFunction.java
@@ -0,0 +1,177 @@
+/**
+ * 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.pinot.core.operator.transform.function;
+
+import java.math.BigDecimal;
+import javax.annotation.Nullable;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.roaringbitmap.RoaringBitmap;
+
+
+/**
+ * Base class for transform functions that compute differently (using value and NULL together) when NULL handling is
+ * enabled.
+ */
+public abstract class ComputeDifferentlyWhenNullHandlingEnabledTransformFunction extends BaseTransformFunction {
+
+  @Override
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.INT) {
+      return super.transformToIntValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToIntValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToIntValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected int[] transformToIntValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected int[] transformToIntValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.LONG) {
+      return super.transformToLongValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToLongValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToLongValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected long[] transformToLongValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected long[] transformToLongValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.FLOAT) {
+      return super.transformToFloatValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToFloatValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToFloatValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected float[] transformToFloatValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected float[] transformToFloatValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.DOUBLE) {
+      return super.transformToDoubleValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToDoubleValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToDoubleValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected double[] transformToDoubleValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected double[] transformToDoubleValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.BIG_DECIMAL) {
+      return super.transformToBigDecimalValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToBigDecimalValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToBigDecimalValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected BigDecimal[] transformToBigDecimalValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected BigDecimal[] transformToBigDecimalValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.STRING) {
+      return super.transformToStringValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToStringValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToStringValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected String[] transformToStringValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected String[] transformToStringValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
+    if (getResultMetadata().getDataType().getStoredType() != FieldSpec.DataType.BYTES) {
+      return super.transformToBytesValuesSV(valueBlock);
+    }
+    if (_nullHandlingEnabled) {
+      return transformToBytesValuesSVUsingValueAndNull(valueBlock);
+    } else {
+      return transformToBytesValuesSVUsingValue(valueBlock);
+    }
+  }
+
+  protected byte[][] transformToBytesValuesSVUsingValue(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected byte[][] transformToBytesValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Nullable
+  @Override
+  public abstract RoaringBitmap getNullBitmap(ValueBlock valueBlock);
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunction.java
index 6fe5fedc4e8..c5e255bf259 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunction.java
@@ -20,7 +20,8 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.transformer.datetime.BaseDateTimeTransformer;
 import org.apache.pinot.core.operator.transform.transformer.datetime.DateTimeTransformerFactory;
@@ -28,8 +29,8 @@
 import org.apache.pinot.core.operator.transform.transformer.datetime.EpochToSDFTransformer;
 import org.apache.pinot.core.operator.transform.transformer.datetime.SDFToEpochTransformer;
 import org.apache.pinot.core.operator.transform.transformer.datetime.SDFToSDFTransformer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.DateTimeFieldSpec;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -90,12 +91,11 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     // Check that there are exactly 4 arguments
     if (arguments.size() != 4) {
       throw new IllegalArgumentException("Exactly 4 arguments are required for DATE_TIME_CONVERT transform function");
     }
-
     TransformFunction firstArgument = arguments.get(0);
     if (firstArgument instanceof LiteralTransformFunction || !firstArgument.getResultMetadata().isSingleValue()) {
       throw new IllegalArgumentException(
@@ -104,10 +104,10 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     }
     _mainTransformFunction = firstArgument;
 
-    _dateTimeTransformer =
-        DateTimeTransformerFactory.getDateTimeTransformer(((LiteralTransformFunction) arguments.get(1)).getLiteral(),
-            ((LiteralTransformFunction) arguments.get(2)).getLiteral(),
-            ((LiteralTransformFunction) arguments.get(3)).getLiteral());
+    _dateTimeTransformer = DateTimeTransformerFactory.getDateTimeTransformer(
+        ((LiteralTransformFunction) arguments.get(1)).getStringLiteral(),
+        ((LiteralTransformFunction) arguments.get(2)).getStringLiteral(),
+        ((LiteralTransformFunction) arguments.get(3)).getStringLiteral());
     if (_dateTimeTransformer instanceof EpochToEpochTransformer
         || _dateTimeTransformer instanceof SDFToEpochTransformer) {
       _resultMetadata = LONG_SV_NO_DICTIONARY_METADATA;
@@ -122,44 +122,44 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata != LONG_SV_NO_DICTIONARY_METADATA) {
-      return super.transformToLongValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
+      return super.transformToLongValuesSV(valueBlock);
     }
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
     if (_dateTimeTransformer instanceof EpochToEpochTransformer) {
       EpochToEpochTransformer dateTimeTransformer = (EpochToEpochTransformer) _dateTimeTransformer;
-      dateTimeTransformer.transform(_mainTransformFunction.transformToLongValuesSV(projectionBlock), _longValuesSV,
-          length);
+      dateTimeTransformer.transform(_mainTransformFunction.transformToLongValuesSV(valueBlock), _longValuesSV, length);
     } else {
       SDFToEpochTransformer dateTimeTransformer = (SDFToEpochTransformer) _dateTimeTransformer;
-      dateTimeTransformer.transform(_mainTransformFunction.transformToStringValuesSV(projectionBlock), _longValuesSV,
+      dateTimeTransformer.transform(_mainTransformFunction.transformToStringValuesSV(valueBlock), _longValuesSV,
           length);
     }
     return _longValuesSV;
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata != STRING_SV_NO_DICTIONARY_METADATA) {
-      return super.transformToStringValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
+      return super.transformToStringValuesSV(valueBlock);
     }
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
     if (_dateTimeTransformer instanceof EpochToSDFTransformer) {
       EpochToSDFTransformer dateTimeTransformer = (EpochToSDFTransformer) _dateTimeTransformer;
-      dateTimeTransformer.transform(_mainTransformFunction.transformToLongValuesSV(projectionBlock), _stringValuesSV,
+      dateTimeTransformer.transform(_mainTransformFunction.transformToLongValuesSV(valueBlock), _stringValuesSV,
           length);
     } else {
       SDFToSDFTransformer dateTimeTransformer = (SDFToSDFTransformer) _dateTimeTransformer;
-      dateTimeTransformer.transform(_mainTransformFunction.transformToStringValuesSV(projectionBlock), _stringValuesSV,
+      dateTimeTransformer.transform(_mainTransformFunction.transformToStringValuesSV(valueBlock), _stringValuesSV,
           length);
     }
     return _stringValuesSV;
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return _mainTransformFunction.getNullBitmap(valueBlock);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunction.java
index 3baf71a990c..2e6fe016579 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunction.java
@@ -22,14 +22,15 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.joda.time.Chronology;
 import org.joda.time.DateTimeField;
 import org.joda.time.DateTimeZone;
 import org.joda.time.chrono.ISOChronology;
+import org.roaringbitmap.RoaringBitmap;
 
 
 public abstract class DateTimeTransformFunction extends BaseTransformFunction {
@@ -46,14 +47,14 @@ protected DateTimeTransformFunction(String name) {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(!arguments.isEmpty() && arguments.size() <= 2, "%s takes one or two arguments", _name);
     _timestampsFunction = arguments.get(0);
     if (arguments.size() == 2) {
       Preconditions.checkArgument(arguments.get(1) instanceof LiteralTransformFunction,
           "zoneId parameter %s must be a literal", _name);
-      _chronology =
-          ISOChronology.getInstance(DateTimeZone.forID(((LiteralTransformFunction) arguments.get(1)).getLiteral()));
+      _chronology = ISOChronology.getInstance(
+          DateTimeZone.forID(((LiteralTransformFunction) arguments.get(1)).getStringLiteral()));
     } else {
       _chronology = UTC;
     }
@@ -70,12 +71,10 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    long[] timestamps = _timestampsFunction.transformToLongValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    long[] timestamps = _timestampsFunction.transformToLongValuesSV(valueBlock);
     convert(timestamps, numDocs, _intValuesSV);
     return _intValuesSV;
   }
@@ -261,4 +260,9 @@ protected void convert(long[] timestamps, int numDocs, int[] output) {
       }
     }
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return _timestampsFunction.getNullBitmap(valueBlock);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTruncTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTruncTransformFunction.java
index 6a9a7ce47bd..f10d0bfa43a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTruncTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DateTruncTransformFunction.java
@@ -24,10 +24,11 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.pinot.common.function.DateTimeUtils;
 import org.apache.pinot.common.function.TimeZoneKey;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.joda.time.DateTimeField;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -96,23 +97,23 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() >= 2 && arguments.size() <= 5,
         "Between two to five arguments are required, example: %s", EXAMPLE_INVOCATION);
-    String unit = ((LiteralTransformFunction) arguments.get(0)).getLiteral().toLowerCase();
+    String unit = ((LiteralTransformFunction) arguments.get(0)).getStringLiteral().toLowerCase();
     TransformFunction valueArgument = arguments.get(1);
     Preconditions.checkArgument(
         !(valueArgument instanceof LiteralTransformFunction) && valueArgument.getResultMetadata().isSingleValue(),
         "The second argument of dateTrunc transform function must be a single-valued column or a transform function");
     _mainTransformFunction = valueArgument;
     String inputTimeUnitStr =
-        (arguments.size() >= 3) ? ((LiteralTransformFunction) arguments.get(2)).getLiteral().toUpperCase()
+        (arguments.size() >= 3) ? ((LiteralTransformFunction) arguments.get(2)).getStringLiteral().toUpperCase()
             : TimeUnit.MILLISECONDS.name();
     _inputTimeUnit = TimeUnit.valueOf(inputTimeUnitStr);
 
-    String timeZone = arguments.size() >= 4 ? ((LiteralTransformFunction) arguments.get(3)).getLiteral() : UTC_TZ;
+    String timeZone = arguments.size() >= 4 ? ((LiteralTransformFunction) arguments.get(3)).getStringLiteral() : UTC_TZ;
     String outputTimeUnitStr =
-        arguments.size() >= 5 ? ((LiteralTransformFunction) arguments.get(4)).getLiteral().toUpperCase()
+        arguments.size() >= 5 ? ((LiteralTransformFunction) arguments.get(4)).getStringLiteral().toUpperCase()
             : inputTimeUnitStr;
     TimeZoneKey timeZoneKey = TimeZoneKey.getTimeZoneKey(timeZone);
 
@@ -127,12 +128,10 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
-    }
-    long[] input = _mainTransformFunction.transformToLongValuesSV(projectionBlock);
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
+    long[] input = _mainTransformFunction.transformToLongValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       _longValuesSV[i] =
           _outputTimeUnit.convert(_field.roundFloor(TimeUnit.MILLISECONDS.convert(input[i], _inputTimeUnit)),
@@ -140,4 +139,9 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
     }
     return _longValuesSV;
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return _mainTransformFunction.getNullBitmap(valueBlock);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunction.java
index 606e63d5255..07c2e0cabb6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunction.java
@@ -18,13 +18,10 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
-import java.util.List;
-import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.roaringbitmap.IntConsumer;
 import org.roaringbitmap.RoaringBitmap;
 
@@ -44,16 +41,6 @@ public class DistinctFromTransformFunction extends BinaryOperatorTransformFuncti
   // 0 for isDistinct, 1 for isNotDistinct
   private final int _notDistinctResult;
 
-  /**
-   * Returns a bit map of corresponding column.
-   * Returns null by default if null option is disabled.
-   */
-  @Nullable
-  private static RoaringBitmap getNullBitMap(ProjectionBlock projectionBlock, TransformFunction transformFunction) {
-    String columnName = ((IdentifierTransformFunction) transformFunction).getColumnName();
-    return projectionBlock.getBlockValueSet(columnName).getNullBitmap();
-  }
-
   /**
    * Returns true when bitmap is null (null option is disabled) or bitmap is empty.
    */
@@ -78,25 +65,16 @@ public String getName() {
     return TransformFunctionType.IS_NOT_DISTINCT_FROM.getName();
   }
 
-  @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
-    super.init(arguments, dataSourceMap);
-    if (!(_leftTransformFunction instanceof IdentifierTransformFunction)
-        || !(_rightTransformFunction instanceof IdentifierTransformFunction)) {
-      throw new IllegalArgumentException("Only column names are supported in DistinctFrom transformation.");
-    }
-  }
-
   @Override
   public TransformResultMetadata getResultMetadata() {
     return BOOLEAN_SV_NO_DICTIONARY_METADATA;
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    _intValuesSV = super.transformToIntValuesSV(projectionBlock);
-    RoaringBitmap leftNull = getNullBitMap(projectionBlock, _leftTransformFunction);
-    RoaringBitmap rightNull = getNullBitMap(projectionBlock, _rightTransformFunction);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    _intValuesSV = super.transformToIntValuesSV(valueBlock);
+    RoaringBitmap leftNull = _leftTransformFunction.getNullBitmap(valueBlock);
+    RoaringBitmap rightNull = _rightTransformFunction.getNullBitmap(valueBlock);
     // Both sides are not null.
     if (isEmpty(leftNull) && isEmpty(rightNull)) {
       return _intValuesSV;
@@ -121,4 +99,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
     andNull.forEach((IntConsumer) i -> _intValuesSV[i] = _notDistinctResult);
     return _intValuesSV;
   }
+
+  @Nullable
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return null;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunction.java
index 0b90fdebb84..b684df34704 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunction.java
@@ -23,9 +23,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 
@@ -45,7 +45,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are exactly 2 arguments
     if (arguments.size() != 2) {
       throw new IllegalArgumentException("Exactly 2 arguments are required for DIV transform function");
@@ -69,9 +70,9 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       if (argument instanceof LiteralTransformFunction) {
         LiteralTransformFunction literalTransformFunction = (LiteralTransformFunction) argument;
         if (_resultDataType == DataType.BIG_DECIMAL) {
-          _bigDecimalLiterals[i] = new BigDecimal(literalTransformFunction.getLiteral());
+          _bigDecimalLiterals[i] = literalTransformFunction.getBigDecimalLiteral();
         } else {
-          _doubleLiterals[i] = Double.parseDouble(((LiteralTransformFunction) argument).getLiteral());
+          _doubleLiterals[i] = ((LiteralTransformFunction) argument).getDoubleLiteral();
         }
       } else {
         if (!argument.getResultMetadata().isSingleValue()) {
@@ -96,19 +97,17 @@ public TransformResultMetadata getResultMetadata() {
 
   @SuppressWarnings("Duplicates")
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     if (_resultDataType == DataType.BIG_DECIMAL) {
-      BigDecimal[] values = transformToBigDecimalValuesSV(projectionBlock);
+      BigDecimal[] values = transformToBigDecimalValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _doubleValuesSV, length);
     } else {
       if (_firstTransformFunction == null) {
         Arrays.fill(_doubleValuesSV, 0, length, _doubleLiterals[0]);
       } else {
-        double[] values = _firstTransformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] values = _firstTransformFunction.transformToDoubleValuesSV(valueBlock);
         System.arraycopy(values, 0, _doubleValuesSV, 0, length);
       }
       if (_secondTransformFunction == null) {
@@ -116,7 +115,7 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
           _doubleValuesSV[i] /= _doubleLiterals[1];
         }
       } else {
-        double[] values = _secondTransformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] values = _secondTransformFunction.transformToDoubleValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _doubleValuesSV[i] /= values[i];
         }
@@ -126,19 +125,17 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     if (_resultDataType == DataType.DOUBLE) {
-      double[] values = transformToDoubleValuesSV(projectionBlock);
+      double[] values = transformToDoubleValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _bigDecimalValuesSV, length);
     } else {
       if (_firstTransformFunction == null) {
         Arrays.fill(_bigDecimalValuesSV, 0, length, _bigDecimalLiterals[0]);
       } else {
-        BigDecimal[] values = _firstTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] values = _firstTransformFunction.transformToBigDecimalValuesSV(valueBlock);
         System.arraycopy(values, 0, _bigDecimalValuesSV, 0, length);
       }
       if (_secondTransformFunction == null) {
@@ -147,7 +144,7 @@ public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBloc
           _bigDecimalValuesSV[i] = _bigDecimalValuesSV[i].divide(_bigDecimalLiterals[1], RoundingMode.HALF_EVEN);
         }
       } else {
-        BigDecimal[] values = _secondTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] values = _secondTransformFunction.transformToBigDecimalValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           // todo: expose roundingMode/mathContext as parameter in DivisionTransformFunction.
           _bigDecimalValuesSV[i] = _bigDecimalValuesSV[i].divide(values[i], RoundingMode.HALF_EVEN);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunction.java
index 9c08b6c514d..b92d19c2709 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunction.java
@@ -20,12 +20,13 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.joda.time.Chronology;
 import org.joda.time.DateTimeField;
 import org.joda.time.chrono.ISOChronology;
+import org.roaringbitmap.RoaringBitmap;
 
 
 public class ExtractTransformFunction extends BaseTransformFunction {
@@ -44,12 +45,12 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     if (arguments.size() != 2) {
       throw new IllegalArgumentException("Exactly 2 arguments are required for EXTRACT transform function");
     }
 
-    _field = Field.valueOf(((LiteralTransformFunction) arguments.get(0)).getLiteral());
+    _field = Field.valueOf(((LiteralTransformFunction) arguments.get(0)).getStringLiteral());
     _mainTransformFunction = arguments.get(1);
   }
 
@@ -59,12 +60,10 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    long[] timestamps = _mainTransformFunction.transformToLongValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    long[] timestamps = _mainTransformFunction.transformToLongValuesSV(valueBlock);
     convert(timestamps, numDocs, _intValuesSV);
     return _intValuesSV;
   }
@@ -102,4 +101,9 @@ private void convert(long[] timestamps, int numDocs, int[] output) {
       }
     }
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return _mainTransformFunction.getNullBitmap(valueBlock);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GreatestTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GreatestTransformFunction.java
index 3cafa769d8a..686a8d4f77c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GreatestTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GreatestTransformFunction.java
@@ -16,13 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.pinot.core.operator.transform.function;
 
 import java.math.BigDecimal;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
-
 
+/**
+ * The <code>GreatestTransformFunction</code> implements the Greatest operator.
+ *
+ * Return the greatest results for the arguments
+ *
+ * Expected result:
+ * greatest(columnA, columnB, columnC): largest among columnA, columnB, columnC
+ *
+ * Note that null values will be ignored for evaluation. If all values are null, we return null.
+ */
 public class GreatestTransformFunction extends SelectTupleElementTransformFunction {
 
   public GreatestTransformFunction() {
@@ -30,106 +39,36 @@ public GreatestTransformFunction() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    int[] values = _arguments.get(0).transformToIntValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _intValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToIntValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _intValuesSV[j] = Math.max(_intValuesSV[j], values[j]);
-      }
-    }
-    return _intValuesSV;
+  protected int binaryFunction(int a, int b) {
+    return Math.max(a, b);
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[numDocs];
-    }
-    long[] values = _arguments.get(0).transformToLongValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _longValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToLongValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _longValuesSV[j] = Math.max(_longValuesSV[j], values[j]);
-      }
-    }
-    return _longValuesSV;
+  protected long binaryFunction(long a, long b) {
+    return Math.max(a, b);
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[numDocs];
-    }
-    float[] values = _arguments.get(0).transformToFloatValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _floatValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToFloatValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _floatValuesSV[j] = Math.max(_floatValuesSV[j], values[j]);
-      }
-    }
-    return _floatValuesSV;
+  protected float binaryFunction(float a, float b) {
+    return Math.max(a, b);
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[numDocs];
-    }
-    double[] values = _arguments.get(0).transformToDoubleValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _doubleValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToDoubleValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _doubleValuesSV[j] = Math.max(_doubleValuesSV[j], values[j]);
-      }
-    }
-    return _doubleValuesSV;
+  protected double binaryFunction(double a, double b) {
+    return Math.max(a, b);
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[numDocs];
-    }
-    BigDecimal[] values = _arguments.get(0).transformToBigDecimalValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _bigDecimalValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToBigDecimalValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _bigDecimalValuesSV[j] = _bigDecimalValuesSV[j].max(values[j]);
-      }
-    }
-    return _bigDecimalValuesSV;
+  protected BigDecimal binaryFunction(BigDecimal a, BigDecimal b) {
+    return a.max(b);
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[numDocs];
-    }
-    String[] values = _arguments.get(0).transformToStringValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _stringValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToStringValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        if (_stringValuesSV[j].compareTo(values[j]) < 0) {
-          _stringValuesSV[j] = values[j];
-        }
-      }
+  protected String binaryFunction(String a, String b) {
+    if (a.compareTo(b) < 0) {
+      return b;
+    } else {
+      return a;
     }
-    return _stringValuesSV;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GroovyTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GroovyTransformFunction.java
index f940b8fcd86..6aba7ff0cdd 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GroovyTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GroovyTransformFunction.java
@@ -32,11 +32,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.apache.commons.lang3.EnumUtils;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.segment.local.function.GroovyFunctionEvaluator;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.JsonUtils;
 
@@ -70,7 +69,7 @@ public class GroovyTransformFunction extends BaseTransformFunction {
   private TransformFunction[] _groovyArguments;
   private boolean[] _isSourceSingleValue;
   private DataType[] _sourceStoredTypes;
-  private BiFunction<TransformFunction, ProjectionBlock, Object>[] _transformToValuesFunctions;
+  private BiFunction<TransformFunction, ValueBlock, Object>[] _transformToValuesFunctions;
   private BiFunction<Object, Integer, Object>[] _fetchElementFunctions;
   private Object[] _sourceArrays;
   private Object[] _bindingValues;
@@ -81,7 +80,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     int numArgs = arguments.size();
     if (numArgs < 2) {
       throw new IllegalArgumentException("GROOVY transform function requires at least 2 arguments");
@@ -91,7 +90,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     TransformFunction returnValueMetadata = arguments.get(0);
     Preconditions.checkState(returnValueMetadata instanceof LiteralTransformFunction,
         "First argument of GROOVY transform function must be a literal, representing a json string");
-    String returnValueMetadataStr = ((LiteralTransformFunction) returnValueMetadata).getLiteral();
+    String returnValueMetadataStr = ((LiteralTransformFunction) returnValueMetadata).getStringLiteral();
     try {
       JsonNode returnValueMetadataJson = JsonUtils.stringToJsonNode(returnValueMetadataStr);
       Preconditions.checkState(returnValueMetadataJson.hasNonNull(RETURN_TYPE_KEY),
@@ -133,8 +132,8 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       // construct arguments string for GroovyFunctionEvaluator
       String argumentsStr = IntStream.range(0, _numGroovyArgs).mapToObj(i -> ARGUMENT_PREFIX + i)
           .collect(Collectors.joining(GROOVY_ARG_DELIMITER));
-      _groovyFunctionEvaluator = new GroovyFunctionEvaluator(
-          String.format(GROOVY_TEMPLATE_WITH_ARGS, ((LiteralTransformFunction) groovyTransformFunction).getLiteral(),
+      _groovyFunctionEvaluator = new GroovyFunctionEvaluator(String.format(GROOVY_TEMPLATE_WITH_ARGS,
+          ((LiteralTransformFunction) groovyTransformFunction).getStringLiteral(),
               argumentsStr));
 
       _transformToValuesFunctions = new BiFunction[_numGroovyArgs];
@@ -142,7 +141,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       initFunctions();
     } else {
       _groovyFunctionEvaluator = new GroovyFunctionEvaluator(String.format(GROOVY_TEMPLATE_WITHOUT_ARGS,
-          ((LiteralTransformFunction) groovyTransformFunction).getLiteral()));
+          ((LiteralTransformFunction) groovyTransformFunction).getStringLiteral()));
     }
     _sourceArrays = new Object[_numGroovyArgs];
     _bindingValues = new Object[_numGroovyArgs];
@@ -156,7 +155,7 @@ public TransformResultMetadata getResultMetadata() {
   private void initFunctions() {
     for (int i = 0; i < _numGroovyArgs; i++) {
       BiFunction<Object, Integer, Object> getElementFunction;
-      BiFunction<TransformFunction, ProjectionBlock, Object> transformToValuesFunction;
+      BiFunction<TransformFunction, ValueBlock, Object> transformToValuesFunction;
       if (_isSourceSingleValue[i]) {
         switch (_sourceStoredTypes[i]) {
           case INT:
@@ -220,13 +219,11 @@ private void initFunctions() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -238,13 +235,11 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
-    }
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -256,13 +251,11 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[length];
-    }
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initFloatValuesSV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -274,14 +267,12 @@ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
         _bindingValues[j] = _fetchElementFunctions[j].apply(_sourceArrays[j], i);
@@ -292,13 +283,11 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -310,13 +299,11 @@ public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBloc
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
-    }
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -328,13 +315,11 @@ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesMV == null) {
-      _intValuesMV = new int[length][];
-    }
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesMV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -353,13 +338,11 @@ public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesMV == null) {
-      _longValuesMV = new long[length][];
-    }
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesMV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -378,13 +361,11 @@ public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesMV == null) {
-      _floatValuesMV = new float[length][];
-    }
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initFloatValuesMV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -403,13 +384,11 @@ public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesMV == null) {
-      _doubleValuesMV = new double[length][];
-    }
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesMV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
@@ -428,14 +407,12 @@ public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
-    if (_stringValuesMV == null) {
-      _stringValuesMV = new String[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
-    }
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesMV(length);
     for (int i = 0; i < _numGroovyArgs; i++) {
-      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], projectionBlock);
+      _sourceArrays[i] = _transformToValuesFunctions[i].apply(_groovyArguments[i], valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numGroovyArgs; j++) {
         _bindingValues[j] = _fetchElementFunctions[j].apply(_sourceArrays[j], i);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunction.java
index 42a83af3d9c..1d0cd84fb59 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunction.java
@@ -21,12 +21,14 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
 import org.apache.pinot.segment.spi.evaluator.TransformEvaluator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -38,12 +40,11 @@ public class IdentifierTransformFunction implements TransformFunction, PushDownT
   private final Dictionary _dictionary;
   private final TransformResultMetadata _resultMetadata;
 
-  public IdentifierTransformFunction(String columnName, DataSource dataSource) {
+  public IdentifierTransformFunction(String columnName, ColumnContext columnContext) {
     _columnName = columnName;
-    _dictionary = dataSource.getDictionary();
-    DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
-    _resultMetadata = new TransformResultMetadata(dataSourceMetadata.getDataType(), dataSourceMetadata.isSingleValue(),
-        _dictionary != null);
+    _dictionary = columnContext.getDictionary();
+    _resultMetadata =
+        new TransformResultMetadata(columnContext.getDataType(), columnContext.isSingleValue(), _dictionary != null);
   }
 
   public String getColumnName() {
@@ -56,7 +57,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     throw new UnsupportedOperationException();
   }
 
@@ -65,85 +66,85 @@ public TransformResultMetadata getResultMetadata() {
     return _resultMetadata;
   }
 
+  @Nullable
   @Override
   public Dictionary getDictionary() {
     return _dictionary;
   }
 
   @Override
-  public int[] transformToDictIdsSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getDictionaryIdsSV();
+  public int[] transformToDictIdsSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getDictionaryIdsSV();
   }
 
   @Override
-  public int[][] transformToDictIdsMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getDictionaryIdsMV();
+  public int[][] transformToDictIdsMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getDictionaryIdsMV();
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getIntValuesSV();
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getIntValuesSV();
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getLongValuesSV();
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getLongValuesSV();
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getFloatValuesSV();
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getFloatValuesSV();
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getDoubleValuesSV();
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getDoubleValuesSV();
   }
 
-
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getBigDecimalValuesSV();
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getBigDecimalValuesSV();
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getStringValuesSV();
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getStringValuesSV();
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getBytesValuesSV();
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getBytesValuesSV();
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getIntValuesMV();
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getIntValuesMV();
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getLongValuesMV();
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getLongValuesMV();
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getFloatValuesMV();
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getFloatValuesMV();
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getDoubleValuesMV();
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getDoubleValuesMV();
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getStringValuesMV();
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getStringValuesMV();
   }
 
   @Override
-  public byte[][][] transformToBytesValuesMV(ProjectionBlock projectionBlock) {
-    return projectionBlock.getBlockValueSet(_columnName).getBytesValuesMV();
+  public byte[][][] transformToBytesValuesMV(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getBytesValuesMV();
   }
 
   @Override
@@ -206,4 +207,9 @@ public void transformToStringValuesMV(ProjectionBlock projectionBlock, Transform
       String[][] buffer) {
     projectionBlock.fillValues(_columnName, evaluator, buffer);
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return valueBlock.getBlockValueSet(_columnName).getNullBitmap();
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InIdSetTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InIdSetTransformFunction.java
index 72ca718ac0b..a1cd65f95d7 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InIdSetTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InIdSetTransformFunction.java
@@ -23,11 +23,11 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.query.utils.idset.IdSet;
 import org.apache.pinot.core.query.utils.idset.IdSets;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
 
@@ -50,7 +50,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 2,
         "2 arguments are required for IN_ID_SET transform function: expression, base64 encoded IdSet");
     Preconditions.checkArgument(arguments.get(0).getResultMetadata().isSingleValue(),
@@ -60,7 +60,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
 
     _transformFunction = arguments.get(0);
     try {
-      _idSet = IdSets.fromBase64String(((LiteralTransformFunction) arguments.get(1)).getLiteral());
+      _idSet = IdSets.fromBase64String(((LiteralTransformFunction) arguments.get(1)).getStringLiteral());
     } catch (IOException e) {
       throw new IllegalArgumentException("Caught exception while deserializing IdSet", e);
     }
@@ -72,45 +72,43 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
     DataType storedType = _transformFunction.getResultMetadata().getDataType().getStoredType();
     switch (storedType) {
       case INT:
-        int[] intValues = _transformFunction.transformToIntValuesSV(projectionBlock);
+        int[] intValues = _transformFunction.transformToIntValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = _idSet.contains(intValues[i]) ? 1 : 0;
         }
         break;
       case LONG:
-        long[] longValues = _transformFunction.transformToLongValuesSV(projectionBlock);
+        long[] longValues = _transformFunction.transformToLongValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = _idSet.contains(longValues[i]) ? 1 : 0;
         }
         break;
       case FLOAT:
-        float[] floatValues = _transformFunction.transformToFloatValuesSV(projectionBlock);
+        float[] floatValues = _transformFunction.transformToFloatValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = _idSet.contains(floatValues[i]) ? 1 : 0;
         }
         break;
       case DOUBLE:
-        double[] doubleValues = _transformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] doubleValues = _transformFunction.transformToDoubleValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = _idSet.contains(doubleValues[i]) ? 1 : 0;
         }
         break;
       case STRING:
-        String[] stringValues = _transformFunction.transformToStringValuesSV(projectionBlock);
+        String[] stringValues = _transformFunction.transformToStringValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = _idSet.contains(stringValues[i]) ? 1 : 0;
         }
         break;
       case BYTES:
-        byte[][] bytesValues = _transformFunction.transformToBytesValuesSV(projectionBlock);
+        byte[][] bytesValues = _transformFunction.transformToBytesValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _intValuesSV[i] = _idSet.contains(bytesValues[i]) ? 1 : 0;
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InTransformFunction.java
index 39419cd9591..4e6662ca981 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/InTransformFunction.java
@@ -28,13 +28,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.apache.pinot.spi.utils.BytesUtils;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -48,6 +50,7 @@ public class InTransformFunction extends BaseTransformFunction {
   private TransformFunction _mainFunction;
   private TransformFunction[] _valueFunctions;
   private Set _valueSet;
+  private boolean _valueSetContainsNull;
 
   @Override
   public String getName() {
@@ -55,7 +58,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     int numArguments = arguments.size();
     Preconditions.checkArgument(numArguments >= 2, "At least 2 arguments are required for [%s] "
         + "transform function: (expression, values)", getName());
@@ -66,7 +69,12 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     for (int i = 1; i < numArguments; i++) {
       TransformFunction valueFunction = arguments.get(i);
       if (valueFunction instanceof LiteralTransformFunction) {
-        stringValues.add(((LiteralTransformFunction) valueFunction).getLiteral());
+        LiteralTransformFunction literalTransformFunction = ((LiteralTransformFunction) valueFunction);
+        if (literalTransformFunction.getResultMetadata().getDataType() == DataType.UNKNOWN) {
+          _valueSetContainsNull = true;
+        } else {
+          stringValues.add(literalTransformFunction.getStringLiteral());
+        }
       } else {
         allLiteralValues = false;
         break;
@@ -115,6 +123,9 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
           }
           _valueSet = bytesValues;
           break;
+        case UNKNOWN:
+          _valueSet = new ObjectOpenHashSet<>();
+          break;
         default:
           throw new IllegalStateException();
       }
@@ -137,15 +148,9 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    } else {
-      Arrays.fill(_intValuesSV, 0);
-    }
-
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initZeroFillingIntValuesSV(length);
     TransformResultMetadata mainFunctionMetadata = _mainFunction.getResultMetadata();
     DataType storedType = mainFunctionMetadata.getDataType().getStoredType();
     if (_valueSet != null) {
@@ -153,7 +158,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
         switch (storedType) {
           case INT:
             IntOpenHashSet inIntValues = (IntOpenHashSet) _valueSet;
-            int[] intValues = _mainFunction.transformToIntValuesSV(projectionBlock);
+            int[] intValues = _mainFunction.transformToIntValuesSV(valueBlock);
             for (int i = 0; i < length; i++) {
               if (inIntValues.contains(intValues[i])) {
                 _intValuesSV[i] = 1;
@@ -162,7 +167,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case LONG:
             LongOpenHashSet inLongValues = (LongOpenHashSet) _valueSet;
-            long[] longValues = _mainFunction.transformToLongValuesSV(projectionBlock);
+            long[] longValues = _mainFunction.transformToLongValuesSV(valueBlock);
             for (int i = 0; i < length; i++) {
               if (inLongValues.contains(longValues[i])) {
                 _intValuesSV[i] = 1;
@@ -171,7 +176,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case FLOAT:
             FloatOpenHashSet inFloatValues = (FloatOpenHashSet) _valueSet;
-            float[] floatValues = _mainFunction.transformToFloatValuesSV(projectionBlock);
+            float[] floatValues = _mainFunction.transformToFloatValuesSV(valueBlock);
             for (int i = 0; i < length; i++) {
               if (inFloatValues.contains(floatValues[i])) {
                 _intValuesSV[i] = 1;
@@ -180,7 +185,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case DOUBLE:
             DoubleOpenHashSet inDoubleValues = (DoubleOpenHashSet) _valueSet;
-            double[] doubleValues = _mainFunction.transformToDoubleValuesSV(projectionBlock);
+            double[] doubleValues = _mainFunction.transformToDoubleValuesSV(valueBlock);
             for (int i = 0; i < length; i++) {
               if (inDoubleValues.contains(doubleValues[i])) {
                 _intValuesSV[i] = 1;
@@ -189,7 +194,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case STRING:
             ObjectOpenHashSet<String> inStringValues = (ObjectOpenHashSet<String>) _valueSet;
-            String[] stringValues = _mainFunction.transformToStringValuesSV(projectionBlock);
+            String[] stringValues = _mainFunction.transformToStringValuesSV(valueBlock);
             for (int i = 0; i < length; i++) {
               if (inStringValues.contains(stringValues[i])) {
                 _intValuesSV[i] = 1;
@@ -198,13 +203,16 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case BYTES:
             ObjectOpenHashSet<ByteArray> inBytesValues = (ObjectOpenHashSet<ByteArray>) _valueSet;
-            byte[][] bytesValues = _mainFunction.transformToBytesValuesSV(projectionBlock);
+            byte[][] bytesValues = _mainFunction.transformToBytesValuesSV(valueBlock);
             for (int i = 0; i < length; i++) {
               if (inBytesValues.contains(new ByteArray(bytesValues[i]))) {
                 _intValuesSV[i] = 1;
               }
             }
             break;
+          case UNKNOWN:
+            fillResultUnknown(length);
+            break;
           default:
             throw new IllegalStateException();
         }
@@ -212,7 +220,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
         switch (storedType) {
           case INT:
             IntOpenHashSet inIntValues = (IntOpenHashSet) _valueSet;
-            int[][] intValues = _mainFunction.transformToIntValuesMV(projectionBlock);
+            int[][] intValues = _mainFunction.transformToIntValuesMV(valueBlock);
             for (int i = 0; i < length; i++) {
               for (int intValue : intValues[i]) {
                 if (inIntValues.contains(intValue)) {
@@ -224,7 +232,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case LONG:
             LongOpenHashSet inLongValues = (LongOpenHashSet) _valueSet;
-            long[][] longValues = _mainFunction.transformToLongValuesMV(projectionBlock);
+            long[][] longValues = _mainFunction.transformToLongValuesMV(valueBlock);
             for (int i = 0; i < length; i++) {
               for (long longValue : longValues[i]) {
                 if (inLongValues.contains(longValue)) {
@@ -236,7 +244,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case FLOAT:
             FloatOpenHashSet inFloatValues = (FloatOpenHashSet) _valueSet;
-            float[][] floatValues = _mainFunction.transformToFloatValuesMV(projectionBlock);
+            float[][] floatValues = _mainFunction.transformToFloatValuesMV(valueBlock);
             for (int i = 0; i < length; i++) {
               for (float floatValue : floatValues[i]) {
                 if (inFloatValues.contains(floatValue)) {
@@ -248,7 +256,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case DOUBLE:
             DoubleOpenHashSet inDoubleValues = (DoubleOpenHashSet) _valueSet;
-            double[][] doubleValues = _mainFunction.transformToDoubleValuesMV(projectionBlock);
+            double[][] doubleValues = _mainFunction.transformToDoubleValuesMV(valueBlock);
             for (int i = 0; i < length; i++) {
               for (double doubleValue : doubleValues[i]) {
                 if (inDoubleValues.contains(doubleValue)) {
@@ -260,7 +268,7 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             break;
           case STRING:
             ObjectOpenHashSet<String> inStringValues = (ObjectOpenHashSet<String>) _valueSet;
-            String[][] stringValues = _mainFunction.transformToStringValuesMV(projectionBlock);
+            String[][] stringValues = _mainFunction.transformToStringValuesMV(valueBlock);
             for (int i = 0; i < length; i++) {
               for (String stringValue : stringValues[i]) {
                 if (inStringValues.contains(stringValue)) {
@@ -270,6 +278,9 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
               }
             }
             break;
+          case UNKNOWN:
+            fillResultUnknown(length);
+            break;
           default:
             throw new IllegalStateException();
         }
@@ -278,10 +289,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
       int numValues = _valueFunctions.length;
       switch (storedType) {
         case INT:
-          int[] intValues = _mainFunction.transformToIntValuesSV(projectionBlock);
+          int[] intValues = _mainFunction.transformToIntValuesSV(valueBlock);
           int[][] inIntValues = new int[numValues][];
           for (int i = 0; i < numValues; i++) {
-            inIntValues[i] = _valueFunctions[i].transformToIntValuesSV(projectionBlock);
+            inIntValues[i] = _valueFunctions[i].transformToIntValuesSV(valueBlock);
           }
           for (int i = 0; i < length; i++) {
             for (int[] inIntValue : inIntValues) {
@@ -293,10 +304,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
           }
           break;
         case LONG:
-          long[] longValues = _mainFunction.transformToLongValuesSV(projectionBlock);
+          long[] longValues = _mainFunction.transformToLongValuesSV(valueBlock);
           long[][] inLongValues = new long[numValues][];
           for (int i = 0; i < numValues; i++) {
-            inLongValues[i] = _valueFunctions[i].transformToLongValuesSV(projectionBlock);
+            inLongValues[i] = _valueFunctions[i].transformToLongValuesSV(valueBlock);
           }
           for (int i = 0; i < length; i++) {
             for (long[] inLongValue : inLongValues) {
@@ -308,10 +319,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
           }
           break;
         case FLOAT:
-          float[] floatValues = _mainFunction.transformToFloatValuesSV(projectionBlock);
+          float[] floatValues = _mainFunction.transformToFloatValuesSV(valueBlock);
           float[][] inFloatValues = new float[numValues][];
           for (int i = 0; i < numValues; i++) {
-            inFloatValues[i] = _valueFunctions[i].transformToFloatValuesSV(projectionBlock);
+            inFloatValues[i] = _valueFunctions[i].transformToFloatValuesSV(valueBlock);
           }
           for (int i = 0; i < length; i++) {
             // Check int bits to be aligned with the Set (Float.equals()) behavior
@@ -325,10 +336,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
           }
           break;
         case DOUBLE:
-          double[] doubleValues = _mainFunction.transformToDoubleValuesSV(projectionBlock);
+          double[] doubleValues = _mainFunction.transformToDoubleValuesSV(valueBlock);
           double[][] inDoubleValues = new double[numValues][];
           for (int i = 0; i < numValues; i++) {
-            inDoubleValues[i] = _valueFunctions[i].transformToDoubleValuesSV(projectionBlock);
+            inDoubleValues[i] = _valueFunctions[i].transformToDoubleValuesSV(valueBlock);
           }
           for (int i = 0; i < length; i++) {
             // Check long bits to be aligned with the Set (Double.equals()) behavior
@@ -342,10 +353,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
           }
           break;
         case STRING:
-          String[] stringValues = _mainFunction.transformToStringValuesSV(projectionBlock);
+          String[] stringValues = _mainFunction.transformToStringValuesSV(valueBlock);
           String[][] inStringValues = new String[numValues][];
           for (int i = 0; i < numValues; i++) {
-            inStringValues[i] = _valueFunctions[i].transformToStringValuesSV(projectionBlock);
+            inStringValues[i] = _valueFunctions[i].transformToStringValuesSV(valueBlock);
           }
           for (int i = 0; i < length; i++) {
             for (String[] inStringValue : inStringValues) {
@@ -357,10 +368,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
           }
           break;
         case BYTES:
-          byte[][] bytesValues = _mainFunction.transformToBytesValuesSV(projectionBlock);
+          byte[][] bytesValues = _mainFunction.transformToBytesValuesSV(valueBlock);
           byte[][][] inBytesValues = new byte[numValues][][];
           for (int i = 0; i < numValues; i++) {
-            inBytesValues[i] = _valueFunctions[i].transformToBytesValuesSV(projectionBlock);
+            inBytesValues[i] = _valueFunctions[i].transformToBytesValuesSV(valueBlock);
           }
           for (int i = 0; i < length; i++) {
             for (byte[][] inBytesValue : inBytesValues) {
@@ -371,6 +382,9 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
             }
           }
           break;
+        case UNKNOWN:
+          fillResultUnknown(length);
+          break;
         default:
           throw new IllegalStateException();
       }
@@ -378,4 +392,50 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
 
     return _intValuesSV;
   }
+
+  @Nullable
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    RoaringBitmap result = new RoaringBitmap();
+    RoaringBitmap mainFunctionNullBitmap = _mainFunction.getNullBitmap(valueBlock);
+    if (mainFunctionNullBitmap != null) {
+      result.or(mainFunctionNullBitmap);
+      if (result.getCardinality() == length) {
+        return result;
+      }
+    }
+    int[] intValuesSV = transformToIntValuesSV(valueBlock);
+    if (_valueSet == null) {
+      RoaringBitmap valueFunctionsContainNull = new RoaringBitmap();
+      RoaringBitmap[] valueFunctionNullBitmaps = new RoaringBitmap[_valueFunctions.length];
+      for (int i = 0; i < _valueFunctions.length; i++) {
+        valueFunctionNullBitmaps[i] = _valueFunctions[i].getNullBitmap(valueBlock);
+      }
+      for (int i = 0; i < length; i++) {
+        for (int j = 0; j < _valueFunctions.length; j++) {
+          if (valueFunctionNullBitmaps[j] != null && valueFunctionNullBitmaps[j].contains(i)) {
+            valueFunctionsContainNull.add(i);
+            break;
+          }
+        }
+      }
+      for (int i = 0; i < length; i++) {
+        if (mainFunctionNotContainedInValues(intValuesSV[i]) && valueFunctionsContainNull.contains(i)) {
+          result.add(i);
+        }
+      }
+    } else {
+      for (int i = 0; i < length; i++) {
+        if (mainFunctionNotContainedInValues(intValuesSV[i]) && _valueSetContainsNull) {
+          result.add(i);
+        }
+      }
+    }
+    return result;
+  }
+
+  protected boolean mainFunctionNotContainedInValues(int value) {
+    return value == 0;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNotNullTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNotNullTransformFunction.java
index c7ba0ae93a4..5b73a621497 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNotNullTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNotNullTransformFunction.java
@@ -18,72 +18,17 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
-import com.google.common.base.Preconditions;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
-import org.roaringbitmap.PeekableIntIterator;
 
 
-public class IsNotNullTransformFunction extends BaseTransformFunction {
-  private PeekableIntIterator _nullValueVectorIterator;
-
+public class IsNotNullTransformFunction extends IsNullTransformFunction {
   @Override
   public String getName() {
     return TransformFunctionType.IS_NOT_NULL.getName();
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
-    Preconditions.checkArgument(arguments.size() == 1,
-        "Exact 1 argument is required for IS_NOT_NULL operator function");
-    TransformFunction transformFunction = arguments.get(0);
-    if (!(transformFunction instanceof IdentifierTransformFunction)) {
-      throw new IllegalArgumentException(
-          "Only column names are supported in IS_NOT_NULL. Support for functions is planned for future release");
-    }
-    String columnName = ((IdentifierTransformFunction) transformFunction).getColumnName();
-    NullValueVectorReader nullValueVectorReader = dataSourceMap.get(columnName).getNullValueVector();
-    if (nullValueVectorReader != null) {
-      _nullValueVectorIterator = nullValueVectorReader.getNullBitmap().getIntIterator();
-    } else {
-      _nullValueVectorIterator = null;
-    }
-  }
-
-  @Override
-  public TransformResultMetadata getResultMetadata() {
-    return BOOLEAN_SV_NO_DICTIONARY_METADATA;
-  }
-
-  @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
-    Arrays.fill(_intValuesSV, 1);
-    int[] docIds = projectionBlock.getDocIds();
-    if (_nullValueVectorIterator != null) {
-      int currentDocIdIndex = 0;
-      while (_nullValueVectorIterator.hasNext() & currentDocIdIndex < length) {
-        _nullValueVectorIterator.advanceIfNeeded(docIds[currentDocIdIndex]);
-        if (_nullValueVectorIterator.hasNext()) {
-          currentDocIdIndex = Arrays.binarySearch(docIds, currentDocIdIndex, length, _nullValueVectorIterator.next());
-          if (currentDocIdIndex >= 0) {
-            _intValuesSV[currentDocIdIndex] = 0;
-            currentDocIdIndex++;
-          } else {
-            currentDocIdIndex = -currentDocIdIndex - 1;
-          }
-        }
-      }
-    }
-    return _intValuesSV;
+  protected int getIsNullValue() {
+    return 0;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNullTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNullTransformFunction.java
index 5f7a05be953..084fd635d0d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNullTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/IsNullTransformFunction.java
@@ -23,15 +23,15 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
-import org.roaringbitmap.PeekableIntIterator;
+import org.roaringbitmap.IntConsumer;
+import org.roaringbitmap.RoaringBitmap;
 
 
 public class IsNullTransformFunction extends BaseTransformFunction {
-  private PeekableIntIterator _nullValueVectorIterator;
+  private TransformFunction _transformFunction;
 
   @Override
   public String getName() {
@@ -39,20 +39,9 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
-    Preconditions.checkArgument(arguments.size() == 1, "Exact 1 argument is required for IS_NULL operator function");
-    TransformFunction transformFunction = arguments.get(0);
-    if (!(transformFunction instanceof IdentifierTransformFunction)) {
-      throw new IllegalArgumentException(
-          "Only column names are supported in IS_NULL. Support for functions is planned for future release");
-    }
-    String columnName = ((IdentifierTransformFunction) transformFunction).getColumnName();
-    NullValueVectorReader nullValueVectorReader = dataSourceMap.get(columnName).getNullValueVector();
-    if (nullValueVectorReader != null) {
-      _nullValueVectorIterator = nullValueVectorReader.getNullBitmap().getIntIterator();
-    } else {
-      _nullValueVectorIterator = null;
-    }
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    Preconditions.checkArgument(arguments.size() == 1, "Exact 1 argument is required for IS_NULL");
+    _transformFunction = arguments.get(0);
   }
 
   @Override
@@ -61,28 +50,23 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
-    }
-    Arrays.fill(_intValuesSV, 0);
-    int[] docIds = projectionBlock.getDocIds();
-    if (_nullValueVectorIterator != null) {
-      int currentDocIdIndex = 0;
-      while (_nullValueVectorIterator.hasNext() & currentDocIdIndex < length) {
-        _nullValueVectorIterator.advanceIfNeeded(docIds[currentDocIdIndex]);
-        if (_nullValueVectorIterator.hasNext()) {
-          currentDocIdIndex = Arrays.binarySearch(docIds, currentDocIdIndex, length, _nullValueVectorIterator.next());
-          if (currentDocIdIndex >= 0) {
-            _intValuesSV[currentDocIdIndex] = 1;
-            currentDocIdIndex++;
-          } else {
-            currentDocIdIndex = -currentDocIdIndex - 1;
-          }
-        }
-      }
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    RoaringBitmap bitmap = _transformFunction.getNullBitmap(valueBlock);
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
+    Arrays.fill(_intValuesSV, getIsNullValue() ^ 1);
+    if (bitmap != null) {
+      bitmap.forEach((IntConsumer) i -> _intValuesSV[i] = getIsNullValue());
     }
     return _intValuesSV;
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return null;
+  }
+
+  protected int getIsNullValue() {
+    return 1;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractKeyTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractKeyTransformFunction.java
index 60b5b659ab6..08a3d5f765e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractKeyTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractKeyTransformFunction.java
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.JsonPathCache;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 /**
@@ -61,7 +61,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     // Check that there are exactly 2 arguments
     if (arguments.size() != 2) {
       throw new IllegalArgumentException(
@@ -75,7 +75,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
               + "function");
     }
     _jsonFieldTransformFunction = firstArgument;
-    _jsonPath = JsonPathCache.INSTANCE.getOrCompute(((LiteralTransformFunction) arguments.get(1)).getLiteral());
+    _jsonPath = JsonPathCache.INSTANCE.getOrCompute(((LiteralTransformFunction) arguments.get(1)).getStringLiteral());
   }
 
   @Override
@@ -84,12 +84,10 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesMV == null) {
-      _stringValuesMV = new String[length][];
-    }
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesMV(length);
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       List<String> values = JSON_PARSER_CONTEXT.parse(jsonStrings[i]).read(_jsonPath);
       _stringValuesMV[i] = values.toArray(new String[0]);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractScalarTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractScalarTransformFunction.java
index 1a534a1856e..718eca8be1e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractScalarTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/JsonExtractScalarTransformFunction.java
@@ -30,9 +30,10 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.JsonPathCache;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.evaluator.json.JsonPathEvaluator;
 import org.apache.pinot.segment.spi.evaluator.json.JsonPathEvaluators;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
@@ -81,7 +82,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     // Check that there are exactly 3 or 4 arguments
     if (arguments.size() < 3 || arguments.size() > 4) {
       throw new IllegalArgumentException(
@@ -96,23 +97,27 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
               + "function");
     }
     _jsonFieldTransformFunction = firstArgument;
-    _jsonPathString = ((LiteralTransformFunction) arguments.get(1)).getLiteral();
-    String resultsType = ((LiteralTransformFunction) arguments.get(2)).getLiteral().toUpperCase();
+    _jsonPathString = ((LiteralTransformFunction) arguments.get(1)).getStringLiteral();
+    String resultsType = ((LiteralTransformFunction) arguments.get(2)).getStringLiteral().toUpperCase();
     boolean isSingleValue = !resultsType.endsWith("_ARRAY");
+    DataType dataType;
     try {
-      DataType dataType =
-          DataType.valueOf(isSingleValue ? resultsType : resultsType.substring(0, resultsType.length() - 6));
-      if (arguments.size() == 4) {
-        _defaultValue = dataType.convert(((LiteralTransformFunction) arguments.get(3)).getLiteral());
-      }
-      _resultMetadata = new TransformResultMetadata(dataType, isSingleValue, false);
-      _jsonPathEvaluator = JsonPathEvaluators.create(_jsonPathString, _defaultValue);
+      dataType = DataType.valueOf(isSingleValue ? resultsType : resultsType.substring(0, resultsType.length() - 6));
     } catch (Exception e) {
-      throw new IllegalStateException(String.format(
+      throw new IllegalArgumentException(String.format(
           "Unsupported results type: %s for jsonExtractScalar function. Supported types are: "
               + "INT/LONG/FLOAT/DOUBLE/BOOLEAN/BIG_DECIMAL/TIMESTAMP/STRING/INT_ARRAY/LONG_ARRAY/FLOAT_ARRAY"
               + "/DOUBLE_ARRAY/STRING_ARRAY", resultsType));
     }
+    if (arguments.size() == 4) {
+      _defaultValue = dataType.convert(((LiteralTransformFunction) arguments.get(3)).getStringLiteral());
+    }
+    _resultMetadata = new TransformResultMetadata(dataType, isSingleValue, false);
+    try {
+      _jsonPathEvaluator = JsonPathEvaluators.create(_jsonPathString, _defaultValue);
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Invalid json path: " + _jsonPathString, e);
+    }
   }
 
   @Override
@@ -121,25 +126,22 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToIntValuesSV(projectionBlock,
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    initIntValuesSV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToIntValuesSV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _intValuesSV);
       return _intValuesSV;
     }
     // operating on the output of another transform so can't pass the evaluation down to the storage
-    return transformTransformedValuesToIntValuesSV(projectionBlock);
+    return transformTransformedValuesToIntValuesSV(valueBlock);
   }
 
-  private int[] transformTransformedValuesToIntValuesSV(ProjectionBlock projectionBlock) {
+  private int[] transformTransformedValuesToIntValuesSV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Object result = null;
       try {
@@ -164,24 +166,21 @@ private int[] transformTransformedValuesToIntValuesSV(ProjectionBlock projection
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[numDocs];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToLongValuesSV(projectionBlock,
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    initLongValuesSV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToLongValuesSV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _longValuesSV);
       return _longValuesSV;
     }
-    return transformTransformedValuesToLongValuesSV(projectionBlock);
+    return transformTransformedValuesToLongValuesSV(valueBlock);
   }
 
-  private long[] transformTransformedValuesToLongValuesSV(ProjectionBlock projectionBlock) {
+  private long[] transformTransformedValuesToLongValuesSV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Object result = null;
       try {
@@ -207,24 +206,21 @@ private long[] transformTransformedValuesToLongValuesSV(ProjectionBlock projecti
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[numDocs];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToFloatValuesSV(projectionBlock,
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
+    initFloatValuesSV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToFloatValuesSV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _floatValuesSV);
       return _floatValuesSV;
     }
-    return transformTransformedValuesToFloatValuesSV(projectionBlock);
+    return transformTransformedValuesToFloatValuesSV(valueBlock);
   }
 
-  private float[] transformTransformedValuesToFloatValuesSV(ProjectionBlock projectionBlock) {
+  private float[] transformTransformedValuesToFloatValuesSV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Object result = null;
       try {
@@ -249,24 +245,21 @@ private float[] transformTransformedValuesToFloatValuesSV(ProjectionBlock projec
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[numDocs];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToDoubleValuesSV(projectionBlock,
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    initDoubleValuesSV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToDoubleValuesSV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _doubleValuesSV);
       return _doubleValuesSV;
     }
-    return transformTransformedValuesToDoubleValuesSV(projectionBlock);
+    return transformTransformedValuesToDoubleValuesSV(valueBlock);
   }
 
-  private double[] transformTransformedValuesToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  private double[] transformTransformedValuesToDoubleValuesSV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Object result = null;
       try {
@@ -291,24 +284,21 @@ private double[] transformTransformedValuesToDoubleValuesSV(ProjectionBlock proj
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[numDocs];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToBigDecimalValuesSV(projectionBlock,
-          _jsonPathEvaluator, _bigDecimalValuesSV);
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    initBigDecimalValuesSV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToBigDecimalValuesSV(
+          (ProjectionBlock) valueBlock, _jsonPathEvaluator, _bigDecimalValuesSV);
       return _bigDecimalValuesSV;
     }
-    return transformTransformedValuesToBigDecimalValuesSV(projectionBlock);
+    return transformTransformedValuesToBigDecimalValuesSV(valueBlock);
   }
 
-  private BigDecimal[] transformTransformedValuesToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
+  private BigDecimal[] transformTransformedValuesToBigDecimalValuesSV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Object result = null;
       try {
@@ -333,24 +323,21 @@ private BigDecimal[] transformTransformedValuesToBigDecimalValuesSV(ProjectionBl
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[numDocs];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToStringValuesSV(projectionBlock,
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    initStringValuesSV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToStringValuesSV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _stringValuesSV);
       return _stringValuesSV;
     }
-    return transformTransformedValuesToStringValuesSV(projectionBlock);
+    return transformTransformedValuesToStringValuesSV(valueBlock);
   }
 
-  private String[] transformTransformedValuesToStringValuesSV(ProjectionBlock projectionBlock) {
+  private String[] transformTransformedValuesToStringValuesSV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       Object result = null;
       try {
@@ -375,24 +362,21 @@ private String[] transformTransformedValuesToStringValuesSV(ProjectionBlock proj
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesMV == null) {
-      _intValuesMV = new int[numDocs][];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToIntValuesMV(projectionBlock,
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
+    initIntValuesMV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToIntValuesMV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _intValuesMV);
       return _intValuesMV;
     }
-    return transformTransformedValuesToIntValuesMV(projectionBlock);
+    return transformTransformedValuesToIntValuesMV(valueBlock);
   }
 
-  private int[][] transformTransformedValuesToIntValuesMV(ProjectionBlock projectionBlock) {
+  private int[][] transformTransformedValuesToIntValuesMV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int numDocs = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int numDocs = valueBlock.getNumDocs();
     for (int i = 0; i < numDocs; i++) {
       List<Integer> result = null;
       try {
@@ -414,24 +398,21 @@ private int[][] transformTransformedValuesToIntValuesMV(ProjectionBlock projecti
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesMV == null) {
-      _longValuesMV = new long[numDocs][];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToLongValuesMV(projectionBlock,
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
+    initLongValuesMV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToLongValuesMV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _longValuesMV);
       return _longValuesMV;
     }
-    return transformTransformedValuesToLongValuesMV(projectionBlock);
+    return transformTransformedValuesToLongValuesMV(valueBlock);
   }
 
-  private long[][] transformTransformedValuesToLongValuesMV(ProjectionBlock projectionBlock) {
+  private long[][] transformTransformedValuesToLongValuesMV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int length = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       List<Long> result = null;
       try {
@@ -453,24 +434,21 @@ private long[][] transformTransformedValuesToLongValuesMV(ProjectionBlock projec
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesMV == null) {
-      _floatValuesMV = new float[numDocs][];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToFloatValuesMV(projectionBlock,
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
+    initFloatValuesMV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToFloatValuesMV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _floatValuesMV);
       return _floatValuesMV;
     }
-    return transformTransformedValuesToFloatValuesMV(projectionBlock);
+    return transformTransformedValuesToFloatValuesMV(valueBlock);
   }
 
-  private float[][] transformTransformedValuesToFloatValuesMV(ProjectionBlock projectionBlock) {
+  private float[][] transformTransformedValuesToFloatValuesMV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int length = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       List<Float> result = null;
       try {
@@ -492,24 +470,21 @@ private float[][] transformTransformedValuesToFloatValuesMV(ProjectionBlock proj
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesMV == null) {
-      _doubleValuesMV = new double[numDocs][];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToDoubleValuesMV(projectionBlock,
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
+    initDoubleValuesMV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToDoubleValuesMV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _doubleValuesMV);
       return _doubleValuesMV;
     }
-    return transformTransformedToDoubleValuesMV(projectionBlock);
+    return transformTransformedToDoubleValuesMV(valueBlock);
   }
 
-  private double[][] transformTransformedToDoubleValuesMV(ProjectionBlock projectionBlock) {
+  private double[][] transformTransformedToDoubleValuesMV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int length = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       List<Double> result = null;
       try {
@@ -531,24 +506,21 @@ private double[][] transformTransformedToDoubleValuesMV(ProjectionBlock projecti
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesMV == null || _stringValuesMV.length < numDocs) {
-      _stringValuesMV = new String[numDocs][];
-    }
-    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction) {
-      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToStringValuesMV(projectionBlock,
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
+    initStringValuesMV(valueBlock.getNumDocs());
+    if (_jsonFieldTransformFunction instanceof PushDownTransformFunction && valueBlock instanceof ProjectionBlock) {
+      ((PushDownTransformFunction) _jsonFieldTransformFunction).transformToStringValuesMV((ProjectionBlock) valueBlock,
           _jsonPathEvaluator, _stringValuesMV);
       return _stringValuesMV;
     }
-    return transformTransformedValuesToStringValuesMV(projectionBlock);
+    return transformTransformedValuesToStringValuesMV(valueBlock);
   }
 
-  private String[][] transformTransformedValuesToStringValuesMV(ProjectionBlock projectionBlock) {
+  private String[][] transformTransformedValuesToStringValuesMV(ValueBlock valueBlock) {
     // operating on the output of another transform so can't pass the evaluation down to the storage
     ensureJsonPathCompiled();
-    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(projectionBlock);
-    int length = projectionBlock.getNumDocs();
+    String[] jsonStrings = _jsonFieldTransformFunction.transformToStringValuesSV(valueBlock);
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < length; i++) {
       List<String> result = null;
       try {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LeastTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LeastTransformFunction.java
index e621abd688f..0420f2fd1d4 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LeastTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LeastTransformFunction.java
@@ -20,9 +20,17 @@
 
 import java.math.BigDecimal;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
-
 
+/**
+ * The <code>LeastTransformFunction</code> implements the Least operator.
+ *
+ * Return the smallest results for the arguments
+ *
+ * Expected result:
+ * Least(columnA, columnB, columnC): smallest among columnA, columnB, columnC
+ *
+ * Note that null values will be ignored for evaluation. If all values are null, we return null.
+ */
 public class LeastTransformFunction extends SelectTupleElementTransformFunction {
 
   public LeastTransformFunction() {
@@ -30,106 +38,36 @@ public LeastTransformFunction() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    int[] values = _arguments.get(0).transformToIntValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _intValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToIntValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _intValuesSV[j] = Math.min(_intValuesSV[j], values[j]);
-      }
-    }
-    return _intValuesSV;
+  protected int binaryFunction(int a, int b) {
+    return Math.min(a, b);
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[numDocs];
-    }
-    long[] values = _arguments.get(0).transformToLongValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _longValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToLongValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _longValuesSV[j] = Math.min(_longValuesSV[j], values[j]);
-      }
-    }
-    return _longValuesSV;
+  protected long binaryFunction(long a, long b) {
+    return Math.min(a, b);
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[numDocs];
-    }
-    float[] values = _arguments.get(0).transformToFloatValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _floatValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToFloatValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _floatValuesSV[j] = Math.min(_floatValuesSV[j], values[j]);
-      }
-    }
-    return _floatValuesSV;
+  protected float binaryFunction(float a, float b) {
+    return Math.min(a, b);
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[numDocs];
-    }
-    double[] values = _arguments.get(0).transformToDoubleValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _doubleValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToDoubleValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _doubleValuesSV[j] = Math.min(_doubleValuesSV[j], values[j]);
-      }
-    }
-    return _doubleValuesSV;
+  protected double binaryFunction(double a, double b) {
+    return Math.min(a, b);
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[numDocs];
-    }
-    BigDecimal[] values = _arguments.get(0).transformToBigDecimalValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _bigDecimalValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToBigDecimalValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        _bigDecimalValuesSV[j] = _bigDecimalValuesSV[j].min(values[j]);
-      }
-    }
-    return _bigDecimalValuesSV;
+  protected BigDecimal binaryFunction(BigDecimal a, BigDecimal b) {
+    return a.min(b);
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[numDocs];
-    }
-    String[] values = _arguments.get(0).transformToStringValuesSV(projectionBlock);
-    System.arraycopy(values, 0, _stringValuesSV, 0, numDocs);
-    for (int i = 1; i < _arguments.size(); i++) {
-      values = _arguments.get(i).transformToStringValuesSV(projectionBlock);
-      for (int j = 0; j < numDocs & j < values.length; j++) {
-        if (_stringValuesSV[j].compareTo(values[j]) > 0) {
-          _stringValuesSV[j] = values[j];
-        }
-      }
+  protected String binaryFunction(String a, String b) {
+    if (a.compareTo(b) < 0) {
+      return a;
+    } else {
+      return b;
     }
-    return _stringValuesSV;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunction.java
index dc63437f36b..ec9f0101017 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunction.java
@@ -18,33 +18,31 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.pinot.common.request.context.LiteralContext;
-import org.apache.pinot.common.utils.PinotDataType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.BytesUtils;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
  * The <code>LiteralTransformFunction</code> class is a special transform function which is a wrapper on top of a
  * LITERAL. The data type is inferred from the literal string.
- * TODO: Preserve the type of the literal instead of inferring the type from the string
  */
 public class LiteralTransformFunction implements TransformFunction {
-  // TODO: Deprecate the string representation of literal.
-  private final String _literal;
+  public static final String FUNCTION_NAME = "literal";
+
+  private final Object _literal;
   private final DataType _dataType;
   private final int _intLiteral;
   private final long _longLiteral;
@@ -63,73 +61,50 @@ public class LiteralTransformFunction implements TransformFunction {
 
   public LiteralTransformFunction(LiteralContext literalContext) {
     Preconditions.checkNotNull(literalContext);
-    _literal = literalContext.getValue() == null ? "" : literalContext.getValue().toString();
-    if (literalContext.getType() == DataType.BOOLEAN) {
-      _bigDecimalLiteral = PinotDataType.BOOLEAN.toBigDecimal(literalContext.getValue());
-      _dataType = DataType.BOOLEAN;
-    } else {
-      _dataType = inferLiteralDataType(_literal);
-      if (_dataType.isNumeric()) {
-        _bigDecimalLiteral = new BigDecimal(_literal);
-      } else if (_dataType == DataType.TIMESTAMP) {
-        // inferLiteralDataType successfully interpreted the literal as TIMESTAMP. _bigDecimalLiteral is populated and
-        // assigned to _longLiteral.
-        _bigDecimalLiteral = PinotDataType.TIMESTAMP.toBigDecimal(Timestamp.valueOf(_literal));
-      } else {
-        _bigDecimalLiteral = BigDecimal.ZERO;
-      }
-    }
+    _literal = literalContext.getValue();
+    _dataType = literalContext.getType();
+    _bigDecimalLiteral = literalContext.getBigDecimalValue();
     _intLiteral = _bigDecimalLiteral.intValue();
     _longLiteral = _bigDecimalLiteral.longValue();
     _floatLiteral = _bigDecimalLiteral.floatValue();
     _doubleLiteral = _bigDecimalLiteral.doubleValue();
   }
 
-  // TODO: Deprecate the usage case for this function.
-  @VisibleForTesting
-  static DataType inferLiteralDataType(String literal) {
-    // Try to interpret the literal as number
-    try {
-      Number number = NumberUtils.createNumber(literal);
-      if (number instanceof Integer) {
-        return DataType.INT;
-      } else if (number instanceof Long) {
-        return DataType.LONG;
-      } else if (number instanceof Float) {
-        return DataType.FLOAT;
-      } else if (number instanceof Double) {
-        return DataType.DOUBLE;
-      } else if (number instanceof BigDecimal | number instanceof BigInteger) {
-        return DataType.BIG_DECIMAL;
-      } else {
-        return DataType.STRING;
-      }
-    } catch (Exception e) {
-      // Ignored
-    }
+  public boolean getBooleanLiteral() {
+    return BooleanUtils.toBoolean(_literal);
+  }
 
-    // Try to interpret the literal as TIMESTAMP
-    try {
-      Timestamp.valueOf(literal);
-      return DataType.TIMESTAMP;
-    } catch (Exception e) {
-      // Ignored
-    }
+  public int getIntLiteral() {
+    return _intLiteral;
+  }
+
+  public long getLongLiteral() {
+    return _longLiteral;
+  }
+
+  public float getFloatLiteral() {
+    return _floatLiteral;
+  }
 
-    return DataType.STRING;
+  public double getDoubleLiteral() {
+    return _doubleLiteral;
   }
 
-  public String getLiteral() {
-    return _literal;
+  public BigDecimal getBigDecimalLiteral() {
+    return _bigDecimalLiteral;
+  }
+
+  public String getStringLiteral() {
+    return String.valueOf(_literal);
   }
 
   @Override
   public String getName() {
-    throw new UnsupportedOperationException();
+    return FUNCTION_NAME;
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
   }
 
   @Override
@@ -139,22 +114,22 @@ public TransformResultMetadata getResultMetadata() {
 
   @Override
   public Dictionary getDictionary() {
-    throw new UnsupportedOperationException();
+    return null;
   }
 
   @Override
-  public int[] transformToDictIdsSV(ProjectionBlock projectionBlock) {
+  public int[] transformToDictIdsSV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public int[][] transformToDictIdsMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToDictIdsMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     int[] intResult = _intResult;
     if (intResult == null || intResult.length < numDocs) {
       intResult = new int[numDocs];
@@ -171,8 +146,8 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     long[] longResult = _longResult;
     if (longResult == null || longResult.length < numDocs) {
       longResult = new long[numDocs];
@@ -181,7 +156,7 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
           Arrays.fill(longResult, _longLiteral);
         }
       } else {
-        Arrays.fill(longResult, Timestamp.valueOf(_literal).getTime());
+        Arrays.fill(longResult, Timestamp.valueOf(getStringLiteral()).getTime());
       }
       _longResult = longResult;
     }
@@ -189,8 +164,8 @@ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     float[] floatResult = _floatResult;
     if (floatResult == null || floatResult.length < numDocs) {
       floatResult = new float[numDocs];
@@ -203,8 +178,8 @@ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     double[] doubleResult = _doubleResult;
     if (doubleResult == null || doubleResult.length < numDocs) {
       doubleResult = new double[numDocs];
@@ -217,8 +192,8 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     BigDecimal[] bigDecimalResult = _bigDecimalResult;
     if (bigDecimalResult == null || bigDecimalResult.length < numDocs) {
       bigDecimalResult = new BigDecimal[numDocs];
@@ -229,56 +204,69 @@ public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBloc
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     String[] stringResult = _stringResult;
     if (stringResult == null || stringResult.length < numDocs) {
       stringResult = new String[numDocs];
-      Arrays.fill(stringResult, _literal);
+      Arrays.fill(stringResult, getStringLiteral());
       _stringResult = stringResult;
     }
     return stringResult;
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     byte[][] bytesResult = _bytesResult;
     if (bytesResult == null || bytesResult.length < numDocs) {
       bytesResult = new byte[numDocs][];
-      Arrays.fill(bytesResult, BytesUtils.toBytes(_literal));
+      // TODO: Handle null literal
+      Arrays.fill(bytesResult, BytesUtils.toBytes(getStringLiteral()));
       _bytesResult = bytesResult;
     }
     return bytesResult;
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public byte[][][] transformToBytesValuesMV(ProjectionBlock projectionBlock) {
+  public byte[][][] transformToBytesValuesMV(ValueBlock valueBlock) {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    // Treat all unknown type values as null regardless of the value.
+    if (_dataType != DataType.UNKNOWN) {
+      return null;
+    }
+    int length = valueBlock.getNumDocs();
+    RoaringBitmap bitmap = new RoaringBitmap();
+    bitmap.add(0L, length);
+    return bitmap;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunction.java
index 10e834c6354..08543e5a49a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunction.java
@@ -21,9 +21,11 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.glassfish.jersey.internal.guava.Preconditions;
 
 
 /**
@@ -34,7 +36,8 @@ public abstract class LogicalOperatorTransformFunction extends BaseTransformFunc
   protected List<TransformFunction> _arguments;
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     _arguments = arguments;
     int numArguments = arguments.size();
     if (numArguments <= 1) {
@@ -44,10 +47,10 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     }
     for (int i = 0; i < numArguments; i++) {
       TransformResultMetadata argumentMetadata = arguments.get(i).getResultMetadata();
-      if (!(argumentMetadata.isSingleValue() && argumentMetadata.getDataType().getStoredType().isNumeric())) {
-        throw new IllegalArgumentException(
-            "Unsupported argument of index: " + i + ", expecting single-valued boolean/number");
-      }
+      FieldSpec.DataType storedType = argumentMetadata.getDataType().getStoredType();
+      Preconditions.checkState(
+          argumentMetadata.isSingleValue() && storedType.isNumeric() || storedType.isUnknown(),
+          "Unsupported argument type. Expecting single-valued boolean/number");
     }
   }
 
@@ -57,16 +60,14 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    System.arraycopy(_arguments.get(0).transformToIntValuesSV(projectionBlock), 0, _intValuesSV, 0, numDocs);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    System.arraycopy(_arguments.get(0).transformToIntValuesSV(valueBlock), 0, _intValuesSV, 0, numDocs);
     int numArguments = _arguments.size();
     for (int i = 1; i < numArguments; i++) {
       TransformFunction transformFunction = _arguments.get(i);
-      int[] results = transformFunction.transformToIntValuesSV(projectionBlock);
+      int[] results = transformFunction.transformToIntValuesSV(valueBlock);
       for (int j = 0; j < numDocs; j++) {
         _intValuesSV[j] = getLogicalFuncResult(_intValuesSV[j], results[j]);
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LookupTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LookupTransformFunction.java
index 460966972fd..74e516ba348 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LookupTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/LookupTransformFunction.java
@@ -24,9 +24,9 @@
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.pinot.core.data.manager.offline.DimensionTableDataManager;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.data.readers.GenericRow;
@@ -91,25 +91,25 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     // Check that there are correct number of arguments
     Preconditions.checkArgument(arguments.size() >= 4,
         "At least 4 arguments are required for LOOKUP transform function: "
             + "LOOKUP(TableName, ColumnName, JoinKey, JoinValue [, JoinKey2, JoinValue2 ...])");
-    Preconditions
-        .checkArgument(arguments.size() % 2 == 0, "Should have the same number of JoinKey and JoinValue arguments");
+    Preconditions.checkArgument(arguments.size() % 2 == 0,
+        "Should have the same number of JoinKey and JoinValue arguments");
 
     TransformFunction dimTableNameFunction = arguments.get(0);
     Preconditions.checkArgument(dimTableNameFunction instanceof LiteralTransformFunction,
         "First argument must be a literal(string) representing the dimension table name");
     // Lookup parameters
-    String dimTableName =
-        TableNameBuilder.OFFLINE.tableNameWithType(((LiteralTransformFunction) dimTableNameFunction).getLiteral());
+    String dimTableName = TableNameBuilder.OFFLINE.tableNameWithType(
+        ((LiteralTransformFunction) dimTableNameFunction).getStringLiteral());
 
     TransformFunction dimColumnFunction = arguments.get(1);
     Preconditions.checkArgument(dimColumnFunction instanceof LiteralTransformFunction,
         "Second argument must be a literal(string) representing the column name from dimension table to lookup");
-    _dimColumnName = ((LiteralTransformFunction) dimColumnFunction).getLiteral();
+    _dimColumnName = ((LiteralTransformFunction) dimColumnFunction).getStringLiteral();
 
     List<TransformFunction> joinArguments = arguments.subList(2, arguments.size());
     int numJoinArguments = joinArguments.size();
@@ -117,7 +117,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       TransformFunction dimJoinKeyFunction = joinArguments.get((i * 2));
       Preconditions.checkArgument(dimJoinKeyFunction instanceof LiteralTransformFunction,
           "JoinKey argument must be a literal(string) representing the primary key for the dimension table");
-      _joinKeys.add(((LiteralTransformFunction) dimJoinKeyFunction).getLiteral());
+      _joinKeys.add(((LiteralTransformFunction) dimJoinKeyFunction).getStringLiteral());
 
       TransformFunction factJoinValueFunction = joinArguments.get((i * 2) + 1);
       TransformResultMetadata factJoinValueFunctionResultMetadata = factJoinValueFunction.getResultMetadata();
@@ -133,9 +133,8 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     Preconditions.checkArgument(_dataManager.isPopulated(), "Dimension table is not populated: %s", dimTableName);
 
     _lookupColumnFieldSpec = _dataManager.getColumnFieldSpec(_dimColumnName);
-    Preconditions
-        .checkArgument(_lookupColumnFieldSpec != null, "Column does not exist in dimension table: %s:%s", dimTableName,
-            _dimColumnName);
+    Preconditions.checkArgument(_lookupColumnFieldSpec != null, "Column does not exist in dimension table: %s:%s",
+        dimTableName, _dimColumnName);
 
     for (String joinKey : _joinKeys) {
       FieldSpec pkColumnSpec = _dataManager.getColumnFieldSpec(joinKey);
@@ -168,31 +167,31 @@ private interface ValueAcceptor {
     void accept(int index, @Nullable Object value);
   }
 
-  private void lookup(ProjectionBlock projectionBlock, ValueAcceptor valueAcceptor) {
+  private void lookup(ValueBlock valueBlock, ValueAcceptor valueAcceptor) {
     int numPkColumns = _joinKeys.size();
-    int numDocuments = projectionBlock.getNumDocs();
+    int numDocuments = valueBlock.getNumDocs();
     Object[] pkColumns = new Object[numPkColumns];
     for (int c = 0; c < numPkColumns; c++) {
       DataType storedType = _joinValueFieldSpecs.get(c).getDataType().getStoredType();
       TransformFunction tf = _joinValueFunctions.get(c);
       switch (storedType) {
         case INT:
-          pkColumns[c] = tf.transformToIntValuesSV(projectionBlock);
+          pkColumns[c] = tf.transformToIntValuesSV(valueBlock);
           break;
         case LONG:
-          pkColumns[c] = tf.transformToLongValuesSV(projectionBlock);
+          pkColumns[c] = tf.transformToLongValuesSV(valueBlock);
           break;
         case FLOAT:
-          pkColumns[c] = tf.transformToFloatValuesSV(projectionBlock);
+          pkColumns[c] = tf.transformToFloatValuesSV(valueBlock);
           break;
         case DOUBLE:
-          pkColumns[c] = tf.transformToDoubleValuesSV(projectionBlock);
+          pkColumns[c] = tf.transformToDoubleValuesSV(valueBlock);
           break;
         case STRING:
-          pkColumns[c] = tf.transformToStringValuesSV(projectionBlock);
+          pkColumns[c] = tf.transformToStringValuesSV(valueBlock);
           break;
         case BYTES:
-          pkColumns[c] = tf.transformToBytesValuesSV(projectionBlock);
+          pkColumns[c] = tf.transformToBytesValuesSV(valueBlock);
           break;
         default:
           throw new IllegalStateException("Unknown column type for primary key");
@@ -226,145 +225,112 @@ private void lookup(ProjectionBlock projectionBlock, ValueAcceptor valueAcceptor
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesSV(projectionBlock);
+      return super.transformToIntValuesSV(valueBlock);
     }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    lookup(projectionBlock, this::setIntSV);
+    initIntValuesSV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setIntSV);
     return _intValuesSV;
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesSV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[numDocs];
+      return super.transformToLongValuesSV(valueBlock);
     }
-    lookup(projectionBlock, this::setLongSV);
+    initLongValuesSV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setLongSV);
     return _longValuesSV;
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesSV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[numDocs];
+      return super.transformToFloatValuesSV(valueBlock);
     }
-    lookup(projectionBlock, this::setFloatSV);
+    initFloatValuesSV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setFloatSV);
     return _floatValuesSV;
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesSV(projectionBlock);
+      return super.transformToDoubleValuesSV(valueBlock);
     }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[numDocs];
-    }
-    lookup(projectionBlock, this::setDoubleSV);
+    initDoubleValuesSV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setDoubleSV);
     return _doubleValuesSV;
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesSV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[numDocs];
+      return super.transformToStringValuesSV(valueBlock);
     }
-    lookup(projectionBlock, this::setStringSV);
+    initStringValuesSV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setStringSV);
     return _stringValuesSV;
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.BYTES) {
-      return super.transformToBytesValuesSV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_bytesValuesSV == null) {
-      _bytesValuesSV = new byte[numDocs][];
+      return super.transformToBytesValuesSV(valueBlock);
     }
-    lookup(projectionBlock, this::setBytesSV);
+    initBytesValuesSV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setBytesSV);
     return _bytesValuesSV;
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesMV(projectionBlock);
+      return super.transformToIntValuesMV(valueBlock);
     }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesMV == null) {
-      _intValuesMV = new int[numDocs][];
-    }
-    lookup(projectionBlock, this::setIntMV);
+    initIntValuesMV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setIntMV);
     return _intValuesMV;
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesMV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_longValuesMV == null) {
-      _longValuesMV = new long[numDocs][];
+      return super.transformToLongValuesMV(valueBlock);
     }
-    lookup(projectionBlock, this::setLongMV);
+    initLongValuesMV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setLongMV);
     return _longValuesMV;
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesMV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_floatValuesMV == null) {
-      _floatValuesMV = new float[numDocs][];
+      return super.transformToFloatValuesMV(valueBlock);
     }
-    lookup(projectionBlock, this::setFloatMV);
+    initFloatValuesMV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setFloatMV);
     return _floatValuesMV;
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesMV(projectionBlock);
+      return super.transformToDoubleValuesMV(valueBlock);
     }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_doubleValuesMV == null) {
-      _doubleValuesMV = new double[numDocs][];
-    }
-    lookup(projectionBlock, this::setDoubleMV);
+    initDoubleValuesMV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setDoubleMV);
     return _doubleValuesMV;
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
     if (_lookupColumnFieldSpec.getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesMV(projectionBlock);
-    }
-    int numDocs = projectionBlock.getNumDocs();
-    if (_stringValuesMV == null) {
-      _stringValuesMV = new String[numDocs][];
+      return super.transformToStringValuesMV(valueBlock);
     }
-    lookup(projectionBlock, this::setStringMV);
+    initStringValuesMV(valueBlock.getNumDocs());
+    lookup(valueBlock, this::setStringMV);
     return _stringValuesMV;
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MapValueTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MapValueTransformFunction.java
index d992e0fccff..1ead2aa6aaf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MapValueTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MapValueTransformFunction.java
@@ -21,9 +21,9 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 
 
@@ -59,7 +59,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() == 3,
         "3 arguments are required for MAP_VALUE transform function: keyColumn, keyValue, valueColumn, e.g. MAP_VALUE"
             + "(key, 'myKey', value)");
@@ -73,7 +73,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     TransformFunction keyValueFunction = arguments.get(1);
     Preconditions.checkState(keyValueFunction instanceof LiteralTransformFunction,
         "Key value must be a literal (number or string)");
-    String keyValue = ((LiteralTransformFunction) keyValueFunction).getLiteral();
+    String keyValue = ((LiteralTransformFunction) keyValueFunction).getStringLiteral();
     _keyDictId = keyColumnDictionary.indexOf(keyValue);
 
     _valueColumnFunction = arguments.get(2);
@@ -95,13 +95,13 @@ public Dictionary getDictionary() {
   }
 
   @Override
-  public int[] transformToDictIdsSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_dictIds == null) {
+  public int[] transformToDictIdsSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    if (_dictIds == null || _dictIds.length < length) {
       _dictIds = new int[length];
     }
-    int[][] keyDictIdsMV = _keyColumnFunction.transformToDictIdsMV(projectionBlock);
-    int[][] valueDictIdsMV = _valueColumnFunction.transformToDictIdsMV(projectionBlock);
+    int[][] keyDictIdsMV = _keyColumnFunction.transformToDictIdsMV(valueBlock);
+    int[][] valueDictIdsMV = _valueColumnFunction.transformToDictIdsMV(valueBlock);
     for (int i = 0; i < length; i++) {
       int[] keyDictIds = keyDictIdsMV[i];
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunction.java
index 435584fdb25..71f2b3ad86d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunction.java
@@ -21,9 +21,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 public class ModuloTransformFunction extends BaseTransformFunction {
@@ -40,7 +40,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are exactly 2 arguments
     if (arguments.size() != 2) {
       throw new IllegalArgumentException("Exactly 2 arguments are required for MOD transform function");
@@ -48,7 +49,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
 
     TransformFunction firstArgument = arguments.get(0);
     if (firstArgument instanceof LiteralTransformFunction) {
-      _firstLiteral = Double.parseDouble(((LiteralTransformFunction) firstArgument).getLiteral());
+      _firstLiteral = ((LiteralTransformFunction) firstArgument).getDoubleLiteral();
     } else {
       if (!firstArgument.getResultMetadata().isSingleValue()) {
         throw new IllegalArgumentException("First argument of MOD transform function must be single-valued");
@@ -58,7 +59,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
 
     TransformFunction secondArgument = arguments.get(1);
     if (secondArgument instanceof LiteralTransformFunction) {
-      _secondLiteral = Double.parseDouble(((LiteralTransformFunction) secondArgument).getLiteral());
+      _secondLiteral = ((LiteralTransformFunction) secondArgument).getDoubleLiteral();
     } else {
       if (!secondArgument.getResultMetadata().isSingleValue()) {
         throw new IllegalArgumentException("Second argument of MOD transform function must be single-valued");
@@ -73,15 +74,13 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     if (_firstTransformFunction == null) {
       Arrays.fill(_doubleValuesSV, 0, length, _firstLiteral);
     } else {
-      double[] values = _firstTransformFunction.transformToDoubleValuesSV(projectionBlock);
+      double[] values = _firstTransformFunction.transformToDoubleValuesSV(valueBlock);
       System.arraycopy(values, 0, _doubleValuesSV, 0, length);
     }
     if (_secondTransformFunction == null) {
@@ -89,7 +88,7 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
         _doubleValuesSV[i] %= _secondLiteral;
       }
     } else {
-      double[] values = _secondTransformFunction.transformToDoubleValuesSV(projectionBlock);
+      double[] values = _secondTransformFunction.transformToDoubleValuesSV(valueBlock);
       for (int i = 0; i < length; i++) {
         _doubleValuesSV[i] %= values[i];
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunction.java
index b2adb8cc645..e8526c7ad4d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunction.java
@@ -23,9 +23,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are more than 1 arguments
     if (arguments.size() < 2) {
       throw new IllegalArgumentException("At least 2 arguments are required for MULT transform function");
@@ -57,10 +58,10 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
         DataType dataType = literalTransformFunction.getResultMetadata().getDataType();
         if (dataType == DataType.BIG_DECIMAL) {
           _literalBigDecimalProduct =
-              _literalBigDecimalProduct.multiply(new BigDecimal(literalTransformFunction.getLiteral()));
+              _literalBigDecimalProduct.multiply(literalTransformFunction.getBigDecimalLiteral());
           _resultDataType = DataType.BIG_DECIMAL;
         } else {
-          _literalDoubleProduct *= Double.parseDouble(((LiteralTransformFunction) argument).getLiteral());
+          _literalDoubleProduct *= ((LiteralTransformFunction) argument).getDoubleLiteral();
         }
       } else {
         if (!argument.getResultMetadata().isSingleValue()) {
@@ -86,18 +87,16 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     if (_resultDataType == DataType.BIG_DECIMAL) {
-      BigDecimal[] values = transformToBigDecimalValuesSV(projectionBlock);
+      BigDecimal[] values = transformToBigDecimalValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _doubleValuesSV, length);
     } else {
       Arrays.fill(_doubleValuesSV, 0, length, _literalDoubleProduct);
       for (TransformFunction transformFunction : _transformFunctions) {
-        double[] values = transformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] values = transformFunction.transformToDoubleValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _doubleValuesSV[i] *= values[i];
         }
@@ -107,18 +106,16 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     if (_resultDataType == DataType.DOUBLE) {
-      double[] values = transformToDoubleValuesSV(projectionBlock);
+      double[] values = transformToDoubleValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _bigDecimalValuesSV, length);
     } else {
       Arrays.fill(_bigDecimalValuesSV, 0, length, _literalBigDecimalProduct);
       for (TransformFunction transformFunction : _transformFunctions) {
-        BigDecimal[] values = transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] values = transformFunction.transformToBigDecimalValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _bigDecimalValuesSV[i] = _bigDecimalValuesSV[i].multiply(values[i]);
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotInTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotInTransformFunction.java
index dd09574847c..4bf2885e50e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotInTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotInTransformFunction.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
-import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 
 
 /**
@@ -36,16 +36,21 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
-    super.init(arguments, dataSourceMap);
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int[] intValuesSV = super.transformToIntValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int[] intValuesSV = super.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < intValuesSV.length; i++) {
       intValuesSV[i] = 1 - intValuesSV[i];
     }
     return intValuesSV;
   }
+
+  @Override
+  protected boolean mainFunctionNotContainedInValues(int value) {
+    return value == 1;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunction.java
index 2870d4836d7..3bff952c918 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunction.java
@@ -22,9 +22,10 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.function.TransformFunctionType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.spi.data.FieldSpec;
 
 
 /**
@@ -48,11 +49,13 @@ public class NotOperatorTransformFunction extends BaseTransformFunction {
   private TransformFunction _argument;
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     Preconditions.checkArgument(arguments.size() == 1, "Exact 1 argument1 is required for not transform function");
     TransformResultMetadata argumentMetadata = arguments.get(0).getResultMetadata();
+    FieldSpec.DataType storedType = argumentMetadata.getDataType().getStoredType();
     Preconditions.checkState(
-        argumentMetadata.isSingleValue() && argumentMetadata.getDataType().getStoredType().isNumeric(),
+        argumentMetadata.isSingleValue() && storedType.isNumeric() || storedType.isUnknown(),
         "Unsupported argument type. Expecting single-valued boolean/number");
     _argument = arguments.get(0);
   }
@@ -68,12 +71,10 @@ public String getName() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
-    int numDocs = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[numDocs];
-    }
-    int[] intValues = _argument.transformToIntValuesSV(projectionBlock);
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    int[] intValues = _argument.transformToIntValuesSV(valueBlock);
     for (int i = 0; i < numDocs; i++) {
       _intValuesSV[i] = getLogicalNegate(intValues[i]);
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunction.java
index 0ac45eb9ed8..0d5324d440c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunction.java
@@ -21,9 +21,9 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 public class PowerTransformFunction extends BaseTransformFunction {
@@ -39,7 +39,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are more than 1 arguments
     if (arguments.size() != 2) {
       throw new IllegalArgumentException("Exactly 2 arguments are required for power transform function");
@@ -49,7 +50,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     _leftTransformFunction = arguments.get(0);
     _rightTransformFunction = arguments.get(1);
     if (_rightTransformFunction instanceof LiteralTransformFunction) {
-      _exponent = Double.parseDouble(((LiteralTransformFunction) _rightTransformFunction).getLiteral());
+      _exponent = ((LiteralTransformFunction) _rightTransformFunction).getDoubleLiteral();
       _fixedExponent = true;
     }
     Preconditions.checkArgument(
@@ -63,18 +64,16 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(valueBlock);
     if (_fixedExponent) {
       for (int i = 0; i < length; i++) {
         _doubleValuesSV[i] = Math.pow(leftValues[i], _exponent);
       }
     } else {
-      double[] rightValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+      double[] rightValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
       for (int i = 0; i < length; i++) {
         _doubleValuesSV[i] = Math.pow(leftValues[i], rightValues[i]);
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RegexpExtractTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RegexpExtractTransformFunction.java
index f163d9a7055..5670f92b76e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RegexpExtractTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RegexpExtractTransformFunction.java
@@ -23,9 +23,9 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 /**
@@ -57,7 +57,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     Preconditions.checkArgument(arguments.size() >= 2 && arguments.size() <= 4,
         "REGEXP_EXTRACT takes between 2 to 4 arguments. See usage: "
             + "REGEXP_EXTRACT(`value`, `regexp`[, `group`[, `default_value`]]");
@@ -66,14 +66,14 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     TransformFunction regexpFunction = arguments.get(1);
     Preconditions.checkState(regexpFunction instanceof LiteralTransformFunction,
         "`regexp` must be a literal regex expression.");
-    _regexp = Pattern.compile(((LiteralTransformFunction) regexpFunction).getLiteral());
+    _regexp = Pattern.compile(((LiteralTransformFunction) regexpFunction).getStringLiteral());
 
     if (arguments.size() >= 3) {
       TransformFunction groupFunction = arguments.get(2);
       Preconditions.checkState(groupFunction instanceof LiteralTransformFunction
-              && Integer.parseInt(((LiteralTransformFunction) groupFunction).getLiteral()) >= 0,
+              && ((LiteralTransformFunction) groupFunction).getIntLiteral() >= 0,
           "`group` must be a literal, non-negative integer.");
-      _group = Integer.parseInt(((LiteralTransformFunction) groupFunction).getLiteral());
+      _group = ((LiteralTransformFunction) groupFunction).getIntLiteral();
     } else {
       _group = 0;
     }
@@ -82,7 +82,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       TransformFunction positionFunction = arguments.get(3);
       Preconditions.checkState(positionFunction instanceof LiteralTransformFunction,
           "`default_value` must be a literal expression.");
-      _defaultValue = ((LiteralTransformFunction) regexpFunction).getLiteral();
+      _defaultValue = ((LiteralTransformFunction) regexpFunction).getStringLiteral();
     } else {
       _defaultValue = "";
     }
@@ -95,12 +95,10 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
-    }
-    String[] valuesSV = _valueFunction.transformToStringValuesSV(projectionBlock);
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
+    String[] valuesSV = _valueFunction.transformToStringValuesSV(valueBlock);
     for (int i = 0; i < length; i++) {
       Matcher matcher = _regexp.matcher(valuesSV[i]);
       if (matcher.find() && matcher.groupCount() >= _group) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunction.java
index 53baed25283..1fbfcecaf3a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunction.java
@@ -23,9 +23,9 @@
 import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 
 
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     int numArguments = arguments.size();
     // Check that there are more than 2 arguments or no arguments
     if (numArguments < 1 || numArguments > 2) {
@@ -57,7 +58,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     if (numArguments > 1) {
       _rightTransformFunction = arguments.get(1);
       if (_rightTransformFunction instanceof LiteralTransformFunction) {
-        _scale = Integer.parseInt(((LiteralTransformFunction) _rightTransformFunction).getLiteral());
+        _scale = ((LiteralTransformFunction) _rightTransformFunction).getIntLiteral();
         _fixedScale = true;
       }
       Preconditions.checkArgument(
@@ -83,19 +84,17 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(valueBlock);
     if (_fixedScale) {
       for (int i = 0; i < length; i++) {
         _doubleValuesSV[i] = BigDecimal.valueOf(leftValues[i])
             .setScale(_scale, RoundingMode.HALF_UP).doubleValue();
       }
     } else if (_rightTransformFunction != null) {
-      int[] rightValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+      int[] rightValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
       for (int i = 0; i < length; i++) {
         _doubleValuesSV[i] = BigDecimal.valueOf(leftValues[i])
             .setScale(rightValues[i], RoundingMode.HALF_UP).doubleValue();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
index 097c387457e..410e9791323 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
@@ -28,9 +28,9 @@
 import org.apache.pinot.common.function.FunctionInvoker;
 import org.apache.pinot.common.function.FunctionUtils;
 import org.apache.pinot.common.utils.PinotDataType;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
 
@@ -43,7 +43,7 @@ public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
   private final PinotDataType _resultType;
   private final TransformResultMetadata _resultMetadata;
 
-  private Object[] _arguments;
+  private Object[] _scalarArguments;
   private int _numNonLiteralArguments;
   private int[] _nonLiteralIndices;
   private TransformFunction[] _nonLiteralFunctions;
@@ -78,21 +78,61 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     int numArguments = arguments.size();
     PinotDataType[] parameterTypes = _functionInvoker.getParameterTypes();
     Preconditions.checkArgument(numArguments == parameterTypes.length,
         "Wrong number of arguments for method: %s, expected: %s, actual: %s", _functionInvoker.getMethod(),
         parameterTypes.length, numArguments);
 
-    _arguments = new Object[numArguments];
+    _scalarArguments = new Object[numArguments];
     _nonLiteralIndices = new int[numArguments];
     _nonLiteralFunctions = new TransformFunction[numArguments];
     for (int i = 0; i < numArguments; i++) {
       TransformFunction transformFunction = arguments.get(i);
       if (transformFunction instanceof LiteralTransformFunction) {
-        String literal = ((LiteralTransformFunction) transformFunction).getLiteral();
-        _arguments[i] = parameterTypes[i].convert(literal, PinotDataType.STRING);
+        LiteralTransformFunction literalTransformFunction = (LiteralTransformFunction) transformFunction;
+        DataType dataType = literalTransformFunction.getResultMetadata().getDataType();
+        switch (dataType) {
+          case BOOLEAN:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getBooleanLiteral(), PinotDataType.BOOLEAN);
+            break;
+          case INT:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getIntLiteral(), PinotDataType.INTEGER);
+            break;
+          case LONG:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getLongLiteral(), PinotDataType.LONG);
+            break;
+          case FLOAT:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getFloatLiteral(), PinotDataType.FLOAT);
+            break;
+          case DOUBLE:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getDoubleLiteral(), PinotDataType.DOUBLE);
+            break;
+          case BIG_DECIMAL:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getBigDecimalLiteral(), PinotDataType.BIG_DECIMAL);
+            break;
+          case TIMESTAMP:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getLongLiteral(), PinotDataType.TIMESTAMP);
+            break;
+          case STRING:
+            _scalarArguments[i] =
+                parameterTypes[i].convert(literalTransformFunction.getStringLiteral(), PinotDataType.STRING);
+            break;
+          case UNKNOWN:
+            _scalarArguments[i] = null;
+            break;
+          default:
+            throw new RuntimeException("Unsupported data type:" + dataType);
+        }
       } else {
         _nonLiteralIndices[_numNonLiteralArguments] = i;
         _nonLiteralFunctions[_numNonLiteralArguments] = transformFunction;
@@ -108,231 +148,207 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+  public int[] transformToIntValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesSV == null) {
-      _intValuesSV = new int[length];
+      return super.transformToIntValuesSV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initIntValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _intValuesSV[i] = (int) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _intValuesSV[i] = (int) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _intValuesSV;
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesSV(projectionBlock);
+      return super.transformToLongValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
-    }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _longValuesSV[i] = (long) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _longValuesSV[i] = (long) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _longValuesSV;
   }
 
   @Override
-  public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+  public float[] transformToFloatValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesSV == null) {
-      _floatValuesSV = new float[length];
+      return super.transformToFloatValuesSV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initFloatValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _floatValuesSV[i] = (float) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _floatValuesSV[i] = (float) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _floatValuesSV;
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesSV(projectionBlock);
+      return super.transformToDoubleValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _doubleValuesSV[i] = (double) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _doubleValuesSV[i] = (double) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _doubleValuesSV;
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.BIG_DECIMAL) {
-      return super.transformToBigDecimalValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
+      return super.transformToBigDecimalValuesSV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _bigDecimalValuesSV[i] = (BigDecimal) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _bigDecimalValuesSV[i] = (BigDecimal) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _bigDecimalValuesSV;
   }
 
   @Override
-  public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+  public String[] transformToStringValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesSV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesSV == null) {
-      _stringValuesSV = new String[length];
+      return super.transformToStringValuesSV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initStringValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      Object result = _functionInvoker.invoke(_arguments);
+      Object result = _functionInvoker.invoke(_scalarArguments);
       _stringValuesSV[i] =
-          _resultType == PinotDataType.STRING ? result.toString() : (String) _resultType.toInternal(result);
+          _resultType == PinotDataType.STRING ? (String) result : (String) _resultType.toInternal(result);
     }
     return _stringValuesSV;
   }
 
   @Override
-  public byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock) {
+  public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.BYTES) {
-      return super.transformToBytesValuesSV(projectionBlock);
+      return super.transformToBytesValuesSV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_bytesValuesSV == null) {
-      _bytesValuesSV = new byte[length][];
-    }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initBytesValuesSV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _bytesValuesSV[i] = (byte[]) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _bytesValuesSV[i] = (byte[]) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _bytesValuesSV;
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesMV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_intValuesMV == null) {
-      _intValuesMV = new int[length][];
+      return super.transformToIntValuesMV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initIntValuesMV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _intValuesMV[i] = (int[]) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _intValuesMV[i] = (int[]) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _intValuesMV;
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesMV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesMV == null) {
-      _longValuesMV = new long[length][];
+      return super.transformToLongValuesMV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initLongValuesMV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _longValuesMV[i] = (long[]) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _longValuesMV[i] = (long[]) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _longValuesMV;
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesMV(projectionBlock);
+      return super.transformToFloatValuesMV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
-    if (_floatValuesMV == null) {
-      _floatValuesMV = new float[length][];
-    }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initFloatValuesMV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _floatValuesMV[i] = (float[]) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _floatValuesMV[i] = (float[]) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _floatValuesMV;
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesMV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesMV == null) {
-      _doubleValuesMV = new double[length][];
+      return super.transformToDoubleValuesMV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesMV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _doubleValuesMV[i] = (double[]) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _doubleValuesMV[i] = (double[]) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _doubleValuesMV;
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
     if (_resultMetadata.getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesMV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesMV == null) {
-      _stringValuesMV = new String[length][];
+      return super.transformToStringValuesMV(valueBlock);
     }
-    getNonLiteralValues(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initStringValuesMV(length);
+    getNonLiteralValues(valueBlock);
     for (int i = 0; i < length; i++) {
       for (int j = 0; j < _numNonLiteralArguments; j++) {
-        _arguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
+        _scalarArguments[_nonLiteralIndices[j]] = _nonLiteralValues[j][i];
       }
-      _stringValuesMV[i] = (String[]) _resultType.toInternal(_functionInvoker.invoke(_arguments));
+      _stringValuesMV[i] = (String[]) _resultType.toInternal(_functionInvoker.invoke(_scalarArguments));
     }
     return _stringValuesMV;
   }
@@ -340,29 +356,29 @@ public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
   /**
    * Helper method to fetch values for the non-literal transform functions based on the parameter types.
    */
-  private void getNonLiteralValues(ProjectionBlock projectionBlock) {
+  private void getNonLiteralValues(ValueBlock valueBlock) {
     PinotDataType[] parameterTypes = _functionInvoker.getParameterTypes();
     for (int i = 0; i < _numNonLiteralArguments; i++) {
       PinotDataType parameterType = parameterTypes[_nonLiteralIndices[i]];
       TransformFunction transformFunction = _nonLiteralFunctions[i];
       switch (parameterType) {
         case INTEGER:
-          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToIntValuesSV(projectionBlock));
+          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToIntValuesSV(valueBlock));
           break;
         case LONG:
-          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToLongValuesSV(projectionBlock));
+          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToLongValuesSV(valueBlock));
           break;
         case FLOAT:
-          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToFloatValuesSV(projectionBlock));
+          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToFloatValuesSV(valueBlock));
           break;
         case DOUBLE:
-          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToDoubleValuesSV(projectionBlock));
+          _nonLiteralValues[i] = ArrayUtils.toObject(transformFunction.transformToDoubleValuesSV(valueBlock));
           break;
         case BIG_DECIMAL:
-          _nonLiteralValues[i] = transformFunction.transformToBigDecimalValuesSV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToBigDecimalValuesSV(valueBlock);
           break;
         case BOOLEAN: {
-          int[] intValues = transformFunction.transformToIntValuesSV(projectionBlock);
+          int[] intValues = transformFunction.transformToIntValuesSV(valueBlock);
           int numValues = intValues.length;
           Boolean[] booleanValues = new Boolean[numValues];
           for (int j = 0; j < numValues; j++) {
@@ -372,7 +388,7 @@ private void getNonLiteralValues(ProjectionBlock projectionBlock) {
           break;
         }
         case TIMESTAMP: {
-          long[] longValues = transformFunction.transformToLongValuesSV(projectionBlock);
+          long[] longValues = transformFunction.transformToLongValuesSV(valueBlock);
           int numValues = longValues.length;
           Timestamp[] timestampValues = new Timestamp[numValues];
           for (int j = 0; j < numValues; j++) {
@@ -382,25 +398,25 @@ private void getNonLiteralValues(ProjectionBlock projectionBlock) {
           break;
         }
         case STRING:
-          _nonLiteralValues[i] = transformFunction.transformToStringValuesSV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToStringValuesSV(valueBlock);
           break;
         case BYTES:
-          _nonLiteralValues[i] = transformFunction.transformToBytesValuesSV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToBytesValuesSV(valueBlock);
           break;
         case PRIMITIVE_INT_ARRAY:
-          _nonLiteralValues[i] = transformFunction.transformToIntValuesMV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToIntValuesMV(valueBlock);
           break;
         case PRIMITIVE_LONG_ARRAY:
-          _nonLiteralValues[i] = transformFunction.transformToLongValuesMV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToLongValuesMV(valueBlock);
           break;
         case PRIMITIVE_FLOAT_ARRAY:
-          _nonLiteralValues[i] = transformFunction.transformToFloatValuesMV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToFloatValuesMV(valueBlock);
           break;
         case PRIMITIVE_DOUBLE_ARRAY:
-          _nonLiteralValues[i] = transformFunction.transformToDoubleValuesMV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToDoubleValuesMV(valueBlock);
           break;
         case STRING_ARRAY:
-          _nonLiteralValues[i] = transformFunction.transformToStringValuesMV(projectionBlock);
+          _nonLiteralValues[i] = transformFunction.transformToStringValuesMV(valueBlock);
           break;
         default:
           throw new IllegalStateException("Unsupported parameter type: " + parameterType);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SelectTupleElementTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SelectTupleElementTransformFunction.java
index a6314770534..83b63931fad 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SelectTupleElementTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SelectTupleElementTransformFunction.java
@@ -18,20 +18,24 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import java.math.BigDecimal;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
+import org.roaringbitmap.RoaringBitmap;
 
 
-public abstract class SelectTupleElementTransformFunction extends BaseTransformFunction {
+public abstract class SelectTupleElementTransformFunction
+    extends ComputeDifferentlyWhenNullHandlingEnabledTransformFunction {
 
   private static final EnumSet<FieldSpec.DataType> SUPPORTED_DATATYPES = EnumSet.of(FieldSpec.DataType.INT,
       FieldSpec.DataType.LONG, FieldSpec.DataType.FLOAT, FieldSpec.DataType.DOUBLE, FieldSpec.DataType.BIG_DECIMAL,
-      FieldSpec.DataType.TIMESTAMP, FieldSpec.DataType.STRING);
+      FieldSpec.DataType.TIMESTAMP, FieldSpec.DataType.STRING, FieldSpec.DataType.UNKNOWN);
 
   private static final EnumMap<FieldSpec.DataType, EnumSet<FieldSpec.DataType>> ACCEPTABLE_COMBINATIONS =
       createAcceptableCombinations();
@@ -46,7 +50,9 @@ public SelectTupleElementTransformFunction(String name) {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap,
+      boolean nullHandlingEnabled) {
+    super.init(arguments, columnContextMap, nullHandlingEnabled);
     if (arguments.isEmpty()) {
       throw new IllegalArgumentException(_name + " takes at least one argument");
     }
@@ -63,7 +69,8 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       }
       if (dataType == null) {
         dataType = argumentType;
-      } else if (ACCEPTABLE_COMBINATIONS.get(dataType).contains(argumentType)) {
+      } else if (dataType.isUnknown() || argumentType.isUnknown() || ACCEPTABLE_COMBINATIONS.get(dataType)
+          .contains(argumentType)) {
         dataType = getLowestCommonDenominatorType(dataType, argumentType);
       } else {
         throw new IllegalArgumentException(
@@ -84,6 +91,25 @@ public String getName() {
     return _name;
   }
 
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    RoaringBitmap bitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    if (bitmap == null || bitmap.isEmpty()) {
+      return bitmap;
+    }
+    for (int i = 1; i < _arguments.size(); i++) {
+      RoaringBitmap curBitmap = _arguments.get(i).getNullBitmap(valueBlock);
+      if (curBitmap == null || curBitmap.isEmpty()) {
+        return curBitmap;
+      }
+      bitmap.and(curBitmap);
+      if (bitmap.isEmpty()) {
+        return null;
+      }
+    }
+    return bitmap;
+  }
+
   private static FieldSpec.DataType getLowestCommonDenominatorType(FieldSpec.DataType left, FieldSpec.DataType right) {
     if (left == null || left == right) {
       return right;
@@ -109,4 +135,286 @@ private static EnumMap<FieldSpec.DataType, EnumSet<FieldSpec.DataType>> createAc
     combinations.put(FieldSpec.DataType.STRING, EnumSet.of(FieldSpec.DataType.STRING));
     return combinations;
   }
+
+  @Override
+  protected int[] transformToIntValuesSVUsingValue(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    int[] values = _arguments.get(0).transformToIntValuesSV(valueBlock);
+    System.arraycopy(values, 0, _intValuesSV, 0, numDocs);
+    for (int i = 1; i < _arguments.size(); i++) {
+      values = _arguments.get(i).transformToIntValuesSV(valueBlock);
+      for (int j = 0; j < numDocs & j < values.length; j++) {
+        _intValuesSV[j] = binaryFunction(_intValuesSV[j], values[j]);
+      }
+    }
+    return _intValuesSV;
+  }
+
+  @Override
+  protected int[] transformToIntValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initIntValuesSV(numDocs);
+    int[] curValues = _arguments.get(0).transformToIntValuesSV(valueBlock);
+    System.arraycopy(curValues, 0, _intValuesSV, 0, numDocs);
+    RoaringBitmap nullBitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    for (int i = 1; i < _arguments.size(); i++) {
+      curValues = _arguments.get(i).transformToIntValuesSV(valueBlock);
+      RoaringBitmap curNull = _arguments.get(i).getNullBitmap(valueBlock);
+      for (int j = 0; j < numDocs & j < curValues.length; j++) {
+        // If current value is not null, we process the data.
+        if (curNull == null || !curNull.contains(j)) {
+          // If existing maximum value is null, we set the value directly.
+          if (nullBitmap != null && nullBitmap.contains(j)) {
+            _intValuesSV[j] = curValues[j];
+          } else {
+            _intValuesSV[j] = binaryFunction(_intValuesSV[j], curValues[j]);
+          }
+        }
+      }
+      if (nullBitmap != null && curNull != null) {
+        nullBitmap.and(curNull);
+      } else {
+        nullBitmap = null;
+      }
+    }
+    return _intValuesSV;
+  }
+
+  abstract protected int binaryFunction(int a, int b);
+
+  @Override
+  protected long[] transformToLongValuesSVUsingValue(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initLongValuesSV(numDocs);
+    long[] values = _arguments.get(0).transformToLongValuesSV(valueBlock);
+    System.arraycopy(values, 0, _longValuesSV, 0, numDocs);
+    for (int i = 1; i < _arguments.size(); i++) {
+      values = _arguments.get(i).transformToLongValuesSV(valueBlock);
+      for (int j = 0; j < numDocs & j < values.length; j++) {
+        _longValuesSV[j] = binaryFunction(_longValuesSV[j], values[j]);
+      }
+    }
+    return _longValuesSV;
+  }
+
+  @Override
+  protected long[] transformToLongValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initLongValuesSV(numDocs);
+    long[] curValues = _arguments.get(0).transformToLongValuesSV(valueBlock);
+    System.arraycopy(curValues, 0, _longValuesSV, 0, numDocs);
+    RoaringBitmap nullBitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    for (int i = 1; i < _arguments.size(); i++) {
+      curValues = _arguments.get(i).transformToLongValuesSV(valueBlock);
+      RoaringBitmap curNull = _arguments.get(i).getNullBitmap(valueBlock);
+      for (int j = 0; j < numDocs & j < curValues.length; j++) {
+        // If current value is not null, we process the data.
+        if (curNull == null || !curNull.contains(j)) {
+          // If existing maximum value is null, we set the value directly.
+          if (nullBitmap != null && nullBitmap.contains(j)) {
+            _longValuesSV[j] = curValues[j];
+          } else {
+            _longValuesSV[j] = binaryFunction(_longValuesSV[j], curValues[j]);
+          }
+        }
+      }
+      if (nullBitmap != null && curNull != null) {
+        nullBitmap.and(curNull);
+      } else {
+        nullBitmap = null;
+      }
+    }
+    return _longValuesSV;
+  }
+
+  abstract protected long binaryFunction(long a, long b);
+
+  @Override
+  protected float[] transformToFloatValuesSVUsingValue(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initFloatValuesSV(numDocs);
+    float[] values = _arguments.get(0).transformToFloatValuesSV(valueBlock);
+    System.arraycopy(values, 0, _floatValuesSV, 0, numDocs);
+    for (int i = 1; i < _arguments.size(); i++) {
+      values = _arguments.get(i).transformToFloatValuesSV(valueBlock);
+      for (int j = 0; j < numDocs & j < values.length; j++) {
+        _floatValuesSV[j] = binaryFunction(_floatValuesSV[j], values[j]);
+      }
+    }
+    return _floatValuesSV;
+  }
+
+  @Override
+  protected float[] transformToFloatValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initFloatValuesSV(numDocs);
+    float[] curValues = _arguments.get(0).transformToFloatValuesSV(valueBlock);
+    System.arraycopy(curValues, 0, _floatValuesSV, 0, numDocs);
+    RoaringBitmap nullBitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    for (int i = 1; i < _arguments.size(); i++) {
+      curValues = _arguments.get(i).transformToFloatValuesSV(valueBlock);
+      RoaringBitmap curNull = _arguments.get(i).getNullBitmap(valueBlock);
+      for (int j = 0; j < numDocs & j < curValues.length; j++) {
+        // If current value is not null, we process the data.
+        if (curNull == null || !curNull.contains(j)) {
+          // If existing maximum value is null, we set the value directly.
+          if (nullBitmap != null && nullBitmap.contains(j)) {
+            _floatValuesSV[j] = curValues[j];
+          } else {
+            _floatValuesSV[j] = binaryFunction(_floatValuesSV[j], curValues[j]);
+          }
+        }
+      }
+      if (nullBitmap != null && curNull != null) {
+        nullBitmap.and(curNull);
+      } else {
+        nullBitmap = null;
+      }
+    }
+    return _floatValuesSV;
+  }
+
+  abstract protected float binaryFunction(float a, float b);
+
+  @Override
+  protected double[] transformToDoubleValuesSVUsingValue(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initDoubleValuesSV(numDocs);
+    double[] values = _arguments.get(0).transformToDoubleValuesSV(valueBlock);
+    System.arraycopy(values, 0, _doubleValuesSV, 0, numDocs);
+    for (int i = 1; i < _arguments.size(); i++) {
+      values = _arguments.get(i).transformToDoubleValuesSV(valueBlock);
+      for (int j = 0; j < numDocs & j < values.length; j++) {
+        _doubleValuesSV[j] = binaryFunction(_doubleValuesSV[j], values[j]);
+      }
+    }
+    return _doubleValuesSV;
+  }
+
+  @Override
+  protected double[] transformToDoubleValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initDoubleValuesSV(numDocs);
+    double[] curValues = _arguments.get(0).transformToDoubleValuesSV(valueBlock);
+    System.arraycopy(curValues, 0, _doubleValuesSV, 0, numDocs);
+    RoaringBitmap nullBitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    for (int i = 1; i < _arguments.size(); i++) {
+      curValues = _arguments.get(i).transformToDoubleValuesSV(valueBlock);
+      RoaringBitmap curNull = _arguments.get(i).getNullBitmap(valueBlock);
+      for (int j = 0; j < numDocs & j < curValues.length; j++) {
+        // If current value is not null, we process the data.
+        if (curNull == null || !curNull.contains(j)) {
+          // If existing maximum value is null, we set the value directly.
+          if (nullBitmap != null && nullBitmap.contains(j)) {
+            _doubleValuesSV[j] = curValues[j];
+          } else {
+            _doubleValuesSV[j] = binaryFunction(_doubleValuesSV[j], curValues[j]);
+          }
+        }
+      }
+      if (nullBitmap != null && curNull != null) {
+        nullBitmap.and(curNull);
+      } else {
+        nullBitmap = null;
+      }
+    }
+    return _doubleValuesSV;
+  }
+
+  abstract protected double binaryFunction(double a, double b);
+
+  @Override
+  protected BigDecimal[] transformToBigDecimalValuesSVUsingValue(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(numDocs);
+    BigDecimal[] values = _arguments.get(0).transformToBigDecimalValuesSV(valueBlock);
+    System.arraycopy(values, 0, _bigDecimalValuesSV, 0, numDocs);
+    for (int i = 1; i < _arguments.size(); i++) {
+      values = _arguments.get(i).transformToBigDecimalValuesSV(valueBlock);
+      for (int j = 0; j < numDocs & j < values.length; j++) {
+        _bigDecimalValuesSV[j] = binaryFunction(_bigDecimalValuesSV[j], values[j]);
+      }
+    }
+    return _bigDecimalValuesSV;
+  }
+
+  @Override
+  protected BigDecimal[] transformToBigDecimalValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(numDocs);
+    BigDecimal[] curValues = _arguments.get(0).transformToBigDecimalValuesSV(valueBlock);
+    System.arraycopy(curValues, 0, _bigDecimalValuesSV, 0, numDocs);
+    RoaringBitmap nullBitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    for (int i = 1; i < _arguments.size(); i++) {
+      curValues = _arguments.get(i).transformToBigDecimalValuesSV(valueBlock);
+      RoaringBitmap curNull = _arguments.get(i).getNullBitmap(valueBlock);
+      for (int j = 0; j < numDocs & j < curValues.length; j++) {
+        // If current value is not null, we process the data.
+        if (curNull == null || !curNull.contains(j)) {
+          // If existing maximum value is null, we set the value directly.
+          if (nullBitmap != null && nullBitmap.contains(j)) {
+            _bigDecimalValuesSV[j] = curValues[j];
+          } else {
+            _bigDecimalValuesSV[j] = binaryFunction(_bigDecimalValuesSV[j], (curValues[j]));
+          }
+        }
+      }
+      if (nullBitmap != null && curNull != null) {
+        nullBitmap.and(curNull);
+      } else {
+        nullBitmap = null;
+      }
+    }
+    return _bigDecimalValuesSV;
+  }
+
+  abstract protected BigDecimal binaryFunction(BigDecimal a, BigDecimal b);
+
+  @Override
+  protected String[] transformToStringValuesSVUsingValue(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initStringValuesSV(numDocs);
+    String[] values = _arguments.get(0).transformToStringValuesSV(valueBlock);
+    System.arraycopy(values, 0, _stringValuesSV, 0, numDocs);
+    for (int i = 1; i < _arguments.size(); i++) {
+      values = _arguments.get(i).transformToStringValuesSV(valueBlock);
+      for (int j = 0; j < numDocs & j < values.length; j++) {
+        _stringValuesSV[j] = binaryFunction(_stringValuesSV[j], (values[j]));
+      }
+    }
+    return _stringValuesSV;
+  }
+
+  @Override
+  protected String[] transformToStringValuesSVUsingValueAndNull(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
+    initStringValuesSV(numDocs);
+    String[] curValues = _arguments.get(0).transformToStringValuesSV(valueBlock);
+    System.arraycopy(curValues, 0, _stringValuesSV, 0, numDocs);
+    RoaringBitmap nullBitmap = _arguments.get(0).getNullBitmap(valueBlock);
+    for (int i = 1; i < _arguments.size(); i++) {
+      curValues = _arguments.get(i).transformToStringValuesSV(valueBlock);
+      RoaringBitmap curNull = _arguments.get(i).getNullBitmap(valueBlock);
+      for (int j = 0; j < numDocs & j < curValues.length; j++) {
+        // If current value is not null, we process the data.
+        if (curNull == null || !curNull.contains(j)) {
+          // If existing maximum value is null, we set the value directly.
+          if (nullBitmap != null && nullBitmap.contains(j)) {
+            _stringValuesSV[j] = curValues[j];
+          } else {
+            _stringValuesSV[j] = binaryFunction(_stringValuesSV[j], (curValues[j]));
+          }
+        }
+      }
+      if (nullBitmap != null && curNull != null) {
+        nullBitmap.and(curNull);
+      } else {
+        nullBitmap = null;
+      }
+    }
+    return _stringValuesSV;
+  }
+
+  abstract protected String binaryFunction(String a, String b);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunction.java
index 39c1d825809..d18c9673c9f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunction.java
@@ -23,9 +23,9 @@
 import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 
@@ -46,7 +46,8 @@ public abstract class SingleParamMathTransformFunction extends BaseTransformFunc
   private DataType _resultDataType;
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     Preconditions.checkArgument(arguments.size() == 1, "Exactly 1 argument is required for transform function: %s",
         getName());
     TransformFunction transformFunction = arguments.get(0);
@@ -70,33 +71,29 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     if (_resultDataType == DataType.BIG_DECIMAL) {
-      BigDecimal[] values = transformToBigDecimalValuesSV(projectionBlock);
+      BigDecimal[] values = transformToBigDecimalValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _doubleValuesSV, length);
     } else {
-      double[] values = _transformFunction.transformToDoubleValuesSV(projectionBlock);
-      applyMathOperator(values, projectionBlock.getNumDocs());
+      double[] values = _transformFunction.transformToDoubleValuesSV(valueBlock);
+      applyMathOperator(values, valueBlock.getNumDocs());
     }
     return _doubleValuesSV;
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     if (_resultDataType == DataType.DOUBLE) {
-      double[] values = transformToDoubleValuesSV(projectionBlock);
+      double[] values = transformToDoubleValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _bigDecimalValuesSV, length);
     } else {
-      BigDecimal[] values = _transformFunction.transformToBigDecimalValuesSV(projectionBlock);
-      applyMathOperator(values, projectionBlock.getNumDocs());
+      BigDecimal[] values = _transformFunction.transformToBigDecimalValuesSV(valueBlock);
+      applyMathOperator(values, valueBlock.getNumDocs());
     }
     return _bigDecimalValuesSV;
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunction.java
index ae039d8cfe1..e46cc115186 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunction.java
@@ -22,9 +22,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 
@@ -44,7 +44,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     // Check that there are exactly 2 arguments
     if (arguments.size() != 2) {
       throw new IllegalArgumentException("Exactly 2 arguments are required for SUB transform function");
@@ -68,9 +69,9 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       if (argument instanceof LiteralTransformFunction) {
         LiteralTransformFunction literalTransformFunction = (LiteralTransformFunction) argument;
         if (_resultDataType == DataType.BIG_DECIMAL) {
-          _bigDecimalLiterals[i] = new BigDecimal(literalTransformFunction.getLiteral());
+          _bigDecimalLiterals[i] = literalTransformFunction.getBigDecimalLiteral();
         } else {
-          _doubleLiterals[i] = Double.parseDouble(((LiteralTransformFunction) argument).getLiteral());
+          _doubleLiterals[i] = ((LiteralTransformFunction) argument).getDoubleLiteral();
         }
       } else {
         if (!argument.getResultMetadata().isSingleValue()) {
@@ -95,19 +96,17 @@ public TransformResultMetadata getResultMetadata() {
 
   @SuppressWarnings("Duplicates")
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
     if (_resultDataType == DataType.BIG_DECIMAL) {
-      BigDecimal[] values = transformToBigDecimalValuesSV(projectionBlock);
+      BigDecimal[] values = transformToBigDecimalValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _doubleValuesSV, length);
     } else {
       if (_firstTransformFunction == null) {
         Arrays.fill(_doubleValuesSV, 0, length, _doubleLiterals[0]);
       } else {
-        double[] values = _firstTransformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] values = _firstTransformFunction.transformToDoubleValuesSV(valueBlock);
         System.arraycopy(values, 0, _doubleValuesSV, 0, length);
       }
       if (_secondTransformFunction == null) {
@@ -115,7 +114,7 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
           _doubleValuesSV[i] -= _doubleLiterals[1];
         }
       } else {
-        double[] values = _secondTransformFunction.transformToDoubleValuesSV(projectionBlock);
+        double[] values = _secondTransformFunction.transformToDoubleValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _doubleValuesSV[i] -= values[i];
         }
@@ -125,19 +124,17 @@ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_bigDecimalValuesSV == null) {
-      _bigDecimalValuesSV = new BigDecimal[length];
-    }
+  public BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initBigDecimalValuesSV(length);
     if (_resultDataType == DataType.DOUBLE) {
-      double[] values = transformToDoubleValuesSV(projectionBlock);
+      double[] values = transformToDoubleValuesSV(valueBlock);
       ArrayCopyUtils.copy(values, _bigDecimalValuesSV, length);
     } else {
       if (_firstTransformFunction == null) {
         Arrays.fill(_bigDecimalValuesSV, 0, length, _bigDecimalLiterals[0]);
       } else {
-        BigDecimal[] values = _firstTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] values = _firstTransformFunction.transformToBigDecimalValuesSV(valueBlock);
         System.arraycopy(values, 0, _bigDecimalValuesSV, 0, length);
       }
       if (_secondTransformFunction == null) {
@@ -145,7 +142,7 @@ public BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBloc
           _bigDecimalValuesSV[i] = _bigDecimalValuesSV[i].subtract(_bigDecimalLiterals[1]);
         }
       } else {
-        BigDecimal[] values = _secondTransformFunction.transformToBigDecimalValuesSV(projectionBlock);
+        BigDecimal[] values = _secondTransformFunction.transformToBigDecimalValuesSV(valueBlock);
         for (int i = 0; i < length; i++) {
           _bigDecimalValuesSV[i] = _bigDecimalValuesSV[i].subtract(values[i]);
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunction.java
index d4382e409af..bac3c9bc62e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunction.java
@@ -21,11 +21,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.core.operator.transform.transformer.timeunit.TimeUnitTransformer;
 import org.apache.pinot.core.operator.transform.transformer.timeunit.TimeUnitTransformerFactory;
-import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.roaringbitmap.RoaringBitmap;
 
 
 public class TimeConversionTransformFunction extends BaseTransformFunction {
@@ -40,7 +41,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     // Check that there are exactly 3 arguments
     if (arguments.size() != 3) {
       throw new IllegalArgumentException("Exactly 3 arguments are required for TIME_CONVERT transform function");
@@ -55,8 +56,8 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     _mainTransformFunction = firstArgument;
 
     _timeUnitTransformer = TimeUnitTransformerFactory.getTimeUnitTransformer(
-        TimeUnit.valueOf(((LiteralTransformFunction) arguments.get(1)).getLiteral().toUpperCase()),
-        ((LiteralTransformFunction) arguments.get(2)).getLiteral());
+        TimeUnit.valueOf(((LiteralTransformFunction) arguments.get(1)).getStringLiteral().toUpperCase()),
+        ((LiteralTransformFunction) arguments.get(2)).getStringLiteral());
   }
 
   @Override
@@ -65,13 +66,15 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_longValuesSV == null) {
-      _longValuesSV = new long[length];
-    }
-    _timeUnitTransformer.transform(_mainTransformFunction.transformToLongValuesSV(projectionBlock), _longValuesSV,
-        length);
+  public long[] transformToLongValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initLongValuesSV(length);
+    _timeUnitTransformer.transform(_mainTransformFunction.transformToLongValuesSV(valueBlock), _longValuesSV, length);
     return _longValuesSV;
   }
+
+  @Override
+  public RoaringBitmap getNullBitmap(ValueBlock valueBlock) {
+    return _mainTransformFunction.getNullBitmap(valueBlock);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunction.java
index f3fc209db92..95ee40f7279 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunction.java
@@ -21,10 +21,12 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import javax.annotation.Nullable;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -43,10 +45,22 @@ public interface TransformFunction {
   /**
    * Initializes the transform function.
    *
-   * @param arguments Arguments for the transform function
-   * @param dataSourceMap Map from column to data source
+   * @param arguments        Arguments for the transform function
+   * @param columnContextMap Map from column name to context
    */
-  void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap);
+  void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap);
+
+  /**
+   * Initializes the transform function.
+   *
+   * @param arguments           Arguments for the transform function
+   * @param columnContextMap    Map from column name to context
+   * @param nullHandlingEnabled Whether this transform function handles {@code null}
+   */
+  default void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap,
+      boolean nullHandlingEnabled) {
+    init(arguments, columnContextMap);
+  }
 
   /**
    * Returns the metadata for the result of the transform function.
@@ -61,136 +75,100 @@ public interface TransformFunction {
 
   /**
    * Returns the dictionary for the transform result if the result is dictionary-encoded, or {@code null} if not.
-   *
-   * @return Dictionary
    */
+  @Nullable
   Dictionary getDictionary();
 
   /**
-   * Transforms the data from the given projection block to single-valued dictionary Ids.
-   *
-   * @param projectionBlock Projection block
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued dictionary ids.
    */
-  int[] transformToDictIdsSV(ProjectionBlock projectionBlock);
+  int[] transformToDictIdsSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to multi-valued dictionary Ids.
-   *
-   * @param projectionBlock Projection block
-   * @return Transformation result
+   * Transforms the data from the given value block to multi-valued dictionary ids.
    */
-  int[][] transformToDictIdsMV(ProjectionBlock projectionBlock);
+  int[][] transformToDictIdsMV(ValueBlock valueBlock);
 
   /**
    * SINGLE-VALUED APIs
    */
 
   /**
-   * Transforms the data from the given projection block to single-valued int values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued int values.
    */
-  int[] transformToIntValuesSV(ProjectionBlock projectionBlock);
+  int[] transformToIntValuesSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to single-valued long values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued long values.
    */
-  long[] transformToLongValuesSV(ProjectionBlock projectionBlock);
+  long[] transformToLongValuesSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to single-valued float values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued float values.
    */
-  float[] transformToFloatValuesSV(ProjectionBlock projectionBlock);
+  float[] transformToFloatValuesSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to single-valued double values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued double values.
    */
-  double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock);
+  double[] transformToDoubleValuesSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to single-valued BigDecimal values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued BigDecimal values.
    */
-  BigDecimal[] transformToBigDecimalValuesSV(ProjectionBlock projectionBlock);
+  BigDecimal[] transformToBigDecimalValuesSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to single-valued string values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued string values.
    */
-  String[] transformToStringValuesSV(ProjectionBlock projectionBlock);
+  String[] transformToStringValuesSV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to single-valued bytes values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to single-valued bytes values.
    */
-  byte[][] transformToBytesValuesSV(ProjectionBlock projectionBlock);
+  byte[][] transformToBytesValuesSV(ValueBlock valueBlock);
 
   /**
    * MULTI-VALUED APIs
    */
 
   /**
-   * Transforms the data from the given projection block to multi-valued int values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to multi-valued int values.
    */
-  int[][] transformToIntValuesMV(ProjectionBlock projectionBlock);
+  int[][] transformToIntValuesMV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to multi-valued long values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to multi-valued long values.
    */
-  long[][] transformToLongValuesMV(ProjectionBlock projectionBlock);
+  long[][] transformToLongValuesMV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to multi-valued float values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to multi-valued float values.
    */
-  float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock);
+  float[][] transformToFloatValuesMV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to multi-valued double values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to multi-valued double values.
    */
-  double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock);
+  double[][] transformToDoubleValuesMV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to multi-valued string values.
-   *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * Transforms the data from the given value block to multi-valued string values.
+   */
+  String[][] transformToStringValuesMV(ValueBlock valueBlock);
+
+  /**
+   * Transforms the data from the given value block to multi-valued bytes values.
    */
-  String[][] transformToStringValuesMV(ProjectionBlock projectionBlock);
+  byte[][][] transformToBytesValuesMV(ValueBlock valueBlock);
 
   /**
-   * Transforms the data from the given projection block to multi-valued bytes values.
+   * Gets the null rows for transformation result. Should be called when only null information is needed for
+   * transformation.
    *
-   * @param projectionBlock Projection result
-   * @return Transformation result
+   * @return Null bit vector that indicates null rows for transformation result
+   * If returns null, it means no record is null.
    */
-  byte[][][] transformToBytesValuesMV(ProjectionBlock projectionBlock);
+  @Nullable
+  RoaringBitmap getNullBitmap(ValueBlock block);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
index cec8847f1af..783a7a20530 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
@@ -18,19 +18,20 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.common.function.FunctionInfo;
 import org.apache.pinot.common.function.FunctionRegistry;
 import org.apache.pinot.common.function.TransformFunctionType;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.FunctionContext;
+import org.apache.pinot.common.utils.HashUtil;
 import org.apache.pinot.core.geospatial.transform.function.GeoToH3Function;
 import org.apache.pinot.core.geospatial.transform.function.StAreaFunction;
 import org.apache.pinot.core.geospatial.transform.function.StAsBinaryFunction;
@@ -46,6 +47,7 @@
 import org.apache.pinot.core.geospatial.transform.function.StPointFunction;
 import org.apache.pinot.core.geospatial.transform.function.StPolygonFunction;
 import org.apache.pinot.core.geospatial.transform.function.StWithinFunction;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.operator.transform.function.SingleParamMathTransformFunction.AbsTransformFunction;
 import org.apache.pinot.core.operator.transform.function.SingleParamMathTransformFunction.CeilTransformFunction;
 import org.apache.pinot.core.operator.transform.function.SingleParamMathTransformFunction.ExpTransformFunction;
@@ -69,8 +71,13 @@
 import org.apache.pinot.core.operator.transform.function.TrigonometricTransformFunctions.TanTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TrigonometricTransformFunctions.TanhTransformFunction;
 import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.apache.pinot.sql.parsers.CalciteSqlParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * Factory class for transformation functions.
@@ -79,6 +86,7 @@ public class TransformFunctionFactory {
   private TransformFunctionFactory() {
   }
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(TransformFunctionFactory.class);
   private static final Map<String, Class<? extends TransformFunction>> TRANSFORM_FUNCTION_MAP = createRegistry();
 
   private static Map<String, Class<? extends TransformFunction>> createRegistry() {
@@ -105,14 +113,10 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
     typeToImplementation.put(TransformFunctionType.TRUNCATE, TruncateDecimalTransformFunction.class);
 
     typeToImplementation.put(TransformFunctionType.CAST, CastTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.JSONEXTRACTSCALAR,
-        JsonExtractScalarTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.JSONEXTRACTKEY,
-        JsonExtractKeyTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.TIMECONVERT,
-        TimeConversionTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.DATETIMECONVERT,
-        DateTimeConversionTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.JSONEXTRACTSCALAR, JsonExtractScalarTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.JSONEXTRACTKEY, JsonExtractKeyTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.TIMECONVERT, TimeConversionTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.DATETIMECONVERT, DateTimeConversionTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.DATETRUNC, DateTruncTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.YEAR, DateTimeTransformFunction.Year.class);
     typeToImplementation.put(TransformFunctionType.YEAR_OF_WEEK, DateTimeTransformFunction.YearOfWeek.class);
@@ -131,16 +135,15 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
     typeToImplementation.put(TransformFunctionType.MAPVALUE, MapValueTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.INIDSET, InIdSetTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.LOOKUP, LookupTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.CLPDECODE, CLPDecodeTransformFunction.class);
 
     typeToImplementation.put(TransformFunctionType.EXTRACT, ExtractTransformFunction.class);
 
     // Regexp functions
-    typeToImplementation.put(TransformFunctionType.REGEXP_EXTRACT,
-        RegexpExtractTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.REGEXP_EXTRACT, RegexpExtractTransformFunction.class);
 
     // Array functions
-    typeToImplementation.put(TransformFunctionType.ARRAYAVERAGE,
-        ArrayAverageTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.ARRAYAVERAGE, ArrayAverageTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.ARRAYMAX, ArrayMaxTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.ARRAYMIN, ArrayMinTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.ARRAYSUM, ArraySumTransformFunction.class);
@@ -150,13 +153,10 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
 
     typeToImplementation.put(TransformFunctionType.EQUALS, EqualsTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.NOT_EQUALS, NotEqualsTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.GREATER_THAN,
-        GreaterThanTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.GREATER_THAN_OR_EQUAL,
-        GreaterThanOrEqualTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.GREATER_THAN, GreaterThanTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.GREATER_THAN_OR_EQUAL, GreaterThanOrEqualTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.LESS_THAN, LessThanTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.LESS_THAN_OR_EQUAL,
-        LessThanOrEqualTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.LESS_THAN_OR_EQUAL, LessThanOrEqualTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.IN, InTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.NOT_IN, NotInTransformFunction.class);
 
@@ -167,22 +167,17 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
 
     // geo functions
     // geo constructors
-    typeToImplementation.put(TransformFunctionType.ST_GEOG_FROM_TEXT,
-        StGeogFromTextFunction.class);
-    typeToImplementation.put(TransformFunctionType.ST_GEOG_FROM_WKB,
-        StGeogFromWKBFunction.class);
-    typeToImplementation.put(TransformFunctionType.ST_GEOM_FROM_TEXT,
-        StGeomFromTextFunction.class);
-    typeToImplementation.put(TransformFunctionType.ST_GEOM_FROM_WKB,
-        StGeomFromWKBFunction.class);
+    typeToImplementation.put(TransformFunctionType.ST_GEOG_FROM_TEXT, StGeogFromTextFunction.class);
+    typeToImplementation.put(TransformFunctionType.ST_GEOG_FROM_WKB, StGeogFromWKBFunction.class);
+    typeToImplementation.put(TransformFunctionType.ST_GEOM_FROM_TEXT, StGeomFromTextFunction.class);
+    typeToImplementation.put(TransformFunctionType.ST_GEOM_FROM_WKB, StGeomFromWKBFunction.class);
     typeToImplementation.put(TransformFunctionType.ST_POINT, StPointFunction.class);
     typeToImplementation.put(TransformFunctionType.ST_POLYGON, StPolygonFunction.class);
 
     // geo measurements
     typeToImplementation.put(TransformFunctionType.ST_AREA, StAreaFunction.class);
     typeToImplementation.put(TransformFunctionType.ST_DISTANCE, StDistanceFunction.class);
-    typeToImplementation.put(TransformFunctionType.ST_GEOMETRY_TYPE,
-        StGeometryTypeFunction.class);
+    typeToImplementation.put(TransformFunctionType.ST_GEOMETRY_TYPE, StGeometryTypeFunction.class);
 
     // geo outputs
     typeToImplementation.put(TransformFunctionType.ST_AS_BINARY, StAsBinaryFunction.class);
@@ -202,8 +197,7 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
 
     // null handling
     typeToImplementation.put(TransformFunctionType.IS_NULL, IsNullTransformFunction.class);
-    typeToImplementation.put(TransformFunctionType.IS_NOT_NULL,
-        IsNotNullTransformFunction.class);
+    typeToImplementation.put(TransformFunctionType.IS_NOT_NULL, IsNotNullTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.COALESCE, CoalesceTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.IS_DISTINCT_FROM, IsDistinctFromTransformFunction.class);
     typeToImplementation.put(TransformFunctionType.IS_NOT_DISTINCT_FROM, IsNotDistinctFromTransformFunction.class);
@@ -225,7 +219,7 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
 
     Map<String, Class<? extends TransformFunction>> registry = new HashMap<>(typeToImplementation.size());
     for (Map.Entry<TransformFunctionType, Class<? extends TransformFunction>> entry : typeToImplementation.entrySet()) {
-      for (String alias : entry.getKey().getAliases()) {
+      for (String alias : entry.getKey().getAlternativeNames()) {
         registry.put(canonicalize(alias), entry.getValue());
       }
     }
@@ -234,7 +228,7 @@ private static Map<String, Class<? extends TransformFunction>> createRegistry()
 
   /**
    * Initializes the factory with a set of transform function classes.
-   * <p>Should be called only once before calling {@link #get(ExpressionContext, Map)}.
+   * <p>Should be called only once before using the factory.
    *
    * @param transformFunctionClasses Set of transform function classes
    */
@@ -242,41 +236,30 @@ public static void init(Set<Class<TransformFunction>> transformFunctionClasses)
     for (Class<TransformFunction> transformFunctionClass : transformFunctionClasses) {
       TransformFunction transformFunction;
       try {
-        transformFunction = transformFunctionClass.newInstance();
-      } catch (InstantiationException | IllegalAccessException e) {
+        transformFunction = transformFunctionClass.getDeclaredConstructor().newInstance();
+      } catch (Exception e) {
         throw new RuntimeException(
-            "Caught exception while instantiating transform function from class: " + transformFunctionClass.toString(),
-            e);
+            "Caught exception while instantiating transform function from class: " + transformFunctionClass, e);
       }
       String transformFunctionName = canonicalize(transformFunction.getName());
-      if (TRANSFORM_FUNCTION_MAP.containsKey(transformFunctionName)) {
-        throw new IllegalArgumentException("Transform function: " + transformFunctionName + " already exists");
+      if (TRANSFORM_FUNCTION_MAP.put(transformFunctionName, transformFunctionClass) == null) {
+        LOGGER.info("Registering function: {} with class: {}", transformFunctionName, transformFunctionClass);
+      } else {
+        LOGGER.info("Replacing function: {} with class: {}", transformFunctionName, transformFunctionClass);
       }
-      TRANSFORM_FUNCTION_MAP.put(transformFunctionName, transformFunctionClass);
     }
   }
 
   /**
    * Returns an instance of transform function for the given expression.
    *
-   * @param expression Transform expression
-   * @param dataSourceMap Map from column name to column data source
-   * @return Transform function
-   */
-  public static TransformFunction get(ExpressionContext expression, Map<String, DataSource> dataSourceMap) {
-    return get(null, expression, dataSourceMap);
-  }
-
-  /**
-   * Returns an instance of transform function for the given expression.
-   *
-   * @param queryContext the query context if available
-   * @param expression Transform expression
-   * @param dataSourceMap Map from column name to column data source
+   * @param expression       Transform expression
+   * @param columnContextMap Map from column name to context
+   * @param queryContext     Query context
    * @return Transform function
    */
-  public static TransformFunction get(@Nullable QueryContext queryContext, ExpressionContext expression,
-      Map<String, DataSource> dataSourceMap) {
+  public static TransformFunction get(ExpressionContext expression, Map<String, ColumnContext> columnContextMap,
+      QueryContext queryContext) {
     switch (expression.getType()) {
       case FUNCTION:
         FunctionContext function = expression.getFunction();
@@ -289,7 +272,7 @@ public static TransformFunction get(@Nullable QueryContext queryContext, Express
         if (transformFunctionClass != null) {
           // Transform function
           try {
-            transformFunction = transformFunctionClass.newInstance();
+            transformFunction = transformFunctionClass.getDeclaredConstructor().newInstance();
           } catch (Exception e) {
             throw new RuntimeException("Caught exception while constructing transform function: " + functionName, e);
           }
@@ -309,10 +292,10 @@ public static TransformFunction get(@Nullable QueryContext queryContext, Express
 
         List<TransformFunction> transformFunctionArguments = new ArrayList<>(numArguments);
         for (ExpressionContext argument : arguments) {
-          transformFunctionArguments.add(TransformFunctionFactory.get(queryContext, argument, dataSourceMap));
+          transformFunctionArguments.add(TransformFunctionFactory.get(argument, columnContextMap, queryContext));
         }
         try {
-          transformFunction.init(transformFunctionArguments, dataSourceMap);
+          transformFunction.init(transformFunctionArguments, columnContextMap, queryContext.isNullHandlingEnabled());
         } catch (Exception e) {
           throw new BadQueryRequestException("Caught exception while initializing transform function: " + functionName,
               e);
@@ -320,16 +303,34 @@ public static TransformFunction get(@Nullable QueryContext queryContext, Express
         return transformFunction;
       case IDENTIFIER:
         String columnName = expression.getIdentifier();
-        return new IdentifierTransformFunction(columnName, dataSourceMap.get(columnName));
+        return new IdentifierTransformFunction(columnName, columnContextMap.get(columnName));
       case LITERAL:
-        return queryContext == null ? new LiteralTransformFunction(expression.getLiteral())
-            : queryContext.getOrComputeSharedValue(LiteralTransformFunction.class, expression.getLiteral(),
+        return queryContext.getOrComputeSharedValue(LiteralTransformFunction.class, expression.getLiteral(),
                 LiteralTransformFunction::new);
       default:
         throw new IllegalStateException();
     }
   }
 
+  @VisibleForTesting
+  public static TransformFunction get(ExpressionContext expression, Map<String, DataSource> dataSourceMap) {
+    Map<String, ColumnContext> columnContextMap = new HashMap<>(HashUtil.getHashMapCapacity(dataSourceMap.size()));
+    dataSourceMap.forEach((k, v) -> columnContextMap.put(k, ColumnContext.fromDataSource(v)));
+    QueryContext dummy = QueryContextConverterUtils.getQueryContext(
+        CalciteSqlParser.compileToPinotQuery("SELECT * from testTable;"));
+    return get(expression, columnContextMap, dummy);
+  }
+
+  @VisibleForTesting
+  public static TransformFunction getNullHandlingEnabled(ExpressionContext expression,
+      Map<String, DataSource> dataSourceMap) {
+    Map<String, ColumnContext> columnContextMap = new HashMap<>(HashUtil.getHashMapCapacity(dataSourceMap.size()));
+    dataSourceMap.forEach((k, v) -> columnContextMap.put(k, ColumnContext.fromDataSource(v)));
+    QueryContext dummy = QueryContextConverterUtils.getQueryContext(
+        CalciteSqlParser.compileToPinotQuery("SET enableNullHandling = true; SELECT * from testTable;"));
+    return get(expression, columnContextMap, dummy);
+  }
+
   /**
    * Converts the transform function name into its canonical form
    *
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TrigonometricTransformFunctions.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TrigonometricTransformFunctions.java
index c7febb5973f..0771d0488ff 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TrigonometricTransformFunctions.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TrigonometricTransformFunctions.java
@@ -21,9 +21,9 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 public class TrigonometricTransformFunctions {
@@ -38,7 +38,8 @@ public String getName() {
     }
 
     @Override
-    public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+    public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+      super.init(arguments, columnContextMap);
       // Check that there are more than 1 arguments
       if (arguments.size() != 2) {
         throw new IllegalArgumentException("Exactly 2 arguments are required for Atan2 transform function");
@@ -48,7 +49,9 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
       _rightTransformFunction = arguments.get(1);
       Preconditions.checkArgument(
           _leftTransformFunction.getResultMetadata().isSingleValue() || _rightTransformFunction.getResultMetadata()
-              .isSingleValue(), "Argument must be single-valued for transform function: %s", getName());
+              .isSingleValue() || _leftTransformFunction.getResultMetadata().getDataType().isUnknown()
+              || _rightTransformFunction.getResultMetadata().getDataType().isUnknown(),
+          "Argument must be single-valued for transform function: %s", getName());
     }
 
     @Override
@@ -57,19 +60,14 @@ public TransformResultMetadata getResultMetadata() {
     }
 
     @Override
-    public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-      int length = projectionBlock.getNumDocs();
-
-      if (_doubleValuesSV == null || _doubleValuesSV.length < length) {
-        _doubleValuesSV = new double[length];
-      }
-
-      double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(projectionBlock);
-      double[] rightValues = _rightTransformFunction.transformToDoubleValuesSV(projectionBlock);
+    public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+      int length = valueBlock.getNumDocs();
+      initDoubleValuesSV(length);
+      double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(valueBlock);
+      double[] rightValues = _rightTransformFunction.transformToDoubleValuesSV(valueBlock);
       for (int i = 0; i < length; i++) {
         _doubleValuesSV[i] = Math.atan2(leftValues[i], rightValues[i]);
       }
-
       return _doubleValuesSV;
     }
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunction.java
index 7815dbf9f6f..9dfb0c65157 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunction.java
@@ -23,9 +23,9 @@
 import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.spi.data.FieldSpec;
 
 
@@ -42,7 +42,8 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
+    super.init(arguments, columnContextMap);
     int numArguments = arguments.size();
     // Check that there are more than 2 arguments or no arguments
     if (numArguments < 1 || numArguments > 2) {
@@ -55,7 +56,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     if (numArguments > 1) {
       _rightTransformFunction = arguments.get(1);
       if (_rightTransformFunction instanceof LiteralTransformFunction) {
-        _scale = Integer.parseInt(((LiteralTransformFunction) _rightTransformFunction).getLiteral());
+        _scale = ((LiteralTransformFunction) _rightTransformFunction).getIntLiteral();
         _fixedScale = true;
       }
       Preconditions.checkArgument(
@@ -81,22 +82,19 @@ public TransformResultMetadata getResultMetadata() {
   }
 
   @Override
-  public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
-    if (_doubleValuesSV == null) {
-      _doubleValuesSV = new double[length];
-    }
-    double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(projectionBlock);
+  public double[] transformToDoubleValuesSV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesSV(length);
+    double[] leftValues = _leftTransformFunction.transformToDoubleValuesSV(valueBlock);
     if (_fixedScale) {
       for (int i = 0; i < length; i++) {
-        _doubleValuesSV[i] = BigDecimal.valueOf(leftValues[i])
-            .setScale(_scale, RoundingMode.DOWN).doubleValue();
+        _doubleValuesSV[i] = BigDecimal.valueOf(leftValues[i]).setScale(_scale, RoundingMode.DOWN).doubleValue();
       }
     } else if (_rightTransformFunction != null) {
-      int[] rightValues = _rightTransformFunction.transformToIntValuesSV(projectionBlock);
+      int[] rightValues = _rightTransformFunction.transformToIntValuesSV(valueBlock);
       for (int i = 0; i < length; i++) {
-        _doubleValuesSV[i] = BigDecimal.valueOf(leftValues[i])
-            .setScale(rightValues[i], RoundingMode.DOWN).doubleValue();
+        _doubleValuesSV[i] =
+            BigDecimal.valueOf(leftValues[i]).setScale(rightValues[i], RoundingMode.DOWN).doubleValue();
       }
     } else {
       for (int i = 0; i < length; i++) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ValueInTransformFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ValueInTransformFunction.java
index 616be3b8662..3c6e2f2eaa2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ValueInTransformFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ValueInTransformFunction.java
@@ -39,9 +39,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import javax.annotation.Nullable;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
@@ -54,7 +55,7 @@ public class ValueInTransformFunction extends BaseTransformFunction {
   private Dictionary _dictionary;
 
   private IntSet _dictIdSet;
-  private int[][] _dictIds;
+  private int[][] _dictIdsMV;
   private IntSet _intValueSet;
   private LongSet _longValueSet;
   private FloatSet _floatValueSet;
@@ -67,7 +68,7 @@ public String getName() {
   }
 
   @Override
-  public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+  public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
     // Check that there are more than 1 arguments
     int numArguments = arguments.size();
     if (numArguments < 2) {
@@ -87,7 +88,7 @@ public void init(List<TransformFunction> arguments, Map<String, DataSource> data
     // Collect all values for the VALUE_IN transform function
     _stringValueSet = new HashSet<>(numArguments - 1);
     for (int i = 1; i < numArguments; i++) {
-      _stringValueSet.add(((LiteralTransformFunction) arguments.get(i)).getLiteral());
+      _stringValueSet.add(((LiteralTransformFunction) arguments.get(i)).getStringLiteral());
     }
   }
 
@@ -96,14 +97,18 @@ public TransformResultMetadata getResultMetadata() {
     return _resultMetadata;
   }
 
+  @Nullable
   @Override
   public Dictionary getDictionary() {
     return _dictionary;
   }
 
   @Override
-  public int[][] transformToDictIdsMV(ProjectionBlock projectionBlock) {
-    int length = projectionBlock.getNumDocs();
+  public int[][] transformToDictIdsMV(ValueBlock valueBlock) {
+    int length = valueBlock.getNumDocs();
+    if (_dictIdsMV == null || _dictIdsMV.length < length) {
+      _dictIdsMV = new int[length][];
+    }
     if (_dictIdSet == null) {
       _dictIdSet = new IntOpenHashSet();
       assert _dictionary != null;
@@ -113,33 +118,28 @@ public int[][] transformToDictIdsMV(ProjectionBlock projectionBlock) {
           _dictIdSet.add(dictId);
         }
       }
-      if (_dictIds == null) {
-        _dictIds = new int[length][];
-      }
     }
-    int[][] unFilteredDictIds = _mainTransformFunction.transformToDictIdsMV(projectionBlock);
+    int[][] unFilteredDictIds = _mainTransformFunction.transformToDictIdsMV(valueBlock);
     for (int i = 0; i < length; i++) {
-      _dictIds[i] = filterInts(_dictIdSet, unFilteredDictIds[i]);
+      _dictIdsMV[i] = filterInts(_dictIdSet, unFilteredDictIds[i]);
     }
-    return _dictIds;
+    return _dictIdsMV;
   }
 
   @Override
-  public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
+  public int[][] transformToIntValuesMV(ValueBlock valueBlock) {
     if (_dictionary != null || _resultMetadata.getDataType().getStoredType() != DataType.INT) {
-      return super.transformToIntValuesMV(projectionBlock);
+      return super.transformToIntValuesMV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
+    initIntValuesMV(length);
     if (_intValueSet == null) {
       _intValueSet = new IntOpenHashSet();
       for (String inValue : _stringValueSet) {
         _intValueSet.add(Integer.parseInt(inValue));
       }
-      if (_intValuesMV == null) {
-        _intValuesMV = new int[length][];
-      }
     }
-    int[][] unFilteredIntValues = _mainTransformFunction.transformToIntValuesMV(projectionBlock);
+    int[][] unFilteredIntValues = _mainTransformFunction.transformToIntValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       _intValuesMV[i] = filterInts(_intValueSet, unFilteredIntValues[i]);
     }
@@ -147,21 +147,19 @@ public int[][] transformToIntValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
+  public long[][] transformToLongValuesMV(ValueBlock valueBlock) {
     if (_dictionary != null || _resultMetadata.getDataType().getStoredType() != DataType.LONG) {
-      return super.transformToLongValuesMV(projectionBlock);
+      return super.transformToLongValuesMV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
+    initLongValuesMV(length);
     if (_longValueSet == null) {
       _longValueSet = new LongOpenHashSet();
       for (String inValue : _stringValueSet) {
         _longValueSet.add(Long.parseLong(inValue));
       }
-      if (_longValuesMV == null) {
-        _longValuesMV = new long[length][];
-      }
     }
-    long[][] unFilteredLongValues = _mainTransformFunction.transformToLongValuesMV(projectionBlock);
+    long[][] unFilteredLongValues = _mainTransformFunction.transformToLongValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       _longValuesMV[i] = filterLongs(_longValueSet, unFilteredLongValues[i]);
     }
@@ -169,21 +167,19 @@ public long[][] transformToLongValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
+  public float[][] transformToFloatValuesMV(ValueBlock valueBlock) {
     if (_dictionary != null || _resultMetadata.getDataType().getStoredType() != DataType.FLOAT) {
-      return super.transformToFloatValuesMV(projectionBlock);
+      return super.transformToFloatValuesMV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
+    initFloatValuesMV(length);
     if (_floatValueSet == null) {
       _floatValueSet = new FloatOpenHashSet();
       for (String inValue : _stringValueSet) {
         _floatValueSet.add(Float.parseFloat(inValue));
       }
-      if (_floatValuesMV == null) {
-        _floatValuesMV = new float[length][];
-      }
     }
-    float[][] unFilteredFloatValues = _mainTransformFunction.transformToFloatValuesMV(projectionBlock);
+    float[][] unFilteredFloatValues = _mainTransformFunction.transformToFloatValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       _floatValuesMV[i] = filterFloats(_floatValueSet, unFilteredFloatValues[i]);
     }
@@ -191,21 +187,19 @@ public float[][] transformToFloatValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
+  public double[][] transformToDoubleValuesMV(ValueBlock valueBlock) {
     if (_dictionary != null || _resultMetadata.getDataType().getStoredType() != DataType.DOUBLE) {
-      return super.transformToDoubleValuesMV(projectionBlock);
+      return super.transformToDoubleValuesMV(valueBlock);
     }
-    int length = projectionBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
+    initDoubleValuesMV(length);
     if (_doubleValueSet == null) {
       _doubleValueSet = new DoubleOpenHashSet();
       for (String inValue : _stringValueSet) {
         _doubleValueSet.add(Double.parseDouble(inValue));
       }
-      if (_doubleValuesMV == null) {
-        _doubleValuesMV = new double[length][];
-      }
     }
-    double[][] unFilteredDoubleValues = _mainTransformFunction.transformToDoubleValuesMV(projectionBlock);
+    double[][] unFilteredDoubleValues = _mainTransformFunction.transformToDoubleValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       _doubleValuesMV[i] = filterDoubles(_doubleValueSet, unFilteredDoubleValues[i]);
     }
@@ -213,15 +207,13 @@ public double[][] transformToDoubleValuesMV(ProjectionBlock projectionBlock) {
   }
 
   @Override
-  public String[][] transformToStringValuesMV(ProjectionBlock projectionBlock) {
+  public String[][] transformToStringValuesMV(ValueBlock valueBlock) {
     if (_dictionary != null || _resultMetadata.getDataType().getStoredType() != DataType.STRING) {
-      return super.transformToStringValuesMV(projectionBlock);
-    }
-    int length = projectionBlock.getNumDocs();
-    if (_stringValuesMV == null) {
-      _stringValuesMV = new String[length][];
+      return super.transformToStringValuesMV(valueBlock);
     }
-    String[][] unFilteredStringValues = _mainTransformFunction.transformToStringValuesMV(projectionBlock);
+    int length = valueBlock.getNumDocs();
+    initStringValuesMV(length);
+    String[][] unFilteredStringValues = _mainTransformFunction.transformToStringValuesMV(valueBlock);
     for (int i = 0; i < length; i++) {
       _stringValuesMV[i] = filterStrings(_stringValueSet, unFilteredStringValues[i]);
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/AggregationPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/AggregationPlanNode.java
index 74e5951412a..ad6dda81797 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/AggregationPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/AggregationPlanNode.java
@@ -25,19 +25,19 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
 import org.apache.pinot.core.operator.filter.BaseFilterOperator;
 import org.apache.pinot.core.operator.query.AggregationOperator;
 import org.apache.pinot.core.operator.query.FastFilteredCountOperator;
 import org.apache.pinot.core.operator.query.FilteredAggregationOperator;
 import org.apache.pinot.core.operator.query.NonScanBasedAggregationOperator;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.startree.CompositePredicateEvaluator;
 import org.apache.pinot.core.startree.StarTreeUtils;
-import org.apache.pinot.core.startree.plan.StarTreeTransformPlanNode;
+import org.apache.pinot.core.startree.plan.StarTreeProjectPlanNode;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
@@ -80,18 +80,10 @@ public Operator<AggregationResultsBlock> run() {
    * Build the operator to be used for filtered aggregations
    */
   private FilteredAggregationOperator buildFilteredAggOperator() {
-    int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
-    // Build the operator chain for the main predicate
-    Pair<FilterPlanNode, BaseFilterOperator> filterOperatorPair =
-        AggregationFunctionUtils.buildFilterOperator(_indexSegment, _queryContext);
-    TransformOperator transformOperator =
-        AggregationFunctionUtils.buildTransformOperatorForFilteredAggregates(_indexSegment, _queryContext,
-            filterOperatorPair.getRight(), null);
-
-    List<Pair<AggregationFunction[], TransformOperator>> aggToTransformOpList =
-        AggregationFunctionUtils.buildFilteredAggTransformPairs(_indexSegment, _queryContext,
-            filterOperatorPair.getRight(), transformOperator, null);
-    return new FilteredAggregationOperator(_queryContext.getAggregationFunctions(), aggToTransformOpList, numTotalDocs);
+    List<Pair<AggregationFunction[], BaseProjectOperator<?>>> projectOperators =
+        AggregationFunctionUtils.buildFilteredAggregateProjectOperators(_indexSegment, _queryContext);
+    return new FilteredAggregationOperator(_queryContext.getAggregationFunctions(), projectOperators,
+        _indexSegment.getSegmentMetadata().getTotalDocs());
   }
 
   /**
@@ -139,10 +131,10 @@ public Operator<AggregationResultsBlock> buildNonFilteredAggOperator() {
           for (StarTreeV2 starTreeV2 : starTrees) {
             if (StarTreeUtils.isFitForStarTree(starTreeV2.getMetadata(), aggregationFunctionColumnPairs, null,
                 predicateEvaluatorsMap.keySet())) {
-              TransformOperator transformOperator =
-                  new StarTreeTransformPlanNode(_queryContext, starTreeV2, aggregationFunctionColumnPairs, null,
+              BaseProjectOperator<?> projectOperator =
+                  new StarTreeProjectPlanNode(_queryContext, starTreeV2, aggregationFunctionColumnPairs, null,
                       predicateEvaluatorsMap).run();
-              return new AggregationOperator(aggregationFunctions, transformOperator, numTotalDocs, true);
+              return new AggregationOperator(aggregationFunctions, projectOperator, numTotalDocs, true);
             }
           }
         }
@@ -151,10 +143,10 @@ public Operator<AggregationResultsBlock> buildNonFilteredAggOperator() {
 
     Set<ExpressionContext> expressionsToTransform =
         AggregationFunctionUtils.collectExpressionsToTransform(aggregationFunctions, null);
-    TransformOperator transformOperator =
-        new TransformPlanNode(_indexSegment, _queryContext, expressionsToTransform, DocIdSetPlanNode.MAX_DOC_PER_CALL,
+    BaseProjectOperator<?> projectOperator =
+        new ProjectPlanNode(_indexSegment, _queryContext, expressionsToTransform, DocIdSetPlanNode.MAX_DOC_PER_CALL,
             filterOperator).run();
-    return new AggregationOperator(aggregationFunctions, transformOperator, numTotalDocs, false);
+    return new AggregationOperator(aggregationFunctions, projectOperator, numTotalDocs, false);
   }
 
   /**
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/CombinePlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/CombinePlanNode.java
index 4ffe7a24a65..3b860061d11 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/CombinePlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/CombinePlanNode.java
@@ -20,12 +20,8 @@
 
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.Phaser;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.proto.Server;
 import org.apache.pinot.common.request.context.ExpressionContext;
@@ -33,16 +29,19 @@
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.combine.AggregationCombineOperator;
 import org.apache.pinot.core.operator.combine.BaseCombineOperator;
-import org.apache.pinot.core.operator.combine.CombineOperatorUtils;
 import org.apache.pinot.core.operator.combine.DistinctCombineOperator;
 import org.apache.pinot.core.operator.combine.GroupByCombineOperator;
 import org.apache.pinot.core.operator.combine.MinMaxValueBasedSelectionOrderByCombineOperator;
 import org.apache.pinot.core.operator.combine.SelectionOnlyCombineOperator;
 import org.apache.pinot.core.operator.combine.SelectionOrderByCombineOperator;
+import org.apache.pinot.core.operator.streaming.StreamingAggregationCombineOperator;
+import org.apache.pinot.core.operator.streaming.StreamingDistinctCombineOperator;
+import org.apache.pinot.core.operator.streaming.StreamingGroupByCombineOperator;
 import org.apache.pinot.core.operator.streaming.StreamingSelectionOnlyCombineOperator;
+import org.apache.pinot.core.operator.streaming.StreamingSelectionOrderByCombineOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextUtils;
-import org.apache.pinot.core.util.trace.TraceCallable;
+import org.apache.pinot.core.util.QueryMultiThreadingUtils;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
 import org.apache.pinot.spi.exception.QueryCancelledException;
 import org.apache.pinot.spi.trace.InvocationRecording;
@@ -101,109 +100,81 @@ private BaseCombineOperator getCombineOperator() {
       // Large number of plan nodes, run them in parallel
       // NOTE: Even if we get single executor thread, still run it using a separate thread so that the timeout can be
       //       honored
-
-      int maxExecutionThreads = _queryContext.getMaxExecutionThreads();
-      if (maxExecutionThreads <= 0) {
-        maxExecutionThreads = CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY;
-      }
-      int numTasks =
-          Math.min((numPlanNodes + TARGET_NUM_PLANS_PER_THREAD - 1) / TARGET_NUM_PLANS_PER_THREAD, maxExecutionThreads);
+      int numTasks = QueryMultiThreadingUtils.getNumTasks(numPlanNodes, TARGET_NUM_PLANS_PER_THREAD,
+          _queryContext.getMaxExecutionThreads());
       recording.setNumTasks(numTasks);
-
-      // Use a Phaser to ensure all the Futures are done (not scheduled, finished or interrupted) before the main thread
-      // returns. We need to ensure no execution left before the main thread returning because the main thread holds the
-      // reference to the segments, and if the segments are deleted/refreshed, the segments can be released after the
-      // main thread returns, which would lead to undefined behavior (even JVM crash) when executing queries against
-      // them.
-      Phaser phaser = new Phaser(1);
-
-      // Submit all jobs
-      Future[] futures = new Future[numTasks];
-      for (int i = 0; i < numTasks; i++) {
-        int index = i;
-        futures[i] = _executorService.submit(new TraceCallable<List<Operator>>() {
-          @Override
-          public List<Operator> callJob() {
-            try {
-              // Register the thread to the phaser.
-              // If the phaser is terminated (returning negative value) when trying to register the thread, that means
-              // the query execution has timed out, and the main thread has deregistered itself and returned the result.
-              // Directly return as no execution result will be taken.
-              if (phaser.register() < 0) {
-                return Collections.emptyList();
-              }
-
-              List<Operator> operators = new ArrayList<>();
-              for (int i = index; i < numPlanNodes; i += numTasks) {
-                operators.add(_planNodes.get(i).run());
-              }
-              return operators;
-            } finally {
-              phaser.arriveAndDeregister();
-            }
-          }
-        });
-      }
-
-      // Get all results
-      try {
-        for (Future future : futures) {
-          List<Operator> ops = (List<Operator>) future.get(_queryContext.getEndTimeMs() - System.currentTimeMillis(),
-              TimeUnit.MILLISECONDS);
-          operators.addAll(ops);
+      QueryMultiThreadingUtils.runTasksWithDeadline(numTasks, index -> {
+        List<Operator> ops = new ArrayList<>();
+        for (int i = index; i < numPlanNodes; i += numTasks) {
+          ops.add(_planNodes.get(i).run());
+        }
+        return ops;
+      }, taskRes -> {
+        if (taskRes != null) {
+          operators.addAll(taskRes);
         }
-      } catch (Exception e) {
+      }, e -> {
         // Future object will throw ExecutionException for execution exception, need to check the cause to determine
         // whether it is caused by bad query
         Throwable cause = e.getCause();
         if (cause instanceof BadQueryRequestException) {
           throw (BadQueryRequestException) cause;
-        } else if (e instanceof InterruptedException) {
-          throw new QueryCancelledException("Cancelled while running CombinePlanNode", e);
-        } else {
-          throw new RuntimeException("Caught exception while running CombinePlanNode.", e);
         }
-      } finally {
-        // Cancel all ongoing jobs
-        for (Future future : futures) {
-          if (!future.isDone()) {
-            future.cancel(true);
-          }
+        if (e instanceof InterruptedException) {
+          throw new QueryCancelledException("Cancelled while running CombinePlanNode", e);
         }
-        // Deregister the main thread and wait for all threads done
-        phaser.awaitAdvance(phaser.arriveAndDeregister());
-      }
+        throw new RuntimeException("Caught exception while running CombinePlanNode.", e);
+      }, _executorService, _queryContext.getEndTimeMs());
     }
 
-    if (_streamObserver != null && QueryContextUtils.isSelectionOnlyQuery(_queryContext)) {
-      // Streaming query (only support selection only)
-      return new StreamingSelectionOnlyCombineOperator(operators, _queryContext, _executorService, _streamObserver);
-    }
-    if (QueryContextUtils.isAggregationQuery(_queryContext)) {
-      if (_queryContext.getGroupByExpressions() == null) {
-        // Aggregation only
-        return new AggregationCombineOperator(operators, _queryContext, _executorService);
+    if (_streamObserver != null) {
+      if (QueryContextUtils.isAggregationQuery(_queryContext)) {
+        if (_queryContext.getGroupByExpressions() == null) {
+          // Aggregation only
+          return new StreamingAggregationCombineOperator(operators, _queryContext, _executorService);
+        } else {
+          // Aggregation group-by
+          return new StreamingGroupByCombineOperator(operators, _queryContext, _executorService);
+        }
+      } else if (QueryContextUtils.isSelectionQuery(_queryContext)) {
+        if (_queryContext.getLimit() == 0 || _queryContext.getOrderByExpressions() == null) {
+          // Streaming query (special handling to support selection only)
+          return new StreamingSelectionOnlyCombineOperator(operators, _queryContext, _executorService);
+        } else {
+          // Selection order-by
+          return new StreamingSelectionOrderByCombineOperator(operators, _queryContext, _executorService);
+        }
       } else {
-        // Aggregation group-by
-        return new GroupByCombineOperator(operators, _queryContext, _executorService);
+        assert QueryContextUtils.isDistinctQuery(_queryContext);
+        return new StreamingDistinctCombineOperator(operators, _queryContext, _executorService);
       }
-    } else if (QueryContextUtils.isSelectionQuery(_queryContext)) {
-      if (_queryContext.getLimit() == 0 || _queryContext.getOrderByExpressions() == null) {
-        // Selection only
-        return new SelectionOnlyCombineOperator(operators, _queryContext, _executorService);
-      } else {
-        // Selection order-by
-        List<OrderByExpressionContext> orderByExpressions = _queryContext.getOrderByExpressions();
-        assert orderByExpressions != null;
-        if (orderByExpressions.get(0).getExpression().getType() == ExpressionContext.Type.IDENTIFIER) {
-          return new MinMaxValueBasedSelectionOrderByCombineOperator(operators, _queryContext, _executorService);
+    } else {
+      if (QueryContextUtils.isAggregationQuery(_queryContext)) {
+        if (_queryContext.getGroupByExpressions() == null) {
+          // Aggregation only
+          return new AggregationCombineOperator(operators, _queryContext, _executorService);
+        } else {
+          // Aggregation group-by
+          return new GroupByCombineOperator(operators, _queryContext, _executorService);
+        }
+      } else if (QueryContextUtils.isSelectionQuery(_queryContext)) {
+        if (_queryContext.getLimit() == 0 || _queryContext.getOrderByExpressions() == null) {
+          // Selection only
+          return new SelectionOnlyCombineOperator(operators, _queryContext, _executorService);
         } else {
-          return new SelectionOrderByCombineOperator(operators, _queryContext, _executorService);
+          // Selection order-by
+          List<OrderByExpressionContext> orderByExpressions = _queryContext.getOrderByExpressions();
+          assert orderByExpressions != null;
+          if (orderByExpressions.get(0).getExpression().getType() == ExpressionContext.Type.IDENTIFIER) {
+            return new MinMaxValueBasedSelectionOrderByCombineOperator(operators, _queryContext, _executorService);
+          } else {
+            return new SelectionOrderByCombineOperator(operators, _queryContext, _executorService);
+          }
         }
+      } else {
+        assert QueryContextUtils.isDistinctQuery(_queryContext);
+        return new DistinctCombineOperator(operators, _queryContext, _executorService);
       }
-    } else {
-      assert QueryContextUtils.isDistinctQuery(_queryContext);
-      return new DistinctCombineOperator(operators, _queryContext, _executorService);
     }
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/DistinctPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/DistinctPlanNode.java
index fe68ce88e18..be8b92e833b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/DistinctPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/DistinctPlanNode.java
@@ -21,24 +21,19 @@
 import java.util.List;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
 import org.apache.pinot.core.operator.query.DictionaryBasedDistinctOperator;
 import org.apache.pinot.core.operator.query.DistinctOperator;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
-import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
 
 
 /**
  * Execution plan for distinct queries on a single segment.
  */
-@SuppressWarnings("rawtypes")
 public class DistinctPlanNode implements PlanNode {
   private final IndexSegment _indexSegment;
   private final QueryContext _queryContext;
@@ -50,20 +45,17 @@ public DistinctPlanNode(IndexSegment indexSegment, QueryContext queryContext) {
 
   @Override
   public Operator<DistinctResultsBlock> run() {
-    AggregationFunction[] aggregationFunctions = _queryContext.getAggregationFunctions();
-    assert aggregationFunctions != null && aggregationFunctions.length == 1
-        && aggregationFunctions[0] instanceof DistinctAggregationFunction;
-    DistinctAggregationFunction distinctAggregationFunction = (DistinctAggregationFunction) aggregationFunctions[0];
-    List<ExpressionContext> expressions = distinctAggregationFunction.getInputExpressions();
+    List<ExpressionContext> expressions = _queryContext.getSelectExpressions();
 
     // Use dictionary to solve the query if possible
-    if (_queryContext.getFilter() == null && !_queryContext.isNullHandlingEnabled() && expressions.size() == 1) {
-      ExpressionContext expression = expressions.get(0);
-      if (expression.getType() == ExpressionContext.Type.IDENTIFIER) {
-        DataSource dataSource = _indexSegment.getDataSource(expression.getIdentifier());
-        Dictionary dictionary = dataSource.getDictionary();
-        if (dictionary != null) {
-          DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
+    if (_queryContext.getFilter() == null && expressions.size() == 1) {
+      String column = expressions.get(0).getIdentifier();
+      if (column != null) {
+        DataSource dataSource = _indexSegment.getDataSource(column);
+        if (dataSource.getDictionary() != null) {
+          if (!_queryContext.isNullHandlingEnabled()) {
+            return new DictionaryBasedDistinctOperator(dataSource, _queryContext);
+          }
           // If nullHandlingEnabled is set to true, and the column contains null values, call DistinctOperator instead
           // of DictionaryBasedDistinctOperator since nullValueVectorReader is a form of a filter.
           // TODO: reserve special value in dictionary (e.g. -1) for null in the future so
@@ -71,15 +63,14 @@ public Operator<DistinctResultsBlock> run() {
           //  dictionary-encoded columns.
           NullValueVectorReader nullValueReader = dataSource.getNullValueVector();
           if (nullValueReader == null || nullValueReader.getNullBitmap().isEmpty()) {
-            return new DictionaryBasedDistinctOperator(dataSourceMetadata.getDataType(), distinctAggregationFunction,
-                dictionary, dataSourceMetadata.getNumDocs(), _queryContext.isNullHandlingEnabled());
+            return new DictionaryBasedDistinctOperator(dataSource, _queryContext);
           }
         }
       }
     }
 
-    TransformOperator transformOperator =
-        new TransformPlanNode(_indexSegment, _queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL).run();
-    return new DistinctOperator(_indexSegment, distinctAggregationFunction, transformOperator, _queryContext);
+    BaseProjectOperator<?> projectOperator =
+        new ProjectPlanNode(_indexSegment, _queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL).run();
+    return new DistinctOperator(_indexSegment, projectOperator, _queryContext);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/FilterPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/FilterPlanNode.java
index 97a6a420dea..82c9d51a1ea 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/FilterPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/FilterPlanNode.java
@@ -81,24 +81,33 @@ public FilterPlanNode(IndexSegment indexSegment, QueryContext queryContext, @Nul
 
   @Override
   public BaseFilterOperator run() {
-    // NOTE: Snapshot the validDocIds before reading the numDocs to prevent the latest updates getting lost
-    ThreadSafeMutableRoaringBitmap validDocIds = _indexSegment.getValidDocIds();
-    MutableRoaringBitmap validDocIdsSnapshot =
-        validDocIds != null && !_queryContext.isSkipUpsert() ? validDocIds.getMutableRoaringBitmap() : null;
+    // NOTE: Snapshot the queryableDocIds before reading the numDocs to prevent the latest updates getting lost
+    MutableRoaringBitmap queryableDocIdSnapshot = null;
+    if (!_queryContext.isSkipUpsert()) {
+      ThreadSafeMutableRoaringBitmap queryableDocIds = _indexSegment.getQueryableDocIds();
+      if (queryableDocIds != null) {
+        queryableDocIdSnapshot = queryableDocIds.getMutableRoaringBitmap();
+      } else {
+        ThreadSafeMutableRoaringBitmap validDocIds = _indexSegment.getValidDocIds();
+        if (validDocIds != null) {
+          queryableDocIdSnapshot = validDocIds.getMutableRoaringBitmap();
+        }
+      }
+    }
     int numDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
 
     FilterContext filter = _filter != null ? _filter : _queryContext.getFilter();
     if (filter != null) {
       BaseFilterOperator filterOperator = constructPhysicalOperator(filter, numDocs);
-      if (validDocIdsSnapshot != null) {
-        BaseFilterOperator validDocFilter = new BitmapBasedFilterOperator(validDocIdsSnapshot, false, numDocs);
+      if (queryableDocIdSnapshot != null) {
+        BaseFilterOperator validDocFilter = new BitmapBasedFilterOperator(queryableDocIdSnapshot, false, numDocs);
         return FilterOperatorUtils.getAndFilterOperator(_queryContext, Arrays.asList(filterOperator, validDocFilter),
             numDocs);
       } else {
         return filterOperator;
       }
-    } else if (validDocIdsSnapshot != null) {
-      return new BitmapBasedFilterOperator(validDocIdsSnapshot, false, numDocs);
+    } else if (queryableDocIdSnapshot != null) {
+      return new BitmapBasedFilterOperator(queryableDocIdSnapshot, false, numDocs);
     } else {
       return new MatchAllFilterOperator(numDocs);
     }
@@ -228,13 +237,13 @@ private BaseFilterOperator constructPhysicalOperator(FilterContext filter, int n
         ExpressionContext lhs = predicate.getLhs();
         if (lhs.getType() == ExpressionContext.Type.FUNCTION) {
           if (canApplyH3IndexForDistanceCheck(predicate, lhs.getFunction())) {
-            return new H3IndexFilterOperator(_indexSegment, predicate, numDocs);
+            return new H3IndexFilterOperator(_indexSegment, _queryContext, predicate, numDocs);
           } else if (canApplyH3IndexForInclusionCheck(predicate, lhs.getFunction())) {
-            return new H3InclusionIndexFilterOperator(_indexSegment, predicate, _queryContext, numDocs);
+            return new H3InclusionIndexFilterOperator(_indexSegment, _queryContext, predicate, numDocs);
           } else {
             // TODO: ExpressionFilterOperator does not support predicate types without PredicateEvaluator (IS_NULL,
             //       IS_NOT_NULL, TEXT_MATCH)
-            return new ExpressionFilterOperator(_indexSegment, predicate, numDocs);
+            return new ExpressionFilterOperator(_indexSegment, _queryContext, predicate, numDocs);
           }
         } else {
           String column = lhs.getIdentifier();
@@ -250,9 +259,8 @@ private BaseFilterOperator constructPhysicalOperator(FilterContext filter, int n
               return new TextContainsFilterOperator(textIndexReader, (TextContainsPredicate) predicate, numDocs);
             case TEXT_MATCH:
               textIndexReader = dataSource.getTextIndex();
-              Preconditions
-                  .checkState(textIndexReader != null, "Cannot apply TEXT_MATCH on column: %s without text index",
-                      column);
+              Preconditions.checkState(textIndexReader != null,
+                  "Cannot apply TEXT_MATCH on column: %s without text index", column);
               // We could check for real time and segment Lucene reader, but easier to check the other way round
               if (textIndexReader instanceof NativeTextIndexReader
                   || textIndexReader instanceof NativeMutableTextIndex) {
@@ -301,8 +309,7 @@ private BaseFilterOperator constructPhysicalOperator(FilterContext filter, int n
               }
             default:
               predicateEvaluator =
-                  PredicateEvaluatorProvider.getPredicateEvaluator(predicate, dataSource.getDictionary(),
-                      dataSource.getDataSourceMetadata().getDataType());
+                  PredicateEvaluatorProvider.getPredicateEvaluator(predicate, dataSource, _queryContext);
               _predicateEvaluators.add(Pair.of(predicate, predicateEvaluator));
               return FilterOperatorUtils.getLeafFilterOperator(predicateEvaluator, dataSource, numDocs,
                   _queryContext.isNullHandlingEnabled());
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/GroupByPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/GroupByPlanNode.java
index ccb51143e60..75069c98778 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/GroupByPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/GroupByPlanNode.java
@@ -24,17 +24,17 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
 import org.apache.pinot.core.operator.filter.BaseFilterOperator;
 import org.apache.pinot.core.operator.query.FilteredGroupByOperator;
 import org.apache.pinot.core.operator.query.GroupByOperator;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.startree.CompositePredicateEvaluator;
 import org.apache.pinot.core.startree.StarTreeUtils;
-import org.apache.pinot.core.startree.plan.StarTreeTransformPlanNode;
+import org.apache.pinot.core.startree.plan.StarTreeProjectPlanNode;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
@@ -55,37 +55,23 @@ public GroupByPlanNode(IndexSegment indexSegment, QueryContext queryContext) {
 
   @Override
   public Operator<GroupByResultsBlock> run() {
-    assert _queryContext.getAggregationFunctions() != null;
-    assert _queryContext.getGroupByExpressions() != null;
-
-    if (_queryContext.hasFilteredAggregations()) {
-      return buildFilteredGroupByPlan();
-    }
-    return buildNonFilteredGroupByPlan();
+    assert _queryContext.getAggregationFunctions() != null && _queryContext.getGroupByExpressions() != null;
+    return _queryContext.hasFilteredAggregations() ? buildFilteredGroupByPlan() : buildNonFilteredGroupByPlan();
   }
 
   private FilteredGroupByOperator buildFilteredGroupByPlan() {
-    int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
-    // Build the operator chain for the main predicate so the filter plan can be run only one time
-    Pair<FilterPlanNode, BaseFilterOperator> filterOperatorPair =
-        AggregationFunctionUtils.buildFilterOperator(_indexSegment, _queryContext);
-    ExpressionContext[] groupByExpressions = _queryContext.getGroupByExpressions().toArray(new ExpressionContext[0]);
-    TransformOperator transformOperator =
-        AggregationFunctionUtils.buildTransformOperatorForFilteredAggregates(_indexSegment, _queryContext,
-            filterOperatorPair.getRight(), groupByExpressions);
-
-    List<Pair<AggregationFunction[], TransformOperator>> aggToTransformOpList =
-        AggregationFunctionUtils.buildFilteredAggTransformPairs(_indexSegment, _queryContext,
-            filterOperatorPair.getRight(), transformOperator, groupByExpressions);
-    return new FilteredGroupByOperator(_queryContext.getAggregationFunctions(),
-        _queryContext.getFilteredAggregationFunctions(), aggToTransformOpList,
-        _queryContext.getGroupByExpressions().toArray(new ExpressionContext[0]), numTotalDocs, _queryContext);
+    List<Pair<AggregationFunction[], BaseProjectOperator<?>>> projectOperators =
+        AggregationFunctionUtils.buildFilteredAggregateProjectOperators(_indexSegment, _queryContext);
+    return new FilteredGroupByOperator(_queryContext, projectOperators,
+        _indexSegment.getSegmentMetadata().getTotalDocs());
   }
 
   private GroupByOperator buildNonFilteredGroupByPlan() {
     int numTotalDocs = _indexSegment.getSegmentMetadata().getTotalDocs();
     AggregationFunction[] aggregationFunctions = _queryContext.getAggregationFunctions();
-    ExpressionContext[] groupByExpressions = _queryContext.getGroupByExpressions().toArray(new ExpressionContext[0]);
+    List<ExpressionContext> groupByExpressionsList = _queryContext.getGroupByExpressions();
+    assert aggregationFunctions != null && groupByExpressionsList != null;
+    ExpressionContext[] groupByExpressions = groupByExpressionsList.toArray(new ExpressionContext[0]);
 
     FilterPlanNode filterPlanNode = new FilterPlanNode(_indexSegment, _queryContext);
     BaseFilterOperator filterOperator = filterPlanNode.run();
@@ -103,10 +89,10 @@ private GroupByOperator buildNonFilteredGroupByPlan() {
           for (StarTreeV2 starTreeV2 : starTrees) {
             if (StarTreeUtils.isFitForStarTree(starTreeV2.getMetadata(), aggregationFunctionColumnPairs,
                 groupByExpressions, predicateEvaluatorsMap.keySet())) {
-              TransformOperator transformOperator =
-                  new StarTreeTransformPlanNode(_queryContext, starTreeV2, aggregationFunctionColumnPairs,
+              BaseProjectOperator<?> projectOperator =
+                  new StarTreeProjectPlanNode(_queryContext, starTreeV2, aggregationFunctionColumnPairs,
                       groupByExpressions, predicateEvaluatorsMap).run();
-              return new GroupByOperator(aggregationFunctions, groupByExpressions, transformOperator, numTotalDocs,
+              return new GroupByOperator(aggregationFunctions, groupByExpressions, projectOperator, numTotalDocs,
                   _queryContext, true);
             }
           }
@@ -115,11 +101,11 @@ private GroupByOperator buildNonFilteredGroupByPlan() {
     }
 
     Set<ExpressionContext> expressionsToTransform =
-        AggregationFunctionUtils.collectExpressionsToTransform(aggregationFunctions, groupByExpressions);
-    TransformOperator transformPlanNode =
-        new TransformPlanNode(_indexSegment, _queryContext, expressionsToTransform, DocIdSetPlanNode.MAX_DOC_PER_CALL,
+        AggregationFunctionUtils.collectExpressionsToTransform(aggregationFunctions, groupByExpressionsList);
+    BaseProjectOperator<?> projectOperator =
+        new ProjectPlanNode(_indexSegment, _queryContext, expressionsToTransform, DocIdSetPlanNode.MAX_DOC_PER_CALL,
             filterOperator).run();
-    return new GroupByOperator(aggregationFunctions, groupByExpressions, transformPlanNode, numTotalDocs, _queryContext,
+    return new GroupByOperator(aggregationFunctions, groupByExpressions, projectOperator, numTotalDocs, _queryContext,
         false);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/TransformPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/ProjectPlanNode.java
similarity index 63%
rename from pinot-core/src/main/java/org/apache/pinot/core/plan/TransformPlanNode.java
rename to pinot-core/src/main/java/org/apache/pinot/core/plan/ProjectPlanNode.java
index 592fc9246fd..aaf33ae6c6b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/TransformPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/ProjectPlanNode.java
@@ -19,34 +19,34 @@
 package org.apache.pinot.core.plan;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.DocIdSetOperator;
 import org.apache.pinot.core.operator.ProjectionOperator;
 import org.apache.pinot.core.operator.filter.BaseFilterOperator;
-import org.apache.pinot.core.operator.transform.PassThroughTransformOperator;
 import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.datasource.DataSource;
 
 
 /**
- * The <code>TransformPlanNode</code> class provides the execution plan for transforms on a single segment.
+ * The <code>ProjectPlanNode</code> provides the execution plan for fetching column values on a single segment.
  */
-public class TransformPlanNode implements PlanNode {
+public class ProjectPlanNode implements PlanNode {
   private final IndexSegment _indexSegment;
   private final QueryContext _queryContext;
   private final Collection<ExpressionContext> _expressions;
   private final int _maxDocsPerCall;
   private final BaseFilterOperator _filterOperator;
 
-  public TransformPlanNode(IndexSegment indexSegment, QueryContext queryContext,
-      Collection<ExpressionContext> expressions, int maxDocsPerCall) {
-    this(indexSegment, queryContext, expressions, maxDocsPerCall, null);
-  }
-
-  public TransformPlanNode(IndexSegment indexSegment, QueryContext queryContext,
+  public ProjectPlanNode(IndexSegment indexSegment, QueryContext queryContext,
       Collection<ExpressionContext> expressions, int maxDocsPerCall, @Nullable BaseFilterOperator filterOperator) {
     _indexSegment = indexSegment;
     _queryContext = queryContext;
@@ -55,8 +55,13 @@ public TransformPlanNode(IndexSegment indexSegment, QueryContext queryContext,
     _filterOperator = filterOperator;
   }
 
+  public ProjectPlanNode(IndexSegment indexSegment, QueryContext queryContext,
+      Collection<ExpressionContext> expressions, int maxDocsPerCall) {
+    this(indexSegment, queryContext, expressions, maxDocsPerCall, null);
+  }
+
   @Override
-  public TransformOperator run() {
+  public BaseProjectOperator<?> run() {
     Set<String> projectionColumns = new HashSet<>();
     boolean hasNonIdentifierExpression = false;
     for (ExpressionContext expression : _expressions) {
@@ -65,12 +70,14 @@ public TransformOperator run() {
         hasNonIdentifierExpression = true;
       }
     }
-    ProjectionOperator projectionOperator =
-        new ProjectionPlanNode(_indexSegment, _queryContext, projectionColumns, _maxDocsPerCall, _filterOperator).run();
-    if (hasNonIdentifierExpression) {
-      return new TransformOperator(_queryContext, projectionOperator, _expressions);
-    } else {
-      return new PassThroughTransformOperator(projectionOperator, _expressions);
-    }
+    Map<String, DataSource> dataSourceMap = new HashMap<>(HashUtil.getHashMapCapacity(projectionColumns.size()));
+    projectionColumns.forEach(column -> dataSourceMap.put(column, _indexSegment.getDataSource(column)));
+    // NOTE: Skip creating DocIdSetOperator when maxDocsPerCall is 0 (for selection query with LIMIT 0)
+    DocIdSetOperator docIdSetOperator =
+        _maxDocsPerCall > 0 ? new DocIdSetPlanNode(_indexSegment, _queryContext, _maxDocsPerCall, _filterOperator).run()
+            : null;
+    ProjectionOperator projectionOperator = new ProjectionOperator(dataSourceMap, docIdSetOperator);
+    return hasNonIdentifierExpression ? new TransformOperator(_queryContext, projectionOperator, _expressions)
+        : projectionOperator;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/ProjectionPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/ProjectionPlanNode.java
deleted file mode 100644
index 5f286b40128..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/ProjectionPlanNode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.plan;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nullable;
-import org.apache.pinot.core.operator.DocIdSetOperator;
-import org.apache.pinot.core.operator.ProjectionOperator;
-import org.apache.pinot.core.operator.filter.BaseFilterOperator;
-import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-
-
-/**
- * The <code>ProjectionPlanNode</code> class provides the execution plan for fetching projection columns' data source
- * on a single segment.
- */
-public class ProjectionPlanNode implements PlanNode {
-  private final IndexSegment _indexSegment;
-  private final QueryContext _queryContext;
-  private final Set<String> _projectionColumns;
-  private final int _maxDocsPerCall;
-  private final BaseFilterOperator _filterOperator;
-
-  public ProjectionPlanNode(IndexSegment indexSegment, QueryContext queryContext, Set<String> projectionColumns,
-      int maxDocsPerCall, @Nullable BaseFilterOperator filterOperator) {
-    _indexSegment = indexSegment;
-    _queryContext = queryContext;
-    _projectionColumns = projectionColumns;
-    _maxDocsPerCall = maxDocsPerCall;
-    _filterOperator = filterOperator;
-  }
-
-  @Override
-  public ProjectionOperator run() {
-    Map<String, DataSource> dataSourceMap = new HashMap<>(_projectionColumns.size());
-    for (String column : _projectionColumns) {
-      dataSourceMap.put(column, _indexSegment.getDataSource(column));
-    }
-    // NOTE: Skip creating DocIdSetOperator when maxDocsPerCall is 0 (for selection query with LIMIT 0)
-    DocIdSetOperator docIdSetOperator =
-        _maxDocsPerCall > 0 ? new DocIdSetPlanNode(_indexSegment, _queryContext, _maxDocsPerCall, _filterOperator).run()
-            : null;
-    return new ProjectionOperator(dataSourceMap, docIdSetOperator);
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/SelectionPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/SelectionPlanNode.java
index cd598a7309b..eeccc498965 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/SelectionPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/SelectionPlanNode.java
@@ -25,13 +25,13 @@
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
 import org.apache.pinot.common.utils.config.QueryOptionsUtils;
 import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
 import org.apache.pinot.core.operator.query.EmptySelectionOperator;
 import org.apache.pinot.core.operator.query.SelectionOnlyOperator;
 import org.apache.pinot.core.operator.query.SelectionOrderByOperator;
 import org.apache.pinot.core.operator.query.SelectionPartiallyOrderedByAscOperator;
 import org.apache.pinot.core.operator.query.SelectionPartiallyOrderedByDescOperation;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.segment.spi.IndexSegment;
@@ -58,8 +58,8 @@ public Operator<SelectionResultsBlock> run() {
 
     if (limit == 0) {
       // Empty selection (LIMIT 0)
-      TransformOperator transformOperator = new TransformPlanNode(_indexSegment, _queryContext, expressions, 0).run();
-      return new EmptySelectionOperator(_indexSegment, expressions, transformOperator);
+      BaseProjectOperator<?> projectOperator = new ProjectPlanNode(_indexSegment, _queryContext, expressions, 0).run();
+      return new EmptySelectionOperator(_indexSegment, expressions, projectOperator);
     }
 
     List<OrderByExpressionContext> orderByExpressions = _queryContext.getOrderByExpressions();
@@ -67,10 +67,9 @@ public Operator<SelectionResultsBlock> run() {
       // Selection only
       // ie: SELECT ... FROM Table WHERE ... LIMIT 10
       int maxDocsPerCall = Math.min(limit, DocIdSetPlanNode.MAX_DOC_PER_CALL);
-      TransformPlanNode planNode = new TransformPlanNode(_indexSegment, _queryContext, expressions, maxDocsPerCall);
-      TransformOperator transformOperator = planNode.run();
-
-      return new SelectionOnlyOperator(_indexSegment, _queryContext, expressions, transformOperator);
+      BaseProjectOperator<?> projectOperator =
+          new ProjectPlanNode(_indexSegment, _queryContext, expressions, maxDocsPerCall).run();
+      return new SelectionOnlyOperator(_indexSegment, _queryContext, expressions, projectOperator);
     }
     int numOrderByExpressions = orderByExpressions.size();
     // Although it is a break of abstraction, some code, specially merging, assumes that if there is an order by
@@ -87,23 +86,23 @@ public Operator<SelectionResultsBlock> run() {
         if (sortedColumnsPrefixSize == orderByExpressions.size()) {
           maxDocsPerCall = Math.min(limit + _queryContext.getOffset(), DocIdSetPlanNode.MAX_DOC_PER_CALL);
         }
-        TransformPlanNode planNode = new TransformPlanNode(_indexSegment, _queryContext, expressions, maxDocsPerCall);
-        TransformOperator transformOperator = planNode.run();
-        return new SelectionPartiallyOrderedByAscOperator(_indexSegment, _queryContext, expressions, transformOperator,
+        BaseProjectOperator<?> projectOperator =
+            new ProjectPlanNode(_indexSegment, _queryContext, expressions, maxDocsPerCall).run();
+        return new SelectionPartiallyOrderedByAscOperator(_indexSegment, _queryContext, expressions, projectOperator,
             sortedColumnsPrefixSize);
       } else {
-        TransformPlanNode planNode = new TransformPlanNode(_indexSegment, _queryContext, expressions, maxDocsPerCall);
-        TransformOperator transformOperator = planNode.run();
-        return new SelectionPartiallyOrderedByDescOperation(_indexSegment, _queryContext, expressions,
-            transformOperator, sortedColumnsPrefixSize);
+        BaseProjectOperator<?> projectOperator =
+            new ProjectPlanNode(_indexSegment, _queryContext, expressions, maxDocsPerCall).run();
+        return new SelectionPartiallyOrderedByDescOperation(_indexSegment, _queryContext, expressions, projectOperator,
+            sortedColumnsPrefixSize);
       }
     }
     if (numOrderByExpressions == expressions.size()) {
       // All output expressions are ordered
       // ie: SELECT not_sorted1, not_sorted2 FROM Table WHERE ... ORDER BY not_sorted1, not_sorted2 LIMIT 10 OFFSET 5
-      TransformOperator transformOperator =
-          new TransformPlanNode(_indexSegment, _queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL).run();
-      return new SelectionOrderByOperator(_indexSegment, _queryContext, expressions, transformOperator);
+      BaseProjectOperator<?> projectOperator =
+          new ProjectPlanNode(_indexSegment, _queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL).run();
+      return new SelectionOrderByOperator(_indexSegment, _queryContext, expressions, projectOperator);
     }
     // Not all output expressions are ordered, only fetch the order-by expressions and docId to avoid the
     // unnecessary data fetch
@@ -112,9 +111,9 @@ public Operator<SelectionResultsBlock> run() {
     for (OrderByExpressionContext orderByExpression : orderByExpressions) {
       expressionsToTransform.add(orderByExpression.getExpression());
     }
-    TransformOperator transformOperator = new TransformPlanNode(_indexSegment, _queryContext, expressionsToTransform,
+    BaseProjectOperator<?> projectOperator = new ProjectPlanNode(_indexSegment, _queryContext, expressionsToTransform,
         DocIdSetPlanNode.MAX_DOC_PER_CALL).run();
-    return new SelectionOrderByOperator(_indexSegment, _queryContext, expressions, transformOperator);
+    return new SelectionOrderByOperator(_indexSegment, _queryContext, expressions, projectOperator);
   }
 
   /**
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/StreamingSelectionPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/StreamingSelectionPlanNode.java
index b21aefa8525..94ab5eef150 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/StreamingSelectionPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/StreamingSelectionPlanNode.java
@@ -21,8 +21,8 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.core.operator.BaseProjectOperator;
 import org.apache.pinot.core.operator.streaming.StreamingSelectionOnlyOperator;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.segment.spi.IndexSegment;
@@ -47,8 +47,8 @@ public StreamingSelectionPlanNode(IndexSegment indexSegment, QueryContext queryC
   @Override
   public StreamingSelectionOnlyOperator run() {
     List<ExpressionContext> expressions = SelectionOperatorUtils.extractExpressions(_queryContext, _indexSegment);
-    TransformOperator transformOperator = new TransformPlanNode(_indexSegment, _queryContext, expressions,
+    BaseProjectOperator<?> projectOperator = new ProjectPlanNode(_indexSegment, _queryContext, expressions,
         Math.min(_queryContext.getLimit(), DocIdSetPlanNode.MAX_DOC_PER_CALL)).run();
-    return new StreamingSelectionOnlyOperator(_indexSegment, _queryContext, expressions, transformOperator);
+    return new StreamingSelectionOnlyOperator(_indexSegment, _queryContext, expressions, projectOperator);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java
index 4510e3e9fac..d4c092c0835 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java
@@ -47,7 +47,6 @@
 import org.apache.pinot.core.plan.SelectionPlanNode;
 import org.apache.pinot.core.plan.StreamingInstanceResponsePlanNode;
 import org.apache.pinot.core.plan.StreamingSelectionPlanNode;
-import org.apache.pinot.core.query.config.QueryExecutorConfig;
 import org.apache.pinot.core.query.prefetch.FetchPlanner;
 import org.apache.pinot.core.query.prefetch.FetchPlannerRegistry;
 import org.apache.pinot.core.query.request.context.QueryContext;
@@ -90,30 +89,22 @@ public class InstancePlanMakerImplV2 implements PlanMaker {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(InstancePlanMakerImplV2.class);
 
-  private final int _maxExecutionThreads;
-  private final int _maxInitialResultHolderCapacity;
+  private final FetchPlanner _fetchPlanner = FetchPlannerRegistry.getPlanner();
+  private int _maxExecutionThreads = DEFAULT_MAX_EXECUTION_THREADS;
+  private int _maxInitialResultHolderCapacity = DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY;
   // Limit on number of groups stored for each segment, beyond which no new group will be created
-  private final int _numGroupsLimit;
+  private int _numGroupsLimit = DEFAULT_NUM_GROUPS_LIMIT;
   // Used for SQL GROUP BY (server combine)
-  private final int _minSegmentGroupTrimSize;
-  private final int _minServerGroupTrimSize;
-  private final int _groupByTrimThreshold;
-  private final FetchPlanner _fetchPlanner = FetchPlannerRegistry.getPlanner();
+  private int _minSegmentGroupTrimSize = DEFAULT_MIN_SEGMENT_GROUP_TRIM_SIZE;
+  private int _minServerGroupTrimSize = DEFAULT_MIN_SERVER_GROUP_TRIM_SIZE;
+  private int _groupByTrimThreshold = DEFAULT_GROUPBY_TRIM_THRESHOLD;
 
-  @VisibleForTesting
   public InstancePlanMakerImplV2() {
-    _maxExecutionThreads = DEFAULT_MAX_EXECUTION_THREADS;
-    _maxInitialResultHolderCapacity = DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY;
-    _numGroupsLimit = DEFAULT_NUM_GROUPS_LIMIT;
-    _minSegmentGroupTrimSize = DEFAULT_MIN_SEGMENT_GROUP_TRIM_SIZE;
-    _minServerGroupTrimSize = DEFAULT_MIN_SERVER_GROUP_TRIM_SIZE;
-    _groupByTrimThreshold = DEFAULT_GROUPBY_TRIM_THRESHOLD;
   }
 
   @VisibleForTesting
   public InstancePlanMakerImplV2(int maxInitialResultHolderCapacity, int numGroupsLimit, int minSegmentGroupTrimSize,
       int minServerGroupTrimSize, int groupByTrimThreshold) {
-    _maxExecutionThreads = DEFAULT_MAX_EXECUTION_THREADS;
     _maxInitialResultHolderCapacity = maxInitialResultHolderCapacity;
     _numGroupsLimit = numGroupsLimit;
     _minSegmentGroupTrimSize = minSegmentGroupTrimSize;
@@ -121,33 +112,26 @@ public InstancePlanMakerImplV2(int maxInitialResultHolderCapacity, int numGroups
     _groupByTrimThreshold = groupByTrimThreshold;
   }
 
-  /**
-   * Constructor for usage when client requires to pass {@link QueryExecutorConfig} to this class.
-   * <ul>
-   *   <li>Set limit on the initial result holder capacity</li>
-   *   <li>Set limit on number of groups returned from each segment and combined result</li>
-   * </ul>
-   *
-   * @param queryExecutorConfig Query executor configuration
-   */
-  public InstancePlanMakerImplV2(QueryExecutorConfig queryExecutorConfig) {
-    PinotConfiguration config = queryExecutorConfig.getConfig();
-    _maxExecutionThreads = config.getProperty(MAX_EXECUTION_THREADS_KEY, DEFAULT_MAX_EXECUTION_THREADS);
-    _maxInitialResultHolderCapacity =
-        config.getProperty(MAX_INITIAL_RESULT_HOLDER_CAPACITY_KEY, DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
-    _numGroupsLimit = config.getProperty(NUM_GROUPS_LIMIT_KEY, DEFAULT_NUM_GROUPS_LIMIT);
+  @Override
+  public void init(PinotConfiguration queryExecutorConfig) {
+    _maxExecutionThreads = queryExecutorConfig.getProperty(MAX_EXECUTION_THREADS_KEY, DEFAULT_MAX_EXECUTION_THREADS);
+    _maxInitialResultHolderCapacity = queryExecutorConfig.getProperty(MAX_INITIAL_RESULT_HOLDER_CAPACITY_KEY,
+        DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
+    _numGroupsLimit = queryExecutorConfig.getProperty(NUM_GROUPS_LIMIT_KEY, DEFAULT_NUM_GROUPS_LIMIT);
     Preconditions.checkState(_maxInitialResultHolderCapacity <= _numGroupsLimit,
         "Invalid configuration: maxInitialResultHolderCapacity: %d must be smaller or equal to numGroupsLimit: %d",
         _maxInitialResultHolderCapacity, _numGroupsLimit);
-    _minSegmentGroupTrimSize = config.getProperty(MIN_SEGMENT_GROUP_TRIM_SIZE_KEY, DEFAULT_MIN_SEGMENT_GROUP_TRIM_SIZE);
-    _minServerGroupTrimSize = config.getProperty(MIN_SERVER_GROUP_TRIM_SIZE_KEY, DEFAULT_MIN_SERVER_GROUP_TRIM_SIZE);
-    _groupByTrimThreshold = config.getProperty(GROUPBY_TRIM_THRESHOLD_KEY, DEFAULT_GROUPBY_TRIM_THRESHOLD);
+    _minSegmentGroupTrimSize =
+        queryExecutorConfig.getProperty(MIN_SEGMENT_GROUP_TRIM_SIZE_KEY, DEFAULT_MIN_SEGMENT_GROUP_TRIM_SIZE);
+    _minServerGroupTrimSize =
+        queryExecutorConfig.getProperty(MIN_SERVER_GROUP_TRIM_SIZE_KEY, DEFAULT_MIN_SERVER_GROUP_TRIM_SIZE);
+    _groupByTrimThreshold = queryExecutorConfig.getProperty(GROUPBY_TRIM_THRESHOLD_KEY, DEFAULT_GROUPBY_TRIM_THRESHOLD);
     Preconditions.checkState(_groupByTrimThreshold > 0,
         "Invalid configurable: groupByTrimThreshold: %d must be positive", _groupByTrimThreshold);
-    LOGGER.info("Initializing plan maker with maxInitialResultHolderCapacity: {}, numGroupsLimit: {}, "
-            + "minSegmentGroupTrimSize: {}, minServerGroupTrimSize: {}", _maxInitialResultHolderCapacity,
-        _numGroupsLimit,
-        _minSegmentGroupTrimSize, _minServerGroupTrimSize);
+    LOGGER.info("Initialized plan maker with maxExecutionThreads: {}, maxInitialResultHolderCapacity: {}, "
+            + "numGroupsLimit: {}, minSegmentGroupTrimSize: {}, minServerGroupTrimSize: {}, groupByTrimThreshold: {}",
+        _maxExecutionThreads, _maxInitialResultHolderCapacity, _numGroupsLimit, _minSegmentGroupTrimSize,
+        _minServerGroupTrimSize, _groupByTrimThreshold);
   }
 
   @Override
@@ -276,17 +260,9 @@ public Plan makeStreamingInstancePlan(List<IndexSegment> indexSegments, QueryCon
       planNodes.add(makeStreamingSegmentPlanNode(indexSegment, queryContext));
     }
     CombinePlanNode combinePlanNode = new CombinePlanNode(planNodes, queryContext, executorService, streamObserver);
-    if (QueryContextUtils.isSelectionOnlyQuery(queryContext)) {
-      // selection-only is streamed in StreamingSelectionPlanNode --> here only metadata block is returned.
-      return new GlobalPlanImplV0(
-          new InstanceResponsePlanNode(combinePlanNode, indexSegments, Collections.emptyList(), queryContext));
-    } else {
-      // non-selection-only requires a StreamingInstanceResponsePlanNode to stream data block back and metadata block
-      // as final return.
-      return new GlobalPlanImplV0(
-          new StreamingInstanceResponsePlanNode(combinePlanNode, indexSegments, Collections.emptyList(), queryContext,
-              streamObserver));
-    }
+    return new GlobalPlanImplV0(
+        new StreamingInstanceResponsePlanNode(combinePlanNode, indexSegments, Collections.emptyList(), queryContext,
+            streamObserver));
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/PlanMaker.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/PlanMaker.java
index 70b6b14069d..113749960d5 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/PlanMaker.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/PlanMaker.java
@@ -28,6 +28,7 @@
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.spi.annotations.InterfaceAudience;
+import org.apache.pinot.spi.env.PinotConfiguration;
 
 
 /**
@@ -36,6 +37,11 @@
 @InterfaceAudience.Private
 public interface PlanMaker {
 
+  /**
+   * Initializes the plan maker.
+   */
+  void init(PinotConfiguration queryExecutorConfig);
+
   /**
    * Returns an instance level {@link Plan} which contains the logical execution plan for multiple segments.
    */
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/AggregationExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/AggregationExecutor.java
index e0def6f7f55..620b4f7b08b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/AggregationExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/AggregationExecutor.java
@@ -19,7 +19,7 @@
 package org.apache.pinot.core.query.aggregation;
 
 import java.util.List;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 
 
 /**
@@ -29,11 +29,9 @@
 public interface AggregationExecutor {
 
   /**
-   * Performs aggregation on the given transform block.
-   *
-   * @param transformBlock Transform Block
+   * Performs aggregation on the given value block.
    */
-  void aggregate(TransformBlock transformBlock);
+  void aggregate(ValueBlock valueBlock);
 
   /**
    * Returns the result of aggregation.
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/DefaultAggregationExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/DefaultAggregationExecutor.java
index 706bf1de9d8..d6c64c1cfb6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/DefaultAggregationExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/DefaultAggregationExecutor.java
@@ -20,11 +20,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 
 
+@SuppressWarnings({"rawtypes", "unchecked"})
 public class DefaultAggregationExecutor implements AggregationExecutor {
   protected final AggregationFunction[] _aggregationFunctions;
   protected final AggregationResultHolder[] _aggregationResultHolders;
@@ -39,13 +40,13 @@ public DefaultAggregationExecutor(AggregationFunction[] aggregationFunctions) {
   }
 
   @Override
-  public void aggregate(TransformBlock transformBlock) {
+  public void aggregate(ValueBlock valueBlock) {
     int numAggregationFunctions = _aggregationFunctions.length;
-    int length = transformBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < numAggregationFunctions; i++) {
       AggregationFunction aggregationFunction = _aggregationFunctions[i];
       aggregationFunction.aggregate(length, _aggregationResultHolders[i],
-          AggregationFunctionUtils.getBlockValSetMap(aggregationFunction, transformBlock));
+          AggregationFunctionUtils.getBlockValSetMap(aggregationFunction, valueBlock));
     }
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunction.java
index 220feec5d12..81763087138 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunction.java
@@ -46,11 +46,6 @@ public interface AggregationFunction<IntermediateResult, FinalResult extends Com
    */
   AggregationFunctionType getType();
 
-  /**
-   * Returns the result column name for the given aggregation column, e.g. 'SUM(foo)' -> 'sum_foo'.
-   */
-  String getColumnName();
-
   /**
    * Returns the column name to be used in the data schema of results.
    * e.g. 'MINMAXRANGEMV( foo)' -> 'minmaxrangemv(foo)', 'PERCENTILE75(bar)' -> 'percentile75(bar)'
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactory.java
index e7d1cba0e41..35cf37631d9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactory.java
@@ -20,12 +20,11 @@
 
 import com.google.common.base.Preconditions;
 import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.FunctionContext;
-import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
-import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
 
 
@@ -40,14 +39,11 @@ private AggregationFunctionFactory() {
   /**
    * Given the function information, returns a new instance of the corresponding aggregation function.
    * <p>NOTE: Underscores in the function name are ignored.
-   * <p>NOTE: We pass the query context to this method because DISTINCT is currently modeled as an aggregation function
-   *          and requires the order-by and limit information from the query.
-   * <p>TODO: Consider modeling DISTINCT as unique selection instead of aggregation so that early-termination, limit and
-   *          offset can be applied easier
    */
-  public static AggregationFunction getAggregationFunction(FunctionContext function, QueryContext queryContext) {
+  public static AggregationFunction getAggregationFunction(FunctionContext function, boolean nullHandlingEnabled) {
     try {
-      String upperCaseFunctionName = StringUtils.remove(function.getFunctionName(), '_').toUpperCase();
+      String upperCaseFunctionName =
+          AggregationFunctionType.getNormalizedAggregationFunctionName(function.getFunctionName());
       List<ExpressionContext> arguments = function.getArguments();
       ExpressionContext firstArgument = arguments.get(0);
       if (upperCaseFunctionName.startsWith("PERCENTILE")) {
@@ -55,9 +51,22 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
         if (remainingFunctionName.equals("SMARTTDIGEST")) {
           return new PercentileSmartTDigestAggregationFunction(arguments);
         }
+        if (remainingFunctionName.equals("KLL")) {
+          return new PercentileKLLAggregationFunction(arguments);
+        }
+        if (remainingFunctionName.equals("KLLMV")) {
+          return new PercentileKLLMVAggregationFunction(arguments);
+        }
+        if (remainingFunctionName.equals("RAWKLL")) {
+          return new PercentileRawKLLAggregationFunction(arguments);
+        }
+        if (remainingFunctionName.equals("RAWKLLMV")) {
+          return new PercentileRawKLLMVAggregationFunction(arguments);
+        }
         int numArguments = arguments.size();
         if (numArguments == 1) {
           // Single argument percentile (e.g. Percentile99(foo), PercentileTDigest95(bar), etc.)
+          // NOTE: This convention is deprecated. DO NOT add new functions here
           if (remainingFunctionName.matches("\\d+")) {
             // Percentile
             return new PercentileAggregationFunction(firstArgument, parsePercentileToInt(remainingFunctionName));
@@ -102,7 +111,7 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
           // Double arguments percentile (e.g. percentile(foo, 99), percentileTDigest(bar, 95), etc.) where the
           // second argument is a decimal number from 0.0 to 100.0.
           // Have to use literal string because we need to cast int to double here.
-          double percentile = parsePercentileToDouble(arguments.get(1).getLiteralString());
+          double percentile = parsePercentileToDouble(arguments.get(1).getLiteral().getStringValue());
           if (remainingFunctionName.isEmpty()) {
             // Percentile
             return new PercentileAggregationFunction(firstArgument, percentile);
@@ -143,22 +152,48 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
             // PercentileRawTDigestMV
             return new PercentileRawTDigestMVAggregationFunction(firstArgument, percentile);
           }
+        } else if (numArguments == 3) {
+          // Triple arguments percentile (e.g. percentileTDigest(bar, 95, 1000), etc.) where the
+          // second argument is a decimal number from 0.0 to 100.0 and third argument is a decimal number indicating
+          // the compression_factor for the TDigest. This can only be used for TDigest type percentile functions to
+          // pass in a custom compression_factor. If the two argument version is used the default compression_factor
+          // of 100.0 is used.
+          // Have to use literal string because we need to cast int to double here.
+          double percentile = parsePercentileToDouble(arguments.get(1).getLiteral().getStringValue());
+          int compressionFactor = parseCompressionFactorToInt(arguments.get(2).getLiteral().getStringValue());
+          if (remainingFunctionName.equals("TDIGEST")) {
+            // PercentileTDigest
+            return new PercentileTDigestAggregationFunction(firstArgument, percentile, compressionFactor);
+          }
+          if (remainingFunctionName.equals("RAWTDIGEST")) {
+            // PercentileRawTDigest
+            return new PercentileRawTDigestAggregationFunction(firstArgument, percentile, compressionFactor);
+          }
+          if (remainingFunctionName.equals("TDIGESTMV")) {
+            // PercentileTDigestMV
+            return new PercentileTDigestMVAggregationFunction(firstArgument, percentile, compressionFactor);
+          }
+          if (remainingFunctionName.equals("RAWTDIGESTMV")) {
+            // PercentileRawTDigestMV
+            return new PercentileRawTDigestMVAggregationFunction(firstArgument, percentile, compressionFactor);
+          }
         }
         throw new IllegalArgumentException("Invalid percentile function: " + function);
       } else {
         switch (AggregationFunctionType.valueOf(upperCaseFunctionName)) {
           case COUNT:
-            return new CountAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+            return new CountAggregationFunction(firstArgument, nullHandlingEnabled);
           case MIN:
-            return new MinAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+            return new MinAggregationFunction(firstArgument, nullHandlingEnabled);
           case MAX:
-            return new MaxAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+            return new MaxAggregationFunction(firstArgument, nullHandlingEnabled);
           case SUM:
-            return new SumAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+          case SUM0:
+            return new SumAggregationFunction(firstArgument, nullHandlingEnabled);
           case SUMPRECISION:
-            return new SumPrecisionAggregationFunction(arguments, queryContext.isNullHandlingEnabled());
+            return new SumPrecisionAggregationFunction(arguments, nullHandlingEnabled);
           case AVG:
-            return new AvgAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+            return new AvgAggregationFunction(firstArgument, nullHandlingEnabled);
           case MODE:
             return new ModeAggregationFunction(arguments);
           case FIRSTWITHTIME:
@@ -169,13 +204,12 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
                 throw new IllegalArgumentException("Third argument of firstWithTime Function should be literal."
                     + " The function can be used as firstWithTime(dataColumn, timeColumn, 'dataType')");
               }
-              FieldSpec.DataType fieldDataType
-                  = FieldSpec.DataType.valueOf(dataType.getLiteralString().toUpperCase());
+              DataType fieldDataType = DataType.valueOf(dataType.getLiteral().getStringValue().toUpperCase());
               switch (fieldDataType) {
                 case BOOLEAN:
                 case INT:
-                  return new FirstIntValueWithTimeAggregationFunction(
-                      firstArgument, timeCol, fieldDataType == FieldSpec.DataType.BOOLEAN);
+                  return new FirstIntValueWithTimeAggregationFunction(firstArgument, timeCol,
+                      fieldDataType == DataType.BOOLEAN);
                 case LONG:
                   return new FirstLongValueWithTimeAggregationFunction(firstArgument, timeCol);
                 case FLOAT:
@@ -199,12 +233,12 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
                 throw new IllegalArgumentException("Third argument of lastWithTime Function should be literal."
                     + " The function can be used as lastWithTime(dataColumn, timeColumn, 'dataType')");
               }
-              FieldSpec.DataType fieldDataType = FieldSpec.DataType.valueOf(dataType.getLiteralString().toUpperCase());
+              DataType fieldDataType = DataType.valueOf(dataType.getLiteral().getStringValue().toUpperCase());
               switch (fieldDataType) {
                 case BOOLEAN:
                 case INT:
                   return new LastIntValueWithTimeAggregationFunction(firstArgument, timeCol,
-                      fieldDataType == FieldSpec.DataType.BOOLEAN);
+                      fieldDataType == DataType.BOOLEAN);
                 case LONG:
                   return new LastLongValueWithTimeAggregationFunction(firstArgument, timeCol);
                 case FLOAT:
@@ -270,9 +304,6 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
             return new DistinctSumMVAggregationFunction(firstArgument);
           case DISTINCTAVGMV:
             return new DistinctAvgMVAggregationFunction(firstArgument);
-          case DISTINCT:
-            return new DistinctAggregationFunction(arguments, queryContext.getOrderByExpressions(),
-                queryContext.getLimit());
           case STUNION:
             return new StUnionAggregationFunction(firstArgument);
           case HISTOGRAM:
@@ -282,9 +313,9 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
           case COVARSAMP:
             return new CovarianceAggregationFunction(arguments, true);
           case BOOLAND:
-            return new BooleanAndAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+            return new BooleanAndAggregationFunction(firstArgument, nullHandlingEnabled);
           case BOOLOR:
-            return new BooleanOrAggregationFunction(firstArgument, queryContext.isNullHandlingEnabled());
+            return new BooleanOrAggregationFunction(firstArgument, nullHandlingEnabled);
           case VARPOP:
             return new VarianceAggregationFunction(firstArgument, false, false);
           case VARSAMP:
@@ -299,13 +330,36 @@ public static AggregationFunction getAggregationFunction(FunctionContext functio
             return new FourthMomentAggregationFunction(firstArgument, FourthMomentAggregationFunction.Type.KURTOSIS);
           case FOURTHMOMENT:
             return new FourthMomentAggregationFunction(firstArgument, FourthMomentAggregationFunction.Type.MOMENT);
+          case DISTINCTCOUNTTUPLESKETCH:
+            // mode actually doesn't matter here because we only care about keys, not values
+            return new DistinctCountIntegerTupleSketchAggregationFunction(arguments, IntegerSummary.Mode.Sum);
+          case DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH:
+            return new IntegerTupleSketchAggregationFunction(arguments, IntegerSummary.Mode.Sum);
+          case SUMVALUESINTEGERSUMTUPLESKETCH:
+            return new SumValuesIntegerTupleSketchAggregationFunction(arguments, IntegerSummary.Mode.Sum);
+          case AVGVALUEINTEGERSUMTUPLESKETCH:
+            return new AvgValueIntegerTupleSketchAggregationFunction(arguments, IntegerSummary.Mode.Sum);
+          case PARENTARGMAX:
+            return new ParentArgMinMaxAggregationFunction(arguments, true);
+          case PARENTARGMIN:
+            return new ParentArgMinMaxAggregationFunction(arguments, false);
+          case CHILDARGMAX:
+            return new ChildArgMinMaxAggregationFunction(arguments, true);
+          case CHILDARGMIN:
+            return new ChildArgMinMaxAggregationFunction(arguments, false);
+          case ARGMAX:
+          case ARGMIN:
+            throw new IllegalArgumentException(
+                "Aggregation function: " + function + " is only supported in selection without alias.");
+          case FUNNELCOUNT:
+            return new FunnelCountAggregationFunction(arguments);
+
           default:
             throw new IllegalArgumentException();
         }
       }
     } catch (Exception e) {
-      throw new BadQueryRequestException(
-          "Invalid aggregation function: " + function + "; Reason: " + e.getMessage());
+      throw new BadQueryRequestException("Invalid aggregation function: " + function + "; Reason: " + e.getMessage());
     }
   }
 
@@ -320,4 +374,10 @@ private static double parsePercentileToDouble(String percentileString) {
     Preconditions.checkArgument(percentile >= 0d && percentile <= 100d, "Invalid percentile: %s", percentile);
     return percentile;
   }
+
+  private static int parseCompressionFactorToInt(String compressionFactorString) {
+    int compressionFactor = Integer.parseInt(compressionFactorString);
+    Preconditions.checkArgument(compressionFactor >= 0, "Invalid compressionFactor: %d", compressionFactor);
+    return compressionFactor;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionUtils.java
index 89e9d3d8e5c..7de88cb8c78 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionUtils.java
@@ -18,8 +18,8 @@
  */
 package org.apache.pinot.core.query.aggregation.function;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,13 +35,13 @@
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.common.ObjectSerDeUtils;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.operator.filter.BaseFilterOperator;
 import org.apache.pinot.core.operator.filter.CombinedFilterOperator;
-import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.core.plan.FilterPlanNode;
-import org.apache.pinot.core.plan.TransformPlanNode;
+import org.apache.pinot.core.plan.ProjectPlanNode;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.apache.pinot.segment.spi.IndexSegment;
@@ -84,23 +84,23 @@ public static AggregationFunctionColumnPair getAggregationFunctionColumnPair(
    *          or group-by expressions.
    */
   public static Set<ExpressionContext> collectExpressionsToTransform(AggregationFunction[] aggregationFunctions,
-      @Nullable ExpressionContext[] groupByExpressions) {
+      @Nullable List<ExpressionContext> groupByExpressions) {
     Set<ExpressionContext> expressions = new HashSet<>();
     for (AggregationFunction aggregationFunction : aggregationFunctions) {
       expressions.addAll(aggregationFunction.getInputExpressions());
     }
     if (groupByExpressions != null) {
-      expressions.addAll(Arrays.asList(groupByExpressions));
+      expressions.addAll(groupByExpressions);
     }
     return expressions;
   }
 
   /**
    * Creates a map from expression required by the {@link AggregationFunction} to {@link BlockValSet} fetched from the
-   * {@link TransformBlock}.
+   * {@link ValueBlock}.
    */
   public static Map<ExpressionContext, BlockValSet> getBlockValSetMap(AggregationFunction aggregationFunction,
-      TransformBlock transformBlock) {
+      ValueBlock valueBlock) {
     //noinspection unchecked
     List<ExpressionContext> expressions = aggregationFunction.getInputExpressions();
     int numExpressions = expressions.size();
@@ -109,25 +109,25 @@ public static Map<ExpressionContext, BlockValSet> getBlockValSetMap(AggregationF
     }
     if (numExpressions == 1) {
       ExpressionContext expression = expressions.get(0);
-      return Collections.singletonMap(expression, transformBlock.getBlockValueSet(expression));
+      return Collections.singletonMap(expression, valueBlock.getBlockValueSet(expression));
     }
     Map<ExpressionContext, BlockValSet> blockValSetMap = new HashMap<>();
     for (ExpressionContext expression : expressions) {
-      blockValSetMap.put(expression, transformBlock.getBlockValueSet(expression));
+      blockValSetMap.put(expression, valueBlock.getBlockValueSet(expression));
     }
     return blockValSetMap;
   }
 
   /**
    * (For Star-Tree) Creates a map from expression required by the {@link AggregationFunctionColumnPair} to
-   * {@link BlockValSet} fetched from the {@link TransformBlock}.
+   * {@link BlockValSet} fetched from the {@link ValueBlock}.
    * <p>NOTE: We construct the map with original column name as the key but fetch BlockValSet with the aggregation
    *          function pair so that the aggregation result column name is consistent with or without star-tree.
    */
   public static Map<ExpressionContext, BlockValSet> getBlockValSetMap(
-      AggregationFunctionColumnPair aggregationFunctionColumnPair, TransformBlock transformBlock) {
+      AggregationFunctionColumnPair aggregationFunctionColumnPair, ValueBlock valueBlock) {
     ExpressionContext expression = ExpressionContext.forIdentifier(aggregationFunctionColumnPair.getColumn());
-    BlockValSet blockValSet = transformBlock.getBlockValueSet(aggregationFunctionColumnPair.toColumnName());
+    BlockValSet blockValSet = valueBlock.getBlockValueSet(aggregationFunctionColumnPair.toColumnName());
     return Collections.singletonMap(expression, blockValSet);
   }
 
@@ -138,6 +138,8 @@ public static Map<ExpressionContext, BlockValSet> getBlockValSetMap(
    */
   public static Object getIntermediateResult(DataTable dataTable, ColumnDataType columnDataType, int rowId, int colId) {
     switch (columnDataType) {
+      case INT:
+        return dataTable.getInt(rowId, colId);
       case LONG:
         return dataTable.getLong(rowId, colId);
       case DOUBLE:
@@ -167,7 +169,12 @@ public static Object getConvertedFinalResult(DataTable dataTable, ColumnDataType
         return dataTable.getDouble(rowId, colId);
       case BIG_DECIMAL:
         return dataTable.getBigDecimal(rowId, colId);
+      case BOOLEAN:
+        return dataTable.getInt(rowId, colId) == 1;
+      case TIMESTAMP:
+        return new Timestamp(dataTable.getLong(rowId, colId));
       case STRING:
+      case JSON:
         return dataTable.getString(rowId, colId);
       case BYTES:
         return dataTable.getBytes(rowId, colId).getBytes();
@@ -179,93 +186,91 @@ public static Object getConvertedFinalResult(DataTable dataTable, ColumnDataType
   }
 
   /**
-   * Build a filter operator from the given FilterContext.
-   *
-   * It returns the FilterPlanNode to allow reusing plan level components such as predicate
-   * evaluator map
+   * Build pairs of filtered aggregation functions and corresponding project operator.
    */
-  public static Pair<FilterPlanNode, BaseFilterOperator> buildFilterOperator(IndexSegment indexSegment,
-      QueryContext queryContext, FilterContext filterContext) {
-    FilterPlanNode filterPlanNode = new FilterPlanNode(indexSegment, queryContext, filterContext);
-    return Pair.of(filterPlanNode, filterPlanNode.run());
-  }
+  public static List<Pair<AggregationFunction[], BaseProjectOperator<?>>> buildFilteredAggregateProjectOperators(
+      IndexSegment indexSegment, QueryContext queryContext) {
+    assert queryContext.getAggregationFunctions() != null && queryContext.getFilteredAggregationFunctions() != null;
 
-  public static Pair<FilterPlanNode, BaseFilterOperator> buildFilterOperator(IndexSegment indexSegment,
-      QueryContext queryContext) {
-    return buildFilterOperator(indexSegment, queryContext, queryContext.getFilter());
-  }
+    BaseFilterOperator mainFilterOperator = new FilterPlanNode(indexSegment, queryContext).run();
 
-  public static TransformOperator buildTransformOperatorForFilteredAggregates(IndexSegment indexSegment,
-      QueryContext queryContext, BaseFilterOperator filterOperator, @Nullable ExpressionContext[] groupByExpressions) {
-    AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
-    assert aggregationFunctions != null;
-    Set<ExpressionContext> expressionsToTransform =
-        collectExpressionsToTransform(aggregationFunctions, groupByExpressions);
-    return new TransformPlanNode(indexSegment, queryContext, expressionsToTransform, DocIdSetPlanNode.MAX_DOC_PER_CALL,
-        filterOperator).run();
-  }
-
-  /**
-   * Build pairs of filtered aggregation functions and corresponding transform operator
-   * @param mainPredicateFilterOperator Filter operator corresponding to the main predicate
-   * @param mainTransformOperator Transform operator corresponding to the main predicate
-   */
-  public static List<Pair<AggregationFunction[], TransformOperator>> buildFilteredAggTransformPairs(
-      IndexSegment indexSegment, QueryContext queryContext, BaseFilterOperator mainPredicateFilterOperator,
-      TransformOperator mainTransformOperator, @Nullable ExpressionContext[] groupByExpressions) {
-    Map<FilterContext, Pair<List<AggregationFunction>, TransformOperator>> filterContextToAggFuncsMap = new HashMap<>();
-    List<AggregationFunction> nonFilteredAggregationFunctions = new ArrayList<>();
-    List<Pair<AggregationFunction, FilterContext>> aggregationFunctions =
-        queryContext.getFilteredAggregationFunctions();
-    List<Pair<AggregationFunction[], TransformOperator>> aggToTransformOpList = new ArrayList<>();
+    // No need to process sub-filters when main filter has empty result
+    if (mainFilterOperator.isResultEmpty()) {
+      AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
+      Set<ExpressionContext> expressions =
+          collectExpressionsToTransform(aggregationFunctions, queryContext.getGroupByExpressions());
+      BaseProjectOperator<?> projectOperator =
+          new ProjectPlanNode(indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL,
+              mainFilterOperator).run();
+      return Collections.singletonList(Pair.of(aggregationFunctions, projectOperator));
+    }
 
-    // For each aggregation function, check if the aggregation function is a filtered agg.
-    // If it is, populate the corresponding filter operator and corresponding transform operator
-    assert aggregationFunctions != null;
-    for (Pair<AggregationFunction, FilterContext> inputPair : aggregationFunctions) {
-      if (inputPair.getLeft() != null) {
-        FilterContext currentFilterExpression = inputPair.getRight();
-        if (filterContextToAggFuncsMap.get(currentFilterExpression) != null) {
-          filterContextToAggFuncsMap.get(currentFilterExpression).getLeft().add(inputPair.getLeft());
-          continue;
-        }
-        Pair<FilterPlanNode, BaseFilterOperator> filterPlanOpPair =
-            buildFilterOperator(indexSegment, queryContext, currentFilterExpression);
-        BaseFilterOperator wrappedFilterOperator =
-            new CombinedFilterOperator(mainPredicateFilterOperator, filterPlanOpPair.getRight(),
-                queryContext.getQueryOptions());
-        TransformOperator newTransformOperator =
-            buildTransformOperatorForFilteredAggregates(indexSegment, queryContext, wrappedFilterOperator,
-                groupByExpressions);
-        // For each transform operator, associate it with the underlying expression. This allows
-        // fetching the relevant TransformOperator when resolving blocks during aggregation
-        // execution
-        List<AggregationFunction> aggFunctionList = new ArrayList<>();
-        aggFunctionList.add(inputPair.getLeft());
-        filterContextToAggFuncsMap.put(currentFilterExpression, Pair.of(aggFunctionList, newTransformOperator));
+    // For each aggregation function, check if the aggregation function is a filtered aggregate. If so, populate the
+    // corresponding filter operator.
+    Map<FilterContext, Pair<BaseFilterOperator, List<AggregationFunction>>> filterOperators = new HashMap<>();
+    List<AggregationFunction> nonFilteredFunctions = new ArrayList<>();
+    for (Pair<AggregationFunction, FilterContext> functionFilterPair : queryContext.getFilteredAggregationFunctions()) {
+      AggregationFunction aggregationFunction = functionFilterPair.getLeft();
+      FilterContext filter = functionFilterPair.getRight();
+      if (filter != null) {
+        filterOperators.computeIfAbsent(filter, k -> {
+          BaseFilterOperator combinedFilterOperator;
+          BaseFilterOperator subFilterOperator = new FilterPlanNode(indexSegment, queryContext, filter).run();
+          if (mainFilterOperator.isResultMatchingAll()) {
+            combinedFilterOperator = subFilterOperator;
+          } else {
+            if (subFilterOperator.isResultEmpty()) {
+              combinedFilterOperator = subFilterOperator;
+            } else if (subFilterOperator.isResultMatchingAll()) {
+              combinedFilterOperator = mainFilterOperator;
+            } else {
+              combinedFilterOperator =
+                  new CombinedFilterOperator(mainFilterOperator, subFilterOperator, queryContext.getQueryOptions());
+            }
+          }
+          return Pair.of(combinedFilterOperator, new ArrayList<>());
+        }).getRight().add(aggregationFunction);
       } else {
-        nonFilteredAggregationFunctions.add(inputPair.getLeft());
+        nonFilteredFunctions.add(aggregationFunction);
       }
     }
-    // Convert to array since FilteredGroupByOperator expects it
-    for (Pair<List<AggregationFunction>, TransformOperator> pair : filterContextToAggFuncsMap.values()) {
-      List<AggregationFunction> aggregationFunctionList = pair.getLeft();
-      if (aggregationFunctionList == null) {
-        throw new IllegalStateException("Null aggregation list seen");
+
+    // Create the project operators
+    List<Pair<AggregationFunction[], BaseProjectOperator<?>>> projectOperators = new ArrayList<>();
+    List<ExpressionContext> groupByExpressions = queryContext.getGroupByExpressions();
+    for (Pair<BaseFilterOperator, List<AggregationFunction>> filterOperatorFunctionsPair : filterOperators.values()) {
+      BaseFilterOperator filterOperator = filterOperatorFunctionsPair.getLeft();
+      if (filterOperator == mainFilterOperator) {
+        // This can happen when the sub filter matches all documents, and we can treat the function as non-filtered
+        nonFilteredFunctions.addAll(filterOperatorFunctionsPair.getRight());
+      } else {
+        AggregationFunction[] aggregationFunctions =
+            filterOperatorFunctionsPair.getRight().toArray(new AggregationFunction[0]);
+        Set<ExpressionContext> expressions = collectExpressionsToTransform(aggregationFunctions, groupByExpressions);
+        BaseProjectOperator<?> projectOperator =
+            new ProjectPlanNode(indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL,
+                filterOperator).run();
+        projectOperators.add(Pair.of(aggregationFunctions, projectOperator));
       }
-      aggToTransformOpList.add(Pair.of(aggregationFunctionList.toArray(new AggregationFunction[0]), pair.getRight()));
     }
-    aggToTransformOpList.add(
-        Pair.of(nonFilteredAggregationFunctions.toArray(new AggregationFunction[0]), mainTransformOperator));
 
-    return aggToTransformOpList;
+    if (!nonFilteredFunctions.isEmpty()) {
+      AggregationFunction[] aggregationFunctions = nonFilteredFunctions.toArray(new AggregationFunction[0]);
+      Set<ExpressionContext> expressions = collectExpressionsToTransform(aggregationFunctions, groupByExpressions);
+      BaseProjectOperator<?> projectOperator =
+          new ProjectPlanNode(indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL,
+              mainFilterOperator).run();
+      projectOperators.add(Pair.of(aggregationFunctions, projectOperator));
+    }
+
+    return projectOperators;
   }
 
   public static String getResultColumnName(AggregationFunction aggregationFunction, @Nullable FilterContext filter) {
-      String columnName = aggregationFunction.getResultColumnName();
-      if (filter != null) {
-        columnName += " FILTER(WHERE " + filter + ")";
-      }
-      return columnName;
+    String columnName = aggregationFunction.getResultColumnName();
+    if (filter != null) {
+      columnName += " FILTER(WHERE " + filter + ")";
+    }
+    return columnName;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AvgValueIntegerTupleSketchAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AvgValueIntegerTupleSketchAggregationFunction.java
new file mode 100644
index 00000000000..3b3718dba2b
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/AvgValueIntegerTupleSketchAggregationFunction.java
@@ -0,0 +1,70 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.datasketches.tuple.CompactSketch;
+import org.apache.datasketches.tuple.TupleSketchIterator;
+import org.apache.datasketches.tuple.Union;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class AvgValueIntegerTupleSketchAggregationFunction
+    extends IntegerTupleSketchAggregationFunction {
+
+  public AvgValueIntegerTupleSketchAggregationFunction(List<ExpressionContext> arguments, IntegerSummary.Mode mode) {
+    super(arguments, mode);
+  }
+
+  // TODO if extra aggregation modes are supported, make this switch
+  // ie, if a Mode argument other than SUM is passed in, switch to the matching AggregationFunctionType
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.AVGVALUEINTEGERSUMTUPLESKETCH;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.LONG;
+  }
+
+  @Override
+  public Comparable extractFinalResult(List<CompactSketch<IntegerSummary>> integerSummarySketches) {
+    if (integerSummarySketches == null) {
+      return null;
+    }
+    Union<IntegerSummary> union = new Union<>(_entries, _setOps);
+    integerSummarySketches.forEach(union::union);
+    double retainedTotal = 0L;
+    CompactSketch<IntegerSummary> result = union.getResult();
+    TupleSketchIterator<IntegerSummary> summaries = result.iterator();
+    while (summaries.next()) {
+      retainedTotal += summaries.getSummary().getValue();
+    }
+    if (result.getRetainedEntries() == 0) {
+      // there is nothing to average, return null
+      return null;
+    }
+    double estimate = retainedTotal / result.getRetainedEntries();
+    return Math.round(estimate);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseBooleanAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseBooleanAggregationFunction.java
index c295d4838fa..4045e496f64 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseBooleanAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseBooleanAggregationFunction.java
@@ -21,7 +21,7 @@
 
 import java.util.Map;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
 import org.apache.pinot.core.query.aggregation.IntAggregateResultHolder;
@@ -232,13 +232,13 @@ public Integer merge(Integer intermediateResult1, Integer intermediateResult2) {
   }
 
   @Override
-  public DataSchema.ColumnDataType getIntermediateResultColumnType() {
-    return DataSchema.ColumnDataType.BOOLEAN;
+  public ColumnDataType getIntermediateResultColumnType() {
+    return ColumnDataType.INT;
   }
 
   @Override
-  public DataSchema.ColumnDataType getFinalResultColumnType() {
-    return DataSchema.ColumnDataType.BOOLEAN;
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.BOOLEAN;
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseSingleInputAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseSingleInputAggregationFunction.java
index 54986c9a74e..84ff537a9c1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseSingleInputAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/BaseSingleInputAggregationFunction.java
@@ -38,11 +38,6 @@ public BaseSingleInputAggregationFunction(ExpressionContext expression) {
     _expression = expression;
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + ")";
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ChildAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ChildAggregationFunction.java
new file mode 100644
index 00000000000..e4d88226a29
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ChildAggregationFunction.java
@@ -0,0 +1,160 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.DummyAggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.DummyGroupByResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+/**
+ * Child aggregation function is used for a result placeholder during the query processing,
+ * It holds the position of the original aggregation function in the query
+ * and use its name to denote which parent aggregation function it belongs to.
+ * The name also serves as the key to retrieve the result from the parent aggregation function
+ * result holder.
+ * Please look at getResultColumnName() for the detailed format of the name.
+ * Please look at ArgMinMaxRewriter as an example of how a child aggregation function is created.
+ */
+public abstract class ChildAggregationFunction implements AggregationFunction<Long, Long> {
+
+  private static final int CHILD_AGGREGATION_FUNCTION_ID_OFFSET = 0;
+  private static final int CHILD_AGGREGATION_FUNCTION_COLUMN_KEY_OFFSET = 1;
+  private final ExpressionContext _childFunctionKeyInParent;
+  private final List<ExpressionContext> _resultNameOperands;
+  private final ExpressionContext _childFunctionID;
+
+  ChildAggregationFunction(List<ExpressionContext> operands) {
+    _childFunctionID = operands.get(CHILD_AGGREGATION_FUNCTION_ID_OFFSET);
+    _childFunctionKeyInParent = operands.get(CHILD_AGGREGATION_FUNCTION_COLUMN_KEY_OFFSET);
+    _resultNameOperands = operands.subList(CHILD_AGGREGATION_FUNCTION_COLUMN_KEY_OFFSET + 1, operands.size());
+  }
+
+  @Override
+  public List<ExpressionContext> getInputExpressions() {
+    ArrayList<ExpressionContext> expressionContexts = new ArrayList<>();
+    expressionContexts.add(_childFunctionID);
+    expressionContexts.add(_childFunctionKeyInParent);
+    expressionContexts.addAll(_resultNameOperands);
+    return expressionContexts;
+  }
+
+  @Override
+  public final AggregationResultHolder createAggregationResultHolder() {
+    return new DummyAggregationResultHolder();
+  }
+
+  @Override
+  public final GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) {
+    return new DummyGroupByResultHolder();
+  }
+
+  @Override
+  public final void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+  }
+
+  @Override
+  public final void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+  }
+
+  @Override
+  public final void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+  }
+
+  @Override
+  public final Long extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
+    return 0L;
+  }
+
+  @Override
+  public final Long extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
+    return 0L;
+  }
+
+  @Override
+  public final Long merge(Long intermediateResult1, Long intermediateResult2) {
+    return 0L;
+  }
+
+  @Override
+  public final DataSchema.ColumnDataType getIntermediateResultColumnType() {
+    return DataSchema.ColumnDataType.LONG;
+  }
+
+  @Override
+  public final DataSchema.ColumnDataType getFinalResultColumnType() {
+    return DataSchema.ColumnDataType.UNKNOWN;
+  }
+
+  @Override
+  public final Long extractFinalResult(Long longValue) {
+    return 0L;
+  }
+
+  /**
+   * The name of the column as follows:
+   * CHILD_AGGREGATION_NAME_PREFIX + actual function type + operands + CHILD_AGGREGATION_SEPERATOR
+   * + actual function type + parent aggregation function id + CHILD_KEY_SEPERATOR + column key in parent function
+   * e.g. if the child aggregation function is "argmax(0,a,b,x)", the name of the column is
+   * "pinotchildaggregationargmax(a,b,x)@argmax0_x"
+   */
+  @Override
+  public final String getResultColumnName() {
+    String type = getType().getName().toLowerCase();
+    return CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX
+        // above is the prefix for all child aggregation functions
+
+        + type + "(" + _resultNameOperands.stream().map(ExpressionContext::toString)
+        .collect(Collectors.joining(",")) + ")"
+        // above is the actual child aggregation function name we want to return to the user
+
+        + CommonConstants.RewriterConstants.CHILD_AGGREGATION_SEPERATOR
+        + type
+        + _childFunctionID.getLiteral().getStringValue()
+        + CommonConstants.RewriterConstants.CHILD_KEY_SEPERATOR
+        + _childFunctionKeyInParent.toString();
+    // above is the column key in the parent aggregation function
+  }
+
+  @Override
+  public final String toExplainString() {
+    StringBuilder stringBuilder = new StringBuilder(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX)
+        .append("_").append(getType().getName()).append('(');
+    int numArguments = getInputExpressions().size();
+    if (numArguments > 0) {
+      stringBuilder.append(getInputExpressions().get(0).toString());
+      for (int i = 1; i < numArguments; i++) {
+        stringBuilder.append(", ").append(getInputExpressions().get(i).toString());
+      }
+    }
+    return stringBuilder.append(')').toString();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ChildArgMinMaxAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ChildArgMinMaxAggregationFunction.java
new file mode 100644
index 00000000000..408941bb303
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ChildArgMinMaxAggregationFunction.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class ChildArgMinMaxAggregationFunction extends ChildAggregationFunction {
+
+  private final boolean _isMax;
+
+  public ChildArgMinMaxAggregationFunction(List<ExpressionContext> operands, boolean isMax) {
+    super(operands);
+    _isMax = isMax;
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return _isMax ? AggregationFunctionType.ARGMAX : AggregationFunctionType.ARGMIN;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountAggregationFunction.java
index 53f36f47031..e9861193f40 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountAggregationFunction.java
@@ -34,7 +34,6 @@
 
 
 public class CountAggregationFunction extends BaseSingleInputAggregationFunction<Long, Long> {
-  private static final String COUNT_STAR_COLUMN_NAME = "count_star";
   private static final String COUNT_STAR_RESULT_COLUMN_NAME = "count(*)";
   private static final double DEFAULT_INITIAL_VALUE = 0.0;
   // Special expression used by star-tree to pass in BlockValSet
@@ -50,7 +49,11 @@ public CountAggregationFunction(ExpressionContext expression) {
   public CountAggregationFunction(ExpressionContext expression, boolean nullHandlingEnabled) {
     super(expression);
     // Consider null values only when null handling is enabled and function is not COUNT(*)
-    _nullHandlingEnabled = nullHandlingEnabled && !expression.getIdentifier().equals("*");
+    // Note COUNT on any literal gives same result as COUNT(*)
+    // So allow for identifiers that are not * and functions, disable for literals and *
+    _nullHandlingEnabled = nullHandlingEnabled
+            && ((expression.getType() == ExpressionContext.Type.IDENTIFIER && !expression.getIdentifier().equals("*"))
+            || (expression.getType() == ExpressionContext.Type.FUNCTION));
   }
 
   @Override
@@ -58,11 +61,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.COUNT;
   }
 
-  @Override
-  public String getColumnName() {
-    return _nullHandlingEnabled ? super.getColumnName() : COUNT_STAR_COLUMN_NAME;
-  }
-
   @Override
   public String getResultColumnName() {
     return _nullHandlingEnabled ? super.getResultColumnName() : COUNT_STAR_RESULT_COLUMN_NAME;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountMVAggregationFunction.java
index 061111daaf9..cb7ab591fb9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountMVAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CountMVAggregationFunction.java
@@ -45,11 +45,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.COUNTMV;
   }
 
-  @Override
-  public String getColumnName() {
-    return AggregationFunctionType.COUNTMV.getName() + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return AggregationFunctionType.COUNTMV.getName().toLowerCase() + "(" + _expression + ")";
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CovarianceAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CovarianceAggregationFunction.java
index 1676835bae8..7f07d0cfb89 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CovarianceAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/CovarianceAggregationFunction.java
@@ -68,11 +68,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.COVARPOP;
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression1 + "_" + _expression2;
-  }
-
   @Override
   public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression1 + "," + _expression2 + ")";
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctAggregationFunction.java
deleted file mode 100644
index 6f0703d72e2..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctAggregationFunction.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.query.aggregation.function;
-
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
-import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
-import org.apache.pinot.segment.spi.AggregationFunctionType;
-
-
-/**
- * The DISTINCT clause in SQL is represented as the DISTINCT aggregation function. Currently it is only used to wrap the
- * information for the distinct queries.
- * TODO: Use a separate way to represent DISTINCT instead of aggregation.
- */
-@SuppressWarnings("rawtypes")
-public class DistinctAggregationFunction implements AggregationFunction<Object, Comparable> {
-  private final List<ExpressionContext> _expressions;
-  private final String[] _columns;
-  private final List<OrderByExpressionContext> _orderByExpressions;
-  private final int _limit;
-
-  /**
-   * Constructor for the class.
-   *
-   * @param expressions Distinct columns to return
-   * @param orderByExpressions Order By clause
-   * @param limit Limit clause
-   */
-  public DistinctAggregationFunction(List<ExpressionContext> expressions,
-      @Nullable List<OrderByExpressionContext> orderByExpressions, int limit) {
-    _expressions = expressions;
-    int numExpressions = expressions.size();
-    _columns = new String[numExpressions];
-    for (int i = 0; i < numExpressions; i++) {
-      _columns[i] = expressions.get(i).toString();
-    }
-    _orderByExpressions = orderByExpressions;
-    _limit = limit;
-  }
-
-  public String[] getColumns() {
-    return _columns;
-  }
-
-  public List<OrderByExpressionContext> getOrderByExpressions() {
-    return _orderByExpressions;
-  }
-
-  public int getLimit() {
-    return _limit;
-  }
-
-  @Override
-  public AggregationFunctionType getType() {
-    return AggregationFunctionType.DISTINCT;
-  }
-
-  @Override
-  public String getColumnName() {
-    return AggregationFunctionType.DISTINCT.getName() + "_" + StringUtils.join(_columns, ':');
-  }
-
-  @Override
-  public String getResultColumnName() {
-    return AggregationFunctionType.DISTINCT.getName().toLowerCase() + "(" + StringUtils.join(_columns, ':') + ")";
-  }
-
-  @Override
-  public List<ExpressionContext> getInputExpressions() {
-    return _expressions;
-  }
-
-  @Override
-  public ColumnDataType getIntermediateResultColumnType() {
-    return ColumnDataType.OBJECT;
-  }
-
-  @Override
-  public AggregationResultHolder createAggregationResultHolder() {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
-      Map<ExpressionContext, BlockValSet> blockValSetMap) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
-      Map<ExpressionContext, BlockValSet> blockValSetMap) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
-      Map<ExpressionContext, BlockValSet> blockValSetMap) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public Object extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public Object extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public Object merge(Object intermediateResult1, Object intermediateResult2) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public ColumnDataType getFinalResultColumnType() {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public Comparable extractFinalResult(Object intermediateResult) {
-    throw new UnsupportedOperationException("Operation not supported for DISTINCT aggregation function");
-  }
-
-  @Override
-  public String toExplainString() {
-    StringBuilder stringBuilder = new StringBuilder(getType().getName()).append('(');
-    int numArguments = getInputExpressions().size();
-    if (numArguments > 0) {
-      stringBuilder.append(getInputExpressions().get(0).toString());
-      for (int i = 1; i < numArguments; i++) {
-        stringBuilder.append(", ").append(getInputExpressions().get(i).toString());
-      }
-    }
-    return stringBuilder.append(')').toString();
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountHLLAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountHLLAggregationFunction.java
index 914177ae8cb..a4386827bb8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountHLLAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountHLLAggregationFunction.java
@@ -48,7 +48,7 @@ public DistinctCountHLLAggregationFunction(List<ExpressionContext> arguments) {
     Preconditions.checkArgument(numExpressions <= 2, "DistinctCountHLL expects 1 or 2 arguments, got: %s",
         numExpressions);
     if (arguments.size() == 2) {
-      _log2m = Integer.parseInt(arguments.get(1).getLiteralString());
+      _log2m = arguments.get(1).getLiteral().getIntValue();
     } else {
       _log2m = CommonConstants.Helix.DEFAULT_HYPERLOGLOG_LOG2M;
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountIntegerTupleSketchAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountIntegerTupleSketchAggregationFunction.java
new file mode 100644
index 00000000000..087337472d6
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountIntegerTupleSketchAggregationFunction.java
@@ -0,0 +1,54 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.datasketches.tuple.CompactSketch;
+import org.apache.datasketches.tuple.Union;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class DistinctCountIntegerTupleSketchAggregationFunction extends IntegerTupleSketchAggregationFunction {
+
+  public DistinctCountIntegerTupleSketchAggregationFunction(List<ExpressionContext> arguments,
+      IntegerSummary.Mode mode) {
+    super(arguments, mode);
+  }
+
+  // TODO if extra aggregation modes are supported, make this switch
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.DISTINCTCOUNTTUPLESKETCH;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.LONG;
+  }
+
+  @Override
+  public Comparable extractFinalResult(List<CompactSketch<IntegerSummary>> integerSummarySketches) {
+    Union<IntegerSummary> union = new Union<>(_entries, _setOps);
+    integerSummarySketches.forEach(union::union);
+    return Double.valueOf(union.getResult().getEstimate()).longValue();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountSmartHLLAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountSmartHLLAggregationFunction.java
index 87e418f9352..0aedb3ae7e6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountSmartHLLAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountSmartHLLAggregationFunction.java
@@ -68,7 +68,7 @@ public DistinctCountSmartHLLAggregationFunction(List<ExpressionContext> argument
     super(arguments.get(0));
 
     if (arguments.size() > 1) {
-      Parameters parameters = new Parameters(arguments.get(1).getLiteralString());
+      Parameters parameters = new Parameters(arguments.get(1).getLiteral().getStringValue());
       _threshold = parameters._threshold;
       _log2m = parameters._log2m;
     } else {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
index 317cb486935..c6a57b373fa 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/DistinctCountThetaSketchAggregationFunction.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.datasketches.Util;
 import org.apache.datasketches.memory.Memory;
 import org.apache.datasketches.theta.AnotB;
 import org.apache.datasketches.theta.Intersection;
@@ -34,6 +33,7 @@
 import org.apache.datasketches.theta.Union;
 import org.apache.datasketches.theta.UpdateSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.thetacommon.ThetaUtil;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.FilterContext;
@@ -101,7 +101,7 @@ public DistinctCountThetaSketchAggregationFunction(List<ExpressionContext> argum
       ExpressionContext paramsExpression = arguments.get(1);
       Preconditions.checkArgument(paramsExpression.getType() == ExpressionContext.Type.LITERAL,
           "Second argument of DISTINCT_COUNT_THETA_SKETCH aggregation function must be literal (parameters)");
-      Parameters parameters = new Parameters(paramsExpression.getLiteralString());
+      Parameters parameters = new Parameters(paramsExpression.getLiteral().getStringValue());
       int nominalEntries = parameters.getNominalEntries();
       _updateSketchBuilder.setNominalEntries(nominalEntries);
       _setOperationBuilder.setNominalEntries(nominalEntries);
@@ -130,8 +130,8 @@ public DistinctCountThetaSketchAggregationFunction(List<ExpressionContext> argum
         Preconditions.checkArgument(filterExpression.getType() == ExpressionContext.Type.LITERAL,
             "Third to second last argument of DISTINCT_COUNT_THETA_SKETCH aggregation function must be literal "
                 + "(filter expression)");
-        FilterContext filter =
-            RequestContextUtils.getFilter(CalciteSqlParser.compileToExpression(filterExpression.getLiteralString()));
+        FilterContext filter = RequestContextUtils.getFilter(
+            CalciteSqlParser.compileToExpression(filterExpression.getLiteral().getStringValue()));
         // NOTE: Collect expressions before constructing the FilterInfo so that expressionIndexMap always include the
         //       expressions in the filter.
         collectExpressions(filter, _inputExpressions, expressionIndexMap);
@@ -143,7 +143,7 @@ public DistinctCountThetaSketchAggregationFunction(List<ExpressionContext> argum
       Preconditions.checkArgument(postAggregationExpression.getType() == ExpressionContext.Type.LITERAL,
           "Last argument of DISTINCT_COUNT_THETA_SKETCH aggregation function must be literal (post-aggregation "
               + "expression)");
-      Expression expr = CalciteSqlParser.compileToExpression(postAggregationExpression.getLiteralString());
+      Expression expr = CalciteSqlParser.compileToExpression(postAggregationExpression.getLiteral().getStringValue());
       _postAggregationExpression = RequestContextUtils.getExpression(expr);
 
 
@@ -406,7 +406,7 @@ public void aggregate(int length, AggregationResultHolder aggregationResultHolde
       if (_includeDefaultSketch) {
         Union defaultUnion = unions.get(0);
         for (Sketch sketch : sketches) {
-          defaultUnion.update(sketch);
+          defaultUnion.union(sketch);
         }
       }
       for (int i = 0; i < numFilters; i++) {
@@ -414,7 +414,7 @@ public void aggregate(int length, AggregationResultHolder aggregationResultHolde
         Union union = unions.get(i + 1);
         for (int j = 0; j < length; j++) {
           if (filterEvaluator.evaluate(singleValues, valueTypes, valueArrays, j)) {
-            union.update(sketches[j]);
+            union.union(sketches[j]);
           }
         }
       }
@@ -634,11 +634,11 @@ public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHol
         List<Union> unions = getUnions(groupByResultHolder, groupKeyArray[i]);
         Sketch sketch = sketches[i];
         if (_includeDefaultSketch) {
-          unions.get(0).update(sketch);
+          unions.get(0).union(sketch);
         }
         for (int j = 0; j < numFilters; j++) {
           if (_filterEvaluators.get(j).evaluate(singleValues, valueTypes, valueArrays, i)) {
-            unions.get(j + 1).update(sketch);
+            unions.get(j + 1).union(sketch);
           }
         }
       }
@@ -907,7 +907,7 @@ public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResult
       if (_includeDefaultSketch) {
         for (int i = 0; i < length; i++) {
           for (int groupKey : groupKeysArray[i]) {
-            getUnions(groupByResultHolder, groupKey).get(0).update(sketches[i]);
+            getUnions(groupByResultHolder, groupKey).get(0).union(sketches[i]);
           }
         }
       }
@@ -916,7 +916,7 @@ public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResult
         for (int j = 0; j < length; j++) {
           if (filterEvaluator.evaluate(singleValues, valueTypes, valueArrays, j)) {
             for (int groupKey : groupKeysArray[i]) {
-              getUnions(groupByResultHolder, groupKey).get(i + 1).update(sketches[i]);
+              getUnions(groupByResultHolder, groupKey).get(i + 1).union(sketches[i]);
             }
           }
         }
@@ -969,8 +969,8 @@ public List<Sketch> merge(List<Sketch> sketches1, List<Sketch> sketches2) {
         continue;
       }
       Union union = _setOperationBuilder.buildUnion();
-      union.update(sketch1);
-      union.update(sketch2);
+      union.union(sketch1);
+      union.union(sketch2);
       // NOTE: Compact the sketch in unsorted, on-heap fashion for performance concern.
       //       See https://datasketches.apache.org/docs/Theta/ThetaSize.html for more details.
       mergedSketches.add(union.getResult(false, null));
@@ -1278,20 +1278,20 @@ private Sketch evaluatePostAggregationExpression(ExpressionContext expression, L
       case SET_UNION:
         Union union = _setOperationBuilder.buildUnion();
         for (ExpressionContext argument : arguments) {
-          union.update(evaluatePostAggregationExpression(argument, sketches));
+          union.union(evaluatePostAggregationExpression(argument, sketches));
         }
         return union.getResult(false, null);
       case SET_INTERSECT:
         Intersection intersection = _setOperationBuilder.buildIntersection();
         for (ExpressionContext argument : arguments) {
-          intersection.update(evaluatePostAggregationExpression(argument, sketches));
+          intersection.intersect(evaluatePostAggregationExpression(argument, sketches));
         }
         return intersection.getResult(false, null);
       case SET_DIFF:
         AnotB diff = _setOperationBuilder.buildANotB();
-        diff.update(evaluatePostAggregationExpression(arguments.get(0), sketches),
-            evaluatePostAggregationExpression(arguments.get(1), sketches));
-        return diff.getResult(false, null);
+        diff.setA(evaluatePostAggregationExpression(arguments.get(0), sketches));
+        diff.notB(evaluatePostAggregationExpression(arguments.get(1), sketches));
+        return diff.getResult(false, null, false);
       default:
         throw new IllegalStateException();
     }
@@ -1305,7 +1305,7 @@ private static class Parameters {
     private static final char PARAMETER_KEY_VALUE_SEPARATOR = '=';
     private static final String NOMINAL_ENTRIES_KEY = "nominalEntries";
 
-    private int _nominalEntries = Util.DEFAULT_NOMINAL_ENTRIES;
+    private int _nominalEntries = ThetaUtil.DEFAULT_NOMINAL_ENTRIES;
 
     Parameters(String parametersString) {
       StringUtils.deleteWhitespace(parametersString);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstDoubleValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstDoubleValueWithTimeAggregationFunction.java
index 56aff397df6..270a86d6715 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstDoubleValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstDoubleValueWithTimeAggregationFunction.java
@@ -38,15 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class FirstDoubleValueWithTimeAggregationFunction extends FirstWithTimeAggregationFunction<Double> {
+  private final static ValueLongPair<Double> DEFAULT_VALUE_TIME_PAIR = new DoubleLongPair(Double.NaN, Long.MAX_VALUE);
 
-  private final static ValueLongPair<Double> DEFAULT_VALUE_TIME_PAIR
-      = new DoubleLongPair(Double.NaN, Long.MAX_VALUE);
-
-  public FirstDoubleValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public FirstDoubleValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.DOUBLE_LONG_PAIR_SER_DE);
   }
 
@@ -81,8 +76,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     double[] doubleValues = blockValSet.getDoubleValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -93,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     double[] doubleValues = blockValSet.getDoubleValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -114,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'DOUBLE')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_DOUBLE";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.DOUBLE;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstFloatValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstFloatValueWithTimeAggregationFunction.java
index 3801ff17a37..e4c4da2400f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstFloatValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstFloatValueWithTimeAggregationFunction.java
@@ -38,14 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class FirstFloatValueWithTimeAggregationFunction extends FirstWithTimeAggregationFunction<Float> {
-
   private final static ValueLongPair<Float> DEFAULT_VALUE_TIME_PAIR = new FloatLongPair(Float.NaN, Long.MAX_VALUE);
 
-  public FirstFloatValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public FirstFloatValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.FLOAT_LONG_PAIR_SER_DE);
   }
 
@@ -79,11 +75,8 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataSv(int length,
-      int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     float[] floatValues = blockValSet.getFloatValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -94,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     float[] floatValues = blockValSet.getFloatValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -115,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'FLOAT')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_FLOAT";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.FLOAT;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstIntValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstIntValueWithTimeAggregationFunction.java
index be151b99942..8623f0bdc56 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstIntValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstIntValueWithTimeAggregationFunction.java
@@ -39,16 +39,13 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class FirstIntValueWithTimeAggregationFunction extends FirstWithTimeAggregationFunction<Integer> {
+  private final static ValueLongPair<Integer> DEFAULT_VALUE_TIME_PAIR =
+      new IntLongPair(Integer.MIN_VALUE, Long.MAX_VALUE);
 
-  private final static ValueLongPair<Integer> DEFAULT_VALUE_TIME_PAIR
-      = new IntLongPair(Integer.MIN_VALUE, Long.MAX_VALUE);
   private final boolean _isBoolean;
 
-  public FirstIntValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol,
+  public FirstIntValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol,
       boolean isBoolean) {
     super(dataCol, timeCol, ObjectSerDeUtils.INT_LONG_PAIR_SER_DE);
     _isBoolean = isBoolean;
@@ -85,8 +82,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     int[] intValues = blockValSet.getIntValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -97,11 +93,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     int[] intValues = blockValSet.getIntValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -122,15 +115,6 @@ public String getResultColumnName() {
     }
   }
 
-  @Override
-  public String getColumnName() {
-    if (_isBoolean) {
-      return getType().getName() + "_" + _expression + "_" + _timeCol + "_BOOLEAN";
-    } else {
-      return getType().getName() + "_" + _expression + "_" + _timeCol + "_INT";
-    }
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     if (_isBoolean) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstLongValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstLongValueWithTimeAggregationFunction.java
index 960cda88209..0f5afeaa970 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstLongValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstLongValueWithTimeAggregationFunction.java
@@ -38,15 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class FirstLongValueWithTimeAggregationFunction extends FirstWithTimeAggregationFunction<Long> {
+  private final static ValueLongPair<Long> DEFAULT_VALUE_TIME_PAIR = new LongLongPair(Long.MIN_VALUE, Long.MAX_VALUE);
 
-  private final static ValueLongPair<Long> DEFAULT_VALUE_TIME_PAIR
-      = new LongLongPair(Long.MIN_VALUE, Long.MAX_VALUE);
-
-  public FirstLongValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public FirstLongValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.LONG_LONG_PAIR_SER_DE);
   }
 
@@ -81,8 +76,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     long[] longValues = blockValSet.getLongValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -93,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     long[] longValues = blockValSet.getLongValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -114,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'LONG')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_LONG";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.LONG;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstStringValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstStringValueWithTimeAggregationFunction.java
index b0ace7487e0..c30f4bfacb3 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstStringValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FirstStringValueWithTimeAggregationFunction.java
@@ -38,13 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class FirstStringValueWithTimeAggregationFunction extends FirstWithTimeAggregationFunction<String> {
   private final static ValueLongPair<String> DEFAULT_VALUE_TIME_PAIR = new StringLongPair("", Long.MAX_VALUE);
 
-  public FirstStringValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public FirstStringValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.STRING_LONG_PAIR_SER_DE);
   }
 
@@ -79,8 +76,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     String[] stringValues = blockValSet.getStringValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -91,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     String[] stringValues = blockValSet.getStringValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -112,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'STRING')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_STRING";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.STRING;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FunnelCountAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FunnelCountAggregationFunction.java
new file mode 100644
index 00000000000..4eecad1002e
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/FunnelCountAggregationFunction.java
@@ -0,0 +1,511 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import com.google.common.base.Preconditions;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.roaringbitmap.RoaringBitmap;
+
+
+/**
+ * The {@code FunnelCountAggregationFunction} calculates the number of step conversions for a given partition column and
+ * a list of boolean expressions.
+ * <p>IMPORTANT: This function relies on the partition column being partitioned for each segment, where there are no
+ * common values across different segments.
+ * <p>This function calculates the exact number of step matches per partition key within the segment, then sums up the
+ * results from different segments.
+ *
+ * Example:
+ *   SELECT
+ *    dateTrunc('day', timestamp) AS ts,
+ *    FUNNEL_COUNT(
+ *      STEPS(url = '/addToCart', url = '/checkout', url = '/orderConfirmation'),
+ *      CORRELATED_BY(user)
+ *    ) as step_counts
+ *    FROM user_log
+ *    WHERE url in ('/addToCart', '/checkout', '/orderConfirmation')
+ *    GROUP BY 1
+ */
+public class FunnelCountAggregationFunction implements AggregationFunction<List<Long>, LongArrayList> {
+  final List<ExpressionContext> _expressions;
+  final List<ExpressionContext> _stepExpressions;
+  final List<ExpressionContext> _correlateByExpressions;
+  final ExpressionContext _primaryCorrelationCol;
+  final int _numSteps;
+
+  final SegmentAggregationStrategy<?, List<Long>> _sortedAggregationStrategy;
+  final SegmentAggregationStrategy<?, List<Long>> _bitmapAggregationStrategy;
+
+  public FunnelCountAggregationFunction(List<ExpressionContext> expressions) {
+    _expressions = expressions;
+    _correlateByExpressions = Option.CORRELATE_BY.getInputExpressions(expressions);
+    _primaryCorrelationCol = Option.CORRELATE_BY.getFirstInputExpression(expressions);
+    _stepExpressions = Option.STEPS.getInputExpressions(expressions);
+    _numSteps = _stepExpressions.size();
+    _sortedAggregationStrategy = new SortedAggregationStrategy();
+    _bitmapAggregationStrategy = new BitmapAggregationStrategy();
+  }
+
+  @Override
+  public String getResultColumnName() {
+    return getType().getName().toLowerCase() + "(" + _expressions.stream().map(ExpressionContext::toString)
+        .collect(Collectors.joining(",")) + ")";
+  }
+
+  @Override
+  public List<ExpressionContext> getInputExpressions() {
+    final List<ExpressionContext> inputs = new ArrayList<>();
+    inputs.addAll(_correlateByExpressions);
+    inputs.addAll(_stepExpressions);
+    return inputs;
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.FUNNELCOUNT;
+  }
+
+  @Override
+  public AggregationResultHolder createAggregationResultHolder() {
+    return new ObjectAggregationResultHolder();
+  }
+
+  @Override
+  public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) {
+    return new ObjectGroupByResultHolder(initialCapacity, maxCapacity);
+  }
+
+  @Override
+  public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    getAggregationStrategyByBlockValSetMap(blockValSetMap).aggregate(length, aggregationResultHolder, blockValSetMap);
+  }
+
+  @Override
+  public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    getAggregationStrategyByBlockValSetMap(blockValSetMap).aggregateGroupBySV(length, groupKeyArray,
+        groupByResultHolder, blockValSetMap);
+  }
+
+  @Override
+  public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    getAggregationStrategyByBlockValSetMap(blockValSetMap).aggregateGroupByMV(length, groupKeysArray,
+        groupByResultHolder, blockValSetMap);
+  }
+
+  @Override
+  public List<Long> extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
+    return getAggregationStrategyByAggregationResult(aggregationResultHolder.getResult()).extractAggregationResult(
+        aggregationResultHolder);
+  }
+
+  @Override
+  public List<Long> extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
+    return getAggregationStrategyByAggregationResult(groupByResultHolder.getResult(groupKey)).extractGroupByResult(
+        groupByResultHolder, groupKey);
+  }
+
+  @Override
+  public List<Long> merge(List<Long> a, List<Long> b) {
+    int length = a.size();
+    Preconditions.checkState(length == b.size(), "The two operand arrays are not of the same size! provided %s, %s",
+        length, b.size());
+
+    LongArrayList result = toLongArrayList(a);
+    long[] elements = result.elements();
+    for (int i = 0; i < length; i++) {
+      elements[i] += b.get(i);
+    }
+    return result;
+  }
+
+  @Override
+  public ColumnDataType getIntermediateResultColumnType() {
+    return ColumnDataType.OBJECT;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.LONG_ARRAY;
+  }
+
+  @Override
+  public LongArrayList extractFinalResult(List<Long> result) {
+    return toLongArrayList(result);
+  }
+
+  @Override
+  public String toExplainString() {
+    StringBuilder stringBuilder = new StringBuilder(getType().getName()).append('(');
+    int numArguments = getInputExpressions().size();
+    if (numArguments > 0) {
+      stringBuilder.append(getInputExpressions().get(0).toString());
+      for (int i = 1; i < numArguments; i++) {
+        stringBuilder.append(", ").append(getInputExpressions().get(i).toString());
+      }
+    }
+    return stringBuilder.append(')').toString();
+  }
+
+  private static LongArrayList toLongArrayList(List<Long> longList) {
+    return longList instanceof LongArrayList ? ((LongArrayList) longList).clone() : new LongArrayList(longList);
+  }
+
+  private int[] getCorrelationIds(Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    return blockValSetMap.get(_primaryCorrelationCol).getDictionaryIdsSV();
+  }
+
+  private int[][] getSteps(Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    final int[][] steps = new int[_numSteps][];
+    for (int n = 0; n < _numSteps; n++) {
+      final BlockValSet stepBlockValSet = blockValSetMap.get(_stepExpressions.get(n));
+      steps[n] = stepBlockValSet.getIntValuesSV();
+    }
+    return steps;
+  }
+
+  private boolean isSorted(Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    final Dictionary primaryCorrelationDictionary = blockValSetMap.get(_primaryCorrelationCol).getDictionary();
+    if (primaryCorrelationDictionary == null) {
+      throw new IllegalArgumentException(
+          "CORRELATE_BY column in FUNNELCOUNT aggregation function not supported, please use a dictionary encoded "
+              + "column.");
+    }
+    return primaryCorrelationDictionary.isSorted();
+  }
+
+  private SegmentAggregationStrategy<?, List<Long>> getAggregationStrategyByBlockValSetMap(
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    return isSorted(blockValSetMap) ? _sortedAggregationStrategy : _bitmapAggregationStrategy;
+  }
+
+  private SegmentAggregationStrategy<?, List<Long>> getAggregationStrategyByAggregationResult(Object aggResult) {
+    return aggResult instanceof SortedAggregationResult ? _sortedAggregationStrategy : _bitmapAggregationStrategy;
+  }
+
+  enum Option {
+    STEPS("steps"),
+    CORRELATE_BY("correlateby");
+
+    final String _name;
+
+    Option(String name) {
+      _name = name;
+    }
+
+    boolean matches(ExpressionContext expression) {
+      if (expression.getType() != ExpressionContext.Type.FUNCTION) {
+        return false;
+      }
+      return _name.equals(expression.getFunction().getFunctionName());
+    }
+
+    Optional<ExpressionContext> find(List<ExpressionContext> expressions) {
+      return expressions.stream().filter(this::matches).findFirst();
+    }
+
+    public List<ExpressionContext> getInputExpressions(List<ExpressionContext> expressions) {
+      return this.find(expressions).map(exp -> exp.getFunction().getArguments())
+          .orElseThrow(() -> new IllegalStateException("FUNNELCOUNT requires " + _name));
+    }
+
+    public ExpressionContext getFirstInputExpression(List<ExpressionContext> expressions) {
+      return this.find(expressions)
+          .flatMap(exp -> exp.getFunction().getArguments().stream().findFirst())
+          .orElseThrow(() -> new IllegalStateException("FUNNELCOUNT: " + _name + " requires an argument."));
+    }
+  }
+
+  /**
+   * Interface for segment aggregation strategy.
+   *
+   * <p>The implementation should be stateless, and can be shared among multiple segments in multiple threads. The
+   * result for each segment should be stored and passed in via the result holder.
+   * There should be no assumptions beyond segment boundaries, different aggregation strategies may be utilized
+   * across different segments for a given query.
+   *
+   * @param <A> Aggregation result accumulated across blocks within segment, kept by result holder.
+   * @param <I> Intermediate result at segment level (extracted from aforementioned aggregation result).
+   */
+  @ThreadSafe
+  static abstract class SegmentAggregationStrategy<A, I> {
+
+    /**
+     * Returns an aggregation result for this aggregation strategy to be kept in a result holder (aggregation only).
+     */
+    abstract A createAggregationResult();
+
+    public A getAggregationResultGroupBy(GroupByResultHolder groupByResultHolder, int groupKey) {
+      A aggResult = groupByResultHolder.getResult(groupKey);
+      if (aggResult == null) {
+        aggResult = createAggregationResult();
+        groupByResultHolder.setValueForKey(groupKey, aggResult);
+      }
+      return aggResult;
+    }
+
+    public A getAggregationResult(AggregationResultHolder aggregationResultHolder) {
+      A aggResult = aggregationResultHolder.getResult();
+      if (aggResult == null) {
+        aggResult = createAggregationResult();
+        aggregationResultHolder.setValue(aggResult);
+      }
+      return aggResult;
+    }
+
+    /**
+     * Performs aggregation on the given block value sets (aggregation only).
+     */
+    abstract void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap);
+
+    /**
+     * Performs aggregation on the given group key array and block value sets (aggregation group-by on single-value
+     * columns).
+     */
+    abstract void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap);
+
+    /**
+     * Performs aggregation on the given group keys array and block value sets (aggregation group-by on multi-value
+     * columns).
+     */
+    abstract void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap);
+
+    /**
+     * Extracts the intermediate result from the aggregation result holder (aggregation only).
+     */
+    public I extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
+      return extractIntermediateResult(aggregationResultHolder.getResult());
+    }
+
+    /**
+     * Extracts the intermediate result from the group-by result holder for the given group key (aggregation group-by).
+     */
+    public I extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
+      return extractIntermediateResult(groupByResultHolder.getResult(groupKey));
+    }
+
+    abstract I extractIntermediateResult(A aggregationResult);
+  }
+
+  /**
+   * Aggregation strategy leveraging roaring bitmap algebra (unions/intersections).
+   */
+  class BitmapAggregationStrategy extends SegmentAggregationStrategy<RoaringBitmap[], List<Long>> {
+
+    @Override
+    public RoaringBitmap[] createAggregationResult() {
+      final RoaringBitmap[] stepsBitmaps = new RoaringBitmap[_numSteps];
+      for (int n = 0; n < _numSteps; n++) {
+        stepsBitmaps[n] = new RoaringBitmap();
+      }
+      return stepsBitmaps;
+    }
+
+    @Override
+    public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap) {
+      final int[] correlationIds = getCorrelationIds(blockValSetMap);
+      final int[][] steps = getSteps(blockValSetMap);
+
+      final RoaringBitmap[] stepsBitmaps = getAggregationResult(aggregationResultHolder);
+
+      for (int n = 0; n < _numSteps; n++) {
+        for (int i = 0; i < length; i++) {
+          if (steps[n][i] > 0) {
+            stepsBitmaps[n].add(correlationIds[i]);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap) {
+      final int[] correlationIds = getCorrelationIds(blockValSetMap);
+      final int[][] steps = getSteps(blockValSetMap);
+
+      for (int n = 0; n < _numSteps; n++) {
+        for (int i = 0; i < length; i++) {
+          final int groupKey = groupKeyArray[i];
+          if (steps[n][i] > 0) {
+            getAggregationResultGroupBy(groupByResultHolder, groupKey)[n].add(correlationIds[i]);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap) {
+      final int[] correlationIds = getCorrelationIds(blockValSetMap);
+      final int[][] steps = getSteps(blockValSetMap);
+
+      for (int n = 0; n < _numSteps; n++) {
+        for (int i = 0; i < length; i++) {
+          for (int groupKey : groupKeysArray[i]) {
+            if (steps[n][i] > 0) {
+              getAggregationResultGroupBy(groupByResultHolder, groupKey)[n].add(correlationIds[i]);
+            }
+          }
+        }
+      }
+    }
+
+    @Override
+    public List<Long> extractIntermediateResult(RoaringBitmap[] stepsBitmaps) {
+      if (stepsBitmaps == null) {
+        return new LongArrayList(_numSteps);
+      }
+
+      long[] result = new long[_numSteps];
+      result[0] = stepsBitmaps[0].getCardinality();
+      for (int i = 1; i < _numSteps; i++) {
+        // intersect this step with previous step
+        stepsBitmaps[i].and(stepsBitmaps[i - 1]);
+        result[i] = stepsBitmaps[i].getCardinality();
+      }
+      return LongArrayList.wrap(result);
+    }
+  }
+
+  /**
+   * Aggregation strategy for segments sorted by the main correlation column.
+   */
+  class SortedAggregationStrategy extends SegmentAggregationStrategy<SortedAggregationResult, List<Long>> {
+
+    @Override
+    public SortedAggregationResult createAggregationResult() {
+      return new SortedAggregationResult();
+    }
+
+    @Override
+    public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap) {
+      final int[] correlationIds = getCorrelationIds(blockValSetMap);
+      final int[][] steps = getSteps(blockValSetMap);
+
+      final SortedAggregationResult agg = getAggregationResult(aggregationResultHolder);
+
+      for (int i = 0; i < length; i++) {
+        agg.sortedCount(steps, i, correlationIds[i]);
+      }
+    }
+
+    @Override
+    public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap) {
+      final int[] correlationIds = getCorrelationIds(blockValSetMap);
+      final int[][] steps = getSteps(blockValSetMap);
+
+      for (int i = 0; i < length; i++) {
+        final int groupKey = groupKeyArray[i];
+        final SortedAggregationResult agg = getAggregationResultGroupBy(groupByResultHolder, groupKey);
+
+        agg.sortedCount(steps, i, correlationIds[i]);
+      }
+    }
+
+    @Override
+    public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+        Map<ExpressionContext, BlockValSet> blockValSetMap) {
+      final int[] correlationIds = getCorrelationIds(blockValSetMap);
+      final int[][] steps = getSteps(blockValSetMap);
+
+      for (int i = 0; i < length; i++) {
+        for (int groupKey : groupKeysArray[i]) {
+          final SortedAggregationResult agg = getAggregationResultGroupBy(groupByResultHolder, groupKey);
+
+          agg.sortedCount(steps, i, correlationIds[i]);
+        }
+      }
+    }
+
+    @Override
+    public List<Long> extractIntermediateResult(SortedAggregationResult agg) {
+      if (agg == null) {
+        return new LongArrayList(_numSteps);
+      }
+
+      return LongArrayList.wrap(agg.extractResult());
+    }
+  }
+
+  /**
+   * Aggregation result data structure leveraged by sorted aggregation strategy.
+   */
+  class SortedAggregationResult {
+    public long[] _stepCounters = new long[_numSteps];
+    public int _lastCorrelationId = Integer.MIN_VALUE;
+    public boolean[] _correlatedSteps = new boolean[_numSteps];
+
+    public void sortedCount(int[][] steps, int i, int correlationId) {
+      if (correlationId == _lastCorrelationId) {
+        // same correlation as before, keep accumulating.
+        for (int n = 0; n < _numSteps; n++) {
+          _correlatedSteps[n] |= steps[n][i] > 0;
+        }
+      } else {
+        // End of correlation group, calculate funnel conversion counts
+        incrStepCounters();
+
+        // initialize next correlation group
+        for (int n = 0; n < _numSteps; n++) {
+          _correlatedSteps[n] = steps[n][i] > 0;
+        }
+        _lastCorrelationId = correlationId;
+      }
+    }
+
+    void incrStepCounters() {
+      for (int n = 0; n < _numSteps; n++) {
+        if (!_correlatedSteps[n]) {
+          break;
+        }
+        _stepCounters[n]++;
+      }
+    }
+
+    public long[] extractResult() {
+      // count last correlation id left open
+      incrStepCounters();
+
+      return _stepCounters;
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/HistogramAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/HistogramAggregationFunction.java
index a2911f5ddcc..78bf60eca90 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/HistogramAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/HistogramAggregationFunction.java
@@ -67,9 +67,9 @@ public HistogramAggregationFunction(List<ExpressionContext> arguments) {
       _upper = _bucketEdges[_bucketEdges.length - 1];
     } else {
       _isEqualLength = true;
-      _lower = Double.parseDouble(arguments.get(1).getLiteralString());
-      _upper = Double.parseDouble(arguments.get(2).getLiteralString());
-      int numBins = Integer.parseInt(arguments.get(3).getLiteralString());
+      _lower = arguments.get(1).getLiteral().getDoubleValue();
+      _upper = arguments.get(2).getLiteral().getDoubleValue();
+      int numBins = arguments.get(3).getLiteral().getIntValue();;
       Preconditions.checkArgument(_upper > _lower,
           "The right most edge must be greater than left most edge, given %s and %s", _lower, _upper);
       Preconditions.checkArgument(numBins > 0, "The number of bins must be greater than zero, given %s", numBins);
@@ -100,7 +100,7 @@ private double[] parseVector(List<ExpressionContext> arrayStr) {
       if (arrayStr.get(i).getType() == ExpressionContext.Type.IDENTIFIER) {
         ret[i] = Double.parseDouble(arrayStr.get(i).getIdentifier());
       } else {
-        ret[i] = Double.parseDouble(arrayStr.get(i).getLiteralString());
+        ret[i] = arrayStr.get(i).getLiteral().getDoubleValue();
       }
       if (i > 0) {
         Preconditions.checkState(ret[i] > ret[i - 1], "The bin edges must be strictly increasing");
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IdSetAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IdSetAggregationFunction.java
index b4d5cb18e76..7d4f7dd3dec 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IdSetAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IdSetAggregationFunction.java
@@ -82,7 +82,7 @@ public IdSetAggregationFunction(List<ExpressionContext> arguments) {
       int sizeThresholdInBytes = IdSets.DEFAULT_SIZE_THRESHOLD_IN_BYTES;
       int expectedInsertions = IdSets.DEFAULT_EXPECTED_INSERTIONS;
       double fpp = IdSets.DEFAULT_FPP;
-      String parametersString = parametersExpression.getLiteralString();
+      String parametersString = parametersExpression.getLiteral().getStringValue();
       StringUtils.deleteWhitespace(parametersString);
       String[] keyValuePairs = StringUtils.split(parametersString, PARAMETER_DELIMITER);
       for (String keyValuePair : keyValuePairs) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java
new file mode 100644
index 00000000000..fde88dc808a
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/IntegerTupleSketchAggregationFunction.java
@@ -0,0 +1,222 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.datasketches.tuple.CompactSketch;
+import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.Union;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+/***
+ * This is the base class for all Integer Tuple Sketch aggregations
+ *
+ * Note that it only supports BYTES columns containing serialized sketches currently, but could be expanded to more
+ */
+public class IntegerTupleSketchAggregationFunction
+    extends BaseSingleInputAggregationFunction<List<CompactSketch<IntegerSummary>>, Comparable> {
+  final ExpressionContext _expressionContext;
+  final IntegerSummarySetOperations _setOps;
+  final int _entries;
+
+  public IntegerTupleSketchAggregationFunction(List<ExpressionContext> arguments, IntegerSummary.Mode mode) {
+    super(arguments.get(0));
+
+    Preconditions.checkArgument(arguments.size() <= 2,
+        "Tuple Sketch Aggregation Function expects at most 2 arguments, got: %s", arguments.size());
+    _expressionContext = arguments.get(0);
+    _setOps = new IntegerSummarySetOperations(mode, mode);
+    if (arguments.size() == 2) {
+      FieldSpec.DataType dataType = arguments.get(1).getLiteral().getType();
+      Preconditions.checkArgument(dataType == FieldSpec.DataType.LONG || dataType == FieldSpec.DataType.INT,
+          "Tuple Sketch Aggregation Function expected the second argument to be a number of entries to keep, but it "
+              + "was of type %s",
+          dataType.toString());
+      _entries = ((Long) arguments.get(1).getLiteral().getValue()).intValue();
+    } else {
+      _entries = (int) Math.pow(2, CommonConstants.Helix.DEFAULT_TUPLE_SKETCH_LGK);
+    }
+  }
+
+  // TODO if extra aggregation modes are supported, make this switch
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH;
+  }
+
+  @Override
+  public AggregationResultHolder createAggregationResultHolder() {
+    return new ObjectAggregationResultHolder();
+  }
+
+  @Override
+  public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) {
+    return new ObjectGroupByResultHolder(initialCapacity, maxCapacity);
+  }
+
+  @Override
+  public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet blockValSet = blockValSetMap.get(_expression);
+
+    // Treat BYTES value as serialized Integer Tuple Sketch
+    FieldSpec.DataType storedType = blockValSet.getValueType().getStoredType();
+    if (storedType == FieldSpec.DataType.BYTES) {
+      byte[][] bytesValues = blockValSet.getBytesValuesSV();
+      try {
+        List<CompactSketch<IntegerSummary>> integerSketch = aggregationResultHolder.getResult();
+        if (integerSketch != null) {
+          List<CompactSketch<IntegerSummary>> sketches =
+              Arrays.stream(bytesValues).map(ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE::deserialize)
+                  .map(Sketch::compact).collect(Collectors.toList());
+          aggregationResultHolder.setValue(merge(aggregationResultHolder.getResult(), sketches));
+        } else {
+          List<CompactSketch<IntegerSummary>> sketches =
+              Arrays.stream(bytesValues).map(ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE::deserialize)
+                  .map(Sketch::compact).collect(Collectors.toList());
+          aggregationResultHolder.setValue(sketches);
+        }
+      } catch (Exception e) {
+        throw new RuntimeException("Caught exception while merging Tuple Sketches", e);
+      }
+    } else {
+      throw new IllegalStateException("Illegal data type for " + getType() + " aggregation function: " + storedType);
+    }
+  }
+
+  @Override
+  public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+
+    BlockValSet blockValSet = blockValSetMap.get(_expression);
+
+    // Treat BYTES value as serialized Integer Tuple Sketch
+    FieldSpec.DataType storedType = blockValSet.getValueType().getStoredType();
+
+    if (storedType == FieldSpec.DataType.BYTES) {
+      byte[][] bytesValues = blockValSet.getBytesValuesSV();
+      try {
+        for (int i = 0; i < length; i++) {
+          byte[] value = bytesValues[i];
+          int groupKey = groupKeyArray[i];
+          CompactSketch<IntegerSummary> newSketch =
+              ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.deserialize(value).compact();
+          if (groupByResultHolder.getResult(groupKey) == null) {
+            ArrayList<CompactSketch<IntegerSummary>> newList = new ArrayList<>();
+            newList.add(newSketch);
+            groupByResultHolder.setValueForKey(groupKey, newList);
+          } else {
+            groupByResultHolder.<List<CompactSketch<IntegerSummary>>>getResult(groupKey).add(newSketch);
+          }
+        }
+      } catch (Exception e) {
+        throw new RuntimeException("Caught exception while merging Tuple Sketches", e);
+      }
+    } else {
+      throw new IllegalStateException(
+          "Illegal data type for INTEGER_TUPLE_SKETCH_UNION aggregation function: " + storedType);
+    }
+  }
+
+  @Override
+  public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    byte[][] valueArray = blockValSetMap.get(_expression).getBytesValuesSV();
+    for (int i = 0; i < length; i++) {
+      byte[] value = valueArray[i];
+      CompactSketch<IntegerSummary> newSketch =
+          ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.deserialize(value).compact();
+      for (int groupKey : groupKeysArray[i]) {
+        if (groupByResultHolder.getResult(groupKey) == null) {
+          groupByResultHolder.setValueForKey(groupKey, Collections.singletonList(newSketch));
+        } else {
+          groupByResultHolder.<List<CompactSketch<IntegerSummary>>>getResult(groupKey).add(newSketch);
+        }
+      }
+    }
+  }
+
+  @Override
+  public List<CompactSketch<IntegerSummary>> extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
+    return aggregationResultHolder.getResult();
+  }
+
+  @Override
+  public List<CompactSketch<IntegerSummary>> extractGroupByResult(GroupByResultHolder groupByResultHolder,
+      int groupKey) {
+    return groupByResultHolder.getResult(groupKey);
+  }
+
+  @Override
+  public List<CompactSketch<IntegerSummary>> merge(List<CompactSketch<IntegerSummary>> intermediateResult1,
+      List<CompactSketch<IntegerSummary>> intermediateResult2) {
+    if (intermediateResult1 == null && intermediateResult2 != null) {
+      return intermediateResult2;
+    } else if (intermediateResult1 != null && intermediateResult2 == null) {
+      return intermediateResult1;
+    } else if (intermediateResult1 == null && intermediateResult2 == null) {
+      return new ArrayList<>(0);
+    }
+    ArrayList<CompactSketch<IntegerSummary>> merged =
+        new ArrayList<>(intermediateResult1.size() + intermediateResult2.size());
+    merged.addAll(intermediateResult1);
+    merged.addAll(intermediateResult2);
+    return merged;
+  }
+
+  @Override
+  public ColumnDataType getIntermediateResultColumnType() {
+    return ColumnDataType.OBJECT;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.STRING;
+  }
+
+  @Override
+  public Comparable extractFinalResult(List<CompactSketch<IntegerSummary>> integerSummarySketches) {
+    if (integerSummarySketches == null) {
+      return null;
+    }
+    Union<IntegerSummary> union = new Union<>(_entries, _setOps);
+    integerSummarySketches.forEach(union::union);
+    return Base64.getEncoder().encodeToString(union.getResult().toByteArray());
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastDoubleValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastDoubleValueWithTimeAggregationFunction.java
index 796a0cb02ad..93aec2b0c13 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastDoubleValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastDoubleValueWithTimeAggregationFunction.java
@@ -38,15 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class LastDoubleValueWithTimeAggregationFunction extends LastWithTimeAggregationFunction<Double> {
+  private final static ValueLongPair<Double> DEFAULT_VALUE_TIME_PAIR = new DoubleLongPair(Double.NaN, Long.MIN_VALUE);
 
-  private final static ValueLongPair<Double> DEFAULT_VALUE_TIME_PAIR
-      = new DoubleLongPair(Double.NaN, Long.MIN_VALUE);
-
-  public LastDoubleValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public LastDoubleValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.DOUBLE_LONG_PAIR_SER_DE);
   }
 
@@ -81,8 +76,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     double[] doubleValues = blockValSet.getDoubleValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -93,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     double[] doubleValues = blockValSet.getDoubleValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -114,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'DOUBLE')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_DOUBLE";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.DOUBLE;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastFloatValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastFloatValueWithTimeAggregationFunction.java
index 6061a839bb6..50635874c94 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastFloatValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastFloatValueWithTimeAggregationFunction.java
@@ -38,14 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class LastFloatValueWithTimeAggregationFunction extends LastWithTimeAggregationFunction<Float> {
-
   private final static ValueLongPair<Float> DEFAULT_VALUE_TIME_PAIR = new FloatLongPair(Float.NaN, Long.MIN_VALUE);
 
-  public LastFloatValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public LastFloatValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.FLOAT_LONG_PAIR_SER_DE);
   }
 
@@ -79,11 +75,8 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataSv(int length,
-      int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     float[] floatValues = blockValSet.getFloatValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -94,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     float[] floatValues = blockValSet.getFloatValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -115,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'FLOAT')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_FLOAT";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.FLOAT;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastIntValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastIntValueWithTimeAggregationFunction.java
index ff9fdee5e2b..87d33ce0df6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastIntValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastIntValueWithTimeAggregationFunction.java
@@ -39,16 +39,13 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class LastIntValueWithTimeAggregationFunction extends LastWithTimeAggregationFunction<Integer> {
+  private final static ValueLongPair<Integer> DEFAULT_VALUE_TIME_PAIR =
+      new IntLongPair(Integer.MIN_VALUE, Long.MIN_VALUE);
 
-  private final static ValueLongPair<Integer> DEFAULT_VALUE_TIME_PAIR
-      = new IntLongPair(Integer.MIN_VALUE, Long.MIN_VALUE);
   private final boolean _isBoolean;
 
-  public LastIntValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol,
+  public LastIntValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol,
       boolean isBoolean) {
     super(dataCol, timeCol, ObjectSerDeUtils.INT_LONG_PAIR_SER_DE);
     _isBoolean = isBoolean;
@@ -85,8 +82,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     int[] intValues = blockValSet.getIntValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -97,11 +93,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     int[] intValues = blockValSet.getIntValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -122,15 +115,6 @@ public String getResultColumnName() {
     }
   }
 
-  @Override
-  public String getColumnName() {
-    if (_isBoolean) {
-      return getType().getName() + "_" + _expression + "_" + _timeCol + "_BOOLEAN";
-    } else {
-      return getType().getName() + "_" + _expression + "_" + _timeCol + "_INT";
-    }
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     if (_isBoolean) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastLongValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastLongValueWithTimeAggregationFunction.java
index fa3c15fb3a7..248487d6357 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastLongValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastLongValueWithTimeAggregationFunction.java
@@ -38,15 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class LastLongValueWithTimeAggregationFunction extends LastWithTimeAggregationFunction<Long> {
+  private final static ValueLongPair<Long> DEFAULT_VALUE_TIME_PAIR = new LongLongPair(Long.MIN_VALUE, Long.MIN_VALUE);
 
-  private final static ValueLongPair<Long> DEFAULT_VALUE_TIME_PAIR
-      = new LongLongPair(Long.MIN_VALUE, Long.MIN_VALUE);
-
-  public LastLongValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public LastLongValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.LONG_LONG_PAIR_SER_DE);
   }
 
@@ -81,8 +76,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     long[] longValues = blockValSet.getLongValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -93,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     long[] longValues = blockValSet.getLongValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -114,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'LONG')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_LONG";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.LONG;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastStringValueWithTimeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastStringValueWithTimeAggregationFunction.java
index cb3caa886bd..0f10e9399d0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastStringValueWithTimeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/LastStringValueWithTimeAggregationFunction.java
@@ -38,13 +38,10 @@
  *   Numeric column</li>
  * </ul>
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 public class LastStringValueWithTimeAggregationFunction extends LastWithTimeAggregationFunction<String> {
   private final static ValueLongPair<String> DEFAULT_VALUE_TIME_PAIR = new StringLongPair("", Long.MIN_VALUE);
 
-  public LastStringValueWithTimeAggregationFunction(
-      ExpressionContext dataCol,
-      ExpressionContext timeCol) {
+  public LastStringValueWithTimeAggregationFunction(ExpressionContext dataCol, ExpressionContext timeCol) {
     super(dataCol, timeCol, ObjectSerDeUtils.STRING_LONG_PAIR_SER_DE);
   }
 
@@ -79,8 +76,7 @@ public void aggregateResultWithRawData(int length, AggregationResultHolder aggre
 
   @Override
   public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet, BlockValSet timeValSet) {
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     String[] stringValues = blockValSet.getStringValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -91,11 +87,8 @@ public void aggregateGroupResultWithRawDataSv(int length, int[] groupKeyArray,
   }
 
   @Override
-  public void aggregateGroupResultWithRawDataMv(int length,
-      int[][] groupKeysArray,
-      GroupByResultHolder groupByResultHolder,
-      BlockValSet blockValSet,
-      BlockValSet timeValSet) {
+  public void aggregateGroupResultWithRawDataMv(int length, int[][] groupKeysArray,
+      GroupByResultHolder groupByResultHolder, BlockValSet blockValSet, BlockValSet timeValSet) {
     String[] stringValues = blockValSet.getStringValuesSV();
     long[] timeValues = timeValSet.getLongValuesSV();
     for (int i = 0; i < length; i++) {
@@ -112,11 +105,6 @@ public String getResultColumnName() {
     return getType().getName().toLowerCase() + "(" + _expression + "," + _timeCol + ",'STRING')";
   }
 
-  @Override
-  public String getColumnName() {
-    return getType().getName() + "_" + _expression + "_" + _timeCol + "_STRING";
-  }
-
   @Override
   public ColumnDataType getFinalResultColumnType() {
     return ColumnDataType.STRING;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ModeAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ModeAggregationFunction.java
index fb394ad5919..882167385d5 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ModeAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ModeAggregationFunction.java
@@ -68,7 +68,7 @@ public ModeAggregationFunction(List<ExpressionContext> arguments) {
     int numArguments = arguments.size();
     Preconditions.checkArgument(numArguments <= 2, "Mode expects at most 2 arguments, got: %s", numArguments);
     if (numArguments > 1) {
-      _multiModeReducerType = MultiModeReducerType.valueOf(arguments.get(1).getLiteralString());
+      _multiModeReducerType = MultiModeReducerType.valueOf(arguments.get(1).getLiteral().getStringValue());
     } else {
       _multiModeReducerType = MultiModeReducerType.MIN;
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ParentAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ParentAggregationFunction.java
new file mode 100644
index 00000000000..831cf2d766a
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ParentAggregationFunction.java
@@ -0,0 +1,71 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.query.aggregation.utils.ParentAggregationFunctionResultObject;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+/**
+ * Base class for parent aggregation functions. A parent aggregation function is an aggregation function
+ * whose result is a nested data block containing multiple columns, each of which corresponds to a child
+ * aggregation function's result.
+ */
+public abstract class ParentAggregationFunction<I, F extends ParentAggregationFunctionResultObject>
+    implements AggregationFunction<I, F> {
+
+  protected static final int PARENT_AGGREGATION_FUNCTION_ID_OFFSET = 0;
+  protected List<ExpressionContext> _arguments;
+
+  ParentAggregationFunction(List<ExpressionContext> arguments) {
+    _arguments = arguments;
+  }
+
+  @Override
+  public final DataSchema.ColumnDataType getFinalResultColumnType() {
+    return DataSchema.ColumnDataType.OBJECT;
+  }
+
+  // The name of the column is the prefix of the parent aggregation function + the name of the
+  // aggregation function + the id of the parent aggregation function
+  // e.g. if the parent aggregation function is "argmax(0,3,a,b,c,x,y,z)", the name of the column is
+  // "pinotparentaggregationargmax0"
+  @Override
+  public final String getResultColumnName() {
+    return CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX
+        + getType().getName().toLowerCase()
+        + _arguments.get(PARENT_AGGREGATION_FUNCTION_ID_OFFSET).getLiteral().getIntValue();
+  }
+
+  public final String toExplainString() {
+    StringBuilder stringBuilder = new StringBuilder(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX)
+        .append("_").append(getType().getName()).append('(');
+    int numArguments = _arguments.size();
+    if (numArguments > 0) {
+      stringBuilder.append(_arguments.get(0).toString());
+      for (int i = 1; i < numArguments; i++) {
+        stringBuilder.append(", ").append(_arguments.get(i).toString());
+      }
+    }
+    return stringBuilder.append(')').toString();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ParentArgMinMaxAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ParentArgMinMaxAggregationFunction.java
new file mode 100644
index 00000000000..9a735f10cce
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/ParentArgMinMaxAggregationFunction.java
@@ -0,0 +1,432 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder;
+import org.apache.pinot.core.query.aggregation.utils.argminmax.ArgMinMaxMeasuringValSetWrapper;
+import org.apache.pinot.core.query.aggregation.utils.argminmax.ArgMinMaxObject;
+import org.apache.pinot.core.query.aggregation.utils.argminmax.ArgMinMaxProjectionValSetWrapper;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class ParentArgMinMaxAggregationFunction extends ParentAggregationFunction<ArgMinMaxObject, ArgMinMaxObject> {
+
+  // list of columns that we do min/max on
+  private final List<ExpressionContext> _measuringColumns;
+  // list of columns that we project based on the min/max value
+  private final List<ExpressionContext> _projectionColumns;
+  // true if we are doing argmax, false if we are doing argmin
+  private final boolean _isMax;
+  // the id of the function, this is to associate the result of the parent aggregation function with the
+  // child aggregation functions having the same type(argmin/argmax) and measuring columns
+  private final ExpressionContext _functionIdContext;
+  private final ExpressionContext _numMeasuringColumnContext;
+  // number of columns that we do min/max on
+  private final int _numMeasuringColumns;
+  // number of columns that we project based on the min/max value
+  private final int _numProjectionColumns;
+
+  // The following variable need to be initialized
+
+  // The wrapper classes for the block value sets
+  private final ThreadLocal<List<ArgMinMaxMeasuringValSetWrapper>> _argMinMaxWrapperMeasuringColumnSets =
+      ThreadLocal.withInitial(ArrayList::new);
+  private final ThreadLocal<List<ArgMinMaxProjectionValSetWrapper>> _argMinMaxWrapperProjectionColumnSets =
+      ThreadLocal.withInitial(ArrayList::new);
+  // The schema for the measuring columns and projection columns
+  private final ThreadLocal<DataSchema> _measuringColumnSchema = new ThreadLocal<>();
+  private final ThreadLocal<DataSchema> _projectionColumnSchema = new ThreadLocal<>();
+  // If the schemas are initialized
+  private final ThreadLocal<Boolean> _schemaInitialized = ThreadLocal.withInitial(() -> false);
+
+  public ParentArgMinMaxAggregationFunction(List<ExpressionContext> arguments, boolean isMax) {
+
+    super(arguments);
+    _isMax = isMax;
+    _functionIdContext = arguments.get(0);
+
+    _numMeasuringColumnContext = arguments.get(1);
+    _numMeasuringColumns = _numMeasuringColumnContext.getLiteral().getIntValue();
+
+    _measuringColumns = arguments.subList(2, 2 + _numMeasuringColumns);
+    _projectionColumns = arguments.subList(2 + _numMeasuringColumns, arguments.size());
+    _numProjectionColumns = _projectionColumns.size();
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return _isMax ? AggregationFunctionType.ARGMAX : AggregationFunctionType.ARGMIN;
+  }
+
+  @Override
+  public List<ExpressionContext> getInputExpressions() {
+    ArrayList<ExpressionContext> expressionContexts = new ArrayList<>();
+    expressionContexts.add(_functionIdContext);
+    expressionContexts.add(_numMeasuringColumnContext);
+    expressionContexts.addAll(_measuringColumns);
+    expressionContexts.addAll(_projectionColumns);
+    return expressionContexts;
+  }
+
+  @Override
+  public AggregationResultHolder createAggregationResultHolder() {
+    return new ObjectAggregationResultHolder();
+  }
+
+  @Override
+  public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) {
+    return new ObjectGroupByResultHolder(initialCapacity, maxCapacity);
+  }
+
+  @SuppressWarnings("LoopStatementThatDoesntLoop")
+  @Override
+  public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+
+    ArgMinMaxObject argMinMaxObject = aggregationResultHolder.getResult();
+
+    if (argMinMaxObject == null) {
+      initializeWithNewDataBlocks(blockValSetMap);
+      argMinMaxObject = new ArgMinMaxObject(_measuringColumnSchema.get(), _projectionColumnSchema.get());
+    }
+
+    List<Integer> rowIds = new ArrayList<>();
+    for (int i = 0; i < length; i++) {
+      int compareResult = argMinMaxObject.compareAndSetKey(_argMinMaxWrapperMeasuringColumnSets.get(), i, _isMax);
+      if (compareResult == 0) {
+        // same key, add the rowId to the list
+        rowIds.add(i);
+      } else if (compareResult > 0) {
+        // new key is set, clear the list and add the new rowId
+        rowIds.clear();
+        rowIds.add(i);
+      }
+    }
+
+    // for all the rows that are associated with the extremum key, add the projection columns
+    for (Integer rowId : rowIds) {
+      argMinMaxObject.addVal(_argMinMaxWrapperProjectionColumnSets.get(), rowId);
+    }
+
+    aggregationResultHolder.setValue(argMinMaxObject);
+  }
+
+  // this method is called to initialize the schemas if they are not initialized
+  // and to set the new block value sets for the wrapper classes
+  private void initializeWithNewDataBlocks(Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    if (blockValSetMap == null) {
+      initializeForEmptyDocSet();
+      return;
+    }
+
+    // if the schema is already initialized, just update with the new block value sets
+    if (_schemaInitialized.get()) {
+      for (int i = 0; i < _numMeasuringColumns; i++) {
+        _argMinMaxWrapperMeasuringColumnSets.get().get(i).setNewBlock(blockValSetMap.get(_measuringColumns.get(i)));
+      }
+      for (int i = 0; i < _numProjectionColumns; i++) {
+        _argMinMaxWrapperProjectionColumnSets.get().get(i).setNewBlock(blockValSetMap.get(_projectionColumns.get(i)));
+      }
+      return;
+    }
+    // the schema is initialized only once
+    _schemaInitialized.set(true);
+    // setup measuring column names and types
+    initializeMeasuringColumnValSet(blockValSetMap);
+    // setup projection column names and types
+    initializeProjectionColumnValSet(blockValSetMap);
+  }
+
+  private void initializeProjectionColumnValSet(Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    List<ArgMinMaxProjectionValSetWrapper> argMinMaxWrapperProjectionColumnSets =
+        _argMinMaxWrapperProjectionColumnSets.get();
+    String[] projectionColNames = new String[_projectionColumns.size()];
+    DataSchema.ColumnDataType[] projectionColTypes = new DataSchema.ColumnDataType[_projectionColumns.size()];
+    for (int i = 0; i < _projectionColumns.size(); i++) {
+      projectionColNames[i] = _projectionColumns.get(i).toString();
+      ExpressionContext projectionColumn = _projectionColumns.get(i);
+      BlockValSet blockValSet = blockValSetMap.get(projectionColumn);
+      if (blockValSet.isSingleValue()) {
+        switch (blockValSet.getValueType()) {
+          case INT:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.INT, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.INT;
+            break;
+          case BOOLEAN:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.BOOLEAN, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.INT;
+            break;
+          case LONG:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.LONG, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.LONG;
+            break;
+          case TIMESTAMP:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.TIMESTAMP, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.LONG;
+            break;
+          case FLOAT:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.FLOAT, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.FLOAT;
+            break;
+          case DOUBLE:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.DOUBLE, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.DOUBLE;
+            break;
+          case STRING:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.STRING, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.STRING;
+            break;
+          case JSON:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.JSON, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.STRING;
+            break;
+          case BYTES:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.BYTES, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.BYTES;
+            break;
+          case BIG_DECIMAL:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(true, DataSchema.ColumnDataType.BIG_DECIMAL, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.BIG_DECIMAL;
+            break;
+          default:
+            throw new IllegalStateException(
+                "Cannot compute ArgMinMax projection on non-comparable type: " + blockValSet.getValueType());
+        }
+      } else {
+        switch (blockValSet.getValueType()) {
+          case INT:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.INT_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.INT_ARRAY;
+            break;
+          case BOOLEAN:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.BOOLEAN_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.INT_ARRAY;
+            break;
+          case LONG:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.LONG_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.LONG_ARRAY;
+            break;
+          case TIMESTAMP:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.TIMESTAMP_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.LONG_ARRAY;
+            break;
+          case FLOAT:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.FLOAT_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.FLOAT_ARRAY;
+            break;
+          case DOUBLE:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.DOUBLE_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.DOUBLE_ARRAY;
+            break;
+          case STRING:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.STRING_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.STRING_ARRAY;
+            break;
+          case BYTES:
+            argMinMaxWrapperProjectionColumnSets.add(
+                new ArgMinMaxProjectionValSetWrapper(false, DataSchema.ColumnDataType.BYTES_ARRAY, blockValSet));
+            projectionColTypes[i] = DataSchema.ColumnDataType.BYTES_ARRAY;
+            break;
+          default:
+            throw new IllegalStateException(
+                "Cannot compute ArgMinMax projection on non-comparable type: " + blockValSet.getValueType());
+        }
+      }
+    }
+    // setup measuring column schema
+    _projectionColumnSchema.set(new DataSchema(projectionColNames, projectionColTypes));
+  }
+
+  private void initializeMeasuringColumnValSet(Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    List<ArgMinMaxMeasuringValSetWrapper> argMinMaxWrapperMeasuringColumnSets =
+        _argMinMaxWrapperMeasuringColumnSets.get();
+    String[] measuringColNames = new String[_numMeasuringColumns];
+    DataSchema.ColumnDataType[] measuringColTypes = new DataSchema.ColumnDataType[_numMeasuringColumns];
+    for (int i = 0; i < _numMeasuringColumns; i++) {
+      measuringColNames[i] = _measuringColumns.get(i).toString();
+      ExpressionContext measuringColumn = _measuringColumns.get(i);
+      BlockValSet blockValSet = blockValSetMap.get(measuringColumn);
+      Preconditions.checkState(blockValSet.isSingleValue(), "ArgMinMax only supports single-valued"
+          + " measuring columns");
+      switch (blockValSet.getValueType()) {
+        case INT:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.INT, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.INT;
+          break;
+        case BOOLEAN:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.BOOLEAN, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.INT;
+          break;
+        case LONG:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.LONG, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.LONG;
+          break;
+        case TIMESTAMP:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.TIMESTAMP, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.LONG;
+          break;
+        case FLOAT:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.FLOAT, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.FLOAT;
+          break;
+        case DOUBLE:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.DOUBLE, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.DOUBLE;
+          break;
+        case STRING:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.STRING, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.STRING;
+          break;
+        case BIG_DECIMAL:
+          argMinMaxWrapperMeasuringColumnSets.add(
+              new ArgMinMaxMeasuringValSetWrapper(true, DataSchema.ColumnDataType.BIG_DECIMAL, blockValSet));
+          measuringColTypes[i] = DataSchema.ColumnDataType.BIG_DECIMAL;
+          break;
+        default:
+          throw new IllegalStateException(
+              "Cannot compute ArgMinMax measuring on non-comparable type: " + blockValSet.getValueType());
+      }
+    }
+    // setup measuring column schema
+    _measuringColumnSchema.set(new DataSchema(measuringColNames, measuringColTypes));
+  }
+
+  // This method is called when the docIdSet is empty meaning that there are no rows that match the filter.
+  private void initializeForEmptyDocSet() {
+    if (_schemaInitialized.get()) {
+      return;
+    }
+    _schemaInitialized.set(true);
+    String[] measuringColNames = new String[_numMeasuringColumns];
+    DataSchema.ColumnDataType[] measuringColTypes = new DataSchema.ColumnDataType[_numMeasuringColumns];
+    for (int i = 0; i < _numMeasuringColumns; i++) {
+      measuringColNames[i] = _measuringColumns.get(i).toString();
+      measuringColTypes[i] = DataSchema.ColumnDataType.STRING;
+    }
+
+    String[] projectionColNames = new String[_numProjectionColumns];
+    DataSchema.ColumnDataType[] projectionColTypes = new DataSchema.ColumnDataType[_numProjectionColumns];
+    for (int i = 0; i < _numProjectionColumns; i++) {
+      projectionColNames[i] = _projectionColumns.get(i).toString();
+      projectionColTypes[i] = DataSchema.ColumnDataType.STRING;
+    }
+    _measuringColumnSchema.set(new DataSchema(measuringColNames, measuringColTypes));
+    _projectionColumnSchema.set(new DataSchema(projectionColNames, projectionColTypes));
+  }
+
+  @Override
+  public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    initializeWithNewDataBlocks(blockValSetMap);
+    for (int i = 0; i < length; i++) {
+      int groupKey = groupKeyArray[i];
+      updateGroupByResult(groupByResultHolder, i, groupKey);
+    }
+  }
+
+  private void updateGroupByResult(GroupByResultHolder groupByResultHolder, int i, int groupKey) {
+    ArgMinMaxObject argMinMaxObject = groupByResultHolder.getResult(groupKey);
+    if (argMinMaxObject == null) {
+      argMinMaxObject = new ArgMinMaxObject(_measuringColumnSchema.get(), _projectionColumnSchema.get());
+      groupByResultHolder.setValueForKey(groupKey, argMinMaxObject);
+    }
+    int compareResult = argMinMaxObject.compareAndSetKey(_argMinMaxWrapperMeasuringColumnSets.get(), i, _isMax);
+    if (compareResult == 0) {
+      argMinMaxObject.addVal(_argMinMaxWrapperProjectionColumnSets.get(), i);
+    } else if (compareResult > 0) {
+      argMinMaxObject.setToNewVal(_argMinMaxWrapperProjectionColumnSets.get(), i);
+    }
+  }
+
+  @Override
+  public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    initializeWithNewDataBlocks(blockValSetMap);
+    for (int i = 0; i < length; i++) {
+      for (int groupKey : groupKeysArray[i]) {
+        updateGroupByResult(groupByResultHolder, i, groupKey);
+      }
+    }
+  }
+
+  @Override
+  public ArgMinMaxObject extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
+    ArgMinMaxObject argMinMaxObject = aggregationResultHolder.getResult();
+    if (argMinMaxObject == null) {
+      initializeWithNewDataBlocks(null);
+      return new ArgMinMaxObject(_measuringColumnSchema.get(), _projectionColumnSchema.get());
+    } else {
+      return argMinMaxObject;
+    }
+  }
+
+  @Override
+  public ArgMinMaxObject extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
+    return groupByResultHolder.getResult(groupKey);
+  }
+
+  @Override
+  public ArgMinMaxObject merge(ArgMinMaxObject intermediateResult1, ArgMinMaxObject intermediateResult2) {
+    return intermediateResult1.merge(intermediateResult2, _isMax);
+  }
+
+  @Override
+  public DataSchema.ColumnDataType getIntermediateResultColumnType() {
+    return DataSchema.ColumnDataType.OBJECT;
+  }
+
+  @Override
+  public ArgMinMaxObject extractFinalResult(ArgMinMaxObject argMinMaxObject) {
+    return argMinMaxObject;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileAggregationFunction.java
index 8bfca2eefeb..5d227caeada 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileAggregationFunction.java
@@ -56,12 +56,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILE;
   }
 
-  @Override
-  public String getColumnName() {
-    return _version == 0 ? AggregationFunctionType.PERCENTILE.getName() + (int) _percentile + "_" + _expression
-        : AggregationFunctionType.PERCENTILE.getName() + _percentile + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return _version == 0 ? AggregationFunctionType.PERCENTILE.getName().toLowerCase() + (int) _percentile + "("
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstAggregationFunction.java
index ba815c47b8b..d055e465054 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstAggregationFunction.java
@@ -57,12 +57,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILEEST;
   }
 
-  @Override
-  public String getColumnName() {
-    return _version == 0 ? AggregationFunctionType.PERCENTILEEST.getName() + (int) _percentile + "_" + _expression
-        : AggregationFunctionType.PERCENTILEEST.getName() + _percentile + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return _version == 0 ? AggregationFunctionType.PERCENTILEEST.getName().toLowerCase() + (int) _percentile + "("
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstMVAggregationFunction.java
index de206a94e8f..c1001f25c7e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstMVAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileEstMVAggregationFunction.java
@@ -42,12 +42,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILEESTMV;
   }
 
-  @Override
-  public String getColumnName() {
-    return _version == 0 ? AggregationFunctionType.PERCENTILEEST.getName() + (int) _percentile + "MV_" + _expression
-        : AggregationFunctionType.PERCENTILEEST.getName() + _percentile + "MV_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return _version == 0 ? AggregationFunctionType.PERCENTILEEST.getName().toLowerCase() + (int) _percentile + "mv("
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileKLLAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileKLLAggregationFunction.java
new file mode 100644
index 00000000000..6d2b3b8697f
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileKLLAggregationFunction.java
@@ -0,0 +1,246 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import com.google.common.base.Preconditions;
+import java.util.List;
+import java.util.Map;
+import org.apache.datasketches.kll.KllDoublesSketch;
+import org.apache.datasketches.memory.Memory;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.ObjectAggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.ObjectGroupByResultHolder;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+
+
+/**
+ * <p>
+ *  {@code PercentileKLLAggregationFunction} provides an approximate percentile calculator using the KLL algorithm
+ *  from <a href="https://datasketches.apache.org/docs/KLL/KLLSketch.html">Apache DataSketches library</a>.
+ * </p>
+ * <p>
+ *  The interface is similar to plain 'Percentile' function except for the optional K value which determines
+ *  the size, hence the accuracy of the sketch.
+ * </p>
+ * <p><b>PERCENTILE_KLL(col, percentile, kValue)</b></p>
+ * <p>E.g.:</p>
+ * <ul>
+ *   <li><b>PERCENTILE_KLL(col, 90)</b></li>
+ *   <li><b>PERCENTILE_KLL(col, 99.9, 800)</b></li>
+ * </ul>
+ *
+ * <p>
+ *   If the column type is BYTES, the aggregation function will assume it is a serialized KllDoubleSketch and will
+ *   attempt to deserialize it for further processing.
+ * </p>
+ *
+ * <p>
+ *   There is a variation of the function (<b>PERCENTILE_RAW_KLL</b>) that returns the Base64 encoded
+ *   sketch object to be used externally.
+ * </p>
+ */
+public class PercentileKLLAggregationFunction
+    extends BaseSingleInputAggregationFunction<KllDoublesSketch, Comparable<?>> {
+  protected static final int DEFAULT_K_VALUE = 200;
+
+  protected final double _percentile;
+  protected int _kValue;
+
+  public PercentileKLLAggregationFunction(List<ExpressionContext> arguments) {
+    super(arguments.get(0));
+
+    // Check that there are correct number of arguments
+    int numArguments = arguments.size();
+    Preconditions.checkArgument(numArguments == 2 || numArguments == 3,
+        "Expecting 2 or 3 arguments for PercentileKLL function: PERCENTILE_KLL(column, percentile, k=200");
+
+    _percentile = arguments.get(1).getLiteral().getDoubleValue();
+    Preconditions.checkArgument(_percentile >= 0 && _percentile <= 100,
+        "Percentile value needs to be in range 0-100, inclusive");
+
+    _kValue = numArguments == 3 ? arguments.get(2).getLiteral().getIntValue() : DEFAULT_K_VALUE;
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.PERCENTILEKLL;
+  }
+
+  @Override
+  public AggregationResultHolder createAggregationResultHolder() {
+    return new ObjectAggregationResultHolder();
+  }
+
+  @Override
+  public GroupByResultHolder createGroupByResultHolder(int initialCapacity, int maxCapacity) {
+    return new ObjectGroupByResultHolder(initialCapacity, maxCapacity);
+  }
+
+  @Override
+  public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet valueSet = blockValSetMap.get(_expression);
+    DataType valueType = valueSet.getValueType();
+    KllDoublesSketch sketch = getOrCreateSketch(aggregationResultHolder);
+
+    if (valueType == DataType.BYTES) {
+      // Assuming the column contains serialized data sketch
+      KllDoublesSketch[] deserializedSketches = deserializeSketches(blockValSetMap.get(_expression).getBytesValuesSV());
+      for (int i = 0; i < length; i++) {
+        sketch.merge(deserializedSketches[i]);
+      }
+    } else {
+      double[] values = valueSet.getDoubleValuesSV();
+      for (int i = 0; i < length; i++) {
+        sketch.update(values[i]);
+      }
+    }
+  }
+
+  @Override
+  public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet valueSet = blockValSetMap.get(_expression);
+    DataType valueType = valueSet.getValueType();
+
+    if (valueType == DataType.BYTES) {
+      // serialized sketch
+      KllDoublesSketch[] deserializedSketches = deserializeSketches(blockValSetMap.get(_expression).getBytesValuesSV());
+      for (int i = 0; i < length; i++) {
+        KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKeyArray[i]);
+        sketch.merge(deserializedSketches[i]);
+      }
+    } else {
+      double[] values = valueSet.getDoubleValuesSV();
+      for (int i = 0; i < length; i++) {
+        KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKeyArray[i]);
+        sketch.update(values[i]);
+      }
+    }
+  }
+
+  @Override
+  public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet valueSet = blockValSetMap.get(_expression);
+    DataType valueType = valueSet.getValueType();
+
+    if (valueType == DataType.BYTES) {
+      // serialized sketch
+      KllDoublesSketch[] deserializedSketches = deserializeSketches(blockValSetMap.get(_expression).getBytesValuesSV());
+      for (int i = 0; i < length; i++) {
+        for (int groupKey : groupKeysArray[i]) {
+          KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKey);
+          sketch.merge(deserializedSketches[i]);
+        }
+      }
+    } else {
+      double[] values = valueSet.getDoubleValuesSV();
+      for (int i = 0; i < length; i++) {
+        for (int groupKey : groupKeysArray[i]) {
+          KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKey);
+          sketch.update(values[i]);
+        }
+      }
+    }
+  }
+
+  /**
+   * Extracts the sketch from the result holder or creates a new one if it does not exist.
+   */
+  protected KllDoublesSketch getOrCreateSketch(AggregationResultHolder aggregationResultHolder) {
+    KllDoublesSketch sketch = aggregationResultHolder.getResult();
+    if (sketch == null) {
+      sketch = KllDoublesSketch.newHeapInstance(_kValue);
+      aggregationResultHolder.setValue(sketch);
+    }
+    return sketch;
+  }
+
+  /**
+   * Extracts the sketch from the group by result holder for key
+   * or creates a new one if it does not exist.
+   */
+  protected KllDoublesSketch getOrCreateSketch(GroupByResultHolder groupByResultHolder, int groupKey) {
+    KllDoublesSketch sketch = groupByResultHolder.getResult(groupKey);
+    if (sketch == null) {
+      sketch = KllDoublesSketch.newHeapInstance(_kValue);
+      groupByResultHolder.setValueForKey(groupKey, sketch);
+    }
+    return sketch;
+  }
+
+  /**
+   * Deserializes the sketches from the bytes.
+   */
+  protected KllDoublesSketch[] deserializeSketches(byte[][] serializedSketches) {
+    KllDoublesSketch[] sketches = new KllDoublesSketch[serializedSketches.length];
+    for (int i = 0; i < serializedSketches.length; i++) {
+      sketches[i] = KllDoublesSketch.wrap(Memory.wrap(serializedSketches[i]));
+    }
+    return sketches;
+  }
+
+  @Override
+  public KllDoublesSketch extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
+    return aggregationResultHolder.getResult();
+  }
+
+  @Override
+  public KllDoublesSketch extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
+    return groupByResultHolder.getResult(groupKey);
+  }
+
+  @Override
+  public KllDoublesSketch merge(KllDoublesSketch sketch1, KllDoublesSketch sketch2) {
+    KllDoublesSketch union = KllDoublesSketch.newHeapInstance(_kValue);
+    if (sketch1 != null) {
+      union.merge(sketch1);
+    }
+    if (sketch2 != null) {
+      union.merge(sketch2);
+    }
+    return union;
+  }
+
+  @Override
+  public ColumnDataType getIntermediateResultColumnType() {
+    return ColumnDataType.OBJECT;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.DOUBLE;
+  }
+
+  @Override
+  public String getResultColumnName() {
+    return AggregationFunctionType.PERCENTILEKLL.getName().toLowerCase() + "(" + _expression + ", " + _percentile + ")";
+  }
+
+  @Override
+  public Comparable<?> extractFinalResult(KllDoublesSketch sketch) {
+    return sketch.getQuantile(_percentile / 100);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileKLLMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileKLLMVAggregationFunction.java
new file mode 100644
index 00000000000..4653e9051d3
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileKLLMVAggregationFunction.java
@@ -0,0 +1,123 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.datasketches.kll.KllDoublesSketch;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+
+
+public class PercentileKLLMVAggregationFunction extends PercentileKLLAggregationFunction {
+
+  public PercentileKLLMVAggregationFunction(List<ExpressionContext> arguments) {
+    super(arguments);
+  }
+
+  @Override
+  public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet valueSet = blockValSetMap.get(_expression);
+    DataType valueType = valueSet.getValueType();
+    KllDoublesSketch sketch = getOrCreateSketch(aggregationResultHolder);
+
+    if (valueType == DataType.BYTES) {
+      // Assuming the column contains serialized data sketches
+      KllDoublesSketch[] deserializedSketches = deserializeSketches(blockValSetMap.get(_expression).getBytesValuesSV());
+      for (int i = 0; i < length; i++) {
+        sketch.merge(deserializedSketches[i]);
+      }
+    } else {
+      double[][] values = valueSet.getDoubleValuesMV();
+      for (int i = 0; i < length; i++) {
+        for (double val : values[i]) {
+          sketch.update(val);
+        }
+      }
+    }
+  }
+
+  @Override
+  public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet valueSet = blockValSetMap.get(_expression);
+    DataType valueType = valueSet.getValueType();
+
+    if (valueType == DataType.BYTES) {
+      // serialized sketch
+      KllDoublesSketch[] deserializedSketches = deserializeSketches(blockValSetMap.get(_expression).getBytesValuesSV());
+      for (int i = 0; i < length; i++) {
+        KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKeyArray[i]);
+        sketch.merge(deserializedSketches[i]);
+      }
+    } else {
+      double[][] values = valueSet.getDoubleValuesMV();
+      for (int i = 0; i < length; i++) {
+        KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKeyArray[i]);
+        for (double val : values[i]) {
+          sketch.update(val);
+        }
+      }
+    }
+  }
+
+  @Override
+  public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResultHolder groupByResultHolder,
+      Map<ExpressionContext, BlockValSet> blockValSetMap) {
+    BlockValSet valueSet = blockValSetMap.get(_expression);
+    DataType valueType = valueSet.getValueType();
+
+    if (valueType == DataType.BYTES) {
+      // serialized sketch
+      KllDoublesSketch[] deserializedSketches = deserializeSketches(blockValSetMap.get(_expression).getBytesValuesSV());
+      for (int i = 0; i < length; i++) {
+        for (int groupKey : groupKeysArray[i]) {
+          KllDoublesSketch sketch = this.getOrCreateSketch(groupByResultHolder, groupKey);
+          sketch.merge(deserializedSketches[i]);
+        }
+      }
+    } else {
+      double[][] values = valueSet.getDoubleValuesMV();
+      for (int i = 0; i < length; i++) {
+        for (int groupKey : groupKeysArray[i]) {
+          KllDoublesSketch sketch = getOrCreateSketch(groupByResultHolder, groupKey);
+          for (double val : values[i]) {
+            sketch.update(val);
+          }
+        }
+      }
+    }
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.PERCENTILEKLLMV;
+  }
+
+  @Override
+  public String getResultColumnName() {
+    return AggregationFunctionType.PERCENTILEKLLMV.getName().toLowerCase() + "(" + _expression + ", " + _percentile
+        + ")";
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileMVAggregationFunction.java
index 33d1ff945ad..794a9896a7d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileMVAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileMVAggregationFunction.java
@@ -42,12 +42,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILEMV;
   }
 
-  @Override
-  public String getColumnName() {
-    return _version == 0 ? AggregationFunctionType.PERCENTILE.getName() + (int) _percentile + "MV_" + _expression
-        : AggregationFunctionType.PERCENTILE.getName() + _percentile + "MV_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return _version == 0 ? AggregationFunctionType.PERCENTILE.getName().toLowerCase() + (int) _percentile + "mv("
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawEstAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawEstAggregationFunction.java
index 1922d74c515..063359ec960 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawEstAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawEstAggregationFunction.java
@@ -56,15 +56,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILERAWEST;
   }
 
-  @Override
-  public String getColumnName() {
-    final double percentile = _percentileEstAggregationFunction._percentile;
-    final int version = _percentileEstAggregationFunction._version;
-    final String type = getType().getName();
-
-    return version == 0 ? type + (int) percentile + "_" + _expression : type + percentile + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     final double percentile = _percentileEstAggregationFunction._percentile;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawKLLAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawKLLAggregationFunction.java
new file mode 100644
index 00000000000..39c2022ff02
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawKLLAggregationFunction.java
@@ -0,0 +1,55 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.datasketches.kll.KllDoublesSketch;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.segment.local.customobject.SerializedKLL;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class PercentileRawKLLAggregationFunction extends PercentileKLLAggregationFunction {
+
+  public PercentileRawKLLAggregationFunction(List<ExpressionContext> arguments) {
+    super(arguments);
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.PERCENTILERAWKLL;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.STRING;
+  }
+
+  @Override
+  public String getResultColumnName() {
+    return AggregationFunctionType.PERCENTILERAWKLL.getName().toLowerCase() + "(" + _expression + ", " + _percentile
+        + ")";
+  }
+
+  @Override
+  public SerializedKLL extractFinalResult(KllDoublesSketch sketch) {
+    return new SerializedKLL(sketch, _percentile);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawKLLMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawKLLMVAggregationFunction.java
new file mode 100644
index 00000000000..80a6a3ac6b0
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawKLLMVAggregationFunction.java
@@ -0,0 +1,55 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.datasketches.kll.KllDoublesSketch;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.segment.local.customobject.SerializedKLL;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class PercentileRawKLLMVAggregationFunction extends PercentileKLLMVAggregationFunction {
+
+  public PercentileRawKLLMVAggregationFunction(List<ExpressionContext> arguments) {
+    super(arguments);
+  }
+
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.PERCENTILERAWKLLMV;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.STRING;
+  }
+
+  @Override
+  public String getResultColumnName() {
+    return AggregationFunctionType.PERCENTILERAWKLLMV.getName().toLowerCase() + "(" + _expression + ", " + _percentile
+        + ")";
+  }
+
+  @Override
+  public SerializedKLL extractFinalResult(KllDoublesSketch sketch) {
+    return new SerializedKLL(sketch, _percentile);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestAggregationFunction.java
index 0efbef2b478..99a096c1306 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestAggregationFunction.java
@@ -45,6 +45,11 @@ public PercentileRawTDigestAggregationFunction(ExpressionContext expressionConte
     this(expressionContext, new PercentileTDigestAggregationFunction(expressionContext, percentile));
   }
 
+  public PercentileRawTDigestAggregationFunction(ExpressionContext expressionContext, double percentile,
+      int compressionFactor) {
+    this(expressionContext, new PercentileTDigestAggregationFunction(expressionContext, percentile, compressionFactor));
+  }
+
   protected PercentileRawTDigestAggregationFunction(ExpressionContext expression,
       PercentileTDigestAggregationFunction percentileTDigestAggregationFunction) {
     super(expression);
@@ -56,23 +61,17 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILERAWTDIGEST;
   }
 
-  @Override
-  public String getColumnName() {
-    final double percentile = _percentileTDigestAggregationFunction._percentile;
-    final int version = _percentileTDigestAggregationFunction._version;
-    final String type = getType().getName();
-
-    return version == 0 ? type + (int) percentile + "_" + _expression : type + percentile + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     final double percentile = _percentileTDigestAggregationFunction._percentile;
+    final int compressionFactor = _percentileTDigestAggregationFunction._compressionFactor;
     final int version = _percentileTDigestAggregationFunction._version;
     final String type = getType().getName().toLowerCase();
 
     return version == 0 ? type + (int) percentile + "(" + _expression + ")"
-        : type + "(" + _expression + ", " + percentile + ")";
+        : (((compressionFactor == PercentileTDigestAggregationFunction.DEFAULT_TDIGEST_COMPRESSION))
+            ? (type + "(" + _expression + ", " + percentile + ")")
+            : (type + "(" + _expression + ", " + percentile + ", " + compressionFactor + ")"));
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestMVAggregationFunction.java
index 4cf5cbbb8fa..e6581ce478d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestMVAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileRawTDigestMVAggregationFunction.java
@@ -36,6 +36,12 @@ public PercentileRawTDigestMVAggregationFunction(ExpressionContext expressionCon
     super(expressionContext, new PercentileTDigestMVAggregationFunction(expressionContext, percentile));
   }
 
+  public PercentileRawTDigestMVAggregationFunction(ExpressionContext expressionContext, double percentile,
+      int compressionFactor) {
+    super(expressionContext,
+        new PercentileTDigestMVAggregationFunction(expressionContext, percentile, compressionFactor));
+  }
+
   @Override
   public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILERAWTDIGESTMV;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileSmartTDigestAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileSmartTDigestAggregationFunction.java
index 2697690a60e..92cd5fa09b9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileSmartTDigestAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileSmartTDigestAggregationFunction.java
@@ -60,14 +60,14 @@ public class PercentileSmartTDigestAggregationFunction extends BaseSingleInputAg
   public PercentileSmartTDigestAggregationFunction(List<ExpressionContext> arguments) {
     super(arguments.get(0));
     try {
-      _percentile = Double.parseDouble(arguments.get(1).getLiteralString());
+      _percentile = arguments.get(1).getLiteral().getDoubleValue();
     } catch (Exception e) {
       throw new IllegalArgumentException(
           "Second argument of PERCENTILE_SMART_TDIGEST aggregation function must be a double literal (percentile)");
     }
     Preconditions.checkArgument(_percentile >= 0 && _percentile <= 100, "Invalid percentile: %s", _percentile);
     if (arguments.size() > 2) {
-      Parameters parameters = new Parameters(arguments.get(2).getLiteralString());
+      Parameters parameters = new Parameters(arguments.get(2).getLiteral().getStringValue());
       _compression = parameters._compression;
       _threshold = parameters._threshold;
     } else {
@@ -93,11 +93,6 @@ public AggregationFunctionType getType() {
     return AggregationFunctionType.PERCENTILESMARTTDIGEST;
   }
 
-  @Override
-  public String getColumnName() {
-    return AggregationFunctionType.PERCENTILESMARTTDIGEST.getName() + _percentile + "_" + _expression;
-  }
-
   @Override
   public String getResultColumnName() {
     return AggregationFunctionType.PERCENTILESMARTTDIGEST.getName().toLowerCase() + "(" + _expression + ", "
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestAggregationFunction.java
index 9ba51013393..d4224739c6e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestAggregationFunction.java
@@ -34,44 +34,57 @@
 
 /**
  * TDigest based Percentile aggregation function.
+ *
+ * TODO: Decided not to support custom compression for version 0 queries as it seems to be the older syntax and requires
+ *       extra handling for two argument PERCENTILE functions to assess if v0 or v1. This can be revisited later if the
+ *       need arises
  */
 public class PercentileTDigestAggregationFunction extends BaseSingleInputAggregationFunction<TDigest, Double> {
   public static final int DEFAULT_TDIGEST_COMPRESSION = 100;
 
-  //version 0 functions specified in the of form PERCENTILETDIGEST<2-digits>(column)
-  //version 1 functions of form PERCENTILETDIGEST(column, <2-digits>.<16-digits>)
+  // version 0 functions specified in the of form PERCENTILETDIGEST<2-digits>(column). Uses default compression of 100
+  // version 1 functions of form PERCENTILETDIGEST(column, <2-digits>.<16-digits>, <n-digits> [optional])
   protected final int _version;
   protected final double _percentile;
+  protected final int _compressionFactor;
 
   public PercentileTDigestAggregationFunction(ExpressionContext expression, int percentile) {
     super(expression);
     _version = 0;
     _percentile = percentile;
+    _compressionFactor = DEFAULT_TDIGEST_COMPRESSION;
   }
 
   public PercentileTDigestAggregationFunction(ExpressionContext expression, double percentile) {
     super(expression);
     _version = 1;
     _percentile = percentile;
+    _compressionFactor = DEFAULT_TDIGEST_COMPRESSION;
   }
 
-  @Override
-  public AggregationFunctionType getType() {
-    return AggregationFunctionType.PERCENTILETDIGEST;
+  public PercentileTDigestAggregationFunction(ExpressionContext expression, double percentile,
+      int compressionFactor) {
+    super(expression);
+    _version = 1;
+    _percentile = percentile;
+    _compressionFactor = compressionFactor;
   }
 
   @Override
-  public String getColumnName() {
-    return _version == 0 ? AggregationFunctionType.PERCENTILETDIGEST.getName() + (int) _percentile + "_" + _expression
-        : AggregationFunctionType.PERCENTILETDIGEST.getName() + _percentile + "_" + _expression;
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.PERCENTILETDIGEST;
   }
 
   @Override
   public String getResultColumnName() {
     return _version == 0 ? AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + (int) _percentile + "("
         + _expression + ")"
-        : AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + "(" + _expression + ", " + _percentile
-            + ")";
+        : ((_compressionFactor == DEFAULT_TDIGEST_COMPRESSION)
+            ? (AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + "(" + _expression + ", "
+                + _percentile + ")")
+            : (AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + "(" + _expression + ", "
+                + _percentile + ", " + _compressionFactor + ")")
+            );
   }
 
   @Override
@@ -90,7 +103,7 @@ public void aggregate(int length, AggregationResultHolder aggregationResultHolde
     BlockValSet blockValSet = blockValSetMap.get(_expression);
     if (blockValSet.getValueType() != DataType.BYTES) {
       double[] doubleValues = blockValSet.getDoubleValuesSV();
-      TDigest tDigest = getDefaultTDigest(aggregationResultHolder);
+      TDigest tDigest = getDefaultTDigest(aggregationResultHolder, _compressionFactor);
       for (int i = 0; i < length; i++) {
         tDigest.add(doubleValues[i]);
       }
@@ -119,7 +132,7 @@ public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHol
     if (blockValSet.getValueType() != DataType.BYTES) {
       double[] doubleValues = blockValSet.getDoubleValuesSV();
       for (int i = 0; i < length; i++) {
-        getDefaultTDigest(groupByResultHolder, groupKeyArray[i]).add(doubleValues[i]);
+        getDefaultTDigest(groupByResultHolder, groupKeyArray[i], _compressionFactor).add(doubleValues[i]);
       }
     } else {
       // Serialized TDigest
@@ -146,7 +159,7 @@ public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResult
       for (int i = 0; i < length; i++) {
         double value = doubleValues[i];
         for (int groupKey : groupKeysArray[i]) {
-          getDefaultTDigest(groupByResultHolder, groupKey).add(value);
+          getDefaultTDigest(groupByResultHolder, groupKey, _compressionFactor).add(value);
         }
       }
     } else {
@@ -171,7 +184,7 @@ public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResult
   public TDigest extractAggregationResult(AggregationResultHolder aggregationResultHolder) {
     TDigest tDigest = aggregationResultHolder.getResult();
     if (tDigest == null) {
-      return TDigest.createMergingDigest(DEFAULT_TDIGEST_COMPRESSION);
+      return TDigest.createMergingDigest(_compressionFactor);
     } else {
       return tDigest;
     }
@@ -181,7 +194,7 @@ public TDigest extractAggregationResult(AggregationResultHolder aggregationResul
   public TDigest extractGroupByResult(GroupByResultHolder groupByResultHolder, int groupKey) {
     TDigest tDigest = groupByResultHolder.getResult(groupKey);
     if (tDigest == null) {
-      return TDigest.createMergingDigest(DEFAULT_TDIGEST_COMPRESSION);
+      return TDigest.createMergingDigest(_compressionFactor);
     } else {
       return tDigest;
     }
@@ -218,12 +231,13 @@ public Double extractFinalResult(TDigest intermediateResult) {
    * Returns the TDigest from the result holder or creates a new one with default compression if it does not exist.
    *
    * @param aggregationResultHolder Result holder
+   * @param compressionFactor Compression factor to use for the TDigest
    * @return TDigest from the result holder
    */
-  protected static TDigest getDefaultTDigest(AggregationResultHolder aggregationResultHolder) {
+  protected static TDigest getDefaultTDigest(AggregationResultHolder aggregationResultHolder, int compressionFactor) {
     TDigest tDigest = aggregationResultHolder.getResult();
     if (tDigest == null) {
-      tDigest = TDigest.createMergingDigest(DEFAULT_TDIGEST_COMPRESSION);
+      tDigest = TDigest.createMergingDigest(compressionFactor);
       aggregationResultHolder.setValue(tDigest);
     }
     return tDigest;
@@ -234,12 +248,14 @@ protected static TDigest getDefaultTDigest(AggregationResultHolder aggregationRe
    *
    * @param groupByResultHolder Result holder
    * @param groupKey Group key for which to return the TDigest
+   * @param compressionFactor Compression factor to use for the TDigest
    * @return TDigest for the group key
    */
-  protected static TDigest getDefaultTDigest(GroupByResultHolder groupByResultHolder, int groupKey) {
+  protected static TDigest getDefaultTDigest(GroupByResultHolder groupByResultHolder, int groupKey,
+      int compressionFactor) {
     TDigest tDigest = groupByResultHolder.getResult(groupKey);
     if (tDigest == null) {
-      tDigest = TDigest.createMergingDigest(DEFAULT_TDIGEST_COMPRESSION);
+      tDigest = TDigest.createMergingDigest(compressionFactor);
       groupByResultHolder.setValueForKey(groupKey, tDigest);
     }
     return tDigest;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestMVAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestMVAggregationFunction.java
index 122748a2e52..571f2ae9126 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestMVAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/PercentileTDigestMVAggregationFunction.java
@@ -37,30 +37,32 @@ public PercentileTDigestMVAggregationFunction(ExpressionContext expression, doub
     super(expression, percentile);
   }
 
-  @Override
-  public AggregationFunctionType getType() {
-    return AggregationFunctionType.PERCENTILETDIGESTMV;
+  public PercentileTDigestMVAggregationFunction(ExpressionContext expression, double percentile,
+      int compressionFactor) {
+    super(expression, percentile, compressionFactor);
   }
 
   @Override
-  public String getColumnName() {
-    return _version == 0 ? AggregationFunctionType.PERCENTILETDIGEST.getName() + (int) _percentile + "MV_" + _expression
-        : AggregationFunctionType.PERCENTILETDIGEST.getName() + _percentile + "MV_" + _expression;
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.PERCENTILETDIGESTMV;
   }
 
   @Override
   public String getResultColumnName() {
     return _version == 0 ? AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + (int) _percentile + "mv("
         + _expression + ")"
-        : AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + "mv(" + _expression + ", " + _percentile
-            + ")";
+        : ((_compressionFactor == PercentileTDigestAggregationFunction.DEFAULT_TDIGEST_COMPRESSION)
+            ? (AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + "mv(" + _expression + ", "
+                + _percentile + ")")
+            : (AggregationFunctionType.PERCENTILETDIGEST.getName().toLowerCase() + "mv(" + _expression + ", "
+                + _percentile + ", " + _compressionFactor + ")"));
   }
 
   @Override
   public void aggregate(int length, AggregationResultHolder aggregationResultHolder,
       Map<ExpressionContext, BlockValSet> blockValSetMap) {
     double[][] valuesArray = blockValSetMap.get(_expression).getDoubleValuesMV();
-    TDigest tDigest = getDefaultTDigest(aggregationResultHolder);
+    TDigest tDigest = getDefaultTDigest(aggregationResultHolder, _compressionFactor);
     for (int i = 0; i < length; i++) {
       for (double value : valuesArray[i]) {
         tDigest.add(value);
@@ -73,7 +75,7 @@ public void aggregateGroupBySV(int length, int[] groupKeyArray, GroupByResultHol
       Map<ExpressionContext, BlockValSet> blockValSetMap) {
     double[][] valuesArray = blockValSetMap.get(_expression).getDoubleValuesMV();
     for (int i = 0; i < length; i++) {
-      TDigest tDigest = getDefaultTDigest(groupByResultHolder, groupKeyArray[i]);
+      TDigest tDigest = getDefaultTDigest(groupByResultHolder, groupKeyArray[i], _compressionFactor);
       for (double value : valuesArray[i]) {
         tDigest.add(value);
       }
@@ -87,7 +89,7 @@ public void aggregateGroupByMV(int length, int[][] groupKeysArray, GroupByResult
     for (int i = 0; i < length; i++) {
       double[] values = valuesArray[i];
       for (int groupKey : groupKeysArray[i]) {
-        TDigest tDigest = getDefaultTDigest(groupByResultHolder, groupKey);
+        TDigest tDigest = getDefaultTDigest(groupByResultHolder, groupKey, _compressionFactor);
         for (double value : values) {
           tDigest.add(value);
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumPrecisionAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumPrecisionAggregationFunction.java
index 2656389822f..5734a499073 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumPrecisionAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumPrecisionAggregationFunction.java
@@ -57,9 +57,9 @@ public SumPrecisionAggregationFunction(List<ExpressionContext> arguments, boolea
     int numArguments = arguments.size();
     Preconditions.checkArgument(numArguments <= 3, "SumPrecision expects at most 3 arguments, got: %s", numArguments);
     if (numArguments > 1) {
-      _precision = Integer.valueOf(arguments.get(1).getLiteralString());
+      _precision = arguments.get(1).getLiteral().getIntValue();
       if (numArguments > 2) {
-        _scale = Integer.valueOf(arguments.get(2).getLiteralString());
+        _scale = arguments.get(2).getLiteral().getIntValue();
       } else {
         _scale = null;
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumValuesIntegerTupleSketchAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumValuesIntegerTupleSketchAggregationFunction.java
new file mode 100644
index 00000000000..33f746a1da2
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/SumValuesIntegerTupleSketchAggregationFunction.java
@@ -0,0 +1,64 @@
+/**
+ * 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.pinot.core.query.aggregation.function;
+
+import java.util.List;
+import org.apache.datasketches.tuple.CompactSketch;
+import org.apache.datasketches.tuple.TupleSketchIterator;
+import org.apache.datasketches.tuple.Union;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+
+
+public class SumValuesIntegerTupleSketchAggregationFunction extends IntegerTupleSketchAggregationFunction {
+
+  public SumValuesIntegerTupleSketchAggregationFunction(List<ExpressionContext> arguments, IntegerSummary.Mode mode) {
+    super(arguments, mode);
+  }
+
+  // TODO if extra aggregation modes are supported, make this switch
+  @Override
+  public AggregationFunctionType getType() {
+    return AggregationFunctionType.SUMVALUESINTEGERSUMTUPLESKETCH;
+  }
+
+  @Override
+  public ColumnDataType getFinalResultColumnType() {
+    return ColumnDataType.LONG;
+  }
+
+  @Override
+  public Comparable extractFinalResult(List<CompactSketch<IntegerSummary>> integerSummarySketches) {
+    if (integerSummarySketches == null) {
+      return null;
+    }
+    Union<IntegerSummary> union = new Union<>(_entries, _setOps);
+    integerSummarySketches.forEach(union::union);
+    double retainedTotal = 0L;
+    CompactSketch<IntegerSummary> result = union.getResult();
+    TupleSketchIterator<IntegerSummary> summaries = result.iterator();
+    while (summaries.next()) {
+      retainedTotal += summaries.getSummary().getValue();
+    }
+    double estimate = retainedTotal / result.getTheta();
+    return Math.round(estimate);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DefaultGroupByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DefaultGroupByExecutor.java
index 38ebd3706cb..133385a5245 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DefaultGroupByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DefaultGroupByExecutor.java
@@ -25,9 +25,9 @@
 import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.IntermediateRecord;
 import org.apache.pinot.core.data.table.TableResizer;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
@@ -60,25 +60,17 @@ public class DefaultGroupByExecutor implements GroupByExecutor {
   protected final int[][] _mvGroupKeys;
 
   public DefaultGroupByExecutor(QueryContext queryContext, ExpressionContext[] groupByExpressions,
-      TransformOperator transformOperator) {
-    this(queryContext, queryContext.getAggregationFunctions(), groupByExpressions, transformOperator, null);
+      BaseProjectOperator<?> projectOperator) {
+    this(queryContext, queryContext.getAggregationFunctions(), groupByExpressions, projectOperator, null);
   }
 
   public DefaultGroupByExecutor(QueryContext queryContext, AggregationFunction[] aggregationFunctions,
-      ExpressionContext[] groupByExpressions, TransformOperator transformOperator) {
-    this(queryContext, aggregationFunctions, groupByExpressions, transformOperator, null);
+      ExpressionContext[] groupByExpressions, BaseProjectOperator<?> projectOperator) {
+    this(queryContext, aggregationFunctions, groupByExpressions, projectOperator, null);
   }
 
-  /**
-   * Constructor for the class.
-   *
-   * @param queryContext Query context
-   * @param aggregationFunctions Aggregation functions
-   * @param groupByExpressions Array of group-by expressions
-   * @param transformOperator Transform operator
-   */
   public DefaultGroupByExecutor(QueryContext queryContext, AggregationFunction[] aggregationFunctions,
-      ExpressionContext[] groupByExpressions, TransformOperator transformOperator,
+      ExpressionContext[] groupByExpressions, BaseProjectOperator<?> projectOperator,
       @Nullable GroupKeyGenerator groupKeyGenerator) {
     _aggregationFunctions = aggregationFunctions;
     assert _aggregationFunctions != null;
@@ -87,9 +79,9 @@ public DefaultGroupByExecutor(QueryContext queryContext, AggregationFunction[] a
     boolean hasMVGroupByExpression = false;
     boolean hasNoDictionaryGroupByExpression = false;
     for (ExpressionContext groupByExpression : groupByExpressions) {
-      TransformResultMetadata transformResultMetadata = transformOperator.getResultMetadata(groupByExpression);
-      hasMVGroupByExpression |= !transformResultMetadata.isSingleValue();
-      hasNoDictionaryGroupByExpression |= !transformResultMetadata.hasDictionary();
+      ColumnContext columnContext = projectOperator.getResultColumnContext(groupByExpression);
+      hasMVGroupByExpression |= !columnContext.isSingleValue();
+      hasNoDictionaryGroupByExpression |= columnContext.getDictionary() == null;
     }
     _hasMVGroupByExpression = hasMVGroupByExpression;
 
@@ -103,14 +95,15 @@ public DefaultGroupByExecutor(QueryContext queryContext, AggregationFunction[] a
         if (groupByExpressions.length == 1) {
           // TODO(nhejazi): support MV and dictionary based when null handling is enabled.
           _groupKeyGenerator =
-              new NoDictionarySingleColumnGroupKeyGenerator(transformOperator, groupByExpressions[0], numGroupsLimit,
+              new NoDictionarySingleColumnGroupKeyGenerator(projectOperator, groupByExpressions[0], numGroupsLimit,
                   _nullHandlingEnabled);
         } else {
           _groupKeyGenerator =
-              new NoDictionaryMultiColumnGroupKeyGenerator(transformOperator, groupByExpressions, numGroupsLimit);
+              new NoDictionaryMultiColumnGroupKeyGenerator(projectOperator, groupByExpressions, numGroupsLimit,
+                  _nullHandlingEnabled);
         }
       } else {
-        _groupKeyGenerator = new DictionaryBasedGroupKeyGenerator(transformOperator, groupByExpressions, numGroupsLimit,
+        _groupKeyGenerator = new DictionaryBasedGroupKeyGenerator(projectOperator, groupByExpressions, numGroupsLimit,
             maxInitialResultHolderCapacity);
       }
     }
@@ -135,29 +128,29 @@ public DefaultGroupByExecutor(QueryContext queryContext, AggregationFunction[] a
   }
 
   @Override
-  public void process(TransformBlock transformBlock) {
+  public void process(ValueBlock valueBlock) {
     // Generate group keys
     // NOTE: groupKeyGenerator will limit the number of groups. Once reaching limit, no new group will be generated
     if (_hasMVGroupByExpression) {
-      _groupKeyGenerator.generateKeysForBlock(transformBlock, _mvGroupKeys);
+      _groupKeyGenerator.generateKeysForBlock(valueBlock, _mvGroupKeys);
     } else {
-      _groupKeyGenerator.generateKeysForBlock(transformBlock, _svGroupKeys);
+      _groupKeyGenerator.generateKeysForBlock(valueBlock, _svGroupKeys);
     }
 
     int capacityNeeded = _groupKeyGenerator.getCurrentGroupKeyUpperBound();
-    int length = transformBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
     int numAggregationFunctions = _aggregationFunctions.length;
     for (int i = 0; i < numAggregationFunctions; i++) {
       GroupByResultHolder groupByResultHolder = _groupByResultHolders[i];
       groupByResultHolder.ensureCapacity(capacityNeeded);
-      aggregate(transformBlock, length, i);
+      aggregate(valueBlock, length, i);
     }
   }
 
-  protected void aggregate(TransformBlock transformBlock, int length, int functionIndex) {
+  protected void aggregate(ValueBlock valueBlock, int length, int functionIndex) {
     AggregationFunction aggregationFunction = _aggregationFunctions[functionIndex];
     Map<ExpressionContext, BlockValSet> blockValSetMap =
-        AggregationFunctionUtils.getBlockValSetMap(aggregationFunction, transformBlock);
+        AggregationFunctionUtils.getBlockValSetMap(aggregationFunction, valueBlock);
     GroupByResultHolder groupByResultHolder = _groupByResultHolders[functionIndex];
     if (_hasMVGroupByExpression) {
       aggregationFunction.aggregateGroupByMV(length, _mvGroupKeys, groupByResultHolder, blockValSetMap);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGenerator.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGenerator.java
index ca431545343..8650ccad9ba 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGenerator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGenerator.java
@@ -29,8 +29,9 @@
 import java.util.Iterator;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 
 
@@ -97,8 +98,8 @@ public class DictionaryBasedGroupKeyGenerator implements GroupKeyGenerator {
   private final int _globalGroupIdUpperBound;
   private final RawKeyHolder _rawKeyHolder;
 
-  public DictionaryBasedGroupKeyGenerator(TransformOperator transformOperator, ExpressionContext[] groupByExpressions,
-      int numGroupsLimit, int arrayBasedThreshold) {
+  public DictionaryBasedGroupKeyGenerator(BaseProjectOperator<?> projectOperator,
+      ExpressionContext[] groupByExpressions, int numGroupsLimit, int arrayBasedThreshold) {
     assert numGroupsLimit >= arrayBasedThreshold;
 
     _groupByExpressions = groupByExpressions;
@@ -117,7 +118,9 @@ public DictionaryBasedGroupKeyGenerator(TransformOperator transformOperator, Exp
     boolean longOverflow = false;
     for (int i = 0; i < _numGroupByExpressions; i++) {
       ExpressionContext groupByExpression = groupByExpressions[i];
-      _dictionaries[i] = transformOperator.getDictionary(groupByExpression);
+      ColumnContext columnContext = projectOperator.getResultColumnContext(groupByExpression);
+      _dictionaries[i] = columnContext.getDictionary();
+      assert _dictionaries[i] != null;
       int cardinality = _dictionaries[i].length();
       _cardinalities[i] = cardinality;
       if (_internedDictionaryValues != null && cardinality < MAX_DICTIONARY_INTERN_TABLE_SIZE) {
@@ -130,8 +133,7 @@ public DictionaryBasedGroupKeyGenerator(TransformOperator transformOperator, Exp
           cardinalityProduct *= cardinality;
         }
       }
-
-      _isSingleValueColumn[i] = transformOperator.getResultMetadata(groupByExpression).isSingleValue();
+      _isSingleValueColumn[i] = columnContext.isSingleValue();
     }
     // TODO: Clear the holder after processing the query instead of before
     if (longOverflow) {
@@ -175,28 +177,27 @@ public int getGlobalGroupKeyUpperBound() {
   }
 
   @Override
-  public void generateKeysForBlock(TransformBlock transformBlock, int[] groupKeys) {
+  public void generateKeysForBlock(ValueBlock valueBlock, int[] groupKeys) {
     // Fetch dictionary ids in the given block for all group-by columns
     for (int i = 0; i < _numGroupByExpressions; i++) {
-      BlockValSet blockValueSet = transformBlock.getBlockValueSet(_groupByExpressions[i]);
+      BlockValSet blockValueSet = valueBlock.getBlockValueSet(_groupByExpressions[i]);
       _singleValueDictIds[i] = blockValueSet.getDictionaryIdsSV();
     }
-    _rawKeyHolder.processSingleValue(transformBlock.getNumDocs(), groupKeys);
+    _rawKeyHolder.processSingleValue(valueBlock.getNumDocs(), groupKeys);
   }
 
   @Override
-  public void generateKeysForBlock(TransformBlock transformBlock, int[][] groupKeys) {
+  public void generateKeysForBlock(ValueBlock valueBlock, int[][] groupKeys) {
     // Fetch dictionary ids in the given block for all group-by columns
     for (int i = 0; i < _numGroupByExpressions; i++) {
-      BlockValSet blockValueSet = transformBlock.getBlockValueSet(_groupByExpressions[i]);
+      BlockValSet blockValueSet = valueBlock.getBlockValueSet(_groupByExpressions[i]);
       if (_isSingleValueColumn[i]) {
         _singleValueDictIds[i] = blockValueSet.getDictionaryIdsSV();
       } else {
         _multiValueDictIds[i] = blockValueSet.getDictionaryIdsMV();
       }
     }
-
-    _rawKeyHolder.processMultiValue(transformBlock.getNumDocs(), groupKeys);
+    _rawKeyHolder.processMultiValue(valueBlock.getNumDocs(), groupKeys);
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DummyAggregationResultHolder.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DummyAggregationResultHolder.java
new file mode 100644
index 00000000000..545cd7973cc
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DummyAggregationResultHolder.java
@@ -0,0 +1,55 @@
+/**
+ * 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.pinot.core.query.aggregation.groupby;
+
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+
+
+/**
+ * Placeholder AggregationResultHolder that does noop
+ * This is used for ChildAggregationFunction
+ */
+public class DummyAggregationResultHolder implements AggregationResultHolder {
+  @Override
+  public void setValue(double value) {
+  }
+
+  @Override
+  public void setValue(int value) {
+  }
+
+  @Override
+  public void setValue(Object value) {
+  }
+
+  @Override
+  public double getDoubleResult() {
+    return 0;
+  }
+
+  @Override
+  public int getIntResult() {
+    return 0;
+  }
+
+  @Override
+  public <T> T getResult() {
+    return null;
+  }
+}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/TextComparator.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DummyGroupByResultHolder.java
similarity index 53%
rename from pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/TextComparator.java
rename to pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DummyGroupByResultHolder.java
index 4def5bd72c8..f76e8967cfd 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/TextComparator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/DummyGroupByResultHolder.java
@@ -16,27 +16,41 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.hadoop.utils.preprocess;
+package org.apache.pinot.core.query.aggregation.groupby;
 
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.WritableComparator;
-import org.apache.hadoop.io.WritableUtils;
+/**
+ * Placeholder GroupByResultHolder that does noop
+ * This is used for ChildAggregationFunction
+ */
+public class DummyGroupByResultHolder implements GroupByResultHolder {
+  @Override
+  public void setValueForKey(int groupKey, double value) {
+  }
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+  @Override
+  public void setValueForKey(int groupKey, int value) {
+  }
 
+  @Override
+  public void setValueForKey(int groupKey, Object value) {
+  }
 
-/**
- * Override the Text comparison logic to compare with the decoded String instead of the byte array.
- */
-public class TextComparator extends WritableComparator {
-  public TextComparator() {
-    super(Text.class);
+  @Override
+  public double getDoubleResult(int groupKey) {
+    return 0;
+  }
+
+  @Override
+  public int getIntResult(int groupKey) {
+    return 0;
+  }
+
+  @Override
+  public <T> T getResult(int groupKey) {
+    return null;
   }
 
   @Override
-  public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
-    int n1 = WritableUtils.decodeVIntSize(b1[s1]);
-    int n2 = WritableUtils.decodeVIntSize(b2[s2]);
-    return new String(b1, s1 + n1, l1 - n1, UTF_8).compareTo(new String(b2, s2 + n2, l2 - n2, UTF_8));
+  public void ensureCapacity(int capacity) {
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupByExecutor.java
index db5ff16b182..8c5524ec457 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupByExecutor.java
@@ -21,7 +21,7 @@
 import java.util.Collection;
 import org.apache.pinot.core.data.table.IntermediateRecord;
 import org.apache.pinot.core.data.table.TableResizer;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 
 
 /**
@@ -30,11 +30,9 @@
 public interface GroupByExecutor {
 
   /**
-   * Performs the group-by aggregation on the given transform block.
-   *
-   * @param transformBlock Transform block
+   * Performs the group-by aggregation on the given value block.
    */
-  void process(TransformBlock transformBlock);
+  void process(ValueBlock valueBlock);
 
   /**
    * Returns the result of group-by aggregation.
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupKeyGenerator.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupKeyGenerator.java
index 66332b5ad00..393610b4a38 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupKeyGenerator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/GroupKeyGenerator.java
@@ -19,7 +19,7 @@
 package org.apache.pinot.core.query.aggregation.groupby;
 
 import java.util.Iterator;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 
 
 /**
@@ -39,22 +39,22 @@ public interface GroupKeyGenerator {
   int getGlobalGroupKeyUpperBound();
 
   /**
-   * Generates group keys on the given transform block and returns the result to the given buffer.
+   * Generates group keys on the given value block and returns the result to the given buffer.
    * <p>This method is for situation where all the group-by columns are single-valued.
    *
-   * @param transformBlock Transform block
-   * @param groupKeys Buffer to return the results
+   * @param valueBlock Value block
+   * @param groupKeys  Buffer to return the results
    */
-  void generateKeysForBlock(TransformBlock transformBlock, int[] groupKeys);
+  void generateKeysForBlock(ValueBlock valueBlock, int[] groupKeys);
 
   /**
-   * Generate group keys on the given transform block and returns the result to the given buffer.
+   * Generate group keys on the given value block and returns the result to the given buffer.
    * <p>This method is for situation where at least one group-by columns are multi-valued.
    *
-   * @param transformBlock Transform block
-   * @param groupKeys Buffer to return the results
+   * @param valueBlock Value block
+   * @param groupKeys  Buffer to return the results
    */
-  void generateKeysForBlock(TransformBlock transformBlock, int[][] groupKeys);
+  void generateKeysForBlock(ValueBlock valueBlock, int[][] groupKeys);
 
   /**
    * Get the current upper bound of the group key. All group keys already generated should be less than this value. This
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryMultiColumnGroupKeyGenerator.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryMultiColumnGroupKeyGenerator.java
index e209eab404a..91becf3bbee 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryMultiColumnGroupKeyGenerator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryMultiColumnGroupKeyGenerator.java
@@ -26,15 +26,16 @@
 import java.util.Iterator;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.aggregation.groupby.utils.ValueToIdMap;
 import org.apache.pinot.core.query.aggregation.groupby.utils.ValueToIdMapFactory;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.apache.pinot.spi.utils.FixedIntArray;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -47,6 +48,8 @@
  * 2. Add support for trimming group-by results.
  */
 public class NoDictionaryMultiColumnGroupKeyGenerator implements GroupKeyGenerator {
+  private static final int ID_FOR_NULL = INVALID_ID - 1;
+
   private final ExpressionContext[] _groupByExpressions;
   private final int _numGroupByExpressions;
   private final DataType[] _storedTypes;
@@ -55,28 +58,31 @@ public class NoDictionaryMultiColumnGroupKeyGenerator implements GroupKeyGenerat
   private final Object2IntOpenHashMap<FixedIntArray> _groupKeyMap;
   private final boolean[] _isSingleValueExpressions;
   private final int _globalGroupIdUpperBound;
+  private final boolean _nullHandlingEnabled;
 
   private int _numGroups = 0;
 
-  public NoDictionaryMultiColumnGroupKeyGenerator(TransformOperator transformOperator,
-      ExpressionContext[] groupByExpressions, int numGroupsLimit) {
+  public NoDictionaryMultiColumnGroupKeyGenerator(BaseProjectOperator<?> projectOperator,
+      ExpressionContext[] groupByExpressions, int numGroupsLimit, boolean nullHandlingEnabled) {
     _groupByExpressions = groupByExpressions;
     _numGroupByExpressions = groupByExpressions.length;
     _storedTypes = new DataType[_numGroupByExpressions];
     _dictionaries = new Dictionary[_numGroupByExpressions];
     _onTheFlyDictionaries = new ValueToIdMap[_numGroupByExpressions];
     _isSingleValueExpressions = new boolean[_numGroupByExpressions];
+    _nullHandlingEnabled = nullHandlingEnabled;
 
     for (int i = 0; i < _numGroupByExpressions; i++) {
       ExpressionContext groupByExpression = groupByExpressions[i];
-      TransformResultMetadata transformResultMetadata = transformOperator.getResultMetadata(groupByExpression);
-      _storedTypes[i] = transformResultMetadata.getDataType().getStoredType();
-      if (transformResultMetadata.hasDictionary()) {
-        _dictionaries[i] = transformOperator.getDictionary(groupByExpression);
+      ColumnContext columnContext = projectOperator.getResultColumnContext(groupByExpression);
+      _storedTypes[i] = columnContext.getDataType().getStoredType();
+      Dictionary dictionary = _nullHandlingEnabled ? null : columnContext.getDictionary();
+      if (dictionary != null) {
+        _dictionaries[i] = dictionary;
       } else {
         _onTheFlyDictionaries[i] = ValueToIdMapFactory.get(_storedTypes[i]);
       }
-      _isSingleValueExpressions[i] = transformResultMetadata.isSingleValue();
+      _isSingleValueExpressions[i] = columnContext.isSingleValue();
     }
 
     _groupKeyMap = new Object2IntOpenHashMap<>();
@@ -90,11 +96,11 @@ public int getGlobalGroupKeyUpperBound() {
   }
 
   @Override
-  public void generateKeysForBlock(TransformBlock transformBlock, int[] groupKeys) {
-    int numDocs = transformBlock.getNumDocs();
+  public void generateKeysForBlock(ValueBlock valueBlock, int[] groupKeys) {
+    int numDocs = valueBlock.getNumDocs();
     Object[] values = new Object[_numGroupByExpressions];
     for (int i = 0; i < _numGroupByExpressions; i++) {
-      BlockValSet blockValSet = transformBlock.getBlockValueSet(_groupByExpressions[i]);
+      BlockValSet blockValSet = valueBlock.getBlockValueSet(_groupByExpressions[i]);
       if (_dictionaries[i] != null) {
         values[i] = blockValSet.getDictionaryIdsSV();
       } else {
@@ -125,38 +131,69 @@ public void generateKeysForBlock(TransformBlock transformBlock, int[] groupKeys)
     int[] keyValues = new int[_numGroupByExpressions];
     // note that we are mutating its backing array for memory efficiency
     FixedIntArray flyweightKey = new FixedIntArray(keyValues);
-    for (int row = 0; row < numDocs; row++) {
-      for (int col = 0; col < _numGroupByExpressions; col++) {
-        Object columnValues = values[col];
-        ValueToIdMap onTheFlyDictionary = _onTheFlyDictionaries[col];
-        if (columnValues instanceof int[]) {
-          if (onTheFlyDictionary == null) {
-            keyValues[col] = ((int[]) columnValues)[row];
+    if (_nullHandlingEnabled) {
+      RoaringBitmap[] nullBitmaps = new RoaringBitmap[_numGroupByExpressions];
+      for (int i = 0; i < _numGroupByExpressions; i++) {
+        nullBitmaps[i] = valueBlock.getBlockValueSet(_groupByExpressions[i]).getNullBitmap();
+      }
+      for (int row = 0; row < numDocs; row++) {
+        for (int col = 0; col < _numGroupByExpressions; col++) {
+          if (nullBitmaps[col] != null && nullBitmaps[col].contains(row)) {
+            keyValues[col] = ID_FOR_NULL;
           } else {
-            keyValues[col] = onTheFlyDictionary.put(((int[]) columnValues)[row]);
+            Object columnValues = values[col];
+            ValueToIdMap onTheFlyDictionary = _onTheFlyDictionaries[col];
+            if (columnValues instanceof int[]) {
+              keyValues[col] = onTheFlyDictionary.put(((int[]) columnValues)[row]);
+            } else if (columnValues instanceof long[]) {
+              keyValues[col] = onTheFlyDictionary.put(((long[]) columnValues)[row]);
+            } else if (columnValues instanceof float[]) {
+              keyValues[col] = onTheFlyDictionary.put(((float[]) columnValues)[row]);
+            } else if (columnValues instanceof double[]) {
+              keyValues[col] = onTheFlyDictionary.put(((double[]) columnValues)[row]);
+            } else if (columnValues instanceof String[]) {
+              keyValues[col] = onTheFlyDictionary.put(((String[]) columnValues)[row]);
+            } else if (columnValues instanceof byte[][]) {
+              keyValues[col] = onTheFlyDictionary.put(new ByteArray(((byte[][]) columnValues)[row]));
+            }
+          }
+        }
+        groupKeys[row] = getGroupIdForFlyweightKey(flyweightKey);
+      }
+    } else {
+      for (int row = 0; row < numDocs; row++) {
+        for (int col = 0; col < _numGroupByExpressions; col++) {
+          Object columnValues = values[col];
+          ValueToIdMap onTheFlyDictionary = _onTheFlyDictionaries[col];
+          if (columnValues instanceof int[]) {
+            if (onTheFlyDictionary == null) {
+              keyValues[col] = ((int[]) columnValues)[row];
+            } else {
+              keyValues[col] = onTheFlyDictionary.put(((int[]) columnValues)[row]);
+            }
+          } else if (columnValues instanceof long[]) {
+            keyValues[col] = onTheFlyDictionary.put(((long[]) columnValues)[row]);
+          } else if (columnValues instanceof float[]) {
+            keyValues[col] = onTheFlyDictionary.put(((float[]) columnValues)[row]);
+          } else if (columnValues instanceof double[]) {
+            keyValues[col] = onTheFlyDictionary.put(((double[]) columnValues)[row]);
+          } else if (columnValues instanceof String[]) {
+            keyValues[col] = onTheFlyDictionary.put(((String[]) columnValues)[row]);
+          } else if (columnValues instanceof byte[][]) {
+            keyValues[col] = onTheFlyDictionary.put(new ByteArray(((byte[][]) columnValues)[row]));
           }
-        } else if (columnValues instanceof long[]) {
-          keyValues[col] = onTheFlyDictionary.put(((long[]) columnValues)[row]);
-        } else if (columnValues instanceof float[]) {
-          keyValues[col] = onTheFlyDictionary.put(((float[]) columnValues)[row]);
-        } else if (columnValues instanceof double[]) {
-          keyValues[col] = onTheFlyDictionary.put(((double[]) columnValues)[row]);
-        } else if (columnValues instanceof String[]) {
-          keyValues[col] = onTheFlyDictionary.put(((String[]) columnValues)[row]);
-        } else if (columnValues instanceof byte[][]) {
-          keyValues[col] = onTheFlyDictionary.put(new ByteArray(((byte[][]) columnValues)[row]));
         }
+        groupKeys[row] = getGroupIdForFlyweightKey(flyweightKey);
       }
-      groupKeys[row] = getGroupIdForFlyweightKey(flyweightKey);
     }
   }
 
   @Override
-  public void generateKeysForBlock(TransformBlock transformBlock, int[][] groupKeys) {
-    int numDocs = transformBlock.getNumDocs();
+  public void generateKeysForBlock(ValueBlock valueBlock, int[][] groupKeys) {
+    int numDocs = valueBlock.getNumDocs();
     int[][][] keys = new int[numDocs][_numGroupByExpressions][];
     for (int i = 0; i < _numGroupByExpressions; i++) {
-      BlockValSet blockValSet = transformBlock.getBlockValueSet(_groupByExpressions[i]);
+      BlockValSet blockValSet = valueBlock.getBlockValueSet(_groupByExpressions[i]);
       if (_dictionaries[i] != null) {
         if (_isSingleValueExpressions[i]) {
           int[] dictIds = blockValSet.getDictionaryIdsSV();
@@ -391,10 +428,14 @@ private Object[] buildKeysFromIds(FixedIntArray keyList) {
     Object[] keys = new Object[_numGroupByExpressions];
     int[] dictIds = keyList.elements();
     for (int i = 0; i < _numGroupByExpressions; i++) {
-      if (_dictionaries[i] != null) {
-        keys[i] = _dictionaries[i].getInternal(dictIds[i]);
+      if (dictIds[i] == ID_FOR_NULL) {
+        keys[i] = null;
       } else {
-        keys[i] = _onTheFlyDictionaries[i].get(dictIds[i]);
+        if (_dictionaries[i] != null) {
+          keys[i] = _dictionaries[i].getInternal(dictIds[i]);
+        } else {
+          keys[i] = _onTheFlyDictionaries[i].get(dictIds[i]);
+        }
       }
     }
     return keys;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionarySingleColumnGroupKeyGenerator.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionarySingleColumnGroupKeyGenerator.java
index f6716ebb2dc..768bfec1beb 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionarySingleColumnGroupKeyGenerator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionarySingleColumnGroupKeyGenerator.java
@@ -35,8 +35,9 @@
 import java.util.Map;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.roaringbitmap.RoaringBitmap;
@@ -62,14 +63,15 @@ public class NoDictionarySingleColumnGroupKeyGenerator implements GroupKeyGenera
 
   private int _numGroups = 0;
 
-  public NoDictionarySingleColumnGroupKeyGenerator(TransformOperator transformOperator,
+  public NoDictionarySingleColumnGroupKeyGenerator(BaseProjectOperator<?> projectOperator,
       ExpressionContext groupByExpression, int numGroupsLimit, boolean nullHandlingEnabled) {
     _groupByExpression = groupByExpression;
-    _storedType = transformOperator.getResultMetadata(_groupByExpression).getDataType().getStoredType();
+    ColumnContext columnContext = projectOperator.getResultColumnContext(groupByExpression);
+    _storedType = columnContext.getDataType().getStoredType();
     _groupKeyMap = createGroupKeyMap(_storedType);
     _globalGroupIdUpperBound = numGroupsLimit;
     _nullHandlingEnabled = nullHandlingEnabled;
-    _isSingleValueExpression = transformOperator.getResultMetadata(groupByExpression).isSingleValue();
+    _isSingleValueExpression = columnContext.isSingleValue();
   }
 
   @Override
@@ -78,16 +80,16 @@ public int getGlobalGroupKeyUpperBound() {
   }
 
   @Override
-  public void generateKeysForBlock(TransformBlock transformBlock, int[] groupKeys) {
-    BlockValSet blockValSet = transformBlock.getBlockValueSet(_groupByExpression);
+  public void generateKeysForBlock(ValueBlock valueBlock, int[] groupKeys) {
+    BlockValSet blockValSet = valueBlock.getBlockValueSet(_groupByExpression);
     if (_nullHandlingEnabled) {
       RoaringBitmap nullBitmap = blockValSet.getNullBitmap();
       if (nullBitmap != null && !nullBitmap.isEmpty()) {
-        generateKeysForBlockNullHandlingEnabled(transformBlock, groupKeys, nullBitmap);
+        generateKeysForBlockNullHandlingEnabled(valueBlock, groupKeys, nullBitmap);
         return;
       }
     }
-    int numDocs = transformBlock.getNumDocs();
+    int numDocs = valueBlock.getNumDocs();
 
     switch (_storedType) {
       case INT:
@@ -137,11 +139,11 @@ public void generateKeysForBlock(TransformBlock transformBlock, int[] groupKeys)
     }
   }
 
-  public void generateKeysForBlockNullHandlingEnabled(TransformBlock transformBlock, int[] groupKeys,
+  public void generateKeysForBlockNullHandlingEnabled(ValueBlock valueBlock, int[] groupKeys,
       RoaringBitmap nullBitmap) {
     assert nullBitmap != null;
-    BlockValSet blockValSet = transformBlock.getBlockValueSet(_groupByExpression);
-    int numDocs = transformBlock.getNumDocs();
+    BlockValSet blockValSet = valueBlock.getBlockValueSet(_groupByExpression);
+    int numDocs = valueBlock.getNumDocs();
 
     switch (_storedType) {
       case INT:
@@ -262,9 +264,9 @@ private Map createGroupKeyMap(DataType keyType) {
   }
 
   @Override
-  public void generateKeysForBlock(TransformBlock transformBlock, int[][] groupKeys) {
-    int numDocs = transformBlock.getNumDocs();
-    BlockValSet blockValSet = transformBlock.getBlockValueSet(_groupByExpression);
+  public void generateKeysForBlock(ValueBlock valueBlock, int[][] groupKeys) {
+    int numDocs = valueBlock.getNumDocs();
+    BlockValSet blockValSet = valueBlock.getBlockValueSet(_groupByExpression);
 
     if (_isSingleValueExpression) {
       switch (_storedType) {
@@ -305,8 +307,7 @@ public void generateKeysForBlock(TransformBlock transformBlock, int[][] groupKey
           }
           break;
         default:
-          throw new IllegalArgumentException(
-              "Illegal data type for no-dictionary key generator: " + _storedType);
+          throw new IllegalArgumentException("Illegal data type for no-dictionary key generator: " + _storedType);
       }
     } else {
       switch (_storedType) {
@@ -366,8 +367,7 @@ public void generateKeysForBlock(TransformBlock transformBlock, int[][] groupKey
           }
           break;
         default:
-          throw new IllegalArgumentException(
-              "Illegal data type for no-dictionary key generator: " + _storedType);
+          throw new IllegalArgumentException("Illegal data type for no-dictionary key generator: " + _storedType);
       }
     }
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/ParentAggregationFunctionResultObject.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/ParentAggregationFunctionResultObject.java
new file mode 100644
index 00000000000..ee441b74e58
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/ParentAggregationFunctionResultObject.java
@@ -0,0 +1,42 @@
+/**
+ * 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.pinot.core.query.aggregation.utils;
+
+import java.io.Serializable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.query.utils.rewriter.ParentAggregationResultRewriter;
+
+
+/**
+ * Interface for the result of a parent aggregation function, as can be used to populate the results of corresponding
+ * of child aggregation functions. Each child aggregation function will have a corresponding column in the result
+ * schema, please see {@link ParentAggregationResultRewriter} for more details.
+ */
+public interface ParentAggregationFunctionResultObject
+    extends Comparable<ParentAggregationFunctionResultObject>, Serializable {
+
+  // get the nested value of the field at the given row, column
+  Object getField(int rowId, int colId);
+
+  // get total number of rows
+  int getNumberOfRows();
+
+  // get the nested schema of the result
+  DataSchema getSchema();
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxMeasuringValSetWrapper.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxMeasuringValSetWrapper.java
new file mode 100644
index 00000000000..0b33aa4363d
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxMeasuringValSetWrapper.java
@@ -0,0 +1,77 @@
+/**
+ * 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.pinot.core.query.aggregation.utils.argminmax;
+
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+
+
+/**
+ * Wrapper class for measuring columns in argmin/max aggregation function.
+ * Meanly used to do comparison without boxing primitive types.
+ */
+public class ArgMinMaxMeasuringValSetWrapper extends ArgMinMaxWrapperValSet {
+
+  public ArgMinMaxMeasuringValSetWrapper(boolean isSingleValue, DataSchema.ColumnDataType dataType,
+      BlockValSet blockValSet) {
+    super(dataType, isSingleValue);
+    setNewBlock(blockValSet);
+  }
+
+  public Comparable getComparable(int i) {
+    switch (_dataType) {
+      case INT:
+      case BOOLEAN:
+        return _intValues[i];
+      case LONG:
+      case TIMESTAMP:
+        return _longValues[i];
+      case FLOAT:
+        return _floatValues[i];
+      case DOUBLE:
+        return _doublesValues[i];
+      case STRING:
+      case BIG_DECIMAL:
+        return (Comparable) _objectsValues[i];
+      default:
+        throw new IllegalStateException("Unsupported data type: " + _dataType);
+    }
+  }
+
+  public int compare(int i, Object o) {
+      switch (_dataType) {
+        case INT:
+        case BOOLEAN:
+          return Integer.compare((Integer) o, _intValues[i]);
+        case LONG:
+        case TIMESTAMP:
+          return Long.compare((Long) o, _longValues[i]);
+        case FLOAT:
+          return Float.compare((Float) o, _floatValues[i]);
+        case DOUBLE:
+          return Double.compare((Double) o, _doublesValues[i]);
+        case STRING:
+          return ((String) o).compareTo((String) _objectsValues[i]);
+        case BIG_DECIMAL:
+          return ((java.math.BigDecimal) o).compareTo((java.math.BigDecimal) _objectsValues[i]);
+        default:
+          throw new IllegalStateException("Unsupported data type in comparison" + _dataType);
+      }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxObject.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxObject.java
new file mode 100644
index 00000000000..176902a4f4b
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxObject.java
@@ -0,0 +1,353 @@
+/**
+ * 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.pinot.core.query.aggregation.utils.argminmax;
+
+import com.google.common.base.Preconditions;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.Nonnull;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.datablock.DataBlockUtils;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.datablock.DataBlockBuilder;
+import org.apache.pinot.core.query.aggregation.utils.ParentAggregationFunctionResultObject;
+
+
+public class ArgMinMaxObject implements ParentAggregationFunctionResultObject {
+
+  // if the object is created but not yet populated, this happens e.g. when a server has no data for
+  // the query and returns a default value
+  enum ObjectNullState {
+    NULL(0),
+    NON_NULL(1);
+
+    final int _state;
+
+    ObjectNullState(int i) {
+      _state = i;
+    }
+
+    int getState() {
+      return _state;
+    }
+  }
+
+  // if the object contains non null values
+  private boolean _isNull;
+
+  // if the value is stored in a mutable list, this is false only when the Object is deserialized from a byte buffer
+  // if the object is mutable, it means that the object is read only and the values are stored in
+  // _immutableMeasuringKeys and _immutableProjectionVals, otherwise we read and write from _extremumMeasuringKeys
+  // and _extremumProjectionValues
+  private boolean _mutable;
+
+  // the schema of the measuring columns
+  private final DataSchema _measuringSchema;
+  // the schema of the projection columns
+  private final DataSchema _projectionSchema;
+
+  // the size of the extremum key cols and value cols
+  private final int _sizeOfExtremumMeasuringKeys;
+  private final int _sizeOfExtremumProjectionVals;
+
+  // the current extremum keys, keys are the extremum values of the measuring columns,
+  // used for comparison
+  private Comparable[] _extremumMeasuringKeys = null;
+  // the current extremum values, values are the values of the projection columns
+  // associated with the minimum measuring column, used for projection
+  private final List<Object[]> _extremumProjectionValues = new ArrayList<>();
+
+  // used for ser/de
+  private DataBlock _immutableMeasuringKeys;
+  private DataBlock _immutableProjectionVals;
+
+  public ArgMinMaxObject(DataSchema measuringSchema, DataSchema projectionSchema) {
+    _isNull = true;
+    _mutable = true;
+
+    _measuringSchema = measuringSchema;
+    _projectionSchema = projectionSchema;
+
+    _sizeOfExtremumMeasuringKeys = _measuringSchema.size();
+    _sizeOfExtremumProjectionVals = _projectionSchema.size();
+  }
+
+  public ArgMinMaxObject(ByteBuffer byteBuffer)
+      throws IOException {
+    _mutable = false;
+    _isNull = byteBuffer.getInt() == ObjectNullState.NULL.getState();
+    byteBuffer = byteBuffer.slice();
+    _immutableMeasuringKeys = DataBlockUtils.getDataBlock(byteBuffer);
+    byteBuffer = byteBuffer.slice();
+    _immutableProjectionVals = DataBlockUtils.getDataBlock(byteBuffer);
+
+    _measuringSchema = _immutableMeasuringKeys.getDataSchema();
+    _projectionSchema = _immutableProjectionVals.getDataSchema();
+
+    _sizeOfExtremumMeasuringKeys = _measuringSchema.size();
+    _sizeOfExtremumProjectionVals = _projectionSchema.size();
+  }
+
+  public static ArgMinMaxObject fromBytes(byte[] bytes)
+      throws IOException {
+    return fromByteBuffer(ByteBuffer.wrap(bytes));
+  }
+
+  public static ArgMinMaxObject fromByteBuffer(ByteBuffer byteBuffer)
+      throws IOException {
+    return new ArgMinMaxObject(byteBuffer);
+  }
+
+  // used for result serialization
+  @Nonnull
+  public byte[] toBytes()
+      throws IOException {
+    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
+    if (_isNull) {
+      // serialize the null object with schemas
+      dataOutputStream.writeInt(ObjectNullState.NULL.getState());
+      _immutableMeasuringKeys = DataBlockBuilder.buildFromRows(Collections.emptyList(), _measuringSchema);
+      _immutableProjectionVals = DataBlockBuilder.buildFromRows(Collections.emptyList(), _projectionSchema);
+    } else {
+      dataOutputStream.writeInt(ObjectNullState.NON_NULL.getState());
+      _immutableMeasuringKeys =
+          DataBlockBuilder.buildFromRows(Collections.singletonList(_extremumMeasuringKeys), _measuringSchema);
+      _immutableProjectionVals = DataBlockBuilder.buildFromRows(_extremumProjectionValues, _projectionSchema);
+    }
+    dataOutputStream.write(_immutableMeasuringKeys.toBytes());
+    dataOutputStream.write(_immutableProjectionVals.toBytes());
+    return byteArrayOutputStream.toByteArray();
+  }
+
+  /**
+   * Used during segment processing
+   * Compare the current key with the new key, and return the comparison result.
+   * > 0: the key is replaced because the new key is the new extremum
+   * = 0: new key is the same as the current extremum
+   * < 0: current key is still the extremum
+   */
+  public int compareAndSetKey(List<ArgMinMaxMeasuringValSetWrapper> argMinMaxWrapperValSets, int offset,
+      boolean isMax) {
+    Preconditions.checkState(_mutable, "Cannot compare and set key after the object is serialized");
+    if (!_isNull) {
+      for (int i = 0; i < _sizeOfExtremumMeasuringKeys; i++) {
+        ArgMinMaxMeasuringValSetWrapper argMinMaxWrapperValSet = argMinMaxWrapperValSets.get(i);
+        int result = argMinMaxWrapperValSet.compare(offset, _extremumMeasuringKeys[i]);
+        if (result != 0) {
+          if (isMax ? result < 0 : result > 0) {
+            for (int j = 0; j < _sizeOfExtremumMeasuringKeys; j++) {
+              _extremumMeasuringKeys[j] = argMinMaxWrapperValSets.get(j).getComparable(offset);
+            }
+            return 1;
+          }
+          return -1;
+        }
+      }
+    } else {
+      _isNull = false;
+      _extremumMeasuringKeys = new Comparable[_sizeOfExtremumMeasuringKeys];
+      for (int i = 0; i < _sizeOfExtremumMeasuringKeys; i++) {
+        _extremumMeasuringKeys[i] = argMinMaxWrapperValSets.get(i).getComparable(offset);
+      }
+    }
+    return 0;
+  }
+
+  /**
+   * Used during segment processing with compareAndSetKey
+   * Set the vals to the new vals if the key is replaced.
+   */
+  public void setToNewVal(List<ArgMinMaxProjectionValSetWrapper> argMinMaxProjectionValSetWrappers, int offset) {
+    _extremumProjectionValues.clear();
+    addVal(argMinMaxProjectionValSetWrappers, offset);
+  }
+
+  /**
+   * Used during segment processing with compareAndSetKey
+   * Add the vals to the list of vals if the key is the same.
+   */
+  public void addVal(List<ArgMinMaxProjectionValSetWrapper> argMinMaxProjectionValSetWrappers, int offset) {
+    Object[] val = new Object[_projectionSchema.size()];
+    for (int i = 0; i < _projectionSchema.size(); i++) {
+      val[i] = argMinMaxProjectionValSetWrappers.get(i).getValue(offset);
+    }
+    _extremumProjectionValues.add(val);
+  }
+
+  public Comparable[] getExtremumKey() {
+    if (_mutable) {
+      return _extremumMeasuringKeys;
+    } else {
+      Comparable[] extremumKeys = new Comparable[_sizeOfExtremumMeasuringKeys];
+      for (int i = 0; i < _sizeOfExtremumMeasuringKeys; i++) {
+        switch (_measuringSchema.getColumnDataType(i)) {
+          case INT:
+          case BOOLEAN:
+            extremumKeys[i] = _immutableMeasuringKeys.getInt(0, i);
+            break;
+          case LONG:
+          case TIMESTAMP:
+            extremumKeys[i] = _immutableMeasuringKeys.getLong(0, i);
+            break;
+          case FLOAT:
+            extremumKeys[i] = _immutableMeasuringKeys.getFloat(0, i);
+            break;
+          case DOUBLE:
+            extremumKeys[i] = _immutableMeasuringKeys.getDouble(0, i);
+            break;
+          case STRING:
+            extremumKeys[i] = _immutableMeasuringKeys.getString(0, i);
+            break;
+          case BIG_DECIMAL:
+            extremumKeys[i] = _immutableMeasuringKeys.getBigDecimal(0, i);
+            break;
+          default:
+            throw new IllegalStateException("Unsupported data type: " + _measuringSchema.getColumnDataType(i));
+        }
+      }
+      return extremumKeys;
+    }
+  }
+
+  /**
+   * Get the field from a projection column
+   */
+  @Override
+  public Object getField(int rowId, int colId) {
+    if (_mutable) {
+      return _extremumProjectionValues.get(rowId)[colId];
+    } else {
+      switch (_projectionSchema.getColumnDataType(colId)) {
+        case BOOLEAN:
+        case INT:
+          return _immutableProjectionVals.getInt(rowId, colId);
+        case TIMESTAMP:
+        case LONG:
+          return _immutableProjectionVals.getLong(rowId, colId);
+        case FLOAT:
+          return _immutableProjectionVals.getFloat(rowId, colId);
+        case DOUBLE:
+          return _immutableProjectionVals.getDouble(rowId, colId);
+        case JSON:
+        case STRING:
+          return _immutableProjectionVals.getString(rowId, colId);
+        case BYTES:
+          return _immutableProjectionVals.getBytes(rowId, colId);
+        case BIG_DECIMAL:
+          return _immutableProjectionVals.getBigDecimal(rowId, colId);
+        case BOOLEAN_ARRAY:
+        case INT_ARRAY:
+          return _immutableProjectionVals.getIntArray(rowId, colId);
+        case TIMESTAMP_ARRAY:
+        case LONG_ARRAY:
+          return _immutableProjectionVals.getLongArray(rowId, colId);
+        case FLOAT_ARRAY:
+          return _immutableProjectionVals.getFloatArray(rowId, colId);
+        case DOUBLE_ARRAY:
+          return _immutableProjectionVals.getDoubleArray(rowId, colId);
+        case STRING_ARRAY:
+        case BYTES_ARRAY:
+          return _immutableProjectionVals.getStringArray(rowId, colId);
+        default:
+          throw new IllegalStateException("Unsupported data type: " + _projectionSchema.getColumnDataType(colId));
+      }
+    }
+  }
+
+  /**
+   * Merge two ArgMinMaxObjects
+   */
+  public ArgMinMaxObject merge(ArgMinMaxObject other, boolean isMax) {
+    if (_isNull && other._isNull) {
+      return this;
+    } else if (_isNull) {
+      return other;
+    } else if (other._isNull) {
+      return this;
+    } else {
+      int result;
+      Comparable[] key = getExtremumKey();
+      Comparable[] otherKey = other.getExtremumKey();
+      for (int i = 0; i < _sizeOfExtremumMeasuringKeys; i++) {
+        result = key[i].compareTo(otherKey[i]);
+        if (result != 0) {
+          // If the keys are not equal, return the object with the extremum key
+          if (isMax) {
+            return result > 0 ? this : other;
+          } else {
+            return result < 0 ? this : other;
+          }
+        }
+      }
+      // If the keys are equal, add the values of the other object to this object
+      if (!_mutable) {
+        // If the result is immutable, we need to copy the values from the serialized result to the mutable result
+        _mutable = true;
+        for (int i = 0; i < getNumberOfRows(); i++) {
+          Object[] val = new Object[_sizeOfExtremumProjectionVals];
+          for (int j = 0; j < _sizeOfExtremumProjectionVals; j++) {
+            val[j] = getField(i, j);
+          }
+          _extremumProjectionValues.add(val);
+        }
+      }
+      for (int i = 0; i < other.getNumberOfRows(); i++) {
+        Object[] val = new Object[_sizeOfExtremumProjectionVals];
+        for (int j = 0; j < _sizeOfExtremumProjectionVals; j++) {
+          val[j] = other.getField(i, j);
+        }
+        _extremumProjectionValues.add(val);
+      }
+      return this;
+    }
+  }
+
+  /**
+   * get the number of rows in the projection data
+   */
+  @Override
+  public int getNumberOfRows() {
+    if (_mutable) {
+      return _extremumProjectionValues.size();
+    } else {
+      return _immutableProjectionVals.getNumberOfRows();
+    }
+  }
+
+  /**
+   * return the schema of the projection data
+   */
+  @Override
+  public DataSchema getSchema() {
+    // the final parent aggregation result only cares about the projection columns
+    return _projectionSchema;
+  }
+
+  @Override
+  public int compareTo(ParentAggregationFunctionResultObject o) {
+    return this.getNumberOfRows() - o.getNumberOfRows();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxProjectionValSetWrapper.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxProjectionValSetWrapper.java
new file mode 100644
index 00000000000..c8676ba716f
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxProjectionValSetWrapper.java
@@ -0,0 +1,70 @@
+/**
+ * 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.pinot.core.query.aggregation.utils.argminmax;
+
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+
+
+/**
+ * Wrapper class for projection block value set for argmin/max aggregation function.
+ * Used to get the value from val set of different data types.
+ */
+public class ArgMinMaxProjectionValSetWrapper extends ArgMinMaxWrapperValSet {
+
+  public ArgMinMaxProjectionValSetWrapper(boolean isSingleValue, DataSchema.ColumnDataType dataType,
+      BlockValSet blockValSet) {
+    super(dataType, isSingleValue);
+    setNewBlock(blockValSet);
+  }
+
+  public Object getValue(int i) {
+    switch (_dataType) {
+      case INT:
+      case BOOLEAN:
+        return _intValues[i];
+      case LONG:
+      case TIMESTAMP:
+        return _longValues[i];
+      case FLOAT:
+        return _floatValues[i];
+      case DOUBLE:
+        return _doublesValues[i];
+      case STRING:
+      case BIG_DECIMAL:
+      case BYTES:
+      case JSON:
+          return _objectsValues[i];
+      case INT_ARRAY:
+        return _intValuesMV[i].length == 0 ? null : _intValuesMV[i];
+      case LONG_ARRAY:
+      case TIMESTAMP_ARRAY:
+        return _longValuesMV[i].length == 0 ? null : _longValuesMV[i];
+      case FLOAT_ARRAY:
+        return _floatValuesMV[i].length == 0 ? null : _floatValuesMV[i];
+      case DOUBLE_ARRAY:
+        return _doublesValuesMV[i].length == 0 ? null : _doublesValuesMV[i];
+      case STRING_ARRAY:
+      case BYTES_ARRAY:
+        return _objectsValuesMV[i].length == 0 ? null : _objectsValuesMV[i];
+      default:
+        throw new IllegalStateException("Unsupported data type: " + _dataType);
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxWrapperValSet.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxWrapperValSet.java
new file mode 100644
index 00000000000..5aa18eae5c0
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/utils/argminmax/ArgMinMaxWrapperValSet.java
@@ -0,0 +1,106 @@
+/**
+ * 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.pinot.core.query.aggregation.utils.argminmax;
+
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+
+
+/**
+ * Wrapper class for the value sets of the column to do argmin/max on.
+ * This class is used for type-generic implementation of argmin/max.
+ */
+public class ArgMinMaxWrapperValSet {
+  protected final DataSchema.ColumnDataType _dataType;
+  boolean _isSingleValue;
+  int[] _intValues;
+  long[] _longValues;
+  float[] _floatValues;
+  double[] _doublesValues;
+  Object[] _objectsValues;
+  int[][] _intValuesMV;
+  long[][] _longValuesMV;
+  float[][] _floatValuesMV;
+  double[][] _doublesValuesMV;
+  Object[][] _objectsValuesMV;
+
+  public ArgMinMaxWrapperValSet(
+      DataSchema.ColumnDataType dataType, boolean isSingleValue) {
+    _dataType = dataType;
+    _isSingleValue = isSingleValue;
+  }
+
+  public void setNewBlock(BlockValSet blockValSet) {
+    if (_isSingleValue) {
+      switch (_dataType) {
+        case INT:
+        case BOOLEAN:
+          _intValues = blockValSet.getIntValuesSV();
+          break;
+        case LONG:
+        case TIMESTAMP:
+          _longValues = blockValSet.getLongValuesSV();
+          break;
+        case FLOAT:
+          _floatValues = blockValSet.getFloatValuesSV();
+          break;
+        case DOUBLE:
+          _doublesValues = blockValSet.getDoubleValuesSV();
+          break;
+        case STRING:
+        case JSON:
+          _objectsValues = blockValSet.getStringValuesSV();
+          break;
+        case BIG_DECIMAL:
+          _objectsValues = blockValSet.getBigDecimalValuesSV();
+          break;
+        case BYTES:
+          _objectsValues = blockValSet.getBytesValuesSV();
+          break;
+        default:
+          throw new IllegalStateException("Unsupported data type: " + _dataType);
+      }
+    } else {
+      switch (_dataType) {
+        case INT_ARRAY:
+        case BOOLEAN_ARRAY:
+          _intValuesMV = blockValSet.getIntValuesMV();
+          break;
+        case LONG_ARRAY:
+        case TIMESTAMP_ARRAY:
+          _longValuesMV = blockValSet.getLongValuesMV();
+          break;
+        case FLOAT_ARRAY:
+          _floatValuesMV = blockValSet.getFloatValuesMV();
+          break;
+        case DOUBLE_ARRAY:
+          _doublesValuesMV = blockValSet.getDoubleValuesMV();
+          break;
+        case STRING_ARRAY:
+          _objectsValuesMV = blockValSet.getStringValuesMV();
+          break;
+        case BYTES_ARRAY:
+          _objectsValuesMV = blockValSet.getBytesValuesMV();
+          break;
+        default:
+          throw new IllegalStateException("Unsupported data type: " + _dataType);
+      }
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryExecutorConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryExecutorConfig.java
index 1d5306f01d3..ffe63415745 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryExecutorConfig.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryExecutorConfig.java
@@ -20,60 +20,37 @@
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.CommonConstants.Server;
 
 
 /**
  * Config for QueryExecutor.
- *
- *
  */
 public class QueryExecutorConfig {
-
-  // Prefix key of Query Pruner
   public static final String QUERY_PRUNER = "pruner";
-  // Prefix key of Query Planner
-  public static final String QUERY_PLANNER = "queryPlanner";
-  // Prefix key of TimeOut
+  public static final String PLAN_MAKER_CLASS = "plan.maker.class";
   public static final String TIME_OUT = "timeout";
 
-  private static final String[] REQUIRED_KEYS = {};
-
-  private PinotConfiguration _queryExecutorConfig = null;
-  private SegmentPrunerConfig _segmentPrunerConfig;
-  private QueryPlannerConfig _queryPlannerConfig;
-  private final long _timeOutMs;
+  private final PinotConfiguration _config;
 
   public QueryExecutorConfig(PinotConfiguration config)
       throws ConfigurationException {
-    _queryExecutorConfig = config;
-    checkRequiredKeys();
-    _segmentPrunerConfig = new SegmentPrunerConfig(_queryExecutorConfig.subset(QUERY_PRUNER));
-    _queryPlannerConfig = new QueryPlannerConfig(_queryExecutorConfig.subset(QUERY_PLANNER));
-    _timeOutMs = _queryExecutorConfig.getProperty(TIME_OUT, -1);
-  }
-
-  private void checkRequiredKeys()
-      throws ConfigurationException {
-    for (String keyString : REQUIRED_KEYS) {
-      if (!_queryExecutorConfig.containsKey(keyString)) {
-        throw new ConfigurationException("Cannot find required key : " + keyString);
-      }
-    }
+    _config = config;
   }
 
   public PinotConfiguration getConfig() {
-    return _queryExecutorConfig;
+    return _config;
   }
 
   public SegmentPrunerConfig getPrunerConfig() {
-    return _segmentPrunerConfig;
+    return new SegmentPrunerConfig(_config.subset(QUERY_PRUNER));
   }
 
-  public QueryPlannerConfig getQueryPlannerConfig() {
-    return _queryPlannerConfig;
+  public String getPlanMakerClass() {
+    return _config.getProperty(PLAN_MAKER_CLASS, Server.DEFAULT_QUERY_EXECUTOR_PLAN_MAKER_CLASS);
   }
 
   public long getTimeOut() {
-    return _timeOutMs;
+    return _config.getProperty(TIME_OUT, Server.DEFAULT_QUERY_EXECUTOR_TIMEOUT_MS);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryPlannerConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryPlannerConfig.java
deleted file mode 100644
index 7c909172086..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/config/QueryPlannerConfig.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.query.config;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.pinot.spi.env.PinotConfiguration;
-
-
-/**
- * Config for QueryPlanner.
- *
- *
- */
-public class QueryPlannerConfig {
-
-  private PinotConfiguration _queryPlannerConfig;
-  private static final String[] REQUIRED_KEYS = {};
-
-  public QueryPlannerConfig(PinotConfiguration queryPlannerConfig)
-      throws ConfigurationException {
-    _queryPlannerConfig = queryPlannerConfig;
-    checkRequiredKeys();
-  }
-
-  private void checkRequiredKeys()
-      throws ConfigurationException {
-    for (String keyString : REQUIRED_KEYS) {
-      if (!_queryPlannerConfig.containsKey(keyString)) {
-        throw new ConfigurationException("Cannot find required key : " + keyString);
-      }
-    }
-  }
-
-  public String getQueryPlannerType() {
-    return _queryPlannerConfig.getProperty("type");
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/config/SegmentPrunerConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/query/config/SegmentPrunerConfig.java
index 604bf108011..20ed9730c6c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/config/SegmentPrunerConfig.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/config/SegmentPrunerConfig.java
@@ -19,9 +19,9 @@
 package org.apache.pinot.core.query.config;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.CommonConstants.Server;
 
 
 /**
@@ -35,7 +35,8 @@ public class SegmentPrunerConfig {
   private final List<PinotConfiguration> _segmentPrunerConfigs;
 
   public SegmentPrunerConfig(PinotConfiguration segmentPrunerConfig) {
-    List<String> segmentPrunerNames = segmentPrunerConfig.getProperty(SEGMENT_PRUNER_NAMES_KEY, Arrays.asList());
+    List<String> segmentPrunerNames =
+        segmentPrunerConfig.getProperty(SEGMENT_PRUNER_NAMES_KEY, Server.DEFAULT_QUERY_EXECUTOR_PRUNER_CLASS);
     _numSegmentPruners = segmentPrunerNames.size();
     _segmentPrunerNames = new ArrayList<>(_numSegmentPruners);
     _segmentPrunerConfigs = new ArrayList<>(_numSegmentPruners);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutor.java
index 1a51e11aebf..053a9d55807 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutor.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.query.distinct;
 
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 
 
 /**
@@ -29,10 +29,10 @@ public interface DistinctExecutor {
   int MAX_INITIAL_CAPACITY = 10000;
 
   /**
-   * Processes the given transform block, returns {@code true} if the query is already satisfied, {@code false}
+   * Processes the given value block, returns {@code true} if the query is already satisfied, {@code false}
    * otherwise. No more calls should be made after it returns {@code true}.
    */
-  boolean process(TransformBlock transformBlock);
+  boolean process(ValueBlock valueBlock);
 
   /**
    * Returns the distinct result. Note that the returned DistinctTable might not be a main DistinctTable, thus cannot be
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutorFactory.java
index 6f988cf6a22..5a3e052c157 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctExecutorFactory.java
@@ -22,9 +22,8 @@
 import java.util.List;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.operator.transform.TransformOperator;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.core.query.distinct.dictionary.DictionaryBasedMultiColumnDistinctOnlyExecutor;
 import org.apache.pinot.core.query.distinct.dictionary.DictionaryBasedMultiColumnDistinctOrderByExecutor;
 import org.apache.pinot.core.query.distinct.dictionary.DictionaryBasedSingleColumnDistinctOnlyExecutor;
@@ -44,6 +43,7 @@
 import org.apache.pinot.core.query.distinct.raw.RawMultiColumnDistinctExecutor;
 import org.apache.pinot.core.query.distinct.raw.RawStringSingleColumnDistinctOnlyExecutor;
 import org.apache.pinot.core.query.distinct.raw.RawStringSingleColumnDistinctOrderByExecutor;
+import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
@@ -58,28 +58,28 @@ private DistinctExecutorFactory() {
   /**
    * Returns the {@link DistinctExecutor} for the given distinct query.
    */
-  public static DistinctExecutor getDistinctExecutor(DistinctAggregationFunction distinctAggregationFunction,
-      TransformOperator transformOperator, boolean nullHandlingEnabled) {
-    List<ExpressionContext> expressions = distinctAggregationFunction.getInputExpressions();
-    List<OrderByExpressionContext> orderByExpressions = distinctAggregationFunction.getOrderByExpressions();
-    int limit = distinctAggregationFunction.getLimit();
+  public static DistinctExecutor getDistinctExecutor(BaseProjectOperator<?> projectOperator,
+      QueryContext queryContext) {
+    List<ExpressionContext> expressions = queryContext.getSelectExpressions();
+    List<OrderByExpressionContext> orderByExpressions = queryContext.getOrderByExpressions();
+    int limit = queryContext.getLimit();
     if (orderByExpressions == null) {
-      return getDistinctOnlyExecutor(expressions, limit, transformOperator, nullHandlingEnabled);
+      return getDistinctOnlyExecutor(expressions, limit, projectOperator, queryContext.isNullHandlingEnabled());
     } else {
-      return getDistinctOrderByExecutor(
-          expressions, orderByExpressions, limit, transformOperator, nullHandlingEnabled);
+      return getDistinctOrderByExecutor(expressions, orderByExpressions, limit, projectOperator,
+          queryContext.isNullHandlingEnabled());
     }
   }
 
   private static DistinctExecutor getDistinctOnlyExecutor(List<ExpressionContext> expressions, int limit,
-      TransformOperator transformOperator, boolean nullHandlingEnabled) {
+      BaseProjectOperator<?> projectOperator, boolean nullHandlingEnabled) {
     int numExpressions = expressions.size();
     if (numExpressions == 1) {
       // Single column
       ExpressionContext expression = expressions.get(0);
-      TransformResultMetadata expressionMetadata = transformOperator.getResultMetadata(expression);
-      DataType dataType = expressionMetadata.getDataType();
-      Dictionary dictionary = transformOperator.getDictionary(expression);
+      ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
+      DataType dataType = columnContext.getDataType();
+      Dictionary dictionary = columnContext.getDictionary();
       if (dictionary != null && !nullHandlingEnabled) {
         // Dictionary based
         return new DictionaryBasedSingleColumnDistinctOnlyExecutor(expression, dictionary, dataType, limit);
@@ -108,22 +108,21 @@ private static DistinctExecutor getDistinctOnlyExecutor(List<ExpressionContext>
       // Multiple columns
       boolean hasMVExpression = false;
       List<DataType> dataTypes = new ArrayList<>(numExpressions);
-      for (ExpressionContext expression : expressions) {
-        TransformResultMetadata expressionMetadata = transformOperator.getResultMetadata(expression);
-        if (!expressionMetadata.isSingleValue()) {
-          hasMVExpression = true;
-        }
-        dataTypes.add(expressionMetadata.getDataType());
-      }
       List<Dictionary> dictionaries = new ArrayList<>(numExpressions);
       boolean dictionaryBased = true;
       for (ExpressionContext expression : expressions) {
-        Dictionary dictionary = transformOperator.getDictionary(expression);
-        if (dictionary != null) {
-          dictionaries.add(dictionary);
-        } else {
-          dictionaryBased = false;
-          break;
+        ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
+        if (!columnContext.isSingleValue()) {
+          hasMVExpression = true;
+        }
+        dataTypes.add(columnContext.getDataType());
+        if (dictionaryBased) {
+          Dictionary dictionary = columnContext.getDictionary();
+          if (dictionary != null) {
+            dictionaries.add(dictionary);
+          } else {
+            dictionaryBased = false;
+          }
         }
       }
       if (dictionaryBased) {
@@ -132,23 +131,24 @@ private static DistinctExecutor getDistinctOnlyExecutor(List<ExpressionContext>
             limit);
       } else {
         // Raw value based
-        return new RawMultiColumnDistinctExecutor(expressions, hasMVExpression, dataTypes, null, limit);
+        return new RawMultiColumnDistinctExecutor(expressions, hasMVExpression, dataTypes, null, nullHandlingEnabled,
+            limit);
       }
     }
   }
 
   private static DistinctExecutor getDistinctOrderByExecutor(List<ExpressionContext> expressions,
-      List<OrderByExpressionContext> orderByExpressions, int limit, TransformOperator transformOperator,
+      List<OrderByExpressionContext> orderByExpressions, int limit, BaseProjectOperator<?> projectOperator,
       boolean nullHandlingEnabled) {
     int numExpressions = expressions.size();
     if (numExpressions == 1) {
       // Single column
       ExpressionContext expression = expressions.get(0);
-      TransformResultMetadata expressionMetadata = transformOperator.getResultMetadata(expression);
-      DataType dataType = expressionMetadata.getDataType();
+      ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
+      DataType dataType = columnContext.getDataType();
       assert orderByExpressions.size() == 1;
       OrderByExpressionContext orderByExpression = orderByExpressions.get(0);
-      Dictionary dictionary = transformOperator.getDictionary(expression);
+      Dictionary dictionary = columnContext.getDictionary();
       // Note: Use raw value based when dictionary is not sorted (consuming segments).
       if (dictionary != null && dictionary.isSorted() && !nullHandlingEnabled) {
         // Dictionary based
@@ -186,32 +186,32 @@ private static DistinctExecutor getDistinctOrderByExecutor(List<ExpressionContex
       // Multiple columns
       boolean hasMVExpression = false;
       List<DataType> dataTypes = new ArrayList<>(numExpressions);
-      for (ExpressionContext expression : expressions) {
-        TransformResultMetadata expressionMetadata = transformOperator.getResultMetadata(expression);
-        if (!expressionMetadata.isSingleValue()) {
-          hasMVExpression = true;
-        }
-        dataTypes.add(expressionMetadata.getDataType());
-      }
       List<Dictionary> dictionaries = new ArrayList<>(numExpressions);
       boolean dictionaryBased = true;
       for (ExpressionContext expression : expressions) {
-        Dictionary dictionary = transformOperator.getDictionary(expression);
-        // Note: Use raw value based when dictionary is not sorted (consuming segments).
-        if (dictionary != null && dictionary.isSorted()) {
-          dictionaries.add(dictionary);
-        } else {
-          dictionaryBased = false;
-          break;
+        ColumnContext columnContext = projectOperator.getResultColumnContext(expression);
+        if (!columnContext.isSingleValue()) {
+          hasMVExpression = true;
+        }
+        dataTypes.add(columnContext.getDataType());
+        if (dictionaryBased) {
+          Dictionary dictionary = columnContext.getDictionary();
+          // Note: Use raw value based when dictionary is not sorted (consuming segments).
+          if (dictionary != null && dictionary.isSorted()) {
+            dictionaries.add(dictionary);
+          } else {
+            dictionaryBased = false;
+          }
         }
       }
-      if (dictionaryBased) {
+      if (dictionaryBased && !nullHandlingEnabled) {
         // Dictionary based
         return new DictionaryBasedMultiColumnDistinctOrderByExecutor(expressions, hasMVExpression, dictionaries,
             dataTypes, orderByExpressions, limit);
       } else {
         // Raw value based
-        return new RawMultiColumnDistinctExecutor(expressions, hasMVExpression, dataTypes, orderByExpressions, limit);
+        return new RawMultiColumnDistinctExecutor(expressions, hasMVExpression, dataTypes, orderByExpressions,
+            nullHandlingEnabled, limit);
       }
     }
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctTable.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctTable.java
index 0affc272f4d..1ba933be3d0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctTable.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/DistinctTable.java
@@ -40,8 +40,8 @@
 import org.apache.pinot.core.common.datatable.DataTableBuilder;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.spi.trace.Tracing;
 import org.apache.pinot.spi.utils.ByteArray;
-import org.apache.pinot.spi.utils.LoopUtils;
 import org.roaringbitmap.RoaringBitmap;
 
 
@@ -93,10 +93,12 @@ public DistinctTable(DataSchema dataSchema, @Nullable List<OrderByExpressionCont
       int numOrderByExpressions = orderByExpressions.size();
       int[] orderByExpressionIndices = new int[numOrderByExpressions];
       int[] comparisonFactors = new int[numOrderByExpressions];
+      int[] nullComparisonFactors = new int[numOrderByExpressions];
       for (int i = 0; i < numOrderByExpressions; i++) {
         OrderByExpressionContext orderByExpression = orderByExpressions.get(i);
         orderByExpressionIndices[i] = columnNames.indexOf(orderByExpression.getExpression().toString());
         comparisonFactors[i] = orderByExpression.isAsc() ? -1 : 1;
+        nullComparisonFactors[i] = orderByExpression.isNullsLast() ? -1 : 1;
       }
       if (_nullHandlingEnabled) {
         _priorityQueue = new ObjectHeapPriorityQueue<>(initialCapacity, (r1, r2) -> {
@@ -110,9 +112,9 @@ public DistinctTable(DataSchema dataSchema, @Nullable List<OrderByExpressionCont
               if (value2 == null) {
                 continue;
               }
-              return comparisonFactors[i];
+              return nullComparisonFactors[i];
             } else if (value2 == null) {
-              return -comparisonFactors[i];
+              return -nullComparisonFactors[i];
             }
             int result = value1.compareTo(value2) * comparisonFactors[i];
             if (result != 0) {
@@ -244,8 +246,8 @@ public void mergeTable(DistinctTable distinctTable) {
     if (hasOrderBy()) {
       for (Record record : distinctTable._records) {
         addWithOrderBy(record);
+        Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(mergedRecords);
         mergedRecords++;
-        LoopUtils.checkMergePhaseInterruption(mergedRecords);
       }
     } else {
       if (_recordSet.size() < _limit) {
@@ -253,8 +255,8 @@ public void mergeTable(DistinctTable distinctTable) {
           if (addWithoutOrderBy(record)) {
             return;
           }
+          Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(mergedRecords);
           mergedRecords++;
-          LoopUtils.checkMergePhaseInterruption(mergedRecords);
         }
       }
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOnlyExecutor.java
index 47ddb6afaf5..e86fc300e0a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOnlyExecutor.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctExecutorUtils;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
@@ -41,13 +41,13 @@ public DictionaryBasedMultiColumnDistinctOnlyExecutor(List<ExpressionContext> ex
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    int numDocs = transformBlock.getNumDocs();
+  public boolean process(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     int numExpressions = _expressions.size();
     if (!_hasMVExpression) {
       int[][] dictIdsArray = new int[numDocs][numExpressions];
       for (int i = 0; i < numExpressions; i++) {
-        BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expressions.get(i));
+        BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expressions.get(i));
         int[] dictIdsForExpression = blockValueSet.getDictionaryIdsSV();
         for (int j = 0; j < numDocs; j++) {
           dictIdsArray[j][i] = dictIdsForExpression[j];
@@ -63,7 +63,7 @@ public boolean process(TransformBlock transformBlock) {
       int[][] svDictIds = new int[numExpressions][];
       int[][][] mvDictIds = new int[numExpressions][][];
       for (int i = 0; i < numExpressions; i++) {
-        BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expressions.get(i));
+        BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expressions.get(i));
         if (blockValueSet.isSingleValue()) {
           svDictIds[i] = blockValueSet.getDictionaryIdsSV();
         } else {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOrderByExecutor.java
index 1d3a40d67ab..b5fc60f8e6c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedMultiColumnDistinctOrderByExecutor.java
@@ -24,7 +24,7 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctExecutorUtils;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
@@ -67,13 +67,13 @@ public DictionaryBasedMultiColumnDistinctOrderByExecutor(List<ExpressionContext>
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    int numDocs = transformBlock.getNumDocs();
+  public boolean process(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     int numExpressions = _expressions.size();
     if (!_hasMVExpression) {
       int[][] dictIdsArray = new int[numDocs][numExpressions];
       for (int i = 0; i < numExpressions; i++) {
-        BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expressions.get(i));
+        BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expressions.get(i));
         int[] dictIdsForExpression = blockValueSet.getDictionaryIdsSV();
         for (int j = 0; j < numDocs; j++) {
           dictIdsArray[j][i] = dictIdsForExpression[j];
@@ -86,7 +86,7 @@ public boolean process(TransformBlock transformBlock) {
       int[][] svDictIds = new int[numExpressions][];
       int[][][] mvDictIds = new int[numExpressions][][];
       for (int i = 0; i < numExpressions; i++) {
-        BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expressions.get(i));
+        BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expressions.get(i));
         if (blockValueSet.isSingleValue()) {
           svDictIds[i] = blockValueSet.getDictionaryIdsSV();
         } else {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOnlyExecutor.java
index 150d8d8168c..d7f25a334dc 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOnlyExecutor.java
@@ -20,7 +20,7 @@
 
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
@@ -37,9 +37,9 @@ public DictionaryBasedSingleColumnDistinctOnlyExecutor(ExpressionContext express
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
     if (blockValueSet.isSingleValue()) {
       int[] dictIds = blockValueSet.getDictionaryIdsSV();
       for (int i = 0; i < numDocs; i++) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOrderByExecutor.java
index 329c7309152..51aad6ae1ee 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/dictionary/DictionaryBasedSingleColumnDistinctOrderByExecutor.java
@@ -23,7 +23,7 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
@@ -47,9 +47,9 @@ public DictionaryBasedSingleColumnDistinctOrderByExecutor(ExpressionContext expr
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
     if (blockValueSet.isSingleValue()) {
       int[] dictIds = blockValueSet.getDictionaryIdsSV();
       for (int i = 0; i < numDocs; i++) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
index 3dcf78e6744..b1ffe77602c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
@@ -26,10 +26,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -42,6 +45,7 @@ public abstract class BaseRawBigDecimalSingleColumnDistinctExecutor implements D
   final boolean _nullHandlingEnabled;
 
   final ObjectSet<BigDecimal> _valueSet;
+  private boolean _hasNull;
 
   BaseRawBigDecimalSingleColumnDistinctExecutor(ExpressionContext expression, DataType dataType, int limit,
       boolean nullHandlingEnabled) {
@@ -61,6 +65,36 @@ public DistinctTable getResult() {
     for (BigDecimal value : _valueSet) {
       records.add(new Record(new Object[]{value}));
     }
+    if (_hasNull) {
+      records.add(new Record(new Object[]{null}));
+    }
+    assert records.size() <= _limit + 1;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    BigDecimal[] values = blockValueSet.getBigDecimalValuesSV();
+    int numDocs = valueBlock.getNumDocs();
+    if (_nullHandlingEnabled) {
+      RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+      for (int i = 0; i < numDocs; i++) {
+        if (nullBitmap != null && nullBitmap.contains(i)) {
+          _hasNull = true;
+        } else if (add(values[i])) {
+          return true;
+        }
+      }
+    } else {
+      for (int i = 0; i < numDocs; i++) {
+        if (add(values[i])) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(BigDecimal value);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
index 870155bc3da..5babb84c41e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
@@ -25,11 +25,14 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -42,6 +45,7 @@ abstract class BaseRawBytesSingleColumnDistinctExecutor implements DistinctExecu
   final boolean _nullHandlingEnabled;
 
   final ObjectSet<ByteArray> _valueSet;
+  private boolean _hasNull;
 
   BaseRawBytesSingleColumnDistinctExecutor(ExpressionContext expression, DataType dataType, int limit,
       boolean nullHandlingEnabled) {
@@ -61,6 +65,36 @@ public DistinctTable getResult() {
     for (ByteArray value : _valueSet) {
       records.add(new Record(new Object[]{value}));
     }
+    if (_hasNull) {
+      records.add(new Record(new Object[]{null}));
+    }
+    assert records.size() <= _limit + 1;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    byte[][] values = blockValueSet.getBytesValuesSV();
+    int numDocs = valueBlock.getNumDocs();
+    if (_nullHandlingEnabled) {
+      RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+      for (int i = 0; i < numDocs; i++) {
+        if (nullBitmap != null && nullBitmap.contains(i)) {
+          _hasNull = true;
+        } else if (add(new ByteArray(values[i]))) {
+          return true;
+        }
+      }
+    } else {
+      for (int i = 0; i < numDocs; i++) {
+        if (add(new ByteArray(values[i]))) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(ByteArray byteArray);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawDoubleSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawDoubleSingleColumnDistinctExecutor.java
index 907b5c3b93e..452eefb1709 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawDoubleSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawDoubleSingleColumnDistinctExecutor.java
@@ -26,10 +26,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -58,7 +61,7 @@ abstract class BaseRawDoubleSingleColumnDistinctExecutor implements DistinctExec
   public DistinctTable getResult() {
     DataSchema dataSchema = new DataSchema(new String[]{_expression.toString()},
         new ColumnDataType[]{ColumnDataType.fromDataTypeSV(_dataType)});
-    List<Record> records = new ArrayList<>(_valueSet.size());
+    List<Record> records = new ArrayList<>(_valueSet.size() + (_hasNull ? 1 : 0));
     DoubleIterator valueIterator = _valueSet.iterator();
     while (valueIterator.hasNext()) {
       records.add(new Record(new Object[]{valueIterator.nextDouble()}));
@@ -66,6 +69,44 @@ public DistinctTable getResult() {
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
+    if (blockValueSet.isSingleValue()) {
+      double[] values = blockValueSet.getDoubleValuesSV();
+      if (_nullHandlingEnabled) {
+        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+        for (int i = 0; i < numDocs; i++) {
+          if (nullBitmap != null && nullBitmap.contains(i)) {
+            _hasNull = true;
+          } else if (add(values[i])) {
+            return true;
+          }
+        }
+      } else {
+        for (int i = 0; i < numDocs; i++) {
+          if (add(values[i])) {
+            return true;
+          }
+        }
+      }
+    } else {
+      int[][] values = blockValueSet.getIntValuesMV();
+      for (int i = 0; i < numDocs; i++) {
+        for (double value : values[i]) {
+          if (add(value)) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(double val);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawFloatSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawFloatSingleColumnDistinctExecutor.java
index 9648b26a87b..dd772a1e122 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawFloatSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawFloatSingleColumnDistinctExecutor.java
@@ -26,10 +26,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -58,7 +61,7 @@ abstract class BaseRawFloatSingleColumnDistinctExecutor implements DistinctExecu
   public DistinctTable getResult() {
     DataSchema dataSchema = new DataSchema(new String[]{_expression.toString()},
         new ColumnDataType[]{ColumnDataType.fromDataTypeSV(_dataType)});
-    List<Record> records = new ArrayList<>(_valueSet.size());
+    List<Record> records = new ArrayList<>(_valueSet.size() + (_hasNull ? 1 : 0));
     FloatIterator valueIterator = _valueSet.iterator();
     while (valueIterator.hasNext()) {
       records.add(new Record(new Object[]{valueIterator.nextFloat()}));
@@ -66,7 +69,44 @@ public DistinctTable getResult() {
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
-    assert records.size() <= _limit;
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
+    if (blockValueSet.isSingleValue()) {
+      float[] values = blockValueSet.getFloatValuesSV();
+      if (_nullHandlingEnabled) {
+        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+        for (int i = 0; i < numDocs; i++) {
+          if (nullBitmap != null && nullBitmap.contains(i)) {
+            _hasNull = true;
+          } else if (add(values[i])) {
+            return true;
+          }
+        }
+      } else {
+        for (int i = 0; i < numDocs; i++) {
+          if (add(values[i])) {
+            return true;
+          }
+        }
+      }
+    } else {
+      float[][] values = blockValueSet.getFloatValuesMV();
+      for (int i = 0; i < numDocs; i++) {
+        for (float value : values[i]) {
+          if (add(value)) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(float val);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawIntSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawIntSingleColumnDistinctExecutor.java
index c3b8413d339..b8f87b8d566 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawIntSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawIntSingleColumnDistinctExecutor.java
@@ -26,10 +26,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -59,7 +62,7 @@ abstract class BaseRawIntSingleColumnDistinctExecutor implements DistinctExecuto
   public DistinctTable getResult() {
     DataSchema dataSchema = new DataSchema(new String[]{_expression.toString()},
         new ColumnDataType[]{ColumnDataType.fromDataTypeSV(_dataType)});
-    List<Record> records = new ArrayList<>(_valueSet.size());
+    List<Record> records = new ArrayList<>(_valueSet.size() + (_hasNull ? 1 : 0));
     IntIterator valueIterator = _valueSet.iterator();
     while (valueIterator.hasNext()) {
       records.add(new Record(new Object[]{valueIterator.nextInt()}));
@@ -67,7 +70,44 @@ public DistinctTable getResult() {
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
-    assert records.size() <= _limit;
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
+    if (blockValueSet.isSingleValue()) {
+      int[] values = blockValueSet.getIntValuesSV();
+      if (_nullHandlingEnabled) {
+        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+        for (int i = 0; i < numDocs; i++) {
+          if (nullBitmap != null && nullBitmap.contains(i)) {
+            _hasNull = true;
+          } else if (add(values[i])) {
+            return true;
+          }
+        }
+      } else {
+        for (int i = 0; i < numDocs; i++) {
+          if (add(values[i])) {
+            return true;
+          }
+        }
+      }
+    } else {
+      int[][] values = blockValueSet.getIntValuesMV();
+      for (int i = 0; i < numDocs; i++) {
+        for (int value : values[i]) {
+          if (add(value)) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(int val);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawLongSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawLongSingleColumnDistinctExecutor.java
index a75d733c38c..eb627c74c21 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawLongSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawLongSingleColumnDistinctExecutor.java
@@ -26,10 +26,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -58,7 +61,7 @@ abstract class BaseRawLongSingleColumnDistinctExecutor implements DistinctExecut
   public DistinctTable getResult() {
     DataSchema dataSchema = new DataSchema(new String[]{_expression.toString()},
         new ColumnDataType[]{ColumnDataType.fromDataTypeSV(_dataType)});
-    List<Record> records = new ArrayList<>(_valueSet.size());
+    List<Record> records = new ArrayList<>(_valueSet.size() + (_hasNull ? 1 : 0));
     LongIterator valueIterator = _valueSet.iterator();
     while (valueIterator.hasNext()) {
       records.add(new Record(new Object[]{valueIterator.nextLong()}));
@@ -66,7 +69,44 @@ public DistinctTable getResult() {
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
-    assert records.size() <= _limit;
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
+    if (blockValueSet.isSingleValue()) {
+      long[] values = blockValueSet.getLongValuesSV();
+      if (_nullHandlingEnabled) {
+        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+        for (int i = 0; i < numDocs; i++) {
+          if (nullBitmap != null && nullBitmap.contains(i)) {
+            _hasNull = true;
+          } else if (add(values[i])) {
+            return true;
+          }
+        }
+      } else {
+        for (int i = 0; i < numDocs; i++) {
+          if (add(values[i])) {
+            return true;
+          }
+        }
+      }
+    } else {
+      long[][] values = blockValueSet.getLongValuesMV();
+      for (int i = 0; i < numDocs; i++) {
+        for (long value : values[i]) {
+          if (add(value)) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(long val);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
index 564a9c3e802..7b85a9a6484 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
@@ -25,10 +25,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -41,6 +44,7 @@ abstract class BaseRawStringSingleColumnDistinctExecutor implements DistinctExec
   final boolean _nullHandlingEnabled;
 
   final ObjectSet<String> _valueSet;
+  private boolean _hasNull;
 
   BaseRawStringSingleColumnDistinctExecutor(ExpressionContext expression, DataType dataType, int limit,
       boolean nullHandlingEnabled) {
@@ -60,6 +64,47 @@ public DistinctTable getResult() {
     for (String value : _valueSet) {
       records.add(new Record(new Object[]{value}));
     }
+    if (_hasNull) {
+      records.add(new Record(new Object[]{null}));
+    }
+    assert records.size() <= _limit + 1;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
+
+  @Override
+  public boolean process(ValueBlock valueBlock) {
+    BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expression);
+    int numDocs = valueBlock.getNumDocs();
+    if (blockValueSet.isSingleValue()) {
+      String[] values = blockValueSet.getStringValuesSV();
+      if (_nullHandlingEnabled) {
+        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
+        for (int i = 0; i < numDocs; i++) {
+          if (nullBitmap != null && nullBitmap.contains(i)) {
+            _hasNull = true;
+          } else if (add(values[i])) {
+            return true;
+          }
+        }
+      } else {
+        for (int i = 0; i < numDocs; i++) {
+          if (add(values[i])) {
+            return true;
+          }
+        }
+      }
+    } else {
+      String[][] values = blockValueSet.getStringValuesMV();
+      for (int i = 0; i < numDocs; i++) {
+        for (String value : values[i]) {
+          if (add(value)) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  protected abstract boolean add(String val);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOnlyExecutor.java
index a44ee36ef82..6f5bd46c83f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOnlyExecutor.java
@@ -20,11 +20,8 @@
 
 import java.math.BigDecimal;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -38,29 +35,8 @@ public RawBigDecimalSingleColumnDistinctOnlyExecutor(ExpressionContext expressio
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    BigDecimal[] values = blockValueSet.getBigDecimalValuesSV();
-    int numDocs = transformBlock.getNumDocs();
-    if (_nullHandlingEnabled) {
-      RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-      for (int i = 0; i < numDocs; i++) {
-        if (nullBitmap != null && nullBitmap.contains(i)) {
-          values[i] = null;
-        }
-        _valueSet.add(values[i]);
-        if (_valueSet.size() >= _limit) {
-          return true;
-        }
-      }
-    } else {
-      for (int i = 0; i < numDocs; i++) {
-        _valueSet.add(values[i]);
-        if (_valueSet.size() >= _limit) {
-          return true;
-        }
-      }
-    }
-    return false;
+  protected boolean add(BigDecimal value) {
+    _valueSet.add(value);
+    return _valueSet.size() >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOrderByExecutor.java
index db1d87fa66a..e0673f068a9 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBigDecimalSingleColumnDistinctOrderByExecutor.java
@@ -23,11 +23,8 @@
 import java.math.BigDecimal;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -42,35 +39,12 @@ public RawBigDecimalSingleColumnDistinctOrderByExecutor(ExpressionContext expres
 
     assert orderByExpression.getExpression().equals(expression);
     int comparisonFactor = orderByExpression.isAsc() ? -1 : 1;
-    if (nullHandlingEnabled) {
-      _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
-          (b1, b2) -> b1 == null ? (b2 == null ? 0 : 1) : (b2 == null ? -1 : b1.compareTo(b2)) * comparisonFactor);
-    } else {
-      _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
-          (b1, b2) -> b1.compareTo(b2) * comparisonFactor);
-    }
+    _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
+            (b1, b2) -> b1.compareTo(b2) * comparisonFactor);
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    BigDecimal[] values = blockValueSet.getBigDecimalValuesSV();
-    int numDocs = transformBlock.getNumDocs();
-    if (_nullHandlingEnabled) {
-      RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-      for (int i = 0; i < numDocs; i++) {
-        BigDecimal value = nullBitmap != null && nullBitmap.contains(i) ? null : values[i];
-        processInternal(value);
-      }
-    } else {
-      for (int i = 0; i < numDocs; i++) {
-        processInternal(values[i]);
-      }
-    }
-    return false;
-  }
-
-  private void processInternal(BigDecimal value) {
+  protected boolean add(BigDecimal value) {
     if (!_valueSet.contains(value)) {
       if (_valueSet.size() < _limit) {
         _valueSet.add(value);
@@ -85,5 +59,6 @@ private void processInternal(BigDecimal value) {
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOnlyExecutor.java
index 3340dbb09b3..fa666798825 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOnlyExecutor.java
@@ -19,12 +19,9 @@
 package org.apache.pinot.core.query.distinct.raw;
 
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -38,29 +35,8 @@ public RawBytesSingleColumnDistinctOnlyExecutor(ExpressionContext expression, Da
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    byte[][] values = blockValueSet.getBytesValuesSV();
-    int numDocs = transformBlock.getNumDocs();
-    if (_nullHandlingEnabled) {
-      RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-      for (int i = 0; i < numDocs; i++) {
-        if (nullBitmap != null && nullBitmap.contains(i)) {
-          values[i] = null;
-        }
-        _valueSet.add(new ByteArray(values[i]));
-        if (_valueSet.size() >= _limit) {
-          return true;
-        }
-      }
-    } else {
-      for (int i = 0; i < numDocs; i++) {
-        _valueSet.add(new ByteArray(values[i]));
-        if (_valueSet.size() >= _limit) {
-          return true;
-        }
-      }
-    }
-    return false;
+  protected boolean add(ByteArray byteArray) {
+    _valueSet.add(byteArray);
+    return _valueSet.size() >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOrderByExecutor.java
index b14cad6189a..03e3b26b3f6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawBytesSingleColumnDistinctOrderByExecutor.java
@@ -22,12 +22,9 @@
 import it.unimi.dsi.fastutil.objects.ObjectHeapPriorityQueue;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -42,48 +39,26 @@ public RawBytesSingleColumnDistinctOrderByExecutor(ExpressionContext expression,
 
     assert orderByExpression.getExpression().equals(expression);
     int comparisonFactor = orderByExpression.isAsc() ? -1 : 1;
-    if (nullHandlingEnabled) {
-      _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
-          (b1, b2) -> b1 == null ? (b2 == null ? 0 : 1) : (b2 == null ? -1 : b1.compareTo(b2)) * comparisonFactor);
-    } else {
-      _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
-          (b1, b2) -> b1.compareTo(b2) * comparisonFactor);
-    }
+    _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
+            (b1, b2) -> b1.compareTo(b2) * comparisonFactor);
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    byte[][] values = blockValueSet.getBytesValuesSV();
-    int numDocs = transformBlock.getNumDocs();
-    if (_nullHandlingEnabled) {
-      RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-      for (int i = 0; i < numDocs; i++) {
-        ByteArray value = nullBitmap != null && nullBitmap.contains(i) ? null : new ByteArray(values[i]);
-        processInternal(value);
-      }
-    } else {
-      for (int i = 0; i < numDocs; i++) {
-        processInternal(new ByteArray(values[i]));
-      }
-    }
-    return false;
-  }
-
-  private void processInternal(ByteArray value) {
-    if (!_valueSet.contains(value)) {
+  protected boolean add(ByteArray byteArray) {
+    if (!_valueSet.contains(byteArray)) {
       if (_valueSet.size() < _limit) {
-        _valueSet.add(value);
-        _priorityQueue.enqueue(value);
+        _valueSet.add(byteArray);
+        _priorityQueue.enqueue(byteArray);
       } else {
         ByteArray firstValue = _priorityQueue.first();
-        if (_priorityQueue.comparator().compare(value, firstValue) > 0) {
+        if (_priorityQueue.comparator().compare(byteArray, firstValue) > 0) {
           _valueSet.remove(firstValue);
-          _valueSet.add(value);
+          _valueSet.add(byteArray);
           _priorityQueue.dequeue();
-          _priorityQueue.enqueue(value);
+          _priorityQueue.enqueue(byteArray);
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOnlyExecutor.java
index 7cb926d221f..ded36ea9a35 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOnlyExecutor.java
@@ -19,11 +19,8 @@
 package org.apache.pinot.core.query.distinct.raw;
 
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -37,44 +34,8 @@ public RawDoubleSingleColumnDistinctOnlyExecutor(ExpressionContext expression, D
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      double[] values = blockValueSet.getDoubleValuesSV();
-      if (_nullHandlingEnabled) {
-        // TODO(nhejazi): consider having a separate set of classes to handle the case with null handling enabled.
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            _valueSet.add(values[i]);
-            if (_valueSet.size() >= _limit - (_hasNull ? 1 : 0)) {
-              return true;
-            }
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          _valueSet.add(values[i]);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    } else {
-      // TODO(nhejazi): support proper null handling in multi-valued columns.
-      double[][] values = blockValueSet.getDoubleValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (double value : values[i]) {
-          _valueSet.add(value);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
+  protected boolean add(double value) {
+    _valueSet.add(value);
+    return _valueSet.size() >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOrderByExecutor.java
index 5dbfec9b41c..6ddf633e4e2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawDoubleSingleColumnDistinctOrderByExecutor.java
@@ -22,11 +22,8 @@
 import it.unimi.dsi.fastutil.doubles.DoublePriorityQueue;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -46,39 +43,9 @@ public RawDoubleSingleColumnDistinctOrderByExecutor(ExpressionContext expression
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      double[] values = blockValueSet.getDoubleValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            add(values[i]);
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          add(values[i]);
-        }
-      }
-    } else {
-      double[][] values = blockValueSet.getDoubleValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (double value : values[i]) {
-          add(value);
-        }
-      }
-    }
-    return false;
-  }
-
-  private void add(double value) {
+  protected boolean add(double value) {
     if (!_valueSet.contains(value)) {
-      if (_valueSet.size() < _limit - (_hasNull ? 1 : 0)) {
+      if (_valueSet.size() < _limit) {
         _valueSet.add(value);
         _priorityQueue.enqueue(value);
       } else {
@@ -91,5 +58,6 @@ private void add(double value) {
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOnlyExecutor.java
index 2bd32ba1920..d37ceb730cc 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOnlyExecutor.java
@@ -19,11 +19,8 @@
 package org.apache.pinot.core.query.distinct.raw;
 
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -37,42 +34,8 @@ public RawFloatSingleColumnDistinctOnlyExecutor(ExpressionContext expression, Da
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      float[] values = blockValueSet.getFloatValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            _valueSet.add(values[i]);
-            if (_valueSet.size() >= _limit - (_hasNull ? 1 : 0)) {
-              return true;
-            }
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          _valueSet.add(values[i]);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    } else {
-      float[][] values = blockValueSet.getFloatValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (float value : values[i]) {
-          _valueSet.add(value);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
+  protected boolean add(float value) {
+    _valueSet.add(value);
+    return _valueSet.size() >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOrderByExecutor.java
index 50206647a4f..9ecc59a9db0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawFloatSingleColumnDistinctOrderByExecutor.java
@@ -22,11 +22,8 @@
 import it.unimi.dsi.fastutil.floats.FloatPriorityQueue;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -46,39 +43,9 @@ public RawFloatSingleColumnDistinctOrderByExecutor(ExpressionContext expression,
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      float[] values = blockValueSet.getFloatValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            add(values[i]);
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          add(values[i]);
-        }
-      }
-    } else {
-      float[][] values = blockValueSet.getFloatValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (float value : values[i]) {
-          add(value);
-        }
-      }
-    }
-    return false;
-  }
-
-  private void add(float value) {
+  protected boolean add(float value) {
     if (!_valueSet.contains(value)) {
-      if (_valueSet.size() < _limit - (_hasNull ? 1 : 0)) {
+      if (_valueSet.size() < _limit) {
         _valueSet.add(value);
         _priorityQueue.enqueue(value);
       } else {
@@ -91,5 +58,6 @@ private void add(float value) {
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
index ba4ba8fe8ea..5e15eccc778 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
@@ -19,11 +19,8 @@
 package org.apache.pinot.core.query.distinct.raw;
 
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -37,42 +34,8 @@ public RawIntSingleColumnDistinctOnlyExecutor(ExpressionContext expression, Data
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      int[] values = blockValueSet.getIntValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            _valueSet.add(values[i]);
-            if (_valueSet.size() >= _limit - (_hasNull ? 1 : 0)) {
-              return true;
-            }
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          _valueSet.add(values[i]);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    } else {
-      int[][] values = blockValueSet.getIntValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (int value : values[i]) {
-          _valueSet.add(value);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
+  protected boolean add(int val) {
+    _valueSet.add(val);
+    return (_valueSet.size() >= _limit);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOrderByExecutor.java
index 4d32dbfca24..313b2722c97 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOrderByExecutor.java
@@ -22,11 +22,8 @@
 import it.unimi.dsi.fastutil.ints.IntPriorityQueue;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -46,39 +43,9 @@ public RawIntSingleColumnDistinctOrderByExecutor(ExpressionContext expression, D
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      int[] values = blockValueSet.getIntValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            add(values[i]);
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          add(values[i]);
-        }
-      }
-    } else {
-      int[][] values = blockValueSet.getIntValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (int value : values[i]) {
-          add(value);
-        }
-      }
-    }
-    return false;
-  }
-
-  private void add(int value) {
+  protected boolean add(int value) {
     if (!_valueSet.contains(value)) {
-      if (_valueSet.size() < _limit - (_hasNull ? 1 : 0)) {
+      if (_valueSet.size() < _limit) {
         _valueSet.add(value);
         _priorityQueue.enqueue(value);
       } else {
@@ -91,5 +58,6 @@ private void add(int value) {
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOnlyExecutor.java
index 628b9bc2979..72bff91bd7b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOnlyExecutor.java
@@ -19,11 +19,8 @@
 package org.apache.pinot.core.query.distinct.raw;
 
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -37,42 +34,8 @@ public RawLongSingleColumnDistinctOnlyExecutor(ExpressionContext expression, Dat
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      long[] values = blockValueSet.getLongValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            _valueSet.add(values[i]);
-            if (_valueSet.size() >= _limit - (_hasNull ? 1 : 0)) {
-              return true;
-            }
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          _valueSet.add(values[i]);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    } else {
-      long[][] values = blockValueSet.getLongValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (long value : values[i]) {
-          _valueSet.add(value);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
+  protected boolean add(long val) {
+    _valueSet.add(val);
+    return _valueSet.size() >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOrderByExecutor.java
index 6dc74e69e03..77dd3330c99 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawLongSingleColumnDistinctOrderByExecutor.java
@@ -22,11 +22,8 @@
 import it.unimi.dsi.fastutil.longs.LongPriorityQueue;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -46,39 +43,9 @@ public RawLongSingleColumnDistinctOrderByExecutor(ExpressionContext expression,
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      long[] values = blockValueSet.getLongValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            _hasNull = true;
-          } else {
-            add(values[i]);
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          add(values[i]);
-        }
-      }
-    } else {
-      long[][] values = blockValueSet.getLongValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (long value : values[i]) {
-          add(value);
-        }
-      }
-    }
-    return false;
-  }
-
-  private void add(long value) {
+  protected boolean add(long value) {
     if (!_valueSet.contains(value)) {
-      if (_valueSet.size() < _limit - (_hasNull ? 1 : 0)) {
+      if (_valueSet.size() < _limit) {
         _valueSet.add(value);
         _priorityQueue.enqueue(value);
       } else {
@@ -91,5 +58,6 @@ private void add(long value) {
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawMultiColumnDistinctExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawMultiColumnDistinctExecutor.java
index 9f01dad4b0c..51ad0f95084 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawMultiColumnDistinctExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawMultiColumnDistinctExecutor.java
@@ -28,12 +28,13 @@
 import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.common.RowBasedBlockValueFetcher;
 import org.apache.pinot.core.data.table.Record;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.core.query.distinct.DistinctExecutorUtils;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
+import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -43,11 +44,14 @@ public class RawMultiColumnDistinctExecutor implements DistinctExecutor {
   private final List<ExpressionContext> _expressions;
   private final boolean _hasMVExpression;
   private final DistinctTable _distinctTable;
+  private final boolean _nullHandlingEnabled;
 
   public RawMultiColumnDistinctExecutor(List<ExpressionContext> expressions, boolean hasMVExpression,
-      List<DataType> dataTypes, @Nullable List<OrderByExpressionContext> orderByExpressions, int limit) {
+      List<DataType> dataTypes, @Nullable List<OrderByExpressionContext> orderByExpressions,
+      boolean nullHandlingEnabled, int limit) {
     _expressions = expressions;
     _hasMVExpression = hasMVExpression;
+    _nullHandlingEnabled = nullHandlingEnabled;
 
     int numExpressions = expressions.size();
     String[] columnNames = new String[numExpressions];
@@ -57,37 +61,48 @@ public RawMultiColumnDistinctExecutor(List<ExpressionContext> expressions, boole
       columnDataTypes[i] = ColumnDataType.fromDataTypeSV(dataTypes.get(i));
     }
     DataSchema dataSchema = new DataSchema(columnNames, columnDataTypes);
-    _distinctTable = new DistinctTable(dataSchema, orderByExpressions, limit, false);
+    _distinctTable = new DistinctTable(dataSchema, orderByExpressions, limit, _nullHandlingEnabled);
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    int numDocs = transformBlock.getNumDocs();
+  public boolean process(ValueBlock valueBlock) {
+    int numDocs = valueBlock.getNumDocs();
     int numExpressions = _expressions.size();
     if (!_hasMVExpression) {
       BlockValSet[] blockValSets = new BlockValSet[numExpressions];
       for (int i = 0; i < numExpressions; i++) {
-        blockValSets[i] = transformBlock.getBlockValueSet(_expressions.get(i));
+        blockValSets[i] = valueBlock.getBlockValueSet(_expressions.get(i));
+      }
+      RoaringBitmap[] nullBitmaps = new RoaringBitmap[numExpressions];
+      if (_nullHandlingEnabled) {
+        for (int i = 0; i < numExpressions; i++) {
+          nullBitmaps[i] = blockValSets[i].getNullBitmap();
+        }
       }
       RowBasedBlockValueFetcher valueFetcher = new RowBasedBlockValueFetcher(blockValSets);
-      if (_distinctTable.hasOrderBy()) {
-        for (int i = 0; i < numDocs; i++) {
-          Record record = new Record(valueFetcher.getRow(i));
-          _distinctTable.addWithOrderBy(record);
+      for (int docId = 0; docId < numDocs; docId++) {
+        Record record = new Record(valueFetcher.getRow(docId));
+        if (_nullHandlingEnabled) {
+          for (int i = 0; i < numExpressions; i++) {
+            if (nullBitmaps[i] != null && nullBitmaps[i].contains(docId)) {
+              record.getValues()[i] = null;
+            }
+          }
         }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          Record record = new Record(valueFetcher.getRow(i));
+        if (_distinctTable.hasOrderBy()) {
+          _distinctTable.addWithOrderBy(record);
+        } else {
           if (_distinctTable.addWithoutOrderBy(record)) {
             return true;
           }
         }
       }
     } else {
+      // TODO(https://github.com/apache/pinot/issues/10882): support NULL for multi-value
       Object[][] svValues = new Object[numExpressions][];
       Object[][][] mvValues = new Object[numExpressions][][];
       for (int i = 0; i < numExpressions; i++) {
-        BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expressions.get(i));
+        BlockValSet blockValueSet = valueBlock.getBlockValueSet(_expressions.get(i));
         if (blockValueSet.isSingleValue()) {
           svValues[i] = getSVValues(blockValueSet, numDocs);
         } else {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOnlyExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOnlyExecutor.java
index 4aa90a5b41d..97d57f0845d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOnlyExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOnlyExecutor.java
@@ -19,11 +19,8 @@
 package org.apache.pinot.core.query.distinct.raw;
 
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -37,41 +34,8 @@ public RawStringSingleColumnDistinctOnlyExecutor(ExpressionContext expression, D
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      String[] values = blockValueSet.getStringValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          if (nullBitmap != null && nullBitmap.contains(i)) {
-            values[i] = null;
-          }
-          _valueSet.add(values[i]);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          _valueSet.add(values[i]);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    } else {
-      String[][] values = blockValueSet.getStringValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (String value : values[i]) {
-          _valueSet.add(value);
-          if (_valueSet.size() >= _limit) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
+  protected boolean add(String value) {
+    _valueSet.add(value);
+    return _valueSet.size() >= _limit;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOrderByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOrderByExecutor.java
index 6ecd8ab9325..d86bad4e903 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOrderByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawStringSingleColumnDistinctOrderByExecutor.java
@@ -22,11 +22,8 @@
 import it.unimi.dsi.fastutil.objects.ObjectHeapPriorityQueue;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
 import org.apache.pinot.core.query.distinct.DistinctExecutor;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.roaringbitmap.RoaringBitmap;
 
 
 /**
@@ -41,43 +38,12 @@ public RawStringSingleColumnDistinctOrderByExecutor(ExpressionContext expression
 
     assert orderByExpression.getExpression().equals(expression);
     int comparisonFactor = orderByExpression.isAsc() ? -1 : 1;
-    if (nullHandlingEnabled) {
-      _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
-          (s1, s2) -> s1 == null ? (s2 == null ? 0 : 1) : (s2 == null ? -1 : s1.compareTo(s2)) * comparisonFactor);
-    } else {
-      _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
-          (s1, s2) -> s1.compareTo(s2) * comparisonFactor);
-    }
+    _priorityQueue = new ObjectHeapPriorityQueue<>(Math.min(limit, MAX_INITIAL_CAPACITY),
+        (s1, s2) -> s1.compareTo(s2) * comparisonFactor);
   }
 
   @Override
-  public boolean process(TransformBlock transformBlock) {
-    BlockValSet blockValueSet = transformBlock.getBlockValueSet(_expression);
-    int numDocs = transformBlock.getNumDocs();
-    if (blockValueSet.isSingleValue()) {
-      String[] values = blockValueSet.getStringValuesSV();
-      if (_nullHandlingEnabled) {
-        RoaringBitmap nullBitmap = blockValueSet.getNullBitmap();
-        for (int i = 0; i < numDocs; i++) {
-          add(nullBitmap != null && nullBitmap.contains(i) ? null : values[i]);
-        }
-      } else {
-        for (int i = 0; i < numDocs; i++) {
-          add(values[i]);
-        }
-      }
-    } else {
-      String[][] values = blockValueSet.getStringValuesMV();
-      for (int i = 0; i < numDocs; i++) {
-        for (String value : values[i]) {
-          add(value);
-        }
-      }
-    }
-    return false;
-  }
-
-  private void add(String value) {
+  protected boolean add(String value) {
     if (!_valueSet.contains(value)) {
       if (_valueSet.size() < _limit) {
         _valueSet.add(value);
@@ -92,5 +58,6 @@ private void add(String value) {
         }
       }
     }
+    return false;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/executor/QueryExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/executor/QueryExecutor.java
index b7ac4727431..c305ecee493 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/executor/QueryExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/executor/QueryExecutor.java
@@ -39,6 +39,7 @@ public interface QueryExecutor {
   /**
    * Initializes the query executor.
    * <p>Should be called only once and before calling any other method.
+   * <p>NOTE: The config is the subset of server config with prefix 'pinot.server.query.executor'
    */
   void init(PinotConfiguration config, InstanceDataManager instanceDataManager, ServerMetrics serverMetrics)
       throws ConfigurationException;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/executor/ServerQueryExecutorV1Impl.java b/pinot-core/src/main/java/org/apache/pinot/core/query/executor/ServerQueryExecutorV1Impl.java
index 40dff35893d..eae67322678 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/executor/ServerQueryExecutorV1Impl.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/executor/ServerQueryExecutorV1Impl.java
@@ -47,15 +47,13 @@
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.data.manager.InstanceDataManager;
 import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.core.operator.InstanceResponseOperator;
 import org.apache.pinot.core.operator.blocks.InstanceResponseBlock;
 import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.BaseResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.ExplainResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.ResultsBlockUtils;
-import org.apache.pinot.core.operator.filter.EmptyFilterOperator;
-import org.apache.pinot.core.operator.filter.MatchAllFilterOperator;
 import org.apache.pinot.core.plan.Plan;
-import org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2;
 import org.apache.pinot.core.plan.maker.PlanMaker;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.config.QueryExecutorConfig;
@@ -78,8 +76,8 @@
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
 import org.apache.pinot.spi.exception.QueryCancelledException;
+import org.apache.pinot.spi.plugin.PluginManager;
 import org.apache.pinot.spi.trace.Tracing;
-import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,7 +94,7 @@ public class ServerQueryExecutorV1Impl implements QueryExecutor {
   private ServerMetrics _serverMetrics;
   private SegmentPrunerService _segmentPrunerService;
   private PlanMaker _planMaker;
-  private long _defaultTimeoutMs = CommonConstants.Server.DEFAULT_QUERY_EXECUTOR_TIMEOUT_MS;
+  private long _defaultTimeoutMs;
   private boolean _enablePrefetch;
 
   @Override
@@ -108,11 +106,15 @@ public synchronized void init(PinotConfiguration config, InstanceDataManager ins
     QueryExecutorConfig queryExecutorConfig = new QueryExecutorConfig(config);
     LOGGER.info("Trying to build SegmentPrunerService");
     _segmentPrunerService = new SegmentPrunerService(queryExecutorConfig.getPrunerConfig());
-    LOGGER.info("Trying to build QueryPlanMaker");
-    _planMaker = new InstancePlanMakerImplV2(queryExecutorConfig);
-    if (queryExecutorConfig.getTimeOut() > 0) {
-      _defaultTimeoutMs = queryExecutorConfig.getTimeOut();
+    String planMakerClass = queryExecutorConfig.getPlanMakerClass();
+    LOGGER.info("Trying to build PlanMaker with class: {}", planMakerClass);
+    try {
+      _planMaker = PluginManager.get().createInstance(planMakerClass);
+    } catch (Exception e) {
+      throw new RuntimeException("Caught exception while creating PlanMaker with class: " + planMakerClass);
     }
+    _planMaker.init(config);
+    _defaultTimeoutMs = queryExecutorConfig.getTimeOut();
     _enablePrefetch = Boolean.parseBoolean(config.getProperty(ENABLE_PREFETCH));
     LOGGER.info("Initialized query executor with defaultTimeoutMs: {}, enablePrefetch: {}", _defaultTimeoutMs,
         _enablePrefetch);
@@ -268,10 +270,11 @@ private InstanceResponseBlock executeInternal(ServerQueryRequest queryRequest, E
         // return the error table to broker sooner than here. But in case of race condition, we construct the error
         // table here too.
         instanceResponse.addException(QueryException.getException(QueryException.QUERY_CANCELLATION_ERROR,
-            "Query cancelled on: " + _instanceDataManager.getInstanceId() + e));
+            "Query cancelled on: " + _instanceDataManager.getInstanceId() + " " + e));
       } else {
         LOGGER.error("Exception processing requestId {}", requestId, e);
-        instanceResponse.addException(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, e));
+        instanceResponse.addException(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR,
+            "Query execution error on: " + _instanceDataManager.getInstanceId() + " " + e));
       }
     } finally {
       for (SegmentDataManager segmentDataManager : segmentDataManagers) {
@@ -351,7 +354,8 @@ private InstanceResponseBlock executeInternal(List<IndexSegment> indexSegments,
     TimerContext.Timer segmentPruneTimer = timerContext.startNewPhaseTimer(ServerQueryPhase.SEGMENT_PRUNING);
     int numTotalSegments = indexSegments.size();
     SegmentPrunerStatistics prunerStats = new SegmentPrunerStatistics();
-    List<IndexSegment> selectedSegments = _segmentPrunerService.prune(indexSegments, queryContext, prunerStats);
+    List<IndexSegment> selectedSegments =
+        _segmentPrunerService.prune(indexSegments, queryContext, prunerStats, executorService);
     segmentPruneTimer.stopAndRecord();
     int numSelectedSegments = selectedSegments.size();
     LOGGER.debug("Matched {} segments after pruning", numSelectedSegments);
@@ -413,7 +417,9 @@ private static Map<Integer, List<ExplainPlanRows>> getAllSegmentsUniqueExplainPl
       int[] operatorId = {3};
       ExplainPlanRows explainPlanRows = new ExplainPlanRows();
       // Get the segment explain plan for a single segment
-      getSegmentExplainPlanRowData(child, explainPlanRows, operatorId, 2);
+      if (child != null) {
+        child.explainPlan(explainPlanRows, operatorId, 2);
+      }
       int numRows = explainPlanRows.getExplainPlanRowData().size();
       if (numRows > 0) {
         operatorDepthToRowDataMap.putIfAbsent(numRows, new ArrayList<>());
@@ -453,72 +459,52 @@ private static Map<Integer, List<ExplainPlanRows>> getAllSegmentsUniqueExplainPl
     return operatorDepthToRowDataMap;
   }
 
-  /**
-   * Get the list of Explain Plan rows for a single segment
-   */
-  private static void getSegmentExplainPlanRowData(Operator node, ExplainPlanRows explainPlanRows, int[] globalId,
-      int parentId) {
-    if (node == null) {
-      return;
-    }
-
-    String explainPlanString = node.toExplainString();
-    if (explainPlanString != null) {
-      ExplainPlanRowData explainPlanRowData = new ExplainPlanRowData(explainPlanString, globalId[0], parentId);
-      parentId = globalId[0]++;
-      explainPlanRows.appendExplainPlanRowData(explainPlanRowData);
-      if (node instanceof EmptyFilterOperator) {
-        explainPlanRows.setHasEmptyFilter(true);
-      }
-      if (node instanceof MatchAllFilterOperator) {
-        explainPlanRows.setHasMatchAllFilter(true);
-      }
-    }
-
-    List<Operator> children = node.getChildOperators();
-    for (Operator child : children) {
-      getSegmentExplainPlanRowData(child, explainPlanRows, globalId, parentId);
-    }
-  }
-
   public static InstanceResponseBlock executeExplainQuery(Plan queryPlan, QueryContext queryContext) {
     ExplainResultsBlock explainResults = new ExplainResultsBlock();
-    List<? extends Operator> childOperators = queryPlan.getPlanNode().run().getChildOperators();
-    assert childOperators.size() == 1;
-    Operator root = childOperators.get(0);
-    Map<Integer, List<ExplainPlanRows>> operatorDepthToRowDataMap;
-    int numEmptyFilterSegments = 0;
-    int numMatchAllFilterSegments = 0;
-
-    // Get the list of unique explain plans
-    operatorDepthToRowDataMap = getAllSegmentsUniqueExplainPlanRowData(root);
-    List<ExplainPlanRows> listOfExplainPlans = new ArrayList<>();
-    operatorDepthToRowDataMap.forEach((key, value) -> listOfExplainPlans.addAll(value));
-
-    // Setup the combine root's explain string
-    explainResults.addOperator(root.toExplainString(), 2, 1);
-
-    // Walk through all the explain plans and create the entries in the explain plan output for each plan
-    for (ExplainPlanRows explainPlanRows : listOfExplainPlans) {
-      numEmptyFilterSegments +=
-          explainPlanRows.isHasEmptyFilter() ? explainPlanRows.getNumSegmentsMatchingThisPlan() : 0;
-      numMatchAllFilterSegments +=
-          explainPlanRows.isHasMatchAllFilter() ? explainPlanRows.getNumSegmentsMatchingThisPlan() : 0;
-      explainResults.addOperator(
-          String.format(ExplainPlanRows.PLAN_START_FORMAT, explainPlanRows.getNumSegmentsMatchingThisPlan()),
-          ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS);
-      for (ExplainPlanRowData explainPlanRowData : explainPlanRows.getExplainPlanRowData()) {
-        explainResults.addOperator(explainPlanRowData.getExplainPlanString(), explainPlanRowData.getOperatorId(),
-            explainPlanRowData.getParentId());
+    InstanceResponseOperator responseOperator = (InstanceResponseOperator) queryPlan.getPlanNode().run();
+
+    try {
+      responseOperator.prefetchAll();
+
+      List<? extends Operator> childOperators = queryPlan.getPlanNode().run().getChildOperators();
+      assert childOperators.size() == 1;
+      Operator root = childOperators.get(0);
+      Map<Integer, List<ExplainPlanRows>> operatorDepthToRowDataMap;
+      int numEmptyFilterSegments = 0;
+      int numMatchAllFilterSegments = 0;
+
+      // Get the list of unique explain plans
+      operatorDepthToRowDataMap = getAllSegmentsUniqueExplainPlanRowData(root);
+      List<ExplainPlanRows> listOfExplainPlans = new ArrayList<>();
+      operatorDepthToRowDataMap.forEach((key, value) -> listOfExplainPlans.addAll(value));
+
+      // Setup the combine root's explain string
+      explainResults.addOperator(root.toExplainString(), 2, 1);
+
+      // Walk through all the explain plans and create the entries in the explain plan output for each plan
+      for (ExplainPlanRows explainPlanRows : listOfExplainPlans) {
+        numEmptyFilterSegments +=
+            explainPlanRows.isHasEmptyFilter() ? explainPlanRows.getNumSegmentsMatchingThisPlan() : 0;
+        numMatchAllFilterSegments +=
+            explainPlanRows.isHasMatchAllFilter() ? explainPlanRows.getNumSegmentsMatchingThisPlan() : 0;
+        explainResults.addOperator(
+            String.format(ExplainPlanRows.PLAN_START_FORMAT, explainPlanRows.getNumSegmentsMatchingThisPlan()),
+            ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS);
+        for (ExplainPlanRowData explainPlanRowData : explainPlanRows.getExplainPlanRowData()) {
+          explainResults.addOperator(explainPlanRowData.getExplainPlanString(), explainPlanRowData.getOperatorId(),
+              explainPlanRowData.getParentId());
+        }
       }
-    }
 
-    InstanceResponseBlock instanceResponse = new InstanceResponseBlock(explainResults, queryContext);
-    instanceResponse.addMetadata(MetadataKey.EXPLAIN_PLAN_NUM_EMPTY_FILTER_SEGMENTS.getName(),
-        String.valueOf(numEmptyFilterSegments));
-    instanceResponse.addMetadata(MetadataKey.EXPLAIN_PLAN_NUM_MATCH_ALL_FILTER_SEGMENTS.getName(),
-        String.valueOf(numMatchAllFilterSegments));
-    return instanceResponse;
+      InstanceResponseBlock instanceResponse = new InstanceResponseBlock(explainResults, queryContext);
+      instanceResponse.addMetadata(MetadataKey.EXPLAIN_PLAN_NUM_EMPTY_FILTER_SEGMENTS.getName(),
+          String.valueOf(numEmptyFilterSegments));
+      instanceResponse.addMetadata(MetadataKey.EXPLAIN_PLAN_NUM_MATCH_ALL_FILTER_SEGMENTS.getName(),
+          String.valueOf(numMatchAllFilterSegments));
+      return instanceResponse;
+    } finally {
+      responseOperator.releaseAll();
+    }
   }
 
   /**
@@ -572,7 +558,8 @@ private void handleSubquery(ExpressionContext expression, List<IndexSegment> ind
       ExpressionContext subqueryExpression = arguments.get(1);
       Preconditions.checkState(subqueryExpression.getType() == ExpressionContext.Type.LITERAL,
           "Second argument of IN_PARTITIONED_SUBQUERY must be a literal (subquery)");
-      QueryContext subquery = QueryContextConverterUtils.getQueryContext(subqueryExpression.getLiteralString());
+      QueryContext subquery =
+          QueryContextConverterUtils.getQueryContext(subqueryExpression.getLiteral().getStringValue());
       // Subquery should be an ID_SET aggregation only query
       //noinspection rawtypes
       AggregationFunction[] aggregationFunctions = subquery.getAggregationFunctions();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/QueryOptimizer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/QueryOptimizer.java
index d0b0c549c34..0b98cdb88ff 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/QueryOptimizer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/QueryOptimizer.java
@@ -26,6 +26,7 @@
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.core.query.optimizer.filter.FilterOptimizer;
 import org.apache.pinot.core.query.optimizer.filter.FlattenAndOrFilterOptimizer;
+import org.apache.pinot.core.query.optimizer.filter.IdenticalPredicateFilterOptimizer;
 import org.apache.pinot.core.query.optimizer.filter.MergeEqInFilterOptimizer;
 import org.apache.pinot.core.query.optimizer.filter.MergeRangeFilterOptimizer;
 import org.apache.pinot.core.query.optimizer.filter.NumericalFilterOptimizer;
@@ -43,8 +44,9 @@ public class QueryOptimizer {
   // - TimePredicateFilterOptimizer and MergeRangeFilterOptimizer relies on NumericalFilterOptimizer to convert the
   //   values to the proper format so that they can be properly parsed
   private static final List<FilterOptimizer> FILTER_OPTIMIZERS =
-      Arrays.asList(new FlattenAndOrFilterOptimizer(), new MergeEqInFilterOptimizer(), new NumericalFilterOptimizer(),
-          new TimePredicateFilterOptimizer(), new MergeRangeFilterOptimizer());
+      Arrays.asList(new FlattenAndOrFilterOptimizer(), new IdenticalPredicateFilterOptimizer(),
+          new MergeEqInFilterOptimizer(), new NumericalFilterOptimizer(), new TimePredicateFilterOptimizer(),
+          new MergeRangeFilterOptimizer());
 
   private static final List<StatementOptimizer> STATEMENT_OPTIMIZERS =
       Collections.singletonList(new StringPredicateFilterOptimizer());
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/BaseAndOrBooleanFilterOptimizer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/BaseAndOrBooleanFilterOptimizer.java
new file mode 100644
index 00000000000..5ef10d09721
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/BaseAndOrBooleanFilterOptimizer.java
@@ -0,0 +1,129 @@
+/**
+ * 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.pinot.core.query.optimizer.filter;
+
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.request.Expression;
+import org.apache.pinot.common.request.Function;
+import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.sql.FilterKind;
+
+
+/**
+ * This base class acts as a helper for any optimizer that is effectively removing filter conditions.
+ * It provides TRUE/FALSE literal classes that can be used to replace filter expressions that are always true/false.
+ * It provides an optimization implementation for AND/OR/NOT expressions.
+ */
+public abstract class BaseAndOrBooleanFilterOptimizer implements FilterOptimizer {
+
+  protected static final Expression TRUE = RequestUtils.getLiteralExpression(true);
+  protected static final Expression FALSE = RequestUtils.getLiteralExpression(false);
+
+  /**
+   * This recursively optimizes each part of the filter expression. For any AND/OR/NOT,
+   * we optimize each child, then we optimize the remaining statement. If there is only
+   * a child statement, we optimize that.
+   */
+  @Override
+  public Expression optimize(Expression filterExpression, @Nullable Schema schema) {
+    if (!canBeOptimized(filterExpression, schema)) {
+      return filterExpression;
+    }
+
+    Function function = filterExpression.getFunctionCall();
+    List<Expression> operands = function.getOperands();
+    FilterKind kind = FilterKind.valueOf(function.getOperator());
+    switch (kind) {
+      case AND:
+      case OR:
+      case NOT:
+        // Recursively traverse the expression tree to find an operator node that can be rewritten.
+        operands.replaceAll(operand -> optimize(operand, schema));
+
+        // We have rewritten the child operands, so rewrite the parent if needed.
+        return optimizeCurrent(filterExpression);
+      default:
+        return optimizeChild(filterExpression, schema);
+    }
+  }
+
+  abstract boolean canBeOptimized(Expression filterExpression, @Nullable Schema schema);
+
+  /**
+   * Optimize any cases that are not AND/OR/NOT. This should be done by converting any cases
+   * that are always true to TRUE or always false to FALSE.
+   */
+  abstract Expression optimizeChild(Expression filterExpression, @Nullable Schema schema);
+
+  /**
+   * If any of the operands of AND function is "false", then the AND function itself is false and can be replaced with
+   * "false" literal. Otherwise, remove all the "true" operands of the AND function. Similarly, if any of the operands
+   * of OR function is "true", then the OR function itself is true and can be replaced with "true" literal. Otherwise,
+   * remove all the "false" operands of the OR function.
+   */
+  protected Expression optimizeCurrent(Expression expression) {
+    Function function = expression.getFunctionCall();
+    String operator = function.getOperator();
+    List<Expression> operands = function.getOperands();
+    if (operator.equals(FilterKind.AND.name())) {
+      // If any of the literal operands are always false, then replace AND function with FALSE.
+      for (Expression operand : operands) {
+        if (operand.equals(FALSE)) {
+          return FALSE;
+        }
+      }
+
+      // Remove all Literal operands that are always true.
+      operands.removeIf(operand -> operand.equals(TRUE));
+      if (operands.isEmpty()) {
+        return TRUE;
+      }
+    } else if (operator.equals(FilterKind.OR.name())) {
+      // If any of the literal operands are always true, then replace OR function with TRUE
+      for (Expression operand : operands) {
+        if (operand.equals(TRUE)) {
+          return TRUE;
+        }
+      }
+
+      // Remove all Literal operands that are always false.
+      operands.removeIf(operand -> operand.equals(FALSE));
+      if (operands.isEmpty()) {
+        return FALSE;
+      }
+    } else if (operator.equals(FilterKind.NOT.name())) {
+      assert operands.size() == 1;
+      Expression operand = operands.get(0);
+      if (operand.equals(TRUE)) {
+        return FALSE;
+      }
+      if (operand.equals(FALSE)) {
+        return TRUE;
+      }
+    }
+    return expression;
+  }
+
+  /** Change the expression value to boolean literal with given value. */
+  protected static Expression getExpressionFromBoolean(boolean value) {
+    return value ? TRUE : FALSE;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/FlattenAndOrFilterOptimizer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/FlattenAndOrFilterOptimizer.java
index 1b04f472de9..a1de7bd7c6e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/FlattenAndOrFilterOptimizer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/FlattenAndOrFilterOptimizer.java
@@ -40,6 +40,9 @@ public Expression optimize(Expression filterExpression, @Nullable Schema schema)
 
   private Expression optimize(Expression filterExpression) {
     Function function = filterExpression.getFunctionCall();
+    if (function == null) {
+      return filterExpression;
+    }
     String operator = function.getOperator();
     if (!operator.equals(FilterKind.AND.name()) && !operator.equals(FilterKind.OR.name())) {
       return filterExpression;
@@ -50,7 +53,7 @@ private Expression optimize(Expression filterExpression) {
     for (Expression child : children) {
       Expression optimizedChild = optimize(child);
       Function childFunction = optimizedChild.getFunctionCall();
-      if (childFunction.getOperator().equals(operator)) {
+      if (childFunction != null && childFunction.getOperator().equals(operator)) {
         newChildren.addAll(childFunction.getOperands());
       } else {
         newChildren.add(optimizedChild);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/IdenticalPredicateFilterOptimizer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/IdenticalPredicateFilterOptimizer.java
new file mode 100644
index 00000000000..cd03842c6d4
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/IdenticalPredicateFilterOptimizer.java
@@ -0,0 +1,106 @@
+/**
+ * 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.pinot.core.query.optimizer.filter;
+
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.request.Expression;
+import org.apache.pinot.common.request.Function;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.sql.FilterKind;
+
+
+/**
+ * This optimizer converts all predicates where the left hand side == right hand side to
+ * a simple TRUE/FALSE literal value. While filters like, WHERE 1=1 OR "col1"="col1" are not
+ * typical, they end up expensive in Pinot because they are rewritten as A-A==0.
+ */
+public class IdenticalPredicateFilterOptimizer extends BaseAndOrBooleanFilterOptimizer {
+
+  @Override
+  boolean canBeOptimized(Expression filterExpression, @Nullable Schema schema) {
+    // if there's no function call, there's no lhs or rhs
+    return filterExpression.getFunctionCall() != null;
+  }
+
+  @Override
+  Expression optimizeChild(Expression filterExpression, @Nullable Schema schema) {
+    Function function = filterExpression.getFunctionCall();
+    FilterKind kind = FilterKind.valueOf(function.getOperator());
+    switch (kind) {
+      case EQUALS:
+        if (hasIdenticalLhsAndRhs(function.getOperands())) {
+          return TRUE;
+        }
+        break;
+      case NOT_EQUALS:
+        if (hasIdenticalLhsAndRhs(function.getOperands())) {
+          return FALSE;
+        }
+        break;
+      default:
+        break;
+    }
+    return filterExpression;
+  }
+
+  /**
+   * Pinot queries of the WHERE 1 != 1 AND "col1" = "col2" variety are rewritten as
+   * 1-1 != 0 AND "col1"-"col2" = 0. Therefore, we check specifically for the case where
+   * the operand is set up in this fashion.
+   *
+   * We return false specifically after every check to ensure we're only continuing when
+   * the input looks as expected. Otherwise, it's easy to for one of the operand functions
+   * to return null and fail the query.
+   *
+   * TODO: The rewrite is already happening in PredicateComparisonRewriter.updateFunctionExpression(),
+   * so we might just compare the lhs and rhs there.
+   */
+  private boolean hasIdenticalLhsAndRhs(List<Expression> operands) {
+    boolean hasTwoChildren = operands.size() == 2;
+    Expression firstChild = operands.get(0);
+    if (firstChild.getFunctionCall() == null || !hasTwoChildren) {
+      return false;
+    }
+    boolean firstChildIsMinusOperator = firstChild.getFunctionCall().getOperator().equals("minus");
+    if (!firstChildIsMinusOperator) {
+      return false;
+    }
+    boolean firstChildHasTwoOperands = firstChild.getFunctionCall().getOperandsSize() == 2;
+    if (!firstChildHasTwoOperands) {
+      return false;
+    }
+    Expression minusOperandFirstChild = firstChild.getFunctionCall().getOperands().get(0);
+    Expression minusOperandSecondChild = firstChild.getFunctionCall().getOperands().get(1);
+    if (minusOperandFirstChild == null || minusOperandSecondChild == null || !minusOperandFirstChild.equals(
+        minusOperandSecondChild)) {
+      return false;
+    }
+    Expression secondChild = operands.get(1);
+    return isLiteralZero(secondChild);
+  }
+
+  private boolean isLiteralZero(Expression expression) {
+    if (!expression.isSetLiteral()) {
+      return false;
+    }
+    Object literalValue = expression.getLiteral().getFieldValue();
+    return literalValue.equals(0) || literalValue.equals(0L) || literalValue.equals(0d);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/MergeEqInFilterOptimizer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/MergeEqInFilterOptimizer.java
index 21fbf324bde..49a9ad171f2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/MergeEqInFilterOptimizer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/MergeEqInFilterOptimizer.java
@@ -56,6 +56,9 @@ public Expression optimize(Expression filterExpression, @Nullable Schema schema)
 
   private Expression optimize(Expression filterExpression) {
     Function function = filterExpression.getFunctionCall();
+    if (function == null) {
+      return filterExpression;
+    }
     String operator = function.getOperator();
     if (operator.equals(FilterKind.OR.name())) {
       List<Expression> children = function.getOperands();
@@ -66,49 +69,53 @@ private Expression optimize(Expression filterExpression) {
       // Iterate over all the child filters to merge EQ and IN predicates
       for (Expression child : children) {
         Function childFunction = child.getFunctionCall();
-        String childOperator = childFunction.getOperator();
-        assert !childOperator.equals(FilterKind.OR.name());
-        if (childOperator.equals(FilterKind.AND.name()) || childOperator.equals(FilterKind.NOT.name())) {
-          childFunction.getOperands().replaceAll(this::optimize);
+        if (childFunction == null) {
           newChildren.add(child);
-        } else if (childOperator.equals(FilterKind.EQUALS.name())) {
-          List<Expression> operands = childFunction.getOperands();
-          Expression lhs = operands.get(0);
-          Expression value = operands.get(1);
-          Set<Expression> values = valuesMap.get(lhs);
-          if (values == null) {
-            values = new HashSet<>();
-            values.add(value);
-            valuesMap.put(lhs, values);
-          } else {
-            values.add(value);
-            // Recreate filter when multiple predicates can be merged
-            recreateFilter = true;
-          }
-        } else if (childOperator.equals(FilterKind.IN.name())) {
-          List<Expression> operands = childFunction.getOperands();
-          Expression lhs = operands.get(0);
-          Set<Expression> inPredicateValuesSet = new HashSet<>();
-          int numOperands = operands.size();
-          for (int i = 1; i < numOperands; i++) {
-            inPredicateValuesSet.add(operands.get(i));
-          }
-          int numUniqueValues = inPredicateValuesSet.size();
-          if (numUniqueValues == 1 || numUniqueValues != numOperands - 1) {
-            // Recreate filter when the IN predicate contains only 1 value (can be rewritten to EQ predicate), or values
-            // can be de-duplicated
-            recreateFilter = true;
-          }
-          Set<Expression> values = valuesMap.get(lhs);
-          if (values == null) {
-            valuesMap.put(lhs, inPredicateValuesSet);
+        } else {
+          String childOperator = childFunction.getOperator();
+          assert !childOperator.equals(FilterKind.OR.name());
+          if (childOperator.equals(FilterKind.AND.name()) || childOperator.equals(FilterKind.NOT.name())) {
+            childFunction.getOperands().replaceAll(this::optimize);
+            newChildren.add(child);
+          } else if (childOperator.equals(FilterKind.EQUALS.name())) {
+            List<Expression> operands = childFunction.getOperands();
+            Expression lhs = operands.get(0);
+            Expression value = operands.get(1);
+            Set<Expression> values = valuesMap.get(lhs);
+            if (values == null) {
+              values = new HashSet<>();
+              values.add(value);
+              valuesMap.put(lhs, values);
+            } else {
+              values.add(value);
+              // Recreate filter when multiple predicates can be merged
+              recreateFilter = true;
+            }
+          } else if (childOperator.equals(FilterKind.IN.name())) {
+            List<Expression> operands = childFunction.getOperands();
+            Expression lhs = operands.get(0);
+            Set<Expression> inPredicateValuesSet = new HashSet<>();
+            int numOperands = operands.size();
+            for (int i = 1; i < numOperands; i++) {
+              inPredicateValuesSet.add(operands.get(i));
+            }
+            int numUniqueValues = inPredicateValuesSet.size();
+            if (numUniqueValues == 1 || numUniqueValues != numOperands - 1) {
+              // Recreate filter when the IN predicate contains only 1 value (can be rewritten to EQ predicate),
+              // or values can be de-duplicated
+              recreateFilter = true;
+            }
+            Set<Expression> values = valuesMap.get(lhs);
+            if (values == null) {
+              valuesMap.put(lhs, inPredicateValuesSet);
+            } else {
+              values.addAll(inPredicateValuesSet);
+              // Recreate filter when multiple predicates can be merged
+              recreateFilter = true;
+            }
           } else {
-            values.addAll(inPredicateValuesSet);
-            // Recreate filter when multiple predicates can be merged
-            recreateFilter = true;
+            newChildren.add(child);
           }
-        } else {
-          newChildren.add(child);
         }
       }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/NumericalFilterOptimizer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/NumericalFilterOptimizer.java
index a50484889fa..5a8baeb3fac 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/NumericalFilterOptimizer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/optimizer/filter/NumericalFilterOptimizer.java
@@ -25,13 +25,11 @@
 import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.Literal;
-import org.apache.pinot.common.utils.request.RequestUtils;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.sql.FilterKind;
 
 
-
 /**
  * Numerical expressions of form "column <operator> literal", where operator can be '=', '!=', '>', '>=', '<', or '<=',
  * can compare a column of one datatype (say INT) with a literal of different datatype (say DOUBLE). These expressions
@@ -62,35 +60,26 @@
  *
  * TODO: Add support for BETWEEN, IN, and NOT IN operators.
  */
-public class NumericalFilterOptimizer implements FilterOptimizer {
-  private static final Expression TRUE = RequestUtils.getLiteralExpression(true);
-  private static final Expression FALSE = RequestUtils.getLiteralExpression(false);
+public class NumericalFilterOptimizer extends BaseAndOrBooleanFilterOptimizer {
 
   @Override
-  public Expression optimize(Expression expression, @Nullable Schema schema) {
-    ExpressionType type = expression.getType();
-    if (type != ExpressionType.FUNCTION || schema == null) {
-      // We have nothing to rewrite if expression is not a function or schema is null
-      return expression;
-    }
+  boolean canBeOptimized(Expression filterExpression, @Nullable Schema schema) {
+    ExpressionType type = filterExpression.getType();
+    // We have nothing to rewrite if expression is not a function or schema is null
+    return type == ExpressionType.FUNCTION && schema != null;
+  }
 
-    Function function = expression.getFunctionCall();
-    List<Expression> operands = function.getOperands();
+  @Override
+  Expression optimizeChild(Expression filterExpression, @Nullable Schema schema) {
+    Function function = filterExpression.getFunctionCall();
     FilterKind kind = FilterKind.valueOf(function.getOperator());
     switch (kind) {
-      case AND:
-      case OR:
-      case NOT:
-        // Recursively traverse the expression tree to find an operator node that can be rewritten.
-        operands.forEach(operand -> optimize(operand, schema));
-
-        // We have rewritten the child operands, so rewrite the parent if needed.
-        return optimizeCurrent(expression);
       case IS_NULL:
       case IS_NOT_NULL:
         // No need to try to optimize IS_NULL and IS_NOT_NULL operations on numerical columns.
         break;
       default:
+        List<Expression> operands = function.getOperands();
         // Verify that LHS is a numeric column and RHS is a numeric literal before rewriting.
         Expression lhs = operands.get(0);
         Expression rhs = operands.get(1);
@@ -100,12 +89,12 @@ public Expression optimize(Expression expression, @Nullable Schema schema) {
             switch (kind) {
               case EQUALS:
               case NOT_EQUALS:
-                return rewriteEqualsExpression(expression, kind, dataType, rhs);
+                return rewriteEqualsExpression(filterExpression, kind, dataType, rhs);
               case GREATER_THAN:
               case GREATER_THAN_OR_EQUAL:
               case LESS_THAN:
               case LESS_THAN_OR_EQUAL:
-                return rewriteRangeExpression(expression, kind, lhs, rhs, schema);
+                return rewriteRangeExpression(filterExpression, kind, lhs, rhs, schema);
               default:
                 break;
             }
@@ -113,56 +102,7 @@ public Expression optimize(Expression expression, @Nullable Schema schema) {
         }
         break;
     }
-    return expression;
-  }
-
-  /**
-   * If any of the operands of AND function is "false", then the AND function itself is false and can be replaced with
-   * "false" literal. Otherwise, remove all the "true" operands of the AND function. Similarly, if any of the operands
-   * of OR function is "true", then the OR function itself is true and can be replaced with "true" literal. Otherwise,
-   * remove all the "false" operands of the OR function.
-   */
-  private static Expression optimizeCurrent(Expression expression) {
-    Function function = expression.getFunctionCall();
-    String operator = function.getOperator();
-    List<Expression> operands = function.getOperands();
-    if (operator.equals(FilterKind.AND.name())) {
-      // If any of the literal operands are FALSE, then replace AND function with FALSE.
-      for (Expression operand : operands) {
-        if (operand.equals(FALSE)) {
-          return FALSE;
-        }
-      }
-
-      // Remove all Literal operands that are TRUE.
-      operands.removeIf(x -> x.equals(TRUE));
-      if (operands.isEmpty()) {
-        return TRUE;
-      }
-    } else if (operator.equals(FilterKind.OR.name())) {
-      // If any of the literal operands are TRUE, then replace OR function with TRUE
-      for (Expression operand : operands) {
-        if (operand.equals(TRUE)) {
-          return TRUE;
-        }
-      }
-
-      // Remove all Literal operands that are FALSE.
-      operands.removeIf(x -> x.equals(FALSE));
-      if (operands.isEmpty()) {
-        return FALSE;
-      }
-    } else if (operator.equals(FilterKind.NOT.name())) {
-      assert operands.size() == 1;
-      Expression operand = operands.get(0);
-      if (operand.equals(TRUE)) {
-        return FALSE;
-      }
-      if (operand.equals(FALSE)) {
-        return TRUE;
-      }
-    }
-    return expression;
+    return filterExpression;
   }
 
   /**
@@ -187,7 +127,7 @@ private static Expression rewriteEqualsExpression(Expression equals, FilterKind
             int converted = (int) actual;
             if (converted != actual) {
               // Long value does not fall within the bounds of INT column.
-              setExpressionToBoolean(equals, result);
+              return getExpressionFromBoolean(result);
             } else {
               // Replace long value with converted int value.
               rhs.getLiteral().setLongValue(converted);
@@ -198,7 +138,7 @@ private static Expression rewriteEqualsExpression(Expression equals, FilterKind
             float converted = (float) actual;
             if (BigDecimal.valueOf(actual).compareTo(BigDecimal.valueOf(converted)) != 0) {
               // Long to float conversion is lossy.
-              setExpressionToBoolean(equals, result);
+              return getExpressionFromBoolean(result);
             } else {
               // Replace long value with converted float value.
               rhs.getLiteral().setDoubleValue(converted);
@@ -209,7 +149,7 @@ private static Expression rewriteEqualsExpression(Expression equals, FilterKind
             double converted = (double) actual;
             if (BigDecimal.valueOf(actual).compareTo(BigDecimal.valueOf(converted)) != 0) {
               // Long to double conversion is lossy.
-              setExpressionToBoolean(equals, result);
+              return getExpressionFromBoolean(result);
             } else {
               // Replace long value with converted double value.
               rhs.getLiteral().setDoubleValue(converted);
@@ -228,7 +168,7 @@ private static Expression rewriteEqualsExpression(Expression equals, FilterKind
             int converted = (int) actual;
             if (converted != actual) {
               // Double value does not fall within the bounds of INT column.
-              setExpressionToBoolean(equals, result);
+              return getExpressionFromBoolean(result);
             } else {
               // Replace double value with converted int value.
               rhs.getLiteral().setLongValue(converted);
@@ -239,7 +179,7 @@ private static Expression rewriteEqualsExpression(Expression equals, FilterKind
             long converted = (long) actual;
             if (BigDecimal.valueOf(actual).compareTo(BigDecimal.valueOf(converted)) != 0) {
               // Double to long conversion is lossy.
-              setExpressionToBoolean(equals, result);
+              return getExpressionFromBoolean(result);
             } else {
               // Replace double value with converted long value.
               rhs.getLiteral().setLongValue(converted);
@@ -250,7 +190,7 @@ private static Expression rewriteEqualsExpression(Expression equals, FilterKind
             float converted = (float) actual;
             if (converted != actual) {
               // Double to float conversion is lossy.
-              setExpressionToBoolean(equals, result);
+              return getExpressionFromBoolean(result);
             } else {
               // Replace double value with converted float value.
               rhs.getLiteral().setDoubleValue(converted);
@@ -294,12 +234,12 @@ private static Expression rewriteRangeExpression(Expression range, FilterKind ki
               // INT column can never have a value greater than Integer.MAX_VALUE. < and <= expressions will always be
               // true, because an INT column will always have values greater than or equal to Integer.MIN_VALUE and less
               // than or equal to Integer.MAX_VALUE.
-              setExpressionToBoolean(range, kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
+              return getExpressionFromBoolean(kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
             } else if (comparison < 0) {
               // Literal value is less than the bounds of INT. > and >= expressions will always be true because an
               // INT column will always have a value greater than or equal to Integer.MIN_VALUE. < and <= expressions
               // will always be false, because an INT column will never have values less than Integer.MIN_VALUE.
-              setExpressionToBoolean(range,
+              return getExpressionFromBoolean(
                   kind == FilterKind.GREATER_THAN || kind == FilterKind.GREATER_THAN_OR_EQUAL);
             } else {
               // Long literal value falls within the bounds of INT column, server will successfully convert the literal
@@ -351,10 +291,10 @@ private static Expression rewriteRangeExpression(Expression range, FilterKind ki
             int comparison = Double.compare(actual, converted);
             if (comparison > 0 && converted == Integer.MAX_VALUE) {
               // Literal value is greater than the bounds of INT.
-              setExpressionToBoolean(range, kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
+              return getExpressionFromBoolean(kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
             } else if (comparison < 0 && converted == Integer.MIN_VALUE) {
               // Literal value is less than the bounds of INT.
-              setExpressionToBoolean(range,
+              return getExpressionFromBoolean(
                   kind == FilterKind.GREATER_THAN || kind == FilterKind.GREATER_THAN_OR_EQUAL);
             } else {
               // Literal value falls within the bounds of INT.
@@ -371,10 +311,10 @@ private static Expression rewriteRangeExpression(Expression range, FilterKind ki
 
             if (comparison > 0 && converted == Long.MAX_VALUE) {
               // Literal value is greater than the bounds of LONG.
-              setExpressionToBoolean(range, kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
+              return getExpressionFromBoolean(kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
             } else if (comparison < 0 && converted == Long.MIN_VALUE) {
               // Literal value is less than the bounds of LONG.
-              setExpressionToBoolean(range,
+              return getExpressionFromBoolean(
                   kind == FilterKind.GREATER_THAN || kind == FilterKind.GREATER_THAN_OR_EQUAL);
             } else {
               // Rewrite range operator
@@ -389,10 +329,10 @@ private static Expression rewriteRangeExpression(Expression range, FilterKind ki
             float converted = (float) actual;
             if (converted == Float.POSITIVE_INFINITY) {
               // Literal value is greater than the bounds of FLOAT
-              setExpressionToBoolean(range, kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
+              return getExpressionFromBoolean(kind == FilterKind.LESS_THAN || kind == FilterKind.LESS_THAN_OR_EQUAL);
             } else if (converted == Float.NEGATIVE_INFINITY) {
               // Literal value is less than the bounds of LONG.
-              setExpressionToBoolean(range,
+              return getExpressionFromBoolean(
                   kind == FilterKind.GREATER_THAN || kind == FilterKind.GREATER_THAN_OR_EQUAL);
             } else {
               int comparison = Double.compare(actual, converted);
@@ -458,11 +398,11 @@ private static FieldSpec.DataType getDataType(Expression expression, Schema sche
       if (fieldSpec != null && fieldSpec.isSingleValueField()) {
         return fieldSpec.getDataType();
       }
-    } else if (expression.getType() == ExpressionType.FUNCTION
-        && "cast".equalsIgnoreCase(expression.getFunctionCall().getOperator())) {
+    } else if (expression.getType() == ExpressionType.FUNCTION && "cast".equalsIgnoreCase(
+        expression.getFunctionCall().getOperator())) {
       // expression is not identifier but we can also determine the data type.
-      String targetTypeLiteral = expression.getFunctionCall().getOperands().get(1).getLiteral().getStringValue()
-          .toUpperCase();
+      String targetTypeLiteral =
+          expression.getFunctionCall().getOperands().get(1).getLiteral().getStringValue().toUpperCase();
       FieldSpec.DataType dataType;
       if ("INTEGER".equals(targetTypeLiteral)) {
         dataType = FieldSpec.DataType.INT;
@@ -492,11 +432,4 @@ private static boolean isNumericLiteral(Expression expression) {
     }
     return false;
   }
-
-  /** Change the expression value to boolean literal with given value. */
-  private static void setExpressionToBoolean(Expression expression, boolean value) {
-    expression.unsetFunctionCall();
-    expression.setType(ExpressionType.LITERAL);
-    expression.setLiteral(Literal.boolValue(value));
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlanner.java b/pinot-core/src/main/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlanner.java
index fcfb07aa22f..d198fb97e07 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlanner.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlanner.java
@@ -33,7 +33,8 @@
 import org.apache.pinot.segment.spi.FetchContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 
 
 public class DefaultFetchPlanner implements FetchPlanner {
@@ -45,11 +46,11 @@ public FetchContext planFetchForPruning(IndexSegment indexSegment, QueryContext
     // Extract columns in EQ/IN predicates.
     Set<String> eqInColumns = new HashSet<>();
     extractEqInColumns(Objects.requireNonNull(queryContext.getFilter()), eqInColumns);
-    Map<String, List<ColumnIndexType>> columnToIndexList = new HashMap<>();
+    Map<String, List<IndexType<?, ?, ?>>> columnToIndexList = new HashMap<>();
     for (String column : eqInColumns) {
       DataSource dataSource = indexSegment.getDataSource(column);
       if (dataSource.getBloomFilter() != null) {
-        columnToIndexList.put(column, Collections.singletonList(ColumnIndexType.BLOOM_FILTER));
+        columnToIndexList.put(column, Collections.singletonList(StandardIndexes.bloomFilter()));
       }
     }
     return new FetchContext(UUID.randomUUID(), indexSegment.getSegmentName(), columnToIndexList);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/BloomFilterSegmentPruner.java b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/BloomFilterSegmentPruner.java
new file mode 100644
index 00000000000..6277aac8eb2
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/BloomFilterSegmentPruner.java
@@ -0,0 +1,264 @@
+/**
+ * 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.pinot.core.query.pruner;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.FilterContext;
+import org.apache.pinot.common.request.context.predicate.EqPredicate;
+import org.apache.pinot.common.request.context.predicate.InPredicate;
+import org.apache.pinot.common.request.context.predicate.Predicate;
+import org.apache.pinot.core.query.prefetch.FetchPlanner;
+import org.apache.pinot.core.query.prefetch.FetchPlannerRegistry;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.util.QueryMultiThreadingUtils;
+import org.apache.pinot.segment.spi.FetchContext;
+import org.apache.pinot.segment.spi.ImmutableSegment;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.exception.QueryCancelledException;
+
+
+/**
+ * The {@code BloomFilterSegmentPruner} prunes segments based on bloom filter for EQUALITY filter. Because the access
+ * to bloom filter data is required, segment pruning is done in parallel when the number of segments is large.
+ */
+@SuppressWarnings({"rawtypes", "unchecked", "RedundantIfStatement"})
+public class BloomFilterSegmentPruner extends ValueBasedSegmentPruner {
+  // Try to schedule 10 segments for each thread, or evenly distribute them to all MAX_NUM_THREADS_PER_QUERY threads.
+  // TODO: make this threshold configurable? threshold 10 is also used in CombinePlanNode, which accesses the
+  //       dictionary data to do query planning and if segments are more than 10, planning is done in parallel.
+  private static final int TARGET_NUM_SEGMENTS_PER_THREAD = 10;
+
+  private FetchPlanner _fetchPlanner;
+
+  @Override
+  public void init(PinotConfiguration config) {
+    super.init(config);
+    _fetchPlanner = FetchPlannerRegistry.getPlanner();
+  }
+
+  @Override
+  protected boolean isApplicableToPredicate(Predicate predicate) {
+    // Only prune columns
+    if (predicate.getLhs().getType() != ExpressionContext.Type.IDENTIFIER) {
+      return false;
+    }
+    Predicate.Type predicateType = predicate.getType();
+    if (predicateType == Predicate.Type.EQ) {
+      return true;
+    }
+    if (predicateType == Predicate.Type.IN) {
+      List<String> values = ((InPredicate) predicate).getValues();
+      // Skip pruning when there are too many values in the IN predicate
+      if (values.size() <= _inPredicateThreshold) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query) {
+    if (segments.isEmpty()) {
+      return segments;
+    }
+    if (!query.isEnablePrefetch()) {
+      return super.prune(segments, query);
+    }
+    return prefetch(segments, query, fetchContexts -> {
+      int numSegments = segments.size();
+      FilterContext filter = Objects.requireNonNull(query.getFilter());
+      ValueCache cachedValues = new ValueCache();
+      Map<String, DataSource> dataSourceCache = new HashMap<>();
+      List<IndexSegment> selectedSegments = new ArrayList<>(numSegments);
+      for (int i = 0; i < numSegments; i++) {
+        dataSourceCache.clear();
+        IndexSegment segment = segments.get(i);
+        if (!pruneSegmentWithFetchContext(segment, fetchContexts[i], filter, dataSourceCache, cachedValues)) {
+          selectedSegments.add(segment);
+        }
+      }
+      return selectedSegments;
+    });
+  }
+
+  @Override
+  public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query,
+      @Nullable ExecutorService executorService) {
+    if (segments.isEmpty()) {
+      return segments;
+    }
+    if (executorService == null || segments.size() <= TARGET_NUM_SEGMENTS_PER_THREAD) {
+      // If executor is not provided, or the number of segments is small, prune them sequentially
+      return prune(segments, query);
+    }
+    // With executor service and large number of segments, prune them in parallel.
+    // NOTE: Even if numTasks=1 i.e. we get a single executor thread, still run it using a separate thread so that
+    //       the timeout can be honored. For example, this may happen when there is only one processor.
+    int numTasks = QueryMultiThreadingUtils.getNumTasks(segments.size(), TARGET_NUM_SEGMENTS_PER_THREAD,
+        query.getMaxExecutionThreads());
+    if (!query.isEnablePrefetch()) {
+      return pruneInParallel(numTasks, segments, query, executorService, null);
+    }
+    return prefetch(segments, query,
+        fetchContexts -> pruneInParallel(numTasks, segments, query, executorService, fetchContexts));
+  }
+
+  private List<IndexSegment> pruneInParallel(int numTasks, List<IndexSegment> segments, QueryContext queryContext,
+      ExecutorService executorService, FetchContext[] fetchContexts) {
+    int numSegments = segments.size();
+    List<IndexSegment> allSelectedSegments = new ArrayList<>();
+    QueryMultiThreadingUtils.runTasksWithDeadline(numTasks, index -> {
+      FilterContext filter = Objects.requireNonNull(queryContext.getFilter());
+      ValueCache cachedValues = new ValueCache();
+      Map<String, DataSource> dataSourceCache = new HashMap<>();
+      List<IndexSegment> selectedSegments = new ArrayList<>();
+      for (int i = index; i < numSegments; i += numTasks) {
+        dataSourceCache.clear();
+        IndexSegment segment = segments.get(i);
+        FetchContext fetchContext = fetchContexts == null ? null : fetchContexts[i];
+        if (!pruneSegmentWithFetchContext(segment, fetchContext, filter, dataSourceCache, cachedValues)) {
+          selectedSegments.add(segment);
+        }
+      }
+      return selectedSegments;
+    }, taskRes -> {
+      if (taskRes != null) {
+        allSelectedSegments.addAll(taskRes);
+      }
+    }, e -> {
+      if (e instanceof InterruptedException) {
+        throw new QueryCancelledException("Cancelled while running BloomFilterSegmentPruner", e);
+      }
+      throw new RuntimeException("Caught exception while running BloomFilterSegmentPruner", e);
+    }, executorService, queryContext.getEndTimeMs());
+    return allSelectedSegments;
+  }
+
+  private List<IndexSegment> prefetch(List<IndexSegment> segments, QueryContext query,
+      Function<FetchContext[], List<IndexSegment>> pruneFunc) {
+    int numSegments = segments.size();
+    FetchContext[] fetchContexts = new FetchContext[numSegments];
+    try {
+      // Prefetch bloom filter for columns within the EQ/IN predicate if exists
+      for (int i = 0; i < numSegments; i++) {
+        IndexSegment segment = segments.get(i);
+        FetchContext fetchContext = _fetchPlanner.planFetchForPruning(segment, query);
+        if (!fetchContext.isEmpty()) {
+          segment.prefetch(fetchContext);
+          fetchContexts[i] = fetchContext;
+        }
+      }
+      return pruneFunc.apply(fetchContexts);
+    } finally {
+      // Release the prefetched bloom filters
+      for (int i = 0; i < numSegments; i++) {
+        FetchContext fetchContext = fetchContexts[i];
+        if (fetchContext != null) {
+          segments.get(i).release(fetchContext);
+        }
+      }
+    }
+  }
+
+  private boolean pruneSegmentWithFetchContext(IndexSegment segment, FetchContext fetchContext, FilterContext filter,
+      Map<String, DataSource> dataSourceCache, ValueCache cachedValues) {
+    if (fetchContext == null) {
+      return pruneSegment(segment, filter, dataSourceCache, cachedValues);
+    }
+    try {
+      segment.acquire(fetchContext);
+      return pruneSegment(segment, filter, dataSourceCache, cachedValues);
+    } finally {
+      segment.release(fetchContext);
+    }
+  }
+
+  @Override
+  boolean pruneSegmentWithPredicate(IndexSegment segment, Predicate predicate, Map<String, DataSource> dataSourceCache,
+      ValueCache cachedValues) {
+    Predicate.Type predicateType = predicate.getType();
+    if (predicateType == Predicate.Type.EQ) {
+      return pruneEqPredicate(segment, (EqPredicate) predicate, dataSourceCache, cachedValues);
+    } else if (predicateType == Predicate.Type.IN) {
+      return pruneInPredicate(segment, (InPredicate) predicate, dataSourceCache, cachedValues);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * For EQ predicate, prune the segments based on column bloom filter.
+   */
+  private boolean pruneEqPredicate(IndexSegment segment, EqPredicate eqPredicate,
+      Map<String, DataSource> dataSourceCache, ValueCache valueCache) {
+    String column = eqPredicate.getLhs().getIdentifier();
+    DataSource dataSource = segment instanceof ImmutableSegment ? segment.getDataSource(column)
+        : dataSourceCache.computeIfAbsent(column, segment::getDataSource);
+    // NOTE: Column must exist after DataSchemaSegmentPruner
+    assert dataSource != null;
+    DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
+    ValueCache.CachedValue cachedValue = valueCache.get(eqPredicate, dataSourceMetadata.getDataType());
+    // Check bloom filter
+    BloomFilterReader bloomFilter = dataSource.getBloomFilter();
+    return bloomFilter != null && !cachedValue.mightBeContained(bloomFilter);
+  }
+
+  /**
+   * For IN predicate, prune the segments based on column bloom filter.
+   * NOTE: segments will not be pruned if the number of values is greater than the threshold.
+   */
+  private boolean pruneInPredicate(IndexSegment segment, InPredicate inPredicate,
+      Map<String, DataSource> dataSourceCache, ValueCache valueCache) {
+    List<String> values = inPredicate.getValues();
+    // Skip pruning when there are too many values in the IN predicate
+    if (values.size() > _inPredicateThreshold) {
+      return false;
+    }
+    String column = inPredicate.getLhs().getIdentifier();
+    DataSource dataSource = segment instanceof ImmutableSegment ? segment.getDataSource(column)
+        : dataSourceCache.computeIfAbsent(column, segment::getDataSource);
+    // NOTE: Column must exist after DataSchemaSegmentPruner
+    assert dataSource != null;
+    DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
+    List<ValueCache.CachedValue> cachedValues = valueCache.get(inPredicate, dataSourceMetadata.getDataType());
+    // Check bloom filter
+    BloomFilterReader bloomFilter = dataSource.getBloomFilter();
+    if (bloomFilter == null) {
+      return false;
+    }
+    for (ValueCache.CachedValue value : cachedValues) {
+      if (value.mightBeContained(bloomFilter)) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPruner.java b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPruner.java
index 6ee9ba5c05c..a2b949da9e6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPruner.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPruner.java
@@ -18,45 +18,32 @@
  */
 package org.apache.pinot.core.query.pruner;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.common.request.context.FilterContext;
 import org.apache.pinot.common.request.context.predicate.EqPredicate;
 import org.apache.pinot.common.request.context.predicate.InPredicate;
 import org.apache.pinot.common.request.context.predicate.Predicate;
 import org.apache.pinot.common.request.context.predicate.RangePredicate;
-import org.apache.pinot.core.query.prefetch.FetchPlanner;
-import org.apache.pinot.core.query.prefetch.FetchPlannerRegistry;
-import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.segment.local.segment.index.readers.bloom.GuavaBloomFilterReaderUtils;
-import org.apache.pinot.segment.spi.FetchContext;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.exception.BadQueryRequestException;
-import org.apache.pinot.spi.utils.CommonConstants.Server;
 
 
 /**
  * The {@code ColumnValueSegmentPruner} is the segment pruner that prunes segments based on the value inside the filter.
+ * This pruner is supposed to use segment metadata like min/max or partition id only. Pruners that need to access
+ * segment data like bloom filter is implemented separately and called after this one to reduce required data access.
  * <ul>
  *   <li>
  *     For EQUALITY filter, prune the segment based on:
  *     <ul>
  *       <li>Column min/max value</li>
  *       <li>Column partition</li>
- *       <li>Column bloom filter</li>
  *     </ul>
  *   </li>
  *   <li>
@@ -68,126 +55,39 @@
  * </ul>
  */
 @SuppressWarnings({"rawtypes", "unchecked", "RedundantIfStatement"})
-public class ColumnValueSegmentPruner implements SegmentPruner {
-
-  public static final String IN_PREDICATE_THRESHOLD = "inpredicate.threshold";
-
-  private int _inPredicateThreshold;
-  private FetchPlanner _fetchPlanner;
-
-  @Override
-  public void init(PinotConfiguration config) {
-    _inPredicateThreshold =
-        config.getProperty(IN_PREDICATE_THRESHOLD, Server.DEFAULT_VALUE_PRUNER_IN_PREDICATE_THRESHOLD);
-    _fetchPlanner = FetchPlannerRegistry.getPlanner();
-  }
-
-  @Override
-  public boolean isApplicableTo(QueryContext query) {
-    return query.getFilter() != null;
-  }
-
+public class ColumnValueSegmentPruner extends ValueBasedSegmentPruner {
   @Override
-  public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query) {
-    if (segments.isEmpty()) {
-      return segments;
+  protected boolean isApplicableToPredicate(Predicate predicate) {
+    // Only prune columns
+    if (predicate.getLhs().getType() != ExpressionContext.Type.IDENTIFIER) {
+      return false;
     }
-    FilterContext filter = Objects.requireNonNull(query.getFilter());
-    ValueCache cachedValues = new ValueCache();
-    int numSegments = segments.size();
-    List<IndexSegment> selectedSegments = new ArrayList<>(numSegments);
-    if (query.isEnablePrefetch()) {
-      FetchContext[] fetchContexts = new FetchContext[numSegments];
-      try {
-        // Prefetch bloom filter for columns within the EQ/IN predicate if exists
-        for (int i = 0; i < numSegments; i++) {
-          IndexSegment segment = segments.get(i);
-          FetchContext fetchContext = _fetchPlanner.planFetchForPruning(segment, query);
-          if (!fetchContext.isEmpty()) {
-            segment.prefetch(fetchContext);
-            fetchContexts[i] = fetchContext;
-          }
-        }
-        // Prune segments
-        Map[] dataSourceCaches = new Map[numSegments];
-        for (int i = 0; i < numSegments; i++) {
-          dataSourceCaches[i] = new HashMap<>();
-          IndexSegment segment = segments.get(i);
-          FetchContext fetchContext = fetchContexts[i];
-          if (fetchContext != null) {
-            segment.acquire(fetchContext);
-            try {
-              if (!pruneSegment(segment, filter, dataSourceCaches[i], cachedValues)) {
-                selectedSegments.add(segment);
-              }
-            } finally {
-              segment.release(fetchContext);
-            }
-          } else {
-            if (!pruneSegment(segment, filter, dataSourceCaches[i], cachedValues)) {
-              selectedSegments.add(segment);
-            }
-          }
-        }
-      } finally {
-        // Release the prefetched bloom filters
-        for (int i = 0; i < numSegments; i++) {
-          FetchContext fetchContext = fetchContexts[i];
-          if (fetchContext != null) {
-            segments.get(i).release(fetchContext);
-          }
-        }
-      }
-    } else {
-      Map<String, DataSource> dataSourceCache = new HashMap<>();
-      for (IndexSegment segment : segments) {
-        dataSourceCache.clear();
-        if (!pruneSegment(segment, filter, dataSourceCache, cachedValues)) {
-          selectedSegments.add(segment);
-        }
+    Predicate.Type predicateType = predicate.getType();
+    if (predicateType == Predicate.Type.EQ || predicateType == Predicate.Type.RANGE) {
+      return true;
+    }
+    if (predicateType == Predicate.Type.IN) {
+      List<String> values = ((InPredicate) predicate).getValues();
+      // Skip pruning when there are too many values in the IN predicate
+      if (values.size() <= _inPredicateThreshold) {
+        return true;
       }
     }
-    return selectedSegments;
+    return false;
   }
 
-  private boolean pruneSegment(IndexSegment segment, FilterContext filter, Map<String, DataSource> dataSourceCache,
+  @Override
+  boolean pruneSegmentWithPredicate(IndexSegment segment, Predicate predicate, Map<String, DataSource> dataSourceCache,
       ValueCache cachedValues) {
-    switch (filter.getType()) {
-      case AND:
-        for (FilterContext child : filter.getChildren()) {
-          if (pruneSegment(segment, child, dataSourceCache, cachedValues)) {
-            return true;
-          }
-        }
-        return false;
-      case OR:
-        for (FilterContext child : filter.getChildren()) {
-          if (!pruneSegment(segment, child, dataSourceCache, cachedValues)) {
-            return false;
-          }
-        }
-        return true;
-      case NOT:
-        // Do not prune NOT filter
-        return false;
-      case PREDICATE:
-        Predicate predicate = filter.getPredicate();
-        // Only prune columns
-        if (predicate.getLhs().getType() != ExpressionContext.Type.IDENTIFIER) {
-          return false;
-        }
-        Predicate.Type predicateType = predicate.getType();
-        if (predicateType == Predicate.Type.EQ) {
-          return pruneEqPredicate(segment, (EqPredicate) predicate, dataSourceCache, cachedValues);
-        } else if (predicateType == Predicate.Type.IN) {
-          return pruneInPredicate(segment, (InPredicate) predicate, dataSourceCache, cachedValues);
-        } else if (predicateType == Predicate.Type.RANGE) {
-          return pruneRangePredicate(segment, (RangePredicate) predicate, dataSourceCache);
-        } else {
-          return false;
-        }
-      default:
-        throw new IllegalStateException();
+    Predicate.Type predicateType = predicate.getType();
+    if (predicateType == Predicate.Type.EQ) {
+      return pruneEqPredicate(segment, (EqPredicate) predicate, dataSourceCache, cachedValues);
+    } else if (predicateType == Predicate.Type.IN) {
+      return pruneInPredicate(segment, (InPredicate) predicate, dataSourceCache, cachedValues);
+    } else if (predicateType == Predicate.Type.RANGE) {
+      return pruneRangePredicate(segment, (RangePredicate) predicate, dataSourceCache);
+    } else {
+      return false;
     }
   }
 
@@ -196,27 +96,22 @@ private boolean pruneSegment(IndexSegment segment, FilterContext filter, Map<Str
    * <ul>
    *   <li>Column min/max value</li>
    *   <li>Column partition</li>
-   *   <li>Column bloom filter</li>
    * </ul>
    */
   private boolean pruneEqPredicate(IndexSegment segment, EqPredicate eqPredicate,
       Map<String, DataSource> dataSourceCache, ValueCache valueCache) {
     String column = eqPredicate.getLhs().getIdentifier();
-    DataSource dataSource = segment instanceof ImmutableSegment
-        ? segment.getDataSource(column)
+    DataSource dataSource = segment instanceof ImmutableSegment ? segment.getDataSource(column)
         : dataSourceCache.computeIfAbsent(column, segment::getDataSource);
     // NOTE: Column must exist after DataSchemaSegmentPruner
     assert dataSource != null;
     DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
     ValueCache.CachedValue cachedValue = valueCache.get(eqPredicate, dataSourceMetadata.getDataType());
-
     Comparable value = cachedValue.getComparableValue();
-
     // Check min/max value
     if (!checkMinMaxRange(dataSourceMetadata, value)) {
       return true;
     }
-
     // Check column partition
     PartitionFunction partitionFunction = dataSourceMetadata.getPartitionFunction();
     if (partitionFunction != null) {
@@ -226,15 +121,6 @@ private boolean pruneEqPredicate(IndexSegment segment, EqPredicate eqPredicate,
         return true;
       }
     }
-
-    // Check bloom filter
-    BloomFilterReader bloomFilter = dataSource.getBloomFilter();
-    if (bloomFilter != null) {
-      if (!cachedValue.mightBeContained(bloomFilter)) {
-        return true;
-      }
-    }
-
     return false;
   }
 
@@ -242,66 +128,26 @@ private boolean pruneEqPredicate(IndexSegment segment, EqPredicate eqPredicate,
    * For IN predicate, prune the segments based on:
    * <ul>
    *   <li>Column min/max value</li>
-   *   <li>Column bloom filter</li>
    * </ul>
    * <p>NOTE: segments will not be pruned if the number of values is greater than the threshold.
    */
   private boolean pruneInPredicate(IndexSegment segment, InPredicate inPredicate,
       Map<String, DataSource> dataSourceCache, ValueCache valueCache) {
-    String column = inPredicate.getLhs().getIdentifier();
-    DataSource dataSource = segment instanceof ImmutableSegment
-        ? segment.getDataSource(column)
-        : dataSourceCache.computeIfAbsent(column, segment::getDataSource);
-    // NOTE: Column must exist after DataSchemaSegmentPruner
-    assert dataSource != null;
-    DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
     List<String> values = inPredicate.getValues();
-
     // Skip pruning when there are too many values in the IN predicate
     if (values.size() > _inPredicateThreshold) {
       return false;
     }
-
+    String column = inPredicate.getLhs().getIdentifier();
+    DataSource dataSource = segment instanceof ImmutableSegment ? segment.getDataSource(column)
+        : dataSourceCache.computeIfAbsent(column, segment::getDataSource);
+    // NOTE: Column must exist after DataSchemaSegmentPruner
+    assert dataSource != null;
+    DataSourceMetadata dataSourceMetadata = dataSource.getDataSourceMetadata();
     List<ValueCache.CachedValue> cachedValues = valueCache.get(inPredicate, dataSourceMetadata.getDataType());
-
     // Check min/max value
-    boolean someInRange = false;
     for (ValueCache.CachedValue value : cachedValues) {
       if (checkMinMaxRange(dataSourceMetadata, value.getComparableValue())) {
-        someInRange = true;
-        break;
-      }
-    }
-    if (!someInRange) {
-      return true;
-    }
-
-    // Check bloom filter
-    BloomFilterReader bloomFilter = dataSource.getBloomFilter();
-    if (bloomFilter == null) {
-      return false;
-    }
-    for (ValueCache.CachedValue value : cachedValues) {
-      if (value.mightBeContained(bloomFilter)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Returns {@code true} if the value is within the column's min/max value range, {@code false} otherwise.
-   */
-  private boolean checkMinMaxRange(DataSourceMetadata dataSourceMetadata, Comparable value) {
-    Comparable minValue = dataSourceMetadata.getMinValue();
-    if (minValue != null) {
-      if (value.compareTo(minValue) < 0) {
-        return false;
-      }
-    }
-    Comparable maxValue = dataSourceMetadata.getMaxValue();
-    if (maxValue != null) {
-      if (value.compareTo(maxValue) > 0) {
         return false;
       }
     }
@@ -317,8 +163,7 @@ private boolean checkMinMaxRange(DataSourceMetadata dataSourceMetadata, Comparab
   private boolean pruneRangePredicate(IndexSegment segment, RangePredicate rangePredicate,
       Map<String, DataSource> dataSourceCache) {
     String column = rangePredicate.getLhs().getIdentifier();
-    DataSource dataSource = segment instanceof ImmutableSegment
-        ? segment.getDataSource(column)
+    DataSource dataSource = segment instanceof ImmutableSegment ? segment.getDataSource(column)
         : dataSourceCache.computeIfAbsent(column, segment::getDataSource);
     // NOTE: Column must exist after DataSchemaSegmentPruner
     assert dataSource != null;
@@ -382,95 +227,25 @@ private boolean pruneRangePredicate(IndexSegment segment, RangePredicate rangePr
         }
       }
     }
-
     return false;
   }
 
-  private static Comparable convertValue(String stringValue, DataType dataType) {
-    try {
-      return dataType.convertInternal(stringValue);
-    } catch (Exception e) {
-      throw new BadQueryRequestException(e);
-    }
-  }
-
-  private static class ValueCache {
-    // As Predicates are recursive structures, their hashCode is quite expensive.
-    // By using an IdentityHashMap here we don't need to iterate over the recursive
-    // structure. This is specially useful in the IN expression.
-    private final Map<Predicate, Object> _cache = new IdentityHashMap<>();
-
-    private CachedValue add(EqPredicate pred) {
-      CachedValue val = new CachedValue(pred.getValue());
-      _cache.put(pred, val);
-      return val;
-    }
-
-    private List<CachedValue> add(InPredicate pred) {
-      List<CachedValue> vals = new ArrayList<>(pred.getValues().size());
-      for (String value : pred.getValues()) {
-        vals.add(new CachedValue(value));
-      }
-      _cache.put(pred, vals);
-      return vals;
-    }
-
-    public CachedValue get(EqPredicate pred, DataType dt) {
-      CachedValue cachedValue = (CachedValue) _cache.get(pred);
-      if (cachedValue == null) {
-        cachedValue = add(pred);
-      }
-      cachedValue.ensureDataType(dt);
-      return cachedValue;
-    }
-
-    public List<CachedValue> get(InPredicate pred, DataType dt) {
-      List<CachedValue> cachedValues = (List<CachedValue>) _cache.get(pred);
-      if (cachedValues == null) {
-        cachedValues = add(pred);
-      }
-      for (CachedValue cachedValue : cachedValues) {
-        cachedValue.ensureDataType(dt);
+  /**
+   * Returns {@code true} if the value is within the column's min/max value range, {@code false} otherwise.
+   */
+  private boolean checkMinMaxRange(DataSourceMetadata dataSourceMetadata, Comparable value) {
+    Comparable minValue = dataSourceMetadata.getMinValue();
+    if (minValue != null) {
+      if (value.compareTo(minValue) < 0) {
+        return false;
       }
-      return cachedValues;
     }
-
-    public static class CachedValue {
-      private final Object _value;
-      private boolean _hashed = false;
-      private long _hash1;
-      private long _hash2;
-      private DataType _dt;
-      private Comparable _comparableValue;
-
-      private CachedValue(Object value) {
-        _value = value;
-      }
-
-      private Comparable getComparableValue() {
-        assert _dt != null;
-        return _comparableValue;
-      }
-
-      private void ensureDataType(DataType dt) {
-        if (dt != _dt) {
-          String strValue = _value.toString();
-          _dt = dt;
-          _comparableValue = convertValue(strValue, dt);
-          _hashed = false;
-        }
-      }
-
-      private boolean mightBeContained(BloomFilterReader bloomFilter) {
-        if (!_hashed) {
-          GuavaBloomFilterReaderUtils.Hash128AsLongs hash128AsLongs =
-              GuavaBloomFilterReaderUtils.hashAsLongs(_comparableValue.toString());
-          _hash1 = hash128AsLongs.getHash1();
-          _hash2 = hash128AsLongs.getHash2();
-          _hashed = true;
-        }
-        return bloomFilter.mightContain(_hash1, _hash2);
+    Comparable maxValue = dataSourceMetadata.getMaxValue();
+    if (maxValue != null) {
+      if (value.compareTo(maxValue) > 0) {
+        return false;
       }
     }
+    return true;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPruner.java b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPruner.java
index 39d19c375d3..db848fc9159 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPruner.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPruner.java
@@ -19,6 +19,8 @@
 package org.apache.pinot.core.query.pruner;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import javax.annotation.Nullable;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -45,4 +47,9 @@ public interface SegmentPruner {
    *                 TODO: Revisit this because the caller doesn't require not changing the input segments
    */
   List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query);
+
+  default List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query,
+      @Nullable ExecutorService executorService) {
+    return prune(segments, query);
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerProvider.java
index e09d54590d7..e9acb210ab7 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerProvider.java
@@ -26,8 +26,6 @@
 
 /**
  * A static SegmentPrunerProvider will give SegmentPruner instance based on prunerClassName and configuration.
- *
- *
  */
 public class SegmentPrunerProvider {
   private SegmentPrunerProvider() {
@@ -36,10 +34,12 @@ private SegmentPrunerProvider() {
   private static final Map<String, Class<? extends SegmentPruner>> PRUNER_MAP = new HashMap<>();
 
   public static final String COLUMN_VALUE_SEGMENT_PRUNER_NAME = "columnvaluesegmentpruner";
+  public static final String BLOOM_FILTER_SEGMENT_PRUNER_NAME = "bloomfiltersegmentpruner";
   public static final String SELECTION_QUERY_SEGMENT_PRUNER_NAME = "selectionquerysegmentpruner";
 
   static {
     PRUNER_MAP.put(COLUMN_VALUE_SEGMENT_PRUNER_NAME, ColumnValueSegmentPruner.class);
+    PRUNER_MAP.put(BLOOM_FILTER_SEGMENT_PRUNER_NAME, BloomFilterSegmentPruner.class);
     PRUNER_MAP.put(SELECTION_QUERY_SEGMENT_PRUNER_NAME, SelectionQuerySegmentPruner.class);
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerService.java b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerService.java
index 5c79ca1c2db..4b775f67bd6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerService.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/SegmentPrunerService.java
@@ -22,7 +22,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.function.BiConsumer;
+import javax.annotation.Nullable;
 import org.apache.pinot.core.query.config.SegmentPrunerConfig;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
@@ -59,6 +61,7 @@ public SegmentPrunerService(SegmentPrunerConfig config) {
             _prunerStatsUpdaters.put(pruner, SegmentPrunerStatistics::setLimitPruned);
             break;
           case SegmentPrunerProvider.COLUMN_VALUE_SEGMENT_PRUNER_NAME:
+          case SegmentPrunerProvider.BLOOM_FILTER_SEGMENT_PRUNER_NAME:
             _prunerStatsUpdaters.put(pruner, SegmentPrunerStatistics::setValuePruned);
             break;
           default:
@@ -96,6 +99,11 @@ public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query)
    *                 undefined way. Therefore, this list should not be used after calling this method.
    */
   public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query, SegmentPrunerStatistics stats) {
+    return prune(segments, query, stats, null);
+  }
+
+  public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query, SegmentPrunerStatistics stats,
+      @Nullable ExecutorService executorService) {
     try (InvocationScope scope = Tracing.getTracer().createScope(SegmentPrunerService.class)) {
       segments = removeInvalidSegments(segments, query, stats);
       int invokedPrunersCount = 0;
@@ -105,7 +113,7 @@ public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query,
           try (InvocationScope prunerScope = Tracing.getTracer().createScope(segmentPruner.getClass())) {
             int originalSegmentsSize = segments.size();
             prunerScope.setNumSegments(originalSegmentsSize);
-            segments = segmentPruner.prune(segments, query);
+            segments = segmentPruner.prune(segments, query, executorService);
             _prunerStatsUpdaters.get(segmentPruner).accept(stats, originalSegmentsSize - segments.size());
           }
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ValueBasedSegmentPruner.java b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ValueBasedSegmentPruner.java
new file mode 100644
index 00000000000..76f1b2737b3
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/pruner/ValueBasedSegmentPruner.java
@@ -0,0 +1,240 @@
+/**
+ * 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.pinot.core.query.pruner;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.FilterContext;
+import org.apache.pinot.common.request.context.predicate.EqPredicate;
+import org.apache.pinot.common.request.context.predicate.InPredicate;
+import org.apache.pinot.common.request.context.predicate.Predicate;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.segment.local.segment.index.readers.bloom.GuavaBloomFilterReaderUtils;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.apache.pinot.spi.utils.CommonConstants.Server;
+
+
+/**
+ * The {@code ValueBasedSegmentPruner} prunes segments based on values inside the filter and segment metadata and data.
+ */
+@SuppressWarnings({"rawtypes", "unchecked", "RedundantIfStatement"})
+abstract public class ValueBasedSegmentPruner implements SegmentPruner {
+  public static final String IN_PREDICATE_THRESHOLD = "inpredicate.threshold";
+  protected int _inPredicateThreshold;
+
+  @Override
+  public void init(PinotConfiguration config) {
+    _inPredicateThreshold =
+        config.getProperty(IN_PREDICATE_THRESHOLD, Server.DEFAULT_VALUE_PRUNER_IN_PREDICATE_THRESHOLD);
+  }
+
+  @Override
+  public boolean isApplicableTo(QueryContext query) {
+    if (query.getFilter() == null) {
+      return false;
+    }
+    return isApplicableToFilter(query.getFilter());
+  }
+
+  /**
+   * 1. NOT is not applicable for segment pruning;
+   * 2. For OR, if one of the child filter is not applicable for pruning, the parent filter is not applicable;
+   * 3. For AND, if one of the child filter is applicable for pruning, the parent filter is applicable, but it
+   *    doesn't mean this child filter can prune the segment.
+   * 4. The specific pruners decide their own applicable predicate types.
+   */
+  private boolean isApplicableToFilter(FilterContext filter) {
+    switch (filter.getType()) {
+      case AND:
+        for (FilterContext child : filter.getChildren()) {
+          if (isApplicableToFilter(child)) {
+            return true;
+          }
+        }
+        return false;
+      case OR:
+        for (FilterContext child : filter.getChildren()) {
+          if (!isApplicableToFilter(child)) {
+            return false;
+          }
+        }
+        return true;
+      case NOT:
+        // Do not prune NOT filter
+        return false;
+      case PREDICATE:
+        return isApplicableToPredicate(filter.getPredicate());
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  abstract boolean isApplicableToPredicate(Predicate predicate);
+
+  @Override
+  public List<IndexSegment> prune(List<IndexSegment> segments, QueryContext query) {
+    if (segments.isEmpty()) {
+      return segments;
+    }
+    FilterContext filter = Objects.requireNonNull(query.getFilter());
+    ValueCache cachedValues = new ValueCache();
+    Map<String, DataSource> dataSourceCache = new HashMap<>();
+    List<IndexSegment> selectedSegments = new ArrayList<>(segments.size());
+    for (IndexSegment segment : segments) {
+      dataSourceCache.clear();
+      if (!pruneSegment(segment, filter, dataSourceCache, cachedValues)) {
+        selectedSegments.add(segment);
+      }
+    }
+    return selectedSegments;
+  }
+
+  protected boolean pruneSegment(IndexSegment segment, FilterContext filter, Map<String, DataSource> dataSourceCache,
+      ValueCache cachedValues) {
+    switch (filter.getType()) {
+      case AND:
+        for (FilterContext child : filter.getChildren()) {
+          if (pruneSegment(segment, child, dataSourceCache, cachedValues)) {
+            return true;
+          }
+        }
+        return false;
+      case OR:
+        for (FilterContext child : filter.getChildren()) {
+          if (!pruneSegment(segment, child, dataSourceCache, cachedValues)) {
+            return false;
+          }
+        }
+        return true;
+      case NOT:
+        // Do not prune NOT filter
+        return false;
+      case PREDICATE:
+        Predicate predicate = filter.getPredicate();
+        // Only prune columns
+        if (predicate.getLhs().getType() != ExpressionContext.Type.IDENTIFIER) {
+          return false;
+        }
+        return pruneSegmentWithPredicate(segment, predicate, dataSourceCache, cachedValues);
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  abstract boolean pruneSegmentWithPredicate(IndexSegment segment, Predicate predicate,
+      Map<String, DataSource> dataSourceCache, ValueCache cachedValues);
+
+  protected static Comparable convertValue(String stringValue, DataType dataType) {
+    try {
+      return dataType.convertInternal(stringValue);
+    } catch (Exception e) {
+      throw new BadQueryRequestException(e);
+    }
+  }
+
+  protected static class ValueCache {
+    // As Predicates are recursive structures, their hashCode is quite expensive.
+    // By using an IdentityHashMap here we don't need to iterate over the recursive
+    // structure. This is specially useful in the IN expression.
+    private final Map<Predicate, Object> _cache = new IdentityHashMap<>();
+
+    private CachedValue add(EqPredicate pred) {
+      CachedValue val = new CachedValue(pred.getValue());
+      _cache.put(pred, val);
+      return val;
+    }
+
+    private List<CachedValue> add(InPredicate pred) {
+      List<CachedValue> vals = new ArrayList<>(pred.getValues().size());
+      for (String value : pred.getValues()) {
+        vals.add(new CachedValue(value));
+      }
+      _cache.put(pred, vals);
+      return vals;
+    }
+
+    public CachedValue get(EqPredicate pred, DataType dt) {
+      CachedValue cachedValue = (CachedValue) _cache.get(pred);
+      if (cachedValue == null) {
+        cachedValue = add(pred);
+      }
+      cachedValue.ensureDataType(dt);
+      return cachedValue;
+    }
+
+    public List<CachedValue> get(InPredicate pred, DataType dt) {
+      List<CachedValue> cachedValues = (List<CachedValue>) _cache.get(pred);
+      if (cachedValues == null) {
+        cachedValues = add(pred);
+      }
+      for (CachedValue cachedValue : cachedValues) {
+        cachedValue.ensureDataType(dt);
+      }
+      return cachedValues;
+    }
+
+    public static class CachedValue {
+      private final Object _value;
+      private boolean _hashed = false;
+      private long _hash1;
+      private long _hash2;
+      private DataType _dt;
+      private Comparable _comparableValue;
+
+      private CachedValue(Object value) {
+        _value = value;
+      }
+
+      public Comparable getComparableValue() {
+        assert _dt != null;
+        return _comparableValue;
+      }
+
+      public void ensureDataType(DataType dt) {
+        if (dt != _dt) {
+          String strValue = _value.toString();
+          _dt = dt;
+          _comparableValue = convertValue(strValue, dt);
+          _hashed = false;
+        }
+      }
+
+      public boolean mightBeContained(BloomFilterReader bloomFilter) {
+        if (!_hashed) {
+          GuavaBloomFilterReaderUtils.Hash128AsLongs hash128AsLongs =
+              GuavaBloomFilterReaderUtils.hashAsLongs(_comparableValue.toString());
+          _hash1 = hash128AsLongs.getHash1();
+          _hash2 = hash128AsLongs.getHash2();
+          _hashed = true;
+        }
+        return bloomFilter.mightContain(_hash1, _hash2);
+      }
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/AggregationDataTableReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/AggregationDataTableReducer.java
index 739c1f691e1..89e28d19241 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/AggregationDataTableReducer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/AggregationDataTableReducer.java
@@ -34,7 +34,10 @@
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.utils.rewriter.ResultRewriteUtils;
+import org.apache.pinot.core.query.utils.rewriter.RewriterResult;
 import org.apache.pinot.core.transport.ServerRoutingInstance;
+import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.RoaringBitmap;
 
 
@@ -44,13 +47,9 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class AggregationDataTableReducer implements DataTableReducer {
   private final QueryContext _queryContext;
-  private final AggregationFunction[] _aggregationFunctions;
-  private final List<Pair<AggregationFunction, FilterContext>> _filteredAggregationFunctions;
 
   AggregationDataTableReducer(QueryContext queryContext) {
     _queryContext = queryContext;
-    _aggregationFunctions = queryContext.getAggregationFunctions();
-    _filteredAggregationFunctions = queryContext.getFilteredAggregationFunctions();
   }
 
   /**
@@ -79,7 +78,9 @@ public void reduceAndSetResults(String tableName, DataSchema dataSchema,
 
   private void reduceWithIntermediateResult(DataSchema dataSchema, Collection<DataTable> dataTables,
       BrokerResponseNative brokerResponseNative) {
-    int numAggregationFunctions = _aggregationFunctions.length;
+    AggregationFunction[] aggregationFunctions = _queryContext.getAggregationFunctions();
+    assert aggregationFunctions != null;
+    int numAggregationFunctions = aggregationFunctions.length;
     Object[] intermediateResults = new Object[numAggregationFunctions];
     for (DataTable dataTable : dataTables) {
       for (int i = 0; i < numAggregationFunctions; i++) {
@@ -99,13 +100,14 @@ private void reduceWithIntermediateResult(DataSchema dataSchema, Collection<Data
         if (mergedIntermediateResult == null) {
           intermediateResults[i] = intermediateResultToMerge;
         } else {
-          intermediateResults[i] = _aggregationFunctions[i].merge(mergedIntermediateResult, intermediateResultToMerge);
+          intermediateResults[i] = aggregationFunctions[i].merge(mergedIntermediateResult, intermediateResultToMerge);
         }
+        Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(i);
       }
     }
     Object[] finalResults = new Object[numAggregationFunctions];
     for (int i = 0; i < numAggregationFunctions; i++) {
-      AggregationFunction aggregationFunction = _aggregationFunctions[i];
+      AggregationFunction aggregationFunction = aggregationFunctions[i];
       Comparable result = aggregationFunction.extractFinalResult(intermediateResults[i]);
       finalResults[i] = result == null ? null : aggregationFunction.getFinalResultColumnType().convert(result);
     }
@@ -114,7 +116,9 @@ private void reduceWithIntermediateResult(DataSchema dataSchema, Collection<Data
 
   private void reduceWithFinalResult(DataSchema dataSchema, DataTable dataTable,
       BrokerResponseNative brokerResponseNative) {
-    int numAggregationFunctions = _aggregationFunctions.length;
+    AggregationFunction[] aggregationFunctions = _queryContext.getAggregationFunctions();
+    assert aggregationFunctions != null;
+    int numAggregationFunctions = aggregationFunctions.length;
     Object[] finalResults = new Object[numAggregationFunctions];
     for (int i = 0; i < numAggregationFunctions; i++) {
       ColumnDataType columnDataType = dataSchema.getColumnDataType(i);
@@ -140,32 +144,39 @@ private ResultTable reduceToResultTable(Object[] finalResults) {
         new PostAggregationHandler(_queryContext, getPrePostAggregationDataSchema());
     DataSchema dataSchema = postAggregationHandler.getResultDataSchema();
     Object[] row = postAggregationHandler.getResult(finalResults);
+
+    RewriterResult resultRewriterResult =
+        ResultRewriteUtils.rewriteResult(dataSchema, Collections.singletonList(row));
+    dataSchema = resultRewriterResult.getDataSchema();
+    List<Object[]> rows = resultRewriterResult.getRows();
+
     ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
     int numColumns = columnDataTypes.length;
-    for (int i = 0; i < numColumns; i++) {
-      row[i] = columnDataTypes[i].format(row[i]);
+    for (Object[] rewrittenRow : rows) {
+      for (int j = 0; j < numColumns; j++) {
+        rewrittenRow[j] = columnDataTypes[j].format(rewrittenRow[j]);
+      }
     }
-    return new ResultTable(dataSchema, Collections.singletonList(row));
+
+    return new ResultTable(dataSchema, rows);
   }
 
   /**
    * Constructs the DataSchema for the rows before the post-aggregation (SQL mode).
    */
   private DataSchema getPrePostAggregationDataSchema() {
-    int numAggregationFunctions = _aggregationFunctions.length;
-    String[] columnNames = new String[numAggregationFunctions];
-    ColumnDataType[] columnDataTypes = new ColumnDataType[numAggregationFunctions];
-
-    int i = 0;
-    for (Pair<AggregationFunction, FilterContext> aggFilterPair : _filteredAggregationFunctions) {
-      AggregationFunction aggregationFunction = aggFilterPair.getLeft();
-      String columnName =
-          AggregationFunctionUtils.getResultColumnName(aggregationFunction, aggFilterPair.getRight());
-      columnNames[i] = columnName;
+    List<Pair<AggregationFunction, FilterContext>> filteredAggregationFunctions =
+        _queryContext.getFilteredAggregationFunctions();
+    assert filteredAggregationFunctions != null;
+    int numColumns = filteredAggregationFunctions.size();
+    String[] columnNames = new String[numColumns];
+    ColumnDataType[] columnDataTypes = new ColumnDataType[numColumns];
+    for (int i = 0; i < numColumns; i++) {
+      Pair<AggregationFunction, FilterContext> pair = filteredAggregationFunctions.get(i);
+      AggregationFunction aggregationFunction = pair.getLeft();
+      columnNames[i] = AggregationFunctionUtils.getResultColumnName(aggregationFunction, pair.getRight());
       columnDataTypes[i] = aggregationFunction.getFinalResultColumnType();
-      i++;
     }
-
     return new DataSchema(columnNames, columnDataTypes);
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseGapfillProcessor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseGapfillProcessor.java
index 0c37e7f7630..25106858ea4 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseGapfillProcessor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseGapfillProcessor.java
@@ -83,16 +83,16 @@ abstract class BaseGapfillProcessor {
 
     List<ExpressionContext> args = _gapFillSelection.getFunction().getArguments();
 
-    _dateTimeFormatter = new DateTimeFormatSpec(args.get(1).getLiteralString());
-    _gapfillDateTimeGranularity = new DateTimeGranularitySpec(args.get(4).getLiteralString());
-    if (args.get(5).getLiteralString() == null) {
+    _dateTimeFormatter = new DateTimeFormatSpec(args.get(1).getLiteral().getStringValue());
+    _gapfillDateTimeGranularity = new DateTimeGranularitySpec(args.get(4).getLiteral().getStringValue());
+    if (args.get(5).getLiteral() == null) {
       _postGapfillDateTimeGranularity = _gapfillDateTimeGranularity;
     } else {
-      _postGapfillDateTimeGranularity = new DateTimeGranularitySpec(args.get(5).getLiteralString());
+      _postGapfillDateTimeGranularity = new DateTimeGranularitySpec(args.get(5).getLiteral().getStringValue());
     }
-    String start = args.get(2).getLiteralString();
+    String start = args.get(2).getLiteral().getStringValue();
     _startMs = truncate(_dateTimeFormatter.fromFormatToMillis(start));
-    String end = args.get(3).getLiteralString();
+    String end = args.get(3).getLiteral().getStringValue();
     _endMs = truncate(_dateTimeFormatter.fromFormatToMillis(end));
     _gapfillTimeBucketSize = _gapfillDateTimeGranularity.granularityToMillis();
     _postGapfillTimeBucketSize = _postGapfillDateTimeGranularity.granularityToMillis();
@@ -201,7 +201,7 @@ protected DataSchema getResultTableDataSchema(DataSchema dataSchema) {
       } else {
         FunctionContext functionContext = expressionContext.getFunction();
         AggregationFunction aggregationFunction =
-            AggregationFunctionFactory.getAggregationFunction(functionContext, _queryContext);
+            AggregationFunctionFactory.getAggregationFunction(functionContext, _queryContext.isNullHandlingEnabled());
         columnDataTypes[i] = aggregationFunction.getFinalResultColumnType();
         columnNames[i] = functionContext.toString();
       }
@@ -222,8 +222,8 @@ protected long truncate(long epoch) {
     return epoch / sz * sz;
   }
 
-  protected List<Object[]> gapFillAndAggregate(
-      List<Object[]> rows, DataSchema dataSchema, DataSchema resultTableSchema) {
+  protected List<Object[]> gapFillAndAggregate(List<Object[]> rows, DataSchema dataSchema,
+      DataSchema resultTableSchema) {
     throw new UnsupportedOperationException("Not supported");
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseReduceService.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseReduceService.java
index 9efac85c937..6de874dbdac 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseReduceService.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BaseReduceService.java
@@ -19,28 +19,15 @@
 package org.apache.pinot.core.query.reduce;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.function.LongConsumer;
 import javax.annotation.concurrent.ThreadSafe;
-import org.apache.pinot.common.datatable.DataTable;
-import org.apache.pinot.common.datatable.DataTable.MetadataKey;
-import org.apache.pinot.common.metrics.BrokerMeter;
-import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.metrics.BrokerTimer;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
-import org.apache.pinot.common.response.broker.QueryProcessingException;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.transport.ServerRoutingInstance;
-import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
@@ -120,240 +107,4 @@ protected static List<ExpressionContext> getSelectExpressions(List<ExpressionCon
   protected void shutDown() {
     _reduceExecutorService.shutdownNow();
   }
-
-  protected static class ExecutionStatsAggregator {
-    private final List<QueryProcessingException> _processingExceptions = new ArrayList<>();
-    private final Map<String, String> _traceInfo = new HashMap<>();
-    private final boolean _enableTrace;
-
-    private long _numDocsScanned = 0L;
-    private long _numEntriesScannedInFilter = 0L;
-    private long _numEntriesScannedPostFilter = 0L;
-    private long _numSegmentsQueried = 0L;
-    private long _numSegmentsProcessed = 0L;
-    private long _numSegmentsMatched = 0L;
-    private long _numConsumingSegmentsQueried = 0L;
-    private long _numConsumingSegmentsProcessed = 0L;
-    private long _numConsumingSegmentsMatched = 0L;
-    private long _minConsumingFreshnessTimeMs = Long.MAX_VALUE;
-    private long _numTotalDocs = 0L;
-    private long _offlineThreadCpuTimeNs = 0L;
-    private long _realtimeThreadCpuTimeNs = 0L;
-    private long _offlineSystemActivitiesCpuTimeNs = 0L;
-    private long _realtimeSystemActivitiesCpuTimeNs = 0L;
-    private long _offlineResponseSerializationCpuTimeNs = 0L;
-    private long _realtimeResponseSerializationCpuTimeNs = 0L;
-    private long _offlineTotalCpuTimeNs = 0L;
-    private long _realtimeTotalCpuTimeNs = 0L;
-    private long _numSegmentsPrunedByServer = 0L;
-    private long _numSegmentsPrunedInvalid = 0L;
-    private long _numSegmentsPrunedByLimit = 0L;
-    private long _numSegmentsPrunedByValue = 0L;
-    private long _explainPlanNumEmptyFilterSegments = 0L;
-    private long _explainPlanNumMatchAllFilterSegments = 0L;
-    private boolean _numGroupsLimitReached = false;
-
-    protected ExecutionStatsAggregator(boolean enableTrace) {
-      _enableTrace = enableTrace;
-    }
-
-    protected synchronized void aggregate(ServerRoutingInstance routingInstance, DataTable dataTable) {
-      Map<String, String> metadata = dataTable.getMetadata();
-      // Reduce on trace info.
-      if (_enableTrace) {
-        _traceInfo.put(routingInstance.getShortName(), metadata.get(MetadataKey.TRACE_INFO.getName()));
-      }
-
-      // Reduce on exceptions.
-      Map<Integer, String> exceptions = dataTable.getExceptions();
-      for (int key : exceptions.keySet()) {
-        _processingExceptions.add(new QueryProcessingException(key, exceptions.get(key)));
-      }
-
-      // Reduce on execution statistics.
-      String numDocsScannedString = metadata.get(MetadataKey.NUM_DOCS_SCANNED.getName());
-      if (numDocsScannedString != null) {
-        _numDocsScanned += Long.parseLong(numDocsScannedString);
-      }
-      String numEntriesScannedInFilterString = metadata.get(MetadataKey.NUM_ENTRIES_SCANNED_IN_FILTER.getName());
-      if (numEntriesScannedInFilterString != null) {
-        _numEntriesScannedInFilter += Long.parseLong(numEntriesScannedInFilterString);
-      }
-      String numEntriesScannedPostFilterString = metadata.get(MetadataKey.NUM_ENTRIES_SCANNED_POST_FILTER.getName());
-      if (numEntriesScannedPostFilterString != null) {
-        _numEntriesScannedPostFilter += Long.parseLong(numEntriesScannedPostFilterString);
-      }
-      String numSegmentsQueriedString = metadata.get(MetadataKey.NUM_SEGMENTS_QUERIED.getName());
-      if (numSegmentsQueriedString != null) {
-        _numSegmentsQueried += Long.parseLong(numSegmentsQueriedString);
-      }
-
-      String numSegmentsProcessedString = metadata.get(MetadataKey.NUM_SEGMENTS_PROCESSED.getName());
-      if (numSegmentsProcessedString != null) {
-        _numSegmentsProcessed += Long.parseLong(numSegmentsProcessedString);
-      }
-      String numSegmentsMatchedString = metadata.get(MetadataKey.NUM_SEGMENTS_MATCHED.getName());
-      if (numSegmentsMatchedString != null) {
-        _numSegmentsMatched += Long.parseLong(numSegmentsMatchedString);
-      }
-
-      String numConsumingSegmentsQueriedString = metadata.get(MetadataKey.NUM_CONSUMING_SEGMENTS_QUERIED.getName());
-      if (numConsumingSegmentsQueriedString != null) {
-        _numConsumingSegmentsQueried += Long.parseLong(numConsumingSegmentsQueriedString);
-      }
-
-      String numConsumingSegmentsProcessed = metadata.get(MetadataKey.NUM_CONSUMING_SEGMENTS_PROCESSED.getName());
-      if (numConsumingSegmentsProcessed != null) {
-        _numConsumingSegmentsProcessed += Long.parseLong(numConsumingSegmentsProcessed);
-      }
-
-      String numConsumingSegmentsMatched = metadata.get(MetadataKey.NUM_CONSUMING_SEGMENTS_MATCHED.getName());
-      if (numConsumingSegmentsMatched != null) {
-        _numConsumingSegmentsMatched += Long.parseLong(numConsumingSegmentsMatched);
-      }
-
-      String minConsumingFreshnessTimeMsString = metadata.get(MetadataKey.MIN_CONSUMING_FRESHNESS_TIME_MS.getName());
-      if (minConsumingFreshnessTimeMsString != null) {
-        _minConsumingFreshnessTimeMs =
-            Math.min(Long.parseLong(minConsumingFreshnessTimeMsString), _minConsumingFreshnessTimeMs);
-      }
-
-      String threadCpuTimeNsString = metadata.get(MetadataKey.THREAD_CPU_TIME_NS.getName());
-      if (threadCpuTimeNsString != null) {
-        if (routingInstance.getTableType() == TableType.OFFLINE) {
-          _offlineThreadCpuTimeNs += Long.parseLong(threadCpuTimeNsString);
-        } else {
-          _realtimeThreadCpuTimeNs += Long.parseLong(threadCpuTimeNsString);
-        }
-      }
-
-      String systemActivitiesCpuTimeNsString = metadata.get(MetadataKey.SYSTEM_ACTIVITIES_CPU_TIME_NS.getName());
-      if (systemActivitiesCpuTimeNsString != null) {
-        if (routingInstance.getTableType() == TableType.OFFLINE) {
-          _offlineSystemActivitiesCpuTimeNs += Long.parseLong(systemActivitiesCpuTimeNsString);
-        } else {
-          _realtimeSystemActivitiesCpuTimeNs += Long.parseLong(systemActivitiesCpuTimeNsString);
-        }
-      }
-
-      String responseSerializationCpuTimeNsString = metadata.get(MetadataKey.RESPONSE_SER_CPU_TIME_NS.getName());
-      if (responseSerializationCpuTimeNsString != null) {
-        if (routingInstance.getTableType() == TableType.OFFLINE) {
-          _offlineResponseSerializationCpuTimeNs += Long.parseLong(responseSerializationCpuTimeNsString);
-        } else {
-          _realtimeResponseSerializationCpuTimeNs += Long.parseLong(responseSerializationCpuTimeNsString);
-        }
-      }
-      _offlineTotalCpuTimeNs =
-          _offlineThreadCpuTimeNs + _offlineSystemActivitiesCpuTimeNs + _offlineResponseSerializationCpuTimeNs;
-      _realtimeTotalCpuTimeNs =
-          _realtimeThreadCpuTimeNs + _realtimeSystemActivitiesCpuTimeNs + _realtimeResponseSerializationCpuTimeNs;
-
-      withNotNullLongMetadata(metadata, MetadataKey.NUM_SEGMENTS_PRUNED_BY_SERVER,
-          l -> _numSegmentsPrunedByServer += l);
-      withNotNullLongMetadata(metadata, MetadataKey.NUM_SEGMENTS_PRUNED_INVALID, l -> _numSegmentsPrunedInvalid += l);
-      withNotNullLongMetadata(metadata, MetadataKey.NUM_SEGMENTS_PRUNED_BY_LIMIT, l -> _numSegmentsPrunedByLimit += l);
-      withNotNullLongMetadata(metadata, MetadataKey.NUM_SEGMENTS_PRUNED_BY_VALUE, l -> _numSegmentsPrunedByValue += l);
-
-      String explainPlanNumEmptyFilterSegments =
-          metadata.get(MetadataKey.EXPLAIN_PLAN_NUM_EMPTY_FILTER_SEGMENTS.getName());
-      if (explainPlanNumEmptyFilterSegments != null) {
-        _explainPlanNumEmptyFilterSegments += Long.parseLong(explainPlanNumEmptyFilterSegments);
-      }
-
-      String explainPlanNumMatchAllFilterSegments =
-          metadata.get(MetadataKey.EXPLAIN_PLAN_NUM_MATCH_ALL_FILTER_SEGMENTS.getName());
-      if (explainPlanNumMatchAllFilterSegments != null) {
-        _explainPlanNumMatchAllFilterSegments += Long.parseLong(explainPlanNumMatchAllFilterSegments);
-      }
-
-      String numTotalDocsString = metadata.get(MetadataKey.TOTAL_DOCS.getName());
-      if (numTotalDocsString != null) {
-        _numTotalDocs += Long.parseLong(numTotalDocsString);
-      }
-      _numGroupsLimitReached |= Boolean.parseBoolean(metadata.get(MetadataKey.NUM_GROUPS_LIMIT_REACHED.getName()));
-    }
-
-    protected void setStats(String rawTableName, BrokerResponseNative brokerResponseNative,
-        BrokerMetrics brokerMetrics) {
-      // set exception
-      List<QueryProcessingException> processingExceptions = brokerResponseNative.getProcessingExceptions();
-      processingExceptions.addAll(_processingExceptions);
-
-      // add all trace.
-      if (_enableTrace) {
-        brokerResponseNative.getTraceInfo().putAll(_traceInfo);
-      }
-
-      // Set execution statistics.
-      brokerResponseNative.setNumDocsScanned(_numDocsScanned);
-      brokerResponseNative.setNumEntriesScannedInFilter(_numEntriesScannedInFilter);
-      brokerResponseNative.setNumEntriesScannedPostFilter(_numEntriesScannedPostFilter);
-      brokerResponseNative.setNumSegmentsQueried(_numSegmentsQueried);
-      brokerResponseNative.setNumSegmentsProcessed(_numSegmentsProcessed);
-      brokerResponseNative.setNumSegmentsMatched(_numSegmentsMatched);
-      brokerResponseNative.setTotalDocs(_numTotalDocs);
-      brokerResponseNative.setNumGroupsLimitReached(_numGroupsLimitReached);
-      brokerResponseNative.setOfflineThreadCpuTimeNs(_offlineThreadCpuTimeNs);
-      brokerResponseNative.setRealtimeThreadCpuTimeNs(_realtimeThreadCpuTimeNs);
-      brokerResponseNative.setOfflineSystemActivitiesCpuTimeNs(_offlineSystemActivitiesCpuTimeNs);
-      brokerResponseNative.setRealtimeSystemActivitiesCpuTimeNs(_realtimeSystemActivitiesCpuTimeNs);
-      brokerResponseNative.setOfflineResponseSerializationCpuTimeNs(_offlineResponseSerializationCpuTimeNs);
-      brokerResponseNative.setRealtimeResponseSerializationCpuTimeNs(_realtimeResponseSerializationCpuTimeNs);
-      brokerResponseNative.setOfflineTotalCpuTimeNs(_offlineTotalCpuTimeNs);
-      brokerResponseNative.setRealtimeTotalCpuTimeNs(_realtimeTotalCpuTimeNs);
-      brokerResponseNative.setNumSegmentsPrunedByServer(_numSegmentsPrunedByServer);
-      brokerResponseNative.setNumSegmentsPrunedInvalid(_numSegmentsPrunedInvalid);
-      brokerResponseNative.setNumSegmentsPrunedByLimit(_numSegmentsPrunedByLimit);
-      brokerResponseNative.setNumSegmentsPrunedByValue(_numSegmentsPrunedByValue);
-      brokerResponseNative.setExplainPlanNumEmptyFilterSegments(_explainPlanNumEmptyFilterSegments);
-      brokerResponseNative.setExplainPlanNumMatchAllFilterSegments(_explainPlanNumMatchAllFilterSegments);
-      if (_numConsumingSegmentsQueried > 0) {
-        brokerResponseNative.setNumConsumingSegmentsQueried(_numConsumingSegmentsQueried);
-      }
-      if (_minConsumingFreshnessTimeMs != Long.MAX_VALUE) {
-        brokerResponseNative.setMinConsumingFreshnessTimeMs(_minConsumingFreshnessTimeMs);
-      }
-      brokerResponseNative.setNumConsumingSegmentsProcessed(_numConsumingSegmentsProcessed);
-      brokerResponseNative.setNumConsumingSegmentsMatched(_numConsumingSegmentsMatched);
-
-      // Update broker metrics.
-      if (brokerMetrics != null) {
-        brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.DOCUMENTS_SCANNED, _numDocsScanned);
-        brokerMetrics
-            .addMeteredTableValue(rawTableName, BrokerMeter.ENTRIES_SCANNED_IN_FILTER, _numEntriesScannedInFilter);
-        brokerMetrics
-            .addMeteredTableValue(rawTableName, BrokerMeter.ENTRIES_SCANNED_POST_FILTER, _numEntriesScannedPostFilter);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_THREAD_CPU_TIME_NS, _offlineThreadCpuTimeNs,
-            TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_THREAD_CPU_TIME_NS,
-            _realtimeThreadCpuTimeNs,
-            TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_SYSTEM_ACTIVITIES_CPU_TIME_NS,
-            _offlineSystemActivitiesCpuTimeNs, TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_SYSTEM_ACTIVITIES_CPU_TIME_NS,
-            _realtimeSystemActivitiesCpuTimeNs, TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_RESPONSE_SER_CPU_TIME_NS,
-            _offlineResponseSerializationCpuTimeNs, TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_RESPONSE_SER_CPU_TIME_NS,
-            _realtimeResponseSerializationCpuTimeNs, TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_TOTAL_CPU_TIME_NS, _offlineTotalCpuTimeNs,
-            TimeUnit.NANOSECONDS);
-        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_TOTAL_CPU_TIME_NS, _realtimeTotalCpuTimeNs,
-            TimeUnit.NANOSECONDS);
-
-        if (_minConsumingFreshnessTimeMs != Long.MAX_VALUE) {
-          brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.FRESHNESS_LAG_MS,
-              System.currentTimeMillis() - _minConsumingFreshnessTimeMs, TimeUnit.MILLISECONDS);
-        }
-      }
-    }
-
-    private void withNotNullLongMetadata(Map<String, String> metadata, MetadataKey key, LongConsumer consumer) {
-      String strValue = metadata.get(key.getName());
-      if (strValue != null) {
-        consumer.accept(Long.parseLong(strValue));
-      }
-    }
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BrokerReduceService.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BrokerReduceService.java
index 74156f5503b..e89978625af 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BrokerReduceService.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/BrokerReduceService.java
@@ -23,15 +23,19 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.broker.QueryProcessingException;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
 import org.apache.pinot.core.transport.ServerRoutingInstance;
 import org.apache.pinot.core.util.GapfillUtils;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 
@@ -103,15 +107,23 @@ public BrokerResponseNative reduceOnDataTable(BrokerRequest brokerRequest, Broke
 
     QueryContext serverQueryContext = QueryContextConverterUtils.getQueryContext(serverBrokerRequest.getPinotQuery());
     DataTableReducer dataTableReducer = ResultReducerFactory.getResultReducer(serverQueryContext);
-    dataTableReducer.reduceAndSetResults(rawTableName, cachedDataSchema, dataTableMap, brokerResponseNative,
-        new DataTableReducerContext(_reduceExecutorService, _maxReduceThreadsPerQuery, reduceTimeOutMs,
-            _groupByTrimThreshold), brokerMetrics);
+    try {
+      dataTableReducer.reduceAndSetResults(rawTableName, cachedDataSchema, dataTableMap, brokerResponseNative,
+          new DataTableReducerContext(_reduceExecutorService, _maxReduceThreadsPerQuery, reduceTimeOutMs,
+              _groupByTrimThreshold), brokerMetrics);
+    } catch (EarlyTerminationException e) {
+      brokerResponseNative.addToExceptions(
+          new QueryProcessingException(QueryException.QUERY_CANCELLATION_ERROR_CODE, e.toString()));
+    }
     QueryContext queryContext;
     if (brokerRequest == serverBrokerRequest) {
       queryContext = serverQueryContext;
     } else {
       queryContext = QueryContextConverterUtils.getQueryContext(brokerRequest.getPinotQuery());
       GapfillUtils.GapfillType gapfillType = GapfillUtils.getGapfillType(queryContext);
+      if (gapfillType == null) {
+        throw new BadQueryRequestException("Nested query is not supported without gapfill");
+      }
       BaseGapfillProcessor gapfillProcessor =
           GapfillProcessorFactory.getGapfillProcessor(queryContext, gapfillType);
       gapfillProcessor.process(brokerResponseNative);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/DistinctDataTableReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/DistinctDataTableReducer.java
index de65c18657f..5adc021bba5 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/DistinctDataTableReducer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/DistinctDataTableReducer.java
@@ -27,17 +27,18 @@
 import org.apache.pinot.common.CustomObject;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.common.ObjectSerDeUtils;
 import org.apache.pinot.core.data.table.Record;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.distinct.DistinctTable;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.core.transport.ServerRoutingInstance;
+import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.RoaringBitmap;
 
 
@@ -45,11 +46,9 @@
  * Helper class to reduce data tables and set results of distinct query into the BrokerResponseNative
  */
 public class DistinctDataTableReducer implements DataTableReducer {
-  private final DistinctAggregationFunction _distinctAggregationFunction;
   private final QueryContext _queryContext;
 
-  DistinctDataTableReducer(DistinctAggregationFunction distinctAggregationFunction, QueryContext queryContext) {
-    _distinctAggregationFunction = distinctAggregationFunction;
+  DistinctDataTableReducer(QueryContext queryContext) {
     _queryContext = queryContext;
   }
 
@@ -73,6 +72,8 @@ public void reduceAndSetResults(String tableName, DataSchema dataSchema,
     // DataTable; if all returns are DataTable we can directly merge with priority queue (with dedup).
     List<DistinctTable> nonEmptyDistinctTables = new ArrayList<>(dataTableMap.size());
     for (DataTable dataTable : dataTableMap.values()) {
+      Tracing.ThreadAccountantOps.sampleAndCheckInterruption();
+
       // Do not use the cached data schema because it might be either single object (legacy) or normal data table
       dataSchema = dataTable.getDataSchema();
       int numColumns = dataSchema.size();
@@ -112,18 +113,21 @@ public void reduceAndSetResults(String tableName, DataSchema dataSchema,
       // All the DistinctTables are empty, construct an empty response
       // TODO: This returns schema with all STRING data types.
       //       There's no way currently to get the data types of the distinct columns for empty results
-      String[] columns = _distinctAggregationFunction.getColumns();
-
-      int numColumns = columns.length;
-      ColumnDataType[] columnDataTypes = new ColumnDataType[numColumns];
+      List<ExpressionContext> expressions = _queryContext.getSelectExpressions();
+      int numExpressions = expressions.size();
+      String[] columns = new String[numExpressions];
+      for (int i = 0; i < numExpressions; i++) {
+        columns[i] = expressions.get(i).toString();
+      }
+      ColumnDataType[] columnDataTypes = new ColumnDataType[numExpressions];
       Arrays.fill(columnDataTypes, ColumnDataType.STRING);
       brokerResponseNative.setResultTable(
           new ResultTable(new DataSchema(columns, columnDataTypes), Collections.emptyList()));
     } else {
       // Construct a main DistinctTable and merge all non-empty DistinctTables into it
-      DistinctTable mainDistinctTable = new DistinctTable(nonEmptyDistinctTables.get(0).getDataSchema(),
-          _distinctAggregationFunction.getOrderByExpressions(), _distinctAggregationFunction.getLimit(),
-          _queryContext.isNullHandlingEnabled());
+      DistinctTable mainDistinctTable =
+          new DistinctTable(nonEmptyDistinctTables.get(0).getDataSchema(), _queryContext.getOrderByExpressions(),
+              _queryContext.getLimit(), _queryContext.isNullHandlingEnabled());
       for (DistinctTable distinctTable : nonEmptyDistinctTables) {
         mainDistinctTable.mergeTable(distinctTable);
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ExecutionStatsAggregator.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ExecutionStatsAggregator.java
new file mode 100644
index 00000000000..bc8612c551c
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ExecutionStatsAggregator.java
@@ -0,0 +1,386 @@
+/**
+ * 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.pinot.core.query.reduce;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongConsumer;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.common.metrics.BrokerMeter;
+import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.BrokerTimer;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.broker.BrokerResponseStats;
+import org.apache.pinot.common.response.broker.QueryProcessingException;
+import org.apache.pinot.core.transport.ServerRoutingInstance;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+
+
+public class ExecutionStatsAggregator {
+  private final List<QueryProcessingException> _processingExceptions = new ArrayList<>();
+  private final Map<String, Map<String, String>> _operatorStats = new HashMap<>();
+  private final Set<String> _tableNames = new HashSet<>();
+  private final Map<String, String> _traceInfo = new HashMap<>();
+  private final boolean _enableTrace;
+
+  private long _numDocsScanned = 0L;
+  private long _numEntriesScannedInFilter = 0L;
+  private long _numEntriesScannedPostFilter = 0L;
+  private long _numSegmentsQueried = 0L;
+  private long _numSegmentsProcessed = 0L;
+  private long _numSegmentsMatched = 0L;
+  private long _numConsumingSegmentsQueried = 0L;
+  private long _numConsumingSegmentsProcessed = 0L;
+  private long _numConsumingSegmentsMatched = 0L;
+  private long _minConsumingFreshnessTimeMs = Long.MAX_VALUE;
+  private long _numTotalDocs = 0L;
+  private long _offlineThreadCpuTimeNs = 0L;
+  private long _realtimeThreadCpuTimeNs = 0L;
+  private long _offlineSystemActivitiesCpuTimeNs = 0L;
+  private long _realtimeSystemActivitiesCpuTimeNs = 0L;
+  private long _offlineResponseSerializationCpuTimeNs = 0L;
+  private long _realtimeResponseSerializationCpuTimeNs = 0L;
+  private long _offlineTotalCpuTimeNs = 0L;
+  private long _realtimeTotalCpuTimeNs = 0L;
+  private long _numSegmentsPrunedByServer = 0L;
+  private long _numSegmentsPrunedInvalid = 0L;
+  private long _numSegmentsPrunedByLimit = 0L;
+  private long _numSegmentsPrunedByValue = 0L;
+  private long _explainPlanNumEmptyFilterSegments = 0L;
+  private long _explainPlanNumMatchAllFilterSegments = 0L;
+  private boolean _numGroupsLimitReached = false;
+  private int _numBlocks = 0;
+  private int _numRows = 0;
+  private long _stageExecutionTimeMs = 0;
+  private long _stageExecStartTimeMs = -1;
+  private long _stageExecEndTimeMs = -1;
+  private int _stageExecutionUnit = 0;
+
+  public ExecutionStatsAggregator(boolean enableTrace) {
+    _enableTrace = enableTrace;
+  }
+
+  public void aggregate(ServerRoutingInstance routingInstance, DataTable dataTable) {
+    aggregate(routingInstance, dataTable.getMetadata(), dataTable.getExceptions());
+  }
+
+  public synchronized void aggregate(@Nullable ServerRoutingInstance routingInstance, Map<String, String> metadata,
+      Map<Integer, String> exceptions) {
+
+    String tableNamesStr = metadata.get(DataTable.MetadataKey.TABLE.getName());
+    String tableName = null;
+
+    if (tableNamesStr != null) {
+      List<String> tableNames = Arrays.stream(tableNamesStr.split("::")).collect(Collectors.toList());
+      _tableNames.addAll(tableNames);
+
+      //TODO: Decide a strategy to split stageLevel stats across tables for brokerMetrics
+      // assigning everything to the first table only for now
+      tableName = tableNames.get(0);
+    }
+
+    TableType tableType = null;
+    String instanceName = null;
+    if (routingInstance != null) {
+      tableType = routingInstance.getTableType();
+      instanceName = routingInstance.getShortName();;
+    } else if (tableName != null) {
+      tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
+      instanceName = tableName;
+    } else {
+      tableType = null;
+      instanceName = null;
+    }
+
+    // Reduce on trace info.
+    if (_enableTrace && metadata.containsKey(DataTable.MetadataKey.TRACE_INFO.getName()) && instanceName != null) {
+      _traceInfo.put(instanceName, metadata.get(DataTable.MetadataKey.TRACE_INFO.getName()));
+    }
+
+    String operatorId = metadata.get(DataTable.MetadataKey.OPERATOR_ID.getName());
+    if (operatorId != null) {
+      if (_enableTrace) {
+        _operatorStats.put(operatorId, metadata);
+      } else {
+        _operatorStats.put(operatorId, new HashMap<>());
+      }
+    }
+
+    // Reduce on exceptions.
+    for (int key : exceptions.keySet()) {
+      _processingExceptions.add(new QueryProcessingException(key, exceptions.get(key)));
+    }
+
+    // Reduce on execution statistics.
+    String numDocsScannedString = metadata.get(DataTable.MetadataKey.NUM_DOCS_SCANNED.getName());
+    if (numDocsScannedString != null) {
+      _numDocsScanned += Long.parseLong(numDocsScannedString);
+    }
+    String numEntriesScannedInFilterString =
+        metadata.get(DataTable.MetadataKey.NUM_ENTRIES_SCANNED_IN_FILTER.getName());
+    if (numEntriesScannedInFilterString != null) {
+      _numEntriesScannedInFilter += Long.parseLong(numEntriesScannedInFilterString);
+    }
+    String numEntriesScannedPostFilterString =
+        metadata.get(DataTable.MetadataKey.NUM_ENTRIES_SCANNED_POST_FILTER.getName());
+    if (numEntriesScannedPostFilterString != null) {
+      _numEntriesScannedPostFilter += Long.parseLong(numEntriesScannedPostFilterString);
+    }
+    String numSegmentsQueriedString = metadata.get(DataTable.MetadataKey.NUM_SEGMENTS_QUERIED.getName());
+    if (numSegmentsQueriedString != null) {
+      _numSegmentsQueried += Long.parseLong(numSegmentsQueriedString);
+    }
+
+    String numSegmentsProcessedString = metadata.get(DataTable.MetadataKey.NUM_SEGMENTS_PROCESSED.getName());
+    if (numSegmentsProcessedString != null) {
+      _numSegmentsProcessed += Long.parseLong(numSegmentsProcessedString);
+    }
+    String numSegmentsMatchedString = metadata.get(DataTable.MetadataKey.NUM_SEGMENTS_MATCHED.getName());
+    if (numSegmentsMatchedString != null) {
+      _numSegmentsMatched += Long.parseLong(numSegmentsMatchedString);
+    }
+
+    String numConsumingSegmentsQueriedString =
+        metadata.get(DataTable.MetadataKey.NUM_CONSUMING_SEGMENTS_QUERIED.getName());
+    if (numConsumingSegmentsQueriedString != null) {
+      _numConsumingSegmentsQueried += Long.parseLong(numConsumingSegmentsQueriedString);
+    }
+
+    String numConsumingSegmentsProcessed =
+        metadata.get(DataTable.MetadataKey.NUM_CONSUMING_SEGMENTS_PROCESSED.getName());
+    if (numConsumingSegmentsProcessed != null) {
+      _numConsumingSegmentsProcessed += Long.parseLong(numConsumingSegmentsProcessed);
+    }
+
+    String numConsumingSegmentsMatched = metadata.get(DataTable.MetadataKey.NUM_CONSUMING_SEGMENTS_MATCHED.getName());
+    if (numConsumingSegmentsMatched != null) {
+      _numConsumingSegmentsMatched += Long.parseLong(numConsumingSegmentsMatched);
+    }
+
+    String minConsumingFreshnessTimeMsString =
+        metadata.get(DataTable.MetadataKey.MIN_CONSUMING_FRESHNESS_TIME_MS.getName());
+    if (minConsumingFreshnessTimeMsString != null) {
+      _minConsumingFreshnessTimeMs =
+          Math.min(Long.parseLong(minConsumingFreshnessTimeMsString), _minConsumingFreshnessTimeMs);
+    }
+
+    String threadCpuTimeNsString = metadata.get(DataTable.MetadataKey.THREAD_CPU_TIME_NS.getName());
+    if (tableType != null && threadCpuTimeNsString != null) {
+      if (tableType == TableType.OFFLINE) {
+        _offlineThreadCpuTimeNs += Long.parseLong(threadCpuTimeNsString);
+      } else {
+        _realtimeThreadCpuTimeNs += Long.parseLong(threadCpuTimeNsString);
+      }
+    }
+
+    String systemActivitiesCpuTimeNsString =
+        metadata.get(DataTable.MetadataKey.SYSTEM_ACTIVITIES_CPU_TIME_NS.getName());
+    if (tableType != null && systemActivitiesCpuTimeNsString != null) {
+      if (tableType == TableType.OFFLINE) {
+        _offlineSystemActivitiesCpuTimeNs += Long.parseLong(systemActivitiesCpuTimeNsString);
+      } else {
+        _realtimeSystemActivitiesCpuTimeNs += Long.parseLong(systemActivitiesCpuTimeNsString);
+      }
+    }
+
+    String responseSerializationCpuTimeNsString =
+        metadata.get(DataTable.MetadataKey.RESPONSE_SER_CPU_TIME_NS.getName());
+    if (tableType != null && responseSerializationCpuTimeNsString != null) {
+      if (tableType == TableType.OFFLINE) {
+        _offlineResponseSerializationCpuTimeNs += Long.parseLong(responseSerializationCpuTimeNsString);
+      } else {
+        _realtimeResponseSerializationCpuTimeNs += Long.parseLong(responseSerializationCpuTimeNsString);
+      }
+    }
+    _offlineTotalCpuTimeNs =
+        _offlineThreadCpuTimeNs + _offlineSystemActivitiesCpuTimeNs + _offlineResponseSerializationCpuTimeNs;
+    _realtimeTotalCpuTimeNs =
+        _realtimeThreadCpuTimeNs + _realtimeSystemActivitiesCpuTimeNs + _realtimeResponseSerializationCpuTimeNs;
+
+    withNotNullLongMetadata(metadata, DataTable.MetadataKey.NUM_SEGMENTS_PRUNED_BY_SERVER,
+        l -> _numSegmentsPrunedByServer += l);
+    withNotNullLongMetadata(metadata, DataTable.MetadataKey.NUM_SEGMENTS_PRUNED_INVALID,
+        l -> _numSegmentsPrunedInvalid += l);
+    withNotNullLongMetadata(metadata, DataTable.MetadataKey.NUM_SEGMENTS_PRUNED_BY_LIMIT,
+        l -> _numSegmentsPrunedByLimit += l);
+    withNotNullLongMetadata(metadata, DataTable.MetadataKey.NUM_SEGMENTS_PRUNED_BY_VALUE,
+        l -> _numSegmentsPrunedByValue += l);
+
+    String explainPlanNumEmptyFilterSegments =
+        metadata.get(DataTable.MetadataKey.EXPLAIN_PLAN_NUM_EMPTY_FILTER_SEGMENTS.getName());
+    if (explainPlanNumEmptyFilterSegments != null) {
+      _explainPlanNumEmptyFilterSegments += Long.parseLong(explainPlanNumEmptyFilterSegments);
+    }
+
+    String explainPlanNumMatchAllFilterSegments =
+        metadata.get(DataTable.MetadataKey.EXPLAIN_PLAN_NUM_MATCH_ALL_FILTER_SEGMENTS.getName());
+    if (explainPlanNumMatchAllFilterSegments != null) {
+      _explainPlanNumMatchAllFilterSegments += Long.parseLong(explainPlanNumMatchAllFilterSegments);
+    }
+
+    String numTotalDocsString = metadata.get(DataTable.MetadataKey.TOTAL_DOCS.getName());
+    if (numTotalDocsString != null) {
+      _numTotalDocs += Long.parseLong(numTotalDocsString);
+    }
+    _numGroupsLimitReached |=
+        Boolean.parseBoolean(metadata.get(DataTable.MetadataKey.NUM_GROUPS_LIMIT_REACHED.getName()));
+
+
+    String numBlocksString = metadata.get(DataTable.MetadataKey.NUM_BLOCKS.getName());
+    if (numBlocksString != null) {
+      _numBlocks += Long.parseLong(numBlocksString);
+    }
+
+    String numRowsString = metadata.get(DataTable.MetadataKey.NUM_ROWS.getName());
+    if (numBlocksString != null) {
+      _numRows += Long.parseLong(numRowsString);
+    }
+
+    String operatorExecutionTimeString = metadata.get(DataTable.MetadataKey.OPERATOR_EXECUTION_TIME_MS.getName());
+    if (operatorExecutionTimeString != null) {
+      _stageExecutionTimeMs += Long.parseLong(operatorExecutionTimeString);
+      _stageExecutionUnit += 1;
+    }
+
+    String operatorExecStartTimeString = metadata.get(DataTable.MetadataKey.OPERATOR_EXEC_START_TIME_MS.getName());
+    if (operatorExecStartTimeString != null) {
+      long operatorExecStartTime = Long.parseLong(operatorExecStartTimeString);
+      _stageExecStartTimeMs = _stageExecStartTimeMs == -1 ? operatorExecStartTime
+          : Math.min(operatorExecStartTime, _stageExecStartTimeMs);
+    }
+
+    String operatorExecEndTimeString = metadata.get(DataTable.MetadataKey.OPERATOR_EXEC_END_TIME_MS.getName());
+    if (operatorExecEndTimeString != null) {
+      long operatorExecEndTime = Long.parseLong(operatorExecEndTimeString);
+      _stageExecEndTimeMs = _stageExecEndTimeMs == -1 ? operatorExecEndTime
+          : Math.max(operatorExecEndTime, _stageExecEndTimeMs);
+    }
+  }
+
+  public void setStats(BrokerResponseNative brokerResponseNative) {
+    setStats(null, brokerResponseNative, null);
+  }
+
+  public void setStats(@Nullable String rawTableName, BrokerResponseNative brokerResponseNative,
+      @Nullable BrokerMetrics brokerMetrics) {
+    // set exception
+    List<QueryProcessingException> processingExceptions = brokerResponseNative.getProcessingExceptions();
+    processingExceptions.addAll(_processingExceptions);
+
+    // add all trace.
+    if (_enableTrace) {
+      brokerResponseNative.getTraceInfo().putAll(_traceInfo);
+    }
+
+    // Set execution statistics.
+    brokerResponseNative.setNumDocsScanned(_numDocsScanned);
+    brokerResponseNative.setNumEntriesScannedInFilter(_numEntriesScannedInFilter);
+    brokerResponseNative.setNumEntriesScannedPostFilter(_numEntriesScannedPostFilter);
+    brokerResponseNative.setNumSegmentsQueried(_numSegmentsQueried);
+    brokerResponseNative.setNumSegmentsProcessed(_numSegmentsProcessed);
+    brokerResponseNative.setNumSegmentsMatched(_numSegmentsMatched);
+    brokerResponseNative.setTotalDocs(_numTotalDocs);
+    brokerResponseNative.setNumGroupsLimitReached(_numGroupsLimitReached);
+    brokerResponseNative.setOfflineThreadCpuTimeNs(_offlineThreadCpuTimeNs);
+    brokerResponseNative.setRealtimeThreadCpuTimeNs(_realtimeThreadCpuTimeNs);
+    brokerResponseNative.setOfflineSystemActivitiesCpuTimeNs(_offlineSystemActivitiesCpuTimeNs);
+    brokerResponseNative.setRealtimeSystemActivitiesCpuTimeNs(_realtimeSystemActivitiesCpuTimeNs);
+    brokerResponseNative.setOfflineResponseSerializationCpuTimeNs(_offlineResponseSerializationCpuTimeNs);
+    brokerResponseNative.setRealtimeResponseSerializationCpuTimeNs(_realtimeResponseSerializationCpuTimeNs);
+    brokerResponseNative.setOfflineTotalCpuTimeNs(_offlineTotalCpuTimeNs);
+    brokerResponseNative.setRealtimeTotalCpuTimeNs(_realtimeTotalCpuTimeNs);
+    brokerResponseNative.setNumSegmentsPrunedByServer(_numSegmentsPrunedByServer);
+    brokerResponseNative.setNumSegmentsPrunedInvalid(_numSegmentsPrunedInvalid);
+    brokerResponseNative.setNumSegmentsPrunedByLimit(_numSegmentsPrunedByLimit);
+    brokerResponseNative.setNumSegmentsPrunedByValue(_numSegmentsPrunedByValue);
+    brokerResponseNative.setExplainPlanNumEmptyFilterSegments(_explainPlanNumEmptyFilterSegments);
+    brokerResponseNative.setExplainPlanNumMatchAllFilterSegments(_explainPlanNumMatchAllFilterSegments);
+    if (_numConsumingSegmentsQueried > 0) {
+      brokerResponseNative.setNumConsumingSegmentsQueried(_numConsumingSegmentsQueried);
+    }
+    if (_minConsumingFreshnessTimeMs != Long.MAX_VALUE) {
+      brokerResponseNative.setMinConsumingFreshnessTimeMs(_minConsumingFreshnessTimeMs);
+    }
+    brokerResponseNative.setNumConsumingSegmentsProcessed(_numConsumingSegmentsProcessed);
+    brokerResponseNative.setNumConsumingSegmentsMatched(_numConsumingSegmentsMatched);
+
+    // Update broker metrics.
+    if (brokerMetrics != null && rawTableName != null) {
+      brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.DOCUMENTS_SCANNED, _numDocsScanned);
+      brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.ENTRIES_SCANNED_IN_FILTER,
+          _numEntriesScannedInFilter);
+      brokerMetrics.addMeteredTableValue(rawTableName, BrokerMeter.ENTRIES_SCANNED_POST_FILTER,
+          _numEntriesScannedPostFilter);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_THREAD_CPU_TIME_NS, _offlineThreadCpuTimeNs,
+          TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_THREAD_CPU_TIME_NS, _realtimeThreadCpuTimeNs,
+          TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_SYSTEM_ACTIVITIES_CPU_TIME_NS,
+          _offlineSystemActivitiesCpuTimeNs, TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_SYSTEM_ACTIVITIES_CPU_TIME_NS,
+          _realtimeSystemActivitiesCpuTimeNs, TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_RESPONSE_SER_CPU_TIME_NS,
+          _offlineResponseSerializationCpuTimeNs, TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_RESPONSE_SER_CPU_TIME_NS,
+          _realtimeResponseSerializationCpuTimeNs, TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.OFFLINE_TOTAL_CPU_TIME_NS, _offlineTotalCpuTimeNs,
+          TimeUnit.NANOSECONDS);
+      brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.REALTIME_TOTAL_CPU_TIME_NS, _realtimeTotalCpuTimeNs,
+          TimeUnit.NANOSECONDS);
+
+      if (_minConsumingFreshnessTimeMs != Long.MAX_VALUE) {
+        brokerMetrics.addTimedTableValue(rawTableName, BrokerTimer.FRESHNESS_LAG_MS,
+            System.currentTimeMillis() - _minConsumingFreshnessTimeMs, TimeUnit.MILLISECONDS);
+      }
+    }
+  }
+
+  public void setStageLevelStats(@Nullable String rawTableName, BrokerResponseStats brokerResponseStats,
+      @Nullable BrokerMetrics brokerMetrics) {
+    if (_enableTrace) {
+      setStats(rawTableName, brokerResponseStats, brokerMetrics);
+      brokerResponseStats.setOperatorStats(_operatorStats);
+    }
+
+    brokerResponseStats.setNumBlocks(_numBlocks);
+    brokerResponseStats.setNumRows(_numRows);
+    brokerResponseStats.setStageExecutionTimeMs(_stageExecutionTimeMs);
+    brokerResponseStats.setStageExecutionUnit(_stageExecutionUnit);
+    brokerResponseStats.setTableNames(new ArrayList<>(_tableNames));
+    if (_stageExecStartTimeMs >= 0 && _stageExecEndTimeMs >= 0) {
+      brokerResponseStats.setStageExecWallTimeMs(_stageExecEndTimeMs - _stageExecStartTimeMs);
+    }
+  }
+
+  private void withNotNullLongMetadata(Map<String, String> metadata, DataTable.MetadataKey key, LongConsumer consumer) {
+    String strValue = metadata.get(key.getName());
+    if (strValue != null) {
+      consumer.accept(Long.parseLong(strValue));
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillFilterHandler.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillFilterHandler.java
index 780de965cd0..6f694cc04e3 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillFilterHandler.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillFilterHandler.java
@@ -67,7 +67,7 @@ public ValueExtractor getValueExtractor(ExpressionContext expression) {
     expression = GapfillUtils.stripGapfill(expression);
     if (expression.getType() == ExpressionContext.Type.LITERAL) {
       // Literal
-      return new LiteralValueExtractor(expression.getLiteralString());
+      return new LiteralValueExtractor(expression.getLiteral().getStringValue());
     }
 
     if (expression.getType() == ExpressionContext.Type.IDENTIFIER) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillProcessor.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillProcessor.java
index 22b1bd91631..9b14c51700a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillProcessor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GapfillProcessor.java
@@ -280,7 +280,7 @@ private List<Object[]> aggregateGapfilledData(Object timeCol, List<Object[]> buc
       if (expressionContext.getType() == ExpressionContext.Type.FUNCTION) {
         FunctionContext functionContext = expressionContext.getFunction();
         AggregationFunction aggregationFunction =
-            AggregationFunctionFactory.getAggregationFunction(functionContext, _queryContext);
+            AggregationFunctionFactory.getAggregationFunction(functionContext, _queryContext.isNullHandlingEnabled());
         GroupByResultHolder groupByResultHolder =
             aggregationFunction.createGroupByResultHolder(groupKeyIndexes.size(), groupKeyIndexes.size());
         if (aggregationFunction instanceof CountAggregationFunction) {
@@ -305,10 +305,10 @@ private Object getFillValue(int columnIndex, String columnName, Object key, Colu
     if (expressionContext != null && expressionContext.getFunction() != null && GapfillUtils
         .isFill(expressionContext)) {
       List<ExpressionContext> args = expressionContext.getFunction().getArguments();
-      if (args.get(1).getLiteralString() == null) {
+      if (args.get(1).getLiteral() == null) {
         throw new UnsupportedOperationException("Wrong Sql.");
       }
-      GapfillUtils.FillType fillType = GapfillUtils.FillType.valueOf(args.get(1).getLiteralString());
+      GapfillUtils.FillType fillType = GapfillUtils.FillType.valueOf(args.get(1).getLiteral().getStringValue());
       if (fillType == GapfillUtils.FillType.FILL_DEFAULT_VALUE) {
         // TODO: may fill the default value from sql in the future.
         return GapfillUtils.getDefaultValue(dataType);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java
index cb5975d02bd..654e6232a2f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/GroupByDataTableReducer.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.apache.commons.lang.StringUtils;
 import org.apache.pinot.common.CustomObject;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.exception.QueryException;
@@ -53,10 +54,15 @@
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.utils.rewriter.ResultRewriteUtils;
+import org.apache.pinot.core.query.utils.rewriter.RewriterResult;
 import org.apache.pinot.core.transport.ServerRoutingInstance;
 import org.apache.pinot.core.util.GroupByUtils;
 import org.apache.pinot.core.util.trace.TraceRunnable;
-import org.apache.pinot.spi.utils.LoopUtils;
+import org.apache.pinot.spi.accounting.ThreadExecutionContext;
+import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.RoaringBitmap;
 
 
@@ -99,7 +105,8 @@ public void reduceAndSetResults(String tableName, DataSchema dataSchema,
       PostAggregationHandler postAggregationHandler =
           new PostAggregationHandler(_queryContext, getPrePostAggregationDataSchema(dataSchema));
       DataSchema resultDataSchema = postAggregationHandler.getResultDataSchema();
-      brokerResponse.setResultTable(new ResultTable(resultDataSchema, Collections.emptyList()));
+      RewriterResult rewriterResult = ResultRewriteUtils.rewriteResult(resultDataSchema, Collections.emptyList());
+      brokerResponse.setResultTable(new ResultTable(rewriterResult.getDataSchema(), rewriterResult.getRows()));
       return;
     }
 
@@ -166,6 +173,7 @@ private void reduceWithIntermediateResult(BrokerResponseNative brokerResponseNat
       rows = new ArrayList<>();
       HavingFilterHandler havingFilterHandler =
           new HavingFilterHandler(havingFilter, postAggregationHandler, _queryContext.isNullHandlingEnabled());
+      int processedRows = 0;
       while (rows.size() < limit && sortedIterator.hasNext()) {
         Object[] row = sortedIterator.next().getValues();
         extractFinalAggregationResults(row);
@@ -178,6 +186,8 @@ private void reduceWithIntermediateResult(BrokerResponseNative brokerResponseNat
         if (havingFilterHandler.isMatch(row)) {
           rows.add(row);
         }
+        Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(processedRows);
+        processedRows++;
       }
     } else {
       int numRows = Math.min(numRecords, limit);
@@ -192,12 +202,18 @@ private void reduceWithIntermediateResult(BrokerResponseNative brokerResponseNat
           }
         }
         rows.add(row);
+        Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(i);
       }
     }
 
     // Calculate final result rows after post aggregation
     List<Object[]> resultRows = calculateFinalResultRows(postAggregationHandler, rows);
 
+    RewriterResult resultRewriterResult =
+        ResultRewriteUtils.rewriteResult(resultDataSchema, resultRows);
+    resultRows = resultRewriterResult.getRows();
+    resultDataSchema = resultRewriterResult.getDataSchema();
+
     brokerResponseNative.setResultTable(new ResultTable(resultDataSchema, resultRows));
   }
 
@@ -272,75 +288,81 @@ private IndexedTable getIndexedTable(DataSchema dataSchema, Collection<DataTable
     ColumnDataType[] storedColumnDataTypes = dataSchema.getStoredColumnDataTypes();
     for (int i = 0; i < numReduceThreadsToUse; i++) {
       List<DataTable> reduceGroup = reduceGroups.get(i);
+      int taskId = i;
+      ThreadExecutionContext parentContext = Tracing.getThreadAccountant().getThreadExecutionContext();
       futures[i] = reducerContext.getExecutorService().submit(new TraceRunnable() {
         @Override
         public void runJob() {
-          for (DataTable dataTable : reduceGroup) {
-            // Terminate when thread is interrupted. This is expected when the query already fails in the main thread.
-            if (Thread.interrupted()) {
-              return;
-            }
-            try {
-              boolean nullHandlingEnabled = _queryContext.isNullHandlingEnabled();
-              RoaringBitmap[] nullBitmaps = null;
-              if (nullHandlingEnabled) {
-                nullBitmaps = new RoaringBitmap[_numColumns];
-                for (int i = 0; i < _numColumns; i++) {
-                  nullBitmaps[i] = dataTable.getNullRowIds(i);
-                }
-              }
-
-              int numRows = dataTable.getNumberOfRows();
-              for (int rowId = 0; rowId < numRows; rowId++) {
-                LoopUtils.checkMergePhaseInterruption(rowId);
-                Object[] values = new Object[_numColumns];
-                for (int colId = 0; colId < _numColumns; colId++) {
-                  switch (storedColumnDataTypes[colId]) {
-                    case INT:
-                      values[colId] = dataTable.getInt(rowId, colId);
-                      break;
-                    case LONG:
-                      values[colId] = dataTable.getLong(rowId, colId);
-                      break;
-                    case FLOAT:
-                      values[colId] = dataTable.getFloat(rowId, colId);
-                      break;
-                    case DOUBLE:
-                      values[colId] = dataTable.getDouble(rowId, colId);
-                      break;
-                    case BIG_DECIMAL:
-                      values[colId] = dataTable.getBigDecimal(rowId, colId);
-                      break;
-                    case STRING:
-                      values[colId] = dataTable.getString(rowId, colId);
-                      break;
-                    case BYTES:
-                      values[colId] = dataTable.getBytes(rowId, colId);
-                      break;
-                    case OBJECT:
-                      // TODO: Move ser/de into AggregationFunction interface
-                      CustomObject customObject = dataTable.getCustomObject(rowId, colId);
-                      if (customObject != null) {
-                        values[colId] = ObjectSerDeUtils.deserialize(customObject);
-                      }
-                      break;
-                    // Add other aggregation intermediate result / group-by column type supports here
-                    default:
-                      throw new IllegalStateException();
+          Tracing.ThreadAccountantOps.setupWorker(taskId, new ThreadResourceUsageProvider(), parentContext);
+          try {
+            for (DataTable dataTable : reduceGroup) {
+              try {
+                boolean nullHandlingEnabled = _queryContext.isNullHandlingEnabled();
+                RoaringBitmap[] nullBitmaps = null;
+                if (nullHandlingEnabled) {
+                  nullBitmaps = new RoaringBitmap[_numColumns];
+                  for (int i = 0; i < _numColumns; i++) {
+                    nullBitmaps[i] = dataTable.getNullRowIds(i);
                   }
                 }
-                if (nullHandlingEnabled) {
+
+                int numRows = dataTable.getNumberOfRows();
+                for (int rowId = 0; rowId < numRows; rowId++) {
+                  // Terminate when thread is interrupted.
+                  // This is expected when the query already fails in the main thread.
+                  // The first check will always be performed when rowId = 0
+                  Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(rowId);
+                  Object[] values = new Object[_numColumns];
                   for (int colId = 0; colId < _numColumns; colId++) {
-                    if (nullBitmaps[colId] != null && nullBitmaps[colId].contains(rowId)) {
-                      values[colId] = null;
+                    switch (storedColumnDataTypes[colId]) {
+                      case INT:
+                        values[colId] = dataTable.getInt(rowId, colId);
+                        break;
+                      case LONG:
+                        values[colId] = dataTable.getLong(rowId, colId);
+                        break;
+                      case FLOAT:
+                        values[colId] = dataTable.getFloat(rowId, colId);
+                        break;
+                      case DOUBLE:
+                        values[colId] = dataTable.getDouble(rowId, colId);
+                        break;
+                      case BIG_DECIMAL:
+                        values[colId] = dataTable.getBigDecimal(rowId, colId);
+                        break;
+                      case STRING:
+                        values[colId] = dataTable.getString(rowId, colId);
+                        break;
+                      case BYTES:
+                        values[colId] = dataTable.getBytes(rowId, colId);
+                        break;
+                      case OBJECT:
+                        // TODO: Move ser/de into AggregationFunction interface
+                        CustomObject customObject = dataTable.getCustomObject(rowId, colId);
+                        if (customObject != null) {
+                          values[colId] = ObjectSerDeUtils.deserialize(customObject);
+                        }
+                        break;
+                      // Add other aggregation intermediate result / group-by column type supports here
+                      default:
+                        throw new IllegalStateException();
+                    }
+                  }
+                  if (nullHandlingEnabled) {
+                    for (int colId = 0; colId < _numColumns; colId++) {
+                      if (nullBitmaps[colId] != null && nullBitmaps[colId].contains(rowId)) {
+                        values[colId] = null;
+                      }
                     }
                   }
+                  indexedTable.upsert(new Record(values));
                 }
-                indexedTable.upsert(new Record(values));
+              } finally {
+                countDownLatch.countDown();
               }
-            } finally {
-              countDownLatch.countDown();
             }
+          } finally {
+            Tracing.ThreadAccountantOps.clear();
           }
         }
       });
@@ -352,7 +374,9 @@ public void runJob() {
         throw new TimeoutException("Timed out in broker reduce phase");
       }
     } catch (InterruptedException e) {
-      throw new RuntimeException("Interrupted in broker reduce phase", e);
+      Exception killedErrorMsg = Tracing.getThreadAccountant().getErrorStatus();
+      throw new EarlyTerminationException("Interrupted in broker reduce phase"
+          + (killedErrorMsg == null ? StringUtils.EMPTY : " " + killedErrorMsg), e);
     } finally {
       for (Future future : futures) {
         if (!future.isDone()) {
@@ -426,6 +450,11 @@ private void reduceWithFinalResult(DataSchema dataSchema, DataTable dataTable,
     // Calculate final result rows after post aggregation
     List<Object[]> resultRows = calculateFinalResultRows(postAggregationHandler, rows);
 
+    RewriterResult resultRewriterResult =
+        ResultRewriteUtils.rewriteResult(resultDataSchema, resultRows);
+    resultRows = resultRewriterResult.getRows();
+    resultDataSchema = resultRewriterResult.getDataSchema();
+
     brokerResponseNative.setResultTable(new ResultTable(resultDataSchema, resultRows));
   }
 
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/PostAggregationHandler.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/PostAggregationHandler.java
index 516ce76f9dc..efa4445872f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/PostAggregationHandler.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/PostAggregationHandler.java
@@ -108,7 +108,7 @@ public Object[] getResult(Object[] row) {
   public ValueExtractor getValueExtractor(ExpressionContext expression) {
     if (expression.getType() == ExpressionContext.Type.LITERAL) {
       // Literal
-      return new LiteralValueExtractor(expression.getLiteralString());
+      return new LiteralValueExtractor(expression.getLiteral().getStringValue());
     }
     if (_numGroupByExpressions > 0) {
       Integer groupByExpressionIndex = _groupByExpressionIndexMap.get(expression);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ResultReducerFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ResultReducerFactory.java
index 529cad24dbc..24d991d4b4c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ResultReducerFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/ResultReducerFactory.java
@@ -18,17 +18,13 @@
  */
 package org.apache.pinot.core.query.reduce;
 
-import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextUtils;
-import org.apache.pinot.segment.spi.AggregationFunctionType;
 
 
 /**
  * Factory class to construct the right result reducer based on the query context.
  */
-@SuppressWarnings("rawtypes")
 public final class ResultReducerFactory {
   private ResultReducerFactory() {
   }
@@ -40,26 +36,18 @@ public static DataTableReducer getResultReducer(QueryContext queryContext) {
     if (queryContext.isExplain()) {
       return new ExplainPlanDataTableReducer(queryContext);
     }
-
-    AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
-    if (aggregationFunctions == null) {
-      // Selection query
+    if (QueryContextUtils.isSelectionQuery(queryContext)) {
       return new SelectionDataTableReducer(queryContext);
-    } else {
-      // Aggregation query
+    }
+    if (QueryContextUtils.isAggregationQuery(queryContext)) {
       if (queryContext.getGroupByExpressions() == null) {
-        // Aggregation only query
-        if (aggregationFunctions.length == 1 && aggregationFunctions[0].getType() == AggregationFunctionType.DISTINCT) {
-          // Distinct query
-          return new DistinctDataTableReducer((DistinctAggregationFunction) aggregationFunctions[0], queryContext);
-        } else {
-          return new AggregationDataTableReducer(queryContext);
-        }
+        return new AggregationDataTableReducer(queryContext);
       } else {
-        // Aggregation group-by query
         return new GroupByDataTableReducer(queryContext);
       }
     }
+    assert QueryContextUtils.isDistinctQuery(queryContext);
+    return new DistinctDataTableReducer(queryContext);
   }
 
   public static StreamingReducer getStreamingReducer(QueryContext queryContext) {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/SelectionDataTableReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/SelectionDataTableReducer.java
index 4d30f549358..a21684acdf0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/SelectionDataTableReducer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/SelectionDataTableReducer.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.core.query.reduce;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -64,63 +65,50 @@ public void reduceAndSetResults(String tableName, DataSchema dataSchema,
       List<String> selectionColumns = SelectionOperatorUtils.getSelectionColumns(_queryContext, dataSchema);
       DataSchema selectionDataSchema = SelectionOperatorUtils.getResultTableDataSchema(dataSchema, selectionColumns);
       brokerResponseNative.setResultTable(new ResultTable(selectionDataSchema, Collections.emptyList()));
-    } else {
-      // For data table map with more than one data tables, remove conflicting data tables
-      if (dataTableMap.size() > 1) {
-        List<ServerRoutingInstance> droppedServers = removeConflictingResponses(dataSchema, dataTableMap);
-        if (!droppedServers.isEmpty()) {
-          String errorMessage = QueryException.MERGE_RESPONSE_ERROR.getMessage() + ": responses for table: " + tableName
-              + " from servers: " + droppedServers + " got dropped due to data schema inconsistency.";
-          LOGGER.warn(errorMessage);
-          if (brokerMetrics != null) {
-            brokerMetrics.addMeteredTableValue(TableNameBuilder.extractRawTableName(tableName),
-                BrokerMeter.RESPONSE_MERGE_EXCEPTIONS, 1L);
-          }
-          brokerResponseNative.addToExceptions(
-              new QueryProcessingException(QueryException.MERGE_RESPONSE_ERROR_CODE, errorMessage));
+      return;
+    }
+
+    // For data table map with more than one data tables, remove conflicting data tables
+    if (dataTableMap.size() > 1) {
+      DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+      List<ServerRoutingInstance> droppedServers = new ArrayList<>();
+      Iterator<Map.Entry<ServerRoutingInstance, DataTable>> iterator = dataTableMap.entrySet().iterator();
+      while (iterator.hasNext()) {
+        Map.Entry<ServerRoutingInstance, DataTable> entry = iterator.next();
+        DataSchema dataSchemaToCompare = entry.getValue().getDataSchema();
+        assert dataSchemaToCompare != null;
+        if (!Arrays.equals(columnDataTypes, dataSchemaToCompare.getColumnDataTypes())) {
+          droppedServers.add(entry.getKey());
+          iterator.remove();
         }
       }
-
-      int limit = _queryContext.getLimit();
-      if (limit > 0 && _queryContext.getOrderByExpressions() != null) {
-        // Selection order-by
-        SelectionOperatorService selectionService = new SelectionOperatorService(_queryContext, dataSchema);
-        selectionService.reduceWithOrdering(dataTableMap.values(), _queryContext.isNullHandlingEnabled());
-        brokerResponseNative.setResultTable(selectionService.renderResultTableWithOrdering());
-      } else {
-        // Selection only
-        List<String> selectionColumns = SelectionOperatorUtils.getSelectionColumns(_queryContext, dataSchema);
-        List<Object[]> reducedRows = SelectionOperatorUtils.reduceWithoutOrdering(dataTableMap.values(), limit,
-            _queryContext.isNullHandlingEnabled());
-        brokerResponseNative.setResultTable(
-            SelectionOperatorUtils.renderResultTableWithoutOrdering(reducedRows, dataSchema, selectionColumns));
+      if (!droppedServers.isEmpty()) {
+        String errorMessage =
+            QueryException.MERGE_RESPONSE_ERROR.getMessage() + ": responses for table: " + tableName + " from servers: "
+                + droppedServers + " got dropped due to data schema inconsistency.";
+        LOGGER.warn(errorMessage);
+        if (brokerMetrics != null) {
+          brokerMetrics.addMeteredTableValue(TableNameBuilder.extractRawTableName(tableName),
+              BrokerMeter.RESPONSE_MERGE_EXCEPTIONS, 1L);
+        }
+        brokerResponseNative.addToExceptions(
+            new QueryProcessingException(QueryException.MERGE_RESPONSE_ERROR_CODE, errorMessage));
       }
     }
-  }
 
-  /**
-   * Given a data schema, remove data tables that are not compatible with this data schema.
-   * <p>Upgrade the data schema passed in to cover all remaining data schemas.
-   *
-   * @param dataSchema data schema.
-   * @param dataTableMap map from server to data table.
-   * @return list of server names where the data table got removed.
-   */
-  private List<ServerRoutingInstance> removeConflictingResponses(DataSchema dataSchema,
-      Map<ServerRoutingInstance, DataTable> dataTableMap) {
-    List<ServerRoutingInstance> droppedServers = new ArrayList<>();
-    Iterator<Map.Entry<ServerRoutingInstance, DataTable>> iterator = dataTableMap.entrySet().iterator();
-    while (iterator.hasNext()) {
-      Map.Entry<ServerRoutingInstance, DataTable> entry = iterator.next();
-      DataSchema dataSchemaToCompare = entry.getValue().getDataSchema();
-      assert dataSchemaToCompare != null;
-      if (!dataSchema.isTypeCompatibleWith(dataSchemaToCompare)) {
-        droppedServers.add(entry.getKey());
-        iterator.remove();
-      } else {
-        dataSchema = DataSchema.upgradeToCover(dataSchema, dataSchemaToCompare);
-      }
+    int limit = _queryContext.getLimit();
+    if (limit > 0 && _queryContext.getOrderByExpressions() != null) {
+      // Selection order-by
+      SelectionOperatorService selectionService = new SelectionOperatorService(_queryContext, dataSchema);
+      selectionService.reduceWithOrdering(dataTableMap.values(), _queryContext.isNullHandlingEnabled());
+      brokerResponseNative.setResultTable(selectionService.renderResultTableWithOrdering());
+    } else {
+      // Selection only
+      List<String> selectionColumns = SelectionOperatorUtils.getSelectionColumns(_queryContext, dataSchema);
+      List<Object[]> reducedRows = SelectionOperatorUtils.reduceWithoutOrdering(dataTableMap.values(), limit,
+          _queryContext.isNullHandlingEnabled());
+      brokerResponseNative.setResultTable(
+          SelectionOperatorUtils.renderResultTableWithoutOrdering(reducedRows, dataSchema, selectionColumns));
     }
-    return droppedServers;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/function/InternalReduceFunctions.java b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/function/InternalReduceFunctions.java
index e56e82298e5..ab0e8cfd209 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/function/InternalReduceFunctions.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/reduce/function/InternalReduceFunctions.java
@@ -19,7 +19,6 @@
 
 package org.apache.pinot.core.query.reduce.function;
 
-import org.apache.pinot.segment.local.customobject.PinotFourthMoment;
 import org.apache.pinot.spi.annotations.ScalarFunction;
 
 
@@ -33,13 +32,11 @@ public class InternalReduceFunctions {
   private InternalReduceFunctions() {
   }
 
-  @ScalarFunction
-  public static double skewnessReduce(PinotFourthMoment fourthMoment) {
-    return fourthMoment.skew();
-  }
-
-  @ScalarFunction
-  public static double kurtosisReduce(PinotFourthMoment fourthMoment) {
-    return fourthMoment.kurtosis();
+  @ScalarFunction(nullableParameters = true)
+  public static Double avgReduce(Double intermediateResultSum, Long intermediateResultCount) {
+    if (intermediateResultCount == null || intermediateResultCount == 0L || intermediateResultSum == null) {
+      return null;
+    }
+    return intermediateResultSum / intermediateResultCount;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
index fcc97dd6fd7..5d5e9a3718c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
@@ -73,6 +73,7 @@ public class QueryContext {
   private final String _tableName;
   private final QueryContext _subquery;
   private final List<ExpressionContext> _selectExpressions;
+  private final boolean _distinct;
   private final List<String> _aliasList;
   private final FilterContext _filter;
   private final List<ExpressionContext> _groupByExpressions;
@@ -124,14 +125,15 @@ public class QueryContext {
   private boolean _serverReturnFinalResult;
 
   private QueryContext(@Nullable String tableName, @Nullable QueryContext subquery,
-      List<ExpressionContext> selectExpressions, List<String> aliasList, @Nullable FilterContext filter,
-      @Nullable List<ExpressionContext> groupByExpressions, @Nullable FilterContext havingFilter,
-      @Nullable List<OrderByExpressionContext> orderByExpressions, int limit, int offset,
-      Map<String, String> queryOptions, @Nullable Map<ExpressionContext, ExpressionContext> expressionOverrideHints,
-      boolean explain) {
+      List<ExpressionContext> selectExpressions, boolean distinct, List<String> aliasList,
+      @Nullable FilterContext filter, @Nullable List<ExpressionContext> groupByExpressions,
+      @Nullable FilterContext havingFilter, @Nullable List<OrderByExpressionContext> orderByExpressions, int limit,
+      int offset, Map<String, String> queryOptions,
+      @Nullable Map<ExpressionContext, ExpressionContext> expressionOverrideHints, boolean explain) {
     _tableName = tableName;
     _subquery = subquery;
     _selectExpressions = selectExpressions;
+    _distinct = distinct;
     _aliasList = Collections.unmodifiableList(aliasList);
     _filter = filter;
     _groupByExpressions = groupByExpressions;
@@ -167,6 +169,13 @@ public List<ExpressionContext> getSelectExpressions() {
     return _selectExpressions;
   }
 
+  /**
+   * Returns whether the query is a DISTINCT query.
+   */
+  public boolean isDistinct() {
+    return _distinct;
+  }
+
   /**
    * Returns an unmodifiable list from the expression to its alias.
    */
@@ -413,9 +422,9 @@ public <K, V> V getOrComputeSharedValue(Class<V> type, K key, Function<K, V> map
   @Override
   public String toString() {
     return "QueryContext{" + "_tableName='" + _tableName + '\'' + ", _subquery=" + _subquery + ", _selectExpressions="
-        + _selectExpressions + ", _aliasList=" + _aliasList + ", _filter=" + _filter + ", _groupByExpressions="
-        + _groupByExpressions + ", _havingFilter=" + _havingFilter + ", _orderByExpressions=" + _orderByExpressions
-        + ", _limit=" + _limit + ", _offset=" + _offset + ", _queryOptions=" + _queryOptions
+        + _selectExpressions + ", _distinct=" + _distinct + ", _aliasList=" + _aliasList + ", _filter=" + _filter
+        + ", _groupByExpressions=" + _groupByExpressions + ", _havingFilter=" + _havingFilter + ", _orderByExpressions="
+        + _orderByExpressions + ", _limit=" + _limit + ", _offset=" + _offset + ", _queryOptions=" + _queryOptions
         + ", _expressionOverrideHints=" + _expressionOverrideHints + ", _explain=" + _explain + '}';
   }
 
@@ -423,6 +432,7 @@ public static class Builder {
     private String _tableName;
     private QueryContext _subquery;
     private List<ExpressionContext> _selectExpressions;
+    private boolean _distinct;
     private List<String> _aliasList;
     private FilterContext _filter;
     private List<ExpressionContext> _groupByExpressions;
@@ -450,6 +460,11 @@ public Builder setSelectExpressions(List<ExpressionContext> selectExpressions) {
       return this;
     }
 
+    public Builder setDistinct(boolean distinct) {
+      _distinct = distinct;
+      return this;
+    }
+
     public Builder setAliasList(List<String> aliasList) {
       _aliasList = aliasList;
       return this;
@@ -507,8 +522,9 @@ public QueryContext build() {
         _queryOptions = Collections.emptyMap();
       }
       QueryContext queryContext =
-          new QueryContext(_tableName, _subquery, _selectExpressions, _aliasList, _filter, _groupByExpressions,
-              _havingFilter, _orderByExpressions, _limit, _offset, _queryOptions, _expressionOverrideHints, _explain);
+          new QueryContext(_tableName, _subquery, _selectExpressions, _distinct, _aliasList, _filter,
+              _groupByExpressions, _havingFilter, _orderByExpressions, _limit, _offset, _queryOptions,
+              _expressionOverrideHints, _explain);
       queryContext.setNullHandlingEnabled(QueryOptionsUtils.isNullHandlingEnabled(_queryOptions));
       queryContext.setServerReturnFinalResult(QueryOptionsUtils.isServerReturnFinalResult(_queryOptions));
 
@@ -540,7 +556,7 @@ private void generateAggregationFunctions(QueryContext queryContext) {
         }
         int functionIndex = filteredAggregationFunctions.size();
         AggregationFunction aggregationFunction =
-            AggregationFunctionFactory.getAggregationFunction(aggregation, queryContext);
+            AggregationFunctionFactory.getAggregationFunction(aggregation, queryContext._nullHandlingEnabled);
         filteredAggregationFunctions.add(Pair.of(aggregationFunction, filter));
         filteredAggregationsIndexMap.put(Pair.of(aggregation, filter), functionIndex);
       }
@@ -561,7 +577,7 @@ private void generateAggregationFunctions(QueryContext queryContext) {
           FilterContext filter = pair.getRight();
           int functionIndex = filteredAggregationFunctions.size();
           AggregationFunction aggregationFunction =
-              AggregationFunctionFactory.getAggregationFunction(aggregation, queryContext);
+              AggregationFunctionFactory.getAggregationFunction(aggregation, queryContext._nullHandlingEnabled);
           filteredAggregationFunctions.add(Pair.of(aggregationFunction, filter));
           filteredAggregationsIndexMap.put(Pair.of(aggregation, filter), functionIndex);
         }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextConverterUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextConverterUtils.java
index c04e0f7b42b..7d16ed1cc47 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextConverterUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextConverterUtils.java
@@ -24,10 +24,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.pinot.common.request.DataSource;
 import org.apache.pinot.common.request.Expression;
-import org.apache.pinot.common.request.ExpressionType;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.common.request.context.ExpressionContext;
@@ -64,40 +64,29 @@ public static QueryContext getQueryContext(PinotQuery pinotQuery) {
 
     // SELECT
     List<ExpressionContext> selectExpressions;
+    boolean distinct = false;
     List<Expression> selectList = pinotQuery.getSelectList();
+    // Handle DISTINCT
+    if (selectList.size() == 1) {
+      Function function = selectList.get(0).getFunctionCall();
+      if (function != null && function.getOperator().equals("distinct")) {
+        distinct = true;
+        selectList = function.getOperands();
+      }
+    }
     List<String> aliasList = new ArrayList<>(selectList.size());
     selectExpressions = new ArrayList<>(selectList.size());
     for (Expression thriftExpression : selectList) {
       // Handle alias
-      Expression expressionWithoutAlias = thriftExpression;
-      if (thriftExpression.getType() == ExpressionType.FUNCTION) {
-        Function function = thriftExpression.getFunctionCall();
+      Function function = thriftExpression.getFunctionCall();
+      Expression expressionWithoutAlias;
+      if (function != null && function.getOperator().equals("as")) {
         List<Expression> operands = function.getOperands();
-        switch (function.getOperator().toUpperCase()) {
-          case "AS":
-            expressionWithoutAlias = operands.get(0);
-            aliasList.add(operands.get(1).getIdentifier().getName());
-            break;
-          case "DISTINCT":
-            int numOperands = operands.size();
-            for (int i = 0; i < numOperands; i++) {
-              Expression operand = operands.get(i);
-              Function operandFunction = operand.getFunctionCall();
-              if (operandFunction != null && operandFunction.getOperator().equalsIgnoreCase("AS")) {
-                operands.set(i, operandFunction.getOperands().get(0));
-                aliasList.add(operandFunction.getOperands().get(1).getIdentifier().getName());
-              } else {
-                aliasList.add(null);
-              }
-            }
-            break;
-          default:
-            // Add null as a placeholder for alias.
-            aliasList.add(null);
-            break;
-        }
+        expressionWithoutAlias = operands.get(0);
+        aliasList.add(operands.get(1).getIdentifier().getName());
       } else {
-        // Add null as a placeholder for alias.
+        expressionWithoutAlias = thriftExpression;
+        // Add null as a placeholder for alias
         aliasList.add(null);
       }
       selectExpressions.add(RequestContextUtils.getExpression(expressionWithoutAlias));
@@ -124,16 +113,20 @@ public static QueryContext getQueryContext(PinotQuery pinotQuery) {
     List<OrderByExpressionContext> orderByExpressions = null;
     List<Expression> orderByList = pinotQuery.getOrderByList();
     if (CollectionUtils.isNotEmpty(orderByList)) {
-      // Deduplicate the order-by expressions
       orderByExpressions = new ArrayList<>(orderByList.size());
-      Set<ExpressionContext> expressionSet = new HashSet<>();
+      Set<Expression> seen = new HashSet<>();
       for (Expression orderBy : orderByList) {
-        // NOTE: Order-by is always a Function with the ordering of the Expression
-        Function thriftFunction = orderBy.getFunctionCall();
-        ExpressionContext expression = RequestContextUtils.getExpression(thriftFunction.getOperands().get(0));
-        if (expressionSet.add(expression)) {
-          boolean isAsc = thriftFunction.getOperator().equalsIgnoreCase("ASC");
-          orderByExpressions.add(new OrderByExpressionContext(expression, isAsc));
+        boolean isAsc = isAsc(orderBy);
+        Boolean isNullsLast = isNullsLast(orderBy);
+        Expression orderByFunctionsRemoved = CalciteSqlParser.removeOrderByFunctions(orderBy);
+        // Deduplicate the order-by expressions
+        if (seen.add(orderByFunctionsRemoved)) {
+          ExpressionContext expressionContext = RequestContextUtils.getExpression(orderByFunctionsRemoved);
+          if (isNullsLast != null) {
+            orderByExpressions.add(new OrderByExpressionContext(expressionContext, isAsc, isNullsLast));
+          } else {
+            orderByExpressions.add(new OrderByExpressionContext(expressionContext, isAsc));
+          }
         }
       }
     }
@@ -156,10 +149,34 @@ public static QueryContext getQueryContext(PinotQuery pinotQuery) {
     }
 
     return new QueryContext.Builder().setTableName(tableName).setSubquery(subquery)
-        .setSelectExpressions(selectExpressions).setAliasList(aliasList).setFilter(filter)
+        .setSelectExpressions(selectExpressions).setDistinct(distinct).setAliasList(aliasList).setFilter(filter)
         .setGroupByExpressions(groupByExpressions).setOrderByExpressions(orderByExpressions)
         .setHavingFilter(havingFilter).setLimit(pinotQuery.getLimit()).setOffset(pinotQuery.getOffset())
         .setQueryOptions(pinotQuery.getQueryOptions()).setExpressionOverrideHints(expressionContextOverrideHints)
         .setExplain(pinotQuery.isExplain()).build();
   }
+
+  private static boolean isAsc(Expression expression) {
+    while (expression != null && expression.isSetFunctionCall()) {
+      if (expression.getFunctionCall().getOperator().equals(CalciteSqlParser.ASC)) {
+        return true;
+      }
+      expression = expression.getFunctionCall().getOperands().get(0);
+    }
+    return false;
+  }
+
+  @Nullable
+  private static Boolean isNullsLast(Expression expression) {
+    while (expression != null && expression.isSetFunctionCall()) {
+      String operator = expression.getFunctionCall().getOperator();
+      if (operator.equals(CalciteSqlParser.NULLS_LAST)) {
+        return true;
+      } else if (operator.equals(CalciteSqlParser.NULLS_FIRST)) {
+        return false;
+      }
+      expression = expression.getFunctionCall().getOperands().get(0);
+    }
+    return null;
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextUtils.java
index 7a468c438bf..b5beee1a401 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/utils/QueryContextUtils.java
@@ -24,12 +24,9 @@
 import org.apache.pinot.common.request.context.FilterContext;
 import org.apache.pinot.common.request.context.FunctionContext;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.request.context.QueryContext;
 
 
-@SuppressWarnings("rawtypes")
 public class QueryContextUtils {
   private QueryContextUtils() {
   }
@@ -38,7 +35,7 @@ private QueryContextUtils() {
    * Returns {@code true} if the given query is a selection query, {@code false} otherwise.
    */
   public static boolean isSelectionQuery(QueryContext query) {
-    return query.getAggregationFunctions() == null;
+    return !query.isDistinct() && query.getAggregationFunctions() == null;
   }
 
   /**
@@ -47,25 +44,21 @@ public static boolean isSelectionQuery(QueryContext query) {
    * Selection-only query at this moment means selection query without order-by.
    */
   public static boolean isSelectionOnlyQuery(QueryContext query) {
-    return query.getAggregationFunctions() == null && query.getOrderByExpressions() == null;
+    return isSelectionQuery(query) && query.getOrderByExpressions() == null;
   }
 
   /**
    * Returns {@code true} if the given query is an aggregation query, {@code false} otherwise.
    */
   public static boolean isAggregationQuery(QueryContext query) {
-    AggregationFunction[] aggregationFunctions = query.getAggregationFunctions();
-    return aggregationFunctions != null && (aggregationFunctions.length != 1
-        || !(aggregationFunctions[0] instanceof DistinctAggregationFunction));
+    return query.getAggregationFunctions() != null;
   }
 
   /**
    * Returns {@code true} if the given query is a distinct query, {@code false} otherwise.
    */
   public static boolean isDistinctQuery(QueryContext query) {
-    AggregationFunction[] aggregationFunctions = query.getAggregationFunctions();
-    return aggregationFunctions != null && aggregationFunctions.length == 1
-        && aggregationFunctions[0] instanceof DistinctAggregationFunction;
+    return query.isDistinct();
   }
 
   /** Collect aggregation functions (except for the ones in filter). */
@@ -96,7 +89,6 @@ public static void collectPostAggregations(QueryContext queryContext, Set<String
     }
   }
 
-
   /** Collect aggregation functions from an ExpressionContext. */
   public static void collectPostAggregations(ExpressionContext expression, Set<String> postAggregations) {
     FunctionContext function = expression.getFunction();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java b/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
index e14a6180a3a..f60962730af 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QueryScheduler.java
@@ -145,6 +145,7 @@ protected ListenableFutureTask<byte[]> createQueryFutureTask(ServerQueryRequest
   @Nullable
   protected byte[] processQueryAndSerialize(ServerQueryRequest queryRequest, ExecutorService executorService) {
 
+    //Start instrumentation context. This must not be moved further below interspersed into the code.
     Tracing.ThreadAccountantOps.setupRunner(queryRequest.getQueryId());
 
     _latestQueryTime.accumulate(System.currentTimeMillis());
@@ -278,7 +279,7 @@ protected byte[] processQueryAndSerialize(ServerQueryRequest queryRequest, Execu
         _numDroppedLogCounter.incrementAndGet();
       }
 
-      if (minConsumingFreshnessMs > -1) {
+      if (minConsumingFreshnessMs > -1 && minConsumingFreshnessMs != Long.MAX_VALUE) {
         _serverMetrics.addTimedTableValue(tableNameWithType, ServerTimer.FRESHNESS_LAG_MS,
             (System.currentTimeMillis() - minConsumingFreshnessMs), TimeUnit.MILLISECONDS);
       }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/resources/ResourceManager.java b/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/resources/ResourceManager.java
index 0216ca3f291..9414dc11edd 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/resources/ResourceManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/resources/ResourceManager.java
@@ -28,7 +28,6 @@
 import org.apache.pinot.core.query.scheduler.SchedulerGroupAccountant;
 import org.apache.pinot.core.util.trace.TracedThreadFactory;
 import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.trace.Tracing;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,8 +93,6 @@ public ResourceManager(PinotConfiguration config) {
         CommonConstants.ExecutorService.PINOT_QUERY_WORKER_NAME_FORMAT);
     _queryWorkers =
         MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(_numQueryWorkerThreads, queryWorkersFactory));
-
-    Tracing.ThreadAccountantOps.initializeThreadAccountant(_numQueryRunnerThreads, _numQueryWorkerThreads, config);
   }
 
   public void stop() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorService.java b/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorService.java
index 525ab7af9ec..688c7bbf495 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorService.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorService.java
@@ -26,7 +26,8 @@
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.spi.utils.LoopUtils;
+import org.apache.pinot.core.query.utils.OrderByComparatorFactory;
+import org.apache.pinot.spi.trace.Tracing;
 import org.roaringbitmap.RoaringBitmap;
 
 
@@ -55,7 +56,6 @@
  *   </li>
  * </ul>
  */
-@SuppressWarnings("rawtypes")
 public class SelectionOperatorService {
   private final QueryContext _queryContext;
   private final List<String> _selectionColumns;
@@ -65,7 +65,7 @@ public class SelectionOperatorService {
   private final PriorityQueue<Object[]> _rows;
 
   /**
-   * Constructor for <code>SelectionOperatorService</code> with {@link DataSchema}. (Inter segment)
+   * Constructor for <code>SelectionOperatorService</code> with {@link DataSchema}. (Broker side)
    *
    * @param queryContext Selection order-by query
    * @param dataSchema data schema.
@@ -79,8 +79,8 @@ public SelectionOperatorService(QueryContext queryContext, DataSchema dataSchema
     _numRowsToKeep = _offset + queryContext.getLimit();
     assert queryContext.getOrderByExpressions() != null;
     _rows = new PriorityQueue<>(Math.min(_numRowsToKeep, SelectionOperatorUtils.MAX_ROW_HOLDER_INITIAL_CAPACITY),
-        SelectionOperatorUtils.getTypeCompatibleComparator(queryContext.getOrderByExpressions(), _dataSchema,
-            _queryContext.isNullHandlingEnabled()));
+        OrderByComparatorFactory.getComparator(queryContext.getOrderByExpressions(),
+            _queryContext.isNullHandlingEnabled()).reversed());
   }
 
   /**
@@ -95,6 +95,8 @@ public PriorityQueue<Object[]> getRows() {
   /**
    * Reduces a collection of {@link DataTable}s to selection rows for selection queries with <code>ORDER BY</code>.
    * (Broker side)
+   * TODO: Do merge sort after releasing 0.13.0 when server side results are sorted
+   *       Can also consider adding a data table metadata to indicate whether the server side results are sorted
    */
   public void reduceWithOrdering(Collection<DataTable> dataTables, boolean nullHandlingEnabled) {
     for (DataTable dataTable : dataTables) {
@@ -105,7 +107,6 @@ public void reduceWithOrdering(Collection<DataTable> dataTables, boolean nullHan
           nullBitmaps[colId] = dataTable.getNullRowIds(colId);
         }
         for (int rowId = 0; rowId < numRows; rowId++) {
-          LoopUtils.checkMergePhaseInterruption(rowId);
           Object[] row = SelectionOperatorUtils.extractRowFromDataTable(dataTable, rowId);
           for (int colId = 0; colId < nullBitmaps.length; colId++) {
             if (nullBitmaps[colId] != null && nullBitmaps[colId].contains(rowId)) {
@@ -113,12 +114,13 @@ public void reduceWithOrdering(Collection<DataTable> dataTables, boolean nullHan
             }
           }
           SelectionOperatorUtils.addToPriorityQueue(row, _rows, _numRowsToKeep);
+          Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(rowId);
         }
       } else {
         for (int rowId = 0; rowId < numRows; rowId++) {
-          LoopUtils.checkMergePhaseInterruption(rowId);
           Object[] row = SelectionOperatorUtils.extractRowFromDataTable(dataTable, rowId);
           SelectionOperatorUtils.addToPriorityQueue(row, _rows, _numRowsToKeep);
+          Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(rowId);
         }
       }
     }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorUtils.java
index bda3efab0b6..66bbefb3d1d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/selection/SelectionOperatorUtils.java
@@ -27,7 +27,6 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
@@ -40,11 +39,11 @@
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.common.datatable.DataTableBuilder;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.spi.utils.ArrayCopyUtils;
+import org.apache.pinot.spi.trace.Tracing;
 import org.apache.pinot.spi.utils.ByteArray;
-import org.apache.pinot.spi.utils.LoopUtils;
 import org.roaringbitmap.RoaringBitmap;
 
 
@@ -192,54 +191,74 @@ public static DataSchema getResultTableDataSchema(DataSchema dataSchema, List<St
   /**
    * Merge two partial results for selection queries without <code>ORDER BY</code>. (Server side)
    *
-   * @param mergedRows partial results 1.
-   * @param rowsToMerge partial results 2.
+   * @param mergedBlock partial results 1.
+   * @param blockToMerge partial results 2.
    * @param selectionSize size of the selection.
    */
-  public static void mergeWithoutOrdering(Collection<Object[]> mergedRows, Collection<Object[]> rowsToMerge,
+  public static void mergeWithoutOrdering(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge,
       int selectionSize) {
-    Iterator<Object[]> iterator = rowsToMerge.iterator();
-    int numMergedRows = 0;
-    while (mergedRows.size() < selectionSize && iterator.hasNext()) {
-      LoopUtils.checkMergePhaseInterruption(numMergedRows);
-      mergedRows.add(iterator.next());
-      numMergedRows++;
+    List<Object[]> mergedRows = mergedBlock.getRows();
+    List<Object[]> rowsToMerge = blockToMerge.getRows();
+    int numRowsToMerge = Math.min(selectionSize - mergedRows.size(), rowsToMerge.size());
+    if (numRowsToMerge > 0) {
+      mergedRows.addAll(rowsToMerge.subList(0, numRowsToMerge));
     }
   }
 
   /**
    * Merge two partial results for selection queries with <code>ORDER BY</code>. (Server side)
-   * TODO: Should use type compatible comparator to compare the rows
    *
-   * @param mergedRows partial results 1.
-   * @param rowsToMerge partial results 2.
+   * @param mergedBlock partial results 1 (sorted).
+   * @param blockToMerge partial results 2 (sorted).
    * @param maxNumRows maximum number of rows need to be stored.
    */
-  public static void mergeWithOrdering(PriorityQueue<Object[]> mergedRows, Collection<Object[]> rowsToMerge,
+  public static void mergeWithOrdering(SelectionResultsBlock mergedBlock, SelectionResultsBlock blockToMerge,
       int maxNumRows) {
+    List<Object[]> sortedRows1 = mergedBlock.getRows();
+    List<Object[]> sortedRows2 = blockToMerge.getRows();
+    Comparator<? super Object[]> comparator = mergedBlock.getComparator();
+    assert comparator != null;
+    int numSortedRows1 = sortedRows1.size();
+    int numSortedRows2 = sortedRows2.size();
+    if (numSortedRows1 == 0) {
+      mergedBlock.setRows(sortedRows2);
+      return;
+    }
+    if (numSortedRows2 == 0 || (numSortedRows1 == maxNumRows
+        && comparator.compare(sortedRows1.get(numSortedRows1 - 1), sortedRows2.get(0)) <= 0)) {
+      return;
+    }
+    int numRowsToMerge = Math.min(numSortedRows1 + numSortedRows2, maxNumRows);
+    List<Object[]> mergedRows = new ArrayList<>(numRowsToMerge);
+    int i1 = 0;
+    int i2 = 0;
     int numMergedRows = 0;
-    for (Object[] row : rowsToMerge) {
-      LoopUtils.checkMergePhaseInterruption(numMergedRows);
-      addToPriorityQueue(row, mergedRows, maxNumRows);
-      numMergedRows++;
+    while (i1 < numSortedRows1 && i2 < numSortedRows2 && numMergedRows < numRowsToMerge) {
+      Object[] row1 = sortedRows1.get(i1);
+      Object[] row2 = sortedRows2.get(i2);
+      if (comparator.compare(row1, row2) <= 0) {
+        mergedRows.add(row1);
+        i1++;
+      } else {
+        mergedRows.add(row2);
+        i2++;
+      }
+      Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(numMergedRows++);
     }
+    if (numMergedRows < numRowsToMerge) {
+      if (i1 < numSortedRows1) {
+        assert i2 == numSortedRows2;
+        mergedRows.addAll(sortedRows1.subList(i1, i1 + numRowsToMerge - numMergedRows));
+      } else {
+        assert i1 == numSortedRows1;
+        mergedRows.addAll(sortedRows2.subList(i2, i2 + numRowsToMerge - numMergedRows));
+      }
+    }
+    mergedBlock.setRows(mergedRows);
   }
 
   /**
    * Build a {@link DataTable} from a {@link Collection} of selection rows with {@link DataSchema}. (Server side)
-   * <p>The passed in data schema stored the column data type that can cover all actual data types for that column.
-   * <p>The actual data types for each column in rows can be different but must be compatible with each other.
-   * <p>Before write each row into the data table, first convert it to match the data types in data schema.
-   *
-   * TODO: Type compatibility is not supported for selection order-by because all segments on the same server shared the
-   *       same comparator. Another solution is to always use the table schema to execute the query (preferable because
-   *       type compatible checks are expensive).
-   *
-   * @param rows {@link Collection} of selection rows.
-   * @param dataSchema data schema.
-   * @param nullHandlingEnabled whether null handling is enabled.
-   * @return data table.
-   * @throws IOException
    */
   public static DataTable getDataTableFromRows(Collection<Object[]> rows, DataSchema dataSchema,
       boolean nullHandlingEnabled)
@@ -276,69 +295,42 @@ public static DataTable getDataTableFromRows(Collection<Object[]> rows, DataSche
         switch (storedColumnDataTypes[i]) {
           // Single-value column
           case INT:
-            dataTableBuilder.setColumn(i, ((Number) columnValue).intValue());
+            dataTableBuilder.setColumn(i, (int) columnValue);
             break;
           case LONG:
-            dataTableBuilder.setColumn(i, ((Number) columnValue).longValue());
+            dataTableBuilder.setColumn(i, (long) columnValue);
             break;
           case FLOAT:
-            dataTableBuilder.setColumn(i, ((Number) columnValue).floatValue());
+            dataTableBuilder.setColumn(i, (float) columnValue);
             break;
           case DOUBLE:
-            dataTableBuilder.setColumn(i, ((Number) columnValue).doubleValue());
+            dataTableBuilder.setColumn(i, (double) columnValue);
             break;
           case BIG_DECIMAL:
             dataTableBuilder.setColumn(i, (BigDecimal) columnValue);
             break;
           case STRING:
-            dataTableBuilder.setColumn(i, ((String) columnValue));
+            dataTableBuilder.setColumn(i, (String) columnValue);
             break;
           case BYTES:
             dataTableBuilder.setColumn(i, (ByteArray) columnValue);
             break;
+          case UNKNOWN:
+            dataTableBuilder.setColumn(i, (Object) null);
+            break;
 
           // Multi-value column
           case INT_ARRAY:
             dataTableBuilder.setColumn(i, (int[]) columnValue);
             break;
           case LONG_ARRAY:
-            // LONG_ARRAY type covers INT_ARRAY and LONG_ARRAY
-            if (columnValue instanceof int[]) {
-              int[] ints = (int[]) columnValue;
-              int length = ints.length;
-              long[] longs = new long[length];
-              ArrayCopyUtils.copy(ints, longs, length);
-              dataTableBuilder.setColumn(i, longs);
-            } else {
-              dataTableBuilder.setColumn(i, (long[]) columnValue);
-            }
+            dataTableBuilder.setColumn(i, (long[]) columnValue);
             break;
           case FLOAT_ARRAY:
             dataTableBuilder.setColumn(i, (float[]) columnValue);
             break;
           case DOUBLE_ARRAY:
-            // DOUBLE_ARRAY type covers INT_ARRAY, LONG_ARRAY, FLOAT_ARRAY and DOUBLE_ARRAY
-            if (columnValue instanceof int[]) {
-              int[] ints = (int[]) columnValue;
-              int length = ints.length;
-              double[] doubles = new double[length];
-              ArrayCopyUtils.copy(ints, doubles, length);
-              dataTableBuilder.setColumn(i, doubles);
-            } else if (columnValue instanceof long[]) {
-              long[] longs = (long[]) columnValue;
-              int length = longs.length;
-              double[] doubles = new double[length];
-              ArrayCopyUtils.copy(longs, doubles, length);
-              dataTableBuilder.setColumn(i, doubles);
-            } else if (columnValue instanceof float[]) {
-              float[] floats = (float[]) columnValue;
-              int length = floats.length;
-              double[] doubles = new double[length];
-              ArrayCopyUtils.copy(floats, doubles, length);
-              dataTableBuilder.setColumn(i, doubles);
-            } else {
-              dataTableBuilder.setColumn(i, (double[]) columnValue);
-            }
+            dataTableBuilder.setColumn(i, (double[]) columnValue);
             break;
           case STRING_ARRAY:
             dataTableBuilder.setColumn(i, (String[]) columnValue);
@@ -398,6 +390,9 @@ public static Object[] extractRowFromDataTable(DataTable dataTable, int rowId) {
         case BYTES:
           row[i] = dataTable.getBytes(rowId, i);
           break;
+        case UNKNOWN:
+          row[i] = null;
+          break;
 
         // Multi-value column
         case INT_ARRAY:
@@ -460,21 +455,21 @@ public static List<Object[]> reduceWithoutOrdering(Collection<DataTable> dataTab
           nullBitmaps[coldId] = dataTable.getNullRowIds(coldId);
         }
         for (int rowId = 0; rowId < numRows; rowId++) {
-          LoopUtils.checkMergePhaseInterruption(rowId);
           if (rows.size() < limit) {
             rows.add(extractRowFromDataTableWithNullHandling(dataTable, rowId, nullBitmaps));
           } else {
             break;
           }
+          Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(rowId);
         }
       } else {
         for (int rowId = 0; rowId < numRows; rowId++) {
-          LoopUtils.checkMergePhaseInterruption(rowId);
           if (rows.size() < limit) {
             rows.add(extractRowFromDataTable(dataTable, rowId));
           } else {
             break;
           }
+          Tracing.ThreadAccountantOps.sampleAndCheckInterruptionPeriodically(rowId);
         }
       }
     }
@@ -560,86 +555,6 @@ public static Map<String, Integer> getColumnToIndexMap(String[] columns) {
     return columnToIndexMap;
   }
 
-  /**
-   * Helper method to get the type-compatible {@link Comparator} for selection rows. (Inter segment)
-   * <p>Type-compatible comparator allows compatible types to compare with each other.
-   *
-   * @return flexible {@link Comparator} for selection rows.
-   */
-  public static Comparator<Object[]> getTypeCompatibleComparator(List<OrderByExpressionContext> orderByExpressions,
-      DataSchema dataSchema, boolean isNullHandlingEnabled) {
-    ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
-
-    // Compare all single-value columns
-    int numOrderByExpressions = orderByExpressions.size();
-    List<Integer> valueIndexList = new ArrayList<>(numOrderByExpressions);
-    for (int i = 0; i < numOrderByExpressions; i++) {
-      if (!columnDataTypes[i].isArray()) {
-        valueIndexList.add(i);
-      }
-    }
-
-    int numValuesToCompare = valueIndexList.size();
-    int[] valueIndices = new int[numValuesToCompare];
-    boolean[] useDoubleComparison = new boolean[numValuesToCompare];
-    // Use multiplier -1 or 1 to control ascending/descending order
-    int[] multipliers = new int[numValuesToCompare];
-    for (int i = 0; i < numValuesToCompare; i++) {
-      int valueIndex = valueIndexList.get(i);
-      valueIndices[i] = valueIndex;
-      if (columnDataTypes[valueIndex].isNumber()) {
-        useDoubleComparison[i] = true;
-      }
-      multipliers[i] = orderByExpressions.get(valueIndex).isAsc() ? -1 : 1;
-    }
-
-    if (isNullHandlingEnabled) {
-      return (o1, o2) -> {
-        for (int i = 0; i < numValuesToCompare; i++) {
-          int index = valueIndices[i];
-          Object v1 = o1[index];
-          Object v2 = o2[index];
-          if (v1 == null) {
-            // The default null ordering is: 'NULLS LAST'.
-            return v2 == null ? 0 : -multipliers[i];
-          } else if (v2 == null) {
-            return multipliers[i];
-          }
-          int result;
-          if (useDoubleComparison[i]) {
-            result = Double.compare(((Number) v1).doubleValue(), ((Number) v2).doubleValue());
-          } else {
-            //noinspection unchecked
-            result = ((Comparable) v1).compareTo(v2);
-          }
-          if (result != 0) {
-            return result * multipliers[i];
-          }
-        }
-        return 0;
-      };
-    } else {
-      return (o1, o2) -> {
-        for (int i = 0; i < numValuesToCompare; i++) {
-          int index = valueIndices[i];
-          Object v1 = o1[index];
-          Object v2 = o2[index];
-          int result;
-          if (useDoubleComparison[i]) {
-            result = Double.compare(((Number) v1).doubleValue(), ((Number) v2).doubleValue());
-          } else {
-            //noinspection unchecked
-            result = ((Comparable) v1).compareTo(v2);
-          }
-          if (result != 0) {
-            return result * multipliers[i];
-          }
-        }
-        return 0;
-      };
-    }
-  }
-
   /**
    * Helper method to add a value to a {@link PriorityQueue}.
    *
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/OrderByComparatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/OrderByComparatorFactory.java
index 4258317e76e..c9d063ead32 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/OrderByComparatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/OrderByComparatorFactory.java
@@ -18,16 +18,11 @@
  */
 package org.apache.pinot.core.query.utils;
 
-import com.google.common.base.Preconditions;
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import org.apache.pinot.common.request.context.OrderByExpressionContext;
-import org.apache.pinot.core.operator.transform.TransformResultMetadata;
-import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.core.operator.ColumnContext;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
-import org.apache.pinot.spi.utils.ByteArray;
 
 
 /**
@@ -38,118 +33,77 @@ private OrderByComparatorFactory() {
   }
 
   public static Comparator<Object[]> getComparator(List<OrderByExpressionContext> orderByExpressions,
-      TransformResultMetadata[] orderByExpressionMetadata, boolean reverse, boolean nullHandlingEnabled) {
-    return getComparator(orderByExpressions, orderByExpressionMetadata, reverse, nullHandlingEnabled, 0,
-        orderByExpressions.size());
+      ColumnContext[] orderByColumnContexts, boolean nullHandlingEnabled) {
+    return getComparator(orderByExpressions, orderByColumnContexts, nullHandlingEnabled, 0, orderByExpressions.size());
   }
 
-  /**
-   * @param reverse if false, the comparator will order in the direction indicated by the
-   * {@link OrderByExpressionContext#isAsc()}. Otherwise, it will be in the opposite direction.
-   */
   public static Comparator<Object[]> getComparator(List<OrderByExpressionContext> orderByExpressions,
-      TransformResultMetadata[] orderByExpressionMetadata, boolean reverse, boolean nullHandlingEnabled, int from,
-      int to) {
-    Preconditions.checkArgument(to <= orderByExpressions.size(),
-        "Trying to access %sth position of orderByExpressions with size %s", to, orderByExpressions.size());
-    Preconditions.checkArgument(to <= orderByExpressionMetadata.length,
-        "Trying to access %sth position of orderByExpressionMetadata with size %s", to,
-        orderByExpressionMetadata.length);
-    Preconditions.checkArgument(from < to, "FROM (%s) must be lower than TO (%s)", from, to);
+      ColumnContext[] orderByColumnContexts, boolean nullHandlingEnabled, int from, int to) {
+    assert 0 <= from && from < to && to <= orderByExpressions.size();
 
-    // Compare all single-value columns
-    int numOrderByExpressions = to - from;
-    List<Integer> valueIndexList = new ArrayList<>(numOrderByExpressions);
+    // Check if all expressions are single-valued
     for (int i = from; i < to; i++) {
-      if (orderByExpressionMetadata[i].isSingleValue()) {
-        valueIndexList.add(i);
-      } else {
-        // MV columns should not be part of the selection order by only list
+      if (!orderByColumnContexts[i].isSingleValue()) {
+        // MV columns should not be part of the selection order-by list
         throw new BadQueryRequestException(
             String.format("MV expression: %s should not be included in the ORDER-BY clause",
                 orderByExpressions.get(i)));
       }
     }
 
-    int numValuesToCompare = valueIndexList.size();
-    int[] valueIndices = new int[numValuesToCompare];
-    FieldSpec.DataType[] storedTypes = new FieldSpec.DataType[numValuesToCompare];
+    return getComparator(orderByExpressions, nullHandlingEnabled, from, to);
+  }
+
+  public static Comparator<Object[]> getComparator(List<OrderByExpressionContext> orderByExpressions,
+      boolean nullHandlingEnabled) {
+    return getComparator(orderByExpressions, nullHandlingEnabled, 0, orderByExpressions.size());
+  }
+
+  @SuppressWarnings({"rawtypes", "unchecked"})
+  public static Comparator<Object[]> getComparator(List<OrderByExpressionContext> orderByExpressions,
+      boolean nullHandlingEnabled, int from, int to) {
+    assert 0 <= from && from < to && to <= orderByExpressions.size();
+
     // Use multiplier -1 or 1 to control ascending/descending order
-    int[] multipliers = new int[numValuesToCompare];
-    int ascMult = reverse ? -1 : 1;
-    int descMult = reverse ? 1 : -1;
-    for (int i = 0; i < numValuesToCompare; i++) {
-      int valueIndex = valueIndexList.get(i);
-      valueIndices[i] = valueIndex;
-      storedTypes[i] = orderByExpressionMetadata[valueIndex].getDataType().getStoredType();
-      multipliers[i] = orderByExpressions.get(valueIndex).isAsc() ? ascMult : descMult;
+    int[] multipliers = new int[to];
+    // Use nulls multiplier -1 or 1 to control nulls last/first order
+    int[] nullsMultipliers = new int[to];
+    for (int i = from; i < to; i++) {
+      multipliers[i] = orderByExpressions.get(i).isAsc() ? 1 : -1;
+      nullsMultipliers[i] = orderByExpressions.get(i).isNullsLast() ? 1 : -1;
     }
 
     if (nullHandlingEnabled) {
       return (Object[] o1, Object[] o2) -> {
-        for (int i = 0; i < numValuesToCompare; i++) {
-          int index = valueIndices[i];
-          // TODO: Evaluate the performance of casting to Comparable and avoid the switch
-          Object v1 = o1[index];
-          Object v2 = o2[index];
-          if (v1 == null) {
-            // The default null ordering is: 'NULLS LAST', regardless of the ordering direction.
-            return v2 == null ? 0 : -multipliers[i];
+        for (int i = from; i < to; i++) {
+          Comparable v1 = (Comparable) o1[i];
+          Comparable v2 = (Comparable) o2[i];
+          if (v1 == null && v2 == null) {
+            continue;
+          } else if (v1 == null) {
+            return nullsMultipliers[i];
           } else if (v2 == null) {
-            return multipliers[i];
+            return -nullsMultipliers[i];
           }
-          int result = compareCols(v1, v2, storedTypes[i], multipliers[i]);
+          int result = v1.compareTo(v2);
           if (result != 0) {
-            return result;
+            return result * multipliers[i];
           }
         }
         return 0;
       };
     } else {
       return (Object[] o1, Object[] o2) -> {
-        for (int i = 0; i < numValuesToCompare; i++) {
-          int index = valueIndices[i];
-          // TODO: Evaluate the performance of casting to Comparable and avoid the switch
-          int result = compareCols(o1[index], o2[index], storedTypes[i], multipliers[i]);
+        for (int i = from; i < to; i++) {
+          Comparable v1 = (Comparable) o1[i];
+          Comparable v2 = (Comparable) o2[i];
+          int result = v1.compareTo(v2);
           if (result != 0) {
-            return result;
+            return result * multipliers[i];
           }
         }
         return 0;
       };
     }
   }
-
-  private static int compareCols(Object v1, Object v2, FieldSpec.DataType type, int multiplier) {
-
-    // TODO: Evaluate the performance of casting to Comparable and avoid the switch
-    int result;
-    switch (type) {
-      case INT:
-        result = ((Integer) v1).compareTo((Integer) v2);
-        break;
-      case LONG:
-        result = ((Long) v1).compareTo((Long) v2);
-        break;
-      case FLOAT:
-        result = ((Float) v1).compareTo((Float) v2);
-        break;
-      case DOUBLE:
-        result = ((Double) v1).compareTo((Double) v2);
-        break;
-      case BIG_DECIMAL:
-        result = ((BigDecimal) v1).compareTo((BigDecimal) v2);
-        break;
-      case STRING:
-        result = ((String) v1).compareTo((String) v2);
-        break;
-      case BYTES:
-        result = ((ByteArray) v1).compareTo((ByteArray) v2);
-        break;
-      // NOTE: Multi-value columns are not comparable, so we should not reach here
-      default:
-        throw new IllegalStateException();
-    }
-    return result * multiplier;
-  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/QueryIdUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/QueryIdUtils.java
index e45e32d366e..48c0dccac58 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/QueryIdUtils.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/QueryIdUtils.java
@@ -30,8 +30,8 @@ public class QueryIdUtils {
   private QueryIdUtils() {
   }
 
-  private static final String OFFLINE_SUFFIX = "_O";
-  private static final String REALTIME_SUFFIX = "_R";
+  public static final String OFFLINE_SUFFIX = "_O";
+  public static final String REALTIME_SUFFIX = "_R";
 
   public static String getQueryId(String brokerId, long requestId, TableType tableType) {
     return brokerId + "_" + requestId + (tableType == TableType.OFFLINE ? OFFLINE_SUFFIX : REALTIME_SUFFIX);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ParentAggregationResultRewriter.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ParentAggregationResultRewriter.java
new file mode 100644
index 00000000000..d650303f8cd
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ParentAggregationResultRewriter.java
@@ -0,0 +1,222 @@
+/**
+ * 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.pinot.core.query.utils.rewriter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.query.aggregation.utils.ParentAggregationFunctionResultObject;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+/**
+ * Used in aggregation and group-by queries with aggregation functions.
+ * Use the result of parent aggregation functions to populate the result of child aggregation functions.
+ * This implementation is based on the column names of the result schema.
+ * The result column name of a parent aggregation function has the following format:
+ * CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX + aggregationFunctionType + FunctionID
+ * The result column name of corresponding child aggregation function has the following format:
+ * CHILD_AGGREGATION_NAME_PREFIX + aggregationFunctionType + operands + CHILD_AGGREGATION_SEPERATOR
+ * + aggregationFunctionType + parent FunctionID + CHILD_KEY_SEPERATOR + column key in parent function
+ * This approach will not work with `AS` clauses as they alter the column names.
+ * TODO: Add support for `AS` clauses.
+ */
+public class ParentAggregationResultRewriter implements ResultRewriter {
+  public ParentAggregationResultRewriter() {
+  }
+
+  private static Map<String, ChildFunctionMapping> createChildFunctionMapping(DataSchema schema, Object[] row) {
+    Map<String, ChildFunctionMapping> childFunctionMapping = new HashMap<>();
+    for (int i = 0; i < schema.size(); i++) {
+      String columnName = schema.getColumnName(i);
+      if (columnName.startsWith(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX)) {
+        ParentAggregationFunctionResultObject parent = (ParentAggregationFunctionResultObject) row[i];
+
+        DataSchema nestedSchema = parent.getSchema();
+        for (int j = 0; j < nestedSchema.size(); j++) {
+          String childColumnKey = nestedSchema.getColumnName(j);
+          String originalChildFunctionKey =
+              columnName.substring(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX.length())
+                  + CommonConstants.RewriterConstants.CHILD_KEY_SEPERATOR + childColumnKey;
+          // aggregationFunctionType + childFunctionID + CHILD_KEY_SEPERATOR + childFunctionKeyInParent
+          childFunctionMapping.put(originalChildFunctionKey, new ChildFunctionMapping(parent, j, i));
+        }
+      }
+    }
+    return childFunctionMapping;
+  }
+
+  public RewriterResult rewrite(DataSchema dataSchema, List<Object[]> rows) {
+
+    int numParentAggregationFunctions = 0;
+    // Count the number of parent aggregation functions
+    for (int i = 0; i < dataSchema.size(); i++) {
+      if (dataSchema.getColumnName(i).startsWith(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX)) {
+        numParentAggregationFunctions++;
+      }
+    }
+
+    if (numParentAggregationFunctions == 0) {
+      // no change to the result
+      return new RewriterResult(dataSchema, rows);
+    }
+
+    Map<String, ChildFunctionMapping> childFunctionMapping = null;
+    if (!rows.isEmpty()) {
+      // Create a mapping from the child aggregation function name to the child aggregation function
+      childFunctionMapping = createChildFunctionMapping(dataSchema, rows.get(0));
+    }
+
+    String[] newColumnNames = new String[dataSchema.size() - numParentAggregationFunctions];
+    DataSchema.ColumnDataType[] newColumnDataTypes
+        = new DataSchema.ColumnDataType[dataSchema.size() - numParentAggregationFunctions];
+
+    // Create a mapping from the function offset in the final aggregation result
+    // to its own/parent function offset in the original aggregation result
+    Map<Integer, Integer> aggregationFunctionIndexMapping = new HashMap<>();
+    // Create a set of the result indices of the child aggregation functions
+    Set<Integer> childAggregationFunctionIndices = new HashSet<>();
+    // Create a mapping from the result aggregation function index to the nested index of the
+    // child aggregation function in the parent aggregation function
+    Map<Integer, Integer> childAggregationFunctionNestedIndexMapping = new HashMap<>();
+    // Create a set of the result indices of the parent aggregation functions
+    Set<Integer> parentAggregationFunctionIndices = new HashSet<>();
+
+    for (int i = 0, j = 0; i < dataSchema.size(); i++) {
+      String columnName = dataSchema.getColumnName(i);
+      // Skip the parent aggregation functions
+      if (columnName.startsWith(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX)) {
+        parentAggregationFunctionIndices.add(i);
+        continue;
+      }
+
+      // for child aggregation functions and regular columns in the result
+      // create a new schema and populate the new column names and data types
+      // also populate the offset mappings used to rewrite the result
+      if (columnName.startsWith(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX)) {
+        // This is a child column of a parent aggregation function
+        String childAggregationFunctionNameWithKey =
+            columnName.substring(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX.length());
+        String[] s = childAggregationFunctionNameWithKey
+            .split(CommonConstants.RewriterConstants.CHILD_AGGREGATION_SEPERATOR);
+        newColumnNames[j] = s[0];
+
+        if (childFunctionMapping == null) {
+          newColumnDataTypes[j] = DataSchema.ColumnDataType.STRING;
+          j++;
+          continue;
+        }
+        ChildFunctionMapping childFunction = childFunctionMapping.get(s[1]);
+        newColumnDataTypes[j] = childFunction.getParent().getSchema()
+            .getColumnDataType(childFunction.getNestedOffset());
+
+        childAggregationFunctionNestedIndexMapping.put(j, childFunction.getNestedOffset());
+        childAggregationFunctionIndices.add(j);
+        aggregationFunctionIndexMapping.put(j, childFunction.getOffset());
+      } else {
+        // This is a regular column
+        newColumnNames[j] = columnName;
+        newColumnDataTypes[j] = dataSchema.getColumnDataType(i);
+
+        aggregationFunctionIndexMapping.put(j, i);
+      }
+      j++;
+    }
+
+    DataSchema newDataSchema = new DataSchema(newColumnNames, newColumnDataTypes);
+    List<Object[]> newRows = new ArrayList<>();
+
+    for (Object[] row : rows) {
+      int maxRows = parentAggregationFunctionIndices.stream().map(k -> {
+        ParentAggregationFunctionResultObject parentAggregationFunctionResultObject =
+            (ParentAggregationFunctionResultObject) row[k];
+        return parentAggregationFunctionResultObject.getNumberOfRows();
+      }).max(Integer::compareTo).orElse(0);
+      maxRows = maxRows == 0 ? 1 : maxRows;
+
+      List<Object[]> newRowsBuffer = new ArrayList<>();
+      for (int rowIter = 0; rowIter < maxRows; rowIter++) {
+        Object[] newRow = new Object[newDataSchema.size()];
+        for (int fieldIter = 0; fieldIter < newDataSchema.size(); fieldIter++) {
+          // If the field is a child aggregation function, extract the value from the parent result
+          if (childAggregationFunctionIndices.contains(fieldIter)) {
+            int offset = aggregationFunctionIndexMapping.get(fieldIter);
+            int nestedOffset = childAggregationFunctionNestedIndexMapping.get(fieldIter);
+            ParentAggregationFunctionResultObject parentAggregationFunctionResultObject =
+                (ParentAggregationFunctionResultObject) row[offset];
+            // If the parent result has more rows than the current row, extract the value from the row
+            if (rowIter < parentAggregationFunctionResultObject.getNumberOfRows()) {
+              newRow[fieldIter] = parentAggregationFunctionResultObject.getField(rowIter, nestedOffset);
+            } else {
+              newRow[fieldIter] = null;
+            }
+          } else { // If the field is a regular column, extract the value from the row, only the first row has value
+            newRow[fieldIter] = row[aggregationFunctionIndexMapping.get(fieldIter)];
+          }
+        }
+        newRowsBuffer.add(newRow);
+      }
+      newRows.addAll(newRowsBuffer);
+    }
+    return new RewriterResult(newDataSchema, newRows);
+  }
+
+  /**
+   * Mapping from child function key to
+   * 1. the parent result object,
+   * 2. offset of the parent result column in original result row,
+   * 3. the nested offset of the child function result in the parent data block
+   *
+   * For example, for a list of aggregation functions result:
+   *            0                      1                    2                   3
+   *            |                      |                    |                   |
+   * "child_argmin(a, b, x) ,child_argmin(a, b, y), child_argmin(a, b, z), parent_argmin(a, b, x, y, z)"
+   *                                                                                           |  |  |
+   *                                                                                           0  1  2
+   * offset of the parent of child_argmin(a, b, y) is 3
+   * nested offset is child_argmin(a, b, y) is 1
+   */
+  private static class ChildFunctionMapping {
+    private final ParentAggregationFunctionResultObject _parent;
+    private final int _nestedOffset;
+    private final int _offset;
+
+    public ChildFunctionMapping(ParentAggregationFunctionResultObject parent, int nestedOffset, int offset) {
+      _parent = parent;
+      _nestedOffset = nestedOffset;
+      _offset = offset;
+    }
+
+    public int getOffset() {
+      return _offset;
+    }
+
+    public ParentAggregationFunctionResultObject getParent() {
+      return _parent;
+    }
+
+    public int getNestedOffset() {
+      return _nestedOffset;
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ArrayBasedDocIdSet.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriteUtils.java
similarity index 59%
rename from pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ArrayBasedDocIdSet.java
rename to pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriteUtils.java
index 4275586d2bc..3ae7f594e64 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/docidsets/ArrayBasedDocIdSet.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriteUtils.java
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.core.operator.docidsets;
+package org.apache.pinot.core.query.utils.rewriter;
 
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.operator.dociditerators.ArrayBasedDocIdIterator;
+import java.util.List;
+import org.apache.pinot.common.utils.DataSchema;
 
 
-public final class ArrayBasedDocIdSet implements BlockDocIdSet {
-  private final int[] _docIds;
-  private final int _searchableLength;
+public class ResultRewriteUtils {
 
-  public ArrayBasedDocIdSet(int[] docIds, int searchableLength) {
-    _docIds = docIds;
-    _searchableLength = searchableLength;
+  private ResultRewriteUtils() {
   }
 
-  @Override
-  public ArrayBasedDocIdIterator iterator() {
-    return new ArrayBasedDocIdIterator(_docIds, _searchableLength);
+  public static RewriterResult rewriteResult(DataSchema dataSchema, List<Object[]> rows) {
+    for (ResultRewriter resultRewriter : ResultRewriterFactory.getResultRewriter()) {
+      RewriterResult result = resultRewriter.rewrite(dataSchema, rows);
+      dataSchema = result.getDataSchema();
+      rows = result.getRows();
+    }
+    return new RewriterResult(dataSchema, rows);
   }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableForwardIndexProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriter.java
similarity index 74%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableForwardIndexProvider.java
rename to pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriter.java
index 948336f1ca5..80975e8f1c6 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableForwardIndexProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriter.java
@@ -16,11 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.index.mutable.provider;
+package org.apache.pinot.core.query.utils.rewriter;
 
-import org.apache.pinot.segment.spi.index.mutable.MutableForwardIndex;
+import java.util.List;
+import org.apache.pinot.common.utils.DataSchema;
 
 
-public interface MutableForwardIndexProvider {
-  MutableForwardIndex newForwardIndex(MutableIndexContext.Forward context);
+/**
+ * Interface for rewriting the result of a query
+ */
+public interface ResultRewriter {
+  RewriterResult rewrite(DataSchema dataSchema, List<Object[]> rows);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriterFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriterFactory.java
new file mode 100644
index 00000000000..9d3d0e45da7
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/ResultRewriterFactory.java
@@ -0,0 +1,69 @@
+/**
+ * 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.pinot.core.query.utils.rewriter;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ResultRewriterFactory {
+
+  private ResultRewriterFactory() {
+  }
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ResultRewriterFactory.class);
+  // left blank intentionally to not load any result rewriter by default
+  static final List<String> DEFAULT_RESULT_REWRITERS_CLASS_NAMES = ImmutableList.of();
+
+  static AtomicReference<List<ResultRewriter>> _resultRewriters
+      = new AtomicReference<>(getResultRewriter(DEFAULT_RESULT_REWRITERS_CLASS_NAMES));
+
+  public static void init(String resultRewritersClassNamesStr) {
+    List<String> resultRewritersClassNames =
+        (resultRewritersClassNamesStr != null) ? Arrays.asList(resultRewritersClassNamesStr.split(","))
+            : DEFAULT_RESULT_REWRITERS_CLASS_NAMES;
+    _resultRewriters.set(getResultRewriter(resultRewritersClassNames));
+  }
+
+  public static List<ResultRewriter> getResultRewriter() {
+    return _resultRewriters.get();
+  }
+
+  private static List<ResultRewriter> getResultRewriter(List<String> resultRewriterClasses) {
+    final ImmutableList.Builder<ResultRewriter> builder = ImmutableList.builder();
+    for (String resultRewriterClassName : resultRewriterClasses) {
+      try {
+        builder.add(getResultRewriter(resultRewriterClassName));
+      } catch (Exception e) {
+        LOGGER.error("Failed to load resultRewriter: {}", resultRewriterClassName, e);
+      }
+    }
+    return builder.build();
+  }
+
+  private static ResultRewriter getResultRewriter(String resultRewriterClassName)
+      throws Exception {
+    final Class<ResultRewriter> resultRewriterClass = (Class<ResultRewriter>) Class.forName(resultRewriterClassName);
+    return (ResultRewriter) resultRewriterClass.getDeclaredConstructors()[0].newInstance();
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/RewriterResult.java b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/RewriterResult.java
new file mode 100644
index 00000000000..f62b4a35f9b
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/utils/rewriter/RewriterResult.java
@@ -0,0 +1,41 @@
+/**
+ * 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.pinot.core.query.utils.rewriter;
+
+import java.util.List;
+import org.apache.pinot.common.utils.DataSchema;
+
+
+public class RewriterResult {
+    DataSchema _dataSchema;
+    List<Object[]> _rows;
+
+    public RewriterResult(DataSchema dataSchema, List<Object[]> rows) {
+      _dataSchema = dataSchema;
+      _rows = rows;
+    }
+
+    public DataSchema getDataSchema() {
+      return _dataSchema;
+    }
+
+    public List<Object[]> getRows() {
+      return _rows;
+    }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/routing/RoutingManager.java b/pinot-core/src/main/java/org/apache/pinot/core/routing/RoutingManager.java
index 857f0207dab..5232addfcaa 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/routing/RoutingManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/routing/RoutingManager.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.core.routing;
 
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.core.transport.ServerInstance;
 import org.apache.pinot.spi.annotations.InterfaceAudience;
@@ -38,7 +39,7 @@
 public interface RoutingManager {
 
   /**
-   * Get all enabled server instances that are available for routing.
+   * Get all enabled server instances in the cluster.
    *
    * @return all currently enabled server instances.
    */
@@ -50,6 +51,7 @@ public interface RoutingManager {
    * @param brokerRequest the broker request constructed from a query.
    * @return the route table.
    */
+  @Nullable
   RoutingTable getRoutingTable(BrokerRequest brokerRequest, long requestId);
 
   /**
@@ -66,5 +68,20 @@ public interface RoutingManager {
    * @param offlineTableName offline table name
    * @return time boundary info.
    */
+  @Nullable
   TimeBoundaryInfo getTimeBoundaryInfo(String offlineTableName);
+
+  /**
+   * Returns the {@link TablePartitionInfo} for a given table.
+   */
+  @Nullable
+  TablePartitionInfo getTablePartitionInfo(String tableNameWithType);
+
+  /**
+   * Returns all enabled server instances for a given table's server tenant.
+   *
+   * @param tableNameWithType name of the table with type
+   * @return all enabled servers for a table's server tenant
+   */
+  Map<String, ServerInstance> getEnabledServersForTableTenant(String tableNameWithType);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/routing/TablePartitionInfo.java b/pinot-core/src/main/java/org/apache/pinot/core/routing/TablePartitionInfo.java
new file mode 100644
index 00000000000..1faef75c777
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/routing/TablePartitionInfo.java
@@ -0,0 +1,76 @@
+/**
+ * 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.pinot.core.routing;
+
+import java.util.List;
+import java.util.Set;
+
+
+public class TablePartitionInfo {
+  private final String _tableNameWithType;
+  private final String _partitionColumn;
+  private final String _partitionFunctionName;
+  private final int _numPartitions;
+  private final PartitionInfo[] _partitionInfoMap;
+  private final Set<String> _segmentsWithInvalidPartition;
+
+  public TablePartitionInfo(String tableNameWithType, String partitionColumn, String partitionFunctionName,
+      int numPartitions, PartitionInfo[] partitionInfoMap, Set<String> segmentsWithInvalidPartition) {
+    _tableNameWithType = tableNameWithType;
+    _partitionColumn = partitionColumn;
+    _partitionFunctionName = partitionFunctionName;
+    _numPartitions = numPartitions;
+    _partitionInfoMap = partitionInfoMap;
+    _segmentsWithInvalidPartition = segmentsWithInvalidPartition;
+  }
+
+  public String getTableNameWithType() {
+    return _tableNameWithType;
+  }
+
+  public String getPartitionColumn() {
+    return _partitionColumn;
+  }
+
+  public String getPartitionFunctionName() {
+    return _partitionFunctionName;
+  }
+
+  public int getNumPartitions() {
+    return _numPartitions;
+  }
+
+  public PartitionInfo[] getPartitionInfoMap() {
+    return _partitionInfoMap;
+  }
+
+  public Set<String> getSegmentsWithInvalidPartition() {
+    return _segmentsWithInvalidPartition;
+  }
+
+  public static class PartitionInfo {
+    public final Set<String> _fullyReplicatedServers;
+    public final List<String> _segments;
+
+    public PartitionInfo(Set<String> fullyReplicatedServers, List<String> segments) {
+      _fullyReplicatedServers = fullyReplicatedServers;
+      _segments = segments;
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/DistinctCountHLLAggregator.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/DistinctCountHLLAggregator.java
new file mode 100644
index 00000000000..4eecbe3696c
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/DistinctCountHLLAggregator.java
@@ -0,0 +1,38 @@
+/**
+ * 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.pinot.core.segment.processing.aggregator;
+
+import com.clearspring.analytics.stream.cardinality.CardinalityMergeException;
+import com.clearspring.analytics.stream.cardinality.HyperLogLog;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+
+
+public class DistinctCountHLLAggregator implements ValueAggregator {
+  @Override
+  public Object aggregate(Object value1, Object value2) {
+    try {
+      HyperLogLog first = ObjectSerDeUtils.HYPER_LOG_LOG_SER_DE.deserialize((byte[]) value1);
+      HyperLogLog second = ObjectSerDeUtils.HYPER_LOG_LOG_SER_DE.deserialize((byte[]) value2);
+      first.addAll(second);
+      return ObjectSerDeUtils.HYPER_LOG_LOG_SER_DE.serialize(first);
+    } catch (CardinalityMergeException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/DistinctCountThetaSketchAggregator.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/DistinctCountThetaSketchAggregator.java
new file mode 100644
index 00000000000..62a350a367e
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/DistinctCountThetaSketchAggregator.java
@@ -0,0 +1,43 @@
+/**
+ * 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.pinot.core.segment.processing.aggregator;
+
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.Union;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+public class DistinctCountThetaSketchAggregator implements ValueAggregator {
+
+  private final Union _union;
+
+  public DistinctCountThetaSketchAggregator() {
+    // TODO: Handle configurable nominal entries
+    _union = Union.builder().setNominalEntries(CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES).buildUnion();
+  }
+
+  @Override
+  public Object aggregate(Object value1, Object value2) {
+    Sketch first = ObjectSerDeUtils.DATA_SKETCH_SER_DE.deserialize((byte[]) value1);
+    Sketch second = ObjectSerDeUtils.DATA_SKETCH_SER_DE.deserialize((byte[]) value2);
+    Sketch result = _union.union(first, second);
+    return ObjectSerDeUtils.DATA_SKETCH_SER_DE.serialize(result);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/IntegerTupleSketchAggregator.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/IntegerTupleSketchAggregator.java
new file mode 100644
index 00000000000..8bdf7f8a86f
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/IntegerTupleSketchAggregator.java
@@ -0,0 +1,42 @@
+/**
+ * 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.pinot.core.segment.processing.aggregator;
+
+import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.Union;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+
+
+public class IntegerTupleSketchAggregator implements ValueAggregator {
+  IntegerSummary.Mode _mode;
+
+  public IntegerTupleSketchAggregator(IntegerSummary.Mode mode) {
+    _mode = mode;
+  }
+
+  @Override
+  public Object aggregate(Object value1, Object value2) {
+    Sketch<IntegerSummary> first = ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.deserialize((byte[]) value1);
+    Sketch<IntegerSummary> second = ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.deserialize((byte[]) value2);
+    Sketch<IntegerSummary> result = new Union<>(new IntegerSummarySetOperations(_mode, _mode)).union(first, second);
+    return ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.serialize(result);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/ValueAggregatorFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/ValueAggregatorFactory.java
index 68578d1f8da..cd5388870d8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/ValueAggregatorFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/aggregator/ValueAggregatorFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.core.segment.processing.aggregator;
 
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
@@ -31,6 +32,9 @@ private ValueAggregatorFactory() {
 
   /**
    * Constructs a ValueAggregator from the given aggregation type.
+   *
+   * When adding entries to this please add them to the Set in org.apache.pinot.segment.local.utils.TableConfigUtils
+   * named AVAILABLE_CORE_VALUE_AGGREGATORS so that they can be used in RealtimeToOfflineTask
    */
   public static ValueAggregator getValueAggregator(AggregationFunctionType aggregationType, DataType dataType) {
     switch (aggregationType) {
@@ -40,6 +44,17 @@ public static ValueAggregator getValueAggregator(AggregationFunctionType aggrega
         return new MaxValueAggregator(dataType);
       case SUM:
         return new SumValueAggregator(dataType);
+      case DISTINCTCOUNTHLL:
+      case DISTINCTCOUNTRAWHLL:
+        return new DistinctCountHLLAggregator();
+      case DISTINCTCOUNTTHETASKETCH:
+      case DISTINCTCOUNTRAWTHETASKETCH:
+        return new DistinctCountThetaSketchAggregator();
+      case DISTINCTCOUNTTUPLESKETCH:
+      case DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH:
+      case SUMVALUESINTEGERSUMTUPLESKETCH:
+      case AVGVALUEINTEGERSUMTUPLESKETCH:
+        return new IntegerTupleSketchAggregator(IntegerSummary.Mode.Sum);
       default:
         throw new IllegalStateException("Unsupported aggregation type: " + aggregationType);
     }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/SimpleConsumerFactory.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/DefaultSegmentNumRowProvider.java
similarity index 62%
rename from pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/SimpleConsumerFactory.java
rename to pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/DefaultSegmentNumRowProvider.java
index c4cd66aaf4e..740e56c1375 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/SimpleConsumerFactory.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/DefaultSegmentNumRowProvider.java
@@ -16,14 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.plugin.stream.kafka09;
+package org.apache.pinot.core.segment.processing.framework;
 
 /**
- * This class is deprecated, and is kept for backward compatibility. Use {@link KafkaConsumerFactory} instead
- * Usages of org.apache.pinot.plugin.stream.kafka09.SimpleConsumerFactory in the table configs,
- * should be changed to org.apache.pinot.plugin.stream.kafka09.KafkaConsumerFactory, as SimpleConsumerFactory will be
- * deleted eventually
+ * Provides the configured maxRecordsPerSegment
  */
-@Deprecated
-public class SimpleConsumerFactory extends KafkaConsumerFactory {
+public class DefaultSegmentNumRowProvider implements SegmentNumRowProvider {
+  private int _maxRecordsPerSegment;
+
+  public DefaultSegmentNumRowProvider(int maxRecordsPerSegment) {
+    _maxRecordsPerSegment = maxRecordsPerSegment;
+  }
+
+  @Override
+  public int getNumRows() {
+    return _maxRecordsPerSegment;
+  }
+
+  @Override
+  public void updateSegmentInfo(int numRows, long segmentSize) {
+  }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdValueIterator.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentNumRowProvider.java
similarity index 72%
rename from pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdValueIterator.java
rename to pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentNumRowProvider.java
index 350ef0afcb9..04e7312a333 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdValueIterator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentNumRowProvider.java
@@ -16,18 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.core.common;
+package org.apache.pinot.core.segment.processing.framework;
 
 /**
- *
- * Not used for now, since most of the predicates make use of inverted index.
- * Revisit when we push predicate evaluation up into the operator
+ * Interface to compute rows for a segment, using past segment size
+ * and number of rows. This will be used by SegmentProcessorFramework.
  */
-public interface BlockDocIdValueIterator {
-
-  boolean advance();
-
-  int currentDocId();
-
-  int currentVal();
+public interface SegmentNumRowProvider {
+  int getNumRows();
+  void updateSegmentInfo(int numRows, long segmentSize);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFramework.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFramework.java
index 25f2b82eba0..cee643c5295 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFramework.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFramework.java
@@ -41,6 +41,7 @@
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.data.readers.RecordReaderFileConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,24 +59,35 @@
 public class SegmentProcessorFramework {
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentProcessorFramework.class);
 
-  private final List<RecordReader> _recordReaders;
+  private final List<RecordReaderFileConfig> _recordReaderFileConfigs;
   private final SegmentProcessorConfig _segmentProcessorConfig;
   private final File _mapperOutputDir;
   private final File _reducerOutputDir;
   private final File _segmentsOutputDir;
+  private Map<String, GenericRowFileManager> _partitionToFileManagerMap;
+  private final SegmentNumRowProvider _segmentNumRowProvider;
 
   /**
-   * Initializes the SegmentProcessorFramework with record readers, config and working directory.
+   * Initializes the SegmentProcessorFramework with record readers, config and working directory. We will now rely on
+   * users passing RecordReaderFileConfig, since that also allows us to do lazy initialization of RecordReaders.
+   * Please use the other constructor that uses RecordReaderFileConfig.
    */
+  @Deprecated
   public SegmentProcessorFramework(List<RecordReader> recordReaders, SegmentProcessorConfig segmentProcessorConfig,
       File workingDir)
       throws IOException {
-    Preconditions.checkState(!recordReaders.isEmpty(), "No record reader is provided");
+    this(segmentProcessorConfig, workingDir, convertRecordReadersToRecordReaderFileConfig(recordReaders), null);
+  }
+
+  public SegmentProcessorFramework(SegmentProcessorConfig segmentProcessorConfig, File workingDir,
+      List<RecordReaderFileConfig> recordReaderFileConfigs, SegmentNumRowProvider segmentNumRowProvider)
+      throws IOException {
 
+    Preconditions.checkState(!recordReaderFileConfigs.isEmpty(), "No recordReaderFileConfigs provided");
     LOGGER.info("Initializing SegmentProcessorFramework with {} record readers, config: {}, working dir: {}",
-        recordReaders.size(), segmentProcessorConfig, workingDir.getAbsolutePath());
+        recordReaderFileConfigs.size(), segmentProcessorConfig, workingDir.getAbsolutePath());
+    _recordReaderFileConfigs = recordReaderFileConfigs;
 
-    _recordReaders = recordReaders;
     _segmentProcessorConfig = segmentProcessorConfig;
 
     _mapperOutputDir = new File(workingDir, "mapper_output");
@@ -84,6 +96,19 @@ public SegmentProcessorFramework(List<RecordReader> recordReaders, SegmentProces
     FileUtils.forceMkdir(_reducerOutputDir);
     _segmentsOutputDir = new File(workingDir, "segments_output");
     FileUtils.forceMkdir(_segmentsOutputDir);
+
+    _segmentNumRowProvider = (segmentNumRowProvider == null) ? new DefaultSegmentNumRowProvider(
+        segmentProcessorConfig.getSegmentConfig().getMaxNumRecordsPerSegment()) : segmentNumRowProvider;
+  }
+
+  private static List<RecordReaderFileConfig> convertRecordReadersToRecordReaderFileConfig(
+      List<RecordReader> recordReaders) {
+    Preconditions.checkState(!recordReaders.isEmpty(), "No record reader is provided");
+    List<RecordReaderFileConfig> recordReaderFileConfigs = new ArrayList<>();
+    for (RecordReader recordReader : recordReaders) {
+      recordReaderFileConfigs.add(new RecordReaderFileConfig(recordReader));
+    }
+    return recordReaderFileConfigs;
   }
 
   /**
@@ -91,33 +116,55 @@ public SegmentProcessorFramework(List<RecordReader> recordReaders, SegmentProces
    */
   public List<File> process()
       throws Exception {
+    try {
+      return doProcess();
+    } catch (Exception e) {
+      // Cleaning up file managers no matter they are from map phase or reduce phase. For those from reduce phase, the
+      // reducers should have cleaned up the corresponding file managers from map phase already.
+      if (_partitionToFileManagerMap != null) {
+        for (GenericRowFileManager fileManager : _partitionToFileManagerMap.values()) {
+          fileManager.cleanUp();
+        }
+      }
+      // Cleaning up output dir as processing has failed.
+      FileUtils.deleteQuietly(_segmentsOutputDir);
+      throw e;
+    } finally {
+      FileUtils.deleteDirectory(_mapperOutputDir);
+      FileUtils.deleteDirectory(_reducerOutputDir);
+    }
+  }
+
+  private List<File> doProcess()
+      throws Exception {
     // Map phase
-    LOGGER.info("Beginning map phase on {} record readers", _recordReaders.size());
-    SegmentMapper mapper = new SegmentMapper(_recordReaders, _segmentProcessorConfig, _mapperOutputDir);
-    Map<String, GenericRowFileManager> partitionToFileManagerMap = mapper.map();
+    LOGGER.info("Beginning map phase on {} record readers", _recordReaderFileConfigs.size());
+    SegmentMapper mapper = new SegmentMapper(_recordReaderFileConfigs, _segmentProcessorConfig, _mapperOutputDir);
+    _partitionToFileManagerMap = mapper.map();
 
     // Check for mapper output files
-    if (partitionToFileManagerMap.isEmpty()) {
+    if (_partitionToFileManagerMap.isEmpty()) {
       LOGGER.info("No partition generated from mapper phase, skipping the reducer phase");
       return Collections.emptyList();
     }
 
     // Reduce phase
-    LOGGER.info("Beginning reduce phase on partitions: {}", partitionToFileManagerMap.keySet());
+    LOGGER.info("Beginning reduce phase on partitions: {}", _partitionToFileManagerMap.keySet());
     Consumer<Object> observer = _segmentProcessorConfig.getProgressObserver();
-    int totalCount = partitionToFileManagerMap.keySet().size();
+    int totalCount = _partitionToFileManagerMap.keySet().size();
     int count = 1;
-    for (Map.Entry<String, GenericRowFileManager> entry : partitionToFileManagerMap.entrySet()) {
+    for (Map.Entry<String, GenericRowFileManager> entry : _partitionToFileManagerMap.entrySet()) {
       String partitionId = entry.getKey();
-      observer.accept(String
-          .format("Doing reduce phase on data from partition: %s (%d out of %d)", partitionId, count++, totalCount));
+      observer.accept(
+          String.format("Doing reduce phase on data from partition: %s (%d out of %d)", partitionId, count++,
+              totalCount));
       GenericRowFileManager fileManager = entry.getValue();
       Reducer reducer = ReducerFactory.getReducer(partitionId, fileManager, _segmentProcessorConfig, _reducerOutputDir);
       entry.setValue(reducer.reduce());
     }
 
     // Segment creation phase
-    LOGGER.info("Beginning segment creation phase on partitions: {}", partitionToFileManagerMap.keySet());
+    LOGGER.info("Beginning segment creation phase on partitions: {}", _partitionToFileManagerMap.keySet());
     List<File> outputSegmentDirs = new ArrayList<>();
     TableConfig tableConfig = _segmentProcessorConfig.getTableConfig();
     Schema schema = _segmentProcessorConfig.getSchema();
@@ -128,18 +175,17 @@ public List<File> process()
     generatorConfig.setOutDir(_segmentsOutputDir.getPath());
 
     if (tableConfig.getIndexingConfig().getSegmentNameGeneratorType() != null) {
-      generatorConfig.setSegmentNameGenerator(SegmentNameGeneratorFactory
-          .createSegmentNameGenerator(tableConfig, schema, segmentNamePrefix, segmentNamePostfix, fixedSegmentName,
-              false));
+      generatorConfig.setSegmentNameGenerator(
+          SegmentNameGeneratorFactory.createSegmentNameGenerator(tableConfig, schema, segmentNamePrefix,
+              segmentNamePostfix, fixedSegmentName, false));
     } else {
       // SegmentNameGenerator will be inferred by the SegmentGeneratorConfig.
       generatorConfig.setSegmentNamePrefix(segmentNamePrefix);
       generatorConfig.setSegmentNamePostfix(segmentNamePostfix);
     }
 
-    int maxNumRecordsPerSegment = _segmentProcessorConfig.getSegmentConfig().getMaxNumRecordsPerSegment();
     int sequenceId = 0;
-    for (Map.Entry<String, GenericRowFileManager> entry : partitionToFileManagerMap.entrySet()) {
+    for (Map.Entry<String, GenericRowFileManager> entry : _partitionToFileManagerMap.entrySet()) {
       String partitionId = entry.getKey();
       GenericRowFileManager fileManager = entry.getValue();
       try {
@@ -149,7 +195,9 @@ public List<File> process()
         LOGGER.info("Start creating segments on partition: {}, numRows: {}, numSortFields: {}", partitionId, numRows,
             numSortFields);
         GenericRowFileRecordReader recordReader = fileReader.getRecordReader();
+        int maxNumRecordsPerSegment;
         for (int startRowId = 0; startRowId < numRows; startRowId += maxNumRecordsPerSegment, sequenceId++) {
+          maxNumRecordsPerSegment = _segmentNumRowProvider.getNumRows();
           int endRowId = Math.min(startRowId + maxNumRecordsPerSegment, numRows);
           LOGGER.info("Start creating segment of sequenceId: {} with row range: {} to {}", sequenceId, startRowId,
               endRowId);
@@ -163,14 +211,13 @@ public List<File> process()
               TransformPipeline.getPassThroughPipeline());
           driver.build();
           outputSegmentDirs.add(driver.getOutputDirectory());
+          _segmentNumRowProvider.updateSegmentInfo(driver.getSegmentStats().getTotalDocCount(),
+              FileUtils.sizeOfDirectory(driver.getOutputDirectory()));
         }
       } finally {
         fileManager.cleanUp();
       }
     }
-    FileUtils.deleteDirectory(_mapperOutputDir);
-    FileUtils.deleteDirectory(_reducerOutputDir);
-
     LOGGER.info("Successfully created segments: {}", outputSegmentDirs);
     return outputSegmentDirs;
   }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableDictionaryProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/PinotSegmentLifecycleEventListener.java
similarity index 74%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableDictionaryProvider.java
rename to pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/PinotSegmentLifecycleEventListener.java
index e42f4a98ffa..c7c510ae2d0 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableDictionaryProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/PinotSegmentLifecycleEventListener.java
@@ -16,11 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.index.mutable.provider;
+package org.apache.pinot.core.segment.processing.lifecycle;
 
-import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
+import org.apache.helix.HelixManager;
 
 
-public interface MutableDictionaryProvider {
-  MutableDictionary newDictionary(MutableIndexContext.Dictionary context);
+public interface PinotSegmentLifecycleEventListener {
+  SegmentLifecycleEventType getType();
+
+  void init(HelixManager helixManager);
+
+  void onEvent(SegmentLifecycleEventDetails event);
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/PinotSegmentLifecycleEventListenerManager.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/PinotSegmentLifecycleEventListenerManager.java
new file mode 100644
index 00000000000..5269c3f7976
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/PinotSegmentLifecycleEventListenerManager.java
@@ -0,0 +1,96 @@
+/**
+ * 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.pinot.core.segment.processing.lifecycle;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.helix.HelixManager;
+import org.apache.pinot.spi.utils.PinotReflectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class PinotSegmentLifecycleEventListenerManager {
+  private static final Logger LOGGER = LoggerFactory.getLogger(PinotSegmentLifecycleEventListenerManager.class);
+  private static final PinotSegmentLifecycleEventListenerManager INSTANCE =
+      new PinotSegmentLifecycleEventListenerManager();
+  private Map<SegmentLifecycleEventType, List<PinotSegmentLifecycleEventListener>> _eventTypeToListenersMap;
+  private boolean _initialized = false;
+
+  private PinotSegmentLifecycleEventListenerManager() {
+  }
+
+  public static PinotSegmentLifecycleEventListenerManager getInstance() {
+    return INSTANCE;
+  }
+
+  public synchronized void init(HelixManager helixZkManager) {
+    if (_initialized) {
+      LOGGER.warn("Segment lifecycle event listener manager already initialized, skipping it");
+      return;
+    }
+    _eventTypeToListenersMap = new HashMap<>();
+    Set<Class<?>> classes =
+        PinotReflectionUtils.getClassesThroughReflection(".*\\.plugin\\.segment\\.lifecycle\\.listener\\..*",
+            SegmentLifecycleEventListener.class);
+    for (Class<?> clazz : classes) {
+      SegmentLifecycleEventListener annotation = clazz.getAnnotation(SegmentLifecycleEventListener.class);
+      if (annotation.enabled()) {
+        try {
+          PinotSegmentLifecycleEventListener pinotSegmentLifecycleEventListener =
+              (PinotSegmentLifecycleEventListener) clazz.newInstance();
+          pinotSegmentLifecycleEventListener.init(helixZkManager);
+          _eventTypeToListenersMap.compute(pinotSegmentLifecycleEventListener.getType(), (key, list) -> {
+            if (list == null) {
+              list = new ArrayList<>();
+            }
+            list.add(pinotSegmentLifecycleEventListener);
+            return list;
+          });
+        } catch (Exception e) {
+          LOGGER.error("Caught exception while initializing segment lifecyle event listener : {}, skipping it", clazz,
+              e);
+        }
+      }
+    }
+
+    _initialized = true;
+  }
+
+  public void notifyListeners(SegmentLifecycleEventDetails event) {
+    if (!_initialized) {
+      LOGGER.warn("Segment lifecycle event listener manager not initialized, skipping it");
+      return;
+    }
+
+    List<PinotSegmentLifecycleEventListener> listeners = _eventTypeToListenersMap.get(event.getType());
+    if (listeners != null) {
+      for (PinotSegmentLifecycleEventListener listener : listeners) {
+        try {
+          listener.onEvent(event);
+        } catch (Exception e) {
+          LOGGER.error("Segment lifecycle listener call failed : ", e);
+        }
+      }
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableJsonIndexProvider.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventDetails.java
similarity index 77%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableJsonIndexProvider.java
rename to pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventDetails.java
index fb518c30cf5..c59435455cd 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableJsonIndexProvider.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventDetails.java
@@ -16,11 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.index.mutable.provider;
+package org.apache.pinot.core.segment.processing.lifecycle;
 
-import org.apache.pinot.segment.spi.index.mutable.MutableJsonIndex;
+import java.util.List;
 
+public interface SegmentLifecycleEventDetails {
+  SegmentLifecycleEventType getType();
 
-public interface MutableJsonIndexProvider {
-  MutableJsonIndex newJsonIndex(MutableIndexContext.Json context);
+  List<String> getSegments();
+
+  String getTableNameWithType();
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventListener.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventListener.java
new file mode 100644
index 00000000000..0a4225e5294
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventListener.java
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.segment.processing.lifecycle;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface SegmentLifecycleEventListener {
+  boolean enabled() default true;
+}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventType.java
similarity index 79%
rename from pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java
rename to pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventType.java
index fa62cecca3f..9559b9547fa 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/PinotIngestionJobType.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/SegmentLifecycleEventType.java
@@ -16,13 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.ingestion.common;
+package org.apache.pinot.core.segment.processing.lifecycle;
 
-public enum PinotIngestionJobType {
-  SegmentCreation,
-  SegmentTarPush,
-  SegmentUriPush,
-  SegmentCreationAndTarPush,
-  SegmentCreationAndUriPush,
-  SegmentPreprocessing
+public enum SegmentLifecycleEventType {
+  DELETION
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/impl/SegmentDeletionEventDetails.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/impl/SegmentDeletionEventDetails.java
new file mode 100644
index 00000000000..eb839a26a69
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/lifecycle/impl/SegmentDeletionEventDetails.java
@@ -0,0 +1,48 @@
+/**
+ * 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.pinot.core.segment.processing.lifecycle.impl;
+
+import java.util.List;
+import org.apache.pinot.core.segment.processing.lifecycle.SegmentLifecycleEventDetails;
+import org.apache.pinot.core.segment.processing.lifecycle.SegmentLifecycleEventType;
+
+public class SegmentDeletionEventDetails implements SegmentLifecycleEventDetails {
+  private final List<String> _segmentsDeleted;
+  private final String _tableName;
+
+  public SegmentDeletionEventDetails(String tableName, List<String> segmentsDeleted) {
+    _tableName = tableName;
+    _segmentsDeleted = segmentsDeleted;
+  }
+
+  @Override
+  public SegmentLifecycleEventType getType() {
+    return SegmentLifecycleEventType.DELETION;
+  }
+
+  @Override
+  public List<String> getSegments() {
+    return _segmentsDeleted;
+  }
+
+  @Override
+  public String getTableNameWithType() {
+    return _tableName;
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/mapper/SegmentMapper.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/mapper/SegmentMapper.java
index 2d8118ff82a..00b61e04e8c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/mapper/SegmentMapper.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/mapper/SegmentMapper.java
@@ -44,6 +44,8 @@
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.data.readers.RecordReaderFactory;
+import org.apache.pinot.spi.data.readers.RecordReaderFileConfig;
 import org.apache.pinot.spi.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +62,7 @@
 public class SegmentMapper {
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentMapper.class);
 
-  private final List<RecordReader> _recordReaders;
+  private List<RecordReaderFileConfig> _recordReaderFileConfigs;
   private final SegmentProcessorConfig _processorConfig;
   private final File _mapperOutputDir;
 
@@ -75,8 +77,9 @@ public class SegmentMapper {
   // NOTE: Use TreeMap so that the order is deterministic
   private final Map<String, GenericRowFileManager> _partitionToFileManagerMap = new TreeMap<>();
 
-  public SegmentMapper(List<RecordReader> recordReaders, SegmentProcessorConfig processorConfig, File mapperOutputDir) {
-    _recordReaders = recordReaders;
+  public SegmentMapper(List<RecordReaderFileConfig> recordReaderFileConfigs,
+      SegmentProcessorConfig processorConfig, File mapperOutputDir) {
+    _recordReaderFileConfigs = recordReaderFileConfigs;
     _processorConfig = processorConfig;
     _mapperOutputDir = mapperOutputDir;
 
@@ -97,8 +100,9 @@ public SegmentMapper(List<RecordReader> recordReaders, SegmentProcessorConfig pr
     }
     // Time partition + partition from partitioners
     _partitionsBuffer = new String[numPartitioners + 1];
+
     LOGGER.info("Initialized mapper with {} record readers, output dir: {}, timeHandler: {}, partitioners: {}",
-        _recordReaders.size(), _mapperOutputDir, _timeHandler.getClass(),
+        _recordReaderFileConfigs.size(), _mapperOutputDir, _timeHandler.getClass(),
         Arrays.stream(_partitioners).map(p -> p.getClass().toString()).collect(Collectors.joining(",")));
   }
 
@@ -108,34 +112,40 @@ public SegmentMapper(List<RecordReader> recordReaders, SegmentProcessorConfig pr
    */
   public Map<String, GenericRowFileManager> map()
       throws Exception {
+    try {
+      return doMap();
+    } catch (Exception e) {
+      // Cleaning up resources created by the mapper, leaving others to the caller like the input _recordReaders.
+      for (GenericRowFileManager fileManager : _partitionToFileManagerMap.values()) {
+        fileManager.cleanUp();
+      }
+      throw e;
+    }
+  }
+
+  private Map<String, GenericRowFileManager> doMap()
+      throws Exception {
     Consumer<Object> observer = _processorConfig.getProgressObserver();
-    int totalCount = _recordReaders.size();
+    int totalCount = _recordReaderFileConfigs.size();
     int count = 1;
     GenericRow reuse = new GenericRow();
-    for (RecordReader recordReader : _recordReaders) {
-      observer.accept(String.format("Doing map phase on data from RecordReader (%d out of %d)", count++, totalCount));
-      while (recordReader.hasNext()) {
-        reuse = recordReader.next(reuse);
-
-        // TODO: Add ComplexTypeTransformer here. Currently it is not idempotent so cannot add it
-
-        if (reuse.getValue(GenericRow.MULTIPLE_RECORDS_KEY) != null) {
-          //noinspection unchecked
-          for (GenericRow row : (Collection<GenericRow>) reuse.getValue(GenericRow.MULTIPLE_RECORDS_KEY)) {
-            GenericRow transformedRow = _recordTransformer.transform(row);
-            if (transformedRow != null && IngestionUtils.shouldIngestRow(transformedRow)) {
-              writeRecord(transformedRow);
-            }
-          }
-        } else {
-          GenericRow transformedRow = _recordTransformer.transform(reuse);
-          if (transformedRow != null && IngestionUtils.shouldIngestRow(transformedRow)) {
-            writeRecord(transformedRow);
+    for (RecordReaderFileConfig recordReaderFileConfig : _recordReaderFileConfigs) {
+      RecordReader recordReader = recordReaderFileConfig._recordReader;
+      if (recordReader == null) {
+        try {
+          recordReader =
+              RecordReaderFactory.getRecordReader(recordReaderFileConfig._fileFormat, recordReaderFileConfig._dataFile,
+                  recordReaderFileConfig._fieldsToRead, recordReaderFileConfig._recordReaderConfig);
+          mapAndTransformRow(recordReader, reuse, observer, count, totalCount);
+        } finally {
+          if (recordReader != null) {
+            recordReader.close();
           }
         }
-
-        reuse.clear();
+      } else {
+        mapAndTransformRow(recordReader, reuse, observer, count, totalCount);
       }
+      count++;
     }
 
     for (GenericRowFileManager fileManager : _partitionToFileManagerMap.values()) {
@@ -145,6 +155,32 @@ public Map<String, GenericRowFileManager> map()
     return _partitionToFileManagerMap;
   }
 
+  private void mapAndTransformRow(RecordReader recordReader, GenericRow reuse,
+      Consumer<Object> observer, int count, int totalCount) throws Exception {
+    observer.accept(String.format("Doing map phase on data from RecordReader (%d out of %d)", count, totalCount));
+    while (recordReader.hasNext()) {
+      reuse = recordReader.next(reuse);
+
+      // TODO: Add ComplexTypeTransformer here. Currently it is not idempotent so cannot add it
+
+      if (reuse.getValue(GenericRow.MULTIPLE_RECORDS_KEY) != null) {
+        //noinspection unchecked
+        for (GenericRow row : (Collection<GenericRow>) reuse.getValue(GenericRow.MULTIPLE_RECORDS_KEY)) {
+          GenericRow transformedRow = _recordTransformer.transform(row);
+          if (transformedRow != null && IngestionUtils.shouldIngestRow(transformedRow)) {
+            writeRecord(transformedRow);
+          }
+        }
+      } else {
+        GenericRow transformedRow = _recordTransformer.transform(reuse);
+        if (transformedRow != null && IngestionUtils.shouldIngestRow(transformedRow)) {
+          writeRecord(transformedRow);
+        }
+      }
+      reuse.clear();
+    }
+  }
+
   private void writeRecord(GenericRow row)
       throws IOException {
     String timePartition = _timeHandler.handleTime(row);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/DedupReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/DedupReducer.java
index 33bdd8b544d..a54f00d5eb3 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/DedupReducer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/DedupReducer.java
@@ -38,6 +38,7 @@ public class DedupReducer implements Reducer {
   private final String _partitionId;
   private final GenericRowFileManager _fileManager;
   private final File _reducerOutputDir;
+  private GenericRowFileManager _dedupFileManager;
 
   public DedupReducer(String partitionId, GenericRowFileManager fileManager, File reducerOutputDir) {
     _partitionId = partitionId;
@@ -48,6 +49,19 @@ public DedupReducer(String partitionId, GenericRowFileManager fileManager, File
   @Override
   public GenericRowFileManager reduce()
       throws Exception {
+    try {
+      return doReduce();
+    } catch (Exception e) {
+      // Cleaning up resources created by the reducer, leaving others to the caller like the input _fileManager.
+      if (_dedupFileManager != null) {
+        _dedupFileManager.cleanUp();
+      }
+      throw e;
+    }
+  }
+
+  private GenericRowFileManager doReduce()
+      throws Exception {
     LOGGER.info("Start reducing on partition: {}", _partitionId);
     long reduceStartTimeMs = System.currentTimeMillis();
 
@@ -63,10 +77,10 @@ public GenericRowFileManager reduce()
     FileUtils.forceMkdir(partitionOutputDir);
     LOGGER.info("Start creating dedup file under dir: {}", partitionOutputDir);
     long dedupFileCreationStartTimeMs = System.currentTimeMillis();
-    GenericRowFileManager dedupFileManager =
+    _dedupFileManager =
         new GenericRowFileManager(partitionOutputDir, _fileManager.getFieldSpecs(), _fileManager.isIncludeNullFields(),
             0);
-    GenericRowFileWriter dedupFileWriter = dedupFileManager.getFileWriter();
+    GenericRowFileWriter dedupFileWriter = _dedupFileManager.getFileWriter();
     GenericRow previousRow = new GenericRow();
     recordReader.read(0, previousRow);
     int previousRowId = 0;
@@ -79,11 +93,11 @@ public GenericRowFileManager reduce()
         dedupFileWriter.write(previousRow);
       }
     }
-    dedupFileManager.closeFileWriter();
+    _dedupFileManager.closeFileWriter();
     LOGGER.info("Finish creating dedup file in {}ms", System.currentTimeMillis() - dedupFileCreationStartTimeMs);
 
     _fileManager.cleanUp();
     LOGGER.info("Finish reducing in {}ms", System.currentTimeMillis() - reduceStartTimeMs);
-    return dedupFileManager;
+    return _dedupFileManager;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/RollupReducer.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/RollupReducer.java
index 5b11c46def8..ae88120f204 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/RollupReducer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/processing/reducer/RollupReducer.java
@@ -48,6 +48,7 @@ public class RollupReducer implements Reducer {
   private final GenericRowFileManager _fileManager;
   private final Map<String, AggregationFunctionType> _aggregationTypes;
   private final File _reducerOutputDir;
+  private GenericRowFileManager _rollupFileManager;
 
   public RollupReducer(String partitionId, GenericRowFileManager fileManager,
       Map<String, AggregationFunctionType> aggregationTypes, File reducerOutputDir) {
@@ -60,6 +61,19 @@ public RollupReducer(String partitionId, GenericRowFileManager fileManager,
   @Override
   public GenericRowFileManager reduce()
       throws Exception {
+    try {
+      return doReduce();
+    } catch (Exception e) {
+      // Cleaning up resources created by the reducer, leaving others to the caller like the input _fileManager.
+      if (_rollupFileManager != null) {
+        _rollupFileManager.cleanUp();
+      }
+      throw e;
+    }
+  }
+
+  private GenericRowFileManager doReduce()
+      throws Exception {
     LOGGER.info("Start reducing on partition: {}", _partitionId);
     long reduceStartTimeMs = System.currentTimeMillis();
 
@@ -85,9 +99,8 @@ public GenericRowFileManager reduce()
     FileUtils.forceMkdir(partitionOutputDir);
     LOGGER.info("Start creating rollup file under dir: {}", partitionOutputDir);
     long rollupFileCreationStartTimeMs = System.currentTimeMillis();
-    GenericRowFileManager rollupFileManager =
-        new GenericRowFileManager(partitionOutputDir, fieldSpecs, includeNullFields, 0);
-    GenericRowFileWriter rollupFileWriter = rollupFileManager.getFileWriter();
+    _rollupFileManager = new GenericRowFileManager(partitionOutputDir, fieldSpecs, includeNullFields, 0);
+    GenericRowFileWriter rollupFileWriter = _rollupFileManager.getFileWriter();
     GenericRow previousRow = new GenericRow();
     recordReader.read(0, previousRow);
     int previousRowId = 0;
@@ -122,12 +135,12 @@ public GenericRowFileManager reduce()
       }
     }
     rollupFileWriter.write(previousRow);
-    rollupFileManager.closeFileWriter();
+    _rollupFileManager.closeFileWriter();
     LOGGER.info("Finish creating rollup file in {}ms", System.currentTimeMillis() - rollupFileCreationStartTimeMs);
 
     _fileManager.cleanUp();
     LOGGER.info("Finish reducing in {}ms", System.currentTimeMillis() - reduceStartTimeMs);
-    return rollupFileManager;
+    return _rollupFileManager;
   }
 
   private static void aggregateWithNullFields(GenericRow aggregatedRow, GenericRow rowToAggregate,
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeAggregationExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeAggregationExecutor.java
index 4067d53e6fc..e6cd8aa1538 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeAggregationExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeAggregationExecutor.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pinot.core.startree.executor;
 
-import org.apache.pinot.core.operator.blocks.TransformBlock;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.aggregation.DefaultAggregationExecutor;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
@@ -48,12 +48,12 @@ public StarTreeAggregationExecutor(AggregationFunction[] aggregationFunctions) {
   }
 
   @Override
-  public void aggregate(TransformBlock transformBlock) {
+  public void aggregate(ValueBlock valueBlock) {
     int numAggregationFunctions = _aggregationFunctions.length;
-    int length = transformBlock.getNumDocs();
+    int length = valueBlock.getNumDocs();
     for (int i = 0; i < numAggregationFunctions; i++) {
       _aggregationFunctions[i].aggregate(length, _aggregationResultHolders[i],
-          AggregationFunctionUtils.getBlockValSetMap(_aggregationFunctionColumnPairs[i], transformBlock));
+          AggregationFunctionUtils.getBlockValSetMap(_aggregationFunctionColumnPairs[i], valueBlock));
     }
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeGroupByExecutor.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeGroupByExecutor.java
index 0960dd15e53..bad3d4ad08e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeGroupByExecutor.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/startree/executor/StarTreeGroupByExecutor.java
@@ -21,8 +21,8 @@
 import java.util.Map;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockValSet;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunctionUtils;
 import org.apache.pinot.core.query.aggregation.groupby.DefaultGroupByExecutor;
@@ -44,8 +44,8 @@ public class StarTreeGroupByExecutor extends DefaultGroupByExecutor {
   private final AggregationFunctionColumnPair[] _aggregationFunctionColumnPairs;
 
   public StarTreeGroupByExecutor(QueryContext queryContext, ExpressionContext[] groupByExpressions,
-      TransformOperator transformOperator) {
-    super(queryContext, groupByExpressions, transformOperator);
+      BaseProjectOperator<?> projectOperator) {
+    super(queryContext, groupByExpressions, projectOperator);
 
     AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
     assert aggregationFunctions != null;
@@ -58,11 +58,11 @@ public StarTreeGroupByExecutor(QueryContext queryContext, ExpressionContext[] gr
   }
 
   @Override
-  protected void aggregate(TransformBlock transformBlock, int length, int functionIndex) {
+  protected void aggregate(ValueBlock valueBlock, int length, int functionIndex) {
     AggregationFunction aggregationFunction = _aggregationFunctions[functionIndex];
     GroupByResultHolder groupByResultHolder = _groupByResultHolders[functionIndex];
     Map<ExpressionContext, BlockValSet> blockValSetMap =
-        AggregationFunctionUtils.getBlockValSetMap(_aggregationFunctionColumnPairs[functionIndex], transformBlock);
+        AggregationFunctionUtils.getBlockValSetMap(_aggregationFunctionColumnPairs[functionIndex], valueBlock);
     if (_hasMVGroupByExpression) {
       aggregationFunction.aggregateGroupByMV(length, _mvGroupKeys, groupByResultHolder, blockValSetMap);
     } else {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java
index 144c4d73c12..f46f7fca53a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java
@@ -123,7 +123,7 @@ public StarTreeFilterOperator(QueryContext queryContext, StarTreeV2 starTreeV2,
   }
 
   @Override
-  public FilterBlock getNextBlock() {
+  protected FilterBlock getNextBlock() {
     if (_resultEmpty) {
       return EmptyFilterBlock.getInstance();
     }
@@ -203,19 +203,26 @@ private BaseFilterOperator getFilterOperator() {
   @Nullable
   private StarTreeResult traverseStarTree() {
     MutableRoaringBitmap matchingDocIds = new MutableRoaringBitmap();
-    Set<String> globalRemainingPredicateColumns = Collections.emptySet();
-    boolean globalRemainingPredicateColumnsSet = false;
+    Set<String> globalRemainingPredicateColumns = null;
 
     StarTree starTree = _starTreeV2.getStarTree();
     List<String> dimensionNames = starTree.getDimensionNames();
     StarTreeNode starTreeRootNode = starTree.getRoot();
 
+    // Track whether we have found a leaf node added to the queue. If we have found a leaf node, and traversed to the
+    // level of the leave node, we can set globalRemainingPredicateColumns if not already set because we know the leaf
+    // node won't split further on other predicate columns.
+    boolean foundLeafNode = starTreeRootNode.isLeaf();
+
     // Use BFS to traverse the star tree
     Queue<StarTreeNode> queue = new ArrayDeque<>();
     queue.add(starTreeRootNode);
     int currentDimensionId = -1;
     Set<String> remainingPredicateColumns = new HashSet<>(_predicateEvaluatorsMap.keySet());
     Set<String> remainingGroupByColumns = new HashSet<>(_groupByColumns);
+    if (foundLeafNode) {
+      globalRemainingPredicateColumns = new HashSet<>(remainingPredicateColumns);
+    }
     IntSet matchingDictIds = null;
     StarTreeNode starTreeNode;
     while ((starTreeNode = queue.poll()) != null) {
@@ -225,6 +232,9 @@ private StarTreeResult traverseStarTree() {
         String dimension = dimensionNames.get(dimensionId);
         remainingPredicateColumns.remove(dimension);
         remainingGroupByColumns.remove(dimension);
+        if (foundLeafNode && globalRemainingPredicateColumns == null) {
+          globalRemainingPredicateColumns = new HashSet<>(remainingPredicateColumns);
+        }
         matchingDictIds = null;
         currentDimensionId = dimensionId;
       }
@@ -240,14 +250,6 @@ private StarTreeResult traverseStarTree() {
       // remaining predicate columns for this node
       if (starTreeNode.isLeaf()) {
         matchingDocIds.add((long) starTreeNode.getStartDocId(), starTreeNode.getEndDocId());
-        // Only set the global remaining predicate columns once because we traverse the tree with BFS, so the first leaf
-        // node always have all the remaining predicate columns
-        if (!globalRemainingPredicateColumnsSet) {
-          if (!remainingPredicateColumns.isEmpty()) {
-            globalRemainingPredicateColumns = new HashSet<>(remainingPredicateColumns);
-          }
-          globalRemainingPredicateColumnsSet = true;
-        }
         continue;
       }
 
@@ -257,8 +259,8 @@ private StarTreeResult traverseStarTree() {
       // Only read star-node when the dimension is not in the global remaining predicate columns or group-by columns
       // because we cannot use star-node in such cases
       StarTreeNode starNode = null;
-      if (!globalRemainingPredicateColumns.contains(childDimension) && !remainingGroupByColumns.contains(
-          childDimension)) {
+      if ((globalRemainingPredicateColumns == null || !globalRemainingPredicateColumns.contains(childDimension))
+          && !remainingGroupByColumns.contains(childDimension)) {
         starNode = starTreeNode.getChildForDimensionValue(StarTreeNode.ALL);
       }
 
@@ -287,18 +289,22 @@ private StarTreeResult traverseStarTree() {
           // star-node if so
           if (starNode != null && numMatchingDictIds >= numChildren - 1) {
             List<StarTreeNode> matchingChildNodes = new ArrayList<>();
+            boolean findLeafChildNode = false;
             while (childrenIterator.hasNext()) {
               StarTreeNode childNode = childrenIterator.next();
               if (matchingDictIds.contains(childNode.getDimensionValue())) {
                 matchingChildNodes.add(childNode);
+                findLeafChildNode |= childNode.isLeaf();
               }
             }
             if (matchingChildNodes.size() == numChildren - 1) {
               // All the child nodes (except for the star-node) match the predicate, use the star-node
               queue.add(starNode);
+              foundLeafNode |= starNode.isLeaf();
             } else {
               // Some child nodes do not match the predicate, use the matching child nodes
               queue.addAll(matchingChildNodes);
+              foundLeafNode |= findLeafChildNode;
             }
           } else {
             // Cannot use the star-node, use the matching child nodes
@@ -306,6 +312,7 @@ private StarTreeResult traverseStarTree() {
               StarTreeNode childNode = childrenIterator.next();
               if (matchingDictIds.contains(childNode.getDimensionValue())) {
                 queue.add(childNode);
+                foundLeafNode |= childNode.isLeaf();
               }
             }
           }
@@ -318,6 +325,7 @@ private StarTreeResult traverseStarTree() {
             // Child node might be null because the matching dictionary id might not exist under this branch
             if (childNode != null) {
               queue.add(childNode);
+              foundLeafNode |= childNode.isLeaf();
             }
           }
         }
@@ -327,6 +335,7 @@ private StarTreeResult traverseStarTree() {
         if (starNode != null) {
           // Star-node exists, use it
           queue.add(starNode);
+          foundLeafNode |= starNode.isLeaf();
         } else {
           // Star-node does not exist or cannot be used, add all non-star nodes to the queue
           Iterator<? extends StarTreeNode> childrenIterator = starTreeNode.getChildrenIterator();
@@ -334,13 +343,15 @@ private StarTreeResult traverseStarTree() {
             StarTreeNode childNode = childrenIterator.next();
             if (childNode.getDimensionValue() != StarTreeNode.ALL) {
               queue.add(childNode);
+              foundLeafNode |= childNode.isLeaf();
             }
           }
         }
       }
     }
 
-    return new StarTreeResult(matchingDocIds, globalRemainingPredicateColumns);
+    return new StarTreeResult(matchingDocIds,
+        globalRemainingPredicateColumns != null ? globalRemainingPredicateColumns : Collections.emptySet());
   }
 
   /**
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeTransformPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeProjectPlanNode.java
similarity index 51%
rename from pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeTransformPlanNode.java
rename to pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeProjectPlanNode.java
index 283891dcbc2..2433752d1ae 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeTransformPlanNode.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeProjectPlanNode.java
@@ -19,54 +19,72 @@
 package org.apache.pinot.core.startree.plan;
 
 import java.util.Arrays;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.DocIdSetOperator;
+import org.apache.pinot.core.operator.ProjectionOperator;
 import org.apache.pinot.core.operator.transform.TransformOperator;
 import org.apache.pinot.core.plan.PlanNode;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.startree.CompositePredicateEvaluator;
+import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
 
 
-public class StarTreeTransformPlanNode implements PlanNode {
-  private final List<ExpressionContext> _groupByExpressions;
-  private final StarTreeProjectionPlanNode _starTreeProjectionPlanNode;
+public class StarTreeProjectPlanNode implements PlanNode {
+  private final QueryContext _queryContext;
+  private final StarTreeV2 _starTreeV2;
+  private final AggregationFunctionColumnPair[] _aggregationFunctionColumnPairs;
+  private final ExpressionContext[] _groupByExpressions;
+  private final Map<String, List<CompositePredicateEvaluator>> _predicateEvaluatorsMap;
 
-  public StarTreeTransformPlanNode(QueryContext queryContext, StarTreeV2 starTreeV2,
+  public StarTreeProjectPlanNode(QueryContext queryContext, StarTreeV2 starTreeV2,
       AggregationFunctionColumnPair[] aggregationFunctionColumnPairs, @Nullable ExpressionContext[] groupByExpressions,
       Map<String, List<CompositePredicateEvaluator>> predicateEvaluatorsMap) {
+    _queryContext = queryContext;
+    _starTreeV2 = starTreeV2;
+    _aggregationFunctionColumnPairs = aggregationFunctionColumnPairs;
+    _groupByExpressions = groupByExpressions;
+    _predicateEvaluatorsMap = predicateEvaluatorsMap;
+  }
+
+  @Override
+  public BaseProjectOperator<?> run() {
     Set<String> projectionColumns = new HashSet<>();
-    for (AggregationFunctionColumnPair aggregationFunctionColumnPair : aggregationFunctionColumnPairs) {
+    boolean hasNonIdentifierExpression = false;
+    for (AggregationFunctionColumnPair aggregationFunctionColumnPair : _aggregationFunctionColumnPairs) {
       projectionColumns.add(aggregationFunctionColumnPair.toColumnName());
     }
     Set<String> groupByColumns;
-    if (groupByExpressions != null) {
-      _groupByExpressions = Arrays.asList(groupByExpressions);
+    if (_groupByExpressions != null) {
       groupByColumns = new HashSet<>();
-      for (ExpressionContext groupByExpression : groupByExpressions) {
-        groupByExpression.getColumns(groupByColumns);
+      for (ExpressionContext expression : _groupByExpressions) {
+        expression.getColumns(groupByColumns);
+        if (expression.getType() != ExpressionContext.Type.IDENTIFIER) {
+          hasNonIdentifierExpression = true;
+        }
       }
       projectionColumns.addAll(groupByColumns);
     } else {
-      _groupByExpressions = Collections.emptyList();
       groupByColumns = null;
     }
-    _starTreeProjectionPlanNode =
-        new StarTreeProjectionPlanNode(queryContext, starTreeV2, projectionColumns, predicateEvaluatorsMap,
-            groupByColumns);
-  }
-
-  @Override
-  public TransformOperator run() {
+    DocIdSetOperator docIdSetOperator =
+        new StarTreeDocIdSetPlanNode(_queryContext, _starTreeV2, _predicateEvaluatorsMap, groupByColumns).run();
+    Map<String, DataSource> dataSourceMap = new HashMap<>(HashUtil.getHashMapCapacity(projectionColumns.size()));
+    projectionColumns.forEach(column -> dataSourceMap.put(column, _starTreeV2.getDataSource(column)));
+    ProjectionOperator projectionOperator = new ProjectionOperator(dataSourceMap, docIdSetOperator);
     // NOTE: Here we do not put aggregation expressions into TransformOperator based on the following assumptions:
     //       - They are all columns (not functions or constants), where no transform is required
-    //       - We never call TransformOperator.getResultMetadata() or TransformOperator.getDictionary() on them
-    return new TransformOperator(_starTreeProjectionPlanNode.run(), _groupByExpressions);
+    //       - We never call TransformOperator.getResultColumnContext() on them
+    return hasNonIdentifierExpression ? new TransformOperator(_queryContext, projectionOperator,
+        Arrays.asList(_groupByExpressions)) : projectionOperator;
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeProjectionPlanNode.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeProjectionPlanNode.java
deleted file mode 100644
index 2238193050e..00000000000
--- a/pinot-core/src/main/java/org/apache/pinot/core/startree/plan/StarTreeProjectionPlanNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.core.startree.plan;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nullable;
-import org.apache.pinot.core.operator.ProjectionOperator;
-import org.apache.pinot.core.plan.PlanNode;
-import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.startree.CompositePredicateEvaluator;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
-
-
-public class StarTreeProjectionPlanNode implements PlanNode {
-  private final Map<String, DataSource> _dataSourceMap;
-  private final StarTreeDocIdSetPlanNode _starTreeDocIdSetPlanNode;
-
-  public StarTreeProjectionPlanNode(QueryContext queryContext, StarTreeV2 starTreeV2, Set<String> projectionColumns,
-      Map<String, List<CompositePredicateEvaluator>> predicateEvaluatorsMap, @Nullable Set<String> groupByColumns) {
-    _dataSourceMap = new HashMap<>();
-    for (String projectionColumn : projectionColumns) {
-      _dataSourceMap.put(projectionColumn, starTreeV2.getDataSource(projectionColumn));
-    }
-    _starTreeDocIdSetPlanNode =
-        new StarTreeDocIdSetPlanNode(queryContext, starTreeV2, predicateEvaluatorsMap, groupByColumns);
-  }
-
-  @Override
-  public ProjectionOperator run() {
-    return new ProjectionOperator(_dataSourceMap, _starTreeDocIdSetPlanNode.run());
-  }
-}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/transport/DataTableHandler.java b/pinot-core/src/main/java/org/apache/pinot/core/transport/DataTableHandler.java
index a5ef07b2e53..3a117a49912 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/transport/DataTableHandler.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/transport/DataTableHandler.java
@@ -25,6 +25,7 @@
 import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.metrics.BrokerMeter;
 import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.spi.trace.Tracing;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,6 +62,7 @@ public void channelInactive(ChannelHandlerContext ctx) {
 
   @Override
   protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) {
+    Tracing.ThreadAccountantOps.setThreadResourceUsageProvider();
     int responseSize = msg.readableBytes();
     _brokerMetrics.addMeteredGlobalValue(BrokerMeter.NETTY_CONNECTION_BYTES_RECEIVED, responseSize);
     try {
@@ -68,6 +70,8 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) {
       DataTable dataTable = DataTableFactory.getDataTable(msg.nioBuffer());
       _queryRouter.receiveDataTable(_serverRoutingInstance, dataTable, responseSize,
           (int) (System.currentTimeMillis() - deserializationStartTimeMs));
+      long requestID = Long.parseLong(dataTable.getMetadata().get(DataTable.MetadataKey.REQUEST_ID.getName()));
+      Tracing.ThreadAccountantOps.updateQueryUsageConcurrently(String.valueOf(requestID));
     } catch (Exception e) {
       LOGGER.error("Caught exception while deserializing data table of size: {} from server: {}", responseSize,
           _serverRoutingInstance, e);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java b/pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java
index 480b9b04275..e64322e7111 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/transport/InstanceRequestHandler.java
@@ -283,9 +283,10 @@ private void sendErrorResponse(ChannelHandlerContext ctx, long requestId, String
       dataTableMetadata.put(MetadataKey.REQUEST_ID.getName(), Long.toString(requestId));
       if (cancelled) {
         dataTable.addException(QueryException.getException(QueryException.QUERY_CANCELLATION_ERROR,
-            "Query cancelled on: " + _instanceName + e));
+            "Query cancelled on: " + _instanceName + " " + e));
       } else {
-        dataTable.addException(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR, e));
+        dataTable.addException(QueryException.getException(QueryException.QUERY_EXECUTION_ERROR,
+            "Query execution error on: " + _instanceName + " " + e));
       }
       byte[] serializedDataTable = dataTable.toBytes();
       sendResponse(ctx, tableNameWithType, queryArrivalTimeMs, serializedDataTable);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/transport/grpc/GrpcQueryServer.java b/pinot-core/src/main/java/org/apache/pinot/core/transport/grpc/GrpcQueryServer.java
index f92a5e23f07..64095b56309 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/transport/grpc/GrpcQueryServer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/transport/grpc/GrpcQueryServer.java
@@ -118,6 +118,9 @@ public void shutdown() {
 
   @Override
   public void submit(ServerRequest request, StreamObserver<ServerResponse> responseObserver) {
+    _serverMetrics.addMeteredGlobalValue(ServerMeter.GRPC_QUERIES, 1);
+    _serverMetrics.addMeteredGlobalValue(ServerMeter.GRPC_BYTES_RECEIVED, request.getSerializedSize());
+
     // Deserialize the request
     ServerQueryRequest queryRequest;
     try {
@@ -168,6 +171,7 @@ public void submit(ServerRequest request, StreamObserver<ServerResponse> respons
       return;
     }
     responseObserver.onNext(serverResponse);
+    _serverMetrics.addMeteredGlobalValue(ServerMeter.GRPC_BYTES_SENT, serverResponse.getSerializedSize());
     responseObserver.onCompleted();
   }
 }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/util/QueryMultiThreadingUtils.java b/pinot-core/src/main/java/org/apache/pinot/core/util/QueryMultiThreadingUtils.java
new file mode 100644
index 00000000000..bea9d0110c5
--- /dev/null
+++ b/pinot-core/src/main/java/org/apache/pinot/core/util/QueryMultiThreadingUtils.java
@@ -0,0 +1,113 @@
+/**
+ * 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.pinot.core.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import org.apache.pinot.core.util.trace.TraceCallable;
+
+
+/**
+ * The term `task` and `thread` are used interchangeably in the logic to parallelize CombinePlanNode and
+ * BaseCombineOperator. This class provides common methods used to set up the parallel processing.
+ */
+public class QueryMultiThreadingUtils {
+  private QueryMultiThreadingUtils() {
+  }
+
+  /**
+   * Use at most 10 or half of the processors threads for each query. If there are less than 2 processors, use 1
+   * thread.
+   * <p>NOTE: Runtime.getRuntime().availableProcessors() may return value < 2 in container based environment, e.g.
+   * Kubernetes.
+   */
+  public static final int MAX_NUM_THREADS_PER_QUERY =
+      Math.max(1, Math.min(10, Runtime.getRuntime().availableProcessors() / 2));
+
+  /**
+   * Returns the number of tasks for the query execution. The tasks can be assigned to multiple execution threads so
+   * that they can run in parallel. The parallelism is bounded by the task count.
+   */
+  public static int getNumTasksForQuery(int numOperators, int maxExecutionThreads) {
+    return getNumTasks(numOperators, 1, maxExecutionThreads);
+  }
+
+  public static int getNumTasks(int numWorkUnits, int minUnitsPerThread, int maxExecutionThreads) {
+    if (numWorkUnits <= minUnitsPerThread) {
+      return 1;
+    }
+    if (maxExecutionThreads <= 0) {
+      maxExecutionThreads = MAX_NUM_THREADS_PER_QUERY;
+    }
+    return Math.min((numWorkUnits + minUnitsPerThread - 1) / minUnitsPerThread, maxExecutionThreads);
+  }
+
+  /**
+   * Use a Phaser to ensure all the Futures are done (not scheduled, finished or interrupted) before the main thread
+   * returns. We need to ensure no execution left before the main thread returning because the main thread holds the
+   * reference to the segments, and if the segments are deleted/refreshed, the segments can be released after the main
+   * thread returns, which would lead to undefined behavior (even JVM crash) when executing queries against them.
+   */
+  public static <T> void runTasksWithDeadline(int numTasks, Function<Integer, T> taskFunc, Consumer<T> resCollector,
+      Consumer<Exception> errHandler, ExecutorService executorService, long deadlineInMs) {
+    Phaser phaser = new Phaser(1);
+    List<Future<T>> futures = new ArrayList<>(numTasks);
+    for (int i = 0; i < numTasks; i++) {
+      int index = i;
+      futures.add(executorService.submit(new TraceCallable<T>() {
+        @Override
+        public T callJob() {
+          try {
+            // Register the thread to the phaser for main thread to wait for it to complete.
+            if (phaser.register() < 0) {
+              return null;
+            }
+            return taskFunc.apply(index);
+          } finally {
+            phaser.arriveAndDeregister();
+          }
+        }
+      }));
+    }
+    try {
+      // Check deadline while waiting for the task results.
+      for (Future<T> future : futures) {
+        T taskResult = future.get(deadlineInMs - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+        resCollector.accept(taskResult);
+      }
+    } catch (Exception e) {
+      errHandler.accept(e);
+    } finally {
+      // Cancel all ongoing jobs
+      for (Future<T> future : futures) {
+        if (!future.isDone()) {
+          future.cancel(true);
+        }
+      }
+      // Deregister the main thread and wait for all threads done
+      phaser.awaitAdvance(phaser.arriveAndDeregister());
+    }
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/util/trace/BuiltInTracer.java b/pinot-core/src/main/java/org/apache/pinot/core/util/trace/BuiltInTracer.java
index 7bd93b17631..bbd5b93bff8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/util/trace/BuiltInTracer.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/util/trace/BuiltInTracer.java
@@ -50,6 +50,15 @@ public void close() {
       }
       TraceContext.logTime(operatorName, duration);
     }
+
+    @Override
+    public void close(Object context) {
+      String operatorName = _operator.getSimpleName();
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Context collected for {}: {}", operatorName, context);
+      }
+      TraceContext.logInfo(operatorName, context);
+    }
   }
 
   @Override
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/util/trace/TraceContext.java b/pinot-core/src/main/java/org/apache/pinot/core/util/trace/TraceContext.java
index 4d430434e56..0bdaf0da626 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/util/trace/TraceContext.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/util/trace/TraceContext.java
@@ -189,8 +189,11 @@ public static void logInfo(String key, Object value) {
    */
   public static String getTraceInfo() {
     ArrayNode jsonTraces = JsonUtils.newArrayNode();
-    for (Trace trace : REQUEST_TO_TRACES_MAP.get(TRACE_ENTRY_THREAD_LOCAL.get()._requestId)) {
-      jsonTraces.add(trace.toJson());
+    Queue<Trace> traces = REQUEST_TO_TRACES_MAP.get(TRACE_ENTRY_THREAD_LOCAL.get()._requestId);
+    if (traces != null && !traces.isEmpty()) {
+      for (Trace trace : traces) {
+        jsonTraces.add(trace.toJson());
+      }
     }
     return jsonTraces.toString();
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java b/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
index a7547e9ab1e..03227f2920b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
+++ b/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
@@ -29,6 +29,7 @@
 import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
 import org.apache.pinot.common.utils.ClientSSLContextGenerator;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
+import org.apache.pinot.common.utils.http.HttpClientConfig;
 import org.apache.pinot.core.data.manager.realtime.Server2ControllerSegmentUploader;
 import org.apache.pinot.core.util.SegmentCompletionProtocolUtils;
 import org.apache.pinot.spi.auth.AuthProvider;
@@ -52,6 +53,7 @@ public class ServerSegmentCompletionProtocolHandler {
   private static final String HTTP_PROTOCOL = CommonConstants.HTTP_PROTOCOL;
 
   private static SSLContext _sslContext;
+  private static HttpClientConfig _httpClientConfig = HttpClientConfig.DEFAULT_HTTP_CLIENT_CONFIG;
   private static Integer _controllerHttpsPort;
   private static int _segmentUploadRequestTimeoutMs;
   private static AuthProvider _authProvider;
@@ -76,10 +78,12 @@ public static void init(PinotConfiguration uploaderConfig) {
         .getProperty(CONFIG_OF_SEGMENT_UPLOAD_REQUEST_TIMEOUT_MS, DEFAULT_SEGMENT_UPLOAD_REQUEST_TIMEOUT_MS);
 
     _authProvider = AuthProviderUtils.extractAuthProvider(uploaderConfig, CONFIG_OF_SEGMENT_UPLOADER_AUTH);
+
+    _httpClientConfig = HttpClientConfig.newBuilder(uploaderConfig).build();
   }
 
   public ServerSegmentCompletionProtocolHandler(ServerMetrics serverMetrics, String tableNameWithType) {
-    _fileUploadDownloadClient = new FileUploadDownloadClient(_sslContext);
+    _fileUploadDownloadClient = new FileUploadDownloadClient(_httpClientConfig, _sslContext);
     _serverMetrics = serverMetrics;
     _rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
   }
@@ -159,7 +163,7 @@ public SegmentCompletionProtocol.Response segmentCommit(SegmentCompletionProtoco
     try {
       segmentUploader =
           new Server2ControllerSegmentUploader(LOGGER, _fileUploadDownloadClient, url, params.getSegmentName(),
-              _segmentUploadRequestTimeoutMs, _serverMetrics, _authProvider);
+              _segmentUploadRequestTimeoutMs, _serverMetrics, _authProvider, _rawTableName);
     } catch (URISyntaxException e) {
       LOGGER.error("Segment commit upload url error: ", e);
       return SegmentCompletionProtocol.RESP_NOT_SENT;
diff --git a/pinot-core/src/test/java/org/apache/pinot/common/request/context/LiteralContextTest.java b/pinot-core/src/test/java/org/apache/pinot/common/request/context/LiteralContextTest.java
new file mode 100644
index 00000000000..003ea4f09e8
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/common/request/context/LiteralContextTest.java
@@ -0,0 +1,98 @@
+/**
+ * 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.pinot.common.request.context;
+
+import java.math.BigDecimal;
+import org.apache.pinot.common.request.Literal;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class LiteralContextTest {
+  @Test
+  public void testNullLiteralContext() {
+    // Create literal context from thrift
+    Literal literal = new Literal();
+    literal.setNullValue(true);
+    LiteralContext nullContext1 = new LiteralContext(literal);
+    Assert.assertEquals(nullContext1.getValue(), null);
+    Assert.assertEquals(nullContext1.toString(), "'null'");
+    Assert.assertEquals(nullContext1.getBigDecimalValue(), BigDecimal.ZERO);
+    // Create literal context from object and type
+    LiteralContext nullContext2 = new LiteralContext(FieldSpec.DataType.UNKNOWN, null);
+    Assert.assertEquals(nullContext2.getValue(), null);
+    Assert.assertEquals(nullContext2.toString(), "'null'");
+    Assert.assertEquals(nullContext2.getBigDecimalValue(), BigDecimal.ZERO);
+    // Check different literal objects are equal and have same hash code.
+    Assert.assertTrue(nullContext1.equals(nullContext2));
+    Assert.assertTrue(nullContext1.hashCode() == nullContext2.hashCode());
+  }
+
+  @Test
+  public void testInferDataType(){
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("abc").getLeft(), FieldSpec.DataType.STRING);
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("123").getLeft(), FieldSpec.DataType.STRING);
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("2147483649").getLeft(), FieldSpec.DataType.STRING);
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("1.2").getLeft(), FieldSpec.DataType.STRING);
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("41241241.2412").getLeft(),
+        FieldSpec.DataType.STRING);
+    // Only big decimal is allowed to pass in as string for numerical type.
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("1.7976931348623159e+308").getLeft(),
+        FieldSpec.DataType.BIG_DECIMAL);
+    Assert.assertEquals(LiteralContext.inferLiteralDataTypeAndValue("2020-02-02 20:20:20.20").getLeft(),
+        FieldSpec.DataType.TIMESTAMP);
+  }
+
+  @Test
+  public void testInferFloatDataType() {
+    Literal literalFloat = new Literal();
+    literalFloat.setDoubleValue(1.23);
+    LiteralContext floatContext = new LiteralContext(literalFloat);
+    Assert.assertEquals(floatContext.getType(), FieldSpec.DataType.FLOAT);
+    Assert.assertEquals(floatContext.getValue(), (float) literalFloat.getDoubleValue());
+  }
+
+  @Test
+  public void testInferDoubleDataType() {
+    Literal literalFloat = new Literal();
+    literalFloat.setDoubleValue(1.234567891011);
+    LiteralContext doubleContext = new LiteralContext(literalFloat);
+    Assert.assertEquals(doubleContext.getType(), FieldSpec.DataType.DOUBLE);
+    Assert.assertEquals(doubleContext.getValue(), literalFloat.getDoubleValue());
+  }
+
+  @Test
+  public void testInferIntDataType() {
+    Literal literalInt = new Literal();
+    literalInt.setLongValue(123);
+    LiteralContext floatContext = new LiteralContext(literalInt);
+    Assert.assertEquals(floatContext.getType(), FieldSpec.DataType.INT);
+    Assert.assertEquals(floatContext.getValue(), (int) literalInt.getLongValue());
+  }
+
+  @Test
+  public void testInferLongDataType() {
+    Literal literalLong = new Literal();
+    literalLong.setLongValue(Integer.MAX_VALUE + 1L);
+    LiteralContext longContext = new LiteralContext(literalLong);
+    Assert.assertEquals(longContext.getType(), FieldSpec.DataType.LONG);
+    Assert.assertEquals(longContext.getValue(), literalLong.getLongValue());
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/common/utils/request/RequestUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/common/utils/request/RequestUtilsTest.java
new file mode 100644
index 00000000000..3c36a0de7fe
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/common/utils/request/RequestUtilsTest.java
@@ -0,0 +1,37 @@
+/**
+ * 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.pinot.common.utils.request;
+
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.pinot.common.request.Expression;
+import org.apache.pinot.common.request.ExpressionType;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class RequestUtilsTest {
+  @Test
+  public void testNullLiteralParsing() {
+    SqlLiteral nullLiteral = SqlLiteral.createNull(SqlParserPos.ZERO);
+    Expression nullExpr = RequestUtils.getLiteralExpression(nullLiteral);
+    Assert.assertEquals(nullExpr.getType(), ExpressionType.LITERAL);
+    Assert.assertEquals(nullExpr.getLiteral().getNullValue(), true);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/accounting/ResourceManagerAccountingTest.java b/pinot-core/src/test/java/org/apache/pinot/core/accounting/ResourceManagerAccountingTest.java
index acc0a4acd67..0a6199e71c1 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/accounting/ResourceManagerAccountingTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/accounting/ResourceManagerAccountingTest.java
@@ -21,8 +21,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -32,7 +30,6 @@
 import org.apache.log4j.LogManager;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant;
-import org.apache.pinot.core.accounting.utils.RunnerWorkerThreadOffsetProvider;
 import org.apache.pinot.core.query.request.ServerQueryRequest;
 import org.apache.pinot.core.query.scheduler.SchedulerGroupAccountant;
 import org.apache.pinot.core.query.scheduler.resources.QueryExecutorService;
@@ -54,45 +51,6 @@ public class ResourceManagerAccountingTest {
 
   public static final Logger LOGGER = LoggerFactory.getLogger(ResourceManagerAccountingTest.class);
 
-  @Test
-  public void testThreadIDProvider()
-      throws Exception {
-    ResourceManager rm = getResourceManager(2, 5, 1, 3, Collections.emptyMap());
-    Future[] futures = new Future[2001];
-    Set<Integer> threadIds = ConcurrentHashMap.newKeySet();
-
-    RunnerWorkerThreadOffsetProvider runnerWorkerThreadOffsetProvider = new RunnerWorkerThreadOffsetProvider();
-
-    for (int i = 0; i < 1000; i++) {
-      int finalI = i;
-      futures[i + 1000] = rm.getQueryWorkers().submit(() -> {
-        int id = runnerWorkerThreadOffsetProvider.get();
-        threadIds.add(id);
-        futures[2000].cancel(true);
-      });
-      futures[i] = rm.getQueryRunners().submit(() -> {
-        int id = runnerWorkerThreadOffsetProvider.get();
-        threadIds.add(id);
-        futures[2500 - finalI] = null;
-      });
-    }
-    for (int i = 0; i < 2000; i++) {
-      try {
-        futures[i].get();
-      } catch (Exception ignored) {
-      }
-    }
-    Assert.assertEquals(threadIds.size(), 7);
-
-    Assert.assertTrue(threadIds.contains(0));
-    Assert.assertTrue(threadIds.contains(1));
-    Assert.assertTrue(threadIds.contains(2));
-    Assert.assertTrue(threadIds.contains(3));
-    Assert.assertTrue(threadIds.contains(4));
-    Assert.assertTrue(threadIds.contains(5));
-    Assert.assertTrue(threadIds.contains(6));
-  }
-
   /**
    * Test thread cpu usage tracking in multithread environment, add @Test to run.
    * Default to unused as this is a proof of concept and will take a long time to run.
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/common/ObjectSerDeUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/common/ObjectSerDeUtilsTest.java
index f22dbb73d69..ccd9ae3f6fd 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/common/ObjectSerDeUtilsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/common/ObjectSerDeUtilsTest.java
@@ -29,6 +29,7 @@
 import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import org.apache.commons.lang.RandomStringUtils;
@@ -289,6 +290,25 @@ public void testTDigest() {
         assertEquals(actual.quantile(j / 100.0), expected.quantile(j / 100.0), 1e-5);
       }
     }
+
+    // Try some custom compression values
+    List<Double> compressionFactorsToTest = Arrays.asList(10d, 200d, 500d, 1000d, 10000d);
+    for (double compressionFactor : compressionFactorsToTest) {
+      for (int i = 0; i < NUM_ITERATIONS; i++) {
+        TDigest expected = TDigest.createMergingDigest(compressionFactor);
+        int size = RANDOM.nextInt(100) + 1;
+        for (int j = 0; j < size; j++) {
+          expected.add(RANDOM.nextDouble());
+        }
+
+        byte[] bytes = ObjectSerDeUtils.serialize(expected);
+        TDigest actual = ObjectSerDeUtils.deserialize(bytes, ObjectSerDeUtils.ObjectType.TDigest);
+
+        for (int j = 0; j <= 100; j++) {
+          assertEquals(actual.quantile(j / 100.0), expected.quantile(j / 100.0), 1e-5);
+        }
+      }
+    }
   }
 
   @Test
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTest.java b/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTest.java
index d71260aa8bf..600e8b8ce8e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTest.java
@@ -20,6 +20,7 @@
 
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.pinot.common.datablock.ColumnarDataBlock;
@@ -95,4 +96,46 @@ public void testAllDataTypes(int nullPercentile)
   public Object[][] provideTestTypeNullPercentile() {
     return new Object[][]{new Object[]{0}, new Object[]{10}, new Object[]{100}};
   }
+
+  /**
+   * TODO: bytes array serialization probably needs fixing.
+   */
+  @Test
+  void bytesArraySerDe() {
+    Object[] row = new Object[1];
+    row[0] = new byte[][]{new byte[]{0xD, 0xA}, new byte[]{0xD, 0xA}};
+    List<Object[]> rows = new ArrayList<>();
+    rows.add(row);
+
+    DataSchema dataSchema = new DataSchema(new String[]{"byteArray"},
+        new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.BYTES_ARRAY});
+
+    try {
+      DataBlock dataBlock = DataBlockBuilder.buildFromRows(rows, dataSchema);
+      Assert.assertNull(dataBlock);
+      Assert.fail();
+    } catch (Exception e) {
+      Assert.assertTrue(e.toString()
+          .contains("java.lang.IllegalArgumentException: Unsupported type of value: byte[][]"));
+    }
+  }
+
+  /**
+   * TODO: empty int array deserialization is probably needs fixing.
+   */
+  @Test
+  void intArraySerDe()
+      throws IOException {
+    Object[] row = new Object[1];
+    row[0] = new int[0];
+    List<Object[]> rows = new ArrayList<>();
+    rows.add(row);
+
+    DataSchema dataSchema = new DataSchema(new String[]{"intArray"},
+        new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT_ARRAY});
+
+    DataBlock dataBlock = DataBlockBuilder.buildFromRows(rows, dataSchema);
+    int[] intArray = DataBlockUtils.getDataBlock(ByteBuffer.wrap(dataBlock.toBytes())).getIntArray(0, 0);
+    Assert.assertEquals(intArray.length, 0);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTestUtils.java b/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTestUtils.java
index 67cc82cba6d..8d0f10058b7 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTestUtils.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/common/datablock/DataBlockTestUtils.java
@@ -127,6 +127,9 @@ public static Object[] getRandomRow(DataSchema dataSchema, int nullPercentile) {
           }
           row[colId] = timestampArray;
           break;
+        case UNKNOWN:
+          row[colId] = null;
+          break;
         default:
           throw new UnsupportedOperationException("Can't fill random data for column type: " + columnDataTypes[colId]);
       }
@@ -173,6 +176,8 @@ public static Object getElement(DataBlock dataBlock, int rowId, int colId,
         return dataBlock.getDoubleArray(rowId, colId);
       case STRING_ARRAY:
         return dataBlock.getStringArray(rowId, colId);
+      case UNKNOWN:
+        return null;
       default:
         throw new UnsupportedOperationException("Can't retrieve data for column type: " + columnDataType);
     }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/common/datatable/DataTableSerDeTest.java b/pinot-core/src/test/java/org/apache/pinot/core/common/datatable/DataTableSerDeTest.java
index 9b53e87354c..a2d30ba50c3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/common/datatable/DataTableSerDeTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/common/datatable/DataTableSerDeTest.java
@@ -123,36 +123,143 @@ public void testException(int dataTableVersion)
   }
 
   @Test(dataProvider = "versionProvider")
-  public void testEmptyStrings(int dataTableVersion)
+  public void testEmptyValues(int dataTableVersion)
       throws IOException {
     DataTableBuilderFactory.setDataTableVersion(dataTableVersion);
     String emptyString = StringUtils.EMPTY;
     String[] emptyStringArray = {StringUtils.EMPTY};
+    ByteArray emptyBytes = new ByteArray(new byte[0]);
+    for (int numRows = 0; numRows < NUM_ROWS; numRows++) {
+      testEmptyValues(new DataSchema(new String[]{"STR_SV", "STR_MV"}, new DataSchema.ColumnDataType[]{
+          DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.STRING_ARRAY
+      }), numRows, new Object[]{emptyString, emptyStringArray});
+
+      testEmptyValues(
+          new DataSchema(new String[]{"STR_SV"}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING}),
+          numRows, new Object[]{emptyString});
+
+      testEmptyValues(new DataSchema(new String[]{"STR_MV"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING_ARRAY}), numRows,
+          new Object[]{emptyStringArray});
+
+      testEmptyValues(
+          new DataSchema(new String[]{"BYTES"}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.BYTES}),
+          numRows, new Object[]{emptyBytes});
+
+      testEmptyValues(
+          new DataSchema(new String[]{"BOOL_ARR"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.BOOLEAN_ARRAY}),
+          numRows, new Object[]{new int[]{}});
+
+      testEmptyValues(
+          new DataSchema(new String[]{"BOOL_ARR"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.BOOLEAN_ARRAY}),
+          numRows, new Object[]{new int[]{0}});
+
+      testEmptyValues(
+          new DataSchema(new String[]{"INT_ARR"}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT_ARRAY}),
+          numRows, new Object[]{new int[]{}});
+
+      testEmptyValues(
+          new DataSchema(new String[]{"INT_ARR"}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT_ARRAY}),
+          numRows, new Object[]{new int[]{0}});
+
+      testEmptyValues(new DataSchema(new String[]{"LONG_ARR"},
+          new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.LONG_ARRAY}), numRows, new Object[]{new long[]{}});
+
+      testEmptyValues(new DataSchema(new String[]{"LONG_ARR"},
+          new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.LONG_ARRAY}), numRows, new Object[]{new long[]{0}});
+
+      testEmptyValues(new DataSchema(new String[]{"FLOAT_ARR"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.FLOAT_ARRAY}), numRows,
+          new Object[]{new float[]{}});
+
+      testEmptyValues(new DataSchema(new String[]{"FLOAT_ARR"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.FLOAT_ARRAY}), numRows,
+          new Object[]{new float[]{0}});
+
+      testEmptyValues(new DataSchema(new String[]{"DOUBLE_ARR"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.DOUBLE_ARRAY}), numRows,
+          new Object[]{new double[]{}});
+
+      testEmptyValues(new DataSchema(new String[]{"DOUBLE_ARR"},
+              new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.DOUBLE_ARRAY}), numRows,
+          new Object[]{new double[]{0}});
+    }
+    DataTableBuilderFactory.setDataTableVersion(DataTableBuilderFactory.DEFAULT_VERSION);
+  }
+
+  private void testEmptyValues(DataSchema dataSchema, int numRows, Object[] emptyValues)
+      throws IOException {
 
-    DataSchema dataSchema = new DataSchema(new String[]{"SV", "MV"},
-        new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.STRING_ARRAY});
     DataTableBuilder dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema);
-    for (int rowId = 0; rowId < NUM_ROWS; rowId++) {
+    for (int rowId = 0; rowId < numRows; rowId++) {
       dataTableBuilder.startRow();
-      dataTableBuilder.setColumn(0, emptyString);
-      dataTableBuilder.setColumn(1, emptyStringArray);
+      for (int columnId = 0; columnId < dataSchema.size(); columnId++) {
+        Object emptyValue = emptyValues[columnId];
+        if (emptyValue instanceof int[]) {
+          dataTableBuilder.setColumn(columnId, (int[]) emptyValue);
+        } else if (emptyValue instanceof long[]) {
+          dataTableBuilder.setColumn(columnId, (long[]) emptyValue);
+        } else if (emptyValue instanceof float[]) {
+          dataTableBuilder.setColumn(columnId, (float[]) emptyValue);
+        } else if (emptyValue instanceof double[]) {
+          dataTableBuilder.setColumn(columnId, (double[]) emptyValue);
+        } else if (emptyValue instanceof String[]) {
+          dataTableBuilder.setColumn(columnId, (String[]) emptyValue);
+        } else if (emptyValue instanceof String) {
+          dataTableBuilder.setColumn(columnId, (String) emptyValue);
+        } else if (emptyValue instanceof ByteArray) {
+          dataTableBuilder.setColumn(columnId, (ByteArray) emptyValue);
+        } else {
+          dataTableBuilder.setColumn(columnId, emptyValue);
+        }
+      }
       dataTableBuilder.finishRow();
     }
 
     DataTable dataTable = dataTableBuilder.build();
     DataTable newDataTable = DataTableFactory.getDataTable(dataTable.toBytes());
     Assert.assertEquals(newDataTable.getDataSchema(), dataSchema);
-    Assert.assertEquals(newDataTable.getNumberOfRows(), NUM_ROWS);
+    Assert.assertEquals(newDataTable.getNumberOfRows(), numRows);
 
-    for (int rowId = 0; rowId < NUM_ROWS; rowId++) {
-      Assert.assertEquals(newDataTable.getString(rowId, 0), emptyString);
-      Assert.assertEquals(newDataTable.getStringArray(rowId, 1), emptyStringArray);
+    for (int rowId = 0; rowId < numRows; rowId++) {
+      for (int columnId = 0; columnId < dataSchema.size(); columnId++) {
+        Object entry;
+        switch (dataSchema.getColumnDataType(columnId)) {
+          case BOOLEAN_ARRAY:
+          case INT_ARRAY:
+            entry = newDataTable.getIntArray(rowId, columnId);
+            break;
+          case LONG_ARRAY:
+            entry = newDataTable.getLongArray(rowId, columnId);
+            break;
+          case FLOAT_ARRAY:
+            entry = newDataTable.getFloatArray(rowId, columnId);
+            break;
+          case DOUBLE_ARRAY:
+            entry = newDataTable.getDoubleArray(rowId, columnId);
+            break;
+          case STRING_ARRAY:
+            entry = newDataTable.getStringArray(rowId, columnId);
+            break;
+          case STRING:
+            entry = newDataTable.getString(rowId, columnId);
+            break;
+          case BYTES:
+            entry = newDataTable.getBytes(rowId, columnId);
+            break;
+          default:
+            entry = newDataTable.getCustomObject(rowId, columnId);
+            break;
+        }
+        Assert.assertEquals(entry, emptyValues[columnId]);
+      }
     }
-    DataTableBuilderFactory.setDataTableVersion(DataTableBuilderFactory.DEFAULT_VERSION);
   }
 
   @Test(dataProvider = "versionProvider")
-  public void testAllDataTypes(int dataTableVersion)
+  public void testAllDataTypesInOneSchema(int dataTableVersion)
       throws IOException {
     DataTableBuilderFactory.setDataTableVersion(dataTableVersion);
     DataSchema.ColumnDataType[] columnDataTypes = DataSchema.ColumnDataType.values();
@@ -174,6 +281,29 @@ public void testAllDataTypes(int dataTableVersion)
     DataTableBuilderFactory.setDataTableVersion(DataTableBuilderFactory.DEFAULT_VERSION);
   }
 
+  @Test(dataProvider = "versionProvider")
+  public void testAllDataTypes(int dataTableVersion)
+      throws IOException {
+    DataTableBuilderFactory.setDataTableVersion(dataTableVersion);
+    DataSchema.ColumnDataType[] columnDataTypes = DataSchema.ColumnDataType.values();
+    int numColumns = columnDataTypes.length;
+    for (int i = 0; i < numColumns; i++) {
+      String[] columnName = new String[]{columnDataTypes[i].name()};
+      DataSchema.ColumnDataType[] columnDataType = new DataSchema.ColumnDataType[]{columnDataTypes[i]};
+      DataSchema dataSchema = new DataSchema(columnName, columnDataType);
+      for (int numRows = 0; numRows < NUM_ROWS; numRows++) {
+        DataTableBuilder dataTableBuilder = DataTableBuilderFactory.getDataTableBuilder(dataSchema);
+        fillDataTableWithRandomData(dataTableBuilder, columnDataType, 1, numRows);
+        DataTable dataTable = dataTableBuilder.build();
+        DataTable newDataTable = DataTableFactory.getDataTable(dataTable.toBytes());
+        Assert.assertEquals(newDataTable.getDataSchema(), dataSchema, ERROR_MESSAGE);
+        Assert.assertEquals(newDataTable.getNumberOfRows(), numRows, ERROR_MESSAGE);
+        verifyDataIsSame(newDataTable, columnDataType, 1, numRows);
+      }
+    }
+    DataTableBuilderFactory.setDataTableVersion(DataTableBuilderFactory.DEFAULT_VERSION);
+  }
+
   @Test(dataProvider = "versionProvider")
   public void testExecutionThreadCpuTimeNs(int dataTableVersion)
       throws IOException {
@@ -553,6 +683,12 @@ public void testDataTableVer3MetadataBytesLayout()
   private void fillDataTableWithRandomData(DataTableBuilder dataTableBuilder,
       DataSchema.ColumnDataType[] columnDataTypes, int numColumns)
       throws IOException {
+    fillDataTableWithRandomData(dataTableBuilder, columnDataTypes, numColumns, NUM_ROWS);
+  }
+
+  private void fillDataTableWithRandomData(DataTableBuilder dataTableBuilder,
+      DataSchema.ColumnDataType[] columnDataTypes, int numColumns, int numRows)
+      throws IOException {
     RoaringBitmap[] nullBitmaps = null;
     if (DataTableBuilderFactory.getDataTableVersion() >= DataTableFactory.VERSION_4) {
       nullBitmaps = new RoaringBitmap[numColumns];
@@ -560,7 +696,7 @@ private void fillDataTableWithRandomData(DataTableBuilder dataTableBuilder,
         nullBitmaps[colId] = new RoaringBitmap();
       }
     }
-    for (int rowId = 0; rowId < NUM_ROWS; rowId++) {
+    for (int rowId = 0; rowId < numRows; rowId++) {
       dataTableBuilder.startRow();
       for (int colId = 0; colId < numColumns; colId++) {
         // Note: isNull is handled for SV columns only for now.
@@ -680,6 +816,9 @@ private void fillDataTableWithRandomData(DataTableBuilder dataTableBuilder,
             STRING_ARRAYS[rowId] = stringArray;
             dataTableBuilder.setColumn(colId, stringArray);
             break;
+          case UNKNOWN:
+            dataTableBuilder.setColumn(colId, (Object) null);
+            break;
           default:
             throw new UnsupportedOperationException("Unable to generate random data for: " + columnDataTypes[colId]);
         }
@@ -694,11 +833,16 @@ private void fillDataTableWithRandomData(DataTableBuilder dataTableBuilder,
   }
 
   private void verifyDataIsSame(DataTable newDataTable, DataSchema.ColumnDataType[] columnDataTypes, int numColumns) {
+    verifyDataIsSame(newDataTable, columnDataTypes, numColumns, NUM_ROWS);
+  }
+
+  private void verifyDataIsSame(DataTable newDataTable, DataSchema.ColumnDataType[] columnDataTypes, int numColumns,
+      int numRows) {
     RoaringBitmap[] nullBitmaps = new RoaringBitmap[numColumns];
     for (int colId = 0; colId < numColumns; colId++) {
       nullBitmaps[colId] = newDataTable.getNullRowIds(colId);
     }
-    for (int rowId = 0; rowId < NUM_ROWS; rowId++) {
+    for (int rowId = 0; rowId < numRows; rowId++) {
       for (int colId = 0; colId < numColumns; colId++) {
         boolean isNull = nullBitmaps[colId] != null && nullBitmaps[colId].contains(rowId);
         switch (columnDataTypes[colId]) {
@@ -773,6 +917,10 @@ private void verifyDataIsSame(DataTable newDataTable, DataSchema.ColumnDataType[
             Assert.assertTrue(Arrays.equals(newDataTable.getStringArray(rowId, colId), STRING_ARRAYS[rowId]),
                 ERROR_MESSAGE);
             break;
+          case UNKNOWN:
+            Object nulValue = newDataTable.getCustomObject(rowId, colId);
+            Assert.assertNull(nulValue, ERROR_MESSAGE);
+            break;
           default:
             throw new UnsupportedOperationException("Unable to generate random data for: " + columnDataTypes[colId]);
         }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/function/DateTimeFunctionsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/function/DateTimeFunctionsTest.java
index ad24fefcc95..b82df0bfe2c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/function/DateTimeFunctionsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/function/DateTimeFunctionsTest.java
@@ -349,7 +349,7 @@ public void testDateTrunc() {
     // name variations
     testFunction("datetrunc('millisecond', epochMillis, 'MILLISECONDS')", arguments, row, 1612296732123L);
     testFunction("date_trunc('MILLISECOND', epochMillis, 'MILLISECONDS')", arguments, row, 1612296732123L);
-    testFunction("dateTrunc('millisecond', epochMillis, 'MILLISECONDS')", arguments, row, 1612296732123L);
+    testFunction("dateTrunc('millisecond', epochMillis, 'milliseconds')", arguments, row, 1612296732123L);
     testFunction("DATE_TRUNC('SECOND', epochMillis, 'MILLISECONDS')", arguments, row, 1612296732000L);
 
     // MILLISECONDS to various
@@ -399,6 +399,8 @@ public void testDateTrunc() {
     DateTime result = WEIRD_TIMESTAMP;
     testFunction("datetrunc('millisecond', epochMillis, 'MILLISECONDS', '" + weirdDateTimeZoneid + "')", arguments, row,
         result.getMillis());
+    testFunction("datetrunc('millisecond', epochMillis, 'MILLISECONDS', '" + weirdDateTimeZoneid + "', 'milliseconds')",
+        arguments, row, result.getMillis());
     result = result.withMillisOfSecond(0);
     testFunction("datetrunc('second', epochMillis, 'MILLISECONDS', '" + weirdDateTimeZoneid + "')", arguments, row,
         result.getMillis());
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerAcquireSegmentTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerAcquireSegmentTest.java
index c679a6d2fee..9f1dfbbe0a8 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerAcquireSegmentTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerAcquireSegmentTest.java
@@ -130,7 +130,7 @@ private TableDataManager makeTestableManager()
       when(config.getTableDeletedSegmentsCacheTtlMinutes()).thenReturn(DELETED_SEGMENTS_TTL_MINUTES);
     }
     tableDataManager.init(config, "dummyInstance", mock(ZkHelixPropertyStore.class),
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null, null,
         new TableDataManagerParams(0, false, -1));
     tableDataManager.start();
     Field segsMapField = BaseTableDataManager.class.getDeclaredField("_segmentDataManagerMap");
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerTest.java
index 6437a54a702..7eb2ef0acd6 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/BaseTableDataManagerTest.java
@@ -191,7 +191,6 @@ public void testReloadSegmentUseLocalCopy()
       fail();
     } catch (Exception e) {
       // As expected, segment reloading fails due to missing the local segment dir.
-      assertTrue(e.getMessage().contains("does not exist or is not a directory"));
     }
   }
 
@@ -312,7 +311,6 @@ public void testReloadSegmentForceDownload()
       fail();
     } catch (Exception e) {
       // As expected, segment reloading fails due to missing the local segment dir.
-      assertTrue(e.getMessage().contains("does not exist or is not a directory"));
     }
 
     tmgr.reloadSegment(segName, TableDataManagerTestUtils.createIndexLoadingConfig(), zkmd, llmd, null, true);
@@ -721,7 +719,7 @@ private static BaseTableDataManager createTableManager() {
 
     OfflineTableDataManager tableDataManager = new OfflineTableDataManager();
     tableDataManager.init(config, "dummyInstance", mock(ZkHelixPropertyStore.class),
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null, null,
         new TableDataManagerParams(0, false, -1));
     tableDataManager.start();
     return tableDataManager;
@@ -730,7 +728,7 @@ private static BaseTableDataManager createTableManager() {
   private static BaseTableDataManager createTableManager(TableDataManagerConfig config, HelixManager helixManager) {
     OfflineTableDataManager tableDataManager = new OfflineTableDataManager();
     tableDataManager.init(config, "dummyInstance", mock(ZkHelixPropertyStore.class),
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), helixManager, null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), helixManager, null, null,
         new TableDataManagerParams(0, false, -1));
     tableDataManager.start();
     return tableDataManager;
@@ -739,7 +737,7 @@ private static BaseTableDataManager createTableManager(TableDataManagerConfig co
   private static OfflineTableDataManager createSpyOfflineTableManager(TableDataManagerConfig tableDataManagerConfig) {
     OfflineTableDataManager tableDataManager = new OfflineTableDataManager();
     tableDataManager.init(tableDataManagerConfig, "dummyInstance", mock(ZkHelixPropertyStore.class),
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null, null,
         new TableDataManagerParams(0, false, -1));
     tableDataManager.start();
     return Mockito.spy(tableDataManager);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java
index 132b94e72a7..3381d9c3838 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/offline/DimensionTableDataManagerTest.java
@@ -133,7 +133,7 @@ private DimensionTableDataManager makeTableDataManager(HelixManager helixManager
       when(config.getDataDir()).thenReturn(TEMP_DIR.getAbsolutePath());
     }
     tableDataManager.init(config, "dummyInstance", helixManager.getHelixPropertyStore(),
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), helixManager, null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), helixManager, null, null,
         new TableDataManagerParams(0, false, -1));
     tableDataManager.start();
     return tableDataManager;
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTrackerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTrackerTest.java
index e2d19fc0acb..177fe332699 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTrackerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/IngestionDelayTrackerTest.java
@@ -85,29 +85,37 @@ public void testRecordIngestionDelayWithNoAging() {
 
     // Test we follow a single partition up and down
     for (long i = 0; i <= maxTestDelay; i++) {
-      ingestionDelayTracker.updateIngestionDelay(i, partition0);
+      ingestionDelayTracker.updateIngestionDelay(i, (i + 1), partition0);
       Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition0), clock.millis() - i);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition0),
+          clock.millis() - (i + 1));
     }
 
     // Test tracking down a measure for a given partition
     for (long i = maxTestDelay; i >= 0; i--) {
-      ingestionDelayTracker.updateIngestionDelay(i, partition0);
+      ingestionDelayTracker.updateIngestionDelay(i, (i + 1), partition0);
       Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition0), clock.millis() - i);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition0),
+          clock.millis() - (i + 1));
     }
 
     // Make the current partition maximum
-    ingestionDelayTracker.updateIngestionDelay(maxTestDelay, partition0);
+    ingestionDelayTracker.updateIngestionDelay(maxTestDelay, maxTestDelay, partition0);
 
     // Bring up partition1 delay up and verify values
     for (long i = 0; i <= 2 * maxTestDelay; i++) {
-      ingestionDelayTracker.updateIngestionDelay(i, partition1);
+      ingestionDelayTracker.updateIngestionDelay(i, (i + 1), partition1);
       Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition1), clock.millis() - i);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition1),
+          clock.millis() - (i + 1));
     }
 
     // Bring down values of partition1 and verify values
     for (long i = 2 * maxTestDelay; i >= 0; i--) {
-      ingestionDelayTracker.updateIngestionDelay(i, partition1);
+      ingestionDelayTracker.updateIngestionDelay(i, (i + 1), partition1);
       Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition1), clock.millis() - i);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition1),
+          clock.millis() - (i + 1));
     }
 
     ingestionDelayTracker.shutdown();
@@ -132,24 +140,34 @@ public void testRecordIngestionDelayWithAging() {
     ZoneId zoneId = ZoneId.systemDefault();
     Clock clock = Clock.fixed(now, zoneId);
     ingestionDelayTracker.setClock(clock);
-    ingestionDelayTracker.updateIngestionDelay(clock.millis() - partition0Delay0, partition0);
+    ingestionDelayTracker.updateIngestionDelay((clock.millis() - partition0Delay0),
+        (clock.millis() - partition0Delay0), partition0);
     Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition0), partition0Delay0);
+    Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition0), partition0Delay0);
     // Advance clock and test aging
     Clock offsetClock = Clock.offset(clock, Duration.ofMillis(partition0Offset0Ms));
     ingestionDelayTracker.setClock(offsetClock);
     Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition0),
         (partition0Delay0 + partition0Offset0Ms));
+    Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition0),
+        (partition0Delay0 + partition0Offset0Ms));
 
-    ingestionDelayTracker.updateIngestionDelay(offsetClock.millis() - partition0Delay1, partition0);
+    ingestionDelayTracker.updateIngestionDelay((offsetClock.millis() - partition0Delay1),
+        (offsetClock.millis() - partition0Delay1), partition0);
     Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition0), partition0Delay1);
+    Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition0), partition0Delay1);
+
     // Add some offset to the last sample and make sure we age that measure properly
     offsetClock = Clock.offset(offsetClock, Duration.ofMillis(partition0Offset1Ms));
     ingestionDelayTracker.setClock(offsetClock);
     Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition0),
         (partition0Delay1 + partition0Offset1Ms));
 
-    ingestionDelayTracker.updateIngestionDelay(offsetClock.millis() - partition1Delay0, partition1);
+    ingestionDelayTracker.updateIngestionDelay((offsetClock.millis() - partition1Delay0),
+        (offsetClock.millis() - partition1Delay0), partition1);
     Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partition1), partition1Delay0);
+    Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partition1), partition1Delay0);
+
     // Add some offset to the last sample and make sure we age that measure properly
     offsetClock = Clock.offset(offsetClock, Duration.ofMillis(partition1Offset0Ms));
     ingestionDelayTracker.setClock(offsetClock);
@@ -173,26 +191,45 @@ public void testStopTrackingIngestionDelay() {
 
     // Record a number of partitions with delay equal to partition id
     for (int partitionGroupId = 0; partitionGroupId <= maxTestDelay; partitionGroupId++) {
-      ingestionDelayTracker.updateIngestionDelay(clock.millis() - partitionGroupId, partitionGroupId);
+      ingestionDelayTracker.updateIngestionDelay((clock.millis() - partitionGroupId),
+          (clock.millis() - partitionGroupId), partitionGroupId);
       Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partitionGroupId), partitionGroupId);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partitionGroupId),
+          partitionGroupId);
     }
-    // Verify that as we remove partitions the next available maximum takes over
     for (int partitionGroupId = maxPartition; partitionGroupId >= 0; partitionGroupId--) {
       ingestionDelayTracker.stopTrackingPartitionIngestionDelay(partitionGroupId);
     }
     for (int partitionGroupId = 0; partitionGroupId <= maxTestDelay; partitionGroupId++) {
       // Untracked partitions must return 0
       Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partitionGroupId), 0);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partitionGroupId), 0);
     }
   }
 
   @Test
-  public void testTickInactivePartitions() {
-    Assert.assertTrue(true);
-  }
+  public void testShutdown() {
+    final long maxTestDelay = 100;
 
-  @Test
-  public void testMarkPartitionForConfirmation() {
-    Assert.assertTrue(true);
+    IngestionDelayTracker ingestionDelayTracker = createTracker();
+    // Use fixed clock so samples don't age
+    Instant now = Instant.now();
+    ZoneId zoneId = ZoneId.systemDefault();
+    Clock clock = Clock.fixed(now, zoneId);
+    ingestionDelayTracker.setClock(clock);
+
+    // Test Shutdown with partitions active
+    for (int partitionGroupId = 0; partitionGroupId <= maxTestDelay; partitionGroupId++) {
+      ingestionDelayTracker.updateIngestionDelay((clock.millis() - partitionGroupId),
+          (clock.millis() - partitionGroupId), partitionGroupId);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionIngestionDelayMs(partitionGroupId), partitionGroupId);
+      Assert.assertEquals(ingestionDelayTracker.getPartitionEndToEndIngestionDelayMs(partitionGroupId),
+          partitionGroupId);
+    }
+    ingestionDelayTracker.shutdown();
+
+    // Test shutdown with no partitions
+    ingestionDelayTracker = createTracker();
+    ingestionDelayTracker.shutdown();
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java
index b6c290cde64..95f19b419e7 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManagerTest.java
@@ -841,6 +841,7 @@ public void testShutdownTableDataManagerWillNotShutdownLeaseExtenderExecutor()
     when(tableDataManagerConfig.getTableName()).thenReturn(REALTIME_TABLE_NAME);
     when(tableDataManagerConfig.getTableType()).thenReturn(TableType.REALTIME);
     when(tableDataManagerConfig.getDataDir()).thenReturn(FileUtils.getTempDirectoryPath());
+    when(tableDataManagerConfig.getTableConfig()).thenReturn(tableConfig);
     InstanceDataManagerConfig instanceDataManagerConfig = mock(InstanceDataManagerConfig.class);
     when(instanceDataManagerConfig.getMaxParallelSegmentBuilds()).thenReturn(4);
     when(instanceDataManagerConfig.getStreamSegmentDownloadUntarRateLimit()).thenReturn(-1L);
@@ -1001,7 +1002,7 @@ public FakeLLRealtimeSegmentDataManager(SegmentZKMetadata segmentZKMetadata, Tab
         throws Exception {
       super(segmentZKMetadata, tableConfig, realtimeTableDataManager, resourceDataDir,
           new IndexLoadingConfig(makeInstanceDataManagerConfig(), tableConfig), schema, llcSegmentName,
-          semaphoreMap.get(llcSegmentName.getPartitionGroupId()), serverMetrics, null, null);
+          semaphoreMap.get(llcSegmentName.getPartitionGroupId()), serverMetrics, null, null, () -> true);
       _state = LLRealtimeSegmentDataManager.class.getDeclaredField("_state");
       _state.setAccessible(true);
       _shouldStop = LLRealtimeSegmentDataManager.class.getDeclaredField("_shouldStop");
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploaderTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploaderTest.java
index 62fa1a44efa..119b7cb7d11 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploaderTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/PinotFSSegmentUploaderTest.java
@@ -28,11 +28,13 @@
 import java.util.UUID;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.filesystem.BasePinotFS;
 import org.apache.pinot.spi.filesystem.PinotFSFactory;
 import org.apache.pinot.spi.utils.StringUtil;
+import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -42,6 +44,7 @@ public class PinotFSSegmentUploaderTest {
   private static final int TIMEOUT_IN_MS = 100;
   private File _file;
   private LLCSegmentName _llcSegmentName;
+  private ServerMetrics _serverMetrics = Mockito.mock(ServerMetrics.class);
 
   @BeforeClass
   public void setUp()
@@ -61,7 +64,7 @@ public void setUp()
 
   @Test
   public void testSuccessfulUpload() {
-    SegmentUploader segmentUploader = new PinotFSSegmentUploader("hdfs://root", TIMEOUT_IN_MS);
+    SegmentUploader segmentUploader = new PinotFSSegmentUploader("hdfs://root", TIMEOUT_IN_MS, _serverMetrics);
     URI segmentURI = segmentUploader.uploadSegment(_file, _llcSegmentName);
     Assert.assertTrue(segmentURI.toString().startsWith(StringUtil
         .join(File.separator, "hdfs://root", _llcSegmentName.getTableName(), _llcSegmentName.getSegmentName())));
@@ -69,7 +72,7 @@ public void testSuccessfulUpload() {
 
   @Test
   public void testSegmentAlreadyExist() {
-    SegmentUploader segmentUploader = new PinotFSSegmentUploader("existing://root", TIMEOUT_IN_MS);
+    SegmentUploader segmentUploader = new PinotFSSegmentUploader("existing://root", TIMEOUT_IN_MS, _serverMetrics);
     URI segmentURI = segmentUploader.uploadSegment(_file, _llcSegmentName);
     Assert.assertTrue(segmentURI.toString().startsWith(StringUtil
         .join(File.separator, "existing://root", _llcSegmentName.getTableName(), _llcSegmentName.getSegmentName())));
@@ -77,14 +80,14 @@ public void testSegmentAlreadyExist() {
 
   @Test
   public void testUploadTimeOut() {
-    SegmentUploader segmentUploader = new PinotFSSegmentUploader("timeout://root", TIMEOUT_IN_MS);
+    SegmentUploader segmentUploader = new PinotFSSegmentUploader("timeout://root", TIMEOUT_IN_MS, _serverMetrics);
     URI segmentURI = segmentUploader.uploadSegment(_file, _llcSegmentName);
     Assert.assertNull(segmentURI);
   }
 
   @Test
   public void testNoSegmentStoreConfigured() {
-    SegmentUploader segmentUploader = new PinotFSSegmentUploader("", TIMEOUT_IN_MS);
+    SegmentUploader segmentUploader = new PinotFSSegmentUploader("", TIMEOUT_IN_MS, _serverMetrics);
     URI segmentURI = segmentUploader.uploadSegment(_file, _llcSegmentName);
     Assert.assertNull(segmentURI);
   }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManagerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManagerTest.java
index 392e562fac2..45196e2730c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManagerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/RealtimeTableDataManagerTest.java
@@ -100,7 +100,7 @@ public void testAddSegmentUseBackupCopy()
     TableConfig tableConfig = setupTableConfig(propertyStore);
     Schema schema = setupSchema(propertyStore);
     tmgr.init(tableDataManagerConfig, "server01", propertyStore,
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null, null,
         new TableDataManagerParams(0, false, -1));
 
     // Create a dummy local segment.
@@ -135,7 +135,7 @@ public void testAddSegmentNoBackupCopy()
     TableConfig tableConfig = setupTableConfig(propertyStore);
     Schema schema = setupSchema(propertyStore);
     tmgr.init(tableDataManagerConfig, "server01", propertyStore,
-        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null,
+        new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), mock(HelixManager.class), null, null,
         new TableDataManagerParams(0, false, -1));
 
     // Create a raw segment and put it in deep store backed by local fs.
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactoryTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactoryTest.java
index c815d48a94c..8e60b1e4140 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactoryTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/SegmentCommitterFactoryTest.java
@@ -99,9 +99,11 @@ public void testUploadToDeepStoreConfig()
     Map<String, String> streamConfigMap = new HashMap<>(getMinimumStreamConfigMap());
     streamConfigMap.put(StreamConfigProperties.SERVER_UPLOAD_TO_DEEPSTORE, "true");
     TableConfig config = createRealtimeTableConfig("testDeepStoreConfig", streamConfigMap).build();
+    IndexLoadingConfig indexLoadingConfig = Mockito.mock(IndexLoadingConfig.class);
+    Mockito.when(indexLoadingConfig.getSegmentStoreURI()).thenReturn("file:///path/to/segment/store.txt");
 
     SegmentCommitterFactory factory = new SegmentCommitterFactory(Mockito.mock(Logger.class), protocolHandler, config,
-        Mockito.mock(IndexLoadingConfig.class), Mockito.mock(ServerMetrics.class));
+        indexLoadingConfig, Mockito.mock(ServerMetrics.class));
     SegmentCommitter committer = factory.createSegmentCommitter(true, requestParams, controllerVipUrl);
     Assert.assertNotNull(committer);
     Assert.assertTrue(committer instanceof SplitSegmentCommitter);
@@ -115,7 +117,7 @@ public void testUploadToDeepStoreConfig()
         .build();
 
     factory = new SegmentCommitterFactory(Mockito.mock(Logger.class), protocolHandler, config1,
-        Mockito.mock(IndexLoadingConfig.class), Mockito.mock(ServerMetrics.class));
+        indexLoadingConfig, Mockito.mock(ServerMetrics.class));
     committer = factory.createSegmentCommitter(true, requestParams, controllerVipUrl);
     Assert.assertNotNull(committer);
     Assert.assertTrue(committer instanceof SplitSegmentCommitter);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploaderTest.java b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploaderTest.java
index 86a7088d941..3dbcfa506c3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploaderTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/data/manager/realtime/Server2ControllerSegmentUploaderTest.java
@@ -91,7 +91,7 @@ public void testUploadSuccess()
       throws URISyntaxException {
     Server2ControllerSegmentUploader uploader =
         new Server2ControllerSegmentUploader(_logger, _fileUploadDownloadClient, GOOD_CONTROLLER_VIP, "segmentName",
-            10000, mock(ServerMetrics.class), null);
+            10000, mock(ServerMetrics.class), null, _llcSegmentName.getTableName());
     URI segmentURI = uploader.uploadSegment(_file, _llcSegmentName);
     Assert.assertEquals(segmentURI.toString(), SEGMENT_LOCATION);
   }
@@ -101,7 +101,7 @@ public void testUploadFailure()
       throws URISyntaxException {
     Server2ControllerSegmentUploader uploader =
         new Server2ControllerSegmentUploader(_logger, _fileUploadDownloadClient, BAD_CONTROLLER_VIP, "segmentName",
-            10000, mock(ServerMetrics.class), null);
+            10000, mock(ServerMetrics.class), null, _llcSegmentName.getTableName());
     URI segmentURI = uploader.uploadSegment(_file, _llcSegmentName);
     Assert.assertNull(segmentURI);
   }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/function/scalar/SketchFunctionsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/function/scalar/SketchFunctionsTest.java
new file mode 100644
index 00000000000..b62d363c4f6
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/function/scalar/SketchFunctionsTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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.pinot.core.function.scalar;
+
+import java.math.BigDecimal;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class SketchFunctionsTest {
+
+  private double thetaEstimate(byte[] bytes) {
+    return ObjectSerDeUtils.DATA_SKETCH_SER_DE.deserialize(bytes).getEstimate();
+  }
+
+  byte[] _bytes = {1, 2, 3};
+
+  Object[] _inputs = {
+      "string", 1, 1L, 1.0f, 1.0d, BigDecimal.valueOf(1), _bytes
+  };
+
+  @Test
+  public void testThetaSketchCreation() {
+    for (Object i : _inputs) {
+      Assert.assertEquals(thetaEstimate(SketchFunctions.toThetaSketch(i)), 1.0);
+      Assert.assertEquals(thetaEstimate(SketchFunctions.toThetaSketch(i, 1024)), 1.0);
+    }
+    Assert.assertEquals(thetaEstimate(SketchFunctions.toThetaSketch(null)), 0.0);
+    Assert.assertEquals(thetaEstimate(SketchFunctions.toThetaSketch(null, 1024)), 0.0);
+    Assert.assertThrows(IllegalArgumentException.class, () -> SketchFunctions.toThetaSketch(new Object()));
+    Assert.assertThrows(IllegalArgumentException.class, () -> SketchFunctions.toThetaSketch(new Object(), 1024));
+  }
+
+  private long hllEstimate(byte[] bytes) {
+    return ObjectSerDeUtils.HYPER_LOG_LOG_SER_DE.deserialize(bytes).cardinality();
+  }
+
+  @Test
+  public void hllCreation() {
+    for (Object i : _inputs) {
+      Assert.assertEquals(hllEstimate(SketchFunctions.toHLL(i)), 1);
+      Assert.assertEquals(hllEstimate(SketchFunctions.toHLL(i, 8)), 1);
+    }
+    Assert.assertEquals(hllEstimate(SketchFunctions.toHLL(null)), 0);
+    Assert.assertEquals(hllEstimate(SketchFunctions.toHLL(null, 8)), 0);
+  }
+
+  private double intTupleEstimate(byte[] bytes) {
+    return ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.deserialize(bytes).getEstimate();
+  }
+
+  @Test
+  public void intTupleSumCreation() {
+    for (Object i : _inputs) {
+      Assert.assertEquals(intTupleEstimate(SketchFunctions.toIntegerSumTupleSketch(i, 1)), 1.0d);
+      Assert.assertEquals(intTupleEstimate(SketchFunctions.toIntegerSumTupleSketch(i, 1, 16)), 1.0d);
+    }
+    Assert.assertEquals(intTupleEstimate(SketchFunctions.toIntegerSumTupleSketch(null, 1)), 0.0d);
+    Assert.assertEquals(intTupleEstimate(SketchFunctions.toIntegerSumTupleSketch(null, 1, 16)), 0.0d);
+    Assert.assertThrows(IllegalArgumentException.class, () -> SketchFunctions.toIntegerSumTupleSketch(new Object(), 1));
+    Assert.assertThrows(IllegalArgumentException.class,
+        () -> SketchFunctions.toIntegerSumTupleSketch(new Object(), 1, 1024));
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/minion/SegmentPurgerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/minion/SegmentPurgerTest.java
index 1866623fb65..2dd6b37a3e4 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/minion/SegmentPurgerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/minion/SegmentPurgerTest.java
@@ -31,10 +31,10 @@
 import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -67,6 +67,7 @@ public class SegmentPurgerTest {
   private static final String D2 = "d2";
 
   private TableConfig _tableConfig;
+  private Schema _schema;
   private File _originalIndexDir;
   private int _expectedNumRecordsPurged;
   private int _expectedNumRecordsModified;
@@ -79,7 +80,7 @@ public void setUp()
     _tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
         .setInvertedIndexColumns(Collections.singletonList(D1)).setCreateInvertedIndexDuringSegmentGeneration(true)
         .build();
-    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(D1, FieldSpec.DataType.INT)
+    _schema = new Schema.SchemaBuilder().addSingleValueDimension(D1, FieldSpec.DataType.INT)
         .addSingleValueDimension(D2, FieldSpec.DataType.INT).build();
 
     List<GenericRow> rows = new ArrayList<>(NUM_ROWS);
@@ -98,7 +99,7 @@ public void setUp()
     }
     GenericRowRecordReader genericRowRecordReader = new GenericRowRecordReader(rows);
 
-    SegmentGeneratorConfig config = new SegmentGeneratorConfig(_tableConfig, schema);
+    SegmentGeneratorConfig config = new SegmentGeneratorConfig(_tableConfig, _schema);
     config.setOutDir(ORIGINAL_SEGMENT_DIR.getPath());
     config.setSegmentName(SEGMENT_NAME);
 
@@ -125,7 +126,7 @@ public void testPurgeSegment()
     };
 
     SegmentPurger segmentPurger =
-        new SegmentPurger(_originalIndexDir, PURGED_SEGMENT_DIR, _tableConfig, recordPurger, recordModifier);
+        new SegmentPurger(_originalIndexDir, PURGED_SEGMENT_DIR, _tableConfig, _schema, recordPurger, recordModifier);
     File purgedIndexDir = segmentPurger.purgeSegment();
 
     // Check the purge/modify counter in segment purger
@@ -167,8 +168,8 @@ public void testPurgeSegment()
         .load(purgedIndexDir.toURI(), new SegmentDirectoryLoaderContext.Builder().setTableConfig(_tableConfig)
             .setSegmentName(purgedSegmentMetadata.getName()).setSegmentDirectoryConfigs(new PinotConfiguration(props))
             .build()); SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
-      assertTrue(reader.hasIndexFor(D1, ColumnIndexType.INVERTED_INDEX));
-      assertFalse(reader.hasIndexFor(D2, ColumnIndexType.INVERTED_INDEX));
+      assertTrue(reader.hasIndexFor(D1, StandardIndexes.inverted()));
+      assertFalse(reader.hasIndexFor(D2, StandardIndexes.inverted()));
     }
   }
 
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtilsTest.java
index eaf9d3fbe31..889c6582a57 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtilsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/blocks/results/ResultsBlockUtilsTest.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
 import org.testng.annotations.Test;
@@ -38,7 +39,7 @@ public void testBuildEmptyQueryResults()
     DataTable dataTable = ResultsBlockUtils.buildEmptyQueryResults(queryContext).getDataTable(queryContext);
     DataSchema dataSchema = dataTable.getDataSchema();
     assertEquals(dataSchema.getColumnNames(), new String[]{"*"});
-    assertEquals(dataSchema.getColumnDataTypes(), new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING});
+    assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{ColumnDataType.STRING});
     assertEquals(dataTable.getNumberOfRows(), 0);
 
     // Aggregation
@@ -46,9 +47,9 @@ public void testBuildEmptyQueryResults()
         QueryContextConverterUtils.getQueryContext("SELECT COUNT(*), SUM(a), MAX(b) FROM testTable WHERE foo = 'bar'");
     dataTable = ResultsBlockUtils.buildEmptyQueryResults(queryContext).getDataTable(queryContext);
     dataSchema = dataTable.getDataSchema();
-    assertEquals(dataSchema.getColumnNames(), new String[]{"count_star", "sum_a", "max_b"});
-    assertEquals(dataSchema.getColumnDataTypes(), new DataSchema.ColumnDataType[]{
-        DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE
+    assertEquals(dataSchema.getColumnNames(), new String[]{"count(*)", "sum(a)", "max(b)"});
+    assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{
+        ColumnDataType.LONG, ColumnDataType.DOUBLE, ColumnDataType.DOUBLE
     });
     assertEquals(dataTable.getNumberOfRows(), 1);
     assertEquals(dataTable.getLong(0, 0), 0L);
@@ -61,9 +62,8 @@ public void testBuildEmptyQueryResults()
     dataTable = ResultsBlockUtils.buildEmptyQueryResults(queryContext).getDataTable(queryContext);
     dataSchema = dataTable.getDataSchema();
     assertEquals(dataSchema.getColumnNames(), new String[]{"c", "d", "count(*)", "sum(a)", "max(b)"});
-    assertEquals(dataSchema.getColumnDataTypes(), new DataSchema.ColumnDataType[]{
-        DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.LONG,
-        DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE
+    assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{
+        ColumnDataType.STRING, ColumnDataType.STRING, ColumnDataType.LONG, ColumnDataType.DOUBLE, ColumnDataType.DOUBLE
     });
     assertEquals(dataTable.getNumberOfRows(), 0);
 
@@ -72,8 +72,9 @@ public void testBuildEmptyQueryResults()
     dataTable = ResultsBlockUtils.buildEmptyQueryResults(queryContext).getDataTable(queryContext);
     dataSchema = dataTable.getDataSchema();
     assertEquals(dataSchema.getColumnNames(), new String[]{"a", "b"});
-    assertEquals(dataSchema.getColumnDataTypes(), new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING,
-        DataSchema.ColumnDataType.STRING});
+    assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{
+        ColumnDataType.STRING, ColumnDataType.STRING
+    });
     assertEquals(dataTable.getNumberOfRows(), 0);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java
index 1f809b32db3..f7e8ee63ad5 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java
@@ -41,7 +41,6 @@
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
 import org.apache.pinot.spi.exception.EarlyTerminationException;
-import org.apache.pinot.spi.exception.QueryCancelledException;
 import org.apache.pinot.util.TestUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -117,7 +116,7 @@ public void testCancelSelectionOnlyCombineOperator() {
     queryContext.setEndTimeMs(System.currentTimeMillis() + 10000);
     SelectionOnlyCombineOperator combineOperator =
         new SelectionOnlyCombineOperator(operators, queryContext, _executorService);
-    testCancelCombineOperator(combineOperator, ready, "Cancelled while merging results blocks");
+    testCancelCombineOperator(combineOperator, ready);
   }
 
   @Test
@@ -128,7 +127,7 @@ public void testCancelSelectionOrderByCombineOperator() {
     queryContext.setEndTimeMs(System.currentTimeMillis() + 10000);
     SelectionOrderByCombineOperator combineOperator =
         new SelectionOrderByCombineOperator(operators, queryContext, _executorService);
-    testCancelCombineOperator(combineOperator, ready, "Cancelled while merging results blocks");
+    testCancelCombineOperator(combineOperator, ready);
   }
 
   @Test
@@ -148,7 +147,7 @@ public void testCancelMinMaxValueBasedSelectionOrderByCombineOperator() {
     queryContext.setEndTimeMs(System.currentTimeMillis() + 10000);
     MinMaxValueBasedSelectionOrderByCombineOperator combineOperator =
         new MinMaxValueBasedSelectionOrderByCombineOperator(operators, queryContext, _executorService);
-    testCancelCombineOperator(combineOperator, ready, "Cancelled while merging results blocks");
+    testCancelCombineOperator(combineOperator, ready);
   }
 
   @Test
@@ -159,7 +158,7 @@ public void testCancelAggregationOnlyCombineOperator() {
     queryContext.setEndTimeMs(System.currentTimeMillis() + 10000);
     AggregationCombineOperator combineOperator =
         new AggregationCombineOperator(operators, queryContext, _executorService);
-    testCancelCombineOperator(combineOperator, ready, "Cancelled while merging results blocks");
+    testCancelCombineOperator(combineOperator, ready);
   }
 
   @Test
@@ -170,10 +169,10 @@ public void testCancelGroupByOrderByCombineOperator() {
         QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable GROUP BY column");
     queryContext.setEndTimeMs(System.currentTimeMillis() + 10000);
     GroupByCombineOperator combineOperator = new GroupByCombineOperator(operators, queryContext, _executorService);
-    testCancelCombineOperator(combineOperator, ready, "Cancelled while merging results blocks");
+    testCancelCombineOperator(combineOperator, ready);
   }
 
-  private void testCancelCombineOperator(BaseCombineOperator combineOperator, CountDownLatch ready, String errMsg) {
+  private void testCancelCombineOperator(BaseCombineOperator combineOperator, CountDownLatch ready) {
     AtomicReference<Exception> exp = new AtomicReference<>();
     ExecutorService combineExecutor = Executors.newSingleThreadExecutor();
     try {
@@ -194,9 +193,8 @@ private void testCancelCombineOperator(BaseCombineOperator combineOperator, Coun
     } finally {
       combineExecutor.shutdownNow();
     }
-    TestUtils.waitForCondition((aVoid) -> exp.get() instanceof QueryCancelledException, 10_000,
+    TestUtils.waitForCondition((aVoid) -> exp.get() instanceof EarlyTerminationException, 10_000,
         "Should have been cancelled");
-    assertEquals(exp.get().getMessage(), errMsg);
   }
 
   /**
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/SelectionCombineOperatorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/SelectionCombineOperatorTest.java
index 88b81d5b886..ddbc4663e30 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/SelectionCombineOperatorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/SelectionCombineOperatorTest.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.PriorityQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.apache.commons.io.FileUtils;
@@ -36,6 +35,7 @@
 import org.apache.pinot.core.plan.maker.PlanMaker;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.core.util.QueryMultiThreadingUtils;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
 import org.apache.pinot.segment.local.indexsegment.mutable.MutableSegmentImpl;
 import org.apache.pinot.segment.local.io.writer.impl.DirectMemoryManager;
@@ -75,7 +75,7 @@ public class SelectionCombineOperatorTest {
   private static final String SEGMENT_NAME_PREFIX = "testSegment_";
 
   // Create (MAX_NUM_THREADS_PER_QUERY * 2) segments so that each thread needs to process 2 segments
-  private static final int NUM_SEGMENTS = CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY * 2;
+  private static final int NUM_SEGMENTS = QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY * 2;
   private static final int NUM_CONSUMING_SEGMENTS = NUM_SEGMENTS / 2;
   private static final String REALTIME_TABLE_NAME = RAW_TABLE_NAME + "_REALTIME";
   private static final int NUM_RECORDS_PER_SEGMENT = 100;
@@ -115,9 +115,7 @@ private IndexSegment createRealtimeSegment(int index)
 
     RealtimeSegmentConfig realtimeSegmentConfig = new RealtimeSegmentConfig.Builder()
         .setTableNameWithType(REALTIME_TABLE_NAME).setSegmentName(segmentName).setSchema(SCHEMA).setCapacity(100000)
-        .setAvgNumMultiValues(2).setNoDictionaryColumns(Collections.emptySet())
-        .setJsonIndexConfigs(Collections.emptyMap()).setVarLengthDictionaryColumns(Collections.emptySet())
-        .setInvertedIndexColumns(Collections.emptySet()).setSegmentZKMetadata(new SegmentZKMetadata(segmentName))
+        .setAvgNumMultiValues(2).setSegmentZKMetadata(new SegmentZKMetadata(segmentName))
         .setMemoryManager(new DirectMemoryManager(segmentName)).setStatsHistory(statsHistory).setAggregateMetrics(false)
         .setNullHandlingEnabled(true).setIngestionAggregationConfigs(Collections.emptyList()).build();
     MutableSegment mutableSegmentImpl = new MutableSegmentImpl(realtimeSegmentConfig, null);
@@ -178,27 +176,27 @@ public void testSelectionOnly() {
     // Should early-terminate after processing the result of the first segment. Each thread should process at most 1
     // segment.
     long numDocsScanned = combineResult.getNumDocsScanned();
-    assertTrue(numDocsScanned >= 10 && numDocsScanned <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY * 10);
+    assertTrue(numDocsScanned >= 10 && numDocsScanned <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY * 10);
     assertEquals(combineResult.getNumEntriesScannedInFilter(), 0);
     assertEquals(combineResult.getNumEntriesScannedPostFilter(), numDocsScanned);
     assertEquals(combineResult.getNumSegmentsProcessed(), NUM_SEGMENTS);
     assertEquals(combineResult.getNumConsumingSegmentsProcessed(), NUM_CONSUMING_SEGMENTS);
     int numSegmentsMatched = combineResult.getNumSegmentsMatched();
-    assertTrue(numSegmentsMatched >= 1 && numSegmentsMatched <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY);
+    assertTrue(numSegmentsMatched >= 1 && numSegmentsMatched <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY);
     // The check below depends on the order of segment processing. When segments# <= 10 (the value of
     // CombinePlanNode.TARGET_NUM_PLANS_PER_THREAD to be specific), the segments are processed in the order as they
     // are prepared, which is OFFLINE segments followed by RT segments and this case makes the value here equal to 0.
     // But when segments# > 10, the segments are processed in a different order and some RT segments can be processed
-    // ahead of the other OFFLINE segments, but no more than CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY for sure
+    // ahead of the other OFFLINE segments, but no more than TaskUtils.MAX_NUM_THREADS_PER_QUERY for sure
     // as each thread only processes one segment.
     int numConsumingSegmentsMatched = combineResult.getNumConsumingSegmentsMatched();
     if (NUM_SEGMENTS <= 10) {
       assertEquals(numConsumingSegmentsMatched, 0, "numSegments: " + NUM_SEGMENTS);
     } else {
       assertTrue(numConsumingSegmentsMatched >= 0
-          && numConsumingSegmentsMatched <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY, String
+          && numConsumingSegmentsMatched <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY, String
           .format("numConsumingSegmentsMatched: %d, maxThreadsPerQuery: %d, numSegments: %d",
-              combineResult.getNumConsumingSegmentsMatched(), CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY,
+              combineResult.getNumConsumingSegmentsMatched(), QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY,
               NUM_SEGMENTS));
     }
     assertEquals(combineResult.getNumTotalDocs(), NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT);
@@ -224,57 +222,56 @@ public void testSelectionOrderBy() {
     SelectionResultsBlock combineResult = getCombineResult("SELECT * FROM testTable ORDER BY intColumn");
     assertEquals(combineResult.getDataSchema(),
         new DataSchema(new String[]{INT_COLUMN}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT}));
-    PriorityQueue<Object[]> selectionResult = combineResult.getRowsAsPriorityQueue();
-    assertNotNull(selectionResult);
-    assertEquals(selectionResult.size(), 10);
-    int expectedValue = 9;
-    while (!selectionResult.isEmpty()) {
-      assertEquals((int) selectionResult.poll()[0], expectedValue--);
+    List<Object[]> rows = combineResult.getRows();
+    assertNotNull(rows);
+    assertEquals(rows.size(), 10);
+    for (int i = 0; i < 10; i++) {
+      assertEquals((int) rows.get(i)[0], i);
     }
     // Should early-terminate after processing the result of the first segment. Each thread should process at most 1
     // segment.
     long numDocsScanned = combineResult.getNumDocsScanned();
     // Need to scan 10 documents per segment because 'intColumn' is sorted
-    assertTrue(numDocsScanned >= 10 && numDocsScanned <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY * 10);
+    assertTrue(numDocsScanned >= 10 && numDocsScanned <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY * 10);
     assertEquals(combineResult.getNumEntriesScannedInFilter(), 0);
     assertEquals(combineResult.getNumEntriesScannedPostFilter(), numDocsScanned);
     assertEquals(combineResult.getNumSegmentsProcessed(), NUM_SEGMENTS);
     assertEquals(combineResult.getNumConsumingSegmentsProcessed(), NUM_CONSUMING_SEGMENTS);
     assertEquals(combineResult.getNumConsumingSegmentsMatched(), 0);
     int numSegmentsMatched = combineResult.getNumSegmentsMatched();
-    assertTrue(numSegmentsMatched >= 1 && numSegmentsMatched <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY);
+    assertTrue(numSegmentsMatched >= 1 && numSegmentsMatched <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY);
     assertEquals(combineResult.getNumTotalDocs(), NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT);
 
     combineResult = getCombineResult("SELECT * FROM testTable ORDER BY intColumn DESC");
     assertEquals(combineResult.getDataSchema(),
         new DataSchema(new String[]{INT_COLUMN}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT}));
-    selectionResult = combineResult.getRowsAsPriorityQueue();
-    assertNotNull(selectionResult);
-    assertEquals(selectionResult.size(), 10);
-    expectedValue = NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT / 2 + 40;
-    while (!selectionResult.isEmpty()) {
-      assertEquals((int) selectionResult.poll()[0], expectedValue++);
+    rows = combineResult.getRows();
+    assertNotNull(rows);
+    assertEquals(rows.size(), 10);
+    int expectedValue = NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT / 2 + 49;
+    for (int i = 0; i < 10; i++) {
+      assertEquals((int) rows.get(i)[0], expectedValue - i);
     }
     // Should early-terminate after processing the result of the first segment. Each thread should process at most 1
     // segment.
     numDocsScanned = combineResult.getNumDocsScanned();
     assertTrue(numDocsScanned >= NUM_RECORDS_PER_SEGMENT
-        && numDocsScanned <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY * NUM_RECORDS_PER_SEGMENT);
+        && numDocsScanned <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY * NUM_RECORDS_PER_SEGMENT);
     assertEquals(combineResult.getNumEntriesScannedInFilter(), 0);
     assertEquals(combineResult.getNumEntriesScannedPostFilter(), numDocsScanned);
     assertEquals(combineResult.getNumSegmentsProcessed(), NUM_SEGMENTS);
     assertEquals(combineResult.getNumConsumingSegmentsProcessed(), NUM_CONSUMING_SEGMENTS);
     assertEquals(combineResult.getNumConsumingSegmentsMatched(), NUM_CONSUMING_SEGMENTS);
     numSegmentsMatched = combineResult.getNumSegmentsMatched();
-    assertTrue(numSegmentsMatched >= 1 && numSegmentsMatched <= CombineOperatorUtils.MAX_NUM_THREADS_PER_QUERY);
+    assertTrue(numSegmentsMatched >= 1 && numSegmentsMatched <= QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY);
     assertEquals(combineResult.getNumTotalDocs(), NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT);
 
     combineResult = getCombineResult("SELECT * FROM testTable ORDER BY intColumn DESC LIMIT 10000");
     assertEquals(combineResult.getDataSchema(),
         new DataSchema(new String[]{INT_COLUMN}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT}));
-    selectionResult = combineResult.getRowsAsPriorityQueue();
-    assertNotNull(selectionResult);
-    assertEquals(selectionResult.size(), NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT);
+    rows = combineResult.getRows();
+    assertNotNull(rows);
+    assertEquals(rows.size(), NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT);
     // Should not early-terminate
     numDocsScanned = combineResult.getNumDocsScanned();
     assertEquals(numDocsScanned, NUM_SEGMENTS * NUM_RECORDS_PER_SEGMENT);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/FilterOperatorUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/FilterOperatorUtilsTest.java
index ef5f781fcea..8eaae209625 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/FilterOperatorUtilsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/FilterOperatorUtilsTest.java
@@ -18,12 +18,21 @@
  */
 package org.apache.pinot.core.operator.filter;
 
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.OptionalInt;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.FilterBlock;
 import org.apache.pinot.core.query.request.context.QueryContext;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 
@@ -101,4 +110,81 @@ public void testGetOrFilterOperator() {
         Arrays.asList(MATCH_ALL_FILTER_OPERATOR, REGULAR_FILTER_OPERATOR), NUM_DOCS);
     assertTrue(filterOperator instanceof MatchAllFilterOperator);
   }
+
+  @DataProvider
+  public static Object[][] priorities() {
+    SortedIndexBasedFilterOperator sorted = mock(SortedIndexBasedFilterOperator.class);
+    BitmapBasedFilterOperator bitmap = mock(BitmapBasedFilterOperator.class);
+    RangeIndexBasedFilterOperator range = mock(RangeIndexBasedFilterOperator.class);
+    TextContainsFilterOperator textContains = mock(TextContainsFilterOperator.class);
+    TextMatchFilterOperator textMatch = mock(TextMatchFilterOperator.class);
+    JsonMatchFilterOperator jsonMatch = mock(JsonMatchFilterOperator.class);
+    H3IndexFilterOperator h3 = mock(H3IndexFilterOperator.class);
+    H3InclusionIndexFilterOperator h3Inclusion = mock(H3InclusionIndexFilterOperator.class);
+    AndFilterOperator andFilterOperator = mock(AndFilterOperator.class);
+    OrFilterOperator orFilterOperator = mock(OrFilterOperator.class);
+    NotFilterOperator notWithHighPriority = new NotFilterOperator(sorted, NUM_DOCS);
+    NotFilterOperator notWithLowPriority = new NotFilterOperator(orFilterOperator, NUM_DOCS);
+
+    ExpressionFilterOperator expression = mock(ExpressionFilterOperator.class);
+    BaseFilterOperator unknown = mock(BaseFilterOperator.class);
+
+    MockedPrioritizedFilterOperator prioritizedBetweenSortedAndBitmap = mock(MockedPrioritizedFilterOperator.class);
+    OptionalInt betweenSortedAndBitmapPriority =
+        OptionalInt.of((PrioritizedFilterOperator.HIGH_PRIORITY + PrioritizedFilterOperator.MEDIUM_PRIORITY) / 2);
+    when(prioritizedBetweenSortedAndBitmap.getPriority())
+        .thenReturn(betweenSortedAndBitmapPriority);
+
+    MockedPrioritizedFilterOperator notPrioritized = mock(MockedPrioritizedFilterOperator.class);
+    when(prioritizedBetweenSortedAndBitmap.getPriority())
+        .thenReturn(OptionalInt.empty());
+
+    List<? extends List<? extends BaseFilterOperator>> expectedOrder = Lists.newArrayList(
+        Lists.newArrayList(sorted, notWithHighPriority),
+        Lists.newArrayList(bitmap),
+        Lists.newArrayList(range, textContains, textMatch, jsonMatch, h3, h3Inclusion),
+        Lists.newArrayList(andFilterOperator),
+        Lists.newArrayList(orFilterOperator, notWithLowPriority),
+        Lists.newArrayList(expression),
+        Lists.newArrayList(unknown, notPrioritized)
+    );
+
+    List<Object[]> cases = new ArrayList<>();
+    for (int i = 0; i < expectedOrder.size(); i++) {
+      List<? extends BaseFilterOperator> currentOps = expectedOrder.get(i);
+      for (BaseFilterOperator highPriorityOp : currentOps) {
+        for (int j = i + 1; j < expectedOrder.size(); j++) {
+          List<? extends BaseFilterOperator> lowerPriorityOps = expectedOrder.get(j);
+          for (BaseFilterOperator lowerPriorityOp : lowerPriorityOps) {
+            cases.add(new Object[] {highPriorityOp, lowerPriorityOp});
+          }
+        }
+      }
+    }
+    return cases.toArray(new Object[][]{});
+  }
+
+  @Test(dataProvider = "priorities")
+  public void testPriority(BaseFilterOperator highPriorty, BaseFilterOperator lowerPriorty) {
+    ArrayList<BaseFilterOperator> unsorted = Lists.newArrayList(lowerPriorty, highPriorty);
+    BaseFilterOperator filterOperator =
+        FilterOperatorUtils.getAndFilterOperator(QUERY_CONTEXT, unsorted, NUM_DOCS);
+    assertTrue(filterOperator instanceof AndFilterOperator);
+    List<Operator> actualChildOperators = ((AndFilterOperator) filterOperator).getChildOperators();
+    assertEquals(actualChildOperators, Lists.newArrayList(highPriorty, lowerPriorty), "Filter " + highPriorty
+        + " should have more priority than filter " + lowerPriorty);
+  }
+
+  private void assertOrder(BaseFilterOperator first, BaseFilterOperator second) {
+    BaseFilterOperator filterOperator =
+        FilterOperatorUtils.getAndFilterOperator(QUERY_CONTEXT, Lists.newArrayList(second, first), NUM_DOCS);
+    assertTrue(filterOperator instanceof AndFilterOperator);
+    List<Operator> actualChildOperators = ((AndFilterOperator) filterOperator).getChildOperators();
+    assertEquals(actualChildOperators, Lists.newArrayList(first, second), "Filter " + first + " should have "
+        + "more priority than filter " + second);
+  }
+
+  private static abstract class MockedPrioritizedFilterOperator extends BaseFilterOperator
+      implements PrioritizedFilterOperator<FilterBlock> {
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java
index 4bcc9381187..94526dfc51e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java
@@ -21,9 +21,9 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.segment.spi.Constants;
 
 
@@ -38,7 +38,7 @@ public TestFilterOperator(int[] docIds) {
 
   @Override
   protected FilterBlock getNextBlock() {
-    return new FilterBlock(new FilterBlockDocIdSet() {
+    return new FilterBlock(new BlockDocIdSet() {
       @Override
       public BlockDocIdIterator iterator() {
         return new BlockDocIdIterator() {
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactoryTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactoryTest.java
new file mode 100644
index 00000000000..8e83e2b2177
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/predicate/InPredicateEvaluatorFactoryTest.java
@@ -0,0 +1,115 @@
+/**
+ * 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.pinot.core.operator.filter.predicate;
+
+import com.google.common.collect.Lists;
+import java.math.BigDecimal;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.predicate.InPredicate;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.MultiValueVisitor;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class InPredicateEvaluatorFactoryTest {
+
+  MultiValueVisitor<Integer> createValueLengthVisitor() {
+    return new MultiValueVisitor<Integer>() {
+      @Override
+      public Integer visitInt(int[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitLong(long[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitFloat(float[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitDouble(double[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitBigDecimal(BigDecimal[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitBoolean(boolean[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitTimestamp(long[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitString(String[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitJson(String[] value) {
+        return value.length;
+      }
+
+      @Override
+      public Integer visitBytes(byte[][] value) {
+        return value.length;
+      }
+    };
+  }
+
+  @Test
+  void canBeVisited() {
+    // Given a visitor
+    MultiValueVisitor<Integer> valueLengthVisitor = Mockito.spy(createValueLengthVisitor());
+
+    // When int predicate is used
+    InPredicate predicate = new InPredicate(ExpressionContext.forIdentifier("ident"), Lists.newArrayList("1", "2"));
+
+    InPredicateEvaluatorFactory.InRawPredicateEvaluator intEvaluator =
+        InPredicateEvaluatorFactory.newRawValueBasedEvaluator(predicate, FieldSpec.DataType.INT);
+
+    // Only the int[] method is called
+    int length = intEvaluator.accept(valueLengthVisitor);
+    Assert.assertEquals(length, 2);
+    Mockito.verify(valueLengthVisitor).visitInt(new int[] {2, 1});
+    Mockito.verifyNoMoreInteractions(valueLengthVisitor);
+
+    // And given a string predicate
+    InPredicateEvaluatorFactory.InRawPredicateEvaluator strEvaluator =
+        InPredicateEvaluatorFactory.newRawValueBasedEvaluator(predicate, FieldSpec.DataType.STRING);
+
+    // Only the string[] method is called
+    length = strEvaluator.accept(valueLengthVisitor);
+    Assert.assertEquals(length, 2);
+    Mockito.verify(valueLengthVisitor).visitString(new String[] {"2", "1"});
+    Mockito.verifyNoMoreInteractions(valueLengthVisitor);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperatorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperatorTest.java
index b7e2a2b6deb..b7ed828aa2f 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperatorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/query/LinearSelectionOrderByOperatorTest.java
@@ -19,9 +19,7 @@
 package org.apache.pinot.core.operator.query;
 
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import org.apache.pinot.core.operator.query.LinearSelectionOrderByOperator.PartiallySortedListBuilder;
 import org.apache.pinot.core.operator.query.LinearSelectionOrderByOperator.TotallySortedListBuilder;
 import org.testng.annotations.Test;
@@ -67,7 +65,7 @@ public void testTotallySortedListBuilder() {
   public void testPartiallySortedListBuilder() {
     int maxNumRows = 10;
     Comparator<Object[]> partitionComparator = Comparator.comparingInt(row -> (Integer) row[0]);
-    Comparator<Object[]> unsortedComparator = (row1, row2) -> Integer.compare((Integer) row2[1], (Integer) row1[1]);
+    Comparator<Object[]> unsortedComparator = Comparator.comparingInt(row -> (Integer) row[1]);
 
     // Enough rows collected without tie rows
     PartiallySortedListBuilder listBuilder =
@@ -81,7 +79,7 @@ public void testPartiallySortedListBuilder() {
     List<Object[]> rows = listBuilder.build();
     assertEquals(rows.size(), maxNumRows);
     for (int i = 0; i < maxNumRows; i++) {
-      assertEquals(rows.get(i), new Object[]{i / 2, maxNumRows - i});
+      assertEquals(rows.get(i), new Object[]{i / 2, i % 2 == 0 ? maxNumRows - i - 1 : maxNumRows - i + 1});
     }
 
     // Enough rows collected with tie rows
@@ -98,19 +96,13 @@ public void testPartiallySortedListBuilder() {
     rows = listBuilder.build();
     assertEquals(rows.size(), maxNumRows);
     // For the last partition, should contain unsorted value 0 and 1
-    Set<Integer> unsortedValues = new HashSet<>();
     for (int i = 0; i < maxNumRows; i++) {
       if (i / 2 != lastPartitionValue) {
-        assertEquals(rows.get(i), new Object[]{i / 2, maxNumRows - i});
+        assertEquals(rows.get(i), new Object[]{i / 2, i % 2 == 0 ? maxNumRows - i - 1 : maxNumRows - i + 1});
       } else {
-        Object[] row = rows.get(i);
-        assertEquals(row[0], lastPartitionValue);
-        int unsortedValue = (int) row[1];
-        assertTrue(unsortedValue == 0 || unsortedValue == 1);
-        unsortedValues.add(unsortedValue);
+        assertEquals(rows.get(i), new Object[]{lastPartitionValue, i % 2});
       }
     }
-    assertEquals(unsortedValues.size(), 2);
 
     // Not enough rows collected with tie rows
     listBuilder = new PartiallySortedListBuilder(maxNumRows, partitionComparator, unsortedComparator);
@@ -125,18 +117,12 @@ public void testPartiallySortedListBuilder() {
     rows = listBuilder.build();
     assertEquals(rows.size(), maxNumRows);
     // For the last partition, should contain unsorted value 0 and 1
-    unsortedValues = new HashSet<>();
     for (int i = 0; i < maxNumRows; i++) {
       if (i / 2 != lastPartitionValue) {
-        assertEquals(rows.get(i), new Object[]{i / 2, maxNumRows - i});
+        assertEquals(rows.get(i), new Object[]{i / 2, i % 2 == 0 ? maxNumRows - i - 1 : maxNumRows - i + 1});
       } else {
-        Object[] row = rows.get(i);
-        assertEquals(row[0], lastPartitionValue);
-        int unsortedValue = (int) row[1];
-        assertTrue(unsortedValue == 0 || unsortedValue == 1);
-        unsortedValues.add(unsortedValue);
+        assertEquals(rows.get(i), new Object[]{lastPartitionValue, i % 2});
       }
     }
-    assertEquals(unsortedValues.size(), 2);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperatorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperatorTest.java
new file mode 100644
index 00000000000..fb583146ca9
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperatorTest.java
@@ -0,0 +1,122 @@
+/**
+ * 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.pinot.core.operator.streaming;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.core.plan.ProjectPlanNode;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
+import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertNull;
+
+
+public class StreamingSelectionOnlyOperatorTest {
+  private static final File TEMP_DIR = new File(FileUtils.getTempDirectory(), "StreamingSelectionOperatorTest");
+  private static final String RAW_TABLE_NAME = "testTable";
+  private static final String SEGMENT_NAME = "testSegment";
+
+  private static final String INT_COLUMN = "intColumn";
+  private static final TableConfig TABLE_CONFIG =
+      new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+  private static final Schema SCHEMA =
+      new Schema.SchemaBuilder().addSingleValueDimension(INT_COLUMN, FieldSpec.DataType.INT).build();
+  private IndexSegment _segmentWithNullValues;
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    FileUtils.deleteDirectory(TEMP_DIR);
+    _segmentWithNullValues = createOfflineSegmentWithNullValue();
+  }
+
+  @Test
+  public void testNullHandling() {
+    QueryContext queryContext =
+        QueryContextConverterUtils.getQueryContext("SELECT * FROM testTable WHERE intColumn IS NULL");
+    queryContext.setNullHandlingEnabled(true);
+    List<ExpressionContext> expressions =
+        SelectionOperatorUtils.extractExpressions(queryContext, _segmentWithNullValues);
+    BaseProjectOperator<?> projectOperator = new ProjectPlanNode(_segmentWithNullValues, queryContext, expressions,
+        DocIdSetPlanNode.MAX_DOC_PER_CALL).run();
+
+    StreamingSelectionOnlyOperator operator = new StreamingSelectionOnlyOperator(
+        _segmentWithNullValues,
+        queryContext,
+        expressions,
+        projectOperator
+    );
+    SelectionResultsBlock block = operator.getNextBlock();
+    List<Object[]> rows = block.getRows();
+    assertNull(rows.get(0)[0], "Column value should be 'null' when null handling is enabled");
+  }
+
+  private IndexSegment createOfflineSegmentWithNullValue()
+      throws Exception {
+
+    List<GenericRow> records = new ArrayList<>();
+
+    // Add one row with null value
+    GenericRow record = new GenericRow();
+    record.addNullValueField(INT_COLUMN);
+    records.add(record);
+
+    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(TABLE_CONFIG, SCHEMA);
+    segmentGeneratorConfig.setTableName(RAW_TABLE_NAME);
+    segmentGeneratorConfig.setSegmentName(SEGMENT_NAME);
+    segmentGeneratorConfig.setNullHandlingEnabled(true);
+    segmentGeneratorConfig.setOutDir(TEMP_DIR.getPath());
+
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    driver.init(segmentGeneratorConfig, new GenericRowRecordReader(records));
+    driver.build();
+
+    return ImmutableSegmentLoader.load(new File(TEMP_DIR, SEGMENT_NAME), ReadMode.mmap);
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws IOException {
+    _segmentWithNullValues.destroy();
+    FileUtils.deleteDirectory(TEMP_DIR);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java
index 744aa1cec4f..2ffa0d57930 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java
@@ -22,6 +22,7 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -99,4 +100,39 @@ public Object[][] testIllegalArguments() {
     }
     };
   }
+
+  @Test
+  public void testAdditionNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("add(%s,null)", INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof AdditionTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), AdditionTransformFunction.FUNCTION_NAME);
+    double[] expectedValues = new double[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      expectedValues[i] = _intSVValues[i];
+    }
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testAdditionNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("add(%s,%s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof AdditionTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), AdditionTransformFunction.FUNCTION_NAME);
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedValues[i] = (double) Integer.MIN_VALUE + (double) _intSVValues[i];
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (double) _intSVValues[i] * 2;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java
index a0aece3a1f8..a909701d611 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java
@@ -19,6 +19,11 @@
 package org.apache.pinot.core.operator.transform.function;
 
 import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 
 public class AndOperatorTransformFunctionTest extends LogicalOperatorTransformFunctionTest {
@@ -32,4 +37,35 @@ boolean getExpectedValue(boolean left, boolean right) {
   String getFunctionName() {
     return TransformFunctionType.AND.getName();
   }
+
+  @Test
+  public void testAndNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("and(%s,null)", INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof AndOperatorTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.AND.getName());
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testAndNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("and(%s,%s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof AndOperatorTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.AND.getName());
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (_intSVValues[i] == 0) ? 0 : 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java
index 870861c884d..985dac3cee4 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java
@@ -22,6 +22,7 @@
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -76,6 +77,71 @@ public void testArrayTransformFunction() {
     }
   }
 
+  @Test
+  public void testArrayNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("%s(%s)", getFunctionName(), INT_MV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertEquals(transformFunction.getClass().getName(), getArrayFunctionClass().getName());
+    Assert.assertEquals(transformFunction.getName(), getFunctionName());
+    Assert.assertEquals(transformFunction.getResultMetadata().getDataType(), getResultDataType(FieldSpec.DataType.INT));
+    Assert.assertTrue(transformFunction.getResultMetadata().isSingleValue());
+    Assert.assertFalse(transformFunction.getResultMetadata().hasDictionary());
+
+    RoaringBitmap expectedNulls = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNulls.add(i);
+      }
+    }
+    testNullBitmap(transformFunction, expectedNulls);
+
+    switch (getResultDataType(FieldSpec.DataType.INT)) {
+      case INT:
+        int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+        for (int i = 0; i < NUM_ROWS; i++) {
+          if (!isNullRow(i)) {
+            Assert.assertEquals(intValues[i], getExpectResult(_intMVValues[i]));
+          }
+        }
+        break;
+      case LONG:
+        long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
+        for (int i = 0; i < NUM_ROWS; i++) {
+          if (!isNullRow(i)) {
+            Assert.assertEquals(longValues[i], getExpectResult(_intMVValues[i]));
+          }
+        }
+        break;
+      case FLOAT:
+        float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
+        for (int i = 0; i < NUM_ROWS; i++) {
+          if (!isNullRow(i)) {
+            Assert.assertEquals(floatValues[i], getExpectResult(_intMVValues[i]));
+          }
+        }
+        break;
+      case DOUBLE:
+        double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+        for (int i = 0; i < NUM_ROWS; i++) {
+          if (!isNullRow(i)) {
+            Assert.assertEquals(doubleValues[i], getExpectResult(_intMVValues[i]));
+          }
+        }
+        break;
+      case STRING:
+        String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
+        for (int i = 0; i < NUM_ROWS; i++) {
+          if (!isNullRow(i)) {
+            Assert.assertEquals(stringValues[i], getExpectResult(_intMVValues[i]));
+          }
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
   @Test(dataProvider = "testIllegalArguments", expectedExceptions = {BadQueryRequestException.class})
   public void testIllegalArguments(String expressionStr) {
     ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java
index 0aa57af3c27..d36bbd32504 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java
@@ -56,6 +56,7 @@
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 
@@ -71,14 +72,23 @@ public abstract class BaseTransformFunctionTest {
   protected static final int MAX_NUM_MULTI_VALUES = 5;
   protected static final int MAX_MULTI_VALUE = 10;
   protected static final String INT_SV_COLUMN = "intSV";
+  // INT_SV_NULL_COLUMN's even row equals to INT_SV_COLUMN. odd row is null.
+  protected static final String INT_SV_NULL_COLUMN = "intSVNull";
   protected static final String LONG_SV_COLUMN = "longSV";
   protected static final String FLOAT_SV_COLUMN = "floatSV";
   protected static final String DOUBLE_SV_COLUMN = "doubleSV";
   protected static final String BIG_DECIMAL_SV_COLUMN = "bigDecimalSV";
   protected static final String STRING_SV_COLUMN = "stringSV";
+  protected static final String STRING_SV_NULL_COLUMN = "stringSVNull";
+
   protected static final String BYTES_SV_COLUMN = "bytesSV";
   protected static final String STRING_ALPHANUM_SV_COLUMN = "stringAlphaNumSV";
+
+  protected static final String STRING_ALPHANUM_NULL_SV_COLUMN = "stringAlphaNumSVNull";
+
   protected static final String INT_MV_COLUMN = "intMV";
+  protected static final String INT_MV_NULL_COLUMN = "intMVNull";
+
   protected static final String LONG_MV_COLUMN = "longMV";
   protected static final String FLOAT_MV_COLUMN = "floatMV";
   protected static final String DOUBLE_MV_COLUMN = "doubleMV";
@@ -87,6 +97,8 @@ public abstract class BaseTransformFunctionTest {
   protected static final String STRING_LONG_MV_COLUMN = "stringLongMV";
   protected static final String TIME_COLUMN = "timeColumn";
   protected static final String TIMESTAMP_COLUMN = "timestampColumn";
+  protected static final String TIMESTAMP_COLUMN_NULL = "timestampColumnNull";
+
   protected static final String JSON_COLUMN = "json";
   protected static final String DEFAULT_JSON_COLUMN = "defaultJson";
   protected final int[] _intSVValues = new int[NUM_ROWS];
@@ -154,14 +166,34 @@ public void setUp()
     for (int i = 0; i < NUM_ROWS; i++) {
       Map<String, Object> map = new HashMap<>();
       map.put(INT_SV_COLUMN, _intSVValues[i]);
+      if (isNullRow(i)) {
+        map.put(INT_SV_NULL_COLUMN, null);
+      } else {
+        map.put(INT_SV_NULL_COLUMN, _intSVValues[i]);
+      }
       map.put(LONG_SV_COLUMN, _longSVValues[i]);
       map.put(FLOAT_SV_COLUMN, _floatSVValues[i]);
       map.put(DOUBLE_SV_COLUMN, _doubleSVValues[i]);
       map.put(BIG_DECIMAL_SV_COLUMN, _bigDecimalSVValues[i]);
       map.put(STRING_SV_COLUMN, _stringSVValues[i]);
+      if (isNullRow(i)) {
+        map.put(STRING_SV_NULL_COLUMN, null);
+      } else {
+        map.put(STRING_SV_NULL_COLUMN, _stringSVValues[i]);
+      }
       map.put(STRING_ALPHANUM_SV_COLUMN, _stringAlphaNumericSVValues[i]);
+      if (isNullRow(i)) {
+        map.put(STRING_ALPHANUM_NULL_SV_COLUMN, null);
+      } else {
+        map.put(STRING_ALPHANUM_NULL_SV_COLUMN, _stringAlphaNumericSVValues[i]);
+      }
       map.put(BYTES_SV_COLUMN, _bytesSVValues[i]);
       map.put(INT_MV_COLUMN, ArrayUtils.toObject(_intMVValues[i]));
+      if (isNullRow(i)) {
+        map.put(INT_MV_NULL_COLUMN, null);
+      } else {
+        map.put(INT_MV_NULL_COLUMN, ArrayUtils.toObject(_intMVValues[i]));
+      }
       map.put(LONG_MV_COLUMN, ArrayUtils.toObject(_longMVValues[i]));
       map.put(FLOAT_MV_COLUMN, ArrayUtils.toObject(_floatMVValues[i]));
       map.put(DOUBLE_MV_COLUMN, ArrayUtils.toObject(_doubleMVValues[i]));
@@ -169,6 +201,11 @@ public void setUp()
       map.put(STRING_ALPHANUM_MV_COLUMN, _stringAlphaNumericMVValues[i]);
       map.put(STRING_LONG_MV_COLUMN, _stringLongFormatMVValues[i]);
       map.put(TIMESTAMP_COLUMN, _timeValues[i]);
+      if (isNullRow(i)) {
+        map.put(TIMESTAMP_COLUMN_NULL, null);
+      } else {
+        map.put(TIMESTAMP_COLUMN_NULL, _timeValues[i]);
+      }
       map.put(TIME_COLUMN, _timeValues[i]);
       _jsonValues[i] = JsonUtils.objectToJsonNode(map).toString();
       map.put(JSON_COLUMN, _jsonValues[i]);
@@ -178,16 +215,20 @@ public void setUp()
     }
 
     Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(INT_SV_COLUMN, FieldSpec.DataType.INT)
+        .addSingleValueDimension(INT_SV_NULL_COLUMN, FieldSpec.DataType.INT)
         .addSingleValueDimension(LONG_SV_COLUMN, FieldSpec.DataType.LONG)
         .addSingleValueDimension(FLOAT_SV_COLUMN, FieldSpec.DataType.FLOAT)
         .addSingleValueDimension(DOUBLE_SV_COLUMN, FieldSpec.DataType.DOUBLE)
         .addMetric(BIG_DECIMAL_SV_COLUMN, FieldSpec.DataType.BIG_DECIMAL)
         .addSingleValueDimension(STRING_SV_COLUMN, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(STRING_SV_NULL_COLUMN, FieldSpec.DataType.STRING)
         .addSingleValueDimension(STRING_ALPHANUM_SV_COLUMN, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(STRING_ALPHANUM_NULL_SV_COLUMN, FieldSpec.DataType.STRING)
         .addSingleValueDimension(BYTES_SV_COLUMN, FieldSpec.DataType.BYTES)
         .addSingleValueDimension(JSON_COLUMN, FieldSpec.DataType.JSON)
         .addSingleValueDimension(DEFAULT_JSON_COLUMN, FieldSpec.DataType.JSON)
         .addMultiValueDimension(INT_MV_COLUMN, FieldSpec.DataType.INT)
+        .addMultiValueDimension(INT_MV_NULL_COLUMN, FieldSpec.DataType.INT)
         .addMultiValueDimension(LONG_MV_COLUMN, FieldSpec.DataType.LONG)
         .addMultiValueDimension(FLOAT_MV_COLUMN, FieldSpec.DataType.FLOAT)
         .addMultiValueDimension(DOUBLE_MV_COLUMN, FieldSpec.DataType.DOUBLE)
@@ -195,9 +236,11 @@ public void setUp()
         .addMultiValueDimension(STRING_ALPHANUM_MV_COLUMN, FieldSpec.DataType.STRING)
         .addMultiValueDimension(STRING_LONG_MV_COLUMN, FieldSpec.DataType.STRING)
         .addDateTime(TIMESTAMP_COLUMN, FieldSpec.DataType.TIMESTAMP, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
+        .addDateTime(TIMESTAMP_COLUMN_NULL, FieldSpec.DataType.TIMESTAMP, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
         .addTime(new TimeGranularitySpec(FieldSpec.DataType.LONG, TimeUnit.MILLISECONDS, TIME_COLUMN), null).build();
     TableConfig tableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName("test").setTimeColumnName(TIME_COLUMN).build();
+        new TableConfigBuilder(TableType.OFFLINE).setTableName("test").setTimeColumnName(TIME_COLUMN)
+            .setNullHandlingEnabled(true).build();
 
     SegmentGeneratorConfig config = new SegmentGeneratorConfig(tableConfig, schema);
     config.setOutDir(INDEX_DIR_PATH);
@@ -217,6 +260,15 @@ public void setUp()
         new DocIdSetOperator(new MatchAllFilterOperator(NUM_ROWS), DocIdSetPlanNode.MAX_DOC_PER_CALL)).nextBlock();
   }
 
+  protected boolean isNullRow(int i) {
+    return i % 2 != 0;
+  }
+
+  protected void testNullBitmap(TransformFunction transformFunction, RoaringBitmap expectedNull) {
+    RoaringBitmap nullBitmap = transformFunction.getNullBitmap(_projectionBlock);
+    assertEquals(nullBitmap, expectedNull);
+  }
+
   protected void testTransformFunction(TransformFunction transformFunction, int[] expectedValues) {
     int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
@@ -232,6 +284,31 @@ protected void testTransformFunction(TransformFunction transformFunction, int[]
       assertEquals(bigDecimalValues[i].intValue(), expectedValues[i]);
       assertEquals(stringValues[i], Integer.toString(expectedValues[i]));
     }
+    testNullBitmap(transformFunction, null);
+  }
+
+  protected void testTransformFunctionWithNull(TransformFunction transformFunction, int[] expectedValues,
+      RoaringBitmap expectedNull) {
+    int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+    long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
+    float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    BigDecimal[] bigDecimalValues =
+        transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
+    String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (expectedNull.contains(i)) {
+        continue;
+      }
+      // only compare the rows that are not null.
+      assertEquals(intValues[i], expectedValues[i]);
+      assertEquals(longValues[i], expectedValues[i]);
+      assertEquals(floatValues[i], (float) expectedValues[i]);
+      assertEquals(doubleValues[i], (double) expectedValues[i]);
+      assertEquals(bigDecimalValues[i].intValue(), expectedValues[i]);
+      assertEquals(stringValues[i], Integer.toString(expectedValues[i]));
+    }
+    testNullBitmap(transformFunction, expectedNull);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, long[] expectedValues) {
@@ -249,6 +326,31 @@ protected void testTransformFunction(TransformFunction transformFunction, long[]
       assertEquals(bigDecimalValues[i].longValue(), expectedValues[i]);
       assertEquals(stringValues[i], Long.toString(expectedValues[i]));
     }
+    testNullBitmap(transformFunction, null);
+  }
+
+  protected void testTransformFunctionWithNull(TransformFunction transformFunction, long[] expectedValues,
+      RoaringBitmap expectedNull) {
+    int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+    long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
+    float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    BigDecimal[] bigDecimalValues =
+        transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
+    String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (expectedNull.contains(i)) {
+        continue;
+      }
+      // only compare the rows that are not null.
+      assertEquals(intValues[i], (int) expectedValues[i]);
+      assertEquals(longValues[i], expectedValues[i]);
+      assertEquals(floatValues[i], (float) expectedValues[i]);
+      assertEquals(doubleValues[i], (double) expectedValues[i]);
+      assertEquals(bigDecimalValues[i].longValue(), expectedValues[i]);
+      assertEquals(stringValues[i], Long.toString(expectedValues[i]));
+    }
+    testNullBitmap(transformFunction, expectedNull);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, float[] expectedValues) {
@@ -266,6 +368,7 @@ protected void testTransformFunction(TransformFunction transformFunction, float[
       assertEquals(bigDecimalValues[i].floatValue(), expectedValues[i]);
       assertEquals(stringValues[i], Float.toString(expectedValues[i]));
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, double[] expectedValues) {
@@ -292,6 +395,39 @@ protected void testTransformFunction(TransformFunction transformFunction, double
       }
       assertEquals(stringValues[i], Double.toString(expectedValues[i]));
     }
+    testNullBitmap(transformFunction, null);
+  }
+
+  protected void testTransformFunctionWithNull(TransformFunction transformFunction, double[] expectedValues,
+      RoaringBitmap expectedNull) {
+    int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+    long[]longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
+    float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
+    double[]doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    BigDecimal[] bigDecimalValues = null;
+    try {
+      // 1- Some transform functions cannot work with BigDecimal (e.g. exp, ln, and sqrt).
+      // 2- NumberFormatException is thrown when converting double.NaN, Double.POSITIVE_INFINITY,
+      // or Double.NEGATIVE_INFINITY.
+      bigDecimalValues = transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
+    } catch (UnsupportedOperationException | NumberFormatException ignored) {
+    }
+    String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      // only compare the results for non-null rows.
+      if (expectedNull.contains(i)) {
+        continue;
+      }
+      assertEquals(intValues[i], (int) expectedValues[i]);
+      assertEquals(longValues[i], (long) expectedValues[i]);
+      assertEquals(floatValues[i], (float) expectedValues[i]);
+      assertEquals(doubleValues[i], expectedValues[i]);
+      if (bigDecimalValues != null) {
+        assertEquals(bigDecimalValues[i].doubleValue(), expectedValues[i]);
+      }
+      assertEquals(stringValues[i], Double.toString(expectedValues[i]));
+    }
+    testNullBitmap(transformFunction, expectedNull);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, BigDecimal[] expectedValues) {
@@ -311,6 +447,7 @@ protected void testTransformFunction(TransformFunction transformFunction, BigDec
       assertEquals((new BigDecimal(stringValues[i])).compareTo(expectedValues[i]), 0);
       assertEquals(BigDecimalUtils.deserialize(bytesValues[i]).compareTo(expectedValues[i]), 0);
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, boolean[] expectedValues) {
@@ -320,15 +457,36 @@ protected void testTransformFunction(TransformFunction transformFunction, boolea
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     BigDecimal[] bigDecimalValues = transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
     // TODO: Support implicit cast from BOOLEAN to STRING
-//    String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
       assertEquals(intValues[i] == 1, expectedValues[i]);
       assertEquals(longValues[i] == 1, expectedValues[i]);
       assertEquals(floatValues[i] == 1, expectedValues[i]);
       assertEquals(doubleValues[i] == 1, expectedValues[i]);
       assertEquals(bigDecimalValues[i].intValue() == 1, expectedValues[i]);
-//      assertEquals(stringValues[i], Boolean.toString(expectedValues[i]));
     }
+    testNullBitmap(transformFunction, null);
+  }
+
+  protected void testTransformFunctionWithNull(TransformFunction transformFunction, boolean[] expectedValues,
+      RoaringBitmap expectedNulls) {
+    int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+    long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
+    float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    BigDecimal[]bigDecimalValues =
+        transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
+
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (expectedNulls.contains(i)) {
+        continue;
+      }
+      assertEquals(intValues[i] == 1, expectedValues[i]);
+      assertEquals(longValues[i] == 1, expectedValues[i]);
+      assertEquals(floatValues[i] == 1, expectedValues[i]);
+      assertEquals(doubleValues[i] == 1, expectedValues[i]);
+      assertEquals(bigDecimalValues[i].intValue() == 1, expectedValues[i]);
+    }
+    testNullBitmap(transformFunction, expectedNulls);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, Timestamp[] expectedValues) {
@@ -347,6 +505,7 @@ protected void testTransformFunction(TransformFunction transformFunction, Timest
       assertEquals(bigDecimalValues[i], BigDecimal.valueOf(expectedValues[i].getTime()));
 //      assertEquals(stringValues[i], expectedValues[i].toString());
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, String[] expectedValues) {
@@ -354,6 +513,19 @@ protected void testTransformFunction(TransformFunction transformFunction, String
     for (int i = 0; i < NUM_ROWS; i++) {
       assertEquals(stringValues[i], expectedValues[i]);
     }
+    testNullBitmap(transformFunction, null);
+  }
+
+  protected void testTransformFunctionWithNull(TransformFunction transformFunction, String[] expectedValues,
+      RoaringBitmap expectedNulls) {
+    String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (expectedNulls.contains(i)) {
+        continue;
+      }
+      assertEquals(stringValues[i], expectedValues[i]);
+    }
+    testNullBitmap(transformFunction, expectedNulls);
   }
 
   protected void testTransformFunction(TransformFunction transformFunction, byte[][] expectedValues) {
@@ -363,6 +535,7 @@ protected void testTransformFunction(TransformFunction transformFunction, byte[]
       assertEquals(bytesValues[i], BytesUtils.toBytes(stringValues[i]));
       assertEquals(bytesValues[i], expectedValues[i]);
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunctionMV(TransformFunction transformFunction, int[][] expectedValues) {
@@ -387,6 +560,7 @@ protected void testTransformFunctionMV(TransformFunction transformFunction, int[
         assertEquals(stringValuesMV[i][j], Integer.toString(expectedValues[i][j]));
       }
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunctionMV(TransformFunction transformFunction, long[][] expectedValues) {
@@ -411,6 +585,7 @@ protected void testTransformFunctionMV(TransformFunction transformFunction, long
         assertEquals(stringValuesMV[i][j], Long.toString(expectedValues[i][j]));
       }
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunctionMV(TransformFunction transformFunction, float[][] expectedValues) {
@@ -435,6 +610,7 @@ protected void testTransformFunctionMV(TransformFunction transformFunction, floa
         assertEquals(stringValuesMV[i][j], Float.toString(expectedValues[i][j]));
       }
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunctionMV(TransformFunction transformFunction, double[][] expectedValues) {
@@ -459,6 +635,7 @@ protected void testTransformFunctionMV(TransformFunction transformFunction, doub
         assertEquals(stringValuesMV[i][j], Double.toString(expectedValues[i][j]));
       }
     }
+    testNullBitmap(transformFunction, null);
   }
 
   protected void testTransformFunctionMV(TransformFunction transformFunction, String[][] expectedValues) {
@@ -466,6 +643,7 @@ protected void testTransformFunctionMV(TransformFunction transformFunction, Stri
     for (int i = 0; i < NUM_ROWS; i++) {
       assertEquals(stringValuesMV[i], expectedValues[i]);
     }
+    testNullBitmap(transformFunction, null);
   }
 
   @AfterClass
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java
index 974812d8f2b..dcf22ecfc34 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java
@@ -23,6 +23,7 @@
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -118,6 +119,34 @@ public void testBinaryOperatorTransformFunction() {
       expectedValues[i] = getExpectedValue(Double.compare(_doubleSVValues[i], _longSVValues[0]));
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    // Test with null literal
+    expression = RequestContextUtils.getExpression(
+        String.format("%s(%s, null)", functionName, DOUBLE_SV_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    bitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
+
+    // Test with null column.
+    expression = RequestContextUtils.getExpression(
+        String.format("%s(%s, %d)", functionName, INT_SV_NULL_COLUMN, _intSVValues[0]));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertEquals(transformFunction.getName(), functionName);
+    resultMetadata = transformFunction.getResultMetadata();
+    assertEquals(resultMetadata.getDataType(), DataType.BOOLEAN);
+    assertTrue(resultMetadata.isSingleValue());
+    assertFalse(resultMetadata.hasDictionary());
+    expectedValues = new boolean[NUM_ROWS];
+    bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = getExpectedValue(Integer.compare(_intSVValues[i], _intSVValues[0]));
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test(dataProvider = "testIllegalArguments", expectedExceptions = {BadQueryRequestException.class})
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CLPDecodeTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CLPDecodeTransformFunctionTest.java
new file mode 100644
index 00000000000..f2537c0a447
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CLPDecodeTransformFunctionTest.java
@@ -0,0 +1,244 @@
+/**
+ * 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.pinot.core.operator.transform.function;
+
+import com.yscope.clp.compressorfrontend.BuiltInVariableHandlingRuleVersions;
+import com.yscope.clp.compressorfrontend.EncodedMessage;
+import com.yscope.clp.compressorfrontend.MessageEncoder;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.apache.pinot.core.operator.DocIdSetOperator;
+import org.apache.pinot.core.operator.ProjectionOperator;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.filter.MatchAllFilterOperator;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.spi.data.FieldSpec.DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.fail;
+
+
+public class CLPDecodeTransformFunctionTest {
+  private static final String SEGMENT_NAME = "testSegmentForClpDecode";
+  private static final String INDEX_DIR_PATH = FileUtils.getTempDirectoryPath() + File.separator + SEGMENT_NAME;
+  private static final String TIMESTAMP_COLUMN = "timestampColumn";
+  private static final String LOGTYPE_COLUMN = "field_logtype";
+  private static final String DICT_VARS_COLUMN = "field_dictionaryVars";
+  private static final String ENCODED_VARS_COLUMN = "field_encodedVars";
+  private static final String TEST_MESSAGE = "Started job_123 on node-987: 4 cores, 8 threads and 51.4% memory used.";
+  private static final int NUM_ROWS = 1000;
+
+  private final long[] _timestampValues = new long[NUM_ROWS];
+
+  private final String[] _logtypeValues = new String[NUM_ROWS];
+  private final String[][] _dictVarValues = new String[NUM_ROWS][];
+
+  private final Long[][] _encodedVarValues = new Long[NUM_ROWS][];
+
+  SegmentGeneratorConfig _segmentGenConfig;
+  protected Map<String, DataSource> _dataSourceMap;
+  protected ProjectionBlock _projectionBlock;
+
+  @BeforeClass
+  public void setup()
+      throws Exception {
+    // Setup the schema and table config
+    Schema schema = new Schema.SchemaBuilder()
+        .addSingleValueDimension(LOGTYPE_COLUMN, FieldSpec.DataType.STRING)
+        .addMultiValueDimension(DICT_VARS_COLUMN, FieldSpec.DataType.STRING)
+        .addMultiValueDimension(ENCODED_VARS_COLUMN, FieldSpec.DataType.LONG)
+        .addDateTime(TIMESTAMP_COLUMN, FieldSpec.DataType.TIMESTAMP, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
+        .build();
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName("testTableForClpDecode")
+        .setTimeColumnName(TIMESTAMP_COLUMN)
+        .build();
+    _segmentGenConfig = new SegmentGeneratorConfig(tableConfig, schema);
+    _segmentGenConfig.setOutDir(INDEX_DIR_PATH);
+    _segmentGenConfig.setSegmentName(SEGMENT_NAME);
+
+    // Create the rows
+    long currentTimeMs = System.currentTimeMillis();
+    Random randomNumGen = new Random();
+    MessageEncoder clpMessageEncoder = new MessageEncoder(BuiltInVariableHandlingRuleVersions.VariablesSchemaV2,
+        BuiltInVariableHandlingRuleVersions.VariableEncodingMethodsV1);
+    EncodedMessage clpEncodedMessage = new EncodedMessage();
+    clpMessageEncoder.encodeMessage(TEST_MESSAGE, clpEncodedMessage);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      _timestampValues[i] = currentTimeMs + randomNumGen.nextInt(365 * 24 * 3600) * 1000L;
+      _logtypeValues[i] = clpEncodedMessage.getLogTypeAsString();
+      _dictVarValues[i] = clpEncodedMessage.getDictionaryVarsAsStrings();
+      _encodedVarValues[i] = clpEncodedMessage.getEncodedVarsAsBoxedLongs();
+    }
+    // Replace the last row with a null row
+    clpMessageEncoder.encodeMessage(DEFAULT_DIMENSION_NULL_VALUE_OF_STRING, clpEncodedMessage);
+    _logtypeValues[NUM_ROWS - 1] = clpEncodedMessage.getLogTypeAsString();
+    _dictVarValues[NUM_ROWS - 1] = clpEncodedMessage.getDictionaryVarsAsStrings();
+    _encodedVarValues[NUM_ROWS - 1] = clpEncodedMessage.getEncodedVarsAsBoxedLongs();
+    // Corrupt the previous two rows, so we can test the default value
+    _dictVarValues[NUM_ROWS - 2] = null;
+    _encodedVarValues[NUM_ROWS - 3] = null;
+
+    List<GenericRow> rows = new ArrayList<>(NUM_ROWS);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      GenericRow row = new GenericRow();
+      row.putValue(TIMESTAMP_COLUMN, _timestampValues[i]);
+      row.putValue(LOGTYPE_COLUMN, _logtypeValues[i]);
+      row.putValue(DICT_VARS_COLUMN, _dictVarValues[i]);
+      row.putValue(ENCODED_VARS_COLUMN, _encodedVarValues[i]);
+      rows.add(row);
+    }
+
+    // Build a segment
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    try {
+      driver.init(_segmentGenConfig, new GenericRowRecordReader(rows));
+      driver.build();
+
+      IndexSegment indexSegment = ImmutableSegmentLoader.load(new File(INDEX_DIR_PATH, SEGMENT_NAME), ReadMode.heap);
+      Set<String> columnNames = indexSegment.getPhysicalColumnNames();
+      _dataSourceMap = new HashMap<>(columnNames.size());
+      for (String columnName : columnNames) {
+        _dataSourceMap.put(columnName, indexSegment.getDataSource(columnName));
+      }
+    } catch (Exception ex) {
+      fail("Failed to build and load segment", ex);
+    }
+
+    _projectionBlock = new ProjectionOperator(_dataSourceMap,
+        new DocIdSetOperator(new MatchAllFilterOperator(NUM_ROWS), DocIdSetPlanNode.MAX_DOC_PER_CALL)).nextBlock();
+  }
+
+  @BeforeTest
+  public void deleteOldIndex() {
+    FileUtils.deleteQuietly(new File(INDEX_DIR_PATH));
+  }
+
+  @Test
+  public void testTransform() {
+    ExpressionContext expression = RequestContextUtils.getExpression(
+        String.format("%s(%s,%s,%s)", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN, DICT_VARS_COLUMN,
+            ENCODED_VARS_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof CLPDecodeTransformFunction);
+
+    String[] expectedValues = new String[NUM_ROWS];
+    Arrays.fill(expectedValues, TEST_MESSAGE);
+    expectedValues[NUM_ROWS - 3] = DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+    expectedValues[NUM_ROWS - 2] = DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+    expectedValues[NUM_ROWS - 1] = DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+    testTransformFunction(transformFunction, expectedValues);
+  }
+
+  @Test
+  public void testTransformWithDefaultValue() {
+    String defaultValue = "default";
+    ExpressionContext expression = RequestContextUtils.getExpression(
+        String.format("%s(%s,%s,%s,'%s')", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN, DICT_VARS_COLUMN,
+            ENCODED_VARS_COLUMN, defaultValue));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof CLPDecodeTransformFunction);
+
+    String[] expectedValues = new String[NUM_ROWS];
+    Arrays.fill(expectedValues, TEST_MESSAGE);
+    expectedValues[NUM_ROWS - 3] = defaultValue;
+    expectedValues[NUM_ROWS - 2] = defaultValue;
+    expectedValues[NUM_ROWS - 1] = DEFAULT_DIMENSION_NULL_VALUE_OF_STRING;
+    testTransformFunction(transformFunction, expectedValues);
+  }
+
+  @Test
+  public void testInvalidArgs() {
+    String defaultValue = "default";
+
+    // 1st parameter literal
+    assertThrows(BadQueryRequestException.class, () -> {
+      ExpressionContext expression = RequestContextUtils.getExpression(
+          String.format("%s('%s',%s,%s,'%s')", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN,
+              DICT_VARS_COLUMN, ENCODED_VARS_COLUMN, defaultValue));
+      TransformFunctionFactory.get(expression, _dataSourceMap);
+    });
+
+    // 2nd parameter literal
+    assertThrows(BadQueryRequestException.class, () -> {
+      ExpressionContext expression = RequestContextUtils.getExpression(
+          String.format("%s(%s,'%s',%s,'%s')", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN,
+              DICT_VARS_COLUMN, ENCODED_VARS_COLUMN, defaultValue));
+      TransformFunctionFactory.get(expression, _dataSourceMap);
+    });
+
+    // 3rd parameter literal
+    assertThrows(BadQueryRequestException.class, () -> {
+      ExpressionContext expression = RequestContextUtils.getExpression(
+          String.format("%s(%s,%s,'%s','%s')", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN,
+              DICT_VARS_COLUMN, ENCODED_VARS_COLUMN, defaultValue));
+      TransformFunctionFactory.get(expression, _dataSourceMap);
+    });
+
+    // 4th parameter identifier
+    assertThrows(BadQueryRequestException.class, () -> {
+      ExpressionContext expression = RequestContextUtils.getExpression(
+          String.format("%s(%s,%s,%s,%s)", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN,
+              DICT_VARS_COLUMN, ENCODED_VARS_COLUMN, defaultValue));
+      TransformFunctionFactory.get(expression, _dataSourceMap);
+    });
+
+    // Missing arg
+    assertThrows(BadQueryRequestException.class, () -> {
+      ExpressionContext expression = RequestContextUtils.getExpression(
+          String.format("%s(%s,%s)", TransformFunctionType.CLPDECODE.getName(), LOGTYPE_COLUMN, DICT_VARS_COLUMN));
+      TransformFunctionFactory.get(expression, _dataSourceMap);
+    });
+  }
+
+  private void testTransformFunction(TransformFunction transformFunction, String[] expectedValues) {
+    String[] values = transformFunction.transformToStringValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      assertEquals(values[i], expectedValues[i]);
+    }
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunctionTest.java
index a9e02d3a266..329d6625e25 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CaseTransformFunctionTest.java
@@ -43,24 +43,22 @@ public class CaseTransformFunctionTest extends BaseTransformFunctionTest {
 
   @DataProvider
   public Object[][] params() {
-    return Stream.of(INT_SV_COLUMN, LONG_SV_COLUMN, FLOAT_SV_COLUMN, DOUBLE_SV_COLUMN)
-        .flatMap(col -> Stream.of(
-            new int[] {3, 2, 1},
-            new int[] {1, 2, 3},
-            new int[] {Integer.MAX_VALUE / 2, Integer.MAX_VALUE / 4, 0},
-            new int[] {0, Integer.MAX_VALUE / 4, Integer.MAX_VALUE / 2},
-            new int[] {0, Integer.MIN_VALUE / 4, Integer.MIN_VALUE},
-            new int[] {Integer.MIN_VALUE, 0, 1},
-            new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE, 1},
-            new int[] {Integer.MAX_VALUE, Integer.MAX_VALUE - 1, Integer.MAX_VALUE - 2}
-        ).map(thresholds -> new Object[]{col, thresholds[0], thresholds[1], thresholds[2]}))
+    return Stream.of(INT_SV_COLUMN, LONG_SV_COLUMN, FLOAT_SV_COLUMN, DOUBLE_SV_COLUMN).flatMap(
+            col -> Stream.of(new int[]{3, 2, 1}, new int[]{1, 2, 3},
+                    new int[]{Integer.MAX_VALUE / 2, Integer.MAX_VALUE / 4, 0},
+                    new int[]{0, Integer.MAX_VALUE / 4, Integer.MAX_VALUE / 2},
+                    new int[]{0, Integer.MIN_VALUE / 4, Integer.MIN_VALUE}, new int[]{Integer.MIN_VALUE, 0, 1},
+                    new int[]{Integer.MAX_VALUE, Integer.MIN_VALUE, 1},
+                    new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE - 1, Integer.MAX_VALUE - 2})
+                .map(thresholds -> new Object[]{col, thresholds[0], thresholds[1], thresholds[2]}))
         .toArray(Object[][]::new);
   }
 
   @Test(dataProvider = "params")
   public void testCasePriorityObserved(String column, int threshold1, int threshold2, int threshold3) {
-    String statement = String.format("CASE WHEN %s > %d THEN 3 WHEN %s > %d THEN 2 WHEN %s > %d THEN 1 ELSE -1 END",
-        column, threshold1, column, threshold2, column, threshold3);
+    String statement =
+        String.format("CASE WHEN %s > %d THEN 3 WHEN %s > %d THEN 2 WHEN %s > %d THEN 1 ELSE -1 END", column,
+            threshold1, column, threshold2, column, threshold3);
     ExpressionContext expression = RequestContextUtils.getExpression(statement);
     TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
     int[] expectedIntResults = new int[NUM_ROWS];
@@ -103,7 +101,8 @@ public void testCaseTransformFunctionWithIntResults() {
       testCaseQueryWithIntResults(String.format("%s(%s, %s)", functionType.getName(), LONG_SV_COLUMN,
           String.format("%d", _longSVValues[INDEX_TO_COMPARE])), getExpectedIntResults(LONG_SV_COLUMN, functionType));
       testCaseQueryWithIntResults(String.format("%s(%s, %s)", functionType.getName(), FLOAT_SV_COLUMN,
-          String.format("%f", _floatSVValues[INDEX_TO_COMPARE])), getExpectedIntResults(FLOAT_SV_COLUMN, functionType));
+              String.format("%f", _floatSVValues[INDEX_TO_COMPARE])),
+          getExpectedIntResults(FLOAT_SV_COLUMN, functionType));
       testCaseQueryWithIntResults(String.format("%s(%s, %s)", functionType.getName(), DOUBLE_SV_COLUMN,
               String.format("%.20f", _doubleSVValues[INDEX_TO_COMPARE])),
           getExpectedIntResults(DOUBLE_SV_COLUMN, functionType));
@@ -125,7 +124,8 @@ public void testCaseTransformFunctionWithFloatResults() {
       testCaseQueryWithFloatResults(String.format("%s(%s, %s)", functionType.getName(), INT_SV_COLUMN,
           String.format("%d", _intSVValues[INDEX_TO_COMPARE])), getExpectedFloatResults(INT_SV_COLUMN, functionType));
       testCaseQueryWithFloatResults(String.format("%s(%s, %s)", functionType.getName(), LONG_SV_COLUMN,
-          String.format("%d", _longSVValues[INDEX_TO_COMPARE])), getExpectedFloatResults(LONG_SV_COLUMN, functionType));
+              String.format("%d", _longSVValues[INDEX_TO_COMPARE])),
+          getExpectedFloatResults(LONG_SV_COLUMN, functionType));
       testCaseQueryWithFloatResults(String.format("%s(%s, %s)", functionType.getName(), FLOAT_SV_COLUMN,
               String.format("%f", _floatSVValues[INDEX_TO_COMPARE])),
           getExpectedFloatResults(FLOAT_SV_COLUMN, functionType));
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java
index f24c3bcaf52..7ae8af7b713 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java
@@ -25,6 +25,8 @@
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import static org.apache.pinot.common.function.scalar.DataTypeConversionFunctions.cast;
@@ -33,7 +35,6 @@
 
 
 public class CastTransformFunctionTest extends BaseTransformFunctionTest {
-
   @Test
   public void testCastTransformFunction() {
     ExpressionContext expression =
@@ -255,4 +256,35 @@ public void testCastTransformFunctionMV() {
     }
     testTransformFunction(transformFunction, expectedArraySums);
   }
+
+  @Test
+  public void testCastNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression("cast(null AS INT)");
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof CastTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), CastTransformFunction.FUNCTION_NAME);
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testCastNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("cast(%s AS INT)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof CastTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), CastTransformFunction.FUNCTION_NAME);
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java
index d604044d18c..20b83f8770c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java
@@ -18,452 +18,89 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import org.apache.commons.io.FileUtils;
-import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
-import org.apache.pinot.core.operator.DocIdSetOperator;
-import org.apache.pinot.core.operator.ProjectionOperator;
-import org.apache.pinot.core.operator.blocks.ProjectionBlock;
-import org.apache.pinot.core.operator.filter.MatchAllFilterOperator;
-import org.apache.pinot.core.plan.DocIdSetPlanNode;
-import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
-import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.utils.ReadMode;
-import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 
 public class CoalesceTransformFunctionTest extends BaseTransformFunctionTest {
-  private static final String ENABLE_NULL_SEGMENT_NAME = "testSegment1";
-  private static final String DISABLE_NULL_SEGMENT_NAME = "testSegment2";
-  private static final Random RANDOM = new Random();
-
-  private static final int NUM_ROWS = 1000;
-  private static final String INT_SV_COLUMN1 = "intSV1";
-  private static final String INT_SV_COLUMN2 = "intSV2";
-  private static final String STRING_SV_COLUMN1 = "StringSV1";
-  private static final String STRING_SV_COLUMN2 = "StringSV2";
-  private static final String BIG_DECIMAL_SV_COLUMN1 = "BigDecimalSV1";
-  private static final String BIG_DECIMAL_SV_COLUMN2 = "BigDecimalSV2";
-  private static final String LONG_SV_COLUMN1 = "LongSV1";
-  private static final String LONG_SV_COLUMN2 = "LongSV2";
-  private static final String DOUBLE_SV_COLUMN1 = "DoubleSV1";
-  private static final String DOUBLE_SV_COLUMN2 = "DoubleSV2";
-
-  private static final String FLOAT_SV_COLUMN1 = "FloatSV1";
-  private static final String FLOAT_SV_COLUMN2 = "FLoatSV2";
-  private final int[] _intSVValues = new int[NUM_ROWS];
-  private final double[] _doubleValues = new double[NUM_ROWS];
-  private final float[] _floatValues = new float[NUM_ROWS];
-  private final String[] _stringSVValues = new String[NUM_ROWS];
-  private Map<String, DataSource> _enableNullDataSourceMap;
-  private Map<String, DataSource> _disableNullDataSourceMap;
-  private ProjectionBlock _enableNullProjectionBlock;
-  private ProjectionBlock _disableNullProjectionBlock;
-  // Mod decides whether the first column of the same type should be null.
-  private static final int NULL_MOD1 = 3;
-  // Mod decides whether the second column of the same type should be null.
-  private static final int NULL_MOD2 = 5;
-  // Difference between two same type numeric columns.
-  private static final int INT_VALUE_SHIFT = 2;
-  private static final double DOUBLE_VALUE_SHIFT = 0.1;
-  private static final float FLOAT_VALUE_SHIFT = 0.1f;
-
-  // Suffix for second string column.
-  private static final String SUFFIX = "column2";
-
-  private static String getIndexDirPath(String segmentName) {
-    return FileUtils.getTempDirectoryPath() + File.separator + segmentName;
-  }
-
-  private static Map<String, DataSource> getDataSourceMap(Schema schema, List<GenericRow> rows, String segmentName)
-      throws Exception {
-    TableConfig tableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName(segmentName).setNullHandlingEnabled(true).build();
-    SegmentGeneratorConfig config = new SegmentGeneratorConfig(tableConfig, schema);
-    config.setOutDir(getIndexDirPath(segmentName));
-    config.setSegmentName(segmentName);
-    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
-    driver.init(config, new GenericRowRecordReader(rows));
-    driver.build();
-    IndexSegment indexSegment =
-        ImmutableSegmentLoader.load(new File(getIndexDirPath(segmentName), segmentName), ReadMode.heap);
-    Set<String> columnNames = indexSegment.getPhysicalColumnNames();
-    Map<String, DataSource> enableNullDataSourceMap = new HashMap<>(columnNames.size());
-    for (String columnName : columnNames) {
-      enableNullDataSourceMap.put(columnName, indexSegment.getDataSource(columnName));
-    }
-    return enableNullDataSourceMap;
-  }
-
-  private static ProjectionBlock getProjectionBlock(Map<String, DataSource> dataSourceMap) {
-    return new ProjectionOperator(dataSourceMap,
-        new DocIdSetOperator(new MatchAllFilterOperator(NUM_ROWS), DocIdSetPlanNode.MAX_DOC_PER_CALL)).nextBlock();
-  }
-
-  private static boolean isColumn1Null(int i) {
-    return i % NULL_MOD1 == 0;
-  }
-
-  private static boolean isColumn2Null(int i) {
-    return i % NULL_MOD2 == 0;
-  }
-
-  @BeforeClass
-  public void setup()
-      throws Exception {
-    // Set up two tables: one with null option enable, the other with null option disable.
-    // Each table one string column, and one int column with some rows set to null.
-    FileUtils.deleteQuietly(new File(getIndexDirPath(DISABLE_NULL_SEGMENT_NAME)));
-    FileUtils.deleteQuietly(new File(getIndexDirPath(ENABLE_NULL_SEGMENT_NAME)));
-    for (int i = 0; i < NUM_ROWS; i++) {
-      _intSVValues[i] = RANDOM.nextInt();
-      _doubleValues[i] = RANDOM.nextDouble();
-      _floatValues[i] = RANDOM.nextFloat();
-      _stringSVValues[i] = "a" + RANDOM.nextInt();
-    }
-    List<GenericRow> rows = new ArrayList<>(NUM_ROWS);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Map<String, Object> map = new HashMap<>();
-      map.put(INT_SV_COLUMN1, _intSVValues[i]);
-      map.put(INT_SV_COLUMN2, _intSVValues[i] + INT_VALUE_SHIFT);
-      map.put(DOUBLE_SV_COLUMN1, _doubleValues[i]);
-      map.put(DOUBLE_SV_COLUMN2, _doubleValues[i] + DOUBLE_VALUE_SHIFT);
-      map.put(FLOAT_SV_COLUMN1, _floatValues[i]);
-      map.put(FLOAT_SV_COLUMN2, _floatValues[i] + FLOAT_VALUE_SHIFT);
-      map.put(STRING_SV_COLUMN1, _stringSVValues[i]);
-      map.put(STRING_SV_COLUMN2, _stringSVValues[i] + SUFFIX);
-      map.put(BIG_DECIMAL_SV_COLUMN1, BigDecimal.valueOf(_intSVValues[i]));
-      map.put(BIG_DECIMAL_SV_COLUMN2, BigDecimal.valueOf(_intSVValues[i] + INT_VALUE_SHIFT));
-      map.put(LONG_SV_COLUMN1, _intSVValues[i]);
-      map.put(LONG_SV_COLUMN2, _intSVValues[i] + INT_VALUE_SHIFT);
-
-      if (isColumn1Null(i)) {
-        map.put(INT_SV_COLUMN1, null);
-        map.put(STRING_SV_COLUMN1, null);
-        map.put(BIG_DECIMAL_SV_COLUMN1, null);
-        map.put(LONG_SV_COLUMN1, null);
-        map.put(DOUBLE_SV_COLUMN1, null);
-        map.put(FLOAT_SV_COLUMN1, null);
-      }
-      if (isColumn2Null(i)) {
-        map.put(INT_SV_COLUMN2, null);
-        map.put(STRING_SV_COLUMN2, null);
-        map.put(LONG_SV_COLUMN2, null);
-        map.put(BIG_DECIMAL_SV_COLUMN2, null);
-        map.put(DOUBLE_SV_COLUMN2, null);
-        map.put(FLOAT_SV_COLUMN2, null);
-      }
-      GenericRow row = new GenericRow();
-      row.init(map);
-      rows.add(row);
-    }
-    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(INT_SV_COLUMN1, FieldSpec.DataType.INT)
-        .addSingleValueDimension(INT_SV_COLUMN2, FieldSpec.DataType.INT)
-        .addSingleValueDimension(STRING_SV_COLUMN1, FieldSpec.DataType.STRING)
-        .addSingleValueDimension(STRING_SV_COLUMN2, FieldSpec.DataType.STRING)
-        .addSingleValueDimension(LONG_SV_COLUMN1, FieldSpec.DataType.LONG)
-        .addSingleValueDimension(LONG_SV_COLUMN2, FieldSpec.DataType.LONG)
-        .addSingleValueDimension(DOUBLE_SV_COLUMN1, FieldSpec.DataType.DOUBLE)
-        .addSingleValueDimension(DOUBLE_SV_COLUMN2, FieldSpec.DataType.DOUBLE)
-        .addSingleValueDimension(FLOAT_SV_COLUMN1, FieldSpec.DataType.FLOAT)
-        .addSingleValueDimension(FLOAT_SV_COLUMN2, FieldSpec.DataType.FLOAT)
-        .addMetric(BIG_DECIMAL_SV_COLUMN1, FieldSpec.DataType.BIG_DECIMAL)
-        .addMetric(BIG_DECIMAL_SV_COLUMN2, FieldSpec.DataType.BIG_DECIMAL).build();
-    _enableNullDataSourceMap = getDataSourceMap(schema, rows, ENABLE_NULL_SEGMENT_NAME);
-    _enableNullProjectionBlock = getProjectionBlock(_enableNullDataSourceMap);
-    _disableNullDataSourceMap = getDataSourceMap(schema, rows, DISABLE_NULL_SEGMENT_NAME);
-    _disableNullProjectionBlock = getProjectionBlock(_disableNullDataSourceMap);
-  }
-
-  private static void testIntTransformFunction(ExpressionContext expression, int[] expectedValues,
-      ProjectionBlock projectionBlock, Map<String, DataSource> dataSourceMap)
-      throws Exception {
-    int[] actualValues =
-        TransformFunctionFactory.get(expression, dataSourceMap).transformToIntValuesSV(projectionBlock);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Assert.assertEquals(actualValues[i], expectedValues[i]);
-    }
-  }
-
-  private static void testStringTransformFunction(ExpressionContext expression, String[] expectedValues,
-      ProjectionBlock projectionBlock, Map<String, DataSource> dataSourceMap)
-      throws Exception {
-    String[] actualValues =
-        TransformFunctionFactory.get(expression, dataSourceMap).transformToStringValuesSV(projectionBlock);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Assert.assertEquals(actualValues[i], expectedValues[i]);
-    }
-  }
-
-  private static void testLongTransformFunction(ExpressionContext expression, long[] expectedValues,
-      ProjectionBlock projectionBlock, Map<String, DataSource> dataSourceMap)
-      throws Exception {
-    long[] actualValues =
-        TransformFunctionFactory.get(expression, dataSourceMap).transformToLongValuesSV(projectionBlock);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Assert.assertEquals(actualValues[i], expectedValues[i]);
-    }
-  }
-
-  private static void testDoubleTransformFunction(ExpressionContext expression, double[] expectedValues,
-      ProjectionBlock projectionBlock, Map<String, DataSource> dataSourceMap)
-      throws Exception {
-    double[] actualValues =
-        TransformFunctionFactory.get(expression, dataSourceMap).transformToDoubleValuesSV(projectionBlock);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Assert.assertEquals(actualValues[i], expectedValues[i]);
-    }
-  }
-
-  private static void testFloatTransformFunction(ExpressionContext expression, float[] expectedValues,
-      ProjectionBlock projectionBlock, Map<String, DataSource> dataSourceMap)
-      throws Exception {
-    float[] actualValues =
-        TransformFunctionFactory.get(expression, dataSourceMap).transformToFloatValuesSV(projectionBlock);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Assert.assertEquals(actualValues[i], expectedValues[i]);
-    }
-  }
-
-  private static void testBigDecimalTransformFunction(ExpressionContext expression, BigDecimal[] expectedValues,
-      ProjectionBlock projectionBlock, Map<String, DataSource> dataSourceMap)
-      throws Exception {
-    BigDecimal[] actualValues =
-        TransformFunctionFactory.get(expression, dataSourceMap).transformToBigDecimalValuesSV(projectionBlock);
-    for (int i = 0; i < NUM_ROWS; i++) {
-      Assert.assertEquals(actualValues[i], expectedValues[i]);
-    }
-  }
-
-  // Test the Coalesce on two Int columns where one or the other or both can be null.
   @Test
-  public void testCoalesceIntColumns()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", INT_SV_COLUMN1, INT_SV_COLUMN2));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
-    int[] expectedResults = new int[NUM_ROWS];
-    for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = CoalesceTransformFunction.NULL_INT;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = _intSVValues[i] + INT_VALUE_SHIFT;
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = _intSVValues[i];
-      } else {
-        expectedResults[i] = _intSVValues[i];
-      }
-    }
-    testIntTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock, _enableNullDataSourceMap);
-    testIntTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock, _disableNullDataSourceMap);
-  }
+  public void testCoalesceIntColumns() {
+    TransformFunction coalesceFunc = TransformFunctionFactory.get(
+        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", INT_SV_NULL_COLUMN, LONG_SV_COLUMN)),
+        _dataSourceMap);
 
-  // Test the Coalesce on two long columns where one or the other or both can be null.
-  @Test
-  public void testCoalesceLongColumns()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", LONG_SV_COLUMN1, LONG_SV_COLUMN2));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
     long[] expectedResults = new long[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = CoalesceTransformFunction.NULL_LONG;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = _intSVValues[i] + INT_VALUE_SHIFT;
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = _intSVValues[i];
+      if (isNullRow(i)) {
+        expectedResults[i] = _longSVValues[i];
       } else {
         expectedResults[i] = _intSVValues[i];
       }
     }
-    testLongTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock, _enableNullDataSourceMap);
-    testLongTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock, _disableNullDataSourceMap);
-  }
-
-  // Test the Coalesce on two float columns where one or the other or both can be null.
-  @Test
-  public void testCoalesceFloatColumns()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", FLOAT_SV_COLUMN1, FLOAT_SV_COLUMN2));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
-    float[] expectedResults = new float[NUM_ROWS];
-    for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = CoalesceTransformFunction.NULL_FLOAT;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = _floatValues[i] + FLOAT_VALUE_SHIFT;
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = _floatValues[i];
-      } else {
-        expectedResults[i] = _floatValues[i];
-      }
-    }
-    testFloatTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock, _enableNullDataSourceMap);
-    testFloatTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock, _disableNullDataSourceMap);
+    testTransformFunction(coalesceFunc, expectedResults);
   }
 
-  // Test the Coalesce on two double columns where one or the other or both can be null.
   @Test
-  public void testCoalesceDoubleColumns()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", DOUBLE_SV_COLUMN1, DOUBLE_SV_COLUMN2));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
-    double[] expectedResults = new double[NUM_ROWS];
-    for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = CoalesceTransformFunction.NULL_DOUBLE;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = _doubleValues[i] + DOUBLE_VALUE_SHIFT;
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = _doubleValues[i];
-      } else {
-        expectedResults[i] = _doubleValues[i];
-      }
-    }
-    testDoubleTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock, _enableNullDataSourceMap);
-    testDoubleTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock, _disableNullDataSourceMap);
-  }
-
-  // Test the Coalesce on two big decimal columns where one or the other or both can be null.
-  @Test
-  public void testCoalesceBigDecimalColumns()
-      throws Exception {
-    ExpressionContext coalesceExpr = RequestContextUtils.getExpression(
-        String.format("COALESCE(%s,%s)", BIG_DECIMAL_SV_COLUMN1, BIG_DECIMAL_SV_COLUMN2));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
-    BigDecimal[] expectedResults = new BigDecimal[NUM_ROWS];
+  public void testCoalesceIntColumnsAndLiterals() {
+    final int intLiteral = 313;
+    TransformFunction coalesceFunc = TransformFunctionFactory.get(
+        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", INT_SV_NULL_COLUMN, intLiteral)),
+        _dataSourceMap);
+    Assert.assertEquals(coalesceFunc.getName(), "coalesce");
+    int[] expectedResults = new int[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = CoalesceTransformFunction.NULL_BIG_DECIMAL;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = BigDecimal.valueOf(_intSVValues[i] + INT_VALUE_SHIFT);
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = BigDecimal.valueOf(_intSVValues[i]);
+      if (isNullRow(i)) {
+        expectedResults[i] = intLiteral;
       } else {
-        expectedResults[i] = BigDecimal.valueOf(_intSVValues[i]);
+        expectedResults[i] = _intSVValues[i];
       }
     }
-    testBigDecimalTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testBigDecimalTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
+    testTransformFunction(coalesceFunc, expectedResults);
   }
 
-  // Test the Coalesce on two String columns where one or the other or both can be null.
   @Test
-  public void testCoalesceStringColumns()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", STRING_SV_COLUMN1, STRING_SV_COLUMN2));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
+  public void testDifferentLiteralArgs() {
+    TransformFunction coalesceFunc = TransformFunctionFactory.get(
+        RequestContextUtils.getExpression(String.format("COALESCE(%s, '%s')", STRING_SV_NULL_COLUMN, 234)),
+        _dataSourceMap);
     String[] expectedResults = new String[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = CoalesceTransformFunction.NULL_STRING;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = _stringSVValues[i] + SUFFIX;
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = _stringSVValues[i];
+      if (isNullRow(i)) {
+        expectedResults[i] = "234";
       } else {
         expectedResults[i] = _stringSVValues[i];
       }
     }
-    testStringTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock, _enableNullDataSourceMap);
-    testStringTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock, _disableNullDataSourceMap);
+    testTransformFunction(coalesceFunc, expectedResults);
   }
 
-  // Test that non-column-names appear in one of the argument.
-  @Test
-  public void testIllegalColumnName()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", _stringSVValues[0], STRING_SV_COLUMN1));
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    });
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(coalesceExpr, _disableNullDataSourceMap);
-    });
-  }
-
-  // Test that wrong data type is illegal argument.
-  @Test
-  public void testIllegalArgType()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", TIMESTAMP_COLUMN, STRING_SV_COLUMN));
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    });
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(coalesceExpr, _disableNullDataSourceMap);
-    });
-  }
 
-  // Test the Coalesce on two Int columns (where one or the other or both can be null) and litrals.
   @Test
-  public void testCoalesceIntColumnsAndLiterals()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s,%s)", INT_SV_COLUMN1, INT_SV_COLUMN2, 314));
-    TransformFunction coalesceTransformFunction = TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    Assert.assertEquals(coalesceTransformFunction.getName(), "coalesce");
-    int[] expectedResults = new int[NUM_ROWS];
+  public void testCoalesceNullLiteral() {
+    TransformFunction coalesceFunc = TransformFunctionFactory.get(
+        RequestContextUtils.getExpression(String.format("COALESCE((1 + null), %s)", INT_SV_NULL_COLUMN)),
+        _dataSourceMap);
+    double[] expectedResults = new double[NUM_ROWS];
+    RoaringBitmap expectedNull = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (isColumn1Null(i) && isColumn2Null(i)) {
-        expectedResults[i] = 314;
-      } else if (isColumn1Null(i)) {
-        expectedResults[i] = _intSVValues[i] + INT_VALUE_SHIFT;
-      } else if (isColumn2Null(i)) {
-        expectedResults[i] = _intSVValues[i];
+      if (isNullRow(i)) {
+        expectedNull.add(i);
       } else {
         expectedResults[i] = _intSVValues[i];
       }
     }
-    testIntTransformFunction(coalesceExpr, expectedResults, _enableNullProjectionBlock, _enableNullDataSourceMap);
-    testIntTransformFunction(coalesceExpr, expectedResults, _disableNullProjectionBlock, _disableNullDataSourceMap);
+    testTransformFunctionWithNull(coalesceFunc, expectedResults, expectedNull);
   }
 
-  // Test that all arguments have to be same type.
   @Test
-  public void testDifferentArgumentType()
-      throws Exception {
-    ExpressionContext coalesceExpr =
-        RequestContextUtils.getExpression(String.format("COALESCE(%s,%s)", INT_SV_COLUMN1, STRING_SV_COLUMN1));
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(coalesceExpr, _enableNullDataSourceMap);
-    });
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(coalesceExpr, _disableNullDataSourceMap);
-    });
+  public void testCoalesceNullNullLiteral() {
+    TransformFunction coalesceFunc = TransformFunctionFactory.get(
+        RequestContextUtils.getExpression("COALESCE(null, null)"), _dataSourceMap);
+    double[] expectedResults = new double[NUM_ROWS];
+    RoaringBitmap expectedNull = new RoaringBitmap();
+    expectedNull.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(coalesceFunc, expectedResults, expectedNull);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java
index 2e1375f5e5e..1d400922c80 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java
@@ -24,6 +24,7 @@
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -65,10 +66,33 @@ public Object[][] testIllegalArguments() {
         }, new Object[]{"dateTimeConvert(5,'1:MILLISECONDS:EPOCH','1:MINUTES:EPOCH','1:MINUTES')"}, new Object[]{
         String.format("dateTimeConvert(%s,'1:MILLISECONDS:EPOCH','1:MINUTES:EPOCH','1:MINUTES')", INT_MV_COLUMN)
     }, new Object[]{
-        String.format("dateTimeConvert(%s,'1:MILLISECONDS:EPOCH','1:MINUTES:EPOCH','MINUTES')", TIME_COLUMN)
+        String.format("dateTimeConvert(%s,'1:MILLISECONDS:EPOCH','1:MINUTES:EPOCH','MINUTES:1')", TIME_COLUMN)
     }, new Object[]{
         String.format("dateTimeConvert(%s,%s,'1:MINUTES:EPOCH','1:MINUTES')", TIME_COLUMN, INT_SV_COLUMN)
     }
     };
   }
+
+  @Test
+  public void testDateTimeConversionTransformFunctionNullColumn() {
+    ExpressionContext expression = RequestContextUtils.getExpression(
+        String.format("dateTimeConvert(%s,'1:MILLISECONDS:EPOCH','1:MINUTES:EPOCH','1:MINUTES')",
+            TIMESTAMP_COLUMN_NULL));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof DateTimeConversionTransformFunction);
+    assertEquals(transformFunction.getName(), DateTimeConversionTransformFunction.FUNCTION_NAME);
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    assertTrue(resultMetadata.isSingleValue());
+    assertEquals(resultMetadata.getDataType(), DataType.LONG);
+    long[] expectedValues = new long[NUM_ROWS];
+    RoaringBitmap expectedNulls = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNulls.add(i);
+      } else {
+        expectedValues[i] = TimeUnit.MILLISECONDS.toMinutes(_timeValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, expectedNulls);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java
index 7918f269fca..f9325c0e04c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java
@@ -22,11 +22,13 @@
 import org.apache.pinot.common.function.scalar.DateTimeFunctions;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 
 public class DateTimeTransformFunctionTest extends BaseTransformFunctionTest {
@@ -89,6 +91,25 @@ public void testUTC(String function, LongToIntFunction expected, Class<? extends
     }
   }
 
+  @Test(dataProvider = "testCasesUTC")
+  public void testUTCNullColumn(String function, LongToIntFunction expected,
+      Class<? extends TransformFunction> expectedClass) {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("%s(%s)", function, TIMESTAMP_COLUMN_NULL));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(expectedClass.isInstance(transformFunction));
+    int[] values = transformFunction.transformToIntValuesSV(_projectionBlock);
+    RoaringBitmap nullBitmap = transformFunction.getNullBitmap(_projectionBlock);
+
+    for (int i = 0; i < _projectionBlock.getNumDocs(); i++) {
+      if (isNullRow(i)) {
+        assertTrue(nullBitmap.contains(i));
+      } else {
+        assertEquals(values[i], expected.applyAsInt(_timeValues[i]));
+      }
+    }
+  }
+
   @Test(dataProvider = "testCasesZoned")
   public void testZoned(String function, ZonedTimeFunction expected, Class<? extends TransformFunction> expectedClass) {
     for (String zone : new String[]{"Europe/Berlin", "America/New_York", "Asia/Katmandu"}) {
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunctionTest.java
index d9badf9e998..65431439811 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DistinctFromTransformFunctionTest.java
@@ -51,22 +51,25 @@
 import org.testng.annotations.Test;
 
 
-public class DistinctFromTransformFunctionTest {
-  private static final String ENABLE_NULL_SEGMENT_NAME = "testSegment1";
-  private static final String DISABLE_NULL_SEGMENT_NAME = "testSegment2";
-  private static final String IS_DISTINCT_FROM_EXPR = "%s IS DISTINCT FROM %s";
-  private static final String IS_NOT_DISTINCT_FROM_EXPR = "%s IS NOT DISTINCT FROM %s";
-  private static final Random RANDOM = new Random();
-
-  private static final int NUM_ROWS = 1000;
+public abstract class DistinctFromTransformFunctionTest {
+  private static final String SEGMENT_NAME = "testSegment";
   private static final String INT_SV_COLUMN = "intSV";
   private static final String INT_SV_NULL_COLUMN = "intSV2";
+  private static final Random RANDOM = new Random();
+  private static final int NUM_ROWS = 1000;
+  private static final int VALUE_MOD = 3;
+
+  private final boolean _isDistinctFrom;
+  private final String _expression;
   private final int[] _intSVValues = new int[NUM_ROWS];
-  private Map<String, DataSource> _enableNullDataSourceMap;
-  private Map<String, DataSource> _disableNullDataSourceMap;
-  private ProjectionBlock _enableNullProjectionBlock;
-  private ProjectionBlock _disableNullProjectionBlock;
-  protected static final int VALUE_MOD = 3;
+
+  private Map<String, DataSource> _dataSourceMap;
+  private ProjectionBlock _projectionBlock;
+
+  DistinctFromTransformFunctionTest(boolean isDistinctFrom) {
+    _isDistinctFrom = isDistinctFrom;
+    _expression = _isDistinctFrom ? "%s IS DISTINCT FROM %s" : "%s IS NOT DISTINCT FROM %s";
+  }
 
   private static String getIndexDirPath(String segmentName) {
     return FileUtils.getTempDirectoryPath() + File.separator + segmentName;
@@ -112,12 +115,9 @@ private static boolean isNullRow(int i) {
   @BeforeClass
   public void setup()
       throws Exception {
-    // Set up two tables: one with null option enable, the other with null option disable.
-    // Each table has two int columns.
-    // One column with every row filled in with random integer number.
-    // The other column has 1/3 rows equal to first column, 1/3 rows not equal to first column and 1/3 null rows.
-    FileUtils.deleteQuietly(new File(getIndexDirPath(DISABLE_NULL_SEGMENT_NAME)));
-    FileUtils.deleteQuietly(new File(getIndexDirPath(ENABLE_NULL_SEGMENT_NAME)));
+    // Sets up a table with two integer columns: one column with every row filled in with an integer number; the other
+    // column with 1/3 rows equal to first column, 1/3 rows not equal to first column, and 1/3 rows as null.
+    FileUtils.deleteQuietly(new File(getIndexDirPath(SEGMENT_NAME)));
     for (int i = 0; i < NUM_ROWS; i++) {
       _intSVValues[i] = RANDOM.nextInt();
     }
@@ -139,10 +139,8 @@ public void setup()
 
     Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(INT_SV_COLUMN, FieldSpec.DataType.INT)
         .addSingleValueDimension(INT_SV_NULL_COLUMN, FieldSpec.DataType.INT).build();
-    _enableNullDataSourceMap = getDataSourceMap(schema, rows, ENABLE_NULL_SEGMENT_NAME);
-    _enableNullProjectionBlock = getProjectionBlock(_enableNullDataSourceMap);
-    _disableNullDataSourceMap = getDataSourceMap(schema, rows, DISABLE_NULL_SEGMENT_NAME);
-    _disableNullProjectionBlock = getProjectionBlock(_disableNullDataSourceMap);
+    _dataSourceMap = getDataSourceMap(schema, rows, SEGMENT_NAME);
+    _projectionBlock = getProjectionBlock(_dataSourceMap);
   }
 
   protected void testTransformFunction(ExpressionContext expression, boolean[] expectedValues,
@@ -172,143 +170,119 @@ private TransformFunction getTransformFunctionInstance(ExpressionContext express
     return TransformFunctionFactory.get(expression, dataSourceMap);
   }
 
-  // Test that left column of the operator has null values and right column is not null.
   @Test
   public void testDistinctFromLeftNull()
       throws Exception {
-    ExpressionContext isDistinctFromExpression =
-        RequestContextUtils.getExpression(String.format(IS_DISTINCT_FROM_EXPR, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
-    TransformFunction isDistinctFromTransformFunction =
-        TransformFunctionFactory.get(isDistinctFromExpression, _enableNullDataSourceMap);
-    Assert.assertEquals(isDistinctFromTransformFunction.getName(), "is_distinct_from");
-    ExpressionContext isNotDistinctFromExpression =
-        RequestContextUtils.getExpression(String.format(IS_NOT_DISTINCT_FROM_EXPR, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
-    TransformFunction isNotDistinctFromTransformFunction =
-        TransformFunctionFactory.get(isNotDistinctFromExpression, _enableNullDataSourceMap);
-    Assert.assertEquals(isNotDistinctFromTransformFunction.getName(), "is_not_distinct_from");
-    boolean[] isDistinctFromExpectedIntValues = new boolean[NUM_ROWS];
-    boolean[] isNotDistinctFromExpectedIntValues = new boolean[NUM_ROWS];
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format(_expression, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertEquals(transformFunction.getName(), _isDistinctFrom ? "is_distinct_from" : "is_not_distinct_from");
+    boolean[] expectedIntValues = new boolean[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
       if (isEqualRow(i)) {
-        isDistinctFromExpectedIntValues[i] = false;
-        isNotDistinctFromExpectedIntValues[i] = true;
+        expectedIntValues[i] = !_isDistinctFrom;
       } else if (isNotEqualRow(i)) {
-        isDistinctFromExpectedIntValues[i] = true;
-        isNotDistinctFromExpectedIntValues[i] = false;
+        expectedIntValues[i] = _isDistinctFrom;
       } else if (isNullRow(i)) {
-        isDistinctFromExpectedIntValues[i] = true;
-        isNotDistinctFromExpectedIntValues[i] = false;
+        expectedIntValues[i] = _isDistinctFrom;
       }
     }
-    testTransformFunction(isDistinctFromExpression, isDistinctFromExpectedIntValues, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testTransformFunction(isNotDistinctFromExpression, isNotDistinctFromExpectedIntValues, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testTransformFunction(isDistinctFromExpression, isDistinctFromExpectedIntValues, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
-    testTransformFunction(isNotDistinctFromExpression, isNotDistinctFromExpectedIntValues, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
+
+    testTransformFunction(expression, expectedIntValues, _projectionBlock, _dataSourceMap);
   }
 
-  // Test that right column of the operator has null values and left column is not null.
   @Test
   public void testDistinctFromRightNull()
       throws Exception {
-    ExpressionContext isDistinctFromExpression =
-        RequestContextUtils.getExpression(String.format(IS_DISTINCT_FROM_EXPR, INT_SV_COLUMN, INT_SV_NULL_COLUMN));
-    TransformFunction isDistinctFromTransformFunction =
-        TransformFunctionFactory.get(isDistinctFromExpression, _enableNullDataSourceMap);
-    Assert.assertEquals(isDistinctFromTransformFunction.getName(), "is_distinct_from");
-    ExpressionContext isNotDistinctFromExpression =
-        RequestContextUtils.getExpression(String.format(IS_NOT_DISTINCT_FROM_EXPR, INT_SV_COLUMN, INT_SV_NULL_COLUMN));
-    TransformFunction isNotDistinctFromTransformFunction =
-        TransformFunctionFactory.get(isNotDistinctFromExpression, _enableNullDataSourceMap);
-    Assert.assertEquals(isNotDistinctFromTransformFunction.getName(), "is_not_distinct_from");
-    boolean[] isDistinctFromExpectedIntValues = new boolean[NUM_ROWS];
-    boolean[] isNotDistinctFromExpectedIntValues = new boolean[NUM_ROWS];
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format(_expression, INT_SV_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertEquals(transformFunction.getName(), _isDistinctFrom ? "is_distinct_from" : "is_not_distinct_from");
+    boolean[] expectedIntValues = new boolean[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
       if (isEqualRow(i)) {
-        isDistinctFromExpectedIntValues[i] = false;
-        isNotDistinctFromExpectedIntValues[i] = true;
+        expectedIntValues[i] = !_isDistinctFrom;
       } else if (isNotEqualRow(i)) {
-        isDistinctFromExpectedIntValues[i] = true;
-        isNotDistinctFromExpectedIntValues[i] = false;
+        expectedIntValues[i] = _isDistinctFrom;
       } else if (isNullRow(i)) {
-        isDistinctFromExpectedIntValues[i] = true;
-        isNotDistinctFromExpectedIntValues[i] = false;
+        expectedIntValues[i] = _isDistinctFrom;
       }
     }
-    testTransformFunction(isDistinctFromExpression, isDistinctFromExpectedIntValues, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testTransformFunction(isNotDistinctFromExpression, isNotDistinctFromExpectedIntValues, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testTransformFunction(isDistinctFromExpression, isDistinctFromExpectedIntValues, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
-    testTransformFunction(isNotDistinctFromExpression, isNotDistinctFromExpectedIntValues, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
+
+    testTransformFunction(expression, expectedIntValues, _projectionBlock, _dataSourceMap);
   }
 
-  // Test the cases where both left and right columns of th operator has null values.
   @Test
   public void testDistinctFromBothNull()
       throws Exception {
-    ExpressionContext isDistinctFromExpression =
-        RequestContextUtils.getExpression(String.format(IS_DISTINCT_FROM_EXPR, INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
-    TransformFunction isDistinctFromTransformFunction =
-        TransformFunctionFactory.get(isDistinctFromExpression, _enableNullDataSourceMap);
-    Assert.assertEquals(isDistinctFromTransformFunction.getName(), "is_distinct_from");
-    ExpressionContext isNotDistinctFromExpression = RequestContextUtils.getExpression(
-        String.format(IS_NOT_DISTINCT_FROM_EXPR, INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
-    TransformFunction isNotDistinctFromTransformFunction =
-        TransformFunctionFactory.get(isNotDistinctFromExpression, _enableNullDataSourceMap);
-    Assert.assertEquals(isNotDistinctFromTransformFunction.getName(), "is_not_distinct_from");
-    boolean[] isDistinctFromExpectedIntValues = new boolean[NUM_ROWS];
-    boolean[] isNotDistinctFromExpectedIntValues = new boolean[NUM_ROWS];
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format(_expression, INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertEquals(transformFunction.getName(), _isDistinctFrom ? "is_distinct_from" : "is_not_distinct_from");
+    boolean[] expectedIntValues = new boolean[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      isDistinctFromExpectedIntValues[i] = false;
-      isNotDistinctFromExpectedIntValues[i] = true;
+      expectedIntValues[i] = !_isDistinctFrom;
     }
-    testTransformFunction(isDistinctFromExpression, isDistinctFromExpectedIntValues, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testTransformFunction(isNotDistinctFromExpression, isNotDistinctFromExpectedIntValues, _enableNullProjectionBlock,
-        _enableNullDataSourceMap);
-    testTransformFunction(isDistinctFromExpression, isDistinctFromExpectedIntValues, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
-    testTransformFunction(isNotDistinctFromExpression, isNotDistinctFromExpectedIntValues, _disableNullProjectionBlock,
-        _disableNullDataSourceMap);
+
+    testTransformFunction(expression, expectedIntValues, _projectionBlock, _dataSourceMap);
   }
 
-  // Test that non-column-names appear in one side of the operator.
   @Test
-  public void testIllegalColumnName()
+  public void testDistinctFromLeftLiteralRightIdentifier()
       throws Exception {
-    ExpressionContext isDistinctFromExpression =
-        RequestContextUtils.getExpression(String.format(IS_DISTINCT_FROM_EXPR, _intSVValues[0], INT_SV_NULL_COLUMN));
-    ExpressionContext isNotDistinctFromExpression = RequestContextUtils.getExpression(
-        String.format(IS_NOT_DISTINCT_FROM_EXPR, _intSVValues[0], INT_SV_NULL_COLUMN));
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format(_expression, "NULL", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertEquals(transformFunction.getName(), _isDistinctFrom ? "is_distinct_from" : "is_not_distinct_from");
+    boolean[] expectedIntValues = new boolean[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedIntValues[i] = !_isDistinctFrom;
+      } else {
+        expectedIntValues[i] = _isDistinctFrom;
+      }
+    }
 
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(isDistinctFromExpression, _enableNullDataSourceMap);
-    });
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(isNotDistinctFromExpression, _enableNullDataSourceMap);
-    });
+    testTransformFunction(expression, expectedIntValues, _projectionBlock, _dataSourceMap);
   }
 
-  // Test that more than 2 arguments appear for the operator.
   @Test
-  public void testIllegalNumArgs()
+  public void testDistinctFromLeftFunctionRightIdentifier()
       throws Exception {
-    ExpressionContext isDistinctFromExpression = RequestContextUtils.getExpression(
-        String.format("is_distinct_from(%s, %s, %s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
-    ExpressionContext isNotDistinctFromExpression = RequestContextUtils.getExpression(
-        String.format("is_not_distinct_from(%s, %s, %s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format(_expression, "NULL + 1", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertEquals(transformFunction.getName(), _isDistinctFrom ? "is_distinct_from" : "is_not_distinct_from");
+    boolean[] expectedIntValues = new boolean[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedIntValues[i] = !_isDistinctFrom;
+      } else {
+        expectedIntValues[i] = _isDistinctFrom;
+      }
+    }
+
+    testTransformFunction(expression, expectedIntValues, _projectionBlock, _dataSourceMap);
+  }
+
+  @Test
+  public void testIllegalNumberOfArgs() {
+    String expressionTemplate = _isDistinctFrom ? "is_distinct_from(%s, %s, %s)" : "is_not_distinct_from(%s, %s, %s)";
+    ExpressionContext expression = RequestContextUtils.getExpression(
+        String.format(expressionTemplate, INT_SV_COLUMN, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
 
     Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(isDistinctFromExpression, _enableNullDataSourceMap);
-    });
-    Assert.assertThrows(RuntimeException.class, () -> {
-      TransformFunctionFactory.get(isNotDistinctFromExpression, _enableNullDataSourceMap);
+      TransformFunctionFactory.get(expression, _dataSourceMap);
     });
   }
+
+  @Test
+  public void testGetNullBitmapReturnsNull() {
+    ExpressionContext isDistinctFromExpression =
+        RequestContextUtils.getExpression(String.format(_expression, INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction isDistinctFromTransformFunction =
+        TransformFunctionFactory.get(isDistinctFromExpression, _dataSourceMap);
+
+    Assert.assertNull(isDistinctFromTransformFunction.getNullBitmap(_projectionBlock));
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java
index 40048eaeded..fd8b62300a0 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java
@@ -23,6 +23,7 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -130,4 +131,38 @@ public Object[][] testIllegalArguments() {
     }
     };
   }
+
+  @Test
+  public void testDivisionNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("div(%s,null)", INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof DivisionTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), DivisionTransformFunction.FUNCTION_NAME);
+    double[] expectedValues = new double[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      expectedValues[i] = _intSVValues[i] / Integer.MIN_VALUE;
+    }
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testDivisionNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("div(%s,%s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof DivisionTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), DivisionTransformFunction.FUNCTION_NAME);
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java
index 65e9596fb27..b0cae0ba0d6 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java
@@ -18,6 +18,12 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 public class EqualsTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
 
   @Override
@@ -29,4 +35,36 @@ boolean getExpectedValue(int compareResult) {
   String getFunctionName() {
     return new EqualsTransformFunction().getName();
   }
+
+  @Test
+  public void testEqualsNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("equals(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof EqualsTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "equals");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testEqualsNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("equals(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof EqualsTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "equals");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java
index 1c78b0def8f..8f25b62c9e9 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java
@@ -22,11 +22,13 @@
 import org.apache.pinot.common.function.scalar.DateTimeFunctions;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 
 public class ExtractTransformFunctionTest extends BaseTransformFunctionTest {
@@ -44,7 +46,7 @@ public static Object[][] testCases() {
         // TODO: Need to add timezone_hour and timezone_minute
 //      "timezone_hour",
 //      "timezone_minute",
-      //@formatter:on
+        //@formatter:on
     };
   }
 
@@ -63,4 +65,24 @@ public void testExtractTransformFunction(String field, LongToIntFunction expecte
       assertEquals(value[i], expected.applyAsInt(_timeValues[i]));
     }
   }
+
+  @Test(dataProvider = "testCases")
+  public void testExtractTransformFunctionNull(String field, LongToIntFunction expected) {
+    // NOTE: functionality of ExtractTransformFunction is covered in ExtractTransformFunctionTest
+    // SELECT EXTRACT(YEAR FROM '2017-10-10')
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("extract(%s FROM %s)", field, TIMESTAMP_COLUMN_NULL));
+
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof ExtractTransformFunction);
+    int[] values = transformFunction.transformToIntValuesSV(_projectionBlock);
+    RoaringBitmap nullBitmap = transformFunction.getNullBitmap(_projectionBlock);
+    for (int i = 0; i < _projectionBlock.getNumDocs(); i++) {
+      if (isNullRow(i)) {
+        assertTrue(nullBitmap.contains(i));
+      } else {
+        assertEquals(values[i], expected.applyAsInt(_timeValues[i]));
+      }
+    }
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java
index 83e60cdd7cf..4a5058e6368 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java
@@ -18,6 +18,13 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
 public class GreaterThanOrEqualTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
 
   @Override
@@ -29,4 +36,36 @@ boolean getExpectedValue(int compareResult) {
   String getFunctionName() {
     return new GreaterThanOrEqualTransformFunction().getName();
   }
+
+  @Test
+  public void testGreaterThanOrEqualNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("greater_than_or_equal(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof GreaterThanOrEqualTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "greater_than_or_equal");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testEqualsNullColumn() {
+    ExpressionContext expression = RequestContextUtils.getExpression(
+        String.format("greater_than_or_equal(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof GreaterThanOrEqualTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "greater_than_or_equal");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanTransformFunctionTest.java
index 06e8effacf3..dc3e9019905 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanTransformFunctionTest.java
@@ -18,6 +18,13 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
 public class GreaterThanTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
 
   @Override
@@ -29,4 +36,36 @@ boolean getExpectedValue(int compareResult) {
   String getFunctionName() {
     return new GreaterThanTransformFunction().getName();
   }
+
+  @Test
+  public void testGreaterThanNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("greater_than(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof GreaterThanTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "greater_than");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testGreaterThanNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("greater_than(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof GreaterThanTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "greater_than");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (i % 2 != 0) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 0;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunctionTest.java
new file mode 100644
index 00000000000..69b838b6db2
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IdentifierTransformFunctionTest.java
@@ -0,0 +1,107 @@
+/**
+ * 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.pinot.core.operator.transform.function;
+
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.operator.ColumnContext;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.when;
+
+
+public class IdentifierTransformFunctionTest {
+  private static final int NUM_DOCS = 100;
+
+  private static final int[] INT_VALUES;
+
+  private static final RoaringBitmap NULL_BITMAP;
+
+  static {
+    INT_VALUES = new int[100];
+    NULL_BITMAP = new RoaringBitmap();
+    for (int i = 0; i < NUM_DOCS; i++) {
+      INT_VALUES[i] = i;
+      if (i % 2 == 0) {
+        NULL_BITMAP.add(i);
+      }
+    }
+  }
+
+  private static final String TEST_COLUMN_NAME = "testColumn";
+
+  private AutoCloseable _mocks;
+
+  @Mock
+  private ColumnContext _columnContext;
+
+  @Mock
+  private ProjectionBlock _projectionBlock;
+
+  @Mock
+  private BlockValSet _blockValSet;
+
+  @Mock
+  private DataSource _dataSource;
+
+  @Mock
+  private Dictionary _dictionary;
+
+  @Mock
+  private DataSourceMetadata _metadata;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    when(_projectionBlock.getNumDocs()).thenReturn(NUM_DOCS);
+    when(_blockValSet.getIntValuesSV()).thenReturn(INT_VALUES);
+    when(_blockValSet.getNullBitmap()).thenReturn(NULL_BITMAP);
+    when(_projectionBlock.getBlockValueSet(TEST_COLUMN_NAME)).thenReturn(_blockValSet);
+    when(_columnContext.getDataSource()).thenReturn(_dataSource);
+    when(_dataSource.getDictionary()).thenReturn(_dictionary);
+    when(_dataSource.getDataSourceMetadata()).thenReturn(_metadata);
+    when(_metadata.getDataType()).thenReturn(FieldSpec.DataType.INT);
+    when(_metadata.isSingleValue()).thenReturn(true);
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void testNullBitmap() {
+    IdentifierTransformFunction identifierTransformFunction =
+        new IdentifierTransformFunction(TEST_COLUMN_NAME, _columnContext);
+    RoaringBitmap bitmap = identifierTransformFunction.getNullBitmap(_projectionBlock);
+    Assert.assertEquals(bitmap, NULL_BITMAP);
+    Assert.assertEquals(identifierTransformFunction.transformToIntValuesSV(_projectionBlock), INT_VALUES);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/InTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/InTransformFunctionTest.java
index 950c8da400f..f33b1138bd8 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/InTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/InTransformFunctionTest.java
@@ -19,20 +19,34 @@
 package org.apache.pinot.core.operator.transform.function;
 
 import com.google.common.collect.Sets;
+import java.util.Arrays;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.pinot.common.function.TransformFunctionType;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.apache.pinot.spi.utils.BytesUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 
 public class InTransformFunctionTest extends BaseTransformFunctionTest {
 
+  protected int getNotInIntSV() {
+    Set<Integer> intSVValues = Arrays.stream(_intSVValues).boxed().collect(Collectors.toSet());
+    int notIn = Integer.MAX_VALUE;
+    while (intSVValues.contains(notIn)) {
+      --notIn;
+    }
+    return notIn;
+  }
+
   @Test
   public void testIntInTransformFunction() {
     String expressionStr =
@@ -122,7 +136,6 @@ public void testLongInTransformFunction() {
     TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
     assertTrue(transformFunction instanceof InTransformFunction);
     assertEquals(transformFunction.getName(), TransformFunctionType.IN.getName());
-
     Set<Long> inValues = Sets.newHashSet(_longSVValues[2], _longSVValues[7], _longSVValues[11]);
     int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -209,4 +222,170 @@ public void testBytesInTransformFunction() {
       assertEquals(intValues[i], inValues.contains(new ByteArray(_bytesSVValues[i])) ? 1 : 0);
     }
   }
+
+  @Test
+  public void testInTransformFunctionNullLiteralReturnsNull() {
+    String expressionStr = String.format("%s IN (%s)", "NULL", INT_SV_NULL_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    expectedNullBitmap.add((long) 0, (long) NUM_ROWS);
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionFillsNullWithPlaceholder() {
+    String expressionStr = String.format("%s IN (%s)", "NULL", INT_SV_NULL_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    Arrays.fill(expectedIntValues, (int) DataSchema.ColumnDataType.INT.getNullPlaceholder());
+
+    assertEquals(transformFunction.transformToIntValuesSV(_projectionBlock), expectedIntValues);
+  }
+
+  @Test
+  public void testNotInTransformFunctionNullLiteralReturnsNull() {
+    String expressionStr = String.format("%s NOT IN (%s)", "NULL", INT_SV_NULL_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    expectedNullBitmap.add((long) 0, (long) NUM_ROWS);
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionNullIdentifierReturnsNull() {
+    String expressionStr = String.format("%s IN (%s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNullBitmap.add(i);
+      } else {
+        expectedIntValues[i] = 1;
+      }
+    }
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionLiteralNotInValuesThatContainNullReturnsNull() {
+    String expressionStr = String.format("%s IN (%s)", getNotInIntSV(), INT_SV_NULL_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNullBitmap.add(i);
+      } else {
+        expectedIntValues[i] = 0;
+      }
+    }
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testNotInTransformFunctionLiteralNotInValuesThatContainNullReturnsNull() {
+    String expressionStr = String.format("%s NOT IN (%s)", getNotInIntSV(), INT_SV_NULL_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNullBitmap.add(i);
+      } else {
+        expectedIntValues[i] = 1;
+      }
+    }
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionIdentifierInValuesThatContainNullReturnsTrue() {
+    String expressionStr = String.format("%s IN (%s, %s)", INT_SV_COLUMN, INT_SV_COLUMN, INT_SV_NULL_COLUMN);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    Arrays.fill(expectedIntValues, 1);
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionIdentifierInAllLiteralValuesThatContainNullReturnsTrue() {
+    String expressionStr = String.format("%s IN (%s, %s, null)", INT_SV_COLUMN, _intSVValues[0], _intSVValues[0] + 1);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+
+    assertEquals(transformFunction.transformToIntValuesSV(_projectionBlock)[0], 1);
+    assertFalse(transformFunction.getNullBitmap(_projectionBlock).contains(0));
+  }
+
+  @Test
+  public void testInTransformFunctionIdentifierNotInAllLiteralValuesThatContainNullReturnsNull() {
+    String expressionStr =
+        String.format("%s IN (%s, %s, NULL)", INT_SV_COLUMN, _intSVValues[0] + 1, _intSVValues[0] + 2);
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+
+    assertTrue(transformFunction.getNullBitmap(_projectionBlock).contains(0));
+  }
+
+  @Test
+  public void testInTransformFunctionLiteralInAllLiteralValuesThatContainNullReturnsTrue() {
+    String expressionStr = "1 IN (1, 2, NULL)";
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    int[] expectedIntValues = new int[NUM_ROWS];
+    Arrays.fill(expectedIntValues, 1);
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+
+    testTransformFunctionWithNull(transformFunction, expectedIntValues, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionLiteralNullAndAllLiteralValuesReturnsNull() {
+    String expressionStr = "NULL IN (1, 2, 3)";
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    expectedNullBitmap.add((long) 0, (long) NUM_ROWS);
+
+    testNullBitmap(transformFunction, expectedNullBitmap);
+  }
+
+  @Test
+  public void testInTransformFunctionLiteralNotInAllLiteralValuesThatContainNullReturnsNull() {
+    String expressionStr = "1 IN (2, 3, NULL)";
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    expectedNullBitmap.add((long) 0, (long) NUM_ROWS);
+
+    testNullBitmap(transformFunction, expectedNullBitmap);
+  }
+
+  @Test
+  public void testNotInTransformFunctionLiteralNotInAllLiteralValuesThatContainNullReturnsNull() {
+    String expressionStr = "1 NOT IN (2, 3, NULL)";
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap expectedNullBitmap = new RoaringBitmap();
+    expectedNullBitmap.add((long) 0, (long) NUM_ROWS);
+
+    testNullBitmap(transformFunction, expectedNullBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IsDistinctFromTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IsDistinctFromTransformFunctionTest.java
new file mode 100644
index 00000000000..628c206d64c
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IsDistinctFromTransformFunctionTest.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+
+public class IsDistinctFromTransformFunctionTest extends DistinctFromTransformFunctionTest {
+
+  IsDistinctFromTransformFunctionTest() {
+    super(true);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IsNotDistinctFromTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IsNotDistinctFromTransformFunctionTest.java
new file mode 100644
index 00000000000..1cab532d165
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/IsNotDistinctFromTransformFunctionTest.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+
+public class IsNotDistinctFromTransformFunctionTest extends DistinctFromTransformFunctionTest {
+
+  IsNotDistinctFromTransformFunctionTest() {
+    super(false);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java
index 652ced40b39..4ccc9e55360 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java
@@ -18,8 +18,14 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
-public class LessThanOrEqualTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 
+public class LessThanOrEqualTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
   @Override
   boolean getExpectedValue(int compareResult) {
     return compareResult <= 0;
@@ -29,4 +35,36 @@ boolean getExpectedValue(int compareResult) {
   String getFunctionName() {
     return new LessThanOrEqualTransformFunction().getName();
   }
+
+  @Test
+  public void testLessThanOrEqualNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("less_than_or_equal(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof LessThanOrEqualTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "less_than_or_equal");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testLessThanOrEqualsNullColumn() {
+    ExpressionContext expression = RequestContextUtils.getExpression(
+        String.format("less_than_or_equal(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof LessThanOrEqualTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "less_than_or_equal");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java
index 556ecdd5b94..d4f6d79f3eb 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java
@@ -18,6 +18,13 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
 public class LessThanTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
 
   @Override
@@ -29,4 +36,36 @@ boolean getExpectedValue(int compareResult) {
   String getFunctionName() {
     return new LessThanTransformFunction().getName();
   }
+
+  @Test
+  public void testLessThanNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("less_than(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof LessThanTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "less_than");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testLessThanNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("less_than(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof LessThanTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "less_than");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 0;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunctionTest.java
index 5fccb613ec1..b1d7d553437 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LiteralTransformFunctionTest.java
@@ -19,27 +19,63 @@
 package org.apache.pinot.core.operator.transform.function;
 
 import org.apache.pinot.common.request.context.LiteralContext;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.mockito.Mockito.when;
+
 
 public class LiteralTransformFunctionTest {
+  private static final int NUM_DOCS = 100;
+  private AutoCloseable _mocks;
+
+  @Mock
+  private ProjectionBlock _projectionBlock;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    when(_projectionBlock.getNumDocs()).thenReturn(NUM_DOCS);
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
 
   @Test
   public void testLiteralTransformFunction() {
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("abc"), DataType.STRING);
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("123"), DataType.INT);
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("2147483649"), DataType.LONG);
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("1.2"), DataType.FLOAT);
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("41241241.2412"), DataType.DOUBLE);
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("1.7976931348623159e+308"), DataType.BIG_DECIMAL);
-    Assert.assertEquals(LiteralTransformFunction.inferLiteralDataType("2020-02-02 20:20:20.20"), DataType.TIMESTAMP);
     LiteralTransformFunction trueBoolean = new LiteralTransformFunction(new LiteralContext(DataType.BOOLEAN, true));
     Assert.assertEquals(trueBoolean.getResultMetadata().getDataType(), DataType.BOOLEAN);
-    Assert.assertEquals(trueBoolean.getLiteral(), "true");
+    Assert.assertEquals(trueBoolean.getBooleanLiteral(), true);
     LiteralTransformFunction falseBoolean = new LiteralTransformFunction(new LiteralContext(DataType.BOOLEAN, false));
     Assert.assertEquals(falseBoolean.getResultMetadata().getDataType(), DataType.BOOLEAN);
-    Assert.assertEquals(falseBoolean.getLiteral(), "false");
+    Assert.assertEquals(falseBoolean.getBooleanLiteral(), false);
+    LiteralTransformFunction nullLiteral = new LiteralTransformFunction(new LiteralContext(DataType.UNKNOWN, true));
+    Assert.assertEquals(nullLiteral.getStringLiteral(), "null");
+  }
+
+  @Test
+  public void testNullTransform() {
+    LiteralTransformFunction nullLiteral = new LiteralTransformFunction(new LiteralContext(DataType.UNKNOWN, true));
+    Assert.assertEquals(nullLiteral.getStringLiteral(), "null");
+    RoaringBitmap bitmap = nullLiteral.getNullBitmap(_projectionBlock);
+    RoaringBitmap expectedBitmap = new RoaringBitmap();
+    expectedBitmap.add(0L, NUM_DOCS);
+    Assert.assertEquals(bitmap, expectedBitmap);
+    int[] intValues = nullLiteral.transformToIntValuesSV(_projectionBlock);
+    Assert.assertEquals(intValues.length, NUM_DOCS);
+    for (int i = 0; i < NUM_DOCS; i++) {
+      Assert.assertEquals(intValues[i], 0);
+    }
+    Assert.assertEquals(nullLiteral.getNullBitmap(_projectionBlock), expectedBitmap);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java
index 8093cad19d9..3d1845b97fe 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java
@@ -27,6 +27,7 @@
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -85,4 +86,51 @@ public Object[][] testIllegalArguments() {
     String intEqualsExpr = String.format("EQUALS(%s, %d)", INT_SV_COLUMN, _intSVValues[0]);
     return new Object[][]{new Object[]{intEqualsExpr}, new Object[]{intEqualsExpr, STRING_SV_COLUMN}};
   }
+
+  @Test
+  public void testLogicalOperatorNullLiteral() {
+    ExpressionContext intEqualsExpr =
+        RequestContextUtils.getExpression(String.format("EQUALS(%s, null)", INT_SV_COLUMN));
+    ExpressionContext longEqualsExpr =
+        RequestContextUtils.getExpression(String.format("EQUALS(%s, null)", LONG_SV_COLUMN));
+    String functionName = getFunctionName();
+    ExpressionContext expression = ExpressionContext.forFunction(
+        new FunctionContext(FunctionContext.Type.TRANSFORM, functionName,
+            Arrays.asList(intEqualsExpr, longEqualsExpr)));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertEquals(transformFunction.getName(), functionName);
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    assertEquals(resultMetadata.getDataType(), FieldSpec.DataType.BOOLEAN);
+    assertTrue(resultMetadata.isSingleValue());
+    assertFalse(resultMetadata.hasDictionary());
+    boolean[] expectedValues = new boolean[NUM_ROWS];
+    RoaringBitmap nullBitmap = new RoaringBitmap();
+    nullBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, nullBitmap);
+  }
+
+  @Test
+  public void testLogicalOperatorNullColumn() {
+    ExpressionContext intEqualsExpr =
+        RequestContextUtils.getExpression(String.format("EQUALS(%s, %s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN));
+    String functionName = getFunctionName();
+    ExpressionContext expression = ExpressionContext.forFunction(
+        new FunctionContext(FunctionContext.Type.TRANSFORM, functionName, Arrays.asList(intEqualsExpr, intEqualsExpr)));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertEquals(transformFunction.getName(), functionName);
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    assertEquals(resultMetadata.getDataType(), FieldSpec.DataType.BOOLEAN);
+    assertTrue(resultMetadata.isSingleValue());
+    assertFalse(resultMetadata.hasDictionary());
+    boolean[] expectedValues = new boolean[NUM_ROWS];
+    RoaringBitmap nullBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        nullBitmap.add(i);
+      } else {
+        expectedValues[i] = true;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, nullBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java
index ed9e2c5cd6d..c71ac818f75 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java
@@ -21,6 +21,7 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -104,4 +105,36 @@ public Object[][] testIllegalArguments() {
     }
     };
   }
+
+  @Test
+  public void testModuloNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("mod(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof ModuloTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "mod");
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testModuloNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("mod(%s, %s)", INT_SV_NULL_COLUMN, LONG_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof ModuloTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "mod");
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    double[] expectedValues = new double[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (double) _intSVValues[i] % (double) _longSVValues[i];
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java
index 1edbd49ab8b..b5158062f7a 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java
@@ -22,13 +22,13 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 
 public class MultiplicationTransformFunctionTest extends BaseTransformFunctionTest {
-
   @Test
   public void testMultiplicationTransformFunction() {
     ExpressionContext expression = RequestContextUtils.getExpression(
@@ -84,6 +84,37 @@ public void testMultiplicationTransformFunction() {
     }
   }
 
+  @Test
+  public void testMultiplicationNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("mult(null, 0)"));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof MultiplicationTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "mult");
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testModuloNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("mult(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof MultiplicationTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "mult");
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    double[] expectedValues = new double[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (double) _intSVValues[i] * (double) _intSVValues[i];
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
   @Test(dataProvider = "testIllegalArguments", expectedExceptions = {BadQueryRequestException.class})
   public void testIllegalArguments(String expressionStr) {
     ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java
index 9f3c4fa0dd5..cb6acc1897f 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java
@@ -18,6 +18,13 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
 public class NotEqualsTransformFunctionTest extends BinaryOperatorTransformFunctionTest {
 
   @Override
@@ -29,4 +36,36 @@ boolean getExpectedValue(int compareResult) {
   String getFunctionName() {
     return new NotEqualsTransformFunction().getName();
   }
+
+  @Test
+  public void testNotEqualsNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("not_equals(null, %s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof NotEqualsTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "not_equals");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testNotEqualsNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("not_equals(%s, %s)", INT_SV_NULL_COLUMN, INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof NotEqualsTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "not_equals");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 0;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java
index 088192200cd..c8d460ea77e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java
@@ -24,6 +24,8 @@
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.spi.data.FieldSpec;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -89,4 +91,34 @@ public void testIllegalNotOperatorTransformFunction() {
       TransformFunctionFactory.get(exprNumArg, _dataSourceMap);
     });
   }
+
+  @Test
+  public void testNotNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("Not(null)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof NotOperatorTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "not");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testNotNullColumn() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("Not(%s)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof NotOperatorTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), "not");
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i] == 0 ? 1 : 0;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NullHandlingTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NullHandlingTransformFunctionTest.java
index 4cb00e657fb..b412a6489fd 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NullHandlingTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NullHandlingTransformFunctionTest.java
@@ -193,6 +193,23 @@ public void testIsNullTransformFunction(String columnName)
     testTransformFunction(expression, expectedValues);
   }
 
+  @Test
+  public void testIsNullTransformFunctionNullLiteral()
+      throws Exception {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("null IS NULL"));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof IsNullTransformFunction);
+    assertEquals(transformFunction.getName(), TransformFunctionType.IS_NULL.getName());
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    assertEquals(resultMetadata.getDataType(), DataType.BOOLEAN);
+    assertTrue(resultMetadata.isSingleValue());
+    boolean[] expectedValues = new boolean[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      expectedValues[i] = true;
+    }
+    testTransformFunction(expression, expectedValues);
+  }
+
   @Test
   public void testIsNotNullTransformFunction()
       throws Exception {
@@ -221,6 +238,23 @@ public void testIsNotNullTransformFunction(String columnName)
     testTransformFunction(expression, expectedValues);
   }
 
+  @Test
+  public void testIsNotNullTransformFunctionNullLiteral()
+      throws Exception {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("null IS NOT NULL"));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof IsNotNullTransformFunction);
+    assertEquals(transformFunction.getName(), TransformFunctionType.IS_NOT_NULL.getName());
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    assertEquals(resultMetadata.getDataType(), DataType.BOOLEAN);
+    assertTrue(resultMetadata.isSingleValue());
+    boolean[] expectedValues = new boolean[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      expectedValues[i] = false;
+    }
+    testTransformFunction(expression, expectedValues);
+  }
+
   protected void testTransformFunction(ExpressionContext expression, boolean[] expectedValues)
       throws Exception {
     int[] intValues = getTransformFunctionInstance(expression).transformToIntValuesSV(_projectionBlock);
@@ -229,16 +263,14 @@ protected void testTransformFunction(ExpressionContext expression, boolean[] exp
     double[] doubleValues = getTransformFunctionInstance(expression).transformToDoubleValuesSV(_projectionBlock);
     BigDecimal[] bigDecimalValues =
         getTransformFunctionInstance(expression).transformToBigDecimalValuesSV(_projectionBlock);
-    // TODO: Support implicit cast from BOOLEAN to STRING
-//    String[] stringValues = getTransformFunctionInstance(expression).transformToStringValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
       assertEquals(intValues[i] == 1, expectedValues[i]);
       assertEquals(longValues[i] == 1, expectedValues[i]);
       assertEquals(floatValues[i] == 1, expectedValues[i]);
       assertEquals(doubleValues[i] == 1, expectedValues[i]);
       assertEquals(bigDecimalValues[i].intValue() == 1, expectedValues[i]);
-//      assertEquals(stringValues[i], Boolean.toString(expectedValues[i]));
     }
+    assertEquals(getTransformFunctionInstance(expression).getNullBitmap(_projectionBlock), null);
   }
 
   private TransformFunction getTransformFunctionInstance(ExpressionContext expression) {
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java
index fbf4271a048..4af0e3acbe1 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java
@@ -19,6 +19,11 @@
 package org.apache.pinot.core.operator.transform.function;
 
 import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 
 public class OrOperatorTransformFunctionTest extends LogicalOperatorTransformFunctionTest {
@@ -32,4 +37,40 @@ boolean getExpectedValue(boolean left, boolean right) {
   String getFunctionName() {
     return TransformFunctionType.OR.getName();
   }
+
+  @Test
+  public void testOrNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("or(%s,null)", INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof OrOperatorTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.OR.getName());
+    int[] expectedValues = new int[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      expectedValues[i] = 1;
+    }
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testOrNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("or(%s,%s)", INT_SV_COLUMN, INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof OrOperatorTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.OR.getName());
+    int[] expectedValues = new int[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        // null int is set to int min in field spec.
+        expectedValues[i] = 1;
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (_intSVValues[i] == 0) ? 0 : 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java
index 3c3b29f8de2..928a4c719c2 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java
@@ -18,8 +18,10 @@
  */
 package org.apache.pinot.core.operator.transform.function;
 
+import org.apache.pinot.common.function.TransformFunctionType;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -86,8 +88,42 @@ public void testPowerTransformFunctionWithLiteralExponents() {
     Assert.assertEquals(transformFunction.getName(), PowerTransformFunction.FUNCTION_NAME);
     double[] expectedValues = new double[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      expectedValues[i] = Math.pow((double) _intSVValues[i], exponent);
+      expectedValues[i] = Math.pow(_intSVValues[i], exponent);
     }
     testTransformFunction(transformFunction, expectedValues);
   }
+
+  @Test
+  public void testPowerNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression(String.format("power(%s,null)", INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof PowerTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.POWER.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    for (int i = 0; i < NUM_ROWS; i++) {
+      expectedValues[i] = 1;
+    }
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testPowerNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("power(%s,%s)", INT_SV_NULL_COLUMN, 0));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof PowerTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.POWER.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java
index 9fe3d8151ff..3a2ab38e2d3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java
@@ -20,8 +20,10 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import org.apache.pinot.common.function.TransformFunctionType;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -59,10 +61,41 @@ public void testRoundDecimalTransformFunction() {
     for (int i = 0; i < NUM_ROWS; i++) {
       expectedValues[i] = round(_doubleSVValues[i], 0);
     }
-    testTransformFunction(transformFunction, expectedValues);
   }
 
   public Double round(double a, int b) {
     return BigDecimal.valueOf(a).setScale(b, RoundingMode.HALF_UP).doubleValue();
   }
+
+  @Test
+  public void testRoundDecimalNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("round_decimal(null)", INT_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof RoundDecimalTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.ROUND_DECIMAL.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testRoundDecimalNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("round_decimal(%s)", INT_SV_NULL_COLUMN, 0));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof RoundDecimalTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.ROUND_DECIMAL.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java
index cade1b2c6ff..117779acac2 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java
@@ -34,6 +34,7 @@
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ArrayCopyUtils;
 import org.apache.pinot.spi.utils.BigDecimalUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -1012,4 +1013,36 @@ public void testBigDecimalSerDeTransformFunction() {
     assertEquals(transformFunction.getName(), "bytesToBigDecimal");
     testTransformFunction(transformFunction, _bigDecimalSVValues);
   }
+
+  @Test
+  public void testStringLowerTransformFunctionNullLiteral() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression("lower(null)");
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
+    assertEquals(transformFunction.getName(), "lower");
+    String[] expectedValues = new String[NUM_ROWS];
+    RoaringBitmap bitmap = new RoaringBitmap();
+    bitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
+  }
+
+  @Test
+  public void testStringLowerTransformFunctionNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("lower(%s)", STRING_ALPHANUM_NULL_SV_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
+    assertEquals(transformFunction.getName(), "lower");
+    String[] expectedValues = new String[NUM_ROWS];
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = _stringAlphaNumericSVValues[i].toLowerCase();
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java
index 1acf26db602..581ba61c213 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java
@@ -31,12 +31,12 @@
 import org.apache.pinot.core.operator.transform.function.SingleParamMathTransformFunction.Log2TransformFunction;
 import org.apache.pinot.core.operator.transform.function.SingleParamMathTransformFunction.SignTransformFunction;
 import org.apache.pinot.core.operator.transform.function.SingleParamMathTransformFunction.SqrtTransformFunction;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 
 public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionTest {
-
   @Test
   public void testAbsTransformFunction() {
     ExpressionContext expression = RequestContextUtils.getExpression(String.format("abs(%s)", INT_SV_COLUMN));
@@ -89,6 +89,19 @@ public void testAbsTransformFunction() {
       expectedBigDecimalValues[i] = _bigDecimalSVValues[i].abs();
     }
     testTransformFunction(transformFunction, expectedBigDecimalValues);
+
+    expression = RequestContextUtils.getExpression(String.format("abs(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof AbsTransformFunction);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.abs(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -143,6 +156,18 @@ public void testCeilTransformFunction() {
       expectedBigDecimalValues[i] = _bigDecimalSVValues[i].setScale(0, RoundingMode.CEILING);
     }
     testTransformFunction(transformFunction, expectedBigDecimalValues);
+    expression = RequestContextUtils.getExpression(String.format("ceil(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof CeilTransformFunction);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.ceil(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -197,6 +222,19 @@ public void testExpTransformFunction() {
       expectedValues[i] = Math.exp(_bigDecimalSVValues[i].doubleValue());
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    expression = RequestContextUtils.getExpression(String.format("exp(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof ExpTransformFunction);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.exp(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -252,6 +290,19 @@ public void testFloorTransformFunction() {
       ;
     }
     testTransformFunction(transformFunction, expectedBigDecimalValues);
+
+    expression = RequestContextUtils.getExpression(String.format("floor(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof FloorTransformFunction);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.floor(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -306,6 +357,19 @@ public void testLnTransformFunction() {
       expectedValues[i] = Math.log(_bigDecimalSVValues[i].doubleValue());
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    expression = RequestContextUtils.getExpression(String.format("ln(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof LnTransformFunction);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.log(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -360,6 +424,19 @@ public void testSqrtTransformFunction() {
       expectedValues[i] = Math.sqrt(_bigDecimalSVValues[i].doubleValue());
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    expression = RequestContextUtils.getExpression(String.format("sqrt(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof SqrtTransformFunction);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.sqrt(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -382,6 +459,19 @@ public void testCombinationMathTransformFunctions() {
           .add(BigDecimal.valueOf(Math.ceil(_intSVValues[i])));
     }
     testTransformFunction(transformFunction, expectedBigDecimalValues);
+
+    expression = RequestContextUtils.getExpression(
+        String.format("add(ceil(%s), sqrt(%s))", INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.sqrt(_intSVValues[i]) + Math.ceil(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -427,6 +517,18 @@ public void testLog10TransformFunction() {
       expectedValues[i] = Math.log10(Double.parseDouble(_stringSVValues[i]));
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    expression = RequestContextUtils.getExpression(String.format("log10(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.log10(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -472,6 +574,18 @@ public void testLog2TransformFunction() {
       expectedValues[i] = Math.log(Double.parseDouble(_stringSVValues[i])) / Math.log(2);
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    expression = RequestContextUtils.getExpression(String.format("log2(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.log(_intSVValues[i]) / Math.log(2);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 
   @Test
@@ -517,5 +631,16 @@ public void testSignTransformFunction() {
       expectedValues[i] = Math.signum(Double.parseDouble(_stringSVValues[i]));
     }
     testTransformFunction(transformFunction, expectedValues);
+    expression = RequestContextUtils.getExpression(String.format("sign(%s)", INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.signum(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java
index 97f9b0f4071..fc2dfefd125 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java
@@ -19,16 +19,17 @@
 package org.apache.pinot.core.operator.transform.function;
 
 import java.math.BigDecimal;
+import org.apache.pinot.common.function.TransformFunctionType;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 
 public class SubtractionTransformFunctionTest extends BaseTransformFunctionTest {
-
   @Test
   public void testSubtractionTransformFunction() {
     ExpressionContext expression =
@@ -117,4 +118,35 @@ public Object[][] testIllegalArguments() {
     }
     };
   }
+
+  @Test
+  public void testSubtractionNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression("sub(null, 1)");
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof SubtractionTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.SUB.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testSubtractionNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("sub(%s, 0)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof SubtractionTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.SUB.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java
index 2540f6c9cfc..5cf5e06dbfc 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java
@@ -24,6 +24,7 @@
 import org.apache.pinot.core.operator.transform.TransformResultMetadata;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -51,6 +52,28 @@ public void testTimeConversionTransformFunction(String expressionStr) {
     testTransformFunction(transformFunction, expectedValues);
   }
 
+  @Test(dataProvider = "testTimeConversionTransformFunctionNull")
+  public void testTimeConversionTransformFunctionNullColumn(String expressionStr) {
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof TimeConversionTransformFunction);
+    assertEquals(transformFunction.getName(), TimeConversionTransformFunction.FUNCTION_NAME);
+    TransformResultMetadata resultMetadata = transformFunction.getResultMetadata();
+    assertEquals(resultMetadata.getDataType(), DataType.LONG);
+    assertTrue(resultMetadata.isSingleValue());
+    assertFalse(resultMetadata.hasDictionary());
+    long[] expectedValues = new long[NUM_ROWS];
+    RoaringBitmap expectedNull = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNull.add(i);
+      } else {
+        expectedValues[i] = TimeUnit.MILLISECONDS.toDays(_timeValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, expectedNull);
+  }
+
   @DataProvider(name = "testTimeConversionTransformFunction")
   public Object[][] testTimeConversionTransformFunction() {
     return new Object[][]{
@@ -64,6 +87,19 @@ public Object[][] testTimeConversionTransformFunction() {
     };
   }
 
+  @DataProvider(name = "testTimeConversionTransformFunctionNull")
+  public Object[][] testTimeConversionTransformFunctionNull() {
+    return new Object[][]{
+        new Object[]{
+            String.format("timeConvert(%s,'MILLISECONDS','DAYS')", TIMESTAMP_COLUMN_NULL)
+        }, new Object[]{
+        String.format(
+            "timeConvert(timeConvert(timeConvert(%s,'MILLISECONDS','SECONDS'),'SECONDS','HOURS'),'HOURS','DAYS')",
+            TIMESTAMP_COLUMN_NULL)
+    }
+    };
+  }
+
   @Test(dataProvider = "testIllegalArguments", expectedExceptions = {BadQueryRequestException.class})
   public void testIllegalArguments(String expressionStr) {
     ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java
index ad467f6263e..fdfb3c60842 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java
@@ -33,6 +33,7 @@
 import org.apache.pinot.core.operator.transform.function.TrigonometricTransformFunctions.SinhTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TrigonometricTransformFunctions.TanTransformFunction;
 import org.apache.pinot.core.operator.transform.function.TrigonometricTransformFunctions.TanhTransformFunction;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -159,5 +160,20 @@ public void testTrigonometricTransformFunction(Class<?> clazz, String sqlFunctio
       expectedValues[i] = op.applyAsDouble(Double.parseDouble(_stringSVValues[i]));
     }
     testTransformFunction(transformFunction, expectedValues);
+
+    expression = RequestContextUtils.getExpression(String.format("%s(%s)", sqlFunction, INT_SV_NULL_COLUMN));
+    transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(clazz.isInstance(transformFunction));
+    Assert.assertEquals(transformFunction.getName(), sqlFunction);
+    expectedValues = new double[NUM_ROWS];
+    RoaringBitmap bitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        bitmap.add(i);
+      } else {
+        expectedValues[i] = op.applyAsDouble(_intSVValues[i]);
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java
index 46e26bff6a4..05ea6c88886 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java
@@ -20,8 +20,10 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import org.apache.pinot.common.function.TransformFunctionType;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -65,4 +67,35 @@ public void testTruncateDecimalTransformFunction() {
   public Double truncate(double a, int b) {
     return BigDecimal.valueOf(a).setScale(b, RoundingMode.DOWN).doubleValue();
   }
+
+  @Test
+  public void testTruncateNullLiteral() {
+    ExpressionContext expression = RequestContextUtils.getExpression("truncate(null, 1)");
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof TruncateDecimalTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.TRUNCATE.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    roaringBitmap.add(0L, NUM_ROWS);
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
+
+  @Test
+  public void testTruncateNullColumn() {
+    ExpressionContext expression =
+        RequestContextUtils.getExpression(String.format("truncate(%s, 0)", INT_SV_NULL_COLUMN));
+    TransformFunction transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
+    Assert.assertTrue(transformFunction instanceof TruncateDecimalTransformFunction);
+    Assert.assertEquals(transformFunction.getName(), TransformFunctionType.TRUNCATE.getName());
+    double[] expectedValues = new double[NUM_ROWS];
+    RoaringBitmap roaringBitmap = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
+      }
+    }
+    testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java
index 74552aae865..291b93eff80 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java
@@ -24,6 +24,7 @@
 import org.apache.pinot.common.request.context.RequestContextUtils;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.exception.BadQueryRequestException;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -35,37 +36,36 @@ public class TupleSelectionTransformFunctionsTest extends BaseTransformFunctionT
 
   @DataProvider
   public static Object[][] rejectedParameters() {
-    return new Object[][] {
-        {"()"},
-        {String.format("(%s)", INT_MV_COLUMN)},
-        {String.format("(%s)", LONG_MV_COLUMN)},
-        {String.format("(%s)", FLOAT_MV_COLUMN)},
-        {String.format("(%s)", DOUBLE_MV_COLUMN)},
-        {String.format("(%s)", STRING_MV_COLUMN)},
-        {String.format("(%s, %s)", INT_MV_COLUMN, INT_SV_COLUMN)},
-        {String.format("(%s, %s)", STRING_SV_COLUMN, INT_SV_COLUMN)},
-        {String.format("(%s, %s)", STRING_SV_COLUMN, LONG_SV_COLUMN)},
-        {String.format("(%s, %s)", STRING_SV_COLUMN, FLOAT_SV_COLUMN)},
-        {String.format("(%s, %s)", STRING_SV_COLUMN, DOUBLE_SV_COLUMN)},
-        {String.format("(%s, %s)", STRING_SV_COLUMN, TIMESTAMP_COLUMN)},
-        {String.format("(%s, %s)", INT_SV_COLUMN, TIMESTAMP_COLUMN)},
-        {String.format("(%s, %s)", FLOAT_SV_COLUMN, TIMESTAMP_COLUMN)},
-        {String.format("(%s, %s)", DOUBLE_SV_COLUMN, TIMESTAMP_COLUMN)},
-        {String.format("(%s, %s)", TIMESTAMP_COLUMN, INT_SV_COLUMN)},
-        {String.format("(%s, %s)", INT_SV_COLUMN, INT_MV_COLUMN)},
-        {String.format("(%s, %s)", INT_SV_COLUMN, STRING_SV_COLUMN)},
-        {String.format("(%s, %s)", TIMESTAMP_COLUMN, INT_SV_COLUMN)},
-        {String.format("(%s, %s)", TIMESTAMP_COLUMN, FLOAT_SV_COLUMN)},
-        {String.format("(%s, %s)", TIMESTAMP_COLUMN, DOUBLE_SV_COLUMN)},
-        {String.format("(%s, %s)", TIMESTAMP_COLUMN, STRING_SV_COLUMN)},
-        {String.format("(%s, %s)", TIMESTAMP_COLUMN, TIME_COLUMN)}
+    return new Object[][]{
+        {"()"}, {String.format("(%s)", INT_MV_COLUMN)}, {String.format("(%s)", LONG_MV_COLUMN)}, {
+        String.format("(%s)", FLOAT_MV_COLUMN)
+    }, {String.format("(%s)", DOUBLE_MV_COLUMN)}, {String.format("(%s)", STRING_MV_COLUMN)}, {
+        String.format("(%s, %s)", INT_MV_COLUMN, INT_SV_COLUMN)
+    }, {String.format("(%s, %s)", STRING_SV_COLUMN, INT_SV_COLUMN)}, {
+        String.format("(%s, %s)", STRING_SV_COLUMN, LONG_SV_COLUMN)
+    }, {String.format("(%s, %s)", STRING_SV_COLUMN, FLOAT_SV_COLUMN)}, {
+        String.format("(%s, %s)", STRING_SV_COLUMN, DOUBLE_SV_COLUMN)
+    }, {String.format("(%s, %s)", STRING_SV_COLUMN, TIMESTAMP_COLUMN)}, {
+        String.format("(%s, %s)", INT_SV_COLUMN, TIMESTAMP_COLUMN)
+    }, {String.format("(%s, %s)", FLOAT_SV_COLUMN, TIMESTAMP_COLUMN)}, {
+        String.format("(%s, %s)", DOUBLE_SV_COLUMN, TIMESTAMP_COLUMN)
+    }, {String.format("(%s, %s)", TIMESTAMP_COLUMN, INT_SV_COLUMN)}, {
+        String.format("(%s, %s)", INT_SV_COLUMN, INT_MV_COLUMN)
+    }, {String.format("(%s, %s)", INT_SV_COLUMN, STRING_SV_COLUMN)}, {
+        String.format("(%s, %s)", TIMESTAMP_COLUMN, INT_SV_COLUMN)
+    }, {String.format("(%s, %s)", TIMESTAMP_COLUMN, FLOAT_SV_COLUMN)}, {
+        String.format("(%s, %s)", TIMESTAMP_COLUMN, DOUBLE_SV_COLUMN)
+    }, {String.format("(%s, %s)", TIMESTAMP_COLUMN, STRING_SV_COLUMN)}, {
+        String.format("(%s, %s)", TIMESTAMP_COLUMN, TIME_COLUMN)
+    }
     };
   }
 
   @Test
   public void testLeastTransformFunctionInt() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, %d, cast(%s as INT))", INT_SV_COLUMN, -1, FLOAT_SV_COLUMN));
+    // -1 will be passed in as a long.
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, %d, cast(%s as INT))", INT_SV_COLUMN, -1, FLOAT_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.INT);
     int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -88,8 +88,7 @@ public void testLeastTransformFunctionString() {
 
   @Test
   public void testLeastTransformFunctionUnaryInt() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s)", INT_SV_COLUMN));
+    TransformFunction transformFunction = testLeastPreconditions(String.format("least(%s)", INT_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.INT);
     int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -99,8 +98,8 @@ public void testLeastTransformFunctionUnaryInt() {
 
   @Test
   public void testLeastTransformFunctionIntLong() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, %d, %s)", INT_SV_COLUMN, -1, LONG_SV_COLUMN));
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, %d, %s)", INT_SV_COLUMN, -1, LONG_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.LONG);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -110,8 +109,7 @@ public void testLeastTransformFunctionIntLong() {
 
   @Test
   public void testLeastTransformFunctionUnaryLong() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s)", LONG_SV_COLUMN));
+    TransformFunction transformFunction = testLeastPreconditions(String.format("least(%s)", LONG_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.LONG);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -121,8 +119,8 @@ public void testLeastTransformFunctionUnaryLong() {
 
   @Test
   public void testLeastTransformFunctionIntFloat() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, %d, %s)", INT_SV_COLUMN, -1, FLOAT_SV_COLUMN));
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, %d, %s)", INT_SV_COLUMN, -1, FLOAT_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -132,8 +130,7 @@ public void testLeastTransformFunctionIntFloat() {
 
   @Test
   public void testLeastTransformFunctionUnaryFloat() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s)", FLOAT_SV_COLUMN));
+    TransformFunction transformFunction = testLeastPreconditions(String.format("least(%s)", FLOAT_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.FLOAT);
     float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -143,8 +140,8 @@ public void testLeastTransformFunctionUnaryFloat() {
 
   @Test
   public void testLeastTransformFunctionIntDouble() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, %d, %s)", INT_SV_COLUMN, -1, DOUBLE_SV_COLUMN));
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, %d, %s)", INT_SV_COLUMN, -1, DOUBLE_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -154,8 +151,7 @@ public void testLeastTransformFunctionIntDouble() {
 
   @Test
   public void testLeastTransformFunctionUnaryDouble() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s)", DOUBLE_SV_COLUMN));
+    TransformFunction transformFunction = testLeastPreconditions(String.format("least(%s)", DOUBLE_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -177,8 +173,8 @@ public void testLeastTransformFunctionNumericTypes1() {
 
   @Test
   public void testLeastTransformFunctionNumericTypes2() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, %s, %s)", INT_SV_COLUMN, FLOAT_SV_COLUMN, LONG_SV_COLUMN));
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, %s, %s)", INT_SV_COLUMN, FLOAT_SV_COLUMN, LONG_SV_COLUMN));
     // Note: In the current code, least return type is DOUBLE if there is a float input, but output values are float!
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
@@ -189,8 +185,8 @@ public void testLeastTransformFunctionNumericTypes2() {
 
   @Test
   public void testLeastTransformFunctionTime() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, cast(%s AS TIMESTAMP))", TIMESTAMP_COLUMN, LONG_SV_COLUMN));
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, cast(%s AS TIMESTAMP))", TIMESTAMP_COLUMN, LONG_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.TIMESTAMP);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -210,8 +206,8 @@ public void testLeastTransformFunctionUnaryString() {
 
   @Test
   public void testLeastTransformFunctionTimestampWithLegacyTimeColumn() {
-    TransformFunction transformFunction = testLeastPreconditions(
-        String.format("least(%s, cast(%s as TIMESTAMP))", TIMESTAMP_COLUMN, TIME_COLUMN));
+    TransformFunction transformFunction =
+        testLeastPreconditions(String.format("least(%s, cast(%s as TIMESTAMP))", TIMESTAMP_COLUMN, TIME_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.TIMESTAMP);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -219,6 +215,61 @@ public void testLeastTransformFunctionTimestampWithLegacyTimeColumn() {
     }
   }
 
+  @Test
+  public void testLeastTransformFunctionNullLiteral() {
+    TransformFunction transformFunction = testLeastPreconditionsNullHandlingEnabled(
+        String.format("least(%s, null, %s)", INT_SV_COLUMN, DOUBLE_SV_COLUMN));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      assertEquals(doubleValues[i], Math.min(_intSVValues[i], _doubleSVValues[i]));
+    }
+    assertEquals(transformFunction.getNullBitmap(_projectionBlock), null);
+  }
+
+  @Test
+  public void testLeastTransformFunctionNullColumn() {
+    TransformFunction transformFunction = testLeastPreconditionsNullHandlingEnabled(
+        String.format("least(%s, null, %s)", INT_SV_NULL_COLUMN, DOUBLE_SV_COLUMN));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        assertEquals(doubleValues[i], _doubleSVValues[i]);
+      } else {
+        assertEquals(doubleValues[i], Math.min(_intSVValues[i], _doubleSVValues[i]));
+      }
+    }
+    testNullBitmap(transformFunction, null);
+  }
+
+  @Test
+  public void testLeastTransformFunctionAllNulls() {
+    TransformFunction transformFunction =
+        testLeastPreconditionsNullHandlingEnabled(String.format("least(null, null, null)"));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.UNKNOWN);
+    RoaringBitmap expectedNull = new RoaringBitmap();
+    expectedNull.add(0L, NUM_ROWS);
+    assertEquals(transformFunction.getNullBitmap(_projectionBlock), expectedNull);
+  }
+
+  @Test
+  public void testLeastTransformFunctionPartialAllNulls() {
+    TransformFunction transformFunction = testLeastPreconditionsNullHandlingEnabled(
+        String.format("least(%s, %s, %s)", INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.INT);
+   int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+    RoaringBitmap expectedNull = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNull.add(i);
+      } else {
+        assertEquals(intValues[i], _intSVValues[i]);
+      }
+    }
+    testNullBitmap(transformFunction, expectedNull);
+  }
+
   @Test(dataProvider = "rejectedParameters", expectedExceptions = BadQueryRequestException.class)
   public void testRejectLeast(String params) {
     testGreatestPreconditions("least" + params);
@@ -247,8 +298,8 @@ public void testGreatestTransformFunctionUnaryInt() {
 
   @Test
   public void testGreatestTransformFunctionIntLong() {
-    TransformFunction transformFunction = testGreatestPreconditions(
-        String.format("greatest(%s, %d, %s)", INT_SV_COLUMN, -1, LONG_SV_COLUMN));
+    TransformFunction transformFunction =
+        testGreatestPreconditions(String.format("greatest(%s, %d, %s)", INT_SV_COLUMN, -1, LONG_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.LONG);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -268,8 +319,8 @@ public void testGreatestTransformFunctionUnaryLong() {
 
   @Test
   public void testGreatestTransformFunctionIntFloat() {
-    TransformFunction transformFunction = testGreatestPreconditions(
-        String.format("greatest(%s, %d, %s)", INT_SV_COLUMN, -1, FLOAT_SV_COLUMN));
+    TransformFunction transformFunction =
+        testGreatestPreconditions(String.format("greatest(%s, %d, %s)", INT_SV_COLUMN, -1, FLOAT_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -299,8 +350,8 @@ public void testGreatestTransformFunctionUnaryString() {
 
   @Test
   public void testGreatestTransformFunctionIntDouble() {
-    TransformFunction transformFunction = testGreatestPreconditions(
-        String.format("greatest(%s, %d, %s)", INT_SV_COLUMN, -1, DOUBLE_SV_COLUMN));
+    TransformFunction transformFunction =
+        testGreatestPreconditions(String.format("greatest(%s, %d, %s)", INT_SV_COLUMN, -1, DOUBLE_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -308,6 +359,62 @@ public void testGreatestTransformFunctionIntDouble() {
     }
   }
 
+  @Test
+  public void testGreatestTransformFunctionNullLiteral() {
+    TransformFunction transformFunction = testGreatestPreconditionsNullHandlingEnabled(
+        String.format("greatest(%s, null, %s)", INT_SV_COLUMN, DOUBLE_SV_COLUMN));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      assertEquals(doubleValues[i], Math.max(_intSVValues[i], _doubleSVValues[i]));
+    }
+    testNullBitmap(transformFunction, null);
+  }
+
+  @Test
+  public void testGreatestTransformFunctionNullColumn() {
+    TransformFunction transformFunction = testGreatestPreconditionsNullHandlingEnabled(
+        String.format("greatest(%s, null, %s)", INT_SV_NULL_COLUMN, DOUBLE_SV_COLUMN));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        assertEquals(doubleValues[i], _doubleSVValues[i]);
+      } else {
+        assertEquals(doubleValues[i], Math.max(_intSVValues[i], _doubleSVValues[i]));
+      }
+    }
+    testNullBitmap(transformFunction, null);
+  }
+
+  @Test
+  public void testGreatestTransformFunctionAllNulls() {
+    TransformFunction transformFunction =
+        testGreatestPreconditionsNullHandlingEnabled(String.format("greatest(null, null, null)"));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.UNKNOWN);
+    double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
+    RoaringBitmap expectedNull = new RoaringBitmap();
+    expectedNull.add(0L, NUM_ROWS);
+    testNullBitmap(transformFunction, expectedNull);
+  }
+
+  @Test
+  public void testGreatestTransformFunctionPartialAllNulls() {
+    TransformFunction transformFunction = testGreatestPreconditionsNullHandlingEnabled(
+        String.format("greatest(%s, %s, %s)", INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN, INT_SV_NULL_COLUMN));
+    assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.INT);
+    int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
+    RoaringBitmap expectedNull = new RoaringBitmap();
+    for (int i = 0; i < NUM_ROWS; i++) {
+      if (isNullRow(i)) {
+        expectedNull.add(i);
+      } else {
+        assertEquals(intValues[i], _intSVValues[i]);
+      }
+    }
+    testNullBitmap(transformFunction, expectedNull);
+  }
+
   @Test
   public void testGreatestTransformFunctionString() {
     TransformFunction transformFunction = testGreatestPreconditions(
@@ -323,8 +430,7 @@ public void testGreatestTransformFunctionString() {
 
   @Test
   public void testGreatestTransformFunctionUnaryDouble() {
-    TransformFunction transformFunction = testGreatestPreconditions(
-        String.format("greatest(%s)", DOUBLE_SV_COLUMN));
+    TransformFunction transformFunction = testGreatestPreconditions(String.format("greatest(%s)", DOUBLE_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -334,8 +440,8 @@ public void testGreatestTransformFunctionUnaryDouble() {
 
   @Test
   public void testGreatestTransformFunctionUnaryBigDecimal() {
-    TransformFunction transformFunction = testGreatestPreconditions(
-        String.format("greatest(%s)", BIG_DECIMAL_SV_COLUMN));
+    TransformFunction transformFunction =
+        testGreatestPreconditions(String.format("greatest(%s)", BIG_DECIMAL_SV_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.BIG_DECIMAL);
     BigDecimal[] bigDecimalValues = transformFunction.transformToBigDecimalValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -368,8 +474,8 @@ public void testGreatestTransformFunctionTime() {
 
   @Test
   public void testGreatestTransformFunctionTimestampWithLegacyTimeColumn() {
-    TransformFunction transformFunction = testGreatestPreconditions(
-        String.format("greatest(%s, cast(%s as TIMESTAMP))", TIMESTAMP_COLUMN, TIME_COLUMN));
+    TransformFunction transformFunction =
+        testGreatestPreconditions(String.format("greatest(%s, cast(%s as TIMESTAMP))", TIMESTAMP_COLUMN, TIME_COLUMN));
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.TIMESTAMP);
     long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
@@ -397,4 +503,20 @@ private TransformFunction testGreatestPreconditions(String expressionStr) {
     assertEquals(transformFunction.getName(), TransformFunctionType.GREATEST.getName());
     return transformFunction;
   }
+
+  private TransformFunction testLeastPreconditionsNullHandlingEnabled(String expressionStr) {
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.getNullHandlingEnabled(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof LeastTransformFunction);
+    assertEquals(transformFunction.getName(), TransformFunctionType.LEAST.getName());
+    return transformFunction;
+  }
+
+  private TransformFunction testGreatestPreconditionsNullHandlingEnabled(String expressionStr) {
+    ExpressionContext expression = RequestContextUtils.getExpression(expressionStr);
+    TransformFunction transformFunction = TransformFunctionFactory.getNullHandlingEnabled(expression, _dataSourceMap);
+    assertTrue(transformFunction instanceof GreatestTransformFunction);
+    assertEquals(transformFunction.getName(), TransformFunctionType.GREATEST.getName());
+    return transformFunction;
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/plan/FilterPlanNodeTest.java b/pinot-core/src/test/java/org/apache/pinot/core/plan/FilterPlanNodeTest.java
index 8a44e830757..b123f2a807a 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/plan/FilterPlanNodeTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/plan/FilterPlanNodeTest.java
@@ -20,8 +20,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pinot.core.common.BlockDocIdIterator;
+import org.apache.pinot.core.common.BlockDocIdSet;
 import org.apache.pinot.core.operator.blocks.FilterBlock;
-import org.apache.pinot.core.operator.docidsets.FilterBlockDocIdSet;
 import org.apache.pinot.core.operator.filter.BaseFilterOperator;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.segment.spi.Constants;
@@ -80,7 +80,7 @@ private int getNumberOfFilteredDocs(IndexSegment segment, QueryContext ctx) {
     BaseFilterOperator op = node.run();
     int numDocsFiltered = 0;
     FilterBlock block = op.nextBlock();
-    FilterBlockDocIdSet blockIds = block.getBlockDocIdSet();
+    BlockDocIdSet blockIds = block.getBlockDocIdSet();
     BlockDocIdIterator it = blockIds.iterator();
     while (it.next() != Constants.EOF) {
       numDocsFiltered++;
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/MetadataAndDictionaryAggregationPlanMakerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/MetadataAndDictionaryAggregationPlanMakerTest.java
index f6df4e9b4ef..874c8a6bedc 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/MetadataAndDictionaryAggregationPlanMakerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/MetadataAndDictionaryAggregationPlanMakerTest.java
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -42,8 +41,10 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
 import org.apache.pinot.spi.config.table.HashFunction;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
@@ -113,8 +114,8 @@ public void buildSegment()
     segmentGeneratorConfig.setTableName("testTable");
     segmentGeneratorConfig.setSegmentName(SEGMENT_NAME);
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(
-        Arrays.asList("column6", "column7", "column11", "column17", "column18"));
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, "column6", "column7", "column11",
+        "column17", "column18");
 
     // Build the index segment.
     SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
@@ -130,7 +131,8 @@ public void loadSegment()
     _upsertIndexSegment = ImmutableSegmentLoader.load(new File(INDEX_DIR, SEGMENT_NAME), ReadMode.heap);
     ((ImmutableSegmentImpl) _upsertIndexSegment).enableUpsert(
         new ConcurrentMapPartitionUpsertMetadataManager("testTable_REALTIME", 0, Collections.singletonList("column6"),
-            "daysSinceEpoch", HashFunction.NONE, null, false, serverMetrics), new ThreadSafeMutableRoaringBitmap());
+            Collections.singletonList("daysSinceEpoch"), null, HashFunction.NONE, null, false, 0, INDEX_DIR,
+            serverMetrics), new ThreadSafeMutableRoaringBitmap(), null);
   }
 
   @AfterClass
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/QueryOverrideWithHintsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/QueryOverrideWithHintsTest.java
index 35ae0d685d5..57f169258ca 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/QueryOverrideWithHintsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/plan/maker/QueryOverrideWithHintsTest.java
@@ -89,6 +89,12 @@ public ThreadSafeMutableRoaringBitmap getValidDocIds() {
       return null;
     }
 
+    @Nullable
+    @Override
+    public ThreadSafeMutableRoaringBitmap getQueryableDocIds() {
+      return null;
+    }
+
     @Override
     public GenericRow getRecord(int docId, GenericRow reuse) {
       return null;
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactoryTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactoryTest.java
index a29694ef79e..de8abca9600 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactoryTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/function/AggregationFunctionFactoryTest.java
@@ -20,8 +20,6 @@
 
 import org.apache.pinot.common.request.context.FunctionContext;
 import org.apache.pinot.common.request.context.RequestContextUtils;
-import org.apache.pinot.core.query.request.context.QueryContext;
-import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.testng.annotations.Test;
 
@@ -33,445 +31,416 @@
 public class AggregationFunctionFactoryTest {
   private static final String ARGUMENT_COLUMN = "(column)";
   private static final String ARGUMENT_STAR = "(*)";
-  private static final QueryContext DUMMY_QUERY_CONTEXT =
-      QueryContextConverterUtils.getQueryContext("SELECT * FROM testTable");
 
   @Test
   public void testGetAggregationFunction() {
     FunctionContext function = getFunction("CoUnT", ARGUMENT_STAR);
-    AggregationFunction aggregationFunction =
-        AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    AggregationFunction aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof CountAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.COUNT);
-    assertEquals(aggregationFunction.getColumnName(), "count_star");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MiN");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof MinAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MIN);
-    assertEquals(aggregationFunction.getColumnName(), "min_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MaX");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof MaxAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MAX);
-    assertEquals(aggregationFunction.getColumnName(), "max_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("SuM");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof SumAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.SUM);
-    assertEquals(aggregationFunction.getColumnName(), "sum_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("SuMPreCIsiON");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof SumPrecisionAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.SUMPRECISION);
-    assertEquals(aggregationFunction.getColumnName(), "sumPrecision_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("AvG");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof AvgAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.AVG);
-    assertEquals(aggregationFunction.getColumnName(), "avg_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MoDe");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof ModeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MODE);
-    assertEquals(aggregationFunction.getColumnName(), "mode_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FiRsTwItHtImE", "(column,timeColumn,'BOOLEAN')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FirstIntValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FIRSTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "firstWithTime_column_timeColumn_BOOLEAN");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FiRsTwItHtImE", "(column,timeColumn,'INT')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FirstIntValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FIRSTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "firstWithTime_column_timeColumn_INT");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FiRsTwItHtImE", "(column,timeColumn,'LONG')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FirstLongValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FIRSTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "firstWithTime_column_timeColumn_LONG");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FiRsTwItHtImE", "(column,timeColumn,'FLOAT')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FirstFloatValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FIRSTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "firstWithTime_column_timeColumn_FLOAT");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FiRsTwItHtImE", "(column,timeColumn,'DOUBLE')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FirstDoubleValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FIRSTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "firstWithTime_column_timeColumn_DOUBLE");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FiRsTwItHtImE", "(column,timeColumn,'STRING')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FirstStringValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FIRSTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "firstWithTime_column_timeColumn_STRING");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("LaStWiThTiMe", "(column,timeColumn,'BOOLEAN')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof LastIntValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.LASTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "lastWithTime_column_timeColumn_BOOLEAN");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("LaStWiThTiMe", "(column,timeColumn,'INT')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof LastIntValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.LASTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "lastWithTime_column_timeColumn_INT");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("LaStWiThTiMe", "(column,timeColumn,'LONG')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof LastLongValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.LASTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "lastWithTime_column_timeColumn_LONG");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("LaStWiThTiMe", "(column,timeColumn,'FLOAT')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof LastFloatValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.LASTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "lastWithTime_column_timeColumn_FLOAT");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("LaStWiThTiMe", "(column,timeColumn,'DOUBLE')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof LastDoubleValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.LASTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "lastWithTime_column_timeColumn_DOUBLE");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("LaStWiThTiMe", "(column,timeColumn,'STRING')");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof LastStringValueWithTimeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.LASTWITHTIME);
-    assertEquals(aggregationFunction.getColumnName(), "lastWithTime_column_timeColumn_STRING");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MiNmAxRaNgE");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof MinMaxRangeAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MINMAXRANGE);
-    assertEquals(aggregationFunction.getColumnName(), "minMaxRange_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCtCoUnT");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNT);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCount_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCtCoUnThLl");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountHLLAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNTHLL);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCountHLL_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCtCoUnTrAwHlL");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountRawHLLAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNTRAWHLL);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCountRawHLL_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("FaStHlL");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FastHLLAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.FASTHLL);
-    assertEquals(aggregationFunction.getColumnName(), "fastHLL_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLe5");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILE);
-    assertEquals(aggregationFunction.getColumnName(), "percentile5_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeEsT50");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileEstAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileEst50_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeRaWEsT50");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileRawEstAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileRawEst50_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeTdIgEsT99");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest99_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeRaWTdIgEsT99");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileRawTDigestAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWTDIGEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileRawTDigest99_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLe", "(column, 5)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILE);
-    assertEquals(aggregationFunction.getColumnName(), "percentile5.0_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentile(column, 5.0)");
 
     function = getFunction("PeRcEnTiLe", "(column, 5.5)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILE);
-    assertEquals(aggregationFunction.getColumnName(), "percentile5.5_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentile(column, 5.5)");
 
     function = getFunction("PeRcEnTiLeEsT", "(column, 50)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileEstAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileEst50.0_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentileest(column, 50.0)");
 
     function = getFunction("PeRcEnTiLeRaWeSt", "(column, 50)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileRawEstAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileRawEst50.0_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentilerawest(column, 50.0)");
 
     function = getFunction("PeRcEnTiLeEsT", "(column, 55.555)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileEstAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileEst55.555_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentileest(column, 55.555)");
 
     function = getFunction("PeRcEnTiLeRaWeSt", "(column, 55.555)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileRawEstAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileRawEst55.555_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentilerawest(column, 55.555)");
 
     function = getFunction("PeRcEnTiLeTdIgEsT", "(column, 99)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest99.0_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigest(column, 99.0)");
 
     function = getFunction("PeRcEnTiLeTdIgEsT", "(column, 99.9999)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest99.9999_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigest(column, 99.9999)");
 
+    function = getFunction("PeRcEnTiLeTdIgEsT", "(column, 99.9999, 1000)");
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
+    assertTrue(aggregationFunction instanceof PercentileTDigestAggregationFunction);
+    assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGEST);
+    assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigest(column, 99.9999, 1000)");
+
     function = getFunction("PeRcEnTiLeRaWtDiGeSt", "(column, 99)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileRawTDigestAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWTDIGEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileRawTDigest99.0_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentilerawtdigest(column, 99.0)");
 
     function = getFunction("PeRcEnTiLeRaWtDiGeSt", "(column, 99.9999)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
+    assertTrue(aggregationFunction instanceof PercentileRawTDigestAggregationFunction);
+    assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWTDIGEST);
+    assertEquals(aggregationFunction.getResultColumnName(), "percentilerawtdigest(column, 99.9999)");
+
+    function = getFunction("PeRcEntiLEkll", "(column, 99.9999)");
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
+    assertTrue(aggregationFunction instanceof PercentileKLLAggregationFunction);
+    assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEKLL);
+    assertEquals(aggregationFunction.getResultColumnName(), "percentilekll(column, 99.9999)");
+
+    function = getFunction("PeRcEnTiLeRaWtDiGeSt", "(column, 99.9999, 500)");
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
+    assertTrue(aggregationFunction instanceof PercentileRawTDigestAggregationFunction);
+    assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWTDIGEST);
+    assertEquals(aggregationFunction.getResultColumnName(), "percentilerawtdigest(column, 99.9999, 500)");
+
+    function = getFunction("PeRcEnTiLeRaWtDiGeSt", "(column, 99.9999, 100)");
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileRawTDigestAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILERAWTDIGEST);
-    assertEquals(aggregationFunction.getColumnName(), "percentileRawTDigest99.9999_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentilerawtdigest(column, 99.9999)");
 
     function = getFunction("CoUnTmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof CountMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.COUNTMV);
-    assertEquals(aggregationFunction.getColumnName(), "countMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MiNmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof MinMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MINMV);
-    assertEquals(aggregationFunction.getColumnName(), "minMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MaXmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof MaxMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MAXMV);
-    assertEquals(aggregationFunction.getColumnName(), "maxMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("SuMmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof SumMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.SUMMV);
-    assertEquals(aggregationFunction.getColumnName(), "sumMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("AvGmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof AvgMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.AVGMV);
-    assertEquals(aggregationFunction.getColumnName(), "avgMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("AvG_mV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof AvgMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.AVGMV);
-    assertEquals(aggregationFunction.getColumnName(), "avgMV_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "avgmv(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("MiNmAxRaNgEmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof MinMaxRangeMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.MINMAXRANGEMV);
-    assertEquals(aggregationFunction.getColumnName(), "minMaxRangeMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCtCoUnTmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNTMV);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCountMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCtCoUnThLlMv");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountHLLMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNTHLLMV);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCountHLLMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCt_CoUnT_hLl_Mv");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountHLLMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNTHLLMV);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCountHLLMV_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "distinctcounthllmv(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("DiStInCtCoUnTrAwHlLmV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof DistinctCountRawHLLMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCTCOUNTRAWHLLMV);
-    assertEquals(aggregationFunction.getColumnName(), "distinctCountRawHLLMV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLe10Mv");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentile10MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeEsT90mV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileEstMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEESTMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentileEst90MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeTdIgEsT95mV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGESTMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest95MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLe_TdIgEsT_95_mV");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGESTMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest95MV_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigest95mv(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("PeRcEnTiLeMv", "(column, 10)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentile10.0MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentilemv(column, 10.0)");
 
     function = getFunction("PeRcEnTiLeEsTmV", "(column, 90)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileEstMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILEESTMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentileEst90.0MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentileestmv(column, 90.0)");
 
     function = getFunction("PeRcEnTiLeTdIgEsTmV", "(column, 95)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGESTMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest95.0MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigestmv(column, 95.0)");
 
+    function = getFunction("PeRcEnTiLeTdIgEsTmV", "(column, 95, 1000)");
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
+    assertTrue(aggregationFunction instanceof PercentileTDigestMVAggregationFunction);
+    assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGESTMV);
+    assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigestmv(column, 95.0, 1000)");
+
     function = getFunction("PeRcEnTiLe_TdIgEsT_mV", "(column, 95)");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof PercentileTDigestMVAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGESTMV);
-    assertEquals(aggregationFunction.getColumnName(), "percentileTDigest95.0MV_column");
     assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigestmv(column, 95.0)");
 
+    function = getFunction("PeRcEnTiLe_TdIgEsT_mV", "(column, 95, 200)");
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
+    assertTrue(aggregationFunction instanceof PercentileTDigestMVAggregationFunction);
+    assertEquals(aggregationFunction.getType(), AggregationFunctionType.PERCENTILETDIGESTMV);
+    assertEquals(aggregationFunction.getResultColumnName(), "percentiletdigestmv(column, 95.0, 200)");
+
     function = getFunction("bool_and");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof BooleanAndAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.BOOLAND);
-    assertEquals(aggregationFunction.getColumnName(), "boolAnd_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "booland(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("bool_or");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof BooleanOrAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.BOOLOR);
-    assertEquals(aggregationFunction.getColumnName(), "boolOr_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "boolor(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("skewness");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FourthMomentAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.SKEWNESS);
-    assertEquals(aggregationFunction.getColumnName(), "skewness_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "skewness(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
 
     function = getFunction("kurtosis");
-    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, DUMMY_QUERY_CONTEXT);
+    aggregationFunction = AggregationFunctionFactory.getAggregationFunction(function, false);
     assertTrue(aggregationFunction instanceof FourthMomentAggregationFunction);
     assertEquals(aggregationFunction.getType(), AggregationFunctionType.KURTOSIS);
-    assertEquals(aggregationFunction.getColumnName(), "kurtosis_column");
-    assertEquals(aggregationFunction.getResultColumnName(), "kurtosis(column)");
+    assertEquals(aggregationFunction.getResultColumnName(), function.toString());
   }
 
   private FunctionContext getFunction(String functionName) {
@@ -481,16 +450,4 @@ private FunctionContext getFunction(String functionName) {
   private FunctionContext getFunction(String functionName, String args) {
     return RequestContextUtils.getExpression(functionName + args).getFunction();
   }
-
-  @Test
-  public void testAggregationFunctionWithMultipleArgs() {
-    QueryContext queryContext =
-        QueryContextConverterUtils.getQueryContext("SELECT DISTINCT column1, column2, column3 FROM testTable");
-    AggregationFunction aggregationFunction = AggregationFunctionFactory
-        .getAggregationFunction(queryContext.getSelectExpressions().get(0).getFunction(), queryContext);
-    assertTrue(aggregationFunction instanceof DistinctAggregationFunction);
-    assertEquals(aggregationFunction.getType(), AggregationFunctionType.DISTINCT);
-    assertEquals(aggregationFunction.getColumnName(), "distinct_column1:column2:column3");
-    assertEquals(aggregationFunction.getResultColumnName(), "distinct(column1:column2:column3)");
-  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGeneratorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGeneratorTest.java
index 5412d34c17c..5e2ae8af341 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGeneratorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/DictionaryBasedGroupKeyGeneratorTest.java
@@ -31,10 +31,10 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
-import org.apache.pinot.core.plan.TransformPlanNode;
+import org.apache.pinot.core.plan.ProjectPlanNode;
 import org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
@@ -78,8 +78,8 @@ public class DictionaryBasedGroupKeyGeneratorTest {
   private final Random _random = new Random(_randomSeed);
   private final String _errorMessage = "Random seed is: " + _randomSeed;
 
-  private TransformOperator _transformOperator;
-  private TransformBlock _transformBlock;
+  private BaseProjectOperator<?> _projectOperator;
+  private ValueBlock _valueBlock;
 
   @BeforeClass
   private void setup()
@@ -151,10 +151,10 @@ private void setup()
     for (String column : MV_COLUMNS) {
       expressions.add(ExpressionContext.forIdentifier(column));
     }
-    TransformPlanNode transformPlanNode =
-        new TransformPlanNode(indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL);
-    _transformOperator = transformPlanNode.run();
-    _transformBlock = _transformOperator.nextBlock();
+    ProjectPlanNode projectPlanNode =
+        new ProjectPlanNode(indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL);
+    _projectOperator = projectPlanNode.run();
+    _valueBlock = _projectOperator.nextBlock();
   }
 
   @Test
@@ -164,14 +164,14 @@ public void testArrayBasedSingleValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(), UNIQUE_ROWS, _errorMessage);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), UNIQUE_ROWS, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, SV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, SV_GROUP_KEY_BUFFER);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), UNIQUE_ROWS, _errorMessage);
     compareSingleValueBuffer();
     testGetGroupKeys(dictionaryBasedGroupKeyGenerator.getGroupKeys(), 2);
@@ -184,7 +184,7 @@ public void testIntMapBasedSingleValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(),
@@ -192,7 +192,7 @@ public void testIntMapBasedSingleValue() {
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, SV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, SV_GROUP_KEY_BUFFER);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 2, _errorMessage);
     compareSingleValueBuffer();
     testGetGroupKeys(dictionaryBasedGroupKeyGenerator.getGroupKeys(), 2);
@@ -205,7 +205,7 @@ public void testLongMapBasedSingleValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(),
@@ -213,7 +213,7 @@ public void testLongMapBasedSingleValue() {
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, SV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, SV_GROUP_KEY_BUFFER);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 2, _errorMessage);
     compareSingleValueBuffer();
     testGetGroupKeys(dictionaryBasedGroupKeyGenerator.getGroupKeys(), 2);
@@ -226,7 +226,7 @@ public void testArrayMapBasedSingleValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(),
@@ -234,7 +234,7 @@ public void testArrayMapBasedSingleValue() {
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, SV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, SV_GROUP_KEY_BUFFER);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 2, _errorMessage);
     compareSingleValueBuffer();
     testGetGroupKeys(dictionaryBasedGroupKeyGenerator.getGroupKeys(), 2);
@@ -261,14 +261,14 @@ public void testArrayBasedMultiValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     int groupKeyUpperBound = dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound();
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), groupKeyUpperBound, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, MV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, MV_GROUP_KEY_BUFFER);
     int numUniqueKeys = MV_GROUP_KEY_BUFFER[0].length + MV_GROUP_KEY_BUFFER[1].length;
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), groupKeyUpperBound, _errorMessage);
     compareMultiValueBuffer();
@@ -282,7 +282,7 @@ public void tesIntMapBasedMultiValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(),
@@ -290,7 +290,7 @@ public void tesIntMapBasedMultiValue() {
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, MV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, MV_GROUP_KEY_BUFFER);
     int numUniqueKeys = MV_GROUP_KEY_BUFFER[0].length + MV_GROUP_KEY_BUFFER[1].length;
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), numUniqueKeys, _errorMessage);
     compareMultiValueBuffer();
@@ -305,7 +305,7 @@ public void testLongMapBasedMultiValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(),
@@ -313,7 +313,7 @@ public void testLongMapBasedMultiValue() {
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, MV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, MV_GROUP_KEY_BUFFER);
     int numUniqueKeys = MV_GROUP_KEY_BUFFER[0].length + MV_GROUP_KEY_BUFFER[1].length;
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), numUniqueKeys, _errorMessage);
     compareMultiValueBuffer();
@@ -327,7 +327,7 @@ public void testArrayMapBasedMultiValue() {
 
     // Test initial status
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns),
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns),
             InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT,
             InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(),
@@ -335,7 +335,7 @@ public void testArrayMapBasedMultiValue() {
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, MV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, MV_GROUP_KEY_BUFFER);
     int numUniqueKeys = MV_GROUP_KEY_BUFFER[0].length + MV_GROUP_KEY_BUFFER[1].length;
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), numUniqueKeys, _errorMessage);
     compareMultiValueBuffer();
@@ -348,13 +348,13 @@ public void testNumGroupsLimit() {
     int numGroupsLimit = 1;
     // NOTE: arrayBasedThreshold must be smaller or equal to numGroupsLimit
     DictionaryBasedGroupKeyGenerator dictionaryBasedGroupKeyGenerator =
-        new DictionaryBasedGroupKeyGenerator(_transformOperator, getExpressions(groupByColumns), numGroupsLimit,
+        new DictionaryBasedGroupKeyGenerator(_projectOperator, getExpressions(groupByColumns), numGroupsLimit,
             numGroupsLimit);
     assertEquals(dictionaryBasedGroupKeyGenerator.getGlobalGroupKeyUpperBound(), numGroupsLimit, _errorMessage);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), 0, _errorMessage);
 
     // Test group key generation
-    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_transformBlock, MV_GROUP_KEY_BUFFER);
+    dictionaryBasedGroupKeyGenerator.generateKeysForBlock(_valueBlock, MV_GROUP_KEY_BUFFER);
     assertEquals(dictionaryBasedGroupKeyGenerator.getCurrentGroupKeyUpperBound(), numGroupsLimit, _errorMessage);
     // Only the first key should be 0, all others should be GroupKeyGenerator.INVALID_ID (-1)
     boolean firstKey = true;
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryGroupKeyGeneratorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryGroupKeyGeneratorTest.java
index b93135db105..790f062dc70 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryGroupKeyGeneratorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/aggregation/groupby/NoDictionaryGroupKeyGeneratorTest.java
@@ -31,10 +31,10 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.common.request.context.ExpressionContext;
-import org.apache.pinot.core.operator.blocks.TransformBlock;
-import org.apache.pinot.core.operator.transform.TransformOperator;
+import org.apache.pinot.core.operator.BaseProjectOperator;
+import org.apache.pinot.core.operator.blocks.ValueBlock;
 import org.apache.pinot.core.plan.DocIdSetPlanNode;
-import org.apache.pinot.core.plan.TransformPlanNode;
+import org.apache.pinot.core.plan.ProjectPlanNode;
 import org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
@@ -96,8 +96,8 @@ public class NoDictionaryGroupKeyGeneratorTest {
 
   private final String[][] _stringValues = new String[NUM_UNIQUE_RECORDS][NUM_COLUMNS];
   private IndexSegment _indexSegment;
-  private TransformOperator _transformOperator;
-  private TransformBlock _transformBlock;
+  private BaseProjectOperator<?> _projectOperator;
+  private ValueBlock _valueBlock;
 
   @BeforeClass
   public void setUp()
@@ -154,10 +154,10 @@ public void setUp()
     for (String column : COLUMNS) {
       expressions.add(ExpressionContext.forIdentifier(column));
     }
-    TransformPlanNode transformPlanNode =
-        new TransformPlanNode(_indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL);
-    _transformOperator = transformPlanNode.run();
-    _transformBlock = _transformOperator.nextBlock();
+    ProjectPlanNode projectPlanNode =
+        new ProjectPlanNode(_indexSegment, queryContext, expressions, DocIdSetPlanNode.MAX_DOC_PER_CALL);
+    _projectOperator = projectPlanNode.run();
+    _valueBlock = _projectOperator.nextBlock();
   }
 
   /**
@@ -197,7 +197,7 @@ private void testGroupKeyGenerator(int[] groupByColumnIndexes) {
     int numGroupByColumns = groupByColumnIndexes.length;
     GroupKeyGenerator groupKeyGenerator;
     if (numGroupByColumns == 1) {
-      groupKeyGenerator = new NoDictionarySingleColumnGroupKeyGenerator(_transformOperator,
+      groupKeyGenerator = new NoDictionarySingleColumnGroupKeyGenerator(_projectOperator,
           ExpressionContext.forIdentifier(COLUMNS.get(groupByColumnIndexes[0])),
           InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT, false);
     } else {
@@ -205,10 +205,10 @@ private void testGroupKeyGenerator(int[] groupByColumnIndexes) {
       for (int i = 0; i < numGroupByColumns; i++) {
         groupByExpressions[i] = ExpressionContext.forIdentifier(COLUMNS.get(groupByColumnIndexes[i]));
       }
-      groupKeyGenerator = new NoDictionaryMultiColumnGroupKeyGenerator(_transformOperator, groupByExpressions,
-          InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT);
+      groupKeyGenerator = new NoDictionaryMultiColumnGroupKeyGenerator(_projectOperator, groupByExpressions,
+          InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT, false);
     }
-    groupKeyGenerator.generateKeysForBlock(_transformBlock, new int[NUM_RECORDS]);
+    groupKeyGenerator.generateKeysForBlock(_valueBlock, new int[NUM_RECORDS]);
 
     // Assert total number of group keys is as expected
     Set<String> expectedGroupKeys = getExpectedGroupKeys(groupByColumnIndexes);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
index 6054de96582..631b4ee9d2e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/optimizer/QueryOptimizerTest.java
@@ -225,9 +225,35 @@ public void testQueries() {
     testQuery(
         "SELECT * FROM testTable WHERE int >= 20 AND (int > 10 AND (int IN (1, 2) OR (int = 2 OR int = 3)) AND int <="
             + " 30)", "SELECT * FROM testTable WHERE int BETWEEN 20 AND 30 AND int IN (1, 2, 3)");
+
+    // IdenticalPredicateOptimizer
+    testQuery("SELECT * FROM testTable WHERE 1=1", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE 1!=1", "SELECT * FROM testTable WHERE false");
+    testQuery("SELECT * FROM testTable WHERE 1=1 AND 1!=1", "SELECT * FROM testTable WHERE false");
+    testQuery("SELECT * FROM testTable WHERE 1=1 OR 1!=1", "SELECT * FROM testTable WHERE true");
+
+    testQuery("SELECT * FROM testTable WHERE \"a\"=\"a\"", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE \"a\"!=\"a\"", "SELECT * FROM testTable WHERE false");
+    testQuery("SELECT * FROM testTable WHERE \"a\"=\"a\" AND \"a\"!=\"a\"", "SELECT * FROM testTable WHERE false");
+    testQuery("SELECT * FROM testTable WHERE \"a\"=\"a\" OR \"a\"!=\"a\"", "SELECT * FROM testTable WHERE true");
+
+    testQuery("SELECT * FROM testTable WHERE 1=1 AND \"a\"=\"a\"", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE 1=1 OR \"a\"=\"a\"", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE 1!=1 AND \"a\"=\"a\"", "SELECT * FROM testTable WHERE false");
+    testQuery("SELECT * FROM testTable WHERE 1=1 AND \"a\"!=\"a\"", "SELECT * FROM testTable WHERE false");
+    testQuery("SELECT * FROM testTable WHERE 1!=1 OR \"a\"=\"a\"", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE 1=1 OR \"a\"!=\"a\"", "SELECT * FROM testTable WHERE true");
+
+    testQuery("SELECT * FROM testTable WHERE 1.0=1.0", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE 1.0=1", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE 1.01=1", "SELECT * FROM testTable WHERE false");
+
+    testQuery("SELECT * FROM testTable WHERE 1=1 AND true", "SELECT * FROM testTable WHERE true");
+    testQuery("SELECT * FROM testTable WHERE \"a\"=\"a\" AND true", "SELECT * FROM testTable WHERE true");
   }
 
   private static void testQuery(String actual, String expected) {
+    assertNotEquals(actual, expected, "You must provide different queries to test");
     PinotQuery actualPinotQuery = CalciteSqlParser.compileToPinotQuery(actual);
     OPTIMIZER.optimize(actualPinotQuery, SCHEMA);
     // Also optimize the expected query because the expected range can only be generate via optimizer
@@ -245,30 +271,37 @@ private static void comparePinotQuery(PinotQuery actual, PinotQuery expected) {
   }
 
   private static void compareFilterExpression(Expression actual, Expression expected) {
-    Function actualFilterFunction = actual.getFunctionCall();
-    Function expectedFilterFunction = expected.getFunctionCall();
-    FilterKind actualFilterKind = FilterKind.valueOf(actualFilterFunction.getOperator());
-    FilterKind expectedFilterKind = FilterKind.valueOf(expectedFilterFunction.getOperator());
-    List<Expression> actualOperands = actualFilterFunction.getOperands();
-    List<Expression> expectedOperands = expectedFilterFunction.getOperands();
-    if (!actualFilterKind.isRange()) {
-      assertEquals(actualFilterKind, expectedFilterKind);
-      assertEquals(actualOperands.size(), expectedOperands.size());
-      if (actualFilterKind == FilterKind.AND || actualFilterKind == FilterKind.OR) {
-        compareFilterExpressionChildren(actualOperands, expectedOperands);
-      } else {
-        assertEquals(actualOperands.get(0), expectedOperands.get(0));
-        if (actualFilterKind == FilterKind.IN || actualFilterKind == FilterKind.NOT_IN) {
-          // Handle different order of values
-          assertEqualsNoOrder(actualOperands.toArray(), expectedOperands.toArray());
+    if (actual.isSetLiteral()) {
+      assertNull(actual.getFunctionCall());
+      assertNull(expected.getFunctionCall());
+      assertTrue(expected.isSetLiteral());
+      assertEquals(actual.getLiteral(), expected.getLiteral());
+    } else {
+      Function actualFilterFunction = actual.getFunctionCall();
+      Function expectedFilterFunction = expected.getFunctionCall();
+      FilterKind actualFilterKind = FilterKind.valueOf(actualFilterFunction.getOperator());
+      FilterKind expectedFilterKind = FilterKind.valueOf(expectedFilterFunction.getOperator());
+      List<Expression> actualOperands = actualFilterFunction.getOperands();
+      List<Expression> expectedOperands = expectedFilterFunction.getOperands();
+      if (!actualFilterKind.isRange()) {
+        assertEquals(actualFilterKind, expectedFilterKind);
+        assertEquals(actualOperands.size(), expectedOperands.size());
+        if (actualFilterKind == FilterKind.AND || actualFilterKind == FilterKind.OR) {
+          compareFilterExpressionChildren(actualOperands, expectedOperands);
         } else {
-          assertEquals(actualOperands, expectedOperands);
+          assertEquals(actualOperands.get(0), expectedOperands.get(0));
+          if (actualFilterKind == FilterKind.IN || actualFilterKind == FilterKind.NOT_IN) {
+            // Handle different order of values
+            assertEqualsNoOrder(actualOperands.toArray(), expectedOperands.toArray());
+          } else {
+            assertEquals(actualOperands, expectedOperands);
+          }
         }
+      } else {
+        assertTrue(expectedFilterKind.isRange());
+        assertEquals(getRangeString(actualFilterKind, actualOperands),
+            getRangeString(expectedFilterKind, expectedOperands));
       }
-    } else {
-      assertTrue(expectedFilterKind.isRange());
-      assertEquals(getRangeString(actualFilterKind, actualOperands),
-          getRangeString(expectedFilterKind, expectedOperands));
     }
   }
 
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlannerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlannerTest.java
index 602a466a789..7b160598980 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlannerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/prefetch/DefaultFetchPlannerTest.java
@@ -26,8 +26,9 @@
 import org.apache.pinot.segment.spi.FetchContext;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.testng.annotations.Test;
 
 import static org.mockito.Mockito.mock;
@@ -49,7 +50,7 @@ public void testPlanFetchForProcessing() {
     QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
     FetchContext fetchContext = planner.planFetchForProcessing(indexSegment, queryContext);
     assertEquals(fetchContext.getSegmentName(), "s0");
-    Map<String, List<ColumnIndexType>> columns = fetchContext.getColumnToIndexList();
+    Map<String, List<IndexType<?, ?, ?>>> columns = fetchContext.getColumnToIndexList();
     assertEquals(columns.size(), 3);
     // null means to get all index types created for the column.
     assertNull(columns.get("c0"));
@@ -81,10 +82,10 @@ public void testPlanFetchForPruning() {
     fetchContext = planner.planFetchForPruning(indexSegment, queryContext);
     assertFalse(fetchContext.isEmpty());
     assertEquals(fetchContext.getSegmentName(), "s0");
-    Map<String, List<ColumnIndexType>> columns = fetchContext.getColumnToIndexList();
+    Map<String, List<IndexType<?, ?, ?>>> columns = fetchContext.getColumnToIndexList();
     assertEquals(columns.size(), 1);
-    List<ColumnIndexType> idxTypes = columns.get("c0");
+    List<IndexType<?, ?, ?>> idxTypes = columns.get("c0");
     assertEquals(idxTypes.size(), 1);
-    assertEquals(idxTypes.get(0), ColumnIndexType.BLOOM_FILTER);
+    assertEquals(idxTypes.get(0), StandardIndexes.bloomFilter());
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/BloomFilterSegmentPrunerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/BloomFilterSegmentPrunerTest.java
new file mode 100644
index 00000000000..75b2beea0fd
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/BloomFilterSegmentPrunerTest.java
@@ -0,0 +1,216 @@
+/**
+ * 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.pinot.core.query.pruner;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.hash.BloomFilter;
+import com.google.common.hash.Funnels;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.segment.local.segment.index.readers.bloom.OnHeapGuavaBloomFilterReader;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.SegmentMetadata;
+import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+public class BloomFilterSegmentPrunerTest {
+  private static final BloomFilterSegmentPruner PRUNER = new BloomFilterSegmentPruner();
+
+  @BeforeClass
+  public void setUp() {
+    Map<String, Object> properties = new HashMap<>();
+    // override default value
+    properties.put(ColumnValueSegmentPruner.IN_PREDICATE_THRESHOLD, 5);
+    PinotConfiguration configuration = new PinotConfiguration(properties);
+    PRUNER.init(configuration);
+  }
+
+  @Test
+  public void testBloomFilterPruning()
+      throws IOException {
+    IndexSegment indexSegment = mockIndexSegment(new String[]{"1.0", "2.0", "3.0", "5.0", "7.0", "21.0"});
+
+    // all out the bloom filter
+    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (0.0)"));
+    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 0.0"));
+    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 6.0"));
+    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (6.0)"));
+    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 0.0 OR column = 6.0"));
+
+    // all in the bloom filter
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (5.0)"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0 OR column = 7.0"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (5.0, 7.0)"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0 AND column = 7.0"));
+
+    // some in the bloom filter with IN/OR
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (0.0, 3.0, 4.0)"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 1.0"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (1.0)"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 21.0"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (21.0)"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (21.0, 30.0)"));
+    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 21.0 OR column = 30.0"));
+    // 30 out the bloom filter with AND
+    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 21.0 AND column = 30.0"));
+  }
+
+  @Test(expectedExceptions = RuntimeException.class)
+  public void testQueryTimeoutOnPruning()
+      throws IOException {
+    IndexSegment indexSegment = mockIndexSegment(new String[]{"1.0", "2.0", "3.0", "5.0", "7.0", "21.0"});
+    DataSource dataSource = mock(DataSource.class);
+    when(indexSegment.getDataSource("column")).thenReturn(dataSource);
+    runPruner(Collections.singletonList(indexSegment),
+        "SELECT COUNT(*) FROM testTable WHERE column = 5.0 OR column = 0.0", 1);
+  }
+
+  @Test
+  public void testParallelPrune()
+      throws IOException {
+    List<IndexSegment> segments = new ArrayList<>();
+    for (int i = 0; i < 35; i++) {
+      IndexSegment indexSegment = mockIndexSegment(new String[]{"1.0", "2.0", "3.0", "5.0", "7.0", "21.0"});
+      segments.add(indexSegment);
+    }
+    assertTrue(
+        runPruner(segments, "SELECT COUNT(*) FROM testTable WHERE column = 21.0 AND column = 30.0", 5000).isEmpty());
+
+    IndexSegment indexSegment = mockIndexSegment(new String[]{"1.0", "2.0", "3.0", "5.0", "7.0", "21.0", "30.0"});
+    segments.add(indexSegment);
+    List<IndexSegment> selected =
+        runPruner(segments, "SELECT COUNT(*) FROM testTable WHERE column = 21.0 AND column = 30.0", 5000);
+    assertEquals(selected.size(), 1);
+  }
+
+  @Test
+  public void testIsApplicableTo() {
+    // EQ and IN (with small number of values) are applicable for bloom filter based pruning.
+    QueryContext queryContext =
+        QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column = 1");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+    queryContext = QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column IN (1, 2)");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+
+    // NOT is not applicable
+    queryContext = QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE NOT column = 1");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+    // Too many values for IN clause
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column IN (1, 2, 3, 4, 5, 6, 7)");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+    // Other predicate types are not applicable
+    queryContext = QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column LIKE 5");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+
+    // AND with one applicable child filter is applicable
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column NOT IN (1, 2) AND column = 3");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+
+    // OR with one child filter that's not applicable is not applicable
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column = 3 OR column NOT IN (1, 2)");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+
+    // Nested with AND/OR
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column = 3 OR (column NOT IN (1, 2) AND column = 4)");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+  }
+
+  private IndexSegment mockIndexSegment(String[] values)
+      throws IOException {
+    IndexSegment indexSegment = mock(IndexSegment.class);
+    when(indexSegment.getColumnNames()).thenReturn(ImmutableSet.of("column"));
+    SegmentMetadata segmentMetadata = mock(SegmentMetadata.class);
+    when(segmentMetadata.getTotalDocs()).thenReturn(20);
+    when(indexSegment.getSegmentMetadata()).thenReturn(segmentMetadata);
+
+    DataSource dataSource = mock(DataSource.class);
+    when(indexSegment.getDataSource("column")).thenReturn(dataSource);
+    // Add support for bloom filter
+    DataSourceMetadata dataSourceMetadata = mock(DataSourceMetadata.class);
+    BloomFilterReaderBuilder builder = new BloomFilterReaderBuilder();
+    for (String v : values) {
+      builder.put(v);
+    }
+    when(dataSourceMetadata.getDataType()).thenReturn(DataType.DOUBLE);
+    when(dataSource.getDataSourceMetadata()).thenReturn(dataSourceMetadata);
+    when(dataSource.getBloomFilter()).thenReturn(builder.build());
+
+    return indexSegment;
+  }
+
+  private boolean runPruner(IndexSegment segment, String query) {
+    return runPruner(Collections.singletonList(segment), query, 5000).isEmpty();
+  }
+
+  private List<IndexSegment> runPruner(List<IndexSegment> segments, String query, long queryTimeout) {
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+    queryContext.setEndTimeMs(System.currentTimeMillis() + queryTimeout);
+    return PRUNER.prune(segments, queryContext, Executors.newCachedThreadPool());
+  }
+
+  private static class BloomFilterReaderBuilder {
+    private BloomFilter<String> _bloomfilter = BloomFilter.create(Funnels.stringFunnel(Charsets.UTF_8), 100, 0.01);
+    public BloomFilterReaderBuilder put(String value) {
+      _bloomfilter.put(value);
+      return this;
+    }
+
+    public BloomFilterReader build() throws IOException {
+      File file = Files.createTempFile("test", ".bloom").toFile();
+      try (FileOutputStream fos = new FileOutputStream(file)) {
+        _bloomfilter.writeTo(fos);
+        try (PinotDataBuffer pinotDataBuffer = PinotDataBuffer.loadBigEndianFile(file)) {
+          // on heap filter should never use the buffer, so we can close it and delete the file
+          return new OnHeapGuavaBloomFilterReader(pinotDataBuffer);
+        }
+      } finally {
+        file.delete();
+      }
+    }
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java
index 5edbdb32a33..5a5d7bd5057 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java
@@ -18,30 +18,21 @@
  */
 package org.apache.pinot.core.query.pruner;
 
-import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.hash.BloomFilter;
-import com.google.common.hash.Funnels;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
-import org.apache.pinot.segment.local.segment.index.readers.bloom.OnHeapGuavaBloomFilterReader;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.SegmentMetadata;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.mockito.Mockito.mock;
@@ -53,14 +44,17 @@
 public class ColumnValueSegmentPrunerTest {
   private static final ColumnValueSegmentPruner PRUNER = new ColumnValueSegmentPruner();
 
-  @Test
-  public void testMinMaxValuePruning() {
+  @BeforeClass
+  public void setUp() {
     Map<String, Object> properties = new HashMap<>();
-    //override default value
-    properties.put(PRUNER.IN_PREDICATE_THRESHOLD, 5);
+    // override default value
+    properties.put(ColumnValueSegmentPruner.IN_PREDICATE_THRESHOLD, 5);
     PinotConfiguration configuration = new PinotConfiguration(properties);
     PRUNER.init(configuration);
+  }
 
+  @Test
+  public void testMinMaxValuePruning() {
     IndexSegment indexSegment = mockIndexSegment();
 
     DataSource dataSource = mock(DataSource.class);
@@ -147,66 +141,42 @@ public void testPartitionPruning() {
   }
 
   @Test
-  public void testBloomFilterPredicatePruning()
-      throws IOException {
-    Map<String, Object> properties = new HashMap<>();
-    // override default value
-    properties.put(ColumnValueSegmentPruner.IN_PREDICATE_THRESHOLD, 5);
-    PinotConfiguration configuration = new PinotConfiguration(properties);
-    PRUNER.init(configuration);
-
-    IndexSegment indexSegment = mockIndexSegment();
-    DataSource dataSource = mock(DataSource.class);
-    when(indexSegment.getDataSource("column")).thenReturn(dataSource);
-    // Add support for bloom filter
-    DataSourceMetadata dataSourceMetadata = mock(DataSourceMetadata.class);
-    BloomFilterReader bloomFilterReader = new BloomFilterReaderBuilder()
-        .put("1.0")
-        .put("2.0")
-        .put("3.0")
-        .put("5.0")
-        .put("7.0")
-        .put("21.0")
-        .build();
-
-    when(dataSourceMetadata.getDataType()).thenReturn(DataType.DOUBLE);
-    when(dataSource.getDataSourceMetadata()).thenReturn(dataSourceMetadata);
-    when(dataSource.getBloomFilter()).thenReturn(bloomFilterReader);
-    when(dataSourceMetadata.getMinValue()).thenReturn(5.0);
-    when(dataSourceMetadata.getMaxValue()).thenReturn(10.0);
-
-    // all out the bloom filter and out of range
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (0.0)"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 0.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (0.0, 3.0, 4.0)"));
-
-    // some in the bloom filter but all out of range
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 1.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (1.0)"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 21.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (21.0)"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (21.0, 30.0)"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 21.0 AND column = 30.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 21.0 OR column = 30.0"));
-
-    // all out the bloom filter but some in range
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 6.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (6.0)"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 0.0 OR column = 6.0"));
-
-    // all in the bloom filter and in range
-    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0"));
-    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (5.0)"));
-    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0 OR column = 7.0"));
-    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (5.0, 7.0)"));
-    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0 AND column = 7.0"));
-
-    // some in the bloom filter and in range
-    assertFalse(
-        runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (0.0, 5.0)"));
-    assertFalse(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0 OR column = 0.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column = 5.0 AND column = 0.0"));
-    assertTrue(runPruner(indexSegment, "SELECT COUNT(*) FROM testTable WHERE column IN (8.0, 10.0)"));
+  public void testIsApplicableTo() {
+    // EQ, RANGE and IN (with small number of values) are applicable for min/max/partitionId based pruning.
+    QueryContext queryContext =
+        QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column = 1");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+    queryContext = QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column IN (1, 2)");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+    queryContext =
+        QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column BETWEEN 1 AND 2");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+
+    // NOT is not applicable
+    queryContext = QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE NOT column = 1");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+    // Too many values for IN clause
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column IN (1, 2, 3, 4, 5, 6, 7)");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+    // Other predicate types are not applicable
+    queryContext = QueryContextConverterUtils.getQueryContext("SELECT COUNT(*) FROM testTable WHERE column LIKE 5");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+
+    // AND with one applicable child filter is applicable
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column NOT IN (1, 2) AND column = 3");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
+
+    // OR with one child filter that's not applicable is not applicable
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column = 3 OR column NOT IN (1, 2)");
+    assertFalse(PRUNER.isApplicableTo(queryContext));
+
+    // Nested with AND/OR
+    queryContext = QueryContextConverterUtils.getQueryContext(
+        "SELECT COUNT(*) FROM testTable WHERE column = 3 OR (column NOT IN (1, 2) AND column BETWEEN 4 AND 5)");
+    assertTrue(PRUNER.isApplicableTo(queryContext));
   }
 
   private IndexSegment mockIndexSegment() {
@@ -222,25 +192,4 @@ private boolean runPruner(IndexSegment indexSegment, String query) {
     QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
     return PRUNER.prune(Arrays.asList(indexSegment), queryContext).isEmpty();
   }
-
-  private static class BloomFilterReaderBuilder {
-    private BloomFilter<String> _bloomfilter = BloomFilter.create(Funnels.stringFunnel(Charsets.UTF_8), 100, 0.01);
-    public BloomFilterReaderBuilder put(String value) {
-      _bloomfilter.put(value);
-      return this;
-    }
-
-    public BloomFilterReader build() throws IOException {
-      File file = Files.createTempFile("test", ".bloom").toFile();
-      try (FileOutputStream fos = new FileOutputStream(file)) {
-        _bloomfilter.writeTo(fos);
-        try (PinotDataBuffer pinotDataBuffer = PinotDataBuffer.loadBigEndianFile(file)) {
-          // on heap filter should never use the buffer, so we can close it and delete the file
-          return new OnHeapGuavaBloomFilterReader(pinotDataBuffer);
-        }
-      } finally {
-        file.delete();
-      }
-    }
-  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/reduce/StreamingReduceServiceTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/reduce/StreamingReduceServiceTest.java
index 9946ddfa15a..a48b12563d1 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/reduce/StreamingReduceServiceTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/reduce/StreamingReduceServiceTest.java
@@ -56,7 +56,7 @@ public void testThreadExceptionTransfer() {
               threadPoolService,
               ImmutableMap.of(routingInstance, mockedResponse),
               1000,
-              mock(BaseReduceService.ExecutionStatsAggregator.class));
+              mock(ExecutionStatsAggregator.class));
           return null;
         }, cause -> cause.getMessage().contains(exceptionMessage))
     );
@@ -85,7 +85,7 @@ public Void answer(InvocationOnMock invocationOnMock)
               threadPoolService,
               ImmutableMap.of(routingInstance, mockedResponse),
               10,
-              mock(BaseReduceService.ExecutionStatsAggregator.class));
+              mock(ExecutionStatsAggregator.class));
           return null;
         },
         (cause) -> cause instanceof TimeoutException));
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/request/context/utils/BrokerRequestToQueryContextConverterTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/request/context/utils/BrokerRequestToQueryContextConverterTest.java
index 018bb275f45..f430c2abf4f 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/request/context/utils/BrokerRequestToQueryContextConverterTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/request/context/utils/BrokerRequestToQueryContextConverterTest.java
@@ -67,6 +67,7 @@ public void testHardcodedQueries() {
       assertEquals(selectExpressions.size(), 1);
       assertEquals(selectExpressions.get(0), ExpressionContext.forIdentifier("*"));
       assertEquals(selectExpressions.get(0).toString(), "*");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       assertNull(queryContext.getGroupByExpressions());
@@ -91,6 +92,7 @@ public void testHardcodedQueries() {
           new FunctionContext(FunctionContext.Type.AGGREGATION, "count",
               Collections.singletonList(ExpressionContext.forIdentifier("*")))));
       assertEquals(selectExpressions.get(0).toString(), "count(*)");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       assertNull(queryContext.getGroupByExpressions());
@@ -115,6 +117,7 @@ public void testHardcodedQueries() {
       assertEquals(selectExpressions.get(0).toString(), "foo");
       assertEquals(selectExpressions.get(1), ExpressionContext.forIdentifier("bar"));
       assertEquals(selectExpressions.get(1).toString(), "bar");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       List<OrderByExpressionContext> orderByExpressions = queryContext.getOrderByExpressions();
@@ -139,12 +142,14 @@ public void testHardcodedQueries() {
       QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
       assertEquals(queryContext.getTableName(), "testTable");
       List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions();
-      assertEquals(selectExpressions.size(), 1);
-      assertEquals(selectExpressions.get(0), ExpressionContext.forFunction(
-          new FunctionContext(FunctionContext.Type.AGGREGATION, "distinct",
-              Arrays.asList(ExpressionContext.forIdentifier("foo"), ExpressionContext.forIdentifier("bar"),
-                  ExpressionContext.forIdentifier("foobar")))));
-      assertEquals(selectExpressions.get(0).toString(), "distinct(foo,bar,foobar)");
+      assertEquals(selectExpressions.size(), 3);
+      assertEquals(selectExpressions.get(0), ExpressionContext.forIdentifier("foo"));
+      assertEquals(selectExpressions.get(0).toString(), "foo");
+      assertEquals(selectExpressions.get(1), ExpressionContext.forIdentifier("bar"));
+      assertEquals(selectExpressions.get(1).toString(), "bar");
+      assertEquals(selectExpressions.get(2), ExpressionContext.forIdentifier("foobar"));
+      assertEquals(selectExpressions.get(2).toString(), "foobar");
+      assertTrue(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       assertNull(queryContext.getGroupByExpressions());
@@ -179,13 +184,14 @@ public void testHardcodedQueries() {
               Arrays.asList(ExpressionContext.forIdentifier("foo"), ExpressionContext.forFunction(
                   new FunctionContext(FunctionContext.Type.TRANSFORM, "add",
                       Arrays.asList(ExpressionContext.forIdentifier("bar"),
-                          ExpressionContext.forLiteralContext(FieldSpec.DataType.LONG, Long.valueOf(123)))))))));
+                          ExpressionContext.forLiteralContext(FieldSpec.DataType.INT, Integer.valueOf(123)))))))));
       assertEquals(selectExpressions.get(0).toString(), "add(foo,add(bar,'123'))");
       assertEquals(selectExpressions.get(1), ExpressionContext.forFunction(
           new FunctionContext(FunctionContext.Type.TRANSFORM, "sub",
               Arrays.asList(ExpressionContext.forLiteralContext(FieldSpec.DataType.STRING, "456"),
                   ExpressionContext.forIdentifier("foobar")))));
       assertEquals(selectExpressions.get(1).toString(), "sub('456',foobar)");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       assertNull(queryContext.getGroupByExpressions());
@@ -194,7 +200,7 @@ public void testHardcodedQueries() {
       assertEquals(orderByExpressions.size(), 1);
       assertEquals(orderByExpressions.get(0), new OrderByExpressionContext(ExpressionContext.forFunction(
           new FunctionContext(FunctionContext.Type.TRANSFORM, "sub",
-              Arrays.asList(ExpressionContext.forLiteralContext(FieldSpec.DataType.LONG, Long.valueOf(456)),
+              Arrays.asList(ExpressionContext.forLiteralContext(FieldSpec.DataType.INT, Integer.valueOf(456)),
                   ExpressionContext.forIdentifier("foobar")))), true));
       assertEquals(orderByExpressions.get(0).toString(), "sub('456',foobar) ASC");
       assertNull(queryContext.getHavingFilter());
@@ -225,22 +231,19 @@ public void testHardcodedQueries() {
       QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
       assertEquals(queryContext.getTableName(), "testTable");
       List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions();
-      int numSelectExpressions = selectExpressions.size();
-      assertTrue(numSelectExpressions == 1 || numSelectExpressions == 3);
-      ExpressionContext aggregationExpression = selectExpressions.get(numSelectExpressions - 1);
-      assertEquals(aggregationExpression, ExpressionContext.forFunction(
+      assertEquals(selectExpressions.size(), 3);
+      assertEquals(selectExpressions.get(0), ExpressionContext.forFunction(
+          new FunctionContext(FunctionContext.Type.TRANSFORM, "sub",
+              Arrays.asList(ExpressionContext.forIdentifier("foo"), ExpressionContext.forIdentifier("bar")))));
+      assertEquals(selectExpressions.get(0).toString(), "sub(foo,bar)");
+      assertEquals(selectExpressions.get(1), ExpressionContext.forIdentifier("bar"));
+      assertEquals(selectExpressions.get(1).toString(), "bar");
+      assertEquals(selectExpressions.get(2), ExpressionContext.forFunction(
           new FunctionContext(FunctionContext.Type.AGGREGATION, "sum", Collections.singletonList(
               ExpressionContext.forFunction(new FunctionContext(FunctionContext.Type.TRANSFORM, "add",
                   Arrays.asList(ExpressionContext.forIdentifier("foo"), ExpressionContext.forIdentifier("bar"))))))));
-      assertEquals(aggregationExpression.toString(), "sum(add(foo,bar))");
-      if (numSelectExpressions == 3) {
-        assertEquals(selectExpressions.get(0), ExpressionContext.forFunction(
-            new FunctionContext(FunctionContext.Type.TRANSFORM, "sub",
-                Arrays.asList(ExpressionContext.forIdentifier("foo"), ExpressionContext.forIdentifier("bar")))));
-        assertEquals(selectExpressions.get(0).toString(), "sub(foo,bar)");
-        assertEquals(selectExpressions.get(1), ExpressionContext.forIdentifier("bar"));
-        assertEquals(selectExpressions.get(1).toString(), "bar");
-      }
+      assertEquals(selectExpressions.get(2).toString(), "sum(add(foo,bar))");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       List<ExpressionContext> groupByExpressions = queryContext.getGroupByExpressions();
@@ -284,6 +287,7 @@ public void testHardcodedQueries() {
       assertEquals(selectExpressions.size(), 1);
       assertEquals(selectExpressions.get(0), ExpressionContext.forIdentifier("*"));
       assertEquals(selectExpressions.get(0).toString(), "*");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       FilterContext filter = queryContext.getFilter();
       assertNotNull(filter);
@@ -328,6 +332,7 @@ public void testHardcodedQueries() {
       assertEquals(selectExpressions.get(0).toString(), "sum(foo)");
       assertEquals(selectExpressions.get(1), ExpressionContext.forIdentifier("bar"));
       assertEquals(selectExpressions.get(1).toString(), "bar");
+      assertFalse(queryContext.isDistinct());
       List<String> aliasList = queryContext.getAliasList();
       assertEquals(aliasList.size(), 2);
       assertEquals(aliasList.get(0), "a");
@@ -371,6 +376,7 @@ public void testHardcodedQueries() {
       assertEquals(selectExpressions.get(0).toString(), "sum(foo)");
       assertEquals(selectExpressions.get(1), ExpressionContext.forIdentifier("bar"));
       assertEquals(selectExpressions.get(1).toString(), "bar");
+      assertFalse(queryContext.isDistinct());
       assertEquals(getAliasCount(queryContext.getAliasList()), 0);
       assertNull(queryContext.getFilter());
       List<ExpressionContext> groupByExpressions = queryContext.getGroupByExpressions();
@@ -649,4 +655,142 @@ public void testFilteredAggregations() {
       }
     }
   }
+
+  @Test
+  void testDeduplicateOrderByExpressions() {
+    String query = "SELECT name FROM employees ORDER BY name DESC NULLS LAST, name ASC";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    assertEquals(queryContext.getOrderByExpressions().size(), 1);
+  }
+
+  @Test
+  void testRemoveOrderByFunctions() {
+    String query = "SELECT A FROM testTable ORDER BY datetrunc(A) DESC NULLS LAST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isDesc());
+    assertTrue(orderByExpressionContext.isNullsLast());
+    assertEquals(orderByExpressionContext.getExpression().getFunction().getFunctionName(), "datetrunc");
+    assertEquals(orderByExpressionContext.getExpression().getFunction().getArguments().get(0).getIdentifier(), "A");
+  }
+
+  @Test
+  void testOrderByDefault() {
+    String query = "SELECT A FROM testTable ORDER BY A";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isAsc());
+    assertTrue(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testOrderByNullsLast() {
+    String query = "SELECT A FROM testTable ORDER BY A NULLS LAST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isAsc());
+    assertTrue(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testOrderByNullsFirst() {
+    String query = "SELECT A FROM testTable ORDER BY A NULLS FIRST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isAsc());
+    assertFalse(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testOrderByAscNullsFirst() {
+    String query = "SELECT A FROM testTable ORDER BY A ASC NULLS FIRST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isAsc());
+    assertFalse(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testOrderByAscNullsLast() {
+    String query = "SELECT A FROM testTable ORDER BY A ASC NULLS LAST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isAsc());
+    assertTrue(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testOrderByDescNullsFirst() {
+    String query = "SELECT A FROM testTable ORDER BY A DESC NULLS FIRST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isDesc());
+    assertFalse(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testOrderByDescNullsLast() {
+    String query = "SELECT A FROM testTable ORDER BY A DESC NULLS LAST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertTrue(orderByExpressionContext.isDesc());
+    assertTrue(orderByExpressionContext.isNullsLast());
+  }
+
+  @Test
+  void testDistinctOrderByNullsLast() {
+    String query = "SELECT DISTINCT A FROM testTable ORDER BY A NULLS LAST";
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext(query);
+
+    assertNotNull(queryContext.getOrderByExpressions());
+    List<OrderByExpressionContext> orderByExpressionContexts = queryContext.getOrderByExpressions();
+    assertEquals(orderByExpressionContexts.size(), 1);
+    OrderByExpressionContext orderByExpressionContext = orderByExpressionContexts.get(0);
+    assertFalse(orderByExpressionContext.isDesc());
+    assertTrue(orderByExpressionContext.isNullsLast());
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/selection/SelectionOperatorServiceTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/selection/SelectionOperatorServiceTest.java
index df95b6a5e16..7d44c6b65b5 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/selection/SelectionOperatorServiceTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/selection/SelectionOperatorServiceTest.java
@@ -18,18 +18,22 @@
  */
 package org.apache.pinot.core.query.selection;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
-import java.util.PriorityQueue;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.core.query.utils.OrderByComparatorFactory;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.testng.annotations.BeforeClass;
@@ -38,6 +42,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
@@ -48,45 +53,30 @@
  */
 public class SelectionOperatorServiceTest {
   private final String[] _columnNames = {
-      "int", "long", "float", "double", "string", "int_array", "long_array", "float_array", "double_array",
-      "string_array", "bytes"
+      "int", "long", "float", "double", "big_decimal", "string", "bytes", "int_array", "long_array", "float_array",
+      "double_array", "string_array"
   };
-  private final DataSchema.ColumnDataType[] _columnDataTypes = {
-      DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.FLOAT,
-      DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT_ARRAY,
-      DataSchema.ColumnDataType.LONG_ARRAY, DataSchema.ColumnDataType.FLOAT_ARRAY,
-      DataSchema.ColumnDataType.DOUBLE_ARRAY, DataSchema.ColumnDataType.STRING_ARRAY, DataSchema.ColumnDataType.BYTES
+  private final ColumnDataType[] _columnDataTypes = {
+      ColumnDataType.INT, ColumnDataType.LONG, ColumnDataType.FLOAT, ColumnDataType.DOUBLE,
+      ColumnDataType.BIG_DECIMAL, ColumnDataType.STRING, ColumnDataType.BYTES, ColumnDataType.INT_ARRAY,
+      ColumnDataType.LONG_ARRAY, ColumnDataType.FLOAT_ARRAY, ColumnDataType.DOUBLE_ARRAY, ColumnDataType.STRING_ARRAY
   };
   private final DataSchema _dataSchema = new DataSchema(_columnNames, _columnDataTypes);
-  private final DataSchema.ColumnDataType[] _compatibleColumnDataTypes = {
-      DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.FLOAT, DataSchema.ColumnDataType.DOUBLE,
-      DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.LONG_ARRAY,
-      DataSchema.ColumnDataType.FLOAT_ARRAY, DataSchema.ColumnDataType.DOUBLE_ARRAY,
-      DataSchema.ColumnDataType.INT_ARRAY, DataSchema.ColumnDataType.STRING_ARRAY, DataSchema.ColumnDataType.BYTES
-  };
-  private final DataSchema _compatibleDataSchema = new DataSchema(_columnNames, _compatibleColumnDataTypes);
-  private final DataSchema.ColumnDataType[] _upgradedColumnDataTypes = new DataSchema.ColumnDataType[]{
-      DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
-      DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.LONG_ARRAY,
-      DataSchema.ColumnDataType.DOUBLE_ARRAY, DataSchema.ColumnDataType.DOUBLE_ARRAY,
-      DataSchema.ColumnDataType.DOUBLE_ARRAY, DataSchema.ColumnDataType.STRING_ARRAY, DataSchema.ColumnDataType.BYTES
-  };
-  private final DataSchema _upgradedDataSchema = new DataSchema(_columnNames, _upgradedColumnDataTypes);
   private final Object[] _row1 = {
-      0, 1L, 2.0F, 3.0, "4", new int[]{5}, new long[]{6L}, new float[]{7.0F}, new double[]{8.0}, new String[]{"9"},
-      BytesUtils.toByteArray("1020")
+      0, 1L, 2.0F, 3.0, new BigDecimal(4), "5", BytesUtils.toByteArray(
+      "0606"), new int[]{7}, new long[]{8L}, new float[]{9.0F}, new double[]{10.0}, new String[]{"11"}
   };
   private final Object[] _row2 = {
-      10, 11L, 12.0F, 13.0, "14", new int[]{15}, new long[]{16L}, new float[]{17.0F}, new double[]{18.0},
-      new String[]{"19"}, BytesUtils.toByteArray("3040")
+      10, 11L, 12.0F, 13.0, new BigDecimal(14), "15", BytesUtils.toByteArray(
+      "1616"), new int[]{17}, new long[]{18L}, new float[]{19.0F}, new double[]{20.0}, new String[]{"21"}
   };
-  private final Object[] _compatibleRow1 = {
-      1L, 2.0F, 3.0, 4, "5", new long[]{6L}, new float[]{7.0F}, new double[]{8.0}, new int[]{9}, new String[]{"10"},
-      BytesUtils.toByteArray("5060")
+  private final Object[] _row3 = {
+      1, 2L, 3.0F, 4.0, new BigDecimal(5), "6", BytesUtils.toByteArray(
+      "0707"), new int[]{8}, new long[]{9L}, new float[]{10.0F}, new double[]{11.0}, new String[]{"12"}
   };
-  private final Object[] _compatibleRow2 = {
-      11L, 12.0F, 13.0, 14, "15", new long[]{16L}, new float[]{17.0F}, new double[]{18.0}, new int[]{19},
-      new String[]{"20"}, BytesUtils.toByteArray("7000")
+  private final Object[] _row4 = {
+      11, 12L, 13.0F, 14.0, new BigDecimal(15), "16", BytesUtils.toByteArray(
+      "1717"), new int[]{18}, new long[]{19L}, new float[]{20.0F}, new double[]{21.0}, new String[]{"22"}
   };
   private QueryContext _queryContext;
 
@@ -167,59 +157,50 @@ public void testGetSelectionColumns() {
   }
 
   @Test
-  public void testCompatibleRowsMergeWithoutOrdering() {
-    ArrayList<Object[]> mergedRows = new ArrayList<>(2);
+  public void testRowsMergeWithoutOrdering() {
+    List<Object[]> mergedRows = new ArrayList<>(2);
     mergedRows.add(_row1);
     mergedRows.add(_row2);
-    Collection<Object[]> rowsToMerge = new ArrayList<>(2);
-    rowsToMerge.add(_compatibleRow1);
-    rowsToMerge.add(_compatibleRow2);
-    SelectionOperatorUtils.mergeWithoutOrdering(mergedRows, rowsToMerge, 3);
+    SelectionResultsBlock mergedBlock = new SelectionResultsBlock(_dataSchema, mergedRows);
+    List<Object[]> rowsToMerge = new ArrayList<>(2);
+    rowsToMerge.add(_row3);
+    rowsToMerge.add(_row4);
+    SelectionResultsBlock blockToMerge = new SelectionResultsBlock(_dataSchema, rowsToMerge);
+    SelectionOperatorUtils.mergeWithoutOrdering(mergedBlock, blockToMerge, 3);
     assertEquals(mergedRows.size(), 3);
     assertSame(mergedRows.get(0), _row1);
     assertSame(mergedRows.get(1), _row2);
-    assertSame(mergedRows.get(2), _compatibleRow1);
+    assertSame(mergedRows.get(2), _row3);
   }
 
   @Test
-  public void testCompatibleRowsMergeWithOrdering() {
-    SelectionOperatorService selectionOperatorService = new SelectionOperatorService(_queryContext, _dataSchema);
-    PriorityQueue<Object[]> mergedRows = selectionOperatorService.getRows();
+  public void testRowsMergeWithOrdering() {
+    assertNotNull(_queryContext.getOrderByExpressions());
+    Comparator<Object[]> comparator =
+        OrderByComparatorFactory.getComparator(_queryContext.getOrderByExpressions(), false);
     int maxNumRows = _queryContext.getOffset() + _queryContext.getLimit();
-    Collection<Object[]> rowsToMerge1 = new ArrayList<>(2);
-    rowsToMerge1.add(_row1);
-    rowsToMerge1.add(_row2);
-    SelectionOperatorUtils.mergeWithOrdering(mergedRows, rowsToMerge1, maxNumRows);
-    Collection<Object[]> rowsToMerge2 = new ArrayList<>(2);
-    rowsToMerge2.add(_compatibleRow1);
-    rowsToMerge2.add(_compatibleRow2);
-    SelectionOperatorUtils.mergeWithOrdering(mergedRows, rowsToMerge2, maxNumRows);
+    SelectionResultsBlock mergedBlock = new SelectionResultsBlock(_dataSchema, Collections.emptyList(), comparator);
+    List<Object[]> rowsToMerge1 = Arrays.asList(_row2, _row1);
+    SelectionResultsBlock blockToMerge1 = new SelectionResultsBlock(_dataSchema, rowsToMerge1, comparator);
+    SelectionOperatorUtils.mergeWithOrdering(mergedBlock, blockToMerge1, maxNumRows);
+    List<Object[]> rowsToMerge2 = Arrays.asList(_row4, _row3);
+    SelectionResultsBlock blockToMerge2 = new SelectionResultsBlock(_dataSchema, rowsToMerge2, comparator);
+    SelectionOperatorUtils.mergeWithOrdering(mergedBlock, blockToMerge2, maxNumRows);
+    List<Object[]> mergedRows = mergedBlock.getRows();
     assertEquals(mergedRows.size(), 3);
-    assertSame(mergedRows.poll(), _compatibleRow1);
-    assertSame(mergedRows.poll(), _row2);
-    assertSame(mergedRows.poll(), _compatibleRow2);
+    assertSame(mergedRows.get(0), _row4);
+    assertSame(mergedRows.get(1), _row2);
+    assertSame(mergedRows.get(2), _row3);
   }
 
   @Test
-  public void testCompatibleRowsDataTableTransformation()
+  public void testExtractRowFromDataTable()
       throws Exception {
     Collection<Object[]> rows = new ArrayList<>(2);
     rows.add(_row1);
-    rows.add(_compatibleRow1);
-    DataSchema dataSchema = _dataSchema.clone();
-    assertTrue(dataSchema.isTypeCompatibleWith(_compatibleDataSchema));
-    dataSchema = DataSchema.upgradeToCover(dataSchema, _compatibleDataSchema);
-    assertEquals(dataSchema, _upgradedDataSchema);
-    DataTable dataTable = SelectionOperatorUtils.getDataTableFromRows(rows, dataSchema, false);
-    Object[] expectedRow1 = {
-        0L, 1.0, 2.0, 3.0, "4", new long[]{5L}, new double[]{6.0}, new double[]{7.0}, new double[]{8.0},
-        new String[]{"9"}, BytesUtils.toByteArray("1020")
-    };
-    Object[] expectedCompatibleRow1 = {
-        1L, 2.0, 3.0, 4.0, "5", new long[]{6L}, new double[]{7.0}, new double[]{8.0}, new double[]{9.0},
-        new String[]{"10"}, BytesUtils.toByteArray("5060")
-    };
-    assertTrue(Arrays.deepEquals(SelectionOperatorUtils.extractRowFromDataTable(dataTable, 0), expectedRow1));
-    assertTrue(Arrays.deepEquals(SelectionOperatorUtils.extractRowFromDataTable(dataTable, 1), expectedCompatibleRow1));
+    rows.add(_row2);
+    DataTable dataTable = SelectionOperatorUtils.getDataTableFromRows(rows, _dataSchema, false);
+    assertTrue(Arrays.deepEquals(SelectionOperatorUtils.extractRowFromDataTable(dataTable, 0), _row1));
+    assertTrue(Arrays.deepEquals(SelectionOperatorUtils.extractRowFromDataTable(dataTable, 1), _row2));
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/utils/OrderByComparatorFactoryTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/utils/OrderByComparatorFactoryTest.java
new file mode 100644
index 00000000000..54864862deb
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/utils/OrderByComparatorFactoryTest.java
@@ -0,0 +1,108 @@
+/**
+ * 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.pinot.core.query.utils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.OrderByExpressionContext;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class OrderByComparatorFactoryTest {
+  private static final boolean ENABLE_NULL_HANDLING = true;
+  private static final boolean ASC = true;
+  private static final boolean DESC = false;
+  private static final boolean NULLS_LAST = true;
+  private static final boolean NULLS_FIRST = false;
+  private static final ExpressionContext COLUMN1 = ExpressionContext.forIdentifier("Column1");
+  private static final ExpressionContext COLUMN2 = ExpressionContext.forIdentifier("Column2");
+  private static final int COLUMN1_INDEX = 0;
+  private static final int COLUMN2_INDEX = 1;
+
+  private List<Object[]> _rows;
+
+  public void setUpSingleColumnRows() {
+    _rows = Arrays.asList(new Object[]{1}, new Object[]{2}, new Object[]{null});
+  }
+
+  private List<Object> extractColumn(List<Object[]> rows, int columnIndex) {
+    return rows.stream().map(row -> row[columnIndex]).collect(Collectors.toList());
+  }
+
+  @Test
+  public void testAscNullsLast() {
+    List<OrderByExpressionContext> orderBys =
+        Collections.singletonList(new OrderByExpressionContext(COLUMN1, ASC, NULLS_LAST));
+    setUpSingleColumnRows();
+
+    _rows.sort(OrderByComparatorFactory.getComparator(orderBys, ENABLE_NULL_HANDLING));
+
+    assertEquals(extractColumn(_rows, COLUMN1_INDEX), Arrays.asList(1, 2, null));
+  }
+
+  @Test
+  public void testAscNullsFirst() {
+    List<OrderByExpressionContext> orderBys =
+        Collections.singletonList(new OrderByExpressionContext(COLUMN1, ASC, NULLS_FIRST));
+    setUpSingleColumnRows();
+
+    _rows.sort(OrderByComparatorFactory.getComparator(orderBys, ENABLE_NULL_HANDLING));
+
+    assertEquals(extractColumn(_rows, COLUMN1_INDEX), Arrays.asList(null, 1, 2));
+  }
+
+  @Test
+  public void testDescNullsLast() {
+    List<OrderByExpressionContext> orderBys =
+        Collections.singletonList(new OrderByExpressionContext(COLUMN1, DESC, NULLS_LAST));
+    setUpSingleColumnRows();
+
+    _rows.sort(OrderByComparatorFactory.getComparator(orderBys, ENABLE_NULL_HANDLING));
+
+    assertEquals(extractColumn(_rows, COLUMN1_INDEX), Arrays.asList(2, 1, null));
+  }
+
+  @Test
+  public void testDescNullsFirst() {
+    List<OrderByExpressionContext> orderBys =
+        Collections.singletonList(new OrderByExpressionContext(COLUMN1, DESC, NULLS_FIRST));
+    setUpSingleColumnRows();
+
+    _rows.sort(OrderByComparatorFactory.getComparator(orderBys, ENABLE_NULL_HANDLING));
+
+    assertEquals(extractColumn(_rows, COLUMN1_INDEX), Arrays.asList(null, 2, 1));
+  }
+
+  @Test
+  public void testTwoNullsCompareNextColumn() {
+    List<OrderByExpressionContext> orderBys = Arrays.asList(new OrderByExpressionContext(COLUMN1, ASC, NULLS_LAST),
+        new OrderByExpressionContext(COLUMN2, ASC, NULLS_LAST));
+    _rows = Arrays.asList(new Object[]{null, 2}, new Object[]{null, 3}, new Object[]{1, 1});
+
+    _rows.sort(OrderByComparatorFactory.getComparator(orderBys, ENABLE_NULL_HANDLING));
+
+    assertEquals(extractColumn(_rows, COLUMN2_INDEX), Arrays.asList(1, 2, 3));
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentMapperTest.java b/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentMapperTest.java
index 3616e190d66..3a3ee333987 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentMapperTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentMapperTest.java
@@ -48,6 +48,7 @@
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.data.readers.RecordReaderFileConfig;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -141,7 +142,8 @@ public void segmentMapperTest(SegmentProcessorConfig processorConfig, Map<String
     PinotSegmentRecordReader segmentRecordReader = new PinotSegmentRecordReader();
     segmentRecordReader.init(_indexDir, null, null, true);
     SegmentMapper segmentMapper =
-        new SegmentMapper(Collections.singletonList(segmentRecordReader), processorConfig, mapperOutputDir);
+        new SegmentMapper(Collections.singletonList(new RecordReaderFileConfig(segmentRecordReader)),
+            processorConfig, mapperOutputDir);
     Map<String, GenericRowFileManager> partitionToFileManagerMap = segmentMapper.map();
     segmentRecordReader.close();
 
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFrameworkTest.java b/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFrameworkTest.java
index 0b73d1f18c1..39b66fa4dda 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFrameworkTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/segment/processing/framework/SegmentProcessorFrameworkTest.java
@@ -18,8 +18,10 @@
  */
 package org.apache.pinot.core.segment.processing.framework;
 
+import com.google.common.collect.ImmutableList;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -42,8 +44,10 @@
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.FileFormat;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.data.readers.RecordReaderFileConfig;
 import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.testng.annotations.AfterClass;
@@ -175,6 +179,41 @@ private void rewindRecordReaders(List<RecordReader> recordReaders)
     }
   }
 
+  /**
+   * Test lazy initialization of record readers. Here we create
+   * RecoderReaderFileConfig and the actual reader is initialized during the
+   * map phase.
+   * @throws Exception
+   */
+  @Test
+  public void testRecordReaderFileConfigInit() throws Exception {
+    File workingDir = new File(TEMP_DIR, "segmentOutput");
+    FileUtils.forceMkdir(workingDir);
+    ClassLoader classLoader = getClass().getClassLoader();
+    URL resource = classLoader.getResource("data/dimBaseballTeams.csv");
+    RecordReaderFileConfig reader = new RecordReaderFileConfig(FileFormat.CSV,
+        new File(resource.toURI()),
+        null, null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName("myTable").
+        setTimeColumnName("time").build();
+
+    Schema schema =
+        new Schema.SchemaBuilder().setSchemaName("mySchema").addSingleValueDimension("teamId",
+                DataType.STRING, "")
+            .addSingleValueDimension("teamName", DataType.STRING, "")
+            .addDateTime("time", DataType.LONG, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS").build();
+
+    SegmentProcessorConfig config =
+        new SegmentProcessorConfig.Builder().setTableConfig(tableConfig).setSchema(schema).build();
+    SegmentProcessorFramework framework = new SegmentProcessorFramework(config, workingDir, ImmutableList.of(reader),
+        null);
+    List<File> outputSegments = framework.process();
+    assertEquals(outputSegments.size(), 1);
+    ImmutableSegment segment = ImmutableSegmentLoader.load(outputSegments.get(0), ReadMode.mmap);
+    SegmentMetadata segmentMetadata = segment.getSegmentMetadata();
+    assertEquals(segmentMetadata.getTotalDocs(), 51);
+  }
+
   @Test
   public void testSingleSegment()
       throws Exception {
@@ -219,6 +258,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    String[] outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segment = ImmutableSegmentLoader.load(outputSegments.get(0), ReadMode.mmap);
     segmentMetadata = segment.getSegmentMetadata();
     assertEquals(segmentMetadata.getTotalDocs(), 10);
@@ -255,6 +296,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segment = ImmutableSegmentLoader.load(outputSegments.get(0), ReadMode.mmap);
     segmentMetadata = segment.getSegmentMetadata();
     assertEquals(segmentMetadata.getName(), "myTable_segment_0001");
@@ -269,6 +312,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 5);
     timeMetadata = segmentMetadata.getColumnMetadataFor("time");
@@ -286,6 +331,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 5);
     timeMetadata = segmentMetadata.getColumnMetadataFor("time");
@@ -303,6 +350,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertTrue(outputSegments.isEmpty());
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     FileUtils.cleanDirectory(workingDir);
     rewindRecordReaders(_singleSegment);
 
@@ -313,6 +362,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 10);
     timeMetadata = segmentMetadata.getColumnMetadataFor("time");
@@ -329,6 +380,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 3);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     outputSegments.sort(null);
     // segment 0
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
@@ -366,6 +419,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 2);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     outputSegments.sort(null);
     // segment 0
     segment = ImmutableSegmentLoader.load(outputSegments.get(0), ReadMode.mmap);
@@ -429,6 +484,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 8);
     assertEquals(segmentMetadata.getName(), "myTable_1597708800000_1597881600000_0");
@@ -442,6 +499,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 3);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     outputSegments.sort(null);
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 4);
@@ -462,6 +521,8 @@ public void testSingleSegment()
     framework = new SegmentProcessorFramework(_singleSegment, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 3);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     outputSegments.sort(null);
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 4);
@@ -488,6 +549,8 @@ public void testMultipleSegments()
     SegmentProcessorFramework framework = new SegmentProcessorFramework(_multipleSegments, config, workingDir);
     List<File> outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    String[] outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     SegmentMetadata segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 10);
     assertEquals(segmentMetadata.getName(), "myTable_1597719600000_1597892400000_0");
@@ -501,6 +564,8 @@ public void testMultipleSegments()
     framework = new SegmentProcessorFramework(_multipleSegments, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 3);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     outputSegments.sort(null);
     segmentMetadata = new SegmentMetadataImpl(outputSegments.get(0));
     assertEquals(segmentMetadata.getTotalDocs(), 2);
@@ -528,6 +593,8 @@ public void testMultiValue()
     SegmentProcessorFramework framework = new SegmentProcessorFramework(_multiValueSegments, config, workingDir);
     List<File> outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    String[] outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     ImmutableSegment segment = ImmutableSegmentLoader.load(outputSegments.get(0), ReadMode.mmap);
     SegmentMetadataImpl segmentMetadata = (SegmentMetadataImpl) segment.getSegmentMetadata();
     assertEquals(segmentMetadata.getTotalDocs(), 2);
@@ -562,6 +629,8 @@ public void testMultiValue()
     framework = new SegmentProcessorFramework(_multiValueSegments, config, workingDir);
     outputSegments = framework.process();
     assertEquals(outputSegments.size(), 1);
+    outputDirs = workingDir.list();
+    assertTrue(outputDirs != null && outputDirs.length == 1, Arrays.toString(outputDirs));
     segment = ImmutableSegmentLoader.load(outputSegments.get(0), ReadMode.mmap);
     segmentMetadata = (SegmentMetadataImpl) segment.getSegmentMetadata();
     assertEquals(segmentMetadata.getTotalDocs(), 2);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/BaseStarTreeV2Test.java b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/BaseStarTreeV2Test.java
index efe2196bb08..f9bb00980c0 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/BaseStarTreeV2Test.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/BaseStarTreeV2Test.java
@@ -33,7 +33,6 @@
 import org.apache.pinot.common.request.context.ExpressionContext;
 import org.apache.pinot.core.common.BlockDocIdIterator;
 import org.apache.pinot.core.plan.FilterPlanNode;
-import org.apache.pinot.core.plan.PlanNode;
 import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
@@ -256,7 +255,7 @@ private void testQuery(String query)
     assertNotNull(predicateEvaluatorsMap);
 
     // Extract values with star-tree
-    PlanNode starTreeFilterPlanNode =
+    StarTreeFilterPlanNode starTreeFilterPlanNode =
         new StarTreeFilterPlanNode(queryContext, _starTreeV2, predicateEvaluatorsMap, groupByColumnSet);
     List<ForwardIndexReader> starTreeAggregationColumnReaders = new ArrayList<>(numAggregations);
     for (AggregationFunctionColumnPair aggregationFunctionColumnPair : aggregationFunctionColumnPairs) {
@@ -271,7 +270,7 @@ private void testQuery(String query)
         computeStarTreeResult(starTreeFilterPlanNode, starTreeAggregationColumnReaders, starTreeGroupByColumnReaders);
 
     // Extract values without star-tree
-    PlanNode nonStarTreeFilterPlanNode = new FilterPlanNode(_indexSegment, queryContext);
+    FilterPlanNode nonStarTreeFilterPlanNode = new FilterPlanNode(_indexSegment, queryContext);
     List<ForwardIndexReader> nonStarTreeAggregationColumnReaders = new ArrayList<>(numAggregations);
     List<Dictionary> nonStarTreeAggregationColumnDictionaries = new ArrayList<>(numAggregations);
     for (AggregationFunctionColumnPair aggregationFunctionColumnPair : aggregationFunctionColumnPairs) {
@@ -305,7 +304,7 @@ private void testQuery(String query)
     }
   }
 
-  private Map<List<Integer>, List<Object>> computeStarTreeResult(PlanNode starTreeFilterPlanNode,
+  private Map<List<Integer>, List<Object>> computeStarTreeResult(StarTreeFilterPlanNode starTreeFilterPlanNode,
       List<ForwardIndexReader> aggregationColumnReaders, List<ForwardIndexReader> groupByColumnReaders)
       throws IOException {
     Map<List<Integer>, List<Object>> result = new HashMap<>();
@@ -372,7 +371,7 @@ private Object getAggregatedValue(int docId, ForwardIndexReader reader, ForwardI
     }
   }
 
-  private Map<List<Integer>, List<Object>> computeNonStarTreeResult(PlanNode nonStarTreeFilterPlanNode,
+  private Map<List<Integer>, List<Object>> computeNonStarTreeResult(FilterPlanNode nonStarTreeFilterPlanNode,
       List<ForwardIndexReader> aggregationColumnReaders, List<Dictionary> aggregationColumnDictionaries,
       List<ForwardIndexReader> groupByColumnReaders)
       throws IOException {
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/DistinctCountIntegerSumTupleSketchStarTreeV2Test.java b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/DistinctCountIntegerSumTupleSketchStarTreeV2Test.java
new file mode 100644
index 00000000000..b9c52bf9587
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/DistinctCountIntegerSumTupleSketchStarTreeV2Test.java
@@ -0,0 +1,57 @@
+/**
+ * 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.pinot.core.startree.v2;
+
+import java.util.Random;
+import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+import org.apache.pinot.segment.local.aggregator.IntegerTupleSketchValueAggregator;
+import org.apache.pinot.segment.local.aggregator.ValueAggregator;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class DistinctCountIntegerSumTupleSketchStarTreeV2Test
+    extends BaseStarTreeV2Test<byte[], Sketch<IntegerSummary>> {
+
+  @Override
+  ValueAggregator<byte[], Sketch<IntegerSummary>> getValueAggregator() {
+    return new IntegerTupleSketchValueAggregator(IntegerSummary.Mode.Sum);
+  }
+
+  @Override
+  DataType getRawValueType() {
+    return DataType.BYTES;
+  }
+
+  @Override
+  byte[] getRandomRawValue(Random random) {
+    IntegerSketch is = new IntegerSketch(4, IntegerSummary.Mode.Sum);
+    is.update(random.nextInt(100), random.nextInt(100));
+    return ObjectSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.serialize(is.compact());
+  }
+
+  @Override
+  void assertAggregatedValue(Sketch<IntegerSummary> starTreeResult, Sketch<IntegerSummary> nonStarTreeResult) {
+    assertEquals(starTreeResult.getEstimate(), nonStarTreeResult.getEstimate());
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/DistinctCountThetaSketchStarTreeV2Test.java b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/DistinctCountThetaSketchStarTreeV2Test.java
new file mode 100644
index 00000000000..4e924c9d0c6
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/DistinctCountThetaSketchStarTreeV2Test.java
@@ -0,0 +1,51 @@
+/**
+ * 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.pinot.core.startree.v2;
+
+import java.util.Random;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.pinot.segment.local.aggregator.DistinctCountThetaSketchValueAggregator;
+import org.apache.pinot.segment.local.aggregator.ValueAggregator;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class DistinctCountThetaSketchStarTreeV2Test extends BaseStarTreeV2Test<Object, Sketch> {
+
+  @Override
+  ValueAggregator<Object, Sketch> getValueAggregator() {
+    return new DistinctCountThetaSketchValueAggregator();
+  }
+
+  @Override
+  DataType getRawValueType() {
+    return DataType.INT;
+  }
+
+  @Override
+  Object getRandomRawValue(Random random) {
+    return random.nextInt(100);
+  }
+
+  @Override
+  void assertAggregatedValue(Sketch starTreeResult, Sketch nonStarTreeResult) {
+    assertEquals(starTreeResult.getEstimate(), nonStarTreeResult.getEstimate());
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/util/CrcUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/util/CrcUtilsTest.java
index 0589ecfceb5..fd54a8a2794 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/util/CrcUtilsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/util/CrcUtilsTest.java
@@ -19,71 +19,49 @@
 package org.apache.pinot.core.util;
 
 import java.io.File;
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
 import org.apache.pinot.segment.local.segment.creator.SegmentTestUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentCreationDriverFactory;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.index.converter.SegmentV1V2ToV3FormatConverter;
 import org.apache.pinot.segment.local.utils.CrcUtils;
-import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.segment.spi.SegmentMetadata;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
-import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.util.TestUtils;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
-/**
- * Dec 4, 2014
- */
 
 public class CrcUtilsTest {
-
+  private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "CrcUtilsTest");
   private static final String AVRO_DATA = "data/test_data-mv.avro";
-  private static final File INDEX_DIR = new File("/tmp/testingCrc");
+  private static final long EXPECTED_V1_CRC = 4139425029L;
+  private static final long EXPECTED_V3_CRC = 94877217L;
 
   @Test
-  public void test1()
-      throws Exception {
-    if (INDEX_DIR.exists()) {
-      FileUtils.deleteQuietly(INDEX_DIR);
-    }
-
-    final CrcUtils u1 = CrcUtils.forAllFilesInFolder(new File(makeSegmentAndReturnPath()));
-    final long crc1 = u1.computeCrc();
-    final String md51 = u1.computeMD5();
-
-    FileUtils.deleteQuietly(INDEX_DIR);
-
-    final CrcUtils u2 = CrcUtils.forAllFilesInFolder(new File(makeSegmentAndReturnPath()));
-    final long crc2 = u2.computeCrc();
-    final String md52 = u2.computeMD5();
-
-    Assert.assertEquals(crc1, crc2);
-    Assert.assertEquals(md51, md52);
-
-    FileUtils.deleteQuietly(INDEX_DIR);
-
-    final IndexSegment segment = ImmutableSegmentLoader.load(new File(makeSegmentAndReturnPath()), ReadMode.mmap);
-    final SegmentMetadata m = segment.getSegmentMetadata();
-
-    FileUtils.deleteQuietly(INDEX_DIR);
-  }
-
-  private String makeSegmentAndReturnPath()
+  public void testCrc()
       throws Exception {
-    final String filePath = TestUtils.getFileFromResourceUrl(CrcUtils.class.getClassLoader().getResource(AVRO_DATA));
-
-    final SegmentGeneratorConfig config = SegmentTestUtils
-        .getSegmentGenSpecWithSchemAndProjectedColumns(new File(filePath), INDEX_DIR, "daysSinceEpoch", TimeUnit.DAYS,
-            "testTable");
-    config.setSegmentNamePostfix("1");
-    final SegmentIndexCreationDriver driver = SegmentCreationDriverFactory.get(null);
+    FileUtils.deleteDirectory(INDEX_DIR);
+
+    URL resource = getClass().getClassLoader().getResource(AVRO_DATA);
+    assertNotNull(resource);
+    String filePath = TestUtils.getFileFromResourceUrl(resource);
+    SegmentGeneratorConfig config =
+        SegmentTestUtils.getSegmentGenSpecWithSchemAndProjectedColumns(new File(filePath), INDEX_DIR, "daysSinceEpoch",
+            TimeUnit.DAYS, "testTable");
+    SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
     driver.init(config);
     driver.build();
 
-    return new File(INDEX_DIR, driver.getSegmentName()).getAbsolutePath();
+    File indexDir = driver.getOutputDirectory();
+    assertEquals(CrcUtils.forAllFilesInFolder(indexDir).computeCrc(), EXPECTED_V1_CRC);
+
+    new SegmentV1V2ToV3FormatConverter().convert(indexDir);
+    assertEquals(CrcUtils.forAllFilesInFolder(indexDir).computeCrc(), EXPECTED_V3_CRC);
+
+    FileUtils.deleteDirectory(INDEX_DIR);
   }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/util/SchemaUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/util/SchemaUtilsTest.java
index 115f50188fd..57f91aa954e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/util/SchemaUtilsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/util/SchemaUtilsTest.java
@@ -248,6 +248,19 @@ public void testValidateDateTimeFieldSpec() {
     checkValidationFails(pinotSchema);
   }
 
+  @Test
+  public void testValidateCaseInsensitive() {
+    Schema pinotSchema;
+    pinotSchema =
+      new Schema.SchemaBuilder().addTime(new TimeGranularitySpec(DataType.LONG, TimeUnit.MILLISECONDS, "incoming"),
+          new TimeGranularitySpec(DataType.INT, TimeUnit.DAYS, "outgoing"))
+        .addSingleValueDimension("dim1", DataType.INT)
+        .addSingleValueDimension("Dim1", DataType.INT)
+        .build();
+
+    checkValidationFails(pinotSchema, true);
+  }
+
   @Test
   public void testValidatePrimaryKeyColumns() {
     Schema pinotSchema;
@@ -416,12 +429,16 @@ public void testColumnNameValidation()
     checkValidationFails(pinotSchema);
   }
 
-  private void checkValidationFails(Schema pinotSchema) {
+  private void checkValidationFails(Schema pinotSchema, boolean isIgnoreCase) {
     try {
-      SchemaUtils.validate(pinotSchema);
+      SchemaUtils.validate(pinotSchema, isIgnoreCase);
       Assert.fail("Schema validation should have failed.");
     } catch (IllegalArgumentException | IllegalStateException e) {
       // expected
     }
   }
+
+  private void checkValidationFails(Schema pinotSchema) {
+    checkValidationFails(pinotSchema, false);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/AllNullQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/AllNullQueriesTest.java
index 960bde9ccac..f345e99f585 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/AllNullQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/AllNullQueriesTest.java
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -285,7 +284,6 @@ public void testQueriesWithNoDictStringColumn()
 
   public void testQueries(ColumnDataType columnDataType, File indexDir)
       throws IOException {
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
     Map<String, String> queryOptions = new HashMap<>();
     queryOptions.put("enableNullHandling", "true");
     DataType dataType = columnDataType.toDataType();
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ArgMinMaxTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ArgMinMaxTest.java
new file mode 100644
index 00000000000..94a63b6b24c
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ArgMinMaxTest.java
@@ -0,0 +1,644 @@
+/**
+ * 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.pinot.queries;
+
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.response.BrokerResponse;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.broker.ResultTable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.query.utils.rewriter.ResultRewriterFactory;
+import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.ImmutableSegment;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.apache.pinot.sql.parsers.rewriter.QueryRewriterFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+
+/**
+ * Queries test for argMin/argMax functions.
+ */
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ArgMinMaxTest extends BaseQueriesTest {
+  private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "ArgMinMaxTest");
+  private static final String RAW_TABLE_NAME = "testTable";
+  private static final String SEGMENT_NAME = "testSegment";
+
+  private static final int NUM_RECORDS = 2000;
+
+  private static final String INT_COLUMN = "intColumn";
+  private static final String LONG_COLUMN = "longColumn";
+  private static final String FLOAT_COLUMN = "floatColumn";
+  private static final String DOUBLE_COLUMN = "doubleColumn";
+  private static final String MV_DOUBLE_COLUMN = "mvDoubleColumn";
+  private static final String MV_INT_COLUMN = "mvIntColumn";
+  private static final String MV_BYTES_COLUMN = "mvBytesColumn";
+  private static final String MV_STRING_COLUMN = "mvStringColumn";
+  private static final String STRING_COLUMN = "stringColumn";
+  private static final String GROUP_BY_INT_COLUMN = "groupByIntColumn";
+  private static final String GROUP_BY_MV_INT_COLUMN = "groupByMVIntColumn";
+  private static final String GROUP_BY_INT_COLUMN2 = "groupByIntColumn2";
+  private static final String BIG_DECIMAL_COLUMN = "bigDecimalColumn";
+  private static final String TIMESTAMP_COLUMN = "timestampColumn";
+  private static final String BOOLEAN_COLUMN = "booleanColumn";
+  private static final String JSON_COLUMN = "jsonColumn";
+
+  private static final Schema SCHEMA = new Schema.SchemaBuilder().addSingleValueDimension(INT_COLUMN, DataType.INT)
+      .addSingleValueDimension(LONG_COLUMN, DataType.LONG).addSingleValueDimension(FLOAT_COLUMN, DataType.FLOAT)
+      .addSingleValueDimension(DOUBLE_COLUMN, DataType.DOUBLE).addMultiValueDimension(MV_INT_COLUMN, DataType.INT)
+      .addMultiValueDimension(MV_BYTES_COLUMN, DataType.BYTES)
+      .addMultiValueDimension(MV_STRING_COLUMN, DataType.STRING)
+      .addSingleValueDimension(STRING_COLUMN, DataType.STRING)
+      .addSingleValueDimension(GROUP_BY_INT_COLUMN, DataType.INT)
+      .addMultiValueDimension(GROUP_BY_MV_INT_COLUMN, DataType.INT)
+      .addSingleValueDimension(GROUP_BY_INT_COLUMN2, DataType.INT)
+      .addSingleValueDimension(BIG_DECIMAL_COLUMN, DataType.BIG_DECIMAL)
+      .addSingleValueDimension(TIMESTAMP_COLUMN, DataType.TIMESTAMP)
+      .addSingleValueDimension(BOOLEAN_COLUMN, DataType.BOOLEAN)
+      .addMultiValueDimension(MV_DOUBLE_COLUMN, DataType.DOUBLE)
+      .addSingleValueDimension(JSON_COLUMN, DataType.JSON)
+      .build();
+  private static final TableConfig TABLE_CONFIG =
+      new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+
+  private IndexSegment _indexSegment;
+  private List<IndexSegment> _indexSegments;
+
+  @Override
+  protected String getFilter() {
+    return " WHERE intColumn >=  500";
+  }
+
+  @Override
+  protected IndexSegment getIndexSegment() {
+    return _indexSegment;
+  }
+
+  @Override
+  protected List<IndexSegment> getIndexSegments() {
+    return _indexSegments;
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    FileUtils.deleteDirectory(INDEX_DIR);
+
+    List<GenericRow> records = new ArrayList<>(NUM_RECORDS);
+    String[] stringSVVals = new String[]{"a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a11", "a22"};
+    int j = 1;
+    for (int i = 0; i < NUM_RECORDS; i++) {
+      GenericRow record = new GenericRow();
+      record.putValue(INT_COLUMN, i);
+      record.putValue(LONG_COLUMN, (long) i - NUM_RECORDS / 2);
+      record.putValue(FLOAT_COLUMN, (float) i * 0.5);
+      record.putValue(DOUBLE_COLUMN, (double) i);
+      record.putValue(MV_INT_COLUMN, Arrays.asList(i, i + 1, i + 2));
+      record.putValue(MV_BYTES_COLUMN, Arrays.asList(String.valueOf(i).getBytes(), String.valueOf(i + 1).getBytes(),
+          String.valueOf(i + 2).getBytes()));
+      record.putValue(MV_STRING_COLUMN, Arrays.asList("a" + i, "a" + i + 1, "a" + i + 2));
+      if (i < 20) {
+        record.putValue(STRING_COLUMN, stringSVVals[i % stringSVVals.length]);
+      } else {
+        record.putValue(STRING_COLUMN, "a33");
+      }
+      record.putValue(GROUP_BY_INT_COLUMN, i % 5);
+      record.putValue(GROUP_BY_MV_INT_COLUMN, Arrays.asList(i % 10, (i + 1) % 10));
+      if (i == j) {
+        j *= 2;
+      }
+      record.putValue(GROUP_BY_INT_COLUMN2, j);
+      record.putValue(BIG_DECIMAL_COLUMN, new BigDecimal(-i * i + 1200 * i));
+      record.putValue(TIMESTAMP_COLUMN, 1683138373879L - i);
+      record.putValue(BOOLEAN_COLUMN, i % 2);
+      record.putValue(MV_DOUBLE_COLUMN, Arrays.asList((double) i, (double) i * i, (double) i * i * i));
+      record.putValue(JSON_COLUMN, "{\"name\":\"John\", \"age\":" + i + ", \"car\":null}");
+      records.add(record);
+    }
+
+    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(TABLE_CONFIG, SCHEMA);
+    segmentGeneratorConfig.setTableName(RAW_TABLE_NAME);
+    segmentGeneratorConfig.setSegmentName(SEGMENT_NAME);
+    segmentGeneratorConfig.setOutDir(INDEX_DIR.getPath());
+
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    driver.init(segmentGeneratorConfig, new GenericRowRecordReader(records));
+    driver.build();
+
+    ImmutableSegment immutableSegment = ImmutableSegmentLoader.load(new File(INDEX_DIR, SEGMENT_NAME), ReadMode.mmap);
+    _indexSegment = immutableSegment;
+    _indexSegments = Arrays.asList(immutableSegment, immutableSegment);
+
+    QueryRewriterFactory.init(String.join(",", QueryRewriterFactory.DEFAULT_QUERY_REWRITERS_CLASS_NAMES)
+        + ",org.apache.pinot.sql.parsers.rewriter.ArgMinMaxRewriter");
+    ResultRewriterFactory
+        .init("org.apache.pinot.core.query.utils.rewriter.ParentAggregationResultRewriter");
+  }
+
+  @Test
+  public void invalidParamTest() {
+    String query = "SELECT arg_max(intColumn) FROM testTable";
+    try {
+      getBrokerResponse(query);
+      fail("Should have failed for invalid params");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Invalid number of arguments for argmax"));
+    }
+
+    query = "SELECT arg_max() FROM testTable";
+    try {
+      getBrokerResponse(query);
+      fail("Should have failed for invalid params");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Invalid number of arguments for argmax"));
+    }
+
+    query = "SELECT arg_max(mvDoubleColumn, mvDoubleColumn) FROM testTable";
+    BrokerResponse brokerResponse = getBrokerResponse(query);
+    Assert.assertTrue(brokerResponse.getProcessingExceptions().get(0).getMessage().contains(
+        "java.lang.IllegalStateException: ArgMinMax only supports single-valued measuring columns"
+    ));
+
+    query = "SELECT arg_max(jsonColumn, mvDoubleColumn) FROM testTable";
+    brokerResponse = getBrokerResponse(query);
+    Assert.assertTrue(brokerResponse.getProcessingExceptions().get(0).getMessage().contains(
+        "Cannot compute ArgMinMax measuring on non-comparable type: JSON"
+    ));
+  }
+
+  @Test
+  public void testAggregationInterSegment() {
+    // Simple inter segment aggregation test
+    String query = "SELECT arg_max(intColumn, longColumn) FROM testTable";
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+
+    assertEquals(rows.get(0)[0], 999L);
+    assertEquals(rows.get(1)[0], 999L);
+    assertEquals(rows.size(), 2);
+
+    // Inter segment data type test
+    query = "SELECT arg_max(intColumn, longColumn), arg_max(intColumn, floatColumn), "
+        + "arg_max(intColumn, doubleColumn), arg_min(intColumn, mvIntColumn), "
+        + "arg_min(intColumn, mvStringColumn), arg_min(intColumn, intColumn), "
+        + "arg_max(bigDecimalColumn, bigDecimalColumn), arg_max(bigDecimalColumn, doubleColumn),"
+        + "arg_min(timestampColumn, timestampColumn), arg_max(bigDecimalColumn, mvDoubleColumn),"
+        + "arg_max(bigDecimalColumn, jsonColumn)"
+        + " FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(resultTable.getDataSchema().getColumnName(0), "argmax(intColumn,longColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(1), "argmax(intColumn,floatColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(2), "argmax(intColumn,doubleColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(3), "argmin(intColumn,mvIntColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(4), "argmin(intColumn,mvStringColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(5), "argmin(intColumn,intColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(6), "argmax(bigDecimalColumn,bigDecimalColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(7), "argmax(bigDecimalColumn,doubleColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(8), "argmin(timestampColumn,timestampColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(9), "argmax(bigDecimalColumn,mvDoubleColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(10), "argmax(bigDecimalColumn,jsonColumn)");
+
+    assertEquals(rows.size(), 2);
+    assertEquals(rows.get(0)[0], 999L);
+    assertEquals(rows.get(1)[0], 999L);
+    assertEquals(rows.get(0)[1], 999.5F);
+    assertEquals(rows.get(1)[1], 999.5F);
+    assertEquals(rows.get(0)[2], 1999D);
+    assertEquals(rows.get(1)[2], 1999D);
+    assertEquals(rows.get(0)[3], new Integer[]{0, 1, 2});
+    assertEquals(rows.get(1)[3], new Integer[]{0, 1, 2});
+    assertEquals(rows.get(0)[4], new String[]{"a0", "a01", "a02"});
+    assertEquals(rows.get(1)[4], new String[]{"a0", "a01", "a02"});
+    assertEquals(rows.get(0)[5], 0);
+    assertEquals(rows.get(1)[5], 0);
+    assertEquals(rows.get(0)[6], "360000");
+    assertEquals(rows.get(1)[6], "360000");
+    assertEquals(rows.get(0)[7], 600D);
+    assertEquals(rows.get(1)[7], 600D);
+    assertEquals(rows.get(0)[8], 1683138373879L - 1999L);
+    assertEquals(rows.get(1)[8], 1683138373879L - 1999L);
+    assertEquals(rows.get(0)[9], new Double[]{600D, 600D * 600D, 600D * 600D * 600D});
+    assertEquals(rows.get(1)[9], new Double[]{600D, 600D * 600D, 600D * 600D * 600D});
+    assertEquals(rows.get(0)[10], "{\"name\":\"John\",\"age\":600,\"car\":null}");
+    assertEquals(rows.get(1)[10], "{\"name\":\"John\",\"age\":600,\"car\":null}");
+
+    // Inter segment data type test for boolean column
+    query = "SELECT arg_max(booleanColumn, booleanColumn) FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 2000);
+    for (int i = 0; i < 2000; i++) {
+      assertEquals(rows.get(i)[0], 1);
+    }
+
+    // Inter segment mix aggregation function with different result length
+    // Inter segment string column comparison test, with dedupe
+    query = "SELECT sum(intColumn), argmin(stringColumn, doubleColumn), argmin(stringColumn, stringColumn), "
+        + "argmin(stringColumn, doubleColumn, doubleColumn) FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 4);
+
+    assertEquals(rows.get(0)[0], 7996000D);
+    assertEquals(rows.get(0)[1], 8D);
+    assertEquals(rows.get(0)[2], "a11");
+    assertEquals(rows.get(0)[3], 8D);
+
+    assertEquals(rows.get(1)[0], 7996000D);
+    assertEquals(rows.get(1)[1], 18D);
+    assertEquals(rows.get(1)[2], "a11");
+    assertEquals(rows.get(1)[3], 8D);
+
+    assertEquals(rows.get(2)[0], 7996000D);
+    assertEquals(rows.get(2)[1], 8D);
+    assertEquals(rows.get(2)[2], "a11");
+    assertNull(rows.get(2)[3]);
+
+    assertEquals(rows.get(3)[0], 7996000D);
+    assertEquals(rows.get(3)[1], 18D);
+    assertEquals(rows.get(3)[2], "a11");
+    assertNull(rows.get(3)[3]);
+
+    // Test transformation function inside argmax/argmin, for both projection and measuring
+    // the max of 3000x-x^2 is 2250000, which is the max of 3000x-x^2
+    query = "SELECT sum(intColumn), argmax(3000 * doubleColumn - intColumn * intColumn, doubleColumn),"
+        + "argmax(3000 * doubleColumn - intColumn * intColumn, 3000 * doubleColumn - intColumn * intColumn),"
+        + "argmax(3000 * doubleColumn - intColumn * intColumn, doubleColumn), "
+        + "argmin(replace(stringColumn, \'a\', \'bb\'), replace(stringColumn, \'a\', \'bb\'))"
+        + "FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 4);
+
+    assertEquals(rows.get(0)[0], 7996000D);
+    assertEquals(rows.get(0)[1], 1500D);
+    assertEquals(rows.get(0)[2], 2250000D);
+    assertEquals(rows.get(0)[3], "bb11");
+    assertEquals(rows.get(1)[0], 7996000D);
+    assertEquals(rows.get(1)[1], 1500D);
+    assertEquals(rows.get(1)[2], 2250000D);
+    assertEquals(rows.get(1)[3], "bb11");
+    assertEquals(rows.get(2)[0], 7996000D);
+    assertNull(rows.get(2)[1]);
+    assertEquals(rows.get(2)[3], "bb11");
+    assertEquals(rows.get(3)[0], 7996000D);
+    assertNull(rows.get(3)[1]);
+    assertEquals(rows.get(3)[3], "bb11");
+
+    // Inter segment mix aggregation function with CASE statement
+    query = "SELECT argmin(CASE WHEN stringColumn = 'a33' THEN 'b' WHEN stringColumn = 'a22' THEN 'a' ELSE 'c' END"
+        + ", stringColumn), argmin(CASE WHEN stringColumn = 'a33' THEN 'b' WHEN stringColumn = 'a22' THEN 'a' "
+        + "ELSE 'c' END, CASE WHEN stringColumn = 'a33' THEN 'b' WHEN stringColumn = 'a22' THEN 'a' ELSE 'c' END) "
+        + "FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 4);
+
+    for (int i = 0; i < 4; i++) {
+      assertEquals(rows.get(i)[0], "a22");
+      assertEquals(rows.get(i)[1], "a");
+    }
+
+    // TODO: The following query throws an exception,
+    //       requires fix for multi-value bytes column serialization in DataBlock
+    query = "SELECT arg_min(intColumn, mvBytesColumn) FROM testTable";
+
+    try {
+      brokerResponse = getBrokerResponse(query);
+      fail("remove this test case, now mvBytesColumn works correctly in serialization");
+    } catch (Exception e) {
+      assertTrue(e.getMessage()
+          .contains("java.lang.IllegalArgumentException: Unsupported type of value: byte[][]"));
+    }
+  }
+
+  @Test
+  public void testAggregationDedupe() {
+    // Inter segment dedupe test1 without dedupe
+    String query = "SELECT  "
+        + "argmin(booleanColumn, bigDecimalColumn, intColumn) FROM testTable WHERE doubleColumn <= 1200";
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 4);
+
+    assertEquals(rows.get(0)[0], 0);
+    assertEquals(rows.get(1)[0], 1200);
+    assertEquals(rows.get(2)[0], 0);
+    assertEquals(rows.get(3)[0], 1200);
+
+    // test1, with dedupe
+    query = "SELECT  "
+        + "argmin(booleanColumn, bigDecimalColumn, doubleColumn, intColumn) FROM testTable WHERE doubleColumn <= 1200";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 2);
+
+    assertEquals(rows.get(0)[0], 0);
+    assertEquals(rows.get(1)[0], 0);
+
+    // test2, with dedupe
+    query = "SELECT  "
+        + "argmin(booleanColumn, bigDecimalColumn, 0-doubleColumn, intColumn) FROM testTable WHERE doubleColumn <= "
+        + "1200";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 2);
+
+    assertEquals(rows.get(0)[0], 1200);
+    assertEquals(rows.get(1)[0], 1200);
+  }
+
+  @Test
+  public void testEmptyAggregation() {
+    // Inter segment mix aggregation with no documents after filtering
+    String query =
+        "SELECT arg_max(intColumn, longColumn), argmin(CASE WHEN stringColumn = 'a33' THEN 'b' "
+            + "WHEN stringColumn = 'a22' THEN 'a' ELSE 'c' END"
+            + ", stringColumn) FROM testTable where intColumn > 10000";
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertEquals(rows.size(), 1);
+    assertNull(rows.get(0)[0]);
+    assertNull(rows.get(0)[1]);
+    assertEquals(resultTable.getDataSchema().getColumnName(0), "argmax(intColumn,longColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(1),
+        "argmin(case(equals(stringColumn,'a33'),equals(stringColumn,'a22'),'b','a','c'),stringColumn)");
+    Assert.assertEquals(resultTable.getDataSchema().getColumnDataType(0), DataSchema.ColumnDataType.STRING);
+    Assert.assertEquals(resultTable.getDataSchema().getColumnDataType(1), DataSchema.ColumnDataType.STRING);
+  }
+
+  @Test
+  public void testGroupByInterSegment() {
+    // Simple inter segment group by
+    String query = "SELECT groupByIntColumn, arg_max(intColumn, longColumn) FROM testTable GROUP BY groupByIntColumn";
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 10);
+
+    for (int i = 0; i < 10; i++) {
+      int group = ((i + 2) / 2) % 5;
+      assertEquals(rows.get(i)[0], group);
+      assertEquals(rows.get(i)[1], 995L + group);
+    }
+
+    // Simple inter segment group by with limit
+    query =
+        "SELECT groupByIntColumn2, arg_max(longColumn, doubleColumn) FROM testTable GROUP BY groupByIntColumn2 ORDER "
+            + "BY groupByIntColumn2 LIMIT 15";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 24);
+
+    for (int i = 0; i < 22; i++) {
+      double group = Math.pow(2, i / 2);
+      assertEquals(rows.get(i)[0], (int) group);
+      assertEquals(rows.get(i)[1], group - 1);
+    }
+
+    assertEquals(rows.get(22)[0], 2048);
+    assertEquals(rows.get(22)[1], 1999D);
+
+    assertEquals(rows.get(23)[0], 2048);
+    assertEquals(rows.get(23)[1], 1999D);
+
+    // MV inter segment group by
+    query = "SELECT groupByMVIntColumn, arg_min(intColumn, doubleColumn) FROM testTable GROUP BY groupByMVIntColumn";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+
+    assertEquals(rows.size(), 20);
+
+    for (int i = 0; i < 18; i++) {
+      int group = i / 2 + 1;
+      assertEquals(rows.get(i)[0], group);
+      assertEquals(rows.get(i)[1], (double) group - 1);
+    }
+
+    assertEquals(rows.get(18)[0], 0);
+    assertEquals(rows.get(18)[1], 0D);
+
+    assertEquals(rows.get(19)[0], 0);
+    assertEquals(rows.get(19)[1], 0D);
+
+    // MV inter segment group by with projection on MV column
+    query = "SELECT groupByMVIntColumn, arg_min(intColumn, mvIntColumn), "
+        + "arg_max(intColumn, mvStringColumn) FROM testTable GROUP BY groupByMVIntColumn";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+    assertEquals(rows.size(), 20);
+
+    for (int i = 0; i < 18; i++) {
+      int group = i / 2 + 1;
+      assertEquals(rows.get(i)[0], group);
+      assertEquals(rows.get(i)[1], new Object[]{group - 1, group, group + 1});
+      assertEquals(rows.get(i)[2], new Object[]{"a199" + group, "a199" + group + 1, "a199" + group + 2});
+    }
+
+    assertEquals(rows.get(18)[0], 0);
+    assertEquals(rows.get(18)[1], new Object[]{0, 1, 2});
+    assertEquals(rows.get(18)[2], new Object[]{"a1999", "a19991", "a19992"});
+  }
+
+  @Test
+  public void testGroupByInterSegmentWithValueIn() {
+    // MV VALUE_IN segment group by
+    String query =
+        "SELECT stringColumn, arg_min(intColumn, VALUE_IN(mvIntColumn,16,17,18,19,20,21,22,23,24,25,26,27)), "
+            + "arg_max(intColumn, VALUE_IN(mvIntColumn,16,17,18,19,20,21,22,23,24,25,26,27)) "
+            + "FROM testTable WHERE mvIntColumn in (16,17,18,19,20,21,22,23,24,25,26,27) GROUP BY stringColumn";
+
+    BrokerResponse brokerResponse = getBrokerResponse(query);
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertEquals(rows.size(), 14);
+    assertEquals(rows.get(4)[0], "a33");
+    assertEquals(rows.get(4)[1], new Object[]{20, 21, 22});
+    assertEquals(rows.get(4)[2], new Object[]{27});
+
+    //  TODO: The following query works because whenever we find an empty array in the result, we use null
+    //        (see ArgMinMaxProjectionValSetWrapper). Ideally, we should be able to serialize empty array.
+    //        requires fix for empty int arrays ser/de in DataBlock
+    query =
+        "SELECT stringColumn, arg_min(intColumn, VALUE_IN(mvIntColumn,16,17,18,19,20,21,22,23,24,25,26,27)), "
+            + "arg_max(intColumn, VALUE_IN(mvIntColumn,16,17,18,19,20,21,22,23,24,25,26,27)) "
+            + "FROM testTable GROUP BY stringColumn";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+    assertEquals(rows.size(), 20);
+    assertEquals(rows.get(8)[0], "a33");
+    assertEquals(rows.get(8)[1], new Object[]{20, 21, 22});
+    assertEquals(rows.get(8)[2], new Object[]{});
+  }
+
+  @Test
+  public void explainPlanTest() {
+    String query = "EXPLAIN PLAN FOR SELECT groupByMVIntColumn, arg_min(intColumn, mvIntColumn), "
+        + "arg_min(intColumn, doubleColumn, mvStringColumn) FROM testTable GROUP BY groupByMVIntColumn";
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    Object groupByExplainPlan = brokerResponse.getResultTable().getRows().get(3)[0];
+    Assert.assertTrue(groupByExplainPlan
+        .toString().contains("child_argMin('0', mvIntColumn, intColumn, mvIntColumn)"));
+    Assert.assertTrue(groupByExplainPlan
+        .toString()
+        .contains("child_argMin('1', mvStringColumn, intColumn, doubleColumn, mvStringColumn)"));
+    Assert.assertTrue(groupByExplainPlan
+        .toString().contains("parent_argMin('0', '1', intColumn, mvIntColumn)"));
+    Assert.assertTrue(groupByExplainPlan
+        .toString().contains("parent_argMin('1', '2', intColumn, doubleColumn, mvStringColumn)"));
+  }
+
+  @Test
+  public void testEmptyGroupByInterSegment() {
+    // Simple inter segment group by with no documents after filtering
+    String query = "SELECT groupByIntColumn, arg_max(intColumn, longColumn) FROM testTable "
+        + " where intColumn > 10000 GROUP BY groupByIntColumn";
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+
+    assertEquals(resultTable.getDataSchema().getColumnName(0), "groupByIntColumn");
+    assertEquals(resultTable.getDataSchema().getColumnName(1), "argmax(intColumn,longColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnDataType(0), DataSchema.ColumnDataType.INT);
+    assertEquals(resultTable.getDataSchema().getColumnDataType(1), DataSchema.ColumnDataType.STRING);
+    assertEquals(rows.size(), 0);
+
+    // Simple inter segment group by with no documents after filtering
+    query = "SELECT groupByIntColumn, arg_max(intColumn, longColumn), sum(longColumn), arg_min(intColumn, longColumn)"
+        + " FROM testTable "
+        + " where intColumn > 10000 GROUP BY groupByIntColumn";
+
+    brokerResponse = getBrokerResponse(query);
+    resultTable = brokerResponse.getResultTable();
+    rows = resultTable.getRows();
+    assertEquals(resultTable.getDataSchema().getColumnName(0), "groupByIntColumn");
+    assertEquals(resultTable.getDataSchema().getColumnName(1), "argmax(intColumn,longColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(2), "sum(longColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnName(3), "argmin(intColumn,longColumn)");
+    assertEquals(resultTable.getDataSchema().getColumnDataType(0), DataSchema.ColumnDataType.INT);
+    assertEquals(resultTable.getDataSchema().getColumnDataType(1), DataSchema.ColumnDataType.STRING);
+    assertEquals(resultTable.getDataSchema().getColumnDataType(0), DataSchema.ColumnDataType.INT);
+    assertEquals(resultTable.getDataSchema().getColumnDataType(1), DataSchema.ColumnDataType.STRING);
+    assertEquals(rows.size(), 0);
+  }
+
+  @Test
+  public void testAlias() {
+    // Using argmin/argmax with alias will fail, since the alias will not be resolved by the rewriter
+    try {
+      String query = "SELECT groupByIntColumn, arg_max(intColumn, longColumn) AS"
+          + " argmax1 FROM testTable GROUP BY groupByIntColumn";
+      BrokerResponseNative brokerResponse = getBrokerResponse(query);
+      ResultTable resultTable = brokerResponse.getResultTable();
+      List<Object[]> rows = resultTable.getRows();
+      fail();
+    } catch (Exception e) {
+      assertTrue(e.getMessage().contains("Aggregation function: argmax(intColumn,longColumn) "
+          + "is only supported in selection without alias."));
+    }
+  }
+
+  @Test
+  public void testOrderBy() {
+    // Using argmin/argmax with order by will fail, since the ordering on a multi-row projection is not well-defined
+    try {
+      String query = "SELECT groupByIntColumn, arg_max(intColumn, longColumn) FROM testTable "
+          + "GROUP BY groupByIntColumn ORDER BY arg_max(intColumn, longColumn)";
+      BrokerResponseNative brokerResponse = getBrokerResponse(query);
+      ResultTable resultTable = brokerResponse.getResultTable();
+      List<Object[]> rows = resultTable.getRows();
+      fail();
+    } catch (Exception e) {
+      assertTrue(e.getMessage().contains("Aggregation function: argmax(intColumn,longColumn) "
+          + "is only supported in selection without alias."));
+    }
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws IOException {
+    _indexSegment.destroy();
+    FileUtils.deleteDirectory(INDEX_DIR);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BaseFunnelCountQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BaseFunnelCountQueriesTest.java
new file mode 100644
index 00000000000..ef5c7d596f8
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/BaseFunnelCountQueriesTest.java
@@ -0,0 +1,252 @@
+/**
+ * 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.pinot.queries;
+
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.utils.HashUtil;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
+import org.apache.pinot.core.operator.query.AggregationOperator;
+import org.apache.pinot.core.operator.query.GroupByOperator;
+import org.apache.pinot.core.query.aggregation.groupby.AggregationGroupByResult;
+import org.apache.pinot.core.query.aggregation.groupby.GroupKeyGenerator;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+
+/**
+ * Base queries test for FUNNEL_COUNT queries.
+ * Each strategy gets its own test.
+ */
+@SuppressWarnings("rawtypes")
+abstract public class BaseFunnelCountQueriesTest extends BaseQueriesTest {
+  protected static final File INDEX_DIR =
+      new File(FileUtils.getTempDirectory(), "FunnelCountQueriesTest");
+  protected static final String RAW_TABLE_NAME = "testTable";
+  protected static final String SEGMENT_NAME = "testSegment";
+  protected static final Random RANDOM = new Random();
+
+  protected static final int NUM_RECORDS = 2000;
+  protected static final int MAX_VALUE = 1000;
+  protected static final int NUM_GROUPS = 100;
+  protected static final int FILTER_LIMIT = 50;
+  protected static final String ID_COLUMN = "idColumn";
+  protected static final String STEP_COLUMN = "stepColumn";
+  protected static final String[] STEPS = {"A", "B"};
+  protected static final Schema SCHEMA = new Schema.SchemaBuilder()
+      .addSingleValueDimension(ID_COLUMN, DataType.INT)
+      .addSingleValueDimension(STEP_COLUMN, DataType.STRING)
+      .build();
+  protected static final TableConfigBuilder TABLE_CONFIG_BUILDER =
+      new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME);
+
+  private Set<Integer>[] _values = new Set[2];
+  private List<Integer> _all = new ArrayList<>();
+  private IndexSegment _indexSegment;
+  private List<IndexSegment> _indexSegments;
+
+  protected abstract int getExpectedNumEntriesScannedInFilter();
+  protected abstract TableConfig getTableConfig();
+  protected abstract IndexSegment buildSegment(List<GenericRow> records) throws Exception;
+
+  @Override
+  protected String getFilter() {
+    return String.format(" WHERE idColumn >= %s", FILTER_LIMIT);
+  }
+
+  @Override
+  protected IndexSegment getIndexSegment() {
+    return _indexSegment;
+  }
+
+  @Override
+  protected List<IndexSegment> getIndexSegments() {
+    return _indexSegments;
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    FileUtils.deleteDirectory(INDEX_DIR);
+
+    List<GenericRow> records = genereateRows();
+    _indexSegment = buildSegment(records);
+    _indexSegments = Arrays.asList(_indexSegment, _indexSegment);
+  }
+
+  private List<GenericRow> genereateRows() {
+    List<GenericRow> records = new ArrayList<>(NUM_RECORDS);
+    int hashMapCapacity = HashUtil.getHashMapCapacity(MAX_VALUE);
+    _values[0] = new HashSet<>(hashMapCapacity);
+    _values[1] = new HashSet<>(hashMapCapacity);
+    for (int i = 0; i < NUM_RECORDS; i++) {
+      int value = RANDOM.nextInt(MAX_VALUE);
+      GenericRow record = new GenericRow();
+      record.putValue(ID_COLUMN, value);
+      record.putValue(STEP_COLUMN, STEPS[i % 2]);
+      records.add(record);
+      _all.add(Integer.hashCode(value));
+      _values[i % 2].add(Integer.hashCode(value));
+    }
+    return records;
+  }
+
+  @Test
+  public void testAggregationOnly() {
+    String query = String.format("SELECT "
+        + "FUNNEL_COUNT("
+        + " STEPS(stepColumn = 'A', stepColumn = 'B'),"
+        + " CORRELATE_BY(idColumn)"
+        + ") FROM testTable");
+
+    // Inner segment
+    Predicate<Integer> filter = id -> id >= FILTER_LIMIT;
+    long expectedFilteredNumDocs = _all.stream().filter(filter).count();
+    Set<Integer> filteredA = _values[0].stream().filter(filter).collect(Collectors.toSet());
+    Set<Integer> filteredB = _values[1].stream().filter(filter).collect(Collectors.toSet());
+    Set<Integer> intersection = new HashSet<>(filteredA);
+    intersection.retainAll(filteredB);
+    long[] expectedResult = { filteredA.size(), intersection.size() };
+
+    Operator operator = getOperatorWithFilter(query);
+    assertTrue(operator instanceof AggregationOperator);
+    AggregationResultsBlock resultsBlock = ((AggregationOperator) operator).nextBlock();
+    QueriesTestUtils.testInnerSegmentExecutionStatistics(operator.getExecutionStatistics(),
+        expectedFilteredNumDocs, getExpectedNumEntriesScannedInFilter(), 2 * expectedFilteredNumDocs, NUM_RECORDS);
+    List<Object> aggregationResult = resultsBlock.getResults();
+    assertNotNull(aggregationResult);
+    assertEquals(aggregationResult.size(), 1);
+    for (int i = 0; i < 2; i++) {
+      assertEquals(((LongArrayList) aggregationResult.get(0)).getLong(i), expectedResult[i]);
+    }
+
+    // Inter segments (expect 4 * inner segment result)
+    for (int i = 0; i < 2; i++) {
+      expectedResult[i] = 4 * expectedResult[i];
+    }
+    Object[] expectedResults = { expectedResult };
+
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponseWithFilter(query),
+        4 * expectedFilteredNumDocs, 4 * getExpectedNumEntriesScannedInFilter(), 4 * 2 * expectedFilteredNumDocs,
+        4 * NUM_RECORDS, expectedResults);
+  }
+
+  @Test
+  public void testAggregationGroupBy() {
+    String query = String.format("SELECT "
+        + "MOD(idColumn, %s), "
+        + "FUNNEL_COUNT("
+        + " STEPS(stepColumn = 'A', stepColumn = 'B'),"
+        + " CORRELATE_BY(idColumn)"
+        + ") FROM testTable "
+        + "WHERE idColumn >= %s "
+        + "GROUP BY 1 ORDER BY 1 LIMIT %s", NUM_GROUPS, FILTER_LIMIT, NUM_GROUPS);
+
+    // Inner segment
+    Set<Integer>[] filteredA = new Set[NUM_GROUPS];
+    Set<Integer>[] filteredB = new Set[NUM_GROUPS];
+    Set<Integer>[] intersection = new Set[NUM_GROUPS];
+    long[][] expectedResult = new long[NUM_GROUPS][];
+
+    long expectedFilteredNumDocs = _all.stream().filter(id -> id >= FILTER_LIMIT).count();
+
+    int expectedNumGroups = 0;
+    for (int i = 0; i < NUM_GROUPS; i++) {
+      final int group = i;
+      Predicate<Integer> filter = id -> id >= FILTER_LIMIT && id % NUM_GROUPS == group;
+      filteredA[group] = _values[0].stream().filter(filter).collect(Collectors.toSet());
+      filteredB[group] = _values[1].stream().filter(filter).collect(Collectors.toSet());
+      intersection[group] = new HashSet<>(filteredA[group]);
+      intersection[group].retainAll(filteredB[group]);
+      if (!filteredA[i].isEmpty() || !filteredB[i].isEmpty()) {
+        expectedNumGroups++;
+        expectedResult[group] = new long[] { filteredA[group].size(), intersection[group].size() };
+      }
+    }
+
+    // Inner segment
+    GroupByOperator groupByOperator = getOperator(query);
+    GroupByResultsBlock resultsBlock = groupByOperator.nextBlock();
+    QueriesTestUtils.testInnerSegmentExecutionStatistics(groupByOperator.getExecutionStatistics(),
+        expectedFilteredNumDocs, getExpectedNumEntriesScannedInFilter(), 2 * expectedFilteredNumDocs, NUM_RECORDS);
+
+    AggregationGroupByResult aggregationGroupByResult = resultsBlock.getAggregationGroupByResult();
+    assertNotNull(aggregationGroupByResult);
+    int numGroups = 0;
+    Iterator<GroupKeyGenerator.GroupKey> groupKeyIterator = aggregationGroupByResult.getGroupKeyIterator();
+    while (groupKeyIterator.hasNext()) {
+      numGroups++;
+      GroupKeyGenerator.GroupKey groupKey = groupKeyIterator.next();
+      int key = ((Double) groupKey._keys[0]).intValue();
+      assertEquals(aggregationGroupByResult.getResultForGroupId(0, groupKey._groupId),
+          new LongArrayList(expectedResult[key]));
+    }
+    assertEquals(numGroups, expectedNumGroups);
+
+    // Inter segments (expect 4 * inner segment result)
+    List<Object[]> expectedRows = new ArrayList<>();
+    for (int i = 0; i < NUM_GROUPS; i++) {
+      if (expectedResult[i] == null) {
+        continue;
+      }
+      for (int step = 0; step < 2; step++) {
+          expectedResult[i][step] = 4 * expectedResult[i][step];
+      }
+      Object[] expectedRow = { Double.valueOf(i), expectedResult[i] };
+      expectedRows.add(expectedRow);
+    }
+
+    // Inter segments (expect 4 * inner segment result)
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(query),
+        4 * expectedFilteredNumDocs, 4 * getExpectedNumEntriesScannedInFilter(), 4 * 2 * expectedFilteredNumDocs,
+        4 * NUM_RECORDS, expectedRows);
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws IOException {
+    _indexSegment.destroy();
+    FileUtils.deleteDirectory(INDEX_DIR);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueQueriesTest.java
index 3f12baefb35..671894eaa0d 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueQueriesTest.java
@@ -32,6 +32,8 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
@@ -117,8 +119,8 @@ public void buildSegment()
     segmentGeneratorConfig.setInputFilePath(filePath);
     segmentGeneratorConfig.setTableName("testTable");
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(Arrays.asList("column3", "column7", "column8", "column9"));
-
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED,
+        "column3", "column7", "column8", "column9");
     // Build the index segment.
     SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
     driver.init(segmentGeneratorConfig);
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueRawQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueRawQueriesTest.java
index 4e75b7a2c46..3cf4270cb8b 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueRawQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/BaseMultiValueRawQueriesTest.java
@@ -32,6 +32,8 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
@@ -117,7 +119,8 @@ public void buildSegment()
     segmentGeneratorConfig.setInputFilePath(filePath);
     segmentGeneratorConfig.setTableName("testTable");
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(Arrays.asList("column3", "column8", "column9"));
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED,
+        "column3", "column8", "column9");
     segmentGeneratorConfig.setRawIndexCreationColumns(Arrays.asList("column5", "column6", "column7"));
 
     // Build the index segment.
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BaseSingleValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BaseSingleValueQueriesTest.java
index 24983bfbce8..990f0f5b4dd 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/BaseSingleValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/BaseSingleValueQueriesTest.java
@@ -32,6 +32,8 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
@@ -119,7 +121,7 @@ public void buildSegment()
     segmentGeneratorConfig.setInputFilePath(filePath);
     segmentGeneratorConfig.setTableName("testTable");
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED,
         Arrays.asList("column6", "column7", "column11", "column17", "column18"));
 
     // Build the index segment.
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BigDecimalQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BigDecimalQueriesTest.java
index d44a266b02a..a712208ff6d 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/BigDecimalQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/BigDecimalQueriesTest.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Random;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -160,7 +159,6 @@ public void testQueriesWithNoDictColumn()
   }
 
   public void testQueries() {
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
     Map<String, String> queryOptions = new HashMap<>();
     queryOptions.put("enableNullHandling", "true");
     {
@@ -181,7 +179,8 @@ public void testQueries() {
       }
     }
     {
-      String query = String.format("SELECT * FROM testTable ORDER BY %s DESC LIMIT 4000", BIG_DECIMAL_COLUMN);
+      String query =
+          String.format("SELECT * FROM testTable ORDER BY %s DESC NULLS LAST LIMIT 4000", BIG_DECIMAL_COLUMN);
       // getBrokerResponseForSqlQuery(query) runs SQL query on multiple index segments. The result should be equivalent
       // to querying 4 identical index segments.
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
@@ -191,9 +190,8 @@ public void testQueries() {
           new DataSchema(new String[]{BIG_DECIMAL_COLUMN}, new ColumnDataType[]{ColumnDataType.BIG_DECIMAL}));
       List<Object[]> rows = resultTable.getRows();
       assertEquals(rows.size(), 4000);
-      // Note 1: we inserted 250 nulls in _records, and since we query 4 identical index segments, the number of null
-      //  values is: 250 * 4 = 1000.
-      // Note 2: The default null ordering is 'NULLS LAST', regardless of the ordering direction.
+      // We inserted 250 nulls in _records, and since we query 4 identical index segments, the number of null values is:
+      // 250 * 4 = 1000.
       int k = 0;
       for (int i = 0; i < 4000; i += 4) {
         // Null values are inserted at indices where: index % 4 equals 3. Skip null values.
@@ -213,7 +211,7 @@ public void testQueries() {
       }
     }
     {
-      String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s", BIG_DECIMAL_COLUMN,
+      String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s LIMIT 4000", BIG_DECIMAL_COLUMN,
           BIG_DECIMAL_COLUMN);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
@@ -221,7 +219,6 @@ public void testQueries() {
       assertEquals(dataSchema,
           new DataSchema(new String[]{BIG_DECIMAL_COLUMN}, new ColumnDataType[]{ColumnDataType.BIG_DECIMAL}));
       List<Object[]> rows = resultTable.getRows();
-      assertEquals(rows.size(), 10);
       int i = 0;
       for (int index = 0; index < rows.size() - 1; index++) {
         Object[] row = rows.get(index);
@@ -262,8 +259,6 @@ public void testQueries() {
         i++;
         index++;
       }
-      // The default null ordering is 'NULLS LAST'. Therefore, null will appear as the last record.
-      assertNull(rows.get(rows.size() - 1)[0]);
     }
     {
       // This test case was added to validate path-code for distinct w/o order by. See:
@@ -316,7 +311,7 @@ public void testQueries() {
     }
     {
       String query = String.format(
-          "SELECT COUNT(*) AS count, %s FROM testTable GROUP BY %s ORDER BY %s DESC LIMIT 1000",
+          "SELECT COUNT(*) AS count, %s FROM testTable GROUP BY %s ORDER BY %s DESC NULLS LAST LIMIT 1000",
           BIG_DECIMAL_COLUMN, BIG_DECIMAL_COLUMN, BIG_DECIMAL_COLUMN);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/BooleanNullEnabledQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/BooleanNullEnabledQueriesTest.java
index 63443449d95..481634f1168 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/BooleanNullEnabledQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/BooleanNullEnabledQueriesTest.java
@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -181,7 +180,6 @@ public void testQueriesWithNoDictColumn()
   }
 
   public void testQueries() {
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
     Map<String, String> queryOptions = new HashMap<>();
     queryOptions.put("enableNullHandling", "true");
     HashSet<Integer> trueIndices = new HashSet<Integer>(Arrays.asList(1, 3, 5));
@@ -361,7 +359,7 @@ public void testQueries() {
       }
     }
     {
-      String query = "SELECT * FROM testTable ORDER BY booleanColumn DESC LIMIT 4000";
+      String query = "SELECT * FROM testTable ORDER BY booleanColumn DESC NULLS LAST LIMIT 4000";
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
       DataSchema dataSchema = resultTable.getDataSchema();
@@ -382,7 +380,6 @@ public void testQueries() {
       for (int i = _trueValuesCount * 4 + _falseValuesCount * 4; i < 4000; i++) {
         Object[] row = rows.get(i);
         assertEquals(row.length, 1);
-        // Note 2: The default null ordering is 'NULLS LAST', regardless of the ordering direction.
         assertNull(row[0]);
       }
     }
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ExplainPlanQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ExplainPlanQueriesTest.java
index d74a81fa871..4fd422b0f00 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/ExplainPlanQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ExplainPlanQueriesTest.java
@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -81,6 +82,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+
 public class ExplainPlanQueriesTest extends BaseQueriesTest {
   private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "ExplainPlanQueriesTest");
   private static final String QUERY_EXECUTOR_CONFIG_PATH = "conf/query-executor.properties";
@@ -143,6 +145,7 @@ public class ExplainPlanQueriesTest extends BaseQueriesTest {
 
   private ServerMetrics _serverMetrics;
   private QueryExecutor _queryExecutor;
+  private QueryExecutor _queryExecutorWithPrefetchEnabled;
   private BrokerReduceService _brokerReduceService;
 
   @Override
@@ -160,10 +163,10 @@ protected List<IndexSegment> getIndexSegments() {
     return _indexSegments;
   }
 
-  GenericRow createMockRecord(int noIndexCol1, int noIndexCol2, int noIndexCol3,
-      boolean noIndexCol4, double invertedIndexCol1, int invertedIndexCol2, String intervedIndexCol3,
-      double rangeIndexCol1, int rangeIndexCol2, int rangeIndexCol3, double sortedIndexCol1, String jsonIndexCol1,
-      String textIndexCol1, int rawCol1, Object[] mvRawCol1, Object[] mvNoIndexCol1) {
+  GenericRow createMockRecord(int noIndexCol1, int noIndexCol2, int noIndexCol3, boolean noIndexCol4,
+      double invertedIndexCol1, int invertedIndexCol2, String invertedIndexCol3, double rangeIndexCol1,
+      int rangeIndexCol2, int rangeIndexCol3, double sortedIndexCol1, String jsonIndexCol1, String textIndexCol1,
+      int rawCol1, Object[] mvRawCol1, Object[] mvNoIndexCol1) {
 
     GenericRow record = new GenericRow();
     record.putValue(COL1_RAW, rawCol1);
@@ -175,7 +178,7 @@ GenericRow createMockRecord(int noIndexCol1, int noIndexCol2, int noIndexCol3,
 
     record.putValue(COL1_INVERTED_INDEX, invertedIndexCol1);
     record.putValue(COL2_INVERTED_INDEX, invertedIndexCol2);
-    record.putValue(COL3_INVERTED_INDEX, intervedIndexCol3);
+    record.putValue(COL3_INVERTED_INDEX, invertedIndexCol3);
 
     record.putValue(COL1_RANGE_INDEX, rangeIndexCol1);
     record.putValue(COL2_RANGE_INDEX, rangeIndexCol2);
@@ -239,48 +242,46 @@ public void setUp()
 
     List<GenericRow> records = new ArrayList<>(NUM_RECORDS);
     records.add(createMockRecord(1, 2, 3, true, 1.1, 2, "daffy", 10.1, 20, 30, 100.1,
-        "{\"first\": \"daffy\", \"last\": " + "\"duck\"}", "daffy", 1, new Object[]{1, 2, 3}, new Object[]{1, 2, 3}));
+        "{\"first\": \"daffy\", \"last\": \"duck\"}", "daffy", 1, new Object[]{1, 2, 3}, new Object[]{1, 2, 3}));
     records.add(createMockRecord(0, 1, 2, false, 0.1, 1, "mickey", 0.1, 10, 20, 100.2,
-        "{\"first\": \"mickey\", \"last\": " + "\"mouse\"}", "mickey", 0, new Object[]{2, 3, 4},
-        new Object[]{2, 3, 4}));
+        "{\"first\": \"mickey\", \"last\": \"mouse\"}", "mickey", 0, new Object[]{2, 3, 4}, new Object[]{2, 3, 4}));
     records.add(createMockRecord(3, 4, 5, true, 2.1, 3, "mickey", 20.1, 30, 40, 100.3,
-        "{\"first\": \"mickey\", \"last\": " + "\"mouse\"}", "mickey", 3, new Object[]{3, 4, 5},
-        new Object[]{3, 4, 5}));
+        "{\"first\": \"mickey\", \"last\": \"mouse\"}", "mickey", 3, new Object[]{3, 4, 5}, new Object[]{3, 4, 5}));
     ImmutableSegment immutableSegment1 = createImmutableSegment(records, SEGMENT_NAME_1);
 
     List<GenericRow> records2 = new ArrayList<>(NUM_RECORDS);
     records2.add(createMockRecord(5, 2, 3, true, 1.1, 2, "pluto", 10.1, 20, 30, 100.1,
-        "{\"first\": \"pluto\", \"last\": " + "\"dog\"}", "pluto", 5, new Object[]{100, 200, 300},
+        "{\"first\": \"pluto\", \"last\": \"dog\"}", "pluto", 5, new Object[]{100, 200, 300},
         new Object[]{100, 200, 300}));
     records2.add(createMockRecord(6, 1, 2, false, 0.1, 1, "pluto", 0.1, 10, 20, 100.2,
-        "{\"first\": \"pluto\", \"last\": " + "\"dog\"}", "pluto", 6, new Object[]{200, 300, 400},
+        "{\"first\": \"pluto\", \"last\": \"dog\"}", "pluto", 6, new Object[]{200, 300, 400},
         new Object[]{200, 300, 400}));
     records2.add(createMockRecord(8, 4, 5, true, 2.1, 3, "pluto", 20.1, 30, 40, 100.3,
-        "{\"first\": \"pluto\", \"last\": " + "\"dog\"}", "pluto", 8, new Object[]{300, 400, 500},
+        "{\"first\": \"pluto\", \"last\": \"dog\"}", "pluto", 8, new Object[]{300, 400, 500},
         new Object[]{300, 400, 500}));
     ImmutableSegment immutableSegment2 = createImmutableSegment(records2, SEGMENT_NAME_2);
 
     List<GenericRow> records3 = new ArrayList<>(NUM_RECORDS);
     records3.add(createMockRecord(5, 2, 3, true, 1.5, 2, "donald", 10.1, 20, 30, 100.1,
-        "{\"first\": \"donald\", \"last\": " + "\"duck\"}", "donald", 1, new Object[]{100, 200, 300},
+        "{\"first\": \"donald\", \"last\": \"duck\"}", "donald", 1, new Object[]{100, 200, 300},
         new Object[]{100, 200, 300}));
     records3.add(createMockRecord(6, 1, 2, false, 0.1, 1, "goofy", 0.1, 10, 20, 100.2,
-        "{\"first\": \"goofy\", \"last\": " + "\"dog\"}", "goofy", 1, new Object[]{100, 200, 300},
+        "{\"first\": \"goofy\", \"last\": \"dog\"}", "goofy", 1, new Object[]{100, 200, 300},
         new Object[]{100, 200, 300}));
     records3.add(createMockRecord(7, 4, 5, true, 2.1, 3, "minnie", 20.1, 30, 40, 100.3,
-        "{\"first\": \"minnie\", \"last\": " + "\"mouse\"}", "minnie", 1, new Object[]{1000, 2000, 3000},
+        "{\"first\": \"minnie\", \"last\": \"mouse\"}", "minnie", 1, new Object[]{1000, 2000, 3000},
         new Object[]{1000, 2000, 3000}));
     ImmutableSegment immutableSegment3 = createImmutableSegment(records3, SEGMENT_NAME_3);
 
     List<GenericRow> records4 = new ArrayList<>(NUM_RECORDS);
     records4.add(createMockRecord(5, 2, 3, true, 1.1, 2, "tweety", 10.1, 20, 30, 100.1,
-        "{\"first\": \"tweety\", \"last\": " + "\"bird\"}", "tweety", 5, new Object[]{100, 200, 300},
+        "{\"first\": \"tweety\", \"last\": \"bird\"}", "tweety", 5, new Object[]{100, 200, 300},
         new Object[]{100, 200, 300}));
     records4.add(createMockRecord(6, 1, 2, false, 0.1, 1, "bugs", 0.1, 10, 20, 100.2,
-        "{\"first\": \"bugs\", \"last\": " + "\"bunny\"}", "bugs", 6, new Object[]{100, 200, 300},
+        "{\"first\": \"bugs\", \"last\": \"bunny\"}", "bugs", 6, new Object[]{100, 200, 300},
         new Object[]{100, 200, 300}));
     records4.add(createMockRecord(7, 4, 5, true, 2.1, 3, "sylvester", 20.1, 30, 40, 100.3,
-        "{\"first\": \"sylvester\", \"last\": " + "\"cat\"}", "sylvester", 7, new Object[]{1000, 2000, 3000},
+        "{\"first\": \"sylvester\", \"last\": \"cat\"}", "sylvester", 7, new Object[]{1000, 2000, 3000},
         new Object[]{1000, 2000, 3000}));
     ImmutableSegment immutableSegment4 = createImmutableSegment(records4, SEGMENT_NAME_4);
 
@@ -319,13 +320,57 @@ public void setUp()
     _queryExecutor = new ServerQueryExecutorV1Impl();
     _queryExecutor.init(new PinotConfiguration(queryExecutorConfig), instanceDataManager, _serverMetrics);
 
+    PinotConfiguration prefetchEnabledConf = new PinotConfiguration(queryExecutorConfig);
+    prefetchEnabledConf.setProperty(ServerQueryExecutorV1Impl.ENABLE_PREFETCH, "true");
+    _queryExecutorWithPrefetchEnabled = new ServerQueryExecutorV1Impl();
+    _queryExecutorWithPrefetchEnabled.init(prefetchEnabledConf, instanceDataManager, _serverMetrics);
+
     // Create the BrokerReduceService
     _brokerReduceService = new BrokerReduceService(new PinotConfiguration(
         Collections.singletonMap(CommonConstants.Broker.CONFIG_OF_MAX_REDUCE_THREADS_PER_QUERY, 2)));
   }
 
+  private ResultTable getPrefetchEnabledResulTable(ResultTable resultTable) {
+    // TODO does not work for cases where different segments have different plans (more than 1 PLAN_START rows)
+    List<Object[]> newRows = new ArrayList<>();
+    int acquireOpParentId = -1;
+
+    Iterator<Object[]> it = resultTable.getRows().iterator();
+    // After each PLAN_START, we need to add ACQUIRE_RELEASE_COLUMNS_SEGMENT (unles ALL_SEGMENTS_PRUNED_ON_SERVER),
+    // and all following op should have their ids incremented
+
+    while (it.hasNext()) {
+      Object[] row = it.next();
+      String op = row[0].toString();
+      newRows.add(row);
+      acquireOpParentId = Math.max(acquireOpParentId, (int) row[1]);
+      if (op.startsWith("PLAN_START")) {
+        newRows.add(new Object[]{"ACQUIRE_RELEASE_COLUMNS_SEGMENT", acquireOpParentId + 1, acquireOpParentId});
+        break;
+      }
+    }
+
+    while (it.hasNext()) {
+      Object[] row = it.next();
+      newRows.add(new Object[]{row[0].toString(), ((int) row[1] + 1), ((int) row[2]) + 1});
+    }
+
+    return new ResultTable(resultTable.getDataSchema(), newRows);
+  }
+
   /** Checks the correctness of EXPLAIN PLAN output. */
   private void check(String query, ResultTable expected) {
+    check(query, expected, false);
+  }
+
+  private void check(String query, ResultTable expected, boolean checkPrefetchEnabled) {
+    checkWithQueryExecutor(query, expected, _queryExecutor);
+    if (checkPrefetchEnabled) {
+      checkWithQueryExecutor(query, getPrefetchEnabledResulTable(expected), _queryExecutorWithPrefetchEnabled);
+    }
+  }
+
+  private void checkWithQueryExecutor(String query, ResultTable expected, QueryExecutor queryExecutor) {
     BrokerRequest brokerRequest = CalciteSqlCompiler.compileToBrokerRequest(query);
 
     int segmentsForServer1 = _segmentNames.size() / 2;
@@ -343,10 +388,10 @@ private void check(String query, ResultTable expected) {
     brokerRequest.getPinotQuery().getDataSource().setTableName(OFFLINE_TABLE_NAME);
     InstanceRequest instanceRequest1 = new InstanceRequest(0L, brokerRequest);
     instanceRequest1.setSearchSegments(indexSegmentsForServer1);
-    InstanceResponseBlock instanceResponse1 = _queryExecutor.execute(getQueryRequest(instanceRequest1), QUERY_RUNNERS);
+    InstanceResponseBlock instanceResponse1 = queryExecutor.execute(getQueryRequest(instanceRequest1), QUERY_RUNNERS);
     InstanceRequest instanceRequest2 = new InstanceRequest(0L, brokerRequest);
     instanceRequest2.setSearchSegments(indexSegmentsForServer2);
-    InstanceResponseBlock instanceResponse2 = _queryExecutor.execute(getQueryRequest(instanceRequest2), QUERY_RUNNERS);
+    InstanceResponseBlock instanceResponse2 = queryExecutor.execute(getQueryRequest(instanceRequest2), QUERY_RUNNERS);
 
     // Broker side
     // Use 2 Threads for 2 data-tables
@@ -386,61 +431,62 @@ public void testSelect() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{
         "SELECT(selectList:invertedIndexCol1, invertedIndexCol2, invertedIndexCol3, jsonIndexCol1, mvNoIndexCol1, "
             + "mvRawCol1, noIndexCol1, noIndexCol2, noIndexCol3, noIndexCol4, rangeIndexCol1, rangeIndexCol2, "
-            + "rangeIndexCol3, rawCol1, sortedIndexCol1, textIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol2, invertedIndexCol3, "
-        + "jsonIndexCol1, mvNoIndexCol1, mvRawCol1, noIndexCol1, noIndexCol2, noIndexCol3, noIndexCol4, "
-        + "rangeIndexCol1, rangeIndexCol2, rangeIndexCol3, rawCol1, sortedIndexCol1, textIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(noIndexCol4, rawCol1, sortedIndexCol1, noIndexCol3, mvNoIndexCol1"
-        + ", rangeIndexCol1, rangeIndexCol2, invertedIndexCol1, noIndexCol2, invertedIndexCol2, noIndexCol1, "
-        + "rangeIndexCol3, textIndexCol1, mvRawCol1, jsonIndexCol1, invertedIndexCol3)", 5, 4
+            + "rangeIndexCol3, rawCol1, sortedIndexCol1, textIndexCol1)", 3, 2
     });
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
-    check(query1, new ResultTable(DATA_SCHEMA, result1));
+    result1.add(new Object[]{
+        "PROJECT(noIndexCol4, rawCol1, sortedIndexCol1, noIndexCol3, mvNoIndexCol1"
+            + ", rangeIndexCol1, rangeIndexCol2, invertedIndexCol1, noIndexCol2, invertedIndexCol2, noIndexCol1, "
+            + "rangeIndexCol3, textIndexCol1, mvRawCol1, jsonIndexCol1, invertedIndexCol3)", 4, 3
+    });
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
+    check(query1, new ResultTable(DATA_SCHEMA, result1), true);
 
     String query2 = "EXPLAIN PLAN FOR SELECT 'mickey' FROM testTable";
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:'mickey')", 3, 2});
     result2.add(new Object[]{"TRANSFORM('mickey')", 4, 3});
     result2.add(new Object[]{"PROJECT()", 5, 4});
     result2.add(new Object[]{"DOC_ID_SET", 6, 5});
     result2.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
-    check(query2, new ResultTable(DATA_SCHEMA, result2));
+    check(query2, new ResultTable(DATA_SCHEMA, result2), true);
 
     String query3 = "EXPLAIN PLAN FOR SELECT invertedIndexCol1, noIndexCol1 FROM testTable LIMIT 100";
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
-    check(query3, new ResultTable(DATA_SCHEMA, result3));
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
+    check(query3, new ResultTable(DATA_SCHEMA, result3), true);
 
     String query4 = "EXPLAIN PLAN FOR SELECT DISTINCT invertedIndexCol1, noIndexCol1 FROM testTable LIMIT 100";
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_DISTINCT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"DISTINCT(keyColumns:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
-    check(query4, new ResultTable(DATA_SCHEMA, result4));
+    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
+    check(query4, new ResultTable(DATA_SCHEMA, result4), true);
   }
 
   @Test
@@ -451,32 +497,30 @@ public void testSelectVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{
         "SELECT(selectList:invertedIndexCol1, invertedIndexCol2, invertedIndexCol3, jsonIndexCol1, mvNoIndexCol1, "
             + "mvRawCol1, noIndexCol1, noIndexCol2, noIndexCol3, noIndexCol4, rangeIndexCol1, rangeIndexCol2, "
             + "rangeIndexCol3, rawCol1, sortedIndexCol1, textIndexCol1)", 3, 2
     });
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol2, invertedIndexCol3, "
-        + "jsonIndexCol1, mvNoIndexCol1, mvRawCol1, noIndexCol1, noIndexCol2, noIndexCol3, noIndexCol4, "
-        + "rangeIndexCol1, rangeIndexCol2, rangeIndexCol3, rawCol1, sortedIndexCol1, textIndexCol1)", 4, 3
-    });
     result1.add(new Object[]{
         "PROJECT(noIndexCol4, rawCol1, sortedIndexCol1, noIndexCol3, mvNoIndexCol1, "
             + "rangeIndexCol1, rangeIndexCol2, invertedIndexCol1, noIndexCol2, invertedIndexCol2, noIndexCol1, "
-            + "rangeIndexCol3, textIndexCol1, mvRawCol1, jsonIndexCol1, invertedIndexCol3)", 5, 4
+            + "rangeIndexCol3, textIndexCol1, mvRawCol1, jsonIndexCol1, invertedIndexCol3)", 4, 3
     });
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     String query2 = "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT 'mickey' FROM testTable";
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:'mickey')", 3, 2});
     result2.add(new Object[]{"TRANSFORM('mickey')", 4, 3});
     result2.add(new Object[]{"PROJECT()", 5, 4});
@@ -489,13 +533,13 @@ public void testSelectVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     String query4 = "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT DISTINCT invertedIndexCol1, noIndexCol1 "
@@ -503,13 +547,13 @@ public void testSelectVerbose() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_DISTINCT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"DISTINCT(keyColumns:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query4, new ResultTable(DATA_SCHEMA, result4));
   }
 
@@ -521,8 +565,9 @@ public void testSelectTransformFunction() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:case(less_than(noIndexCol1,'10'),'less','more'))", 3, 2});
     result1.add(new Object[]{"TRANSFORM(case(less_than(noIndexCol1,'10'),'less','more'))", 4, 3});
     result1.add(new Object[]{"PROJECT(noIndexCol1)", 5, 4});
@@ -534,8 +579,9 @@ public void testSelectTransformFunction() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:concat(textIndexCol1,textIndexCol1,':'))", 3, 2});
     result2.add(new Object[]{"TRANSFORM(concat(textIndexCol1,textIndexCol1,':'))", 4, 3});
     result2.add(new Object[]{"PROJECT(textIndexCol1)", 5, 4});
@@ -553,8 +599,9 @@ public void testSelectTransformFunctionVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:case(less_than(noIndexCol1,'10'),'less','more'))", 3, 2});
     result1.add(new Object[]{"TRANSFORM(case(less_than(noIndexCol1,'10'),'less','more'))", 4, 3});
     result1.add(new Object[]{"PROJECT(noIndexCol1)", 5, 4});
@@ -567,8 +614,9 @@ public void testSelectTransformFunctionVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:concat(textIndexCol1,textIndexCol1,':'))", 3, 2});
     result2.add(new Object[]{"TRANSFORM(concat(textIndexCol1,textIndexCol1,':'))", 4, 3});
     result2.add(new Object[]{"PROJECT(textIndexCol1)", 5, 4});
@@ -584,11 +632,12 @@ public void testSelectOrderBy() {
     String query1 = "EXPLAIN PLAN FOR SELECT CASE WHEN noIndexCol1 < 10 THEN 'less' ELSE 'more' END  FROM testTable "
         + "ORDER BY 1";
     List<Object[]> result1 = new ArrayList<>();
-    result1
-        .add(new Object[]{"BROKER_REDUCE(sort:[case(less_than(noIndexCol1,'10'),'less','more') ASC],limit:10)", 1, 0});
+    result1.add(
+        new Object[]{"BROKER_REDUCE(sort:[case(less_than(noIndexCol1,'10'),'less','more') ASC],limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT_ORDERBY", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT_ORDERBY(selectList:case(less_than(noIndexCol1,'10'),'less','more'))", 3, 2});
     result1.add(new Object[]{"TRANSFORM(case(less_than(noIndexCol1,'10'),'less','more'))", 4, 3});
     result1.add(new Object[]{"PROJECT(noIndexCol1)", 5, 4});
@@ -600,8 +649,9 @@ public void testSelectOrderBy() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(sort:[concat(textIndexCol1,textIndexCol1,':') DESC],limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT_ORDERBY", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT_ORDERBY(selectList:concat(textIndexCol1,textIndexCol1,':'))", 3, 2});
     result2.add(new Object[]{"TRANSFORM(concat(textIndexCol1,textIndexCol1,':'))", 4, 3});
     result2.add(new Object[]{"PROJECT(textIndexCol1)", 5, 4});
@@ -617,11 +667,12 @@ public void testSelectOrderByVerbose() {
     String query1 = "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT CASE WHEN noIndexCol1 < 10 THEN 'less' ELSE "
         + "'more' END  FROM testTable ORDER BY 1";
     List<Object[]> result1 = new ArrayList<>();
-    result1
-        .add(new Object[]{"BROKER_REDUCE(sort:[case(less_than(noIndexCol1,'10'),'less','more') ASC],limit:10)", 1, 0});
+    result1.add(
+        new Object[]{"BROKER_REDUCE(sort:[case(less_than(noIndexCol1,'10'),'less','more') ASC],limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT_ORDERBY", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT_ORDERBY(selectList:case(less_than(noIndexCol1,'10'),'less','more'))", 3, 2});
     result1.add(new Object[]{"TRANSFORM(case(less_than(noIndexCol1,'10'),'less','more'))", 4, 3});
     result1.add(new Object[]{"PROJECT(noIndexCol1)", 5, 4});
@@ -634,8 +685,9 @@ public void testSelectOrderByVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(sort:[concat(textIndexCol1,textIndexCol1,':') DESC],limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT_ORDERBY", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT_ORDERBY(selectList:concat(textIndexCol1,textIndexCol1,':'))", 3, 2});
     result2.add(new Object[]{"TRANSFORM(concat(textIndexCol1,textIndexCol1,':'))", 4, 3});
     result2.add(new Object[]{"PROJECT(textIndexCol1)", 5, 4});
@@ -656,13 +708,13 @@ public void testSelectColumnsUsingFilter() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, noIndexCol2, sortedIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, sortedIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(sortedIndexCol1, noIndexCol2, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result1.add(new Object[]{"PROJECT(sortedIndexCol1, noIndexCol2, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // The FILTER_AND is part of the query plan for all segments as both predicates are expressions
@@ -672,18 +724,18 @@ public void testSelectColumnsUsingFilter() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, noIndexCol2)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_AND", 7, 6});
+    result2.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_AND", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_EXPRESSION(operator:RANGE,predicate:div(noIndexCol1,noIndexCol2) BETWEEN '10' AND '20')", 7, 6
+    });
     result2.add(
-        new Object[]{"FILTER_EXPRESSION(operator:RANGE,predicate:div(noIndexCol1,noIndexCol2) BETWEEN '10' AND '20')",
-            8, 7});
-    result2
-        .add(new Object[]{"FILTER_EXPRESSION(operator:RANGE,predicate:times(invertedIndexCol1,'5') < '1000')", 9, 7});
+        new Object[]{"FILTER_EXPRESSION(operator:RANGE,predicate:times(invertedIndexCol1,'5') < '1000')", 8, 6});
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // All segments have a match for noIndexCol2 'between 2 and 101'
@@ -697,15 +749,15 @@ public void testSelectColumnsUsingFilter() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_OR", 7, 6});
-    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 8, 7});
-    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 9, 7});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_OR", 6, 5});
+    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 7, 6});
+    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 8, 6});
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // All segments have a match for noIndexCol2 'between 2 and 101'
@@ -718,16 +770,16 @@ public void testSelectColumnsUsingFilter() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_OR", 7, 6});
-    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 8, 7});
-    result4.add(new Object[]{"FILTER_EXPRESSION(operator:EQ,predicate:contains(textIndexCol1,'daff') = 'true')", 9, 7});
-    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 10, 7});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_OR", 6, 5});
+    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 7, 6});
+    result4.add(new Object[]{"FILTER_EXPRESSION(operator:EQ,predicate:contains(textIndexCol1,'daff') = 'true')", 8, 6});
+    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 9, 6});
     check(query4, new ResultTable(DATA_SCHEMA, result4));
 
     // All segments match for a full scan since noIndexCol4 has at least one row value set to 'true' across all segments
@@ -735,13 +787,13 @@ public void testSelectColumnsUsingFilter() {
     List<Object[]> result5 = new ArrayList<>();
     result5.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result5.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result5.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result5.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result5.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result5.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result5.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result5.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result5.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 7, 6});
+    result5.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result5.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result5.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 6, 5});
     check(query5, new ResultTable(DATA_SCHEMA, result5));
 
     // The FILTER_AND is part of the query plan for all segments as the first predicate is an expression and the second
@@ -751,16 +803,17 @@ public void testSelectColumnsUsingFilter() {
     List<Object[]> result6 = new ArrayList<>();
     result6.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result6.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result6.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result6.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result6.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result6.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result6.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result6.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result6.add(new Object[]{"FILTER_AND", 7, 6});
-    result6.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 8, 7});
-    result6.add(new Object[]{"FILTER_EXPRESSION(operator:EQ,predicate:startswith(textIndexCol1,'daff') = 'true')", 9,
-        7});
+    result6.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result6.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result6.add(new Object[]{"FILTER_AND", 6, 5});
+    result6.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 7, 6});
+    result6.add(new Object[]{
+        "FILTER_EXPRESSION(operator:EQ,predicate:startswith(textIndexCol1,'daff') = 'true')", 8, 6
+    });
     check(query6, new ResultTable(DATA_SCHEMA, result6));
   }
 
@@ -777,13 +830,13 @@ public void testSelectColumnsUsingFilterVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, noIndexCol2, sortedIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, sortedIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(sortedIndexCol1, noIndexCol2, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result1.add(new Object[]{"PROJECT(sortedIndexCol1, noIndexCol2, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // The FILTER_AND is part of the query plan for all segments as both predicates are expressions
@@ -793,18 +846,18 @@ public void testSelectColumnsUsingFilterVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, noIndexCol2)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_AND", 7, 6});
+    result2.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_AND", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_EXPRESSION(operator:RANGE,predicate:div(noIndexCol1,noIndexCol2) BETWEEN '10' AND '20')", 7, 6
+    });
     result2.add(
-        new Object[]{"FILTER_EXPRESSION(operator:RANGE,predicate:div(noIndexCol1,noIndexCol2) BETWEEN '10' AND '20')",
-            8, 7});
-    result2
-        .add(new Object[]{"FILTER_EXPRESSION(operator:RANGE,predicate:times(invertedIndexCol1,'5') < '1000')", 9, 7});
+        new Object[]{"FILTER_EXPRESSION(operator:RANGE,predicate:times(invertedIndexCol1,'5') < '1000')", 8, 6});
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // All segments have a match for noIndexCol2 'between 2 and 101'
@@ -817,22 +870,22 @@ public void testSelectColumnsUsingFilterVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_OR", 7, 6});
-    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 8, 7});
-    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 9, 7});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_OR", 6, 5});
+    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 7, 6});
+    result3.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 8, 6});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // All segments have a match for noIndexCol2 'between 2 and 101'
@@ -845,23 +898,23 @@ public void testSelectColumnsUsingFilterVerbose() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_OR", 7, 6});
-    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 8, 7});
-    result4.add(new Object[]{"FILTER_EXPRESSION(operator:EQ,predicate:contains(textIndexCol1,'daff') = 'true')", 9, 7});
-    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 10, 7});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_OR", 6, 5});
+    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol1 > '1')", 7, 6});
+    result4.add(new Object[]{"FILTER_EXPRESSION(operator:EQ,predicate:contains(textIndexCol1,'daff') = 'true')", 8, 6});
+    result4.add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:noIndexCol2 BETWEEN '2' AND '101')", 9, 6});
     check(query4, new ResultTable(DATA_SCHEMA, result4));
 
     // All segments match since noIndexCol4 has at least one row value set to 'true' across all segments
@@ -870,13 +923,13 @@ public void testSelectColumnsUsingFilterVerbose() {
     List<Object[]> result5 = new ArrayList<>();
     result5.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result5.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result5.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result5.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result5.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result5.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result5.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result5.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result5.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 7, 6});
+    result5.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result5.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result5.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 6, 5});
     check(query5, new ResultTable(DATA_SCHEMA, result5));
 
     // The FILTER_AND is part of the query plan for all segments as the first predicate is an expression and the second
@@ -886,16 +939,17 @@ public void testSelectColumnsUsingFilterVerbose() {
     List<Object[]> result6 = new ArrayList<>();
     result6.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result6.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result6.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result6.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result6.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1)", 3, 2});
-    result6.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result6.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result6.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result6.add(new Object[]{"FILTER_AND", 7, 6});
-    result6.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 8, 7});
-    result6.add(new Object[]{"FILTER_EXPRESSION(operator:EQ,predicate:startswith(textIndexCol1,'daff') = 'true')", 9,
-        7});
+    result6.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result6.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result6.add(new Object[]{"FILTER_AND", 6, 5});
+    result6.add(new Object[]{"FILTER_FULL_SCAN(operator:EQ,predicate:noIndexCol4 = 'true')", 7, 6});
+    result6.add(new Object[]{
+        "FILTER_EXPRESSION(operator:EQ,predicate:startswith(textIndexCol1,'daff') = 'true')", 8, 6
+    });
     check(query6, new ResultTable(DATA_SCHEMA, result6));
   }
 
@@ -911,17 +965,19 @@ public void testSelectColumnsUsingFilterOnInvertedIndexColumn() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, sortedIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, sortedIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_AND", 7, 6});
+    result1.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_AND", 6, 5});
+    result1.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = '100.1')", 7, 6
+    });
     result1.add(new Object[]{
-        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = " + "'100.1')", 8, 7});
-    result1.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,"
-        + "predicate:invertedIndexCol1 = '1.1')", 9, 7});
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 8, 6
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segments 1, 2, 4 result in a FILTER_OR plan which matches all the segments and all four predicates.
@@ -934,21 +990,24 @@ public void testSelectColumnsUsingFilterOnInvertedIndexColumn() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, sortedIndexCol1)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, sortedIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_OR", 7, 6});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,"
-        + "predicate:invertedIndexCol1 = '1.1')", 8, 7});
+    result2.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_OR", 6, 5});
     result2.add(new Object[]{
-        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = " + "'100.2')", 9, 7});
-    result2
-        .add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:invertedIndexCol1 BETWEEN '0.2' AND '5')", 10, 7});
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 7, 6
+    });
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = '100.2')", 8, 6
+    });
+    result2.add(
+        new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:invertedIndexCol1 BETWEEN '0.2' AND '5')", 9, 6});
     result2.add(new Object[]{
-        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > " + "'20')", 11, 7});
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '20')", 10, 6
+    });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // Segments 2, 3, 4 result in a MatchAllOperator because 'invertedIndexCol3 NOT IN ('foo', 'mickey')' matches all
@@ -961,17 +1020,21 @@ public void testSelectColumnsUsingFilterOnInvertedIndexColumn() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_OR", 7, 6});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:IN,"
-        + "predicate:invertedIndexCol2 IN ('1','2','30'))", 8, 7});
-    result3.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:NOT_IN,"
-        + "predicate:invertedIndexCol3 NOT IN ('foo','mickey'))", 9, 7});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_OR", 6, 5});
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:IN,predicate:invertedIndexCol2 IN ('1','2','30'))",
+        7, 6
+    });
+    result3.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:NOT_IN,predicate:invertedIndexCol3 NOT IN "
+            + "('foo','mickey'))", 8, 6
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
   }
 
@@ -986,24 +1049,26 @@ public void testSelectColumnsUsingFilterOnInvertedIndexColumnVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, sortedIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, sortedIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_AND", 7, 6});
+    result1.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_EMPTY", 6, 5});
     result1.add(new Object[]{
-        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = " + "'100.1')", 8, 7});
-    result1.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,"
-        + "predicate:invertedIndexCol1 = '1.1')", 9, 7});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, sortedIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, sortedIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result1.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_AND", 6, 5});
+    result1.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = '100.1')", 7, 6
+    });
+    result1.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 8, 6
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segments 1, 2, 4 result in a FILTER_OR plan which matches all the segments and all four predicates.
@@ -1015,35 +1080,40 @@ public void testSelectColumnsUsingFilterOnInvertedIndexColumnVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, sortedIndexCol1)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, sortedIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_OR", 7, 6});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,"
-        + "predicate:invertedIndexCol1 = '1.1')", 8, 7});
+    result2.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_OR", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = '100.2')", 7, 6
+    });
+    result2.add(new Object[]{
+        "FILTER_FULL_SCAN(operator:RANGE,predicate:invertedIndexCol1 BETWEEN '0.2' AND '5')", 8, 6
+    });
     result2.add(new Object[]{
-        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = " + "'100.2')", 9, 7});
-    result2
-        .add(new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:invertedIndexCol1 BETWEEN '0.2' AND '5')", 10, 7});
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '20')", 9, 6
+    });
     result2.add(new Object[]{
-        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > " + "'20')", 11, 7});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, sortedIndexCol1)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, sortedIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_OR", 7, 6});
-    result2.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 "
-        + "= '100.2')", 8, 7});
+    result2.add(new Object[]{"PROJECT(sortedIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_OR", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 7, 6
+    });
     result2.add(new Object[]{
-        "FILTER_FULL_SCAN(operator:RANGE,predicate:invertedIndexCol1 BETWEEN '0.2' AND '5')", 9, 7});
-    result2
-        .add(new Object[]{"FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > "
-            + "'20')", 10, 7});
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:sortedIndexCol1 = '100.2')", 8, 6
+    });
+    result2.add(
+        new Object[]{"FILTER_FULL_SCAN(operator:RANGE,predicate:invertedIndexCol1 BETWEEN '0.2' AND '5')", 9, 6});
+    result2.add(new Object[]{
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '20')", 10, 6
+    });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // Segments 2, 3, 4 result in a MatchAllOperator because 'invertedIndexCol3 NOT IN ('foo', 'mickey')' matches all
@@ -1056,24 +1126,28 @@ public void testSelectColumnsUsingFilterOnInvertedIndexColumnVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_OR", 7, 6});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:IN,"
-        + "predicate:invertedIndexCol2 IN ('1','2','30'))", 8, 7});
-    result3.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:NOT_IN,"
-        + "predicate:invertedIndexCol3 NOT IN ('foo','mickey'))", 9, 7});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_OR", 6, 5});
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:IN,predicate:invertedIndexCol2 IN ('1','2','30'))",
+        7, 6
+    });
+    result3.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:NOT_IN,predicate:invertedIndexCol3 NOT IN "
+            + "('foo','mickey'))", 8, 6
+    });
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query3, new ResultTable(DATA_SCHEMA, result3));
   }
 
@@ -1088,20 +1162,24 @@ public void testSelectColumnUsingFilterOnRangeIndexColumn() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1, rangeIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, rangeIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(rangeIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_OR", 7, 6});
-    result1.add(new Object[]{"FILTER_AND", 8, 7});
+    result1.add(new Object[]{"PROJECT(rangeIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_OR", 6, 5});
+    result1.add(new Object[]{"FILTER_AND", 7, 6});
+    result1.add(new Object[]{
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '10.1')", 8, 7
+    });
     result1.add(new Object[]{
-        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '10" + ".1')", 9, 8});
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol2 >= '15')", 9, 7
+    });
     result1.add(new Object[]{
-        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol2 >= " + "'15')", 10, 8});
-    result1.add(new Object[]{"FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol3 "
-        + "BETWEEN '21' AND '45')", 11, 7});
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol3 "
+            + "BETWEEN '21' AND '45')", 10, 6
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
   }
 
@@ -1117,20 +1195,24 @@ public void testSelectColumnUsingFilterOnRangeIndexColumnVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:invertedIndexCol1, noIndexCol1, rangeIndexCol1)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1, rangeIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(rangeIndexCol1, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_OR", 7, 6});
-    result1.add(new Object[]{"FILTER_AND", 8, 7});
+    result1.add(new Object[]{"PROJECT(rangeIndexCol1, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_OR", 6, 5});
+    result1.add(new Object[]{"FILTER_AND", 7, 6});
+    result1.add(new Object[]{
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '10.1')", 8, 7
+    });
     result1.add(new Object[]{
-        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol1 > '10" + ".1')", 9, 8});
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol2 >= '15')", 9, 7
+    });
     result1.add(new Object[]{
-        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol2 >= " + "'15')", 10, 8});
-    result1.add(new Object[]{"FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol3 "
-        + "BETWEEN '21' AND '45')", 11, 7});
+        "FILTER_RANGE_INDEX(indexLookUp:range_index,operator:RANGE,predicate:rangeIndexCol3 "
+            + "BETWEEN '21' AND '45')", 10, 6
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
   }
 
@@ -1149,11 +1231,10 @@ public void testSelectAggregateUsingFilterOnTextIndexColumn() {
     result1.add(new Object[]{
         "GROUP_BY(groupKeys:noIndexCol1, noIndexCol2, aggregations:max(noIndexCol2), min(noIndexCol3))", 3, 2
     });
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
     result1.add(new Object[]{
-        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 7, 6
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 6, 5
     });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
@@ -1170,11 +1251,10 @@ public void testSelectAggregateUsingFilterOnTextIndexColumn() {
     result2.add(new Object[]{
         "GROUP_BY(groupKeys:noIndexCol1, noIndexCol2, aggregations:max(noIndexCol2), min(noIndexCol3))", 3, 2
     });
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result2.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
     result2.add(new Object[]{
-        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 7, 6
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 6, 5
     });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
   }
@@ -1182,42 +1262,42 @@ public void testSelectAggregateUsingFilterOnTextIndexColumn() {
   @Test
   public void testSelectAggregateUsingFilterOnTextIndexColumnVerbose() {
     // All segments match the same plan for these queries
-    String query1 =
-        "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT noIndexCol1, noIndexCol2, max(noIndexCol2), "
-            + "min(noIndexCol3) FROM testTable WHERE TEXT_MATCH(textIndexCol1, 'foo') GROUP BY noIndexCol1, "
-            + "noIndexCol2";
+    String query1 = "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT noIndexCol1, noIndexCol2, max(noIndexCol2), "
+        + "min(noIndexCol3) FROM testTable WHERE TEXT_MATCH(textIndexCol1, 'foo') GROUP BY noIndexCol1, "
+        + "noIndexCol2";
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_GROUP_BY", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
     result1.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol1, noIndexCol2, aggregations:max(noIndexCol2), min"
-            + "(noIndexCol3))", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match"
-        + "(textIndexCol1,'foo'))", 7, 6});
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
+    result1.add(new Object[]{
+        "GROUP_BY(groupKeys:noIndexCol1, noIndexCol2, aggregations:max(noIndexCol2), min(noIndexCol3))", 3, 2
+    });
+    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 6, 5
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
-    String query2 =
-        "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT noIndexCol1, max(noIndexCol2) AS mymax, "
-            + "min(noIndexCol3) AS mymin FROM testTable WHERE TEXT_MATCH (textIndexCol1, 'foo') GROUP BY "
-            + "noIndexCol1, noIndexCol2 ORDER BY noIndexCol1, max(noIndexCol2)";
+    String query2 = "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT noIndexCol1, max(noIndexCol2) AS mymax, "
+        + "min(noIndexCol3) AS mymin FROM testTable WHERE TEXT_MATCH (textIndexCol1, 'foo') GROUP BY "
+        + "noIndexCol1, noIndexCol2 ORDER BY noIndexCol1, max(noIndexCol2)";
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(sort:[noIndexCol1 ASC, max(noIndexCol2) ASC],limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_GROUP_BY", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
     result2.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol1, noIndexCol2, aggregations:max(noIndexCol2), min"
-            + "(noIndexCol3))", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match"
-        + "(textIndexCol1,'foo'))", 7, 6});
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
+    result2.add(new Object[]{
+        "GROUP_BY(groupKeys:noIndexCol1, noIndexCol2, aggregations:max(noIndexCol2), min(noIndexCol3))", 3, 2
+    });
+    result2.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 6, 5
+    });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
   }
 
@@ -1233,18 +1313,21 @@ public void testSelectColumnUsingFilterOnJsonIndexColumn() {
     List<Object[]> result = new ArrayList<>();
     result.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result.add(new Object[]{"FILTER_AND", 7, 6});
-    result.add(new Object[]{"FILTER_JSON_INDEX(indexLookUp:json_index,operator:JSON_MATCH,predicate:json_match"
-        + "(jsonIndexCol1,'key=1'))", 8, 7});
-    result.add(new Object[]{"FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match"
-        + "(textIndexCol1,'foo'))", 9, 7});
-    result.add(new Object[]{"FILTER_FULL_SCAN(operator:NOT_IN,predicate:noIndexCol1 NOT IN ('1','20','30'))", 10, 7});
+    result.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result.add(new Object[]{"FILTER_AND", 6, 5});
+    result.add(new Object[]{
+        "FILTER_JSON_INDEX(indexLookUp:json_index,operator:JSON_MATCH,predicate:json_match(jsonIndexCol1,'key=1'))",
+        7, 6
+    });
+    result.add(new Object[]{
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 8, 6
+    });
+    result.add(new Object[]{"FILTER_FULL_SCAN(operator:NOT_IN,predicate:noIndexCol1 NOT IN ('1','20','30'))", 9, 6});
     check(query, new ResultTable(DATA_SCHEMA, result));
   }
 
@@ -1252,38 +1335,43 @@ public void testSelectColumnUsingFilterOnJsonIndexColumn() {
   public void testSelectColumnUsingFilterOnJsonIndexColumnVerbose() {
     // Segment 2, 3, 4 don't match 'noIndexCol1 NOT IN (1, 20, 30)' so they return a plan without this OR predicate
     // Segments 1 matches all three predicates so returns a plan with all three
-    String query =
-        "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT noIndexCol1, invertedIndexCol1 FROM testTable "
-            + "WHERE (invertedIndexCol1 IN (10, 20, 30) AND sortedIndexCol1 != 100) OR (noIndexCol1 NOT IN (1, 20, "
-            + "30) AND rangeIndexCol1 != 20 AND JSON_MATCH(jsonIndexCol1, 'key=1') AND TEXT_MATCH(textIndexCol1, "
-            + "'foo'))";
+    String query = "SET explainPlanVerbose=true; EXPLAIN PLAN FOR SELECT noIndexCol1, invertedIndexCol1 FROM testTable "
+        + "WHERE (invertedIndexCol1 IN (10, 20, 30) AND sortedIndexCol1 != 100) OR (noIndexCol1 NOT IN (1, 20, "
+        + "30) AND rangeIndexCol1 != 20 AND JSON_MATCH(jsonIndexCol1, 'key=1') AND TEXT_MATCH(textIndexCol1, "
+        + "'foo'))";
     List<Object[]> result = new ArrayList<>();
     result.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result.add(new Object[]{"FILTER_AND", 7, 6});
-    result.add(new Object[]{"FILTER_JSON_INDEX(indexLookUp:json_index,operator:JSON_MATCH,predicate:json_match"
-        + "(jsonIndexCol1,'key=1'))", 8, 7});
-    result.add(new Object[]{"FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match"
-        + "(textIndexCol1,'foo'))", 9, 7});
-    result.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result.add(new Object[]{"FILTER_AND", 6, 5});
+    result.add(new Object[]{
+        "FILTER_JSON_INDEX(indexLookUp:json_index,operator:JSON_MATCH,predicate:json_match(jsonIndexCol1,'key=1'))",
+        7, 6
+    });
+    result.add(new Object[]{
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 8, 6
+    });
+    result.add(new Object[]{"FILTER_FULL_SCAN(operator:NOT_IN,predicate:noIndexCol1 NOT IN ('1','20','30'))", 9, 6});
+    result.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1)", 3, 2});
-    result.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, noIndexCol1)", 4, 3});
-    result.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 5, 4});
-    result.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result.add(new Object[]{"FILTER_AND", 7, 6});
-    result.add(new Object[]{"FILTER_JSON_INDEX(indexLookUp:json_index,operator:JSON_MATCH,predicate:json_match"
-        + "(jsonIndexCol1,'key=1'))", 8, 7});
-    result.add(new Object[]{"FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match"
-        + "(textIndexCol1,'foo'))", 9, 7});
-    result.add(new Object[]{"FILTER_FULL_SCAN(operator:NOT_IN,predicate:noIndexCol1 NOT IN ('1','20','30'))", 10, 7});
-    check(query, new ResultTable(DATA_SCHEMA, result));
+    result.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1)", 4, 3});
+    result.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result.add(new Object[]{"FILTER_AND", 6, 5});
+    result.add(new Object[]{
+        "FILTER_JSON_INDEX(indexLookUp:json_index,operator:JSON_MATCH,predicate:json_match(jsonIndexCol1,'key=1'))",
+        7, 6
+    });
+    result.add(new Object[]{
+        "FILTER_TEXT_INDEX(indexLookUp:text_index,operator:TEXT_MATCH,predicate:text_match(textIndexCol1,'foo'))", 8, 6
+    });
+    check(query, new ResultTable(DATA_SCHEMA, result));
   }
 
   @Test
@@ -1297,14 +1385,15 @@ public void testSelectColumnsVariationsOfOrOperators() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.5')", 7, 6});
+    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.5')", 6, 5
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segment 1 matches both OR predicates so returns a FILTER_OR tree
@@ -1316,17 +1405,19 @@ public void testSelectColumnsVariationsOfOrOperators() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_OR", 7, 6});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.1')", 8, 7});
-    result2.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3"
-        + " = 'mickey')", 9, 7});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_OR", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 7, 6
+    });
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 8, 6
+    });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // An OR query that matches all predicates on all segments
@@ -1335,17 +1426,19 @@ public void testSelectColumnsVariationsOfOrOperators() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol2)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol2, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_OR", 7, 6});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '0.1')", 8, 7});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2"
-        + " = '2')", 9, 7});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_OR", 6, 5});
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '0.1')", 7, 6
+    });
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '2')", 8, 6
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // Segment 2 matches all on the 'pluto' predicate
@@ -1357,13 +1450,13 @@ public void testSelectColumnsVariationsOfOrOperators() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query4, new ResultTable(DATA_SCHEMA, result4));
   }
 
@@ -1377,28 +1470,29 @@ public void testSelectColumnsVariationsOfOrOperatorsVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.5')", 7, 6});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.5')", 6, 5
+    });
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_EMPTY", 6, 5});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segment 1 matches both OR predicates so returns a FILTER_OR tree
@@ -1409,32 +1503,35 @@ public void testSelectColumnsVariationsOfOrOperatorsVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.1')", 7, 6});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_OR", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 7, 6
+    });
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 8, 6
+    });
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_OR", 7, 6});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.1')", 8, 7});
-    result2.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3"
-        + " = 'mickey')", 9, 7});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 6, 5
+    });
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_EMPTY", 6, 5});
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // An OR query that matches all predicates on all segments
@@ -1443,17 +1540,19 @@ public void testSelectColumnsVariationsOfOrOperatorsVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol2)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol2, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_OR", 7, 6});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '0.1')", 8, 7});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2"
-        + " = '2')", 9, 7});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_OR", 6, 5});
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '0.1')", 7, 6
+    });
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '2')", 8, 6
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // Segment 2 matches all on the 'pluto' predicate
@@ -1464,20 +1563,20 @@ public void testSelectColumnsVariationsOfOrOperatorsVerbose() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_EMPTY", 6, 5});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query4, new ResultTable(DATA_SCHEMA, result4));
   }
 
@@ -1492,13 +1591,13 @@ public void testSelectColumnsVariationsOfAndOperators() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_EMPTY", 6, 5});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segment 1 has a match for both predicates so it return a FILTER_AND plan
@@ -1510,17 +1609,19 @@ public void testSelectColumnsVariationsOfAndOperators() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_AND", 7, 6});
-    result2.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3"
-        + " = 'mickey')", 8, 7});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.1')", 9, 7});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_AND", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 7, 6
+    });
+    result2.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 8, 6
+    });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // An AND query that matches all predicates on all segments
@@ -1529,17 +1630,19 @@ public void testSelectColumnsVariationsOfAndOperators() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol2)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol2, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_AND", 7, 6});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '0.1')", 8, 7});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2"
-        + " = '1')", 9, 7});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_AND", 6, 5});
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '0.1')", 7, 6
+    });
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 8, 6
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // Segment 2 matches all on the first predicate 'pluto' which is removed from the AND, and matches '8' for the
@@ -1551,14 +1654,15 @@ public void testSelectColumnsVariationsOfAndOperators() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:noIndexCol1 = '8')",
-        7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:noIndexCol1 = '8')", 6, 5
+    });
     check(query4, new ResultTable(DATA_SCHEMA, result4));
   }
 
@@ -1572,13 +1676,13 @@ public void testSelectColumnsVariationsOfAndOperatorsVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result1.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result1.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{"FILTER_EMPTY", 6, 5});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segment 1 has a match for both predicates so it return a FILTER_AND plan
@@ -1589,24 +1693,26 @@ public void testSelectColumnsVariationsOfAndOperatorsVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result2.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_AND", 7, 6});
-    result2.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3"
-        + " = 'mickey')", 8, 7});
-    result2.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '1.1')", 9, 7});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_AND", 6, 5});
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 7, 6
+    });
+    result2.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 8, 6
+    });
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol3)", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol3, noIndexCol1)", 4, 3});
-    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result2.add(new Object[]{"PROJECT(invertedIndexCol3, invertedIndexCol1, noIndexCol1)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_EMPTY", 6, 5});
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // An AND query that matches all predicates on all segments
@@ -1615,17 +1721,19 @@ public void testSelectColumnsVariationsOfAndOperatorsVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result3.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol1, invertedIndexCol2)", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol1, invertedIndexCol2, noIndexCol1)", 4, 3});
-    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_AND", 7, 6});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1"
-        + " = '0.1')", 8, 7});
-    result3.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2"
-        + " = '1')", 9, 7});
+    result3.add(new Object[]{"PROJECT(invertedIndexCol1, noIndexCol1, invertedIndexCol2)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_AND", 6, 5});
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '0.1')", 7, 6
+    });
+    result3.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 8, 6
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // Segment 2 matches all on the first predicate 'pluto' which is removed from the AND, and matches '8' for the
@@ -1636,16 +1744,18 @@ public void testSelectColumnsVariationsOfAndOperatorsVerbose() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:noIndexCol1, invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3, noIndexCol1)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:noIndexCol1 = '8')",
-        7, 6});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:noIndexCol1 = '8')", 6, 5
+    });
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"ALL_SEGMENTS_PRUNED_ON_SERVER", 3, 2});
     check(query4, new ResultTable(DATA_SCHEMA, result4));
   }
@@ -1688,10 +1798,9 @@ public void testSelectAggregate() {
     });
     result3.add(
         new Object[]{"AGGREGATE(aggregations:count(*), max(noIndexCol1), sum(noIndexCol2), avg(noIndexCol2))", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2)", 4, 3});
-    result3.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result3.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // All segment plans for this queries generate a plan using the MatchAllFilterOperator as it selects and aggregates
@@ -1705,8 +1814,8 @@ public void testSelectAggregate() {
         "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
     });
     result4.add(new Object[]{
-        "AGGREGATE(aggregations:sum(add(noIndexCol1,noIndexCol2)), min(add(div(noIndexCol1,"
-            + "noIndexCol2),noIndexCol3)))", 3, 2
+        "AGGREGATE(aggregations:sum(add(noIndexCol1,noIndexCol2)), "
+            + "min(add(div(noIndexCol1,noIndexCol2),noIndexCol3)))", 3, 2
     });
     result4.add(
         new Object[]{"TRANSFORM(add(div(noIndexCol1,noIndexCol2),noIndexCol3), add(noIndexCol1,noIndexCol2))", 4, 3});
@@ -1741,30 +1850,29 @@ public void testSelectAggregate() {
     List<Object[]> result7 = new ArrayList<>();
     result7.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result7.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result7.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result7.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result7.add(new Object[]{"AGGREGATE(aggregations:distinctAvg(rawCol1))", 3, 2});
-    result7.add(new Object[]{"TRANSFORM_PASSTHROUGH(rawCol1)", 4, 3});
-    result7.add(new Object[]{"PROJECT(rawCol1)", 5, 4});
-    result7.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result7.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result7.add(new Object[]{"PROJECT(rawCol1)", 4, 3});
+    result7.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result7.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query7, new ResultTable(DATA_SCHEMA, result7));
 
     String query8 = "EXPLAIN PLAN FOR SELECT DISTINCTAVGMV(mvRawCol1) FROM testTable";
     List<Object[]> result8 = new ArrayList<>();
     result8.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result8.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result8.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result8.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result8.add(new Object[]{"AGGREGATE(aggregations:distinctAvgMV(mvRawCol1))", 3, 2});
-    result8.add(new Object[]{"TRANSFORM_PASSTHROUGH(mvRawCol1)", 4, 3});
-    result8.add(new Object[]{"PROJECT(mvRawCol1)", 5, 4});
-    result8.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result8.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result8.add(new Object[]{"PROJECT(mvRawCol1)", 4, 3});
+    result8.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result8.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query8, new ResultTable(DATA_SCHEMA, result8));
   }
 
-
   @Test
   public void testSelectAggregateVerbose() {
     // All segment plans for this queries generate a plan using the MatchAllFilterOperator as it selects and aggregates
@@ -1773,8 +1881,9 @@ public void testSelectAggregateVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result1.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 4, 3});
     check(query1, new ResultTable(DATA_SCHEMA, result1));
@@ -1784,8 +1893,9 @@ public void testSelectAggregateVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"AGGREGATE_NO_SCAN", 3, 2});
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
@@ -1797,14 +1907,14 @@ public void testSelectAggregateVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result3.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(
         new Object[]{"AGGREGATE(aggregations:count(*), max(noIndexCol1), sum(noIndexCol2), avg(noIndexCol2))", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2)", 4, 3});
-    result3.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 7, 6});
+    result3.add(new Object[]{"PROJECT(noIndexCol2, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 6, 5});
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // All segment plans for this queries generate a plan using the MatchAllFilterOperator as it selects and aggregates
@@ -1814,10 +1924,13 @@ public void testSelectAggregateVerbose() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result4.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
-    result4.add(new Object[]{"AGGREGATE(aggregations:sum(add(noIndexCol1,noIndexCol2)), min(add(div(noIndexCol1,"
-        + "noIndexCol2),noIndexCol3)))", 3, 2});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
+    result4.add(new Object[]{
+        "AGGREGATE(aggregations:sum(add(noIndexCol1,noIndexCol2)), "
+            + "min(add(div(noIndexCol1,noIndexCol2),noIndexCol3)))", 3, 2
+    });
     result4.add(
         new Object[]{"TRANSFORM(add(div(noIndexCol1,noIndexCol2),noIndexCol3), add(noIndexCol1,noIndexCol2))", 4, 3});
     result4.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
@@ -1868,7 +1981,7 @@ public void testSelectAggregateUsingFilterGroupByVerbose() {
         "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
     });
     result1.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol2, aggregations:sum(add(noIndexCol1," + "noIndexCol2)), min(noIndexCol3))", 3, 2
+        "GROUP_BY(groupKeys:noIndexCol2, aggregations:sum(add(noIndexCol1,noIndexCol2)), min(noIndexCol3))", 3, 2
     });
     result1.add(new Object[]{"TRANSFORM(add(noIndexCol1,noIndexCol2), noIndexCol2, noIndexCol3)", 4, 3});
     result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
@@ -1887,11 +2000,13 @@ public void testSelectAggregateUsingFilterIndex() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
-    result1.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 "
-        + "= 'mickey')", 4, 3});
+    result1.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 4, 3
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segment 2 is pruned because 'mickey' is not within range (and all values in that segment are 'pluto')
@@ -1902,14 +2017,15 @@ public void testSelectAggregateUsingFilterIndex() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"AGGREGATE(aggregations:sum(noIndexCol2))", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol2)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol2)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result2.add(new Object[]{"PROJECT(noIndexCol2)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
     result2.add(new Object[]{
-        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = " + "'mickey')", 7, 6});
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 6, 5
+    });
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // None of the segments have a value of '20' for the noIndexCol1 so this part of the OR predicate is removed for
@@ -1922,16 +2038,16 @@ public void testSelectAggregateUsingFilterIndex() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result3.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(
         new Object[]{"AGGREGATE(aggregations:count(*), max(noIndexCol1), sum(noIndexCol2), avg(noIndexCol3))", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result3.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result3.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
     result3.add(new Object[]{
-        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1"
-            + ".1')", 7, 6});
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 6, 5
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // Use a Transform function in filter on an indexed column.
@@ -1943,43 +2059,46 @@ public void testSelectAggregateUsingFilterIndex() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_OR", 7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_OR", 6, 5});
     result4.add(new Object[]{
-        "FILTER_EXPRESSION(operator:EQ,predicate:concat(invertedIndexCol3,'test','-') = " + "'mickey-test')", 8, 7});
-    result4.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,"
-        + "predicate:invertedIndexCol1 = '1.1')", 9, 7});
+        "FILTER_EXPRESSION(operator:EQ,predicate:concat(invertedIndexCol3,'test','-') = 'mickey-test')", 7, 6
+    });
+    result4.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 8, 6
+    });
     check(query4, new ResultTable(DATA_SCHEMA, result4));
 
     // Segments 1, 2, 4 have an EmptyFilterOperator plan for this query as '1.5' is within the min-max range but
     // doesn't exist as a value in any row
     // Segment 3 contains a row with the value as '1.5' so a FILTERED_INVERTED_INDEX is returned for 1 segment
-    String query5 =
-        "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol1 = 1.5 LIMIT 100";
+    String query5 = "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol1 = 1.5 LIMIT 100";
     List<Object[]> result5 = new ArrayList<>();
     result5.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result5.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result5.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result5.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result5.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
-    result5.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:"
-        + "invertedIndexCol1 = '1.5')", 4, 3});
+    result5.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.5')", 4, 3
+    });
     check(query5, new ResultTable(DATA_SCHEMA, result5));
 
     // All segments have a EmptyFilterOperator plan for this query as '1.7' is within the min-max range but doesn't
     // exist as a value in any row
-    String query6 =
-        "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol1 = 1.7 LIMIT 100";
+    String query6 = "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol1 = 1.7 LIMIT 100";
     List<Object[]> result6 = new ArrayList<>();
     result6.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result6.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result6.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result6.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result6.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result6.add(new Object[]{"FILTER_EMPTY", 4, 3});
     check(query6, new ResultTable(DATA_SCHEMA, result6));
@@ -1989,13 +2108,13 @@ public void testSelectAggregateUsingFilterIndex() {
     // Segment 4 has an EmptyFilterOperator plan as 'pluto' doesn't exist but is within the value ranges
     // Only the MatchAllOperator plan is returned as it has higher precedence than no matching segment and verbose is
     // disabled
-    String query7 =
-        "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol3 = 'pluto' LIMIT 100";
+    String query7 = "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol3 = 'pluto' LIMIT 100";
     List<Object[]> result7 = new ArrayList<>();
     result7.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result7.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result7.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result7.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result7.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result7.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 4, 3});
     check(query7, new ResultTable(DATA_SCHEMA, result7));
@@ -2004,13 +2123,13 @@ public void testSelectAggregateUsingFilterIndex() {
     // The other segments are pruned as '2' is less than the min for these segments
     // Only the EmptyFilterOperator plan is returned as it has higher precedence than no matching segment and verbose
     // is disabled
-    String query8 =
-        "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE noIndexCol1 = 2 LIMIT 100";
+    String query8 = "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE noIndexCol1 = 2 LIMIT 100";
     List<Object[]> result8 = new ArrayList<>();
     result8.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result8.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result8.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result8.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result8.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result8.add(new Object[]{"FILTER_EMPTY", 4, 3});
     check(query8, new ResultTable(DATA_SCHEMA, result8));
@@ -2021,18 +2140,18 @@ public void testSelectAggregateUsingFilterIndex() {
     // Segment 4 has an EmptyFilterOperator plan as neither 'minnie' nor 'pluto' exists but are within the value ranges
     // Only the FILTERED_SORTED_COUNT plan is returned as it has higher precedence than the others and verbose is
     // disabled
-    String query9 =
-        "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol3 = 'pluto' OR "
-            + "invertedIndexCol3 = 'minnie' LIMIT 100";
+    String query9 = "EXPLAIN PLAN FOR SELECT count(*) FROM testTable WHERE invertedIndexCol3 = 'pluto' OR "
+        + "invertedIndexCol3 = 'minnie' LIMIT 100";
     List<Object[]> result9 = new ArrayList<>();
     result9.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result9.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result9.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result9.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result9.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
-    result9.add(
-        new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'minnie')",
-            4, 3});
+    result9.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'minnie')", 4, 3
+    });
     check(query9, new ResultTable(DATA_SCHEMA, result9));
 
     // All segments are pruned
@@ -2040,8 +2159,9 @@ public void testSelectAggregateUsingFilterIndex() {
         + "noIndexCol1 = 100 LIMIT 100";
     List<Object[]> result10 = new ArrayList<>();
     result10.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
-    result10.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result10.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result10.add(new Object[]{"ALL_SEGMENTS_PRUNED_ON_SERVER", 2, 1});
     check(query10, new ResultTable(DATA_SCHEMA, result10));
   }
@@ -2056,15 +2176,18 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result1.add(new Object[]{"FILTER_EMPTY", 4, 3});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result1.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
-    result1.add(new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 "
-        + "= 'mickey')", 4, 3});
+    result1.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 4, 3
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
 
     // Segment 2 is pruned because 'mickey' is not within range (and all values in that segment are 'pluto')
@@ -2075,21 +2198,22 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result2 = new ArrayList<>();
     result2.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result2.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result2.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"AGGREGATE(aggregations:sum(noIndexCol2))", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol2)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol2)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result2.add(new Object[]{"PROJECT(noIndexCol2)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'mickey')", 6, 5
+    });
     result2.add(new Object[]{
-        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = " + "'mickey')", 7, 6});
-    result2.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result2.add(new Object[]{"AGGREGATE(aggregations:sum(noIndexCol2))", 3, 2});
-    result2.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol2)", 4, 3});
-    result2.add(new Object[]{"PROJECT(noIndexCol2)", 5, 4});
-    result2.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result2.add(new Object[]{"FILTER_EMPTY", 7, 6});
+    result2.add(new Object[]{"PROJECT(noIndexCol2)", 4, 3});
+    result2.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result2.add(new Object[]{"FILTER_EMPTY", 6, 5});
     check(query2, new ResultTable(DATA_SCHEMA, result2));
 
     // None of the segments have a value of '20' for the noIndexCol1 so this part of the OR predicate is removed for
@@ -2101,24 +2225,24 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result3 = new ArrayList<>();
     result3.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result3.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(
         new Object[]{"AGGREGATE(aggregations:count(*), max(noIndexCol1), sum(noIndexCol2), avg(noIndexCol3))", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result3.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result3.add(new Object[]{"FILTER_EMPTY", 7, 6});
-    result3.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result3.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result3.add(new Object[]{"FILTER_EMPTY", 6, 5});
+    result3.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result3.add(
         new Object[]{"AGGREGATE(aggregations:count(*), max(noIndexCol1), sum(noIndexCol2), avg(noIndexCol3))", 3, 2});
-    result3.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result3.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result3.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result3.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result3.add(new Object[]{"DOC_ID_SET", 5, 4});
     result3.add(new Object[]{
-        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1"
-            + ".1')", 7, 6});
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 6, 5
+    });
     check(query3, new ResultTable(DATA_SCHEMA, result3));
 
     // Use a Transform function in filter on an indexed column.
@@ -2129,25 +2253,28 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result4 = new ArrayList<>();
     result4.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result4.add(new Object[]{"COMBINE_SELECT", 2, 1});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result4.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{
+        "FILTER_EXPRESSION(operator:EQ,predicate:concat(invertedIndexCol3,'test','-') = 'mickey-test')", 6, 5
+    });
     result4.add(new Object[]{
-        "FILTER_EXPRESSION(operator:EQ,predicate:concat(invertedIndexCol3,'test','-') = " + "'mickey-test')", 7, 6});
-    result4.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result4.add(new Object[]{"SELECT(selectList:invertedIndexCol3)", 3, 2});
-    result4.add(new Object[]{"TRANSFORM_PASSTHROUGH(invertedIndexCol3)", 4, 3});
-    result4.add(new Object[]{"PROJECT(invertedIndexCol3)", 5, 4});
-    result4.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result4.add(new Object[]{"FILTER_OR", 7, 6});
+    result4.add(new Object[]{"PROJECT(invertedIndexCol3)", 4, 3});
+    result4.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result4.add(new Object[]{"FILTER_OR", 6, 5});
+    result4.add(new Object[]{
+        "FILTER_EXPRESSION(operator:EQ,predicate:concat(invertedIndexCol3,'test','-') = 'mickey-test')", 7, 6
+    });
     result4.add(new Object[]{
-        "FILTER_EXPRESSION(operator:EQ,predicate:concat(invertedIndexCol3,'test','-') = " + "'mickey-test')", 8, 7});
-    result4.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,"
-        + "predicate:invertedIndexCol1 = '1.1')", 9, 7});
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.1')", 8, 6
+    });
     check(query4, new ResultTable(DATA_SCHEMA, result4));
 
     // Segments 1, 2, 4 have an EmptyFilterOperator plan for this query as '1.5' is within the min-max range but
@@ -2159,15 +2286,18 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result5 = new ArrayList<>();
     result5.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result5.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result5.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result5.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:3)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result5.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result5.add(new Object[]{"FILTER_EMPTY", 4, 3});
-    result5.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result5.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result5.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
-    result5.add(new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:"
-        + "invertedIndexCol1 = '1.5')", 4, 3});
+    result5.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol1 = '1.5')", 4, 3
+    });
     check(query5, new ResultTable(DATA_SCHEMA, result5));
 
     // All segments have a EmptyFilterOperator plan for this query as '1.7' is within the min-max range but doesn't
@@ -2178,8 +2308,9 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result6 = new ArrayList<>();
     result6.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result6.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result6.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result6.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result6.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result6.add(new Object[]{"FILTER_EMPTY", 4, 3});
     check(query6, new ResultTable(DATA_SCHEMA, result6));
@@ -2193,12 +2324,14 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result7 = new ArrayList<>();
     result7.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result7.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result7.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result7.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result7.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result7.add(new Object[]{"FILTER_EMPTY", 4, 3});
-    result7.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result7.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result7.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result7.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 4, 3});
     check(query7, new ResultTable(DATA_SCHEMA, result7));
@@ -2210,12 +2343,14 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result8 = new ArrayList<>();
     result8.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result8.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result8.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result8.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result8.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result8.add(new Object[]{"FILTER_EMPTY", 4, 3});
-    result8.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result8.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:2)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result8.add(new Object[]{"ALL_SEGMENTS_PRUNED_ON_SERVER", 3, 2});
     check(query8, new ResultTable(DATA_SCHEMA, result8));
 
@@ -2229,18 +2364,21 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
     List<Object[]> result9 = new ArrayList<>();
     result9.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
     result9.add(new Object[]{"COMBINE_AGGREGATE", 2, 1});
-    result9.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result9.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result9.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
-    result9.add(
-        new Object[]{"FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'minnie')",
-            4, 3});
-    result9.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result9.add(new Object[]{
+        "FILTER_SORTED_INDEX(indexLookUp:sorted_index,operator:EQ,predicate:invertedIndexCol3 = 'minnie')", 4, 3
+    });
+    result9.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result9.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result9.add(new Object[]{"FILTER_EMPTY", 4, 3});
-    result9.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result9.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:1)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result9.add(new Object[]{"FAST_FILTERED_COUNT", 3, 2});
     result9.add(new Object[]{"FILTER_MATCH_ENTIRE_SEGMENT(docs:3)", 4, 3});
     check(query9, new ResultTable(DATA_SCHEMA, result9));
@@ -2250,8 +2388,9 @@ public void testSelectAggregateUsingFilterIndexVerbose() {
         + "invertedIndexCol3 = 'roadrunner' AND noIndexCol1 = 100 LIMIT 100";
     List<Object[]> result10 = new ArrayList<>();
     result10.add(new Object[]{"BROKER_REDUCE(limit:100)", 1, 0});
-    result10.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
+    result10.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
     result10.add(new Object[]{"ALL_SEGMENTS_PRUNED_ON_SERVER", 2, 1});
     check(query10, new ResultTable(DATA_SCHEMA, result10));
   }
@@ -2264,17 +2403,17 @@ public void testSelectAggregateUsingFilterIndexGroupBy() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_GROUP_BY", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
     result1.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol1, aggregations:max(noIndexCol2), min(noIndexCol3)"
-            + ")", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(
-        new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')",
-            7, 6});
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
+    result1.add(new Object[]{
+        "GROUP_BY(groupKeys:noIndexCol1, aggregations:max(noIndexCol2), min(noIndexCol3))", 3, 2
+    });
+    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 6, 5
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
   }
 
@@ -2286,17 +2425,17 @@ public void testSelectAggregateUsingFilterIndexGroupByVerbose() {
     List<Object[]> result1 = new ArrayList<>();
     result1.add(new Object[]{"BROKER_REDUCE(limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_GROUP_BY", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
     result1.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol1, aggregations:max(noIndexCol2), min(noIndexCol3)"
-            + ")", 3, 2});
-    result1.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result1.add(new Object[]{"DOC_ID_SET", 6, 5});
-    result1.add(
-        new Object[]{"FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')",
-            7, 6});
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
+    result1.add(new Object[]{
+        "GROUP_BY(groupKeys:noIndexCol1, aggregations:max(noIndexCol2), min(noIndexCol3))", 3, 2
+    });
+    result1.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result1.add(new Object[]{"DOC_ID_SET", 5, 4});
+    result1.add(new Object[]{
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 6, 5
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
   }
 
@@ -2311,16 +2450,19 @@ public void testSelectAggregateUsingFilterIndexGroupByOrderBy() {
     result1.add(
         new Object[]{"BROKER_REDUCE(sort:[noIndexCol1 ASC, concat(invertedIndexCol3,'test','-') ASC],limit:10)", 1, 0});
     result1.add(new Object[]{"COMBINE_GROUP_BY", 2, 1});
-    result1.add(new Object[]{"PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS,
-        ExplainPlanRows.PLAN_START_IDS});
-    result1.add(new Object[]{"GROUP_BY(groupKeys:noIndexCol1, concat(invertedIndexCol3,'test','-'), "
-        + "aggregations:count(*))", 3, 2});
+    result1.add(new Object[]{
+        "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
+    });
+    result1.add(new Object[]{
+        "GROUP_BY(groupKeys:noIndexCol1, concat(invertedIndexCol3,'test','-'), aggregations:count(*))", 3, 2
+    });
     result1.add(new Object[]{"TRANSFORM(concat(invertedIndexCol3,'test','-'), noIndexCol1)", 4, 3});
     result1.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
     result1.add(new Object[]{"DOC_ID_SET", 6, 5});
     result1.add(new Object[]{
         "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:NOT_EQ,predicate:invertedIndexCol2 !="
-            + " '1')", 7, 6});
+            + " '1')", 7, 6
+    });
     check(query1, new ResultTable(DATA_SCHEMA, result1));
   }
 
@@ -2339,7 +2481,7 @@ public void testSelectAggregateUsingFilterIndexGroupByOrderByVerbose() {
         "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
     });
     result1.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol1, concat(invertedIndexCol3,'test','-'), " + "aggregations:count(*))", 3, 2
+        "GROUP_BY(groupKeys:noIndexCol1, concat(invertedIndexCol3,'test','-'), aggregations:count(*))", 3, 2
     });
     result1.add(new Object[]{"TRANSFORM(concat(invertedIndexCol3,'test','-'), noIndexCol1)", 4, 3});
     result1.add(new Object[]{"PROJECT(invertedIndexCol3, noIndexCol1)", 5, 4});
@@ -2365,11 +2507,10 @@ public void testSelectAggregateUsingFilterIndexGroupByHaving() {
     result.add(new Object[]{
         "GROUP_BY(groupKeys:noIndexCol3, aggregations:max(noIndexCol1), min(noIndexCol2))", 3, 2
     });
-    result.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result.add(new Object[]{"DOC_ID_SET", 5, 4});
     result.add(new Object[]{
-        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 7, 6
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 6, 5
     });
     check(query, new ResultTable(DATA_SCHEMA, result));
   }
@@ -2388,13 +2529,12 @@ public void testSelectAggregateUsingFilterIndexGroupByHavingVerbose() {
         "PLAN_START(numSegmentsForThisPlan:4)", ExplainPlanRows.PLAN_START_IDS, ExplainPlanRows.PLAN_START_IDS
     });
     result.add(new Object[]{
-        "GROUP_BY(groupKeys:noIndexCol3, aggregations:max(noIndexCol1), min(noIndexCol2)" + ")", 3, 2
+        "GROUP_BY(groupKeys:noIndexCol3, aggregations:max(noIndexCol1), min(noIndexCol2))", 3, 2
     });
-    result.add(new Object[]{"TRANSFORM_PASSTHROUGH(noIndexCol1, noIndexCol2, noIndexCol3)", 4, 3});
-    result.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 5, 4});
-    result.add(new Object[]{"DOC_ID_SET", 6, 5});
+    result.add(new Object[]{"PROJECT(noIndexCol3, noIndexCol2, noIndexCol1)", 4, 3});
+    result.add(new Object[]{"DOC_ID_SET", 5, 4});
     result.add(new Object[]{
-        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 7, 6
+        "FILTER_INVERTED_INDEX(indexLookUp:inverted_index,operator:EQ,predicate:invertedIndexCol2 = '1')", 6, 5
     });
     check(query, new ResultTable(DATA_SCHEMA, result));
   }
@@ -2403,6 +2543,7 @@ public void testSelectAggregateUsingFilterIndexGroupByHavingVerbose() {
   public void tearDown() {
     _brokerReduceService.shutDown();
     _queryExecutor.shutDown();
+    _queryExecutorWithPrefetchEnabled.shutDown();
     for (IndexSegment segment : _indexSegments) {
       segment.destroy();
     }
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/FastHllQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/FastHllQueriesTest.java
index b817adb2814..f2f1370c5b3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/FastHllQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/FastHllQueriesTest.java
@@ -193,8 +193,6 @@ private void buildAndLoadSegment()
     segmentGeneratorConfig.setInputFilePath(filePath);
     segmentGeneratorConfig.setTableName("testTable");
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(
-        Arrays.asList("column6", "column7", "column11", "column17", "column18"));
 
     // Build the index segment
     SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/FilteredAggregationsTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/FilteredAggregationsTest.java
index 2ea664ec67a..d3636e4fc9a 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/FilteredAggregationsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/FilteredAggregationsTest.java
@@ -94,6 +94,7 @@ public void setUp()
     invertedIndexCols.add(INT_COL_NAME);
 
     indexLoadingConfig.setInvertedIndexColumns(invertedIndexCols);
+    indexLoadingConfig.setRangeIndexColumns(invertedIndexCols);
     ImmutableSegment firstImmutableSegment =
         ImmutableSegmentLoader.load(new File(INDEX_DIR, FIRST_SEGMENT_NAME), indexLoadingConfig);
     ImmutableSegment secondImmutableSegment =
@@ -446,4 +447,30 @@ public void testGroupBySameFilterOrderByFiltered() {
             + "ORDER BY testAvg";
     testQuery(filterQuery, nonFilterQuery);
   }
+
+  @Test
+  public void testSameNumScannedFilteredAggMatchAll() {
+    // For a single filtered aggregation, the same number of docs should be scanned regardless of which portions of
+    // the filter are in the filter expression Vs. the main predicate i.e. the applied filters are commutative.
+    String filterQuery =
+        "SELECT SUM(INT_COL) FILTER(WHERE INT_COL > 25000) testSum FROM MyTable";
+    String nonFilterQuery =
+        "SELECT SUM(INT_COL) testSum FROM MyTable WHERE INT_COL > 25000";
+    long filterQueryDocsScanned = getBrokerResponse(filterQuery).getNumDocsScanned();
+    long nonFilterQueryDocsScanned = getBrokerResponse(nonFilterQuery).getNumDocsScanned();
+    assertEquals(filterQueryDocsScanned, nonFilterQueryDocsScanned);
+  }
+
+  @Test
+  public void testSameNumScannedFilteredAgg() {
+    // For a single filtered aggregation, the same number of docs should be scanned regardless of which portions of
+    // the filter are in the filter expression Vs. the main predicate i.e. the applied filters are commutative.
+    String filterQuery =
+        "SELECT SUM(INT_COL) FILTER(WHERE INT_COL > 25000) testSum FROM MyTable WHERE INT_COL < 1000000";
+    String nonFilterQuery =
+        "SELECT SUM(INT_COL) testSum FROM MyTable WHERE INT_COL > 25000 AND INT_COL < 1000000";
+    long filterQueryDocsScanned = getBrokerResponse(filterQuery).getNumDocsScanned();
+    long nonFilterQueryDocsScanned = getBrokerResponse(nonFilterQuery).getNumDocsScanned();
+    assertEquals(filterQueryDocsScanned, nonFilterQueryDocsScanned);
+  }
 }
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesTest.java
index f51bb8e60e4..c98ad77f385 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesTest.java
@@ -39,7 +39,10 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -154,9 +157,10 @@ private void createSegment(String filePath, String segmentName, Schema schema)
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
     segmentGeneratorConfig.setSegmentName(segmentName);
     _invertedIndexColumns = Arrays.asList("column3", "column6", "column7", "column8", "column9");
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(_invertedIndexColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, _invertedIndexColumns);
     _forwardIndexDisabledColumns = new ArrayList<>(Arrays.asList("column6", "column7"));
-    segmentGeneratorConfig.setForwardIndexDisabledColumns(_forwardIndexDisabledColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.forward(), ForwardIndexConfig.DISABLED,
+        _forwardIndexDisabledColumns);
     // The segment generation code in SegmentColumnarIndexCreator will throw
     // exception if start and end time in time column are not in acceptable
     // range. For this test, we first need to fix the input avro data
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesWithReloadTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesWithReloadTest.java
index 0181575637f..242e8194ce5 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesWithReloadTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledMultiValueQueriesWithReloadTest.java
@@ -40,7 +40,10 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -153,9 +156,10 @@ private void createSegment(String filePath, String segmentName)
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
     segmentGeneratorConfig.setSegmentName(segmentName);
     _invertedIndexColumns = Arrays.asList("column3", "column6", "column8", "column9");
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(_invertedIndexColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, _invertedIndexColumns);
     _forwardIndexDisabledColumns = new ArrayList<>(Arrays.asList("column6"));
-    segmentGeneratorConfig.setForwardIndexDisabledColumns(_forwardIndexDisabledColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.forward(), ForwardIndexConfig.DISABLED,
+        _forwardIndexDisabledColumns);
     segmentGeneratorConfig.setRawIndexCreationColumns(_noDictionaryColumns);
     // The segment generation code in SegmentColumnarIndexCreator will throw
     // exception if start and end time in time column are not in acceptable
@@ -754,7 +758,7 @@ private void disableForwardIndexForSomeColumns()
     Set<String> forwardIndexDisabledColumns = new HashSet<>(_forwardIndexDisabledColumns);
     forwardIndexDisabledColumns.add("column7");
     indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    indexLoadingConfig.getNoDictionaryColumns().remove("column7");
+    indexLoadingConfig.removeNoDictionaryColumns("column7");
     indexLoadingConfig.setReadMode(ReadMode.heap);
 
     // Reload the segments to pick up the new configs
@@ -785,7 +789,7 @@ private void reenableForwardIndexForSomeColumns()
     Set<String> forwardIndexDisabledColumns = new HashSet<>(_forwardIndexDisabledColumns);
     forwardIndexDisabledColumns.remove("column6");
     indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    indexLoadingConfig.getNoDictionaryColumns().add("column7");
+    indexLoadingConfig.addNoDictionaryColumns("column7");
     indexLoadingConfig.setReadMode(ReadMode.heap);
 
     // Reload the segments to pick up the new configs
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledSingleValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledSingleValueQueriesTest.java
index 51718d06e7e..39be6b5e2a1 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledSingleValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexDisabledSingleValueQueriesTest.java
@@ -40,7 +40,11 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -168,12 +172,14 @@ private void createSegment(String filePath, String segmentName)
     // is explicitly disabled
     segmentGeneratorConfig.setSkipTimeValueCheck(true);
     _invertedIndexColumns = Arrays.asList("column6", "column7", "column11", "column17", "column18");
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(_invertedIndexColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, _invertedIndexColumns);
     segmentGeneratorConfig.setRawIndexCreationColumns(_noDictionaryColumns);
 
     _forwardIndexDisabledColumns = new ArrayList<>(Arrays.asList("column6", "column7"));
-    segmentGeneratorConfig.setForwardIndexDisabledColumns(_forwardIndexDisabledColumns);
-    segmentGeneratorConfig.setRangeIndexCreationColumns(Arrays.asList("column6"));
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.forward(), ForwardIndexConfig.DISABLED,
+        _forwardIndexDisabledColumns);
+    RangeIndexConfig rangeIndexConfig = RangeIndexConfig.DEFAULT;
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.range(), rangeIndexConfig, "column6");
 
     // Build the index segment.
     SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
@@ -1937,7 +1943,7 @@ private void disableForwardIndexForSomeColumns()
     forwardIndexDisabledColumns.add("column11");
     indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
     indexLoadingConfig.setRangeIndexColumns(new HashSet<>(Arrays.asList("column6", "column9")));
-    indexLoadingConfig.getNoDictionaryColumns().remove("column9");
+    indexLoadingConfig.removeNoDictionaryColumns("column9");
     indexLoadingConfig.setReadMode(ReadMode.heap);
 
     // Reload the segments to pick up the new configs
@@ -1977,7 +1983,7 @@ private void reenableForwardIndexForSomeColumns()
     forwardIndexDisabledColumns.remove("column6");
     indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
     indexLoadingConfig.setRangeIndexColumns(new HashSet<>(Collections.singletonList("column6")));
-    indexLoadingConfig.getNoDictionaryColumns().add("column9");
+    indexLoadingConfig.addNoDictionaryColumns("column9");
     indexLoadingConfig.setReadMode(ReadMode.heap);
 
     // Reload the segments to pick up the new configs
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexHandlerReloadQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexHandlerReloadQueriesTest.java
index 297282e09c3..084e865cdfc 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexHandlerReloadQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ForwardIndexHandlerReloadQueriesTest.java
@@ -40,7 +40,10 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -185,9 +188,10 @@ private void createSegment(String filePath, String segmentName)
     segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
     segmentGeneratorConfig.setSegmentName(segmentName);
     _invertedIndexColumns = Arrays.asList("column8", "column9");
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(_invertedIndexColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, _invertedIndexColumns);
     segmentGeneratorConfig.setRawIndexCreationColumns(_noDictionaryColumns);
-    segmentGeneratorConfig.setRangeIndexCreationColumns(_rangeIndexColumns);
+    RangeIndexConfig config = RangeIndexConfig.DEFAULT;
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.range(), config, _rangeIndexColumns);
     // The segment generation code in SegmentColumnarIndexCreator will throw
     // exception if start and end time in time column are not in acceptable
     // range. For this test, we first need to fix the input avro data
@@ -744,15 +748,15 @@ private void changePropertiesAndReloadSegment()
     invertedIndexEnabledColumns.add("column2");
     invertedIndexEnabledColumns.add("column7");
     indexLoadingConfig.setInvertedIndexColumns(invertedIndexEnabledColumns);
-    indexLoadingConfig.getInvertedIndexColumns().remove("column9");
+    indexLoadingConfig.removeInvertedIndexColumns("column9");
     Set<String> noDictionaryColumns = new HashSet<>(_noDictionaryColumns);
     indexLoadingConfig.setNoDictionaryColumns(noDictionaryColumns);
-    indexLoadingConfig.getNoDictionaryColumns().remove("column2");
-    indexLoadingConfig.getNoDictionaryColumns().remove("column3");
-    indexLoadingConfig.getNoDictionaryColumns().remove("column7");
-    indexLoadingConfig.getNoDictionaryColumns().remove("column10");
-    indexLoadingConfig.getNoDictionaryColumns().add("column6");
-    indexLoadingConfig.getNoDictionaryColumns().add("column9");
+    indexLoadingConfig.removeNoDictionaryColumns("column2");
+    indexLoadingConfig.removeNoDictionaryColumns("column3");
+    indexLoadingConfig.removeNoDictionaryColumns("column7");
+    indexLoadingConfig.removeNoDictionaryColumns("column10");
+    indexLoadingConfig.addNoDictionaryColumns("column6");
+    indexLoadingConfig.addNoDictionaryColumns("column9");
     Set<String> rangeIndexColumns = new HashSet<>(_rangeIndexColumns);
     indexLoadingConfig.setRangeIndexColumns(rangeIndexColumns);
     indexLoadingConfig.setReadMode(ReadMode.heap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/FunnelCountQueriesNonSortedTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/FunnelCountQueriesNonSortedTest.java
new file mode 100644
index 00000000000..c89a5d74c95
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/FunnelCountQueriesNonSortedTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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.pinot.queries;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.pinot.segment.local.indexsegment.mutable.MutableSegmentImplTestUtils;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.MutableSegment;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+
+
+/**
+ * Queries test for FUNNEL_COUNT queries.
+ */
+@SuppressWarnings("rawtypes")
+public class FunnelCountQueriesNonSortedTest extends BaseFunnelCountQueriesTest {
+
+  @Override
+  protected int getExpectedNumEntriesScannedInFilter() {
+    return NUM_RECORDS;
+  }
+
+  @Override
+  protected TableConfig getTableConfig() {
+    return TABLE_CONFIG_BUILDER.build();
+  }
+
+  @Override
+  protected IndexSegment buildSegment(List<GenericRow> records)
+      throws Exception {
+    MutableSegment mutableSegment = MutableSegmentImplTestUtils
+        .createMutableSegmentImpl(SCHEMA, Collections.emptySet(), Collections.emptySet(), Collections.emptySet(),
+            false);
+    for (GenericRow record : records) {
+      mutableSegment.index(record, null);
+    }
+    return mutableSegment;
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/FunnelCountQueriesSortedTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/FunnelCountQueriesSortedTest.java
new file mode 100644
index 00000000000..f06fe26637e
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/FunnelCountQueriesSortedTest.java
@@ -0,0 +1,65 @@
+/**
+ * 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.pinot.queries;
+
+import java.io.File;
+import java.util.Comparator;
+import java.util.List;
+import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.utils.ReadMode;
+
+
+/**
+ * Queries test for FUNNEL_COUNT queries using sorted strategy.
+ */
+@SuppressWarnings("rawtypes")
+public class FunnelCountQueriesSortedTest extends BaseFunnelCountQueriesTest {
+
+  @Override
+  protected int getExpectedNumEntriesScannedInFilter() {
+    return 0;
+  }
+
+  @Override
+  protected TableConfig getTableConfig() {
+    return TABLE_CONFIG_BUILDER.setSortedColumn(ID_COLUMN).build();
+  }
+
+  @Override
+  protected IndexSegment buildSegment(List<GenericRow> records)
+      throws Exception {
+    // Simulate PinotSegmentSorter
+    records.sort(Comparator.comparingInt(rec -> (Integer) rec.getValue(ID_COLUMN)));
+
+    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(getTableConfig(), SCHEMA);
+    segmentGeneratorConfig.setTableName(RAW_TABLE_NAME);
+    segmentGeneratorConfig.setSegmentName(SEGMENT_NAME);
+    segmentGeneratorConfig.setOutDir(INDEX_DIR.getPath());
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    driver.init(segmentGeneratorConfig, new GenericRowRecordReader(records));
+    driver.build();
+    return ImmutableSegmentLoader.load(new File(INDEX_DIR, SEGMENT_NAME), ReadMode.mmap);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentAggregationSingleValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentAggregationSingleValueQueriesTest.java
index 8d0e187521a..dbf9565f67c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentAggregationSingleValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentAggregationSingleValueQueriesTest.java
@@ -66,8 +66,8 @@ public void testFilteredAggregations() {
         + "FROM testTable WHERE column3 > 0";
     FilteredAggregationOperator aggregationOperator = getOperator(query);
     AggregationResultsBlock resultsBlock = aggregationOperator.nextBlock();
-    QueriesTestUtils.testInnerSegmentExecutionStatistics(aggregationOperator.getExecutionStatistics(), 180000L, 0L,
-        540000L, 30000L);
+    QueriesTestUtils.testInnerSegmentExecutionStatistics(aggregationOperator.getExecutionStatistics(), 150000L, 0L,
+        120000L, 30000L);
     QueriesTestUtils.testInnerSegmentAggregationResult(resultsBlock.getResults(), 22266008882250L, 30000, 2147419555,
         32289159189150L, 28175373944314L, 30000L);
 
@@ -76,8 +76,8 @@ public void testFilteredAggregations() {
         + "FROM testTable";
     aggregationOperator = getOperator(query);
     resultsBlock = aggregationOperator.nextBlock();
-    QueriesTestUtils.testInnerSegmentExecutionStatistics(aggregationOperator.getExecutionStatistics(), 180000L, 0L,
-        540000L, 30000L);
+    QueriesTestUtils.testInnerSegmentExecutionStatistics(aggregationOperator.getExecutionStatistics(), 150000L, 0L,
+        120000L, 30000L);
     QueriesTestUtils.testInnerSegmentAggregationResult(resultsBlock.getResults(), 22266008882250L, 30000, 2147419555,
         32289159189150L, 28175373944314L, 30000L);
 
@@ -86,8 +86,8 @@ public void testFilteredAggregations() {
         + "SUM(column3), AVG(column7) FILTER(WHERE column7 > 0 AND column7 < 100) FROM testTable";
     aggregationOperator = getOperator(query);
     resultsBlock = aggregationOperator.nextBlock();
-    QueriesTestUtils.testInnerSegmentExecutionStatistics(aggregationOperator.getExecutionStatistics(), 150000L, 0L,
-        450000L, 30000L);
+    QueriesTestUtils.testInnerSegmentExecutionStatistics(aggregationOperator.getExecutionStatistics(), 120000L, 0L,
+        90000L, 30000L);
     QueriesTestUtils.testInnerSegmentAggregationResult(resultsBlock.getResults(), 22266008882250L, 30000, 2147419555,
         32289159189150L, 0L, 0L);
   }
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueQueriesTest.java
index 876baf7a986..a2c62d888d3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueQueriesTest.java
@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.PriorityQueue;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.operator.BaseOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
@@ -175,7 +174,7 @@ public void testSelectionOnly() {
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), DataSchema.ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")),
         DataSchema.ColumnDataType.INT_ARRAY);
-    selectionResult = (List<Object[]>) resultsBlock.getRows();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
     firstRow = selectionResult.get(0);
     assertEquals(firstRow.length, 3);
@@ -203,9 +202,9 @@ public void testSelectionOrderBy() {
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), DataSchema.ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")),
         DataSchema.ColumnDataType.INT_ARRAY);
-    PriorityQueue<Object[]> selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 4);
     assertEquals((String) lastRow[columnIndexMap.get("column5")], "AKXcXcIqsqOJFsdwxZ");
     assertEquals(lastRow[columnIndexMap.get("column6")], new int[]{1252});
@@ -228,9 +227,9 @@ public void testSelectionOrderBy() {
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), DataSchema.ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")),
         DataSchema.ColumnDataType.INT_ARRAY);
-    selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 4);
     assertEquals((String) lastRow[columnIndexMap.get("column5")], "AKXcXcIqsqOJFsdwxZ");
     assertEquals(lastRow[columnIndexMap.get("column6")], new int[]{2147483647});
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueRawQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueRawQueriesTest.java
index 9e3abdc9291..c28e8d9d9a8 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueRawQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionMultiValueRawQueriesTest.java
@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.PriorityQueue;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.operator.BaseOperator;
 import org.apache.pinot.core.operator.ExecutionStatistics;
@@ -203,9 +202,9 @@ public void testSelectionOrderBy() {
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), DataSchema.ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")),
         DataSchema.ColumnDataType.INT_ARRAY);
-    PriorityQueue<Object[]> selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 4);
     assertEquals((String) lastRow[columnIndexMap.get("column5")], "AKXcXcIqsqOJFsdwxZ");
     assertEquals(lastRow[columnIndexMap.get("column6")], new int[]{1252});
@@ -228,9 +227,9 @@ public void testSelectionOrderBy() {
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), DataSchema.ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")),
         DataSchema.ColumnDataType.INT_ARRAY);
-    selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 4);
     assertEquals((String) lastRow[columnIndexMap.get("column5")], "AKXcXcIqsqOJFsdwxZ");
     assertEquals(lastRow[columnIndexMap.get("column6")], new int[]{2147483647});
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionSingleValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionSingleValueQueriesTest.java
index 9506bcbb9f9..92d24fc72c0 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionSingleValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InnerSegmentSelectionSingleValueQueriesTest.java
@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.PriorityQueue;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
@@ -108,7 +107,7 @@ private void verifySelectionOrderByAgoFunctionResult(SelectionResultsBlock resul
     assertTrue(columnIndexMap.containsKey("daysSinceEpoch"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("daysSinceEpoch")), ColumnDataType.INT);
 
-    PriorityQueue<Object[]> selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
     for (Object[] row : selectionResult) {
       assertEquals(row.length, 1);
@@ -232,9 +231,9 @@ public void testSelectionOrderBy() {
     assertTrue(columnIndexMap.containsKey("column1"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")), ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), ColumnDataType.INT);
-    PriorityQueue<Object[]> selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 4);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column6")]).intValue(), 6043515);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column1")]).intValue(), 10542595);
@@ -256,9 +255,9 @@ public void testSelectionOrderBy() {
     assertTrue(columnIndexMap.containsKey("column1"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")), ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), ColumnDataType.INT);
-    selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 4);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column6")]).intValue(), 6043515);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column1")]).intValue(), 462769197);
@@ -281,9 +280,9 @@ public void testSelectionOrderBySortedColumn() {
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "column1", "column11"});
     assertEquals(dataSchema.getColumnDataTypes(),
         new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT, ColumnDataType.STRING});
-    PriorityQueue<Object[]> selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 3);
     assertEquals(lastRow[0], "gFuH");
 
@@ -302,9 +301,9 @@ public void testSelectionOrderBySortedColumn() {
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "column1", "column11"});
     assertEquals(dataSchema.getColumnDataTypes(),
         new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT, ColumnDataType.STRING});
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 3);
     assertEquals(lastRow[0], "gFuH");
 
@@ -322,9 +321,9 @@ public void testSelectionOrderBySortedColumn() {
     dataSchema = resultsBlock.getDataSchema();
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "daysSinceEpoch"});
     assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT});
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 2);
     assertEquals(lastRow[0], "gFuH");
     assertEquals(lastRow[1], 126164076);
@@ -343,9 +342,9 @@ public void testSelectionOrderBySortedColumn() {
     dataSchema = resultsBlock.getDataSchema();
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "daysSinceEpoch"});
     assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT});
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 2);
     assertEquals(lastRow[0], "gFuH");
     assertEquals(lastRow[1], 167572854);
@@ -364,9 +363,9 @@ public void testSelectionOrderBySortedColumn() {
     dataSchema = resultsBlock.getDataSchema();
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "daysSinceEpoch"});
     assertEquals(dataSchema.getColumnDataTypes(), new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT});
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 2);
     assertEquals(lastRow[0], "gFuH");
     assertEquals(lastRow[1], 167572854);
@@ -386,9 +385,9 @@ public void testSelectionOrderBySortedColumn() {
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "column6", "column1"});
     assertEquals(dataSchema.getColumnDataTypes(),
         new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT, ColumnDataType.INT});
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 3);
     assertEquals(lastRow[0], "gFuH");
     // Unsorted column values should be the same as ordering by their own
@@ -410,9 +409,9 @@ public void testSelectionOrderBySortedColumn() {
     assertEquals(dataSchema.getColumnNames(), new String[]{"column5", "column6", "column1"});
     assertEquals(dataSchema.getColumnDataTypes(),
         new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT, ColumnDataType.INT});
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 3);
     assertEquals(lastRow[0], "gFuH");
     // Unsorted column values should be the same as ordering by their own
@@ -440,9 +439,9 @@ public void testSelectStarOrderBy() {
     assertTrue(columnIndexMap.containsKey("column1"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")), ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), ColumnDataType.INT);
-    PriorityQueue<Object[]> selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 11);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column6")]).intValue(), 6043515);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column1")]).intValue(), 10542595);
@@ -465,9 +464,9 @@ public void testSelectStarOrderBy() {
     assertTrue(columnIndexMap.containsKey("column1"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")), ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), ColumnDataType.INT);
-    selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 11);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column6")]).intValue(), 6043515);
     assertEquals(((Integer) lastRow[columnIndexMap.get("column1")]).intValue(), 462769197);
@@ -493,9 +492,9 @@ public void testSelectStarOrderBySortedColumn() {
     assertEquals(selectionDataSchema.size(), 11);
     assertTrue(columnIndexMap.containsKey("column5"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column5")), ColumnDataType.STRING);
-    PriorityQueue<Object[]> selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 11);
     assertEquals((lastRow[columnIndexMap.get("column5")]), "gFuH");
 
@@ -515,9 +514,9 @@ public void testSelectStarOrderBySortedColumn() {
     assertEquals(selectionDataSchema.size(), 11);
     assertTrue(columnIndexMap.containsKey("column5"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column5")), ColumnDataType.STRING);
-    selectionResult = resultsBlock.convertToPriorityQueueBased().getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 10);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(9);
     assertEquals(lastRow.length, 11);
     assertEquals((lastRow[columnIndexMap.get("column5")]), "gFuH");
   }
@@ -544,9 +543,9 @@ public void testSelectStarOrderByLargeOffsetLimit() {
     assertTrue(columnIndexMap.containsKey("column1"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")), ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), ColumnDataType.INT);
-    PriorityQueue<Object[]> selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    List<Object[]> selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 12000);
-    Object[] lastRow = selectionResult.peek();
+    Object[] lastRow = selectionResult.get(11999);
     assertEquals(lastRow.length, 11);
     assertEquals((int) lastRow[columnIndexMap.get("column6")], 296467636);
     assertEquals((int) lastRow[columnIndexMap.get("column1")], 1715964282);
@@ -569,9 +568,9 @@ public void testSelectStarOrderByLargeOffsetLimit() {
     assertTrue(columnIndexMap.containsKey("column1"));
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column6")), ColumnDataType.INT);
     assertEquals(selectionDataSchema.getColumnDataType(columnIndexMap.get("column1")), ColumnDataType.INT);
-    selectionResult = resultsBlock.getRowsAsPriorityQueue();
+    selectionResult = resultsBlock.getRows();
     assertEquals(selectionResult.size(), 6129);
-    lastRow = selectionResult.peek();
+    lastRow = selectionResult.get(6128);
     assertEquals(lastRow.length, 11);
     assertEquals((int) lastRow[columnIndexMap.get("column6")], 499968041);
     assertEquals((int) lastRow[columnIndexMap.get("column1")], 335520083);
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueQueriesTest.java
index 4d323588144..33c32db70af 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueQueriesTest.java
@@ -550,6 +550,11 @@ public void testPercentileRawTDigestMV() {
     testPercentileRawTDigestMV(90);
     testPercentileRawTDigestMV(95);
     testPercentileRawTDigestMV(99);
+
+    testPercentileRawTDigestCustomCompression(50, 150);
+    testPercentileRawTDigestCustomCompression(90, 500);
+    testPercentileRawTDigestCustomCompression(95, 200);
+    testPercentileRawTDigestCustomCompression(99, 1000);
   }
 
   private void testPercentileRawTDigestMV(int percentile) {
@@ -573,6 +578,25 @@ private void testPercentileRawTDigestMV(int percentile) {
         getBrokerResponse(regularQuery + FILTER + MV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
   }
 
+  private void testPercentileRawTDigestCustomCompression(int percentile, int compressionFactor) {
+    Function<Object, Object> quantileExtractor =
+        value -> ObjectSerDeUtils.TDIGEST_SER_DE.deserialize(BytesUtils.toBytes((String) value))
+            .quantile(percentile / 100.0);
+
+    String rawQuery = String.format("SELECT PERCENTILERAWTDIGESTMV(column6, %d, %d) AS value FROM testTable",
+        percentile, compressionFactor);
+    String regularQuery = String.format("SELECT PERCENTILETDIGESTMV(column6, %d, %d) AS value FROM testTable",
+        percentile, compressionFactor);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery), getBrokerResponse(regularQuery),
+        quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER),
+        getBrokerResponse(regularQuery + FILTER), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + MV_GROUP_BY),
+        getBrokerResponse(regularQuery + MV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER + MV_GROUP_BY),
+        getBrokerResponse(regularQuery + FILTER + MV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+  }
+
   @Test
   public void testNumGroupsLimit() {
     String query = "SELECT COUNT(*) FROM testTable GROUP BY column6";
@@ -595,7 +619,7 @@ public void testFilteredAggregations() {
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.LONG});
     ResultTable expectedResultTable =
         new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{370236L}));
-    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 740472L, 400000L, 0L, 400000L, expectedResultTable);
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 370236L, 400000L, 0L, 400000L, expectedResultTable);
   }
 
   @Test
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueRawQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueRawQueriesTest.java
index 06d89e6573a..c9f0c444afe 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueRawQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationMultiValueRawQueriesTest.java
@@ -18,10 +18,13 @@
  */
 package org.apache.pinot.queries;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
+import org.apache.calcite.avatica.util.Base64;
+import org.apache.datasketches.kll.KllDoublesSketch;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -41,6 +44,8 @@ public class InterSegmentAggregationMultiValueRawQueriesTest extends BaseMultiVa
 
   // Allow 5% quantile error due to the randomness of TDigest merge
   private static final double PERCENTILE_TDIGEST_DELTA = 0.05 * Integer.MAX_VALUE;
+  // Allow 2% quantile error due to the randomness of KLL merge
+  private static final double PERCENTILE_KLL_DELTA = 0.02 * Integer.MAX_VALUE;
 
   @Test
   public void testCountMV() {
@@ -489,6 +494,11 @@ public void testPercentileRawTDigestMV() {
     testPercentileRawTDigestMV(90);
     testPercentileRawTDigestMV(95);
     testPercentileRawTDigestMV(99);
+
+    testPercentileRawTDigestCustomCompressionMV(50, 150);
+    testPercentileRawTDigestCustomCompressionMV(90, 500);
+    testPercentileRawTDigestCustomCompressionMV(95, 200);
+    testPercentileRawTDigestCustomCompressionMV(99, 1000);
   }
 
   private void testPercentileRawTDigestMV(int percentile) {
@@ -512,6 +522,63 @@ private void testPercentileRawTDigestMV(int percentile) {
         getBrokerResponse(regularQuery + FILTER + MV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
   }
 
+  private void testPercentileRawTDigestCustomCompressionMV(int percentile, int compressionFactor) {
+    Function<Object, Object> quantileExtractor =
+        value -> ObjectSerDeUtils.TDIGEST_SER_DE.deserialize(BytesUtils.toBytes((String) value))
+            .quantile(percentile / 100.0);
+
+    String rawQuery = String.format("SELECT PERCENTILERAWTDIGESTMV(column6, %d, %d) AS value FROM testTable",
+        percentile, compressionFactor);
+    String regularQuery = String.format("SELECT PERCENTILETDIGESTMV(column6, %d, %d) AS value FROM testTable",
+        percentile, compressionFactor);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery), getBrokerResponse(regularQuery),
+        quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER),
+        getBrokerResponse(regularQuery + FILTER), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + SV_GROUP_BY),
+        getBrokerResponse(regularQuery + SV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER + SV_GROUP_BY),
+        getBrokerResponse(regularQuery + FILTER + SV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + MV_GROUP_BY),
+        getBrokerResponse(regularQuery + MV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER + MV_GROUP_BY),
+        getBrokerResponse(regularQuery + FILTER + MV_GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+  }
+
+  @Test
+  public void testPercentileRawKLLMV() {
+    testPercentileRawKLLMV(50);
+    testPercentileRawKLLMV(90);
+    testPercentileRawKLLMV(95);
+    testPercentileRawKLLMV(99);
+  }
+
+  private void testPercentileRawKLLMV(int percentile) {
+    Function<Object, Object> quantileExtractor = value -> {
+      try {
+        KllDoublesSketch sketch = ObjectSerDeUtils.KLL_SKETCH_SER_DE.deserialize(Base64.decode((String) value));
+        return sketch.getQuantile(percentile / 100.0);
+      } catch (IOException e) {
+        return null;
+      }
+    };
+
+    String rawKllQuery = String.format("SELECT PERCENTILERAWKLLMV(column6, %d) AS value FROM testTable", percentile);
+    String regularQuery = String.format("SELECT PERCENTILEMV(column6, %d) AS value FROM testTable", percentile);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawKllQuery), getBrokerResponse(regularQuery),
+        quantileExtractor, PERCENTILE_KLL_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawKllQuery + FILTER),
+        getBrokerResponse(regularQuery + FILTER), quantileExtractor, PERCENTILE_KLL_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawKllQuery + SV_GROUP_BY),
+        getBrokerResponse(regularQuery + SV_GROUP_BY), quantileExtractor, PERCENTILE_KLL_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawKllQuery + FILTER + SV_GROUP_BY),
+        getBrokerResponse(regularQuery + FILTER + SV_GROUP_BY), quantileExtractor, PERCENTILE_KLL_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawKllQuery + MV_GROUP_BY),
+        getBrokerResponse(regularQuery + MV_GROUP_BY), quantileExtractor, PERCENTILE_KLL_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawKllQuery + FILTER + MV_GROUP_BY),
+        getBrokerResponse(regularQuery + FILTER + MV_GROUP_BY), quantileExtractor, PERCENTILE_KLL_DELTA);
+  }
+
   @Test
   public void testNumGroupsLimit() {
     String query = "SELECT COUNT(*) FROM testTable GROUP BY column6";
@@ -534,7 +601,7 @@ public void testFilteredAggregations() {
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.LONG});
     ResultTable expectedResultTable =
         new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{370236L}));
-    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 740472L, 400000L, 0L, 400000L, expectedResultTable);
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 370236L, 400000L, 0L, 400000L, expectedResultTable);
   }
 
   @Test
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationSingleValueQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationSingleValueQueriesTest.java
index b1fe73fb283..a6e83209628 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationSingleValueQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/InterSegmentAggregationSingleValueQueriesTest.java
@@ -40,6 +40,8 @@ public class InterSegmentAggregationSingleValueQueriesTest extends BaseSingleVal
 
   // Allow 5% quantile error due to the randomness of TDigest merge
   private static final double PERCENTILE_TDIGEST_DELTA = 0.05 * Integer.MAX_VALUE;
+  // Allow 2% quantile error due to the randomness of KLL merge
+  private static final double PERCENTILE_KLL_DELTA = 0.02 * Integer.MAX_VALUE;
 
   @Test
   public void testCount() {
@@ -538,6 +540,11 @@ public void testPercentileRawTDigest() {
     testPercentileRawTDigest(90);
     testPercentileRawTDigest(95);
     testPercentileRawTDigest(99);
+
+    testPercentileRawTDigestCustomCompression(50, 150);
+    testPercentileRawTDigestCustomCompression(90, 500);
+    testPercentileRawTDigestCustomCompression(95, 200);
+    testPercentileRawTDigestCustomCompression(99, 1000);
   }
 
   private void testPercentileRawTDigest(int percentile) {
@@ -561,6 +568,138 @@ private void testPercentileRawTDigest(int percentile) {
         getBrokerResponse(regularQuery + FILTER + GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
   }
 
+  private void testPercentileRawTDigestCustomCompression(int percentile, int compressionFactor) {
+    Function<Object, Object> quantileExtractor =
+        value -> ObjectSerDeUtils.TDIGEST_SER_DE.deserialize(BytesUtils.toBytes((String) value))
+            .quantile(percentile / 100.0);
+
+    String rawQuery = String.format(
+        "SELECT PERCENTILERAWTDIGEST(column1, %d, %d) AS v1, PERCENTILERAWTDIGEST(column3, %d, %d) AS v2 "
+            + "FROM testTable",
+        percentile, compressionFactor, percentile, compressionFactor);
+    String regularQuery =
+        String.format("SELECT PERCENTILETDIGEST(column1, %d, %d) AS v1, PERCENTILETDIGEST(column3, %d, %d) AS v2 "
+                + "FROM testTable",
+            percentile, compressionFactor, percentile, compressionFactor);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery), getBrokerResponse(regularQuery),
+        quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER),
+        getBrokerResponse(regularQuery + FILTER), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + GROUP_BY),
+        getBrokerResponse(regularQuery + GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+    QueriesTestUtils.testInterSegmentsResult(getBrokerResponse(rawQuery + FILTER + GROUP_BY),
+        getBrokerResponse(regularQuery + FILTER + GROUP_BY), quantileExtractor, PERCENTILE_TDIGEST_DELTA);
+  }
+
+  @Test
+  public void testPercentileKLL() {
+    String query = "SELECT PERCENTILEKLL(column1, 50) AS v1, PERCENTILEKLL(column3, 50) AS v2 FROM testTable";
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query);
+    DataSchema expectedDataSchema =
+        new DataSchema(new String[]{"v1", "v2"}, new ColumnDataType[]{ColumnDataType.DOUBLE, ColumnDataType.DOUBLE});
+    ResultTable expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{1107310944L, 1082130431L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        240000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{1139674505L, 509607935L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        49032L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2146791843L, 1418523221L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        360000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2142595699L, 334963174L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        73548L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    query = "SELECT PERCENTILEKLL(column1, 90) AS v1, PERCENTILEKLL(column3, 90) AS v2 FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{1946157055L, 1946157055L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        240000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{1939865599L, 902299647L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        49032L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2146791843L, 1418523221L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        360000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2142595699L, 334963174L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        73548L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    query = "SELECT PERCENTILEKLL(column1, 95) AS v1, PERCENTILEKLL(column3, 95) AS v2 FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2080374783L, 2051014655L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        240000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2109734911L, 950009855L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        49032L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2146791843L, 1418523221L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        360000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2142595699L, 334963174L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        73548L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    query = "SELECT PERCENTILEKLL(column1, 99) AS v1, PERCENTILEKLL(column3, 99) AS v2 FROM testTable";
+
+    brokerResponse = getBrokerResponse(query);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2143289343L, 2143289343L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        240000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2146232405L, 991952895L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        49032L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2146791843L, 1418523221L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 120000L, 0L,
+        360000L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+
+    brokerResponse = getBrokerResponse(query + FILTER + GROUP_BY);
+    expectedResultTable =
+        new ResultTable(expectedDataSchema, Collections.singletonList(new Object[]{2146232405L, 993001471L}));
+    QueriesTestUtils.testInterSegmentsResult(brokerResponse, 24516L, 252256L,
+        73548L, 120000L, expectedResultTable, PERCENTILE_KLL_DELTA);
+  }
+
   @Test
   public void testNumGroupsLimit() {
     String query = "SELECT COUNT(*) FROM testTable GROUP BY column1";
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/NoDictionaryCompressionQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/NoDictionaryCompressionQueriesTest.java
index 6007a11b155..9fe631aa8f4 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/NoDictionaryCompressionQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/NoDictionaryCompressionQueriesTest.java
@@ -124,7 +124,7 @@ public void setUp()
     indexColumns.addAll(RAW_ZSTANDARD_INDEX_COLUMNS);
     indexColumns.addAll(RAW_LZ4_INDEX_COLUMNS);
 
-    indexLoadingConfig.getNoDictionaryColumns().addAll(indexColumns);
+    indexLoadingConfig.addNoDictionaryColumns(indexColumns);
     ImmutableSegment immutableSegment =
         ImmutableSegmentLoader.load(new File(INDEX_DIR, SEGMENT_NAME), indexLoadingConfig);
     _indexSegment = immutableSegment;
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/NullEnabledQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/NullEnabledQueriesTest.java
index a93cd88a71f..5a57945ca74 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/NullEnabledQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/NullEnabledQueriesTest.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Random;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.response.broker.BrokerResponseNative;
 import org.apache.pinot.common.response.broker.ResultTable;
 import org.apache.pinot.common.utils.DataSchema;
@@ -103,7 +102,7 @@ public void createRecords(Number baseValue, boolean generateNulls)
     _records = new ArrayList<>(NUM_RECORDS);
     for (int i = 0; i < NUM_RECORDS; i++) {
       GenericRow record = new GenericRow();
-      double value = baseValue.doubleValue() + i;
+      double value = baseValue instanceof Float ? baseValue.floatValue() + i : baseValue.doubleValue() + i;
       if (i % 2 == 0) {
         record.putValue(COLUMN_NAME, value);
         _sumPrecision = _sumPrecision.add(BigDecimal.valueOf(value));
@@ -281,7 +280,6 @@ public void testQueriesWithNoDictDoubleColumnNoNullValues()
   }
 
   public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullValuesExist) {
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
     Map<String, String> queryOptions = new HashMap<>();
     queryOptions.put("enableNullHandling", "true");
     {
@@ -374,7 +372,7 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
       }
     }
     {
-      String query = String.format("SELECT * FROM testTable ORDER BY %s DESC LIMIT 4000", COLUMN_NAME);
+      String query = String.format("SELECT * FROM testTable ORDER BY %s DESC NULLS LAST LIMIT 4000", COLUMN_NAME);
       // getBrokerResponseForSqlQuery(query) runs SQL query on multiple index segments. The result should be equivalent
       // to querying 4 identical index segments.
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
@@ -399,9 +397,8 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
         }
         k++;
       }
-      // Note 1: we inserted 500 nulls in _records, and since we query 4 identical index segments, the number of null
-      //  values is: 500 * 4 = 2000.
-      // Note 2: The default null ordering is 'NULLS LAST', regardless of the ordering direction.
+      // We inserted 500 nulls in _records, and since we query 4 identical index segments, the number of null values is:
+      // 500 * 4 = 2000.
       for (int i = 2000; i < rowsCount; i++) {
         Object[] values = rows.get(i);
         assertEquals(values.length, 2);
@@ -431,13 +428,9 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
         i++;
         index++;
       }
-      // The default null ordering is 'NULLS LAST'. Therefore, null will appear as the last record.
-      if (nullValuesExist) {
-        assertNull(rows.get(rows.size() - 1)[0]);
-      }
     }
     {
-      int limit = 40;
+      int limit = NUM_RECORDS / 2 + 1;
       String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s LIMIT %d", COLUMN_NAME, COLUMN_NAME,
           limit);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
@@ -530,7 +523,7 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
     }
     {
       String query = String.format(
-          "SELECT COUNT(*) AS count, %s FROM testTable GROUP BY %s ORDER BY %s DESC LIMIT 1000", COLUMN_NAME,
+          "SELECT COUNT(*) AS count, %s FROM testTable GROUP BY %s ORDER BY %s DESC NULLS LAST LIMIT 1000", COLUMN_NAME,
           COLUMN_NAME, COLUMN_NAME);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
@@ -605,8 +598,8 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
       // 9.500
       //(1 row)
       //
-      String query = String.format("SELECT %s FROM testTable WHERE %s > '%s' LIMIT 50", COLUMN_NAME, COLUMN_NAME,
-          baseValue.doubleValue() + 69);
+      String query = String.format("SELECT %s FROM testTable WHERE %s > %s LIMIT 50", COLUMN_NAME, COLUMN_NAME,
+          baseValue instanceof Float ? baseValue.floatValue() + 69 : baseValue.doubleValue() + 69);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
       DataSchema dataSchema = resultTable.getDataSchema();
@@ -627,8 +620,8 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
       }
     }
     {
-      String query = String.format("SELECT %s FROM testTable WHERE %s = '%s'", COLUMN_NAME, COLUMN_NAME,
-          baseValue.doubleValue() + 68);
+      String query = String.format("SELECT %s FROM testTable WHERE %s = %s", COLUMN_NAME, COLUMN_NAME,
+          baseValue instanceof Float ? baseValue.floatValue() + 68 : baseValue.doubleValue() + 68);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
       DataSchema dataSchema = resultTable.getDataSchema();
@@ -642,8 +635,8 @@ public void testQueries(Number baseValue, ColumnDataType dataType, boolean nullV
       }
     }
     {
-      String query = String.format("SELECT %s FROM testTable WHERE %s = '%s'", COLUMN_NAME, COLUMN_NAME,
-          baseValue.doubleValue() + 69);
+      String query = String.format("SELECT %s FROM testTable WHERE %s = %s", COLUMN_NAME, COLUMN_NAME,
+          baseValue instanceof Float ? baseValue.floatValue() + 69 : baseValue.doubleValue() + 69);
       BrokerResponseNative brokerResponse = getBrokerResponse(query, queryOptions);
       ResultTable resultTable = brokerResponse.getResultTable();
       DataSchema dataSchema = resultTable.getDataSchema();
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/NullHandlingEnabledQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/NullHandlingEnabledQueriesTest.java
new file mode 100644
index 00000000000..af54abf9a5d
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/NullHandlingEnabledQueriesTest.java
@@ -0,0 +1,467 @@
+/**
+ * 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.pinot.queries;
+
+import com.google.common.collect.ImmutableMap;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.broker.ResultTable;
+import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.ImmutableSegment;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.AssertJUnit.assertArrayEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+
+public class NullHandlingEnabledQueriesTest extends BaseQueriesTest {
+  private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "NullHandlingEnabledQueriesTest");
+  private static final String RAW_TABLE_NAME = "testTable";
+  private static final String SEGMENT_NAME = "testSegment";
+  private static final String COLUMN1 = "column1";
+  private static final String COLUMN2 = "column2";
+  private static final int NUM_OF_SEGMENT_COPIES = 4;
+  private final List<GenericRow> _rows = new ArrayList<>();
+  private static final ImmutableMap<String, String> QUERY_OPTIONS = ImmutableMap.of("enableNullHandling", "true");
+
+  private IndexSegment _indexSegment;
+  private List<IndexSegment> _indexSegments;
+
+  @Override
+  protected String getFilter() {
+    return "";
+  }
+
+  @Override
+  protected IndexSegment getIndexSegment() {
+    return _indexSegment;
+  }
+
+  @Override
+  protected List<IndexSegment> getIndexSegments() {
+    return _indexSegments;
+  }
+
+  private void setUpSegments(TableConfig tableConfig, Schema schema)
+      throws Exception {
+    FileUtils.deleteDirectory(INDEX_DIR);
+    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(tableConfig, schema);
+    segmentGeneratorConfig.setTableName(RAW_TABLE_NAME);
+    segmentGeneratorConfig.setSegmentName(SEGMENT_NAME);
+    segmentGeneratorConfig.setNullHandlingEnabled(true);
+    segmentGeneratorConfig.setOutDir(INDEX_DIR.getPath());
+
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    driver.init(segmentGeneratorConfig, new GenericRowRecordReader(_rows));
+    driver.build();
+
+    ImmutableSegment immutableSegment = ImmutableSegmentLoader.load(new File(INDEX_DIR, SEGMENT_NAME), ReadMode.mmap);
+    _indexSegment = immutableSegment;
+    _indexSegments = Arrays.asList(immutableSegment, immutableSegment);
+  }
+
+  private void initializeRows() {
+    _rows.clear();
+  }
+
+  private void insertRow(Object value) {
+    GenericRow row = new GenericRow();
+    row.putValue(COLUMN1, value);
+    _rows.add(row);
+  }
+
+  private void insertRowWithTwoColumns(Object column1Value, Object column2Value) {
+    GenericRow row = new GenericRow();
+    row.putValue(COLUMN1, column1Value);
+    row.putValue(COLUMN2, column2Value);
+    _rows.add(row);
+  }
+
+  @Test
+  public void testSelectDistinctOrderByNullsFirst()
+      throws Exception {
+    FileUtils.deleteDirectory(INDEX_DIR);
+    initializeRows();
+    insertRow(1);
+    insertRow(null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s NULLS FIRST", COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertNull(resultTable.getRows().get(0)[0]);
+    assertNotNull(resultTable.getRows().get(1)[0]);
+  }
+
+  @Test
+  public void testSelectDistinctOrderByNullsLast()
+      throws Exception {
+    FileUtils.deleteDirectory(INDEX_DIR);
+    initializeRows();
+    insertRow(1);
+    insertRow(null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s NULLS LAST", COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertNotNull(resultTable.getRows().get(0)[0]);
+    assertNull(resultTable.getRows().get(1)[0]);
+  }
+
+  @Test
+  public void testSelectDistinctIntegerMinValueDiffersFromNull()
+      throws Exception {
+    FileUtils.deleteDirectory(INDEX_DIR);
+    initializeRows();
+    insertRow(Integer.MIN_VALUE);
+    insertRow(null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable", COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 2);
+  }
+
+  @Test
+  public void testSelectDistinctMultiColumn()
+      throws Exception {
+    initializeRows();
+    insertRowWithTwoColumns(1, 1);
+    insertRowWithTwoColumns(1, 1);
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(null, 2);
+    insertRowWithTwoColumns(null, null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT)
+        .addSingleValueDimension(COLUMN2, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT DISTINCT %s,%s FROM testTable ORDER BY %s,%s", COLUMN1, COLUMN2, COLUMN1, COLUMN2);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 4);
+  }
+
+  @Test
+  public void testSelectDistinctOrderByMultiColumn()
+      throws Exception {
+    initializeRows();
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(null, 2);
+    insertRowWithTwoColumns(null, 2);
+    insertRowWithTwoColumns(1, 1);
+    insertRowWithTwoColumns(null, null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT)
+        .addSingleValueDimension(COLUMN2, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT DISTINCT %s,%s FROM testTable ORDER BY %s,%s", COLUMN1, COLUMN2, COLUMN1, COLUMN2);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 4);
+    assertEquals(resultTable.getRows().get(0), new Object[]{1, 1});
+    assertEquals(resultTable.getRows().get(1), new Object[]{null, 1});
+    assertEquals(resultTable.getRows().get(2), new Object[]{null, 2});
+    assertEquals(resultTable.getRows().get(3), new Object[]{null, null});
+  }
+
+  @DataProvider(name = "NumberTypes")
+  public static Object[][] getPrimitiveDataTypes() {
+    return new Object[][]{
+        {FieldSpec.DataType.INT}, {FieldSpec.DataType.LONG}, {FieldSpec.DataType.DOUBLE}, {FieldSpec.DataType.FLOAT}
+    };
+  }
+
+  @Test(dataProvider = "NumberTypes")
+  public void testSelectDistinctWithLimit(FieldSpec.DataType dataType)
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    insertRow(1);
+    insertRow(2);
+    insertRow(3);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, dataType).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s LIMIT 3", COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 3);
+  }
+
+  @Test(dataProvider = "NumberTypes")
+  public void testSelectDistinctOrderByWithLimit(FieldSpec.DataType dataType)
+      throws Exception {
+    double delta = 0.01;
+    initializeRows();
+    insertRow(null);
+    insertRow(1);
+    insertRow(2);
+    insertRow(3);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, dataType).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s LIMIT 3", COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 3);
+    assertTrue(Math.abs(((Number) resultTable.getRows().get(0)[0]).doubleValue() - 1.0) < delta);
+    assertTrue(Math.abs(((Number) resultTable.getRows().get(1)[0]).doubleValue() - 2.0) < delta);
+    assertTrue(Math.abs(((Number) resultTable.getRows().get(2)[0]).doubleValue() - 3.0) < delta);
+  }
+
+  @DataProvider(name = "ObjectTypes")
+  public static Object[][] getObjectDataTypes() {
+    return new Object[][]{
+        {FieldSpec.DataType.STRING, "a"}, {
+        FieldSpec.DataType.BIG_DECIMAL, 1
+    }, {
+        FieldSpec.DataType.BYTES, "a string".getBytes()
+    }
+    };
+  }
+
+  @Test(dataProvider = "ObjectTypes")
+  public void testObjectSingleColumnDistinctOrderByNullsFirst(FieldSpec.DataType dataType, Object value)
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    insertRow(value);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, dataType).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s NULLS FIRST LIMIT 1", COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 1);
+    assertNull(resultTable.getRows().get(0)[0]);
+  }
+
+  @Test(dataProvider = "ObjectTypes")
+  public void testObjectSingleColumnDistinctOrderByNullsLast(FieldSpec.DataType dataType, Object value)
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    insertRow(value);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, dataType).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT DISTINCT %s FROM testTable ORDER BY %s NULLS LAST LIMIT 1", COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), 1);
+    assertNotNull(resultTable.getRows().get(0)[0]);
+  }
+
+  @Test
+  public void testTransformBlockValSetGetNullBitmap()
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query = String.format("SELECT (CASE WHEN %s IS NULL THEN 1 END) FROM testTable", COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    assertEquals(resultTable.getRows().size(), NUM_OF_SEGMENT_COPIES);
+    assertEquals(resultTable.getRows().get(0)[0], 1);
+  }
+
+  private boolean contains(List<Object[]> rows, Object[] target) {
+    for (Object[] row : rows) {
+      if (Arrays.equals(row, target)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Test
+  public void testMultiColumnGroupBy()
+      throws Exception {
+    initializeRows();
+    insertRowWithTwoColumns(null, null);
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(1, 1);
+    insertRowWithTwoColumns(1, null);
+    insertRowWithTwoColumns(1, Integer.MIN_VALUE);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT)
+        .addSingleValueDimension(COLUMN2, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT count(*), %s, %s FROM testTable GROUP BY %s, %s", COLUMN1, COLUMN2, COLUMN1,
+            COLUMN2);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertEquals(rows.size(), 5);
+    assertTrue(contains(rows, new Object[]{(long) NUM_OF_SEGMENT_COPIES, null, null}));
+    assertTrue(contains(rows, new Object[]{(long) 2 * NUM_OF_SEGMENT_COPIES, null, 1}));
+    assertTrue(contains(rows, new Object[]{(long) NUM_OF_SEGMENT_COPIES, 1, 1}));
+    assertTrue(contains(rows, new Object[]{(long) NUM_OF_SEGMENT_COPIES, 1, null}));
+    assertTrue(contains(rows, new Object[]{(long) NUM_OF_SEGMENT_COPIES, 1, Integer.MIN_VALUE}));
+  }
+
+  @Test
+  public void testMultiColumnGroupByWithLimit()
+      throws Exception {
+    initializeRows();
+    insertRowWithTwoColumns(null, null);
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(null, 1);
+    insertRowWithTwoColumns(1, 1);
+    insertRowWithTwoColumns(1, null);
+    insertRowWithTwoColumns(1, Integer.MIN_VALUE);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT)
+        .addSingleValueDimension(COLUMN2, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT count(*), %s, %s FROM testTable GROUP BY %s, %s LIMIT 3", COLUMN1, COLUMN2, COLUMN1,
+            COLUMN2);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertEquals(rows.size(), 3);
+  }
+
+  @Test
+  public void testGroupByOrderBy()
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    insertRow(1);
+    insertRow(1);
+    insertRow(2);
+    insertRow(3);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT count(*), %s FROM testTable GROUP BY %s ORDER BY %s ASC NULLS LAST", COLUMN1, COLUMN1,
+            COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertEquals(rows.size(), 4);
+    assertArrayEquals(rows.get(0), new Object[]{(long) 2 * NUM_OF_SEGMENT_COPIES, 1});
+    assertArrayEquals(rows.get(1), new Object[]{(long) NUM_OF_SEGMENT_COPIES, 2});
+    assertArrayEquals(rows.get(2), new Object[]{(long) NUM_OF_SEGMENT_COPIES, 3});
+    assertArrayEquals(rows.get(3), new Object[]{(long) NUM_OF_SEGMENT_COPIES, null});
+  }
+
+  @Test
+  public void testGroupByOrderByWithLimit()
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    insertRow(1);
+    insertRow(1);
+    insertRow(2);
+    insertRow(3);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT count(*), %s FROM testTable GROUP BY %s ORDER BY %s DESC NULLS FIRST LIMIT 3", COLUMN1,
+            COLUMN1, COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertEquals(rows.size(), 3);
+    assertArrayEquals(rows.get(0), new Object[]{(long) NUM_OF_SEGMENT_COPIES, null});
+    assertArrayEquals(rows.get(1), new Object[]{(long) NUM_OF_SEGMENT_COPIES, 3});
+    assertArrayEquals(rows.get(2), new Object[]{(long) NUM_OF_SEGMENT_COPIES, 2});
+  }
+
+  @Test
+  public void testNestedCaseTransformFunction()
+      throws Exception {
+    initializeRows();
+    insertRow(null);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
+    Schema schema = new Schema.SchemaBuilder().addSingleValueDimension(COLUMN1, FieldSpec.DataType.INT).build();
+    setUpSegments(tableConfig, schema);
+    String query =
+        String.format("SELECT (CASE WHEN %s = -2147483648 THEN 1 ELSE 2 END) + 0 FROM testTable", COLUMN1);
+
+    BrokerResponseNative brokerResponse = getBrokerResponse(query, QUERY_OPTIONS);
+
+    ResultTable resultTable = brokerResponse.getResultTable();
+    List<Object[]> rows = resultTable.getRows();
+    assertArrayEquals(rows.get(0), new Object[]{(double) 2});
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/PercentileKLLMVQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileKLLMVQueriesTest.java
new file mode 100644
index 00000000000..9a0473ea5ad
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileKLLMVQueriesTest.java
@@ -0,0 +1,94 @@
+/**
+ * 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.pinot.queries;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.datasketches.kll.KllDoublesSketch;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.MetricFieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+
+
+/**
+ * Variation of the PercentileKLLQueriesTest suite which tests PERCENTILE_KLL_MV
+ */
+public class PercentileKLLMVQueriesTest extends PercentileKLLQueriesTest {
+  private static final int MAX_NUM_MULTI_VALUES = 10;
+
+  @Override
+  protected void buildSegment()
+      throws Exception {
+    List<GenericRow> rows = new ArrayList<>(NUM_ROWS);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      GenericRow row = new GenericRow();
+
+      int numMultiValues = RANDOM.nextInt(MAX_NUM_MULTI_VALUES) + 1;
+      Double[] values = new Double[numMultiValues];
+      KllDoublesSketch sketch = KllDoublesSketch.newHeapInstance();
+      for (int j = 0; j < numMultiValues; j++) {
+        double value = RANDOM.nextDouble() * VALUE_RANGE;
+        values[j] = value;
+        sketch.update(value);
+      }
+      row.putValue(DOUBLE_COLUMN, values);
+      row.putValue(KLL_COLUMN, sketch.toByteArray());
+
+      String group = GROUPS[RANDOM.nextInt(GROUPS.length)];
+      row.putValue(GROUP_BY_COLUMN, group);
+
+      rows.add(row);
+    }
+
+    Schema schema = new Schema();
+    schema.addField(new DimensionFieldSpec(DOUBLE_COLUMN, FieldSpec.DataType.DOUBLE, false));
+    schema.addField(new MetricFieldSpec(KLL_COLUMN, FieldSpec.DataType.BYTES));
+    schema.addField(new DimensionFieldSpec(GROUP_BY_COLUMN, FieldSpec.DataType.STRING, true));
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
+
+    SegmentGeneratorConfig config = new SegmentGeneratorConfig(tableConfig, schema);
+    config.setOutDir(INDEX_DIR.getPath());
+    config.setTableName(TABLE_NAME);
+    config.setSegmentName(SEGMENT_NAME);
+    config.setRawIndexCreationColumns(Collections.singletonList(KLL_COLUMN));
+
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    try (RecordReader recordReader = new GenericRowRecordReader(rows)) {
+      driver.init(config, recordReader);
+      driver.build();
+    }
+  }
+
+  @Override
+  protected String getAggregationQuery(int percentile) {
+    return String.format(
+        "SELECT PERCENTILEMV(%2$s, %1$d), PERCENTILEKLLMV(%2$s, %1$d), PERCENTILEKLL(%3$s, %1$d) FROM %4$s", percentile,
+        DOUBLE_COLUMN, KLL_COLUMN, TABLE_NAME);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/PercentileKLLQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileKLLQueriesTest.java
new file mode 100644
index 00000000000..2f5b1e67dc8
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileKLLQueriesTest.java
@@ -0,0 +1,244 @@
+/**
+ * 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.pinot.queries;
+
+import it.unimi.dsi.fastutil.doubles.DoubleList;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import org.apache.commons.io.FileUtils;
+import org.apache.datasketches.kll.KllDoublesSketch;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.core.operator.blocks.results.AggregationResultsBlock;
+import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
+import org.apache.pinot.core.operator.query.AggregationOperator;
+import org.apache.pinot.core.operator.query.GroupByOperator;
+import org.apache.pinot.core.query.aggregation.groupby.AggregationGroupByResult;
+import org.apache.pinot.core.query.aggregation.groupby.GroupKeyGenerator;
+import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
+import org.apache.pinot.segment.spi.ImmutableSegment;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.MetricFieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+
+/**
+ * Tests for PERCENTILE_KLL aggregation function.
+ *
+ * <ul>
+ *   <li>Generates a segment with a double column, a KLL column and a group-by column</li>
+ *   <li>Runs aggregation and group-by queries on the generated segment</li>
+ *   <li>
+ *     Compares the results for PERCENTILE_KLL on double column and KLL column with results for PERCENTILE on
+ *     double column
+ *   </li>
+ * </ul>
+ */
+public class PercentileKLLQueriesTest extends BaseQueriesTest {
+  protected static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "PercentileKllQueriesTest");
+  protected static final String TABLE_NAME = "testTable";
+  protected static final String SEGMENT_NAME = "testSegment";
+
+  protected static final int NUM_ROWS = 1000;
+  protected static final int VALUE_RANGE = Integer.MAX_VALUE;
+  protected static final double DELTA = 0.05 * VALUE_RANGE; // Allow 5% delta
+  protected static final String DOUBLE_COLUMN = "doubleColumn";
+  protected static final String KLL_COLUMN = "kllColumn";
+  protected static final String GROUP_BY_COLUMN = "groupByColumn";
+  protected static final String[] GROUPS = new String[]{"G1", "G2", "G3"};
+  protected static final long RANDOM_SEED = System.nanoTime();
+  protected static final Random RANDOM = new Random(RANDOM_SEED);
+  protected static final String ERROR_MESSAGE = "Random seed: " + RANDOM_SEED;
+
+  private IndexSegment _indexSegment;
+  private List<IndexSegment> _indexSegments;
+
+  @Override
+  protected String getFilter() {
+    return ""; // No filtering required for this test.
+  }
+
+  @Override
+  protected IndexSegment getIndexSegment() {
+    return _indexSegment;
+  }
+
+  @Override
+  protected List<IndexSegment> getIndexSegments() {
+    return _indexSegments;
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    FileUtils.deleteQuietly(INDEX_DIR);
+
+    buildSegment();
+    ImmutableSegment immutableSegment = ImmutableSegmentLoader.load(new File(INDEX_DIR, SEGMENT_NAME), ReadMode.mmap);
+    _indexSegment = immutableSegment;
+    _indexSegments = Arrays.asList(immutableSegment, immutableSegment);
+  }
+
+  protected void buildSegment()
+      throws Exception {
+    List<GenericRow> rows = new ArrayList<>(NUM_ROWS);
+    for (int i = 0; i < NUM_ROWS; i++) {
+      GenericRow row = new GenericRow();
+
+      double value = RANDOM.nextDouble() * VALUE_RANGE;
+      row.putValue(DOUBLE_COLUMN, value);
+
+      KllDoublesSketch sketch = KllDoublesSketch.newHeapInstance();
+      sketch.update(value);
+      row.putValue(KLL_COLUMN, sketch.toByteArray());
+
+      String group = GROUPS[RANDOM.nextInt(GROUPS.length)];
+      row.putValue(GROUP_BY_COLUMN, group);
+
+      rows.add(row);
+    }
+
+    Schema schema = new Schema();
+    schema.addField(new MetricFieldSpec(DOUBLE_COLUMN, FieldSpec.DataType.DOUBLE));
+    schema.addField(new MetricFieldSpec(KLL_COLUMN, FieldSpec.DataType.BYTES));
+    schema.addField(new DimensionFieldSpec(GROUP_BY_COLUMN, FieldSpec.DataType.STRING, true));
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
+
+    SegmentGeneratorConfig config = new SegmentGeneratorConfig(tableConfig, schema);
+    config.setOutDir(INDEX_DIR.getPath());
+    config.setTableName(TABLE_NAME);
+    config.setSegmentName(SEGMENT_NAME);
+    config.setRawIndexCreationColumns(Collections.singletonList(KLL_COLUMN));
+
+    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+    try (RecordReader recordReader = new GenericRowRecordReader(rows)) {
+      driver.init(config, recordReader);
+      driver.build();
+    }
+  }
+
+  @Test
+  public void testInnerSegmentAggregation() {
+    // For inner segment case, percentile does not affect the intermediate result
+    AggregationOperator aggregationOperator = getOperator(getAggregationQuery(0));
+    AggregationResultsBlock resultsBlock = aggregationOperator.nextBlock();
+    List<Object> aggregationResult = resultsBlock.getResults();
+    assertNotNull(aggregationResult);
+    assertEquals(aggregationResult.size(), 3);
+    DoubleList doubleList0 = (DoubleList) aggregationResult.get(0);
+    Collections.sort(doubleList0);
+    assertSketch((KllDoublesSketch) aggregationResult.get(1), doubleList0);
+    assertSketch((KllDoublesSketch) aggregationResult.get(2), doubleList0);
+  }
+
+  @Test
+  public void testInterSegmentAggregation() {
+    for (int percentile = 0; percentile <= 100; percentile++) {
+      BrokerResponseNative brokerResponse = getBrokerResponse(getAggregationQuery(percentile));
+      Object[] results = brokerResponse.getResultTable().getRows().get(0);
+      assertEquals(results.length, 3);
+      double expectedResult = (Double) results[0];
+      for (int i = 1; i < 3; i++) {
+        assertEquals((Double) results[i], expectedResult, DELTA, ERROR_MESSAGE);
+      }
+    }
+  }
+
+  @Test
+  public void testInnerSegmentGroupBy() {
+    // For inner segment case, percentile does not affect the intermediate result
+    GroupByOperator groupByOperator = getOperator(getGroupByQuery(0));
+    GroupByResultsBlock resultsBlock = groupByOperator.nextBlock();
+    AggregationGroupByResult groupByResult = resultsBlock.getAggregationGroupByResult();
+    assertNotNull(groupByResult);
+    Iterator<GroupKeyGenerator.GroupKey> groupKeyIterator = groupByResult.getGroupKeyIterator();
+    while (groupKeyIterator.hasNext()) {
+      int groupId = groupKeyIterator.next()._groupId;
+      DoubleList doubleList0 = (DoubleList) groupByResult.getResultForGroupId(0, groupId);
+      Collections.sort(doubleList0);
+      assertSketch((KllDoublesSketch) groupByResult.getResultForGroupId(1, groupId), doubleList0);
+      assertSketch((KllDoublesSketch) groupByResult.getResultForGroupId(2, groupId), doubleList0);
+    }
+  }
+
+  @Test
+  public void testInterSegmentGroupBy() {
+    for (int percentile = 0; percentile <= 100; percentile++) {
+      BrokerResponseNative brokerResponse = getBrokerResponse(getGroupByQuery(percentile));
+      List<Object[]> rows = brokerResponse.getResultTable().getRows();
+      assertEquals(rows.size(), 3);
+      for (Object[] row : rows) {
+        assertEquals(row.length, 3);
+        double expectedResult = (Double) row[0];
+        for (int i = 1; i < 3; i++) {
+          assertEquals((Double) row[i], expectedResult, DELTA, ERROR_MESSAGE);
+        }
+      }
+    }
+  }
+
+  protected String getAggregationQuery(int percentile) {
+    return String.format(
+        "SELECT PERCENTILE(%2$s, %1$d), PERCENTILEKLL(%2$s, %1$d), PERCENTILEKLL(%3$s, %1$d) FROM %4$s", percentile,
+        DOUBLE_COLUMN, KLL_COLUMN, TABLE_NAME);
+  }
+
+  private String getGroupByQuery(int percentile) {
+    return String.format("%s GROUP BY %s", getAggregationQuery(percentile), GROUP_BY_COLUMN);
+  }
+
+  private void assertSketch(KllDoublesSketch sketch, DoubleList doubleList) {
+    for (int percentile = 0; percentile <= 100; percentile++) {
+      double expected;
+      if (percentile == 100) {
+        expected = doubleList.getDouble(doubleList.size() - 1);
+      } else {
+        expected = doubleList.getDouble(doubleList.size() * percentile / 100);
+      }
+      assertEquals(sketch.getQuantile(percentile / 100.0), expected, DELTA, ERROR_MESSAGE);
+    }
+  }
+
+  @AfterClass
+  public void tearDown() {
+    _indexSegment.destroy();
+    FileUtils.deleteQuietly(INDEX_DIR);
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestMVQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestMVQueriesTest.java
index 9fe38aab344..77292937de2 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestMVQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestMVQueriesTest.java
@@ -21,7 +21,7 @@
 import com.tdunning.math.stats.TDigest;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import org.apache.pinot.core.query.aggregation.function.PercentileTDigestAggregationFunction;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
@@ -42,7 +42,10 @@
  * Tests for PERCENTILE_TDIGEST and PERCENTILE_TDIGEST_MV aggregation functions.
  *
  * <ul>
- *   <li>Generates a segment with a double multi-valued column, a TDigest column and a group-by column</li>
+ *   <li>
+ *     Generates a segment with a double multi-valued column, a TDigest column, a custom compression TDigest column
+ *     and a group-by column
+ *   </li>
  *   <li>Runs aggregation and group-by queries on the generated segment</li>
  *   <li>
  *     Compares the results for PERCENTILE_TDIGEST_MV on double multi-valued column, PERCENTILE_TDIGEST on TDigest
@@ -63,10 +66,12 @@ protected void buildSegment()
       int numMultiValues = RANDOM.nextInt(MAX_NUM_MULTI_VALUES) + 1;
       Double[] values = new Double[numMultiValues];
       TDigest tDigest = TDigest.createMergingDigest(PercentileTDigestAggregationFunction.DEFAULT_TDIGEST_COMPRESSION);
+      TDigest tDigestCustom = TDigest.createMergingDigest(CUSTOM_COMPRESSION);
       for (int j = 0; j < numMultiValues; j++) {
         double value = RANDOM.nextDouble() * VALUE_RANGE;
         values[j] = value;
         tDigest.add(value);
+        tDigestCustom.add(value);
       }
       row.putValue(DOUBLE_COLUMN, values);
 
@@ -74,6 +79,10 @@ protected void buildSegment()
       tDigest.asBytes(byteBuffer);
       row.putValue(TDIGEST_COLUMN, byteBuffer.array());
 
+      ByteBuffer byteBufferCustom = ByteBuffer.allocate(tDigestCustom.byteSize());
+      tDigestCustom.asBytes(byteBufferCustom);
+      row.putValue(TDIGEST_CUSTOM_COMPRESSION_COLUMN, byteBufferCustom.array());
+
       String group = GROUPS[RANDOM.nextInt(GROUPS.length)];
       row.putValue(GROUP_BY_COLUMN, group);
 
@@ -83,6 +92,7 @@ protected void buildSegment()
     Schema schema = new Schema();
     schema.addField(new DimensionFieldSpec(DOUBLE_COLUMN, FieldSpec.DataType.DOUBLE, false));
     schema.addField(new MetricFieldSpec(TDIGEST_COLUMN, FieldSpec.DataType.BYTES));
+    schema.addField(new MetricFieldSpec(TDIGEST_CUSTOM_COMPRESSION_COLUMN, FieldSpec.DataType.BYTES));
     schema.addField(new DimensionFieldSpec(GROUP_BY_COLUMN, FieldSpec.DataType.STRING, true));
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
 
@@ -90,7 +100,7 @@ protected void buildSegment()
     config.setOutDir(INDEX_DIR.getPath());
     config.setTableName(TABLE_NAME);
     config.setSegmentName(SEGMENT_NAME);
-    config.setRawIndexCreationColumns(Collections.singletonList(TDIGEST_COLUMN));
+    config.setRawIndexCreationColumns(Arrays.asList(TDIGEST_COLUMN, TDIGEST_CUSTOM_COMPRESSION_COLUMN));
 
     SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
     try (RecordReader recordReader = new GenericRowRecordReader(rows)) {
@@ -102,8 +112,9 @@ protected void buildSegment()
   @Override
   protected String getAggregationQuery(int percentile) {
     return String.format("SELECT PERCENTILE%1$dMV(%2$s), PERCENTILETDIGEST%1$dMV(%2$s), PERCENTILETDIGEST%1$d(%3$s), "
-            + "PERCENTILEMV(%2$s, %1$d), PERCENTILETDIGESTMV(%2$s, %1$d), PERCENTILETDIGEST(%3$s, %1$d) FROM %4$s",
-        percentile, DOUBLE_COLUMN, TDIGEST_COLUMN, TABLE_NAME);
+            + "PERCENTILEMV(%2$s, %1$d), PERCENTILETDIGESTMV(%2$s, %1$d), PERCENTILETDIGEST(%3$s, %1$d), "
+            + "PERCENTILETDIGESTMV(%2$s, %1$d, %6$d), PERCENTILETDIGEST(%5$s, %1$d, %6$d) FROM %4$s",
+        percentile, DOUBLE_COLUMN, TDIGEST_COLUMN, TABLE_NAME, TDIGEST_CUSTOM_COMPRESSION_COLUMN, CUSTOM_COMPRESSION);
   }
 
   @Override
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestQueriesTest.java
index 426d9921d53..6272ece222e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/PercentileTDigestQueriesTest.java
@@ -65,7 +65,10 @@
  * Tests for PERCENTILE_TDIGEST aggregation function.
  *
  * <ul>
- *   <li>Generates a segment with a double column, a TDigest column and a group-by column</li>
+ *   <li>
+ *     Generates a segment with a double column, a TDigest column, a custom compression TDigest column and a group-by
+ *     column
+ *   </li>
  *   <li>Runs aggregation and group-by queries on the generated segment</li>
  *   <li>
  *     Compares the results for PERCENTILE_TDIGEST on double column and TDigest column with results for PERCENTILE on
@@ -81,8 +84,10 @@ public class PercentileTDigestQueriesTest extends BaseQueriesTest {
   protected static final int NUM_ROWS = 1000;
   protected static final double VALUE_RANGE = Integer.MAX_VALUE;
   protected static final double DELTA = 0.05 * VALUE_RANGE; // Allow 5% quantile error
+  protected static final int CUSTOM_COMPRESSION = 1000;
   protected static final String DOUBLE_COLUMN = "doubleColumn";
   protected static final String TDIGEST_COLUMN = "tDigestColumn";
+  protected static final String TDIGEST_CUSTOM_COMPRESSION_COLUMN = "tDigestColumnCustom";
   protected static final String GROUP_BY_COLUMN = "groupByColumn";
   protected static final String[] GROUPS = new String[]{"G1", "G2", "G3"};
   protected static final long RANDOM_SEED = System.nanoTime();
@@ -133,6 +138,12 @@ protected void buildSegment()
       tDigest.asBytes(byteBuffer);
       row.putValue(TDIGEST_COLUMN, byteBuffer.array());
 
+      TDigest tDigestCustom = TDigest.createMergingDigest(CUSTOM_COMPRESSION);
+      tDigestCustom.add(value);
+      ByteBuffer byteBufferCustom = ByteBuffer.allocate(tDigestCustom.byteSize());
+      tDigestCustom.asBytes(byteBufferCustom);
+      row.putValue(TDIGEST_CUSTOM_COMPRESSION_COLUMN, byteBufferCustom.array());
+
       String group = GROUPS[RANDOM.nextInt(GROUPS.length)];
       row.putValue(GROUP_BY_COLUMN, group);
 
@@ -142,6 +153,7 @@ protected void buildSegment()
     Schema schema = new Schema();
     schema.addField(new MetricFieldSpec(DOUBLE_COLUMN, FieldSpec.DataType.DOUBLE));
     schema.addField(new MetricFieldSpec(TDIGEST_COLUMN, FieldSpec.DataType.BYTES));
+    schema.addField(new MetricFieldSpec(TDIGEST_CUSTOM_COMPRESSION_COLUMN, FieldSpec.DataType.BYTES));
     schema.addField(new DimensionFieldSpec(GROUP_BY_COLUMN, FieldSpec.DataType.STRING, true));
     TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
 
@@ -149,7 +161,7 @@ protected void buildSegment()
     config.setOutDir(INDEX_DIR.getPath());
     config.setTableName(TABLE_NAME);
     config.setSegmentName(SEGMENT_NAME);
-    config.setRawIndexCreationColumns(Collections.singletonList(TDIGEST_COLUMN));
+    config.setRawIndexCreationColumns(Arrays.asList(TDIGEST_COLUMN, TDIGEST_CUSTOM_COMPRESSION_COLUMN));
 
     SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
     try (RecordReader recordReader = new GenericRowRecordReader(rows)) {
@@ -165,7 +177,7 @@ public void testInnerSegmentAggregation() {
     AggregationResultsBlock resultsBlock = aggregationOperator.nextBlock();
     List<Object> aggregationResult = resultsBlock.getResults();
     assertNotNull(aggregationResult);
-    assertEquals(aggregationResult.size(), 6);
+    assertEquals(aggregationResult.size(), 8);
     DoubleList doubleList0 = (DoubleList) aggregationResult.get(0);
     Collections.sort(doubleList0);
     assertTDigest((TDigest) aggregationResult.get(1), doubleList0);
@@ -176,6 +188,8 @@ public void testInnerSegmentAggregation() {
     assertEquals(doubleList3, doubleList0);
     assertTDigest((TDigest) aggregationResult.get(4), doubleList0);
     assertTDigest((TDigest) aggregationResult.get(5), doubleList0);
+    assertTDigest((TDigest) aggregationResult.get(6), doubleList0);
+    assertTDigest((TDigest) aggregationResult.get(7), doubleList0);
   }
 
   @Test
@@ -183,9 +197,9 @@ public void testInterSegmentAggregation() {
     for (int percentile = 0; percentile <= 100; percentile++) {
       BrokerResponseNative brokerResponse = getBrokerResponse(getAggregationQuery(percentile));
       Object[] results = brokerResponse.getResultTable().getRows().get(0);
-      assertEquals(results.length, 6);
+      assertEquals(results.length, 8);
       double expectedResult = (Double) results[0];
-      for (int i = 1; i < 6; i++) {
+      for (int i = 1; i < 8; i++) {
         assertEquals((Double) results[i], expectedResult, DELTA, ERROR_MESSAGE);
       }
     }
@@ -211,6 +225,8 @@ public void testInnerSegmentGroupBy() {
       assertEquals(doubleList3, doubleList0);
       assertTDigest((TDigest) groupByResult.getResultForGroupId(4, groupId), doubleList0);
       assertTDigest((TDigest) groupByResult.getResultForGroupId(5, groupId), doubleList0);
+      assertTDigest((TDigest) groupByResult.getResultForGroupId(6, groupId), doubleList0);
+      assertTDigest((TDigest) groupByResult.getResultForGroupId(7, groupId), doubleList0);
     }
   }
 
@@ -221,9 +237,9 @@ public void testInterSegmentGroupBy() {
       List<Object[]> rows = brokerResponse.getResultTable().getRows();
       assertEquals(rows.size(), 3);
       for (Object[] row : rows) {
-        assertEquals(row.length, 6);
+        assertEquals(row.length, 8);
         double expectedResult = (Double) row[0];
-        for (int i = 1; i < 6; i++) {
+        for (int i = 1; i < 8; i++) {
           assertEquals((Double) row[i], expectedResult, DELTA, ERROR_MESSAGE);
         }
       }
@@ -232,9 +248,10 @@ public void testInterSegmentGroupBy() {
 
   protected String getAggregationQuery(int percentile) {
     return String.format("SELECT PERCENTILE%1$d(%2$s), PERCENTILETDIGEST%1$d(%2$s), PERCENTILETDIGEST%1$d(%3$s), "
-            + "PERCENTILE(%2$s, %1$d), PERCENTILETDIGEST(%2$s, %1$d), PERCENTILETDIGEST(%3$s, %1$d) FROM %4$s",
+            + "PERCENTILE(%2$s, %1$d), PERCENTILETDIGEST(%2$s, %1$d), PERCENTILETDIGEST(%3$s, %1$d), "
+            + "PERCENTILETDIGEST(%2$s, %1$d, %6$d), PERCENTILETDIGEST(%5$s, %1$d, %6$d) FROM %4$s",
         percentile,
-        DOUBLE_COLUMN, TDIGEST_COLUMN, TABLE_NAME);
+        DOUBLE_COLUMN, TDIGEST_COLUMN, TABLE_NAME, TDIGEST_CUSTOM_COMPRESSION_COLUMN, CUSTOM_COMPRESSION);
   }
 
   private String getGroupByQuery(int percentile) {
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/QueriesTestUtils.java b/pinot-core/src/test/java/org/apache/pinot/queries/QueriesTestUtils.java
index c5ba9cdb8b6..c5c9eea9a31 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/QueriesTestUtils.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/QueriesTestUtils.java
@@ -133,7 +133,8 @@ private static void validateResultTable(ResultTable actual, ResultTable expected
   private static void validateRows(List<Object[]> actual, List<Object[]> expected) {
     assertEquals(actual.size(), expected.size());
     for (int i = 0; i < actual.size(); i++) {
-      assertEquals(actual.get(i), expected.get(i));
+      // Generic assertEquals delegates to assertArrayEquals, which can test for equality of array values in rows.
+      assertEquals((Object) actual.get(i), (Object) expected.get(i));
     }
   }
 
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/RangeQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/RangeQueriesTest.java
index 099981d6810..86ac43379bc 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/RangeQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/RangeQueriesTest.java
@@ -51,7 +51,6 @@
 
 
 public class RangeQueriesTest extends BaseQueriesTest {
-
   private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "RangeQueriesTest");
   private static final String RAW_TABLE_NAME = "testTable";
   private static final String SEGMENT_NAME = "testSegment";
@@ -64,20 +63,17 @@ public class RangeQueriesTest extends BaseQueriesTest {
   private static final String RAW_FLOAT_COL = "rawFloatCol";
   private static final String RAW_DOUBLE_COL = "rawDoubleCol";
 
-  private static final Schema SCHEMA = new Schema.SchemaBuilder()
-      .addSingleValueDimension(DICTIONARIZED_INT_COL, FieldSpec.DataType.INT)
-      .addSingleValueDimension(RAW_INT_COL, FieldSpec.DataType.INT)
-      .addSingleValueDimension(RAW_LONG_COL, FieldSpec.DataType.LONG)
-      .addSingleValueDimension(RAW_FLOAT_COL, FieldSpec.DataType.FLOAT)
-      .addSingleValueDimension(RAW_DOUBLE_COL, FieldSpec.DataType.DOUBLE)
-      .build();
-
-  private static final TableConfig TABLE_CONFIG =
-      new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME)
-          .setNoDictionaryColumns(Arrays.asList(RAW_INT_COL, RAW_LONG_COL, RAW_FLOAT_COL, RAW_DOUBLE_COL))
-          .setRangeIndexColumns(Arrays.asList(DICTIONARIZED_INT_COL, RAW_INT_COL, RAW_LONG_COL, RAW_FLOAT_COL,
-              RAW_DOUBLE_COL))
-          .build();
+  private static final Schema SCHEMA =
+      new Schema.SchemaBuilder().addSingleValueDimension(DICTIONARIZED_INT_COL, FieldSpec.DataType.INT)
+          .addSingleValueDimension(RAW_INT_COL, FieldSpec.DataType.INT)
+          .addSingleValueDimension(RAW_LONG_COL, FieldSpec.DataType.LONG)
+          .addSingleValueDimension(RAW_FLOAT_COL, FieldSpec.DataType.FLOAT)
+          .addSingleValueDimension(RAW_DOUBLE_COL, FieldSpec.DataType.DOUBLE).build();
+
+  private static final TableConfig TABLE_CONFIG = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME)
+      .setNoDictionaryColumns(Arrays.asList(RAW_INT_COL, RAW_LONG_COL, RAW_FLOAT_COL, RAW_DOUBLE_COL))
+      .setRangeIndexColumns(
+          Arrays.asList(DICTIONARIZED_INT_COL, RAW_INT_COL, RAW_LONG_COL, RAW_FLOAT_COL, RAW_DOUBLE_COL)).build();
 
   private IndexSegment _indexSegment;
   private List<IndexSegment> _indexSegments;
@@ -134,6 +130,7 @@ public void setUp()
 
   @DataProvider
   public static Object[][] selectionTestCases() {
+    //@formatter:off
     return new Object[][]{
         {buildSelectionQuery(DICTIONARIZED_INT_COL, 250, 500, true), 250, 500, true},
         {buildSelectionQuery(RAW_INT_COL, 250, 500, true), 250, 500, true},
@@ -154,27 +151,51 @@ public static Object[][] selectionTestCases() {
         {buildSelectionQuery(RAW_INT_COL, 301), 301, 301, true},
         {buildSelectionQuery(RAW_LONG_COL, 301), 301, 301, true},
         {buildSelectionQuery(RAW_FLOAT_COL, 301), 301, 301, true},
-        {buildSelectionQuery(RAW_DOUBLE_COL, 301), 301, 301, true}
+        {buildSelectionQuery(RAW_DOUBLE_COL, 301), 301, 301, true},
+
+        // Boundary value
+        {buildSelectionQuery(DICTIONARIZED_INT_COL, 0, 500, true), 0, 500, true},
+        {buildSelectionQuery(RAW_INT_COL, 0, 500, true), 0, 500, true},
+        {buildSelectionQuery(RAW_LONG_COL, 0, 500, true), 0, 500, true},
+        {buildSelectionQuery(RAW_FLOAT_COL, 0, 500, true), 0, 500, true},
+        {buildSelectionQuery(RAW_DOUBLE_COL, 0, 500, true), 0, 500, true},
+        {buildSelectionQuery(DICTIONARIZED_INT_COL, 99500, 99900, false), 99500, 99900, false},
+        {buildSelectionQuery(RAW_INT_COL, 99500, 99900, false), 99500, 99900, false},
+        {buildSelectionQuery(RAW_LONG_COL, 99500, 99900, false), 99500, 99900, false},
+        {buildSelectionQuery(RAW_FLOAT_COL, 99500, 99900, false), 99500, 99900, false},
+        {buildSelectionQuery(RAW_DOUBLE_COL, 99500, 99900, false), 99500, 99900, false},
+        {buildSelectionQuery(DICTIONARIZED_INT_COL, 0), 0, 0, true},
+        {buildSelectionQuery(RAW_INT_COL, 0), 0, 0, true},
+        {buildSelectionQuery(RAW_LONG_COL, 0), 0, 0, true},
+        {buildSelectionQuery(RAW_FLOAT_COL, 0), 0, 0, true},
+        {buildSelectionQuery(RAW_DOUBLE_COL, 0), 0, 0, true},
+        {buildSelectionQuery(DICTIONARIZED_INT_COL, 99900), 99900, 99900, true},
+        {buildSelectionQuery(RAW_INT_COL, 99900), 99900, 99900, true},
+        {buildSelectionQuery(RAW_LONG_COL, 99900), 99900, 99900, true},
+        {buildSelectionQuery(RAW_FLOAT_COL, 99900), 99900, 99900, true},
+        {buildSelectionQuery(RAW_DOUBLE_COL, 99900), 99900, 99900, true}
     };
+    //@formatter:on
   }
 
   private static String buildSelectionQuery(String filterCol, Number min, Number max, boolean inclusive) {
     if (inclusive) {
-      return "select " + RAW_INT_COL + " from " + RAW_TABLE_NAME + " where " + filterCol + " between "
-          + buildFilter(filterCol, min, max);
+      return "select " + RAW_INT_COL + " from " + RAW_TABLE_NAME + " where " + filterCol + " between " + buildFilter(
+          filterCol, min, max);
     } else {
-      return "select " + RAW_INT_COL + " from " + RAW_TABLE_NAME + " where " + filterCol + " > "
-          + formatValue(filterCol, min) + " and " + filterCol + " < " + formatValue(filterCol, max);
+      return "select " + RAW_INT_COL + " from " + RAW_TABLE_NAME + " where " + filterCol + " > " + formatValue(
+          filterCol, min) + " and " + filterCol + " < " + formatValue(filterCol, max);
     }
   }
 
   private static String buildSelectionQuery(String filterCol, Number value) {
-      return "select " + RAW_INT_COL + " from " + RAW_TABLE_NAME + " where " + filterCol + " = "
-              + formatValue(filterCol, value);
+    return "select " + RAW_INT_COL + " from " + RAW_TABLE_NAME + " where " + filterCol + " = " + formatValue(filterCol,
+        value);
   }
 
   @DataProvider
   public static Object[][] countTestCases() {
+    //@formatter:off
     return new Object[][]{
         {buildCountQuery(DICTIONARIZED_INT_COL, 250, 500, true), 3},
         {buildCountQuery(RAW_INT_COL, 250, 500, true), 3},
@@ -195,17 +216,40 @@ public static Object[][] countTestCases() {
         {buildCountQuery(RAW_INT_COL, 301), 0},
         {buildCountQuery(RAW_LONG_COL, 301), 0},
         {buildCountQuery(RAW_FLOAT_COL, 301), 0},
-        {buildCountQuery(RAW_DOUBLE_COL, 301), 0}
+        {buildCountQuery(RAW_DOUBLE_COL, 301), 0},
+
+        // Boundary value
+        {buildCountQuery(DICTIONARIZED_INT_COL, 0, 500, true), 6},
+        {buildCountQuery(RAW_INT_COL, 0, 500, true), 6},
+        {buildCountQuery(RAW_LONG_COL, 0, 500, true), 6},
+        {buildCountQuery(RAW_FLOAT_COL, 0, 500, true), 6},
+        {buildCountQuery(RAW_DOUBLE_COL, 0, 500, true), 6},
+        {buildCountQuery(DICTIONARIZED_INT_COL, 99500, 99900, false), 3},
+        {buildCountQuery(RAW_INT_COL, 99500, 99900, false), 3},
+        {buildCountQuery(RAW_LONG_COL, 99500, 99900, false), 3},
+        {buildCountQuery(RAW_FLOAT_COL, 99500, 99900, false), 3},
+        {buildCountQuery(RAW_DOUBLE_COL, 99500, 99900, false), 3},
+        {buildCountQuery(DICTIONARIZED_INT_COL, 0), 1},
+        {buildCountQuery(RAW_INT_COL, 0), 1},
+        {buildCountQuery(RAW_LONG_COL, 0), 1},
+        {buildCountQuery(RAW_FLOAT_COL, 0), 1},
+        {buildCountQuery(RAW_DOUBLE_COL, 0), 1},
+        {buildCountQuery(DICTIONARIZED_INT_COL, 99900), 1},
+        {buildCountQuery(RAW_INT_COL, 99900), 1},
+        {buildCountQuery(RAW_LONG_COL, 99900), 1},
+        {buildCountQuery(RAW_FLOAT_COL, 99900), 1},
+        {buildCountQuery(RAW_DOUBLE_COL, 99900), 1}
     };
+    //@formatter:on
   }
 
   private static String buildCountQuery(String filterCol, Number min, Number max, boolean inclusive) {
     if (inclusive) {
-      return "select count(*) from " + RAW_TABLE_NAME + " where " + filterCol + " between "
-          + buildFilter(filterCol, min, max);
+      return "select count(*) from " + RAW_TABLE_NAME + " where " + filterCol + " between " + buildFilter(filterCol,
+          min, max);
     } else {
-      return "select count(*) from " + RAW_TABLE_NAME + " where " + filterCol + " > "
-          + formatValue(filterCol, min) + " and " + filterCol + " < " + formatValue(filterCol, max);
+      return "select count(*) from " + RAW_TABLE_NAME + " where " + filterCol + " > " + formatValue(filterCol, min)
+          + " and " + filterCol + " < " + formatValue(filterCol, max);
     }
   }
 
@@ -257,7 +301,7 @@ public void testSelectionOverRangeFilterAfterReload(String query, int min, int m
       throws Exception {
     // Enable dictionary on RAW_INT_COL and reload the segment.
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, TABLE_CONFIG);
-    indexLoadingConfig.getNoDictionaryColumns().remove(RAW_INT_COL);
+    indexLoadingConfig.removeNoDictionaryColumns(RAW_INT_COL);
     File indexDir = new File(INDEX_DIR, SEGMENT_NAME);
     ImmutableSegment immutableSegment = reloadSegment(indexDir, indexLoadingConfig, SCHEMA);
     _indexSegment = immutableSegment;
@@ -273,7 +317,7 @@ public void testSelectionOverRangeFilterAfterReload(String query, int min, int m
 
     // Enable dictionary on RAW_DOUBLE_COL and reload the segment.
     indexLoadingConfig = new IndexLoadingConfig(null, TABLE_CONFIG);
-    indexLoadingConfig.getNoDictionaryColumns().remove(RAW_DOUBLE_COL);
+    indexLoadingConfig.removeNoDictionaryColumns(RAW_DOUBLE_COL);
     indexDir = new File(INDEX_DIR, SEGMENT_NAME);
     immutableSegment = reloadSegment(indexDir, indexLoadingConfig, SCHEMA);
     _indexSegment = immutableSegment;
@@ -303,13 +347,12 @@ public void testCountOverRangeFilterAfterReload(String query, int expectedCount)
       throws Exception {
     // Enable dictionary on RAW_LONG_COL and reload the segment.
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, TABLE_CONFIG);
-    indexLoadingConfig.getNoDictionaryColumns().remove(RAW_LONG_COL);
+    indexLoadingConfig.removeNoDictionaryColumns(RAW_LONG_COL);
     File indexDir = new File(INDEX_DIR, SEGMENT_NAME);
     ImmutableSegment immutableSegment = reloadSegment(indexDir, indexLoadingConfig, SCHEMA);
     _indexSegment = immutableSegment;
     _indexSegments = Arrays.asList(immutableSegment, immutableSegment);
 
-
     Operator<?> operator = getOperator(query);
     assertTrue(operator instanceof FastFilteredCountOperator);
     List<Object> aggregationResult = ((FastFilteredCountOperator) operator).nextBlock().getResults();
@@ -319,7 +362,7 @@ public void testCountOverRangeFilterAfterReload(String query, int expectedCount)
 
     // Enable dictionary on RAW_FLOAT_COL and reload the segment.
     indexLoadingConfig = new IndexLoadingConfig(null, TABLE_CONFIG);
-    indexLoadingConfig.getNoDictionaryColumns().remove(RAW_FLOAT_COL);
+    indexLoadingConfig.removeNoDictionaryColumns(RAW_FLOAT_COL);
     immutableSegment = reloadSegment(indexDir, indexLoadingConfig, SCHEMA);
     _indexSegment = immutableSegment;
     _indexSegments = Arrays.asList(immutableSegment, immutableSegment);
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ResultRewriterRegressionTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ResultRewriterRegressionTest.java
new file mode 100644
index 00000000000..0e4cd336a5d
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ResultRewriterRegressionTest.java
@@ -0,0 +1,69 @@
+/**
+ * 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.pinot.queries;
+
+import org.apache.pinot.core.query.utils.rewriter.ResultRewriterFactory;
+import org.apache.pinot.sql.parsers.rewriter.QueryRewriterFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * Regression test for queries with result rewriter.
+ */
+public class ResultRewriterRegressionTest {
+
+  @Test
+  public static class StatsQueriesRegressionTest extends StatisticalQueriesTest {
+    @BeforeClass
+    public void setupRewriter()
+        throws Exception {
+      QueryRewriterFactory.init(String.join(",", QueryRewriterFactory.DEFAULT_QUERY_REWRITERS_CLASS_NAMES)
+          + ",org.apache.pinot.sql.parsers.rewriter.ArgMinMaxRewriter");
+      ResultRewriterFactory
+          .init("org.apache.pinot.core.query.utils.rewriter.ParentAggregationResultRewriter");
+    }
+  }
+
+  @Test
+  public static class HistogramQueriesRegressionTest extends HistogramQueriesTest {
+    @BeforeClass
+    public void setupRewriter()
+        throws Exception {
+      QueryRewriterFactory.init(String.join(",", QueryRewriterFactory.DEFAULT_QUERY_REWRITERS_CLASS_NAMES)
+          + ",org.apache.pinot.sql.parsers.rewriter.ArgMinMaxRewriter");
+      ResultRewriterFactory
+          .init("org.apache.pinot.core.query.utils.rewriter.ParentAggregationResultRewriter");
+    }
+  }
+
+  @Test
+  public static class InterSegmentAggregationMultiValueQueriesRegressionTest
+      extends InterSegmentAggregationMultiValueQueriesTest {
+    @BeforeClass
+    public void setupRewriter()
+        throws Exception {
+      QueryRewriterFactory.init(String.join(",", QueryRewriterFactory.DEFAULT_QUERY_REWRITERS_CLASS_NAMES)
+          + ",org.apache.pinot.sql.parsers.rewriter.ArgMinMaxRewriter");
+      ResultRewriterFactory
+          .init("org.apache.pinot.core.query.utils.rewriter.ParentAggregationResultRewriter");
+    }
+  }
+}
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/ScanBasedANDFilterReorderingTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/ScanBasedANDFilterReorderingTest.java
index 739f264fc7c..de6528e7971 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/ScanBasedANDFilterReorderingTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/ScanBasedANDFilterReorderingTest.java
@@ -35,6 +35,8 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
@@ -130,7 +132,8 @@ public void buildSegment()
       segmentGeneratorConfig.setInputFilePath(filePath);
       segmentGeneratorConfig.setTableName("testTable");
       segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-      segmentGeneratorConfig.setInvertedIndexCreationColumns(Arrays.asList("column3", "column8", "column9"));
+      segmentGeneratorConfig.setIndexOn(
+          StandardIndexes.inverted(), IndexConfig.ENABLED, "column3", "column8", "column9");
 
       // Build the index segment.
       SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
diff --git a/pinot-core/src/test/java/org/apache/pinot/queries/TextSearchQueriesTest.java b/pinot-core/src/test/java/org/apache/pinot/queries/TextSearchQueriesTest.java
index 688d2290230..ea164c0e6a4 100644
--- a/pinot-core/src/test/java/org/apache/pinot/queries/TextSearchQueriesTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/queries/TextSearchQueriesTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.queries;
 
+import com.google.common.collect.ImmutableMap;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -61,10 +62,14 @@
 import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeLuceneTextIndex;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexConfigBuilder;
 import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.spi.config.table.FieldConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -195,19 +200,16 @@ private void buildSegment()
     config.setOutDir(INDEX_DIR.getPath());
     config.setTableName(TABLE_NAME);
     config.setSegmentName(SEGMENT_NAME);
-    Map<String, Map<String, String>> columnProperties = new HashMap<>();
-    Map<String, String> props = new HashMap<>();
-    props.put(FieldConfig.TEXT_INDEX_NO_RAW_DATA, "true");
-    props.put(FieldConfig.TEXT_INDEX_RAW_VALUE, "ILoveCoding");
-    columnProperties.put(SKILLS_TEXT_NO_RAW_NAME, props);
-    props = new HashMap<>();
-    props.put(FieldConfig.TEXT_INDEX_STOP_WORD_INCLUDE_KEY, "coordinator");
-    props.put(FieldConfig.TEXT_INDEX_STOP_WORD_EXCLUDE_KEY, "it, those");
-    columnProperties.put(SKILLS_TEXT_COL_NAME, props);
-    props = new HashMap<>();
-    props.put(FieldConfig.TEXT_INDEX_STOP_WORD_EXCLUDE_KEY, "");
-    columnProperties.put(SKILLS_TEXT_COL_DICT_NAME, props);
-    config.setColumnProperties(columnProperties);
+    addTextIndexProp(config, SKILLS_TEXT_NO_RAW_NAME, ImmutableMap.<String, String>builder()
+        .put(FieldConfig.TEXT_INDEX_NO_RAW_DATA, "true")
+        .put(FieldConfig.TEXT_INDEX_RAW_VALUE, "ILoveCoding")
+        .build());
+    addTextIndexProp(config, SKILLS_TEXT_COL_NAME, ImmutableMap.<String, String>builder()
+        .put(FieldConfig.TEXT_INDEX_STOP_WORD_INCLUDE_KEY, "coordinator")
+        .put(FieldConfig.TEXT_INDEX_STOP_WORD_EXCLUDE_KEY, "it, those")
+        .build());
+    addTextIndexProp(config, SKILLS_TEXT_COL_DICT_NAME,
+        Collections.singletonMap(FieldConfig.TEXT_INDEX_STOP_WORD_EXCLUDE_KEY, ""));
     SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
     try (RecordReader recordReader = new GenericRowRecordReader(rows)) {
       driver.init(config, recordReader);
@@ -215,6 +217,18 @@ private void buildSegment()
     }
   }
 
+
+  private void addTextIndexProp(SegmentGeneratorConfig config, String colName, Map<String, String> propMap) {
+    FieldIndexConfigs fieldIndexConfigs = config.getIndexConfigsByColName().get(colName);
+    TextIndexConfig textConfig = fieldIndexConfigs.getConfig(StandardIndexes.text());
+
+    TextIndexConfig newTextConfig = new TextIndexConfigBuilder(textConfig)
+        .withProperties(propMap)
+        .build();
+
+    config.setIndexOn(StandardIndexes.text(), newTextConfig, colName);
+  }
+
   private List<GenericRow> createTestData()
       throws Exception {
     List<GenericRow> rows = new ArrayList<>();
diff --git a/pinot-core/src/test/java/org/apache/pinot/realtime/converter/RealtimeSegmentConverterTest.java b/pinot-core/src/test/java/org/apache/pinot/realtime/converter/RealtimeSegmentConverterTest.java
index 9cfee253773..28df031be2e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/realtime/converter/RealtimeSegmentConverterTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/realtime/converter/RealtimeSegmentConverterTest.java
@@ -33,7 +33,10 @@
 import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
 import org.apache.pinot.segment.local.segment.virtualcolumn.VirtualColumnProviderFactory;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -105,12 +108,15 @@ public void testNoRecordsIndexed()
     String segmentName = "testTable__0__0__123456";
     IndexingConfig indexingConfig = tableConfig.getIndexingConfig();
 
+    DictionaryIndexConfig varLengthDictConf = new DictionaryIndexConfig(false, true);
+
     RealtimeSegmentConfig.Builder realtimeSegmentConfigBuilder =
         new RealtimeSegmentConfig.Builder().setTableNameWithType(tableNameWithType).setSegmentName(segmentName)
             .setStreamName(tableNameWithType).setSchema(schema).setTimeColumnName(DATE_TIME_COLUMN).setCapacity(1000)
-            .setAvgNumMultiValues(3).setNoDictionaryColumns(Sets.newHashSet(LONG_COLUMN2))
-            .setVarLengthDictionaryColumns(Sets.newHashSet(STRING_COLUMN3))
-            .setInvertedIndexColumns(Sets.newHashSet(STRING_COLUMN1))
+            .setAvgNumMultiValues(3)
+            .setIndex(Sets.newHashSet(LONG_COLUMN2), StandardIndexes.dictionary(), DictionaryIndexConfig.DISABLED)
+            .setIndex(Sets.newHashSet(Sets.newHashSet(STRING_COLUMN3)), StandardIndexes.dictionary(), varLengthDictConf)
+            .setIndex(Sets.newHashSet(STRING_COLUMN1), StandardIndexes.inverted(), IndexConfig.ENABLED)
             .setSegmentZKMetadata(getSegmentZKMetadata(segmentName)).setOffHeap(true)
             .setMemoryManager(new DirectMemoryManager(segmentName))
             .setStatsHistory(RealtimeSegmentStatsHistory.deserialzeFrom(new File(tmpDir, "stats")))
diff --git a/pinot-core/src/test/java/org/apache/pinot/util/QueryMultiThreadingUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/util/QueryMultiThreadingUtilsTest.java
new file mode 100644
index 00000000000..92ac06f9677
--- /dev/null
+++ b/pinot-core/src/test/java/org/apache/pinot/util/QueryMultiThreadingUtilsTest.java
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.util;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.pinot.core.util.QueryMultiThreadingUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class QueryMultiThreadingUtilsTest {
+  @Test
+  public void testGetNumTasksForQuery() {
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasksForQuery(1, 2), 1);
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasksForQuery(3, 2), 2);
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasksForQuery(0, -1), 1);
+    int numOps = QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY;
+    // TaskUtils.MAX_NUM_THREADS_PER_QUERY at max
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasksForQuery(numOps + 10, -1),
+        QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY);
+    // But 1 at min
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasksForQuery(numOps - 1, -1), Math.max(1, numOps - 1));
+  }
+
+  @Test
+  public void testGetNumTasks() {
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasks(2, 3, 4), 1);
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasks(7, 3, 4), 3);
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasks(9, 3, 4), 3);
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasks(10, 3, 4), 4);
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasks(100, 3, 4), 4);
+    int targetPerThread = 5;
+    int numWorkUnits = QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY * targetPerThread;
+    Assert.assertEquals(QueryMultiThreadingUtils.getNumTasks(numWorkUnits + 10, targetPerThread, -1),
+        QueryMultiThreadingUtils.MAX_NUM_THREADS_PER_QUERY);
+  }
+
+  @Test
+  public void testRunTasksWithDeadline() {
+    ExecutorService exec = Executors.newCachedThreadPool();
+    AtomicInteger sum = new AtomicInteger(0);
+    QueryMultiThreadingUtils.runTasksWithDeadline(5, index -> index, sum::addAndGet, e -> {
+    }, exec, System.currentTimeMillis() + 500);
+    // sum of 0, 1, .., 4 indices.
+    Assert.assertEquals(sum.get(), 10);
+
+    // Task throws exception before timeout.
+    Exception[] err = new Exception[1];
+    QueryMultiThreadingUtils.runTasksWithDeadline(5, index -> {
+      throw new RuntimeException("oops: " + index);
+    }, sum::addAndGet, e -> err[0] = e, exec, System.currentTimeMillis() + 500);
+    Assert.assertTrue(err[0].getMessage().contains("oops"));
+
+    // Task timed out.
+    QueryMultiThreadingUtils.runTasksWithDeadline(5, index -> {
+      try {
+        Thread.sleep(10_000);
+        return index;
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
+    }, sum::addAndGet, e -> err[0] = e, exec, System.currentTimeMillis() + 500);
+    Assert.assertTrue(err[0] instanceof TimeoutException);
+  }
+}
diff --git a/pinot-distribution/pinot-assembly.xml b/pinot-distribution/pinot-assembly.xml
index 1c92fd1bccf..73aefa1c110 100644
--- a/pinot-distribution/pinot-assembly.xml
+++ b/pinot-distribution/pinot-assembly.xml
@@ -46,14 +46,6 @@
     </file>
     <!-- Start Include Pinot Plugins-->
     <!-- Start Include Pinot Stream Ingestion Plugins-->
-    <file>
-      <source>
-        ${pinot.root}/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/target/pinot-kafka-0.9-${project.version}-shaded.jar
-      </source>
-      <destName>
-        plugins/pinot-stream-ingestion/pinot-kafka-0.9/pinot-kafka-0.9-${project.version}-shaded.jar
-      </destName>
-    </file>
     <file>
       <source>
         ${pinot.root}/pinot-plugins/pinot-stream-ingestion/pinot-kafka-${kafka.version}/target/pinot-kafka-${kafka.version}-${project.version}-shaded.jar
diff --git a/pinot-integration-test-base/pom.xml b/pinot-integration-test-base/pom.xml
index 510dfe1cde2..7e081dda34e 100644
--- a/pinot-integration-test-base/pom.xml
+++ b/pinot-integration-test-base/pom.xml
@@ -35,11 +35,6 @@
 
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <localstack-utils.version>0.2.11</localstack-utils.version>
-    <awaitility.version>3.0.0</awaitility.version>
-    <aws.sdk.version>2.14.28</aws.sdk.version>
-    <!-- TODO: delete this prop once all the checkstyle warnings are fixed -->
-    <checkstyle.fail.on.violation>false</checkstyle.fail.on.violation>
   </properties>
 
   <build>
@@ -93,12 +88,6 @@
     <dependency>
       <groupId>com.101tec</groupId>
       <artifactId>zkclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.pinot</groupId>
diff --git a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
index 11ffabe953a..42ea2c0baeb 100644
--- a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
+++ b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
@@ -18,13 +18,13 @@
  */
 package org.apache.pinot.integration.tests;
 
-import com.google.common.base.Function;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,6 +37,7 @@
 import org.apache.pinot.client.ConnectionFactory;
 import org.apache.pinot.common.utils.TarGzCompressionUtils;
 import org.apache.pinot.common.utils.config.TagNameUtils;
+import org.apache.pinot.plugin.inputformat.csv.CSVMessageDecoder;
 import org.apache.pinot.plugin.stream.kafka.KafkaStreamConfigProperties;
 import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
 import org.apache.pinot.spi.config.table.DedupConfig;
@@ -54,6 +55,8 @@
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.stream.StreamConfig;
 import org.apache.pinot.spi.stream.StreamConfigProperties;
+import org.apache.pinot.spi.stream.StreamDataProducer;
+import org.apache.pinot.spi.stream.StreamDataProvider;
 import org.apache.pinot.spi.stream.StreamDataServerStartable;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
@@ -262,7 +265,7 @@ protected IngestionConfig getIngestionConfig() {
     return null;
   }
 
-  protected QueryConfig getQueryconfig() {
+  protected QueryConfig getQueryConfig() {
     // Enable groovy for tables used in the tests
     return new QueryConfig(null, false, null, null);
   }
@@ -276,11 +279,6 @@ protected SegmentPartitionConfig getSegmentPartitionConfig() {
     return null;
   }
 
-  /**
-   * The following methods are based on the getters. Override the getters for non-default settings before calling these
-   * methods.
-   */
-
   /**
    * Creates a new schema.
    */
@@ -323,7 +321,7 @@ protected TableConfig createOfflineTableConfig() {
         .setRangeIndexColumns(getRangeIndexColumns()).setBloomFilterColumns(getBloomFilterColumns())
         .setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas()).setSegmentVersion(getSegmentVersion())
         .setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig()).setBrokerTenant(getBrokerTenant())
-        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryconfig())
+        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryConfig())
         .setNullHandlingEnabled(getNullHandlingEnabled()).setSegmentPartitionConfig(getSegmentPartitionConfig())
         .build();
   }
@@ -394,18 +392,22 @@ protected TableConfig createRealtimeTableConfig(File sampleAvroFile) {
         .setRangeIndexColumns(getRangeIndexColumns()).setBloomFilterColumns(getBloomFilterColumns())
         .setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas()).setSegmentVersion(getSegmentVersion())
         .setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig()).setBrokerTenant(getBrokerTenant())
-        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryconfig())
+        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryConfig())
         .setLLC(useLlc()).setStreamConfigs(getStreamConfigs()).setNullHandlingEnabled(getNullHandlingEnabled()).build();
   }
 
   /**
    * Creates a new Upsert enabled table config.
    */
-  protected TableConfig createUpsertTableConfig(File sampleAvroFile, String primaryKeyColumn, int numPartitions) {
+  protected TableConfig createUpsertTableConfig(File sampleAvroFile, String primaryKeyColumn, String deleteColumn,
+      int numPartitions) {
     AvroFileSchemaKafkaAvroMessageDecoder._avroFile = sampleAvroFile;
     Map<String, ColumnPartitionConfig> columnPartitionConfigMap = new HashMap<>();
     columnPartitionConfigMap.put(primaryKeyColumn, new ColumnPartitionConfig("Murmur", numPartitions));
 
+    UpsertConfig upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setDeleteRecordColumn(deleteColumn);
+
     return new TableConfigBuilder(TableType.REALTIME).setTableName(getTableName()).setSchemaName(getSchemaName())
         .setTimeColumnName(getTimeColumnName()).setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas())
         .setSegmentVersion(getSegmentVersion()).setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig())
@@ -414,7 +416,62 @@ protected TableConfig createUpsertTableConfig(File sampleAvroFile, String primar
         .setRoutingConfig(new RoutingConfig(null, null, RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE))
         .setSegmentPartitionConfig(new SegmentPartitionConfig(columnPartitionConfigMap))
         .setReplicaGroupStrategyConfig(new ReplicaGroupStrategyConfig(primaryKeyColumn, 1))
-        .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL)).build();
+        .setUpsertConfig(upsertConfig).build();
+  }
+
+  protected Map<String, String> getCSVDecoderProperties(@Nullable String delimiter,
+      @Nullable String csvHeaderProperty) {
+    String streamType = "kafka";
+    Map<String, String> csvDecoderProperties = new HashMap<>();
+    csvDecoderProperties.put(
+        StreamConfigProperties.constructStreamProperty(streamType, StreamConfigProperties.STREAM_DECODER_CLASS),
+        CSVMessageDecoder.class.getName());
+    if (delimiter != null) {
+      csvDecoderProperties.put(StreamConfigProperties.constructStreamProperty(streamType, "decoder.prop.delimiter"),
+          delimiter);
+    }
+    if (csvHeaderProperty != null) {
+      csvDecoderProperties.put(StreamConfigProperties.constructStreamProperty(streamType, "decoder.prop.header"),
+          csvHeaderProperty);
+    }
+    return csvDecoderProperties;
+  }
+
+  /**
+   * Creates a new Upsert enabled table config.
+   */
+  protected TableConfig createCSVUpsertTableConfig(String tableName, @Nullable String schemaName,
+      @Nullable String kafkaTopicName, int numPartitions, Map<String, String> streamDecoderProperties,
+      UpsertConfig upsertConfig, String primaryKeyColumn) {
+    if (schemaName == null) {
+      schemaName = getSchemaName();
+    }
+    Map<String, ColumnPartitionConfig> columnPartitionConfigMap = new HashMap<>();
+    columnPartitionConfigMap.put(primaryKeyColumn, new ColumnPartitionConfig("Murmur", numPartitions));
+
+    if (upsertConfig == null) {
+      upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    }
+    if (kafkaTopicName == null) {
+      kafkaTopicName = getKafkaTopic();
+    }
+
+    Map<String, String> streamConfigsMap = getStreamConfigMap();
+    streamConfigsMap.put(
+        StreamConfigProperties.constructStreamProperty("kafka", StreamConfigProperties.STREAM_TOPIC_NAME),
+        kafkaTopicName);
+    streamConfigsMap.putAll(streamDecoderProperties);
+
+    return new TableConfigBuilder(TableType.REALTIME).setTableName(tableName).setSchemaName(schemaName)
+        .setTimeColumnName(getTimeColumnName()).setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas())
+        .setSegmentVersion(getSegmentVersion()).setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig())
+        .setBrokerTenant(getBrokerTenant()).setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig())
+        .setLLC(useLlc()).setStreamConfigs(streamConfigsMap)
+        .setNullHandlingEnabled(UpsertConfig.Mode.PARTIAL.equals(upsertConfig.getMode()) || getNullHandlingEnabled())
+        .setRoutingConfig(new RoutingConfig(null, null, RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE))
+        .setSegmentPartitionConfig(new SegmentPartitionConfig(columnPartitionConfigMap))
+        .setReplicaGroupStrategyConfig(new ReplicaGroupStrategyConfig(primaryKeyColumn, 1))
+        .setUpsertConfig(upsertConfig).build();
   }
 
   /**
@@ -450,11 +507,18 @@ protected TableConfig getRealtimeTableConfig() {
    */
   protected org.apache.pinot.client.Connection getPinotConnection() {
     if (_pinotConnection == null) {
-      _pinotConnection = ConnectionFactory.fromZookeeper(getZkUrl() + "/" + getHelixClusterName());
+      _pinotConnection =
+          ConnectionFactory.fromZookeeper(getPinotConnectionProperties(), getZkUrl() + "/" + getHelixClusterName());
     }
     return _pinotConnection;
   }
 
+  protected Properties getPinotConnectionProperties() {
+    Properties properties = new Properties();
+    properties.putAll(getExtraQueryProperties());
+    return properties;
+  }
+
   /**
    * Get the H2 connection. H2 connection must be set up before calling this method.
    *
@@ -503,17 +567,23 @@ protected void setUpQueryGenerator(List<File> avroFiles) {
     _queryGenerator = new QueryGenerator(avroFiles, tableName, tableName);
   }
 
+  protected List<File> unpackAvroData(File outputDir)
+      throws Exception {
+    return unpackTarData(getAvroTarFileName(), outputDir);
+  }
+
   /**
-   * Unpack the tarred Avro data into the given directory.
+   * Unpack the tarred data into the given directory.
    *
+   * @param tarFileName Input tar filename
    * @param outputDir Output directory
    * @return List of files unpacked.
    * @throws Exception
    */
-  protected List<File> unpackAvroData(File outputDir)
+  protected List<File> unpackTarData(String tarFileName, File outputDir)
       throws Exception {
     InputStream inputStream =
-        BaseClusterIntegrationTest.class.getClassLoader().getResourceAsStream(getAvroTarFileName());
+        BaseClusterIntegrationTest.class.getClassLoader().getResourceAsStream(tarFileName);
     Assert.assertNotNull(inputStream);
     return TarGzCompressionUtils.untar(inputStream, outputDir);
   }
@@ -525,11 +595,58 @@ protected List<File> unpackAvroData(File outputDir)
    */
   protected void pushAvroIntoKafka(List<File> avroFiles)
       throws Exception {
-
     ClusterIntegrationTestUtils.pushAvroIntoKafka(avroFiles, "localhost:" + getKafkaPort(), getKafkaTopic(),
         getMaxNumKafkaMessagesPerBatch(), getKafkaMessageHeader(), getPartitionColumn(), injectTombstones());
   }
 
+  /**
+   * Pushes the data in the given Avro files into a Kafka stream.
+   *
+   * @param csvFile List of CSV strings
+   */
+  protected void pushCsvIntoKafka(File csvFile, String kafkaTopic, @Nullable Integer partitionColumnIndex)
+      throws Exception {
+    String kafkaBroker = "localhost:" + getKafkaPort();
+    StreamDataProducer producer = null;
+    try {
+      producer =
+          StreamDataProvider.getStreamDataProducer(KafkaStarterUtils.KAFKA_PRODUCER_CLASS_NAME,
+              getDefaultKafkaProducerProperties(kafkaBroker));
+      ClusterIntegrationTestUtils.pushCsvIntoKafka(csvFile, kafkaTopic, partitionColumnIndex, injectTombstones(),
+          producer);
+    } catch (Exception e) {
+      if (producer != null) {
+        producer.close();
+      }
+      throw e;
+    }
+  }
+
+  protected void pushCsvIntoKafka(List<String> csvRecords, String kafkaTopic, @Nullable Integer partitionColumnIndex) {
+    String kafkaBroker = "localhost:" + getKafkaPort();
+    StreamDataProducer producer = null;
+    try {
+      producer =
+          StreamDataProvider.getStreamDataProducer(KafkaStarterUtils.KAFKA_PRODUCER_CLASS_NAME,
+              getDefaultKafkaProducerProperties(kafkaBroker));
+      ClusterIntegrationTestUtils.pushCsvIntoKafka(csvRecords, kafkaTopic, partitionColumnIndex, injectTombstones(),
+          producer);
+    } catch (Exception e) {
+      if (producer != null) {
+        producer.close();
+      }
+    }
+  }
+
+  private Properties getDefaultKafkaProducerProperties(String kafkaBroker) {
+    Properties properties = new Properties();
+    properties.put("metadata.broker.list", kafkaBroker);
+    properties.put("serializer.class", "kafka.serializer.DefaultEncoder");
+    properties.put("request.required.acks", "1");
+    properties.put("partitioner.class", "kafka.producer.ByteArrayPartitioner");
+    return properties;
+  }
+
   protected boolean injectTombstones() {
     return false;
   }
@@ -603,26 +720,14 @@ protected long getCurrentCountStarResult(String tableName) {
    */
   protected void waitForAllDocsLoaded(long timeoutMs)
       throws Exception {
-    waitForDocsLoaded(timeoutMs, true);
-  }
-
-  protected void waitForDocsLoaded(long timeoutMs, boolean raiseError) {
-    waitForDocsLoaded(timeoutMs, raiseError, getTableName());
+    waitForDocsLoaded(timeoutMs, true, getTableName());
   }
 
   protected void waitForDocsLoaded(long timeoutMs, boolean raiseError, String tableName) {
     final long countStarResult = getCountStarResult();
-    TestUtils.waitForCondition(new Function<Void, Boolean>() {
-      @Nullable
-      @Override
-      public Boolean apply(@Nullable Void aVoid) {
-        try {
-          return getCurrentCountStarResult(tableName) == countStarResult;
-        } catch (Exception e) {
-          return null;
-        }
-      }
-    }, 100L, timeoutMs, "Failed to load " + countStarResult + " documents", raiseError);
+    TestUtils.waitForCondition(
+        () -> getCurrentCountStarResult(tableName) == countStarResult, 100L, timeoutMs,
+        "Failed to load " + countStarResult + " documents", raiseError, Duration.ofMillis(timeoutMs / 10));
   }
 
   /**
@@ -647,7 +752,16 @@ protected void testQuery(String query)
    */
   protected void testQuery(String pinotQuery, String h2Query)
       throws Exception {
-    ClusterIntegrationTestUtils.testQuery(pinotQuery, _brokerBaseApiUrl, getPinotConnection(), h2Query,
-        getH2Connection());
+    ClusterIntegrationTestUtils.testQuery(pinotQuery, getBrokerBaseApiUrl(), getPinotConnection(), h2Query,
+        getH2Connection(), null, getExtraQueryProperties());
+  }
+
+  /**
+   * Run equivalent Pinot and H2 query and compare the results.
+   */
+  protected void testQueryWithMatchingRowCount(String pinotQuery, String h2Query)
+      throws Exception {
+    ClusterIntegrationTestUtils.testQueryWithMatchingRowCount(pinotQuery, getBrokerBaseApiUrl(), getPinotConnection(),
+        h2Query, getH2Connection(), null, getExtraQueryProperties());
   }
 }
diff --git a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterIntegrationTestUtils.java b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterIntegrationTestUtils.java
index 67a1ea78f1c..457b3d29715 100644
--- a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterIntegrationTestUtils.java
+++ b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterIntegrationTestUtils.java
@@ -25,13 +25,16 @@
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Types;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,7 +56,10 @@
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.util.Utf8;
-import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -87,7 +93,6 @@ private ClusterIntegrationTestUtils() {
   // Comparison limit
   public static final int MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE = 5;
   public static final int MAX_NUM_ROWS_TO_COMPARE = 10000;
-  public static final int H2_MULTI_VALUE_SUFFIX_LENGTH = 5;
 
   private static final Random RANDOM = new Random();
 
@@ -133,38 +138,34 @@ public static void setUpH2TableWithAvro(List<File> avroFiles, String tableName,
               h2FieldNameAndTypes.add(buildH2FieldNameAndType(fieldName, type, true));
               break;
             }
-            Assert.fail("Unsupported UNION Avro field: " + fieldName + " with underlying types: " + typesInUnion);
+            Assert.fail(
+                String.format("Unsupported UNION Avro field: %s with underlying types: %s", fieldName, typesInUnion));
             break;
           case ARRAY:
             Schema.Type type = field.schema().getElementType().getType();
             Assert.assertTrue(isSingleValueAvroFieldType(type));
-            // Split multi-value field into MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE single-value fields
-            for (int i = 0; i < MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
-              h2FieldNameAndTypes.add(buildH2FieldNameAndType(fieldName + "__MV" + i, type, true));
-            }
+            // create Array data type based column.
+            h2FieldNameAndTypes.add(buildH2FieldNameAndType(fieldName, type, true, true));
             break;
           default:
             if (isSingleValueAvroFieldType(fieldType)) {
               h2FieldNameAndTypes.add(buildH2FieldNameAndType(fieldName, fieldType, false));
             } else {
-              Assert.fail("Unsupported Avro field: " + fieldName + " with type: " + fieldType);
+              Assert.fail(String.format("Unsupported Avro field: %s with underlying types: %s", fieldName, fieldType));
             }
             break;
         }
       }
 
-      h2Connection.prepareCall("DROP TABLE IF EXISTS " + tableName).execute();
-      h2Connection.prepareCall("CREATE TABLE " + tableName + "(" + StringUtil.join(",",
-          h2FieldNameAndTypes.toArray(new String[h2FieldNameAndTypes.size()])) + ")").execute();
+      h2Connection.prepareCall(String.format("DROP TABLE IF EXISTS %s", tableName)).execute();
+      String columnsStr = StringUtil.join(",", h2FieldNameAndTypes.toArray(new String[0]));
+      h2Connection.prepareCall(String.format("CREATE TABLE %s (%s)", tableName, columnsStr)).execute();
     }
 
     // Insert Avro records into H2 table
-    StringBuilder params = new StringBuilder("?");
-    for (int i = 0; i < h2FieldNameAndTypes.size() - 1; i++) {
-      params.append(",?");
-    }
+    String params = "?" + StringUtils.repeat(",?", h2FieldNameAndTypes.size() - 1);
     PreparedStatement h2Statement =
-        h2Connection.prepareStatement("INSERT INTO " + tableName + " VALUES (" + params.toString() + ")");
+        h2Connection.prepareStatement(String.format("INSERT INTO %s VALUES (%s)", tableName, params));
     for (File avroFile : avroFiles) {
       try (DataFileStream<GenericRecord> reader = AvroUtils.getAvroReader(avroFile)) {
         for (GenericRecord record : reader) {
@@ -173,17 +174,19 @@ public static void setUpH2TableWithAvro(List<File> avroFiles, String tableName,
             Object value = record.get(avroIndex);
             if (value instanceof GenericData.Array) {
               GenericData.Array array = (GenericData.Array) value;
+              Object[] arrayValue = new Object[MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE];
               for (int i = 0; i < MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
                 if (i < array.size()) {
-                  value = array.get(i);
-                  if (value instanceof Utf8) {
-                    value = StringUtil.sanitizeStringValue(value.toString(), FieldSpec.DEFAULT_MAX_LENGTH);
+                  arrayValue[i] = array.get(i);
+                  if (arrayValue[i] instanceof Utf8) {
+                    arrayValue[i] =
+                        StringUtil.sanitizeStringValue(arrayValue[i].toString(), FieldSpec.DEFAULT_MAX_LENGTH);
                   }
                 } else {
-                  value = null;
+                  arrayValue[i] = null;
                 }
-                h2Statement.setObject(h2Index++, value);
               }
+              h2Statement.setObject(h2Index++, arrayValue);
             } else {
               if (value instanceof Utf8) {
                 value = StringUtil.sanitizeStringValue(value.toString(), FieldSpec.DEFAULT_MAX_LENGTH);
@@ -218,6 +221,20 @@ private static boolean isSingleValueAvroFieldType(Schema.Type avroFieldType) {
    * @return H2 field name and type
    */
   private static String buildH2FieldNameAndType(String fieldName, Schema.Type avroFieldType, boolean nullable) {
+    return buildH2FieldNameAndType(fieldName, avroFieldType, nullable, false);
+  }
+
+  /**
+   * Helper method to build H2 field name and type.
+   *
+   * @param fieldName Field name
+   * @param avroFieldType Avro field type
+   * @param nullable Whether the column is nullable
+   * @param arrayType Whether the column is array data type or not
+   * @return H2 field name and type
+   */
+  private static String buildH2FieldNameAndType(String fieldName, Schema.Type avroFieldType, boolean nullable,
+      boolean arrayType) {
     String avroFieldTypeName = avroFieldType.getName();
     String h2FieldType;
     switch (avroFieldTypeName) {
@@ -231,10 +248,14 @@ private static String buildH2FieldNameAndType(String fieldName, Schema.Type avro
         h2FieldType = avroFieldTypeName;
         break;
     }
+    // if column is array data type, add Array with size.
+    if (arrayType) {
+      h2FieldType = String.format("%s  ARRAY[%d]", h2FieldType, MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE);
+    }
     if (nullable) {
-      return fieldName + " " + h2FieldType;
+      return String.format("`%s` %s", fieldName, h2FieldType);
     } else {
-      return fieldName + " " + h2FieldType + " not null";
+      return String.format("`%s` %s not null", fieldName, h2FieldType);
     }
   }
 
@@ -320,6 +341,76 @@ public static void buildSegmentFromAvro(File avroFile, TableConfig tableConfig,
     TarGzCompressionUtils.createTarGzFile(indexDir, segmentTarFile);
   }
 
+  /**
+   * Push the records from the given Avro files into a Kafka stream.
+   *
+   * @param csvFile CSV File name
+   * @param kafkaTopic Kafka topic
+   * @param partitionColumnIndex Optional Index of the partition column
+   * @throws Exception
+   */
+  public static void pushCsvIntoKafka(File csvFile, String kafkaTopic,
+      @Nullable Integer partitionColumnIndex, boolean injectTombstones, StreamDataProducer producer)
+      throws Exception {
+    long counter = 0;
+    if (injectTombstones) {
+      // publish lots of tombstones to livelock the consumer if it can't handle this properly
+      for (int i = 0; i < 1000; i++) {
+        // publish a tombstone first
+        producer.produce(kafkaTopic, Longs.toByteArray(counter++), null);
+      }
+    }
+    CSVFormat csvFormat = CSVFormat.DEFAULT.withSkipHeaderRecord(true);
+    try (CSVParser parser = CSVParser.parse(csvFile, StandardCharsets.UTF_8, csvFormat)) {
+      for (CSVRecord csv : parser) {
+        byte[] keyBytes = (partitionColumnIndex == null) ? Longs.toByteArray(counter++)
+            : csv.get(partitionColumnIndex).getBytes(StandardCharsets.UTF_8);
+        List<String> cols = new ArrayList<>();
+        for (String col : csv) {
+          cols.add(col);
+        }
+        byte[] bytes = String.join(",", cols).getBytes(StandardCharsets.UTF_8);
+        producer.produce(kafkaTopic, keyBytes, bytes);
+      }
+    }
+  }
+
+  /**
+   * Push the records from the given Avro files into a Kafka stream.
+   *
+   * @param csvRecords List of CSV record string
+   * @param kafkaTopic Kafka topic
+   * @param partitionColumnIndex Optional Index of the partition column
+   * @throws Exception
+   */
+  public static void pushCsvIntoKafka(List<String> csvRecords, String kafkaTopic,
+      @Nullable Integer partitionColumnIndex, boolean injectTombstones, StreamDataProducer producer)
+      throws Exception {
+    long counter = 0;
+    if (injectTombstones) {
+      // publish lots of tombstones to livelock the consumer if it can't handle this properly
+      for (int i = 0; i < 1000; i++) {
+        // publish a tombstone first
+        producer.produce(kafkaTopic, Longs.toByteArray(counter++), null);
+      }
+    }
+    CSVFormat csvFormat = CSVFormat.DEFAULT.withSkipHeaderRecord(true);
+    for (String recordCsv: csvRecords) {
+      try (CSVParser parser = CSVParser.parse(recordCsv, csvFormat)) {
+        for (CSVRecord csv : parser) {
+          byte[] keyBytes = (partitionColumnIndex == null) ? Longs.toByteArray(counter++)
+              : csv.get(partitionColumnIndex).getBytes(StandardCharsets.UTF_8);
+          List<String> cols = new ArrayList<>();
+          for (String col : csv) {
+            cols.add(col);
+          }
+          byte[] bytes = String.join(",", cols).getBytes(StandardCharsets.UTF_8);
+          producer.produce(kafkaTopic, keyBytes, bytes);
+        }
+      }
+    }
+  }
+
   /**
    * Push the records from the given Avro files into a Kafka stream.
    *
@@ -344,12 +435,13 @@ public static void pushAvroIntoKafka(List<File> avroFiles, String kafkaBroker, S
     StreamDataProducer producer =
         StreamDataProvider.getStreamDataProducer(KafkaStarterUtils.KAFKA_PRODUCER_CLASS_NAME, properties);
 
+    long counter = 0;
     try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(65536)) {
       if (injectTombstones) {
         // publish lots of tombstones to livelock the consumer if it can't handle this properly
         for (int i = 0; i < 1000; i++) {
           // publish a tombstone first
-          producer.produce(kafkaTopic, Longs.toByteArray(System.currentTimeMillis()), null);
+          producer.produce(kafkaTopic, Longs.toByteArray(counter++), null);
         }
       }
       for (File avroFile : avroFiles) {
@@ -364,7 +456,7 @@ public static void pushAvroIntoKafka(List<File> avroFiles, String kafkaBroker, S
             datumWriter.write(genericRecord, binaryEncoder);
             binaryEncoder.flush();
 
-            byte[] keyBytes = (partitionColumn == null) ? Longs.toByteArray(System.currentTimeMillis())
+            byte[] keyBytes = (partitionColumn == null) ? Longs.toByteArray(counter++)
                 : (genericRecord.get(partitionColumn)).toString().getBytes();
             byte[] bytes = outputStream.toByteArray();
             producer.produce(kafkaTopic, keyBytes, bytes);
@@ -380,7 +472,6 @@ public static void pushAvroIntoKafka(List<File> avroFiles, String kafkaBroker, S
    * @param avroFiles List of Avro files
    * @param kafkaBroker Kafka broker config
    * @param kafkaTopic Kafka topic
-   * @param maxNumKafkaMessagesPerBatch Maximum number of Kafka messages per batch
    * @param header Optional Kafka message header
    * @param partitionColumn Optional partition column
    * @param commit if the transaction commits or aborts
@@ -401,6 +492,7 @@ public static void pushAvroIntoKafkaWithTransaction(List<File> avroFiles, String
     // initiate transaction.
     producer.initTransactions();
     producer.beginTransaction();
+    long counter = 0;
     try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(65536)) {
       for (File avroFile : avroFiles) {
         try (DataFileStream<GenericRecord> reader = AvroUtils.getAvroReader(avroFile)) {
@@ -414,7 +506,7 @@ public static void pushAvroIntoKafkaWithTransaction(List<File> avroFiles, String
             datumWriter.write(genericRecord, binaryEncoder);
             binaryEncoder.flush();
 
-            byte[] keyBytes = (partitionColumn == null) ? Longs.toByteArray(System.currentTimeMillis())
+            byte[] keyBytes = (partitionColumn == null) ? Longs.toByteArray(counter++)
                 : (genericRecord.get(partitionColumn)).toString().getBytes();
             byte[] bytes = outputStream.toByteArray();
             ProducerRecord<byte[], byte[]> record = new ProducerRecord(kafkaTopic, keyBytes, bytes);
@@ -453,6 +545,7 @@ public static void pushRandomAvroIntoKafka(File avroFile, String kafkaBroker, St
     properties.put("request.required.acks", "1");
     properties.put("partitioner.class", "kafka.producer.ByteArrayPartitioner");
 
+    long counter = 0;
     StreamDataProducer producer =
         StreamDataProvider.getStreamDataProducer(KafkaStarterUtils.KAFKA_PRODUCER_CLASS_NAME, properties);
     try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(65536)) {
@@ -472,7 +565,7 @@ public static void pushRandomAvroIntoKafka(File avroFile, String kafkaBroker, St
           datumWriter.write(genericRecord, binaryEncoder);
           binaryEncoder.flush();
 
-          byte[] keyBytes = (partitionColumn == null) ? Longs.toByteArray(System.currentTimeMillis())
+          byte[] keyBytes = (partitionColumn == null) ? Longs.toByteArray(counter++)
               : (genericRecord.get(partitionColumn)).toString().getBytes();
           byte[] bytes = outputStream.toByteArray();
 
@@ -545,55 +638,71 @@ private static Object generateRandomValue(Schema.Type fieldType) {
   /**
    * Run equivalent Pinot and H2 query and compare the results.
    */
-  static void testQuery(String pinotQuery, String brokerUrl, org.apache.pinot.client.Connection pinotConnection,
+  static void testQuery(String pinotQuery, String queryResourceUrl, org.apache.pinot.client.Connection pinotConnection,
       String h2Query, Connection h2Connection)
       throws Exception {
-    testQuery(pinotQuery, brokerUrl, pinotConnection, h2Query, h2Connection, null);
+    testQuery(pinotQuery, queryResourceUrl, pinotConnection, h2Query, h2Connection, null);
   }
 
   /**
    * Run equivalent Pinot and H2 query and compare the results.
    */
-  static void testQuery(String pinotQuery, String brokerUrl, org.apache.pinot.client.Connection pinotConnection,
+  static void testQuery(String pinotQuery, String queryResourceUrl, org.apache.pinot.client.Connection pinotConnection,
       String h2Query, Connection h2Connection, @Nullable Map<String, String> headers)
       throws Exception {
-    testQuery(pinotQuery, brokerUrl, pinotConnection, h2Query, h2Connection, headers, null);
+    testQuery(pinotQuery, queryResourceUrl, pinotConnection, h2Query, h2Connection, headers, null);
   }
 
   /**
-   *  Compare # of rows in pinot and H2 only. Succeed if # of rows matches. Note this only applies to non-aggregation
-   *  query.
+   * Compare # of rows in pinot and H2 only. Succeed if # of rows matches. Note this only applies to non-aggregation
+   * query.
    */
-  static void testQueryWithMatchingRowCount(String pinotQuery, String brokerUrl,
+  static void testQueryWithMatchingRowCount(String pinotQuery, String queryResourceUrl,
       org.apache.pinot.client.Connection pinotConnection, String h2Query, Connection h2Connection,
       @Nullable Map<String, String> headers, @Nullable Map<String, String> extraJsonProperties)
       throws Exception {
     try {
-      testQueryInternal(pinotQuery, brokerUrl, pinotConnection, h2Query, h2Connection, headers, extraJsonProperties,
-          true);
+      testQueryInternal(pinotQuery, queryResourceUrl, pinotConnection, h2Query, h2Connection, headers,
+          extraJsonProperties, true, false);
     } catch (Exception e) {
-      failure(pinotQuery, h2Query, "Caught exception while testing query!", e);
+      failure(pinotQuery, h2Query, e);
     }
   }
 
-  static void testQuery(String pinotQuery, String brokerUrl, org.apache.pinot.client.Connection pinotConnection,
+  static void testQuery(String pinotQuery, String queryResourceUrl, org.apache.pinot.client.Connection pinotConnection,
       String h2Query, Connection h2Connection, @Nullable Map<String, String> headers,
       @Nullable Map<String, String> extraJsonProperties) {
     try {
-      testQueryInternal(pinotQuery, brokerUrl, pinotConnection, h2Query, h2Connection, headers, extraJsonProperties,
-          false);
+      testQueryInternal(pinotQuery, queryResourceUrl, pinotConnection, h2Query, h2Connection, headers,
+          extraJsonProperties, false, false);
+    } catch (Exception e) {
+      failure(pinotQuery, h2Query, e);
+    }
+  }
+
+  static void testQueryViaController(String pinotQuery, String queryResourceUrl,
+      org.apache.pinot.client.Connection pinotConnection, String h2Query, Connection h2Connection,
+      @Nullable Map<String, String> headers, @Nullable Map<String, String> extraJsonProperties) {
+    try {
+      testQueryInternal(pinotQuery, queryResourceUrl, pinotConnection, h2Query, h2Connection, headers,
+          extraJsonProperties, false, true);
     } catch (Exception e) {
-      failure(pinotQuery, h2Query, "Caught exception while testing query!", e);
+      failure(pinotQuery, h2Query, e);
     }
   }
 
-  private static void testQueryInternal(String pinotQuery, String brokerUrl,
+  private static void testQueryInternal(String pinotQuery, String queryResourceUrl,
       org.apache.pinot.client.Connection pinotConnection, String h2Query, Connection h2Connection,
       @Nullable Map<String, String> headers, @Nullable Map<String, String> extraJsonProperties,
-      boolean matchingRowCount)
+      boolean matchingRowCount, boolean viaController)
       throws Exception {
     // broker response
-    JsonNode pinotResponse = ClusterTest.postQuery(pinotQuery, brokerUrl, headers, extraJsonProperties);
+    JsonNode pinotResponse;
+    if (viaController) {
+      pinotResponse = ClusterTest.postQueryToController(pinotQuery, queryResourceUrl, headers, extraJsonProperties);
+    } else {
+      pinotResponse = ClusterTest.postQuery(pinotQuery, queryResourceUrl, headers, extraJsonProperties);
+    }
     if (!pinotResponse.get("exceptions").isEmpty()) {
       throw new RuntimeException("Got Exceptions from Query Response: " + pinotResponse);
     }
@@ -635,7 +744,7 @@ private static void testQueryInternal(String pinotQuery, String brokerUrl,
         }
       }
       comparePinotResultsWithExpectedValues(expectedValues, expectedOrderByValues, resultTableResultSet, orderByColumns,
-          pinotQuery, h2Query, h2NumRows, pinotNumRecordsSelected);
+          pinotQuery, h2NumRows, pinotNumRecordsSelected);
     } else {
       if (queryContext.getGroupByExpressions() == null && !QueryContextUtils.isDistinctQuery(queryContext)) {
         // aggregation only
@@ -650,7 +759,7 @@ private static void testQueryInternal(String pinotQuery, String brokerUrl,
           if (h2Value == null) {
             if (pinotNumRecordsSelected != 0) {
               throw new RuntimeException("No record selected in H2 but " + pinotNumRecordsSelected
-                  + " records selected in Pinot, explain plan: " + getExplainPlan(pinotQuery, brokerUrl, headers,
+                  + " records selected in Pinot, explain plan: " + getExplainPlan(pinotQuery, queryResourceUrl, headers,
                   extraJsonProperties));
             }
 
@@ -664,6 +773,7 @@ private static void testQueryInternal(String pinotQuery, String brokerUrl,
             return;
           }
 
+          h2Value = convertBooleanToLowerCase(h2Value);
           String brokerValue = brokerResponseRows.get(0).get(c).asText();
           String connectionValue = resultTableResultSet.getString(0, c);
 
@@ -673,7 +783,7 @@ private static void testQueryInternal(String pinotQuery, String brokerUrl,
             throw new RuntimeException(
                 "Value: " + c + " does not match, expected: " + h2Value + ", got broker value: " + brokerValue
                     + ", got client value:" + connectionValue + ", explain plan: " + getExplainPlan(pinotQuery,
-                    brokerUrl, headers, extraJsonProperties));
+                    queryResourceUrl, headers, extraJsonProperties));
           }
         }
       } else {
@@ -689,7 +799,7 @@ private static void testQueryInternal(String pinotQuery, String brokerUrl,
           if (h2ResultSet.first()) {
             for (int i = 0; i < numRows; i++) {
               for (int c = 0; c < numColumns; c++) {
-                String h2Value = h2ResultSet.getString(c + 1);
+                String h2Value = convertBooleanToLowerCase(h2ResultSet.getString(c + 1));
                 String brokerValue = brokerResponseRows.get(i).get(c).asText();
                 String connectionValue = resultTableResultSet.getString(i, c);
                 boolean error = fuzzyCompare(h2Value, brokerValue, connectionValue);
@@ -697,7 +807,7 @@ private static void testQueryInternal(String pinotQuery, String brokerUrl,
                   throw new RuntimeException(
                       "Value: " + c + " does not match, expected: " + h2Value + ", got broker value: " + brokerValue
                           + ", got client value:" + connectionValue + ", explain plan: " + getExplainPlan(pinotQuery,
-                          brokerUrl, headers, extraJsonProperties));
+                          queryResourceUrl, headers, extraJsonProperties));
                 }
               }
               if (!h2ResultSet.next()) {
@@ -722,14 +832,12 @@ private static int getH2ExpectedValues(Set<String> expectedValues, List<String>
       ResultSet h2ResultSet, ResultSetMetaData h2MetaData, Collection<String> orderByColumns)
       throws SQLException {
     Map<String, String> reusableExpectedValueMap = new HashMap<>();
-    Map<String, List<String>> reusableMultiValuesMap = new HashMap<>();
     List<String> reusableColumnOrder = new ArrayList<>();
     int h2NumRows;
     int numColumns = h2MetaData.getColumnCount();
 
     for (h2NumRows = 0; h2ResultSet.next() && h2NumRows < MAX_NUM_ROWS_TO_COMPARE; h2NumRows++) {
       reusableExpectedValueMap.clear();
-      reusableMultiValuesMap.clear();
       reusableColumnOrder.clear();
 
       for (int columnIndex = 1; columnIndex <= numColumns; columnIndex++) { // h2 result set is 1-based
@@ -744,18 +852,16 @@ private static int getH2ExpectedValues(Set<String> expectedValues, List<String>
         }
 
         // Handle multi-value columns
-        int length = columnName.length();
-        if (length > H2_MULTI_VALUE_SUFFIX_LENGTH && columnName.substring(length - H2_MULTI_VALUE_SUFFIX_LENGTH,
-            length - 1).equals("__MV")) {
+        int columnType = h2MetaData.getColumnType(columnIndex);
+        if (columnType == Types.ARRAY) {
           // Multi-value column
-          String multiValueColumnName = columnName.substring(0, length - H2_MULTI_VALUE_SUFFIX_LENGTH);
-          List<String> multiValue = reusableMultiValuesMap.get(multiValueColumnName);
-          if (multiValue == null) {
-            multiValue = new ArrayList<>();
-            reusableMultiValuesMap.put(multiValueColumnName, multiValue);
-            reusableColumnOrder.add(multiValueColumnName);
+          reusableColumnOrder.add(columnName);
+          if (columnValue.contains(",")) {
+            columnValue = Arrays.toString(
+                Arrays.stream(columnValue.substring(1, columnValue.length() - 1).split(",")).map(String::trim).sorted()
+                    .toArray());
           }
-          multiValue.add(columnValue);
+          reusableExpectedValueMap.put(columnName, columnValue);
         } else {
           // Single-value column
           String columnDataType = h2MetaData.getColumnTypeName(columnIndex);
@@ -765,14 +871,6 @@ private static int getH2ExpectedValues(Set<String> expectedValues, List<String>
         }
       }
 
-      // Add multi-value column results to the expected values
-      // The reason for this step is that Pinot does not maintain order of elements in multi-value columns
-      for (Map.Entry<String, List<String>> entry : reusableMultiValuesMap.entrySet()) {
-        List<String> multiValue = entry.getValue();
-        Collections.sort(multiValue);
-        reusableExpectedValueMap.put(entry.getKey(), multiValue.toString());
-      }
-
       // Build expected value String
       StringBuilder expectedValue = new StringBuilder();
       StringBuilder expectedOrderByValue = new StringBuilder();
@@ -791,7 +889,7 @@ private static int getH2ExpectedValues(Set<String> expectedValues, List<String>
 
   private static void comparePinotResultsWithExpectedValues(Set<String> expectedValues,
       List<String> expectedOrderByValues, org.apache.pinot.client.ResultSet connectionResultSet,
-      Set<String> orderByColumns, String pinotQuery, String h2Query, int h2NumRows, long pinotNumRecordsSelected) {
+      Set<String> orderByColumns, String pinotQuery, int h2NumRows, long pinotNumRecordsSelected) {
 
     int pinotNumRows = connectionResultSet.getRowCount();
     // No record selected in H2
@@ -831,7 +929,7 @@ private static void comparePinotResultsWithExpectedValues(Set<String> expectedVa
           JsonNode columnValues = null;
           try {
             columnValues = JsonUtils.stringToJsonNode(columnResult);
-          } catch (IOException e) {
+          } catch (IOException ignored) {
           }
 
           if (columnValues != null && columnValues.isArray()) {
@@ -845,16 +943,13 @@ private static void comparePinotResultsWithExpectedValues(Set<String> expectedVa
               multiValue.add("null");
             }
             Collections.sort(multiValue);
-            actualValueBuilder.append(multiValue.toString()).append(' ');
-            if (orderByColumns.contains(columnName)) {
-              actualOrderByValueBuilder.append(columnResult).append(' ');
-            }
+            actualValueBuilder.append(multiValue).append(' ');
           } else {
             // Single-value column
             actualValueBuilder.append(columnResult).append(' ');
-            if (orderByColumns.contains(columnName)) {
-              actualOrderByValueBuilder.append(columnResult).append(' ');
-            }
+          }
+          if (orderByColumns.contains(columnName)) {
+            actualOrderByValueBuilder.append(columnResult).append(' ');
           }
         }
 
@@ -862,8 +957,10 @@ private static void comparePinotResultsWithExpectedValues(Set<String> expectedVa
         String actualOrderByValue = actualOrderByValueBuilder.toString();
         // Check actual value in expected values set, skip comparison if query response is truncated by limit
         if ((!isLimitSet || limit > h2NumRows) && !expectedValues.contains(actualValue)) {
-          throw new RuntimeException(
-              "Selection result returned in Pinot but not in H2: " + actualValue + ", " + expectedValues);
+          throw new RuntimeException(String.format(
+              "Selection result differ in Pinot from H2: Pinot row: [ %s ] not found in H2 result set: [%s].",
+              actualValue, expectedValues)
+          );
         }
         if (!orderByColumns.isEmpty()) {
           // Check actual group value is the same as expected group value in the same order.
@@ -878,21 +975,32 @@ private static void comparePinotResultsWithExpectedValues(Set<String> expectedVa
   }
 
   private static String removeTrailingZeroForNumber(String value, String type) {
+    String upperCaseType = StringUtils.upperCase(type);
     // remove trailing zero after decimal point to compare decimal numbers with h2 data
-    if (type == null || type.toUpperCase().equals("FLOAT") || type.toUpperCase().equals("DOUBLE") || type.toUpperCase()
-        .equals("BIGINT")) {
+    if (upperCaseType.equals("FLOAT") || upperCaseType.equals("DECFLOAT") || upperCaseType.equals("DOUBLE")
+        || upperCaseType.equals("DOUBLE PRECISION")) {
       try {
         return (new BigDecimal(value)).stripTrailingZeros().toPlainString();
-      } catch (NumberFormatException e) {
+      } catch (NumberFormatException ignored) {
+        // ignoring the exception
       }
     }
     return value;
   }
 
+  public static boolean isParsableDouble(String input) {
+    try {
+      Double.parseDouble(input);
+      return true;
+    } catch (NumberFormatException e) {
+      return false;
+    }
+  }
+
   public static boolean fuzzyCompare(String h2Value, String brokerValue, String connectionValue) {
     // Fuzzy compare expected value and actual value
     boolean error = false;
-    if (NumberUtils.isParsable(h2Value)) {
+    if (isParsableDouble(h2Value)) {
       double expectedValue = Double.parseDouble(h2Value);
       double actualValueBroker = Double.parseDouble(brokerValue);
       double actualValueConnection = Double.parseDouble(connectionValue);
@@ -909,6 +1017,10 @@ public static boolean fuzzyCompare(String h2Value, String brokerValue, String co
     return error;
   }
 
+  private static void failure(String pinotQuery, String h2Query, @Nullable Exception e) {
+    String failureMessage = "Caught exception while testing query!";
+    failure(pinotQuery, h2Query, failureMessage, e);
+  }
   /**
    * Helper method to report failures.
    *
diff --git a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java
index 7dfc3134e3d..42988b57e78 100644
--- a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java
+++ b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/ClusterTest.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -61,14 +62,12 @@
 import org.apache.pinot.plugin.inputformat.avro.AvroRecordExtractorConfig;
 import org.apache.pinot.plugin.inputformat.avro.AvroUtils;
 import org.apache.pinot.server.starter.helix.BaseServerStarter;
-import org.apache.pinot.server.starter.helix.DefaultHelixStarterServerConfig;
 import org.apache.pinot.server.starter.helix.HelixServerStarter;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordExtractor;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.stream.StreamMessageDecoder;
-import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Broker;
 import org.apache.pinot.spi.utils.CommonConstants.Helix;
 import org.apache.pinot.spi.utils.CommonConstants.Minion;
@@ -77,6 +76,7 @@
 import org.apache.pinot.spi.utils.NetUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.annotations.DataProvider;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -90,13 +90,35 @@ public abstract class ClusterTest extends ControllerTest {
   protected static final int DEFAULT_BROKER_PORT = 18099;
   protected static final Random RANDOM = new Random(System.currentTimeMillis());
 
-  protected String _brokerBaseApiUrl;
-
   protected List<BaseBrokerStarter> _brokerStarters;
   protected List<BaseServerStarter> _serverStarters;
   protected List<Integer> _brokerPorts;
   protected BaseMinionStarter _minionStarter;
 
+  private String _brokerBaseApiUrl;
+
+  private boolean _useMultiStageQueryEngine = false;
+
+  protected String getBrokerBaseApiUrl() {
+    return _brokerBaseApiUrl;
+  }
+
+  protected boolean useMultiStageQueryEngine() {
+    return _useMultiStageQueryEngine;
+  }
+
+  protected void setUseMultiStageQueryEngine(boolean useMultiStageQueryEngine) {
+    _useMultiStageQueryEngine = useMultiStageQueryEngine;
+  }
+
+  protected void disableMultiStageQueryEngine() {
+    setUseMultiStageQueryEngine(false);
+  }
+
+  protected void enableMultiStageQueryEngine() {
+    setUseMultiStageQueryEngine(true);
+  }
+
   protected PinotConfiguration getDefaultBrokerConfiguration() {
     return new PinotConfiguration();
   }
@@ -168,22 +190,12 @@ protected int getRandomBrokerPort() {
     return _brokerPorts.get(RANDOM.nextInt(_brokerPorts.size()));
   }
 
-  protected int getBrokerPort(int index) {
-    return _brokerPorts.get(index);
-  }
-
-  protected List<Integer> getBrokerPorts() {
-    return ImmutableList.copyOf(_brokerPorts);
-  }
-
   protected PinotConfiguration getDefaultServerConfiguration() {
-    PinotConfiguration configuration = DefaultHelixStarterServerConfig.loadDefaultServerConf();
-
-    configuration.setProperty(Helix.KEY_OF_SERVER_NETTY_HOST, LOCAL_HOST);
-    configuration.setProperty(Server.CONFIG_OF_SEGMENT_FORMAT_VERSION, "v3");
-    configuration.setProperty(Server.CONFIG_OF_SHUTDOWN_ENABLE_QUERY_CHECK, false);
-
-    return configuration;
+    PinotConfiguration serverConf = new PinotConfiguration();
+    serverConf.setProperty(Helix.KEY_OF_SERVER_NETTY_HOST, LOCAL_HOST);
+    serverConf.setProperty(Server.CONFIG_OF_SEGMENT_FORMAT_VERSION, "v3");
+    serverConf.setProperty(Server.CONFIG_OF_SHUTDOWN_ENABLE_QUERY_CHECK, false);
+    return serverConf;
   }
 
   protected void overrideServerConf(PinotConfiguration serverConf) {
@@ -198,7 +210,7 @@ protected PinotConfiguration getServerConf(int serverId) {
     serverConf.setProperty(Server.CONFIG_OF_INSTANCE_SEGMENT_TAR_DIR,
         Server.DEFAULT_INSTANCE_SEGMENT_TAR_DIR + "-" + serverId);
     serverConf.setProperty(Server.CONFIG_OF_ADMIN_API_PORT, Server.DEFAULT_ADMIN_API_PORT - serverId);
-    serverConf.setProperty(Server.CONFIG_OF_NETTY_PORT, Helix.DEFAULT_SERVER_NETTY_PORT + serverId);
+    serverConf.setProperty(Helix.KEY_OF_SERVER_NETTY_PORT, Helix.DEFAULT_SERVER_NETTY_PORT + serverId);
     serverConf.setProperty(Server.CONFIG_OF_GRPC_PORT, Server.DEFAULT_GRPC_PORT + serverId);
     // Thread time measurement is disabled by default, enable it in integration tests.
     // TODO: this can be removed when we eventually enable thread time measurement by default.
@@ -329,8 +341,7 @@ protected void uploadSegments(String tableName, TableType tableType, List<File>
     int numSegments = segmentTarFiles.size();
     assertTrue(numSegments > 0);
 
-    URI uploadSegmentHttpURI =
-        FileUploadDownloadClient.getUploadSegmentURI(CommonConstants.HTTP_PROTOCOL, LOCAL_HOST, _controllerPort);
+    URI uploadSegmentHttpURI = URI.create(getControllerRequestURLBuilder().forSegmentUpload());
     try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient()) {
       if (numSegments == 1) {
         File segmentTarFile = segmentTarFiles.get(0);
@@ -386,23 +397,26 @@ private int uploadSegmentWithOnlyMetadata(String tableName, TableType tableType,
   public static class AvroFileSchemaKafkaAvroMessageDecoder implements StreamMessageDecoder<byte[]> {
     private static final Logger LOGGER = LoggerFactory.getLogger(AvroFileSchemaKafkaAvroMessageDecoder.class);
     public static File _avroFile;
-    private org.apache.avro.Schema _avroSchema;
-    private RecordExtractor _recordExtractor;
-    private DecoderFactory _decoderFactory = new DecoderFactory();
+    private RecordExtractor<GenericRecord> _recordExtractor;
+    private final DecoderFactory _decoderFactory = new DecoderFactory();
     private DatumReader<GenericData.Record> _reader;
 
     @Override
     public void init(Map<String, String> props, Set<String> fieldsToRead, String topicName)
         throws Exception {
       // Load Avro schema
+      org.apache.avro.Schema avroSchema;
       try (DataFileStream<GenericRecord> reader = AvroUtils.getAvroReader(_avroFile)) {
-        _avroSchema = reader.getSchema();
+        avroSchema = reader.getSchema();
+      } catch (Exception ex) {
+        LOGGER.error("Caught exception", ex);
+        throw new RuntimeException(ex);
       }
       AvroRecordExtractorConfig config = new AvroRecordExtractorConfig();
       config.init(props);
       _recordExtractor = new AvroRecordExtractor();
       _recordExtractor.init(fieldsToRead, config);
-      _reader = new GenericDatumReader<>(_avroSchema);
+      _reader = new GenericDatumReader<>(avroSchema);
     }
 
     @Override
@@ -425,7 +439,7 @@ public GenericRow decode(byte[] payload, int offset, int length, GenericRow dest
 
   protected JsonNode getDebugInfo(final String uri)
       throws Exception {
-    return JsonUtils.stringToJsonNode(sendGetRequest(_brokerBaseApiUrl + "/" + uri));
+    return JsonUtils.stringToJsonNode(sendGetRequest(getBrokerBaseApiUrl() + "/" + uri));
   }
 
   /**
@@ -433,23 +447,14 @@ protected JsonNode getDebugInfo(final String uri)
    */
   protected JsonNode postQuery(String query)
       throws Exception {
-    return postQuery(query, _brokerBaseApiUrl);
-  }
-
-  /**
-   * Queries the broker's sql query endpoint (/sql)
-   */
-  public static JsonNode postQuery(String query, String brokerBaseApiUrl)
-      throws Exception {
-    return postQuery(query, brokerBaseApiUrl, null);
+    return postQuery(query, getBrokerBaseApiUrl(), null, getExtraQueryProperties());
   }
 
-  /**
-   * Queries the broker's sql query endpoint (/sql)
-   */
-  public static JsonNode postQuery(String query, String brokerBaseApiUrl, Map<String, String> headers)
-      throws Exception {
-    return postQuery(query, brokerBaseApiUrl, headers, null);
+  protected Map<String, String> getExtraQueryProperties() {
+    if (!useMultiStageQueryEngine()) {
+      return Collections.emptyMap();
+    }
+    return ImmutableMap.of("queryOptions", "useMultistageEngine=true");
   }
 
   /**
@@ -461,7 +466,7 @@ public static JsonNode postQuery(String query, String brokerBaseApiUrl, Map<Stri
     ObjectNode payload = JsonUtils.newObjectNode();
     payload.put("sql", query);
     if (MapUtils.isNotEmpty(extraJsonProperties)) {
-      for (Map.Entry<String, String> extraProperty :extraJsonProperties.entrySet()) {
+      for (Map.Entry<String, String> extraProperty : extraJsonProperties.entrySet()) {
         payload.put(extraProperty.getKey(), extraProperty.getValue());
       }
     }
@@ -469,29 +474,57 @@ public static JsonNode postQuery(String query, String brokerBaseApiUrl, Map<Stri
   }
 
   /**
-   * Queries the controller's sql query endpoint (/query/sql)
+   * Queries the broker's sql query endpoint (/query/sql) using query and queryOptions strings
    */
-  protected JsonNode postQueryToController(String query)
+  protected JsonNode postQueryWithOptions(String query, String queryOptions)
       throws Exception {
-    return postQueryToController(query, _controllerBaseApiUrl);
+    return postQuery(query, getBrokerBaseApiUrl(), null, ImmutableMap.of("queryOptions", queryOptions));
   }
 
   /**
    * Queries the controller's sql query endpoint (/sql)
    */
-  public static JsonNode postQueryToController(String query, String controllerBaseApiUrl)
+  public JsonNode postQueryToController(String query)
       throws Exception {
-    return postQueryToController(query, controllerBaseApiUrl, null);
+    return postQueryToController(query, getControllerBaseApiUrl(), null, getExtraQueryProperties());
   }
 
   /**
    * Queries the controller's sql query endpoint (/sql)
    */
-  public static JsonNode postQueryToController(String query, String controllerBaseApiUrl, Map<String, String> headers)
+  public static JsonNode postQueryToController(String query, String controllerBaseApiUrl, Map<String, String> headers,
+      Map<String, String> extraJsonProperties)
       throws Exception {
     ObjectNode payload = JsonUtils.newObjectNode();
     payload.put("sql", query);
+    if (MapUtils.isNotEmpty(extraJsonProperties)) {
+      for (Map.Entry<String, String> extraProperty : extraJsonProperties.entrySet()) {
+        payload.put(extraProperty.getKey(), extraProperty.getValue());
+      }
+    }
     return JsonUtils.stringToJsonNode(
         sendPostRequest(controllerBaseApiUrl + "/sql", JsonUtils.objectToString(payload), headers));
   }
+
+  @DataProvider(name = "useBothQueryEngines")
+  public Object[][] useBothQueryEngines() {
+    return new Object[][]{
+        {false},
+        {true}
+    };
+  }
+
+  @DataProvider(name = "useV1QueryEngine")
+  public Object[][] useV1QueryEngine() {
+    return new Object[][]{
+        {false}
+    };
+  }
+
+  @DataProvider(name = "useV2QueryEngine")
+  public Object[][] useV2QueryEngine() {
+    return new Object[][]{
+        {true}
+    };
+  }
 }
diff --git a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/QueryGenerator.java b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/QueryGenerator.java
index c1e38453b93..de55ceed432 100644
--- a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/QueryGenerator.java
+++ b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/QueryGenerator.java
@@ -32,6 +32,7 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.avro.Schema;
 import org.apache.avro.file.DataFileReader;
 import org.apache.avro.generic.GenericData;
@@ -447,15 +448,7 @@ public String generatePinotQuery() {
     public String generateH2Query() {
       List<String> h2ProjectionColumns = new ArrayList<>();
       for (String projectionColumn : _projectionColumns) {
-        if (_multiValueColumnMaxNumElements.containsKey(projectionColumn)) {
-          // Multi-value column.
-          for (int i = 0; i < ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
-            h2ProjectionColumns.add(projectionColumn + "__MV" + i);
-          }
-        } else {
-          // Single-value column.
-          h2ProjectionColumns.add(projectionColumn);
-        }
+        h2ProjectionColumns.add(String.format("`%s`", projectionColumn));
       }
       return joinWithSpaces("SELECT", StringUtils.join(h2ProjectionColumns, ", "), "FROM", _h2TableName,
           _predicate.generateH2Query(), _orderBy.generateH2Query(), _limit.generateH2Query());
@@ -507,19 +500,26 @@ public String generateH2Query() {
       List<String> h2AggregateColumnAndFunctions = new ArrayList<>();
       for (String aggregateColumnAndFunction : _aggregateColumnsAndFunctions) {
         String h2AggregateColumnAndFunction;
+        String pinotAggregateFunction = aggregateColumnAndFunction;
+        if (!pinotAggregateFunction.equals("COUNT(*)")) {
+          pinotAggregateFunction = pinotAggregateFunction.replace("(", "(`").replace(")", "`)");
+        }
+        if (!pinotAggregateFunction.contains("(")) {
+          pinotAggregateFunction = String.format("`%s`", pinotAggregateFunction);
+        }
         // Make 'AVG' and
-        if (aggregateColumnAndFunction.startsWith("DISTINCTCOUNT(")) {
+        if (pinotAggregateFunction.startsWith("DISTINCTCOUNT(")) {
           // make 'DISTINCTCOUNT(..)' compatible with H2 SQL query using 'COUNT(DISTINCT(..)'
-          h2AggregateColumnAndFunction = aggregateColumnAndFunction.replace("DISTINCTCOUNT(", "COUNT(DISTINCT ");
-        } else if (AGGREGATION_FUNCTIONS.contains(aggregateColumnAndFunction.substring(0, 3))) {
+          h2AggregateColumnAndFunction = pinotAggregateFunction.replace("DISTINCTCOUNT(", "COUNT(DISTINCT ");
+        } else if (AGGREGATION_FUNCTIONS.contains(pinotAggregateFunction.substring(0, 3))) {
           // make AGG functions (SUM, MIN, MAX, AVG) compatible with H2 SQL query.
           // this is because Pinot queries casts all to double before doing aggregation
-          String aggFunctionName = aggregateColumnAndFunction.substring(0, 3);
-          h2AggregateColumnAndFunction = aggregateColumnAndFunction
+          String aggFunctionName = pinotAggregateFunction.substring(0, 3);
+          h2AggregateColumnAndFunction = pinotAggregateFunction
               .replace(aggFunctionName + "(", aggFunctionName + "(CAST(")
               .replace(")", " AS DOUBLE))");
         } else {
-          h2AggregateColumnAndFunction = aggregateColumnAndFunction;
+          h2AggregateColumnAndFunction = pinotAggregateFunction;
         }
         h2AggregateColumnAndFunctions.add(h2AggregateColumnAndFunction);
       }
@@ -528,7 +528,9 @@ public String generateH2Query() {
             _predicate.generateH2Query());
       } else {
         return joinWithSpaces("SELECT", StringUtils.join(h2AggregateColumnAndFunctions, ", "), "FROM", _h2TableName,
-            _predicate.generateH2Query(), "GROUP BY", StringUtils.join(_groupColumns, ", "),
+            _predicate.generateH2Query(), "GROUP BY",
+            StringUtils.join(_groupColumns.stream().map(c -> String.format("`%s`", c))
+                .collect(Collectors.toList()), ", "),
             _havingPredicate.generateH2Query(), _limit.generateH2Query());
       }
     }
@@ -590,7 +592,9 @@ private static class LimitQueryFragment extends StringQueryFragment {
    */
   private static class OrderByQueryFragment extends StringQueryFragment {
     OrderByQueryFragment(Set<String> columns) {
-      super(columns.isEmpty() ? "" : "ORDER BY " + StringUtils.join(columns, ", "));
+      super(columns.isEmpty() ? "" : "ORDER BY " + StringUtils.join(columns, ", "),
+          columns.isEmpty() ? "" : "ORDER BY " + StringUtils.join(
+              columns.stream().map(c -> String.format("`%s`", c)).collect(Collectors.toList()), ", "));
     }
   }
 
@@ -696,6 +700,9 @@ public String generateH2Query() {
       if (aggregationFunctionCount > 0) {
         h2Query += "HAVING";
         String aggregationFunction = _havingClauseAggregationFunctions.get(0);
+        if (!aggregationFunction.equals("COUNT(*)")) {
+          aggregationFunction = aggregationFunction.replace("(", "(`").replace(")", "`)");
+        }
         if (aggregationFunction.startsWith("AVG(")) {
           aggregationFunction = aggregationFunction.replace("AVG(", "AVG(CAST(").replace(")", " AS DOUBLE))");
         } else if (aggregationFunction.startsWith("DISTINCTCOUNT(")) {
@@ -705,6 +712,9 @@ public String generateH2Query() {
         h2Query = joinWithSpaces(h2Query, _havingClauseOperatorsAndValues.get(0));
         for (int i = 1; i < aggregationFunctionCount; i++) {
           aggregationFunction = _havingClauseAggregationFunctions.get(i);
+          if (!aggregationFunction.equals("COUNT(*)")) {
+            aggregationFunction = aggregationFunction.replace("(", "(`").replace(")", "`)");
+          }
           if (aggregationFunction.startsWith("AVG(")) {
             aggregationFunction = aggregationFunction.replace("AVG(", "AVG(CAST(").replace(")", " AS DOUBLE))");
           } else if (aggregationFunction.startsWith("DISTINCTCOUNT(")) {
@@ -887,7 +897,7 @@ private String createOperatorAndValueForAggregationFunction(String aggregationFu
       } else {
         boolean isItBetween = RANDOM.nextBoolean();
         if (isItBetween) {
-          return "BETWEEN " + generateRandomValue(generateInt) + " AND " + generateRandomValue(generateInt);
+          return String.format("BETWEEN %s AND %s", generateRandomValue(generateInt), generateRandomValue(generateInt));
         } else {
           int numValues = RANDOM.nextInt(MAX_NUM_IN_CLAUSE_VALUES) + 1;
           Set<String> values = new HashSet<>();
@@ -896,7 +906,7 @@ private String createOperatorAndValueForAggregationFunction(String aggregationFu
           }
           String valuesString = StringUtils.join(values, ", ");
           boolean isItIn = RANDOM.nextBoolean();
-          return (isItIn ? "" : "NOT ") + "IN (" + valuesString + ")";
+          return String.format("%s IN (%s)", isItIn ? "" : "NOT ", valuesString);
         }
       }
     }
@@ -916,7 +926,8 @@ private class SingleValueComparisonPredicateGenerator implements PredicateGenera
     public QueryFragment generatePredicate(String columnName) {
       String columnValue = pickRandom(_columnToValueList.get(columnName));
       String comparisonOperator = pickRandom(COMPARISON_OPERATORS);
-      return new StringQueryFragment(joinWithSpaces(columnName, comparisonOperator, columnValue));
+      return new StringQueryFragment(joinWithSpaces(columnName, comparisonOperator, columnValue),
+          joinWithSpaces(String.format("`%s`", columnName), comparisonOperator, columnValue));
     }
   }
 
@@ -938,9 +949,11 @@ public QueryFragment generatePredicate(String columnName) {
 
       boolean notIn = RANDOM.nextBoolean();
       if (notIn) {
-        return new StringQueryFragment(columnName + " NOT IN (" + inValues + ")");
+        return new StringQueryFragment(String.format("%s NOT IN (%s)", columnName, inValues),
+            String.format("`%s` NOT IN (%s)", columnName, inValues));
       } else {
-        return new StringQueryFragment(columnName + " IN (" + inValues + ")");
+        return new StringQueryFragment(String.format("%s IN (%s)", columnName, inValues),
+            String.format("`%s` IN (%s)", columnName, inValues));
       }
     }
   }
@@ -955,7 +968,9 @@ public QueryFragment generatePredicate(String columnName) {
       List<String> columnValues = _columnToValueList.get(columnName);
       String leftValue = pickRandom(columnValues);
       String rightValue = pickRandom(columnValues);
-      return new StringQueryFragment(columnName + " BETWEEN " + leftValue + " AND " + rightValue);
+      return new StringQueryFragment(
+          String.format("%s BETWEEN %s AND %s", columnName, leftValue, rightValue),
+          String.format("`%s` BETWEEN %s AND %s", columnName, leftValue, rightValue));
     }
   }
 
@@ -975,11 +990,13 @@ public QueryFragment generatePredicate(String columnName) {
         int indexToReplaceWithRegex = 1 + _random.nextInt(value.length() - 2);
         String regex = value.substring(1, indexToReplaceWithRegex) + ".*" + value.substring(indexToReplaceWithRegex + 1,
             value.length() - 1);
-        return new StringQueryFragment(String.format(" REGEXP_LIKE(%s, '%s')", columnName, regex),
-            String.format(" REGEXP_LIKE(%s, '%s', 'i')", columnName, regex));
+        String regexpPredicate = String.format(" REGEXP_LIKE(%s, '%s')", columnName, regex);
+        String h2RegexpPredicate = String.format(" REGEXP_LIKE(`%s`, '%s', 'i')", columnName, regex);
+        return new StringQueryFragment(regexpPredicate, h2RegexpPredicate);
       } else {
         String equalsPredicate = String.format("%s = %s", columnName, value);
-        return new StringQueryFragment(equalsPredicate);
+        String h2EqualsPredicate = String.format("`%s` = %s", columnName, value);
+        return new StringQueryFragment(equalsPredicate, h2EqualsPredicate);
       }
     }
   }
@@ -1002,12 +1019,13 @@ public QueryFragment generatePredicate(String columnName) {
 
       List<String> h2ComparisonClauses =
           new ArrayList<>(ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE);
-      for (int i = 0; i < ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
-        h2ComparisonClauses.add(joinWithSpaces(columnName + "__MV" + i, comparisonOperator, columnValue));
+      for (int i = 1; i <= ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
+        h2ComparisonClauses.add(
+            joinWithSpaces(String.format("%s[%d]", columnName, i), comparisonOperator, columnValue));
       }
 
       return new StringQueryFragment(joinWithSpaces(columnName, comparisonOperator, columnValue),
-          "(" + StringUtils.join(h2ComparisonClauses, " OR ") + ")");
+          generateH2QueryConditionPredicate(h2ComparisonClauses));
     }
   }
 
@@ -1030,12 +1048,12 @@ public QueryFragment generatePredicate(String columnName) {
 
       List<String> h2InClauses =
           new ArrayList<>(ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE);
-      for (int i = 0; i < ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
-        h2InClauses.add(columnName + "__MV" + i + " IN (" + inValues + ")");
+      for (int i = 1; i <= ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
+        h2InClauses.add(String.format("%s[%d] IN (%s)", columnName, i, inValues));
       }
 
-      return new StringQueryFragment(columnName + " IN (" + inValues + ")",
-          "(" + StringUtils.join(h2InClauses, " OR ") + ")");
+      return new StringQueryFragment(String.format("%s IN (%s)", columnName, inValues),
+          generateH2QueryConditionPredicate(h2InClauses));
     }
   }
 
@@ -1052,12 +1070,18 @@ public QueryFragment generatePredicate(String columnName) {
 
       List<String> h2ComparisonClauses =
           new ArrayList<>(ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE);
-      for (int i = 0; i < ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
-        h2ComparisonClauses.add(columnName + "__MV" + i + " BETWEEN " + leftValue + " AND " + rightValue);
+      for (int i = 1; i <= ClusterIntegrationTestUtils.MAX_NUM_ELEMENTS_IN_MULTI_VALUE_TO_COMPARE; i++) {
+        h2ComparisonClauses.add(String.format("%s[%d] BETWEEN %s AND %s", columnName, i, leftValue, rightValue));
       }
 
-      return new StringQueryFragment(columnName + " BETWEEN " + leftValue + " AND " + rightValue,
-          "(" + StringUtils.join(h2ComparisonClauses, " OR ") + ")");
+      return new StringQueryFragment(String.format("%s BETWEEN %s AND %s", columnName, leftValue, rightValue),
+          generateH2QueryConditionPredicate(h2ComparisonClauses));
     }
   }
+  private static String generateH2QueryConditionPredicate(List<String> conditionList) {
+    return generateH2QueryConditionPredicate(conditionList, " OR ");
+  }
+  private static String generateH2QueryConditionPredicate(List<String> conditionList, String separator) {
+    return String.format("( %s )", StringUtils.join(conditionList, separator));
+  }
 }
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index b6d2affbc79..131c889faeb 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -35,8 +35,6 @@
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
     <localstack-utils.version>0.2.19</localstack-utils.version>
-    <awaitility.version>3.0.0</awaitility.version>
-    <aws.sdk.version>2.14.28</aws.sdk.version>
     <testcontainers.version>1.17.3</testcontainers.version>
   </properties>
 
@@ -122,73 +120,6 @@
     </profile>
   </profiles>
 
-  <!-- cloud.localstack:localstack-utils brings in slightly older versions of all of
-       these libraries, so we have to manage their versions -->
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>http-client-spi</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>protocol-core</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>aws-core</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>sdk-core</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>netty-nio-client</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>aws-json-protocol</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>apache-client</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>auth</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>regions</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>profiles</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>utils</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>annotations</artifactId>
-        <version>${aws.sdk.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.pinot</groupId>
@@ -223,12 +154,6 @@
     <dependency>
       <groupId>com.101tec</groupId>
       <artifactId>zkclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.glassfish.hk2</groupId>
@@ -353,12 +278,6 @@
       <artifactId>localstack-utils</artifactId>
       <version>${localstack-utils.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AdminConsoleIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AdminConsoleIntegrationTest.java
index f0a838b0a92..30765538773 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AdminConsoleIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AdminConsoleIntegrationTest.java
@@ -63,21 +63,21 @@ public void tearDown()
   public void testApiHelp()
       throws Exception {
     // test controller
-    String response = sendGetRequest(_controllerBaseApiUrl + "/help");
+    String response = sendGetRequest(getControllerBaseApiUrl() + "/help");
     String expected = IOUtils
         .toString(ControllerAdminApiApplication.class.getClassLoader().getResourceAsStream("api/index.html"), "UTF-8");
     Assert.assertEquals(response, expected);
     // help and api map to the same content
-    response = sendGetRequest(_controllerBaseApiUrl + "/api");
+    response = sendGetRequest(getControllerBaseApiUrl() + "/api");
     Assert.assertEquals(response, expected);
 
     // test broker
-    response = sendGetRequest(_brokerBaseApiUrl + "/help");
+    response = sendGetRequest(getBrokerBaseApiUrl() + "/help");
     expected = IOUtils
         .toString(BrokerAdminApiApplication.class.getClassLoader().getResourceAsStream("api/index.html"), "UTF-8");
     Assert.assertEquals(response, expected);
     // help and api map to the same content
-    response = sendGetRequest(_brokerBaseApiUrl + "/api");
+    response = sendGetRequest(getBrokerBaseApiUrl() + "/api");
     Assert.assertEquals(response, expected);
 
     String serverBaseApiUrl = "http://localhost:" + CommonConstants.Server.DEFAULT_ADMIN_API_PORT;
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AggregateMetricsClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AggregateMetricsClusterIntegrationTest.java
index 9814e36b7d7..5fd41d9d95a 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AggregateMetricsClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/AggregateMetricsClusterIntegrationTest.java
@@ -90,7 +90,7 @@ protected void waitForAllDocsLoaded(long timeoutMs) {
     String sql = "SELECT SUM(AirTime), SUM(ArrDelay) FROM mytable";
     TestUtils.waitForCondition(aVoid -> {
       try {
-        JsonNode queryResult = postQuery(sql, _brokerBaseApiUrl);
+        JsonNode queryResult = postQuery(sql);
         JsonNode aggregationResults = queryResult.get("resultTable").get("rows").get(0);
         return aggregationResults.get(0).asInt() == -165429728 && aggregationResults.get(1).asInt() == -175625957;
       } catch (Exception e) {
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTestSet.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTestSet.java
index f1537efe7ee..8331d10235d 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTestSet.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTestSet.java
@@ -145,6 +145,7 @@ private void testHardcodedQueriesCommon()
       throws Exception {
     String query;
     String h2Query;
+
     query = "SELECT COUNT(*) FROM mytable WHERE CarrierDelay=15 AND ArrDelay > CarrierDelay LIMIT 1";
     testQuery(query);
     query = "SELECT ArrDelay, CarrierDelay, (ArrDelay - CarrierDelay) AS diff FROM mytable WHERE CarrierDelay=15 AND "
@@ -205,7 +206,8 @@ private void testHardcodedQueriesCommon()
     query = "SELECT MAX(ArrTime) FROM mytable GROUP BY DaysSinceEpoch ORDER BY MAX(ArrTime) - MIN(ArrTime)";
     testQuery(query);
     query = "SELECT MAX(ArrDelay), Month FROM mytable GROUP BY Month ORDER BY ABS(Month - 6) + MAX(ArrDelay)";
-    testQuery(query);
+    h2Query = "SELECT MAX(ArrDelay), `Month` FROM mytable GROUP BY `Month` ORDER BY ABS(`Month` - 6) + MAX(ArrDelay)";
+    testQuery(query, h2Query);
 
     // Post-aggregation in SELECT
     query = "SELECT MAX(ArrDelay) + MAX(AirTime) FROM mytable";
@@ -251,6 +253,33 @@ private void testHardcodedQueriesCommon()
         + "'1:DAYS:SIMPLE_DATE_FORMAT:yyyy-MM-dd''T''HH:mm:ss.SSS''Z''', '1:DAYS') = '2014-09-05T00:00:00.000Z'";
     h2Query = "SELECT DistanceGroup FROM mytable WHERE DaysSinceEpoch = 16318 LIMIT 10000";
     testQuery(query, h2Query);
+
+    // DateTimeConverter
+    query = "SELECT dateTimeConvert(DaysSinceEpoch,'1:DAYS:EPOCH','1:HOURS:EPOCH','1:HOURS'), COUNT(*) FROM mytable "
+        + "GROUP BY dateTimeConvert(DaysSinceEpoch,'1:DAYS:EPOCH','1:HOURS:EPOCH','1:HOURS') "
+        + "ORDER BY COUNT(*), dateTimeConvert(DaysSinceEpoch,'1:DAYS:EPOCH','1:HOURS:EPOCH','1:HOURS') DESC";
+    h2Query = "SELECT DaysSinceEpoch * 24, COUNT(*) FROM mytable "
+        + "GROUP BY DaysSinceEpoch * 24 "
+        + "ORDER BY COUNT(*), DaysSinceEpoch DESC";
+    testQuery(query, h2Query);
+
+    // TimeConvert
+    query = "SELECT timeConvert(DaysSinceEpoch,'DAYS','SECONDS'), COUNT(*) FROM mytable "
+        + "GROUP BY timeConvert(DaysSinceEpoch,'DAYS','SECONDS') "
+        + "ORDER BY COUNT(*), timeConvert(DaysSinceEpoch,'DAYS','SECONDS') DESC";
+    h2Query = "SELECT DaysSinceEpoch * 86400, COUNT(*) FROM mytable "
+        + "GROUP BY DaysSinceEpoch * 86400"
+        + "ORDER BY COUNT(*), DaysSinceEpoch * 86400 DESC";
+    testQuery(query, h2Query);
+
+    // test arithmetic operations on date time columns
+    query = "SELECT sub(DaysSinceEpoch,25), COUNT(*) FROM mytable "
+        + "GROUP BY sub(DaysSinceEpoch,25) "
+        + "ORDER BY COUNT(*),sub(DaysSinceEpoch,25) DESC";
+    h2Query = "SELECT DaysSinceEpoch - 25, COUNT(*) FROM mytable "
+        + "GROUP BY DaysSinceEpoch "
+        + "ORDER BY COUNT(*), DaysSinceEpoch DESC";
+    testQuery(query, h2Query);
   }
 
   private void testHardCodedQueriesV1()
@@ -271,10 +300,10 @@ private void testHardCodedQueriesV1()
         "SELECT DistanceGroup FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DivAirportSeqIDs IN (1078102, 1142303,"
             + " 1530402, 1172102, 1291503) OR SecurityDelay IN (1, 0, 14, -9999) LIMIT 10";
     h2Query =
-        "SELECT DistanceGroup FROM mytable WHERE Month BETWEEN 1 AND 1 AND (DivAirportSeqIDs__MV0 IN (1078102, "
-            + "1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs__MV1 IN (1078102, 1142303, 1530402, 1172102, "
-            + "1291503) OR DivAirportSeqIDs__MV2 IN (1078102, 1142303, 1530402, 1172102, 1291503) OR "
-            + "DivAirportSeqIDs__MV3 IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs__MV4 IN "
+        "SELECT DistanceGroup FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND (DivAirportSeqIDs[1] IN (1078102, "
+            + "1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs[2] IN (1078102, 1142303, 1530402, 1172102, "
+            + "1291503) OR DivAirportSeqIDs[3] IN (1078102, 1142303, 1530402, 1172102, 1291503) OR "
+            + "DivAirportSeqIDs[4] IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs[5] IN "
             + "(1078102, 1142303, 1530402, 1172102, 1291503)) OR SecurityDelay IN (1, 0, 14, -9999) LIMIT 10000";
     testQuery(query, h2Query);
 
@@ -444,7 +473,7 @@ protected void testGeneratedQueries(boolean withMultiValues, boolean useMultista
       QueryGenerator.Query query = queryGenerator.generateQuery();
       if (useMultistageEngine) {
         // multistage engine follows standard SQL thus should use H2 query string for testing.
-        testQuery(query.generateH2Query(), query.generateH2Query());
+        testQuery(query.generateH2Query().replace("`", "\""), query.generateH2Query());
       } else {
         testQuery(query.generatePinotQuery(), query.generateH2Query());
       }
@@ -622,7 +651,7 @@ public String reloadTableAndValidateResponse(String tableName, TableType tableTy
 
     // Validate all fields are present
     assertEquals(jobStatus.get("metadata").get("jobId").asText(), jobId);
-    assertEquals(jobStatus.get("metadata").get("jobType").asText(), "RELOAD_ALL_SEGMENTS");
+    assertEquals(jobStatus.get("metadata").get("jobType").asText(), "RELOAD_SEGMENT");
     assertEquals(jobStatus.get("metadata").get("tableName").asText(), tableNameWithType);
     return jobId;
   }
@@ -633,7 +662,7 @@ public boolean isReloadJobCompleted(String reloadJobId)
     JsonNode jobStatus = JsonUtils.stringToJsonNode(jobStatusResponse);
 
     assertEquals(jobStatus.get("metadata").get("jobId").asText(), reloadJobId);
-    assertEquals(jobStatus.get("metadata").get("jobType").asText(), "RELOAD_ALL_SEGMENTS");
+    assertEquals(jobStatus.get("metadata").get("jobType").asText(), "RELOAD_SEGMENT");
     return jobStatus.get("totalSegmentCount").asInt() == jobStatus.get("successCount").asInt();
   }
 
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseRealtimeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseRealtimeClusterIntegrationTest.java
index a8cccc73b70..c95d5d7f2cd 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseRealtimeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BaseRealtimeClusterIntegrationTest.java
@@ -19,7 +19,7 @@
 package org.apache.pinot.integration.tests;
 
 import java.io.File;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import org.apache.commons.io.FileUtils;
@@ -90,12 +90,12 @@ protected void overrideServerConf(PinotConfiguration configuration) {
 
   @Override
   protected List<String> getNoDictionaryColumns() {
+    List<String> noDictionaryColumns = new ArrayList<>(super.getNoDictionaryColumns());
     // Randomly set time column as no dictionary column.
-    if (new Random().nextInt(2) == 0) {
-      return Arrays.asList("ActualElapsedTime", "ArrDelay", "DepDelay", "CRSDepTime", "DaysSinceEpoch");
-    } else {
-      return super.getNoDictionaryColumns();
+    if (new Random().nextBoolean()) {
+      noDictionaryColumns.add("DaysSinceEpoch");
     }
+    return noDictionaryColumns;
   }
 
   /**
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BasicAuthBatchIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BasicAuthBatchIntegrationTest.java
index 39ad829fdaf..fb209db1f46 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BasicAuthBatchIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BasicAuthBatchIntegrationTest.java
@@ -28,6 +28,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.pinot.common.auth.AuthProviderUtils;
+import org.apache.pinot.common.exception.HttpErrorStatusException;
 import org.apache.pinot.controller.helix.core.minion.generator.PinotTaskGenerator;
 import org.apache.pinot.minion.executor.PinotTaskExecutor;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -99,10 +100,12 @@ protected PinotConfiguration getDefaultMinionConfiguration() {
   @Test
   public void testBrokerNoAuth()
       throws Exception {
-    JsonNode response = JsonUtils.stringToJsonNode(
-        sendPostRequest("http://localhost:" + getRandomBrokerPort() + "/query/sql", "{\"sql\":\"SELECT now()\"}"));
-    Assert.assertFalse(response.has("resultTable"), "must not return result table");
-    Assert.assertTrue(response.get("exceptions").get(0).get("errorCode").asInt() != 0, "must return error code");
+    try {
+        sendPostRequest("http://localhost:" + getRandomBrokerPort() + "/query/sql", "{\"sql\":\"SELECT now()\"}");
+    } catch (IOException e) {
+      HttpErrorStatusException httpErrorStatusException = (HttpErrorStatusException) e.getCause();
+      Assert.assertEquals(httpErrorStatusException.getStatusCode(), 403, "must return 403");
+    }
   }
 
   @Test
@@ -176,11 +179,13 @@ public void testIngestionBatch()
         "must return row count 97889");
     Assert.assertTrue(response.get("exceptions").isEmpty(), "must not return exception");
 
-    // user with valid auth but no table access
-    JsonNode responseUser = JsonUtils.stringToJsonNode(
-        sendPostRequest("http://localhost:" + getRandomBrokerPort() + "/query/sql",
-            "{\"sql\":\"SELECT count(*) FROM baseballStats\"}", AUTH_HEADER_USER));
-    Assert.assertFalse(responseUser.has("resultTable"), "must not return result table");
-    Assert.assertTrue(responseUser.get("exceptions").get(0).get("errorCode").asInt() != 0, "must return error code");
+    // user with valid auth but no table access - must return 403
+    try {
+      sendPostRequest("http://localhost:" + getRandomBrokerPort() + "/query/sql",
+          "{\"sql\":\"SELECT count(*) FROM baseballStats\"}", AUTH_HEADER_USER);
+    } catch (IOException e) {
+      HttpErrorStatusException httpErrorStatusException = (HttpErrorStatusException) e.getCause();
+      Assert.assertEquals(httpErrorStatusException.getStatusCode(), 403, "must return 403");
+    }
   }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BrokerServiceDiscoveryIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BrokerServiceDiscoveryIntegrationTest.java
index 207d2f64eea..6290cb9a051 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BrokerServiceDiscoveryIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BrokerServiceDiscoveryIntegrationTest.java
@@ -75,7 +75,7 @@ public void tearDown()
   @Test
   public void testBrokerExtraEndpointsAutoLoaded()
       throws Exception {
-    String response = sendGetRequest(_brokerBaseApiUrl + "/test/echo/doge");
+    String response = sendGetRequest(getBrokerBaseApiUrl() + "/test/echo/doge");
     Assert.assertEquals(response, "doge");
   }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerServiceDiscoveryIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerServiceDiscoveryIntegrationTest.java
index 72fc96129e4..5211d64f47d 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerServiceDiscoveryIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerServiceDiscoveryIntegrationTest.java
@@ -84,9 +84,9 @@ public void tearDown()
   @Test
   public void testControllerExtraEndpointsAutoLoaded()
       throws Exception {
-    String response = sendGetRequest(_controllerBaseApiUrl + "/test/echo/doge");
+    String response = sendGetRequest(getControllerBaseApiUrl() + "/test/echo/doge");
     Assert.assertEquals(response, "doge");
-    response = sendGetRequest(_brokerBaseApiUrl + "/test/echo/doge");
+    response = sendGetRequest(getBrokerBaseApiUrl() + "/test/echo/doge");
     Assert.assertEquals(response, "doge");
   }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java
index 422672c9d9d..f366a994eba 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java
@@ -210,6 +210,40 @@ public void testQueryTracing()
     Assert.assertTrue(traceInfo.has("localhost_R"));
   }
 
+  @Test
+  public void testQueryTracingWithLiteral()
+      throws Exception {
+    JsonNode jsonNode =
+        postQuery("SET trace = true; SELECT 1, \'test\', ArrDelay FROM " + getTableName() + " LIMIT 10");
+    long countStarResult = 10;
+    Assert.assertEquals(jsonNode.get("resultTable").get("rows").size(), 10);
+    for (int rowId = 0; rowId < 10; rowId++) {
+      Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(rowId).get(0).asLong(), 1);
+      Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(rowId).get(1).asText(), "test");
+    }
+    Assert.assertTrue(jsonNode.get("exceptions").isEmpty());
+    JsonNode traceInfo = jsonNode.get("traceInfo");
+    Assert.assertEquals(traceInfo.size(), 2);
+    Assert.assertTrue(traceInfo.has("localhost_O"));
+    Assert.assertTrue(traceInfo.has("localhost_R"));
+  }
+
+  @Test
+  public void testDropResults()
+      throws Exception {
+    final String query = String.format("SELECT * FROM %s limit 10", getTableName());
+    final String resultTag = "resultTable";
+
+    // dropResults=true - resultTable must not be in the response
+    Assert.assertFalse(postQueryWithOptions(query, "dropResults=true").has(resultTag));
+
+    // dropResults=TrUE (case insensitive match) - resultTable must not be in the response
+    Assert.assertFalse(postQueryWithOptions(query, "dropResults=TrUE").has(resultTag));
+
+    // dropResults=truee - (anything other than true, is taken as false) - resultTable must be in the response
+    Assert.assertTrue(postQueryWithOptions(query, "dropResults=truee").has(resultTag));
+  }
+
   @Test
   @Override
   public void testHardcodedQueries()
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/JsonPathClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/JsonPathClusterIntegrationTest.java
index 31a2bedf9bc..f6a8f238265 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/JsonPathClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/JsonPathClusterIntegrationTest.java
@@ -53,14 +53,14 @@
 
 
 public class JsonPathClusterIntegrationTest extends BaseClusterIntegrationTest {
-  private static final int NUM_TOTAL_DOCS = 1000;
+  protected static final int NUM_TOTAL_DOCS = 1000;
   private static final String MY_MAP_STR_FIELD_NAME = "myMapStr";
   private static final String MY_MAP_STR_K1_FIELD_NAME = "myMapStr_k1";
   private static final String MY_MAP_STR_K2_FIELD_NAME = "myMapStr_k2";
   private static final String COMPLEX_MAP_STR_FIELD_NAME = "complexMapStr";
   private static final String COMPLEX_MAP_STR_K3_FIELD_NAME = "complexMapStr_k3";
 
-  private final List<String> _sortedSequenceIds = new ArrayList<>(NUM_TOTAL_DOCS);
+  protected final List<String> _sortedSequenceIds = new ArrayList<>(NUM_TOTAL_DOCS);
 
   @Override
   protected long getCountStarResult() {
@@ -144,9 +144,11 @@ private File createAvroFile()
     return avroFile;
   }
 
-  @Test
-  public void testQueries()
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testQueries(boolean useMultiStageQueryEngine)
       throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+
     //Selection Query
     String query = "Select myMapStr from " + DEFAULT_TABLE_NAME;
     JsonNode pinotResponse = postQuery(query);
@@ -194,9 +196,10 @@ public void testQueries()
     }
   }
 
-  @Test
-  public void testComplexQueries()
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testComplexQueries(boolean useMultiStageQueryEngine)
       throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
     //Selection Query
     String query = "Select complexMapStr from " + DEFAULT_TABLE_NAME;
     JsonNode pinotResponse = postQuery(query);
@@ -260,15 +263,21 @@ public void testComplexQueries()
       Assert.assertEquals(k4.get("k4-k3"), "value-k4-k3-" + seqId);
       Assert.assertEquals(Double.parseDouble(k4.get("met").toString()), Double.parseDouble(seqId));
     }
+  }
+
+  @Test(dataProvider = "useV1QueryEngine")
+  public void testComplexGroupByQueryV1(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
 
     //Group By Query
-    query = "Select" + " jsonExtractScalar(complexMapStr,'$.k1','STRING'),"
+    String query = "Select" + " jsonExtractScalar(complexMapStr,'$.k1','STRING'),"
         + " sum(jsonExtractScalar(complexMapStr,'$.k4.met','INT'))" + " from " + DEFAULT_TABLE_NAME
         + " group by jsonExtractScalar(complexMapStr,'$.k1','STRING')"
         + " order by sum(jsonExtractScalar(complexMapStr,'$.k4.met','INT')) DESC";
-    pinotResponse = postQuery(query);
+    JsonNode pinotResponse = postQuery(query);
     Assert.assertNotNull(pinotResponse.get("resultTable").get("rows"));
-    rows = (ArrayNode) pinotResponse.get("resultTable").get("rows");
+    ArrayNode rows = (ArrayNode) pinotResponse.get("resultTable").get("rows");
     for (int i = 0; i < rows.size(); i++) {
       String seqId = _sortedSequenceIds.get(NUM_TOTAL_DOCS - 1 - i);
       final JsonNode row = rows.get(i);
@@ -277,9 +286,66 @@ public void testComplexQueries()
     }
   }
 
-  @Test
-  void testFailedQuery()
+  @Test(dataProvider = "useV2QueryEngine")
+  public void testComplexGroupByQueryV2(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    //Group By Query
+    String query = "Select" + " jsonExtractScalar(complexMapStr,'$.k1','STRING'),"
+        + " sum(jsonExtractScalar(complexMapStr,'$.k4.met','INT'))" + " from " + DEFAULT_TABLE_NAME
+        + " group by jsonExtractScalar(complexMapStr,'$.k1','STRING')"
+        + " order by sum(jsonExtractScalar(complexMapStr,'$.k4.met','INT')) DESC";
+    JsonNode pinotResponse = postQuery(query);
+    Assert.assertNotNull(pinotResponse.get("resultTable").get("rows"));
+    ArrayNode rows = (ArrayNode) pinotResponse.get("resultTable").get("rows");
+    for (int i = 0; i < rows.size(); i++) {
+      String seqId = String.valueOf(NUM_TOTAL_DOCS - 1 - i);
+      final JsonNode row = rows.get(i);
+      Assert.assertEquals(row.get(0).asText(), "value-k1-" + seqId);
+      Assert.assertEquals(row.get(1).asDouble(), Double.parseDouble(seqId));
+    }
+  }
+
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testQueryWithIntegerDefault(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    //Group By Query
+    String query = "Select" + " jsonExtractScalar(complexMapStr,'$.inExistKey','STRING','defaultKey'),"
+        + " sum(jsonExtractScalar(complexMapStr,'$.inExistMet','INT','1'))" + " from " + DEFAULT_TABLE_NAME
+        + " group by jsonExtractScalar(complexMapStr,'$.inExistKey','STRING','defaultKey')"
+        + " order by sum(jsonExtractScalar(complexMapStr,'$.inExistMet','INT','1')) DESC";
+    JsonNode pinotResponse = postQuery(query);
+    Assert.assertNotNull(pinotResponse.get("resultTable").get("rows"));
+    ArrayNode rows = (ArrayNode) pinotResponse.get("resultTable").get("rows");
+    Assert.assertEquals(rows.size(), 1);
+    final JsonNode row = rows.get(0);
+    Assert.assertEquals(row.get(0).asText(), "defaultKey");
+    Assert.assertEquals(row.get(1).asDouble(), 1000.0);
+  }
+
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testQueryWithDoubleDefault(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    //Group By Query
+    String query = "Select" + " jsonExtractScalar(complexMapStr,'$.inExistKey','STRING', 'defaultKey'),"
+        + " sum(jsonExtractScalar(complexMapStr,'$.inExistMet','DOUBLE','0.1'))" + " from " + DEFAULT_TABLE_NAME
+        + " group by jsonExtractScalar(complexMapStr,'$.inExistKey','STRING','defaultKey')"
+        + " order by sum(jsonExtractScalar(complexMapStr,'$.inExistMet','DOUBLE','0.1')) DESC";
+    JsonNode pinotResponse = postQuery(query);
+    Assert.assertNotNull(pinotResponse.get("resultTable").get("rows"));
+    ArrayNode rows = (ArrayNode) pinotResponse.get("resultTable").get("rows");
+    Assert.assertEquals(rows.size(), 1);
+    final JsonNode row = rows.get(0);
+    Assert.assertEquals(row.get(0).asText(), "defaultKey");
+    Assert.assertTrue(Math.abs(row.get(1).asDouble() - 100.0) < 1e-10);
+  }
+
+  @Test(dataProvider = "useBothQueryEngines")
+  void testFailedQuery(boolean useMultiStageQueryEngine)
       throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
     String query = "Select jsonExtractScalar(myMapStr,\"$.k1\",\"STRING\") from " + DEFAULT_TABLE_NAME;
     JsonNode pinotResponse = postQuery(query);
     Assert.assertEquals(pinotResponse.get("exceptions").get(0).get("errorCode").asInt(), 150);
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
index 93de24252aa..fd48bd6eb40 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
@@ -251,7 +251,7 @@ private void uploadSegmentsToController(String tableName, File tarDir, boolean o
     if (onlyFirstSegment) {
       numSegments = 1;
     }
-    URI uploadSegmentHttpURI = FileUploadDownloadClient.getUploadSegmentHttpURI(LOCAL_HOST, _controllerPort);
+    URI uploadSegmentHttpURI = URI.create(getControllerRequestURLBuilder().forSegmentUpload());
     try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient()) {
       if (numSegments == 1) {
         File segmentTarFile = segmentTarFiles[0];
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java
index 3d3637f8200..7068656865a 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/LLCRealtimeClusterIntegrationTest.java
@@ -162,7 +162,7 @@ private void uploadSegmentsToController(String tableName, File tarDir, boolean o
     if (onlyFirstSegment) {
       numSegments = 1;
     }
-    URI uploadSegmentHttpURI = FileUploadDownloadClient.getUploadSegmentHttpURI(LOCAL_HOST, _controllerPort);
+    URI uploadSegmentHttpURI = URI.create(getControllerRequestURLBuilder().forSegmentUpload());
     try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient()) {
       if (numSegments == 1) {
         File segmentTarFile = segmentTarFiles[0];
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MapTypeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MapTypeClusterIntegrationTest.java
index 68ec52dc5da..51724325d04 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MapTypeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MapTypeClusterIntegrationTest.java
@@ -53,6 +53,7 @@ public class MapTypeClusterIntegrationTest extends BaseClusterIntegrationTest {
   private static final String INT_KEY_MAP_FIELD_NAME = "intKeyMap";
   private static final String STRING_KEY_MAP_STR_FIELD_NAME = "stringKeyMapStr";
   private static final String INT_KEY_MAP_STR_FIELD_NAME = "intKeyMapStr";
+  private int _setSelectionDefaultDocCount = 10;
 
   @Override
   protected long getCountStarResult() {
@@ -79,6 +80,7 @@ public void setUp()
         .addMultiValueDimension(INT_KEY_MAP_FIELD_NAME + SchemaUtils.MAP_VALUE_COLUMN_SUFFIX, DataType.INT)
         .addSingleValueDimension(STRING_KEY_MAP_STR_FIELD_NAME, DataType.STRING)
         .addSingleValueDimension(INT_KEY_MAP_STR_FIELD_NAME, DataType.STRING).build();
+    addSchema(schema);
     List<TransformConfig> transformConfigs = Arrays.asList(
         new TransformConfig(STRING_KEY_MAP_STR_FIELD_NAME, "toJsonMapStr(" + STRING_KEY_MAP_FIELD_NAME + ")"),
         new TransformConfig(INT_KEY_MAP_STR_FIELD_NAME, "toJsonMapStr(" + INT_KEY_MAP_FIELD_NAME + ")"));
@@ -129,32 +131,37 @@ private File createAvroFile()
     return avroFile;
   }
 
-  @Test
-  public void testJsonPathQueries()
+  protected int getSelectionDefaultDocCount() {
+    return _setSelectionDefaultDocCount;
+  }
+
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testJsonPathQueries(boolean useMultiStageQueryEngine)
       throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
     // Selection only
     String query = "SELECT stringKeyMapStr FROM " + getTableName();
     JsonNode pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     JsonNode rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
-      assertEquals(rows.get(i).get(0).textValue(), String.format("{\"k1\":%d,\"k2\":100%d}", i, i));
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
+      assertEquals(rows.get(i).get(0).textValue(), String.format("{\"k1\":%d,\"k2\":%d}", i, NUM_DOCS + i));
     }
     query = "SELECT jsonExtractScalar(stringKeyMapStr, '$.k1', 'INT') FROM " + getTableName();
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
     }
     query = "SELECT jsonExtractScalar(intKeyMapStr, '$.95', 'INT') FROM " + getTableName();
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
     }
 
@@ -164,8 +171,8 @@ public void testJsonPathQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), NUM_DOCS + i);
     }
     query = "SELECT jsonExtractScalar(intKeyMapStr, '$.717', 'INT') FROM " + getTableName()
@@ -173,8 +180,8 @@ public void testJsonPathQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), NUM_DOCS + i);
     }
 
@@ -197,8 +204,8 @@ public void testJsonPathQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
       assertEquals(rows.get(i).get(1).intValue(), NUM_DOCS + i);
     }
@@ -208,8 +215,8 @@ public void testJsonPathQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
       assertEquals(rows.get(i).get(1).intValue(), NUM_DOCS + i);
     }
@@ -230,20 +237,6 @@ public void testJsonPathQueries()
     assertEquals(rows.size(), 1);
     assertEquals(rows.get(0).get(0).intValue(), NUM_DOCS + 25);
 
-    // Filter on non-existing key
-    query = "SELECT jsonExtractScalar(stringKeyMapStr, '$.k2', 'INT') FROM " + getTableName()
-        + " WHERE jsonExtractScalar(stringKeyMapStr, '$.k3', 'INT_ARRAY') = 25";
-    pinotResponse = postQuery(query);
-    assertEquals(pinotResponse.get("exceptions").size(), 0);
-    rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 0);
-    query = "SELECT jsonExtractScalar(intKeyMapStr, '$.717', 'INT') FROM " + getTableName()
-        + " WHERE jsonExtractScalar(intKeyMapStr, '$.123', 'INT_ARRAY') = 25";
-    pinotResponse = postQuery(query);
-    assertEquals(pinotResponse.get("exceptions").size(), 0);
-    rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 0);
-
     // Select non-existing key (illegal query)
     query = "SELECT jsonExtractScalar(stringKeyMapStr, '$.k3', 'INT') FROM " + getTableName();
     pinotResponse = postQuery(query);
@@ -259,40 +252,27 @@ public void testJsonPathQueries()
     query = "SELECT jsonExtractScalar(stringKeyMapStr, '$.123', 'INT', '0') FROM " + getTableName();
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
-
-    // Select non-existing key with proper filter
-    query = "SELECT jsonExtractScalar(intKeyMapStr, '$.123', 'INT') FROM " + getTableName()
-        + " WHERE jsonExtractKey(intKeyMapStr, '$.*') = \"$['123']\"";
-    pinotResponse = postQuery(query);
-    assertEquals(pinotResponse.get("exceptions").size(), 0);
-    rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 0);
-    query = "SELECT jsonExtractScalar(stringKeyMapStr, '$.k3', 'INT') FROM " + getTableName()
-        + " WHERE jsonExtractKey(stringKeyMapStr, '$.*') = \"$['k3']\"";
-    pinotResponse = postQuery(query);
-    assertEquals(pinotResponse.get("exceptions").size(), 0);
-    rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 0);
   }
 
-  @Test
-  public void testQueries()
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testQueries(boolean useMultiStageQueryEngine)
       throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
     // Selection only
     String query = "SELECT mapValue(stringKeyMap__KEYS, 'k1', stringKeyMap__VALUES) FROM " + getTableName();
     JsonNode pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     JsonNode rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
     }
     query = "SELECT mapValue(intKeyMap__KEYS, 95, intKeyMap__VALUES) FROM " + getTableName();
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
     }
 
@@ -302,8 +282,8 @@ public void testQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), NUM_DOCS + i);
     }
     query = "SELECT mapValue(intKeyMap__KEYS, 717, intKeyMap__VALUES) FROM " + getTableName()
@@ -311,8 +291,8 @@ public void testQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), NUM_DOCS + i);
     }
 
@@ -335,8 +315,8 @@ public void testQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
       assertEquals(rows.get(i).get(1).intValue(), NUM_DOCS + i);
     }
@@ -346,8 +326,8 @@ public void testQueries()
     pinotResponse = postQuery(query);
     assertEquals(pinotResponse.get("exceptions").size(), 0);
     rows = pinotResponse.get("resultTable").get("rows");
-    assertEquals(rows.size(), 10);
-    for (int i = 0; i < 10; i++) {
+    assertEquals(rows.size(), getSelectionDefaultDocCount());
+    for (int i = 0; i < getSelectionDefaultDocCount(); i++) {
       assertEquals(rows.get(i).get(0).intValue(), i);
       assertEquals(rows.get(i).get(1).intValue(), NUM_DOCS + i);
     }
@@ -389,6 +369,44 @@ public void testQueries()
     query = "SELECT mapValue(stringKeyMap__KEYS, 123, stringKeyMap__VALUES) FROM " + getTableName();
     pinotResponse = postQuery(query);
     assertNotEquals(pinotResponse.get("exceptions").size(), 0);
+  }
+
+  @Test(dataProvider = "useV1QueryEngine")
+  public void testMultiValueQueries(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    String query;
+    JsonNode pinotResponse;
+    JsonNode rows;
+
+    // Filter on non-existing key
+    query
+        = "SELECT jsonExtractScalar(stringKeyMapStr, '$.k2', 'INT') FROM " + getTableName()
+        + " WHERE jsonExtractScalar(stringKeyMapStr, '$.k3', 'INT_ARRAY') = 25";
+    pinotResponse = postQuery(query);
+    assertEquals(pinotResponse.get("exceptions").size(), 0);
+    rows = pinotResponse.get("resultTable").get("rows");
+    assertEquals(rows.size(), 0);
+    query = "SELECT jsonExtractScalar(intKeyMapStr, '$.717', 'INT') FROM " + getTableName()
+        + " WHERE jsonExtractScalar(intKeyMapStr, '$.123', 'INT_ARRAY') = 25";
+    pinotResponse = postQuery(query);
+    assertEquals(pinotResponse.get("exceptions").size(), 0);
+    rows = pinotResponse.get("resultTable").get("rows");
+    assertEquals(rows.size(), 0);
+
+    // Select non-existing key with proper filter
+    query = "SELECT jsonExtractScalar(intKeyMapStr, '$.123', 'INT') FROM " + getTableName()
+        + " WHERE jsonExtractKey(intKeyMapStr, '$.*') = \"$['123']\"";
+    pinotResponse = postQuery(query);
+    assertEquals(pinotResponse.get("exceptions").size(), 0);
+    rows = pinotResponse.get("resultTable").get("rows");
+    assertEquals(rows.size(), 0);
+    query = "SELECT jsonExtractScalar(stringKeyMapStr, '$.k3', 'INT') FROM " + getTableName()
+        + " WHERE jsonExtractKey(stringKeyMapStr, '$.*') = \"$['k3']\"";
+    pinotResponse = postQuery(query);
+    assertEquals(pinotResponse.get("exceptions").size(), 0);
+    rows = pinotResponse.get("resultTable").get("rows");
+    assertEquals(rows.size(), 0);
 
     // Select non-existing key with proper filter
     query = "SELECT mapValue(stringKeyMap__KEYS, 'k3', stringKeyMap__VALUES) FROM " + getTableName()
@@ -417,4 +435,10 @@ public void tearDown()
 
     FileUtils.deleteDirectory(_tempDir);
   }
+
+  @Override
+  protected void setUseMultiStageQueryEngine(boolean useMultiStageQueryEngine) {
+    super.setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    _setSelectionDefaultDocCount = useMultiStageQueryEngine ? 1000 : 10;
+  }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MergeRollupMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MergeRollupMinionClusterIntegrationTest.java
index 3c6b98c6e25..6874da83621 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MergeRollupMinionClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MergeRollupMinionClusterIntegrationTest.java
@@ -31,8 +31,10 @@
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.apache.helix.task.TaskState;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.lineage.SegmentLineageAccessHelper;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.MetricValueUtils;
 import org.apache.pinot.common.minion.MergeRollupTaskMetadata;
 import org.apache.pinot.common.minion.MinionTaskMetadataUtils;
 import org.apache.pinot.common.utils.SqlResultComparator;
@@ -51,8 +53,10 @@
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.ingestion.batch.BatchConfigProperties;
+import org.apache.pinot.spi.stream.StreamConfigProperties;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.apache.pinot.tools.utils.KafkaStarterUtils;
 import org.apache.pinot.util.TestUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -73,6 +77,8 @@ public class MergeRollupMinionClusterIntegrationTest extends BaseClusterIntegrat
   private static final String MULTI_LEVEL_CONCAT_TEST_TABLE = "myTable3";
   private static final String SINGLE_LEVEL_CONCAT_METADATA_TEST_TABLE = "myTable4";
   private static final String SINGLE_LEVEL_CONCAT_TEST_REALTIME_TABLE = "myTable5";
+  private static final String MULTI_LEVEL_CONCAT_PROCESS_ALL_REALTIME_TABLE = "myTable6";
+  private static final String PROCESS_ALL_MODE_KAFKA_TOPIC = "myKafkaTopic";
   private static final long TIMEOUT_IN_MS = 10_000L;
 
   protected PinotHelixTaskResourceManager _helixTaskResourceManager;
@@ -83,16 +89,18 @@ public class MergeRollupMinionClusterIntegrationTest extends BaseClusterIntegrat
   protected final File _segmentDir2 = new File(_tempDir, "segmentDir2");
   protected final File _segmentDir3 = new File(_tempDir, "segmentDir3");
   protected final File _segmentDir4 = new File(_tempDir, "segmentDir4");
+  protected final File _segmentDir5 = new File(_tempDir, "segmentDir5");
   protected final File _tarDir1 = new File(_tempDir, "tarDir1");
   protected final File _tarDir2 = new File(_tempDir, "tarDir2");
   protected final File _tarDir3 = new File(_tempDir, "tarDir3");
   protected final File _tarDir4 = new File(_tempDir, "tarDir4");
+  protected final File _tarDir5 = new File(_tempDir, "tarDir5");
 
   @BeforeClass
   public void setUp()
       throws Exception {
     TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir1, _segmentDir2, _segmentDir3, _segmentDir4,
-        _tarDir1, _tarDir2, _tarDir3, _tarDir4);
+        _segmentDir5, _tarDir1, _tarDir2, _tarDir3, _tarDir4, _tarDir5);
 
     // Start the Pinot cluster
     startZk();
@@ -139,8 +147,24 @@ public void setUp()
     // create the realtime table
     TableConfig tableConfig = createRealtimeTableConfig(avroFiles.get(0));
     addTableConfig(tableConfig);
+    _kafkaStarters.get(0)
+        .createTopic(PROCESS_ALL_MODE_KAFKA_TOPIC, KafkaStarterUtils.getTopicCreationProps(getNumKafkaPartitions()));
+    TableConfig singleLevelConcatProcessAllRealtimeTableConfig =
+        createRealtimeTableConfigWithProcessAllMode(avroFiles.get(0),
+            MULTI_LEVEL_CONCAT_PROCESS_ALL_REALTIME_TABLE, PROCESS_ALL_MODE_KAFKA_TOPIC);
+    addTableConfig(singleLevelConcatProcessAllRealtimeTableConfig);
+
     // Push data into Kafka
     pushAvroIntoKafka(avroFiles);
+    ClusterIntegrationTestUtils.pushAvroIntoKafka(avroFiles.subList(9, 12), "localhost:" + getKafkaPort(),
+        PROCESS_ALL_MODE_KAFKA_TOPIC, getMaxNumKafkaMessagesPerBatch(), getKafkaMessageHeader(), getPartitionColumn(),
+        injectTombstones());
+    ClusterIntegrationTestUtils.pushAvroIntoKafka(avroFiles.subList(0, 3), "localhost:" + getKafkaPort(),
+        PROCESS_ALL_MODE_KAFKA_TOPIC, getMaxNumKafkaMessagesPerBatch(), getKafkaMessageHeader(), getPartitionColumn(),
+        injectTombstones());
+    ClusterIntegrationTestUtils
+        .buildSegmentsFromAvro(avroFiles.subList(3, 9), singleLevelConcatProcessAllRealtimeTableConfig, schema, 0,
+            _segmentDir5, _tarDir5);
     // Wait for all documents loaded
     waitForAllDocsLoaded(600_000L);
 
@@ -192,6 +216,38 @@ private TableConfig createOfflineTableConfig(String tableName, TableTaskConfig t
         .setNullHandlingEnabled(getNullHandlingEnabled()).setSegmentPartitionConfig(partitionConfig).build();
   }
 
+  protected TableConfig createRealtimeTableConfigWithProcessAllMode(File sampleAvroFile, String tableName,
+      String topicName) {
+    AvroFileSchemaKafkaAvroMessageDecoder._avroFile = sampleAvroFile;
+    Map<String, String> streamConfigs = getStreamConfigMap();
+    streamConfigs.put(StreamConfigProperties.constructStreamProperty("kafka", StreamConfigProperties.STREAM_TOPIC_NAME),
+        topicName);
+    Map<String, String> tableTaskConfigs = new HashMap<>();
+    tableTaskConfigs.put("100days.mergeType", "concat");
+    tableTaskConfigs.put("100days.bufferTimePeriod", "1d");
+    tableTaskConfigs.put("100days.bucketTimePeriod", "100d");
+    tableTaskConfigs.put("100days.maxNumRecordsPerSegment", "15000");
+    tableTaskConfigs.put("100days.maxNumRecordsPerTask", "15000");
+    tableTaskConfigs.put("200days.mergeType", "concat");
+    tableTaskConfigs.put("200days.bufferTimePeriod", "1d");
+    tableTaskConfigs.put("200days.bucketTimePeriod", "200d");
+    tableTaskConfigs.put("200days.maxNumRecordsPerSegment", "15000");
+    tableTaskConfigs.put("200days.maxNumRecordsPerTask", "30000");
+    tableTaskConfigs.put("ActualElapsedTime.aggregationType", "min");
+    tableTaskConfigs.put("WeatherDelay.aggregationType", "sum");
+    tableTaskConfigs.put("mode", "processAll");
+    return new TableConfigBuilder(TableType.REALTIME).setTableName(tableName).setSchemaName(getSchemaName())
+        .setTimeColumnName(getTimeColumnName()).setSortedColumn(getSortedColumn())
+        .setInvertedIndexColumns(getInvertedIndexColumns()).setNoDictionaryColumns(getNoDictionaryColumns())
+        .setRangeIndexColumns(getRangeIndexColumns()).setBloomFilterColumns(getBloomFilterColumns())
+        .setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas()).setSegmentVersion(getSegmentVersion())
+        .setLoadMode(getLoadMode()).setTaskConfig(
+            new TableTaskConfig(Collections.singletonMap(MinionConstants.MergeRollupTask.TASK_TYPE, tableTaskConfigs)))
+        .setBrokerTenant(getBrokerTenant())
+        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryConfig())
+        .setLLC(useLlc()).setStreamConfigs(streamConfigs).setNullHandlingEnabled(getNullHandlingEnabled()).build();
+  }
+
   private TableTaskConfig getSingleLevelConcatTaskConfig() {
     Map<String, String> tableTaskConfigs = new HashMap<>();
     tableTaskConfigs.put("100days.mergeType", "concat");
@@ -337,7 +393,7 @@ public void testOfflineTableSingleLevelConcat()
     //      -> {merged_100days_T5_0_myTable1_16400_16435_0}
 
     String sqlQuery = "SELECT count(*) FROM myTable1"; // 115545 rows for the test table
-    JsonNode expectedJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode expectedJson = postQuery(sqlQuery);
     int[] expectedNumSubTasks = {1, 2, 2, 2, 1};
     int[] expectedNumSegmentsQueried = {13, 12, 13, 13, 12};
     long expectedWatermark = 16000 * 86_400_000L;
@@ -378,7 +434,7 @@ public void testOfflineTableSingleLevelConcat()
       TestUtils.waitForCondition(aVoid -> {
         try {
           // Check num total doc of merged segments are the same as the original segments
-          JsonNode actualJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+          JsonNode actualJson = postQuery(sqlQuery);
           if (!SqlResultComparator.areEqual(actualJson, expectedJson, sqlQuery)) {
             return false;
           }
@@ -393,9 +449,8 @@ public void testOfflineTableSingleLevelConcat()
     // Check total tasks
     assertEquals(numTasks, 5);
 
-    assertTrue(_controllerStarter.getControllerMetrics()
-        .containsGauge("mergeRollupTaskDelayInNumBuckets.myTable1_OFFLINE.100days"));
-
+    assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+        "mergeRollupTaskDelayInNumBuckets.myTable1_OFFLINE.100days"));
     // Drop the table
     dropOfflineTable(SINGLE_LEVEL_CONCAT_TEST_TABLE);
 
@@ -450,7 +505,7 @@ public void testOfflineTableSingleLevelConcatWithMetadataPush()
     //      -> {merged_100days_T5_0_myTable1_16400_16435_0}
 
     String sqlQuery = "SELECT count(*) FROM myTable4"; // 115545 rows for the test table
-    JsonNode expectedJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode expectedJson = postQuery(sqlQuery);
     int[] expectedNumSubTasks = {1, 2, 2, 2, 1};
     int[] expectedNumSegmentsQueried = {13, 12, 13, 13, 12};
     long expectedWatermark = 16000 * 86_400_000L;
@@ -491,7 +546,7 @@ public void testOfflineTableSingleLevelConcatWithMetadataPush()
       TestUtils.waitForCondition(aVoid -> {
         try {
           // Check num total doc of merged segments are the same as the original segments
-          JsonNode actualJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+          JsonNode actualJson = postQuery(sqlQuery);
           if (!SqlResultComparator.areEqual(actualJson, expectedJson, sqlQuery)) {
             return false;
           }
@@ -506,8 +561,8 @@ public void testOfflineTableSingleLevelConcatWithMetadataPush()
     // Check total tasks
     assertEquals(numTasks, 5);
 
-    assertTrue(_controllerStarter.getControllerMetrics()
-        .containsGauge("mergeRollupTaskDelayInNumBuckets.myTable4_OFFLINE.100days"));
+    assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+        "mergeRollupTaskDelayInNumBuckets.myTable4_OFFLINE.100days"));
 
     // Drop the table
     dropOfflineTable(SINGLE_LEVEL_CONCAT_METADATA_TEST_TABLE);
@@ -556,7 +611,7 @@ public void testOfflineTableSingleLevelRollup()
     //      -> {merged_150days_1628644105127_0_myTable2_16352_16429_0}
 
     String sqlQuery = "SELECT count(*) FROM myTable2"; // 115545 rows for the test table
-    JsonNode expectedJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode expectedJson = postQuery(sqlQuery);
     int[] expectedNumSegmentsQueried = {16, 7, 3};
     long expectedWatermark = 16050 * 86_400_000L;
     String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(SINGLE_LEVEL_ROLLUP_TEST_TABLE);
@@ -596,7 +651,7 @@ public void testOfflineTableSingleLevelRollup()
       TestUtils.waitForCondition(aVoid -> {
         try {
           // Check total doc of merged segments are less than the original segments
-          JsonNode actualJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+          JsonNode actualJson = postQuery(sqlQuery);
           if (actualJson.get("resultTable").get("rows").get(0).get(0).asInt() >= expectedJson.get("resultTable")
               .get("rows").get(0).get(0).asInt()) {
             return false;
@@ -611,7 +666,7 @@ public void testOfflineTableSingleLevelRollup()
     }
 
     // Check total doc is half of the original after all merge tasks are finished
-    JsonNode actualJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode actualJson = postQuery(sqlQuery);
     assertEquals(actualJson.get("resultTable").get("rows").get(0).get(0).asInt(),
         expectedJson.get("resultTable").get("rows").get(0).get(0).asInt() / 2);
     // Check time column is rounded
@@ -624,8 +679,8 @@ public void testOfflineTableSingleLevelRollup()
     // Check total tasks
     assertEquals(numTasks, 3);
 
-    assertTrue(_controllerStarter.getControllerMetrics()
-        .containsGauge("mergeRollupTaskDelayInNumBuckets.myTable2_OFFLINE.150days"));
+    assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+        "mergeRollupTaskDelayInNumBuckets.myTable2_OFFLINE.150days"));
   }
 
   /**
@@ -695,7 +750,7 @@ public void testOfflineTableMultiLevelConcat()
     //    90days: [16380, 16470) is not a valid merge window because windowEndTime > 45days watermark, not scheduling
 
     String sqlQuery = "SELECT count(*) FROM myTable3"; // 115545 rows for the test table
-    JsonNode expectedJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode expectedJson = postQuery(sqlQuery);
     int[] expectedNumSubTasks = {1, 2, 1, 2, 1, 2, 1, 2, 1};
     int[] expectedNumSegmentsQueried = {12, 12, 11, 10, 9, 8, 7, 6, 5};
     Long[] expectedWatermarks45Days = {16065L, 16110L, 16155L, 16200L, 16245L, 16290L, 16335L, 16380L};
@@ -750,7 +805,7 @@ public void testOfflineTableMultiLevelConcat()
       TestUtils.waitForCondition(aVoid -> {
         try {
           // Check total doc of merged segments are the same as the original segments
-          JsonNode actualJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+          JsonNode actualJson = postQuery(sqlQuery);
           if (!SqlResultComparator.areEqual(actualJson, expectedJson, sqlQuery)) {
             return false;
           }
@@ -765,10 +820,10 @@ public void testOfflineTableMultiLevelConcat()
     // Check total tasks
     assertEquals(numTasks, 8);
 
-    assertTrue(_controllerStarter.getControllerMetrics()
-        .containsGauge("mergeRollupTaskDelayInNumBuckets.myTable3_OFFLINE.45days"));
-    assertTrue(_controllerStarter.getControllerMetrics()
-        .containsGauge("mergeRollupTaskDelayInNumBuckets.myTable3_OFFLINE.90days"));
+    assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+        "mergeRollupTaskDelayInNumBuckets.myTable3_OFFLINE.45days"));
+    assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+        "mergeRollupTaskDelayInNumBuckets.myTable3_OFFLINE.90days"));
   }
 
   protected void verifyTableDelete(String tableNameWithType) {
@@ -829,7 +884,7 @@ public void testRealtimeTableSingleLevelConcat()
     String tableName = getTableName();
 
     String sqlQuery = "SELECT count(*) FROM " + tableName; // 115545 rows for the test table
-    JsonNode expectedJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode expectedJson = postQuery(sqlQuery);
     // disable some checks for now because github does not generate the same number of tasks sometimes
     // need to figure out why they work locally all the time but not on github
     // I feel it maybe related to resources or timestamps
@@ -874,7 +929,7 @@ public void testRealtimeTableSingleLevelConcat()
       TestUtils.waitForCondition(aVoid -> {
         try {
           // Check num total doc of merged segments are the same as the original segments
-          JsonNode actualJson = postQuery(sqlQuery, _brokerBaseApiUrl);
+          JsonNode actualJson = postQuery(sqlQuery);
           if (!SqlResultComparator.areEqual(actualJson, expectedJson, sqlQuery)) {
             return false;
           }
@@ -892,8 +947,108 @@ public void testRealtimeTableSingleLevelConcat()
     // Check total tasks
     assertEquals(numTasks, 5);
 
-    assertTrue(_controllerStarter.getControllerMetrics()
-        .containsGauge("mergeRollupTaskDelayInNumBuckets.myTable5_REALTIME.100days"));
+    assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+        "mergeRollupTaskDelayInNumBuckets.myTable5_REALTIME.100days"));
+
+    // Drop the table
+    dropRealtimeTable(tableName);
+
+    // Check if the task metadata is cleaned up on table deletion
+    verifyTableDelete(realtimeTableName);
+  }
+
+  @Test
+  public void testRealtimeTableProcessAllModeMultiLevelConcat()
+      throws Exception {
+    // The original segments (time range: [16251, 16428]):
+    // mytable__0__0__{ts00} ... mytable__0__11__{ts011}
+    // mytable__1__0__{ts00} ... mytable__1__11__{ts111}
+    //
+    // Scheduled time ranges and number buckets to process:
+    // round  |        100days          200days
+    //   1    | [16251, 16299], 3  |       []       , 0
+    //   2    | [16300, 16399], 2  |       []       , 0
+    //   3    | [16400, 16428], 1  |  [16251, 16399], 1
+    //   4    |       []      , 0  |  [16400, 16428], 1
+    //
+    // Upload historical segments manually:
+    // myTable_16071_16101_0
+    // myTable_16102_16129_1
+    // myTable_16130_16159_2
+    // myTable_16160_16189_3
+    // myTable_16190_16220_4
+    // myTable_16221_16250_5
+    //
+    // Scheduled time ranges and number buckets to process:
+    // round  |        100days          200days
+    //   5    | [16071, 16099], 3  |       []       , 0
+    //   6    | [16100, 16199], 2  |       []       , 0
+    //   7    | [16200, 16299], 1  |  [16071, 16199], 1
+    //   8    |       []      , 0  |  [16200, 16399], 1
+    PinotHelixTaskResourceManager helixTaskResourceManager = _controllerStarter.getHelixTaskResourceManager();
+    PinotTaskManager taskManager = _controllerStarter.getTaskManager();
+    String tableName = MULTI_LEVEL_CONCAT_PROCESS_ALL_REALTIME_TABLE;
+
+    String sqlQuery = "SELECT count(*) FROM " + tableName;
+    JsonNode expectedJson = postQuery(sqlQuery);
+    long[] expectedNumBucketsToProcess100Days = {3, 2, 1, 0, 3, 2, 1, 0};
+    long[] expectedNumBucketsToProcess200Days = {0, 0, 1, 1, 0, 0, 1, 1};
+    String realtimeTableName = TableNameBuilder.REALTIME.tableNameWithType(tableName);
+    int numTasks = 0;
+    for (String tasks = taskManager.scheduleTasks(realtimeTableName).get(MinionConstants.MergeRollupTask.TASK_TYPE);
+        tasks != null; tasks =
+        taskManager.scheduleTasks(realtimeTableName).get(MinionConstants.MergeRollupTask.TASK_TYPE), numTasks++) {
+      assertTrue(helixTaskResourceManager.getTaskQueues()
+          .contains(PinotHelixTaskResourceManager.getHelixJobQueueName(MinionConstants.MergeRollupTask.TASK_TYPE)));
+
+      // Will not schedule task if there's incomplete task
+      assertNull(
+          taskManager.scheduleTasks(realtimeTableName).get(MinionConstants.RealtimeToOfflineSegmentsTask.TASK_TYPE));
+      waitForTaskToComplete();
+
+      // Check not using watermarks
+      ZNRecord minionTaskMetadataZNRecord = taskManager.getClusterInfoAccessor()
+          .getMinionTaskMetadataZNRecord(MinionConstants.MergeRollupTask.TASK_TYPE, realtimeTableName);
+      assertNull(minionTaskMetadataZNRecord);
+
+      // Check metrics
+      assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+          "mergeRollupTaskNumBucketsToProcess.myTable6_REALTIME.100days"));
+      assertTrue(MetricValueUtils.gaugeExists(_controllerStarter.getControllerMetrics(),
+          "mergeRollupTaskNumBucketsToProcess.myTable6_REALTIME.200days"));
+      long numBucketsToProcess = MetricValueUtils.getGaugeValue(_controllerStarter.getControllerMetrics(),
+          "mergeRollupTaskNumBucketsToProcess.myTable6_REALTIME.100days");
+      assertEquals(numBucketsToProcess, expectedNumBucketsToProcess100Days[numTasks]);
+      numBucketsToProcess = MetricValueUtils.getGaugeValue(_controllerStarter.getControllerMetrics(),
+          "mergeRollupTaskNumBucketsToProcess.myTable6_REALTIME.200days");
+      assertEquals(numBucketsToProcess, expectedNumBucketsToProcess200Days[numTasks]);
+    }
+    // Check total tasks
+    assertEquals(numTasks, 4);
+
+    // Check query results
+    JsonNode actualJson = postQuery(sqlQuery);
+    assertTrue(SqlResultComparator.areEqual(actualJson, expectedJson, sqlQuery));
+
+    // Upload historical data and schedule
+    uploadSegments(MULTI_LEVEL_CONCAT_PROCESS_ALL_REALTIME_TABLE, TableType.REALTIME, _tarDir5);
+    waitForAllDocsLoaded(600_000L);
+
+    for (String tasks = taskManager.scheduleTasks(realtimeTableName).get(MinionConstants.MergeRollupTask.TASK_TYPE);
+        tasks != null; tasks =
+        taskManager.scheduleTasks(realtimeTableName).get(MinionConstants.MergeRollupTask.TASK_TYPE), numTasks++) {
+      waitForTaskToComplete();
+      // Check metrics
+      long numBucketsToProcess = MetricValueUtils.getGaugeValue(_controllerStarter.getControllerMetrics(),
+          "mergeRollupTaskNumBucketsToProcess.myTable6_REALTIME.100days");
+      assertEquals(numBucketsToProcess, expectedNumBucketsToProcess100Days[numTasks]);
+      numBucketsToProcess = MetricValueUtils.getGaugeValue(_controllerStarter.getControllerMetrics(),
+          "mergeRollupTaskNumBucketsToProcess.myTable6_REALTIME.200days");
+      assertEquals(numBucketsToProcess, expectedNumBucketsToProcess200Days[numTasks]);
+    }
+
+    // Check total tasks
+    assertEquals(numTasks, 8);
 
     // Drop the table
     dropRealtimeTable(tableName);
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiNodesOfflineClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiNodesOfflineClusterIntegrationTest.java
index d64c7321618..7c76eaaacb3 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiNodesOfflineClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiNodesOfflineClusterIntegrationTest.java
@@ -31,6 +31,8 @@
 import org.apache.pinot.spi.utils.CommonConstants.Broker.FailureDetector;
 import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.BrokerResourceStateModel;
 import org.apache.pinot.util.TestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -43,6 +45,7 @@
  * Integration test that extends OfflineClusterIntegrationTest but start multiple brokers and servers.
  */
 public class MultiNodesOfflineClusterIntegrationTest extends OfflineClusterIntegrationTest {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MultiNodesOfflineClusterIntegrationTest.class);
   private static final int NUM_BROKERS = 2;
   private static final int NUM_SERVERS = 3;
 
@@ -136,30 +139,34 @@ public void testServerHardFailure()
     testCountStarQuery(3, false);
     assertEquals(getCurrentCountStarResult(), expectedCountStarResult);
 
+    LOGGER.warn("Shutting down server " + _serverStarters.get(NUM_SERVERS - 1).getInstanceId());
     // Take a server and shut down its query server to mimic a hard failure
     BaseServerStarter serverStarter = _serverStarters.get(NUM_SERVERS - 1);
-    serverStarter.getServerInstance().shutDown();
-
-    // First query should hit all servers and get connection refused exception
-    testCountStarQuery(NUM_SERVERS, true);
-
-    // Second query should not hit the failed server, and should return the correct result
-    testCountStarQuery(NUM_SERVERS - 1, false);
-
-    // Restart the failed server, and it should be included in the routing again
-    serverStarter.stop();
-    serverStarter = startOneServer(NUM_SERVERS - 1);
-    _serverStarters.set(NUM_SERVERS - 1, serverStarter);
-    TestUtils.waitForCondition(aVoid -> {
-      try {
-        JsonNode queryResult = postQuery("SELECT COUNT(*) FROM mytable");
-        // Result should always be correct
-        assertEquals(queryResult.get("resultTable").get("rows").get(0).get(0).longValue(), getCountStarResult());
-        return queryResult.get("numServersQueried").intValue() == NUM_SERVERS;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }, 10_000L, "Failed to include the restarted server into the routing");
+    try {
+      serverStarter.getServerInstance().shutDown();
+
+      // First query should hit all servers and get connection refused or reset exception
+      // TODO: This is a flaky test. There is a race condition between shutDown and the query being executed.
+      testCountStarQuery(NUM_SERVERS, true);
+
+      // Second query should not hit the failed server, and should return the correct result
+      testCountStarQuery(NUM_SERVERS - 1, false);
+    } finally {
+      // Restart the failed server, and it should be included in the routing again
+      serverStarter.stop();
+      serverStarter = startOneServer(NUM_SERVERS - 1);
+      _serverStarters.set(NUM_SERVERS - 1, serverStarter);
+      TestUtils.waitForCondition((aVoid) -> {
+        try {
+          JsonNode queryResult = postQuery("SELECT COUNT(*) FROM mytable");
+          // Result should always be correct
+          assertEquals(queryResult.get("resultTable").get("rows").get(0).get(0).longValue(), getCountStarResult());
+          return queryResult.get("numServersQueried").intValue() == NUM_SERVERS;
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+      }, 10_000L, "Failed to include the restarted server into the routing. Other tests may be affected");
+    }
   }
 
   private void testCountStarQuery(int expectedNumServersQueried, boolean exceptionExpected)
@@ -171,8 +178,12 @@ private void testCountStarQuery(int expectedNumServersQueried, boolean exception
       JsonNode exceptions = queryResult.get("exceptions");
       assertEquals(exceptions.size(), 2);
       JsonNode firstException = exceptions.get(0);
+      // NOTE:
+      // Only verify the error code but not the exception message because there can be different messages:
+      // - Connection refused
+      // - Connection reset
+      // - Channel is inactive
       assertEquals(firstException.get("errorCode").intValue(), QueryException.BROKER_REQUEST_SEND_ERROR_CODE);
-      assertTrue(firstException.get("message").textValue().contains("Connection refused"));
       JsonNode secondException = exceptions.get(1);
       assertEquals(secondException.get("errorCode").intValue(), QueryException.SERVER_NOT_RESPONDING_ERROR_CODE);
     } else {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/fwd/NoOpForwardIndexCreator.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineCustomTenantIntegrationTest.java
similarity index 51%
rename from pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/fwd/NoOpForwardIndexCreator.java
rename to pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineCustomTenantIntegrationTest.java
index bc990ac616f..4c72033a7f6 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/fwd/NoOpForwardIndexCreator.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineCustomTenantIntegrationTest.java
@@ -16,49 +16,36 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.local.segment.creator.impl.fwd;
+package org.apache.pinot.integration.tests;
 
 import java.io.IOException;
-import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
-import org.apache.pinot.spi.data.FieldSpec;
+import java.util.Map;
+import org.apache.pinot.controller.ControllerConf;
 
 
-/**
- * Forward index creator for dictionary-encoded single and multi-value columns with forward index disabled.
- * This is a no-op.
- */
-public class NoOpForwardIndexCreator implements ForwardIndexCreator {
-  private final boolean _isSingleValue;
-
-  public NoOpForwardIndexCreator(boolean isSingleValue) {
-    _isSingleValue = isSingleValue;
-  }
-
-  @Override
-  public boolean isDictionaryEncoded() {
-    return true;
-  }
+public class MultiStageEngineCustomTenantIntegrationTest extends MultiStageEngineIntegrationTest {
+  private static final String TEST_TENANT = "TestTenant";
 
   @Override
-  public boolean isSingleValue() {
-    return _isSingleValue;
+  protected String getBrokerTenant() {
+    return TEST_TENANT;
   }
 
   @Override
-  public FieldSpec.DataType getValueType() {
-    return FieldSpec.DataType.INT;
+  protected String getServerTenant() {
+    return TEST_TENANT;
   }
 
-  @Override
-  public void putDictId(int dictId) {
-  }
-
-  @Override
-  public void putDictIdMV(int[] dictIds) {
+  protected void setupTenants()
+      throws IOException {
+    createBrokerTenant(getBrokerTenant(), 1);
+    createServerTenant(getServerTenant(), 1, 0);
   }
 
   @Override
-  public void close()
-      throws IOException {
+  public Map<String, Object> getDefaultControllerConfiguration() {
+    Map<String, Object> properties = super.getDefaultControllerConfiguration();
+    properties.put(ControllerConf.CLUSTER_TENANT_ISOLATION_ENABLE, false);
+    return properties;
   }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java
index 651a8da1bda..c4039874b07 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java
@@ -18,29 +18,31 @@
  */
 package org.apache.pinot.integration.tests;
 
-import com.google.common.collect.ImmutableMap;
+import com.fasterxml.jackson.databind.JsonNode;
 import java.io.File;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.client.Connection;
-import org.apache.pinot.client.ConnectionFactory;
-import org.apache.pinot.common.datatable.DataTableFactory;
-import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
-import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.util.TestUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.apache.pinot.common.function.scalar.StringFunctions.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
 
 public class MultiStageEngineIntegrationTest extends BaseClusterIntegrationTestSet {
-  private static final String SCHEMA_FILE_NAME =
-      "On_Time_On_Time_Performance_2014_100k_subset_nonulls_single_value_columns.schema";
+  private static final String SCHEMA_FILE_NAME = "On_Time_On_Time_Performance_2014_100k_subset_nonulls.schema";
 
   @Override
   protected String getSchemaFileName() {
@@ -54,9 +56,10 @@ public void setUp()
 
     // Start the Pinot cluster
     startZk();
-    startController();
+    startController(getDefaultControllerConfiguration());
     startBroker();
     startServer();
+    setupTenants();
 
     // Create and upload the schema and table config
     Schema schema = createSchema();
@@ -79,9 +82,15 @@ public void setUp()
 
     // Wait for all documents loaded
     waitForAllDocsLoaded(600_000L);
+  }
+
+  protected void setupTenants()
+      throws IOException {
+  }
 
-    // Setting data table version to 4
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
+  @Override
+  protected boolean useMultiStageQueryEngine() {
+    return true;
   }
 
   @Test
@@ -104,38 +113,376 @@ public void testQueryOptions()
       throws Exception {
     String pinotQuery = "SET multistageLeafLimit = 1; SELECT * FROM mytable;";
     String h2Query = "SELECT * FROM mytable limit 1";
-    ClusterIntegrationTestUtils.testQueryWithMatchingRowCount(pinotQuery, _brokerBaseApiUrl, getPinotConnection(),
-        h2Query, getH2Connection(), null, ImmutableMap.of("queryOptions", "useMultistageEngine=true"));
+    testQueryWithMatchingRowCount(pinotQuery, h2Query);
   }
 
-  @Override
-  protected Connection getPinotConnection() {
-    Properties properties = new Properties();
-    properties.put("queryOptions", "useMultistageEngine=true");
-    if (_pinotConnection == null) {
-      _pinotConnection = ConnectionFactory.fromZookeeper(properties, getZkUrl() + "/" + getHelixClusterName());
+  @Test
+  public void testMultiValueColumnSelectionQuery()
+      throws Exception {
+    String pinotQuery =
+        "SELECT DivAirportIDs, DivAirports FROM mytable WHERE DATE_TIME_CONVERT(DaysSinceEpoch, '1:DAYS:EPOCH', "
+            + "'1:DAYS:SIMPLE_DATE_FORMAT:yyyy-MM-dd''T''HH:mm:ss.SSS''Z''', '1:DAYS') = '2014-09-05T00:00:00.000Z'";
+    String h2Query =
+        "SELECT DivAirportIDs[1], DivAirports[1] FROM mytable WHERE DaysSinceEpoch = 16318 LIMIT 10000";
+    testQueryWithMatchingRowCount(pinotQuery, h2Query);
+  }
+
+  @Test
+  public void testTimeFunc()
+      throws Exception {
+    String sqlQuery = "SELECT toDateTime(now(), 'yyyy-MM-dd z'), toDateTime(ago('PT1H'), 'yyyy-MM-dd z') FROM mytable";
+    JsonNode response = postQuery(sqlQuery);
+    System.out.println("response = " + response);
+    String todayStr = response.get("resultTable").get("rows").get(0).get(0).asText();
+    String expectedTodayStr =
+        Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+    assertEquals(todayStr, expectedTodayStr);
+
+    String oneHourAgoTodayStr = response.get("resultTable").get("rows").get(0).get(1).asText();
+    String expectedOneHourAgoTodayStr = Instant.now().minus(Duration.parse("PT1H")).atZone(ZoneId.of("UTC"))
+        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+    assertEquals(oneHourAgoTodayStr, expectedOneHourAgoTodayStr);
+  }
+
+  @Test
+  public void testRegexpReplace()
+      throws Exception {
+    // Correctness tests of regexpReplace.
+
+    // Test replace all.
+    String sqlQuery = "SELECT regexpReplace('CA', 'C', 'TEST')";
+    JsonNode response = postQuery(sqlQuery);
+    String result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "TESTA");
+
+    sqlQuery = "SELECT regexpReplace('foobarbaz', 'b', 'X')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "fooXarXaz");
+
+    sqlQuery = "SELECT regexpReplace('foobarbaz', 'b', 'XY')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "fooXYarXYaz");
+
+    sqlQuery = "SELECT regexpReplace('Argentina', '(.)', '$1 ')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "A r g e n t i n a ");
+
+    sqlQuery = "SELECT regexpReplace('Pinot is  blazing  fast', '( ){2,}', ' ')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "Pinot is blazing fast");
+
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, and wise','\\w+thy', 'something')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "something, something, and wise");
+
+    sqlQuery = "SELECT regexpReplace('11234567898','(\\d)(\\d{3})(\\d{3})(\\d{4})', '$1-($2) $3-$4')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "1-(123) 456-7898");
+
+    // Test replace starting at index.
+
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 4)";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "healthy, something, something and wise");
+
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 1)";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "hsomething, something, something and wise");
+
+    // Test occurence
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 0, 2)";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "healthy, wealthy, something and wise");
+
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 0, 0)";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "something, wealthy, stealthy and wise");
+
+    // Test flags
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something', 0, 0, 'i')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "something, wealthy, stealthy and wise");
+
+    // Negative test. Pattern match not found.
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "healthy, wealthy, stealthy and wise");
+
+    // Negative test. Pattern match not found.
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something', 3, 21, 'i')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "healthy, wealthy, stealthy and wise");
+
+    // Negative test - incorrect flag
+    sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something', 3, 12, 'xyz')";
+    response = postQuery(sqlQuery);
+    result = response.get("resultTable").get("rows").get(0).get(0).asText();
+    assertEquals(result, "healthy, wealthy, stealthy and wise");
+
+    // Test in select clause with column values
+    sqlQuery = "SELECT regexpReplace(DestCityName, ' ', '', 0, -1, 'i') from mytable where OriginState = 'CA'";
+    response = postQuery(sqlQuery);
+    JsonNode rows = response.get("resultTable").get("rows");
+    for (int i = 0; i < rows.size(); i++) {
+      JsonNode row = rows.get(i);
+      assertFalse(row.get(0).asText().contains(" "));
     }
-    return _pinotConnection;
+
+    // Test in where clause
+    sqlQuery = "SELECT count(*) from mytable where regexpReplace(OriginState, '[VC]A', 'TEST') = 'TEST'";
+    response = postQuery(sqlQuery);
+    int count1 = response.get("resultTable").get("rows").get(0).get(0).asInt();
+    sqlQuery = "SELECT count(*) from mytable where OriginState='CA' or OriginState='VA'";
+    response = postQuery(sqlQuery);
+    int count2 = response.get("resultTable").get("rows").get(0).get(0).asInt();
+    assertEquals(count1, count2);
+
+    // Test nested transform
+    sqlQuery =
+        "SELECT count(*) from mytable where contains(regexpReplace(OriginState, '(C)(A)', '$1TEST$2'), 'CTESTA')";
+    response = postQuery(sqlQuery);
+    count1 = response.get("resultTable").get("rows").get(0).get(0).asInt();
+    sqlQuery = "SELECT count(*) from mytable where OriginState='CA'";
+    response = postQuery(sqlQuery);
+    count2 = response.get("resultTable").get("rows").get(0).get(0).asInt();
+    assertEquals(count1, count2);
   }
 
-  @Override
-  protected void overrideBrokerConf(PinotConfiguration brokerConf) {
-    brokerConf.setProperty(CommonConstants.Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED, true);
-    brokerConf.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, 8421);
+  @Test
+  public void testUrlFunc()
+      throws Exception {
+    String sqlQuery = "SELECT encodeUrl('key1=value 1&key2=value@!$2&key3=value%3'), "
+        + "decodeUrl('key1%3Dvalue+1%26key2%3Dvalue%40%21%242%26key3%3Dvalue%253') FROM mytable";
+    JsonNode response = postQuery(sqlQuery);
+    String encodedString = response.get("resultTable").get("rows").get(0).get(0).asText();
+    String expectedUrlStr = encodeUrl("key1=value 1&key2=value@!$2&key3=value%3");
+    assertEquals(encodedString, expectedUrlStr);
+
+    String decodedString = response.get("resultTable").get("rows").get(0).get(1).asText();
+    expectedUrlStr = decodeUrl("key1%3Dvalue+1%26key2%3Dvalue%40%21%242%26key3%3Dvalue%253");
+    assertEquals(decodedString, expectedUrlStr);
   }
 
-  @Override
-  protected void overrideServerConf(PinotConfiguration serverConf) {
-    serverConf.setProperty(CommonConstants.Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED, true);
-    serverConf.setProperty(QueryConfig.KEY_OF_QUERY_SERVER_PORT, 8842);
-    serverConf.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, 8422);
+  @Test
+  public void testBase64Func()
+      throws Exception {
+
+    // string literal
+    String sqlQuery = "SELECT toBase64(toUtf8('hello!')), " + "fromUtf8(fromBase64('aGVsbG8h')) FROM mytable";
+    JsonNode response = postQuery(sqlQuery);
+    JsonNode resultTable = response.get("resultTable");
+    JsonNode dataSchema = resultTable.get("dataSchema");
+    assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"STRING\"]");
+    JsonNode rows = response.get("resultTable").get("rows");
+
+    String encodedString = rows.get(0).get(0).asText();
+    String expectedEncodedStr = toBase64(toUtf8("hello!"));
+    assertEquals(encodedString, expectedEncodedStr);
+    String decodedString = rows.get(0).get(1).asText();
+    String expectedDecodedStr = fromUtf8(fromBase64("aGVsbG8h"));
+    assertEquals(decodedString, expectedDecodedStr);
+
+    // long string literal encode
+    sqlQuery =
+        "SELECT toBase64(toUtf8('this is a long string that will encode to more than 76 characters using base64')) "
+            + "FROM mytable";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    rows = resultTable.get("rows");
+    encodedString = rows.get(0).get(0).asText();
+    assertEquals(encodedString,
+        toBase64(toUtf8("this is a long string that will encode to more than 76 characters using base64")));
+
+    // long string literal decode
+    sqlQuery = "SELECT fromUtf8(fromBase64"
+        + "('dGhpcyBpcyBhIGxvbmcgc3RyaW5nIHRoYXQgd2lsbCBlbmNvZGUgdG8gbW9yZSB0aGFuIDc2IGNoYXJhY3RlcnMgdXNpbmcgYmFzZTY0"
+        + "')) FROM mytable";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    rows = resultTable.get("rows");
+    decodedString = rows.get(0).get(0).asText();
+    assertEquals(decodedString, fromUtf8(fromBase64(
+        "dGhpcyBpcyBhIGxvbmcgc3RyaW5nIHRoYXQgd2lsbCBlbmNvZGUgdG8gbW9yZSB0aGFuIDc2IGNoYXJhY3RlcnMgdXNpbmcgYmFzZTY0")));
+
+    // non-string literal
+    sqlQuery = "SELECT toBase64(toUtf8(123)), fromUtf8(fromBase64(toBase64(toUtf8(123)))), 123 FROM mytable";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    rows = resultTable.get("rows");
+    encodedString = rows.get(0).get(0).asText();
+    decodedString = rows.get(0).get(1).asText();
+    String originalCol = rows.get(0).get(2).asText();
+    assertEquals(decodedString, originalCol);
+    assertEquals(encodedString, toBase64(toUtf8("123")));
+
+    // identifier
+    sqlQuery = "SELECT Carrier, toBase64(toUtf8(Carrier)), fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))), "
+        + "fromBase64(toBase64(toUtf8(Carrier))) FROM mytable LIMIT 100";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    dataSchema = resultTable.get("dataSchema");
+    assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"STRING\",\"STRING\",\"BYTES\"]");
+    rows = response.get("resultTable").get("rows");
+    assertEquals(rows.size(), 100);
+    for (int i = 0; i < 100; i++) {
+      String original = rows.get(0).asText();
+      String encoded = rows.get(1).asText();
+      String decoded = rows.get(2).asText();
+      assertEquals(original, decoded);
+      assertEquals(encoded, toBase64(toUtf8(original)));
+      assertEquals(decoded, fromUtf8(fromBase64(toBase64(toUtf8(original)))));
+    }
+
+    // invalid argument
+    sqlQuery = "SELECT toBase64('hello!') FROM mytable";
+    response = postQuery(sqlQuery);
+    assertTrue(response.get("exceptions").get(0).get("message").toString().contains("SQLParsingError"));
+
+    // invalid argument
+    sqlQuery = "SELECT fromBase64('hello!') FROM mytable";
+    response = postQuery(sqlQuery);
+    assertTrue(response.get("exceptions").get(0).get("message").toString().contains("IllegalArgumentException"));
+
+    // string literal used in a filter
+    sqlQuery = "SELECT * FROM mytable WHERE fromUtf8(fromBase64('aGVsbG8h')) != Carrier AND "
+        + "toBase64(toUtf8('hello!')) != Carrier LIMIT 10";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    rows = resultTable.get("rows");
+    assertEquals(rows.size(), 10);
+
+    // non-string literal used in a filter
+    sqlQuery = "SELECT * FROM mytable WHERE fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) != Carrier LIMIT 10";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    rows = resultTable.get("rows");
+    assertEquals(rows.size(), 10);
+
+    // string identifier used in a filter
+    sqlQuery = "SELECT * FROM mytable WHERE fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))) = Carrier LIMIT 10";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    rows = resultTable.get("rows");
+    assertEquals(rows.size(), 10);
+
+    // non-string identifier used in a filter
+    sqlQuery = "SELECT fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))), AirlineID FROM mytable WHERE "
+        + "fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) = AirlineID LIMIT 10";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    dataSchema = resultTable.get("dataSchema");
+    assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"LONG\"]");
+    rows = resultTable.get("rows");
+    assertEquals(rows.size(), 10);
+
+    // string identifier used in group by order by
+    sqlQuery = "SELECT Carrier as originalCol, toBase64(toUtf8(Carrier)) as encoded, "
+        + "fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))) as decoded FROM mytable "
+        + "GROUP BY Carrier, toBase64(toUtf8(Carrier)), fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))) "
+        + "ORDER BY toBase64(toUtf8(Carrier)) LIMIT 10";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    dataSchema = resultTable.get("dataSchema");
+    assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"STRING\",\"STRING\"]");
+    rows = resultTable.get("rows");
+    assertEquals(rows.size(), 10);
+    for (int i = 0; i < 10; i++) {
+      String original = rows.get(0).asText();
+      String encoded = rows.get(1).asText();
+      String decoded = rows.get(2).asText();
+      assertEquals(original, decoded);
+      assertEquals(encoded, toBase64(toUtf8(original)));
+      assertEquals(decoded, fromUtf8(fromBase64(toBase64(toUtf8(original)))));
+    }
+
+    // non-string identifier used in group by order by
+    sqlQuery = "SELECT AirlineID as originalCol, toBase64(toUtf8(CAST(AirlineID AS VARCHAR))) as encoded, "
+        + "fromUtf8(fromBase64(toBase64(toUtf8(CAST(AirlineID AS VARCHAR))))) as decoded FROM mytable "
+        + "GROUP BY AirlineID, toBase64(toUtf8(CAST(AirlineID AS VARCHAR))), "
+        + "fromUtf8(fromBase64(toBase64(toUtf8(CAST(AirlineID AS VARCHAR))))) "
+        + "ORDER BY fromUtf8(fromBase64(toBase64(toUtf8(CAST(AirlineID AS VARCHAR))))) LIMIT 10";
+    response = postQuery(sqlQuery);
+    resultTable = response.get("resultTable");
+    dataSchema = resultTable.get("dataSchema");
+    assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"LONG\",\"STRING\",\"STRING\"]");
+    rows = resultTable.get("rows");
+    assertEquals(rows.size(), 10);
+    for (int i = 0; i < 10; i++) {
+      String original = rows.get(0).asText();
+      String encoded = rows.get(1).asText();
+      String decoded = rows.get(2).asText();
+      assertEquals(original, decoded);
+      assertEquals(encoded, toBase64(toUtf8(original)));
+      assertEquals(decoded, fromUtf8(fromBase64(toBase64(toUtf8(original)))));
+    }
   }
 
-  @Override
-  protected void testQuery(String pinotQuery, String h2Query)
+  @Test
+  public void testLiteralOnlyFunc()
       throws Exception {
-    ClusterIntegrationTestUtils.testQuery(pinotQuery, _brokerBaseApiUrl, getPinotConnection(), h2Query,
-        getH2Connection(), null, ImmutableMap.of("queryOptions", "useMultistageEngine=true"));
+    long queryStartTimeMs = System.currentTimeMillis();
+    String sqlQuery =
+        "SELECT 1, now() as currentTs, ago('PT1H') as oneHourAgoTs, 'abc', toDateTime(now(), 'yyyy-MM-dd z') as "
+            + "today, now(), ago('PT1H'), encodeUrl('key1=value 1&key2=value@!$2&key3=value%3') as encodedUrl, "
+            + "decodeUrl('key1%3Dvalue+1%26key2%3Dvalue%40%21%242%26key3%3Dvalue%253') as decodedUrl, toBase64"
+            + "(toUtf8('hello!')) as toBase64, fromUtf8(fromBase64('aGVsbG8h')) as fromBase64";
+    JsonNode response = postQuery(sqlQuery);
+    System.out.println("response = " + response.toPrettyString());
+    long queryEndTimeMs = System.currentTimeMillis();
+
+    JsonNode resultTable = response.get("resultTable");
+    JsonNode dataSchema = resultTable.get("dataSchema");
+    JsonNode columnDataTypes = dataSchema.get("columnDataTypes");
+    assertEquals(columnDataTypes.get(0).asText(), "INT");
+    assertEquals(columnDataTypes.get(1).asText(), "LONG");
+    assertEquals(columnDataTypes.get(2).asText(), "LONG");
+    assertEquals(columnDataTypes.get(3).asText(), "STRING");
+    assertEquals(columnDataTypes.get(4).asText(), "STRING");
+    assertEquals(columnDataTypes.get(5).asText(), "LONG");
+    assertEquals(columnDataTypes.get(6).asText(), "LONG");
+    assertEquals(columnDataTypes.get(7).asText(), "STRING");
+    assertEquals(columnDataTypes.get(8).asText(), "STRING");
+    assertEquals(columnDataTypes.get(9).asText(), "STRING");
+    assertEquals(columnDataTypes.get(10).asText(), "STRING");
+
+    JsonNode results = resultTable.get("rows").get(0);
+    assertEquals(results.get(0).asInt(), 1);
+    long nowResult = results.get(1).asLong();
+    assertTrue(nowResult >= queryStartTimeMs);
+    assertTrue(nowResult <= queryEndTimeMs);
+    long oneHourAgoResult = results.get(2).asLong();
+    assertTrue(oneHourAgoResult >= queryStartTimeMs - TimeUnit.HOURS.toMillis(1));
+    assertTrue(oneHourAgoResult <= queryEndTimeMs - TimeUnit.HOURS.toMillis(1));
+    assertEquals(results.get(3).asText(), "abc");
+    String queryStartTimeDay = Instant.ofEpochMilli(queryStartTimeMs).atZone(ZoneId.of("UTC"))
+        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+    String queryEndTimeDay = Instant.ofEpochMilli(queryEndTimeMs).atZone(ZoneId.of("UTC"))
+        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+    String dateTimeResult = results.get(4).asText();
+    assertTrue(dateTimeResult.equals(queryStartTimeDay) || dateTimeResult.equals(queryEndTimeDay));
+    nowResult = results.get(5).asLong();
+    assertTrue(nowResult >= queryStartTimeMs);
+    assertTrue(nowResult <= queryEndTimeMs);
+    oneHourAgoResult = results.get(6).asLong();
+    assertTrue(oneHourAgoResult >= queryStartTimeMs - TimeUnit.HOURS.toMillis(1));
+    assertTrue(oneHourAgoResult <= queryEndTimeMs - TimeUnit.HOURS.toMillis(1));
+    assertEquals(results.get(7).asText(), "key1%3Dvalue+1%26key2%3Dvalue%40%21%242%26key3%3Dvalue%253");
+    assertEquals(results.get(8).asText(), "key1=value 1&key2=value@!$2&key3=value%3");
+    assertEquals(results.get(9).asText(), "aGVsbG8h");
+    assertEquals(results.get(10).asText(), "hello!");
   }
 
   @AfterClass
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/NullHandlingIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/NullHandlingIntegrationTest.java
index c74e9ade806..f2517cebc09 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/NullHandlingIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/NullHandlingIntegrationTest.java
@@ -18,15 +18,20 @@
  */
 package org.apache.pinot.integration.tests;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import java.io.File;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
 import org.apache.pinot.util.TestUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
 
 /**
  * Integration test that creates a Kafka broker, creates a Pinot cluster that consumes from Kafka and queries Pinot.
@@ -186,4 +191,151 @@ public void testCaseWithIsNotDistinctFrom()
     query = "SELECT description FROM " + getTableName() + " where description IS NOT DISTINCT FROM description";
     testQuery(query);
   }
+
+  @Test
+  public void testTotalCountWithNullHandlingQueryOptionEnabled()
+          throws Exception {
+    String pinotQuery = "SELECT COUNT(*) FROM " + getTableName() + " option(enableNullHandling=true)";
+    String h2Query = "SELECT COUNT(*) FROM " + getTableName();
+    testQuery(pinotQuery, h2Query);
+
+    pinotQuery = "SELECT COUNT(1) FROM " + getTableName() + " option(enableNullHandling=true)";
+    h2Query = "SELECT COUNT(1) FROM " + getTableName();
+    testQuery(pinotQuery, h2Query);
+    DataTableBuilderFactory.setDataTableVersion(DataTableBuilderFactory.DEFAULT_VERSION);
+  }
+
+  @Test
+  public void testNullLiteralSelectionOnlyBroker()
+      throws Exception {
+    // Null literal only
+    String sqlQuery = "SELECT null FROM mytable OPTION(enableNullHandling=true)";
+    JsonNode response = postQuery(sqlQuery);
+    JsonNode rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asText(), "null");
+
+    // Null related functions
+    sqlQuery = "SELECT isNull(null) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asBoolean(), true);
+
+    sqlQuery = "SELECT isNotNull(null) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asBoolean(), false);
+
+
+    sqlQuery = "SELECT coalesce(null, 1) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asInt(), 1);
+
+    sqlQuery = "SELECT coalesce(null, null) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asText(), "null");
+
+    sqlQuery = "SELECT isDistinctFrom(null, null) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asBoolean(), false);
+
+    sqlQuery = "SELECT isNotDistinctFrom(null, null) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asBoolean(), true);
+
+
+    sqlQuery = "SELECT isDistinctFrom(null, 1) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asBoolean(), true);
+
+    sqlQuery = "SELECT isNotDistinctFrom(null, 1) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asBoolean(), false);
+
+    sqlQuery = "SELECT case when true then null end FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asText(), "null");
+
+
+    sqlQuery = "SELECT case when false then 1 end FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asText(), "null");
+
+
+    // Null intolerant functions
+    sqlQuery = "SELECT add(null, 1) FROM " + getTableName() + "  OPTION (enableNullHandling=true);";
+    response = postQuery(sqlQuery);
+    rows = response.get("resultTable").get("rows");
+    assertTrue(response.get("exceptions").isEmpty());
+    assertEquals(rows.size(), 1);
+    assertEquals(rows.get(0).get(0).asText(), "null");
+  }
+
+  @Test
+  public void testOrderByNullsFirst()
+      throws Exception {
+    String h2Query = "SELECT salary FROM " + getTableName() + " ORDER BY salary NULLS FIRST";
+    String pinotQuery = h2Query + " option(enableNullHandling=true)";
+
+    testQuery(pinotQuery, h2Query);
+  }
+
+  @Test
+  public void testOrderByNullsLast()
+      throws Exception {
+    String h2Query = "SELECT salary FROM " + getTableName() + " ORDER BY salary DESC NULLS LAST";
+    String pinotQuery = h2Query + " option(enableNullHandling=true)";
+
+    testQuery(pinotQuery, h2Query);
+  }
+
+  @Test
+  public void testDistinctOrderByNullsLast()
+      throws Exception {
+    String h2Query = "SELECT distinct salary FROM " + getTableName() + " ORDER BY salary DESC NULLS LAST";
+    String pinotQuery = h2Query + " option(enableNullHandling=true)";
+
+    testQuery(pinotQuery, h2Query);
+  }
+
+  @Test
+  public void testSelectNullLiteral() throws Exception {
+    // Need to also select an identifier column to skip the all literal query optimization which returns without
+    // querying the segment.
+    String sqlQuery = "SELECT NULL, salary FROM mytable OPTION(enableNullHandling=true)";
+
+    JsonNode response = postQuery(sqlQuery);
+
+    JsonNode rows = response.get("resultTable").get("rows");
+    assertEquals(rows.get(0).get(0).asText(), "null");
+  }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
index 389253b80f9..1546d1d069a 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
@@ -49,6 +49,7 @@
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.pinot.client.PinotConnection;
 import org.apache.pinot.client.PinotDriver;
+import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.common.exception.HttpErrorStatusException;
 import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
@@ -56,6 +57,7 @@
 import org.apache.pinot.common.utils.ServiceStatus;
 import org.apache.pinot.common.utils.SimpleHttpResponse;
 import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
 import org.apache.pinot.core.operator.query.NonScanBasedAggregationOperator;
 import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
 import org.apache.pinot.spi.config.instance.InstanceType;
@@ -138,9 +140,7 @@ public class OfflineClusterIntegrationTest extends BaseClusterIntegrationTestSet
   private static final String COLUMN_LENGTH_MAP_KEY = "columnLengthMap";
   private static final String COLUMN_CARDINALITY_MAP_KEY = "columnCardinalityMap";
   private static final String MAX_NUM_MULTI_VALUES_MAP_KEY = "maxNumMultiValuesMap";
-  // TODO: This might lead to flaky test, as this disk size is not deterministic
-  //       as it depends on the iteration order of a HashSet.
-  private static final int DISK_SIZE_IN_BYTES = 20797128;
+  private static final int DISK_SIZE_IN_BYTES = 20797324;
   private static final int NUM_ROWS = 115545;
 
   private final List<ServiceStatus.ServiceStatusCallback> _serviceStatusCallbacks =
@@ -167,6 +167,7 @@ protected String getSchemaFileName() {
   @BeforeClass
   public void setUp()
       throws Exception {
+    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_3);
     TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
 
     // Start the Pinot cluster
@@ -400,7 +401,7 @@ public void testUploadSegmentRefreshOnly()
         TableNameBuilder.extractRawTableName(offlineTableName));
     parameters.add(tableNameParameter);
 
-    URI uploadSegmentHttpURI = FileUploadDownloadClient.getUploadSegmentHttpURI(LOCAL_HOST, _controllerPort);
+    URI uploadSegmentHttpURI = URI.create(getControllerRequestURLBuilder().forSegmentUpload());
     try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient()) {
       // Refresh non-existing segment
       File segmentTarFile = segmentTarFiles[0];
@@ -518,12 +519,7 @@ public void testInvertedIndexTriggering()
     // download, the original segment dir is deleted and then replaced with the newly downloaded segment, leaving a
     // small chance of race condition between getting table size check and replacing the segment dir, i.e. flaky test.
     addInvertedIndex();
-    // The table size gets larger for sure, but it does not necessarily equal to tableSizeWithNewIndex, because the
-    // order of entries in the index_map file can change when the raw segment adds/deletes indices back and forth.
-    long tableSizeAfterAddIndex = getTableSize(getTableName());
-    assertTrue(tableSizeAfterAddIndex > tableSizeAfterReloadSegment,
-        String.format("Table size: %d should increase after adding inverted index on segment: %s, as compared with %d",
-            tableSizeAfterAddIndex, segmentName, tableSizeAfterReloadSegment));
+    assertEquals(getTableSize(getTableName()), tableSizeWithNewIndex);
 
     // Force to download the whole table and use the original table config, so the disk usage should get back to
     // initial value.
@@ -575,7 +571,7 @@ private void addInvertedIndex()
   public void testTimeFunc()
       throws Exception {
     String sqlQuery = "SELECT toDateTime(now(), 'yyyy-MM-dd z'), toDateTime(ago('PT1H'), 'yyyy-MM-dd z') FROM mytable";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     String todayStr = response.get("resultTable").get("rows").get(0).get(0).asText();
     String expectedTodayStr =
         Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
@@ -594,90 +590,90 @@ public void testRegexpReplace()
 
     // Test replace all.
     String sqlQuery = "SELECT regexpReplace('CA', 'C', 'TEST')";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     String result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "TESTA");
 
     sqlQuery = "SELECT regexpReplace('foobarbaz', 'b', 'X')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "fooXarXaz");
 
     sqlQuery = "SELECT regexpReplace('foobarbaz', 'b', 'XY')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "fooXYarXYaz");
 
     sqlQuery = "SELECT regexpReplace('Argentina', '(.)', '$1 ')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "A r g e n t i n a ");
 
     sqlQuery = "SELECT regexpReplace('Pinot is  blazing  fast', '( ){2,}', ' ')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "Pinot is blazing fast");
 
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, and wise','\\w+thy', 'something')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "something, something, and wise");
 
     sqlQuery = "SELECT regexpReplace('11234567898','(\\d)(\\d{3})(\\d{3})(\\d{4})', '$1-($2) $3-$4')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "1-(123) 456-7898");
 
     // Test replace starting at index.
 
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 4)";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "healthy, something, something and wise");
 
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 1)";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "hsomething, something, something and wise");
 
     // Test occurence
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 0, 2)";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "healthy, wealthy, something and wise");
 
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+thy', 'something', 0, 0)";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "something, wealthy, stealthy and wise");
 
     // Test flags
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something', 0, 0, 'i')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "something, wealthy, stealthy and wise");
 
     // Negative test. Pattern match not found.
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "healthy, wealthy, stealthy and wise");
 
     // Negative test. Pattern match not found.
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something', 3, 21, 'i')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "healthy, wealthy, stealthy and wise");
 
     // Negative test - incorrect flag
     sqlQuery = "SELECT regexpReplace('healthy, wealthy, stealthy and wise','\\w+tHy', 'something', 3, 12, 'xyz')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     result = response.get("resultTable").get("rows").get(0).get(0).asText();
     assertEquals(result, "healthy, wealthy, stealthy and wise");
 
     // Test in select clause with column values
     sqlQuery = "SELECT regexpReplace(DestCityName, ' ', '', 0, -1, 'i') from myTable where OriginState = 'CA'";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     JsonNode rows = response.get("resultTable").get("rows");
     for (int i = 0; i < rows.size(); i++) {
       JsonNode row = rows.get(i);
@@ -686,20 +682,20 @@ public void testRegexpReplace()
 
     // Test in where clause
     sqlQuery = "SELECT count(*) from myTable where regexpReplace(originState, '[VC]A', 'TEST') = 'TEST'";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     int count1 = response.get("resultTable").get("rows").get(0).get(0).asInt();
     sqlQuery = "SELECT count(*) from myTable where originState='CA' or originState='VA'";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     int count2 = response.get("resultTable").get("rows").get(0).get(0).asInt();
     assertEquals(count1, count2);
 
     // Test nested transform
     sqlQuery =
         "SELECT count(*) from myTable where contains(regexpReplace(originState, '(C)(A)', '$1TEST$2'), 'CTESTA')";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     count1 = response.get("resultTable").get("rows").get(0).get(0).asInt();
     sqlQuery = "SELECT count(*) from myTable where originState='CA'";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     count2 = response.get("resultTable").get("rows").get(0).get(0).asInt();
     assertEquals(count1, count2);
   }
@@ -710,7 +706,7 @@ public void testCastMV()
 
     // simple cast
     String sqlQuery = "SELECT DivLongestGTimes, CAST(DivLongestGTimes as DOUBLE) from myTable LIMIT 100";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     JsonNode resultTable = response.get("resultTable");
     JsonNode dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"FLOAT_ARRAY\",\"DOUBLE_ARRAY\"]");
@@ -734,7 +730,7 @@ public void testCastMV()
     // nested cast
     sqlQuery = "SELECT DivAirportIDs, CAST(CAST(CAST(DivAirportIDs AS FLOAT) as INT) as STRING),"
         + " DivTotalGTimes, CAST(CAST(DivTotalGTimes AS STRING) AS LONG) from myTable ORDER BY CARRIER LIMIT 100";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(),
@@ -773,7 +769,7 @@ public void testUrlFunc()
       throws Exception {
     String sqlQuery = "SELECT encodeUrl('key1=value 1&key2=value@!$2&key3=value%3'), "
         + "decodeUrl('key1%3Dvalue+1%26key2%3Dvalue%40%21%242%26key3%3Dvalue%253') FROM myTable";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     String encodedString = response.get("resultTable").get("rows").get(0).get(0).asText();
     String expectedUrlStr = encodeUrl("key1=value 1&key2=value@!$2&key3=value%3");
     assertEquals(encodedString, expectedUrlStr);
@@ -789,7 +785,7 @@ public void testBase64Func()
 
     // string literal
     String sqlQuery = "SELECT toBase64(toUtf8('hello!')), " + "fromUtf8(fromBase64('aGVsbG8h')) FROM myTable";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     JsonNode resultTable = response.get("resultTable");
     JsonNode dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"STRING\"]");
@@ -806,7 +802,7 @@ public void testBase64Func()
     sqlQuery =
         "SELECT toBase64(toUtf8('this is a long string that will encode to more than 76 characters using base64')) "
             + "FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     rows = resultTable.get("rows");
     encodedString = rows.get(0).get(0).asText();
@@ -817,7 +813,7 @@ public void testBase64Func()
     sqlQuery = "SELECT fromUtf8(fromBase64"
         + "('dGhpcyBpcyBhIGxvbmcgc3RyaW5nIHRoYXQgd2lsbCBlbmNvZGUgdG8gbW9yZSB0aGFuIDc2IGNoYXJhY3RlcnMgdXNpbmcgYmFzZTY0"
         + "')) FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     rows = resultTable.get("rows");
     decodedString = rows.get(0).get(0).asText();
@@ -826,7 +822,7 @@ public void testBase64Func()
 
     // non-string literal
     sqlQuery = "SELECT toBase64(toUtf8(123)), fromUtf8(fromBase64(toBase64(toUtf8(123)))), 123 FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     rows = resultTable.get("rows");
     encodedString = rows.get(0).get(0).asText();
@@ -838,7 +834,7 @@ public void testBase64Func()
     // identifier
     sqlQuery = "SELECT Carrier, toBase64(toUtf8(Carrier)), fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))), "
         + "fromBase64(toBase64(toUtf8(Carrier))) FROM myTable LIMIT 100";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"STRING\",\"STRING\",\"BYTES\"]");
@@ -855,42 +851,42 @@ public void testBase64Func()
 
     // invalid argument
     sqlQuery = "SELECT toBase64() FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     assertTrue(response.get("exceptions").get(0).get("message").toString().startsWith("\"QueryExecutionError"));
 
     // invalid argument
     sqlQuery = "SELECT fromBase64() FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     assertTrue(response.get("exceptions").get(0).get("message").toString().startsWith("\"QueryExecutionError"));
 
     // invalid argument
     sqlQuery = "SELECT toBase64('hello!') FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     assertTrue(response.get("exceptions").get(0).get("message").toString().contains("SqlCompilationException"));
 
     // invalid argument
     sqlQuery = "SELECT fromBase64('hello!') FROM myTable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     assertTrue(response.get("exceptions").get(0).get("message").toString().contains("IllegalArgumentException"));
 
     // string literal used in a filter
     sqlQuery = "SELECT * FROM myTable WHERE fromUtf8(fromBase64('aGVsbG8h')) != Carrier AND "
         + "toBase64(toUtf8('hello!')) != Carrier LIMIT 10";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     rows = resultTable.get("rows");
     assertEquals(rows.size(), 10);
 
     // non-string literal used in a filter
     sqlQuery = "SELECT * FROM myTable WHERE fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) != Carrier LIMIT 10";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     rows = resultTable.get("rows");
     assertEquals(rows.size(), 10);
 
     // string identifier used in a filter
     sqlQuery = "SELECT * FROM myTable WHERE fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))) = Carrier LIMIT 10";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     rows = resultTable.get("rows");
     assertEquals(rows.size(), 10);
@@ -898,7 +894,7 @@ public void testBase64Func()
     // non-string identifier used in a filter
     sqlQuery = "SELECT fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))), AirlineID FROM myTable WHERE "
         + "fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) = AirlineID LIMIT 10";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"LONG\"]");
@@ -910,7 +906,7 @@ public void testBase64Func()
         + "fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))) as decoded FROM myTable "
         + "GROUP BY Carrier, toBase64(toUtf8(Carrier)), fromUtf8(fromBase64(toBase64(toUtf8(Carrier)))) "
         + "ORDER BY toBase64(toUtf8(Carrier)) LIMIT 10";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\",\"STRING\",\"STRING\"]");
@@ -930,7 +926,7 @@ public void testBase64Func()
         + "fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) as decoded FROM myTable "
         + "GROUP BY AirlineID, toBase64(toUtf8(AirlineID)), fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) "
         + "ORDER BY fromUtf8(fromBase64(toBase64(toUtf8(AirlineID)))) LIMIT 10";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     resultTable = response.get("resultTable");
     dataSchema = resultTable.get("dataSchema");
     assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"LONG\",\"STRING\",\"STRING\"]");
@@ -1926,7 +1922,7 @@ public void testCaseStatementInSelection()
     }
     caseStatementBuilder.append("ELSE 0 END");
     String sqlQuery = "SELECT origin, " + caseStatementBuilder + " AS origin_code FROM mytable LIMIT 1000";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     JsonNode rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     for (int i = 0; i < rows.size(); i++) {
@@ -1946,7 +1942,7 @@ public void testCaseStatementInSelectionWithTransformFunctionInThen()
     String sqlQuery =
         "SELECT ArrDelay, CASE WHEN ArrDelay > 0 THEN ArrDelay WHEN ArrDelay < 0 THEN ArrDelay * -1 ELSE 0 END AS "
             + "ArrTimeDiff FROM mytable LIMIT 1000";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     JsonNode rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     for (int i = 0; i < rows.size(); i++) {
@@ -1965,7 +1961,7 @@ public void testCaseStatementWithLogicalTransformFunction()
       throws Exception {
     String sqlQuery = "SELECT ArrDelay" + ", CASE WHEN ArrDelay > 50 OR ArrDelay < 10 THEN 10 ELSE 0 END"
         + ", CASE WHEN ArrDelay < 50 AND ArrDelay >= 10 THEN 10 ELSE 0 END" + " FROM mytable LIMIT 1000";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     JsonNode rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     for (int i = 0; i < rows.size(); i++) {
@@ -2002,10 +1998,10 @@ public void testCaseStatementWithInAggregation()
   private void testCountVsCaseQuery(String predicate)
       throws Exception {
     String sqlQuery = String.format("SELECT COUNT(*) FROM mytable WHERE %s", predicate);
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     long countValue = response.get("resultTable").get("rows").get(0).get(0).asLong();
     sqlQuery = String.format("SELECT SUM(CASE WHEN %s THEN 1 ELSE 0 END) as sum1 FROM mytable", predicate);
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     long caseSum = response.get("resultTable").get("rows").get(0).get(0).asLong();
     assertEquals(caseSum, countValue);
   }
@@ -2265,11 +2261,11 @@ public void testNonAggregationGroupByQuery()
     testQuery(pinotQuery, h2Query);
 
     pinotQuery = "SELECT ArrTime-DepTime FROM mytable GROUP BY ArrTime-DepTime LIMIT 1000000";
-    h2Query = "SELECT ArrTime-DepTime FROM mytable GROUP BY ArrTime-DepTime";
+    h2Query = "SELECT CAST(ArrTime-DepTime AS FLOAT) FROM mytable GROUP BY CAST(ArrTime-DepTime AS FLOAT)";
     testQuery(pinotQuery, h2Query);
 
     pinotQuery = "SELECT ArrTime+DepTime AS A FROM mytable GROUP BY A LIMIT 1000000";
-    h2Query = "SELECT ArrTime+DepTime AS A FROM mytable GROUP BY A";
+    h2Query = "SELECT CAST(ArrTime+DepTime AS FLOAT) AS A FROM mytable GROUP BY A";
     testQuery(pinotQuery, h2Query);
   }
 
@@ -2380,7 +2376,7 @@ public void testDistinctCountHll()
     // The Accurate value is 6538.
     query = "SELECT distinctCount(FlightNum) FROM mytable ";
     assertEquals(postQuery(query).get("resultTable").get("rows").get(0).get(0).asLong(), 6538);
-    assertEquals(postQuery(query, _brokerBaseApiUrl).get("resultTable").get("rows").get(0).get(0).asLong(), 6538);
+    assertEquals(postQuery(query).get("resultTable").get("rows").get(0).get(0).asLong(), 6538);
 
     // Expected distinctCountHll with different log2m value from 2 to 19. The Accurate value is 6538.
     long[] expectedResults = new long[]{
@@ -2390,14 +2386,14 @@ public void testDistinctCountHll()
     for (int i = 2; i < 20; i++) {
       query = String.format("SELECT distinctCountHLL(FlightNum, %d) FROM mytable ", i);
       assertEquals(postQuery(query).get("resultTable").get("rows").get(0).get(0).asLong(), expectedResults[i - 2]);
-      assertEquals(postQuery(query, _brokerBaseApiUrl).get("resultTable").get("rows").get(0).get(0).asLong(),
+      assertEquals(postQuery(query).get("resultTable").get("rows").get(0).get(0).asLong(),
           expectedResults[i - 2]);
     }
 
     // Default HLL is set as log2m=12
     query = "SELECT distinctCountHLL(FlightNum) FROM mytable ";
     assertEquals(postQuery(query).get("resultTable").get("rows").get(0).get(0).asLong(), expectedResults[10]);
-    assertEquals(postQuery(query, _brokerBaseApiUrl).get("resultTable").get("rows").get(0).get(0).asLong(),
+    assertEquals(postQuery(query).get("resultTable").get("rows").get(0).get(0).asLong(),
         expectedResults[10]);
   }
 
@@ -2419,7 +2415,7 @@ public void testAggregationFunctionsWithUnderscore()
   public void testExplainPlanQuery()
       throws Exception {
     String query1 = "EXPLAIN PLAN FOR SELECT count(*) AS count, Carrier AS name FROM mytable GROUP BY name ORDER BY 1";
-    String response1 = postQuery(query1, _brokerBaseApiUrl).get("resultTable").toString();
+    String response1 = postQuery(query1).get("resultTable").toString();
 
     // Replace string "docs:[0-9]+" with "docs:*" so that test doesn't fail when number of documents change. This is
     // needed because both OfflineClusterIntegrationTest and MultiNodesOfflineClusterIntegrationTest run this test
@@ -2430,14 +2426,13 @@ public void testExplainPlanQuery()
         + "\"columnDataTypes\":[\"STRING\",\"INT\",\"INT\"]},"
         + "\"rows\":[[\"BROKER_REDUCE(sort:[count(*) ASC],limit:10)\",1,0],[\"COMBINE_GROUP_BY\",2,1],"
         + "[\"PLAN_START(numSegmentsForThisPlan:1)\",-1,-1],"
-        + "[\"GROUP_BY(groupKeys:Carrier, aggregations:count(*))\",3,2],"
-        + "[\"TRANSFORM_PASSTHROUGH(Carrier)\",4,3],[\"PROJECT(Carrier)\",5,4],[\"DOC_ID_SET\",6,5],"
-        + "[\"FILTER_MATCH_ENTIRE_SEGMENT(docs:*)\",7,6]]}");
+        + "[\"GROUP_BY(groupKeys:Carrier, aggregations:count(*))\",3,2],[\"PROJECT(Carrier)\",4,3],"
+        + "[\"DOC_ID_SET\",5,4],[\"FILTER_MATCH_ENTIRE_SEGMENT(docs:*)\",6,5]]}");
 
     // In the query below, FlightNum column has an inverted index and there is no data satisfying the predicate
     // "FlightNum < 0". Hence, all segments are pruned out before query execution on the server side.
     String query2 = "EXPLAIN PLAN FOR SELECT * FROM mytable WHERE FlightNum < 0";
-    String response2 = postQuery(query2, _brokerBaseApiUrl).get("resultTable").toString();
+    String response2 = postQuery(query2).get("resultTable").toString();
 
     assertEquals(response2, "{\"dataSchema\":{\"columnNames\":[\"Operator\",\"Operator_Id\",\"Parent_Id\"],"
         + "\"columnDataTypes\":[\"STRING\",\"INT\",\"INT\"]},\"rows\":[[\"BROKER_REDUCE(limit:10)\",1,0],"
@@ -2450,19 +2445,19 @@ public void testStringComparisonInFilter()
       throws Exception {
     // compare two string columns.
     String query1 = "SELECT count(*) FROM mytable WHERE OriginState = DestState";
-    String response1 = postQuery(query1, _brokerBaseApiUrl).get("resultTable").toString();
+    String response1 = postQuery(query1).get("resultTable").toString();
     assertEquals(response1,
         "{\"dataSchema\":{\"columnNames\":[\"count(*)\"],\"columnDataTypes\":[\"LONG\"]}," + "\"rows\":[[14011]]}");
 
     // compare string function with string column.
     String query2 = "SELECT count(*) FROM mytable WHERE trim(OriginState) = DestState";
-    String response2 = postQuery(query2, _brokerBaseApiUrl).get("resultTable").toString();
+    String response2 = postQuery(query2).get("resultTable").toString();
     assertEquals(response2,
         "{\"dataSchema\":{\"columnNames\":[\"count(*)\"],\"columnDataTypes\":[\"LONG\"]}," + "\"rows\":[[14011]]}");
 
     // compare string function with string function.
     String query3 = "SELECT count(*) FROM mytable WHERE substr(OriginState, 0, 1) = substr(DestState, 0, 1)";
-    String response3 = postQuery(query3, _brokerBaseApiUrl).get("resultTable").toString();
+    String response3 = postQuery(query3).get("resultTable").toString();
     assertEquals(response3,
         "{\"dataSchema\":{\"columnNames\":[\"count(*)\"],\"columnDataTypes\":[\"LONG\"]}," + "\"rows\":[[19755]]}");
   }
@@ -2621,57 +2616,57 @@ public void testHardcodedServerPartitionedSqlQueries()
   public void testAggregateMetadataAPI()
       throws IOException {
     JsonNode oneSVColumnResponse = JsonUtils.stringToJsonNode(
-        sendGetRequest(_controllerBaseApiUrl + "/tables/mytable/metadata?columns=DestCityMarketID"));
+        sendGetRequest(getControllerBaseApiUrl() + "/tables/mytable/metadata?columns=DestCityMarketID"));
     // DestCityMarketID is a SV column
     validateMetadataResponse(oneSVColumnResponse, 1, 0);
 
     JsonNode oneMVColumnResponse = JsonUtils.stringToJsonNode(
-        sendGetRequest(_controllerBaseApiUrl + "/tables/mytable/metadata?columns=DivLongestGTimes"));
+        sendGetRequest(getControllerBaseApiUrl() + "/tables/mytable/metadata?columns=DivLongestGTimes"));
     // DivLongestGTimes is a MV column
     validateMetadataResponse(oneMVColumnResponse, 1, 1);
 
-    JsonNode threeSVColumnsResponse = JsonUtils.stringToJsonNode(sendGetRequest(_controllerBaseApiUrl
+    JsonNode threeSVColumnsResponse = JsonUtils.stringToJsonNode(sendGetRequest(getControllerBaseApiUrl()
         + "/tables/mytable/metadata?columns=DivActualElapsedTime&columns=CRSElapsedTime&columns=OriginStateName"));
     validateMetadataResponse(threeSVColumnsResponse, 3, 0);
 
     JsonNode threeSVColumnsWholeEncodedResponse = JsonUtils.stringToJsonNode(sendGetRequest(
-        _controllerBaseApiUrl + "/tables/mytable/metadata?columns="
+        getControllerBaseApiUrl() + "/tables/mytable/metadata?columns="
             + "DivActualElapsedTime%26columns%3DCRSElapsedTime%26columns%3DOriginStateName"));
     validateMetadataResponse(threeSVColumnsWholeEncodedResponse, 3, 0);
 
-    JsonNode threeMVColumnsResponse = JsonUtils.stringToJsonNode(sendGetRequest(_controllerBaseApiUrl
+    JsonNode threeMVColumnsResponse = JsonUtils.stringToJsonNode(sendGetRequest(getControllerBaseApiUrl()
         + "/tables/mytable/metadata?columns=DivLongestGTimes&columns=DivWheelsOns&columns=DivAirports"));
     validateMetadataResponse(threeMVColumnsResponse, 3, 3);
 
     JsonNode threeMVColumnsWholeEncodedResponse = JsonUtils.stringToJsonNode(sendGetRequest(
-        _controllerBaseApiUrl + "/tables/mytable/metadata?columns="
+        getControllerBaseApiUrl() + "/tables/mytable/metadata?columns="
             + "DivLongestGTimes%26columns%3DDivWheelsOns%26columns%3DDivAirports"));
     validateMetadataResponse(threeMVColumnsWholeEncodedResponse, 3, 3);
 
     JsonNode zeroColumnResponse =
-        JsonUtils.stringToJsonNode(sendGetRequest(_controllerBaseApiUrl + "/tables/mytable/metadata"));
+        JsonUtils.stringToJsonNode(sendGetRequest(getControllerBaseApiUrl() + "/tables/mytable/metadata"));
     validateMetadataResponse(zeroColumnResponse, 0, 0);
 
     JsonNode starColumnResponse =
-        JsonUtils.stringToJsonNode(sendGetRequest(_controllerBaseApiUrl + "/tables/mytable/metadata?columns=*"));
+        JsonUtils.stringToJsonNode(sendGetRequest(getControllerBaseApiUrl() + "/tables/mytable/metadata?columns=*"));
     validateMetadataResponse(starColumnResponse, 82, 9);
 
     JsonNode starEncodedColumnResponse =
-        JsonUtils.stringToJsonNode(sendGetRequest(_controllerBaseApiUrl + "/tables/mytable/metadata?columns=%2A"));
+        JsonUtils.stringToJsonNode(sendGetRequest(getControllerBaseApiUrl() + "/tables/mytable/metadata?columns=%2A"));
     validateMetadataResponse(starEncodedColumnResponse, 82, 9);
 
     JsonNode starWithExtraColumnResponse = JsonUtils.stringToJsonNode(sendGetRequest(
-        _controllerBaseApiUrl + "/tables/mytable/metadata?columns="
+        getControllerBaseApiUrl() + "/tables/mytable/metadata?columns="
             + "CRSElapsedTime&columns=*&columns=OriginStateName"));
     validateMetadataResponse(starWithExtraColumnResponse, 82, 9);
 
     JsonNode starWithExtraEncodedColumnResponse = JsonUtils.stringToJsonNode(sendGetRequest(
-        _controllerBaseApiUrl + "/tables/mytable/metadata?columns="
+        getControllerBaseApiUrl() + "/tables/mytable/metadata?columns="
             + "CRSElapsedTime&columns=%2A&columns=OriginStateName"));
     validateMetadataResponse(starWithExtraEncodedColumnResponse, 82, 9);
 
     JsonNode starWithExtraColumnWholeEncodedResponse = JsonUtils.stringToJsonNode(sendGetRequest(
-        _controllerBaseApiUrl + "/tables/mytable/metadata?columns="
+        getControllerBaseApiUrl() + "/tables/mytable/metadata?columns="
             + "CRSElapsedTime%26columns%3D%2A%26columns%3DOriginStateName"));
     validateMetadataResponse(starWithExtraColumnWholeEncodedResponse, 82, 9);
   }
@@ -2728,31 +2723,38 @@ public void testBooleanLiteralsFunc()
       throws Exception {
     // Test boolean equal true case.
     String sqlQuery = "SELECT (true = true) = true FROM mytable where true = true";
-    JsonNode response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    JsonNode response = postQuery(sqlQuery);
     JsonNode rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     assertEquals(rows.size(), 1);
     assertTrue(rows.get(0).get(0).asBoolean());
     // Test boolean equal false case.
     sqlQuery = "SELECT (true = true) = false FROM mytable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     assertEquals(rows.size(), 1);
     assertFalse(rows.get(0).get(0).asBoolean());
     // Test boolean not equal true case.
     sqlQuery = "SELECT true != false FROM mytable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     assertEquals(rows.size(), 1);
     assertTrue(rows.get(0).get(0).asBoolean());
     // Test boolean not equal false case.
     sqlQuery = "SELECT true != true FROM mytable";
-    response = postQuery(sqlQuery, _brokerBaseApiUrl);
+    response = postQuery(sqlQuery);
     rows = response.get("resultTable").get("rows");
     assertTrue(response.get("exceptions").isEmpty());
     assertEquals(rows.size(), 1);
     assertFalse(rows.get(0).get(0).asBoolean());
   }
+
+  @Test
+  public void testBooleanAggregation()
+      throws Exception {
+    testQuery("SELECT BOOL_AND(CAST(Cancelled AS BOOLEAN)) FROM mytable");
+    testQuery("SELECT BOOL_OR(CAST(Diverted AS BOOLEAN)) FROM mytable");
+  }
 }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterQueryKillingTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterMemBasedBrokerQueryKillingTest.java
similarity index 73%
rename from pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterQueryKillingTest.java
rename to pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterMemBasedBrokerQueryKillingTest.java
index 7d850c2d9cf..b5c0a5351d1 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterQueryKillingTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterMemBasedBrokerQueryKillingTest.java
@@ -36,9 +36,11 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
+import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory;
-import org.apache.pinot.server.conf.ServerConf;
+import org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactoryForTest;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
+import org.apache.pinot.spi.config.instance.InstanceType;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -49,17 +51,15 @@
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
 import org.apache.pinot.util.TestUtils;
 import org.junit.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 
 /**
- * Integration test that converts Avro data for 12 segments and runs queries against it.
+ * Integration test for heap size based broker query killing, this works only for xmx4G
  */
-public class OfflineClusterQueryKillingTest extends BaseClusterIntegrationTestSet {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OfflineClusterQueryKillingTest.class);
+public class OfflineClusterMemBasedBrokerQueryKillingTest extends BaseClusterIntegrationTestSet {
+
   public static final String STRING_DIM_SV1 = "stringDimSV1";
   public static final String STRING_DIM_SV2 = "stringDimSV2";
   public static final String INT_DIM_SV1 = "intDimSV1";
@@ -67,10 +67,10 @@ public class OfflineClusterQueryKillingTest extends BaseClusterIntegrationTestSe
   public static final String DOUBLE_DIM_SV1 = "doubleDimSV1";
   public static final String BOOLEAN_DIM_SV1 = "booleanDimSV1";
   private static final int NUM_BROKERS = 1;
-  private static final int NUM_SERVERS = 1;
+  private static final int NUM_SERVERS = 3;
   private static final String OOM_QUERY =
-      "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest, intDimSV1 FROM mytable GROUP BY intDimSV1"
-          + " ORDER BY digest LIMIT 30000";
+      "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest, intDimSV1 FROM mytable WHERE intDimSV1 > 450000 GROUP BY"
+          + " intDimSV1 ORDER BY digest LIMIT 15000";
 
   private static final String DIGEST_QUERY_1 =
       "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest FROM mytable";
@@ -94,12 +94,8 @@ protected int getNumServers() {
   @BeforeClass
   public void setUp()
       throws Exception {
-    // Setup logging and resource accounting
     LogManager.getLogger(PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant.class)
-        .setLevel(Level.DEBUG);
-    LogManager.getLogger(ThreadResourceUsageProvider.class).setLevel(Level.DEBUG);
-    LogManager.getLogger(Tracing.class).setLevel(Level.DEBUG);
-    LogManager.getLogger(ThreadResourceUsageProvider.class).setLevel(Level.DEBUG);
+        .setLevel(Level.ERROR);
     ThreadResourceUsageProvider.setThreadCpuTimeMeasurementEnabled(true);
     ThreadResourceUsageProvider.setThreadMemoryMeasurementEnabled(true);
 
@@ -109,6 +105,9 @@ public void setUp()
     startZk();
     startController();
     startBrokers();
+    while (!Tracing.isAccountantRegistered()) {
+      Thread.sleep(100L);
+    }
     startServers();
 
     // Create and upload the schema and table config
@@ -130,6 +129,13 @@ public void setUp()
 
     //Wait for all documents loaded
     waitForAllDocsLoaded(10_000L);
+
+    // Setup logging and resource accounting
+    LogManager.getLogger(OfflineClusterMemBasedBrokerQueryKillingTest.class).setLevel(Level.INFO);
+    LogManager.getLogger(PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant.class)
+        .setLevel(Level.INFO);
+    LogManager.getLogger(ThreadResourceUsageProvider.class).setLevel(Level.INFO);
+    LogManager.getLogger(Tracing.class).setLevel(Level.INFO);
   }
 
   protected void startBrokers()
@@ -142,20 +148,43 @@ protected void startServers()
     startServers(getNumServers());
   }
 
+  protected void overrideBrokerConf(PinotConfiguration brokerConf) {
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO, 0.0f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO, 0.40f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_MIN_MEMORY_FOOTPRINT_TO_KILL_RATIO, 0.0025f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_INSTANCE_TYPE, InstanceType.BROKER);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_PANIC_LEVEL_HEAP_USAGE_RATIO, 1.1f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+            + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
+        PerQueryCPUMemAccountantFactoryForTest.class.getCanonicalName());
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_MEMORY_SAMPLING, true);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING, false);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_OOM_PROTECTION_KILLING_QUERY, true);
+    brokerConf.setProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT, true);
+  }
+
   protected void overrideServerConf(PinotConfiguration serverConf) {
-    serverConf.setProperty(ServerConf.PINOT_QUERY_SCHEDULER_PREFIX + "."
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
         + CommonConstants.Accounting.CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO, 0.0f);
-    serverConf.setProperty(ServerConf.PINOT_QUERY_SCHEDULER_PREFIX + "."
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
         + CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO, 0.60f);
     serverConf.setProperty(
-        ServerConf.PINOT_QUERY_SCHEDULER_PREFIX + "." + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
-        "org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory");
-    serverConf.setProperty(ServerConf.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "." + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
+        PerQueryCPUMemAccountantFactoryForTest.class.getCanonicalName());
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
         + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_MEMORY_SAMPLING, true);
     serverConf.setProperty(
-        ServerConf.PINOT_QUERY_SCHEDULER_PREFIX + "." + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING,
-        false);
-    serverConf.setProperty(ServerConf.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+            + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING, false);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
         + CommonConstants.Accounting.CONFIG_OF_OOM_PROTECTION_KILLING_QUERY, true);
     serverConf.setProperty(CommonConstants.Server.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT, true);
   }
@@ -173,19 +202,11 @@ protected TableConfig createOfflineTableConfig() {
         .setTimeColumnName(getTimeColumnName()).setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas())
         .setSegmentVersion(getSegmentVersion()).setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig())
         .setBrokerTenant(getBrokerTenant()).setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig())
-        .setQueryConfig(getQueryconfig()).setNullHandlingEnabled(getNullHandlingEnabled())
+        .setQueryConfig(getQueryConfig()).setNullHandlingEnabled(getNullHandlingEnabled())
         .setSegmentPartitionConfig(getSegmentPartitionConfig())
         .build();
   }
 
-  @Test
-  public void testDigestOOM()
-      throws Exception {
-    JsonNode queryResponse = postQuery(OOM_QUERY);
-    LOGGER.info("testDigestOOM: {}", queryResponse);
-    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("QueryCancelledException"));
-    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("got killed because"));
-  }
 
   @Test
   public void testDigestOOMMultipleQueries()
@@ -224,11 +245,13 @@ public void testDigestOOMMultipleQueries()
         }
     );
     countDownLatch.await();
-    LOGGER.info("testDigestOOMMultipleQueries: {}", queryResponse1);
-    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("QueryCancelledException"));
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains(
+        "Interrupted in broker reduce phase"));
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("\"errorCode\":"
+        + QueryException.QUERY_CANCELLATION_ERROR_CODE));
     Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("got killed because"));
     Assert.assertFalse(StringUtils.isEmpty(queryResponse2.get().get("exceptions").toString()));
-    Assert.assertFalse(StringUtils.isEmpty(queryResponse2.get().get("exceptions").toString()));
+    Assert.assertFalse(StringUtils.isEmpty(queryResponse3.get().get("exceptions").toString()));
   }
 
   private List<File> createAvroFile()
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterMemBasedServerQueryKillingTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterMemBasedServerQueryKillingTest.java
new file mode 100644
index 00000000000..7cc9a60fe69
--- /dev/null
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterMemBasedServerQueryKillingTest.java
@@ -0,0 +1,321 @@
+/**
+ * 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.pinot.integration.tests;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.collect.ImmutableList;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.IntStream;
+import org.apache.avro.file.DataFileWriter;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory;
+import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
+import org.apache.pinot.spi.config.instance.InstanceType;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.trace.Tracing;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.apache.pinot.util.TestUtils;
+import org.junit.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * Integration test for heap size based server query killing, this works only for xmx4G
+ */
+public class OfflineClusterMemBasedServerQueryKillingTest extends BaseClusterIntegrationTestSet {
+  public static final String STRING_DIM_SV1 = "stringDimSV1";
+  public static final String STRING_DIM_SV2 = "stringDimSV2";
+  public static final String INT_DIM_SV1 = "intDimSV1";
+  public static final String LONG_DIM_SV1 = "longDimSV1";
+  public static final String DOUBLE_DIM_SV1 = "doubleDimSV1";
+  public static final String BOOLEAN_DIM_SV1 = "booleanDimSV1";
+  private static final int NUM_BROKERS = 1;
+  private static final int NUM_SERVERS = 1;
+  private static final int NUM_DOCS = 3_000_000;
+
+  private static final String OOM_QUERY =
+      "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest, intDimSV1 FROM mytable GROUP BY intDimSV1"
+          + " ORDER BY digest LIMIT 30000";
+
+  private static final String OOM_QUERY_2 =
+      "SELECT stringDimSV2 FROM mytable GROUP BY stringDimSV2"
+          + " ORDER BY stringDimSV2 LIMIT 3000000";
+
+  private static final String DIGEST_QUERY_1 =
+      "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest FROM mytable";
+  private static final String COUNT_STAR_QUERY =
+      "SELECT * FROM mytable LIMIT 5";
+
+  private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(20, r -> {
+    Thread thread = new Thread(r);
+    thread.setDaemon(false);
+    return thread;
+  });
+
+  protected int getNumBrokers() {
+    return NUM_BROKERS;
+  }
+
+  protected int getNumServers() {
+    return NUM_SERVERS;
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    LogManager.getLogger(PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant.class)
+        .setLevel(Level.ERROR);
+    ThreadResourceUsageProvider.setThreadCpuTimeMeasurementEnabled(true);
+    ThreadResourceUsageProvider.setThreadMemoryMeasurementEnabled(true);
+
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
+
+    // Start the Pinot cluster
+    startZk();
+    startController();
+    startServers();
+    while (!Tracing.isAccountantRegistered()) {
+      Thread.sleep(100L);
+    }
+    startBrokers();
+
+
+    // Create and upload the schema and table config
+    Schema schema = new Schema.SchemaBuilder().setSchemaName(DEFAULT_SCHEMA_NAME)
+        .addSingleValueDimension(STRING_DIM_SV1, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(STRING_DIM_SV2, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(INT_DIM_SV1, FieldSpec.DataType.INT)
+        .addSingleValueDimension(LONG_DIM_SV1, FieldSpec.DataType.LONG)
+        .addSingleValueDimension(DOUBLE_DIM_SV1, FieldSpec.DataType.DOUBLE)
+        .addSingleValueDimension(BOOLEAN_DIM_SV1, FieldSpec.DataType.BOOLEAN)
+        .build();
+    addSchema(schema);
+    TableConfig tableConfig = createOfflineTableConfig();
+    addTableConfig(tableConfig);
+
+    List<File> avroFiles = createAvroFile();
+    ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, tableConfig, schema, 0, _segmentDir, _tarDir);
+    uploadSegments(DEFAULT_TABLE_NAME, _tarDir);
+
+    //Wait for all documents loaded
+    waitForAllDocsLoaded(10_000L);
+
+    // Setup logging and resource accounting
+    LogManager.getLogger(OfflineClusterMemBasedServerQueryKillingTest.class).setLevel(Level.INFO);
+    LogManager.getLogger(PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant.class)
+        .setLevel(Level.INFO);
+    LogManager.getLogger(ThreadResourceUsageProvider.class).setLevel(Level.INFO);
+    LogManager.getLogger(Tracing.class).setLevel(Level.INFO);
+  }
+
+  protected void startBrokers()
+      throws Exception {
+    startBrokers(getNumBrokers());
+  }
+
+  protected void startServers()
+      throws Exception {
+    startServers(getNumServers());
+  }
+
+  protected void overrideServerConf(PinotConfiguration serverConf) {
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO, 0.0f);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO, 0.15f);
+    serverConf.setProperty(
+        CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "." + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
+        "org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory");
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_MEMORY_SAMPLING, true);
+    serverConf.setProperty(
+        CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+            + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING, false);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_OOM_PROTECTION_KILLING_QUERY, true);
+    serverConf.setProperty(CommonConstants.Server.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT, true);
+  }
+
+  protected void overrideBrokerConf(PinotConfiguration brokerConf) {
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO, 0.0f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO, 0.60f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_INSTANCE_TYPE, InstanceType.BROKER);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_PANIC_LEVEL_HEAP_USAGE_RATIO, 1.1f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+            + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
+        "org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory");
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_MEMORY_SAMPLING, true);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING, false);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_OOM_PROTECTION_KILLING_QUERY, true);
+    brokerConf.setProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT, true);
+  }
+
+
+  protected long getCountStarResult() {
+    return NUM_DOCS * 3;
+  }
+
+  protected String getTimeColumnName() {
+    return null;
+  }
+
+  protected TableConfig createOfflineTableConfig() {
+    return new TableConfigBuilder(TableType.OFFLINE).setTableName(getTableName()).setSchemaName(getSchemaName())
+        .setTimeColumnName(getTimeColumnName()).setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas())
+        .setSegmentVersion(getSegmentVersion()).setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig())
+        .setBrokerTenant(getBrokerTenant()).setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig())
+        .setQueryConfig(getQueryConfig()).setNullHandlingEnabled(getNullHandlingEnabled())
+        .setSegmentPartitionConfig(getSegmentPartitionConfig())
+        .build();
+  }
+
+  @Test
+  public void testDigestOOM()
+      throws Exception {
+    JsonNode queryResponse = postQuery(OOM_QUERY);
+    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("\"errorCode\":"
+        + QueryException.QUERY_CANCELLATION_ERROR_CODE));
+    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("QueryCancelledException"));
+    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("got killed because"));
+  }
+
+  @Test
+  public void testDigestOOM2()
+      throws Exception {
+    JsonNode queryResponse = postQuery(OOM_QUERY_2);
+    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("QueryCancelledException"));
+    Assert.assertTrue(queryResponse.get("exceptions").toString().contains("got killed because"));
+  }
+
+  @Test
+  public void testDigestOOMMultipleQueries()
+      throws Exception {
+    AtomicReference<JsonNode> queryResponse1 = new AtomicReference<>();
+    AtomicReference<JsonNode> queryResponse2 = new AtomicReference<>();
+    AtomicReference<JsonNode> queryResponse3 = new AtomicReference<>();
+
+    CountDownLatch countDownLatch = new CountDownLatch(3);
+
+    EXECUTOR_SERVICE.submit(
+        () -> {
+          try {
+            queryResponse1.set(postQuery(OOM_QUERY));
+            countDownLatch.countDown();
+          } catch (Exception ignored) {
+          }
+        }
+    );
+    EXECUTOR_SERVICE.submit(
+        () -> {
+          try {
+            queryResponse2.set(postQuery(DIGEST_QUERY_1));
+            countDownLatch.countDown();
+          } catch (Exception ignored) {
+          }
+        }
+    );
+    EXECUTOR_SERVICE.submit(
+        () -> {
+          try {
+            queryResponse3.set(postQuery(COUNT_STAR_QUERY));
+            countDownLatch.countDown();
+          } catch (Exception ignored) {
+          }
+        }
+    );
+    countDownLatch.await();
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("\"errorCode\":503"));
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("QueryCancelledException"));
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("got killed because"));
+    Assert.assertFalse(StringUtils.isEmpty(queryResponse2.get().get("exceptions").toString()));
+    Assert.assertFalse(StringUtils.isEmpty(queryResponse3.get().get("exceptions").toString()));
+  }
+
+  private List<File> createAvroFile()
+      throws IOException {
+
+    // create avro schema
+    org.apache.avro.Schema avroSchema = org.apache.avro.Schema.createRecord("myRecord", null, null, false);
+    avroSchema.setFields(ImmutableList.of(
+        new org.apache.avro.Schema.Field(STRING_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.STRING), null, null),
+        new org.apache.avro.Schema.Field(STRING_DIM_SV2,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.STRING), null, null),
+        new org.apache.avro.Schema.Field(INT_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.INT), null, null),
+        new org.apache.avro.Schema.Field(LONG_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.LONG), null, null),
+        new org.apache.avro.Schema.Field(DOUBLE_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.DOUBLE), null, null),
+        new org.apache.avro.Schema.Field(BOOLEAN_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.BOOLEAN), null, null)));
+
+    List<File> ret = new ArrayList<>();
+    for (int file = 0; file < 3; file++) {
+      // create avro file
+      File avroFile = new File(_tempDir, "data_" + file + ".avro");
+      try (DataFileWriter<GenericData.Record> fileWriter = new DataFileWriter<>(new GenericDatumWriter<>(avroSchema))) {
+        fileWriter.create(avroSchema, avroFile);
+
+        int numDocs = NUM_DOCS;
+        int randBound = numDocs / 2;
+        Random random = new Random(0);
+        IntStream randomInt = random.ints(0, 100_000);
+        for (int docId = 0; docId < numDocs; docId++) {
+          GenericData.Record record = new GenericData.Record(avroSchema);
+          record.put(STRING_DIM_SV1, "test query killing");
+          record.put(STRING_DIM_SV2, "test query killing" + docId);
+          record.put(INT_DIM_SV1, random.nextInt(randBound));
+          record.put(LONG_DIM_SV1, random.nextLong());
+          record.put(DOUBLE_DIM_SV1, random.nextDouble());
+          record.put(BOOLEAN_DIM_SV1, true);
+          fileWriter.append(record);
+        }
+        ret.add(avroFile);
+      }
+    }
+    return ret;
+  }
+}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterServerCPUTimeQueryKillingTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterServerCPUTimeQueryKillingTest.java
new file mode 100644
index 00000000000..ce8a12a4785
--- /dev/null
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterServerCPUTimeQueryKillingTest.java
@@ -0,0 +1,305 @@
+/**
+ * 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.pinot.integration.tests;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.collect.ImmutableList;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.IntStream;
+import org.apache.avro.file.DataFileWriter;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory;
+import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
+import org.apache.pinot.spi.config.instance.InstanceType;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.trace.Tracing;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.apache.pinot.util.TestUtils;
+import org.junit.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * Integration test for heap size based server query killing, this works only for xmx4G
+ */
+public class OfflineClusterServerCPUTimeQueryKillingTest extends BaseClusterIntegrationTestSet {
+  public static final String STRING_DIM_SV1 = "stringDimSV1";
+  public static final String STRING_DIM_SV2 = "stringDimSV2";
+  public static final String INT_DIM_SV1 = "intDimSV1";
+  public static final String LONG_DIM_SV1 = "longDimSV1";
+  public static final String DOUBLE_DIM_SV1 = "doubleDimSV1";
+  public static final String BOOLEAN_DIM_SV1 = "booleanDimSV1";
+  private static final int NUM_BROKERS = 1;
+  private static final int NUM_SERVERS = 1;
+  private static final String OOM_QUERY =
+      "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest, intDimSV1 FROM mytable GROUP BY intDimSV1"
+          + " ORDER BY digest LIMIT 15000";
+
+  private static final String DIGEST_QUERY_1 =
+      "SELECT PERCENTILETDigest(doubleDimSV1, 50) AS digest FROM mytable";
+  private static final String COUNT_STAR_QUERY =
+      "SELECT * FROM mytable LIMIT 5";
+
+  private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(20, r -> {
+    Thread thread = new Thread(r);
+    thread.setDaemon(false);
+    return thread;
+  });
+
+  protected int getNumBrokers() {
+    return NUM_BROKERS;
+  }
+
+  protected int getNumServers() {
+    return NUM_SERVERS;
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    LogManager.getLogger(PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant.class)
+        .setLevel(Level.ERROR);
+    ThreadResourceUsageProvider.setThreadCpuTimeMeasurementEnabled(true);
+    ThreadResourceUsageProvider.setThreadMemoryMeasurementEnabled(true);
+
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
+
+    // Start the Pinot cluster
+    startZk();
+    startController();
+    startServers();
+    while (!Tracing.isAccountantRegistered()) {
+      Thread.sleep(100L);
+    }
+    startBrokers();
+
+
+    // Create and upload the schema and table config
+    Schema schema = new Schema.SchemaBuilder().setSchemaName(DEFAULT_SCHEMA_NAME)
+        .addSingleValueDimension(STRING_DIM_SV1, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(STRING_DIM_SV2, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(INT_DIM_SV1, FieldSpec.DataType.INT)
+        .addSingleValueDimension(LONG_DIM_SV1, FieldSpec.DataType.LONG)
+        .addSingleValueDimension(DOUBLE_DIM_SV1, FieldSpec.DataType.DOUBLE)
+        .addSingleValueDimension(BOOLEAN_DIM_SV1, FieldSpec.DataType.BOOLEAN)
+        .build();
+    addSchema(schema);
+    TableConfig tableConfig = createOfflineTableConfig();
+    addTableConfig(tableConfig);
+
+    List<File> avroFiles = createAvroFile();
+    ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, tableConfig, schema, 0, _segmentDir, _tarDir);
+    uploadSegments(DEFAULT_TABLE_NAME, _tarDir);
+
+    //Wait for all documents loaded
+    waitForAllDocsLoaded(10_000L);
+
+    // Setup logging and resource accounting
+    LogManager.getLogger(OfflineClusterServerCPUTimeQueryKillingTest.class).setLevel(Level.INFO);
+    LogManager.getLogger(PerQueryCPUMemAccountantFactory.PerQueryCPUMemResourceUsageAccountant.class)
+        .setLevel(Level.INFO);
+    LogManager.getLogger(ThreadResourceUsageProvider.class).setLevel(Level.INFO);
+    LogManager.getLogger(Tracing.class).setLevel(Level.INFO);
+  }
+
+  protected void startBrokers()
+      throws Exception {
+    startBrokers(getNumBrokers());
+  }
+
+  protected void startServers()
+      throws Exception {
+    startServers(getNumServers());
+  }
+
+  protected void overrideServerConf(PinotConfiguration serverConf) {
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO, 0.2f);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO, 1.1f);
+    serverConf.setProperty(
+        CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "." + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
+        "org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory");
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_PANIC_LEVEL_HEAP_USAGE_RATIO, 1.1f);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_MEMORY_SAMPLING, true);
+    serverConf.setProperty(
+        CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+            + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING, true);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_OOM_PROTECTION_KILLING_QUERY, true);
+    serverConf.setProperty(CommonConstants.Server.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT, true);
+    serverConf.setProperty(CommonConstants.Server.CONFIG_OF_ENABLE_THREAD_CPU_TIME_MEASUREMENT, true);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CPU_TIME_BASED_KILLING_ENABLED, true);
+    serverConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CPU_TIME_BASED_KILLING_THRESHOLD_MS, 1_000);
+  }
+
+  protected void overrideBrokerConf(PinotConfiguration brokerConf) {
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO, 0.2f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO, 1.1f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_INSTANCE_TYPE, InstanceType.BROKER);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_PANIC_LEVEL_HEAP_USAGE_RATIO, 1.1f);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+            + CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME,
+        "org.apache.pinot.core.accounting.PerQueryCPUMemAccountantFactory");
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_MEMORY_SAMPLING, true);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING, true);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_OOM_PROTECTION_KILLING_QUERY, true);
+    brokerConf.setProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT, true);
+    brokerConf.setProperty(CommonConstants.Broker.CONFIG_OF_ENABLE_THREAD_CPU_TIME_MEASUREMENT, true);
+    brokerConf.setProperty(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX + "."
+        + CommonConstants.Accounting.CONFIG_OF_CPU_TIME_BASED_KILLING_ENABLED, true);
+  }
+
+
+  protected long getCountStarResult() {
+    return 3_000_000;
+  }
+
+  protected String getTimeColumnName() {
+    return null;
+  }
+
+  protected TableConfig createOfflineTableConfig() {
+    return new TableConfigBuilder(TableType.OFFLINE).setTableName(getTableName()).setSchemaName(getSchemaName())
+        .setTimeColumnName(getTimeColumnName()).setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas())
+        .setSegmentVersion(getSegmentVersion()).setLoadMode(getLoadMode()).setTaskConfig(getTaskConfig())
+        .setBrokerTenant(getBrokerTenant()).setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig())
+        .setQueryConfig(getQueryConfig()).setNullHandlingEnabled(getNullHandlingEnabled())
+        .setSegmentPartitionConfig(getSegmentPartitionConfig())
+        .build();
+  }
+
+  @Test
+  public void testDigestTimeoutMultipleQueries()
+      throws Exception {
+    AtomicReference<JsonNode> queryResponse1 = new AtomicReference<>();
+    AtomicReference<JsonNode> queryResponse2 = new AtomicReference<>();
+    AtomicReference<JsonNode> queryResponse3 = new AtomicReference<>();
+
+    CountDownLatch countDownLatch = new CountDownLatch(3);
+
+    EXECUTOR_SERVICE.submit(
+        () -> {
+          try {
+            queryResponse1.set(postQuery(OOM_QUERY));
+            countDownLatch.countDown();
+          } catch (Exception ignored) {
+          }
+        }
+    );
+    EXECUTOR_SERVICE.submit(
+        () -> {
+          try {
+            queryResponse2.set(postQuery(DIGEST_QUERY_1));
+            countDownLatch.countDown();
+          } catch (Exception ignored) {
+          }
+        }
+    );
+    EXECUTOR_SERVICE.submit(
+        () -> {
+          try {
+            queryResponse3.set(postQuery(COUNT_STAR_QUERY));
+            countDownLatch.countDown();
+          } catch (Exception ignored) {
+          }
+        }
+    );
+    countDownLatch.await();
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("got killed on SERVER"));
+    Assert.assertTrue(queryResponse1.get().get("exceptions").toString().contains("CPU time exceeding limit of"));
+    Assert.assertFalse(StringUtils.isEmpty(queryResponse2.get().get("exceptions").toString()));
+    Assert.assertFalse(StringUtils.isEmpty(queryResponse3.get().get("exceptions").toString()));
+  }
+
+  private List<File> createAvroFile()
+      throws IOException {
+
+    // create avro schema
+    org.apache.avro.Schema avroSchema = org.apache.avro.Schema.createRecord("myRecord", null, null, false);
+    avroSchema.setFields(ImmutableList.of(
+        new org.apache.avro.Schema.Field(STRING_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.STRING), null, null),
+        new org.apache.avro.Schema.Field(STRING_DIM_SV2,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.STRING), null, null),
+        new org.apache.avro.Schema.Field(INT_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.INT), null, null),
+        new org.apache.avro.Schema.Field(LONG_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.LONG), null, null),
+        new org.apache.avro.Schema.Field(DOUBLE_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.DOUBLE), null, null),
+        new org.apache.avro.Schema.Field(BOOLEAN_DIM_SV1,
+            org.apache.avro.Schema.create(org.apache.avro.Schema.Type.BOOLEAN), null, null)));
+
+    List<File> ret = new ArrayList<>();
+    for (int file = 0; file < 3; file++) {
+      // create avro file
+      File avroFile = new File(_tempDir, "data_" + file + ".avro");
+      try (DataFileWriter<GenericData.Record> fileWriter = new DataFileWriter<>(new GenericDatumWriter<>(avroSchema))) {
+        fileWriter.create(avroSchema, avroFile);
+
+        int numDocs = 1_000_000;
+        int randBound = numDocs / 2;
+        Random random = new Random(0);
+        IntStream randomInt = random.ints(0, 100_000);
+        for (int docId = 0; docId < numDocs; docId++) {
+          GenericData.Record record = new GenericData.Record(avroSchema);
+          record.put(STRING_DIM_SV1, "test query killing");
+          record.put(STRING_DIM_SV2, "test query killing");
+          record.put(INT_DIM_SV1, random.nextInt(randBound));
+          record.put(LONG_DIM_SV1, random.nextLong());
+          record.put(DOUBLE_DIM_SV1, random.nextDouble());
+          record.put(BOOLEAN_DIM_SV1, true);
+          fileWriter.append(record);
+        }
+        ret.add(avroFile);
+      }
+    }
+    return ret;
+  }
+}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineGRPCServerIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineGRPCServerIntegrationTest.java
index 168c1fb3529..d796db58508 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineGRPCServerIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineGRPCServerIntegrationTest.java
@@ -20,17 +20,29 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.common.datatable.DataTable;
 import org.apache.pinot.common.datatable.DataTable.MetadataKey;
 import org.apache.pinot.common.datatable.DataTableFactory;
+import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.proto.Server;
 import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.grpc.GrpcQueryClient;
 import org.apache.pinot.common.utils.grpc.GrpcRequestBuilder;
+import org.apache.pinot.core.query.reduce.DataTableReducer;
+import org.apache.pinot.core.query.reduce.DataTableReducerContext;
+import org.apache.pinot.core.query.reduce.ResultReducerFactory;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.core.transport.ServerRoutingInstance;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.utils.CommonConstants;
@@ -41,10 +53,14 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import static org.mockito.Mockito.mock;
 import static org.testng.Assert.*;
 
 
 public class OfflineGRPCServerIntegrationTest extends BaseClusterIntegrationTest {
+  private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(2);
+  private static final DataTableReducerContext DATATABLE_REDUCER_CONTEXT = new DataTableReducerContext(
+      EXECUTOR_SERVICE, 2, 10000, 10000);
 
   @BeforeClass
   public void setUp()
@@ -112,7 +128,7 @@ public void testQueryingGrpcServer(String sql)
     DataTable dataTable = collectNonStreamingRequestResult(queryClient.submit(requestBuilder.setSql(sql).build()));
 
     requestBuilder.setEnableStreaming(true);
-    collectAndCompareResult(queryClient.submit(requestBuilder.setSql(sql).build()), dataTable);
+    collectAndCompareResult(sql, queryClient.submit(requestBuilder.setSql(sql).build()), dataTable);
     queryClient.close();
   }
 
@@ -127,18 +143,26 @@ public Object[][] provideSqlAndResultRowsAndNumDocScanTestCases() {
         "SELECT timeConvert(DaysSinceEpoch,'DAYS','SECONDS') FROM mytable_OFFLINE LIMIT 10000000"
     });
 
+    // select only with early termination
+    entries.add(new Object[]{"SELECT * FROM mytable_OFFLINE LIMIT 10"});
+
     // aggregate
     entries.add(new Object[]{"SELECT count(*) FROM mytable_OFFLINE"});
-    entries.add(new Object[]{"SELECT count(*) FROM mytable_OFFLINE GROUP BY arrayLength(DivAirports)"});
+    entries.add(new Object[]{"SELECT SUM(ArrTime) FROM mytable_OFFLINE"});
 
-    // distinct count
+    // group-by
+    entries.add(new Object[]{"SELECT count(*) FROM mytable_OFFLINE GROUP BY arrayLength(DivAirports)"});
     entries.add(new Object[]{"SELECT DISTINCTCOUNT(AirlineID) FROM mytable_OFFLINE GROUP BY Carrier"});
+    entries.add(new Object[]{"SELECT count(*), sum(ArrTime) FROM mytable_OFFLINE GROUP BY AirlineID"});
+
+    // distinct
+    entries.add(new Object[]{"SELECT DISTINCT(AirlineID) FROM mytable_OFFLINE LIMIT 1000000"});
+    entries.add(new Object[]{"SELECT AirlineID, ArrTime FROM mytable_OFFLINE "
+        + "GROUP BY AirlineID, ArrTime LIMIT 1000000"});
 
     // order by
-    entries.add(new Object[]{
-        "SELECT DaysSinceEpoch, timeConvert(DaysSinceEpoch,'DAYS','SECONDS') "
-            + "FROM mytable_OFFLINE ORDER BY DaysSinceEpoch limit 10000"
-    });
+    entries.add(new Object[]{"SELECT DaysSinceEpoch, timeConvert(DaysSinceEpoch,'DAYS','SECONDS') "
+        + "FROM mytable_OFFLINE ORDER BY DaysSinceEpoch limit 1000000"});
 
     return entries.toArray(new Object[entries.size()][]);
   }
@@ -154,10 +178,11 @@ private DataTable collectNonStreamingRequestResult(Iterator<Server.ServerRespons
     return dataTable;
   }
 
-  private void collectAndCompareResult(Iterator<Server.ServerResponse> streamingResponses,
+  private void collectAndCompareResult(String sql, Iterator<Server.ServerResponse> streamingResponses,
       DataTable nonStreamResultDataTable)
       throws Exception {
-    int numTotalDocs = 0;
+    Map<ServerRoutingInstance, DataTable> dataTableMap = new HashMap<>();
+    DataSchema cachedDataSchema = null;
     while (streamingResponses.hasNext()) {
       Server.ServerResponse streamingResponse = streamingResponses.next();
       DataTable dataTable = DataTableFactory.getDataTable(streamingResponse.getPayload().asReadOnlyByteBuffer());
@@ -169,11 +194,28 @@ private void collectAndCompareResult(Iterator<Server.ServerResponse> streamingRe
         Map<String, String> metadata = dataTable.getMetadata();
         assertTrue(metadata.containsKey(DataTable.MetadataKey.RESPONSE_SER_CPU_TIME_NS.getName()));
         assertNotNull(dataTable.getDataSchema());
-        numTotalDocs += dataTable.getNumberOfRows();
+        cachedDataSchema = dataTable.getDataSchema();
+        // adding them to a fake dataTableMap for reduce
+        dataTableMap.put(mock(ServerRoutingInstance.class), dataTable);
       } else {
+        // compare result dataTable against nonStreamingResultDataTable
+        // Process server response.
+        QueryContext queryContext = QueryContextConverterUtils.getQueryContext(sql);
+        DataTableReducer reducer = ResultReducerFactory.getResultReducer(queryContext);
+        BrokerResponseNative streamingBrokerResponse = new BrokerResponseNative();
+        reducer.reduceAndSetResults("mytable_OFFLINE", cachedDataSchema, dataTableMap, streamingBrokerResponse,
+            DATATABLE_REDUCER_CONTEXT, mock(BrokerMetrics.class));
+        dataTableMap.clear();
+        dataTableMap.put(mock(ServerRoutingInstance.class), nonStreamResultDataTable);
+        BrokerResponseNative nonStreamBrokerResponse = new BrokerResponseNative();
+        reducer.reduceAndSetResults("mytable_OFFLINE", cachedDataSchema, dataTableMap, nonStreamBrokerResponse,
+            DATATABLE_REDUCER_CONTEXT, mock(BrokerMetrics.class));
+        assertEquals(streamingBrokerResponse.getResultTable().getRows().size(),
+            nonStreamBrokerResponse.getResultTable().getRows().size());
+
+        // validate final metadata return
         assertEquals(responseType, CommonConstants.Query.Response.ResponseType.METADATA);
         assertFalse(streamingResponses.hasNext());
-        assertEquals(numTotalDocs, nonStreamResultDataTable.getNumberOfRows());
         assertNull(dataTable.getDataSchema());
         assertEquals(dataTable.getNumberOfRows(), 0);
         assertEquals(dataTable.getMetadata().get(DataTable.MetadataKey.NUM_DOCS_SCANNED.getName()),
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PurgeMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PurgeMinionClusterIntegrationTest.java
index 284e7655b54..c4ba131f6de 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PurgeMinionClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PurgeMinionClusterIntegrationTest.java
@@ -18,7 +18,9 @@
  */
 package org.apache.pinot.integration.tests;
 
+import com.google.common.collect.ImmutableList;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34,8 +36,11 @@
 import org.apache.pinot.controller.helix.core.minion.PinotTaskManager;
 import org.apache.pinot.core.common.MinionConstants;
 import org.apache.pinot.minion.MinionContext;
+import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableTaskConfig;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.util.TestUtils;
@@ -56,25 +61,21 @@ public class PurgeMinionClusterIntegrationTest extends BaseClusterIntegrationTes
   private static final String PURGE_FIRST_RUN_TABLE = "myTable1";
   private static final String PURGE_DELTA_PASSED_TABLE = "myTable2";
   private static final String PURGE_DELTA_NOT_PASSED_TABLE = "myTable3";
+  private static final String PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE = "myTable4";
+
 
   protected PinotHelixTaskResourceManager _helixTaskResourceManager;
   protected PinotTaskManager _taskManager;
   protected PinotHelixResourceManager _pinotHelixResourceManager;
   protected String _tableName;
 
-  protected final File _segmentDir1 = new File(_tempDir, "segmentDir1");
-  protected final File _segmentDir2 = new File(_tempDir, "segmentDir2");
-  protected final File _segmentDir3 = new File(_tempDir, "segmentDir3");
-
-  protected final File _tarDir1 = new File(_tempDir, "tarDir1");
-  protected final File _tarDir2 = new File(_tempDir, "tarDir2");
-  protected final File _tarDir3 = new File(_tempDir, "tarDir3");
+  protected final File _segmentDataDir = new File(_tempDir, "segmentDataDir");
+  protected final File _segmentTarDir = new File(_tempDir, "segmentTarDir");
 
   @BeforeClass
   public void setUp()
       throws Exception {
-    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir1, _tarDir1, _segmentDir2, _tarDir2, _segmentDir3,
-        _tarDir3);
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDataDir, _segmentTarDir);
 
     // Start the Pinot cluster
     startZk();
@@ -82,37 +83,38 @@ public void setUp()
     startBrokers(1);
     startServers(1);
 
-    // Create and upload the schema and table config
-    Schema schema = createSchema();
-    addSchema(schema);
-    setTableName(PURGE_DELTA_NOT_PASSED_TABLE);
-    TableConfig purgeDeltaNotPassedTableConfig = createOfflineTableConfig();
-    purgeDeltaNotPassedTableConfig.setTaskConfig(getPurgeTaskConfig());
-    setTableName(PURGE_FIRST_RUN_TABLE);
-    TableConfig purgeTableConfig = createOfflineTableConfig();
-    purgeTableConfig.setTaskConfig(getPurgeTaskConfig());
-
-    setTableName(PURGE_DELTA_PASSED_TABLE);
-    TableConfig purgeDeltaPassedTableConfig = createOfflineTableConfig();
-    purgeDeltaPassedTableConfig.setTaskConfig(getPurgeTaskConfig());
-
-    addTableConfig(purgeTableConfig);
-    addTableConfig(purgeDeltaPassedTableConfig);
-    addTableConfig(purgeDeltaNotPassedTableConfig);
+    List<String> allTables = ImmutableList.of(
+        PURGE_FIRST_RUN_TABLE,
+        PURGE_DELTA_PASSED_TABLE,
+        PURGE_DELTA_NOT_PASSED_TABLE,
+        PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE
+    );
+    Schema schema = null;
+    TableConfig tableConfig = null;
+    for (String tableName : allTables) {
+      // create and upload schema
+      schema = createSchema();
+      schema.setSchemaName(tableName);
+      addSchema(schema);
+
+      // create and upload table config
+      setTableName(tableName);
+      tableConfig = createOfflineTableConfig();
+      tableConfig.setTaskConfig(getPurgeTaskConfig());
+      addTableConfig(tableConfig);
+    }
 
     // Unpack the Avro files
     List<File> avroFiles = unpackAvroData(_tempDir);
 
-    // Create and upload segments
-    ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, purgeTableConfig, schema, 0, _segmentDir1, _tarDir1);
-    ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, purgeDeltaPassedTableConfig, schema, 0, _segmentDir2,
-        _tarDir2);
-    ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, purgeDeltaNotPassedTableConfig, schema, 0,
-        _segmentDir3, _tarDir3);
+    // Create segments
+    ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, tableConfig, schema, 0, _segmentDataDir,
+        _segmentTarDir);
 
-    uploadSegments(PURGE_FIRST_RUN_TABLE, _tarDir1);
-    uploadSegments(PURGE_DELTA_PASSED_TABLE, _tarDir2);
-    uploadSegments(PURGE_DELTA_NOT_PASSED_TABLE, _tarDir3);
+    // Upload segments for all tables
+    for (String tableName : allTables) {
+      uploadSegments(tableName, _segmentTarDir);
+    }
 
     startMinion();
     setRecordPurger();
@@ -150,10 +152,14 @@ public void setUp()
   private void setRecordPurger() {
     MinionContext minionContext = MinionContext.getInstance();
     minionContext.setRecordPurgerFactory(rawTableName -> {
-      List<String> tableNames =
-          Arrays.asList(PURGE_FIRST_RUN_TABLE, PURGE_DELTA_PASSED_TABLE, PURGE_DELTA_NOT_PASSED_TABLE);
+      List<String> tableNames = Arrays.asList(
+          PURGE_FIRST_RUN_TABLE,
+          PURGE_DELTA_PASSED_TABLE,
+          PURGE_DELTA_NOT_PASSED_TABLE,
+          PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE
+      );
       if (tableNames.contains(rawTableName)) {
-        return row -> row.getValue("Quarter").equals(1);
+        return row -> row.getValue("ArrTime").equals(1);
       } else {
         return null;
       }
@@ -205,11 +211,11 @@ public void testFirstRunPurge()
     // Should not generate new purge task as the last time purge is not greater than last + 1day (default purge delay)
     assertNull(_taskManager.scheduleTasks(offlineTableName).get(MinionConstants.PurgeTask.TASK_TYPE));
 
-    // 28057 rows with quarter = 1
+    // 52 rows with ArrTime = 1
     // 115545 totals rows
-    // Expecting 115545 - 28057 = 87488 rows after purging
+    // Expecting 115545 - 52 = 115493 rows after purging
     // It might take some time for server to load the purged segments
-    TestUtils.waitForCondition(aVoid -> getCurrentCountStarResult(PURGE_FIRST_RUN_TABLE) == 87488, 60_000L,
+    TestUtils.waitForCondition(aVoid -> getCurrentCountStarResult(PURGE_FIRST_RUN_TABLE) == 115493, 60_000L,
         "Failed to get expected purged records");
 
     // Drop the table
@@ -251,11 +257,11 @@ public void testPassedDelayTimePurge()
     // Should not generate new purge task as the last time purge is not greater than last + 1day (default purge delay)
     assertNull(_taskManager.scheduleTasks(offlineTableName).get(MinionConstants.PurgeTask.TASK_TYPE));
 
-    // 28057 rows with quarter = 1
+    // 52 rows with ArrTime = 1
     // 115545 totals rows
-    // Expecting 115545 - 28057 = 87488 rows after purging
+    // Expecting 115545 - 52 = 115493 rows after purging
     // It might take some time for server to load the purged segments
-    TestUtils.waitForCondition(aVoid -> getCurrentCountStarResult(PURGE_DELTA_PASSED_TABLE) == 87488, 60_000L,
+    TestUtils.waitForCondition(aVoid -> getCurrentCountStarResult(PURGE_DELTA_PASSED_TABLE) == 115493, 60_000L,
         "Failed to get expected purged records");
 
     // Drop the table
@@ -302,6 +308,63 @@ public void testNotPassedDelayTimePurge()
     verifyTableDelete(offlineTableName);
   }
 
+  /**
+   * Test purge on segments which were built by older schema and table config.
+   * Two new columns are added after segments are built and indices are defined for the new columns in the table config.
+   */
+  @Test
+  public void testPurgeOnOldSegmentsWithIndicesOnNewColumns()
+      throws Exception {
+
+    // add new columns to schema
+    Schema schema = createSchema();
+    schema.addField(new DimensionFieldSpec("ColumnABC", FieldSpec.DataType.INT, true));
+    schema.addField(new DimensionFieldSpec("ColumnXYZ", FieldSpec.DataType.INT, true));
+    schema.setSchemaName(PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE);
+    updateSchema(schema);
+
+    // add indices to the new columns
+    setTableName(PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE);
+    TableConfig tableConfig = createOfflineTableConfig();
+    tableConfig.setTaskConfig(getPurgeTaskConfig());
+    IndexingConfig indexingConfig = tableConfig.getIndexingConfig();
+    List<String> invertedIndices = new ArrayList<>(indexingConfig.getInvertedIndexColumns());
+    invertedIndices.add("ColumnABC");
+    List<String> rangeIndices = new ArrayList<>(indexingConfig.getRangeIndexColumns());
+    rangeIndices.add("ColumnXYZ");
+    indexingConfig.setInvertedIndexColumns(invertedIndices);
+    indexingConfig.setRangeIndexColumns(rangeIndices);
+    updateTableConfig(tableConfig);
+
+    // schedule purge tasks
+    String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE);
+    assertNotNull(_taskManager.scheduleTasks(offlineTableName).get(MinionConstants.PurgeTask.TASK_TYPE));
+    assertTrue(_helixTaskResourceManager.getTaskQueues()
+        .contains(PinotHelixTaskResourceManager.getHelixJobQueueName(MinionConstants.PurgeTask.TASK_TYPE)));
+    assertNull(_taskManager.scheduleTasks(offlineTableName).get(MinionConstants.PurgeTask.TASK_TYPE));
+    waitForTaskToComplete();
+
+    // Check that metadata contains expected values
+    for (SegmentZKMetadata metadata : _pinotHelixResourceManager.getSegmentsZKMetadata(offlineTableName)) {
+      // Check purge time
+      assertTrue(
+          metadata.getCustomMap().containsKey(MinionConstants.PurgeTask.TASK_TYPE + MinionConstants.TASK_TIME_SUFFIX));
+    }
+
+    // 52 rows with ArrTime = 1
+    // 115545 totals rows
+    // Expecting 115545 - 52 = 115493 rows after purging
+    // It might take some time for server to load the purged segments
+    TestUtils.waitForCondition(aVoid -> getCurrentCountStarResult(PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE) == 115493,
+        60_000L, "Failed to get expected purged records");
+
+    // Drop the table
+    dropOfflineTable(PURGE_OLD_SEGMENTS_WITH_NEW_INDICES_TABLE);
+
+    // Check if the task metadata is cleaned up on table deletion
+    verifyTableDelete(offlineTableName);
+  }
+
   protected void verifyTableDelete(String tableNameWithType) {
     TestUtils.waitForCondition(input -> {
       // Check if the segment lineage is cleaned up
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java
index 852230188b3..82aa58659bc 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeToOfflineSegmentsMinionClusterIntegrationTest.java
@@ -209,7 +209,7 @@ protected TableConfig createRealtimeTableConfig(File sampleAvroFile, String tabl
         .setRangeIndexColumns(getRangeIndexColumns()).setBloomFilterColumns(getBloomFilterColumns())
         .setFieldConfigList(getFieldConfigs()).setNumReplicas(getNumReplicas()).setSegmentVersion(getSegmentVersion())
         .setLoadMode(getLoadMode()).setTaskConfig(taskConfig).setBrokerTenant(getBrokerTenant())
-        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryconfig())
+        .setServerTenant(getServerTenant()).setIngestionConfig(getIngestionConfig()).setQueryConfig(getQueryConfig())
         .setLLC(useLlc()).setStreamConfigs(getStreamConfigs()).setNullHandlingEnabled(getNullHandlingEnabled()).build();
   }
 
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SSBQueryIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SSBQueryIntegrationTest.java
index 5776f2c82bb..5b78267d013 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SSBQueryIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SSBQueryIntegrationTest.java
@@ -27,18 +27,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.client.Connection;
-import org.apache.pinot.client.ConnectionFactory;
 import org.apache.pinot.client.ResultSetGroup;
-import org.apache.pinot.common.datatable.DataTableFactory;
-import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
-import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.tools.utils.JarUtils;
 import org.apache.pinot.util.TestUtils;
 import org.slf4j.Logger;
@@ -103,9 +95,6 @@ public void setUp()
       // H2
       ClusterIntegrationTestUtils.setUpH2TableWithAvro(Collections.singletonList(dataFile), tableName, _h2Connection);
     }
-
-    // Setting data table version to 4
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
   }
 
   @Test(dataProvider = "QueryDataProvider")
@@ -161,26 +150,8 @@ protected long getCountStarResult() {
   }
 
   @Override
-  protected Connection getPinotConnection() {
-    Properties properties = new Properties();
-    properties.put("queryOptions", "useMultistageEngine=true");
-    if (_pinotConnection == null) {
-      _pinotConnection = ConnectionFactory.fromZookeeper(properties, getZkUrl() + "/" + getHelixClusterName());
-    }
-    return _pinotConnection;
-  }
-
-  @Override
-  protected void overrideBrokerConf(PinotConfiguration brokerConf) {
-    brokerConf.setProperty(CommonConstants.Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED, true);
-    brokerConf.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, 8421);
-  }
-
-  @Override
-  protected void overrideServerConf(PinotConfiguration serverConf) {
-    serverConf.setProperty(CommonConstants.Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED, true);
-    serverConf.setProperty(QueryConfig.KEY_OF_QUERY_SERVER_PORT, 8842);
-    serverConf.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, 8422);
+  protected boolean useMultiStageQueryEngine() {
+    return true;
   }
 
   @AfterClass
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentGenerationMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentGenerationMinionClusterIntegrationTest.java
index 7880d1b846a..9606002d4f7 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentGenerationMinionClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentGenerationMinionClusterIntegrationTest.java
@@ -88,7 +88,7 @@ public void testAdhocSegmentGenerationAndPushTask()
     AdhocTaskConfig adhocTaskConfig =
         new AdhocTaskConfig("SegmentGenerationAndPushTask", tableNameWithType, null, taskConfigs);
 
-    String url = _controllerBaseApiUrl + "/tasks/execute";
+    String url = getControllerBaseApiUrl() + "/tasks/execute";
     TestUtils.waitForCondition(aVoid -> {
       try {
         if (getTotalDocs(tableName) < rowCnt) {
@@ -102,7 +102,7 @@ public void testAdhocSegmentGenerationAndPushTask()
         return false;
       }
     }, 5000L, 600_000L, "Failed to load " + rowCnt + " documents", true);
-    JsonNode result = postQuery("SELECT COUNT(*) FROM " + tableName, _brokerBaseApiUrl);
+    JsonNode result = postQuery("SELECT COUNT(*) FROM " + tableName);
     // One segment per file.
     assertEquals(result.get("numSegmentsQueried").asInt(), 7);
   }
@@ -134,8 +134,8 @@ private void testInsertIntoFromFile(String tableName, String taskName, boolean q
     TestUtils.waitForCondition(aVoid -> {
       try {
         if (getTotalDocs(tableName) < rowCnt) {
-          JsonNode response = queryController ? postQueryToController(insertFileStatement, _controllerBaseApiUrl)
-              : postQuery(insertFileStatement, _brokerBaseApiUrl);
+          JsonNode response = queryController ? postQueryToController(insertFileStatement)
+              : postQuery(insertFileStatement);
           Assert.assertEquals(response.get("resultTable").get("rows").get(0).get(0).asText(),
               tableName + "_OFFLINE");
           Assert.assertEquals(response.get("resultTable").get("rows").get(0).get(1).asText(),
@@ -147,7 +147,7 @@ private void testInsertIntoFromFile(String tableName, String taskName, boolean q
         return false;
       }
     }, 5000L, 600_000L, "Failed to load " + rowCnt + " documents", true);
-    JsonNode result = postQuery("SELECT COUNT(*) FROM " + tableName, _brokerBaseApiUrl);
+    JsonNode result = postQuery("SELECT COUNT(*) FROM " + tableName);
     // One segment per file.
     assertEquals(result.get("numSegmentsQueried").asInt(), 7);
   }
@@ -178,7 +178,7 @@ private int prepInputFiles(File inputDir, int fileNum, int rowsPerFile)
   private int getTotalDocs(String tableName)
       throws Exception {
     String query = "SELECT COUNT(*) FROM " + tableName;
-    JsonNode response = postQuery(query, _brokerBaseApiUrl);
+    JsonNode response = postQuery(query);
     JsonNode resTbl = response.get("resultTable");
     return (resTbl == null) ? 0 : resTbl.get("rows").get(0).get(0).asInt();
   }
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentUploadIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentUploadIntegrationTest.java
index c85b494c292..35fdae84489 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentUploadIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentUploadIntegrationTest.java
@@ -43,6 +43,7 @@
 import org.apache.pinot.spi.ingestion.batch.spec.TableSpec;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.ControllerRequestURLBuilder;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.util.TestUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -114,6 +115,7 @@ public void testUploadAndQuery()
     Schema schema = createSchema();
     addSchema(schema);
     TableConfig offlineTableConfig = createOfflineTableConfig();
+    waitForEVToDisappear(offlineTableConfig.getTableName());
     addTableConfig(offlineTableConfig);
 
     List<File> avroFiles = getAllAvroFiles();
@@ -138,7 +140,7 @@ public void testUploadAndQuery()
     tableSpec.setTableConfigURI(_controllerRequestURLBuilder.forUpdateTableConfig(DEFAULT_TABLE_NAME));
     jobSpec.setTableSpec(tableSpec);
     PinotClusterSpec clusterSpec = new PinotClusterSpec();
-    clusterSpec.setControllerURI(_controllerBaseApiUrl);
+    clusterSpec.setControllerURI(getControllerBaseApiUrl());
     jobSpec.setPinotClusterSpecs(new PinotClusterSpec[]{clusterSpec});
 
     File dataDir = new File(_controllerConfig.getDataDir());
@@ -213,6 +215,7 @@ public void testUploadAndQueryWithConsistentPush()
     Schema schema = createSchema();
     addSchema(schema);
     TableConfig offlineTableConfig = createOfflineTableConfigWithConsistentPush();
+    waitForEVToDisappear(offlineTableConfig.getTableName());
     addTableConfig(offlineTableConfig);
 
     List<File> avroFiles = getAllAvroFiles();
@@ -238,7 +241,7 @@ public void testUploadAndQueryWithConsistentPush()
     tableSpec.setTableConfigURI(_controllerRequestURLBuilder.forUpdateTableConfig(DEFAULT_TABLE_NAME));
     jobSpec.setTableSpec(tableSpec);
     PinotClusterSpec clusterSpec = new PinotClusterSpec();
-    clusterSpec.setControllerURI(_controllerBaseApiUrl);
+    clusterSpec.setControllerURI(getControllerBaseApiUrl());
     jobSpec.setPinotClusterSpecs(new PinotClusterSpec[]{clusterSpec});
 
     File dataDir = new File(_controllerConfig.getDataDir());
@@ -264,7 +267,7 @@ public void testUploadAndQueryWithConsistentPush()
 
     // Fetch segment lineage entry after running segment metadata push with consistent push enabled.
     String segmentLineageResponse = ControllerTest.sendGetRequest(
-        ControllerRequestURLBuilder.baseUrl(_controllerBaseApiUrl)
+        ControllerRequestURLBuilder.baseUrl(getControllerBaseApiUrl())
             .forListAllSegmentLineages(DEFAULT_TABLE_NAME, TableType.OFFLINE.toString()));
     // Segment lineage should be in completed state.
     Assert.assertTrue(segmentLineageResponse.contains("\"state\":\"COMPLETED\""));
@@ -313,7 +316,7 @@ public void testUploadAndQueryWithConsistentPush()
 
     // Fetch segment lineage entry after running segment tar push with consistent push enabled.
     segmentLineageResponse = ControllerTest.sendGetRequest(
-        ControllerRequestURLBuilder.baseUrl(_controllerBaseApiUrl)
+        ControllerRequestURLBuilder.baseUrl(getControllerBaseApiUrl())
             .forListAllSegmentLineages(DEFAULT_TABLE_NAME, TableType.OFFLINE.toString()));
     // Segment lineage should be in completed state.
     Assert.assertTrue(segmentLineageResponse.contains("\"state\":\"COMPLETED\""));
@@ -362,7 +365,8 @@ public Boolean apply(@Nullable Void aVoid) {
   @AfterMethod
   public void tearDownTest()
       throws IOException {
-    dropOfflineTable(getTableName());
+    String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(getTableName());
+    dropOfflineTable(offlineTableName);
   }
 
   @AfterClass
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentWriterUploaderIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentWriterUploaderIntegrationTest.java
index 8a41be5dacb..c0ad63c550f 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentWriterUploaderIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SegmentWriterUploaderIntegrationTest.java
@@ -88,7 +88,7 @@ protected IngestionConfig getIngestionConfig() {
     Map<String, String> batchConfigMap = new HashMap<>();
     batchConfigMap.put(BatchConfigProperties.OUTPUT_DIR_URI, _tarDir.getAbsolutePath());
     batchConfigMap.put(BatchConfigProperties.OVERWRITE_OUTPUT, "false");
-    batchConfigMap.put(BatchConfigProperties.PUSH_CONTROLLER_URI, _controllerBaseApiUrl);
+    batchConfigMap.put(BatchConfigProperties.PUSH_CONTROLLER_URI, getControllerBaseApiUrl());
     IngestionConfig ingestionConfig = new IngestionConfig();
     ingestionConfig.setBatchIngestionConfig(
         new BatchIngestionConfig(Collections.singletonList(batchConfigMap), "APPEND", "HOURLY"));
@@ -162,7 +162,7 @@ private int getNumSegments()
 
   private int getTotalDocsFromQuery()
       throws Exception {
-    JsonNode response = postQuery(String.format("select count(*) from %s", _tableNameWithType), _brokerBaseApiUrl);
+    JsonNode response = postQuery(String.format("select count(*) from %s", _tableNameWithType));
     return response.get("resultTable").get("rows").get(0).get(0).asInt();
   }
 
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java
index 87fb039d535..e36f3d6aac4 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java
@@ -24,6 +24,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.integration.tests.startree.SegmentInfoProvider;
 import org.apache.pinot.integration.tests.startree.StarTreeQueryGenerator;
@@ -33,11 +34,12 @@
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.util.TestUtils;
-import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+
 
 /**
  * Integration test for Star-Tree based indexes.
@@ -66,6 +68,9 @@ public class StarTreeClusterIntegrationTest extends BaseClusterIntegrationTest {
           AggregationFunctionType.DISTINCTCOUNTBITMAP);
   private static final int NUM_QUERIES_TO_GENERATE = 100;
 
+  private final long _randomSeed = System.currentTimeMillis();
+  private final Random _random = new Random(_randomSeed);
+
   private StarTreeQueryGenerator _starTree1QueryGenerator;
   private StarTreeQueryGenerator _starTree2QueryGenerator;
 
@@ -95,27 +100,26 @@ public void setUp()
     Schema schema = createSchema();
     addSchema(schema);
 
-    // Randomly pick some dimensions and metrics for star-trees
-    List<String> starTree1Dimensions = new ArrayList<>(NUM_STAR_TREE_DIMENSIONS);
-    List<String> starTree2Dimensions = new ArrayList<>(NUM_STAR_TREE_DIMENSIONS);
+    // Pick fixed dimensions and metrics for the first star-tree
+    List<String> starTree1Dimensions =
+        Arrays.asList("OriginCityName", "DepTimeBlk", "LongestAddGTime", "CRSDepTime", "DivArrDelay");
+    List<String> starTree1Metrics =
+        Arrays.asList("CarrierDelay", "DepDelay", "LateAircraftDelay", "ArrivalDelayGroups", "ArrDel15");
+    int starTree1MaxLeafRecords = 10;
+
+    // Randomly pick some dimensions and metrics for the second star-tree
     List<String> allDimensions = new ArrayList<>(schema.getDimensionNames());
-    Collections.shuffle(allDimensions);
-    for (int i = 0; i < NUM_STAR_TREE_DIMENSIONS; i++) {
-      starTree1Dimensions.add(allDimensions.get(2 * i));
-      starTree2Dimensions.add(allDimensions.get(2 * i + 1));
-    }
-    List<String> starTree1Metrics = new ArrayList<>(NUM_STAR_TREE_METRICS);
-    List<String> starTree2Metrics = new ArrayList<>(NUM_STAR_TREE_METRICS);
+    Collections.shuffle(allDimensions, _random);
+    List<String> starTree2Dimensions = allDimensions.subList(0, NUM_STAR_TREE_DIMENSIONS);
     List<String> allMetrics = new ArrayList<>(schema.getMetricNames());
-    Collections.shuffle(allMetrics);
-    for (int i = 0; i < NUM_STAR_TREE_METRICS; i++) {
-      starTree1Metrics.add(allMetrics.get(2 * i));
-      starTree2Metrics.add(allMetrics.get(2 * i + 1));
-    }
+    Collections.shuffle(allMetrics, _random);
+    List<String> starTree2Metrics = allMetrics.subList(0, NUM_STAR_TREE_METRICS);
+    int starTree2MaxLeafRecords = 100;
+
     TableConfig tableConfig = createOfflineTableConfig();
     tableConfig.getIndexingConfig().setStarTreeIndexConfigs(
-        Arrays.asList(getStarTreeIndexConfig(starTree1Dimensions, starTree1Metrics),
-            getStarTreeIndexConfig(starTree2Dimensions, starTree2Metrics)));
+        Arrays.asList(getStarTreeIndexConfig(starTree1Dimensions, starTree1Metrics, starTree1MaxLeafRecords),
+            getStarTreeIndexConfig(starTree2Dimensions, starTree2Metrics, starTree2MaxLeafRecords)));
     addTableConfig(tableConfig);
 
     // Unpack the Avro files
@@ -132,22 +136,23 @@ public void setUp()
       aggregationFunctions.add(functionType.getName());
     }
     _starTree1QueryGenerator = new StarTreeQueryGenerator(DEFAULT_TABLE_NAME, starTree1Dimensions, starTree1Metrics,
-        segmentInfoProvider.getSingleValueDimensionValuesMap(), aggregationFunctions);
+        segmentInfoProvider.getSingleValueDimensionValuesMap(), aggregationFunctions, _random);
     _starTree2QueryGenerator = new StarTreeQueryGenerator(DEFAULT_TABLE_NAME, starTree2Dimensions, starTree2Metrics,
-        segmentInfoProvider.getSingleValueDimensionValuesMap(), aggregationFunctions);
+        segmentInfoProvider.getSingleValueDimensionValuesMap(), aggregationFunctions, _random);
 
     // Wait for all documents loaded
     waitForAllDocsLoaded(600_000L);
   }
 
-  private static StarTreeIndexConfig getStarTreeIndexConfig(List<String> dimensions, List<String> metrics) {
+  private static StarTreeIndexConfig getStarTreeIndexConfig(List<String> dimensions, List<String> metrics,
+      int maxLeafRecords) {
     List<String> functionColumnPairs = new ArrayList<>();
     for (AggregationFunctionType functionType : AGGREGATION_FUNCTION_TYPES) {
       for (String metric : metrics) {
         functionColumnPairs.add(new AggregationFunctionColumnPair(functionType, metric).toColumnName());
       }
     }
-    return new StarTreeIndexConfig(dimensions, null, functionColumnPairs, 100);
+    return new StarTreeIndexConfig(dimensions, null, functionColumnPairs, maxLeafRecords);
   }
 
   @Test
@@ -160,23 +165,13 @@ public void testGeneratedQueries()
   }
 
   @Test
-  public void testPredicateOnMetrics()
+  public void testHardCodedQueries()
       throws Exception {
-    String starQuery;
-
-    // Query containing predicate on one metric only
-    starQuery = "SELECT SUM(DepDelayMinutes) FROM mytable WHERE DepDelay > 0";
-    testStarQuery(starQuery);
-    starQuery = "SELECT SUM(DepDelayMinutes) FROM mytable WHERE DepDelay BETWEEN 0 and 10000";
-    testStarQuery(starQuery);
-
-    // Query containing predicate on multiple metrics
-    starQuery = "SELECT SUM(DepDelayMinutes) FROM mytable WHERE DepDelay > 0 AND ArrDelay > 0";
-    testStarQuery(starQuery);
-
-    // Query containing predicate on multiple metrics and dimensions
-    starQuery = "SELECT SUM(DepDelayMinutes) FROM mytable WHERE DepDelay > 0 AND ArrDelay > 0 AND OriginStateName = "
-        + "'Massachusetts'";
+    // This query can test the case of one predicate matches all the child nodes but star-node cannot be used because
+    // the predicate is included as remaining predicate from another branch
+    String starQuery = "SELECT DepTimeBlk, COUNT(*) FROM mytable "
+        + "WHERE CRSDepTime BETWEEN 1137 AND 1849 AND DivArrDelay > 218 AND CRSDepTime NOT IN (35, 1633, 1457, 140) "
+        + "AND LongestAddGTime NOT IN (17, 105, 20, 22) GROUP BY DepTimeBlk ORDER BY DepTimeBlk";
     testStarQuery(starQuery);
   }
 
@@ -185,9 +180,10 @@ private void testStarQuery(String starQuery)
     String referenceQuery = "SET useStarTree = false; " + starQuery;
     JsonNode starResponse = postQuery(starQuery);
     JsonNode referenceResponse = postQuery(referenceQuery);
-    Assert.assertEquals(starResponse.get("resultTable"), referenceResponse.get("resultTable"),
-        "Query comparison failed for: \nStar Query: " + starQuery + "\nStar Response: " + starResponse
-            + "\nReference Query: " + referenceQuery + "\nReference Response: " + referenceResponse);
+    assertEquals(starResponse.get("resultTable"), referenceResponse.get("resultTable"), String.format(
+        "Query comparison failed for: \n"
+            + "Star Query: %s\nStar Response: %s\nReference Query: %s\nReference Response: %s\nRandom Seed: %d",
+        starQuery, starResponse, referenceQuery, referenceResponse, _randomSeed));
   }
 
   @AfterClass
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SumPrecisionIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SumPrecisionIntegrationTest.java
new file mode 100644
index 00000000000..8b8a8ab41fb
--- /dev/null
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/SumPrecisionIntegrationTest.java
@@ -0,0 +1,167 @@
+/**
+ * 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.pinot.integration.tests;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.collect.ImmutableList;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.avro.Schema.Field;
+import org.apache.avro.Schema.Type;
+import org.apache.avro.file.DataFileWriter;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.BigDecimalUtils;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.apache.pinot.util.TestUtils;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class SumPrecisionIntegrationTest extends BaseClusterIntegrationTest {
+  private static final String DIM_NAME = "dimName";
+  private static final String MET_BIG_DECIMAL_BYTES = "metBigDecimalBytes";
+  private static final String MET_BIG_DECIMAL_STRING = "metBigDecimalString";
+  private static final String MET_DOUBLE = "metDouble";
+  private static final String MET_LONG = "metLong";
+
+  @BeforeClass
+  public void setup()
+      throws Exception {
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
+
+    // Start the Pinot cluster
+    startZk();
+    startController();
+    startBroker();
+    startServer();
+
+    // create & upload schema AND table config
+    Schema schema = new Schema.SchemaBuilder().setSchemaName(DEFAULT_SCHEMA_NAME)
+        .addSingleValueDimension(DIM_NAME, FieldSpec.DataType.STRING)
+        .addMetric(MET_BIG_DECIMAL_BYTES, FieldSpec.DataType.BIG_DECIMAL)
+        .addMetric(MET_BIG_DECIMAL_STRING, FieldSpec.DataType.BIG_DECIMAL)
+        .addMetric(MET_DOUBLE, FieldSpec.DataType.DOUBLE)
+        .addMetric(MET_LONG, FieldSpec.DataType.LONG).build();
+    addSchema(schema);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(DEFAULT_TABLE_NAME).build();
+    addTableConfig(tableConfig);
+
+    // create & upload segments
+    File avroFile = createAvroFile(getCountStarResult());
+    ClusterIntegrationTestUtils.buildSegmentFromAvro(avroFile, tableConfig, schema, 0, _segmentDir, _tarDir);
+    uploadSegments(DEFAULT_TABLE_NAME, _tarDir);
+
+    waitForAllDocsLoaded(60_000);
+  }
+
+  @Override
+  protected long getCountStarResult() {
+    return 1000;
+  }
+
+  @Test(dataProvider = "useBothQueryEngines")
+  public void testQueries(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    String query =
+        String.format("SELECT SUMPRECISION(%s), SUMPRECISION(%s), sum(%s), sum(%s) FROM %s",
+            MET_BIG_DECIMAL_BYTES, MET_BIG_DECIMAL_STRING, MET_DOUBLE, MET_LONG, DEFAULT_TABLE_NAME);
+    double sumResult = 2147484147500L;
+    JsonNode jsonNode = postQuery(query);
+    System.out.println("jsonNode = " + jsonNode.toPrettyString());
+    for (int i = 0; i < 4; i++) {
+      assertEquals(Double.parseDouble(jsonNode.get("resultTable").get("rows").get(0).get(i).asText()), sumResult);
+    }
+  }
+
+  private void runAndAssert(String query, Map<String, Integer> expectedGroupToValueMap)
+      throws Exception {
+    Map<String, Integer> actualGroupToValueMap = new HashMap<>();
+    JsonNode jsonNode = postQuery(query);
+    jsonNode.get("resultTable").get("rows").forEach(node -> {
+      String group = node.get(0).textValue();
+      int value = node.get(1).intValue();
+      actualGroupToValueMap.put(group, value);
+    });
+    assertEquals(actualGroupToValueMap, expectedGroupToValueMap);
+  }
+
+  private File createAvroFile(long totalNumRecords)
+      throws IOException {
+
+    // create avro schema
+    org.apache.avro.Schema avroSchema = org.apache.avro.Schema.createRecord("myRecord", null, null, false);
+    avroSchema.setFields(ImmutableList.of(
+        new Field(DIM_NAME, org.apache.avro.Schema.create(Type.STRING), null, null),
+        new Field(MET_BIG_DECIMAL_BYTES, org.apache.avro.Schema.create(Type.BYTES), null, null),
+        new Field(MET_BIG_DECIMAL_STRING, org.apache.avro.Schema.create(Type.STRING), null, null),
+        new Field(MET_DOUBLE, org.apache.avro.Schema.create(Type.DOUBLE), null, null),
+        new Field(MET_LONG, org.apache.avro.Schema.create(Type.LONG), null, null)));
+
+    // create avro file
+    File avroFile = new File(_tempDir, "data.avro");
+    try (DataFileWriter<GenericData.Record> fileWriter = new DataFileWriter<>(new GenericDatumWriter<>(avroSchema))) {
+      fileWriter.create(avroSchema, avroFile);
+      int dimCardinality = 50;
+      BigDecimal bigDecimalBase = BigDecimal.valueOf(Integer.MAX_VALUE + 1L);
+      for (int i = 0; i < totalNumRecords; i++) {
+        // create avro record
+        GenericData.Record record = new GenericData.Record(avroSchema);
+        record.put(DIM_NAME, "dim" + (RandomUtils.nextInt() % dimCardinality));
+        BigDecimal bigDecimalValue = bigDecimalBase.add(BigDecimal.valueOf(i));
+
+        record.put(MET_BIG_DECIMAL_BYTES, ByteBuffer.wrap(BigDecimalUtils.serialize(bigDecimalValue)));
+        record.put(MET_BIG_DECIMAL_STRING, bigDecimalValue.toPlainString());
+        record.put(MET_DOUBLE, bigDecimalValue.doubleValue());
+        record.put(MET_LONG, bigDecimalValue.longValue());
+
+        // add avro record to file
+        fileWriter.append(record);
+      }
+    }
+    return avroFile;
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws IOException {
+    dropOfflineTable(DEFAULT_TABLE_NAME);
+
+    stopServer();
+    stopBroker();
+    stopController();
+    stopZk();
+
+    FileUtils.deleteDirectory(_tempDir);
+  }
+}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/TPCHQueryIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/TPCHQueryIntegrationTest.java
new file mode 100644
index 00000000000..42065672d07
--- /dev/null
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/TPCHQueryIntegrationTest.java
@@ -0,0 +1,182 @@
+/**
+ * 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.pinot.integration.tests;
+
+import com.google.common.collect.ImmutableList;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.pinot.client.ResultSetGroup;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.tools.utils.JarUtils;
+import org.apache.pinot.util.TestUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+
+public class TPCHQueryIntegrationTest extends BaseClusterIntegrationTest {
+  private static final Map<String, String> TPCH_QUICKSTART_TABLE_RESOURCES;
+  private static final int NUM_TPCH_QUERIES = 24;
+  private static final Set<Integer> EXEMPT_QUERIES;
+
+  static {
+    TPCH_QUICKSTART_TABLE_RESOURCES = new HashMap<>();
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("orders", "examples/batch/tpch/orders");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("lineitem", "examples/batch/tpch/lineitem");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("region", "examples/batch/tpch/region");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("partsupp", "examples/batch/tpch/partsupp");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("customer", "examples/batch/tpch/customer");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("nation", "examples/batch/tpch/nation");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("part", "examples/batch/tpch/part");
+    TPCH_QUICKSTART_TABLE_RESOURCES.put("supplier", "examples/batch/tpch/supplier");
+    EXEMPT_QUERIES = new HashSet<>();
+    // The following queries fail due to lack of support for views.
+    EXEMPT_QUERIES.addAll(ImmutableList.of(15, 16, 17));
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
+
+    // Start the Pinot cluster
+    startZk();
+    startController();
+    startBroker();
+    startServer();
+
+    for (Map.Entry<String, String> tableResource : TPCH_QUICKSTART_TABLE_RESOURCES.entrySet()) {
+      File tableSegmentDir = new File(_segmentDir, tableResource.getKey());
+      File tarDir = new File(_tarDir, tableResource.getKey());
+      String tableName = tableResource.getKey();
+      URL resourceUrl = getClass().getClassLoader().getResource(tableResource.getValue());
+      Assert.assertNotNull(resourceUrl, "Unable to find resource from: " + tableResource.getValue());
+      File resourceFile;
+      if ("jar".equals(resourceUrl.getProtocol())) {
+        String[] splits = resourceUrl.getFile().split("!");
+        File tempUnpackDir = new File(_tempDir.getAbsolutePath() + File.separator + splits[1]);
+        TestUtils.ensureDirectoriesExistAndEmpty(tempUnpackDir);
+        JarUtils.copyResourcesToDirectory(splits[0], splits[1].substring(1), tempUnpackDir.getAbsolutePath());
+        resourceFile = tempUnpackDir;
+      } else {
+        resourceFile = new File(resourceUrl.getFile());
+      }
+      File dataFile = new File(resourceFile.getAbsolutePath(), "rawdata" + File.separator + tableName + ".avro");
+      Assert.assertTrue(dataFile.exists(), "Unable to load resource file from URL: " + dataFile);
+      File schemaFile = new File(resourceFile.getPath(), tableName + "_schema.json");
+      File tableFile = new File(resourceFile.getPath(), tableName + "_offline_table_config.json");
+      // Pinot
+      TestUtils.ensureDirectoriesExistAndEmpty(tableSegmentDir, tarDir);
+      Schema schema = createSchema(schemaFile);
+      addSchema(schema);
+      TableConfig tableConfig = createTableConfig(tableFile);
+      addTableConfig(tableConfig);
+      ClusterIntegrationTestUtils.buildSegmentsFromAvro(Collections.singletonList(dataFile), tableConfig, schema, 0,
+          tableSegmentDir, tarDir);
+      uploadSegments(tableName, tarDir);
+    }
+  }
+
+  @Test(dataProvider = "QueryDataProvider")
+  public void testTPCHQueries(String query) {
+    testQueriesSucceed(query);
+  }
+
+  protected void testQueriesSucceed(String query) {
+    ResultSetGroup pinotResultSetGroup = getPinotConnection().execute(query);
+    org.apache.pinot.client.ResultSet resultTableResultSet = pinotResultSetGroup.getResultSet(0);
+
+    if (CollectionUtils.isNotEmpty(pinotResultSetGroup.getExceptions())) {
+      Assert.fail(String.format(
+          "TPC-H query raised exception: %s. query: %s", pinotResultSetGroup.getExceptions().get(0), query));
+    }
+    // TODO: Enable the following 2 assertions after fixing the data so each query returns non-zero rows
+    /*
+    Assert.assertTrue(resultTableResultSet.getRowCount() > 0,
+        String.format("Expected non-zero rows for tpc-h query: %s", query));
+    Assert.assertTrue(resultTableResultSet.getColumnCount() > 0,
+        String.format("Expected non-zero columns for tpc-h query: %s", query)); */
+  }
+
+  @Override
+  protected long getCurrentCountStarResult() {
+    return getPinotConnection().execute("SELECT COUNT(*) FROM orders").getResultSet(0).getLong(0);
+  }
+
+  @Override
+  protected long getCountStarResult() {
+    return 9999L;
+  }
+
+  @Override
+  protected boolean useMultiStageQueryEngine() {
+    return true;
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws Exception {
+    // unload all TPCH tables.
+    for (String table : TPCH_QUICKSTART_TABLE_RESOURCES.keySet()) {
+      dropOfflineTable(table);
+    }
+
+    // stop components and clean up
+    stopServer();
+    stopBroker();
+    stopController();
+    stopZk();
+
+    FileUtils.deleteDirectory(_tempDir);
+  }
+
+  @DataProvider(name = "QueryDataProvider")
+  public static Object[][] queryDataProvider()
+      throws IOException {
+    Object[][] queries = new Object[NUM_TPCH_QUERIES - EXEMPT_QUERIES.size()][];
+    for (int query = 1, iter = 0; query <= NUM_TPCH_QUERIES; query++) {
+      if (EXEMPT_QUERIES.contains(query)) {
+        continue;
+      }
+      String path = String.format("tpch/%s.sql", query);
+      try (InputStream inputStream = TPCHQueryIntegrationTest.class.getClassLoader()
+          .getResourceAsStream(path)) {
+        queries[iter] = new Object[1];
+        queries[iter][0] = IOUtils.toString(Objects.requireNonNull(inputStream), Charset.defaultCharset());
+        iter++;
+      }
+    }
+    return queries;
+  }
+}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ThetaSketchIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ThetaSketchIntegrationTest.java
index 5b0171718b6..80e5ad176b2 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ThetaSketchIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ThetaSketchIntegrationTest.java
@@ -107,9 +107,10 @@ protected long getCountStarResult() {
     return 10;
   }
 
-  @Test
-  public void testThetaSketchQuery()
+  @Test(dataProvider = "useV1QueryEngine")
+  public void testThetaSketchQueryV1(boolean useMultiStageQueryEngine)
       throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
     /*
     Original data:
 
@@ -206,6 +207,152 @@ public void testThetaSketchQuery()
       runAndAssert(query, expected);
     }
 
+    // gender = female DIFF course = history
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender'' and dimValue = ''Female''', 'dimName = ''course'' and dimValue = ''History''', "
+          + "'SET_DIFF($1, $2)') from " + DEFAULT_TABLE_NAME;
+      int expected = 50 + 110 + 70 + 130;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Female''', 'dimName = ''course''', 'dimValue = ''History''', "
+          + "'SET_DIFF(SET_INTERSECT($1, $2), SET_INTERSECT($3, $4))') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+    }
+
+    // group by gender
+    {
+      String query = "select dimValue, distinctCountThetaSketch(thetaSketchCol) from " + DEFAULT_TABLE_NAME
+          + " where dimName = 'gender' group by dimValue";
+      ImmutableMap<String, Integer> expected =
+          ImmutableMap.of("Female", 50 + 60 + 70 + 110 + 120 + 130, "Male", 80 + 90 + 100 + 140 + 150 + 160);
+      runAndAssert(query, expected);
+    }
+  }
+
+  @Test(dataProvider = "useV2QueryEngine")
+  public void testThetaSketchQueryV2(boolean useMultiStageQueryEngine)
+      throws Exception {
+    setUseMultiStageQueryEngine(useMultiStageQueryEngine);
+    /*
+    Original data:
+
+    Gender    Course   Shard#1  Shard#2
+    --------  -------  -------  -------
+    Female    Math     50       110
+    Female    History  60       120
+    Female    Biology  70       130
+    Male      Math     80       140
+    Male      History  90       150
+    Male      Biology  100      160
+     */
+
+    // gender = female
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol) from " + DEFAULT_TABLE_NAME
+          + " where dimName = 'gender' and dimValue = 'Female'";
+      int expected = 50 + 60 + 70 + 110 + 120 + 130;
+      runAndAssert(query, expected);
+
+      /*
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', 'dimName = ''gender'' and dimValue = ''Female''', "
+          + "'$1') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Female''', 'SET_INTERSECT($1, $2)') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+       */
+    }
+
+    // gender = male
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol) from " + DEFAULT_TABLE_NAME
+          + " where dimName = 'gender' and dimValue = 'Male'";
+      int expected = 80 + 90 + 100 + 140 + 150 + 160;
+      runAndAssert(query, expected);
+
+      /*
+      query =
+          "select distinctCountThetaSketch(thetaSketchCol, '', 'dimName = ''gender'' and dimValue = ''Male''', '$1') "
+              + "from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Male''', 'SET_INTERSECT($1, $2)') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+       */
+    }
+
+    // course = math
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol) from " + DEFAULT_TABLE_NAME
+          + " where dimName = 'course' AND dimValue = 'Math'";
+      int expected = 50 + 80 + 110 + 140;
+      runAndAssert(query, expected);
+
+      /*
+      query =
+          "select distinctCountThetaSketch(thetaSketchCol, '', 'dimName = ''course'' and dimValue = ''Math''', '$1') "
+              + "from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''course''', 'dimValue = ''Math''', 'SET_INTERSECT($1, $2)') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+       */
+    }
+
+    /*
+    // gender = female INTERSECT course = math
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender'' and dimValue = ''Female''', 'dimName = ''course'' and dimValue = ''Math''', "
+          + "'SET_INTERSECT($1, $2)') from " + DEFAULT_TABLE_NAME;
+      int expected = 50 + 110;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Female''', 'dimName = ''course''', 'dimValue = ''Math''', "
+          + "'SET_INTERSECT($1, $2, $3, $4)') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Female''', 'dimName = ''course''', 'dimValue = ''Math''', "
+          + "'SET_INTERSECT(SET_INTERSECT($1, $2), SET_INTERSECT($3, $4))') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+    }
+
+    // gender = male UNION course = biology
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender'' and dimValue = ''Male''', 'dimName = ''course'' and dimValue = ''Biology''', "
+          + "'SET_UNION($1, $2)') from " + DEFAULT_TABLE_NAME;
+      int expected = 70 + 80 + 90 + 100 + 130 + 140 + 150 + 160;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Male''', 'dimName = ''course''', 'dimValue = ''Biology''', "
+          + "'SET_UNION(SET_INTERSECT($1, $2), SET_INTERSECT($3, $4))') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+    }
+
+    // gender = female DIFF course = history
+    {
+      String query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender'' and dimValue = ''Female''', 'dimName = ''course'' and dimValue = ''History''', "
+          + "'SET_DIFF($1, $2)') from " + DEFAULT_TABLE_NAME;
+      int expected = 50 + 110 + 70 + 130;
+      runAndAssert(query, expected);
+
+      query = "select distinctCountThetaSketch(thetaSketchCol, '', "
+          + "'dimName = ''gender''', 'dimValue = ''Female''', 'dimName = ''course''', 'dimValue = ''History''', "
+          + "'SET_DIFF(SET_INTERSECT($1, $2), SET_INTERSECT($3, $4))') from " + DEFAULT_TABLE_NAME;
+      runAndAssert(query, expected);
+    }
+     */
+
     // group by gender
     {
       String query = "select dimValue, distinctCountThetaSketch(thetaSketchCol) from " + DEFAULT_TABLE_NAME
@@ -218,7 +365,7 @@ public void testThetaSketchQuery()
 
   private void runAndAssert(String query, int expected)
       throws Exception {
-    JsonNode jsonNode = postQuery(query, _brokerBaseApiUrl);
+    JsonNode jsonNode = postQuery(query);
     int actual = Integer.parseInt(jsonNode.get("resultTable").get("rows").get(0).get(0).asText());
     assertEquals(actual, expected);
   }
@@ -226,7 +373,7 @@ private void runAndAssert(String query, int expected)
   private void runAndAssert(String query, Map<String, Integer> expectedGroupToValueMap)
       throws Exception {
     Map<String, Integer> actualGroupToValueMap = new HashMap<>();
-    JsonNode jsonNode = postQuery(query, _brokerBaseApiUrl);
+    JsonNode jsonNode = postQuery(query);
     jsonNode.get("resultTable").get("rows").forEach(node -> {
       String group = node.get(0).textValue();
       int value = node.get(1).intValue();
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertCompactionMinionClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertCompactionMinionClusterIntegrationTest.java
new file mode 100644
index 00000000000..de645ca7495
--- /dev/null
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertCompactionMinionClusterIntegrationTest.java
@@ -0,0 +1,228 @@
+/**
+ * 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.pinot.integration.tests;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.io.FileUtils;
+import org.apache.helix.task.TaskState;
+import org.apache.pinot.controller.helix.core.minion.PinotHelixTaskResourceManager;
+import org.apache.pinot.controller.helix.core.minion.PinotTaskManager;
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableTaskConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.apache.pinot.util.TestUtils;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+
+public class UpsertCompactionMinionClusterIntegrationTest extends BaseClusterIntegrationTest {
+  protected PinotHelixTaskResourceManager _helixTaskResourceManager;
+  protected PinotTaskManager _taskManager;
+  private static final String PRIMARY_KEY_COL = "clientId";
+  private static final String REALTIME_TABLE_NAME = TableNameBuilder.REALTIME.tableNameWithType(DEFAULT_TABLE_NAME);
+  private static List<File> _avroFiles;
+  private TableConfig _tableConfig;
+  private Schema _schema;
+
+  @Override
+  protected String getSchemaFileName() {
+    return "upsert_upload_segment_test.schema";
+  }
+
+  @Override
+  protected String getSchemaName() {
+    return "upsertSchema";
+  }
+
+  @Override
+  protected String getAvroTarFileName() {
+    return "upsert_compaction_test.tar.gz";
+  }
+
+  @Override
+  protected String getPartitionColumn() {
+    return PRIMARY_KEY_COL;
+  }
+
+  private TableTaskConfig getCompactionTaskConfig() {
+    Map<String, String> tableTaskConfigs = new HashMap<>();
+    tableTaskConfigs.put(MinionConstants.UpsertCompactionTask.BUFFER_TIME_PERIOD_KEY, "0d");
+    tableTaskConfigs.put(MinionConstants.UpsertCompactionTask.INVALID_RECORDS_THRESHOLD_PERCENT, "1");
+    tableTaskConfigs.put(MinionConstants.UpsertCompactionTask.INVALID_RECORDS_THRESHOLD_COUNT, "10");
+    return new TableTaskConfig(
+        Collections.singletonMap(MinionConstants.UpsertCompactionTask.TASK_TYPE, tableTaskConfigs));
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
+
+    // Start the Pinot cluster
+    startZk();
+    startController();
+    startBroker();
+    startServers(1);
+
+    // Unpack the Avro files
+    _avroFiles = unpackAvroData(_tempDir);
+
+    startKafka();
+
+    // Create and upload the schema and table config
+    _schema = createSchema();
+    addSchema(_schema);
+    _tableConfig = createUpsertTableConfig(_avroFiles.get(0), PRIMARY_KEY_COL, null, getNumKafkaPartitions());
+    _tableConfig.setTaskConfig(getCompactionTaskConfig());
+    addTableConfig(_tableConfig);
+
+    ClusterIntegrationTestUtils.buildSegmentsFromAvro(_avroFiles, _tableConfig, _schema, 0, _segmentDir, _tarDir);
+
+    startMinion();
+    _helixTaskResourceManager = _controllerStarter.getHelixTaskResourceManager();
+    _taskManager = _controllerStarter.getTaskManager();
+  }
+
+  @BeforeMethod
+  public void beforeMethod()
+      throws Exception {
+    // Create and upload segments
+    uploadSegments(getTableName(), TableType.REALTIME, _tarDir);
+  }
+
+  protected void waitForAllDocsLoaded(long timeoutMs, long expectedCount)
+      throws Exception {
+    TestUtils.waitForCondition(aVoid -> {
+      try {
+        return getCurrentCountStarResultWithoutUpsert() == expectedCount;
+      } catch (Exception e) {
+        return null;
+      }
+    }, 100L, timeoutMs, "Failed to load all documents");
+    assertEquals(getCurrentCountStarResult(), getCountStarResult());
+  }
+
+  private long getCurrentCountStarResultWithoutUpsert() {
+    return getPinotConnection().execute("SELECT COUNT(*) FROM " + getTableName() + " OPTION(skipUpsert=true)")
+        .getResultSet(0).getLong(0);
+  }
+
+  private long getSalary() {
+    return getPinotConnection().execute("SELECT salary FROM " + getTableName() + " WHERE clientId=100001")
+        .getResultSet(0).getLong(0);
+  }
+
+  @Override
+  protected long getCountStarResult() {
+    return 3;
+  }
+
+  @AfterMethod
+  public void afterMethod()
+      throws Exception {
+    String realtimeTableName = TableNameBuilder.REALTIME.tableNameWithType(getTableName());
+
+    // Test dropping all segments one by one
+    List<String> segments = listSegments(realtimeTableName);
+    assertFalse(segments.isEmpty());
+    for (String segment : segments) {
+      dropSegment(realtimeTableName, segment);
+    }
+    // NOTE: There is a delay to remove the segment from property store
+    TestUtils.waitForCondition((aVoid) -> {
+      try {
+        return listSegments(realtimeTableName).isEmpty();
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }, 60_000L, "Failed to drop the segments");
+
+    stopServer();
+    startServers(1);
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws IOException {
+    String realtimeTableName = TableNameBuilder.REALTIME.tableNameWithType(getTableName());
+    dropRealtimeTable(realtimeTableName);
+    stopMinion();
+    stopServer();
+    stopBroker();
+    stopController();
+    stopKafka();
+    stopZk();
+    FileUtils.deleteDirectory(_tempDir);
+  }
+
+  @Test
+  public void testCompaction()
+      throws Exception {
+    waitForAllDocsLoaded(600_000L, 283);
+    assertEquals(getSalary(), 9747108);
+
+    assertNotNull(_taskManager.scheduleTasks(REALTIME_TABLE_NAME).get(MinionConstants.UpsertCompactionTask.TASK_TYPE));
+    waitForTaskToComplete();
+    waitForAllDocsLoaded(600_000L, 3);
+    assertEquals(getSalary(), 9747108);
+  }
+
+  @Test
+  public void testCompactionDeletesSegments()
+      throws Exception {
+    pushAvroIntoKafka(_avroFiles);
+    // Wait for all documents loaded
+    waitForAllDocsLoaded(600_000L, 566);
+    assertEquals(getSalary(), 9747108);
+
+    assertNull(_taskManager.scheduleTasks(REALTIME_TABLE_NAME).get(MinionConstants.UpsertCompactionTask.TASK_TYPE));
+    waitForTaskToComplete();
+    waitForAllDocsLoaded(600_000L, 283);
+    assertEquals(getSalary(), 9747108);
+  }
+
+  protected void waitForTaskToComplete() {
+    TestUtils.waitForCondition(input -> {
+      // Check task state
+      for (TaskState taskState : _helixTaskResourceManager.getTaskStates(MinionConstants.UpsertCompactionTask.TASK_TYPE)
+          .values()) {
+        if (taskState != TaskState.COMPLETED) {
+          return false;
+        }
+      }
+      return true;
+    }, 600_000L, "Failed to complete task");
+  }
+}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableIntegrationTest.java
new file mode 100644
index 00000000000..a9aac6e37cd
--- /dev/null
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableIntegrationTest.java
@@ -0,0 +1,373 @@
+/**
+ * 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.pinot.integration.tests;
+
+import com.google.common.collect.ImmutableList;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.client.ResultSet;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.UpsertConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.apache.pinot.util.TestUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+
+/**
+ * Input data - Scores of players
+ * Schema
+ *  - Dimension fields: playerId:int (primary key), name:string, game:string, deleted:boolean
+ *  - Metric fields: score:float
+ *  - DataTime fields: timestampInEpoch:long
+ */
+public class UpsertTableIntegrationTest extends BaseClusterIntegrationTestSet {
+  private static final String INPUT_DATA_TAR_FILE = "gameScores_csv.tar.gz";
+  private static final String CSV_SCHEMA_HEADER = "playerId,name,game,score,timestampInEpoch,deleted";
+  private static final String PARTIAL_UPSERT_TABLE_SCHEMA = "partial_upsert_table_test.schema";
+  private static final String CSV_DELIMITER = ",";
+  private static final String TABLE_NAME = "gameScores";
+  private static final int NUM_SERVERS = 2;
+  private static final String PRIMARY_KEY_COL = "playerId";
+  protected static final String DELETE_COL = "deleted";
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir);
+
+    // Start the Pinot cluster
+    startZk();
+    // Start a customized controller with more frequent realtime segment validation
+    startController();
+    startBroker();
+    startServers(NUM_SERVERS);
+
+    // Start Kafka and push data into Kafka
+    startKafka();
+
+    List<File> unpackDataFiles = unpackTarData(INPUT_DATA_TAR_FILE, _tempDir);
+    pushCsvIntoKafka(unpackDataFiles.get(0), getKafkaTopic(), 0);  // TODO: Fix
+
+    // Create and upload schema and table config
+    Schema schema = createSchema();
+    addSchema(schema);
+
+    Map<String, String> csvDecoderProperties = getCSVDecoderProperties(CSV_DELIMITER, CSV_SCHEMA_HEADER);
+    TableConfig tableConfig = createCSVUpsertTableConfig(getTableName(), getSchemaName(), getKafkaTopic(),
+        getNumKafkaPartitions(), csvDecoderProperties, null, PRIMARY_KEY_COL);
+    addTableConfig(tableConfig);
+
+    // Wait for all documents loaded
+    waitForAllDocsLoaded(600_000L);
+
+    // Create partial upsert table schema
+    Schema partialUpsertSchema = createSchema(PARTIAL_UPSERT_TABLE_SCHEMA);
+    addSchema(partialUpsertSchema);
+  }
+
+  @AfterClass
+  public void tearDown()
+      throws IOException {
+    String realtimeTableName = TableNameBuilder.REALTIME.tableNameWithType(getTableName());
+    dropRealtimeTable(realtimeTableName);
+    stopServer();
+    stopBroker();
+    stopController();
+    stopKafka();
+    stopZk();
+    FileUtils.deleteDirectory(_tempDir);
+  }
+
+  @Override
+  protected String getSchemaFileName() {
+    return "upsert_table_test.schema";
+  }
+
+  @Override
+  protected String getSchemaName() {
+    return "playerScores";
+  }
+
+  @Nullable
+  @Override
+  protected String getTimeColumnName() {
+    return "timestampInEpoch";
+  }
+
+  @Override
+  protected String getPartitionColumn() {
+    return PRIMARY_KEY_COL;
+  }
+
+  @Override
+  protected String getTableName() {
+    return TABLE_NAME;
+  }
+
+  @Override
+  protected long getCountStarResult() {
+    // Three distinct records are expected with pk values of 100, 101, 102
+    return 3;
+  }
+
+  private Schema createSchema(String schemaFileName)
+      throws IOException {
+    InputStream inputStream =
+        BaseClusterIntegrationTest.class.getClassLoader().getResourceAsStream(schemaFileName);
+    Assert.assertNotNull(inputStream);
+    return Schema.fromInputStream(inputStream);
+  }
+  private long queryCountStarWithoutUpsert(String tableName) {
+    return getPinotConnection().execute("SELECT COUNT(*) FROM " + tableName + " OPTION(skipUpsert=true)")
+        .getResultSet(0).getLong(0);
+  }
+
+  private long getCountStarResultWithoutUpsert() {
+    return 10;
+  }
+
+  @Override
+  protected void waitForAllDocsLoaded(long timeoutMs)
+      throws Exception {
+    TestUtils.waitForCondition(aVoid -> {
+      try {
+        return queryCountStarWithoutUpsert(getTableName()) == getCountStarResultWithoutUpsert();
+      } catch (Exception e) {
+        return null;
+      }
+    }, 100L, timeoutMs, "Failed to load all documents");
+    assertEquals(getCurrentCountStarResult(), getCountStarResult());
+  }
+
+  @Test
+  protected void testDeleteWithFullUpsert()
+      throws Exception {
+    final UpsertConfig upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setDeleteRecordColumn(DELETE_COL);
+
+    testDeleteWithFullUpsert(getKafkaTopic() + "-with-deletes", "gameScoresWithDelete", upsertConfig);
+  }
+
+  protected void testDeleteWithFullUpsert(String kafkaTopicName, String tableName, UpsertConfig upsertConfig)
+      throws Exception {
+    // SETUP
+    // Create table with delete Record column
+    Map<String, String> csvDecoderProperties = getCSVDecoderProperties(CSV_DELIMITER, CSV_SCHEMA_HEADER);
+    TableConfig tableConfig = createCSVUpsertTableConfig(tableName, getSchemaName(), kafkaTopicName,
+        getNumKafkaPartitions(), csvDecoderProperties, upsertConfig, PRIMARY_KEY_COL);
+    addTableConfig(tableConfig);
+
+    // Push initial 10 upsert records - 3 pks 100, 101 and 102
+    List<File> dataFiles = unpackTarData(INPUT_DATA_TAR_FILE, _tempDir);
+    pushCsvIntoKafka(dataFiles.get(0), kafkaTopicName, 0);
+
+    // TEST 1: Delete existing primary key
+    // Push 2 records with deleted = true - deletes pks 100 and 102
+    List<String> deleteRecords = ImmutableList.of("102,Clifford,counter-strike,102,1681054200000,true",
+        "100,Zook,counter-strike,2050,1681377200000,true");
+    pushCsvIntoKafka(deleteRecords, kafkaTopicName, 0);
+
+    // Wait for all docs (12 with skipUpsert=true) to be loaded
+    TestUtils.waitForCondition(aVoid -> {
+      try {
+        return queryCountStarWithoutUpsert(tableName) == 12;
+      } catch (Exception e) {
+        return null;
+      }
+    }, 100L, 600_000L, "Failed to load all upsert records for testDeleteWithFullUpsert");
+
+    // Query for number of records in the table - should only return 1
+    ResultSet rs = getPinotConnection().execute("SELECT * FROM " + tableName).getResultSet(0);
+    Assert.assertEquals(rs.getRowCount(), 1);
+
+    // pk 101 - not deleted - only record available
+    int columnCount = rs.getColumnCount();
+    int playerIdColumnIndex = -1;
+    for (int i = 0; i < columnCount; i++) {
+      String columnName = rs.getColumnName(i);
+      if ("playerId".equalsIgnoreCase(columnName)) {
+        playerIdColumnIndex = i;
+        break;
+      }
+    }
+    Assert.assertNotEquals(playerIdColumnIndex, -1);
+    Assert.assertEquals(rs.getString(0, playerIdColumnIndex), "101");
+
+    // Validate deleted records
+    rs = getPinotConnection()
+        .execute("SELECT playerId FROM " + tableName
+            + " WHERE deleted = true OPTION(skipUpsert=true)").getResultSet(0);
+    Assert.assertEquals(rs.getRowCount(), 2);
+    for (int i = 0; i < rs.getRowCount(); i++) {
+      String playerId = rs.getString(i, 0);
+      Assert.assertTrue("100".equalsIgnoreCase(playerId) || "102".equalsIgnoreCase(playerId));
+    }
+
+    // TEST 2: Revive a previously deleted primary key
+    // Revive pk - 100 by adding a record with a newer timestamp
+    List<String> revivedRecord = Collections.singletonList("100,Zook-New,,0.0,1684707335000,false");
+    pushCsvIntoKafka(revivedRecord, kafkaTopicName, 0);
+    // Wait for the new record (13 with skipUpsert=true) to be indexed
+    TestUtils.waitForCondition(aVoid -> {
+      try {
+        return queryCountStarWithoutUpsert(tableName) == 13;
+      } catch (Exception e) {
+        return null;
+      }
+    }, 100L, 600_000L, "Failed to load all upsert records for testDeleteWithFullUpsert");
+
+
+    // Validate: pk is queryable and all columns are overwritten with new value
+    rs = getPinotConnection()
+        .execute("SELECT playerId, name, game FROM " + tableName + " WHERE playerId = 100").getResultSet(0);
+    Assert.assertEquals(rs.getRowCount(), 1);
+    Assert.assertEquals(rs.getInt(0, 0), 100);
+    Assert.assertEquals(rs.getString(0, 1), "Zook-New");
+    Assert.assertEquals(rs.getString(0, 2), "null");
+
+    // Validate: pk lineage still exists
+    rs = getPinotConnection()
+        .execute("SELECT playerId, name FROM " + tableName
+            + " WHERE playerId = 100 OPTION(skipUpsert=true)").getResultSet(0);
+
+    Assert.assertTrue(rs.getRowCount() > 1);
+
+    // TEARDOWN
+    dropRealtimeTable(tableName);
+  }
+
+  @Test
+  public void testDeleteWithPartialUpsert()
+      throws Exception {
+    final UpsertConfig upsertConfig = new UpsertConfig(UpsertConfig.Mode.PARTIAL);
+    upsertConfig.setDeleteRecordColumn(DELETE_COL);
+
+    testDeleteWithPartialUpsert(getKafkaTopic() + "-partial-upsert-with-deletes",
+        "gameScoresPartialUpsertWithDelete", upsertConfig);
+  }
+
+  protected void testDeleteWithPartialUpsert(String kafkaTopicName, String tableName, UpsertConfig upsertConfig)
+      throws Exception {
+    final String partialUpsertSchemaName = "playerScoresPartialUpsert";
+    final String inputDataTarFile = "gameScores_partial_upsert_csv.tar.gz";
+
+    Map<String, UpsertConfig.Strategy> partialUpsertStrategies = new HashMap<>();
+    partialUpsertStrategies.put("game", UpsertConfig.Strategy.UNION);
+    partialUpsertStrategies.put("score", UpsertConfig.Strategy.INCREMENT);
+    partialUpsertStrategies.put(DELETE_COL, UpsertConfig.Strategy.OVERWRITE);
+    upsertConfig.setPartialUpsertStrategies(partialUpsertStrategies);
+
+    // Create table with delete Record column
+    Map<String, String> csvDecoderProperties = getCSVDecoderProperties(CSV_DELIMITER, CSV_SCHEMA_HEADER);
+    TableConfig tableConfig = createCSVUpsertTableConfig(tableName, partialUpsertSchemaName, kafkaTopicName,
+        getNumKafkaPartitions(), csvDecoderProperties, upsertConfig, PRIMARY_KEY_COL);
+    addTableConfig(tableConfig);
+
+    // Push initial 10 upsert records - 3 pks 100, 101 and 102
+    List<File> dataFiles = unpackTarData(inputDataTarFile, _tempDir);
+    pushCsvIntoKafka(dataFiles.get(0), kafkaTopicName, 0);
+
+    // TEST 1: Delete existing primary key
+    // Push 2 records with deleted = true - deletes pks 100 and 102
+    List<String> deleteRecords = ImmutableList.of("102,Clifford,counter-strike,102,1681054200000,true",
+        "100,Zook,counter-strike,2050,1681377200000,true");
+    pushCsvIntoKafka(deleteRecords, kafkaTopicName, 0);
+
+    // Wait for all docs (12 with skipUpsert=true) to be loaded
+    TestUtils.waitForCondition(aVoid -> {
+      try {
+        return queryCountStarWithoutUpsert(tableName) == 12;
+      } catch (Exception e) {
+        return null;
+      }
+    }, 100L, 600_000L, "Failed to load all upsert records for testDeleteWithFullUpsert");
+
+    // Query for number of records in the table - should only return 1
+    ResultSet rs = getPinotConnection().execute("SELECT * FROM " + tableName).getResultSet(0);
+    Assert.assertEquals(rs.getRowCount(), 1);
+
+    // pk 101 - not deleted - only record available
+    int columnCount = rs.getColumnCount();
+    int playerIdColumnIndex = -1;
+    for (int i = 0; i < columnCount; i++) {
+      String columnName = rs.getColumnName(i);
+      if ("playerId".equalsIgnoreCase(columnName)) {
+        playerIdColumnIndex = i;
+        break;
+      }
+    }
+    Assert.assertNotEquals(playerIdColumnIndex, -1);
+    Assert.assertEquals(rs.getString(0, playerIdColumnIndex), "101");
+
+    // Validate deleted records
+    rs = getPinotConnection()
+        .execute("SELECT playerId FROM " + tableName
+            + " WHERE deleted = true OPTION(skipUpsert=true)").getResultSet(0);
+    Assert.assertEquals(rs.getRowCount(), 2);
+    for (int i = 0; i < rs.getRowCount(); i++) {
+      String playerId = rs.getString(i, 0);
+      Assert.assertTrue("100".equalsIgnoreCase(playerId) || "102".equalsIgnoreCase(playerId));
+    }
+
+    // TEST 2: Revive a previously deleted primary key
+    // Revive pk - 100 by adding a record with a newer timestamp
+    List<String> revivedRecord = Collections.singletonList("100,Zook,,0.0,1684707335000,false");
+    pushCsvIntoKafka(revivedRecord, kafkaTopicName, 0);
+    // Wait for the new record (13 with skipUpsert=true) to be indexed
+    TestUtils.waitForCondition(aVoid -> {
+      try {
+        return queryCountStarWithoutUpsert(tableName) == 13;
+      } catch (Exception e) {
+        return null;
+      }
+    }, 100L, 600_000L, "Failed to load all upsert records for testDeleteWithFullUpsert");
+
+    // Validate: pk is queryable and all columns are overwritten with new value
+    rs = getPinotConnection()
+        .execute("SELECT playerId, name, game FROM " + tableName
+            + " WHERE playerId = 100").getResultSet(0);
+    Assert.assertEquals(rs.getRowCount(), 1);
+    Assert.assertEquals(rs.getInt(0, 0), 100);
+    Assert.assertEquals(rs.getString(0, 1), "Zook");
+    Assert.assertEquals(rs.getString(0, 2), "[\"null\"]");
+
+    // Validate: pk lineage still exists
+    rs = getPinotConnection()
+        .execute("SELECT playerId, name FROM " + tableName
+            + " WHERE playerId = 100 OPTION(skipUpsert=true)").getResultSet(0);
+
+    Assert.assertTrue(rs.getRowCount() > 1);
+
+    // TEARDOWN
+    dropRealtimeTable(tableName);
+  }
+}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableSegmentUploadIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableSegmentUploadIntegrationTest.java
index e7966e3608b..7fddd5e43c6 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableSegmentUploadIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/UpsertTableSegmentUploadIntegrationTest.java
@@ -74,7 +74,7 @@ public void setUp()
     // Create and upload schema and table config
     Schema schema = createSchema();
     addSchema(schema);
-    TableConfig tableConfig = createUpsertTableConfig(avroFiles.get(0), PRIMARY_KEY_COL, getNumKafkaPartitions());
+    TableConfig tableConfig = createUpsertTableConfig(avroFiles.get(0), PRIMARY_KEY_COL, null, getNumKafkaPartitions());
     addTableConfig(tableConfig);
 
     // Create and upload segments
@@ -116,7 +116,7 @@ public void tearDown()
 
   @Override
   protected String getSchemaFileName() {
-    return "upsert_table_test.schema";
+    return "upsert_upload_segment_test.schema";
   }
 
   @Override
@@ -126,7 +126,7 @@ protected String getSchemaName() {
 
   @Override
   protected String getAvroTarFileName() {
-    return "upsert_test.tar.gz";
+    return "upsert_upload_segment_test.tar.gz";
   }
 
   @Override
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/startree/StarTreeQueryGenerator.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/startree/StarTreeQueryGenerator.java
index 81a8ff13353..827aaa7245a 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/startree/StarTreeQueryGenerator.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/startree/StarTreeQueryGenerator.java
@@ -51,7 +51,6 @@ public class StarTreeQueryGenerator {
   private static final int MAX_NUM_GROUP_BYS = 3;
   private static final int MAX_NUM_IN_VALUES = 5;
   private static final int SHUFFLE_THRESHOLD = 5 * MAX_NUM_IN_VALUES;
-  private static final Random RANDOM = new Random();
   // Add more comparators here to generate them in the 'WHERE' clause.
   private static final List<String> COMPARATORS = Arrays.asList("=", "<>", "<", ">", "<=", ">=");
 
@@ -60,14 +59,16 @@ public class StarTreeQueryGenerator {
   private final List<String> _metricColumns;
   private final Map<String, List<Object>> _singleValueDimensionValuesMap;
   private final List<String> _aggregationFunctions;
+  private final Random _random;
 
   public StarTreeQueryGenerator(String tableName, List<String> singleValueDimensionColumns, List<String> metricColumns,
-      Map<String, List<Object>> singleValueDimensionValuesMap, List<String> aggregationFunctions) {
+      Map<String, List<Object>> singleValueDimensionValuesMap, List<String> aggregationFunctions, Random random) {
     _tableName = tableName;
     _singleValueDimensionColumns = singleValueDimensionColumns;
     _metricColumns = metricColumns;
     _singleValueDimensionValuesMap = singleValueDimensionValuesMap;
     _aggregationFunctions = aggregationFunctions;
+    _random = random;
   }
 
   /**
@@ -77,7 +78,7 @@ public StarTreeQueryGenerator(String tableName, List<String> singleValueDimensio
    * @return aggregation function.
    */
   private String generateAggregation(String metricColumn) {
-    return String.format("%s(%s)", _aggregationFunctions.get(RANDOM.nextInt(_aggregationFunctions.size())),
+    return String.format("%s(%s)", _aggregationFunctions.get(_random.nextInt(_aggregationFunctions.size())),
         metricColumn);
   }
 
@@ -87,11 +88,11 @@ private String generateAggregation(String metricColumn) {
    * @return aggregation section.
    */
   private String generateAggregations() {
-    int numAggregations = RANDOM.nextInt(MAX_NUM_AGGREGATIONS) + 1;
+    int numAggregations = _random.nextInt(MAX_NUM_AGGREGATIONS) + 1;
     int numMetrics = _metricColumns.size();
     String[] aggregations = new String[numAggregations];
     for (int i = 0; i < numAggregations; i++) {
-      aggregations[i] = generateAggregation(_metricColumns.get(RANDOM.nextInt(numMetrics)));
+      aggregations[i] = generateAggregation(_metricColumns.get(_random.nextInt(numMetrics)));
     }
     return StringUtils.join(aggregations, ", ");
   }
@@ -105,10 +106,10 @@ private String generateAggregations() {
   private String generateComparisonPredicate(String dimensionColumn) {
     StringBuilder stringBuilder = new StringBuilder(dimensionColumn);
 
-    stringBuilder.append(' ').append(COMPARATORS.get(RANDOM.nextInt(COMPARATORS.size()))).append(' ');
+    stringBuilder.append(' ').append(COMPARATORS.get(_random.nextInt(COMPARATORS.size()))).append(' ');
 
     List<Object> valueArray = _singleValueDimensionValuesMap.get(dimensionColumn);
-    Object value = valueArray.get(RANDOM.nextInt(valueArray.size()));
+    Object value = valueArray.get(_random.nextInt(valueArray.size()));
     if (value instanceof String) {
       stringBuilder.append('\'').append(((String) value).replaceAll("'", "''")).append('\'');
     } else {
@@ -128,8 +129,8 @@ private String generateBetweenPredicate(String dimensionColumn) {
     StringBuilder stringBuilder = new StringBuilder(dimensionColumn).append(BETWEEN);
 
     List<Object> valueArray = _singleValueDimensionValuesMap.get(dimensionColumn);
-    Object value1 = valueArray.get(RANDOM.nextInt(valueArray.size()));
-    Object value2 = valueArray.get(RANDOM.nextInt(valueArray.size()));
+    Object value1 = valueArray.get(_random.nextInt(valueArray.size()));
+    Object value2 = valueArray.get(_random.nextInt(valueArray.size()));
 
     Preconditions.checkState((value1 instanceof String && value2 instanceof String) || (value1 instanceof Number
         && value2 instanceof Number));
@@ -163,7 +164,7 @@ private String generateBetweenPredicate(String dimensionColumn) {
    */
   private String generateInPredicate(String dimensionColumn) {
     StringBuilder stringBuilder = new StringBuilder(dimensionColumn);
-    if (RANDOM.nextBoolean()) {
+    if (_random.nextBoolean()) {
       stringBuilder.append(IN).append('(');
     } else {
       stringBuilder.append(NOT_IN).append('(');
@@ -171,7 +172,7 @@ private String generateInPredicate(String dimensionColumn) {
 
     List<Object> valueArray = _singleValueDimensionValuesMap.get(dimensionColumn);
     int size = valueArray.size();
-    int numValues = Math.min(RANDOM.nextInt(MAX_NUM_IN_VALUES) + 1, size);
+    int numValues = Math.min(_random.nextInt(MAX_NUM_IN_VALUES) + 1, size);
     if (size < SHUFFLE_THRESHOLD) {
       // For smaller size values, use shuffle strategy.
       Collections.shuffle(valueArray);
@@ -190,7 +191,7 @@ private String generateInPredicate(String dimensionColumn) {
       // For larger size values, use random indices strategy.
       Set<Integer> indices = new HashSet<>();
       while (indices.size() < numValues) {
-        indices.add(RANDOM.nextInt(size));
+        indices.add(_random.nextInt(size));
       }
       boolean isFirst = true;
       for (int index : indices) {
@@ -218,7 +219,7 @@ private String generateInPredicate(String dimensionColumn) {
    */
   @Nullable
   private String generatePredicates() {
-    int numPredicates = RANDOM.nextInt(MAX_NUM_PREDICATES + 1);
+    int numPredicates = _random.nextInt(MAX_NUM_PREDICATES + 1);
     if (numPredicates == 0) {
       return null;
     }
@@ -230,8 +231,8 @@ private String generatePredicates() {
       if (i != 0) {
         stringBuilder.append(AND);
       }
-      String dimensionName = _singleValueDimensionColumns.get(RANDOM.nextInt(numDimensions));
-      switch (RANDOM.nextInt(3)) {
+      String dimensionName = _singleValueDimensionColumns.get(_random.nextInt(numDimensions));
+      switch (_random.nextInt(3)) {
         case 0:
           stringBuilder.append(generateComparisonPredicate(dimensionName));
           break;
@@ -251,7 +252,7 @@ private String generatePredicates() {
    * Randomly generate the group-by columns, may return {@code null}.
    */
   private String generateGroupByColumns() {
-    int numColumns = RANDOM.nextInt(MAX_NUM_GROUP_BYS + 1);
+    int numColumns = _random.nextInt(MAX_NUM_GROUP_BYS + 1);
     if (numColumns == 0) {
       return null;
     }
diff --git a/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_10K.sql b/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_10K.sql
index 6d561433a9a..d122c93e1b8 100644
--- a/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_10K.sql
+++ b/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_10K.sql
@@ -19,8 +19,8 @@
 
 {"sql":"SELECT DivReachedDest, FirstDepTime, DepDelayMinutes FROM mytable WHERE DestState IN ('VI', 'UT', 'VA') OR ArrTime < 806 ORDER BY OriginAirportSeqID, ArrivalDelayGroups LIMIT 10"}
 {"sql":"SELECT DistanceGroup, Carrier, DepTime FROM mytable WHERE Cancelled IN (1, 0) AND Flights BETWEEN 1 AND 1 OR TaxiOut <> 32 LIMIT 7"}
-{"sql":"SELECT ActualElapsedTime, CancellationCode, DivArrDelay, MIN(\"Month\"), AVG(DivAirportLandings) FROM mytable WHERE DayofMonth BETWEEN 12 AND 24 GROUP BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 29","hsqls":["SELECT ActualElapsedTime, CancellationCode, DivArrDelay, MIN(Month), AVG(DivAirportLandings) FROM mytable WHERE DayofMonth BETWEEN 12 AND 24 GROUP BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 29"]}
-{"sql":"SELECT Diverted, FlightDate, OriginStateName FROM mytable WHERE Diverted < 1 AND DivTailNums BETWEEN 'N8320J' AND 'N233SW' LIMIT 1","hsqls":["SELECT Diverted, FlightDate, OriginStateName FROM mytable WHERE Diverted < 1 AND (DivTailNums__MV0 BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums__MV1 BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums__MV2 BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums__MV3 BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums__MV4 BETWEEN 'N8320J' AND 'N233SW') LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, CancellationCode, DivArrDelay, MIN(\"Month\"), AVG(DivAirportLandings) FROM mytable WHERE DayofMonth BETWEEN 12 AND 24 GROUP BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 29","hsqls":["SELECT ActualElapsedTime, CancellationCode, DivArrDelay, MIN(`Month`), AVG(DivAirportLandings) FROM mytable WHERE DayofMonth BETWEEN 12 AND 24 GROUP BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 29"]}
+{"sql":"SELECT Diverted, FlightDate, OriginStateName FROM mytable WHERE Diverted < 1 AND DivTailNums BETWEEN 'N8320J' AND 'N233SW' LIMIT 1","hsqls":["SELECT Diverted, FlightDate, OriginStateName FROM mytable WHERE Diverted < 1 AND (DivTailNums[1] BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums[2] BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums[3] BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums[4] BETWEEN 'N8320J' AND 'N233SW' OR DivTailNums[5] BETWEEN 'N8320J' AND 'N233SW') LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, MIN(DepartureDelayGroups), COUNT(DivDistance) FROM mytable GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 6","hsqls":["SELECT DestAirportID, MIN(DepartureDelayGroups), COUNT(DivDistance) FROM mytable GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 6"]}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE FlightNum <= 1881 AND TailNum < 'N3JLAA' ORDER BY DaysSinceEpoch LIMIT 10"}
 {"sql":"SELECT DestWac FROM mytable WHERE NASDelay BETWEEN 226 AND 69 AND Quarter <= 1 ORDER BY DivDistance, ArrDelayMinutes LIMIT 11"}
@@ -28,93 +28,93 @@
 {"sql":"SELECT DivAirportLandings FROM mytable ORDER BY OriginAirportSeqID, OriginWac, AirTime LIMIT 6"}
 {"sql":"SELECT ActualElapsedTime FROM mytable"}
 {"sql":"SELECT TailNum FROM mytable LIMIT 15"}
-{"sql":"SELECT DivDistance, CRSArrTime, OriginStateName, MIN(Diverted), SUM(OriginWac) FROM mytable WHERE DivAirportIDs IN (13830, 10397) GROUP BY DivDistance, CRSArrTime, OriginStateName LIMIT 11","hsqls":["SELECT DivDistance, CRSArrTime, OriginStateName, MIN(Diverted), SUM(OriginWac) FROM mytable WHERE (DivAirportIDs__MV0 IN (13830, 10397) OR DivAirportIDs__MV1 IN (13830, 10397) OR DivAirportIDs__MV2 IN (13830, 10397) OR DivAirportIDs__MV3 IN (13830, 10397) OR DivAirportIDs__MV4 IN (13830, 10397)) GROUP BY DivDistance, CRSArrTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivDistance, CRSArrTime, OriginStateName, MIN(Diverted), SUM(OriginWac) FROM mytable WHERE DivAirportIDs IN (13830, 10397) GROUP BY DivDistance, CRSArrTime, OriginStateName LIMIT 11","hsqls":["SELECT DivDistance, CRSArrTime, OriginStateName, MIN(Diverted), SUM(OriginWac) FROM mytable WHERE (ARRAY_CONTAINS(DivAirportIDs, 13830) OR ARRAY_CONTAINS(DivAirportIDs, 10397)) GROUP BY DivDistance, CRSArrTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, OriginWac, UniqueCarrier, MIN(NASDelay) FROM mytable WHERE CRSElapsedTime IN (352, 339, 187) OR TaxiIn IN (43, 47) OR OriginAirportID BETWEEN 11278 AND 13424 GROUP BY WheelsOff, OriginWac, UniqueCarrier  ORDER BY WheelsOff, OriginWac, UniqueCarrier LIMIT 7","hsqls":["SELECT WheelsOff, OriginWac, UniqueCarrier, MIN(NASDelay) FROM mytable WHERE CRSElapsedTime IN (352, 339, 187) OR TaxiIn IN (43, 47) OR OriginAirportID BETWEEN 11278 AND 13424 GROUP BY WheelsOff, OriginWac, UniqueCarrier  ORDER BY WheelsOff, OriginWac, UniqueCarrier LIMIT 7"]}
 {"sql":"SELECT SecurityDelay, MAX(LongestAddGTime), COUNT(TotalAddGTime), AVG(WheelsOff) FROM mytable WHERE DestAirportID < 10157 OR DivDistance BETWEEN 170 AND 24 OR WheelsOff BETWEEN 559 AND 1713 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 20","hsqls":["SELECT SecurityDelay, MAX(LongestAddGTime), COUNT(TotalAddGTime), AVG(WheelsOff) FROM mytable WHERE DestAirportID < 10157 OR DivDistance BETWEEN 170 AND 24 OR WheelsOff BETWEEN 559 AND 1713 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 20"]}
-{"sql":"SELECT OriginStateFips, DestCityMarketID, DayOfWeek, MIN(DivReachedDest) FROM mytable WHERE OriginCityName BETWEEN 'Midland/Odessa, TX' AND 'Santa Barbara, CA' AND DivWheelsOffs BETWEEN 58 AND 1321 AND Cancelled > 1 GROUP BY OriginStateFips, DestCityMarketID, DayOfWeek LIMIT 24","hsqls":["SELECT OriginStateFips, DestCityMarketID, DayOfWeek, MIN(DivReachedDest) FROM mytable WHERE OriginCityName BETWEEN 'Midland/Odessa, TX' AND 'Santa Barbara, CA' AND (DivWheelsOffs__MV0 BETWEEN 58 AND 1321 OR DivWheelsOffs__MV1 BETWEEN 58 AND 1321 OR DivWheelsOffs__MV2 BETWEEN 58 AND 1321 OR DivWheelsOffs__MV3 BETWEEN 58 AND 1321 OR DivWheelsOffs__MV4 BETWEEN 58 AND 1321) AND Cancelled > 1 GROUP BY OriginStateFips, DestCityMarketID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DestCityMarketID, DayOfWeek, MIN(DivReachedDest) FROM mytable WHERE OriginCityName BETWEEN 'Midland/Odessa, TX' AND 'Santa Barbara, CA' AND DivWheelsOffs BETWEEN 58 AND 1321 AND Cancelled > 1 GROUP BY OriginStateFips, DestCityMarketID, DayOfWeek LIMIT 24","hsqls":["SELECT OriginStateFips, DestCityMarketID, DayOfWeek, MIN(DivReachedDest) FROM mytable WHERE OriginCityName BETWEEN 'Midland/Odessa, TX' AND 'Santa Barbara, CA' AND (DivWheelsOffs[1] BETWEEN 58 AND 1321 OR DivWheelsOffs[2] BETWEEN 58 AND 1321 OR DivWheelsOffs[3] BETWEEN 58 AND 1321 OR DivWheelsOffs[4] BETWEEN 58 AND 1321 OR DivWheelsOffs[5] BETWEEN 58 AND 1321) AND Cancelled > 1 GROUP BY OriginStateFips, DestCityMarketID, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DivActualElapsedTime FROM mytable WHERE DivAirportLandings <= 1 LIMIT 7"}
 {"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE AirTime > 202 AND DestStateName BETWEEN 'Louisiana' AND 'Alaska' LIMIT 7"}
 {"sql":"SELECT OriginStateFips, FlightNum, AVG(DestAirportSeqID), MAX(Quarter), AVG(WheelsOff) FROM mytable WHERE WeatherDelay <> 27 OR ArrDelay = 238.0 OR CRSDepTime = 1332 GROUP BY OriginStateFips, FlightNum  ORDER BY OriginStateFips, FlightNum LIMIT 28","hsqls":["SELECT OriginStateFips, FlightNum, AVG(DestAirportSeqID), MAX(Quarter), AVG(WheelsOff) FROM mytable WHERE WeatherDelay <> 27 OR ArrDelay = 238.0 OR CRSDepTime = 1332 GROUP BY OriginStateFips, FlightNum  ORDER BY OriginStateFips, FlightNum LIMIT 28"]}
 {"sql":"SELECT MAX(ArrTime) FROM mytable WHERE TailNum IN ('N822SK', 'N14731', 'N003AA', 'N77430') OR Origin IN ('MOB', 'MMH', 'RAP', 'EGE') LIMIT 14"}
-{"sql":"SELECT DestState, DivTailNums FROM mytable WHERE OriginState <> 'MS' AND TaxiIn = 162 OR SecurityDelay BETWEEN 27 AND 8 ORDER BY LateAircraftDelay LIMIT 11","hsqls":["SELECT DestState, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE OriginState <> 'MS' AND TaxiIn = 162 OR SecurityDelay BETWEEN 27 AND 8 ORDER BY LateAircraftDelay LIMIT 10000"]}
-{"sql":"SELECT TailNum, DivAirportIDs FROM mytable WHERE OriginAirportSeqID BETWEEN 1288403 AND 1537602 AND OriginCityName BETWEEN 'Columbus, GA' AND 'San Antonio, TX' LIMIT 22","hsqls":["SELECT TailNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginAirportSeqID BETWEEN 1288403 AND 1537602 AND OriginCityName BETWEEN 'Columbus, GA' AND 'San Antonio, TX' LIMIT 10000"]}
+{"sql":"SELECT DestState, DivTailNums FROM mytable WHERE OriginState <> 'MS' AND TaxiIn = 162 OR SecurityDelay BETWEEN 27 AND 8 ORDER BY LateAircraftDelay LIMIT 11","hsqls":["SELECT DestState, DivTailNums FROM mytable WHERE OriginState <> 'MS' AND TaxiIn = 162 OR SecurityDelay BETWEEN 27 AND 8 ORDER BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT TailNum, DivAirportIDs FROM mytable WHERE OriginAirportSeqID BETWEEN 1288403 AND 1537602 AND OriginCityName BETWEEN 'Columbus, GA' AND 'San Antonio, TX' LIMIT 22","hsqls":["SELECT TailNum, DivAirportIDs FROM mytable WHERE OriginAirportSeqID BETWEEN 1288403 AND 1537602 AND OriginCityName BETWEEN 'Columbus, GA' AND 'San Antonio, TX' LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, DestStateFips, Origin, SUM(Cancelled), AVG(ArrDel15) FROM mytable GROUP BY LateAircraftDelay, DestStateFips, Origin  ORDER BY LateAircraftDelay, DestStateFips, Origin LIMIT 19","hsqls":["SELECT LateAircraftDelay, DestStateFips, Origin, SUM(Cancelled), AVG(ArrDel15) FROM mytable GROUP BY LateAircraftDelay, DestStateFips, Origin  ORDER BY LateAircraftDelay, DestStateFips, Origin LIMIT 19"]}
 {"sql":"SELECT SUM(CarrierDelay), SUM(OriginWac) FROM mytable WHERE DepartureDelayGroups >= 0 LIMIT 14"}
 {"sql":"SELECT SecurityDelay, AVG(OriginAirportSeqID), AVG(OriginStateFips) FROM mytable WHERE DestCityName BETWEEN 'Melbourne, FL' AND 'Washington, DC' AND DepartureDelayGroups >= 10 AND DivArrDelay IN (802, 107, 305, 343, 130) GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 6","hsqls":["SELECT SecurityDelay, AVG(OriginAirportSeqID), AVG(OriginStateFips) FROM mytable WHERE DestCityName BETWEEN 'Melbourne, FL' AND 'Washington, DC' AND DepartureDelayGroups >= 10 AND DivArrDelay IN (802, 107, 305, 343, 130) GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 6"]}
-{"sql":"SELECT Flights, DaysSinceEpoch FROM mytable WHERE \"Year\" NOT IN (2014) OR DestCityName NOT IN ('Burlington, VT') OR ArrDelay BETWEEN 46.0 AND 39.0 ORDER BY DestState, CRSElapsedTime LIMIT 3","hsqls":["SELECT Flights, DaysSinceEpoch FROM mytable WHERE Year NOT IN (2014) OR DestCityName NOT IN ('Burlington, VT') OR ArrDelay BETWEEN 46.0 AND 39.0 ORDER BY DestState, CRSElapsedTime LIMIT 3"]}
+{"sql":"SELECT Flights, DaysSinceEpoch FROM mytable WHERE \"Year\" NOT IN (2014) OR DestCityName NOT IN ('Burlington, VT') OR ArrDelay BETWEEN 46.0 AND 39.0 ORDER BY DestState, CRSElapsedTime LIMIT 3","hsqls":["SELECT Flights, DaysSinceEpoch FROM mytable WHERE `Year` NOT IN (2014) OR DestCityName NOT IN ('Burlington, VT') OR ArrDelay BETWEEN 46.0 AND 39.0 ORDER BY DestState, CRSElapsedTime LIMIT 3"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE OriginCityName NOT IN ('Kalispell, MT', 'Manhattan/Ft. Riley, KS', 'Sioux Falls, SD') AND Dest NOT IN ('IMT', 'BTV') ORDER BY TaxiIn, Origin LIMIT 21"}
-{"sql":"SELECT DivTailNums FROM mytable ORDER BY DestAirportID LIMIT 7","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY DestAirportID LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivTotalGTimes >= 87 OR DivAirportIDs = 14098 LIMIT 16","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE (DivTotalGTimes__MV0 >= 87 OR DivTotalGTimes__MV1 >= 87 OR DivTotalGTimes__MV2 >= 87 OR DivTotalGTimes__MV3 >= 87 OR DivTotalGTimes__MV4 >= 87) OR (DivAirportIDs__MV0 = 14098 OR DivAirportIDs__MV1 = 14098 OR DivAirportIDs__MV2 = 14098 OR DivAirportIDs__MV3 = 14098 OR DivAirportIDs__MV4 = 14098) LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable ORDER BY DestAirportID LIMIT 7","hsqls":["SELECT DivTailNums FROM mytable ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivTotalGTimes >= 87 OR DivAirportIDs = 14098 LIMIT 16","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE (DivTotalGTimes[1] >= 87 OR DivTotalGTimes[2] >= 87 OR DivTotalGTimes[3] >= 87 OR DivTotalGTimes[4] >= 87 OR DivTotalGTimes[5] >= 87) OR ARRAY_CONTAINS(DivAirportIDs, 14098) LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, Dest, DestCityMarketID FROM mytable WHERE DivActualElapsedTime >= 271 OR OriginStateFips NOT IN (56, 5, 23) LIMIT 5"}
 {"sql":"SELECT SUM(WheelsOn), MIN(NASDelay), SUM(ArrTime) FROM mytable WHERE LongestAddGTime = 23 OR WheelsOn < 101 LIMIT 5"}
-{"sql":"SELECT OriginStateName, AVG(DaysSinceEpoch) FROM mytable WHERE DepartureDelayGroups BETWEEN 1 AND -9999 OR DivAirportIDs BETWEEN 15070 AND 14288 GROUP BY OriginStateName LIMIT 19","hsqls":["SELECT OriginStateName, AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE DepartureDelayGroups BETWEEN 1 AND -9999 OR (DivAirportIDs__MV0 BETWEEN 15070 AND 14288 OR DivAirportIDs__MV1 BETWEEN 15070 AND 14288 OR DivAirportIDs__MV2 BETWEEN 15070 AND 14288 OR DivAirportIDs__MV3 BETWEEN 15070 AND 14288 OR DivAirportIDs__MV4 BETWEEN 15070 AND 14288) GROUP BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginStateName, AVG(DaysSinceEpoch) FROM mytable WHERE DepartureDelayGroups BETWEEN 1 AND -9999 OR DivAirportIDs BETWEEN 15070 AND 14288 GROUP BY OriginStateName LIMIT 19","hsqls":["SELECT OriginStateName, AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE DepartureDelayGroups BETWEEN 1 AND -9999 OR (DivAirportIDs[1] BETWEEN 15070 AND 14288 OR DivAirportIDs[2] BETWEEN 15070 AND 14288 OR DivAirportIDs[3] BETWEEN 15070 AND 14288 OR DivAirportIDs[4] BETWEEN 15070 AND 14288 OR DivAirportIDs[5] BETWEEN 15070 AND 14288) GROUP BY OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Cancelled, TailNum, WheelsOn FROM mytable WHERE Distance > 934 AND TaxiIn IN (14, 89) ORDER BY TaxiOut, LateAircraftDelay, CancellationCode LIMIT 28"}
 {"sql":"SELECT ArrTime, AirTime FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND ArrDelay NOT IN (90.0) OR ArrDel15 BETWEEN 1 AND -9999 ORDER BY DepDelay, DepTimeBlk, OriginAirportID LIMIT 3"}
 {"sql":"SELECT DepDelay, ArrTime, TaxiIn FROM mytable WHERE ActualElapsedTime <= 60 ORDER BY DepartureDelayGroups, Flights, DepTime LIMIT 17"}
 {"sql":"SELECT ArrDelay, COUNT(Quarter), COUNT(OriginWac), COUNT(LongestAddGTime) FROM mytable WHERE DepTime >= 548 AND DepDelay BETWEEN 186.0 AND 1.0 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 8","hsqls":["SELECT ArrDelay, COUNT(Quarter), COUNT(OriginWac), COUNT(LongestAddGTime) FROM mytable WHERE DepTime >= 548 AND DepDelay BETWEEN 186.0 AND 1.0 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 8"]}
 {"sql":"SELECT DestAirportID, COUNT(DivArrDelay), MAX(Cancelled), MAX(OriginStateFips) FROM mytable GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 11","hsqls":["SELECT DestAirportID, COUNT(DivArrDelay), MAX(Cancelled), MAX(OriginStateFips) FROM mytable GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 11"]}
-{"sql":"SELECT DepartureDelayGroups, DivAirports FROM mytable ORDER BY Origin LIMIT 16","hsqls":["SELECT DepartureDelayGroups, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirports FROM mytable ORDER BY Origin LIMIT 16","hsqls":["SELECT DepartureDelayGroups, DivAirports FROM mytable ORDER BY Origin LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrDelayMinutes), MAX(DepDelay) FROM mytable LIMIT 14"}
 {"sql":"SELECT OriginStateName FROM mytable WHERE Carrier BETWEEN 'FL' AND 'HA' AND DivActualElapsedTime <= 1968 LIMIT 1"}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N937WN', 'N905WN', 'N477WN') OR DestStateFips BETWEEN 12 AND 31 AND ArrTime BETWEEN 1258 AND 806 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 16","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N937WN', 'N905WN', 'N477WN') OR DestStateFips BETWEEN 12 AND 31 AND ArrTime BETWEEN 1258 AND 806 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 16"]}
-{"sql":"SELECT DivDistance, Carrier, DivTailNums FROM mytable WHERE DestAirportSeqID IN (1409803, 1288802, 1504102, 1014002) OR OriginAirportID BETWEEN 13198 AND 12335 OR Quarter IN (1) LIMIT 11","hsqls":["SELECT DivDistance, Carrier, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DestAirportSeqID IN (1409803, 1288802, 1504102, 1014002) OR OriginAirportID BETWEEN 13198 AND 12335 OR Quarter IN (1) LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, DivAirportSeqIDs, WheelsOn FROM mytable WHERE DivTotalGTimes IN (62) AND DestAirportID NOT IN (14252, 10821, 11337) LIMIT 9","hsqls":["SELECT DestStateFips, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, WheelsOn FROM mytable WHERE (DivTotalGTimes__MV0 IN (62) OR DivTotalGTimes__MV1 IN (62) OR DivTotalGTimes__MV2 IN (62) OR DivTotalGTimes__MV3 IN (62) OR DivTotalGTimes__MV4 IN (62)) AND DestAirportID NOT IN (14252, 10821, 11337) LIMIT 10000"]}
+{"sql":"SELECT DivDistance, Carrier, DivTailNums FROM mytable WHERE DestAirportSeqID IN (1409803, 1288802, 1504102, 1014002) OR OriginAirportID BETWEEN 13198 AND 12335 OR Quarter IN (1) LIMIT 11","hsqls":["SELECT DivDistance, Carrier, DivTailNums FROM mytable WHERE DestAirportSeqID IN (1409803, 1288802, 1504102, 1014002) OR OriginAirportID BETWEEN 13198 AND 12335 OR Quarter IN (1) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivAirportSeqIDs, WheelsOn FROM mytable WHERE DivTotalGTimes IN (62) AND DestAirportID NOT IN (14252, 10821, 11337) LIMIT 9","hsqls":["SELECT DestStateFips, DivAirportSeqIDs WheelsOn FROM mytable WHERE ARRAY_CONTAINS(DivTotalGTimes, 62) AND DestAirportID NOT IN (14252, 10821, 11337) LIMIT 10000"]}
 {"sql":"SELECT ArrTime, OriginAirportID, COUNT(DestCityName) FROM mytable WHERE WheelsOff BETWEEN 1226 AND 2102 OR Flights >= 1 GROUP BY ArrTime, OriginAirportID  ORDER BY ArrTime, OriginAirportID LIMIT 28","hsqls":["SELECT ArrTime, OriginAirportID, COUNT(DestCityName) FROM mytable WHERE WheelsOff BETWEEN 1226 AND 2102 OR Flights >= 1 GROUP BY ArrTime, OriginAirportID  ORDER BY ArrTime, OriginAirportID LIMIT 28"]}
 {"sql":"SELECT OriginAirportSeqID, CRSDepTime, DivArrDelay, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 1534 AND 2145 GROUP BY OriginAirportSeqID, CRSDepTime, DivArrDelay  ORDER BY OriginAirportSeqID, CRSDepTime, DivArrDelay LIMIT 14","hsqls":["SELECT OriginAirportSeqID, CRSDepTime, DivArrDelay, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 1534 AND 2145 GROUP BY OriginAirportSeqID, CRSDepTime, DivArrDelay  ORDER BY OriginAirportSeqID, CRSDepTime, DivArrDelay LIMIT 14"]}
 {"sql":"SELECT OriginCityName, AVG(LongestAddGTime), MAX(OriginStateFips) FROM mytable WHERE DayofMonth >= 15 OR ArrDel15 BETWEEN 0 AND 1 AND DestCityMarketID BETWEEN 30140 AND 33388 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 17","hsqls":["SELECT OriginCityName, AVG(LongestAddGTime), MAX(OriginStateFips) FROM mytable WHERE DayofMonth >= 15 OR ArrDel15 BETWEEN 0 AND 1 AND DestCityMarketID BETWEEN 30140 AND 33388 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 17"]}
 {"sql":"SELECT ArrTime FROM mytable WHERE DayofMonth BETWEEN 29 AND 9 OR SecurityDelay IN (10, 1, 14) ORDER BY CarrierDelay, Cancelled, DepDel15 LIMIT 6"}
 {"sql":"SELECT DestAirportSeqID, MAX(DestWac) FROM mytable GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 25","hsqls":["SELECT DestAirportSeqID, MAX(DestWac) FROM mytable GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 25"]}
-{"sql":"SELECT AVG(\"Year\"), MAX(DaysSinceEpoch), MAX(CarrierDelay) FROM mytable WHERE Origin BETWEEN 'GEG' AND 'ORH'","hsqls":["SELECT AVG(Year), MAX(DaysSinceEpoch), MAX(CarrierDelay) FROM mytable WHERE Origin BETWEEN 'GEG' AND 'ORH'"]}
-{"sql":"SELECT OriginAirportSeqID, DestCityMarketID, \"Month\" FROM mytable WHERE TaxiOut NOT IN (138, 55, 83) AND AirTime BETWEEN 279 AND 347 ORDER BY FlightDate LIMIT 1","hsqls":["SELECT OriginAirportSeqID, DestCityMarketID, Month FROM mytable WHERE TaxiOut NOT IN (138, 55, 83) AND AirTime BETWEEN 279 AND 347 ORDER BY FlightDate LIMIT 1"]}
+{"sql":"SELECT AVG(\"Year\"), MAX(DaysSinceEpoch), MAX(CarrierDelay) FROM mytable WHERE Origin BETWEEN 'GEG' AND 'ORH'","hsqls":["SELECT AVG(`Year`), MAX(DaysSinceEpoch), MAX(CarrierDelay) FROM mytable WHERE Origin BETWEEN 'GEG' AND 'ORH'"]}
+{"sql":"SELECT OriginAirportSeqID, DestCityMarketID, \"Month\" FROM mytable WHERE TaxiOut NOT IN (138, 55, 83) AND AirTime BETWEEN 279 AND 347 ORDER BY FlightDate LIMIT 1","hsqls":["SELECT OriginAirportSeqID, DestCityMarketID, `Month` FROM mytable WHERE TaxiOut NOT IN (138, 55, 83) AND AirTime BETWEEN 279 AND 347 ORDER BY FlightDate LIMIT 1"]}
 {"sql":"SELECT TaxiOut, OriginStateFips, MAX(DepTime) FROM mytable GROUP BY TaxiOut, OriginStateFips  ORDER BY TaxiOut, OriginStateFips LIMIT 21","hsqls":["SELECT TaxiOut, OriginStateFips, MAX(DepTime) FROM mytable GROUP BY TaxiOut, OriginStateFips  ORDER BY TaxiOut, OriginStateFips LIMIT 21"]}
-{"sql":"SELECT ArrDel15, DestStateName, \"Month\", MIN(DayOfWeek) FROM mytable WHERE DivReachedDest <> -9999 GROUP BY ArrDel15, DestStateName, \"Month\" LIMIT 4","hsqls":["SELECT ArrDel15, DestStateName, Month, MIN(DayOfWeek) FROM mytable WHERE DivReachedDest <> -9999 GROUP BY ArrDel15, DestStateName, Month LIMIT 4"]}
-{"sql":"SELECT MIN(DepDelay) FROM mytable WHERE DivAirportIDs IN (15323, 10627) LIMIT 18","hsqls":["SELECT MIN(DepDelay) FROM mytable WHERE (DivAirportIDs__MV0 IN (15323, 10627) OR DivAirportIDs__MV1 IN (15323, 10627) OR DivAirportIDs__MV2 IN (15323, 10627) OR DivAirportIDs__MV3 IN (15323, 10627) OR DivAirportIDs__MV4 IN (15323, 10627)) LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DestStateName, \"Month\", MIN(DayOfWeek) FROM mytable WHERE DivReachedDest <> -9999 GROUP BY ArrDel15, DestStateName, \"Month\" LIMIT 4","hsqls":["SELECT ArrDel15, DestStateName, Month, MIN(DayOfWeek) FROM mytable WHERE DivReachedDest <> -9999 GROUP BY ArrDel15, DestStateName, `Month` LIMIT 4"]}
+{"sql":"SELECT MIN(DepDelay) FROM mytable WHERE DivAirportIDs IN (15323, 10627) LIMIT 18","hsqls":["SELECT MIN(DepDelay) FROM mytable WHERE (ARRAY_CONTAINS(DivAirportIDs, 15323) OR ARRAY_CONTAINS(DivAirportIDs, 10627)) LIMIT 10000"]}
 {"sql":"SELECT MIN(FlightNum), SUM(DestAirportSeqID) FROM mytable LIMIT 26"}
 {"sql":"SELECT DivReachedDest, DestWac FROM mytable ORDER BY DestAirportSeqID, DestCityMarketID LIMIT 26"}
 {"sql":"SELECT DepTimeBlk, AirTime, CRSDepTime, COUNT(DistanceGroup), COUNT(DivReachedDest), MIN(Cancelled) FROM mytable WHERE OriginAirportSeqID < 1150303 GROUP BY DepTimeBlk, AirTime, CRSDepTime  ORDER BY DepTimeBlk, AirTime, CRSDepTime LIMIT 24","hsqls":["SELECT DepTimeBlk, AirTime, CRSDepTime, COUNT(DistanceGroup), COUNT(DivReachedDest), MIN(Cancelled) FROM mytable WHERE OriginAirportSeqID < 1150303 GROUP BY DepTimeBlk, AirTime, CRSDepTime  ORDER BY DepTimeBlk, AirTime, CRSDepTime LIMIT 24"]}
-{"sql":"SELECT DivAirports, DepDel15, DivActualElapsedTime FROM mytable ORDER BY NASDelay, DestCityName LIMIT 1","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepDel15, DivActualElapsedTime FROM mytable ORDER BY NASDelay, DestCityName LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DepDel15, DivActualElapsedTime FROM mytable ORDER BY NASDelay, DestCityName LIMIT 1","hsqls":["SELECT DivAirports, DepDel15, DivActualElapsedTime FROM mytable ORDER BY NASDelay, DestCityName LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, COUNT(*) FROM mytable GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 18","hsqls":["SELECT TaxiOut, COUNT(*) FROM mytable GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 18"]}
 {"sql":"SELECT TailNum, CRSDepTime, COUNT(*) FROM mytable WHERE LateAircraftDelay = 7 OR DayOfWeek IN (3, 1, 7, 5) OR OriginState <> 'NJ' GROUP BY TailNum, CRSDepTime","hsqls":["SELECT TailNum, CRSDepTime, COUNT(*) FROM mytable WHERE LateAircraftDelay = 7 OR DayOfWeek IN (3, 1, 7, 5) OR OriginState <> 'NJ' GROUP BY TailNum, CRSDepTime"]}
 {"sql":"SELECT Distance, TotalAddGTime FROM mytable ORDER BY DivReachedDest, ArrDel15 LIMIT 5"}
-{"sql":"SELECT DivWheelsOns, TailNum, OriginStateName FROM mytable WHERE FirstDepTime < 1043 AND DivAirportSeqIDs IN (1289605) ORDER BY FlightDate, ArrDelay, DivAirportLandings LIMIT 6","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, TailNum, OriginStateName FROM mytable WHERE FirstDepTime < 1043 AND (DivAirportSeqIDs__MV0 IN (1289605) OR DivAirportSeqIDs__MV1 IN (1289605) OR DivAirportSeqIDs__MV2 IN (1289605) OR DivAirportSeqIDs__MV3 IN (1289605) OR DivAirportSeqIDs__MV4 IN (1289605)) ORDER BY FlightDate, ArrDelay, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, TailNum, OriginStateName FROM mytable WHERE FirstDepTime < 1043 AND DivAirportSeqIDs IN (1289605) ORDER BY FlightDate, ArrDelay, DivAirportLandings LIMIT 6","hsqls":["SELECT DivWheelsOns, TailNum, OriginStateName FROM mytable WHERE FirstDepTime < 1043 AND ARRAY_CONTAINS(DivAirportSeqIDs, 1289605) ORDER BY FlightDate, ArrDelay, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT Diverted, Origin, CRSDepTime, COUNT(*) FROM mytable WHERE Origin BETWEEN 'SAT' AND 'DLH' GROUP BY Diverted, Origin, CRSDepTime  ORDER BY Diverted, Origin, CRSDepTime LIMIT 10","hsqls":["SELECT Diverted, Origin, CRSDepTime, COUNT(*) FROM mytable WHERE Origin BETWEEN 'SAT' AND 'DLH' GROUP BY Diverted, Origin, CRSDepTime  ORDER BY Diverted, Origin, CRSDepTime LIMIT 10"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE ArrDelay NOT IN (157.0, 108.0, 996.0, 463.0) ORDER BY ActualElapsedTime, DestCityName, DestAirportID LIMIT 10"}
-{"sql":"SELECT LateAircraftDelay, TailNum, \"Month\", SUM(NASDelay) FROM mytable WHERE FirstDepTime NOT IN (1856, 903, 624) GROUP BY LateAircraftDelay, TailNum, \"Month\" LIMIT 11","hsqls":["SELECT LateAircraftDelay, TailNum, Month, SUM(NASDelay) FROM mytable WHERE FirstDepTime NOT IN (1856, 903, 624) GROUP BY LateAircraftDelay, TailNum, Month LIMIT 11"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE DestCityName IN ('Bristol/Johnson City/Kingsport, TN', 'Tulsa, OK') OR FlightNum BETWEEN 5401 AND 1197 ORDER BY WeatherDelay LIMIT 27","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DestCityName IN ('Bristol/Johnson City/Kingsport, TN', 'Tulsa, OK') OR FlightNum BETWEEN 5401 AND 1197 ORDER BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, TailNum, \"Month\", SUM(NASDelay) FROM mytable WHERE FirstDepTime NOT IN (1856, 903, 624) GROUP BY LateAircraftDelay, TailNum, \"Month\" LIMIT 11","hsqls":["SELECT LateAircraftDelay, TailNum, Month, SUM(NASDelay) FROM mytable WHERE FirstDepTime NOT IN (1856, 903, 624) GROUP BY LateAircraftDelay, TailNum, `Month` LIMIT 11"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE DestCityName IN ('Bristol/Johnson City/Kingsport, TN', 'Tulsa, OK') OR FlightNum BETWEEN 5401 AND 1197 ORDER BY WeatherDelay LIMIT 27","hsqls":["SELECT DivAirportIDs FROM mytable WHERE DestCityName IN ('Bristol/Johnson City/Kingsport, TN', 'Tulsa, OK') OR FlightNum BETWEEN 5401 AND 1197 ORDER BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT OriginCityName FROM mytable WHERE AirlineID IN (20366, 19930, 20409) OR UniqueCarrier <= 'VX' ORDER BY CarrierDelay, Flights, Distance LIMIT 7"}
 {"sql":"SELECT DivReachedDest, AirTime FROM mytable WHERE FlightNum < 4453 ORDER BY DepartureDelayGroups, CarrierDelay, CRSElapsedTime LIMIT 28"}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY DepTimeBlk, DayOfWeek LIMIT 19"}
 {"sql":"SELECT OriginCityName FROM mytable ORDER BY OriginState LIMIT 9"}
 {"sql":"SELECT AVG(DistanceGroup), COUNT(CancellationCode), COUNT(FlightDate) FROM mytable WHERE OriginState IN ('IL') LIMIT 11"}
-{"sql":"SELECT NASDelay, SUM(DestWac) FROM mytable WHERE DaysSinceEpoch IN (16082, 16087, 16079) OR DivWheelsOns BETWEEN 1814 AND 1918 OR Flights BETWEEN 1 AND 1 GROUP BY NASDelay LIMIT 23","hsqls":["SELECT NASDelay, SUM(DestWac) FROM mytable WHERE DaysSinceEpoch IN (16082, 16087, 16079) OR (DivWheelsOns__MV0 BETWEEN 1814 AND 1918 OR DivWheelsOns__MV1 BETWEEN 1814 AND 1918 OR DivWheelsOns__MV2 BETWEEN 1814 AND 1918 OR DivWheelsOns__MV3 BETWEEN 1814 AND 1918 OR DivWheelsOns__MV4 BETWEEN 1814 AND 1918) OR Flights BETWEEN 1 AND 1 GROUP BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT NASDelay, SUM(DestWac) FROM mytable WHERE DaysSinceEpoch IN (16082, 16087, 16079) OR DivWheelsOns BETWEEN 1814 AND 1918 OR Flights BETWEEN 1 AND 1 GROUP BY NASDelay LIMIT 23","hsqls":["SELECT NASDelay, SUM(DestWac) FROM mytable WHERE DaysSinceEpoch IN (16082, 16087, 16079) OR (DivWheelsOns[1] BETWEEN 1814 AND 1918 OR DivWheelsOns[2] BETWEEN 1814 AND 1918 OR DivWheelsOns[3] BETWEEN 1814 AND 1918 OR DivWheelsOns[4] BETWEEN 1814 AND 1918 OR DivWheelsOns[5] BETWEEN 1814 AND 1918) OR Flights BETWEEN 1 AND 1 GROUP BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT Quarter, NASDelay, DestAirportID, AVG(DivReachedDest) FROM mytable WHERE DayofMonth NOT IN (4, 16) GROUP BY Quarter, NASDelay, DestAirportID  ORDER BY Quarter, NASDelay, DestAirportID LIMIT 25","hsqls":["SELECT Quarter, NASDelay, DestAirportID, AVG(DivReachedDest) FROM mytable WHERE DayofMonth NOT IN (4, 16) GROUP BY Quarter, NASDelay, DestAirportID  ORDER BY Quarter, NASDelay, DestAirportID LIMIT 25"]}
 {"sql":"SELECT DayofMonth FROM mytable ORDER BY Cancelled, DestStateName LIMIT 26"}
 {"sql":"SELECT DestCityName FROM mytable ORDER BY CRSArrTime, WheelsOn LIMIT 12"}
 {"sql":"SELECT Flights, DivActualElapsedTime, AVG(DestStateFips), MIN(DistanceGroup), MAX(OriginStateFips) FROM mytable WHERE DivActualElapsedTime BETWEEN 414 AND 503 OR CRSDepTime IN (1744, 2232, 1552) GROUP BY Flights, DivActualElapsedTime  ORDER BY Flights, DivActualElapsedTime LIMIT 29","hsqls":["SELECT Flights, DivActualElapsedTime, AVG(DestStateFips), MIN(DistanceGroup), MAX(OriginStateFips) FROM mytable WHERE DivActualElapsedTime BETWEEN 414 AND 503 OR CRSDepTime IN (1744, 2232, 1552) GROUP BY Flights, DivActualElapsedTime  ORDER BY Flights, DivActualElapsedTime LIMIT 29"]}
-{"sql":"SELECT Carrier, DestAirportSeqID FROM mytable WHERE NASDelay NOT IN (67, 20, 110, 8, 38) AND \"Month\" IN (1) ORDER BY Distance, \"Month\" LIMIT 21","hsqls":["SELECT Carrier, DestAirportSeqID FROM mytable WHERE NASDelay NOT IN (67, 20, 110, 8, 38) AND Month IN (1) ORDER BY Distance, Month LIMIT 21"]}
+{"sql":"SELECT Carrier, DestAirportSeqID FROM mytable WHERE NASDelay NOT IN (67, 20, 110, 8, 38) AND \"Month\" IN (1) ORDER BY Distance, \"Month\" LIMIT 21","hsqls":["SELECT Carrier, DestAirportSeqID FROM mytable WHERE NASDelay NOT IN (67, 20, 110, 8, 38) AND `Month` IN (1) ORDER BY Distance, `Month` LIMIT 21"]}
 {"sql":"SELECT MAX(OriginWac), AVG(OriginStateFips) FROM mytable WHERE AirTime BETWEEN 191 AND 240 AND DestState < 'MS' AND DepTimeBlk BETWEEN '1800-1859' AND '2200-2259' LIMIT 3"}
 {"sql":"SELECT MAX(DepTime), MIN(LateAircraftDelay), COUNT(WheelsOff) FROM mytable WHERE OriginState NOT IN ('MO', 'MN', 'FL') AND DistanceGroup BETWEEN 3 AND 11 LIMIT 3"}
 {"sql":"SELECT CancellationCode, COUNT(DepDelay), AVG(DivActualElapsedTime) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 19","hsqls":["SELECT CancellationCode, COUNT(DepDelay), AVG(DivActualElapsedTime) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 19"]}
 {"sql":"SELECT FlightNum, ArrDelay, OriginAirportID, COUNT(*) FROM mytable WHERE DestState NOT IN ('TN', 'SC', 'ME') OR Cancelled IN (1) GROUP BY FlightNum, ArrDelay, OriginAirportID  ORDER BY FlightNum, ArrDelay, OriginAirportID LIMIT 29","hsqls":["SELECT FlightNum, ArrDelay, OriginAirportID, COUNT(*) FROM mytable WHERE DestState NOT IN ('TN', 'SC', 'ME') OR Cancelled IN (1) GROUP BY FlightNum, ArrDelay, OriginAirportID  ORDER BY FlightNum, ArrDelay, OriginAirportID LIMIT 29"]}
 {"sql":"SELECT MIN(DayOfWeek) FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 AND ArrivalDelayGroups <> 6 OR ArrTimeBlk BETWEEN '0900-0959' AND '1200-1259' LIMIT 20"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityName <> 'Evansville, IN' AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE DestCityName <> 'Evansville, IN' AND Year BETWEEN 2014 AND 2014 LIMIT 3"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityName <> 'Evansville, IN' AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE DestCityName <> 'Evansville, IN' AND `Year` BETWEEN 2014 AND 2014 LIMIT 3"]}
 {"sql":"SELECT AVG(WheelsOn) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) LIMIT 29"}
-{"sql":"SELECT Diverted, DepDel15, COUNT(DestState) FROM mytable WHERE DestCityMarketID IN (30431, 35323, 31986) OR Origin BETWEEN 'IAH' AND 'BUR' AND DivAirportSeqIDs < 1029904 GROUP BY Diverted, DepDel15 LIMIT 11","hsqls":["SELECT Diverted, DepDel15, COUNT(DestState) FROM mytable WHERE DestCityMarketID IN (30431, 35323, 31986) OR Origin BETWEEN 'IAH' AND 'BUR' AND (DivAirportSeqIDs__MV0 < 1029904 OR DivAirportSeqIDs__MV1 < 1029904 OR DivAirportSeqIDs__MV2 < 1029904 OR DivAirportSeqIDs__MV3 < 1029904 OR DivAirportSeqIDs__MV4 < 1029904) GROUP BY Diverted, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT Diverted, DepDel15, COUNT(DestState) FROM mytable WHERE DestCityMarketID IN (30431, 35323, 31986) OR Origin BETWEEN 'IAH' AND 'BUR' AND DivAirportSeqIDs < 1029904 GROUP BY Diverted, DepDel15 LIMIT 11","hsqls":["SELECT Diverted, DepDel15, COUNT(DestState) FROM mytable WHERE DestCityMarketID IN (30431, 35323, 31986) OR Origin BETWEEN 'IAH' AND 'BUR' AND (DivAirportSeqIDs[1] < 1029904 OR DivAirportSeqIDs[2] < 1029904 OR DivAirportSeqIDs[3] < 1029904 OR DivAirportSeqIDs[4] < 1029904 OR DivAirportSeqIDs[5] < 1029904) GROUP BY Diverted, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT Cancelled, ArrTimeBlk, AirTime FROM mytable LIMIT 9"}
-{"sql":"SELECT DivAirports FROM mytable ORDER BY TaxiIn, DivArrDelay, CRSElapsedTime LIMIT 11","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY TaxiIn, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DepDelay, CancellationCode FROM mytable WHERE DivLongestGTimes <= 7.0 OR OriginAirportSeqID <= 1109702 AND DayofMonth IN (25) ORDER BY CancellationCode, ArrDelay, OriginAirportID LIMIT 11","hsqls":["SELECT DepDelay, CancellationCode FROM mytable WHERE (DivLongestGTimes__MV0 <= 7.0 OR DivLongestGTimes__MV1 <= 7.0 OR DivLongestGTimes__MV2 <= 7.0 OR DivLongestGTimes__MV3 <= 7.0 OR DivLongestGTimes__MV4 <= 7.0) OR OriginAirportSeqID <= 1109702 AND DayofMonth IN (25) ORDER BY CancellationCode, ArrDelay, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable ORDER BY TaxiIn, DivArrDelay, CRSElapsedTime LIMIT 11","hsqls":["SELECT DivAirports FROM mytable ORDER BY TaxiIn, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DepDelay, CancellationCode FROM mytable WHERE DivLongestGTimes <= 7.0 OR OriginAirportSeqID <= 1109702 AND DayofMonth IN (25) ORDER BY CancellationCode, ArrDelay, OriginAirportID LIMIT 11","hsqls":["SELECT DepDelay, CancellationCode FROM mytable WHERE (DivLongestGTimes[1] <= 7.0 OR DivLongestGTimes[2] <= 7.0 OR DivLongestGTimes[3] <= 7.0 OR DivLongestGTimes[4] <= 7.0 OR DivLongestGTimes[5] <= 7.0) OR OriginAirportSeqID <= 1109702 AND DayofMonth IN (25) ORDER BY CancellationCode, ArrDelay, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DepDelay, FlightDate, OriginStateName, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN -1 AND 0 AND FlightDate BETWEEN '2014-01-20' AND '2014-01-31' OR DepDel15 >= 1 GROUP BY DepDelay, FlightDate, OriginStateName  ORDER BY DepDelay, FlightDate, OriginStateName LIMIT 17","hsqls":["SELECT DepDelay, FlightDate, OriginStateName, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN -1 AND 0 AND FlightDate BETWEEN '2014-01-20' AND '2014-01-31' OR DepDel15 >= 1 GROUP BY DepDelay, FlightDate, OriginStateName  ORDER BY DepDelay, FlightDate, OriginStateName LIMIT 17"]}
 {"sql":"SELECT DivReachedDest, Diverted FROM mytable WHERE FlightDate BETWEEN '2014-01-21' AND '2014-01-27' AND TaxiIn <= 42 ORDER BY TaxiOut LIMIT 27"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 5"}
 {"sql":"SELECT DepTime, OriginStateName FROM mytable ORDER BY LongestAddGTime, OriginCityName, WheelsOn LIMIT 28"}
 {"sql":"SELECT OriginState, MIN(DestAirportID), MIN(DepartureDelayGroups) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 14","hsqls":["SELECT OriginState, MIN(DestAirportID), MIN(DepartureDelayGroups) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 14"]}
 {"sql":"SELECT SUM(SecurityDelay) FROM mytable WHERE DestWac IN (66, 81, 11) LIMIT 9"}
-{"sql":"SELECT OriginState, DivTailNums FROM mytable WHERE DivDistance >= 71 LIMIT 5","hsqls":["SELECT OriginState, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DivDistance >= 71 LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivTailNums FROM mytable WHERE DivDistance >= 71 LIMIT 5","hsqls":["SELECT OriginState, DivTailNums FROM mytable WHERE DivDistance >= 71 LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, CRSElapsedTime, DayOfWeek FROM mytable LIMIT 11"}
-{"sql":"SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE Distance < 143 AND DivWheelsOns <= 2254 OR DivAirportIDs >= 13796 GROUP BY LateAircraftDelay LIMIT 19","hsqls":["SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE Distance < 143 AND (DivWheelsOns__MV0 <= 2254 OR DivWheelsOns__MV1 <= 2254 OR DivWheelsOns__MV2 <= 2254 OR DivWheelsOns__MV3 <= 2254 OR DivWheelsOns__MV4 <= 2254) OR (DivAirportIDs__MV0 >= 13796 OR DivAirportIDs__MV1 >= 13796 OR DivAirportIDs__MV2 >= 13796 OR DivAirportIDs__MV3 >= 13796 OR DivAirportIDs__MV4 >= 13796) GROUP BY LateAircraftDelay LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, SecurityDelay, DivWheelsOffs FROM mytable WHERE Flights < 1 AND DivActualElapsedTime NOT IN (594, 207) AND DepDelayMinutes IN (246.0, 201.0, 151.0, 17.0) ORDER BY OriginStateFips LIMIT 27","hsqls":["SELECT DepDelayMinutes, SecurityDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Flights < 1 AND DivActualElapsedTime NOT IN (594, 207) AND DepDelayMinutes IN (246.0, 201.0, 151.0, 17.0) ORDER BY OriginStateFips LIMIT 10000"]}
-{"sql":"SELECT \"Year\", MIN(AirTime), SUM(LongestAddGTime), MAX(\"Month\") FROM mytable WHERE SecurityDelay IN (1) AND DestAirportID BETWEEN 10849 AND 10397 GROUP BY \"Year\" LIMIT 28","hsqls":["SELECT Year, MIN(AirTime), SUM(LongestAddGTime), MAX(Month) FROM mytable WHERE SecurityDelay IN (1) AND DestAirportID BETWEEN 10849 AND 10397 GROUP BY Year LIMIT 28"]}
-{"sql":"SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR DivTailNums IN ('N713SK') AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10","hsqls":["SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR (DivTailNums__MV0 IN ('N713SK') OR DivTailNums__MV1 IN ('N713SK') OR DivTailNums__MV2 IN ('N713SK') OR DivTailNums__MV3 IN ('N713SK') OR DivTailNums__MV4 IN ('N713SK')) AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE Distance < 143 AND DivWheelsOns <= 2254 OR DivAirportIDs >= 13796 GROUP BY LateAircraftDelay LIMIT 19","hsqls":["SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE Distance < 143 AND (DivWheelsOns[1] <= 2254 OR DivWheelsOns[2] <= 2254 OR DivWheelsOns[3] <= 2254 OR DivWheelsOns[4] <= 2254 OR DivWheelsOns[5] <= 2254) OR (DivAirportIDs[1] >= 13796 OR DivAirportIDs[2] >= 13796 OR DivAirportIDs[3] >= 13796 OR DivAirportIDs[4] >= 13796 OR DivAirportIDs[5] >= 13796) GROUP BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, SecurityDelay, DivWheelsOffs FROM mytable WHERE Flights < 1 AND DivActualElapsedTime NOT IN (594, 207) AND DepDelayMinutes IN (246.0, 201.0, 151.0, 17.0) ORDER BY OriginStateFips LIMIT 27","hsqls":["SELECT DepDelayMinutes, SecurityDelay, DivWheelsOffs FROM mytable WHERE Flights < 1 AND DivActualElapsedTime NOT IN (594, 207) AND DepDelayMinutes IN (246.0, 201.0, 151.0, 17.0) ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT \"Year\", MIN(AirTime), SUM(LongestAddGTime), MAX(\"Month\") FROM mytable WHERE SecurityDelay IN (1) AND DestAirportID BETWEEN 10849 AND 10397 GROUP BY \"Year\" LIMIT 28","hsqls":["SELECT Year, MIN(AirTime), SUM(LongestAddGTime), MAX(`Month`) FROM mytable WHERE SecurityDelay IN (1) AND DestAirportID BETWEEN 10849 AND 10397 GROUP BY `Year` LIMIT 28"]}
+{"sql":"SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR DivTailNums IN ('N713SK') AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10","hsqls":["SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR ARRAY_CONTAINS(DivTailNums,'N713SK') AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10000"]}
 {"sql":"SELECT OriginState, DepDelay, FlightDate FROM mytable ORDER BY OriginWac LIMIT 3"}
 {"sql":"SELECT MAX(DepDelay) FROM mytable LIMIT 10"}
 {"sql":"SELECT LateAircraftDelay, DepTime, OriginAirportID FROM mytable WHERE DestWac = 39 OR OriginCityMarketID > 32177 ORDER BY FirstDepTime LIMIT 29"}
@@ -123,63 +123,63 @@
 {"sql":"SELECT DestWac, DepDelay, Dest FROM mytable WHERE WheelsOff >= 2011 AND DepTimeBlk IN ('1200-1259', '1400-1459', '1500-1559') LIMIT 24"}
 {"sql":"SELECT DistanceGroup FROM mytable ORDER BY FlightNum, ArrTime, DayOfWeek LIMIT 12"}
 {"sql":"SELECT DivReachedDest, Diverted, ArrDelay FROM mytable LIMIT 24"}
-{"sql":"SELECT OriginState, DivAirportIDs, OriginAirportID FROM mytable WHERE OriginStateName BETWEEN 'Alaska' AND 'Illinois' ORDER BY DestAirportID LIMIT 10","hsqls":["SELECT OriginState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, OriginAirportID FROM mytable WHERE OriginStateName BETWEEN 'Alaska' AND 'Illinois' ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirportIDs, OriginAirportID FROM mytable WHERE OriginStateName BETWEEN 'Alaska' AND 'Illinois' ORDER BY DestAirportID LIMIT 10","hsqls":["SELECT OriginState, DivAirportIDs, OriginAirportID FROM mytable WHERE OriginStateName BETWEEN 'Alaska' AND 'Illinois' ORDER BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, CRSElapsedTime, OriginStateName, COUNT(*) FROM mytable GROUP BY DistanceGroup, CRSElapsedTime, OriginStateName  ORDER BY DistanceGroup, CRSElapsedTime, OriginStateName LIMIT 14","hsqls":["SELECT DistanceGroup, CRSElapsedTime, OriginStateName, COUNT(*) FROM mytable GROUP BY DistanceGroup, CRSElapsedTime, OriginStateName  ORDER BY DistanceGroup, CRSElapsedTime, OriginStateName LIMIT 14"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTime BETWEEN 1707 AND 2206 LIMIT 18"}
 {"sql":"SELECT Origin FROM mytable LIMIT 20"}
 {"sql":"SELECT FlightDate, OriginCityName, DestAirportID, MAX(Quarter) FROM mytable WHERE DestCityMarketID IN (30732, 34520, 31295, 30599) OR DepDelayMinutes IN (334.0) GROUP BY FlightDate, OriginCityName, DestAirportID  ORDER BY FlightDate, OriginCityName, DestAirportID LIMIT 10","hsqls":["SELECT FlightDate, OriginCityName, DestAirportID, MAX(Quarter) FROM mytable WHERE DestCityMarketID IN (30732, 34520, 31295, 30599) OR DepDelayMinutes IN (334.0) GROUP BY FlightDate, OriginCityName, DestAirportID  ORDER BY FlightDate, OriginCityName, DestAirportID LIMIT 10"]}
 {"sql":"SELECT DivDistance, DepDelayMinutes, DivAirportLandings, COUNT(*) FROM mytable WHERE OriginStateFips IN (42) GROUP BY DivDistance, DepDelayMinutes, DivAirportLandings  ORDER BY DivDistance, DepDelayMinutes, DivAirportLandings LIMIT 23","hsqls":["SELECT DivDistance, DepDelayMinutes, DivAirportLandings, COUNT(*) FROM mytable WHERE OriginStateFips IN (42) GROUP BY DivDistance, DepDelayMinutes, DivAirportLandings  ORDER BY DivDistance, DepDelayMinutes, DivAirportLandings LIMIT 23"]}
-{"sql":"SELECT MIN(\"Year\"), AVG(OriginAirportSeqID), COUNT(DaysSinceEpoch) FROM mytable WHERE Quarter = 1 LIMIT 7","hsqls":["SELECT MIN(Year), AVG(OriginAirportSeqID), COUNT(DaysSinceEpoch) FROM mytable WHERE Quarter = 1 LIMIT 7"]}
+{"sql":"SELECT MIN(\"Year\"), AVG(OriginAirportSeqID), COUNT(DaysSinceEpoch) FROM mytable WHERE Quarter = 1 LIMIT 7","hsqls":["SELECT MIN(`Year`), AVG(OriginAirportSeqID), COUNT(DaysSinceEpoch) FROM mytable WHERE Quarter = 1 LIMIT 7"]}
 {"sql":"SELECT AVG(OriginCityMarketID) FROM mytable LIMIT 22"}
 {"sql":"SELECT WheelsOff, FirstDepTime, DayofMonth FROM mytable ORDER BY Cancelled, TailNum, OriginStateName LIMIT 12"}
-{"sql":"SELECT DestState, CRSElapsedTime, OriginStateName FROM mytable WHERE DivTailNums BETWEEN 'N506JB' AND 'N640JB' ORDER BY NASDelay, CRSDepTime LIMIT 17","hsqls":["SELECT DestState, CRSElapsedTime, OriginStateName FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums__MV1 BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums__MV2 BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums__MV3 BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums__MV4 BETWEEN 'N506JB' AND 'N640JB') ORDER BY NASDelay, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DestState, CRSElapsedTime, OriginStateName FROM mytable WHERE DivTailNums BETWEEN 'N506JB' AND 'N640JB' ORDER BY NASDelay, CRSDepTime LIMIT 17","hsqls":["SELECT DestState, CRSElapsedTime, OriginStateName FROM mytable WHERE (DivTailNums[1] BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums[2] BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums[3] BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums[4] BETWEEN 'N506JB' AND 'N640JB' OR DivTailNums[5] BETWEEN 'N506JB' AND 'N640JB') ORDER BY NASDelay, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DestStateFips, SUM(CarrierDelay), SUM(ArrDelayMinutes) FROM mytable GROUP BY WeatherDelay, DestStateFips  ORDER BY WeatherDelay, DestStateFips LIMIT 26","hsqls":["SELECT WeatherDelay, DestStateFips, SUM(CarrierDelay), SUM(ArrDelayMinutes) FROM mytable GROUP BY WeatherDelay, DestStateFips  ORDER BY WeatherDelay, DestStateFips LIMIT 26"]}
 {"sql":"SELECT ArrDelay, MAX(DepartureDelayGroups), SUM(OriginAirportID), AVG(Distance) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 1","hsqls":["SELECT ArrDelay, MAX(DepartureDelayGroups), SUM(OriginAirportID), AVG(Distance) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 1"]}
-{"sql":"SELECT DestWac, LateAircraftDelay, DayofMonth, COUNT(*) FROM mytable WHERE DivTailNums IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DestWac, LateAircraftDelay, DayofMonth LIMIT 19","hsqls":["SELECT DestWac, LateAircraftDelay, DayofMonth, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums__MV1 IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums__MV2 IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums__MV3 IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums__MV4 IN ('N587JB', 'N811MQ', 'N3AEMQ')) OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DestWac, LateAircraftDelay, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DestWac, LateAircraftDelay, DayofMonth, COUNT(*) FROM mytable WHERE DivTailNums IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DestWac, LateAircraftDelay, DayofMonth LIMIT 19","hsqls":["SELECT DestWac, LateAircraftDelay, DayofMonth, COUNT(*) FROM mytable WHERE (DivTailNums[1] IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums[2] IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums[3] IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums[4] IN ('N587JB', 'N811MQ', 'N3AEMQ') OR DivTailNums[5] IN ('N587JB', 'N811MQ', 'N3AEMQ')) OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DestWac, LateAircraftDelay, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, DestStateName FROM mytable ORDER BY DivDistance LIMIT 12"}
 {"sql":"SELECT CRSArrTime, DestStateName, WheelsOn FROM mytable WHERE DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY AirTime LIMIT 19"}
 {"sql":"SELECT AVG(DepDel15), MIN(DepDelay), COUNT(DivAirportLandings) FROM mytable WHERE SecurityDelay = 4 LIMIT 28"}
-{"sql":"SELECT DestAirportSeqID, DivTailNums FROM mytable WHERE DivDistance BETWEEN 397 AND 67 AND SecurityDelay BETWEEN 8 AND 18 LIMIT 21","hsqls":["SELECT DestAirportSeqID, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DivDistance BETWEEN 397 AND 67 AND SecurityDelay BETWEEN 8 AND 18 LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivTailNums FROM mytable WHERE DivDistance BETWEEN 397 AND 67 AND SecurityDelay BETWEEN 8 AND 18 LIMIT 21","hsqls":["SELECT DestAirportSeqID, DivTailNums FROM mytable WHERE DivDistance BETWEEN 397 AND 67 AND SecurityDelay BETWEEN 8 AND 18 LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE DestWac IN (42, 53) OR LateAircraftDelay NOT IN (21, 96, 187, 100) ORDER BY DestAirportID LIMIT 14"}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE UniqueCarrier NOT IN ('US') AND LongestAddGTime NOT IN (8) OR DestWac NOT IN (67, 66, 39) ORDER BY Dest LIMIT 2"}
 {"sql":"SELECT Quarter, OriginCityMarketID FROM mytable ORDER BY DestWac, DepDelayMinutes, DepTimeBlk LIMIT 18"}
 {"sql":"SELECT \"Year\", Dest FROM mytable LIMIT 24","hsqls":["SELECT Year, Dest FROM mytable LIMIT 24"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE ArrTime BETWEEN 1912 AND 2106 OR OriginStateFips <= 24 OR OriginCityMarketID BETWEEN 31337 AND 33195 ORDER BY DistanceGroup, OriginCityMarketID, Cancelled LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE ArrTime BETWEEN 1912 AND 2106 OR OriginStateFips <= 24 OR OriginCityMarketID BETWEEN 31337 AND 33195 ORDER BY DistanceGroup, OriginCityMarketID, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE ArrTime BETWEEN 1912 AND 2106 OR OriginStateFips <= 24 OR OriginCityMarketID BETWEEN 31337 AND 33195 ORDER BY DistanceGroup, OriginCityMarketID, Cancelled LIMIT 2","hsqls":["SELECT DivAirports FROM mytable WHERE ArrTime BETWEEN 1912 AND 2106 OR OriginStateFips <= 24 OR OriginCityMarketID BETWEEN 31337 AND 33195 ORDER BY DistanceGroup, OriginCityMarketID, Cancelled LIMIT 10000"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE FlightNum IN (787) OR ArrivalDelayGroups NOT IN (1, -1, 8, 11) AND LateAircraftDelay BETWEEN 106 AND 194 ORDER BY ArrivalDelayGroups LIMIT 29"}
 {"sql":"SELECT DestWac FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR OriginCityMarketID BETWEEN 33277 AND 33570 LIMIT 14"}
 {"sql":"SELECT AVG(WheelsOn), AVG(WheelsOff) FROM mytable LIMIT 27"}
-{"sql":"SELECT DivTailNums FROM mytable WHERE FirstDepTime <= 1309 AND FirstDepTime IN (814, 726, 1902, 710, 900) AND OriginState IN ('MI') ORDER BY DivReachedDest, NASDelay, CRSDepTime LIMIT 16","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE FirstDepTime <= 1309 AND FirstDepTime IN (814, 726, 1902, 710, 900) AND OriginState IN ('MI') ORDER BY DivReachedDest, NASDelay, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE FirstDepTime <= 1309 AND FirstDepTime IN (814, 726, 1902, 710, 900) AND OriginState IN ('MI') ORDER BY DivReachedDest, NASDelay, CRSDepTime LIMIT 16","hsqls":["SELECT DivTailNums FROM mytable WHERE FirstDepTime <= 1309 AND FirstDepTime IN (814, 726, 1902, 710, 900) AND OriginState IN ('MI') ORDER BY DivReachedDest, NASDelay, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(ArrivalDelayGroups), MAX(TaxiIn), MAX(CRSDepTime) FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259') GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 5","hsqls":["SELECT DaysSinceEpoch, COUNT(ArrivalDelayGroups), MAX(TaxiIn), MAX(CRSDepTime) FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259') GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 5"]}
 {"sql":"SELECT DestWac FROM mytable WHERE DestCityName BETWEEN 'Manhattan/Ft. Riley, KS' AND 'Cedar City, UT' AND OriginCityMarketID BETWEEN 30868 AND 31097 AND DaysSinceEpoch < 16076 ORDER BY ActualElapsedTime, DestAirportSeqID LIMIT 28"}
-{"sql":"SELECT WheelsOff, DayofMonth, MIN(\"Month\"), MAX(OriginStateFips) FROM mytable GROUP BY WheelsOff, DayofMonth LIMIT 6","hsqls":["SELECT WheelsOff, DayofMonth, MIN(Month), MAX(OriginStateFips) FROM mytable GROUP BY WheelsOff, DayofMonth LIMIT 6"]}
+{"sql":"SELECT WheelsOff, DayofMonth, MIN(\"Month\"), MAX(OriginStateFips) FROM mytable GROUP BY WheelsOff, DayofMonth LIMIT 6","hsqls":["SELECT WheelsOff, DayofMonth, MIN(`Month`), MAX(OriginStateFips) FROM mytable GROUP BY WheelsOff, DayofMonth LIMIT 6"]}
 {"sql":"SELECT Diverted, DivAirportLandings FROM mytable LIMIT 29"}
 {"sql":"SELECT Diverted, CarrierDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FlightNum BETWEEN 366 AND 2608 LIMIT 16"}
-{"sql":"SELECT SecurityDelay, ActualElapsedTime, AVG(\"Year\") FROM mytable GROUP BY SecurityDelay, ActualElapsedTime LIMIT 9","hsqls":["SELECT SecurityDelay, ActualElapsedTime, AVG(Year) FROM mytable GROUP BY SecurityDelay, ActualElapsedTime LIMIT 9"]}
+{"sql":"SELECT SecurityDelay, ActualElapsedTime, AVG(\"Year\") FROM mytable GROUP BY SecurityDelay, ActualElapsedTime LIMIT 9","hsqls":["SELECT SecurityDelay, ActualElapsedTime, AVG(`Year`) FROM mytable GROUP BY SecurityDelay, ActualElapsedTime LIMIT 9"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE FlightDate > '2014-01-23' AND DivActualElapsedTime NOT IN (773, 359, 332, 196) AND OriginCityMarketID <= 32600 ORDER BY OriginState, DepTimeBlk, ArrivalDelayGroups LIMIT 10"}
-{"sql":"SELECT DivTailNums, \"Month\", CRSElapsedTime FROM mytable LIMIT 21","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Month, CRSElapsedTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, \"Month\", CRSElapsedTime FROM mytable LIMIT 21","hsqls":["SELECT DivTailNums, Month, CRSElapsedTime FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, CancellationCode, COUNT(*) FROM mytable GROUP BY DivReachedDest, CancellationCode  ORDER BY DivReachedDest, CancellationCode LIMIT 19","hsqls":["SELECT DivReachedDest, CancellationCode, COUNT(*) FROM mytable GROUP BY DivReachedDest, CancellationCode  ORDER BY DivReachedDest, CancellationCode LIMIT 19"]}
 {"sql":"SELECT DivReachedDest, FlightDate, Origin FROM mytable WHERE ArrivalDelayGroups BETWEEN 3 AND -1"}
 {"sql":"SELECT DepartureDelayGroups, SecurityDelay FROM mytable WHERE DestState NOT IN ('TX', 'NE', 'ME') OR DepDelayMinutes < 113.0 ORDER BY Origin, DepTimeBlk LIMIT 22"}
 {"sql":"SELECT Distance, DivAirportLandings, OriginWac FROM mytable ORDER BY DaysSinceEpoch LIMIT 20"}
-{"sql":"SELECT LongestAddGTime, DestCityMarketID FROM mytable WHERE DivAirportSeqIDs < 1320402 OR DestCityName <= 'Orlando, FL' LIMIT 17","hsqls":["SELECT LongestAddGTime, DestCityMarketID FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1320402 OR DivAirportSeqIDs__MV1 < 1320402 OR DivAirportSeqIDs__MV2 < 1320402 OR DivAirportSeqIDs__MV3 < 1320402 OR DivAirportSeqIDs__MV4 < 1320402) OR DestCityName <= 'Orlando, FL' LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DestCityMarketID FROM mytable WHERE DivAirportSeqIDs < 1320402 OR DestCityName <= 'Orlando, FL' LIMIT 17","hsqls":["SELECT LongestAddGTime, DestCityMarketID FROM mytable WHERE (DivAirportSeqIDs[1] < 1320402 OR DivAirportSeqIDs[2] < 1320402 OR DivAirportSeqIDs[3] < 1320402 OR DivAirportSeqIDs[4] < 1320402 OR DivAirportSeqIDs[5] < 1320402) OR DestCityName <= 'Orlando, FL' LIMIT 10000"]}
 {"sql":"SELECT WheelsOn FROM mytable WHERE DestAirportID IN (11042, 14771, 14006, 11111, 15096) ORDER BY CarrierDelay LIMIT 8"}
-{"sql":"SELECT \"Month\", SUM(WheelsOn) FROM mytable WHERE Quarter <> 1 GROUP BY \"Month\" LIMIT 24","hsqls":["SELECT Month, SUM(WheelsOn) FROM mytable WHERE Quarter <> 1 GROUP BY Month LIMIT 24"]}
+{"sql":"SELECT \"Month\", SUM(WheelsOn) FROM mytable WHERE Quarter <> 1 GROUP BY \"Month\" LIMIT 24","hsqls":["SELECT Month, SUM(WheelsOn) FROM mytable WHERE Quarter <> 1 GROUP BY `Month` LIMIT 24"]}
 {"sql":"SELECT DestAirportSeqID, ArrDelay FROM mytable WHERE ArrTime = 523 ORDER BY DepDelayMinutes LIMIT 14"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE AirlineID > 20437 ORDER BY Distance LIMIT 2"}
 {"sql":"SELECT OriginCityMarketID, AVG(NASDelay), COUNT(OriginState) FROM mytable WHERE TotalAddGTime >= 45 OR DepTime BETWEEN 945 AND 546 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 5","hsqls":["SELECT OriginCityMarketID, AVG(NASDelay), COUNT(OriginState) FROM mytable WHERE TotalAddGTime >= 45 OR DepTime BETWEEN 945 AND 546 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 5"]}
 {"sql":"SELECT DestStateName, CancellationCode, COUNT(UniqueCarrier), MIN(AirlineID), AVG(DepDelayMinutes) FROM mytable WHERE WheelsOff = 1911 GROUP BY DestStateName, CancellationCode  ORDER BY DestStateName, CancellationCode LIMIT 10","hsqls":["SELECT DestStateName, CancellationCode, COUNT(UniqueCarrier), MIN(AirlineID), AVG(DepDelayMinutes) FROM mytable WHERE WheelsOff = 1911 GROUP BY DestStateName, CancellationCode  ORDER BY DestStateName, CancellationCode LIMIT 10"]}
-{"sql":"SELECT OriginWac, COUNT(\"Month\"), MIN(DestAirportID), COUNT(CRSElapsedTime) FROM mytable WHERE ArrTime BETWEEN 57 AND 1304 AND DestStateName NOT IN ('Wyoming', 'South Dakota', 'Oklahoma') OR DivLongestGTimes IN (24.0, 79.0, 88.0) GROUP BY OriginWac LIMIT 18","hsqls":["SELECT OriginWac, COUNT(Month), MIN(DestAirportID), COUNT(CRSElapsedTime) FROM mytable WHERE ArrTime BETWEEN 57 AND 1304 AND DestStateName NOT IN ('Wyoming', 'South Dakota', 'Oklahoma') OR (DivLongestGTimes__MV0 IN (24.0, 79.0, 88.0) OR DivLongestGTimes__MV1 IN (24.0, 79.0, 88.0) OR DivLongestGTimes__MV2 IN (24.0, 79.0, 88.0) OR DivLongestGTimes__MV3 IN (24.0, 79.0, 88.0) OR DivLongestGTimes__MV4 IN (24.0, 79.0, 88.0)) GROUP BY OriginWac LIMIT 10000"]}
-{"sql":"SELECT ArrDel15 FROM mytable WHERE DestCityName IN ('Hilo, HI', 'Indianapolis, IN') AND DestCityName BETWEEN 'Christiansted, VI' AND 'Bismarck/Mandan, ND' AND \"Month\" >= 1 LIMIT 6","hsqls":["SELECT ArrDel15 FROM mytable WHERE DestCityName IN ('Hilo, HI', 'Indianapolis, IN') AND DestCityName BETWEEN 'Christiansted, VI' AND 'Bismarck/Mandan, ND' AND Month >= 1 LIMIT 6"]}
+{"sql":"SELECT OriginWac, COUNT(\"Month\"), MIN(DestAirportID), COUNT(CRSElapsedTime) FROM mytable WHERE ArrTime BETWEEN 57 AND 1304 AND DestStateName NOT IN ('Wyoming', 'South Dakota', 'Oklahoma') OR DivLongestGTimes IN (24.0, 79.0, 88.0) GROUP BY OriginWac LIMIT 18","hsqls":["SELECT OriginWac, COUNT(`Month`), MIN(DestAirportID), COUNT(CRSElapsedTime) FROM mytable WHERE ArrTime BETWEEN 57 AND 1304 AND DestStateName NOT IN ('Wyoming', 'South Dakota', 'Oklahoma') OR (DivLongestGTimes[1] IN (24.0, 79.0, 88.0) OR DivLongestGTimes[2] IN (24.0, 79.0, 88.0) OR DivLongestGTimes[3] IN (24.0, 79.0, 88.0) OR DivLongestGTimes[4] IN (24.0, 79.0, 88.0) OR DivLongestGTimes[5] IN (24.0, 79.0, 88.0)) GROUP BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT ArrDel15 FROM mytable WHERE DestCityName IN ('Hilo, HI', 'Indianapolis, IN') AND DestCityName BETWEEN 'Christiansted, VI' AND 'Bismarck/Mandan, ND' AND \"Month\" >= 1 LIMIT 6","hsqls":["SELECT ArrDel15 FROM mytable WHERE DestCityName IN ('Hilo, HI', 'Indianapolis, IN') AND DestCityName BETWEEN 'Christiansted, VI' AND 'Bismarck/Mandan, ND' AND `Month` >= 1 LIMIT 6"]}
 {"sql":"SELECT OriginStateFips, DaysSinceEpoch, COUNT(OriginStateFips), AVG(CarrierDelay) FROM mytable GROUP BY OriginStateFips, DaysSinceEpoch  ORDER BY OriginStateFips, DaysSinceEpoch LIMIT 1","hsqls":["SELECT OriginStateFips, DaysSinceEpoch, COUNT(OriginStateFips), AVG(CarrierDelay) FROM mytable GROUP BY OriginStateFips, DaysSinceEpoch  ORDER BY OriginStateFips, DaysSinceEpoch LIMIT 1"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE ArrTime > 1449 OR Diverted BETWEEN 0 AND 0 LIMIT 10"}
-{"sql":"SELECT DestWac, DivTailNums FROM mytable WHERE LongestAddGTime BETWEEN 31 AND 42 OR TotalAddGTime < 55 ORDER BY DivReachedDest, FlightNum LIMIT 20","hsqls":["SELECT DestWac, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE LongestAddGTime BETWEEN 31 AND 42 OR TotalAddGTime < 55 ORDER BY DivReachedDest, FlightNum LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, \"Year\" FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2","hsqls":["SELECT OriginAirportSeqID, Year FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2"]}
-{"sql":"SELECT Distance, SUM(\"Month\"), AVG(ArrDelayMinutes), SUM(TaxiIn) FROM mytable WHERE TaxiOut = 74 OR DayOfWeek IN (3, 6, 5) GROUP BY Distance LIMIT 23","hsqls":["SELECT Distance, SUM(Month), AVG(ArrDelayMinutes), SUM(TaxiIn) FROM mytable WHERE TaxiOut = 74 OR DayOfWeek IN (3, 6, 5) GROUP BY Distance LIMIT 23"]}
+{"sql":"SELECT DestWac, DivTailNums FROM mytable WHERE LongestAddGTime BETWEEN 31 AND 42 OR TotalAddGTime < 55 ORDER BY DivReachedDest, FlightNum LIMIT 20","hsqls":["SELECT DestWac, DivTailNums FROM mytable WHERE LongestAddGTime BETWEEN 31 AND 42 OR TotalAddGTime < 55 ORDER BY DivReachedDest, FlightNum LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, \"Year\" FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2","hsqls":["SELECT OriginAirportSeqID, `Year` FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2"]}
+{"sql":"SELECT Distance, SUM(\"Month\"), AVG(ArrDelayMinutes), SUM(TaxiIn) FROM mytable WHERE TaxiOut = 74 OR DayOfWeek IN (3, 6, 5) GROUP BY Distance LIMIT 23","hsqls":["SELECT Distance, SUM(`Month`), AVG(ArrDelayMinutes), SUM(TaxiIn) FROM mytable WHERE TaxiOut = 74 OR DayOfWeek IN (3, 6, 5) GROUP BY Distance LIMIT 23"]}
 {"sql":"SELECT DepTime, COUNT(*) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 27","hsqls":["SELECT DepTime, COUNT(*) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 27"]}
-{"sql":"SELECT OriginAirportSeqID, DivLongestGTimes FROM mytable ORDER BY CarrierDelay LIMIT 29","hsqls":["SELECT OriginAirportSeqID, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable ORDER BY CarrierDelay LIMIT 10000"]}
-{"sql":"SELECT TailNum FROM mytable WHERE DestAirportID BETWEEN 14520 AND 13930 AND DivTailNums IN ('N674MQ') AND ArrivalDelayGroups BETWEEN 9 AND 5 ORDER BY AirlineID LIMIT 19","hsqls":["SELECT TailNum FROM mytable WHERE DestAirportID BETWEEN 14520 AND 13930 AND (DivTailNums__MV0 IN ('N674MQ') OR DivTailNums__MV1 IN ('N674MQ') OR DivTailNums__MV2 IN ('N674MQ') OR DivTailNums__MV3 IN ('N674MQ') OR DivTailNums__MV4 IN ('N674MQ')) AND ArrivalDelayGroups BETWEEN 9 AND 5 ORDER BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivLongestGTimes FROM mytable ORDER BY CarrierDelay LIMIT 29","hsqls":["SELECT OriginAirportSeqID, DivLongestGTimes FROM mytable ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT TailNum FROM mytable WHERE DestAirportID BETWEEN 14520 AND 13930 AND DivTailNums IN ('N674MQ') AND ArrivalDelayGroups BETWEEN 9 AND 5 ORDER BY AirlineID LIMIT 19","hsqls":["SELECT TailNum FROM mytable WHERE DestAirportID BETWEEN 14520 AND 13930 AND (DivTailNums[1] IN ('N674MQ') OR DivTailNums[2] IN ('N674MQ') OR DivTailNums[3] IN ('N674MQ') OR DivTailNums[4] IN ('N674MQ') OR DivTailNums[5] IN ('N674MQ')) AND ArrivalDelayGroups BETWEEN 9 AND 5 ORDER BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DepDel15 FROM mytable WHERE CRSDepTime IN (832, 1218, 2001) OR ArrTime >= 1906 ORDER BY DestWac LIMIT 22"}
-{"sql":"SELECT DivTailNums, DaysSinceEpoch FROM mytable ORDER BY DivArrDelay, OriginAirportID LIMIT 13","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DaysSinceEpoch FROM mytable ORDER BY DivArrDelay, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, DaysSinceEpoch FROM mytable ORDER BY DivArrDelay, OriginAirportID LIMIT 13","hsqls":["SELECT DivTailNums, DaysSinceEpoch FROM mytable ORDER BY DivArrDelay, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT Diverted, CRSDepTime, COUNT(*) FROM mytable WHERE DivReachedDest BETWEEN 0 AND -9999 GROUP BY Diverted, CRSDepTime  ORDER BY Diverted, CRSDepTime LIMIT 10","hsqls":["SELECT Diverted, CRSDepTime, COUNT(*) FROM mytable WHERE DivReachedDest BETWEEN 0 AND -9999 GROUP BY Diverted, CRSDepTime  ORDER BY Diverted, CRSDepTime LIMIT 10"]}
 {"sql":"SELECT MIN(Cancelled), SUM(DistanceGroup), MAX(LateAircraftDelay) FROM mytable WHERE ActualElapsedTime IN (133, 186, 99) OR OriginCityMarketID BETWEEN 30279 AND 31641 LIMIT 13"}
 {"sql":"SELECT TaxiOut, DayOfWeek FROM mytable WHERE CancellationCode BETWEEN 'B' AND 'A' AND OriginWac > 44 ORDER BY FlightDate, WheelsOn, UniqueCarrier"}
@@ -189,20 +189,20 @@
 {"sql":"SELECT OriginStateFips, Quarter, CancellationCode FROM mytable WHERE CRSArrTime NOT IN (2140, 956, 2010, 1824, 947) OR ArrTimeBlk NOT IN ('2000-2059', '2200-2259', '0700-0759', '0600-0659', '0001-0559') ORDER BY SecurityDelay LIMIT 9"}
 {"sql":"SELECT DistanceGroup, DivActualElapsedTime, OriginAirportID, AVG(Distance) FROM mytable WHERE NASDelay <= 56 AND FlightNum NOT IN (409, 573, 2093) OR DestWac BETWEEN 11 AND 12 GROUP BY DistanceGroup, DivActualElapsedTime, OriginAirportID  ORDER BY DistanceGroup, DivActualElapsedTime, OriginAirportID LIMIT 18","hsqls":["SELECT DistanceGroup, DivActualElapsedTime, OriginAirportID, AVG(Distance) FROM mytable WHERE NASDelay <= 56 AND FlightNum NOT IN (409, 573, 2093) OR DestWac BETWEEN 11 AND 12 GROUP BY DistanceGroup, DivActualElapsedTime, OriginAirportID  ORDER BY DistanceGroup, DivActualElapsedTime, OriginAirportID LIMIT 18"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE CRSDepTime BETWEEN 1818 AND 1402 OR OriginState > 'CA' ORDER BY Diverted, DepTime, ArrTime LIMIT 22"}
-{"sql":"SELECT OriginAirportSeqID, UniqueCarrier, AVG(OriginWac), SUM(WheelsOff), AVG(CRSArrTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1150 AND 2138 GROUP BY OriginAirportSeqID, UniqueCarrier LIMIT 9","hsqls":["SELECT OriginAirportSeqID, UniqueCarrier, AVG(OriginWac), SUM(WheelsOff), AVG(CRSArrTime) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1150 AND 2138 OR DivWheelsOffs__MV1 BETWEEN 1150 AND 2138 OR DivWheelsOffs__MV2 BETWEEN 1150 AND 2138 OR DivWheelsOffs__MV3 BETWEEN 1150 AND 2138 OR DivWheelsOffs__MV4 BETWEEN 1150 AND 2138) GROUP BY OriginAirportSeqID, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, WeatherDelay FROM mytable WHERE DivAirportSeqIDs IN (1410702, 1306104) LIMIT 13","hsqls":["SELECT TaxiOut, WeatherDelay FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1410702, 1306104) OR DivAirportSeqIDs__MV1 IN (1410702, 1306104) OR DivAirportSeqIDs__MV2 IN (1410702, 1306104) OR DivAirportSeqIDs__MV3 IN (1410702, 1306104) OR DivAirportSeqIDs__MV4 IN (1410702, 1306104)) LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, ArrDel15 FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'DL' ORDER BY Flights, ActualElapsedTime, NASDelay LIMIT 22","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, ArrDel15 FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'DL' ORDER BY Flights, ActualElapsedTime, NASDelay LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, UniqueCarrier, AVG(OriginWac), SUM(WheelsOff), AVG(CRSArrTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1150 AND 2138 GROUP BY OriginAirportSeqID, UniqueCarrier LIMIT 9","hsqls":["SELECT OriginAirportSeqID, UniqueCarrier, AVG(OriginWac), SUM(WheelsOff), AVG(CRSArrTime) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1150 AND 2138 OR DivWheelsOffs[2] BETWEEN 1150 AND 2138 OR DivWheelsOffs[3] BETWEEN 1150 AND 2138 OR DivWheelsOffs[4] BETWEEN 1150 AND 2138 OR DivWheelsOffs[5] BETWEEN 1150 AND 2138) GROUP BY OriginAirportSeqID, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, WeatherDelay FROM mytable WHERE DivAirportSeqIDs IN (1410702, 1306104) LIMIT 13","hsqls":["SELECT TaxiOut, WeatherDelay FROM mytable WHERE (DivAirportSeqIDs[1] IN (1410702, 1306104) OR DivAirportSeqIDs[2] IN (1410702, 1306104) OR DivAirportSeqIDs[3] IN (1410702, 1306104) OR DivAirportSeqIDs[4] IN (1410702, 1306104) OR DivAirportSeqIDs[5] IN (1410702, 1306104)) LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, ArrDel15 FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'DL' ORDER BY Flights, ActualElapsedTime, NASDelay LIMIT 22","hsqls":["SELECT DivTailNums, ArrDel15 FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'DL' ORDER BY Flights, ActualElapsedTime, NASDelay LIMIT 10000"]}
 {"sql":"SELECT WheelsOn FROM mytable ORDER BY OriginAirportSeqID, WheelsOff, AirlineID LIMIT 29"}
 {"sql":"SELECT OriginState, FirstDepTime, Origin, MIN(OriginStateFips), MIN(DivArrDelay), COUNT(LongestAddGTime) FROM mytable WHERE CRSElapsedTime = 340 OR ArrDelayMinutes <> 59.0 OR CRSArrTime >= 801 GROUP BY OriginState, FirstDepTime, Origin  ORDER BY OriginState, FirstDepTime, Origin LIMIT 1","hsqls":["SELECT OriginState, FirstDepTime, Origin, MIN(OriginStateFips), MIN(DivArrDelay), COUNT(LongestAddGTime) FROM mytable WHERE CRSElapsedTime = 340 OR ArrDelayMinutes <> 59.0 OR CRSArrTime >= 801 GROUP BY OriginState, FirstDepTime, Origin  ORDER BY OriginState, FirstDepTime, Origin LIMIT 1"]}
-{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY Quarter, TaxiIn LIMIT 19","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable ORDER BY Quarter, TaxiIn LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, ActualElapsedTime, DivAirportIDs FROM mytable ORDER BY OriginCityMarketID, DivAirportLandings, WheelsOn LIMIT 12","hsqls":["SELECT DivReachedDest, ActualElapsedTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY OriginCityMarketID, DivAirportLandings, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16090 AND 16073 OR DivAirports BETWEEN 'SMF' AND 'SRQ' LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16090 AND 16073 OR (DivAirports__MV0 BETWEEN 'SMF' AND 'SRQ' OR DivAirports__MV1 BETWEEN 'SMF' AND 'SRQ' OR DivAirports__MV2 BETWEEN 'SMF' AND 'SRQ' OR DivAirports__MV3 BETWEEN 'SMF' AND 'SRQ' OR DivAirports__MV4 BETWEEN 'SMF' AND 'SRQ') LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY Quarter, TaxiIn LIMIT 19","hsqls":["SELECT DivWheelsOns FROM mytable ORDER BY Quarter, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, ActualElapsedTime, DivAirportIDs FROM mytable ORDER BY OriginCityMarketID, DivAirportLandings, WheelsOn LIMIT 12","hsqls":["SELECT DivReachedDest, ActualElapsedTime, DivAirportIDs FROM mytable ORDER BY OriginCityMarketID, DivAirportLandings, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16090 AND 16073 OR DivAirports BETWEEN 'SMF' AND 'SRQ' LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16090 AND 16073 OR (DivAirports[1] BETWEEN 'SMF' AND 'SRQ' OR DivAirports[2] BETWEEN 'SMF' AND 'SRQ' OR DivAirports[3] BETWEEN 'SMF' AND 'SRQ' OR DivAirports[4] BETWEEN 'SMF' AND 'SRQ' OR DivAirports[5] BETWEEN 'SMF' AND 'SRQ') LIMIT 10000"]}
 {"sql":"SELECT WheelsOn, COUNT(*) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 25","hsqls":["SELECT WheelsOn, COUNT(*) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 25"]}
 {"sql":"SELECT OriginWac FROM mytable WHERE LateAircraftDelay BETWEEN 14 AND 250 AND OriginCityMarketID BETWEEN 31401 AND 34520 ORDER BY OriginAirportSeqID, NASDelay, DivArrDelay LIMIT 17"}
 {"sql":"SELECT TotalAddGTime, DivAirportLandings FROM mytable WHERE DestStateFips BETWEEN 37 AND 75 ORDER BY DepDel15, CRSDepTime LIMIT 18"}
 {"sql":"SELECT SecurityDelay, DepTime, DestAirportID, COUNT(OriginAirportID) FROM mytable GROUP BY SecurityDelay, DepTime, DestAirportID  ORDER BY SecurityDelay, DepTime, DestAirportID LIMIT 6","hsqls":["SELECT SecurityDelay, DepTime, DestAirportID, COUNT(OriginAirportID) FROM mytable GROUP BY SecurityDelay, DepTime, DestAirportID  ORDER BY SecurityDelay, DepTime, DestAirportID LIMIT 6"]}
 {"sql":"SELECT DestWac, FirstDepTime, OriginAirportID, AVG(DayofMonth), MIN(DayofMonth) FROM mytable WHERE DayOfWeek NOT IN (7, 6, 5, 4) GROUP BY DestWac, FirstDepTime, OriginAirportID  ORDER BY DestWac, FirstDepTime, OriginAirportID LIMIT 8","hsqls":["SELECT DestWac, FirstDepTime, OriginAirportID, AVG(DayofMonth), MIN(DayofMonth) FROM mytable WHERE DayOfWeek NOT IN (7, 6, 5, 4) GROUP BY DestWac, FirstDepTime, OriginAirportID  ORDER BY DestWac, FirstDepTime, OriginAirportID LIMIT 8"]}
-{"sql":"SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE DivTailNums <= 'N940DN' AND ArrDel15 < 1 AND DestCityMarketID IN (35550, 34696) GROUP BY ActualElapsedTime LIMIT 17","hsqls":["SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 <= 'N940DN' OR DivTailNums__MV1 <= 'N940DN' OR DivTailNums__MV2 <= 'N940DN' OR DivTailNums__MV3 <= 'N940DN' OR DivTailNums__MV4 <= 'N940DN') AND ArrDel15 < 1 AND DestCityMarketID IN (35550, 34696) GROUP BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE DivTailNums <= 'N940DN' AND ArrDel15 < 1 AND DestCityMarketID IN (35550, 34696) GROUP BY ActualElapsedTime LIMIT 17","hsqls":["SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE (DivTailNums[1] <= 'N940DN' OR DivTailNums[2] <= 'N940DN' OR DivTailNums[3] <= 'N940DN' OR DivTailNums[4] <= 'N940DN' OR DivTailNums[5] <= 'N940DN') AND ArrDel15 < 1 AND DestCityMarketID IN (35550, 34696) GROUP BY ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, ActualElapsedTime, COUNT(DepDelay), MAX(DivArrDelay), MAX(AirTime) FROM mytable WHERE TaxiIn <= 19 GROUP BY WheelsOff, ActualElapsedTime  ORDER BY WheelsOff, ActualElapsedTime LIMIT 15","hsqls":["SELECT WheelsOff, ActualElapsedTime, COUNT(DepDelay), MAX(DivArrDelay), MAX(AirTime) FROM mytable WHERE TaxiIn <= 19 GROUP BY WheelsOff, ActualElapsedTime  ORDER BY WheelsOff, ActualElapsedTime LIMIT 15"]}
 {"sql":"SELECT OriginStateFips, MAX(OriginAirportSeqID), MIN(ArrDelay) FROM mytable WHERE DepDel15 <> 0 OR SecurityDelay IN (1, 0, 4, 18, 14) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 20","hsqls":["SELECT OriginStateFips, MAX(OriginAirportSeqID), MIN(ArrDelay) FROM mytable WHERE DepDel15 <> 0 OR SecurityDelay IN (1, 0, 4, 18, 14) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 20"]}
 {"sql":"SELECT DistanceGroup, ActualElapsedTime, COUNT(*) FROM mytable GROUP BY DistanceGroup, ActualElapsedTime  ORDER BY DistanceGroup, ActualElapsedTime LIMIT 1","hsqls":["SELECT DistanceGroup, ActualElapsedTime, COUNT(*) FROM mytable GROUP BY DistanceGroup, ActualElapsedTime  ORDER BY DistanceGroup, ActualElapsedTime LIMIT 1"]}
@@ -213,198 +213,198 @@
 {"sql":"SELECT DestWac, NASDelay, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-22') AND DepDelayMinutes > 332.0 GROUP BY DestWac, NASDelay  ORDER BY DestWac, NASDelay LIMIT 16","hsqls":["SELECT DestWac, NASDelay, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-22') AND DepDelayMinutes > 332.0 GROUP BY DestWac, NASDelay  ORDER BY DestWac, NASDelay LIMIT 16"]}
 {"sql":"SELECT MIN(OriginAirportSeqID) FROM mytable WHERE ArrDelay >= 181.0 OR CRSElapsedTime NOT IN (251, 96, 333, 158) AND DestCityMarketID BETWEEN 30731 AND 33495 LIMIT 27"}
 {"sql":"SELECT DestState, TotalAddGTime, TaxiIn FROM mytable ORDER BY Carrier, DepDelayMinutes, OriginStateName LIMIT 1"}
-{"sql":"SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE DivTailNums IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') LIMIT 7","hsqls":["SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE (DivTailNums__MV0 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV1 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV2 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV3 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV4 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN')) LIMIT 10000"]}
+{"sql":"SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE DivTailNums IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') LIMIT 7","hsqls":["SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE (DivTailNums[1] IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums[2] IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums[3] IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums[4] IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums[5] IN ('N3751B', 'N296WN', 'N416SW', 'N472WN')) LIMIT 10000"]}
 {"sql":"SELECT DestWac, TailNum FROM mytable ORDER BY DestAirportSeqID LIMIT 3"}
 {"sql":"SELECT OriginState, ArrDelay, DivArrDelay FROM mytable WHERE WheelsOn BETWEEN 1128 AND 1548 AND CRSDepTime < 1619 LIMIT 14"}
 {"sql":"SELECT OriginAirportSeqID, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, ArrTimeBlk  ORDER BY OriginAirportSeqID, ArrTimeBlk LIMIT 26","hsqls":["SELECT OriginAirportSeqID, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, ArrTimeBlk  ORDER BY OriginAirportSeqID, ArrTimeBlk LIMIT 26"]}
 {"sql":"SELECT FlightNum, ActualElapsedTime FROM mytable WHERE DepartureDelayGroups NOT IN (1, -1, 6, 11, 12) ORDER BY DistanceGroup, Dest LIMIT 23"}
-{"sql":"SELECT DepDel15, \"Month\" FROM mytable WHERE OriginAirportSeqID BETWEEN 1020803 AND 1281902 OR ArrDel15 IN (1, 0, -9999) AND AirlineID IN (20398, 20437) ORDER BY DepDelay LIMIT 4","hsqls":["SELECT DepDel15, Month FROM mytable WHERE OriginAirportSeqID BETWEEN 1020803 AND 1281902 OR ArrDel15 IN (1, 0, -9999) AND AirlineID IN (20398, 20437) ORDER BY DepDelay LIMIT 4"]}
+{"sql":"SELECT DepDel15, \"Month\" FROM mytable WHERE OriginAirportSeqID BETWEEN 1020803 AND 1281902 OR ArrDel15 IN (1, 0, -9999) AND AirlineID IN (20398, 20437) ORDER BY DepDelay LIMIT 4","hsqls":["SELECT DepDel15, `Month` FROM mytable WHERE OriginAirportSeqID BETWEEN 1020803 AND 1281902 OR ArrDel15 IN (1, 0, -9999) AND AirlineID IN (20398, 20437) ORDER BY DepDelay LIMIT 4"]}
 {"sql":"SELECT Carrier, ArrDelay, AVG(CRSDepTime), SUM(OriginCityMarketID), SUM(DepartureDelayGroups) FROM mytable WHERE DayofMonth <= 1 OR ActualElapsedTime BETWEEN 91 AND 253 GROUP BY Carrier, ArrDelay  ORDER BY Carrier, ArrDelay LIMIT 5","hsqls":["SELECT Carrier, ArrDelay, AVG(CRSDepTime), SUM(OriginCityMarketID), SUM(DepartureDelayGroups) FROM mytable WHERE DayofMonth <= 1 OR ActualElapsedTime BETWEEN 91 AND 253 GROUP BY Carrier, ArrDelay  ORDER BY Carrier, ArrDelay LIMIT 5"]}
 {"sql":"SELECT DestCityName, DaysSinceEpoch, AVG(SecurityDelay), AVG(OriginAirportID) FROM mytable WHERE OriginStateName NOT IN ('Louisiana', 'Maine', 'West Virginia', 'Indiana', 'Rhode Island') OR CRSElapsedTime IN (200, 176) GROUP BY DestCityName, DaysSinceEpoch  ORDER BY DestCityName, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DestCityName, DaysSinceEpoch, AVG(SecurityDelay), AVG(OriginAirportID) FROM mytable WHERE OriginStateName NOT IN ('Louisiana', 'Maine', 'West Virginia', 'Indiana', 'Rhode Island') OR CRSElapsedTime IN (200, 176) GROUP BY DestCityName, DaysSinceEpoch  ORDER BY DestCityName, DaysSinceEpoch LIMIT 12"]}
 {"sql":"SELECT TotalAddGTime, DivActualElapsedTime FROM mytable ORDER BY OriginStateName LIMIT 4"}
 {"sql":"SELECT AirlineID, COUNT(*) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 9","hsqls":["SELECT AirlineID, COUNT(*) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 9"]}
 {"sql":"SELECT Carrier, DepDelayMinutes, CRSElapsedTime, COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DaysSinceEpoch BETWEEN 16083 AND 16078 OR CRSArrTime BETWEEN 2253 AND 1621 GROUP BY Carrier, DepDelayMinutes, CRSElapsedTime  ORDER BY Carrier, DepDelayMinutes, CRSElapsedTime LIMIT 17","hsqls":["SELECT Carrier, DepDelayMinutes, CRSElapsedTime, COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DaysSinceEpoch BETWEEN 16083 AND 16078 OR CRSArrTime BETWEEN 2253 AND 1621 GROUP BY Carrier, DepDelayMinutes, CRSElapsedTime  ORDER BY Carrier, DepDelayMinutes, CRSElapsedTime LIMIT 17"]}
 {"sql":"SELECT FlightNum, Dest, COUNT(DestStateName), SUM(DivDistance) FROM mytable WHERE DivArrDelay <= 74 AND LateAircraftDelay >= 63 OR DepTimeBlk BETWEEN '1900-1959' AND '1500-1559' GROUP BY FlightNum, Dest  ORDER BY FlightNum, Dest LIMIT 14","hsqls":["SELECT FlightNum, Dest, COUNT(DestStateName), SUM(DivDistance) FROM mytable WHERE DivArrDelay <= 74 AND LateAircraftDelay >= 63 OR DepTimeBlk BETWEEN '1900-1959' AND '1500-1559' GROUP BY FlightNum, Dest  ORDER BY FlightNum, Dest LIMIT 14"]}
-{"sql":"SELECT DepartureDelayGroups, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE OriginCityName BETWEEN 'Wrangell, AK' AND 'Omaha, NE' AND OriginCityMarketID > 33792 AND DivAirports IN ('ACY') ORDER BY DestStateFips, ArrDel15 LIMIT 27","hsqls":["SELECT DepartureDelayGroups, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginCityName BETWEEN 'Wrangell, AK' AND 'Omaha, NE' AND OriginCityMarketID > 33792 AND (DivAirports__MV0 IN ('ACY') OR DivAirports__MV1 IN ('ACY') OR DivAirports__MV2 IN ('ACY') OR DivAirports__MV3 IN ('ACY') OR DivAirports__MV4 IN ('ACY')) ORDER BY DestStateFips, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT AVG(\"Year\"), MAX(WheelsOn), AVG(Cancelled) FROM mytable WHERE ArrDelayMinutes BETWEEN 106.0 AND 224.0 OR DestWac IN (65, 83, 72) LIMIT 14","hsqls":["SELECT AVG(Year), MAX(WheelsOn), AVG(Cancelled) FROM mytable WHERE ArrDelayMinutes BETWEEN 106.0 AND 224.0 OR DestWac IN (65, 83, 72) LIMIT 14"]}
+{"sql":"SELECT DepartureDelayGroups, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE OriginCityName BETWEEN 'Wrangell, AK' AND 'Omaha, NE' AND OriginCityMarketID > 33792 AND DivAirports IN ('ACY') ORDER BY DestStateFips, ArrDel15 LIMIT 27","hsqls":["SELECT DepartureDelayGroups, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE OriginCityName BETWEEN 'Wrangell, AK' AND 'Omaha, NE' AND OriginCityMarketID > 33792 AND (DivAirports[1] IN ('ACY') OR DivAirports[2] IN ('ACY') OR DivAirports[3] IN ('ACY') OR DivAirports[4] IN ('ACY') OR DivAirports[5] IN ('ACY')) ORDER BY DestStateFips, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT AVG(\"Year\"), MAX(WheelsOn), AVG(Cancelled) FROM mytable WHERE ArrDelayMinutes BETWEEN 106.0 AND 224.0 OR DestWac IN (65, 83, 72) LIMIT 14","hsqls":["SELECT AVG(`Year`), MAX(WheelsOn), AVG(Cancelled) FROM mytable WHERE ArrDelayMinutes BETWEEN 106.0 AND 224.0 OR DestWac IN (65, 83, 72) LIMIT 14"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DestStateFips IN (42, 56, 55) ORDER BY ArrivalDelayGroups"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19790 AND 19805 AND DepTimeBlk <= '1000-1059' LIMIT 20"}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE CRSArrTime IN (1947, 650, 1940, 50, 2242) OR OriginStateFips >= 75 ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE CRSArrTime IN (1947, 650, 1940, 50, 2242) OR OriginStateFips >= 75 ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE CRSArrTime IN (1947, 650, 1940, 50, 2242) OR OriginStateFips >= 75 ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 4","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE CRSArrTime IN (1947, 650, 1940, 50, 2242) OR OriginStateFips >= 75 ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Flights, DestStateFips, CRSDepTime FROM mytable ORDER BY FirstDepTime, DepTime LIMIT 9"}
 {"sql":"SELECT FlightNum, ActualElapsedTime FROM mytable ORDER BY ArrDelayMinutes LIMIT 15"}
-{"sql":"SELECT Dest, DivTotalGTimes FROM mytable WHERE DestAirportID BETWEEN 10423 AND 10140 AND NASDelay BETWEEN 2 AND 12 ORDER BY DepTimeBlk LIMIT 4","hsqls":["SELECT Dest, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestAirportID BETWEEN 10423 AND 10140 AND NASDelay BETWEEN 2 AND 12 ORDER BY DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT Flights, LongestAddGTime, CarrierDelay, COUNT(\"Month\"), MAX(TaxiIn) FROM mytable WHERE DestState BETWEEN 'MS' AND 'MD' GROUP BY Flights, LongestAddGTime, CarrierDelay LIMIT 18","hsqls":["SELECT Flights, LongestAddGTime, CarrierDelay, COUNT(Month), MAX(TaxiIn) FROM mytable WHERE DestState BETWEEN 'MS' AND 'MD' GROUP BY Flights, LongestAddGTime, CarrierDelay LIMIT 18"]}
+{"sql":"SELECT Dest, DivTotalGTimes FROM mytable WHERE DestAirportID BETWEEN 10423 AND 10140 AND NASDelay BETWEEN 2 AND 12 ORDER BY DepTimeBlk LIMIT 4","hsqls":["SELECT Dest, DivTotalGTimes FROM mytable WHERE DestAirportID BETWEEN 10423 AND 10140 AND NASDelay BETWEEN 2 AND 12 ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT Flights, LongestAddGTime, CarrierDelay, COUNT(\"Month\"), MAX(TaxiIn) FROM mytable WHERE DestState BETWEEN 'MS' AND 'MD' GROUP BY Flights, LongestAddGTime, CarrierDelay LIMIT 18","hsqls":["SELECT Flights, LongestAddGTime, CarrierDelay, COUNT(`Month`), MAX(TaxiIn) FROM mytable WHERE DestState BETWEEN 'MS' AND 'MD' GROUP BY Flights, LongestAddGTime, CarrierDelay LIMIT 18"]}
 {"sql":"SELECT TailNum, DestCityMarketID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1199603 AND 1425603 OR TotalAddGTime BETWEEN 78 AND 47 AND ArrivalDelayGroups >= 4 GROUP BY TailNum, DestCityMarketID","hsqls":["SELECT TailNum, DestCityMarketID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1199603 AND 1425603 OR TotalAddGTime BETWEEN 78 AND 47 AND ArrivalDelayGroups >= 4 GROUP BY TailNum, DestCityMarketID"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE DestWac BETWEEN 12 AND 85 ORDER BY DepTimeBlk"}
 {"sql":"SELECT LateAircraftDelay, ArrDel15, MIN(Diverted) FROM mytable WHERE OriginAirportSeqID BETWEEN 1087402 AND 1324402 OR DayOfWeek BETWEEN 1 AND 1 GROUP BY LateAircraftDelay, ArrDel15  ORDER BY LateAircraftDelay, ArrDel15 LIMIT 23","hsqls":["SELECT LateAircraftDelay, ArrDel15, MIN(Diverted) FROM mytable WHERE OriginAirportSeqID BETWEEN 1087402 AND 1324402 OR DayOfWeek BETWEEN 1 AND 1 GROUP BY LateAircraftDelay, ArrDel15  ORDER BY LateAircraftDelay, ArrDel15 LIMIT 23"]}
 {"sql":"SELECT CarrierDelay, FlightDate, AVG(LongestAddGTime), SUM(FirstDepTime), COUNT(DepTime) FROM mytable GROUP BY CarrierDelay, FlightDate  ORDER BY CarrierDelay, FlightDate LIMIT 28","hsqls":["SELECT CarrierDelay, FlightDate, AVG(LongestAddGTime), SUM(FirstDepTime), COUNT(DepTime) FROM mytable GROUP BY CarrierDelay, FlightDate  ORDER BY CarrierDelay, FlightDate LIMIT 28"]}
 {"sql":"SELECT DistanceGroup, DepDelay, Cancelled, COUNT(*) FROM mytable GROUP BY DistanceGroup, DepDelay, Cancelled  ORDER BY DistanceGroup, DepDelay, Cancelled LIMIT 1","hsqls":["SELECT DistanceGroup, DepDelay, Cancelled, COUNT(*) FROM mytable GROUP BY DistanceGroup, DepDelay, Cancelled  ORDER BY DistanceGroup, DepDelay, Cancelled LIMIT 1"]}
-{"sql":"SELECT DepartureDelayGroups, DestWac, ArrDelay FROM mytable WHERE Diverted >= 1 AND DivAirportSeqIDs < 1410803 OR DestStateFips BETWEEN 31 AND 53 ORDER BY DepDelayMinutes LIMIT 15","hsqls":["SELECT DepartureDelayGroups, DestWac, ArrDelay FROM mytable WHERE Diverted >= 1 AND (DivAirportSeqIDs__MV0 < 1410803 OR DivAirportSeqIDs__MV1 < 1410803 OR DivAirportSeqIDs__MV2 < 1410803 OR DivAirportSeqIDs__MV3 < 1410803 OR DivAirportSeqIDs__MV4 < 1410803) OR DestStateFips BETWEEN 31 AND 53 ORDER BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DestWac, ArrDelay FROM mytable WHERE Diverted >= 1 AND DivAirportSeqIDs < 1410803 OR DestStateFips BETWEEN 31 AND 53 ORDER BY DepDelayMinutes LIMIT 15","hsqls":["SELECT DepartureDelayGroups, DestWac, ArrDelay FROM mytable WHERE Diverted >= 1 AND (DivAirportSeqIDs[1] < 1410803 OR DivAirportSeqIDs[2] < 1410803 OR DivAirportSeqIDs[3] < 1410803 OR DivAirportSeqIDs[4] < 1410803 OR DivAirportSeqIDs[5] < 1410803) OR DestStateFips BETWEEN 31 AND 53 ORDER BY DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT AVG(FlightNum), AVG(Distance), SUM(DivActualElapsedTime) FROM mytable WHERE CRSDepTime IN (1644, 1333, 1911) LIMIT 10"}
-{"sql":"SELECT TaxiIn, DaysSinceEpoch FROM mytable WHERE OriginStateFips BETWEEN 16 AND 27 AND DivAirportIDs <= 15991 ORDER BY FlightNum, DaysSinceEpoch LIMIT 13","hsqls":["SELECT TaxiIn, DaysSinceEpoch FROM mytable WHERE OriginStateFips BETWEEN 16 AND 27 AND (DivAirportIDs__MV0 <= 15991 OR DivAirportIDs__MV1 <= 15991 OR DivAirportIDs__MV2 <= 15991 OR DivAirportIDs__MV3 <= 15991 OR DivAirportIDs__MV4 <= 15991) ORDER BY FlightNum, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DaysSinceEpoch FROM mytable WHERE OriginStateFips BETWEEN 16 AND 27 AND DivAirportIDs <= 15991 ORDER BY FlightNum, DaysSinceEpoch LIMIT 13","hsqls":["SELECT TaxiIn, DaysSinceEpoch FROM mytable WHERE OriginStateFips BETWEEN 16 AND 27 AND (DivAirportIDs[1] <= 15991 OR DivAirportIDs[2] <= 15991 OR DivAirportIDs[3] <= 15991 OR DivAirportIDs[4] <= 15991 OR DivAirportIDs[5] <= 15991) ORDER BY FlightNum, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, MIN(ArrivalDelayGroups) FROM mytable WHERE FlightNum IN (5280) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 17","hsqls":["SELECT ArrDelay, MIN(ArrivalDelayGroups) FROM mytable WHERE FlightNum IN (5280) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 17"]}
-{"sql":"SELECT TaxiOut, \"Year\" FROM mytable LIMIT 10","hsqls":["SELECT TaxiOut, Year FROM mytable LIMIT 10"]}
+{"sql":"SELECT TaxiOut, \"Year\" FROM mytable LIMIT 10","hsqls":["SELECT TaxiOut, `Year` FROM mytable LIMIT 10"]}
 {"sql":"SELECT DivDistance, DestAirportSeqID, Origin, COUNT(DestAirportSeqID), COUNT(Diverted), MIN(CRSArrTime) FROM mytable GROUP BY DivDistance, DestAirportSeqID, Origin  ORDER BY DivDistance, DestAirportSeqID, Origin LIMIT 18","hsqls":["SELECT DivDistance, DestAirportSeqID, Origin, COUNT(DestAirportSeqID), COUNT(Diverted), MIN(CRSArrTime) FROM mytable GROUP BY DivDistance, DestAirportSeqID, Origin  ORDER BY DivDistance, DestAirportSeqID, Origin LIMIT 18"]}
-{"sql":"SELECT OriginCityMarketID, NASDelay FROM mytable ORDER BY OriginStateFips, \"Month\" LIMIT 15","hsqls":["SELECT OriginCityMarketID, NASDelay FROM mytable ORDER BY OriginStateFips, Month LIMIT 15"]}
+{"sql":"SELECT OriginCityMarketID, NASDelay FROM mytable ORDER BY OriginStateFips, \"Month\" LIMIT 15","hsqls":["SELECT OriginCityMarketID, NASDelay FROM mytable ORDER BY OriginStateFips, `Month` LIMIT 15"]}
 {"sql":"SELECT DepDelayMinutes, WheelsOn, OriginStateName FROM mytable WHERE OriginStateFips IN (6, 47, 55, 33, 13) ORDER BY OriginStateFips LIMIT 17"}
 {"sql":"SELECT OriginAirportSeqID, ArrDel15, AirlineID FROM mytable LIMIT 19"}
 {"sql":"SELECT Origin, DestAirportID, MIN(LateAircraftDelay), AVG(OriginWac), MAX(TaxiIn) FROM mytable WHERE DestCityMarketID IN (30747, 32389, 30189) AND DepDelayMinutes <> 134.0 GROUP BY Origin, DestAirportID  ORDER BY Origin, DestAirportID LIMIT 10","hsqls":["SELECT Origin, DestAirportID, MIN(LateAircraftDelay), AVG(OriginWac), MAX(TaxiIn) FROM mytable WHERE DestCityMarketID IN (30747, 32389, 30189) AND DepDelayMinutes <> 134.0 GROUP BY Origin, DestAirportID  ORDER BY Origin, DestAirportID LIMIT 10"]}
 {"sql":"SELECT Quarter, ArrTimeBlk, UniqueCarrier FROM mytable WHERE DepDelayMinutes BETWEEN 114.0 AND 141.0 AND AirlineID < 19790 AND DestAirportSeqID IN (1244805, 1074702, 1073905, 1393003) ORDER BY FlightNum, SecurityDelay LIMIT 12"}
-{"sql":"SELECT DepDelay, DestAirportSeqID, DivWheelsOffs FROM mytable WHERE Distance <> 1352 AND DivWheelsOns IN (1953, 1816) ORDER BY Origin LIMIT 27","hsqls":["SELECT DepDelay, DestAirportSeqID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Distance <> 1352 AND (DivWheelsOns__MV0 IN (1953, 1816) OR DivWheelsOns__MV1 IN (1953, 1816) OR DivWheelsOns__MV2 IN (1953, 1816) OR DivWheelsOns__MV3 IN (1953, 1816) OR DivWheelsOns__MV4 IN (1953, 1816)) ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DestAirportSeqID, DivWheelsOffs FROM mytable WHERE Distance <> 1352 AND DivWheelsOns IN (1953, 1816) ORDER BY Origin LIMIT 27","hsqls":["SELECT DepDelay, DestAirportSeqID, DivWheelsOffs FROM mytable WHERE Distance <> 1352 AND (DivWheelsOns[1] IN (1953, 1816) OR DivWheelsOns[2] IN (1953, 1816) OR DivWheelsOns[3] IN (1953, 1816) OR DivWheelsOns[4] IN (1953, 1816) OR DivWheelsOns[5] IN (1953, 1816)) ORDER BY Origin LIMIT 10000"]}
 {"sql":"SELECT CRSElapsedTime, MAX(WheelsOn), COUNT(ActualElapsedTime) FROM mytable WHERE TaxiIn NOT IN (25, 13, 140, 29) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 5","hsqls":["SELECT CRSElapsedTime, MAX(WheelsOn), COUNT(ActualElapsedTime) FROM mytable WHERE TaxiIn NOT IN (25, 13, 140, 29) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 5"]}
-{"sql":"SELECT DestWac, DivAirports FROM mytable ORDER BY Quarter, Origin LIMIT 19","hsqls":["SELECT DestWac, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY Quarter, Origin LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirports FROM mytable ORDER BY Quarter, Origin LIMIT 19","hsqls":["SELECT DestWac, DivAirports FROM mytable ORDER BY Quarter, Origin LIMIT 10000"]}
 {"sql":"SELECT ArrTime, ArrivalDelayGroups, DaysSinceEpoch, AVG(ActualElapsedTime), COUNT(Diverted) FROM mytable WHERE ArrTime BETWEEN 1804 AND 107 GROUP BY ArrTime, ArrivalDelayGroups, DaysSinceEpoch  ORDER BY ArrTime, ArrivalDelayGroups, DaysSinceEpoch LIMIT 11","hsqls":["SELECT ArrTime, ArrivalDelayGroups, DaysSinceEpoch, AVG(ActualElapsedTime), COUNT(Diverted) FROM mytable WHERE ArrTime BETWEEN 1804 AND 107 GROUP BY ArrTime, ArrivalDelayGroups, DaysSinceEpoch  ORDER BY ArrTime, ArrivalDelayGroups, DaysSinceEpoch LIMIT 11"]}
 {"sql":"SELECT Distance, AirTime, DivActualElapsedTime, MAX(DivActualElapsedTime), SUM(WheelsOff) FROM mytable WHERE NASDelay >= 305 AND DivActualElapsedTime IN (200, 232, 485, 307, 834) AND FirstDepTime BETWEEN 2009 AND 921 GROUP BY Distance, AirTime, DivActualElapsedTime  ORDER BY Distance, AirTime, DivActualElapsedTime LIMIT 8","hsqls":["SELECT Distance, AirTime, DivActualElapsedTime, MAX(DivActualElapsedTime), SUM(WheelsOff) FROM mytable WHERE NASDelay >= 305 AND DivActualElapsedTime IN (200, 232, 485, 307, 834) AND FirstDepTime BETWEEN 2009 AND 921 GROUP BY Distance, AirTime, DivActualElapsedTime  ORDER BY Distance, AirTime, DivActualElapsedTime LIMIT 8"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'HA' ORDER BY TaxiIn LIMIT 10","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'HA' ORDER BY TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'HA' ORDER BY TaxiIn LIMIT 10","hsqls":["SELECT DivWheelsOns FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'HA' ORDER BY TaxiIn LIMIT 10000"]}
 {"sql":"SELECT DestCityName, DestCityMarketID, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivActualElapsedTime IN (433, 307, 834) GROUP BY DestCityName, DestCityMarketID, ArrivalDelayGroups  ORDER BY DestCityName, DestCityMarketID, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT DestCityName, DestCityMarketID, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivActualElapsedTime IN (433, 307, 834) GROUP BY DestCityName, DestCityMarketID, ArrivalDelayGroups  ORDER BY DestCityName, DestCityMarketID, ArrivalDelayGroups LIMIT 14"]}
-{"sql":"SELECT TaxiOut, WeatherDelay, ActualElapsedTime, MIN(WheelsOn), SUM(DepDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND DivTotalGTimes IN (2) AND DivTailNums BETWEEN 'N436WN' AND 'N986CA' GROUP BY TaxiOut, WeatherDelay, ActualElapsedTime LIMIT 4","hsqls":["SELECT TaxiOut, WeatherDelay, ActualElapsedTime, MIN(WheelsOn), SUM(DepDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND (DivTotalGTimes__MV0 IN (2) OR DivTotalGTimes__MV1 IN (2) OR DivTotalGTimes__MV2 IN (2) OR DivTotalGTimes__MV3 IN (2) OR DivTotalGTimes__MV4 IN (2)) AND (DivTailNums__MV0 BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums__MV1 BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums__MV2 BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums__MV3 BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums__MV4 BETWEEN 'N436WN' AND 'N986CA') GROUP BY TaxiOut, WeatherDelay, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, WeatherDelay, ActualElapsedTime, MIN(WheelsOn), SUM(DepDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND DivTotalGTimes IN (2) AND DivTailNums BETWEEN 'N436WN' AND 'N986CA' GROUP BY TaxiOut, WeatherDelay, ActualElapsedTime LIMIT 4","hsqls":["SELECT TaxiOut, WeatherDelay, ActualElapsedTime, MIN(WheelsOn), SUM(DepDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND (DivTotalGTimes[1] IN (2) OR DivTotalGTimes[2] IN (2) OR DivTotalGTimes[3] IN (2) OR DivTotalGTimes[4] IN (2) OR DivTotalGTimes[5] IN (2)) AND (DivTailNums[1] BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums[2] BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums[3] BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums[4] BETWEEN 'N436WN' AND 'N986CA' OR DivTailNums[5] BETWEEN 'N436WN' AND 'N986CA') GROUP BY TaxiOut, WeatherDelay, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE ArrTimeBlk IN ('2200-2259') ORDER BY DestState LIMIT 5"}
-{"sql":"SELECT Carrier FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND FirstDepTime NOT IN (944, 921) ORDER BY Quarter, ArrDelay LIMIT 26","hsqls":["SELECT Carrier FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND FirstDepTime NOT IN (944, 921) ORDER BY Quarter, ArrDelay LIMIT 26"]}
+{"sql":"SELECT Carrier FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND FirstDepTime NOT IN (944, 921) ORDER BY Quarter, ArrDelay LIMIT 26","hsqls":["SELECT Carrier FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND FirstDepTime NOT IN (944, 921) ORDER BY Quarter, ArrDelay LIMIT 26"]}
 {"sql":"SELECT Dest, OriginAirportID FROM mytable WHERE DestStateName IN ('Wisconsin', 'Oregon') OR DaysSinceEpoch BETWEEN 16089 AND 16075 OR WheelsOff NOT IN (623, 1028) ORDER BY DivDistance, Flights, DepTimeBlk LIMIT 22"}
 {"sql":"SELECT Diverted, MAX(ArrDel15) FROM mytable WHERE ArrTimeBlk <> '0900-0959' AND Origin BETWEEN 'SHV' AND 'RAP' AND DivActualElapsedTime IN (738, 227, 324, 305, 563) GROUP BY Diverted  ORDER BY Diverted LIMIT 7","hsqls":["SELECT Diverted, MAX(ArrDel15) FROM mytable WHERE ArrTimeBlk <> '0900-0959' AND Origin BETWEEN 'SHV' AND 'RAP' AND DivActualElapsedTime IN (738, 227, 324, 305, 563) GROUP BY Diverted  ORDER BY Diverted LIMIT 7"]}
-{"sql":"SELECT DivAirportIDs, DepDel15, CancellationCode FROM mytable WHERE DestCityName < 'State College, PA' OR DivAirportIDs BETWEEN 10868 AND 11267 AND DivAirportLandings IN (2, 0, 9) ORDER BY DestStateName LIMIT 12","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DepDel15, CancellationCode FROM mytable WHERE DestCityName < 'State College, PA' OR (DivAirportIDs__MV0 BETWEEN 10868 AND 11267 OR DivAirportIDs__MV1 BETWEEN 10868 AND 11267 OR DivAirportIDs__MV2 BETWEEN 10868 AND 11267 OR DivAirportIDs__MV3 BETWEEN 10868 AND 11267 OR DivAirportIDs__MV4 BETWEEN 10868 AND 11267) AND DivAirportLandings IN (2, 0, 9) ORDER BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, ArrTimeBlk, CRSDepTime FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Nebraska' ORDER BY DepTime LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTimeBlk, CRSDepTime FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Nebraska' ORDER BY DepTime LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, \"Year\", DivTailNums FROM mytable WHERE Carrier > 'F9' ORDER BY Carrier, WeatherDelay, OriginCityName LIMIT 22","hsqls":["SELECT DistanceGroup, Year, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Carrier > 'F9' ORDER BY Carrier, WeatherDelay, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, DepDel15, CancellationCode FROM mytable WHERE DestCityName < 'State College, PA' OR DivAirportIDs BETWEEN 10868 AND 11267 AND DivAirportLandings IN (2, 0, 9) ORDER BY DestStateName LIMIT 12","hsqls":["SELECT DivAirportIDs, DepDel15, CancellationCode FROM mytable WHERE DestCityName < 'State College, PA' OR (DivAirportIDs[1] BETWEEN 10868 AND 11267 OR DivAirportIDs[2] BETWEEN 10868 AND 11267 OR DivAirportIDs[3] BETWEEN 10868 AND 11267 OR DivAirportIDs[4] BETWEEN 10868 AND 11267 OR DivAirportIDs[5] BETWEEN 10868 AND 11267) AND DivAirportLandings IN (2, 0, 9) ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTimeBlk, CRSDepTime FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Nebraska' ORDER BY DepTime LIMIT 4","hsqls":["SELECT DivLongestGTimes, ArrTimeBlk, CRSDepTime FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Nebraska' ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, \"Year\", DivTailNums FROM mytable WHERE Carrier > 'F9' ORDER BY Carrier, WeatherDelay, OriginCityName LIMIT 22","hsqls":["SELECT DistanceGroup, Year, DivTailNums FROM mytable WHERE Carrier > 'F9' ORDER BY Carrier, WeatherDelay, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DepTimeBlk, DestAirportID, COUNT(*) FROM mytable WHERE DivDistance <= 813 OR Dest BETWEEN 'ACT' AND 'AEX' AND OriginCityName > 'Huntsville, AL' GROUP BY OriginStateFips, DepTimeBlk, DestAirportID  ORDER BY OriginStateFips, DepTimeBlk, DestAirportID LIMIT 5","hsqls":["SELECT OriginStateFips, DepTimeBlk, DestAirportID, COUNT(*) FROM mytable WHERE DivDistance <= 813 OR Dest BETWEEN 'ACT' AND 'AEX' AND OriginCityName > 'Huntsville, AL' GROUP BY OriginStateFips, DepTimeBlk, DestAirportID  ORDER BY OriginStateFips, DepTimeBlk, DestAirportID LIMIT 5"]}
-{"sql":"SELECT OriginStateFips, FlightNum, \"Month\" FROM mytable WHERE DivReachedDest IN (0, -9999) AND DestAirportSeqID BETWEEN 1348602 AND 1467402 OR DivWheelsOffs BETWEEN 13 AND 2011 LIMIT 22","hsqls":["SELECT OriginStateFips, FlightNum, Month FROM mytable WHERE DivReachedDest IN (0, -9999) AND DestAirportSeqID BETWEEN 1348602 AND 1467402 OR (DivWheelsOffs__MV0 BETWEEN 13 AND 2011 OR DivWheelsOffs__MV1 BETWEEN 13 AND 2011 OR DivWheelsOffs__MV2 BETWEEN 13 AND 2011 OR DivWheelsOffs__MV3 BETWEEN 13 AND 2011 OR DivWheelsOffs__MV4 BETWEEN 13 AND 2011) LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, FlightNum, \"Month\" FROM mytable WHERE DivReachedDest IN (0, -9999) AND DestAirportSeqID BETWEEN 1348602 AND 1467402 OR DivWheelsOffs BETWEEN 13 AND 2011 LIMIT 22","hsqls":["SELECT OriginStateFips, FlightNum, `Month` FROM mytable WHERE DivReachedDest IN (0, -9999) AND DestAirportSeqID BETWEEN 1348602 AND 1467402 OR (DivWheelsOffs[1] BETWEEN 13 AND 2011 OR DivWheelsOffs[2] BETWEEN 13 AND 2011 OR DivWheelsOffs[3] BETWEEN 13 AND 2011 OR DivWheelsOffs[4] BETWEEN 13 AND 2011 OR DivWheelsOffs[5] BETWEEN 13 AND 2011) LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, DepDelayMinutes, COUNT(*) FROM mytable GROUP BY LateAircraftDelay, DepDelayMinutes  ORDER BY LateAircraftDelay, DepDelayMinutes LIMIT 2","hsqls":["SELECT LateAircraftDelay, DepDelayMinutes, COUNT(*) FROM mytable GROUP BY LateAircraftDelay, DepDelayMinutes  ORDER BY LateAircraftDelay, DepDelayMinutes LIMIT 2"]}
 {"sql":"SELECT MIN(DepTime) FROM mytable LIMIT 25"}
 {"sql":"SELECT \"Year\", DestWac FROM mytable WHERE DepDelay IN (414.0, 174.0, 142.0, 38.0) AND Flights BETWEEN 1 AND 1 ORDER BY TailNum LIMIT 4","hsqls":["SELECT Year, DestWac FROM mytable WHERE DepDelay IN (414.0, 174.0, 142.0, 38.0) AND Flights BETWEEN 1 AND 1 ORDER BY TailNum LIMIT 4"]}
 {"sql":"SELECT ActualElapsedTime, \"Month\", CRSElapsedTime FROM mytable WHERE OriginCityName NOT IN ('Little Rock, AR', 'Wrangell, AK', 'Austin, TX', 'Aguadilla, PR') LIMIT 4","hsqls":["SELECT ActualElapsedTime, Month, CRSElapsedTime FROM mytable WHERE OriginCityName NOT IN ('Little Rock, AR', 'Wrangell, AK', 'Austin, TX', 'Aguadilla, PR') LIMIT 4"]}
 {"sql":"SELECT ArrTime, OriginStateName FROM mytable WHERE DayOfWeek NOT IN (3, 2) AND UniqueCarrier = 'F9' ORDER BY DivDistance LIMIT 16"}
 {"sql":"SELECT DepTime, TotalAddGTime FROM mytable ORDER BY OriginStateFips LIMIT 11"}
-{"sql":"SELECT DivDistance, TaxiIn, MIN(Diverted) FROM mytable WHERE LongestAddGTime NOT IN (2, 24, 103, 11, 38) OR DivTotalGTimes IN (54) GROUP BY DivDistance, TaxiIn LIMIT 21","hsqls":["SELECT DivDistance, TaxiIn, MIN(Diverted) FROM mytable WHERE LongestAddGTime NOT IN (2, 24, 103, 11, 38) OR (DivTotalGTimes__MV0 IN (54) OR DivTotalGTimes__MV1 IN (54) OR DivTotalGTimes__MV2 IN (54) OR DivTotalGTimes__MV3 IN (54) OR DivTotalGTimes__MV4 IN (54)) GROUP BY DivDistance, TaxiIn LIMIT 10000"]}
-{"sql":"SELECT CRSElapsedTime, AVG(DestAirportID) FROM mytable WHERE FirstDepTime <= 1119 OR DivAirportSeqIDs BETWEEN 1215602 AND 1348502 GROUP BY CRSElapsedTime LIMIT 10","hsqls":["SELECT CRSElapsedTime, AVG(CAST(DestAirportID AS DOUBLE)) FROM mytable WHERE FirstDepTime <= 1119 OR (DivAirportSeqIDs__MV0 BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs__MV1 BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs__MV2 BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs__MV3 BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs__MV4 BETWEEN 1215602 AND 1348502) GROUP BY CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivDistance, TaxiIn, MIN(Diverted) FROM mytable WHERE LongestAddGTime NOT IN (2, 24, 103, 11, 38) OR DivTotalGTimes IN (54) GROUP BY DivDistance, TaxiIn LIMIT 21","hsqls":["SELECT DivDistance, TaxiIn, MIN(Diverted) FROM mytable WHERE LongestAddGTime NOT IN (2, 24, 103, 11, 38) OR (DivTotalGTimes[1] IN (54) OR DivTotalGTimes[2] IN (54) OR DivTotalGTimes[3] IN (54) OR DivTotalGTimes[4] IN (54) OR DivTotalGTimes[5] IN (54)) GROUP BY DivDistance, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT CRSElapsedTime, AVG(DestAirportID) FROM mytable WHERE FirstDepTime <= 1119 OR DivAirportSeqIDs BETWEEN 1215602 AND 1348502 GROUP BY CRSElapsedTime LIMIT 10","hsqls":["SELECT CRSElapsedTime, AVG(CAST(DestAirportID AS DOUBLE)) FROM mytable WHERE FirstDepTime <= 1119 OR (DivAirportSeqIDs[1] BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs[2] BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs[3] BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs[4] BETWEEN 1215602 AND 1348502 OR DivAirportSeqIDs[5] BETWEEN 1215602 AND 1348502) GROUP BY CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Distance, DestStateFips, NASDelay, COUNT(NASDelay), AVG(FlightNum), MIN(CRSElapsedTime) FROM mytable GROUP BY Distance, DestStateFips, NASDelay  ORDER BY Distance, DestStateFips, NASDelay LIMIT 26","hsqls":["SELECT Distance, DestStateFips, NASDelay, COUNT(NASDelay), AVG(FlightNum), MIN(CRSElapsedTime) FROM mytable GROUP BY Distance, DestStateFips, NASDelay  ORDER BY Distance, DestStateFips, NASDelay LIMIT 26"]}
 {"sql":"SELECT CRSElapsedTime FROM mytable WHERE TaxiOut BETWEEN 60 AND 36 OR OriginStateName IN ('Michigan', 'Puerto Rico', 'Hawaii', 'Florida') ORDER BY Distance, ArrTime LIMIT 8"}
 {"sql":"SELECT CancellationCode, COUNT(*) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 27","hsqls":["SELECT CancellationCode, COUNT(*) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 27"]}
-{"sql":"SELECT DivReachedDest, DestState, DivWheelsOffs FROM mytable WHERE WeatherDelay <> 47 AND ArrTimeBlk BETWEEN '1700-1759' AND '1200-1259' ORDER BY LateAircraftDelay, SecurityDelay, WheelsOn LIMIT 13","hsqls":["SELECT DivReachedDest, DestState, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE WeatherDelay <> 47 AND ArrTimeBlk BETWEEN '1700-1759' AND '1200-1259' ORDER BY LateAircraftDelay, SecurityDelay, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DestState, DivWheelsOffs FROM mytable WHERE WeatherDelay <> 47 AND ArrTimeBlk BETWEEN '1700-1759' AND '1200-1259' ORDER BY LateAircraftDelay, SecurityDelay, WheelsOn LIMIT 13","hsqls":["SELECT DivReachedDest, DestState, DivWheelsOffs FROM mytable WHERE WeatherDelay <> 47 AND ArrTimeBlk BETWEEN '1700-1759' AND '1200-1259' ORDER BY LateAircraftDelay, SecurityDelay, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT ArrTime, DepTimeBlk, OriginWac FROM mytable WHERE DayofMonth BETWEEN 18 AND 12 AND DayofMonth NOT IN (17) ORDER BY OriginCityName, ActualElapsedTime LIMIT 23"}
-{"sql":"SELECT DestAirportSeqID, DestCityMarketID, \"Month\" FROM mytable WHERE CarrierDelay IN (44) OR WheelsOff BETWEEN 2301 AND 1623 AND Cancelled NOT IN (1, 0) LIMIT 14","hsqls":["SELECT DestAirportSeqID, DestCityMarketID, Month FROM mytable WHERE CarrierDelay IN (44) OR WheelsOff BETWEEN 2301 AND 1623 AND Cancelled NOT IN (1, 0) LIMIT 14"]}
+{"sql":"SELECT DestAirportSeqID, DestCityMarketID, \"Month\" FROM mytable WHERE CarrierDelay IN (44) OR WheelsOff BETWEEN 2301 AND 1623 AND Cancelled NOT IN (1, 0) LIMIT 14","hsqls":["SELECT DestAirportSeqID, DestCityMarketID, `Month` FROM mytable WHERE CarrierDelay IN (44) OR WheelsOff BETWEEN 2301 AND 1623 AND Cancelled NOT IN (1, 0) LIMIT 14"]}
 {"sql":"SELECT DepartureDelayGroups, COUNT(*) FROM mytable WHERE DepartureDelayGroups >= 6 GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 22","hsqls":["SELECT DepartureDelayGroups, COUNT(*) FROM mytable WHERE DepartureDelayGroups >= 6 GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 22"]}
 {"sql":"SELECT DivAirportLandings, DaysSinceEpoch FROM mytable ORDER BY Quarter LIMIT 27"}
 {"sql":"SELECT WeatherDelay, DivAirportLandings, DestAirportID, MAX(TaxiOut) FROM mytable GROUP BY WeatherDelay, DivAirportLandings, DestAirportID  ORDER BY WeatherDelay, DivAirportLandings, DestAirportID LIMIT 27","hsqls":["SELECT WeatherDelay, DivAirportLandings, DestAirportID, MAX(TaxiOut) FROM mytable GROUP BY WeatherDelay, DivAirportLandings, DestAirportID  ORDER BY WeatherDelay, DivAirportLandings, DestAirportID LIMIT 27"]}
-{"sql":"SELECT OriginStateFips FROM mytable WHERE AirTime <= 161 AND DivAirportIDs = 14487 AND ActualElapsedTime IN (173, 72, 142) ORDER BY TotalAddGTime, DayOfWeek LIMIT 25","hsqls":["SELECT OriginStateFips FROM mytable WHERE AirTime <= 161 AND (DivAirportIDs__MV0 = 14487 OR DivAirportIDs__MV1 = 14487 OR DivAirportIDs__MV2 = 14487 OR DivAirportIDs__MV3 = 14487 OR DivAirportIDs__MV4 = 14487) AND ActualElapsedTime IN (173, 72, 142) ORDER BY TotalAddGTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips FROM mytable WHERE AirTime <= 161 AND DivAirportIDs = 14487 AND ActualElapsedTime IN (173, 72, 142) ORDER BY TotalAddGTime, DayOfWeek LIMIT 25","hsqls":["SELECT OriginStateFips FROM mytable WHERE AirTime <= 161 AND (DivAirportIDs[1] = 14487 OR DivAirportIDs[2] = 14487 OR DivAirportIDs[3] = 14487 OR DivAirportIDs[4] = 14487 OR DivAirportIDs[5] = 14487) AND ActualElapsedTime IN (173, 72, 142) ORDER BY TotalAddGTime, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT MAX(DivActualElapsedTime) FROM mytable WHERE Diverted <> 1 AND DivActualElapsedTime NOT IN (546, 401, 344, 249, 266) LIMIT 2"}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE SecurityDelay NOT IN (1, 0, 4, 27, -9999) OR DivArrDelay = 322 ORDER BY Origin, CRSDepTime LIMIT 7"}
 {"sql":"SELECT SecurityDelay, ArrDel15, DivActualElapsedTime, COUNT(*) FROM mytable WHERE CRSArrTime <> 1802 GROUP BY SecurityDelay, ArrDel15, DivActualElapsedTime  ORDER BY SecurityDelay, ArrDel15, DivActualElapsedTime LIMIT 25","hsqls":["SELECT SecurityDelay, ArrDel15, DivActualElapsedTime, COUNT(*) FROM mytable WHERE CRSArrTime <> 1802 GROUP BY SecurityDelay, ArrDel15, DivActualElapsedTime  ORDER BY SecurityDelay, ArrDel15, DivActualElapsedTime LIMIT 25"]}
 {"sql":"SELECT DestCityMarketID, CRSDepTime, AVG(ArrivalDelayGroups) FROM mytable WHERE Quarter NOT IN (1) GROUP BY DestCityMarketID, CRSDepTime  ORDER BY DestCityMarketID, CRSDepTime LIMIT 16","hsqls":["SELECT DestCityMarketID, CRSDepTime, AVG(ArrivalDelayGroups) FROM mytable WHERE Quarter NOT IN (1) GROUP BY DestCityMarketID, CRSDepTime  ORDER BY DestCityMarketID, CRSDepTime LIMIT 16"]}
-{"sql":"SELECT COUNT(DestWac), AVG(Diverted), SUM(\"Year\") FROM mytable WHERE OriginWac NOT IN (45, 51, 37) OR ArrDelay BETWEEN 109.0 AND 211.0 AND TailNum > 'N3HHAA' LIMIT 3","hsqls":["SELECT COUNT(DestWac), AVG(Diverted), SUM(Year) FROM mytable WHERE OriginWac NOT IN (45, 51, 37) OR ArrDelay BETWEEN 109.0 AND 211.0 AND TailNum > 'N3HHAA' LIMIT 3"]}
+{"sql":"SELECT COUNT(DestWac), AVG(Diverted), SUM(\"Year\") FROM mytable WHERE OriginWac NOT IN (45, 51, 37) OR ArrDelay BETWEEN 109.0 AND 211.0 AND TailNum > 'N3HHAA' LIMIT 3","hsqls":["SELECT COUNT(DestWac), AVG(Diverted), SUM(`Year`) FROM mytable WHERE OriginWac NOT IN (45, 51, 37) OR ArrDelay BETWEEN 109.0 AND 211.0 AND TailNum > 'N3HHAA' LIMIT 3"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(OriginAirportSeqID) FROM mytable WHERE DepTimeBlk BETWEEN '1000-1059' AND '1400-1459' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 23","hsqls":["SELECT DaysSinceEpoch, COUNT(OriginAirportSeqID) FROM mytable WHERE DepTimeBlk BETWEEN '1000-1059' AND '1400-1459' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 23"]}
 {"sql":"SELECT ActualElapsedTime, OriginStateName FROM mytable ORDER BY WeatherDelay, ActualElapsedTime LIMIT 4"}
 {"sql":"SELECT Distance FROM mytable WHERE DepDelayMinutes BETWEEN 257.0 AND 259.0 OR DestStateFips BETWEEN 13 AND 44 ORDER BY WheelsOff, Dest LIMIT 16"}
 {"sql":"SELECT Diverted, COUNT(Origin), COUNT(ArrDel15), COUNT(FlightDate) FROM mytable GROUP BY Diverted  ORDER BY Diverted LIMIT 5","hsqls":["SELECT Diverted, COUNT(Origin), COUNT(ArrDel15), COUNT(FlightDate) FROM mytable GROUP BY Diverted  ORDER BY Diverted LIMIT 5"]}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE AirlineID IN (20304, 20398, 19393, 19790, 21171) ORDER BY ArrDel15, DestAirportID LIMIT 23"}
 {"sql":"SELECT ActualElapsedTime, DestCityName, OriginStateName FROM mytable WHERE DivDistance BETWEEN 272 AND 74 AND LongestAddGTime IN (7, 73) OR DestCityMarketID NOT IN (33795, 31135) ORDER BY LateAircraftDelay LIMIT 17"}
-{"sql":"SELECT TaxiIn, DestCityName, ArrivalDelayGroups FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1000-1059', '1100-1159', '1200-1259', '1900-1959') OR DivLongestGTimes BETWEEN 3.0 AND 32.0 AND DepTime = 2154 ORDER BY Quarter, ArrTimeBlk, DivAirportLandings LIMIT 10","hsqls":["SELECT TaxiIn, DestCityName, ArrivalDelayGroups FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1000-1059', '1100-1159', '1200-1259', '1900-1959') OR (DivLongestGTimes__MV0 BETWEEN 3.0 AND 32.0 OR DivLongestGTimes__MV1 BETWEEN 3.0 AND 32.0 OR DivLongestGTimes__MV2 BETWEEN 3.0 AND 32.0 OR DivLongestGTimes__MV3 BETWEEN 3.0 AND 32.0 OR DivLongestGTimes__MV4 BETWEEN 3.0 AND 32.0) AND DepTime = 2154 ORDER BY Quarter, ArrTimeBlk, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DestCityName, ArrivalDelayGroups FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1000-1059', '1100-1159', '1200-1259', '1900-1959') OR DivLongestGTimes BETWEEN 3.0 AND 32.0 AND DepTime = 2154 ORDER BY Quarter, ArrTimeBlk, DivAirportLandings LIMIT 10","hsqls":["SELECT TaxiIn, DestCityName, ArrivalDelayGroups FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1000-1059', '1100-1159', '1200-1259', '1900-1959') OR (DivLongestGTimes[1] BETWEEN 3.0 AND 32.0 OR DivLongestGTimes[2] BETWEEN 3.0 AND 32.0 OR DivLongestGTimes[3] BETWEEN 3.0 AND 32.0 OR DivLongestGTimes[4] BETWEEN 3.0 AND 32.0 OR DivLongestGTimes[5] BETWEEN 3.0 AND 32.0) AND DepTime = 2154 ORDER BY Quarter, ArrTimeBlk, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DepTime, TaxiIn, TailNum FROM mytable WHERE AirlineID >= 20437 AND LongestAddGTime > 47 ORDER BY DestCityName, ArrivalDelayGroups, OriginStateName LIMIT 6"}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE DepDelayMinutes BETWEEN 286.0 AND 29.0 OR NASDelay <> 4 AND DivReachedDest NOT IN (1) ORDER BY WheelsOff, TotalAddGTime, DestAirportSeqID LIMIT 9"}
 {"sql":"SELECT NASDelay, ArrDelay FROM mytable ORDER BY Dest, ArrDel15 LIMIT 13"}
-{"sql":"SELECT ArrTime, \"Month\", SUM(ArrDelayMinutes), COUNT(Cancelled), COUNT(ArrTime) FROM mytable GROUP BY ArrTime, \"Month\" LIMIT 3","hsqls":["SELECT ArrTime, Month, SUM(ArrDelayMinutes), COUNT(Cancelled), COUNT(ArrTime) FROM mytable GROUP BY ArrTime, Month LIMIT 3"]}
+{"sql":"SELECT ArrTime, \"Month\", SUM(ArrDelayMinutes), COUNT(Cancelled), COUNT(ArrTime) FROM mytable GROUP BY ArrTime, \"Month\" LIMIT 3","hsqls":["SELECT ArrTime, Month, SUM(ArrDelayMinutes), COUNT(Cancelled), COUNT(ArrTime) FROM mytable GROUP BY ArrTime, `Month` LIMIT 3"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable ORDER BY DivReachedDest, Distance LIMIT 25"}
 {"sql":"SELECT FlightDate FROM mytable WHERE OriginWac IN (35, 52, 72, 61, 12) AND ActualElapsedTime BETWEEN 139 AND 114 ORDER BY DestWac, TailNum LIMIT 24"}
 {"sql":"SELECT ArrDelayMinutes, DestCityName, OriginWac, COUNT(LateAircraftDelay) FROM mytable WHERE LateAircraftDelay BETWEEN 250 AND 47 GROUP BY ArrDelayMinutes, DestCityName, OriginWac","hsqls":["SELECT ArrDelayMinutes, DestCityName, OriginWac, COUNT(LateAircraftDelay) FROM mytable WHERE LateAircraftDelay BETWEEN 250 AND 47 GROUP BY ArrDelayMinutes, DestCityName, OriginWac"]}
 {"sql":"SELECT CRSDepTime, DivActualElapsedTime, AVG(DepDel15), MIN(Quarter) FROM mytable WHERE OriginStateName BETWEEN 'South Carolina' AND 'Illinois' OR OriginWac > 87 OR DepDelayMinutes < 580.0 GROUP BY CRSDepTime, DivActualElapsedTime  ORDER BY CRSDepTime, DivActualElapsedTime LIMIT 3","hsqls":["SELECT CRSDepTime, DivActualElapsedTime, AVG(DepDel15), MIN(Quarter) FROM mytable WHERE OriginStateName BETWEEN 'South Carolina' AND 'Illinois' OR OriginWac > 87 OR DepDelayMinutes < 580.0 GROUP BY CRSDepTime, DivActualElapsedTime  ORDER BY CRSDepTime, DivActualElapsedTime LIMIT 3"]}
 {"sql":"SELECT LateAircraftDelay, OriginStateFips, DayOfWeek FROM mytable WHERE DivDistance IN (68, 577) AND DestAirportID NOT IN (14100, 10792, 13487) ORDER BY CRSArrTime, AirTime, DayofMonth LIMIT 25"}
-{"sql":"SELECT DivWheelsOns, LateAircraftDelay, OriginCityName FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1200-1259' AND ActualElapsedTime <> 373 OR Cancelled > 1 LIMIT 16","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LateAircraftDelay, OriginCityName FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1200-1259' AND ActualElapsedTime <> 373 OR Cancelled > 1 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, LateAircraftDelay, OriginCityName FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1200-1259' AND ActualElapsedTime <> 373 OR Cancelled > 1 LIMIT 16","hsqls":["SELECT DivWheelsOns, LateAircraftDelay, OriginCityName FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1200-1259' AND ActualElapsedTime <> 373 OR Cancelled > 1 LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, OriginWac, COUNT(TaxiIn) FROM mytable WHERE CRSDepTime NOT IN (1654, 1349) OR TaxiIn NOT IN (2, 8, 12, -9999) GROUP BY TaxiOut, OriginWac  ORDER BY TaxiOut, OriginWac LIMIT 7","hsqls":["SELECT TaxiOut, OriginWac, COUNT(TaxiIn) FROM mytable WHERE CRSDepTime NOT IN (1654, 1349) OR TaxiIn NOT IN (2, 8, 12, -9999) GROUP BY TaxiOut, OriginWac  ORDER BY TaxiOut, OriginWac LIMIT 7"]}
 {"sql":"SELECT Diverted, FlightNum, AirTime FROM mytable WHERE LateAircraftDelay <= 39 AND ArrDelayMinutes BETWEEN 198.0 AND 238.0 ORDER BY DepartureDelayGroups LIMIT 23"}
-{"sql":"SELECT DestStateName FROM mytable WHERE DivAirports <= 'ILM' AND DepDel15 > -9999 LIMIT 5","hsqls":["SELECT DestStateName FROM mytable WHERE (DivAirports__MV0 <= 'ILM' OR DivAirports__MV1 <= 'ILM' OR DivAirports__MV2 <= 'ILM' OR DivAirports__MV3 <= 'ILM' OR DivAirports__MV4 <= 'ILM') AND DepDel15 > -9999 LIMIT 10000"]}
+{"sql":"SELECT DestStateName FROM mytable WHERE DivAirports <= 'ILM' AND DepDel15 > -9999 LIMIT 5","hsqls":["SELECT DestStateName FROM mytable WHERE (DivAirports[1] <= 'ILM' OR DivAirports[2] <= 'ILM' OR DivAirports[3] <= 'ILM' OR DivAirports[4] <= 'ILM' OR DivAirports[5] <= 'ILM') AND DepDel15 > -9999 LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrTime) FROM mytable LIMIT 1"}
 {"sql":"SELECT SecurityDelay, MIN(Diverted), MAX(Quarter) FROM mytable WHERE FirstDepTime <= 1136 OR FirstDepTime BETWEEN 1859 AND 726 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 17","hsqls":["SELECT SecurityDelay, MIN(Diverted), MAX(Quarter) FROM mytable WHERE FirstDepTime <= 1136 OR FirstDepTime BETWEEN 1859 AND 726 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 17"]}
 {"sql":"SELECT OriginState, DestWac, Diverted FROM mytable ORDER BY Diverted, DestAirportID LIMIT 13"}
 {"sql":"SELECT DestState, COUNT(NASDelay), MAX(ArrDelayMinutes) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 10","hsqls":["SELECT DestState, COUNT(NASDelay), MAX(ArrDelayMinutes) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 10"]}
-{"sql":"SELECT DivReachedDest, DivAirportIDs, DestCityName FROM mytable ORDER BY TaxiOut, DepDel15 LIMIT 11","hsqls":["SELECT DivReachedDest, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DestCityName FROM mytable ORDER BY TaxiOut, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivAirportIDs, DestCityName FROM mytable ORDER BY TaxiOut, DepDel15 LIMIT 11","hsqls":["SELECT DivReachedDest, DivAirportIDs, DestCityName FROM mytable ORDER BY TaxiOut, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT AirTime, AVG(LongestAddGTime), AVG(OriginCityMarketID) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 8","hsqls":["SELECT AirTime, AVG(LongestAddGTime), AVG(OriginCityMarketID) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 8"]}
 {"sql":"SELECT ActualElapsedTime, UniqueCarrier FROM mytable WHERE Distance BETWEEN 2288 AND 3711 ORDER BY DestStateFips, SecurityDelay, CancellationCode LIMIT 26"}
 {"sql":"SELECT NASDelay, DepTimeBlk, ArrDelay, SUM(DestAirportID) FROM mytable WHERE DestAirportID <> 13476 OR Diverted NOT IN (1, 0) GROUP BY NASDelay, DepTimeBlk, ArrDelay  ORDER BY NASDelay, DepTimeBlk, ArrDelay LIMIT 10","hsqls":["SELECT NASDelay, DepTimeBlk, ArrDelay, SUM(DestAirportID) FROM mytable WHERE DestAirportID <> 13476 OR Diverted NOT IN (1, 0) GROUP BY NASDelay, DepTimeBlk, ArrDelay  ORDER BY NASDelay, DepTimeBlk, ArrDelay LIMIT 10"]}
 {"sql":"SELECT WeatherDelay, ArrTimeBlk, MAX(OriginAirportSeqID), AVG(DaysSinceEpoch) FROM mytable WHERE AirlineID IN (20436, 19790, 20437, 19930, 21171) GROUP BY WeatherDelay, ArrTimeBlk  ORDER BY WeatherDelay, ArrTimeBlk LIMIT 23","hsqls":["SELECT WeatherDelay, ArrTimeBlk, MAX(OriginAirportSeqID), AVG(DaysSinceEpoch) FROM mytable WHERE AirlineID IN (20436, 19790, 20437, 19930, 21171) GROUP BY WeatherDelay, ArrTimeBlk  ORDER BY WeatherDelay, ArrTimeBlk LIMIT 23"]}
 {"sql":"SELECT DivArrDelay FROM mytable ORDER BY OriginWac LIMIT 8"}
-{"sql":"SELECT DestCityMarketID, AVG(WheelsOn) FROM mytable WHERE DivLongestGTimes <= 34.0 AND DivDistance = 416 AND DivWheelsOns BETWEEN 1026 AND 1623 GROUP BY DestCityMarketID LIMIT 24","hsqls":["SELECT DestCityMarketID, AVG(CAST(WheelsOn AS DOUBLE)) FROM mytable WHERE (DivLongestGTimes__MV0 <= 34.0 OR DivLongestGTimes__MV1 <= 34.0 OR DivLongestGTimes__MV2 <= 34.0 OR DivLongestGTimes__MV3 <= 34.0 OR DivLongestGTimes__MV4 <= 34.0) AND DivDistance = 416 AND (DivWheelsOns__MV0 BETWEEN 1026 AND 1623 OR DivWheelsOns__MV1 BETWEEN 1026 AND 1623 OR DivWheelsOns__MV2 BETWEEN 1026 AND 1623 OR DivWheelsOns__MV3 BETWEEN 1026 AND 1623 OR DivWheelsOns__MV4 BETWEEN 1026 AND 1623) GROUP BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, AVG(WheelsOn) FROM mytable WHERE DivLongestGTimes <= 34.0 AND DivDistance = 416 AND DivWheelsOns BETWEEN 1026 AND 1623 GROUP BY DestCityMarketID LIMIT 24","hsqls":["SELECT DestCityMarketID, AVG(CAST(WheelsOn AS DOUBLE)) FROM mytable WHERE (DivLongestGTimes[1] <= 34.0 OR DivLongestGTimes[2] <= 34.0 OR DivLongestGTimes[3] <= 34.0 OR DivLongestGTimes[4] <= 34.0 OR DivLongestGTimes[5] <= 34.0) AND DivDistance = 416 AND (DivWheelsOns[1] BETWEEN 1026 AND 1623 OR DivWheelsOns[2] BETWEEN 1026 AND 1623 OR DivWheelsOns[3] BETWEEN 1026 AND 1623 OR DivWheelsOns[4] BETWEEN 1026 AND 1623 OR DivWheelsOns[5] BETWEEN 1026 AND 1623) GROUP BY DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, CRSDepTime FROM mytable WHERE CRSDepTime BETWEEN 2127 AND 659 ORDER BY FlightNum LIMIT 5"}
-{"sql":"SELECT WheelsOff, COUNT(*) FROM mytable WHERE \"Year\" IN (2014) GROUP BY WheelsOff LIMIT 5","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable WHERE Year IN (2014) GROUP BY WheelsOff LIMIT 5"]}
+{"sql":"SELECT WheelsOff, COUNT(*) FROM mytable WHERE \"Year\" IN (2014) GROUP BY WheelsOff LIMIT 5","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable WHERE `Year` IN (2014) GROUP BY WheelsOff LIMIT 5"]}
 {"sql":"SELECT DestWac, ArrTime, Origin, MAX(DestAirportSeqID), AVG(FlightNum) FROM mytable WHERE Flights > 1 OR Flights BETWEEN 1 AND 1 AND DayOfWeek = 2 GROUP BY DestWac, ArrTime, Origin  ORDER BY DestWac, ArrTime, Origin LIMIT 15","hsqls":["SELECT DestWac, ArrTime, Origin, MAX(DestAirportSeqID), AVG(FlightNum) FROM mytable WHERE Flights > 1 OR Flights BETWEEN 1 AND 1 AND DayOfWeek = 2 GROUP BY DestWac, ArrTime, Origin  ORDER BY DestWac, ArrTime, Origin LIMIT 15"]}
-{"sql":"SELECT Quarter, TaxiIn, DivActualElapsedTime, AVG(DayOfWeek), COUNT(DistanceGroup), MAX(DivReachedDest) FROM mytable WHERE DivLongestGTimes IN (128.0) GROUP BY Quarter, TaxiIn, DivActualElapsedTime","hsqls":["SELECT Quarter, TaxiIn, DivActualElapsedTime, AVG(DayOfWeek), COUNT(DistanceGroup), MAX(DivReachedDest) FROM mytable WHERE (DivLongestGTimes__MV0 IN (128.0) OR DivLongestGTimes__MV1 IN (128.0) OR DivLongestGTimes__MV2 IN (128.0) OR DivLongestGTimes__MV3 IN (128.0) OR DivLongestGTimes__MV4 IN (128.0)) GROUP BY Quarter, TaxiIn, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT Quarter, TaxiIn, DivActualElapsedTime, AVG(DayOfWeek), COUNT(DistanceGroup), MAX(DivReachedDest) FROM mytable WHERE DivLongestGTimes IN (128.0) GROUP BY Quarter, TaxiIn, DivActualElapsedTime","hsqls":["SELECT Quarter, TaxiIn, DivActualElapsedTime, AVG(DayOfWeek), COUNT(DistanceGroup), MAX(DivReachedDest) FROM mytable WHERE (DivLongestGTimes[1] IN (128.0) OR DivLongestGTimes[2] IN (128.0) OR DivLongestGTimes[3] IN (128.0) OR DivLongestGTimes[4] IN (128.0) OR DivLongestGTimes[5] IN (128.0)) GROUP BY Quarter, TaxiIn, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DestAirportSeqID, ArrDelay FROM mytable WHERE OriginAirportSeqID BETWEEN 1058102 AND 1426202 ORDER BY OriginState, OriginStateFips LIMIT 27"}
-{"sql":"SELECT TotalAddGTime, DepTime, MAX(DivActualElapsedTime), MIN(DepTime), AVG(WheelsOn) FROM mytable WHERE DivTailNums <= 'N483AA' GROUP BY TotalAddGTime, DepTime LIMIT 23","hsqls":["SELECT TotalAddGTime, DepTime, MAX(DivActualElapsedTime), MIN(DepTime), AVG(WheelsOn) FROM mytable WHERE (DivTailNums__MV0 <= 'N483AA' OR DivTailNums__MV1 <= 'N483AA' OR DivTailNums__MV2 <= 'N483AA' OR DivTailNums__MV3 <= 'N483AA' OR DivTailNums__MV4 <= 'N483AA') GROUP BY TotalAddGTime, DepTime LIMIT 10000"]}
-{"sql":"SELECT MIN(DivActualElapsedTime), MAX(WheelsOn), MAX(\"Month\") FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) LIMIT 17","hsqls":["SELECT MIN(DivActualElapsedTime), MAX(WheelsOn), MAX(Month) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) LIMIT 17"]}
+{"sql":"SELECT TotalAddGTime, DepTime, MAX(DivActualElapsedTime), MIN(DepTime), AVG(WheelsOn) FROM mytable WHERE DivTailNums <= 'N483AA' GROUP BY TotalAddGTime, DepTime LIMIT 23","hsqls":["SELECT TotalAddGTime, DepTime, MAX(DivActualElapsedTime), MIN(DepTime), AVG(WheelsOn) FROM mytable WHERE (DivTailNums[1] <= 'N483AA' OR DivTailNums[2] <= 'N483AA' OR DivTailNums[3] <= 'N483AA' OR DivTailNums[4] <= 'N483AA' OR DivTailNums[5] <= 'N483AA') GROUP BY TotalAddGTime, DepTime LIMIT 10000"]}
+{"sql":"SELECT MIN(DivActualElapsedTime), MAX(WheelsOn), MAX(\"Month\") FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) LIMIT 17","hsqls":["SELECT MIN(DivActualElapsedTime), MAX(WheelsOn), MAX(`Month`) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) LIMIT 17"]}
 {"sql":"SELECT MAX(Flights), MAX(DepDel15), MIN(AirlineID) FROM mytable WHERE ArrDelayMinutes NOT IN (33.0, 27.0, 252.0) AND Origin BETWEEN 'SIT' AND 'TYS' OR OriginAirportSeqID >= 1251102 LIMIT 9"}
 {"sql":"SELECT OriginCityMarketID, AirTime FROM mytable WHERE DistanceGroup IN (2, 10, 9, 8) AND OriginStateFips <> 54 AND SecurityDelay NOT IN (1, 18, 8, 27, 14) ORDER BY DivAirportLandings LIMIT 29"}
-{"sql":"SELECT DivLongestGTimes, ArrTime, DivAirportLandings FROM mytable WHERE DestWac > 33 OR DepDelay IN (-9999.0, 133.0, 233.0, 8.0, 14.0) ORDER BY DepDelay, TotalAddGTime LIMIT 14","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTime, DivAirportLandings FROM mytable WHERE DestWac > 33 OR DepDelay IN (-9999.0, 133.0, 233.0, 8.0, 14.0) ORDER BY DepDelay, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTime, DivAirportLandings FROM mytable WHERE DestWac > 33 OR DepDelay IN (-9999.0, 133.0, 233.0, 8.0, 14.0) ORDER BY DepDelay, TotalAddGTime LIMIT 14","hsqls":["SELECT DivLongestGTimes, ArrTime, DivAirportLandings FROM mytable WHERE DestWac > 33 OR DepDelay IN (-9999.0, 133.0, 233.0, 8.0, 14.0) ORDER BY DepDelay, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT OriginState, AirlineID, ArrivalDelayGroups, MAX(DivArrDelay), COUNT(LateAircraftDelay), COUNT(DepTime) FROM mytable WHERE CRSElapsedTime BETWEEN 267 AND 308 AND Dest IN ('SGU', 'MLI', 'BGR') OR Quarter BETWEEN 1 AND 1 GROUP BY OriginState, AirlineID, ArrivalDelayGroups  ORDER BY OriginState, AirlineID, ArrivalDelayGroups LIMIT 3","hsqls":["SELECT OriginState, AirlineID, ArrivalDelayGroups, MAX(DivArrDelay), COUNT(LateAircraftDelay), COUNT(DepTime) FROM mytable WHERE CRSElapsedTime BETWEEN 267 AND 308 AND Dest IN ('SGU', 'MLI', 'BGR') OR Quarter BETWEEN 1 AND 1 GROUP BY OriginState, AirlineID, ArrivalDelayGroups  ORDER BY OriginState, AirlineID, ArrivalDelayGroups LIMIT 3"]}
 {"sql":"SELECT ArrDelayMinutes, DestAirportID FROM mytable WHERE ArrDelayMinutes <> 245.0 OR Cancelled >= 1 OR DistanceGroup BETWEEN 9 AND 11 ORDER BY DestWac, Diverted LIMIT 9"}
-{"sql":"SELECT DestStateFips, DestAirportID FROM mytable WHERE OriginCityMarketID IN (34992) AND DivAirportSeqIDs = 1323002 ORDER BY Carrier, ArrDelayMinutes, OriginWac LIMIT 3","hsqls":["SELECT DestStateFips, DestAirportID FROM mytable WHERE OriginCityMarketID IN (34992) AND (DivAirportSeqIDs__MV0 = 1323002 OR DivAirportSeqIDs__MV1 = 1323002 OR DivAirportSeqIDs__MV2 = 1323002 OR DivAirportSeqIDs__MV3 = 1323002 OR DivAirportSeqIDs__MV4 = 1323002) ORDER BY Carrier, ArrDelayMinutes, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DestAirportID FROM mytable WHERE OriginCityMarketID IN (34992) AND DivAirportSeqIDs = 1323002 ORDER BY Carrier, ArrDelayMinutes, OriginWac LIMIT 3","hsqls":["SELECT DestStateFips, DestAirportID FROM mytable WHERE OriginCityMarketID IN (34992) AND (DivAirportSeqIDs[1] = 1323002 OR DivAirportSeqIDs[2] = 1323002 OR DivAirportSeqIDs[3] = 1323002 OR DivAirportSeqIDs[4] = 1323002 OR DivAirportSeqIDs[5] = 1323002) ORDER BY Carrier, ArrDelayMinutes, OriginWac LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 15"}
-{"sql":"SELECT DepartureDelayGroups, Cancelled, DivTotalGTimes FROM mytable WHERE DivLongestGTimes > 2.0 AND DivTotalGTimes IN (8, 73, 27) ORDER BY DayofMonth LIMIT 17","hsqls":["SELECT DepartureDelayGroups, Cancelled, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE (DivLongestGTimes__MV0 > 2.0 OR DivLongestGTimes__MV1 > 2.0 OR DivLongestGTimes__MV2 > 2.0 OR DivLongestGTimes__MV3 > 2.0 OR DivLongestGTimes__MV4 > 2.0) AND (DivTotalGTimes__MV0 IN (8, 73, 27) OR DivTotalGTimes__MV1 IN (8, 73, 27) OR DivTotalGTimes__MV2 IN (8, 73, 27) OR DivTotalGTimes__MV3 IN (8, 73, 27) OR DivTotalGTimes__MV4 IN (8, 73, 27)) ORDER BY DayofMonth LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, SecurityDelay, DepTimeBlk FROM mytable WHERE FirstDepTime BETWEEN 227 AND 2110 OR DestCityName >= 'Cordova, AK' OR \"Year\" <= 2014 LIMIT 25","hsqls":["SELECT TaxiOut, SecurityDelay, DepTimeBlk FROM mytable WHERE FirstDepTime BETWEEN 227 AND 2110 OR DestCityName >= 'Cordova, AK' OR Year <= 2014 LIMIT 25"]}
-{"sql":"SELECT Origin, DepTimeBlk, DayofMonth FROM mytable WHERE DivTotalGTimes < 45 OR DivTotalGTimes IN (97, 79, 56, 111) AND ArrTime IN (1750, 1009) ORDER BY DivAirportLandings, DaysSinceEpoch LIMIT 3","hsqls":["SELECT Origin, DepTimeBlk, DayofMonth FROM mytable WHERE (DivTotalGTimes__MV0 < 45 OR DivTotalGTimes__MV1 < 45 OR DivTotalGTimes__MV2 < 45 OR DivTotalGTimes__MV3 < 45 OR DivTotalGTimes__MV4 < 45) OR (DivTotalGTimes__MV0 IN (97, 79, 56, 111) OR DivTotalGTimes__MV1 IN (97, 79, 56, 111) OR DivTotalGTimes__MV2 IN (97, 79, 56, 111) OR DivTotalGTimes__MV3 IN (97, 79, 56, 111) OR DivTotalGTimes__MV4 IN (97, 79, 56, 111)) AND ArrTime IN (1750, 1009) ORDER BY DivAirportLandings, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT \"Month\", AVG(\"Month\"), AVG(AirTime) FROM mytable GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, AVG(Month), AVG(AirTime) FROM mytable GROUP BY Month LIMIT 10"]}
+{"sql":"SELECT DepartureDelayGroups, Cancelled, DivTotalGTimes FROM mytable WHERE DivLongestGTimes > 2.0 AND DivTotalGTimes IN (8, 73, 27) ORDER BY DayofMonth LIMIT 17","hsqls":["SELECT DepartureDelayGroups, Cancelled, DivTotalGTimes FROM mytable WHERE (DivLongestGTimes[1] > 2.0 OR DivLongestGTimes[2] > 2.0 OR DivLongestGTimes[3] > 2.0 OR DivLongestGTimes[4] > 2.0 OR DivLongestGTimes[5] > 2.0) AND (DivTotalGTimes[1] IN (8, 73, 27) OR DivTotalGTimes[2] IN (8, 73, 27) OR DivTotalGTimes[3] IN (8, 73, 27) OR DivTotalGTimes[4] IN (8, 73, 27) OR DivTotalGTimes[5] IN (8, 73, 27)) ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, SecurityDelay, DepTimeBlk FROM mytable WHERE FirstDepTime BETWEEN 227 AND 2110 OR DestCityName >= 'Cordova, AK' OR \"Year\" <= 2014 LIMIT 25","hsqls":["SELECT TaxiOut, SecurityDelay, DepTimeBlk FROM mytable WHERE FirstDepTime BETWEEN 227 AND 2110 OR DestCityName >= 'Cordova, AK' OR `Year` <= 2014 LIMIT 25"]}
+{"sql":"SELECT Origin, DepTimeBlk, DayofMonth FROM mytable WHERE DivTotalGTimes < 45 OR DivTotalGTimes IN (97, 79, 56, 111) AND ArrTime IN (1750, 1009) ORDER BY DivAirportLandings, DaysSinceEpoch LIMIT 3","hsqls":["SELECT Origin, DepTimeBlk, DayofMonth FROM mytable WHERE (DivTotalGTimes[1] < 45 OR DivTotalGTimes[2] < 45 OR DivTotalGTimes[3] < 45 OR DivTotalGTimes[4] < 45 OR DivTotalGTimes[5] < 45) OR (DivTotalGTimes[1] IN (97, 79, 56, 111) OR DivTotalGTimes[2] IN (97, 79, 56, 111) OR DivTotalGTimes[3] IN (97, 79, 56, 111) OR DivTotalGTimes[4] IN (97, 79, 56, 111) OR DivTotalGTimes[5] IN (97, 79, 56, 111)) AND ArrTime IN (1750, 1009) ORDER BY DivAirportLandings, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT \"Month\", AVG(\"Month\"), AVG(AirTime) FROM mytable GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, AVG(`Month`), AVG(AirTime) FROM mytable GROUP BY `Month` LIMIT 10"]}
 {"sql":"SELECT ArrDelayMinutes, WheelsOn, OriginAirportID FROM mytable WHERE CRSDepTime = 2205 OR DepDel15 NOT IN (1, 0, -9999) OR UniqueCarrier <= 'FL' ORDER BY TailNum, AirlineID, DivActualElapsedTime LIMIT 10"}
 {"sql":"SELECT AVG(DayOfWeek) FROM mytable WHERE TailNum >= 'N7741C' LIMIT 9"}
 {"sql":"SELECT AVG(DestStateFips), MAX(LateAircraftDelay), COUNT(FlightDate) FROM mytable LIMIT 15"}
-{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20409 OR DivAirportIDs IN (10257, 15919) OR OriginState BETWEEN 'TN' AND 'NC' GROUP BY OriginStateName LIMIT 24","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20409 OR (DivAirportIDs__MV0 IN (10257, 15919) OR DivAirportIDs__MV1 IN (10257, 15919) OR DivAirportIDs__MV2 IN (10257, 15919) OR DivAirportIDs__MV3 IN (10257, 15919) OR DivAirportIDs__MV4 IN (10257, 15919)) OR OriginState BETWEEN 'TN' AND 'NC' GROUP BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20409 OR DivAirportIDs IN (10257, 15919) OR OriginState BETWEEN 'TN' AND 'NC' GROUP BY OriginStateName LIMIT 24","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20409 OR (DivAirportIDs[1] IN (10257, 15919) OR DivAirportIDs[2] IN (10257, 15919) OR DivAirportIDs[3] IN (10257, 15919) OR DivAirportIDs[4] IN (10257, 15919) OR DivAirportIDs[5] IN (10257, 15919)) OR OriginState BETWEEN 'TN' AND 'NC' GROUP BY OriginStateName LIMIT 10000"]}
 {"sql":"SELECT MIN(CarrierDelay), SUM(Diverted), SUM(DestWac) FROM mytable LIMIT 16"}
 {"sql":"SELECT Dest, AVG(DaysSinceEpoch), SUM(OriginCityMarketID) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 27","hsqls":["SELECT Dest, AVG(DaysSinceEpoch), SUM(OriginCityMarketID) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 27"]}
 {"sql":"SELECT DivDistance, CRSArrTime, FlightNum FROM mytable WHERE CRSElapsedTime <> 225 AND TaxiIn BETWEEN 84 AND 57 LIMIT 18"}
 {"sql":"SELECT SecurityDelay, ArrDel15 FROM mytable WHERE Flights >= 1 OR TaxiOut BETWEEN 41 AND 71"}
-{"sql":"SELECT DestAirportID, \"Month\", COUNT(*) FROM mytable WHERE FlightNum <> 4672 OR UniqueCarrier BETWEEN 'WN' AND 'WN' GROUP BY DestAirportID, \"Month\" LIMIT 15","hsqls":["SELECT DestAirportID, Month, COUNT(*) FROM mytable WHERE FlightNum <> 4672 OR UniqueCarrier BETWEEN 'WN' AND 'WN' GROUP BY DestAirportID, Month LIMIT 15"]}
+{"sql":"SELECT DestAirportID, \"Month\", COUNT(*) FROM mytable WHERE FlightNum <> 4672 OR UniqueCarrier BETWEEN 'WN' AND 'WN' GROUP BY DestAirportID, \"Month\" LIMIT 15","hsqls":["SELECT DestAirportID, Month, COUNT(*) FROM mytable WHERE FlightNum <> 4672 OR UniqueCarrier BETWEEN 'WN' AND 'WN' GROUP BY DestAirportID, `Month` LIMIT 15"]}
 {"sql":"SELECT \"Year\", DaysSinceEpoch, MIN(Quarter) FROM mytable GROUP BY \"Year\", DaysSinceEpoch LIMIT 15","hsqls":["SELECT Year, DaysSinceEpoch, MIN(Quarter) FROM mytable GROUP BY Year, DaysSinceEpoch LIMIT 15"]}
 {"sql":"SELECT DaysSinceEpoch, SUM(DepTime) FROM mytable GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 18","hsqls":["SELECT DaysSinceEpoch, SUM(DepTime) FROM mytable GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 18"]}
-{"sql":"SELECT CRSArrTime, DivWheelsOffs FROM mytable WHERE DivAirportIDs = 11921 AND LongestAddGTime BETWEEN 14 AND 148 AND Quarter BETWEEN 1 AND 1 LIMIT 29","hsqls":["SELECT CRSArrTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE (DivAirportIDs__MV0 = 11921 OR DivAirportIDs__MV1 = 11921 OR DivAirportIDs__MV2 = 11921 OR DivAirportIDs__MV3 = 11921 OR DivAirportIDs__MV4 = 11921) AND LongestAddGTime BETWEEN 14 AND 148 AND Quarter BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivWheelsOffs FROM mytable WHERE DivAirportIDs = 11921 AND LongestAddGTime BETWEEN 14 AND 148 AND Quarter BETWEEN 1 AND 1 LIMIT 29","hsqls":["SELECT CRSArrTime, DivWheelsOffs FROM mytable WHERE (DivAirportIDs[1] = 11921 OR DivAirportIDs[2] = 11921 OR DivAirportIDs[3] = 11921 OR DivAirportIDs[4] = 11921 OR DivAirportIDs[5] = 11921) AND LongestAddGTime BETWEEN 14 AND 148 AND Quarter BETWEEN 1 AND 1 LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DestState, DepDel15, COUNT(*) FROM mytable GROUP BY FirstDepTime, DestState, DepDel15  ORDER BY FirstDepTime, DestState, DepDel15 LIMIT 18","hsqls":["SELECT FirstDepTime, DestState, DepDel15, COUNT(*) FROM mytable GROUP BY FirstDepTime, DestState, DepDel15  ORDER BY FirstDepTime, DestState, DepDel15 LIMIT 18"]}
 {"sql":"SELECT NASDelay, Origin, SUM(CRSElapsedTime), MAX(FlightNum) FROM mytable WHERE DivActualElapsedTime IN (543, 193) GROUP BY NASDelay, Origin  ORDER BY NASDelay, Origin LIMIT 1","hsqls":["SELECT NASDelay, Origin, SUM(CRSElapsedTime), MAX(FlightNum) FROM mytable WHERE DivActualElapsedTime IN (543, 193) GROUP BY NASDelay, Origin  ORDER BY NASDelay, Origin LIMIT 1"]}
 {"sql":"SELECT SUM(Flights) FROM mytable WHERE OriginAirportID >= 11638 LIMIT 25"}
-{"sql":"SELECT WeatherDelay, MAX(\"Month\") FROM mytable WHERE ActualElapsedTime NOT IN (97, 128, 122, 241) GROUP BY WeatherDelay LIMIT 2","hsqls":["SELECT WeatherDelay, MAX(Month) FROM mytable WHERE ActualElapsedTime NOT IN (97, 128, 122, 241) GROUP BY WeatherDelay LIMIT 2"]}
-{"sql":"SELECT Carrier, LongestAddGTime FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DepartureDelayGroups BETWEEN 11 AND -9999 AND DivWheelsOffs BETWEEN 2135 AND 1955 LIMIT 20","hsqls":["SELECT Carrier, LongestAddGTime FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DepartureDelayGroups BETWEEN 11 AND -9999 AND (DivWheelsOffs__MV0 BETWEEN 2135 AND 1955 OR DivWheelsOffs__MV1 BETWEEN 2135 AND 1955 OR DivWheelsOffs__MV2 BETWEEN 2135 AND 1955 OR DivWheelsOffs__MV3 BETWEEN 2135 AND 1955 OR DivWheelsOffs__MV4 BETWEEN 2135 AND 1955) LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, MAX(\"Month\") FROM mytable WHERE ActualElapsedTime NOT IN (97, 128, 122, 241) GROUP BY WeatherDelay LIMIT 2","hsqls":["SELECT WeatherDelay, MAX(`Month`) FROM mytable WHERE ActualElapsedTime NOT IN (97, 128, 122, 241) GROUP BY WeatherDelay LIMIT 2"]}
+{"sql":"SELECT Carrier, LongestAddGTime FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DepartureDelayGroups BETWEEN 11 AND -9999 AND DivWheelsOffs BETWEEN 2135 AND 1955 LIMIT 20","hsqls":["SELECT Carrier, LongestAddGTime FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DepartureDelayGroups BETWEEN 11 AND -9999 AND (DivWheelsOffs[1] BETWEEN 2135 AND 1955 OR DivWheelsOffs[2] BETWEEN 2135 AND 1955 OR DivWheelsOffs[3] BETWEEN 2135 AND 1955 OR DivWheelsOffs[4] BETWEEN 2135 AND 1955 OR DivWheelsOffs[5] BETWEEN 2135 AND 1955) LIMIT 10000"]}
 {"sql":"SELECT NASDelay, OriginStateName FROM mytable ORDER BY FlightDate, DivAirportLandings LIMIT 17"}
 {"sql":"SELECT DepTime, DepTimeBlk, CRSDepTime FROM mytable ORDER BY SecurityDelay, OriginStateName LIMIT 12"}
-{"sql":"SELECT Diverted, \"Month\", COUNT(AirlineID), AVG(DivAirportLandings) FROM mytable WHERE ArrivalDelayGroups IN (1) OR DestCityName <> 'Muskegon, MI' GROUP BY Diverted, \"Month\" LIMIT 29","hsqls":["SELECT Diverted, Month, COUNT(AirlineID), AVG(DivAirportLandings) FROM mytable WHERE ArrivalDelayGroups IN (1) OR DestCityName <> 'Muskegon, MI' GROUP BY Diverted, Month LIMIT 29"]}
+{"sql":"SELECT Diverted, \"Month\", COUNT(AirlineID), AVG(DivAirportLandings) FROM mytable WHERE ArrivalDelayGroups IN (1) OR DestCityName <> 'Muskegon, MI' GROUP BY Diverted, \"Month\" LIMIT 29","hsqls":["SELECT Diverted, Month, COUNT(AirlineID), AVG(DivAirportLandings) FROM mytable WHERE ArrivalDelayGroups IN (1) OR DestCityName <> 'Muskegon, MI' GROUP BY Diverted, `Month` LIMIT 29"]}
 {"sql":"SELECT TaxiOut, DepDelayMinutes, DepDel15, COUNT(*) FROM mytable WHERE Origin NOT IN ('RIC', 'EVV', 'MRY', 'PSE') GROUP BY TaxiOut, DepDelayMinutes, DepDel15  ORDER BY TaxiOut, DepDelayMinutes, DepDel15 LIMIT 3","hsqls":["SELECT TaxiOut, DepDelayMinutes, DepDel15, COUNT(*) FROM mytable WHERE Origin NOT IN ('RIC', 'EVV', 'MRY', 'PSE') GROUP BY TaxiOut, DepDelayMinutes, DepDel15  ORDER BY TaxiOut, DepDelayMinutes, DepDel15 LIMIT 3"]}
 {"sql":"SELECT Distance FROM mytable ORDER BY Diverted, AirlineID LIMIT 9"}
-{"sql":"SELECT DivWheelsOns, DepDelayMinutes, CRSDepTime FROM mytable LIMIT 24","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepDelayMinutes, CRSDepTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepDelayMinutes, CRSDepTime FROM mytable LIMIT 24","hsqls":["SELECT DivWheelsOns, DepDelayMinutes, CRSDepTime FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, NASDelay, DestAirportID FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'C' ORDER BY ArrDelayMinutes, CRSDepTime LIMIT 11"}
 {"sql":"SELECT DivAirportLandings, COUNT(*) FROM mytable GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 12","hsqls":["SELECT DivAirportLandings, COUNT(*) FROM mytable GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 12"]}
 {"sql":"SELECT LateAircraftDelay, DestStateFips, DivArrDelay, AVG(DestAirportID), COUNT(DivArrDelay), COUNT(ArrDel15) FROM mytable GROUP BY LateAircraftDelay, DestStateFips, DivArrDelay  ORDER BY LateAircraftDelay, DestStateFips, DivArrDelay LIMIT 1","hsqls":["SELECT LateAircraftDelay, DestStateFips, DivArrDelay, AVG(DestAirportID), COUNT(DivArrDelay), COUNT(ArrDel15) FROM mytable GROUP BY LateAircraftDelay, DestStateFips, DivArrDelay  ORDER BY LateAircraftDelay, DestStateFips, DivArrDelay LIMIT 1"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE OriginCityName BETWEEN 'Des Moines, IA' AND 'Brunswick, GA' OR ArrTime IN (1107) OR CRSDepTime BETWEEN 500 AND 851 ORDER BY LateAircraftDelay, Distance, DepDel15 LIMIT 4"}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivActualElapsedTime IN (996, 543, 231) AND WheelsOff NOT IN (1210, 625) OR ArrivalDelayGroups >= 8 ORDER BY DepTimeBlk, CancellationCode LIMIT 5"}
-{"sql":"SELECT SecurityDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE DivLongestGTimes = 20.0 GROUP BY SecurityDelay, UniqueCarrier LIMIT 19","hsqls":["SELECT SecurityDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 = 20.0 OR DivLongestGTimes__MV1 = 20.0 OR DivLongestGTimes__MV2 = 20.0 OR DivLongestGTimes__MV3 = 20.0 OR DivLongestGTimes__MV4 = 20.0) GROUP BY SecurityDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE DivLongestGTimes = 20.0 GROUP BY SecurityDelay, UniqueCarrier LIMIT 19","hsqls":["SELECT SecurityDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] = 20.0 OR DivLongestGTimes[2] = 20.0 OR DivLongestGTimes[3] = 20.0 OR DivLongestGTimes[4] = 20.0 OR DivLongestGTimes[5] = 20.0) GROUP BY SecurityDelay, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT Carrier, FlightNum, DestAirportID FROM mytable ORDER BY OriginCityMarketID, CarrierDelay LIMIT 7"}
 {"sql":"SELECT AirlineID, SUM(AirlineID), COUNT(CRSElapsedTime) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 10","hsqls":["SELECT AirlineID, SUM(AirlineID), COUNT(CRSElapsedTime) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 10"]}
 {"sql":"SELECT MAX(DestStateFips) FROM mytable WHERE DaysSinceEpoch > 16091 LIMIT 29"}
-{"sql":"SELECT COUNT(Flights), AVG(ArrDel15), AVG(AirlineID) FROM mytable WHERE DivLongestGTimes IN (55.0) LIMIT 12","hsqls":["SELECT COUNT(Flights), AVG(ArrDel15), AVG(AirlineID)  FROM mytable WHERE (DivLongestGTimes__MV0 IN (55.0) OR DivLongestGTimes__MV1 IN (55.0) OR DivLongestGTimes__MV2 IN (55.0) OR DivLongestGTimes__MV3 IN (55.0) OR DivLongestGTimes__MV4 IN (55.0)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(Flights), AVG(ArrDel15), AVG(AirlineID) FROM mytable WHERE DivLongestGTimes IN (55.0) LIMIT 12","hsqls":["SELECT COUNT(Flights), AVG(ArrDel15), AVG(AirlineID)  FROM mytable WHERE (DivLongestGTimes[1] IN (55.0) OR DivLongestGTimes[2] IN (55.0) OR DivLongestGTimes[3] IN (55.0) OR DivLongestGTimes[4] IN (55.0) OR DivLongestGTimes[5] IN (55.0)) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, COUNT(DestAirportID) FROM mytable WHERE AirlineID > 20355 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 24","hsqls":["SELECT DivReachedDest, COUNT(DestAirportID) FROM mytable WHERE AirlineID > 20355 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 24"]}
-{"sql":"SELECT Flights, CRSElapsedTime FROM mytable WHERE DivWheelsOffs IN (2142, 1857, 1216, 1729, 1231) OR WheelsOn BETWEEN 1521 AND 1846 ORDER BY Quarter LIMIT 21","hsqls":["SELECT Flights, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs__MV0 IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs__MV1 IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs__MV2 IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs__MV3 IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs__MV4 IN (2142, 1857, 1216, 1729, 1231)) OR WheelsOn BETWEEN 1521 AND 1846 ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT Flights, CRSElapsedTime FROM mytable WHERE DivWheelsOffs IN (2142, 1857, 1216, 1729, 1231) OR WheelsOn BETWEEN 1521 AND 1846 ORDER BY Quarter LIMIT 21","hsqls":["SELECT Flights, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs[1] IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs[2] IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs[3] IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs[4] IN (2142, 1857, 1216, 1729, 1231) OR DivWheelsOffs[5] IN (2142, 1857, 1216, 1729, 1231)) OR WheelsOn BETWEEN 1521 AND 1846 ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT \"Year\", LongestAddGTime, SUM(NASDelay), MAX(ActualElapsedTime), AVG(DestWac) FROM mytable WHERE CRSElapsedTime BETWEEN 257 AND 224 AND DayofMonth NOT IN (20, 18, 13) OR DepTimeBlk >= '1600-1659' GROUP BY \"Year\", LongestAddGTime LIMIT 3","hsqls":["SELECT Year, LongestAddGTime, SUM(NASDelay), MAX(ActualElapsedTime), AVG(DestWac) FROM mytable WHERE CRSElapsedTime BETWEEN 257 AND 224 AND DayofMonth NOT IN (20, 18, 13) OR DepTimeBlk >= '1600-1659' GROUP BY Year, LongestAddGTime LIMIT 3"]}
 {"sql":"SELECT Quarter, FlightDate, TailNum FROM mytable WHERE Cancelled > 1 AND DayofMonth NOT IN (21, 20, 18, 8, 14) ORDER BY OriginStateFips, CarrierDelay, Distance LIMIT 29"}
 {"sql":"SELECT DivActualElapsedTime, SUM(TaxiOut), AVG(Quarter), MAX(Cancelled) FROM mytable WHERE OriginAirportID IN (10141, 14685, 13433, 13367, 10408) AND ArrivalDelayGroups >= 5 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 12","hsqls":["SELECT DivActualElapsedTime, SUM(TaxiOut), AVG(Quarter), MAX(Cancelled) FROM mytable WHERE OriginAirportID IN (10141, 14685, 13433, 13367, 10408) AND ArrivalDelayGroups >= 5 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 12"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY DepDelay, ArrDel15 LIMIT 4","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY DepDelay, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, Distance, DepTime FROM mytable WHERE NASDelay BETWEEN 23 AND 11 OR DivTotalGTimes BETWEEN 48 AND 42 LIMIT 4","hsqls":["SELECT LateAircraftDelay, Distance, DepTime FROM mytable WHERE NASDelay BETWEEN 23 AND 11 OR (DivTotalGTimes__MV0 BETWEEN 48 AND 42 OR DivTotalGTimes__MV1 BETWEEN 48 AND 42 OR DivTotalGTimes__MV2 BETWEEN 48 AND 42 OR DivTotalGTimes__MV3 BETWEEN 48 AND 42 OR DivTotalGTimes__MV4 BETWEEN 48 AND 42) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY DepDelay, ArrDel15 LIMIT 4","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY DepDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, Distance, DepTime FROM mytable WHERE NASDelay BETWEEN 23 AND 11 OR DivTotalGTimes BETWEEN 48 AND 42 LIMIT 4","hsqls":["SELECT LateAircraftDelay, Distance, DepTime FROM mytable WHERE NASDelay BETWEEN 23 AND 11 OR (DivTotalGTimes[1] BETWEEN 48 AND 42 OR DivTotalGTimes[2] BETWEEN 48 AND 42 OR DivTotalGTimes[3] BETWEEN 48 AND 42 OR DivTotalGTimes[4] BETWEEN 48 AND 42 OR DivTotalGTimes[5] BETWEEN 48 AND 42) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE LongestAddGTime <> 51 LIMIT 15"}
 {"sql":"SELECT DestAirportSeqID, DestStateName, DivAirportLandings, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DestStateName, DivAirportLandings  ORDER BY DestAirportSeqID, DestStateName, DivAirportLandings LIMIT 17","hsqls":["SELECT DestAirportSeqID, DestStateName, DivAirportLandings, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DestStateName, DivAirportLandings  ORDER BY DestAirportSeqID, DestStateName, DivAirportLandings LIMIT 17"]}
-{"sql":"SELECT Dest, SUM(Quarter), AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName = 'Puerto Rico' OR DivWheelsOns IN (1055, 1500, 2003, 1129, 939) GROUP BY Dest LIMIT 7","hsqls":["SELECT Dest, SUM(Quarter), AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName = 'Puerto Rico' OR (DivWheelsOns__MV0 IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns__MV1 IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns__MV2 IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns__MV3 IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns__MV4 IN (1055, 1500, 2003, 1129, 939)) GROUP BY Dest LIMIT 10000"]}
+{"sql":"SELECT Dest, SUM(Quarter), AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName = 'Puerto Rico' OR DivWheelsOns IN (1055, 1500, 2003, 1129, 939) GROUP BY Dest LIMIT 7","hsqls":["SELECT Dest, SUM(Quarter), AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName = 'Puerto Rico' OR (DivWheelsOns[1] IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns[2] IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns[3] IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns[4] IN (1055, 1500, 2003, 1129, 939) OR DivWheelsOns[5] IN (1055, 1500, 2003, 1129, 939)) GROUP BY Dest LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, AVG(DepDel15), COUNT(Distance) FROM mytable WHERE Quarter >= 1 GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 10","hsqls":["SELECT DepDelayMinutes, AVG(DepDel15), COUNT(Distance) FROM mytable WHERE Quarter >= 1 GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 10"]}
 {"sql":"SELECT CRSArrTime, Cancelled, CRSDepTime, COUNT(*) FROM mytable GROUP BY CRSArrTime, Cancelled, CRSDepTime  ORDER BY CRSArrTime, Cancelled, CRSDepTime LIMIT 13","hsqls":["SELECT CRSArrTime, Cancelled, CRSDepTime, COUNT(*) FROM mytable GROUP BY CRSArrTime, Cancelled, CRSDepTime  ORDER BY CRSArrTime, Cancelled, CRSDepTime LIMIT 13"]}
-{"sql":"SELECT CancellationCode, MIN(Flights), MAX(\"Month\") FROM mytable WHERE \"Month\" < 1 GROUP BY CancellationCode LIMIT 23","hsqls":["SELECT CancellationCode, MIN(Flights), MAX(Month) FROM mytable WHERE Month < 1 GROUP BY CancellationCode LIMIT 23"]}
+{"sql":"SELECT CancellationCode, MIN(Flights), MAX(\"Month\") FROM mytable WHERE \"Month\" < 1 GROUP BY CancellationCode LIMIT 23","hsqls":["SELECT CancellationCode, MIN(Flights), MAX(`Month`) FROM mytable WHERE `Month` < 1 GROUP BY CancellationCode LIMIT 23"]}
 {"sql":"SELECT DepDelayMinutes, TotalAddGTime, DestCityMarketID FROM mytable WHERE Flights NOT IN (1) AND OriginCityName > 'Duluth, MN' ORDER BY FlightDate, DepTimeBlk LIMIT 3"}
 {"sql":"SELECT DestStateFips, ArrDelayMinutes, DepDel15, COUNT(*) FROM mytable GROUP BY DestStateFips, ArrDelayMinutes, DepDel15  ORDER BY DestStateFips, ArrDelayMinutes, DepDel15 LIMIT 21","hsqls":["SELECT DestStateFips, ArrDelayMinutes, DepDel15, COUNT(*) FROM mytable GROUP BY DestStateFips, ArrDelayMinutes, DepDel15  ORDER BY DestStateFips, ArrDelayMinutes, DepDel15 LIMIT 21"]}
 {"sql":"SELECT DepTime FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND Distance IN (1389, 852, 744) AND AirTime NOT IN (181, 132, 259, 271) LIMIT 1"}
-{"sql":"SELECT DivAirportLandings, UniqueCarrier FROM mytable WHERE OriginCityName NOT IN ('Tampa, FL', 'Pasco/Kennewick/Richland, WA') AND WheelsOn = 917 AND DivTotalGTimes BETWEEN 6 AND 67 ORDER BY Diverted, WeatherDelay LIMIT 18","hsqls":["SELECT DivAirportLandings, UniqueCarrier FROM mytable WHERE OriginCityName NOT IN ('Tampa, FL', 'Pasco/Kennewick/Richland, WA') AND WheelsOn = 917 AND (DivTotalGTimes__MV0 BETWEEN 6 AND 67 OR DivTotalGTimes__MV1 BETWEEN 6 AND 67 OR DivTotalGTimes__MV2 BETWEEN 6 AND 67 OR DivTotalGTimes__MV3 BETWEEN 6 AND 67 OR DivTotalGTimes__MV4 BETWEEN 6 AND 67) ORDER BY Diverted, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, UniqueCarrier FROM mytable WHERE OriginCityName NOT IN ('Tampa, FL', 'Pasco/Kennewick/Richland, WA') AND WheelsOn = 917 AND DivTotalGTimes BETWEEN 6 AND 67 ORDER BY Diverted, WeatherDelay LIMIT 18","hsqls":["SELECT DivAirportLandings, UniqueCarrier FROM mytable WHERE OriginCityName NOT IN ('Tampa, FL', 'Pasco/Kennewick/Richland, WA') AND WheelsOn = 917 AND (DivTotalGTimes[1] BETWEEN 6 AND 67 OR DivTotalGTimes[2] BETWEEN 6 AND 67 OR DivTotalGTimes[3] BETWEEN 6 AND 67 OR DivTotalGTimes[4] BETWEEN 6 AND 67 OR DivTotalGTimes[5] BETWEEN 6 AND 67) ORDER BY Diverted, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT DestCityName, CRSElapsedTime FROM mytable ORDER BY CRSArrTime, AirTime LIMIT 7"}
 {"sql":"SELECT Diverted, WeatherDelay, Dest, COUNT(OriginCityMarketID), MAX(Distance) FROM mytable GROUP BY Diverted, WeatherDelay, Dest  ORDER BY Diverted, WeatherDelay, Dest LIMIT 5","hsqls":["SELECT Diverted, WeatherDelay, Dest, COUNT(OriginCityMarketID), MAX(Distance) FROM mytable GROUP BY Diverted, WeatherDelay, Dest  ORDER BY Diverted, WeatherDelay, Dest LIMIT 5"]}
-{"sql":"SELECT DestStateFips, Cancelled, DestAirportID FROM mytable WHERE NASDelay > 281 AND DivWheelsOns IN (2235, 1645, 819) ORDER BY Diverted, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DestStateFips, Cancelled, DestAirportID FROM mytable WHERE NASDelay > 281 AND (DivWheelsOns__MV0 IN (2235, 1645, 819) OR DivWheelsOns__MV1 IN (2235, 1645, 819) OR DivWheelsOns__MV2 IN (2235, 1645, 819) OR DivWheelsOns__MV3 IN (2235, 1645, 819) OR DivWheelsOns__MV4 IN (2235, 1645, 819)) ORDER BY Diverted, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, Cancelled, DestAirportID FROM mytable WHERE NASDelay > 281 AND DivWheelsOns IN (2235, 1645, 819) ORDER BY Diverted, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DestStateFips, Cancelled, DestAirportID FROM mytable WHERE NASDelay > 281 AND (DivWheelsOns[1] IN (2235, 1645, 819) OR DivWheelsOns[2] IN (2235, 1645, 819) OR DivWheelsOns[3] IN (2235, 1645, 819) OR DivWheelsOns[4] IN (2235, 1645, 819) OR DivWheelsOns[5] IN (2235, 1645, 819)) ORDER BY Diverted, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT Diverted, OriginCityName, Origin FROM mytable ORDER BY TaxiIn, DaysSinceEpoch LIMIT 27"}
-{"sql":"SELECT DestWac, DayofMonth FROM mytable WHERE Flights BETWEEN 1 AND 1 OR \"Month\" BETWEEN 1 AND 1 ORDER BY LongestAddGTime, TailNum LIMIT 20","hsqls":["SELECT DestWac, DayofMonth FROM mytable WHERE Flights BETWEEN 1 AND 1 OR Month BETWEEN 1 AND 1 ORDER BY LongestAddGTime, TailNum LIMIT 20"]}
+{"sql":"SELECT DestWac, DayofMonth FROM mytable WHERE Flights BETWEEN 1 AND 1 OR \"Month\" BETWEEN 1 AND 1 ORDER BY LongestAddGTime, TailNum LIMIT 20","hsqls":["SELECT DestWac, DayofMonth FROM mytable WHERE Flights BETWEEN 1 AND 1 OR `Month` BETWEEN 1 AND 1 ORDER BY LongestAddGTime, TailNum LIMIT 20"]}
 {"sql":"SELECT COUNT(DayofMonth), SUM(WeatherDelay), MAX(AirTime) FROM mytable WHERE TaxiOut >= 57 AND DivDistance BETWEEN 261 AND 190 LIMIT 15"}
 {"sql":"SELECT OriginAirportSeqID, Diverted, Origin FROM mytable ORDER BY OriginStateName LIMIT 10"}
 {"sql":"SELECT DestState FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) AND DestStateName IN ('Idaho', 'Kansas') LIMIT 17"}
-{"sql":"SELECT DivReachedDest, DestStateFips FROM mytable WHERE DestAirportID <> 14831 OR \"Year\" = 2014 ORDER BY \"Month\" LIMIT 19","hsqls":["SELECT DivReachedDest, DestStateFips FROM mytable WHERE DestAirportID <> 14831 OR Year = 2014 ORDER BY Month LIMIT 19"]}
+{"sql":"SELECT DivReachedDest, DestStateFips FROM mytable WHERE DestAirportID <> 14831 OR \"Year\" = 2014 ORDER BY \"Month\" LIMIT 19","hsqls":["SELECT DivReachedDest, DestStateFips FROM mytable WHERE DestAirportID <> 14831 OR `Year` = 2014 ORDER BY `Month` LIMIT 19"]}
 {"sql":"SELECT DivDistance, COUNT(FlightDate) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 8","hsqls":["SELECT DivDistance, COUNT(FlightDate) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 8"]}
-{"sql":"SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE DivAirportIDs IN (12892, 11630, 14492, 12217, 12173) AND DayOfWeek IN (3, 1, 5, 4) ORDER BY CarrierDelay, ArrDel15 LIMIT 22","hsqls":["SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE (DivAirportIDs__MV0 IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs__MV1 IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs__MV2 IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs__MV3 IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs__MV4 IN (12892, 11630, 14492, 12217, 12173)) AND DayOfWeek IN (3, 1, 5, 4) ORDER BY CarrierDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE DivAirportIDs IN (12892, 11630, 14492, 12217, 12173) AND DayOfWeek IN (3, 1, 5, 4) ORDER BY CarrierDelay, ArrDel15 LIMIT 22","hsqls":["SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE (DivAirportIDs[1] IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs[2] IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs[3] IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs[4] IN (12892, 11630, 14492, 12217, 12173) OR DivAirportIDs[5] IN (12892, 11630, 14492, 12217, 12173)) AND DayOfWeek IN (3, 1, 5, 4) ORDER BY CarrierDelay, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE DivArrDelay NOT IN (67, 260) AND Carrier IN ('F9', 'B6') OR DepTime BETWEEN 2144 AND 1926 LIMIT 28"}
-{"sql":"SELECT DivWheelsOns, DayofMonth FROM mytable WHERE TaxiIn BETWEEN 102 AND 140 OR WeatherDelay BETWEEN 62 AND 132 LIMIT 7","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DayofMonth FROM mytable WHERE TaxiIn BETWEEN 102 AND 140 OR WeatherDelay BETWEEN 62 AND 132 LIMIT 10000"]}
-{"sql":"SELECT AVG(Distance), MIN(\"Month\") FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 4","hsqls":["SELECT AVG(Distance), MIN(Month) FROM mytable WHERE Year BETWEEN 2014 AND 2014 LIMIT 4"]}
+{"sql":"SELECT DivWheelsOns, DayofMonth FROM mytable WHERE TaxiIn BETWEEN 102 AND 140 OR WeatherDelay BETWEEN 62 AND 132 LIMIT 7","hsqls":["SELECT DivWheelsOns, DayofMonth FROM mytable WHERE TaxiIn BETWEEN 102 AND 140 OR WeatherDelay BETWEEN 62 AND 132 LIMIT 10000"]}
+{"sql":"SELECT AVG(Distance), MIN(\"Month\") FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 4","hsqls":["SELECT AVG(Distance), MIN(`Month`) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 LIMIT 4"]}
 {"sql":"SELECT OriginCityName, DivArrDelay, COUNT(DivActualElapsedTime) FROM mytable GROUP BY OriginCityName, DivArrDelay  ORDER BY OriginCityName, DivArrDelay LIMIT 10","hsqls":["SELECT OriginCityName, DivArrDelay, COUNT(DivActualElapsedTime) FROM mytable GROUP BY OriginCityName, DivArrDelay  ORDER BY OriginCityName, DivArrDelay LIMIT 10"]}
-{"sql":"SELECT DivReachedDest, ActualElapsedTime, DivTotalGTimes FROM mytable WHERE TotalAddGTime <= 40 LIMIT 6","hsqls":["SELECT DivReachedDest, ActualElapsedTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE TotalAddGTime <= 40 LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, ActualElapsedTime, DivTotalGTimes FROM mytable WHERE TotalAddGTime <= 40 LIMIT 6","hsqls":["SELECT DivReachedDest, ActualElapsedTime, DivTotalGTimes FROM mytable WHERE TotalAddGTime <= 40 LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, CRSDepTime, COUNT(*) FROM mytable WHERE ActualElapsedTime > 363 GROUP BY DivReachedDest, CRSDepTime  ORDER BY DivReachedDest, CRSDepTime LIMIT 24","hsqls":["SELECT DivReachedDest, CRSDepTime, COUNT(*) FROM mytable WHERE ActualElapsedTime > 363 GROUP BY DivReachedDest, CRSDepTime  ORDER BY DivReachedDest, CRSDepTime LIMIT 24"]}
 {"sql":"SELECT AVG(TotalAddGTime) FROM mytable LIMIT 10"}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE Cancelled < 1 OR Origin = 'COD' AND OriginCityName NOT IN ('Dallas, TX') ORDER BY DepartureDelayGroups, CRSArrTime LIMIT 19"}
@@ -415,82 +415,82 @@
 {"sql":"SELECT CRSElapsedTime FROM mytable LIMIT 8"}
 {"sql":"SELECT DestWac, LongestAddGTime, AirlineID FROM mytable ORDER BY DepartureDelayGroups, CRSArrTime, ArrTime LIMIT 18"}
 {"sql":"SELECT LongestAddGTime, Origin, CRSDepTime, SUM(ArrDelayMinutes), MAX(CRSArrTime), SUM(DepartureDelayGroups) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY LongestAddGTime, Origin, CRSDepTime  ORDER BY LongestAddGTime, Origin, CRSDepTime LIMIT 2","hsqls":["SELECT LongestAddGTime, Origin, CRSDepTime, SUM(ArrDelayMinutes), MAX(CRSArrTime), SUM(DepartureDelayGroups) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY LongestAddGTime, Origin, CRSDepTime  ORDER BY LongestAddGTime, Origin, CRSDepTime LIMIT 2"]}
-{"sql":"SELECT DivAirports, WeatherDelay, DepTimeBlk FROM mytable WHERE Cancelled BETWEEN 0 AND 0 AND DaysSinceEpoch >= 16098 OR Flights NOT IN (1) LIMIT 12","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, WeatherDelay, DepTimeBlk FROM mytable WHERE Cancelled BETWEEN 0 AND 0 AND DaysSinceEpoch >= 16098 OR Flights NOT IN (1) LIMIT 10000"]}
+{"sql":"SELECT DivAirports, WeatherDelay, DepTimeBlk FROM mytable WHERE Cancelled BETWEEN 0 AND 0 AND DaysSinceEpoch >= 16098 OR Flights NOT IN (1) LIMIT 12","hsqls":["SELECT DivAirports, WeatherDelay, DepTimeBlk FROM mytable WHERE Cancelled BETWEEN 0 AND 0 AND DaysSinceEpoch >= 16098 OR Flights NOT IN (1) LIMIT 10000"]}
 {"sql":"SELECT OriginState, DepDelay, Flights FROM mytable WHERE ArrDelay BETWEEN 106.0 AND -46.0 OR DestWac >= 12 ORDER BY FirstDepTime, Dest LIMIT 5"}
 {"sql":"SELECT DepDelayMinutes, LongestAddGTime FROM mytable WHERE WheelsOff <= 2300 ORDER BY LongestAddGTime, ArrTime, Cancelled LIMIT 8"}
-{"sql":"SELECT DepDelay, LateAircraftDelay, DivAirportIDs FROM mytable WHERE UniqueCarrier IN ('HA') ORDER BY OriginAirportSeqID, LateAircraftDelay, DepDel15 LIMIT 6","hsqls":["SELECT DepDelay, LateAircraftDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE UniqueCarrier IN ('HA') ORDER BY OriginAirportSeqID, LateAircraftDelay, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DepDelay, LateAircraftDelay, DivAirportIDs FROM mytable WHERE UniqueCarrier IN ('HA') ORDER BY OriginAirportSeqID, LateAircraftDelay, DepDel15 LIMIT 6","hsqls":["SELECT DepDelay, LateAircraftDelay, DivAirportIDs FROM mytable WHERE UniqueCarrier IN ('HA') ORDER BY OriginAirportSeqID, LateAircraftDelay, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime <> 264 OR WheelsOff BETWEEN 722 AND 1243 LIMIT 20"}
 {"sql":"SELECT OriginStateFips, FirstDepTime, DestState, AVG(DestAirportSeqID), COUNT(DepartureDelayGroups), MAX(ActualElapsedTime) FROM mytable WHERE DistanceGroup < 5 OR ArrTime <> 1755 OR WheelsOff IN (1138, 2225, 532, 643, 2010) GROUP BY OriginStateFips, FirstDepTime, DestState  ORDER BY OriginStateFips, FirstDepTime, DestState LIMIT 9","hsqls":["SELECT OriginStateFips, FirstDepTime, DestState, AVG(DestAirportSeqID), COUNT(DepartureDelayGroups), MAX(ActualElapsedTime) FROM mytable WHERE DistanceGroup < 5 OR ArrTime <> 1755 OR WheelsOff IN (1138, 2225, 532, 643, 2010) GROUP BY OriginStateFips, FirstDepTime, DestState  ORDER BY OriginStateFips, FirstDepTime, DestState LIMIT 9"]}
-{"sql":"SELECT OriginAirportSeqID, WheelsOff, TailNum, AVG(\"Month\"), COUNT(DistanceGroup), MIN(DepDelay) FROM mytable WHERE CRSDepTime NOT IN (935, 1012, 1809) OR DivAirports IN ('SJC', 'FNT') GROUP BY OriginAirportSeqID, WheelsOff, TailNum LIMIT 20","hsqls":["SELECT OriginAirportSeqID, WheelsOff, TailNum, AVG(Month), COUNT(DistanceGroup), MIN(DepDelay) FROM mytable WHERE CRSDepTime NOT IN (935, 1012, 1809) OR (DivAirports__MV0 IN ('SJC', 'FNT') OR DivAirports__MV1 IN ('SJC', 'FNT') OR DivAirports__MV2 IN ('SJC', 'FNT') OR DivAirports__MV3 IN ('SJC', 'FNT') OR DivAirports__MV4 IN ('SJC', 'FNT')) GROUP BY OriginAirportSeqID, WheelsOff, TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, WheelsOff, TailNum, AVG(\"Month\"), COUNT(DistanceGroup), MIN(DepDelay) FROM mytable WHERE CRSDepTime NOT IN (935, 1012, 1809) OR DivAirports IN ('SJC', 'FNT') GROUP BY OriginAirportSeqID, WheelsOff, TailNum LIMIT 20","hsqls":["SELECT OriginAirportSeqID, WheelsOff, TailNum, AVG(`Month`), COUNT(DistanceGroup), MIN(DepDelay) FROM mytable WHERE CRSDepTime NOT IN (935, 1012, 1809) OR (DivAirports[1] IN ('SJC', 'FNT') OR DivAirports[2] IN ('SJC', 'FNT') OR DivAirports[3] IN ('SJC', 'FNT') OR DivAirports[4] IN ('SJC', 'FNT') OR DivAirports[5] IN ('SJC', 'FNT')) GROUP BY OriginAirportSeqID, WheelsOff, TailNum LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, ArrDelayMinutes, NASDelay, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (108.0, 0.0, 82.0, 147.0, 87.0) OR Flights >= 1 GROUP BY LateAircraftDelay, ArrDelayMinutes, NASDelay  ORDER BY LateAircraftDelay, ArrDelayMinutes, NASDelay LIMIT 18","hsqls":["SELECT LateAircraftDelay, ArrDelayMinutes, NASDelay, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (108.0, 0.0, 82.0, 147.0, 87.0) OR Flights >= 1 GROUP BY LateAircraftDelay, ArrDelayMinutes, NASDelay  ORDER BY LateAircraftDelay, ArrDelayMinutes, NASDelay LIMIT 18"]}
 {"sql":"SELECT DivDistance, COUNT(*) FROM mytable WHERE CRSElapsedTime = 76 AND DistanceGroup IN (3, 1, 5, 4) GROUP BY DivDistance  ORDER BY DivDistance LIMIT 14","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable WHERE CRSElapsedTime = 76 AND DistanceGroup IN (3, 1, 5, 4) GROUP BY DivDistance  ORDER BY DivDistance LIMIT 14"]}
 {"sql":"SELECT OriginState FROM mytable ORDER BY Distance, ArrDelayMinutes LIMIT 26"}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE DestAirportSeqID BETWEEN 1463502 AND 1338801 LIMIT 24"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDel15 <> -9999 OR DistanceGroup IN (2)"}
 {"sql":"SELECT MAX(OriginStateFips) FROM mytable WHERE FirstDepTime <= 835 AND ActualElapsedTime IN (109, 157, 361, 118) LIMIT 22"}
-{"sql":"SELECT DivDistance, Carrier, UniqueCarrier, COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N221SW' AND 'N638SW' GROUP BY DivDistance, Carrier, UniqueCarrier LIMIT 18","hsqls":["SELECT DivDistance, Carrier, UniqueCarrier, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums__MV1 BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums__MV2 BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums__MV3 BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums__MV4 BETWEEN 'N221SW' AND 'N638SW') GROUP BY DivDistance, Carrier, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivDistance, Carrier, UniqueCarrier, COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N221SW' AND 'N638SW' GROUP BY DivDistance, Carrier, UniqueCarrier LIMIT 18","hsqls":["SELECT DivDistance, Carrier, UniqueCarrier, COUNT(*) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums[2] BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums[3] BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums[4] BETWEEN 'N221SW' AND 'N638SW' OR DivTailNums[5] BETWEEN 'N221SW' AND 'N638SW') GROUP BY DivDistance, Carrier, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY FirstDepTime, ActualElapsedTime LIMIT 5"}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY WheelsOff LIMIT 16"}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE OriginStateFips NOT IN (47, 36, 15, 25, 27) AND NASDelay IN (113, 106, 25, 39) AND TailNum NOT IN ('N958UW', 'N913DL', 'N8603F', 'N779CA', 'N398SW') ORDER BY DivAirportLandings LIMIT 15"}
 {"sql":"SELECT FirstDepTime, MIN(DivActualElapsedTime), MAX(DistanceGroup), MAX(ArrDelayMinutes) FROM mytable WHERE AirTime <= 200 OR Diverted > 1 OR CRSDepTime BETWEEN 612 AND 1653 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 29","hsqls":["SELECT FirstDepTime, MIN(DivActualElapsedTime), MAX(DistanceGroup), MAX(ArrDelayMinutes) FROM mytable WHERE AirTime <= 200 OR Diverted > 1 OR CRSDepTime BETWEEN 612 AND 1653 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 29"]}
 {"sql":"SELECT DepartureDelayGroups, OriginAirportID, AVG(CRSElapsedTime), MIN(WheelsOff) FROM mytable WHERE LateAircraftDelay BETWEEN 77 AND 27 OR ArrDelay IN (262.0, -26.0, -58.0) AND OriginStateFips IN (1, 26) GROUP BY DepartureDelayGroups, OriginAirportID  ORDER BY DepartureDelayGroups, OriginAirportID LIMIT 13","hsqls":["SELECT DepartureDelayGroups, OriginAirportID, AVG(CRSElapsedTime), MIN(WheelsOff) FROM mytable WHERE LateAircraftDelay BETWEEN 77 AND 27 OR ArrDelay IN (262.0, -26.0, -58.0) AND OriginStateFips IN (1, 26) GROUP BY DepartureDelayGroups, OriginAirportID  ORDER BY DepartureDelayGroups, OriginAirportID LIMIT 13"]}
-{"sql":"SELECT TotalAddGTime, ArrTimeBlk, DivWheelsOffs FROM mytable WHERE LateAircraftDelay BETWEEN 33 AND 32 OR DepDelay IN (246.0, 164.0, 171.0, 39.0, 340.0) OR DayOfWeek NOT IN (2, 7, 6, 4) ORDER BY WeatherDelay, UniqueCarrier LIMIT 28","hsqls":["SELECT TotalAddGTime, ArrTimeBlk, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE LateAircraftDelay BETWEEN 33 AND 32 OR DepDelay IN (246.0, 164.0, 171.0, 39.0, 340.0) OR DayOfWeek NOT IN (2, 7, 6, 4) ORDER BY WeatherDelay, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT Diverted, DepTimeBlk, DivAirportLandings, COUNT(DepTimeBlk), MIN(TaxiOut), SUM(DepartureDelayGroups) FROM mytable WHERE OriginCityName BETWEEN 'Tyler, TX' AND 'Dayton, OH' AND OriginStateName <= 'New Hampshire' OR DivTotalGTimes BETWEEN 107 AND 62 GROUP BY Diverted, DepTimeBlk, DivAirportLandings LIMIT 29","hsqls":["SELECT Diverted, DepTimeBlk, DivAirportLandings, COUNT(DepTimeBlk), MIN(TaxiOut), SUM(DepartureDelayGroups) FROM mytable WHERE OriginCityName BETWEEN 'Tyler, TX' AND 'Dayton, OH' AND OriginStateName <= 'New Hampshire' OR (DivTotalGTimes__MV0 BETWEEN 107 AND 62 OR DivTotalGTimes__MV1 BETWEEN 107 AND 62 OR DivTotalGTimes__MV2 BETWEEN 107 AND 62 OR DivTotalGTimes__MV3 BETWEEN 107 AND 62 OR DivTotalGTimes__MV4 BETWEEN 107 AND 62) GROUP BY Diverted, DepTimeBlk, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DivDistance, DivWheelsOffs FROM mytable WHERE DepDelay IN (58.0, 93.0, 8.0, 106.0, -18.0) OR Flights <= 1 OR NASDelay IN (202, 104, 60, 74) ORDER BY DestState, DepTimeBlk, UniqueCarrier LIMIT 24","hsqls":["SELECT DivDistance, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DepDelay IN (58.0, 93.0, 8.0, 106.0, -18.0) OR Flights <= 1 OR NASDelay IN (202, 104, 60, 74) ORDER BY DestState, DepTimeBlk, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE OriginStateFips NOT IN (42, 47, 51, 24, 75) OR DivTailNums IN ('N462WN') AND ArrivalDelayGroups < 7 ORDER BY CRSArrTime, DepTimeBlk LIMIT 11","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE OriginStateFips NOT IN (42, 47, 51, 24, 75) OR (DivTailNums__MV0 IN ('N462WN') OR DivTailNums__MV1 IN ('N462WN') OR DivTailNums__MV2 IN ('N462WN') OR DivTailNums__MV3 IN ('N462WN') OR DivTailNums__MV4 IN ('N462WN')) AND ArrivalDelayGroups < 7 ORDER BY CRSArrTime, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, ArrTimeBlk, DivWheelsOffs FROM mytable WHERE LateAircraftDelay BETWEEN 33 AND 32 OR DepDelay IN (246.0, 164.0, 171.0, 39.0, 340.0) OR DayOfWeek NOT IN (2, 7, 6, 4) ORDER BY WeatherDelay, UniqueCarrier LIMIT 28","hsqls":["SELECT TotalAddGTime, ArrTimeBlk, DivWheelsOffs FROM mytable WHERE LateAircraftDelay BETWEEN 33 AND 32 OR DepDelay IN (246.0, 164.0, 171.0, 39.0, 340.0) OR DayOfWeek NOT IN (2, 7, 6, 4) ORDER BY WeatherDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT Diverted, DepTimeBlk, DivAirportLandings, COUNT(DepTimeBlk), MIN(TaxiOut), SUM(DepartureDelayGroups) FROM mytable WHERE OriginCityName BETWEEN 'Tyler, TX' AND 'Dayton, OH' AND OriginStateName <= 'New Hampshire' OR DivTotalGTimes BETWEEN 107 AND 62 GROUP BY Diverted, DepTimeBlk, DivAirportLandings LIMIT 29","hsqls":["SELECT Diverted, DepTimeBlk, DivAirportLandings, COUNT(DepTimeBlk), MIN(TaxiOut), SUM(DepartureDelayGroups) FROM mytable WHERE OriginCityName BETWEEN 'Tyler, TX' AND 'Dayton, OH' AND OriginStateName <= 'New Hampshire' OR (DivTotalGTimes[1] BETWEEN 107 AND 62 OR DivTotalGTimes[2] BETWEEN 107 AND 62 OR DivTotalGTimes[3] BETWEEN 107 AND 62 OR DivTotalGTimes[4] BETWEEN 107 AND 62 OR DivTotalGTimes[5] BETWEEN 107 AND 62) GROUP BY Diverted, DepTimeBlk, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DivWheelsOffs FROM mytable WHERE DepDelay IN (58.0, 93.0, 8.0, 106.0, -18.0) OR Flights <= 1 OR NASDelay IN (202, 104, 60, 74) ORDER BY DestState, DepTimeBlk, UniqueCarrier LIMIT 24","hsqls":["SELECT DivDistance, DivWheelsOffs FROM mytable WHERE DepDelay IN (58.0, 93.0, 8.0, 106.0, -18.0) OR Flights <= 1 OR NASDelay IN (202, 104, 60, 74) ORDER BY DestState, DepTimeBlk, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE OriginStateFips NOT IN (42, 47, 51, 24, 75) OR DivTailNums IN ('N462WN') AND ArrivalDelayGroups < 7 ORDER BY CRSArrTime, DepTimeBlk LIMIT 11","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE OriginStateFips NOT IN (42, 47, 51, 24, 75) OR (DivTailNums[1] IN ('N462WN') OR DivTailNums[2] IN ('N462WN') OR DivTailNums[3] IN ('N462WN') OR DivTailNums[4] IN ('N462WN') OR DivTailNums[5] IN ('N462WN')) AND ArrivalDelayGroups < 7 ORDER BY CRSArrTime, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DayofMonth, COUNT(DivActualElapsedTime), AVG(Diverted), AVG(Flights) FROM mytable GROUP BY OriginAirportSeqID, DayofMonth  ORDER BY OriginAirportSeqID, DayofMonth LIMIT 18","hsqls":["SELECT OriginAirportSeqID, DayofMonth, COUNT(DivActualElapsedTime), AVG(Diverted), AVG(Flights) FROM mytable GROUP BY OriginAirportSeqID, DayofMonth  ORDER BY OriginAirportSeqID, DayofMonth LIMIT 18"]}
 {"sql":"SELECT SUM(WheelsOn) FROM mytable LIMIT 23"}
 {"sql":"SELECT Diverted, ArrDel15, OriginWac FROM mytable WHERE AirlineID BETWEEN 20436 AND 19805 ORDER BY CRSArrTime LIMIT 24"}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivActualElapsedTime <= 349 OR FirstDepTime NOT IN (1653, 721) ORDER BY TaxiOut, FirstDepTime LIMIT 17","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DivActualElapsedTime <= 349 OR FirstDepTime NOT IN (1653, 721) ORDER BY TaxiOut, FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivActualElapsedTime <= 349 OR FirstDepTime NOT IN (1653, 721) ORDER BY TaxiOut, FirstDepTime LIMIT 17","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE DivActualElapsedTime <= 349 OR FirstDepTime NOT IN (1653, 721) ORDER BY TaxiOut, FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT Quarter, CRSArrTime, AVG(WheelsOff), MAX(DestWac) FROM mytable WHERE DestStateFips IN (9, 38) AND DaysSinceEpoch <= 16077 GROUP BY Quarter, CRSArrTime  ORDER BY Quarter, CRSArrTime LIMIT 5","hsqls":["SELECT Quarter, CRSArrTime, AVG(WheelsOff), MAX(DestWac) FROM mytable WHERE DestStateFips IN (9, 38) AND DaysSinceEpoch <= 16077 GROUP BY Quarter, CRSArrTime  ORDER BY Quarter, CRSArrTime LIMIT 5"]}
-{"sql":"SELECT SecurityDelay FROM mytable WHERE DivTailNums BETWEEN 'N8319F' AND 'N960AT' OR Dest BETWEEN 'BQN' AND 'SAN' ORDER BY ArrivalDelayGroups LIMIT 26","hsqls":["SELECT SecurityDelay FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums__MV1 BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums__MV2 BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums__MV3 BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums__MV4 BETWEEN 'N8319F' AND 'N960AT') OR Dest BETWEEN 'BQN' AND 'SAN' ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay FROM mytable WHERE DivTailNums BETWEEN 'N8319F' AND 'N960AT' OR Dest BETWEEN 'BQN' AND 'SAN' ORDER BY ArrivalDelayGroups LIMIT 26","hsqls":["SELECT SecurityDelay FROM mytable WHERE (DivTailNums[1] BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums[2] BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums[3] BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums[4] BETWEEN 'N8319F' AND 'N960AT' OR DivTailNums[5] BETWEEN 'N8319F' AND 'N960AT') OR Dest BETWEEN 'BQN' AND 'SAN' ORDER BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE FlightNum BETWEEN 5343 AND 4768 ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 11"}
-{"sql":"SELECT CRSArrTime, ArrivalDelayGroups, OriginStateName FROM mytable WHERE DivLongestGTimes BETWEEN 99.0 AND 79.0 ORDER BY AirTime, DaysSinceEpoch LIMIT 21","hsqls":["SELECT CRSArrTime, ArrivalDelayGroups, OriginStateName FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 99.0 AND 79.0 OR DivLongestGTimes__MV1 BETWEEN 99.0 AND 79.0 OR DivLongestGTimes__MV2 BETWEEN 99.0 AND 79.0 OR DivLongestGTimes__MV3 BETWEEN 99.0 AND 79.0 OR DivLongestGTimes__MV4 BETWEEN 99.0 AND 79.0) ORDER BY AirTime, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, DepDelay, FlightDate FROM mytable ORDER BY FlightNum, OriginWac LIMIT 14","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepDelay, FlightDate FROM mytable ORDER BY FlightNum, OriginWac LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, ArrivalDelayGroups, OriginStateName FROM mytable WHERE DivLongestGTimes BETWEEN 99.0 AND 79.0 ORDER BY AirTime, DaysSinceEpoch LIMIT 21","hsqls":["SELECT CRSArrTime, ArrivalDelayGroups, OriginStateName FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 99.0 AND 79.0 OR DivLongestGTimes[2] BETWEEN 99.0 AND 79.0 OR DivLongestGTimes[3] BETWEEN 99.0 AND 79.0 OR DivLongestGTimes[4] BETWEEN 99.0 AND 79.0 OR DivLongestGTimes[5] BETWEEN 99.0 AND 79.0) ORDER BY AirTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepDelay, FlightDate FROM mytable ORDER BY FlightNum, OriginWac LIMIT 14","hsqls":["SELECT DivWheelsOns, DepDelay, FlightDate FROM mytable ORDER BY FlightNum, OriginWac LIMIT 10000"]}
 {"sql":"SELECT DepDel15, DivArrDelay, MAX(CRSElapsedTime) FROM mytable WHERE TailNum NOT IN ('N001AA', 'N889AS', 'N314NB', 'N902MQ', 'N952DN') GROUP BY DepDel15, DivArrDelay  ORDER BY DepDel15, DivArrDelay LIMIT 28","hsqls":["SELECT DepDel15, DivArrDelay, MAX(CRSElapsedTime) FROM mytable WHERE TailNum NOT IN ('N001AA', 'N889AS', 'N314NB', 'N902MQ', 'N952DN') GROUP BY DepDel15, DivArrDelay  ORDER BY DepDel15, DivArrDelay LIMIT 28"]}
 {"sql":"SELECT DistanceGroup, Quarter, DestCityName FROM mytable WHERE Distance BETWEEN 1138 AND 1147 ORDER BY OriginAirportSeqID, WheelsOff, FlightDate LIMIT 5"}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE OriginCityName <> 'Wilmington, NC' AND DepDelay IN (2.0) OR DivDistance <> 91 ORDER BY DepDelay LIMIT 10"}
-{"sql":"SELECT WheelsOff, TaxiIn, DivArrDelay, COUNT(DistanceGroup), MIN(WheelsOff), MAX(Diverted) FROM mytable WHERE DivWheelsOffs IN (1231, 858, 2118) AND OriginWac BETWEEN 31 AND 14 OR CarrierDelay NOT IN (290) GROUP BY WheelsOff, TaxiIn, DivArrDelay LIMIT 10","hsqls":["SELECT WheelsOff, TaxiIn, DivArrDelay, COUNT(DistanceGroup), MIN(WheelsOff), MAX(Diverted) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1231, 858, 2118) OR DivWheelsOffs__MV1 IN (1231, 858, 2118) OR DivWheelsOffs__MV2 IN (1231, 858, 2118) OR DivWheelsOffs__MV3 IN (1231, 858, 2118) OR DivWheelsOffs__MV4 IN (1231, 858, 2118)) AND OriginWac BETWEEN 31 AND 14 OR CarrierDelay NOT IN (290) GROUP BY WheelsOff, TaxiIn, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, TaxiIn, DivArrDelay, COUNT(DistanceGroup), MIN(WheelsOff), MAX(Diverted) FROM mytable WHERE DivWheelsOffs IN (1231, 858, 2118) AND OriginWac BETWEEN 31 AND 14 OR CarrierDelay NOT IN (290) GROUP BY WheelsOff, TaxiIn, DivArrDelay LIMIT 10","hsqls":["SELECT WheelsOff, TaxiIn, DivArrDelay, COUNT(DistanceGroup), MIN(WheelsOff), MAX(Diverted) FROM mytable WHERE (DivWheelsOffs[1] IN (1231, 858, 2118) OR DivWheelsOffs[2] IN (1231, 858, 2118) OR DivWheelsOffs[3] IN (1231, 858, 2118) OR DivWheelsOffs[4] IN (1231, 858, 2118) OR DivWheelsOffs[5] IN (1231, 858, 2118)) AND OriginWac BETWEEN 31 AND 14 OR CarrierDelay NOT IN (290) GROUP BY WheelsOff, TaxiIn, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT FlightNum FROM mytable WHERE LateAircraftDelay > 132 LIMIT 25"}
 {"sql":"SELECT DepDelay, Carrier, DepTimeBlk, SUM(DivArrDelay) FROM mytable GROUP BY DepDelay, Carrier, DepTimeBlk","hsqls":["SELECT DepDelay, Carrier, DepTimeBlk, SUM(DivArrDelay) FROM mytable GROUP BY DepDelay, Carrier, DepTimeBlk"]}
-{"sql":"SELECT UniqueCarrier FROM mytable WHERE DivAirports IN ('MSO') OR OriginState IN ('CA') AND ArrTimeBlk <> '2200-2259' ORDER BY Origin, DivActualElapsedTime LIMIT 18","hsqls":["SELECT UniqueCarrier FROM mytable WHERE (DivAirports__MV0 IN ('MSO') OR DivAirports__MV1 IN ('MSO') OR DivAirports__MV2 IN ('MSO') OR DivAirports__MV3 IN ('MSO') OR DivAirports__MV4 IN ('MSO')) OR OriginState IN ('CA') AND ArrTimeBlk <> '2200-2259' ORDER BY Origin, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier FROM mytable WHERE DivAirports IN ('MSO') OR OriginState IN ('CA') AND ArrTimeBlk <> '2200-2259' ORDER BY Origin, DivActualElapsedTime LIMIT 18","hsqls":["SELECT UniqueCarrier FROM mytable WHERE (DivAirports[1] IN ('MSO') OR DivAirports[2] IN ('MSO') OR DivAirports[3] IN ('MSO') OR DivAirports[4] IN ('MSO') OR DivAirports[5] IN ('MSO')) OR OriginState IN ('CA') AND ArrTimeBlk <> '2200-2259' ORDER BY Origin, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DivDistance, Dest FROM mytable WHERE DepDelay NOT IN (243.0) LIMIT 4"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestState BETWEEN 'WY' AND 'AK' OR ActualElapsedTime BETWEEN 261 AND 250 LIMIT 27"}
-{"sql":"SELECT DepDelay, DivAirportIDs, DepDel15 FROM mytable LIMIT 9","hsqls":["SELECT DepDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DepDel15 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivAirportIDs, DepDel15 FROM mytable LIMIT 9","hsqls":["SELECT DepDelay, DivAirportIDs, DepDel15 FROM mytable LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE DaysSinceEpoch BETWEEN 16073 AND 16100 AND Origin = 'DHN' AND Origin <= 'ACT' ORDER BY DepartureDelayGroups, DestWac, Carrier LIMIT 10"}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE CarrierDelay NOT IN (79, 174, 43, 228, 176) ORDER BY Quarter, DestAirportID LIMIT 1"}
 {"sql":"SELECT Dest, SUM(SecurityDelay) FROM mytable WHERE DepDelay BETWEEN 198.0 AND 27.0 AND Flights <> 1 OR DestAirportID IN (10279, 11097, 10693) GROUP BY Dest  ORDER BY Dest LIMIT 5","hsqls":["SELECT Dest, SUM(SecurityDelay) FROM mytable WHERE DepDelay BETWEEN 198.0 AND 27.0 AND Flights <> 1 OR DestAirportID IN (10279, 11097, 10693) GROUP BY Dest  ORDER BY Dest LIMIT 5"]}
 {"sql":"SELECT DivReachedDest, AVG(WheelsOff) FROM mytable WHERE CarrierDelay < 280 AND DestWac BETWEEN 2 AND 13 AND TaxiIn BETWEEN 162 AND 6 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 10","hsqls":["SELECT DivReachedDest, AVG(WheelsOff) FROM mytable WHERE CarrierDelay < 280 AND DestWac BETWEEN 2 AND 13 AND TaxiIn BETWEEN 162 AND 6 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 10"]}
-{"sql":"SELECT MIN(NASDelay), MAX(DivReachedDest) FROM mytable WHERE DivAirportSeqIDs = 1474703 OR ActualElapsedTime BETWEEN 402 AND 535 OR DivWheelsOffs > 2338 LIMIT 3","hsqls":["SELECT MIN(NASDelay), MAX(DivReachedDest) FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1474703 OR DivAirportSeqIDs__MV1 = 1474703 OR DivAirportSeqIDs__MV2 = 1474703 OR DivAirportSeqIDs__MV3 = 1474703 OR DivAirportSeqIDs__MV4 = 1474703) OR ActualElapsedTime BETWEEN 402 AND 535 OR (DivWheelsOffs__MV0 > 2338 OR DivWheelsOffs__MV1 > 2338 OR DivWheelsOffs__MV2 > 2338 OR DivWheelsOffs__MV3 > 2338 OR DivWheelsOffs__MV4 > 2338) LIMIT 10000"]}
+{"sql":"SELECT MIN(NASDelay), MAX(DivReachedDest) FROM mytable WHERE DivAirportSeqIDs = 1474703 OR ActualElapsedTime BETWEEN 402 AND 535 OR DivWheelsOffs > 2338 LIMIT 3","hsqls":["SELECT MIN(NASDelay), MAX(DivReachedDest) FROM mytable WHERE (DivAirportSeqIDs[1] = 1474703 OR DivAirportSeqIDs[2] = 1474703 OR DivAirportSeqIDs[3] = 1474703 OR DivAirportSeqIDs[4] = 1474703 OR DivAirportSeqIDs[5] = 1474703) OR ActualElapsedTime BETWEEN 402 AND 535 OR (DivWheelsOffs[1] > 2338 OR DivWheelsOffs[2] > 2338 OR DivWheelsOffs[3] > 2338 OR DivWheelsOffs[4] > 2338 OR DivWheelsOffs[5] > 2338) LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) OR DepartureDelayGroups NOT IN (2, 4) OR DepDelayMinutes BETWEEN 126.0 AND 140.0 LIMIT 26"}
 {"sql":"SELECT Diverted, DestAirportID, DivArrDelay FROM mytable WHERE OriginCityName NOT IN ('Shreveport, LA') OR DestStateFips = 72 ORDER BY OriginCityName, DivArrDelay LIMIT 20"}
 {"sql":"SELECT OriginState, Dest FROM mytable WHERE DestAirportSeqID BETWEEN 1201202 AND 1056103 OR Flights BETWEEN 1 AND 1 ORDER BY CRSElapsedTime LIMIT 23"}
 {"sql":"SELECT Quarter, DestStateFips, UniqueCarrier, COUNT(*) FROM mytable WHERE LateAircraftDelay BETWEEN 182 AND 120 GROUP BY Quarter, DestStateFips, UniqueCarrier  ORDER BY Quarter, DestStateFips, UniqueCarrier LIMIT 2","hsqls":["SELECT Quarter, DestStateFips, UniqueCarrier, COUNT(*) FROM mytable WHERE LateAircraftDelay BETWEEN 182 AND 120 GROUP BY Quarter, DestStateFips, UniqueCarrier  ORDER BY Quarter, DestStateFips, UniqueCarrier LIMIT 2"]}
 {"sql":"SELECT CRSArrTime FROM mytable LIMIT 14"}
-{"sql":"SELECT OriginState, DivArrDelay, MIN(\"Year\") FROM mytable GROUP BY OriginState, DivArrDelay LIMIT 26","hsqls":["SELECT OriginState, DivArrDelay, MIN(Year) FROM mytable GROUP BY OriginState, DivArrDelay LIMIT 26"]}
+{"sql":"SELECT OriginState, DivArrDelay, MIN(\"Year\") FROM mytable GROUP BY OriginState, DivArrDelay LIMIT 26","hsqls":["SELECT OriginState, DivArrDelay, MIN(`Year`) FROM mytable GROUP BY OriginState, DivArrDelay LIMIT 26"]}
 {"sql":"SELECT DepartureDelayGroups, ArrTimeBlk, CRSElapsedTime, SUM(ArrDel15), AVG(DivActualElapsedTime) FROM mytable WHERE FlightDate >= '2014-01-03' GROUP BY DepartureDelayGroups, ArrTimeBlk, CRSElapsedTime  ORDER BY DepartureDelayGroups, ArrTimeBlk, CRSElapsedTime LIMIT 10","hsqls":["SELECT DepartureDelayGroups, ArrTimeBlk, CRSElapsedTime, SUM(ArrDel15), AVG(DivActualElapsedTime) FROM mytable WHERE FlightDate >= '2014-01-03' GROUP BY DepartureDelayGroups, ArrTimeBlk, CRSElapsedTime  ORDER BY DepartureDelayGroups, ArrTimeBlk, CRSElapsedTime LIMIT 10"]}
 {"sql":"SELECT AirTime, AirlineID FROM mytable WHERE Distance BETWEEN 365 AND 1774 OR DepTimeBlk NOT IN ('1600-1659', '2000-2059', '1300-1359', '2300-2359') OR AirlineID < 19790 ORDER BY DepDelay, DepTime, Cancelled LIMIT 16"}
 {"sql":"SELECT ArrDel15, OriginStateName FROM mytable WHERE OriginCityName BETWEEN 'International Falls, MN' AND 'Pensacola, FL' ORDER BY WeatherDelay, DayofMonth LIMIT 24"}
-{"sql":"SELECT AVG(\"Month\"), AVG(WheelsOff) FROM mytable LIMIT 29","hsqls":["SELECT AVG(Month), AVG(WheelsOff) FROM mytable LIMIT 29"]}
+{"sql":"SELECT AVG(\"Month\"), AVG(WheelsOff) FROM mytable LIMIT 29","hsqls":["SELECT AVG(`Month`), AVG(WheelsOff) FROM mytable LIMIT 29"]}
 {"sql":"SELECT WheelsOff, ArrTimeBlk, UniqueCarrier FROM mytable WHERE DepDel15 IN (1, 0, -9999) LIMIT 3"}
-{"sql":"SELECT FirstDepTime, DepDelayMinutes, ArrDelay, SUM(DepDel15), AVG(ActualElapsedTime) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 OR OriginStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'South Carolina' OR \"Year\" NOT IN (2014) GROUP BY FirstDepTime, DepDelayMinutes, ArrDelay LIMIT 11","hsqls":["SELECT FirstDepTime, DepDelayMinutes, ArrDelay, SUM(DepDel15), AVG(ActualElapsedTime) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 OR OriginStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'South Carolina' OR Year NOT IN (2014) GROUP BY FirstDepTime, DepDelayMinutes, ArrDelay LIMIT 11"]}
-{"sql":"SELECT ActualElapsedTime, DivAirportIDs, Dest FROM mytable LIMIT 9","hsqls":["SELECT ActualElapsedTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, Dest FROM mytable LIMIT 10000"]}
-{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups >= -1 AND DivWheelsOns BETWEEN 938 AND 1127 AND DestAirportID <= 11778 ORDER BY OriginStateFips, LongestAddGTime LIMIT 18","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups >= -1 AND (DivWheelsOns__MV0 BETWEEN 938 AND 1127 OR DivWheelsOns__MV1 BETWEEN 938 AND 1127 OR DivWheelsOns__MV2 BETWEEN 938 AND 1127 OR DivWheelsOns__MV3 BETWEEN 938 AND 1127 OR DivWheelsOns__MV4 BETWEEN 938 AND 1127) AND DestAirportID <= 11778 ORDER BY OriginStateFips, LongestAddGTime LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, DepTime, COUNT(TaxiOut) FROM mytable WHERE DivAirportSeqIDs = 1015804 AND DepDelayMinutes NOT IN (359.0, 44.0, 151.0) OR NASDelay < 66 GROUP BY DivReachedDest, DepTime LIMIT 21","hsqls":["SELECT DivReachedDest, DepTime, COUNT(TaxiOut) FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1015804 OR DivAirportSeqIDs__MV1 = 1015804 OR DivAirportSeqIDs__MV2 = 1015804 OR DivAirportSeqIDs__MV3 = 1015804 OR DivAirportSeqIDs__MV4 = 1015804) AND DepDelayMinutes NOT IN (359.0, 44.0, 151.0) OR NASDelay < 66 GROUP BY DivReachedDest, DepTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DepDelayMinutes, ArrDelay, SUM(DepDel15), AVG(ActualElapsedTime) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 OR OriginStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'South Carolina' OR \"Year\" NOT IN (2014) GROUP BY FirstDepTime, DepDelayMinutes, ArrDelay LIMIT 11","hsqls":["SELECT FirstDepTime, DepDelayMinutes, ArrDelay, SUM(DepDel15), AVG(ActualElapsedTime) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 OR OriginStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'South Carolina' OR `Year` NOT IN (2014) GROUP BY FirstDepTime, DepDelayMinutes, ArrDelay LIMIT 11"]}
+{"sql":"SELECT ActualElapsedTime, DivAirportIDs, Dest FROM mytable LIMIT 9","hsqls":["SELECT ActualElapsedTime, DivAirportIDs, Dest FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups >= -1 AND DivWheelsOns BETWEEN 938 AND 1127 AND DestAirportID <= 11778 ORDER BY OriginStateFips, LongestAddGTime LIMIT 18","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups >= -1 AND (DivWheelsOns[1] BETWEEN 938 AND 1127 OR DivWheelsOns[2] BETWEEN 938 AND 1127 OR DivWheelsOns[3] BETWEEN 938 AND 1127 OR DivWheelsOns[4] BETWEEN 938 AND 1127 OR DivWheelsOns[5] BETWEEN 938 AND 1127) AND DestAirportID <= 11778 ORDER BY OriginStateFips, LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DepTime, COUNT(TaxiOut) FROM mytable WHERE DivAirportSeqIDs = 1015804 AND DepDelayMinutes NOT IN (359.0, 44.0, 151.0) OR NASDelay < 66 GROUP BY DivReachedDest, DepTime LIMIT 21","hsqls":["SELECT DivReachedDest, DepTime, COUNT(TaxiOut) FROM mytable WHERE (DivAirportSeqIDs[1] = 1015804 OR DivAirportSeqIDs[2] = 1015804 OR DivAirportSeqIDs[3] = 1015804 OR DivAirportSeqIDs[4] = 1015804 OR DivAirportSeqIDs[5] = 1015804) AND DepDelayMinutes NOT IN (359.0, 44.0, 151.0) OR NASDelay < 66 GROUP BY DivReachedDest, DepTime LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE OriginWac <= 23 AND DepDelay NOT IN (146.0, 580.0, 37.0, 127.0) ORDER BY LateAircraftDelay, DepDelayMinutes, ArrDel15 LIMIT 10"}
 {"sql":"SELECT TotalAddGTime, \"Month\", OriginAirportID, COUNT(*) FROM mytable GROUP BY TotalAddGTime, \"Month\", OriginAirportID LIMIT 19","hsqls":["SELECT TotalAddGTime, Month, OriginAirportID, COUNT(*) FROM mytable GROUP BY TotalAddGTime, Month, OriginAirportID LIMIT 19"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE DestAirportSeqID BETWEEN 1298202 AND 1379502 ORDER BY DestAirportSeqID, DepTimeBlk LIMIT 10"}
-{"sql":"SELECT Carrier, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 1800 AND 550 AND DivAirportSeqIDs IN (1182304, 1075402) AND ArrDelayMinutes BETWEEN 95.0 AND 94.0 GROUP BY Carrier LIMIT 6","hsqls":["SELECT Carrier, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 1800 AND 550 AND (DivAirportSeqIDs__MV0 IN (1182304, 1075402) OR DivAirportSeqIDs__MV1 IN (1182304, 1075402) OR DivAirportSeqIDs__MV2 IN (1182304, 1075402) OR DivAirportSeqIDs__MV3 IN (1182304, 1075402) OR DivAirportSeqIDs__MV4 IN (1182304, 1075402)) AND ArrDelayMinutes BETWEEN 95.0 AND 94.0 GROUP BY Carrier LIMIT 10000"]}
+{"sql":"SELECT Carrier, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 1800 AND 550 AND DivAirportSeqIDs IN (1182304, 1075402) AND ArrDelayMinutes BETWEEN 95.0 AND 94.0 GROUP BY Carrier LIMIT 6","hsqls":["SELECT Carrier, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 1800 AND 550 AND (DivAirportSeqIDs[1] IN (1182304, 1075402) OR DivAirportSeqIDs[2] IN (1182304, 1075402) OR DivAirportSeqIDs[3] IN (1182304, 1075402) OR DivAirportSeqIDs[4] IN (1182304, 1075402) OR DivAirportSeqIDs[5] IN (1182304, 1075402)) AND ArrDelayMinutes BETWEEN 95.0 AND 94.0 GROUP BY Carrier LIMIT 10000"]}
 {"sql":"SELECT DestStateName, MAX(DestStateFips), COUNT(TaxiIn) FROM mytable WHERE Quarter >= 1 OR DivDistance BETWEEN 1036 AND 50 OR DivDistance BETWEEN 448 AND 696 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 22","hsqls":["SELECT DestStateName, MAX(DestStateFips), COUNT(TaxiIn) FROM mytable WHERE Quarter >= 1 OR DivDistance BETWEEN 1036 AND 50 OR DivDistance BETWEEN 448 AND 696 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 22"]}
 {"sql":"SELECT ActualElapsedTime, AirTime FROM mytable WHERE Cancelled > 0 LIMIT 27"}
-{"sql":"SELECT DivAirports, TotalAddGTime, Origin FROM mytable ORDER BY \"Year\", FlightNum, OriginCityName LIMIT 19","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, TotalAddGTime, Origin FROM mytable ORDER BY Year, FlightNum, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivAirports, TotalAddGTime, Origin FROM mytable ORDER BY \"Year\", FlightNum, OriginCityName LIMIT 19","hsqls":["SELECT DivAirports, TotalAddGTime, Origin FROM mytable ORDER BY Year, FlightNum, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginCityName), AVG(DivActualElapsedTime) FROM mytable WHERE Flights IN (1) LIMIT 10"}
-{"sql":"SELECT CRSArrTime, FlightDate, ArrDel15, COUNT(Dest), COUNT(FlightNum), COUNT(ArrivalDelayGroups) FROM mytable WHERE WheelsOn NOT IN (1402) AND DivTailNums BETWEEN 'N703TW' AND 'N216FR' OR DepDelayMinutes > 102.0 GROUP BY CRSArrTime, FlightDate, ArrDel15 LIMIT 27","hsqls":["SELECT CRSArrTime, FlightDate, ArrDel15, COUNT(Dest), COUNT(FlightNum), COUNT(ArrivalDelayGroups) FROM mytable WHERE WheelsOn NOT IN (1402) AND (DivTailNums__MV0 BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums__MV1 BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums__MV2 BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums__MV3 BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums__MV4 BETWEEN 'N703TW' AND 'N216FR') OR DepDelayMinutes > 102.0 GROUP BY CRSArrTime, FlightDate, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, FlightDate, ArrDel15, COUNT(Dest), COUNT(FlightNum), COUNT(ArrivalDelayGroups) FROM mytable WHERE WheelsOn NOT IN (1402) AND DivTailNums BETWEEN 'N703TW' AND 'N216FR' OR DepDelayMinutes > 102.0 GROUP BY CRSArrTime, FlightDate, ArrDel15 LIMIT 27","hsqls":["SELECT CRSArrTime, FlightDate, ArrDel15, COUNT(Dest), COUNT(FlightNum), COUNT(ArrivalDelayGroups) FROM mytable WHERE WheelsOn NOT IN (1402) AND (DivTailNums[1] BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums[2] BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums[3] BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums[4] BETWEEN 'N703TW' AND 'N216FR' OR DivTailNums[5] BETWEEN 'N703TW' AND 'N216FR') OR DepDelayMinutes > 102.0 GROUP BY CRSArrTime, FlightDate, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT NASDelay, DestCityName FROM mytable WHERE DepDelay BETWEEN 210.0 AND 65.0 LIMIT 10"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE DestState BETWEEN 'SD' AND 'CO' AND DestAirportSeqID BETWEEN 1020803 AND 1342202 ORDER BY ArrTimeBlk, NASDelay LIMIT 25","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DestState BETWEEN 'SD' AND 'CO' AND DestAirportSeqID BETWEEN 1020803 AND 1342202 ORDER BY ArrTimeBlk, NASDelay LIMIT 10000"]}
-{"sql":"SELECT DivAirports, DestAirportID FROM mytable WHERE DestAirportID IN (14698, 13487, 11921, 10747, 11274) OR Dest <> 'SCC' ORDER BY CRSArrTime, CRSElapsedTime LIMIT 1","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportID FROM mytable WHERE DestAirportID IN (14698, 13487, 11921, 10747, 11274) OR Dest <> 'SCC' ORDER BY CRSArrTime, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE DestState BETWEEN 'SD' AND 'CO' AND DestAirportSeqID BETWEEN 1020803 AND 1342202 ORDER BY ArrTimeBlk, NASDelay LIMIT 25","hsqls":["SELECT DivAirportIDs FROM mytable WHERE DestState BETWEEN 'SD' AND 'CO' AND DestAirportSeqID BETWEEN 1020803 AND 1342202 ORDER BY ArrTimeBlk, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestAirportID FROM mytable WHERE DestAirportID IN (14698, 13487, 11921, 10747, 11274) OR Dest <> 'SCC' ORDER BY CRSArrTime, CRSElapsedTime LIMIT 1","hsqls":["SELECT DivAirports, DestAirportID FROM mytable WHERE DestAirportID IN (14698, 13487, 11921, 10747, 11274) OR Dest <> 'SCC' ORDER BY CRSArrTime, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestState BETWEEN 'CA' AND 'NH' AND LongestAddGTime BETWEEN 60 AND 19 LIMIT 8"}
-{"sql":"SELECT DivReachedDest, DivWheelsOns, OriginCityMarketID FROM mytable ORDER BY OriginCityMarketID LIMIT 29","hsqls":["SELECT DivReachedDest, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginCityMarketID FROM mytable ORDER BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivWheelsOns, OriginCityMarketID FROM mytable ORDER BY OriginCityMarketID LIMIT 29","hsqls":["SELECT DivReachedDest, DivWheelsOns, OriginCityMarketID FROM mytable ORDER BY OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT Carrier, FlightDate, DestCityName, COUNT(*) FROM mytable WHERE DepTimeBlk <= '0900-0959' GROUP BY Carrier, FlightDate, DestCityName  ORDER BY Carrier, FlightDate, DestCityName LIMIT 6","hsqls":["SELECT Carrier, FlightDate, DestCityName, COUNT(*) FROM mytable WHERE DepTimeBlk <= '0900-0959' GROUP BY Carrier, FlightDate, DestCityName  ORDER BY Carrier, FlightDate, DestCityName LIMIT 6"]}
 {"sql":"SELECT DestCityName, COUNT(*) FROM mytable WHERE DepTime BETWEEN 420 AND 1123 AND DestCityName NOT IN ('Juneau, AK', 'Minot, ND', 'Lawton/Fort Sill, OK', 'Ketchikan, AK') GROUP BY DestCityName  ORDER BY DestCityName LIMIT 25","hsqls":["SELECT DestCityName, COUNT(*) FROM mytable WHERE DepTime BETWEEN 420 AND 1123 AND DestCityName NOT IN ('Juneau, AK', 'Minot, ND', 'Lawton/Fort Sill, OK', 'Ketchikan, AK') GROUP BY DestCityName  ORDER BY DestCityName LIMIT 25"]}
 {"sql":"SELECT DestWac, LateAircraftDelay, ArrDel15, COUNT(*) FROM mytable GROUP BY DestWac, LateAircraftDelay, ArrDel15  ORDER BY DestWac, LateAircraftDelay, ArrDel15 LIMIT 12","hsqls":["SELECT DestWac, LateAircraftDelay, ArrDel15, COUNT(*) FROM mytable GROUP BY DestWac, LateAircraftDelay, ArrDel15  ORDER BY DestWac, LateAircraftDelay, ArrDel15 LIMIT 12"]}
@@ -498,15 +498,15 @@
 {"sql":"SELECT Carrier FROM mytable WHERE DepartureDelayGroups IN (10, -2) LIMIT 6"}
 {"sql":"SELECT TaxiOut, DivArrDelay, COUNT(OriginStateFips) FROM mytable WHERE OriginAirportSeqID <= 1379602 OR OriginCityMarketID IN (31624, 31905, 30779, 30476) GROUP BY TaxiOut, DivArrDelay  ORDER BY TaxiOut, DivArrDelay LIMIT 8","hsqls":["SELECT TaxiOut, DivArrDelay, COUNT(OriginStateFips) FROM mytable WHERE OriginAirportSeqID <= 1379602 OR OriginCityMarketID IN (31624, 31905, 30779, 30476) GROUP BY TaxiOut, DivArrDelay  ORDER BY TaxiOut, DivArrDelay LIMIT 8"]}
 {"sql":"SELECT DistanceGroup, DestWac, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-11' AND '2014-01-05' OR OriginWac BETWEEN 14 AND 41 GROUP BY DistanceGroup, DestWac  ORDER BY DistanceGroup, DestWac LIMIT 26","hsqls":["SELECT DistanceGroup, DestWac, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-11' AND '2014-01-05' OR OriginWac BETWEEN 14 AND 41 GROUP BY DistanceGroup, DestWac  ORDER BY DistanceGroup, DestWac LIMIT 26"]}
-{"sql":"SELECT CRSArrTime, COUNT(*) FROM mytable WHERE CRSDepTime IN (1156, 2025, 905, 857) OR DivAirports <= 'RSW' GROUP BY CRSArrTime LIMIT 12","hsqls":["SELECT CRSArrTime, COUNT(*) FROM mytable WHERE CRSDepTime IN (1156, 2025, 905, 857) OR (DivAirports__MV0 <= 'RSW' OR DivAirports__MV1 <= 'RSW' OR DivAirports__MV2 <= 'RSW' OR DivAirports__MV3 <= 'RSW' OR DivAirports__MV4 <= 'RSW') GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, COUNT(*) FROM mytable WHERE CRSDepTime IN (1156, 2025, 905, 857) OR DivAirports <= 'RSW' GROUP BY CRSArrTime LIMIT 12","hsqls":["SELECT CRSArrTime, COUNT(*) FROM mytable WHERE CRSDepTime IN (1156, 2025, 905, 857) OR (DivAirports[1] <= 'RSW' OR DivAirports[2] <= 'RSW' OR DivAirports[3] <= 'RSW' OR DivAirports[4] <= 'RSW' OR DivAirports[5] <= 'RSW') GROUP BY CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, SecurityDelay, Distance, COUNT(DivDistance) FROM mytable WHERE DayofMonth <= 22 OR DivDistance BETWEEN 181 AND 91 GROUP BY WeatherDelay, SecurityDelay, Distance  ORDER BY WeatherDelay, SecurityDelay, Distance LIMIT 17","hsqls":["SELECT WeatherDelay, SecurityDelay, Distance, COUNT(DivDistance) FROM mytable WHERE DayofMonth <= 22 OR DivDistance BETWEEN 181 AND 91 GROUP BY WeatherDelay, SecurityDelay, Distance  ORDER BY WeatherDelay, SecurityDelay, Distance LIMIT 17"]}
 {"sql":"SELECT TaxiOut, DestWac, DestState FROM mytable WHERE FirstDepTime BETWEEN 2145 AND 612 OR UniqueCarrier BETWEEN 'MQ' AND 'VX' OR Diverted >= 1 ORDER BY Carrier, DivAirportLandings LIMIT 16"}
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, DestAirportSeqID  ORDER BY OriginAirportSeqID, DestAirportSeqID LIMIT 12","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, DestAirportSeqID  ORDER BY OriginAirportSeqID, DestAirportSeqID LIMIT 12"]}
-{"sql":"SELECT CRSDepTime, AVG(TaxiIn) FROM mytable WHERE DestStateFips BETWEEN 46 AND 49 AND FirstDepTime BETWEEN 1859 AND 1957 AND DivWheelsOffs IN (2318, 918, 1010) GROUP BY CRSDepTime LIMIT 21","hsqls":["SELECT CRSDepTime, AVG(CAST(TaxiIn AS DOUBLE)) FROM mytable WHERE DestStateFips BETWEEN 46 AND 49 AND FirstDepTime BETWEEN 1859 AND 1957 AND (DivWheelsOffs__MV0 IN (2318, 918, 1010) OR DivWheelsOffs__MV1 IN (2318, 918, 1010) OR DivWheelsOffs__MV2 IN (2318, 918, 1010) OR DivWheelsOffs__MV3 IN (2318, 918, 1010) OR DivWheelsOffs__MV4 IN (2318, 918, 1010)) GROUP BY CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, LongestAddGTime FROM mytable WHERE DivTotalGTimes BETWEEN 92 AND 49 AND ActualElapsedTime <> 274 OR WheelsOff BETWEEN 1033 AND 1318 ORDER BY FlightNum, FlightDate, SecurityDelay LIMIT 21","hsqls":["SELECT WheelsOff, LongestAddGTime FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 92 AND 49 OR DivTotalGTimes__MV1 BETWEEN 92 AND 49 OR DivTotalGTimes__MV2 BETWEEN 92 AND 49 OR DivTotalGTimes__MV3 BETWEEN 92 AND 49 OR DivTotalGTimes__MV4 BETWEEN 92 AND 49) AND ActualElapsedTime <> 274 OR WheelsOff BETWEEN 1033 AND 1318 ORDER BY FlightNum, FlightDate, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime, AVG(TaxiIn) FROM mytable WHERE DestStateFips BETWEEN 46 AND 49 AND FirstDepTime BETWEEN 1859 AND 1957 AND DivWheelsOffs IN (2318, 918, 1010) GROUP BY CRSDepTime LIMIT 21","hsqls":["SELECT CRSDepTime, AVG(CAST(TaxiIn AS DOUBLE)) FROM mytable WHERE DestStateFips BETWEEN 46 AND 49 AND FirstDepTime BETWEEN 1859 AND 1957 AND (DivWheelsOffs[1] IN (2318, 918, 1010) OR DivWheelsOffs[2] IN (2318, 918, 1010) OR DivWheelsOffs[3] IN (2318, 918, 1010) OR DivWheelsOffs[4] IN (2318, 918, 1010) OR DivWheelsOffs[5] IN (2318, 918, 1010)) GROUP BY CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, LongestAddGTime FROM mytable WHERE DivTotalGTimes BETWEEN 92 AND 49 AND ActualElapsedTime <> 274 OR WheelsOff BETWEEN 1033 AND 1318 ORDER BY FlightNum, FlightDate, SecurityDelay LIMIT 21","hsqls":["SELECT WheelsOff, LongestAddGTime FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 92 AND 49 OR DivTotalGTimes[2] BETWEEN 92 AND 49 OR DivTotalGTimes[3] BETWEEN 92 AND 49 OR DivTotalGTimes[4] BETWEEN 92 AND 49 OR DivTotalGTimes[5] BETWEEN 92 AND 49) AND ActualElapsedTime <> 274 OR WheelsOff BETWEEN 1033 AND 1318 ORDER BY FlightNum, FlightDate, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, AirTime FROM mytable WHERE OriginStateFips > 47 OR LateAircraftDelay BETWEEN 72 AND 250 OR OriginCityMarketID BETWEEN 32177 AND 32335 ORDER BY DepDelay, WeatherDelay LIMIT 17"}
 {"sql":"SELECT OriginCityMarketID, AVG(FirstDepTime) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 23","hsqls":["SELECT OriginCityMarketID, AVG(FirstDepTime) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 23"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE Quarter NOT IN (1) AND AirTime IN (312, 273) OR DestState BETWEEN 'PR' AND 'LA' LIMIT 10","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Quarter NOT IN (1) AND AirTime IN (312, 273) OR DestState BETWEEN 'PR' AND 'LA' LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE Quarter NOT IN (1) AND AirTime IN (312, 273) OR DestState BETWEEN 'PR' AND 'LA' LIMIT 10","hsqls":["SELECT DivAirportIDs FROM mytable WHERE Quarter NOT IN (1) AND AirTime IN (312, 273) OR DestState BETWEEN 'PR' AND 'LA' LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID FROM mytable WHERE WheelsOff < 1403 ORDER BY SecurityDelay, TailNum, ArrDelay LIMIT 20"}
 {"sql":"SELECT Distance, CRSElapsedTime FROM mytable ORDER BY Cancelled, DepTimeBlk LIMIT 23"}
 {"sql":"SELECT TaxiOut, DestStateName FROM mytable WHERE Carrier <> 'AA' LIMIT 29"}
@@ -514,34 +514,34 @@
 {"sql":"SELECT OriginCityName, ArrDelayMinutes, MIN(SecurityDelay), SUM(Quarter) FROM mytable WHERE DivReachedDest <> 0 GROUP BY OriginCityName, ArrDelayMinutes  ORDER BY OriginCityName, ArrDelayMinutes LIMIT 20","hsqls":["SELECT OriginCityName, ArrDelayMinutes, MIN(SecurityDelay), SUM(Quarter) FROM mytable WHERE DivReachedDest <> 0 GROUP BY OriginCityName, ArrDelayMinutes  ORDER BY OriginCityName, ArrDelayMinutes LIMIT 20"]}
 {"sql":"SELECT ActualElapsedTime, DestAirportID, SUM(DestAirportID), AVG(AirlineID), AVG(DivActualElapsedTime) FROM mytable WHERE ArrDelay BETWEEN -34.0 AND -13.0 OR DestStateName BETWEEN 'Connecticut' AND 'Texas' GROUP BY ActualElapsedTime, DestAirportID  ORDER BY ActualElapsedTime, DestAirportID LIMIT 20","hsqls":["SELECT ActualElapsedTime, DestAirportID, SUM(DestAirportID), AVG(AirlineID), AVG(DivActualElapsedTime) FROM mytable WHERE ArrDelay BETWEEN -34.0 AND -13.0 OR DestStateName BETWEEN 'Connecticut' AND 'Texas' GROUP BY ActualElapsedTime, DestAirportID  ORDER BY ActualElapsedTime, DestAirportID LIMIT 20"]}
 {"sql":"SELECT DepartureDelayGroups, AVG(DestAirportSeqID), SUM(DistanceGroup) FROM mytable WHERE LongestAddGTime BETWEEN 78 AND 47 OR TaxiOut IN (49, 57, 55) AND Diverted NOT IN (1, 0) GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 25","hsqls":["SELECT DepartureDelayGroups, AVG(DestAirportSeqID), SUM(DistanceGroup) FROM mytable WHERE LongestAddGTime BETWEEN 78 AND 47 OR TaxiOut IN (49, 57, 55) AND Diverted NOT IN (1, 0) GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 25"]}
-{"sql":"SELECT DestWac, DestCityName, SUM(WheelsOff) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR ArrivalDelayGroups <= 10 GROUP BY DestWac, DestCityName LIMIT 10","hsqls":["SELECT DestWac, DestCityName, SUM(WheelsOff) FROM mytable WHERE Month BETWEEN 1 AND 1 OR ArrivalDelayGroups <= 10 GROUP BY DestWac, DestCityName LIMIT 10"]}
-{"sql":"SELECT AirlineID, AVG(DivReachedDest), AVG(Distance) FROM mytable WHERE DayOfWeek NOT IN (3, 7, 4) AND DivAirportSeqIDs BETWEEN 1537002 AND 1104202 OR DestAirportSeqID < 1232303 GROUP BY AirlineID LIMIT 24","hsqls":["SELECT AirlineID, AVG(DivReachedDest), AVG(Distance) FROM mytable WHERE DayOfWeek NOT IN (3, 7, 4) AND (DivAirportSeqIDs__MV0 BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs__MV1 BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs__MV2 BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs__MV3 BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs__MV4 BETWEEN 1537002 AND 1104202) OR DestAirportSeqID < 1232303 GROUP BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT DestWac, DestCityName, SUM(WheelsOff) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR ArrivalDelayGroups <= 10 GROUP BY DestWac, DestCityName LIMIT 10","hsqls":["SELECT DestWac, DestCityName, SUM(WheelsOff) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR ArrivalDelayGroups <= 10 GROUP BY DestWac, DestCityName LIMIT 10"]}
+{"sql":"SELECT AirlineID, AVG(DivReachedDest), AVG(Distance) FROM mytable WHERE DayOfWeek NOT IN (3, 7, 4) AND DivAirportSeqIDs BETWEEN 1537002 AND 1104202 OR DestAirportSeqID < 1232303 GROUP BY AirlineID LIMIT 24","hsqls":["SELECT AirlineID, AVG(DivReachedDest), AVG(Distance) FROM mytable WHERE DayOfWeek NOT IN (3, 7, 4) AND (DivAirportSeqIDs[1] BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs[2] BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs[3] BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs[4] BETWEEN 1537002 AND 1104202 OR DivAirportSeqIDs[5] BETWEEN 1537002 AND 1104202) OR DestAirportSeqID < 1232303 GROUP BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE AirTime BETWEEN 480 AND 314 OR TaxiOut <> 42 AND NASDelay = 202 LIMIT 18"}
 {"sql":"SELECT Quarter, SUM(TaxiOut), MAX(ArrDelayMinutes), SUM(DestCityMarketID) FROM mytable WHERE DistanceGroup > 4 OR AirlineID NOT IN (19690, 19930, 21171) GROUP BY Quarter  ORDER BY Quarter LIMIT 21","hsqls":["SELECT Quarter, SUM(TaxiOut), MAX(ArrDelayMinutes), SUM(DestCityMarketID) FROM mytable WHERE DistanceGroup > 4 OR AirlineID NOT IN (19690, 19930, 21171) GROUP BY Quarter  ORDER BY Quarter LIMIT 21"]}
 {"sql":"SELECT SUM(DaysSinceEpoch) FROM mytable WHERE TailNum < 'N172US' LIMIT 29"}
-{"sql":"SELECT ArrDelay, OriginStateName, AVG(\"Year\"), MIN(ArrDelay) FROM mytable GROUP BY ArrDelay, OriginStateName","hsqls":["SELECT ArrDelay, OriginStateName, AVG(Year), MIN(ArrDelay) FROM mytable GROUP BY ArrDelay, OriginStateName"]}
+{"sql":"SELECT ArrDelay, OriginStateName, AVG(\"Year\"), MIN(ArrDelay) FROM mytable GROUP BY ArrDelay, OriginStateName","hsqls":["SELECT ArrDelay, OriginStateName, AVG(`Year`), MIN(ArrDelay) FROM mytable GROUP BY ArrDelay, OriginStateName"]}
 {"sql":"SELECT DestWac, ArrDelay, UniqueCarrier, MIN(TaxiIn) FROM mytable WHERE DepartureDelayGroups <> -9999 AND DestCityMarketID IN (30693, 31650, 31617, 31823) AND ArrDelayMinutes NOT IN (150.0, 201.0, 184.0, 181.0) GROUP BY DestWac, ArrDelay, UniqueCarrier  ORDER BY DestWac, ArrDelay, UniqueCarrier LIMIT 22","hsqls":["SELECT DestWac, ArrDelay, UniqueCarrier, MIN(TaxiIn) FROM mytable WHERE DepartureDelayGroups <> -9999 AND DestCityMarketID IN (30693, 31650, 31617, 31823) AND ArrDelayMinutes NOT IN (150.0, 201.0, 184.0, 181.0) GROUP BY DestWac, ArrDelay, UniqueCarrier  ORDER BY DestWac, ArrDelay, UniqueCarrier LIMIT 22"]}
-{"sql":"SELECT DepartureDelayGroups, FirstDepTime, UniqueCarrier FROM mytable WHERE DivAirportIDs < 12478 ORDER BY DepTime LIMIT 29","hsqls":["SELECT DepartureDelayGroups, FirstDepTime, UniqueCarrier FROM mytable WHERE (DivAirportIDs__MV0 < 12478 OR DivAirportIDs__MV1 < 12478 OR DivAirportIDs__MV2 < 12478 OR DivAirportIDs__MV3 < 12478 OR DivAirportIDs__MV4 < 12478) ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, FirstDepTime, UniqueCarrier FROM mytable WHERE DivAirportIDs < 12478 ORDER BY DepTime LIMIT 29","hsqls":["SELECT DepartureDelayGroups, FirstDepTime, UniqueCarrier FROM mytable WHERE (DivAirportIDs[1] < 12478 OR DivAirportIDs[2] < 12478 OR DivAirportIDs[3] < 12478 OR DivAirportIDs[4] < 12478 OR DivAirportIDs[5] < 12478) ORDER BY DepTime LIMIT 10000"]}
 {"sql":"SELECT DivDistance, Origin, COUNT(DivDistance), MIN(ActualElapsedTime) FROM mytable WHERE OriginAirportID NOT IN (15016, 13377) OR DestAirportID <= 15096 GROUP BY DivDistance, Origin","hsqls":["SELECT DivDistance, Origin, COUNT(DivDistance), MIN(ActualElapsedTime) FROM mytable WHERE OriginAirportID NOT IN (15016, 13377) OR DestAirportID <= 15096 GROUP BY DivDistance, Origin"]}
-{"sql":"SELECT FirstDepTime, CarrierDelay, COUNT(*) FROM mytable WHERE DivLongestGTimes <= 61.0 GROUP BY FirstDepTime, CarrierDelay LIMIT 14","hsqls":["SELECT FirstDepTime, CarrierDelay, COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 <= 61.0 OR DivLongestGTimes__MV1 <= 61.0 OR DivLongestGTimes__MV2 <= 61.0 OR DivLongestGTimes__MV3 <= 61.0 OR DivLongestGTimes__MV4 <= 61.0) GROUP BY FirstDepTime, CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, CarrierDelay, COUNT(*) FROM mytable WHERE DivLongestGTimes <= 61.0 GROUP BY FirstDepTime, CarrierDelay LIMIT 14","hsqls":["SELECT FirstDepTime, CarrierDelay, COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] <= 61.0 OR DivLongestGTimes[2] <= 61.0 OR DivLongestGTimes[3] <= 61.0 OR DivLongestGTimes[4] <= 61.0 OR DivLongestGTimes[5] <= 61.0) GROUP BY FirstDepTime, CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT DestWac, OriginStateFips, MIN(ArrDelayMinutes), SUM(FirstDepTime), MIN(DepDelay) FROM mytable GROUP BY DestWac, OriginStateFips  ORDER BY DestWac, OriginStateFips LIMIT 17","hsqls":["SELECT DestWac, OriginStateFips, MIN(ArrDelayMinutes), SUM(FirstDepTime), MIN(DepDelay) FROM mytable GROUP BY DestWac, OriginStateFips  ORDER BY DestWac, OriginStateFips LIMIT 17"]}
-{"sql":"SELECT DivAirports, DepTimeBlk, ArrivalDelayGroups FROM mytable WHERE OriginCityMarketID BETWEEN 33830 AND 30436 OR TaxiIn = 65 ORDER BY NASDelay, UniqueCarrier LIMIT 25","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepTimeBlk, ArrivalDelayGroups FROM mytable WHERE OriginCityMarketID BETWEEN 33830 AND 30436 OR TaxiIn = 65 ORDER BY NASDelay, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT ArrTimeBlk, SUM(CRSDepTime), COUNT(DestAirportID), MIN(CarrierDelay) FROM mytable WHERE DivTotalGTimes BETWEEN 25 AND 139 GROUP BY ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrTimeBlk, SUM(CRSDepTime), COUNT(DestAirportID), MIN(CarrierDelay) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 25 AND 139 OR DivTotalGTimes__MV1 BETWEEN 25 AND 139 OR DivTotalGTimes__MV2 BETWEEN 25 AND 139 OR DivTotalGTimes__MV3 BETWEEN 25 AND 139 OR DivTotalGTimes__MV4 BETWEEN 25 AND 139) GROUP BY ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DivDistance, Carrier, WeatherDelay, SUM(LongestAddGTime), SUM(CRSElapsedTime) FROM mytable WHERE \"Month\" >= 1 AND DivAirportSeqIDs < 1043403 OR ArrivalDelayGroups BETWEEN -1 AND 3 GROUP BY DivDistance, Carrier, WeatherDelay LIMIT 24","hsqls":["SELECT DivDistance, Carrier, WeatherDelay, SUM(LongestAddGTime), SUM(CRSElapsedTime) FROM mytable WHERE Month >= 1 AND (DivAirportSeqIDs__MV0 < 1043403 OR DivAirportSeqIDs__MV1 < 1043403 OR DivAirportSeqIDs__MV2 < 1043403 OR DivAirportSeqIDs__MV3 < 1043403 OR DivAirportSeqIDs__MV4 < 1043403) OR ArrivalDelayGroups BETWEEN -1 AND 3 GROUP BY DivDistance, Carrier, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DepTimeBlk, ArrivalDelayGroups FROM mytable WHERE OriginCityMarketID BETWEEN 33830 AND 30436 OR TaxiIn = 65 ORDER BY NASDelay, UniqueCarrier LIMIT 25","hsqls":["SELECT DivAirports, DepTimeBlk, ArrivalDelayGroups FROM mytable WHERE OriginCityMarketID BETWEEN 33830 AND 30436 OR TaxiIn = 65 ORDER BY NASDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, SUM(CRSDepTime), COUNT(DestAirportID), MIN(CarrierDelay) FROM mytable WHERE DivTotalGTimes BETWEEN 25 AND 139 GROUP BY ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrTimeBlk, SUM(CRSDepTime), COUNT(DestAirportID), MIN(CarrierDelay) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 25 AND 139 OR DivTotalGTimes[2] BETWEEN 25 AND 139 OR DivTotalGTimes[3] BETWEEN 25 AND 139 OR DivTotalGTimes[4] BETWEEN 25 AND 139 OR DivTotalGTimes[5] BETWEEN 25 AND 139) GROUP BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivDistance, Carrier, WeatherDelay, SUM(LongestAddGTime), SUM(CRSElapsedTime) FROM mytable WHERE \"Month\" >= 1 AND DivAirportSeqIDs < 1043403 OR ArrivalDelayGroups BETWEEN -1 AND 3 GROUP BY DivDistance, Carrier, WeatherDelay LIMIT 24","hsqls":["SELECT DivDistance, Carrier, WeatherDelay, SUM(LongestAddGTime), SUM(CRSElapsedTime) FROM mytable WHERE `Month` >= 1 AND (DivAirportSeqIDs[1] < 1043403 OR DivAirportSeqIDs[2] < 1043403 OR DivAirportSeqIDs[3] < 1043403 OR DivAirportSeqIDs[4] < 1043403 OR DivAirportSeqIDs[5] < 1043403) OR ArrivalDelayGroups BETWEEN -1 AND 3 GROUP BY DivDistance, Carrier, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT MIN(DivDistance), SUM(DestWac), MIN(CRSElapsedTime) FROM mytable WHERE DivActualElapsedTime >= 265 LIMIT 2"}
 {"sql":"SELECT Carrier, OriginCityMarketID, DestCityName FROM mytable WHERE DepartureDelayGroups IN (6, 9, -9999) OR DepDelayMinutes IN (238.0, 36.0, 91.0, 135.0) ORDER BY DivDistance, LateAircraftDelay, AirTime LIMIT 19"}
 {"sql":"SELECT COUNT(SecurityDelay), SUM(TaxiOut), AVG(DestWac) FROM mytable WHERE Diverted < 1 AND DistanceGroup NOT IN (7, 5, 11) LIMIT 9"}
 {"sql":"SELECT SecurityDelay, MIN(FlightNum), SUM(DaysSinceEpoch) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 17","hsqls":["SELECT SecurityDelay, MIN(FlightNum), SUM(DaysSinceEpoch) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 17"]}
-{"sql":"SELECT OriginCityName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 2 AND DivAirportIDs < 14869 OR OriginStateFips <> 75 ORDER BY CRSArrTime, DestCityName LIMIT 4","hsqls":["SELECT OriginCityName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 2 AND (DivAirportIDs__MV0 < 14869 OR DivAirportIDs__MV1 < 14869 OR DivAirportIDs__MV2 < 14869 OR DivAirportIDs__MV3 < 14869 OR DivAirportIDs__MV4 < 14869) OR OriginStateFips <> 75 ORDER BY CRSArrTime, DestCityName LIMIT 10000"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 2 AND DivAirportIDs < 14869 OR OriginStateFips <> 75 ORDER BY CRSArrTime, DestCityName LIMIT 4","hsqls":["SELECT OriginCityName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 2 AND (DivAirportIDs[1] < 14869 OR DivAirportIDs[2] < 14869 OR DivAirportIDs[3] < 14869 OR DivAirportIDs[4] < 14869 OR DivAirportIDs[5] < 14869) OR OriginStateFips <> 75 ORDER BY CRSArrTime, DestCityName LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, OriginStateFips, FlightDate, MIN(AirlineID), SUM(DivActualElapsedTime) FROM mytable WHERE DivDistance <= 169 AND DestCityName > 'Melbourne, FL' OR ArrivalDelayGroups IN (7, -2, 6, 5, 11) GROUP BY WheelsOff, OriginStateFips, FlightDate  ORDER BY WheelsOff, OriginStateFips, FlightDate LIMIT 23","hsqls":["SELECT WheelsOff, OriginStateFips, FlightDate, MIN(AirlineID), SUM(DivActualElapsedTime) FROM mytable WHERE DivDistance <= 169 AND DestCityName > 'Melbourne, FL' OR ArrivalDelayGroups IN (7, -2, 6, 5, 11) GROUP BY WheelsOff, OriginStateFips, FlightDate  ORDER BY WheelsOff, OriginStateFips, FlightDate LIMIT 23"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DestStateName <> 'Wyoming' ORDER BY OriginCityName, ArrTime LIMIT 2","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestStateName <> 'Wyoming' ORDER BY OriginCityName, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DestStateName <> 'Wyoming' ORDER BY OriginCityName, ArrTime LIMIT 2","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE DestStateName <> 'Wyoming' ORDER BY OriginCityName, ArrTime LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DivArrDelay FROM mytable WHERE TaxiIn NOT IN (46, 102, 73, 28, 29) AND DayofMonth <= 10 ORDER BY OriginStateFips LIMIT 22"}
 {"sql":"SELECT Origin, SUM(CarrierDelay), MAX(DestAirportSeqID), SUM(CRSDepTime) FROM mytable WHERE DepDelayMinutes BETWEEN 141.0 AND 192.0 AND DestAirportID IN (11042, 11630, 11481, 10693) GROUP BY Origin  ORDER BY Origin LIMIT 20","hsqls":["SELECT Origin, SUM(CarrierDelay), MAX(DestAirportSeqID), SUM(CRSDepTime) FROM mytable WHERE DepDelayMinutes BETWEEN 141.0 AND 192.0 AND DestAirportID IN (11042, 11630, 11481, 10693) GROUP BY Origin  ORDER BY Origin LIMIT 20"]}
-{"sql":"SELECT DepDelay, CarrierDelay, DivAirportSeqIDs FROM mytable ORDER BY Quarter, DepDelayMinutes, DepTime LIMIT 24","hsqls":["SELECT DepDelay, CarrierDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable ORDER BY Quarter, DepDelayMinutes, DepTime LIMIT 10000"]}
+{"sql":"SELECT DepDelay, CarrierDelay, DivAirportSeqIDs FROM mytable ORDER BY Quarter, DepDelayMinutes, DepTime LIMIT 24","hsqls":["SELECT DepDelay, CarrierDelay, DivAirportSeqIDs FROM mytable ORDER BY Quarter, DepDelayMinutes, DepTime LIMIT 10000"]}
 {"sql":"SELECT DestState, FlightDate, MIN(WeatherDelay), AVG(DestStateFips), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DestState, FlightDate  ORDER BY DestState, FlightDate LIMIT 6","hsqls":["SELECT DestState, FlightDate, MIN(WeatherDelay), AVG(DestStateFips), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DestState, FlightDate  ORDER BY DestState, FlightDate LIMIT 6"]}
-{"sql":"SELECT CancellationCode, DayOfWeek FROM mytable WHERE \"Year\" >= 2014 AND ArrTimeBlk IN ('2200-2259') LIMIT 16","hsqls":["SELECT CancellationCode, DayOfWeek FROM mytable WHERE Year >= 2014 AND ArrTimeBlk IN ('2200-2259') LIMIT 16"]}
+{"sql":"SELECT CancellationCode, DayOfWeek FROM mytable WHERE \"Year\" >= 2014 AND ArrTimeBlk IN ('2200-2259') LIMIT 16","hsqls":["SELECT CancellationCode, DayOfWeek FROM mytable WHERE `Year` >= 2014 AND ArrTimeBlk IN ('2200-2259') LIMIT 16"]}
 {"sql":"SELECT DivActualElapsedTime, DayOfWeek, COUNT(*) FROM mytable GROUP BY DivActualElapsedTime, DayOfWeek  ORDER BY DivActualElapsedTime, DayOfWeek LIMIT 10","hsqls":["SELECT DivActualElapsedTime, DayOfWeek, COUNT(*) FROM mytable GROUP BY DivActualElapsedTime, DayOfWeek  ORDER BY DivActualElapsedTime, DayOfWeek LIMIT 10"]}
-{"sql":"SELECT DivAirports, \"Month\" FROM mytable LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Month FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirports, \"Month\" FROM mytable LIMIT 2","hsqls":["SELECT DivAirports, `Month` FROM mytable LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, MIN(DaysSinceEpoch), SUM(CRSElapsedTime) FROM mytable WHERE OriginState BETWEEN 'NC' AND 'NM' AND OriginStateName IN ('Hawaii', 'Oklahoma') GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 26","hsqls":["SELECT CarrierDelay, MIN(DaysSinceEpoch), SUM(CRSElapsedTime) FROM mytable WHERE OriginState BETWEEN 'NC' AND 'NM' AND OriginStateName IN ('Hawaii', 'Oklahoma') GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 26"]}
 {"sql":"SELECT COUNT(DestWac) FROM mytable LIMIT 10"}
 {"sql":"SELECT AVG(DivActualElapsedTime) FROM mytable LIMIT 10"}
@@ -551,106 +551,106 @@
 {"sql":"SELECT DepartureDelayGroups, CRSArrTime FROM mytable WHERE AirlineID > 20355 AND OriginState BETWEEN 'PA' AND 'DE' AND DepTime <> 2202 ORDER BY CRSArrTime, Dest LIMIT 21"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE CRSArrTime NOT IN (1426) ORDER BY DestStateName LIMIT 25"}
 {"sql":"SELECT DepDel15, TailNum, DepTimeBlk FROM mytable WHERE DepDelay = 165.0 AND FirstDepTime BETWEEN 2009 AND 907 ORDER BY OriginAirportID LIMIT 10"}
-{"sql":"SELECT ArrDelayMinutes, Origin, COUNT(*) FROM mytable WHERE DayOfWeek <= 6 AND DivTailNums BETWEEN 'N711HK' AND 'N582AA' AND DivDistance BETWEEN 509 AND 93 GROUP BY ArrDelayMinutes, Origin LIMIT 29","hsqls":["SELECT ArrDelayMinutes, Origin, COUNT(*) FROM mytable WHERE DayOfWeek <= 6 AND (DivTailNums__MV0 BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums__MV1 BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums__MV2 BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums__MV3 BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums__MV4 BETWEEN 'N711HK' AND 'N582AA') AND DivDistance BETWEEN 509 AND 93 GROUP BY ArrDelayMinutes, Origin LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, Origin, COUNT(*) FROM mytable WHERE DayOfWeek <= 6 AND DivTailNums BETWEEN 'N711HK' AND 'N582AA' AND DivDistance BETWEEN 509 AND 93 GROUP BY ArrDelayMinutes, Origin LIMIT 29","hsqls":["SELECT ArrDelayMinutes, Origin, COUNT(*) FROM mytable WHERE DayOfWeek <= 6 AND (DivTailNums[1] BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums[2] BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums[3] BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums[4] BETWEEN 'N711HK' AND 'N582AA' OR DivTailNums[5] BETWEEN 'N711HK' AND 'N582AA') AND DivDistance BETWEEN 509 AND 93 GROUP BY ArrDelayMinutes, Origin LIMIT 10000"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE AirTime > 233 ORDER BY WeatherDelay, DestAirportSeqID, OriginWac LIMIT 8"}
 {"sql":"SELECT DestWac FROM mytable ORDER BY OriginStateFips, NASDelay, DestAirportID LIMIT 17"}
 {"sql":"SELECT DestState, FirstDepTime FROM mytable ORDER BY DistanceGroup, DivActualElapsedTime LIMIT 23"}
 {"sql":"SELECT OriginAirportSeqID, DaysSinceEpoch FROM mytable WHERE AirlineID IN (20398, 19393) ORDER BY ArrDel15, CRSElapsedTime LIMIT 4"}
-{"sql":"SELECT OriginStateFips, \"Month\" FROM mytable ORDER BY \"Year\", Flights LIMIT 11","hsqls":["SELECT OriginStateFips, Month FROM mytable ORDER BY Year, Flights LIMIT 11"]}
-{"sql":"SELECT DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE Cancelled NOT IN (1, 0) AND DivTotalGTimes > 54 ORDER BY OriginStateFips, SecurityDelay, OriginStateName LIMIT 8","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestAirportSeqID FROM mytable WHERE Cancelled NOT IN (1, 0) AND (DivTotalGTimes__MV0 > 54 OR DivTotalGTimes__MV1 > 54 OR DivTotalGTimes__MV2 > 54 OR DivTotalGTimes__MV3 > 54 OR DivTotalGTimes__MV4 > 54) ORDER BY OriginStateFips, SecurityDelay, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, \"Month\" FROM mytable ORDER BY \"Year\", Flights LIMIT 11","hsqls":["SELECT OriginStateFips, `Month` FROM mytable ORDER BY Year, Flights LIMIT 11"]}
+{"sql":"SELECT DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE Cancelled NOT IN (1, 0) AND DivTotalGTimes > 54 ORDER BY OriginStateFips, SecurityDelay, OriginStateName LIMIT 8","hsqls":["SELECT DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE Cancelled NOT IN (1, 0) AND (DivTotalGTimes[1] > 54 OR DivTotalGTimes[2] > 54 OR DivTotalGTimes[3] > 54 OR DivTotalGTimes[4] > 54 OR DivTotalGTimes[5] > 54) ORDER BY OriginStateFips, SecurityDelay, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DestWac, Quarter, Dest, COUNT(OriginWac) FROM mytable GROUP BY DestWac, Quarter, Dest  ORDER BY DestWac, Quarter, Dest LIMIT 5","hsqls":["SELECT DestWac, Quarter, Dest, COUNT(OriginWac) FROM mytable GROUP BY DestWac, Quarter, Dest  ORDER BY DestWac, Quarter, Dest LIMIT 5"]}
 {"sql":"SELECT DestCityMarketID FROM mytable WHERE FirstDepTime NOT IN (1030, 721) OR OriginWac BETWEEN 16 AND 65 ORDER BY DestStateFips LIMIT 15"}
-{"sql":"SELECT DivReachedDest, DivWheelsOffs, ArrDelay FROM mytable ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 22","hsqls":["SELECT DivReachedDest, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, ArrDelay FROM mytable ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivWheelsOffs, ArrDelay FROM mytable ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 22","hsqls":["SELECT DivReachedDest, DivWheelsOffs, ArrDelay FROM mytable ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DestWac, DestStateFips, DivArrDelay, COUNT(*) FROM mytable WHERE UniqueCarrier IN ('DL', 'OO', 'AA', 'VX') OR DestWac <> 86 OR CancellationCode BETWEEN 'C' AND 'C' GROUP BY DestWac, DestStateFips, DivArrDelay  ORDER BY DestWac, DestStateFips, DivArrDelay LIMIT 9","hsqls":["SELECT DestWac, DestStateFips, DivArrDelay, COUNT(*) FROM mytable WHERE UniqueCarrier IN ('DL', 'OO', 'AA', 'VX') OR DestWac <> 86 OR CancellationCode BETWEEN 'C' AND 'C' GROUP BY DestWac, DestStateFips, DivArrDelay  ORDER BY DestWac, DestStateFips, DivArrDelay LIMIT 9"]}
-{"sql":"SELECT TaxiIn, DestAirportID, DivArrDelay, COUNT(*) FROM mytable WHERE DivAirportIDs IN (10299, 11233, 11109, 13487, 14006) AND DestAirportID BETWEEN 13198 AND 10643 OR OriginWac BETWEEN 92 AND 92 GROUP BY TaxiIn, DestAirportID, DivArrDelay LIMIT 23","hsqls":["SELECT TaxiIn, DestAirportID, DivArrDelay, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs__MV1 IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs__MV2 IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs__MV3 IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs__MV4 IN (10299, 11233, 11109, 13487, 14006)) AND DestAirportID BETWEEN 13198 AND 10643 OR OriginWac BETWEEN 92 AND 92 GROUP BY TaxiIn, DestAirportID, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DestAirportID, DivArrDelay, COUNT(*) FROM mytable WHERE DivAirportIDs IN (10299, 11233, 11109, 13487, 14006) AND DestAirportID BETWEEN 13198 AND 10643 OR OriginWac BETWEEN 92 AND 92 GROUP BY TaxiIn, DestAirportID, DivArrDelay LIMIT 23","hsqls":["SELECT TaxiIn, DestAirportID, DivArrDelay, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs[2] IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs[3] IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs[4] IN (10299, 11233, 11109, 13487, 14006) OR DivAirportIDs[5] IN (10299, 11233, 11109, 13487, 14006)) AND DestAirportID BETWEEN 13198 AND 10643 OR OriginWac BETWEEN 92 AND 92 GROUP BY TaxiIn, DestAirportID, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE Diverted <> 0 OR DepDel15 NOT IN (1, -9999) AND DivActualElapsedTime NOT IN (481, 642, 243, 196) ORDER BY Quarter LIMIT 5"}
-{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DivTailNums < 'N3CEAA' OR Carrier > 'DL' AND DestWac > 12 ORDER BY OriginAirportSeqID, WeatherDelay, CRSDepTime LIMIT 10","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE (DivTailNums__MV0 < 'N3CEAA' OR DivTailNums__MV1 < 'N3CEAA' OR DivTailNums__MV2 < 'N3CEAA' OR DivTailNums__MV3 < 'N3CEAA' OR DivTailNums__MV4 < 'N3CEAA') OR Carrier > 'DL' AND DestWac > 12 ORDER BY OriginAirportSeqID, WeatherDelay, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DivTailNums < 'N3CEAA' OR Carrier > 'DL' AND DestWac > 12 ORDER BY OriginAirportSeqID, WeatherDelay, CRSDepTime LIMIT 10","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE (DivTailNums[1] < 'N3CEAA' OR DivTailNums[2] < 'N3CEAA' OR DivTailNums[3] < 'N3CEAA' OR DivTailNums[4] < 'N3CEAA' OR DivTailNums[5] < 'N3CEAA') OR Carrier > 'DL' AND DestWac > 12 ORDER BY OriginAirportSeqID, WeatherDelay, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, Carrier, DayOfWeek, MAX(DivDistance) FROM mytable WHERE DayofMonth IN (20, 19, 31, 17) AND Flights <= 1 AND DayofMonth BETWEEN 7 AND 4 GROUP BY WheelsOff, Carrier, DayOfWeek  ORDER BY WheelsOff, Carrier, DayOfWeek LIMIT 14","hsqls":["SELECT WheelsOff, Carrier, DayOfWeek, MAX(DivDistance) FROM mytable WHERE DayofMonth IN (20, 19, 31, 17) AND Flights <= 1 AND DayofMonth BETWEEN 7 AND 4 GROUP BY WheelsOff, Carrier, DayOfWeek  ORDER BY WheelsOff, Carrier, DayOfWeek LIMIT 14"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE WheelsOff <= 1500 LIMIT 15"}
-{"sql":"SELECT Origin, \"Month\" FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY CRSArrTime, DestCityMarketID, DivArrDelay LIMIT 21","hsqls":["SELECT Origin, Month FROM mytable WHERE Year NOT IN (2014) ORDER BY CRSArrTime, DestCityMarketID, DivArrDelay LIMIT 21"]}
+{"sql":"SELECT Origin, \"Month\" FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY CRSArrTime, DestCityMarketID, DivArrDelay LIMIT 21","hsqls":["SELECT Origin, `Month` FROM mytable WHERE `Year` NOT IN (2014) ORDER BY CRSArrTime, DestCityMarketID, DivArrDelay LIMIT 21"]}
 {"sql":"SELECT ArrDelayMinutes, DayOfWeek, COUNT(*) FROM mytable WHERE DepartureDelayGroups IN (7, 8, 11) AND ArrDelay BETWEEN 0.0 AND -31.0 GROUP BY ArrDelayMinutes, DayOfWeek  ORDER BY ArrDelayMinutes, DayOfWeek LIMIT 15","hsqls":["SELECT ArrDelayMinutes, DayOfWeek, COUNT(*) FROM mytable WHERE DepartureDelayGroups IN (7, 8, 11) AND ArrDelay BETWEEN 0.0 AND -31.0 GROUP BY ArrDelayMinutes, DayOfWeek  ORDER BY ArrDelayMinutes, DayOfWeek LIMIT 15"]}
-{"sql":"SELECT ArrDel15, DestCityMarketID FROM mytable WHERE DivAirports IN ('HOU', 'GJT') AND TotalAddGTime BETWEEN 74 AND 23 AND DayOfWeek IN (2, 7) ORDER BY DivActualElapsedTime LIMIT 3","hsqls":["SELECT ArrDel15, DestCityMarketID FROM mytable WHERE (DivAirports__MV0 IN ('HOU', 'GJT') OR DivAirports__MV1 IN ('HOU', 'GJT') OR DivAirports__MV2 IN ('HOU', 'GJT') OR DivAirports__MV3 IN ('HOU', 'GJT') OR DivAirports__MV4 IN ('HOU', 'GJT')) AND TotalAddGTime BETWEEN 74 AND 23 AND DayOfWeek IN (2, 7) ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DestCityMarketID FROM mytable WHERE DivAirports IN ('HOU', 'GJT') AND TotalAddGTime BETWEEN 74 AND 23 AND DayOfWeek IN (2, 7) ORDER BY DivActualElapsedTime LIMIT 3","hsqls":["SELECT ArrDel15, DestCityMarketID FROM mytable WHERE (DivAirports[1] IN ('HOU', 'GJT') OR DivAirports[2] IN ('HOU', 'GJT') OR DivAirports[3] IN ('HOU', 'GJT') OR DivAirports[4] IN ('HOU', 'GJT') OR DivAirports[5] IN ('HOU', 'GJT')) AND TotalAddGTime BETWEEN 74 AND 23 AND DayOfWeek IN (2, 7) ORDER BY DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE UniqueCarrier = 'EV' ORDER BY WeatherDelay LIMIT 19"}
 {"sql":"SELECT ArrDelay, CancellationCode FROM mytable ORDER BY OriginAirportSeqID LIMIT 7"}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE FirstDepTime BETWEEN 903 AND 903 ORDER BY DestStateName LIMIT 27"}
 {"sql":"SELECT DepTimeBlk, ArrDelay, DayofMonth FROM mytable WHERE FlightNum <> 4360 LIMIT 23"}
 {"sql":"SELECT TaxiOut, Carrier FROM mytable WHERE OriginAirportSeqID IN (1197302, 1251102, 1463303) OR TaxiOut NOT IN (7, 108, 4, 26) OR DaysSinceEpoch <> 16085 ORDER BY WheelsOff LIMIT 6"}
-{"sql":"SELECT ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE DestStateFips IN (32, 55, 51, 36) AND DepartureDelayGroups BETWEEN 1 AND -9999 ORDER BY Origin LIMIT 9","hsqls":["SELECT ArrDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DestStateFips IN (32, 55, 51, 36) AND DepartureDelayGroups BETWEEN 1 AND -9999 ORDER BY Origin LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE AirTime BETWEEN 300 AND 335 OR CRSElapsedTime BETWEEN 294 AND 366 LIMIT 13","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestAirportSeqID FROM mytable WHERE AirTime BETWEEN 300 AND 335 OR CRSElapsedTime BETWEEN 294 AND 366 LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable LIMIT 4","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE AirTime NOT IN (115, 11, 100, 351) ORDER BY Quarter, TailNum LIMIT 4","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE AirTime NOT IN (115, 11, 100, 351) ORDER BY Quarter, TailNum LIMIT 10000"]}
-{"sql":"SELECT DepTime, DivAirportSeqIDs FROM mytable WHERE DivAirportSeqIDs <= 1482802 OR DivDistance <> 234 OR SecurityDelay BETWEEN 14 AND 27 ORDER BY OriginCityName, DestAirportSeqID LIMIT 10","hsqls":["SELECT DepTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1482802 OR DivAirportSeqIDs__MV1 <= 1482802 OR DivAirportSeqIDs__MV2 <= 1482802 OR DivAirportSeqIDs__MV3 <= 1482802 OR DivAirportSeqIDs__MV4 <= 1482802) OR DivDistance <> 234 OR SecurityDelay BETWEEN 14 AND 27 ORDER BY OriginCityName, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE DestStateFips IN (32, 55, 51, 36) AND DepartureDelayGroups BETWEEN 1 AND -9999 ORDER BY Origin LIMIT 9","hsqls":["SELECT ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE DestStateFips IN (32, 55, 51, 36) AND DepartureDelayGroups BETWEEN 1 AND -9999 ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE AirTime BETWEEN 300 AND 335 OR CRSElapsedTime BETWEEN 294 AND 366 LIMIT 13","hsqls":["SELECT DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE AirTime BETWEEN 300 AND 335 OR CRSElapsedTime BETWEEN 294 AND 366 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable LIMIT 4","hsqls":["SELECT DivWheelsOffs FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE AirTime NOT IN (115, 11, 100, 351) ORDER BY Quarter, TailNum LIMIT 4","hsqls":["SELECT DivAirportIDs FROM mytable WHERE AirTime NOT IN (115, 11, 100, 351) ORDER BY Quarter, TailNum LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivAirportSeqIDs FROM mytable WHERE DivAirportSeqIDs <= 1482802 OR DivDistance <> 234 OR SecurityDelay BETWEEN 14 AND 27 ORDER BY OriginCityName, DestAirportSeqID LIMIT 10","hsqls":["SELECT DepTime, DivAirportSeqIDs FROM mytable WHERE (DivAirportSeqIDs[1] <= 1482802 OR DivAirportSeqIDs[2] <= 1482802 OR DivAirportSeqIDs[3] <= 1482802 OR DivAirportSeqIDs[4] <= 1482802 OR DivAirportSeqIDs[5] <= 1482802) OR DivDistance <> 234 OR SecurityDelay BETWEEN 14 AND 27 ORDER BY OriginCityName, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT AVG(CRSDepTime), MIN(DepartureDelayGroups), SUM(ArrTime) FROM mytable WHERE CancellationCode IN ('C') AND DestWac = 86 LIMIT 16"}
-{"sql":"SELECT ArrTime, \"Month\", COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '2200-2259', '1100-1159', '1800-1859') GROUP BY ArrTime, \"Month\" LIMIT 18","hsqls":["SELECT ArrTime, Month, COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '2200-2259', '1100-1159', '1800-1859') GROUP BY ArrTime, Month LIMIT 18"]}
+{"sql":"SELECT ArrTime, \"Month\", COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '2200-2259', '1100-1159', '1800-1859') GROUP BY ArrTime, \"Month\" LIMIT 18","hsqls":["SELECT ArrTime, Month, COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '2200-2259', '1100-1159', '1800-1859') GROUP BY ArrTime, `Month` LIMIT 18"]}
 {"sql":"SELECT COUNT(DepDelay), SUM(DepDelayMinutes), MAX(OriginAirportID) FROM mytable WHERE DestCityMarketID NOT IN (30620) LIMIT 9"}
 {"sql":"SELECT DestState, COUNT(ArrivalDelayGroups), AVG(FlightNum) FROM mytable WHERE LateAircraftDelay BETWEEN 48 AND 75 GROUP BY DestState  ORDER BY DestState LIMIT 20","hsqls":["SELECT DestState, COUNT(ArrivalDelayGroups), AVG(FlightNum) FROM mytable WHERE LateAircraftDelay BETWEEN 48 AND 75 GROUP BY DestState  ORDER BY DestState LIMIT 20"]}
-{"sql":"SELECT Flights, DivActualElapsedTime FROM mytable WHERE CRSArrTime BETWEEN 100 AND 632 OR DivWheelsOns IN (1414, 1706, 838, 1113, 1326) LIMIT 13","hsqls":["SELECT Flights, DivActualElapsedTime FROM mytable WHERE CRSArrTime BETWEEN 100 AND 632 OR (DivWheelsOns__MV0 IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns__MV1 IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns__MV2 IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns__MV3 IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns__MV4 IN (1414, 1706, 838, 1113, 1326)) LIMIT 10000"]}
+{"sql":"SELECT Flights, DivActualElapsedTime FROM mytable WHERE CRSArrTime BETWEEN 100 AND 632 OR DivWheelsOns IN (1414, 1706, 838, 1113, 1326) LIMIT 13","hsqls":["SELECT Flights, DivActualElapsedTime FROM mytable WHERE CRSArrTime BETWEEN 100 AND 632 OR (DivWheelsOns[1] IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns[2] IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns[3] IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns[4] IN (1414, 1706, 838, 1113, 1326) OR DivWheelsOns[5] IN (1414, 1706, 838, 1113, 1326)) LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, LongestAddGTime, CancellationCode FROM mytable ORDER BY AirTime LIMIT 29"}
 {"sql":"SELECT FirstDepTime, ArrTime, DivAirportLandings FROM mytable WHERE DayOfWeek >= 5 OR AirlineID <= 20437 OR DivReachedDest BETWEEN 0 AND 1 ORDER BY OriginCityMarketID, ActualElapsedTime, OriginAirportID LIMIT 20"}
 {"sql":"SELECT Diverted, FlightNum, COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 4 AND 18 GROUP BY Diverted, FlightNum  ORDER BY Diverted, FlightNum LIMIT 14","hsqls":["SELECT Diverted, FlightNum, COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 4 AND 18 GROUP BY Diverted, FlightNum  ORDER BY Diverted, FlightNum LIMIT 14"]}
 {"sql":"SELECT DistanceGroup, TaxiIn, OriginAirportID, MIN(DivReachedDest), MIN(AirlineID) FROM mytable WHERE OriginAirportSeqID NOT IN (1219102) OR Cancelled >= 1 GROUP BY DistanceGroup, TaxiIn, OriginAirportID  ORDER BY DistanceGroup, TaxiIn, OriginAirportID LIMIT 18","hsqls":["SELECT DistanceGroup, TaxiIn, OriginAirportID, MIN(DivReachedDest), MIN(AirlineID) FROM mytable WHERE OriginAirportSeqID NOT IN (1219102) OR Cancelled >= 1 GROUP BY DistanceGroup, TaxiIn, OriginAirportID  ORDER BY DistanceGroup, TaxiIn, OriginAirportID LIMIT 18"]}
 {"sql":"SELECT LateAircraftDelay, TotalAddGTime, COUNT(OriginCityName) FROM mytable WHERE CarrierDelay < 66 AND OriginCityName = 'San Juan, PR' GROUP BY LateAircraftDelay, TotalAddGTime","hsqls":["SELECT LateAircraftDelay, TotalAddGTime, COUNT(OriginCityName) FROM mytable WHERE CarrierDelay < 66 AND OriginCityName = 'San Juan, PR' GROUP BY LateAircraftDelay, TotalAddGTime"]}
-{"sql":"SELECT DivReachedDest, DestAirportID FROM mytable WHERE DivAirports IN ('AVP', 'ORF', 'TYS') AND DivAirportSeqIDs BETWEEN 1086803 AND 1599102 AND SecurityDelay BETWEEN 4 AND 1 ORDER BY OriginCityMarketID LIMIT 9","hsqls":["SELECT DivReachedDest, DestAirportID FROM mytable WHERE (DivAirports__MV0 IN ('AVP', 'ORF', 'TYS') OR DivAirports__MV1 IN ('AVP', 'ORF', 'TYS') OR DivAirports__MV2 IN ('AVP', 'ORF', 'TYS') OR DivAirports__MV3 IN ('AVP', 'ORF', 'TYS') OR DivAirports__MV4 IN ('AVP', 'ORF', 'TYS')) AND (DivAirportSeqIDs__MV0 BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs__MV1 BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs__MV2 BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs__MV3 BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs__MV4 BETWEEN 1086803 AND 1599102) AND SecurityDelay BETWEEN 4 AND 1 ORDER BY OriginCityMarketID LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, WeatherDelay, ArrDelayMinutes FROM mytable WHERE ArrDelay > 62.0 AND WheelsOn < 2043 OR DivAirportSeqIDs BETWEEN 1468902 AND 1483103 ORDER BY Dest LIMIT 26","hsqls":["SELECT WheelsOff, WeatherDelay, ArrDelayMinutes FROM mytable WHERE ArrDelay > 62.0 AND WheelsOn < 2043 OR (DivAirportSeqIDs__MV0 BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs__MV1 BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs__MV2 BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs__MV3 BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs__MV4 BETWEEN 1468902 AND 1483103) ORDER BY Dest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DestAirportID FROM mytable WHERE DivAirports IN ('AVP', 'ORF', 'TYS') AND DivAirportSeqIDs BETWEEN 1086803 AND 1599102 AND SecurityDelay BETWEEN 4 AND 1 ORDER BY OriginCityMarketID LIMIT 9","hsqls":["SELECT DivReachedDest, DestAirportID FROM mytable WHERE (DivAirports[1] IN ('AVP', 'ORF', 'TYS') OR DivAirports[2] IN ('AVP', 'ORF', 'TYS') OR DivAirports[3] IN ('AVP', 'ORF', 'TYS') OR DivAirports[4] IN ('AVP', 'ORF', 'TYS') OR DivAirports[5] IN ('AVP', 'ORF', 'TYS')) AND (DivAirportSeqIDs[1] BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs[2] BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs[3] BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs[4] BETWEEN 1086803 AND 1599102 OR DivAirportSeqIDs[5] BETWEEN 1086803 AND 1599102) AND SecurityDelay BETWEEN 4 AND 1 ORDER BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, WeatherDelay, ArrDelayMinutes FROM mytable WHERE ArrDelay > 62.0 AND WheelsOn < 2043 OR DivAirportSeqIDs BETWEEN 1468902 AND 1483103 ORDER BY Dest LIMIT 26","hsqls":["SELECT WheelsOff, WeatherDelay, ArrDelayMinutes FROM mytable WHERE ArrDelay > 62.0 AND WheelsOn < 2043 OR (DivAirportSeqIDs[1] BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs[2] BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs[3] BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs[4] BETWEEN 1468902 AND 1483103 OR DivAirportSeqIDs[5] BETWEEN 1468902 AND 1483103) ORDER BY Dest LIMIT 10000"]}
 {"sql":"SELECT DestWac, ArrDel15, TailNum, MIN(ArrDelay), COUNT(NASDelay) FROM mytable WHERE ArrTime = 1528 GROUP BY DestWac, ArrDel15, TailNum  ORDER BY DestWac, ArrDel15, TailNum LIMIT 11","hsqls":["SELECT DestWac, ArrDel15, TailNum, MIN(ArrDelay), COUNT(NASDelay) FROM mytable WHERE ArrTime = 1528 GROUP BY DestWac, ArrDel15, TailNum  ORDER BY DestWac, ArrDel15, TailNum LIMIT 11"]}
 {"sql":"SELECT FlightDate, Cancelled, COUNT(DestAirportID) FROM mytable WHERE ArrTime NOT IN (1752, 2339, 2123) GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 28","hsqls":["SELECT FlightDate, Cancelled, COUNT(DestAirportID) FROM mytable WHERE ArrTime NOT IN (1752, 2339, 2123) GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 28"]}
 {"sql":"SELECT FlightDate, DayOfWeek, COUNT(TaxiOut), MAX(DepDelay), SUM(OriginCityMarketID) FROM mytable WHERE OriginStateFips >= 23 AND DivDistance < 47 GROUP BY FlightDate, DayOfWeek  ORDER BY FlightDate, DayOfWeek LIMIT 16","hsqls":["SELECT FlightDate, DayOfWeek, COUNT(TaxiOut), MAX(DepDelay), SUM(OriginCityMarketID) FROM mytable WHERE OriginStateFips >= 23 AND DivDistance < 47 GROUP BY FlightDate, DayOfWeek  ORDER BY FlightDate, DayOfWeek LIMIT 16"]}
 {"sql":"SELECT TailNum FROM mytable WHERE ActualElapsedTime BETWEEN 125 AND 299 AND OriginCityMarketID NOT IN (31884, 35991, 30073, 32335, 33264) AND DepDelayMinutes BETWEEN 338.0 AND 186.0 ORDER BY OriginCityName, Dest LIMIT 18"}
-{"sql":"SELECT OriginStateName FROM mytable WHERE DestStateName BETWEEN 'Hawaii' AND 'Alabama' OR DivWheelsOns >= 1600 ORDER BY DepDel15 LIMIT 25","hsqls":["SELECT OriginStateName FROM mytable WHERE DestStateName BETWEEN 'Hawaii' AND 'Alabama' OR (DivWheelsOns__MV0 >= 1600 OR DivWheelsOns__MV1 >= 1600 OR DivWheelsOns__MV2 >= 1600 OR DivWheelsOns__MV3 >= 1600 OR DivWheelsOns__MV4 >= 1600) ORDER BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT OriginStateName FROM mytable WHERE DestStateName BETWEEN 'Hawaii' AND 'Alabama' OR DivWheelsOns >= 1600 ORDER BY DepDel15 LIMIT 25","hsqls":["SELECT OriginStateName FROM mytable WHERE DestStateName BETWEEN 'Hawaii' AND 'Alabama' OR (DivWheelsOns[1] >= 1600 OR DivWheelsOns[2] >= 1600 OR DivWheelsOns[3] >= 1600 OR DivWheelsOns[4] >= 1600 OR DivWheelsOns[5] >= 1600) ORDER BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT DestWac, DivAirportLandings, CancellationCode, COUNT(OriginCityName), COUNT(AirlineID) FROM mytable WHERE WeatherDelay IN (16) GROUP BY DestWac, DivAirportLandings, CancellationCode  ORDER BY DestWac, DivAirportLandings, CancellationCode LIMIT 19","hsqls":["SELECT DestWac, DivAirportLandings, CancellationCode, COUNT(OriginCityName), COUNT(AirlineID) FROM mytable WHERE WeatherDelay IN (16) GROUP BY DestWac, DivAirportLandings, CancellationCode  ORDER BY DestWac, DivAirportLandings, CancellationCode LIMIT 19"]}
 {"sql":"SELECT LongestAddGTime, DepDel15, UniqueCarrier, COUNT(*) FROM mytable WHERE Dest BETWEEN 'FWA' AND 'BTR' OR DepDelayMinutes < 81.0 GROUP BY LongestAddGTime, DepDel15, UniqueCarrier","hsqls":["SELECT LongestAddGTime, DepDel15, UniqueCarrier, COUNT(*) FROM mytable WHERE Dest BETWEEN 'FWA' AND 'BTR' OR DepDelayMinutes < 81.0 GROUP BY LongestAddGTime, DepDel15, UniqueCarrier"]}
 {"sql":"SELECT Diverted, WeatherDelay FROM mytable WHERE OriginCityMarketID BETWEEN 32896 AND 33785 AND DepTimeBlk IN ('2200-2259', '2100-2159', '2300-2359', '1200-1259') LIMIT 20"}
 {"sql":"SELECT LongestAddGTime, COUNT(*) FROM mytable WHERE OriginStateFips BETWEEN 33 AND 6 AND CRSArrTime = 2249 AND ArrTimeBlk <> '1200-1259' GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 8","hsqls":["SELECT LongestAddGTime, COUNT(*) FROM mytable WHERE OriginStateFips BETWEEN 33 AND 6 AND CRSArrTime = 2249 AND ArrTimeBlk <> '1200-1259' GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 8"]}
 {"sql":"SELECT DestWac, OriginAirportID FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestState BETWEEN 'IN' AND 'NV' ORDER BY DestState LIMIT 26"}
 {"sql":"SELECT UniqueCarrier, DivArrDelay FROM mytable ORDER BY DivReachedDest, WeatherDelay, LongestAddGTime LIMIT 17"}
-{"sql":"SELECT Carrier, FlightNum, ArrDelayMinutes, COUNT(\"Year\"), MIN(ArrTime) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND NASDelay BETWEEN 281 AND 29 OR TailNum < 'N914EV' GROUP BY Carrier, FlightNum, ArrDelayMinutes LIMIT 26","hsqls":["SELECT Carrier, FlightNum, ArrDelayMinutes, COUNT(Year), MIN(ArrTime) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND NASDelay BETWEEN 281 AND 29 OR TailNum < 'N914EV' GROUP BY Carrier, FlightNum, ArrDelayMinutes LIMIT 26"]}
-{"sql":"SELECT \"Year\", FlightNum, MAX(DestStateFips), AVG(NASDelay), MIN(DepTime) FROM mytable WHERE DivAirports IN ('CPR', 'GPT', 'RDM') GROUP BY \"Year\", FlightNum LIMIT 14","hsqls":["SELECT Year, FlightNum, MAX(DestStateFips), AVG(NASDelay), MIN(DepTime) FROM mytable WHERE (DivAirports__MV0 IN ('CPR', 'GPT', 'RDM') OR DivAirports__MV1 IN ('CPR', 'GPT', 'RDM') OR DivAirports__MV2 IN ('CPR', 'GPT', 'RDM') OR DivAirports__MV3 IN ('CPR', 'GPT', 'RDM') OR DivAirports__MV4 IN ('CPR', 'GPT', 'RDM')) GROUP BY Year, FlightNum LIMIT 10000"]}
+{"sql":"SELECT Carrier, FlightNum, ArrDelayMinutes, COUNT(\"Year\"), MIN(ArrTime) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND NASDelay BETWEEN 281 AND 29 OR TailNum < 'N914EV' GROUP BY Carrier, FlightNum, ArrDelayMinutes LIMIT 26","hsqls":["SELECT Carrier, FlightNum, ArrDelayMinutes, COUNT(`Year`), MIN(ArrTime) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND NASDelay BETWEEN 281 AND 29 OR TailNum < 'N914EV' GROUP BY Carrier, FlightNum, ArrDelayMinutes LIMIT 26"]}
+{"sql":"SELECT \"Year\", FlightNum, MAX(DestStateFips), AVG(NASDelay), MIN(DepTime) FROM mytable WHERE DivAirports IN ('CPR', 'GPT', 'RDM') GROUP BY \"Year\", FlightNum LIMIT 14","hsqls":["SELECT Year, FlightNum, MAX(DestStateFips), AVG(NASDelay), MIN(DepTime) FROM mytable WHERE (DivAirports[1] IN ('CPR', 'GPT', 'RDM') OR DivAirports[2] IN ('CPR', 'GPT', 'RDM') OR DivAirports[3] IN ('CPR', 'GPT', 'RDM') OR DivAirports[4] IN ('CPR', 'GPT', 'RDM') OR DivAirports[5] IN ('CPR', 'GPT', 'RDM')) GROUP BY Year, FlightNum LIMIT 10000"]}
 {"sql":"SELECT COUNT(WheelsOn), MIN(TaxiOut) FROM mytable LIMIT 10"}
-{"sql":"SELECT LongestAddGTime, ArrivalDelayGroups, DivTotalGTimes FROM mytable WHERE OriginAirportID > 13577 OR ArrivalDelayGroups <= 6 AND WheelsOn BETWEEN 1940 AND 1008 ORDER BY AirlineID LIMIT 25","hsqls":["SELECT LongestAddGTime, ArrivalDelayGroups, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginAirportID > 13577 OR ArrivalDelayGroups <= 6 AND WheelsOn BETWEEN 1940 AND 1008 ORDER BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, ArrivalDelayGroups, DivTotalGTimes FROM mytable WHERE OriginAirportID > 13577 OR ArrivalDelayGroups <= 6 AND WheelsOn BETWEEN 1940 AND 1008 ORDER BY AirlineID LIMIT 25","hsqls":["SELECT LongestAddGTime, ArrivalDelayGroups, DivTotalGTimes FROM mytable WHERE OriginAirportID > 13577 OR ArrivalDelayGroups <= 6 AND WheelsOn BETWEEN 1940 AND 1008 ORDER BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DepDelayMinutes, DivArrDelay FROM mytable ORDER BY DestWac, DayofMonth LIMIT 15"}
-{"sql":"SELECT DivWheelsOffs, DivTotalGTimes FROM mytable WHERE AirlineID = 19790 LIMIT 6","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE AirlineID = 19790 LIMIT 10000"]}
-{"sql":"SELECT DivDistance, ArrTimeBlk, ArrDel15 FROM mytable WHERE Distance IN (257, 476, 1129) AND DivTotalGTimes IN (89) OR UniqueCarrier <> 'MQ' LIMIT 3","hsqls":["SELECT DivDistance, ArrTimeBlk, ArrDel15 FROM mytable WHERE Distance IN (257, 476, 1129) AND (DivTotalGTimes__MV0 IN (89) OR DivTotalGTimes__MV1 IN (89) OR DivTotalGTimes__MV2 IN (89) OR DivTotalGTimes__MV3 IN (89) OR DivTotalGTimes__MV4 IN (89)) OR UniqueCarrier <> 'MQ' LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DivTotalGTimes FROM mytable WHERE AirlineID = 19790 LIMIT 6","hsqls":["SELECT DivWheelsOffs, DivTotalGTimes FROM mytable WHERE AirlineID = 19790 LIMIT 10000"]}
+{"sql":"SELECT DivDistance, ArrTimeBlk, ArrDel15 FROM mytable WHERE Distance IN (257, 476, 1129) AND DivTotalGTimes IN (89) OR UniqueCarrier <> 'MQ' LIMIT 3","hsqls":["SELECT DivDistance, ArrTimeBlk, ArrDel15 FROM mytable WHERE Distance IN (257, 476, 1129) AND (DivTotalGTimes[1] IN (89) OR DivTotalGTimes[2] IN (89) OR DivTotalGTimes[3] IN (89) OR DivTotalGTimes[4] IN (89) OR DivTotalGTimes[5] IN (89)) OR UniqueCarrier <> 'MQ' LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable WHERE OriginAirportSeqID > 1201602 AND ActualElapsedTime BETWEEN 32 AND 35 LIMIT 10"}
-{"sql":"SELECT Flights, DivWheelsOffs, DayofMonth FROM mytable LIMIT 17","hsqls":["SELECT Flights, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DayofMonth FROM mytable LIMIT 10000"]}
+{"sql":"SELECT Flights, DivWheelsOffs, DayofMonth FROM mytable LIMIT 17","hsqls":["SELECT Flights, DivWheelsOffs, DayofMonth FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay, AVG(DestAirportSeqID), MIN(OriginStateFips) FROM mytable WHERE FlightDate BETWEEN '2014-01-19' AND '2014-01-23' GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 6","hsqls":["SELECT DivArrDelay, AVG(DestAirportSeqID), MIN(OriginStateFips) FROM mytable WHERE FlightDate BETWEEN '2014-01-19' AND '2014-01-23' GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 6"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivTotalGTimes BETWEEN 35 AND 31 ORDER BY Distance LIMIT 12","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 35 AND 31 OR DivTotalGTimes__MV1 BETWEEN 35 AND 31 OR DivTotalGTimes__MV2 BETWEEN 35 AND 31 OR DivTotalGTimes__MV3 BETWEEN 35 AND 31 OR DivTotalGTimes__MV4 BETWEEN 35 AND 31) ORDER BY Distance LIMIT 10000"]}
-{"sql":"SELECT Diverted, DepDel15, DivTailNums FROM mytable WHERE ArrivalDelayGroups <= 5 AND \"Month\" BETWEEN 1 AND 1 OR DepTime <> 1045 ORDER BY Diverted, DestAirportID LIMIT 25","hsqls":["SELECT Diverted, DepDel15, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE ArrivalDelayGroups <= 5 AND Month BETWEEN 1 AND 1 OR DepTime <> 1045 ORDER BY Diverted, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivTotalGTimes BETWEEN 35 AND 31 ORDER BY Distance LIMIT 12","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 35 AND 31 OR DivTotalGTimes[2] BETWEEN 35 AND 31 OR DivTotalGTimes[3] BETWEEN 35 AND 31 OR DivTotalGTimes[4] BETWEEN 35 AND 31 OR DivTotalGTimes[5] BETWEEN 35 AND 31) ORDER BY Distance LIMIT 10000"]}
+{"sql":"SELECT Diverted, DepDel15, DivTailNums FROM mytable WHERE ArrivalDelayGroups <= 5 AND \"Month\" BETWEEN 1 AND 1 OR DepTime <> 1045 ORDER BY Diverted, DestAirportID LIMIT 25","hsqls":["SELECT Diverted, DepDel15, DivTailNums FROM mytable WHERE ArrivalDelayGroups <= 5 AND `Month` BETWEEN 1 AND 1 OR DepTime <> 1045 ORDER BY Diverted, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, \"Year\", DivActualElapsedTime, MAX(ArrivalDelayGroups), AVG(DivArrDelay), MAX(DivAirportLandings) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 18 AND DivActualElapsedTime BETWEEN 398 AND 425 GROUP BY WheelsOff, \"Year\", DivActualElapsedTime LIMIT 19","hsqls":["SELECT WheelsOff, Year, DivActualElapsedTime, MAX(ArrivalDelayGroups), AVG(DivArrDelay), MAX(DivAirportLandings) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 18 AND DivActualElapsedTime BETWEEN 398 AND 425 GROUP BY WheelsOff, Year, DivActualElapsedTime LIMIT 19"]}
-{"sql":"SELECT UniqueCarrier, \"Month\", AVG(Diverted), AVG(DestWac) FROM mytable WHERE WeatherDelay <= 205 GROUP BY UniqueCarrier, \"Month\" LIMIT 16","hsqls":["SELECT UniqueCarrier, Month, AVG(Diverted), AVG(DestWac) FROM mytable WHERE WeatherDelay <= 205 GROUP BY UniqueCarrier, Month LIMIT 16"]}
-{"sql":"SELECT DivAirportIDs, CRSDepTime FROM mytable WHERE DivWheelsOffs >= 2111 AND DivLongestGTimes BETWEEN 5.0 AND 20.0 AND DestWac <= 87 ORDER BY LongestAddGTime, Cancelled, OriginWac LIMIT 13","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CRSDepTime FROM mytable WHERE (DivWheelsOffs__MV0 >= 2111 OR DivWheelsOffs__MV1 >= 2111 OR DivWheelsOffs__MV2 >= 2111 OR DivWheelsOffs__MV3 >= 2111 OR DivWheelsOffs__MV4 >= 2111) AND (DivLongestGTimes__MV0 BETWEEN 5.0 AND 20.0 OR DivLongestGTimes__MV1 BETWEEN 5.0 AND 20.0 OR DivLongestGTimes__MV2 BETWEEN 5.0 AND 20.0 OR DivLongestGTimes__MV3 BETWEEN 5.0 AND 20.0 OR DivLongestGTimes__MV4 BETWEEN 5.0 AND 20.0) AND DestWac <= 87 ORDER BY LongestAddGTime, Cancelled, OriginWac LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier, \"Month\", AVG(Diverted), AVG(DestWac) FROM mytable WHERE WeatherDelay <= 205 GROUP BY UniqueCarrier, \"Month\" LIMIT 16","hsqls":["SELECT UniqueCarrier, Month, AVG(Diverted), AVG(DestWac) FROM mytable WHERE WeatherDelay <= 205 GROUP BY UniqueCarrier, `Month` LIMIT 16"]}
+{"sql":"SELECT DivAirportIDs, CRSDepTime FROM mytable WHERE DivWheelsOffs >= 2111 AND DivLongestGTimes BETWEEN 5.0 AND 20.0 AND DestWac <= 87 ORDER BY LongestAddGTime, Cancelled, OriginWac LIMIT 13","hsqls":["SELECT DivAirportIDs, CRSDepTime FROM mytable WHERE (DivWheelsOffs[1] >= 2111 OR DivWheelsOffs[2] >= 2111 OR DivWheelsOffs[3] >= 2111 OR DivWheelsOffs[4] >= 2111 OR DivWheelsOffs[5] >= 2111) AND (DivLongestGTimes[1] BETWEEN 5.0 AND 20.0 OR DivLongestGTimes[2] BETWEEN 5.0 AND 20.0 OR DivLongestGTimes[3] BETWEEN 5.0 AND 20.0 OR DivLongestGTimes[4] BETWEEN 5.0 AND 20.0 OR DivLongestGTimes[5] BETWEEN 5.0 AND 20.0) AND DestWac <= 87 ORDER BY LongestAddGTime, Cancelled, OriginWac LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, UniqueCarrier FROM mytable ORDER BY DestStateFips, WheelsOn LIMIT 11"}
 {"sql":"SELECT OriginCityName, TaxiIn, COUNT(*) FROM mytable GROUP BY OriginCityName, TaxiIn  ORDER BY OriginCityName, TaxiIn LIMIT 25","hsqls":["SELECT OriginCityName, TaxiIn, COUNT(*) FROM mytable GROUP BY OriginCityName, TaxiIn  ORDER BY OriginCityName, TaxiIn LIMIT 25"]}
 {"sql":"SELECT DivReachedDest, ArrDelayMinutes, COUNT(*) FROM mytable WHERE DivArrDelay > 49 OR Flights IN (1) AND Distance IN (544) GROUP BY DivReachedDest, ArrDelayMinutes  ORDER BY DivReachedDest, ArrDelayMinutes LIMIT 7","hsqls":["SELECT DivReachedDest, ArrDelayMinutes, COUNT(*) FROM mytable WHERE DivArrDelay > 49 OR Flights IN (1) AND Distance IN (544) GROUP BY DivReachedDest, ArrDelayMinutes  ORDER BY DivReachedDest, ArrDelayMinutes LIMIT 7"]}
 {"sql":"SELECT DayofMonth FROM mytable ORDER BY OriginCityMarketID LIMIT 12"}
-{"sql":"SELECT DivLongestGTimes, CRSDepTime FROM mytable ORDER BY LateAircraftDelay, DepTimeBlk LIMIT 16","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CRSDepTime FROM mytable ORDER BY LateAircraftDelay, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CRSDepTime FROM mytable ORDER BY LateAircraftDelay, DepTimeBlk LIMIT 16","hsqls":["SELECT DivLongestGTimes, CRSDepTime FROM mytable ORDER BY LateAircraftDelay, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE FlightDate >= '2014-01-23' ORDER BY ActualElapsedTime, ArrivalDelayGroups LIMIT 16"}
 {"sql":"SELECT Dest, OriginWac, CRSElapsedTime FROM mytable WHERE DestWac >= 64 AND DayofMonth BETWEEN 2 AND 4 OR DestWac NOT IN (1) ORDER BY DepDelay, OriginStateFips, CRSElapsedTime LIMIT 16"}
 {"sql":"SELECT DestCityMarketID, MAX(ArrDel15), SUM(WheelsOn), SUM(AirTime) FROM mytable GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 29","hsqls":["SELECT DestCityMarketID, MAX(ArrDel15), SUM(WheelsOn), SUM(AirTime) FROM mytable GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 29"]}
-{"sql":"SELECT DivAirports, DestCityName, DivActualElapsedTime FROM mytable WHERE WheelsOff IN (852) ORDER BY DayofMonth LIMIT 16","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestCityName, DivActualElapsedTime FROM mytable WHERE WheelsOff IN (852) ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestCityName, DivActualElapsedTime FROM mytable WHERE WheelsOff IN (852) ORDER BY DayofMonth LIMIT 16","hsqls":["SELECT DivAirports, DestCityName, DivActualElapsedTime FROM mytable WHERE WheelsOff IN (852) ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier, MAX(CRSDepTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 AND ArrDelayMinutes NOT IN (78.0, 49.0, 152.0, 144.0) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 6","hsqls":["SELECT UniqueCarrier, MAX(CRSDepTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 AND ArrDelayMinutes NOT IN (78.0, 49.0, 152.0, 144.0) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 6"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE AirlineID BETWEEN 20436 AND 19690 AND LongestAddGTime <= 78 ORDER BY DivReachedDest, WeatherDelay, ArrTime LIMIT 28"}
 {"sql":"SELECT WheelsOff, UniqueCarrier, DayOfWeek FROM mytable ORDER BY DepDelay, ArrTime, DivAirportLandings LIMIT 22"}
 {"sql":"SELECT Carrier, COUNT(DepTimeBlk) FROM mytable WHERE Quarter IN (1) AND DivActualElapsedTime IN (213, 324, 243, 495, 142) OR FlightDate IN ('2014-01-25') GROUP BY Carrier  ORDER BY Carrier LIMIT 15","hsqls":["SELECT Carrier, COUNT(DepTimeBlk) FROM mytable WHERE Quarter IN (1) AND DivActualElapsedTime IN (213, 324, 243, 495, 142) OR FlightDate IN ('2014-01-25') GROUP BY Carrier  ORDER BY Carrier LIMIT 15"]}
-{"sql":"SELECT DestAirportID, WheelsOn FROM mytable WHERE DivAirportIDs IN (14113, 14794, 14679, 13230) AND ArrTimeBlk IN ('2000-2059', '1700-1759', '1100-1159') OR ArrTimeBlk BETWEEN '1900-1959' AND '1100-1159' ORDER BY DistanceGroup, Diverted LIMIT 22","hsqls":["SELECT DestAirportID, WheelsOn FROM mytable WHERE (DivAirportIDs__MV0 IN (14113, 14794, 14679, 13230) OR DivAirportIDs__MV1 IN (14113, 14794, 14679, 13230) OR DivAirportIDs__MV2 IN (14113, 14794, 14679, 13230) OR DivAirportIDs__MV3 IN (14113, 14794, 14679, 13230) OR DivAirportIDs__MV4 IN (14113, 14794, 14679, 13230)) AND ArrTimeBlk IN ('2000-2059', '1700-1759', '1100-1159') OR ArrTimeBlk BETWEEN '1900-1959' AND '1100-1159' ORDER BY DistanceGroup, Diverted LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, WheelsOn FROM mytable WHERE DivAirportIDs IN (14113, 14794, 14679, 13230) AND ArrTimeBlk IN ('2000-2059', '1700-1759', '1100-1159') OR ArrTimeBlk BETWEEN '1900-1959' AND '1100-1159' ORDER BY DistanceGroup, Diverted LIMIT 22","hsqls":["SELECT DestAirportID, WheelsOn FROM mytable WHERE (DivAirportIDs[1] IN (14113, 14794, 14679, 13230) OR DivAirportIDs[2] IN (14113, 14794, 14679, 13230) OR DivAirportIDs[3] IN (14113, 14794, 14679, 13230) OR DivAirportIDs[4] IN (14113, 14794, 14679, 13230) OR DivAirportIDs[5] IN (14113, 14794, 14679, 13230)) AND ArrTimeBlk IN ('2000-2059', '1700-1759', '1100-1159') OR ArrTimeBlk BETWEEN '1900-1959' AND '1100-1159' ORDER BY DistanceGroup, Diverted LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, DepTimeBlk, COUNT(OriginCityMarketID), SUM(Flights) FROM mytable WHERE ArrTime BETWEEN 44 AND 955 AND UniqueCarrier IN ('F9', 'US', 'B6', 'OO', 'VX') GROUP BY ActualElapsedTime, DepTimeBlk  ORDER BY ActualElapsedTime, DepTimeBlk LIMIT 6","hsqls":["SELECT ActualElapsedTime, DepTimeBlk, COUNT(OriginCityMarketID), SUM(Flights) FROM mytable WHERE ArrTime BETWEEN 44 AND 955 AND UniqueCarrier IN ('F9', 'US', 'B6', 'OO', 'VX') GROUP BY ActualElapsedTime, DepTimeBlk  ORDER BY ActualElapsedTime, DepTimeBlk LIMIT 6"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE SecurityDelay NOT IN (0, 4, 8, 14, -9999) AND DayofMonth < 28 AND TotalAddGTime = 51 ORDER BY DivDistance, CRSDepTime LIMIT 29"}
 {"sql":"SELECT COUNT(TotalAddGTime) FROM mytable WHERE OriginState NOT IN ('PA', 'AK') LIMIT 23"}
 {"sql":"SELECT MAX(NASDelay), MIN(DepDelay) FROM mytable WHERE DestState <> 'FL' LIMIT 25"}
 {"sql":"SELECT CarrierDelay, ArrivalDelayGroups, SUM(AirTime), MIN(CRSDepTime), MIN(ArrivalDelayGroups) FROM mytable WHERE DestAirportID >= 15096 AND DestWac BETWEEN 15 AND 74 OR ArrTime BETWEEN 1941 AND 951 GROUP BY CarrierDelay, ArrivalDelayGroups  ORDER BY CarrierDelay, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT CarrierDelay, ArrivalDelayGroups, SUM(AirTime), MIN(CRSDepTime), MIN(ArrivalDelayGroups) FROM mytable WHERE DestAirportID >= 15096 AND DestWac BETWEEN 15 AND 74 OR ArrTime BETWEEN 1941 AND 951 GROUP BY CarrierDelay, ArrivalDelayGroups  ORDER BY CarrierDelay, ArrivalDelayGroups LIMIT 29"]}
 {"sql":"SELECT Quarter, AVG(CRSDepTime), SUM(OriginAirportID) FROM mytable GROUP BY Quarter  ORDER BY Quarter LIMIT 6","hsqls":["SELECT Quarter, AVG(CRSDepTime), SUM(OriginAirportID) FROM mytable GROUP BY Quarter  ORDER BY Quarter LIMIT 6"]}
-{"sql":"SELECT DayofMonth, DaysSinceEpoch FROM mytable WHERE DivWheelsOffs IN (1228, 1812, 1509) OR TaxiIn < 5 ORDER BY TaxiOut, DivArrDelay LIMIT 3","hsqls":["SELECT DayofMonth, DaysSinceEpoch FROM mytable WHERE (DivWheelsOffs__MV0 IN (1228, 1812, 1509) OR DivWheelsOffs__MV1 IN (1228, 1812, 1509) OR DivWheelsOffs__MV2 IN (1228, 1812, 1509) OR DivWheelsOffs__MV3 IN (1228, 1812, 1509) OR DivWheelsOffs__MV4 IN (1228, 1812, 1509)) OR TaxiIn < 5 ORDER BY TaxiOut, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, DaysSinceEpoch FROM mytable WHERE DivWheelsOffs IN (1228, 1812, 1509) OR TaxiIn < 5 ORDER BY TaxiOut, DivArrDelay LIMIT 3","hsqls":["SELECT DayofMonth, DaysSinceEpoch FROM mytable WHERE (DivWheelsOffs[1] IN (1228, 1812, 1509) OR DivWheelsOffs[2] IN (1228, 1812, 1509) OR DivWheelsOffs[3] IN (1228, 1812, 1509) OR DivWheelsOffs[4] IN (1228, 1812, 1509) OR DivWheelsOffs[5] IN (1228, 1812, 1509)) OR TaxiIn < 5 ORDER BY TaxiOut, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE TotalAddGTime BETWEEN 111 AND 27 AND DepDelayMinutes BETWEEN 223.0 AND 86.0 LIMIT 29"}
 {"sql":"SELECT LateAircraftDelay, Carrier, OriginWac, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 21 AND 1225 GROUP BY LateAircraftDelay, Carrier, OriginWac  ORDER BY LateAircraftDelay, Carrier, OriginWac LIMIT 10","hsqls":["SELECT LateAircraftDelay, Carrier, OriginWac, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 21 AND 1225 GROUP BY LateAircraftDelay, Carrier, OriginWac  ORDER BY LateAircraftDelay, Carrier, OriginWac LIMIT 10"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE OriginCityMarketID BETWEEN 33304 AND 35401 AND LateAircraftDelay < 44 AND FlightNum <> 2386 LIMIT 1"}
 {"sql":"SELECT OriginState, Flights, OriginCityName, COUNT(DestStateName) FROM mytable WHERE OriginState BETWEEN 'VA' AND 'CO' AND DestAirportID <> 11278 GROUP BY OriginState, Flights, OriginCityName  ORDER BY OriginState, Flights, OriginCityName LIMIT 8","hsqls":["SELECT OriginState, Flights, OriginCityName, COUNT(DestStateName) FROM mytable WHERE OriginState BETWEEN 'VA' AND 'CO' AND DestAirportID <> 11278 GROUP BY OriginState, Flights, OriginCityName  ORDER BY OriginState, Flights, OriginCityName LIMIT 8"]}
-{"sql":"SELECT ActualElapsedTime, DivAirportSeqIDs, DivTotalGTimes FROM mytable ORDER BY WeatherDelay, Dest LIMIT 14","hsqls":["SELECT ActualElapsedTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY WeatherDelay, Dest LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DivAirportSeqIDs, DivTotalGTimes FROM mytable ORDER BY WeatherDelay, Dest LIMIT 14","hsqls":["SELECT ActualElapsedTime, DivAirportSeqIDs, DivTotalGTimes FROM mytable ORDER BY WeatherDelay, Dest LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DestCityName FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 0 AND FirstDepTime <> 907 ORDER BY DestStateFips LIMIT 8"}
 {"sql":"SELECT WeatherDelay, ArrTimeBlk FROM mytable WHERE OriginState < 'AL' AND ArrivalDelayGroups >= 6 ORDER BY OriginStateFips, LateAircraftDelay, ArrDelay LIMIT 13"}
 {"sql":"SELECT WheelsOff, ActualElapsedTime, NASDelay, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1900-1959' OR ActualElapsedTime IN (394) OR Distance > 1597 GROUP BY WheelsOff, ActualElapsedTime, NASDelay  ORDER BY WheelsOff, ActualElapsedTime, NASDelay LIMIT 24","hsqls":["SELECT WheelsOff, ActualElapsedTime, NASDelay, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1900-1959' OR ActualElapsedTime IN (394) OR Distance > 1597 GROUP BY WheelsOff, ActualElapsedTime, NASDelay  ORDER BY WheelsOff, ActualElapsedTime, NASDelay LIMIT 24"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 4"}
 {"sql":"SELECT OriginStateFips, TotalAddGTime, ArrTimeBlk, COUNT(OriginAirportSeqID), AVG(DepDelayMinutes) FROM mytable GROUP BY OriginStateFips, TotalAddGTime, ArrTimeBlk  ORDER BY OriginStateFips, TotalAddGTime, ArrTimeBlk LIMIT 14","hsqls":["SELECT OriginStateFips, TotalAddGTime, ArrTimeBlk, COUNT(OriginAirportSeqID), AVG(DepDelayMinutes) FROM mytable GROUP BY OriginStateFips, TotalAddGTime, ArrTimeBlk  ORDER BY OriginStateFips, TotalAddGTime, ArrTimeBlk LIMIT 14"]}
-{"sql":"SELECT COUNT(Carrier), COUNT(OriginCityMarketID), SUM(\"Year\") FROM mytable WHERE OriginStateName = 'Hawaii' LIMIT 4","hsqls":["SELECT COUNT(Carrier), COUNT(OriginCityMarketID), SUM(Year) FROM mytable WHERE OriginStateName = 'Hawaii' LIMIT 4"]}
-{"sql":"SELECT DepDelay, DivTotalGTimes FROM mytable WHERE FlightNum NOT IN (3627) OR ArrTime <> 107 LIMIT 22","hsqls":["SELECT DepDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE FlightNum NOT IN (3627) OR ArrTime <> 107 LIMIT 10000"]}
+{"sql":"SELECT COUNT(Carrier), COUNT(OriginCityMarketID), SUM(\"Year\") FROM mytable WHERE OriginStateName = 'Hawaii' LIMIT 4","hsqls":["SELECT COUNT(Carrier), COUNT(OriginCityMarketID), SUM(`Year`) FROM mytable WHERE OriginStateName = 'Hawaii' LIMIT 4"]}
+{"sql":"SELECT DepDelay, DivTotalGTimes FROM mytable WHERE FlightNum NOT IN (3627) OR ArrTime <> 107 LIMIT 22","hsqls":["SELECT DepDelay, DivTotalGTimes FROM mytable WHERE FlightNum NOT IN (3627) OR ArrTime <> 107 LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE DivActualElapsedTime >= 330 AND ActualElapsedTime IN (224, 91, 233, 282) ORDER BY WheelsOff, ActualElapsedTime, OriginStateName LIMIT 16"}
 {"sql":"SELECT AVG(FirstDepTime), COUNT(LongestAddGTime) FROM mytable WHERE Origin <= 'LIT' LIMIT 10"}
 {"sql":"SELECT FlightDate, OriginCityName, ArrTime FROM mytable ORDER BY SecurityDelay LIMIT 2"}
@@ -658,110 +658,110 @@
 {"sql":"SELECT DepTime, DayofMonth, AVG(OriginAirportSeqID), MAX(ArrTime) FROM mytable WHERE OriginCityMarketID BETWEEN 30476 AND 30747 AND DepDelay NOT IN (64.0, 144.0, 118.0, 39.0) OR TaxiIn >= 37 GROUP BY DepTime, DayofMonth","hsqls":["SELECT DepTime, DayofMonth, AVG(OriginAirportSeqID), MAX(ArrTime) FROM mytable WHERE OriginCityMarketID BETWEEN 30476 AND 30747 AND DepDelay NOT IN (64.0, 144.0, 118.0, 39.0) OR TaxiIn >= 37 GROUP BY DepTime, DayofMonth"]}
 {"sql":"SELECT Carrier, AirTime FROM mytable WHERE ArrivalDelayGroups >= 2 ORDER BY TotalAddGTime, DestCityMarketID, UniqueCarrier LIMIT 19"}
 {"sql":"SELECT DivDistance, OriginStateName, SUM(Cancelled), SUM(OriginAirportID), MAX(DayOfWeek) FROM mytable GROUP BY DivDistance, OriginStateName  ORDER BY DivDistance, OriginStateName LIMIT 7","hsqls":["SELECT DivDistance, OriginStateName, SUM(Cancelled), SUM(OriginAirportID), MAX(DayOfWeek) FROM mytable GROUP BY DivDistance, OriginStateName  ORDER BY DivDistance, OriginStateName LIMIT 7"]}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DivAirports IN ('MGM', 'PDX') LIMIT 3","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivAirports__MV0 IN ('MGM', 'PDX') OR DivAirports__MV1 IN ('MGM', 'PDX') OR DivAirports__MV2 IN ('MGM', 'PDX') OR DivAirports__MV3 IN ('MGM', 'PDX') OR DivAirports__MV4 IN ('MGM', 'PDX')) LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DivAirports IN ('MGM', 'PDX') LIMIT 3","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivAirports[1] IN ('MGM', 'PDX') OR DivAirports[2] IN ('MGM', 'PDX') OR DivAirports[3] IN ('MGM', 'PDX') OR DivAirports[4] IN ('MGM', 'PDX') OR DivAirports[5] IN ('MGM', 'PDX')) LIMIT 10000"]}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY FlightNum, SecurityDelay, Cancelled LIMIT 16"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY DivDistance, ArrDelayMinutes, DivAirportLandings LIMIT 12","hsqls":["SELECT Month FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY DivDistance, ArrDelayMinutes, DivAirportLandings LIMIT 12"]}
-{"sql":"SELECT COUNT(\"Month\"), MIN(DepDel15) FROM mytable WHERE DivAirports IN ('CPR', 'SGU', 'SPS', 'PHX') LIMIT 13","hsqls":["SELECT COUNT(Month), MIN(DepDel15) FROM mytable WHERE (DivAirports__MV0 IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports__MV1 IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports__MV2 IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports__MV3 IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports__MV4 IN ('CPR', 'SGU', 'SPS', 'PHX')) LIMIT 10000"]}
-{"sql":"SELECT ArrTimeBlk, SUM(TaxiOut) FROM mytable WHERE DivDistance IN (237) OR CancellationCode BETWEEN 'B' AND 'B' OR DivTotalGTimes > 49 GROUP BY ArrTimeBlk LIMIT 29","hsqls":["SELECT ArrTimeBlk, SUM(TaxiOut) FROM mytable WHERE DivDistance IN (237) OR CancellationCode BETWEEN 'B' AND 'B' OR (DivTotalGTimes__MV0 > 49 OR DivTotalGTimes__MV1 > 49 OR DivTotalGTimes__MV2 > 49 OR DivTotalGTimes__MV3 > 49 OR DivTotalGTimes__MV4 > 49) GROUP BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY DivDistance, ArrDelayMinutes, DivAirportLandings LIMIT 12","hsqls":["SELECT `Month` FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY DivDistance, ArrDelayMinutes, DivAirportLandings LIMIT 12"]}
+{"sql":"SELECT COUNT(\"Month\"), MIN(DepDel15) FROM mytable WHERE DivAirports IN ('CPR', 'SGU', 'SPS', 'PHX') LIMIT 13","hsqls":["SELECT COUNT(`Month`), MIN(DepDel15) FROM mytable WHERE (DivAirports[1] IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports[2] IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports[3] IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports[4] IN ('CPR', 'SGU', 'SPS', 'PHX') OR DivAirports[5] IN ('CPR', 'SGU', 'SPS', 'PHX')) LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, SUM(TaxiOut) FROM mytable WHERE DivDistance IN (237) OR CancellationCode BETWEEN 'B' AND 'B' OR DivTotalGTimes > 49 GROUP BY ArrTimeBlk LIMIT 29","hsqls":["SELECT ArrTimeBlk, SUM(TaxiOut) FROM mytable WHERE DivDistance IN (237) OR CancellationCode BETWEEN 'B' AND 'B' OR (DivTotalGTimes[1] > 49 OR DivTotalGTimes[2] > 49 OR DivTotalGTimes[3] > 49 OR DivTotalGTimes[4] > 49 OR DivTotalGTimes[5] > 49) GROUP BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, DestStateName, DivActualElapsedTime FROM mytable WHERE DestCityName NOT IN ('Minot, ND', 'San Angelo, TX') LIMIT 23"}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE Cancelled >= 1 AND TailNum < 'N37413' AND DestStateName IN ('South Carolina', 'Alaska', 'California', 'Nevada') ORDER BY Dest LIMIT 15"}
 {"sql":"SELECT OriginState FROM mytable WHERE DestCityName NOT IN ('Chattanooga, TN', 'Shreveport, LA', 'Tampa, FL') LIMIT 4"}
-{"sql":"SELECT DistanceGroup FROM mytable WHERE DivLongestGTimes IN (136.0, 92.0, 7.0, 47.0) AND Dest NOT IN ('ISP') OR DestState IN ('IA', 'OK', 'NH') LIMIT 12","hsqls":["SELECT DistanceGroup FROM mytable WHERE (DivLongestGTimes__MV0 IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes__MV1 IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes__MV2 IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes__MV3 IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes__MV4 IN (136.0, 92.0, 7.0, 47.0)) AND Dest NOT IN ('ISP') OR DestState IN ('IA', 'OK', 'NH') LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup FROM mytable WHERE DivLongestGTimes IN (136.0, 92.0, 7.0, 47.0) AND Dest NOT IN ('ISP') OR DestState IN ('IA', 'OK', 'NH') LIMIT 12","hsqls":["SELECT DistanceGroup FROM mytable WHERE (DivLongestGTimes[1] IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes[2] IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes[3] IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes[4] IN (136.0, 92.0, 7.0, 47.0) OR DivLongestGTimes[5] IN (136.0, 92.0, 7.0, 47.0)) AND Dest NOT IN ('ISP') OR DestState IN ('IA', 'OK', 'NH') LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, OriginCityMarketID, DestAirportID FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 OR DepTimeBlk = '0800-0859' AND SecurityDelay <= 1 ORDER BY DepartureDelayGroups, DivReachedDest, ArrivalDelayGroups LIMIT 22"}
 {"sql":"SELECT DivDistance, DivArrDelay FROM mytable WHERE Origin >= 'BGR' AND ArrDel15 IN (1, 0, -9999) OR DestCityName IN ('Williston, ND', 'Memphis, TN', 'Montrose/Delta, CO', 'Washington, DC') ORDER BY DestState, ArrDelay, CRSDepTime LIMIT 11"}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) ORDER BY DestCityMarketID LIMIT 29"}
-{"sql":"SELECT DaysSinceEpoch, MAX(DestAirportID), SUM(DestAirportSeqID), AVG(FirstDepTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1156 AND 1307 AND DepDelayMinutes BETWEEN 18.0 AND 61.0 AND Origin IN ('DAY') GROUP BY DaysSinceEpoch LIMIT 10","hsqls":["SELECT DaysSinceEpoch, MAX(DestAirportID), SUM(DestAirportSeqID), AVG(FirstDepTime) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1156 AND 1307 OR DivWheelsOffs__MV1 BETWEEN 1156 AND 1307 OR DivWheelsOffs__MV2 BETWEEN 1156 AND 1307 OR DivWheelsOffs__MV3 BETWEEN 1156 AND 1307 OR DivWheelsOffs__MV4 BETWEEN 1156 AND 1307) AND DepDelayMinutes BETWEEN 18.0 AND 61.0 AND Origin IN ('DAY') GROUP BY DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DaysSinceEpoch, MAX(DestAirportID), SUM(DestAirportSeqID), AVG(FirstDepTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1156 AND 1307 AND DepDelayMinutes BETWEEN 18.0 AND 61.0 AND Origin IN ('DAY') GROUP BY DaysSinceEpoch LIMIT 10","hsqls":["SELECT DaysSinceEpoch, MAX(DestAirportID), SUM(DestAirportSeqID), AVG(FirstDepTime) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1156 AND 1307 OR DivWheelsOffs[2] BETWEEN 1156 AND 1307 OR DivWheelsOffs[3] BETWEEN 1156 AND 1307 OR DivWheelsOffs[4] BETWEEN 1156 AND 1307 OR DivWheelsOffs[5] BETWEEN 1156 AND 1307) AND DepDelayMinutes BETWEEN 18.0 AND 61.0 AND Origin IN ('DAY') GROUP BY DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT MAX(DestCityMarketID) FROM mytable WHERE DestState IN ('CA', 'IN', 'VA', 'KS', 'MA') OR DestStateName = 'Georgia' OR DestAirportID IN (13158, 11540, 12888, 10785, 15624) LIMIT 10"}
 {"sql":"SELECT Origin, CRSDepTime FROM mytable WHERE CRSElapsedTime IN (299, 39) OR Dest NOT IN ('ABI', 'SRQ') LIMIT 26"}
 {"sql":"SELECT AVG(FlightNum), COUNT(CRSArrTime) FROM mytable WHERE Cancelled <> 0 OR OriginCityName BETWEEN 'Charleston, SC' AND 'Hartford, CT' OR OriginState BETWEEN 'OH' AND 'ME' LIMIT 14"}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivAirportSeqIDs IN (1219102, 1348502, 1306104) ORDER BY DestStateFips, ArrTime LIMIT 5","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs__MV1 IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs__MV2 IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs__MV3 IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs__MV4 IN (1219102, 1348502, 1306104)) ORDER BY DestStateFips, ArrTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivAirportSeqIDs IN (1219102, 1348502, 1306104) ORDER BY DestStateFips, ArrTime LIMIT 5","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE (DivAirportSeqIDs[1] IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs[2] IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs[3] IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs[4] IN (1219102, 1348502, 1306104) OR DivAirportSeqIDs[5] IN (1219102, 1348502, 1306104)) ORDER BY DestStateFips, ArrTime LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, DestState, CRSDepTime, AVG(NASDelay), MIN(NASDelay), MAX(AirTime) FROM mytable GROUP BY WheelsOff, DestState, CRSDepTime  ORDER BY WheelsOff, DestState, CRSDepTime LIMIT 22","hsqls":["SELECT WheelsOff, DestState, CRSDepTime, AVG(NASDelay), MIN(NASDelay), MAX(AirTime) FROM mytable GROUP BY WheelsOff, DestState, CRSDepTime  ORDER BY WheelsOff, DestState, CRSDepTime LIMIT 22"]}
 {"sql":"SELECT DestWac, Dest, COUNT(*) FROM mytable WHERE LateAircraftDelay < 98 OR Cancelled BETWEEN 1 AND 1 GROUP BY DestWac, Dest  ORDER BY DestWac, Dest LIMIT 9","hsqls":["SELECT DestWac, Dest, COUNT(*) FROM mytable WHERE LateAircraftDelay < 98 OR Cancelled BETWEEN 1 AND 1 GROUP BY DestWac, Dest  ORDER BY DestWac, Dest LIMIT 9"]}
-{"sql":"SELECT ArrDelayMinutes, \"Month\", OriginAirportID FROM mytable WHERE DivTailNums BETWEEN 'N8617E' AND 'N592JB' OR CRSArrTime BETWEEN 2314 AND 839 ORDER BY WeatherDelay, ArrTimeBlk LIMIT 22","hsqls":["SELECT ArrDelayMinutes, Month, OriginAirportID FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums__MV1 BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums__MV2 BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums__MV3 BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums__MV4 BETWEEN 'N8617E' AND 'N592JB') OR CRSArrTime BETWEEN 2314 AND 839 ORDER BY WeatherDelay, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, \"Month\", OriginAirportID FROM mytable WHERE DivTailNums BETWEEN 'N8617E' AND 'N592JB' OR CRSArrTime BETWEEN 2314 AND 839 ORDER BY WeatherDelay, ArrTimeBlk LIMIT 22","hsqls":["SELECT ArrDelayMinutes, Month, OriginAirportID FROM mytable WHERE (DivTailNums[1] BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums[2] BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums[3] BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums[4] BETWEEN 'N8617E' AND 'N592JB' OR DivTailNums[5] BETWEEN 'N8617E' AND 'N592JB') OR CRSArrTime BETWEEN 2314 AND 839 ORDER BY WeatherDelay, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, SecurityDelay, COUNT(CancellationCode), MAX(DayofMonth) FROM mytable WHERE DepartureDelayGroups <> -9999 GROUP BY DepartureDelayGroups, SecurityDelay  ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 27","hsqls":["SELECT DepartureDelayGroups, SecurityDelay, COUNT(CancellationCode), MAX(DayofMonth) FROM mytable WHERE DepartureDelayGroups <> -9999 GROUP BY DepartureDelayGroups, SecurityDelay  ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 27"]}
 {"sql":"SELECT SUM(DivAirportLandings), AVG(ArrivalDelayGroups), COUNT(WeatherDelay) FROM mytable WHERE AirlineID IN (20304, 20436, 21171) OR Dest BETWEEN 'ASE' AND 'STX' OR OriginAirportID < 10747 LIMIT 10"}
 {"sql":"SELECT OriginCityMarketID, LongestAddGTime FROM mytable WHERE OriginStateName BETWEEN 'U.S. Virgin Islands' AND 'New Mexico' AND ArrDel15 = -9999 ORDER BY FlightDate, TaxiIn LIMIT 25"}
-{"sql":"SELECT UniqueCarrier FROM mytable WHERE DivTotalGTimes BETWEEN 84 AND 50 OR OriginStateName IN ('Missouri') ORDER BY WheelsOff, DepTimeBlk LIMIT 26","hsqls":["SELECT UniqueCarrier FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 84 AND 50 OR DivTotalGTimes__MV1 BETWEEN 84 AND 50 OR DivTotalGTimes__MV2 BETWEEN 84 AND 50 OR DivTotalGTimes__MV3 BETWEEN 84 AND 50 OR DivTotalGTimes__MV4 BETWEEN 84 AND 50) OR OriginStateName IN ('Missouri') ORDER BY WheelsOff, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier FROM mytable WHERE DivTotalGTimes BETWEEN 84 AND 50 OR OriginStateName IN ('Missouri') ORDER BY WheelsOff, DepTimeBlk LIMIT 26","hsqls":["SELECT UniqueCarrier FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 84 AND 50 OR DivTotalGTimes[2] BETWEEN 84 AND 50 OR DivTotalGTimes[3] BETWEEN 84 AND 50 OR DivTotalGTimes[4] BETWEEN 84 AND 50 OR DivTotalGTimes[5] BETWEEN 84 AND 50) OR OriginStateName IN ('Missouri') ORDER BY WheelsOff, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, COUNT(*) FROM mytable GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 21","hsqls":["SELECT DistanceGroup, COUNT(*) FROM mytable GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 21"]}
-{"sql":"SELECT LongestAddGTime, CRSDepTime, AVG(DivActualElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 109 AND 2247 AND \"Year\" NOT IN (2014) AND ArrDel15 <= -9999 GROUP BY LongestAddGTime, CRSDepTime LIMIT 14","hsqls":["SELECT LongestAddGTime, CRSDepTime, AVG(CAST(DivActualElapsedTime AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 109 AND 2247 OR DivWheelsOffs__MV1 BETWEEN 109 AND 2247 OR DivWheelsOffs__MV2 BETWEEN 109 AND 2247 OR DivWheelsOffs__MV3 BETWEEN 109 AND 2247 OR DivWheelsOffs__MV4 BETWEEN 109 AND 2247) AND Year NOT IN (2014) AND ArrDel15 <= -9999 GROUP BY LongestAddGTime, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, CRSDepTime, AVG(DivActualElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 109 AND 2247 AND \"Year\" NOT IN (2014) AND ArrDel15 <= -9999 GROUP BY LongestAddGTime, CRSDepTime LIMIT 14","hsqls":["SELECT LongestAddGTime, CRSDepTime, AVG(CAST(DivActualElapsedTime AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 109 AND 2247 OR DivWheelsOffs[2] BETWEEN 109 AND 2247 OR DivWheelsOffs[3] BETWEEN 109 AND 2247 OR DivWheelsOffs[4] BETWEEN 109 AND 2247 OR DivWheelsOffs[5] BETWEEN 109 AND 2247) AND `Year` NOT IN (2014) AND ArrDel15 <= -9999 GROUP BY LongestAddGTime, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT AVG(DivDistance), MAX(Diverted) FROM mytable WHERE DepTime BETWEEN 1531 AND 2048 LIMIT 10"}
 {"sql":"SELECT Cancelled, NASDelay FROM mytable ORDER BY Dest LIMIT 21"}
 {"sql":"SELECT Diverted, WeatherDelay, ActualElapsedTime FROM mytable ORDER BY DepTimeBlk, DivArrDelay LIMIT 11"}
 {"sql":"SELECT Dest FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR OriginWac <= 16 OR OriginAirportSeqID >= 1062002 LIMIT 7"}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE Origin NOT IN ('MRY', 'ICT', 'GSP') OR DivTailNums BETWEEN 'N956AT' AND 'N374JB' AND DivAirports BETWEEN 'ABE' AND 'GSP' ORDER BY DepTime, DestAirportSeqID, DepDel15 LIMIT 12","hsqls":["SELECT WeatherDelay FROM mytable WHERE Origin NOT IN ('MRY', 'ICT', 'GSP') OR (DivTailNums__MV0 BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums__MV1 BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums__MV2 BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums__MV3 BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums__MV4 BETWEEN 'N956AT' AND 'N374JB') AND (DivAirports__MV0 BETWEEN 'ABE' AND 'GSP' OR DivAirports__MV1 BETWEEN 'ABE' AND 'GSP' OR DivAirports__MV2 BETWEEN 'ABE' AND 'GSP' OR DivAirports__MV3 BETWEEN 'ABE' AND 'GSP' OR DivAirports__MV4 BETWEEN 'ABE' AND 'GSP') ORDER BY DepTime, DestAirportSeqID, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE Origin NOT IN ('MRY', 'ICT', 'GSP') OR DivTailNums BETWEEN 'N956AT' AND 'N374JB' AND DivAirports BETWEEN 'ABE' AND 'GSP' ORDER BY DepTime, DestAirportSeqID, DepDel15 LIMIT 12","hsqls":["SELECT WeatherDelay FROM mytable WHERE Origin NOT IN ('MRY', 'ICT', 'GSP') OR (DivTailNums[1] BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums[2] BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums[3] BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums[4] BETWEEN 'N956AT' AND 'N374JB' OR DivTailNums[5] BETWEEN 'N956AT' AND 'N374JB') AND (DivAirports[1] BETWEEN 'ABE' AND 'GSP' OR DivAirports[2] BETWEEN 'ABE' AND 'GSP' OR DivAirports[3] BETWEEN 'ABE' AND 'GSP' OR DivAirports[4] BETWEEN 'ABE' AND 'GSP' OR DivAirports[5] BETWEEN 'ABE' AND 'GSP') ORDER BY DepTime, DestAirportSeqID, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, ActualElapsedTime, DayOfWeek, MAX(LongestAddGTime), MAX(DivActualElapsedTime) FROM mytable WHERE DestStateName IN ('Wyoming', 'Virginia', 'Hawaii', 'Alabama', 'Iowa') AND CRSArrTime NOT IN (1401, 1025) GROUP BY TaxiOut, ActualElapsedTime, DayOfWeek  ORDER BY TaxiOut, ActualElapsedTime, DayOfWeek LIMIT 8","hsqls":["SELECT TaxiOut, ActualElapsedTime, DayOfWeek, MAX(LongestAddGTime), MAX(DivActualElapsedTime) FROM mytable WHERE DestStateName IN ('Wyoming', 'Virginia', 'Hawaii', 'Alabama', 'Iowa') AND CRSArrTime NOT IN (1401, 1025) GROUP BY TaxiOut, ActualElapsedTime, DayOfWeek  ORDER BY TaxiOut, ActualElapsedTime, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT DestWac, OriginState, MIN(Flights) FROM mytable GROUP BY DestWac, OriginState  ORDER BY DestWac, OriginState LIMIT 17","hsqls":["SELECT DestWac, OriginState, MIN(Flights) FROM mytable GROUP BY DestWac, OriginState  ORDER BY DestWac, OriginState LIMIT 17"]}
 {"sql":"SELECT CRSDepTime FROM mytable ORDER BY Cancelled, OriginWac LIMIT 6"}
-{"sql":"SELECT OriginAirportSeqID, TaxiOut, DivAirports FROM mytable ORDER BY OriginStateFips, DepTimeBlk LIMIT 8","hsqls":["SELECT OriginAirportSeqID, TaxiOut, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY OriginStateFips, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, TaxiOut, DivAirports FROM mytable ORDER BY OriginStateFips, DepTimeBlk LIMIT 8","hsqls":["SELECT OriginAirportSeqID, TaxiOut, DivAirports FROM mytable ORDER BY OriginStateFips, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DestCityMarketID FROM mytable WHERE NASDelay < 37 OR DepTime >= 1503 OR ArrTime BETWEEN 757 AND 1112 ORDER BY ArrDel15 LIMIT 27"}
 {"sql":"SELECT Carrier, OriginCityName, DayOfWeek FROM mytable WHERE WeatherDelay > 198 LIMIT 20"}
 {"sql":"SELECT LateAircraftDelay, Flights, LongestAddGTime, SUM(ArrDel15), AVG(ArrivalDelayGroups), COUNT(DepTime) FROM mytable WHERE TailNum BETWEEN 'N15527' AND 'N531JB' AND OriginWac IN (5, 35, 22, 73, 13) GROUP BY LateAircraftDelay, Flights, LongestAddGTime  ORDER BY LateAircraftDelay, Flights, LongestAddGTime LIMIT 14","hsqls":["SELECT LateAircraftDelay, Flights, LongestAddGTime, SUM(ArrDel15), AVG(ArrivalDelayGroups), COUNT(DepTime) FROM mytable WHERE TailNum BETWEEN 'N15527' AND 'N531JB' AND OriginWac IN (5, 35, 22, 73, 13) GROUP BY LateAircraftDelay, Flights, LongestAddGTime  ORDER BY LateAircraftDelay, Flights, LongestAddGTime LIMIT 14"]}
-{"sql":"SELECT DivAirportLandings, WheelsOn FROM mytable WHERE ArrDelayMinutes BETWEEN 237.0 AND 269.0 AND DepTime >= 108 OR NASDelay BETWEEN 113 AND 40 ORDER BY \"Year\" LIMIT 6","hsqls":["SELECT DivAirportLandings, WheelsOn FROM mytable WHERE ArrDelayMinutes BETWEEN 237.0 AND 269.0 AND DepTime >= 108 OR NASDelay BETWEEN 113 AND 40 ORDER BY Year LIMIT 6"]}
-{"sql":"SELECT MIN(DivDistance), MIN(CarrierDelay), SUM(DepDelay) FROM mytable WHERE DivTotalGTimes = 47 LIMIT 9","hsqls":["SELECT MIN(DivDistance), MIN(CarrierDelay), SUM(DepDelay)  FROM mytable WHERE (DivTotalGTimes__MV0 = 47 OR DivTotalGTimes__MV1 = 47 OR DivTotalGTimes__MV2 = 47 OR DivTotalGTimes__MV3 = 47 OR DivTotalGTimes__MV4 = 47) LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, WheelsOn FROM mytable WHERE ArrDelayMinutes BETWEEN 237.0 AND 269.0 AND DepTime >= 108 OR NASDelay BETWEEN 113 AND 40 ORDER BY \"Year\" LIMIT 6","hsqls":["SELECT DivAirportLandings, WheelsOn FROM mytable WHERE ArrDelayMinutes BETWEEN 237.0 AND 269.0 AND DepTime >= 108 OR NASDelay BETWEEN 113 AND 40 ORDER BY `Year` LIMIT 6"]}
+{"sql":"SELECT MIN(DivDistance), MIN(CarrierDelay), SUM(DepDelay) FROM mytable WHERE DivTotalGTimes = 47 LIMIT 9","hsqls":["SELECT MIN(DivDistance), MIN(CarrierDelay), SUM(DepDelay)  FROM mytable WHERE (DivTotalGTimes[1] = 47 OR DivTotalGTimes[2] = 47 OR DivTotalGTimes[3] = 47 OR DivTotalGTimes[4] = 47 OR DivTotalGTimes[5] = 47) LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginWac), MAX(Diverted) FROM mytable"}
 {"sql":"SELECT DepTime, DestAirportID FROM mytable WHERE WheelsOn BETWEEN 1528 AND 1608 OR DestCityMarketID NOT IN (30647, 32441) LIMIT 18"}
-{"sql":"SELECT DepartureDelayGroups, TaxiOut, SecurityDelay FROM mytable WHERE OriginStateName IN ('Arizona', 'Wisconsin', 'Florida') AND DivTailNums IN ('N13994') ORDER BY TaxiOut, DestCityMarketID LIMIT 13","hsqls":["SELECT DepartureDelayGroups, TaxiOut, SecurityDelay FROM mytable WHERE OriginStateName IN ('Arizona', 'Wisconsin', 'Florida') AND (DivTailNums__MV0 IN ('N13994') OR DivTailNums__MV1 IN ('N13994') OR DivTailNums__MV2 IN ('N13994') OR DivTailNums__MV3 IN ('N13994') OR DivTailNums__MV4 IN ('N13994')) ORDER BY TaxiOut, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, TaxiOut, SecurityDelay FROM mytable WHERE OriginStateName IN ('Arizona', 'Wisconsin', 'Florida') AND DivTailNums IN ('N13994') ORDER BY TaxiOut, DestCityMarketID LIMIT 13","hsqls":["SELECT DepartureDelayGroups, TaxiOut, SecurityDelay FROM mytable WHERE OriginStateName IN ('Arizona', 'Wisconsin', 'Florida') AND (DivTailNums[1] IN ('N13994') OR DivTailNums[2] IN ('N13994') OR DivTailNums[3] IN ('N13994') OR DivTailNums[4] IN ('N13994') OR DivTailNums[5] IN ('N13994')) ORDER BY TaxiOut, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE Origin = 'FCA' OR CRSArrTime BETWEEN 1521 AND 2305 ORDER BY DivDistance LIMIT 29"}
 {"sql":"SELECT Cancelled, DepDel15, UniqueCarrier FROM mytable WHERE DaysSinceEpoch NOT IN (16100) AND ArrTimeBlk IN ('2200-2259', '1900-1959') LIMIT 16"}
 {"sql":"SELECT Distance, Dest, DepDel15 FROM mytable WHERE LateAircraftDelay > 59 OR OriginCityName > 'El Paso, TX' ORDER BY FlightDate, AirlineID LIMIT 16"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 20"}
-{"sql":"SELECT Flights, MAX(ArrDelay), MIN(DestCityMarketID), MIN(DestAirportSeqID) FROM mytable WHERE DivAirportSeqIDs >= 1219102 AND DepDelay NOT IN (123.0) GROUP BY Flights LIMIT 13","hsqls":["SELECT Flights, MAX(ArrDelay), MIN(DestCityMarketID), MIN(DestAirportSeqID) FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1219102 OR DivAirportSeqIDs__MV1 >= 1219102 OR DivAirportSeqIDs__MV2 >= 1219102 OR DivAirportSeqIDs__MV3 >= 1219102 OR DivAirportSeqIDs__MV4 >= 1219102) AND DepDelay NOT IN (123.0) GROUP BY Flights LIMIT 10000"]}
+{"sql":"SELECT Flights, MAX(ArrDelay), MIN(DestCityMarketID), MIN(DestAirportSeqID) FROM mytable WHERE DivAirportSeqIDs >= 1219102 AND DepDelay NOT IN (123.0) GROUP BY Flights LIMIT 13","hsqls":["SELECT Flights, MAX(ArrDelay), MIN(DestCityMarketID), MIN(DestAirportSeqID) FROM mytable WHERE (DivAirportSeqIDs[1] >= 1219102 OR DivAirportSeqIDs[2] >= 1219102 OR DivAirportSeqIDs[3] >= 1219102 OR DivAirportSeqIDs[4] >= 1219102 OR DivAirportSeqIDs[5] >= 1219102) AND DepDelay NOT IN (123.0) GROUP BY Flights LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DivActualElapsedTime, OriginAirportID, MIN(TotalAddGTime) FROM mytable GROUP BY \"Year\", DivActualElapsedTime, OriginAirportID LIMIT 8","hsqls":["SELECT Year, DivActualElapsedTime, OriginAirportID, MIN(TotalAddGTime) FROM mytable GROUP BY Year, DivActualElapsedTime, OriginAirportID LIMIT 8"]}
 {"sql":"SELECT NASDelay, DestCityMarketID, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-28' AND '2014-01-08' GROUP BY NASDelay, DestCityMarketID  ORDER BY NASDelay, DestCityMarketID LIMIT 9","hsqls":["SELECT NASDelay, DestCityMarketID, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-28' AND '2014-01-08' GROUP BY NASDelay, DestCityMarketID  ORDER BY NASDelay, DestCityMarketID LIMIT 9"]}
-{"sql":"SELECT Flights FROM mytable WHERE OriginStateName NOT IN ('Colorado', 'Massachusetts') AND DivLongestGTimes IN (102.0, 80.0) ORDER BY OriginState, OriginCityName LIMIT 9","hsqls":["SELECT Flights FROM mytable WHERE OriginStateName NOT IN ('Colorado', 'Massachusetts') AND (DivLongestGTimes__MV0 IN (102.0, 80.0) OR DivLongestGTimes__MV1 IN (102.0, 80.0) OR DivLongestGTimes__MV2 IN (102.0, 80.0) OR DivLongestGTimes__MV3 IN (102.0, 80.0) OR DivLongestGTimes__MV4 IN (102.0, 80.0)) ORDER BY OriginState, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE OriginStateName NOT IN ('Colorado', 'Massachusetts') AND DivLongestGTimes IN (102.0, 80.0) ORDER BY OriginState, OriginCityName LIMIT 9","hsqls":["SELECT Flights FROM mytable WHERE OriginStateName NOT IN ('Colorado', 'Massachusetts') AND (DivLongestGTimes[1] IN (102.0, 80.0) OR DivLongestGTimes[2] IN (102.0, 80.0) OR DivLongestGTimes[3] IN (102.0, 80.0) OR DivLongestGTimes[4] IN (102.0, 80.0) OR DivLongestGTimes[5] IN (102.0, 80.0)) ORDER BY OriginState, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, DestAirportID FROM mytable WHERE ArrDelay <> 125.0 OR OriginState BETWEEN 'UT' AND 'IN' ORDER BY TotalAddGTime, DestCityMarketID LIMIT 9"}
 {"sql":"SELECT Quarter, DivActualElapsedTime FROM mytable WHERE WeatherDelay NOT IN (166) OR OriginStateFips BETWEEN 27 AND 36 OR DepDelayMinutes <> 212.0 LIMIT 20"}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE TailNum IN ('N684DA', 'N299WN', 'N765US', 'N5CCAA', 'N12924') ORDER BY LongestAddGTime, DepTime, DestStateName LIMIT 22"}
-{"sql":"SELECT \"Year\", MAX(OriginAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 31695 GROUP BY \"Year\" LIMIT 1","hsqls":["SELECT Year, MAX(OriginAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 31695 GROUP BY Year LIMIT 1"]}
+{"sql":"SELECT \"Year\", MAX(OriginAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 31695 GROUP BY \"Year\" LIMIT 1","hsqls":["SELECT Year, MAX(OriginAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 31695 GROUP BY `Year` LIMIT 1"]}
 {"sql":"SELECT DivDistance, DestStateFips FROM mytable WHERE Origin BETWEEN 'SGF' AND 'LAR' AND FlightNum <> 1855 ORDER BY WheelsOn, UniqueCarrier LIMIT 4"}
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE Distance <= 1849 OR OriginAirportSeqID IN (1244805, 1198202) ORDER BY CarrierDelay LIMIT 18"}
 {"sql":"SELECT DestWac, DivDistance, ArrTimeBlk FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'noodles' AND AirTime BETWEEN 271 AND 442 ORDER BY Flights, WeatherDelay, DestStateName"}
 {"sql":"SELECT OriginStateFips, Carrier, DestCityMarketID, COUNT(WheelsOff), MAX(Cancelled), MAX(Distance) FROM mytable WHERE CarrierDelay NOT IN (455) GROUP BY OriginStateFips, Carrier, DestCityMarketID  ORDER BY OriginStateFips, Carrier, DestCityMarketID LIMIT 26","hsqls":["SELECT OriginStateFips, Carrier, DestCityMarketID, COUNT(WheelsOff), MAX(Cancelled), MAX(Distance) FROM mytable WHERE CarrierDelay NOT IN (455) GROUP BY OriginStateFips, Carrier, DestCityMarketID  ORDER BY OriginStateFips, Carrier, DestCityMarketID LIMIT 26"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE ArrTime BETWEEN 113 AND 1749 AND DepDelayMinutes BETWEEN 179.0 AND 644.0 ORDER BY FlightDate, DivArrDelay LIMIT 14","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE ArrTime BETWEEN 113 AND 1749 AND DepDelayMinutes BETWEEN 179.0 AND 644.0 ORDER BY FlightDate, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT CancellationCode FROM mytable WHERE DivTailNums BETWEEN 'N882AS' AND 'N614QX' OR LateAircraftDelay IN (35) AND DivArrDelay BETWEEN 331 AND 133 ORDER BY OriginCityMarketID, Distance, DestAirportSeqID LIMIT 21","hsqls":["SELECT CancellationCode FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums__MV1 BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums__MV2 BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums__MV3 BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums__MV4 BETWEEN 'N882AS' AND 'N614QX') OR LateAircraftDelay IN (35) AND DivArrDelay BETWEEN 331 AND 133 ORDER BY OriginCityMarketID, Distance, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE ArrTime BETWEEN 113 AND 1749 AND DepDelayMinutes BETWEEN 179.0 AND 644.0 ORDER BY FlightDate, DivArrDelay LIMIT 14","hsqls":["SELECT DivTailNums FROM mytable WHERE ArrTime BETWEEN 113 AND 1749 AND DepDelayMinutes BETWEEN 179.0 AND 644.0 ORDER BY FlightDate, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT CancellationCode FROM mytable WHERE DivTailNums BETWEEN 'N882AS' AND 'N614QX' OR LateAircraftDelay IN (35) AND DivArrDelay BETWEEN 331 AND 133 ORDER BY OriginCityMarketID, Distance, DestAirportSeqID LIMIT 21","hsqls":["SELECT CancellationCode FROM mytable WHERE (DivTailNums[1] BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums[2] BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums[3] BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums[4] BETWEEN 'N882AS' AND 'N614QX' OR DivTailNums[5] BETWEEN 'N882AS' AND 'N614QX') OR LateAircraftDelay IN (35) AND DivArrDelay BETWEEN 331 AND 133 ORDER BY OriginCityMarketID, Distance, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable WHERE DestAirportID <> 12915 LIMIT 16"}
-{"sql":"SELECT FlightDate FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1300-1359', '1800-1859') OR DivTotalGTimes = 87 OR TotalAddGTime <> 30 ORDER BY OriginCityMarketID, DepDelayMinutes, CRSDepTime LIMIT 24","hsqls":["SELECT FlightDate FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1300-1359', '1800-1859') OR (DivTotalGTimes__MV0 = 87 OR DivTotalGTimes__MV1 = 87 OR DivTotalGTimes__MV2 = 87 OR DivTotalGTimes__MV3 = 87 OR DivTotalGTimes__MV4 = 87) OR TotalAddGTime <> 30 ORDER BY OriginCityMarketID, DepDelayMinutes, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1300-1359', '1800-1859') OR DivTotalGTimes = 87 OR TotalAddGTime <> 30 ORDER BY OriginCityMarketID, DepDelayMinutes, CRSDepTime LIMIT 24","hsqls":["SELECT FlightDate FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1300-1359', '1800-1859') OR (DivTotalGTimes[1] = 87 OR DivTotalGTimes[2] = 87 OR DivTotalGTimes[3] = 87 OR DivTotalGTimes[4] = 87 OR DivTotalGTimes[5] = 87) OR TotalAddGTime <> 30 ORDER BY OriginCityMarketID, DepDelayMinutes, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DestAirportID, UniqueCarrier, COUNT(*) FROM mytable GROUP BY Cancelled, DestAirportID, UniqueCarrier  ORDER BY Cancelled, DestAirportID, UniqueCarrier LIMIT 10","hsqls":["SELECT Cancelled, DestAirportID, UniqueCarrier, COUNT(*) FROM mytable GROUP BY Cancelled, DestAirportID, UniqueCarrier  ORDER BY Cancelled, DestAirportID, UniqueCarrier LIMIT 10"]}
-{"sql":"SELECT \"Month\" FROM mytable ORDER BY Carrier, DestStateName, DepTimeBlk LIMIT 5","hsqls":["SELECT Month FROM mytable ORDER BY Carrier, DestStateName, DepTimeBlk LIMIT 5"]}
+{"sql":"SELECT \"Month\" FROM mytable ORDER BY Carrier, DestStateName, DepTimeBlk LIMIT 5","hsqls":["SELECT `Month` FROM mytable ORDER BY Carrier, DestStateName, DepTimeBlk LIMIT 5"]}
 {"sql":"SELECT OriginState, ArrDelay, AVG(DaysSinceEpoch) FROM mytable WHERE Distance IN (1447, 851, 627, 2465, 255) AND DestState <> 'WV' AND DestWac BETWEEN 92 AND 64 GROUP BY OriginState, ArrDelay  ORDER BY OriginState, ArrDelay LIMIT 26","hsqls":["SELECT OriginState, ArrDelay, AVG(DaysSinceEpoch) FROM mytable WHERE Distance IN (1447, 851, 627, 2465, 255) AND DestState <> 'WV' AND DestWac BETWEEN 92 AND 64 GROUP BY OriginState, ArrDelay  ORDER BY OriginState, ArrDelay LIMIT 26"]}
 {"sql":"SELECT OriginAirportSeqID, DistanceGroup, DestWac FROM mytable LIMIT 8"}
-{"sql":"SELECT DivTailNums, TailNum, AirlineID FROM mytable WHERE DestAirportID IN (10170, 14524, 15070, 10693, 12819) OR OriginCityName NOT IN ('Barrow, AK', 'Fort Wayne, IN', 'Portland, OR', 'Wilmington, DE', 'Bozeman, MT') OR SecurityDelay BETWEEN 1 AND 27 LIMIT 14","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, TailNum, AirlineID FROM mytable WHERE DestAirportID IN (10170, 14524, 15070, 10693, 12819) OR OriginCityName NOT IN ('Barrow, AK', 'Fort Wayne, IN', 'Portland, OR', 'Wilmington, DE', 'Bozeman, MT') OR SecurityDelay BETWEEN 1 AND 27 LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, TailNum, AirlineID FROM mytable WHERE DestAirportID IN (10170, 14524, 15070, 10693, 12819) OR OriginCityName NOT IN ('Barrow, AK', 'Fort Wayne, IN', 'Portland, OR', 'Wilmington, DE', 'Bozeman, MT') OR SecurityDelay BETWEEN 1 AND 27 LIMIT 14","hsqls":["SELECT DivTailNums, TailNum, AirlineID FROM mytable WHERE DestAirportID IN (10170, 14524, 15070, 10693, 12819) OR OriginCityName NOT IN ('Barrow, AK', 'Fort Wayne, IN', 'Portland, OR', 'Wilmington, DE', 'Bozeman, MT') OR SecurityDelay BETWEEN 1 AND 27 LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, OriginWac FROM mytable WHERE SecurityDelay < 4 AND WheelsOff NOT IN (2003, 2011) LIMIT 25"}
 {"sql":"SELECT ArrDelay FROM mytable ORDER BY ArrDelay LIMIT 15"}
-{"sql":"SELECT Carrier, SecurityDelay FROM mytable WHERE \"Year\" NOT IN (2014) OR LongestAddGTime NOT IN (2, 78, 74) ORDER BY WheelsOff, OriginStateName, OriginAirportID LIMIT 20","hsqls":["SELECT Carrier, SecurityDelay FROM mytable WHERE Year NOT IN (2014) OR LongestAddGTime NOT IN (2, 78, 74) ORDER BY WheelsOff, OriginStateName, OriginAirportID LIMIT 20"]}
+{"sql":"SELECT Carrier, SecurityDelay FROM mytable WHERE \"Year\" NOT IN (2014) OR LongestAddGTime NOT IN (2, 78, 74) ORDER BY WheelsOff, OriginStateName, OriginAirportID LIMIT 20","hsqls":["SELECT Carrier, SecurityDelay FROM mytable WHERE `Year` NOT IN (2014) OR LongestAddGTime NOT IN (2, 78, 74) ORDER BY WheelsOff, OriginStateName, OriginAirportID LIMIT 20"]}
 {"sql":"SELECT OriginCityName, DestStateName, MIN(DepTime), AVG(DivAirportLandings) FROM mytable WHERE AirlineID NOT IN (19690) OR OriginCityMarketID >= 31921 OR ActualElapsedTime NOT IN (240, 340, 35, 73) GROUP BY OriginCityName, DestStateName  ORDER BY OriginCityName, DestStateName LIMIT 29","hsqls":["SELECT OriginCityName, DestStateName, MIN(DepTime), AVG(DivAirportLandings) FROM mytable WHERE AirlineID NOT IN (19690) OR OriginCityMarketID >= 31921 OR ActualElapsedTime NOT IN (240, 340, 35, 73) GROUP BY OriginCityName, DestStateName  ORDER BY OriginCityName, DestStateName LIMIT 29"]}
 {"sql":"SELECT Distance, COUNT(DepDelay) FROM mytable WHERE ArrivalDelayGroups NOT IN (10) GROUP BY Distance  ORDER BY Distance LIMIT 28","hsqls":["SELECT Distance, COUNT(DepDelay) FROM mytable WHERE ArrivalDelayGroups NOT IN (10) GROUP BY Distance  ORDER BY Distance LIMIT 28"]}
-{"sql":"SELECT Dest, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 8 AND OriginStateName BETWEEN 'Idaho' AND 'U.S. Pacific Trust Territories and Possessions' AND DivAirports IN ('MLI') LIMIT 5","hsqls":["SELECT Dest, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 8 AND OriginStateName BETWEEN 'Idaho' AND 'U.S. Pacific Trust Territories and Possessions' AND (DivAirports__MV0 IN ('MLI') OR DivAirports__MV1 IN ('MLI') OR DivAirports__MV2 IN ('MLI') OR DivAirports__MV3 IN ('MLI') OR DivAirports__MV4 IN ('MLI')) LIMIT 10000"]}
-{"sql":"SELECT SecurityDelay, ArrDel15 FROM mytable WHERE DivTotalGTimes BETWEEN 9 AND 121 OR Distance <> 576 ORDER BY DayOfWeek LIMIT 19","hsqls":["SELECT SecurityDelay, ArrDel15 FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 9 AND 121 OR DivTotalGTimes__MV1 BETWEEN 9 AND 121 OR DivTotalGTimes__MV2 BETWEEN 9 AND 121 OR DivTotalGTimes__MV3 BETWEEN 9 AND 121 OR DivTotalGTimes__MV4 BETWEEN 9 AND 121) OR Distance <> 576 ORDER BY DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT DestState, \"Month\" FROM mytable LIMIT 17","hsqls":["SELECT DestState, Month FROM mytable LIMIT 17"]}
-{"sql":"SELECT OriginWac, MIN(Diverted), AVG(ActualElapsedTime), MAX(\"Month\") FROM mytable WHERE Origin BETWEEN 'ROA' AND 'BIL' AND DestAirportSeqID NOT IN (1315802, 1329604) OR Dest >= 'ISN' GROUP BY OriginWac LIMIT 4","hsqls":["SELECT OriginWac, MIN(Diverted), AVG(ActualElapsedTime), MAX(Month) FROM mytable WHERE Origin BETWEEN 'ROA' AND 'BIL' AND DestAirportSeqID NOT IN (1315802, 1329604) OR Dest >= 'ISN' GROUP BY OriginWac LIMIT 4"]}
+{"sql":"SELECT Dest, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 8 AND OriginStateName BETWEEN 'Idaho' AND 'U.S. Pacific Trust Territories and Possessions' AND DivAirports IN ('MLI') LIMIT 5","hsqls":["SELECT Dest, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 8 AND OriginStateName BETWEEN 'Idaho' AND 'U.S. Pacific Trust Territories and Possessions' AND (DivAirports[1] IN ('MLI') OR DivAirports[2] IN ('MLI') OR DivAirports[3] IN ('MLI') OR DivAirports[4] IN ('MLI') OR DivAirports[5] IN ('MLI')) LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, ArrDel15 FROM mytable WHERE DivTotalGTimes BETWEEN 9 AND 121 OR Distance <> 576 ORDER BY DayOfWeek LIMIT 19","hsqls":["SELECT SecurityDelay, ArrDel15 FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 9 AND 121 OR DivTotalGTimes[2] BETWEEN 9 AND 121 OR DivTotalGTimes[3] BETWEEN 9 AND 121 OR DivTotalGTimes[4] BETWEEN 9 AND 121 OR DivTotalGTimes[5] BETWEEN 9 AND 121) OR Distance <> 576 ORDER BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DestState, \"Month\" FROM mytable LIMIT 17","hsqls":["SELECT DestState, `Month` FROM mytable LIMIT 17"]}
+{"sql":"SELECT OriginWac, MIN(Diverted), AVG(ActualElapsedTime), MAX(\"Month\") FROM mytable WHERE Origin BETWEEN 'ROA' AND 'BIL' AND DestAirportSeqID NOT IN (1315802, 1329604) OR Dest >= 'ISN' GROUP BY OriginWac LIMIT 4","hsqls":["SELECT OriginWac, MIN(Diverted), AVG(ActualElapsedTime), MAX(`Month`) FROM mytable WHERE Origin BETWEEN 'ROA' AND 'BIL' AND DestAirportSeqID NOT IN (1315802, 1329604) OR Dest >= 'ISN' GROUP BY OriginWac LIMIT 4"]}
 {"sql":"SELECT TotalAddGTime, UniqueCarrier FROM mytable WHERE Flights NOT IN (1) OR DepTimeBlk BETWEEN '1900-1959' AND '1700-1759' OR SecurityDelay > 18 ORDER BY CarrierDelay LIMIT 6"}
 {"sql":"SELECT ArrTime, CRSDepTime, CRSElapsedTime FROM mytable LIMIT 26"}
 {"sql":"SELECT DepartureDelayGroups, OriginCityName, DivAirportLandings, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, OriginCityName, DivAirportLandings  ORDER BY DepartureDelayGroups, OriginCityName, DivAirportLandings LIMIT 27","hsqls":["SELECT DepartureDelayGroups, OriginCityName, DivAirportLandings, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, OriginCityName, DivAirportLandings  ORDER BY DepartureDelayGroups, OriginCityName, DivAirportLandings LIMIT 27"]}
-{"sql":"SELECT OriginAirportSeqID, OriginCityName FROM mytable WHERE Distance IN (2007, 1670) OR DivLongestGTimes IN (10.0, 2.0, 7.0, 75.0) AND OriginStateFips BETWEEN 8 AND 20 ORDER BY AirlineID, DayofMonth, CRSDepTime LIMIT 3","hsqls":["SELECT OriginAirportSeqID, OriginCityName FROM mytable WHERE Distance IN (2007, 1670) OR (DivLongestGTimes__MV0 IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes__MV1 IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes__MV2 IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes__MV3 IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes__MV4 IN (10.0, 2.0, 7.0, 75.0)) AND OriginStateFips BETWEEN 8 AND 20 ORDER BY AirlineID, DayofMonth, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, OriginCityName FROM mytable WHERE Distance IN (2007, 1670) OR DivLongestGTimes IN (10.0, 2.0, 7.0, 75.0) AND OriginStateFips BETWEEN 8 AND 20 ORDER BY AirlineID, DayofMonth, CRSDepTime LIMIT 3","hsqls":["SELECT OriginAirportSeqID, OriginCityName FROM mytable WHERE Distance IN (2007, 1670) OR (DivLongestGTimes[1] IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes[2] IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes[3] IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes[4] IN (10.0, 2.0, 7.0, 75.0) OR DivLongestGTimes[5] IN (10.0, 2.0, 7.0, 75.0)) AND OriginStateFips BETWEEN 8 AND 20 ORDER BY AirlineID, DayofMonth, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, AVG(CRSDepTime), MAX(SecurityDelay) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 15","hsqls":["SELECT ArrDelayMinutes, AVG(CRSDepTime), MAX(SecurityDelay) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 15"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DepDelayMinutes IN (3.0, 102.0, 113.0, 60.0, 47.0) AND OriginAirportSeqID BETWEEN 1056103 AND 1336003 OR WeatherDelay > 205 LIMIT 11"}
 {"sql":"SELECT TaxiOut, DaysSinceEpoch FROM mytable WHERE LateAircraftDelay <= 1 ORDER BY NASDelay, \"Month\", CRSDepTime LIMIT 24","hsqls":["SELECT TaxiOut, DaysSinceEpoch FROM mytable WHERE LateAircraftDelay <= 1 ORDER BY NASDelay, Month, CRSDepTime LIMIT 24"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE DayOfWeek NOT IN (2, 1, 7, 6) OR TailNum NOT IN ('N830UA', 'N3DYAA') ORDER BY WheelsOff, SecurityDelay, WheelsOn LIMIT 5"}
 {"sql":"SELECT DepDelayMinutes, SecurityDelay, DestCityName FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'A' OR DivAirportLandings BETWEEN 2 AND 2 ORDER BY TaxiOut, OriginAirportSeqID, OriginStateFips LIMIT 14"}
 {"sql":"SELECT DestState FROM mytable WHERE DestAirportSeqID <> 1015502 OR TaxiOut BETWEEN 11 AND 141 ORDER BY TaxiOut, Quarter, UniqueCarrier LIMIT 26"}
-{"sql":"SELECT DivReachedDest, DivAirports, AirTime FROM mytable WHERE DayofMonth > 20 ORDER BY DestWac, LongestAddGTime","hsqls":["SELECT DivReachedDest, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, AirTime FROM mytable WHERE DayofMonth > 20 ORDER BY DestWac, LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivAirports, AirTime FROM mytable WHERE DayofMonth > 20 ORDER BY DestWac, LongestAddGTime","hsqls":["SELECT DivReachedDest, DivAirports, AirTime FROM mytable WHERE DayofMonth > 20 ORDER BY DestWac, LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE OriginCityMarketID = 32575 ORDER BY Flights, AirTime, CRSDepTime LIMIT 16"}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE ActualElapsedTime IN (251, 389, 314, 243) AND DayOfWeek BETWEEN 7 AND 1 OR DestState > 'TN' ORDER BY SecurityDelay LIMIT 1"}
 {"sql":"SELECT MIN(DivActualElapsedTime), MAX(DistanceGroup), MAX(WeatherDelay) FROM mytable LIMIT 24"}
-{"sql":"SELECT UniqueCarrier, AVG(DayOfWeek), SUM(Diverted), COUNT(Distance) FROM mytable WHERE DivAirportIDs BETWEEN 12523 AND 10257 AND CarrierDelay NOT IN (78) OR AirlineID NOT IN (20436, 19393, 19930, 20355) GROUP BY UniqueCarrier LIMIT 1","hsqls":["SELECT UniqueCarrier, AVG(DayOfWeek), SUM(Diverted), COUNT(Distance) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 12523 AND 10257 OR DivAirportIDs__MV1 BETWEEN 12523 AND 10257 OR DivAirportIDs__MV2 BETWEEN 12523 AND 10257 OR DivAirportIDs__MV3 BETWEEN 12523 AND 10257 OR DivAirportIDs__MV4 BETWEEN 12523 AND 10257) AND CarrierDelay NOT IN (78) OR AirlineID NOT IN (20436, 19393, 19930, 20355) GROUP BY UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier, AVG(DayOfWeek), SUM(Diverted), COUNT(Distance) FROM mytable WHERE DivAirportIDs BETWEEN 12523 AND 10257 AND CarrierDelay NOT IN (78) OR AirlineID NOT IN (20436, 19393, 19930, 20355) GROUP BY UniqueCarrier LIMIT 1","hsqls":["SELECT UniqueCarrier, AVG(DayOfWeek), SUM(Diverted), COUNT(Distance) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 12523 AND 10257 OR DivAirportIDs[2] BETWEEN 12523 AND 10257 OR DivAirportIDs[3] BETWEEN 12523 AND 10257 OR DivAirportIDs[4] BETWEEN 12523 AND 10257 OR DivAirportIDs[5] BETWEEN 12523 AND 10257) AND CarrierDelay NOT IN (78) OR AirlineID NOT IN (20436, 19393, 19930, 20355) GROUP BY UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT TailNum, AirTime, COUNT(*) FROM mytable WHERE Dest <> 'CRW' OR DepDel15 = -9999 AND DestCityName IN ('Butte, MT') GROUP BY TailNum, AirTime  ORDER BY TailNum, AirTime LIMIT 26","hsqls":["SELECT TailNum, AirTime, COUNT(*) FROM mytable WHERE Dest <> 'CRW' OR DepDel15 = -9999 AND DestCityName IN ('Butte, MT') GROUP BY TailNum, AirTime  ORDER BY TailNum, AirTime LIMIT 26"]}
 {"sql":"SELECT WheelsOff, COUNT(*) FROM mytable WHERE Flights IN (1) GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 18","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable WHERE Flights IN (1) GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 18"]}
 {"sql":"SELECT TaxiOut, DepDelayMinutes, ArrDel15 FROM mytable ORDER BY DayofMonth LIMIT 28"}
 {"sql":"SELECT DepDelay, DivAirportLandings, COUNT(*) FROM mytable GROUP BY DepDelay, DivAirportLandings  ORDER BY DepDelay, DivAirportLandings LIMIT 23","hsqls":["SELECT DepDelay, DivAirportLandings, COUNT(*) FROM mytable GROUP BY DepDelay, DivAirportLandings  ORDER BY DepDelay, DivAirportLandings LIMIT 23"]}
 {"sql":"SELECT TaxiOut, CRSArrTime FROM mytable WHERE DestStateName BETWEEN 'New Hampshire' AND 'Ohio' ORDER BY ArrTimeBlk, DayofMonth, DaysSinceEpoch LIMIT 19"}
 {"sql":"SELECT Cancelled, OriginWac FROM mytable ORDER BY OriginState, TailNum, ArrivalDelayGroups LIMIT 18"}
-{"sql":"SELECT LongestAddGTime, DivTailNums FROM mytable WHERE TaxiIn BETWEEN 1 AND 36 AND ArrDelay NOT IN (32.0, 151.0, 149.0, -22.0) LIMIT 15","hsqls":["SELECT LongestAddGTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE TaxiIn BETWEEN 1 AND 36 AND ArrDelay NOT IN (32.0, 151.0, 149.0, -22.0) LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivTailNums FROM mytable WHERE TaxiIn BETWEEN 1 AND 36 AND ArrDelay NOT IN (32.0, 151.0, 149.0, -22.0) LIMIT 15","hsqls":["SELECT LongestAddGTime, DivTailNums FROM mytable WHERE TaxiIn BETWEEN 1 AND 36 AND ArrDelay NOT IN (32.0, 151.0, 149.0, -22.0) LIMIT 10000"]}
 {"sql":"SELECT AirTime, DivActualElapsedTime, AVG(DepTime) FROM mytable WHERE DepartureDelayGroups = -2 OR DivActualElapsedTime < 514 GROUP BY AirTime, DivActualElapsedTime  ORDER BY AirTime, DivActualElapsedTime LIMIT 22","hsqls":["SELECT AirTime, DivActualElapsedTime, AVG(DepTime) FROM mytable WHERE DepartureDelayGroups = -2 OR DivActualElapsedTime < 514 GROUP BY AirTime, DivActualElapsedTime  ORDER BY AirTime, DivActualElapsedTime LIMIT 22"]}
 {"sql":"SELECT DepDelay, FirstDepTime, DayOfWeek, MAX(LongestAddGTime) FROM mytable WHERE FirstDepTime BETWEEN 2254 AND 1534 GROUP BY DepDelay, FirstDepTime, DayOfWeek  ORDER BY DepDelay, FirstDepTime, DayOfWeek LIMIT 2","hsqls":["SELECT DepDelay, FirstDepTime, DayOfWeek, MAX(LongestAddGTime) FROM mytable WHERE FirstDepTime BETWEEN 2254 AND 1534 GROUP BY DepDelay, FirstDepTime, DayOfWeek  ORDER BY DepDelay, FirstDepTime, DayOfWeek LIMIT 2"]}
 {"sql":"SELECT DivArrDelay, COUNT(*) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 22","hsqls":["SELECT DivArrDelay, COUNT(*) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 22"]}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE LongestAddGTime >= 40 AND WheelsOn < 133 AND NASDelay <= 24"}
-{"sql":"SELECT DestState, TotalAddGTime, \"Month\" FROM mytable WHERE DivDistance BETWEEN 290 AND 104 OR DepTime BETWEEN 1632 AND 539 OR DivAirports BETWEEN 'ALB' AND 'LIT' ORDER BY FlightDate, TailNum LIMIT 10","hsqls":["SELECT DestState, TotalAddGTime, Month FROM mytable WHERE DivDistance BETWEEN 290 AND 104 OR DepTime BETWEEN 1632 AND 539 OR (DivAirports__MV0 BETWEEN 'ALB' AND 'LIT' OR DivAirports__MV1 BETWEEN 'ALB' AND 'LIT' OR DivAirports__MV2 BETWEEN 'ALB' AND 'LIT' OR DivAirports__MV3 BETWEEN 'ALB' AND 'LIT' OR DivAirports__MV4 BETWEEN 'ALB' AND 'LIT') ORDER BY FlightDate, TailNum LIMIT 10000"]}
+{"sql":"SELECT DestState, TotalAddGTime, \"Month\" FROM mytable WHERE DivDistance BETWEEN 290 AND 104 OR DepTime BETWEEN 1632 AND 539 OR DivAirports BETWEEN 'ALB' AND 'LIT' ORDER BY FlightDate, TailNum LIMIT 10","hsqls":["SELECT DestState, TotalAddGTime, `Month` FROM mytable WHERE DivDistance BETWEEN 290 AND 104 OR DepTime BETWEEN 1632 AND 539 OR (DivAirports[1] BETWEEN 'ALB' AND 'LIT' OR DivAirports[2] BETWEEN 'ALB' AND 'LIT' OR DivAirports[3] BETWEEN 'ALB' AND 'LIT' OR DivAirports[4] BETWEEN 'ALB' AND 'LIT' OR DivAirports[5] BETWEEN 'ALB' AND 'LIT') ORDER BY FlightDate, TailNum LIMIT 10000"]}
 {"sql":"SELECT Carrier, Flights, CRSElapsedTime FROM mytable WHERE Flights NOT IN (1) AND LateAircraftDelay BETWEEN 32 AND 187 LIMIT 17"}
 {"sql":"SELECT DestAirportSeqID, AirTime FROM mytable WHERE UniqueCarrier BETWEEN 'B6' AND 'VX' OR WheelsOn < 1700 LIMIT 19"}
 {"sql":"SELECT NASDelay, SUM(TaxiOut), MAX(Distance) FROM mytable WHERE CancellationCode > 'C' GROUP BY NASDelay  ORDER BY NASDelay LIMIT 6","hsqls":["SELECT NASDelay, SUM(TaxiOut), MAX(Distance) FROM mytable WHERE CancellationCode > 'C' GROUP BY NASDelay  ORDER BY NASDelay LIMIT 6"]}
@@ -770,79 +770,79 @@
 {"sql":"SELECT UniqueCarrier, DivActualElapsedTime, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'US' AND 'US' OR DestAirportSeqID NOT IN (1457002, 1200302, 1182304, 1295103) GROUP BY UniqueCarrier, DivActualElapsedTime  ORDER BY UniqueCarrier, DivActualElapsedTime LIMIT 26","hsqls":["SELECT UniqueCarrier, DivActualElapsedTime, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'US' AND 'US' OR DestAirportSeqID NOT IN (1457002, 1200302, 1182304, 1295103) GROUP BY UniqueCarrier, DivActualElapsedTime  ORDER BY UniqueCarrier, DivActualElapsedTime LIMIT 26"]}
 {"sql":"SELECT MIN(CRSElapsedTime), MAX(Distance), AVG(DepDelayMinutes) FROM mytable WHERE CRSElapsedTime IN (57, 316, 254) AND ArrivalDelayGroups BETWEEN 1 AND -1 LIMIT 11"}
 {"sql":"SELECT DestState, Carrier, AirlineID, SUM(CarrierDelay), MIN(Flights) FROM mytable WHERE OriginState IN ('OK') GROUP BY DestState, Carrier, AirlineID  ORDER BY DestState, Carrier, AirlineID LIMIT 18","hsqls":["SELECT DestState, Carrier, AirlineID, SUM(CarrierDelay), MIN(Flights) FROM mytable WHERE OriginState IN ('OK') GROUP BY DestState, Carrier, AirlineID  ORDER BY DestState, Carrier, AirlineID LIMIT 18"]}
-{"sql":"SELECT DepTime, AirlineID FROM mytable WHERE CRSElapsedTime BETWEEN 390 AND 314 AND UniqueCarrier > 'HA' AND DivTailNums IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') ORDER BY DepDel15, AirlineID, DayOfWeek LIMIT 8","hsqls":["SELECT DepTime, AirlineID FROM mytable WHERE CRSElapsedTime BETWEEN 390 AND 314 AND UniqueCarrier > 'HA' AND (DivTailNums__MV0 IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums__MV1 IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums__MV2 IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums__MV3 IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums__MV4 IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999')) ORDER BY DepDel15, AirlineID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DepTime, AirlineID FROM mytable WHERE CRSElapsedTime BETWEEN 390 AND 314 AND UniqueCarrier > 'HA' AND DivTailNums IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') ORDER BY DepDel15, AirlineID, DayOfWeek LIMIT 8","hsqls":["SELECT DepTime, AirlineID FROM mytable WHERE CRSElapsedTime BETWEEN 390 AND 314 AND UniqueCarrier > 'HA' AND (DivTailNums[1] IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums[2] IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums[3] IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums[4] IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999') OR DivTailNums[5] IN ('N378SW', 'N957DN', 'N274WN', 'N728SW', 'N16999')) ORDER BY DepDel15, AirlineID, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, NASDelay FROM mytable ORDER BY DepartureDelayGroups LIMIT 10"}
-{"sql":"SELECT OriginCityMarketID, DepTimeBlk, OriginStateName, COUNT(*) FROM mytable WHERE DivAirports IN ('BIS') AND DestWac BETWEEN 31 AND 12 GROUP BY OriginCityMarketID, DepTimeBlk, OriginStateName LIMIT 3","hsqls":["SELECT OriginCityMarketID, DepTimeBlk, OriginStateName, COUNT(*) FROM mytable WHERE (DivAirports__MV0 IN ('BIS') OR DivAirports__MV1 IN ('BIS') OR DivAirports__MV2 IN ('BIS') OR DivAirports__MV3 IN ('BIS') OR DivAirports__MV4 IN ('BIS')) AND DestWac BETWEEN 31 AND 12 GROUP BY OriginCityMarketID, DepTimeBlk, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DepTimeBlk, OriginStateName, COUNT(*) FROM mytable WHERE DivAirports IN ('BIS') AND DestWac BETWEEN 31 AND 12 GROUP BY OriginCityMarketID, DepTimeBlk, OriginStateName LIMIT 3","hsqls":["SELECT OriginCityMarketID, DepTimeBlk, OriginStateName, COUNT(*) FROM mytable WHERE (DivAirports[1] IN ('BIS') OR DivAirports[2] IN ('BIS') OR DivAirports[3] IN ('BIS') OR DivAirports[4] IN ('BIS') OR DivAirports[5] IN ('BIS')) AND DestWac BETWEEN 31 AND 12 GROUP BY OriginCityMarketID, DepTimeBlk, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Quarter FROM mytable ORDER BY FirstDepTime, DestCityMarketID, CRSElapsedTime LIMIT 29"}
 {"sql":"SELECT TaxiOut, DestWac FROM mytable WHERE WheelsOn BETWEEN 1149 AND 848 OR TailNum BETWEEN 'N727TW' AND 'N13988' OR Diverted <> 0 ORDER BY CarrierDelay LIMIT 1"}
-{"sql":"SELECT \"Year\" FROM mytable ORDER BY DepartureDelayGroups, Flights LIMIT 27","hsqls":["SELECT Year FROM mytable ORDER BY DepartureDelayGroups, Flights LIMIT 27"]}
-{"sql":"SELECT \"Year\", DivAirports, ArrDel15 FROM mytable ORDER BY DistanceGroup, Distance, ArrDelayMinutes LIMIT 5","hsqls":["SELECT Year, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrDel15 FROM mytable ORDER BY DistanceGroup, Distance, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable ORDER BY DepartureDelayGroups, Flights LIMIT 27","hsqls":["SELECT `Year` FROM mytable ORDER BY DepartureDelayGroups, Flights LIMIT 27"]}
+{"sql":"SELECT \"Year\", DivAirports, ArrDel15 FROM mytable ORDER BY DistanceGroup, Distance, ArrDelayMinutes LIMIT 5","hsqls":["SELECT Year, DivAirports, ArrDel15 FROM mytable ORDER BY DistanceGroup, Distance, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DepDelayMinutes FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) OR DestCityName = 'Moline, IL' ORDER BY DistanceGroup, DestWac, TotalAddGTime LIMIT 15"}
 {"sql":"SELECT DistanceGroup, AirlineID, DayOfWeek, MAX(Flights) FROM mytable WHERE FlightDate = '2014-01-05' OR AirlineID IN (19690, 19977) GROUP BY DistanceGroup, AirlineID, DayOfWeek  ORDER BY DistanceGroup, AirlineID, DayOfWeek LIMIT 24","hsqls":["SELECT DistanceGroup, AirlineID, DayOfWeek, MAX(Flights) FROM mytable WHERE FlightDate = '2014-01-05' OR AirlineID IN (19690, 19977) GROUP BY DistanceGroup, AirlineID, DayOfWeek  ORDER BY DistanceGroup, AirlineID, DayOfWeek LIMIT 24"]}
 {"sql":"SELECT LongestAddGTime, CRSArrTime, Dest, MAX(ArrDelayMinutes) FROM mytable WHERE NASDelay NOT IN (78, 5, 35) AND DivReachedDest IN (1, 0, -9999) OR CarrierDelay BETWEEN 47 AND 17 GROUP BY LongestAddGTime, CRSArrTime, Dest  ORDER BY LongestAddGTime, CRSArrTime, Dest LIMIT 10","hsqls":["SELECT LongestAddGTime, CRSArrTime, Dest, MAX(ArrDelayMinutes) FROM mytable WHERE NASDelay NOT IN (78, 5, 35) AND DivReachedDest IN (1, 0, -9999) OR CarrierDelay BETWEEN 47 AND 17 GROUP BY LongestAddGTime, CRSArrTime, Dest  ORDER BY LongestAddGTime, CRSArrTime, Dest LIMIT 10"]}
-{"sql":"SELECT ActualElapsedTime, UniqueCarrier, OriginAirportID FROM mytable WHERE \"Year\" IN (2014) LIMIT 14","hsqls":["SELECT ActualElapsedTime, UniqueCarrier, OriginAirportID FROM mytable WHERE Year IN (2014) LIMIT 14"]}
-{"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch, AVG(DistanceGroup) FROM mytable WHERE \"Month\" > 1 OR DivAirportIDs BETWEEN 12280 AND 14256 OR DivDistance BETWEEN 581 AND 49 GROUP BY OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch LIMIT 9","hsqls":["SELECT OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch, AVG(CAST(DistanceGroup AS DOUBLE)) FROM mytable WHERE Month > 1 OR (DivAirportIDs__MV0 BETWEEN 12280 AND 14256 OR DivAirportIDs__MV1 BETWEEN 12280 AND 14256 OR DivAirportIDs__MV2 BETWEEN 12280 AND 14256 OR DivAirportIDs__MV3 BETWEEN 12280 AND 14256 OR DivAirportIDs__MV4 BETWEEN 12280 AND 14256) OR DivDistance BETWEEN 581 AND 49 GROUP BY OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, UniqueCarrier, OriginAirportID FROM mytable WHERE \"Year\" IN (2014) LIMIT 14","hsqls":["SELECT ActualElapsedTime, UniqueCarrier, OriginAirportID FROM mytable WHERE `Year` IN (2014) LIMIT 14"]}
+{"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch, AVG(DistanceGroup) FROM mytable WHERE \"Month\" > 1 OR DivAirportIDs BETWEEN 12280 AND 14256 OR DivDistance BETWEEN 581 AND 49 GROUP BY OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch LIMIT 9","hsqls":["SELECT OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch, AVG(CAST(DistanceGroup AS DOUBLE)) FROM mytable WHERE `Month` > 1 OR (DivAirportIDs[1] BETWEEN 12280 AND 14256 OR DivAirportIDs[2] BETWEEN 12280 AND 14256 OR DivAirportIDs[3] BETWEEN 12280 AND 14256 OR DivAirportIDs[4] BETWEEN 12280 AND 14256 OR DivAirportIDs[5] BETWEEN 12280 AND 14256) OR DivDistance BETWEEN 581 AND 49 GROUP BY OriginAirportSeqID, LateAircraftDelay, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, SUM(ActualElapsedTime), AVG(DepDelayMinutes) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 29","hsqls":["SELECT WheelsOff, SUM(ActualElapsedTime), AVG(DepDelayMinutes) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 29"]}
-{"sql":"SELECT DivLongestGTimes, DestAirportSeqID FROM mytable WHERE CancellationCode = 'noodles' ORDER BY CarrierDelay LIMIT 27","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestAirportSeqID FROM mytable WHERE CancellationCode = 'noodles' ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestAirportSeqID FROM mytable WHERE CancellationCode = 'noodles' ORDER BY CarrierDelay LIMIT 27","hsqls":["SELECT DivLongestGTimes, DestAirportSeqID FROM mytable WHERE CancellationCode = 'noodles' ORDER BY CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE OriginState = 'OR' ORDER BY Quarter, NASDelay, DayofMonth LIMIT 8"}
 {"sql":"SELECT \"Year\", DayOfWeek FROM mytable WHERE WheelsOff NOT IN (811, 2005, 1222) AND NASDelay BETWEEN 7 AND 202 AND DestStateFips < 35 ORDER BY Carrier LIMIT 19","hsqls":["SELECT Year, DayOfWeek FROM mytable WHERE WheelsOff NOT IN (811, 2005, 1222) AND NASDelay BETWEEN 7 AND 202 AND DestStateFips < 35 ORDER BY Carrier LIMIT 19"]}
 {"sql":"SELECT TaxiOut, DayOfWeek FROM mytable WHERE WheelsOn BETWEEN 753 AND 1659 ORDER BY DepDel15 LIMIT 29"}
-{"sql":"SELECT Diverted, WeatherDelay, DivAirportIDs FROM mytable WHERE LongestAddGTime BETWEEN 45 AND 29 OR DepTime IN (2008, 705) LIMIT 29","hsqls":["SELECT Diverted, WeatherDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE LongestAddGTime BETWEEN 45 AND 29 OR DepTime IN (2008, 705) LIMIT 10000"]}
+{"sql":"SELECT Diverted, WeatherDelay, DivAirportIDs FROM mytable WHERE LongestAddGTime BETWEEN 45 AND 29 OR DepTime IN (2008, 705) LIMIT 29","hsqls":["SELECT Diverted, WeatherDelay, DivAirportIDs FROM mytable WHERE LongestAddGTime BETWEEN 45 AND 29 OR DepTime IN (2008, 705) LIMIT 10000"]}
 {"sql":"SELECT DestCityName FROM mytable ORDER BY FlightNum, DepTime LIMIT 7"}
 {"sql":"SELECT DaysSinceEpoch, COUNT(*) FROM mytable WHERE LongestAddGTime IN (41) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 18","hsqls":["SELECT DaysSinceEpoch, COUNT(*) FROM mytable WHERE LongestAddGTime IN (41) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 18"]}
-{"sql":"SELECT DivDistance, DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE WheelsOn NOT IN (2216, 2317, 2010) ORDER BY DestStateName, OriginWac, DestAirportID LIMIT 12","hsqls":["SELECT DivDistance, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE WheelsOn NOT IN (2216, 2317, 2010) ORDER BY DestStateName, OriginWac, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT DivAirports, OriginStateName FROM mytable ORDER BY TaxiOut, ArrTimeBlk LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginStateName FROM mytable ORDER BY TaxiOut, ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DestStateFips BETWEEN 22 AND 31 ORDER BY TailNum, DepTimeBlk, \"Month\" LIMIT 16","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE DestStateFips BETWEEN 22 AND 31 ORDER BY TailNum, DepTimeBlk, Month LIMIT 16"]}
+{"sql":"SELECT DivDistance, DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE WheelsOn NOT IN (2216, 2317, 2010) ORDER BY DestStateName, OriginWac, DestAirportID LIMIT 12","hsqls":["SELECT DivDistance, DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE WheelsOn NOT IN (2216, 2317, 2010) ORDER BY DestStateName, OriginWac, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginStateName FROM mytable ORDER BY TaxiOut, ArrTimeBlk LIMIT 10","hsqls":["SELECT DivAirports, OriginStateName FROM mytable ORDER BY TaxiOut, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DestStateFips BETWEEN 22 AND 31 ORDER BY TailNum, DepTimeBlk, \"Month\" LIMIT 16","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE DestStateFips BETWEEN 22 AND 31 ORDER BY TailNum, DepTimeBlk, `Month` LIMIT 16"]}
 {"sql":"SELECT WheelsOn, OriginStateName, AVG(DepDel15) FROM mytable GROUP BY WheelsOn, OriginStateName  ORDER BY WheelsOn, OriginStateName LIMIT 18","hsqls":["SELECT WheelsOn, OriginStateName, AVG(DepDel15) FROM mytable GROUP BY WheelsOn, OriginStateName  ORDER BY WheelsOn, OriginStateName LIMIT 18"]}
 {"sql":"SELECT Cancelled, UniqueCarrier, COUNT(DepTimeBlk), AVG(DivAirportLandings) FROM mytable WHERE DivDistance BETWEEN 589 AND 745 AND OriginState <> 'WY' GROUP BY Cancelled, UniqueCarrier  ORDER BY Cancelled, UniqueCarrier LIMIT 5","hsqls":["SELECT Cancelled, UniqueCarrier, COUNT(DepTimeBlk), AVG(DivAirportLandings) FROM mytable WHERE DivDistance BETWEEN 589 AND 745 AND OriginState <> 'WY' GROUP BY Cancelled, UniqueCarrier  ORDER BY Cancelled, UniqueCarrier LIMIT 5"]}
-{"sql":"SELECT TaxiIn, ArrDel15, AirTime FROM mytable WHERE DivAirportIDs BETWEEN 12992 AND 14107 AND CRSElapsedTime IN (224, 179, 208, 29) LIMIT 16","hsqls":["SELECT TaxiIn, ArrDel15, AirTime FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 12992 AND 14107 OR DivAirportIDs__MV1 BETWEEN 12992 AND 14107 OR DivAirportIDs__MV2 BETWEEN 12992 AND 14107 OR DivAirportIDs__MV3 BETWEEN 12992 AND 14107 OR DivAirportIDs__MV4 BETWEEN 12992 AND 14107) AND CRSElapsedTime IN (224, 179, 208, 29) LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, SecurityDelay, OriginAirportID, MAX(AirlineID), MAX(Quarter) FROM mytable WHERE WheelsOff <= 958 OR DaysSinceEpoch > 16092 OR DivAirportIDs IN (16101, 11540, 11996, 13830, 10521) GROUP BY DepartureDelayGroups, SecurityDelay, OriginAirportID LIMIT 13","hsqls":["SELECT DepartureDelayGroups, SecurityDelay, OriginAirportID, MAX(AirlineID), MAX(Quarter) FROM mytable WHERE WheelsOff <= 958 OR DaysSinceEpoch > 16092 OR (DivAirportIDs__MV0 IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs__MV1 IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs__MV2 IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs__MV3 IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs__MV4 IN (16101, 11540, 11996, 13830, 10521)) GROUP BY DepartureDelayGroups, SecurityDelay, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT MIN(DepDelayMinutes), COUNT(\"Year\") FROM mytable WHERE AirlineID BETWEEN 19930 AND 20355 LIMIT 1","hsqls":["SELECT MIN(DepDelayMinutes), COUNT(Year) FROM mytable WHERE AirlineID BETWEEN 19930 AND 20355 LIMIT 1"]}
+{"sql":"SELECT TaxiIn, ArrDel15, AirTime FROM mytable WHERE DivAirportIDs BETWEEN 12992 AND 14107 AND CRSElapsedTime IN (224, 179, 208, 29) LIMIT 16","hsqls":["SELECT TaxiIn, ArrDel15, AirTime FROM mytable WHERE (DivAirportIDs[1] BETWEEN 12992 AND 14107 OR DivAirportIDs[2] BETWEEN 12992 AND 14107 OR DivAirportIDs[3] BETWEEN 12992 AND 14107 OR DivAirportIDs[4] BETWEEN 12992 AND 14107 OR DivAirportIDs[5] BETWEEN 12992 AND 14107) AND CRSElapsedTime IN (224, 179, 208, 29) LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, SecurityDelay, OriginAirportID, MAX(AirlineID), MAX(Quarter) FROM mytable WHERE WheelsOff <= 958 OR DaysSinceEpoch > 16092 OR DivAirportIDs IN (16101, 11540, 11996, 13830, 10521) GROUP BY DepartureDelayGroups, SecurityDelay, OriginAirportID LIMIT 13","hsqls":["SELECT DepartureDelayGroups, SecurityDelay, OriginAirportID, MAX(AirlineID), MAX(Quarter) FROM mytable WHERE WheelsOff <= 958 OR DaysSinceEpoch > 16092 OR (DivAirportIDs[1] IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs[2] IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs[3] IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs[4] IN (16101, 11540, 11996, 13830, 10521) OR DivAirportIDs[5] IN (16101, 11540, 11996, 13830, 10521)) GROUP BY DepartureDelayGroups, SecurityDelay, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT MIN(DepDelayMinutes), COUNT(\"Year\") FROM mytable WHERE AirlineID BETWEEN 19930 AND 20355 LIMIT 1","hsqls":["SELECT MIN(DepDelayMinutes), COUNT(`Year`) FROM mytable WHERE AirlineID BETWEEN 19930 AND 20355 LIMIT 1"]}
 {"sql":"SELECT TotalAddGTime, DayofMonth, DestAirportID, COUNT(OriginAirportSeqID), MIN(DestStateFips) FROM mytable WHERE TailNum BETWEEN 'N3KRAA' AND 'N764NC' AND DivArrDelay BETWEEN 126 AND 250 GROUP BY TotalAddGTime, DayofMonth, DestAirportID  ORDER BY TotalAddGTime, DayofMonth, DestAirportID LIMIT 9","hsqls":["SELECT TotalAddGTime, DayofMonth, DestAirportID, COUNT(OriginAirportSeqID), MIN(DestStateFips) FROM mytable WHERE TailNum BETWEEN 'N3KRAA' AND 'N764NC' AND DivArrDelay BETWEEN 126 AND 250 GROUP BY TotalAddGTime, DayofMonth, DestAirportID  ORDER BY TotalAddGTime, DayofMonth, DestAirportID LIMIT 9"]}
 {"sql":"SELECT DivReachedDest, AVG(CRSElapsedTime), SUM(ActualElapsedTime), COUNT(ArrDel15) FROM mytable WHERE CRSArrTime NOT IN (1700, 2242) GROUP BY DivReachedDest","hsqls":["SELECT DivReachedDest, AVG(CRSElapsedTime), SUM(ActualElapsedTime), COUNT(ArrDel15) FROM mytable WHERE CRSArrTime NOT IN (1700, 2242) GROUP BY DivReachedDest"]}
-{"sql":"SELECT DepTime FROM mytable WHERE \"Year\" NOT IN (2014) OR DivAirportSeqIDs <= 1129202 OR TaxiIn BETWEEN 3 AND 24 ORDER BY Carrier, FlightNum LIMIT 10","hsqls":["SELECT DepTime FROM mytable WHERE Year NOT IN (2014) OR (DivAirportSeqIDs__MV0 <= 1129202 OR DivAirportSeqIDs__MV1 <= 1129202 OR DivAirportSeqIDs__MV2 <= 1129202 OR DivAirportSeqIDs__MV3 <= 1129202 OR DivAirportSeqIDs__MV4 <= 1129202) OR TaxiIn BETWEEN 3 AND 24 ORDER BY Carrier, FlightNum LIMIT 10000"]}
+{"sql":"SELECT DepTime FROM mytable WHERE \"Year\" NOT IN (2014) OR DivAirportSeqIDs <= 1129202 OR TaxiIn BETWEEN 3 AND 24 ORDER BY Carrier, FlightNum LIMIT 10","hsqls":["SELECT DepTime FROM mytable WHERE `Year` NOT IN (2014) OR (DivAirportSeqIDs[1] <= 1129202 OR DivAirportSeqIDs[2] <= 1129202 OR DivAirportSeqIDs[3] <= 1129202 OR DivAirportSeqIDs[4] <= 1129202 OR DivAirportSeqIDs[5] <= 1129202) OR TaxiIn BETWEEN 3 AND 24 ORDER BY Carrier, FlightNum LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DivActualElapsedTime FROM mytable WHERE CRSElapsedTime IN (376, 130) AND LateAircraftDelay IN (55, 100, 88) AND DivAirportLandings BETWEEN 0 AND 0 LIMIT 25"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DestWac BETWEEN 54 AND 67 ORDER BY OriginAirportSeqID, OriginState LIMIT 15","hsqls":["SELECT Year FROM mytable WHERE DestWac BETWEEN 54 AND 67 ORDER BY OriginAirportSeqID, OriginState LIMIT 15"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DestWac BETWEEN 54 AND 67 ORDER BY OriginAirportSeqID, OriginState LIMIT 15","hsqls":["SELECT `Year` FROM mytable WHERE DestWac BETWEEN 54 AND 67 ORDER BY OriginAirportSeqID, OriginState LIMIT 15"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DestAirportID BETWEEN 13485 AND 14747 AND OriginState IN ('IL', 'AK', 'VA', 'RI') LIMIT 19"}
 {"sql":"SELECT Diverted FROM mytable WHERE ArrDelay BETWEEN 85.0 AND -31.0 AND DestStateName BETWEEN 'Arkansas' AND 'Arizona' ORDER BY DivArrDelay LIMIT 1"}
 {"sql":"SELECT OriginState FROM mytable WHERE OriginStateName > 'Arizona' LIMIT 24"}
-{"sql":"SELECT \"Month\" FROM mytable ORDER BY SecurityDelay, Origin LIMIT 28","hsqls":["SELECT Month FROM mytable ORDER BY SecurityDelay, Origin LIMIT 28"]}
+{"sql":"SELECT \"Month\" FROM mytable ORDER BY SecurityDelay, Origin LIMIT 28","hsqls":["SELECT `Month` FROM mytable ORDER BY SecurityDelay, Origin LIMIT 28"]}
 {"sql":"SELECT CancellationCode, SUM(NASDelay), SUM(OriginWac), MIN(FirstDepTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-01' AND '2014-01-21' OR OriginCityName < 'Tampa, FL' GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 7","hsqls":["SELECT CancellationCode, SUM(NASDelay), SUM(OriginWac), MIN(FirstDepTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-01' AND '2014-01-21' OR OriginCityName < 'Tampa, FL' GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 7"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE CRSArrTime IN (2225, 2219, 1620, 1417, 1534) LIMIT 18"}
-{"sql":"SELECT DivWheelsOns, CancellationCode FROM mytable WHERE NASDelay BETWEEN 211 AND 110 ORDER BY LateAircraftDelay LIMIT 19","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, CancellationCode FROM mytable WHERE NASDelay BETWEEN 211 AND 110 ORDER BY LateAircraftDelay LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, WheelsOff, CRSArrTime, MIN(OriginAirportSeqID), MAX(\"Year\"), AVG(DistanceGroup) FROM mytable WHERE OriginState <= 'FL' OR DivWheelsOffs >= 1200 AND DepartureDelayGroups <> 8 GROUP BY OriginAirportSeqID, WheelsOff, CRSArrTime LIMIT 14","hsqls":["SELECT OriginAirportSeqID, WheelsOff, CRSArrTime, MIN(OriginAirportSeqID), MAX(Year), AVG(DistanceGroup) FROM mytable WHERE OriginState <= 'FL' OR (DivWheelsOffs__MV0 >= 1200 OR DivWheelsOffs__MV1 >= 1200 OR DivWheelsOffs__MV2 >= 1200 OR DivWheelsOffs__MV3 >= 1200 OR DivWheelsOffs__MV4 >= 1200) AND DepartureDelayGroups <> 8 GROUP BY OriginAirportSeqID, WheelsOff, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, CancellationCode FROM mytable WHERE NASDelay BETWEEN 211 AND 110 ORDER BY LateAircraftDelay LIMIT 19","hsqls":["SELECT DivWheelsOns, CancellationCode FROM mytable WHERE NASDelay BETWEEN 211 AND 110 ORDER BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, WheelsOff, CRSArrTime, MIN(OriginAirportSeqID), MAX(\"Year\"), AVG(DistanceGroup) FROM mytable WHERE OriginState <= 'FL' OR DivWheelsOffs >= 1200 AND DepartureDelayGroups <> 8 GROUP BY OriginAirportSeqID, WheelsOff, CRSArrTime LIMIT 14","hsqls":["SELECT OriginAirportSeqID, WheelsOff, CRSArrTime, MIN(OriginAirportSeqID), MAX(`Year`), AVG(DistanceGroup) FROM mytable WHERE OriginState <= 'FL' OR (DivWheelsOffs[1] >= 1200 OR DivWheelsOffs[2] >= 1200 OR DivWheelsOffs[3] >= 1200 OR DivWheelsOffs[4] >= 1200 OR DivWheelsOffs[5] >= 1200) AND DepartureDelayGroups <> 8 GROUP BY OriginAirportSeqID, WheelsOff, CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 4"}
-{"sql":"SELECT Distance, DepTime FROM mytable WHERE DivWheelsOns BETWEEN 1755 AND 1017 OR DivAirportLandings >= 9 ORDER BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 14","hsqls":["SELECT Distance, DepTime FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1755 AND 1017 OR DivWheelsOns__MV1 BETWEEN 1755 AND 1017 OR DivWheelsOns__MV2 BETWEEN 1755 AND 1017 OR DivWheelsOns__MV3 BETWEEN 1755 AND 1017 OR DivWheelsOns__MV4 BETWEEN 1755 AND 1017) OR DivAirportLandings >= 9 ORDER BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT Distance, DepTime FROM mytable WHERE DivWheelsOns BETWEEN 1755 AND 1017 OR DivAirportLandings >= 9 ORDER BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 14","hsqls":["SELECT Distance, DepTime FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1755 AND 1017 OR DivWheelsOns[2] BETWEEN 1755 AND 1017 OR DivWheelsOns[3] BETWEEN 1755 AND 1017 OR DivWheelsOns[4] BETWEEN 1755 AND 1017 OR DivWheelsOns[5] BETWEEN 1755 AND 1017) OR DivAirportLandings >= 9 ORDER BY ActualElapsedTime, CancellationCode, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE OriginAirportID BETWEEN 10990 AND 15919 AND TailNum IN ('N658SW', 'N519UW', 'N489HA') OR Flights > 1 ORDER BY Origin LIMIT 2"}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY DivActualElapsedTime LIMIT 4"}
 {"sql":"SELECT SUM(ActualElapsedTime) FROM mytable WHERE DepDelay < 177.0 AND TailNum BETWEEN 'N176PQ' AND 'N181PQ' AND LateAircraftDelay BETWEEN 96 AND 123 LIMIT 24"}
 {"sql":"SELECT DepTime FROM mytable ORDER BY DestAirportSeqID LIMIT 2"}
-{"sql":"SELECT OriginCityMarketID, DestAirportSeqID FROM mytable WHERE DestCityMarketID IN (31504, 30739) AND DivWheelsOns = 1407 OR OriginAirportID BETWEEN 11315 AND 10918 LIMIT 13","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID FROM mytable WHERE DestCityMarketID IN (31504, 30739) AND (DivWheelsOns__MV0 = 1407 OR DivWheelsOns__MV1 = 1407 OR DivWheelsOns__MV2 = 1407 OR DivWheelsOns__MV3 = 1407 OR DivWheelsOns__MV4 = 1407) OR OriginAirportID BETWEEN 11315 AND 10918 LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestAirportSeqID FROM mytable WHERE DestCityMarketID IN (31504, 30739) AND DivWheelsOns = 1407 OR OriginAirportID BETWEEN 11315 AND 10918 LIMIT 13","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID FROM mytable WHERE DestCityMarketID IN (31504, 30739) AND (DivWheelsOns[1] = 1407 OR DivWheelsOns[2] = 1407 OR DivWheelsOns[3] = 1407 OR DivWheelsOns[4] = 1407 OR DivWheelsOns[5] = 1407) OR OriginAirportID BETWEEN 11315 AND 10918 LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DivDistance FROM mytable WHERE DistanceGroup <> 5 OR DepDelay NOT IN (166.0) OR ArrTimeBlk <= '1200-1259' LIMIT 11"}
 {"sql":"SELECT DayofMonth, AirTime FROM mytable WHERE AirTime BETWEEN 189 AND 355 AND ArrDel15 = -9999 AND DaysSinceEpoch IN (16096, 16097, 16076, 16085) ORDER BY LateAircraftDelay, DepTimeBlk LIMIT 27"}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE NASDelay <> 45 OR AirlineID BETWEEN 20398 AND 20304 ORDER BY DepDel15 LIMIT 13"}
 {"sql":"SELECT WeatherDelay, Distance FROM mytable ORDER BY LateAircraftDelay, CancellationCode, DivAirportLandings LIMIT 11"}
-{"sql":"SELECT Flights FROM mytable WHERE DivAirports > 'BUR' AND DayofMonth NOT IN (1, 25) LIMIT 21","hsqls":["SELECT Flights FROM mytable WHERE (DivAirports__MV0 > 'BUR' OR DivAirports__MV1 > 'BUR' OR DivAirports__MV2 > 'BUR' OR DivAirports__MV3 > 'BUR' OR DivAirports__MV4 > 'BUR') AND DayofMonth NOT IN (1, 25) LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE DivAirports > 'BUR' AND DayofMonth NOT IN (1, 25) LIMIT 21","hsqls":["SELECT Flights FROM mytable WHERE (DivAirports[1] > 'BUR' OR DivAirports[2] > 'BUR' OR DivAirports[3] > 'BUR' OR DivAirports[4] > 'BUR' OR DivAirports[5] > 'BUR') AND DayofMonth NOT IN (1, 25) LIMIT 10000"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE DepDelay BETWEEN 140.0 AND 137.0 ORDER BY ArrDelayMinutes LIMIT 17"}
-{"sql":"SELECT ActualElapsedTime, AVG(DayOfWeek), MAX(DistanceGroup), AVG(CRSElapsedTime) FROM mytable WHERE AirlineID NOT IN (20355) AND \"Month\" BETWEEN 1 AND 1 GROUP BY ActualElapsedTime LIMIT 11","hsqls":["SELECT ActualElapsedTime, AVG(DayOfWeek), MAX(DistanceGroup), AVG(CRSElapsedTime) FROM mytable WHERE AirlineID NOT IN (20355) AND Month BETWEEN 1 AND 1 GROUP BY ActualElapsedTime LIMIT 11"]}
+{"sql":"SELECT ActualElapsedTime, AVG(DayOfWeek), MAX(DistanceGroup), AVG(CRSElapsedTime) FROM mytable WHERE AirlineID NOT IN (20355) AND \"Month\" BETWEEN 1 AND 1 GROUP BY ActualElapsedTime LIMIT 11","hsqls":["SELECT ActualElapsedTime, AVG(DayOfWeek), MAX(DistanceGroup), AVG(CRSElapsedTime) FROM mytable WHERE AirlineID NOT IN (20355) AND `Month` BETWEEN 1 AND 1 GROUP BY ActualElapsedTime LIMIT 11"]}
 {"sql":"SELECT CRSElapsedTime, MAX(DepDelayMinutes), COUNT(DepTimeBlk), SUM(DayOfWeek) FROM mytable WHERE CRSElapsedTime NOT IN (305, 234) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 19","hsqls":["SELECT CRSElapsedTime, MAX(DepDelayMinutes), COUNT(DepTimeBlk), SUM(DayOfWeek) FROM mytable WHERE CRSElapsedTime NOT IN (305, 234) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 19"]}
 {"sql":"SELECT DestWac, CRSDepTime, COUNT(*) FROM mytable WHERE WheelsOff <= 2130 OR AirTime > 361 AND DayOfWeek < 5 GROUP BY DestWac, CRSDepTime  ORDER BY DestWac, CRSDepTime LIMIT 9","hsqls":["SELECT DestWac, CRSDepTime, COUNT(*) FROM mytable WHERE WheelsOff <= 2130 OR AirTime > 361 AND DayOfWeek < 5 GROUP BY DestWac, CRSDepTime  ORDER BY DestWac, CRSDepTime LIMIT 9"]}
 {"sql":"SELECT OriginState, DestState, WeatherDelay FROM mytable WHERE DivAirportLandings > 9 ORDER BY DepartureDelayGroups, Quarter, OriginStateName LIMIT 8"}
-{"sql":"SELECT OriginState, FirstDepTime, DayofMonth FROM mytable WHERE OriginStateFips NOT IN (31, 51, 28) OR ArrDelay > 158.0 ORDER BY ArrDelayMinutes, \"Month\" LIMIT 13","hsqls":["SELECT OriginState, FirstDepTime, DayofMonth FROM mytable WHERE OriginStateFips NOT IN (31, 51, 28) OR ArrDelay > 158.0 ORDER BY ArrDelayMinutes, Month LIMIT 13"]}
+{"sql":"SELECT OriginState, FirstDepTime, DayofMonth FROM mytable WHERE OriginStateFips NOT IN (31, 51, 28) OR ArrDelay > 158.0 ORDER BY ArrDelayMinutes, \"Month\" LIMIT 13","hsqls":["SELECT OriginState, FirstDepTime, DayofMonth FROM mytable WHERE OriginStateFips NOT IN (31, 51, 28) OR ArrDelay > 158.0 ORDER BY ArrDelayMinutes, `Month` LIMIT 13"]}
 {"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE OriginWac <> 86 AND OriginAirportID NOT IN (10140, 14457, 11525) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 19","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE OriginWac <> 86 AND OriginAirportID NOT IN (10140, 14457, 11525) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 19"]}
 {"sql":"SELECT AVG(FlightNum), COUNT(DivReachedDest), MIN(DestCityMarketID) FROM mytable WHERE DivAirportLandings <> 9 LIMIT 4"}
 {"sql":"SELECT FlightNum, CancellationCode, SUM(DayOfWeek) FROM mytable GROUP BY FlightNum, CancellationCode  ORDER BY FlightNum, CancellationCode LIMIT 22","hsqls":["SELECT FlightNum, CancellationCode, SUM(DayOfWeek) FROM mytable GROUP BY FlightNum, CancellationCode  ORDER BY FlightNum, CancellationCode LIMIT 22"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Carrier < 'MQ' LIMIT 4","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Carrier < 'MQ' LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Carrier < 'MQ' LIMIT 4","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE Carrier < 'MQ' LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 17","hsqls":["SELECT DepartureDelayGroups, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 17"]}
 {"sql":"SELECT CRSArrTime, Cancelled, CancellationCode FROM mytable WHERE ActualElapsedTime BETWEEN 64 AND 268 ORDER BY ArrTime, UniqueCarrier, OriginAirportID"}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE DepDelay BETWEEN 109.0 AND 92.0 OR ActualElapsedTime > 222 ORDER BY OriginState, Distance, ArrTimeBlk LIMIT 12"}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 42.0 AND 165.0 OR Carrier BETWEEN 'B6' AND 'EV' GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 23","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 42.0 AND 165.0 OR Carrier BETWEEN 'B6' AND 'EV' GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 23"]}
-{"sql":"SELECT DestWac, DestState, DepTime FROM mytable WHERE \"Month\" < 1 AND DivActualElapsedTime >= 500 ORDER BY Diverted, DepDelay, OriginCityName LIMIT 21","hsqls":["SELECT DestWac, DestState, DepTime FROM mytable WHERE Month < 1 AND DivActualElapsedTime >= 500 ORDER BY Diverted, DepDelay, OriginCityName LIMIT 21"]}
+{"sql":"SELECT DestWac, DestState, DepTime FROM mytable WHERE \"Month\" < 1 AND DivActualElapsedTime >= 500 ORDER BY Diverted, DepDelay, OriginCityName LIMIT 21","hsqls":["SELECT DestWac, DestState, DepTime FROM mytable WHERE `Month` < 1 AND DivActualElapsedTime >= 500 ORDER BY Diverted, DepDelay, OriginCityName LIMIT 21"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE OriginCityMarketID IN (32575) AND SecurityDelay BETWEEN 8 AND 18 LIMIT 14"}
 {"sql":"SELECT DestStateName FROM mytable WHERE ActualElapsedTime > 163 AND DivAirportLandings <> 2 ORDER BY ArrDelay, DayofMonth, OriginAirportID LIMIT 1"}
-{"sql":"SELECT DivLongestGTimes, DestAirportSeqID, UniqueCarrier FROM mytable WHERE OriginCityMarketID BETWEEN 30615 AND 30073 ORDER BY LateAircraftDelay, ArrDelay LIMIT 8","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestAirportSeqID, UniqueCarrier FROM mytable WHERE OriginCityMarketID BETWEEN 30615 AND 30073 ORDER BY LateAircraftDelay, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestAirportSeqID, UniqueCarrier FROM mytable WHERE OriginCityMarketID BETWEEN 30615 AND 30073 ORDER BY LateAircraftDelay, ArrDelay LIMIT 8","hsqls":["SELECT DivLongestGTimes, DestAirportSeqID, UniqueCarrier FROM mytable WHERE OriginCityMarketID BETWEEN 30615 AND 30073 ORDER BY LateAircraftDelay, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT Quarter, \"Month\", ArrivalDelayGroups FROM mytable WHERE SecurityDelay NOT IN (0, 4, 27) OR FirstDepTime IN (2009, 750, 612, 550) OR ActualElapsedTime IN (127, 243) ORDER BY CRSArrTime LIMIT 9","hsqls":["SELECT Quarter, Month, ArrivalDelayGroups FROM mytable WHERE SecurityDelay NOT IN (0, 4, 27) OR FirstDepTime IN (2009, 750, 612, 550) OR ActualElapsedTime IN (127, 243) ORDER BY CRSArrTime LIMIT 9"]}
-{"sql":"SELECT ArrTime, MIN(WheelsOff) FROM mytable WHERE \"Year\" NOT IN (2014) OR ArrDel15 BETWEEN -9999 AND 1 GROUP BY ArrTime LIMIT 28","hsqls":["SELECT ArrTime, MIN(WheelsOff) FROM mytable WHERE Year NOT IN (2014) OR ArrDel15 BETWEEN -9999 AND 1 GROUP BY ArrTime LIMIT 28"]}
+{"sql":"SELECT ArrTime, MIN(WheelsOff) FROM mytable WHERE \"Year\" NOT IN (2014) OR ArrDel15 BETWEEN -9999 AND 1 GROUP BY ArrTime LIMIT 28","hsqls":["SELECT ArrTime, MIN(WheelsOff) FROM mytable WHERE `Year` NOT IN (2014) OR ArrDel15 BETWEEN -9999 AND 1 GROUP BY ArrTime LIMIT 28"]}
 {"sql":"SELECT Quarter FROM mytable WHERE DivArrDelay BETWEEN 868 AND 308 LIMIT 5"}
 {"sql":"SELECT OriginState, DestState, DestCityMarketID FROM mytable WHERE UniqueCarrier > 'US' AND DepTimeBlk NOT IN ('1300-1359', '1400-1459') ORDER BY DivArrDelay, WheelsOn LIMIT 7"}
 {"sql":"SELECT Diverted, OriginCityMarketID, TaxiIn FROM mytable WHERE ArrDelay <> 228.0 OR LongestAddGTime < 31 ORDER BY CRSArrTime LIMIT 29"}
@@ -854,53 +854,53 @@
 {"sql":"SELECT WheelsOff FROM mytable LIMIT 24"}
 {"sql":"SELECT DepDelay, TaxiIn, ArrTimeBlk, SUM(DestAirportSeqID) FROM mytable WHERE DestCityName NOT IN ('Rhinelander, WI', 'Bethel, AK', 'International Falls, MN') GROUP BY DepDelay, TaxiIn, ArrTimeBlk  ORDER BY DepDelay, TaxiIn, ArrTimeBlk LIMIT 17","hsqls":["SELECT DepDelay, TaxiIn, ArrTimeBlk, SUM(DestAirportSeqID) FROM mytable WHERE DestCityName NOT IN ('Rhinelander, WI', 'Bethel, AK', 'International Falls, MN') GROUP BY DepDelay, TaxiIn, ArrTimeBlk  ORDER BY DepDelay, TaxiIn, ArrTimeBlk LIMIT 17"]}
 {"sql":"SELECT UniqueCarrier, COUNT(DestWac), MIN(DestCityMarketID), SUM(DepTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 28","hsqls":["SELECT UniqueCarrier, COUNT(DestWac), MIN(DestCityMarketID), SUM(DepTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 28"]}
-{"sql":"SELECT DestStateFips, ArrTimeBlk, UniqueCarrier FROM mytable ORDER BY OriginCityMarketID, ActualElapsedTime, \"Month\" LIMIT 3","hsqls":["SELECT DestStateFips, ArrTimeBlk, UniqueCarrier FROM mytable ORDER BY OriginCityMarketID, ActualElapsedTime, Month LIMIT 3"]}
+{"sql":"SELECT DestStateFips, ArrTimeBlk, UniqueCarrier FROM mytable ORDER BY OriginCityMarketID, ActualElapsedTime, \"Month\" LIMIT 3","hsqls":["SELECT DestStateFips, ArrTimeBlk, UniqueCarrier FROM mytable ORDER BY OriginCityMarketID, ActualElapsedTime, `Month` LIMIT 3"]}
 {"sql":"SELECT DestStateName, DivArrDelay FROM mytable ORDER BY WeatherDelay LIMIT 24"}
 {"sql":"SELECT DestStateFips, DivActualElapsedTime FROM mytable WHERE DepDel15 IN (1) AND OriginCityMarketID IN (32402, 35841, 33192) ORDER BY CRSDepTime LIMIT 10"}
 {"sql":"SELECT DestAirportSeqID, DestStateName, OriginStateName, COUNT(OriginStateFips), MAX(OriginWac) FROM mytable WHERE OriginCityMarketID >= 31401 GROUP BY DestAirportSeqID, DestStateName, OriginStateName  ORDER BY DestAirportSeqID, DestStateName, OriginStateName LIMIT 7","hsqls":["SELECT DestAirportSeqID, DestStateName, OriginStateName, COUNT(OriginStateFips), MAX(OriginWac) FROM mytable WHERE OriginCityMarketID >= 31401 GROUP BY DestAirportSeqID, DestStateName, OriginStateName  ORDER BY DestAirportSeqID, DestStateName, OriginStateName LIMIT 7"]}
 {"sql":"SELECT Diverted, ArrivalDelayGroups FROM mytable WHERE NASDelay > 32 OR DaysSinceEpoch BETWEEN 16090 AND 16091 ORDER BY ActualElapsedTime LIMIT 18"}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (20, 11) OR DivLongestGTimes IN (45.0) ORDER BY AirlineID LIMIT 18","hsqls":["SELECT WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (20, 11) OR (DivLongestGTimes__MV0 IN (45.0) OR DivLongestGTimes__MV1 IN (45.0) OR DivLongestGTimes__MV2 IN (45.0) OR DivLongestGTimes__MV3 IN (45.0) OR DivLongestGTimes__MV4 IN (45.0)) ORDER BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (20, 11) OR DivLongestGTimes IN (45.0) ORDER BY AirlineID LIMIT 18","hsqls":["SELECT WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (20, 11) OR (DivLongestGTimes[1] IN (45.0) OR DivLongestGTimes[2] IN (45.0) OR DivLongestGTimes[3] IN (45.0) OR DivLongestGTimes[4] IN (45.0) OR DivLongestGTimes[5] IN (45.0)) ORDER BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, TailNum, DaysSinceEpoch, COUNT(OriginCityMarketID), SUM(ArrDelay) FROM mytable WHERE DivDistance > 575 OR DestStateFips IN (49) AND OriginCityMarketID BETWEEN 30849 AND 34108 GROUP BY DistanceGroup, TailNum, DaysSinceEpoch  ORDER BY DistanceGroup, TailNum, DaysSinceEpoch LIMIT 2","hsqls":["SELECT DistanceGroup, TailNum, DaysSinceEpoch, COUNT(OriginCityMarketID), SUM(ArrDelay) FROM mytable WHERE DivDistance > 575 OR DestStateFips IN (49) AND OriginCityMarketID BETWEEN 30849 AND 34108 GROUP BY DistanceGroup, TailNum, DaysSinceEpoch  ORDER BY DistanceGroup, TailNum, DaysSinceEpoch LIMIT 2"]}
 {"sql":"SELECT ArrDelay FROM mytable WHERE ArrDel15 BETWEEN 0 AND 0 OR DepDelayMinutes >= 51.0 ORDER BY DepartureDelayGroups, UniqueCarrier LIMIT 6"}
-{"sql":"SELECT DepDel15, SUM(ArrDelay), MIN(\"Month\"), MAX(ArrTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-28' AND '2014-01-18' OR DestAirportID NOT IN (11977, 13198, 11109, 12007, 11995) GROUP BY DepDel15 LIMIT 7","hsqls":["SELECT DepDel15, SUM(ArrDelay), MIN(Month), MAX(ArrTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-28' AND '2014-01-18' OR DestAirportID NOT IN (11977, 13198, 11109, 12007, 11995) GROUP BY DepDel15 LIMIT 7"]}
+{"sql":"SELECT DepDel15, SUM(ArrDelay), MIN(\"Month\"), MAX(ArrTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-28' AND '2014-01-18' OR DestAirportID NOT IN (11977, 13198, 11109, 12007, 11995) GROUP BY DepDel15 LIMIT 7","hsqls":["SELECT DepDel15, SUM(ArrDelay), MIN(`Month`), MAX(ArrTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-28' AND '2014-01-18' OR DestAirportID NOT IN (11977, 13198, 11109, 12007, 11995) GROUP BY DepDel15 LIMIT 7"]}
 {"sql":"SELECT DestWac, Dest, MIN(OriginAirportID) FROM mytable WHERE TailNum IN ('N406WN', 'N363AA', 'N13970') GROUP BY DestWac, Dest  ORDER BY DestWac, Dest LIMIT 18","hsqls":["SELECT DestWac, Dest, MIN(OriginAirportID) FROM mytable WHERE TailNum IN ('N406WN', 'N363AA', 'N13970') GROUP BY DestWac, Dest  ORDER BY DestWac, Dest LIMIT 18"]}
 {"sql":"SELECT Dest, COUNT(*) FROM mytable WHERE Flights = 1 GROUP BY Dest  ORDER BY Dest LIMIT 26","hsqls":["SELECT Dest, COUNT(*) FROM mytable WHERE Flights = 1 GROUP BY Dest  ORDER BY Dest LIMIT 26"]}
 {"sql":"SELECT FlightNum FROM mytable WHERE TaxiOut IN (97, 69, 4, 14, 29) AND Diverted = 1 LIMIT 26"}
 {"sql":"SELECT MAX(AirlineID) FROM mytable WHERE DayofMonth IN (13, 27, 14, 29) OR DestCityMarketID >= 31726 OR DivAirportLandings < 0 LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'Washington' AND 'New Hampshire' LIMIT 2"}
-{"sql":"SELECT Origin, DivWheelsOffs, DestCityMarketID FROM mytable WHERE DaysSinceEpoch NOT IN (16092, 16076) OR DestAirportSeqID BETWEEN 1524903 AND 1226402 ORDER BY DestWac LIMIT 19","hsqls":["SELECT Origin, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DestCityMarketID FROM mytable WHERE DaysSinceEpoch NOT IN (16092, 16076) OR DestAirportSeqID BETWEEN 1524903 AND 1226402 ORDER BY DestWac LIMIT 10000"]}
+{"sql":"SELECT Origin, DivWheelsOffs, DestCityMarketID FROM mytable WHERE DaysSinceEpoch NOT IN (16092, 16076) OR DestAirportSeqID BETWEEN 1524903 AND 1226402 ORDER BY DestWac LIMIT 19","hsqls":["SELECT Origin, DivWheelsOffs, DestCityMarketID FROM mytable WHERE DaysSinceEpoch NOT IN (16092, 16076) OR DestAirportSeqID BETWEEN 1524903 AND 1226402 ORDER BY DestWac LIMIT 10000"]}
 {"sql":"SELECT OriginState, DayofMonth, AirlineID, COUNT(ArrDel15), SUM(DestStateFips) FROM mytable WHERE TotalAddGTime < 19 GROUP BY OriginState, DayofMonth, AirlineID  ORDER BY OriginState, DayofMonth, AirlineID LIMIT 27","hsqls":["SELECT OriginState, DayofMonth, AirlineID, COUNT(ArrDel15), SUM(DestStateFips) FROM mytable WHERE TotalAddGTime < 19 GROUP BY OriginState, DayofMonth, AirlineID  ORDER BY OriginState, DayofMonth, AirlineID LIMIT 27"]}
 {"sql":"SELECT CRSDepTime, COUNT(*) FROM mytable WHERE DepDelay BETWEEN -34.0 AND 310.0 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 10","hsqls":["SELECT CRSDepTime, COUNT(*) FROM mytable WHERE DepDelay BETWEEN -34.0 AND 310.0 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 10"]}
 {"sql":"SELECT DepartureDelayGroups, LongestAddGTime, AVG(DivReachedDest), SUM(Flights), MAX(AirTime) FROM mytable WHERE DestAirportSeqID <> 1080003 AND OriginStateFips BETWEEN 18 AND 1 AND DivDistance < 509 GROUP BY DepartureDelayGroups, LongestAddGTime  ORDER BY DepartureDelayGroups, LongestAddGTime LIMIT 8","hsqls":["SELECT DepartureDelayGroups, LongestAddGTime, AVG(DivReachedDest), SUM(Flights), MAX(AirTime) FROM mytable WHERE DestAirportSeqID <> 1080003 AND OriginStateFips BETWEEN 18 AND 1 AND DivDistance < 509 GROUP BY DepartureDelayGroups, LongestAddGTime  ORDER BY DepartureDelayGroups, LongestAddGTime LIMIT 8"]}
 {"sql":"SELECT MAX(ArrDelayMinutes) FROM mytable LIMIT 21"}
-{"sql":"SELECT CarrierDelay, MIN(DepTime), SUM(ArrTime), MAX(\"Month\") FROM mytable WHERE DestCityMarketID NOT IN (30529) AND OriginState NOT IN ('OH', 'NM', 'DE', 'CO', 'MI') GROUP BY CarrierDelay LIMIT 23","hsqls":["SELECT CarrierDelay, MIN(DepTime), SUM(ArrTime), MAX(Month) FROM mytable WHERE DestCityMarketID NOT IN (30529) AND OriginState NOT IN ('OH', 'NM', 'DE', 'CO', 'MI') GROUP BY CarrierDelay LIMIT 23"]}
+{"sql":"SELECT CarrierDelay, MIN(DepTime), SUM(ArrTime), MAX(\"Month\") FROM mytable WHERE DestCityMarketID NOT IN (30529) AND OriginState NOT IN ('OH', 'NM', 'DE', 'CO', 'MI') GROUP BY CarrierDelay LIMIT 23","hsqls":["SELECT CarrierDelay, MIN(DepTime), SUM(ArrTime), MAX(`Month`) FROM mytable WHERE DestCityMarketID NOT IN (30529) AND OriginState NOT IN ('OH', 'NM', 'DE', 'CO', 'MI') GROUP BY CarrierDelay LIMIT 23"]}
 {"sql":"SELECT DepDelayMinutes, ArrTimeBlk, OriginWac, SUM(DestCityMarketID) FROM mytable WHERE Distance >= 1208 AND ArrTime NOT IN (111) GROUP BY DepDelayMinutes, ArrTimeBlk, OriginWac  ORDER BY DepDelayMinutes, ArrTimeBlk, OriginWac LIMIT 15","hsqls":["SELECT DepDelayMinutes, ArrTimeBlk, OriginWac, SUM(DestCityMarketID) FROM mytable WHERE Distance >= 1208 AND ArrTime NOT IN (111) GROUP BY DepDelayMinutes, ArrTimeBlk, OriginWac  ORDER BY DepDelayMinutes, ArrTimeBlk, OriginWac LIMIT 15"]}
 {"sql":"SELECT ArrDelay FROM mytable WHERE OriginCityName >= 'International Falls, MN' AND ArrTime = 2319 AND FlightNum BETWEEN 3454 AND 3541 ORDER BY WeatherDelay, DepDelayMinutes, OriginCityName LIMIT 27"}
 {"sql":"SELECT ArrDelayMinutes, WheelsOn, OriginAirportID, MIN(DivActualElapsedTime), MAX(DepDel15), COUNT(TailNum) FROM mytable WHERE LateAircraftDelay IN (128) OR OriginStateFips > 51 AND Diverted = 0 GROUP BY ArrDelayMinutes, WheelsOn, OriginAirportID  ORDER BY ArrDelayMinutes, WheelsOn, OriginAirportID LIMIT 1","hsqls":["SELECT ArrDelayMinutes, WheelsOn, OriginAirportID, MIN(DivActualElapsedTime), MAX(DepDel15), COUNT(TailNum) FROM mytable WHERE LateAircraftDelay IN (128) OR OriginStateFips > 51 AND Diverted = 0 GROUP BY ArrDelayMinutes, WheelsOn, OriginAirportID  ORDER BY ArrDelayMinutes, WheelsOn, OriginAirportID LIMIT 1"]}
 {"sql":"SELECT AVG(DestAirportSeqID), MIN(ArrivalDelayGroups) FROM mytable WHERE DivDistance >= 402 LIMIT 21"}
 {"sql":"SELECT DepartureDelayGroups, CancellationCode, AVG(OriginCityMarketID) FROM mytable WHERE DestStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'Massachusetts' GROUP BY DepartureDelayGroups, CancellationCode  ORDER BY DepartureDelayGroups, CancellationCode LIMIT 26","hsqls":["SELECT DepartureDelayGroups, CancellationCode, AVG(OriginCityMarketID) FROM mytable WHERE DestStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'Massachusetts' GROUP BY DepartureDelayGroups, CancellationCode  ORDER BY DepartureDelayGroups, CancellationCode LIMIT 26"]}
 {"sql":"SELECT OriginState, \"Month\", OriginAirportID, MIN(OriginAirportSeqID) FROM mytable WHERE TotalAddGTime NOT IN (25) OR DepDelayMinutes BETWEEN 199.0 AND 245.0 OR DestAirportID BETWEEN 13204 AND 14108 GROUP BY OriginState, \"Month\", OriginAirportID LIMIT 28","hsqls":["SELECT OriginState, Month, OriginAirportID, MIN(OriginAirportSeqID) FROM mytable WHERE TotalAddGTime NOT IN (25) OR DepDelayMinutes BETWEEN 199.0 AND 245.0 OR DestAirportID BETWEEN 13204 AND 14108 GROUP BY OriginState, Month, OriginAirportID LIMIT 28"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE DestStateFips > 1 OR DepTime NOT IN (1523, 1237, 1053, 1636, 2212) AND AirTime BETWEEN 319 AND 328 ORDER BY Dest, DayOfWeek LIMIT 4","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DestStateFips > 1 OR DepTime NOT IN (1523, 1237, 1053, 1636, 2212) AND AirTime BETWEEN 319 AND 328 ORDER BY Dest, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE DestStateFips > 1 OR DepTime NOT IN (1523, 1237, 1053, 1636, 2212) AND AirTime BETWEEN 319 AND 328 ORDER BY Dest, DayOfWeek LIMIT 4","hsqls":["SELECT DivTailNums FROM mytable WHERE DestStateFips > 1 OR DepTime NOT IN (1523, 1237, 1053, 1636, 2212) AND AirTime BETWEEN 319 AND 328 ORDER BY Dest, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE UniqueCarrier NOT IN ('UA') LIMIT 26"}
 {"sql":"SELECT DepartureDelayGroups, OriginWac, MIN(AirTime), SUM(DayofMonth) FROM mytable GROUP BY DepartureDelayGroups, OriginWac  ORDER BY DepartureDelayGroups, OriginWac LIMIT 5","hsqls":["SELECT DepartureDelayGroups, OriginWac, MIN(AirTime), SUM(DayofMonth) FROM mytable GROUP BY DepartureDelayGroups, OriginWac  ORDER BY DepartureDelayGroups, OriginWac LIMIT 5"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE DestCityMarketID BETWEEN 32467 AND 32012 AND TaxiIn BETWEEN 109 AND 56 ORDER BY TaxiIn, DestCityName, CRSElapsedTime LIMIT 19"}
 {"sql":"SELECT WheelsOff, DestCityName, DestStateName FROM mytable ORDER BY FlightDate LIMIT 14"}
 {"sql":"SELECT DestAirportID, WheelsOn, MIN(OriginStateFips), COUNT(OriginAirportID), SUM(DayOfWeek) FROM mytable WHERE DestStateFips BETWEEN 21 AND 26 OR AirlineID IN (20437, 19805) AND LateAircraftDelay <= 247 GROUP BY DestAirportID, WheelsOn  ORDER BY DestAirportID, WheelsOn LIMIT 14","hsqls":["SELECT DestAirportID, WheelsOn, MIN(OriginStateFips), COUNT(OriginAirportID), SUM(DayOfWeek) FROM mytable WHERE DestStateFips BETWEEN 21 AND 26 OR AirlineID IN (20437, 19805) AND LateAircraftDelay <= 247 GROUP BY DestAirportID, WheelsOn  ORDER BY DestAirportID, WheelsOn LIMIT 14"]}
 {"sql":"SELECT TotalAddGTime, TaxiIn, COUNT(*) FROM mytable WHERE ArrDel15 IN (-9999) OR ArrDelayMinutes BETWEEN 44.0 AND 196.0 AND DivActualElapsedTime BETWEEN 466 AND 296 GROUP BY TotalAddGTime, TaxiIn  ORDER BY TotalAddGTime, TaxiIn LIMIT 24","hsqls":["SELECT TotalAddGTime, TaxiIn, COUNT(*) FROM mytable WHERE ArrDel15 IN (-9999) OR ArrDelayMinutes BETWEEN 44.0 AND 196.0 AND DivActualElapsedTime BETWEEN 466 AND 296 GROUP BY TotalAddGTime, TaxiIn  ORDER BY TotalAddGTime, TaxiIn LIMIT 24"]}
-{"sql":"SELECT Carrier, Distance, Cancelled, SUM(\"Year\") FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'noodles' AND \"Month\" IN (1) GROUP BY Carrier, Distance, Cancelled LIMIT 4","hsqls":["SELECT Carrier, Distance, Cancelled, SUM(Year) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'noodles' AND Month IN (1) GROUP BY Carrier, Distance, Cancelled LIMIT 4"]}
+{"sql":"SELECT Carrier, Distance, Cancelled, SUM(\"Year\") FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'noodles' AND \"Month\" IN (1) GROUP BY Carrier, Distance, Cancelled LIMIT 4","hsqls":["SELECT Carrier, Distance, Cancelled, SUM(`Year`) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'noodles' AND `Month` IN (1) GROUP BY Carrier, Distance, Cancelled LIMIT 4"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY Cancelled, DestStateName, CancellationCode LIMIT 25"}
 {"sql":"SELECT FlightDate, DayOfWeek, COUNT(OriginStateName), COUNT(DivArrDelay), COUNT(DestCityName) FROM mytable WHERE ArrDel15 <= 0 GROUP BY FlightDate, DayOfWeek  ORDER BY FlightDate, DayOfWeek LIMIT 16","hsqls":["SELECT FlightDate, DayOfWeek, COUNT(OriginStateName), COUNT(DivArrDelay), COUNT(DestCityName) FROM mytable WHERE ArrDel15 <= 0 GROUP BY FlightDate, DayOfWeek  ORDER BY FlightDate, DayOfWeek LIMIT 16"]}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY DestAirportSeqID, ArrDelay LIMIT 27"}
 {"sql":"SELECT DivDistance, COUNT(*) FROM mytable WHERE DestCityMarketID < 33728 AND CarrierDelay >= 189 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 7","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable WHERE DestCityMarketID < 33728 AND CarrierDelay >= 189 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 7"]}
-{"sql":"SELECT OriginAirportSeqID, Diverted, DestStateName, MIN(DepDelayMinutes), COUNT(Diverted), MIN(TaxiIn) FROM mytable WHERE Dest NOT IN ('GEG', 'CHO', 'BRO', 'ALO') OR DivWheelsOns IN (1330, 757) AND DestAirportSeqID >= 1501603 GROUP BY OriginAirportSeqID, Diverted, DestStateName LIMIT 6","hsqls":["SELECT OriginAirportSeqID, Diverted, DestStateName, MIN(DepDelayMinutes), COUNT(Diverted), MIN(TaxiIn) FROM mytable WHERE Dest NOT IN ('GEG', 'CHO', 'BRO', 'ALO') OR (DivWheelsOns__MV0 IN (1330, 757) OR DivWheelsOns__MV1 IN (1330, 757) OR DivWheelsOns__MV2 IN (1330, 757) OR DivWheelsOns__MV3 IN (1330, 757) OR DivWheelsOns__MV4 IN (1330, 757)) AND DestAirportSeqID >= 1501603 GROUP BY OriginAirportSeqID, Diverted, DestStateName LIMIT 10000"]}
-{"sql":"SELECT DepTime, DivAirportIDs, UniqueCarrier FROM mytable WHERE CRSDepTime > 951 OR DepDelayMinutes > 157.0 AND AirlineID IN (20436, 19790, 19930, 20409) ORDER BY DayOfWeek LIMIT 16","hsqls":["SELECT DepTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, UniqueCarrier FROM mytable WHERE CRSDepTime > 951 OR DepDelayMinutes > 157.0 AND AirlineID IN (20436, 19790, 19930, 20409) ORDER BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, Diverted, DestStateName, MIN(DepDelayMinutes), COUNT(Diverted), MIN(TaxiIn) FROM mytable WHERE Dest NOT IN ('GEG', 'CHO', 'BRO', 'ALO') OR DivWheelsOns IN (1330, 757) AND DestAirportSeqID >= 1501603 GROUP BY OriginAirportSeqID, Diverted, DestStateName LIMIT 6","hsqls":["SELECT OriginAirportSeqID, Diverted, DestStateName, MIN(DepDelayMinutes), COUNT(Diverted), MIN(TaxiIn) FROM mytable WHERE Dest NOT IN ('GEG', 'CHO', 'BRO', 'ALO') OR (DivWheelsOns[1] IN (1330, 757) OR DivWheelsOns[2] IN (1330, 757) OR DivWheelsOns[3] IN (1330, 757) OR DivWheelsOns[4] IN (1330, 757) OR DivWheelsOns[5] IN (1330, 757)) AND DestAirportSeqID >= 1501603 GROUP BY OriginAirportSeqID, Diverted, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivAirportIDs, UniqueCarrier FROM mytable WHERE CRSDepTime > 951 OR DepDelayMinutes > 157.0 AND AirlineID IN (20436, 19790, 19930, 20409) ORDER BY DayOfWeek LIMIT 16","hsqls":["SELECT DepTime, DivAirportIDs, UniqueCarrier FROM mytable WHERE CRSDepTime > 951 OR DepDelayMinutes > 157.0 AND AirlineID IN (20436, 19790, 19930, 20409) ORDER BY DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DestStateName, DepTimeBlk, UniqueCarrier FROM mytable ORDER BY Diverted, ArrTimeBlk, ArrivalDelayGroups LIMIT 26"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DayofMonth IN (7, 6, 8) OR DestCityMarketID < 34254 AND AirlineID IN (20304, 20436, 19393, 20437, 20355) ORDER BY WheelsOff, DepartureDelayGroups, DestAirportSeqID LIMIT 26","hsqls":["SELECT Year FROM mytable WHERE DayofMonth IN (7, 6, 8) OR DestCityMarketID < 34254 AND AirlineID IN (20304, 20436, 19393, 20437, 20355) ORDER BY WheelsOff, DepartureDelayGroups, DestAirportSeqID LIMIT 26"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DayofMonth IN (7, 6, 8) OR DestCityMarketID < 34254 AND AirlineID IN (20304, 20436, 19393, 20437, 20355) ORDER BY WheelsOff, DepartureDelayGroups, DestAirportSeqID LIMIT 26","hsqls":["SELECT `Year` FROM mytable WHERE DayofMonth IN (7, 6, 8) OR DestCityMarketID < 34254 AND AirlineID IN (20304, 20436, 19393, 20437, 20355) ORDER BY WheelsOff, DepartureDelayGroups, DestAirportSeqID LIMIT 26"]}
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY \"Year\", ArrTime, ArrTimeBlk LIMIT 25","hsqls":["SELECT DestCityMarketID FROM mytable ORDER BY Year, ArrTime, ArrTimeBlk LIMIT 25"]}
 {"sql":"SELECT TotalAddGTime, DepDel15 FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND OriginCityMarketID BETWEEN 32012 AND 31921 ORDER BY FlightDate, OriginStateName LIMIT 15"}
 {"sql":"SELECT DivDistance, Distance, DepDel15, AVG(DayOfWeek), AVG(CRSElapsedTime) FROM mytable WHERE DepTime IN (1307, 1309, 1505, 1153, 1900) AND DayOfWeek IN (4) OR ArrDelayMinutes BETWEEN 418.0 AND 209.0 GROUP BY DivDistance, Distance, DepDel15  ORDER BY DivDistance, Distance, DepDel15 LIMIT 13","hsqls":["SELECT DivDistance, Distance, DepDel15, AVG(DayOfWeek), AVG(CRSElapsedTime) FROM mytable WHERE DepTime IN (1307, 1309, 1505, 1153, 1900) AND DayOfWeek IN (4) OR ArrDelayMinutes BETWEEN 418.0 AND 209.0 GROUP BY DivDistance, Distance, DepDel15  ORDER BY DivDistance, Distance, DepDel15 LIMIT 13"]}
-{"sql":"SELECT DepDelay, ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE ArrTime IN (601, 1840, 702) AND DayOfWeek > 6 AND CarrierDelay BETWEEN 150 AND 189 LIMIT 20","hsqls":["SELECT DepDelay, ArrDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE ArrTime IN (601, 1840, 702) AND DayOfWeek > 6 AND CarrierDelay BETWEEN 150 AND 189 LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DestWac, COUNT(NASDelay), MIN(DivArrDelay), MIN(DistanceGroup) FROM mytable WHERE DivWheelsOns IN (2146, 2254) AND DepDelayMinutes BETWEEN 251.0 AND 234.0 OR LongestAddGTime < 24 GROUP BY OriginAirportSeqID, DestWac LIMIT 2","hsqls":["SELECT OriginAirportSeqID, DestWac, COUNT(NASDelay), MIN(DivArrDelay), MIN(DistanceGroup) FROM mytable WHERE (DivWheelsOns__MV0 IN (2146, 2254) OR DivWheelsOns__MV1 IN (2146, 2254) OR DivWheelsOns__MV2 IN (2146, 2254) OR DivWheelsOns__MV3 IN (2146, 2254) OR DivWheelsOns__MV4 IN (2146, 2254)) AND DepDelayMinutes BETWEEN 251.0 AND 234.0 OR LongestAddGTime < 24 GROUP BY OriginAirportSeqID, DestWac LIMIT 10000"]}
+{"sql":"SELECT DepDelay, ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE ArrTime IN (601, 1840, 702) AND DayOfWeek > 6 AND CarrierDelay BETWEEN 150 AND 189 LIMIT 20","hsqls":["SELECT DepDelay, ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE ArrTime IN (601, 1840, 702) AND DayOfWeek > 6 AND CarrierDelay BETWEEN 150 AND 189 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DestWac, COUNT(NASDelay), MIN(DivArrDelay), MIN(DistanceGroup) FROM mytable WHERE DivWheelsOns IN (2146, 2254) AND DepDelayMinutes BETWEEN 251.0 AND 234.0 OR LongestAddGTime < 24 GROUP BY OriginAirportSeqID, DestWac LIMIT 2","hsqls":["SELECT OriginAirportSeqID, DestWac, COUNT(NASDelay), MIN(DivArrDelay), MIN(DistanceGroup) FROM mytable WHERE (DivWheelsOns[1] IN (2146, 2254) OR DivWheelsOns[2] IN (2146, 2254) OR DivWheelsOns[3] IN (2146, 2254) OR DivWheelsOns[4] IN (2146, 2254) OR DivWheelsOns[5] IN (2146, 2254)) AND DepDelayMinutes BETWEEN 251.0 AND 234.0 OR LongestAddGTime < 24 GROUP BY OriginAirportSeqID, DestWac LIMIT 10000"]}
 {"sql":"SELECT OriginWac FROM mytable WHERE DestState BETWEEN 'WV' AND 'NY' AND Diverted = 0 ORDER BY ArrTime LIMIT 26"}
 {"sql":"SELECT OriginWac FROM mytable WHERE FlightNum IN (3629, 1949) ORDER BY DepTime, ArrDelayMinutes, DivArrDelay LIMIT 1"}
 {"sql":"SELECT AVG(NASDelay), MAX(NASDelay), SUM(CRSArrTime) FROM mytable WHERE DayofMonth <= 12 AND FlightDate BETWEEN '2014-01-31' AND '2014-01-30' OR LateAircraftDelay NOT IN (195) LIMIT 19"}
@@ -910,7 +910,7 @@
 {"sql":"SELECT DepDelayMinutes, WheelsOn, COUNT(*) FROM mytable WHERE ArrTime <= 1114 GROUP BY DepDelayMinutes, WheelsOn  ORDER BY DepDelayMinutes, WheelsOn LIMIT 10","hsqls":["SELECT DepDelayMinutes, WheelsOn, COUNT(*) FROM mytable WHERE ArrTime <= 1114 GROUP BY DepDelayMinutes, WheelsOn  ORDER BY DepDelayMinutes, WheelsOn LIMIT 10"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE ArrTimeBlk IN ('1600-1659') AND OriginAirportSeqID >= 1393102 AND OriginWac BETWEEN 65 AND 1 LIMIT 7"}
 {"sql":"SELECT DestState, DepTimeBlk, DayofMonth FROM mytable WHERE TaxiIn BETWEEN 59 AND 93 ORDER BY Carrier LIMIT 23"}
-{"sql":"SELECT OriginCityMarketID, DestCityMarketID, MIN(DestAirportID), MAX(OriginWac) FROM mytable WHERE DivWheelsOns <= 2254 GROUP BY OriginCityMarketID, DestCityMarketID LIMIT 17","hsqls":["SELECT OriginCityMarketID, DestCityMarketID, MIN(DestAirportID), MAX(OriginWac) FROM mytable WHERE (DivWheelsOns__MV0 <= 2254 OR DivWheelsOns__MV1 <= 2254 OR DivWheelsOns__MV2 <= 2254 OR DivWheelsOns__MV3 <= 2254 OR DivWheelsOns__MV4 <= 2254) GROUP BY OriginCityMarketID, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestCityMarketID, MIN(DestAirportID), MAX(OriginWac) FROM mytable WHERE DivWheelsOns <= 2254 GROUP BY OriginCityMarketID, DestCityMarketID LIMIT 17","hsqls":["SELECT OriginCityMarketID, DestCityMarketID, MIN(DestAirportID), MAX(OriginWac) FROM mytable WHERE (DivWheelsOns[1] <= 2254 OR DivWheelsOns[2] <= 2254 OR DivWheelsOns[3] <= 2254 OR DivWheelsOns[4] <= 2254 OR DivWheelsOns[5] <= 2254) GROUP BY OriginCityMarketID, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT Diverted, TailNum, DaysSinceEpoch, SUM(ArrivalDelayGroups), MAX(DivReachedDest) FROM mytable WHERE FlightDate = '2014-01-26' AND DepDelay BETWEEN 99.0 AND 86.0 AND DepTimeBlk = '1400-1459' GROUP BY Diverted, TailNum, DaysSinceEpoch  ORDER BY Diverted, TailNum, DaysSinceEpoch LIMIT 4","hsqls":["SELECT Diverted, TailNum, DaysSinceEpoch, SUM(ArrivalDelayGroups), MAX(DivReachedDest) FROM mytable WHERE FlightDate = '2014-01-26' AND DepDelay BETWEEN 99.0 AND 86.0 AND DepTimeBlk = '1400-1459' GROUP BY Diverted, TailNum, DaysSinceEpoch  ORDER BY Diverted, TailNum, DaysSinceEpoch LIMIT 4"]}
 {"sql":"SELECT CancellationCode, MAX(SecurityDelay), COUNT(CarrierDelay) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 10","hsqls":["SELECT CancellationCode, MAX(SecurityDelay), COUNT(CarrierDelay) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 10"]}
 {"sql":"SELECT DivReachedDest, OriginCityMarketID, COUNT(*) FROM mytable WHERE ArrDelay <= 4.0 GROUP BY DivReachedDest, OriginCityMarketID  ORDER BY DivReachedDest, OriginCityMarketID LIMIT 3","hsqls":["SELECT DivReachedDest, OriginCityMarketID, COUNT(*) FROM mytable WHERE ArrDelay <= 4.0 GROUP BY DivReachedDest, OriginCityMarketID  ORDER BY DivReachedDest, OriginCityMarketID LIMIT 3"]}
@@ -919,25 +919,25 @@
 {"sql":"SELECT WeatherDelay, DestCityMarketID FROM mytable WHERE FlightNum BETWEEN 5571 AND 4591 OR FlightNum = 6431 ORDER BY DepTime LIMIT 26"}
 {"sql":"SELECT DestCityName FROM mytable LIMIT 10"}
 {"sql":"SELECT WheelsOff, OriginStateFips, DepDel15 FROM mytable WHERE FlightDate IN ('2014-01-12', '2014-01-03', '2014-01-29', '2014-01-13', '2014-01-20') ORDER BY OriginCityName LIMIT 16"}
-{"sql":"SELECT DepDelayMinutes, COUNT(DepDelay), COUNT(CarrierDelay), SUM(Distance) FROM mytable WHERE TaxiIn <> 37 OR DestState BETWEEN 'CO' AND 'MO' AND DivTailNums BETWEEN 'N303DQ' AND 'N873AS' GROUP BY DepDelayMinutes LIMIT 18","hsqls":["SELECT DepDelayMinutes, COUNT(DepDelay), COUNT(CarrierDelay), SUM(Distance) FROM mytable WHERE TaxiIn <> 37 OR DestState BETWEEN 'CO' AND 'MO' AND (DivTailNums__MV0 BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums__MV1 BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums__MV2 BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums__MV3 BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums__MV4 BETWEEN 'N303DQ' AND 'N873AS') GROUP BY DepDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT Dest, SUM(TaxiOut), SUM(DestAirportSeqID) FROM mytable WHERE DivWheelsOns BETWEEN 855 AND 1434 AND DestStateName BETWEEN 'Connecticut' AND 'Mississippi' OR DepTime >= 1755 GROUP BY Dest LIMIT 15","hsqls":["SELECT Dest, SUM(TaxiOut), SUM(DestAirportSeqID) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 855 AND 1434 OR DivWheelsOns__MV1 BETWEEN 855 AND 1434 OR DivWheelsOns__MV2 BETWEEN 855 AND 1434 OR DivWheelsOns__MV3 BETWEEN 855 AND 1434 OR DivWheelsOns__MV4 BETWEEN 855 AND 1434) AND DestStateName BETWEEN 'Connecticut' AND 'Mississippi' OR DepTime >= 1755 GROUP BY Dest LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, COUNT(DepDelay), COUNT(CarrierDelay), SUM(Distance) FROM mytable WHERE TaxiIn <> 37 OR DestState BETWEEN 'CO' AND 'MO' AND DivTailNums BETWEEN 'N303DQ' AND 'N873AS' GROUP BY DepDelayMinutes LIMIT 18","hsqls":["SELECT DepDelayMinutes, COUNT(DepDelay), COUNT(CarrierDelay), SUM(Distance) FROM mytable WHERE TaxiIn <> 37 OR DestState BETWEEN 'CO' AND 'MO' AND (DivTailNums[1] BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums[2] BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums[3] BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums[4] BETWEEN 'N303DQ' AND 'N873AS' OR DivTailNums[5] BETWEEN 'N303DQ' AND 'N873AS') GROUP BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT Dest, SUM(TaxiOut), SUM(DestAirportSeqID) FROM mytable WHERE DivWheelsOns BETWEEN 855 AND 1434 AND DestStateName BETWEEN 'Connecticut' AND 'Mississippi' OR DepTime >= 1755 GROUP BY Dest LIMIT 15","hsqls":["SELECT Dest, SUM(TaxiOut), SUM(DestAirportSeqID) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 855 AND 1434 OR DivWheelsOns[2] BETWEEN 855 AND 1434 OR DivWheelsOns[3] BETWEEN 855 AND 1434 OR DivWheelsOns[4] BETWEEN 855 AND 1434 OR DivWheelsOns[5] BETWEEN 855 AND 1434) AND DestStateName BETWEEN 'Connecticut' AND 'Mississippi' OR DepTime >= 1755 GROUP BY Dest LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DestCityMarketID, DaysSinceEpoch FROM mytable WHERE Origin <= 'BMI' AND DestStateName NOT IN ('Colorado', 'Kentucky') ORDER BY FlightNum, CRSDepTime LIMIT 22"}
 {"sql":"SELECT MAX(Flights), SUM(WeatherDelay), AVG(Diverted) FROM mytable WHERE WeatherDelay BETWEEN 43 AND 55 LIMIT 4"}
 {"sql":"SELECT ArrTime, Origin FROM mytable ORDER BY LongestAddGTime, DestCityName, DayOfWeek LIMIT 8"}
 {"sql":"SELECT Quarter, DestState FROM mytable WHERE ActualElapsedTime >= 182 LIMIT 26"}
 {"sql":"SELECT DestStateFips, COUNT(*) FROM mytable WHERE WheelsOn NOT IN (1614, 1415, 1320, 1819) GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 27","hsqls":["SELECT DestStateFips, COUNT(*) FROM mytable WHERE WheelsOn NOT IN (1614, 1415, 1320, 1819) GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 27"]}
 {"sql":"SELECT OriginStateFips, Cancelled, AirlineID, AVG(DivReachedDest), COUNT(TaxiIn) FROM mytable WHERE DepDelay NOT IN (243.0, 0.0, 67.0, 168.0) AND LateAircraftDelay IN (182, 121, 56, 159, 142) AND ActualElapsedTime < 75 GROUP BY OriginStateFips, Cancelled, AirlineID","hsqls":["SELECT OriginStateFips, Cancelled, AirlineID, AVG(DivReachedDest), COUNT(TaxiIn) FROM mytable WHERE DepDelay NOT IN (243.0, 0.0, 67.0, 168.0) AND LateAircraftDelay IN (182, 121, 56, 159, 142) AND ActualElapsedTime < 75 GROUP BY OriginStateFips, Cancelled, AirlineID"]}
-{"sql":"SELECT MAX(OriginCityMarketID), COUNT(DayOfWeek), AVG(DayofMonth) FROM mytable WHERE TotalAddGTime BETWEEN 4 AND 32 AND Distance IN (683, 2447, 2846, 606, 2136) AND \"Month\" <= 1 LIMIT 25","hsqls":["SELECT MAX(OriginCityMarketID), COUNT(DayOfWeek), AVG(DayofMonth) FROM mytable WHERE TotalAddGTime BETWEEN 4 AND 32 AND Distance IN (683, 2447, 2846, 606, 2136) AND Month <= 1 LIMIT 25"]}
+{"sql":"SELECT MAX(OriginCityMarketID), COUNT(DayOfWeek), AVG(DayofMonth) FROM mytable WHERE TotalAddGTime BETWEEN 4 AND 32 AND Distance IN (683, 2447, 2846, 606, 2136) AND \"Month\" <= 1 LIMIT 25","hsqls":["SELECT MAX(OriginCityMarketID), COUNT(DayOfWeek), AVG(DayofMonth) FROM mytable WHERE TotalAddGTime BETWEEN 4 AND 32 AND Distance IN (683, 2447, 2846, 606, 2136) AND `Month` <= 1 LIMIT 25"]}
 {"sql":"SELECT OriginState, FirstDepTime, FlightNum FROM mytable ORDER BY Origin, OriginStateName, DaysSinceEpoch LIMIT 16"}
-{"sql":"SELECT FlightNum, Dest, ArrivalDelayGroups FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) OR DivTailNums BETWEEN 'N16981' AND 'N806JB' AND DestStateName IN ('Massachusetts') LIMIT 12","hsqls":["SELECT FlightNum, Dest, ArrivalDelayGroups FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) OR (DivTailNums__MV0 BETWEEN 'N16981' AND 'N806JB' OR DivTailNums__MV1 BETWEEN 'N16981' AND 'N806JB' OR DivTailNums__MV2 BETWEEN 'N16981' AND 'N806JB' OR DivTailNums__MV3 BETWEEN 'N16981' AND 'N806JB' OR DivTailNums__MV4 BETWEEN 'N16981' AND 'N806JB') AND DestStateName IN ('Massachusetts') LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, COUNT(\"Month\"), SUM(DayOfWeek) FROM mytable WHERE DivWheelsOns IN (1541, 1518, 1942) AND CRSArrTime BETWEEN 1758 AND 1107 GROUP BY LongestAddGTime LIMIT 9","hsqls":["SELECT LongestAddGTime, COUNT(Month), SUM(DayOfWeek) FROM mytable WHERE (DivWheelsOns__MV0 IN (1541, 1518, 1942) OR DivWheelsOns__MV1 IN (1541, 1518, 1942) OR DivWheelsOns__MV2 IN (1541, 1518, 1942) OR DivWheelsOns__MV3 IN (1541, 1518, 1942) OR DivWheelsOns__MV4 IN (1541, 1518, 1942)) AND CRSArrTime BETWEEN 1758 AND 1107 GROUP BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT FlightNum, Dest, ArrivalDelayGroups FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) OR DivTailNums BETWEEN 'N16981' AND 'N806JB' AND DestStateName IN ('Massachusetts') LIMIT 12","hsqls":["SELECT FlightNum, Dest, ArrivalDelayGroups FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) OR (DivTailNums[1] BETWEEN 'N16981' AND 'N806JB' OR DivTailNums[2] BETWEEN 'N16981' AND 'N806JB' OR DivTailNums[3] BETWEEN 'N16981' AND 'N806JB' OR DivTailNums[4] BETWEEN 'N16981' AND 'N806JB' OR DivTailNums[5] BETWEEN 'N16981' AND 'N806JB') AND DestStateName IN ('Massachusetts') LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, COUNT(\"Month\"), SUM(DayOfWeek) FROM mytable WHERE DivWheelsOns IN (1541, 1518, 1942) AND CRSArrTime BETWEEN 1758 AND 1107 GROUP BY LongestAddGTime LIMIT 9","hsqls":["SELECT LongestAddGTime, COUNT(`Month`), SUM(DayOfWeek) FROM mytable WHERE (DivWheelsOns[1] IN (1541, 1518, 1942) OR DivWheelsOns[2] IN (1541, 1518, 1942) OR DivWheelsOns[3] IN (1541, 1518, 1942) OR DivWheelsOns[4] IN (1541, 1518, 1942) OR DivWheelsOns[5] IN (1541, 1518, 1942)) AND CRSArrTime BETWEEN 1758 AND 1107 GROUP BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, OriginWac FROM mytable ORDER BY Carrier, ArrTimeBlk LIMIT 19"}
-{"sql":"SELECT TaxiIn, \"Month\" FROM mytable WHERE DaysSinceEpoch BETWEEN 16100 AND 16071 ORDER BY FirstDepTime, TotalAddGTime","hsqls":["SELECT TaxiIn, Month FROM mytable WHERE DaysSinceEpoch BETWEEN 16100 AND 16071 ORDER BY FirstDepTime, TotalAddGTime"]}
-{"sql":"SELECT FlightDate FROM mytable WHERE DivWheelsOns BETWEEN 1937 AND 2329 OR DepDelayMinutes <> 27.0 OR DayofMonth IN (17) ORDER BY OriginCityName LIMIT 24","hsqls":["SELECT FlightDate FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1937 AND 2329 OR DivWheelsOns__MV1 BETWEEN 1937 AND 2329 OR DivWheelsOns__MV2 BETWEEN 1937 AND 2329 OR DivWheelsOns__MV3 BETWEEN 1937 AND 2329 OR DivWheelsOns__MV4 BETWEEN 1937 AND 2329) OR DepDelayMinutes <> 27.0 OR DayofMonth IN (17) ORDER BY OriginCityName LIMIT 10000"]}
-{"sql":"SELECT DivActualElapsedTime, OriginStateName, SUM(ArrDelayMinutes), MIN(DepDel15) FROM mytable WHERE DivTotalGTimes IN (6, 39, 85) AND ArrDelayMinutes > 184.0 AND DestAirportSeqID NOT IN (1342402, 1486903, 1125203) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 19","hsqls":["SELECT DivActualElapsedTime, OriginStateName, SUM(ArrDelayMinutes), MIN(DepDel15) FROM mytable WHERE (DivTotalGTimes__MV0 IN (6, 39, 85) OR DivTotalGTimes__MV1 IN (6, 39, 85) OR DivTotalGTimes__MV2 IN (6, 39, 85) OR DivTotalGTimes__MV3 IN (6, 39, 85) OR DivTotalGTimes__MV4 IN (6, 39, 85)) AND ArrDelayMinutes > 184.0 AND DestAirportSeqID NOT IN (1342402, 1486903, 1125203) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, \"Month\" FROM mytable WHERE DaysSinceEpoch BETWEEN 16100 AND 16071 ORDER BY FirstDepTime, TotalAddGTime","hsqls":["SELECT TaxiIn, `Month` FROM mytable WHERE DaysSinceEpoch BETWEEN 16100 AND 16071 ORDER BY FirstDepTime, TotalAddGTime"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE DivWheelsOns BETWEEN 1937 AND 2329 OR DepDelayMinutes <> 27.0 OR DayofMonth IN (17) ORDER BY OriginCityName LIMIT 24","hsqls":["SELECT FlightDate FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1937 AND 2329 OR DivWheelsOns[2] BETWEEN 1937 AND 2329 OR DivWheelsOns[3] BETWEEN 1937 AND 2329 OR DivWheelsOns[4] BETWEEN 1937 AND 2329 OR DivWheelsOns[5] BETWEEN 1937 AND 2329) OR DepDelayMinutes <> 27.0 OR DayofMonth IN (17) ORDER BY OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivActualElapsedTime, OriginStateName, SUM(ArrDelayMinutes), MIN(DepDel15) FROM mytable WHERE DivTotalGTimes IN (6, 39, 85) AND ArrDelayMinutes > 184.0 AND DestAirportSeqID NOT IN (1342402, 1486903, 1125203) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 19","hsqls":["SELECT DivActualElapsedTime, OriginStateName, SUM(ArrDelayMinutes), MIN(DepDel15) FROM mytable WHERE (DivTotalGTimes[1] IN (6, 39, 85) OR DivTotalGTimes[2] IN (6, 39, 85) OR DivTotalGTimes[3] IN (6, 39, 85) OR DivTotalGTimes[4] IN (6, 39, 85) OR DivTotalGTimes[5] IN (6, 39, 85)) AND ArrDelayMinutes > 184.0 AND DestAirportSeqID NOT IN (1342402, 1486903, 1125203) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE DivReachedDest IN (1, 0, -9999) OR Distance BETWEEN 911 AND 691 AND Flights BETWEEN 1 AND 1 ORDER BY DivArrDelay LIMIT 11"}
-{"sql":"SELECT \"Year\", SecurityDelay, Cancelled, AVG(\"Month\"), SUM(\"Month\"), AVG(FlightNum) FROM mytable WHERE TaxiOut NOT IN (6) GROUP BY \"Year\", SecurityDelay, Cancelled LIMIT 19","hsqls":["SELECT Year, SecurityDelay, Cancelled, AVG(Month), SUM(Month), AVG(FlightNum) FROM mytable WHERE TaxiOut NOT IN (6) GROUP BY Year, SecurityDelay, Cancelled LIMIT 19"]}
-{"sql":"SELECT DepTime, DestCityName, Origin, AVG(CarrierDelay), AVG(OriginWac), COUNT(DivActualElapsedTime) FROM mytable WHERE DepDelay IN (116.0) OR DepDelayMinutes = 87.0 OR DivAirports = 'TYS' GROUP BY DepTime, DestCityName, Origin LIMIT 5","hsqls":["SELECT DepTime, DestCityName, Origin, AVG(CarrierDelay), AVG(OriginWac), COUNT(DivActualElapsedTime) FROM mytable WHERE DepDelay IN (116.0) OR DepDelayMinutes = 87.0 OR (DivAirports__MV0 = 'TYS' OR DivAirports__MV1 = 'TYS' OR DivAirports__MV2 = 'TYS' OR DivAirports__MV3 = 'TYS' OR DivAirports__MV4 = 'TYS') GROUP BY DepTime, DestCityName, Origin LIMIT 10000"]}
+{"sql":"SELECT \"Year\", SecurityDelay, Cancelled, AVG(\"Month\"), SUM(\"Month\"), AVG(FlightNum) FROM mytable WHERE TaxiOut NOT IN (6) GROUP BY \"Year\", SecurityDelay, Cancelled LIMIT 19","hsqls":["SELECT Year, SecurityDelay, Cancelled, AVG(`Month`), SUM(`Month`), AVG(FlightNum) FROM mytable WHERE TaxiOut NOT IN (6) GROUP BY Year, SecurityDelay, Cancelled LIMIT 19"]}
+{"sql":"SELECT DepTime, DestCityName, Origin, AVG(CarrierDelay), AVG(OriginWac), COUNT(DivActualElapsedTime) FROM mytable WHERE DepDelay IN (116.0) OR DepDelayMinutes = 87.0 OR DivAirports = 'TYS' GROUP BY DepTime, DestCityName, Origin LIMIT 5","hsqls":["SELECT DepTime, DestCityName, Origin, AVG(CarrierDelay), AVG(OriginWac), COUNT(DivActualElapsedTime) FROM mytable WHERE DepDelay IN (116.0) OR DepDelayMinutes = 87.0 OR (DivAirports[1] = 'TYS' OR DivAirports[2] = 'TYS' OR DivAirports[3] = 'TYS' OR DivAirports[4] = 'TYS' OR DivAirports[5] = 'TYS') GROUP BY DepTime, DestCityName, Origin LIMIT 10000"]}
 {"sql":"SELECT SUM(Cancelled), SUM(DaysSinceEpoch), COUNT(DestState) FROM mytable LIMIT 20"}
 {"sql":"SELECT Carrier, LongestAddGTime, CancellationCode, MIN(WeatherDelay), SUM(OriginStateFips) FROM mytable WHERE DestState BETWEEN 'NJ' AND 'AZ' GROUP BY Carrier, LongestAddGTime, CancellationCode  ORDER BY Carrier, LongestAddGTime, CancellationCode LIMIT 15","hsqls":["SELECT Carrier, LongestAddGTime, CancellationCode, MIN(WeatherDelay), SUM(OriginStateFips) FROM mytable WHERE DestState BETWEEN 'NJ' AND 'AZ' GROUP BY Carrier, LongestAddGTime, CancellationCode  ORDER BY Carrier, LongestAddGTime, CancellationCode LIMIT 15"]}
 {"sql":"SELECT DepDelay FROM mytable LIMIT 10"}
@@ -948,26 +948,26 @@
 {"sql":"SELECT TaxiOut, NASDelay FROM mytable LIMIT 6"}
 {"sql":"SELECT DepTime, TaxiIn, DivArrDelay FROM mytable WHERE TailNum IN ('N17146', 'N540AA', 'N924WN') AND OriginStateName < 'Hawaii' OR OriginCityMarketID BETWEEN 32335 AND 30189 ORDER BY CRSElapsedTime LIMIT 9"}
 {"sql":"SELECT CarrierDelay, AVG(LongestAddGTime) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 12","hsqls":["SELECT CarrierDelay, AVG(LongestAddGTime) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 12"]}
-{"sql":"SELECT ArrTime, DivAirportIDs, CancellationCode FROM mytable ORDER BY OriginCityMarketID, ArrDel15 LIMIT 4","hsqls":["SELECT ArrTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CancellationCode FROM mytable ORDER BY OriginCityMarketID, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT ArrTime, DivAirportIDs, CancellationCode FROM mytable ORDER BY OriginCityMarketID, ArrDel15 LIMIT 4","hsqls":["SELECT ArrTime, DivAirportIDs, CancellationCode FROM mytable ORDER BY OriginCityMarketID, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT TailNum, CRSDepTime, MAX(CRSElapsedTime) FROM mytable WHERE CRSDepTime IN (2053, 727, 2350, 857) GROUP BY TailNum, CRSDepTime  ORDER BY TailNum, CRSDepTime LIMIT 15","hsqls":["SELECT TailNum, CRSDepTime, MAX(CRSElapsedTime) FROM mytable WHERE CRSDepTime IN (2053, 727, 2350, 857) GROUP BY TailNum, CRSDepTime  ORDER BY TailNum, CRSDepTime LIMIT 15"]}
 {"sql":"SELECT DivDistance, UniqueCarrier FROM mytable WHERE DayofMonth BETWEEN 18 AND 27 ORDER BY \"Year\", DaysSinceEpoch LIMIT 13","hsqls":["SELECT DivDistance, UniqueCarrier FROM mytable WHERE DayofMonth BETWEEN 18 AND 27 ORDER BY Year, DaysSinceEpoch LIMIT 13"]}
 {"sql":"SELECT DistanceGroup, UniqueCarrier, DayOfWeek FROM mytable WHERE FirstDepTime NOT IN (1200, 1957, 1136, 1605) OR ArrivalDelayGroups BETWEEN 4 AND 8 AND Flights BETWEEN 1 AND 1 LIMIT 24"}
 {"sql":"SELECT Diverted, DestStateName, DaysSinceEpoch FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 AND CRSElapsedTime >= 57 OR FlightNum = 2718 LIMIT 4"}
-{"sql":"SELECT COUNT(DepDel15), MIN(DepDelay), SUM(OriginCityMarketID) FROM mytable WHERE CRSDepTime < 955 OR DivWheelsOns <= 1911 OR OriginCityMarketID < 32575 LIMIT 1","hsqls":["SELECT COUNT(DepDel15), MIN(DepDelay), SUM(OriginCityMarketID)  FROM mytable WHERE CRSDepTime < 955 OR (DivWheelsOns__MV0 <= 1911 OR DivWheelsOns__MV1 <= 1911 OR DivWheelsOns__MV2 <= 1911 OR DivWheelsOns__MV3 <= 1911 OR DivWheelsOns__MV4 <= 1911) OR OriginCityMarketID < 32575 LIMIT 10000"]}
-{"sql":"SELECT DivAirports, FlightNum, DepTimeBlk FROM mytable WHERE DepDel15 IN (1, 0, -9999) LIMIT 5","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, FlightNum, DepTimeBlk FROM mytable WHERE DepDel15 IN (1, 0, -9999) LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, ArrTimeBlk, ArrDelay, SUM(ArrivalDelayGroups), SUM(DivActualElapsedTime) FROM mytable WHERE CRSElapsedTime BETWEEN 505 AND 395 AND DivTotalGTimes > 201 GROUP BY DestStateFips, ArrTimeBlk, ArrDelay LIMIT 16","hsqls":["SELECT DestStateFips, ArrTimeBlk, ArrDelay, SUM(ArrivalDelayGroups), SUM(DivActualElapsedTime) FROM mytable WHERE CRSElapsedTime BETWEEN 505 AND 395 AND (DivTotalGTimes__MV0 > 201 OR DivTotalGTimes__MV1 > 201 OR DivTotalGTimes__MV2 > 201 OR DivTotalGTimes__MV3 > 201 OR DivTotalGTimes__MV4 > 201) GROUP BY DestStateFips, ArrTimeBlk, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepDel15), MIN(DepDelay), SUM(OriginCityMarketID) FROM mytable WHERE CRSDepTime < 955 OR DivWheelsOns <= 1911 OR OriginCityMarketID < 32575 LIMIT 1","hsqls":["SELECT COUNT(DepDel15), MIN(DepDelay), SUM(OriginCityMarketID)  FROM mytable WHERE CRSDepTime < 955 OR (DivWheelsOns[1] <= 1911 OR DivWheelsOns[2] <= 1911 OR DivWheelsOns[3] <= 1911 OR DivWheelsOns[4] <= 1911 OR DivWheelsOns[5] <= 1911) OR OriginCityMarketID < 32575 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, FlightNum, DepTimeBlk FROM mytable WHERE DepDel15 IN (1, 0, -9999) LIMIT 5","hsqls":["SELECT DivAirports, FlightNum, DepTimeBlk FROM mytable WHERE DepDel15 IN (1, 0, -9999) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, ArrTimeBlk, ArrDelay, SUM(ArrivalDelayGroups), SUM(DivActualElapsedTime) FROM mytable WHERE CRSElapsedTime BETWEEN 505 AND 395 AND DivTotalGTimes > 201 GROUP BY DestStateFips, ArrTimeBlk, ArrDelay LIMIT 16","hsqls":["SELECT DestStateFips, ArrTimeBlk, ArrDelay, SUM(ArrivalDelayGroups), SUM(DivActualElapsedTime) FROM mytable WHERE CRSElapsedTime BETWEEN 505 AND 395 AND (DivTotalGTimes[1] > 201 OR DivTotalGTimes[2] > 201 OR DivTotalGTimes[3] > 201 OR DivTotalGTimes[4] > 201 OR DivTotalGTimes[5] > 201) GROUP BY DestStateFips, ArrTimeBlk, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DivActualElapsedTime FROM mytable WHERE DivAirportLandings > 2 OR OriginCityMarketID IN (30279) AND OriginCityName BETWEEN 'Wilmington, NC' AND 'Saginaw/Bay City/Midland, MI' ORDER BY Flights LIMIT 5"}
-{"sql":"SELECT TailNum, MIN(TotalAddGTime) FROM mytable WHERE TotalAddGTime BETWEEN 41 AND -9999 OR OriginWac < 86 OR \"Month\" NOT IN (1) GROUP BY TailNum LIMIT 12","hsqls":["SELECT TailNum, MIN(TotalAddGTime) FROM mytable WHERE TotalAddGTime BETWEEN 41 AND -9999 OR OriginWac < 86 OR Month NOT IN (1) GROUP BY TailNum LIMIT 12"]}
+{"sql":"SELECT TailNum, MIN(TotalAddGTime) FROM mytable WHERE TotalAddGTime BETWEEN 41 AND -9999 OR OriginWac < 86 OR \"Month\" NOT IN (1) GROUP BY TailNum LIMIT 12","hsqls":["SELECT TailNum, MIN(TotalAddGTime) FROM mytable WHERE TotalAddGTime BETWEEN 41 AND -9999 OR OriginWac < 86 OR `Month` NOT IN (1) GROUP BY TailNum LIMIT 12"]}
 {"sql":"SELECT OriginStateFips, ArrTime, DayofMonth, MAX(WheelsOn) FROM mytable GROUP BY OriginStateFips, ArrTime, DayofMonth  ORDER BY OriginStateFips, ArrTime, DayofMonth LIMIT 2","hsqls":["SELECT OriginStateFips, ArrTime, DayofMonth, MAX(WheelsOn) FROM mytable GROUP BY OriginStateFips, ArrTime, DayofMonth  ORDER BY OriginStateFips, ArrTime, DayofMonth LIMIT 2"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE OriginCityName NOT IN ('Waco, TX') AND DaysSinceEpoch NOT IN (16098, 16077, 16076, 16091) OR CRSDepTime IN (1139, 1802, 956) LIMIT 10"}
 {"sql":"SELECT DepDelay FROM mytable WHERE DepTime IN (1653, 1937, 2052, 707, 550) ORDER BY Carrier, DepTimeBlk LIMIT 20"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups >= 2 OR OriginStateName IN ('Mississippi', 'Idaho', 'Hawaii') AND DivDistance BETWEEN 302 AND 254 LIMIT 12"}
 {"sql":"SELECT DestStateFips, ActualElapsedTime, MAX(OriginAirportSeqID), AVG(TaxiIn), SUM(TaxiIn) FROM mytable WHERE TaxiIn BETWEEN 65 AND 73 OR CRSElapsedTime NOT IN (81) AND FlightNum BETWEEN 908 AND 4512 GROUP BY DestStateFips, ActualElapsedTime  ORDER BY DestStateFips, ActualElapsedTime LIMIT 3","hsqls":["SELECT DestStateFips, ActualElapsedTime, MAX(OriginAirportSeqID), AVG(TaxiIn), SUM(TaxiIn) FROM mytable WHERE TaxiIn BETWEEN 65 AND 73 OR CRSElapsedTime NOT IN (81) AND FlightNum BETWEEN 908 AND 4512 GROUP BY DestStateFips, ActualElapsedTime  ORDER BY DestStateFips, ActualElapsedTime LIMIT 3"]}
-{"sql":"SELECT DestAirportID, OriginStateName, COUNT(*) FROM mytable WHERE WheelsOn IN (230, 624, 1300) OR Cancelled = 0 AND DivLongestGTimes BETWEEN 34.0 AND 108.0 GROUP BY DestAirportID, OriginStateName LIMIT 20","hsqls":["SELECT DestAirportID, OriginStateName, COUNT(*) FROM mytable WHERE WheelsOn IN (230, 624, 1300) OR Cancelled = 0 AND (DivLongestGTimes__MV0 BETWEEN 34.0 AND 108.0 OR DivLongestGTimes__MV1 BETWEEN 34.0 AND 108.0 OR DivLongestGTimes__MV2 BETWEEN 34.0 AND 108.0 OR DivLongestGTimes__MV3 BETWEEN 34.0 AND 108.0 OR DivLongestGTimes__MV4 BETWEEN 34.0 AND 108.0) GROUP BY DestAirportID, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, OriginStateName, COUNT(*) FROM mytable WHERE WheelsOn IN (230, 624, 1300) OR Cancelled = 0 AND DivLongestGTimes BETWEEN 34.0 AND 108.0 GROUP BY DestAirportID, OriginStateName LIMIT 20","hsqls":["SELECT DestAirportID, OriginStateName, COUNT(*) FROM mytable WHERE WheelsOn IN (230, 624, 1300) OR Cancelled = 0 AND (DivLongestGTimes[1] BETWEEN 34.0 AND 108.0 OR DivLongestGTimes[2] BETWEEN 34.0 AND 108.0 OR DivLongestGTimes[3] BETWEEN 34.0 AND 108.0 OR DivLongestGTimes[4] BETWEEN 34.0 AND 108.0 OR DivLongestGTimes[5] BETWEEN 34.0 AND 108.0) GROUP BY DestAirportID, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, CRSArrTime, FlightNum FROM mytable WHERE FlightNum <= 1512 OR ArrDelay IN (245.0, -37.0) ORDER BY CRSArrTime LIMIT 7"}
 {"sql":"SELECT DepartureDelayGroups, DepDelayMinutes, SUM(ArrivalDelayGroups) FROM mytable WHERE Distance IN (3302) GROUP BY DepartureDelayGroups, DepDelayMinutes  ORDER BY DepartureDelayGroups, DepDelayMinutes LIMIT 9","hsqls":["SELECT DepartureDelayGroups, DepDelayMinutes, SUM(ArrivalDelayGroups) FROM mytable WHERE Distance IN (3302) GROUP BY DepartureDelayGroups, DepDelayMinutes  ORDER BY DepartureDelayGroups, DepDelayMinutes LIMIT 9"]}
 {"sql":"SELECT DestWac, ActualElapsedTime, CRSElapsedTime, AVG(ArrDel15), MIN(DivDistance) FROM mytable GROUP BY DestWac, ActualElapsedTime, CRSElapsedTime  ORDER BY DestWac, ActualElapsedTime, CRSElapsedTime LIMIT 7","hsqls":["SELECT DestWac, ActualElapsedTime, CRSElapsedTime, AVG(ArrDel15), MIN(DivDistance) FROM mytable GROUP BY DestWac, ActualElapsedTime, CRSElapsedTime  ORDER BY DestWac, ActualElapsedTime, CRSElapsedTime LIMIT 7"]}
-{"sql":"SELECT DivReachedDest, DivTailNums FROM mytable WHERE DivAirportSeqIDs >= 1387102 AND DestStateFips NOT IN (21, 40, 23, 37, 75) AND DayOfWeek IN (3, 2, 6, 4) ORDER BY CRSDepTime, OriginStateName LIMIT 22","hsqls":["SELECT DivReachedDest, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1387102 OR DivAirportSeqIDs__MV1 >= 1387102 OR DivAirportSeqIDs__MV2 >= 1387102 OR DivAirportSeqIDs__MV3 >= 1387102 OR DivAirportSeqIDs__MV4 >= 1387102) AND DestStateFips NOT IN (21, 40, 23, 37, 75) AND DayOfWeek IN (3, 2, 6, 4) ORDER BY CRSDepTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivTailNums FROM mytable WHERE DivAirportSeqIDs >= 1387102 AND DestStateFips NOT IN (21, 40, 23, 37, 75) AND DayOfWeek IN (3, 2, 6, 4) ORDER BY CRSDepTime, OriginStateName LIMIT 22","hsqls":["SELECT DivReachedDest, DivTailNums FROM mytable WHERE (DivAirportSeqIDs[1] >= 1387102 OR DivAirportSeqIDs[2] >= 1387102 OR DivAirportSeqIDs[3] >= 1387102 OR DivAirportSeqIDs[4] >= 1387102 OR DivAirportSeqIDs[5] >= 1387102) AND DestStateFips NOT IN (21, 40, 23, 37, 75) AND DayOfWeek IN (3, 2, 6, 4) ORDER BY CRSDepTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Diverted, DivDistance, Quarter, MIN(OriginWac), AVG(DivActualElapsedTime) FROM mytable GROUP BY Diverted, DivDistance, Quarter  ORDER BY Diverted, DivDistance, Quarter LIMIT 10","hsqls":["SELECT Diverted, DivDistance, Quarter, MIN(OriginWac), AVG(DivActualElapsedTime) FROM mytable GROUP BY Diverted, DivDistance, Quarter  ORDER BY Diverted, DivDistance, Quarter LIMIT 10"]}
 {"sql":"SELECT DepDelayMinutes, DestStateFips, FlightDate, MAX(TaxiIn), SUM(DivReachedDest) FROM mytable WHERE WheelsOn NOT IN (2309, 1824) GROUP BY DepDelayMinutes, DestStateFips, FlightDate  ORDER BY DepDelayMinutes, DestStateFips, FlightDate LIMIT 15","hsqls":["SELECT DepDelayMinutes, DestStateFips, FlightDate, MAX(TaxiIn), SUM(DivReachedDest) FROM mytable WHERE WheelsOn NOT IN (2309, 1824) GROUP BY DepDelayMinutes, DestStateFips, FlightDate  ORDER BY DepDelayMinutes, DestStateFips, FlightDate LIMIT 15"]}
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY DepDel15 LIMIT 17"}
@@ -975,26 +975,26 @@
 {"sql":"SELECT DestStateFips FROM mytable WHERE OriginStateFips BETWEEN 19 AND 40 OR OriginCityMarketID BETWEEN 30140 AND 31454 ORDER BY FirstDepTime, ArrivalDelayGroups LIMIT 11"}
 {"sql":"SELECT DestCityMarketID FROM mytable WHERE ArrDelay <= -2.0 ORDER BY ArrTimeBlk LIMIT 10"}
 {"sql":"SELECT TaxiOut, Flights, TotalAddGTime FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' AND DayofMonth IN (2, 4, 31, 16, 12) ORDER BY DivArrDelay LIMIT 24"}
-{"sql":"SELECT DivWheelsOffs, Origin, DivArrDelay FROM mytable WHERE TaxiIn BETWEEN 55 AND 32 OR ArrivalDelayGroups NOT IN (7) OR ArrTime >= 2108 ORDER BY DestStateName, DivActualElapsedTime LIMIT 6","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, Origin, DivArrDelay FROM mytable WHERE TaxiIn BETWEEN 55 AND 32 OR ArrivalDelayGroups NOT IN (7) OR ArrTime >= 2108 ORDER BY DestStateName, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, Origin, DivArrDelay FROM mytable WHERE TaxiIn BETWEEN 55 AND 32 OR ArrivalDelayGroups NOT IN (7) OR ArrTime >= 2108 ORDER BY DestStateName, DivActualElapsedTime LIMIT 6","hsqls":["SELECT DivWheelsOffs, Origin, DivArrDelay FROM mytable WHERE TaxiIn BETWEEN 55 AND 32 OR ArrivalDelayGroups NOT IN (7) OR ArrTime >= 2108 ORDER BY DestStateName, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, DepDelayMinutes, DayofMonth, SUM(DepartureDelayGroups) FROM mytable WHERE CarrierDelay BETWEEN 65 AND 27 GROUP BY WheelsOff, DepDelayMinutes, DayofMonth  ORDER BY WheelsOff, DepDelayMinutes, DayofMonth LIMIT 15","hsqls":["SELECT WheelsOff, DepDelayMinutes, DayofMonth, SUM(DepartureDelayGroups) FROM mytable WHERE CarrierDelay BETWEEN 65 AND 27 GROUP BY WheelsOff, DepDelayMinutes, DayofMonth  ORDER BY WheelsOff, DepDelayMinutes, DayofMonth LIMIT 15"]}
 {"sql":"SELECT DepTimeBlk, WheelsOn, MIN(Flights) FROM mytable WHERE OriginCityMarketID NOT IN (31140, 32156, 31865, 34457) GROUP BY DepTimeBlk, WheelsOn  ORDER BY DepTimeBlk, WheelsOn LIMIT 9","hsqls":["SELECT DepTimeBlk, WheelsOn, MIN(Flights) FROM mytable WHERE OriginCityMarketID NOT IN (31140, 32156, 31865, 34457) GROUP BY DepTimeBlk, WheelsOn  ORDER BY DepTimeBlk, WheelsOn LIMIT 9"]}
 {"sql":"SELECT WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE DayOfWeek NOT IN (3, 4) OR ArrTime BETWEEN 1037 AND 17 GROUP BY WeatherDelay, ArrDelay  ORDER BY WeatherDelay, ArrDelay LIMIT 18","hsqls":["SELECT WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE DayOfWeek NOT IN (3, 4) OR ArrTime BETWEEN 1037 AND 17 GROUP BY WeatherDelay, ArrDelay  ORDER BY WeatherDelay, ArrDelay LIMIT 18"]}
-{"sql":"SELECT Diverted, OriginCityMarketID, DivArrDelay FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR DivWheelsOns > 1125 LIMIT 6","hsqls":["SELECT Diverted, OriginCityMarketID, DivArrDelay FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR (DivWheelsOns__MV0 > 1125 OR DivWheelsOns__MV1 > 1125 OR DivWheelsOns__MV2 > 1125 OR DivWheelsOns__MV3 > 1125 OR DivWheelsOns__MV4 > 1125) LIMIT 10000"]}
+{"sql":"SELECT Diverted, OriginCityMarketID, DivArrDelay FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR DivWheelsOns > 1125 LIMIT 6","hsqls":["SELECT Diverted, OriginCityMarketID, DivArrDelay FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR (DivWheelsOns[1] > 1125 OR DivWheelsOns[2] > 1125 OR DivWheelsOns[3] > 1125 OR DivWheelsOns[4] > 1125 OR DivWheelsOns[5] > 1125) LIMIT 10000"]}
 {"sql":"SELECT COUNT(CRSArrTime), COUNT(DepTime) FROM mytable WHERE OriginStateName = 'U.S. Pacific Trust Territories and Possessions' OR DepartureDelayGroups >= 8 LIMIT 20"}
-{"sql":"SELECT OriginState, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1144 AND 1025 OR DestStateFips BETWEEN 56 AND 55 OR OriginCityMarketID BETWEEN 31049 AND 32402 GROUP BY OriginState LIMIT 7","hsqls":["SELECT OriginState, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1144 AND 1025 OR DivWheelsOffs__MV1 BETWEEN 1144 AND 1025 OR DivWheelsOffs__MV2 BETWEEN 1144 AND 1025 OR DivWheelsOffs__MV3 BETWEEN 1144 AND 1025 OR DivWheelsOffs__MV4 BETWEEN 1144 AND 1025) OR DestStateFips BETWEEN 56 AND 55 OR OriginCityMarketID BETWEEN 31049 AND 32402 GROUP BY OriginState LIMIT 10000"]}
+{"sql":"SELECT OriginState, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1144 AND 1025 OR DestStateFips BETWEEN 56 AND 55 OR OriginCityMarketID BETWEEN 31049 AND 32402 GROUP BY OriginState LIMIT 7","hsqls":["SELECT OriginState, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1144 AND 1025 OR DivWheelsOffs[2] BETWEEN 1144 AND 1025 OR DivWheelsOffs[3] BETWEEN 1144 AND 1025 OR DivWheelsOffs[4] BETWEEN 1144 AND 1025 OR DivWheelsOffs[5] BETWEEN 1144 AND 1025) OR DestStateFips BETWEEN 56 AND 55 OR OriginCityMarketID BETWEEN 31049 AND 32402 GROUP BY OriginState LIMIT 10000"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE CRSElapsedTime BETWEEN 570 AND 266 OR DepTimeBlk IN ('2000-2059', '1100-1159', '0700-0759') LIMIT 22"}
-{"sql":"SELECT TotalAddGTime, DepTime, CancellationCode FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DivLongestGTimes > 97.0 AND DivAirportSeqIDs BETWEEN 1457402 AND 1025702 LIMIT 10","hsqls":["SELECT TotalAddGTime, DepTime, CancellationCode FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR (DivLongestGTimes__MV0 > 97.0 OR DivLongestGTimes__MV1 > 97.0 OR DivLongestGTimes__MV2 > 97.0 OR DivLongestGTimes__MV3 > 97.0 OR DivLongestGTimes__MV4 > 97.0) AND (DivAirportSeqIDs__MV0 BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs__MV1 BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs__MV2 BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs__MV3 BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs__MV4 BETWEEN 1457402 AND 1025702) LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DepTime, CancellationCode FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DivLongestGTimes > 97.0 AND DivAirportSeqIDs BETWEEN 1457402 AND 1025702 LIMIT 10","hsqls":["SELECT TotalAddGTime, DepTime, CancellationCode FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR (DivLongestGTimes[1] > 97.0 OR DivLongestGTimes[2] > 97.0 OR DivLongestGTimes[3] > 97.0 OR DivLongestGTimes[4] > 97.0 OR DivLongestGTimes[5] > 97.0) AND (DivAirportSeqIDs[1] BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs[2] BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs[3] BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs[4] BETWEEN 1457402 AND 1025702 OR DivAirportSeqIDs[5] BETWEEN 1457402 AND 1025702) LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, WheelsOn, DaysSinceEpoch, SUM(NASDelay), MAX(OriginCityMarketID), SUM(WheelsOff) FROM mytable GROUP BY OriginCityMarketID, WheelsOn, DaysSinceEpoch  ORDER BY OriginCityMarketID, WheelsOn, DaysSinceEpoch LIMIT 6","hsqls":["SELECT OriginCityMarketID, WheelsOn, DaysSinceEpoch, SUM(NASDelay), MAX(OriginCityMarketID), SUM(WheelsOff) FROM mytable GROUP BY OriginCityMarketID, WheelsOn, DaysSinceEpoch  ORDER BY OriginCityMarketID, WheelsOn, DaysSinceEpoch LIMIT 6"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE DestAirportSeqID IN (1484304, 1072102, 1348502, 1383002) OR OriginCityName BETWEEN 'Fort Lauderdale, FL' AND 'Minot, ND' OR Carrier > 'B6' LIMIT 24"}
 {"sql":"SELECT CarrierDelay, DestStateFips, MIN(Quarter), COUNT(CancellationCode), AVG(DivActualElapsedTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 OR DestState BETWEEN 'MI' AND 'CO' AND CancellationCode BETWEEN 'A' AND 'A' GROUP BY CarrierDelay, DestStateFips  ORDER BY CarrierDelay, DestStateFips LIMIT 9","hsqls":["SELECT CarrierDelay, DestStateFips, MIN(Quarter), COUNT(CancellationCode), AVG(DivActualElapsedTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 OR DestState BETWEEN 'MI' AND 'CO' AND CancellationCode BETWEEN 'A' AND 'A' GROUP BY CarrierDelay, DestStateFips  ORDER BY CarrierDelay, DestStateFips LIMIT 9"]}
 {"sql":"SELECT DestCityMarketID, OriginStateName FROM mytable ORDER BY DepTime, TaxiIn, DivAirportLandings LIMIT 11"}
 {"sql":"SELECT ArrDelay, CRSElapsedTime, OriginAirportID, COUNT(DivAirportLandings) FROM mytable GROUP BY ArrDelay, CRSElapsedTime, OriginAirportID  ORDER BY ArrDelay, CRSElapsedTime, OriginAirportID LIMIT 19","hsqls":["SELECT ArrDelay, CRSElapsedTime, OriginAirportID, COUNT(DivAirportLandings) FROM mytable GROUP BY ArrDelay, CRSElapsedTime, OriginAirportID  ORDER BY ArrDelay, CRSElapsedTime, OriginAirportID LIMIT 19"]}
-{"sql":"SELECT DepartureDelayGroups, CRSDepTime FROM mytable WHERE DivAirportSeqIDs <= 1474703 ORDER BY FlightNum, TailNum, OriginWac LIMIT 16","hsqls":["SELECT DepartureDelayGroups, CRSDepTime FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1474703 OR DivAirportSeqIDs__MV1 <= 1474703 OR DivAirportSeqIDs__MV2 <= 1474703 OR DivAirportSeqIDs__MV3 <= 1474703 OR DivAirportSeqIDs__MV4 <= 1474703) ORDER BY FlightNum, TailNum, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, CRSDepTime FROM mytable WHERE DivAirportSeqIDs <= 1474703 ORDER BY FlightNum, TailNum, OriginWac LIMIT 16","hsqls":["SELECT DepartureDelayGroups, CRSDepTime FROM mytable WHERE (DivAirportSeqIDs[1] <= 1474703 OR DivAirportSeqIDs[2] <= 1474703 OR DivAirportSeqIDs[3] <= 1474703 OR DivAirportSeqIDs[4] <= 1474703 OR DivAirportSeqIDs[5] <= 1474703) ORDER BY FlightNum, TailNum, OriginWac LIMIT 10000"]}
 {"sql":"SELECT DepDelay, OriginStateFips, COUNT(*) FROM mytable WHERE OriginCityName BETWEEN 'Springfield, MO' AND 'Albuquerque, NM' AND Carrier BETWEEN 'DL' AND 'UA' AND LongestAddGTime IN (148, 103) GROUP BY DepDelay, OriginStateFips  ORDER BY DepDelay, OriginStateFips LIMIT 15","hsqls":["SELECT DepDelay, OriginStateFips, COUNT(*) FROM mytable WHERE OriginCityName BETWEEN 'Springfield, MO' AND 'Albuquerque, NM' AND Carrier BETWEEN 'DL' AND 'UA' AND LongestAddGTime IN (148, 103) GROUP BY DepDelay, OriginStateFips  ORDER BY DepDelay, OriginStateFips LIMIT 15"]}
 {"sql":"SELECT CRSElapsedTime, COUNT(*) FROM mytable WHERE OriginCityMarketID NOT IN (34113, 32457, 30285, 30073, 32891) AND LongestAddGTime NOT IN (78, 30) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 6","hsqls":["SELECT CRSElapsedTime, COUNT(*) FROM mytable WHERE OriginCityMarketID NOT IN (34113, 32457, 30285, 30073, 32891) AND LongestAddGTime NOT IN (78, 30) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 6"]}
 {"sql":"SELECT COUNT(TaxiIn), SUM(DivReachedDest) FROM mytable WHERE DestStateFips <= 23 OR Quarter NOT IN (1) LIMIT 23"}
 {"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY SecurityDelay LIMIT 21"}
-{"sql":"SELECT TailNum, DivAirportIDs FROM mytable LIMIT 13","hsqls":["SELECT TailNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT TailNum, DivAirportIDs FROM mytable LIMIT 13","hsqls":["SELECT TailNum, DivAirportIDs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, LongestAddGTime FROM mytable WHERE CRSElapsedTime BETWEEN 296 AND 311 ORDER BY DestStateName LIMIT 5"}
 {"sql":"SELECT Cancelled FROM mytable WHERE WheelsOff BETWEEN 836 AND 2348 OR DepartureDelayGroups >= 3 ORDER BY SecurityDelay, TaxiIn, CRSDepTime LIMIT 26"}
 {"sql":"SELECT OriginState, DestStateFips, CancellationCode FROM mytable WHERE WheelsOff <> 1434 LIMIT 1"}
@@ -1003,58 +1003,58 @@
 {"sql":"SELECT UniqueCarrier, AVG(DayOfWeek), MAX(DivReachedDest), MAX(ActualElapsedTime) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 29","hsqls":["SELECT UniqueCarrier, AVG(DayOfWeek), MAX(DivReachedDest), MAX(ActualElapsedTime) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 29"]}
 {"sql":"SELECT DepDelay, NASDelay, ArrivalDelayGroups, COUNT(ArrTimeBlk), MIN(TaxiOut) FROM mytable WHERE ArrDelayMinutes NOT IN (332.0, 98.0, 162.0, 134.0, 291.0) AND NASDelay NOT IN (234, 24, 34) GROUP BY DepDelay, NASDelay, ArrivalDelayGroups  ORDER BY DepDelay, NASDelay, ArrivalDelayGroups LIMIT 13","hsqls":["SELECT DepDelay, NASDelay, ArrivalDelayGroups, COUNT(ArrTimeBlk), MIN(TaxiOut) FROM mytable WHERE ArrDelayMinutes NOT IN (332.0, 98.0, 162.0, 134.0, 291.0) AND NASDelay NOT IN (234, 24, 34) GROUP BY DepDelay, NASDelay, ArrivalDelayGroups  ORDER BY DepDelay, NASDelay, ArrivalDelayGroups LIMIT 13"]}
 {"sql":"SELECT DistanceGroup, DepDelayMinutes, SUM(Cancelled), MAX(DaysSinceEpoch), MIN(DayOfWeek) FROM mytable WHERE OriginCityMarketID <= 34492 GROUP BY DistanceGroup, DepDelayMinutes  ORDER BY DistanceGroup, DepDelayMinutes LIMIT 25","hsqls":["SELECT DistanceGroup, DepDelayMinutes, SUM(Cancelled), MAX(DaysSinceEpoch), MIN(DayOfWeek) FROM mytable WHERE OriginCityMarketID <= 34492 GROUP BY DistanceGroup, DepDelayMinutes  ORDER BY DistanceGroup, DepDelayMinutes LIMIT 25"]}
-{"sql":"SELECT AVG(ActualElapsedTime), SUM(ArrTime) FROM mytable WHERE CRSElapsedTime IN (193) AND DivAirportIDs IN (13158, 13198) AND DistanceGroup BETWEEN 2 AND 1 LIMIT 12","hsqls":["SELECT AVG(ActualElapsedTime), SUM(ArrTime)  FROM mytable WHERE CRSElapsedTime IN (193) AND (DivAirportIDs__MV0 IN (13158, 13198) OR DivAirportIDs__MV1 IN (13158, 13198) OR DivAirportIDs__MV2 IN (13158, 13198) OR DivAirportIDs__MV3 IN (13158, 13198) OR DivAirportIDs__MV4 IN (13158, 13198)) AND DistanceGroup BETWEEN 2 AND 1 LIMIT 10000"]}
+{"sql":"SELECT AVG(ActualElapsedTime), SUM(ArrTime) FROM mytable WHERE CRSElapsedTime IN (193) AND DivAirportIDs IN (13158, 13198) AND DistanceGroup BETWEEN 2 AND 1 LIMIT 12","hsqls":["SELECT AVG(ActualElapsedTime), SUM(ArrTime)  FROM mytable WHERE CRSElapsedTime IN (193) AND (DivAirportIDs[1] IN (13158, 13198) OR DivAirportIDs[2] IN (13158, 13198) OR DivAirportIDs[3] IN (13158, 13198) OR DivAirportIDs[4] IN (13158, 13198) OR DivAirportIDs[5] IN (13158, 13198)) AND DistanceGroup BETWEEN 2 AND 1 LIMIT 10000"]}
 {"sql":"SELECT SUM(DepDel15), COUNT(ArrivalDelayGroups), MIN(ArrTime) FROM mytable WHERE WheelsOn BETWEEN 1009 AND 722 OR DestCityMarketID BETWEEN 31895 AND 32389 AND ArrTime = 1013 LIMIT 15"}
 {"sql":"SELECT MIN(OriginCityMarketID) FROM mytable LIMIT 27"}
 {"sql":"SELECT SecurityDelay, TaxiIn, DivActualElapsedTime FROM mytable WHERE CarrierDelay BETWEEN 21 AND 157 ORDER BY FlightDate, WheelsOn LIMIT 28"}
 {"sql":"SELECT NASDelay, AirTime FROM mytable WHERE DepDelayMinutes BETWEEN 329.0 AND 419.0 AND CarrierDelay IN (139, 22, 243, 74) OR ArrDelayMinutes NOT IN (220.0, 185.0, 269.0, 174.0) ORDER BY Dest, DestCityMarketID LIMIT 22"}
 {"sql":"SELECT ArrTime, DayofMonth, AirlineID FROM mytable WHERE TaxiOut NOT IN (22, 15) AND SecurityDelay BETWEEN 8 AND 4 ORDER BY ArrTime LIMIT 24"}
 {"sql":"SELECT DestCityName, DaysSinceEpoch FROM mytable ORDER BY CarrierDelay, OriginAirportID, OriginStateName LIMIT 26"}
-{"sql":"SELECT FirstDepTime, OriginCityName, ActualElapsedTime FROM mytable ORDER BY Carrier, TailNum, \"Month\" LIMIT 14","hsqls":["SELECT FirstDepTime, OriginCityName, ActualElapsedTime FROM mytable ORDER BY Carrier, TailNum, Month LIMIT 14"]}
-{"sql":"SELECT COUNT(Carrier), MAX(DivReachedDest) FROM mytable WHERE DivLongestGTimes BETWEEN 14.0 AND 36.0 OR CRSDepTime < 832 LIMIT 3","hsqls":["SELECT COUNT(Carrier), MAX(DivReachedDest)  FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 14.0 AND 36.0 OR DivLongestGTimes__MV1 BETWEEN 14.0 AND 36.0 OR DivLongestGTimes__MV2 BETWEEN 14.0 AND 36.0 OR DivLongestGTimes__MV3 BETWEEN 14.0 AND 36.0 OR DivLongestGTimes__MV4 BETWEEN 14.0 AND 36.0) OR CRSDepTime < 832 LIMIT 10000"]}
-{"sql":"SELECT CRSElapsedTime FROM mytable WHERE DivAirportIDs IN (15249, 10135, 11471, 10620, 11721) ORDER BY Flights LIMIT 17","hsqls":["SELECT CRSElapsedTime FROM mytable WHERE (DivAirportIDs__MV0 IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs__MV1 IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs__MV2 IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs__MV3 IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs__MV4 IN (15249, 10135, 11471, 10620, 11721)) ORDER BY Flights LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, OriginCityName, ActualElapsedTime FROM mytable ORDER BY Carrier, TailNum, \"Month\" LIMIT 14","hsqls":["SELECT FirstDepTime, OriginCityName, ActualElapsedTime FROM mytable ORDER BY Carrier, TailNum, `Month` LIMIT 14"]}
+{"sql":"SELECT COUNT(Carrier), MAX(DivReachedDest) FROM mytable WHERE DivLongestGTimes BETWEEN 14.0 AND 36.0 OR CRSDepTime < 832 LIMIT 3","hsqls":["SELECT COUNT(Carrier), MAX(DivReachedDest)  FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 14.0 AND 36.0 OR DivLongestGTimes[2] BETWEEN 14.0 AND 36.0 OR DivLongestGTimes[3] BETWEEN 14.0 AND 36.0 OR DivLongestGTimes[4] BETWEEN 14.0 AND 36.0 OR DivLongestGTimes[5] BETWEEN 14.0 AND 36.0) OR CRSDepTime < 832 LIMIT 10000"]}
+{"sql":"SELECT CRSElapsedTime FROM mytable WHERE DivAirportIDs IN (15249, 10135, 11471, 10620, 11721) ORDER BY Flights LIMIT 17","hsqls":["SELECT CRSElapsedTime FROM mytable WHERE (DivAirportIDs[1] IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs[2] IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs[3] IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs[4] IN (15249, 10135, 11471, 10620, 11721) OR DivAirportIDs[5] IN (15249, 10135, 11471, 10620, 11721)) ORDER BY Flights LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE TaxiOut NOT IN (55) OR Distance NOT IN (985) OR OriginCityMarketID >= 31041 ORDER BY DestWac, DestStateName, OriginStateName LIMIT 28"}
-{"sql":"SELECT DivAirports, OriginStateFips, DestCityMarketID FROM mytable ORDER BY Dest LIMIT 28","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginStateFips, DestCityMarketID FROM mytable ORDER BY Dest LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginStateFips, DestCityMarketID FROM mytable ORDER BY Dest LIMIT 28","hsqls":["SELECT DivAirports, OriginStateFips, DestCityMarketID FROM mytable ORDER BY Dest LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE DivDistance >= 277 ORDER BY DepTime, DestAirportSeqID, DayOfWeek LIMIT 10"}
 {"sql":"SELECT Origin FROM mytable WHERE SecurityDelay BETWEEN 0 AND 14 OR DestAirportID BETWEEN 10781 AND 11503 ORDER BY Dest LIMIT 5"}
 {"sql":"SELECT Flights, OriginStateName, MIN(DepDelayMinutes), COUNT(DestState) FROM mytable GROUP BY Flights, OriginStateName  ORDER BY Flights, OriginStateName LIMIT 16","hsqls":["SELECT Flights, OriginStateName, MIN(DepDelayMinutes), COUNT(DestState) FROM mytable GROUP BY Flights, OriginStateName  ORDER BY Flights, OriginStateName LIMIT 16"]}
 {"sql":"SELECT Carrier, DivActualElapsedTime, CRSElapsedTime FROM mytable WHERE DestCityName BETWEEN 'Newark, NJ' AND 'Augusta, GA' ORDER BY ArrDelay LIMIT 14"}
-{"sql":"SELECT TaxiOut, DivTailNums, AirlineID FROM mytable WHERE CancellationCode = 'B' ORDER BY ArrTimeBlk LIMIT 5","hsqls":["SELECT TaxiOut, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, AirlineID FROM mytable WHERE CancellationCode = 'B' ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivTailNums, AirlineID FROM mytable WHERE CancellationCode = 'B' ORDER BY ArrTimeBlk LIMIT 5","hsqls":["SELECT TaxiOut, DivTailNums, AirlineID FROM mytable WHERE CancellationCode = 'B' ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY DivDistance, LongestAddGTime, DepTime LIMIT 16"}
 {"sql":"SELECT ArrTime, DepDel15, DivArrDelay FROM mytable LIMIT 19"}
-{"sql":"SELECT Flights, ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 0 ORDER BY Flights, DestCityMarketID, DayofMonth LIMIT 24","hsqls":["SELECT Flights, ArrDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 0 ORDER BY Flights, DestCityMarketID, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Flights, ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 0 ORDER BY Flights, DestCityMarketID, DayofMonth LIMIT 24","hsqls":["SELECT Flights, ArrDelayMinutes, DivWheelsOffs FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 0 ORDER BY Flights, DestCityMarketID, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, DestState, MAX(DestAirportID), MAX(TaxiIn) FROM mytable GROUP BY DepartureDelayGroups, DestState  ORDER BY DepartureDelayGroups, DestState LIMIT 14","hsqls":["SELECT DepartureDelayGroups, DestState, MAX(DestAirportID), MAX(TaxiIn) FROM mytable GROUP BY DepartureDelayGroups, DestState  ORDER BY DepartureDelayGroups, DestState LIMIT 14"]}
 {"sql":"SELECT Diverted, DepDelay, DestStateFips FROM mytable WHERE TailNum NOT IN ('N757AT', 'N552NW', 'N755SK') ORDER BY FirstDepTime, DepTime LIMIT 13"}
 {"sql":"SELECT CarrierDelay, SUM(Cancelled) FROM mytable WHERE SecurityDelay < 14 OR CancellationCode NOT IN ('C') AND ArrTimeBlk BETWEEN '1800-1859' AND '1500-1559' GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 4","hsqls":["SELECT CarrierDelay, SUM(Cancelled) FROM mytable WHERE SecurityDelay < 14 OR CancellationCode NOT IN ('C') AND ArrTimeBlk BETWEEN '1800-1859' AND '1500-1559' GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 4"]}
-{"sql":"SELECT ArrDelay FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR OriginState NOT IN ('NV', 'VA', 'AR', 'MA', 'AL') ORDER BY OriginAirportSeqID, CRSArrTime LIMIT 10","hsqls":["SELECT ArrDelay FROM mytable WHERE Month BETWEEN 1 AND 1 OR OriginState NOT IN ('NV', 'VA', 'AR', 'MA', 'AL') ORDER BY OriginAirportSeqID, CRSArrTime LIMIT 10"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE OriginStateName >= 'Alaska' ORDER BY DestStateFips, Distance, CRSDepTime LIMIT 4","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE OriginStateName >= 'Alaska' ORDER BY DestStateFips, Distance, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelay FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR OriginState NOT IN ('NV', 'VA', 'AR', 'MA', 'AL') ORDER BY OriginAirportSeqID, CRSArrTime LIMIT 10","hsqls":["SELECT ArrDelay FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR OriginState NOT IN ('NV', 'VA', 'AR', 'MA', 'AL') ORDER BY OriginAirportSeqID, CRSArrTime LIMIT 10"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE OriginStateName >= 'Alaska' ORDER BY DestStateFips, Distance, CRSDepTime LIMIT 4","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE OriginStateName >= 'Alaska' ORDER BY DestStateFips, Distance, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT Dest, OriginAirportID, MIN(Quarter), COUNT(DestCityName), MIN(DepTime) FROM mytable WHERE Distance IN (2358, 2434, 642, 1066) AND OriginCityName >= 'Ketchikan, AK' GROUP BY Dest, OriginAirportID  ORDER BY Dest, OriginAirportID LIMIT 28","hsqls":["SELECT Dest, OriginAirportID, MIN(Quarter), COUNT(DestCityName), MIN(DepTime) FROM mytable WHERE Distance IN (2358, 2434, 642, 1066) AND OriginCityName >= 'Ketchikan, AK' GROUP BY Dest, OriginAirportID  ORDER BY Dest, OriginAirportID LIMIT 28"]}
-{"sql":"SELECT DivAirportLandings FROM mytable WHERE DivAirports >= 'ONT' OR ArrivalDelayGroups BETWEEN 1 AND 3 OR DivAirportIDs IN (11066) ORDER BY DivReachedDest, Carrier, OriginWac LIMIT 7","hsqls":["SELECT DivAirportLandings FROM mytable WHERE (DivAirports__MV0 >= 'ONT' OR DivAirports__MV1 >= 'ONT' OR DivAirports__MV2 >= 'ONT' OR DivAirports__MV3 >= 'ONT' OR DivAirports__MV4 >= 'ONT') OR ArrivalDelayGroups BETWEEN 1 AND 3 OR (DivAirportIDs__MV0 IN (11066) OR DivAirportIDs__MV1 IN (11066) OR DivAirportIDs__MV2 IN (11066) OR DivAirportIDs__MV3 IN (11066) OR DivAirportIDs__MV4 IN (11066)) ORDER BY DivReachedDest, Carrier, OriginWac LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, ArrivalDelayGroups, SUM(DestAirportSeqID), MAX(DestCityMarketID) FROM mytable WHERE UniqueCarrier NOT IN ('EV', 'DL', 'AA', 'VX') OR DivLongestGTimes > 108.0 OR NASDelay BETWEEN 13 AND 14 GROUP BY LateAircraftDelay, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT LateAircraftDelay, ArrivalDelayGroups, SUM(DestAirportSeqID), MAX(DestCityMarketID) FROM mytable WHERE UniqueCarrier NOT IN ('EV', 'DL', 'AA', 'VX') OR (DivLongestGTimes__MV0 > 108.0 OR DivLongestGTimes__MV1 > 108.0 OR DivLongestGTimes__MV2 > 108.0 OR DivLongestGTimes__MV3 > 108.0 OR DivLongestGTimes__MV4 > 108.0) OR NASDelay BETWEEN 13 AND 14 GROUP BY LateAircraftDelay, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings FROM mytable WHERE DivAirports >= 'ONT' OR ArrivalDelayGroups BETWEEN 1 AND 3 OR DivAirportIDs IN (11066) ORDER BY DivReachedDest, Carrier, OriginWac LIMIT 7","hsqls":["SELECT DivAirportLandings FROM mytable WHERE (DivAirports[1] >= 'ONT' OR DivAirports[2] >= 'ONT' OR DivAirports[3] >= 'ONT' OR DivAirports[4] >= 'ONT' OR DivAirports[5] >= 'ONT') OR ArrivalDelayGroups BETWEEN 1 AND 3 OR (DivAirportIDs[1] IN (11066) OR DivAirportIDs[2] IN (11066) OR DivAirportIDs[3] IN (11066) OR DivAirportIDs[4] IN (11066) OR DivAirportIDs[5] IN (11066)) ORDER BY DivReachedDest, Carrier, OriginWac LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, ArrivalDelayGroups, SUM(DestAirportSeqID), MAX(DestCityMarketID) FROM mytable WHERE UniqueCarrier NOT IN ('EV', 'DL', 'AA', 'VX') OR DivLongestGTimes > 108.0 OR NASDelay BETWEEN 13 AND 14 GROUP BY LateAircraftDelay, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT LateAircraftDelay, ArrivalDelayGroups, SUM(DestAirportSeqID), MAX(DestCityMarketID) FROM mytable WHERE UniqueCarrier NOT IN ('EV', 'DL', 'AA', 'VX') OR (DivLongestGTimes[1] > 108.0 OR DivLongestGTimes[2] > 108.0 OR DivLongestGTimes[3] > 108.0 OR DivLongestGTimes[4] > 108.0 OR DivLongestGTimes[5] > 108.0) OR NASDelay BETWEEN 13 AND 14 GROUP BY LateAircraftDelay, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime FROM mytable ORDER BY AirlineID, CRSElapsedTime"}
 {"sql":"SELECT DestStateName, DestAirportID, OriginStateName, MIN(SecurityDelay), MIN(DivArrDelay), SUM(DepDelay) FROM mytable GROUP BY DestStateName, DestAirportID, OriginStateName","hsqls":["SELECT DestStateName, DestAirportID, OriginStateName, MIN(SecurityDelay), MIN(DivArrDelay), SUM(DepDelay) FROM mytable GROUP BY DestStateName, DestAirportID, OriginStateName"]}
 {"sql":"SELECT Flights, TotalAddGTime, DestAirportID FROM mytable WHERE CRSElapsedTime NOT IN (190) OR DivArrDelay > 944 ORDER BY Diverted, DestWac LIMIT 13"}
 {"sql":"SELECT OriginState, DestState FROM mytable ORDER BY CarrierDelay, Distance LIMIT 7"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 64 AND 2 OR TaxiIn <= 32 AND DistanceGroup <> 8 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 64 AND 2 OR DivTotalGTimes__MV1 BETWEEN 64 AND 2 OR DivTotalGTimes__MV2 BETWEEN 64 AND 2 OR DivTotalGTimes__MV3 BETWEEN 64 AND 2 OR DivTotalGTimes__MV4 BETWEEN 64 AND 2) OR TaxiIn <= 32 AND DistanceGroup <> 8 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 64 AND 2 OR TaxiIn <= 32 AND DistanceGroup <> 8 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 64 AND 2 OR DivTotalGTimes[2] BETWEEN 64 AND 2 OR DivTotalGTimes[3] BETWEEN 64 AND 2 OR DivTotalGTimes[4] BETWEEN 64 AND 2 OR DivTotalGTimes[5] BETWEEN 64 AND 2) OR TaxiIn <= 32 AND DistanceGroup <> 8 LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, MAX(LongestAddGTime) FROM mytable GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 12","hsqls":["SELECT WeatherDelay, MAX(LongestAddGTime) FROM mytable GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 12"]}
 {"sql":"SELECT DestWac, TailNum FROM mytable ORDER BY DepTime, DestAirportSeqID LIMIT 4"}
 {"sql":"SELECT ArrTime, MIN(FlightNum) FROM mytable WHERE DepDelay = 134.0 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 28","hsqls":["SELECT ArrTime, MIN(FlightNum) FROM mytable WHERE DepDelay = 134.0 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 28"]}
 {"sql":"SELECT OriginWac, SUM(DivAirportLandings), MAX(TaxiIn), MAX(OriginAirportID) FROM mytable GROUP BY OriginWac  ORDER BY OriginWac LIMIT 21","hsqls":["SELECT OriginWac, SUM(DivAirportLandings), MAX(TaxiIn), MAX(OriginAirportID) FROM mytable GROUP BY OriginWac  ORDER BY OriginWac LIMIT 21"]}
 {"sql":"SELECT OriginState, COUNT(DaysSinceEpoch), MIN(DestStateFips) FROM mytable WHERE UniqueCarrier >= 'DL' GROUP BY OriginState  ORDER BY OriginState LIMIT 17","hsqls":["SELECT OriginState, COUNT(DaysSinceEpoch), MIN(DestStateFips) FROM mytable WHERE UniqueCarrier >= 'DL' GROUP BY OriginState  ORDER BY OriginState LIMIT 17"]}
 {"sql":"SELECT NASDelay, MAX(Flights), SUM(DepartureDelayGroups) FROM mytable WHERE DestState BETWEEN 'CT' AND 'HI' AND ArrDelayMinutes IN (155.0, 218.0, 343.0) AND DivArrDelay <> 167 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 13","hsqls":["SELECT NASDelay, MAX(Flights), SUM(DepartureDelayGroups) FROM mytable WHERE DestState BETWEEN 'CT' AND 'HI' AND ArrDelayMinutes IN (155.0, 218.0, 343.0) AND DivArrDelay <> 167 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 13"]}
-{"sql":"SELECT AirlineID, SUM(\"Month\"), SUM(DepDelayMinutes), MAX(FlightNum) FROM mytable WHERE DivAirportIDs BETWEEN 12448 AND 12448 OR DepDelayMinutes IN (220.0, 118.0, 247.0, 304.0, 54.0) AND DivArrDelay <= 1651 GROUP BY AirlineID LIMIT 6","hsqls":["SELECT AirlineID, SUM(Month), SUM(DepDelayMinutes), MAX(FlightNum) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 12448 AND 12448 OR DivAirportIDs__MV1 BETWEEN 12448 AND 12448 OR DivAirportIDs__MV2 BETWEEN 12448 AND 12448 OR DivAirportIDs__MV3 BETWEEN 12448 AND 12448 OR DivAirportIDs__MV4 BETWEEN 12448 AND 12448) OR DepDelayMinutes IN (220.0, 118.0, 247.0, 304.0, 54.0) AND DivArrDelay <= 1651 GROUP BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT AirlineID, SUM(\"Month\"), SUM(DepDelayMinutes), MAX(FlightNum) FROM mytable WHERE DivAirportIDs BETWEEN 12448 AND 12448 OR DepDelayMinutes IN (220.0, 118.0, 247.0, 304.0, 54.0) AND DivArrDelay <= 1651 GROUP BY AirlineID LIMIT 6","hsqls":["SELECT AirlineID, SUM(`Month`), SUM(DepDelayMinutes), MAX(FlightNum) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 12448 AND 12448 OR DivAirportIDs[2] BETWEEN 12448 AND 12448 OR DivAirportIDs[3] BETWEEN 12448 AND 12448 OR DivAirportIDs[4] BETWEEN 12448 AND 12448 OR DivAirportIDs[5] BETWEEN 12448 AND 12448) OR DepDelayMinutes IN (220.0, 118.0, 247.0, 304.0, 54.0) AND DivArrDelay <= 1651 GROUP BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, SUM(AirTime), MAX(DestCityMarketID), MIN(AirlineID) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 16","hsqls":["SELECT OriginCityMarketID, SUM(AirTime), MAX(DestCityMarketID), MIN(AirlineID) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 16"]}
 {"sql":"SELECT WeatherDelay, OriginCityName, ArrivalDelayGroups FROM mytable ORDER BY Carrier LIMIT 23"}
-{"sql":"SELECT FlightDate, AVG(\"Month\"), SUM(WheelsOn), MAX(ArrivalDelayGroups) FROM mytable WHERE DepTime BETWEEN 1432 AND 1333 OR DestCityMarketID > 31481 GROUP BY FlightDate LIMIT 29","hsqls":["SELECT FlightDate, AVG(Month), SUM(WheelsOn), MAX(ArrivalDelayGroups) FROM mytable WHERE DepTime BETWEEN 1432 AND 1333 OR DestCityMarketID > 31481 GROUP BY FlightDate LIMIT 29"]}
-{"sql":"SELECT DivDistance, OriginWac, MAX(NASDelay), SUM(\"Year\"), MIN(CarrierDelay) FROM mytable WHERE OriginStateName NOT IN ('Louisiana', 'Iowa', 'South Dakota', 'Nevada', 'Washington') GROUP BY DivDistance, OriginWac LIMIT 9","hsqls":["SELECT DivDistance, OriginWac, MAX(NASDelay), SUM(Year), MIN(CarrierDelay) FROM mytable WHERE OriginStateName NOT IN ('Louisiana', 'Iowa', 'South Dakota', 'Nevada', 'Washington') GROUP BY DivDistance, OriginWac LIMIT 9"]}
-{"sql":"SELECT Diverted, FirstDepTime, DivDistance FROM mytable WHERE OriginCityMarketID <= 32523 OR DivAirportSeqIDs >= 1393102 OR DepTimeBlk BETWEEN '1200-1259' AND '1800-1859' ORDER BY DivReachedDest, DepDelayMinutes, CarrierDelay LIMIT 21","hsqls":["SELECT Diverted, FirstDepTime, DivDistance FROM mytable WHERE OriginCityMarketID <= 32523 OR (DivAirportSeqIDs__MV0 >= 1393102 OR DivAirportSeqIDs__MV1 >= 1393102 OR DivAirportSeqIDs__MV2 >= 1393102 OR DivAirportSeqIDs__MV3 >= 1393102 OR DivAirportSeqIDs__MV4 >= 1393102) OR DepTimeBlk BETWEEN '1200-1259' AND '1800-1859' ORDER BY DivReachedDest, DepDelayMinutes, CarrierDelay LIMIT 10000"]}
-{"sql":"SELECT DestAirportSeqID, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DivAirports BETWEEN 'RDM' AND 'PSC' AND DivLongestGTimes = 44.0 GROUP BY DestAirportSeqID, DivActualElapsedTime LIMIT 8","hsqls":["SELECT DestAirportSeqID, DivActualElapsedTime, COUNT(*) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'RDM' AND 'PSC' OR DivAirports__MV1 BETWEEN 'RDM' AND 'PSC' OR DivAirports__MV2 BETWEEN 'RDM' AND 'PSC' OR DivAirports__MV3 BETWEEN 'RDM' AND 'PSC' OR DivAirports__MV4 BETWEEN 'RDM' AND 'PSC') AND (DivLongestGTimes__MV0 = 44.0 OR DivLongestGTimes__MV1 = 44.0 OR DivLongestGTimes__MV2 = 44.0 OR DivLongestGTimes__MV3 = 44.0 OR DivLongestGTimes__MV4 = 44.0) GROUP BY DestAirportSeqID, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportLandings, AVG(\"Month\"), MAX(DivArrDelay) FROM mytable WHERE WheelsOn BETWEEN 1228 AND 1920 OR Cancelled <> 0 GROUP BY DivAirportLandings LIMIT 23","hsqls":["SELECT DivAirportLandings, AVG(Month), MAX(DivArrDelay) FROM mytable WHERE WheelsOn BETWEEN 1228 AND 1920 OR Cancelled <> 0 GROUP BY DivAirportLandings LIMIT 23"]}
-{"sql":"SELECT FlightNum, ArrTime, COUNT(AirTime), AVG(DivArrDelay), COUNT(CancellationCode) FROM mytable WHERE DestStateName BETWEEN 'Ohio' AND 'South Carolina' AND \"Year\" < 2014 GROUP BY FlightNum, ArrTime","hsqls":["SELECT FlightNum, ArrTime, COUNT(AirTime), AVG(DivArrDelay), COUNT(CancellationCode) FROM mytable WHERE DestStateName BETWEEN 'Ohio' AND 'South Carolina' AND Year < 2014 GROUP BY FlightNum, ArrTime"]}
+{"sql":"SELECT FlightDate, AVG(\"Month\"), SUM(WheelsOn), MAX(ArrivalDelayGroups) FROM mytable WHERE DepTime BETWEEN 1432 AND 1333 OR DestCityMarketID > 31481 GROUP BY FlightDate LIMIT 29","hsqls":["SELECT FlightDate, AVG(`Month`), SUM(WheelsOn), MAX(ArrivalDelayGroups) FROM mytable WHERE DepTime BETWEEN 1432 AND 1333 OR DestCityMarketID > 31481 GROUP BY FlightDate LIMIT 29"]}
+{"sql":"SELECT DivDistance, OriginWac, MAX(NASDelay), SUM(\"Year\"), MIN(CarrierDelay) FROM mytable WHERE OriginStateName NOT IN ('Louisiana', 'Iowa', 'South Dakota', 'Nevada', 'Washington') GROUP BY DivDistance, OriginWac LIMIT 9","hsqls":["SELECT DivDistance, OriginWac, MAX(NASDelay), SUM(`Year`), MIN(CarrierDelay) FROM mytable WHERE OriginStateName NOT IN ('Louisiana', 'Iowa', 'South Dakota', 'Nevada', 'Washington') GROUP BY DivDistance, OriginWac LIMIT 9"]}
+{"sql":"SELECT Diverted, FirstDepTime, DivDistance FROM mytable WHERE OriginCityMarketID <= 32523 OR DivAirportSeqIDs >= 1393102 OR DepTimeBlk BETWEEN '1200-1259' AND '1800-1859' ORDER BY DivReachedDest, DepDelayMinutes, CarrierDelay LIMIT 21","hsqls":["SELECT Diverted, FirstDepTime, DivDistance FROM mytable WHERE OriginCityMarketID <= 32523 OR (DivAirportSeqIDs[1] >= 1393102 OR DivAirportSeqIDs[2] >= 1393102 OR DivAirportSeqIDs[3] >= 1393102 OR DivAirportSeqIDs[4] >= 1393102 OR DivAirportSeqIDs[5] >= 1393102) OR DepTimeBlk BETWEEN '1200-1259' AND '1800-1859' ORDER BY DivReachedDest, DepDelayMinutes, CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DivAirports BETWEEN 'RDM' AND 'PSC' AND DivLongestGTimes = 44.0 GROUP BY DestAirportSeqID, DivActualElapsedTime LIMIT 8","hsqls":["SELECT DestAirportSeqID, DivActualElapsedTime, COUNT(*) FROM mytable WHERE (DivAirports[1] BETWEEN 'RDM' AND 'PSC' OR DivAirports[2] BETWEEN 'RDM' AND 'PSC' OR DivAirports[3] BETWEEN 'RDM' AND 'PSC' OR DivAirports[4] BETWEEN 'RDM' AND 'PSC' OR DivAirports[5] BETWEEN 'RDM' AND 'PSC') AND (DivLongestGTimes[1] = 44.0 OR DivLongestGTimes[2] = 44.0 OR DivLongestGTimes[3] = 44.0 OR DivLongestGTimes[4] = 44.0 OR DivLongestGTimes[5] = 44.0) GROUP BY DestAirportSeqID, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, AVG(\"Month\"), MAX(DivArrDelay) FROM mytable WHERE WheelsOn BETWEEN 1228 AND 1920 OR Cancelled <> 0 GROUP BY DivAirportLandings LIMIT 23","hsqls":["SELECT DivAirportLandings, AVG(`Month`), MAX(DivArrDelay) FROM mytable WHERE WheelsOn BETWEEN 1228 AND 1920 OR Cancelled <> 0 GROUP BY DivAirportLandings LIMIT 23"]}
+{"sql":"SELECT FlightNum, ArrTime, COUNT(AirTime), AVG(DivArrDelay), COUNT(CancellationCode) FROM mytable WHERE DestStateName BETWEEN 'Ohio' AND 'South Carolina' AND \"Year\" < 2014 GROUP BY FlightNum, ArrTime","hsqls":["SELECT FlightNum, ArrTime, COUNT(AirTime), AVG(DivArrDelay), COUNT(CancellationCode) FROM mytable WHERE DestStateName BETWEEN 'Ohio' AND 'South Carolina' AND `Year` < 2014 GROUP BY FlightNum, ArrTime"]}
 {"sql":"SELECT DepTime, DepTimeBlk, CRSElapsedTime, MAX(OriginAirportSeqID), COUNT(FirstDepTime), COUNT(ArrDelay) FROM mytable GROUP BY DepTime, DepTimeBlk, CRSElapsedTime  ORDER BY DepTime, DepTimeBlk, CRSElapsedTime LIMIT 29","hsqls":["SELECT DepTime, DepTimeBlk, CRSElapsedTime, MAX(OriginAirportSeqID), COUNT(FirstDepTime), COUNT(ArrDelay) FROM mytable GROUP BY DepTime, DepTimeBlk, CRSElapsedTime  ORDER BY DepTime, DepTimeBlk, CRSElapsedTime LIMIT 29"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DestCityMarketID <= 31834 AND CRSDepTime IN (654) ORDER BY Quarter, ArrDel15, OriginStateName LIMIT 10"}
-{"sql":"SELECT DepDelayMinutes, DivWheelsOffs, CancellationCode FROM mytable WHERE DepDelay BETWEEN -13.0 AND 188.0 AND DivActualElapsedTime < 322 OR TaxiOut BETWEEN 57 AND 37 ORDER BY CRSDepTime, \"Month\"","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, CancellationCode FROM mytable WHERE DepDelay BETWEEN -13.0 AND 188.0 AND DivActualElapsedTime < 322 OR TaxiOut BETWEEN 57 AND 37 ORDER BY CRSDepTime, Month LIMIT 10000"]}
-{"sql":"SELECT Quarter, DepTime, DestCityMarketID, COUNT(DepDelay), COUNT(TaxiIn) FROM mytable WHERE DestAirportSeqID BETWEEN 1385103 AND 1291503 AND \"Year\" BETWEEN 2014 AND 2014 GROUP BY Quarter, DepTime, DestCityMarketID LIMIT 25","hsqls":["SELECT Quarter, DepTime, DestCityMarketID, COUNT(DepDelay), COUNT(TaxiIn) FROM mytable WHERE DestAirportSeqID BETWEEN 1385103 AND 1291503 AND Year BETWEEN 2014 AND 2014 GROUP BY Quarter, DepTime, DestCityMarketID LIMIT 25"]}
+{"sql":"SELECT DepDelayMinutes, DivWheelsOffs, CancellationCode FROM mytable WHERE DepDelay BETWEEN -13.0 AND 188.0 AND DivActualElapsedTime < 322 OR TaxiOut BETWEEN 57 AND 37 ORDER BY CRSDepTime, \"Month\"","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs, CancellationCode FROM mytable WHERE DepDelay BETWEEN -13.0 AND 188.0 AND DivActualElapsedTime < 322 OR TaxiOut BETWEEN 57 AND 37 ORDER BY CRSDepTime, `Month` LIMIT 10000"]}
+{"sql":"SELECT Quarter, DepTime, DestCityMarketID, COUNT(DepDelay), COUNT(TaxiIn) FROM mytable WHERE DestAirportSeqID BETWEEN 1385103 AND 1291503 AND \"Year\" BETWEEN 2014 AND 2014 GROUP BY Quarter, DepTime, DestCityMarketID LIMIT 25","hsqls":["SELECT Quarter, DepTime, DestCityMarketID, COUNT(DepDelay), COUNT(TaxiIn) FROM mytable WHERE DestAirportSeqID BETWEEN 1385103 AND 1291503 AND `Year` BETWEEN 2014 AND 2014 GROUP BY Quarter, DepTime, DestCityMarketID LIMIT 25"]}
 {"sql":"SELECT DepDelayMinutes, TailNum, DaysSinceEpoch, SUM(Diverted), MAX(DestCityMarketID), MAX(ActualElapsedTime) FROM mytable WHERE Carrier IN ('F9', 'HA', 'AA') AND DestAirportSeqID <> 1298202 GROUP BY DepDelayMinutes, TailNum, DaysSinceEpoch  ORDER BY DepDelayMinutes, TailNum, DaysSinceEpoch LIMIT 4","hsqls":["SELECT DepDelayMinutes, TailNum, DaysSinceEpoch, SUM(Diverted), MAX(DestCityMarketID), MAX(ActualElapsedTime) FROM mytable WHERE Carrier IN ('F9', 'HA', 'AA') AND DestAirportSeqID <> 1298202 GROUP BY DepDelayMinutes, TailNum, DaysSinceEpoch  ORDER BY DepDelayMinutes, TailNum, DaysSinceEpoch LIMIT 4"]}
 {"sql":"SELECT ArrivalDelayGroups, MIN(LateAircraftDelay), MIN(NASDelay), SUM(Quarter) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 20","hsqls":["SELECT ArrivalDelayGroups, MIN(LateAircraftDelay), MIN(NASDelay), SUM(Quarter) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 20"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CarrierDelay NOT IN (144, 153, 199, 62, 87) OR Carrier IN ('WN', 'OO') LIMIT 3"}
@@ -1067,59 +1067,59 @@
 {"sql":"SELECT TotalAddGTime, ActualElapsedTime, DestStateName, AVG(LateAircraftDelay), SUM(DayOfWeek) FROM mytable GROUP BY TotalAddGTime, ActualElapsedTime, DestStateName  ORDER BY TotalAddGTime, ActualElapsedTime, DestStateName LIMIT 5","hsqls":["SELECT TotalAddGTime, ActualElapsedTime, DestStateName, AVG(LateAircraftDelay), SUM(DayOfWeek) FROM mytable GROUP BY TotalAddGTime, ActualElapsedTime, DestStateName  ORDER BY TotalAddGTime, ActualElapsedTime, DestStateName LIMIT 5"]}
 {"sql":"SELECT FlightNum, COUNT(*) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 2","hsqls":["SELECT FlightNum, COUNT(*) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 2"]}
 {"sql":"SELECT TotalAddGTime, DepDel15 FROM mytable WHERE CRSElapsedTime NOT IN (349, 183, 356, 41, 315) OR TaxiOut BETWEEN 78 AND 25 ORDER BY CancellationCode, DivArrDelay LIMIT 13"}
-{"sql":"SELECT DivWheelsOffs, ArrDelay, UniqueCarrier FROM mytable WHERE OriginState NOT IN ('GA', 'NC', 'SD', 'IL', 'KY') OR DepartureDelayGroups <= 1 OR DepDelay <= 104.0 ORDER BY TaxiOut LIMIT 13","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, ArrDelay, UniqueCarrier FROM mytable WHERE OriginState NOT IN ('GA', 'NC', 'SD', 'IL', 'KY') OR DepartureDelayGroups <= 1 OR DepDelay <= 104.0 ORDER BY TaxiOut LIMIT 10000"]}
-{"sql":"SELECT SecurityDelay, ArrDel15, ArrDelay, MIN(DepDelayMinutes), SUM(DepDel15), MIN(ArrDelayMinutes) FROM mytable WHERE OriginStateFips BETWEEN 32 AND 53 OR DivAirportIDs >= 13303 GROUP BY SecurityDelay, ArrDel15, ArrDelay LIMIT 19","hsqls":["SELECT SecurityDelay, ArrDel15, ArrDelay, MIN(DepDelayMinutes), SUM(DepDel15), MIN(ArrDelayMinutes) FROM mytable WHERE OriginStateFips BETWEEN 32 AND 53 OR (DivAirportIDs__MV0 >= 13303 OR DivAirportIDs__MV1 >= 13303 OR DivAirportIDs__MV2 >= 13303 OR DivAirportIDs__MV3 >= 13303 OR DivAirportIDs__MV4 >= 13303) GROUP BY SecurityDelay, ArrDel15, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, ArrDelay, UniqueCarrier FROM mytable WHERE OriginState NOT IN ('GA', 'NC', 'SD', 'IL', 'KY') OR DepartureDelayGroups <= 1 OR DepDelay <= 104.0 ORDER BY TaxiOut LIMIT 13","hsqls":["SELECT DivWheelsOffs, ArrDelay, UniqueCarrier FROM mytable WHERE OriginState NOT IN ('GA', 'NC', 'SD', 'IL', 'KY') OR DepartureDelayGroups <= 1 OR DepDelay <= 104.0 ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, ArrDel15, ArrDelay, MIN(DepDelayMinutes), SUM(DepDel15), MIN(ArrDelayMinutes) FROM mytable WHERE OriginStateFips BETWEEN 32 AND 53 OR DivAirportIDs >= 13303 GROUP BY SecurityDelay, ArrDel15, ArrDelay LIMIT 19","hsqls":["SELECT SecurityDelay, ArrDel15, ArrDelay, MIN(DepDelayMinutes), SUM(DepDel15), MIN(ArrDelayMinutes) FROM mytable WHERE OriginStateFips BETWEEN 32 AND 53 OR (DivAirportIDs[1] >= 13303 OR DivAirportIDs[2] >= 13303 OR DivAirportIDs[3] >= 13303 OR DivAirportIDs[4] >= 13303 OR DivAirportIDs[5] >= 13303) GROUP BY SecurityDelay, ArrDel15, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT Quarter, ArrDelayMinutes, ArrDelay, AVG(DivActualElapsedTime) FROM mytable WHERE ArrTimeBlk <= '0600-0659' GROUP BY Quarter, ArrDelayMinutes, ArrDelay  ORDER BY Quarter, ArrDelayMinutes, ArrDelay LIMIT 28","hsqls":["SELECT Quarter, ArrDelayMinutes, ArrDelay, AVG(DivActualElapsedTime) FROM mytable WHERE ArrTimeBlk <= '0600-0659' GROUP BY Quarter, ArrDelayMinutes, ArrDelay  ORDER BY Quarter, ArrDelayMinutes, ArrDelay LIMIT 28"]}
 {"sql":"SELECT TailNum, ArrDelay, AVG(NASDelay), COUNT(DayOfWeek), MIN(CarrierDelay) FROM mytable WHERE TaxiIn NOT IN (31, 18, 73, 11) GROUP BY TailNum, ArrDelay  ORDER BY TailNum, ArrDelay LIMIT 12","hsqls":["SELECT TailNum, ArrDelay, AVG(NASDelay), COUNT(DayOfWeek), MIN(CarrierDelay) FROM mytable WHERE TaxiIn NOT IN (31, 18, 73, 11) GROUP BY TailNum, ArrDelay  ORDER BY TailNum, ArrDelay LIMIT 12"]}
 {"sql":"SELECT WheelsOff, ArrTimeBlk, OriginStateName FROM mytable WHERE DepDel15 NOT IN (0) AND DayofMonth BETWEEN 20 AND 14 ORDER BY Diverted, SecurityDelay, ArrDelayMinutes LIMIT 14"}
 {"sql":"SELECT Origin, DaysSinceEpoch FROM mytable WHERE ArrDelay IN (12.0, 60.0, 148.0) AND DivReachedDest IN (-9999) LIMIT 10"}
-{"sql":"SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE OriginAirportSeqID NOT IN (1457604, 1357702, 1349503, 1014602, 1212903) OR FlightNum BETWEEN 1994 AND 2164 OR LateAircraftDelay >= 90 ORDER BY DestState, FlightDate LIMIT 28","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginAirportSeqID NOT IN (1457604, 1357702, 1349503, 1014602, 1212903) OR FlightNum BETWEEN 1994 AND 2164 OR LateAircraftDelay >= 90 ORDER BY DestState, FlightDate LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE OriginAirportSeqID NOT IN (1457604, 1357702, 1349503, 1014602, 1212903) OR FlightNum BETWEEN 1994 AND 2164 OR LateAircraftDelay >= 90 ORDER BY DestState, FlightDate LIMIT 28","hsqls":["SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE OriginAirportSeqID NOT IN (1457604, 1357702, 1349503, 1014602, 1212903) OR FlightNum BETWEEN 1994 AND 2164 OR LateAircraftDelay >= 90 ORDER BY DestState, FlightDate LIMIT 10000"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE DaysSinceEpoch IN (16101, 16099, 16092, 16079) OR ArrDel15 BETWEEN -9999 AND 1 OR NASDelay NOT IN (185, 92, 305, 26, 130) ORDER BY DivReachedDest, ArrDelay LIMIT 17"}
 {"sql":"SELECT DepDelay, NASDelay, AVG(NASDelay), MIN(TotalAddGTime), MIN(FirstDepTime) FROM mytable GROUP BY DepDelay, NASDelay  ORDER BY DepDelay, NASDelay LIMIT 2","hsqls":["SELECT DepDelay, NASDelay, AVG(NASDelay), MIN(TotalAddGTime), MIN(FirstDepTime) FROM mytable GROUP BY DepDelay, NASDelay  ORDER BY DepDelay, NASDelay LIMIT 2"]}
 {"sql":"SELECT DivReachedDest, Diverted, AVG(ArrDel15) FROM mytable WHERE FlightDate IN ('2014-01-09') GROUP BY DivReachedDest, Diverted  ORDER BY DivReachedDest, Diverted LIMIT 5","hsqls":["SELECT DivReachedDest, Diverted, AVG(ArrDel15) FROM mytable WHERE FlightDate IN ('2014-01-09') GROUP BY DivReachedDest, Diverted  ORDER BY DivReachedDest, Diverted LIMIT 5"]}
-{"sql":"SELECT TotalAddGTime, CRSDepTime, CRSElapsedTime FROM mytable WHERE DivDistance <> 198 AND DivTailNums IN ('N12564') AND SecurityDelay BETWEEN 14 AND -9999 ORDER BY OriginCityMarketID, TotalAddGTime LIMIT 3","hsqls":["SELECT TotalAddGTime, CRSDepTime, CRSElapsedTime FROM mytable WHERE DivDistance <> 198 AND (DivTailNums__MV0 IN ('N12564') OR DivTailNums__MV1 IN ('N12564') OR DivTailNums__MV2 IN ('N12564') OR DivTailNums__MV3 IN ('N12564') OR DivTailNums__MV4 IN ('N12564')) AND SecurityDelay BETWEEN 14 AND -9999 ORDER BY OriginCityMarketID, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, CRSDepTime, CRSElapsedTime FROM mytable WHERE DivDistance <> 198 AND DivTailNums IN ('N12564') AND SecurityDelay BETWEEN 14 AND -9999 ORDER BY OriginCityMarketID, TotalAddGTime LIMIT 3","hsqls":["SELECT TotalAddGTime, CRSDepTime, CRSElapsedTime FROM mytable WHERE DivDistance <> 198 AND (DivTailNums[1] IN ('N12564') OR DivTailNums[2] IN ('N12564') OR DivTailNums[3] IN ('N12564') OR DivTailNums[4] IN ('N12564') OR DivTailNums[5] IN ('N12564')) AND SecurityDelay BETWEEN 14 AND -9999 ORDER BY OriginCityMarketID, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT TailNum, CancellationCode FROM mytable LIMIT 29"}
 {"sql":"SELECT OriginAirportID, SUM(Diverted) FROM mytable WHERE OriginCityMarketID <> 32337 AND DepDel15 BETWEEN 1 AND -9999 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 15","hsqls":["SELECT OriginAirportID, SUM(Diverted) FROM mytable WHERE OriginCityMarketID <> 32337 AND DepDel15 BETWEEN 1 AND -9999 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 15"]}
 {"sql":"SELECT OriginWac, SUM(Diverted), AVG(Quarter) FROM mytable GROUP BY OriginWac  ORDER BY OriginWac LIMIT 5","hsqls":["SELECT OriginWac, SUM(Diverted), AVG(Quarter) FROM mytable GROUP BY OriginWac  ORDER BY OriginWac LIMIT 5"]}
-{"sql":"SELECT DivLongestGTimes, AirTime FROM mytable WHERE FlightDate BETWEEN '2014-01-21' AND '2014-01-16' AND CancellationCode <= 'C' AND DepDel15 NOT IN (1, -9999) ORDER BY ArrTime, DestStateName, ArrDel15 LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, AirTime FROM mytable WHERE FlightDate BETWEEN '2014-01-21' AND '2014-01-16' AND CancellationCode <= 'C' AND DepDel15 NOT IN (1, -9999) ORDER BY ArrTime, DestStateName, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, AirTime FROM mytable WHERE FlightDate BETWEEN '2014-01-21' AND '2014-01-16' AND CancellationCode <= 'C' AND DepDel15 NOT IN (1, -9999) ORDER BY ArrTime, DestStateName, ArrDel15 LIMIT 2","hsqls":["SELECT DivLongestGTimes, AirTime FROM mytable WHERE FlightDate BETWEEN '2014-01-21' AND '2014-01-16' AND CancellationCode <= 'C' AND DepDel15 NOT IN (1, -9999) ORDER BY ArrTime, DestStateName, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT Carrier, CRSArrTime, UniqueCarrier FROM mytable WHERE DestStateName BETWEEN 'Nebraska' AND 'Illinois' OR DayOfWeek > 3 ORDER BY DivArrDelay LIMIT 20"}
 {"sql":"SELECT DivReachedDest, Carrier, WeatherDelay FROM mytable WHERE Cancelled BETWEEN 0 AND 0 AND UniqueCarrier IN ('EV', 'US', 'AS', 'AA') AND LateAircraftDelay BETWEEN 52 AND 151 ORDER BY DestCityName, OriginWac LIMIT 10"}
 {"sql":"SELECT \"Year\", Quarter, DestState, COUNT(ArrTimeBlk), MIN(DivReachedDest), SUM(DayOfWeek) FROM mytable WHERE TotalAddGTime NOT IN (94, 13, 27, 37) AND CRSDepTime >= 739 OR LongestAddGTime IN (148, 31, 4, -9999) GROUP BY \"Year\", Quarter, DestState LIMIT 20","hsqls":["SELECT Year, Quarter, DestState, COUNT(ArrTimeBlk), MIN(DivReachedDest), SUM(DayOfWeek) FROM mytable WHERE TotalAddGTime NOT IN (94, 13, 27, 37) AND CRSDepTime >= 739 OR LongestAddGTime IN (148, 31, 4, -9999) GROUP BY Year, Quarter, DestState LIMIT 20"]}
 {"sql":"SELECT Distance, AirlineID FROM mytable WHERE Quarter BETWEEN 1 AND 1 ORDER BY DepartureDelayGroups, Flights, ArrTime LIMIT 2"}
 {"sql":"SELECT ArrDelayMinutes, COUNT(*) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 25","hsqls":["SELECT ArrDelayMinutes, COUNT(*) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 25"]}
 {"sql":"SELECT OriginStateFips, TaxiIn, OriginStateName FROM mytable WHERE ArrTime <= 818 AND DepartureDelayGroups NOT IN (1, -2, -1, 12) ORDER BY Origin LIMIT 24"}
-{"sql":"SELECT DepDelayMinutes, SUM(\"Year\"), MIN(DepDelay), MIN(DivAirportLandings) FROM mytable GROUP BY DepDelayMinutes LIMIT 25","hsqls":["SELECT DepDelayMinutes, SUM(Year), MIN(DepDelay), MIN(DivAirportLandings) FROM mytable GROUP BY DepDelayMinutes LIMIT 25"]}
+{"sql":"SELECT DepDelayMinutes, SUM(\"Year\"), MIN(DepDelay), MIN(DivAirportLandings) FROM mytable GROUP BY DepDelayMinutes LIMIT 25","hsqls":["SELECT DepDelayMinutes, SUM(`Year`), MIN(DepDelay), MIN(DivAirportLandings) FROM mytable GROUP BY DepDelayMinutes LIMIT 25"]}
 {"sql":"SELECT OriginStateFips, CRSArrTime, AirlineID, MIN(AirTime), AVG(CarrierDelay), SUM(Diverted) FROM mytable WHERE Cancelled NOT IN (1) GROUP BY OriginStateFips, CRSArrTime, AirlineID  ORDER BY OriginStateFips, CRSArrTime, AirlineID LIMIT 6","hsqls":["SELECT OriginStateFips, CRSArrTime, AirlineID, MIN(AirTime), AVG(CarrierDelay), SUM(Diverted) FROM mytable WHERE Cancelled NOT IN (1) GROUP BY OriginStateFips, CRSArrTime, AirlineID  ORDER BY OriginStateFips, CRSArrTime, AirlineID LIMIT 6"]}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND -2 AND DivTotalGTimes BETWEEN 34 AND 23","hsqls":["SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND -2 AND (DivTotalGTimes__MV0 BETWEEN 34 AND 23 OR DivTotalGTimes__MV1 BETWEEN 34 AND 23 OR DivTotalGTimes__MV2 BETWEEN 34 AND 23 OR DivTotalGTimes__MV3 BETWEEN 34 AND 23 OR DivTotalGTimes__MV4 BETWEEN 34 AND 23) LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND -2 AND DivTotalGTimes BETWEEN 34 AND 23","hsqls":["SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND -2 AND (DivTotalGTimes[1] BETWEEN 34 AND 23 OR DivTotalGTimes[2] BETWEEN 34 AND 23 OR DivTotalGTimes[3] BETWEEN 34 AND 23 OR DivTotalGTimes[4] BETWEEN 34 AND 23 OR DivTotalGTimes[5] BETWEEN 34 AND 23) LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DepDel15, AVG(DepDelay), AVG(DivArrDelay), AVG(DepartureDelayGroups) FROM mytable GROUP BY Cancelled, DepDel15  ORDER BY Cancelled, DepDel15 LIMIT 26","hsqls":["SELECT Cancelled, DepDel15, AVG(DepDelay), AVG(DivArrDelay), AVG(DepartureDelayGroups) FROM mytable GROUP BY Cancelled, DepDel15  ORDER BY Cancelled, DepDel15 LIMIT 26"]}
-{"sql":"SELECT DivAirports, DayOfWeek FROM mytable WHERE DivWheelsOns IN (1747) AND ActualElapsedTime < 124 AND ArrDel15 NOT IN (1, -9999) ORDER BY Dest, DaysSinceEpoch LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DayOfWeek FROM mytable WHERE (DivWheelsOns__MV0 IN (1747) OR DivWheelsOns__MV1 IN (1747) OR DivWheelsOns__MV2 IN (1747) OR DivWheelsOns__MV3 IN (1747) OR DivWheelsOns__MV4 IN (1747)) AND ActualElapsedTime < 124 AND ArrDel15 NOT IN (1, -9999) ORDER BY Dest, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT DepTime, ArrTimeBlk, DivWheelsOffs FROM mytable ORDER BY Quarter, Distance LIMIT 13","hsqls":["SELECT DepTime, ArrTimeBlk, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY Quarter, Distance LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DayOfWeek FROM mytable WHERE DivWheelsOns IN (1747) AND ActualElapsedTime < 124 AND ArrDel15 NOT IN (1, -9999) ORDER BY Dest, DaysSinceEpoch LIMIT 24","hsqls":["SELECT DivAirports, DayOfWeek FROM mytable WHERE (DivWheelsOns[1] IN (1747) OR DivWheelsOns[2] IN (1747) OR DivWheelsOns[3] IN (1747) OR DivWheelsOns[4] IN (1747) OR DivWheelsOns[5] IN (1747)) AND ActualElapsedTime < 124 AND ArrDel15 NOT IN (1, -9999) ORDER BY Dest, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepTime, ArrTimeBlk, DivWheelsOffs FROM mytable ORDER BY Quarter, Distance LIMIT 13","hsqls":["SELECT DepTime, ArrTimeBlk, DivWheelsOffs FROM mytable ORDER BY Quarter, Distance LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, NASDelay FROM mytable ORDER BY Dest, DestCityMarketID LIMIT 17"}
 {"sql":"SELECT TaxiOut FROM mytable WHERE TailNum NOT IN ('N592JB') AND Cancelled BETWEEN 0 AND 1 ORDER BY DestCityMarketID, DayOfWeek LIMIT 4"}
 {"sql":"SELECT Quarter, DepDel15, DayOfWeek FROM mytable WHERE Cancelled >= 0 LIMIT 12"}
 {"sql":"SELECT AirTime FROM mytable WHERE TotalAddGTime <= 21 ORDER BY OriginWac, CRSElapsedTime LIMIT 16"}
-{"sql":"SELECT FirstDepTime, DepTime, COUNT(*) FROM mytable WHERE OriginStateFips IN (47, 55, 18, 25) AND DivAirportSeqIDs > 1106603 GROUP BY FirstDepTime, DepTime LIMIT 29","hsqls":["SELECT FirstDepTime, DepTime, COUNT(*) FROM mytable WHERE OriginStateFips IN (47, 55, 18, 25) AND (DivAirportSeqIDs__MV0 > 1106603 OR DivAirportSeqIDs__MV1 > 1106603 OR DivAirportSeqIDs__MV2 > 1106603 OR DivAirportSeqIDs__MV3 > 1106603 OR DivAirportSeqIDs__MV4 > 1106603) GROUP BY FirstDepTime, DepTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DepTime, COUNT(*) FROM mytable WHERE OriginStateFips IN (47, 55, 18, 25) AND DivAirportSeqIDs > 1106603 GROUP BY FirstDepTime, DepTime LIMIT 29","hsqls":["SELECT FirstDepTime, DepTime, COUNT(*) FROM mytable WHERE OriginStateFips IN (47, 55, 18, 25) AND (DivAirportSeqIDs[1] > 1106603 OR DivAirportSeqIDs[2] > 1106603 OR DivAirportSeqIDs[3] > 1106603 OR DivAirportSeqIDs[4] > 1106603 OR DivAirportSeqIDs[5] > 1106603) GROUP BY FirstDepTime, DepTime LIMIT 10000"]}
 {"sql":"SELECT SUM(ArrDelayMinutes), COUNT(Distance) FROM mytable WHERE DayofMonth BETWEEN 28 AND 11 OR DepDel15 IN (1, -9999) AND WheelsOn BETWEEN 1941 AND 1539 LIMIT 6"}
-{"sql":"SELECT DivDistance, \"Month\", CRSDepTime, AVG(Distance), MIN(\"Month\"), SUM(DestCityMarketID) FROM mytable WHERE OriginStateFips IN (19, 72, 25) OR DepDel15 > -9999 GROUP BY DivDistance, \"Month\", CRSDepTime LIMIT 14","hsqls":["SELECT DivDistance, Month, CRSDepTime, AVG(Distance), MIN(Month), SUM(DestCityMarketID) FROM mytable WHERE OriginStateFips IN (19, 72, 25) OR DepDel15 > -9999 GROUP BY DivDistance, Month, CRSDepTime LIMIT 14"]}
+{"sql":"SELECT DivDistance, \"Month\", CRSDepTime, AVG(Distance), MIN(\"Month\"), SUM(DestCityMarketID) FROM mytable WHERE OriginStateFips IN (19, 72, 25) OR DepDel15 > -9999 GROUP BY DivDistance, \"Month\", CRSDepTime LIMIT 14","hsqls":["SELECT DivDistance, Month, CRSDepTime, AVG(Distance), MIN(`Month`), SUM(DestCityMarketID) FROM mytable WHERE OriginStateFips IN (19, 72, 25) OR DepDel15 > -9999 GROUP BY DivDistance, Month, CRSDepTime LIMIT 14"]}
 {"sql":"SELECT OriginCityMarketID, DepTime FROM mytable WHERE Carrier = 'UA' AND OriginStateName >= 'Connecticut' ORDER BY OriginCityName, ActualElapsedTime, ArrivalDelayGroups LIMIT 18"}
-{"sql":"SELECT COUNT(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 81 AND 83 AND DivTailNums = 'N316JB' OR DivTailNums IN ('N934SW') LIMIT 7","hsqls":["SELECT COUNT(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 81 AND 83 AND (DivTailNums__MV0 = 'N316JB' OR DivTailNums__MV1 = 'N316JB' OR DivTailNums__MV2 = 'N316JB' OR DivTailNums__MV3 = 'N316JB' OR DivTailNums__MV4 = 'N316JB') OR (DivTailNums__MV0 IN ('N934SW') OR DivTailNums__MV1 IN ('N934SW') OR DivTailNums__MV2 IN ('N934SW') OR DivTailNums__MV3 IN ('N934SW') OR DivTailNums__MV4 IN ('N934SW')) LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 81 AND 83 AND DivTailNums = 'N316JB' OR DivTailNums IN ('N934SW') LIMIT 7","hsqls":["SELECT COUNT(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 81 AND 83 AND (DivTailNums[1] = 'N316JB' OR DivTailNums[2] = 'N316JB' OR DivTailNums[3] = 'N316JB' OR DivTailNums[4] = 'N316JB' OR DivTailNums[5] = 'N316JB') OR (DivTailNums[1] IN ('N934SW') OR DivTailNums[2] IN ('N934SW') OR DivTailNums[3] IN ('N934SW') OR DivTailNums[4] IN ('N934SW') OR DivTailNums[5] IN ('N934SW')) LIMIT 10000"]}
 {"sql":"SELECT Quarter, Distance, OriginStateName FROM mytable WHERE DestAirportSeqID BETWEEN 1200702 AND 1562401 OR DivReachedDest >= -9999 ORDER BY DivActualElapsedTime, ArrivalDelayGroups, DaysSinceEpoch LIMIT 17"}
-{"sql":"SELECT Diverted, ActualElapsedTime FROM mytable WHERE DivAirports IN ('AEX', 'TUL') AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND TailNum NOT IN ('N297SW', 'N14542', 'N921AT', 'N16951') ORDER BY LateAircraftDelay, DivDistance, Dest LIMIT 10","hsqls":["SELECT Diverted, ActualElapsedTime FROM mytable WHERE (DivAirports__MV0 IN ('AEX', 'TUL') OR DivAirports__MV1 IN ('AEX', 'TUL') OR DivAirports__MV2 IN ('AEX', 'TUL') OR DivAirports__MV3 IN ('AEX', 'TUL') OR DivAirports__MV4 IN ('AEX', 'TUL')) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND TailNum NOT IN ('N297SW', 'N14542', 'N921AT', 'N16951') ORDER BY LateAircraftDelay, DivDistance, Dest LIMIT 10000"]}
-{"sql":"SELECT DepDelay, LateAircraftDelay, DepTimeBlk, SUM(\"Month\"), AVG(Flights) FROM mytable WHERE DivWheelsOns IN (1908, 943, 2200) AND WheelsOff > 1532 GROUP BY DepDelay, LateAircraftDelay, DepTimeBlk LIMIT 8","hsqls":["SELECT DepDelay, LateAircraftDelay, DepTimeBlk, SUM(Month), AVG(Flights) FROM mytable WHERE (DivWheelsOns__MV0 IN (1908, 943, 2200) OR DivWheelsOns__MV1 IN (1908, 943, 2200) OR DivWheelsOns__MV2 IN (1908, 943, 2200) OR DivWheelsOns__MV3 IN (1908, 943, 2200) OR DivWheelsOns__MV4 IN (1908, 943, 2200)) AND WheelsOff > 1532 GROUP BY DepDelay, LateAircraftDelay, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT Diverted, ActualElapsedTime FROM mytable WHERE DivAirports IN ('AEX', 'TUL') AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND TailNum NOT IN ('N297SW', 'N14542', 'N921AT', 'N16951') ORDER BY LateAircraftDelay, DivDistance, Dest LIMIT 10","hsqls":["SELECT Diverted, ActualElapsedTime FROM mytable WHERE (DivAirports[1] IN ('AEX', 'TUL') OR DivAirports[2] IN ('AEX', 'TUL') OR DivAirports[3] IN ('AEX', 'TUL') OR DivAirports[4] IN ('AEX', 'TUL') OR DivAirports[5] IN ('AEX', 'TUL')) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND TailNum NOT IN ('N297SW', 'N14542', 'N921AT', 'N16951') ORDER BY LateAircraftDelay, DivDistance, Dest LIMIT 10000"]}
+{"sql":"SELECT DepDelay, LateAircraftDelay, DepTimeBlk, SUM(\"Month\"), AVG(Flights) FROM mytable WHERE DivWheelsOns IN (1908, 943, 2200) AND WheelsOff > 1532 GROUP BY DepDelay, LateAircraftDelay, DepTimeBlk LIMIT 8","hsqls":["SELECT DepDelay, LateAircraftDelay, DepTimeBlk, SUM(`Month`), AVG(Flights) FROM mytable WHERE (DivWheelsOns[1] IN (1908, 943, 2200) OR DivWheelsOns[2] IN (1908, 943, 2200) OR DivWheelsOns[3] IN (1908, 943, 2200) OR DivWheelsOns[4] IN (1908, 943, 2200) OR DivWheelsOns[5] IN (1908, 943, 2200)) AND WheelsOff > 1532 GROUP BY DepDelay, LateAircraftDelay, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DepDelayMinutes, FlightDate FROM mytable WHERE DepTime NOT IN (1851, 2100) AND NASDelay BETWEEN 49 AND 31 AND Diverted IN (1, 0) ORDER BY Cancelled, DestAirportID LIMIT 26","hsqls":["SELECT Year, DepDelayMinutes, FlightDate FROM mytable WHERE DepTime NOT IN (1851, 2100) AND NASDelay BETWEEN 49 AND 31 AND Diverted IN (1, 0) ORDER BY Cancelled, DestAirportID LIMIT 26"]}
 {"sql":"SELECT AVG(NASDelay) FROM mytable LIMIT 18"}
-{"sql":"SELECT DivLongestGTimes, OriginCityMarketID, DestCityMarketID FROM mytable ORDER BY ArrDel15, CRSDepTime LIMIT 12","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginCityMarketID, DestCityMarketID FROM mytable ORDER BY ArrDel15, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT Cancelled, AVG(DestAirportSeqID), MAX(Quarter), SUM(DaysSinceEpoch) FROM mytable WHERE DivTotalGTimes BETWEEN 56 AND 196 AND DivWheelsOns IN (1856, 2244, 1222, 1114, 1229) AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Cancelled LIMIT 24","hsqls":["SELECT Cancelled, AVG(DestAirportSeqID), MAX(Quarter), SUM(DaysSinceEpoch) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 56 AND 196 OR DivTotalGTimes__MV1 BETWEEN 56 AND 196 OR DivTotalGTimes__MV2 BETWEEN 56 AND 196 OR DivTotalGTimes__MV3 BETWEEN 56 AND 196 OR DivTotalGTimes__MV4 BETWEEN 56 AND 196) AND (DivWheelsOns__MV0 IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns__MV1 IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns__MV2 IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns__MV3 IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns__MV4 IN (1856, 2244, 1222, 1114, 1229)) AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginCityMarketID, DestCityMarketID FROM mytable ORDER BY ArrDel15, CRSDepTime LIMIT 12","hsqls":["SELECT DivLongestGTimes, OriginCityMarketID, DestCityMarketID FROM mytable ORDER BY ArrDel15, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT Cancelled, AVG(DestAirportSeqID), MAX(Quarter), SUM(DaysSinceEpoch) FROM mytable WHERE DivTotalGTimes BETWEEN 56 AND 196 AND DivWheelsOns IN (1856, 2244, 1222, 1114, 1229) AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Cancelled LIMIT 24","hsqls":["SELECT Cancelled, AVG(DestAirportSeqID), MAX(Quarter), SUM(DaysSinceEpoch) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 56 AND 196 OR DivTotalGTimes[2] BETWEEN 56 AND 196 OR DivTotalGTimes[3] BETWEEN 56 AND 196 OR DivTotalGTimes[4] BETWEEN 56 AND 196 OR DivTotalGTimes[5] BETWEEN 56 AND 196) AND (DivWheelsOns[1] IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns[2] IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns[3] IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns[4] IN (1856, 2244, 1222, 1114, 1229) OR DivWheelsOns[5] IN (1856, 2244, 1222, 1114, 1229)) AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Cancelled LIMIT 10000"]}
 {"sql":"SELECT AVG(ArrivalDelayGroups), SUM(DistanceGroup), MAX(DayofMonth) FROM mytable WHERE DayofMonth >= 5 OR AirTime <= 368 OR Flights BETWEEN 1 AND 1 LIMIT 19"}
-{"sql":"SELECT DivAirports, DestAirportSeqID, AirlineID FROM mytable WHERE OriginWac BETWEEN 12 AND 14 ORDER BY DepartureDelayGroups, DestAirportID LIMIT 18","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportSeqID, AirlineID FROM mytable WHERE OriginWac BETWEEN 12 AND 14 ORDER BY DepartureDelayGroups, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestAirportSeqID, AirlineID FROM mytable WHERE OriginWac BETWEEN 12 AND 14 ORDER BY DepartureDelayGroups, DestAirportID LIMIT 18","hsqls":["SELECT DivAirports, DestAirportSeqID, AirlineID FROM mytable WHERE OriginWac BETWEEN 12 AND 14 ORDER BY DepartureDelayGroups, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime, COUNT(*) FROM mytable WHERE DestAirportSeqID NOT IN (1040802, 1448902, 1161706, 1302902, 1334205) GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 21","hsqls":["SELECT CRSDepTime, COUNT(*) FROM mytable WHERE DestAirportSeqID NOT IN (1040802, 1448902, 1161706, 1302902, 1334205) GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 21"]}
 {"sql":"SELECT ArrDelay, AVG(DepDel15), SUM(LongestAddGTime) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 5","hsqls":["SELECT ArrDelay, AVG(DepDel15), SUM(LongestAddGTime) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 5"]}
 {"sql":"SELECT TaxiOut, DestWac, DestStateFips FROM mytable WHERE ArrDelay NOT IN (197.0, 116.0, 93.0, 308.0) ORDER BY DepartureDelayGroups, Flights LIMIT 18"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DestCityName IN ('Chattanooga, TN', 'New York, NY') LIMIT 29","hsqls":["SELECT COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND DestCityName IN ('Chattanooga, TN', 'New York, NY') LIMIT 29"]}
-{"sql":"SELECT Quarter, DivAirports, ArrDelay FROM mytable WHERE Quarter < 1 OR DivAirportIDs IN (12992, 13495) AND \"Month\" BETWEEN 1 AND 1 ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT Quarter, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrDelay FROM mytable WHERE Quarter < 1 OR (DivAirportIDs__MV0 IN (12992, 13495) OR DivAirportIDs__MV1 IN (12992, 13495) OR DivAirportIDs__MV2 IN (12992, 13495) OR DivAirportIDs__MV3 IN (12992, 13495) OR DivAirportIDs__MV4 IN (12992, 13495)) AND Month BETWEEN 1 AND 1 ORDER BY DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, DivArrDelay FROM mytable WHERE DivLongestGTimes IN (3.0, 53.0, 79.0, 31.0) OR WeatherDelay <> 10 ORDER BY NASDelay, UniqueCarrier LIMIT 3","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivArrDelay FROM mytable WHERE (DivLongestGTimes__MV0 IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes__MV1 IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes__MV2 IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes__MV3 IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes__MV4 IN (3.0, 53.0, 79.0, 31.0)) OR WeatherDelay <> 10 ORDER BY NASDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DestCityName IN ('Chattanooga, TN', 'New York, NY') LIMIT 29","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND DestCityName IN ('Chattanooga, TN', 'New York, NY') LIMIT 29"]}
+{"sql":"SELECT Quarter, DivAirports, ArrDelay FROM mytable WHERE Quarter < 1 OR DivAirportIDs IN (12992, 13495) AND \"Month\" BETWEEN 1 AND 1 ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT Quarter, DivAirports, ArrDelay FROM mytable WHERE Quarter < 1 OR (DivAirportIDs[1] IN (12992, 13495) OR DivAirportIDs[2] IN (12992, 13495) OR DivAirportIDs[3] IN (12992, 13495) OR DivAirportIDs[4] IN (12992, 13495) OR DivAirportIDs[5] IN (12992, 13495)) AND `Month` BETWEEN 1 AND 1 ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivArrDelay FROM mytable WHERE DivLongestGTimes IN (3.0, 53.0, 79.0, 31.0) OR WeatherDelay <> 10 ORDER BY NASDelay, UniqueCarrier LIMIT 3","hsqls":["SELECT DivWheelsOns, DivArrDelay FROM mytable WHERE (DivLongestGTimes[1] IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes[2] IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes[3] IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes[4] IN (3.0, 53.0, 79.0, 31.0) OR DivLongestGTimes[5] IN (3.0, 53.0, 79.0, 31.0)) OR WeatherDelay <> 10 ORDER BY NASDelay, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DestStateName, ArrivalDelayGroups FROM mytable LIMIT 9"}
-{"sql":"SELECT FirstDepTime, DepDelayMinutes, Origin, COUNT(OriginStateFips) FROM mytable WHERE DivWheelsOns BETWEEN 634 AND 2123 GROUP BY FirstDepTime, DepDelayMinutes, Origin LIMIT 26","hsqls":["SELECT FirstDepTime, DepDelayMinutes, Origin, COUNT(OriginStateFips) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 634 AND 2123 OR DivWheelsOns__MV1 BETWEEN 634 AND 2123 OR DivWheelsOns__MV2 BETWEEN 634 AND 2123 OR DivWheelsOns__MV3 BETWEEN 634 AND 2123 OR DivWheelsOns__MV4 BETWEEN 634 AND 2123) GROUP BY FirstDepTime, DepDelayMinutes, Origin LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DepDelayMinutes, Origin, COUNT(OriginStateFips) FROM mytable WHERE DivWheelsOns BETWEEN 634 AND 2123 GROUP BY FirstDepTime, DepDelayMinutes, Origin LIMIT 26","hsqls":["SELECT FirstDepTime, DepDelayMinutes, Origin, COUNT(OriginStateFips) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 634 AND 2123 OR DivWheelsOns[2] BETWEEN 634 AND 2123 OR DivWheelsOns[3] BETWEEN 634 AND 2123 OR DivWheelsOns[4] BETWEEN 634 AND 2123 OR DivWheelsOns[5] BETWEEN 634 AND 2123) GROUP BY FirstDepTime, DepDelayMinutes, Origin LIMIT 10000"]}
 {"sql":"SELECT Origin FROM mytable WHERE OriginState NOT IN ('ME') AND UniqueCarrier IN ('US', 'VX') AND TaxiOut BETWEEN 3 AND 102 ORDER BY DivReachedDest, DivDistance, WeatherDelay LIMIT 8"}
 {"sql":"SELECT COUNT(DestCityMarketID), AVG(DestWac) FROM mytable LIMIT 18"}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE Quarter >= 1 ORDER BY FirstDepTime LIMIT 19"}
@@ -1130,19 +1130,19 @@
 {"sql":"SELECT DestStateFips FROM mytable WHERE Quarter IN (1) ORDER BY ArrTime, DepDel15 LIMIT 23"}
 {"sql":"SELECT Diverted, SUM(OriginWac) FROM mytable GROUP BY Diverted  ORDER BY Diverted LIMIT 13","hsqls":["SELECT Diverted, SUM(OriginWac) FROM mytable GROUP BY Diverted  ORDER BY Diverted LIMIT 13"]}
 {"sql":"SELECT WheelsOff, SUM(DistanceGroup) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 13","hsqls":["SELECT WheelsOff, SUM(DistanceGroup) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 13"]}
-{"sql":"SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE DepDelay BETWEEN 455.0 AND 66.0 AND DivWheelsOns = 2141 OR CancellationCode BETWEEN 'B' AND 'noodles' LIMIT 13","hsqls":["SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE DepDelay BETWEEN 455.0 AND 66.0 AND (DivWheelsOns__MV0 = 2141 OR DivWheelsOns__MV1 = 2141 OR DivWheelsOns__MV2 = 2141 OR DivWheelsOns__MV3 = 2141 OR DivWheelsOns__MV4 = 2141) OR CancellationCode BETWEEN 'B' AND 'noodles' LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE DepDelay BETWEEN 455.0 AND 66.0 AND DivWheelsOns = 2141 OR CancellationCode BETWEEN 'B' AND 'noodles' LIMIT 13","hsqls":["SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE DepDelay BETWEEN 455.0 AND 66.0 AND (DivWheelsOns[1] = 2141 OR DivWheelsOns[2] = 2141 OR DivWheelsOns[3] = 2141 OR DivWheelsOns[4] = 2141 OR DivWheelsOns[5] = 2141) OR CancellationCode BETWEEN 'B' AND 'noodles' LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DepTime FROM mytable WHERE ArrDelayMinutes > 238.0 OR DivReachedDest >= 1 OR ArrDel15 BETWEEN -9999 AND 1 LIMIT 20"}
-{"sql":"SELECT FlightDate, DaysSinceEpoch FROM mytable WHERE CarrierDelay IN (70, 414) OR LateAircraftDelay NOT IN (63) OR \"Month\" <= 1 LIMIT 23","hsqls":["SELECT FlightDate, DaysSinceEpoch FROM mytable WHERE CarrierDelay IN (70, 414) OR LateAircraftDelay NOT IN (63) OR Month <= 1 LIMIT 23"]}
+{"sql":"SELECT FlightDate, DaysSinceEpoch FROM mytable WHERE CarrierDelay IN (70, 414) OR LateAircraftDelay NOT IN (63) OR \"Month\" <= 1 LIMIT 23","hsqls":["SELECT FlightDate, DaysSinceEpoch FROM mytable WHERE CarrierDelay IN (70, 414) OR LateAircraftDelay NOT IN (63) OR `Month` <= 1 LIMIT 23"]}
 {"sql":"SELECT Diverted, OriginAirportID FROM mytable WHERE SecurityDelay >= 14 OR TaxiOut NOT IN (13, 37, 75) AND DestStateName BETWEEN 'Arizona' AND 'Massachusetts' LIMIT 1"}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE DayofMonth < 21 OR LongestAddGTime >= 4 ORDER BY TaxiOut, ActualElapsedTime, DaysSinceEpoch LIMIT 5"}
 {"sql":"SELECT FlightDate, OriginStateName, AVG(AirTime), AVG(DepartureDelayGroups) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DaysSinceEpoch IN (16071) AND LateAircraftDelay BETWEEN 7 AND 111 GROUP BY FlightDate, OriginStateName  ORDER BY FlightDate, OriginStateName LIMIT 19","hsqls":["SELECT FlightDate, OriginStateName, AVG(AirTime), AVG(DepartureDelayGroups) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DaysSinceEpoch IN (16071) AND LateAircraftDelay BETWEEN 7 AND 111 GROUP BY FlightDate, OriginStateName  ORDER BY FlightDate, OriginStateName LIMIT 19"]}
-{"sql":"SELECT ArrTimeBlk, DivTailNums, ArrivalDelayGroups FROM mytable LIMIT 28","hsqls":["SELECT ArrTimeBlk, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, ArrivalDelayGroups FROM mytable LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DivTailNums, ArrivalDelayGroups FROM mytable LIMIT 28","hsqls":["SELECT ArrTimeBlk, DivTailNums, ArrivalDelayGroups FROM mytable LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, DayOfWeek, MIN(DivArrDelay), COUNT(DestCityMarketID) FROM mytable GROUP BY ArrTimeBlk, DayOfWeek  ORDER BY ArrTimeBlk, DayOfWeek LIMIT 2","hsqls":["SELECT ArrTimeBlk, DayOfWeek, MIN(DivArrDelay), COUNT(DestCityMarketID) FROM mytable GROUP BY ArrTimeBlk, DayOfWeek  ORDER BY ArrTimeBlk, DayOfWeek LIMIT 2"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 4"}
-{"sql":"SELECT DestState, SUM(TotalAddGTime), MIN(DestCityMarketID) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1106603 AND 1496002 AND TailNum < 'N135EV' AND DestAirportID IN (14570) GROUP BY DestState LIMIT 11","hsqls":["SELECT DestState, SUM(TotalAddGTime), MIN(DestCityMarketID) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs__MV1 BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs__MV2 BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs__MV3 BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs__MV4 BETWEEN 1106603 AND 1496002) AND TailNum < 'N135EV' AND DestAirportID IN (14570) GROUP BY DestState LIMIT 10000"]}
+{"sql":"SELECT DestState, SUM(TotalAddGTime), MIN(DestCityMarketID) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1106603 AND 1496002 AND TailNum < 'N135EV' AND DestAirportID IN (14570) GROUP BY DestState LIMIT 11","hsqls":["SELECT DestState, SUM(TotalAddGTime), MIN(DestCityMarketID) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs[2] BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs[3] BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs[4] BETWEEN 1106603 AND 1496002 OR DivAirportSeqIDs[5] BETWEEN 1106603 AND 1496002) AND TailNum < 'N135EV' AND DestAirportID IN (14570) GROUP BY DestState LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE WheelsOff <= 1806 OR OriginWac <> 13 AND SecurityDelay NOT IN (8, 27) ORDER BY OriginState, DepTime LIMIT 10"}
 {"sql":"SELECT UniqueCarrier, SUM(ArrDelayMinutes), MAX(ArrDelayMinutes), MIN(DayofMonth) FROM mytable WHERE Distance = 220 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 6","hsqls":["SELECT UniqueCarrier, SUM(ArrDelayMinutes), MAX(ArrDelayMinutes), MIN(DayofMonth) FROM mytable WHERE Distance = 220 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 6"]}
-{"sql":"SELECT DivLongestGTimes, FlightDate, DestAirportSeqID FROM mytable WHERE DestAirportSeqID IN (1349503) ORDER BY \"Year\", CRSArrTime LIMIT 1","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, FlightDate, DestAirportSeqID FROM mytable WHERE DestAirportSeqID IN (1349503) ORDER BY Year, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, FlightDate, DestAirportSeqID FROM mytable WHERE DestAirportSeqID IN (1349503) ORDER BY \"Year\", CRSArrTime LIMIT 1","hsqls":["SELECT DivLongestGTimes, FlightDate, DestAirportSeqID FROM mytable WHERE DestAirportSeqID IN (1349503) ORDER BY Year, CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT MIN(DestWac), MAX(TotalAddGTime), AVG(FlightNum) FROM mytable WHERE OriginState BETWEEN 'SD' AND 'OR' LIMIT 27"}
 {"sql":"SELECT AVG(DivDistance), MAX(DepartureDelayGroups) FROM mytable WHERE OriginAirportSeqID BETWEEN 1192102 AND 1238902 OR Dest BETWEEN 'MFE' AND 'EWR' LIMIT 10"}
 {"sql":"SELECT ActualElapsedTime, OriginWac FROM mytable WHERE OriginAirportSeqID BETWEEN 1130802 AND 1217703 ORDER BY SecurityDelay, DepTimeBlk LIMIT 10"}
@@ -1155,46 +1155,46 @@
 {"sql":"SELECT DestWac FROM mytable WHERE ArrivalDelayGroups BETWEEN 0 AND 5 ORDER BY DestCityMarketID LIMIT 16"}
 {"sql":"SELECT Origin, CancellationCode, OriginStateName FROM mytable WHERE FirstDepTime >= 1018 ORDER BY WeatherDelay LIMIT 9"}
 {"sql":"SELECT OriginCityMarketID FROM mytable ORDER BY CRSElapsedTime LIMIT 5"}
-{"sql":"SELECT DivLongestGTimes, ArrDel15, DivAirportLandings FROM mytable WHERE FirstDepTime BETWEEN 1030 AND 1639 AND OriginCityName = 'Cody, WY' ORDER BY DivArrDelay LIMIT 11","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrDel15, DivAirportLandings FROM mytable WHERE FirstDepTime BETWEEN 1030 AND 1639 AND OriginCityName = 'Cody, WY' ORDER BY DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE \"Month\" <> 1 OR ArrDelayMinutes BETWEEN 46.0 AND 35.0 AND DaysSinceEpoch >= 16094 GROUP BY OriginCityMarketID, SecurityDelay, DestAirportSeqID LIMIT 16","hsqls":["SELECT OriginCityMarketID, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE Month <> 1 OR ArrDelayMinutes BETWEEN 46.0 AND 35.0 AND DaysSinceEpoch >= 16094 GROUP BY OriginCityMarketID, SecurityDelay, DestAirportSeqID LIMIT 16"]}
+{"sql":"SELECT DivLongestGTimes, ArrDel15, DivAirportLandings FROM mytable WHERE FirstDepTime BETWEEN 1030 AND 1639 AND OriginCityName = 'Cody, WY' ORDER BY DivArrDelay LIMIT 11","hsqls":["SELECT DivLongestGTimes, ArrDel15, DivAirportLandings FROM mytable WHERE FirstDepTime BETWEEN 1030 AND 1639 AND OriginCityName = 'Cody, WY' ORDER BY DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE \"Month\" <> 1 OR ArrDelayMinutes BETWEEN 46.0 AND 35.0 AND DaysSinceEpoch >= 16094 GROUP BY OriginCityMarketID, SecurityDelay, DestAirportSeqID LIMIT 16","hsqls":["SELECT OriginCityMarketID, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE `Month` <> 1 OR ArrDelayMinutes BETWEEN 46.0 AND 35.0 AND DaysSinceEpoch >= 16094 GROUP BY OriginCityMarketID, SecurityDelay, DestAirportSeqID LIMIT 16"]}
 {"sql":"SELECT LateAircraftDelay, AirTime FROM mytable WHERE Quarter IN (1) OR CRSElapsedTime NOT IN (132, 124, 231) AND TotalAddGTime BETWEEN 13 AND 20 ORDER BY OriginAirportSeqID LIMIT 17"}
 {"sql":"SELECT LateAircraftDelay, DepTime, ArrTime, MIN(DayOfWeek) FROM mytable GROUP BY LateAircraftDelay, DepTime, ArrTime  ORDER BY LateAircraftDelay, DepTime, ArrTime LIMIT 17","hsqls":["SELECT LateAircraftDelay, DepTime, ArrTime, MIN(DayOfWeek) FROM mytable GROUP BY LateAircraftDelay, DepTime, ArrTime  ORDER BY LateAircraftDelay, DepTime, ArrTime LIMIT 17"]}
-{"sql":"SELECT FlightDate FROM mytable WHERE \"Year\" IN (2014) OR DayOfWeek >= 2 ORDER BY DestState, UniqueCarrier LIMIT 4","hsqls":["SELECT FlightDate FROM mytable WHERE Year IN (2014) OR DayOfWeek >= 2 ORDER BY DestState, UniqueCarrier LIMIT 4"]}
-{"sql":"SELECT AVG(\"Month\"), SUM(DepDelayMinutes) FROM mytable WHERE Quarter < 1 OR ArrTime BETWEEN 1850 AND 841 AND TaxiOut >= 79 LIMIT 21","hsqls":["SELECT AVG(Month), SUM(DepDelayMinutes) FROM mytable WHERE Quarter < 1 OR ArrTime BETWEEN 1850 AND 841 AND TaxiOut >= 79 LIMIT 21"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE \"Year\" IN (2014) OR DayOfWeek >= 2 ORDER BY DestState, UniqueCarrier LIMIT 4","hsqls":["SELECT FlightDate FROM mytable WHERE `Year` IN (2014) OR DayOfWeek >= 2 ORDER BY DestState, UniqueCarrier LIMIT 4"]}
+{"sql":"SELECT AVG(\"Month\"), SUM(DepDelayMinutes) FROM mytable WHERE Quarter < 1 OR ArrTime BETWEEN 1850 AND 841 AND TaxiOut >= 79 LIMIT 21","hsqls":["SELECT AVG(`Month`), SUM(DepDelayMinutes) FROM mytable WHERE Quarter < 1 OR ArrTime BETWEEN 1850 AND 841 AND TaxiOut >= 79 LIMIT 21"]}
 {"sql":"SELECT DestAirportSeqID, DayOfWeek FROM mytable WHERE WheelsOff BETWEEN 743 AND 1542 OR Cancelled > 1 OR TailNum BETWEEN 'N568JB' AND 'N968DL' ORDER BY DestStateFips, DestAirportSeqID LIMIT 10"}
 {"sql":"SELECT OriginCityMarketID, TaxiIn, COUNT(Quarter), MIN(ArrDelayMinutes), SUM(ArrivalDelayGroups) FROM mytable WHERE DestAirportSeqID BETWEEN 1244805 AND 1052904 GROUP BY OriginCityMarketID, TaxiIn  ORDER BY OriginCityMarketID, TaxiIn LIMIT 2","hsqls":["SELECT OriginCityMarketID, TaxiIn, COUNT(Quarter), MIN(ArrDelayMinutes), SUM(ArrivalDelayGroups) FROM mytable WHERE DestAirportSeqID BETWEEN 1244805 AND 1052904 GROUP BY OriginCityMarketID, TaxiIn  ORDER BY OriginCityMarketID, TaxiIn LIMIT 2"]}
-{"sql":"SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable ORDER BY ArrTime, ArrDelay, \"Month\" LIMIT 13","hsqls":["SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable ORDER BY ArrTime, ArrDelay, Month LIMIT 13"]}
+{"sql":"SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable ORDER BY ArrTime, ArrDelay, \"Month\" LIMIT 13","hsqls":["SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable ORDER BY ArrTime, ArrDelay, `Month` LIMIT 13"]}
 {"sql":"SELECT DivReachedDest, DepDel15, MIN(LateAircraftDelay) FROM mytable WHERE LateAircraftDelay < 29 AND TailNum BETWEEN 'N3HEAA' AND 'N3LBAA' GROUP BY DivReachedDest, DepDel15  ORDER BY DivReachedDest, DepDel15 LIMIT 3","hsqls":["SELECT DivReachedDest, DepDel15, MIN(LateAircraftDelay) FROM mytable WHERE LateAircraftDelay < 29 AND TailNum BETWEEN 'N3HEAA' AND 'N3LBAA' GROUP BY DivReachedDest, DepDel15  ORDER BY DivReachedDest, DepDel15 LIMIT 3"]}
 {"sql":"SELECT OriginAirportSeqID, Quarter, DivArrDelay FROM mytable LIMIT 7"}
 {"sql":"SELECT ArrTime, AirTime FROM mytable WHERE DayOfWeek BETWEEN 1 AND 7 AND FirstDepTime IN (1032, 2145, 1940, -9999) LIMIT 23"}
 {"sql":"SELECT CarrierDelay, DayofMonth, UniqueCarrier FROM mytable WHERE Dest BETWEEN 'MSN' AND 'OTH' AND CancellationCode NOT IN ('C', 'noodles') OR DepTimeBlk NOT IN ('1100-1159', '0600-0659', '1900-1959', '0001-0559', '1500-1559') LIMIT 4"}
-{"sql":"SELECT DistanceGroup, Carrier, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivAirports BETWEEN 'BPT' AND 'TUL' OR OriginStateFips BETWEEN 10 AND 36 OR ArrDelay NOT IN (198.0, 16.0, 1.0, 48.0, 151.0) GROUP BY DistanceGroup, Carrier, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT DistanceGroup, Carrier, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'BPT' AND 'TUL' OR DivAirports__MV1 BETWEEN 'BPT' AND 'TUL' OR DivAirports__MV2 BETWEEN 'BPT' AND 'TUL' OR DivAirports__MV3 BETWEEN 'BPT' AND 'TUL' OR DivAirports__MV4 BETWEEN 'BPT' AND 'TUL') OR OriginStateFips BETWEEN 10 AND 36 OR ArrDelay NOT IN (198.0, 16.0, 1.0, 48.0, 151.0) GROUP BY DistanceGroup, Carrier, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, Carrier, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivAirports BETWEEN 'BPT' AND 'TUL' OR OriginStateFips BETWEEN 10 AND 36 OR ArrDelay NOT IN (198.0, 16.0, 1.0, 48.0, 151.0) GROUP BY DistanceGroup, Carrier, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT DistanceGroup, Carrier, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE (DivAirports[1] BETWEEN 'BPT' AND 'TUL' OR DivAirports[2] BETWEEN 'BPT' AND 'TUL' OR DivAirports[3] BETWEEN 'BPT' AND 'TUL' OR DivAirports[4] BETWEEN 'BPT' AND 'TUL' OR DivAirports[5] BETWEEN 'BPT' AND 'TUL') OR OriginStateFips BETWEEN 10 AND 36 OR ArrDelay NOT IN (198.0, 16.0, 1.0, 48.0, 151.0) GROUP BY DistanceGroup, Carrier, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DepDelay, DestCityMarketID FROM mytable LIMIT 3"}
-{"sql":"SELECT DepDelayMinutes, ArrTimeBlk, Dest FROM mytable WHERE DayofMonth NOT IN (3, 7, 8, 12) AND DivReachedDest = -9999 OR DivAirportIDs BETWEEN 11140 AND 14524 LIMIT 26","hsqls":["SELECT DepDelayMinutes, ArrTimeBlk, Dest FROM mytable WHERE DayofMonth NOT IN (3, 7, 8, 12) AND DivReachedDest = -9999 OR (DivAirportIDs__MV0 BETWEEN 11140 AND 14524 OR DivAirportIDs__MV1 BETWEEN 11140 AND 14524 OR DivAirportIDs__MV2 BETWEEN 11140 AND 14524 OR DivAirportIDs__MV3 BETWEEN 11140 AND 14524 OR DivAirportIDs__MV4 BETWEEN 11140 AND 14524) LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DivActualElapsedTime FROM mytable WHERE OriginCityName = 'Manchester, NH' AND ArrDelayMinutes BETWEEN 19.0 AND 43.0 ORDER BY WeatherDelay LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivActualElapsedTime FROM mytable WHERE OriginCityName = 'Manchester, NH' AND ArrDelayMinutes BETWEEN 19.0 AND 43.0 ORDER BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, ArrTimeBlk, Dest FROM mytable WHERE DayofMonth NOT IN (3, 7, 8, 12) AND DivReachedDest = -9999 OR DivAirportIDs BETWEEN 11140 AND 14524 LIMIT 26","hsqls":["SELECT DepDelayMinutes, ArrTimeBlk, Dest FROM mytable WHERE DayofMonth NOT IN (3, 7, 8, 12) AND DivReachedDest = -9999 OR (DivAirportIDs[1] BETWEEN 11140 AND 14524 OR DivAirportIDs[2] BETWEEN 11140 AND 14524 OR DivAirportIDs[3] BETWEEN 11140 AND 14524 OR DivAirportIDs[4] BETWEEN 11140 AND 14524 OR DivAirportIDs[5] BETWEEN 11140 AND 14524) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivActualElapsedTime FROM mytable WHERE OriginCityName = 'Manchester, NH' AND ArrDelayMinutes BETWEEN 19.0 AND 43.0 ORDER BY WeatherDelay LIMIT 10","hsqls":["SELECT DivLongestGTimes, DivActualElapsedTime FROM mytable WHERE OriginCityName = 'Manchester, NH' AND ArrDelayMinutes BETWEEN 19.0 AND 43.0 ORDER BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, SecurityDelay, Cancelled, COUNT(*) FROM mytable GROUP BY DestStateFips, SecurityDelay, Cancelled  ORDER BY DestStateFips, SecurityDelay, Cancelled LIMIT 2","hsqls":["SELECT DestStateFips, SecurityDelay, Cancelled, COUNT(*) FROM mytable GROUP BY DestStateFips, SecurityDelay, Cancelled  ORDER BY DestStateFips, SecurityDelay, Cancelled LIMIT 2"]}
 {"sql":"SELECT WheelsOn FROM mytable WHERE DepartureDelayGroups IN (10, 7, 6, 5, 9) AND DayOfWeek BETWEEN 4 AND 7 AND ArrTime >= 1433 LIMIT 21"}
 {"sql":"SELECT CarrierDelay, DestAirportSeqID, AVG(OriginAirportSeqID), MIN(DestStateFips) FROM mytable GROUP BY CarrierDelay, DestAirportSeqID  ORDER BY CarrierDelay, DestAirportSeqID LIMIT 25","hsqls":["SELECT CarrierDelay, DestAirportSeqID, AVG(OriginAirportSeqID), MIN(DestStateFips) FROM mytable GROUP BY CarrierDelay, DestAirportSeqID  ORDER BY CarrierDelay, DestAirportSeqID LIMIT 25"]}
 {"sql":"SELECT \"Year\", WheelsOn, OriginAirportID FROM mytable WHERE Cancelled < 0 OR ArrDelayMinutes BETWEEN 184.0 AND 75.0 ORDER BY DistanceGroup, ArrDelay, CRSElapsedTime LIMIT 13","hsqls":["SELECT Year, WheelsOn, OriginAirportID FROM mytable WHERE Cancelled < 0 OR ArrDelayMinutes BETWEEN 184.0 AND 75.0 ORDER BY DistanceGroup, ArrDelay, CRSElapsedTime LIMIT 13"]}
 {"sql":"SELECT FirstDepTime, ArrTimeBlk FROM mytable WHERE FlightNum IN (1661, 5872, 1477, 1270, 4617) OR DayofMonth NOT IN (21, 17, 13) ORDER BY DestCityMarketID, WheelsOn LIMIT 9"}
-{"sql":"SELECT DistanceGroup, DayOfWeek FROM mytable WHERE \"Year\" NOT IN (2014) AND CancellationCode BETWEEN 'B' AND 'B' AND OriginAirportID = 10408 LIMIT 25","hsqls":["SELECT DistanceGroup, DayOfWeek FROM mytable WHERE Year NOT IN (2014) AND CancellationCode BETWEEN 'B' AND 'B' AND OriginAirportID = 10408 LIMIT 25"]}
+{"sql":"SELECT DistanceGroup, DayOfWeek FROM mytable WHERE \"Year\" NOT IN (2014) AND CancellationCode BETWEEN 'B' AND 'B' AND OriginAirportID = 10408 LIMIT 25","hsqls":["SELECT DistanceGroup, DayOfWeek FROM mytable WHERE `Year` NOT IN (2014) AND CancellationCode BETWEEN 'B' AND 'B' AND OriginAirportID = 10408 LIMIT 25"]}
 {"sql":"SELECT ArrivalDelayGroups, COUNT(Flights), COUNT(DepTime) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 12","hsqls":["SELECT ArrivalDelayGroups, COUNT(Flights), COUNT(DepTime) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 12"]}
-{"sql":"SELECT ArrTime FROM mytable WHERE \"Year\" IN (2014) OR ArrTime BETWEEN 244 AND 637 AND UniqueCarrier BETWEEN 'VX' AND 'US' ORDER BY Quarter","hsqls":["SELECT ArrTime FROM mytable WHERE Year IN (2014) OR ArrTime BETWEEN 244 AND 637 AND UniqueCarrier BETWEEN 'VX' AND 'US' ORDER BY Quarter"]}
-{"sql":"SELECT AVG(OriginAirportSeqID), MIN(CarrierDelay), SUM(Quarter) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1039705 AND 1315802 LIMIT 24","hsqls":["SELECT AVG(OriginAirportSeqID), MIN(CarrierDelay), SUM(Quarter)  FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs__MV1 BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs__MV2 BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs__MV3 BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs__MV4 BETWEEN 1039705 AND 1315802) LIMIT 10000"]}
-{"sql":"SELECT CarrierDelay, DivTotalGTimes FROM mytable WHERE CRSArrTime BETWEEN 1913 AND 843 ORDER BY TaxiIn, AirTime LIMIT 2","hsqls":["SELECT CarrierDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CRSArrTime BETWEEN 1913 AND 843 ORDER BY TaxiIn, AirTime LIMIT 10000"]}
+{"sql":"SELECT ArrTime FROM mytable WHERE \"Year\" IN (2014) OR ArrTime BETWEEN 244 AND 637 AND UniqueCarrier BETWEEN 'VX' AND 'US' ORDER BY Quarter","hsqls":["SELECT ArrTime FROM mytable WHERE `Year` IN (2014) OR ArrTime BETWEEN 244 AND 637 AND UniqueCarrier BETWEEN 'VX' AND 'US' ORDER BY Quarter"]}
+{"sql":"SELECT AVG(OriginAirportSeqID), MIN(CarrierDelay), SUM(Quarter) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1039705 AND 1315802 LIMIT 24","hsqls":["SELECT AVG(OriginAirportSeqID), MIN(CarrierDelay), SUM(Quarter)  FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs[2] BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs[3] BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs[4] BETWEEN 1039705 AND 1315802 OR DivAirportSeqIDs[5] BETWEEN 1039705 AND 1315802) LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivTotalGTimes FROM mytable WHERE CRSArrTime BETWEEN 1913 AND 843 ORDER BY TaxiIn, AirTime LIMIT 2","hsqls":["SELECT CarrierDelay, DivTotalGTimes FROM mytable WHERE CRSArrTime BETWEEN 1913 AND 843 ORDER BY TaxiIn, AirTime LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DepartureDelayGroups NOT IN (0, 7, -1) LIMIT 15"}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY OriginStateFips LIMIT 28"}
 {"sql":"SELECT DivAirportLandings, DivArrDelay, MAX(DepTime), COUNT(OriginCityName) FROM mytable WHERE DestCityName NOT IN ('Mosinee, WI') GROUP BY DivAirportLandings, DivArrDelay  ORDER BY DivAirportLandings, DivArrDelay LIMIT 20","hsqls":["SELECT DivAirportLandings, DivArrDelay, MAX(DepTime), COUNT(OriginCityName) FROM mytable WHERE DestCityName NOT IN ('Mosinee, WI') GROUP BY DivAirportLandings, DivArrDelay  ORDER BY DivAirportLandings, DivArrDelay LIMIT 20"]}
 {"sql":"SELECT Origin FROM mytable WHERE DivActualElapsedTime NOT IN (151, 497) ORDER BY FlightNum LIMIT 7"}
 {"sql":"SELECT DepartureDelayGroups, ArrTime, NASDelay FROM mytable WHERE Cancelled = 0 ORDER BY TaxiOut LIMIT 10"}
 {"sql":"SELECT TaxiOut, CancellationCode FROM mytable WHERE DivArrDelay BETWEEN 281 AND 84 AND Cancelled BETWEEN 0 AND 0 ORDER BY DepTime LIMIT 6"}
-{"sql":"SELECT LongestAddGTime, ArrDelay FROM mytable WHERE DivWheelsOffs BETWEEN 1253 AND 1910 LIMIT 22","hsqls":["SELECT LongestAddGTime, ArrDelay FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1253 AND 1910 OR DivWheelsOffs__MV1 BETWEEN 1253 AND 1910 OR DivWheelsOffs__MV2 BETWEEN 1253 AND 1910 OR DivWheelsOffs__MV3 BETWEEN 1253 AND 1910 OR DivWheelsOffs__MV4 BETWEEN 1253 AND 1910) LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, ArrDelay FROM mytable WHERE DivWheelsOffs BETWEEN 1253 AND 1910 LIMIT 22","hsqls":["SELECT LongestAddGTime, ArrDelay FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1253 AND 1910 OR DivWheelsOffs[2] BETWEEN 1253 AND 1910 OR DivWheelsOffs[3] BETWEEN 1253 AND 1910 OR DivWheelsOffs[4] BETWEEN 1253 AND 1910 OR DivWheelsOffs[5] BETWEEN 1253 AND 1910) LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, LongestAddGTime, COUNT(*) FROM mytable WHERE ActualElapsedTime >= 40 OR NASDelay <= 281 GROUP BY WheelsOff, LongestAddGTime  ORDER BY WheelsOff, LongestAddGTime LIMIT 16","hsqls":["SELECT WheelsOff, LongestAddGTime, COUNT(*) FROM mytable WHERE ActualElapsedTime >= 40 OR NASDelay <= 281 GROUP BY WheelsOff, LongestAddGTime  ORDER BY WheelsOff, LongestAddGTime LIMIT 16"]}
 {"sql":"SELECT CancellationCode, AVG(ArrDelay), AVG(OriginAirportID) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 0 AND OriginWac IN (45, 82, 72, 54, 61) AND Dest BETWEEN 'ISP' AND 'ROC' GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 26","hsqls":["SELECT CancellationCode, AVG(ArrDelay), AVG(OriginAirportID) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 0 AND OriginWac IN (45, 82, 72, 54, 61) AND Dest BETWEEN 'ISP' AND 'ROC' GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 26"]}
-{"sql":"SELECT DivLongestGTimes, DepDelay, OriginAirportID FROM mytable WHERE ArrivalDelayGroups > 10 OR NASDelay BETWEEN 226 AND 7 LIMIT 23","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DepDelay, OriginAirportID FROM mytable WHERE ArrivalDelayGroups > 10 OR NASDelay BETWEEN 226 AND 7 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DepDelay, OriginAirportID FROM mytable WHERE ArrivalDelayGroups > 10 OR NASDelay BETWEEN 226 AND 7 LIMIT 23","hsqls":["SELECT DivLongestGTimes, DepDelay, OriginAirportID FROM mytable WHERE ArrivalDelayGroups > 10 OR NASDelay BETWEEN 226 AND 7 LIMIT 10000"]}
 {"sql":"SELECT DepDelay, CRSArrTime, TaxiIn FROM mytable WHERE Carrier BETWEEN 'EV' AND 'UA' OR OriginCityName >= 'Gillette, WY' AND Flights IN (1) LIMIT 29"}
-{"sql":"SELECT DayofMonth, CancellationCode, \"Month\", SUM(TaxiOut), SUM(FlightNum) FROM mytable GROUP BY DayofMonth, CancellationCode, \"Month\" LIMIT 19","hsqls":["SELECT DayofMonth, CancellationCode, Month, SUM(TaxiOut), SUM(FlightNum) FROM mytable GROUP BY DayofMonth, CancellationCode, Month LIMIT 19"]}
-{"sql":"SELECT TaxiOut, WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (78, 5, 63, 26, -9999) AND DivWheelsOffs BETWEEN 2105 AND 21 OR DestCityMarketID < 31986 ORDER BY FlightDate, WheelsOn, DivActualElapsedTime LIMIT 17","hsqls":["SELECT TaxiOut, WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (78, 5, 63, 26, -9999) AND (DivWheelsOffs__MV0 BETWEEN 2105 AND 21 OR DivWheelsOffs__MV1 BETWEEN 2105 AND 21 OR DivWheelsOffs__MV2 BETWEEN 2105 AND 21 OR DivWheelsOffs__MV3 BETWEEN 2105 AND 21 OR DivWheelsOffs__MV4 BETWEEN 2105 AND 21) OR DestCityMarketID < 31986 ORDER BY FlightDate, WheelsOn, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, CancellationCode, \"Month\", SUM(TaxiOut), SUM(FlightNum) FROM mytable GROUP BY DayofMonth, CancellationCode, \"Month\" LIMIT 19","hsqls":["SELECT DayofMonth, CancellationCode, Month, SUM(TaxiOut), SUM(FlightNum) FROM mytable GROUP BY DayofMonth, CancellationCode, `Month` LIMIT 19"]}
+{"sql":"SELECT TaxiOut, WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (78, 5, 63, 26, -9999) AND DivWheelsOffs BETWEEN 2105 AND 21 OR DestCityMarketID < 31986 ORDER BY FlightDate, WheelsOn, DivActualElapsedTime LIMIT 17","hsqls":["SELECT TaxiOut, WeatherDelay FROM mytable WHERE LongestAddGTime NOT IN (78, 5, 63, 26, -9999) AND (DivWheelsOffs[1] BETWEEN 2105 AND 21 OR DivWheelsOffs[2] BETWEEN 2105 AND 21 OR DivWheelsOffs[3] BETWEEN 2105 AND 21 OR DivWheelsOffs[4] BETWEEN 2105 AND 21 OR DivWheelsOffs[5] BETWEEN 2105 AND 21) OR DestCityMarketID < 31986 ORDER BY FlightDate, WheelsOn, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DepTimeBlk, OriginAirportID, COUNT(DestAirportSeqID), COUNT(Diverted) FROM mytable WHERE TaxiOut BETWEEN 37 AND 112 AND OriginStateFips <= 19 AND OriginStateName <> 'Oklahoma' GROUP BY WeatherDelay, DepTimeBlk, OriginAirportID  ORDER BY WeatherDelay, DepTimeBlk, OriginAirportID LIMIT 11","hsqls":["SELECT WeatherDelay, DepTimeBlk, OriginAirportID, COUNT(DestAirportSeqID), COUNT(Diverted) FROM mytable WHERE TaxiOut BETWEEN 37 AND 112 AND OriginStateFips <= 19 AND OriginStateName <> 'Oklahoma' GROUP BY WeatherDelay, DepTimeBlk, OriginAirportID  ORDER BY WeatherDelay, DepTimeBlk, OriginAirportID LIMIT 11"]}
 {"sql":"SELECT DestStateName FROM mytable ORDER BY DestCityMarketID LIMIT 14"}
 {"sql":"SELECT AVG(TotalAddGTime), MAX(CRSDepTime), AVG(DepDelayMinutes) FROM mytable LIMIT 19"}
@@ -1208,140 +1208,140 @@
 {"sql":"SELECT ArrDel15 FROM mytable WHERE OriginStateFips BETWEEN 42 AND 19 OR DivReachedDest < 0 OR WheelsOff BETWEEN 1202 AND 1218 ORDER BY DivDistance LIMIT 29"}
 {"sql":"SELECT ArrTimeBlk, MIN(DepTime), SUM(OriginAirportSeqID), MIN(FirstDepTime) FROM mytable WHERE DepDelayMinutes <> 66.0 AND OriginWac > 73 AND OriginAirportID NOT IN (12448, 11150, 14487, 11618, 11637) GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 6","hsqls":["SELECT ArrTimeBlk, MIN(DepTime), SUM(OriginAirportSeqID), MIN(FirstDepTime) FROM mytable WHERE DepDelayMinutes <> 66.0 AND OriginWac > 73 AND OriginAirportID NOT IN (12448, 11150, 14487, 11618, 11637) GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 6"]}
 {"sql":"SELECT LongestAddGTime, OriginStateName, MAX(OriginAirportSeqID), COUNT(NASDelay), AVG(OriginStateFips) FROM mytable GROUP BY LongestAddGTime, OriginStateName  ORDER BY LongestAddGTime, OriginStateName LIMIT 28","hsqls":["SELECT LongestAddGTime, OriginStateName, MAX(OriginAirportSeqID), COUNT(NASDelay), AVG(OriginStateFips) FROM mytable GROUP BY LongestAddGTime, OriginStateName  ORDER BY LongestAddGTime, OriginStateName LIMIT 28"]}
-{"sql":"SELECT OriginCityName, DivAirportSeqIDs FROM mytable WHERE DivWheelsOffs BETWEEN 2030 AND 44 OR ActualElapsedTime BETWEEN 126 AND 188 LIMIT 28","hsqls":["SELECT OriginCityName, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2030 AND 44 OR DivWheelsOffs__MV1 BETWEEN 2030 AND 44 OR DivWheelsOffs__MV2 BETWEEN 2030 AND 44 OR DivWheelsOffs__MV3 BETWEEN 2030 AND 44 OR DivWheelsOffs__MV4 BETWEEN 2030 AND 44) OR ActualElapsedTime BETWEEN 126 AND 188 LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, SUM(Quarter) FROM mytable WHERE DivAirportSeqIDs IN (1163805, 1315802) AND Quarter <= 1 GROUP BY DistanceGroup LIMIT 29","hsqls":["SELECT DistanceGroup, SUM(Quarter) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1163805, 1315802) OR DivAirportSeqIDs__MV1 IN (1163805, 1315802) OR DivAirportSeqIDs__MV2 IN (1163805, 1315802) OR DivAirportSeqIDs__MV3 IN (1163805, 1315802) OR DivAirportSeqIDs__MV4 IN (1163805, 1315802)) AND Quarter <= 1 GROUP BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DivAirportSeqIDs FROM mytable WHERE DivWheelsOffs BETWEEN 2030 AND 44 OR ActualElapsedTime BETWEEN 126 AND 188 LIMIT 28","hsqls":["SELECT OriginCityName, DivAirportSeqIDs FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2030 AND 44 OR DivWheelsOffs[2] BETWEEN 2030 AND 44 OR DivWheelsOffs[3] BETWEEN 2030 AND 44 OR DivWheelsOffs[4] BETWEEN 2030 AND 44 OR DivWheelsOffs[5] BETWEEN 2030 AND 44) OR ActualElapsedTime BETWEEN 126 AND 188 LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, SUM(Quarter) FROM mytable WHERE DivAirportSeqIDs IN (1163805, 1315802) AND Quarter <= 1 GROUP BY DistanceGroup LIMIT 29","hsqls":["SELECT DistanceGroup, SUM(Quarter) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1163805, 1315802) OR DivAirportSeqIDs[2] IN (1163805, 1315802) OR DivAirportSeqIDs[3] IN (1163805, 1315802) OR DivAirportSeqIDs[4] IN (1163805, 1315802) OR DivAirportSeqIDs[5] IN (1163805, 1315802)) AND Quarter <= 1 GROUP BY DistanceGroup LIMIT 10000"]}
 {"sql":"SELECT AirlineID, OriginStateName, MAX(TaxiIn), MAX(DivReachedDest), MIN(WheelsOff) FROM mytable WHERE OriginAirportID IN (14520, 12339, 12016, 13485, 11996) AND DivActualElapsedTime BETWEEN 567 AND 250 GROUP BY AirlineID, OriginStateName  ORDER BY AirlineID, OriginStateName LIMIT 5","hsqls":["SELECT AirlineID, OriginStateName, MAX(TaxiIn), MAX(DivReachedDest), MIN(WheelsOff) FROM mytable WHERE OriginAirportID IN (14520, 12339, 12016, 13485, 11996) AND DivActualElapsedTime BETWEEN 567 AND 250 GROUP BY AirlineID, OriginStateName  ORDER BY AirlineID, OriginStateName LIMIT 5"]}
-{"sql":"SELECT DestState FROM mytable WHERE DivTailNums IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') LIMIT 16","hsqls":["SELECT DestState FROM mytable WHERE (DivTailNums__MV0 IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums__MV1 IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums__MV2 IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums__MV3 IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums__MV4 IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA')) LIMIT 10000"]}
+{"sql":"SELECT DestState FROM mytable WHERE DivTailNums IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') LIMIT 16","hsqls":["SELECT DestState FROM mytable WHERE (DivTailNums[1] IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums[2] IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums[3] IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums[4] IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA') OR DivTailNums[5] IN ('N297WN', 'N839AS', 'N940DN', 'N907DL', 'N4UCAA')) LIMIT 10000"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE CarrierDelay > 45 AND WheelsOn BETWEEN 1123 AND 158 AND OriginCityName BETWEEN 'Columbus, GA' AND 'Boston, MA' ORDER BY OriginCityMarketID LIMIT 7"}
 {"sql":"SELECT FlightDate FROM mytable WHERE DepDelayMinutes < 182.0 ORDER BY DepDelay, DivDistance LIMIT 5"}
 {"sql":"SELECT DestWac, LongestAddGTime, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY DestWac, LongestAddGTime, ArrTimeBlk  ORDER BY DestWac, LongestAddGTime, ArrTimeBlk LIMIT 24","hsqls":["SELECT DestWac, LongestAddGTime, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY DestWac, LongestAddGTime, ArrTimeBlk  ORDER BY DestWac, LongestAddGTime, ArrTimeBlk LIMIT 24"]}
 {"sql":"SELECT DayOfWeek, MIN(OriginAirportSeqID), MAX(DepDelayMinutes), MIN(DistanceGroup) FROM mytable WHERE WeatherDelay < 92 AND DestStateName NOT IN ('Colorado', 'Arkansas', 'New Jersey') AND Dest NOT IN ('PHF', 'BTM', 'SEA', 'BMI') GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 7","hsqls":["SELECT DayOfWeek, MIN(OriginAirportSeqID), MAX(DepDelayMinutes), MIN(DistanceGroup) FROM mytable WHERE WeatherDelay < 92 AND DestStateName NOT IN ('Colorado', 'Arkansas', 'New Jersey') AND Dest NOT IN ('PHF', 'BTM', 'SEA', 'BMI') GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 7"]}
 {"sql":"SELECT AirTime, \"Month\", CRSElapsedTime, SUM(WheelsOff), MAX(TaxiIn), SUM(DayOfWeek) FROM mytable WHERE DivArrDelay BETWEEN 1045 AND 200 OR DayOfWeek IN (3, 2, 1) GROUP BY AirTime, \"Month\", CRSElapsedTime LIMIT 18","hsqls":["SELECT AirTime, Month, CRSElapsedTime, SUM(WheelsOff), MAX(TaxiIn), SUM(DayOfWeek) FROM mytable WHERE DivArrDelay BETWEEN 1045 AND 200 OR DayOfWeek IN (3, 2, 1) GROUP BY AirTime, Month, CRSElapsedTime LIMIT 18"]}
-{"sql":"SELECT Quarter, DivArrDelay, MAX(DepDel15), SUM(DestWac), SUM(DivActualElapsedTime) FROM mytable WHERE DivAirports = 'BNA' AND OriginStateName BETWEEN 'Maryland' AND 'Indiana' OR DivWheelsOffs BETWEEN 914 AND 1940 GROUP BY Quarter, DivArrDelay LIMIT 14","hsqls":["SELECT Quarter, DivArrDelay, MAX(DepDel15), SUM(DestWac), SUM(DivActualElapsedTime) FROM mytable WHERE (DivAirports__MV0 = 'BNA' OR DivAirports__MV1 = 'BNA' OR DivAirports__MV2 = 'BNA' OR DivAirports__MV3 = 'BNA' OR DivAirports__MV4 = 'BNA') AND OriginStateName BETWEEN 'Maryland' AND 'Indiana' OR (DivWheelsOffs__MV0 BETWEEN 914 AND 1940 OR DivWheelsOffs__MV1 BETWEEN 914 AND 1940 OR DivWheelsOffs__MV2 BETWEEN 914 AND 1940 OR DivWheelsOffs__MV3 BETWEEN 914 AND 1940 OR DivWheelsOffs__MV4 BETWEEN 914 AND 1940) GROUP BY Quarter, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT Quarter, DivArrDelay, MAX(DepDel15), SUM(DestWac), SUM(DivActualElapsedTime) FROM mytable WHERE DivAirports = 'BNA' AND OriginStateName BETWEEN 'Maryland' AND 'Indiana' OR DivWheelsOffs BETWEEN 914 AND 1940 GROUP BY Quarter, DivArrDelay LIMIT 14","hsqls":["SELECT Quarter, DivArrDelay, MAX(DepDel15), SUM(DestWac), SUM(DivActualElapsedTime) FROM mytable WHERE (DivAirports[1] = 'BNA' OR DivAirports[2] = 'BNA' OR DivAirports[3] = 'BNA' OR DivAirports[4] = 'BNA' OR DivAirports[5] = 'BNA') AND OriginStateName BETWEEN 'Maryland' AND 'Indiana' OR (DivWheelsOffs[1] BETWEEN 914 AND 1940 OR DivWheelsOffs[2] BETWEEN 914 AND 1940 OR DivWheelsOffs[3] BETWEEN 914 AND 1940 OR DivWheelsOffs[4] BETWEEN 914 AND 1940 OR DivWheelsOffs[5] BETWEEN 914 AND 1940) GROUP BY Quarter, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DestWac, DivActualElapsedTime, MAX(WheelsOff), MIN(NASDelay) FROM mytable WHERE Distance BETWEEN 1565 AND 163 OR FlightNum IN (4186, 6341, 5308, 1952, 2774) GROUP BY DivReachedDest, DestWac, DivActualElapsedTime  ORDER BY DivReachedDest, DestWac, DivActualElapsedTime LIMIT 27","hsqls":["SELECT DivReachedDest, DestWac, DivActualElapsedTime, MAX(WheelsOff), MIN(NASDelay) FROM mytable WHERE Distance BETWEEN 1565 AND 163 OR FlightNum IN (4186, 6341, 5308, 1952, 2774) GROUP BY DivReachedDest, DestWac, DivActualElapsedTime  ORDER BY DivReachedDest, DestWac, DivActualElapsedTime LIMIT 27"]}
-{"sql":"SELECT \"Year\", FirstDepTime, ArrDel15 FROM mytable ORDER BY DestCityName, AirlineID, \"Month\" LIMIT 11","hsqls":["SELECT Year, FirstDepTime, ArrDel15 FROM mytable ORDER BY DestCityName, AirlineID, Month LIMIT 11"]}
+{"sql":"SELECT \"Year\", FirstDepTime, ArrDel15 FROM mytable ORDER BY DestCityName, AirlineID, \"Month\" LIMIT 11","hsqls":["SELECT Year, FirstDepTime, ArrDel15 FROM mytable ORDER BY DestCityName, AirlineID, `Month` LIMIT 11"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DistanceGroup BETWEEN 7 AND 4 ORDER BY CarrierDelay, CRSArrTime LIMIT 9"}
-{"sql":"SELECT MIN(OriginStateFips), AVG(OriginAirportSeqID), SUM(AirTime) FROM mytable WHERE DivWheelsOns IN (2041, 2350, 1553, 1546) LIMIT 10","hsqls":["SELECT MIN(OriginStateFips), AVG(OriginAirportSeqID), SUM(AirTime)  FROM mytable WHERE (DivWheelsOns__MV0 IN (2041, 2350, 1553, 1546) OR DivWheelsOns__MV1 IN (2041, 2350, 1553, 1546) OR DivWheelsOns__MV2 IN (2041, 2350, 1553, 1546) OR DivWheelsOns__MV3 IN (2041, 2350, 1553, 1546) OR DivWheelsOns__MV4 IN (2041, 2350, 1553, 1546)) LIMIT 10000"]}
-{"sql":"SELECT ArrTime, CRSElapsedTime, SUM(DestAirportID) FROM mytable WHERE ArrTimeBlk > '1000-1059' AND DivLongestGTimes IN (107.0) GROUP BY ArrTime, CRSElapsedTime LIMIT 15","hsqls":["SELECT ArrTime, CRSElapsedTime, SUM(DestAirportID) FROM mytable WHERE ArrTimeBlk > '1000-1059' AND (DivLongestGTimes__MV0 IN (107.0) OR DivLongestGTimes__MV1 IN (107.0) OR DivLongestGTimes__MV2 IN (107.0) OR DivLongestGTimes__MV3 IN (107.0) OR DivLongestGTimes__MV4 IN (107.0)) GROUP BY ArrTime, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1169703 AND 1320302 AND Quarter BETWEEN 1 AND 1 LIMIT 29","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs__MV1 BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs__MV2 BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs__MV3 BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs__MV4 BETWEEN 1169703 AND 1320302) AND Quarter BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT MIN(OriginStateFips), AVG(OriginAirportSeqID), SUM(AirTime) FROM mytable WHERE DivWheelsOns IN (2041, 2350, 1553, 1546) LIMIT 10","hsqls":["SELECT MIN(OriginStateFips), AVG(OriginAirportSeqID), SUM(AirTime)  FROM mytable WHERE (DivWheelsOns[1] IN (2041, 2350, 1553, 1546) OR DivWheelsOns[2] IN (2041, 2350, 1553, 1546) OR DivWheelsOns[3] IN (2041, 2350, 1553, 1546) OR DivWheelsOns[4] IN (2041, 2350, 1553, 1546) OR DivWheelsOns[5] IN (2041, 2350, 1553, 1546)) LIMIT 10000"]}
+{"sql":"SELECT ArrTime, CRSElapsedTime, SUM(DestAirportID) FROM mytable WHERE ArrTimeBlk > '1000-1059' AND DivLongestGTimes IN (107.0) GROUP BY ArrTime, CRSElapsedTime LIMIT 15","hsqls":["SELECT ArrTime, CRSElapsedTime, SUM(DestAirportID) FROM mytable WHERE ArrTimeBlk > '1000-1059' AND (DivLongestGTimes[1] IN (107.0) OR DivLongestGTimes[2] IN (107.0) OR DivLongestGTimes[3] IN (107.0) OR DivLongestGTimes[4] IN (107.0) OR DivLongestGTimes[5] IN (107.0)) GROUP BY ArrTime, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1169703 AND 1320302 AND Quarter BETWEEN 1 AND 1 LIMIT 29","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs[2] BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs[3] BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs[4] BETWEEN 1169703 AND 1320302 OR DivAirportSeqIDs[5] BETWEEN 1169703 AND 1320302) AND Quarter BETWEEN 1 AND 1 LIMIT 10000"]}
 {"sql":"SELECT Dest, AirTime, DayOfWeek FROM mytable WHERE OriginStateFips < 18 OR SecurityDelay >= 8 ORDER BY TaxiIn, ArrTimeBlk, DaysSinceEpoch LIMIT 11"}
-{"sql":"SELECT DivWheelsOns, Carrier FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Massachusetts' AND DayOfWeek <> 1 ORDER BY Diverted, Cancelled, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Carrier FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Massachusetts' AND DayOfWeek <> 1 ORDER BY Diverted, Cancelled, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Carrier FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Massachusetts' AND DayOfWeek <> 1 ORDER BY Diverted, Cancelled, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT DivWheelsOns, Carrier FROM mytable WHERE DestStateName BETWEEN 'West Virginia' AND 'Massachusetts' AND DayOfWeek <> 1 ORDER BY Diverted, Cancelled, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE FirstDepTime >= 1942 ORDER BY SecurityDelay, ArrTime, AirTime LIMIT 21"}
-{"sql":"SELECT \"Year\", Distance, \"Month\", MIN(TotalAddGTime), MAX(DivArrDelay), MAX(ArrTime) FROM mytable GROUP BY \"Year\", Distance, \"Month\" LIMIT 15","hsqls":["SELECT Year, Distance, Month, MIN(TotalAddGTime), MAX(DivArrDelay), MAX(ArrTime) FROM mytable GROUP BY Year, Distance, Month LIMIT 15"]}
+{"sql":"SELECT \"Year\", Distance, \"Month\", MIN(TotalAddGTime), MAX(DivArrDelay), MAX(ArrTime) FROM mytable GROUP BY \"Year\", Distance, \"Month\" LIMIT 15","hsqls":["SELECT Year, Distance, Month, MIN(TotalAddGTime), MAX(DivArrDelay), MAX(ArrTime) FROM mytable GROUP BY Year, Distance, `Month` LIMIT 15"]}
 {"sql":"SELECT CarrierDelay, COUNT(Flights), MIN(CRSDepTime), MIN(DayOfWeek) FROM mytable WHERE DepartureDelayGroups NOT IN (2, 1, 0, -1, -9999) OR DestWac >= 23 AND ArrTime <= 2316 GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 3","hsqls":["SELECT CarrierDelay, COUNT(Flights), MIN(CRSDepTime), MIN(DayOfWeek) FROM mytable WHERE DepartureDelayGroups NOT IN (2, 1, 0, -1, -9999) OR DestWac >= 23 AND ArrTime <= 2316 GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 3"]}
 {"sql":"SELECT MIN(DestStateFips), MIN(DayOfWeek) FROM mytable LIMIT 21"}
 {"sql":"SELECT MIN(WeatherDelay), MIN(AirlineID) FROM mytable WHERE DestState BETWEEN 'HI' AND 'LA' AND Cancelled >= 0 LIMIT 5"}
-{"sql":"SELECT DivWheelsOns, Carrier, Origin FROM mytable WHERE DestStateFips BETWEEN 78 AND 39 OR DivWheelsOns BETWEEN 1326 AND 1535 ORDER BY ArrivalDelayGroups","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Carrier, Origin FROM mytable WHERE DestStateFips BETWEEN 78 AND 39 OR (DivWheelsOns__MV0 BETWEEN 1326 AND 1535 OR DivWheelsOns__MV1 BETWEEN 1326 AND 1535 OR DivWheelsOns__MV2 BETWEEN 1326 AND 1535 OR DivWheelsOns__MV3 BETWEEN 1326 AND 1535 OR DivWheelsOns__MV4 BETWEEN 1326 AND 1535) ORDER BY ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepDelayMinutes IN (186.0, 144.0, 109.0, 125.0, 88.0) GROUP BY TotalAddGTime LIMIT 26","hsqls":["SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DepDelayMinutes IN (186.0, 144.0, 109.0, 125.0, 88.0) GROUP BY TotalAddGTime LIMIT 26"]}
+{"sql":"SELECT DivWheelsOns, Carrier, Origin FROM mytable WHERE DestStateFips BETWEEN 78 AND 39 OR DivWheelsOns BETWEEN 1326 AND 1535 ORDER BY ArrivalDelayGroups","hsqls":["SELECT DivWheelsOns, Carrier, Origin FROM mytable WHERE DestStateFips BETWEEN 78 AND 39 OR (DivWheelsOns[1] BETWEEN 1326 AND 1535 OR DivWheelsOns[2] BETWEEN 1326 AND 1535 OR DivWheelsOns[3] BETWEEN 1326 AND 1535 OR DivWheelsOns[4] BETWEEN 1326 AND 1535 OR DivWheelsOns[5] BETWEEN 1326 AND 1535) ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepDelayMinutes IN (186.0, 144.0, 109.0, 125.0, 88.0) GROUP BY TotalAddGTime LIMIT 26","hsqls":["SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DepDelayMinutes IN (186.0, 144.0, 109.0, 125.0, 88.0) GROUP BY TotalAddGTime LIMIT 26"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE AirlineID IN (20437, 19805, 20409, 20355) ORDER BY DepDel15 LIMIT 27"}
 {"sql":"SELECT TaxiOut, FlightDate, OriginCityName, COUNT(*) FROM mytable GROUP BY TaxiOut, FlightDate, OriginCityName  ORDER BY TaxiOut, FlightDate, OriginCityName LIMIT 23","hsqls":["SELECT TaxiOut, FlightDate, OriginCityName, COUNT(*) FROM mytable GROUP BY TaxiOut, FlightDate, OriginCityName  ORDER BY TaxiOut, FlightDate, OriginCityName LIMIT 23"]}
 {"sql":"SELECT CarrierDelay, DestCityName, CancellationCode FROM mytable WHERE Flights NOT IN (1) AND TaxiIn BETWEEN 6 AND 44 ORDER BY DestWac, OriginCityMarketID, TotalAddGTime LIMIT 25"}
-{"sql":"SELECT FlightNum, ArrDelayMinutes, ActualElapsedTime, COUNT(*) FROM mytable WHERE Carrier NOT IN ('OO', 'MQ') AND DivLongestGTimes IN (107.0, 79.0, 95.0, 90.0) OR ArrTimeBlk BETWEEN '1600-1659' AND '2000-2059' GROUP BY FlightNum, ArrDelayMinutes, ActualElapsedTime LIMIT 7","hsqls":["SELECT FlightNum, ArrDelayMinutes, ActualElapsedTime, COUNT(*) FROM mytable WHERE Carrier NOT IN ('OO', 'MQ') AND (DivLongestGTimes__MV0 IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes__MV1 IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes__MV2 IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes__MV3 IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes__MV4 IN (107.0, 79.0, 95.0, 90.0)) OR ArrTimeBlk BETWEEN '1600-1659' AND '2000-2059' GROUP BY FlightNum, ArrDelayMinutes, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FlightNum, ArrDelayMinutes, ActualElapsedTime, COUNT(*) FROM mytable WHERE Carrier NOT IN ('OO', 'MQ') AND DivLongestGTimes IN (107.0, 79.0, 95.0, 90.0) OR ArrTimeBlk BETWEEN '1600-1659' AND '2000-2059' GROUP BY FlightNum, ArrDelayMinutes, ActualElapsedTime LIMIT 7","hsqls":["SELECT FlightNum, ArrDelayMinutes, ActualElapsedTime, COUNT(*) FROM mytable WHERE Carrier NOT IN ('OO', 'MQ') AND (DivLongestGTimes[1] IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes[2] IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes[3] IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes[4] IN (107.0, 79.0, 95.0, 90.0) OR DivLongestGTimes[5] IN (107.0, 79.0, 95.0, 90.0)) OR ArrTimeBlk BETWEEN '1600-1659' AND '2000-2059' GROUP BY FlightNum, ArrDelayMinutes, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime, COUNT(DivActualElapsedTime) FROM mytable WHERE TaxiIn = 75 AND AirlineID BETWEEN 19930 AND 20437 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 17","hsqls":["SELECT CRSDepTime, COUNT(DivActualElapsedTime) FROM mytable WHERE TaxiIn = 75 AND AirlineID BETWEEN 19930 AND 20437 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 17"]}
-{"sql":"SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable WHERE DivLongestGTimes BETWEEN 6.0 AND 96.0 AND TaxiOut BETWEEN 33 AND 32 ORDER BY OriginAirportSeqID, OriginCityMarketID LIMIT 27","hsqls":["SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 6.0 AND 96.0 OR DivLongestGTimes__MV1 BETWEEN 6.0 AND 96.0 OR DivLongestGTimes__MV2 BETWEEN 6.0 AND 96.0 OR DivLongestGTimes__MV3 BETWEEN 6.0 AND 96.0 OR DivLongestGTimes__MV4 BETWEEN 6.0 AND 96.0) AND TaxiOut BETWEEN 33 AND 32 ORDER BY OriginAirportSeqID, OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable WHERE DivLongestGTimes BETWEEN 6.0 AND 96.0 AND TaxiOut BETWEEN 33 AND 32 ORDER BY OriginAirportSeqID, OriginCityMarketID LIMIT 27","hsqls":["SELECT DestAirportSeqID, DaysSinceEpoch FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 6.0 AND 96.0 OR DivLongestGTimes[2] BETWEEN 6.0 AND 96.0 OR DivLongestGTimes[3] BETWEEN 6.0 AND 96.0 OR DivLongestGTimes[4] BETWEEN 6.0 AND 96.0 OR DivLongestGTimes[5] BETWEEN 6.0 AND 96.0) AND TaxiOut BETWEEN 33 AND 32 ORDER BY OriginAirportSeqID, OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, CarrierDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE NASDelay BETWEEN 146 AND 202 GROUP BY CRSArrTime, CarrierDelay, DaysSinceEpoch  ORDER BY CRSArrTime, CarrierDelay, DaysSinceEpoch LIMIT 19","hsqls":["SELECT CRSArrTime, CarrierDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE NASDelay BETWEEN 146 AND 202 GROUP BY CRSArrTime, CarrierDelay, DaysSinceEpoch  ORDER BY CRSArrTime, CarrierDelay, DaysSinceEpoch LIMIT 19"]}
 {"sql":"SELECT OriginAirportSeqID, AirTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 18 AND 18 AND ArrivalDelayGroups NOT IN (3, 10, -2, 7, 6) AND ArrDelayMinutes IN (246.0, 49.0, 119.0, 455.0, 8.0) GROUP BY OriginAirportSeqID, AirTime, DaysSinceEpoch  ORDER BY OriginAirportSeqID, AirTime, DaysSinceEpoch LIMIT 27","hsqls":["SELECT OriginAirportSeqID, AirTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 18 AND 18 AND ArrivalDelayGroups NOT IN (3, 10, -2, 7, 6) AND ArrDelayMinutes IN (246.0, 49.0, 119.0, 455.0, 8.0) GROUP BY OriginAirportSeqID, AirTime, DaysSinceEpoch  ORDER BY OriginAirportSeqID, AirTime, DaysSinceEpoch LIMIT 27"]}
 {"sql":"SELECT OriginState, DestCityMarketID, OriginStateName, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 101 AND 36 AND Diverted BETWEEN 0 AND 1 GROUP BY OriginState, DestCityMarketID, OriginStateName  ORDER BY OriginState, DestCityMarketID, OriginStateName LIMIT 15","hsqls":["SELECT OriginState, DestCityMarketID, OriginStateName, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 101 AND 36 AND Diverted BETWEEN 0 AND 1 GROUP BY OriginState, DestCityMarketID, OriginStateName  ORDER BY OriginState, DestCityMarketID, OriginStateName LIMIT 15"]}
 {"sql":"SELECT DivAirportLandings, OriginWac, WheelsOn, COUNT(CRSDepTime) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 10, 1, 5) AND ActualElapsedTime BETWEEN 72 AND 285 AND OriginCityMarketID NOT IN (31721) GROUP BY DivAirportLandings, OriginWac, WheelsOn  ORDER BY DivAirportLandings, OriginWac, WheelsOn LIMIT 15","hsqls":["SELECT DivAirportLandings, OriginWac, WheelsOn, COUNT(CRSDepTime) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 10, 1, 5) AND ActualElapsedTime BETWEEN 72 AND 285 AND OriginCityMarketID NOT IN (31721) GROUP BY DivAirportLandings, OriginWac, WheelsOn  ORDER BY DivAirportLandings, OriginWac, WheelsOn LIMIT 15"]}
-{"sql":"SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes FROM mytable WHERE OriginStateFips >= 2 LIMIT 16","hsqls":["SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginStateFips >= 2 LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, OriginCityName FROM mytable WHERE DivAirportSeqIDs IN (1410702, 1468902, 1052103, 1086803) AND DestState BETWEEN 'CA' AND 'AL' ORDER BY DayofMonth LIMIT 28","hsqls":["SELECT DestStateFips, OriginCityName FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs__MV1 IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs__MV2 IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs__MV3 IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs__MV4 IN (1410702, 1468902, 1052103, 1086803)) AND DestState BETWEEN 'CA' AND 'AL' ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes FROM mytable WHERE OriginStateFips >= 2 LIMIT 16","hsqls":["SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes FROM mytable WHERE OriginStateFips >= 2 LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, OriginCityName FROM mytable WHERE DivAirportSeqIDs IN (1410702, 1468902, 1052103, 1086803) AND DestState BETWEEN 'CA' AND 'AL' ORDER BY DayofMonth LIMIT 28","hsqls":["SELECT DestStateFips, OriginCityName FROM mytable WHERE (DivAirportSeqIDs[1] IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs[2] IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs[3] IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs[4] IN (1410702, 1468902, 1052103, 1086803) OR DivAirportSeqIDs[5] IN (1410702, 1468902, 1052103, 1086803)) AND DestState BETWEEN 'CA' AND 'AL' ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT Diverted, ArrDel15 FROM mytable WHERE DepDelayMinutes <= 260.0 ORDER BY DepartureDelayGroups, FirstDepTime, DepDel15 LIMIT 14"}
 {"sql":"SELECT NASDelay, DepDel15, WheelsOn FROM mytable ORDER BY OriginStateFips, OriginCityName, ArrDel15 LIMIT 23"}
-{"sql":"SELECT AVG(DepDel15), COUNT(Cancelled) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivAirports IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') LIMIT 29","hsqls":["SELECT AVG(DepDel15), COUNT(Cancelled)  FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND (DivAirports__MV0 IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports__MV1 IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports__MV2 IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports__MV3 IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports__MV4 IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF')) LIMIT 10000"]}
+{"sql":"SELECT AVG(DepDel15), COUNT(Cancelled) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivAirports IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') LIMIT 29","hsqls":["SELECT AVG(DepDel15), COUNT(Cancelled)  FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND (DivAirports[1] IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports[2] IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports[3] IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports[4] IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF') OR DivAirports[5] IN ('GNV', 'MRY', 'PUB', 'PIA', 'MAF')) LIMIT 10000"]}
 {"sql":"SELECT Cancelled, MAX(FirstDepTime), SUM(ArrTime) FROM mytable WHERE TaxiIn NOT IN (3, 116, 18) AND OriginStateFips >= 17 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 23","hsqls":["SELECT Cancelled, MAX(FirstDepTime), SUM(ArrTime) FROM mytable WHERE TaxiIn NOT IN (3, 116, 18) AND OriginStateFips >= 17 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 23"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DivReachedDest >= -9999 AND CancellationCode IN ('A', 'B', 'C', 'noodles') OR DestState BETWEEN 'MO' AND 'TX' ORDER BY FlightDate, OriginStateName LIMIT 8"}
 {"sql":"SELECT MIN(OriginAirportSeqID), AVG(OriginAirportSeqID) FROM mytable WHERE DestCityName BETWEEN 'Worcester, MA' AND 'Minneapolis, MN' LIMIT 13"}
-{"sql":"SELECT DestState, DepTime, TailNum, MIN(DepDelayMinutes), MIN(DestAirportID), AVG(OriginAirportID) FROM mytable WHERE DivAirportSeqIDs < 1110902 OR DestAirportID IN (13422, 10918) GROUP BY DestState, DepTime, TailNum LIMIT 26","hsqls":["SELECT DestState, DepTime, TailNum, MIN(DepDelayMinutes), MIN(DestAirportID), AVG(OriginAirportID) FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1110902 OR DivAirportSeqIDs__MV1 < 1110902 OR DivAirportSeqIDs__MV2 < 1110902 OR DivAirportSeqIDs__MV3 < 1110902 OR DivAirportSeqIDs__MV4 < 1110902) OR DestAirportID IN (13422, 10918) GROUP BY DestState, DepTime, TailNum LIMIT 10000"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivActualElapsedTime BETWEEN 214 AND 461 OR DivDistance BETWEEN 1262 AND 449 AND CRSArrTime BETWEEN 2102 AND 2221 ORDER BY DepTime, DestCityName, AirlineID LIMIT 16","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DivActualElapsedTime BETWEEN 214 AND 461 OR DivDistance BETWEEN 1262 AND 449 AND CRSArrTime BETWEEN 2102 AND 2221 ORDER BY DepTime, DestCityName, AirlineID LIMIT 10000"]}
-{"sql":"SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DestStateFips <> 1 OR FlightDate BETWEEN '2014-01-17' AND '2014-01-15' OR \"Year\" >= 2014 GROUP BY ArrivalDelayGroups","hsqls":["SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DestStateFips <> 1 OR FlightDate BETWEEN '2014-01-17' AND '2014-01-15' OR Year >= 2014 GROUP BY ArrivalDelayGroups"]}
+{"sql":"SELECT DestState, DepTime, TailNum, MIN(DepDelayMinutes), MIN(DestAirportID), AVG(OriginAirportID) FROM mytable WHERE DivAirportSeqIDs < 1110902 OR DestAirportID IN (13422, 10918) GROUP BY DestState, DepTime, TailNum LIMIT 26","hsqls":["SELECT DestState, DepTime, TailNum, MIN(DepDelayMinutes), MIN(DestAirportID), AVG(OriginAirportID) FROM mytable WHERE (DivAirportSeqIDs[1] < 1110902 OR DivAirportSeqIDs[2] < 1110902 OR DivAirportSeqIDs[3] < 1110902 OR DivAirportSeqIDs[4] < 1110902 OR DivAirportSeqIDs[5] < 1110902) OR DestAirportID IN (13422, 10918) GROUP BY DestState, DepTime, TailNum LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivActualElapsedTime BETWEEN 214 AND 461 OR DivDistance BETWEEN 1262 AND 449 AND CRSArrTime BETWEEN 2102 AND 2221 ORDER BY DepTime, DestCityName, AirlineID LIMIT 16","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE DivActualElapsedTime BETWEEN 214 AND 461 OR DivDistance BETWEEN 1262 AND 449 AND CRSArrTime BETWEEN 2102 AND 2221 ORDER BY DepTime, DestCityName, AirlineID LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DestStateFips <> 1 OR FlightDate BETWEEN '2014-01-17' AND '2014-01-15' OR \"Year\" >= 2014 GROUP BY ArrivalDelayGroups","hsqls":["SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DestStateFips <> 1 OR FlightDate BETWEEN '2014-01-17' AND '2014-01-15' OR `Year` >= 2014 GROUP BY ArrivalDelayGroups"]}
 {"sql":"SELECT DestState, DepTime FROM mytable WHERE Origin BETWEEN 'SCC' AND 'OGG' AND OriginAirportID <> 15016 ORDER BY LateAircraftDelay LIMIT 23"}
-{"sql":"SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE DivTotalGTimes < 52 OR Diverted <= 0 GROUP BY DivActualElapsedTime LIMIT 17","hsqls":["SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 < 52 OR DivTotalGTimes__MV1 < 52 OR DivTotalGTimes__MV2 < 52 OR DivTotalGTimes__MV3 < 52 OR DivTotalGTimes__MV4 < 52) OR Diverted <= 0 GROUP BY DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, \"Month\" FROM mytable WHERE DepDelay BETWEEN 379.0 AND 10.0 OR DepTimeBlk IN ('0800-0859') ORDER BY ActualElapsedTime, DivAirportLandings LIMIT 18","hsqls":["SELECT TaxiIn, Month FROM mytable WHERE DepDelay BETWEEN 379.0 AND 10.0 OR DepTimeBlk IN ('0800-0859') ORDER BY ActualElapsedTime, DivAirportLandings LIMIT 18"]}
+{"sql":"SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE DivTotalGTimes < 52 OR Diverted <= 0 GROUP BY DivActualElapsedTime LIMIT 17","hsqls":["SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] < 52 OR DivTotalGTimes[2] < 52 OR DivTotalGTimes[3] < 52 OR DivTotalGTimes[4] < 52 OR DivTotalGTimes[5] < 52) OR Diverted <= 0 GROUP BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, \"Month\" FROM mytable WHERE DepDelay BETWEEN 379.0 AND 10.0 OR DepTimeBlk IN ('0800-0859') ORDER BY ActualElapsedTime, DivAirportLandings LIMIT 18","hsqls":["SELECT TaxiIn, `Month` FROM mytable WHERE DepDelay BETWEEN 379.0 AND 10.0 OR DepTimeBlk IN ('0800-0859') ORDER BY ActualElapsedTime, DivAirportLandings LIMIT 18"]}
 {"sql":"SELECT WheelsOff, COUNT(OriginAirportSeqID), AVG(LongestAddGTime), MIN(CRSElapsedTime) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 12","hsqls":["SELECT WheelsOff, COUNT(OriginAirportSeqID), AVG(LongestAddGTime), MIN(CRSElapsedTime) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 12"]}
 {"sql":"SELECT OriginCityName, DepTimeBlk, ArrDelay FROM mytable WHERE DayofMonth <= 1 ORDER BY Diverted, Cancelled, AirTime LIMIT 20"}
-{"sql":"SELECT CarrierDelay, DivWheelsOffs FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 AND DepDelayMinutes NOT IN (114.0, 89.0, 91.0, 75.0) LIMIT 4","hsqls":["SELECT CarrierDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 AND DepDelayMinutes NOT IN (114.0, 89.0, 91.0, 75.0) LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivWheelsOffs FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 AND DepDelayMinutes NOT IN (114.0, 89.0, 91.0, 75.0) LIMIT 4","hsqls":["SELECT CarrierDelay, DivWheelsOffs FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 AND DepDelayMinutes NOT IN (114.0, 89.0, 91.0, 75.0) LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, TailNum, MIN(Cancelled), AVG(DestWac) FROM mytable WHERE TaxiIn <= 67 GROUP BY TotalAddGTime, TailNum  ORDER BY TotalAddGTime, TailNum LIMIT 29","hsqls":["SELECT TotalAddGTime, TailNum, MIN(Cancelled), AVG(DestWac) FROM mytable WHERE TaxiIn <= 67 GROUP BY TotalAddGTime, TailNum  ORDER BY TotalAddGTime, TailNum LIMIT 29"]}
 {"sql":"SELECT MAX(AirlineID), SUM(Diverted) FROM mytable WHERE OriginCityName <> 'St. George, UT' OR WheelsOn BETWEEN 1920 AND 1837 LIMIT 14"}
 {"sql":"SELECT DestStateFips, DestCityName, DestAirportID, MIN(AirlineID) FROM mytable GROUP BY DestStateFips, DestCityName, DestAirportID  ORDER BY DestStateFips, DestCityName, DestAirportID LIMIT 25","hsqls":["SELECT DestStateFips, DestCityName, DestAirportID, MIN(AirlineID) FROM mytable GROUP BY DestStateFips, DestCityName, DestAirportID  ORDER BY DestStateFips, DestCityName, DestAirportID LIMIT 25"]}
-{"sql":"SELECT TailNum, \"Month\", MAX(Quarter) FROM mytable WHERE DivAirports >= 'RFD' AND DivAirportSeqIDs IN (1199603) GROUP BY TailNum, \"Month\" LIMIT 5","hsqls":["SELECT TailNum, Month, MAX(Quarter) FROM mytable WHERE (DivAirports__MV0 >= 'RFD' OR DivAirports__MV1 >= 'RFD' OR DivAirports__MV2 >= 'RFD' OR DivAirports__MV3 >= 'RFD' OR DivAirports__MV4 >= 'RFD') AND (DivAirportSeqIDs__MV0 IN (1199603) OR DivAirportSeqIDs__MV1 IN (1199603) OR DivAirportSeqIDs__MV2 IN (1199603) OR DivAirportSeqIDs__MV3 IN (1199603) OR DivAirportSeqIDs__MV4 IN (1199603)) GROUP BY TailNum, Month LIMIT 10000"]}
+{"sql":"SELECT TailNum, \"Month\", MAX(Quarter) FROM mytable WHERE DivAirports >= 'RFD' AND DivAirportSeqIDs IN (1199603) GROUP BY TailNum, \"Month\" LIMIT 5","hsqls":["SELECT TailNum, Month, MAX(Quarter) FROM mytable WHERE (DivAirports[1] >= 'RFD' OR DivAirports[2] >= 'RFD' OR DivAirports[3] >= 'RFD' OR DivAirports[4] >= 'RFD' OR DivAirports[5] >= 'RFD') AND (DivAirportSeqIDs[1] IN (1199603) OR DivAirportSeqIDs[2] IN (1199603) OR DivAirportSeqIDs[3] IN (1199603) OR DivAirportSeqIDs[4] IN (1199603) OR DivAirportSeqIDs[5] IN (1199603)) GROUP BY TailNum, `Month` LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, CRSDepTime, DivActualElapsedTime FROM mytable ORDER BY DestStateName, DepDel15 LIMIT 9"}
 {"sql":"SELECT COUNT(WheelsOn) FROM mytable WHERE WheelsOff = 1526 OR DestAirportSeqID BETWEEN 1330303 AND 1104202 OR CancellationCode > 'A' LIMIT 12"}
-{"sql":"SELECT Carrier, ActualElapsedTime, ArrDelay FROM mytable WHERE DivAirports = 'ABQ' OR LateAircraftDelay IN (98) OR WheelsOn BETWEEN 1024 AND 1257 ORDER BY DestWac, DivAirportLandings LIMIT 3","hsqls":["SELECT Carrier, ActualElapsedTime, ArrDelay FROM mytable WHERE (DivAirports__MV0 = 'ABQ' OR DivAirports__MV1 = 'ABQ' OR DivAirports__MV2 = 'ABQ' OR DivAirports__MV3 = 'ABQ' OR DivAirports__MV4 = 'ABQ') OR LateAircraftDelay IN (98) OR WheelsOn BETWEEN 1024 AND 1257 ORDER BY DestWac, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT OriginStateName FROM mytable WHERE DivAirportIDs IN (10980) LIMIT 7","hsqls":["SELECT OriginStateName FROM mytable WHERE (DivAirportIDs__MV0 IN (10980) OR DivAirportIDs__MV1 IN (10980) OR DivAirportIDs__MV2 IN (10980) OR DivAirportIDs__MV3 IN (10980) OR DivAirportIDs__MV4 IN (10980)) LIMIT 10000"]}
+{"sql":"SELECT Carrier, ActualElapsedTime, ArrDelay FROM mytable WHERE DivAirports = 'ABQ' OR LateAircraftDelay IN (98) OR WheelsOn BETWEEN 1024 AND 1257 ORDER BY DestWac, DivAirportLandings LIMIT 3","hsqls":["SELECT Carrier, ActualElapsedTime, ArrDelay FROM mytable WHERE (DivAirports[1] = 'ABQ' OR DivAirports[2] = 'ABQ' OR DivAirports[3] = 'ABQ' OR DivAirports[4] = 'ABQ' OR DivAirports[5] = 'ABQ') OR LateAircraftDelay IN (98) OR WheelsOn BETWEEN 1024 AND 1257 ORDER BY DestWac, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT OriginStateName FROM mytable WHERE DivAirportIDs IN (10980) LIMIT 7","hsqls":["SELECT OriginStateName FROM mytable WHERE (DivAirportIDs[1] IN (10980) OR DivAirportIDs[2] IN (10980) OR DivAirportIDs[3] IN (10980) OR DivAirportIDs[4] IN (10980) OR DivAirportIDs[5] IN (10980)) LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, CarrierDelay, OriginAirportID FROM mytable WHERE Diverted <> 1 AND WheelsOff BETWEEN 2026 AND 1651 ORDER BY DestState LIMIT 22"}
-{"sql":"SELECT OriginAirportSeqID, DestCityMarketID, MAX(CRSArrTime), SUM(Diverted) FROM mytable WHERE \"Year\" < 2014 OR CancellationCode BETWEEN 'A' AND 'noodles' AND LateAircraftDelay BETWEEN 147 AND 26 GROUP BY OriginAirportSeqID, DestCityMarketID LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DestCityMarketID, MAX(CRSArrTime), SUM(Diverted) FROM mytable WHERE Year < 2014 OR CancellationCode BETWEEN 'A' AND 'noodles' AND LateAircraftDelay BETWEEN 147 AND 26 GROUP BY OriginAirportSeqID, DestCityMarketID LIMIT 8"]}
+{"sql":"SELECT OriginAirportSeqID, DestCityMarketID, MAX(CRSArrTime), SUM(Diverted) FROM mytable WHERE \"Year\" < 2014 OR CancellationCode BETWEEN 'A' AND 'noodles' AND LateAircraftDelay BETWEEN 147 AND 26 GROUP BY OriginAirportSeqID, DestCityMarketID LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DestCityMarketID, MAX(CRSArrTime), SUM(Diverted) FROM mytable WHERE `Year` < 2014 OR CancellationCode BETWEEN 'A' AND 'noodles' AND LateAircraftDelay BETWEEN 147 AND 26 GROUP BY OriginAirportSeqID, DestCityMarketID LIMIT 8"]}
 {"sql":"SELECT COUNT(DistanceGroup), SUM(OriginWac) FROM mytable LIMIT 12"}
 {"sql":"SELECT AVG(Diverted) FROM mytable LIMIT 28"}
 {"sql":"SELECT TaxiOut, DivActualElapsedTime, COUNT(*) FROM mytable WHERE ArrTime >= 1534 GROUP BY TaxiOut, DivActualElapsedTime  ORDER BY TaxiOut, DivActualElapsedTime LIMIT 29","hsqls":["SELECT TaxiOut, DivActualElapsedTime, COUNT(*) FROM mytable WHERE ArrTime >= 1534 GROUP BY TaxiOut, DivActualElapsedTime  ORDER BY TaxiOut, DivActualElapsedTime LIMIT 29"]}
 {"sql":"SELECT Dest, NASDelay, CRSElapsedTime FROM mytable WHERE DivDistance <= 17 LIMIT 26"}
 {"sql":"SELECT DepTime, ArrivalDelayGroups, MAX(FirstDepTime), MIN(CRSDepTime) FROM mytable GROUP BY DepTime, ArrivalDelayGroups","hsqls":["SELECT DepTime, ArrivalDelayGroups, MAX(FirstDepTime), MIN(CRSDepTime) FROM mytable GROUP BY DepTime, ArrivalDelayGroups"]}
 {"sql":"SELECT DestWac, DepTime, CancellationCode, MAX(DestCityMarketID), MAX(OriginAirportID), MAX(ActualElapsedTime) FROM mytable GROUP BY DestWac, DepTime, CancellationCode  ORDER BY DestWac, DepTime, CancellationCode LIMIT 18","hsqls":["SELECT DestWac, DepTime, CancellationCode, MAX(DestCityMarketID), MAX(OriginAirportID), MAX(ActualElapsedTime) FROM mytable GROUP BY DestWac, DepTime, CancellationCode  ORDER BY DestWac, DepTime, CancellationCode LIMIT 18"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE TaxiOut IN (29) OR DepDelay IN (306.0) OR DivTotalGTimes BETWEEN 135 AND 139 ORDER BY CarrierDelay, DivAirportLandings, OriginAirportID LIMIT 11","hsqls":["SELECT DestCityName FROM mytable WHERE TaxiOut IN (29) OR DepDelay IN (306.0) OR (DivTotalGTimes__MV0 BETWEEN 135 AND 139 OR DivTotalGTimes__MV1 BETWEEN 135 AND 139 OR DivTotalGTimes__MV2 BETWEEN 135 AND 139 OR DivTotalGTimes__MV3 BETWEEN 135 AND 139 OR DivTotalGTimes__MV4 BETWEEN 135 AND 139) ORDER BY CarrierDelay, DivAirportLandings, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT Quarter, FlightDate, DepTime FROM mytable WHERE DivWheelsOns > 1502 AND NASDelay BETWEEN 55 AND 224 AND OriginStateFips <> 26 ORDER BY DestAirportID LIMIT 6","hsqls":["SELECT Quarter, FlightDate, DepTime FROM mytable WHERE (DivWheelsOns__MV0 > 1502 OR DivWheelsOns__MV1 > 1502 OR DivWheelsOns__MV2 > 1502 OR DivWheelsOns__MV3 > 1502 OR DivWheelsOns__MV4 > 1502) AND NASDelay BETWEEN 55 AND 224 AND OriginStateFips <> 26 ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE TaxiOut IN (29) OR DepDelay IN (306.0) OR DivTotalGTimes BETWEEN 135 AND 139 ORDER BY CarrierDelay, DivAirportLandings, OriginAirportID LIMIT 11","hsqls":["SELECT DestCityName FROM mytable WHERE TaxiOut IN (29) OR DepDelay IN (306.0) OR (DivTotalGTimes[1] BETWEEN 135 AND 139 OR DivTotalGTimes[2] BETWEEN 135 AND 139 OR DivTotalGTimes[3] BETWEEN 135 AND 139 OR DivTotalGTimes[4] BETWEEN 135 AND 139 OR DivTotalGTimes[5] BETWEEN 135 AND 139) ORDER BY CarrierDelay, DivAirportLandings, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT Quarter, FlightDate, DepTime FROM mytable WHERE DivWheelsOns > 1502 AND NASDelay BETWEEN 55 AND 224 AND OriginStateFips <> 26 ORDER BY DestAirportID LIMIT 6","hsqls":["SELECT Quarter, FlightDate, DepTime FROM mytable WHERE (DivWheelsOns[1] > 1502 OR DivWheelsOns[2] > 1502 OR DivWheelsOns[3] > 1502 OR DivWheelsOns[4] > 1502 OR DivWheelsOns[5] > 1502) AND NASDelay BETWEEN 55 AND 224 AND OriginStateFips <> 26 ORDER BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DestState, AirTime, AirlineID, MAX(WheelsOff), COUNT(DivActualElapsedTime), AVG(ArrivalDelayGroups) FROM mytable WHERE TaxiOut <> 35 AND DestStateFips IN (30, 42, 37) AND Carrier BETWEEN 'AA' AND 'VX' GROUP BY DestState, AirTime, AirlineID  ORDER BY DestState, AirTime, AirlineID LIMIT 8","hsqls":["SELECT DestState, AirTime, AirlineID, MAX(WheelsOff), COUNT(DivActualElapsedTime), AVG(ArrivalDelayGroups) FROM mytable WHERE TaxiOut <> 35 AND DestStateFips IN (30, 42, 37) AND Carrier BETWEEN 'AA' AND 'VX' GROUP BY DestState, AirTime, AirlineID  ORDER BY DestState, AirTime, AirlineID LIMIT 8"]}
 {"sql":"SELECT Distance, TailNum, COUNT(DepTimeBlk), MIN(WheelsOff), SUM(DestStateFips) FROM mytable WHERE Diverted BETWEEN 0 AND 0 AND DayOfWeek BETWEEN 3 AND 3 GROUP BY Distance, TailNum  ORDER BY Distance, TailNum LIMIT 19","hsqls":["SELECT Distance, TailNum, COUNT(DepTimeBlk), MIN(WheelsOff), SUM(DestStateFips) FROM mytable WHERE Diverted BETWEEN 0 AND 0 AND DayOfWeek BETWEEN 3 AND 3 GROUP BY Distance, TailNum  ORDER BY Distance, TailNum LIMIT 19"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DivLongestGTimes BETWEEN 47.0 AND 95.0 OR OriginCityMarketID <> 34524 LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR (DivLongestGTimes__MV0 BETWEEN 47.0 AND 95.0 OR DivLongestGTimes__MV1 BETWEEN 47.0 AND 95.0 OR DivLongestGTimes__MV2 BETWEEN 47.0 AND 95.0 OR DivLongestGTimes__MV3 BETWEEN 47.0 AND 95.0 OR DivLongestGTimes__MV4 BETWEEN 47.0 AND 95.0) OR OriginCityMarketID <> 34524 LIMIT 10000"]}
-{"sql":"SELECT AVG(OriginStateFips) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DivActualElapsedTime BETWEEN 454 AND 645 OR DestWac BETWEEN 39 AND 66 LIMIT 3","hsqls":["SELECT AVG(OriginStateFips) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND DivActualElapsedTime BETWEEN 454 AND 645 OR DestWac BETWEEN 39 AND 66 LIMIT 3"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DivLongestGTimes BETWEEN 47.0 AND 95.0 OR OriginCityMarketID <> 34524 LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR (DivLongestGTimes[1] BETWEEN 47.0 AND 95.0 OR DivLongestGTimes[2] BETWEEN 47.0 AND 95.0 OR DivLongestGTimes[3] BETWEEN 47.0 AND 95.0 OR DivLongestGTimes[4] BETWEEN 47.0 AND 95.0 OR DivLongestGTimes[5] BETWEEN 47.0 AND 95.0) OR OriginCityMarketID <> 34524 LIMIT 10000"]}
+{"sql":"SELECT AVG(OriginStateFips) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DivActualElapsedTime BETWEEN 454 AND 645 OR DestWac BETWEEN 39 AND 66 LIMIT 3","hsqls":["SELECT AVG(OriginStateFips) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND DivActualElapsedTime BETWEEN 454 AND 645 OR DestWac BETWEEN 39 AND 66 LIMIT 3"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (155.0, 332.0, 43.0, 84.0, 209.0) OR DestStateName BETWEEN 'Delaware' AND 'South Dakota' OR ArrTimeBlk NOT IN ('2000-2059', '1100-1159', '0800-0859', '1900-1959', '1500-1559') LIMIT 8"}
 {"sql":"SELECT CRSElapsedTime FROM mytable ORDER BY DestCityMarketID, DivAirportLandings LIMIT 4"}
 {"sql":"SELECT DestState, ArrTime, COUNT(CancellationCode), AVG(DivAirportLandings) FROM mytable WHERE DestAirportID >= 13424 OR DestAirportSeqID BETWEEN 1062702 AND 1463502 AND CRSArrTime <> 2157 GROUP BY DestState, ArrTime  ORDER BY DestState, ArrTime LIMIT 2","hsqls":["SELECT DestState, ArrTime, COUNT(CancellationCode), AVG(DivAirportLandings) FROM mytable WHERE DestAirportID >= 13424 OR DestAirportSeqID BETWEEN 1062702 AND 1463502 AND CRSArrTime <> 2157 GROUP BY DestState, ArrTime  ORDER BY DestState, ArrTime LIMIT 2"]}
 {"sql":"SELECT SecurityDelay, DepTime, DestAirportID, COUNT(DestState) FROM mytable WHERE Quarter <> 1 AND WheelsOn BETWEEN 1440 AND 1050 AND DayofMonth < 10 GROUP BY SecurityDelay, DepTime, DestAirportID  ORDER BY SecurityDelay, DepTime, DestAirportID LIMIT 23","hsqls":["SELECT SecurityDelay, DepTime, DestAirportID, COUNT(DestState) FROM mytable WHERE Quarter <> 1 AND WheelsOn BETWEEN 1440 AND 1050 AND DayofMonth < 10 GROUP BY SecurityDelay, DepTime, DestAirportID  ORDER BY SecurityDelay, DepTime, DestAirportID LIMIT 23"]}
-{"sql":"SELECT TaxiIn, DivTailNums, DivWheelsOffs FROM mytable LIMIT 20","hsqls":["SELECT TaxiIn, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DivTailNums, DivWheelsOffs FROM mytable LIMIT 20","hsqls":["SELECT TaxiIn, DivTailNums, DivWheelsOffs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT Quarter, AVG(NASDelay) FROM mytable GROUP BY Quarter  ORDER BY Quarter LIMIT 3","hsqls":["SELECT Quarter, AVG(NASDelay) FROM mytable GROUP BY Quarter  ORDER BY Quarter LIMIT 3"]}
 {"sql":"SELECT AirTime FROM mytable ORDER BY DestCityName LIMIT 2"}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE Carrier BETWEEN 'WN' AND 'DL' LIMIT 20"}
 {"sql":"SELECT ActualElapsedTime, DestCityMarketID FROM mytable WHERE Distance > 911 AND DepDelay BETWEEN 247.0 AND 48.0 AND TaxiIn BETWEEN 49 AND 12 ORDER BY OriginAirportSeqID, OriginCityMarketID, Cancelled LIMIT 13"}
 {"sql":"SELECT DestAirportSeqID, TaxiIn FROM mytable WHERE FlightDate < '2014-01-22' OR DestAirportSeqID NOT IN (1025702, 1348602, 1289203, 1027903, 1071302) LIMIT 19"}
-{"sql":"SELECT DistanceGroup, MAX(\"Year\"), MIN(DestAirportID), MAX(OriginStateFips) FROM mytable WHERE Origin < 'FAR' GROUP BY DistanceGroup LIMIT 7","hsqls":["SELECT DistanceGroup, MAX(Year), MIN(DestAirportID), MAX(OriginStateFips) FROM mytable WHERE Origin < 'FAR' GROUP BY DistanceGroup LIMIT 7"]}
+{"sql":"SELECT DistanceGroup, MAX(\"Year\"), MIN(DestAirportID), MAX(OriginStateFips) FROM mytable WHERE Origin < 'FAR' GROUP BY DistanceGroup LIMIT 7","hsqls":["SELECT DistanceGroup, MAX(`Year`), MIN(DestAirportID), MAX(OriginStateFips) FROM mytable WHERE Origin < 'FAR' GROUP BY DistanceGroup LIMIT 7"]}
 {"sql":"SELECT MIN(FirstDepTime) FROM mytable WHERE AirlineID >= 21171 AND CarrierDelay BETWEEN 37 AND 20 LIMIT 18"}
 {"sql":"SELECT DestState, Carrier FROM mytable LIMIT 21"}
-{"sql":"SELECT DivAirports FROM mytable LIMIT 23","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable LIMIT 23","hsqls":["SELECT DivAirports FROM mytable LIMIT 10000"]}
 {"sql":"SELECT SUM(Quarter) FROM mytable WHERE DaysSinceEpoch BETWEEN 16094 AND 16093 OR OriginStateFips >= 41 LIMIT 8"}
-{"sql":"SELECT DivWheelsOns, DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE TaxiOut >= 60 ORDER BY Origin LIMIT 15","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestAirportSeqID FROM mytable WHERE TaxiOut >= 60 ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE TaxiOut >= 60 ORDER BY Origin LIMIT 15","hsqls":["SELECT DivWheelsOns, DivAirportSeqIDs, DestAirportSeqID FROM mytable WHERE TaxiOut >= 60 ORDER BY Origin LIMIT 10000"]}
 {"sql":"SELECT Flights, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 215 AND 271 AND Flights IN (1) AND LateAircraftDelay BETWEEN 26 AND 9 GROUP BY Flights  ORDER BY Flights LIMIT 11","hsqls":["SELECT Flights, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 215 AND 271 AND Flights IN (1) AND LateAircraftDelay BETWEEN 26 AND 9 GROUP BY Flights  ORDER BY Flights LIMIT 11"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Origin BETWEEN 'SLC' AND 'PBI' AND DestAirportSeqID BETWEEN 1111102 AND 1295302 AND CRSDepTime BETWEEN 2000 AND 1103","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Origin BETWEEN 'SLC' AND 'PBI' AND DestAirportSeqID BETWEEN 1111102 AND 1295302 AND CRSDepTime BETWEEN 2000 AND 1103 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Origin BETWEEN 'SLC' AND 'PBI' AND DestAirportSeqID BETWEEN 1111102 AND 1295302 AND CRSDepTime BETWEEN 2000 AND 1103","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE Origin BETWEEN 'SLC' AND 'PBI' AND DestAirportSeqID BETWEEN 1111102 AND 1295302 AND CRSDepTime BETWEEN 2000 AND 1103 LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, OriginCityName, CancellationCode, SUM(DaysSinceEpoch) FROM mytable GROUP BY TaxiOut, OriginCityName, CancellationCode  ORDER BY TaxiOut, OriginCityName, CancellationCode LIMIT 18","hsqls":["SELECT TaxiOut, OriginCityName, CancellationCode, SUM(DaysSinceEpoch) FROM mytable GROUP BY TaxiOut, OriginCityName, CancellationCode  ORDER BY TaxiOut, OriginCityName, CancellationCode LIMIT 18"]}
 {"sql":"SELECT OriginStateFips, DivDistance, SecurityDelay FROM mytable WHERE Quarter IN (1) OR DestAirportSeqID > 1473003 AND FirstDepTime BETWEEN 710 AND 617 ORDER BY FirstDepTime, DepDel15, WheelsOn LIMIT 20"}
 {"sql":"SELECT WheelsOff, DistanceGroup, Carrier, MAX(DepTime), MIN(CRSArrTime) FROM mytable WHERE DestCityMarketID <> 30255 OR DivActualElapsedTime > 846 AND DivDistance = 405 GROUP BY WheelsOff, DistanceGroup, Carrier  ORDER BY WheelsOff, DistanceGroup, Carrier LIMIT 16","hsqls":["SELECT WheelsOff, DistanceGroup, Carrier, MAX(DepTime), MIN(CRSArrTime) FROM mytable WHERE DestCityMarketID <> 30255 OR DivActualElapsedTime > 846 AND DivDistance = 405 GROUP BY WheelsOff, DistanceGroup, Carrier  ORDER BY WheelsOff, DistanceGroup, Carrier LIMIT 16"]}
 {"sql":"SELECT DepTime FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR OriginCityMarketID = 32945 ORDER BY DestState, Flights, WeatherDelay LIMIT 12"}
-{"sql":"SELECT DivWheelsOns, OriginWac FROM mytable WHERE OriginStateName BETWEEN 'Pennsylvania' AND 'U.S. Virgin Islands' OR LateAircraftDelay BETWEEN 112 AND 183 OR ArrDel15 NOT IN (0, -9999) ORDER BY DivDistance LIMIT 12","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginWac FROM mytable WHERE OriginStateName BETWEEN 'Pennsylvania' AND 'U.S. Virgin Islands' OR LateAircraftDelay BETWEEN 112 AND 183 OR ArrDel15 NOT IN (0, -9999) ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, OriginWac FROM mytable WHERE OriginStateName BETWEEN 'Pennsylvania' AND 'U.S. Virgin Islands' OR LateAircraftDelay BETWEEN 112 AND 183 OR ArrDel15 NOT IN (0, -9999) ORDER BY DivDistance LIMIT 12","hsqls":["SELECT DivWheelsOns, OriginWac FROM mytable WHERE OriginStateName BETWEEN 'Pennsylvania' AND 'U.S. Virgin Islands' OR LateAircraftDelay BETWEEN 112 AND 183 OR ArrDel15 NOT IN (0, -9999) ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable LIMIT 15"}
 {"sql":"SELECT ArrDel15, AirTime, AVG(DepDelay), MIN(DestAirportSeqID) FROM mytable WHERE CRSDepTime BETWEEN 1041 AND 1616 AND LongestAddGTime NOT IN (20) GROUP BY ArrDel15, AirTime  ORDER BY ArrDel15, AirTime LIMIT 4","hsqls":["SELECT ArrDel15, AirTime, AVG(DepDelay), MIN(DestAirportSeqID) FROM mytable WHERE CRSDepTime BETWEEN 1041 AND 1616 AND LongestAddGTime NOT IN (20) GROUP BY ArrDel15, AirTime  ORDER BY ArrDel15, AirTime LIMIT 4"]}
 {"sql":"SELECT DestWac, COUNT(*) FROM mytable WHERE DepDelayMinutes NOT IN (191.0, 107.0, 83.0, 304.0, 536.0) AND OriginAirportID BETWEEN 11150 AND 11471 GROUP BY DestWac  ORDER BY DestWac LIMIT 17","hsqls":["SELECT DestWac, COUNT(*) FROM mytable WHERE DepDelayMinutes NOT IN (191.0, 107.0, 83.0, 304.0, 536.0) AND OriginAirportID BETWEEN 11150 AND 11471 GROUP BY DestWac  ORDER BY DestWac LIMIT 17"]}
 {"sql":"SELECT ArrivalDelayGroups, OriginStateName FROM mytable WHERE DepDelay NOT IN (-1.0, 224.0, 310.0, 536.0) AND DivArrDelay BETWEEN 47 AND 192 LIMIT 22"}
-{"sql":"SELECT DestStateFips, DaysSinceEpoch, COUNT(DivDistance) FROM mytable WHERE OriginCityName BETWEEN 'Bemidji, MN' AND 'Newport News/Williamsburg, VA' OR DivAirportIDs IN (10874) GROUP BY DestStateFips, DaysSinceEpoch LIMIT 3","hsqls":["SELECT DestStateFips, DaysSinceEpoch, COUNT(DivDistance) FROM mytable WHERE OriginCityName BETWEEN 'Bemidji, MN' AND 'Newport News/Williamsburg, VA' OR (DivAirportIDs__MV0 IN (10874) OR DivAirportIDs__MV1 IN (10874) OR DivAirportIDs__MV2 IN (10874) OR DivAirportIDs__MV3 IN (10874) OR DivAirportIDs__MV4 IN (10874)) GROUP BY DestStateFips, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DaysSinceEpoch, COUNT(DivDistance) FROM mytable WHERE OriginCityName BETWEEN 'Bemidji, MN' AND 'Newport News/Williamsburg, VA' OR DivAirportIDs IN (10874) GROUP BY DestStateFips, DaysSinceEpoch LIMIT 3","hsqls":["SELECT DestStateFips, DaysSinceEpoch, COUNT(DivDistance) FROM mytable WHERE OriginCityName BETWEEN 'Bemidji, MN' AND 'Newport News/Williamsburg, VA' OR (DivAirportIDs[1] IN (10874) OR DivAirportIDs[2] IN (10874) OR DivAirportIDs[3] IN (10874) OR DivAirportIDs[4] IN (10874) OR DivAirportIDs[5] IN (10874)) GROUP BY DestStateFips, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT TailNum, UniqueCarrier, OriginAirportID FROM mytable ORDER BY DivArrDelay LIMIT 8"}
 {"sql":"SELECT WheelsOff, DepTimeBlk, CRSElapsedTime FROM mytable WHERE DestStateName <= 'New Mexico' OR TotalAddGTime BETWEEN 25 AND 15 ORDER BY TaxiOut LIMIT 25"}
-{"sql":"SELECT SUM(WheelsOff), AVG(Diverted), SUM(Distance) FROM mytable WHERE DivTotalGTimes >= 53 LIMIT 18","hsqls":["SELECT SUM(WheelsOff), AVG(Diverted), SUM(Distance)  FROM mytable WHERE (DivTotalGTimes__MV0 >= 53 OR DivTotalGTimes__MV1 >= 53 OR DivTotalGTimes__MV2 >= 53 OR DivTotalGTimes__MV3 >= 53 OR DivTotalGTimes__MV4 >= 53) LIMIT 10000"]}
+{"sql":"SELECT SUM(WheelsOff), AVG(Diverted), SUM(Distance) FROM mytable WHERE DivTotalGTimes >= 53 LIMIT 18","hsqls":["SELECT SUM(WheelsOff), AVG(Diverted), SUM(Distance)  FROM mytable WHERE (DivTotalGTimes[1] >= 53 OR DivTotalGTimes[2] >= 53 OR DivTotalGTimes[3] >= 53 OR DivTotalGTimes[4] >= 53 OR DivTotalGTimes[5] >= 53) LIMIT 10000"]}
 {"sql":"SELECT WheelsOn FROM mytable ORDER BY Carrier LIMIT 29"}
 {"sql":"SELECT AirlineID, OriginStateName FROM mytable ORDER BY DepartureDelayGroups, DivDistance, WeatherDelay LIMIT 9"}
-{"sql":"SELECT ArrDel15, SUM(DepDel15), MAX(WheelsOn), SUM(DepTime) FROM mytable WHERE DivAirportIDs IN (10785) GROUP BY ArrDel15 LIMIT 27","hsqls":["SELECT ArrDel15, SUM(DepDel15), MAX(WheelsOn), SUM(DepTime) FROM mytable WHERE (DivAirportIDs__MV0 IN (10785) OR DivAirportIDs__MV1 IN (10785) OR DivAirportIDs__MV2 IN (10785) OR DivAirportIDs__MV3 IN (10785) OR DivAirportIDs__MV4 IN (10785)) GROUP BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, SUM(DepDel15), MAX(WheelsOn), SUM(DepTime) FROM mytable WHERE DivAirportIDs IN (10785) GROUP BY ArrDel15 LIMIT 27","hsqls":["SELECT ArrDel15, SUM(DepDel15), MAX(WheelsOn), SUM(DepTime) FROM mytable WHERE (DivAirportIDs[1] IN (10785) OR DivAirportIDs[2] IN (10785) OR DivAirportIDs[3] IN (10785) OR DivAirportIDs[4] IN (10785) OR DivAirportIDs[5] IN (10785)) GROUP BY ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, TotalAddGTime, MIN(Diverted), AVG(OriginStateFips) FROM mytable GROUP BY TaxiOut, TotalAddGTime  ORDER BY TaxiOut, TotalAddGTime LIMIT 26","hsqls":["SELECT TaxiOut, TotalAddGTime, MIN(Diverted), AVG(OriginStateFips) FROM mytable GROUP BY TaxiOut, TotalAddGTime  ORDER BY TaxiOut, TotalAddGTime LIMIT 26"]}
-{"sql":"SELECT ActualElapsedTime FROM mytable WHERE LongestAddGTime BETWEEN 51 AND 97 AND DivAirportSeqIDs BETWEEN 1324402 AND 1161802 OR WeatherDelay <= -9999 LIMIT 8","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE LongestAddGTime BETWEEN 51 AND 97 AND (DivAirportSeqIDs__MV0 BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs__MV1 BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs__MV2 BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs__MV3 BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs__MV4 BETWEEN 1324402 AND 1161802) OR WeatherDelay <= -9999 LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime FROM mytable WHERE LongestAddGTime BETWEEN 51 AND 97 AND DivAirportSeqIDs BETWEEN 1324402 AND 1161802 OR WeatherDelay <= -9999 LIMIT 8","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE LongestAddGTime BETWEEN 51 AND 97 AND (DivAirportSeqIDs[1] BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs[2] BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs[3] BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs[4] BETWEEN 1324402 AND 1161802 OR DivAirportSeqIDs[5] BETWEEN 1324402 AND 1161802) OR WeatherDelay <= -9999 LIMIT 10000"]}
 {"sql":"SELECT DepTime, DaysSinceEpoch, MAX(OriginWac), MAX(DivAirportLandings) FROM mytable WHERE OriginStateFips <> 55 GROUP BY DepTime, DaysSinceEpoch  ORDER BY DepTime, DaysSinceEpoch LIMIT 28","hsqls":["SELECT DepTime, DaysSinceEpoch, MAX(OriginWac), MAX(DivAirportLandings) FROM mytable WHERE OriginStateFips <> 55 GROUP BY DepTime, DaysSinceEpoch  ORDER BY DepTime, DaysSinceEpoch LIMIT 28"]}
 {"sql":"SELECT WeatherDelay, UniqueCarrier, DivArrDelay FROM mytable WHERE SecurityDelay BETWEEN 1 AND 18 ORDER BY OriginStateFips, Cancelled, DaysSinceEpoch LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1600-1659') LIMIT 13"}
 {"sql":"SELECT TaxiOut, Dest, DivArrDelay, SUM(LateAircraftDelay), COUNT(CancellationCode), AVG(WheelsOn) FROM mytable GROUP BY TaxiOut, Dest, DivArrDelay  ORDER BY TaxiOut, Dest, DivArrDelay LIMIT 14","hsqls":["SELECT TaxiOut, Dest, DivArrDelay, SUM(LateAircraftDelay), COUNT(CancellationCode), AVG(WheelsOn) FROM mytable GROUP BY TaxiOut, Dest, DivArrDelay  ORDER BY TaxiOut, Dest, DivArrDelay LIMIT 14"]}
 {"sql":"SELECT COUNT(Origin), MIN(ArrDel15), MIN(ArrivalDelayGroups) FROM mytable LIMIT 10"}
-{"sql":"SELECT AVG(DepDelay), COUNT(WheelsOff), SUM(DivDistance) FROM mytable WHERE DivLongestGTimes IN (53.0, 6.0, 65.0, 21.0, 8.0) AND OriginStateFips >= 30 AND OriginWac = 87 LIMIT 19","hsqls":["SELECT AVG(DepDelay), COUNT(WheelsOff), SUM(DivDistance)  FROM mytable WHERE (DivLongestGTimes__MV0 IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes__MV1 IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes__MV2 IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes__MV3 IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes__MV4 IN (53.0, 6.0, 65.0, 21.0, 8.0)) AND OriginStateFips >= 30 AND OriginWac = 87 LIMIT 10000"]}
+{"sql":"SELECT AVG(DepDelay), COUNT(WheelsOff), SUM(DivDistance) FROM mytable WHERE DivLongestGTimes IN (53.0, 6.0, 65.0, 21.0, 8.0) AND OriginStateFips >= 30 AND OriginWac = 87 LIMIT 19","hsqls":["SELECT AVG(DepDelay), COUNT(WheelsOff), SUM(DivDistance)  FROM mytable WHERE (DivLongestGTimes[1] IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes[2] IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes[3] IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes[4] IN (53.0, 6.0, 65.0, 21.0, 8.0) OR DivLongestGTimes[5] IN (53.0, 6.0, 65.0, 21.0, 8.0)) AND OriginStateFips >= 30 AND OriginWac = 87 LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable WHERE LateAircraftDelay > 33 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 18","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable WHERE LateAircraftDelay > 33 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 18"]}
 {"sql":"SELECT ArrTimeBlk, UniqueCarrier, DayOfWeek, COUNT(Dest) FROM mytable WHERE OriginAirportSeqID IN (1251102, 1330303, 1306104) OR Origin BETWEEN 'PIT' AND 'ADQ' AND CRSDepTime IN (534, 2005, 1037, 926, 1257) GROUP BY ArrTimeBlk, UniqueCarrier, DayOfWeek  ORDER BY ArrTimeBlk, UniqueCarrier, DayOfWeek LIMIT 8","hsqls":["SELECT ArrTimeBlk, UniqueCarrier, DayOfWeek, COUNT(Dest) FROM mytable WHERE OriginAirportSeqID IN (1251102, 1330303, 1306104) OR Origin BETWEEN 'PIT' AND 'ADQ' AND CRSDepTime IN (534, 2005, 1037, 926, 1257) GROUP BY ArrTimeBlk, UniqueCarrier, DayOfWeek  ORDER BY ArrTimeBlk, UniqueCarrier, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT FlightNum, DestAirportID FROM mytable WHERE ArrTime IN (454, 1835) OR DayofMonth BETWEEN 30 AND 16 OR FirstDepTime BETWEEN 1039 AND 908 LIMIT 22"}
-{"sql":"SELECT DivWheelsOns, DivLongestGTimes, Quarter FROM mytable WHERE TaxiOut NOT IN (44, 42, 35, 8, 60) OR DestAirportID BETWEEN 12892 AND 14960 LIMIT 20","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Quarter FROM mytable WHERE TaxiOut NOT IN (44, 42, 35, 8, 60) OR DestAirportID BETWEEN 12892 AND 14960 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivLongestGTimes, Quarter FROM mytable WHERE TaxiOut NOT IN (44, 42, 35, 8, 60) OR DestAirportID BETWEEN 12892 AND 14960 LIMIT 20","hsqls":["SELECT DivWheelsOns, DivLongestGTimes, Quarter FROM mytable WHERE TaxiOut NOT IN (44, 42, 35, 8, 60) OR DestAirportID BETWEEN 12892 AND 14960 LIMIT 10000"]}
 {"sql":"SELECT NASDelay, ArrivalDelayGroups, SUM(DivDistance) FROM mytable WHERE TaxiIn IN (45, 41, 15, 102) GROUP BY NASDelay, ArrivalDelayGroups  ORDER BY NASDelay, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT NASDelay, ArrivalDelayGroups, SUM(DivDistance) FROM mytable WHERE TaxiIn IN (45, 41, 15, 102) GROUP BY NASDelay, ArrivalDelayGroups  ORDER BY NASDelay, ArrivalDelayGroups LIMIT 29"]}
 {"sql":"SELECT DepTimeBlk, DayofMonth, DaysSinceEpoch FROM mytable WHERE SecurityDelay NOT IN (0, 4, 18, -9999) OR DivReachedDest >= 1 AND ArrDelayMinutes IN (203.0, 34.0, 223.0, 169.0, 47.0) ORDER BY OriginState, LongestAddGTime, DaysSinceEpoch LIMIT 18"}
 {"sql":"SELECT FlightDate, Origin FROM mytable WHERE DestAirportSeqID IN (1323202) OR OriginCityName BETWEEN 'Klamath Falls, OR' AND 'Lake Charles, LA' ORDER BY CRSDepTime LIMIT 20"}
 {"sql":"SELECT SecurityDelay, COUNT(DivDistance) FROM mytable WHERE DepDelay <= 247.0 AND OriginCityName BETWEEN 'Gulfport/Biloxi, MS' AND 'Butte, MT' OR DivActualElapsedTime BETWEEN 313 AND 145 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 25","hsqls":["SELECT SecurityDelay, COUNT(DivDistance) FROM mytable WHERE DepDelay <= 247.0 AND OriginCityName BETWEEN 'Gulfport/Biloxi, MS' AND 'Butte, MT' OR DivActualElapsedTime BETWEEN 313 AND 145 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 25"]}
-{"sql":"SELECT DivAirports, FirstDepTime, LongestAddGTime FROM mytable WHERE AirTime < 247 AND Cancelled BETWEEN 1 AND 1 ORDER BY FlightDate, DayofMonth LIMIT 18","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, FirstDepTime, LongestAddGTime FROM mytable WHERE AirTime < 247 AND Cancelled BETWEEN 1 AND 1 ORDER BY FlightDate, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirports, FirstDepTime, LongestAddGTime FROM mytable WHERE AirTime < 247 AND Cancelled BETWEEN 1 AND 1 ORDER BY FlightDate, DayofMonth LIMIT 18","hsqls":["SELECT DivAirports, FirstDepTime, LongestAddGTime FROM mytable WHERE AirTime < 247 AND Cancelled BETWEEN 1 AND 1 ORDER BY FlightDate, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DestCityName, AirlineID, MIN(DestWac), MIN(ActualElapsedTime) FROM mytable WHERE Distance BETWEEN 2465 AND 712 AND OriginAirportSeqID BETWEEN 1410803 AND 1478302 GROUP BY CarrierDelay, DestCityName, AirlineID  ORDER BY CarrierDelay, DestCityName, AirlineID LIMIT 9","hsqls":["SELECT CarrierDelay, DestCityName, AirlineID, MIN(DestWac), MIN(ActualElapsedTime) FROM mytable WHERE Distance BETWEEN 2465 AND 712 AND OriginAirportSeqID BETWEEN 1410803 AND 1478302 GROUP BY CarrierDelay, DestCityName, AirlineID  ORDER BY CarrierDelay, DestCityName, AirlineID LIMIT 9"]}
 {"sql":"SELECT SUM(Diverted), SUM(DepartureDelayGroups) FROM mytable WHERE DepDelayMinutes BETWEEN 143.0 AND 13.0 LIMIT 24"}
-{"sql":"SELECT DivLongestGTimes, DestCityName FROM mytable ORDER BY WheelsOff, WeatherDelay LIMIT 5","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestCityName FROM mytable ORDER BY WheelsOff, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestCityName FROM mytable ORDER BY WheelsOff, WeatherDelay LIMIT 5","hsqls":["SELECT DivLongestGTimes, DestCityName FROM mytable ORDER BY WheelsOff, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT \"Year\", OriginCityMarketID, DivAirportLandings FROM mytable ORDER BY UniqueCarrier LIMIT 14","hsqls":["SELECT Year, OriginCityMarketID, DivAirportLandings FROM mytable ORDER BY UniqueCarrier LIMIT 14"]}
-{"sql":"SELECT DestState, DivAirports, WheelsOn FROM mytable WHERE DivWheelsOns >= 1217 OR UniqueCarrier >= 'EV' ORDER BY CarrierDelay, AirTime LIMIT 18","hsqls":["SELECT DestState, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, WheelsOn FROM mytable WHERE (DivWheelsOns__MV0 >= 1217 OR DivWheelsOns__MV1 >= 1217 OR DivWheelsOns__MV2 >= 1217 OR DivWheelsOns__MV3 >= 1217 OR DivWheelsOns__MV4 >= 1217) OR UniqueCarrier >= 'EV' ORDER BY CarrierDelay, AirTime LIMIT 10000"]}
+{"sql":"SELECT DestState, DivAirports, WheelsOn FROM mytable WHERE DivWheelsOns >= 1217 OR UniqueCarrier >= 'EV' ORDER BY CarrierDelay, AirTime LIMIT 18","hsqls":["SELECT DestState, DivAirports, WheelsOn FROM mytable WHERE (DivWheelsOns[1] >= 1217 OR DivWheelsOns[2] >= 1217 OR DivWheelsOns[3] >= 1217 OR DivWheelsOns[4] >= 1217 OR DivWheelsOns[5] >= 1217) OR UniqueCarrier >= 'EV' ORDER BY CarrierDelay, AirTime LIMIT 10000"]}
 {"sql":"SELECT Dest, AirlineID, COUNT(OriginCityMarketID) FROM mytable GROUP BY Dest, AirlineID  ORDER BY Dest, AirlineID LIMIT 6","hsqls":["SELECT Dest, AirlineID, COUNT(OriginCityMarketID) FROM mytable GROUP BY Dest, AirlineID  ORDER BY Dest, AirlineID LIMIT 6"]}
 {"sql":"SELECT DivDistance, Distance, OriginWac FROM mytable WHERE Dest IN ('FCA', 'HOU') LIMIT 25"}
-{"sql":"SELECT Carrier, DestStateFips, COUNT(DepDel15), SUM(DepDel15), MAX(DivReachedDest) FROM mytable WHERE UniqueCarrier NOT IN ('WN', 'B6') OR \"Year\" NOT IN (2014) AND CarrierDelay BETWEEN 328 AND 132 GROUP BY Carrier, DestStateFips LIMIT 21","hsqls":["SELECT Carrier, DestStateFips, COUNT(DepDel15), SUM(DepDel15), MAX(DivReachedDest) FROM mytable WHERE UniqueCarrier NOT IN ('WN', 'B6') OR Year NOT IN (2014) AND CarrierDelay BETWEEN 328 AND 132 GROUP BY Carrier, DestStateFips LIMIT 21"]}
+{"sql":"SELECT Carrier, DestStateFips, COUNT(DepDel15), SUM(DepDel15), MAX(DivReachedDest) FROM mytable WHERE UniqueCarrier NOT IN ('WN', 'B6') OR \"Year\" NOT IN (2014) AND CarrierDelay BETWEEN 328 AND 132 GROUP BY Carrier, DestStateFips LIMIT 21","hsqls":["SELECT Carrier, DestStateFips, COUNT(DepDel15), SUM(DepDel15), MAX(DivReachedDest) FROM mytable WHERE UniqueCarrier NOT IN ('WN', 'B6') OR `Year` NOT IN (2014) AND CarrierDelay BETWEEN 328 AND 132 GROUP BY Carrier, DestStateFips LIMIT 21"]}
 {"sql":"SELECT AirlineID, MAX(ArrDelay), SUM(ArrDel15) FROM mytable WHERE ActualElapsedTime BETWEEN 163 AND 90 OR DaysSinceEpoch BETWEEN 16075 AND 16078 AND DepDelayMinutes <> 310.0 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 28","hsqls":["SELECT AirlineID, MAX(ArrDelay), SUM(ArrDel15) FROM mytable WHERE ActualElapsedTime BETWEEN 163 AND 90 OR DaysSinceEpoch BETWEEN 16075 AND 16078 AND DepDelayMinutes <> 310.0 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 28"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE AirTime >= 404 AND OriginState BETWEEN 'NV' AND 'AK' OR FirstDepTime BETWEEN 710 AND 907 ORDER BY AirTime, DivAirportLandings LIMIT 23"}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DestWac IN (33, 54, 11, 88) ORDER BY DepTime, DivAirportLandings LIMIT 21"}
@@ -1360,17 +1360,17 @@
 {"sql":"SELECT AirlineID FROM mytable ORDER BY DestStateName, ArrivalDelayGroups LIMIT 10"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE OriginCityMarketID NOT IN (33502, 32600) OR SecurityDelay IN (10, 0, 18, 14, 27) AND Cancelled > 1 ORDER BY TotalAddGTime, DepDel15 LIMIT 22"}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE DayOfWeek IN (6) AND DestStateFips BETWEEN 2 AND 18 AND Carrier BETWEEN 'UA' AND 'UA' ORDER BY Carrier, DestState LIMIT 8"}
-{"sql":"SELECT OriginCityMarketID, SUM(\"Year\") FROM mytable WHERE DivTotalGTimes IN (6, 36) GROUP BY OriginCityMarketID LIMIT 2","hsqls":["SELECT OriginCityMarketID, SUM(Year) FROM mytable WHERE (DivTotalGTimes__MV0 IN (6, 36) OR DivTotalGTimes__MV1 IN (6, 36) OR DivTotalGTimes__MV2 IN (6, 36) OR DivTotalGTimes__MV3 IN (6, 36) OR DivTotalGTimes__MV4 IN (6, 36)) GROUP BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, SUM(\"Year\") FROM mytable WHERE DivTotalGTimes IN (6, 36) GROUP BY OriginCityMarketID LIMIT 2","hsqls":["SELECT OriginCityMarketID, SUM(`Year`) FROM mytable WHERE (DivTotalGTimes[1] IN (6, 36) OR DivTotalGTimes[2] IN (6, 36) OR DivTotalGTimes[3] IN (6, 36) OR DivTotalGTimes[4] IN (6, 36) OR DivTotalGTimes[5] IN (6, 36)) GROUP BY OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DaysSinceEpoch FROM mytable WHERE NASDelay = 150 LIMIT 29"}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DistanceGroup NOT IN (1, 10, 5, 8, 11) OR DivDistance IN (804, 107, 83, 50) ORDER BY ArrDelayMinutes, TailNum LIMIT 25"}
 {"sql":"SELECT Diverted, WheelsOn FROM mytable ORDER BY WeatherDelay LIMIT 28"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE WheelsOn IN (444, 1741, 1153, 2334, 2253) LIMIT 23","hsqls":["SELECT Year FROM mytable WHERE WheelsOn IN (444, 1741, 1153, 2334, 2253) LIMIT 23"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE WheelsOn IN (444, 1741, 1153, 2334, 2253) LIMIT 23","hsqls":["SELECT `Year` FROM mytable WHERE WheelsOn IN (444, 1741, 1153, 2334, 2253) LIMIT 23"]}
 {"sql":"SELECT OriginCityMarketID, WheelsOn FROM mytable WHERE NASDelay NOT IN (98, 66, 92, 32) ORDER BY DistanceGroup, OriginStateName LIMIT 27"}
 {"sql":"SELECT AirlineID, UniqueCarrier, OriginAirportID FROM mytable WHERE DivDistance NOT IN (462, 761, 257) AND DistanceGroup NOT IN (3, 1, 9, 8, 11) LIMIT 4"}
-{"sql":"SELECT DistanceGroup, DivWheelsOns FROM mytable WHERE DestStateFips BETWEEN 40 AND 10 LIMIT 29","hsqls":["SELECT DistanceGroup, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE DestStateFips BETWEEN 40 AND 10 LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivWheelsOns FROM mytable WHERE DestStateFips BETWEEN 40 AND 10 LIMIT 29","hsqls":["SELECT DistanceGroup, DivWheelsOns FROM mytable WHERE DestStateFips BETWEEN 40 AND 10 LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DestStateFips, COUNT(DepartureDelayGroups) FROM mytable WHERE DestStateName < 'Maine' GROUP BY DepDelayMinutes, DestStateFips  ORDER BY DepDelayMinutes, DestStateFips LIMIT 17","hsqls":["SELECT DepDelayMinutes, DestStateFips, COUNT(DepartureDelayGroups) FROM mytable WHERE DestStateName < 'Maine' GROUP BY DepDelayMinutes, DestStateFips  ORDER BY DepDelayMinutes, DestStateFips LIMIT 17"]}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE ArrDelayMinutes < 340.0 ORDER BY \"Month\" LIMIT 10","hsqls":["SELECT DepTimeBlk FROM mytable WHERE ArrDelayMinutes < 340.0 ORDER BY Month LIMIT 10"]}
-{"sql":"SELECT Cancelled, AVG(ActualElapsedTime), SUM(\"Year\"), SUM(DestAirportID) FROM mytable WHERE DestStateFips BETWEEN 29 AND 78 AND WeatherDelay IN (68, 111, 54, 37, 50) GROUP BY Cancelled LIMIT 16","hsqls":["SELECT Cancelled, AVG(ActualElapsedTime), SUM(Year), SUM(DestAirportID) FROM mytable WHERE DestStateFips BETWEEN 29 AND 78 AND WeatherDelay IN (68, 111, 54, 37, 50) GROUP BY Cancelled LIMIT 16"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE ArrDelayMinutes < 340.0 ORDER BY \"Month\" LIMIT 10","hsqls":["SELECT DepTimeBlk FROM mytable WHERE ArrDelayMinutes < 340.0 ORDER BY `Month` LIMIT 10"]}
+{"sql":"SELECT Cancelled, AVG(ActualElapsedTime), SUM(\"Year\"), SUM(DestAirportID) FROM mytable WHERE DestStateFips BETWEEN 29 AND 78 AND WeatherDelay IN (68, 111, 54, 37, 50) GROUP BY Cancelled LIMIT 16","hsqls":["SELECT Cancelled, AVG(ActualElapsedTime), SUM(`Year`), SUM(DestAirportID) FROM mytable WHERE DestStateFips BETWEEN 29 AND 78 AND WeatherDelay IN (68, 111, 54, 37, 50) GROUP BY Cancelled LIMIT 16"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE Distance IN (794, 156, 2569) AND DivReachedDest >= -9999 ORDER BY Flights LIMIT 4"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 10 AND 1 OR CRSDepTime <= 952 LIMIT 11"}
 {"sql":"SELECT Cancelled, ArrTimeBlk, DivActualElapsedTime FROM mytable WHERE DepTimeBlk = '0900-0959' OR DivActualElapsedTime IN (854, 358) AND DestStateName BETWEEN 'Delaware' AND 'Colorado' ORDER BY TailNum LIMIT 11"}
@@ -1380,64 +1380,64 @@
 {"sql":"SELECT OriginCityMarketID, CRSArrTime, CancellationCode FROM mytable LIMIT 2"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE Distance IN (362, 2300) ORDER BY DistanceGroup LIMIT 13"}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE FlightDate >= '2014-01-08' ORDER BY SecurityDelay, DepTime, DaysSinceEpoch LIMIT 3"}
-{"sql":"SELECT Distance, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivAirportIDs IN (14828, 14843, 13495, 10754) GROUP BY Distance, ArrivalDelayGroups LIMIT 2","hsqls":["SELECT Distance, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (14828, 14843, 13495, 10754) OR DivAirportIDs__MV1 IN (14828, 14843, 13495, 10754) OR DivAirportIDs__MV2 IN (14828, 14843, 13495, 10754) OR DivAirportIDs__MV3 IN (14828, 14843, 13495, 10754) OR DivAirportIDs__MV4 IN (14828, 14843, 13495, 10754)) GROUP BY Distance, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT Distance, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivAirportIDs IN (14828, 14843, 13495, 10754) GROUP BY Distance, ArrivalDelayGroups LIMIT 2","hsqls":["SELECT Distance, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (14828, 14843, 13495, 10754) OR DivAirportIDs[2] IN (14828, 14843, 13495, 10754) OR DivAirportIDs[3] IN (14828, 14843, 13495, 10754) OR DivAirportIDs[4] IN (14828, 14843, 13495, 10754) OR DivAirportIDs[5] IN (14828, 14843, 13495, 10754)) GROUP BY Distance, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, ArrDelayMinutes FROM mytable LIMIT 15"}
 {"sql":"SELECT DestState, MAX(WeatherDelay) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 3","hsqls":["SELECT DestState, MAX(WeatherDelay) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 3"]}
-{"sql":"SELECT DivReachedDest, SecurityDelay, \"Month\" FROM mytable WHERE OriginState BETWEEN 'TN' AND 'WY' AND DivWheelsOns BETWEEN 45 AND 1704 AND SecurityDelay < -9999 ORDER BY DivActualElapsedTime LIMIT 1","hsqls":["SELECT DivReachedDest, SecurityDelay, Month FROM mytable WHERE OriginState BETWEEN 'TN' AND 'WY' AND (DivWheelsOns__MV0 BETWEEN 45 AND 1704 OR DivWheelsOns__MV1 BETWEEN 45 AND 1704 OR DivWheelsOns__MV2 BETWEEN 45 AND 1704 OR DivWheelsOns__MV3 BETWEEN 45 AND 1704 OR DivWheelsOns__MV4 BETWEEN 45 AND 1704) AND SecurityDelay < -9999 ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, SecurityDelay, \"Month\" FROM mytable WHERE OriginState BETWEEN 'TN' AND 'WY' AND DivWheelsOns BETWEEN 45 AND 1704 AND SecurityDelay < -9999 ORDER BY DivActualElapsedTime LIMIT 1","hsqls":["SELECT DivReachedDest, SecurityDelay, `Month` FROM mytable WHERE OriginState BETWEEN 'TN' AND 'WY' AND (DivWheelsOns[1] BETWEEN 45 AND 1704 OR DivWheelsOns[2] BETWEEN 45 AND 1704 OR DivWheelsOns[3] BETWEEN 45 AND 1704 OR DivWheelsOns[4] BETWEEN 45 AND 1704 OR DivWheelsOns[5] BETWEEN 45 AND 1704) AND SecurityDelay < -9999 ORDER BY DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID, SUM(DivArrDelay) FROM mytable WHERE OriginAirportSeqID BETWEEN 1524903 AND 1240203 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 26","hsqls":["SELECT OriginAirportID, SUM(DivArrDelay) FROM mytable WHERE OriginAirportSeqID BETWEEN 1524903 AND 1240203 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 26"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND Flights > 1 LIMIT 24"}
 {"sql":"SELECT OriginCityName, CancellationCode, COUNT(*) FROM mytable WHERE DaysSinceEpoch NOT IN (16073, 16075, 16093) AND Distance IN (1460, 315, 519, 253) OR DepTimeBlk > '1300-1359' GROUP BY OriginCityName, CancellationCode  ORDER BY OriginCityName, CancellationCode LIMIT 22","hsqls":["SELECT OriginCityName, CancellationCode, COUNT(*) FROM mytable WHERE DaysSinceEpoch NOT IN (16073, 16075, 16093) AND Distance IN (1460, 315, 519, 253) OR DepTimeBlk > '1300-1359' GROUP BY OriginCityName, CancellationCode  ORDER BY OriginCityName, CancellationCode LIMIT 22"]}
 {"sql":"SELECT Distance, ArrDel15, DestAirportID, COUNT(*) FROM mytable WHERE DestCityName NOT IN ('Colorado Springs, CO', 'Billings, MT', 'Augusta, GA') AND FirstDepTime IN (1859, 1957, 903, 2153) GROUP BY Distance, ArrDel15, DestAirportID  ORDER BY Distance, ArrDel15, DestAirportID LIMIT 27","hsqls":["SELECT Distance, ArrDel15, DestAirportID, COUNT(*) FROM mytable WHERE DestCityName NOT IN ('Colorado Springs, CO', 'Billings, MT', 'Augusta, GA') AND FirstDepTime IN (1859, 1957, 903, 2153) GROUP BY Distance, ArrDel15, DestAirportID  ORDER BY Distance, ArrDel15, DestAirportID LIMIT 27"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable ORDER BY DivReachedDest, Cancelled, DepTimeBlk LIMIT 17"}
 {"sql":"SELECT CRSArrTime, FlightDate, DivArrDelay, MAX(ArrDel15) FROM mytable WHERE CarrierDelay <= 108 GROUP BY CRSArrTime, FlightDate, DivArrDelay  ORDER BY CRSArrTime, FlightDate, DivArrDelay LIMIT 21","hsqls":["SELECT CRSArrTime, FlightDate, DivArrDelay, MAX(ArrDel15) FROM mytable WHERE CarrierDelay <= 108 GROUP BY CRSArrTime, FlightDate, DivArrDelay  ORDER BY CRSArrTime, FlightDate, DivArrDelay LIMIT 21"]}
-{"sql":"SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE TailNum = 'N3AUAA' AND DivDistance BETWEEN 577 AND 156 ORDER BY OriginState, DestCityName LIMIT 10","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, OriginAirportID FROM mytable WHERE TailNum = 'N3AUAA' AND DivDistance BETWEEN 577 AND 156 ORDER BY OriginState, DestCityName LIMIT 10000"]}
-{"sql":"SELECT DestCityMarketID, AirlineID, ArrivalDelayGroups, AVG(DepTime) FROM mytable WHERE DivLongestGTimes IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivAirportSeqIDs BETWEEN 1069302 AND 1320402 AND Flights < 1 GROUP BY DestCityMarketID, AirlineID, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT DestCityMarketID, AirlineID, ArrivalDelayGroups, AVG(CAST(DepTime AS DOUBLE)) FROM mytable WHERE (DivLongestGTimes__MV0 IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes__MV1 IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes__MV2 IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes__MV3 IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes__MV4 IN (13.0, 20.0, 116.0, 15.0, 14.0)) OR (DivAirportSeqIDs__MV0 BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs__MV1 BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs__MV2 BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs__MV3 BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs__MV4 BETWEEN 1069302 AND 1320402) AND Flights < 1 GROUP BY DestCityMarketID, AirlineID, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE TailNum = 'N3AUAA' AND DivDistance BETWEEN 577 AND 156 ORDER BY OriginState, DestCityName LIMIT 10","hsqls":["SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE TailNum = 'N3AUAA' AND DivDistance BETWEEN 577 AND 156 ORDER BY OriginState, DestCityName LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, AirlineID, ArrivalDelayGroups, AVG(DepTime) FROM mytable WHERE DivLongestGTimes IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivAirportSeqIDs BETWEEN 1069302 AND 1320402 AND Flights < 1 GROUP BY DestCityMarketID, AirlineID, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT DestCityMarketID, AirlineID, ArrivalDelayGroups, AVG(CAST(DepTime AS DOUBLE)) FROM mytable WHERE (DivLongestGTimes[1] IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes[2] IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes[3] IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes[4] IN (13.0, 20.0, 116.0, 15.0, 14.0) OR DivLongestGTimes[5] IN (13.0, 20.0, 116.0, 15.0, 14.0)) OR (DivAirportSeqIDs[1] BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs[2] BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs[3] BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs[4] BETWEEN 1069302 AND 1320402 OR DivAirportSeqIDs[5] BETWEEN 1069302 AND 1320402) AND Flights < 1 GROUP BY DestCityMarketID, AirlineID, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, Origin, ArrDelay, AVG(OriginCityMarketID) FROM mytable GROUP BY DepartureDelayGroups, Origin, ArrDelay  ORDER BY DepartureDelayGroups, Origin, ArrDelay LIMIT 11","hsqls":["SELECT DepartureDelayGroups, Origin, ArrDelay, AVG(OriginCityMarketID) FROM mytable GROUP BY DepartureDelayGroups, Origin, ArrDelay  ORDER BY DepartureDelayGroups, Origin, ArrDelay LIMIT 11"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE DivDistance >= 24 AND AirTime BETWEEN 303 AND 119 ORDER BY DivArrDelay LIMIT 27"}
 {"sql":"SELECT DaysSinceEpoch, AVG(CRSElapsedTime), MAX(ArrDelayMinutes) FROM mytable WHERE DepDel15 IN (1, 0, -9999) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 12","hsqls":["SELECT DaysSinceEpoch, AVG(CRSElapsedTime), MAX(ArrDelayMinutes) FROM mytable WHERE DepDel15 IN (1, 0, -9999) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 12"]}
 {"sql":"SELECT FlightNum, SUM(WheelsOn), AVG(ArrDelay) FROM mytable WHERE DivDistance BETWEEN 581 AND 483 AND Carrier NOT IN ('WN', 'B6', 'FL', 'UA', 'MQ') GROUP BY FlightNum","hsqls":["SELECT FlightNum, SUM(WheelsOn), AVG(ArrDelay) FROM mytable WHERE DivDistance BETWEEN 581 AND 483 AND Carrier NOT IN ('WN', 'B6', 'FL', 'UA', 'MQ') GROUP BY FlightNum"]}
 {"sql":"SELECT Carrier, LongestAddGTime FROM mytable ORDER BY DestCityName, DestStateName, DaysSinceEpoch LIMIT 26"}
 {"sql":"SELECT WheelsOff, SecurityDelay, ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginState NOT IN ('UT', 'MA') AND WheelsOn IN (447, 1538, 1201, 916, 2117) AND ActualElapsedTime < 177 GROUP BY WheelsOff, SecurityDelay, ArrDelayMinutes  ORDER BY WheelsOff, SecurityDelay, ArrDelayMinutes LIMIT 15","hsqls":["SELECT WheelsOff, SecurityDelay, ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginState NOT IN ('UT', 'MA') AND WheelsOn IN (447, 1538, 1201, 916, 2117) AND ActualElapsedTime < 177 GROUP BY WheelsOff, SecurityDelay, ArrDelayMinutes  ORDER BY WheelsOff, SecurityDelay, ArrDelayMinutes LIMIT 15"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE FirstDepTime > 908 LIMIT 2","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE FirstDepTime > 908 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE FirstDepTime > 908 LIMIT 2","hsqls":["SELECT DivWheelsOns FROM mytable WHERE FirstDepTime > 908 LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, Origin, COUNT(*) FROM mytable GROUP BY CRSArrTime, Origin  ORDER BY CRSArrTime, Origin LIMIT 5","hsqls":["SELECT CRSArrTime, Origin, COUNT(*) FROM mytable GROUP BY CRSArrTime, Origin  ORDER BY CRSArrTime, Origin LIMIT 5"]}
 {"sql":"SELECT DepTimeBlk, CRSElapsedTime FROM mytable WHERE CarrierDelay IN (21, 153, 150) AND ArrDel15 BETWEEN 1 AND -9999 OR AirlineID <> 20355 ORDER BY Cancelled LIMIT 21"}
 {"sql":"SELECT Diverted FROM mytable ORDER BY DepDelayMinutes LIMIT 10"}
-{"sql":"SELECT NASDelay, OriginWac FROM mytable WHERE Distance IN (1340, 351) AND DivAirports IN ('DFW', 'BPT', 'IMT', 'BWI') ORDER BY ArrTime, ArrDelayMinutes, ArrivalDelayGroups LIMIT 28","hsqls":["SELECT NASDelay, OriginWac FROM mytable WHERE Distance IN (1340, 351) AND (DivAirports__MV0 IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports__MV1 IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports__MV2 IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports__MV3 IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports__MV4 IN ('DFW', 'BPT', 'IMT', 'BWI')) ORDER BY ArrTime, ArrDelayMinutes, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT NASDelay, OriginWac FROM mytable WHERE Distance IN (1340, 351) AND DivAirports IN ('DFW', 'BPT', 'IMT', 'BWI') ORDER BY ArrTime, ArrDelayMinutes, ArrivalDelayGroups LIMIT 28","hsqls":["SELECT NASDelay, OriginWac FROM mytable WHERE Distance IN (1340, 351) AND (DivAirports[1] IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports[2] IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports[3] IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports[4] IN ('DFW', 'BPT', 'IMT', 'BWI') OR DivAirports[5] IN ('DFW', 'BPT', 'IMT', 'BWI')) ORDER BY ArrTime, ArrDelayMinutes, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE DaysSinceEpoch IN (16084, 16072, 16095, 16091) AND OriginWac IN (45, 93, 92, 37, 11) AND DistanceGroup NOT IN (4) ORDER BY Carrier, TotalAddGTime, ArrivalDelayGroups LIMIT 10"}
 {"sql":"SELECT DepDelay, CRSArrTime, SecurityDelay, MIN(OriginStateFips), SUM(CRSElapsedTime), MIN(DivArrDelay) FROM mytable WHERE WeatherDelay > 115 GROUP BY DepDelay, CRSArrTime, SecurityDelay  ORDER BY DepDelay, CRSArrTime, SecurityDelay LIMIT 29","hsqls":["SELECT DepDelay, CRSArrTime, SecurityDelay, MIN(OriginStateFips), SUM(CRSElapsedTime), MIN(DivArrDelay) FROM mytable WHERE WeatherDelay > 115 GROUP BY DepDelay, CRSArrTime, SecurityDelay  ORDER BY DepDelay, CRSArrTime, SecurityDelay LIMIT 29"]}
 {"sql":"SELECT CarrierDelay, MAX(DepDelayMinutes), AVG(SecurityDelay), COUNT(DestState) FROM mytable WHERE Distance <> 1826 OR OriginCityMarketID NOT IN (31057) GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 18","hsqls":["SELECT CarrierDelay, MAX(DepDelayMinutes), AVG(SecurityDelay), COUNT(DestState) FROM mytable WHERE Distance <> 1826 OR OriginCityMarketID NOT IN (31057) GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 18"]}
 {"sql":"SELECT SUM(CarrierDelay), AVG(LateAircraftDelay) FROM mytable WHERE AirTime BETWEEN 317 AND 87 AND DestStateName BETWEEN 'Alaska' AND 'Illinois' LIMIT 16"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DestState BETWEEN 'MS' AND 'AK' OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE DestState BETWEEN 'MS' AND 'AK' OR Year BETWEEN 2014 AND 2014 LIMIT 8"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DestState BETWEEN 'MS' AND 'AK' OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE DestState BETWEEN 'MS' AND 'AK' OR `Year` BETWEEN 2014 AND 2014 LIMIT 8"]}
 {"sql":"SELECT DayofMonth, DivAirportLandings, COUNT(Quarter), MAX(Quarter), SUM(ActualElapsedTime) FROM mytable WHERE DivArrDelay <> 880 OR Flights BETWEEN 1 AND 1 GROUP BY DayofMonth, DivAirportLandings  ORDER BY DayofMonth, DivAirportLandings LIMIT 11","hsqls":["SELECT DayofMonth, DivAirportLandings, COUNT(Quarter), MAX(Quarter), SUM(ActualElapsedTime) FROM mytable WHERE DivArrDelay <> 880 OR Flights BETWEEN 1 AND 1 GROUP BY DayofMonth, DivAirportLandings  ORDER BY DayofMonth, DivAirportLandings LIMIT 11"]}
 {"sql":"SELECT SecurityDelay, CancellationCode, OriginAirportID, COUNT(*) FROM mytable WHERE ArrTime = 1134 OR FlightNum < 2858 OR DivArrDelay BETWEEN 187 AND 346 GROUP BY SecurityDelay, CancellationCode, OriginAirportID  ORDER BY SecurityDelay, CancellationCode, OriginAirportID LIMIT 28","hsqls":["SELECT SecurityDelay, CancellationCode, OriginAirportID, COUNT(*) FROM mytable WHERE ArrTime = 1134 OR FlightNum < 2858 OR DivArrDelay BETWEEN 187 AND 346 GROUP BY SecurityDelay, CancellationCode, OriginAirportID  ORDER BY SecurityDelay, CancellationCode, OriginAirportID LIMIT 28"]}
 {"sql":"SELECT AirTime FROM mytable WHERE Diverted <= 0 ORDER BY Origin, DivAirportLandings LIMIT 10"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE TaxiIn IN (49, 30) AND Diverted NOT IN (1, 0) AND Quarter BETWEEN 1 AND 1 ORDER BY DepTime, DestAirportID, DivActualElapsedTime LIMIT 16","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE TaxiIn IN (49, 30) AND Diverted NOT IN (1, 0) AND Quarter BETWEEN 1 AND 1 ORDER BY DepTime, DestAirportID, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DestState, WheelsOn FROM mytable WHERE DivActualElapsedTime NOT IN (738) AND OriginCityMarketID NOT IN (33667, 31003, 31146) OR DivLongestGTimes BETWEEN 110.0 AND 80.0 ORDER BY DestWac, ArrTime, TailNum LIMIT 24","hsqls":["SELECT Year, DestState, WheelsOn FROM mytable WHERE DivActualElapsedTime NOT IN (738) AND OriginCityMarketID NOT IN (33667, 31003, 31146) OR (DivLongestGTimes__MV0 BETWEEN 110.0 AND 80.0 OR DivLongestGTimes__MV1 BETWEEN 110.0 AND 80.0 OR DivLongestGTimes__MV2 BETWEEN 110.0 AND 80.0 OR DivLongestGTimes__MV3 BETWEEN 110.0 AND 80.0 OR DivLongestGTimes__MV4 BETWEEN 110.0 AND 80.0) ORDER BY DestWac, ArrTime, TailNum LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE TaxiIn IN (49, 30) AND Diverted NOT IN (1, 0) AND Quarter BETWEEN 1 AND 1 ORDER BY DepTime, DestAirportID, DivActualElapsedTime LIMIT 16","hsqls":["SELECT DivAirportIDs FROM mytable WHERE TaxiIn IN (49, 30) AND Diverted NOT IN (1, 0) AND Quarter BETWEEN 1 AND 1 ORDER BY DepTime, DestAirportID, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DestState, WheelsOn FROM mytable WHERE DivActualElapsedTime NOT IN (738) AND OriginCityMarketID NOT IN (33667, 31003, 31146) OR DivLongestGTimes BETWEEN 110.0 AND 80.0 ORDER BY DestWac, ArrTime, TailNum LIMIT 24","hsqls":["SELECT Year, DestState, WheelsOn FROM mytable WHERE DivActualElapsedTime NOT IN (738) AND OriginCityMarketID NOT IN (33667, 31003, 31146) OR (DivLongestGTimes[1] BETWEEN 110.0 AND 80.0 OR DivLongestGTimes[2] BETWEEN 110.0 AND 80.0 OR DivLongestGTimes[3] BETWEEN 110.0 AND 80.0 OR DivLongestGTimes[4] BETWEEN 110.0 AND 80.0 OR DivLongestGTimes[5] BETWEEN 110.0 AND 80.0) ORDER BY DestWac, ArrTime, TailNum LIMIT 10000"]}
 {"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 832 AND 1412 OR OriginCityName >= 'Sioux Falls, SD' GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 11","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 832 AND 1412 OR OriginCityName >= 'Sioux Falls, SD' GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 11"]}
 {"sql":"SELECT FirstDepTime, OriginWac, CRSDepTime, MAX(OriginCityMarketID), SUM(DistanceGroup), SUM(OriginAirportSeqID) FROM mytable WHERE Flights IN (1) AND ArrTimeBlk BETWEEN '1600-1659' AND '2300-2359' AND FlightDate <= '2014-01-07' GROUP BY FirstDepTime, OriginWac, CRSDepTime  ORDER BY FirstDepTime, OriginWac, CRSDepTime LIMIT 22","hsqls":["SELECT FirstDepTime, OriginWac, CRSDepTime, MAX(OriginCityMarketID), SUM(DistanceGroup), SUM(OriginAirportSeqID) FROM mytable WHERE Flights IN (1) AND ArrTimeBlk BETWEEN '1600-1659' AND '2300-2359' AND FlightDate <= '2014-01-07' GROUP BY FirstDepTime, OriginWac, CRSDepTime  ORDER BY FirstDepTime, OriginWac, CRSDepTime LIMIT 22"]}
 {"sql":"SELECT Quarter, TotalAddGTime, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY Quarter, TotalAddGTime, CRSElapsedTime  ORDER BY Quarter, TotalAddGTime, CRSElapsedTime LIMIT 9","hsqls":["SELECT Quarter, TotalAddGTime, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY Quarter, TotalAddGTime, CRSElapsedTime  ORDER BY Quarter, TotalAddGTime, CRSElapsedTime LIMIT 9"]}
 {"sql":"SELECT SecurityDelay, AVG(DestStateFips), SUM(WheelsOff), SUM(AirTime) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) OR Distance BETWEEN 1721 AND 1585 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 14","hsqls":["SELECT SecurityDelay, AVG(DestStateFips), SUM(WheelsOff), SUM(AirTime) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) OR Distance BETWEEN 1721 AND 1585 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 14"]}
 {"sql":"SELECT WeatherDelay, ArrDelayMinutes, MIN(DayOfWeek), MAX(DepDelay) FROM mytable WHERE OriginAirportID IN (10333, 14520, 13061, 10431, 14783) AND DaysSinceEpoch BETWEEN 16090 AND 16079 GROUP BY WeatherDelay, ArrDelayMinutes  ORDER BY WeatherDelay, ArrDelayMinutes LIMIT 9","hsqls":["SELECT WeatherDelay, ArrDelayMinutes, MIN(DayOfWeek), MAX(DepDelay) FROM mytable WHERE OriginAirportID IN (10333, 14520, 13061, 10431, 14783) AND DaysSinceEpoch BETWEEN 16090 AND 16079 GROUP BY WeatherDelay, ArrDelayMinutes  ORDER BY WeatherDelay, ArrDelayMinutes LIMIT 9"]}
-{"sql":"SELECT DivLongestGTimes, Distance, CancellationCode FROM mytable WHERE OriginAirportSeqID BETWEEN 1445702 AND 1484304 OR TaxiIn BETWEEN 8 AND 30 AND Cancelled IN (1, 0) ORDER BY DistanceGroup, LateAircraftDelay, NASDelay LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Distance, CancellationCode FROM mytable WHERE OriginAirportSeqID BETWEEN 1445702 AND 1484304 OR TaxiIn BETWEEN 8 AND 30 AND Cancelled IN (1, 0) ORDER BY DistanceGroup, LateAircraftDelay, NASDelay LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivReachedDest < 1 OR DivTailNums BETWEEN 'N224WN' AND 'N248WN' ORDER BY OriginState, DestState, DayofMonth LIMIT 10","hsqls":["SELECT TaxiIn, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivReachedDest < 1 OR (DivTailNums__MV0 BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums__MV1 BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums__MV2 BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums__MV3 BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums__MV4 BETWEEN 'N224WN' AND 'N248WN') ORDER BY OriginState, DestState, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Distance, CancellationCode FROM mytable WHERE OriginAirportSeqID BETWEEN 1445702 AND 1484304 OR TaxiIn BETWEEN 8 AND 30 AND Cancelled IN (1, 0) ORDER BY DistanceGroup, LateAircraftDelay, NASDelay LIMIT 2","hsqls":["SELECT DivLongestGTimes, Distance, CancellationCode FROM mytable WHERE OriginAirportSeqID BETWEEN 1445702 AND 1484304 OR TaxiIn BETWEEN 8 AND 30 AND Cancelled IN (1, 0) ORDER BY DistanceGroup, LateAircraftDelay, NASDelay LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivReachedDest < 1 OR DivTailNums BETWEEN 'N224WN' AND 'N248WN' ORDER BY OriginState, DestState, DayofMonth LIMIT 10","hsqls":["SELECT TaxiIn, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivReachedDest < 1 OR (DivTailNums[1] BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums[2] BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums[3] BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums[4] BETWEEN 'N224WN' AND 'N248WN' OR DivTailNums[5] BETWEEN 'N224WN' AND 'N248WN') ORDER BY OriginState, DestState, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, MIN(OriginStateFips), MIN(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE TaxiOut BETWEEN 26 AND 12 AND CarrierDelay < 175 OR DepTime BETWEEN 1514 AND 1940 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 24","hsqls":["SELECT DayofMonth, MIN(OriginStateFips), MIN(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE TaxiOut BETWEEN 26 AND 12 AND CarrierDelay < 175 OR DepTime BETWEEN 1514 AND 1940 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 24"]}
 {"sql":"SELECT DepTimeBlk, MAX(DivDistance), AVG(LateAircraftDelay) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 13","hsqls":["SELECT DepTimeBlk, MAX(DivDistance), AVG(LateAircraftDelay) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 13"]}
 {"sql":"SELECT DepTime, TaxiIn, Cancelled, COUNT(AirlineID), MAX(DestWac) FROM mytable WHERE WheelsOff IN (1602, 1528) AND TaxiIn BETWEEN 116 AND 71 GROUP BY DepTime, TaxiIn, Cancelled  ORDER BY DepTime, TaxiIn, Cancelled LIMIT 10","hsqls":["SELECT DepTime, TaxiIn, Cancelled, COUNT(AirlineID), MAX(DestWac) FROM mytable WHERE WheelsOff IN (1602, 1528) AND TaxiIn BETWEEN 116 AND 71 GROUP BY DepTime, TaxiIn, Cancelled  ORDER BY DepTime, TaxiIn, Cancelled LIMIT 10"]}
 {"sql":"SELECT Flights FROM mytable WHERE FirstDepTime NOT IN (1859, 1309, 1540, 1018) AND FirstDepTime NOT IN (1957, 640) AND DestAirportSeqID BETWEEN 1471102 AND 1098002 LIMIT 24"}
-{"sql":"SELECT SecurityDelay, DestAirportID FROM mytable WHERE CRSDepTime NOT IN (1910, 713, 2332, 1911) OR DepDelayMinutes NOT IN (192.0, 245.0, 140.0, 250.0) OR DivWheelsOns BETWEEN 1459 AND 1856 ORDER BY \"Month\" LIMIT 7","hsqls":["SELECT SecurityDelay, DestAirportID FROM mytable WHERE CRSDepTime NOT IN (1910, 713, 2332, 1911) OR DepDelayMinutes NOT IN (192.0, 245.0, 140.0, 250.0) OR (DivWheelsOns__MV0 BETWEEN 1459 AND 1856 OR DivWheelsOns__MV1 BETWEEN 1459 AND 1856 OR DivWheelsOns__MV2 BETWEEN 1459 AND 1856 OR DivWheelsOns__MV3 BETWEEN 1459 AND 1856 OR DivWheelsOns__MV4 BETWEEN 1459 AND 1856) ORDER BY Month LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, DestAirportID FROM mytable WHERE CRSDepTime NOT IN (1910, 713, 2332, 1911) OR DepDelayMinutes NOT IN (192.0, 245.0, 140.0, 250.0) OR DivWheelsOns BETWEEN 1459 AND 1856 ORDER BY \"Month\" LIMIT 7","hsqls":["SELECT SecurityDelay, DestAirportID FROM mytable WHERE CRSDepTime NOT IN (1910, 713, 2332, 1911) OR DepDelayMinutes NOT IN (192.0, 245.0, 140.0, 250.0) OR (DivWheelsOns[1] BETWEEN 1459 AND 1856 OR DivWheelsOns[2] BETWEEN 1459 AND 1856 OR DivWheelsOns[3] BETWEEN 1459 AND 1856 OR DivWheelsOns[4] BETWEEN 1459 AND 1856 OR DivWheelsOns[5] BETWEEN 1459 AND 1856) ORDER BY `Month` LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepTimeBlk BETWEEN '2100-2159' AND '1500-1559' LIMIT 1"}
 {"sql":"SELECT DivReachedDest, ArrDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FlightDate <> '2014-01-05' OR ArrDelay NOT IN (241.0, -48.0, 105.0, 138.0) ORDER BY CRSDepTime LIMIT 10"}
 {"sql":"SELECT CRSElapsedTime, OriginStateName, DayOfWeek FROM mytable ORDER BY Diverted, DepDelay, DepDel15 LIMIT 15"}
-{"sql":"SELECT DestWac, Quarter, OriginWac FROM mytable WHERE DivLongestGTimes IN (56.0, 36.0, 37.0, 69.0, 29.0) ORDER BY DestStateFips, OriginCityName, ArrDelayMinutes LIMIT 7","hsqls":["SELECT DestWac, Quarter, OriginWac FROM mytable WHERE (DivLongestGTimes__MV0 IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes__MV1 IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes__MV2 IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes__MV3 IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes__MV4 IN (56.0, 36.0, 37.0, 69.0, 29.0)) ORDER BY DestStateFips, OriginCityName, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DestWac, Quarter, OriginWac FROM mytable WHERE DivLongestGTimes IN (56.0, 36.0, 37.0, 69.0, 29.0) ORDER BY DestStateFips, OriginCityName, ArrDelayMinutes LIMIT 7","hsqls":["SELECT DestWac, Quarter, OriginWac FROM mytable WHERE (DivLongestGTimes[1] IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes[2] IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes[3] IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes[4] IN (56.0, 36.0, 37.0, 69.0, 29.0) OR DivLongestGTimes[5] IN (56.0, 36.0, 37.0, 69.0, 29.0)) ORDER BY DestStateFips, OriginCityName, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DestStateName, CRSElapsedTime FROM mytable WHERE DepartureDelayGroups <= 6 OR DepDel15 <> 1 OR OriginState NOT IN ('IL', 'WI', 'VA', 'WV', 'NJ') ORDER BY FirstDepTime, CancellationCode, DivArrDelay LIMIT 10"}
 {"sql":"SELECT DivReachedDest, Carrier FROM mytable LIMIT 6"}
-{"sql":"SELECT SUM(\"Month\"), MAX(Quarter) FROM mytable WHERE WheelsOff < 1848 OR OriginCityName NOT IN ('Albany, NY', 'Cincinnati, OH', 'Lewiston, ID', 'Reno, NV', 'Fort Lauderdale, FL') LIMIT 18","hsqls":["SELECT SUM(Month), MAX(Quarter) FROM mytable WHERE WheelsOff < 1848 OR OriginCityName NOT IN ('Albany, NY', 'Cincinnati, OH', 'Lewiston, ID', 'Reno, NV', 'Fort Lauderdale, FL') LIMIT 18"]}
-{"sql":"SELECT TaxiOut, CancellationCode FROM mytable WHERE DivTailNums BETWEEN 'N612JB' AND 'N443SW' OR DestCityMarketID IN (30781, 32511, 34905) AND LongestAddGTime < 15 ORDER BY SecurityDelay, ArrDelay LIMIT 8","hsqls":["SELECT TaxiOut, CancellationCode FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums__MV1 BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums__MV2 BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums__MV3 BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums__MV4 BETWEEN 'N612JB' AND 'N443SW') OR DestCityMarketID IN (30781, 32511, 34905) AND LongestAddGTime < 15 ORDER BY SecurityDelay, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT NASDelay, DivWheelsOffs, ArrivalDelayGroups FROM mytable ORDER BY CRSArrTime, DepDelayMinutes, FlightDate LIMIT 11","hsqls":["SELECT NASDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, ArrivalDelayGroups FROM mytable ORDER BY CRSArrTime, DepDelayMinutes, FlightDate LIMIT 10000"]}
+{"sql":"SELECT SUM(\"Month\"), MAX(Quarter) FROM mytable WHERE WheelsOff < 1848 OR OriginCityName NOT IN ('Albany, NY', 'Cincinnati, OH', 'Lewiston, ID', 'Reno, NV', 'Fort Lauderdale, FL') LIMIT 18","hsqls":["SELECT SUM(`Month`), MAX(Quarter) FROM mytable WHERE WheelsOff < 1848 OR OriginCityName NOT IN ('Albany, NY', 'Cincinnati, OH', 'Lewiston, ID', 'Reno, NV', 'Fort Lauderdale, FL') LIMIT 18"]}
+{"sql":"SELECT TaxiOut, CancellationCode FROM mytable WHERE DivTailNums BETWEEN 'N612JB' AND 'N443SW' OR DestCityMarketID IN (30781, 32511, 34905) AND LongestAddGTime < 15 ORDER BY SecurityDelay, ArrDelay LIMIT 8","hsqls":["SELECT TaxiOut, CancellationCode FROM mytable WHERE (DivTailNums[1] BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums[2] BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums[3] BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums[4] BETWEEN 'N612JB' AND 'N443SW' OR DivTailNums[5] BETWEEN 'N612JB' AND 'N443SW') OR DestCityMarketID IN (30781, 32511, 34905) AND LongestAddGTime < 15 ORDER BY SecurityDelay, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT NASDelay, DivWheelsOffs, ArrivalDelayGroups FROM mytable ORDER BY CRSArrTime, DepDelayMinutes, FlightDate LIMIT 11","hsqls":["SELECT NASDelay, DivWheelsOffs, ArrivalDelayGroups FROM mytable ORDER BY CRSArrTime, DepDelayMinutes, FlightDate LIMIT 10000"]}
 {"sql":"SELECT NASDelay, DayofMonth, COUNT(Flights) FROM mytable WHERE OriginAirportID BETWEEN 11308 AND 14674 AND Quarter BETWEEN 1 AND 1 AND DayofMonth > 16 GROUP BY NASDelay, DayofMonth  ORDER BY NASDelay, DayofMonth LIMIT 29","hsqls":["SELECT NASDelay, DayofMonth, COUNT(Flights) FROM mytable WHERE OriginAirportID BETWEEN 11308 AND 14674 AND Quarter BETWEEN 1 AND 1 AND DayofMonth > 16 GROUP BY NASDelay, DayofMonth  ORDER BY NASDelay, DayofMonth LIMIT 29"]}
 {"sql":"SELECT TaxiOut, Distance, DestAirportSeqID, SUM(ArrivalDelayGroups), MAX(ActualElapsedTime), MIN(OriginCityMarketID) FROM mytable WHERE Origin BETWEEN 'ECP' AND 'HDN' OR CRSDepTime IN (1808, 2149, 818, 744, 630) OR DestStateFips < 25 GROUP BY TaxiOut, Distance, DestAirportSeqID  ORDER BY TaxiOut, Distance, DestAirportSeqID LIMIT 21","hsqls":["SELECT TaxiOut, Distance, DestAirportSeqID, SUM(ArrivalDelayGroups), MAX(ActualElapsedTime), MIN(OriginCityMarketID) FROM mytable WHERE Origin BETWEEN 'ECP' AND 'HDN' OR CRSDepTime IN (1808, 2149, 818, 744, 630) OR DestStateFips < 25 GROUP BY TaxiOut, Distance, DestAirportSeqID  ORDER BY TaxiOut, Distance, DestAirportSeqID LIMIT 21"]}
-{"sql":"SELECT DistanceGroup, LateAircraftDelay, \"Month\", COUNT(*) FROM mytable WHERE ArrDelayMinutes > 28.0 GROUP BY DistanceGroup, LateAircraftDelay, \"Month\" LIMIT 19","hsqls":["SELECT DistanceGroup, LateAircraftDelay, Month, COUNT(*) FROM mytable WHERE ArrDelayMinutes > 28.0 GROUP BY DistanceGroup, LateAircraftDelay, Month LIMIT 19"]}
-{"sql":"SELECT MAX(CarrierDelay), AVG(DayofMonth), MAX(DestCityMarketID) FROM mytable WHERE DivTailNums BETWEEN 'N248WN' AND 'N493AA' OR DepDelay >= -8.0 OR WheelsOn IN (959, 1042, 2105) LIMIT 27","hsqls":["SELECT MAX(CarrierDelay), AVG(DayofMonth), MAX(DestCityMarketID)  FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums__MV1 BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums__MV2 BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums__MV3 BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums__MV4 BETWEEN 'N248WN' AND 'N493AA') OR DepDelay >= -8.0 OR WheelsOn IN (959, 1042, 2105) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, LateAircraftDelay, \"Month\", COUNT(*) FROM mytable WHERE ArrDelayMinutes > 28.0 GROUP BY DistanceGroup, LateAircraftDelay, \"Month\" LIMIT 19","hsqls":["SELECT DistanceGroup, LateAircraftDelay, Month, COUNT(*) FROM mytable WHERE ArrDelayMinutes > 28.0 GROUP BY DistanceGroup, LateAircraftDelay, `Month` LIMIT 19"]}
+{"sql":"SELECT MAX(CarrierDelay), AVG(DayofMonth), MAX(DestCityMarketID) FROM mytable WHERE DivTailNums BETWEEN 'N248WN' AND 'N493AA' OR DepDelay >= -8.0 OR WheelsOn IN (959, 1042, 2105) LIMIT 27","hsqls":["SELECT MAX(CarrierDelay), AVG(DayofMonth), MAX(DestCityMarketID)  FROM mytable WHERE (DivTailNums[1] BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums[2] BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums[3] BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums[4] BETWEEN 'N248WN' AND 'N493AA' OR DivTailNums[5] BETWEEN 'N248WN' AND 'N493AA') OR DepDelay >= -8.0 OR WheelsOn IN (959, 1042, 2105) LIMIT 10000"]}
 {"sql":"SELECT ArrTime, DayOfWeek, AVG(DaysSinceEpoch), COUNT(DepDelayMinutes), MIN(CRSArrTime) FROM mytable WHERE DestWac BETWEEN 84 AND 54 GROUP BY ArrTime, DayOfWeek  ORDER BY ArrTime, DayOfWeek LIMIT 28","hsqls":["SELECT ArrTime, DayOfWeek, AVG(DaysSinceEpoch), COUNT(DepDelayMinutes), MIN(CRSArrTime) FROM mytable WHERE DestWac BETWEEN 84 AND 54 GROUP BY ArrTime, DayOfWeek  ORDER BY ArrTime, DayOfWeek LIMIT 28"]}
 {"sql":"SELECT CancellationCode, MAX(DivActualElapsedTime), COUNT(DepTime), MAX(ArrTime) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 19","hsqls":["SELECT CancellationCode, MAX(DivActualElapsedTime), COUNT(DepTime), MAX(ArrTime) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 19"]}
 {"sql":"SELECT DepTime, DestCityMarketID FROM mytable WHERE CRSArrTime IN (1834) OR DivDistance < 156 OR UniqueCarrier NOT IN ('MQ', 'UA') ORDER BY DivReachedDest, Cancelled LIMIT 13"}
@@ -1445,8 +1445,8 @@
 {"sql":"SELECT Origin, AirTime FROM mytable WHERE DivAirportLandings = 1 OR OriginState BETWEEN 'NY' AND 'ID' OR DepartureDelayGroups BETWEEN 1 AND 5 LIMIT 19"}
 {"sql":"SELECT ArrTime, Cancelled FROM mytable WHERE OriginAirportID = 14893 ORDER BY FirstDepTime, CRSDepTime LIMIT 29"}
 {"sql":"SELECT DestStateFips, DestAirportID FROM mytable WHERE Diverted < 0 AND Diverted BETWEEN 1 AND 1 AND DestStateFips > 23 ORDER BY Diverted, AirTime, DivAirportLandings LIMIT 19"}
-{"sql":"SELECT DepartureDelayGroups, FlightNum, Dest, AVG(\"Year\"), MAX(TotalAddGTime) FROM mytable WHERE CRSDepTime BETWEEN 834 AND 1741 AND CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY DepartureDelayGroups, FlightNum, Dest LIMIT 23","hsqls":["SELECT DepartureDelayGroups, FlightNum, Dest, AVG(Year), MAX(TotalAddGTime) FROM mytable WHERE CRSDepTime BETWEEN 834 AND 1741 AND CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY DepartureDelayGroups, FlightNum, Dest LIMIT 23"]}
-{"sql":"SELECT SecurityDelay, MAX(TotalAddGTime), AVG(ArrDelayMinutes) FROM mytable WHERE DivLongestGTimes >= 128.0 OR FlightDate <= '2014-01-17' GROUP BY SecurityDelay LIMIT 21","hsqls":["SELECT SecurityDelay, MAX(TotalAddGTime), AVG(ArrDelayMinutes) FROM mytable WHERE (DivLongestGTimes__MV0 >= 128.0 OR DivLongestGTimes__MV1 >= 128.0 OR DivLongestGTimes__MV2 >= 128.0 OR DivLongestGTimes__MV3 >= 128.0 OR DivLongestGTimes__MV4 >= 128.0) OR FlightDate <= '2014-01-17' GROUP BY SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, FlightNum, Dest, AVG(\"Year\"), MAX(TotalAddGTime) FROM mytable WHERE CRSDepTime BETWEEN 834 AND 1741 AND CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY DepartureDelayGroups, FlightNum, Dest LIMIT 23","hsqls":["SELECT DepartureDelayGroups, FlightNum, Dest, AVG(`Year`), MAX(TotalAddGTime) FROM mytable WHERE CRSDepTime BETWEEN 834 AND 1741 AND CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY DepartureDelayGroups, FlightNum, Dest LIMIT 23"]}
+{"sql":"SELECT SecurityDelay, MAX(TotalAddGTime), AVG(ArrDelayMinutes) FROM mytable WHERE DivLongestGTimes >= 128.0 OR FlightDate <= '2014-01-17' GROUP BY SecurityDelay LIMIT 21","hsqls":["SELECT SecurityDelay, MAX(TotalAddGTime), AVG(ArrDelayMinutes) FROM mytable WHERE (DivLongestGTimes[1] >= 128.0 OR DivLongestGTimes[2] >= 128.0 OR DivLongestGTimes[3] >= 128.0 OR DivLongestGTimes[4] >= 128.0 OR DivLongestGTimes[5] >= 128.0) OR FlightDate <= '2014-01-17' GROUP BY SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT WheelsOn, MAX(WheelsOn), COUNT(OriginAirportID), SUM(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 66 AND 4 AND CancellationCode = 'C' GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 2","hsqls":["SELECT WheelsOn, MAX(WheelsOn), COUNT(OriginAirportID), SUM(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 66 AND 4 AND CancellationCode = 'C' GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 2"]}
 {"sql":"SELECT SUM(DestWac) FROM mytable WHERE Diverted > 1 AND DepDel15 BETWEEN -9999 AND 1 LIMIT 25"}
 {"sql":"SELECT TotalAddGTime, DestCityName, CRSDepTime FROM mytable WHERE OriginStateName IN ('Utah', 'North Dakota', 'Michigan', 'Delaware', 'Arkansas') ORDER BY DestCityName LIMIT 24"}
@@ -1457,48 +1457,48 @@
 {"sql":"SELECT TotalAddGTime, ArrivalDelayGroups FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259', '0700-0759') OR CancellationCode BETWEEN 'B' AND 'A' ORDER BY DepDelayMinutes, NASDelay LIMIT 21"}
 {"sql":"SELECT DivDistance, Cancelled, CancellationCode FROM mytable LIMIT 16"}
 {"sql":"SELECT COUNT(Cancelled), AVG(LateAircraftDelay) FROM mytable LIMIT 29"}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE WeatherDelay NOT IN (2, 319, 15) AND DivArrDelay BETWEEN 75 AND 161 AND AirlineID <= 19930 ORDER BY DistanceGroup, DestAirportSeqID, ArrDel15 LIMIT 21","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE WeatherDelay NOT IN (2, 319, 15) AND DivArrDelay BETWEEN 75 AND 161 AND AirlineID <= 19930 ORDER BY DistanceGroup, DestAirportSeqID, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE WeatherDelay NOT IN (2, 319, 15) AND DivArrDelay BETWEEN 75 AND 161 AND AirlineID <= 19930 ORDER BY DistanceGroup, DestAirportSeqID, ArrDel15 LIMIT 21","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE WeatherDelay NOT IN (2, 319, 15) AND DivArrDelay BETWEEN 75 AND 161 AND AirlineID <= 19930 ORDER BY DistanceGroup, DestAirportSeqID, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, Cancelled, CancellationCode FROM mytable WHERE DepTime BETWEEN 735 AND 1933 LIMIT 15"}
 {"sql":"SELECT MAX(Quarter), MAX(FlightNum) FROM mytable LIMIT 8"}
 {"sql":"SELECT ArrDel15, OriginStateName, MIN(ArrivalDelayGroups) FROM mytable WHERE WheelsOff <= 1542 AND CRSElapsedTime BETWEEN 198 AND 277 AND DayOfWeek >= 7 GROUP BY ArrDel15, OriginStateName","hsqls":["SELECT ArrDel15, OriginStateName, MIN(ArrivalDelayGroups) FROM mytable WHERE WheelsOff <= 1542 AND CRSElapsedTime BETWEEN 198 AND 277 AND DayOfWeek >= 7 GROUP BY ArrDel15, OriginStateName"]}
 {"sql":"SELECT DivReachedDest, COUNT(OriginWac) FROM mytable WHERE Flights NOT IN (1) OR DepTimeBlk IN ('0700-0759') GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 29","hsqls":["SELECT DivReachedDest, COUNT(OriginWac) FROM mytable WHERE Flights NOT IN (1) OR DepTimeBlk IN ('0700-0759') GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 29"]}
-{"sql":"SELECT AVG(\"Month\"), MIN(DepartureDelayGroups) FROM mytable LIMIT 16","hsqls":["SELECT AVG(Month), MIN(DepartureDelayGroups) FROM mytable LIMIT 16"]}
+{"sql":"SELECT AVG(\"Month\"), MIN(DepartureDelayGroups) FROM mytable LIMIT 16","hsqls":["SELECT AVG(`Month`), MIN(DepartureDelayGroups) FROM mytable LIMIT 16"]}
 {"sql":"SELECT DivDistance, Quarter, Dest, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) GROUP BY DivDistance, Quarter, Dest  ORDER BY DivDistance, Quarter, Dest LIMIT 25","hsqls":["SELECT DivDistance, Quarter, Dest, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) GROUP BY DivDistance, Quarter, Dest  ORDER BY DivDistance, Quarter, Dest LIMIT 25"]}
 {"sql":"SELECT Flights, OriginStateName, COUNT(OriginAirportSeqID), MAX(DistanceGroup), SUM(CRSElapsedTime) FROM mytable GROUP BY Flights, OriginStateName  ORDER BY Flights, OriginStateName LIMIT 29","hsqls":["SELECT Flights, OriginStateName, COUNT(OriginAirportSeqID), MAX(DistanceGroup), SUM(CRSElapsedTime) FROM mytable GROUP BY Flights, OriginStateName  ORDER BY Flights, OriginStateName LIMIT 29"]}
-{"sql":"SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE DestState <> 'OR' OR DivActualElapsedTime >= 779 AND Carrier <= 'B6' ORDER BY WheelsOff, TailNum LIMIT 3","hsqls":["SELECT FirstDepTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DestState <> 'OR' OR DivActualElapsedTime >= 779 AND Carrier <= 'B6' ORDER BY WheelsOff, TailNum LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE DestState <> 'OR' OR DivActualElapsedTime >= 779 AND Carrier <= 'B6' ORDER BY WheelsOff, TailNum LIMIT 3","hsqls":["SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE DestState <> 'OR' OR DivActualElapsedTime >= 779 AND Carrier <= 'B6' ORDER BY WheelsOff, TailNum LIMIT 10000"]}
 {"sql":"SELECT Diverted, OriginCityName FROM mytable WHERE DepDel15 <= 1 ORDER BY Diverted, FirstDepTime LIMIT 3"}
-{"sql":"SELECT OriginWac, DivAirportLandings, COUNT(DepTime) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 1 OR DivWheelsOffs < 1734 GROUP BY OriginWac, DivAirportLandings LIMIT 29","hsqls":["SELECT OriginWac, DivAirportLandings, COUNT(DepTime) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 1 OR (DivWheelsOffs__MV0 < 1734 OR DivWheelsOffs__MV1 < 1734 OR DivWheelsOffs__MV2 < 1734 OR DivWheelsOffs__MV3 < 1734 OR DivWheelsOffs__MV4 < 1734) GROUP BY OriginWac, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT OriginWac, DivAirportLandings, COUNT(DepTime) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 1 OR DivWheelsOffs < 1734 GROUP BY OriginWac, DivAirportLandings LIMIT 29","hsqls":["SELECT OriginWac, DivAirportLandings, COUNT(DepTime) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 1 OR (DivWheelsOffs[1] < 1734 OR DivWheelsOffs[2] < 1734 OR DivWheelsOffs[3] < 1734 OR DivWheelsOffs[4] < 1734 OR DivWheelsOffs[5] < 1734) GROUP BY OriginWac, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DestState, SUM(AirTime), MIN(NASDelay), MAX(ArrDelayMinutes) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 19","hsqls":["SELECT DestState, SUM(AirTime), MIN(NASDelay), MAX(ArrDelayMinutes) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 19"]}
 {"sql":"SELECT Distance, Cancelled, AVG(DayOfWeek), AVG(DayofMonth), MAX(DestCityMarketID) FROM mytable WHERE DepTime BETWEEN 2133 AND 1603 GROUP BY Distance, Cancelled  ORDER BY Distance, Cancelled LIMIT 5","hsqls":["SELECT Distance, Cancelled, AVG(DayOfWeek), AVG(DayofMonth), MAX(DestCityMarketID) FROM mytable WHERE DepTime BETWEEN 2133 AND 1603 GROUP BY Distance, Cancelled  ORDER BY Distance, Cancelled LIMIT 5"]}
-{"sql":"SELECT OriginState, LongestAddGTime, FlightNum FROM mytable WHERE DivTotalGTimes BETWEEN 57 AND 107 AND DivWheelsOffs BETWEEN 1127 AND 1907 ORDER BY OriginCityMarketID, ArrDel15 LIMIT 1","hsqls":["SELECT OriginState, LongestAddGTime, FlightNum FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 57 AND 107 OR DivTotalGTimes__MV1 BETWEEN 57 AND 107 OR DivTotalGTimes__MV2 BETWEEN 57 AND 107 OR DivTotalGTimes__MV3 BETWEEN 57 AND 107 OR DivTotalGTimes__MV4 BETWEEN 57 AND 107) AND (DivWheelsOffs__MV0 BETWEEN 1127 AND 1907 OR DivWheelsOffs__MV1 BETWEEN 1127 AND 1907 OR DivWheelsOffs__MV2 BETWEEN 1127 AND 1907 OR DivWheelsOffs__MV3 BETWEEN 1127 AND 1907 OR DivWheelsOffs__MV4 BETWEEN 1127 AND 1907) ORDER BY OriginCityMarketID, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT OriginState, LongestAddGTime, FlightNum FROM mytable WHERE DivTotalGTimes BETWEEN 57 AND 107 AND DivWheelsOffs BETWEEN 1127 AND 1907 ORDER BY OriginCityMarketID, ArrDel15 LIMIT 1","hsqls":["SELECT OriginState, LongestAddGTime, FlightNum FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 57 AND 107 OR DivTotalGTimes[2] BETWEEN 57 AND 107 OR DivTotalGTimes[3] BETWEEN 57 AND 107 OR DivTotalGTimes[4] BETWEEN 57 AND 107 OR DivTotalGTimes[5] BETWEEN 57 AND 107) AND (DivWheelsOffs[1] BETWEEN 1127 AND 1907 OR DivWheelsOffs[2] BETWEEN 1127 AND 1907 OR DivWheelsOffs[3] BETWEEN 1127 AND 1907 OR DivWheelsOffs[4] BETWEEN 1127 AND 1907 OR DivWheelsOffs[5] BETWEEN 1127 AND 1907) ORDER BY OriginCityMarketID, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, MAX(CarrierDelay), SUM(DivActualElapsedTime), MIN(ArrivalDelayGroups) FROM mytable WHERE CRSDepTime IN (702, 2250) GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 16","hsqls":["SELECT DayofMonth, MAX(CarrierDelay), SUM(DivActualElapsedTime), MIN(ArrivalDelayGroups) FROM mytable WHERE CRSDepTime IN (702, 2250) GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 16"]}
 {"sql":"SELECT DivReachedDest, FlightNum, Origin, AVG(LongestAddGTime), MAX(TotalAddGTime), COUNT(DestStateName) FROM mytable WHERE DistanceGroup BETWEEN 8 AND 1 OR Distance BETWEEN 458 AND 551 AND CRSElapsedTime BETWEEN 318 AND 98 GROUP BY DivReachedDest, FlightNum, Origin  ORDER BY DivReachedDest, FlightNum, Origin LIMIT 3","hsqls":["SELECT DivReachedDest, FlightNum, Origin, AVG(LongestAddGTime), MAX(TotalAddGTime), COUNT(DestStateName) FROM mytable WHERE DistanceGroup BETWEEN 8 AND 1 OR Distance BETWEEN 458 AND 551 AND CRSElapsedTime BETWEEN 318 AND 98 GROUP BY DivReachedDest, FlightNum, Origin  ORDER BY DivReachedDest, FlightNum, Origin LIMIT 3"]}
 {"sql":"SELECT Distance, Dest, SUM(DepDelay) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 OR Carrier IN ('EV', 'WN', 'OO') OR DepTime IN (935, 1853, 619, 1438) GROUP BY Distance, Dest  ORDER BY Distance, Dest LIMIT 15","hsqls":["SELECT Distance, Dest, SUM(DepDelay) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 OR Carrier IN ('EV', 'WN', 'OO') OR DepTime IN (935, 1853, 619, 1438) GROUP BY Distance, Dest  ORDER BY Distance, Dest LIMIT 15"]}
-{"sql":"SELECT DivWheelsOns, FlightNum FROM mytable WHERE LateAircraftDelay NOT IN (135, 20, 74) LIMIT 6","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, FlightNum FROM mytable WHERE LateAircraftDelay NOT IN (135, 20, 74) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, FlightNum FROM mytable WHERE LateAircraftDelay NOT IN (135, 20, 74) LIMIT 6","hsqls":["SELECT DivWheelsOns, FlightNum FROM mytable WHERE LateAircraftDelay NOT IN (135, 20, 74) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 903 AND 639 OR DestState BETWEEN 'VA' AND 'MI' OR OriginCityName IN ('Dothan, AL') LIMIT 19"}
 {"sql":"SELECT Carrier, DivActualElapsedTime, AVG(DivReachedDest), SUM(ArrivalDelayGroups) FROM mytable GROUP BY Carrier, DivActualElapsedTime  ORDER BY Carrier, DivActualElapsedTime LIMIT 12","hsqls":["SELECT Carrier, DivActualElapsedTime, AVG(DivReachedDest), SUM(ArrivalDelayGroups) FROM mytable GROUP BY Carrier, DivActualElapsedTime  ORDER BY Carrier, DivActualElapsedTime LIMIT 12"]}
 {"sql":"SELECT TailNum FROM mytable WHERE WheelsOff >= 704 ORDER BY TaxiOut LIMIT 16"}
 {"sql":"SELECT Quarter, DestStateFips, DayOfWeek FROM mytable WHERE Origin BETWEEN 'CID' AND 'CPR' ORDER BY TailNum, DaysSinceEpoch LIMIT 2"}
 {"sql":"SELECT \"Year\", Diverted, COUNT(FirstDepTime), MIN(DestAirportSeqID), COUNT(FlightDate) FROM mytable WHERE CancellationCode NOT IN ('A', 'noodles') GROUP BY \"Year\", Diverted LIMIT 10","hsqls":["SELECT Year, Diverted, COUNT(FirstDepTime), MIN(DestAirportSeqID), COUNT(FlightDate) FROM mytable WHERE CancellationCode NOT IN ('A', 'noodles') GROUP BY Year, Diverted LIMIT 10"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE Diverted = 0 AND SecurityDelay NOT IN (1, 18) OR OriginStateName <= 'Nevada' ORDER BY DestState, Flights LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE Diverted = 0 AND SecurityDelay NOT IN (1, 18) OR OriginStateName <= 'Nevada' ORDER BY DestState, Flights LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE Diverted = 0 AND SecurityDelay NOT IN (1, 18) OR OriginStateName <= 'Nevada' ORDER BY DestState, Flights LIMIT 2","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE Diverted = 0 AND SecurityDelay NOT IN (1, 18) OR OriginStateName <= 'Nevada' ORDER BY DestState, Flights LIMIT 10000"]}
 {"sql":"SELECT \"Year\", MIN(DestAirportID), MIN(DepTime), MAX(FlightNum) FROM mytable WHERE TaxiIn NOT IN (127) GROUP BY \"Year\"","hsqls":["SELECT Year, MIN(DestAirportID), MIN(DepTime), MAX(FlightNum) FROM mytable WHERE TaxiIn NOT IN (127) GROUP BY Year"]}
 {"sql":"SELECT DivReachedDest, DestWac, DivActualElapsedTime FROM mytable WHERE DepTimeBlk IN ('2200-2259', '0700-0759', '0800-0859', '1400-1459', '1800-1859') OR CRSElapsedTime >= 196 OR AirTime BETWEEN 163 AND 251 ORDER BY WheelsOn, ArrivalDelayGroups LIMIT 7"}
-{"sql":"SELECT DivWheelsOns, WeatherDelay, DestCityName FROM mytable ORDER BY ArrivalDelayGroups LIMIT 18","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, WeatherDelay, DestCityName FROM mytable ORDER BY ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivWheelsOffs, OriginWac FROM mytable WHERE DivLongestGTimes IN (102.0, 21.0, 42.0, 62.0) ORDER BY Flights, DepTimeBlk, AirlineID LIMIT 13","hsqls":["SELECT DestWac, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, OriginWac FROM mytable WHERE (DivLongestGTimes__MV0 IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes__MV1 IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes__MV2 IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes__MV3 IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes__MV4 IN (102.0, 21.0, 42.0, 62.0)) ORDER BY Flights, DepTimeBlk, AirlineID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, WeatherDelay, DestCityName FROM mytable ORDER BY ArrivalDelayGroups LIMIT 18","hsqls":["SELECT DivWheelsOns, WeatherDelay, DestCityName FROM mytable ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivWheelsOffs, OriginWac FROM mytable WHERE DivLongestGTimes IN (102.0, 21.0, 42.0, 62.0) ORDER BY Flights, DepTimeBlk, AirlineID LIMIT 13","hsqls":["SELECT DestWac, DivWheelsOffs, OriginWac FROM mytable WHERE (DivLongestGTimes[1] IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes[2] IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes[3] IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes[4] IN (102.0, 21.0, 42.0, 62.0) OR DivLongestGTimes[5] IN (102.0, 21.0, 42.0, 62.0)) ORDER BY Flights, DepTimeBlk, AirlineID LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, UniqueCarrier FROM mytable WHERE CarrierDelay < 170 ORDER BY FirstDepTime, CarrierDelay, DepTime LIMIT 5"}
 {"sql":"SELECT DepDelay FROM mytable WHERE DestAirportID IN (12982, 12339, 14698, 10620) ORDER BY DivAirportLandings LIMIT 11"}
 {"sql":"SELECT SUM(AirlineID), MIN(OriginCityMarketID) FROM mytable LIMIT 1"}
 {"sql":"SELECT AirlineID FROM mytable WHERE OriginAirportSeqID IN (1281902, 1071302) OR DivReachedDest BETWEEN 0 AND 1 OR DepartureDelayGroups IN (-2, 4, 9) LIMIT 16"}
 {"sql":"SELECT FirstDepTime, FlightNum, SecurityDelay FROM mytable WHERE DivArrDelay <> 328 AND OriginStateName >= 'U.S. Pacific Trust Territories and Possessions' OR Diverted BETWEEN 0 AND 0 LIMIT 24"}
-{"sql":"SELECT DistanceGroup, Flights, DivTailNums FROM mytable WHERE Origin NOT IN ('GRR', 'GEG', 'MHT', 'EKO') AND Cancelled BETWEEN 0 AND 0 AND ArrTime IN (1002, 22, 1723, 1449) ORDER BY DivReachedDest LIMIT 13","hsqls":["SELECT DistanceGroup, Flights, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Origin NOT IN ('GRR', 'GEG', 'MHT', 'EKO') AND Cancelled BETWEEN 0 AND 0 AND ArrTime IN (1002, 22, 1723, 1449) ORDER BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, Flights, DivTailNums FROM mytable WHERE Origin NOT IN ('GRR', 'GEG', 'MHT', 'EKO') AND Cancelled BETWEEN 0 AND 0 AND ArrTime IN (1002, 22, 1723, 1449) ORDER BY DivReachedDest LIMIT 13","hsqls":["SELECT DistanceGroup, Flights, DivTailNums FROM mytable WHERE Origin NOT IN ('GRR', 'GEG', 'MHT', 'EKO') AND Cancelled BETWEEN 0 AND 0 AND ArrTime IN (1002, 22, 1723, 1449) ORDER BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, OriginStateName FROM mytable ORDER BY FlightDate LIMIT 9"}
-{"sql":"SELECT DestWac, ArrTime, DaysSinceEpoch FROM mytable WHERE TailNum BETWEEN 'N708EV' AND 'N3CEAA' OR DivAirportSeqIDs IN (1014002, 1142303, 1013603, 1383002) ORDER BY OriginStateName LIMIT 4","hsqls":["SELECT DestWac, ArrTime, DaysSinceEpoch FROM mytable WHERE TailNum BETWEEN 'N708EV' AND 'N3CEAA' OR (DivAirportSeqIDs__MV0 IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs__MV1 IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs__MV2 IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs__MV3 IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs__MV4 IN (1014002, 1142303, 1013603, 1383002)) ORDER BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestWac, ArrTime, DaysSinceEpoch FROM mytable WHERE TailNum BETWEEN 'N708EV' AND 'N3CEAA' OR DivAirportSeqIDs IN (1014002, 1142303, 1013603, 1383002) ORDER BY OriginStateName LIMIT 4","hsqls":["SELECT DestWac, ArrTime, DaysSinceEpoch FROM mytable WHERE TailNum BETWEEN 'N708EV' AND 'N3CEAA' OR (DivAirportSeqIDs[1] IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs[2] IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs[3] IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs[4] IN (1014002, 1142303, 1013603, 1383002) OR DivAirportSeqIDs[5] IN (1014002, 1142303, 1013603, 1383002)) ORDER BY OriginStateName LIMIT 10000"]}
 {"sql":"SELECT OriginState, NASDelay, DestCityMarketID, COUNT(*) FROM mytable WHERE DivAirportLandings > 9 OR TaxiIn IN (95, 73, 38) AND DayofMonth <> 19 GROUP BY OriginState, NASDelay, DestCityMarketID","hsqls":["SELECT OriginState, NASDelay, DestCityMarketID, COUNT(*) FROM mytable WHERE DivAirportLandings > 9 OR TaxiIn IN (95, 73, 38) AND DayofMonth <> 19 GROUP BY OriginState, NASDelay, DestCityMarketID"]}
 {"sql":"SELECT Carrier, DepTime, TaxiIn, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1400-1459' AND '1900-1959' OR DayofMonth >= 12 GROUP BY Carrier, DepTime, TaxiIn  ORDER BY Carrier, DepTime, TaxiIn LIMIT 7","hsqls":["SELECT Carrier, DepTime, TaxiIn, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1400-1459' AND '1900-1959' OR DayofMonth >= 12 GROUP BY Carrier, DepTime, TaxiIn  ORDER BY Carrier, DepTime, TaxiIn LIMIT 7"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiOut NOT IN (48, 122, 16) LIMIT 17"}
 {"sql":"SELECT Diverted, DayofMonth, AVG(ArrDelay), COUNT(DepTime) FROM mytable WHERE WeatherDelay IN (46) GROUP BY Diverted, DayofMonth","hsqls":["SELECT Diverted, DayofMonth, AVG(ArrDelay), COUNT(DepTime) FROM mytable WHERE WeatherDelay IN (46) GROUP BY Diverted, DayofMonth"]}
 {"sql":"SELECT DepDelayMinutes, FlightNum, ArrDel15 FROM mytable WHERE OriginState NOT IN ('MO', 'NV', 'WV') OR DivArrDelay <> 222 OR WheelsOff BETWEEN 603 AND 1913 ORDER BY WheelsOff, FirstDepTime, ArrDelay LIMIT 10"}
-{"sql":"SELECT DivLongestGTimes, AirlineID, DivTotalGTimes FROM mytable WHERE WheelsOff IN (1859, 2032, 621, 2338) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') LIMIT 11","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, AirlineID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE WheelsOff IN (1859, 2032, 621, 2338) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, AirlineID, DivTotalGTimes FROM mytable WHERE WheelsOff IN (1859, 2032, 621, 2338) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') LIMIT 11","hsqls":["SELECT DivLongestGTimes, AirlineID, DivTotalGTimes FROM mytable WHERE WheelsOff IN (1859, 2032, 621, 2338) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, TailNum FROM mytable WHERE Cancelled <= 0 OR CRSElapsedTime BETWEEN 185 AND 280 ORDER BY Diverted, SecurityDelay, DestCityName LIMIT 9"}
 {"sql":"SELECT DepTimeBlk, MAX(ArrDelay), MIN(FlightNum), MAX(CRSDepTime) FROM mytable WHERE ArrTime BETWEEN 1348 AND 2344 OR ArrivalDelayGroups <= 9 OR DestAirportID NOT IN (14698, 10397) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 26","hsqls":["SELECT DepTimeBlk, MAX(ArrDelay), MIN(FlightNum), MAX(CRSDepTime) FROM mytable WHERE ArrTime BETWEEN 1348 AND 2344 OR ArrivalDelayGroups <= 9 OR DestAirportID NOT IN (14698, 10397) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 26"]}
 {"sql":"SELECT DistanceGroup, AirlineID FROM mytable ORDER BY TaxiOut, \"Year\", DivAirportLandings LIMIT 11","hsqls":["SELECT DistanceGroup, AirlineID FROM mytable ORDER BY TaxiOut, Year, DivAirportLandings LIMIT 11"]}
@@ -1509,13 +1509,13 @@
 {"sql":"SELECT SUM(DivReachedDest) FROM mytable WHERE Flights BETWEEN 1 AND 1 AND CarrierDelay NOT IN (46) AND DivAirportLandings BETWEEN 9 AND 1 LIMIT 28"}
 {"sql":"SELECT LateAircraftDelay, TaxiIn, ArrDel15, MAX(WheelsOn), MAX(ArrivalDelayGroups), SUM(FlightNum) FROM mytable WHERE DistanceGroup BETWEEN 10 AND 8 GROUP BY LateAircraftDelay, TaxiIn, ArrDel15  ORDER BY LateAircraftDelay, TaxiIn, ArrDel15 LIMIT 2","hsqls":["SELECT LateAircraftDelay, TaxiIn, ArrDel15, MAX(WheelsOn), MAX(ArrivalDelayGroups), SUM(FlightNum) FROM mytable WHERE DistanceGroup BETWEEN 10 AND 8 GROUP BY LateAircraftDelay, TaxiIn, ArrDel15  ORDER BY LateAircraftDelay, TaxiIn, ArrDel15 LIMIT 2"]}
 {"sql":"SELECT UniqueCarrier, MAX(WheelsOn), SUM(DestAirportSeqID) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 19","hsqls":["SELECT UniqueCarrier, MAX(WheelsOn), SUM(DestAirportSeqID) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 19"]}
-{"sql":"SELECT DepDelayMinutes, \"Month\" FROM mytable WHERE DepDel15 IN (-9999) AND TaxiIn < 21 ORDER BY DepDelay, ArrTime LIMIT 16","hsqls":["SELECT DepDelayMinutes, Month FROM mytable WHERE DepDel15 IN (-9999) AND TaxiIn < 21 ORDER BY DepDelay, ArrTime LIMIT 16"]}
+{"sql":"SELECT DepDelayMinutes, \"Month\" FROM mytable WHERE DepDel15 IN (-9999) AND TaxiIn < 21 ORDER BY DepDelay, ArrTime LIMIT 16","hsqls":["SELECT DepDelayMinutes, `Month` FROM mytable WHERE DepDel15 IN (-9999) AND TaxiIn < 21 ORDER BY DepDelay, ArrTime LIMIT 16"]}
 {"sql":"SELECT Distance, DivArrDelay, AVG(Quarter), MAX(CRSElapsedTime) FROM mytable GROUP BY Distance, DivArrDelay  ORDER BY Distance, DivArrDelay LIMIT 13","hsqls":["SELECT Distance, DivArrDelay, AVG(Quarter), MAX(CRSElapsedTime) FROM mytable GROUP BY Distance, DivArrDelay  ORDER BY Distance, DivArrDelay LIMIT 13"]}
 {"sql":"SELECT Flights, ArrDelayMinutes, AVG(WeatherDelay), COUNT(Quarter) FROM mytable WHERE Dest BETWEEN 'DBQ' AND 'LAR' AND NASDelay BETWEEN 34 AND 56 AND TaxiOut IN (80) GROUP BY Flights, ArrDelayMinutes  ORDER BY Flights, ArrDelayMinutes LIMIT 24","hsqls":["SELECT Flights, ArrDelayMinutes, AVG(WeatherDelay), COUNT(Quarter) FROM mytable WHERE Dest BETWEEN 'DBQ' AND 'LAR' AND NASDelay BETWEEN 34 AND 56 AND TaxiOut IN (80) GROUP BY Flights, ArrDelayMinutes  ORDER BY Flights, ArrDelayMinutes LIMIT 24"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelay > 9.0 AND DepDelay BETWEEN 17.0 AND 146.0 LIMIT 10"}
 {"sql":"SELECT DepTimeBlk, AVG(OriginWac), MAX(LateAircraftDelay), MIN(AirlineID) FROM mytable WHERE OriginAirportID NOT IN (11648, 12217) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 17","hsqls":["SELECT DepTimeBlk, AVG(OriginWac), MAX(LateAircraftDelay), MIN(AirlineID) FROM mytable WHERE OriginAirportID NOT IN (11648, 12217) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 17"]}
 {"sql":"SELECT DestCityName, DivActualElapsedTime FROM mytable LIMIT 27"}
-{"sql":"SELECT DestState, SecurityDelay, DivTailNums FROM mytable ORDER BY FlightNum LIMIT 22","hsqls":["SELECT DestState, SecurityDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT DestState, SecurityDelay, DivTailNums FROM mytable ORDER BY FlightNum LIMIT 22","hsqls":["SELECT DestState, SecurityDelay, DivTailNums FROM mytable ORDER BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT DepTime, OriginWac, WheelsOn FROM mytable LIMIT 1"}
 {"sql":"SELECT MIN(LateAircraftDelay) FROM mytable WHERE DestState BETWEEN 'NJ' AND 'TN' OR DepDel15 > -9999 OR OriginCityName BETWEEN 'Gulfport/Biloxi, MS' AND 'West Palm Beach/Palm Beach, FL' LIMIT 9"}
 {"sql":"SELECT LateAircraftDelay, DepTime, TailNum, MIN(ActualElapsedTime), MIN(Cancelled), COUNT(CRSArrTime) FROM mytable WHERE NASDelay BETWEEN 53 AND 99 OR UniqueCarrier BETWEEN 'F9' AND 'HA' GROUP BY LateAircraftDelay, DepTime, TailNum  ORDER BY LateAircraftDelay, DepTime, TailNum LIMIT 6","hsqls":["SELECT LateAircraftDelay, DepTime, TailNum, MIN(ActualElapsedTime), MIN(Cancelled), COUNT(CRSArrTime) FROM mytable WHERE NASDelay BETWEEN 53 AND 99 OR UniqueCarrier BETWEEN 'F9' AND 'HA' GROUP BY LateAircraftDelay, DepTime, TailNum  ORDER BY LateAircraftDelay, DepTime, TailNum LIMIT 6"]}
@@ -1524,38 +1524,38 @@
 {"sql":"SELECT DestStateFips, OriginStateName FROM mytable ORDER BY DestWac, DestStateFips, CRSElapsedTime LIMIT 4"}
 {"sql":"SELECT Distance FROM mytable WHERE DestWac BETWEEN 22 AND 5 LIMIT 19"}
 {"sql":"SELECT MIN(Diverted), MAX(DistanceGroup), AVG(Diverted) FROM mytable WHERE DivDistance IN (850, 54) LIMIT 19"}
-{"sql":"SELECT COUNT(\"Month\"), SUM(OriginAirportSeqID), MIN(AirlineID) FROM mytable WHERE DivTailNums <= 'N530MQ' AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 2","hsqls":["SELECT COUNT(Month), SUM(OriginAirportSeqID), MIN(AirlineID)  FROM mytable WHERE (DivTailNums__MV0 <= 'N530MQ' OR DivTailNums__MV1 <= 'N530MQ' OR DivTailNums__MV2 <= 'N530MQ' OR DivTailNums__MV3 <= 'N530MQ' OR DivTailNums__MV4 <= 'N530MQ') AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 10000"]}
+{"sql":"SELECT COUNT(\"Month\"), SUM(OriginAirportSeqID), MIN(AirlineID) FROM mytable WHERE DivTailNums <= 'N530MQ' AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 2","hsqls":["SELECT COUNT(`Month`), SUM(OriginAirportSeqID), MIN(AirlineID)  FROM mytable WHERE (DivTailNums[1] <= 'N530MQ' OR DivTailNums[2] <= 'N530MQ' OR DivTailNums[3] <= 'N530MQ' OR DivTailNums[4] <= 'N530MQ' OR DivTailNums[5] <= 'N530MQ') AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, COUNT(*) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 27","hsqls":["SELECT DepDelayMinutes, COUNT(*) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 27"]}
 {"sql":"SELECT DivActualElapsedTime, OriginStateName FROM mytable WHERE DepTime NOT IN (1814, 847, 1930, 810) OR OriginStateName <> 'U.S. Virgin Islands' AND DestState BETWEEN 'KY' AND 'OH' ORDER BY DistanceGroup, ActualElapsedTime, DepTimeBlk LIMIT 27"}
-{"sql":"SELECT Flights, FlightDate, DestStateFips FROM mytable WHERE DestState NOT IN ('TN', 'WA', 'VA', 'PR', 'AR') OR DivReachedDest = -9999 ORDER BY Distance, DepTimeBlk, \"Month\" LIMIT 27","hsqls":["SELECT Flights, FlightDate, DestStateFips FROM mytable WHERE DestState NOT IN ('TN', 'WA', 'VA', 'PR', 'AR') OR DivReachedDest = -9999 ORDER BY Distance, DepTimeBlk, Month LIMIT 27"]}
+{"sql":"SELECT Flights, FlightDate, DestStateFips FROM mytable WHERE DestState NOT IN ('TN', 'WA', 'VA', 'PR', 'AR') OR DivReachedDest = -9999 ORDER BY Distance, DepTimeBlk, \"Month\" LIMIT 27","hsqls":["SELECT Flights, FlightDate, DestStateFips FROM mytable WHERE DestState NOT IN ('TN', 'WA', 'VA', 'PR', 'AR') OR DivReachedDest = -9999 ORDER BY Distance, DepTimeBlk, `Month` LIMIT 27"]}
 {"sql":"SELECT CRSArrTime, MAX(OriginStateFips) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 4","hsqls":["SELECT CRSArrTime, MAX(OriginStateFips) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 4"]}
 {"sql":"SELECT CarrierDelay, Origin, OriginWac FROM mytable WHERE CancellationCode IN ('B') ORDER BY DepDelay, TotalAddGTime, DivAirportLandings LIMIT 16"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE TailNum > 'N3KCAA' OR Diverted NOT IN (1, 0) ORDER BY DistanceGroup, DestCityName LIMIT 4"}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE Flights < 1 LIMIT 8"}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE DivWheelsOffs IN (2144) AND ArrDel15 >= 0 OR CarrierDelay BETWEEN 61 AND 68 ORDER BY OriginState LIMIT 4","hsqls":["SELECT WeatherDelay FROM mytable WHERE (DivWheelsOffs__MV0 IN (2144) OR DivWheelsOffs__MV1 IN (2144) OR DivWheelsOffs__MV2 IN (2144) OR DivWheelsOffs__MV3 IN (2144) OR DivWheelsOffs__MV4 IN (2144)) AND ArrDel15 >= 0 OR CarrierDelay BETWEEN 61 AND 68 ORDER BY OriginState LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE DivWheelsOffs IN (2144) AND ArrDel15 >= 0 OR CarrierDelay BETWEEN 61 AND 68 ORDER BY OriginState LIMIT 4","hsqls":["SELECT WeatherDelay FROM mytable WHERE (DivWheelsOffs[1] IN (2144) OR DivWheelsOffs[2] IN (2144) OR DivWheelsOffs[3] IN (2144) OR DivWheelsOffs[4] IN (2144) OR DivWheelsOffs[5] IN (2144)) AND ArrDel15 >= 0 OR CarrierDelay BETWEEN 61 AND 68 ORDER BY OriginState LIMIT 10000"]}
 {"sql":"SELECT MAX(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 85 AND 113 LIMIT 9"}
 {"sql":"SELECT DivAirportLandings, SUM(Flights), COUNT(LateAircraftDelay) FROM mytable WHERE Distance IN (1389) GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 15","hsqls":["SELECT DivAirportLandings, SUM(Flights), COUNT(LateAircraftDelay) FROM mytable WHERE Distance IN (1389) GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 15"]}
-{"sql":"SELECT FlightNum FROM mytable WHERE Flights NOT IN (1) AND DivWheelsOffs >= 123 OR \"Month\" IN (1) LIMIT 24","hsqls":["SELECT FlightNum FROM mytable WHERE Flights NOT IN (1) AND (DivWheelsOffs__MV0 >= 123 OR DivWheelsOffs__MV1 >= 123 OR DivWheelsOffs__MV2 >= 123 OR DivWheelsOffs__MV3 >= 123 OR DivWheelsOffs__MV4 >= 123) OR Month IN (1) LIMIT 10000"]}
-{"sql":"SELECT OriginState, DestAirportSeqID, TaxiIn, COUNT(*) FROM mytable WHERE DivTotalGTimes IN (3, 79, 128, 123, 34) OR CRSDepTime < 2142 GROUP BY OriginState, DestAirportSeqID, TaxiIn","hsqls":["SELECT OriginState, DestAirportSeqID, TaxiIn, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 IN (3, 79, 128, 123, 34) OR DivTotalGTimes__MV1 IN (3, 79, 128, 123, 34) OR DivTotalGTimes__MV2 IN (3, 79, 128, 123, 34) OR DivTotalGTimes__MV3 IN (3, 79, 128, 123, 34) OR DivTotalGTimes__MV4 IN (3, 79, 128, 123, 34)) OR CRSDepTime < 2142 GROUP BY OriginState, DestAirportSeqID, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT FlightNum FROM mytable WHERE Flights NOT IN (1) AND DivWheelsOffs >= 123 OR \"Month\" IN (1) LIMIT 24","hsqls":["SELECT FlightNum FROM mytable WHERE Flights NOT IN (1) AND (DivWheelsOffs[1] >= 123 OR DivWheelsOffs[2] >= 123 OR DivWheelsOffs[3] >= 123 OR DivWheelsOffs[4] >= 123 OR DivWheelsOffs[5] >= 123) OR `Month` IN (1) LIMIT 10000"]}
+{"sql":"SELECT OriginState, DestAirportSeqID, TaxiIn, COUNT(*) FROM mytable WHERE DivTotalGTimes IN (3, 79, 128, 123, 34) OR CRSDepTime < 2142 GROUP BY OriginState, DestAirportSeqID, TaxiIn","hsqls":["SELECT OriginState, DestAirportSeqID, TaxiIn, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] IN (3, 79, 128, 123, 34) OR DivTotalGTimes[2] IN (3, 79, 128, 123, 34) OR DivTotalGTimes[3] IN (3, 79, 128, 123, 34) OR DivTotalGTimes[4] IN (3, 79, 128, 123, 34) OR DivTotalGTimes[5] IN (3, 79, 128, 123, 34)) OR CRSDepTime < 2142 GROUP BY OriginState, DestAirportSeqID, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT SUM(WeatherDelay) FROM mytable WHERE DepDelay BETWEEN 334.0 AND 259.0 AND FlightNum IN (5575, 6268, 5441) OR DayOfWeek BETWEEN 6 AND 3 LIMIT 6"}
-{"sql":"SELECT DepDelayMinutes, COUNT(DivDistance), AVG(DivArrDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DepDelayMinutes LIMIT 14","hsqls":["SELECT DepDelayMinutes, COUNT(DivDistance), AVG(DivArrDelay) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DepDelayMinutes LIMIT 14"]}
+{"sql":"SELECT DepDelayMinutes, COUNT(DivDistance), AVG(DivArrDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DepDelayMinutes LIMIT 14","hsqls":["SELECT DepDelayMinutes, COUNT(DivDistance), AVG(DivArrDelay) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DivReachedDest BETWEEN 1 AND 0 GROUP BY DepDelayMinutes LIMIT 14"]}
 {"sql":"SELECT Carrier, Origin, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY Carrier, Origin, CRSElapsedTime  ORDER BY Carrier, Origin, CRSElapsedTime LIMIT 3","hsqls":["SELECT Carrier, Origin, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY Carrier, Origin, CRSElapsedTime  ORDER BY Carrier, Origin, CRSElapsedTime LIMIT 3"]}
 {"sql":"SELECT DepTimeBlk FROM mytable LIMIT 26"}
 {"sql":"SELECT DepDelay, TotalAddGTime, Cancelled FROM mytable ORDER BY OriginState, OriginCityMarketID, TaxiIn LIMIT 11"}
 {"sql":"SELECT DestState, CRSArrTime, CarrierDelay FROM mytable WHERE LateAircraftDelay BETWEEN 194 AND 327 ORDER BY OriginAirportID LIMIT 25"}
-{"sql":"SELECT DepartureDelayGroups, COUNT(OriginWac), MIN(Cancelled), COUNT(ArrDelay) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND Origin BETWEEN 'BTR' AND 'SLC' OR DivTotalGTimes < 57 GROUP BY DepartureDelayGroups LIMIT 6","hsqls":["SELECT DepartureDelayGroups, COUNT(OriginWac), MIN(Cancelled), COUNT(ArrDelay) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND Origin BETWEEN 'BTR' AND 'SLC' OR (DivTotalGTimes__MV0 < 57 OR DivTotalGTimes__MV1 < 57 OR DivTotalGTimes__MV2 < 57 OR DivTotalGTimes__MV3 < 57 OR DivTotalGTimes__MV4 < 57) GROUP BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, COUNT(OriginWac), MIN(Cancelled), COUNT(ArrDelay) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND Origin BETWEEN 'BTR' AND 'SLC' OR DivTotalGTimes < 57 GROUP BY DepartureDelayGroups LIMIT 6","hsqls":["SELECT DepartureDelayGroups, COUNT(OriginWac), MIN(Cancelled), COUNT(ArrDelay) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND Origin BETWEEN 'BTR' AND 'SLC' OR (DivTotalGTimes[1] < 57 OR DivTotalGTimes[2] < 57 OR DivTotalGTimes[3] < 57 OR DivTotalGTimes[4] < 57 OR DivTotalGTimes[5] < 57) GROUP BY DepartureDelayGroups LIMIT 10000"]}
 {"sql":"SELECT FlightNum, SUM(DivAirportLandings) FROM mytable WHERE OriginAirportSeqID <= 1084903 AND DestAirportSeqID BETWEEN 1013603 AND 1425603 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 7","hsqls":["SELECT FlightNum, SUM(DivAirportLandings) FROM mytable WHERE OriginAirportSeqID <= 1084903 AND DestAirportSeqID BETWEEN 1013603 AND 1425603 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 7"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes < 139.0 LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 < 139.0 OR DivLongestGTimes__MV1 < 139.0 OR DivLongestGTimes__MV2 < 139.0 OR DivLongestGTimes__MV3 < 139.0 OR DivLongestGTimes__MV4 < 139.0) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes < 139.0 LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] < 139.0 OR DivLongestGTimes[2] < 139.0 OR DivLongestGTimes[3] < 139.0 OR DivLongestGTimes[4] < 139.0 OR DivLongestGTimes[5] < 139.0) LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, ArrivalDelayGroups, DayOfWeek FROM mytable WHERE OriginAirportID BETWEEN 10994 AND 12402 AND WheelsOff BETWEEN 1351 AND 1022 AND Flights NOT IN (1) LIMIT 7"}
 {"sql":"SELECT \"Year\", DivDistance, SecurityDelay, COUNT(SecurityDelay), COUNT(DayofMonth), SUM(DepTime) FROM mytable WHERE DepDel15 BETWEEN 1 AND -9999 GROUP BY \"Year\", DivDistance, SecurityDelay LIMIT 11","hsqls":["SELECT Year, DivDistance, SecurityDelay, COUNT(SecurityDelay), COUNT(DayofMonth), SUM(DepTime) FROM mytable WHERE DepDel15 BETWEEN 1 AND -9999 GROUP BY Year, DivDistance, SecurityDelay LIMIT 11"]}
 {"sql":"SELECT Diverted, OriginStateFips, FirstDepTime, SUM(DivDistance) FROM mytable WHERE DestStateName BETWEEN 'South Dakota' AND 'South Carolina' AND DepDelayMinutes IN (101.0, 205.0, 188.0, 62.0) AND TotalAddGTime IN (148, 28) GROUP BY Diverted, OriginStateFips, FirstDepTime  ORDER BY Diverted, OriginStateFips, FirstDepTime LIMIT 29","hsqls":["SELECT Diverted, OriginStateFips, FirstDepTime, SUM(DivDistance) FROM mytable WHERE DestStateName BETWEEN 'South Dakota' AND 'South Carolina' AND DepDelayMinutes IN (101.0, 205.0, 188.0, 62.0) AND TotalAddGTime IN (148, 28) GROUP BY Diverted, OriginStateFips, FirstDepTime  ORDER BY Diverted, OriginStateFips, FirstDepTime LIMIT 29"]}
-{"sql":"SELECT TailNum, DivTailNums FROM mytable WHERE DivWheelsOns <= 1937 OR DepartureDelayGroups < 7 LIMIT 27","hsqls":["SELECT TailNum, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivWheelsOns__MV0 <= 1937 OR DivWheelsOns__MV1 <= 1937 OR DivWheelsOns__MV2 <= 1937 OR DivWheelsOns__MV3 <= 1937 OR DivWheelsOns__MV4 <= 1937) OR DepartureDelayGroups < 7 LIMIT 10000"]}
+{"sql":"SELECT TailNum, DivTailNums FROM mytable WHERE DivWheelsOns <= 1937 OR DepartureDelayGroups < 7 LIMIT 27","hsqls":["SELECT TailNum, DivTailNums FROM mytable WHERE (DivWheelsOns[1] <= 1937 OR DivWheelsOns[2] <= 1937 OR DivWheelsOns[3] <= 1937 OR DivWheelsOns[4] <= 1937 OR DivWheelsOns[5] <= 1937) OR DepartureDelayGroups < 7 LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState >= 'NM' LIMIT 27"}
 {"sql":"SELECT DestCityName, MAX(TaxiOut) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 12","hsqls":["SELECT DestCityName, MAX(TaxiOut) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 12"]}
 {"sql":"SELECT Dest FROM mytable WHERE Dest >= 'CRW' AND OriginStateFips NOT IN (35, 28, 38) ORDER BY DestState LIMIT 14"}
-{"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE DivAirportIDs IN (10666, 13871, 14843, 11122, 14027) AND Diverted NOT IN (1, 0) GROUP BY OriginStateFips LIMIT 21","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs__MV1 IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs__MV2 IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs__MV3 IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs__MV4 IN (10666, 13871, 14843, 11122, 14027)) AND Diverted NOT IN (1, 0) GROUP BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE DivAirportIDs IN (10666, 13871, 14843, 11122, 14027) AND Diverted NOT IN (1, 0) GROUP BY OriginStateFips LIMIT 21","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs[2] IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs[3] IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs[4] IN (10666, 13871, 14843, 11122, 14027) OR DivAirportIDs[5] IN (10666, 13871, 14843, 11122, 14027)) AND Diverted NOT IN (1, 0) GROUP BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID FROM mytable WHERE DestWac BETWEEN 84 AND 45 AND ArrTime > 840 ORDER BY Distance, NASDelay, ArrivalDelayGroups LIMIT 23"}
-{"sql":"SELECT LateAircraftDelay, Quarter, DivWheelsOffs FROM mytable ORDER BY DepDelayMinutes, SecurityDelay, AirTime LIMIT 25","hsqls":["SELECT LateAircraftDelay, Quarter, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY DepDelayMinutes, SecurityDelay, AirTime LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, Quarter, DivWheelsOffs FROM mytable ORDER BY DepDelayMinutes, SecurityDelay, AirTime LIMIT 25","hsqls":["SELECT LateAircraftDelay, Quarter, DivWheelsOffs FROM mytable ORDER BY DepDelayMinutes, SecurityDelay, AirTime LIMIT 10000"]}
 {"sql":"SELECT Flights, CRSDepTime, MAX(Flights), SUM(LateAircraftDelay), MAX(SecurityDelay) FROM mytable GROUP BY Flights, CRSDepTime  ORDER BY Flights, CRSDepTime LIMIT 8","hsqls":["SELECT Flights, CRSDepTime, MAX(Flights), SUM(LateAircraftDelay), MAX(SecurityDelay) FROM mytable GROUP BY Flights, CRSDepTime  ORDER BY Flights, CRSDepTime LIMIT 8"]}
 {"sql":"SELECT TaxiOut, DestCityName FROM mytable WHERE DepDelay <> 45.0 AND ArrDelay BETWEEN 145.0 AND 104.0 ORDER BY FlightDate, TaxiIn, Dest LIMIT 11"}
 {"sql":"SELECT COUNT(ArrivalDelayGroups) FROM mytable WHERE ArrDelayMinutes <= 238.0 LIMIT 17"}
@@ -1565,58 +1565,58 @@
 {"sql":"SELECT FirstDepTime FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) OR ArrTimeBlk <= '1400-1459' ORDER BY OriginAirportSeqID, SecurityDelay, CRSElapsedTime LIMIT 26"}
 {"sql":"SELECT DepDelay, DestAirportSeqID, OriginStateName, COUNT(*) FROM mytable GROUP BY DepDelay, DestAirportSeqID, OriginStateName  ORDER BY DepDelay, DestAirportSeqID, OriginStateName LIMIT 6","hsqls":["SELECT DepDelay, DestAirportSeqID, OriginStateName, COUNT(*) FROM mytable GROUP BY DepDelay, DestAirportSeqID, OriginStateName  ORDER BY DepDelay, DestAirportSeqID, OriginStateName LIMIT 6"]}
 {"sql":"SELECT OriginState FROM mytable WHERE OriginState IN ('VI', 'NE', 'HI', 'WV', 'PR') ORDER BY Dest, OriginStateName LIMIT 22"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 2","hsqls":["SELECT COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 LIMIT 2"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 2","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 LIMIT 2"]}
 {"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE FirstDepTime BETWEEN 1859 AND 1540 ORDER BY TaxiIn, Dest, DestAirportID LIMIT 10"}
 {"sql":"SELECT TaxiOut, ActualElapsedTime, TaxiIn, COUNT(Dest), COUNT(NASDelay), SUM(WeatherDelay) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY TaxiOut, ActualElapsedTime, TaxiIn  ORDER BY TaxiOut, ActualElapsedTime, TaxiIn LIMIT 20","hsqls":["SELECT TaxiOut, ActualElapsedTime, TaxiIn, COUNT(Dest), COUNT(NASDelay), SUM(WeatherDelay) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY TaxiOut, ActualElapsedTime, TaxiIn  ORDER BY TaxiOut, ActualElapsedTime, TaxiIn LIMIT 20"]}
 {"sql":"SELECT DivDistance, Cancelled, DaysSinceEpoch, COUNT(Quarter), MAX(DestStateFips), COUNT(TaxiOut) FROM mytable GROUP BY DivDistance, Cancelled, DaysSinceEpoch  ORDER BY DivDistance, Cancelled, DaysSinceEpoch LIMIT 22","hsqls":["SELECT DivDistance, Cancelled, DaysSinceEpoch, COUNT(Quarter), MAX(DestStateFips), COUNT(TaxiOut) FROM mytable GROUP BY DivDistance, Cancelled, DaysSinceEpoch  ORDER BY DivDistance, Cancelled, DaysSinceEpoch LIMIT 22"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE LongestAddGTime = 74 OR DestCityMarketID <= 33486 AND Carrier BETWEEN 'VX' AND 'VX' ORDER BY SecurityDelay, ArrDel15 LIMIT 19"}
 {"sql":"SELECT DepTime, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 128 AND 967 OR CRSArrTime BETWEEN 1723 AND 1821 GROUP BY DepTime  ORDER BY DepTime LIMIT 23","hsqls":["SELECT DepTime, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 128 AND 967 OR CRSArrTime BETWEEN 1723 AND 1821 GROUP BY DepTime  ORDER BY DepTime LIMIT 23"]}
-{"sql":"SELECT DestStateFips, MAX(TaxiIn), COUNT(CarrierDelay) FROM mytable WHERE CarrierDelay BETWEEN 70 AND 200 AND TailNum BETWEEN 'N11181' AND 'N285WN' AND DivLongestGTimes = 97.0 GROUP BY DestStateFips LIMIT 26","hsqls":["SELECT DestStateFips, MAX(TaxiIn), COUNT(CarrierDelay) FROM mytable WHERE CarrierDelay BETWEEN 70 AND 200 AND TailNum BETWEEN 'N11181' AND 'N285WN' AND (DivLongestGTimes__MV0 = 97.0 OR DivLongestGTimes__MV1 = 97.0 OR DivLongestGTimes__MV2 = 97.0 OR DivLongestGTimes__MV3 = 97.0 OR DivLongestGTimes__MV4 = 97.0) GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, MAX(TaxiIn), COUNT(CarrierDelay) FROM mytable WHERE CarrierDelay BETWEEN 70 AND 200 AND TailNum BETWEEN 'N11181' AND 'N285WN' AND DivLongestGTimes = 97.0 GROUP BY DestStateFips LIMIT 26","hsqls":["SELECT DestStateFips, MAX(TaxiIn), COUNT(CarrierDelay) FROM mytable WHERE CarrierDelay BETWEEN 70 AND 200 AND TailNum BETWEEN 'N11181' AND 'N285WN' AND (DivLongestGTimes[1] = 97.0 OR DivLongestGTimes[2] = 97.0 OR DivLongestGTimes[3] = 97.0 OR DivLongestGTimes[4] = 97.0 OR DivLongestGTimes[5] = 97.0) GROUP BY DestStateFips LIMIT 10000"]}
 {"sql":"SELECT DestState FROM mytable WHERE DayofMonth BETWEEN 16 AND 15 AND DestWac IN (4, 52) LIMIT 23"}
 {"sql":"SELECT AirlineID FROM mytable WHERE Flights NOT IN (1) OR ArrDelay NOT IN (122.0) LIMIT 7"}
 {"sql":"SELECT TailNum, CancellationCode FROM mytable WHERE OriginStateName NOT IN ('Utah', 'Missouri', 'Arizona', 'Oklahoma') AND ArrivalDelayGroups IN (10, -2, 11, 12) ORDER BY OriginState, DestWac, DaysSinceEpoch LIMIT 5"}
-{"sql":"SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14","hsqls":["SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14"]}
+{"sql":"SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14","hsqls":["SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14"]}
 {"sql":"SELECT SecurityDelay, ArrDelayMinutes, COUNT(*) FROM mytable WHERE LateAircraftDelay = 61 OR Origin IN ('FSD', 'TUS', 'HIB') OR WheelsOff BETWEEN 1512 AND 1822 GROUP BY SecurityDelay, ArrDelayMinutes  ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 7","hsqls":["SELECT SecurityDelay, ArrDelayMinutes, COUNT(*) FROM mytable WHERE LateAircraftDelay = 61 OR Origin IN ('FSD', 'TUS', 'HIB') OR WheelsOff BETWEEN 1512 AND 1822 GROUP BY SecurityDelay, ArrDelayMinutes  ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 7"]}
 {"sql":"SELECT CRSElapsedTime, OriginAirportID, COUNT(Origin), MIN(TotalAddGTime) FROM mytable WHERE DivArrDelay NOT IN (746, 224, 185, 62) GROUP BY CRSElapsedTime, OriginAirportID  ORDER BY CRSElapsedTime, OriginAirportID LIMIT 17","hsqls":["SELECT CRSElapsedTime, OriginAirportID, COUNT(Origin), MIN(TotalAddGTime) FROM mytable WHERE DivArrDelay NOT IN (746, 224, 185, 62) GROUP BY CRSElapsedTime, OriginAirportID  ORDER BY CRSElapsedTime, OriginAirportID LIMIT 17"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE Origin = 'MHT' ORDER BY OriginCityName, NASDelay LIMIT 6"}
-{"sql":"SELECT OriginStateFips, DivAirportSeqIDs FROM mytable WHERE DistanceGroup BETWEEN 2 AND 11 ORDER BY TailNum LIMIT 20","hsqls":["SELECT OriginStateFips, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DistanceGroup BETWEEN 2 AND 11 ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DivAirportSeqIDs FROM mytable WHERE DistanceGroup BETWEEN 2 AND 11 ORDER BY TailNum LIMIT 20","hsqls":["SELECT OriginStateFips, DivAirportSeqIDs FROM mytable WHERE DistanceGroup BETWEEN 2 AND 11 ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, TaxiIn, TailNum, COUNT(*) FROM mytable WHERE DepartureDelayGroups BETWEEN 0 AND -1 AND DestStateName BETWEEN 'Pennsylvania' AND 'North Carolina' OR DepDel15 IN (1, 0, -9999) GROUP BY TaxiOut, TaxiIn, TailNum  ORDER BY TaxiOut, TaxiIn, TailNum LIMIT 15","hsqls":["SELECT TaxiOut, TaxiIn, TailNum, COUNT(*) FROM mytable WHERE DepartureDelayGroups BETWEEN 0 AND -1 AND DestStateName BETWEEN 'Pennsylvania' AND 'North Carolina' OR DepDel15 IN (1, 0, -9999) GROUP BY TaxiOut, TaxiIn, TailNum  ORDER BY TaxiOut, TaxiIn, TailNum LIMIT 15"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE DivActualElapsedTime BETWEEN 343 AND 344 AND AirlineID <= 20437 ORDER BY OriginCityMarketID, FlightDate LIMIT 25"}
-{"sql":"SELECT DivTailNums FROM mytable WHERE \"Month\" NOT IN (1) AND ArrTime BETWEEN 825 AND 1236 AND TotalAddGTime IN (78, 25, 13) ORDER BY \"Year\", DivDistance, OriginWac LIMIT 12","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Month NOT IN (1) AND ArrTime BETWEEN 825 AND 1236 AND TotalAddGTime IN (78, 25, 13) ORDER BY Year, DivDistance, OriginWac LIMIT 10000"]}
-{"sql":"SELECT WheelsOn, CRSDepTime, MAX(CarrierDelay), COUNT(DestWac) FROM mytable WHERE OriginStateFips BETWEEN 47 AND 33 AND DivWheelsOns IN (1022, 1251) GROUP BY WheelsOn, CRSDepTime LIMIT 29","hsqls":["SELECT WheelsOn, CRSDepTime, MAX(CarrierDelay), COUNT(DestWac) FROM mytable WHERE OriginStateFips BETWEEN 47 AND 33 AND (DivWheelsOns__MV0 IN (1022, 1251) OR DivWheelsOns__MV1 IN (1022, 1251) OR DivWheelsOns__MV2 IN (1022, 1251) OR DivWheelsOns__MV3 IN (1022, 1251) OR DivWheelsOns__MV4 IN (1022, 1251)) GROUP BY WheelsOn, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE \"Month\" NOT IN (1) AND ArrTime BETWEEN 825 AND 1236 AND TotalAddGTime IN (78, 25, 13) ORDER BY \"Year\", DivDistance, OriginWac LIMIT 12","hsqls":["SELECT DivTailNums FROM mytable WHERE `Month` NOT IN (1) AND ArrTime BETWEEN 825 AND 1236 AND TotalAddGTime IN (78, 25, 13) ORDER BY Year, DivDistance, OriginWac LIMIT 10000"]}
+{"sql":"SELECT WheelsOn, CRSDepTime, MAX(CarrierDelay), COUNT(DestWac) FROM mytable WHERE OriginStateFips BETWEEN 47 AND 33 AND DivWheelsOns IN (1022, 1251) GROUP BY WheelsOn, CRSDepTime LIMIT 29","hsqls":["SELECT WheelsOn, CRSDepTime, MAX(CarrierDelay), COUNT(DestWac) FROM mytable WHERE OriginStateFips BETWEEN 47 AND 33 AND (DivWheelsOns[1] IN (1022, 1251) OR DivWheelsOns[2] IN (1022, 1251) OR DivWheelsOns[3] IN (1022, 1251) OR DivWheelsOns[4] IN (1022, 1251) OR DivWheelsOns[5] IN (1022, 1251)) GROUP BY WheelsOn, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT MIN(TaxiIn) FROM mytable WHERE OriginCityMarketID <> 30140 AND CRSElapsedTime >= 181 LIMIT 29"}
 {"sql":"SELECT TotalAddGTime, CRSDepTime FROM mytable WHERE TailNum NOT IN ('N78509', 'N961DL', 'N667DN', 'N760EV', 'N23721') OR ArrTimeBlk NOT IN ('1100-1159', '2300-2359', '1400-1459') ORDER BY WheelsOff, DivDistance LIMIT 28"}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY NASDelay LIMIT 20"}
 {"sql":"SELECT TailNum, DepDel15 FROM mytable WHERE DistanceGroup < 1 ORDER BY OriginState, ArrDelayMinutes, AirlineID LIMIT 11"}
 {"sql":"SELECT ArrTime FROM mytable WHERE NASDelay = 21 AND ArrTime IN (600, 1328) AND TaxiIn IN (7, 93, 44) ORDER BY Carrier, DepTimeBlk LIMIT 15"}
-{"sql":"SELECT TotalAddGTime, DepDel15, MAX(\"Year\"), AVG(CRSElapsedTime) FROM mytable WHERE WeatherDelay < 3 AND DestCityName < 'Newark, NJ' GROUP BY TotalAddGTime, DepDel15 LIMIT 10","hsqls":["SELECT TotalAddGTime, DepDel15, MAX(Year), AVG(CRSElapsedTime) FROM mytable WHERE WeatherDelay < 3 AND DestCityName < 'Newark, NJ' GROUP BY TotalAddGTime, DepDel15 LIMIT 10"]}
-{"sql":"SELECT LateAircraftDelay, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16095 OR DivTotalGTimes IN (12, 76) AND Quarter <= 1 ORDER BY DepTime, DayofMonth LIMIT 9","hsqls":["SELECT LateAircraftDelay, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16095 OR (DivTotalGTimes__MV0 IN (12, 76) OR DivTotalGTimes__MV1 IN (12, 76) OR DivTotalGTimes__MV2 IN (12, 76) OR DivTotalGTimes__MV3 IN (12, 76) OR DivTotalGTimes__MV4 IN (12, 76)) AND Quarter <= 1 ORDER BY DepTime, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DepDel15, MAX(\"Year\"), AVG(CRSElapsedTime) FROM mytable WHERE WeatherDelay < 3 AND DestCityName < 'Newark, NJ' GROUP BY TotalAddGTime, DepDel15 LIMIT 10","hsqls":["SELECT TotalAddGTime, DepDel15, MAX(`Year`), AVG(CRSElapsedTime) FROM mytable WHERE WeatherDelay < 3 AND DestCityName < 'Newark, NJ' GROUP BY TotalAddGTime, DepDel15 LIMIT 10"]}
+{"sql":"SELECT LateAircraftDelay, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16095 OR DivTotalGTimes IN (12, 76) AND Quarter <= 1 ORDER BY DepTime, DayofMonth LIMIT 9","hsqls":["SELECT LateAircraftDelay, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16095 OR (DivTotalGTimes[1] IN (12, 76) OR DivTotalGTimes[2] IN (12, 76) OR DivTotalGTimes[3] IN (12, 76) OR DivTotalGTimes[4] IN (12, 76) OR DivTotalGTimes[5] IN (12, 76)) AND Quarter <= 1 ORDER BY DepTime, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DepTime, MAX(DepTime) FROM mytable GROUP BY TaxiOut, DepTime  ORDER BY TaxiOut, DepTime LIMIT 26","hsqls":["SELECT TaxiOut, DepTime, MAX(DepTime) FROM mytable GROUP BY TaxiOut, DepTime  ORDER BY TaxiOut, DepTime LIMIT 26"]}
-{"sql":"SELECT WeatherDelay, Distance, AVG(\"Year\"), COUNT(ArrTimeBlk), AVG(Flights) FROM mytable WHERE Carrier = 'OO' OR OriginStateName NOT IN ('Utah', 'Puerto Rico', 'Kentucky', 'U.S. Pacific Trust Territories and Possessions', 'Illinois') GROUP BY WeatherDelay, Distance LIMIT 25","hsqls":["SELECT WeatherDelay, Distance, AVG(Year), COUNT(ArrTimeBlk), AVG(Flights) FROM mytable WHERE Carrier = 'OO' OR OriginStateName NOT IN ('Utah', 'Puerto Rico', 'Kentucky', 'U.S. Pacific Trust Territories and Possessions', 'Illinois') GROUP BY WeatherDelay, Distance LIMIT 25"]}
+{"sql":"SELECT WeatherDelay, Distance, AVG(\"Year\"), COUNT(ArrTimeBlk), AVG(Flights) FROM mytable WHERE Carrier = 'OO' OR OriginStateName NOT IN ('Utah', 'Puerto Rico', 'Kentucky', 'U.S. Pacific Trust Territories and Possessions', 'Illinois') GROUP BY WeatherDelay, Distance LIMIT 25","hsqls":["SELECT WeatherDelay, Distance, AVG(`Year`), COUNT(ArrTimeBlk), AVG(Flights) FROM mytable WHERE Carrier = 'OO' OR OriginStateName NOT IN ('Utah', 'Puerto Rico', 'Kentucky', 'U.S. Pacific Trust Territories and Possessions', 'Illinois') GROUP BY WeatherDelay, Distance LIMIT 25"]}
 {"sql":"SELECT DestState FROM mytable WHERE ArrTime > 2242 OR Carrier NOT IN ('F9') LIMIT 4"}
-{"sql":"SELECT DistanceGroup FROM mytable WHERE WeatherDelay <= 101 OR \"Month\" >= 1 AND AirTime BETWEEN 85 AND 442 ORDER BY DepDelayMinutes, ArrTime, Dest LIMIT 13","hsqls":["SELECT DistanceGroup FROM mytable WHERE WeatherDelay <= 101 OR Month >= 1 AND AirTime BETWEEN 85 AND 442 ORDER BY DepDelayMinutes, ArrTime, Dest LIMIT 13"]}
+{"sql":"SELECT DistanceGroup FROM mytable WHERE WeatherDelay <= 101 OR \"Month\" >= 1 AND AirTime BETWEEN 85 AND 442 ORDER BY DepDelayMinutes, ArrTime, Dest LIMIT 13","hsqls":["SELECT DistanceGroup FROM mytable WHERE WeatherDelay <= 101 OR `Month` >= 1 AND AirTime BETWEEN 85 AND 442 ORDER BY DepDelayMinutes, ArrTime, Dest LIMIT 13"]}
 {"sql":"SELECT MIN(Flights) FROM mytable WHERE OriginAirportID BETWEEN 11413 AND 13495 AND OriginCityMarketID NOT IN (30739) AND DivActualElapsedTime BETWEEN 383 AND 289 LIMIT 12"}
-{"sql":"SELECT DestAirportSeqID, DivTotalGTimes FROM mytable ORDER BY Dest LIMIT 6","hsqls":["SELECT DestAirportSeqID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY Dest LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivTotalGTimes FROM mytable ORDER BY Dest LIMIT 6","hsqls":["SELECT DestAirportSeqID, DivTotalGTimes FROM mytable ORDER BY Dest LIMIT 10000"]}
 {"sql":"SELECT WheelsOn FROM mytable WHERE Cancelled = 1 AND DestState < 'ND' LIMIT 20"}
 {"sql":"SELECT AVG(OriginStateFips) FROM mytable LIMIT 28"}
 {"sql":"SELECT WheelsOff FROM mytable WHERE ArrivalDelayGroups NOT IN (10, 0, 7, -1) LIMIT 20"}
-{"sql":"SELECT DivWheelsOns, OriginCityName, DivAirportIDs FROM mytable ORDER BY TailNum LIMIT 11","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginCityName, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, OriginCityName, DivAirportIDs FROM mytable ORDER BY TailNum LIMIT 11","hsqls":["SELECT DivWheelsOns, OriginCityName, DivAirportIDs FROM mytable ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, TaxiIn, DestAirportID, COUNT(*) FROM mytable WHERE TailNum <= 'N56859' OR DestCityName NOT IN ('Savannah, GA', 'Anchorage, AK', 'Yuma, AZ', 'Newport News/Williamsburg, VA') AND Cancelled = 1 GROUP BY WeatherDelay, TaxiIn, DestAirportID  ORDER BY WeatherDelay, TaxiIn, DestAirportID LIMIT 15","hsqls":["SELECT WeatherDelay, TaxiIn, DestAirportID, COUNT(*) FROM mytable WHERE TailNum <= 'N56859' OR DestCityName NOT IN ('Savannah, GA', 'Anchorage, AK', 'Yuma, AZ', 'Newport News/Williamsburg, VA') AND Cancelled = 1 GROUP BY WeatherDelay, TaxiIn, DestAirportID  ORDER BY WeatherDelay, TaxiIn, DestAirportID LIMIT 15"]}
-{"sql":"SELECT DepartureDelayGroups, DayofMonth FROM mytable WHERE DestCityName NOT IN ('Manchester, NH', 'Tallahassee, FL', 'Asheville, NC') OR DivWheelsOffs < 2002 ORDER BY DayofMonth LIMIT 23","hsqls":["SELECT DepartureDelayGroups, DayofMonth FROM mytable WHERE DestCityName NOT IN ('Manchester, NH', 'Tallahassee, FL', 'Asheville, NC') OR (DivWheelsOffs__MV0 < 2002 OR DivWheelsOffs__MV1 < 2002 OR DivWheelsOffs__MV2 < 2002 OR DivWheelsOffs__MV3 < 2002 OR DivWheelsOffs__MV4 < 2002) ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DayofMonth FROM mytable WHERE DestCityName NOT IN ('Manchester, NH', 'Tallahassee, FL', 'Asheville, NC') OR DivWheelsOffs < 2002 ORDER BY DayofMonth LIMIT 23","hsqls":["SELECT DepartureDelayGroups, DayofMonth FROM mytable WHERE DestCityName NOT IN ('Manchester, NH', 'Tallahassee, FL', 'Asheville, NC') OR (DivWheelsOffs[1] < 2002 OR DivWheelsOffs[2] < 2002 OR DivWheelsOffs[3] < 2002 OR DivWheelsOffs[4] < 2002 OR DivWheelsOffs[5] < 2002) ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DepDel15, MAX(DepDelayMinutes), SUM(DivArrDelay), SUM(Quarter) FROM mytable GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 23","hsqls":["SELECT DepDel15, MAX(DepDelayMinutes), SUM(DivArrDelay), SUM(Quarter) FROM mytable GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 23"]}
-{"sql":"SELECT DestStateName, COUNT(*) FROM mytable WHERE DivLongestGTimes IN (77.0, 30.0) AND Carrier BETWEEN 'B6' AND 'UA' OR DivActualElapsedTime BETWEEN 262 AND 171 GROUP BY DestStateName LIMIT 8","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 IN (77.0, 30.0) OR DivLongestGTimes__MV1 IN (77.0, 30.0) OR DivLongestGTimes__MV2 IN (77.0, 30.0) OR DivLongestGTimes__MV3 IN (77.0, 30.0) OR DivLongestGTimes__MV4 IN (77.0, 30.0)) AND Carrier BETWEEN 'B6' AND 'UA' OR DivActualElapsedTime BETWEEN 262 AND 171 GROUP BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestStateName, COUNT(*) FROM mytable WHERE DivLongestGTimes IN (77.0, 30.0) AND Carrier BETWEEN 'B6' AND 'UA' OR DivActualElapsedTime BETWEEN 262 AND 171 GROUP BY DestStateName LIMIT 8","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] IN (77.0, 30.0) OR DivLongestGTimes[2] IN (77.0, 30.0) OR DivLongestGTimes[3] IN (77.0, 30.0) OR DivLongestGTimes[4] IN (77.0, 30.0) OR DivLongestGTimes[5] IN (77.0, 30.0)) AND Carrier BETWEEN 'B6' AND 'UA' OR DivActualElapsedTime BETWEEN 262 AND 171 GROUP BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, DestCityName, SUM(DepDelayMinutes), SUM(OriginAirportSeqID) FROM mytable WHERE WeatherDelay BETWEEN 18 AND 88 GROUP BY DestStateFips, DestCityName  ORDER BY DestStateFips, DestCityName LIMIT 22","hsqls":["SELECT DestStateFips, DestCityName, SUM(DepDelayMinutes), SUM(OriginAirportSeqID) FROM mytable WHERE WeatherDelay BETWEEN 18 AND 88 GROUP BY DestStateFips, DestCityName  ORDER BY DestStateFips, DestCityName LIMIT 22"]}
 {"sql":"SELECT ArrTime, DestAirportSeqID FROM mytable WHERE FlightNum NOT IN (3798, 618) LIMIT 16"}
 {"sql":"SELECT ArrDelay FROM mytable WHERE ActualElapsedTime BETWEEN 60 AND 259 AND CRSArrTime IN (752, 1150) AND DestCityMarketID > 33933 ORDER BY DaysSinceEpoch LIMIT 10"}
 {"sql":"SELECT FlightDate, MAX(DivDistance), MIN(FlightNum), SUM(CRSElapsedTime) FROM mytable WHERE DepartureDelayGroups BETWEEN -1 AND 11 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 9","hsqls":["SELECT FlightDate, MAX(DivDistance), MIN(FlightNum), SUM(CRSElapsedTime) FROM mytable WHERE DepartureDelayGroups BETWEEN -1 AND 11 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 9"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE OriginWac NOT IN (82, 83, 13, 84) ORDER BY Diverted, DivArrDelay LIMIT 22"}
-{"sql":"SELECT DepDel15, DivAirportLandings FROM mytable WHERE ActualElapsedTime BETWEEN 54 AND 263 AND DivAirportIDs = 11278 ORDER BY TotalAddGTime LIMIT 19","hsqls":["SELECT DepDel15, DivAirportLandings FROM mytable WHERE ActualElapsedTime BETWEEN 54 AND 263 AND (DivAirportIDs__MV0 = 11278 OR DivAirportIDs__MV1 = 11278 OR DivAirportIDs__MV2 = 11278 OR DivAirportIDs__MV3 = 11278 OR DivAirportIDs__MV4 = 11278) ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DivAirportLandings FROM mytable WHERE ActualElapsedTime BETWEEN 54 AND 263 AND DivAirportIDs = 11278 ORDER BY TotalAddGTime LIMIT 19","hsqls":["SELECT DepDel15, DivAirportLandings FROM mytable WHERE ActualElapsedTime BETWEEN 54 AND 263 AND (DivAirportIDs[1] = 11278 OR DivAirportIDs[2] = 11278 OR DivAirportIDs[3] = 11278 OR DivAirportIDs[4] = 11278 OR DivAirportIDs[5] = 11278) ORDER BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, ArrDelay FROM mytable WHERE OriginWac < 53 ORDER BY DivAirportLandings, CRSElapsedTime LIMIT 17"}
 {"sql":"SELECT OriginCityName, OriginStateName FROM mytable LIMIT 25"}
 {"sql":"SELECT LateAircraftDelay, LongestAddGTime, ActualElapsedTime FROM mytable WHERE DepartureDelayGroups IN (3, 10, -1, 4, -9999) OR TaxiIn = 175 AND DestStateFips > 42 ORDER BY Distance LIMIT 5"}
 {"sql":"SELECT FlightDate, UniqueCarrier, AVG(DepDel15) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR LateAircraftDelay <= 224 GROUP BY FlightDate, UniqueCarrier  ORDER BY FlightDate, UniqueCarrier LIMIT 27","hsqls":["SELECT FlightDate, UniqueCarrier, AVG(DepDel15) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR LateAircraftDelay <= 224 GROUP BY FlightDate, UniqueCarrier  ORDER BY FlightDate, UniqueCarrier LIMIT 27"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE DestStateName IN ('Minnesota', 'Illinois', 'New York', 'South Dakota', 'Oklahoma') OR AirTime BETWEEN 306 AND 159 ORDER BY UniqueCarrier LIMIT 12"}
-{"sql":"SELECT AirTime, DivArrDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 OR DivWheelsOffs <= 130 OR TaxiOut = 71 ORDER BY ArrDelayMinutes, TailNum, DepDel15 LIMIT 15","hsqls":["SELECT AirTime, DivArrDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 OR (DivWheelsOffs__MV0 <= 130 OR DivWheelsOffs__MV1 <= 130 OR DivWheelsOffs__MV2 <= 130 OR DivWheelsOffs__MV3 <= 130 OR DivWheelsOffs__MV4 <= 130) OR TaxiOut = 71 ORDER BY ArrDelayMinutes, TailNum, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT AirTime, DivArrDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 OR DivWheelsOffs <= 130 OR TaxiOut = 71 ORDER BY ArrDelayMinutes, TailNum, DepDel15 LIMIT 15","hsqls":["SELECT AirTime, DivArrDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 OR (DivWheelsOffs[1] <= 130 OR DivWheelsOffs[2] <= 130 OR DivWheelsOffs[3] <= 130 OR DivWheelsOffs[4] <= 130 OR DivWheelsOffs[5] <= 130) OR TaxiOut = 71 ORDER BY ArrDelayMinutes, TailNum, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 93 AND 72 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 10","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 93 AND 72 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 10"]}
 {"sql":"SELECT OriginAirportID, AVG(FlightNum), SUM(DepTime), MAX(DestCityMarketID) FROM mytable WHERE FlightDate < '2014-01-17' OR DestStateName BETWEEN 'Rhode Island' AND 'Indiana' OR DivDistance <> 236 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 29","hsqls":["SELECT OriginAirportID, AVG(FlightNum), SUM(DepTime), MAX(DestCityMarketID) FROM mytable WHERE FlightDate < '2014-01-17' OR DestStateName BETWEEN 'Rhode Island' AND 'Indiana' OR DivDistance <> 236 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 29"]}
 {"sql":"SELECT MIN(DestWac), AVG(DaysSinceEpoch), COUNT(FlightDate) FROM mytable LIMIT 9"}
@@ -1624,19 +1624,19 @@
 {"sql":"SELECT WheelsOn, DaysSinceEpoch FROM mytable ORDER BY ArrTime, CancellationCode LIMIT 24"}
 {"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, Cancelled FROM mytable WHERE Flights IN (1) ORDER BY OriginAirportSeqID, ActualElapsedTime LIMIT 8"}
 {"sql":"SELECT DepDelay, TotalAddGTime, Origin FROM mytable WHERE Distance = 1180 AND OriginStateName = 'Wyoming' ORDER BY SecurityDelay, DestAirportSeqID, NASDelay LIMIT 11"}
-{"sql":"SELECT OriginCityMarketID, Dest, OriginAirportID, COUNT(*) FROM mytable WHERE OriginState >= 'VT' OR \"Month\" BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, Dest, OriginAirportID LIMIT 10","hsqls":["SELECT OriginCityMarketID, Dest, OriginAirportID, COUNT(*) FROM mytable WHERE OriginState >= 'VT' OR Month BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, Dest, OriginAirportID LIMIT 10"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE NASDelay < 42 AND Cancelled BETWEEN 0 AND 0 AND DestCityName IN ('Las Vegas, NV', 'Laramie, WY', 'Brownsville, TX', 'Klamath Falls, OR', 'Palm Springs, CA') ORDER BY DepDelay, DestStateFips, OriginStateName LIMIT 19","hsqls":["SELECT Year FROM mytable WHERE NASDelay < 42 AND Cancelled BETWEEN 0 AND 0 AND DestCityName IN ('Las Vegas, NV', 'Laramie, WY', 'Brownsville, TX', 'Klamath Falls, OR', 'Palm Springs, CA') ORDER BY DepDelay, DestStateFips, OriginStateName LIMIT 19"]}
+{"sql":"SELECT OriginCityMarketID, Dest, OriginAirportID, COUNT(*) FROM mytable WHERE OriginState >= 'VT' OR \"Month\" BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, Dest, OriginAirportID LIMIT 10","hsqls":["SELECT OriginCityMarketID, Dest, OriginAirportID, COUNT(*) FROM mytable WHERE OriginState >= 'VT' OR `Month` BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, Dest, OriginAirportID LIMIT 10"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE NASDelay < 42 AND Cancelled BETWEEN 0 AND 0 AND DestCityName IN ('Las Vegas, NV', 'Laramie, WY', 'Brownsville, TX', 'Klamath Falls, OR', 'Palm Springs, CA') ORDER BY DepDelay, DestStateFips, OriginStateName LIMIT 19","hsqls":["SELECT `Year` FROM mytable WHERE NASDelay < 42 AND Cancelled BETWEEN 0 AND 0 AND DestCityName IN ('Las Vegas, NV', 'Laramie, WY', 'Brownsville, TX', 'Klamath Falls, OR', 'Palm Springs, CA') ORDER BY DepDelay, DestStateFips, OriginStateName LIMIT 19"]}
 {"sql":"SELECT TotalAddGTime, ArrivalDelayGroups FROM mytable ORDER BY DivDistance LIMIT 23"}
 {"sql":"SELECT TaxiOut, MAX(DestStateFips), AVG(DestCityMarketID) FROM mytable GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 4","hsqls":["SELECT TaxiOut, MAX(DestStateFips), AVG(DestCityMarketID) FROM mytable GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 4"]}
-{"sql":"SELECT FlightNum, DivAirportIDs, AirTime FROM mytable ORDER BY DivArrDelay LIMIT 22","hsqls":["SELECT FlightNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirTime FROM mytable ORDER BY DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivAirportIDs, AirTime FROM mytable ORDER BY DivArrDelay LIMIT 22","hsqls":["SELECT FlightNum, DivAirportIDs, AirTime FROM mytable ORDER BY DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT Dest, SUM(ArrDel15), AVG(TaxiOut), COUNT(AirTime) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 21","hsqls":["SELECT Dest, SUM(ArrDel15), AVG(TaxiOut), COUNT(AirTime) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 21"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE Diverted <= 0 AND Carrier BETWEEN 'AS' AND 'WN' ORDER BY DivActualElapsedTime LIMIT 3","hsqls":["SELECT Month FROM mytable WHERE Diverted <= 0 AND Carrier BETWEEN 'AS' AND 'WN' ORDER BY DivActualElapsedTime LIMIT 3"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE Diverted <= 0 AND Carrier BETWEEN 'AS' AND 'WN' ORDER BY DivActualElapsedTime LIMIT 3","hsqls":["SELECT `Month` FROM mytable WHERE Diverted <= 0 AND Carrier BETWEEN 'AS' AND 'WN' ORDER BY DivActualElapsedTime LIMIT 3"]}
 {"sql":"SELECT COUNT(DestCityMarketID) FROM mytable WHERE AirTime BETWEEN 109 AND 70 LIMIT 16"}
 {"sql":"SELECT CarrierDelay, MIN(OriginStateFips), AVG(DivArrDelay) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 7","hsqls":["SELECT CarrierDelay, MIN(OriginStateFips), AVG(DivArrDelay) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 7"]}
 {"sql":"SELECT Carrier, NASDelay FROM mytable WHERE SecurityDelay <= -9999 AND CarrierDelay >= 67 AND WheelsOff BETWEEN 549 AND 1100 ORDER BY TotalAddGTime LIMIT 12"}
-{"sql":"SELECT DestStateFips, DivAirportSeqIDs FROM mytable WHERE ArrDelay IN (184.0) OR Carrier NOT IN ('US', 'VX') AND AirTime <= 161 ORDER BY DivDistance LIMIT 10","hsqls":["SELECT DestStateFips, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrDelay IN (184.0) OR Carrier NOT IN ('US', 'VX') AND AirTime <= 161 ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivAirportSeqIDs FROM mytable WHERE ArrDelay IN (184.0) OR Carrier NOT IN ('US', 'VX') AND AirTime <= 161 ORDER BY DivDistance LIMIT 10","hsqls":["SELECT DestStateFips, DivAirportSeqIDs FROM mytable WHERE ArrDelay IN (184.0) OR Carrier NOT IN ('US', 'VX') AND AirTime <= 161 ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DepDel15 FROM mytable WHERE DistanceGroup IN (1, 6, 5) AND FlightNum <= 4814 AND CRSArrTime < 1315 ORDER BY TaxiOut LIMIT 28"}
-{"sql":"SELECT OriginAirportID, COUNT(*) FROM mytable WHERE DayOfWeek <= 3 AND DivAirportIDs <= 10397 OR DepTime BETWEEN 1851 AND 2230 GROUP BY OriginAirportID LIMIT 17","hsqls":["SELECT OriginAirportID, COUNT(*) FROM mytable WHERE DayOfWeek <= 3 AND (DivAirportIDs__MV0 <= 10397 OR DivAirportIDs__MV1 <= 10397 OR DivAirportIDs__MV2 <= 10397 OR DivAirportIDs__MV3 <= 10397 OR DivAirportIDs__MV4 <= 10397) OR DepTime BETWEEN 1851 AND 2230 GROUP BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT OriginAirportID, COUNT(*) FROM mytable WHERE DayOfWeek <= 3 AND DivAirportIDs <= 10397 OR DepTime BETWEEN 1851 AND 2230 GROUP BY OriginAirportID LIMIT 17","hsqls":["SELECT OriginAirportID, COUNT(*) FROM mytable WHERE DayOfWeek <= 3 AND (DivAirportIDs[1] <= 10397 OR DivAirportIDs[2] <= 10397 OR DivAirportIDs[3] <= 10397 OR DivAirportIDs[4] <= 10397 OR DivAirportIDs[5] <= 10397) OR DepTime BETWEEN 1851 AND 2230 GROUP BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, DivReachedDest, MAX(Flights), MAX(NASDelay), MIN(DistanceGroup) FROM mytable WHERE UniqueCarrier <> 'B6' GROUP BY WheelsOff, DivReachedDest  ORDER BY WheelsOff, DivReachedDest LIMIT 26","hsqls":["SELECT WheelsOff, DivReachedDest, MAX(Flights), MAX(NASDelay), MIN(DistanceGroup) FROM mytable WHERE UniqueCarrier <> 'B6' GROUP BY WheelsOff, DivReachedDest  ORDER BY WheelsOff, DivReachedDest LIMIT 26"]}
 {"sql":"SELECT DestWac, DestAirportID FROM mytable ORDER BY Origin LIMIT 10"}
 {"sql":"SELECT OriginStateFips, DivDistance, DayofMonth FROM mytable WHERE CRSArrTime <= 1937 LIMIT 1"}
@@ -1647,81 +1647,81 @@
 {"sql":"SELECT WheelsOff, DepDel15, CRSElapsedTime, MAX(AirlineID), MAX(FlightNum) FROM mytable WHERE ArrTime NOT IN (138) OR DepDelayMinutes BETWEEN 72.0 AND 333.0 AND DistanceGroup IN (3, 1, 10, 4, 9) GROUP BY WheelsOff, DepDel15, CRSElapsedTime  ORDER BY WheelsOff, DepDel15, CRSElapsedTime LIMIT 13","hsqls":["SELECT WheelsOff, DepDel15, CRSElapsedTime, MAX(AirlineID), MAX(FlightNum) FROM mytable WHERE ArrTime NOT IN (138) OR DepDelayMinutes BETWEEN 72.0 AND 333.0 AND DistanceGroup IN (3, 1, 10, 4, 9) GROUP BY WheelsOff, DepDel15, CRSElapsedTime  ORDER BY WheelsOff, DepDel15, CRSElapsedTime LIMIT 13"]}
 {"sql":"SELECT DestState FROM mytable WHERE Carrier BETWEEN 'WN' AND 'EV' OR DivAirportLandings BETWEEN 9 AND 0 ORDER BY Diverted, DivDistance LIMIT 10"}
 {"sql":"SELECT WeatherDelay, ActualElapsedTime, DestCityName, COUNT(SecurityDelay), MAX(Quarter), AVG(ArrDelay) FROM mytable WHERE UniqueCarrier IN ('OO', 'UA') OR DivArrDelay NOT IN (864, 72) GROUP BY WeatherDelay, ActualElapsedTime, DestCityName  ORDER BY WeatherDelay, ActualElapsedTime, DestCityName LIMIT 28","hsqls":["SELECT WeatherDelay, ActualElapsedTime, DestCityName, COUNT(SecurityDelay), MAX(Quarter), AVG(ArrDelay) FROM mytable WHERE UniqueCarrier IN ('OO', 'UA') OR DivArrDelay NOT IN (864, 72) GROUP BY WeatherDelay, ActualElapsedTime, DestCityName  ORDER BY WeatherDelay, ActualElapsedTime, DestCityName LIMIT 28"]}
-{"sql":"SELECT MAX(\"Year\"), MIN(DepartureDelayGroups), COUNT(CancellationCode) FROM mytable WHERE ArrivalDelayGroups IN (10, 0, -2, 9, 11) LIMIT 8","hsqls":["SELECT MAX(Year), MIN(DepartureDelayGroups), COUNT(CancellationCode) FROM mytable WHERE ArrivalDelayGroups IN (10, 0, -2, 9, 11) LIMIT 8"]}
-{"sql":"SELECT TotalAddGTime, ArrDelayMinutes, AirlineID FROM mytable WHERE DestAirportID NOT IN (10731, 14689, 12758) AND DivTotalGTimes BETWEEN 7 AND 87 ORDER BY DepartureDelayGroups LIMIT 19","hsqls":["SELECT TotalAddGTime, ArrDelayMinutes, AirlineID FROM mytable WHERE DestAirportID NOT IN (10731, 14689, 12758) AND (DivTotalGTimes__MV0 BETWEEN 7 AND 87 OR DivTotalGTimes__MV1 BETWEEN 7 AND 87 OR DivTotalGTimes__MV2 BETWEEN 7 AND 87 OR DivTotalGTimes__MV3 BETWEEN 7 AND 87 OR DivTotalGTimes__MV4 BETWEEN 7 AND 87) ORDER BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT MAX(\"Year\"), MIN(DepartureDelayGroups), COUNT(CancellationCode) FROM mytable WHERE ArrivalDelayGroups IN (10, 0, -2, 9, 11) LIMIT 8","hsqls":["SELECT MAX(`Year`), MIN(DepartureDelayGroups), COUNT(CancellationCode) FROM mytable WHERE ArrivalDelayGroups IN (10, 0, -2, 9, 11) LIMIT 8"]}
+{"sql":"SELECT TotalAddGTime, ArrDelayMinutes, AirlineID FROM mytable WHERE DestAirportID NOT IN (10731, 14689, 12758) AND DivTotalGTimes BETWEEN 7 AND 87 ORDER BY DepartureDelayGroups LIMIT 19","hsqls":["SELECT TotalAddGTime, ArrDelayMinutes, AirlineID FROM mytable WHERE DestAirportID NOT IN (10731, 14689, 12758) AND (DivTotalGTimes[1] BETWEEN 7 AND 87 OR DivTotalGTimes[2] BETWEEN 7 AND 87 OR DivTotalGTimes[3] BETWEEN 7 AND 87 OR DivTotalGTimes[4] BETWEEN 7 AND 87 OR DivTotalGTimes[5] BETWEEN 7 AND 87) ORDER BY DepartureDelayGroups LIMIT 10000"]}
 {"sql":"SELECT Diverted FROM mytable WHERE DepartureDelayGroups >= 2 ORDER BY LateAircraftDelay, OriginStateFips, ActualElapsedTime LIMIT 22"}
 {"sql":"SELECT Distance FROM mytable WHERE Diverted >= 1 AND ArrTime <= 1554 ORDER BY DepDelay, DestState"}
-{"sql":"SELECT DestStateFips, DivTailNums, DayofMonth FROM mytable WHERE CRSArrTime BETWEEN 809 AND 1655 AND LateAircraftDelay <= 154 ORDER BY DestAirportID, DestCityMarketID LIMIT 12","hsqls":["SELECT DestStateFips, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DayofMonth FROM mytable WHERE CRSArrTime BETWEEN 809 AND 1655 AND LateAircraftDelay <= 154 ORDER BY DestAirportID, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N821SK' AND 'N699BR'","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums__MV1 BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums__MV2 BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums__MV3 BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums__MV4 BETWEEN 'N821SK' AND 'N699BR') LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, Cancelled FROM mytable WHERE DivAirportSeqIDs IN (1342202, 1334205) ORDER BY ArrDelay LIMIT 16","hsqls":["SELECT LateAircraftDelay, Cancelled FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1342202, 1334205) OR DivAirportSeqIDs__MV1 IN (1342202, 1334205) OR DivAirportSeqIDs__MV2 IN (1342202, 1334205) OR DivAirportSeqIDs__MV3 IN (1342202, 1334205) OR DivAirportSeqIDs__MV4 IN (1342202, 1334205)) ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivTailNums, DayofMonth FROM mytable WHERE CRSArrTime BETWEEN 809 AND 1655 AND LateAircraftDelay <= 154 ORDER BY DestAirportID, DestCityMarketID LIMIT 12","hsqls":["SELECT DestStateFips, DivTailNums, DayofMonth FROM mytable WHERE CRSArrTime BETWEEN 809 AND 1655 AND LateAircraftDelay <= 154 ORDER BY DestAirportID, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N821SK' AND 'N699BR'","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums[2] BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums[3] BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums[4] BETWEEN 'N821SK' AND 'N699BR' OR DivTailNums[5] BETWEEN 'N821SK' AND 'N699BR') LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, Cancelled FROM mytable WHERE DivAirportSeqIDs IN (1342202, 1334205) ORDER BY ArrDelay LIMIT 16","hsqls":["SELECT LateAircraftDelay, Cancelled FROM mytable WHERE (DivAirportSeqIDs[1] IN (1342202, 1334205) OR DivAirportSeqIDs[2] IN (1342202, 1334205) OR DivAirportSeqIDs[3] IN (1342202, 1334205) OR DivAirportSeqIDs[4] IN (1342202, 1334205) OR DivAirportSeqIDs[5] IN (1342202, 1334205)) ORDER BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT SUM(CarrierDelay), AVG(ArrDelay) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 LIMIT 10"}
 {"sql":"SELECT SUM(OriginAirportID), SUM(DistanceGroup), MIN(Distance) FROM mytable WHERE DepDelay IN (164.0, 84.0, 250.0, 217.0) LIMIT 8"}
 {"sql":"SELECT OriginAirportSeqID, Dest FROM mytable WHERE ArrDelayMinutes NOT IN (226.0, 33.0, 166.0, 54.0) OR DaysSinceEpoch BETWEEN 16093 AND 16080 AND ActualElapsedTime NOT IN (22, 312, 344, 156) ORDER BY DestStateName LIMIT 13"}
 {"sql":"SELECT OriginAirportSeqID, \"Year\", Origin, COUNT(DayofMonth), SUM(AirlineID), MAX(OriginAirportID) FROM mytable GROUP BY OriginAirportSeqID, \"Year\", Origin LIMIT 6","hsqls":["SELECT OriginAirportSeqID, Year, Origin, COUNT(DayofMonth), SUM(AirlineID), MAX(OriginAirportID) FROM mytable GROUP BY OriginAirportSeqID, Year, Origin LIMIT 6"]}
 {"sql":"SELECT SUM(DivAirportLandings), MIN(TotalAddGTime), MIN(WheelsOff) FROM mytable"}
 {"sql":"SELECT FirstDepTime, FlightDate, DestStateName, MAX(LongestAddGTime), MIN(OriginWac) FROM mytable GROUP BY FirstDepTime, FlightDate, DestStateName  ORDER BY FirstDepTime, FlightDate, DestStateName LIMIT 23","hsqls":["SELECT FirstDepTime, FlightDate, DestStateName, MAX(LongestAddGTime), MIN(OriginWac) FROM mytable GROUP BY FirstDepTime, FlightDate, DestStateName  ORDER BY FirstDepTime, FlightDate, DestStateName LIMIT 23"]}
-{"sql":"SELECT DivReachedDest, FirstDepTime, OriginWac, COUNT(*) FROM mytable WHERE DivWheelsOns = 551 GROUP BY DivReachedDest, FirstDepTime, OriginWac LIMIT 15","hsqls":["SELECT DivReachedDest, FirstDepTime, OriginWac, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 = 551 OR DivWheelsOns__MV1 = 551 OR DivWheelsOns__MV2 = 551 OR DivWheelsOns__MV3 = 551 OR DivWheelsOns__MV4 = 551) GROUP BY DivReachedDest, FirstDepTime, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, FirstDepTime, OriginWac, COUNT(*) FROM mytable WHERE DivWheelsOns = 551 GROUP BY DivReachedDest, FirstDepTime, OriginWac LIMIT 15","hsqls":["SELECT DivReachedDest, FirstDepTime, OriginWac, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] = 551 OR DivWheelsOns[2] = 551 OR DivWheelsOns[3] = 551 OR DivWheelsOns[4] = 551 OR DivWheelsOns[5] = 551) GROUP BY DivReachedDest, FirstDepTime, OriginWac LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE DestState BETWEEN 'NJ' AND 'TX' OR OriginAirportID IN (13873, 11977, 11905, 13342, 15991) ORDER BY DepDelayMinutes, CRSDepTime LIMIT 20"}
 {"sql":"SELECT LateAircraftDelay, SecurityDelay, DestAirportID, SUM(CarrierDelay), AVG(NASDelay), SUM(DepDelayMinutes) FROM mytable GROUP BY LateAircraftDelay, SecurityDelay, DestAirportID  ORDER BY LateAircraftDelay, SecurityDelay, DestAirportID LIMIT 21","hsqls":["SELECT LateAircraftDelay, SecurityDelay, DestAirportID, SUM(CarrierDelay), AVG(NASDelay), SUM(DepDelayMinutes) FROM mytable GROUP BY LateAircraftDelay, SecurityDelay, DestAirportID  ORDER BY LateAircraftDelay, SecurityDelay, DestAirportID LIMIT 21"]}
-{"sql":"SELECT CRSArrTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 302 AND 382 OR DaysSinceEpoch < 16072 AND DivTotalGTimes BETWEEN 159 AND 54 GROUP BY CRSArrTime, ArrTimeBlk LIMIT 10","hsqls":["SELECT CRSArrTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 302 AND 382 OR DaysSinceEpoch < 16072 AND (DivTotalGTimes__MV0 BETWEEN 159 AND 54 OR DivTotalGTimes__MV1 BETWEEN 159 AND 54 OR DivTotalGTimes__MV2 BETWEEN 159 AND 54 OR DivTotalGTimes__MV3 BETWEEN 159 AND 54 OR DivTotalGTimes__MV4 BETWEEN 159 AND 54) GROUP BY CRSArrTime, ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, DivArrDelay FROM mytable WHERE Carrier > 'AS' AND DepDelay IN (-14.0, 93.0, 47.0) OR OriginWac BETWEEN 39 AND 45 LIMIT 21","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivArrDelay FROM mytable WHERE Carrier > 'AS' AND DepDelay IN (-14.0, 93.0, 47.0) OR OriginWac BETWEEN 39 AND 45 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 302 AND 382 OR DaysSinceEpoch < 16072 AND DivTotalGTimes BETWEEN 159 AND 54 GROUP BY CRSArrTime, ArrTimeBlk LIMIT 10","hsqls":["SELECT CRSArrTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 302 AND 382 OR DaysSinceEpoch < 16072 AND (DivTotalGTimes[1] BETWEEN 159 AND 54 OR DivTotalGTimes[2] BETWEEN 159 AND 54 OR DivTotalGTimes[3] BETWEEN 159 AND 54 OR DivTotalGTimes[4] BETWEEN 159 AND 54 OR DivTotalGTimes[5] BETWEEN 159 AND 54) GROUP BY CRSArrTime, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivArrDelay FROM mytable WHERE Carrier > 'AS' AND DepDelay IN (-14.0, 93.0, 47.0) OR OriginWac BETWEEN 39 AND 45 LIMIT 21","hsqls":["SELECT DivAirportSeqIDs, DivArrDelay FROM mytable WHERE Carrier > 'AS' AND DepDelay IN (-14.0, 93.0, 47.0) OR OriginWac BETWEEN 39 AND 45 LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrDelayMinutes), MIN(LongestAddGTime) FROM mytable LIMIT 19"}
-{"sql":"SELECT Distance, Dest, UniqueCarrier, MIN(ActualElapsedTime) FROM mytable WHERE DivWheelsOffs = 1605 OR DayOfWeek >= 3 GROUP BY Distance, Dest, UniqueCarrier LIMIT 15","hsqls":["SELECT Distance, Dest, UniqueCarrier, MIN(ActualElapsedTime) FROM mytable WHERE (DivWheelsOffs__MV0 = 1605 OR DivWheelsOffs__MV1 = 1605 OR DivWheelsOffs__MV2 = 1605 OR DivWheelsOffs__MV3 = 1605 OR DivWheelsOffs__MV4 = 1605) OR DayOfWeek >= 3 GROUP BY Distance, Dest, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DivDistance, AirlineID FROM mytable WHERE OriginAirportID NOT IN (12448, 15991, 14122, 13232, 10781) ORDER BY DepTimeBlk, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivDistance, AirlineID FROM mytable WHERE OriginAirportID NOT IN (12448, 15991, 14122, 13232, 10781) ORDER BY DepTimeBlk, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT OriginState, DestCityMarketID, \"Month\", MAX(ActualElapsedTime) FROM mytable WHERE OriginCityName IN ('Madison, WI', 'Manhattan/Ft. Riley, KS', 'Lexington, KY', 'Sioux Falls, SD', 'Fort Lauderdale, FL') OR ArrTime BETWEEN 1722 AND 235 GROUP BY OriginState, DestCityMarketID, \"Month\" LIMIT 28","hsqls":["SELECT OriginState, DestCityMarketID, Month, MAX(ActualElapsedTime) FROM mytable WHERE OriginCityName IN ('Madison, WI', 'Manhattan/Ft. Riley, KS', 'Lexington, KY', 'Sioux Falls, SD', 'Fort Lauderdale, FL') OR ArrTime BETWEEN 1722 AND 235 GROUP BY OriginState, DestCityMarketID, Month LIMIT 28"]}
-{"sql":"SELECT TotalAddGTime, DepTimeBlk, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR SecurityDelay NOT IN (1, -9999) OR TaxiOut BETWEEN 12 AND 47 LIMIT 27","hsqls":["SELECT TotalAddGTime, DepTimeBlk, DivActualElapsedTime FROM mytable WHERE (DivTailNums__MV0 IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums__MV1 IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums__MV2 IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums__MV3 IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums__MV4 IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F')) OR SecurityDelay NOT IN (1, -9999) OR TaxiOut BETWEEN 12 AND 47 LIMIT 10000"]}
+{"sql":"SELECT Distance, Dest, UniqueCarrier, MIN(ActualElapsedTime) FROM mytable WHERE DivWheelsOffs = 1605 OR DayOfWeek >= 3 GROUP BY Distance, Dest, UniqueCarrier LIMIT 15","hsqls":["SELECT Distance, Dest, UniqueCarrier, MIN(ActualElapsedTime) FROM mytable WHERE (DivWheelsOffs[1] = 1605 OR DivWheelsOffs[2] = 1605 OR DivWheelsOffs[3] = 1605 OR DivWheelsOffs[4] = 1605 OR DivWheelsOffs[5] = 1605) OR DayOfWeek >= 3 GROUP BY Distance, Dest, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivDistance, AirlineID FROM mytable WHERE OriginAirportID NOT IN (12448, 15991, 14122, 13232, 10781) ORDER BY DepTimeBlk, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT DivLongestGTimes, DivDistance, AirlineID FROM mytable WHERE OriginAirportID NOT IN (12448, 15991, 14122, 13232, 10781) ORDER BY DepTimeBlk, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT OriginState, DestCityMarketID, \"Month\", MAX(ActualElapsedTime) FROM mytable WHERE OriginCityName IN ('Madison, WI', 'Manhattan/Ft. Riley, KS', 'Lexington, KY', 'Sioux Falls, SD', 'Fort Lauderdale, FL') OR ArrTime BETWEEN 1722 AND 235 GROUP BY OriginState, DestCityMarketID, \"Month\" LIMIT 28","hsqls":["SELECT OriginState, DestCityMarketID, Month, MAX(ActualElapsedTime) FROM mytable WHERE OriginCityName IN ('Madison, WI', 'Manhattan/Ft. Riley, KS', 'Lexington, KY', 'Sioux Falls, SD', 'Fort Lauderdale, FL') OR ArrTime BETWEEN 1722 AND 235 GROUP BY OriginState, DestCityMarketID, `Month` LIMIT 28"]}
+{"sql":"SELECT TotalAddGTime, DepTimeBlk, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR SecurityDelay NOT IN (1, -9999) OR TaxiOut BETWEEN 12 AND 47 LIMIT 27","hsqls":["SELECT TotalAddGTime, DepTimeBlk, DivActualElapsedTime FROM mytable WHERE (DivTailNums[1] IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums[2] IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums[3] IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums[4] IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F') OR DivTailNums[5] IN ('N953WN', 'N3750D', 'N827JB', 'N948WN', 'N8619F')) OR SecurityDelay NOT IN (1, -9999) OR TaxiOut BETWEEN 12 AND 47 LIMIT 10000"]}
 {"sql":"SELECT AirTime FROM mytable WHERE WeatherDelay BETWEEN 177 AND 50 AND DayOfWeek BETWEEN 3 AND 4 ORDER BY Cancelled, DaysSinceEpoch LIMIT 19"}
 {"sql":"SELECT TailNum, OriginStateName, SUM(DivReachedDest), MIN(CRSElapsedTime), MAX(Distance) FROM mytable WHERE OriginWac BETWEEN 14 AND 42 GROUP BY TailNum, OriginStateName  ORDER BY TailNum, OriginStateName LIMIT 13","hsqls":["SELECT TailNum, OriginStateName, SUM(DivReachedDest), MIN(CRSElapsedTime), MAX(Distance) FROM mytable WHERE OriginWac BETWEEN 14 AND 42 GROUP BY TailNum, OriginStateName  ORDER BY TailNum, OriginStateName LIMIT 13"]}
-{"sql":"SELECT CRSDepTime, DivTotalGTimes, OriginStateName FROM mytable WHERE DepDel15 > 0 AND \"Year\" <> 2014 OR DaysSinceEpoch BETWEEN 16082 AND 16086 ORDER BY Cancelled, DestAirportID LIMIT 24","hsqls":["SELECT CRSDepTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, OriginStateName FROM mytable WHERE DepDel15 > 0 AND Year <> 2014 OR DaysSinceEpoch BETWEEN 16082 AND 16086 ORDER BY Cancelled, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime, DivTotalGTimes, OriginStateName FROM mytable WHERE DepDel15 > 0 AND \"Year\" <> 2014 OR DaysSinceEpoch BETWEEN 16082 AND 16086 ORDER BY Cancelled, DestAirportID LIMIT 24","hsqls":["SELECT CRSDepTime, DivTotalGTimes, OriginStateName FROM mytable WHERE DepDel15 > 0 AND `Year` <> 2014 OR DaysSinceEpoch BETWEEN 16082 AND 16086 ORDER BY Cancelled, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 15"}
-{"sql":"SELECT DivDistance, DivArrDelay, CRSElapsedTime FROM mytable WHERE DivLongestGTimes >= 75.0 AND DaysSinceEpoch <> 16096 ORDER BY Distance, SecurityDelay LIMIT 10","hsqls":["SELECT DivDistance, DivArrDelay, CRSElapsedTime FROM mytable WHERE (DivLongestGTimes__MV0 >= 75.0 OR DivLongestGTimes__MV1 >= 75.0 OR DivLongestGTimes__MV2 >= 75.0 OR DivLongestGTimes__MV3 >= 75.0 OR DivLongestGTimes__MV4 >= 75.0) AND DaysSinceEpoch <> 16096 ORDER BY Distance, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DivArrDelay, CRSElapsedTime FROM mytable WHERE DivLongestGTimes >= 75.0 AND DaysSinceEpoch <> 16096 ORDER BY Distance, SecurityDelay LIMIT 10","hsqls":["SELECT DivDistance, DivArrDelay, CRSElapsedTime FROM mytable WHERE (DivLongestGTimes[1] >= 75.0 OR DivLongestGTimes[2] >= 75.0 OR DivLongestGTimes[3] >= 75.0 OR DivLongestGTimes[4] >= 75.0 OR DivLongestGTimes[5] >= 75.0) AND DaysSinceEpoch <> 16096 ORDER BY Distance, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT DepDel15, MAX(DivActualElapsedTime) FROM mytable WHERE DestCityMarketID <> 30561 GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 23","hsqls":["SELECT DepDel15, MAX(DivActualElapsedTime) FROM mytable WHERE DestCityMarketID <> 30561 GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 23"]}
-{"sql":"SELECT WeatherDelay, \"Month\" FROM mytable WHERE DayOfWeek IN (3, 7, 6, 4) AND DestCityMarketID BETWEEN 31537 AND 31953 AND AirTime IN (21, 80) ORDER BY OriginCityName, TailNum, Dest LIMIT 26","hsqls":["SELECT WeatherDelay, Month FROM mytable WHERE DayOfWeek IN (3, 7, 6, 4) AND DestCityMarketID BETWEEN 31537 AND 31953 AND AirTime IN (21, 80) ORDER BY OriginCityName, TailNum, Dest LIMIT 26"]}
+{"sql":"SELECT WeatherDelay, \"Month\" FROM mytable WHERE DayOfWeek IN (3, 7, 6, 4) AND DestCityMarketID BETWEEN 31537 AND 31953 AND AirTime IN (21, 80) ORDER BY OriginCityName, TailNum, Dest LIMIT 26","hsqls":["SELECT WeatherDelay, `Month` FROM mytable WHERE DayOfWeek IN (3, 7, 6, 4) AND DestCityMarketID BETWEEN 31537 AND 31953 AND AirTime IN (21, 80) ORDER BY OriginCityName, TailNum, Dest LIMIT 26"]}
 {"sql":"SELECT DepTime FROM mytable WHERE TailNum BETWEEN 'N643SW' AND 'N33294' AND Cancelled <> 0 ORDER BY DestAirportSeqID LIMIT 23"}
 {"sql":"SELECT TaxiIn, DestAirportSeqID, COUNT(FirstDepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 181 AND 374 AND CarrierDelay BETWEEN 0 AND 150 AND WheelsOn BETWEEN 1133 AND 2230 GROUP BY TaxiIn, DestAirportSeqID  ORDER BY TaxiIn, DestAirportSeqID LIMIT 17","hsqls":["SELECT TaxiIn, DestAirportSeqID, COUNT(FirstDepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 181 AND 374 AND CarrierDelay BETWEEN 0 AND 150 AND WheelsOn BETWEEN 1133 AND 2230 GROUP BY TaxiIn, DestAirportSeqID  ORDER BY TaxiIn, DestAirportSeqID LIMIT 17"]}
 {"sql":"SELECT ArrTime FROM mytable WHERE FlightDate NOT IN ('2014-01-02') OR OriginStateFips BETWEEN 23 AND 25 ORDER BY CRSArrTime LIMIT 6"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DaysSinceEpoch IN (16098, 16071, 16073) LIMIT 6"}
 {"sql":"SELECT Cancelled FROM mytable ORDER BY DivDistance, TailNum, CancellationCode LIMIT 3"}
 {"sql":"SELECT MIN(LateAircraftDelay) FROM mytable WHERE OriginCityName NOT IN ('Fargo, ND', 'Phoenix, AZ', 'Saginaw/Bay City/Midland, MI', 'West Palm Beach/Palm Beach, FL') LIMIT 29"}
-{"sql":"SELECT WeatherDelay, SUM(Diverted) FROM mytable WHERE DivTailNums >= 'N462WN' GROUP BY WeatherDelay LIMIT 25","hsqls":["SELECT WeatherDelay, SUM(Diverted) FROM mytable WHERE (DivTailNums__MV0 >= 'N462WN' OR DivTailNums__MV1 >= 'N462WN' OR DivTailNums__MV2 >= 'N462WN' OR DivTailNums__MV3 >= 'N462WN' OR DivTailNums__MV4 >= 'N462WN') GROUP BY WeatherDelay LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivWheelsOffs FROM mytable WHERE TaxiIn IN (36) OR DepDelay BETWEEN 32.0 AND 211.0 OR AirTime BETWEEN 123 AND 196 LIMIT 28","hsqls":["SELECT DestWac, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiIn IN (36) OR DepDelay BETWEEN 32.0 AND 211.0 OR AirTime BETWEEN 123 AND 196 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, SUM(Diverted) FROM mytable WHERE DivTailNums >= 'N462WN' GROUP BY WeatherDelay LIMIT 25","hsqls":["SELECT WeatherDelay, SUM(Diverted) FROM mytable WHERE (DivTailNums[1] >= 'N462WN' OR DivTailNums[2] >= 'N462WN' OR DivTailNums[3] >= 'N462WN' OR DivTailNums[4] >= 'N462WN' OR DivTailNums[5] >= 'N462WN') GROUP BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivWheelsOffs FROM mytable WHERE TaxiIn IN (36) OR DepDelay BETWEEN 32.0 AND 211.0 OR AirTime BETWEEN 123 AND 196 LIMIT 28","hsqls":["SELECT DestWac, DivWheelsOffs FROM mytable WHERE TaxiIn IN (36) OR DepDelay BETWEEN 32.0 AND 211.0 OR AirTime BETWEEN 123 AND 196 LIMIT 10000"]}
 {"sql":"SELECT SUM(CRSDepTime), MAX(OriginWac), MAX(ArrTime) FROM mytable LIMIT 18"}
 {"sql":"SELECT DestState FROM mytable WHERE DepDelay BETWEEN 319.0 AND 340.0 LIMIT 21"}
 {"sql":"SELECT FirstDepTime, DivActualElapsedTime FROM mytable WHERE DayofMonth IN (18, 11) OR TaxiOut >= 56 LIMIT 19"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DestCityMarketID LIMIT 20","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DestCityMarketID LIMIT 20","hsqls":["SELECT DivWheelsOns FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, CRSArrTime, DivActualElapsedTime FROM mytable WHERE ArrivalDelayGroups IN (5, 12) OR DivArrDelay BETWEEN 73 AND 205 LIMIT 3"}
 {"sql":"SELECT OriginAirportSeqID, ArrDel15, UniqueCarrier FROM mytable WHERE DayOfWeek >= 3 OR DayofMonth <= 30 LIMIT 12"}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE Diverted NOT IN (1, 0) ORDER BY FlightDate LIMIT 9"}
 {"sql":"SELECT OriginState FROM mytable LIMIT 15"}
 {"sql":"SELECT Quarter, OriginCityName, ArrDelayMinutes FROM mytable ORDER BY NASDelay LIMIT 14"}
-{"sql":"SELECT MAX(\"Year\"), MIN(Distance) FROM mytable","hsqls":["SELECT MAX(Year), MIN(Distance) FROM mytable"]}
+{"sql":"SELECT MAX(\"Year\"), MIN(Distance) FROM mytable","hsqls":["SELECT MAX(`Year`), MIN(Distance) FROM mytable"]}
 {"sql":"SELECT TaxiIn, Origin, CRSDepTime FROM mytable ORDER BY UniqueCarrier LIMIT 19"}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE CancellationCode < 'A' ORDER BY DepDel15, ArrivalDelayGroups LIMIT 22","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CancellationCode < 'A' ORDER BY DepDel15, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE CancellationCode < 'A' ORDER BY DepDel15, ArrivalDelayGroups LIMIT 22","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE CancellationCode < 'A' ORDER BY DepDel15, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT OriginState, MIN(DestCityMarketID), MAX(DestCityMarketID), COUNT(ArrDel15) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 6","hsqls":["SELECT OriginState, MIN(DestCityMarketID), MAX(DestCityMarketID), COUNT(ArrDel15) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 6"]}
 {"sql":"SELECT Diverted, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DestWac NOT IN (82, 37) AND DepDel15 IN (1, 0, -9999) OR ArrTime BETWEEN 1244 AND 4 GROUP BY Diverted, DivActualElapsedTime  ORDER BY Diverted, DivActualElapsedTime LIMIT 10","hsqls":["SELECT Diverted, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DestWac NOT IN (82, 37) AND DepDel15 IN (1, 0, -9999) OR ArrTime BETWEEN 1244 AND 4 GROUP BY Diverted, DivActualElapsedTime  ORDER BY Diverted, DivActualElapsedTime LIMIT 10"]}
 {"sql":"SELECT DaysSinceEpoch, MIN(TaxiIn), COUNT(DivAirportLandings) FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'OO' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 22","hsqls":["SELECT DaysSinceEpoch, MIN(TaxiIn), COUNT(DivAirportLandings) FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'OO' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 22"]}
-{"sql":"SELECT COUNT(DepDelay), SUM(LongestAddGTime), MIN(DivAirportLandings) FROM mytable WHERE DivTailNums IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') AND Origin IN ('ITO', 'SNA', 'FSD', 'OAJ', 'ILM') LIMIT 12","hsqls":["SELECT COUNT(DepDelay), SUM(LongestAddGTime), MIN(DivAirportLandings)  FROM mytable WHERE (DivTailNums__MV0 IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums__MV1 IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums__MV2 IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums__MV3 IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums__MV4 IN ('N365NB', 'N299SW', 'N797MX', 'N214WN')) AND Origin IN ('ITO', 'SNA', 'FSD', 'OAJ', 'ILM') LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepDelay), SUM(LongestAddGTime), MIN(DivAirportLandings) FROM mytable WHERE DivTailNums IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') AND Origin IN ('ITO', 'SNA', 'FSD', 'OAJ', 'ILM') LIMIT 12","hsqls":["SELECT COUNT(DepDelay), SUM(LongestAddGTime), MIN(DivAirportLandings)  FROM mytable WHERE (DivTailNums[1] IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums[2] IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums[3] IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums[4] IN ('N365NB', 'N299SW', 'N797MX', 'N214WN') OR DivTailNums[5] IN ('N365NB', 'N299SW', 'N797MX', 'N214WN')) AND Origin IN ('ITO', 'SNA', 'FSD', 'OAJ', 'ILM') LIMIT 10000"]}
 {"sql":"SELECT FlightNum, OriginWac FROM mytable LIMIT 14"}
 {"sql":"SELECT TailNum, MAX(ArrDelay), COUNT(Carrier), MAX(ArrDel15) FROM mytable WHERE DayofMonth BETWEEN 28 AND 8 GROUP BY TailNum  ORDER BY TailNum LIMIT 8","hsqls":["SELECT TailNum, MAX(ArrDelay), COUNT(Carrier), MAX(ArrDel15) FROM mytable WHERE DayofMonth BETWEEN 28 AND 8 GROUP BY TailNum  ORDER BY TailNum LIMIT 8"]}
-{"sql":"SELECT SUM(DaysSinceEpoch), AVG(DepartureDelayGroups) FROM mytable WHERE DivAirports BETWEEN 'MSP' AND 'SAT' AND OriginWac < 66 OR DivDistance <= 328 LIMIT 20","hsqls":["SELECT SUM(DaysSinceEpoch), AVG(DepartureDelayGroups)  FROM mytable WHERE (DivAirports__MV0 BETWEEN 'MSP' AND 'SAT' OR DivAirports__MV1 BETWEEN 'MSP' AND 'SAT' OR DivAirports__MV2 BETWEEN 'MSP' AND 'SAT' OR DivAirports__MV3 BETWEEN 'MSP' AND 'SAT' OR DivAirports__MV4 BETWEEN 'MSP' AND 'SAT') AND OriginWac < 66 OR DivDistance <= 328 LIMIT 10000"]}
+{"sql":"SELECT SUM(DaysSinceEpoch), AVG(DepartureDelayGroups) FROM mytable WHERE DivAirports BETWEEN 'MSP' AND 'SAT' AND OriginWac < 66 OR DivDistance <= 328 LIMIT 20","hsqls":["SELECT SUM(DaysSinceEpoch), AVG(DepartureDelayGroups)  FROM mytable WHERE (DivAirports[1] BETWEEN 'MSP' AND 'SAT' OR DivAirports[2] BETWEEN 'MSP' AND 'SAT' OR DivAirports[3] BETWEEN 'MSP' AND 'SAT' OR DivAirports[4] BETWEEN 'MSP' AND 'SAT' OR DivAirports[5] BETWEEN 'MSP' AND 'SAT') AND OriginWac < 66 OR DivDistance <= 328 LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, MAX(DivActualElapsedTime) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 18","hsqls":["SELECT FirstDepTime, MAX(DivActualElapsedTime) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 18"]}
 {"sql":"SELECT WeatherDelay, CRSArrTime, DayOfWeek FROM mytable WHERE WeatherDelay >= 98 OR ArrDelayMinutes IN (269.0) ORDER BY DestState, Quarter, AirlineID LIMIT 15"}
 {"sql":"SELECT OriginWac FROM mytable WHERE CRSElapsedTime < 186 OR DestAirportID BETWEEN 12478 AND 13577 LIMIT 13"}
 {"sql":"SELECT OriginStateFips, Flights, ArrDel15 FROM mytable WHERE DivDistance NOT IN (306) AND DestCityName >= 'Harlingen/San Benito, TX' LIMIT 10"}
-{"sql":"SELECT DivLongestGTimes, DestCityMarketID FROM mytable WHERE Quarter <= 1 OR DestAirportID > 15841 ORDER BY ArrDelayMinutes, DestCityName LIMIT 9","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestCityMarketID FROM mytable WHERE Quarter <= 1 OR DestAirportID > 15841 ORDER BY ArrDelayMinutes, DestCityName LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 23","hsqls":["SELECT WheelsOff, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestCityMarketID FROM mytable WHERE Quarter <= 1 OR DestAirportID > 15841 ORDER BY ArrDelayMinutes, DestCityName LIMIT 9","hsqls":["SELECT DivLongestGTimes, DestCityMarketID FROM mytable WHERE Quarter <= 1 OR DestAirportID > 15841 ORDER BY ArrDelayMinutes, DestCityName LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 23","hsqls":["SELECT WheelsOff, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, DivActualElapsedTime, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 13871 AND 14730 AND Quarter IN (1) GROUP BY DestAirportID, DivActualElapsedTime, ArrivalDelayGroups","hsqls":["SELECT DestAirportID, DivActualElapsedTime, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 13871 AND 14730 AND Quarter IN (1) GROUP BY DestAirportID, DivActualElapsedTime, ArrivalDelayGroups"]}
 {"sql":"SELECT ArrDelay, DayofMonth, COUNT(*) FROM mytable WHERE AirlineID NOT IN (19977) OR Cancelled BETWEEN 0 AND 0 GROUP BY ArrDelay, DayofMonth  ORDER BY ArrDelay, DayofMonth LIMIT 10","hsqls":["SELECT ArrDelay, DayofMonth, COUNT(*) FROM mytable WHERE AirlineID NOT IN (19977) OR Cancelled BETWEEN 0 AND 0 GROUP BY ArrDelay, DayofMonth  ORDER BY ArrDelay, DayofMonth LIMIT 10"]}
-{"sql":"SELECT TaxiOut, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE \"Year\" <= 2014 GROUP BY TaxiOut, SecurityDelay, DestAirportSeqID LIMIT 7","hsqls":["SELECT TaxiOut, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE Year <= 2014 GROUP BY TaxiOut, SecurityDelay, DestAirportSeqID LIMIT 7"]}
+{"sql":"SELECT TaxiOut, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE \"Year\" <= 2014 GROUP BY TaxiOut, SecurityDelay, DestAirportSeqID LIMIT 7","hsqls":["SELECT TaxiOut, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE `Year` <= 2014 GROUP BY TaxiOut, SecurityDelay, DestAirportSeqID LIMIT 7"]}
 {"sql":"SELECT TaxiIn, DepDel15, OriginWac FROM mytable ORDER BY DistanceGroup, Quarter, DestAirportID LIMIT 15"}
 {"sql":"SELECT DestCityName FROM mytable WHERE DivDistance > 368 AND OriginStateFips BETWEEN 47 AND 24 ORDER BY DestState, DestAirportSeqID, DivAirportLandings"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE Cancelled >= 1 AND OriginAirportSeqID BETWEEN 1445702 AND 1114603 LIMIT 17","hsqls":["SELECT Month FROM mytable WHERE Cancelled >= 1 AND OriginAirportSeqID BETWEEN 1445702 AND 1114603 LIMIT 17"]}
-{"sql":"SELECT MAX(CRSDepTime), COUNT(CancellationCode), MAX(WeatherDelay) FROM mytable WHERE \"Year\" IN (2014) LIMIT 3","hsqls":["SELECT MAX(CRSDepTime), COUNT(CancellationCode), MAX(WeatherDelay) FROM mytable WHERE Year IN (2014) LIMIT 3"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY DivAirportLandings, DayOfWeek LIMIT 9","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Year BETWEEN 2014 AND 2014 ORDER BY DivAirportLandings, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT CRSDepTime FROM mytable WHERE DivAirportSeqIDs BETWEEN 1415305 AND 1093002 AND DivAirportIDs <= 11292 OR CRSDepTime > 919 ORDER BY TaxiOut, DepTimeBlk, OriginWac LIMIT 16","hsqls":["SELECT CRSDepTime FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs__MV1 BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs__MV2 BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs__MV3 BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs__MV4 BETWEEN 1415305 AND 1093002) AND (DivAirportIDs__MV0 <= 11292 OR DivAirportIDs__MV1 <= 11292 OR DivAirportIDs__MV2 <= 11292 OR DivAirportIDs__MV3 <= 11292 OR DivAirportIDs__MV4 <= 11292) OR CRSDepTime > 919 ORDER BY TaxiOut, DepTimeBlk, OriginWac LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DestAirportSeqID IN (1153703) OR \"Year\" NOT IN (2014) OR CRSArrTime IN (1655, 740, 18, 248) LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE DestAirportSeqID IN (1153703) OR Year NOT IN (2014) OR CRSArrTime IN (1655, 740, 18, 248) LIMIT 5"]}
-{"sql":"SELECT WheelsOff, \"Year\" FROM mytable WHERE Flights NOT IN (1) AND DivTailNums IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') LIMIT 2","hsqls":["SELECT WheelsOff, Year FROM mytable WHERE Flights NOT IN (1) AND (DivTailNums__MV0 IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums__MV1 IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums__MV2 IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums__MV3 IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums__MV4 IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ')) LIMIT 10000"]}
-{"sql":"SELECT MAX(AirlineID), MIN(OriginAirportSeqID), SUM(ArrivalDelayGroups) FROM mytable WHERE \"Year\" = 2014 AND DestStateFips IN (15) LIMIT 6","hsqls":["SELECT MAX(AirlineID), MIN(OriginAirportSeqID), SUM(ArrivalDelayGroups) FROM mytable WHERE Year = 2014 AND DestStateFips IN (15) LIMIT 6"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE Cancelled >= 1 AND OriginAirportSeqID BETWEEN 1445702 AND 1114603 LIMIT 17","hsqls":["SELECT `Month` FROM mytable WHERE Cancelled >= 1 AND OriginAirportSeqID BETWEEN 1445702 AND 1114603 LIMIT 17"]}
+{"sql":"SELECT MAX(CRSDepTime), COUNT(CancellationCode), MAX(WeatherDelay) FROM mytable WHERE \"Year\" IN (2014) LIMIT 3","hsqls":["SELECT MAX(CRSDepTime), COUNT(CancellationCode), MAX(WeatherDelay) FROM mytable WHERE `Year` IN (2014) LIMIT 3"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY DivAirportLandings, DayOfWeek LIMIT 9","hsqls":["SELECT DivAirportIDs FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 ORDER BY DivAirportLandings, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime FROM mytable WHERE DivAirportSeqIDs BETWEEN 1415305 AND 1093002 AND DivAirportIDs <= 11292 OR CRSDepTime > 919 ORDER BY TaxiOut, DepTimeBlk, OriginWac LIMIT 16","hsqls":["SELECT CRSDepTime FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs[2] BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs[3] BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs[4] BETWEEN 1415305 AND 1093002 OR DivAirportSeqIDs[5] BETWEEN 1415305 AND 1093002) AND (DivAirportIDs[1] <= 11292 OR DivAirportIDs[2] <= 11292 OR DivAirportIDs[3] <= 11292 OR DivAirportIDs[4] <= 11292 OR DivAirportIDs[5] <= 11292) OR CRSDepTime > 919 ORDER BY TaxiOut, DepTimeBlk, OriginWac LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DestAirportSeqID IN (1153703) OR \"Year\" NOT IN (2014) OR CRSArrTime IN (1655, 740, 18, 248) LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE DestAirportSeqID IN (1153703) OR `Year` NOT IN (2014) OR CRSArrTime IN (1655, 740, 18, 248) LIMIT 5"]}
+{"sql":"SELECT WheelsOff, \"Year\" FROM mytable WHERE Flights NOT IN (1) AND DivTailNums IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') LIMIT 2","hsqls":["SELECT WheelsOff, `Year` FROM mytable WHERE Flights NOT IN (1) AND (DivTailNums[1] IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums[2] IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums[3] IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums[4] IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ') OR DivTailNums[5] IN ('N936DN', 'N743SW', 'N314NB', 'N627MQ')) LIMIT 10000"]}
+{"sql":"SELECT MAX(AirlineID), MIN(OriginAirportSeqID), SUM(ArrivalDelayGroups) FROM mytable WHERE \"Year\" = 2014 AND DestStateFips IN (15) LIMIT 6","hsqls":["SELECT MAX(AirlineID), MIN(OriginAirportSeqID), SUM(ArrivalDelayGroups) FROM mytable WHERE `Year` = 2014 AND DestStateFips IN (15) LIMIT 6"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE WeatherDelay < 30 LIMIT 28"}
 {"sql":"SELECT DivAirportLandings, CRSElapsedTime, COUNT(ArrivalDelayGroups), AVG(OriginStateFips), AVG(DivActualElapsedTime) FROM mytable WHERE AirlineID BETWEEN 20437 AND 20436 AND CRSArrTime NOT IN (2227, 1900, 1106, 2036, 2116) GROUP BY DivAirportLandings, CRSElapsedTime  ORDER BY DivAirportLandings, CRSElapsedTime LIMIT 28","hsqls":["SELECT DivAirportLandings, CRSElapsedTime, COUNT(ArrivalDelayGroups), AVG(OriginStateFips), AVG(DivActualElapsedTime) FROM mytable WHERE AirlineID BETWEEN 20437 AND 20436 AND CRSArrTime NOT IN (2227, 1900, 1106, 2036, 2116) GROUP BY DivAirportLandings, CRSElapsedTime  ORDER BY DivAirportLandings, CRSElapsedTime LIMIT 28"]}
 {"sql":"SELECT Quarter, \"Month\", DaysSinceEpoch, AVG(DepDelay) FROM mytable GROUP BY Quarter, \"Month\", DaysSinceEpoch LIMIT 22","hsqls":["SELECT Quarter, Month, DaysSinceEpoch, AVG(DepDelay) FROM mytable GROUP BY Quarter, Month, DaysSinceEpoch LIMIT 22"]}
@@ -1734,46 +1734,46 @@
 {"sql":"SELECT DepartureDelayGroups, DestWac, DestAirportSeqID FROM mytable WHERE ArrDelayMinutes IN (53.0, 220.0, 74.0) ORDER BY OriginCityName, NASDelay LIMIT 6"}
 {"sql":"SELECT LateAircraftDelay, DepDelayMinutes, CarrierDelay, MAX(ArrDel15), MIN(DivArrDelay), SUM(OriginAirportID) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'C' OR OriginState NOT IN ('ND', 'KS', 'NJ') GROUP BY LateAircraftDelay, DepDelayMinutes, CarrierDelay  ORDER BY LateAircraftDelay, DepDelayMinutes, CarrierDelay LIMIT 28","hsqls":["SELECT LateAircraftDelay, DepDelayMinutes, CarrierDelay, MAX(ArrDel15), MIN(DivArrDelay), SUM(OriginAirportID) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'C' OR OriginState NOT IN ('ND', 'KS', 'NJ') GROUP BY LateAircraftDelay, DepDelayMinutes, CarrierDelay  ORDER BY LateAircraftDelay, DepDelayMinutes, CarrierDelay LIMIT 28"]}
 {"sql":"SELECT Distance, CRSElapsedTime, MAX(DestAirportSeqID), MAX(OriginAirportID), MAX(WeatherDelay) FROM mytable GROUP BY Distance, CRSElapsedTime  ORDER BY Distance, CRSElapsedTime LIMIT 13","hsqls":["SELECT Distance, CRSElapsedTime, MAX(DestAirportSeqID), MAX(OriginAirportID), MAX(WeatherDelay) FROM mytable GROUP BY Distance, CRSElapsedTime  ORDER BY Distance, CRSElapsedTime LIMIT 13"]}
-{"sql":"SELECT DivTailNums FROM mytable ORDER BY DivDistance LIMIT 17","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable ORDER BY DivDistance LIMIT 17","hsqls":["SELECT DivTailNums FROM mytable ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, Dest, DestAirportID, COUNT(*) FROM mytable GROUP BY OriginCityMarketID, Dest, DestAirportID  ORDER BY OriginCityMarketID, Dest, DestAirportID LIMIT 24","hsqls":["SELECT OriginCityMarketID, Dest, DestAirportID, COUNT(*) FROM mytable GROUP BY OriginCityMarketID, Dest, DestAirportID  ORDER BY OriginCityMarketID, Dest, DestAirportID LIMIT 24"]}
 {"sql":"SELECT AVG(CRSDepTime) FROM mytable WHERE Dest = 'EYW' AND CRSArrTime = 1336 OR DayofMonth >= 1 LIMIT 10"}
-{"sql":"SELECT DivDistance, COUNT(*) FROM mytable WHERE ArrDelay = 152.0 OR DepDelay <= 73.0 AND DivWheelsOffs >= 1159 GROUP BY DivDistance LIMIT 8","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable WHERE ArrDelay = 152.0 OR DepDelay <= 73.0 AND (DivWheelsOffs__MV0 >= 1159 OR DivWheelsOffs__MV1 >= 1159 OR DivWheelsOffs__MV2 >= 1159 OR DivWheelsOffs__MV3 >= 1159 OR DivWheelsOffs__MV4 >= 1159) GROUP BY DivDistance LIMIT 10000"]}
-{"sql":"SELECT DepDel15 FROM mytable WHERE DivAirportSeqIDs BETWEEN 1066602 AND 1291503 ORDER BY DepDel15, \"Month\" LIMIT 7","hsqls":["SELECT DepDel15 FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs__MV1 BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs__MV2 BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs__MV3 BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs__MV4 BETWEEN 1066602 AND 1291503) ORDER BY DepDel15, Month LIMIT 10000"]}
+{"sql":"SELECT DivDistance, COUNT(*) FROM mytable WHERE ArrDelay = 152.0 OR DepDelay <= 73.0 AND DivWheelsOffs >= 1159 GROUP BY DivDistance LIMIT 8","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable WHERE ArrDelay = 152.0 OR DepDelay <= 73.0 AND (DivWheelsOffs[1] >= 1159 OR DivWheelsOffs[2] >= 1159 OR DivWheelsOffs[3] >= 1159 OR DivWheelsOffs[4] >= 1159 OR DivWheelsOffs[5] >= 1159) GROUP BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DepDel15 FROM mytable WHERE DivAirportSeqIDs BETWEEN 1066602 AND 1291503 ORDER BY DepDel15, \"Month\" LIMIT 7","hsqls":["SELECT DepDel15 FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs[2] BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs[3] BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs[4] BETWEEN 1066602 AND 1291503 OR DivAirportSeqIDs[5] BETWEEN 1066602 AND 1291503) ORDER BY DepDel15, `Month` LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE DestAirportID >= 15249 AND DayOfWeek NOT IN (6) OR WheelsOff <= 1920 ORDER BY Quarter, FirstDepTime, DestStateName LIMIT 25"}
-{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY SecurityDelay LIMIT 1","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable ORDER BY SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY SecurityDelay LIMIT 1","hsqls":["SELECT DivWheelsOns FROM mytable ORDER BY SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Carrier, DestCityMarketID FROM mytable WHERE DepDelayMinutes NOT IN (81.0, 271.0) AND DestAirportSeqID = 1114603 AND TaxiIn BETWEEN 80 AND 116 ORDER BY FlightNum, DepDelayMinutes LIMIT 6"}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE NASDelay > 53 OR \"Year\" NOT IN (2014) OR TailNum BETWEEN 'N407WN' AND 'N576SW' ORDER BY DivReachedDest, DepDelayMinutes, OriginWac LIMIT 18","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE NASDelay > 53 OR Year NOT IN (2014) OR TailNum BETWEEN 'N407WN' AND 'N576SW' ORDER BY DivReachedDest, DepDelayMinutes, OriginWac LIMIT 10000"]}
-{"sql":"SELECT DestStateName, DayofMonth, DivActualElapsedTime FROM mytable WHERE OriginState IN ('TX', 'CO', 'NH', 'WV', 'SC') AND DivTailNums IN ('N13903', 'N925AT', 'N560UW') OR CancellationCode IN ('A', 'B') ORDER BY OriginStateFips, DivDistance LIMIT 20","hsqls":["SELECT DestStateName, DayofMonth, DivActualElapsedTime FROM mytable WHERE OriginState IN ('TX', 'CO', 'NH', 'WV', 'SC') AND (DivTailNums__MV0 IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums__MV1 IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums__MV2 IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums__MV3 IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums__MV4 IN ('N13903', 'N925AT', 'N560UW')) OR CancellationCode IN ('A', 'B') ORDER BY OriginStateFips, DivDistance LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE NASDelay > 53 OR \"Year\" NOT IN (2014) OR TailNum BETWEEN 'N407WN' AND 'N576SW' ORDER BY DivReachedDest, DepDelayMinutes, OriginWac LIMIT 18","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE NASDelay > 53 OR `Year` NOT IN (2014) OR TailNum BETWEEN 'N407WN' AND 'N576SW' ORDER BY DivReachedDest, DepDelayMinutes, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DestStateName, DayofMonth, DivActualElapsedTime FROM mytable WHERE OriginState IN ('TX', 'CO', 'NH', 'WV', 'SC') AND DivTailNums IN ('N13903', 'N925AT', 'N560UW') OR CancellationCode IN ('A', 'B') ORDER BY OriginStateFips, DivDistance LIMIT 20","hsqls":["SELECT DestStateName, DayofMonth, DivActualElapsedTime FROM mytable WHERE OriginState IN ('TX', 'CO', 'NH', 'WV', 'SC') AND (DivTailNums[1] IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums[2] IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums[3] IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums[4] IN ('N13903', 'N925AT', 'N560UW') OR DivTailNums[5] IN ('N13903', 'N925AT', 'N560UW')) OR CancellationCode IN ('A', 'B') ORDER BY OriginStateFips, DivDistance LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, ArrivalDelayGroups FROM mytable WHERE Distance = 31 OR OriginCityMarketID BETWEEN 31337 AND 32337 ORDER BY TailNum LIMIT 16"}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DivWheelsOns >= 2237 LIMIT 16","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivWheelsOns__MV0 >= 2237 OR DivWheelsOns__MV1 >= 2237 OR DivWheelsOns__MV2 >= 2237 OR DivWheelsOns__MV3 >= 2237 OR DivWheelsOns__MV4 >= 2237) LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DivWheelsOns >= 2237 LIMIT 16","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivWheelsOns[1] >= 2237 OR DivWheelsOns[2] >= 2237 OR DivWheelsOns[3] >= 2237 OR DivWheelsOns[4] >= 2237 OR DivWheelsOns[5] >= 2237) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, Cancelled, DivArrDelay, MAX(DivDistance), MIN(DepDelay), AVG(DepDelayMinutes) FROM mytable WHERE DepTime <= 2139 AND DestAirportSeqID BETWEEN 1018502 AND 1042302 GROUP BY TaxiIn, Cancelled, DivArrDelay  ORDER BY TaxiIn, Cancelled, DivArrDelay LIMIT 21","hsqls":["SELECT TaxiIn, Cancelled, DivArrDelay, MAX(DivDistance), MIN(DepDelay), AVG(DepDelayMinutes) FROM mytable WHERE DepTime <= 2139 AND DestAirportSeqID BETWEEN 1018502 AND 1042302 GROUP BY TaxiIn, Cancelled, DivArrDelay  ORDER BY TaxiIn, Cancelled, DivArrDelay LIMIT 21"]}
 {"sql":"SELECT OriginState, ArrTime, COUNT(DestState) FROM mytable WHERE DayofMonth NOT IN (10, 30, 9, 8) OR CRSElapsedTime = 279 AND UniqueCarrier < 'DL' GROUP BY OriginState, ArrTime","hsqls":["SELECT OriginState, ArrTime, COUNT(DestState) FROM mytable WHERE DayofMonth NOT IN (10, 30, 9, 8) OR CRSElapsedTime = 279 AND UniqueCarrier < 'DL' GROUP BY OriginState, ArrTime"]}
 {"sql":"SELECT ArrDelayMinutes, UniqueCarrier FROM mytable ORDER BY LateAircraftDelay, CarrierDelay, ArrDel15 LIMIT 25"}
-{"sql":"SELECT Carrier FROM mytable WHERE DivTotalGTimes IN (1, 92, 36, 70, 60) AND DestStateName NOT IN ('Louisiana', 'West Virginia', 'Iowa') ORDER BY TaxiOut, NASDelay, ArrDel15 LIMIT 22","hsqls":["SELECT Carrier FROM mytable WHERE (DivTotalGTimes__MV0 IN (1, 92, 36, 70, 60) OR DivTotalGTimes__MV1 IN (1, 92, 36, 70, 60) OR DivTotalGTimes__MV2 IN (1, 92, 36, 70, 60) OR DivTotalGTimes__MV3 IN (1, 92, 36, 70, 60) OR DivTotalGTimes__MV4 IN (1, 92, 36, 70, 60)) AND DestStateName NOT IN ('Louisiana', 'West Virginia', 'Iowa') ORDER BY TaxiOut, NASDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT Carrier FROM mytable WHERE DivTotalGTimes IN (1, 92, 36, 70, 60) AND DestStateName NOT IN ('Louisiana', 'West Virginia', 'Iowa') ORDER BY TaxiOut, NASDelay, ArrDel15 LIMIT 22","hsqls":["SELECT Carrier FROM mytable WHERE (DivTotalGTimes[1] IN (1, 92, 36, 70, 60) OR DivTotalGTimes[2] IN (1, 92, 36, 70, 60) OR DivTotalGTimes[3] IN (1, 92, 36, 70, 60) OR DivTotalGTimes[4] IN (1, 92, 36, 70, 60) OR DivTotalGTimes[5] IN (1, 92, 36, 70, 60)) AND DestStateName NOT IN ('Louisiana', 'West Virginia', 'Iowa') ORDER BY TaxiOut, NASDelay, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, Origin, CRSDepTime, COUNT(*) FROM mytable WHERE NASDelay BETWEEN 4 AND 96 AND OriginStateName IN ('Massachusetts', 'Iowa') GROUP BY DivReachedDest, Origin, CRSDepTime  ORDER BY DivReachedDest, Origin, CRSDepTime LIMIT 29","hsqls":["SELECT DivReachedDest, Origin, CRSDepTime, COUNT(*) FROM mytable WHERE NASDelay BETWEEN 4 AND 96 AND OriginStateName IN ('Massachusetts', 'Iowa') GROUP BY DivReachedDest, Origin, CRSDepTime  ORDER BY DivReachedDest, Origin, CRSDepTime LIMIT 29"]}
 {"sql":"SELECT Distance, ArrTimeBlk, CRSElapsedTime, AVG(CRSElapsedTime) FROM mytable GROUP BY Distance, ArrTimeBlk, CRSElapsedTime  ORDER BY Distance, ArrTimeBlk, CRSElapsedTime LIMIT 8","hsqls":["SELECT Distance, ArrTimeBlk, CRSElapsedTime, AVG(CRSElapsedTime) FROM mytable GROUP BY Distance, ArrTimeBlk, CRSElapsedTime  ORDER BY Distance, ArrTimeBlk, CRSElapsedTime LIMIT 8"]}
 {"sql":"SELECT DivReachedDest, DepDelay, Dest FROM mytable WHERE ArrDelay <> 363.0 OR WheelsOff BETWEEN 1836 AND 905 OR DivReachedDest BETWEEN 1 AND 1 ORDER BY DayofMonth LIMIT 11"}
 {"sql":"SELECT WheelsOff, SecurityDelay, DestStateFips, SUM(DepTime), SUM(OriginAirportSeqID) FROM mytable WHERE SecurityDelay BETWEEN 0 AND 10 GROUP BY WheelsOff, SecurityDelay, DestStateFips  ORDER BY WheelsOff, SecurityDelay, DestStateFips LIMIT 12","hsqls":["SELECT WheelsOff, SecurityDelay, DestStateFips, SUM(DepTime), SUM(OriginAirportSeqID) FROM mytable WHERE SecurityDelay BETWEEN 0 AND 10 GROUP BY WheelsOff, SecurityDelay, DestStateFips  ORDER BY WheelsOff, SecurityDelay, DestStateFips LIMIT 12"]}
-{"sql":"SELECT TaxiOut, DepartureDelayGroups, \"Year\", MAX(OriginStateFips), MAX(Cancelled) FROM mytable WHERE DestStateFips < 6 GROUP BY TaxiOut, DepartureDelayGroups, \"Year\" LIMIT 16","hsqls":["SELECT TaxiOut, DepartureDelayGroups, Year, MAX(OriginStateFips), MAX(Cancelled) FROM mytable WHERE DestStateFips < 6 GROUP BY TaxiOut, DepartureDelayGroups, Year LIMIT 16"]}
+{"sql":"SELECT TaxiOut, DepartureDelayGroups, \"Year\", MAX(OriginStateFips), MAX(Cancelled) FROM mytable WHERE DestStateFips < 6 GROUP BY TaxiOut, DepartureDelayGroups, \"Year\" LIMIT 16","hsqls":["SELECT TaxiOut, DepartureDelayGroups, Year, MAX(OriginStateFips), MAX(Cancelled) FROM mytable WHERE DestStateFips < 6 GROUP BY TaxiOut, DepartureDelayGroups, `Year` LIMIT 16"]}
 {"sql":"SELECT NASDelay, AirTime, WheelsOn, SUM(TaxiOut), MIN(CRSElapsedTime), MAX(DayofMonth) FROM mytable GROUP BY NASDelay, AirTime, WheelsOn  ORDER BY NASDelay, AirTime, WheelsOn LIMIT 4","hsqls":["SELECT NASDelay, AirTime, WheelsOn, SUM(TaxiOut), MIN(CRSElapsedTime), MAX(DayofMonth) FROM mytable GROUP BY NASDelay, AirTime, WheelsOn  ORDER BY NASDelay, AirTime, WheelsOn LIMIT 4"]}
-{"sql":"SELECT DivReachedDest, OriginStateFips, DivWheelsOffs FROM mytable WHERE DestCityMarketID IN (30562) ORDER BY DivDistance, AirlineID LIMIT 5","hsqls":["SELECT DivReachedDest, OriginStateFips, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DestCityMarketID IN (30562) ORDER BY DivDistance, AirlineID LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, OriginStateFips, DivWheelsOffs FROM mytable WHERE DestCityMarketID IN (30562) ORDER BY DivDistance, AirlineID LIMIT 5","hsqls":["SELECT DivReachedDest, OriginStateFips, DivWheelsOffs FROM mytable WHERE DestCityMarketID IN (30562) ORDER BY DivDistance, AirlineID LIMIT 10000"]}
 {"sql":"SELECT Quarter, SecurityDelay, DepTimeBlk, COUNT(Carrier), MIN(OriginAirportID), COUNT(ArrTime) FROM mytable GROUP BY Quarter, SecurityDelay, DepTimeBlk  ORDER BY Quarter, SecurityDelay, DepTimeBlk LIMIT 13","hsqls":["SELECT Quarter, SecurityDelay, DepTimeBlk, COUNT(Carrier), MIN(OriginAirportID), COUNT(ArrTime) FROM mytable GROUP BY Quarter, SecurityDelay, DepTimeBlk  ORDER BY Quarter, SecurityDelay, DepTimeBlk LIMIT 13"]}
-{"sql":"SELECT DivReachedDest, FlightDate FROM mytable WHERE OriginState = 'MT' OR TailNum BETWEEN 'N4YFAA' AND 'N297WN' ORDER BY \"Month\" LIMIT 25","hsqls":["SELECT DivReachedDest, FlightDate FROM mytable WHERE OriginState = 'MT' OR TailNum BETWEEN 'N4YFAA' AND 'N297WN' ORDER BY Month LIMIT 25"]}
-{"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, DivTailNums FROM mytable ORDER BY OriginCityMarketID, DestStateFips, CRSDepTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, LateAircraftDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY OriginCityMarketID, DestStateFips, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, FlightDate FROM mytable WHERE OriginState = 'MT' OR TailNum BETWEEN 'N4YFAA' AND 'N297WN' ORDER BY \"Month\" LIMIT 25","hsqls":["SELECT DivReachedDest, FlightDate FROM mytable WHERE OriginState = 'MT' OR TailNum BETWEEN 'N4YFAA' AND 'N297WN' ORDER BY `Month` LIMIT 25"]}
+{"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, DivTailNums FROM mytable ORDER BY OriginCityMarketID, DestStateFips, CRSDepTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, LateAircraftDelay, DivTailNums FROM mytable ORDER BY OriginCityMarketID, DestStateFips, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DestWac, CRSArrTime FROM mytable WHERE DivReachedDest > -9999 LIMIT 17"}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE ArrivalDelayGroups <> 2 AND DestCityMarketID > 31041 AND OriginAirportID NOT IN (10980, 13344) ORDER BY DaysSinceEpoch LIMIT 2"}
 {"sql":"SELECT Diverted, Flights, COUNT(DayofMonth), COUNT(FlightDate) FROM mytable WHERE DaysSinceEpoch IN (16097, 16077) GROUP BY Diverted, Flights  ORDER BY Diverted, Flights LIMIT 12","hsqls":["SELECT Diverted, Flights, COUNT(DayofMonth), COUNT(FlightDate) FROM mytable WHERE DaysSinceEpoch IN (16097, 16077) GROUP BY Diverted, Flights  ORDER BY Diverted, Flights LIMIT 12"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable ORDER BY DestCityName, Origin LIMIT 17"}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE TaxiOut BETWEEN 53 AND 48 ORDER BY \"Month\", CRSDepTime LIMIT 14","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE TaxiOut BETWEEN 53 AND 48 ORDER BY Month, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE TaxiOut BETWEEN 53 AND 48 ORDER BY \"Month\", CRSDepTime LIMIT 14","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE TaxiOut BETWEEN 53 AND 48 ORDER BY Month, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, ArrivalDelayGroups FROM mytable WHERE OriginStateFips < 45 ORDER BY FirstDepTime, OriginStateName LIMIT 23"}
 {"sql":"SELECT MIN(DestWac) FROM mytable WHERE TaxiIn NOT IN (35, 16, 101) AND TaxiIn IN (37) AND DayOfWeek >= 2 LIMIT 17"}
 {"sql":"SELECT Distance, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DayofMonth BETWEEN 28 AND 5 GROUP BY Distance, DivActualElapsedTime  ORDER BY Distance, DivActualElapsedTime LIMIT 4","hsqls":["SELECT Distance, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DayofMonth BETWEEN 28 AND 5 GROUP BY Distance, DivActualElapsedTime  ORDER BY Distance, DivActualElapsedTime LIMIT 4"]}
-{"sql":"SELECT SUM(\"Year\"), MIN(OriginCityMarketID) FROM mytable LIMIT 11","hsqls":["SELECT SUM(Year), MIN(OriginCityMarketID) FROM mytable LIMIT 11"]}
+{"sql":"SELECT SUM(\"Year\"), MIN(OriginCityMarketID) FROM mytable LIMIT 11","hsqls":["SELECT SUM(`Year`), MIN(OriginCityMarketID) FROM mytable LIMIT 11"]}
 {"sql":"SELECT CarrierDelay, NASDelay, WheelsOn, AVG(FlightNum) FROM mytable GROUP BY CarrierDelay, NASDelay, WheelsOn  ORDER BY CarrierDelay, NASDelay, WheelsOn LIMIT 4","hsqls":["SELECT CarrierDelay, NASDelay, WheelsOn, AVG(FlightNum) FROM mytable GROUP BY CarrierDelay, NASDelay, WheelsOn  ORDER BY CarrierDelay, NASDelay, WheelsOn LIMIT 4"]}
-{"sql":"SELECT WheelsOn, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 66 AND 36 OR DivWheelsOns > 53 GROUP BY WheelsOn LIMIT 10","hsqls":["SELECT WheelsOn, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 66 AND 36 OR (DivWheelsOns__MV0 > 53 OR DivWheelsOns__MV1 > 53 OR DivWheelsOns__MV2 > 53 OR DivWheelsOns__MV3 > 53 OR DivWheelsOns__MV4 > 53) GROUP BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT WheelsOn, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 66 AND 36 OR DivWheelsOns > 53 GROUP BY WheelsOn LIMIT 10","hsqls":["SELECT WheelsOn, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 66 AND 36 OR (DivWheelsOns[1] > 53 OR DivWheelsOns[2] > 53 OR DivWheelsOns[3] > 53 OR DivWheelsOns[4] > 53 OR DivWheelsOns[5] > 53) GROUP BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT OriginState, DivDistance, NASDelay FROM mytable WHERE Cancelled BETWEEN 1 AND 0 LIMIT 4"}
 {"sql":"SELECT \"Year\", Flights, COUNT(*) FROM mytable GROUP BY \"Year\", Flights LIMIT 9","hsqls":["SELECT Year, Flights, COUNT(*) FROM mytable GROUP BY Year, Flights LIMIT 9"]}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE OriginWac <> 84 AND Carrier IN ('DL', 'HA', 'B6', 'OO', 'AS') OR \"Month\" NOT IN (1) LIMIT 5","hsqls":["SELECT CarrierDelay FROM mytable WHERE OriginWac <> 84 AND Carrier IN ('DL', 'HA', 'B6', 'OO', 'AS') OR Month NOT IN (1) LIMIT 5"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE OriginWac <> 84 AND Carrier IN ('DL', 'HA', 'B6', 'OO', 'AS') OR \"Month\" NOT IN (1) LIMIT 5","hsqls":["SELECT CarrierDelay FROM mytable WHERE OriginWac <> 84 AND Carrier IN ('DL', 'HA', 'B6', 'OO', 'AS') OR `Month` NOT IN (1) LIMIT 5"]}
 {"sql":"SELECT ArrTimeBlk, Dest FROM mytable WHERE DaysSinceEpoch NOT IN (16101, 16100) AND DepTime > 1209 OR DistanceGroup = 10 LIMIT 28"}
 {"sql":"SELECT Quarter, LateAircraftDelay, LongestAddGTime FROM mytable LIMIT 4"}
 {"sql":"SELECT AVG(Distance) FROM mytable WHERE Distance NOT IN (1447, 296, 1076, 1300, 1587) AND DestCityMarketID > 30333 LIMIT 3"}
@@ -1785,84 +1785,84 @@
 {"sql":"SELECT DestStateFips FROM mytable ORDER BY DistanceGroup, DivArrDelay, CRSElapsedTime LIMIT 5"}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1400-1459') LIMIT 10"}
 {"sql":"SELECT Flights, DestCityName, Dest, COUNT(SecurityDelay), MAX(CarrierDelay) FROM mytable WHERE ArrDel15 = 1 AND CarrierDelay NOT IN (98, 171, 13, 450, 28) OR Quarter BETWEEN 1 AND 1 GROUP BY Flights, DestCityName, Dest","hsqls":["SELECT Flights, DestCityName, Dest, COUNT(SecurityDelay), MAX(CarrierDelay) FROM mytable WHERE ArrDel15 = 1 AND CarrierDelay NOT IN (98, 171, 13, 450, 28) OR Quarter BETWEEN 1 AND 1 GROUP BY Flights, DestCityName, Dest"]}
-{"sql":"SELECT DivAirportIDs, DestAirportID FROM mytable LIMIT 1","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DestAirportID FROM mytable LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivReachedDest <= -9999 ORDER BY DepDel15 LIMIT 6","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DivReachedDest <= -9999 ORDER BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, DestAirportID FROM mytable LIMIT 1","hsqls":["SELECT DivAirportIDs, DestAirportID FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivReachedDest <= -9999 ORDER BY DepDel15 LIMIT 6","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE DivReachedDest <= -9999 ORDER BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginStateFips), AVG(OriginWac), MAX(DepDel15) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 LIMIT 22"}
 {"sql":"SELECT ArrDelayMinutes, MIN(DaysSinceEpoch), SUM(Diverted) FROM mytable WHERE DivDistance <> 500 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21","hsqls":["SELECT ArrDelayMinutes, MIN(DaysSinceEpoch), SUM(Diverted) FROM mytable WHERE DivDistance <> 500 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21"]}
 {"sql":"SELECT SUM(OriginAirportSeqID) FROM mytable WHERE Dest BETWEEN 'SLC' AND 'GPT' LIMIT 7"}
 {"sql":"SELECT UniqueCarrier FROM mytable ORDER BY DestState LIMIT 13"}
 {"sql":"SELECT DepDelay, OriginStateFips, DestCityName FROM mytable WHERE DivAirportLandings >= 0 LIMIT 10"}
 {"sql":"SELECT DayofMonth FROM mytable ORDER BY WheelsOff, WheelsOn LIMIT 21"}
-{"sql":"SELECT DivDistance, Distance, ArrDelayMinutes FROM mytable WHERE \"Year\" <> 2014 OR DepDelay NOT IN (68.0, 257.0, 55.0, 115.0, 218.0) AND DepDelay NOT IN (157.0, 254.0, 38.0) ORDER BY OriginCityName, Dest LIMIT 1","hsqls":["SELECT DivDistance, Distance, ArrDelayMinutes FROM mytable WHERE Year <> 2014 OR DepDelay NOT IN (68.0, 257.0, 55.0, 115.0, 218.0) AND DepDelay NOT IN (157.0, 254.0, 38.0) ORDER BY OriginCityName, Dest LIMIT 1"]}
+{"sql":"SELECT DivDistance, Distance, ArrDelayMinutes FROM mytable WHERE \"Year\" <> 2014 OR DepDelay NOT IN (68.0, 257.0, 55.0, 115.0, 218.0) AND DepDelay NOT IN (157.0, 254.0, 38.0) ORDER BY OriginCityName, Dest LIMIT 1","hsqls":["SELECT DivDistance, Distance, ArrDelayMinutes FROM mytable WHERE `Year` <> 2014 OR DepDelay NOT IN (68.0, 257.0, 55.0, 115.0, 218.0) AND DepDelay NOT IN (157.0, 254.0, 38.0) ORDER BY OriginCityName, Dest LIMIT 1"]}
 {"sql":"SELECT DestState, LongestAddGTime, DivActualElapsedTime FROM mytable WHERE DepTime IN (1033, 750, 1850) AND DestStateFips BETWEEN 15 AND 9 OR WheelsOn <= 1409 ORDER BY TailNum, DepTimeBlk, DaysSinceEpoch LIMIT 22"}
-{"sql":"SELECT DivWheelsOns, DivAirports, DestStateFips FROM mytable ORDER BY DepDel15, AirTime LIMIT 21","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestStateFips FROM mytable ORDER BY DepDel15, AirTime LIMIT 10000"]}
-{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginWac IN (92, 35, 34, 39) OR DivWheelsOffs IN (1857, 1521, 2226) AND LongestAddGTime < 54 GROUP BY OriginStateName LIMIT 28","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginWac IN (92, 35, 34, 39) OR (DivWheelsOffs__MV0 IN (1857, 1521, 2226) OR DivWheelsOffs__MV1 IN (1857, 1521, 2226) OR DivWheelsOffs__MV2 IN (1857, 1521, 2226) OR DivWheelsOffs__MV3 IN (1857, 1521, 2226) OR DivWheelsOffs__MV4 IN (1857, 1521, 2226)) AND LongestAddGTime < 54 GROUP BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivAirports, DestStateFips FROM mytable ORDER BY DepDel15, AirTime LIMIT 21","hsqls":["SELECT DivWheelsOns, DivAirports, DestStateFips FROM mytable ORDER BY DepDel15, AirTime LIMIT 10000"]}
+{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginWac IN (92, 35, 34, 39) OR DivWheelsOffs IN (1857, 1521, 2226) AND LongestAddGTime < 54 GROUP BY OriginStateName LIMIT 28","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginWac IN (92, 35, 34, 39) OR (DivWheelsOffs[1] IN (1857, 1521, 2226) OR DivWheelsOffs[2] IN (1857, 1521, 2226) OR DivWheelsOffs[3] IN (1857, 1521, 2226) OR DivWheelsOffs[4] IN (1857, 1521, 2226) OR DivWheelsOffs[5] IN (1857, 1521, 2226)) AND LongestAddGTime < 54 GROUP BY OriginStateName LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 205.0 AND 73.0 LIMIT 1"}
-{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY Cancelled, DepTimeBlk LIMIT 20","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY Cancelled, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY Cancelled, DepTimeBlk LIMIT 20","hsqls":["SELECT DivTotalGTimes FROM mytable ORDER BY Cancelled, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, OriginWac FROM mytable WHERE WheelsOn BETWEEN 32 AND 2138 OR TotalAddGTime NOT IN (24, 11) LIMIT 28"}
 {"sql":"SELECT Dest, MIN(DestWac), MIN(Flights) FROM mytable WHERE LateAircraftDelay <= 63 GROUP BY Dest  ORDER BY Dest LIMIT 18","hsqls":["SELECT Dest, MIN(DestWac), MIN(Flights) FROM mytable WHERE LateAircraftDelay <= 63 GROUP BY Dest  ORDER BY Dest LIMIT 18"]}
 {"sql":"SELECT ActualElapsedTime, ArrTime, Cancelled, AVG(DestStateFips), AVG(ArrDelay) FROM mytable WHERE OriginStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'Delaware' AND FlightNum BETWEEN 1661 AND 44 GROUP BY ActualElapsedTime, ArrTime, Cancelled  ORDER BY ActualElapsedTime, ArrTime, Cancelled LIMIT 10","hsqls":["SELECT ActualElapsedTime, ArrTime, Cancelled, AVG(DestStateFips), AVG(ArrDelay) FROM mytable WHERE OriginStateName BETWEEN 'U.S. Pacific Trust Territories and Possessions' AND 'Delaware' AND FlightNum BETWEEN 1661 AND 44 GROUP BY ActualElapsedTime, ArrTime, Cancelled  ORDER BY ActualElapsedTime, ArrTime, Cancelled LIMIT 10"]}
-{"sql":"SELECT DepDelay FROM mytable WHERE DivWheelsOffs BETWEEN 2315 AND 1208 OR DestAirportID BETWEEN 14674 AND 14006 LIMIT 23","hsqls":["SELECT DepDelay FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2315 AND 1208 OR DivWheelsOffs__MV1 BETWEEN 2315 AND 1208 OR DivWheelsOffs__MV2 BETWEEN 2315 AND 1208 OR DivWheelsOffs__MV3 BETWEEN 2315 AND 1208 OR DivWheelsOffs__MV4 BETWEEN 2315 AND 1208) OR DestAirportID BETWEEN 14674 AND 14006 LIMIT 10000"]}
+{"sql":"SELECT DepDelay FROM mytable WHERE DivWheelsOffs BETWEEN 2315 AND 1208 OR DestAirportID BETWEEN 14674 AND 14006 LIMIT 23","hsqls":["SELECT DepDelay FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2315 AND 1208 OR DivWheelsOffs[2] BETWEEN 2315 AND 1208 OR DivWheelsOffs[3] BETWEEN 2315 AND 1208 OR DivWheelsOffs[4] BETWEEN 2315 AND 1208 OR DivWheelsOffs[5] BETWEEN 2315 AND 1208) OR DestAirportID BETWEEN 14674 AND 14006 LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, ArrTimeBlk, MIN(DivActualElapsedTime) FROM mytable WHERE CRSArrTime NOT IN (2058, 1604, 2057) GROUP BY TotalAddGTime, ArrTimeBlk  ORDER BY TotalAddGTime, ArrTimeBlk LIMIT 2","hsqls":["SELECT TotalAddGTime, ArrTimeBlk, MIN(DivActualElapsedTime) FROM mytable WHERE CRSArrTime NOT IN (2058, 1604, 2057) GROUP BY TotalAddGTime, ArrTimeBlk  ORDER BY TotalAddGTime, ArrTimeBlk LIMIT 2"]}
-{"sql":"SELECT DestWac, TotalAddGTime, DivAirportSeqIDs FROM mytable WHERE ArrTime IN (1929) OR OriginCityMarketID NOT IN (35380, 35411, 31834) ORDER BY NASDelay LIMIT 27","hsqls":["SELECT DestWac, TotalAddGTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrTime IN (1929) OR OriginCityMarketID NOT IN (35380, 35411, 31834) ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT DestWac, TotalAddGTime, DivAirportSeqIDs FROM mytable WHERE ArrTime IN (1929) OR OriginCityMarketID NOT IN (35380, 35411, 31834) ORDER BY NASDelay LIMIT 27","hsqls":["SELECT DestWac, TotalAddGTime, DivAirportSeqIDs FROM mytable WHERE ArrTime IN (1929) OR OriginCityMarketID NOT IN (35380, 35411, 31834) ORDER BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, AVG(OriginWac), COUNT(OriginStateName), AVG(OriginCityMarketID) FROM mytable GROUP BY SecurityDelay","hsqls":["SELECT SecurityDelay, AVG(OriginWac), COUNT(OriginStateName), AVG(OriginCityMarketID) FROM mytable GROUP BY SecurityDelay"]}
-{"sql":"SELECT CarrierDelay, AirlineID, MIN(Flights), SUM(DepDelayMinutes), COUNT(DivAirportLandings) FROM mytable WHERE DestAirportSeqID BETWEEN 1484304 AND 1396403 AND \"Year\" BETWEEN 2014 AND 2014 OR DayOfWeek <= 6 GROUP BY CarrierDelay, AirlineID LIMIT 21","hsqls":["SELECT CarrierDelay, AirlineID, MIN(Flights), SUM(DepDelayMinutes), COUNT(DivAirportLandings) FROM mytable WHERE DestAirportSeqID BETWEEN 1484304 AND 1396403 AND Year BETWEEN 2014 AND 2014 OR DayOfWeek <= 6 GROUP BY CarrierDelay, AirlineID LIMIT 21"]}
-{"sql":"SELECT TaxiOut, \"Month\" FROM mytable WHERE CarrierDelay BETWEEN 1 AND 64 ORDER BY DepDelay LIMIT 18","hsqls":["SELECT TaxiOut, Month FROM mytable WHERE CarrierDelay BETWEEN 1 AND 64 ORDER BY DepDelay LIMIT 18"]}
-{"sql":"SELECT AirlineID FROM mytable WHERE DivAirportSeqIDs <= 1013503 AND OriginCityName >= 'Yakutat, AK' LIMIT 16","hsqls":["SELECT AirlineID FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1013503 OR DivAirportSeqIDs__MV1 <= 1013503 OR DivAirportSeqIDs__MV2 <= 1013503 OR DivAirportSeqIDs__MV3 <= 1013503 OR DivAirportSeqIDs__MV4 <= 1013503) AND OriginCityName >= 'Yakutat, AK' LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivAirportSeqIDs FROM mytable WHERE DivTotalGTimes > 77 AND DivWheelsOffs IN (1407, 1451, 921) ORDER BY DivActualElapsedTime LIMIT 3","hsqls":["SELECT DistanceGroup, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 > 77 OR DivTotalGTimes__MV1 > 77 OR DivTotalGTimes__MV2 > 77 OR DivTotalGTimes__MV3 > 77 OR DivTotalGTimes__MV4 > 77) AND (DivWheelsOffs__MV0 IN (1407, 1451, 921) OR DivWheelsOffs__MV1 IN (1407, 1451, 921) OR DivWheelsOffs__MV2 IN (1407, 1451, 921) OR DivWheelsOffs__MV3 IN (1407, 1451, 921) OR DivWheelsOffs__MV4 IN (1407, 1451, 921)) ORDER BY DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DestAirportSeqID, Dest FROM mytable WHERE \"Year\" IN (2014) OR FirstDepTime BETWEEN 736 AND 1742 OR DivTotalGTimes BETWEEN 24 AND 109 LIMIT 1","hsqls":["SELECT DestAirportSeqID, Dest FROM mytable WHERE Year IN (2014) OR FirstDepTime BETWEEN 736 AND 1742 OR (DivTotalGTimes__MV0 BETWEEN 24 AND 109 OR DivTotalGTimes__MV1 BETWEEN 24 AND 109 OR DivTotalGTimes__MV2 BETWEEN 24 AND 109 OR DivTotalGTimes__MV3 BETWEEN 24 AND 109 OR DivTotalGTimes__MV4 BETWEEN 24 AND 109) LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, AirlineID, MIN(Flights), SUM(DepDelayMinutes), COUNT(DivAirportLandings) FROM mytable WHERE DestAirportSeqID BETWEEN 1484304 AND 1396403 AND \"Year\" BETWEEN 2014 AND 2014 OR DayOfWeek <= 6 GROUP BY CarrierDelay, AirlineID LIMIT 21","hsqls":["SELECT CarrierDelay, AirlineID, MIN(Flights), SUM(DepDelayMinutes), COUNT(DivAirportLandings) FROM mytable WHERE DestAirportSeqID BETWEEN 1484304 AND 1396403 AND `Year` BETWEEN 2014 AND 2014 OR DayOfWeek <= 6 GROUP BY CarrierDelay, AirlineID LIMIT 21"]}
+{"sql":"SELECT TaxiOut, \"Month\" FROM mytable WHERE CarrierDelay BETWEEN 1 AND 64 ORDER BY DepDelay LIMIT 18","hsqls":["SELECT TaxiOut, `Month` FROM mytable WHERE CarrierDelay BETWEEN 1 AND 64 ORDER BY DepDelay LIMIT 18"]}
+{"sql":"SELECT AirlineID FROM mytable WHERE DivAirportSeqIDs <= 1013503 AND OriginCityName >= 'Yakutat, AK' LIMIT 16","hsqls":["SELECT AirlineID FROM mytable WHERE (DivAirportSeqIDs[1] <= 1013503 OR DivAirportSeqIDs[2] <= 1013503 OR DivAirportSeqIDs[3] <= 1013503 OR DivAirportSeqIDs[4] <= 1013503 OR DivAirportSeqIDs[5] <= 1013503) AND OriginCityName >= 'Yakutat, AK' LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivAirportSeqIDs FROM mytable WHERE DivTotalGTimes > 77 AND DivWheelsOffs IN (1407, 1451, 921) ORDER BY DivActualElapsedTime LIMIT 3","hsqls":["SELECT DistanceGroup, DivAirportSeqIDs FROM mytable WHERE (DivTotalGTimes[1] > 77 OR DivTotalGTimes[2] > 77 OR DivTotalGTimes[3] > 77 OR DivTotalGTimes[4] > 77 OR DivTotalGTimes[5] > 77) AND (DivWheelsOffs[1] IN (1407, 1451, 921) OR DivWheelsOffs[2] IN (1407, 1451, 921) OR DivWheelsOffs[3] IN (1407, 1451, 921) OR DivWheelsOffs[4] IN (1407, 1451, 921) OR DivWheelsOffs[5] IN (1407, 1451, 921)) ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, Dest FROM mytable WHERE \"Year\" IN (2014) OR FirstDepTime BETWEEN 736 AND 1742 OR DivTotalGTimes BETWEEN 24 AND 109 LIMIT 1","hsqls":["SELECT DestAirportSeqID, Dest FROM mytable WHERE `Year` IN (2014) OR FirstDepTime BETWEEN 736 AND 1742 OR (DivTotalGTimes[1] BETWEEN 24 AND 109 OR DivTotalGTimes[2] BETWEEN 24 AND 109 OR DivTotalGTimes[3] BETWEEN 24 AND 109 OR DivTotalGTimes[4] BETWEEN 24 AND 109 OR DivTotalGTimes[5] BETWEEN 24 AND 109) LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, DepTimeBlk, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DepTimeBlk  ORDER BY DestAirportSeqID, DepTimeBlk LIMIT 25","hsqls":["SELECT DestAirportSeqID, DepTimeBlk, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DepTimeBlk  ORDER BY DestAirportSeqID, DepTimeBlk LIMIT 25"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable LIMIT 15"}
 {"sql":"SELECT MAX(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 51 AND 65 AND Distance NOT IN (1995, 776, 4983, 1979, 2338) OR DepDelay IN (198.0, 388.0, 213.0, 151.0, 103.0) LIMIT 22"}
 {"sql":"SELECT DestWac, Carrier, DestCityName, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 51 AND 1327 AND CRSElapsedTime IN (277, 392, 157, 192, 141) AND DestAirportID IN (14113, 15249, 10721, 13264, 10713) GROUP BY DestWac, Carrier, DestCityName  ORDER BY DestWac, Carrier, DestCityName LIMIT 28","hsqls":["SELECT DestWac, Carrier, DestCityName, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 51 AND 1327 AND CRSElapsedTime IN (277, 392, 157, 192, 141) AND DestAirportID IN (14113, 15249, 10721, 13264, 10713) GROUP BY DestWac, Carrier, DestCityName  ORDER BY DestWac, Carrier, DestCityName LIMIT 28"]}
-{"sql":"SELECT CRSDepTime, COUNT(DepDelay), AVG(FirstDepTime), COUNT(ArrTime) FROM mytable WHERE OriginStateName > 'Louisiana' AND ArrDelay BETWEEN 43.0 AND 16.0 OR DivLongestGTimes BETWEEN 68.0 AND 66.0 GROUP BY CRSDepTime LIMIT 6","hsqls":["SELECT CRSDepTime, COUNT(DepDelay), AVG(FirstDepTime), COUNT(ArrTime) FROM mytable WHERE OriginStateName > 'Louisiana' AND ArrDelay BETWEEN 43.0 AND 16.0 OR (DivLongestGTimes__MV0 BETWEEN 68.0 AND 66.0 OR DivLongestGTimes__MV1 BETWEEN 68.0 AND 66.0 OR DivLongestGTimes__MV2 BETWEEN 68.0 AND 66.0 OR DivLongestGTimes__MV3 BETWEEN 68.0 AND 66.0 OR DivLongestGTimes__MV4 BETWEEN 68.0 AND 66.0) GROUP BY CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime, COUNT(DepDelay), AVG(FirstDepTime), COUNT(ArrTime) FROM mytable WHERE OriginStateName > 'Louisiana' AND ArrDelay BETWEEN 43.0 AND 16.0 OR DivLongestGTimes BETWEEN 68.0 AND 66.0 GROUP BY CRSDepTime LIMIT 6","hsqls":["SELECT CRSDepTime, COUNT(DepDelay), AVG(FirstDepTime), COUNT(ArrTime) FROM mytable WHERE OriginStateName > 'Louisiana' AND ArrDelay BETWEEN 43.0 AND 16.0 OR (DivLongestGTimes[1] BETWEEN 68.0 AND 66.0 OR DivLongestGTimes[2] BETWEEN 68.0 AND 66.0 OR DivLongestGTimes[3] BETWEEN 68.0 AND 66.0 OR DivLongestGTimes[4] BETWEEN 68.0 AND 66.0 OR DivLongestGTimes[5] BETWEEN 68.0 AND 66.0) GROUP BY CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE ArrTimeBlk BETWEEN '1200-1259' AND '0700-0759' OR Diverted BETWEEN 0 AND 0 ORDER BY TaxiIn, AirTime, DestCityMarketID LIMIT 13"}
 {"sql":"SELECT DestWac, DepDelay, DepDel15, AVG(NASDelay), SUM(ArrivalDelayGroups) FROM mytable GROUP BY DestWac, DepDelay, DepDel15  ORDER BY DestWac, DepDelay, DepDel15 LIMIT 7","hsqls":["SELECT DestWac, DepDelay, DepDel15, AVG(NASDelay), SUM(ArrivalDelayGroups) FROM mytable GROUP BY DestWac, DepDelay, DepDel15  ORDER BY DestWac, DepDelay, DepDel15 LIMIT 7"]}
-{"sql":"SELECT Origin FROM mytable WHERE ArrivalDelayGroups <> 2 OR DivAirportIDs IN (11953, 10208, 15389, -9999) AND DestStateFips NOT IN (49, 20, 5, 26, 28) ORDER BY LateAircraftDelay, WheelsOn, CRSElapsedTime LIMIT 12","hsqls":["SELECT Origin FROM mytable WHERE ArrivalDelayGroups <> 2 OR (DivAirportIDs__MV0 IN (11953, 10208, 15389, -9999) OR DivAirportIDs__MV1 IN (11953, 10208, 15389, -9999) OR DivAirportIDs__MV2 IN (11953, 10208, 15389, -9999) OR DivAirportIDs__MV3 IN (11953, 10208, 15389, -9999) OR DivAirportIDs__MV4 IN (11953, 10208, 15389, -9999)) AND DestStateFips NOT IN (49, 20, 5, 26, 28) ORDER BY LateAircraftDelay, WheelsOn, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE Dest BETWEEN 'LIH' AND 'RHI' OR DivAirportIDs BETWEEN 13277 AND 14252 LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE Dest BETWEEN 'LIH' AND 'RHI' OR (DivAirportIDs__MV0 BETWEEN 13277 AND 14252 OR DivAirportIDs__MV1 BETWEEN 13277 AND 14252 OR DivAirportIDs__MV2 BETWEEN 13277 AND 14252 OR DivAirportIDs__MV3 BETWEEN 13277 AND 14252 OR DivAirportIDs__MV4 BETWEEN 13277 AND 14252) LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, Dest, MAX(AirlineID), MIN(CRSDepTime), AVG(FirstDepTime) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND SecurityDelay BETWEEN 0 AND -9999 GROUP BY OriginStateFips, Dest LIMIT 28","hsqls":["SELECT OriginStateFips, Dest, MAX(AirlineID), MIN(CRSDepTime), AVG(FirstDepTime) FROM mytable WHERE Month BETWEEN 1 AND 1 AND SecurityDelay BETWEEN 0 AND -9999 GROUP BY OriginStateFips, Dest LIMIT 28"]}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 AND Quarter BETWEEN 1 AND 1 ORDER BY \"Year\" LIMIT 5","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 AND Quarter BETWEEN 1 AND 1 ORDER BY Year LIMIT 5"]}
+{"sql":"SELECT Origin FROM mytable WHERE ArrivalDelayGroups <> 2 OR DivAirportIDs IN (11953, 10208, 15389, -9999) AND DestStateFips NOT IN (49, 20, 5, 26, 28) ORDER BY LateAircraftDelay, WheelsOn, CRSElapsedTime LIMIT 12","hsqls":["SELECT Origin FROM mytable WHERE ArrivalDelayGroups <> 2 OR (DivAirportIDs[1] IN (11953, 10208, 15389, -9999) OR DivAirportIDs[2] IN (11953, 10208, 15389, -9999) OR DivAirportIDs[3] IN (11953, 10208, 15389, -9999) OR DivAirportIDs[4] IN (11953, 10208, 15389, -9999) OR DivAirportIDs[5] IN (11953, 10208, 15389, -9999)) AND DestStateFips NOT IN (49, 20, 5, 26, 28) ORDER BY LateAircraftDelay, WheelsOn, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE Dest BETWEEN 'LIH' AND 'RHI' OR DivAirportIDs BETWEEN 13277 AND 14252 LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE Dest BETWEEN 'LIH' AND 'RHI' OR (DivAirportIDs[1] BETWEEN 13277 AND 14252 OR DivAirportIDs[2] BETWEEN 13277 AND 14252 OR DivAirportIDs[3] BETWEEN 13277 AND 14252 OR DivAirportIDs[4] BETWEEN 13277 AND 14252 OR DivAirportIDs[5] BETWEEN 13277 AND 14252) LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, Dest, MAX(AirlineID), MIN(CRSDepTime), AVG(FirstDepTime) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND SecurityDelay BETWEEN 0 AND -9999 GROUP BY OriginStateFips, Dest LIMIT 28","hsqls":["SELECT OriginStateFips, Dest, MAX(AirlineID), MIN(CRSDepTime), AVG(FirstDepTime) FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND SecurityDelay BETWEEN 0 AND -9999 GROUP BY OriginStateFips, Dest LIMIT 28"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 AND Quarter BETWEEN 1 AND 1 ORDER BY \"Year\" LIMIT 5","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 AND Quarter BETWEEN 1 AND 1 ORDER BY `Year` LIMIT 5"]}
 {"sql":"SELECT SUM(DivReachedDest), MIN(TaxiOut), SUM(SecurityDelay) FROM mytable WHERE DepartureDelayGroups < 6 LIMIT 16"}
-{"sql":"SELECT TaxiOut, DivLongestGTimes, DivAirportIDs FROM mytable LIMIT 28","hsqls":["SELECT TaxiOut, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivLongestGTimes, DivAirportIDs FROM mytable LIMIT 28","hsqls":["SELECT TaxiOut, DivLongestGTimes, DivAirportIDs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT SUM(DivAirportLandings), COUNT(DestCityName), SUM(OriginStateFips) FROM mytable WHERE TailNum IN ('N562UA', 'N559JB', 'N340LV') AND DepDelayMinutes BETWEEN 203.0 AND 388.0 LIMIT 5"}
 {"sql":"SELECT OriginStateFips, OriginCityName, AVG(DivDistance), COUNT(ActualElapsedTime) FROM mytable GROUP BY OriginStateFips, OriginCityName  ORDER BY OriginStateFips, OriginCityName LIMIT 28","hsqls":["SELECT OriginStateFips, OriginCityName, AVG(DivDistance), COUNT(ActualElapsedTime) FROM mytable GROUP BY OriginStateFips, OriginCityName  ORDER BY OriginStateFips, OriginCityName LIMIT 28"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE ArrTimeBlk IN ('0700-0759', '2100-2159', '1200-1259', '1400-1459') ORDER BY OriginAirportSeqID, ArrDel15, Dest LIMIT 21"}
 {"sql":"SELECT \"Year\", ActualElapsedTime, Cancelled FROM mytable ORDER BY Carrier, OriginCityMarketID, FlightDate LIMIT 14","hsqls":["SELECT Year, ActualElapsedTime, Cancelled FROM mytable ORDER BY Carrier, OriginCityMarketID, FlightDate LIMIT 14"]}
-{"sql":"SELECT OriginState FROM mytable WHERE TailNum = 'N732US' AND DivTotalGTimes BETWEEN 102 AND 52 OR ArrTimeBlk <= '0800-0859' ORDER BY SecurityDelay, DivActualElapsedTime LIMIT 10","hsqls":["SELECT OriginState FROM mytable WHERE TailNum = 'N732US' AND (DivTotalGTimes__MV0 BETWEEN 102 AND 52 OR DivTotalGTimes__MV1 BETWEEN 102 AND 52 OR DivTotalGTimes__MV2 BETWEEN 102 AND 52 OR DivTotalGTimes__MV3 BETWEEN 102 AND 52 OR DivTotalGTimes__MV4 BETWEEN 102 AND 52) OR ArrTimeBlk <= '0800-0859' ORDER BY SecurityDelay, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Flights IN (1) ORDER BY DivReachedDest, WeatherDelay, DestStateName LIMIT 22","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Flights IN (1) ORDER BY DivReachedDest, WeatherDelay, DestStateName LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE TailNum = 'N732US' AND DivTotalGTimes BETWEEN 102 AND 52 OR ArrTimeBlk <= '0800-0859' ORDER BY SecurityDelay, DivActualElapsedTime LIMIT 10","hsqls":["SELECT OriginState FROM mytable WHERE TailNum = 'N732US' AND (DivTotalGTimes[1] BETWEEN 102 AND 52 OR DivTotalGTimes[2] BETWEEN 102 AND 52 OR DivTotalGTimes[3] BETWEEN 102 AND 52 OR DivTotalGTimes[4] BETWEEN 102 AND 52 OR DivTotalGTimes[5] BETWEEN 102 AND 52) OR ArrTimeBlk <= '0800-0859' ORDER BY SecurityDelay, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Flights IN (1) ORDER BY DivReachedDest, WeatherDelay, DestStateName LIMIT 22","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE Flights IN (1) ORDER BY DivReachedDest, WeatherDelay, DestStateName LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, OriginWac FROM mytable WHERE LongestAddGTime IN (21) ORDER BY Cancelled LIMIT 15"}
 {"sql":"SELECT DestState, CancellationCode FROM mytable ORDER BY DayOfWeek LIMIT 1"}
 {"sql":"SELECT DepartureDelayGroups FROM mytable ORDER BY OriginState, ArrDel15 LIMIT 20"}
-{"sql":"SELECT DistanceGroup, CarrierDelay, AirTime, SUM(LateAircraftDelay), AVG(FirstDepTime) FROM mytable WHERE Dest BETWEEN 'MBS' AND 'LCH' OR DivAirportSeqIDs >= 1489302 GROUP BY DistanceGroup, CarrierDelay, AirTime LIMIT 7","hsqls":["SELECT DistanceGroup, CarrierDelay, AirTime, SUM(LateAircraftDelay), AVG(FirstDepTime) FROM mytable WHERE Dest BETWEEN 'MBS' AND 'LCH' OR (DivAirportSeqIDs__MV0 >= 1489302 OR DivAirportSeqIDs__MV1 >= 1489302 OR DivAirportSeqIDs__MV2 >= 1489302 OR DivAirportSeqIDs__MV3 >= 1489302 OR DivAirportSeqIDs__MV4 >= 1489302) GROUP BY DistanceGroup, CarrierDelay, AirTime LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, CarrierDelay, AirTime, SUM(LateAircraftDelay), AVG(FirstDepTime) FROM mytable WHERE Dest BETWEEN 'MBS' AND 'LCH' OR DivAirportSeqIDs >= 1489302 GROUP BY DistanceGroup, CarrierDelay, AirTime LIMIT 7","hsqls":["SELECT DistanceGroup, CarrierDelay, AirTime, SUM(LateAircraftDelay), AVG(FirstDepTime) FROM mytable WHERE Dest BETWEEN 'MBS' AND 'LCH' OR (DivAirportSeqIDs[1] >= 1489302 OR DivAirportSeqIDs[2] >= 1489302 OR DivAirportSeqIDs[3] >= 1489302 OR DivAirportSeqIDs[4] >= 1489302 OR DivAirportSeqIDs[5] >= 1489302) GROUP BY DistanceGroup, CarrierDelay, AirTime LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, SUM(DivAirportLandings), MAX(DestStateFips), AVG(FlightNum) FROM mytable WHERE ArrDel15 <= -9999 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 20","hsqls":["SELECT CancellationCode, SUM(DivAirportLandings), MAX(DestStateFips), AVG(FlightNum) FROM mytable WHERE ArrDel15 <= -9999 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 20"]}
-{"sql":"SELECT DepartureDelayGroups, CRSArrTime, ArrTime FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR CRSDepTime >= 2245 OR DivAirports BETWEEN 'FSD' AND 'BUF' LIMIT 18","hsqls":["SELECT DepartureDelayGroups, CRSArrTime, ArrTime FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR CRSDepTime >= 2245 OR (DivAirports__MV0 BETWEEN 'FSD' AND 'BUF' OR DivAirports__MV1 BETWEEN 'FSD' AND 'BUF' OR DivAirports__MV2 BETWEEN 'FSD' AND 'BUF' OR DivAirports__MV3 BETWEEN 'FSD' AND 'BUF' OR DivAirports__MV4 BETWEEN 'FSD' AND 'BUF') LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, DestState, Carrier, COUNT(\"Month\"), MIN(WeatherDelay), AVG(DepDel15) FROM mytable WHERE TaxiIn BETWEEN 8 AND 28 AND DestStateName BETWEEN 'Arizona' AND 'North Dakota' GROUP BY OriginStateFips, DestState, Carrier LIMIT 10","hsqls":["SELECT OriginStateFips, DestState, Carrier, COUNT(Month), MIN(WeatherDelay), AVG(DepDel15) FROM mytable WHERE TaxiIn BETWEEN 8 AND 28 AND DestStateName BETWEEN 'Arizona' AND 'North Dakota' GROUP BY OriginStateFips, DestState, Carrier LIMIT 10"]}
+{"sql":"SELECT DepartureDelayGroups, CRSArrTime, ArrTime FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR CRSDepTime >= 2245 OR DivAirports BETWEEN 'FSD' AND 'BUF' LIMIT 18","hsqls":["SELECT DepartureDelayGroups, CRSArrTime, ArrTime FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR CRSDepTime >= 2245 OR (DivAirports[1] BETWEEN 'FSD' AND 'BUF' OR DivAirports[2] BETWEEN 'FSD' AND 'BUF' OR DivAirports[3] BETWEEN 'FSD' AND 'BUF' OR DivAirports[4] BETWEEN 'FSD' AND 'BUF' OR DivAirports[5] BETWEEN 'FSD' AND 'BUF') LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DestState, Carrier, COUNT(\"Month\"), MIN(WeatherDelay), AVG(DepDel15) FROM mytable WHERE TaxiIn BETWEEN 8 AND 28 AND DestStateName BETWEEN 'Arizona' AND 'North Dakota' GROUP BY OriginStateFips, DestState, Carrier LIMIT 10","hsqls":["SELECT OriginStateFips, DestState, Carrier, COUNT(`Month`), MIN(WeatherDelay), AVG(DepDel15) FROM mytable WHERE TaxiIn BETWEEN 8 AND 28 AND DestStateName BETWEEN 'Arizona' AND 'North Dakota' GROUP BY OriginStateFips, DestState, Carrier LIMIT 10"]}
 {"sql":"SELECT DepDelay, DestCityName, COUNT(OriginState) FROM mytable WHERE WheelsOff BETWEEN 853 AND 1126 GROUP BY DepDelay, DestCityName  ORDER BY DepDelay, DestCityName LIMIT 28","hsqls":["SELECT DepDelay, DestCityName, COUNT(OriginState) FROM mytable WHERE WheelsOff BETWEEN 853 AND 1126 GROUP BY DepDelay, DestCityName  ORDER BY DepDelay, DestCityName LIMIT 28"]}
 {"sql":"SELECT ArrDel15, COUNT(CRSArrTime), AVG(DivArrDelay), COUNT(FlightDate) FROM mytable WHERE CancellationCode <> 'B' AND OriginCityName BETWEEN 'Santa Maria, CA' AND 'Tucson, AZ' OR Cancelled <= 0 GROUP BY ArrDel15","hsqls":["SELECT ArrDel15, COUNT(CRSArrTime), AVG(DivArrDelay), COUNT(FlightDate) FROM mytable WHERE CancellationCode <> 'B' AND OriginCityName BETWEEN 'Santa Maria, CA' AND 'Tucson, AZ' OR Cancelled <= 0 GROUP BY ArrDel15"]}
 {"sql":"SELECT DistanceGroup, Diverted, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) OR LateAircraftDelay BETWEEN 51 AND 128 GROUP BY DistanceGroup, Diverted  ORDER BY DistanceGroup, Diverted LIMIT 5","hsqls":["SELECT DistanceGroup, Diverted, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) OR LateAircraftDelay BETWEEN 51 AND 128 GROUP BY DistanceGroup, Diverted  ORDER BY DistanceGroup, Diverted LIMIT 5"]}
 {"sql":"SELECT Carrier, LateAircraftDelay, COUNT(*) FROM mytable GROUP BY Carrier, LateAircraftDelay  ORDER BY Carrier, LateAircraftDelay LIMIT 7","hsqls":["SELECT Carrier, LateAircraftDelay, COUNT(*) FROM mytable GROUP BY Carrier, LateAircraftDelay  ORDER BY Carrier, LateAircraftDelay LIMIT 7"]}
-{"sql":"SELECT WheelsOn, COUNT(DepDel15), SUM(WheelsOff), SUM(OriginAirportID) FROM mytable WHERE DayofMonth IN (9) AND ArrTimeBlk > '1700-1759' AND DivLongestGTimes BETWEEN 18.0 AND 39.0 GROUP BY WheelsOn LIMIT 27","hsqls":["SELECT WheelsOn, COUNT(DepDel15), SUM(WheelsOff), SUM(OriginAirportID) FROM mytable WHERE DayofMonth IN (9) AND ArrTimeBlk > '1700-1759' AND (DivLongestGTimes__MV0 BETWEEN 18.0 AND 39.0 OR DivLongestGTimes__MV1 BETWEEN 18.0 AND 39.0 OR DivLongestGTimes__MV2 BETWEEN 18.0 AND 39.0 OR DivLongestGTimes__MV3 BETWEEN 18.0 AND 39.0 OR DivLongestGTimes__MV4 BETWEEN 18.0 AND 39.0) GROUP BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT WheelsOn, COUNT(DepDel15), SUM(WheelsOff), SUM(OriginAirportID) FROM mytable WHERE DayofMonth IN (9) AND ArrTimeBlk > '1700-1759' AND DivLongestGTimes BETWEEN 18.0 AND 39.0 GROUP BY WheelsOn LIMIT 27","hsqls":["SELECT WheelsOn, COUNT(DepDel15), SUM(WheelsOff), SUM(OriginAirportID) FROM mytable WHERE DayofMonth IN (9) AND ArrTimeBlk > '1700-1759' AND (DivLongestGTimes[1] BETWEEN 18.0 AND 39.0 OR DivLongestGTimes[2] BETWEEN 18.0 AND 39.0 OR DivLongestGTimes[3] BETWEEN 18.0 AND 39.0 OR DivLongestGTimes[4] BETWEEN 18.0 AND 39.0 OR DivLongestGTimes[5] BETWEEN 18.0 AND 39.0) GROUP BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, ArrDel15, COUNT(*) FROM mytable GROUP BY ArrDelayMinutes, ArrDel15  ORDER BY ArrDelayMinutes, ArrDel15 LIMIT 3","hsqls":["SELECT ArrDelayMinutes, ArrDel15, COUNT(*) FROM mytable GROUP BY ArrDelayMinutes, ArrDel15  ORDER BY ArrDelayMinutes, ArrDel15 LIMIT 3"]}
-{"sql":"SELECT ArrDelay, \"Month\" FROM mytable WHERE CancellationCode IN ('A', 'C', 'noodles') AND OriginStateName NOT IN ('New Hampshire', 'Colorado', 'Arkansas', 'Alaska') OR DepTime < 1458 ORDER BY ArrTimeBlk, OriginStateName LIMIT 25","hsqls":["SELECT ArrDelay, Month FROM mytable WHERE CancellationCode IN ('A', 'C', 'noodles') AND OriginStateName NOT IN ('New Hampshire', 'Colorado', 'Arkansas', 'Alaska') OR DepTime < 1458 ORDER BY ArrTimeBlk, OriginStateName LIMIT 25"]}
+{"sql":"SELECT ArrDelay, \"Month\" FROM mytable WHERE CancellationCode IN ('A', 'C', 'noodles') AND OriginStateName NOT IN ('New Hampshire', 'Colorado', 'Arkansas', 'Alaska') OR DepTime < 1458 ORDER BY ArrTimeBlk, OriginStateName LIMIT 25","hsqls":["SELECT ArrDelay, `Month` FROM mytable WHERE CancellationCode IN ('A', 'C', 'noodles') AND OriginStateName NOT IN ('New Hampshire', 'Colorado', 'Arkansas', 'Alaska') OR DepTime < 1458 ORDER BY ArrTimeBlk, OriginStateName LIMIT 25"]}
 {"sql":"SELECT DepDelayMinutes, AVG(Cancelled), MIN(ActualElapsedTime) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 17","hsqls":["SELECT DepDelayMinutes, AVG(Cancelled), MIN(ActualElapsedTime) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, \"Year\", ArrDel15 FROM mytable WHERE Distance BETWEEN 309 AND 1182 OR LongestAddGTime NOT IN (20, 40, 111) AND OriginAirportSeqID > 1058102 LIMIT 3","hsqls":["SELECT OriginAirportSeqID, Year, ArrDel15 FROM mytable WHERE Distance BETWEEN 309 AND 1182 OR LongestAddGTime NOT IN (20, 40, 111) AND OriginAirportSeqID > 1058102 LIMIT 3"]}
-{"sql":"SELECT DistanceGroup, DestState, DivAirportIDs FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DestAirportID NOT IN (15411) AND DivAirports IN ('JFK') LIMIT 19","hsqls":["SELECT DistanceGroup, DestState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND DestAirportID NOT IN (15411) AND (DivAirports__MV0 IN ('JFK') OR DivAirports__MV1 IN ('JFK') OR DivAirports__MV2 IN ('JFK') OR DivAirports__MV3 IN ('JFK') OR DivAirports__MV4 IN ('JFK')) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestState, DivAirportIDs FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DestAirportID NOT IN (15411) AND DivAirports IN ('JFK') LIMIT 19","hsqls":["SELECT DistanceGroup, DestState, DivAirportIDs FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND DestAirportID NOT IN (15411) AND (DivAirports[1] IN ('JFK') OR DivAirports[2] IN ('JFK') OR DivAirports[3] IN ('JFK') OR DivAirports[4] IN ('JFK') OR DivAirports[5] IN ('JFK')) LIMIT 10000"]}
 {"sql":"SELECT Diverted, DestWac FROM mytable LIMIT 26"}
-{"sql":"SELECT Flights FROM mytable WHERE DepDel15 <> -9999 AND DestAirportID BETWEEN 13502 AND 13830 OR DivAirports IN ('RIC', 'SRQ', 'BOS') ORDER BY Flights, TaxiIn, CRSDepTime LIMIT 3","hsqls":["SELECT Flights FROM mytable WHERE DepDel15 <> -9999 AND DestAirportID BETWEEN 13502 AND 13830 OR (DivAirports__MV0 IN ('RIC', 'SRQ', 'BOS') OR DivAirports__MV1 IN ('RIC', 'SRQ', 'BOS') OR DivAirports__MV2 IN ('RIC', 'SRQ', 'BOS') OR DivAirports__MV3 IN ('RIC', 'SRQ', 'BOS') OR DivAirports__MV4 IN ('RIC', 'SRQ', 'BOS')) ORDER BY Flights, TaxiIn, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE DepDel15 <> -9999 AND DestAirportID BETWEEN 13502 AND 13830 OR DivAirports IN ('RIC', 'SRQ', 'BOS') ORDER BY Flights, TaxiIn, CRSDepTime LIMIT 3","hsqls":["SELECT Flights FROM mytable WHERE DepDel15 <> -9999 AND DestAirportID BETWEEN 13502 AND 13830 OR (DivAirports[1] IN ('RIC', 'SRQ', 'BOS') OR DivAirports[2] IN ('RIC', 'SRQ', 'BOS') OR DivAirports[3] IN ('RIC', 'SRQ', 'BOS') OR DivAirports[4] IN ('RIC', 'SRQ', 'BOS') OR DivAirports[5] IN ('RIC', 'SRQ', 'BOS')) ORDER BY Flights, TaxiIn, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, ArrDel15, DestAirportID FROM mytable WHERE FlightNum BETWEEN 1699 AND 4696 OR OriginCityName BETWEEN 'Kahului, HI' AND 'Mosinee, WI' LIMIT 17"}
 {"sql":"SELECT OriginState, FlightDate, DivArrDelay FROM mytable WHERE DestStateFips > 75 OR DivActualElapsedTime IN (389, 198, 307) AND Distance > 3801 ORDER BY DepDelayMinutes LIMIT 10"}
 {"sql":"SELECT MIN(OriginAirportSeqID), SUM(FirstDepTime), AVG(DivActualElapsedTime) FROM mytable WHERE AirTime BETWEEN 474 AND 295 LIMIT 9"}
-{"sql":"SELECT SUM(TaxiOut), MIN(\"Month\"), SUM(SecurityDelay) FROM mytable WHERE DestWac BETWEEN 88 AND 85 AND DepDelay <> 158.0 OR DivAirportIDs BETWEEN 10136 AND 10713 LIMIT 4","hsqls":["SELECT SUM(TaxiOut), MIN(Month), SUM(SecurityDelay)  FROM mytable WHERE DestWac BETWEEN 88 AND 85 AND DepDelay <> 158.0 OR (DivAirportIDs__MV0 BETWEEN 10136 AND 10713 OR DivAirportIDs__MV1 BETWEEN 10136 AND 10713 OR DivAirportIDs__MV2 BETWEEN 10136 AND 10713 OR DivAirportIDs__MV3 BETWEEN 10136 AND 10713 OR DivAirportIDs__MV4 BETWEEN 10136 AND 10713) LIMIT 10000"]}
-{"sql":"SELECT OriginState FROM mytable WHERE DivLongestGTimes IN (43.0, 42.0) ORDER BY DivReachedDest, Distance LIMIT 24","hsqls":["SELECT OriginState FROM mytable WHERE (DivLongestGTimes__MV0 IN (43.0, 42.0) OR DivLongestGTimes__MV1 IN (43.0, 42.0) OR DivLongestGTimes__MV2 IN (43.0, 42.0) OR DivLongestGTimes__MV3 IN (43.0, 42.0) OR DivLongestGTimes__MV4 IN (43.0, 42.0)) ORDER BY DivReachedDest, Distance LIMIT 10000"]}
+{"sql":"SELECT SUM(TaxiOut), MIN(\"Month\"), SUM(SecurityDelay) FROM mytable WHERE DestWac BETWEEN 88 AND 85 AND DepDelay <> 158.0 OR DivAirportIDs BETWEEN 10136 AND 10713 LIMIT 4","hsqls":["SELECT SUM(TaxiOut), MIN(`Month`), SUM(SecurityDelay)  FROM mytable WHERE DestWac BETWEEN 88 AND 85 AND DepDelay <> 158.0 OR (DivAirportIDs[1] BETWEEN 10136 AND 10713 OR DivAirportIDs[2] BETWEEN 10136 AND 10713 OR DivAirportIDs[3] BETWEEN 10136 AND 10713 OR DivAirportIDs[4] BETWEEN 10136 AND 10713 OR DivAirportIDs[5] BETWEEN 10136 AND 10713) LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE DivLongestGTimes IN (43.0, 42.0) ORDER BY DivReachedDest, Distance LIMIT 24","hsqls":["SELECT OriginState FROM mytable WHERE (DivLongestGTimes[1] IN (43.0, 42.0) OR DivLongestGTimes[2] IN (43.0, 42.0) OR DivLongestGTimes[3] IN (43.0, 42.0) OR DivLongestGTimes[4] IN (43.0, 42.0) OR DivLongestGTimes[5] IN (43.0, 42.0)) ORDER BY DivReachedDest, Distance LIMIT 10000"]}
 {"sql":"SELECT AirTime, \"Month\", ArrivalDelayGroups FROM mytable WHERE ActualElapsedTime > 350 ORDER BY DepDelayMinutes, TotalAddGTime, TailNum LIMIT 21","hsqls":["SELECT AirTime, Month, ArrivalDelayGroups FROM mytable WHERE ActualElapsedTime > 350 ORDER BY DepDelayMinutes, TotalAddGTime, TailNum LIMIT 21"]}
 {"sql":"SELECT Carrier, FlightDate, DivArrDelay, MAX(ArrDelay), AVG(DestCityMarketID), MIN(LongestAddGTime) FROM mytable WHERE FlightDate <> '2014-01-15' AND DivDistance <> 70 GROUP BY Carrier, FlightDate, DivArrDelay  ORDER BY Carrier, FlightDate, DivArrDelay LIMIT 5","hsqls":["SELECT Carrier, FlightDate, DivArrDelay, MAX(ArrDelay), AVG(DestCityMarketID), MIN(LongestAddGTime) FROM mytable WHERE FlightDate <> '2014-01-15' AND DivDistance <> 70 GROUP BY Carrier, FlightDate, DivArrDelay  ORDER BY Carrier, FlightDate, DivArrDelay LIMIT 5"]}
 {"sql":"SELECT DestWac, WeatherDelay, DayOfWeek, SUM(Quarter) FROM mytable WHERE Quarter BETWEEN 1 AND 1 GROUP BY DestWac, WeatherDelay, DayOfWeek  ORDER BY DestWac, WeatherDelay, DayOfWeek LIMIT 27","hsqls":["SELECT DestWac, WeatherDelay, DayOfWeek, SUM(Quarter) FROM mytable WHERE Quarter BETWEEN 1 AND 1 GROUP BY DestWac, WeatherDelay, DayOfWeek  ORDER BY DestWac, WeatherDelay, DayOfWeek LIMIT 27"]}
-{"sql":"SELECT DepDelayMinutes, DestCityName, DivWheelsOffs FROM mytable WHERE FirstDepTime >= 921 LIMIT 9","hsqls":["SELECT DepDelayMinutes, DestCityName, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE FirstDepTime >= 921 LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DestCityName, DivWheelsOffs FROM mytable WHERE FirstDepTime >= 921 LIMIT 9","hsqls":["SELECT DepDelayMinutes, DestCityName, DivWheelsOffs FROM mytable WHERE FirstDepTime >= 921 LIMIT 10000"]}
 {"sql":"SELECT AirTime FROM mytable ORDER BY DepDelayMinutes LIMIT 9"}
 {"sql":"SELECT TotalAddGTime, AVG(DestStateFips), MAX(CRSDepTime), COUNT(TailNum) FROM mytable GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 3","hsqls":["SELECT TotalAddGTime, AVG(DestStateFips), MAX(CRSDepTime), COUNT(TailNum) FROM mytable GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 3"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginAirportID IN (11003, 15027) LIMIT 25"}
-{"sql":"SELECT DepartureDelayGroups, DestStateFips, ArrivalDelayGroups FROM mytable WHERE DivTailNums >= 'N507JB' OR LateAircraftDelay NOT IN (221, 232, 89) ORDER BY TaxiIn, DivActualElapsedTime LIMIT 17","hsqls":["SELECT DepartureDelayGroups, DestStateFips, ArrivalDelayGroups FROM mytable WHERE (DivTailNums__MV0 >= 'N507JB' OR DivTailNums__MV1 >= 'N507JB' OR DivTailNums__MV2 >= 'N507JB' OR DivTailNums__MV3 >= 'N507JB' OR DivTailNums__MV4 >= 'N507JB') OR LateAircraftDelay NOT IN (221, 232, 89) ORDER BY TaxiIn, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DepDelay FROM mytable WHERE \"Month\" <> 1 ORDER BY DestWac, Flights, DaysSinceEpoch LIMIT 27","hsqls":["SELECT DepDelay FROM mytable WHERE Month <> 1 ORDER BY DestWac, Flights, DaysSinceEpoch LIMIT 27"]}
+{"sql":"SELECT DepartureDelayGroups, DestStateFips, ArrivalDelayGroups FROM mytable WHERE DivTailNums >= 'N507JB' OR LateAircraftDelay NOT IN (221, 232, 89) ORDER BY TaxiIn, DivActualElapsedTime LIMIT 17","hsqls":["SELECT DepartureDelayGroups, DestStateFips, ArrivalDelayGroups FROM mytable WHERE (DivTailNums[1] >= 'N507JB' OR DivTailNums[2] >= 'N507JB' OR DivTailNums[3] >= 'N507JB' OR DivTailNums[4] >= 'N507JB' OR DivTailNums[5] >= 'N507JB') OR LateAircraftDelay NOT IN (221, 232, 89) ORDER BY TaxiIn, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DepDelay FROM mytable WHERE \"Month\" <> 1 ORDER BY DestWac, Flights, DaysSinceEpoch LIMIT 27","hsqls":["SELECT DepDelay FROM mytable WHERE `Month` <> 1 ORDER BY DestWac, Flights, DaysSinceEpoch LIMIT 27"]}
 {"sql":"SELECT OriginState FROM mytable ORDER BY DepDelay, OriginStateFips, CRSDepTime LIMIT 4"}
 {"sql":"SELECT ArrTimeBlk, MAX(OriginStateFips) FROM mytable WHERE DepTimeBlk NOT IN ('1600-1659', '2200-2259', '1200-1259', '0900-0959') GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 20","hsqls":["SELECT ArrTimeBlk, MAX(OriginStateFips) FROM mytable WHERE DepTimeBlk NOT IN ('1600-1659', '2200-2259', '1200-1259', '0900-0959') GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 20"]}
 {"sql":"SELECT NASDelay, DepTimeBlk, COUNT(DestCityName) FROM mytable GROUP BY NASDelay, DepTimeBlk  ORDER BY NASDelay, DepTimeBlk LIMIT 2","hsqls":["SELECT NASDelay, DepTimeBlk, COUNT(DestCityName) FROM mytable GROUP BY NASDelay, DepTimeBlk  ORDER BY NASDelay, DepTimeBlk LIMIT 2"]}
@@ -1870,24 +1870,24 @@
 {"sql":"SELECT DayOfWeek FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'Virginia' OR OriginCityMarketID BETWEEN 34057 AND 32016 OR CRSDepTime < 947 ORDER BY DivDistance, DepDelayMinutes, DayofMonth LIMIT 19"}
 {"sql":"SELECT FirstDepTime, CRSArrTime, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'MQ' AND 'B6' OR DestWac <= 4 OR DayOfWeek NOT IN (3, 2, 1, 7, 6) GROUP BY FirstDepTime, CRSArrTime  ORDER BY FirstDepTime, CRSArrTime LIMIT 7","hsqls":["SELECT FirstDepTime, CRSArrTime, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'MQ' AND 'B6' OR DestWac <= 4 OR DayOfWeek NOT IN (3, 2, 1, 7, 6) GROUP BY FirstDepTime, CRSArrTime  ORDER BY FirstDepTime, CRSArrTime LIMIT 7"]}
 {"sql":"SELECT WheelsOn FROM mytable ORDER BY CRSArrTime, NASDelay, OriginWac LIMIT 19"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE TaxiIn BETWEEN 10 AND 4 OR Distance BETWEEN 378 AND 2116 LIMIT 27","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE TaxiIn BETWEEN 10 AND 4 OR Distance BETWEEN 378 AND 2116 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE TaxiIn BETWEEN 10 AND 4 OR Distance BETWEEN 378 AND 2116 LIMIT 27","hsqls":["SELECT DivWheelsOns FROM mytable WHERE TaxiIn BETWEEN 10 AND 4 OR Distance BETWEEN 378 AND 2116 LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, COUNT(Quarter), MIN(AirlineID), AVG(CRSArrTime) FROM mytable WHERE SecurityDelay >= 0 OR TotalAddGTime BETWEEN 128 AND 30 AND FirstDepTime IN (2009, 727, 1540, 1800) GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 16","hsqls":["SELECT OriginCityName, COUNT(Quarter), MIN(AirlineID), AVG(CRSArrTime) FROM mytable WHERE SecurityDelay >= 0 OR TotalAddGTime BETWEEN 128 AND 30 AND FirstDepTime IN (2009, 727, 1540, 1800) GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 16"]}
 {"sql":"SELECT CRSArrTime, DivArrDelay FROM mytable ORDER BY AirTime, CancellationCode LIMIT 10"}
 {"sql":"SELECT OriginStateFips, TotalAddGTime, AirTime FROM mytable ORDER BY Flights LIMIT 12"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Quarter > 1 LIMIT 17"}
 {"sql":"SELECT Quarter, ArrTime, DivArrDelay FROM mytable ORDER BY ArrTime, DivAirportLandings LIMIT 14"}
-{"sql":"SELECT DepDel15, DestStateName, CRSDepTime, SUM(DayOfWeek), MAX(OriginWac) FROM mytable WHERE LongestAddGTime >= 47 OR DivWheelsOffs <= 1605 GROUP BY DepDel15, DestStateName, CRSDepTime","hsqls":["SELECT DepDel15, DestStateName, CRSDepTime, SUM(DayOfWeek), MAX(OriginWac) FROM mytable WHERE LongestAddGTime >= 47 OR (DivWheelsOffs__MV0 <= 1605 OR DivWheelsOffs__MV1 <= 1605 OR DivWheelsOffs__MV2 <= 1605 OR DivWheelsOffs__MV3 <= 1605 OR DivWheelsOffs__MV4 <= 1605) GROUP BY DepDel15, DestStateName, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DestStateName, CRSDepTime, SUM(DayOfWeek), MAX(OriginWac) FROM mytable WHERE LongestAddGTime >= 47 OR DivWheelsOffs <= 1605 GROUP BY DepDel15, DestStateName, CRSDepTime","hsqls":["SELECT DepDel15, DestStateName, CRSDepTime, SUM(DayOfWeek), MAX(OriginWac) FROM mytable WHERE LongestAddGTime >= 47 OR (DivWheelsOffs[1] <= 1605 OR DivWheelsOffs[2] <= 1605 OR DivWheelsOffs[3] <= 1605 OR DivWheelsOffs[4] <= 1605 OR DivWheelsOffs[5] <= 1605) GROUP BY DepDel15, DestStateName, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, ActualElapsedTime, CRSElapsedTime FROM mytable LIMIT 24"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DivLongestGTimes >= 4.0 AND DepartureDelayGroups = 2 AND TotalAddGTime < 8 ORDER BY OriginAirportSeqID, Dest, DivActualElapsedTime LIMIT 18","hsqls":["SELECT Year FROM mytable WHERE (DivLongestGTimes__MV0 >= 4.0 OR DivLongestGTimes__MV1 >= 4.0 OR DivLongestGTimes__MV2 >= 4.0 OR DivLongestGTimes__MV3 >= 4.0 OR DivLongestGTimes__MV4 >= 4.0) AND DepartureDelayGroups = 2 AND TotalAddGTime < 8 ORDER BY OriginAirportSeqID, Dest, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DivLongestGTimes >= 4.0 AND DepartureDelayGroups = 2 AND TotalAddGTime < 8 ORDER BY OriginAirportSeqID, Dest, DivActualElapsedTime LIMIT 18","hsqls":["SELECT `Year` FROM mytable WHERE (DivLongestGTimes[1] >= 4.0 OR DivLongestGTimes[2] >= 4.0 OR DivLongestGTimes[3] >= 4.0 OR DivLongestGTimes[4] >= 4.0 OR DivLongestGTimes[5] >= 4.0) AND DepartureDelayGroups = 2 AND TotalAddGTime < 8 ORDER BY OriginAirportSeqID, Dest, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CancellationCode = 'C' LIMIT 3"}
 {"sql":"SELECT COUNT(OriginWac), MAX(DivAirportLandings) FROM mytable LIMIT 8"}
-{"sql":"SELECT DepartureDelayGroups, DivAirports, ArrTimeBlk FROM mytable WHERE FlightNum BETWEEN 468 AND 4192 AND ArrTimeBlk NOT IN ('0800-0859', '1200-1259', '0001-0559', '1800-1859') OR DestAirportID <= 11203 ORDER BY DestState, CRSArrTime LIMIT 23","hsqls":["SELECT DepartureDelayGroups, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrTimeBlk FROM mytable WHERE FlightNum BETWEEN 468 AND 4192 AND ArrTimeBlk NOT IN ('0800-0859', '1200-1259', '0001-0559', '1800-1859') OR DestAirportID <= 11203 ORDER BY DestState, CRSArrTime LIMIT 10000"]}
-{"sql":"SELECT DestState, OriginCityName, DayOfWeek, MAX(SecurityDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepartureDelayGroups BETWEEN 6 AND 10 GROUP BY DestState, OriginCityName, DayOfWeek LIMIT 25","hsqls":["SELECT DestState, OriginCityName, DayOfWeek, MAX(SecurityDelay) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DepartureDelayGroups BETWEEN 6 AND 10 GROUP BY DestState, OriginCityName, DayOfWeek LIMIT 25"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirports, ArrTimeBlk FROM mytable WHERE FlightNum BETWEEN 468 AND 4192 AND ArrTimeBlk NOT IN ('0800-0859', '1200-1259', '0001-0559', '1800-1859') OR DestAirportID <= 11203 ORDER BY DestState, CRSArrTime LIMIT 23","hsqls":["SELECT DepartureDelayGroups, DivAirports, ArrTimeBlk FROM mytable WHERE FlightNum BETWEEN 468 AND 4192 AND ArrTimeBlk NOT IN ('0800-0859', '1200-1259', '0001-0559', '1800-1859') OR DestAirportID <= 11203 ORDER BY DestState, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DestState, OriginCityName, DayOfWeek, MAX(SecurityDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepartureDelayGroups BETWEEN 6 AND 10 GROUP BY DestState, OriginCityName, DayOfWeek LIMIT 25","hsqls":["SELECT DestState, OriginCityName, DayOfWeek, MAX(SecurityDelay) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DepartureDelayGroups BETWEEN 6 AND 10 GROUP BY DestState, OriginCityName, DayOfWeek LIMIT 25"]}
 {"sql":"SELECT DestState, OriginStateFips, NASDelay, MIN(OriginAirportID), COUNT(DestWac), MIN(CRSArrTime) FROM mytable WHERE DepDel15 IN (1, 0) OR Diverted <= 0 GROUP BY DestState, OriginStateFips, NASDelay  ORDER BY DestState, OriginStateFips, NASDelay LIMIT 9","hsqls":["SELECT DestState, OriginStateFips, NASDelay, MIN(OriginAirportID), COUNT(DestWac), MIN(CRSArrTime) FROM mytable WHERE DepDel15 IN (1, 0) OR Diverted <= 0 GROUP BY DestState, OriginStateFips, NASDelay  ORDER BY DestState, OriginStateFips, NASDelay LIMIT 9"]}
-{"sql":"SELECT SecurityDelay FROM mytable WHERE DaysSinceEpoch >= 16089 OR \"Month\" <> 1 ORDER BY OriginAirportSeqID, DestStateName, DepTimeBlk LIMIT 24","hsqls":["SELECT SecurityDelay FROM mytable WHERE DaysSinceEpoch >= 16089 OR Month <> 1 ORDER BY OriginAirportSeqID, DestStateName, DepTimeBlk LIMIT 24"]}
-{"sql":"SELECT DivArrDelay, COUNT(\"Month\"), AVG(WeatherDelay) FROM mytable GROUP BY DivArrDelay LIMIT 10","hsqls":["SELECT DivArrDelay, COUNT(Month), AVG(WeatherDelay) FROM mytable GROUP BY DivArrDelay LIMIT 10"]}
+{"sql":"SELECT SecurityDelay FROM mytable WHERE DaysSinceEpoch >= 16089 OR \"Month\" <> 1 ORDER BY OriginAirportSeqID, DestStateName, DepTimeBlk LIMIT 24","hsqls":["SELECT SecurityDelay FROM mytable WHERE DaysSinceEpoch >= 16089 OR `Month` <> 1 ORDER BY OriginAirportSeqID, DestStateName, DepTimeBlk LIMIT 24"]}
+{"sql":"SELECT DivArrDelay, COUNT(\"Month\"), AVG(WeatherDelay) FROM mytable GROUP BY DivArrDelay LIMIT 10","hsqls":["SELECT DivArrDelay, COUNT(`Month`), AVG(WeatherDelay) FROM mytable GROUP BY DivArrDelay LIMIT 10"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE CRSDepTime BETWEEN 840 AND 945 OR CRSElapsedTime BETWEEN 570 AND 413 LIMIT 25"}
-{"sql":"SELECT Cancelled, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 41.0 AND 379.0 OR DestCityMarketID BETWEEN 30980 AND 31884 AND DivAirportIDs BETWEEN 11775 AND 14314 GROUP BY Cancelled, DivActualElapsedTime LIMIT 17","hsqls":["SELECT Cancelled, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 41.0 AND 379.0 OR DestCityMarketID BETWEEN 30980 AND 31884 AND (DivAirportIDs__MV0 BETWEEN 11775 AND 14314 OR DivAirportIDs__MV1 BETWEEN 11775 AND 14314 OR DivAirportIDs__MV2 BETWEEN 11775 AND 14314 OR DivAirportIDs__MV3 BETWEEN 11775 AND 14314 OR DivAirportIDs__MV4 BETWEEN 11775 AND 14314) GROUP BY Cancelled, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT Cancelled, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 41.0 AND 379.0 OR DestCityMarketID BETWEEN 30980 AND 31884 AND DivAirportIDs BETWEEN 11775 AND 14314 GROUP BY Cancelled, DivActualElapsedTime LIMIT 17","hsqls":["SELECT Cancelled, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 41.0 AND 379.0 OR DestCityMarketID BETWEEN 30980 AND 31884 AND (DivAirportIDs[1] BETWEEN 11775 AND 14314 OR DivAirportIDs[2] BETWEEN 11775 AND 14314 OR DivAirportIDs[3] BETWEEN 11775 AND 14314 OR DivAirportIDs[4] BETWEEN 11775 AND 14314 OR DivAirportIDs[5] BETWEEN 11775 AND 14314) GROUP BY Cancelled, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'North Carolina' AND 'Texas' LIMIT 21"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Quarter IN (1) OR OriginAirportSeqID = 1228002 OR ArrivalDelayGroups BETWEEN 2 AND 0 LIMIT 14"}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE ArrivalDelayGroups <> 11 ORDER BY DepTime, DestStateName LIMIT 10"}
@@ -1899,29 +1899,29 @@
 {"sql":"SELECT ArrTime FROM mytable WHERE TaxiIn IN (2, 1, 9, 11) AND Origin IN ('FNT', 'CSG', 'OKC', 'CWA') ORDER BY DepDelayMinutes, DayofMonth LIMIT 14"}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE DayofMonth > 19 AND DestStateName BETWEEN 'Hawaii' AND 'New York' LIMIT 29"}
 {"sql":"SELECT Distance, MAX(OriginAirportSeqID), AVG(WheelsOn) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 AND Carrier = 'B6' OR Quarter > 1 GROUP BY Distance  ORDER BY Distance LIMIT 24","hsqls":["SELECT Distance, MAX(OriginAirportSeqID), AVG(WheelsOn) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 AND Carrier = 'B6' OR Quarter > 1 GROUP BY Distance  ORDER BY Distance LIMIT 24"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable LIMIT 5","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable LIMIT 5","hsqls":["SELECT DivTotalGTimes FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE DestStateName BETWEEN 'Maryland' AND 'Delaware' ORDER BY Carrier, DepDel15 LIMIT 10"}
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY DivReachedDest, TotalAddGTime, DestStateName LIMIT 2"}
 {"sql":"SELECT TailNum, OriginWac, MAX(ArrDel15), MAX(WheelsOn) FROM mytable GROUP BY TailNum, OriginWac  ORDER BY TailNum, OriginWac LIMIT 6","hsqls":["SELECT TailNum, OriginWac, MAX(ArrDel15), MAX(WheelsOn) FROM mytable GROUP BY TailNum, OriginWac  ORDER BY TailNum, OriginWac LIMIT 6"]}
 {"sql":"SELECT Origin, MAX(Quarter), SUM(DestAirportSeqID), COUNT(DepDelayMinutes) FROM mytable WHERE UniqueCarrier BETWEEN 'HA' AND 'MQ' GROUP BY Origin  ORDER BY Origin LIMIT 29","hsqls":["SELECT Origin, MAX(Quarter), SUM(DestAirportSeqID), COUNT(DepDelayMinutes) FROM mytable WHERE UniqueCarrier BETWEEN 'HA' AND 'MQ' GROUP BY Origin  ORDER BY Origin LIMIT 29"]}
 {"sql":"SELECT MIN(Diverted) FROM mytable WHERE ArrDel15 <> 0 LIMIT 15"}
-{"sql":"SELECT Quarter FROM mytable WHERE DepTime IN (1808, 1735) OR LateAircraftDelay <> 157 AND DivAirports = 'INL' LIMIT 2","hsqls":["SELECT Quarter FROM mytable WHERE DepTime IN (1808, 1735) OR LateAircraftDelay <> 157 AND (DivAirports__MV0 = 'INL' OR DivAirports__MV1 = 'INL' OR DivAirports__MV2 = 'INL' OR DivAirports__MV3 = 'INL' OR DivAirports__MV4 = 'INL') LIMIT 10000"]}
+{"sql":"SELECT Quarter FROM mytable WHERE DepTime IN (1808, 1735) OR LateAircraftDelay <> 157 AND DivAirports = 'INL' LIMIT 2","hsqls":["SELECT Quarter FROM mytable WHERE DepTime IN (1808, 1735) OR LateAircraftDelay <> 157 AND (DivAirports[1] = 'INL' OR DivAirports[2] = 'INL' OR DivAirports[3] = 'INL' OR DivAirports[4] = 'INL' OR DivAirports[5] = 'INL') LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 9 ORDER BY OriginAirportSeqID, LongestAddGTime, DestAirportID LIMIT 16"}
 {"sql":"SELECT MAX(NASDelay), SUM(Flights), MAX(Cancelled) FROM mytable WHERE CRSArrTime < 2352 OR ArrDel15 BETWEEN -9999 AND -9999 OR OriginAirportID BETWEEN 10785 AND 10930 LIMIT 25"}
 {"sql":"SELECT DepartureDelayGroups, DayofMonth FROM mytable WHERE DepTimeBlk NOT IN ('1700-1759', '1300-1359', '2300-2359', '0900-0959', '0001-0559') OR DepartureDelayGroups BETWEEN 8 AND 10 OR LateAircraftDelay BETWEEN 75 AND 174 LIMIT 6"}
 {"sql":"SELECT Distance, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 1488 AND 104 GROUP BY Distance  ORDER BY Distance LIMIT 26","hsqls":["SELECT Distance, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 1488 AND 104 GROUP BY Distance  ORDER BY Distance LIMIT 26"]}
-{"sql":"SELECT OriginAirportSeqID, DivWheelsOns FROM mytable WHERE ArrDel15 = 1 AND AirlineID <> 20304 ORDER BY FirstDepTime, ArrTime, UniqueCarrier LIMIT 2","hsqls":["SELECT OriginAirportSeqID, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE ArrDel15 = 1 AND AirlineID <> 20304 ORDER BY FirstDepTime, ArrTime, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivWheelsOns FROM mytable WHERE ArrDel15 = 1 AND AirlineID <> 20304 ORDER BY FirstDepTime, ArrTime, UniqueCarrier LIMIT 2","hsqls":["SELECT OriginAirportSeqID, DivWheelsOns FROM mytable WHERE ArrDel15 = 1 AND AirlineID <> 20304 ORDER BY FirstDepTime, ArrTime, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT Flights, TailNum FROM mytable LIMIT 24"}
 {"sql":"SELECT \"Year\", SecurityDelay, AirlineID, MIN(OriginCityMarketID) FROM mytable WHERE OriginStateFips BETWEEN 33 AND 55 GROUP BY \"Year\", SecurityDelay, AirlineID LIMIT 24","hsqls":["SELECT Year, SecurityDelay, AirlineID, MIN(OriginCityMarketID) FROM mytable WHERE OriginStateFips BETWEEN 33 AND 55 GROUP BY Year, SecurityDelay, AirlineID LIMIT 24"]}
 {"sql":"SELECT CRSArrTime, DaysSinceEpoch FROM mytable ORDER BY Diverted, AirlineID, DivAirportLandings LIMIT 6"}
 {"sql":"SELECT DepTime, DivArrDelay FROM mytable WHERE CarrierDelay <= 243 ORDER BY TaxiOut, \"Year\", FirstDepTime LIMIT 7","hsqls":["SELECT DepTime, DivArrDelay FROM mytable WHERE CarrierDelay <= 243 ORDER BY TaxiOut, Year, FirstDepTime LIMIT 7"]}
-{"sql":"SELECT DepDel15, MIN(ArrDelayMinutes), SUM(ArrDel15), AVG(FlightNum) FROM mytable WHERE DivAirportIDs IN (16101, 14492, 13487, 11603) AND DestState <> 'ND' GROUP BY DepDel15 LIMIT 8","hsqls":["SELECT DepDel15, MIN(ArrDelayMinutes), SUM(ArrDel15), AVG(FlightNum) FROM mytable WHERE (DivAirportIDs__MV0 IN (16101, 14492, 13487, 11603) OR DivAirportIDs__MV1 IN (16101, 14492, 13487, 11603) OR DivAirportIDs__MV2 IN (16101, 14492, 13487, 11603) OR DivAirportIDs__MV3 IN (16101, 14492, 13487, 11603) OR DivAirportIDs__MV4 IN (16101, 14492, 13487, 11603)) AND DestState <> 'ND' GROUP BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DepDel15, MIN(ArrDelayMinutes), SUM(ArrDel15), AVG(FlightNum) FROM mytable WHERE DivAirportIDs IN (16101, 14492, 13487, 11603) AND DestState <> 'ND' GROUP BY DepDel15 LIMIT 8","hsqls":["SELECT DepDel15, MIN(ArrDelayMinutes), SUM(ArrDel15), AVG(FlightNum) FROM mytable WHERE (DivAirportIDs[1] IN (16101, 14492, 13487, 11603) OR DivAirportIDs[2] IN (16101, 14492, 13487, 11603) OR DivAirportIDs[3] IN (16101, 14492, 13487, 11603) OR DivAirportIDs[4] IN (16101, 14492, 13487, 11603) OR DivAirportIDs[5] IN (16101, 14492, 13487, 11603)) AND DestState <> 'ND' GROUP BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, CancellationCode FROM mytable WHERE DistanceGroup BETWEEN 10 AND 9 AND DayofMonth BETWEEN 5 AND 8 ORDER BY DivReachedDest, FlightNum LIMIT 18"}
 {"sql":"SELECT OriginState, COUNT(*) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 13","hsqls":["SELECT OriginState, COUNT(*) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 13"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState <> 'SD' AND Carrier BETWEEN 'WN' AND 'UA' LIMIT 13"}
-{"sql":"SELECT DivAirports, OriginCityMarketID, OriginStateName FROM mytable WHERE DestCityName > 'Akron, OH' ORDER BY DepartureDelayGroups, CRSElapsedTime LIMIT 3","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityMarketID, OriginStateName FROM mytable WHERE DestCityName > 'Akron, OH' ORDER BY DepartureDelayGroups, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityMarketID, OriginStateName FROM mytable WHERE DestCityName > 'Akron, OH' ORDER BY DepartureDelayGroups, CRSElapsedTime LIMIT 3","hsqls":["SELECT DivAirports, OriginCityMarketID, OriginStateName FROM mytable WHERE DestCityName > 'Akron, OH' ORDER BY DepartureDelayGroups, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, TaxiIn, DivActualElapsedTime FROM mytable WHERE CRSArrTime BETWEEN 721 AND 605 ORDER BY OriginCityName LIMIT 11"}
-{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivAirportSeqIDs BETWEEN 1496002 AND 1540103 AND OriginCityName IN ('Santa Barbara, CA', 'Rock Springs, WY', 'Charlottesville, VA', 'Pasco/Kennewick/Richland, WA') ORDER BY DistanceGroup, LongestAddGTime LIMIT 26","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs__MV1 BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs__MV2 BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs__MV3 BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs__MV4 BETWEEN 1496002 AND 1540103) AND OriginCityName IN ('Santa Barbara, CA', 'Rock Springs, WY', 'Charlottesville, VA', 'Pasco/Kennewick/Richland, WA') ORDER BY DistanceGroup, LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivAirportSeqIDs BETWEEN 1496002 AND 1540103 AND OriginCityName IN ('Santa Barbara, CA', 'Rock Springs, WY', 'Charlottesville, VA', 'Pasco/Kennewick/Richland, WA') ORDER BY DistanceGroup, LongestAddGTime LIMIT 26","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs[2] BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs[3] BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs[4] BETWEEN 1496002 AND 1540103 OR DivAirportSeqIDs[5] BETWEEN 1496002 AND 1540103) AND OriginCityName IN ('Santa Barbara, CA', 'Rock Springs, WY', 'Charlottesville, VA', 'Pasco/Kennewick/Richland, WA') ORDER BY DistanceGroup, LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT OriginStateName FROM mytable LIMIT 10"}
 {"sql":"SELECT OriginAirportID, MAX(TaxiIn), COUNT(DaysSinceEpoch) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 8","hsqls":["SELECT OriginAirportID, MAX(TaxiIn), COUNT(DaysSinceEpoch) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 8"]}
 {"sql":"SELECT AVG(CRSDepTime), AVG(ArrDel15), MAX(DepartureDelayGroups) FROM mytable LIMIT 20"}
@@ -1929,10 +1929,10 @@
 {"sql":"SELECT DivReachedDest, LongestAddGTime, DepTime, AVG(DestStateFips), COUNT(OriginStateName) FROM mytable GROUP BY DivReachedDest, LongestAddGTime, DepTime  ORDER BY DivReachedDest, LongestAddGTime, DepTime LIMIT 15","hsqls":["SELECT DivReachedDest, LongestAddGTime, DepTime, AVG(DestStateFips), COUNT(OriginStateName) FROM mytable GROUP BY DivReachedDest, LongestAddGTime, DepTime  ORDER BY DivReachedDest, LongestAddGTime, DepTime LIMIT 15"]}
 {"sql":"SELECT COUNT(Flights), SUM(OriginAirportID) FROM mytable WHERE DestCityMarketID < 31423 LIMIT 5"}
 {"sql":"SELECT OriginStateFips, DestAirportSeqID, MAX(DepartureDelayGroups), MIN(ActualElapsedTime), COUNT(LongestAddGTime) FROM mytable WHERE CRSDepTime BETWEEN 1657 AND 1148 GROUP BY OriginStateFips, DestAirportSeqID  ORDER BY OriginStateFips, DestAirportSeqID LIMIT 15","hsqls":["SELECT OriginStateFips, DestAirportSeqID, MAX(DepartureDelayGroups), MIN(ActualElapsedTime), COUNT(LongestAddGTime) FROM mytable WHERE CRSDepTime BETWEEN 1657 AND 1148 GROUP BY OriginStateFips, DestAirportSeqID  ORDER BY OriginStateFips, DestAirportSeqID LIMIT 15"]}
-{"sql":"SELECT CRSDepTime, MAX(\"Year\"), COUNT(ArrDelay) FROM mytable WHERE LongestAddGTime IN (20, 96, 58, 40, 8) GROUP BY CRSDepTime LIMIT 17","hsqls":["SELECT CRSDepTime, MAX(Year), COUNT(ArrDelay) FROM mytable WHERE LongestAddGTime IN (20, 96, 58, 40, 8) GROUP BY CRSDepTime LIMIT 17"]}
+{"sql":"SELECT CRSDepTime, MAX(\"Year\"), COUNT(ArrDelay) FROM mytable WHERE LongestAddGTime IN (20, 96, 58, 40, 8) GROUP BY CRSDepTime LIMIT 17","hsqls":["SELECT CRSDepTime, MAX(`Year`), COUNT(ArrDelay) FROM mytable WHERE LongestAddGTime IN (20, 96, 58, 40, 8) GROUP BY CRSDepTime LIMIT 17"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE DayofMonth <> 10 AND DestAirportID BETWEEN 11617 AND 13367 AND DestCityMarketID = 32523 ORDER BY ActualElapsedTime, OriginWac LIMIT 25"}
-{"sql":"SELECT TaxiOut, DivDistance, CRSArrTime FROM mytable WHERE DivAirportSeqIDs IN (1342202) OR DestCityMarketID >= 30155 LIMIT 2","hsqls":["SELECT TaxiOut, DivDistance, CRSArrTime FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1342202) OR DivAirportSeqIDs__MV1 IN (1342202) OR DivAirportSeqIDs__MV2 IN (1342202) OR DivAirportSeqIDs__MV3 IN (1342202) OR DivAirportSeqIDs__MV4 IN (1342202)) OR DestCityMarketID >= 30155 LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, FlightNum FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 8","hsqls":["SELECT LongestAddGTime, FlightNum FROM mytable WHERE Year BETWEEN 2014 AND 2014 LIMIT 8"]}
+{"sql":"SELECT TaxiOut, DivDistance, CRSArrTime FROM mytable WHERE DivAirportSeqIDs IN (1342202) OR DestCityMarketID >= 30155 LIMIT 2","hsqls":["SELECT TaxiOut, DivDistance, CRSArrTime FROM mytable WHERE (DivAirportSeqIDs[1] IN (1342202) OR DivAirportSeqIDs[2] IN (1342202) OR DivAirportSeqIDs[3] IN (1342202) OR DivAirportSeqIDs[4] IN (1342202) OR DivAirportSeqIDs[5] IN (1342202)) OR DestCityMarketID >= 30155 LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, FlightNum FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 8","hsqls":["SELECT LongestAddGTime, FlightNum FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 LIMIT 8"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE ArrTimeBlk <> '1000-1059' OR Carrier NOT IN ('HA', 'US', 'AS') OR ActualElapsedTime NOT IN (349, 435, 224) LIMIT 15"}
 {"sql":"SELECT DivDistance, Dest FROM mytable WHERE DestCityName IN ('Wichita, KS') OR LateAircraftDelay NOT IN (159) AND DestAirportSeqID NOT IN (1468902) ORDER BY WheelsOff, Distance LIMIT 14"}
 {"sql":"SELECT AVG(DestAirportSeqID), MIN(Flights), AVG(Flights) FROM mytable WHERE AirTime IN (67, 64, 281) LIMIT 3"}
@@ -1940,34 +1940,34 @@
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 11"}
 {"sql":"SELECT DistanceGroup, OriginCityMarketID, Cancelled FROM mytable WHERE Flights IN (1) OR DepDel15 <> 1 ORDER BY DistanceGroup, DivReachedDest, DepDel15 LIMIT 28"}
 {"sql":"SELECT DestAirportSeqID, TailNum, OriginStateName, AVG(DestAirportSeqID), AVG(CarrierDelay) FROM mytable GROUP BY DestAirportSeqID, TailNum, OriginStateName  ORDER BY DestAirportSeqID, TailNum, OriginStateName LIMIT 13","hsqls":["SELECT DestAirportSeqID, TailNum, OriginStateName, AVG(DestAirportSeqID), AVG(CarrierDelay) FROM mytable GROUP BY DestAirportSeqID, TailNum, OriginStateName  ORDER BY DestAirportSeqID, TailNum, OriginStateName LIMIT 13"]}
-{"sql":"SELECT Flights, Origin, MAX(AirTime) FROM mytable WHERE DivTotalGTimes IN (65) OR Diverted BETWEEN 0 AND 1 AND CRSDepTime NOT IN (843, 1726, 1821, 2120) GROUP BY Flights, Origin LIMIT 14","hsqls":["SELECT Flights, Origin, MAX(AirTime) FROM mytable WHERE (DivTotalGTimes__MV0 IN (65) OR DivTotalGTimes__MV1 IN (65) OR DivTotalGTimes__MV2 IN (65) OR DivTotalGTimes__MV3 IN (65) OR DivTotalGTimes__MV4 IN (65)) OR Diverted BETWEEN 0 AND 1 AND CRSDepTime NOT IN (843, 1726, 1821, 2120) GROUP BY Flights, Origin LIMIT 10000"]}
-{"sql":"SELECT Diverted, DivAirportIDs, DivActualElapsedTime FROM mytable ORDER BY FlightDate, DepTime, ArrTimeBlk LIMIT 5","hsqls":["SELECT Diverted, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivActualElapsedTime FROM mytable ORDER BY FlightDate, DepTime, ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT FlightNum, OriginCityName, ActualElapsedTime FROM mytable WHERE OriginStateFips <= 8 OR \"Month\" BETWEEN 1 AND 1 LIMIT 18","hsqls":["SELECT FlightNum, OriginCityName, ActualElapsedTime FROM mytable WHERE OriginStateFips <= 8 OR Month BETWEEN 1 AND 1 LIMIT 18"]}
-{"sql":"SELECT Flights, ArrDelayMinutes, ArrDel15 FROM mytable WHERE TailNum IN ('N729SW', 'N39475') OR DayOfWeek BETWEEN 7 AND 2 AND DivLongestGTimes IN (42.0, 7.0) ORDER BY UniqueCarrier LIMIT 14","hsqls":["SELECT Flights, ArrDelayMinutes, ArrDel15 FROM mytable WHERE TailNum IN ('N729SW', 'N39475') OR DayOfWeek BETWEEN 7 AND 2 AND (DivLongestGTimes__MV0 IN (42.0, 7.0) OR DivLongestGTimes__MV1 IN (42.0, 7.0) OR DivLongestGTimes__MV2 IN (42.0, 7.0) OR DivLongestGTimes__MV3 IN (42.0, 7.0) OR DivLongestGTimes__MV4 IN (42.0, 7.0)) ORDER BY UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT Flights, Origin, MAX(AirTime) FROM mytable WHERE DivTotalGTimes IN (65) OR Diverted BETWEEN 0 AND 1 AND CRSDepTime NOT IN (843, 1726, 1821, 2120) GROUP BY Flights, Origin LIMIT 14","hsqls":["SELECT Flights, Origin, MAX(AirTime) FROM mytable WHERE (DivTotalGTimes[1] IN (65) OR DivTotalGTimes[2] IN (65) OR DivTotalGTimes[3] IN (65) OR DivTotalGTimes[4] IN (65) OR DivTotalGTimes[5] IN (65)) OR Diverted BETWEEN 0 AND 1 AND CRSDepTime NOT IN (843, 1726, 1821, 2120) GROUP BY Flights, Origin LIMIT 10000"]}
+{"sql":"SELECT Diverted, DivAirportIDs, DivActualElapsedTime FROM mytable ORDER BY FlightDate, DepTime, ArrTimeBlk LIMIT 5","hsqls":["SELECT Diverted, DivAirportIDs, DivActualElapsedTime FROM mytable ORDER BY FlightDate, DepTime, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT FlightNum, OriginCityName, ActualElapsedTime FROM mytable WHERE OriginStateFips <= 8 OR \"Month\" BETWEEN 1 AND 1 LIMIT 18","hsqls":["SELECT FlightNum, OriginCityName, ActualElapsedTime FROM mytable WHERE OriginStateFips <= 8 OR `Month` BETWEEN 1 AND 1 LIMIT 18"]}
+{"sql":"SELECT Flights, ArrDelayMinutes, ArrDel15 FROM mytable WHERE TailNum IN ('N729SW', 'N39475') OR DayOfWeek BETWEEN 7 AND 2 AND DivLongestGTimes IN (42.0, 7.0) ORDER BY UniqueCarrier LIMIT 14","hsqls":["SELECT Flights, ArrDelayMinutes, ArrDel15 FROM mytable WHERE TailNum IN ('N729SW', 'N39475') OR DayOfWeek BETWEEN 7 AND 2 AND (DivLongestGTimes[1] IN (42.0, 7.0) OR DivLongestGTimes[2] IN (42.0, 7.0) OR DivLongestGTimes[3] IN (42.0, 7.0) OR DivLongestGTimes[4] IN (42.0, 7.0) OR DivLongestGTimes[5] IN (42.0, 7.0)) ORDER BY UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, AVG(LateAircraftDelay), AVG(DivArrDelay), MIN(ArrTime) FROM mytable WHERE ArrTime NOT IN (239, 2119) GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 2","hsqls":["SELECT LongestAddGTime, AVG(LateAircraftDelay), AVG(DivArrDelay), MIN(ArrTime) FROM mytable WHERE ArrTime NOT IN (239, 2119) GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 2"]}
 {"sql":"SELECT CancellationCode, ArrivalDelayGroups, MIN(Cancelled), SUM(OriginAirportSeqID) FROM mytable GROUP BY CancellationCode, ArrivalDelayGroups  ORDER BY CancellationCode, ArrivalDelayGroups LIMIT 25","hsqls":["SELECT CancellationCode, ArrivalDelayGroups, MIN(Cancelled), SUM(OriginAirportSeqID) FROM mytable GROUP BY CancellationCode, ArrivalDelayGroups  ORDER BY CancellationCode, ArrivalDelayGroups LIMIT 25"]}
 {"sql":"SELECT OriginAirportSeqID, Carrier, TotalAddGTime, MAX(OriginWac), MIN(LongestAddGTime), SUM(SecurityDelay) FROM mytable WHERE Origin BETWEEN 'ROW' AND 'SAT' AND OriginState <= 'MS' GROUP BY OriginAirportSeqID, Carrier, TotalAddGTime  ORDER BY OriginAirportSeqID, Carrier, TotalAddGTime LIMIT 14","hsqls":["SELECT OriginAirportSeqID, Carrier, TotalAddGTime, MAX(OriginWac), MIN(LongestAddGTime), SUM(SecurityDelay) FROM mytable WHERE Origin BETWEEN 'ROW' AND 'SAT' AND OriginState <= 'MS' GROUP BY OriginAirportSeqID, Carrier, TotalAddGTime  ORDER BY OriginAirportSeqID, Carrier, TotalAddGTime LIMIT 14"]}
-{"sql":"SELECT DivDistance FROM mytable WHERE OriginStateFips >= 38 OR \"Month\" NOT IN (1) AND WeatherDelay BETWEEN 35 AND 27 ORDER BY OriginCityMarketID LIMIT 27","hsqls":["SELECT DivDistance FROM mytable WHERE OriginStateFips >= 38 OR Month NOT IN (1) AND WeatherDelay BETWEEN 35 AND 27 ORDER BY OriginCityMarketID LIMIT 27"]}
+{"sql":"SELECT DivDistance FROM mytable WHERE OriginStateFips >= 38 OR \"Month\" NOT IN (1) AND WeatherDelay BETWEEN 35 AND 27 ORDER BY OriginCityMarketID LIMIT 27","hsqls":["SELECT DivDistance FROM mytable WHERE OriginStateFips >= 38 OR `Month` NOT IN (1) AND WeatherDelay BETWEEN 35 AND 27 ORDER BY OriginCityMarketID LIMIT 27"]}
 {"sql":"SELECT ArrDel15, CancellationCode, CRSElapsedTime, COUNT(*) FROM mytable WHERE AirTime BETWEEN 239 AND 480 AND DepDel15 > 0 AND ArrivalDelayGroups <= 9 GROUP BY ArrDel15, CancellationCode, CRSElapsedTime  ORDER BY ArrDel15, CancellationCode, CRSElapsedTime LIMIT 11","hsqls":["SELECT ArrDel15, CancellationCode, CRSElapsedTime, COUNT(*) FROM mytable WHERE AirTime BETWEEN 239 AND 480 AND DepDel15 > 0 AND ArrivalDelayGroups <= 9 GROUP BY ArrDel15, CancellationCode, CRSElapsedTime  ORDER BY ArrDel15, CancellationCode, CRSElapsedTime LIMIT 11"]}
 {"sql":"SELECT Distance, UniqueCarrier FROM mytable ORDER BY CRSDepTime, OriginAirportID LIMIT 26"}
 {"sql":"SELECT ArrTimeBlk, Dest, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE Distance BETWEEN 448 AND 4502 OR OriginWac BETWEEN 43 AND 63 OR FlightNum NOT IN (1601, 2918, 1415, 2179, 110) GROUP BY ArrTimeBlk, Dest, ArrivalDelayGroups  ORDER BY ArrTimeBlk, Dest, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT ArrTimeBlk, Dest, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE Distance BETWEEN 448 AND 4502 OR OriginWac BETWEEN 43 AND 63 OR FlightNum NOT IN (1601, 2918, 1415, 2179, 110) GROUP BY ArrTimeBlk, Dest, ArrivalDelayGroups  ORDER BY ArrTimeBlk, Dest, ArrivalDelayGroups LIMIT 14"]}
-{"sql":"SELECT SUM(DivAirportLandings), MIN(WeatherDelay) FROM mytable WHERE Cancelled = 1 AND DestAirportID IN (12888, 12884, 14193) OR \"Year\" IN (2014) LIMIT 11","hsqls":["SELECT SUM(DivAirportLandings), MIN(WeatherDelay) FROM mytable WHERE Cancelled = 1 AND DestAirportID IN (12888, 12884, 14193) OR Year IN (2014) LIMIT 11"]}
+{"sql":"SELECT SUM(DivAirportLandings), MIN(WeatherDelay) FROM mytable WHERE Cancelled = 1 AND DestAirportID IN (12888, 12884, 14193) OR \"Year\" IN (2014) LIMIT 11","hsqls":["SELECT SUM(DivAirportLandings), MIN(WeatherDelay) FROM mytable WHERE Cancelled = 1 AND DestAirportID IN (12888, 12884, 14193) OR `Year` IN (2014) LIMIT 11"]}
 {"sql":"SELECT Carrier, Dest FROM mytable LIMIT 23"}
-{"sql":"SELECT Quarter, FlightNum FROM mytable WHERE DivLongestGTimes IN (30.0, 17.0) OR Diverted >= 1 AND DestAirportID >= 13502 ORDER BY DepartureDelayGroups, Dest, UniqueCarrier LIMIT 21","hsqls":["SELECT Quarter, FlightNum FROM mytable WHERE (DivLongestGTimes__MV0 IN (30.0, 17.0) OR DivLongestGTimes__MV1 IN (30.0, 17.0) OR DivLongestGTimes__MV2 IN (30.0, 17.0) OR DivLongestGTimes__MV3 IN (30.0, 17.0) OR DivLongestGTimes__MV4 IN (30.0, 17.0)) OR Diverted >= 1 AND DestAirportID >= 13502 ORDER BY DepartureDelayGroups, Dest, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT Quarter, FlightNum FROM mytable WHERE DivLongestGTimes IN (30.0, 17.0) OR Diverted >= 1 AND DestAirportID >= 13502 ORDER BY DepartureDelayGroups, Dest, UniqueCarrier LIMIT 21","hsqls":["SELECT Quarter, FlightNum FROM mytable WHERE (DivLongestGTimes[1] IN (30.0, 17.0) OR DivLongestGTimes[2] IN (30.0, 17.0) OR DivLongestGTimes[3] IN (30.0, 17.0) OR DivLongestGTimes[4] IN (30.0, 17.0) OR DivLongestGTimes[5] IN (30.0, 17.0)) OR Diverted >= 1 AND DestAirportID >= 13502 ORDER BY DepartureDelayGroups, Dest, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, COUNT(FlightNum), AVG(DistanceGroup) FROM mytable WHERE AirlineID IN (20436, 20437, 19930) GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 18","hsqls":["SELECT OriginAirportSeqID, COUNT(FlightNum), AVG(DistanceGroup) FROM mytable WHERE AirlineID IN (20436, 20437, 19930) GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 18"]}
 {"sql":"SELECT DivAirportLandings, SUM(DivArrDelay), MAX(ActualElapsedTime) FROM mytable WHERE LateAircraftDelay = 53 OR OriginAirportSeqID BETWEEN 1104202 AND 1160302 AND DivAirportLandings IN (1) GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 20","hsqls":["SELECT DivAirportLandings, SUM(DivArrDelay), MAX(ActualElapsedTime) FROM mytable WHERE LateAircraftDelay = 53 OR OriginAirportSeqID BETWEEN 1104202 AND 1160302 AND DivAirportLandings IN (1) GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 20"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE AirlineID <= 19977 OR DepTime >= 515 OR OriginAirportSeqID BETWEEN 1288403 AND 1221702 ORDER BY OriginStateFips, OriginStateName LIMIT 14"}
-{"sql":"SELECT DestStateFips, TotalAddGTime, OriginAirportID, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 244.0 OR \"Month\" BETWEEN 1 AND 1 GROUP BY DestStateFips, TotalAddGTime, OriginAirportID LIMIT 26","hsqls":["SELECT DestStateFips, TotalAddGTime, OriginAirportID, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 244.0 OR Month BETWEEN 1 AND 1 GROUP BY DestStateFips, TotalAddGTime, OriginAirportID LIMIT 26"]}
+{"sql":"SELECT DestStateFips, TotalAddGTime, OriginAirportID, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 244.0 OR \"Month\" BETWEEN 1 AND 1 GROUP BY DestStateFips, TotalAddGTime, OriginAirportID LIMIT 26","hsqls":["SELECT DestStateFips, TotalAddGTime, OriginAirportID, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 244.0 OR `Month` BETWEEN 1 AND 1 GROUP BY DestStateFips, TotalAddGTime, OriginAirportID LIMIT 26"]}
 {"sql":"SELECT DepDelay, TotalAddGTime, WheelsOn, MIN(DivActualElapsedTime), COUNT(CarrierDelay), MAX(DestCityMarketID) FROM mytable WHERE OriginStateName BETWEEN 'New Hampshire' AND 'Indiana' GROUP BY DepDelay, TotalAddGTime, WheelsOn  ORDER BY DepDelay, TotalAddGTime, WheelsOn LIMIT 26","hsqls":["SELECT DepDelay, TotalAddGTime, WheelsOn, MIN(DivActualElapsedTime), COUNT(CarrierDelay), MAX(DestCityMarketID) FROM mytable WHERE OriginStateName BETWEEN 'New Hampshire' AND 'Indiana' GROUP BY DepDelay, TotalAddGTime, WheelsOn  ORDER BY DepDelay, TotalAddGTime, WheelsOn LIMIT 26"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE AirTime IN (29) ORDER BY DestState, ArrDelay LIMIT 12"}
-{"sql":"SELECT DivAirports FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16099 ORDER BY DestState, WeatherDelay, DestCityMarketID LIMIT 11","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16099 ORDER BY DestState, WeatherDelay, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, WheelsOn FROM mytable LIMIT 25","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, WheelsOn FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16099 ORDER BY DestState, WeatherDelay, DestCityMarketID LIMIT 11","hsqls":["SELECT DivAirports FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16099 ORDER BY DestState, WeatherDelay, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, WheelsOn FROM mytable LIMIT 25","hsqls":["SELECT DivWheelsOns, WheelsOn FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, OriginStateName, COUNT(TaxiIn), COUNT(DestState) FROM mytable WHERE SecurityDelay BETWEEN 0 AND 27 GROUP BY DepTimeBlk, OriginStateName  ORDER BY DepTimeBlk, OriginStateName LIMIT 14","hsqls":["SELECT DepTimeBlk, OriginStateName, COUNT(TaxiIn), COUNT(DestState) FROM mytable WHERE SecurityDelay BETWEEN 0 AND 27 GROUP BY DepTimeBlk, OriginStateName  ORDER BY DepTimeBlk, OriginStateName LIMIT 14"]}
 {"sql":"SELECT WheelsOff, DayOfWeek FROM mytable ORDER BY DestWac, ArrDelay, OriginAirportID LIMIT 8"}
 {"sql":"SELECT FlightNum, Distance, DivArrDelay, MAX(Quarter), AVG(ActualElapsedTime), MAX(ActualElapsedTime) FROM mytable WHERE ArrTime NOT IN (743) GROUP BY FlightNum, Distance, DivArrDelay  ORDER BY FlightNum, Distance, DivArrDelay LIMIT 18","hsqls":["SELECT FlightNum, Distance, DivArrDelay, MAX(Quarter), AVG(ActualElapsedTime), MAX(ActualElapsedTime) FROM mytable WHERE ArrTime NOT IN (743) GROUP BY FlightNum, Distance, DivArrDelay  ORDER BY FlightNum, Distance, DivArrDelay LIMIT 18"]}
-{"sql":"SELECT DivLongestGTimes, Flights FROM mytable WHERE DestCityMarketID BETWEEN 34524 AND 30155 ORDER BY DivActualElapsedTime LIMIT 27","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Flights FROM mytable WHERE DestCityMarketID BETWEEN 34524 AND 30155 ORDER BY DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivAirportSeqIDs, CRSDepTime FROM mytable WHERE DepDelayMinutes IN (248.0, 138.0, 52.0, 39.0) ORDER BY Distance LIMIT 27","hsqls":["SELECT DestWac, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, CRSDepTime FROM mytable WHERE DepDelayMinutes IN (248.0, 138.0, 52.0, 39.0) ORDER BY Distance LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE DivTotalGTimes BETWEEN 50 AND 96 AND SecurityDelay = 18 ORDER BY ArrTimeBlk LIMIT 15","hsqls":["SELECT TaxiOut, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestCityMarketID FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 50 AND 96 OR DivTotalGTimes__MV1 BETWEEN 50 AND 96 OR DivTotalGTimes__MV2 BETWEEN 50 AND 96 OR DivTotalGTimes__MV3 BETWEEN 50 AND 96 OR DivTotalGTimes__MV4 BETWEEN 50 AND 96) AND SecurityDelay = 18 ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Flights FROM mytable WHERE DestCityMarketID BETWEEN 34524 AND 30155 ORDER BY DivActualElapsedTime LIMIT 27","hsqls":["SELECT DivLongestGTimes, Flights FROM mytable WHERE DestCityMarketID BETWEEN 34524 AND 30155 ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirportSeqIDs, CRSDepTime FROM mytable WHERE DepDelayMinutes IN (248.0, 138.0, 52.0, 39.0) ORDER BY Distance LIMIT 27","hsqls":["SELECT DestWac, DivAirportSeqIDs, CRSDepTime FROM mytable WHERE DepDelayMinutes IN (248.0, 138.0, 52.0, 39.0) ORDER BY Distance LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE DivTotalGTimes BETWEEN 50 AND 96 AND SecurityDelay = 18 ORDER BY ArrTimeBlk LIMIT 15","hsqls":["SELECT TaxiOut, DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 50 AND 96 OR DivTotalGTimes[2] BETWEEN 50 AND 96 OR DivTotalGTimes[3] BETWEEN 50 AND 96 OR DivTotalGTimes[4] BETWEEN 50 AND 96 OR DivTotalGTimes[5] BETWEEN 50 AND 96) AND SecurityDelay = 18 ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, Origin, DayofMonth, COUNT(Cancelled) FROM mytable GROUP BY SecurityDelay, Origin, DayofMonth  ORDER BY SecurityDelay, Origin, DayofMonth LIMIT 18","hsqls":["SELECT SecurityDelay, Origin, DayofMonth, COUNT(Cancelled) FROM mytable GROUP BY SecurityDelay, Origin, DayofMonth  ORDER BY SecurityDelay, Origin, DayofMonth LIMIT 18"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE NASDelay BETWEEN 133 AND 15 LIMIT 9"}
 {"sql":"SELECT FlightNum, Cancelled, COUNT(*) FROM mytable GROUP BY FlightNum, Cancelled  ORDER BY FlightNum, Cancelled LIMIT 4","hsqls":["SELECT FlightNum, Cancelled, COUNT(*) FROM mytable GROUP BY FlightNum, Cancelled  ORDER BY FlightNum, Cancelled LIMIT 4"]}
@@ -1979,66 +1979,66 @@
 {"sql":"SELECT MIN(Quarter) FROM mytable WHERE OriginCityName BETWEEN 'Sacramento, CA' AND 'Laramie, WY' OR DepDelay IN (20.0, 25.0) OR LongestAddGTime BETWEEN 128 AND 51"}
 {"sql":"SELECT NASDelay, MAX(WheelsOff), COUNT(DepTimeBlk) FROM mytable WHERE TaxiIn <= 39 AND ArrDel15 = 0 OR TaxiOut NOT IN (21, 15, 39) GROUP BY NASDelay  ORDER BY NASDelay LIMIT 15","hsqls":["SELECT NASDelay, MAX(WheelsOff), COUNT(DepTimeBlk) FROM mytable WHERE TaxiIn <= 39 AND ArrDel15 = 0 OR TaxiOut NOT IN (21, 15, 39) GROUP BY NASDelay  ORDER BY NASDelay LIMIT 15"]}
 {"sql":"SELECT WeatherDelay, FlightDate FROM mytable WHERE DayofMonth <= 11 LIMIT 10"}
-{"sql":"SELECT WheelsOff, DivTailNums FROM mytable WHERE CarrierDelay NOT IN (89) AND Dest NOT IN ('HDN', 'SBA', 'ELP') LIMIT 26","hsqls":["SELECT WheelsOff, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE CarrierDelay NOT IN (89) AND Dest NOT IN ('HDN', 'SBA', 'ELP') LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivTailNums FROM mytable WHERE CarrierDelay NOT IN (89) AND Dest NOT IN ('HDN', 'SBA', 'ELP') LIMIT 26","hsqls":["SELECT WheelsOff, DivTailNums FROM mytable WHERE CarrierDelay NOT IN (89) AND Dest NOT IN ('HDN', 'SBA', 'ELP') LIMIT 10000"]}
 {"sql":"SELECT DestWac, CRSArrTime, OriginAirportID, COUNT(DepTimeBlk), AVG(TaxiIn) FROM mytable WHERE DestCityName < 'Peoria, IL' AND DepDelayMinutes NOT IN (129.0, 293.0, 162.0, 163.0) GROUP BY DestWac, CRSArrTime, OriginAirportID  ORDER BY DestWac, CRSArrTime, OriginAirportID LIMIT 1","hsqls":["SELECT DestWac, CRSArrTime, OriginAirportID, COUNT(DepTimeBlk), AVG(TaxiIn) FROM mytable WHERE DestCityName < 'Peoria, IL' AND DepDelayMinutes NOT IN (129.0, 293.0, 162.0, 163.0) GROUP BY DestWac, CRSArrTime, OriginAirportID  ORDER BY DestWac, CRSArrTime, OriginAirportID LIMIT 1"]}
 {"sql":"SELECT ArrDel15, MIN(DestAirportSeqID), COUNT(Distance) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 7","hsqls":["SELECT ArrDel15, MIN(DestAirportSeqID), COUNT(Distance) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 7"]}
-{"sql":"SELECT DestCityMarketID, CRSElapsedTime, AVG(WheelsOn) FROM mytable WHERE DivWheelsOns BETWEEN 634 AND 1310 OR Cancelled NOT IN (1, 0) AND OriginAirportSeqID >= 1163703 GROUP BY DestCityMarketID, CRSElapsedTime LIMIT 28","hsqls":["SELECT DestCityMarketID, CRSElapsedTime, AVG(CAST(WheelsOn AS DOUBLE)) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 634 AND 1310 OR DivWheelsOns__MV1 BETWEEN 634 AND 1310 OR DivWheelsOns__MV2 BETWEEN 634 AND 1310 OR DivWheelsOns__MV3 BETWEEN 634 AND 1310 OR DivWheelsOns__MV4 BETWEEN 634 AND 1310) OR Cancelled NOT IN (1, 0) AND OriginAirportSeqID >= 1163703 GROUP BY DestCityMarketID, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT SUM(DivArrDelay), SUM(DestStateFips) FROM mytable WHERE DivTailNums IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 20","hsqls":["SELECT SUM(DivArrDelay), SUM(DestStateFips)  FROM mytable WHERE (DivTailNums__MV0 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV1 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV2 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV3 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV4 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA')) AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, CRSElapsedTime, AVG(WheelsOn) FROM mytable WHERE DivWheelsOns BETWEEN 634 AND 1310 OR Cancelled NOT IN (1, 0) AND OriginAirportSeqID >= 1163703 GROUP BY DestCityMarketID, CRSElapsedTime LIMIT 28","hsqls":["SELECT DestCityMarketID, CRSElapsedTime, AVG(CAST(WheelsOn AS DOUBLE)) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 634 AND 1310 OR DivWheelsOns[2] BETWEEN 634 AND 1310 OR DivWheelsOns[3] BETWEEN 634 AND 1310 OR DivWheelsOns[4] BETWEEN 634 AND 1310 OR DivWheelsOns[5] BETWEEN 634 AND 1310) OR Cancelled NOT IN (1, 0) AND OriginAirportSeqID >= 1163703 GROUP BY DestCityMarketID, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT SUM(DivArrDelay), SUM(DestStateFips) FROM mytable WHERE DivTailNums IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 20","hsqls":["SELECT SUM(DivArrDelay), SUM(DestStateFips)  FROM mytable WHERE (DivTailNums[1] IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums[2] IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums[3] IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums[4] IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums[5] IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA')) AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 10000"]}
 {"sql":"SELECT OriginWac, DayOfWeek, MAX(DestAirportID), MAX(CarrierDelay) FROM mytable GROUP BY OriginWac, DayOfWeek  ORDER BY OriginWac, DayOfWeek LIMIT 16","hsqls":["SELECT OriginWac, DayOfWeek, MAX(DestAirportID), MAX(CarrierDelay) FROM mytable GROUP BY OriginWac, DayOfWeek  ORDER BY OriginWac, DayOfWeek LIMIT 16"]}
 {"sql":"SELECT FlightDate, ArrTime, CRSElapsedTime, MAX(WheelsOn), AVG(TaxiOut), COUNT(WeatherDelay) FROM mytable GROUP BY FlightDate, ArrTime, CRSElapsedTime  ORDER BY FlightDate, ArrTime, CRSElapsedTime LIMIT 16","hsqls":["SELECT FlightDate, ArrTime, CRSElapsedTime, MAX(WheelsOn), AVG(TaxiOut), COUNT(WeatherDelay) FROM mytable GROUP BY FlightDate, ArrTime, CRSElapsedTime  ORDER BY FlightDate, ArrTime, CRSElapsedTime LIMIT 16"]}
 {"sql":"SELECT Quarter, FlightDate, DivAirportLandings FROM mytable WHERE ArrTimeBlk >= '1900-1959' LIMIT 17"}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY DestWac, Flights, AirTime LIMIT 13"}
-{"sql":"SELECT DestState, OriginStateFips, CarrierDelay, MAX(DistanceGroup) FROM mytable WHERE DivWheelsOns BETWEEN 1825 AND 858 AND OriginStateFips IN (42, 51, 8) GROUP BY DestState, OriginStateFips, CarrierDelay LIMIT 3","hsqls":["SELECT DestState, OriginStateFips, CarrierDelay, MAX(DistanceGroup) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1825 AND 858 OR DivWheelsOns__MV1 BETWEEN 1825 AND 858 OR DivWheelsOns__MV2 BETWEEN 1825 AND 858 OR DivWheelsOns__MV3 BETWEEN 1825 AND 858 OR DivWheelsOns__MV4 BETWEEN 1825 AND 858) AND OriginStateFips IN (42, 51, 8) GROUP BY DestState, OriginStateFips, CarrierDelay LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivLongestGTimes BETWEEN 17.0 AND 112.0 OR OriginState IN ('OH') ORDER BY Quarter LIMIT 25","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 17.0 AND 112.0 OR DivLongestGTimes__MV1 BETWEEN 17.0 AND 112.0 OR DivLongestGTimes__MV2 BETWEEN 17.0 AND 112.0 OR DivLongestGTimes__MV3 BETWEEN 17.0 AND 112.0 OR DivLongestGTimes__MV4 BETWEEN 17.0 AND 112.0) OR OriginState IN ('OH') ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT DestState, OriginStateFips, CarrierDelay, MAX(DistanceGroup) FROM mytable WHERE DivWheelsOns BETWEEN 1825 AND 858 AND OriginStateFips IN (42, 51, 8) GROUP BY DestState, OriginStateFips, CarrierDelay LIMIT 3","hsqls":["SELECT DestState, OriginStateFips, CarrierDelay, MAX(DistanceGroup) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1825 AND 858 OR DivWheelsOns[2] BETWEEN 1825 AND 858 OR DivWheelsOns[3] BETWEEN 1825 AND 858 OR DivWheelsOns[4] BETWEEN 1825 AND 858 OR DivWheelsOns[5] BETWEEN 1825 AND 858) AND OriginStateFips IN (42, 51, 8) GROUP BY DestState, OriginStateFips, CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivLongestGTimes BETWEEN 17.0 AND 112.0 OR OriginState IN ('OH') ORDER BY Quarter LIMIT 25","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 17.0 AND 112.0 OR DivLongestGTimes[2] BETWEEN 17.0 AND 112.0 OR DivLongestGTimes[3] BETWEEN 17.0 AND 112.0 OR DivLongestGTimes[4] BETWEEN 17.0 AND 112.0 OR DivLongestGTimes[5] BETWEEN 17.0 AND 112.0) OR OriginState IN ('OH') ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, TotalAddGTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 1252 AND 706 OR Diverted IN (1, 0) GROUP BY CarrierDelay, TotalAddGTime, DaysSinceEpoch  ORDER BY CarrierDelay, TotalAddGTime, DaysSinceEpoch LIMIT 21","hsqls":["SELECT CarrierDelay, TotalAddGTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 1252 AND 706 OR Diverted IN (1, 0) GROUP BY CarrierDelay, TotalAddGTime, DaysSinceEpoch  ORDER BY CarrierDelay, TotalAddGTime, DaysSinceEpoch LIMIT 21"]}
 {"sql":"SELECT TaxiIn, ArrivalDelayGroups, CRSElapsedTime FROM mytable ORDER BY DestAirportSeqID, CancellationCode LIMIT 13"}
 {"sql":"SELECT FlightDate, DayofMonth, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 7 OR DepTimeBlk >= '2300-2359' AND OriginStateFips BETWEEN 26 AND 47 GROUP BY FlightDate, DayofMonth  ORDER BY FlightDate, DayofMonth LIMIT 10","hsqls":["SELECT FlightDate, DayofMonth, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 7 OR DepTimeBlk >= '2300-2359' AND OriginStateFips BETWEEN 26 AND 47 GROUP BY FlightDate, DayofMonth  ORDER BY FlightDate, DayofMonth LIMIT 10"]}
 {"sql":"SELECT ArrDelay, SUM(DivDistance) FROM mytable WHERE Quarter IN (1) AND CRSArrTime BETWEEN 2251 AND 1500 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 8","hsqls":["SELECT ArrDelay, SUM(DivDistance) FROM mytable WHERE Quarter IN (1) AND CRSArrTime BETWEEN 2251 AND 1500 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 8"]}
-{"sql":"SELECT DepDel15, COUNT(DestWac) FROM mytable WHERE \"Month\" <= 1 OR DivLongestGTimes IN (23.0, 49.0, 36.0) AND CRSDepTime NOT IN (1422) GROUP BY DepDel15 LIMIT 10","hsqls":["SELECT DepDel15, COUNT(DestWac) FROM mytable WHERE Month <= 1 OR (DivLongestGTimes__MV0 IN (23.0, 49.0, 36.0) OR DivLongestGTimes__MV1 IN (23.0, 49.0, 36.0) OR DivLongestGTimes__MV2 IN (23.0, 49.0, 36.0) OR DivLongestGTimes__MV3 IN (23.0, 49.0, 36.0) OR DivLongestGTimes__MV4 IN (23.0, 49.0, 36.0)) AND CRSDepTime NOT IN (1422) GROUP BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DepDel15, COUNT(DestWac) FROM mytable WHERE \"Month\" <= 1 OR DivLongestGTimes IN (23.0, 49.0, 36.0) AND CRSDepTime NOT IN (1422) GROUP BY DepDel15 LIMIT 10","hsqls":["SELECT DepDel15, COUNT(DestWac) FROM mytable WHERE `Month` <= 1 OR (DivLongestGTimes[1] IN (23.0, 49.0, 36.0) OR DivLongestGTimes[2] IN (23.0, 49.0, 36.0) OR DivLongestGTimes[3] IN (23.0, 49.0, 36.0) OR DivLongestGTimes[4] IN (23.0, 49.0, 36.0) OR DivLongestGTimes[5] IN (23.0, 49.0, 36.0)) AND CRSDepTime NOT IN (1422) GROUP BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE OriginStateFips >= 75 AND FlightDate NOT IN ('2014-01-22') OR DestState BETWEEN 'SC' AND 'AR' ORDER BY DestState, ArrDelay, CRSDepTime LIMIT 19"}
-{"sql":"SELECT DivTailNums FROM mytable WHERE CancellationCode NOT IN ('B', 'noodles') ORDER BY DepartureDelayGroups, DepDel15, CRSDepTime LIMIT 1","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE CancellationCode NOT IN ('B', 'noodles') ORDER BY DepartureDelayGroups, DepDel15, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE CancellationCode NOT IN ('B', 'noodles') ORDER BY DepartureDelayGroups, DepDel15, CRSDepTime LIMIT 1","hsqls":["SELECT DivTailNums FROM mytable WHERE CancellationCode NOT IN ('B', 'noodles') ORDER BY DepartureDelayGroups, DepDel15, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE CarrierDelay BETWEEN 280 AND 201 AND UniqueCarrier NOT IN ('DL', 'EV', 'FL', 'UA', 'AA') AND DivDistance >= 1138 ORDER BY WheelsOff, AirlineID LIMIT 15"}
 {"sql":"SELECT OriginCityMarketID FROM mytable ORDER BY TotalAddGTime LIMIT 14"}
-{"sql":"SELECT \"Year\", COUNT(OriginAirportID), MAX(ArrDelayMinutes) FROM mytable WHERE LateAircraftDelay NOT IN (174, 167) OR Quarter >= 1 GROUP BY \"Year\" LIMIT 18","hsqls":["SELECT Year, COUNT(OriginAirportID), MAX(ArrDelayMinutes) FROM mytable WHERE LateAircraftDelay NOT IN (174, 167) OR Quarter >= 1 GROUP BY Year LIMIT 18"]}
+{"sql":"SELECT \"Year\", COUNT(OriginAirportID), MAX(ArrDelayMinutes) FROM mytable WHERE LateAircraftDelay NOT IN (174, 167) OR Quarter >= 1 GROUP BY \"Year\" LIMIT 18","hsqls":["SELECT Year, COUNT(OriginAirportID), MAX(ArrDelayMinutes) FROM mytable WHERE LateAircraftDelay NOT IN (174, 167) OR Quarter >= 1 GROUP BY `Year` LIMIT 18"]}
 {"sql":"SELECT MAX(DayOfWeek) FROM mytable WHERE DivAirportLandings > 2 OR OriginWac NOT IN (2, 5, 82, 73, 84) LIMIT 27"}
 {"sql":"SELECT SUM(ArrDel15), COUNT(ActualElapsedTime), AVG(ArrDelay) FROM mytable WHERE DivAirportLandings <= 1 AND OriginWac <> 1 LIMIT 24"}
-{"sql":"SELECT Origin, DivActualElapsedTime, COUNT(Flights), MIN(DivReachedDest), MIN(LongestAddGTime) FROM mytable WHERE DivTailNums > 'N530US' GROUP BY Origin, DivActualElapsedTime LIMIT 12","hsqls":["SELECT Origin, DivActualElapsedTime, COUNT(Flights), MIN(DivReachedDest), MIN(LongestAddGTime) FROM mytable WHERE (DivTailNums__MV0 > 'N530US' OR DivTailNums__MV1 > 'N530US' OR DivTailNums__MV2 > 'N530US' OR DivTailNums__MV3 > 'N530US' OR DivTailNums__MV4 > 'N530US') GROUP BY Origin, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE TaxiIn BETWEEN 83 AND 40 OR LongestAddGTime BETWEEN 24 AND 63 ORDER BY FirstDepTime, Flights, DepTimeBlk LIMIT 1","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivActualElapsedTime FROM mytable WHERE TaxiIn BETWEEN 83 AND 40 OR LongestAddGTime BETWEEN 24 AND 63 ORDER BY FirstDepTime, Flights, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DestState, DepTime, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') AND CRSDepTime BETWEEN 1754 AND 755 AND Dest BETWEEN 'MTJ' AND 'SGU' ORDER BY DestState, FlightDate, DepTime LIMIT 26","hsqls":["SELECT DestState, DepTime, DivActualElapsedTime FROM mytable WHERE (DivTailNums__MV0 IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums__MV1 IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums__MV2 IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums__MV3 IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums__MV4 IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K')) AND CRSDepTime BETWEEN 1754 AND 755 AND Dest BETWEEN 'MTJ' AND 'SGU' ORDER BY DestState, FlightDate, DepTime LIMIT 10000"]}
-{"sql":"SELECT AVG(DaysSinceEpoch) FROM mytable WHERE DivAirportIDs > 14027 AND DivLongestGTimes >= 61.0 AND Cancelled BETWEEN 0 AND 1 LIMIT 3","hsqls":["SELECT AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE (DivAirportIDs__MV0 > 14027 OR DivAirportIDs__MV1 > 14027 OR DivAirportIDs__MV2 > 14027 OR DivAirportIDs__MV3 > 14027 OR DivAirportIDs__MV4 > 14027) AND (DivLongestGTimes__MV0 >= 61.0 OR DivLongestGTimes__MV1 >= 61.0 OR DivLongestGTimes__MV2 >= 61.0 OR DivLongestGTimes__MV3 >= 61.0 OR DivLongestGTimes__MV4 >= 61.0) AND Cancelled BETWEEN 0 AND 1 LIMIT 10000"]}
+{"sql":"SELECT Origin, DivActualElapsedTime, COUNT(Flights), MIN(DivReachedDest), MIN(LongestAddGTime) FROM mytable WHERE DivTailNums > 'N530US' GROUP BY Origin, DivActualElapsedTime LIMIT 12","hsqls":["SELECT Origin, DivActualElapsedTime, COUNT(Flights), MIN(DivReachedDest), MIN(LongestAddGTime) FROM mytable WHERE (DivTailNums[1] > 'N530US' OR DivTailNums[2] > 'N530US' OR DivTailNums[3] > 'N530US' OR DivTailNums[4] > 'N530US' OR DivTailNums[5] > 'N530US') GROUP BY Origin, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE TaxiIn BETWEEN 83 AND 40 OR LongestAddGTime BETWEEN 24 AND 63 ORDER BY FirstDepTime, Flights, DepTimeBlk LIMIT 1","hsqls":["SELECT DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE TaxiIn BETWEEN 83 AND 40 OR LongestAddGTime BETWEEN 24 AND 63 ORDER BY FirstDepTime, Flights, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DestState, DepTime, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') AND CRSDepTime BETWEEN 1754 AND 755 AND Dest BETWEEN 'MTJ' AND 'SGU' ORDER BY DestState, FlightDate, DepTime LIMIT 26","hsqls":["SELECT DestState, DepTime, DivActualElapsedTime FROM mytable WHERE (DivTailNums[1] IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums[2] IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums[3] IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums[4] IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K') OR DivTailNums[5] IN ('N228PQ', 'N882AS', 'N873AS', 'N4YGAA', 'N8307K')) AND CRSDepTime BETWEEN 1754 AND 755 AND Dest BETWEEN 'MTJ' AND 'SGU' ORDER BY DestState, FlightDate, DepTime LIMIT 10000"]}
+{"sql":"SELECT AVG(DaysSinceEpoch) FROM mytable WHERE DivAirportIDs > 14027 AND DivLongestGTimes >= 61.0 AND Cancelled BETWEEN 0 AND 1 LIMIT 3","hsqls":["SELECT AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE (DivAirportIDs[1] > 14027 OR DivAirportIDs[2] > 14027 OR DivAirportIDs[3] > 14027 OR DivAirportIDs[4] > 14027 OR DivAirportIDs[5] > 14027) AND (DivLongestGTimes[1] >= 61.0 OR DivLongestGTimes[2] >= 61.0 OR DivLongestGTimes[3] >= 61.0 OR DivLongestGTimes[4] >= 61.0 OR DivLongestGTimes[5] >= 61.0) AND Cancelled BETWEEN 0 AND 1 LIMIT 10000"]}
 {"sql":"SELECT MAX(DaysSinceEpoch) FROM mytable WHERE NASDelay IN (79, 50) LIMIT 26"}
 {"sql":"SELECT Distance, SecurityDelay, OriginCityName FROM mytable WHERE OriginCityName BETWEEN 'Long Beach, CA' AND 'Cody, WY' AND DestCityMarketID > 30113 LIMIT 26"}
-{"sql":"SELECT ActualElapsedTime, DivTailNums, DestStateName FROM mytable WHERE DivActualElapsedTime <= 1331 AND DivArrDelay BETWEEN 164 AND 257 AND DivWheelsOns = 1841 LIMIT 26","hsqls":["SELECT ActualElapsedTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestStateName FROM mytable WHERE DivActualElapsedTime <= 1331 AND DivArrDelay BETWEEN 164 AND 257 AND (DivWheelsOns__MV0 = 1841 OR DivWheelsOns__MV1 = 1841 OR DivWheelsOns__MV2 = 1841 OR DivWheelsOns__MV3 = 1841 OR DivWheelsOns__MV4 = 1841) LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DepDelayMinutes, ActualElapsedTime FROM mytable WHERE DivArrDelay IN (531, 153, 332, 65, 29) AND DivAirportIDs < 11630 AND DivTotalGTimes IN (96, 33, 27) ORDER BY FirstDepTime LIMIT 27","hsqls":["SELECT Year, DepDelayMinutes, ActualElapsedTime FROM mytable WHERE DivArrDelay IN (531, 153, 332, 65, 29) AND (DivAirportIDs__MV0 < 11630 OR DivAirportIDs__MV1 < 11630 OR DivAirportIDs__MV2 < 11630 OR DivAirportIDs__MV3 < 11630 OR DivAirportIDs__MV4 < 11630) AND (DivTotalGTimes__MV0 IN (96, 33, 27) OR DivTotalGTimes__MV1 IN (96, 33, 27) OR DivTotalGTimes__MV2 IN (96, 33, 27) OR DivTotalGTimes__MV3 IN (96, 33, 27) OR DivTotalGTimes__MV4 IN (96, 33, 27)) ORDER BY FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DivTailNums, DestStateName FROM mytable WHERE DivActualElapsedTime <= 1331 AND DivArrDelay BETWEEN 164 AND 257 AND DivWheelsOns = 1841 LIMIT 26","hsqls":["SELECT ActualElapsedTime, DivTailNums, DestStateName FROM mytable WHERE DivActualElapsedTime <= 1331 AND DivArrDelay BETWEEN 164 AND 257 AND (DivWheelsOns[1] = 1841 OR DivWheelsOns[2] = 1841 OR DivWheelsOns[3] = 1841 OR DivWheelsOns[4] = 1841 OR DivWheelsOns[5] = 1841) LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DepDelayMinutes, ActualElapsedTime FROM mytable WHERE DivArrDelay IN (531, 153, 332, 65, 29) AND DivAirportIDs < 11630 AND DivTotalGTimes IN (96, 33, 27) ORDER BY FirstDepTime LIMIT 27","hsqls":["SELECT Year, DepDelayMinutes, ActualElapsedTime FROM mytable WHERE DivArrDelay IN (531, 153, 332, 65, 29) AND (DivAirportIDs[1] < 11630 OR DivAirportIDs[2] < 11630 OR DivAirportIDs[3] < 11630 OR DivAirportIDs[4] < 11630 OR DivAirportIDs[5] < 11630) AND (DivTotalGTimes[1] IN (96, 33, 27) OR DivTotalGTimes[2] IN (96, 33, 27) OR DivTotalGTimes[3] IN (96, 33, 27) OR DivTotalGTimes[4] IN (96, 33, 27) OR DivTotalGTimes[5] IN (96, 33, 27)) ORDER BY FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, DivArrDelay, SUM(DivAirportLandings), AVG(FlightNum), COUNT(DestCityMarketID) FROM mytable WHERE DestState < 'CA' AND FlightDate IN ('2014-01-12', '2014-01-22', '2014-01-18', '2014-01-11', '2014-01-25') AND LateAircraftDelay < 78 GROUP BY SecurityDelay, DivArrDelay  ORDER BY SecurityDelay, DivArrDelay LIMIT 22","hsqls":["SELECT SecurityDelay, DivArrDelay, SUM(DivAirportLandings), AVG(FlightNum), COUNT(DestCityMarketID) FROM mytable WHERE DestState < 'CA' AND FlightDate IN ('2014-01-12', '2014-01-22', '2014-01-18', '2014-01-11', '2014-01-25') AND LateAircraftDelay < 78 GROUP BY SecurityDelay, DivArrDelay  ORDER BY SecurityDelay, DivArrDelay LIMIT 22"]}
-{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivAirportSeqIDs = 1319801 ORDER BY FlightNum, OriginCityName LIMIT 28","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1319801 OR DivAirportSeqIDs__MV1 = 1319801 OR DivAirportSeqIDs__MV2 = 1319801 OR DivAirportSeqIDs__MV3 = 1319801 OR DivAirportSeqIDs__MV4 = 1319801) ORDER BY FlightNum, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivAirportSeqIDs = 1319801 ORDER BY FlightNum, OriginCityName LIMIT 28","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE (DivAirportSeqIDs[1] = 1319801 OR DivAirportSeqIDs[2] = 1319801 OR DivAirportSeqIDs[3] = 1319801 OR DivAirportSeqIDs[4] = 1319801 OR DivAirportSeqIDs[5] = 1319801) ORDER BY FlightNum, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, ActualElapsedTime, DayOfWeek, AVG(ArrDelay) FROM mytable WHERE DistanceGroup BETWEEN 6 AND 6 OR DestWac BETWEEN 73 AND 72 OR DivDistance BETWEEN 862 AND 270 GROUP BY ArrDelayMinutes, ActualElapsedTime, DayOfWeek  ORDER BY ArrDelayMinutes, ActualElapsedTime, DayOfWeek LIMIT 9","hsqls":["SELECT ArrDelayMinutes, ActualElapsedTime, DayOfWeek, AVG(ArrDelay) FROM mytable WHERE DistanceGroup BETWEEN 6 AND 6 OR DestWac BETWEEN 73 AND 72 OR DivDistance BETWEEN 862 AND 270 GROUP BY ArrDelayMinutes, ActualElapsedTime, DayOfWeek  ORDER BY ArrDelayMinutes, ActualElapsedTime, DayOfWeek LIMIT 9"]}
 {"sql":"SELECT DistanceGroup, ActualElapsedTime FROM mytable WHERE OriginCityMarketID = 31337 AND ActualElapsedTime NOT IN (98, 388, 52) ORDER BY OriginCityMarketID, DestStateFips LIMIT 4"}
 {"sql":"SELECT OriginStateName FROM mytable ORDER BY TaxiIn LIMIT 7"}
 {"sql":"SELECT DayofMonth FROM mytable WHERE FlightNum BETWEEN 139 AND 860 AND OriginAirportSeqID IN (1018502, 1014002, 1127802)"}
 {"sql":"SELECT DivReachedDest, SecurityDelay, ActualElapsedTime, SUM(NASDelay), MAX(DestAirportID), MAX(WheelsOn) FROM mytable WHERE DestAirportID BETWEEN 10170 AND 14256 AND Cancelled = 1 GROUP BY DivReachedDest, SecurityDelay, ActualElapsedTime  ORDER BY DivReachedDest, SecurityDelay, ActualElapsedTime LIMIT 3","hsqls":["SELECT DivReachedDest, SecurityDelay, ActualElapsedTime, SUM(NASDelay), MAX(DestAirportID), MAX(WheelsOn) FROM mytable WHERE DestAirportID BETWEEN 10170 AND 14256 AND Cancelled = 1 GROUP BY DivReachedDest, SecurityDelay, ActualElapsedTime  ORDER BY DivReachedDest, SecurityDelay, ActualElapsedTime LIMIT 3"]}
-{"sql":"SELECT ArrDelayMinutes, \"Month\", MAX(DepDelayMinutes) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 6 OR DivWheelsOffs >= 1115 AND Origin > 'SAT' GROUP BY ArrDelayMinutes, \"Month\" LIMIT 19","hsqls":["SELECT ArrDelayMinutes, Month, MAX(DepDelayMinutes) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 6 OR (DivWheelsOffs__MV0 >= 1115 OR DivWheelsOffs__MV1 >= 1115 OR DivWheelsOffs__MV2 >= 1115 OR DivWheelsOffs__MV3 >= 1115 OR DivWheelsOffs__MV4 >= 1115) AND Origin > 'SAT' GROUP BY ArrDelayMinutes, Month LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, \"Month\", MAX(DepDelayMinutes) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 6 OR DivWheelsOffs >= 1115 AND Origin > 'SAT' GROUP BY ArrDelayMinutes, \"Month\" LIMIT 19","hsqls":["SELECT ArrDelayMinutes, Month, MAX(DepDelayMinutes) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 6 OR (DivWheelsOffs[1] >= 1115 OR DivWheelsOffs[2] >= 1115 OR DivWheelsOffs[3] >= 1115 OR DivWheelsOffs[4] >= 1115 OR DivWheelsOffs[5] >= 1115) AND Origin > 'SAT' GROUP BY ArrDelayMinutes, `Month` LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DepDel15, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 1516 AND 1701 AND DepDelayMinutes <> 235.0 GROUP BY FlightNum, DepDel15  ORDER BY FlightNum, DepDel15 LIMIT 23","hsqls":["SELECT FlightNum, DepDel15, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 1516 AND 1701 AND DepDelayMinutes <> 235.0 GROUP BY FlightNum, DepDel15  ORDER BY FlightNum, DepDel15 LIMIT 23"]}
-{"sql":"SELECT OriginCityMarketID, DivTailNums, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 30894 AND 34489 OR DaysSinceEpoch = 16079 OR DivArrDelay BETWEEN 135 AND 110 LIMIT 9","hsqls":["SELECT OriginCityMarketID, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 30894 AND 34489 OR DaysSinceEpoch = 16079 OR DivArrDelay BETWEEN 135 AND 110 LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, LongestAddGTime, SUM(DistanceGroup) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR DepTime >= 1205 GROUP BY DepartureDelayGroups, LongestAddGTime LIMIT 21","hsqls":["SELECT DepartureDelayGroups, LongestAddGTime, SUM(DistanceGroup) FROM mytable WHERE Month BETWEEN 1 AND 1 OR DepTime >= 1205 GROUP BY DepartureDelayGroups, LongestAddGTime LIMIT 21"]}
-{"sql":"SELECT MIN(\"Year\"), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259', '1200-1259', '0001-0559', '1400-1459', '1800-1859') LIMIT 1","hsqls":["SELECT MIN(Year), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259', '1200-1259', '0001-0559', '1400-1459', '1800-1859') LIMIT 1"]}
-{"sql":"SELECT DepTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Massachusetts' AND DivWheelsOffs IN (2354, 1403, 1543, 2313, 921) GROUP BY DepTime, ArrDelayMinutes LIMIT 4","hsqls":["SELECT DepTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Massachusetts' AND (DivWheelsOffs__MV0 IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs__MV1 IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs__MV2 IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs__MV3 IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs__MV4 IN (2354, 1403, 1543, 2313, 921)) GROUP BY DepTime, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivTailNums, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 30894 AND 34489 OR DaysSinceEpoch = 16079 OR DivArrDelay BETWEEN 135 AND 110 LIMIT 9","hsqls":["SELECT OriginCityMarketID, DivTailNums, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 30894 AND 34489 OR DaysSinceEpoch = 16079 OR DivArrDelay BETWEEN 135 AND 110 LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, LongestAddGTime, SUM(DistanceGroup) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR DepTime >= 1205 GROUP BY DepartureDelayGroups, LongestAddGTime LIMIT 21","hsqls":["SELECT DepartureDelayGroups, LongestAddGTime, SUM(DistanceGroup) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR DepTime >= 1205 GROUP BY DepartureDelayGroups, LongestAddGTime LIMIT 21"]}
+{"sql":"SELECT MIN(\"Year\"), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259', '1200-1259', '0001-0559', '1400-1459', '1800-1859') LIMIT 1","hsqls":["SELECT MIN(`Year`), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrTimeBlk NOT IN ('2200-2259', '1200-1259', '0001-0559', '1400-1459', '1800-1859') LIMIT 1"]}
+{"sql":"SELECT DepTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Massachusetts' AND DivWheelsOffs IN (2354, 1403, 1543, 2313, 921) GROUP BY DepTime, ArrDelayMinutes LIMIT 4","hsqls":["SELECT DepTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Massachusetts' AND (DivWheelsOffs[1] IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs[2] IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs[3] IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs[4] IN (2354, 1403, 1543, 2313, 921) OR DivWheelsOffs[5] IN (2354, 1403, 1543, 2313, 921)) GROUP BY DepTime, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE OriginCityMarketID NOT IN (31637) AND CRSDepTime IN (2351, 1038) AND AirTime >= 380 LIMIT 26"}
 {"sql":"SELECT WeatherDelay, CancellationCode, DivArrDelay, SUM(ArrDel15), MIN(DepDelay) FROM mytable GROUP BY WeatherDelay, CancellationCode, DivArrDelay  ORDER BY WeatherDelay, CancellationCode, DivArrDelay LIMIT 23","hsqls":["SELECT WeatherDelay, CancellationCode, DivArrDelay, SUM(ArrDel15), MIN(DepDelay) FROM mytable GROUP BY WeatherDelay, CancellationCode, DivArrDelay  ORDER BY WeatherDelay, CancellationCode, DivArrDelay LIMIT 23"]}
 {"sql":"SELECT CRSArrTime, WeatherDelay, AirlineID FROM mytable LIMIT 6"}
-{"sql":"SELECT DepTimeBlk, \"Month\" FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 ORDER BY DestStateName LIMIT 20","hsqls":["SELECT DepTimeBlk, Month FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 ORDER BY DestStateName LIMIT 20"]}
+{"sql":"SELECT DepTimeBlk, \"Month\" FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 ORDER BY DestStateName LIMIT 20","hsqls":["SELECT DepTimeBlk, `Month` FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 ORDER BY DestStateName LIMIT 20"]}
 {"sql":"SELECT FirstDepTime, ArrDelayMinutes FROM mytable ORDER BY DestAirportSeqID, TailNum LIMIT 3"}
-{"sql":"SELECT DivDistance, DestCityMarketID, UniqueCarrier FROM mytable WHERE DivAirports IN ('OGD', 'LMT', 'LGA') AND DepDelayMinutes BETWEEN 51.0 AND 356.0 LIMIT 24","hsqls":["SELECT DivDistance, DestCityMarketID, UniqueCarrier FROM mytable WHERE (DivAirports__MV0 IN ('OGD', 'LMT', 'LGA') OR DivAirports__MV1 IN ('OGD', 'LMT', 'LGA') OR DivAirports__MV2 IN ('OGD', 'LMT', 'LGA') OR DivAirports__MV3 IN ('OGD', 'LMT', 'LGA') OR DivAirports__MV4 IN ('OGD', 'LMT', 'LGA')) AND DepDelayMinutes BETWEEN 51.0 AND 356.0 LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DestCityMarketID, UniqueCarrier FROM mytable WHERE DivAirports IN ('OGD', 'LMT', 'LGA') AND DepDelayMinutes BETWEEN 51.0 AND 356.0 LIMIT 24","hsqls":["SELECT DivDistance, DestCityMarketID, UniqueCarrier FROM mytable WHERE (DivAirports[1] IN ('OGD', 'LMT', 'LGA') OR DivAirports[2] IN ('OGD', 'LMT', 'LGA') OR DivAirports[3] IN ('OGD', 'LMT', 'LGA') OR DivAirports[4] IN ('OGD', 'LMT', 'LGA') OR DivAirports[5] IN ('OGD', 'LMT', 'LGA')) AND DepDelayMinutes BETWEEN 51.0 AND 356.0 LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE Dest = 'FSM' LIMIT 9"}
 {"sql":"SELECT FlightDate, DestStateName, DayofMonth FROM mytable LIMIT 21"}
-{"sql":"SELECT ArrivalDelayGroups, COUNT(ActualElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay IN (8) OR DivTotalGTimes IN (20, 107) AND DestAirportSeqID BETWEEN 1312702 AND 1200302 GROUP BY ArrivalDelayGroups LIMIT 26","hsqls":["SELECT ArrivalDelayGroups, COUNT(ActualElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay IN (8) OR (DivTotalGTimes__MV0 IN (20, 107) OR DivTotalGTimes__MV1 IN (20, 107) OR DivTotalGTimes__MV2 IN (20, 107) OR DivTotalGTimes__MV3 IN (20, 107) OR DivTotalGTimes__MV4 IN (20, 107)) AND DestAirportSeqID BETWEEN 1312702 AND 1200302 GROUP BY ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT MIN(DivReachedDest), COUNT(UniqueCarrier), MAX(Cancelled) FROM mytable WHERE DivLongestGTimes IN (7.0) LIMIT 25","hsqls":["SELECT MIN(DivReachedDest), COUNT(UniqueCarrier), MAX(Cancelled)  FROM mytable WHERE (DivLongestGTimes__MV0 IN (7.0) OR DivLongestGTimes__MV1 IN (7.0) OR DivLongestGTimes__MV2 IN (7.0) OR DivLongestGTimes__MV3 IN (7.0) OR DivLongestGTimes__MV4 IN (7.0)) LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups, COUNT(ActualElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay IN (8) OR DivTotalGTimes IN (20, 107) AND DestAirportSeqID BETWEEN 1312702 AND 1200302 GROUP BY ArrivalDelayGroups LIMIT 26","hsqls":["SELECT ArrivalDelayGroups, COUNT(ActualElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay IN (8) OR (DivTotalGTimes[1] IN (20, 107) OR DivTotalGTimes[2] IN (20, 107) OR DivTotalGTimes[3] IN (20, 107) OR DivTotalGTimes[4] IN (20, 107) OR DivTotalGTimes[5] IN (20, 107)) AND DestAirportSeqID BETWEEN 1312702 AND 1200302 GROUP BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT MIN(DivReachedDest), COUNT(UniqueCarrier), MAX(Cancelled) FROM mytable WHERE DivLongestGTimes IN (7.0) LIMIT 25","hsqls":["SELECT MIN(DivReachedDest), COUNT(UniqueCarrier), MAX(Cancelled)  FROM mytable WHERE (DivLongestGTimes[1] IN (7.0) OR DivLongestGTimes[2] IN (7.0) OR DivLongestGTimes[3] IN (7.0) OR DivLongestGTimes[4] IN (7.0) OR DivLongestGTimes[5] IN (7.0)) LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE DestAirportID > 14107 ORDER BY DivDistance, TailNum, AirlineID LIMIT 21"}
 {"sql":"SELECT MIN(OriginAirportSeqID), MAX(DistanceGroup), MAX(TaxiIn) FROM mytable WHERE FlightDate IN ('2014-01-28', '2014-01-20', '2014-01-16') OR CRSArrTime NOT IN (746) AND ArrTimeBlk BETWEEN '1800-1859' AND '1800-1859' LIMIT 24"}
 {"sql":"SELECT OriginCityMarketID, NASDelay, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'New Mexico' AND 'New York' AND DivActualElapsedTime NOT IN (267, 191, 141) GROUP BY OriginCityMarketID, NASDelay  ORDER BY OriginCityMarketID, NASDelay LIMIT 11","hsqls":["SELECT OriginCityMarketID, NASDelay, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'New Mexico' AND 'New York' AND DivActualElapsedTime NOT IN (267, 191, 141) GROUP BY OriginCityMarketID, NASDelay  ORDER BY OriginCityMarketID, NASDelay LIMIT 11"]}
 {"sql":"SELECT AirTime FROM mytable WHERE TaxiOut <= 92 AND TaxiIn <> 51 OR DepTimeBlk NOT IN ('2000-2059', '1000-1059', '2300-2359', '0600-0659', '1900-1959') ORDER BY DivDistance, ArrDel15, DayofMonth LIMIT 25"}
 {"sql":"SELECT Quarter, CarrierDelay, ActualElapsedTime FROM mytable ORDER BY DestCityName, CRSElapsedTime LIMIT 24"}
-{"sql":"SELECT ActualElapsedTime, DayofMonth, DaysSinceEpoch, MAX(Flights) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR Origin <> 'MKE' GROUP BY ActualElapsedTime, DayofMonth, DaysSinceEpoch LIMIT 11","hsqls":["SELECT ActualElapsedTime, DayofMonth, DaysSinceEpoch, MAX(Flights) FROM mytable WHERE Month BETWEEN 1 AND 1 OR Origin <> 'MKE' GROUP BY ActualElapsedTime, DayofMonth, DaysSinceEpoch LIMIT 11"]}
+{"sql":"SELECT ActualElapsedTime, DayofMonth, DaysSinceEpoch, MAX(Flights) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR Origin <> 'MKE' GROUP BY ActualElapsedTime, DayofMonth, DaysSinceEpoch LIMIT 11","hsqls":["SELECT ActualElapsedTime, DayofMonth, DaysSinceEpoch, MAX(Flights) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR Origin <> 'MKE' GROUP BY ActualElapsedTime, DayofMonth, DaysSinceEpoch LIMIT 11"]}
 {"sql":"SELECT DaysSinceEpoch, AVG(Distance), MIN(AirlineID) FROM mytable GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 14","hsqls":["SELECT DaysSinceEpoch, AVG(Distance), MIN(AirlineID) FROM mytable GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 14"]}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY DestStateName, CancellationCode LIMIT 17"}
 {"sql":"SELECT \"Year\", DivDistance, DivActualElapsedTime FROM mytable WHERE LateAircraftDelay BETWEEN 21 AND 110 LIMIT 12","hsqls":["SELECT Year, DivDistance, DivActualElapsedTime FROM mytable WHERE LateAircraftDelay BETWEEN 21 AND 110 LIMIT 12"]}
@@ -2046,27 +2046,27 @@
 {"sql":"SELECT DestWac, NASDelay, COUNT(Carrier), AVG(DayofMonth) FROM mytable GROUP BY DestWac, NASDelay  ORDER BY DestWac, NASDelay LIMIT 12","hsqls":["SELECT DestWac, NASDelay, COUNT(Carrier), AVG(DayofMonth) FROM mytable GROUP BY DestWac, NASDelay  ORDER BY DestWac, NASDelay LIMIT 12"]}
 {"sql":"SELECT DestWac, TailNum, ArrDelay FROM mytable LIMIT 28"}
 {"sql":"SELECT COUNT(NASDelay), MIN(DestAirportSeqID) FROM mytable WHERE ArrDelay IN (996.0, 261.0, 56.0) LIMIT 21"}
-{"sql":"SELECT DistanceGroup, TotalAddGTime FROM mytable WHERE OriginStateName IN ('Mississippi', 'Georgia') OR DivWheelsOffs <= 1906 LIMIT 15","hsqls":["SELECT DistanceGroup, TotalAddGTime FROM mytable WHERE OriginStateName IN ('Mississippi', 'Georgia') OR (DivWheelsOffs__MV0 <= 1906 OR DivWheelsOffs__MV1 <= 1906 OR DivWheelsOffs__MV2 <= 1906 OR DivWheelsOffs__MV3 <= 1906 OR DivWheelsOffs__MV4 <= 1906) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, TotalAddGTime FROM mytable WHERE OriginStateName IN ('Mississippi', 'Georgia') OR DivWheelsOffs <= 1906 LIMIT 15","hsqls":["SELECT DistanceGroup, TotalAddGTime FROM mytable WHERE OriginStateName IN ('Mississippi', 'Georgia') OR (DivWheelsOffs[1] <= 1906 OR DivWheelsOffs[2] <= 1906 OR DivWheelsOffs[3] <= 1906 OR DivWheelsOffs[4] <= 1906 OR DivWheelsOffs[5] <= 1906) LIMIT 10000"]}
 {"sql":"SELECT SUM(Cancelled), MIN(OriginWac) FROM mytable WHERE DivReachedDest < 1 OR TaxiIn >= 4 AND LateAircraftDelay BETWEEN 327 AND 10 LIMIT 16"}
 {"sql":"SELECT DistanceGroup, AVG(DestAirportID), COUNT(DaysSinceEpoch) FROM mytable WHERE DepartureDelayGroups BETWEEN 12 AND 8 OR DivActualElapsedTime IN (1043, 165, 334, 208, 273) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 14","hsqls":["SELECT DistanceGroup, AVG(DestAirportID), COUNT(DaysSinceEpoch) FROM mytable WHERE DepartureDelayGroups BETWEEN 12 AND 8 OR DivActualElapsedTime IN (1043, 165, 334, 208, 273) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 14"]}
 {"sql":"SELECT Dest, DestCityMarketID, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND 2 AND UniqueCarrier BETWEEN 'B6' AND 'AS' GROUP BY Dest, DestCityMarketID  ORDER BY Dest, DestCityMarketID LIMIT 9","hsqls":["SELECT Dest, DestCityMarketID, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND 2 AND UniqueCarrier BETWEEN 'B6' AND 'AS' GROUP BY Dest, DestCityMarketID  ORDER BY Dest, DestCityMarketID LIMIT 9"]}
 {"sql":"SELECT DestWac, DivAirportLandings FROM mytable ORDER BY DivReachedDest LIMIT 28"}
-{"sql":"SELECT CancellationCode, OriginStateName, SUM(ArrDelayMinutes), COUNT(ArrTimeBlk), AVG(DistanceGroup) FROM mytable WHERE \"Year\" > 2014 AND DepDelay <= 456.0 OR DivWheelsOffs BETWEEN 2030 AND 2138 GROUP BY CancellationCode, OriginStateName LIMIT 12","hsqls":["SELECT CancellationCode, OriginStateName, SUM(ArrDelayMinutes), COUNT(ArrTimeBlk), AVG(DistanceGroup) FROM mytable WHERE Year > 2014 AND DepDelay <= 456.0 OR (DivWheelsOffs__MV0 BETWEEN 2030 AND 2138 OR DivWheelsOffs__MV1 BETWEEN 2030 AND 2138 OR DivWheelsOffs__MV2 BETWEEN 2030 AND 2138 OR DivWheelsOffs__MV3 BETWEEN 2030 AND 2138 OR DivWheelsOffs__MV4 BETWEEN 2030 AND 2138) GROUP BY CancellationCode, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, Quarter FROM mytable WHERE DestAirportID BETWEEN 10990 AND 15048 OR DivWheelsOns IN (1625, 1427, 2304, 733) LIMIT 23","hsqls":["SELECT DepartureDelayGroups, Quarter FROM mytable WHERE DestAirportID BETWEEN 10990 AND 15048 OR (DivWheelsOns__MV0 IN (1625, 1427, 2304, 733) OR DivWheelsOns__MV1 IN (1625, 1427, 2304, 733) OR DivWheelsOns__MV2 IN (1625, 1427, 2304, 733) OR DivWheelsOns__MV3 IN (1625, 1427, 2304, 733) OR DivWheelsOns__MV4 IN (1625, 1427, 2304, 733)) LIMIT 10000"]}
+{"sql":"SELECT CancellationCode, OriginStateName, SUM(ArrDelayMinutes), COUNT(ArrTimeBlk), AVG(DistanceGroup) FROM mytable WHERE \"Year\" > 2014 AND DepDelay <= 456.0 OR DivWheelsOffs BETWEEN 2030 AND 2138 GROUP BY CancellationCode, OriginStateName LIMIT 12","hsqls":["SELECT CancellationCode, OriginStateName, SUM(ArrDelayMinutes), COUNT(ArrTimeBlk), AVG(DistanceGroup) FROM mytable WHERE `Year` > 2014 AND DepDelay <= 456.0 OR (DivWheelsOffs[1] BETWEEN 2030 AND 2138 OR DivWheelsOffs[2] BETWEEN 2030 AND 2138 OR DivWheelsOffs[3] BETWEEN 2030 AND 2138 OR DivWheelsOffs[4] BETWEEN 2030 AND 2138 OR DivWheelsOffs[5] BETWEEN 2030 AND 2138) GROUP BY CancellationCode, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Quarter FROM mytable WHERE DestAirportID BETWEEN 10990 AND 15048 OR DivWheelsOns IN (1625, 1427, 2304, 733) LIMIT 23","hsqls":["SELECT DepartureDelayGroups, Quarter FROM mytable WHERE DestAirportID BETWEEN 10990 AND 15048 OR (DivWheelsOns[1] IN (1625, 1427, 2304, 733) OR DivWheelsOns[2] IN (1625, 1427, 2304, 733) OR DivWheelsOns[3] IN (1625, 1427, 2304, 733) OR DivWheelsOns[4] IN (1625, 1427, 2304, 733) OR DivWheelsOns[5] IN (1625, 1427, 2304, 733)) LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, CarrierDelay, SecurityDelay FROM mytable WHERE LateAircraftDelay IN (373, 37) ORDER BY OriginState LIMIT 28"}
 {"sql":"SELECT TotalAddGTime, CRSDepTime, DivArrDelay FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 0 LIMIT 16"}
 {"sql":"SELECT DivArrDelay, ArrivalDelayGroups, MIN(TaxiIn) FROM mytable WHERE ActualElapsedTime = 332 GROUP BY DivArrDelay, ArrivalDelayGroups  ORDER BY DivArrDelay, ArrivalDelayGroups LIMIT 26","hsqls":["SELECT DivArrDelay, ArrivalDelayGroups, MIN(TaxiIn) FROM mytable WHERE ActualElapsedTime = 332 GROUP BY DivArrDelay, ArrivalDelayGroups  ORDER BY DivArrDelay, ArrivalDelayGroups LIMIT 26"]}
-{"sql":"SELECT DepDel15, COUNT(*) FROM mytable WHERE DivAirportIDs IN (15249, 11775, 13424) AND Distance NOT IN (1616, 1294, 998, 666) GROUP BY DepDel15 LIMIT 27","hsqls":["SELECT DepDel15, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (15249, 11775, 13424) OR DivAirportIDs__MV1 IN (15249, 11775, 13424) OR DivAirportIDs__MV2 IN (15249, 11775, 13424) OR DivAirportIDs__MV3 IN (15249, 11775, 13424) OR DivAirportIDs__MV4 IN (15249, 11775, 13424)) AND Distance NOT IN (1616, 1294, 998, 666) GROUP BY DepDel15 LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, OriginState, Quarter FROM mytable WHERE DivLongestGTimes IN (108.0, 145.0, 21.0, 104.0) AND DestWac BETWEEN 91 AND 42 OR DestCityName BETWEEN 'Grand Junction, CO' AND 'Gunnison, CO' ORDER BY DivDistance LIMIT 2","hsqls":["SELECT DivReachedDest, OriginState, Quarter FROM mytable WHERE (DivLongestGTimes__MV0 IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes__MV1 IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes__MV2 IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes__MV3 IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes__MV4 IN (108.0, 145.0, 21.0, 104.0)) AND DestWac BETWEEN 91 AND 42 OR DestCityName BETWEEN 'Grand Junction, CO' AND 'Gunnison, CO' ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DepDel15, COUNT(*) FROM mytable WHERE DivAirportIDs IN (15249, 11775, 13424) AND Distance NOT IN (1616, 1294, 998, 666) GROUP BY DepDel15 LIMIT 27","hsqls":["SELECT DepDel15, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (15249, 11775, 13424) OR DivAirportIDs[2] IN (15249, 11775, 13424) OR DivAirportIDs[3] IN (15249, 11775, 13424) OR DivAirportIDs[4] IN (15249, 11775, 13424) OR DivAirportIDs[5] IN (15249, 11775, 13424)) AND Distance NOT IN (1616, 1294, 998, 666) GROUP BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, OriginState, Quarter FROM mytable WHERE DivLongestGTimes IN (108.0, 145.0, 21.0, 104.0) AND DestWac BETWEEN 91 AND 42 OR DestCityName BETWEEN 'Grand Junction, CO' AND 'Gunnison, CO' ORDER BY DivDistance LIMIT 2","hsqls":["SELECT DivReachedDest, OriginState, Quarter FROM mytable WHERE (DivLongestGTimes[1] IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes[2] IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes[3] IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes[4] IN (108.0, 145.0, 21.0, 104.0) OR DivLongestGTimes[5] IN (108.0, 145.0, 21.0, 104.0)) AND DestWac BETWEEN 91 AND 42 OR DestCityName BETWEEN 'Grand Junction, CO' AND 'Gunnison, CO' ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID FROM mytable ORDER BY Diverted, Distance, CRSDepTime LIMIT 9"}
 {"sql":"SELECT DestState, SecurityDelay, DaysSinceEpoch, SUM(AirlineID), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DestState, SecurityDelay, DaysSinceEpoch  ORDER BY DestState, SecurityDelay, DaysSinceEpoch LIMIT 1","hsqls":["SELECT DestState, SecurityDelay, DaysSinceEpoch, SUM(AirlineID), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DestState, SecurityDelay, DaysSinceEpoch  ORDER BY DestState, SecurityDelay, DaysSinceEpoch LIMIT 1"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable ORDER BY ArrivalDelayGroups LIMIT 9"}
 {"sql":"SELECT WheelsOff, OriginCityName, DestStateName FROM mytable WHERE FirstDepTime < 1016 AND LateAircraftDelay > 138 ORDER BY FirstDepTime LIMIT 18"}
-{"sql":"SELECT WheelsOff, \"Year\", Carrier FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DayofMonth NOT IN (1, 31, 28) OR DestAirportID IN (10299, 11996, 13424, 11982) ORDER BY DestWac LIMIT 9","hsqls":["SELECT WheelsOff, Year, Carrier FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND DayofMonth NOT IN (1, 31, 28) OR DestAirportID IN (10299, 11996, 13424, 11982) ORDER BY DestWac LIMIT 9"]}
-{"sql":"SELECT AirlineID, OriginAirportID, COUNT(*) FROM mytable WHERE WeatherDelay BETWEEN 16 AND 17 OR DivLongestGTimes = 102.0 GROUP BY AirlineID, OriginAirportID LIMIT 11","hsqls":["SELECT AirlineID, OriginAirportID, COUNT(*) FROM mytable WHERE WeatherDelay BETWEEN 16 AND 17 OR (DivLongestGTimes__MV0 = 102.0 OR DivLongestGTimes__MV1 = 102.0 OR DivLongestGTimes__MV2 = 102.0 OR DivLongestGTimes__MV3 = 102.0 OR DivLongestGTimes__MV4 = 102.0) GROUP BY AirlineID, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, \"Year\", Carrier FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DayofMonth NOT IN (1, 31, 28) OR DestAirportID IN (10299, 11996, 13424, 11982) ORDER BY DestWac LIMIT 9","hsqls":["SELECT WheelsOff, Year, Carrier FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND DayofMonth NOT IN (1, 31, 28) OR DestAirportID IN (10299, 11996, 13424, 11982) ORDER BY DestWac LIMIT 9"]}
+{"sql":"SELECT AirlineID, OriginAirportID, COUNT(*) FROM mytable WHERE WeatherDelay BETWEEN 16 AND 17 OR DivLongestGTimes = 102.0 GROUP BY AirlineID, OriginAirportID LIMIT 11","hsqls":["SELECT AirlineID, OriginAirportID, COUNT(*) FROM mytable WHERE WeatherDelay BETWEEN 16 AND 17 OR (DivLongestGTimes[1] = 102.0 OR DivLongestGTimes[2] = 102.0 OR DivLongestGTimes[3] = 102.0 OR DivLongestGTimes[4] = 102.0 OR DivLongestGTimes[5] = 102.0) GROUP BY AirlineID, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DivDistance, DepTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE OriginStateName IN ('New Mexico', 'South Carolina', 'Hawaii', 'Montana', 'Indiana') OR Flights = 1 AND LateAircraftDelay IN (175, 194, 80, 60) GROUP BY DivDistance, DepTimeBlk, OriginAirportID  ORDER BY DivDistance, DepTimeBlk, OriginAirportID LIMIT 2","hsqls":["SELECT DivDistance, DepTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE OriginStateName IN ('New Mexico', 'South Carolina', 'Hawaii', 'Montana', 'Indiana') OR Flights = 1 AND LateAircraftDelay IN (175, 194, 80, 60) GROUP BY DivDistance, DepTimeBlk, OriginAirportID  ORDER BY DivDistance, DepTimeBlk, OriginAirportID LIMIT 2"]}
 {"sql":"SELECT DepartureDelayGroups, WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR UniqueCarrier > 'DL' GROUP BY DepartureDelayGroups, WeatherDelay, ArrDelay  ORDER BY DepartureDelayGroups, WeatherDelay, ArrDelay LIMIT 11","hsqls":["SELECT DepartureDelayGroups, WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR UniqueCarrier > 'DL' GROUP BY DepartureDelayGroups, WeatherDelay, ArrDelay  ORDER BY DepartureDelayGroups, WeatherDelay, ArrDelay LIMIT 11"]}
-{"sql":"SELECT WeatherDelay, DivTotalGTimes FROM mytable WHERE DepartureDelayGroups BETWEEN 12 AND 4 OR FlightDate IN ('2014-01-13', '2014-01-23', '2014-01-10') OR Quarter <= 1 LIMIT 10","hsqls":["SELECT WeatherDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DepartureDelayGroups BETWEEN 12 AND 4 OR FlightDate IN ('2014-01-13', '2014-01-23', '2014-01-10') OR Quarter <= 1 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DivTotalGTimes FROM mytable WHERE DepartureDelayGroups BETWEEN 12 AND 4 OR FlightDate IN ('2014-01-13', '2014-01-23', '2014-01-10') OR Quarter <= 1 LIMIT 10","hsqls":["SELECT WeatherDelay, DivTotalGTimes FROM mytable WHERE DepartureDelayGroups BETWEEN 12 AND 4 OR FlightDate IN ('2014-01-13', '2014-01-23', '2014-01-10') OR Quarter <= 1 LIMIT 10000"]}
 {"sql":"SELECT OriginState, CRSDepTime FROM mytable WHERE DepTimeBlk BETWEEN '0600-0659' AND '1200-1259' OR FlightNum IN (5601, 3039, 2412, 630, 985) LIMIT 11"}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16082 AND 16088 OR OriginStateFips NOT IN (32, 18, 36, 33, 39) AND ActualElapsedTime NOT IN (383, 178, 244, 271, 167) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 2","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16082 AND 16088 OR OriginStateFips NOT IN (32, 18, 36, 33, 39) AND ActualElapsedTime NOT IN (383, 178, 244, 271, 167) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 2"]}
 {"sql":"SELECT DestState, DepTimeBlk, DivActualElapsedTime FROM mytable WHERE Quarter IN (1) LIMIT 26"}
@@ -2074,68 +2074,68 @@
 {"sql":"SELECT DestState, OriginStateName, MIN(DivActualElapsedTime), SUM(DivArrDelay) FROM mytable WHERE DestCityMarketID = 32888 OR Cancelled IN (1, 0) GROUP BY DestState, OriginStateName  ORDER BY DestState, OriginStateName LIMIT 2","hsqls":["SELECT DestState, OriginStateName, MIN(DivActualElapsedTime), SUM(DivArrDelay) FROM mytable WHERE DestCityMarketID = 32888 OR Cancelled IN (1, 0) GROUP BY DestState, OriginStateName  ORDER BY DestState, OriginStateName LIMIT 2"]}
 {"sql":"SELECT Dest, MIN(DivDistance) FROM mytable WHERE OriginWac NOT IN (1, 91, 39, 11, 37) OR CRSDepTime IN (717, 1507) AND DayOfWeek NOT IN (5) GROUP BY Dest  ORDER BY Dest LIMIT 7","hsqls":["SELECT Dest, MIN(DivDistance) FROM mytable WHERE OriginWac NOT IN (1, 91, 39, 11, 37) OR CRSDepTime IN (717, 1507) AND DayOfWeek NOT IN (5) GROUP BY Dest  ORDER BY Dest LIMIT 7"]}
 {"sql":"SELECT TaxiOut, DestState, DivActualElapsedTime FROM mytable WHERE CRSDepTime = 1256 AND FirstDepTime > 1940 AND DestWac IN (43, 5, 4, 52, 72) ORDER BY DaysSinceEpoch LIMIT 20"}
-{"sql":"SELECT TaxiOut, DestCityMarketID FROM mytable ORDER BY FlightNum, \"Month\" LIMIT 25","hsqls":["SELECT TaxiOut, DestCityMarketID FROM mytable ORDER BY FlightNum, Month LIMIT 25"]}
+{"sql":"SELECT TaxiOut, DestCityMarketID FROM mytable ORDER BY FlightNum, \"Month\" LIMIT 25","hsqls":["SELECT TaxiOut, DestCityMarketID FROM mytable ORDER BY FlightNum, `Month` LIMIT 25"]}
 {"sql":"SELECT DistanceGroup, ActualElapsedTime, AirlineID, MIN(FlightNum), MIN(ArrDelay), MIN(DaysSinceEpoch) FROM mytable WHERE OriginAirportSeqID < 1504102 OR NASDelay NOT IN (80, 12) OR DayOfWeek BETWEEN 3 AND 1 GROUP BY DistanceGroup, ActualElapsedTime, AirlineID  ORDER BY DistanceGroup, ActualElapsedTime, AirlineID LIMIT 9","hsqls":["SELECT DistanceGroup, ActualElapsedTime, AirlineID, MIN(FlightNum), MIN(ArrDelay), MIN(DaysSinceEpoch) FROM mytable WHERE OriginAirportSeqID < 1504102 OR NASDelay NOT IN (80, 12) OR DayOfWeek BETWEEN 3 AND 1 GROUP BY DistanceGroup, ActualElapsedTime, AirlineID  ORDER BY DistanceGroup, ActualElapsedTime, AirlineID LIMIT 9"]}
 {"sql":"SELECT DepartureDelayGroups, ActualElapsedTime, DepTimeBlk, COUNT(*) FROM mytable WHERE Quarter <> 1 AND ArrTimeBlk NOT IN ('1000-1059', '2300-2359') OR ArrDelay NOT IN (75.0) GROUP BY DepartureDelayGroups, ActualElapsedTime, DepTimeBlk  ORDER BY DepartureDelayGroups, ActualElapsedTime, DepTimeBlk LIMIT 12","hsqls":["SELECT DepartureDelayGroups, ActualElapsedTime, DepTimeBlk, COUNT(*) FROM mytable WHERE Quarter <> 1 AND ArrTimeBlk NOT IN ('1000-1059', '2300-2359') OR ArrDelay NOT IN (75.0) GROUP BY DepartureDelayGroups, ActualElapsedTime, DepTimeBlk  ORDER BY DepartureDelayGroups, ActualElapsedTime, DepTimeBlk LIMIT 12"]}
-{"sql":"SELECT SecurityDelay, DivWheelsOffs, ArrivalDelayGroups FROM mytable ORDER BY OriginCityName, DivArrDelay LIMIT 15","hsqls":["SELECT SecurityDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, ArrivalDelayGroups FROM mytable ORDER BY OriginCityName, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, DivWheelsOffs, ArrivalDelayGroups FROM mytable ORDER BY OriginCityName, DivArrDelay LIMIT 15","hsqls":["SELECT SecurityDelay, DivWheelsOffs, ArrivalDelayGroups FROM mytable ORDER BY OriginCityName, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginState, CancellationCode FROM mytable WHERE SecurityDelay >= 18 AND DivAirportLandings <= 1 AND DivActualElapsedTime IN (272) ORDER BY Origin LIMIT 18"}
 {"sql":"SELECT Origin, DayofMonth, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 20355 AND 20436 OR ArrDel15 BETWEEN 0 AND 1 GROUP BY Origin, DayofMonth  ORDER BY Origin, DayofMonth LIMIT 6","hsqls":["SELECT Origin, DayofMonth, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 20355 AND 20436 OR ArrDel15 BETWEEN 0 AND 1 GROUP BY Origin, DayofMonth  ORDER BY Origin, DayofMonth LIMIT 6"]}
 {"sql":"SELECT DistanceGroup, ArrDelayMinutes, MAX(OriginAirportSeqID), MIN(CarrierDelay) FROM mytable WHERE OriginState < 'CO' OR DestAirportID IN (14869, 12197, 14108, 10781) GROUP BY DistanceGroup, ArrDelayMinutes  ORDER BY DistanceGroup, ArrDelayMinutes LIMIT 12","hsqls":["SELECT DistanceGroup, ArrDelayMinutes, MAX(OriginAirportSeqID), MIN(CarrierDelay) FROM mytable WHERE OriginState < 'CO' OR DestAirportID IN (14869, 12197, 14108, 10781) GROUP BY DistanceGroup, ArrDelayMinutes  ORDER BY DistanceGroup, ArrDelayMinutes LIMIT 12"]}
 {"sql":"SELECT FlightDate, AVG(CarrierDelay), MAX(DepDelayMinutes), MIN(Distance) FROM mytable WHERE TaxiIn < 10 OR Distance IN (505, 930) AND ArrDel15 BETWEEN -9999 AND -9999 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 21","hsqls":["SELECT FlightDate, AVG(CarrierDelay), MAX(DepDelayMinutes), MIN(Distance) FROM mytable WHERE TaxiIn < 10 OR Distance IN (505, 930) AND ArrDel15 BETWEEN -9999 AND -9999 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 21"]}
 {"sql":"SELECT DepartureDelayGroups, TotalAddGTime, ActualElapsedTime, MIN(DepDelayMinutes), COUNT(Origin), MIN(AirTime) FROM mytable WHERE DepTime NOT IN (1355) OR WeatherDelay BETWEEN 100 AND 59 OR Quarter NOT IN (1) GROUP BY DepartureDelayGroups, TotalAddGTime, ActualElapsedTime  ORDER BY DepartureDelayGroups, TotalAddGTime, ActualElapsedTime LIMIT 20","hsqls":["SELECT DepartureDelayGroups, TotalAddGTime, ActualElapsedTime, MIN(DepDelayMinutes), COUNT(Origin), MIN(AirTime) FROM mytable WHERE DepTime NOT IN (1355) OR WeatherDelay BETWEEN 100 AND 59 OR Quarter NOT IN (1) GROUP BY DepartureDelayGroups, TotalAddGTime, ActualElapsedTime  ORDER BY DepartureDelayGroups, TotalAddGTime, ActualElapsedTime LIMIT 20"]}
 {"sql":"SELECT Carrier, SecurityDelay, MAX(OriginAirportSeqID), COUNT(TotalAddGTime), MIN(AirlineID) FROM mytable WHERE DivReachedDest <= 0 OR DayOfWeek < 6 GROUP BY Carrier, SecurityDelay","hsqls":["SELECT Carrier, SecurityDelay, MAX(OriginAirportSeqID), COUNT(TotalAddGTime), MIN(AirlineID) FROM mytable WHERE DivReachedDest <= 0 OR DayOfWeek < 6 GROUP BY Carrier, SecurityDelay"]}
-{"sql":"SELECT DestAirportSeqID, DivAirportLandings FROM mytable WHERE ArrTime = 1431 OR DivAirports <= 'FSD' ORDER BY DistanceGroup, DivReachedDest, DepTime LIMIT 9","hsqls":["SELECT DestAirportSeqID, DivAirportLandings FROM mytable WHERE ArrTime = 1431 OR (DivAirports__MV0 <= 'FSD' OR DivAirports__MV1 <= 'FSD' OR DivAirports__MV2 <= 'FSD' OR DivAirports__MV3 <= 'FSD' OR DivAirports__MV4 <= 'FSD') ORDER BY DistanceGroup, DivReachedDest, DepTime LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivAirportLandings FROM mytable WHERE ArrTime = 1431 OR DivAirports <= 'FSD' ORDER BY DistanceGroup, DivReachedDest, DepTime LIMIT 9","hsqls":["SELECT DestAirportSeqID, DivAirportLandings FROM mytable WHERE ArrTime = 1431 OR (DivAirports[1] <= 'FSD' OR DivAirports[2] <= 'FSD' OR DivAirports[3] <= 'FSD' OR DivAirports[4] <= 'FSD' OR DivAirports[5] <= 'FSD') ORDER BY DistanceGroup, DivReachedDest, DepTime LIMIT 10000"]}
 {"sql":"SELECT FlightDate, DepDel15, CRSElapsedTime FROM mytable WHERE OriginCityMarketID >= 33244 AND OriginCityName IN ('Seattle, WA', 'Eagle, CO') AND DestCityName <= 'San Luis Obispo, CA' ORDER BY DivDistance, CRSArrTime LIMIT 20"}
-{"sql":"SELECT Diverted, TaxiIn, DivAirportIDs FROM mytable WHERE AirTime BETWEEN 224 AND 95 AND LateAircraftDelay NOT IN (112, 113, 39, 13, 255) AND DestAirportID BETWEEN 13931 AND 14730 ORDER BY TaxiIn LIMIT 27","hsqls":["SELECT Diverted, TaxiIn, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE AirTime BETWEEN 224 AND 95 AND LateAircraftDelay NOT IN (112, 113, 39, 13, 255) AND DestAirportID BETWEEN 13931 AND 14730 ORDER BY TaxiIn LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE TotalAddGTime <= 24 ORDER BY DestCityMarketID LIMIT 21","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, OriginAirportID FROM mytable WHERE TotalAddGTime <= 24 ORDER BY DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE NASDelay NOT IN (57, 15, 28, 76) AND \"Month\" BETWEEN 1 AND 1 ORDER BY DepDel15 LIMIT 27","hsqls":["SELECT CarrierDelay FROM mytable WHERE NASDelay NOT IN (57, 15, 28, 76) AND Month BETWEEN 1 AND 1 ORDER BY DepDel15 LIMIT 27"]}
+{"sql":"SELECT Diverted, TaxiIn, DivAirportIDs FROM mytable WHERE AirTime BETWEEN 224 AND 95 AND LateAircraftDelay NOT IN (112, 113, 39, 13, 255) AND DestAirportID BETWEEN 13931 AND 14730 ORDER BY TaxiIn LIMIT 27","hsqls":["SELECT Diverted, TaxiIn, DivAirportIDs FROM mytable WHERE AirTime BETWEEN 224 AND 95 AND LateAircraftDelay NOT IN (112, 113, 39, 13, 255) AND DestAirportID BETWEEN 13931 AND 14730 ORDER BY TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE TotalAddGTime <= 24 ORDER BY DestCityMarketID LIMIT 21","hsqls":["SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE TotalAddGTime <= 24 ORDER BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE NASDelay NOT IN (57, 15, 28, 76) AND \"Month\" BETWEEN 1 AND 1 ORDER BY DepDel15 LIMIT 27","hsqls":["SELECT CarrierDelay FROM mytable WHERE NASDelay NOT IN (57, 15, 28, 76) AND `Month` BETWEEN 1 AND 1 ORDER BY DepDel15 LIMIT 27"]}
 {"sql":"SELECT DepartureDelayGroups, OriginCityName, DayofMonth FROM mytable WHERE TotalAddGTime BETWEEN 111 AND 111 OR DayOfWeek NOT IN (3, 1, 7, 5, 4) AND DestAirportSeqID >= 1457604 ORDER BY FlightNum, CarrierDelay, DestAirportID LIMIT 2"}
-{"sql":"SELECT Flights FROM mytable WHERE DayOfWeek BETWEEN 6 AND 4 AND CancellationCode <> 'B' OR DivTailNums IN ('N611SK', 'N373JB', 'N368NW') ORDER BY Carrier, CRSArrTime LIMIT 3","hsqls":["SELECT Flights FROM mytable WHERE DayOfWeek BETWEEN 6 AND 4 AND CancellationCode <> 'B' OR (DivTailNums__MV0 IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums__MV1 IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums__MV2 IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums__MV3 IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums__MV4 IN ('N611SK', 'N373JB', 'N368NW')) ORDER BY Carrier, CRSArrTime LIMIT 10000"]}
-{"sql":"SELECT COUNT(\"Month\"), MIN(DivReachedDest) FROM mytable WHERE DivArrDelay BETWEEN 258 AND 1153 AND DestState NOT IN ('MO') LIMIT 14","hsqls":["SELECT COUNT(Month), MIN(DivReachedDest) FROM mytable WHERE DivArrDelay BETWEEN 258 AND 1153 AND DestState NOT IN ('MO') LIMIT 14"]}
+{"sql":"SELECT Flights FROM mytable WHERE DayOfWeek BETWEEN 6 AND 4 AND CancellationCode <> 'B' OR DivTailNums IN ('N611SK', 'N373JB', 'N368NW') ORDER BY Carrier, CRSArrTime LIMIT 3","hsqls":["SELECT Flights FROM mytable WHERE DayOfWeek BETWEEN 6 AND 4 AND CancellationCode <> 'B' OR (DivTailNums[1] IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums[2] IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums[3] IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums[4] IN ('N611SK', 'N373JB', 'N368NW') OR DivTailNums[5] IN ('N611SK', 'N373JB', 'N368NW')) ORDER BY Carrier, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(\"Month\"), MIN(DivReachedDest) FROM mytable WHERE DivArrDelay BETWEEN 258 AND 1153 AND DestState NOT IN ('MO') LIMIT 14","hsqls":["SELECT COUNT(`Month`), MIN(DivReachedDest) FROM mytable WHERE DivArrDelay BETWEEN 258 AND 1153 AND DestState NOT IN ('MO') LIMIT 14"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CRSDepTime >= 1547 AND WeatherDelay NOT IN (19, 26, 100) AND OriginAirportSeqID BETWEEN 1018502 AND 1018502 LIMIT 1"}
 {"sql":"SELECT OriginCityName, NASDelay, ArrDelay FROM mytable WHERE TailNum BETWEEN 'N77871' AND 'N711HK' ORDER BY DivDistance, FlightDate, AirlineID LIMIT 21"}
 {"sql":"SELECT DayofMonth, DayOfWeek FROM mytable LIMIT 6"}
 {"sql":"SELECT DistanceGroup, ArrDelay, CRSDepTime, MAX(WheelsOn), SUM(OriginAirportID) FROM mytable GROUP BY DistanceGroup, ArrDelay, CRSDepTime  ORDER BY DistanceGroup, ArrDelay, CRSDepTime LIMIT 3","hsqls":["SELECT DistanceGroup, ArrDelay, CRSDepTime, MAX(WheelsOn), SUM(OriginAirportID) FROM mytable GROUP BY DistanceGroup, ArrDelay, CRSDepTime  ORDER BY DistanceGroup, ArrDelay, CRSDepTime LIMIT 3"]}
 {"sql":"SELECT OriginState, MAX(LateAircraftDelay), MAX(DayOfWeek) FROM mytable WHERE CarrierDelay BETWEEN 0 AND 243 GROUP BY OriginState  ORDER BY OriginState LIMIT 8","hsqls":["SELECT OriginState, MAX(LateAircraftDelay), MAX(DayOfWeek) FROM mytable WHERE CarrierDelay BETWEEN 0 AND 243 GROUP BY OriginState  ORDER BY OriginState LIMIT 8"]}
 {"sql":"SELECT ArrTimeBlk, DivAirportLandings, SUM(WheelsOn), SUM(CRSDepTime), SUM(OriginAirportID) FROM mytable WHERE ArrDelay BETWEEN 92.0 AND -15.0 AND WheelsOff BETWEEN 1513 AND 910 OR TaxiIn >= 16 GROUP BY ArrTimeBlk, DivAirportLandings  ORDER BY ArrTimeBlk, DivAirportLandings LIMIT 28","hsqls":["SELECT ArrTimeBlk, DivAirportLandings, SUM(WheelsOn), SUM(CRSDepTime), SUM(OriginAirportID) FROM mytable WHERE ArrDelay BETWEEN 92.0 AND -15.0 AND WheelsOff BETWEEN 1513 AND 910 OR TaxiIn >= 16 GROUP BY ArrTimeBlk, DivAirportLandings  ORDER BY ArrTimeBlk, DivAirportLandings LIMIT 28"]}
-{"sql":"SELECT SUM(Quarter), MAX(DestWac) FROM mytable WHERE \"Year\" NOT IN (2014) LIMIT 13","hsqls":["SELECT SUM(Quarter), MAX(DestWac) FROM mytable WHERE Year NOT IN (2014) LIMIT 13"]}
+{"sql":"SELECT SUM(Quarter), MAX(DestWac) FROM mytable WHERE \"Year\" NOT IN (2014) LIMIT 13","hsqls":["SELECT SUM(Quarter), MAX(DestWac) FROM mytable WHERE `Year` NOT IN (2014) LIMIT 13"]}
 {"sql":"SELECT NASDelay, AirlineID, AVG(ArrTime), MIN(ArrTime), MIN(FirstDepTime) FROM mytable WHERE DepDelayMinutes >= 81.0 OR DepDelayMinutes NOT IN (108.0, 536.0) GROUP BY NASDelay, AirlineID  ORDER BY NASDelay, AirlineID LIMIT 11","hsqls":["SELECT NASDelay, AirlineID, AVG(ArrTime), MIN(ArrTime), MIN(FirstDepTime) FROM mytable WHERE DepDelayMinutes >= 81.0 OR DepDelayMinutes NOT IN (108.0, 536.0) GROUP BY NASDelay, AirlineID  ORDER BY NASDelay, AirlineID LIMIT 11"]}
 {"sql":"SELECT DivDistance, UniqueCarrier FROM mytable WHERE WheelsOff BETWEEN 1851 AND 835 AND FlightNum BETWEEN 2053 AND 4720 LIMIT 16"}
-{"sql":"SELECT DepDelay, Carrier, ArrDel15 FROM mytable WHERE DivAirports > 'MLI' OR DestStateName <= 'Oklahoma' LIMIT 16","hsqls":["SELECT DepDelay, Carrier, ArrDel15 FROM mytable WHERE (DivAirports__MV0 > 'MLI' OR DivAirports__MV1 > 'MLI' OR DivAirports__MV2 > 'MLI' OR DivAirports__MV3 > 'MLI' OR DivAirports__MV4 > 'MLI') OR DestStateName <= 'Oklahoma' LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, DivWheelsOffs FROM mytable WHERE DivLongestGTimes BETWEEN 116.0 AND 27.0 ORDER BY LongestAddGTime, TotalAddGTime LIMIT 26","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 116.0 AND 27.0 OR DivLongestGTimes__MV1 BETWEEN 116.0 AND 27.0 OR DivLongestGTimes__MV2 BETWEEN 116.0 AND 27.0 OR DivLongestGTimes__MV3 BETWEEN 116.0 AND 27.0 OR DivLongestGTimes__MV4 BETWEEN 116.0 AND 27.0) ORDER BY LongestAddGTime, TotalAddGTime LIMIT 10000"]}
-{"sql":"SELECT MIN(DepDelayMinutes), MAX(LongestAddGTime), SUM(TaxiIn) FROM mytable WHERE DivTotalGTimes > 3 AND CancellationCode BETWEEN 'noodles' AND 'A' OR DivWheelsOffs > 1614 LIMIT 24","hsqls":["SELECT MIN(DepDelayMinutes), MAX(LongestAddGTime), SUM(TaxiIn)  FROM mytable WHERE (DivTotalGTimes__MV0 > 3 OR DivTotalGTimes__MV1 > 3 OR DivTotalGTimes__MV2 > 3 OR DivTotalGTimes__MV3 > 3 OR DivTotalGTimes__MV4 > 3) AND CancellationCode BETWEEN 'noodles' AND 'A' OR (DivWheelsOffs__MV0 > 1614 OR DivWheelsOffs__MV1 > 1614 OR DivWheelsOffs__MV2 > 1614 OR DivWheelsOffs__MV3 > 1614 OR DivWheelsOffs__MV4 > 1614) LIMIT 10000"]}
+{"sql":"SELECT DepDelay, Carrier, ArrDel15 FROM mytable WHERE DivAirports > 'MLI' OR DestStateName <= 'Oklahoma' LIMIT 16","hsqls":["SELECT DepDelay, Carrier, ArrDel15 FROM mytable WHERE (DivAirports[1] > 'MLI' OR DivAirports[2] > 'MLI' OR DivAirports[3] > 'MLI' OR DivAirports[4] > 'MLI' OR DivAirports[5] > 'MLI') OR DestStateName <= 'Oklahoma' LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, DivWheelsOffs FROM mytable WHERE DivLongestGTimes BETWEEN 116.0 AND 27.0 ORDER BY LongestAddGTime, TotalAddGTime LIMIT 26","hsqls":["SELECT DivTailNums, DivWheelsOffs FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 116.0 AND 27.0 OR DivLongestGTimes[2] BETWEEN 116.0 AND 27.0 OR DivLongestGTimes[3] BETWEEN 116.0 AND 27.0 OR DivLongestGTimes[4] BETWEEN 116.0 AND 27.0 OR DivLongestGTimes[5] BETWEEN 116.0 AND 27.0) ORDER BY LongestAddGTime, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT MIN(DepDelayMinutes), MAX(LongestAddGTime), SUM(TaxiIn) FROM mytable WHERE DivTotalGTimes > 3 AND CancellationCode BETWEEN 'noodles' AND 'A' OR DivWheelsOffs > 1614 LIMIT 24","hsqls":["SELECT MIN(DepDelayMinutes), MAX(LongestAddGTime), SUM(TaxiIn)  FROM mytable WHERE (DivTotalGTimes[1] > 3 OR DivTotalGTimes[2] > 3 OR DivTotalGTimes[3] > 3 OR DivTotalGTimes[4] > 3 OR DivTotalGTimes[5] > 3) AND CancellationCode BETWEEN 'noodles' AND 'A' OR (DivWheelsOffs[1] > 1614 OR DivWheelsOffs[2] > 1614 OR DivWheelsOffs[3] > 1614 OR DivWheelsOffs[4] > 1614 OR DivWheelsOffs[5] > 1614) LIMIT 10000"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE TaxiOut BETWEEN 97 AND 65 LIMIT 5"}
 {"sql":"SELECT ArrDel15, TailNum, DestCityMarketID, COUNT(*) FROM mytable WHERE CarrierDelay >= 31 OR DestCityName > 'Flint, MI' GROUP BY ArrDel15, TailNum, DestCityMarketID  ORDER BY ArrDel15, TailNum, DestCityMarketID LIMIT 19","hsqls":["SELECT ArrDel15, TailNum, DestCityMarketID, COUNT(*) FROM mytable WHERE CarrierDelay >= 31 OR DestCityName > 'Flint, MI' GROUP BY ArrDel15, TailNum, DestCityMarketID  ORDER BY ArrDel15, TailNum, DestCityMarketID LIMIT 19"]}
-{"sql":"SELECT DistanceGroup, DestStateFips FROM mytable WHERE AirlineID BETWEEN 20355 AND 20436 AND DivTotalGTimes < 64 ORDER BY WeatherDelay LIMIT 4","hsqls":["SELECT DistanceGroup, DestStateFips FROM mytable WHERE AirlineID BETWEEN 20355 AND 20436 AND (DivTotalGTimes__MV0 < 64 OR DivTotalGTimes__MV1 < 64 OR DivTotalGTimes__MV2 < 64 OR DivTotalGTimes__MV3 < 64 OR DivTotalGTimes__MV4 < 64) ORDER BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestStateFips FROM mytable WHERE AirlineID BETWEEN 20355 AND 20436 AND DivTotalGTimes < 64 ORDER BY WeatherDelay LIMIT 4","hsqls":["SELECT DistanceGroup, DestStateFips FROM mytable WHERE AirlineID BETWEEN 20355 AND 20436 AND (DivTotalGTimes[1] < 64 OR DivTotalGTimes[2] < 64 OR DivTotalGTimes[3] < 64 OR DivTotalGTimes[4] < 64 OR DivTotalGTimes[5] < 64) ORDER BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, AirlineID, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, AirlineID","hsqls":["SELECT DestAirportSeqID, AirlineID, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, AirlineID"]}
-{"sql":"SELECT DivLongestGTimes, DivAirportSeqIDs FROM mytable WHERE DayofMonth NOT IN (19, 23, 15, 8, 11) OR DivDistance BETWEEN 91 AND 115 ORDER BY ArrivalDelayGroups LIMIT 14","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DayofMonth NOT IN (19, 23, 15, 8, 11) OR DivDistance BETWEEN 91 AND 115 ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivAirportSeqIDs FROM mytable WHERE DayofMonth NOT IN (19, 23, 15, 8, 11) OR DivDistance BETWEEN 91 AND 115 ORDER BY ArrivalDelayGroups LIMIT 14","hsqls":["SELECT DivLongestGTimes, DivAirportSeqIDs FROM mytable WHERE DayofMonth NOT IN (19, 23, 15, 8, 11) OR DivDistance BETWEEN 91 AND 115 ORDER BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, OriginAirportID FROM mytable WHERE ArrTime < 1235 OR DestStateFips BETWEEN 15 AND 72 ORDER BY WheelsOff, OriginWac, CRSElapsedTime LIMIT 3"}
 {"sql":"SELECT DestStateName, DestCityMarketID FROM mytable LIMIT 26"}
 {"sql":"SELECT OriginWac, COUNT(*) FROM mytable WHERE SecurityDelay IN (10, 1, 4, 8, -9999) GROUP BY OriginWac  ORDER BY OriginWac LIMIT 18","hsqls":["SELECT OriginWac, COUNT(*) FROM mytable WHERE SecurityDelay IN (10, 1, 4, 8, -9999) GROUP BY OriginWac  ORDER BY OriginWac LIMIT 18"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 2"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirports IN ('ROA', 'PLS', 'SYR') OR OriginCityName > 'Bozeman, MT' LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirports__MV0 IN ('ROA', 'PLS', 'SYR') OR DivAirports__MV1 IN ('ROA', 'PLS', 'SYR') OR DivAirports__MV2 IN ('ROA', 'PLS', 'SYR') OR DivAirports__MV3 IN ('ROA', 'PLS', 'SYR') OR DivAirports__MV4 IN ('ROA', 'PLS', 'SYR')) OR OriginCityName > 'Bozeman, MT' LIMIT 10000"]}
-{"sql":"SELECT ArrivalDelayGroups, MIN(\"Month\") FROM mytable WHERE DepTime BETWEEN 1150 AND 2315 AND DepTimeBlk IN ('2000-2059', '1700-1759', '0700-0759', '0600-0659', '1900-1959') AND OriginCityName NOT IN ('Islip, NY') GROUP BY ArrivalDelayGroups LIMIT 11","hsqls":["SELECT ArrivalDelayGroups, MIN(Month) FROM mytable WHERE DepTime BETWEEN 1150 AND 2315 AND DepTimeBlk IN ('2000-2059', '1700-1759', '0700-0759', '0600-0659', '1900-1959') AND OriginCityName NOT IN ('Islip, NY') GROUP BY ArrivalDelayGroups LIMIT 11"]}
-{"sql":"SELECT CRSArrTime, WheelsOn FROM mytable WHERE DivLongestGTimes BETWEEN 112.0 AND 39.0 LIMIT 8","hsqls":["SELECT CRSArrTime, WheelsOn FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 112.0 AND 39.0 OR DivLongestGTimes__MV1 BETWEEN 112.0 AND 39.0 OR DivLongestGTimes__MV2 BETWEEN 112.0 AND 39.0 OR DivLongestGTimes__MV3 BETWEEN 112.0 AND 39.0 OR DivLongestGTimes__MV4 BETWEEN 112.0 AND 39.0) LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, Dest, \"Month\", MAX(CarrierDelay) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR WheelsOff NOT IN (1009, 924) OR DestStateFips BETWEEN 44 AND 41 GROUP BY OriginAirportSeqID, Dest, \"Month\" LIMIT 3","hsqls":["SELECT OriginAirportSeqID, Dest, Month, MAX(CarrierDelay) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR WheelsOff NOT IN (1009, 924) OR DestStateFips BETWEEN 44 AND 41 GROUP BY OriginAirportSeqID, Dest, Month LIMIT 3"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirports IN ('ROA', 'PLS', 'SYR') OR OriginCityName > 'Bozeman, MT' LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirports[1] IN ('ROA', 'PLS', 'SYR') OR DivAirports[2] IN ('ROA', 'PLS', 'SYR') OR DivAirports[3] IN ('ROA', 'PLS', 'SYR') OR DivAirports[4] IN ('ROA', 'PLS', 'SYR') OR DivAirports[5] IN ('ROA', 'PLS', 'SYR')) OR OriginCityName > 'Bozeman, MT' LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups, MIN(\"Month\") FROM mytable WHERE DepTime BETWEEN 1150 AND 2315 AND DepTimeBlk IN ('2000-2059', '1700-1759', '0700-0759', '0600-0659', '1900-1959') AND OriginCityName NOT IN ('Islip, NY') GROUP BY ArrivalDelayGroups LIMIT 11","hsqls":["SELECT ArrivalDelayGroups, MIN(`Month`) FROM mytable WHERE DepTime BETWEEN 1150 AND 2315 AND DepTimeBlk IN ('2000-2059', '1700-1759', '0700-0759', '0600-0659', '1900-1959') AND OriginCityName NOT IN ('Islip, NY') GROUP BY ArrivalDelayGroups LIMIT 11"]}
+{"sql":"SELECT CRSArrTime, WheelsOn FROM mytable WHERE DivLongestGTimes BETWEEN 112.0 AND 39.0 LIMIT 8","hsqls":["SELECT CRSArrTime, WheelsOn FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 112.0 AND 39.0 OR DivLongestGTimes[2] BETWEEN 112.0 AND 39.0 OR DivLongestGTimes[3] BETWEEN 112.0 AND 39.0 OR DivLongestGTimes[4] BETWEEN 112.0 AND 39.0 OR DivLongestGTimes[5] BETWEEN 112.0 AND 39.0) LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, Dest, \"Month\", MAX(CarrierDelay) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR WheelsOff NOT IN (1009, 924) OR DestStateFips BETWEEN 44 AND 41 GROUP BY OriginAirportSeqID, Dest, \"Month\" LIMIT 3","hsqls":["SELECT OriginAirportSeqID, Dest, Month, MAX(CarrierDelay) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR WheelsOff NOT IN (1009, 924) OR DestStateFips BETWEEN 44 AND 41 GROUP BY OriginAirportSeqID, Dest, `Month` LIMIT 3"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 381 AND 224 LIMIT 1"}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE DestAirportSeqID IN (1320402, 1106702, 1099402, 1396403) AND Origin NOT IN ('GCC', 'TUS', 'MOT', 'DAY') OR FirstDepTime BETWEEN 1639 AND 1940 LIMIT 27"}
-{"sql":"SELECT MAX(\"Year\"), SUM(OriginAirportSeqID) FROM mytable LIMIT 25","hsqls":["SELECT MAX(Year), SUM(OriginAirportSeqID) FROM mytable LIMIT 25"]}
+{"sql":"SELECT MAX(\"Year\"), SUM(OriginAirportSeqID) FROM mytable LIMIT 25","hsqls":["SELECT MAX(`Year`), SUM(OriginAirportSeqID) FROM mytable LIMIT 25"]}
 {"sql":"SELECT ArrivalDelayGroups, MIN(DepDel15), MAX(DestCityMarketID), COUNT(TailNum) FROM mytable WHERE DestAirportSeqID NOT IN (1114603, 1114002) GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 24","hsqls":["SELECT ArrivalDelayGroups, MIN(DepDel15), MAX(DestCityMarketID), COUNT(TailNum) FROM mytable WHERE DestAirportSeqID NOT IN (1114603, 1114002) GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 24"]}
 {"sql":"SELECT TaxiOut, DepDel15 FROM mytable ORDER BY DivReachedDest, DestStateFips, WheelsOn LIMIT 26"}
-{"sql":"SELECT DepDelay, OriginStateFips, CRSElapsedTime FROM mytable WHERE ArrivalDelayGroups = 5 OR DivLongestGTimes < 9.0 LIMIT 14","hsqls":["SELECT DepDelay, OriginStateFips, CRSElapsedTime FROM mytable WHERE ArrivalDelayGroups = 5 OR (DivLongestGTimes__MV0 < 9.0 OR DivLongestGTimes__MV1 < 9.0 OR DivLongestGTimes__MV2 < 9.0 OR DivLongestGTimes__MV3 < 9.0 OR DivLongestGTimes__MV4 < 9.0) LIMIT 10000"]}
+{"sql":"SELECT DepDelay, OriginStateFips, CRSElapsedTime FROM mytable WHERE ArrivalDelayGroups = 5 OR DivLongestGTimes < 9.0 LIMIT 14","hsqls":["SELECT DepDelay, OriginStateFips, CRSElapsedTime FROM mytable WHERE ArrivalDelayGroups = 5 OR (DivLongestGTimes[1] < 9.0 OR DivLongestGTimes[2] < 9.0 OR DivLongestGTimes[3] < 9.0 OR DivLongestGTimes[4] < 9.0 OR DivLongestGTimes[5] < 9.0) LIMIT 10000"]}
 {"sql":"SELECT DivActualElapsedTime, DayOfWeek, MIN(DestAirportID), COUNT(DivActualElapsedTime), COUNT(DivDistance) FROM mytable WHERE FlightDate IN ('2014-01-20', '2014-01-11', '2014-01-01', '2014-01-08') AND ActualElapsedTime BETWEEN 70 AND 245 AND Carrier <> 'DL' GROUP BY DivActualElapsedTime, DayOfWeek  ORDER BY DivActualElapsedTime, DayOfWeek LIMIT 19","hsqls":["SELECT DivActualElapsedTime, DayOfWeek, MIN(DestAirportID), COUNT(DivActualElapsedTime), COUNT(DivDistance) FROM mytable WHERE FlightDate IN ('2014-01-20', '2014-01-11', '2014-01-01', '2014-01-08') AND ActualElapsedTime BETWEEN 70 AND 245 AND Carrier <> 'DL' GROUP BY DivActualElapsedTime, DayOfWeek  ORDER BY DivActualElapsedTime, DayOfWeek LIMIT 19"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE DivAirportLandings IN (1) ORDER BY Flights, NASDelay LIMIT 19"}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE LateAircraftDelay > 25 AND ArrivalDelayGroups > 0 ORDER BY DivArrDelay LIMIT 4"}
-{"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE \"Year\" <> 2014 AND OriginCityName NOT IN ('Chico, CA', 'San Jose, CA', 'Bangor, ME') LIMIT 28","hsqls":["SELECT SUM(TotalAddGTime) FROM mytable WHERE Year <> 2014 AND OriginCityName NOT IN ('Chico, CA', 'San Jose, CA', 'Bangor, ME') LIMIT 28"]}
-{"sql":"SELECT SUM(TotalAddGTime), COUNT(DistanceGroup) FROM mytable WHERE DivAirportIDs BETWEEN 13851 AND 11278 LIMIT 22","hsqls":["SELECT SUM(TotalAddGTime), COUNT(DistanceGroup)  FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 13851 AND 11278 OR DivAirportIDs__MV1 BETWEEN 13851 AND 11278 OR DivAirportIDs__MV2 BETWEEN 13851 AND 11278 OR DivAirportIDs__MV3 BETWEEN 13851 AND 11278 OR DivAirportIDs__MV4 BETWEEN 13851 AND 11278) LIMIT 10000"]}
+{"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE \"Year\" <> 2014 AND OriginCityName NOT IN ('Chico, CA', 'San Jose, CA', 'Bangor, ME') LIMIT 28","hsqls":["SELECT SUM(TotalAddGTime) FROM mytable WHERE `Year` <> 2014 AND OriginCityName NOT IN ('Chico, CA', 'San Jose, CA', 'Bangor, ME') LIMIT 28"]}
+{"sql":"SELECT SUM(TotalAddGTime), COUNT(DistanceGroup) FROM mytable WHERE DivAirportIDs BETWEEN 13851 AND 11278 LIMIT 22","hsqls":["SELECT SUM(TotalAddGTime), COUNT(DistanceGroup)  FROM mytable WHERE (DivAirportIDs[1] BETWEEN 13851 AND 11278 OR DivAirportIDs[2] BETWEEN 13851 AND 11278 OR DivAirportIDs[3] BETWEEN 13851 AND 11278 OR DivAirportIDs[4] BETWEEN 13851 AND 11278 OR DivAirportIDs[5] BETWEEN 13851 AND 11278) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginAirportID NOT IN (11042, 13871, 14262, 13487, 11525) LIMIT 12"}
-{"sql":"SELECT WheelsOff, DivLongestGTimes FROM mytable WHERE DestStateFips < 48 AND TailNum NOT IN ('N901DA', 'N16149', 'N64809', 'N603MQ', 'N37298') OR DepartureDelayGroups < -2 ORDER BY Distance, DayofMonth LIMIT 29","hsqls":["SELECT WheelsOff, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE DestStateFips < 48 AND TailNum NOT IN ('N901DA', 'N16149', 'N64809', 'N603MQ', 'N37298') OR DepartureDelayGroups < -2 ORDER BY Distance, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT Distance, DestStateFips, OriginCityName, MIN(OriginWac), AVG(LateAircraftDelay), AVG(AirlineID) FROM mytable WHERE OriginStateName BETWEEN 'Oklahoma' AND 'Kansas' AND DivWheelsOns BETWEEN 1213 AND 811 GROUP BY Distance, DestStateFips, OriginCityName LIMIT 28","hsqls":["SELECT Distance, DestStateFips, OriginCityName, MIN(OriginWac), AVG(LateAircraftDelay), AVG(AirlineID) FROM mytable WHERE OriginStateName BETWEEN 'Oklahoma' AND 'Kansas' AND (DivWheelsOns__MV0 BETWEEN 1213 AND 811 OR DivWheelsOns__MV1 BETWEEN 1213 AND 811 OR DivWheelsOns__MV2 BETWEEN 1213 AND 811 OR DivWheelsOns__MV3 BETWEEN 1213 AND 811 OR DivWheelsOns__MV4 BETWEEN 1213 AND 811) GROUP BY Distance, DestStateFips, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivLongestGTimes FROM mytable WHERE DestStateFips < 48 AND TailNum NOT IN ('N901DA', 'N16149', 'N64809', 'N603MQ', 'N37298') OR DepartureDelayGroups < -2 ORDER BY Distance, DayofMonth LIMIT 29","hsqls":["SELECT WheelsOff, DivLongestGTimes FROM mytable WHERE DestStateFips < 48 AND TailNum NOT IN ('N901DA', 'N16149', 'N64809', 'N603MQ', 'N37298') OR DepartureDelayGroups < -2 ORDER BY Distance, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Distance, DestStateFips, OriginCityName, MIN(OriginWac), AVG(LateAircraftDelay), AVG(AirlineID) FROM mytable WHERE OriginStateName BETWEEN 'Oklahoma' AND 'Kansas' AND DivWheelsOns BETWEEN 1213 AND 811 GROUP BY Distance, DestStateFips, OriginCityName LIMIT 28","hsqls":["SELECT Distance, DestStateFips, OriginCityName, MIN(OriginWac), AVG(LateAircraftDelay), AVG(AirlineID) FROM mytable WHERE OriginStateName BETWEEN 'Oklahoma' AND 'Kansas' AND (DivWheelsOns[1] BETWEEN 1213 AND 811 OR DivWheelsOns[2] BETWEEN 1213 AND 811 OR DivWheelsOns[3] BETWEEN 1213 AND 811 OR DivWheelsOns[4] BETWEEN 1213 AND 811 OR DivWheelsOns[5] BETWEEN 1213 AND 811) GROUP BY Distance, DestStateFips, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DivDistance, WeatherDelay FROM mytable WHERE TailNum IN ('N923EV', 'N326NB', 'N709UW', 'N5EVAA', 'N467UA') OR Diverted BETWEEN 0 AND 0 AND DayofMonth NOT IN (2, 22, 12) LIMIT 26"}
 {"sql":"SELECT MAX(ArrivalDelayGroups), MIN(ArrTime) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 1 OR AirlineID <= 19805 LIMIT 28"}
-{"sql":"SELECT DestWac, NASDelay FROM mytable WHERE DivTotalGTimes IN (30, 61, 29) OR DivAirports BETWEEN 'CLE' AND 'DFW' AND DivActualElapsedTime NOT IN (375, 362) ORDER BY Diverted, AirTime LIMIT 3","hsqls":["SELECT DestWac, NASDelay FROM mytable WHERE (DivTotalGTimes__MV0 IN (30, 61, 29) OR DivTotalGTimes__MV1 IN (30, 61, 29) OR DivTotalGTimes__MV2 IN (30, 61, 29) OR DivTotalGTimes__MV3 IN (30, 61, 29) OR DivTotalGTimes__MV4 IN (30, 61, 29)) OR (DivAirports__MV0 BETWEEN 'CLE' AND 'DFW' OR DivAirports__MV1 BETWEEN 'CLE' AND 'DFW' OR DivAirports__MV2 BETWEEN 'CLE' AND 'DFW' OR DivAirports__MV3 BETWEEN 'CLE' AND 'DFW' OR DivAirports__MV4 BETWEEN 'CLE' AND 'DFW') AND DivActualElapsedTime NOT IN (375, 362) ORDER BY Diverted, AirTime LIMIT 10000"]}
+{"sql":"SELECT DestWac, NASDelay FROM mytable WHERE DivTotalGTimes IN (30, 61, 29) OR DivAirports BETWEEN 'CLE' AND 'DFW' AND DivActualElapsedTime NOT IN (375, 362) ORDER BY Diverted, AirTime LIMIT 3","hsqls":["SELECT DestWac, NASDelay FROM mytable WHERE (DivTotalGTimes[1] IN (30, 61, 29) OR DivTotalGTimes[2] IN (30, 61, 29) OR DivTotalGTimes[3] IN (30, 61, 29) OR DivTotalGTimes[4] IN (30, 61, 29) OR DivTotalGTimes[5] IN (30, 61, 29)) OR (DivAirports[1] BETWEEN 'CLE' AND 'DFW' OR DivAirports[2] BETWEEN 'CLE' AND 'DFW' OR DivAirports[3] BETWEEN 'CLE' AND 'DFW' OR DivAirports[4] BETWEEN 'CLE' AND 'DFW' OR DivAirports[5] BETWEEN 'CLE' AND 'DFW') AND DivActualElapsedTime NOT IN (375, 362) ORDER BY Diverted, AirTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(DestAirportID) FROM mytable WHERE CRSArrTime IN (1717, 1754, 1135, 938, 1023) OR DepartureDelayGroups BETWEEN 10 AND 4 LIMIT 13"}
-{"sql":"SELECT OriginAirportSeqID, DistanceGroup, DivAirportLandings, SUM(ArrivalDelayGroups) FROM mytable WHERE DestStateFips BETWEEN 36 AND 27 AND Origin IN ('SBA', 'MSN', 'DRO') AND DivAirportIDs IN (10140, 13476, 11471, 13891, 10728) GROUP BY OriginAirportSeqID, DistanceGroup, DivAirportLandings LIMIT 29","hsqls":["SELECT OriginAirportSeqID, DistanceGroup, DivAirportLandings, SUM(ArrivalDelayGroups) FROM mytable WHERE DestStateFips BETWEEN 36 AND 27 AND Origin IN ('SBA', 'MSN', 'DRO') AND (DivAirportIDs__MV0 IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs__MV1 IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs__MV2 IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs__MV3 IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs__MV4 IN (10140, 13476, 11471, 13891, 10728)) GROUP BY OriginAirportSeqID, DistanceGroup, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DistanceGroup, DivAirportLandings, SUM(ArrivalDelayGroups) FROM mytable WHERE DestStateFips BETWEEN 36 AND 27 AND Origin IN ('SBA', 'MSN', 'DRO') AND DivAirportIDs IN (10140, 13476, 11471, 13891, 10728) GROUP BY OriginAirportSeqID, DistanceGroup, DivAirportLandings LIMIT 29","hsqls":["SELECT OriginAirportSeqID, DistanceGroup, DivAirportLandings, SUM(ArrivalDelayGroups) FROM mytable WHERE DestStateFips BETWEEN 36 AND 27 AND Origin IN ('SBA', 'MSN', 'DRO') AND (DivAirportIDs[1] IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs[2] IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs[3] IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs[4] IN (10140, 13476, 11471, 13891, 10728) OR DivAirportIDs[5] IN (10140, 13476, 11471, 13891, 10728)) GROUP BY OriginAirportSeqID, DistanceGroup, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Distance, AVG(DaysSinceEpoch), SUM(ArrTime) FROM mytable GROUP BY TaxiOut, Distance  ORDER BY TaxiOut, Distance LIMIT 26","hsqls":["SELECT TaxiOut, Distance, AVG(DaysSinceEpoch), SUM(ArrTime) FROM mytable GROUP BY TaxiOut, Distance  ORDER BY TaxiOut, Distance LIMIT 26"]}
 {"sql":"SELECT OriginWac, CRSDepTime, COUNT(*) FROM mytable WHERE SecurityDelay > 10 AND DestStateFips NOT IN (10, 32, 31, 13, 12) GROUP BY OriginWac, CRSDepTime  ORDER BY OriginWac, CRSDepTime LIMIT 20","hsqls":["SELECT OriginWac, CRSDepTime, COUNT(*) FROM mytable WHERE SecurityDelay > 10 AND DestStateFips NOT IN (10, 32, 31, 13, 12) GROUP BY OriginWac, CRSDepTime  ORDER BY OriginWac, CRSDepTime LIMIT 20"]}
 {"sql":"SELECT DepTimeBlk, ArrDelay FROM mytable WHERE DestCityMarketID NOT IN (30325, 33256, 33024, 31049) ORDER BY DivActualElapsedTime LIMIT 19"}
@@ -2149,32 +2149,32 @@
 {"sql":"SELECT TaxiOut, OriginAirportID, MIN(DivAirportLandings) FROM mytable WHERE DestAirportSeqID > 1334205 GROUP BY TaxiOut, OriginAirportID  ORDER BY TaxiOut, OriginAirportID LIMIT 10","hsqls":["SELECT TaxiOut, OriginAirportID, MIN(DivAirportLandings) FROM mytable WHERE DestAirportSeqID > 1334205 GROUP BY TaxiOut, OriginAirportID  ORDER BY TaxiOut, OriginAirportID LIMIT 10"]}
 {"sql":"SELECT DestState, COUNT(*) FROM mytable WHERE DepDelayMinutes IN (108.0, 58.0, 21.0, 375.0, 153.0) OR OriginStateName NOT IN ('Massachusetts', 'South Dakota') AND CRSElapsedTime = 352 GROUP BY DestState  ORDER BY DestState LIMIT 17","hsqls":["SELECT DestState, COUNT(*) FROM mytable WHERE DepDelayMinutes IN (108.0, 58.0, 21.0, 375.0, 153.0) OR OriginStateName NOT IN ('Massachusetts', 'South Dakota') AND CRSElapsedTime = 352 GROUP BY DestState  ORDER BY DestState LIMIT 17"]}
 {"sql":"SELECT OriginStateName FROM mytable WHERE DaysSinceEpoch NOT IN (16099, 16077, 16079) OR DestCityMarketID >= 32016 OR WeatherDelay BETWEEN 98 AND 237 ORDER BY DepTimeBlk LIMIT 11"}
-{"sql":"SELECT AVG(DayOfWeek), MAX(Diverted) FROM mytable WHERE DivAirportSeqIDs >= 1281902 OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 18","hsqls":["SELECT AVG(DayOfWeek), MAX(Diverted)  FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1281902 OR DivAirportSeqIDs__MV1 >= 1281902 OR DivAirportSeqIDs__MV2 >= 1281902 OR DivAirportSeqIDs__MV3 >= 1281902 OR DivAirportSeqIDs__MV4 >= 1281902) OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 10000"]}
-{"sql":"SELECT OriginState, DivAirportIDs FROM mytable WHERE ArrDelayMinutes BETWEEN 190.0 AND 320.0 AND Dest <= 'CMH' ORDER BY Diverted, DayOfWeek LIMIT 10","hsqls":["SELECT OriginState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE ArrDelayMinutes BETWEEN 190.0 AND 320.0 AND Dest <= 'CMH' ORDER BY Diverted, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, FirstDepTime, ArrDelay, COUNT(*) FROM mytable WHERE DivAirportIDs >= 13158 GROUP BY TaxiOut, FirstDepTime, ArrDelay LIMIT 29","hsqls":["SELECT TaxiOut, FirstDepTime, ArrDelay, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 >= 13158 OR DivAirportIDs__MV1 >= 13158 OR DivAirportIDs__MV2 >= 13158 OR DivAirportIDs__MV3 >= 13158 OR DivAirportIDs__MV4 >= 13158) GROUP BY TaxiOut, FirstDepTime, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT AVG(DayOfWeek), MAX(Diverted) FROM mytable WHERE DivAirportSeqIDs >= 1281902 OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 18","hsqls":["SELECT AVG(DayOfWeek), MAX(Diverted)  FROM mytable WHERE (DivAirportSeqIDs[1] >= 1281902 OR DivAirportSeqIDs[2] >= 1281902 OR DivAirportSeqIDs[3] >= 1281902 OR DivAirportSeqIDs[4] >= 1281902 OR DivAirportSeqIDs[5] >= 1281902) OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirportIDs FROM mytable WHERE ArrDelayMinutes BETWEEN 190.0 AND 320.0 AND Dest <= 'CMH' ORDER BY Diverted, DayOfWeek LIMIT 10","hsqls":["SELECT OriginState, DivAirportIDs FROM mytable WHERE ArrDelayMinutes BETWEEN 190.0 AND 320.0 AND Dest <= 'CMH' ORDER BY Diverted, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, FirstDepTime, ArrDelay, COUNT(*) FROM mytable WHERE DivAirportIDs >= 13158 GROUP BY TaxiOut, FirstDepTime, ArrDelay LIMIT 29","hsqls":["SELECT TaxiOut, FirstDepTime, ArrDelay, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] >= 13158 OR DivAirportIDs[2] >= 13158 OR DivAirportIDs[3] >= 13158 OR DivAirportIDs[4] >= 13158 OR DivAirportIDs[5] >= 13158) GROUP BY TaxiOut, FirstDepTime, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginState, AVG(DestAirportSeqID), MIN(FlightNum) FROM mytable WHERE ArrDelay <> 165.0 AND DayOfWeek >= 4 GROUP BY OriginState  ORDER BY OriginState LIMIT 1","hsqls":["SELECT OriginState, AVG(DestAirportSeqID), MIN(FlightNum) FROM mytable WHERE ArrDelay <> 165.0 AND DayOfWeek >= 4 GROUP BY OriginState  ORDER BY OriginState LIMIT 1"]}
-{"sql":"SELECT CRSElapsedTime, COUNT(Diverted), AVG(WheelsOn), MAX(OriginStateFips) FROM mytable WHERE NASDelay BETWEEN 146 AND 150 AND DivWheelsOns = 1558 OR NASDelay < 29 GROUP BY CRSElapsedTime LIMIT 21","hsqls":["SELECT CRSElapsedTime, COUNT(Diverted), AVG(WheelsOn), MAX(OriginStateFips) FROM mytable WHERE NASDelay BETWEEN 146 AND 150 AND (DivWheelsOns__MV0 = 1558 OR DivWheelsOns__MV1 = 1558 OR DivWheelsOns__MV2 = 1558 OR DivWheelsOns__MV3 = 1558 OR DivWheelsOns__MV4 = 1558) OR NASDelay < 29 GROUP BY CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT CRSElapsedTime, COUNT(Diverted), AVG(WheelsOn), MAX(OriginStateFips) FROM mytable WHERE NASDelay BETWEEN 146 AND 150 AND DivWheelsOns = 1558 OR NASDelay < 29 GROUP BY CRSElapsedTime LIMIT 21","hsqls":["SELECT CRSElapsedTime, COUNT(Diverted), AVG(WheelsOn), MAX(OriginStateFips) FROM mytable WHERE NASDelay BETWEEN 146 AND 150 AND (DivWheelsOns[1] = 1558 OR DivWheelsOns[2] = 1558 OR DivWheelsOns[3] = 1558 OR DivWheelsOns[4] = 1558 OR DivWheelsOns[5] = 1558) OR NASDelay < 29 GROUP BY CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DestStateFips, DayOfWeek FROM mytable WHERE DivActualElapsedTime BETWEEN 231 AND 989 ORDER BY DepDelay LIMIT 24"}
-{"sql":"SELECT DivTailNums, ArrDel15 FROM mytable WHERE OriginCityMarketID IN (34986, 34113, 30141, 31517, 30476) AND DivAirports BETWEEN 'SGF' AND 'SPS' ORDER BY TotalAddGTime, DestStateName LIMIT 9","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, ArrDel15 FROM mytable WHERE OriginCityMarketID IN (34986, 34113, 30141, 31517, 30476) AND (DivAirports__MV0 BETWEEN 'SGF' AND 'SPS' OR DivAirports__MV1 BETWEEN 'SGF' AND 'SPS' OR DivAirports__MV2 BETWEEN 'SGF' AND 'SPS' OR DivAirports__MV3 BETWEEN 'SGF' AND 'SPS' OR DivAirports__MV4 BETWEEN 'SGF' AND 'SPS') ORDER BY TotalAddGTime, DestStateName LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, NASDelay FROM mytable WHERE WheelsOff > 1554 LIMIT 20","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, NASDelay FROM mytable WHERE WheelsOff > 1554 LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, ArrDel15 FROM mytable WHERE OriginCityMarketID IN (34986, 34113, 30141, 31517, 30476) AND DivAirports BETWEEN 'SGF' AND 'SPS' ORDER BY TotalAddGTime, DestStateName LIMIT 9","hsqls":["SELECT DivTailNums, ArrDel15 FROM mytable WHERE OriginCityMarketID IN (34986, 34113, 30141, 31517, 30476) AND (DivAirports[1] BETWEEN 'SGF' AND 'SPS' OR DivAirports[2] BETWEEN 'SGF' AND 'SPS' OR DivAirports[3] BETWEEN 'SGF' AND 'SPS' OR DivAirports[4] BETWEEN 'SGF' AND 'SPS' OR DivAirports[5] BETWEEN 'SGF' AND 'SPS') ORDER BY TotalAddGTime, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, NASDelay FROM mytable WHERE WheelsOff > 1554 LIMIT 20","hsqls":["SELECT DivWheelsOns, NASDelay FROM mytable WHERE WheelsOff > 1554 LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, ArrDel15, AVG(DestStateFips), MAX(DayofMonth) FROM mytable WHERE ArrivalDelayGroups IN (10, -9999) OR WheelsOn NOT IN (1133, 1903, 1855) GROUP BY LateAircraftDelay, ArrDel15  ORDER BY LateAircraftDelay, ArrDel15 LIMIT 2","hsqls":["SELECT LateAircraftDelay, ArrDel15, AVG(DestStateFips), MAX(DayofMonth) FROM mytable WHERE ArrivalDelayGroups IN (10, -9999) OR WheelsOn NOT IN (1133, 1903, 1855) GROUP BY LateAircraftDelay, ArrDel15  ORDER BY LateAircraftDelay, ArrDel15 LIMIT 2"]}
 {"sql":"SELECT OriginAirportSeqID, TaxiIn, ArrivalDelayGroups FROM mytable WHERE OriginStateName BETWEEN 'Kansas' AND 'Louisiana' ORDER BY TailNum, AirlineID LIMIT 26"}
 {"sql":"SELECT ArrDel15, OriginWac, ArrivalDelayGroups FROM mytable ORDER BY DestState, TailNum, OriginAirportID LIMIT 5"}
-{"sql":"SELECT OriginCityName, CancellationCode FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DestState <= 'KY' AND OriginAirportID BETWEEN 10185 AND 12819 LIMIT 5","hsqls":["SELECT OriginCityName, CancellationCode FROM mytable WHERE Month BETWEEN 1 AND 1 AND DestState <= 'KY' AND OriginAirportID BETWEEN 10185 AND 12819 LIMIT 5"]}
+{"sql":"SELECT OriginCityName, CancellationCode FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DestState <= 'KY' AND OriginAirportID BETWEEN 10185 AND 12819 LIMIT 5","hsqls":["SELECT OriginCityName, CancellationCode FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND DestState <= 'KY' AND OriginAirportID BETWEEN 10185 AND 12819 LIMIT 5"]}
 {"sql":"SELECT Carrier FROM mytable ORDER BY DestStateName, TailNum LIMIT 23"}
-{"sql":"SELECT DepDelay FROM mytable WHERE DepDelayMinutes NOT IN (104.0) AND TaxiOut BETWEEN 70 AND 47 AND DivLongestGTimes IN (36.0, 112.0, 29.0, 139.0) ORDER BY DestAirportSeqID, CancellationCode, AirTime LIMIT 11","hsqls":["SELECT DepDelay FROM mytable WHERE DepDelayMinutes NOT IN (104.0) AND TaxiOut BETWEEN 70 AND 47 AND (DivLongestGTimes__MV0 IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes__MV1 IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes__MV2 IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes__MV3 IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes__MV4 IN (36.0, 112.0, 29.0, 139.0)) ORDER BY DestAirportSeqID, CancellationCode, AirTime LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DivAirportLandings, DivTotalGTimes FROM mytable WHERE CancellationCode = 'noodles' OR TaxiOut IN (78, 25, 37, 12) ORDER BY ArrDelayMinutes, ArrDel15, OriginStateName LIMIT 5","hsqls":["SELECT WheelsOff, DivAirportLandings, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CancellationCode = 'noodles' OR TaxiOut IN (78, 25, 37, 12) ORDER BY ArrDelayMinutes, ArrDel15, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT Diverted, LateAircraftDelay, DestStateFips, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE DivArrDelay BETWEEN 277 AND 93 AND \"Month\" = 1 OR Flights BETWEEN 1 AND 1 GROUP BY Diverted, LateAircraftDelay, DestStateFips LIMIT 10","hsqls":["SELECT Diverted, LateAircraftDelay, DestStateFips, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE DivArrDelay BETWEEN 277 AND 93 AND Month = 1 OR Flights BETWEEN 1 AND 1 GROUP BY Diverted, LateAircraftDelay, DestStateFips LIMIT 10"]}
+{"sql":"SELECT DepDelay FROM mytable WHERE DepDelayMinutes NOT IN (104.0) AND TaxiOut BETWEEN 70 AND 47 AND DivLongestGTimes IN (36.0, 112.0, 29.0, 139.0) ORDER BY DestAirportSeqID, CancellationCode, AirTime LIMIT 11","hsqls":["SELECT DepDelay FROM mytable WHERE DepDelayMinutes NOT IN (104.0) AND TaxiOut BETWEEN 70 AND 47 AND (DivLongestGTimes[1] IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes[2] IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes[3] IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes[4] IN (36.0, 112.0, 29.0, 139.0) OR DivLongestGTimes[5] IN (36.0, 112.0, 29.0, 139.0)) ORDER BY DestAirportSeqID, CancellationCode, AirTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivAirportLandings, DivTotalGTimes FROM mytable WHERE CancellationCode = 'noodles' OR TaxiOut IN (78, 25, 37, 12) ORDER BY ArrDelayMinutes, ArrDel15, OriginStateName LIMIT 5","hsqls":["SELECT WheelsOff, DivAirportLandings, DivTotalGTimes FROM mytable WHERE CancellationCode = 'noodles' OR TaxiOut IN (78, 25, 37, 12) ORDER BY ArrDelayMinutes, ArrDel15, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT Diverted, LateAircraftDelay, DestStateFips, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE DivArrDelay BETWEEN 277 AND 93 AND \"Month\" = 1 OR Flights BETWEEN 1 AND 1 GROUP BY Diverted, LateAircraftDelay, DestStateFips LIMIT 10","hsqls":["SELECT Diverted, LateAircraftDelay, DestStateFips, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE DivArrDelay BETWEEN 277 AND 93 AND `Month` = 1 OR Flights BETWEEN 1 AND 1 GROUP BY Diverted, LateAircraftDelay, DestStateFips LIMIT 10"]}
 {"sql":"SELECT OriginCityMarketID, DayofMonth FROM mytable WHERE Dest BETWEEN 'MOD' AND 'RNO' AND DepartureDelayGroups BETWEEN 10 AND 12 LIMIT 14"}
 {"sql":"SELECT ArrTime, DivAirportLandings, COUNT(CRSArrTime) FROM mytable GROUP BY ArrTime, DivAirportLandings","hsqls":["SELECT ArrTime, DivAirportLandings, COUNT(CRSArrTime) FROM mytable GROUP BY ArrTime, DivAirportLandings"]}
 {"sql":"SELECT Flights FROM mytable WHERE NASDelay IN (30, 107) AND DestWac BETWEEN 81 AND 64 AND DepartureDelayGroups >= -9999 ORDER BY DestCityMarketID, CRSDepTime, DayOfWeek LIMIT 10"}
 {"sql":"SELECT LateAircraftDelay, Dest FROM mytable WHERE OriginStateFips BETWEEN 20 AND 47 AND Flights IN (1) ORDER BY TaxiOut, \"Year\", Diverted LIMIT 5","hsqls":["SELECT LateAircraftDelay, Dest FROM mytable WHERE OriginStateFips BETWEEN 20 AND 47 AND Flights IN (1) ORDER BY TaxiOut, Year, Diverted LIMIT 5"]}
-{"sql":"SELECT DestCityName, AirTime, MIN(Flights), SUM(TaxiIn) FROM mytable WHERE TailNum BETWEEN 'N3757D' AND 'N551UA' OR DivWheelsOffs IN (1110, 2350, 1151) GROUP BY DestCityName, AirTime LIMIT 13","hsqls":["SELECT DestCityName, AirTime, MIN(Flights), SUM(TaxiIn) FROM mytable WHERE TailNum BETWEEN 'N3757D' AND 'N551UA' OR (DivWheelsOffs__MV0 IN (1110, 2350, 1151) OR DivWheelsOffs__MV1 IN (1110, 2350, 1151) OR DivWheelsOffs__MV2 IN (1110, 2350, 1151) OR DivWheelsOffs__MV3 IN (1110, 2350, 1151) OR DivWheelsOffs__MV4 IN (1110, 2350, 1151)) GROUP BY DestCityName, AirTime LIMIT 10000"]}
+{"sql":"SELECT DestCityName, AirTime, MIN(Flights), SUM(TaxiIn) FROM mytable WHERE TailNum BETWEEN 'N3757D' AND 'N551UA' OR DivWheelsOffs IN (1110, 2350, 1151) GROUP BY DestCityName, AirTime LIMIT 13","hsqls":["SELECT DestCityName, AirTime, MIN(Flights), SUM(TaxiIn) FROM mytable WHERE TailNum BETWEEN 'N3757D' AND 'N551UA' OR (DivWheelsOffs[1] IN (1110, 2350, 1151) OR DivWheelsOffs[2] IN (1110, 2350, 1151) OR DivWheelsOffs[3] IN (1110, 2350, 1151) OR DivWheelsOffs[4] IN (1110, 2350, 1151) OR DivWheelsOffs[5] IN (1110, 2350, 1151)) GROUP BY DestCityName, AirTime LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, MIN(CRSElapsedTime) FROM mytable WHERE Diverted = 0 OR DivArrDelay NOT IN (183, 472, 119) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 1","hsqls":["SELECT ArrDelay, MIN(CRSElapsedTime) FROM mytable WHERE Diverted = 0 OR DivArrDelay NOT IN (183, 472, 119) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 1"]}
 {"sql":"SELECT DestCityName, ArrDel15, DivArrDelay FROM mytable WHERE AirlineID NOT IN (20304, 19790, 19805) AND FlightDate = '2014-01-09' ORDER BY ArrTime, NASDelay, AirlineID LIMIT 10"}
 {"sql":"SELECT DistanceGroup, WeatherDelay, DepTime, SUM(ArrDelay), AVG(Distance), AVG(DivArrDelay) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) GROUP BY DistanceGroup, WeatherDelay, DepTime  ORDER BY DistanceGroup, WeatherDelay, DepTime LIMIT 22","hsqls":["SELECT DistanceGroup, WeatherDelay, DepTime, SUM(ArrDelay), AVG(Distance), AVG(DivArrDelay) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) GROUP BY DistanceGroup, WeatherDelay, DepTime  ORDER BY DistanceGroup, WeatherDelay, DepTime LIMIT 22"]}
 {"sql":"SELECT FlightDate, COUNT(FirstDepTime), MIN(DaysSinceEpoch), COUNT(OriginState) FROM mytable GROUP BY FlightDate  ORDER BY FlightDate LIMIT 23","hsqls":["SELECT FlightDate, COUNT(FirstDepTime), MIN(DaysSinceEpoch), COUNT(OriginState) FROM mytable GROUP BY FlightDate  ORDER BY FlightDate LIMIT 23"]}
-{"sql":"SELECT DivWheelsOffs, OriginWac FROM mytable WHERE Distance NOT IN (1149, 700, 313, 552) OR DaysSinceEpoch = 16078 OR ArrTime BETWEEN 1146 AND 1932 ORDER BY DepTime, Dest, DestStateName LIMIT 8","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, OriginWac FROM mytable WHERE Distance NOT IN (1149, 700, 313, 552) OR DaysSinceEpoch = 16078 OR ArrTime BETWEEN 1146 AND 1932 ORDER BY DepTime, Dest, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, OriginWac FROM mytable WHERE Distance NOT IN (1149, 700, 313, 552) OR DaysSinceEpoch = 16078 OR ArrTime BETWEEN 1146 AND 1932 ORDER BY DepTime, Dest, DestStateName LIMIT 8","hsqls":["SELECT DivWheelsOffs, OriginWac FROM mytable WHERE Distance NOT IN (1149, 700, 313, 552) OR DaysSinceEpoch = 16078 OR ArrTime BETWEEN 1146 AND 1932 ORDER BY DepTime, Dest, DestStateName LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTime > 818 LIMIT 13"}
 {"sql":"SELECT OriginState, ActualElapsedTime, DestAirportID FROM mytable ORDER BY DepDelayMinutes, TotalAddGTime, CancellationCode LIMIT 10"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportLandings = 1 AND DivActualElapsedTime BETWEEN 284 AND 234 LIMIT 11"}
@@ -2185,57 +2185,57 @@
 {"sql":"SELECT DepTime, DepDel15 FROM mytable WHERE DivArrDelay BETWEEN 378 AND 289 AND DestStateFips NOT IN (31, 33) ORDER BY DestAirportSeqID LIMIT 19"}
 {"sql":"SELECT DivDistance, OriginCityMarketID, DivAirportLandings, SUM(CRSDepTime) FROM mytable WHERE FlightDate >= '2014-01-25' OR Diverted <= 1 GROUP BY DivDistance, OriginCityMarketID, DivAirportLandings  ORDER BY DivDistance, OriginCityMarketID, DivAirportLandings LIMIT 23","hsqls":["SELECT DivDistance, OriginCityMarketID, DivAirportLandings, SUM(CRSDepTime) FROM mytable WHERE FlightDate >= '2014-01-25' OR Diverted <= 1 GROUP BY DivDistance, OriginCityMarketID, DivAirportLandings  ORDER BY DivDistance, OriginCityMarketID, DivAirportLandings LIMIT 23"]}
 {"sql":"SELECT DestAirportSeqID, ArrDelayMinutes, DestStateName FROM mytable ORDER BY CarrierDelay, Origin, DivAirportLandings LIMIT 5"}
-{"sql":"SELECT AVG(TaxiIn), SUM(DestWac), AVG(DivAirportLandings) FROM mytable WHERE DivWheelsOffs BETWEEN 1217 AND 1849 OR DivActualElapsedTime BETWEEN 350 AND 399 OR DestAirportID BETWEEN 12992 AND 10666 LIMIT 28","hsqls":["SELECT AVG(TaxiIn), SUM(DestWac), AVG(DivAirportLandings)  FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1217 AND 1849 OR DivWheelsOffs__MV1 BETWEEN 1217 AND 1849 OR DivWheelsOffs__MV2 BETWEEN 1217 AND 1849 OR DivWheelsOffs__MV3 BETWEEN 1217 AND 1849 OR DivWheelsOffs__MV4 BETWEEN 1217 AND 1849) OR DivActualElapsedTime BETWEEN 350 AND 399 OR DestAirportID BETWEEN 12992 AND 10666 LIMIT 10000"]}
+{"sql":"SELECT AVG(TaxiIn), SUM(DestWac), AVG(DivAirportLandings) FROM mytable WHERE DivWheelsOffs BETWEEN 1217 AND 1849 OR DivActualElapsedTime BETWEEN 350 AND 399 OR DestAirportID BETWEEN 12992 AND 10666 LIMIT 28","hsqls":["SELECT AVG(TaxiIn), SUM(DestWac), AVG(DivAirportLandings)  FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1217 AND 1849 OR DivWheelsOffs[2] BETWEEN 1217 AND 1849 OR DivWheelsOffs[3] BETWEEN 1217 AND 1849 OR DivWheelsOffs[4] BETWEEN 1217 AND 1849 OR DivWheelsOffs[5] BETWEEN 1217 AND 1849) OR DivActualElapsedTime BETWEEN 350 AND 399 OR DestAirportID BETWEEN 12992 AND 10666 LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE ActualElapsedTime = 341"}
 {"sql":"SELECT TaxiOut FROM mytable WHERE ArrTime BETWEEN 1921 AND 2327 LIMIT 23"}
 {"sql":"SELECT OriginCityMarketID, ArrTimeBlk, AirlineID, MAX(DestCityMarketID), MAX(AirTime) FROM mytable GROUP BY OriginCityMarketID, ArrTimeBlk, AirlineID  ORDER BY OriginCityMarketID, ArrTimeBlk, AirlineID LIMIT 15","hsqls":["SELECT OriginCityMarketID, ArrTimeBlk, AirlineID, MAX(DestCityMarketID), MAX(AirTime) FROM mytable GROUP BY OriginCityMarketID, ArrTimeBlk, AirlineID  ORDER BY OriginCityMarketID, ArrTimeBlk, AirlineID LIMIT 15"]}
 {"sql":"SELECT CancellationCode, UniqueCarrier, DivArrDelay FROM mytable WHERE FlightNum IN (5527, 2418, 1305) OR LateAircraftDelay <= 8 ORDER BY Distance, AirlineID LIMIT 10"}
 {"sql":"SELECT DestWac, TailNum, DepDel15 FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 LIMIT 20"}
-{"sql":"SELECT DivAirports, LongestAddGTime, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 31638 AND 35841 ORDER BY \"Year\", OriginStateFips, Origin LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, LongestAddGTime, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 31638 AND 35841 ORDER BY Year, OriginStateFips, Origin LIMIT 10000"]}
+{"sql":"SELECT DivAirports, LongestAddGTime, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 31638 AND 35841 ORDER BY \"Year\", OriginStateFips, Origin LIMIT 10","hsqls":["SELECT DivAirports, LongestAddGTime, DestCityMarketID FROM mytable WHERE DestCityMarketID BETWEEN 31638 AND 35841 ORDER BY Year, OriginStateFips, Origin LIMIT 10000"]}
 {"sql":"SELECT Carrier FROM mytable WHERE ArrDelayMinutes IN (147.0, 88.0, 94.0) AND OriginAirportID IN (14831) OR AirlineID = 19690 ORDER BY ActualElapsedTime LIMIT 13"}
 {"sql":"SELECT ActualElapsedTime, DayofMonth, MIN(CRSElapsedTime) FROM mytable WHERE DestStateName NOT IN ('Colorado') AND DepTimeBlk < '1300-1359' AND DestStateName BETWEEN 'U.S. Virgin Islands' AND 'New Mexico' GROUP BY ActualElapsedTime, DayofMonth  ORDER BY ActualElapsedTime, DayofMonth LIMIT 21","hsqls":["SELECT ActualElapsedTime, DayofMonth, MIN(CRSElapsedTime) FROM mytable WHERE DestStateName NOT IN ('Colorado') AND DepTimeBlk < '1300-1359' AND DestStateName BETWEEN 'U.S. Virgin Islands' AND 'New Mexico' GROUP BY ActualElapsedTime, DayofMonth  ORDER BY ActualElapsedTime, DayofMonth LIMIT 21"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums <= 'N336AA' AND DivAirports IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') LIMIT 19","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums__MV0 <= 'N336AA' OR DivTailNums__MV1 <= 'N336AA' OR DivTailNums__MV2 <= 'N336AA' OR DivTailNums__MV3 <= 'N336AA' OR DivTailNums__MV4 <= 'N336AA') AND (DivAirports__MV0 IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports__MV1 IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports__MV2 IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports__MV3 IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports__MV4 IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA')) LIMIT 10000"]}
-{"sql":"SELECT DivDistance, DepTime, Origin, SUM(DayofMonth) FROM mytable WHERE DivWheelsOns IN (2130) GROUP BY DivDistance, DepTime, Origin LIMIT 7","hsqls":["SELECT DivDistance, DepTime, Origin, SUM(DayofMonth) FROM mytable WHERE (DivWheelsOns__MV0 IN (2130) OR DivWheelsOns__MV1 IN (2130) OR DivWheelsOns__MV2 IN (2130) OR DivWheelsOns__MV3 IN (2130) OR DivWheelsOns__MV4 IN (2130)) GROUP BY DivDistance, DepTime, Origin LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs, DivTotalGTimes FROM mytable WHERE TaxiOut IN (42, 19, 83) OR TotalAddGTime < -9999 AND Flights NOT IN (1) ORDER BY NASDelay LIMIT 7","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE TaxiOut IN (42, 19, 83) OR TotalAddGTime < -9999 AND Flights NOT IN (1) ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums <= 'N336AA' AND DivAirports IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') LIMIT 19","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums[1] <= 'N336AA' OR DivTailNums[2] <= 'N336AA' OR DivTailNums[3] <= 'N336AA' OR DivTailNums[4] <= 'N336AA' OR DivTailNums[5] <= 'N336AA') AND (DivAirports[1] IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports[2] IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports[3] IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports[4] IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA') OR DivAirports[5] IN ('PHL', 'ROA', 'MSY', 'ONT', 'CWA')) LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DepTime, Origin, SUM(DayofMonth) FROM mytable WHERE DivWheelsOns IN (2130) GROUP BY DivDistance, DepTime, Origin LIMIT 7","hsqls":["SELECT DivDistance, DepTime, Origin, SUM(DayofMonth) FROM mytable WHERE (DivWheelsOns[1] IN (2130) OR DivWheelsOns[2] IN (2130) OR DivWheelsOns[3] IN (2130) OR DivWheelsOns[4] IN (2130) OR DivWheelsOns[5] IN (2130)) GROUP BY DivDistance, DepTime, Origin LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, DivTotalGTimes FROM mytable WHERE TaxiOut IN (42, 19, 83) OR TotalAddGTime < -9999 AND Flights NOT IN (1) ORDER BY NASDelay LIMIT 7","hsqls":["SELECT DivAirportIDs, DivTotalGTimes FROM mytable WHERE TaxiOut IN (42, 19, 83) OR TotalAddGTime < -9999 AND Flights NOT IN (1) ORDER BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE SecurityDelay NOT IN (10, 0, 18, 14, -9999) OR ArrTime BETWEEN 1051 AND 604 OR DestWac IN (81) LIMIT 2"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 20"}
 {"sql":"SELECT TailNum, CRSElapsedTime, DayOfWeek FROM mytable ORDER BY LateAircraftDelay, ArrDelay, CRSDepTime LIMIT 27"}
 {"sql":"SELECT ArrTimeBlk FROM mytable ORDER BY NASDelay, DayofMonth, OriginWac LIMIT 27"}
-{"sql":"SELECT DivWheelsOns, CancellationCode, DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 82 AND 73 ORDER BY OriginCityMarketID, OriginCityName LIMIT 1","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, CancellationCode, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginWac BETWEEN 82 AND 73 ORDER BY OriginCityMarketID, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, CancellationCode, DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 82 AND 73 ORDER BY OriginCityMarketID, OriginCityName LIMIT 1","hsqls":["SELECT DivWheelsOns, CancellationCode, DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 82 AND 73 ORDER BY OriginCityMarketID, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT OriginState, ArrDel15 FROM mytable WHERE OriginCityMarketID IN (33851, 32457, 31871, 31721) LIMIT 5"}
 {"sql":"SELECT CRSElapsedTime, MAX(CarrierDelay), SUM(DaysSinceEpoch), SUM(OriginCityMarketID) FROM mytable WHERE TaxiIn IN (21, 175, 33, 39) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 29","hsqls":["SELECT CRSElapsedTime, MAX(CarrierDelay), SUM(DaysSinceEpoch), SUM(OriginCityMarketID) FROM mytable WHERE TaxiIn IN (21, 175, 33, 39) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 29"]}
 {"sql":"SELECT \"Year\", LateAircraftDelay, CRSDepTime, COUNT(*) FROM mytable GROUP BY \"Year\", LateAircraftDelay, CRSDepTime LIMIT 26","hsqls":["SELECT Year, LateAircraftDelay, CRSDepTime, COUNT(*) FROM mytable GROUP BY Year, LateAircraftDelay, CRSDepTime LIMIT 26"]}
 {"sql":"SELECT WheelsOff, LateAircraftDelay, DepDel15 FROM mytable ORDER BY AirTime LIMIT 10"}
-{"sql":"SELECT DivLongestGTimes, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable WHERE TotalAddGTime BETWEEN 42 AND 38 ORDER BY DestWac, TotalAddGTime, ArrTimeBlk LIMIT 8","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrivalDelayGroups FROM mytable WHERE TotalAddGTime BETWEEN 42 AND 38 ORDER BY DestWac, TotalAddGTime, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable WHERE TotalAddGTime BETWEEN 42 AND 38 ORDER BY DestWac, TotalAddGTime, ArrTimeBlk LIMIT 8","hsqls":["SELECT DivLongestGTimes, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable WHERE TotalAddGTime BETWEEN 42 AND 38 ORDER BY DestWac, TotalAddGTime, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Carrier, Dest, COUNT(DayOfWeek), SUM(ArrDelay) FROM mytable GROUP BY TaxiOut, Carrier, Dest  ORDER BY TaxiOut, Carrier, Dest LIMIT 29","hsqls":["SELECT TaxiOut, Carrier, Dest, COUNT(DayOfWeek), SUM(ArrDelay) FROM mytable GROUP BY TaxiOut, Carrier, Dest  ORDER BY TaxiOut, Carrier, Dest LIMIT 29"]}
 {"sql":"SELECT DayOfWeek, AVG(Cancelled) FROM mytable WHERE DestStateName NOT IN ('Nevada') GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 18","hsqls":["SELECT DayOfWeek, AVG(Cancelled) FROM mytable WHERE DestStateName NOT IN ('Nevada') GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 18"]}
 {"sql":"SELECT SUM(DivAirportLandings) FROM mytable WHERE OriginStateName <= 'Arkansas' LIMIT 22"}
-{"sql":"SELECT DepDelayMinutes, AirlineID, \"Month\", AVG(DestAirportSeqID), MIN(ArrDel15) FROM mytable WHERE ArrTime <= 16 GROUP BY DepDelayMinutes, AirlineID, \"Month\" LIMIT 10","hsqls":["SELECT DepDelayMinutes, AirlineID, Month, AVG(DestAirportSeqID), MIN(ArrDel15) FROM mytable WHERE ArrTime <= 16 GROUP BY DepDelayMinutes, AirlineID, Month LIMIT 10"]}
+{"sql":"SELECT DepDelayMinutes, AirlineID, \"Month\", AVG(DestAirportSeqID), MIN(ArrDel15) FROM mytable WHERE ArrTime <= 16 GROUP BY DepDelayMinutes, AirlineID, \"Month\" LIMIT 10","hsqls":["SELECT DepDelayMinutes, AirlineID, Month, AVG(DestAirportSeqID), MIN(ArrDel15) FROM mytable WHERE ArrTime <= 16 GROUP BY DepDelayMinutes, AirlineID, `Month` LIMIT 10"]}
 {"sql":"SELECT Distance, OriginStateName FROM mytable ORDER BY DestWac, Quarter LIMIT 22"}
-{"sql":"SELECT AVG(\"Year\"), MIN(AirTime) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND CarrierDelay IN (149, 72, 86) AND ArrivalDelayGroups IN (1, 7, 4, 11) LIMIT 12","hsqls":["SELECT AVG(Year), MIN(AirTime) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND CarrierDelay IN (149, 72, 86) AND ArrivalDelayGroups IN (1, 7, 4, 11) LIMIT 12"]}
+{"sql":"SELECT AVG(\"Year\"), MIN(AirTime) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND CarrierDelay IN (149, 72, 86) AND ArrivalDelayGroups IN (1, 7, 4, 11) LIMIT 12","hsqls":["SELECT AVG(`Year`), MIN(AirTime) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND CarrierDelay IN (149, 72, 86) AND ArrivalDelayGroups IN (1, 7, 4, 11) LIMIT 12"]}
 {"sql":"SELECT Cancelled, DestAirportID, AVG(DestStateFips), MAX(FirstDepTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN 6 AND 3 GROUP BY Cancelled, DestAirportID  ORDER BY Cancelled, DestAirportID LIMIT 8","hsqls":["SELECT Cancelled, DestAirportID, AVG(DestStateFips), MAX(FirstDepTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN 6 AND 3 GROUP BY Cancelled, DestAirportID  ORDER BY Cancelled, DestAirportID LIMIT 8"]}
 {"sql":"SELECT LongestAddGTime, FlightDate, DepTime, MIN(LateAircraftDelay), MAX(OriginAirportID), SUM(DestCityMarketID) FROM mytable WHERE TaxiIn BETWEEN 56 AND 93 GROUP BY LongestAddGTime, FlightDate, DepTime  ORDER BY LongestAddGTime, FlightDate, DepTime LIMIT 19","hsqls":["SELECT LongestAddGTime, FlightDate, DepTime, MIN(LateAircraftDelay), MAX(OriginAirportID), SUM(DestCityMarketID) FROM mytable WHERE TaxiIn BETWEEN 56 AND 93 GROUP BY LongestAddGTime, FlightDate, DepTime  ORDER BY LongestAddGTime, FlightDate, DepTime LIMIT 19"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 4"}
 {"sql":"SELECT DepDelay FROM mytable ORDER BY DepartureDelayGroups, OriginAirportSeqID LIMIT 11"}
 {"sql":"SELECT TailNum FROM mytable WHERE OriginAirportID BETWEEN 10257 AND 10561 OR AirTime IN (349, 289, 121, 356, 139) ORDER BY DestWac, DayofMonth, OriginStateName LIMIT 9"}
-{"sql":"SELECT FlightDate, TotalAddGTime, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (3.0, 59.0, 100.0, 124.0, 173.0) AND LateAircraftDelay <= 109 OR DivAirports IN ('IAD', 'GGG', 'LGA') GROUP BY FlightDate, TotalAddGTime LIMIT 19","hsqls":["SELECT FlightDate, TotalAddGTime, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (3.0, 59.0, 100.0, 124.0, 173.0) AND LateAircraftDelay <= 109 OR (DivAirports__MV0 IN ('IAD', 'GGG', 'LGA') OR DivAirports__MV1 IN ('IAD', 'GGG', 'LGA') OR DivAirports__MV2 IN ('IAD', 'GGG', 'LGA') OR DivAirports__MV3 IN ('IAD', 'GGG', 'LGA') OR DivAirports__MV4 IN ('IAD', 'GGG', 'LGA')) GROUP BY FlightDate, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT FlightDate, TotalAddGTime, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (3.0, 59.0, 100.0, 124.0, 173.0) AND LateAircraftDelay <= 109 OR DivAirports IN ('IAD', 'GGG', 'LGA') GROUP BY FlightDate, TotalAddGTime LIMIT 19","hsqls":["SELECT FlightDate, TotalAddGTime, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (3.0, 59.0, 100.0, 124.0, 173.0) AND LateAircraftDelay <= 109 OR (DivAirports[1] IN ('IAD', 'GGG', 'LGA') OR DivAirports[2] IN ('IAD', 'GGG', 'LGA') OR DivAirports[3] IN ('IAD', 'GGG', 'LGA') OR DivAirports[4] IN ('IAD', 'GGG', 'LGA') OR DivAirports[5] IN ('IAD', 'GGG', 'LGA')) GROUP BY FlightDate, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT Flights, CarrierDelay FROM mytable WHERE DepDel15 <= 1 ORDER BY DepDelayMinutes, WheelsOn LIMIT 1"}
 {"sql":"SELECT AVG(DepDel15), SUM(OriginStateFips) FROM mytable WHERE DepDelayMinutes IN (126.0, 334.0) OR ArrTime NOT IN (1510, 2254) OR CancellationCode NOT IN ('A', 'B', 'C', 'noodles') LIMIT 10"}
-{"sql":"SELECT ArrTime, CancellationCode, MIN(OriginAirportSeqID), COUNT(AirlineID) FROM mytable WHERE TaxiIn = 44 AND DivAirportIDs IN (12323) GROUP BY ArrTime, CancellationCode LIMIT 4","hsqls":["SELECT ArrTime, CancellationCode, MIN(OriginAirportSeqID), COUNT(AirlineID) FROM mytable WHERE TaxiIn = 44 AND (DivAirportIDs__MV0 IN (12323) OR DivAirportIDs__MV1 IN (12323) OR DivAirportIDs__MV2 IN (12323) OR DivAirportIDs__MV3 IN (12323) OR DivAirportIDs__MV4 IN (12323)) GROUP BY ArrTime, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT ArrTime, CancellationCode, MIN(OriginAirportSeqID), COUNT(AirlineID) FROM mytable WHERE TaxiIn = 44 AND DivAirportIDs IN (12323) GROUP BY ArrTime, CancellationCode LIMIT 4","hsqls":["SELECT ArrTime, CancellationCode, MIN(OriginAirportSeqID), COUNT(AirlineID) FROM mytable WHERE TaxiIn = 44 AND (DivAirportIDs[1] IN (12323) OR DivAirportIDs[2] IN (12323) OR DivAirportIDs[3] IN (12323) OR DivAirportIDs[4] IN (12323) OR DivAirportIDs[5] IN (12323)) GROUP BY ArrTime, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT Diverted, NASDelay, OriginStateName FROM mytable ORDER BY OriginAirportID LIMIT 9"}
-{"sql":"SELECT DepDelay, CarrierDelay, DestCityName, COUNT(*) FROM mytable WHERE DayOfWeek <> 4 AND \"Year\" BETWEEN 2014 AND 2014 AND CRSArrTime <> 1834 GROUP BY DepDelay, CarrierDelay, DestCityName LIMIT 26","hsqls":["SELECT DepDelay, CarrierDelay, DestCityName, COUNT(*) FROM mytable WHERE DayOfWeek <> 4 AND Year BETWEEN 2014 AND 2014 AND CRSArrTime <> 1834 GROUP BY DepDelay, CarrierDelay, DestCityName LIMIT 26"]}
+{"sql":"SELECT DepDelay, CarrierDelay, DestCityName, COUNT(*) FROM mytable WHERE DayOfWeek <> 4 AND \"Year\" BETWEEN 2014 AND 2014 AND CRSArrTime <> 1834 GROUP BY DepDelay, CarrierDelay, DestCityName LIMIT 26","hsqls":["SELECT DepDelay, CarrierDelay, DestCityName, COUNT(*) FROM mytable WHERE DayOfWeek <> 4 AND `Year` BETWEEN 2014 AND 2014 AND CRSArrTime <> 1834 GROUP BY DepDelay, CarrierDelay, DestCityName LIMIT 26"]}
 {"sql":"SELECT DepTime FROM mytable LIMIT 22"}
 {"sql":"SELECT Cancelled FROM mytable WHERE ArrDelay < 192.0 ORDER BY ArrDelayMinutes, Cancelled, DestCityMarketID LIMIT 14"}
-{"sql":"SELECT DivDistance, Origin FROM mytable WHERE DayOfWeek < 2 AND TaxiIn <> 96 AND DivWheelsOffs = 1831 ORDER BY Quarter, CRSArrTime LIMIT 28","hsqls":["SELECT DivDistance, Origin FROM mytable WHERE DayOfWeek < 2 AND TaxiIn <> 96 AND (DivWheelsOffs__MV0 = 1831 OR DivWheelsOffs__MV1 = 1831 OR DivWheelsOffs__MV2 = 1831 OR DivWheelsOffs__MV3 = 1831 OR DivWheelsOffs__MV4 = 1831) ORDER BY Quarter, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DivDistance, Origin FROM mytable WHERE DayOfWeek < 2 AND TaxiIn <> 96 AND DivWheelsOffs = 1831 ORDER BY Quarter, CRSArrTime LIMIT 28","hsqls":["SELECT DivDistance, Origin FROM mytable WHERE DayOfWeek < 2 AND TaxiIn <> 96 AND (DivWheelsOffs[1] = 1831 OR DivWheelsOffs[2] = 1831 OR DivWheelsOffs[3] = 1831 OR DivWheelsOffs[4] = 1831 OR DivWheelsOffs[5] = 1831) ORDER BY Quarter, CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT MIN(DepDelayMinutes), MIN(DaysSinceEpoch), MAX(DivReachedDest) FROM mytable LIMIT 12"}
 {"sql":"SELECT DestState FROM mytable ORDER BY ArrTimeBlk, DestStateName, AirlineID LIMIT 23"}
-{"sql":"SELECT DepartureDelayGroups, Cancelled, \"Month\" FROM mytable ORDER BY FirstDepTime, DestAirportSeqID, DestAirportID LIMIT 24","hsqls":["SELECT DepartureDelayGroups, Cancelled, Month FROM mytable ORDER BY FirstDepTime, DestAirportSeqID, DestAirportID LIMIT 24"]}
-{"sql":"SELECT FlightDate, \"Month\", COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'F9' AND 'WN' AND ArrTimeBlk <> '2000-2059' GROUP BY FlightDate, \"Month\" LIMIT 10","hsqls":["SELECT FlightDate, Month, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'F9' AND 'WN' AND ArrTimeBlk <> '2000-2059' GROUP BY FlightDate, Month LIMIT 10"]}
+{"sql":"SELECT DepartureDelayGroups, Cancelled, \"Month\" FROM mytable ORDER BY FirstDepTime, DestAirportSeqID, DestAirportID LIMIT 24","hsqls":["SELECT DepartureDelayGroups, Cancelled, `Month` FROM mytable ORDER BY FirstDepTime, DestAirportSeqID, DestAirportID LIMIT 24"]}
+{"sql":"SELECT FlightDate, \"Month\", COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'F9' AND 'WN' AND ArrTimeBlk <> '2000-2059' GROUP BY FlightDate, \"Month\" LIMIT 10","hsqls":["SELECT FlightDate, Month, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'F9' AND 'WN' AND ArrTimeBlk <> '2000-2059' GROUP BY FlightDate, `Month` LIMIT 10"]}
 {"sql":"SELECT DestState, DestStateFips, ArrTime, COUNT(ArrTimeBlk), MAX(DivReachedDest) FROM mytable WHERE AirlineID BETWEEN 19790 AND 19805 AND DivDistance BETWEEN 814 AND 1029 AND DivDistance <= 842 GROUP BY DestState, DestStateFips, ArrTime  ORDER BY DestState, DestStateFips, ArrTime LIMIT 25","hsqls":["SELECT DestState, DestStateFips, ArrTime, COUNT(ArrTimeBlk), MAX(DivReachedDest) FROM mytable WHERE AirlineID BETWEEN 19790 AND 19805 AND DivDistance BETWEEN 814 AND 1029 AND DivDistance <= 842 GROUP BY DestState, DestStateFips, ArrTime  ORDER BY DestState, DestStateFips, ArrTime LIMIT 25"]}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE Distance IN (384, 645) LIMIT 17"}
-{"sql":"SELECT DivLongestGTimes, CRSArrTime, DayOfWeek FROM mytable WHERE ArrTimeBlk IN ('1200-1259', '0001-0559') ORDER BY DestStateName LIMIT 12","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CRSArrTime, DayOfWeek FROM mytable WHERE ArrTimeBlk IN ('1200-1259', '0001-0559') ORDER BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT DestState, Distance, OriginWac, AVG(LateAircraftDelay), AVG(Flights) FROM mytable WHERE DivWheelsOffs BETWEEN 1045 AND 1348 GROUP BY DestState, Distance, OriginWac LIMIT 24","hsqls":["SELECT DestState, Distance, OriginWac, AVG(LateAircraftDelay), AVG(Flights) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1045 AND 1348 OR DivWheelsOffs__MV1 BETWEEN 1045 AND 1348 OR DivWheelsOffs__MV2 BETWEEN 1045 AND 1348 OR DivWheelsOffs__MV3 BETWEEN 1045 AND 1348 OR DivWheelsOffs__MV4 BETWEEN 1045 AND 1348) GROUP BY DestState, Distance, OriginWac LIMIT 10000"]}
-{"sql":"SELECT OriginState, TailNum, AirlineID, COUNT(SecurityDelay) FROM mytable WHERE DivAirports >= 'FWA' OR ArrivalDelayGroups > 2 OR OriginAirportSeqID NOT IN (1288903, 1323202, 1348602, 1389101, 1469802) GROUP BY OriginState, TailNum, AirlineID LIMIT 21","hsqls":["SELECT OriginState, TailNum, AirlineID, COUNT(SecurityDelay) FROM mytable WHERE (DivAirports__MV0 >= 'FWA' OR DivAirports__MV1 >= 'FWA' OR DivAirports__MV2 >= 'FWA' OR DivAirports__MV3 >= 'FWA' OR DivAirports__MV4 >= 'FWA') OR ArrivalDelayGroups > 2 OR OriginAirportSeqID NOT IN (1288903, 1323202, 1348602, 1389101, 1469802) GROUP BY OriginState, TailNum, AirlineID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CRSArrTime, DayOfWeek FROM mytable WHERE ArrTimeBlk IN ('1200-1259', '0001-0559') ORDER BY DestStateName LIMIT 12","hsqls":["SELECT DivLongestGTimes, CRSArrTime, DayOfWeek FROM mytable WHERE ArrTimeBlk IN ('1200-1259', '0001-0559') ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestState, Distance, OriginWac, AVG(LateAircraftDelay), AVG(Flights) FROM mytable WHERE DivWheelsOffs BETWEEN 1045 AND 1348 GROUP BY DestState, Distance, OriginWac LIMIT 24","hsqls":["SELECT DestState, Distance, OriginWac, AVG(LateAircraftDelay), AVG(Flights) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1045 AND 1348 OR DivWheelsOffs[2] BETWEEN 1045 AND 1348 OR DivWheelsOffs[3] BETWEEN 1045 AND 1348 OR DivWheelsOffs[4] BETWEEN 1045 AND 1348 OR DivWheelsOffs[5] BETWEEN 1045 AND 1348) GROUP BY DestState, Distance, OriginWac LIMIT 10000"]}
+{"sql":"SELECT OriginState, TailNum, AirlineID, COUNT(SecurityDelay) FROM mytable WHERE DivAirports >= 'FWA' OR ArrivalDelayGroups > 2 OR OriginAirportSeqID NOT IN (1288903, 1323202, 1348602, 1389101, 1469802) GROUP BY OriginState, TailNum, AirlineID LIMIT 21","hsqls":["SELECT OriginState, TailNum, AirlineID, COUNT(SecurityDelay) FROM mytable WHERE (DivAirports[1] >= 'FWA' OR DivAirports[2] >= 'FWA' OR DivAirports[3] >= 'FWA' OR DivAirports[4] >= 'FWA' OR DivAirports[5] >= 'FWA') OR ArrivalDelayGroups > 2 OR OriginAirportSeqID NOT IN (1288903, 1323202, 1348602, 1389101, 1469802) GROUP BY OriginState, TailNum, AirlineID LIMIT 10000"]}
 {"sql":"SELECT FlightDate, ArrTimeBlk, ArrivalDelayGroups FROM mytable LIMIT 18"}
 {"sql":"SELECT AirlineID, WheelsOn, DivActualElapsedTime FROM mytable WHERE ArrDel15 BETWEEN -9999 AND -9999 LIMIT 14"}
 {"sql":"SELECT MAX(WeatherDelay) FROM mytable WHERE DestAirportID BETWEEN 10431 AND 12441 AND DayOfWeek IN (2, 1, 6) LIMIT 18"}
@@ -2245,33 +2245,33 @@
 {"sql":"SELECT CRSArrTime, ArrDelay FROM mytable WHERE UniqueCarrier < 'AA' LIMIT 23"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 374 AND 160 AND FlightDate IN ('2014-01-07') LIMIT 4"}
 {"sql":"SELECT Diverted, CarrierDelay, ArrDel15, COUNT(*) FROM mytable GROUP BY Diverted, CarrierDelay, ArrDel15  ORDER BY Diverted, CarrierDelay, ArrDel15 LIMIT 9","hsqls":["SELECT Diverted, CarrierDelay, ArrDel15, COUNT(*) FROM mytable GROUP BY Diverted, CarrierDelay, ArrDel15  ORDER BY Diverted, CarrierDelay, ArrDel15 LIMIT 9"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivAirports IN ('JNU', 'JAX', 'TWF') OR TaxiOut IN (20, 54, 13, 102) LIMIT 4","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivAirports__MV0 IN ('JNU', 'JAX', 'TWF') OR DivAirports__MV1 IN ('JNU', 'JAX', 'TWF') OR DivAirports__MV2 IN ('JNU', 'JAX', 'TWF') OR DivAirports__MV3 IN ('JNU', 'JAX', 'TWF') OR DivAirports__MV4 IN ('JNU', 'JAX', 'TWF')) OR TaxiOut IN (20, 54, 13, 102) LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivAirports IN ('JNU', 'JAX', 'TWF') OR TaxiOut IN (20, 54, 13, 102) LIMIT 4","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE (DivAirports[1] IN ('JNU', 'JAX', 'TWF') OR DivAirports[2] IN ('JNU', 'JAX', 'TWF') OR DivAirports[3] IN ('JNU', 'JAX', 'TWF') OR DivAirports[4] IN ('JNU', 'JAX', 'TWF') OR DivAirports[5] IN ('JNU', 'JAX', 'TWF')) OR TaxiOut IN (20, 54, 13, 102) LIMIT 10000"]}
 {"sql":"SELECT Quarter, DayOfWeek, SUM(TaxiIn), MAX(ActualElapsedTime), SUM(DivDistance) FROM mytable GROUP BY Quarter, DayOfWeek  ORDER BY Quarter, DayOfWeek LIMIT 6","hsqls":["SELECT Quarter, DayOfWeek, SUM(TaxiIn), MAX(ActualElapsedTime), SUM(DivDistance) FROM mytable GROUP BY Quarter, DayOfWeek  ORDER BY Quarter, DayOfWeek LIMIT 6"]}
 {"sql":"SELECT Dest, DayofMonth, MAX(Diverted), AVG(OriginAirportID) FROM mytable GROUP BY Dest, DayofMonth  ORDER BY Dest, DayofMonth LIMIT 10","hsqls":["SELECT Dest, DayofMonth, MAX(Diverted), AVG(OriginAirportID) FROM mytable GROUP BY Dest, DayofMonth  ORDER BY Dest, DayofMonth LIMIT 10"]}
 {"sql":"SELECT DestStateName, SUM(LateAircraftDelay), AVG(TaxiIn) FROM mytable WHERE Distance IN (352, 805, 711, 325, 2105) OR ArrDelay BETWEEN 76.0 AND 46.0 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 5","hsqls":["SELECT DestStateName, SUM(LateAircraftDelay), AVG(TaxiIn) FROM mytable WHERE Distance IN (352, 805, 711, 325, 2105) OR ArrDelay BETWEEN 76.0 AND 46.0 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 5"]}
-{"sql":"SELECT DivDistance, DivAirportSeqIDs, Dest FROM mytable LIMIT 26","hsqls":["SELECT DivDistance, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Dest FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DivAirportSeqIDs, Dest FROM mytable LIMIT 26","hsqls":["SELECT DivDistance, DivAirportSeqIDs, Dest FROM mytable LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, OriginWac, ArrDelay FROM mytable WHERE DestAirportID >= 14576 OR DestState BETWEEN 'MO' AND 'OR' LIMIT 10"}
 {"sql":"SELECT ArrDelayMinutes FROM mytable LIMIT 6"}
-{"sql":"SELECT OriginAirportSeqID FROM mytable WHERE TailNum IN ('N784NC', 'N154UW') AND DivAirportSeqIDs BETWEEN 1537002 AND 1289605 ORDER BY DestState, LongestAddGTime","hsqls":["SELECT OriginAirportSeqID FROM mytable WHERE TailNum IN ('N784NC', 'N154UW') AND (DivAirportSeqIDs__MV0 BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs__MV1 BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs__MV2 BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs__MV3 BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs__MV4 BETWEEN 1537002 AND 1289605) ORDER BY DestState, LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID FROM mytable WHERE TailNum IN ('N784NC', 'N154UW') AND DivAirportSeqIDs BETWEEN 1537002 AND 1289605 ORDER BY DestState, LongestAddGTime","hsqls":["SELECT OriginAirportSeqID FROM mytable WHERE TailNum IN ('N784NC', 'N154UW') AND (DivAirportSeqIDs[1] BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs[2] BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs[3] BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs[4] BETWEEN 1537002 AND 1289605 OR DivAirportSeqIDs[5] BETWEEN 1537002 AND 1289605) ORDER BY DestState, LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT AirlineID, MIN(ArrDelayMinutes), AVG(ActualElapsedTime) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 10","hsqls":["SELECT AirlineID, MIN(ArrDelayMinutes), AVG(ActualElapsedTime) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 10"]}
 {"sql":"SELECT WeatherDelay, ArrivalDelayGroups, DivActualElapsedTime, COUNT(*) FROM mytable GROUP BY WeatherDelay, ArrivalDelayGroups, DivActualElapsedTime  ORDER BY WeatherDelay, ArrivalDelayGroups, DivActualElapsedTime LIMIT 10","hsqls":["SELECT WeatherDelay, ArrivalDelayGroups, DivActualElapsedTime, COUNT(*) FROM mytable GROUP BY WeatherDelay, ArrivalDelayGroups, DivActualElapsedTime  ORDER BY WeatherDelay, ArrivalDelayGroups, DivActualElapsedTime LIMIT 10"]}
-{"sql":"SELECT OriginState, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 2243 AND 1132 OR OriginAirportSeqID NOT IN (1161203) AND DivTailNums IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') GROUP BY OriginState LIMIT 5","hsqls":["SELECT OriginState, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 2243 AND 1132 OR OriginAirportSeqID NOT IN (1161203) AND (DivTailNums__MV0 IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums__MV1 IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums__MV2 IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums__MV3 IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums__MV4 IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA')) GROUP BY OriginState LIMIT 10000"]}
-{"sql":"SELECT DepDelay, Cancelled, DestCityMarketID FROM mytable WHERE AirlineID <= 20366 OR DivAirports <= 'FSD' AND DivLongestGTimes IN (-9999.0, 49.0, 79.0, 66.0) LIMIT 3","hsqls":["SELECT DepDelay, Cancelled, DestCityMarketID FROM mytable WHERE AirlineID <= 20366 OR (DivAirports__MV0 <= 'FSD' OR DivAirports__MV1 <= 'FSD' OR DivAirports__MV2 <= 'FSD' OR DivAirports__MV3 <= 'FSD' OR DivAirports__MV4 <= 'FSD') AND (DivLongestGTimes__MV0 IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes__MV1 IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes__MV2 IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes__MV3 IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes__MV4 IN (-9999.0, 49.0, 79.0, 66.0)) LIMIT 10000"]}
+{"sql":"SELECT OriginState, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 2243 AND 1132 OR OriginAirportSeqID NOT IN (1161203) AND DivTailNums IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') GROUP BY OriginState LIMIT 5","hsqls":["SELECT OriginState, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 2243 AND 1132 OR OriginAirportSeqID NOT IN (1161203) AND (DivTailNums[1] IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums[2] IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums[3] IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums[4] IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA') OR DivTailNums[5] IN ('N699BR', 'N986CA', 'N345NW', 'N836MQ', 'N389HA')) GROUP BY OriginState LIMIT 10000"]}
+{"sql":"SELECT DepDelay, Cancelled, DestCityMarketID FROM mytable WHERE AirlineID <= 20366 OR DivAirports <= 'FSD' AND DivLongestGTimes IN (-9999.0, 49.0, 79.0, 66.0) LIMIT 3","hsqls":["SELECT DepDelay, Cancelled, DestCityMarketID FROM mytable WHERE AirlineID <= 20366 OR (DivAirports[1] <= 'FSD' OR DivAirports[2] <= 'FSD' OR DivAirports[3] <= 'FSD' OR DivAirports[4] <= 'FSD' OR DivAirports[5] <= 'FSD') AND (DivLongestGTimes[1] IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes[2] IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes[3] IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes[4] IN (-9999.0, 49.0, 79.0, 66.0) OR DivLongestGTimes[5] IN (-9999.0, 49.0, 79.0, 66.0)) LIMIT 10000"]}
 {"sql":"SELECT MAX(FirstDepTime), SUM(DestStateFips) FROM mytable WHERE DepTimeBlk BETWEEN '1900-1959' AND '1600-1659' OR TailNum NOT IN ('N584NW') LIMIT 15"}
-{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DivTailNums <= 'N547UA' OR OriginAirportSeqID BETWEEN 1538003 AND 1163703 ORDER BY DistanceGroup, CRSArrTime LIMIT 25","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE (DivTailNums__MV0 <= 'N547UA' OR DivTailNums__MV1 <= 'N547UA' OR DivTailNums__MV2 <= 'N547UA' OR DivTailNums__MV3 <= 'N547UA' OR DivTailNums__MV4 <= 'N547UA') OR OriginAirportSeqID BETWEEN 1538003 AND 1163703 ORDER BY DistanceGroup, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DivTailNums <= 'N547UA' OR OriginAirportSeqID BETWEEN 1538003 AND 1163703 ORDER BY DistanceGroup, CRSArrTime LIMIT 25","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE (DivTailNums[1] <= 'N547UA' OR DivTailNums[2] <= 'N547UA' OR DivTailNums[3] <= 'N547UA' OR DivTailNums[4] <= 'N547UA' OR DivTailNums[5] <= 'N547UA') OR OriginAirportSeqID BETWEEN 1538003 AND 1163703 ORDER BY DistanceGroup, CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DestStateName, MAX(DepDelayMinutes), MIN(DayOfWeek) FROM mytable GROUP BY FirstDepTime, DestStateName  ORDER BY FirstDepTime, DestStateName LIMIT 1","hsqls":["SELECT FirstDepTime, DestStateName, MAX(DepDelayMinutes), MIN(DayOfWeek) FROM mytable GROUP BY FirstDepTime, DestStateName  ORDER BY FirstDepTime, DestStateName LIMIT 1"]}
 {"sql":"SELECT AirTime, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 AND FlightDate BETWEEN '2014-01-08' AND '2014-01-12' GROUP BY AirTime  ORDER BY AirTime LIMIT 18","hsqls":["SELECT AirTime, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 AND FlightDate BETWEEN '2014-01-08' AND '2014-01-12' GROUP BY AirTime  ORDER BY AirTime LIMIT 18"]}
-{"sql":"SELECT \"Year\", FlightNum, LongestAddGTime FROM mytable WHERE DivAirportIDs IN (14307, 14689, 10397) OR CarrierDelay >= 21 OR OriginCityMarketID BETWEEN 32467 AND 30631 ORDER BY WheelsOff, Quarter, DepTime LIMIT 29","hsqls":["SELECT Year, FlightNum, LongestAddGTime FROM mytable WHERE (DivAirportIDs__MV0 IN (14307, 14689, 10397) OR DivAirportIDs__MV1 IN (14307, 14689, 10397) OR DivAirportIDs__MV2 IN (14307, 14689, 10397) OR DivAirportIDs__MV3 IN (14307, 14689, 10397) OR DivAirportIDs__MV4 IN (14307, 14689, 10397)) OR CarrierDelay >= 21 OR OriginCityMarketID BETWEEN 32467 AND 30631 ORDER BY WheelsOff, Quarter, DepTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\", FlightNum, LongestAddGTime FROM mytable WHERE DivAirportIDs IN (14307, 14689, 10397) OR CarrierDelay >= 21 OR OriginCityMarketID BETWEEN 32467 AND 30631 ORDER BY WheelsOff, Quarter, DepTime LIMIT 29","hsqls":["SELECT Year, FlightNum, LongestAddGTime FROM mytable WHERE (DivAirportIDs[1] IN (14307, 14689, 10397) OR DivAirportIDs[2] IN (14307, 14689, 10397) OR DivAirportIDs[3] IN (14307, 14689, 10397) OR DivAirportIDs[4] IN (14307, 14689, 10397) OR DivAirportIDs[5] IN (14307, 14689, 10397)) OR CarrierDelay >= 21 OR OriginCityMarketID BETWEEN 32467 AND 30631 ORDER BY WheelsOff, Quarter, DepTime LIMIT 10000"]}
 {"sql":"SELECT DestState FROM mytable ORDER BY Flights, DepTime, UniqueCarrier LIMIT 21"}
 {"sql":"SELECT DestStateFips, ArrDelayMinutes, MAX(ArrivalDelayGroups), COUNT(DayOfWeek), COUNT(ArrDelay) FROM mytable WHERE OriginStateFips <= 5 OR Diverted NOT IN (1, 0) GROUP BY DestStateFips, ArrDelayMinutes  ORDER BY DestStateFips, ArrDelayMinutes LIMIT 17","hsqls":["SELECT DestStateFips, ArrDelayMinutes, MAX(ArrivalDelayGroups), COUNT(DayOfWeek), COUNT(ArrDelay) FROM mytable WHERE OriginStateFips <= 5 OR Diverted NOT IN (1, 0) GROUP BY DestStateFips, ArrDelayMinutes  ORDER BY DestStateFips, ArrDelayMinutes LIMIT 17"]}
 {"sql":"SELECT DivArrDelay FROM mytable ORDER BY DepDel15, Dest LIMIT 9"}
 {"sql":"SELECT MIN(FlightNum), AVG(DestAirportID), SUM(FlightNum) FROM mytable WHERE FlightNum BETWEEN 2345 AND 4441 AND FlightNum = 3747 LIMIT 15"}
 {"sql":"SELECT Diverted, Distance, SUM(ArrDelay) FROM mytable GROUP BY Diverted, Distance  ORDER BY Diverted, Distance LIMIT 21","hsqls":["SELECT Diverted, Distance, SUM(ArrDelay) FROM mytable GROUP BY Diverted, Distance  ORDER BY Diverted, Distance LIMIT 21"]}
-{"sql":"SELECT ArrDel15 FROM mytable WHERE OriginAirportSeqID IN (1379502, 1426202, 1343302) OR \"Month\" BETWEEN 1 AND 1 AND DivTotalGTimes BETWEEN 1 AND 66 ORDER BY ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrDel15 FROM mytable WHERE OriginAirportSeqID IN (1379502, 1426202, 1343302) OR Month BETWEEN 1 AND 1 AND (DivTotalGTimes__MV0 BETWEEN 1 AND 66 OR DivTotalGTimes__MV1 BETWEEN 1 AND 66 OR DivTotalGTimes__MV2 BETWEEN 1 AND 66 OR DivTotalGTimes__MV3 BETWEEN 1 AND 66 OR DivTotalGTimes__MV4 BETWEEN 1 AND 66) ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ArrDel15 FROM mytable WHERE OriginAirportSeqID IN (1379502, 1426202, 1343302) OR \"Month\" BETWEEN 1 AND 1 AND DivTotalGTimes BETWEEN 1 AND 66 ORDER BY ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrDel15 FROM mytable WHERE OriginAirportSeqID IN (1379502, 1426202, 1343302) OR `Month` BETWEEN 1 AND 1 AND (DivTotalGTimes[1] BETWEEN 1 AND 66 OR DivTotalGTimes[2] BETWEEN 1 AND 66 OR DivTotalGTimes[3] BETWEEN 1 AND 66 OR DivTotalGTimes[4] BETWEEN 1 AND 66 OR DivTotalGTimes[5] BETWEEN 1 AND 66) ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT AVG(OriginAirportID) FROM mytable WHERE DestCityName >= 'Syracuse, NY' LIMIT 15"}
-{"sql":"SELECT OriginState, DivArrDelay, COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 182 AND 33 GROUP BY OriginState, DivArrDelay LIMIT 27","hsqls":["SELECT OriginState, DivArrDelay, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 182 AND 33 OR DivTotalGTimes__MV1 BETWEEN 182 AND 33 OR DivTotalGTimes__MV2 BETWEEN 182 AND 33 OR DivTotalGTimes__MV3 BETWEEN 182 AND 33 OR DivTotalGTimes__MV4 BETWEEN 182 AND 33) GROUP BY OriginState, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivArrDelay, COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 182 AND 33 GROUP BY OriginState, DivArrDelay LIMIT 27","hsqls":["SELECT OriginState, DivArrDelay, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 182 AND 33 OR DivTotalGTimes[2] BETWEEN 182 AND 33 OR DivTotalGTimes[3] BETWEEN 182 AND 33 OR DivTotalGTimes[4] BETWEEN 182 AND 33 OR DivTotalGTimes[5] BETWEEN 182 AND 33) GROUP BY OriginState, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT Carrier FROM mytable WHERE OriginAirportID NOT IN (11193, 12954, 14122, 14027) ORDER BY WeatherDelay LIMIT 19"}
-{"sql":"SELECT MIN(OriginStateFips), SUM(FirstDepTime) FROM mytable WHERE DivAirports > 'PSG' LIMIT 17","hsqls":["SELECT MIN(OriginStateFips), SUM(FirstDepTime) FROM mytable WHERE (DivAirports__MV0 > 'PSG' OR DivAirports__MV1 > 'PSG' OR DivAirports__MV2 > 'PSG' OR DivAirports__MV3 > 'PSG' OR DivAirports__MV4 > 'PSG') LIMIT 10000"]}
+{"sql":"SELECT MIN(OriginStateFips), SUM(FirstDepTime) FROM mytable WHERE DivAirports > 'PSG' LIMIT 17","hsqls":["SELECT MIN(OriginStateFips), SUM(FirstDepTime) FROM mytable WHERE (DivAirports[1] > 'PSG' OR DivAirports[2] > 'PSG' OR DivAirports[3] > 'PSG' OR DivAirports[4] > 'PSG' OR DivAirports[5] > 'PSG') LIMIT 10000"]}
 {"sql":"SELECT DepDelay, WeatherDelay, DestStateFips, AVG(CRSArrTime), MAX(WeatherDelay) FROM mytable WHERE OriginStateName IN ('Pennsylvania') GROUP BY DepDelay, WeatherDelay, DestStateFips  ORDER BY DepDelay, WeatherDelay, DestStateFips LIMIT 27","hsqls":["SELECT DepDelay, WeatherDelay, DestStateFips, AVG(CRSArrTime), MAX(WeatherDelay) FROM mytable WHERE OriginStateName IN ('Pennsylvania') GROUP BY DepDelay, WeatherDelay, DestStateFips  ORDER BY DepDelay, WeatherDelay, DestStateFips LIMIT 27"]}
 {"sql":"SELECT SUM(Quarter), COUNT(DepTime) FROM mytable LIMIT 25"}
 {"sql":"SELECT OriginCityName FROM mytable WHERE ArrDelayMinutes <= 148.0 OR TotalAddGTime BETWEEN 30 AND 21 ORDER BY DepDelay, Quarter, DestCityMarketID LIMIT 10"}
@@ -2281,30 +2281,30 @@
 {"sql":"SELECT COUNT(OriginWac), AVG(CRSElapsedTime), SUM(CRSArrTime) FROM mytable LIMIT 22"}
 {"sql":"SELECT DivDistance, Carrier, COUNT(FirstDepTime), AVG(FlightNum), COUNT(DepTime) FROM mytable WHERE DivReachedDest < 1 OR DestStateName BETWEEN 'Connecticut' AND 'North Carolina' GROUP BY DivDistance, Carrier  ORDER BY DivDistance, Carrier LIMIT 17","hsqls":["SELECT DivDistance, Carrier, COUNT(FirstDepTime), AVG(FlightNum), COUNT(DepTime) FROM mytable WHERE DivReachedDest < 1 OR DestStateName BETWEEN 'Connecticut' AND 'North Carolina' GROUP BY DivDistance, Carrier  ORDER BY DivDistance, Carrier LIMIT 17"]}
 {"sql":"SELECT WeatherDelay, Dest, OriginStateName FROM mytable WHERE OriginStateFips <= 51 ORDER BY Diverted, FirstDepTime, AirTime"}
-{"sql":"SELECT DivLongestGTimes, OriginState, OriginStateName FROM mytable WHERE OriginStateName = 'Missouri' ORDER BY OriginState, Carrier, FlightDate LIMIT 3","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginState, OriginStateName FROM mytable WHERE OriginStateName = 'Missouri' ORDER BY OriginState, Carrier, FlightDate LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginState, OriginStateName FROM mytable WHERE OriginStateName = 'Missouri' ORDER BY OriginState, Carrier, FlightDate LIMIT 3","hsqls":["SELECT DivLongestGTimes, OriginState, OriginStateName FROM mytable WHERE OriginStateName = 'Missouri' ORDER BY OriginState, Carrier, FlightDate LIMIT 10000"]}
 {"sql":"SELECT DestStateName, DayofMonth, AVG(DestStateFips), SUM(WheelsOn), COUNT(LongestAddGTime) FROM mytable WHERE DepTime BETWEEN 1304 AND 912 OR TotalAddGTime IN (128, 41, 15, 73, 38) GROUP BY DestStateName, DayofMonth  ORDER BY DestStateName, DayofMonth LIMIT 11","hsqls":["SELECT DestStateName, DayofMonth, AVG(DestStateFips), SUM(WheelsOn), COUNT(LongestAddGTime) FROM mytable WHERE DepTime BETWEEN 1304 AND 912 OR TotalAddGTime IN (128, 41, 15, 73, 38) GROUP BY DestStateName, DayofMonth  ORDER BY DestStateName, DayofMonth LIMIT 11"]}
 {"sql":"SELECT OriginAirportSeqID, DestStateFips FROM mytable WHERE TaxiOut < 75 LIMIT 5"}
 {"sql":"SELECT TaxiOut, DivReachedDest, DivArrDelay, COUNT(DestStateFips), MAX(DivReachedDest), MIN(OriginCityMarketID) FROM mytable WHERE DivReachedDest >= 1 GROUP BY TaxiOut, DivReachedDest, DivArrDelay  ORDER BY TaxiOut, DivReachedDest, DivArrDelay LIMIT 25","hsqls":["SELECT TaxiOut, DivReachedDest, DivArrDelay, COUNT(DestStateFips), MAX(DivReachedDest), MIN(OriginCityMarketID) FROM mytable WHERE DivReachedDest >= 1 GROUP BY TaxiOut, DivReachedDest, DivArrDelay  ORDER BY TaxiOut, DivReachedDest, DivArrDelay LIMIT 25"]}
 {"sql":"SELECT MIN(Quarter) FROM mytable LIMIT 17"}
 {"sql":"SELECT TaxiIn FROM mytable WHERE FlightNum BETWEEN 2241 AND 2744 AND CRSElapsedTime BETWEEN 332 AND 156 OR DepDel15 <= -9999 ORDER BY OriginCityMarketID LIMIT 19"}
-{"sql":"SELECT Flights FROM mytable WHERE DivTotalGTimes >= 36 OR CarrierDelay <= 32 ORDER BY DepTime, DestCityMarketID, DivArrDelay LIMIT 29","hsqls":["SELECT Flights FROM mytable WHERE (DivTotalGTimes__MV0 >= 36 OR DivTotalGTimes__MV1 >= 36 OR DivTotalGTimes__MV2 >= 36 OR DivTotalGTimes__MV3 >= 36 OR DivTotalGTimes__MV4 >= 36) OR CarrierDelay <= 32 ORDER BY DepTime, DestCityMarketID, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, ArrTime, \"Month\" FROM mytable LIMIT 28","hsqls":["SELECT TotalAddGTime, ArrTime, Month FROM mytable LIMIT 28"]}
-{"sql":"SELECT DivWheelsOns, DivAirports, TotalAddGTime FROM mytable ORDER BY DestCityName LIMIT 13","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, TotalAddGTime FROM mytable ORDER BY DestCityName LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE DivTotalGTimes >= 36 OR CarrierDelay <= 32 ORDER BY DepTime, DestCityMarketID, DivArrDelay LIMIT 29","hsqls":["SELECT Flights FROM mytable WHERE (DivTotalGTimes[1] >= 36 OR DivTotalGTimes[2] >= 36 OR DivTotalGTimes[3] >= 36 OR DivTotalGTimes[4] >= 36 OR DivTotalGTimes[5] >= 36) OR CarrierDelay <= 32 ORDER BY DepTime, DestCityMarketID, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, ArrTime, \"Month\" FROM mytable LIMIT 28","hsqls":["SELECT TotalAddGTime, ArrTime, `Month` FROM mytable LIMIT 28"]}
+{"sql":"SELECT DivWheelsOns, DivAirports, TotalAddGTime FROM mytable ORDER BY DestCityName LIMIT 13","hsqls":["SELECT DivWheelsOns, DivAirports, TotalAddGTime FROM mytable ORDER BY DestCityName LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, FirstDepTime, COUNT(*) FROM mytable GROUP BY OriginStateFips, FirstDepTime  ORDER BY OriginStateFips, FirstDepTime LIMIT 5","hsqls":["SELECT OriginStateFips, FirstDepTime, COUNT(*) FROM mytable GROUP BY OriginStateFips, FirstDepTime  ORDER BY OriginStateFips, FirstDepTime LIMIT 5"]}
 {"sql":"SELECT DestAirportSeqID, NASDelay, CRSDepTime, MIN(ArrDelay) FROM mytable WHERE AirlineID <> 19393 AND OriginAirportSeqID >= 1020803 OR Cancelled > 1 GROUP BY DestAirportSeqID, NASDelay, CRSDepTime  ORDER BY DestAirportSeqID, NASDelay, CRSDepTime LIMIT 20","hsqls":["SELECT DestAirportSeqID, NASDelay, CRSDepTime, MIN(ArrDelay) FROM mytable WHERE AirlineID <> 19393 AND OriginAirportSeqID >= 1020803 OR Cancelled > 1 GROUP BY DestAirportSeqID, NASDelay, CRSDepTime  ORDER BY DestAirportSeqID, NASDelay, CRSDepTime LIMIT 20"]}
-{"sql":"SELECT LongestAddGTime, MIN(OriginCityMarketID) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND DivAirports BETWEEN 'COS' AND 'TWF' GROUP BY LongestAddGTime LIMIT 10","hsqls":["SELECT LongestAddGTime, MIN(OriginCityMarketID) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND (DivAirports__MV0 BETWEEN 'COS' AND 'TWF' OR DivAirports__MV1 BETWEEN 'COS' AND 'TWF' OR DivAirports__MV2 BETWEEN 'COS' AND 'TWF' OR DivAirports__MV3 BETWEEN 'COS' AND 'TWF' OR DivAirports__MV4 BETWEEN 'COS' AND 'TWF') GROUP BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, MIN(OriginCityMarketID) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND DivAirports BETWEEN 'COS' AND 'TWF' GROUP BY LongestAddGTime LIMIT 10","hsqls":["SELECT LongestAddGTime, MIN(OriginCityMarketID) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND (DivAirports[1] BETWEEN 'COS' AND 'TWF' OR DivAirports[2] BETWEEN 'COS' AND 'TWF' OR DivAirports[3] BETWEEN 'COS' AND 'TWF' OR DivAirports[4] BETWEEN 'COS' AND 'TWF' OR DivAirports[5] BETWEEN 'COS' AND 'TWF') GROUP BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, AVG(TaxiOut) FROM mytable WHERE Diverted = 1 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 10","hsqls":["SELECT DayofMonth, AVG(TaxiOut) FROM mytable WHERE Diverted = 1 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 10"]}
 {"sql":"SELECT MIN(ArrDelay) FROM mytable WHERE OriginCityName BETWEEN 'Wilmington, DE' AND 'Moline, IL' OR DepTime BETWEEN 1333 AND 1223 AND DepDel15 IN (1) LIMIT 17"}
-{"sql":"SELECT DestAirportSeqID FROM mytable WHERE DivWheelsOffs BETWEEN 1840 AND 2318 ORDER BY DivDistance, DepTime, DivAirportLandings LIMIT 27","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1840 AND 2318 OR DivWheelsOffs__MV1 BETWEEN 1840 AND 2318 OR DivWheelsOffs__MV2 BETWEEN 1840 AND 2318 OR DivWheelsOffs__MV3 BETWEEN 1840 AND 2318 OR DivWheelsOffs__MV4 BETWEEN 1840 AND 2318) ORDER BY DivDistance, DepTime, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, OriginCityMarketID, ArrTimeBlk, AVG(WeatherDelay), MAX(DestWac) FROM mytable WHERE ActualElapsedTime NOT IN (181, 147, 293) AND DivAirportIDs BETWEEN 11618 AND 13204 GROUP BY LateAircraftDelay, OriginCityMarketID, ArrTimeBlk LIMIT 16","hsqls":["SELECT LateAircraftDelay, OriginCityMarketID, ArrTimeBlk, AVG(WeatherDelay), MAX(DestWac) FROM mytable WHERE ActualElapsedTime NOT IN (181, 147, 293) AND (DivAirportIDs__MV0 BETWEEN 11618 AND 13204 OR DivAirportIDs__MV1 BETWEEN 11618 AND 13204 OR DivAirportIDs__MV2 BETWEEN 11618 AND 13204 OR DivAirportIDs__MV3 BETWEEN 11618 AND 13204 OR DivAirportIDs__MV4 BETWEEN 11618 AND 13204) GROUP BY LateAircraftDelay, OriginCityMarketID, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID FROM mytable WHERE DivWheelsOffs BETWEEN 1840 AND 2318 ORDER BY DivDistance, DepTime, DivAirportLandings LIMIT 27","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1840 AND 2318 OR DivWheelsOffs[2] BETWEEN 1840 AND 2318 OR DivWheelsOffs[3] BETWEEN 1840 AND 2318 OR DivWheelsOffs[4] BETWEEN 1840 AND 2318 OR DivWheelsOffs[5] BETWEEN 1840 AND 2318) ORDER BY DivDistance, DepTime, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, OriginCityMarketID, ArrTimeBlk, AVG(WeatherDelay), MAX(DestWac) FROM mytable WHERE ActualElapsedTime NOT IN (181, 147, 293) AND DivAirportIDs BETWEEN 11618 AND 13204 GROUP BY LateAircraftDelay, OriginCityMarketID, ArrTimeBlk LIMIT 16","hsqls":["SELECT LateAircraftDelay, OriginCityMarketID, ArrTimeBlk, AVG(WeatherDelay), MAX(DestWac) FROM mytable WHERE ActualElapsedTime NOT IN (181, 147, 293) AND (DivAirportIDs[1] BETWEEN 11618 AND 13204 OR DivAirportIDs[2] BETWEEN 11618 AND 13204 OR DivAirportIDs[3] BETWEEN 11618 AND 13204 OR DivAirportIDs[4] BETWEEN 11618 AND 13204 OR DivAirportIDs[5] BETWEEN 11618 AND 13204) GROUP BY LateAircraftDelay, OriginCityMarketID, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT FlightNum, SecurityDelay FROM mytable LIMIT 24"}
 {"sql":"SELECT TaxiIn, Dest, MAX(OriginAirportSeqID), AVG(CRSElapsedTime), AVG(DepDelay) FROM mytable WHERE DivDistance BETWEEN 368 AND 251 GROUP BY TaxiIn, Dest  ORDER BY TaxiIn, Dest LIMIT 21","hsqls":["SELECT TaxiIn, Dest, MAX(OriginAirportSeqID), AVG(CRSElapsedTime), AVG(DepDelay) FROM mytable WHERE DivDistance BETWEEN 368 AND 251 GROUP BY TaxiIn, Dest  ORDER BY TaxiIn, Dest LIMIT 21"]}
 {"sql":"SELECT LongestAddGTime, DestCityName FROM mytable WHERE DepTime BETWEEN 548 AND 2210 ORDER BY Flights LIMIT 7"}
-{"sql":"SELECT AVG(ArrivalDelayGroups), MIN(Distance) FROM mytable WHERE DestCityMarketID BETWEEN 31337 AND 35389 OR DivDistance BETWEEN 575 AND 971 AND DivWheelsOns IN (1228, 1007) LIMIT 6","hsqls":["SELECT AVG(ArrivalDelayGroups), MIN(Distance)  FROM mytable WHERE DestCityMarketID BETWEEN 31337 AND 35389 OR DivDistance BETWEEN 575 AND 971 AND (DivWheelsOns__MV0 IN (1228, 1007) OR DivWheelsOns__MV1 IN (1228, 1007) OR DivWheelsOns__MV2 IN (1228, 1007) OR DivWheelsOns__MV3 IN (1228, 1007) OR DivWheelsOns__MV4 IN (1228, 1007)) LIMIT 10000"]}
+{"sql":"SELECT AVG(ArrivalDelayGroups), MIN(Distance) FROM mytable WHERE DestCityMarketID BETWEEN 31337 AND 35389 OR DivDistance BETWEEN 575 AND 971 AND DivWheelsOns IN (1228, 1007) LIMIT 6","hsqls":["SELECT AVG(ArrivalDelayGroups), MIN(Distance)  FROM mytable WHERE DestCityMarketID BETWEEN 31337 AND 35389 OR DivDistance BETWEEN 575 AND 971 AND (DivWheelsOns[1] IN (1228, 1007) OR DivWheelsOns[2] IN (1228, 1007) OR DivWheelsOns[3] IN (1228, 1007) OR DivWheelsOns[4] IN (1228, 1007) OR DivWheelsOns[5] IN (1228, 1007)) LIMIT 10000"]}
 {"sql":"SELECT TailNum, DestAirportID, MIN(TaxiOut), COUNT(AirlineID) FROM mytable WHERE DepDelay BETWEEN 187.0 AND 334.0 AND WheelsOn = 1534 GROUP BY TailNum, DestAirportID  ORDER BY TailNum, DestAirportID LIMIT 22","hsqls":["SELECT TailNum, DestAirportID, MIN(TaxiOut), COUNT(AirlineID) FROM mytable WHERE DepDelay BETWEEN 187.0 AND 334.0 AND WheelsOn = 1534 GROUP BY TailNum, DestAirportID  ORDER BY TailNum, DestAirportID LIMIT 22"]}
 {"sql":"SELECT LateAircraftDelay, COUNT(*) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 29","hsqls":["SELECT LateAircraftDelay, COUNT(*) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 29"]}
 {"sql":"SELECT AVG(CRSElapsedTime), MIN(TaxiIn), COUNT(DivArrDelay) FROM mytable WHERE ActualElapsedTime BETWEEN 379 AND 259 OR OriginState NOT IN ('MT', 'SD', 'NC', 'IN') OR DestState BETWEEN 'MT' AND 'MN' LIMIT 10"}
-{"sql":"SELECT \"Year\" FROM mytable ORDER BY OriginAirportSeqID, OriginState LIMIT 21","hsqls":["SELECT Year FROM mytable ORDER BY OriginAirportSeqID, OriginState LIMIT 21"]}
+{"sql":"SELECT \"Year\" FROM mytable ORDER BY OriginAirportSeqID, OriginState LIMIT 21","hsqls":["SELECT `Year` FROM mytable ORDER BY OriginAirportSeqID, OriginState LIMIT 21"]}
 {"sql":"SELECT DepDelay, DestAirportSeqID, SUM(ArrDelayMinutes), MIN(DepDel15), COUNT(UniqueCarrier) FROM mytable WHERE CarrierDelay IN (59, 43, 7, 118, 85) OR DestAirportSeqID <= 1495203 GROUP BY DepDelay, DestAirportSeqID  ORDER BY DepDelay, DestAirportSeqID LIMIT 4","hsqls":["SELECT DepDelay, DestAirportSeqID, SUM(ArrDelayMinutes), MIN(DepDel15), COUNT(UniqueCarrier) FROM mytable WHERE CarrierDelay IN (59, 43, 7, 118, 85) OR DestAirportSeqID <= 1495203 GROUP BY DepDelay, DestAirportSeqID  ORDER BY DepDelay, DestAirportSeqID LIMIT 4"]}
 {"sql":"SELECT TaxiOut, DistanceGroup, OriginAirportID, COUNT(*) FROM mytable WHERE DepDel15 < -9999 AND ArrDelay BETWEEN -21.0 AND 82.0 AND DepDel15 NOT IN (1, 0, -9999) GROUP BY TaxiOut, DistanceGroup, OriginAirportID  ORDER BY TaxiOut, DistanceGroup, OriginAirportID LIMIT 16","hsqls":["SELECT TaxiOut, DistanceGroup, OriginAirportID, COUNT(*) FROM mytable WHERE DepDel15 < -9999 AND ArrDelay BETWEEN -21.0 AND 82.0 AND DepDel15 NOT IN (1, 0, -9999) GROUP BY TaxiOut, DistanceGroup, OriginAirportID  ORDER BY TaxiOut, DistanceGroup, OriginAirportID LIMIT 16"]}
 {"sql":"SELECT UniqueCarrier FROM mytable ORDER BY CarrierDelay LIMIT 27"}
@@ -2313,28 +2313,28 @@
 {"sql":"SELECT OriginWac, MAX(NASDelay), AVG(WheelsOn) FROM mytable WHERE OriginStateFips NOT IN (48, 41, 40, 33, 72) AND UniqueCarrier NOT IN ('F9', 'OO', 'MQ') OR DivReachedDest <> -9999 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 10","hsqls":["SELECT OriginWac, MAX(NASDelay), AVG(WheelsOn) FROM mytable WHERE OriginStateFips NOT IN (48, 41, 40, 33, 72) AND UniqueCarrier NOT IN ('F9', 'OO', 'MQ') OR DivReachedDest <> -9999 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 10"]}
 {"sql":"SELECT DestAirportSeqID, Cancelled, CRSElapsedTime FROM mytable WHERE DayOfWeek NOT IN (2, 6, 5, 4) ORDER BY ArrDel15"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE NASDelay >= 113 AND ArrDelay <= -41.0 AND ArrTime >= 854 LIMIT 28"}
-{"sql":"SELECT DepartureDelayGroups, \"Month\" FROM mytable WHERE CRSArrTime < 1918 OR DivTotalGTimes BETWEEN 56 AND 85 ORDER BY DistanceGroup, \"Year\", TotalAddGTime LIMIT 17","hsqls":["SELECT DepartureDelayGroups, Month FROM mytable WHERE CRSArrTime < 1918 OR (DivTotalGTimes__MV0 BETWEEN 56 AND 85 OR DivTotalGTimes__MV1 BETWEEN 56 AND 85 OR DivTotalGTimes__MV2 BETWEEN 56 AND 85 OR DivTotalGTimes__MV3 BETWEEN 56 AND 85 OR DivTotalGTimes__MV4 BETWEEN 56 AND 85) ORDER BY DistanceGroup, Year, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, \"Month\" FROM mytable WHERE CRSArrTime < 1918 OR DivTotalGTimes BETWEEN 56 AND 85 ORDER BY DistanceGroup, \"Year\", TotalAddGTime LIMIT 17","hsqls":["SELECT DepartureDelayGroups, `Month` FROM mytable WHERE CRSArrTime < 1918 OR (DivTotalGTimes[1] BETWEEN 56 AND 85 OR DivTotalGTimes[2] BETWEEN 56 AND 85 OR DivTotalGTimes[3] BETWEEN 56 AND 85 OR DivTotalGTimes[4] BETWEEN 56 AND 85 OR DivTotalGTimes[5] BETWEEN 56 AND 85) ORDER BY DistanceGroup, Year, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrDel15) FROM mytable WHERE OriginStateName BETWEEN 'Wyoming' AND 'Alaska' AND OriginStateName BETWEEN 'Delaware' AND 'Puerto Rico' LIMIT 12"}
 {"sql":"SELECT MAX(DestAirportID), MAX(DestStateFips), MIN(DestAirportID) FROM mytable LIMIT 16"}
-{"sql":"SELECT DestState, FirstDepTime, DayofMonth FROM mytable WHERE CRSDepTime < 1223 AND DivWheelsOffs BETWEEN 1609 AND 1711 AND DivAirportIDs BETWEEN 13029 AND 11638 ORDER BY OriginCityMarketID, ArrTime, OriginAirportID LIMIT 27","hsqls":["SELECT DestState, FirstDepTime, DayofMonth FROM mytable WHERE CRSDepTime < 1223 AND (DivWheelsOffs__MV0 BETWEEN 1609 AND 1711 OR DivWheelsOffs__MV1 BETWEEN 1609 AND 1711 OR DivWheelsOffs__MV2 BETWEEN 1609 AND 1711 OR DivWheelsOffs__MV3 BETWEEN 1609 AND 1711 OR DivWheelsOffs__MV4 BETWEEN 1609 AND 1711) AND (DivAirportIDs__MV0 BETWEEN 13029 AND 11638 OR DivAirportIDs__MV1 BETWEEN 13029 AND 11638 OR DivAirportIDs__MV2 BETWEEN 13029 AND 11638 OR DivAirportIDs__MV3 BETWEEN 13029 AND 11638 OR DivAirportIDs__MV4 BETWEEN 13029 AND 11638) ORDER BY OriginCityMarketID, ArrTime, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DestState, FirstDepTime, DayofMonth FROM mytable WHERE CRSDepTime < 1223 AND DivWheelsOffs BETWEEN 1609 AND 1711 AND DivAirportIDs BETWEEN 13029 AND 11638 ORDER BY OriginCityMarketID, ArrTime, OriginAirportID LIMIT 27","hsqls":["SELECT DestState, FirstDepTime, DayofMonth FROM mytable WHERE CRSDepTime < 1223 AND (DivWheelsOffs[1] BETWEEN 1609 AND 1711 OR DivWheelsOffs[2] BETWEEN 1609 AND 1711 OR DivWheelsOffs[3] BETWEEN 1609 AND 1711 OR DivWheelsOffs[4] BETWEEN 1609 AND 1711 OR DivWheelsOffs[5] BETWEEN 1609 AND 1711) AND (DivAirportIDs[1] BETWEEN 13029 AND 11638 OR DivAirportIDs[2] BETWEEN 13029 AND 11638 OR DivAirportIDs[3] BETWEEN 13029 AND 11638 OR DivAirportIDs[4] BETWEEN 13029 AND 11638 OR DivAirportIDs[5] BETWEEN 13029 AND 11638) ORDER BY OriginCityMarketID, ArrTime, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, AVG(CRSDepTime), AVG(OriginStateFips) FROM mytable WHERE LateAircraftDelay IN (128, 93, 87) OR DestAirportID IN (14711, 10423, 11471, 12343) AND LateAircraftDelay BETWEEN 51 AND 250 GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 16","hsqls":["SELECT DestAirportID, AVG(CRSDepTime), AVG(OriginStateFips) FROM mytable WHERE LateAircraftDelay IN (128, 93, 87) OR DestAirportID IN (14711, 10423, 11471, 12343) AND LateAircraftDelay BETWEEN 51 AND 250 GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 16"]}
 {"sql":"SELECT FirstDepTime, DivAirportLandings, CRSElapsedTime FROM mytable WHERE OriginState BETWEEN 'VI' AND 'KS' OR DestStateFips BETWEEN 23 AND 42 ORDER BY DepDelay, ArrTime, DestCityName LIMIT 16"}
 {"sql":"SELECT OriginAirportSeqID, TailNum, COUNT(*) FROM mytable WHERE Quarter >= 1 OR LongestAddGTime IN (78) GROUP BY OriginAirportSeqID, TailNum  ORDER BY OriginAirportSeqID, TailNum LIMIT 1","hsqls":["SELECT OriginAirportSeqID, TailNum, COUNT(*) FROM mytable WHERE Quarter >= 1 OR LongestAddGTime IN (78) GROUP BY OriginAirportSeqID, TailNum  ORDER BY OriginAirportSeqID, TailNum LIMIT 1"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE UniqueCarrier > 'MQ' OR DepartureDelayGroups BETWEEN -2 AND -2 ORDER BY DestStateFips, TaxiIn LIMIT 24"}
 {"sql":"SELECT Diverted FROM mytable WHERE OriginCityMarketID >= 30436 OR DepTime < 753 OR DepTimeBlk < '1800-1859' ORDER BY FirstDepTime, CarrierDelay, Distance LIMIT 15"}
 {"sql":"SELECT TaxiIn, COUNT(*) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 23","hsqls":["SELECT TaxiIn, COUNT(*) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 23"]}
-{"sql":"SELECT DepartureDelayGroups, DistanceGroup, SecurityDelay FROM mytable WHERE DepDelayMinutes <> 10.0 AND DivTotalGTimes IN (97, 56) ORDER BY TaxiOut, OriginAirportID LIMIT 23","hsqls":["SELECT DepartureDelayGroups, DistanceGroup, SecurityDelay FROM mytable WHERE DepDelayMinutes <> 10.0 AND (DivTotalGTimes__MV0 IN (97, 56) OR DivTotalGTimes__MV1 IN (97, 56) OR DivTotalGTimes__MV2 IN (97, 56) OR DivTotalGTimes__MV3 IN (97, 56) OR DivTotalGTimes__MV4 IN (97, 56)) ORDER BY TaxiOut, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DistanceGroup, SecurityDelay FROM mytable WHERE DepDelayMinutes <> 10.0 AND DivTotalGTimes IN (97, 56) ORDER BY TaxiOut, OriginAirportID LIMIT 23","hsqls":["SELECT DepartureDelayGroups, DistanceGroup, SecurityDelay FROM mytable WHERE DepDelayMinutes <> 10.0 AND (DivTotalGTimes[1] IN (97, 56) OR DivTotalGTimes[2] IN (97, 56) OR DivTotalGTimes[3] IN (97, 56) OR DivTotalGTimes[4] IN (97, 56) OR DivTotalGTimes[5] IN (97, 56)) ORDER BY TaxiOut, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DivDistance, DestStateName, COUNT(FirstDepTime), MIN(Flights), SUM(WeatherDelay) FROM mytable WHERE Distance BETWEEN 369 AND 1144 AND FlightDate BETWEEN '2014-01-17' AND '2014-01-10' GROUP BY DivDistance, DestStateName  ORDER BY DivDistance, DestStateName LIMIT 9","hsqls":["SELECT DivDistance, DestStateName, COUNT(FirstDepTime), MIN(Flights), SUM(WeatherDelay) FROM mytable WHERE Distance BETWEEN 369 AND 1144 AND FlightDate BETWEEN '2014-01-17' AND '2014-01-10' GROUP BY DivDistance, DestStateName  ORDER BY DivDistance, DestStateName LIMIT 9"]}
 {"sql":"SELECT MIN(DivAirportLandings) FROM mytable WHERE OriginAirportSeqID > 1425603 LIMIT 20"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1040802, 1160302) LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1040802, 1160302) OR DivAirportSeqIDs__MV1 IN (1040802, 1160302) OR DivAirportSeqIDs__MV2 IN (1040802, 1160302) OR DivAirportSeqIDs__MV3 IN (1040802, 1160302) OR DivAirportSeqIDs__MV4 IN (1040802, 1160302)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1040802, 1160302) LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1040802, 1160302) OR DivAirportSeqIDs[2] IN (1040802, 1160302) OR DivAirportSeqIDs[3] IN (1040802, 1160302) OR DivAirportSeqIDs[4] IN (1040802, 1160302) OR DivAirportSeqIDs[5] IN (1040802, 1160302)) LIMIT 10000"]}
 {"sql":"SELECT TailNum, SUM(AirTime), MAX(Diverted), MIN(DayofMonth) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 12","hsqls":["SELECT TailNum, SUM(AirTime), MAX(Diverted), MIN(DayofMonth) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 12"]}
-{"sql":"SELECT DivLongestGTimes, ArrTimeBlk, DestCityName FROM mytable WHERE DivAirportIDs <= 13024 OR Quarter BETWEEN 1 AND 1 AND DestAirportSeqID NOT IN (1393303, 1164802) ORDER BY OriginState, TaxiIn, \"Month\" LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTimeBlk, DestCityName FROM mytable WHERE (DivAirportIDs__MV0 <= 13024 OR DivAirportIDs__MV1 <= 13024 OR DivAirportIDs__MV2 <= 13024 OR DivAirportIDs__MV3 <= 13024 OR DivAirportIDs__MV4 <= 13024) OR Quarter BETWEEN 1 AND 1 AND DestAirportSeqID NOT IN (1393303, 1164802) ORDER BY OriginState, TaxiIn, Month LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTimeBlk, DestCityName FROM mytable WHERE DivAirportIDs <= 13024 OR Quarter BETWEEN 1 AND 1 AND DestAirportSeqID NOT IN (1393303, 1164802) ORDER BY OriginState, TaxiIn, \"Month\" LIMIT 10","hsqls":["SELECT DivLongestGTimes, ArrTimeBlk, DestCityName FROM mytable WHERE (DivAirportIDs[1] <= 13024 OR DivAirportIDs[2] <= 13024 OR DivAirportIDs[3] <= 13024 OR DivAirportIDs[4] <= 13024 OR DivAirportIDs[5] <= 13024) OR Quarter BETWEEN 1 AND 1 AND DestAirportSeqID NOT IN (1393303, 1164802) ORDER BY OriginState, TaxiIn, `Month` LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY OriginStateFips, ArrivalDelayGroups  ORDER BY OriginStateFips, ArrivalDelayGroups LIMIT 10","hsqls":["SELECT OriginStateFips, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY OriginStateFips, ArrivalDelayGroups  ORDER BY OriginStateFips, ArrivalDelayGroups LIMIT 10"]}
 {"sql":"SELECT WheelsOff, OriginStateFips, OriginCityName, MAX(OriginWac) FROM mytable WHERE Distance <> 1488 AND DestCityMarketID BETWEEN 31624 AND 30990 OR TotalAddGTime NOT IN (55) GROUP BY WheelsOff, OriginStateFips, OriginCityName  ORDER BY WheelsOff, OriginStateFips, OriginCityName LIMIT 18","hsqls":["SELECT WheelsOff, OriginStateFips, OriginCityName, MAX(OriginWac) FROM mytable WHERE Distance <> 1488 AND DestCityMarketID BETWEEN 31624 AND 30990 OR TotalAddGTime NOT IN (55) GROUP BY WheelsOff, OriginStateFips, OriginCityName  ORDER BY WheelsOff, OriginStateFips, OriginCityName LIMIT 18"]}
-{"sql":"SELECT DivLongestGTimes, OriginCityName, DestCityMarketID FROM mytable WHERE Dest IN ('CEC', 'ELM', 'FAI', 'ABI', 'SCC') AND SecurityDelay BETWEEN 8 AND 4 AND OriginWac BETWEEN 42 AND 88 ORDER BY DepartureDelayGroups LIMIT 19","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginCityName, DestCityMarketID FROM mytable WHERE Dest IN ('CEC', 'ELM', 'FAI', 'ABI', 'SCC') AND SecurityDelay BETWEEN 8 AND 4 AND OriginWac BETWEEN 42 AND 88 ORDER BY DepartureDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND TaxiIn BETWEEN 9 AND 46 LIMIT 29","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CRSElapsedTime FROM mytable WHERE Month BETWEEN 1 AND 1 AND TaxiIn BETWEEN 9 AND 46 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginCityName, DestCityMarketID FROM mytable WHERE Dest IN ('CEC', 'ELM', 'FAI', 'ABI', 'SCC') AND SecurityDelay BETWEEN 8 AND 4 AND OriginWac BETWEEN 42 AND 88 ORDER BY DepartureDelayGroups LIMIT 19","hsqls":["SELECT DivLongestGTimes, OriginCityName, DestCityMarketID FROM mytable WHERE Dest IN ('CEC', 'ELM', 'FAI', 'ABI', 'SCC') AND SecurityDelay BETWEEN 8 AND 4 AND OriginWac BETWEEN 42 AND 88 ORDER BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND TaxiIn BETWEEN 9 AND 46 LIMIT 29","hsqls":["SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND TaxiIn BETWEEN 9 AND 46 LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Dest, CRSDepTime FROM mytable WHERE ActualElapsedTime NOT IN (140, 264, 273) AND Flights IN (1) ORDER BY ArrTime, DivAirportLandings, OriginAirportID LIMIT 10"}
-{"sql":"SELECT WheelsOff, DepDelay, DestState, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 1, -2, 11) OR DivWheelsOns >= 1925 AND TailNum BETWEEN 'N38424' AND 'N495UA' GROUP BY WheelsOff, DepDelay, DestState LIMIT 21","hsqls":["SELECT WheelsOff, DepDelay, DestState, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 1, -2, 11) OR (DivWheelsOns__MV0 >= 1925 OR DivWheelsOns__MV1 >= 1925 OR DivWheelsOns__MV2 >= 1925 OR DivWheelsOns__MV3 >= 1925 OR DivWheelsOns__MV4 >= 1925) AND TailNum BETWEEN 'N38424' AND 'N495UA' GROUP BY WheelsOff, DepDelay, DestState LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DepDelay, DestState, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 1, -2, 11) OR DivWheelsOns >= 1925 AND TailNum BETWEEN 'N38424' AND 'N495UA' GROUP BY WheelsOff, DepDelay, DestState LIMIT 21","hsqls":["SELECT WheelsOff, DepDelay, DestState, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 1, -2, 11) OR (DivWheelsOns[1] >= 1925 OR DivWheelsOns[2] >= 1925 OR DivWheelsOns[3] >= 1925 OR DivWheelsOns[4] >= 1925 OR DivWheelsOns[5] >= 1925) AND TailNum BETWEEN 'N38424' AND 'N495UA' GROUP BY WheelsOff, DepDelay, DestState LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, NASDelay FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1000-1059', '0700-0759', '2100-2159', '1200-1259') AND SecurityDelay > -9999 ORDER BY DepartureDelayGroups LIMIT 29"}
 {"sql":"SELECT WheelsOff, DayofMonth, WheelsOn FROM mytable WHERE OriginCityName BETWEEN 'Arcata/Eureka, CA' AND 'Akron, OH' OR DestState BETWEEN 'ME' AND 'ID' ORDER BY TaxiOut LIMIT 11"}
 {"sql":"SELECT OriginCityName, AVG(TotalAddGTime), MAX(OriginCityMarketID), COUNT(NASDelay) FROM mytable WHERE DayOfWeek = 2 OR DivActualElapsedTime NOT IN (471, 359) AND DestCityMarketID BETWEEN 34492 AND 35411 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 16","hsqls":["SELECT OriginCityName, AVG(TotalAddGTime), MAX(OriginCityMarketID), COUNT(NASDelay) FROM mytable WHERE DayOfWeek = 2 OR DivActualElapsedTime NOT IN (471, 359) AND DestCityMarketID BETWEEN 34492 AND 35411 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 16"]}
@@ -2342,21 +2342,21 @@
 {"sql":"SELECT TaxiOut FROM mytable WHERE DestState = 'NJ' ORDER BY DivReachedDest, CarrierDelay LIMIT 18"}
 {"sql":"SELECT OriginAirportSeqID, AirlineID FROM mytable LIMIT 9"}
 {"sql":"SELECT DayofMonth, DaysSinceEpoch, MIN(ArrDelayMinutes), SUM(ArrivalDelayGroups), COUNT(OriginWac) FROM mytable WHERE ArrDelayMinutes BETWEEN 23.0 AND 245.0 OR ArrTimeBlk BETWEEN '0600-0659' AND '1200-1259' GROUP BY DayofMonth, DaysSinceEpoch  ORDER BY DayofMonth, DaysSinceEpoch LIMIT 6","hsqls":["SELECT DayofMonth, DaysSinceEpoch, MIN(ArrDelayMinutes), SUM(ArrivalDelayGroups), COUNT(OriginWac) FROM mytable WHERE ArrDelayMinutes BETWEEN 23.0 AND 245.0 OR ArrTimeBlk BETWEEN '0600-0659' AND '1200-1259' GROUP BY DayofMonth, DaysSinceEpoch  ORDER BY DayofMonth, DaysSinceEpoch LIMIT 6"]}
-{"sql":"SELECT DestStateFips, DepDel15, AVG(DayofMonth), SUM(ArrDelay), MAX(DestWac) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY DestStateFips, DepDel15 LIMIT 20","hsqls":["SELECT DestStateFips, DepDel15, AVG(DayofMonth), SUM(ArrDelay), MAX(DestWac) FROM mytable WHERE Year BETWEEN 2014 AND 2014 GROUP BY DestStateFips, DepDel15 LIMIT 20"]}
+{"sql":"SELECT DestStateFips, DepDel15, AVG(DayofMonth), SUM(ArrDelay), MAX(DestWac) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY DestStateFips, DepDel15 LIMIT 20","hsqls":["SELECT DestStateFips, DepDel15, AVG(DayofMonth), SUM(ArrDelay), MAX(DestWac) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 GROUP BY DestStateFips, DepDel15 LIMIT 20"]}
 {"sql":"SELECT DivDistance, COUNT(Quarter), COUNT(TaxiIn), COUNT(DepTimeBlk) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 13","hsqls":["SELECT DivDistance, COUNT(Quarter), COUNT(TaxiIn), COUNT(DepTimeBlk) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 13"]}
 {"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE TaxiOut BETWEEN 7 AND 44 ORDER BY LateAircraftDelay, DepTime LIMIT 5"}
 {"sql":"SELECT TailNum FROM mytable WHERE OriginAirportSeqID BETWEEN 1112202 AND 1080003 ORDER BY FirstDepTime LIMIT 19"}
 {"sql":"SELECT ActualElapsedTime, ArrTime, DivAirportLandings, MAX(ActualElapsedTime) FROM mytable WHERE OriginState <> 'NE' GROUP BY ActualElapsedTime, ArrTime, DivAirportLandings  ORDER BY ActualElapsedTime, ArrTime, DivAirportLandings LIMIT 25","hsqls":["SELECT ActualElapsedTime, ArrTime, DivAirportLandings, MAX(ActualElapsedTime) FROM mytable WHERE OriginState <> 'NE' GROUP BY ActualElapsedTime, ArrTime, DivAirportLandings  ORDER BY ActualElapsedTime, ArrTime, DivAirportLandings LIMIT 25"]}
 {"sql":"SELECT SUM(LongestAddGTime), COUNT(ActualElapsedTime), SUM(Quarter) FROM mytable WHERE Cancelled IN (1, 0) OR CRSArrTime BETWEEN 1043 AND 1357"}
-{"sql":"SELECT DistanceGroup, DestWac, AVG(ArrivalDelayGroups), MIN(\"Month\") FROM mytable WHERE \"Year\" IN (2014) GROUP BY DistanceGroup, DestWac LIMIT 5","hsqls":["SELECT DistanceGroup, DestWac, AVG(ArrivalDelayGroups), MIN(Month) FROM mytable WHERE Year IN (2014) GROUP BY DistanceGroup, DestWac LIMIT 5"]}
-{"sql":"SELECT MAX(CRSArrTime) FROM mytable WHERE DivTailNums BETWEEN 'N957DN' AND 'N416WN' OR ArrivalDelayGroups <> 3 AND OriginAirportSeqID BETWEEN 1489302 AND 1059904 LIMIT 13","hsqls":["SELECT MAX(CRSArrTime) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums__MV1 BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums__MV2 BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums__MV3 BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums__MV4 BETWEEN 'N957DN' AND 'N416WN') OR ArrivalDelayGroups <> 3 AND OriginAirportSeqID BETWEEN 1489302 AND 1059904 LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestWac, AVG(ArrivalDelayGroups), MIN(\"Month\") FROM mytable WHERE \"Year\" IN (2014) GROUP BY DistanceGroup, DestWac LIMIT 5","hsqls":["SELECT DistanceGroup, DestWac, AVG(ArrivalDelayGroups), MIN(`Month`) FROM mytable WHERE `Year` IN (2014) GROUP BY DistanceGroup, DestWac LIMIT 5"]}
+{"sql":"SELECT MAX(CRSArrTime) FROM mytable WHERE DivTailNums BETWEEN 'N957DN' AND 'N416WN' OR ArrivalDelayGroups <> 3 AND OriginAirportSeqID BETWEEN 1489302 AND 1059904 LIMIT 13","hsqls":["SELECT MAX(CRSArrTime) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums[2] BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums[3] BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums[4] BETWEEN 'N957DN' AND 'N416WN' OR DivTailNums[5] BETWEEN 'N957DN' AND 'N416WN') OR ArrivalDelayGroups <> 3 AND OriginAirportSeqID BETWEEN 1489302 AND 1059904 LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, COUNT(ArrDelayMinutes) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 9","hsqls":["SELECT DepartureDelayGroups, COUNT(ArrDelayMinutes) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 9"]}
 {"sql":"SELECT OriginState, LongestAddGTime, DivArrDelay FROM mytable WHERE DepDelayMinutes >= 106.0 OR FirstDepTime IN (814, 1939) OR NASDelay NOT IN (211, 56, 16, 63) ORDER BY NASDelay, DestAirportID LIMIT 10"}
 {"sql":"SELECT Distance, DivArrDelay, OriginAirportID FROM mytable WHERE DaysSinceEpoch NOT IN (16085) LIMIT 24"}
-{"sql":"SELECT DivReachedDest, TaxiIn, WheelsOn FROM mytable WHERE ActualElapsedTime <= 103 OR DivWheelsOffs BETWEEN 1711 AND 1952 AND DivAirports BETWEEN 'MLI' AND 'ORD' ORDER BY FlightNum, DestAirportID LIMIT 13","hsqls":["SELECT DivReachedDest, TaxiIn, WheelsOn FROM mytable WHERE ActualElapsedTime <= 103 OR (DivWheelsOffs__MV0 BETWEEN 1711 AND 1952 OR DivWheelsOffs__MV1 BETWEEN 1711 AND 1952 OR DivWheelsOffs__MV2 BETWEEN 1711 AND 1952 OR DivWheelsOffs__MV3 BETWEEN 1711 AND 1952 OR DivWheelsOffs__MV4 BETWEEN 1711 AND 1952) AND (DivAirports__MV0 BETWEEN 'MLI' AND 'ORD' OR DivAirports__MV1 BETWEEN 'MLI' AND 'ORD' OR DivAirports__MV2 BETWEEN 'MLI' AND 'ORD' OR DivAirports__MV3 BETWEEN 'MLI' AND 'ORD' OR DivAirports__MV4 BETWEEN 'MLI' AND 'ORD') ORDER BY FlightNum, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivAirportIDs, DestAirportID FROM mytable LIMIT 17","hsqls":["SELECT DestWac, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DestAirportID FROM mytable LIMIT 10000"]}
-{"sql":"SELECT Flights, DestStateName FROM mytable WHERE DestWac NOT IN (11) AND DivWheelsOffs IN (1524, 1901, 1621) AND DayOfWeek NOT IN (2, 7, 5) ORDER BY OriginAirportSeqID, ArrivalDelayGroups LIMIT 21","hsqls":["SELECT Flights, DestStateName FROM mytable WHERE DestWac NOT IN (11) AND (DivWheelsOffs__MV0 IN (1524, 1901, 1621) OR DivWheelsOffs__MV1 IN (1524, 1901, 1621) OR DivWheelsOffs__MV2 IN (1524, 1901, 1621) OR DivWheelsOffs__MV3 IN (1524, 1901, 1621) OR DivWheelsOffs__MV4 IN (1524, 1901, 1621)) AND DayOfWeek NOT IN (2, 7, 5) ORDER BY OriginAirportSeqID, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'California' AND 'Maine' AND DivTotalGTimes BETWEEN 1 AND 159 AND DepartureDelayGroups NOT IN (2, -1, 12) LIMIT 24","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'California' AND 'Maine' AND (DivTotalGTimes__MV0 BETWEEN 1 AND 159 OR DivTotalGTimes__MV1 BETWEEN 1 AND 159 OR DivTotalGTimes__MV2 BETWEEN 1 AND 159 OR DivTotalGTimes__MV3 BETWEEN 1 AND 159 OR DivTotalGTimes__MV4 BETWEEN 1 AND 159) AND DepartureDelayGroups NOT IN (2, -1, 12) LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, TaxiIn, WheelsOn FROM mytable WHERE ActualElapsedTime <= 103 OR DivWheelsOffs BETWEEN 1711 AND 1952 AND DivAirports BETWEEN 'MLI' AND 'ORD' ORDER BY FlightNum, DestAirportID LIMIT 13","hsqls":["SELECT DivReachedDest, TaxiIn, WheelsOn FROM mytable WHERE ActualElapsedTime <= 103 OR (DivWheelsOffs[1] BETWEEN 1711 AND 1952 OR DivWheelsOffs[2] BETWEEN 1711 AND 1952 OR DivWheelsOffs[3] BETWEEN 1711 AND 1952 OR DivWheelsOffs[4] BETWEEN 1711 AND 1952 OR DivWheelsOffs[5] BETWEEN 1711 AND 1952) AND (DivAirports[1] BETWEEN 'MLI' AND 'ORD' OR DivAirports[2] BETWEEN 'MLI' AND 'ORD' OR DivAirports[3] BETWEEN 'MLI' AND 'ORD' OR DivAirports[4] BETWEEN 'MLI' AND 'ORD' OR DivAirports[5] BETWEEN 'MLI' AND 'ORD') ORDER BY FlightNum, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirportIDs, DestAirportID FROM mytable LIMIT 17","hsqls":["SELECT DestWac, DivAirportIDs, DestAirportID FROM mytable LIMIT 10000"]}
+{"sql":"SELECT Flights, DestStateName FROM mytable WHERE DestWac NOT IN (11) AND DivWheelsOffs IN (1524, 1901, 1621) AND DayOfWeek NOT IN (2, 7, 5) ORDER BY OriginAirportSeqID, ArrivalDelayGroups LIMIT 21","hsqls":["SELECT Flights, DestStateName FROM mytable WHERE DestWac NOT IN (11) AND (DivWheelsOffs[1] IN (1524, 1901, 1621) OR DivWheelsOffs[2] IN (1524, 1901, 1621) OR DivWheelsOffs[3] IN (1524, 1901, 1621) OR DivWheelsOffs[4] IN (1524, 1901, 1621) OR DivWheelsOffs[5] IN (1524, 1901, 1621)) AND DayOfWeek NOT IN (2, 7, 5) ORDER BY OriginAirportSeqID, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'California' AND 'Maine' AND DivTotalGTimes BETWEEN 1 AND 159 AND DepartureDelayGroups NOT IN (2, -1, 12) LIMIT 24","hsqls":["SELECT DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'California' AND 'Maine' AND (DivTotalGTimes[1] BETWEEN 1 AND 159 OR DivTotalGTimes[2] BETWEEN 1 AND 159 OR DivTotalGTimes[3] BETWEEN 1 AND 159 OR DivTotalGTimes[4] BETWEEN 1 AND 159 OR DivTotalGTimes[5] BETWEEN 1 AND 159) AND DepartureDelayGroups NOT IN (2, -1, 12) LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DayOfWeek, COUNT(OriginCityName) FROM mytable WHERE DestWac > 74 GROUP BY WeatherDelay, DayOfWeek  ORDER BY WeatherDelay, DayOfWeek LIMIT 8","hsqls":["SELECT WeatherDelay, DayOfWeek, COUNT(OriginCityName) FROM mytable WHERE DestWac > 74 GROUP BY WeatherDelay, DayOfWeek  ORDER BY WeatherDelay, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDel15 = -9999 OR DestStateName < 'Idaho' LIMIT 3"}
 {"sql":"SELECT DepDelay, Carrier, DivDistance FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) OR OriginWac BETWEEN 1 AND 3 OR OriginAirportSeqID BETWEEN 1177801 AND 1087402 ORDER BY DaysSinceEpoch LIMIT 1"}
@@ -2369,52 +2369,52 @@
 {"sql":"SELECT SecurityDelay, DayOfWeek, SUM(ArrivalDelayGroups), SUM(LateAircraftDelay) FROM mytable WHERE DivArrDelay BETWEEN 449 AND 141 GROUP BY SecurityDelay, DayOfWeek  ORDER BY SecurityDelay, DayOfWeek LIMIT 11","hsqls":["SELECT SecurityDelay, DayOfWeek, SUM(ArrivalDelayGroups), SUM(LateAircraftDelay) FROM mytable WHERE DivArrDelay BETWEEN 449 AND 141 GROUP BY SecurityDelay, DayOfWeek  ORDER BY SecurityDelay, DayOfWeek LIMIT 11"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE DestStateName <= 'Wyoming' ORDER BY DivActualElapsedTime LIMIT 7"}
 {"sql":"SELECT DestWac, OriginCityMarketID, DestCityName FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) ORDER BY FlightNum, WeatherDelay, DestStateName LIMIT 7"}
-{"sql":"SELECT FlightDate, TotalAddGTime FROM mytable WHERE DivAirports < 'SIT' OR DepDelay NOT IN (329.0, 39.0) ORDER BY FlightNum LIMIT 10","hsqls":["SELECT FlightDate, TotalAddGTime FROM mytable WHERE (DivAirports__MV0 < 'SIT' OR DivAirports__MV1 < 'SIT' OR DivAirports__MV2 < 'SIT' OR DivAirports__MV3 < 'SIT' OR DivAirports__MV4 < 'SIT') OR DepDelay NOT IN (329.0, 39.0) ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT FlightDate, TotalAddGTime FROM mytable WHERE DivAirports < 'SIT' OR DepDelay NOT IN (329.0, 39.0) ORDER BY FlightNum LIMIT 10","hsqls":["SELECT FlightDate, TotalAddGTime FROM mytable WHERE (DivAirports[1] < 'SIT' OR DivAirports[2] < 'SIT' OR DivAirports[3] < 'SIT' OR DivAirports[4] < 'SIT' OR DivAirports[5] < 'SIT') OR DepDelay NOT IN (329.0, 39.0) ORDER BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE DivReachedDest < 1 ORDER BY ArrDel15, DivArrDelay LIMIT 18"}
-{"sql":"SELECT DistanceGroup, DivDistance, Flights FROM mytable WHERE TailNum IN ('N223SW') OR DivTailNums BETWEEN 'N904FR' AND 'N27213' AND FirstDepTime >= 736 ORDER BY DepartureDelayGroups LIMIT 18","hsqls":["SELECT DistanceGroup, DivDistance, Flights FROM mytable WHERE TailNum IN ('N223SW') OR (DivTailNums__MV0 BETWEEN 'N904FR' AND 'N27213' OR DivTailNums__MV1 BETWEEN 'N904FR' AND 'N27213' OR DivTailNums__MV2 BETWEEN 'N904FR' AND 'N27213' OR DivTailNums__MV3 BETWEEN 'N904FR' AND 'N27213' OR DivTailNums__MV4 BETWEEN 'N904FR' AND 'N27213') AND FirstDepTime >= 736 ORDER BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivDistance, Flights FROM mytable WHERE TailNum IN ('N223SW') OR DivTailNums BETWEEN 'N904FR' AND 'N27213' AND FirstDepTime >= 736 ORDER BY DepartureDelayGroups LIMIT 18","hsqls":["SELECT DistanceGroup, DivDistance, Flights FROM mytable WHERE TailNum IN ('N223SW') OR (DivTailNums[1] BETWEEN 'N904FR' AND 'N27213' OR DivTailNums[2] BETWEEN 'N904FR' AND 'N27213' OR DivTailNums[3] BETWEEN 'N904FR' AND 'N27213' OR DivTailNums[4] BETWEEN 'N904FR' AND 'N27213' OR DivTailNums[5] BETWEEN 'N904FR' AND 'N27213') AND FirstDepTime >= 736 ORDER BY DepartureDelayGroups LIMIT 10000"]}
 {"sql":"SELECT AVG(NASDelay), MAX(LongestAddGTime), AVG(FirstDepTime) FROM mytable WHERE Origin BETWEEN 'SEA' AND 'SMF' LIMIT 24"}
 {"sql":"SELECT DepDelay FROM mytable WHERE CarrierDelay BETWEEN 16 AND 86 LIMIT 1"}
-{"sql":"SELECT DivAirports, Distance, ArrTime FROM mytable WHERE TotalAddGTime BETWEEN 30 AND 32 AND AirTime IN (238) ORDER BY DivDistance, Origin, CancellationCode LIMIT 7","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Distance, ArrTime FROM mytable WHERE TotalAddGTime BETWEEN 30 AND 32 AND AirTime IN (238) ORDER BY DivDistance, Origin, CancellationCode LIMIT 10000"]}
-{"sql":"SELECT MIN(\"Year\"), COUNT(DestWac), MAX(DestCityMarketID) FROM mytable WHERE DivWheelsOns IN (1724, 1120, 723, 1613) OR FlightNum < 2412 LIMIT 2","hsqls":["SELECT MIN(Year), COUNT(DestWac), MAX(DestCityMarketID)  FROM mytable WHERE (DivWheelsOns__MV0 IN (1724, 1120, 723, 1613) OR DivWheelsOns__MV1 IN (1724, 1120, 723, 1613) OR DivWheelsOns__MV2 IN (1724, 1120, 723, 1613) OR DivWheelsOns__MV3 IN (1724, 1120, 723, 1613) OR DivWheelsOns__MV4 IN (1724, 1120, 723, 1613)) OR FlightNum < 2412 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, Distance, ArrTime FROM mytable WHERE TotalAddGTime BETWEEN 30 AND 32 AND AirTime IN (238) ORDER BY DivDistance, Origin, CancellationCode LIMIT 7","hsqls":["SELECT DivAirports, Distance, ArrTime FROM mytable WHERE TotalAddGTime BETWEEN 30 AND 32 AND AirTime IN (238) ORDER BY DivDistance, Origin, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT MIN(\"Year\"), COUNT(DestWac), MAX(DestCityMarketID) FROM mytable WHERE DivWheelsOns IN (1724, 1120, 723, 1613) OR FlightNum < 2412 LIMIT 2","hsqls":["SELECT MIN(`Year`), COUNT(DestWac), MAX(DestCityMarketID)  FROM mytable WHERE (DivWheelsOns[1] IN (1724, 1120, 723, 1613) OR DivWheelsOns[2] IN (1724, 1120, 723, 1613) OR DivWheelsOns[3] IN (1724, 1120, 723, 1613) OR DivWheelsOns[4] IN (1724, 1120, 723, 1613) OR DivWheelsOns[5] IN (1724, 1120, 723, 1613)) OR FlightNum < 2412 LIMIT 10000"]}
 {"sql":"SELECT MAX(OriginAirportSeqID), MIN(DestAirportID) FROM mytable LIMIT 8"}
 {"sql":"SELECT AVG(ArrTime), AVG(DivDistance), MIN(NASDelay) FROM mytable LIMIT 22"}
 {"sql":"SELECT DayOfWeek, MIN(ArrDel15), MIN(DepDelay), MAX(WeatherDelay) FROM mytable WHERE TaxiIn <> 94 OR Quarter BETWEEN 1 AND 1 AND AirlineID NOT IN (19690) GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 25","hsqls":["SELECT DayOfWeek, MIN(ArrDel15), MIN(DepDelay), MAX(WeatherDelay) FROM mytable WHERE TaxiIn <> 94 OR Quarter BETWEEN 1 AND 1 AND AirlineID NOT IN (19690) GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 25"]}
 {"sql":"SELECT DivReachedDest, AVG(TotalAddGTime), COUNT(OriginStateFips), AVG(DestCityMarketID) FROM mytable WHERE DepTimeBlk NOT IN ('1100-1159', '2300-2359', '0600-0659', '0800-0859', '1900-1959') OR DepDelayMinutes IN (260.0, 111.0, 206.0) GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 9","hsqls":["SELECT DivReachedDest, AVG(TotalAddGTime), COUNT(OriginStateFips), AVG(DestCityMarketID) FROM mytable WHERE DepTimeBlk NOT IN ('1100-1159', '2300-2359', '0600-0659', '0800-0859', '1900-1959') OR DepDelayMinutes IN (260.0, 111.0, 206.0) GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 9"]}
 {"sql":"SELECT OriginCityMarketID, ArrTime, ArrivalDelayGroups, MAX(ArrDelay), AVG(DestAirportID) FROM mytable GROUP BY OriginCityMarketID, ArrTime, ArrivalDelayGroups  ORDER BY OriginCityMarketID, ArrTime, ArrivalDelayGroups LIMIT 6","hsqls":["SELECT OriginCityMarketID, ArrTime, ArrivalDelayGroups, MAX(ArrDelay), AVG(DestAirportID) FROM mytable GROUP BY OriginCityMarketID, ArrTime, ArrivalDelayGroups  ORDER BY OriginCityMarketID, ArrTime, ArrivalDelayGroups LIMIT 6"]}
 {"sql":"SELECT DestAirportSeqID, OriginAirportID, AVG(DepDelayMinutes) FROM mytable WHERE DestWac <= 22 OR ActualElapsedTime BETWEEN 207 AND 160 GROUP BY DestAirportSeqID, OriginAirportID  ORDER BY DestAirportSeqID, OriginAirportID LIMIT 25","hsqls":["SELECT DestAirportSeqID, OriginAirportID, AVG(DepDelayMinutes) FROM mytable WHERE DestWac <= 22 OR ActualElapsedTime BETWEEN 207 AND 160 GROUP BY DestAirportSeqID, OriginAirportID  ORDER BY DestAirportSeqID, OriginAirportID LIMIT 25"]}
-{"sql":"SELECT DestStateFips, DayofMonth, DivArrDelay, SUM(ArrDelay), MIN(\"Month\"), MAX(ArrTime) FROM mytable GROUP BY DestStateFips, DayofMonth, DivArrDelay LIMIT 24","hsqls":["SELECT DestStateFips, DayofMonth, DivArrDelay, SUM(ArrDelay), MIN(Month), MAX(ArrTime) FROM mytable GROUP BY DestStateFips, DayofMonth, DivArrDelay LIMIT 24"]}
+{"sql":"SELECT DestStateFips, DayofMonth, DivArrDelay, SUM(ArrDelay), MIN(\"Month\"), MAX(ArrTime) FROM mytable GROUP BY DestStateFips, DayofMonth, DivArrDelay LIMIT 24","hsqls":["SELECT DestStateFips, DayofMonth, DivArrDelay, SUM(ArrDelay), MIN(`Month`), MAX(ArrTime) FROM mytable GROUP BY DestStateFips, DayofMonth, DivArrDelay LIMIT 24"]}
 {"sql":"SELECT MIN(ArrTime), MAX(DestWac) FROM mytable LIMIT 7"}
 {"sql":"SELECT CarrierDelay, TotalAddGTime, ArrivalDelayGroups FROM mytable WHERE TotalAddGTime >= 25 AND Origin IN ('LAR', 'ALB', 'CAK', 'MSO', 'FAR') AND DistanceGroup BETWEEN 3 AND 5 LIMIT 20"}
-{"sql":"SELECT AirTime, AirlineID, \"Month\", COUNT(ActualElapsedTime) FROM mytable WHERE Flights > 1 OR DepDelay NOT IN (207.0, 49.0) GROUP BY AirTime, AirlineID, \"Month\" LIMIT 22","hsqls":["SELECT AirTime, AirlineID, Month, COUNT(ActualElapsedTime) FROM mytable WHERE Flights > 1 OR DepDelay NOT IN (207.0, 49.0) GROUP BY AirTime, AirlineID, Month LIMIT 22"]}
+{"sql":"SELECT AirTime, AirlineID, \"Month\", COUNT(ActualElapsedTime) FROM mytable WHERE Flights > 1 OR DepDelay NOT IN (207.0, 49.0) GROUP BY AirTime, AirlineID, \"Month\" LIMIT 22","hsqls":["SELECT AirTime, AirlineID, Month, COUNT(ActualElapsedTime) FROM mytable WHERE Flights > 1 OR DepDelay NOT IN (207.0, 49.0) GROUP BY AirTime, AirlineID, `Month` LIMIT 22"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE TaxiOut BETWEEN 27 AND 68 ORDER BY SecurityDelay, DestAirportID LIMIT 13"}
 {"sql":"SELECT ArrDelayMinutes, DivAirportLandings, DayOfWeek FROM mytable WHERE OriginAirportID NOT IN (15295, 11423) ORDER BY OriginStateFips, DayofMonth LIMIT 23"}
-{"sql":"SELECT ArrTime, CancellationCode, OriginStateName FROM mytable WHERE DivAirports BETWEEN 'PIT' AND 'GTF' AND DivWheelsOffs IN (1733, 1222, 1906) OR ArrDel15 <= 1 ORDER BY ActualElapsedTime, DestStateName, NASDelay LIMIT 6","hsqls":["SELECT ArrTime, CancellationCode, OriginStateName FROM mytable WHERE (DivAirports__MV0 BETWEEN 'PIT' AND 'GTF' OR DivAirports__MV1 BETWEEN 'PIT' AND 'GTF' OR DivAirports__MV2 BETWEEN 'PIT' AND 'GTF' OR DivAirports__MV3 BETWEEN 'PIT' AND 'GTF' OR DivAirports__MV4 BETWEEN 'PIT' AND 'GTF') AND (DivWheelsOffs__MV0 IN (1733, 1222, 1906) OR DivWheelsOffs__MV1 IN (1733, 1222, 1906) OR DivWheelsOffs__MV2 IN (1733, 1222, 1906) OR DivWheelsOffs__MV3 IN (1733, 1222, 1906) OR DivWheelsOffs__MV4 IN (1733, 1222, 1906)) OR ArrDel15 <= 1 ORDER BY ActualElapsedTime, DestStateName, NASDelay LIMIT 10000"]}
+{"sql":"SELECT ArrTime, CancellationCode, OriginStateName FROM mytable WHERE DivAirports BETWEEN 'PIT' AND 'GTF' AND DivWheelsOffs IN (1733, 1222, 1906) OR ArrDel15 <= 1 ORDER BY ActualElapsedTime, DestStateName, NASDelay LIMIT 6","hsqls":["SELECT ArrTime, CancellationCode, OriginStateName FROM mytable WHERE (DivAirports[1] BETWEEN 'PIT' AND 'GTF' OR DivAirports[2] BETWEEN 'PIT' AND 'GTF' OR DivAirports[3] BETWEEN 'PIT' AND 'GTF' OR DivAirports[4] BETWEEN 'PIT' AND 'GTF' OR DivAirports[5] BETWEEN 'PIT' AND 'GTF') AND (DivWheelsOffs[1] IN (1733, 1222, 1906) OR DivWheelsOffs[2] IN (1733, 1222, 1906) OR DivWheelsOffs[3] IN (1733, 1222, 1906) OR DivWheelsOffs[4] IN (1733, 1222, 1906) OR DivWheelsOffs[5] IN (1733, 1222, 1906)) OR ArrDel15 <= 1 ORDER BY ActualElapsedTime, DestStateName, NASDelay LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, WheelsOn, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 GROUP BY DivReachedDest, WheelsOn  ORDER BY DivReachedDest, WheelsOn LIMIT 5","hsqls":["SELECT DivReachedDest, WheelsOn, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 GROUP BY DivReachedDest, WheelsOn  ORDER BY DivReachedDest, WheelsOn LIMIT 5"]}
 {"sql":"SELECT TaxiIn, Cancelled FROM mytable WHERE DepDelay IN (145.0, 28.0, 9.0, 142.0) ORDER BY OriginStateFips, ArrTime, ArrDelayMinutes LIMIT 23"}
 {"sql":"SELECT ArrDel15, DepTimeBlk, DaysSinceEpoch, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1800-1859' AND '1300-1359' AND NASDelay BETWEEN 63 AND 14 GROUP BY ArrDel15, DepTimeBlk, DaysSinceEpoch  ORDER BY ArrDel15, DepTimeBlk, DaysSinceEpoch LIMIT 3","hsqls":["SELECT ArrDel15, DepTimeBlk, DaysSinceEpoch, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1800-1859' AND '1300-1359' AND NASDelay BETWEEN 63 AND 14 GROUP BY ArrDel15, DepTimeBlk, DaysSinceEpoch  ORDER BY ArrDel15, DepTimeBlk, DaysSinceEpoch LIMIT 3"]}
-{"sql":"SELECT DepTime, DestCityName, Origin FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DistanceGroup IN (2) ORDER BY DepartureDelayGroups, AirTime, CRSElapsedTime LIMIT 4","hsqls":["SELECT DepTime, DestCityName, Origin FROM mytable WHERE Month BETWEEN 1 AND 1 AND DistanceGroup IN (2) ORDER BY DepartureDelayGroups, AirTime, CRSElapsedTime LIMIT 4"]}
-{"sql":"SELECT Quarter, DivAirportSeqIDs, DaysSinceEpoch FROM mytable WHERE DivDistance <= 183 OR OriginWac <= 37 AND DivAirports IN ('ILM') LIMIT 18","hsqls":["SELECT Quarter, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DaysSinceEpoch FROM mytable WHERE DivDistance <= 183 OR OriginWac <= 37 AND (DivAirports__MV0 IN ('ILM') OR DivAirports__MV1 IN ('ILM') OR DivAirports__MV2 IN ('ILM') OR DivAirports__MV3 IN ('ILM') OR DivAirports__MV4 IN ('ILM')) LIMIT 10000"]}
+{"sql":"SELECT DepTime, DestCityName, Origin FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DistanceGroup IN (2) ORDER BY DepartureDelayGroups, AirTime, CRSElapsedTime LIMIT 4","hsqls":["SELECT DepTime, DestCityName, Origin FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND DistanceGroup IN (2) ORDER BY DepartureDelayGroups, AirTime, CRSElapsedTime LIMIT 4"]}
+{"sql":"SELECT Quarter, DivAirportSeqIDs, DaysSinceEpoch FROM mytable WHERE DivDistance <= 183 OR OriginWac <= 37 AND DivAirports IN ('ILM') LIMIT 18","hsqls":["SELECT Quarter, DivAirportSeqIDs, DaysSinceEpoch FROM mytable WHERE DivDistance <= 183 OR OriginWac <= 37 AND (DivAirports[1] IN ('ILM') OR DivAirports[2] IN ('ILM') OR DivAirports[3] IN ('ILM') OR DivAirports[4] IN ('ILM') OR DivAirports[5] IN ('ILM')) LIMIT 10000"]}
 {"sql":"SELECT Distance FROM mytable WHERE DivAirportLandings < 9 LIMIT 27"}
-{"sql":"SELECT Carrier, WeatherDelay, DaysSinceEpoch FROM mytable WHERE DivTailNums < 'N3732J' ORDER BY DepDel15 LIMIT 21","hsqls":["SELECT Carrier, WeatherDelay, DaysSinceEpoch FROM mytable WHERE (DivTailNums__MV0 < 'N3732J' OR DivTailNums__MV1 < 'N3732J' OR DivTailNums__MV2 < 'N3732J' OR DivTailNums__MV3 < 'N3732J' OR DivTailNums__MV4 < 'N3732J') ORDER BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT Carrier, WeatherDelay, DaysSinceEpoch FROM mytable WHERE DivTailNums < 'N3732J' ORDER BY DepDel15 LIMIT 21","hsqls":["SELECT Carrier, WeatherDelay, DaysSinceEpoch FROM mytable WHERE (DivTailNums[1] < 'N3732J' OR DivTailNums[2] < 'N3732J' OR DivTailNums[3] < 'N3732J' OR DivTailNums[4] < 'N3732J' OR DivTailNums[5] < 'N3732J') ORDER BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DivDistance FROM mytable WHERE DistanceGroup NOT IN (2, 11) LIMIT 29"}
-{"sql":"SELECT DepDelay, ArrTimeBlk FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND DivTotalGTimes BETWEEN 47 AND 52 ORDER BY WheelsOff, TaxiIn, ArrDelay LIMIT 6","hsqls":["SELECT DepDelay, ArrTimeBlk FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND (DivTotalGTimes__MV0 BETWEEN 47 AND 52 OR DivTotalGTimes__MV1 BETWEEN 47 AND 52 OR DivTotalGTimes__MV2 BETWEEN 47 AND 52 OR DivTotalGTimes__MV3 BETWEEN 47 AND 52 OR DivTotalGTimes__MV4 BETWEEN 47 AND 52) ORDER BY WheelsOff, TaxiIn, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelay, ArrTimeBlk FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND DivTotalGTimes BETWEEN 47 AND 52 ORDER BY WheelsOff, TaxiIn, ArrDelay LIMIT 6","hsqls":["SELECT DepDelay, ArrTimeBlk FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND (DivTotalGTimes[1] BETWEEN 47 AND 52 OR DivTotalGTimes[2] BETWEEN 47 AND 52 OR DivTotalGTimes[3] BETWEEN 47 AND 52 OR DivTotalGTimes[4] BETWEEN 47 AND 52 OR DivTotalGTimes[5] BETWEEN 47 AND 52) ORDER BY WheelsOff, TaxiIn, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE FlightDate < '2014-01-11' OR CarrierDelay IN (4, 343, 14, 119) ORDER BY DepDelay, DestState, DepDelayMinutes LIMIT 5"}
-{"sql":"SELECT DivReachedDest FROM mytable WHERE DivLongestGTimes IN (58.0, 27.0) AND ArrTimeBlk NOT IN ('0700-0759', '1100-1159', '1000-1059', '0600-0659', '1800-1859') ORDER BY FlightDate, DepTime, CRSElapsedTime LIMIT 24","hsqls":["SELECT DivReachedDest FROM mytable WHERE (DivLongestGTimes__MV0 IN (58.0, 27.0) OR DivLongestGTimes__MV1 IN (58.0, 27.0) OR DivLongestGTimes__MV2 IN (58.0, 27.0) OR DivLongestGTimes__MV3 IN (58.0, 27.0) OR DivLongestGTimes__MV4 IN (58.0, 27.0)) AND ArrTimeBlk NOT IN ('0700-0759', '1100-1159', '1000-1059', '0600-0659', '1800-1859') ORDER BY FlightDate, DepTime, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest FROM mytable WHERE DivLongestGTimes IN (58.0, 27.0) AND ArrTimeBlk NOT IN ('0700-0759', '1100-1159', '1000-1059', '0600-0659', '1800-1859') ORDER BY FlightDate, DepTime, CRSElapsedTime LIMIT 24","hsqls":["SELECT DivReachedDest FROM mytable WHERE (DivLongestGTimes[1] IN (58.0, 27.0) OR DivLongestGTimes[2] IN (58.0, 27.0) OR DivLongestGTimes[3] IN (58.0, 27.0) OR DivLongestGTimes[4] IN (58.0, 27.0) OR DivLongestGTimes[5] IN (58.0, 27.0)) AND ArrTimeBlk NOT IN ('0700-0759', '1100-1159', '1000-1059', '0600-0659', '1800-1859') ORDER BY FlightDate, DepTime, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, DepTimeBlk FROM mytable WHERE ArrDel15 <= -9999 OR DivAirportLandings NOT IN (2, 1, 9) AND TaxiOut NOT IN (7, 112, 70, 16, 13) ORDER BY LateAircraftDelay, TailNum, DayofMonth LIMIT 29"}
 {"sql":"SELECT AVG(ActualElapsedTime) FROM mytable WHERE FlightNum >= 5020 LIMIT 23"}
-{"sql":"SELECT DivLongestGTimes, Flights, TaxiIn FROM mytable WHERE CarrierDelay < 243 LIMIT 1","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Flights, TaxiIn FROM mytable WHERE CarrierDelay < 243 LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DivWheelsOns, Diverted FROM mytable WHERE CRSElapsedTime BETWEEN 201 AND 137 AND DestCityName BETWEEN 'Newport News/Williamsburg, VA' AND 'Mammoth Lakes, CA' AND DepDelayMinutes NOT IN (75.0) LIMIT 14","hsqls":["SELECT WheelsOff, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Diverted FROM mytable WHERE CRSElapsedTime BETWEEN 201 AND 137 AND DestCityName BETWEEN 'Newport News/Williamsburg, VA' AND 'Mammoth Lakes, CA' AND DepDelayMinutes NOT IN (75.0) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Flights, TaxiIn FROM mytable WHERE CarrierDelay < 243 LIMIT 1","hsqls":["SELECT DivLongestGTimes, Flights, TaxiIn FROM mytable WHERE CarrierDelay < 243 LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivWheelsOns, Diverted FROM mytable WHERE CRSElapsedTime BETWEEN 201 AND 137 AND DestCityName BETWEEN 'Newport News/Williamsburg, VA' AND 'Mammoth Lakes, CA' AND DepDelayMinutes NOT IN (75.0) LIMIT 14","hsqls":["SELECT WheelsOff, DivWheelsOns, Diverted FROM mytable WHERE CRSElapsedTime BETWEEN 201 AND 137 AND DestCityName BETWEEN 'Newport News/Williamsburg, VA' AND 'Mammoth Lakes, CA' AND DepDelayMinutes NOT IN (75.0) LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, \"Year\", DivArrDelay, SUM(AirlineID) FROM mytable WHERE DestAirportID = 14730 AND FlightDate <> '2014-01-08' AND TailNum <> 'N965WN' GROUP BY WheelsOff, \"Year\", DivArrDelay LIMIT 11","hsqls":["SELECT WheelsOff, Year, DivArrDelay, SUM(AirlineID) FROM mytable WHERE DestAirportID = 14730 AND FlightDate <> '2014-01-08' AND TailNum <> 'N965WN' GROUP BY WheelsOff, Year, DivArrDelay LIMIT 11"]}
 {"sql":"SELECT COUNT(DestStateFips) FROM mytable WHERE LongestAddGTime NOT IN (58, 54, 28) LIMIT 17"}
-{"sql":"SELECT TotalAddGTime, DestCityName, DayofMonth FROM mytable WHERE DepDelay >= 3.0 AND DivAirportIDs > 13424 OR DivLongestGTimes <= 20.0 ORDER BY CarrierDelay LIMIT 16","hsqls":["SELECT TotalAddGTime, DestCityName, DayofMonth FROM mytable WHERE DepDelay >= 3.0 AND (DivAirportIDs__MV0 > 13424 OR DivAirportIDs__MV1 > 13424 OR DivAirportIDs__MV2 > 13424 OR DivAirportIDs__MV3 > 13424 OR DivAirportIDs__MV4 > 13424) OR (DivLongestGTimes__MV0 <= 20.0 OR DivLongestGTimes__MV1 <= 20.0 OR DivLongestGTimes__MV2 <= 20.0 OR DivLongestGTimes__MV3 <= 20.0 OR DivLongestGTimes__MV4 <= 20.0) ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DestCityName, DayofMonth FROM mytable WHERE DepDelay >= 3.0 AND DivAirportIDs > 13424 OR DivLongestGTimes <= 20.0 ORDER BY CarrierDelay LIMIT 16","hsqls":["SELECT TotalAddGTime, DestCityName, DayofMonth FROM mytable WHERE DepDelay >= 3.0 AND (DivAirportIDs[1] > 13424 OR DivAirportIDs[2] > 13424 OR DivAirportIDs[3] > 13424 OR DivAirportIDs[4] > 13424 OR DivAirportIDs[5] > 13424) OR (DivLongestGTimes[1] <= 20.0 OR DivLongestGTimes[2] <= 20.0 OR DivLongestGTimes[3] <= 20.0 OR DivLongestGTimes[4] <= 20.0 OR DivLongestGTimes[5] <= 20.0) ORDER BY CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, OriginCityMarketID, OriginAirportID FROM mytable WHERE Origin BETWEEN 'LAR' AND 'MOB' AND WeatherDelay IN (43, 22) ORDER BY OriginState, TailNum LIMIT 11"}
-{"sql":"SELECT Cancelled, \"Month\", MIN(DepDel15) FROM mytable WHERE WheelsOff NOT IN (1411, 1239) OR WheelsOff NOT IN (1051, 1448, 1223) GROUP BY Cancelled, \"Month\" LIMIT 19","hsqls":["SELECT Cancelled, Month, MIN(DepDel15) FROM mytable WHERE WheelsOff NOT IN (1411, 1239) OR WheelsOff NOT IN (1051, 1448, 1223) GROUP BY Cancelled, Month LIMIT 19"]}
+{"sql":"SELECT Cancelled, \"Month\", MIN(DepDel15) FROM mytable WHERE WheelsOff NOT IN (1411, 1239) OR WheelsOff NOT IN (1051, 1448, 1223) GROUP BY Cancelled, \"Month\" LIMIT 19","hsqls":["SELECT Cancelled, Month, MIN(DepDel15) FROM mytable WHERE WheelsOff NOT IN (1411, 1239) OR WheelsOff NOT IN (1051, 1448, 1223) GROUP BY Cancelled, `Month` LIMIT 19"]}
 {"sql":"SELECT TailNum FROM mytable ORDER BY OriginCityMarketID, Cancelled, OriginWac"}
 {"sql":"SELECT DestState FROM mytable WHERE CRSElapsedTime BETWEEN 145 AND 249 OR Distance BETWEEN 1797 AND 984 AND ArrTimeBlk >= '1500-1559' ORDER BY AirlineID LIMIT 10"}
 {"sql":"SELECT DivDistance, FlightDate, DestCityMarketID FROM mytable WHERE DestWac BETWEEN 65 AND 38 ORDER BY OriginCityName, ActualElapsedTime, CRSElapsedTime LIMIT 2"}
 {"sql":"SELECT ActualElapsedTime, SUM(DivReachedDest), MAX(DepDelay) FROM mytable WHERE DestAirportID BETWEEN 10551 AND 10792 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 15","hsqls":["SELECT ActualElapsedTime, SUM(DivReachedDest), MAX(DepDelay) FROM mytable WHERE DestAirportID BETWEEN 10551 AND 10792 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 15"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable ORDER BY LateAircraftDelay, TaxiIn LIMIT 3","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable ORDER BY LateAircraftDelay, TaxiIn LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, DivWheelsOffs FROM mytable WHERE DestState <> 'MN' ORDER BY Cancelled LIMIT 12","hsqls":["SELECT OriginCityMarketID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DestState <> 'MN' ORDER BY Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable ORDER BY LateAircraftDelay, TaxiIn LIMIT 3","hsqls":["SELECT DivAirportSeqIDs FROM mytable ORDER BY LateAircraftDelay, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivWheelsOffs FROM mytable WHERE DestState <> 'MN' ORDER BY Cancelled LIMIT 12","hsqls":["SELECT OriginCityMarketID, DivWheelsOffs FROM mytable WHERE DestState <> 'MN' ORDER BY Cancelled LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE OriginCityName <> 'Palm Springs, CA' ORDER BY DepDelayMinutes LIMIT 13"}
 {"sql":"SELECT DivReachedDest, COUNT(*) FROM mytable WHERE DestCityMarketID IN (33728, 31205, 30408, 32206) AND OriginStateFips NOT IN (18, 25, 8, 27) GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 8","hsqls":["SELECT DivReachedDest, COUNT(*) FROM mytable WHERE DestCityMarketID IN (33728, 31205, 30408, 32206) AND OriginStateFips NOT IN (18, 25, 8, 27) GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 8"]}
 {"sql":"SELECT Diverted, Quarter, ArrDelay FROM mytable WHERE TailNum IN ('N584SW', 'N12957') AND DestCityName BETWEEN 'Dothan, AL' AND 'Aspen, CO' ORDER BY DestAirportID LIMIT 21"}
@@ -2427,117 +2427,117 @@
 {"sql":"SELECT OriginAirportSeqID, DayofMonth, DivActualElapsedTime, SUM(CarrierDelay), MAX(DestStateFips) FROM mytable GROUP BY OriginAirportSeqID, DayofMonth, DivActualElapsedTime  ORDER BY OriginAirportSeqID, DayofMonth, DivActualElapsedTime LIMIT 26","hsqls":["SELECT OriginAirportSeqID, DayofMonth, DivActualElapsedTime, SUM(CarrierDelay), MAX(DestStateFips) FROM mytable GROUP BY OriginAirportSeqID, DayofMonth, DivActualElapsedTime  ORDER BY OriginAirportSeqID, DayofMonth, DivActualElapsedTime LIMIT 26"]}
 {"sql":"SELECT WheelsOff, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-04', '2014-01-18', '2014-01-10') AND LongestAddGTime BETWEEN 28 AND 54 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 2","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-04', '2014-01-18', '2014-01-10') AND LongestAddGTime BETWEEN 28 AND 54 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 2"]}
 {"sql":"SELECT OriginAirportSeqID, DivDistance FROM mytable WHERE OriginAirportSeqID NOT IN (1541202, 1591902) OR AirlineID NOT IN (20304, 20436, 19930, 19977) ORDER BY Diverted, FlightNum, DestAirportID LIMIT 17"}
-{"sql":"SELECT CRSArrTime, AirTime FROM mytable WHERE DivAirports BETWEEN 'TWF' AND 'RFD' OR ArrDelay BETWEEN 363.0 AND 159.0 OR OriginStateName BETWEEN 'Alabama' AND 'Oregon' ORDER BY \"Year\", \"Month\" LIMIT 16","hsqls":["SELECT CRSArrTime, AirTime FROM mytable WHERE (DivAirports__MV0 BETWEEN 'TWF' AND 'RFD' OR DivAirports__MV1 BETWEEN 'TWF' AND 'RFD' OR DivAirports__MV2 BETWEEN 'TWF' AND 'RFD' OR DivAirports__MV3 BETWEEN 'TWF' AND 'RFD' OR DivAirports__MV4 BETWEEN 'TWF' AND 'RFD') OR ArrDelay BETWEEN 363.0 AND 159.0 OR OriginStateName BETWEEN 'Alabama' AND 'Oregon' ORDER BY Year, Month LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, TotalAddGTime, DestStateName, MIN(DivActualElapsedTime), MIN(DepartureDelayGroups), AVG(Cancelled) FROM mytable WHERE DivAirportIDs > 16257 OR CRSDepTime BETWEEN 1243 AND 643 OR ArrTimeBlk BETWEEN '2000-2059' AND '2200-2259' GROUP BY WeatherDelay, TotalAddGTime, DestStateName LIMIT 13","hsqls":["SELECT WeatherDelay, TotalAddGTime, DestStateName, MIN(DivActualElapsedTime), MIN(DepartureDelayGroups), AVG(Cancelled) FROM mytable WHERE (DivAirportIDs__MV0 > 16257 OR DivAirportIDs__MV1 > 16257 OR DivAirportIDs__MV2 > 16257 OR DivAirportIDs__MV3 > 16257 OR DivAirportIDs__MV4 > 16257) OR CRSDepTime BETWEEN 1243 AND 643 OR ArrTimeBlk BETWEEN '2000-2059' AND '2200-2259' GROUP BY WeatherDelay, TotalAddGTime, DestStateName LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, AirTime FROM mytable WHERE DivAirports BETWEEN 'TWF' AND 'RFD' OR ArrDelay BETWEEN 363.0 AND 159.0 OR OriginStateName BETWEEN 'Alabama' AND 'Oregon' ORDER BY \"Year\", \"Month\" LIMIT 16","hsqls":["SELECT CRSArrTime, AirTime FROM mytable WHERE (DivAirports[1] BETWEEN 'TWF' AND 'RFD' OR DivAirports[2] BETWEEN 'TWF' AND 'RFD' OR DivAirports[3] BETWEEN 'TWF' AND 'RFD' OR DivAirports[4] BETWEEN 'TWF' AND 'RFD' OR DivAirports[5] BETWEEN 'TWF' AND 'RFD') OR ArrDelay BETWEEN 363.0 AND 159.0 OR OriginStateName BETWEEN 'Alabama' AND 'Oregon' ORDER BY Year, `Month` LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, TotalAddGTime, DestStateName, MIN(DivActualElapsedTime), MIN(DepartureDelayGroups), AVG(Cancelled) FROM mytable WHERE DivAirportIDs > 16257 OR CRSDepTime BETWEEN 1243 AND 643 OR ArrTimeBlk BETWEEN '2000-2059' AND '2200-2259' GROUP BY WeatherDelay, TotalAddGTime, DestStateName LIMIT 13","hsqls":["SELECT WeatherDelay, TotalAddGTime, DestStateName, MIN(DivActualElapsedTime), MIN(DepartureDelayGroups), AVG(Cancelled) FROM mytable WHERE (DivAirportIDs[1] > 16257 OR DivAirportIDs[2] > 16257 OR DivAirportIDs[3] > 16257 OR DivAirportIDs[4] > 16257 OR DivAirportIDs[5] > 16257) OR CRSDepTime BETWEEN 1243 AND 643 OR ArrTimeBlk BETWEEN '2000-2059' AND '2200-2259' GROUP BY WeatherDelay, TotalAddGTime, DestStateName LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DestStateName, MIN(DepDel15), MIN(ArrTime), SUM(TaxiIn) FROM mytable GROUP BY Cancelled, DestStateName  ORDER BY Cancelled, DestStateName LIMIT 29","hsqls":["SELECT Cancelled, DestStateName, MIN(DepDel15), MIN(ArrTime), SUM(TaxiIn) FROM mytable GROUP BY Cancelled, DestStateName  ORDER BY Cancelled, DestStateName LIMIT 29"]}
-{"sql":"SELECT DivWheelsOffs, DepTimeBlk FROM mytable WHERE TotalAddGTime BETWEEN 39 AND 37 LIMIT 27","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DepTimeBlk FROM mytable WHERE TotalAddGTime BETWEEN 39 AND 37 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DepTimeBlk FROM mytable WHERE TotalAddGTime BETWEEN 39 AND 37 LIMIT 27","hsqls":["SELECT DivWheelsOffs, DepTimeBlk FROM mytable WHERE TotalAddGTime BETWEEN 39 AND 37 LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable LIMIT 1"}
 {"sql":"SELECT COUNT(WeatherDelay) FROM mytable WHERE DestStateFips BETWEEN 51 AND 17 AND Carrier <> 'DL' OR DestStateFips > 28 LIMIT 13"}
-{"sql":"SELECT TaxiIn, DestAirportSeqID FROM mytable WHERE DivWheelsOns BETWEEN 1744 AND 1334 OR DestCityName IN ('Santa Barbara, CA', 'San Jose, CA', 'Joplin, MO', 'Panama City, FL') OR DepDelay BETWEEN 225.0 AND 17.0 ORDER BY UniqueCarrier LIMIT 27","hsqls":["SELECT TaxiIn, DestAirportSeqID FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1744 AND 1334 OR DivWheelsOns__MV1 BETWEEN 1744 AND 1334 OR DivWheelsOns__MV2 BETWEEN 1744 AND 1334 OR DivWheelsOns__MV3 BETWEEN 1744 AND 1334 OR DivWheelsOns__MV4 BETWEEN 1744 AND 1334) OR DestCityName IN ('Santa Barbara, CA', 'San Jose, CA', 'Joplin, MO', 'Panama City, FL') OR DepDelay BETWEEN 225.0 AND 17.0 ORDER BY UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DestAirportSeqID FROM mytable WHERE DivWheelsOns BETWEEN 1744 AND 1334 OR DestCityName IN ('Santa Barbara, CA', 'San Jose, CA', 'Joplin, MO', 'Panama City, FL') OR DepDelay BETWEEN 225.0 AND 17.0 ORDER BY UniqueCarrier LIMIT 27","hsqls":["SELECT TaxiIn, DestAirportSeqID FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1744 AND 1334 OR DivWheelsOns[2] BETWEEN 1744 AND 1334 OR DivWheelsOns[3] BETWEEN 1744 AND 1334 OR DivWheelsOns[4] BETWEEN 1744 AND 1334 OR DivWheelsOns[5] BETWEEN 1744 AND 1334) OR DestCityName IN ('Santa Barbara, CA', 'San Jose, CA', 'Joplin, MO', 'Panama City, FL') OR DepDelay BETWEEN 225.0 AND 17.0 ORDER BY UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT FlightDate, DepDel15, DayOfWeek FROM mytable WHERE OriginAirportID IN (15411, 14113, 10372, 15841) AND CRSElapsedTime BETWEEN 83 AND 147 ORDER BY DistanceGroup, TailNum LIMIT 5"}
 {"sql":"SELECT COUNT(OriginWac) FROM mytable WHERE ActualElapsedTime BETWEEN 122 AND 133 LIMIT 15"}
 {"sql":"SELECT ArrTimeBlk, DestAirportID FROM mytable WHERE Carrier NOT IN ('B6') OR DepDelay IN (100.0) LIMIT 28"}
-{"sql":"SELECT Cancelled, SUM(DestAirportSeqID), SUM(OriginAirportID), MAX(\"Month\") FROM mytable WHERE DivLongestGTimes IN (46.0, 152.0, 56.0, 1.0) OR ArrivalDelayGroups = 2 GROUP BY Cancelled","hsqls":["SELECT Cancelled, SUM(DestAirportSeqID), SUM(OriginAirportID), MAX(Month) FROM mytable WHERE (DivLongestGTimes__MV0 IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes__MV1 IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes__MV2 IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes__MV3 IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes__MV4 IN (46.0, 152.0, 56.0, 1.0)) OR ArrivalDelayGroups = 2 GROUP BY Cancelled LIMIT 10000"]}
+{"sql":"SELECT Cancelled, SUM(DestAirportSeqID), SUM(OriginAirportID), MAX(\"Month\") FROM mytable WHERE DivLongestGTimes IN (46.0, 152.0, 56.0, 1.0) OR ArrivalDelayGroups = 2 GROUP BY Cancelled","hsqls":["SELECT Cancelled, SUM(DestAirportSeqID), SUM(OriginAirportID), MAX(`Month`) FROM mytable WHERE (DivLongestGTimes[1] IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes[2] IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes[3] IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes[4] IN (46.0, 152.0, 56.0, 1.0) OR DivLongestGTimes[5] IN (46.0, 152.0, 56.0, 1.0)) OR ArrivalDelayGroups = 2 GROUP BY Cancelled LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, FlightNum, Cancelled, COUNT(OriginStateFips), MAX(LateAircraftDelay) FROM mytable WHERE OriginCityMarketID NOT IN (31308, 30146, 31503, 33485) AND OriginAirportID NOT IN (14674, 14122, 10685) OR DestCityName = 'State College, PA' GROUP BY FirstDepTime, FlightNum, Cancelled  ORDER BY FirstDepTime, FlightNum, Cancelled LIMIT 23","hsqls":["SELECT FirstDepTime, FlightNum, Cancelled, COUNT(OriginStateFips), MAX(LateAircraftDelay) FROM mytable WHERE OriginCityMarketID NOT IN (31308, 30146, 31503, 33485) AND OriginAirportID NOT IN (14674, 14122, 10685) OR DestCityName = 'State College, PA' GROUP BY FirstDepTime, FlightNum, Cancelled  ORDER BY FirstDepTime, FlightNum, Cancelled LIMIT 23"]}
-{"sql":"SELECT OriginState, \"Month\", MAX(ArrDel15), AVG(DepDel15), MAX(\"Month\") FROM mytable WHERE DivWheelsOffs > 1616 AND OriginCityName <= 'Bakersfield, CA' GROUP BY OriginState, \"Month\" LIMIT 29","hsqls":["SELECT OriginState, Month, MAX(ArrDel15), AVG(DepDel15), MAX(Month) FROM mytable WHERE (DivWheelsOffs__MV0 > 1616 OR DivWheelsOffs__MV1 > 1616 OR DivWheelsOffs__MV2 > 1616 OR DivWheelsOffs__MV3 > 1616 OR DivWheelsOffs__MV4 > 1616) AND OriginCityName <= 'Bakersfield, CA' GROUP BY OriginState, Month LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime FROM mytable WHERE AirlineID IN (19805, 19930, 19977) AND DivWheelsOns IN (1859, 1134, 1107, 2126) ORDER BY \"Year\", FlightDate, DestCityName LIMIT 26","hsqls":["SELECT FirstDepTime FROM mytable WHERE AirlineID IN (19805, 19930, 19977) AND (DivWheelsOns__MV0 IN (1859, 1134, 1107, 2126) OR DivWheelsOns__MV1 IN (1859, 1134, 1107, 2126) OR DivWheelsOns__MV2 IN (1859, 1134, 1107, 2126) OR DivWheelsOns__MV3 IN (1859, 1134, 1107, 2126) OR DivWheelsOns__MV4 IN (1859, 1134, 1107, 2126)) ORDER BY Year, FlightDate, DestCityName LIMIT 10000"]}
+{"sql":"SELECT OriginState, \"Month\", MAX(ArrDel15), AVG(DepDel15), MAX(\"Month\") FROM mytable WHERE DivWheelsOffs > 1616 AND OriginCityName <= 'Bakersfield, CA' GROUP BY OriginState, \"Month\" LIMIT 29","hsqls":["SELECT OriginState, Month, MAX(ArrDel15), AVG(DepDel15), MAX(`Month`) FROM mytable WHERE (DivWheelsOffs[1] > 1616 OR DivWheelsOffs[2] > 1616 OR DivWheelsOffs[3] > 1616 OR DivWheelsOffs[4] > 1616 OR DivWheelsOffs[5] > 1616) AND OriginCityName <= 'Bakersfield, CA' GROUP BY OriginState, `Month` LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime FROM mytable WHERE AirlineID IN (19805, 19930, 19977) AND DivWheelsOns IN (1859, 1134, 1107, 2126) ORDER BY \"Year\", FlightDate, DestCityName LIMIT 26","hsqls":["SELECT FirstDepTime FROM mytable WHERE AirlineID IN (19805, 19930, 19977) AND (DivWheelsOns[1] IN (1859, 1134, 1107, 2126) OR DivWheelsOns[2] IN (1859, 1134, 1107, 2126) OR DivWheelsOns[3] IN (1859, 1134, 1107, 2126) OR DivWheelsOns[4] IN (1859, 1134, 1107, 2126) OR DivWheelsOns[5] IN (1859, 1134, 1107, 2126)) ORDER BY Year, FlightDate, DestCityName LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, SUM(DivDistance) FROM mytable WHERE DestState IN ('NC', 'MS', 'MD', 'SC') AND DestState NOT IN ('DE', 'CT', 'CO', 'FL', 'AL') GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 24","hsqls":["SELECT ArrDel15, SUM(DivDistance) FROM mytable WHERE DestState IN ('NC', 'MS', 'MD', 'SC') AND DestState NOT IN ('DE', 'CT', 'CO', 'FL', 'AL') GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 24"]}
-{"sql":"SELECT ArrDelayMinutes, DivArrDelay, COUNT(*) FROM mytable WHERE DivAirportIDs = 12217 OR DestCityName <> 'Phoenix, AZ' OR DepartureDelayGroups < 2 GROUP BY ArrDelayMinutes, DivArrDelay LIMIT 17","hsqls":["SELECT ArrDelayMinutes, DivArrDelay, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 = 12217 OR DivAirportIDs__MV1 = 12217 OR DivAirportIDs__MV2 = 12217 OR DivAirportIDs__MV3 = 12217 OR DivAirportIDs__MV4 = 12217) OR DestCityName <> 'Phoenix, AZ' OR DepartureDelayGroups < 2 GROUP BY ArrDelayMinutes, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DivArrDelay, COUNT(*) FROM mytable WHERE DivAirportIDs = 12217 OR DestCityName <> 'Phoenix, AZ' OR DepartureDelayGroups < 2 GROUP BY ArrDelayMinutes, DivArrDelay LIMIT 17","hsqls":["SELECT ArrDelayMinutes, DivArrDelay, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] = 12217 OR DivAirportIDs[2] = 12217 OR DivAirportIDs[3] = 12217 OR DivAirportIDs[4] = 12217 OR DivAirportIDs[5] = 12217) OR DestCityName <> 'Phoenix, AZ' OR DepartureDelayGroups < 2 GROUP BY ArrDelayMinutes, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE ArrDel15 NOT IN (1, 0) LIMIT 29"}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE DepTime BETWEEN 1447 AND 2349 AND AirlineID BETWEEN 19393 AND 19805 ORDER BY SecurityDelay, DivAirportLandings LIMIT 29"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DistanceGroup NOT IN (3) OR TaxiOut BETWEEN 4 AND 121 ORDER BY TotalAddGTime LIMIT 22"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE DepTimeBlk NOT IN ('2200-2259', '0700-0759', '1000-1059', '1900-1959') AND WeatherDelay BETWEEN 105 AND 237 ORDER BY SecurityDelay, CancellationCode","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE DepTimeBlk NOT IN ('2200-2259', '0700-0759', '1000-1059', '1900-1959') AND WeatherDelay BETWEEN 105 AND 237 ORDER BY SecurityDelay, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE DepTimeBlk NOT IN ('2200-2259', '0700-0759', '1000-1059', '1900-1959') AND WeatherDelay BETWEEN 105 AND 237 ORDER BY SecurityDelay, CancellationCode","hsqls":["SELECT DivWheelsOns FROM mytable WHERE DepTimeBlk NOT IN ('2200-2259', '0700-0759', '1000-1059', '1900-1959') AND WeatherDelay BETWEEN 105 AND 237 ORDER BY SecurityDelay, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, COUNT(*) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 19","hsqls":["SELECT TaxiIn, COUNT(*) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 19"]}
 {"sql":"SELECT TaxiOut, DivActualElapsedTime FROM mytable WHERE DaysSinceEpoch <= 16082 ORDER BY DepDelay, ArrDelayMinutes, DestAirportID"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepTimeBlk >= '1600-1659' LIMIT 13"}
 {"sql":"SELECT DestStateFips, TailNum, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime BETWEEN 1026 AND 1639 GROUP BY DestStateFips, TailNum, CRSElapsedTime  ORDER BY DestStateFips, TailNum, CRSElapsedTime LIMIT 25","hsqls":["SELECT DestStateFips, TailNum, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime BETWEEN 1026 AND 1639 GROUP BY DestStateFips, TailNum, CRSElapsedTime  ORDER BY DestStateFips, TailNum, CRSElapsedTime LIMIT 25"]}
-{"sql":"SELECT DepDelay, SecurityDelay, NASDelay, COUNT(*) FROM mytable WHERE DivAirportSeqIDs < 1348502 AND DestAirportID = 14262 GROUP BY DepDelay, SecurityDelay, NASDelay LIMIT 3","hsqls":["SELECT DepDelay, SecurityDelay, NASDelay, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1348502 OR DivAirportSeqIDs__MV1 < 1348502 OR DivAirportSeqIDs__MV2 < 1348502 OR DivAirportSeqIDs__MV3 < 1348502 OR DivAirportSeqIDs__MV4 < 1348502) AND DestAirportID = 14262 GROUP BY DepDelay, SecurityDelay, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelay, SecurityDelay, NASDelay, COUNT(*) FROM mytable WHERE DivAirportSeqIDs < 1348502 AND DestAirportID = 14262 GROUP BY DepDelay, SecurityDelay, NASDelay LIMIT 3","hsqls":["SELECT DepDelay, SecurityDelay, NASDelay, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] < 1348502 OR DivAirportSeqIDs[2] < 1348502 OR DivAirportSeqIDs[3] < 1348502 OR DivAirportSeqIDs[4] < 1348502 OR DivAirportSeqIDs[5] < 1348502) AND DestAirportID = 14262 GROUP BY DepDelay, SecurityDelay, NASDelay LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, NASDelay, AirlineID FROM mytable WHERE DestAirportSeqID NOT IN (1324402) ORDER BY ArrDelayMinutes, Dest LIMIT 3"}
 {"sql":"SELECT Flights FROM mytable ORDER BY DestCityMarketID, DayOfWeek LIMIT 6"}
 {"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE TaxiIn IN (59, 17, 38) GROUP BY DepDelay  ORDER BY DepDelay LIMIT 11","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE TaxiIn IN (59, 17, 38) GROUP BY DepDelay  ORDER BY DepDelay LIMIT 11"]}
 {"sql":"SELECT WeatherDelay, ArrDelayMinutes, UniqueCarrier, COUNT(Dest) FROM mytable WHERE AirTime NOT IN (212, 155, 274, 238) AND DestStateName NOT IN ('Delaware', 'Washington', 'Oklahoma') GROUP BY WeatherDelay, ArrDelayMinutes, UniqueCarrier  ORDER BY WeatherDelay, ArrDelayMinutes, UniqueCarrier LIMIT 11","hsqls":["SELECT WeatherDelay, ArrDelayMinutes, UniqueCarrier, COUNT(Dest) FROM mytable WHERE AirTime NOT IN (212, 155, 274, 238) AND DestStateName NOT IN ('Delaware', 'Washington', 'Oklahoma') GROUP BY WeatherDelay, ArrDelayMinutes, UniqueCarrier  ORDER BY WeatherDelay, ArrDelayMinutes, UniqueCarrier LIMIT 11"]}
 {"sql":"SELECT AirTime, DestCityMarketID FROM mytable WHERE DestWac NOT IN (67, 51, 82, 73, 14) ORDER BY SecurityDelay LIMIT 13"}
-{"sql":"SELECT DivWheelsOffs, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'Virginia' AND 'Alabama' AND CRSArrTime >= 2204 AND DepartureDelayGroups BETWEEN 2 AND 11 LIMIT 6","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'Virginia' AND 'Alabama' AND CRSArrTime >= 2204 AND DepartureDelayGroups BETWEEN 2 AND 11 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'Virginia' AND 'Alabama' AND CRSArrTime >= 2204 AND DepartureDelayGroups BETWEEN 2 AND 11 LIMIT 6","hsqls":["SELECT DivWheelsOffs, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'Virginia' AND 'Alabama' AND CRSArrTime >= 2204 AND DepartureDelayGroups BETWEEN 2 AND 11 LIMIT 10000"]}
 {"sql":"SELECT ArrDel15 FROM mytable ORDER BY DestStateFips, DepTime, UniqueCarrier LIMIT 13"}
 {"sql":"SELECT WeatherDelay, DestCityName, DepTimeBlk FROM mytable WHERE ArrTimeBlk <= '1400-1459' AND DestAirportID = 10754 LIMIT 21"}
-{"sql":"SELECT OriginStateFips, SUM(Cancelled), AVG(DepDel15), MAX(ActualElapsedTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND ArrivalDelayGroups IN (-1, 5, 8, 11) AND DestStateName BETWEEN 'Vermont' AND 'North Dakota' GROUP BY OriginStateFips LIMIT 23","hsqls":["SELECT OriginStateFips, SUM(Cancelled), AVG(DepDel15), MAX(ActualElapsedTime) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND ArrivalDelayGroups IN (-1, 5, 8, 11) AND DestStateName BETWEEN 'Vermont' AND 'North Dakota' GROUP BY OriginStateFips LIMIT 23"]}
-{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY OriginStateFips, DivAirportLandings, CRSElapsedTime LIMIT 27","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable ORDER BY OriginStateFips, DivAirportLandings, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, SUM(Cancelled), AVG(DepDel15), MAX(ActualElapsedTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND ArrivalDelayGroups IN (-1, 5, 8, 11) AND DestStateName BETWEEN 'Vermont' AND 'North Dakota' GROUP BY OriginStateFips LIMIT 23","hsqls":["SELECT OriginStateFips, SUM(Cancelled), AVG(DepDel15), MAX(ActualElapsedTime) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND ArrivalDelayGroups IN (-1, 5, 8, 11) AND DestStateName BETWEEN 'Vermont' AND 'North Dakota' GROUP BY OriginStateFips LIMIT 23"]}
+{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY OriginStateFips, DivAirportLandings, CRSElapsedTime LIMIT 27","hsqls":["SELECT DivWheelsOns FROM mytable ORDER BY OriginStateFips, DivAirportLandings, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, Quarter, TailNum, SUM(TaxiOut) FROM mytable GROUP BY FirstDepTime, Quarter, TailNum  ORDER BY FirstDepTime, Quarter, TailNum LIMIT 18","hsqls":["SELECT FirstDepTime, Quarter, TailNum, SUM(TaxiOut) FROM mytable GROUP BY FirstDepTime, Quarter, TailNum  ORDER BY FirstDepTime, Quarter, TailNum LIMIT 18"]}
-{"sql":"SELECT DayofMonth, DivTotalGTimes FROM mytable WHERE ActualElapsedTime BETWEEN 535 AND 502 AND Distance BETWEEN 329 AND 1725 AND \"Year\" IN (2014) LIMIT 8","hsqls":["SELECT DayofMonth, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE ActualElapsedTime BETWEEN 535 AND 502 AND Distance BETWEEN 329 AND 1725 AND Year IN (2014) LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, DivTotalGTimes FROM mytable WHERE ActualElapsedTime BETWEEN 535 AND 502 AND Distance BETWEEN 329 AND 1725 AND \"Year\" IN (2014) LIMIT 8","hsqls":["SELECT DayofMonth, DivTotalGTimes FROM mytable WHERE ActualElapsedTime BETWEEN 535 AND 502 AND Distance BETWEEN 329 AND 1725 AND `Year` IN (2014) LIMIT 10000"]}
 {"sql":"SELECT WheelsOn FROM mytable ORDER BY DepartureDelayGroups, SecurityDelay, DivActualElapsedTime LIMIT 6"}
-{"sql":"SELECT DivReachedDest, Diverted FROM mytable WHERE DayofMonth <= 19 ORDER BY \"Year\" LIMIT 27","hsqls":["SELECT DivReachedDest, Diverted FROM mytable WHERE DayofMonth <= 19 ORDER BY Year LIMIT 27"]}
+{"sql":"SELECT DivReachedDest, Diverted FROM mytable WHERE DayofMonth <= 19 ORDER BY \"Year\" LIMIT 27","hsqls":["SELECT DivReachedDest, Diverted FROM mytable WHERE DayofMonth <= 19 ORDER BY `Year` LIMIT 27"]}
 {"sql":"SELECT UniqueCarrier, MIN(DepDelayMinutes), AVG(DestWac) FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'FL' OR SecurityDelay IN (0, 18) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 17","hsqls":["SELECT UniqueCarrier, MIN(DepDelayMinutes), AVG(DestWac) FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'FL' OR SecurityDelay IN (0, 18) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 17"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE FlightDate <= '2014-01-13' OR AirTime NOT IN (141) LIMIT 5"}
 {"sql":"SELECT OriginState, OriginStateName FROM mytable WHERE DestCityMarketID BETWEEN 33792 AND 31641 OR DayOfWeek BETWEEN 6 AND 3 AND DestState BETWEEN 'AL' AND 'RI' ORDER BY DivAirportLandings LIMIT 7"}
-{"sql":"SELECT ActualElapsedTime, CRSDepTime FROM mytable WHERE DivAirportIDs BETWEEN 14574 AND 11252 LIMIT 18","hsqls":["SELECT ActualElapsedTime, CRSDepTime FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14574 AND 11252 OR DivAirportIDs__MV1 BETWEEN 14574 AND 11252 OR DivAirportIDs__MV2 BETWEEN 14574 AND 11252 OR DivAirportIDs__MV3 BETWEEN 14574 AND 11252 OR DivAirportIDs__MV4 BETWEEN 14574 AND 11252) LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, CRSDepTime FROM mytable WHERE DivAirportIDs BETWEEN 14574 AND 11252 LIMIT 18","hsqls":["SELECT ActualElapsedTime, CRSDepTime FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14574 AND 11252 OR DivAirportIDs[2] BETWEEN 14574 AND 11252 OR DivAirportIDs[3] BETWEEN 14574 AND 11252 OR DivAirportIDs[4] BETWEEN 14574 AND 11252 OR DivAirportIDs[5] BETWEEN 14574 AND 11252) LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, OriginStateName, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DivAirportLandings BETWEEN 9 AND 2 GROUP BY OriginCityName, OriginStateName  ORDER BY OriginCityName, OriginStateName LIMIT 29","hsqls":["SELECT OriginCityName, OriginStateName, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DivAirportLandings BETWEEN 9 AND 2 GROUP BY OriginCityName, OriginStateName  ORDER BY OriginCityName, OriginStateName LIMIT 29"]}
 {"sql":"SELECT MIN(DepTime) FROM mytable WHERE WeatherDelay BETWEEN 68 AND 54 LIMIT 27"}
 {"sql":"SELECT ArrDelay, COUNT(FlightNum), COUNT(DistanceGroup) FROM mytable WHERE DivActualElapsedTime BETWEEN 333 AND 255 AND DayofMonth >= 2 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 18","hsqls":["SELECT ArrDelay, COUNT(FlightNum), COUNT(DistanceGroup) FROM mytable WHERE DivActualElapsedTime BETWEEN 333 AND 255 AND DayofMonth >= 2 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 18"]}
 {"sql":"SELECT OriginAirportSeqID, DivActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID, CRSElapsedTime LIMIT 29"}
-{"sql":"SELECT OriginState, \"Month\" FROM mytable LIMIT 5","hsqls":["SELECT OriginState, Month FROM mytable LIMIT 5"]}
+{"sql":"SELECT OriginState, \"Month\" FROM mytable LIMIT 5","hsqls":["SELECT OriginState, `Month` FROM mytable LIMIT 5"]}
 {"sql":"SELECT DepDelay FROM mytable WHERE DayofMonth NOT IN (14) ORDER BY Dest LIMIT 10"}
 {"sql":"SELECT OriginCityMarketID, CRSArrTime, ArrTimeBlk, SUM(ActualElapsedTime) FROM mytable WHERE SecurityDelay < 18 OR DepTimeBlk BETWEEN '1900-1959' AND '2300-2359' GROUP BY OriginCityMarketID, CRSArrTime, ArrTimeBlk  ORDER BY OriginCityMarketID, CRSArrTime, ArrTimeBlk LIMIT 6","hsqls":["SELECT OriginCityMarketID, CRSArrTime, ArrTimeBlk, SUM(ActualElapsedTime) FROM mytable WHERE SecurityDelay < 18 OR DepTimeBlk BETWEEN '1900-1959' AND '2300-2359' GROUP BY OriginCityMarketID, CRSArrTime, ArrTimeBlk  ORDER BY OriginCityMarketID, CRSArrTime, ArrTimeBlk LIMIT 6"]}
-{"sql":"SELECT OriginCityMarketID, DestStateName, DivTailNums FROM mytable WHERE TaxiIn <= 48 ORDER BY DepDel15, DayofMonth LIMIT 6","hsqls":["SELECT OriginCityMarketID, DestStateName, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE TaxiIn <= 48 ORDER BY DepDel15, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestStateName, DivTailNums FROM mytable WHERE TaxiIn <= 48 ORDER BY DepDel15, DayofMonth LIMIT 6","hsqls":["SELECT OriginCityMarketID, DestStateName, DivTailNums FROM mytable WHERE TaxiIn <= 48 ORDER BY DepDel15, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DestState, ActualElapsedTime, ArrDelay, SUM(DepDel15), COUNT(DestStateName), COUNT(DivArrDelay) FROM mytable WHERE DestAirportSeqID > 1538902 AND DayOfWeek NOT IN (6) GROUP BY DestState, ActualElapsedTime, ArrDelay  ORDER BY DestState, ActualElapsedTime, ArrDelay LIMIT 23","hsqls":["SELECT DestState, ActualElapsedTime, ArrDelay, SUM(DepDel15), COUNT(DestStateName), COUNT(DivArrDelay) FROM mytable WHERE DestAirportSeqID > 1538902 AND DayOfWeek NOT IN (6) GROUP BY DestState, ActualElapsedTime, ArrDelay  ORDER BY DestState, ActualElapsedTime, ArrDelay LIMIT 23"]}
 {"sql":"SELECT ArrDelayMinutes, MAX(DistanceGroup), MIN(CarrierDelay) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 15","hsqls":["SELECT ArrDelayMinutes, MAX(DistanceGroup), MIN(CarrierDelay) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 15"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE CarrierDelay >= 82 OR ActualElapsedTime >= 349 ORDER BY DistanceGroup, DepTime LIMIT 2"}
-{"sql":"SELECT TaxiIn, DepDel15, CancellationCode FROM mytable WHERE DivTotalGTimes = 25 LIMIT 2","hsqls":["SELECT TaxiIn, DepDel15, CancellationCode FROM mytable WHERE (DivTotalGTimes__MV0 = 25 OR DivTotalGTimes__MV1 = 25 OR DivTotalGTimes__MV2 = 25 OR DivTotalGTimes__MV3 = 25 OR DivTotalGTimes__MV4 = 25) LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DivAirportSeqIDs, DestAirportID FROM mytable WHERE ArrDelay IN (87.0) OR WheelsOn BETWEEN 757 AND 1742 OR DivAirportLandings <= 9 LIMIT 16","hsqls":["SELECT WheelsOff, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestAirportID FROM mytable WHERE ArrDelay IN (87.0) OR WheelsOn BETWEEN 757 AND 1742 OR DivAirportLandings <= 9 LIMIT 10000"]}
-{"sql":"SELECT DivAirports, ActualElapsedTime FROM mytable WHERE LongestAddGTime IN (148, 34, 29) OR OriginAirportSeqID IN (1400602, 1106603, 1490503) LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ActualElapsedTime FROM mytable WHERE LongestAddGTime IN (148, 34, 29) OR OriginAirportSeqID IN (1400602, 1106603, 1490503) LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, DivWheelsOffs FROM mytable ORDER BY OriginStateFips LIMIT 3","hsqls":["SELECT LongestAddGTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DepDel15, CancellationCode FROM mytable WHERE DivTotalGTimes = 25 LIMIT 2","hsqls":["SELECT TaxiIn, DepDel15, CancellationCode FROM mytable WHERE (DivTotalGTimes[1] = 25 OR DivTotalGTimes[2] = 25 OR DivTotalGTimes[3] = 25 OR DivTotalGTimes[4] = 25 OR DivTotalGTimes[5] = 25) LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivAirportSeqIDs, DestAirportID FROM mytable WHERE ArrDelay IN (87.0) OR WheelsOn BETWEEN 757 AND 1742 OR DivAirportLandings <= 9 LIMIT 16","hsqls":["SELECT WheelsOff, DivAirportSeqIDs, DestAirportID FROM mytable WHERE ArrDelay IN (87.0) OR WheelsOn BETWEEN 757 AND 1742 OR DivAirportLandings <= 9 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ActualElapsedTime FROM mytable WHERE LongestAddGTime IN (148, 34, 29) OR OriginAirportSeqID IN (1400602, 1106603, 1490503) LIMIT 10","hsqls":["SELECT DivAirports, ActualElapsedTime FROM mytable WHERE LongestAddGTime IN (148, 34, 29) OR OriginAirportSeqID IN (1400602, 1106603, 1490503) LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivWheelsOffs FROM mytable ORDER BY OriginStateFips LIMIT 3","hsqls":["SELECT LongestAddGTime, DivWheelsOffs FROM mytable ORDER BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT MIN(DepDel15), AVG(ArrivalDelayGroups), SUM(FlightNum) FROM mytable WHERE WheelsOn > 1425 LIMIT 4"}
-{"sql":"SELECT ArrDelayMinutes, DestStateName, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DistanceGroup IN (1, 8, 11) OR OriginCityName IN ('Laramie, WY', 'Fairbanks, AK', 'Burbank, CA') LIMIT 17","hsqls":["SELECT ArrDelayMinutes, DestStateName, DivActualElapsedTime FROM mytable WHERE (DivTailNums__MV0 IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums__MV1 IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums__MV2 IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums__MV3 IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums__MV4 IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA')) OR DistanceGroup IN (1, 8, 11) OR OriginCityName IN ('Laramie, WY', 'Fairbanks, AK', 'Burbank, CA') LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, DivAirportIDs, UniqueCarrier FROM mytable LIMIT 3","hsqls":["SELECT DepDelayMinutes, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, UniqueCarrier FROM mytable LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DestStateName, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DistanceGroup IN (1, 8, 11) OR OriginCityName IN ('Laramie, WY', 'Fairbanks, AK', 'Burbank, CA') LIMIT 17","hsqls":["SELECT ArrDelayMinutes, DestStateName, DivActualElapsedTime FROM mytable WHERE (DivTailNums[1] IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums[2] IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums[3] IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums[4] IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA') OR DivTailNums[5] IN ('N953SW', 'N521US', 'N807MQ', 'N163US', 'N549AA')) OR DistanceGroup IN (1, 8, 11) OR OriginCityName IN ('Laramie, WY', 'Fairbanks, AK', 'Burbank, CA') LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivAirportIDs, UniqueCarrier FROM mytable LIMIT 3","hsqls":["SELECT DepDelayMinutes, DivAirportIDs, UniqueCarrier FROM mytable LIMIT 10000"]}
 {"sql":"SELECT FlightDate, AirTime FROM mytable WHERE OriginStateFips NOT IN (6, 47, 18, 28, 37) AND DivDistance NOT IN (687, 69, 257, 158, 130) AND ArrTime <> 49 ORDER BY Quarter, ArrTimeBlk, OriginWac LIMIT 26"}
-{"sql":"SELECT DestAirportSeqID, DestCityName, DaysSinceEpoch FROM mytable WHERE ArrDelayMinutes BETWEEN 10.0 AND 166.0 ORDER BY DepTime, DayofMonth, \"Month\" LIMIT 24","hsqls":["SELECT DestAirportSeqID, DestCityName, DaysSinceEpoch FROM mytable WHERE ArrDelayMinutes BETWEEN 10.0 AND 166.0 ORDER BY DepTime, DayofMonth, Month LIMIT 24"]}
+{"sql":"SELECT DestAirportSeqID, DestCityName, DaysSinceEpoch FROM mytable WHERE ArrDelayMinutes BETWEEN 10.0 AND 166.0 ORDER BY DepTime, DayofMonth, \"Month\" LIMIT 24","hsqls":["SELECT DestAirportSeqID, DestCityName, DaysSinceEpoch FROM mytable WHERE ArrDelayMinutes BETWEEN 10.0 AND 166.0 ORDER BY DepTime, DayofMonth, `Month` LIMIT 24"]}
 {"sql":"SELECT WheelsOff, DistanceGroup, CRSArrTime, SUM(ArrDelayMinutes), SUM(WheelsOff), MAX(NASDelay) FROM mytable GROUP BY WheelsOff, DistanceGroup, CRSArrTime  ORDER BY WheelsOff, DistanceGroup, CRSArrTime LIMIT 2","hsqls":["SELECT WheelsOff, DistanceGroup, CRSArrTime, SUM(ArrDelayMinutes), SUM(WheelsOff), MAX(NASDelay) FROM mytable GROUP BY WheelsOff, DistanceGroup, CRSArrTime  ORDER BY WheelsOff, DistanceGroup, CRSArrTime LIMIT 2"]}
 {"sql":"SELECT OriginAirportSeqID, OriginStateName FROM mytable WHERE ArrivalDelayGroups IN (-9999) AND Flights < 1 LIMIT 16"}
 {"sql":"SELECT WheelsOff, Origin, DestCityMarketID, MAX(ArrDel15), MAX(OriginWac), AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay NOT IN (-34.0, 146.0, 24.0, 168.0, 316.0) AND OriginAirportSeqID <> 1410803 GROUP BY WheelsOff, Origin, DestCityMarketID  ORDER BY WheelsOff, Origin, DestCityMarketID LIMIT 25","hsqls":["SELECT WheelsOff, Origin, DestCityMarketID, MAX(ArrDel15), MAX(OriginWac), AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay NOT IN (-34.0, 146.0, 24.0, 168.0, 316.0) AND OriginAirportSeqID <> 1410803 GROUP BY WheelsOff, Origin, DestCityMarketID  ORDER BY WheelsOff, Origin, DestCityMarketID LIMIT 25"]}
 {"sql":"SELECT AVG(TotalAddGTime), MIN(FirstDepTime) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'noodles' OR DivReachedDest >= 1 OR FlightNum < 2971 LIMIT 28"}
-{"sql":"SELECT MAX(DepDel15) FROM mytable WHERE DivTailNums IN ('N922MQ', 'N980SW') OR Cancelled NOT IN (1, 0) LIMIT 21","hsqls":["SELECT MAX(DepDel15) FROM mytable WHERE (DivTailNums__MV0 IN ('N922MQ', 'N980SW') OR DivTailNums__MV1 IN ('N922MQ', 'N980SW') OR DivTailNums__MV2 IN ('N922MQ', 'N980SW') OR DivTailNums__MV3 IN ('N922MQ', 'N980SW') OR DivTailNums__MV4 IN ('N922MQ', 'N980SW')) OR Cancelled NOT IN (1, 0) LIMIT 10000"]}
+{"sql":"SELECT MAX(DepDel15) FROM mytable WHERE DivTailNums IN ('N922MQ', 'N980SW') OR Cancelled NOT IN (1, 0) LIMIT 21","hsqls":["SELECT MAX(DepDel15) FROM mytable WHERE (DivTailNums[1] IN ('N922MQ', 'N980SW') OR DivTailNums[2] IN ('N922MQ', 'N980SW') OR DivTailNums[3] IN ('N922MQ', 'N980SW') OR DivTailNums[4] IN ('N922MQ', 'N980SW') OR DivTailNums[5] IN ('N922MQ', 'N980SW')) OR Cancelled NOT IN (1, 0) LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, COUNT(OriginWac) FROM mytable WHERE OriginCityMarketID >= 31953 AND DestCityMarketID = 33158 OR DestStateName <= 'Illinois' GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 4","hsqls":["SELECT CRSArrTime, COUNT(OriginWac) FROM mytable WHERE OriginCityMarketID >= 31953 AND DestCityMarketID = 33158 OR DestStateName <= 'Illinois' GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 4"]}
 {"sql":"SELECT LateAircraftDelay, MAX(ArrivalDelayGroups), SUM(DayOfWeek), COUNT(ArrTime) FROM mytable WHERE DivActualElapsedTime <= 279 AND DestCityName BETWEEN 'Allentown/Bethlehem/Easton, PA' AND 'Manchester, NH' OR DestAirportID BETWEEN 13933 AND 10930 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 9","hsqls":["SELECT LateAircraftDelay, MAX(ArrivalDelayGroups), SUM(DayOfWeek), COUNT(ArrTime) FROM mytable WHERE DivActualElapsedTime <= 279 AND DestCityName BETWEEN 'Allentown/Bethlehem/Easton, PA' AND 'Manchester, NH' OR DestAirportID BETWEEN 13933 AND 10930 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 9"]}
-{"sql":"SELECT \"Month\", SUM(DepDelay) FROM mytable WHERE ActualElapsedTime IN (117, 224, 267, 142) AND TailNum IN ('N508AY', 'N902MQ') OR DestState BETWEEN 'ND' AND 'OK' GROUP BY \"Month\" LIMIT 12","hsqls":["SELECT Month, SUM(DepDelay) FROM mytable WHERE ActualElapsedTime IN (117, 224, 267, 142) AND TailNum IN ('N508AY', 'N902MQ') OR DestState BETWEEN 'ND' AND 'OK' GROUP BY Month LIMIT 12"]}
+{"sql":"SELECT \"Month\", SUM(DepDelay) FROM mytable WHERE ActualElapsedTime IN (117, 224, 267, 142) AND TailNum IN ('N508AY', 'N902MQ') OR DestState BETWEEN 'ND' AND 'OK' GROUP BY \"Month\" LIMIT 12","hsqls":["SELECT Month, SUM(DepDelay) FROM mytable WHERE ActualElapsedTime IN (117, 224, 267, 142) AND TailNum IN ('N508AY', 'N902MQ') OR DestState BETWEEN 'ND' AND 'OK' GROUP BY `Month` LIMIT 12"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (180.0, 321.0, 271.0, 188.0) OR WheelsOff = 741 AND CRSDepTime BETWEEN 1745 AND 2029"}
-{"sql":"SELECT \"Year\", DestStateFips, ArrDelayMinutes FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-31' AND DivTailNums <= 'N564JB' OR WheelsOn = 1308 LIMIT 18","hsqls":["SELECT Year, DestStateFips, ArrDelayMinutes FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-31' AND (DivTailNums__MV0 <= 'N564JB' OR DivTailNums__MV1 <= 'N564JB' OR DivTailNums__MV2 <= 'N564JB' OR DivTailNums__MV3 <= 'N564JB' OR DivTailNums__MV4 <= 'N564JB') OR WheelsOn = 1308 LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DestStateFips, ArrDelayMinutes FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-31' AND DivTailNums <= 'N564JB' OR WheelsOn = 1308 LIMIT 18","hsqls":["SELECT Year, DestStateFips, ArrDelayMinutes FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-31' AND (DivTailNums[1] <= 'N564JB' OR DivTailNums[2] <= 'N564JB' OR DivTailNums[3] <= 'N564JB' OR DivTailNums[4] <= 'N564JB' OR DivTailNums[5] <= 'N564JB') OR WheelsOn = 1308 LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE DepTime <= 946 OR DivReachedDest BETWEEN -9999 AND -9999 ORDER BY DepDelay LIMIT 12"}
 {"sql":"SELECT AirlineID, WheelsOn, OriginStateName, AVG(DestCityMarketID), COUNT(DivArrDelay) FROM mytable WHERE Diverted NOT IN (1, 0) AND OriginStateName IN ('Minnesota', 'Massachusetts') OR ArrDelayMinutes > 77.0 GROUP BY AirlineID, WheelsOn, OriginStateName  ORDER BY AirlineID, WheelsOn, OriginStateName LIMIT 1","hsqls":["SELECT AirlineID, WheelsOn, OriginStateName, AVG(DestCityMarketID), COUNT(DivArrDelay) FROM mytable WHERE Diverted NOT IN (1, 0) AND OriginStateName IN ('Minnesota', 'Massachusetts') OR ArrDelayMinutes > 77.0 GROUP BY AirlineID, WheelsOn, OriginStateName  ORDER BY AirlineID, WheelsOn, OriginStateName LIMIT 1"]}
 {"sql":"SELECT Carrier, CRSArrTime, ArrDelay, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N12201', 'N190JB', 'N211FR', 'N600MQ', 'N947DN') GROUP BY Carrier, CRSArrTime, ArrDelay  ORDER BY Carrier, CRSArrTime, ArrDelay LIMIT 13","hsqls":["SELECT Carrier, CRSArrTime, ArrDelay, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N12201', 'N190JB', 'N211FR', 'N600MQ', 'N947DN') GROUP BY Carrier, CRSArrTime, ArrDelay  ORDER BY Carrier, CRSArrTime, ArrDelay LIMIT 13"]}
 {"sql":"SELECT ArrTimeBlk, DepTimeBlk, DestAirportID, MIN(DivActualElapsedTime), COUNT(DayofMonth), SUM(DivArrDelay) FROM mytable WHERE TailNum <= 'N913DE' GROUP BY ArrTimeBlk, DepTimeBlk, DestAirportID  ORDER BY ArrTimeBlk, DepTimeBlk, DestAirportID LIMIT 19","hsqls":["SELECT ArrTimeBlk, DepTimeBlk, DestAirportID, MIN(DivActualElapsedTime), COUNT(DayofMonth), SUM(DivArrDelay) FROM mytable WHERE TailNum <= 'N913DE' GROUP BY ArrTimeBlk, DepTimeBlk, DestAirportID  ORDER BY ArrTimeBlk, DepTimeBlk, DestAirportID LIMIT 19"]}
-{"sql":"SELECT MAX(\"Year\"), SUM(FlightNum), MAX(ArrTime) FROM mytable WHERE Carrier <> 'AS' LIMIT 1","hsqls":["SELECT MAX(Year), SUM(FlightNum), MAX(ArrTime) FROM mytable WHERE Carrier <> 'AS' LIMIT 1"]}
+{"sql":"SELECT MAX(\"Year\"), SUM(FlightNum), MAX(ArrTime) FROM mytable WHERE Carrier <> 'AS' LIMIT 1","hsqls":["SELECT MAX(`Year`), SUM(FlightNum), MAX(ArrTime) FROM mytable WHERE Carrier <> 'AS' LIMIT 1"]}
 {"sql":"SELECT MIN(DivActualElapsedTime), AVG(OriginCityMarketID) FROM mytable LIMIT 15"}
-{"sql":"SELECT DivAirportLandings, \"Month\" FROM mytable WHERE OriginWac IN (93, 53, 74) AND DayofMonth IN (31, 23, 8, 11, 12) AND DepartureDelayGroups BETWEEN -2 AND 8 ORDER BY DepDelay, CRSArrTime, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DivAirportLandings, Month FROM mytable WHERE OriginWac IN (93, 53, 74) AND DayofMonth IN (31, 23, 8, 11, 12) AND DepartureDelayGroups BETWEEN -2 AND 8 ORDER BY DepDelay, CRSArrTime, DaysSinceEpoch LIMIT 12"]}
-{"sql":"SELECT OriginState, DivWheelsOffs FROM mytable WHERE \"Month\" <> 1 OR ArrDelay >= 176.0 AND DivWheelsOffs IN (1339, 1504, 1620) ORDER BY DivReachedDest, ArrDelayMinutes, Origin LIMIT 7","hsqls":["SELECT OriginState, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Month <> 1 OR ArrDelay >= 176.0 AND (DivWheelsOffs__MV0 IN (1339, 1504, 1620) OR DivWheelsOffs__MV1 IN (1339, 1504, 1620) OR DivWheelsOffs__MV2 IN (1339, 1504, 1620) OR DivWheelsOffs__MV3 IN (1339, 1504, 1620) OR DivWheelsOffs__MV4 IN (1339, 1504, 1620)) ORDER BY DivReachedDest, ArrDelayMinutes, Origin LIMIT 10000"]}
-{"sql":"SELECT DivDistance, CarrierDelay FROM mytable WHERE DestStateFips <= 31 AND DivTailNums BETWEEN 'N8315C' AND 'N4XLAA' ORDER BY SecurityDelay, DivAirportLandings LIMIT 2","hsqls":["SELECT DivDistance, CarrierDelay FROM mytable WHERE DestStateFips <= 31 AND (DivTailNums__MV0 BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums__MV1 BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums__MV2 BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums__MV3 BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums__MV4 BETWEEN 'N8315C' AND 'N4XLAA') ORDER BY SecurityDelay, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, \"Month\" FROM mytable WHERE OriginWac IN (93, 53, 74) AND DayofMonth IN (31, 23, 8, 11, 12) AND DepartureDelayGroups BETWEEN -2 AND 8 ORDER BY DepDelay, CRSArrTime, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DivAirportLandings, `Month` FROM mytable WHERE OriginWac IN (93, 53, 74) AND DayofMonth IN (31, 23, 8, 11, 12) AND DepartureDelayGroups BETWEEN -2 AND 8 ORDER BY DepDelay, CRSArrTime, DaysSinceEpoch LIMIT 12"]}
+{"sql":"SELECT OriginState, DivWheelsOffs FROM mytable WHERE \"Month\" <> 1 OR ArrDelay >= 176.0 AND DivWheelsOffs IN (1339, 1504, 1620) ORDER BY DivReachedDest, ArrDelayMinutes, Origin LIMIT 7","hsqls":["SELECT OriginState, DivWheelsOffs FROM mytable WHERE `Month` <> 1 OR ArrDelay >= 176.0 AND (DivWheelsOffs[1] IN (1339, 1504, 1620) OR DivWheelsOffs[2] IN (1339, 1504, 1620) OR DivWheelsOffs[3] IN (1339, 1504, 1620) OR DivWheelsOffs[4] IN (1339, 1504, 1620) OR DivWheelsOffs[5] IN (1339, 1504, 1620)) ORDER BY DivReachedDest, ArrDelayMinutes, Origin LIMIT 10000"]}
+{"sql":"SELECT DivDistance, CarrierDelay FROM mytable WHERE DestStateFips <= 31 AND DivTailNums BETWEEN 'N8315C' AND 'N4XLAA' ORDER BY SecurityDelay, DivAirportLandings LIMIT 2","hsqls":["SELECT DivDistance, CarrierDelay FROM mytable WHERE DestStateFips <= 31 AND (DivTailNums[1] BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums[2] BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums[3] BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums[4] BETWEEN 'N8315C' AND 'N4XLAA' OR DivTailNums[5] BETWEEN 'N8315C' AND 'N4XLAA') ORDER BY SecurityDelay, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT SUM(Cancelled), SUM(Distance), MAX(Cancelled) FROM mytable WHERE Origin BETWEEN 'TRI' AND 'SMF' AND OriginStateName > 'Illinois' LIMIT 13"}
 {"sql":"SELECT WheelsOff, AirTime, DayofMonth, COUNT(*) FROM mytable WHERE DestAirportSeqID NOT IN (1074702, 1329604, 1327702, 1323002) OR Dest BETWEEN 'MCO' AND 'PIH' GROUP BY WheelsOff, AirTime, DayofMonth  ORDER BY WheelsOff, AirTime, DayofMonth LIMIT 19","hsqls":["SELECT WheelsOff, AirTime, DayofMonth, COUNT(*) FROM mytable WHERE DestAirportSeqID NOT IN (1074702, 1329604, 1327702, 1323002) OR Dest BETWEEN 'MCO' AND 'PIH' GROUP BY WheelsOff, AirTime, DayofMonth  ORDER BY WheelsOff, AirTime, DayofMonth LIMIT 19"]}
 {"sql":"SELECT MIN(DestCityMarketID) FROM mytable WHERE DivArrDelay >= 159 LIMIT 26"}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE WheelsOff = 754 ORDER BY SecurityDelay, \"Month\", ArrivalDelayGroups LIMIT 6","hsqls":["SELECT OriginCityMarketID FROM mytable WHERE WheelsOff = 754 ORDER BY SecurityDelay, Month, ArrivalDelayGroups LIMIT 6"]}
-{"sql":"SELECT COUNT(LongestAddGTime), SUM(OriginCityMarketID) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR CRSArrTime NOT IN (1723) LIMIT 18","hsqls":["SELECT COUNT(LongestAddGTime), SUM(OriginCityMarketID) FROM mytable WHERE Month BETWEEN 1 AND 1 OR CRSArrTime NOT IN (1723) LIMIT 18"]}
-{"sql":"SELECT ArrDelay, DivTotalGTimes, DaysSinceEpoch FROM mytable ORDER BY DivReachedDest, DestAirportSeqID LIMIT 7","hsqls":["SELECT ArrDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, DaysSinceEpoch FROM mytable ORDER BY DivReachedDest, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT COUNT(LongestAddGTime), SUM(OriginCityMarketID) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR CRSArrTime NOT IN (1723) LIMIT 18","hsqls":["SELECT COUNT(LongestAddGTime), SUM(OriginCityMarketID) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR CRSArrTime NOT IN (1723) LIMIT 18"]}
+{"sql":"SELECT ArrDelay, DivTotalGTimes, DaysSinceEpoch FROM mytable ORDER BY DivReachedDest, DestAirportSeqID LIMIT 7","hsqls":["SELECT ArrDelay, DivTotalGTimes, DaysSinceEpoch FROM mytable ORDER BY DivReachedDest, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, DivReachedDest, TotalAddGTime FROM mytable WHERE Cancelled IN (1) AND FlightDate IN ('2014-01-04', '2014-01-06', '2014-01-21', '2014-01-11')"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityName <= 'Barrow, AK' OR Flights >= 1 LIMIT 5"}
 {"sql":"SELECT Origin FROM mytable WHERE WeatherDelay BETWEEN 10 AND 198 ORDER BY Carrier, Cancelled, AirlineID LIMIT 12"}
 {"sql":"SELECT ArrDelayMinutes, OriginStateName, SUM(DestWac) FROM mytable WHERE OriginAirportSeqID >= 1217703 GROUP BY ArrDelayMinutes, OriginStateName  ORDER BY ArrDelayMinutes, OriginStateName LIMIT 4","hsqls":["SELECT ArrDelayMinutes, OriginStateName, SUM(DestWac) FROM mytable WHERE OriginAirportSeqID >= 1217703 GROUP BY ArrDelayMinutes, OriginStateName  ORDER BY ArrDelayMinutes, OriginStateName LIMIT 4"]}
 {"sql":"SELECT CarrierDelay, Origin, DayOfWeek FROM mytable WHERE ActualElapsedTime BETWEEN 163 AND 322 OR CarrierDelay IN (17, 266) OR AirlineID IN (19690, 20366) ORDER BY TaxiIn, TailNum LIMIT 1"}
-{"sql":"SELECT OriginState, DivAirports, OriginCityName FROM mytable ORDER BY Carrier LIMIT 10","hsqls":["SELECT OriginState, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityName FROM mytable ORDER BY Carrier LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, DivAirportSeqIDs FROM mytable WHERE Distance BETWEEN 955 AND 2486 OR DestState NOT IN ('TN', 'SD', 'IL', 'SC') OR WheelsOff NOT IN (1730, 2018) ORDER BY Diverted, FlightDate LIMIT 26","hsqls":["SELECT DepDelayMinutes, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE Distance BETWEEN 955 AND 2486 OR DestState NOT IN ('TN', 'SD', 'IL', 'SC') OR WheelsOff NOT IN (1730, 2018) ORDER BY Diverted, FlightDate LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirports, OriginCityName FROM mytable ORDER BY Carrier LIMIT 10","hsqls":["SELECT OriginState, DivAirports, OriginCityName FROM mytable ORDER BY Carrier LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivAirportSeqIDs FROM mytable WHERE Distance BETWEEN 955 AND 2486 OR DestState NOT IN ('TN', 'SD', 'IL', 'SC') OR WheelsOff NOT IN (1730, 2018) ORDER BY Diverted, FlightDate LIMIT 26","hsqls":["SELECT DepDelayMinutes, DivAirportSeqIDs FROM mytable WHERE Distance BETWEEN 955 AND 2486 OR DestState NOT IN ('TN', 'SD', 'IL', 'SC') OR WheelsOff NOT IN (1730, 2018) ORDER BY Diverted, FlightDate LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE DestStateFips BETWEEN 45 AND 75 OR DepDel15 BETWEEN -9999 AND -9999 OR OriginCityMarketID < 30713 ORDER BY DepartureDelayGroups, AirlineID, CRSDepTime LIMIT 21"}
-{"sql":"SELECT DestStateName, DivAirportIDs FROM mytable WHERE TaxiOut >= 141 OR DistanceGroup NOT IN (1) OR ArrivalDelayGroups IN (3, 2, 6) ORDER BY Origin LIMIT 6","hsqls":["SELECT DestStateName, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE TaxiOut >= 141 OR DistanceGroup NOT IN (1) OR ArrivalDelayGroups IN (3, 2, 6) ORDER BY Origin LIMIT 10000"]}
-{"sql":"SELECT DestAirportSeqID, DivTailNums, WheelsOn FROM mytable WHERE CRSArrTime <= 1346 ORDER BY Distance, DestCityMarketID LIMIT 10","hsqls":["SELECT DestAirportSeqID, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, WheelsOn FROM mytable WHERE CRSArrTime <= 1346 ORDER BY Distance, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestStateName, DivAirportIDs FROM mytable WHERE TaxiOut >= 141 OR DistanceGroup NOT IN (1) OR ArrivalDelayGroups IN (3, 2, 6) ORDER BY Origin LIMIT 6","hsqls":["SELECT DestStateName, DivAirportIDs FROM mytable WHERE TaxiOut >= 141 OR DistanceGroup NOT IN (1) OR ArrivalDelayGroups IN (3, 2, 6) ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivTailNums, WheelsOn FROM mytable WHERE CRSArrTime <= 1346 ORDER BY Distance, DestCityMarketID LIMIT 10","hsqls":["SELECT DestAirportSeqID, DivTailNums, WheelsOn FROM mytable WHERE CRSArrTime <= 1346 ORDER BY Distance, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT FlightDate, ArrTimeBlk FROM mytable WHERE OriginStateFips BETWEEN 38 AND 27 ORDER BY ArrivalDelayGroups LIMIT 25"}
-{"sql":"SELECT OriginState, DivAirportIDs FROM mytable WHERE DepDelayMinutes BETWEEN 84.0 AND 49.0 OR DistanceGroup IN (5) ORDER BY DivDistance, DivAirportLandings LIMIT 7","hsqls":["SELECT OriginState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DepDelayMinutes BETWEEN 84.0 AND 49.0 OR DistanceGroup IN (5) ORDER BY DivDistance, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirportIDs FROM mytable WHERE DepDelayMinutes BETWEEN 84.0 AND 49.0 OR DistanceGroup IN (5) ORDER BY DivDistance, DivAirportLandings LIMIT 7","hsqls":["SELECT OriginState, DivAirportIDs FROM mytable WHERE DepDelayMinutes BETWEEN 84.0 AND 49.0 OR DistanceGroup IN (5) ORDER BY DivDistance, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT Origin, COUNT(FirstDepTime) FROM mytable WHERE DepTime NOT IN (1119, 856, 607, 645) AND DepDel15 IN (0, -9999) GROUP BY Origin","hsqls":["SELECT Origin, COUNT(FirstDepTime) FROM mytable WHERE DepTime NOT IN (1119, 856, 607, 645) AND DepDel15 IN (0, -9999) GROUP BY Origin"]}
 {"sql":"SELECT Origin, ArrivalDelayGroups FROM mytable WHERE DepDelayMinutes BETWEEN 235.0 AND 210.0 OR CRSElapsedTime <= 79 ORDER BY ArrDelay LIMIT 10"}
 {"sql":"SELECT ArrDelayMinutes, AVG(ArrDel15) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 2","hsqls":["SELECT ArrDelayMinutes, AVG(ArrDel15) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 2"]}
 {"sql":"SELECT DestState, TaxiIn, AVG(DepDelayMinutes) FROM mytable WHERE DestStateName BETWEEN 'Indiana' AND 'Washington' OR ActualElapsedTime BETWEEN 243 AND 387 OR DestStateFips IN (42, 44, 41, 19, 26) GROUP BY DestState, TaxiIn  ORDER BY DestState, TaxiIn LIMIT 29","hsqls":["SELECT DestState, TaxiIn, AVG(DepDelayMinutes) FROM mytable WHERE DestStateName BETWEEN 'Indiana' AND 'Washington' OR ActualElapsedTime BETWEEN 243 AND 387 OR DestStateFips IN (42, 44, 41, 19, 26) GROUP BY DestState, TaxiIn  ORDER BY DestState, TaxiIn LIMIT 29"]}
 {"sql":"SELECT DestWac, Origin, CRSElapsedTime, COUNT(DestStateName) FROM mytable WHERE TaxiIn IN (20, 127, 175, 5, 55) GROUP BY DestWac, Origin, CRSElapsedTime  ORDER BY DestWac, Origin, CRSElapsedTime LIMIT 8","hsqls":["SELECT DestWac, Origin, CRSElapsedTime, COUNT(DestStateName) FROM mytable WHERE TaxiIn IN (20, 127, 175, 5, 55) GROUP BY DestWac, Origin, CRSElapsedTime  ORDER BY DestWac, Origin, CRSElapsedTime LIMIT 8"]}
-{"sql":"SELECT DivAirportIDs, ArrDelay FROM mytable ORDER BY Quarter, CRSArrTime, ArrDelayMinutes LIMIT 18","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay FROM mytable ORDER BY Quarter, CRSArrTime, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, ArrDelay FROM mytable ORDER BY Quarter, CRSArrTime, ArrDelayMinutes LIMIT 18","hsqls":["SELECT DivAirportIDs, ArrDelay FROM mytable ORDER BY Quarter, CRSArrTime, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT Diverted, DestStateFips, DayOfWeek, MIN(NASDelay), MIN(Distance) FROM mytable WHERE DestStateFips = 78 AND CarrierDelay NOT IN (170, 20, 164) GROUP BY Diverted, DestStateFips, DayOfWeek  ORDER BY Diverted, DestStateFips, DayOfWeek LIMIT 22","hsqls":["SELECT Diverted, DestStateFips, DayOfWeek, MIN(NASDelay), MIN(Distance) FROM mytable WHERE DestStateFips = 78 AND CarrierDelay NOT IN (170, 20, 164) GROUP BY Diverted, DestStateFips, DayOfWeek  ORDER BY Diverted, DestStateFips, DayOfWeek LIMIT 22"]}
-{"sql":"SELECT DivDistance, FlightDate, DivWheelsOffs FROM mytable WHERE DepDelayMinutes IN (210.0) OR WheelsOff >= 1014 AND ArrivalDelayGroups BETWEEN 12 AND -1 LIMIT 24","hsqls":["SELECT DivDistance, FlightDate, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DepDelayMinutes IN (210.0) OR WheelsOff >= 1014 AND ArrivalDelayGroups BETWEEN 12 AND -1 LIMIT 10000"]}
+{"sql":"SELECT DivDistance, FlightDate, DivWheelsOffs FROM mytable WHERE DepDelayMinutes IN (210.0) OR WheelsOff >= 1014 AND ArrivalDelayGroups BETWEEN 12 AND -1 LIMIT 24","hsqls":["SELECT DivDistance, FlightDate, DivWheelsOffs FROM mytable WHERE DepDelayMinutes IN (210.0) OR WheelsOff >= 1014 AND ArrivalDelayGroups BETWEEN 12 AND -1 LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(TaxiIn) FROM mytable WHERE DepartureDelayGroups BETWEEN 8 AND 0 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 11","hsqls":["SELECT DaysSinceEpoch, COUNT(TaxiIn) FROM mytable WHERE DepartureDelayGroups BETWEEN 8 AND 0 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 11"]}
-{"sql":"SELECT DaysSinceEpoch, COUNT(\"Month\"), COUNT(OriginWac) FROM mytable WHERE OriginAirportSeqID BETWEEN 1312702 AND 1484304 GROUP BY DaysSinceEpoch LIMIT 24","hsqls":["SELECT DaysSinceEpoch, COUNT(Month), COUNT(OriginWac) FROM mytable WHERE OriginAirportSeqID BETWEEN 1312702 AND 1484304 GROUP BY DaysSinceEpoch LIMIT 24"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8"]}
+{"sql":"SELECT DaysSinceEpoch, COUNT(\"Month\"), COUNT(OriginWac) FROM mytable WHERE OriginAirportSeqID BETWEEN 1312702 AND 1484304 GROUP BY DaysSinceEpoch LIMIT 24","hsqls":["SELECT DaysSinceEpoch, COUNT(`Month`), COUNT(OriginWac) FROM mytable WHERE OriginAirportSeqID BETWEEN 1312702 AND 1484304 GROUP BY DaysSinceEpoch LIMIT 24"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8"]}
 {"sql":"SELECT TailNum FROM mytable ORDER BY Flights, DepDelayMinutes, DestAirportID LIMIT 12"}
 {"sql":"SELECT ArrTimeBlk FROM mytable ORDER BY DestWac LIMIT 7"}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE ArrivalDelayGroups > 5 ORDER BY Carrier LIMIT 29"}
@@ -2548,25 +2548,25 @@
 {"sql":"SELECT Distance, OriginCityName, COUNT(*) FROM mytable WHERE Carrier IN ('US', 'VX', 'AS') AND LongestAddGTime NOT IN (40, 60) AND DestWac IN (23, 62, 33) GROUP BY Distance, OriginCityName  ORDER BY Distance, OriginCityName LIMIT 11","hsqls":["SELECT Distance, OriginCityName, COUNT(*) FROM mytable WHERE Carrier IN ('US', 'VX', 'AS') AND LongestAddGTime NOT IN (40, 60) AND DestWac IN (23, 62, 33) GROUP BY Distance, OriginCityName  ORDER BY Distance, OriginCityName LIMIT 11"]}
 {"sql":"SELECT FlightNum, OriginWac, MAX(DivReachedDest), MIN(TaxiOut) FROM mytable GROUP BY FlightNum, OriginWac  ORDER BY FlightNum, OriginWac LIMIT 13","hsqls":["SELECT FlightNum, OriginWac, MAX(DivReachedDest), MIN(TaxiOut) FROM mytable GROUP BY FlightNum, OriginWac  ORDER BY FlightNum, OriginWac LIMIT 13"]}
 {"sql":"SELECT DestAirportSeqID, DepDel15, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DepDel15  ORDER BY DestAirportSeqID, DepDel15 LIMIT 4","hsqls":["SELECT DestAirportSeqID, DepDel15, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DepDel15  ORDER BY DestAirportSeqID, DepDel15 LIMIT 4"]}
-{"sql":"SELECT TaxiOut, DistanceGroup, FirstDepTime FROM mytable WHERE DayofMonth > 8 OR DivTailNums IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DestAirportSeqID NOT IN (1532302, 1430702, 1348502, 1127802, 1329002) ORDER BY FlightDate, CRSDepTime LIMIT 21","hsqls":["SELECT TaxiOut, DistanceGroup, FirstDepTime FROM mytable WHERE DayofMonth > 8 OR (DivTailNums__MV0 IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums__MV1 IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums__MV2 IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums__MV3 IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums__MV4 IN ('N1EAMQ', 'N807MQ', 'N657AW')) OR DestAirportSeqID NOT IN (1532302, 1430702, 1348502, 1127802, 1329002) ORDER BY FlightDate, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DistanceGroup, FirstDepTime FROM mytable WHERE DayofMonth > 8 OR DivTailNums IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DestAirportSeqID NOT IN (1532302, 1430702, 1348502, 1127802, 1329002) ORDER BY FlightDate, CRSDepTime LIMIT 21","hsqls":["SELECT TaxiOut, DistanceGroup, FirstDepTime FROM mytable WHERE DayofMonth > 8 OR (DivTailNums[1] IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums[2] IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums[3] IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums[4] IN ('N1EAMQ', 'N807MQ', 'N657AW') OR DivTailNums[5] IN ('N1EAMQ', 'N807MQ', 'N657AW')) OR DestAirportSeqID NOT IN (1532302, 1430702, 1348502, 1127802, 1329002) ORDER BY FlightDate, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT MIN(TaxiIn), AVG(Quarter) FROM mytable WHERE LateAircraftDelay > 68 AND DestState IN ('MO', 'PR', 'NY') LIMIT 23"}
 {"sql":"SELECT OriginState FROM mytable WHERE AirlineID BETWEEN 19790 AND 19790 ORDER BY DepartureDelayGroups, FlightNum, DivActualElapsedTime LIMIT 29"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DestWac < 85 ORDER BY OriginCityName LIMIT 3","hsqls":["SELECT Month FROM mytable WHERE DestWac < 85 ORDER BY OriginCityName LIMIT 3"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DestWac < 85 ORDER BY OriginCityName LIMIT 3","hsqls":["SELECT `Month` FROM mytable WHERE DestWac < 85 ORDER BY OriginCityName LIMIT 3"]}
 {"sql":"SELECT OriginAirportSeqID, TaxiOut FROM mytable WHERE WeatherDelay NOT IN (97, 101) OR OriginAirportSeqID BETWEEN 1621801 AND 1385103 ORDER BY OriginCityMarketID, TaxiIn LIMIT 6"}
-{"sql":"SELECT FlightDate, DivAirportIDs, ArrDelay FROM mytable WHERE LongestAddGTime NOT IN (2, 5) OR ArrivalDelayGroups IN (1, 9) AND CarrierDelay BETWEEN 328 AND 62 ORDER BY TaxiOut, OriginStateFips LIMIT 19","hsqls":["SELECT FlightDate, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay FROM mytable WHERE LongestAddGTime NOT IN (2, 5) OR ArrivalDelayGroups IN (1, 9) AND CarrierDelay BETWEEN 328 AND 62 ORDER BY TaxiOut, OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT FlightDate, DivAirportIDs, ArrDelay FROM mytable WHERE LongestAddGTime NOT IN (2, 5) OR ArrivalDelayGroups IN (1, 9) AND CarrierDelay BETWEEN 328 AND 62 ORDER BY TaxiOut, OriginStateFips LIMIT 19","hsqls":["SELECT FlightDate, DivAirportIDs, ArrDelay FROM mytable WHERE LongestAddGTime NOT IN (2, 5) OR ArrivalDelayGroups IN (1, 9) AND CarrierDelay BETWEEN 328 AND 62 ORDER BY TaxiOut, OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, DestAirportID, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10792 AND 14696 AND DestCityMarketID < 30599 AND Carrier BETWEEN 'WN' AND 'F9' GROUP BY ArrDelayMinutes, DestAirportID  ORDER BY ArrDelayMinutes, DestAirportID LIMIT 4","hsqls":["SELECT ArrDelayMinutes, DestAirportID, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10792 AND 14696 AND DestCityMarketID < 30599 AND Carrier BETWEEN 'WN' AND 'F9' GROUP BY ArrDelayMinutes, DestAirportID  ORDER BY ArrDelayMinutes, DestAirportID LIMIT 4"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE ActualElapsedTime BETWEEN 36 AND 30 AND WheelsOn IN (1501, 740) LIMIT 28","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE ActualElapsedTime BETWEEN 36 AND 30 AND WheelsOn IN (1501, 740) LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE ActualElapsedTime BETWEEN 36 AND 30 AND WheelsOn IN (1501, 740) LIMIT 28","hsqls":["SELECT DivAirportIDs FROM mytable WHERE ActualElapsedTime BETWEEN 36 AND 30 AND WheelsOn IN (1501, 740) LIMIT 10000"]}
 {"sql":"SELECT OriginState, Origin, AirTime FROM mytable WHERE AirlineID IN (19690, 20437, 19930, 20355) ORDER BY LateAircraftDelay, FlightNum, DayofMonth LIMIT 5"}
 {"sql":"SELECT Carrier, DestStateFips, DestCityMarketID, SUM(LateAircraftDelay), MIN(TaxiIn) FROM mytable WHERE TaxiOut IN (48, 92, 91, 34, 85) AND DepartureDelayGroups <= -2 AND AirTime BETWEEN 216 AND 156 GROUP BY Carrier, DestStateFips, DestCityMarketID  ORDER BY Carrier, DestStateFips, DestCityMarketID LIMIT 5","hsqls":["SELECT Carrier, DestStateFips, DestCityMarketID, SUM(LateAircraftDelay), MIN(TaxiIn) FROM mytable WHERE TaxiOut IN (48, 92, 91, 34, 85) AND DepartureDelayGroups <= -2 AND AirTime BETWEEN 216 AND 156 GROUP BY Carrier, DestStateFips, DestCityMarketID  ORDER BY Carrier, DestStateFips, DestCityMarketID LIMIT 5"]}
-{"sql":"SELECT DestAirportSeqID, DestCityMarketID, COUNT(*) FROM mytable WHERE DivTotalGTimes IN (97, 92, 33, 25, 11) AND DivAirportSeqIDs BETWEEN 1409803 AND 1329604 AND ArrDel15 BETWEEN 0 AND 0 GROUP BY DestAirportSeqID, DestCityMarketID LIMIT 24","hsqls":["SELECT DestAirportSeqID, DestCityMarketID, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 IN (97, 92, 33, 25, 11) OR DivTotalGTimes__MV1 IN (97, 92, 33, 25, 11) OR DivTotalGTimes__MV2 IN (97, 92, 33, 25, 11) OR DivTotalGTimes__MV3 IN (97, 92, 33, 25, 11) OR DivTotalGTimes__MV4 IN (97, 92, 33, 25, 11)) AND (DivAirportSeqIDs__MV0 BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs__MV1 BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs__MV2 BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs__MV3 BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs__MV4 BETWEEN 1409803 AND 1329604) AND ArrDel15 BETWEEN 0 AND 0 GROUP BY DestAirportSeqID, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DestCityMarketID, COUNT(*) FROM mytable WHERE DivTotalGTimes IN (97, 92, 33, 25, 11) AND DivAirportSeqIDs BETWEEN 1409803 AND 1329604 AND ArrDel15 BETWEEN 0 AND 0 GROUP BY DestAirportSeqID, DestCityMarketID LIMIT 24","hsqls":["SELECT DestAirportSeqID, DestCityMarketID, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] IN (97, 92, 33, 25, 11) OR DivTotalGTimes[2] IN (97, 92, 33, 25, 11) OR DivTotalGTimes[3] IN (97, 92, 33, 25, 11) OR DivTotalGTimes[4] IN (97, 92, 33, 25, 11) OR DivTotalGTimes[5] IN (97, 92, 33, 25, 11)) AND (DivAirportSeqIDs[1] BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs[2] BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs[3] BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs[4] BETWEEN 1409803 AND 1329604 OR DivAirportSeqIDs[5] BETWEEN 1409803 AND 1329604) AND ArrDel15 BETWEEN 0 AND 0 GROUP BY DestAirportSeqID, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DepDelay, DivActualElapsedTime, AVG(FirstDepTime), MAX(CRSDepTime), COUNT(DivAirportLandings) FROM mytable GROUP BY DepDelay, DivActualElapsedTime  ORDER BY DepDelay, DivActualElapsedTime LIMIT 27","hsqls":["SELECT DepDelay, DivActualElapsedTime, AVG(FirstDepTime), MAX(CRSDepTime), COUNT(DivAirportLandings) FROM mytable GROUP BY DepDelay, DivActualElapsedTime  ORDER BY DepDelay, DivActualElapsedTime LIMIT 27"]}
-{"sql":"SELECT OriginState, Carrier, OriginCityName, MIN(TotalAddGTime), COUNT(DestAirportID), MAX(\"Month\") FROM mytable WHERE SecurityDelay IN (1, 4, 8, 14) GROUP BY OriginState, Carrier, OriginCityName LIMIT 29","hsqls":["SELECT OriginState, Carrier, OriginCityName, MIN(TotalAddGTime), COUNT(DestAirportID), MAX(Month) FROM mytable WHERE SecurityDelay IN (1, 4, 8, 14) GROUP BY OriginState, Carrier, OriginCityName LIMIT 29"]}
+{"sql":"SELECT OriginState, Carrier, OriginCityName, MIN(TotalAddGTime), COUNT(DestAirportID), MAX(\"Month\") FROM mytable WHERE SecurityDelay IN (1, 4, 8, 14) GROUP BY OriginState, Carrier, OriginCityName LIMIT 29","hsqls":["SELECT OriginState, Carrier, OriginCityName, MIN(TotalAddGTime), COUNT(DestAirportID), MAX(`Month`) FROM mytable WHERE SecurityDelay IN (1, 4, 8, 14) GROUP BY OriginState, Carrier, OriginCityName LIMIT 29"]}
 {"sql":"SELECT LateAircraftDelay, NASDelay, DaysSinceEpoch FROM mytable WHERE CarrierDelay IN (343, 129, 157, 27) AND DaysSinceEpoch IN (16101, 16094, 16086) OR CRSArrTime >= 1434 ORDER BY DivActualElapsedTime, DayOfWeek LIMIT 15"}
 {"sql":"SELECT CarrierDelay, DayofMonth, CRSElapsedTime FROM mytable WHERE OriginCityName <> 'Flint, MI' AND DistanceGroup < 2 ORDER BY Diverted, DepDelay LIMIT 23"}
 {"sql":"SELECT MIN(LateAircraftDelay) FROM mytable LIMIT 2"}
-{"sql":"SELECT AirlineID, DivTotalGTimes FROM mytable ORDER BY FlightDate LIMIT 19","hsqls":["SELECT AirlineID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY FlightDate LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivTotalGTimes <= 196 AND TaxiIn IN (44) OR TotalAddGTime BETWEEN 23 AND 5 ORDER BY OriginStateName","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE (DivTotalGTimes__MV0 <= 196 OR DivTotalGTimes__MV1 <= 196 OR DivTotalGTimes__MV2 <= 196 OR DivTotalGTimes__MV3 <= 196 OR DivTotalGTimes__MV4 <= 196) AND TaxiIn IN (44) OR TotalAddGTime BETWEEN 23 AND 5 ORDER BY OriginStateName LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivArrDelay FROM mytable WHERE Distance >= 157 OR DestCityMarketID <= 32335 AND \"Year\" = 2014 ORDER BY SecurityDelay, CRSDepTime LIMIT 17","hsqls":["SELECT DestWac, DivArrDelay FROM mytable WHERE Distance >= 157 OR DestCityMarketID <= 32335 AND Year = 2014 ORDER BY SecurityDelay, CRSDepTime LIMIT 17"]}
+{"sql":"SELECT AirlineID, DivTotalGTimes FROM mytable ORDER BY FlightDate LIMIT 19","hsqls":["SELECT AirlineID, DivTotalGTimes FROM mytable ORDER BY FlightDate LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivTotalGTimes <= 196 AND TaxiIn IN (44) OR TotalAddGTime BETWEEN 23 AND 5 ORDER BY OriginStateName","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE (DivTotalGTimes[1] <= 196 OR DivTotalGTimes[2] <= 196 OR DivTotalGTimes[3] <= 196 OR DivTotalGTimes[4] <= 196 OR DivTotalGTimes[5] <= 196) AND TaxiIn IN (44) OR TotalAddGTime BETWEEN 23 AND 5 ORDER BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivArrDelay FROM mytable WHERE Distance >= 157 OR DestCityMarketID <= 32335 AND \"Year\" = 2014 ORDER BY SecurityDelay, CRSDepTime LIMIT 17","hsqls":["SELECT DestWac, DivArrDelay FROM mytable WHERE Distance >= 157 OR DestCityMarketID <= 32335 AND `Year` = 2014 ORDER BY SecurityDelay, CRSDepTime LIMIT 17"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk NOT IN ('0700-0759', '0800-0859', '1200-1259') AND OriginAirportSeqID IN (1182304, 1419303) OR OriginStateFips NOT IN (2, 30, 55, 50) LIMIT 7"}
 {"sql":"SELECT FlightDate FROM mytable WHERE DepTime >= 954 LIMIT 5"}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE TaxiIn NOT IN (19, 56, 102, 101) ORDER BY LongestAddGTime, ArrDel15, OriginWac LIMIT 15"}
@@ -2582,36 +2582,36 @@
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE Distance BETWEEN 919 AND 1623 OR OriginCityMarketID NOT IN (33851, 30713, 32511) OR CRSArrTime = 1000 ORDER BY Quarter LIMIT 7"}
 {"sql":"SELECT TaxiOut, FirstDepTime, NASDelay, AVG(DivDistance), COUNT(Cancelled), SUM(DivDistance) FROM mytable WHERE ArrTime NOT IN (850, 1726, 836) GROUP BY TaxiOut, FirstDepTime, NASDelay  ORDER BY TaxiOut, FirstDepTime, NASDelay LIMIT 18","hsqls":["SELECT TaxiOut, FirstDepTime, NASDelay, AVG(DivDistance), COUNT(Cancelled), SUM(DivDistance) FROM mytable WHERE ArrTime NOT IN (850, 1726, 836) GROUP BY TaxiOut, FirstDepTime, NASDelay  ORDER BY TaxiOut, FirstDepTime, NASDelay LIMIT 18"]}
 {"sql":"SELECT Origin, OriginWac, COUNT(*) FROM mytable WHERE TaxiOut IN (66, 42, 51, 52, 9) OR DestCityMarketID BETWEEN 30666 AND 30189 OR ArrDelayMinutes BETWEEN 211.0 AND 49.0 GROUP BY Origin, OriginWac  ORDER BY Origin, OriginWac LIMIT 11","hsqls":["SELECT Origin, OriginWac, COUNT(*) FROM mytable WHERE TaxiOut IN (66, 42, 51, 52, 9) OR DestCityMarketID BETWEEN 30666 AND 30189 OR ArrDelayMinutes BETWEEN 211.0 AND 49.0 GROUP BY Origin, OriginWac  ORDER BY Origin, OriginWac LIMIT 11"]}
-{"sql":"SELECT FlightDate FROM mytable WHERE DivTotalGTimes BETWEEN 38 AND 4 AND OriginCityMarketID IN (34696) OR Dest > 'TWF' ORDER BY ArrTime, Cancelled, DestAirportID LIMIT 24","hsqls":["SELECT FlightDate FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 38 AND 4 OR DivTotalGTimes__MV1 BETWEEN 38 AND 4 OR DivTotalGTimes__MV2 BETWEEN 38 AND 4 OR DivTotalGTimes__MV3 BETWEEN 38 AND 4 OR DivTotalGTimes__MV4 BETWEEN 38 AND 4) AND OriginCityMarketID IN (34696) OR Dest > 'TWF' ORDER BY ArrTime, Cancelled, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, CRSDepTime FROM mytable WHERE DepTime BETWEEN 654 AND 1214 AND \"Year\" NOT IN (2014) AND DistanceGroup BETWEEN 5 AND 3 ORDER BY DivDistance, LongestAddGTime LIMIT 10","hsqls":["SELECT LateAircraftDelay, CRSDepTime FROM mytable WHERE DepTime BETWEEN 654 AND 1214 AND Year NOT IN (2014) AND DistanceGroup BETWEEN 5 AND 3 ORDER BY DivDistance, LongestAddGTime LIMIT 10"]}
-{"sql":"SELECT Diverted, DepDelay, DivTotalGTimes FROM mytable WHERE DivWheelsOns IN (950) AND CRSArrTime IN (1209, 757, 1014) ORDER BY OriginStateFips, Flights LIMIT 7","hsqls":["SELECT Diverted, DepDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE (DivWheelsOns__MV0 IN (950) OR DivWheelsOns__MV1 IN (950) OR DivWheelsOns__MV2 IN (950) OR DivWheelsOns__MV3 IN (950) OR DivWheelsOns__MV4 IN (950)) AND CRSArrTime IN (1209, 757, 1014) ORDER BY OriginStateFips, Flights LIMIT 10000"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE DivTotalGTimes BETWEEN 38 AND 4 AND OriginCityMarketID IN (34696) OR Dest > 'TWF' ORDER BY ArrTime, Cancelled, DestAirportID LIMIT 24","hsqls":["SELECT FlightDate FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 38 AND 4 OR DivTotalGTimes[2] BETWEEN 38 AND 4 OR DivTotalGTimes[3] BETWEEN 38 AND 4 OR DivTotalGTimes[4] BETWEEN 38 AND 4 OR DivTotalGTimes[5] BETWEEN 38 AND 4) AND OriginCityMarketID IN (34696) OR Dest > 'TWF' ORDER BY ArrTime, Cancelled, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, CRSDepTime FROM mytable WHERE DepTime BETWEEN 654 AND 1214 AND \"Year\" NOT IN (2014) AND DistanceGroup BETWEEN 5 AND 3 ORDER BY DivDistance, LongestAddGTime LIMIT 10","hsqls":["SELECT LateAircraftDelay, CRSDepTime FROM mytable WHERE DepTime BETWEEN 654 AND 1214 AND `Year` NOT IN (2014) AND DistanceGroup BETWEEN 5 AND 3 ORDER BY DivDistance, LongestAddGTime LIMIT 10"]}
+{"sql":"SELECT Diverted, DepDelay, DivTotalGTimes FROM mytable WHERE DivWheelsOns IN (950) AND CRSArrTime IN (1209, 757, 1014) ORDER BY OriginStateFips, Flights LIMIT 7","hsqls":["SELECT Diverted, DepDelay, DivTotalGTimes FROM mytable WHERE (DivWheelsOns[1] IN (950) OR DivWheelsOns[2] IN (950) OR DivWheelsOns[3] IN (950) OR DivWheelsOns[4] IN (950) OR DivWheelsOns[5] IN (950)) AND CRSArrTime IN (1209, 757, 1014) ORDER BY OriginStateFips, Flights LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, NASDelay FROM mytable WHERE CRSElapsedTime = 255 LIMIT 29"}
 {"sql":"SELECT TaxiOut, Quarter FROM mytable WHERE DestCityMarketID IN (31884, 31867, 34492, 33377, 33038) OR DivAirportLandings BETWEEN 9 AND 2 OR ArrDelayMinutes = 110.0 LIMIT 8"}
 {"sql":"SELECT CarrierDelay, AVG(DayofMonth), MIN(DepDel15), SUM(Quarter) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 26","hsqls":["SELECT CarrierDelay, AVG(DayofMonth), MIN(DepDel15), SUM(Quarter) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 26"]}
 {"sql":"SELECT FlightDate FROM mytable ORDER BY DestAirportID, OriginStateName LIMIT 22"}
 {"sql":"SELECT DepDelay, Carrier FROM mytable WHERE DestStateName IN ('Louisiana', 'Colorado', 'Massachusetts', 'Kansas') OR DayofMonth BETWEEN 15 AND 8 AND CRSArrTime > 1108 LIMIT 14"}
 {"sql":"SELECT DistanceGroup, DestWac, NASDelay, AVG(DestAirportSeqID), MAX(FirstDepTime), AVG(ArrivalDelayGroups) FROM mytable GROUP BY DistanceGroup, DestWac, NASDelay  ORDER BY DistanceGroup, DestWac, NASDelay LIMIT 21","hsqls":["SELECT DistanceGroup, DestWac, NASDelay, AVG(DestAirportSeqID), MAX(FirstDepTime), AVG(ArrivalDelayGroups) FROM mytable GROUP BY DistanceGroup, DestWac, NASDelay  ORDER BY DistanceGroup, DestWac, NASDelay LIMIT 21"]}
-{"sql":"SELECT MIN(DivActualElapsedTime), MAX(DivAirportLandings) FROM mytable WHERE DivTotalGTimes IN (3, 4, 15, 99, 14) OR TotalAddGTime NOT IN (41, 40, 63, 14, 38) OR DivDistance IN (1590, 369, 490, 177, 191) LIMIT 7","hsqls":["SELECT MIN(DivActualElapsedTime), MAX(DivAirportLandings)  FROM mytable WHERE (DivTotalGTimes__MV0 IN (3, 4, 15, 99, 14) OR DivTotalGTimes__MV1 IN (3, 4, 15, 99, 14) OR DivTotalGTimes__MV2 IN (3, 4, 15, 99, 14) OR DivTotalGTimes__MV3 IN (3, 4, 15, 99, 14) OR DivTotalGTimes__MV4 IN (3, 4, 15, 99, 14)) OR TotalAddGTime NOT IN (41, 40, 63, 14, 38) OR DivDistance IN (1590, 369, 490, 177, 191) LIMIT 10000"]}
+{"sql":"SELECT MIN(DivActualElapsedTime), MAX(DivAirportLandings) FROM mytable WHERE DivTotalGTimes IN (3, 4, 15, 99, 14) OR TotalAddGTime NOT IN (41, 40, 63, 14, 38) OR DivDistance IN (1590, 369, 490, 177, 191) LIMIT 7","hsqls":["SELECT MIN(DivActualElapsedTime), MAX(DivAirportLandings)  FROM mytable WHERE (DivTotalGTimes[1] IN (3, 4, 15, 99, 14) OR DivTotalGTimes[2] IN (3, 4, 15, 99, 14) OR DivTotalGTimes[3] IN (3, 4, 15, 99, 14) OR DivTotalGTimes[4] IN (3, 4, 15, 99, 14) OR DivTotalGTimes[5] IN (3, 4, 15, 99, 14)) OR TotalAddGTime NOT IN (41, 40, 63, 14, 38) OR DivDistance IN (1590, 369, 490, 177, 191) LIMIT 10000"]}
 {"sql":"SELECT AirTime FROM mytable ORDER BY WeatherDelay, DepDel15, DestCityName LIMIT 8"}
 {"sql":"SELECT DistanceGroup, OriginAirportID FROM mytable WHERE CancellationCode IN ('B') ORDER BY ArrTime, ArrDel15, CRSDepTime LIMIT 8"}
-{"sql":"SELECT DivLongestGTimes, CancellationCode, OriginAirportID FROM mytable WHERE DestStateName > 'Pennsylvania' AND DivArrDelay >= 161 OR WeatherDelay >= 61 ORDER BY CarrierDelay LIMIT 7","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CancellationCode, OriginAirportID FROM mytable WHERE DestStateName > 'Pennsylvania' AND DivArrDelay >= 161 OR WeatherDelay >= 61 ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CancellationCode, OriginAirportID FROM mytable WHERE DestStateName > 'Pennsylvania' AND DivArrDelay >= 161 OR WeatherDelay >= 61 ORDER BY CarrierDelay LIMIT 7","hsqls":["SELECT DivLongestGTimes, CancellationCode, OriginAirportID FROM mytable WHERE DestStateName > 'Pennsylvania' AND DivArrDelay >= 161 OR WeatherDelay >= 61 ORDER BY CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, MAX(DestAirportSeqID), MIN(AirlineID) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 19","hsqls":["SELECT CarrierDelay, MAX(DestAirportSeqID), MIN(AirlineID) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 19"]}
 {"sql":"SELECT OriginCityName FROM mytable WHERE AirlineID <> 21171 ORDER BY WeatherDelay LIMIT 13"}
 {"sql":"SELECT DistanceGroup, OriginStateFips, SecurityDelay FROM mytable ORDER BY OriginAirportSeqID, DivDistance, Dest LIMIT 4"}
-{"sql":"SELECT WheelsOff, DivAirportIDs FROM mytable WHERE DivWheelsOffs = 1212 AND Distance BETWEEN 212 AND 1709 ORDER BY ArrDelay LIMIT 10","hsqls":["SELECT WheelsOff, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE (DivWheelsOffs__MV0 = 1212 OR DivWheelsOffs__MV1 = 1212 OR DivWheelsOffs__MV2 = 1212 OR DivWheelsOffs__MV3 = 1212 OR DivWheelsOffs__MV4 = 1212) AND Distance BETWEEN 212 AND 1709 ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivAirportIDs FROM mytable WHERE DivWheelsOffs = 1212 AND Distance BETWEEN 212 AND 1709 ORDER BY ArrDelay LIMIT 10","hsqls":["SELECT WheelsOff, DivAirportIDs FROM mytable WHERE (DivWheelsOffs[1] = 1212 OR DivWheelsOffs[2] = 1212 OR DivWheelsOffs[3] = 1212 OR DivWheelsOffs[4] = 1212 OR DivWheelsOffs[5] = 1212) AND Distance BETWEEN 212 AND 1709 ORDER BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTime, AirTime FROM mytable WHERE DivDistance IN (69, 342) AND OriginState IN ('MT', 'NC', 'CA', 'NV', 'CO') LIMIT 21"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DestWac < 66 ORDER BY FirstDepTime, FlightNum, Cancelled LIMIT 19"}
 {"sql":"SELECT DepDel15, AVG(TotalAddGTime), MAX(CRSDepTime) FROM mytable WHERE DestAirportSeqID BETWEEN 1226402 AND 1209402 OR CRSDepTime = 1106 GROUP BY DepDel15","hsqls":["SELECT DepDel15, AVG(TotalAddGTime), MAX(CRSDepTime) FROM mytable WHERE DestAirportSeqID BETWEEN 1226402 AND 1209402 OR CRSDepTime = 1106 GROUP BY DepDel15"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DivActualElapsedTime = 193 OR DepartureDelayGroups IN (-1, 4, 9) OR OriginCityMarketID BETWEEN 30779 AND 34905 ORDER BY FlightDate, DepDel15, DivActualElapsedTime LIMIT 17"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ActualElapsedTime = 124 ORDER BY \"Month\" LIMIT 15","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ActualElapsedTime = 124 ORDER BY Month LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ActualElapsedTime = 124 ORDER BY \"Month\" LIMIT 15","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE ActualElapsedTime = 124 ORDER BY `Month` LIMIT 10000"]}
 {"sql":"SELECT Flights FROM mytable WHERE SecurityDelay >= 8 OR CRSArrTime < 1625 OR Origin >= 'MHK' LIMIT 24"}
 {"sql":"SELECT AirlineID, SUM(DestCityMarketID) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 1","hsqls":["SELECT AirlineID, SUM(DestCityMarketID) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 1"]}
 {"sql":"SELECT Flights, FlightDate FROM mytable ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 4"}
 {"sql":"SELECT DepartureDelayGroups, SecurityDelay FROM mytable WHERE CRSDepTime NOT IN (1035, 1305) OR DestAirportID BETWEEN 14869 AND 12884 LIMIT 18"}
-{"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE AirlineID <> 20304 AND \"Year\" BETWEEN 2014 AND 2014 AND Quarter IN (1) LIMIT 16","hsqls":["SELECT SUM(TotalAddGTime) FROM mytable WHERE AirlineID <> 20304 AND Year BETWEEN 2014 AND 2014 AND Quarter IN (1) LIMIT 16"]}
+{"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE AirlineID <> 20304 AND \"Year\" BETWEEN 2014 AND 2014 AND Quarter IN (1) LIMIT 16","hsqls":["SELECT SUM(TotalAddGTime) FROM mytable WHERE AirlineID <> 20304 AND `Year` BETWEEN 2014 AND 2014 AND Quarter IN (1) LIMIT 16"]}
 {"sql":"SELECT LateAircraftDelay, ArrTime, AVG(DestAirportSeqID), SUM(Distance) FROM mytable GROUP BY LateAircraftDelay, ArrTime  ORDER BY LateAircraftDelay, ArrTime LIMIT 14","hsqls":["SELECT LateAircraftDelay, ArrTime, AVG(DestAirportSeqID), SUM(Distance) FROM mytable GROUP BY LateAircraftDelay, ArrTime  ORDER BY LateAircraftDelay, ArrTime LIMIT 14"]}
 {"sql":"SELECT WeatherDelay, DaysSinceEpoch, COUNT(LongestAddGTime) FROM mytable GROUP BY WeatherDelay, DaysSinceEpoch  ORDER BY WeatherDelay, DaysSinceEpoch LIMIT 18","hsqls":["SELECT WeatherDelay, DaysSinceEpoch, COUNT(LongestAddGTime) FROM mytable GROUP BY WeatherDelay, DaysSinceEpoch  ORDER BY WeatherDelay, DaysSinceEpoch LIMIT 18"]}
-{"sql":"SELECT DepDelay, WeatherDelay, Origin, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1342202 AND 1163805 OR DestCityMarketID NOT IN (32402, 31921, 35323, 34520, 30185) OR ArrTimeBlk < '0600-0659' GROUP BY DepDelay, WeatherDelay, Origin LIMIT 16","hsqls":["SELECT DepDelay, WeatherDelay, Origin, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs__MV1 BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs__MV2 BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs__MV3 BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs__MV4 BETWEEN 1342202 AND 1163805) OR DestCityMarketID NOT IN (32402, 31921, 35323, 34520, 30185) OR ArrTimeBlk < '0600-0659' GROUP BY DepDelay, WeatherDelay, Origin LIMIT 10000"]}
+{"sql":"SELECT DepDelay, WeatherDelay, Origin, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1342202 AND 1163805 OR DestCityMarketID NOT IN (32402, 31921, 35323, 34520, 30185) OR ArrTimeBlk < '0600-0659' GROUP BY DepDelay, WeatherDelay, Origin LIMIT 16","hsqls":["SELECT DepDelay, WeatherDelay, Origin, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs[2] BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs[3] BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs[4] BETWEEN 1342202 AND 1163805 OR DivAirportSeqIDs[5] BETWEEN 1342202 AND 1163805) OR DestCityMarketID NOT IN (32402, 31921, 35323, 34520, 30185) OR ArrTimeBlk < '0600-0659' GROUP BY DepDelay, WeatherDelay, Origin LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, CRSElapsedTime FROM mytable WHERE ArrDelay <> 68.0 AND DestStateName BETWEEN 'Wisconsin' AND 'New Hampshire' ORDER BY CancellationCode LIMIT 19"}
 {"sql":"SELECT TotalAddGTime, ArrDelay, CRSElapsedTime FROM mytable WHERE OriginCityName BETWEEN 'Kona, HI' AND 'Baton Rouge, LA' AND CRSDepTime BETWEEN 1356 AND 2233 OR OriginWac IN (21, 44, 36, 74, 14) ORDER BY TotalAddGTime, DepTimeBlk LIMIT 6"}
 {"sql":"SELECT SUM(CRSArrTime) FROM mytable WHERE FlightNum IN (5252, 6076, 4373, 2243, 603) AND ArrTime = 842 AND DayOfWeek IN (3, 2, 1, 4) LIMIT 24"}
@@ -2619,16 +2619,16 @@
 {"sql":"SELECT CarrierDelay, CRSDepTime, UniqueCarrier, COUNT(DepTimeBlk) FROM mytable WHERE OriginStateFips IN (6, 42, 8, 34, 37) GROUP BY CarrierDelay, CRSDepTime, UniqueCarrier  ORDER BY CarrierDelay, CRSDepTime, UniqueCarrier LIMIT 18","hsqls":["SELECT CarrierDelay, CRSDepTime, UniqueCarrier, COUNT(DepTimeBlk) FROM mytable WHERE OriginStateFips IN (6, 42, 8, 34, 37) GROUP BY CarrierDelay, CRSDepTime, UniqueCarrier  ORDER BY CarrierDelay, CRSDepTime, UniqueCarrier LIMIT 18"]}
 {"sql":"SELECT TailNum, DestCityMarketID, SUM(TaxiIn), AVG(OriginCityMarketID) FROM mytable WHERE CRSDepTime >= 1527 GROUP BY TailNum, DestCityMarketID  ORDER BY TailNum, DestCityMarketID LIMIT 2","hsqls":["SELECT TailNum, DestCityMarketID, SUM(TaxiIn), AVG(OriginCityMarketID) FROM mytable WHERE CRSDepTime >= 1527 GROUP BY TailNum, DestCityMarketID  ORDER BY TailNum, DestCityMarketID LIMIT 2"]}
 {"sql":"SELECT DestStateFips, ArrTimeBlk, TailNum FROM mytable WHERE LateAircraftDelay = 99 AND DayOfWeek BETWEEN 3 AND 2 ORDER BY ActualElapsedTime LIMIT 9"}
-{"sql":"SELECT WheelsOff, DestState, Origin, COUNT(LongestAddGTime), MIN(\"Month\"), MIN(OriginCityMarketID) FROM mytable WHERE WeatherDelay <= 23 GROUP BY WheelsOff, DestState, Origin LIMIT 25","hsqls":["SELECT WheelsOff, DestState, Origin, COUNT(LongestAddGTime), MIN(Month), MIN(OriginCityMarketID) FROM mytable WHERE WeatherDelay <= 23 GROUP BY WheelsOff, DestState, Origin LIMIT 25"]}
-{"sql":"SELECT \"Year\", CRSArrTime, AVG(Diverted) FROM mytable WHERE FlightNum NOT IN (2244, 307, 7369) AND DivAirportSeqIDs BETWEEN 1540103 AND 1072804 AND CarrierDelay IN (280, 71) GROUP BY \"Year\", CRSArrTime LIMIT 21","hsqls":["SELECT Year, CRSArrTime, AVG(CAST(Diverted AS DOUBLE)) FROM mytable WHERE FlightNum NOT IN (2244, 307, 7369) AND (DivAirportSeqIDs__MV0 BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs__MV1 BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs__MV2 BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs__MV3 BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs__MV4 BETWEEN 1540103 AND 1072804) AND CarrierDelay IN (280, 71) GROUP BY Year, CRSArrTime LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DestState, OriginAirportID FROM mytable WHERE DaysSinceEpoch IN (16093, 16090) AND DivWheelsOns >= 1821 AND DaysSinceEpoch <= 16099 LIMIT 5","hsqls":["SELECT DepDelay, DestState, OriginAirportID FROM mytable WHERE DaysSinceEpoch IN (16093, 16090) AND (DivWheelsOns__MV0 >= 1821 OR DivWheelsOns__MV1 >= 1821 OR DivWheelsOns__MV2 >= 1821 OR DivWheelsOns__MV3 >= 1821 OR DivWheelsOns__MV4 >= 1821) AND DaysSinceEpoch <= 16099 LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DestState, Origin, COUNT(LongestAddGTime), MIN(\"Month\"), MIN(OriginCityMarketID) FROM mytable WHERE WeatherDelay <= 23 GROUP BY WheelsOff, DestState, Origin LIMIT 25","hsqls":["SELECT WheelsOff, DestState, Origin, COUNT(LongestAddGTime), MIN(`Month`), MIN(OriginCityMarketID) FROM mytable WHERE WeatherDelay <= 23 GROUP BY WheelsOff, DestState, Origin LIMIT 25"]}
+{"sql":"SELECT \"Year\", CRSArrTime, AVG(Diverted) FROM mytable WHERE FlightNum NOT IN (2244, 307, 7369) AND DivAirportSeqIDs BETWEEN 1540103 AND 1072804 AND CarrierDelay IN (280, 71) GROUP BY \"Year\", CRSArrTime LIMIT 21","hsqls":["SELECT Year, CRSArrTime, AVG(CAST(Diverted AS DOUBLE)) FROM mytable WHERE FlightNum NOT IN (2244, 307, 7369) AND (DivAirportSeqIDs[1] BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs[2] BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs[3] BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs[4] BETWEEN 1540103 AND 1072804 OR DivAirportSeqIDs[5] BETWEEN 1540103 AND 1072804) AND CarrierDelay IN (280, 71) GROUP BY Year, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DestState, OriginAirportID FROM mytable WHERE DaysSinceEpoch IN (16093, 16090) AND DivWheelsOns >= 1821 AND DaysSinceEpoch <= 16099 LIMIT 5","hsqls":["SELECT DepDelay, DestState, OriginAirportID FROM mytable WHERE DaysSinceEpoch IN (16093, 16090) AND (DivWheelsOns[1] >= 1821 OR DivWheelsOns[2] >= 1821 OR DivWheelsOns[3] >= 1821 OR DivWheelsOns[4] >= 1821 OR DivWheelsOns[5] >= 1821) AND DaysSinceEpoch <= 16099 LIMIT 10000"]}
 {"sql":"SELECT COUNT(DivReachedDest) FROM mytable WHERE Diverted = 0 AND FirstDepTime <= 1040 LIMIT 28"}
 {"sql":"SELECT MAX(Quarter), SUM(OriginAirportID), SUM(DestAirportID) FROM mytable WHERE ArrDelayMinutes > 321.0 OR ArrDel15 = 1 LIMIT 14"}
-{"sql":"SELECT AVG(\"Year\"), COUNT(Dest) FROM mytable WHERE OriginState > 'GA' LIMIT 13","hsqls":["SELECT AVG(Year), COUNT(Dest) FROM mytable WHERE OriginState > 'GA' LIMIT 13"]}
+{"sql":"SELECT AVG(\"Year\"), COUNT(Dest) FROM mytable WHERE OriginState > 'GA' LIMIT 13","hsqls":["SELECT AVG(`Year`), COUNT(Dest) FROM mytable WHERE OriginState > 'GA' LIMIT 13"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE ArrDel15 BETWEEN 0 AND 0 OR DivActualElapsedTime IN (989, 387, 847) AND Quarter < 1 ORDER BY DepTimeBlk LIMIT 12"}
-{"sql":"SELECT DivDistance, DivAirportLandings, OriginAirportID FROM mytable WHERE FlightNum > 712 AND ActualElapsedTime BETWEEN 152 AND 382 ORDER BY \"Month\" LIMIT 20","hsqls":["SELECT DivDistance, DivAirportLandings, OriginAirportID FROM mytable WHERE FlightNum > 712 AND ActualElapsedTime BETWEEN 152 AND 382 ORDER BY Month LIMIT 20"]}
+{"sql":"SELECT DivDistance, DivAirportLandings, OriginAirportID FROM mytable WHERE FlightNum > 712 AND ActualElapsedTime BETWEEN 152 AND 382 ORDER BY \"Month\" LIMIT 20","hsqls":["SELECT DivDistance, DivAirportLandings, OriginAirportID FROM mytable WHERE FlightNum > 712 AND ActualElapsedTime BETWEEN 152 AND 382 ORDER BY `Month` LIMIT 20"]}
 {"sql":"SELECT COUNT(FirstDepTime), COUNT(ArrDelay) FROM mytable WHERE DestCityName <= 'Dubuque, IA' LIMIT 17"}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR FirstDepTime = 903 OR DepDel15 IN (1, 0, -9999) ORDER BY DestWac, CRSDepTime, DivArrDelay LIMIT 23","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR FirstDepTime = 903 OR DepDel15 IN (1, 0, -9999) ORDER BY DestWac, CRSDepTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR FirstDepTime = 903 OR DepDel15 IN (1, 0, -9999) ORDER BY DestWac, CRSDepTime, DivArrDelay LIMIT 23","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR FirstDepTime = 903 OR DepDel15 IN (1, 0, -9999) ORDER BY DestWac, CRSDepTime, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginAirportID), AVG(ArrDelayMinutes), MAX(DivArrDelay) FROM mytable WHERE OriginCityName IN ('Cleveland, OH', 'Carlsbad, CA', 'Petersburg, AK', 'Midland/Odessa, TX', 'Roanoke, VA') OR TailNum BETWEEN 'N617DL' AND 'N923FR' LIMIT 10"}
 {"sql":"SELECT Flights FROM mytable WHERE DepTime BETWEEN 456 AND 2038 ORDER BY OriginWac, CancellationCode LIMIT 29"}
 {"sql":"SELECT DepartureDelayGroups, ArrDelayMinutes, SUM(CarrierDelay), AVG(WeatherDelay), AVG(ActualElapsedTime) FROM mytable WHERE ArrTimeBlk <= '1500-1559' GROUP BY DepartureDelayGroups, ArrDelayMinutes  ORDER BY DepartureDelayGroups, ArrDelayMinutes LIMIT 18","hsqls":["SELECT DepartureDelayGroups, ArrDelayMinutes, SUM(CarrierDelay), AVG(WeatherDelay), AVG(ActualElapsedTime) FROM mytable WHERE ArrTimeBlk <= '1500-1559' GROUP BY DepartureDelayGroups, ArrDelayMinutes  ORDER BY DepartureDelayGroups, ArrDelayMinutes LIMIT 18"]}
@@ -2636,16 +2636,16 @@
 {"sql":"SELECT NASDelay, \"Month\", CRSDepTime, COUNT(*) FROM mytable WHERE Dest IN ('DAB') OR DaysSinceEpoch = 16101 GROUP BY NASDelay, \"Month\", CRSDepTime LIMIT 25","hsqls":["SELECT NASDelay, Month, CRSDepTime, COUNT(*) FROM mytable WHERE Dest IN ('DAB') OR DaysSinceEpoch = 16101 GROUP BY NASDelay, Month, CRSDepTime LIMIT 25"]}
 {"sql":"SELECT AVG(DestAirportSeqID), MAX(DepTime), AVG(DayofMonth) FROM mytable LIMIT 25"}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE TaxiIn BETWEEN 11 AND 2 AND Cancelled BETWEEN 1 AND 1 ORDER BY FirstDepTime, NASDelay, DaysSinceEpoch LIMIT 5"}
-{"sql":"SELECT \"Year\", CRSElapsedTime, COUNT(*) FROM mytable WHERE DivWheelsOffs IN (2320) GROUP BY \"Year\", CRSElapsedTime LIMIT 4","hsqls":["SELECT Year, CRSElapsedTime, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 IN (2320) OR DivWheelsOffs__MV1 IN (2320) OR DivWheelsOffs__MV2 IN (2320) OR DivWheelsOffs__MV3 IN (2320) OR DivWheelsOffs__MV4 IN (2320)) GROUP BY Year, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, ArrTimeBlk, DayofMonth FROM mytable WHERE AirTime IN (189) AND DepDelay IN (120.0, 252.0) LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTimeBlk, DayofMonth FROM mytable WHERE AirTime IN (189) AND DepDelay IN (120.0, 252.0) LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, OriginState FROM mytable WHERE Distance IN (850) OR DivWheelsOns BETWEEN 1747 AND 1229 ORDER BY ArrDel15 LIMIT 19","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginState FROM mytable WHERE Distance IN (850) OR (DivWheelsOns__MV0 BETWEEN 1747 AND 1229 OR DivWheelsOns__MV1 BETWEEN 1747 AND 1229 OR DivWheelsOns__MV2 BETWEEN 1747 AND 1229 OR DivWheelsOns__MV3 BETWEEN 1747 AND 1229 OR DivWheelsOns__MV4 BETWEEN 1747 AND 1229) ORDER BY ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT FlightNum, CRSDepTime, ArrivalDelayGroups FROM mytable WHERE DepTime IN (521, 930, 744, 1342) OR \"Month\" < 1 AND DestCityName > 'Columbus, OH' ORDER BY WeatherDelay, DestCityMarketID, WheelsOn LIMIT 1","hsqls":["SELECT FlightNum, CRSDepTime, ArrivalDelayGroups FROM mytable WHERE DepTime IN (521, 930, 744, 1342) OR Month < 1 AND DestCityName > 'Columbus, OH' ORDER BY WeatherDelay, DestCityMarketID, WheelsOn LIMIT 1"]}
+{"sql":"SELECT \"Year\", CRSElapsedTime, COUNT(*) FROM mytable WHERE DivWheelsOffs IN (2320) GROUP BY \"Year\", CRSElapsedTime LIMIT 4","hsqls":["SELECT Year, CRSElapsedTime, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] IN (2320) OR DivWheelsOffs[2] IN (2320) OR DivWheelsOffs[3] IN (2320) OR DivWheelsOffs[4] IN (2320) OR DivWheelsOffs[5] IN (2320)) GROUP BY Year, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTimeBlk, DayofMonth FROM mytable WHERE AirTime IN (189) AND DepDelay IN (120.0, 252.0) LIMIT 4","hsqls":["SELECT DivLongestGTimes, ArrTimeBlk, DayofMonth FROM mytable WHERE AirTime IN (189) AND DepDelay IN (120.0, 252.0) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginState FROM mytable WHERE Distance IN (850) OR DivWheelsOns BETWEEN 1747 AND 1229 ORDER BY ArrDel15 LIMIT 19","hsqls":["SELECT DivLongestGTimes, OriginState FROM mytable WHERE Distance IN (850) OR (DivWheelsOns[1] BETWEEN 1747 AND 1229 OR DivWheelsOns[2] BETWEEN 1747 AND 1229 OR DivWheelsOns[3] BETWEEN 1747 AND 1229 OR DivWheelsOns[4] BETWEEN 1747 AND 1229 OR DivWheelsOns[5] BETWEEN 1747 AND 1229) ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT FlightNum, CRSDepTime, ArrivalDelayGroups FROM mytable WHERE DepTime IN (521, 930, 744, 1342) OR \"Month\" < 1 AND DestCityName > 'Columbus, OH' ORDER BY WeatherDelay, DestCityMarketID, WheelsOn LIMIT 1","hsqls":["SELECT FlightNum, CRSDepTime, ArrivalDelayGroups FROM mytable WHERE DepTime IN (521, 930, 744, 1342) OR `Month` < 1 AND DestCityName > 'Columbus, OH' ORDER BY WeatherDelay, DestCityMarketID, WheelsOn LIMIT 1"]}
 {"sql":"SELECT SecurityDelay, ArrDelayMinutes, DivActualElapsedTime FROM mytable WHERE AirTime IN (313) AND OriginStateName <= 'U.S. Virgin Islands' OR OriginState IN ('VI') LIMIT 12"}
 {"sql":"SELECT ArrDelay FROM mytable WHERE OriginStateName BETWEEN 'Idaho' AND 'Illinois' ORDER BY OriginAirportSeqID, OriginStateFips, DestCityName LIMIT 25"}
 {"sql":"SELECT MAX(LateAircraftDelay), COUNT(AirlineID) FROM mytable LIMIT 3"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DistanceGroup NOT IN (2, 7, 5, 4, 11) OR WheelsOn > 2221 OR CarrierDelay BETWEEN 0 AND 58 LIMIT 9"}
 {"sql":"SELECT OriginCityMarketID, FlightNum, DivActualElapsedTime, AVG(OriginAirportID) FROM mytable GROUP BY OriginCityMarketID, FlightNum, DivActualElapsedTime  ORDER BY OriginCityMarketID, FlightNum, DivActualElapsedTime LIMIT 2","hsqls":["SELECT OriginCityMarketID, FlightNum, DivActualElapsedTime, AVG(OriginAirportID) FROM mytable GROUP BY OriginCityMarketID, FlightNum, DivActualElapsedTime  ORDER BY OriginCityMarketID, FlightNum, DivActualElapsedTime LIMIT 2"]}
-{"sql":"SELECT OriginAirportSeqID, Cancelled FROM mytable WHERE DivLongestGTimes BETWEEN 50.0 AND 94.0 AND Flights < 1 AND ArrTimeBlk NOT IN ('1700-1759', '2200-2259') LIMIT 12","hsqls":["SELECT OriginAirportSeqID, Cancelled FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 50.0 AND 94.0 OR DivLongestGTimes__MV1 BETWEEN 50.0 AND 94.0 OR DivLongestGTimes__MV2 BETWEEN 50.0 AND 94.0 OR DivLongestGTimes__MV3 BETWEEN 50.0 AND 94.0 OR DivLongestGTimes__MV4 BETWEEN 50.0 AND 94.0) AND Flights < 1 AND ArrTimeBlk NOT IN ('1700-1759', '2200-2259') LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, Cancelled FROM mytable WHERE DivLongestGTimes BETWEEN 50.0 AND 94.0 AND Flights < 1 AND ArrTimeBlk NOT IN ('1700-1759', '2200-2259') LIMIT 12","hsqls":["SELECT OriginAirportSeqID, Cancelled FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 50.0 AND 94.0 OR DivLongestGTimes[2] BETWEEN 50.0 AND 94.0 OR DivLongestGTimes[3] BETWEEN 50.0 AND 94.0 OR DivLongestGTimes[4] BETWEEN 50.0 AND 94.0 OR DivLongestGTimes[5] BETWEEN 50.0 AND 94.0) AND Flights < 1 AND ArrTimeBlk NOT IN ('1700-1759', '2200-2259') LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DepDelayMinutes, OriginCityName, COUNT(*) FROM mytable WHERE DistanceGroup > 10 GROUP BY CarrierDelay, DepDelayMinutes, OriginCityName  ORDER BY CarrierDelay, DepDelayMinutes, OriginCityName LIMIT 3","hsqls":["SELECT CarrierDelay, DepDelayMinutes, OriginCityName, COUNT(*) FROM mytable WHERE DistanceGroup > 10 GROUP BY CarrierDelay, DepDelayMinutes, OriginCityName  ORDER BY CarrierDelay, DepDelayMinutes, OriginCityName LIMIT 3"]}
 {"sql":"SELECT OriginWac, ArrDelay, OriginStateName FROM mytable WHERE TaxiIn BETWEEN 65 AND 35 LIMIT 27"}
 {"sql":"SELECT DestWac FROM mytable WHERE DivReachedDest IN (0, -9999) OR Dest <= 'MDW' OR DistanceGroup IN (1, 6, 5) ORDER BY CRSArrTime LIMIT 20"}
@@ -2657,14 +2657,14 @@
 {"sql":"SELECT OriginState, \"Month\", OriginAirportID FROM mytable WHERE WeatherDelay BETWEEN 316 AND 319 OR OriginAirportID > 11697 ORDER BY TotalAddGTime LIMIT 22","hsqls":["SELECT OriginState, Month, OriginAirportID FROM mytable WHERE WeatherDelay BETWEEN 316 AND 319 OR OriginAirportID > 11697 ORDER BY TotalAddGTime LIMIT 22"]}
 {"sql":"SELECT DestStateName, AirlineID, DivActualElapsedTime FROM mytable LIMIT 15"}
 {"sql":"SELECT DivDistance, TotalAddGTime, DestAirportID FROM mytable WHERE DepTimeBlk > '2200-2259' ORDER BY DepDelay, Quarter LIMIT 7"}
-{"sql":"SELECT DayofMonth FROM mytable WHERE DivAirportIDs IN (14524, 11109, 11630, 14783, 10397) LIMIT 20","hsqls":["SELECT DayofMonth FROM mytable WHERE (DivAirportIDs__MV0 IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs__MV1 IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs__MV2 IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs__MV3 IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs__MV4 IN (14524, 11109, 11630, 14783, 10397)) LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrDelayMinutes < 250.0 LIMIT 26","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE ArrDelayMinutes < 250.0 LIMIT 10000"]}
+{"sql":"SELECT DayofMonth FROM mytable WHERE DivAirportIDs IN (14524, 11109, 11630, 14783, 10397) LIMIT 20","hsqls":["SELECT DayofMonth FROM mytable WHERE (DivAirportIDs[1] IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs[2] IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs[3] IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs[4] IN (14524, 11109, 11630, 14783, 10397) OR DivAirportIDs[5] IN (14524, 11109, 11630, 14783, 10397)) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrDelayMinutes < 250.0 LIMIT 26","hsqls":["SELECT DivWheelsOns FROM mytable WHERE ArrDelayMinutes < 250.0 LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, OriginCityName, Cancelled FROM mytable WHERE DestState BETWEEN 'PR' AND 'MI' ORDER BY DestState, CRSDepTime LIMIT 17"}
 {"sql":"SELECT Quarter, DepDel15, DayofMonth FROM mytable WHERE CRSDepTime IN (1129) AND Cancelled IN (1, 0) ORDER BY Origin, DivAirportLandings LIMIT 19"}
 {"sql":"SELECT Carrier, DestStateFips, DayOfWeek FROM mytable WHERE LongestAddGTime = 34 AND FlightDate IN ('2014-01-23', '2014-01-30') ORDER BY Carrier LIMIT 7"}
 {"sql":"SELECT SUM(DepTime), COUNT(CRSElapsedTime), MIN(OriginCityMarketID) FROM mytable WHERE ArrTimeBlk <> '1700-1759' AND DestAirportSeqID BETWEEN 1015502 AND 1104103 OR DestStateFips IN (49, 2, 4, 36, 12) LIMIT 4"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 18"}
-{"sql":"SELECT DestState, AVG(LateAircraftDelay), MIN(\"Month\"), MIN(ArrivalDelayGroups) FROM mytable WHERE SecurityDelay IN (27) AND DepTimeBlk NOT IN ('1100-1159', '1300-1359') OR DivWheelsOffs IN (1856, 1006, 1152, 1326, 1631) GROUP BY DestState LIMIT 12","hsqls":["SELECT DestState, AVG(LateAircraftDelay), MIN(Month), MIN(ArrivalDelayGroups) FROM mytable WHERE SecurityDelay IN (27) AND DepTimeBlk NOT IN ('1100-1159', '1300-1359') OR (DivWheelsOffs__MV0 IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs__MV1 IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs__MV2 IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs__MV3 IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs__MV4 IN (1856, 1006, 1152, 1326, 1631)) GROUP BY DestState LIMIT 10000"]}
+{"sql":"SELECT DestState, AVG(LateAircraftDelay), MIN(\"Month\"), MIN(ArrivalDelayGroups) FROM mytable WHERE SecurityDelay IN (27) AND DepTimeBlk NOT IN ('1100-1159', '1300-1359') OR DivWheelsOffs IN (1856, 1006, 1152, 1326, 1631) GROUP BY DestState LIMIT 12","hsqls":["SELECT DestState, AVG(LateAircraftDelay), MIN(`Month`), MIN(ArrivalDelayGroups) FROM mytable WHERE SecurityDelay IN (27) AND DepTimeBlk NOT IN ('1100-1159', '1300-1359') OR (DivWheelsOffs[1] IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs[2] IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs[3] IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs[4] IN (1856, 1006, 1152, 1326, 1631) OR DivWheelsOffs[5] IN (1856, 1006, 1152, 1326, 1631)) GROUP BY DestState LIMIT 10000"]}
 {"sql":"SELECT DivDistance, FirstDepTime FROM mytable WHERE Distance BETWEEN 2342 AND 1039 ORDER BY OriginStateFips, TailNum LIMIT 11"}
 {"sql":"SELECT OriginStateFips, OriginCityMarketID, CRSDepTime FROM mytable ORDER BY Origin, CRSElapsedTime LIMIT 8"}
 {"sql":"SELECT TailNum, AVG(Distance) FROM mytable WHERE WeatherDelay >= 74 OR DepTimeBlk >= '1500-1559' GROUP BY TailNum  ORDER BY TailNum LIMIT 10","hsqls":["SELECT TailNum, AVG(Distance) FROM mytable WHERE WeatherDelay >= 74 OR DepTimeBlk >= '1500-1559' GROUP BY TailNum  ORDER BY TailNum LIMIT 10"]}
@@ -2672,15 +2672,15 @@
 {"sql":"SELECT Diverted, Flights, AVG(Flights), SUM(OriginStateFips) FROM mytable GROUP BY Diverted, Flights  ORDER BY Diverted, Flights LIMIT 12","hsqls":["SELECT Diverted, Flights, AVG(Flights), SUM(OriginStateFips) FROM mytable GROUP BY Diverted, Flights  ORDER BY Diverted, Flights LIMIT 12"]}
 {"sql":"SELECT OriginCityMarketID, DestStateFips FROM mytable ORDER BY DivDistance, DaysSinceEpoch LIMIT 6"}
 {"sql":"SELECT LateAircraftDelay, SecurityDelay, DestAirportSeqID, MIN(ActualElapsedTime), SUM(CRSArrTime), MIN(DestStateFips) FROM mytable WHERE ArrDel15 <> -9999 OR DepTime >= 1156 GROUP BY LateAircraftDelay, SecurityDelay, DestAirportSeqID  ORDER BY LateAircraftDelay, SecurityDelay, DestAirportSeqID LIMIT 15","hsqls":["SELECT LateAircraftDelay, SecurityDelay, DestAirportSeqID, MIN(ActualElapsedTime), SUM(CRSArrTime), MIN(DestStateFips) FROM mytable WHERE ArrDel15 <> -9999 OR DepTime >= 1156 GROUP BY LateAircraftDelay, SecurityDelay, DestAirportSeqID  ORDER BY LateAircraftDelay, SecurityDelay, DestAirportSeqID LIMIT 15"]}
-{"sql":"SELECT LongestAddGTime, DivAirportIDs FROM mytable WHERE DestWac NOT IN (1, 51, 87, 11) AND DivLongestGTimes = 97.0 OR ArrTime BETWEEN 1356 AND 1758 ORDER BY OriginAirportSeqID, FirstDepTime LIMIT 15","hsqls":["SELECT LongestAddGTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DestWac NOT IN (1, 51, 87, 11) AND (DivLongestGTimes__MV0 = 97.0 OR DivLongestGTimes__MV1 = 97.0 OR DivLongestGTimes__MV2 = 97.0 OR DivLongestGTimes__MV3 = 97.0 OR DivLongestGTimes__MV4 = 97.0) OR ArrTime BETWEEN 1356 AND 1758 ORDER BY OriginAirportSeqID, FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivAirportIDs FROM mytable WHERE DestWac NOT IN (1, 51, 87, 11) AND DivLongestGTimes = 97.0 OR ArrTime BETWEEN 1356 AND 1758 ORDER BY OriginAirportSeqID, FirstDepTime LIMIT 15","hsqls":["SELECT LongestAddGTime, DivAirportIDs FROM mytable WHERE DestWac NOT IN (1, 51, 87, 11) AND (DivLongestGTimes[1] = 97.0 OR DivLongestGTimes[2] = 97.0 OR DivLongestGTimes[3] = 97.0 OR DivLongestGTimes[4] = 97.0 OR DivLongestGTimes[5] = 97.0) OR ArrTime BETWEEN 1356 AND 1758 ORDER BY OriginAirportSeqID, FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DestAirportID, OriginAirportID FROM mytable ORDER BY Quarter, FirstDepTime, DivAirportLandings LIMIT 14"}
-{"sql":"SELECT DepTime, DestStateName, CancellationCode, MIN(DepartureDelayGroups), SUM(DivReachedDest) FROM mytable WHERE CRSDepTime BETWEEN 536 AND 838 AND \"Year\" BETWEEN 2014 AND 2014 AND OriginCityName BETWEEN 'Tucson, AZ' AND 'Akron, OH' GROUP BY DepTime, DestStateName, CancellationCode LIMIT 4","hsqls":["SELECT DepTime, DestStateName, CancellationCode, MIN(DepartureDelayGroups), SUM(DivReachedDest) FROM mytable WHERE CRSDepTime BETWEEN 536 AND 838 AND Year BETWEEN 2014 AND 2014 AND OriginCityName BETWEEN 'Tucson, AZ' AND 'Akron, OH' GROUP BY DepTime, DestStateName, CancellationCode LIMIT 4"]}
+{"sql":"SELECT DepTime, DestStateName, CancellationCode, MIN(DepartureDelayGroups), SUM(DivReachedDest) FROM mytable WHERE CRSDepTime BETWEEN 536 AND 838 AND \"Year\" BETWEEN 2014 AND 2014 AND OriginCityName BETWEEN 'Tucson, AZ' AND 'Akron, OH' GROUP BY DepTime, DestStateName, CancellationCode LIMIT 4","hsqls":["SELECT DepTime, DestStateName, CancellationCode, MIN(DepartureDelayGroups), SUM(DivReachedDest) FROM mytable WHERE CRSDepTime BETWEEN 536 AND 838 AND `Year` BETWEEN 2014 AND 2014 AND OriginCityName BETWEEN 'Tucson, AZ' AND 'Akron, OH' GROUP BY DepTime, DestStateName, CancellationCode LIMIT 4"]}
 {"sql":"SELECT CancellationCode, CRSDepTime, SUM(DepTime) FROM mytable WHERE ArrivalDelayGroups NOT IN (3, 10, 7, 11) AND ArrDelayMinutes NOT IN (340.0) OR ArrTimeBlk IN ('1200-1259') GROUP BY CancellationCode, CRSDepTime  ORDER BY CancellationCode, CRSDepTime LIMIT 11","hsqls":["SELECT CancellationCode, CRSDepTime, SUM(DepTime) FROM mytable WHERE ArrivalDelayGroups NOT IN (3, 10, 7, 11) AND ArrDelayMinutes NOT IN (340.0) OR ArrTimeBlk IN ('1200-1259') GROUP BY CancellationCode, CRSDepTime  ORDER BY CancellationCode, CRSDepTime LIMIT 11"]}
-{"sql":"SELECT Flights, ArrTimeBlk, Dest, MAX(ArrDelayMinutes) FROM mytable WHERE DivTotalGTimes IN (77, 80, 100, 76) GROUP BY Flights, ArrTimeBlk, Dest LIMIT 20","hsqls":["SELECT Flights, ArrTimeBlk, Dest, MAX(ArrDelayMinutes) FROM mytable WHERE (DivTotalGTimes__MV0 IN (77, 80, 100, 76) OR DivTotalGTimes__MV1 IN (77, 80, 100, 76) OR DivTotalGTimes__MV2 IN (77, 80, 100, 76) OR DivTotalGTimes__MV3 IN (77, 80, 100, 76) OR DivTotalGTimes__MV4 IN (77, 80, 100, 76)) GROUP BY Flights, ArrTimeBlk, Dest LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrTime BETWEEN 818 AND 1049 ORDER BY TaxiOut, DestStateName, DivArrDelay LIMIT 29","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE ArrTime BETWEEN 818 AND 1049 ORDER BY TaxiOut, DestStateName, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT DestAirportSeqID, DivArrDelay, SUM(DepDelayMinutes), SUM(\"Year\") FROM mytable WHERE DayofMonth NOT IN (24, 25, 27) GROUP BY DestAirportSeqID, DivArrDelay LIMIT 8","hsqls":["SELECT DestAirportSeqID, DivArrDelay, SUM(DepDelayMinutes), SUM(Year) FROM mytable WHERE DayofMonth NOT IN (24, 25, 27) GROUP BY DestAirportSeqID, DivArrDelay LIMIT 8"]}
+{"sql":"SELECT Flights, ArrTimeBlk, Dest, MAX(ArrDelayMinutes) FROM mytable WHERE DivTotalGTimes IN (77, 80, 100, 76) GROUP BY Flights, ArrTimeBlk, Dest LIMIT 20","hsqls":["SELECT Flights, ArrTimeBlk, Dest, MAX(ArrDelayMinutes) FROM mytable WHERE (DivTotalGTimes[1] IN (77, 80, 100, 76) OR DivTotalGTimes[2] IN (77, 80, 100, 76) OR DivTotalGTimes[3] IN (77, 80, 100, 76) OR DivTotalGTimes[4] IN (77, 80, 100, 76) OR DivTotalGTimes[5] IN (77, 80, 100, 76)) GROUP BY Flights, ArrTimeBlk, Dest LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrTime BETWEEN 818 AND 1049 ORDER BY TaxiOut, DestStateName, DivArrDelay LIMIT 29","hsqls":["SELECT DivWheelsOns FROM mytable WHERE ArrTime BETWEEN 818 AND 1049 ORDER BY TaxiOut, DestStateName, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivArrDelay, SUM(DepDelayMinutes), SUM(\"Year\") FROM mytable WHERE DayofMonth NOT IN (24, 25, 27) GROUP BY DestAirportSeqID, DivArrDelay LIMIT 8","hsqls":["SELECT DestAirportSeqID, DivArrDelay, SUM(DepDelayMinutes), SUM(`Year`) FROM mytable WHERE DayofMonth NOT IN (24, 25, 27) GROUP BY DestAirportSeqID, DivArrDelay LIMIT 8"]}
 {"sql":"SELECT AVG(CarrierDelay), MIN(DivReachedDest), MIN(FirstDepTime) FROM mytable"}
-{"sql":"SELECT ActualElapsedTime, WheelsOn, AVG(\"Year\"), MIN(CarrierDelay), MAX(DestWac) FROM mytable WHERE Origin BETWEEN 'PWM' AND 'LGB' OR DivAirports BETWEEN 'PHL' AND 'SBN' GROUP BY ActualElapsedTime, WheelsOn LIMIT 10","hsqls":["SELECT ActualElapsedTime, WheelsOn, AVG(Year), MIN(CarrierDelay), MAX(DestWac) FROM mytable WHERE Origin BETWEEN 'PWM' AND 'LGB' OR (DivAirports__MV0 BETWEEN 'PHL' AND 'SBN' OR DivAirports__MV1 BETWEEN 'PHL' AND 'SBN' OR DivAirports__MV2 BETWEEN 'PHL' AND 'SBN' OR DivAirports__MV3 BETWEEN 'PHL' AND 'SBN' OR DivAirports__MV4 BETWEEN 'PHL' AND 'SBN') GROUP BY ActualElapsedTime, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, WheelsOn, AVG(\"Year\"), MIN(CarrierDelay), MAX(DestWac) FROM mytable WHERE Origin BETWEEN 'PWM' AND 'LGB' OR DivAirports BETWEEN 'PHL' AND 'SBN' GROUP BY ActualElapsedTime, WheelsOn LIMIT 10","hsqls":["SELECT ActualElapsedTime, WheelsOn, AVG(`Year`), MIN(CarrierDelay), MAX(DestWac) FROM mytable WHERE Origin BETWEEN 'PWM' AND 'LGB' OR (DivAirports[1] BETWEEN 'PHL' AND 'SBN' OR DivAirports[2] BETWEEN 'PHL' AND 'SBN' OR DivAirports[3] BETWEEN 'PHL' AND 'SBN' OR DivAirports[4] BETWEEN 'PHL' AND 'SBN' OR DivAirports[5] BETWEEN 'PHL' AND 'SBN') GROUP BY ActualElapsedTime, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE ArrTimeBlk IN ('0800-0859') OR DestStateFips NOT IN (42, 6) LIMIT 1"}
 {"sql":"SELECT TaxiOut, LongestAddGTime, Distance, MAX(DepartureDelayGroups), SUM(DivActualElapsedTime) FROM mytable WHERE OriginAirportSeqID > 1343302 AND OriginState <= 'TT' OR Carrier NOT IN ('DL', 'B6', 'OO', 'UA', 'VX') GROUP BY TaxiOut, LongestAddGTime, Distance  ORDER BY TaxiOut, LongestAddGTime, Distance LIMIT 13","hsqls":["SELECT TaxiOut, LongestAddGTime, Distance, MAX(DepartureDelayGroups), SUM(DivActualElapsedTime) FROM mytable WHERE OriginAirportSeqID > 1343302 AND OriginState <= 'TT' OR Carrier NOT IN ('DL', 'B6', 'OO', 'UA', 'VX') GROUP BY TaxiOut, LongestAddGTime, Distance  ORDER BY TaxiOut, LongestAddGTime, Distance LIMIT 13"]}
 {"sql":"SELECT DayofMonth, AVG(Quarter), COUNT(WeatherDelay) FROM mytable WHERE LateAircraftDelay <= 40 OR WheelsOff IN (822, 1703, 1318, 1846) GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 12","hsqls":["SELECT DayofMonth, AVG(Quarter), COUNT(WeatherDelay) FROM mytable WHERE LateAircraftDelay <= 40 OR WheelsOff IN (822, 1703, 1318, 1846) GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 12"]}
@@ -2704,67 +2704,67 @@
 {"sql":"SELECT MAX(NASDelay) FROM mytable LIMIT 10"}
 {"sql":"SELECT LongestAddGTime, NASDelay FROM mytable LIMIT 26"}
 {"sql":"SELECT SecurityDelay, ArrDelay FROM mytable WHERE DistanceGroup BETWEEN 3 AND 8 AND Dest NOT IN ('HOU', 'GSP') ORDER BY ActualElapsedTime, ArrDelay LIMIT 7"}
-{"sql":"SELECT ArrTime, WheelsOn, OriginStateName, MAX(ArrivalDelayGroups), MIN(FirstDepTime) FROM mytable WHERE DivAirports IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') GROUP BY ArrTime, WheelsOn, OriginStateName LIMIT 27","hsqls":["SELECT ArrTime, WheelsOn, OriginStateName, MAX(ArrivalDelayGroups), MIN(FirstDepTime) FROM mytable WHERE (DivAirports__MV0 IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports__MV1 IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports__MV2 IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports__MV3 IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports__MV4 IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP')) GROUP BY ArrTime, WheelsOn, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT DestState, DivTailNums, OriginWac FROM mytable WHERE TailNum NOT IN ('N839AS') ORDER BY FlightDate LIMIT 16","hsqls":["SELECT DestState, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, OriginWac FROM mytable WHERE TailNum NOT IN ('N839AS') ORDER BY FlightDate LIMIT 10000"]}
+{"sql":"SELECT ArrTime, WheelsOn, OriginStateName, MAX(ArrivalDelayGroups), MIN(FirstDepTime) FROM mytable WHERE DivAirports IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') GROUP BY ArrTime, WheelsOn, OriginStateName LIMIT 27","hsqls":["SELECT ArrTime, WheelsOn, OriginStateName, MAX(ArrivalDelayGroups), MIN(FirstDepTime) FROM mytable WHERE (DivAirports[1] IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports[2] IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports[3] IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports[4] IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP') OR DivAirports[5] IN ('HOU', 'BPT', 'MLI', 'LAS', 'CRP')) GROUP BY ArrTime, WheelsOn, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestState, DivTailNums, OriginWac FROM mytable WHERE TailNum NOT IN ('N839AS') ORDER BY FlightDate LIMIT 16","hsqls":["SELECT DestState, DivTailNums, OriginWac FROM mytable WHERE TailNum NOT IN ('N839AS') ORDER BY FlightDate LIMIT 10000"]}
 {"sql":"SELECT DepDelay, CRSArrTime, DestAirportID FROM mytable WHERE Dest BETWEEN 'JAN' AND 'AUS' ORDER BY WeatherDelay LIMIT 7"}
 {"sql":"SELECT OriginCityMarketID, DepDel15, OriginWac FROM mytable WHERE AirTime < 31 OR WeatherDelay BETWEEN 29 AND 92 ORDER BY FirstDepTime LIMIT 17"}
 {"sql":"SELECT DivDistance, MIN(NASDelay) FROM mytable WHERE DivDistance NOT IN (717, 268) GROUP BY DivDistance  ORDER BY DivDistance LIMIT 20","hsqls":["SELECT DivDistance, MIN(NASDelay) FROM mytable WHERE DivDistance NOT IN (717, 268) GROUP BY DivDistance  ORDER BY DivDistance LIMIT 20"]}
 {"sql":"SELECT DivReachedDest, OriginCityName, DepDel15 FROM mytable WHERE CRSArrTime IN (915, 1536) ORDER BY NASDelay LIMIT 8"}
 {"sql":"SELECT ArrDel15, DestCityMarketID, AVG(OriginWac), SUM(WeatherDelay) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 AND FlightDate BETWEEN '2014-01-05' AND '2014-01-04' GROUP BY ArrDel15, DestCityMarketID  ORDER BY ArrDel15, DestCityMarketID LIMIT 24","hsqls":["SELECT ArrDel15, DestCityMarketID, AVG(OriginWac), SUM(WeatherDelay) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 AND FlightDate BETWEEN '2014-01-05' AND '2014-01-04' GROUP BY ArrDel15, DestCityMarketID  ORDER BY ArrDel15, DestCityMarketID LIMIT 24"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE OriginStateFips BETWEEN 72 AND 9 LIMIT 11","hsqls":["SELECT Month FROM mytable WHERE OriginStateFips BETWEEN 72 AND 9 LIMIT 11"]}
-{"sql":"SELECT DivAirportSeqIDs, ArrDelayMinutes FROM mytable WHERE OriginStateName IN ('Colorado', 'Alaska', 'South Dakota') ORDER BY WeatherDelay LIMIT 5","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrDelayMinutes FROM mytable WHERE OriginStateName IN ('Colorado', 'Alaska', 'South Dakota') ORDER BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE OriginStateFips BETWEEN 72 AND 9 LIMIT 11","hsqls":["SELECT `Month` FROM mytable WHERE OriginStateFips BETWEEN 72 AND 9 LIMIT 11"]}
+{"sql":"SELECT DivAirportSeqIDs, ArrDelayMinutes FROM mytable WHERE OriginStateName IN ('Colorado', 'Alaska', 'South Dakota') ORDER BY WeatherDelay LIMIT 5","hsqls":["SELECT DivAirportSeqIDs, ArrDelayMinutes FROM mytable WHERE OriginStateName IN ('Colorado', 'Alaska', 'South Dakota') ORDER BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT Cancelled FROM mytable WHERE UniqueCarrier NOT IN ('WN', 'OO', 'UA') AND DestCityMarketID BETWEEN 31637 AND 32600 AND DayofMonth IN (17, 29) LIMIT 9"}
 {"sql":"SELECT DivDistance, WeatherDelay, CRSArrTime FROM mytable ORDER BY OriginCityName LIMIT 6"}
 {"sql":"SELECT Diverted, Distance FROM mytable ORDER BY DivDistance, Origin LIMIT 9"}
-{"sql":"SELECT TaxiIn, SUM(ArrivalDelayGroups), MAX(\"Year\"), COUNT(OriginStateName) FROM mytable WHERE Quarter NOT IN (1) GROUP BY TaxiIn LIMIT 14","hsqls":["SELECT TaxiIn, SUM(ArrivalDelayGroups), MAX(Year), COUNT(OriginStateName) FROM mytable WHERE Quarter NOT IN (1) GROUP BY TaxiIn LIMIT 14"]}
+{"sql":"SELECT TaxiIn, SUM(ArrivalDelayGroups), MAX(\"Year\"), COUNT(OriginStateName) FROM mytable WHERE Quarter NOT IN (1) GROUP BY TaxiIn LIMIT 14","hsqls":["SELECT TaxiIn, SUM(ArrivalDelayGroups), MAX(`Year`), COUNT(OriginStateName) FROM mytable WHERE Quarter NOT IN (1) GROUP BY TaxiIn LIMIT 14"]}
 {"sql":"SELECT FirstDepTime, TotalAddGTime, TailNum, AVG(DepDel15), SUM(CRSArrTime) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 AND Carrier < 'MQ' OR DivReachedDest BETWEEN 0 AND 1 GROUP BY FirstDepTime, TotalAddGTime, TailNum  ORDER BY FirstDepTime, TotalAddGTime, TailNum LIMIT 18","hsqls":["SELECT FirstDepTime, TotalAddGTime, TailNum, AVG(DepDel15), SUM(CRSArrTime) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 AND Carrier < 'MQ' OR DivReachedDest BETWEEN 0 AND 1 GROUP BY FirstDepTime, TotalAddGTime, TailNum  ORDER BY FirstDepTime, TotalAddGTime, TailNum LIMIT 18"]}
-{"sql":"SELECT Flights, ArrivalDelayGroups, MIN(OriginWac), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE DivAirportIDs IN (13296, 14771, 14783, 14288, 12819) GROUP BY Flights, ArrivalDelayGroups","hsqls":["SELECT Flights, ArrivalDelayGroups, MIN(OriginWac), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE (DivAirportIDs__MV0 IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs__MV1 IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs__MV2 IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs__MV3 IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs__MV4 IN (13296, 14771, 14783, 14288, 12819)) GROUP BY Flights, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT SecurityDelay, AirlineID, OriginWac, COUNT(*) FROM mytable WHERE \"Year\" <= 2014 AND DivDistance > 157 AND Flights <> 1 GROUP BY SecurityDelay, AirlineID, OriginWac LIMIT 4","hsqls":["SELECT SecurityDelay, AirlineID, OriginWac, COUNT(*) FROM mytable WHERE Year <= 2014 AND DivDistance > 157 AND Flights <> 1 GROUP BY SecurityDelay, AirlineID, OriginWac LIMIT 4"]}
+{"sql":"SELECT Flights, ArrivalDelayGroups, MIN(OriginWac), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE DivAirportIDs IN (13296, 14771, 14783, 14288, 12819) GROUP BY Flights, ArrivalDelayGroups","hsqls":["SELECT Flights, ArrivalDelayGroups, MIN(OriginWac), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE (DivAirportIDs[1] IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs[2] IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs[3] IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs[4] IN (13296, 14771, 14783, 14288, 12819) OR DivAirportIDs[5] IN (13296, 14771, 14783, 14288, 12819)) GROUP BY Flights, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, AirlineID, OriginWac, COUNT(*) FROM mytable WHERE \"Year\" <= 2014 AND DivDistance > 157 AND Flights <> 1 GROUP BY SecurityDelay, AirlineID, OriginWac LIMIT 4","hsqls":["SELECT SecurityDelay, AirlineID, OriginWac, COUNT(*) FROM mytable WHERE `Year` <= 2014 AND DivDistance > 157 AND Flights <> 1 GROUP BY SecurityDelay, AirlineID, OriginWac LIMIT 4"]}
 {"sql":"SELECT TotalAddGTime, Dest, CRSElapsedTime FROM mytable WHERE DepDelay IN (241.0, 470.0, 39.0) AND CRSElapsedTime NOT IN (230, 305, 190, 255) OR CRSArrTime NOT IN (2233, 1233, 905, 1951, 836) ORDER BY SecurityDelay LIMIT 21"}
-{"sql":"SELECT FlightNum, AirlineID FROM mytable WHERE DivWheelsOns BETWEEN 2003 AND 1324 OR DestAirportID IN (14113, 11433, 12758) ORDER BY DestCityName, Origin, CRSDepTime LIMIT 10","hsqls":["SELECT FlightNum, AirlineID FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 2003 AND 1324 OR DivWheelsOns__MV1 BETWEEN 2003 AND 1324 OR DivWheelsOns__MV2 BETWEEN 2003 AND 1324 OR DivWheelsOns__MV3 BETWEEN 2003 AND 1324 OR DivWheelsOns__MV4 BETWEEN 2003 AND 1324) OR DestAirportID IN (14113, 11433, 12758) ORDER BY DestCityName, Origin, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT ArrDelay, DayOfWeek FROM mytable WHERE DivTotalGTimes IN (117, 90, 9, 16, 73) AND DivArrDelay BETWEEN 258 AND 481 ORDER BY DestState LIMIT 23","hsqls":["SELECT ArrDelay, DayOfWeek FROM mytable WHERE (DivTotalGTimes__MV0 IN (117, 90, 9, 16, 73) OR DivTotalGTimes__MV1 IN (117, 90, 9, 16, 73) OR DivTotalGTimes__MV2 IN (117, 90, 9, 16, 73) OR DivTotalGTimes__MV3 IN (117, 90, 9, 16, 73) OR DivTotalGTimes__MV4 IN (117, 90, 9, 16, 73)) AND DivArrDelay BETWEEN 258 AND 481 ORDER BY DestState LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, DestStateName FROM mytable WHERE \"Year\" >= 2014 AND FlightDate IN ('2014-01-14', '2014-01-17') LIMIT 13","hsqls":["SELECT DepDelayMinutes, DestStateName FROM mytable WHERE Year >= 2014 AND FlightDate IN ('2014-01-14', '2014-01-17') LIMIT 13"]}
-{"sql":"SELECT Carrier, DestStateFips, OriginStateName, MAX(DepDelayMinutes) FROM mytable WHERE DivArrDelay IN (252, 226, 70) OR DivLongestGTimes IN (28.0, 62.0, 87.0) OR TaxiOut > 56 GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 7","hsqls":["SELECT Carrier, DestStateFips, OriginStateName, MAX(DepDelayMinutes) FROM mytable WHERE DivArrDelay IN (252, 226, 70) OR (DivLongestGTimes__MV0 IN (28.0, 62.0, 87.0) OR DivLongestGTimes__MV1 IN (28.0, 62.0, 87.0) OR DivLongestGTimes__MV2 IN (28.0, 62.0, 87.0) OR DivLongestGTimes__MV3 IN (28.0, 62.0, 87.0) OR DivLongestGTimes__MV4 IN (28.0, 62.0, 87.0)) OR TaxiOut > 56 GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT FlightNum, AirlineID FROM mytable WHERE DivWheelsOns BETWEEN 2003 AND 1324 OR DestAirportID IN (14113, 11433, 12758) ORDER BY DestCityName, Origin, CRSDepTime LIMIT 10","hsqls":["SELECT FlightNum, AirlineID FROM mytable WHERE (DivWheelsOns[1] BETWEEN 2003 AND 1324 OR DivWheelsOns[2] BETWEEN 2003 AND 1324 OR DivWheelsOns[3] BETWEEN 2003 AND 1324 OR DivWheelsOns[4] BETWEEN 2003 AND 1324 OR DivWheelsOns[5] BETWEEN 2003 AND 1324) OR DestAirportID IN (14113, 11433, 12758) ORDER BY DestCityName, Origin, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, DayOfWeek FROM mytable WHERE DivTotalGTimes IN (117, 90, 9, 16, 73) AND DivArrDelay BETWEEN 258 AND 481 ORDER BY DestState LIMIT 23","hsqls":["SELECT ArrDelay, DayOfWeek FROM mytable WHERE (DivTotalGTimes[1] IN (117, 90, 9, 16, 73) OR DivTotalGTimes[2] IN (117, 90, 9, 16, 73) OR DivTotalGTimes[3] IN (117, 90, 9, 16, 73) OR DivTotalGTimes[4] IN (117, 90, 9, 16, 73) OR DivTotalGTimes[5] IN (117, 90, 9, 16, 73)) AND DivArrDelay BETWEEN 258 AND 481 ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DestStateName FROM mytable WHERE \"Year\" >= 2014 AND FlightDate IN ('2014-01-14', '2014-01-17') LIMIT 13","hsqls":["SELECT DepDelayMinutes, DestStateName FROM mytable WHERE `Year` >= 2014 AND FlightDate IN ('2014-01-14', '2014-01-17') LIMIT 13"]}
+{"sql":"SELECT Carrier, DestStateFips, OriginStateName, MAX(DepDelayMinutes) FROM mytable WHERE DivArrDelay IN (252, 226, 70) OR DivLongestGTimes IN (28.0, 62.0, 87.0) OR TaxiOut > 56 GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 7","hsqls":["SELECT Carrier, DestStateFips, OriginStateName, MAX(DepDelayMinutes) FROM mytable WHERE DivArrDelay IN (252, 226, 70) OR (DivLongestGTimes[1] IN (28.0, 62.0, 87.0) OR DivLongestGTimes[2] IN (28.0, 62.0, 87.0) OR DivLongestGTimes[3] IN (28.0, 62.0, 87.0) OR DivLongestGTimes[4] IN (28.0, 62.0, 87.0) OR DivLongestGTimes[5] IN (28.0, 62.0, 87.0)) OR TaxiOut > 56 GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DayofMonth BETWEEN 30 AND 25 OR DepTimeBlk = '0800-0859' OR AirlineID IN (20304, 19930, 21171, 19977) LIMIT 6"}
 {"sql":"SELECT DepTime, DivArrDelay FROM mytable WHERE LateAircraftDelay BETWEEN 41 AND 11 ORDER BY Origin, DepTimeBlk, DestCityMarketID LIMIT 3"}
 {"sql":"SELECT WheelsOff, LateAircraftDelay, UniqueCarrier FROM mytable ORDER BY FlightNum, AirTime, CRSElapsedTime LIMIT 24"}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE DestWac IN (43, 5, 35, 51, 85) OR Dest <= 'PIA' AND Diverted BETWEEN 0 AND 1 ORDER BY DestWac, DepDel15 LIMIT 22"}
 {"sql":"SELECT TaxiOut, LateAircraftDelay FROM mytable ORDER BY ArrDelayMinutes, DestStateName, OriginWac LIMIT 17"}
 {"sql":"SELECT MAX(WheelsOff), MIN(LateAircraftDelay), COUNT(FlightDate) FROM mytable LIMIT 13"}
-{"sql":"SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND \"Year\" < 2014 OR CRSElapsedTime >= 337 LIMIT 29","hsqls":["SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND Year < 2014 OR CRSElapsedTime >= 337 LIMIT 29"]}
-{"sql":"SELECT TaxiIn, DivAirportSeqIDs, ActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 14","hsqls":["SELECT TaxiIn, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND \"Year\" < 2014 OR CRSElapsedTime >= 337 LIMIT 29","hsqls":["SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND `Year` < 2014 OR CRSElapsedTime >= 337 LIMIT 29"]}
+{"sql":"SELECT TaxiIn, DivAirportSeqIDs, ActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 14","hsqls":["SELECT TaxiIn, DivAirportSeqIDs, ActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, SecurityDelay, TotalAddGTime FROM mytable WHERE AirTime NOT IN (30, 201, 333, 235) AND DistanceGroup BETWEEN 8 AND 5 ORDER BY DestStateName LIMIT 2"}
 {"sql":"SELECT FlightNum, ActualElapsedTime, MIN(Quarter), SUM(OriginAirportID) FROM mytable WHERE OriginAirportSeqID IN (1040802, 1232002, 1509602, 1490503) GROUP BY FlightNum, ActualElapsedTime  ORDER BY FlightNum, ActualElapsedTime LIMIT 28","hsqls":["SELECT FlightNum, ActualElapsedTime, MIN(Quarter), SUM(OriginAirportID) FROM mytable WHERE OriginAirportSeqID IN (1040802, 1232002, 1509602, 1490503) GROUP BY FlightNum, ActualElapsedTime  ORDER BY FlightNum, ActualElapsedTime LIMIT 28"]}
-{"sql":"SELECT DivTotalGTimes, DayOfWeek FROM mytable WHERE Quarter NOT IN (1) AND Distance BETWEEN 624 AND 1709 ORDER BY DestStateName","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, DayOfWeek FROM mytable WHERE Quarter NOT IN (1) AND Distance BETWEEN 624 AND 1709 ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes, DayOfWeek FROM mytable WHERE Quarter NOT IN (1) AND Distance BETWEEN 624 AND 1709 ORDER BY DestStateName","hsqls":["SELECT DivTotalGTimes, DayOfWeek FROM mytable WHERE Quarter NOT IN (1) AND Distance BETWEEN 624 AND 1709 ORDER BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, ArrTimeBlk, MIN(SecurityDelay), COUNT(DayOfWeek) FROM mytable WHERE DayofMonth NOT IN (7, 11) GROUP BY DepDelayMinutes, ArrTimeBlk  ORDER BY DepDelayMinutes, ArrTimeBlk LIMIT 19","hsqls":["SELECT DepDelayMinutes, ArrTimeBlk, MIN(SecurityDelay), COUNT(DayOfWeek) FROM mytable WHERE DayofMonth NOT IN (7, 11) GROUP BY DepDelayMinutes, ArrTimeBlk  ORDER BY DepDelayMinutes, ArrTimeBlk LIMIT 19"]}
 {"sql":"SELECT OriginAirportSeqID, DestState, DepTimeBlk FROM mytable WHERE OriginStateName BETWEEN 'North Dakota' AND 'Idaho' OR DepDelayMinutes BETWEEN 4.0 AND 200.0 OR Dest BETWEEN 'MGM' AND 'CMX' ORDER BY DestState, DestStateName LIMIT 15"}
 {"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE DivAirportLandings <> 9 AND DepDel15 IN (0) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 20","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE DivAirportLandings <> 9 AND DepDel15 IN (0) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 20"]}
-{"sql":"SELECT DestStateFips, SUM(DaysSinceEpoch) FROM mytable WHERE ActualElapsedTime NOT IN (326, 37, 273) AND DivAirportLandings NOT IN (2, 1, 0, 9) OR DivWheelsOffs BETWEEN 1659 AND 809 GROUP BY DestStateFips LIMIT 28","hsqls":["SELECT DestStateFips, SUM(DaysSinceEpoch) FROM mytable WHERE ActualElapsedTime NOT IN (326, 37, 273) AND DivAirportLandings NOT IN (2, 1, 0, 9) OR (DivWheelsOffs__MV0 BETWEEN 1659 AND 809 OR DivWheelsOffs__MV1 BETWEEN 1659 AND 809 OR DivWheelsOffs__MV2 BETWEEN 1659 AND 809 OR DivWheelsOffs__MV3 BETWEEN 1659 AND 809 OR DivWheelsOffs__MV4 BETWEEN 1659 AND 809) GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, SUM(DaysSinceEpoch) FROM mytable WHERE ActualElapsedTime NOT IN (326, 37, 273) AND DivAirportLandings NOT IN (2, 1, 0, 9) OR DivWheelsOffs BETWEEN 1659 AND 809 GROUP BY DestStateFips LIMIT 28","hsqls":["SELECT DestStateFips, SUM(DaysSinceEpoch) FROM mytable WHERE ActualElapsedTime NOT IN (326, 37, 273) AND DivAirportLandings NOT IN (2, 1, 0, 9) OR (DivWheelsOffs[1] BETWEEN 1659 AND 809 OR DivWheelsOffs[2] BETWEEN 1659 AND 809 OR DivWheelsOffs[3] BETWEEN 1659 AND 809 OR DivWheelsOffs[4] BETWEEN 1659 AND 809 OR DivWheelsOffs[5] BETWEEN 1659 AND 809) GROUP BY DestStateFips LIMIT 10000"]}
 {"sql":"SELECT \"Year\", ArrTime, DayofMonth FROM mytable ORDER BY WheelsOff, CRSDepTime, CRSElapsedTime","hsqls":["SELECT Year, ArrTime, DayofMonth FROM mytable ORDER BY WheelsOff, CRSDepTime, CRSElapsedTime"]}
 {"sql":"SELECT DivReachedDest, MIN(SecurityDelay), MAX(OriginAirportID), AVG(DepTime) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 6","hsqls":["SELECT DivReachedDest, MIN(SecurityDelay), MAX(OriginAirportID), AVG(DepTime) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 6"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE OriginAirportSeqID BETWEEN 1387302 AND 1336003 AND DestState = 'MI' ORDER BY OriginAirportSeqID LIMIT 22"}
 {"sql":"SELECT DivActualElapsedTime, MIN(ActualElapsedTime), COUNT(Cancelled) FROM mytable WHERE DepDelayMinutes > 225.0 AND LateAircraftDelay NOT IN (197, 76) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 6","hsqls":["SELECT DivActualElapsedTime, MIN(ActualElapsedTime), COUNT(Cancelled) FROM mytable WHERE DepDelayMinutes > 225.0 AND LateAircraftDelay NOT IN (197, 76) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 6"]}
-{"sql":"SELECT Origin FROM mytable WHERE AirlineID BETWEEN 20409 AND 19393 OR DivTotalGTimes BETWEEN 48 AND 111 OR TaxiIn BETWEEN -9999 AND 37 ORDER BY DepDelayMinutes, ArrDelayMinutes LIMIT 12","hsqls":["SELECT Origin FROM mytable WHERE AirlineID BETWEEN 20409 AND 19393 OR (DivTotalGTimes__MV0 BETWEEN 48 AND 111 OR DivTotalGTimes__MV1 BETWEEN 48 AND 111 OR DivTotalGTimes__MV2 BETWEEN 48 AND 111 OR DivTotalGTimes__MV3 BETWEEN 48 AND 111 OR DivTotalGTimes__MV4 BETWEEN 48 AND 111) OR TaxiIn BETWEEN -9999 AND 37 ORDER BY DepDelayMinutes, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT Origin FROM mytable WHERE AirlineID BETWEEN 20409 AND 19393 OR DivTotalGTimes BETWEEN 48 AND 111 OR TaxiIn BETWEEN -9999 AND 37 ORDER BY DepDelayMinutes, ArrDelayMinutes LIMIT 12","hsqls":["SELECT Origin FROM mytable WHERE AirlineID BETWEEN 20409 AND 19393 OR (DivTotalGTimes[1] BETWEEN 48 AND 111 OR DivTotalGTimes[2] BETWEEN 48 AND 111 OR DivTotalGTimes[3] BETWEEN 48 AND 111 OR DivTotalGTimes[4] BETWEEN 48 AND 111 OR DivTotalGTimes[5] BETWEEN 48 AND 111) OR TaxiIn BETWEEN -9999 AND 37 ORDER BY DepDelayMinutes, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT Cancelled, CancellationCode FROM mytable WHERE DestStateFips BETWEEN 24 AND 34 AND AirTime IN (202, 357, 172, 192) AND DestCityMarketID <> 31308 ORDER BY DepDelay, Carrier LIMIT 23"}
 {"sql":"SELECT OriginState, Distance, TaxiIn, COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (1631) GROUP BY OriginState, Distance, TaxiIn  ORDER BY OriginState, Distance, TaxiIn LIMIT 21","hsqls":["SELECT OriginState, Distance, TaxiIn, COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (1631) GROUP BY OriginState, Distance, TaxiIn  ORDER BY OriginState, Distance, TaxiIn LIMIT 21"]}
 {"sql":"SELECT WheelsOff, Diverted, DestAirportSeqID FROM mytable WHERE DestCityName < 'Washington, DC' LIMIT 16"}
-{"sql":"SELECT FlightNum, Origin, \"Month\" FROM mytable ORDER BY ArrDel15, CancellationCode LIMIT 10","hsqls":["SELECT FlightNum, Origin, Month FROM mytable ORDER BY ArrDel15, CancellationCode LIMIT 10"]}
-{"sql":"SELECT DivAirportSeqIDs, Cancelled, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 0 AND DepTimeBlk NOT IN ('1600-1659', '1700-1759', '1100-1159', '1900-1959') AND DaysSinceEpoch >= 16087 ORDER BY WheelsOff, DestState, ActualElapsedTime LIMIT 17","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Cancelled, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 0 AND DepTimeBlk NOT IN ('1600-1659', '1700-1759', '1100-1159', '1900-1959') AND DaysSinceEpoch >= 16087 ORDER BY WheelsOff, DestState, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FlightNum, Origin, \"Month\" FROM mytable ORDER BY ArrDel15, CancellationCode LIMIT 10","hsqls":["SELECT FlightNum, Origin, `Month` FROM mytable ORDER BY ArrDel15, CancellationCode LIMIT 10"]}
+{"sql":"SELECT DivAirportSeqIDs, Cancelled, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 0 AND DepTimeBlk NOT IN ('1600-1659', '1700-1759', '1100-1159', '1900-1959') AND DaysSinceEpoch >= 16087 ORDER BY WheelsOff, DestState, ActualElapsedTime LIMIT 17","hsqls":["SELECT DivAirportSeqIDs, Cancelled, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups < 0 AND DepTimeBlk NOT IN ('1600-1659', '1700-1759', '1100-1159', '1900-1959') AND DaysSinceEpoch >= 16087 ORDER BY WheelsOff, DestState, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Origin, DestCityMarketID, MAX(ArrDelay) FROM mytable WHERE DepDelay BETWEEN 39.0 AND 51.0 AND ArrivalDelayGroups NOT IN (2, -9999) GROUP BY Origin, DestCityMarketID  ORDER BY Origin, DestCityMarketID LIMIT 16","hsqls":["SELECT Origin, DestCityMarketID, MAX(ArrDelay) FROM mytable WHERE DepDelay BETWEEN 39.0 AND 51.0 AND ArrivalDelayGroups NOT IN (2, -9999) GROUP BY Origin, DestCityMarketID  ORDER BY Origin, DestCityMarketID LIMIT 16"]}
 {"sql":"SELECT CRSDepTime, MAX(DistanceGroup), AVG(FlightNum), SUM(ArrTime) FROM mytable WHERE CRSArrTime NOT IN (1251, 1323) OR AirlineID BETWEEN 20398 AND 19393 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 25","hsqls":["SELECT CRSDepTime, MAX(DistanceGroup), AVG(FlightNum), SUM(ArrTime) FROM mytable WHERE CRSArrTime NOT IN (1251, 1323) OR AirlineID BETWEEN 20398 AND 19393 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 25"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE Cancelled < 0 ORDER BY CRSArrTime, ActualElapsedTime, OriginAirportID LIMIT 13"}
-{"sql":"SELECT DestStateFips, TotalAddGTime, \"Month\", COUNT(TaxiOut), COUNT(DestStateName), MIN(FirstDepTime) FROM mytable GROUP BY DestStateFips, TotalAddGTime, \"Month\" LIMIT 9","hsqls":["SELECT DestStateFips, TotalAddGTime, Month, COUNT(TaxiOut), COUNT(DestStateName), MIN(FirstDepTime) FROM mytable GROUP BY DestStateFips, TotalAddGTime, Month LIMIT 9"]}
+{"sql":"SELECT DestStateFips, TotalAddGTime, \"Month\", COUNT(TaxiOut), COUNT(DestStateName), MIN(FirstDepTime) FROM mytable GROUP BY DestStateFips, TotalAddGTime, \"Month\" LIMIT 9","hsqls":["SELECT DestStateFips, TotalAddGTime, Month, COUNT(TaxiOut), COUNT(DestStateName), MIN(FirstDepTime) FROM mytable GROUP BY DestStateFips, TotalAddGTime, `Month` LIMIT 9"]}
 {"sql":"SELECT DestState, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 237 AND 265 GROUP BY DestState  ORDER BY DestState LIMIT 23","hsqls":["SELECT DestState, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 237 AND 265 GROUP BY DestState  ORDER BY DestState LIMIT 23"]}
 {"sql":"SELECT DepTimeBlk, AVG(DivDistance), COUNT(AirTime) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 18","hsqls":["SELECT DepTimeBlk, AVG(DivDistance), COUNT(AirTime) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 18"]}
-{"sql":"SELECT Dest, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (10, 12) AND DivAirportLandings BETWEEN 9 AND 1 AND TaxiOut <> 83 ORDER BY \"Month\" LIMIT 16","hsqls":["SELECT Dest, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (10, 12) AND DivAirportLandings BETWEEN 9 AND 1 AND TaxiOut <> 83 ORDER BY Month LIMIT 16"]}
+{"sql":"SELECT Dest, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (10, 12) AND DivAirportLandings BETWEEN 9 AND 1 AND TaxiOut <> 83 ORDER BY \"Month\" LIMIT 16","hsqls":["SELECT Dest, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (10, 12) AND DivAirportLandings BETWEEN 9 AND 1 AND TaxiOut <> 83 ORDER BY `Month` LIMIT 16"]}
 {"sql":"SELECT AirTime, MIN(DepartureDelayGroups), SUM(OriginCityMarketID), AVG(OriginStateFips) FROM mytable WHERE CancellationCode <> 'C' AND DestState < 'IN' OR ArrTimeBlk <> '1300-1359' GROUP BY AirTime  ORDER BY AirTime LIMIT 23","hsqls":["SELECT AirTime, MIN(DepartureDelayGroups), SUM(OriginCityMarketID), AVG(OriginStateFips) FROM mytable WHERE CancellationCode <> 'C' AND DestState < 'IN' OR ArrTimeBlk <> '1300-1359' GROUP BY AirTime  ORDER BY AirTime LIMIT 23"]}
 {"sql":"SELECT \"Year\", OriginCityMarketID, Dest FROM mytable ORDER BY FirstDepTime, OriginWac, AirTime LIMIT 24","hsqls":["SELECT Year, OriginCityMarketID, Dest FROM mytable ORDER BY FirstDepTime, OriginWac, AirTime LIMIT 24"]}
-{"sql":"SELECT DivReachedDest, Carrier, OriginStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 45.0 AND 110.0 OR CRSArrTime IN (1235, 2149, 2201) AND DivAirports IN ('IAH', 'SMF') GROUP BY DivReachedDest, Carrier, OriginStateName","hsqls":["SELECT DivReachedDest, Carrier, OriginStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 45.0 AND 110.0 OR CRSArrTime IN (1235, 2149, 2201) AND (DivAirports__MV0 IN ('IAH', 'SMF') OR DivAirports__MV1 IN ('IAH', 'SMF') OR DivAirports__MV2 IN ('IAH', 'SMF') OR DivAirports__MV3 IN ('IAH', 'SMF') OR DivAirports__MV4 IN ('IAH', 'SMF')) GROUP BY DivReachedDest, Carrier, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT AVG(Diverted), MIN(Distance) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DivAirportLandings IN (2, 1, 0, 9) LIMIT 23","hsqls":["SELECT AVG(Diverted), MIN(Distance) FROM mytable WHERE Month BETWEEN 1 AND 1 AND DivAirportLandings IN (2, 1, 0, 9) LIMIT 23"]}
+{"sql":"SELECT DivReachedDest, Carrier, OriginStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 45.0 AND 110.0 OR CRSArrTime IN (1235, 2149, 2201) AND DivAirports IN ('IAH', 'SMF') GROUP BY DivReachedDest, Carrier, OriginStateName","hsqls":["SELECT DivReachedDest, Carrier, OriginStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 45.0 AND 110.0 OR CRSArrTime IN (1235, 2149, 2201) AND (DivAirports[1] IN ('IAH', 'SMF') OR DivAirports[2] IN ('IAH', 'SMF') OR DivAirports[3] IN ('IAH', 'SMF') OR DivAirports[4] IN ('IAH', 'SMF') OR DivAirports[5] IN ('IAH', 'SMF')) GROUP BY DivReachedDest, Carrier, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT AVG(Diverted), MIN(Distance) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DivAirportLandings IN (2, 1, 0, 9) LIMIT 23","hsqls":["SELECT AVG(Diverted), MIN(Distance) FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND DivAirportLandings IN (2, 1, 0, 9) LIMIT 23"]}
 {"sql":"SELECT LateAircraftDelay, Origin, COUNT(*) FROM mytable GROUP BY LateAircraftDelay, Origin","hsqls":["SELECT LateAircraftDelay, Origin, COUNT(*) FROM mytable GROUP BY LateAircraftDelay, Origin"]}
-{"sql":"SELECT DepTimeBlk, AirTime, SUM(\"Year\") FROM mytable WHERE FlightDate BETWEEN '2014-01-26' AND '2014-01-06' OR TotalAddGTime NOT IN (103, 39) AND DestCityName NOT IN ('St. Louis, MO', 'Newark, NJ') GROUP BY DepTimeBlk, AirTime LIMIT 13","hsqls":["SELECT DepTimeBlk, AirTime, SUM(Year) FROM mytable WHERE FlightDate BETWEEN '2014-01-26' AND '2014-01-06' OR TotalAddGTime NOT IN (103, 39) AND DestCityName NOT IN ('St. Louis, MO', 'Newark, NJ') GROUP BY DepTimeBlk, AirTime LIMIT 13"]}
+{"sql":"SELECT DepTimeBlk, AirTime, SUM(\"Year\") FROM mytable WHERE FlightDate BETWEEN '2014-01-26' AND '2014-01-06' OR TotalAddGTime NOT IN (103, 39) AND DestCityName NOT IN ('St. Louis, MO', 'Newark, NJ') GROUP BY DepTimeBlk, AirTime LIMIT 13","hsqls":["SELECT DepTimeBlk, AirTime, SUM(`Year`) FROM mytable WHERE FlightDate BETWEEN '2014-01-26' AND '2014-01-06' OR TotalAddGTime NOT IN (103, 39) AND DestCityName NOT IN ('St. Louis, MO', 'Newark, NJ') GROUP BY DepTimeBlk, AirTime LIMIT 13"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable ORDER BY Carrier, ArrDelay, UniqueCarrier LIMIT 4"}
-{"sql":"SELECT SUM(DivActualElapsedTime), MAX(\"Month\") FROM mytable WHERE Distance <> 788 AND DivWheelsOffs > 1851 LIMIT 5","hsqls":["SELECT SUM(DivActualElapsedTime), MAX(Month)  FROM mytable WHERE Distance <> 788 AND (DivWheelsOffs__MV0 > 1851 OR DivWheelsOffs__MV1 > 1851 OR DivWheelsOffs__MV2 > 1851 OR DivWheelsOffs__MV3 > 1851 OR DivWheelsOffs__MV4 > 1851) LIMIT 10000"]}
+{"sql":"SELECT SUM(DivActualElapsedTime), MAX(\"Month\") FROM mytable WHERE Distance <> 788 AND DivWheelsOffs > 1851 LIMIT 5","hsqls":["SELECT SUM(DivActualElapsedTime), MAX(`Month`)  FROM mytable WHERE Distance <> 788 AND (DivWheelsOffs[1] > 1851 OR DivWheelsOffs[2] > 1851 OR DivWheelsOffs[3] > 1851 OR DivWheelsOffs[4] > 1851 OR DivWheelsOffs[5] > 1851) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, AirTime FROM mytable LIMIT 3"}
 {"sql":"SELECT Distance, DepTime, DepTimeBlk FROM mytable WHERE WheelsOn <> 1917 OR WheelsOn > 840 OR DivDistance IN (453, 289, 11) ORDER BY TaxiIn, TailNum LIMIT 17"}
 {"sql":"SELECT DestAirportSeqID, NASDelay, AirTime FROM mytable ORDER BY ArrTimeBlk, DepTimeBlk LIMIT 9"}
@@ -2775,33 +2775,33 @@
 {"sql":"SELECT OriginCityName, DepTimeBlk FROM mytable WHERE DestAirportID BETWEEN 11921 AND 12278 AND TaxiIn >= 52 ORDER BY Distance LIMIT 5"}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE OriginAirportSeqID >= 1530402 ORDER BY CarrierDelay, TailNum LIMIT 1"}
 {"sql":"SELECT DayofMonth FROM mytable WHERE DivDistance NOT IN (80) ORDER BY Quarter, Dest LIMIT 14"}
-{"sql":"SELECT OriginState, \"Month\", MAX(OriginAirportID), SUM(DestStateFips), AVG(DivAirportLandings) FROM mytable WHERE CarrierDelay IN (66, 153, 144, -9999) GROUP BY OriginState, \"Month\" LIMIT 28","hsqls":["SELECT OriginState, Month, MAX(OriginAirportID), SUM(DestStateFips), AVG(DivAirportLandings) FROM mytable WHERE CarrierDelay IN (66, 153, 144, -9999) GROUP BY OriginState, Month LIMIT 28"]}
-{"sql":"SELECT TaxiIn, Cancelled FROM mytable WHERE DivAirportIDs BETWEEN 11721 AND 12915 OR DepartureDelayGroups IN (-2, 5, -9999) LIMIT 11","hsqls":["SELECT TaxiIn, Cancelled FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11721 AND 12915 OR DivAirportIDs__MV1 BETWEEN 11721 AND 12915 OR DivAirportIDs__MV2 BETWEEN 11721 AND 12915 OR DivAirportIDs__MV3 BETWEEN 11721 AND 12915 OR DivAirportIDs__MV4 BETWEEN 11721 AND 12915) OR DepartureDelayGroups IN (-2, 5, -9999) LIMIT 10000"]}
+{"sql":"SELECT OriginState, \"Month\", MAX(OriginAirportID), SUM(DestStateFips), AVG(DivAirportLandings) FROM mytable WHERE CarrierDelay IN (66, 153, 144, -9999) GROUP BY OriginState, \"Month\" LIMIT 28","hsqls":["SELECT OriginState, Month, MAX(OriginAirportID), SUM(DestStateFips), AVG(DivAirportLandings) FROM mytable WHERE CarrierDelay IN (66, 153, 144, -9999) GROUP BY OriginState, `Month` LIMIT 28"]}
+{"sql":"SELECT TaxiIn, Cancelled FROM mytable WHERE DivAirportIDs BETWEEN 11721 AND 12915 OR DepartureDelayGroups IN (-2, 5, -9999) LIMIT 11","hsqls":["SELECT TaxiIn, Cancelled FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11721 AND 12915 OR DivAirportIDs[2] BETWEEN 11721 AND 12915 OR DivAirportIDs[3] BETWEEN 11721 AND 12915 OR DivAirportIDs[4] BETWEEN 11721 AND 12915 OR DivAirportIDs[5] BETWEEN 11721 AND 12915) OR DepartureDelayGroups IN (-2, 5, -9999) LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DivArrDelay FROM mytable WHERE DayOfWeek BETWEEN 5 AND 1 ORDER BY DestStateName LIMIT 3"}
 {"sql":"SELECT DivDistance FROM mytable WHERE DayOfWeek IN (2) OR DayOfWeek NOT IN (3, 1, 7, 6) OR CRSElapsedTime BETWEEN 288 AND 140 LIMIT 25"}
-{"sql":"SELECT Origin, DivWheelsOffs, DestAirportID FROM mytable ORDER BY OriginAirportSeqID, FlightNum LIMIT 8","hsqls":["SELECT Origin, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DestAirportID FROM mytable ORDER BY OriginAirportSeqID, FlightNum LIMIT 10000"]}
+{"sql":"SELECT Origin, DivWheelsOffs, DestAirportID FROM mytable ORDER BY OriginAirportSeqID, FlightNum LIMIT 8","hsqls":["SELECT Origin, DivWheelsOffs, DestAirportID FROM mytable ORDER BY OriginAirportSeqID, FlightNum LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, CRSDepTime FROM mytable WHERE CancellationCode >= 'noodles' LIMIT 7"}
-{"sql":"SELECT Quarter, \"Month\", MAX(DaysSinceEpoch) FROM mytable WHERE WheelsOn BETWEEN 958 AND 1656 OR ActualElapsedTime < 223 GROUP BY Quarter, \"Month\" LIMIT 14","hsqls":["SELECT Quarter, Month, MAX(DaysSinceEpoch) FROM mytable WHERE WheelsOn BETWEEN 958 AND 1656 OR ActualElapsedTime < 223 GROUP BY Quarter, Month LIMIT 14"]}
-{"sql":"SELECT DivLongestGTimes, SecurityDelay FROM mytable LIMIT 18","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, SecurityDelay FROM mytable LIMIT 10000"]}
-{"sql":"SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE \"Year\" = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22","hsqls":["SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE Year = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22"]}
+{"sql":"SELECT Quarter, \"Month\", MAX(DaysSinceEpoch) FROM mytable WHERE WheelsOn BETWEEN 958 AND 1656 OR ActualElapsedTime < 223 GROUP BY Quarter, \"Month\" LIMIT 14","hsqls":["SELECT Quarter, Month, MAX(DaysSinceEpoch) FROM mytable WHERE WheelsOn BETWEEN 958 AND 1656 OR ActualElapsedTime < 223 GROUP BY Quarter, `Month` LIMIT 14"]}
+{"sql":"SELECT DivLongestGTimes, SecurityDelay FROM mytable LIMIT 18","hsqls":["SELECT DivLongestGTimes, SecurityDelay FROM mytable LIMIT 10000"]}
+{"sql":"SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE \"Year\" = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22","hsqls":["SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE `Year` = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22"]}
 {"sql":"SELECT DepDel15, SUM(Flights), MIN(DivReachedDest) FROM mytable WHERE ArrivalDelayGroups BETWEEN 12 AND 9 AND Flights IN (1) OR DestCityName = 'Fort Lauderdale, FL' GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 8","hsqls":["SELECT DepDel15, SUM(Flights), MIN(DivReachedDest) FROM mytable WHERE ArrivalDelayGroups BETWEEN 12 AND 9 AND Flights IN (1) OR DestCityName = 'Fort Lauderdale, FL' GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 8"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE OriginWac IN (92, 4, 22, 35, 33) ORDER BY LateAircraftDelay, FlightDate LIMIT 17"}
 {"sql":"SELECT Distance, NASDelay, COUNT(FlightNum), AVG(DepDel15), COUNT(DivDistance) FROM mytable WHERE OriginAirportSeqID IN (1232303, 1252302, 1130802) GROUP BY Distance, NASDelay  ORDER BY Distance, NASDelay LIMIT 13","hsqls":["SELECT Distance, NASDelay, COUNT(FlightNum), AVG(DepDel15), COUNT(DivDistance) FROM mytable WHERE OriginAirportSeqID IN (1232303, 1252302, 1130802) GROUP BY Distance, NASDelay  ORDER BY Distance, NASDelay LIMIT 13"]}
-{"sql":"SELECT Dest, DivTailNums FROM mytable ORDER BY CarrierDelay, DestCityName, DayofMonth LIMIT 10","hsqls":["SELECT Dest, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY CarrierDelay, DestCityName, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Dest, DivTailNums FROM mytable ORDER BY CarrierDelay, DestCityName, DayofMonth LIMIT 10","hsqls":["SELECT Dest, DivTailNums FROM mytable ORDER BY CarrierDelay, DestCityName, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, SUM(AirTime) FROM mytable GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 20","hsqls":["SELECT DistanceGroup, SUM(AirTime) FROM mytable GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 20"]}
 {"sql":"SELECT MIN(DivDistance), MIN(OriginCityMarketID) FROM mytable LIMIT 10"}
-{"sql":"SELECT AVG(Quarter) FROM mytable WHERE ArrDelayMinutes IN (180.0, 189.0, 153.0, 135.0) OR FlightNum NOT IN (16, 2203) AND DivAirportSeqIDs BETWEEN 1228002 AND 1481402 LIMIT 19","hsqls":["SELECT AVG(CAST(Quarter AS DOUBLE)) FROM mytable WHERE ArrDelayMinutes IN (180.0, 189.0, 153.0, 135.0) OR FlightNum NOT IN (16, 2203) AND (DivAirportSeqIDs__MV0 BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs__MV1 BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs__MV2 BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs__MV3 BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs__MV4 BETWEEN 1228002 AND 1481402) LIMIT 10000"]}
-{"sql":"SELECT DivAirports, DayOfWeek FROM mytable WHERE OriginAirportID >= 15919 OR UniqueCarrier BETWEEN 'AS' AND 'B6' OR OriginAirportSeqID BETWEEN 1323202 AND 1448902 ORDER BY Quarter, Dest LIMIT 7","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DayOfWeek FROM mytable WHERE OriginAirportID >= 15919 OR UniqueCarrier BETWEEN 'AS' AND 'B6' OR OriginAirportSeqID BETWEEN 1323202 AND 1448902 ORDER BY Quarter, Dest LIMIT 10000"]}
+{"sql":"SELECT AVG(Quarter) FROM mytable WHERE ArrDelayMinutes IN (180.0, 189.0, 153.0, 135.0) OR FlightNum NOT IN (16, 2203) AND DivAirportSeqIDs BETWEEN 1228002 AND 1481402 LIMIT 19","hsqls":["SELECT AVG(CAST(Quarter AS DOUBLE)) FROM mytable WHERE ArrDelayMinutes IN (180.0, 189.0, 153.0, 135.0) OR FlightNum NOT IN (16, 2203) AND (DivAirportSeqIDs[1] BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs[2] BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs[3] BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs[4] BETWEEN 1228002 AND 1481402 OR DivAirportSeqIDs[5] BETWEEN 1228002 AND 1481402) LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DayOfWeek FROM mytable WHERE OriginAirportID >= 15919 OR UniqueCarrier BETWEEN 'AS' AND 'B6' OR OriginAirportSeqID BETWEEN 1323202 AND 1448902 ORDER BY Quarter, Dest LIMIT 7","hsqls":["SELECT DivAirports, DayOfWeek FROM mytable WHERE OriginAirportID >= 15919 OR UniqueCarrier BETWEEN 'AS' AND 'B6' OR OriginAirportSeqID BETWEEN 1323202 AND 1448902 ORDER BY Quarter, Dest LIMIT 10000"]}
 {"sql":"SELECT Origin, DestCityMarketID, CRSElapsedTime FROM mytable WHERE DepTime IN (1405, 534, 1417) AND DepDelay NOT IN (53.0, 81.0, 34.0, 117.0, -18.0) ORDER BY TotalAddGTime, ArrDel15, DestStateName LIMIT 10"}
 {"sql":"SELECT DepDelayMinutes, TailNum, Origin, MAX(Flights), COUNT(AirlineID) FROM mytable GROUP BY DepDelayMinutes, TailNum, Origin  ORDER BY DepDelayMinutes, TailNum, Origin LIMIT 18","hsqls":["SELECT DepDelayMinutes, TailNum, Origin, MAX(Flights), COUNT(AirlineID) FROM mytable GROUP BY DepDelayMinutes, TailNum, Origin  ORDER BY DepDelayMinutes, TailNum, Origin LIMIT 18"]}
 {"sql":"SELECT DestCityMarketID, MAX(OriginCityMarketID), SUM(DepDelayMinutes), COUNT(CRSElapsedTime) FROM mytable GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 22","hsqls":["SELECT DestCityMarketID, MAX(OriginCityMarketID), SUM(DepDelayMinutes), COUNT(CRSElapsedTime) FROM mytable GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 22"]}
 {"sql":"SELECT CRSArrTime, OriginCityName, COUNT(*) FROM mytable GROUP BY CRSArrTime, OriginCityName  ORDER BY CRSArrTime, OriginCityName LIMIT 18","hsqls":["SELECT CRSArrTime, OriginCityName, COUNT(*) FROM mytable GROUP BY CRSArrTime, OriginCityName  ORDER BY CRSArrTime, OriginCityName LIMIT 18"]}
 {"sql":"SELECT OriginState, DestWac, SUM(TotalAddGTime), COUNT(NASDelay), SUM(WheelsOff) FROM mytable GROUP BY OriginState, DestWac  ORDER BY OriginState, DestWac LIMIT 12","hsqls":["SELECT OriginState, DestWac, SUM(TotalAddGTime), COUNT(NASDelay), SUM(WheelsOff) FROM mytable GROUP BY OriginState, DestWac  ORDER BY OriginState, DestWac LIMIT 12"]}
-{"sql":"SELECT LateAircraftDelay, FlightDate, DivArrDelay FROM mytable WHERE WheelsOn NOT IN (1526) OR DivWheelsOffs < 1144 ORDER BY ArrTimeBlk LIMIT 11","hsqls":["SELECT LateAircraftDelay, FlightDate, DivArrDelay FROM mytable WHERE WheelsOn NOT IN (1526) OR (DivWheelsOffs__MV0 < 1144 OR DivWheelsOffs__MV1 < 1144 OR DivWheelsOffs__MV2 < 1144 OR DivWheelsOffs__MV3 < 1144 OR DivWheelsOffs__MV4 < 1144) ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, FlightDate, DivArrDelay FROM mytable WHERE WheelsOn NOT IN (1526) OR DivWheelsOffs < 1144 ORDER BY ArrTimeBlk LIMIT 11","hsqls":["SELECT LateAircraftDelay, FlightDate, DivArrDelay FROM mytable WHERE WheelsOn NOT IN (1526) OR (DivWheelsOffs[1] < 1144 OR DivWheelsOffs[2] < 1144 OR DivWheelsOffs[3] < 1144 OR DivWheelsOffs[4] < 1144 OR DivWheelsOffs[5] < 1144) ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Carrier, OriginWac FROM mytable WHERE ActualElapsedTime BETWEEN 396 AND 86 AND FirstDepTime = 857 ORDER BY AirlineID, DivArrDelay LIMIT 24"}
 {"sql":"SELECT Diverted, SUM(AirTime), SUM(FlightNum) FROM mytable WHERE LateAircraftDelay IN (110, 158, 101) GROUP BY Diverted  ORDER BY Diverted LIMIT 17","hsqls":["SELECT Diverted, SUM(AirTime), SUM(FlightNum) FROM mytable WHERE LateAircraftDelay IN (110, 158, 101) GROUP BY Diverted  ORDER BY Diverted LIMIT 17"]}
 {"sql":"SELECT DepDel15 FROM mytable WHERE ArrTimeBlk BETWEEN '0700-0759' AND '1900-1959' LIMIT 23"}
-{"sql":"SELECT SUM(NASDelay), AVG(DivDistance), SUM(ActualElapsedTime) FROM mytable WHERE OriginStateName NOT IN ('Kentucky', 'South Dakota') OR DivWheelsOns <= 1038 AND DivDistance = 261","hsqls":["SELECT SUM(NASDelay), AVG(DivDistance), SUM(ActualElapsedTime)  FROM mytable WHERE OriginStateName NOT IN ('Kentucky', 'South Dakota') OR (DivWheelsOns__MV0 <= 1038 OR DivWheelsOns__MV1 <= 1038 OR DivWheelsOns__MV2 <= 1038 OR DivWheelsOns__MV3 <= 1038 OR DivWheelsOns__MV4 <= 1038) AND DivDistance = 261 LIMIT 10000"]}
+{"sql":"SELECT SUM(NASDelay), AVG(DivDistance), SUM(ActualElapsedTime) FROM mytable WHERE OriginStateName NOT IN ('Kentucky', 'South Dakota') OR DivWheelsOns <= 1038 AND DivDistance = 261","hsqls":["SELECT SUM(NASDelay), AVG(DivDistance), SUM(ActualElapsedTime)  FROM mytable WHERE OriginStateName NOT IN ('Kentucky', 'South Dakota') OR (DivWheelsOns[1] <= 1038 OR DivWheelsOns[2] <= 1038 OR DivWheelsOns[3] <= 1038 OR DivWheelsOns[4] <= 1038 OR DivWheelsOns[5] <= 1038) AND DivDistance = 261 LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, DaysSinceEpoch FROM mytable WHERE FlightDate < '2014-01-15' ORDER BY DestStateFips, WheelsOn LIMIT 11"}
 {"sql":"SELECT Quarter, MAX(AirlineID), SUM(WheelsOff) FROM mytable WHERE NASDelay >= 57 AND AirTime > 115 GROUP BY Quarter  ORDER BY Quarter LIMIT 16","hsqls":["SELECT Quarter, MAX(AirlineID), SUM(WheelsOff) FROM mytable WHERE NASDelay >= 57 AND AirTime > 115 GROUP BY Quarter  ORDER BY Quarter LIMIT 16"]}
 {"sql":"SELECT FirstDepTime, FlightDate, AVG(DestAirportID), AVG(LateAircraftDelay) FROM mytable WHERE Diverted < 0 OR DayofMonth = 12 GROUP BY FirstDepTime, FlightDate  ORDER BY FirstDepTime, FlightDate LIMIT 29","hsqls":["SELECT FirstDepTime, FlightDate, AVG(DestAirportID), AVG(LateAircraftDelay) FROM mytable WHERE Diverted < 0 OR DayofMonth = 12 GROUP BY FirstDepTime, FlightDate  ORDER BY FirstDepTime, FlightDate LIMIT 29"]}
@@ -2810,14 +2810,14 @@
 {"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE CarrierDelay < 56 GROUP BY Quarter  ORDER BY Quarter LIMIT 21","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE CarrierDelay < 56 GROUP BY Quarter  ORDER BY Quarter LIMIT 21"]}
 {"sql":"SELECT ArrDelayMinutes, ArrTime FROM mytable ORDER BY TaxiOut, ArrDel15, DayofMonth LIMIT 17"}
 {"sql":"SELECT DepartureDelayGroups, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 24","hsqls":["SELECT DepartureDelayGroups, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 24"]}
-{"sql":"SELECT DivAirportIDs, ArrDelay, CRSElapsedTime FROM mytable WHERE DivTailNums IN ('N638MQ') ORDER BY CancellationCode LIMIT 22","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay, CRSElapsedTime FROM mytable WHERE (DivTailNums__MV0 IN ('N638MQ') OR DivTailNums__MV1 IN ('N638MQ') OR DivTailNums__MV2 IN ('N638MQ') OR DivTailNums__MV3 IN ('N638MQ') OR DivTailNums__MV4 IN ('N638MQ')) ORDER BY CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, ArrDelay, CRSElapsedTime FROM mytable WHERE DivTailNums IN ('N638MQ') ORDER BY CancellationCode LIMIT 22","hsqls":["SELECT DivAirportIDs, ArrDelay, CRSElapsedTime FROM mytable WHERE (DivTailNums[1] IN ('N638MQ') OR DivTailNums[2] IN ('N638MQ') OR DivTailNums[3] IN ('N638MQ') OR DivTailNums[4] IN ('N638MQ') OR DivTailNums[5] IN ('N638MQ')) ORDER BY CancellationCode LIMIT 10000"]}
 {"sql":"SELECT COUNT(TaxiIn), COUNT(ArrTimeBlk), AVG(DestWac) FROM mytable WHERE DayOfWeek IN (3, 4) LIMIT 26"}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE DestStateFips IN (2, 6, 55, 75) ORDER BY DistanceGroup, SecurityDelay, TailNum LIMIT 21"}
 {"sql":"SELECT OriginState, DivDistance, DestStateName, MIN(DivArrDelay), MAX(FlightNum) FROM mytable WHERE CarrierDelay = 86 AND DivAirportLandings BETWEEN 0 AND 9 AND DestAirportID BETWEEN 13024 AND 13424 GROUP BY OriginState, DivDistance, DestStateName  ORDER BY OriginState, DivDistance, DestStateName LIMIT 9","hsqls":["SELECT OriginState, DivDistance, DestStateName, MIN(DivArrDelay), MAX(FlightNum) FROM mytable WHERE CarrierDelay = 86 AND DivAirportLandings BETWEEN 0 AND 9 AND DestAirportID BETWEEN 13024 AND 13424 GROUP BY OriginState, DivDistance, DestStateName  ORDER BY OriginState, DivDistance, DestStateName LIMIT 9"]}
 {"sql":"SELECT OriginState, FlightNum, OriginStateName FROM mytable ORDER BY DistanceGroup, DepDelay LIMIT 8"}
 {"sql":"SELECT FlightDate, OriginWac, DestAirportID, MAX(DayofMonth), COUNT(Distance) FROM mytable WHERE Dest BETWEEN 'SBA' AND 'HSV' OR Distance <> 1739 GROUP BY FlightDate, OriginWac, DestAirportID  ORDER BY FlightDate, OriginWac, DestAirportID LIMIT 14","hsqls":["SELECT FlightDate, OriginWac, DestAirportID, MAX(DayofMonth), COUNT(Distance) FROM mytable WHERE Dest BETWEEN 'SBA' AND 'HSV' OR Distance <> 1739 GROUP BY FlightDate, OriginWac, DestAirportID  ORDER BY FlightDate, OriginWac, DestAirportID LIMIT 14"]}
-{"sql":"SELECT OriginAirportSeqID, OriginCityMarketID, UniqueCarrier FROM mytable WHERE FirstDepTime BETWEEN 710 AND 750 OR DivAirports = 'IAD' AND DivAirports BETWEEN 'MAF' AND 'YYC' ORDER BY AirTime LIMIT 29","hsqls":["SELECT OriginAirportSeqID, OriginCityMarketID, UniqueCarrier FROM mytable WHERE FirstDepTime BETWEEN 710 AND 750 OR (DivAirports__MV0 = 'IAD' OR DivAirports__MV1 = 'IAD' OR DivAirports__MV2 = 'IAD' OR DivAirports__MV3 = 'IAD' OR DivAirports__MV4 = 'IAD') AND (DivAirports__MV0 BETWEEN 'MAF' AND 'YYC' OR DivAirports__MV1 BETWEEN 'MAF' AND 'YYC' OR DivAirports__MV2 BETWEEN 'MAF' AND 'YYC' OR DivAirports__MV3 BETWEEN 'MAF' AND 'YYC' OR DivAirports__MV4 BETWEEN 'MAF' AND 'YYC') ORDER BY AirTime LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, DestCityName, AVG(\"Month\"), AVG(CRSElapsedTime) FROM mytable GROUP BY OriginCityMarketID, DestCityName LIMIT 12","hsqls":["SELECT OriginCityMarketID, DestCityName, AVG(Month), AVG(CRSElapsedTime) FROM mytable GROUP BY OriginCityMarketID, DestCityName LIMIT 12"]}
+{"sql":"SELECT OriginAirportSeqID, OriginCityMarketID, UniqueCarrier FROM mytable WHERE FirstDepTime BETWEEN 710 AND 750 OR DivAirports = 'IAD' AND DivAirports BETWEEN 'MAF' AND 'YYC' ORDER BY AirTime LIMIT 29","hsqls":["SELECT OriginAirportSeqID, OriginCityMarketID, UniqueCarrier FROM mytable WHERE FirstDepTime BETWEEN 710 AND 750 OR (DivAirports[1] = 'IAD' OR DivAirports[2] = 'IAD' OR DivAirports[3] = 'IAD' OR DivAirports[4] = 'IAD' OR DivAirports[5] = 'IAD') AND (DivAirports[1] BETWEEN 'MAF' AND 'YYC' OR DivAirports[2] BETWEEN 'MAF' AND 'YYC' OR DivAirports[3] BETWEEN 'MAF' AND 'YYC' OR DivAirports[4] BETWEEN 'MAF' AND 'YYC' OR DivAirports[5] BETWEEN 'MAF' AND 'YYC') ORDER BY AirTime LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestCityName, AVG(\"Month\"), AVG(CRSElapsedTime) FROM mytable GROUP BY OriginCityMarketID, DestCityName LIMIT 12","hsqls":["SELECT OriginCityMarketID, DestCityName, AVG(`Month`), AVG(CRSElapsedTime) FROM mytable GROUP BY OriginCityMarketID, DestCityName LIMIT 12"]}
 {"sql":"SELECT AVG(CRSDepTime) FROM mytable WHERE DepTimeBlk <= '0700-0759' OR Cancelled BETWEEN 0 AND 0 LIMIT 5"}
 {"sql":"SELECT Quarter, DepTime, DestStateName FROM mytable WHERE Diverted > 1 ORDER BY DepTime LIMIT 21"}
 {"sql":"SELECT SUM(ArrDelayMinutes), SUM(WheelsOn), COUNT(ArrTimeBlk) FROM mytable WHERE OriginCityMarketID IN (32467, 31721) OR TaxiIn NOT IN (116, 96, 44) AND OriginAirportSeqID BETWEEN 1295302 AND 1288403 LIMIT 19"}
@@ -2825,82 +2825,82 @@
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY OriginStateName LIMIT 21"}
 {"sql":"SELECT OriginStateName FROM mytable WHERE DepDelay NOT IN (2.0) AND TaxiIn NOT IN (6, 5, 64) AND DestStateName IN ('Texas', 'Tennessee') ORDER BY UniqueCarrier LIMIT 21"}
 {"sql":"SELECT Carrier, MAX(DepTime), COUNT(DivActualElapsedTime) FROM mytable WHERE UniqueCarrier BETWEEN 'F9' AND 'AS' GROUP BY Carrier  ORDER BY Carrier LIMIT 27","hsqls":["SELECT Carrier, MAX(DepTime), COUNT(DivActualElapsedTime) FROM mytable WHERE UniqueCarrier BETWEEN 'F9' AND 'AS' GROUP BY Carrier  ORDER BY Carrier LIMIT 27"]}
-{"sql":"SELECT OriginCityMarketID, DestCityName, AVG(TotalAddGTime), MIN(\"Month\") FROM mytable WHERE CarrierDelay NOT IN (266) OR WeatherDelay >= 123 AND ArrivalDelayGroups NOT IN (0) GROUP BY OriginCityMarketID, DestCityName LIMIT 7","hsqls":["SELECT OriginCityMarketID, DestCityName, AVG(TotalAddGTime), MIN(Month) FROM mytable WHERE CarrierDelay NOT IN (266) OR WeatherDelay >= 123 AND ArrivalDelayGroups NOT IN (0) GROUP BY OriginCityMarketID, DestCityName LIMIT 7"]}
+{"sql":"SELECT OriginCityMarketID, DestCityName, AVG(TotalAddGTime), MIN(\"Month\") FROM mytable WHERE CarrierDelay NOT IN (266) OR WeatherDelay >= 123 AND ArrivalDelayGroups NOT IN (0) GROUP BY OriginCityMarketID, DestCityName LIMIT 7","hsqls":["SELECT OriginCityMarketID, DestCityName, AVG(TotalAddGTime), MIN(`Month`) FROM mytable WHERE CarrierDelay NOT IN (266) OR WeatherDelay >= 123 AND ArrivalDelayGroups NOT IN (0) GROUP BY OriginCityMarketID, DestCityName LIMIT 7"]}
 {"sql":"SELECT Carrier, CarrierDelay, WheelsOn FROM mytable ORDER BY CarrierDelay, ArrivalDelayGroups LIMIT 10"}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY WheelsOff, ArrTime, DestCityName LIMIT 7","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY WheelsOff, ArrTime, DestCityName LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, Origin FROM mytable WHERE ArrTime >= 1512 AND DepDelayMinutes >= 137.0 OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 3","hsqls":["SELECT DestStateFips, Origin FROM mytable WHERE ArrTime >= 1512 AND DepDelayMinutes >= 137.0 OR Year BETWEEN 2014 AND 2014 LIMIT 3"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY WheelsOff, ArrTime, DestCityName LIMIT 7","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY WheelsOff, ArrTime, DestCityName LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, Origin FROM mytable WHERE ArrTime >= 1512 AND DepDelayMinutes >= 137.0 OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 3","hsqls":["SELECT DestStateFips, Origin FROM mytable WHERE ArrTime >= 1512 AND DepDelayMinutes >= 137.0 OR `Year` BETWEEN 2014 AND 2014 LIMIT 3"]}
 {"sql":"SELECT ArrTime, DivAirportLandings FROM mytable WHERE DepTime <> 2220 OR DepDel15 >= 1 ORDER BY LateAircraftDelay, ArrDelay LIMIT 27"}
 {"sql":"SELECT ActualElapsedTime, MAX(DepDel15) FROM mytable WHERE TaxiIn NOT IN (40, 52, 102) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 9","hsqls":["SELECT ActualElapsedTime, MAX(DepDel15) FROM mytable WHERE TaxiIn NOT IN (40, 52, 102) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 9"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE DepDel15 BETWEEN -9999 AND 1 AND CRSDepTime BETWEEN 1838 AND 1519 AND CRSElapsedTime BETWEEN 295 AND 353 ORDER BY DepDelayMinutes, TotalAddGTime LIMIT 3"}
-{"sql":"SELECT OriginAirportSeqID, DivAirports FROM mytable ORDER BY OriginStateFips, CRSArrTime LIMIT 9","hsqls":["SELECT OriginAirportSeqID, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY OriginStateFips, CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivAirports FROM mytable ORDER BY OriginStateFips, CRSArrTime LIMIT 9","hsqls":["SELECT OriginAirportSeqID, DivAirports FROM mytable ORDER BY OriginStateFips, CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT MAX(OriginWac) FROM mytable LIMIT 26"}
 {"sql":"SELECT TotalAddGTime, UniqueCarrier FROM mytable ORDER BY DestWac, DestState, FlightNum LIMIT 7"}
 {"sql":"SELECT AVG(LongestAddGTime), MIN(WheelsOn), MAX(Cancelled) FROM mytable LIMIT 11"}
-{"sql":"SELECT DestCityName, OriginWac FROM mytable WHERE Diverted BETWEEN 0 AND 0 OR DivWheelsOns = 1322 OR Dest BETWEEN 'CWA' AND 'GUC' LIMIT 13","hsqls":["SELECT DestCityName, OriginWac FROM mytable WHERE Diverted BETWEEN 0 AND 0 OR (DivWheelsOns__MV0 = 1322 OR DivWheelsOns__MV1 = 1322 OR DivWheelsOns__MV2 = 1322 OR DivWheelsOns__MV3 = 1322 OR DivWheelsOns__MV4 = 1322) OR Dest BETWEEN 'CWA' AND 'GUC' LIMIT 10000"]}
+{"sql":"SELECT DestCityName, OriginWac FROM mytable WHERE Diverted BETWEEN 0 AND 0 OR DivWheelsOns = 1322 OR Dest BETWEEN 'CWA' AND 'GUC' LIMIT 13","hsqls":["SELECT DestCityName, OriginWac FROM mytable WHERE Diverted BETWEEN 0 AND 0 OR (DivWheelsOns[1] = 1322 OR DivWheelsOns[2] = 1322 OR DivWheelsOns[3] = 1322 OR DivWheelsOns[4] = 1322 OR DivWheelsOns[5] = 1322) OR Dest BETWEEN 'CWA' AND 'GUC' LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DestAirportSeqID, AirTime FROM mytable ORDER BY CRSElapsedTime LIMIT 11"}
-{"sql":"SELECT DivLongestGTimes, DestCityMarketID, WheelsOn FROM mytable ORDER BY TaxiIn, WheelsOn LIMIT 20","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestCityMarketID, WheelsOn FROM mytable ORDER BY TaxiIn, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestCityMarketID, WheelsOn FROM mytable ORDER BY TaxiIn, WheelsOn LIMIT 20","hsqls":["SELECT DivLongestGTimes, DestCityMarketID, WheelsOn FROM mytable ORDER BY TaxiIn, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable LIMIT 8"}
 {"sql":"SELECT Quarter, MAX(DestAirportSeqID) FROM mytable GROUP BY Quarter  ORDER BY Quarter LIMIT 27","hsqls":["SELECT Quarter, MAX(DestAirportSeqID) FROM mytable GROUP BY Quarter  ORDER BY Quarter LIMIT 27"]}
-{"sql":"SELECT ArrDel15, OriginAirportID FROM mytable WHERE DivAirports IN ('SWF') AND DivTotalGTimes IN (2, 128, 6) ORDER BY DepDelayMinutes, CancellationCode, OriginStateName LIMIT 27","hsqls":["SELECT ArrDel15, OriginAirportID FROM mytable WHERE (DivAirports__MV0 IN ('SWF') OR DivAirports__MV1 IN ('SWF') OR DivAirports__MV2 IN ('SWF') OR DivAirports__MV3 IN ('SWF') OR DivAirports__MV4 IN ('SWF')) AND (DivTotalGTimes__MV0 IN (2, 128, 6) OR DivTotalGTimes__MV1 IN (2, 128, 6) OR DivTotalGTimes__MV2 IN (2, 128, 6) OR DivTotalGTimes__MV3 IN (2, 128, 6) OR DivTotalGTimes__MV4 IN (2, 128, 6)) ORDER BY DepDelayMinutes, CancellationCode, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, OriginAirportID FROM mytable WHERE DivAirports IN ('SWF') AND DivTotalGTimes IN (2, 128, 6) ORDER BY DepDelayMinutes, CancellationCode, OriginStateName LIMIT 27","hsqls":["SELECT ArrDel15, OriginAirportID FROM mytable WHERE (DivAirports[1] IN ('SWF') OR DivAirports[2] IN ('SWF') OR DivAirports[3] IN ('SWF') OR DivAirports[4] IN ('SWF') OR DivAirports[5] IN ('SWF')) AND (DivTotalGTimes[1] IN (2, 128, 6) OR DivTotalGTimes[2] IN (2, 128, 6) OR DivTotalGTimes[3] IN (2, 128, 6) OR DivTotalGTimes[4] IN (2, 128, 6) OR DivTotalGTimes[5] IN (2, 128, 6)) ORDER BY DepDelayMinutes, CancellationCode, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DepDel15, UniqueCarrier, CRSElapsedTime FROM mytable WHERE DayofMonth NOT IN (19, 22, 25, 29, 12) AND DivReachedDest BETWEEN -9999 AND 0 OR OriginAirportSeqID IN (1469605, 1240203) LIMIT 29"}
 {"sql":"SELECT SUM(OriginStateFips) FROM mytable WHERE ArrTime > 858 LIMIT 27"}
-{"sql":"SELECT FlightNum, CRSArrTime, DestStateFips FROM mytable WHERE DivAirportIDs IN (13871, 11996) ORDER BY DestState, DepDelayMinutes LIMIT 5","hsqls":["SELECT FlightNum, CRSArrTime, DestStateFips FROM mytable WHERE (DivAirportIDs__MV0 IN (13871, 11996) OR DivAirportIDs__MV1 IN (13871, 11996) OR DivAirportIDs__MV2 IN (13871, 11996) OR DivAirportIDs__MV3 IN (13871, 11996) OR DivAirportIDs__MV4 IN (13871, 11996)) ORDER BY DestState, DepDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, \"Year\", DestStateName FROM mytable WHERE OriginCityMarketID < 33388 AND LongestAddGTime BETWEEN 2 AND 19 ORDER BY DepDelay, DepTime LIMIT 28","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Year, DestStateName FROM mytable WHERE OriginCityMarketID < 33388 AND LongestAddGTime BETWEEN 2 AND 19 ORDER BY DepDelay, DepTime LIMIT 10000"]}
+{"sql":"SELECT FlightNum, CRSArrTime, DestStateFips FROM mytable WHERE DivAirportIDs IN (13871, 11996) ORDER BY DestState, DepDelayMinutes LIMIT 5","hsqls":["SELECT FlightNum, CRSArrTime, DestStateFips FROM mytable WHERE (DivAirportIDs[1] IN (13871, 11996) OR DivAirportIDs[2] IN (13871, 11996) OR DivAirportIDs[3] IN (13871, 11996) OR DivAirportIDs[4] IN (13871, 11996) OR DivAirportIDs[5] IN (13871, 11996)) ORDER BY DestState, DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, \"Year\", DestStateName FROM mytable WHERE OriginCityMarketID < 33388 AND LongestAddGTime BETWEEN 2 AND 19 ORDER BY DepDelay, DepTime LIMIT 28","hsqls":["SELECT DivWheelsOns, Year, DestStateName FROM mytable WHERE OriginCityMarketID < 33388 AND LongestAddGTime BETWEEN 2 AND 19 ORDER BY DepDelay, DepTime LIMIT 10000"]}
 {"sql":"SELECT Flights, TaxiIn FROM mytable WHERE ActualElapsedTime BETWEEN 149 AND 423 LIMIT 13"}
 {"sql":"SELECT COUNT(Diverted), MIN(Cancelled) FROM mytable WHERE CRSArrTime NOT IN (725, 715, 1649, 1736, 1240) LIMIT 10"}
 {"sql":"SELECT Carrier FROM mytable ORDER BY LateAircraftDelay, LongestAddGTime LIMIT 27"}
 {"sql":"SELECT Cancelled, DestCityName, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DayOfWeek IN (1, 6, 4) OR DestState >= 'WV' OR DestStateFips <= 54 GROUP BY Cancelled, DestCityName, DaysSinceEpoch  ORDER BY Cancelled, DestCityName, DaysSinceEpoch LIMIT 14","hsqls":["SELECT Cancelled, DestCityName, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DayOfWeek IN (1, 6, 4) OR DestState >= 'WV' OR DestStateFips <= 54 GROUP BY Cancelled, DestCityName, DaysSinceEpoch  ORDER BY Cancelled, DestCityName, DaysSinceEpoch LIMIT 14"]}
-{"sql":"SELECT OriginCityName, \"Month\" FROM mytable ORDER BY DepDelay LIMIT 1","hsqls":["SELECT OriginCityName, Month FROM mytable ORDER BY DepDelay LIMIT 1"]}
+{"sql":"SELECT OriginCityName, \"Month\" FROM mytable ORDER BY DepDelay LIMIT 1","hsqls":["SELECT OriginCityName, `Month` FROM mytable ORDER BY DepDelay LIMIT 1"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable ORDER BY WeatherDelay, OriginCityMarketID, DepTimeBlk LIMIT 22"}
 {"sql":"SELECT ActualElapsedTime, UniqueCarrier, DivActualElapsedTime, COUNT(ArrTime) FROM mytable WHERE DestAirportSeqID IN (1295402, 1125203, 1142303, 1073103) OR DepTime BETWEEN 2253 AND 1531 AND AirTime < 323 GROUP BY ActualElapsedTime, UniqueCarrier, DivActualElapsedTime  ORDER BY ActualElapsedTime, UniqueCarrier, DivActualElapsedTime LIMIT 10","hsqls":["SELECT ActualElapsedTime, UniqueCarrier, DivActualElapsedTime, COUNT(ArrTime) FROM mytable WHERE DestAirportSeqID IN (1295402, 1125203, 1142303, 1073103) OR DepTime BETWEEN 2253 AND 1531 AND AirTime < 323 GROUP BY ActualElapsedTime, UniqueCarrier, DivActualElapsedTime  ORDER BY ActualElapsedTime, UniqueCarrier, DivActualElapsedTime LIMIT 10"]}
-{"sql":"SELECT MIN(Diverted), MAX(\"Month\") FROM mytable LIMIT 20","hsqls":["SELECT MIN(Diverted), MAX(Month) FROM mytable LIMIT 20"]}
+{"sql":"SELECT MIN(Diverted), MAX(\"Month\") FROM mytable LIMIT 20","hsqls":["SELECT MIN(Diverted), MAX(`Month`) FROM mytable LIMIT 20"]}
 {"sql":"SELECT SecurityDelay, DepTime, OriginWac FROM mytable ORDER BY OriginWac LIMIT 9"}
-{"sql":"SELECT WeatherDelay, DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE CarrierDelay = 105 OR FlightNum NOT IN (3353) AND DivAirportIDs BETWEEN 14314 AND 14843 GROUP BY WeatherDelay, DepDelayMinutes LIMIT 8","hsqls":["SELECT WeatherDelay, DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE CarrierDelay = 105 OR FlightNum NOT IN (3353) AND (DivAirportIDs__MV0 BETWEEN 14314 AND 14843 OR DivAirportIDs__MV1 BETWEEN 14314 AND 14843 OR DivAirportIDs__MV2 BETWEEN 14314 AND 14843 OR DivAirportIDs__MV3 BETWEEN 14314 AND 14843 OR DivAirportIDs__MV4 BETWEEN 14314 AND 14843) GROUP BY WeatherDelay, DepDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs, DivArrDelay FROM mytable WHERE WheelsOn = 636 OR DestAirportSeqID NOT IN (1129202, 1014602) OR FlightDate BETWEEN '2014-01-14' AND '2014-01-21' ORDER BY DestStateFips, DepTimeBlk, CRSElapsedTime LIMIT 4","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivArrDelay FROM mytable WHERE WheelsOn = 636 OR DestAirportSeqID NOT IN (1129202, 1014602) OR FlightDate BETWEEN '2014-01-14' AND '2014-01-21' ORDER BY DestStateFips, DepTimeBlk, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE CarrierDelay = 105 OR FlightNum NOT IN (3353) AND DivAirportIDs BETWEEN 14314 AND 14843 GROUP BY WeatherDelay, DepDelayMinutes LIMIT 8","hsqls":["SELECT WeatherDelay, DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE CarrierDelay = 105 OR FlightNum NOT IN (3353) AND (DivAirportIDs[1] BETWEEN 14314 AND 14843 OR DivAirportIDs[2] BETWEEN 14314 AND 14843 OR DivAirportIDs[3] BETWEEN 14314 AND 14843 OR DivAirportIDs[4] BETWEEN 14314 AND 14843 OR DivAirportIDs[5] BETWEEN 14314 AND 14843) GROUP BY WeatherDelay, DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DivArrDelay FROM mytable WHERE WheelsOn = 636 OR DestAirportSeqID NOT IN (1129202, 1014602) OR FlightDate BETWEEN '2014-01-14' AND '2014-01-21' ORDER BY DestStateFips, DepTimeBlk, CRSElapsedTime LIMIT 4","hsqls":["SELECT DivWheelsOffs, DivArrDelay FROM mytable WHERE WheelsOn = 636 OR DestAirportSeqID NOT IN (1129202, 1014602) OR FlightDate BETWEEN '2014-01-14' AND '2014-01-21' ORDER BY DestStateFips, DepTimeBlk, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT SUM(TaxiOut) FROM mytable LIMIT 19"}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE CRSElapsedTime <> 51 ORDER BY CancellationCode, UniqueCarrier LIMIT 10"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 21"}
-{"sql":"SELECT DestWac, OriginCityName, ArrDel15 FROM mytable ORDER BY DestWac, DepDel15, \"Month\" LIMIT 14","hsqls":["SELECT DestWac, OriginCityName, ArrDel15 FROM mytable ORDER BY DestWac, DepDel15, Month LIMIT 14"]}
-{"sql":"SELECT Quarter, CarrierDelay, DivAirportSeqIDs FROM mytable WHERE FirstDepTime = 710 AND Cancelled BETWEEN 1 AND 0 ORDER BY DestState, DivArrDelay LIMIT 23","hsqls":["SELECT Quarter, CarrierDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE FirstDepTime = 710 AND Cancelled BETWEEN 1 AND 0 ORDER BY DestState, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestWac, OriginCityName, ArrDel15 FROM mytable ORDER BY DestWac, DepDel15, \"Month\" LIMIT 14","hsqls":["SELECT DestWac, OriginCityName, ArrDel15 FROM mytable ORDER BY DestWac, DepDel15, `Month` LIMIT 14"]}
+{"sql":"SELECT Quarter, CarrierDelay, DivAirportSeqIDs FROM mytable WHERE FirstDepTime = 710 AND Cancelled BETWEEN 1 AND 0 ORDER BY DestState, DivArrDelay LIMIT 23","hsqls":["SELECT Quarter, CarrierDelay, DivAirportSeqIDs FROM mytable WHERE FirstDepTime = 710 AND Cancelled BETWEEN 1 AND 0 ORDER BY DestState, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay, MIN(AirTime) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 24","hsqls":["SELECT DivArrDelay, MIN(AirTime) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 24"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Dest BETWEEN 'CAK' AND 'JAN' AND Origin BETWEEN 'MBS' AND 'GGG' OR FlightNum <= 1073 LIMIT 29"}
-{"sql":"SELECT Dest, DepTimeBlk FROM mytable WHERE DivTailNums = 'N606SK' ORDER BY DistanceGroup LIMIT 14","hsqls":["SELECT Dest, DepTimeBlk FROM mytable WHERE (DivTailNums__MV0 = 'N606SK' OR DivTailNums__MV1 = 'N606SK' OR DivTailNums__MV2 = 'N606SK' OR DivTailNums__MV3 = 'N606SK' OR DivTailNums__MV4 = 'N606SK') ORDER BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT Dest, DepTimeBlk FROM mytable WHERE DivTailNums = 'N606SK' ORDER BY DistanceGroup LIMIT 14","hsqls":["SELECT Dest, DepTimeBlk FROM mytable WHERE (DivTailNums[1] = 'N606SK' OR DivTailNums[2] = 'N606SK' OR DivTailNums[3] = 'N606SK' OR DivTailNums[4] = 'N606SK' OR DivTailNums[5] = 'N606SK') ORDER BY DistanceGroup LIMIT 10000"]}
 {"sql":"SELECT DivDistance, SUM(CRSDepTime), COUNT(AirlineID) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Louisiana', 'Tennessee', 'Georgia') OR Diverted BETWEEN 0 AND 0 OR DepTimeBlk NOT IN ('2000-2059', '1700-1759', '0800-0859', '1400-1459') GROUP BY DivDistance  ORDER BY DivDistance LIMIT 20","hsqls":["SELECT DivDistance, SUM(CRSDepTime), COUNT(AirlineID) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Louisiana', 'Tennessee', 'Georgia') OR Diverted BETWEEN 0 AND 0 OR DepTimeBlk NOT IN ('2000-2059', '1700-1759', '0800-0859', '1400-1459') GROUP BY DivDistance  ORDER BY DivDistance LIMIT 20"]}
 {"sql":"SELECT AVG(ArrTime), SUM(Cancelled) FROM mytable WHERE DistanceGroup <> 11"}
 {"sql":"SELECT Distance, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 OR DistanceGroup NOT IN (6, 9, 8) GROUP BY Distance  ORDER BY Distance LIMIT 29","hsqls":["SELECT Distance, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 OR DistanceGroup NOT IN (6, 9, 8) GROUP BY Distance  ORDER BY Distance LIMIT 29"]}
 {"sql":"SELECT Diverted, CancellationCode FROM mytable ORDER BY ArrDelayMinutes"}
 {"sql":"SELECT OriginState, TotalAddGTime FROM mytable WHERE FirstDepTime NOT IN (2041, 1745, 1043, -9999) ORDER BY TaxiIn, DestAirportID, DivArrDelay LIMIT 24"}
-{"sql":"SELECT OriginState, CarrierDelay, DestCityMarketID, COUNT(\"Month\"), MIN(CRSElapsedTime), MAX(OriginStateFips) FROM mytable WHERE FlightNum IN (1233, 5064, 6078, 307, 1795) OR Diverted IN (1, 0) AND Cancelled >= 0 GROUP BY OriginState, CarrierDelay, DestCityMarketID LIMIT 28","hsqls":["SELECT OriginState, CarrierDelay, DestCityMarketID, COUNT(Month), MIN(CRSElapsedTime), MAX(OriginStateFips) FROM mytable WHERE FlightNum IN (1233, 5064, 6078, 307, 1795) OR Diverted IN (1, 0) AND Cancelled >= 0 GROUP BY OriginState, CarrierDelay, DestCityMarketID LIMIT 28"]}
-{"sql":"SELECT AirTime, AVG(\"Month\"), MAX(CarrierDelay), MAX(NASDelay) FROM mytable WHERE Origin = 'ISP' OR Diverted > 1 OR DayofMonth IN (31, 25) GROUP BY AirTime LIMIT 27","hsqls":["SELECT AirTime, AVG(Month), MAX(CarrierDelay), MAX(NASDelay) FROM mytable WHERE Origin = 'ISP' OR Diverted > 1 OR DayofMonth IN (31, 25) GROUP BY AirTime LIMIT 27"]}
+{"sql":"SELECT OriginState, CarrierDelay, DestCityMarketID, COUNT(\"Month\"), MIN(CRSElapsedTime), MAX(OriginStateFips) FROM mytable WHERE FlightNum IN (1233, 5064, 6078, 307, 1795) OR Diverted IN (1, 0) AND Cancelled >= 0 GROUP BY OriginState, CarrierDelay, DestCityMarketID LIMIT 28","hsqls":["SELECT OriginState, CarrierDelay, DestCityMarketID, COUNT(`Month`), MIN(CRSElapsedTime), MAX(OriginStateFips) FROM mytable WHERE FlightNum IN (1233, 5064, 6078, 307, 1795) OR Diverted IN (1, 0) AND Cancelled >= 0 GROUP BY OriginState, CarrierDelay, DestCityMarketID LIMIT 28"]}
+{"sql":"SELECT AirTime, AVG(\"Month\"), MAX(CarrierDelay), MAX(NASDelay) FROM mytable WHERE Origin = 'ISP' OR Diverted > 1 OR DayofMonth IN (31, 25) GROUP BY AirTime LIMIT 27","hsqls":["SELECT AirTime, AVG(`Month`), MAX(CarrierDelay), MAX(NASDelay) FROM mytable WHERE Origin = 'ISP' OR Diverted > 1 OR DayofMonth IN (31, 25) GROUP BY AirTime LIMIT 27"]}
 {"sql":"SELECT DivReachedDest, OriginCityMarketID FROM mytable WHERE Diverted > 0 ORDER BY WheelsOff, DestWac LIMIT 8"}
-{"sql":"SELECT CarrierDelay, DepTimeBlk, MAX(\"Year\"), MIN(NASDelay) FROM mytable GROUP BY CarrierDelay, DepTimeBlk LIMIT 7","hsqls":["SELECT CarrierDelay, DepTimeBlk, MAX(Year), MIN(NASDelay) FROM mytable GROUP BY CarrierDelay, DepTimeBlk LIMIT 7"]}
+{"sql":"SELECT CarrierDelay, DepTimeBlk, MAX(\"Year\"), MIN(NASDelay) FROM mytable GROUP BY CarrierDelay, DepTimeBlk LIMIT 7","hsqls":["SELECT CarrierDelay, DepTimeBlk, MAX(`Year`), MIN(NASDelay) FROM mytable GROUP BY CarrierDelay, DepTimeBlk LIMIT 7"]}
 {"sql":"SELECT AVG(CarrierDelay) FROM mytable WHERE DestState IN ('OR', 'VA', 'WV', 'NY') AND DepTimeBlk NOT IN ('1700-1759', '1000-1059', '0700-0759', '1500-1559') LIMIT 22"}
 {"sql":"SELECT FlightDate, Cancelled, MAX(OriginStateFips), AVG(DivAirportLandings) FROM mytable WHERE Origin <= 'MSO' AND DestAirportID BETWEEN 12819 AND 12523 GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 14","hsqls":["SELECT FlightDate, Cancelled, MAX(OriginStateFips), AVG(DivAirportLandings) FROM mytable WHERE Origin <= 'MSO' AND DestAirportID BETWEEN 12819 AND 12523 GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 14"]}
 {"sql":"SELECT Origin, AirlineID, SUM(AirTime), COUNT(DaysSinceEpoch), COUNT(WeatherDelay) FROM mytable WHERE OriginState BETWEEN 'MS' AND 'PR' GROUP BY Origin, AirlineID  ORDER BY Origin, AirlineID LIMIT 26","hsqls":["SELECT Origin, AirlineID, SUM(AirTime), COUNT(DaysSinceEpoch), COUNT(WeatherDelay) FROM mytable WHERE OriginState BETWEEN 'MS' AND 'PR' GROUP BY Origin, AirlineID  ORDER BY Origin, AirlineID LIMIT 26"]}
 {"sql":"SELECT LateAircraftDelay, DivArrDelay, COUNT(*) FROM mytable WHERE OriginState BETWEEN 'CT' AND 'MI' GROUP BY LateAircraftDelay, DivArrDelay  ORDER BY LateAircraftDelay, DivArrDelay LIMIT 27","hsqls":["SELECT LateAircraftDelay, DivArrDelay, COUNT(*) FROM mytable WHERE OriginState BETWEEN 'CT' AND 'MI' GROUP BY LateAircraftDelay, DivArrDelay  ORDER BY LateAircraftDelay, DivArrDelay LIMIT 27"]}
-{"sql":"SELECT Cancelled, UniqueCarrier FROM mytable WHERE ArrivalDelayGroups NOT IN (-1, -9999) AND DivLongestGTimes BETWEEN 116.0 AND 15.0 ORDER BY LateAircraftDelay, ArrTimeBlk LIMIT 7","hsqls":["SELECT Cancelled, UniqueCarrier FROM mytable WHERE ArrivalDelayGroups NOT IN (-1, -9999) AND (DivLongestGTimes__MV0 BETWEEN 116.0 AND 15.0 OR DivLongestGTimes__MV1 BETWEEN 116.0 AND 15.0 OR DivLongestGTimes__MV2 BETWEEN 116.0 AND 15.0 OR DivLongestGTimes__MV3 BETWEEN 116.0 AND 15.0 OR DivLongestGTimes__MV4 BETWEEN 116.0 AND 15.0) ORDER BY LateAircraftDelay, ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DayofMonth < 1 OR Diverted NOT IN (1, 0) ORDER BY ArrTime, AirTime, \"Month\" LIMIT 17","hsqls":["SELECT CRSArrTime FROM mytable WHERE DayofMonth < 1 OR Diverted NOT IN (1, 0) ORDER BY ArrTime, AirTime, Month LIMIT 17"]}
+{"sql":"SELECT Cancelled, UniqueCarrier FROM mytable WHERE ArrivalDelayGroups NOT IN (-1, -9999) AND DivLongestGTimes BETWEEN 116.0 AND 15.0 ORDER BY LateAircraftDelay, ArrTimeBlk LIMIT 7","hsqls":["SELECT Cancelled, UniqueCarrier FROM mytable WHERE ArrivalDelayGroups NOT IN (-1, -9999) AND (DivLongestGTimes[1] BETWEEN 116.0 AND 15.0 OR DivLongestGTimes[2] BETWEEN 116.0 AND 15.0 OR DivLongestGTimes[3] BETWEEN 116.0 AND 15.0 OR DivLongestGTimes[4] BETWEEN 116.0 AND 15.0 OR DivLongestGTimes[5] BETWEEN 116.0 AND 15.0) ORDER BY LateAircraftDelay, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DayofMonth < 1 OR Diverted NOT IN (1, 0) ORDER BY ArrTime, AirTime, \"Month\" LIMIT 17","hsqls":["SELECT CRSArrTime FROM mytable WHERE DayofMonth < 1 OR Diverted NOT IN (1, 0) ORDER BY ArrTime, AirTime, `Month` LIMIT 17"]}
 {"sql":"SELECT OriginState, WheelsOn, MIN(DestStateFips) FROM mytable WHERE CRSDepTime BETWEEN 1554 AND 1342 GROUP BY OriginState, WheelsOn  ORDER BY OriginState, WheelsOn LIMIT 9","hsqls":["SELECT OriginState, WheelsOn, MIN(DestStateFips) FROM mytable WHERE CRSDepTime BETWEEN 1554 AND 1342 GROUP BY OriginState, WheelsOn  ORDER BY OriginState, WheelsOn LIMIT 9"]}
 {"sql":"SELECT DestStateName, MIN(ActualElapsedTime) FROM mytable WHERE Distance IN (2586, 139, 1749, 742, 667) OR CRSArrTime BETWEEN 1043 AND 1753 GROUP BY DestStateName","hsqls":["SELECT DestStateName, MIN(ActualElapsedTime) FROM mytable WHERE Distance IN (2586, 139, 1749, 742, 667) OR CRSArrTime BETWEEN 1043 AND 1753 GROUP BY DestStateName"]}
-{"sql":"SELECT DivWheelsOns, LateAircraftDelay, DivAirportIDs FROM mytable WHERE TotalAddGTime < 111 ORDER BY Origin LIMIT 18","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LateAircraftDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE TotalAddGTime < 111 ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, LateAircraftDelay, DivAirportIDs FROM mytable WHERE TotalAddGTime < 111 ORDER BY Origin LIMIT 18","hsqls":["SELECT DivWheelsOns, LateAircraftDelay, DivAirportIDs FROM mytable WHERE TotalAddGTime < 111 ORDER BY Origin LIMIT 10000"]}
 {"sql":"SELECT DestCityName, AVG(Quarter), MIN(Distance) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 21","hsqls":["SELECT DestCityName, AVG(Quarter), MIN(Distance) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 21"]}
 {"sql":"SELECT Diverted, DepDel15 FROM mytable LIMIT 10"}
 {"sql":"SELECT TaxiOut, DayofMonth, MIN(DistanceGroup), AVG(Flights), SUM(DivDistance) FROM mytable WHERE SecurityDelay BETWEEN 8 AND -9999 GROUP BY TaxiOut, DayofMonth  ORDER BY TaxiOut, DayofMonth LIMIT 29","hsqls":["SELECT TaxiOut, DayofMonth, MIN(DistanceGroup), AVG(Flights), SUM(DivDistance) FROM mytable WHERE SecurityDelay BETWEEN 8 AND -9999 GROUP BY TaxiOut, DayofMonth  ORDER BY TaxiOut, DayofMonth LIMIT 29"]}
-{"sql":"SELECT DivLongestGTimes, TotalAddGTime FROM mytable LIMIT 5","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, TotalAddGTime FROM mytable LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DivTailNums FROM mytable WHERE FlightDate NOT IN ('2014-01-29', '2014-01-28', '2014-01-21', '2014-01-07', '2014-01-10') AND TailNum IN ('N547JB') AND UniqueCarrier <> 'AS' ORDER BY Diverted LIMIT 14","hsqls":["SELECT OriginAirportSeqID, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE FlightDate NOT IN ('2014-01-29', '2014-01-28', '2014-01-21', '2014-01-07', '2014-01-10') AND TailNum IN ('N547JB') AND UniqueCarrier <> 'AS' ORDER BY Diverted LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, TotalAddGTime FROM mytable LIMIT 5","hsqls":["SELECT DivLongestGTimes, TotalAddGTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivTailNums FROM mytable WHERE FlightDate NOT IN ('2014-01-29', '2014-01-28', '2014-01-21', '2014-01-07', '2014-01-10') AND TailNum IN ('N547JB') AND UniqueCarrier <> 'AS' ORDER BY Diverted LIMIT 14","hsqls":["SELECT OriginAirportSeqID, DivTailNums FROM mytable WHERE FlightDate NOT IN ('2014-01-29', '2014-01-28', '2014-01-21', '2014-01-07', '2014-01-10') AND TailNum IN ('N547JB') AND UniqueCarrier <> 'AS' ORDER BY Diverted LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable ORDER BY SecurityDelay, ArrDel15, DepTimeBlk LIMIT 22"}
-{"sql":"SELECT LateAircraftDelay, SecurityDelay, DivTotalGTimes FROM mytable WHERE OriginCityMarketID <> 33495 OR DivArrDelay NOT IN (91) AND DepDel15 NOT IN (0, -9999) ORDER BY DepartureDelayGroups, DivReachedDest, Flights LIMIT 4","hsqls":["SELECT LateAircraftDelay, SecurityDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginCityMarketID <> 33495 OR DivArrDelay NOT IN (91) AND DepDel15 NOT IN (0, -9999) ORDER BY DepartureDelayGroups, DivReachedDest, Flights LIMIT 10000"]}
-{"sql":"SELECT Quarter, TotalAddGTime, OriginAirportID FROM mytable WHERE DivAirportIDs BETWEEN 10821 AND 14100 ORDER BY OriginAirportSeqID, AirTime, DayofMonth LIMIT 16","hsqls":["SELECT Quarter, TotalAddGTime, OriginAirportID FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 10821 AND 14100 OR DivAirportIDs__MV1 BETWEEN 10821 AND 14100 OR DivAirportIDs__MV2 BETWEEN 10821 AND 14100 OR DivAirportIDs__MV3 BETWEEN 10821 AND 14100 OR DivAirportIDs__MV4 BETWEEN 10821 AND 14100) ORDER BY OriginAirportSeqID, AirTime, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DestCityMarketID BETWEEN 31726 AND 30627 OR Cancelled >= 0 ORDER BY TotalAddGTime, OriginCityName LIMIT 7","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE DestCityMarketID BETWEEN 31726 AND 30627 OR Cancelled >= 0 ORDER BY TotalAddGTime, OriginCityName LIMIT 10000"]}
-{"sql":"SELECT CRSElapsedTime FROM mytable WHERE OriginCityMarketID <= 31041 OR DivWheelsOffs IN (2046) AND WeatherDelay NOT IN (316, 234, 37) ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 1","hsqls":["SELECT CRSElapsedTime FROM mytable WHERE OriginCityMarketID <= 31041 OR (DivWheelsOffs__MV0 IN (2046) OR DivWheelsOffs__MV1 IN (2046) OR DivWheelsOffs__MV2 IN (2046) OR DivWheelsOffs__MV3 IN (2046) OR DivWheelsOffs__MV4 IN (2046)) AND WeatherDelay NOT IN (316, 234, 37) ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, SecurityDelay, DivTotalGTimes FROM mytable WHERE OriginCityMarketID <> 33495 OR DivArrDelay NOT IN (91) AND DepDel15 NOT IN (0, -9999) ORDER BY DepartureDelayGroups, DivReachedDest, Flights LIMIT 4","hsqls":["SELECT LateAircraftDelay, SecurityDelay, DivTotalGTimes FROM mytable WHERE OriginCityMarketID <> 33495 OR DivArrDelay NOT IN (91) AND DepDel15 NOT IN (0, -9999) ORDER BY DepartureDelayGroups, DivReachedDest, Flights LIMIT 10000"]}
+{"sql":"SELECT Quarter, TotalAddGTime, OriginAirportID FROM mytable WHERE DivAirportIDs BETWEEN 10821 AND 14100 ORDER BY OriginAirportSeqID, AirTime, DayofMonth LIMIT 16","hsqls":["SELECT Quarter, TotalAddGTime, OriginAirportID FROM mytable WHERE (DivAirportIDs[1] BETWEEN 10821 AND 14100 OR DivAirportIDs[2] BETWEEN 10821 AND 14100 OR DivAirportIDs[3] BETWEEN 10821 AND 14100 OR DivAirportIDs[4] BETWEEN 10821 AND 14100 OR DivAirportIDs[5] BETWEEN 10821 AND 14100) ORDER BY OriginAirportSeqID, AirTime, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DestCityMarketID BETWEEN 31726 AND 30627 OR Cancelled >= 0 ORDER BY TotalAddGTime, OriginCityName LIMIT 7","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE DestCityMarketID BETWEEN 31726 AND 30627 OR Cancelled >= 0 ORDER BY TotalAddGTime, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT CRSElapsedTime FROM mytable WHERE OriginCityMarketID <= 31041 OR DivWheelsOffs IN (2046) AND WeatherDelay NOT IN (316, 234, 37) ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 1","hsqls":["SELECT CRSElapsedTime FROM mytable WHERE OriginCityMarketID <= 31041 OR (DivWheelsOffs[1] IN (2046) OR DivWheelsOffs[2] IN (2046) OR DivWheelsOffs[3] IN (2046) OR DivWheelsOffs[4] IN (2046) OR DivWheelsOffs[5] IN (2046)) AND WeatherDelay NOT IN (316, 234, 37) ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginCityMarketID), MIN(SecurityDelay), MAX(DepTime) FROM mytable LIMIT 6"}
 {"sql":"SELECT OriginAirportSeqID, UniqueCarrier, OriginStateName, MAX(WheelsOff) FROM mytable WHERE FirstDepTime <= 947 AND Distance IN (989, 610, 1276, 1062) AND DestAirportSeqID BETWEEN 1033302 AND 1295103 GROUP BY OriginAirportSeqID, UniqueCarrier, OriginStateName  ORDER BY OriginAirportSeqID, UniqueCarrier, OriginStateName LIMIT 24","hsqls":["SELECT OriginAirportSeqID, UniqueCarrier, OriginStateName, MAX(WheelsOff) FROM mytable WHERE FirstDepTime <= 947 AND Distance IN (989, 610, 1276, 1062) AND DestAirportSeqID BETWEEN 1033302 AND 1295103 GROUP BY OriginAirportSeqID, UniqueCarrier, OriginStateName  ORDER BY OriginAirportSeqID, UniqueCarrier, OriginStateName LIMIT 24"]}
 {"sql":"SELECT DepDel15, CRSDepTime, MAX(ActualElapsedTime) FROM mytable WHERE DistanceGroup <= 9 AND OriginStateName BETWEEN 'Tennessee' AND 'Kansas' GROUP BY DepDel15, CRSDepTime  ORDER BY DepDel15, CRSDepTime LIMIT 22","hsqls":["SELECT DepDel15, CRSDepTime, MAX(ActualElapsedTime) FROM mytable WHERE DistanceGroup <= 9 AND OriginStateName BETWEEN 'Tennessee' AND 'Kansas' GROUP BY DepDel15, CRSDepTime  ORDER BY DepDel15, CRSDepTime LIMIT 22"]}
-{"sql":"SELECT OriginAirportSeqID, TaxiIn, \"Month\", COUNT(ArrTime) FROM mytable WHERE DivArrDelay IN (852, 507, 201, 346, 292) GROUP BY OriginAirportSeqID, TaxiIn, \"Month\" LIMIT 28","hsqls":["SELECT OriginAirportSeqID, TaxiIn, Month, COUNT(ArrTime) FROM mytable WHERE DivArrDelay IN (852, 507, 201, 346, 292) GROUP BY OriginAirportSeqID, TaxiIn, Month LIMIT 28"]}
+{"sql":"SELECT OriginAirportSeqID, TaxiIn, \"Month\", COUNT(ArrTime) FROM mytable WHERE DivArrDelay IN (852, 507, 201, 346, 292) GROUP BY OriginAirportSeqID, TaxiIn, \"Month\" LIMIT 28","hsqls":["SELECT OriginAirportSeqID, TaxiIn, Month, COUNT(ArrTime) FROM mytable WHERE DivArrDelay IN (852, 507, 201, 346, 292) GROUP BY OriginAirportSeqID, TaxiIn, `Month` LIMIT 28"]}
 {"sql":"SELECT Flights, DestCityName, CRSElapsedTime, COUNT(DivDistance) FROM mytable GROUP BY Flights, DestCityName, CRSElapsedTime  ORDER BY Flights, DestCityName, CRSElapsedTime LIMIT 18","hsqls":["SELECT Flights, DestCityName, CRSElapsedTime, COUNT(DivDistance) FROM mytable GROUP BY Flights, DestCityName, CRSElapsedTime  ORDER BY Flights, DestCityName, CRSElapsedTime LIMIT 18"]}
-{"sql":"SELECT NASDelay FROM mytable ORDER BY \"Month\" LIMIT 8","hsqls":["SELECT NASDelay FROM mytable ORDER BY Month LIMIT 8"]}
+{"sql":"SELECT NASDelay FROM mytable ORDER BY \"Month\" LIMIT 8","hsqls":["SELECT NASDelay FROM mytable ORDER BY `Month` LIMIT 8"]}
 {"sql":"SELECT AirTime, DayofMonth, CancellationCode, COUNT(*) FROM mytable WHERE CancellationCode >= 'B' GROUP BY AirTime, DayofMonth, CancellationCode  ORDER BY AirTime, DayofMonth, CancellationCode LIMIT 18","hsqls":["SELECT AirTime, DayofMonth, CancellationCode, COUNT(*) FROM mytable WHERE CancellationCode >= 'B' GROUP BY AirTime, DayofMonth, CancellationCode  ORDER BY AirTime, DayofMonth, CancellationCode LIMIT 18"]}
-{"sql":"SELECT Cancelled FROM mytable WHERE DivWheelsOffs BETWEEN 1125 AND 2040 AND Distance <= 1846 ORDER BY TaxiIn, DestCityName LIMIT 10","hsqls":["SELECT Cancelled FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1125 AND 2040 OR DivWheelsOffs__MV1 BETWEEN 1125 AND 2040 OR DivWheelsOffs__MV2 BETWEEN 1125 AND 2040 OR DivWheelsOffs__MV3 BETWEEN 1125 AND 2040 OR DivWheelsOffs__MV4 BETWEEN 1125 AND 2040) AND Distance <= 1846 ORDER BY TaxiIn, DestCityName LIMIT 10000"]}
+{"sql":"SELECT Cancelled FROM mytable WHERE DivWheelsOffs BETWEEN 1125 AND 2040 AND Distance <= 1846 ORDER BY TaxiIn, DestCityName LIMIT 10","hsqls":["SELECT Cancelled FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1125 AND 2040 OR DivWheelsOffs[2] BETWEEN 1125 AND 2040 OR DivWheelsOffs[3] BETWEEN 1125 AND 2040 OR DivWheelsOffs[4] BETWEEN 1125 AND 2040 OR DivWheelsOffs[5] BETWEEN 1125 AND 2040) AND Distance <= 1846 ORDER BY TaxiIn, DestCityName LIMIT 10000"]}
 {"sql":"SELECT TailNum, OriginStateName, SUM(CarrierDelay), MAX(DayofMonth) FROM mytable WHERE ArrTimeBlk > '1400-1459' GROUP BY TailNum, OriginStateName","hsqls":["SELECT TailNum, OriginStateName, SUM(CarrierDelay), MAX(DayofMonth) FROM mytable WHERE ArrTimeBlk > '1400-1459' GROUP BY TailNum, OriginStateName"]}
 {"sql":"SELECT FirstDepTime, DestCityName, OriginWac, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1501603 AND 1295302 GROUP BY FirstDepTime, DestCityName, OriginWac  ORDER BY FirstDepTime, DestCityName, OriginWac LIMIT 29","hsqls":["SELECT FirstDepTime, DestCityName, OriginWac, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1501603 AND 1295302 GROUP BY FirstDepTime, DestCityName, OriginWac  ORDER BY FirstDepTime, DestCityName, OriginWac LIMIT 29"]}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE ArrivalDelayGroups IN (1, 0, 4, 8, -9999) ORDER BY DivDistance, Quarter LIMIT 6"}
@@ -2911,7 +2911,7 @@
 {"sql":"SELECT MIN(DistanceGroup), AVG(DepTime), MIN(TaxiOut) FROM mytable WHERE ActualElapsedTime NOT IN (182, 370, 345, 603) LIMIT 19"}
 {"sql":"SELECT OriginState, DestState, DestAirportID, COUNT(*) FROM mytable GROUP BY OriginState, DestState, DestAirportID  ORDER BY OriginState, DestState, DestAirportID LIMIT 19","hsqls":["SELECT OriginState, DestState, DestAirportID, COUNT(*) FROM mytable GROUP BY OriginState, DestState, DestAirportID  ORDER BY OriginState, DestState, DestAirportID LIMIT 19"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE CRSDepTime IN (554) OR DivDistance IN (110, 159, 237) OR WheelsOn IN (228) ORDER BY \"Year\", Cancelled LIMIT 13","hsqls":["SELECT DivAirportLandings FROM mytable WHERE CRSDepTime IN (554) OR DivDistance IN (110, 159, 237) OR WheelsOn IN (228) ORDER BY Year, Cancelled LIMIT 13"]}
-{"sql":"SELECT DepDelay, CarrierDelay FROM mytable WHERE DivAirportSeqIDs < 1415305 ORDER BY Diverted, OriginCityName, CancellationCode LIMIT 3","hsqls":["SELECT DepDelay, CarrierDelay FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1415305 OR DivAirportSeqIDs__MV1 < 1415305 OR DivAirportSeqIDs__MV2 < 1415305 OR DivAirportSeqIDs__MV3 < 1415305 OR DivAirportSeqIDs__MV4 < 1415305) ORDER BY Diverted, OriginCityName, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DepDelay, CarrierDelay FROM mytable WHERE DivAirportSeqIDs < 1415305 ORDER BY Diverted, OriginCityName, CancellationCode LIMIT 3","hsqls":["SELECT DepDelay, CarrierDelay FROM mytable WHERE (DivAirportSeqIDs[1] < 1415305 OR DivAirportSeqIDs[2] < 1415305 OR DivAirportSeqIDs[3] < 1415305 OR DivAirportSeqIDs[4] < 1415305 OR DivAirportSeqIDs[5] < 1415305) ORDER BY Diverted, OriginCityName, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT MAX(DestAirportID), AVG(CRSElapsedTime), MAX(DivActualElapsedTime) FROM mytable LIMIT 18"}
 {"sql":"SELECT LongestAddGTime, COUNT(*) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 21","hsqls":["SELECT LongestAddGTime, COUNT(*) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 21"]}
 {"sql":"SELECT LateAircraftDelay, DestStateName, CRSDepTime, COUNT(*) FROM mytable WHERE FirstDepTime NOT IN (1032, 1030, 639, 1940, 835) OR TotalAddGTime BETWEEN 15 AND 19 AND WheelsOn IN (1703, 2345) GROUP BY LateAircraftDelay, DestStateName, CRSDepTime  ORDER BY LateAircraftDelay, DestStateName, CRSDepTime LIMIT 10","hsqls":["SELECT LateAircraftDelay, DestStateName, CRSDepTime, COUNT(*) FROM mytable WHERE FirstDepTime NOT IN (1032, 1030, 639, 1940, 835) OR TotalAddGTime BETWEEN 15 AND 19 AND WheelsOn IN (1703, 2345) GROUP BY LateAircraftDelay, DestStateName, CRSDepTime  ORDER BY LateAircraftDelay, DestStateName, CRSDepTime LIMIT 10"]}
@@ -2925,11 +2925,11 @@
 {"sql":"SELECT AirTime, OriginAirportID FROM mytable WHERE DivDistance BETWEEN 108 AND 24 OR AirTime NOT IN (363, 269, 285, 282) ORDER BY LateAircraftDelay, DaysSinceEpoch LIMIT 16"}
 {"sql":"SELECT DestAirportSeqID, ArrivalDelayGroups FROM mytable WHERE OriginCityName IN ('Hibbing, MN', 'Hayden, CO', 'Hartford, CT', 'Dayton, OH') LIMIT 17"}
 {"sql":"SELECT CRSElapsedTime FROM mytable WHERE NASDelay BETWEEN 56 AND 25 OR DepDel15 NOT IN (1, 0, -9999) LIMIT 1"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE WheelsOff IN (2030) AND DivActualElapsedTime BETWEEN 485 AND 336 OR Origin <= 'PHF' ORDER BY SecurityDelay LIMIT 3","hsqls":["SELECT Year FROM mytable WHERE WheelsOff IN (2030) AND DivActualElapsedTime BETWEEN 485 AND 336 OR Origin <= 'PHF' ORDER BY SecurityDelay LIMIT 3"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE WheelsOff IN (2030) AND DivActualElapsedTime BETWEEN 485 AND 336 OR Origin <= 'PHF' ORDER BY SecurityDelay LIMIT 3","hsqls":["SELECT `Year` FROM mytable WHERE WheelsOff IN (2030) AND DivActualElapsedTime BETWEEN 485 AND 336 OR Origin <= 'PHF' ORDER BY SecurityDelay LIMIT 3"]}
 {"sql":"SELECT OriginState, DepTimeBlk, MAX(AirlineID) FROM mytable WHERE ArrTimeBlk NOT IN ('1300-1359', '1400-1459', '1800-1859') GROUP BY OriginState, DepTimeBlk  ORDER BY OriginState, DepTimeBlk LIMIT 23","hsqls":["SELECT OriginState, DepTimeBlk, MAX(AirlineID) FROM mytable WHERE ArrTimeBlk NOT IN ('1300-1359', '1400-1459', '1800-1859') GROUP BY OriginState, DepTimeBlk  ORDER BY OriginState, DepTimeBlk LIMIT 23"]}
 {"sql":"SELECT SecurityDelay, ArrTime, CRSElapsedTime FROM mytable WHERE OriginState NOT IN ('TN', 'TX', 'NE') ORDER BY OriginAirportSeqID, Diverted, TaxiIn LIMIT 9"}
-{"sql":"SELECT ActualElapsedTime, DayofMonth, \"Month\" FROM mytable WHERE DivAirportIDs <= 10874 OR OriginCityMarketID >= 34457 LIMIT 29","hsqls":["SELECT ActualElapsedTime, DayofMonth, Month FROM mytable WHERE (DivAirportIDs__MV0 <= 10874 OR DivAirportIDs__MV1 <= 10874 OR DivAirportIDs__MV2 <= 10874 OR DivAirportIDs__MV3 <= 10874 OR DivAirportIDs__MV4 <= 10874) OR OriginCityMarketID >= 34457 LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, DayofMonth, OriginStateName, MIN(\"Year\"), COUNT(ArrDelay), COUNT(Distance) FROM mytable WHERE DivArrDelay BETWEEN 124 AND 159 AND DivLongestGTimes IN (56.0, 70.0) GROUP BY DepartureDelayGroups, DayofMonth, OriginStateName LIMIT 10","hsqls":["SELECT DepartureDelayGroups, DayofMonth, OriginStateName, MIN(Year), COUNT(ArrDelay), COUNT(Distance) FROM mytable WHERE DivArrDelay BETWEEN 124 AND 159 AND (DivLongestGTimes__MV0 IN (56.0, 70.0) OR DivLongestGTimes__MV1 IN (56.0, 70.0) OR DivLongestGTimes__MV2 IN (56.0, 70.0) OR DivLongestGTimes__MV3 IN (56.0, 70.0) OR DivLongestGTimes__MV4 IN (56.0, 70.0)) GROUP BY DepartureDelayGroups, DayofMonth, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DayofMonth, \"Month\" FROM mytable WHERE DivAirportIDs <= 10874 OR OriginCityMarketID >= 34457 LIMIT 29","hsqls":["SELECT ActualElapsedTime, DayofMonth, `Month` FROM mytable WHERE (DivAirportIDs[1] <= 10874 OR DivAirportIDs[2] <= 10874 OR DivAirportIDs[3] <= 10874 OR DivAirportIDs[4] <= 10874 OR DivAirportIDs[5] <= 10874) OR OriginCityMarketID >= 34457 LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DayofMonth, OriginStateName, MIN(\"Year\"), COUNT(ArrDelay), COUNT(Distance) FROM mytable WHERE DivArrDelay BETWEEN 124 AND 159 AND DivLongestGTimes IN (56.0, 70.0) GROUP BY DepartureDelayGroups, DayofMonth, OriginStateName LIMIT 10","hsqls":["SELECT DepartureDelayGroups, DayofMonth, OriginStateName, MIN(`Year`), COUNT(ArrDelay), COUNT(Distance) FROM mytable WHERE DivArrDelay BETWEEN 124 AND 159 AND (DivLongestGTimes[1] IN (56.0, 70.0) OR DivLongestGTimes[2] IN (56.0, 70.0) OR DivLongestGTimes[3] IN (56.0, 70.0) OR DivLongestGTimes[4] IN (56.0, 70.0) OR DivLongestGTimes[5] IN (56.0, 70.0)) GROUP BY DepartureDelayGroups, DayofMonth, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT SUM(Flights), AVG(ArrDelayMinutes), AVG(DistanceGroup) FROM mytable WHERE CRSArrTime < 1216 LIMIT 14"}
 {"sql":"SELECT COUNT(DestWac), MAX(CRSDepTime), MIN(FirstDepTime) FROM mytable WHERE DepTimeBlk > '2300-2359' OR DestAirportID IN (11982) LIMIT 15"}
 {"sql":"SELECT DestState, COUNT(*) FROM mytable WHERE AirTime = 49 GROUP BY DestState  ORDER BY DestState LIMIT 8","hsqls":["SELECT DestState, COUNT(*) FROM mytable WHERE AirTime = 49 GROUP BY DestState  ORDER BY DestState LIMIT 8"]}
@@ -2940,23 +2940,23 @@
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Distance BETWEEN 187 AND 287 OR DestStateFips IN (48, 45, 19, 26) LIMIT 18"}
 {"sql":"SELECT Dest, COUNT(OriginCityMarketID), MIN(OriginAirportSeqID), MIN(DivReachedDest) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 15","hsqls":["SELECT Dest, COUNT(OriginCityMarketID), MIN(OriginAirportSeqID), MIN(DivReachedDest) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 15"]}
 {"sql":"SELECT Quarter FROM mytable WHERE OriginWac NOT IN (63, 13, 14) OR DestCityMarketID BETWEEN 30361 AND 31726 OR CRSArrTime >= 723 ORDER BY DestState, ArrDelayMinutes LIMIT 9"}
-{"sql":"SELECT DestWac, DepDelay FROM mytable WHERE OriginAirportID BETWEEN 10372 AND 14730 AND DivAirportSeqIDs BETWEEN 1524903 AND 1348502 OR OriginStateFips BETWEEN 10 AND 45 ORDER BY TaxiOut, Diverted, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT DestWac, DepDelay FROM mytable WHERE OriginAirportID BETWEEN 10372 AND 14730 AND (DivAirportSeqIDs__MV0 BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs__MV1 BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs__MV2 BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs__MV3 BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs__MV4 BETWEEN 1524903 AND 1348502) OR OriginStateFips BETWEEN 10 AND 45 ORDER BY TaxiOut, Diverted, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT ArrDel15 FROM mytable WHERE DivAirportSeqIDs BETWEEN 1532302 AND 1457002 ORDER BY ArrDel15, DayofMonth LIMIT 29","hsqls":["SELECT ArrDel15 FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs__MV1 BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs__MV2 BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs__MV3 BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs__MV4 BETWEEN 1532302 AND 1457002) ORDER BY ArrDel15, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, WheelsOff, AVG(DistanceGroup) FROM mytable WHERE DivWheelsOns <= 2132 OR Dest <> 'ADQ' AND TailNum IN ('N549AA') GROUP BY DepartureDelayGroups, WheelsOff LIMIT 23","hsqls":["SELECT DepartureDelayGroups, WheelsOff, AVG(CAST(DistanceGroup AS DOUBLE)) FROM mytable WHERE (DivWheelsOns__MV0 <= 2132 OR DivWheelsOns__MV1 <= 2132 OR DivWheelsOns__MV2 <= 2132 OR DivWheelsOns__MV3 <= 2132 OR DivWheelsOns__MV4 <= 2132) OR Dest <> 'ADQ' AND TailNum IN ('N549AA') GROUP BY DepartureDelayGroups, WheelsOff LIMIT 10000"]}
-{"sql":"SELECT Diverted, LateAircraftDelay, DivAirportIDs FROM mytable WHERE DepartureDelayGroups < 3 OR CarrierDelay BETWEEN 59 AND 59 AND OriginCityMarketID BETWEEN 32448 AND 31778 ORDER BY DestAirportID","hsqls":["SELECT Diverted, LateAircraftDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DepartureDelayGroups < 3 OR CarrierDelay BETWEEN 59 AND 59 AND OriginCityMarketID BETWEEN 32448 AND 31778 ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestWac, DepDelay FROM mytable WHERE OriginAirportID BETWEEN 10372 AND 14730 AND DivAirportSeqIDs BETWEEN 1524903 AND 1348502 OR OriginStateFips BETWEEN 10 AND 45 ORDER BY TaxiOut, Diverted, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT DestWac, DepDelay FROM mytable WHERE OriginAirportID BETWEEN 10372 AND 14730 AND (DivAirportSeqIDs[1] BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs[2] BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs[3] BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs[4] BETWEEN 1524903 AND 1348502 OR DivAirportSeqIDs[5] BETWEEN 1524903 AND 1348502) OR OriginStateFips BETWEEN 10 AND 45 ORDER BY TaxiOut, Diverted, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT ArrDel15 FROM mytable WHERE DivAirportSeqIDs BETWEEN 1532302 AND 1457002 ORDER BY ArrDel15, DayofMonth LIMIT 29","hsqls":["SELECT ArrDel15 FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs[2] BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs[3] BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs[4] BETWEEN 1532302 AND 1457002 OR DivAirportSeqIDs[5] BETWEEN 1532302 AND 1457002) ORDER BY ArrDel15, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, WheelsOff, AVG(DistanceGroup) FROM mytable WHERE DivWheelsOns <= 2132 OR Dest <> 'ADQ' AND TailNum IN ('N549AA') GROUP BY DepartureDelayGroups, WheelsOff LIMIT 23","hsqls":["SELECT DepartureDelayGroups, WheelsOff, AVG(CAST(DistanceGroup AS DOUBLE)) FROM mytable WHERE (DivWheelsOns[1] <= 2132 OR DivWheelsOns[2] <= 2132 OR DivWheelsOns[3] <= 2132 OR DivWheelsOns[4] <= 2132 OR DivWheelsOns[5] <= 2132) OR Dest <> 'ADQ' AND TailNum IN ('N549AA') GROUP BY DepartureDelayGroups, WheelsOff LIMIT 10000"]}
+{"sql":"SELECT Diverted, LateAircraftDelay, DivAirportIDs FROM mytable WHERE DepartureDelayGroups < 3 OR CarrierDelay BETWEEN 59 AND 59 AND OriginCityMarketID BETWEEN 32448 AND 31778 ORDER BY DestAirportID","hsqls":["SELECT Diverted, LateAircraftDelay, DivAirportIDs FROM mytable WHERE DepartureDelayGroups < 3 OR CarrierDelay BETWEEN 59 AND 59 AND OriginCityMarketID BETWEEN 32448 AND 31778 ORDER BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, OriginCityName, COUNT(OriginStateName), SUM(DivActualElapsedTime), SUM(FlightNum) FROM mytable WHERE FlightNum BETWEEN 289 AND 992 GROUP BY CarrierDelay, OriginCityName  ORDER BY CarrierDelay, OriginCityName LIMIT 17","hsqls":["SELECT CarrierDelay, OriginCityName, COUNT(OriginStateName), SUM(DivActualElapsedTime), SUM(FlightNum) FROM mytable WHERE FlightNum BETWEEN 289 AND 992 GROUP BY CarrierDelay, OriginCityName  ORDER BY CarrierDelay, OriginCityName LIMIT 17"]}
 {"sql":"SELECT Quarter, DepDelayMinutes, ArrTimeBlk FROM mytable ORDER BY FlightDate, DayofMonth LIMIT 10"}
-{"sql":"SELECT DestAirportSeqID, DivAirportIDs FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR Distance BETWEEN 4502 AND 1313 OR OriginCityMarketID NOT IN (30466, 34108) ORDER BY DepDelay, TaxiIn, TailNum LIMIT 23","hsqls":["SELECT DestAirportSeqID, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Month BETWEEN 1 AND 1 OR Distance BETWEEN 4502 AND 1313 OR OriginCityMarketID NOT IN (30466, 34108) ORDER BY DepDelay, TaxiIn, TailNum LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivAirportIDs FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR Distance BETWEEN 4502 AND 1313 OR OriginCityMarketID NOT IN (30466, 34108) ORDER BY DepDelay, TaxiIn, TailNum LIMIT 23","hsqls":["SELECT DestAirportSeqID, DivAirportIDs FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR Distance BETWEEN 4502 AND 1313 OR OriginCityMarketID NOT IN (30466, 34108) ORDER BY DepDelay, TaxiIn, TailNum LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, AirlineID FROM mytable WHERE SecurityDelay IN (18, 8, 27) LIMIT 18"}
 {"sql":"SELECT DepTime, DestCityMarketID FROM mytable WHERE DestWac BETWEEN 34 AND 42 OR DepDelayMinutes BETWEEN 188.0 AND 48.0 AND DepDelayMinutes <> 5.0 ORDER BY OriginAirportID LIMIT 2"}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE CRSArrTime > 1812 OR DepartureDelayGroups >= 1 AND LongestAddGTime BETWEEN 37 AND 31 ORDER BY DepartureDelayGroups, DestAirportID LIMIT 1"}
-{"sql":"SELECT DestState, \"Month\" FROM mytable LIMIT 13","hsqls":["SELECT DestState, Month FROM mytable LIMIT 13"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE \"Month\" NOT IN (1) AND Distance BETWEEN 471 AND 1023 ORDER BY TaxiOut, DivActualElapsedTime LIMIT 20","hsqls":["SELECT Year FROM mytable WHERE Month NOT IN (1) AND Distance BETWEEN 471 AND 1023 ORDER BY TaxiOut, DivActualElapsedTime LIMIT 20"]}
+{"sql":"SELECT DestState, \"Month\" FROM mytable LIMIT 13","hsqls":["SELECT DestState, `Month` FROM mytable LIMIT 13"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE \"Month\" NOT IN (1) AND Distance BETWEEN 471 AND 1023 ORDER BY TaxiOut, DivActualElapsedTime LIMIT 20","hsqls":["SELECT `Year` FROM mytable WHERE `Month` NOT IN (1) AND Distance BETWEEN 471 AND 1023 ORDER BY TaxiOut, DivActualElapsedTime LIMIT 20"]}
 {"sql":"SELECT LateAircraftDelay, CRSArrTime, CarrierDelay, SUM(WeatherDelay) FROM mytable WHERE TailNum BETWEEN 'N952FR' AND 'N524AS' AND DepDelayMinutes NOT IN (114.0, 138.0, 218.0) AND AirlineID = 19805 GROUP BY LateAircraftDelay, CRSArrTime, CarrierDelay  ORDER BY LateAircraftDelay, CRSArrTime, CarrierDelay LIMIT 11","hsqls":["SELECT LateAircraftDelay, CRSArrTime, CarrierDelay, SUM(WeatherDelay) FROM mytable WHERE TailNum BETWEEN 'N952FR' AND 'N524AS' AND DepDelayMinutes NOT IN (114.0, 138.0, 218.0) AND AirlineID = 19805 GROUP BY LateAircraftDelay, CRSArrTime, CarrierDelay  ORDER BY LateAircraftDelay, CRSArrTime, CarrierDelay LIMIT 11"]}
 {"sql":"SELECT DivArrDelay, AVG(DestStateFips), COUNT(Diverted) FROM mytable WHERE Distance IN (2442, 606) GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 10","hsqls":["SELECT DivArrDelay, AVG(DestStateFips), COUNT(Diverted) FROM mytable WHERE Distance IN (2442, 606) GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 10"]}
 {"sql":"SELECT WeatherDelay, TotalAddGTime, UniqueCarrier, MIN(ArrDelayMinutes), AVG(DepDel15), SUM(DestWac) FROM mytable GROUP BY WeatherDelay, TotalAddGTime, UniqueCarrier  ORDER BY WeatherDelay, TotalAddGTime, UniqueCarrier LIMIT 22","hsqls":["SELECT WeatherDelay, TotalAddGTime, UniqueCarrier, MIN(ArrDelayMinutes), AVG(DepDel15), SUM(DestWac) FROM mytable GROUP BY WeatherDelay, TotalAddGTime, UniqueCarrier  ORDER BY WeatherDelay, TotalAddGTime, UniqueCarrier LIMIT 22"]}
 {"sql":"SELECT DepDelayMinutes, TaxiIn, DestAirportSeqID, MAX(DepDelayMinutes) FROM mytable GROUP BY DepDelayMinutes, TaxiIn, DestAirportSeqID  ORDER BY DepDelayMinutes, TaxiIn, DestAirportSeqID LIMIT 11","hsqls":["SELECT DepDelayMinutes, TaxiIn, DestAirportSeqID, MAX(DepDelayMinutes) FROM mytable GROUP BY DepDelayMinutes, TaxiIn, DestAirportSeqID  ORDER BY DepDelayMinutes, TaxiIn, DestAirportSeqID LIMIT 11"]}
-{"sql":"SELECT DepTime FROM mytable WHERE DivArrDelay < 260 OR WheelsOn BETWEEN 2205 AND 1326 ORDER BY TailNum, \"Month\" LIMIT 15","hsqls":["SELECT DepTime FROM mytable WHERE DivArrDelay < 260 OR WheelsOn BETWEEN 2205 AND 1326 ORDER BY TailNum, Month LIMIT 15"]}
+{"sql":"SELECT DepTime FROM mytable WHERE DivArrDelay < 260 OR WheelsOn BETWEEN 2205 AND 1326 ORDER BY TailNum, \"Month\" LIMIT 15","hsqls":["SELECT DepTime FROM mytable WHERE DivArrDelay < 260 OR WheelsOn BETWEEN 2205 AND 1326 ORDER BY TailNum, `Month` LIMIT 15"]}
 {"sql":"SELECT AVG(Cancelled) FROM mytable LIMIT 16"}
 {"sql":"SELECT DestStateFips FROM mytable WHERE FlightNum > 4875 OR SecurityDelay NOT IN (0, 4, 14, 27, -9999) OR DivActualElapsedTime BETWEEN 403 AND 379 LIMIT 15"}
 {"sql":"SELECT ArrTime, COUNT(*) FROM mytable WHERE DivDistance <= 603 OR OriginWac > 45 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 15","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable WHERE DivDistance <= 603 OR OriginWac > 45 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 15"]}
@@ -2965,74 +2965,74 @@
 {"sql":"SELECT DistanceGroup, DivArrDelay, COUNT(*) FROM mytable WHERE TailNum BETWEEN 'N11206' AND 'N863AS' GROUP BY DistanceGroup, DivArrDelay  ORDER BY DistanceGroup, DivArrDelay LIMIT 7","hsqls":["SELECT DistanceGroup, DivArrDelay, COUNT(*) FROM mytable WHERE TailNum BETWEEN 'N11206' AND 'N863AS' GROUP BY DistanceGroup, DivArrDelay  ORDER BY DistanceGroup, DivArrDelay LIMIT 7"]}
 {"sql":"SELECT DivDistance, NASDelay FROM mytable WHERE TaxiIn BETWEEN 15 AND 9 ORDER BY OriginCityName, ActualElapsedTime, CancellationCode LIMIT 5"}
 {"sql":"SELECT OriginAirportSeqID, UniqueCarrier, DayOfWeek, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, UniqueCarrier, DayOfWeek  ORDER BY OriginAirportSeqID, UniqueCarrier, DayOfWeek LIMIT 7","hsqls":["SELECT OriginAirportSeqID, UniqueCarrier, DayOfWeek, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, UniqueCarrier, DayOfWeek  ORDER BY OriginAirportSeqID, UniqueCarrier, DayOfWeek LIMIT 7"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE TaxiIn >= 34 OR DestStateFips IN (48, 78, 26, 28) OR OriginAirportID IN (10821, 12915) ORDER BY OriginState, \"Month\", DivActualElapsedTime LIMIT 10","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE TaxiIn >= 34 OR DestStateFips IN (48, 78, 26, 28) OR OriginAirportID IN (10821, 12915) ORDER BY OriginState, Month, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE TaxiIn >= 34 OR DestStateFips IN (48, 78, 26, 28) OR OriginAirportID IN (10821, 12915) ORDER BY OriginState, \"Month\", DivActualElapsedTime LIMIT 10","hsqls":["SELECT DivWheelsOns FROM mytable WHERE TaxiIn >= 34 OR DestStateFips IN (48, 78, 26, 28) OR OriginAirportID IN (10821, 12915) ORDER BY OriginState, Month, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Dest, ArrDelay, AVG(DestStateFips), COUNT(ArrTimeBlk) FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 397.0 OR CancellationCode <= 'B' GROUP BY Dest, ArrDelay  ORDER BY Dest, ArrDelay LIMIT 7","hsqls":["SELECT Dest, ArrDelay, AVG(DestStateFips), COUNT(ArrTimeBlk) FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 397.0 OR CancellationCode <= 'B' GROUP BY Dest, ArrDelay  ORDER BY Dest, ArrDelay LIMIT 7"]}
-{"sql":"SELECT WheelsOff, Carrier, DepDel15, AVG(\"Month\") FROM mytable GROUP BY WheelsOff, Carrier, DepDel15 LIMIT 9","hsqls":["SELECT WheelsOff, Carrier, DepDel15, AVG(Month) FROM mytable GROUP BY WheelsOff, Carrier, DepDel15 LIMIT 9"]}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivAirportIDs >= 12451 AND Quarter BETWEEN 1 AND 1 ORDER BY DestAirportID LIMIT 16","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivAirportIDs__MV0 >= 12451 OR DivAirportIDs__MV1 >= 12451 OR DivAirportIDs__MV2 >= 12451 OR DivAirportIDs__MV3 >= 12451 OR DivAirportIDs__MV4 >= 12451) AND Quarter BETWEEN 1 AND 1 ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, Carrier, DepDel15, AVG(\"Month\") FROM mytable GROUP BY WheelsOff, Carrier, DepDel15 LIMIT 9","hsqls":["SELECT WheelsOff, Carrier, DepDel15, AVG(`Month`) FROM mytable GROUP BY WheelsOff, Carrier, DepDel15 LIMIT 9"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivAirportIDs >= 12451 AND Quarter BETWEEN 1 AND 1 ORDER BY DestAirportID LIMIT 16","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivAirportIDs[1] >= 12451 OR DivAirportIDs[2] >= 12451 OR DivAirportIDs[3] >= 12451 OR DivAirportIDs[4] >= 12451 OR DivAirportIDs[5] >= 12451) AND Quarter BETWEEN 1 AND 1 ORDER BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT SUM(DestAirportID) FROM mytable LIMIT 20"}
 {"sql":"SELECT ArrDel15, WheelsOn, ArrivalDelayGroups FROM mytable WHERE DestStateFips BETWEEN 17 AND 9 OR LateAircraftDelay >= 9 AND OriginAirportID <= 15389 ORDER BY LongestAddGTime LIMIT 21"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <= 1412 AND DivLongestGTimes BETWEEN 69.0 AND 1.0 OR ActualElapsedTime BETWEEN 304 AND 336 LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime <= 1412 AND (DivLongestGTimes__MV0 BETWEEN 69.0 AND 1.0 OR DivLongestGTimes__MV1 BETWEEN 69.0 AND 1.0 OR DivLongestGTimes__MV2 BETWEEN 69.0 AND 1.0 OR DivLongestGTimes__MV3 BETWEEN 69.0 AND 1.0 OR DivLongestGTimes__MV4 BETWEEN 69.0 AND 1.0) OR ActualElapsedTime BETWEEN 304 AND 336 LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DivAirports FROM mytable ORDER BY DivDistance LIMIT 9","hsqls":["SELECT OriginAirportSeqID, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <= 1412 AND DivLongestGTimes BETWEEN 69.0 AND 1.0 OR ActualElapsedTime BETWEEN 304 AND 336 LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime <= 1412 AND (DivLongestGTimes[1] BETWEEN 69.0 AND 1.0 OR DivLongestGTimes[2] BETWEEN 69.0 AND 1.0 OR DivLongestGTimes[3] BETWEEN 69.0 AND 1.0 OR DivLongestGTimes[4] BETWEEN 69.0 AND 1.0 OR DivLongestGTimes[5] BETWEEN 69.0 AND 1.0) OR ActualElapsedTime BETWEEN 304 AND 336 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivAirports FROM mytable ORDER BY DivDistance LIMIT 9","hsqls":["SELECT OriginAirportSeqID, DivAirports FROM mytable ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DepDel15, SUM(NASDelay) FROM mytable GROUP BY FirstDepTime, DepDel15  ORDER BY FirstDepTime, DepDel15 LIMIT 19","hsqls":["SELECT FirstDepTime, DepDel15, SUM(NASDelay) FROM mytable GROUP BY FirstDepTime, DepDel15  ORDER BY FirstDepTime, DepDel15 LIMIT 19"]}
 {"sql":"SELECT DivActualElapsedTime, OriginStateName FROM mytable WHERE Dest NOT IN ('WRG', 'HRL', 'GSO', 'EKO') AND DepTime NOT IN (747) AND WheelsOff < 914 LIMIT 22"}
 {"sql":"SELECT CarrierDelay, DivArrDelay, WheelsOn FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR Dest <= 'BMI' AND SecurityDelay <> 10 ORDER BY Flights"}
-{"sql":"SELECT CarrierDelay, CRSElapsedTime FROM mytable WHERE \"Year\" NOT IN (2014) OR Distance NOT IN (997, 384, 350) AND SecurityDelay BETWEEN 18 AND -9999 ORDER BY OriginState, DayofMonth, CRSDepTime LIMIT 13","hsqls":["SELECT CarrierDelay, CRSElapsedTime FROM mytable WHERE Year NOT IN (2014) OR Distance NOT IN (997, 384, 350) AND SecurityDelay BETWEEN 18 AND -9999 ORDER BY OriginState, DayofMonth, CRSDepTime LIMIT 13"]}
-{"sql":"SELECT CRSArrTime, NASDelay, \"Month\" FROM mytable LIMIT 28","hsqls":["SELECT CRSArrTime, NASDelay, Month FROM mytable LIMIT 28"]}
-{"sql":"SELECT Dest, UniqueCarrier, AVG(OriginWac) FROM mytable WHERE DivAirports BETWEEN 'CDC' AND 'BHM' OR TaxiOut BETWEEN 26 AND 91 AND NASDelay IN (238) GROUP BY Dest, UniqueCarrier LIMIT 15","hsqls":["SELECT Dest, UniqueCarrier, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'CDC' AND 'BHM' OR DivAirports__MV1 BETWEEN 'CDC' AND 'BHM' OR DivAirports__MV2 BETWEEN 'CDC' AND 'BHM' OR DivAirports__MV3 BETWEEN 'CDC' AND 'BHM' OR DivAirports__MV4 BETWEEN 'CDC' AND 'BHM') OR TaxiOut BETWEEN 26 AND 91 AND NASDelay IN (238) GROUP BY Dest, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, CRSElapsedTime FROM mytable WHERE \"Year\" NOT IN (2014) OR Distance NOT IN (997, 384, 350) AND SecurityDelay BETWEEN 18 AND -9999 ORDER BY OriginState, DayofMonth, CRSDepTime LIMIT 13","hsqls":["SELECT CarrierDelay, CRSElapsedTime FROM mytable WHERE `Year` NOT IN (2014) OR Distance NOT IN (997, 384, 350) AND SecurityDelay BETWEEN 18 AND -9999 ORDER BY OriginState, DayofMonth, CRSDepTime LIMIT 13"]}
+{"sql":"SELECT CRSArrTime, NASDelay, \"Month\" FROM mytable LIMIT 28","hsqls":["SELECT CRSArrTime, NASDelay, `Month` FROM mytable LIMIT 28"]}
+{"sql":"SELECT Dest, UniqueCarrier, AVG(OriginWac) FROM mytable WHERE DivAirports BETWEEN 'CDC' AND 'BHM' OR TaxiOut BETWEEN 26 AND 91 AND NASDelay IN (238) GROUP BY Dest, UniqueCarrier LIMIT 15","hsqls":["SELECT Dest, UniqueCarrier, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE (DivAirports[1] BETWEEN 'CDC' AND 'BHM' OR DivAirports[2] BETWEEN 'CDC' AND 'BHM' OR DivAirports[3] BETWEEN 'CDC' AND 'BHM' OR DivAirports[4] BETWEEN 'CDC' AND 'BHM' OR DivAirports[5] BETWEEN 'CDC' AND 'BHM') OR TaxiOut BETWEEN 26 AND 91 AND NASDelay IN (238) GROUP BY Dest, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, OriginAirportID, AVG(CRSDepTime), AVG(DestWac) FROM mytable WHERE TaxiOut >= 96 AND DestStateName IN ('Wyoming', 'Pennsylvania', 'Kansas', 'Wisconsin') AND ArrivalDelayGroups <= 1 GROUP BY ArrTimeBlk, OriginAirportID  ORDER BY ArrTimeBlk, OriginAirportID LIMIT 8","hsqls":["SELECT ArrTimeBlk, OriginAirportID, AVG(CRSDepTime), AVG(DestWac) FROM mytable WHERE TaxiOut >= 96 AND DestStateName IN ('Wyoming', 'Pennsylvania', 'Kansas', 'Wisconsin') AND ArrivalDelayGroups <= 1 GROUP BY ArrTimeBlk, OriginAirportID  ORDER BY ArrTimeBlk, OriginAirportID LIMIT 8"]}
 {"sql":"SELECT DestWac, Quarter, UniqueCarrier, AVG(SecurityDelay) FROM mytable WHERE Carrier NOT IN ('EV', 'FL') GROUP BY DestWac, Quarter, UniqueCarrier  ORDER BY DestWac, Quarter, UniqueCarrier LIMIT 24","hsqls":["SELECT DestWac, Quarter, UniqueCarrier, AVG(SecurityDelay) FROM mytable WHERE Carrier NOT IN ('EV', 'FL') GROUP BY DestWac, Quarter, UniqueCarrier  ORDER BY DestWac, Quarter, UniqueCarrier LIMIT 24"]}
-{"sql":"SELECT ArrTime, DivAirportSeqIDs, OriginAirportID FROM mytable WHERE DestStateFips BETWEEN 49 AND 25 OR DepDel15 BETWEEN 0 AND -9999 ORDER BY DestState, OriginCityName LIMIT 20","hsqls":["SELECT ArrTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, OriginAirportID FROM mytable WHERE DestStateFips BETWEEN 49 AND 25 OR DepDel15 BETWEEN 0 AND -9999 ORDER BY DestState, OriginCityName LIMIT 10000"]}
-{"sql":"SELECT SUM(TaxiOut) FROM mytable WHERE WeatherDelay <> 123 OR DivWheelsOffs IN (1352, 1758) OR DistanceGroup NOT IN (5) LIMIT 14","hsqls":["SELECT SUM(TaxiOut) FROM mytable WHERE WeatherDelay <> 123 OR (DivWheelsOffs__MV0 IN (1352, 1758) OR DivWheelsOffs__MV1 IN (1352, 1758) OR DivWheelsOffs__MV2 IN (1352, 1758) OR DivWheelsOffs__MV3 IN (1352, 1758) OR DivWheelsOffs__MV4 IN (1352, 1758)) OR DistanceGroup NOT IN (5) LIMIT 10000"]}
+{"sql":"SELECT ArrTime, DivAirportSeqIDs, OriginAirportID FROM mytable WHERE DestStateFips BETWEEN 49 AND 25 OR DepDel15 BETWEEN 0 AND -9999 ORDER BY DestState, OriginCityName LIMIT 20","hsqls":["SELECT ArrTime, DivAirportSeqIDs, OriginAirportID FROM mytable WHERE DestStateFips BETWEEN 49 AND 25 OR DepDel15 BETWEEN 0 AND -9999 ORDER BY DestState, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT SUM(TaxiOut) FROM mytable WHERE WeatherDelay <> 123 OR DivWheelsOffs IN (1352, 1758) OR DistanceGroup NOT IN (5) LIMIT 14","hsqls":["SELECT SUM(TaxiOut) FROM mytable WHERE WeatherDelay <> 123 OR (DivWheelsOffs[1] IN (1352, 1758) OR DivWheelsOffs[2] IN (1352, 1758) OR DivWheelsOffs[3] IN (1352, 1758) OR DivWheelsOffs[4] IN (1352, 1758) OR DivWheelsOffs[5] IN (1352, 1758)) OR DistanceGroup NOT IN (5) LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrivalDelayGroups), MIN(DepartureDelayGroups), SUM(AirlineID) FROM mytable LIMIT 15"}
 {"sql":"SELECT WheelsOff, DivReachedDest FROM mytable ORDER BY TaxiOut, DepTime, Dest LIMIT 27"}
-{"sql":"SELECT DistanceGroup, CRSElapsedTime, AVG(\"Year\"), COUNT(WeatherDelay) FROM mytable WHERE DepartureDelayGroups < 1 OR DestWac >= 54 OR WheelsOn IN (755) GROUP BY DistanceGroup, CRSElapsedTime LIMIT 7","hsqls":["SELECT DistanceGroup, CRSElapsedTime, AVG(Year), COUNT(WeatherDelay) FROM mytable WHERE DepartureDelayGroups < 1 OR DestWac >= 54 OR WheelsOn IN (755) GROUP BY DistanceGroup, CRSElapsedTime LIMIT 7"]}
+{"sql":"SELECT DistanceGroup, CRSElapsedTime, AVG(\"Year\"), COUNT(WeatherDelay) FROM mytable WHERE DepartureDelayGroups < 1 OR DestWac >= 54 OR WheelsOn IN (755) GROUP BY DistanceGroup, CRSElapsedTime LIMIT 7","hsqls":["SELECT DistanceGroup, CRSElapsedTime, AVG(`Year`), COUNT(WeatherDelay) FROM mytable WHERE DepartureDelayGroups < 1 OR DestWac >= 54 OR WheelsOn IN (755) GROUP BY DistanceGroup, CRSElapsedTime LIMIT 7"]}
 {"sql":"SELECT OriginStateFips, COUNT(DestAirportID), MIN(TaxiOut) FROM mytable WHERE TaxiOut >= 79 OR WheelsOn BETWEEN 520 AND 301 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 27","hsqls":["SELECT OriginStateFips, COUNT(DestAirportID), MIN(TaxiOut) FROM mytable WHERE TaxiOut >= 79 OR WheelsOn BETWEEN 520 AND 301 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 27"]}
-{"sql":"SELECT WeatherDelay, DepDelayMinutes, COUNT(\"Month\"), MIN(DivAirportLandings) FROM mytable WHERE DaysSinceEpoch IN (16088) GROUP BY WeatherDelay, DepDelayMinutes LIMIT 13","hsqls":["SELECT WeatherDelay, DepDelayMinutes, COUNT(Month), MIN(DivAirportLandings) FROM mytable WHERE DaysSinceEpoch IN (16088) GROUP BY WeatherDelay, DepDelayMinutes LIMIT 13"]}
+{"sql":"SELECT WeatherDelay, DepDelayMinutes, COUNT(\"Month\"), MIN(DivAirportLandings) FROM mytable WHERE DaysSinceEpoch IN (16088) GROUP BY WeatherDelay, DepDelayMinutes LIMIT 13","hsqls":["SELECT WeatherDelay, DepDelayMinutes, COUNT(`Month`), MIN(DivAirportLandings) FROM mytable WHERE DaysSinceEpoch IN (16088) GROUP BY WeatherDelay, DepDelayMinutes LIMIT 13"]}
 {"sql":"SELECT CarrierDelay, TaxiIn, OriginWac, MAX(OriginCityMarketID) FROM mytable GROUP BY CarrierDelay, TaxiIn, OriginWac  ORDER BY CarrierDelay, TaxiIn, OriginWac LIMIT 13","hsqls":["SELECT CarrierDelay, TaxiIn, OriginWac, MAX(OriginCityMarketID) FROM mytable GROUP BY CarrierDelay, TaxiIn, OriginWac  ORDER BY CarrierDelay, TaxiIn, OriginWac LIMIT 13"]}
-{"sql":"SELECT DestCityMarketID, OriginWac, DaysSinceEpoch, MAX(WheelsOff) FROM mytable WHERE DivTailNums BETWEEN 'N551AS' AND 'N635AA' AND DivAirportSeqIDs < 1281902 OR DepDel15 NOT IN (1, 0) GROUP BY DestCityMarketID, OriginWac, DaysSinceEpoch LIMIT 23","hsqls":["SELECT DestCityMarketID, OriginWac, DaysSinceEpoch, MAX(WheelsOff) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums__MV1 BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums__MV2 BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums__MV3 BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums__MV4 BETWEEN 'N551AS' AND 'N635AA') AND (DivAirportSeqIDs__MV0 < 1281902 OR DivAirportSeqIDs__MV1 < 1281902 OR DivAirportSeqIDs__MV2 < 1281902 OR DivAirportSeqIDs__MV3 < 1281902 OR DivAirportSeqIDs__MV4 < 1281902) OR DepDel15 NOT IN (1, 0) GROUP BY DestCityMarketID, OriginWac, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, DestCityName, DepTimeBlk, MAX(DestStateFips), MAX(TaxiIn), SUM(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 335 AND 45 AND DivAirportIDs BETWEEN 13851 AND 15370 AND ArrivalDelayGroups NOT IN (-2, 4, -9999) GROUP BY OriginCityMarketID, DestCityName, DepTimeBlk LIMIT 9","hsqls":["SELECT OriginCityMarketID, DestCityName, DepTimeBlk, MAX(DestStateFips), MAX(TaxiIn), SUM(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 335 AND 45 AND (DivAirportIDs__MV0 BETWEEN 13851 AND 15370 OR DivAirportIDs__MV1 BETWEEN 13851 AND 15370 OR DivAirportIDs__MV2 BETWEEN 13851 AND 15370 OR DivAirportIDs__MV3 BETWEEN 13851 AND 15370 OR DivAirportIDs__MV4 BETWEEN 13851 AND 15370) AND ArrivalDelayGroups NOT IN (-2, 4, -9999) GROUP BY OriginCityMarketID, DestCityName, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, DivAirportIDs FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND Quarter IN (1) LIMIT 21","hsqls":["SELECT TotalAddGTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND Quarter IN (1) LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, OriginWac, DaysSinceEpoch, MAX(WheelsOff) FROM mytable WHERE DivTailNums BETWEEN 'N551AS' AND 'N635AA' AND DivAirportSeqIDs < 1281902 OR DepDel15 NOT IN (1, 0) GROUP BY DestCityMarketID, OriginWac, DaysSinceEpoch LIMIT 23","hsqls":["SELECT DestCityMarketID, OriginWac, DaysSinceEpoch, MAX(WheelsOff) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums[2] BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums[3] BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums[4] BETWEEN 'N551AS' AND 'N635AA' OR DivTailNums[5] BETWEEN 'N551AS' AND 'N635AA') AND (DivAirportSeqIDs[1] < 1281902 OR DivAirportSeqIDs[2] < 1281902 OR DivAirportSeqIDs[3] < 1281902 OR DivAirportSeqIDs[4] < 1281902 OR DivAirportSeqIDs[5] < 1281902) OR DepDel15 NOT IN (1, 0) GROUP BY DestCityMarketID, OriginWac, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestCityName, DepTimeBlk, MAX(DestStateFips), MAX(TaxiIn), SUM(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 335 AND 45 AND DivAirportIDs BETWEEN 13851 AND 15370 AND ArrivalDelayGroups NOT IN (-2, 4, -9999) GROUP BY OriginCityMarketID, DestCityName, DepTimeBlk LIMIT 9","hsqls":["SELECT OriginCityMarketID, DestCityName, DepTimeBlk, MAX(DestStateFips), MAX(TaxiIn), SUM(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 335 AND 45 AND (DivAirportIDs[1] BETWEEN 13851 AND 15370 OR DivAirportIDs[2] BETWEEN 13851 AND 15370 OR DivAirportIDs[3] BETWEEN 13851 AND 15370 OR DivAirportIDs[4] BETWEEN 13851 AND 15370 OR DivAirportIDs[5] BETWEEN 13851 AND 15370) AND ArrivalDelayGroups NOT IN (-2, 4, -9999) GROUP BY OriginCityMarketID, DestCityName, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DivAirportIDs FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND Quarter IN (1) LIMIT 21","hsqls":["SELECT TotalAddGTime, DivAirportIDs FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND Quarter IN (1) LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, ActualElapsedTime, NASDelay FROM mytable WHERE OriginAirportSeqID <= 1130802 OR OriginStateFips >= 26 AND CRSArrTime <= 1017 LIMIT 13"}
 {"sql":"SELECT SUM(TaxiOut) FROM mytable LIMIT 2"}
-{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY DivAirportLandings LIMIT 2","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY DivAirportLandings LIMIT 2","hsqls":["SELECT DivAirportIDs FROM mytable ORDER BY DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DepDelay, AVG(ArrivalDelayGroups), MAX(DivReachedDest) FROM mytable WHERE AirlineID NOT IN (19690, 19790, 19805, 20366) OR DepDelayMinutes IN (359.0, 49.0, 17.0) AND Dest BETWEEN 'MCI' AND 'ECP' GROUP BY DepDelay  ORDER BY DepDelay LIMIT 18","hsqls":["SELECT DepDelay, AVG(ArrivalDelayGroups), MAX(DivReachedDest) FROM mytable WHERE AirlineID NOT IN (19690, 19790, 19805, 20366) OR DepDelayMinutes IN (359.0, 49.0, 17.0) AND Dest BETWEEN 'MCI' AND 'ECP' GROUP BY DepDelay  ORDER BY DepDelay LIMIT 18"]}
 {"sql":"SELECT Flights, AVG(ArrivalDelayGroups) FROM mytable WHERE CarrierDelay >= 153 GROUP BY Flights  ORDER BY Flights LIMIT 3","hsqls":["SELECT Flights, AVG(ArrivalDelayGroups) FROM mytable WHERE CarrierDelay >= 153 GROUP BY Flights  ORDER BY Flights LIMIT 3"]}
-{"sql":"SELECT SUM(DistanceGroup) FROM mytable WHERE CRSArrTime BETWEEN 2341 AND 931 OR DivWheelsOns IN (1642) OR DestCityName <> 'Indianapolis, IN' LIMIT 6","hsqls":["SELECT SUM(DistanceGroup) FROM mytable WHERE CRSArrTime BETWEEN 2341 AND 931 OR (DivWheelsOns__MV0 IN (1642) OR DivWheelsOns__MV1 IN (1642) OR DivWheelsOns__MV2 IN (1642) OR DivWheelsOns__MV3 IN (1642) OR DivWheelsOns__MV4 IN (1642)) OR DestCityName <> 'Indianapolis, IN' LIMIT 10000"]}
+{"sql":"SELECT SUM(DistanceGroup) FROM mytable WHERE CRSArrTime BETWEEN 2341 AND 931 OR DivWheelsOns IN (1642) OR DestCityName <> 'Indianapolis, IN' LIMIT 6","hsqls":["SELECT SUM(DistanceGroup) FROM mytable WHERE CRSArrTime BETWEEN 2341 AND 931 OR (DivWheelsOns[1] IN (1642) OR DivWheelsOns[2] IN (1642) OR DivWheelsOns[3] IN (1642) OR DivWheelsOns[4] IN (1642) OR DivWheelsOns[5] IN (1642)) OR DestCityName <> 'Indianapolis, IN' LIMIT 10000"]}
 {"sql":"SELECT DivDistance, MIN(DayOfWeek) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 4","hsqls":["SELECT DivDistance, MIN(DayOfWeek) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 4"]}
 {"sql":"SELECT FirstDepTime, SUM(DivReachedDest) FROM mytable WHERE ActualElapsedTime > 95 AND TailNum NOT IN ('N8609A') GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 15","hsqls":["SELECT FirstDepTime, SUM(DivReachedDest) FROM mytable WHERE ActualElapsedTime > 95 AND TailNum NOT IN ('N8609A') GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 15"]}
 {"sql":"SELECT OriginAirportSeqID, OriginStateName FROM mytable ORDER BY DivDistance LIMIT 12"}
 {"sql":"SELECT AVG(TotalAddGTime), AVG(OriginCityMarketID) FROM mytable WHERE Carrier < 'HA' LIMIT 17"}
-{"sql":"SELECT DepDelay, DivTotalGTimes FROM mytable ORDER BY OriginCityMarketID, FlightNum LIMIT 25","hsqls":["SELECT DepDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY OriginCityMarketID, FlightNum LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivTotalGTimes FROM mytable ORDER BY OriginCityMarketID, FlightNum LIMIT 25","hsqls":["SELECT DepDelay, DivTotalGTimes FROM mytable ORDER BY OriginCityMarketID, FlightNum LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE OriginCityName BETWEEN 'Iron Mountain/Kingsfd, MI' AND 'Jacksonville/Camp Lejeune, NC' OR CRSArrTime = 849 LIMIT 10"}
-{"sql":"SELECT TaxiOut, DepDel15, WheelsOn FROM mytable WHERE DivAirportIDs IN (11278, 10521, 10754) OR WheelsOff > 2032 AND TaxiIn IN (30, 94, 47, 27, 28) ORDER BY DestCityMarketID LIMIT 7","hsqls":["SELECT TaxiOut, DepDel15, WheelsOn FROM mytable WHERE (DivAirportIDs__MV0 IN (11278, 10521, 10754) OR DivAirportIDs__MV1 IN (11278, 10521, 10754) OR DivAirportIDs__MV2 IN (11278, 10521, 10754) OR DivAirportIDs__MV3 IN (11278, 10521, 10754) OR DivAirportIDs__MV4 IN (11278, 10521, 10754)) OR WheelsOff > 2032 AND TaxiIn IN (30, 94, 47, 27, 28) ORDER BY DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, AVG(AirTime) FROM mytable WHERE DayOfWeek NOT IN (5) OR \"Month\" BETWEEN 1 AND 1 AND SecurityDelay IN (1, 10, 4, 8, 14) GROUP BY DistanceGroup LIMIT 24","hsqls":["SELECT DistanceGroup, AVG(AirTime) FROM mytable WHERE DayOfWeek NOT IN (5) OR Month BETWEEN 1 AND 1 AND SecurityDelay IN (1, 10, 4, 8, 14) GROUP BY DistanceGroup LIMIT 24"]}
+{"sql":"SELECT TaxiOut, DepDel15, WheelsOn FROM mytable WHERE DivAirportIDs IN (11278, 10521, 10754) OR WheelsOff > 2032 AND TaxiIn IN (30, 94, 47, 27, 28) ORDER BY DestCityMarketID LIMIT 7","hsqls":["SELECT TaxiOut, DepDel15, WheelsOn FROM mytable WHERE (DivAirportIDs[1] IN (11278, 10521, 10754) OR DivAirportIDs[2] IN (11278, 10521, 10754) OR DivAirportIDs[3] IN (11278, 10521, 10754) OR DivAirportIDs[4] IN (11278, 10521, 10754) OR DivAirportIDs[5] IN (11278, 10521, 10754)) OR WheelsOff > 2032 AND TaxiIn IN (30, 94, 47, 27, 28) ORDER BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, AVG(AirTime) FROM mytable WHERE DayOfWeek NOT IN (5) OR \"Month\" BETWEEN 1 AND 1 AND SecurityDelay IN (1, 10, 4, 8, 14) GROUP BY DistanceGroup LIMIT 24","hsqls":["SELECT DistanceGroup, AVG(AirTime) FROM mytable WHERE DayOfWeek NOT IN (5) OR `Month` BETWEEN 1 AND 1 AND SecurityDelay IN (1, 10, 4, 8, 14) GROUP BY DistanceGroup LIMIT 24"]}
 {"sql":"SELECT TaxiOut, LongestAddGTime FROM mytable WHERE ArrTime <> 1932 OR OriginState IN ('CA', 'IL', 'WI') AND ArrDelay IN (63.0, 241.0, 21.0) LIMIT 14"}
 {"sql":"SELECT DistanceGroup, FlightNum, NASDelay, MAX(FirstDepTime), COUNT(OriginAirportID) FROM mytable GROUP BY DistanceGroup, FlightNum, NASDelay  ORDER BY DistanceGroup, FlightNum, NASDelay LIMIT 24","hsqls":["SELECT DistanceGroup, FlightNum, NASDelay, MAX(FirstDepTime), COUNT(OriginAirportID) FROM mytable GROUP BY DistanceGroup, FlightNum, NASDelay  ORDER BY DistanceGroup, FlightNum, NASDelay LIMIT 24"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivWheelsOffs IN (1243, 204, 1430, 2104, 952) LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs__MV1 IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs__MV2 IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs__MV3 IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs__MV4 IN (1243, 204, 1430, 2104, 952)) LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DivWheelsOns, ActualElapsedTime FROM mytable WHERE DivLongestGTimes >= 30.0 AND DivArrDelay <= 113 ORDER BY Distance, WheelsOn, CRSElapsedTime LIMIT 5","hsqls":["SELECT OriginAirportSeqID, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ActualElapsedTime FROM mytable WHERE (DivLongestGTimes__MV0 >= 30.0 OR DivLongestGTimes__MV1 >= 30.0 OR DivLongestGTimes__MV2 >= 30.0 OR DivLongestGTimes__MV3 >= 30.0 OR DivLongestGTimes__MV4 >= 30.0) AND DivArrDelay <= 113 ORDER BY Distance, WheelsOn, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivWheelsOffs IN (1243, 204, 1430, 2104, 952) LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs[2] IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs[3] IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs[4] IN (1243, 204, 1430, 2104, 952) OR DivWheelsOffs[5] IN (1243, 204, 1430, 2104, 952)) LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivWheelsOns, ActualElapsedTime FROM mytable WHERE DivLongestGTimes >= 30.0 AND DivArrDelay <= 113 ORDER BY Distance, WheelsOn, CRSElapsedTime LIMIT 5","hsqls":["SELECT OriginAirportSeqID, DivWheelsOns, ActualElapsedTime FROM mytable WHERE (DivLongestGTimes[1] >= 30.0 OR DivLongestGTimes[2] >= 30.0 OR DivLongestGTimes[3] >= 30.0 OR DivLongestGTimes[4] >= 30.0 OR DivLongestGTimes[5] >= 30.0) AND DivArrDelay <= 113 ORDER BY Distance, WheelsOn, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(Origin), COUNT(NASDelay) FROM mytable WHERE OriginCityMarketID NOT IN (31205, 32177, 33038) LIMIT 3"}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY ArrDelayMinutes, CRSElapsedTime LIMIT 5"}
 {"sql":"SELECT OriginAirportSeqID, ArrDelayMinutes, AVG(ArrDelayMinutes) FROM mytable WHERE DestCityName > 'Christiansted, VI' OR Carrier >= 'FL' AND OriginCityName >= 'Duluth, MN' GROUP BY OriginAirportSeqID, ArrDelayMinutes  ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 20","hsqls":["SELECT OriginAirportSeqID, ArrDelayMinutes, AVG(ArrDelayMinutes) FROM mytable WHERE DestCityName > 'Christiansted, VI' OR Carrier >= 'FL' AND OriginCityName >= 'Duluth, MN' GROUP BY OriginAirportSeqID, ArrDelayMinutes  ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 20"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups >= 3 OR DivArrDelay NOT IN (1280, 252, 647, 71, 166) OR NASDelay IN (133, 35, 63, -9999, 12) LIMIT 16"}
 {"sql":"SELECT ArrDelayMinutes, Cancelled, ArrivalDelayGroups, COUNT(DepTimeBlk), SUM(TaxiOut) FROM mytable WHERE DaysSinceEpoch BETWEEN 16077 AND 16072 AND Dest < 'GGG' AND TailNum BETWEEN 'N467UA' AND 'N440UA' GROUP BY ArrDelayMinutes, Cancelled, ArrivalDelayGroups  ORDER BY ArrDelayMinutes, Cancelled, ArrivalDelayGroups LIMIT 10","hsqls":["SELECT ArrDelayMinutes, Cancelled, ArrivalDelayGroups, COUNT(DepTimeBlk), SUM(TaxiOut) FROM mytable WHERE DaysSinceEpoch BETWEEN 16077 AND 16072 AND Dest < 'GGG' AND TailNum BETWEEN 'N467UA' AND 'N440UA' GROUP BY ArrDelayMinutes, Cancelled, ArrivalDelayGroups  ORDER BY ArrDelayMinutes, Cancelled, ArrivalDelayGroups LIMIT 10"]}
 {"sql":"SELECT MIN(WeatherDelay) FROM mytable WHERE DestCityMarketID BETWEEN 32441 AND 34685 OR SecurityDelay NOT IN (1, 10, 4, 18) LIMIT 9"}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivDistance BETWEEN 50 AND 539 OR DestCityMarketID BETWEEN 31905 AND 33424 AND ArrDel15 BETWEEN 0 AND -9999 ORDER BY TaxiIn LIMIT 1","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DivDistance BETWEEN 50 AND 539 OR DestCityMarketID BETWEEN 31905 AND 33424 AND ArrDel15 BETWEEN 0 AND -9999 ORDER BY TaxiIn LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, ArrTime, OriginStateName, MAX(DepDel15), COUNT(Cancelled) FROM mytable WHERE DivArrDelay BETWEEN 171 AND 762 AND DivTotalGTimes < 56 AND CRSArrTime = 931 GROUP BY FirstDepTime, ArrTime, OriginStateName LIMIT 10","hsqls":["SELECT FirstDepTime, ArrTime, OriginStateName, MAX(DepDel15), COUNT(Cancelled) FROM mytable WHERE DivArrDelay BETWEEN 171 AND 762 AND (DivTotalGTimes__MV0 < 56 OR DivTotalGTimes__MV1 < 56 OR DivTotalGTimes__MV2 < 56 OR DivTotalGTimes__MV3 < 56 OR DivTotalGTimes__MV4 < 56) AND CRSArrTime = 931 GROUP BY FirstDepTime, ArrTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivDistance BETWEEN 50 AND 539 OR DestCityMarketID BETWEEN 31905 AND 33424 AND ArrDel15 BETWEEN 0 AND -9999 ORDER BY TaxiIn LIMIT 1","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE DivDistance BETWEEN 50 AND 539 OR DestCityMarketID BETWEEN 31905 AND 33424 AND ArrDel15 BETWEEN 0 AND -9999 ORDER BY TaxiIn LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, ArrTime, OriginStateName, MAX(DepDel15), COUNT(Cancelled) FROM mytable WHERE DivArrDelay BETWEEN 171 AND 762 AND DivTotalGTimes < 56 AND CRSArrTime = 931 GROUP BY FirstDepTime, ArrTime, OriginStateName LIMIT 10","hsqls":["SELECT FirstDepTime, ArrTime, OriginStateName, MAX(DepDel15), COUNT(Cancelled) FROM mytable WHERE DivArrDelay BETWEEN 171 AND 762 AND (DivTotalGTimes[1] < 56 OR DivTotalGTimes[2] < 56 OR DivTotalGTimes[3] < 56 OR DivTotalGTimes[4] < 56 OR DivTotalGTimes[5] < 56) AND CRSArrTime = 931 GROUP BY FirstDepTime, ArrTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT AirTime FROM mytable ORDER BY UniqueCarrier LIMIT 24"}
-{"sql":"SELECT Distance, ArrDelayMinutes, ArrivalDelayGroups, MAX(ArrDel15), SUM(DivDistance) FROM mytable WHERE DivWheelsOns IN (1807, 1728, 2247, 1131, 1344) AND DestAirportID > 14679 OR DestState NOT IN ('ID') GROUP BY Distance, ArrDelayMinutes, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT Distance, ArrDelayMinutes, ArrivalDelayGroups, MAX(ArrDel15), SUM(DivDistance) FROM mytable WHERE (DivWheelsOns__MV0 IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns__MV1 IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns__MV2 IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns__MV3 IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns__MV4 IN (1807, 1728, 2247, 1131, 1344)) AND DestAirportID > 14679 OR DestState NOT IN ('ID') GROUP BY Distance, ArrDelayMinutes, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT Distance, ArrDelayMinutes, ArrivalDelayGroups, MAX(ArrDel15), SUM(DivDistance) FROM mytable WHERE DivWheelsOns IN (1807, 1728, 2247, 1131, 1344) AND DestAirportID > 14679 OR DestState NOT IN ('ID') GROUP BY Distance, ArrDelayMinutes, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT Distance, ArrDelayMinutes, ArrivalDelayGroups, MAX(ArrDel15), SUM(DivDistance) FROM mytable WHERE (DivWheelsOns[1] IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns[2] IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns[3] IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns[4] IN (1807, 1728, 2247, 1131, 1344) OR DivWheelsOns[5] IN (1807, 1728, 2247, 1131, 1344)) AND DestAirportID > 14679 OR DestState NOT IN ('ID') GROUP BY Distance, ArrDelayMinutes, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DestCityMarketID, AVG(OriginWac) FROM mytable WHERE DestStateName IN ('Pennsylvania', 'Ohio', 'North Carolina', 'Nebraska', 'Oregon') OR OriginState IN ('DE', 'AK', 'HI') GROUP BY WeatherDelay, DestCityMarketID  ORDER BY WeatherDelay, DestCityMarketID LIMIT 26","hsqls":["SELECT WeatherDelay, DestCityMarketID, AVG(OriginWac) FROM mytable WHERE DestStateName IN ('Pennsylvania', 'Ohio', 'North Carolina', 'Nebraska', 'Oregon') OR OriginState IN ('DE', 'AK', 'HI') GROUP BY WeatherDelay, DestCityMarketID  ORDER BY WeatherDelay, DestCityMarketID LIMIT 26"]}
 {"sql":"SELECT OriginAirportSeqID, DestState, Dest, AVG(OriginWac), COUNT(DivAirportLandings) FROM mytable GROUP BY OriginAirportSeqID, DestState, Dest  ORDER BY OriginAirportSeqID, DestState, Dest LIMIT 26","hsqls":["SELECT OriginAirportSeqID, DestState, Dest, AVG(OriginWac), COUNT(DivAirportLandings) FROM mytable GROUP BY OriginAirportSeqID, DestState, Dest  ORDER BY OriginAirportSeqID, DestState, Dest LIMIT 26"]}
-{"sql":"SELECT SecurityDelay FROM mytable WHERE DivWheelsOns IN (1409) ORDER BY Distance, ArrTimeBlk, DaysSinceEpoch LIMIT 17","hsqls":["SELECT SecurityDelay FROM mytable WHERE (DivWheelsOns__MV0 IN (1409) OR DivWheelsOns__MV1 IN (1409) OR DivWheelsOns__MV2 IN (1409) OR DivWheelsOns__MV3 IN (1409) OR DivWheelsOns__MV4 IN (1409)) ORDER BY Distance, ArrTimeBlk, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DivWheelsOffs FROM mytable ORDER BY DepTime, TailNum, DayofMonth LIMIT 8","hsqls":["SELECT DepDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY DepTime, TailNum, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay FROM mytable WHERE DivWheelsOns IN (1409) ORDER BY Distance, ArrTimeBlk, DaysSinceEpoch LIMIT 17","hsqls":["SELECT SecurityDelay FROM mytable WHERE (DivWheelsOns[1] IN (1409) OR DivWheelsOns[2] IN (1409) OR DivWheelsOns[3] IN (1409) OR DivWheelsOns[4] IN (1409) OR DivWheelsOns[5] IN (1409)) ORDER BY Distance, ArrTimeBlk, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivWheelsOffs FROM mytable ORDER BY DepTime, TailNum, DayofMonth LIMIT 8","hsqls":["SELECT DepDelay, DivWheelsOffs FROM mytable ORDER BY DepTime, TailNum, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT MAX(ArrDel15), COUNT(DivActualElapsedTime) FROM mytable LIMIT 9"}
 {"sql":"SELECT LateAircraftDelay, DepDelayMinutes, SUM(CarrierDelay), MIN(DepDelayMinutes), AVG(DepDel15) FROM mytable WHERE OriginCityMarketID <= 30779 AND WheelsOff BETWEEN 1134 AND 1019 OR DestState > 'WA' GROUP BY LateAircraftDelay, DepDelayMinutes  ORDER BY LateAircraftDelay, DepDelayMinutes LIMIT 5","hsqls":["SELECT LateAircraftDelay, DepDelayMinutes, SUM(CarrierDelay), MIN(DepDelayMinutes), AVG(DepDel15) FROM mytable WHERE OriginCityMarketID <= 30779 AND WheelsOff BETWEEN 1134 AND 1019 OR DestState > 'WA' GROUP BY LateAircraftDelay, DepDelayMinutes  ORDER BY LateAircraftDelay, DepDelayMinutes LIMIT 5"]}
 {"sql":"SELECT ActualElapsedTime, TaxiIn, Dest FROM mytable WHERE OriginWac BETWEEN 93 AND 62 ORDER BY FirstDepTime, OriginCityMarketID, DayOfWeek LIMIT 19"}
 {"sql":"SELECT MAX(CRSDepTime) FROM mytable WHERE DestCityMarketID IN (30141, 31135) OR AirTime NOT IN (357, 196) OR LateAircraftDelay > 23 LIMIT 13"}
 {"sql":"SELECT DepDel15, UniqueCarrier FROM mytable WHERE DestState < 'ND' AND Carrier BETWEEN 'WN' AND 'F9' LIMIT 14"}
 {"sql":"SELECT AVG(ArrDelay) FROM mytable LIMIT 19"}
-{"sql":"SELECT Dest FROM mytable WHERE DivTailNums >= 'N8315C' ORDER BY WeatherDelay","hsqls":["SELECT Dest FROM mytable WHERE (DivTailNums__MV0 >= 'N8315C' OR DivTailNums__MV1 >= 'N8315C' OR DivTailNums__MV2 >= 'N8315C' OR DivTailNums__MV3 >= 'N8315C' OR DivTailNums__MV4 >= 'N8315C') ORDER BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT Dest FROM mytable WHERE DivTailNums >= 'N8315C' ORDER BY WeatherDelay","hsqls":["SELECT Dest FROM mytable WHERE (DivTailNums[1] >= 'N8315C' OR DivTailNums[2] >= 'N8315C' OR DivTailNums[3] >= 'N8315C' OR DivTailNums[4] >= 'N8315C' OR DivTailNums[5] >= 'N8315C') ORDER BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, CRSDepTime, MAX(OriginAirportID), COUNT(DestCityMarketID) FROM mytable WHERE TaxiIn NOT IN (79, 7, 9, 101) GROUP BY DayofMonth, CRSDepTime  ORDER BY DayofMonth, CRSDepTime LIMIT 2","hsqls":["SELECT DayofMonth, CRSDepTime, MAX(OriginAirportID), COUNT(DestCityMarketID) FROM mytable WHERE TaxiIn NOT IN (79, 7, 9, 101) GROUP BY DayofMonth, CRSDepTime  ORDER BY DayofMonth, CRSDepTime LIMIT 2"]}
-{"sql":"SELECT DepDelayMinutes, WheelsOn FROM mytable WHERE CancellationCode <= 'A' OR \"Year\" NOT IN (2014) AND TaxiIn BETWEEN 50 AND 29 ORDER BY DayOfWeek LIMIT 17","hsqls":["SELECT DepDelayMinutes, WheelsOn FROM mytable WHERE CancellationCode <= 'A' OR Year NOT IN (2014) AND TaxiIn BETWEEN 50 AND 29 ORDER BY DayOfWeek LIMIT 17"]}
+{"sql":"SELECT DepDelayMinutes, WheelsOn FROM mytable WHERE CancellationCode <= 'A' OR \"Year\" NOT IN (2014) AND TaxiIn BETWEEN 50 AND 29 ORDER BY DayOfWeek LIMIT 17","hsqls":["SELECT DepDelayMinutes, WheelsOn FROM mytable WHERE CancellationCode <= 'A' OR `Year` NOT IN (2014) AND TaxiIn BETWEEN 50 AND 29 ORDER BY DayOfWeek LIMIT 17"]}
 {"sql":"SELECT CRSElapsedTime, OriginAirportID, COUNT(*) FROM mytable WHERE ActualElapsedTime <= 336 OR CRSDepTime = 1747 AND OriginCityName BETWEEN 'Mammoth Lakes, CA' AND 'Phoenix, AZ' GROUP BY CRSElapsedTime, OriginAirportID  ORDER BY CRSElapsedTime, OriginAirportID LIMIT 4","hsqls":["SELECT CRSElapsedTime, OriginAirportID, COUNT(*) FROM mytable WHERE ActualElapsedTime <= 336 OR CRSDepTime = 1747 AND OriginCityName BETWEEN 'Mammoth Lakes, CA' AND 'Phoenix, AZ' GROUP BY CRSElapsedTime, OriginAirportID  ORDER BY CRSElapsedTime, OriginAirportID LIMIT 4"]}
 {"sql":"SELECT ArrDelayMinutes, Origin, DestCityMarketID FROM mytable WHERE ArrTime BETWEEN 1810 AND 122 LIMIT 11"}
 {"sql":"SELECT TaxiIn, TailNum FROM mytable WHERE Distance IN (765, 1303, 3365, 2173) AND DivArrDelay NOT IN (170, 132, 753, 274, 76) ORDER BY DepDelay, TailNum, DaysSinceEpoch LIMIT 2"}
@@ -3041,38 +3041,38 @@
 {"sql":"SELECT OriginStateFips, WheelsOn FROM mytable LIMIT 14"}
 {"sql":"SELECT DistanceGroup, CRSArrTime, OriginWac FROM mytable WHERE Diverted BETWEEN 1 AND 1 ORDER BY OriginCityMarketID LIMIT 22"}
 {"sql":"SELECT OriginCityName FROM mytable ORDER BY ArrDel15 LIMIT 3"}
-{"sql":"SELECT FlightNum, Dest, SUM(\"Month\") FROM mytable GROUP BY FlightNum, Dest LIMIT 18","hsqls":["SELECT FlightNum, Dest, SUM(Month) FROM mytable GROUP BY FlightNum, Dest LIMIT 18"]}
+{"sql":"SELECT FlightNum, Dest, SUM(\"Month\") FROM mytable GROUP BY FlightNum, Dest LIMIT 18","hsqls":["SELECT FlightNum, Dest, SUM(`Month`) FROM mytable GROUP BY FlightNum, Dest LIMIT 18"]}
 {"sql":"SELECT SUM(WheelsOff), SUM(CRSArrTime), SUM(DestStateFips) FROM mytable LIMIT 11"}
 {"sql":"SELECT DestState, WeatherDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DayOfWeek >= 4 OR Carrier BETWEEN 'F9' AND 'WN' ORDER BY FlightNum, OriginCityName, ArrTime LIMIT 28"}
-{"sql":"SELECT ArrDelayMinutes, SUM(Flights) FROM mytable WHERE DivTotalGTimes IN (20, 70, 13, 84, 38) OR CRSArrTime NOT IN (1708, 1043, 918, 1839, 1604) OR OriginAirportID BETWEEN 12016 AND 11537 GROUP BY ArrDelayMinutes LIMIT 24","hsqls":["SELECT ArrDelayMinutes, SUM(Flights) FROM mytable WHERE (DivTotalGTimes__MV0 IN (20, 70, 13, 84, 38) OR DivTotalGTimes__MV1 IN (20, 70, 13, 84, 38) OR DivTotalGTimes__MV2 IN (20, 70, 13, 84, 38) OR DivTotalGTimes__MV3 IN (20, 70, 13, 84, 38) OR DivTotalGTimes__MV4 IN (20, 70, 13, 84, 38)) OR CRSArrTime NOT IN (1708, 1043, 918, 1839, 1604) OR OriginAirportID BETWEEN 12016 AND 11537 GROUP BY ArrDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT DepTime FROM mytable WHERE DivAirports IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR NASDelay IN (21, 7, 100) AND ArrivalDelayGroups IN (3, 9) ORDER BY CRSArrTime LIMIT 4","hsqls":["SELECT DepTime FROM mytable WHERE (DivAirports__MV0 IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports__MV1 IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports__MV2 IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports__MV3 IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports__MV4 IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL')) OR NASDelay IN (21, 7, 100) AND ArrivalDelayGroups IN (3, 9) ORDER BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, SUM(Flights) FROM mytable WHERE DivTotalGTimes IN (20, 70, 13, 84, 38) OR CRSArrTime NOT IN (1708, 1043, 918, 1839, 1604) OR OriginAirportID BETWEEN 12016 AND 11537 GROUP BY ArrDelayMinutes LIMIT 24","hsqls":["SELECT ArrDelayMinutes, SUM(Flights) FROM mytable WHERE (DivTotalGTimes[1] IN (20, 70, 13, 84, 38) OR DivTotalGTimes[2] IN (20, 70, 13, 84, 38) OR DivTotalGTimes[3] IN (20, 70, 13, 84, 38) OR DivTotalGTimes[4] IN (20, 70, 13, 84, 38) OR DivTotalGTimes[5] IN (20, 70, 13, 84, 38)) OR CRSArrTime NOT IN (1708, 1043, 918, 1839, 1604) OR OriginAirportID BETWEEN 12016 AND 11537 GROUP BY ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepTime FROM mytable WHERE DivAirports IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR NASDelay IN (21, 7, 100) AND ArrivalDelayGroups IN (3, 9) ORDER BY CRSArrTime LIMIT 4","hsqls":["SELECT DepTime FROM mytable WHERE (DivAirports[1] IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports[2] IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports[3] IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports[4] IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL') OR DivAirports[5] IN ('JAN', 'SJC', 'AEX', 'PUB', 'TUL')) OR NASDelay IN (21, 7, 100) AND ArrivalDelayGroups IN (3, 9) ORDER BY CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, LongestAddGTime, Cancelled, MIN(OriginCityMarketID) FROM mytable WHERE OriginAirportID <> 13204 OR DepTimeBlk >= '0600-0659' GROUP BY DivReachedDest, LongestAddGTime, Cancelled  ORDER BY DivReachedDest, LongestAddGTime, Cancelled LIMIT 10","hsqls":["SELECT DivReachedDest, LongestAddGTime, Cancelled, MIN(OriginCityMarketID) FROM mytable WHERE OriginAirportID <> 13204 OR DepTimeBlk >= '0600-0659' GROUP BY DivReachedDest, LongestAddGTime, Cancelled  ORDER BY DivReachedDest, LongestAddGTime, Cancelled LIMIT 10"]}
 {"sql":"SELECT LateAircraftDelay, WeatherDelay, ArrTime, COUNT(*) FROM mytable WHERE ArrDelay = 307.0 GROUP BY LateAircraftDelay, WeatherDelay, ArrTime  ORDER BY LateAircraftDelay, WeatherDelay, ArrTime LIMIT 24","hsqls":["SELECT LateAircraftDelay, WeatherDelay, ArrTime, COUNT(*) FROM mytable WHERE ArrDelay = 307.0 GROUP BY LateAircraftDelay, WeatherDelay, ArrTime  ORDER BY LateAircraftDelay, WeatherDelay, ArrTime LIMIT 24"]}
 {"sql":"SELECT DivArrDelay, MIN(FlightNum) FROM mytable WHERE CarrierDelay IN (49, 67, 463, 70, 81) GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 2","hsqls":["SELECT DivArrDelay, MIN(FlightNum) FROM mytable WHERE CarrierDelay IN (49, 67, 463, 70, 81) GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 2"]}
 {"sql":"SELECT ArrDelayMinutes, AVG(WeatherDelay), MIN(DepartureDelayGroups) FROM mytable WHERE Origin IN ('HOU', 'CRW') AND DestWac = 61 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21","hsqls":["SELECT ArrDelayMinutes, AVG(WeatherDelay), MIN(DepartureDelayGroups) FROM mytable WHERE Origin IN ('HOU', 'CRW') AND DestWac = 61 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE OriginCityName IN ('Green Bay, WI') OR Diverted BETWEEN 0 AND 0 OR WheelsOn > 2334 LIMIT 16","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE OriginCityName IN ('Green Bay, WI') OR Diverted BETWEEN 0 AND 0 OR WheelsOn > 2334 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE OriginCityName IN ('Green Bay, WI') OR Diverted BETWEEN 0 AND 0 OR WheelsOn > 2334 LIMIT 16","hsqls":["SELECT DivWheelsOns FROM mytable WHERE OriginCityName IN ('Green Bay, WI') OR Diverted BETWEEN 0 AND 0 OR WheelsOn > 2334 LIMIT 10000"]}
 {"sql":"SELECT AirlineID, SUM(DistanceGroup), MIN(DestAirportSeqID) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 21","hsqls":["SELECT AirlineID, SUM(DistanceGroup), MIN(DestAirportSeqID) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 21"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE AirlineID = 21171 AND SecurityDelay BETWEEN 18 AND 18 AND OriginStateFips NOT IN (55, 15, 54, 26, 29) LIMIT 22"}
 {"sql":"SELECT DivDistance, TaxiIn, COUNT(DepTime) FROM mytable WHERE DepTime = 1045 GROUP BY DivDistance, TaxiIn  ORDER BY DivDistance, TaxiIn LIMIT 12","hsqls":["SELECT DivDistance, TaxiIn, COUNT(DepTime) FROM mytable WHERE DepTime = 1045 GROUP BY DivDistance, TaxiIn  ORDER BY DivDistance, TaxiIn LIMIT 12"]}
-{"sql":"SELECT LateAircraftDelay FROM mytable WHERE TaxiIn NOT IN (79, 96, 44, 75, 50) OR \"Year\" IN (2014) LIMIT 21","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE TaxiIn NOT IN (79, 96, 44, 75, 50) OR Year IN (2014) LIMIT 21"]}
+{"sql":"SELECT LateAircraftDelay FROM mytable WHERE TaxiIn NOT IN (79, 96, 44, 75, 50) OR \"Year\" IN (2014) LIMIT 21","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE TaxiIn NOT IN (79, 96, 44, 75, 50) OR `Year` IN (2014) LIMIT 21"]}
 {"sql":"SELECT MAX(OriginAirportID), COUNT(WheelsOff), COUNT(TailNum) FROM mytable LIMIT 12"}
-{"sql":"SELECT FirstDepTime, OriginStateFips, SUM(DistanceGroup) FROM mytable WHERE DestCityName NOT IN ('Mobile, AL') OR DivTailNums < 'N183UW' AND DestCityName <= 'Milwaukee, WI' GROUP BY FirstDepTime, OriginStateFips LIMIT 26","hsqls":["SELECT FirstDepTime, OriginStateFips, SUM(DistanceGroup) FROM mytable WHERE DestCityName NOT IN ('Mobile, AL') OR (DivTailNums__MV0 < 'N183UW' OR DivTailNums__MV1 < 'N183UW' OR DivTailNums__MV2 < 'N183UW' OR DivTailNums__MV3 < 'N183UW' OR DivTailNums__MV4 < 'N183UW') AND DestCityName <= 'Milwaukee, WI' GROUP BY FirstDepTime, OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, OriginStateFips, SUM(DistanceGroup) FROM mytable WHERE DestCityName NOT IN ('Mobile, AL') OR DivTailNums < 'N183UW' AND DestCityName <= 'Milwaukee, WI' GROUP BY FirstDepTime, OriginStateFips LIMIT 26","hsqls":["SELECT FirstDepTime, OriginStateFips, SUM(DistanceGroup) FROM mytable WHERE DestCityName NOT IN ('Mobile, AL') OR (DivTailNums[1] < 'N183UW' OR DivTailNums[2] < 'N183UW' OR DivTailNums[3] < 'N183UW' OR DivTailNums[4] < 'N183UW' OR DivTailNums[5] < 'N183UW') AND DestCityName <= 'Milwaukee, WI' GROUP BY FirstDepTime, OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DivActualElapsedTime FROM mytable WHERE TaxiIn = 4 ORDER BY OriginState, OriginCityName LIMIT 22"}
-{"sql":"SELECT DestStateName FROM mytable WHERE OriginAirportID BETWEEN 11996 AND 14576 OR \"Month\" NOT IN (1) OR DivReachedDest BETWEEN -9999 AND -9999 LIMIT 2","hsqls":["SELECT DestStateName FROM mytable WHERE OriginAirportID BETWEEN 11996 AND 14576 OR Month NOT IN (1) OR DivReachedDest BETWEEN -9999 AND -9999 LIMIT 2"]}
-{"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1257 AND 325 AND DestState IN ('LA', 'MS') AND \"Month\" BETWEEN 1 AND 1 LIMIT 6","hsqls":["SELECT COUNT(CRSElapsedTime) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV1 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV2 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV3 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV4 BETWEEN 1257 AND 325) AND DestState IN ('LA', 'MS') AND Month BETWEEN 1 AND 1 LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DepDelayMinutes, MIN(DepDelayMinutes), SUM(DivDistance) FROM mytable WHERE \"Month\" IN (1) AND DaysSinceEpoch > 16093 AND Distance BETWEEN 1379 AND 1585 GROUP BY \"Year\", DepDelayMinutes LIMIT 11","hsqls":["SELECT Year, DepDelayMinutes, MIN(DepDelayMinutes), SUM(DivDistance) FROM mytable WHERE Month IN (1) AND DaysSinceEpoch > 16093 AND Distance BETWEEN 1379 AND 1585 GROUP BY Year, DepDelayMinutes LIMIT 11"]}
-{"sql":"SELECT DivTailNums, CRSDepTime FROM mytable WHERE DepartureDelayGroups IN (6) ORDER BY DepDelay, TailNum LIMIT 20","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, CRSDepTime FROM mytable WHERE DepartureDelayGroups IN (6) ORDER BY DepDelay, TailNum LIMIT 10000"]}
+{"sql":"SELECT DestStateName FROM mytable WHERE OriginAirportID BETWEEN 11996 AND 14576 OR \"Month\" NOT IN (1) OR DivReachedDest BETWEEN -9999 AND -9999 LIMIT 2","hsqls":["SELECT DestStateName FROM mytable WHERE OriginAirportID BETWEEN 11996 AND 14576 OR `Month` NOT IN (1) OR DivReachedDest BETWEEN -9999 AND -9999 LIMIT 2"]}
+{"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1257 AND 325 AND DestState IN ('LA', 'MS') AND \"Month\" BETWEEN 1 AND 1 LIMIT 6","hsqls":["SELECT COUNT(CRSElapsedTime) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1257 AND 325 OR DivWheelsOffs[2] BETWEEN 1257 AND 325 OR DivWheelsOffs[3] BETWEEN 1257 AND 325 OR DivWheelsOffs[4] BETWEEN 1257 AND 325 OR DivWheelsOffs[5] BETWEEN 1257 AND 325) AND DestState IN ('LA', 'MS') AND `Month` BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DepDelayMinutes, MIN(DepDelayMinutes), SUM(DivDistance) FROM mytable WHERE \"Month\" IN (1) AND DaysSinceEpoch > 16093 AND Distance BETWEEN 1379 AND 1585 GROUP BY \"Year\", DepDelayMinutes LIMIT 11","hsqls":["SELECT Year, DepDelayMinutes, MIN(DepDelayMinutes), SUM(DivDistance) FROM mytable WHERE `Month` IN (1) AND DaysSinceEpoch > 16093 AND Distance BETWEEN 1379 AND 1585 GROUP BY Year, DepDelayMinutes LIMIT 11"]}
+{"sql":"SELECT DivTailNums, CRSDepTime FROM mytable WHERE DepartureDelayGroups IN (6) ORDER BY DepDelay, TailNum LIMIT 20","hsqls":["SELECT DivTailNums, CRSDepTime FROM mytable WHERE DepartureDelayGroups IN (6) ORDER BY DepDelay, TailNum LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, OriginWac FROM mytable ORDER BY CarrierDelay LIMIT 9"}
 {"sql":"SELECT COUNT(TailNum) FROM mytable WHERE ArrDelay IN (90.0) AND DayofMonth >= 24 OR ArrivalDelayGroups <> 9 LIMIT 7"}
 {"sql":"SELECT MIN(OriginAirportSeqID) FROM mytable WHERE TaxiOut IN (112, 23, 37) LIMIT 10"}
-{"sql":"SELECT DepTime, OriginStateName, MAX(ArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY DepTime, OriginStateName LIMIT 28","hsqls":["SELECT DepTime, OriginStateName, MAX(ArrTime) FROM mytable WHERE Year BETWEEN 2014 AND 2014 GROUP BY DepTime, OriginStateName LIMIT 28"]}
+{"sql":"SELECT DepTime, OriginStateName, MAX(ArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY DepTime, OriginStateName LIMIT 28","hsqls":["SELECT DepTime, OriginStateName, MAX(ArrTime) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 GROUP BY DepTime, OriginStateName LIMIT 28"]}
 {"sql":"SELECT Diverted FROM mytable WHERE DayOfWeek >= 2 AND Distance BETWEEN 1488 AND 1107 ORDER BY Distance LIMIT 3"}
-{"sql":"SELECT WheelsOff, DivWheelsOns, ArrTimeBlk FROM mytable WHERE OriginAirportID <= 13796 ORDER BY DepartureDelayGroups, DepDel15 LIMIT 26","hsqls":["SELECT WheelsOff, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ArrTimeBlk FROM mytable WHERE OriginAirportID <= 13796 ORDER BY DepartureDelayGroups, DepDel15 LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, DivAirportLandings FROM mytable WHERE DestAirportID NOT IN (10739, 11884, 10930, 10728) OR DivTailNums BETWEEN 'N14168' AND 'N684DA' OR DestWac IN (5, 84) ORDER BY TaxiOut, OriginStateFips LIMIT 15","hsqls":["SELECT OriginCityMarketID, DivAirportLandings FROM mytable WHERE DestAirportID NOT IN (10739, 11884, 10930, 10728) OR (DivTailNums__MV0 BETWEEN 'N14168' AND 'N684DA' OR DivTailNums__MV1 BETWEEN 'N14168' AND 'N684DA' OR DivTailNums__MV2 BETWEEN 'N14168' AND 'N684DA' OR DivTailNums__MV3 BETWEEN 'N14168' AND 'N684DA' OR DivTailNums__MV4 BETWEEN 'N14168' AND 'N684DA') OR DestWac IN (5, 84) ORDER BY TaxiOut, OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivWheelsOns, ArrTimeBlk FROM mytable WHERE OriginAirportID <= 13796 ORDER BY DepartureDelayGroups, DepDel15 LIMIT 26","hsqls":["SELECT WheelsOff, DivWheelsOns, ArrTimeBlk FROM mytable WHERE OriginAirportID <= 13796 ORDER BY DepartureDelayGroups, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivAirportLandings FROM mytable WHERE DestAirportID NOT IN (10739, 11884, 10930, 10728) OR DivTailNums BETWEEN 'N14168' AND 'N684DA' OR DestWac IN (5, 84) ORDER BY TaxiOut, OriginStateFips LIMIT 15","hsqls":["SELECT OriginCityMarketID, DivAirportLandings FROM mytable WHERE DestAirportID NOT IN (10739, 11884, 10930, 10728) OR (DivTailNums[1] BETWEEN 'N14168' AND 'N684DA' OR DivTailNums[2] BETWEEN 'N14168' AND 'N684DA' OR DivTailNums[3] BETWEEN 'N14168' AND 'N684DA' OR DivTailNums[4] BETWEEN 'N14168' AND 'N684DA' OR DivTailNums[5] BETWEEN 'N14168' AND 'N684DA') OR DestWac IN (5, 84) ORDER BY TaxiOut, OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, CRSElapsedTime FROM mytable ORDER BY DestWac, TailNum LIMIT 27"}
 {"sql":"SELECT AVG(ArrDel15), COUNT(OriginWac) FROM mytable WHERE DaysSinceEpoch BETWEEN 16100 AND 16080 OR ActualElapsedTime NOT IN (47, 83) AND CRSArrTime < 553 LIMIT 17"}
 {"sql":"SELECT DestWac FROM mytable WHERE CancellationCode = 'B' OR DestCityName BETWEEN 'International Falls, MN' AND 'Fayetteville, NC' ORDER BY OriginStateFips, OriginCityMarketID, DestAirportSeqID LIMIT 24"}
-{"sql":"SELECT DivAirports, ArrivalDelayGroups FROM mytable WHERE ArrTime NOT IN (1653, 2220, 1545) ORDER BY DivActualElapsedTime LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrivalDelayGroups FROM mytable WHERE ArrTime NOT IN (1653, 2220, 1545) ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ArrivalDelayGroups FROM mytable WHERE ArrTime NOT IN (1653, 2220, 1545) ORDER BY DivActualElapsedTime LIMIT 24","hsqls":["SELECT DivAirports, ArrivalDelayGroups FROM mytable WHERE ArrTime NOT IN (1653, 2220, 1545) ORDER BY DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT AirTime FROM mytable WHERE DestState BETWEEN 'NE' AND 'IL' AND Diverted BETWEEN 1 AND 1 OR DaysSinceEpoch IN (16088, 16086) ORDER BY WeatherDelay LIMIT 23"}
 {"sql":"SELECT OriginCityMarketID, Distance, DestCityName, MAX(FirstDepTime) FROM mytable WHERE DestAirportID BETWEEN 10155 AND 11049 AND TaxiOut <= 3 GROUP BY OriginCityMarketID, Distance, DestCityName  ORDER BY OriginCityMarketID, Distance, DestCityName LIMIT 27","hsqls":["SELECT OriginCityMarketID, Distance, DestCityName, MAX(FirstDepTime) FROM mytable WHERE DestAirportID BETWEEN 10155 AND 11049 AND TaxiOut <= 3 GROUP BY OriginCityMarketID, Distance, DestCityName  ORDER BY OriginCityMarketID, Distance, DestCityName LIMIT 27"]}
 {"sql":"SELECT OriginCityMarketID, CRSArrTime, Cancelled, AVG(Diverted), AVG(ArrivalDelayGroups) FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 AND DivDistance IN (190, 602) GROUP BY OriginCityMarketID, CRSArrTime, Cancelled  ORDER BY OriginCityMarketID, CRSArrTime, Cancelled LIMIT 22","hsqls":["SELECT OriginCityMarketID, CRSArrTime, Cancelled, AVG(Diverted), AVG(ArrivalDelayGroups) FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 AND DivDistance IN (190, 602) GROUP BY OriginCityMarketID, CRSArrTime, Cancelled  ORDER BY OriginCityMarketID, CRSArrTime, Cancelled LIMIT 22"]}
@@ -3083,7 +3083,7 @@
 {"sql":"SELECT Diverted, Carrier, DepTime, COUNT(*) FROM mytable GROUP BY Diverted, Carrier, DepTime  ORDER BY Diverted, Carrier, DepTime LIMIT 15","hsqls":["SELECT Diverted, Carrier, DepTime, COUNT(*) FROM mytable GROUP BY Diverted, Carrier, DepTime  ORDER BY Diverted, Carrier, DepTime LIMIT 15"]}
 {"sql":"SELECT DivReachedDest, CancellationCode, DivArrDelay, COUNT(*) FROM mytable WHERE Quarter NOT IN (1) GROUP BY DivReachedDest, CancellationCode, DivArrDelay  ORDER BY DivReachedDest, CancellationCode, DivArrDelay LIMIT 7","hsqls":["SELECT DivReachedDest, CancellationCode, DivArrDelay, COUNT(*) FROM mytable WHERE Quarter NOT IN (1) GROUP BY DivReachedDest, CancellationCode, DivArrDelay  ORDER BY DivReachedDest, CancellationCode, DivArrDelay LIMIT 7"]}
 {"sql":"SELECT MIN(TotalAddGTime), COUNT(ArrDel15) FROM mytable LIMIT 12"}
-{"sql":"SELECT MIN(DepDelayMinutes), MIN(OriginCityMarketID) FROM mytable WHERE DivWheelsOffs BETWEEN 849 AND 1758 OR OriginCityMarketID NOT IN (33044) OR DivDistance = 861 LIMIT 26","hsqls":["SELECT MIN(DepDelayMinutes), MIN(OriginCityMarketID)  FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 849 AND 1758 OR DivWheelsOffs__MV1 BETWEEN 849 AND 1758 OR DivWheelsOffs__MV2 BETWEEN 849 AND 1758 OR DivWheelsOffs__MV3 BETWEEN 849 AND 1758 OR DivWheelsOffs__MV4 BETWEEN 849 AND 1758) OR OriginCityMarketID NOT IN (33044) OR DivDistance = 861 LIMIT 10000"]}
+{"sql":"SELECT MIN(DepDelayMinutes), MIN(OriginCityMarketID) FROM mytable WHERE DivWheelsOffs BETWEEN 849 AND 1758 OR OriginCityMarketID NOT IN (33044) OR DivDistance = 861 LIMIT 26","hsqls":["SELECT MIN(DepDelayMinutes), MIN(OriginCityMarketID)  FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 849 AND 1758 OR DivWheelsOffs[2] BETWEEN 849 AND 1758 OR DivWheelsOffs[3] BETWEEN 849 AND 1758 OR DivWheelsOffs[4] BETWEEN 849 AND 1758 OR DivWheelsOffs[5] BETWEEN 849 AND 1758) OR OriginCityMarketID NOT IN (33044) OR DivDistance = 861 LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DepTimeBlk, AirlineID FROM mytable WHERE DepTime >= 2314 OR AirTime < 242 ORDER BY OriginAirportSeqID, AirTime, DivActualElapsedTime LIMIT 25"}
 {"sql":"SELECT Diverted, FlightDate, DayOfWeek FROM mytable WHERE DivActualElapsedTime >= 102 LIMIT 28"}
 {"sql":"SELECT Quarter, ArrDelay, OriginStateName, SUM(DepDelayMinutes), AVG(DepDelay) FROM mytable WHERE ArrDel15 = 0 GROUP BY Quarter, ArrDelay, OriginStateName  ORDER BY Quarter, ArrDelay, OriginStateName LIMIT 5","hsqls":["SELECT Quarter, ArrDelay, OriginStateName, SUM(DepDelayMinutes), AVG(DepDelay) FROM mytable WHERE ArrDel15 = 0 GROUP BY Quarter, ArrDelay, OriginStateName  ORDER BY Quarter, ArrDelay, OriginStateName LIMIT 5"]}
@@ -3092,9 +3092,9 @@
 {"sql":"SELECT DestAirportID, MIN(CRSArrTime) FROM mytable WHERE DepTime IN (2256, 1222, 918, 1720, 1358) OR Carrier NOT IN ('B6', 'UA', 'VX') GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 23","hsqls":["SELECT DestAirportID, MIN(CRSArrTime) FROM mytable WHERE DepTime IN (2256, 1222, 918, 1720, 1358) OR Carrier NOT IN ('B6', 'UA', 'VX') GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 23"]}
 {"sql":"SELECT DepDel15, Origin FROM mytable WHERE ArrDelayMinutes BETWEEN 138.0 AND 315.0 AND Dest BETWEEN 'MKE' AND 'STX' ORDER BY Quarter LIMIT 9"}
 {"sql":"SELECT ArrTimeBlk, CancellationCode, OriginStateName FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 0 ORDER BY ArrDelayMinutes, DaysSinceEpoch LIMIT 10"}
-{"sql":"SELECT OriginStateFips, DepTime FROM mytable WHERE LateAircraftDelay BETWEEN 2 AND 108 OR ArrDelay NOT IN (50.0, 117.0) OR DivWheelsOffs IN (955, 1919, 2010, 1126) ORDER BY OriginStateFips LIMIT 22","hsqls":["SELECT OriginStateFips, DepTime FROM mytable WHERE LateAircraftDelay BETWEEN 2 AND 108 OR ArrDelay NOT IN (50.0, 117.0) OR (DivWheelsOffs__MV0 IN (955, 1919, 2010, 1126) OR DivWheelsOffs__MV1 IN (955, 1919, 2010, 1126) OR DivWheelsOffs__MV2 IN (955, 1919, 2010, 1126) OR DivWheelsOffs__MV3 IN (955, 1919, 2010, 1126) OR DivWheelsOffs__MV4 IN (955, 1919, 2010, 1126)) ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DepTime FROM mytable WHERE LateAircraftDelay BETWEEN 2 AND 108 OR ArrDelay NOT IN (50.0, 117.0) OR DivWheelsOffs IN (955, 1919, 2010, 1126) ORDER BY OriginStateFips LIMIT 22","hsqls":["SELECT OriginStateFips, DepTime FROM mytable WHERE LateAircraftDelay BETWEEN 2 AND 108 OR ArrDelay NOT IN (50.0, 117.0) OR (DivWheelsOffs[1] IN (955, 1919, 2010, 1126) OR DivWheelsOffs[2] IN (955, 1919, 2010, 1126) OR DivWheelsOffs[3] IN (955, 1919, 2010, 1126) OR DivWheelsOffs[4] IN (955, 1919, 2010, 1126) OR DivWheelsOffs[5] IN (955, 1919, 2010, 1126)) ORDER BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT Flights, AirlineID FROM mytable WHERE DestWac NOT IN (1, 91, 83, 86) AND DestWac IN (43) ORDER BY DivDistance, DepTime, ArrTime LIMIT 21"}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE Distance <> 1157 ORDER BY DepDelay, Carrier, DivAirportLandings LIMIT 11","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Distance <> 1157 ORDER BY DepDelay, Carrier, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE Distance <> 1157 ORDER BY DepDelay, Carrier, DivAirportLandings LIMIT 11","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE Distance <> 1157 ORDER BY DepDelay, Carrier, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE WeatherDelay >= 138 ORDER BY OriginStateFips, ArrDelayMinutes, DestAirportID LIMIT 7"}
 {"sql":"SELECT SUM(NASDelay) FROM mytable LIMIT 15"}
 {"sql":"SELECT SecurityDelay, COUNT(CRSDepTime), MAX(DayofMonth) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 15","hsqls":["SELECT SecurityDelay, COUNT(CRSDepTime), MAX(DayofMonth) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 15"]}
@@ -3105,9 +3105,9 @@
 {"sql":"SELECT DepDelayMinutes, ArrDelayMinutes, ArrDelay, COUNT(*) FROM mytable WHERE DivDistance NOT IN (204) AND DestAirportID BETWEEN 14869 AND 11503 GROUP BY DepDelayMinutes, ArrDelayMinutes, ArrDelay  ORDER BY DepDelayMinutes, ArrDelayMinutes, ArrDelay LIMIT 10","hsqls":["SELECT DepDelayMinutes, ArrDelayMinutes, ArrDelay, COUNT(*) FROM mytable WHERE DivDistance NOT IN (204) AND DestAirportID BETWEEN 14869 AND 11503 GROUP BY DepDelayMinutes, ArrDelayMinutes, ArrDelay  ORDER BY DepDelayMinutes, ArrDelayMinutes, ArrDelay LIMIT 10"]}
 {"sql":"SELECT Origin, CRSDepTime, COUNT(OriginAirportID), AVG(SecurityDelay), MAX(CRSElapsedTime) FROM mytable WHERE DestCityName NOT IN ('Huntsville, AL', 'Grand Junction, CO', 'Tampa, FL', 'New York, NY', 'St. George, UT') GROUP BY Origin, CRSDepTime  ORDER BY Origin, CRSDepTime LIMIT 27","hsqls":["SELECT Origin, CRSDepTime, COUNT(OriginAirportID), AVG(SecurityDelay), MAX(CRSElapsedTime) FROM mytable WHERE DestCityName NOT IN ('Huntsville, AL', 'Grand Junction, CO', 'Tampa, FL', 'New York, NY', 'St. George, UT') GROUP BY Origin, CRSDepTime  ORDER BY Origin, CRSDepTime LIMIT 27"]}
 {"sql":"SELECT TaxiOut, DayofMonth, COUNT(*) FROM mytable WHERE OriginCityMarketID < 30141 AND AirlineID BETWEEN 20398 AND 20437 GROUP BY TaxiOut, DayofMonth  ORDER BY TaxiOut, DayofMonth LIMIT 29","hsqls":["SELECT TaxiOut, DayofMonth, COUNT(*) FROM mytable WHERE OriginCityMarketID < 30141 AND AirlineID BETWEEN 20398 AND 20437 GROUP BY TaxiOut, DayofMonth  ORDER BY TaxiOut, DayofMonth LIMIT 29"]}
-{"sql":"SELECT LongestAddGTime, NASDelay, DivTailNums FROM mytable WHERE Origin NOT IN ('EYW', 'ACV', 'APN') LIMIT 29","hsqls":["SELECT LongestAddGTime, NASDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Origin NOT IN ('EYW', 'ACV', 'APN') LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, NASDelay, DivTailNums FROM mytable WHERE Origin NOT IN ('EYW', 'ACV', 'APN') LIMIT 29","hsqls":["SELECT LongestAddGTime, NASDelay, DivTailNums FROM mytable WHERE Origin NOT IN ('EYW', 'ACV', 'APN') LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable WHERE DepDelay >= -14.0 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 11","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable WHERE DepDelay >= -14.0 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 11"]}
-{"sql":"SELECT TaxiOut, CarrierDelay, Origin FROM mytable WHERE CRSDepTime BETWEEN 922 AND 752 OR \"Month\" BETWEEN 1 AND 1 ORDER BY DayofMonth, DivArrDelay LIMIT 12","hsqls":["SELECT TaxiOut, CarrierDelay, Origin FROM mytable WHERE CRSDepTime BETWEEN 922 AND 752 OR Month BETWEEN 1 AND 1 ORDER BY DayofMonth, DivArrDelay LIMIT 12"]}
+{"sql":"SELECT TaxiOut, CarrierDelay, Origin FROM mytable WHERE CRSDepTime BETWEEN 922 AND 752 OR \"Month\" BETWEEN 1 AND 1 ORDER BY DayofMonth, DivArrDelay LIMIT 12","hsqls":["SELECT TaxiOut, CarrierDelay, Origin FROM mytable WHERE CRSDepTime BETWEEN 922 AND 752 OR `Month` BETWEEN 1 AND 1 ORDER BY DayofMonth, DivArrDelay LIMIT 12"]}
 {"sql":"SELECT DivDistance, ArrDelayMinutes FROM mytable WHERE DestAirportSeqID <= 1584102 OR ArrDel15 IN (1, 0, -9999) AND Diverted NOT IN (1, 0) ORDER BY AirTime LIMIT 14"}
 {"sql":"SELECT DestCityMarketID, SUM(DivDistance) FROM mytable WHERE WheelsOff BETWEEN 735 AND 921 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 4","hsqls":["SELECT DestCityMarketID, SUM(DivDistance) FROM mytable WHERE WheelsOff BETWEEN 735 AND 921 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 4"]}
 {"sql":"SELECT DivReachedDest, DayofMonth, AVG(DepDelay), SUM(DaysSinceEpoch), AVG(CRSArrTime) FROM mytable GROUP BY DivReachedDest, DayofMonth  ORDER BY DivReachedDest, DayofMonth LIMIT 19","hsqls":["SELECT DivReachedDest, DayofMonth, AVG(DepDelay), SUM(DaysSinceEpoch), AVG(CRSArrTime) FROM mytable GROUP BY DivReachedDest, DayofMonth  ORDER BY DivReachedDest, DayofMonth LIMIT 19"]}
@@ -3115,78 +3115,78 @@
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID, DestCityMarketID, COUNT(*) FROM mytable WHERE DestAirportID < 10631 GROUP BY OriginAirportSeqID, DestAirportSeqID, DestCityMarketID  ORDER BY OriginAirportSeqID, DestAirportSeqID, DestCityMarketID LIMIT 7","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID, DestCityMarketID, COUNT(*) FROM mytable WHERE DestAirportID < 10631 GROUP BY OriginAirportSeqID, DestAirportSeqID, DestCityMarketID  ORDER BY OriginAirportSeqID, DestAirportSeqID, DestCityMarketID LIMIT 7"]}
 {"sql":"SELECT DestWac, LongestAddGTime, DivAirportLandings FROM mytable WHERE Diverted IN (0) LIMIT 20"}
 {"sql":"SELECT AVG(LongestAddGTime), AVG(TaxiOut), MIN(TotalAddGTime) FROM mytable WHERE DepartureDelayGroups >= -9999 LIMIT 1"}
-{"sql":"SELECT OriginWac, DayofMonth, \"Month\" FROM mytable WHERE DayOfWeek BETWEEN 2 AND 3 ORDER BY OriginState LIMIT 25","hsqls":["SELECT OriginWac, DayofMonth, Month FROM mytable WHERE DayOfWeek BETWEEN 2 AND 3 ORDER BY OriginState LIMIT 25"]}
+{"sql":"SELECT OriginWac, DayofMonth, \"Month\" FROM mytable WHERE DayOfWeek BETWEEN 2 AND 3 ORDER BY OriginState LIMIT 25","hsqls":["SELECT OriginWac, DayofMonth, `Month` FROM mytable WHERE DayOfWeek BETWEEN 2 AND 3 ORDER BY OriginState LIMIT 25"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 21"}
-{"sql":"SELECT DestStateName, DepTimeBlk, AVG(ArrDelay), SUM(DaysSinceEpoch), COUNT(DepTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND OriginStateFips BETWEEN 44 AND 55 GROUP BY DestStateName, DepTimeBlk LIMIT 14","hsqls":["SELECT DestStateName, DepTimeBlk, AVG(ArrDelay), SUM(DaysSinceEpoch), COUNT(DepTime) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND OriginStateFips BETWEEN 44 AND 55 GROUP BY DestStateName, DepTimeBlk LIMIT 14"]}
+{"sql":"SELECT DestStateName, DepTimeBlk, AVG(ArrDelay), SUM(DaysSinceEpoch), COUNT(DepTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND OriginStateFips BETWEEN 44 AND 55 GROUP BY DestStateName, DepTimeBlk LIMIT 14","hsqls":["SELECT DestStateName, DepTimeBlk, AVG(ArrDelay), SUM(DaysSinceEpoch), COUNT(DepTime) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND OriginStateFips BETWEEN 44 AND 55 GROUP BY DestStateName, DepTimeBlk LIMIT 14"]}
 {"sql":"SELECT LateAircraftDelay, WeatherDelay FROM mytable WHERE LongestAddGTime > 2 ORDER BY FlightDate LIMIT 25"}
 {"sql":"SELECT WheelsOn FROM mytable WHERE DivReachedDest IN (0, -9999) OR ArrDelayMinutes <> 61.0 LIMIT 16"}
 {"sql":"SELECT FlightDate, TotalAddGTime, DepTime FROM mytable WHERE ArrDelayMinutes NOT IN (132.0, 159.0) AND DepTimeBlk BETWEEN '1800-1859' AND '0600-0659' AND OriginStateName <= 'New Hampshire' ORDER BY DivArrDelay"}
 {"sql":"SELECT DepDel15, AirlineID, MIN(WeatherDelay), AVG(TaxiIn), SUM(ArrTime) FROM mytable WHERE OriginWac >= 83 OR DaysSinceEpoch < 16093 GROUP BY DepDel15, AirlineID  ORDER BY DepDel15, AirlineID LIMIT 27","hsqls":["SELECT DepDel15, AirlineID, MIN(WeatherDelay), AVG(TaxiIn), SUM(ArrTime) FROM mytable WHERE OriginWac >= 83 OR DaysSinceEpoch < 16093 GROUP BY DepDel15, AirlineID  ORDER BY DepDel15, AirlineID LIMIT 27"]}
 {"sql":"SELECT LongestAddGTime, Cancelled, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 3 AND 56 GROUP BY LongestAddGTime, Cancelled  ORDER BY LongestAddGTime, Cancelled LIMIT 7","hsqls":["SELECT LongestAddGTime, Cancelled, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 3 AND 56 GROUP BY LongestAddGTime, Cancelled  ORDER BY LongestAddGTime, Cancelled LIMIT 7"]}
-{"sql":"SELECT DestCityMarketID FROM mytable WHERE CarrierDelay BETWEEN 123 AND 123 OR DivTailNums BETWEEN 'N8621A' AND 'N952WN' AND DivWheelsOns IN (1119, 1841, 2038, 1402, 1118) ORDER BY DayofMonth LIMIT 28","hsqls":["SELECT DestCityMarketID FROM mytable WHERE CarrierDelay BETWEEN 123 AND 123 OR (DivTailNums__MV0 BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums__MV1 BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums__MV2 BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums__MV3 BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums__MV4 BETWEEN 'N8621A' AND 'N952WN') AND (DivWheelsOns__MV0 IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns__MV1 IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns__MV2 IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns__MV3 IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns__MV4 IN (1119, 1841, 2038, 1402, 1118)) ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID FROM mytable WHERE CarrierDelay BETWEEN 123 AND 123 OR DivTailNums BETWEEN 'N8621A' AND 'N952WN' AND DivWheelsOns IN (1119, 1841, 2038, 1402, 1118) ORDER BY DayofMonth LIMIT 28","hsqls":["SELECT DestCityMarketID FROM mytable WHERE CarrierDelay BETWEEN 123 AND 123 OR (DivTailNums[1] BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums[2] BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums[3] BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums[4] BETWEEN 'N8621A' AND 'N952WN' OR DivTailNums[5] BETWEEN 'N8621A' AND 'N952WN') AND (DivWheelsOns[1] IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns[2] IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns[3] IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns[4] IN (1119, 1841, 2038, 1402, 1118) OR DivWheelsOns[5] IN (1119, 1841, 2038, 1402, 1118)) ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT MIN(WheelsOn), MIN(ActualElapsedTime), AVG(OriginAirportID) FROM mytable LIMIT 1"}
 {"sql":"SELECT DestAirportSeqID, Origin, DepTimeBlk, AVG(NASDelay), MIN(DivReachedDest) FROM mytable WHERE FirstDepTime BETWEEN 908 AND 1301 OR FlightDate BETWEEN '2014-01-20' AND '2014-01-16' OR WeatherDelay IN (3, 35, 52, 27, 271) GROUP BY DestAirportSeqID, Origin, DepTimeBlk  ORDER BY DestAirportSeqID, Origin, DepTimeBlk LIMIT 4","hsqls":["SELECT DestAirportSeqID, Origin, DepTimeBlk, AVG(NASDelay), MIN(DivReachedDest) FROM mytable WHERE FirstDepTime BETWEEN 908 AND 1301 OR FlightDate BETWEEN '2014-01-20' AND '2014-01-16' OR WeatherDelay IN (3, 35, 52, 27, 271) GROUP BY DestAirportSeqID, Origin, DepTimeBlk  ORDER BY DestAirportSeqID, Origin, DepTimeBlk LIMIT 4"]}
 {"sql":"SELECT SUM(Diverted), MAX(DivReachedDest) FROM mytable WHERE DestState BETWEEN 'AZ' AND 'GA' OR TailNum IN ('N341NB') OR Dest <> 'RNO' LIMIT 21"}
 {"sql":"SELECT Diverted, CarrierDelay, OriginWac, AVG(FlightNum), COUNT(Diverted), MIN(CarrierDelay) FROM mytable GROUP BY Diverted, CarrierDelay, OriginWac  ORDER BY Diverted, CarrierDelay, OriginWac LIMIT 26","hsqls":["SELECT Diverted, CarrierDelay, OriginWac, AVG(FlightNum), COUNT(Diverted), MIN(CarrierDelay) FROM mytable GROUP BY Diverted, CarrierDelay, OriginWac  ORDER BY Diverted, CarrierDelay, OriginWac LIMIT 26"]}
 {"sql":"SELECT CRSDepTime, MIN(DivActualElapsedTime), MIN(Quarter) FROM mytable WHERE OriginCityMarketID BETWEEN 34986 AND 32945 OR DestStateFips NOT IN (20, 19, 40, 13, 27) GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 2","hsqls":["SELECT CRSDepTime, MIN(DivActualElapsedTime), MIN(Quarter) FROM mytable WHERE OriginCityMarketID BETWEEN 34986 AND 32945 OR DestStateFips NOT IN (20, 19, 40, 13, 27) GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 2"]}
 {"sql":"SELECT OriginStateFips, LateAircraftDelay, Origin, MIN(DepDelayMinutes), SUM(ArrDelay), MAX(OriginAirportID) FROM mytable WHERE DestState IN ('VI', 'WA', 'AZ', 'NJ') AND ArrDelayMinutes = 78.0 GROUP BY OriginStateFips, LateAircraftDelay, Origin  ORDER BY OriginStateFips, LateAircraftDelay, Origin LIMIT 10","hsqls":["SELECT OriginStateFips, LateAircraftDelay, Origin, MIN(DepDelayMinutes), SUM(ArrDelay), MAX(OriginAirportID) FROM mytable WHERE DestState IN ('VI', 'WA', 'AZ', 'NJ') AND ArrDelayMinutes = 78.0 GROUP BY OriginStateFips, LateAircraftDelay, Origin  ORDER BY OriginStateFips, LateAircraftDelay, Origin LIMIT 10"]}
-{"sql":"SELECT OriginStateFips, LongestAddGTime, Distance FROM mytable WHERE DayofMonth >= 6 OR DestStateFips > 28 ORDER BY \"Year\" LIMIT 13","hsqls":["SELECT OriginStateFips, LongestAddGTime, Distance FROM mytable WHERE DayofMonth >= 6 OR DestStateFips > 28 ORDER BY Year LIMIT 13"]}
+{"sql":"SELECT OriginStateFips, LongestAddGTime, Distance FROM mytable WHERE DayofMonth >= 6 OR DestStateFips > 28 ORDER BY \"Year\" LIMIT 13","hsqls":["SELECT OriginStateFips, LongestAddGTime, Distance FROM mytable WHERE DayofMonth >= 6 OR DestStateFips > 28 ORDER BY `Year` LIMIT 13"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE DepDelay = 23.0 AND CRSDepTime >= 619 AND CRSDepTime BETWEEN 1955 AND 1448 ORDER BY Diverted, Cancelled LIMIT 26"}
 {"sql":"SELECT TailNum FROM mytable WHERE Origin BETWEEN 'RAP' AND 'SGF' ORDER BY OriginCityMarketID LIMIT 11"}
 {"sql":"SELECT Quarter, SUM(CarrierDelay), MAX(DivReachedDest) FROM mytable WHERE AirlineID = 19977 AND DayofMonth NOT IN (22, 23, 26, 14, 11) AND CRSElapsedTime BETWEEN 252 AND 87 GROUP BY Quarter  ORDER BY Quarter LIMIT 18","hsqls":["SELECT Quarter, SUM(CarrierDelay), MAX(DivReachedDest) FROM mytable WHERE AirlineID = 19977 AND DayofMonth NOT IN (22, 23, 26, 14, 11) AND CRSElapsedTime BETWEEN 252 AND 87 GROUP BY Quarter  ORDER BY Quarter LIMIT 18"]}
-{"sql":"SELECT SUM(\"Year\"), MAX(DayofMonth), AVG(CRSArrTime) FROM mytable WHERE WheelsOff > 1737 AND DivTotalGTimes IN (30, 113, 102, 37) LIMIT 10","hsqls":["SELECT SUM(Year), MAX(DayofMonth), AVG(CRSArrTime)  FROM mytable WHERE WheelsOff > 1737 AND (DivTotalGTimes__MV0 IN (30, 113, 102, 37) OR DivTotalGTimes__MV1 IN (30, 113, 102, 37) OR DivTotalGTimes__MV2 IN (30, 113, 102, 37) OR DivTotalGTimes__MV3 IN (30, 113, 102, 37) OR DivTotalGTimes__MV4 IN (30, 113, 102, 37)) LIMIT 10000"]}
+{"sql":"SELECT SUM(\"Year\"), MAX(DayofMonth), AVG(CRSArrTime) FROM mytable WHERE WheelsOff > 1737 AND DivTotalGTimes IN (30, 113, 102, 37) LIMIT 10","hsqls":["SELECT SUM(`Year`), MAX(DayofMonth), AVG(CRSArrTime)  FROM mytable WHERE WheelsOff > 1737 AND (DivTotalGTimes[1] IN (30, 113, 102, 37) OR DivTotalGTimes[2] IN (30, 113, 102, 37) OR DivTotalGTimes[3] IN (30, 113, 102, 37) OR DivTotalGTimes[4] IN (30, 113, 102, 37) OR DivTotalGTimes[5] IN (30, 113, 102, 37)) LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, CRSElapsedTime, DaysSinceEpoch, SUM(CRSElapsedTime) FROM mytable WHERE Cancelled <= 1 OR ArrDelay NOT IN (245.0, 193.0, 450.0) AND Distance > 1156 GROUP BY OriginCityMarketID, CRSElapsedTime, DaysSinceEpoch  ORDER BY OriginCityMarketID, CRSElapsedTime, DaysSinceEpoch LIMIT 26","hsqls":["SELECT OriginCityMarketID, CRSElapsedTime, DaysSinceEpoch, SUM(CRSElapsedTime) FROM mytable WHERE Cancelled <= 1 OR ArrDelay NOT IN (245.0, 193.0, 450.0) AND Distance > 1156 GROUP BY OriginCityMarketID, CRSElapsedTime, DaysSinceEpoch  ORDER BY OriginCityMarketID, CRSElapsedTime, DaysSinceEpoch LIMIT 26"]}
 {"sql":"SELECT WheelsOff, TaxiIn, WheelsOn, AVG(CRSDepTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND 3 OR DestAirportID IN (14252, 13422) OR Flights IN (1) GROUP BY WheelsOff, TaxiIn, WheelsOn","hsqls":["SELECT WheelsOff, TaxiIn, WheelsOn, AVG(CRSDepTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND 3 OR DestAirportID IN (14252, 13422) OR Flights IN (1) GROUP BY WheelsOff, TaxiIn, WheelsOn"]}
 {"sql":"SELECT Dest, DestCityMarketID, COUNT(*) FROM mytable WHERE Quarter NOT IN (1) GROUP BY Dest, DestCityMarketID  ORDER BY Dest, DestCityMarketID LIMIT 29","hsqls":["SELECT Dest, DestCityMarketID, COUNT(*) FROM mytable WHERE Quarter NOT IN (1) GROUP BY Dest, DestCityMarketID  ORDER BY Dest, DestCityMarketID LIMIT 29"]}
-{"sql":"SELECT DivWheelsOns, DestCityName, AirTime FROM mytable WHERE WeatherDelay NOT IN (6, 54, 973, 86, 237) AND TaxiIn = 113 ORDER BY CRSArrTime, DepDel15 LIMIT 17","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestCityName, AirTime FROM mytable WHERE WeatherDelay NOT IN (6, 54, 973, 86, 237) AND TaxiIn = 113 ORDER BY CRSArrTime, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DestCityName, AirTime FROM mytable WHERE WeatherDelay NOT IN (6, 54, 973, 86, 237) AND TaxiIn = 113 ORDER BY CRSArrTime, DepDel15 LIMIT 17","hsqls":["SELECT DivWheelsOns, DestCityName, AirTime FROM mytable WHERE WeatherDelay NOT IN (6, 54, 973, 86, 237) AND TaxiIn = 113 ORDER BY CRSArrTime, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT DestState, COUNT(Cancelled) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 13","hsqls":["SELECT DestState, COUNT(Cancelled) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 13"]}
 {"sql":"SELECT Carrier, ArrDelay FROM mytable ORDER BY DivDistance, LongestAddGTime, UniqueCarrier LIMIT 22"}
-{"sql":"SELECT DivAirports, Distance FROM mytable ORDER BY UniqueCarrier, CRSElapsedTime, OriginStateName LIMIT 13","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Distance FROM mytable ORDER BY UniqueCarrier, CRSElapsedTime, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, OriginCityName, \"Month\", AVG(DivReachedDest), MIN(ArrDelay) FROM mytable WHERE DepDel15 >= 0 GROUP BY WheelsOff, OriginCityName, \"Month\" LIMIT 27","hsqls":["SELECT WheelsOff, OriginCityName, Month, AVG(DivReachedDest), MIN(ArrDelay) FROM mytable WHERE DepDel15 >= 0 GROUP BY WheelsOff, OriginCityName, Month LIMIT 27"]}
-{"sql":"SELECT NASDelay, DestCityName, DestStateName FROM mytable WHERE DestWac NOT IN (5, 4, 52, 72, 74) ORDER BY Dest, \"Month\" LIMIT 4","hsqls":["SELECT NASDelay, DestCityName, DestStateName FROM mytable WHERE DestWac NOT IN (5, 4, 52, 72, 74) ORDER BY Dest, Month LIMIT 4"]}
-{"sql":"SELECT Flights, MAX(OriginCityMarketID), COUNT(OriginAirportID) FROM mytable WHERE DivTailNums IN ('N12126') GROUP BY Flights LIMIT 16","hsqls":["SELECT Flights, MAX(OriginCityMarketID), COUNT(OriginAirportID) FROM mytable WHERE (DivTailNums__MV0 IN ('N12126') OR DivTailNums__MV1 IN ('N12126') OR DivTailNums__MV2 IN ('N12126') OR DivTailNums__MV3 IN ('N12126') OR DivTailNums__MV4 IN ('N12126')) GROUP BY Flights LIMIT 10000"]}
+{"sql":"SELECT DivAirports, Distance FROM mytable ORDER BY UniqueCarrier, CRSElapsedTime, OriginStateName LIMIT 13","hsqls":["SELECT DivAirports, Distance FROM mytable ORDER BY UniqueCarrier, CRSElapsedTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, OriginCityName, \"Month\", AVG(DivReachedDest), MIN(ArrDelay) FROM mytable WHERE DepDel15 >= 0 GROUP BY WheelsOff, OriginCityName, \"Month\" LIMIT 27","hsqls":["SELECT WheelsOff, OriginCityName, Month, AVG(DivReachedDest), MIN(ArrDelay) FROM mytable WHERE DepDel15 >= 0 GROUP BY WheelsOff, OriginCityName, `Month` LIMIT 27"]}
+{"sql":"SELECT NASDelay, DestCityName, DestStateName FROM mytable WHERE DestWac NOT IN (5, 4, 52, 72, 74) ORDER BY Dest, \"Month\" LIMIT 4","hsqls":["SELECT NASDelay, DestCityName, DestStateName FROM mytable WHERE DestWac NOT IN (5, 4, 52, 72, 74) ORDER BY Dest, `Month` LIMIT 4"]}
+{"sql":"SELECT Flights, MAX(OriginCityMarketID), COUNT(OriginAirportID) FROM mytable WHERE DivTailNums IN ('N12126') GROUP BY Flights LIMIT 16","hsqls":["SELECT Flights, MAX(OriginCityMarketID), COUNT(OriginAirportID) FROM mytable WHERE (DivTailNums[1] IN ('N12126') OR DivTailNums[2] IN ('N12126') OR DivTailNums[3] IN ('N12126') OR DivTailNums[4] IN ('N12126') OR DivTailNums[5] IN ('N12126')) GROUP BY Flights LIMIT 10000"]}
 {"sql":"SELECT WheelsOn, DaysSinceEpoch FROM mytable WHERE DestWac < 52 OR ArrDel15 > -9999 ORDER BY Carrier, Origin LIMIT 29"}
 {"sql":"SELECT TaxiOut, OriginAirportSeqID, OriginAirportID, SUM(NASDelay), MIN(ActualElapsedTime) FROM mytable GROUP BY TaxiOut, OriginAirportSeqID, OriginAirportID  ORDER BY TaxiOut, OriginAirportSeqID, OriginAirportID LIMIT 1","hsqls":["SELECT TaxiOut, OriginAirportSeqID, OriginAirportID, SUM(NASDelay), MIN(ActualElapsedTime) FROM mytable GROUP BY TaxiOut, OriginAirportSeqID, OriginAirportID  ORDER BY TaxiOut, OriginAirportSeqID, OriginAirportID LIMIT 1"]}
 {"sql":"SELECT SUM(AirlineID) FROM mytable WHERE DayOfWeek BETWEEN 5 AND 7 OR LateAircraftDelay NOT IN (102, 118) OR DistanceGroup BETWEEN 10 AND 6 LIMIT 1"}
-{"sql":"SELECT OriginAirportSeqID, TaxiIn FROM mytable WHERE DivWheelsOns IN (1139, 2039) AND FlightDate >= '2014-01-01' ORDER BY DivArrDelay LIMIT 18","hsqls":["SELECT OriginAirportSeqID, TaxiIn FROM mytable WHERE (DivWheelsOns__MV0 IN (1139, 2039) OR DivWheelsOns__MV1 IN (1139, 2039) OR DivWheelsOns__MV2 IN (1139, 2039) OR DivWheelsOns__MV3 IN (1139, 2039) OR DivWheelsOns__MV4 IN (1139, 2039)) AND FlightDate >= '2014-01-01' ORDER BY DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, TaxiIn FROM mytable WHERE DivWheelsOns IN (1139, 2039) AND FlightDate >= '2014-01-01' ORDER BY DivArrDelay LIMIT 18","hsqls":["SELECT OriginAirportSeqID, TaxiIn FROM mytable WHERE (DivWheelsOns[1] IN (1139, 2039) OR DivWheelsOns[2] IN (1139, 2039) OR DivWheelsOns[3] IN (1139, 2039) OR DivWheelsOns[4] IN (1139, 2039) OR DivWheelsOns[5] IN (1139, 2039)) AND FlightDate >= '2014-01-01' ORDER BY DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16071 AND 16081 GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 22","hsqls":["SELECT DestStateFips, COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16071 AND 16081 GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 22"]}
 {"sql":"SELECT WheelsOff, TotalAddGTime, SUM(OriginAirportSeqID), MAX(DestWac) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' OR DayofMonth < 21 OR DivArrDelay BETWEEN 231 AND 1651 GROUP BY WheelsOff, TotalAddGTime  ORDER BY WheelsOff, TotalAddGTime LIMIT 27","hsqls":["SELECT WheelsOff, TotalAddGTime, SUM(OriginAirportSeqID), MAX(DestWac) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' OR DayofMonth < 21 OR DivArrDelay BETWEEN 231 AND 1651 GROUP BY WheelsOff, TotalAddGTime  ORDER BY WheelsOff, TotalAddGTime LIMIT 27"]}
 {"sql":"SELECT DayofMonth, COUNT(DivArrDelay), SUM(DestAirportSeqID) FROM mytable WHERE DivArrDelay BETWEEN 126 AND 187 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 29","hsqls":["SELECT DayofMonth, COUNT(DivArrDelay), SUM(DestAirportSeqID) FROM mytable WHERE DivArrDelay BETWEEN 126 AND 187 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 29"]}
-{"sql":"SELECT LateAircraftDelay, DivActualElapsedTime, AVG(DivReachedDest), MAX(ArrivalDelayGroups), AVG(WheelsOn) FROM mytable WHERE DivWheelsOffs BETWEEN 2329 AND 2010 AND ArrivalDelayGroups IN (-1) GROUP BY LateAircraftDelay, DivActualElapsedTime LIMIT 14","hsqls":["SELECT LateAircraftDelay, DivActualElapsedTime, AVG(DivReachedDest), MAX(ArrivalDelayGroups), AVG(WheelsOn) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2329 AND 2010 OR DivWheelsOffs__MV1 BETWEEN 2329 AND 2010 OR DivWheelsOffs__MV2 BETWEEN 2329 AND 2010 OR DivWheelsOffs__MV3 BETWEEN 2329 AND 2010 OR DivWheelsOffs__MV4 BETWEEN 2329 AND 2010) AND ArrivalDelayGroups IN (-1) GROUP BY LateAircraftDelay, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, ActualElapsedTime, CRSElapsedTime FROM mytable WHERE UniqueCarrier BETWEEN 'UA' AND 'MQ' AND DepTime <= 1344 AND DivLongestGTimes IN (49.0) ORDER BY WheelsOff, DistanceGroup, ArrDel15 LIMIT 10","hsqls":["SELECT FirstDepTime, ActualElapsedTime, CRSElapsedTime FROM mytable WHERE UniqueCarrier BETWEEN 'UA' AND 'MQ' AND DepTime <= 1344 AND (DivLongestGTimes__MV0 IN (49.0) OR DivLongestGTimes__MV1 IN (49.0) OR DivLongestGTimes__MV2 IN (49.0) OR DivLongestGTimes__MV3 IN (49.0) OR DivLongestGTimes__MV4 IN (49.0)) ORDER BY WheelsOff, DistanceGroup, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT OriginState, \"Month\" FROM mytable ORDER BY Distance, TotalAddGTime, ArrTime LIMIT 14","hsqls":["SELECT OriginState, Month FROM mytable ORDER BY Distance, TotalAddGTime, ArrTime LIMIT 14"]}
+{"sql":"SELECT LateAircraftDelay, DivActualElapsedTime, AVG(DivReachedDest), MAX(ArrivalDelayGroups), AVG(WheelsOn) FROM mytable WHERE DivWheelsOffs BETWEEN 2329 AND 2010 AND ArrivalDelayGroups IN (-1) GROUP BY LateAircraftDelay, DivActualElapsedTime LIMIT 14","hsqls":["SELECT LateAircraftDelay, DivActualElapsedTime, AVG(DivReachedDest), MAX(ArrivalDelayGroups), AVG(WheelsOn) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2329 AND 2010 OR DivWheelsOffs[2] BETWEEN 2329 AND 2010 OR DivWheelsOffs[3] BETWEEN 2329 AND 2010 OR DivWheelsOffs[4] BETWEEN 2329 AND 2010 OR DivWheelsOffs[5] BETWEEN 2329 AND 2010) AND ArrivalDelayGroups IN (-1) GROUP BY LateAircraftDelay, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, ActualElapsedTime, CRSElapsedTime FROM mytable WHERE UniqueCarrier BETWEEN 'UA' AND 'MQ' AND DepTime <= 1344 AND DivLongestGTimes IN (49.0) ORDER BY WheelsOff, DistanceGroup, ArrDel15 LIMIT 10","hsqls":["SELECT FirstDepTime, ActualElapsedTime, CRSElapsedTime FROM mytable WHERE UniqueCarrier BETWEEN 'UA' AND 'MQ' AND DepTime <= 1344 AND (DivLongestGTimes[1] IN (49.0) OR DivLongestGTimes[2] IN (49.0) OR DivLongestGTimes[3] IN (49.0) OR DivLongestGTimes[4] IN (49.0) OR DivLongestGTimes[5] IN (49.0)) ORDER BY WheelsOff, DistanceGroup, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT OriginState, \"Month\" FROM mytable ORDER BY Distance, TotalAddGTime, ArrTime LIMIT 14","hsqls":["SELECT OriginState, `Month` FROM mytable ORDER BY Distance, TotalAddGTime, ArrTime LIMIT 14"]}
 {"sql":"SELECT MAX(ArrDel15), COUNT(DestWac), AVG(WheelsOn) FROM mytable LIMIT 16"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 2"}
 {"sql":"SELECT DivReachedDest, Carrier, AVG(OriginAirportSeqID), MIN(DivArrDelay), SUM(DivActualElapsedTime) FROM mytable GROUP BY DivReachedDest, Carrier  ORDER BY DivReachedDest, Carrier LIMIT 19","hsqls":["SELECT DivReachedDest, Carrier, AVG(OriginAirportSeqID), MIN(DivArrDelay), SUM(DivActualElapsedTime) FROM mytable GROUP BY DivReachedDest, Carrier  ORDER BY DivReachedDest, Carrier LIMIT 19"]}
 {"sql":"SELECT NASDelay, Origin, DayOfWeek FROM mytable WHERE FlightNum IN (1593, 1703, 2229, 5649) OR DestState <> 'GA' OR LongestAddGTime NOT IN (97, 42, 47, 40, 29) ORDER BY OriginAirportSeqID, DistanceGroup, FlightNum LIMIT 19"}
 {"sql":"SELECT Origin, DivActualElapsedTime FROM mytable WHERE WheelsOn IN (1339) ORDER BY OriginState, DivAirportLandings, UniqueCarrier LIMIT 14"}
-{"sql":"SELECT ArrDelayMinutes, DestCityName FROM mytable WHERE OriginWac NOT IN (21, 72) ORDER BY DivDistance, AirTime, \"Month\" LIMIT 7","hsqls":["SELECT ArrDelayMinutes, DestCityName FROM mytable WHERE OriginWac NOT IN (21, 72) ORDER BY DivDistance, AirTime, Month LIMIT 7"]}
+{"sql":"SELECT ArrDelayMinutes, DestCityName FROM mytable WHERE OriginWac NOT IN (21, 72) ORDER BY DivDistance, AirTime, \"Month\" LIMIT 7","hsqls":["SELECT ArrDelayMinutes, DestCityName FROM mytable WHERE OriginWac NOT IN (21, 72) ORDER BY DivDistance, AirTime, `Month` LIMIT 7"]}
 {"sql":"SELECT FlightDate, AirTime FROM mytable WHERE DepTime BETWEEN 1208 AND 903 AND DestCityName BETWEEN 'Barrow, AK' AND 'Grand Island, NE' OR Carrier = 'MQ' ORDER BY Diverted, CarrierDelay LIMIT 4"}
-{"sql":"SELECT DepDelay, DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND OriginWac IN (1, 92, 31, 64, 74) ORDER BY Diverted, ArrDelay, OriginAirportID LIMIT 20","hsqls":["SELECT DepDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivActualElapsedTime FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND OriginWac IN (1, 92, 31, 64, 74) ORDER BY Diverted, ArrDelay, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND OriginWac IN (1, 92, 31, 64, 74) ORDER BY Diverted, ArrDelay, OriginAirportID LIMIT 20","hsqls":["SELECT DepDelay, DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND OriginWac IN (1, 92, 31, 64, 74) ORDER BY Diverted, ArrDelay, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT AVG(FirstDepTime), MIN(FirstDepTime) FROM mytable LIMIT 10"}
 {"sql":"SELECT FlightNum FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'WN', 'HA', 'FL') ORDER BY Distance, WheelsOn LIMIT 18"}
 {"sql":"SELECT WheelsOff, AirTime, COUNT(*) FROM mytable WHERE DepDel15 IN (1, 0, -9999) GROUP BY WheelsOff, AirTime  ORDER BY WheelsOff, AirTime LIMIT 11","hsqls":["SELECT WheelsOff, AirTime, COUNT(*) FROM mytable WHERE DepDel15 IN (1, 0, -9999) GROUP BY WheelsOff, AirTime  ORDER BY WheelsOff, AirTime LIMIT 11"]}
 {"sql":"SELECT OriginState, OriginStateName FROM mytable WHERE FlightNum <= 1275 ORDER BY Diverted, ArrivalDelayGroups LIMIT 24"}
 {"sql":"SELECT Origin, CRSDepTime, ArrivalDelayGroups FROM mytable ORDER BY AirlineID LIMIT 14"}
-{"sql":"SELECT TaxiOut, ArrivalDelayGroups, DivTotalGTimes FROM mytable WHERE FlightNum <> 926 AND DivWheelsOffs IN (2053, 1549, 137, 2139) AND DistanceGroup >= 5 LIMIT 24","hsqls":["SELECT TaxiOut, ArrivalDelayGroups, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE FlightNum <> 926 AND (DivWheelsOffs__MV0 IN (2053, 1549, 137, 2139) OR DivWheelsOffs__MV1 IN (2053, 1549, 137, 2139) OR DivWheelsOffs__MV2 IN (2053, 1549, 137, 2139) OR DivWheelsOffs__MV3 IN (2053, 1549, 137, 2139) OR DivWheelsOffs__MV4 IN (2053, 1549, 137, 2139)) AND DistanceGroup >= 5 LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable ORDER BY ArrDel15 LIMIT 29","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, ArrivalDelayGroups, DivTotalGTimes FROM mytable WHERE FlightNum <> 926 AND DivWheelsOffs IN (2053, 1549, 137, 2139) AND DistanceGroup >= 5 LIMIT 24","hsqls":["SELECT TaxiOut, ArrivalDelayGroups, DivTotalGTimes FROM mytable WHERE FlightNum <> 926 AND (DivWheelsOffs[1] IN (2053, 1549, 137, 2139) OR DivWheelsOffs[2] IN (2053, 1549, 137, 2139) OR DivWheelsOffs[3] IN (2053, 1549, 137, 2139) OR DivWheelsOffs[4] IN (2053, 1549, 137, 2139) OR DivWheelsOffs[5] IN (2053, 1549, 137, 2139)) AND DistanceGroup >= 5 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable ORDER BY ArrDel15 LIMIT 29","hsqls":["SELECT DivLongestGTimes FROM mytable ORDER BY ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE DestAirportSeqID BETWEEN 1538902 AND 1072102 OR OriginAirportID BETWEEN 11337 AND 10994 LIMIT 11"}
-{"sql":"SELECT TaxiOut, DistanceGroup, ActualElapsedTime FROM mytable WHERE DivAirportIDs = 15070 AND DestCityName IN ('San Jose, CA', 'Twin Falls, ID', 'Fort Smith, AR', 'Fort Myers, FL', 'Columbia, SC') ORDER BY DestStateFips, Dest LIMIT 8","hsqls":["SELECT TaxiOut, DistanceGroup, ActualElapsedTime FROM mytable WHERE (DivAirportIDs__MV0 = 15070 OR DivAirportIDs__MV1 = 15070 OR DivAirportIDs__MV2 = 15070 OR DivAirportIDs__MV3 = 15070 OR DivAirportIDs__MV4 = 15070) AND DestCityName IN ('San Jose, CA', 'Twin Falls, ID', 'Fort Smith, AR', 'Fort Myers, FL', 'Columbia, SC') ORDER BY DestStateFips, Dest LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable ORDER BY DepartureDelayGroups, UniqueCarrier LIMIT 1","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY DepartureDelayGroups, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DistanceGroup, ActualElapsedTime FROM mytable WHERE DivAirportIDs = 15070 AND DestCityName IN ('San Jose, CA', 'Twin Falls, ID', 'Fort Smith, AR', 'Fort Myers, FL', 'Columbia, SC') ORDER BY DestStateFips, Dest LIMIT 8","hsqls":["SELECT TaxiOut, DistanceGroup, ActualElapsedTime FROM mytable WHERE (DivAirportIDs[1] = 15070 OR DivAirportIDs[2] = 15070 OR DivAirportIDs[3] = 15070 OR DivAirportIDs[4] = 15070 OR DivAirportIDs[5] = 15070) AND DestCityName IN ('San Jose, CA', 'Twin Falls, ID', 'Fort Smith, AR', 'Fort Myers, FL', 'Columbia, SC') ORDER BY DestStateFips, Dest LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable ORDER BY DepartureDelayGroups, UniqueCarrier LIMIT 1","hsqls":["SELECT DivAirports FROM mytable ORDER BY DepartureDelayGroups, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable ORDER BY OriginCityName, ArrTime, DestAirportID LIMIT 1"}
 {"sql":"SELECT OriginCityName, Dest, SUM(Flights), SUM(DistanceGroup) FROM mytable GROUP BY OriginCityName, Dest  ORDER BY OriginCityName, Dest LIMIT 27","hsqls":["SELECT OriginCityName, Dest, SUM(Flights), SUM(DistanceGroup) FROM mytable GROUP BY OriginCityName, Dest  ORDER BY OriginCityName, Dest LIMIT 27"]}
 {"sql":"SELECT Carrier, FlightDate, Origin FROM mytable WHERE OriginState BETWEEN 'MN' AND 'AK' AND CRSDepTime <> 1549 OR DepartureDelayGroups BETWEEN 1 AND -9999 LIMIT 16"}
-{"sql":"SELECT Quarter, MIN(LateAircraftDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 14.0 AND 34.0 OR ArrDelay NOT IN (-21.0, 245.0, 90.0, -28.0, 187.0) GROUP BY Quarter LIMIT 14","hsqls":["SELECT Quarter, MIN(LateAircraftDelay) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 14.0 AND 34.0 OR DivLongestGTimes__MV1 BETWEEN 14.0 AND 34.0 OR DivLongestGTimes__MV2 BETWEEN 14.0 AND 34.0 OR DivLongestGTimes__MV3 BETWEEN 14.0 AND 34.0 OR DivLongestGTimes__MV4 BETWEEN 14.0 AND 34.0) OR ArrDelay NOT IN (-21.0, 245.0, 90.0, -28.0, 187.0) GROUP BY Quarter LIMIT 10000"]}
+{"sql":"SELECT Quarter, MIN(LateAircraftDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 14.0 AND 34.0 OR ArrDelay NOT IN (-21.0, 245.0, 90.0, -28.0, 187.0) GROUP BY Quarter LIMIT 14","hsqls":["SELECT Quarter, MIN(LateAircraftDelay) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 14.0 AND 34.0 OR DivLongestGTimes[2] BETWEEN 14.0 AND 34.0 OR DivLongestGTimes[3] BETWEEN 14.0 AND 34.0 OR DivLongestGTimes[4] BETWEEN 14.0 AND 34.0 OR DivLongestGTimes[5] BETWEEN 14.0 AND 34.0) OR ArrDelay NOT IN (-21.0, 245.0, 90.0, -28.0, 187.0) GROUP BY Quarter LIMIT 10000"]}
 {"sql":"SELECT AVG(ActualElapsedTime), COUNT(DepDelayMinutes) FROM mytable WHERE DepDelayMinutes <> 297.0 LIMIT 11"}
 {"sql":"SELECT WheelsOn FROM mytable ORDER BY DestState, OriginCityName, NASDelay LIMIT 19"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DayofMonth = 20 ORDER BY NASDelay, AirlineID LIMIT 19"}
 {"sql":"SELECT SUM(DivReachedDest), MAX(Diverted), SUM(DestCityMarketID) FROM mytable LIMIT 29"}
 {"sql":"SELECT CRSArrTime, AVG(OriginWac), SUM(TotalAddGTime), SUM(WheelsOn) FROM mytable WHERE DestAirportSeqID IN (1141303, 1343302, 1410002) AND ArrDel15 >= -9999 GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 10","hsqls":["SELECT CRSArrTime, AVG(OriginWac), SUM(TotalAddGTime), SUM(WheelsOn) FROM mytable WHERE DestAirportSeqID IN (1141303, 1343302, 1410002) AND ArrDel15 >= -9999 GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 10"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE DestStateFips > 17 ORDER BY Distance, ArrDelay, OriginAirportID LIMIT 8","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DestStateFips > 17 ORDER BY Distance, ArrDelay, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DestStateFips > 17 ORDER BY Distance, ArrDelay, OriginAirportID LIMIT 8","hsqls":["SELECT DivAirports FROM mytable WHERE DestStateFips > 17 ORDER BY Distance, ArrDelay, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DaysSinceEpoch BETWEEN 16078 AND 16076 ORDER BY OriginWac LIMIT 23"}
 {"sql":"SELECT OriginStateFips, FlightDate, OriginStateName, MAX(AirlineID), COUNT(DivReachedDest), COUNT(ArrDel15) FROM mytable GROUP BY OriginStateFips, FlightDate, OriginStateName  ORDER BY OriginStateFips, FlightDate, OriginStateName LIMIT 17","hsqls":["SELECT OriginStateFips, FlightDate, OriginStateName, MAX(AirlineID), COUNT(DivReachedDest), COUNT(ArrDel15) FROM mytable GROUP BY OriginStateFips, FlightDate, OriginStateName  ORDER BY OriginStateFips, FlightDate, OriginStateName LIMIT 17"]}
-{"sql":"SELECT Diverted, Flights, ArrivalDelayGroups FROM mytable WHERE DivAirportSeqIDs BETWEEN 1425202 AND 1451202 OR LongestAddGTime NOT IN (128, 32) OR DivWheelsOns BETWEEN 1033 AND 1118 ORDER BY OriginCityMarketID LIMIT 23","hsqls":["SELECT Diverted, Flights, ArrivalDelayGroups FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs__MV1 BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs__MV2 BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs__MV3 BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs__MV4 BETWEEN 1425202 AND 1451202) OR LongestAddGTime NOT IN (128, 32) OR (DivWheelsOns__MV0 BETWEEN 1033 AND 1118 OR DivWheelsOns__MV1 BETWEEN 1033 AND 1118 OR DivWheelsOns__MV2 BETWEEN 1033 AND 1118 OR DivWheelsOns__MV3 BETWEEN 1033 AND 1118 OR DivWheelsOns__MV4 BETWEEN 1033 AND 1118) ORDER BY OriginCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, MIN(WheelsOn), COUNT(DivReachedDest), SUM(OriginCityMarketID) FROM mytable WHERE WheelsOn NOT IN (824, 1215, 2156, 1251) AND LongestAddGTime < 27 AND DivTailNums IN ('N530MQ', 'N805SK', 'N753SK') GROUP BY DestStateFips LIMIT 12","hsqls":["SELECT DestStateFips, MIN(WheelsOn), COUNT(DivReachedDest), SUM(OriginCityMarketID) FROM mytable WHERE WheelsOn NOT IN (824, 1215, 2156, 1251) AND LongestAddGTime < 27 AND (DivTailNums__MV0 IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums__MV1 IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums__MV2 IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums__MV3 IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums__MV4 IN ('N530MQ', 'N805SK', 'N753SK')) GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT Diverted, Flights, ArrivalDelayGroups FROM mytable WHERE DivAirportSeqIDs BETWEEN 1425202 AND 1451202 OR LongestAddGTime NOT IN (128, 32) OR DivWheelsOns BETWEEN 1033 AND 1118 ORDER BY OriginCityMarketID LIMIT 23","hsqls":["SELECT Diverted, Flights, ArrivalDelayGroups FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs[2] BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs[3] BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs[4] BETWEEN 1425202 AND 1451202 OR DivAirportSeqIDs[5] BETWEEN 1425202 AND 1451202) OR LongestAddGTime NOT IN (128, 32) OR (DivWheelsOns[1] BETWEEN 1033 AND 1118 OR DivWheelsOns[2] BETWEEN 1033 AND 1118 OR DivWheelsOns[3] BETWEEN 1033 AND 1118 OR DivWheelsOns[4] BETWEEN 1033 AND 1118 OR DivWheelsOns[5] BETWEEN 1033 AND 1118) ORDER BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, MIN(WheelsOn), COUNT(DivReachedDest), SUM(OriginCityMarketID) FROM mytable WHERE WheelsOn NOT IN (824, 1215, 2156, 1251) AND LongestAddGTime < 27 AND DivTailNums IN ('N530MQ', 'N805SK', 'N753SK') GROUP BY DestStateFips LIMIT 12","hsqls":["SELECT DestStateFips, MIN(WheelsOn), COUNT(DivReachedDest), SUM(OriginCityMarketID) FROM mytable WHERE WheelsOn NOT IN (824, 1215, 2156, 1251) AND LongestAddGTime < 27 AND (DivTailNums[1] IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums[2] IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums[3] IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums[4] IN ('N530MQ', 'N805SK', 'N753SK') OR DivTailNums[5] IN ('N530MQ', 'N805SK', 'N753SK')) GROUP BY DestStateFips LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginAirportSeqID), MIN(AirlineID) FROM mytable WHERE Flights NOT IN (1) LIMIT 16"}
 {"sql":"SELECT DepTime FROM mytable WHERE TotalAddGTime = 4 OR Carrier NOT IN ('UA') OR DestAirportSeqID BETWEEN 1152502 AND 1199603 ORDER BY ArrDelayMinutes, CRSDepTime, DivActualElapsedTime LIMIT 5"}
 {"sql":"SELECT DestStateFips, ArrTimeBlk, DepTimeBlk FROM mytable WHERE DepartureDelayGroups <> 9 AND DaysSinceEpoch BETWEEN 16089 AND 16084 ORDER BY OriginState, DepTime LIMIT 24"}
@@ -3196,10 +3196,10 @@
 {"sql":"SELECT UniqueCarrier, DaysSinceEpoch FROM mytable WHERE Carrier IN ('DL', 'B6', 'VX') OR Flights < 1 ORDER BY DivActualElapsedTime LIMIT 10"}
 {"sql":"SELECT MIN(ArrDelayMinutes), AVG(OriginAirportSeqID) FROM mytable WHERE ActualElapsedTime < 185 LIMIT 6"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivDistance NOT IN (539, 1105) LIMIT 10"}
-{"sql":"SELECT OriginState, COUNT(DistanceGroup), SUM(DestAirportID) FROM mytable WHERE \"Year\" < 2014 AND CRSDepTime BETWEEN 738 AND 1423 GROUP BY OriginState LIMIT 25","hsqls":["SELECT OriginState, COUNT(DistanceGroup), SUM(DestAirportID) FROM mytable WHERE Year < 2014 AND CRSDepTime BETWEEN 738 AND 1423 GROUP BY OriginState LIMIT 25"]}
+{"sql":"SELECT OriginState, COUNT(DistanceGroup), SUM(DestAirportID) FROM mytable WHERE \"Year\" < 2014 AND CRSDepTime BETWEEN 738 AND 1423 GROUP BY OriginState LIMIT 25","hsqls":["SELECT OriginState, COUNT(DistanceGroup), SUM(DestAirportID) FROM mytable WHERE `Year` < 2014 AND CRSDepTime BETWEEN 738 AND 1423 GROUP BY OriginState LIMIT 25"]}
 {"sql":"SELECT DepTime, \"Month\", CRSElapsedTime, AVG(Quarter) FROM mytable GROUP BY DepTime, \"Month\", CRSElapsedTime LIMIT 4","hsqls":["SELECT DepTime, Month, CRSElapsedTime, AVG(Quarter) FROM mytable GROUP BY DepTime, Month, CRSElapsedTime LIMIT 4"]}
 {"sql":"SELECT DestState, AVG(DestAirportSeqID), COUNT(AirTime), MAX(Diverted) FROM mytable WHERE Carrier NOT IN ('B6', 'FL', 'AS') GROUP BY DestState  ORDER BY DestState LIMIT 6","hsqls":["SELECT DestState, AVG(DestAirportSeqID), COUNT(AirTime), MAX(Diverted) FROM mytable WHERE Carrier NOT IN ('B6', 'FL', 'AS') GROUP BY DestState  ORDER BY DestState LIMIT 6"]}
-{"sql":"SELECT Cancelled FROM mytable WHERE TaxiIn = 11 OR DivAirportSeqIDs >= 1320302 OR CarrierDelay NOT IN (48, 115, 18, 280) ORDER BY DepDelay, OriginCityMarketID LIMIT 27","hsqls":["SELECT Cancelled FROM mytable WHERE TaxiIn = 11 OR (DivAirportSeqIDs__MV0 >= 1320302 OR DivAirportSeqIDs__MV1 >= 1320302 OR DivAirportSeqIDs__MV2 >= 1320302 OR DivAirportSeqIDs__MV3 >= 1320302 OR DivAirportSeqIDs__MV4 >= 1320302) OR CarrierDelay NOT IN (48, 115, 18, 280) ORDER BY DepDelay, OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT Cancelled FROM mytable WHERE TaxiIn = 11 OR DivAirportSeqIDs >= 1320302 OR CarrierDelay NOT IN (48, 115, 18, 280) ORDER BY DepDelay, OriginCityMarketID LIMIT 27","hsqls":["SELECT Cancelled FROM mytable WHERE TaxiIn = 11 OR (DivAirportSeqIDs[1] >= 1320302 OR DivAirportSeqIDs[2] >= 1320302 OR DivAirportSeqIDs[3] >= 1320302 OR DivAirportSeqIDs[4] >= 1320302 OR DivAirportSeqIDs[5] >= 1320302) OR CarrierDelay NOT IN (48, 115, 18, 280) ORDER BY DepDelay, OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT OriginState, DayofMonth, AVG(ArrDel15), COUNT(DayOfWeek) FROM mytable WHERE DistanceGroup > 8 OR UniqueCarrier NOT IN ('HA', 'B6', 'MQ', 'UA') GROUP BY OriginState, DayofMonth","hsqls":["SELECT OriginState, DayofMonth, AVG(ArrDel15), COUNT(DayOfWeek) FROM mytable WHERE DistanceGroup > 8 OR UniqueCarrier NOT IN ('HA', 'B6', 'MQ', 'UA') GROUP BY OriginState, DayofMonth"]}
 {"sql":"SELECT DepDel15 FROM mytable WHERE FlightDate > '2014-01-17' OR Dest BETWEEN 'SPS' AND 'ISP' ORDER BY DaysSinceEpoch LIMIT 13"}
 {"sql":"SELECT LateAircraftDelay, AirlineID, MAX(FlightNum) FROM mytable WHERE LongestAddGTime NOT IN (58, 32, 26) AND CRSArrTime = 1200 GROUP BY LateAircraftDelay, AirlineID  ORDER BY LateAircraftDelay, AirlineID LIMIT 11","hsqls":["SELECT LateAircraftDelay, AirlineID, MAX(FlightNum) FROM mytable WHERE LongestAddGTime NOT IN (58, 32, 26) AND CRSArrTime = 1200 GROUP BY LateAircraftDelay, AirlineID  ORDER BY LateAircraftDelay, AirlineID LIMIT 11"]}
@@ -3207,28 +3207,28 @@
 {"sql":"SELECT CarrierDelay FROM mytable WHERE CRSArrTime IN (1651, 1550, 1630) AND DepDelayMinutes BETWEEN 100.0 AND 229.0 AND Flights IN (1) ORDER BY Origin LIMIT 18"}
 {"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable LIMIT 11"}
 {"sql":"SELECT DepTimeBlk, SUM(ArrivalDelayGroups), COUNT(OriginStateName), AVG(DayofMonth) FROM mytable WHERE ArrivalDelayGroups BETWEEN -1 AND 4 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 27","hsqls":["SELECT DepTimeBlk, SUM(ArrivalDelayGroups), COUNT(OriginStateName), AVG(DayofMonth) FROM mytable WHERE ArrivalDelayGroups BETWEEN -1 AND 4 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 27"]}
-{"sql":"SELECT DivWheelsOns, SecurityDelay, DivWheelsOffs FROM mytable WHERE TaxiIn BETWEEN 40 AND 162 LIMIT 4","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, SecurityDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiIn BETWEEN 40 AND 162 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, SecurityDelay, DivWheelsOffs FROM mytable WHERE TaxiIn BETWEEN 40 AND 162 LIMIT 4","hsqls":["SELECT DivWheelsOns, SecurityDelay, DivWheelsOffs FROM mytable WHERE TaxiIn BETWEEN 40 AND 162 LIMIT 10000"]}
 {"sql":"SELECT Flights, CRSElapsedTime, AVG(ArrTime), COUNT(DestCityName) FROM mytable WHERE DepDelay >= 113.0 OR ArrDel15 BETWEEN 0 AND -9999 GROUP BY Flights, CRSElapsedTime  ORDER BY Flights, CRSElapsedTime LIMIT 3","hsqls":["SELECT Flights, CRSElapsedTime, AVG(ArrTime), COUNT(DestCityName) FROM mytable WHERE DepDelay >= 113.0 OR ArrDel15 BETWEEN 0 AND -9999 GROUP BY Flights, CRSElapsedTime  ORDER BY Flights, CRSElapsedTime LIMIT 3"]}
-{"sql":"SELECT DestCityName, DayofMonth FROM mytable WHERE \"Month\" < 1 AND TotalAddGTime = 74 ORDER BY Carrier, DayofMonth, WheelsOn LIMIT 5","hsqls":["SELECT DestCityName, DayofMonth FROM mytable WHERE Month < 1 AND TotalAddGTime = 74 ORDER BY Carrier, DayofMonth, WheelsOn LIMIT 5"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE OriginState > 'HI' OR DestAirportID IN (11953, 14570, 10781) ORDER BY DepDel15, ArrDel15","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE OriginState > 'HI' OR DestAirportID IN (11953, 14570, 10781) ORDER BY DepDel15, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DestCityName, DayofMonth FROM mytable WHERE \"Month\" < 1 AND TotalAddGTime = 74 ORDER BY Carrier, DayofMonth, WheelsOn LIMIT 5","hsqls":["SELECT DestCityName, DayofMonth FROM mytable WHERE `Month` < 1 AND TotalAddGTime = 74 ORDER BY Carrier, DayofMonth, WheelsOn LIMIT 5"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE OriginState > 'HI' OR DestAirportID IN (11953, 14570, 10781) ORDER BY DepDel15, ArrDel15","hsqls":["SELECT DivWheelsOns FROM mytable WHERE OriginState > 'HI' OR DestAirportID IN (11953, 14570, 10781) ORDER BY DepDel15, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, FlightNum, DepDelayMinutes FROM mytable WHERE SecurityDelay BETWEEN 8 AND 0 ORDER BY Dest, ArrDelay LIMIT 14"}
-{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND TaxiIn < 18 LIMIT 15","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND TaxiIn < 18 LIMIT 15"]}
+{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND TaxiIn < 18 LIMIT 15","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND TaxiIn < 18 LIMIT 15"]}
 {"sql":"SELECT DepTime, DestAirportID, AVG(TaxiIn), MAX(Cancelled) FROM mytable GROUP BY DepTime, DestAirportID  ORDER BY DepTime, DestAirportID LIMIT 18","hsqls":["SELECT DepTime, DestAirportID, AVG(TaxiIn), MAX(Cancelled) FROM mytable GROUP BY DepTime, DestAirportID  ORDER BY DepTime, DestAirportID LIMIT 18"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE TaxiOut BETWEEN 92 AND 37 OR Flights BETWEEN 1 AND 1 OR Dest BETWEEN 'GRI' AND 'LRD' ORDER BY LongestAddGTime LIMIT 24"}
 {"sql":"SELECT AVG(CarrierDelay) FROM mytable WHERE CRSArrTime < 21 LIMIT 4"}
-{"sql":"SELECT ArrDel15, DestCityName, ArrivalDelayGroups, SUM(Cancelled), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE DivTotalGTimes IN (16) AND OriginCityMarketID BETWEEN 31002 AND 30135 OR FlightDate NOT IN ('2014-01-29', '2014-01-09', '2014-01-24', '2014-01-26') GROUP BY ArrDel15, DestCityName, ArrivalDelayGroups LIMIT 5","hsqls":["SELECT ArrDel15, DestCityName, ArrivalDelayGroups, SUM(Cancelled), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE (DivTotalGTimes__MV0 IN (16) OR DivTotalGTimes__MV1 IN (16) OR DivTotalGTimes__MV2 IN (16) OR DivTotalGTimes__MV3 IN (16) OR DivTotalGTimes__MV4 IN (16)) AND OriginCityMarketID BETWEEN 31002 AND 30135 OR FlightDate NOT IN ('2014-01-29', '2014-01-09', '2014-01-24', '2014-01-26') GROUP BY ArrDel15, DestCityName, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DestCityName, ArrivalDelayGroups, SUM(Cancelled), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE DivTotalGTimes IN (16) AND OriginCityMarketID BETWEEN 31002 AND 30135 OR FlightDate NOT IN ('2014-01-29', '2014-01-09', '2014-01-24', '2014-01-26') GROUP BY ArrDel15, DestCityName, ArrivalDelayGroups LIMIT 5","hsqls":["SELECT ArrDel15, DestCityName, ArrivalDelayGroups, SUM(Cancelled), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE (DivTotalGTimes[1] IN (16) OR DivTotalGTimes[2] IN (16) OR DivTotalGTimes[3] IN (16) OR DivTotalGTimes[4] IN (16) OR DivTotalGTimes[5] IN (16)) AND OriginCityMarketID BETWEEN 31002 AND 30135 OR FlightDate NOT IN ('2014-01-29', '2014-01-09', '2014-01-24', '2014-01-26') GROUP BY ArrDel15, DestCityName, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DepartureDelayGroups BETWEEN 0 AND 7 AND TaxiIn = 55 LIMIT 18"}
-{"sql":"SELECT WheelsOff, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE \"Month\" IN (1) OR SecurityDelay NOT IN (4) GROUP BY WheelsOff, ArrivalDelayGroups LIMIT 6","hsqls":["SELECT WheelsOff, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE Month IN (1) OR SecurityDelay NOT IN (4) GROUP BY WheelsOff, ArrivalDelayGroups LIMIT 6"]}
-{"sql":"SELECT DivWheelsOns, SecurityDelay FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY WheelsOff, Dest, DestCityName LIMIT 3","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, SecurityDelay FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY WheelsOff, Dest, DestCityName LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE \"Month\" IN (1) OR SecurityDelay NOT IN (4) GROUP BY WheelsOff, ArrivalDelayGroups LIMIT 6","hsqls":["SELECT WheelsOff, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE `Month` IN (1) OR SecurityDelay NOT IN (4) GROUP BY WheelsOff, ArrivalDelayGroups LIMIT 6"]}
+{"sql":"SELECT DivWheelsOns, SecurityDelay FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY WheelsOff, Dest, DestCityName LIMIT 3","hsqls":["SELECT DivWheelsOns, SecurityDelay FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY WheelsOff, Dest, DestCityName LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, Quarter, CancellationCode, MAX(Flights), AVG(AirlineID), MAX(DepDelay) FROM mytable WHERE CRSArrTime BETWEEN 1429 AND 1750 OR DepartureDelayGroups >= 3 OR Flights IN (1) GROUP BY DepartureDelayGroups, Quarter, CancellationCode  ORDER BY DepartureDelayGroups, Quarter, CancellationCode LIMIT 22","hsqls":["SELECT DepartureDelayGroups, Quarter, CancellationCode, MAX(Flights), AVG(AirlineID), MAX(DepDelay) FROM mytable WHERE CRSArrTime BETWEEN 1429 AND 1750 OR DepartureDelayGroups >= 3 OR Flights IN (1) GROUP BY DepartureDelayGroups, Quarter, CancellationCode  ORDER BY DepartureDelayGroups, Quarter, CancellationCode LIMIT 22"]}
 {"sql":"SELECT MAX(FirstDepTime), MIN(ActualElapsedTime) FROM mytable WHERE OriginAirportSeqID IN (1350202, 1192102, 1073203, 1244102, 1470903) AND Carrier BETWEEN 'EV' AND 'FL' OR ArrDelay NOT IN (252.0) LIMIT 8"}
 {"sql":"SELECT DestAirportSeqID, ArrDelay, WheelsOn, COUNT(*) FROM mytable WHERE SecurityDelay <> 1 GROUP BY DestAirportSeqID, ArrDelay, WheelsOn  ORDER BY DestAirportSeqID, ArrDelay, WheelsOn LIMIT 9","hsqls":["SELECT DestAirportSeqID, ArrDelay, WheelsOn, COUNT(*) FROM mytable WHERE SecurityDelay <> 1 GROUP BY DestAirportSeqID, ArrDelay, WheelsOn  ORDER BY DestAirportSeqID, ArrDelay, WheelsOn LIMIT 9"]}
 {"sql":"SELECT AVG(DepDel15), SUM(DivArrDelay), COUNT(DestState) FROM mytable WHERE OriginStateName > 'Maine' OR CancellationCode BETWEEN 'noodles' AND 'C' AND OriginWac IN (34, 37, 85) LIMIT 20"}
 {"sql":"SELECT FlightDate, DayofMonth FROM mytable ORDER BY CancellationCode, \"Month\"","hsqls":["SELECT FlightDate, DayofMonth FROM mytable ORDER BY CancellationCode, Month"]}
-{"sql":"SELECT Dest FROM mytable WHERE DestState BETWEEN 'CO' AND 'MA' AND DepartureDelayGroups BETWEEN 5 AND 3 OR DivAirports BETWEEN 'MCN' AND 'CID' ORDER BY WeatherDelay, AirlineID LIMIT 24","hsqls":["SELECT Dest FROM mytable WHERE DestState BETWEEN 'CO' AND 'MA' AND DepartureDelayGroups BETWEEN 5 AND 3 OR (DivAirports__MV0 BETWEEN 'MCN' AND 'CID' OR DivAirports__MV1 BETWEEN 'MCN' AND 'CID' OR DivAirports__MV2 BETWEEN 'MCN' AND 'CID' OR DivAirports__MV3 BETWEEN 'MCN' AND 'CID' OR DivAirports__MV4 BETWEEN 'MCN' AND 'CID') ORDER BY WeatherDelay, AirlineID LIMIT 10000"]}
-{"sql":"SELECT AVG(OriginStateFips) FROM mytable WHERE DivAirports IN ('OGG') OR DivAirportLandings < 0 LIMIT 26","hsqls":["SELECT AVG(CAST(OriginStateFips AS DOUBLE)) FROM mytable WHERE (DivAirports__MV0 IN ('OGG') OR DivAirports__MV1 IN ('OGG') OR DivAirports__MV2 IN ('OGG') OR DivAirports__MV3 IN ('OGG') OR DivAirports__MV4 IN ('OGG')) OR DivAirportLandings < 0 LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, ArrTimeBlk, AirlineID, MIN(CarrierDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR ArrDelay BETWEEN 118.0 AND -9.0 GROUP BY TaxiIn, ArrTimeBlk, AirlineID LIMIT 27","hsqls":["SELECT TaxiIn, ArrTimeBlk, AirlineID, MIN(CarrierDelay) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR ArrDelay BETWEEN 118.0 AND -9.0 GROUP BY TaxiIn, ArrTimeBlk, AirlineID LIMIT 27"]}
-{"sql":"SELECT FirstDepTime, ArrTimeBlk, DivAirportIDs FROM mytable WHERE Diverted BETWEEN 1 AND 0 AND \"Year\" <> 2014 OR DepartureDelayGroups BETWEEN 12 AND -1 ORDER BY DestCityName, DepTimeBlk, AirTime LIMIT 3","hsqls":["SELECT FirstDepTime, ArrTimeBlk, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Diverted BETWEEN 1 AND 0 AND Year <> 2014 OR DepartureDelayGroups BETWEEN 12 AND -1 ORDER BY DestCityName, DepTimeBlk, AirTime LIMIT 10000"]}
+{"sql":"SELECT Dest FROM mytable WHERE DestState BETWEEN 'CO' AND 'MA' AND DepartureDelayGroups BETWEEN 5 AND 3 OR DivAirports BETWEEN 'MCN' AND 'CID' ORDER BY WeatherDelay, AirlineID LIMIT 24","hsqls":["SELECT Dest FROM mytable WHERE DestState BETWEEN 'CO' AND 'MA' AND DepartureDelayGroups BETWEEN 5 AND 3 OR (DivAirports[1] BETWEEN 'MCN' AND 'CID' OR DivAirports[2] BETWEEN 'MCN' AND 'CID' OR DivAirports[3] BETWEEN 'MCN' AND 'CID' OR DivAirports[4] BETWEEN 'MCN' AND 'CID' OR DivAirports[5] BETWEEN 'MCN' AND 'CID') ORDER BY WeatherDelay, AirlineID LIMIT 10000"]}
+{"sql":"SELECT AVG(OriginStateFips) FROM mytable WHERE DivAirports IN ('OGG') OR DivAirportLandings < 0 LIMIT 26","hsqls":["SELECT AVG(CAST(OriginStateFips AS DOUBLE)) FROM mytable WHERE (DivAirports[1] IN ('OGG') OR DivAirports[2] IN ('OGG') OR DivAirports[3] IN ('OGG') OR DivAirports[4] IN ('OGG') OR DivAirports[5] IN ('OGG')) OR DivAirportLandings < 0 LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, ArrTimeBlk, AirlineID, MIN(CarrierDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR ArrDelay BETWEEN 118.0 AND -9.0 GROUP BY TaxiIn, ArrTimeBlk, AirlineID LIMIT 27","hsqls":["SELECT TaxiIn, ArrTimeBlk, AirlineID, MIN(CarrierDelay) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR ArrDelay BETWEEN 118.0 AND -9.0 GROUP BY TaxiIn, ArrTimeBlk, AirlineID LIMIT 27"]}
+{"sql":"SELECT FirstDepTime, ArrTimeBlk, DivAirportIDs FROM mytable WHERE Diverted BETWEEN 1 AND 0 AND \"Year\" <> 2014 OR DepartureDelayGroups BETWEEN 12 AND -1 ORDER BY DestCityName, DepTimeBlk, AirTime LIMIT 3","hsqls":["SELECT FirstDepTime, ArrTimeBlk, DivAirportIDs FROM mytable WHERE Diverted BETWEEN 1 AND 0 AND `Year` <> 2014 OR DepartureDelayGroups BETWEEN 12 AND -1 ORDER BY DestCityName, DepTimeBlk, AirTime LIMIT 10000"]}
 {"sql":"SELECT AVG(OriginStateFips) FROM mytable WHERE DivDistance IN (261, 176, 60, 283) AND OriginAirportSeqID BETWEEN 1043403 AND 1325602 LIMIT 16"}
 {"sql":"SELECT DepartureDelayGroups, ArrDel15, DepTimeBlk FROM mytable ORDER BY DistanceGroup, Diverted, ActualElapsedTime LIMIT 26"}
 {"sql":"SELECT ActualElapsedTime, SUM(TotalAddGTime), MAX(DivReachedDest), AVG(ArrDelay) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 1","hsqls":["SELECT ActualElapsedTime, SUM(TotalAddGTime), MAX(DivReachedDest), AVG(ArrDelay) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 1"]}
@@ -3239,23 +3239,23 @@
 {"sql":"SELECT LateAircraftDelay, Carrier, DepDelayMinutes, AVG(AirTime) FROM mytable WHERE DestState NOT IN ('ND', 'GA', 'VI', 'DE', 'ME') GROUP BY LateAircraftDelay, Carrier, DepDelayMinutes  ORDER BY LateAircraftDelay, Carrier, DepDelayMinutes LIMIT 22","hsqls":["SELECT LateAircraftDelay, Carrier, DepDelayMinutes, AVG(AirTime) FROM mytable WHERE DestState NOT IN ('ND', 'GA', 'VI', 'DE', 'ME') GROUP BY LateAircraftDelay, Carrier, DepDelayMinutes  ORDER BY LateAircraftDelay, Carrier, DepDelayMinutes LIMIT 22"]}
 {"sql":"SELECT OriginCityName FROM mytable ORDER BY DestAirportID LIMIT 12"}
 {"sql":"SELECT AirlineID FROM mytable WHERE ArrivalDelayGroups BETWEEN 11 AND 0 AND OriginAirportID BETWEEN 14576 AND 12003 ORDER BY ArrDelay LIMIT 16"}
-{"sql":"SELECT CarrierDelay, \"Month\" FROM mytable WHERE DivWheelsOffs IN (153, 1908, 2107) AND DestState BETWEEN 'WV' AND 'TT' OR DivWheelsOffs IN (1330, 1531) ORDER BY AirlineID, DestAirportID LIMIT 26","hsqls":["SELECT CarrierDelay, Month FROM mytable WHERE (DivWheelsOffs__MV0 IN (153, 1908, 2107) OR DivWheelsOffs__MV1 IN (153, 1908, 2107) OR DivWheelsOffs__MV2 IN (153, 1908, 2107) OR DivWheelsOffs__MV3 IN (153, 1908, 2107) OR DivWheelsOffs__MV4 IN (153, 1908, 2107)) AND DestState BETWEEN 'WV' AND 'TT' OR (DivWheelsOffs__MV0 IN (1330, 1531) OR DivWheelsOffs__MV1 IN (1330, 1531) OR DivWheelsOffs__MV2 IN (1330, 1531) OR DivWheelsOffs__MV3 IN (1330, 1531) OR DivWheelsOffs__MV4 IN (1330, 1531)) ORDER BY AirlineID, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, \"Month\" FROM mytable WHERE DivWheelsOffs IN (153, 1908, 2107) AND DestState BETWEEN 'WV' AND 'TT' OR DivWheelsOffs IN (1330, 1531) ORDER BY AirlineID, DestAirportID LIMIT 26","hsqls":["SELECT CarrierDelay, `Month` FROM mytable WHERE (DivWheelsOffs[1] IN (153, 1908, 2107) OR DivWheelsOffs[2] IN (153, 1908, 2107) OR DivWheelsOffs[3] IN (153, 1908, 2107) OR DivWheelsOffs[4] IN (153, 1908, 2107) OR DivWheelsOffs[5] IN (153, 1908, 2107)) AND DestState BETWEEN 'WV' AND 'TT' OR (DivWheelsOffs[1] IN (1330, 1531) OR DivWheelsOffs[2] IN (1330, 1531) OR DivWheelsOffs[3] IN (1330, 1531) OR DivWheelsOffs[4] IN (1330, 1531) OR DivWheelsOffs[5] IN (1330, 1531)) ORDER BY AirlineID, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DestWac, OriginStateFips, DivActualElapsedTime, MIN(LateAircraftDelay) FROM mytable WHERE ArrDelay > 227.0 GROUP BY DestWac, OriginStateFips, DivActualElapsedTime","hsqls":["SELECT DestWac, OriginStateFips, DivActualElapsedTime, MIN(LateAircraftDelay) FROM mytable WHERE ArrDelay > 227.0 GROUP BY DestWac, OriginStateFips, DivActualElapsedTime"]}
-{"sql":"SELECT \"Year\", DivAirports FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY WheelsOff, FlightNum, DestAirportSeqID LIMIT 16","hsqls":["SELECT Year, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY WheelsOff, FlightNum, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivAirports FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY WheelsOff, FlightNum, DestAirportSeqID LIMIT 16","hsqls":["SELECT Year, DivAirports FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY WheelsOff, FlightNum, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DestStateName, CancellationCode FROM mytable WHERE DivDistance NOT IN (842, 786, 545, 187, 236) AND CRSDepTime IN (1350, 510, 1339, 836) ORDER BY Flights LIMIT 26"}
 {"sql":"SELECT ArrDelayMinutes, DivActualElapsedTime FROM mytable ORDER BY TaxiOut, CRSElapsedTime LIMIT 7"}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DivAirportIDs BETWEEN 10994 AND 10918 AND DivArrDelay < 161 AND DivAirportIDs > 14057 ORDER BY ArrDelay, ArrivalDelayGroups, OriginStateName LIMIT 27","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 10994 AND 10918 OR DivAirportIDs__MV1 BETWEEN 10994 AND 10918 OR DivAirportIDs__MV2 BETWEEN 10994 AND 10918 OR DivAirportIDs__MV3 BETWEEN 10994 AND 10918 OR DivAirportIDs__MV4 BETWEEN 10994 AND 10918) AND DivArrDelay < 161 AND (DivAirportIDs__MV0 > 14057 OR DivAirportIDs__MV1 > 14057 OR DivAirportIDs__MV2 > 14057 OR DivAirportIDs__MV3 > 14057 OR DivAirportIDs__MV4 > 14057) ORDER BY ArrDelay, ArrivalDelayGroups, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DivAirportIDs BETWEEN 10994 AND 10918 AND DivArrDelay < 161 AND DivAirportIDs > 14057 ORDER BY ArrDelay, ArrivalDelayGroups, OriginStateName LIMIT 27","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivAirportIDs[1] BETWEEN 10994 AND 10918 OR DivAirportIDs[2] BETWEEN 10994 AND 10918 OR DivAirportIDs[3] BETWEEN 10994 AND 10918 OR DivAirportIDs[4] BETWEEN 10994 AND 10918 OR DivAirportIDs[5] BETWEEN 10994 AND 10918) AND DivArrDelay < 161 AND (DivAirportIDs[1] > 14057 OR DivAirportIDs[2] > 14057 OR DivAirportIDs[3] > 14057 OR DivAirportIDs[4] > 14057 OR DivAirportIDs[5] > 14057) ORDER BY ArrDelay, ArrivalDelayGroups, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DivDistance, OriginCityMarketID, DivArrDelay, MAX(WheelsOn), AVG(TaxiOut), MIN(DepartureDelayGroups) FROM mytable WHERE WheelsOn >= 1754 OR Diverted >= 0 GROUP BY DivDistance, OriginCityMarketID, DivArrDelay  ORDER BY DivDistance, OriginCityMarketID, DivArrDelay LIMIT 12","hsqls":["SELECT DivDistance, OriginCityMarketID, DivArrDelay, MAX(WheelsOn), AVG(TaxiOut), MIN(DepartureDelayGroups) FROM mytable WHERE WheelsOn >= 1754 OR Diverted >= 0 GROUP BY DivDistance, OriginCityMarketID, DivArrDelay  ORDER BY DivDistance, OriginCityMarketID, DivArrDelay LIMIT 12"]}
 {"sql":"SELECT COUNT(DepDel15), SUM(DayOfWeek) FROM mytable WHERE Dest <> 'ONT' AND TailNum <= 'N927EV' OR CRSDepTime > 1752 LIMIT 29"}
-{"sql":"SELECT DivLongestGTimes, DestWac FROM mytable LIMIT 11","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestWac FROM mytable LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DestWac, COUNT(\"Month\"), COUNT(OriginCityName) FROM mytable WHERE TailNum BETWEEN 'N931MQ' AND 'N778SK' GROUP BY \"Year\", DestWac LIMIT 26","hsqls":["SELECT Year, DestWac, COUNT(Month), COUNT(OriginCityName) FROM mytable WHERE TailNum BETWEEN 'N931MQ' AND 'N778SK' GROUP BY Year, DestWac LIMIT 26"]}
+{"sql":"SELECT DivLongestGTimes, DestWac FROM mytable LIMIT 11","hsqls":["SELECT DivLongestGTimes, DestWac FROM mytable LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DestWac, COUNT(\"Month\"), COUNT(OriginCityName) FROM mytable WHERE TailNum BETWEEN 'N931MQ' AND 'N778SK' GROUP BY \"Year\", DestWac LIMIT 26","hsqls":["SELECT Year, DestWac, COUNT(`Month`), COUNT(OriginCityName) FROM mytable WHERE TailNum BETWEEN 'N931MQ' AND 'N778SK' GROUP BY Year, DestWac LIMIT 26"]}
 {"sql":"SELECT Flights, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 350 AND 259 AND OriginState NOT IN ('LA', 'VT', 'UT', 'OR', 'RI') GROUP BY Flights  ORDER BY Flights LIMIT 25","hsqls":["SELECT Flights, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 350 AND 259 AND OriginState NOT IN ('LA', 'VT', 'UT', 'OR', 'RI') GROUP BY Flights  ORDER BY Flights LIMIT 25"]}
 {"sql":"SELECT Carrier, DivActualElapsedTime FROM mytable ORDER BY TotalAddGTime, CancellationCode, WheelsOn LIMIT 28"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivArrDelay NOT IN (205) LIMIT 9"}
 {"sql":"SELECT OriginAirportSeqID, COUNT(OriginCityName), SUM(OriginStateFips) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 12","hsqls":["SELECT OriginAirportSeqID, COUNT(OriginCityName), SUM(OriginStateFips) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 12"]}
-{"sql":"SELECT DivReachedDest, MIN(DestStateFips), MIN(ArrTime) FROM mytable WHERE DivAirports IN ('SEA', 'BRW', 'ONT') GROUP BY DivReachedDest LIMIT 15","hsqls":["SELECT DivReachedDest, MIN(DestStateFips), MIN(ArrTime) FROM mytable WHERE (DivAirports__MV0 IN ('SEA', 'BRW', 'ONT') OR DivAirports__MV1 IN ('SEA', 'BRW', 'ONT') OR DivAirports__MV2 IN ('SEA', 'BRW', 'ONT') OR DivAirports__MV3 IN ('SEA', 'BRW', 'ONT') OR DivAirports__MV4 IN ('SEA', 'BRW', 'ONT')) GROUP BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, MIN(DestStateFips), MIN(ArrTime) FROM mytable WHERE DivAirports IN ('SEA', 'BRW', 'ONT') GROUP BY DivReachedDest LIMIT 15","hsqls":["SELECT DivReachedDest, MIN(DestStateFips), MIN(ArrTime) FROM mytable WHERE (DivAirports[1] IN ('SEA', 'BRW', 'ONT') OR DivAirports[2] IN ('SEA', 'BRW', 'ONT') OR DivAirports[3] IN ('SEA', 'BRW', 'ONT') OR DivAirports[4] IN ('SEA', 'BRW', 'ONT') OR DivAirports[5] IN ('SEA', 'BRW', 'ONT')) GROUP BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT Dest, NASDelay, SUM(DepDel15), MAX(WeatherDelay) FROM mytable GROUP BY Dest, NASDelay  ORDER BY Dest, NASDelay LIMIT 19","hsqls":["SELECT Dest, NASDelay, SUM(DepDel15), MAX(WeatherDelay) FROM mytable GROUP BY Dest, NASDelay  ORDER BY Dest, NASDelay LIMIT 19"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE OriginStateName IN ('Pennsylvania', 'Idaho', 'Alabama') ORDER BY OriginStateFips, OriginCityName LIMIT 13","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginStateName IN ('Pennsylvania', 'Idaho', 'Alabama') ORDER BY OriginStateFips, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE OriginStateName IN ('Pennsylvania', 'Idaho', 'Alabama') ORDER BY OriginStateFips, OriginCityName LIMIT 13","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE OriginStateName IN ('Pennsylvania', 'Idaho', 'Alabama') ORDER BY OriginStateFips, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR CRSArrTime BETWEEN 2023 AND 1142 ORDER BY DestState, DivArrDelay, OriginAirportID LIMIT 23"}
 {"sql":"SELECT FirstDepTime, DestAirportSeqID FROM mytable LIMIT 10"}
 {"sql":"SELECT COUNT(Quarter), SUM(OriginWac) FROM mytable LIMIT 6"}
@@ -3263,33 +3263,33 @@
 {"sql":"SELECT ArrDel15, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16082 AND 16084 ORDER BY Carrier, DepTimeBlk LIMIT 22"}
 {"sql":"SELECT WheelsOff, WeatherDelay, COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR OriginStateFips BETWEEN 37 AND 12 GROUP BY WheelsOff, WeatherDelay  ORDER BY WheelsOff, WeatherDelay LIMIT 27","hsqls":["SELECT WheelsOff, WeatherDelay, COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR OriginStateFips BETWEEN 37 AND 12 GROUP BY WheelsOff, WeatherDelay  ORDER BY WheelsOff, WeatherDelay LIMIT 27"]}
 {"sql":"SELECT AVG(DestWac) FROM mytable WHERE Origin NOT IN ('CLL', 'DTW') OR ArrivalDelayGroups IN (-1, 5, 8, -9999) LIMIT 9"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE Carrier >= 'US' LIMIT 29","hsqls":["SELECT Month FROM mytable WHERE Carrier >= 'US' LIMIT 29"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE Carrier >= 'US' LIMIT 29","hsqls":["SELECT `Month` FROM mytable WHERE Carrier >= 'US' LIMIT 29"]}
 {"sql":"SELECT DepartureDelayGroups, FlightDate FROM mytable LIMIT 5"}
 {"sql":"SELECT ArrDelayMinutes, WheelsOn, DivArrDelay FROM mytable WHERE DestAirportID < 11778 OR TaxiIn IN (67, 109, 65, 63, 11) ORDER BY NASDelay LIMIT 27"}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE ArrDelayMinutes IN (53.0, 92.0, 79.0, 250.0, 120.0) ORDER BY OriginAirportSeqID, DivArrDelay, ArrivalDelayGroups LIMIT 18"}
 {"sql":"SELECT DestAirportSeqID, AVG(CarrierDelay), MAX(NASDelay) FROM mytable GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 22","hsqls":["SELECT DestAirportSeqID, AVG(CarrierDelay), MAX(NASDelay) FROM mytable GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 22"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 51 AND 67 ORDER BY AirlineID LIMIT 3","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginWac BETWEEN 51 AND 67 ORDER BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 51 AND 67 ORDER BY AirlineID LIMIT 3","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 51 AND 67 ORDER BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT Distance, WheelsOn FROM mytable WHERE OriginStateFips BETWEEN 28 AND 33 AND NASDelay NOT IN (2, 106) ORDER BY DestCityMarketID LIMIT 5"}
 {"sql":"SELECT DestWac, DepDelay, MIN(AirTime), MIN(DepDelay) FROM mytable WHERE DayofMonth BETWEEN 25 AND 9 GROUP BY DestWac, DepDelay  ORDER BY DestWac, DepDelay LIMIT 17","hsqls":["SELECT DestWac, DepDelay, MIN(AirTime), MIN(DepDelay) FROM mytable WHERE DayofMonth BETWEEN 25 AND 9 GROUP BY DestWac, DepDelay  ORDER BY DestWac, DepDelay LIMIT 17"]}
 {"sql":"SELECT CancellationCode FROM mytable ORDER BY DistanceGroup, FirstDepTime, LateAircraftDelay LIMIT 19"}
 {"sql":"SELECT TailNum, DestCityName, AVG(ArrivalDelayGroups) FROM mytable WHERE WheelsOff BETWEEN 510 AND 1347 AND DestState < 'VI' GROUP BY TailNum, DestCityName  ORDER BY TailNum, DestCityName LIMIT 23","hsqls":["SELECT TailNum, DestCityName, AVG(ArrivalDelayGroups) FROM mytable WHERE WheelsOff BETWEEN 510 AND 1347 AND DestState < 'VI' GROUP BY TailNum, DestCityName  ORDER BY TailNum, DestCityName LIMIT 23"]}
 {"sql":"SELECT DestWac, DestAirportID FROM mytable WHERE OriginCityMarketID NOT IN (33342, 30739, 31471, 31123, 30185) AND FlightNum NOT IN (4707) AND FirstDepTime > 1800 LIMIT 7"}
-{"sql":"SELECT DivLongestGTimes, CarrierDelay, DestCityMarketID FROM mytable WHERE Carrier NOT IN ('AA') ORDER BY Origin LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CarrierDelay, DestCityMarketID FROM mytable WHERE Carrier NOT IN ('AA') ORDER BY Origin LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CarrierDelay, DestCityMarketID FROM mytable WHERE Carrier NOT IN ('AA') ORDER BY Origin LIMIT 10","hsqls":["SELECT DivLongestGTimes, CarrierDelay, DestCityMarketID FROM mytable WHERE Carrier NOT IN ('AA') ORDER BY Origin LIMIT 10000"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE CRSDepTime <> 1517 ORDER BY FlightNum, DestAirportSeqID, DivActualElapsedTime LIMIT 24"}
 {"sql":"SELECT OriginWac, UniqueCarrier, MAX(WheelsOn), COUNT(NASDelay), AVG(TaxiOut) FROM mytable WHERE OriginCityMarketID NOT IN (34614) OR Distance BETWEEN 1565 AND 1237 GROUP BY OriginWac, UniqueCarrier  ORDER BY OriginWac, UniqueCarrier LIMIT 7","hsqls":["SELECT OriginWac, UniqueCarrier, MAX(WheelsOn), COUNT(NASDelay), AVG(TaxiOut) FROM mytable WHERE OriginCityMarketID NOT IN (34614) OR Distance BETWEEN 1565 AND 1237 GROUP BY OriginWac, UniqueCarrier  ORDER BY OriginWac, UniqueCarrier LIMIT 7"]}
 {"sql":"SELECT CarrierDelay, LongestAddGTime, DaysSinceEpoch, COUNT(DivDistance), MIN(DestAirportSeqID) FROM mytable WHERE OriginStateName BETWEEN 'Oklahoma' AND 'Mississippi' AND WeatherDelay = 95 AND TailNum IN ('N588UA', 'N742SK', 'N374DA', 'N549AS', 'N329NB') GROUP BY CarrierDelay, LongestAddGTime, DaysSinceEpoch  ORDER BY CarrierDelay, LongestAddGTime, DaysSinceEpoch LIMIT 26","hsqls":["SELECT CarrierDelay, LongestAddGTime, DaysSinceEpoch, COUNT(DivDistance), MIN(DestAirportSeqID) FROM mytable WHERE OriginStateName BETWEEN 'Oklahoma' AND 'Mississippi' AND WeatherDelay = 95 AND TailNum IN ('N588UA', 'N742SK', 'N374DA', 'N549AS', 'N329NB') GROUP BY CarrierDelay, LongestAddGTime, DaysSinceEpoch  ORDER BY CarrierDelay, LongestAddGTime, DaysSinceEpoch LIMIT 26"]}
 {"sql":"SELECT MIN(ArrDel15) FROM mytable WHERE DepartureDelayGroups < 1 OR CRSArrTime BETWEEN 533 AND 741 OR TaxiIn IN (95, 57, 22, 83) LIMIT 20"}
 {"sql":"SELECT ArrDelayMinutes, ActualElapsedTime, MIN(SecurityDelay) FROM mytable WHERE TotalAddGTime NOT IN (97) GROUP BY ArrDelayMinutes, ActualElapsedTime  ORDER BY ArrDelayMinutes, ActualElapsedTime LIMIT 9","hsqls":["SELECT ArrDelayMinutes, ActualElapsedTime, MIN(SecurityDelay) FROM mytable WHERE TotalAddGTime NOT IN (97) GROUP BY ArrDelayMinutes, ActualElapsedTime  ORDER BY ArrDelayMinutes, ActualElapsedTime LIMIT 9"]}
-{"sql":"SELECT DistanceGroup FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DivAirportSeqIDs IN (1078102, 1142303, 1530402, 1172102, 1291503) OR SecurityDelay IN (1, 0, 14, -9999) LIMIT 10","hsqls":["SELECT DistanceGroup FROM mytable WHERE Month BETWEEN 1 AND 1 AND (DivAirportSeqIDs__MV0 IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs__MV1 IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs__MV2 IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs__MV3 IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs__MV4 IN (1078102, 1142303, 1530402, 1172102, 1291503)) OR SecurityDelay IN (1, 0, 14, -9999) LIMIT 10000"]}
-{"sql":"SELECT DayofMonth, SUM(AirTime) FROM mytable WHERE \"Year\" < 2014 GROUP BY DayofMonth LIMIT 12","hsqls":["SELECT DayofMonth, SUM(AirTime) FROM mytable WHERE Year < 2014 GROUP BY DayofMonth LIMIT 12"]}
+{"sql":"SELECT DistanceGroup FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DivAirportSeqIDs IN (1078102, 1142303, 1530402, 1172102, 1291503) OR SecurityDelay IN (1, 0, 14, -9999) LIMIT 10","hsqls":["SELECT DistanceGroup FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND (DivAirportSeqIDs[1] IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs[2] IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs[3] IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs[4] IN (1078102, 1142303, 1530402, 1172102, 1291503) OR DivAirportSeqIDs[5] IN (1078102, 1142303, 1530402, 1172102, 1291503)) OR SecurityDelay IN (1, 0, 14, -9999) LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, SUM(AirTime) FROM mytable WHERE \"Year\" < 2014 GROUP BY DayofMonth LIMIT 12","hsqls":["SELECT DayofMonth, SUM(AirTime) FROM mytable WHERE `Year` < 2014 GROUP BY DayofMonth LIMIT 12"]}
 {"sql":"SELECT \"Month\", ArrivalDelayGroups FROM mytable ORDER BY LateAircraftDelay LIMIT 11","hsqls":["SELECT Month, ArrivalDelayGroups FROM mytable ORDER BY LateAircraftDelay LIMIT 11"]}
-{"sql":"SELECT FlightNum, DivAirportIDs, Origin FROM mytable WHERE OriginStateFips BETWEEN 47 AND 37 ORDER BY Distance, OriginCityName, DepTime LIMIT 28","hsqls":["SELECT FlightNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, Origin FROM mytable WHERE OriginStateFips BETWEEN 47 AND 37 ORDER BY Distance, OriginCityName, DepTime LIMIT 10000"]}
-{"sql":"SELECT UniqueCarrier, DivTotalGTimes FROM mytable WHERE CRSDepTime BETWEEN 1904 AND 2320 OR DestWac >= 42 LIMIT 26","hsqls":["SELECT UniqueCarrier, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CRSDepTime BETWEEN 1904 AND 2320 OR DestWac >= 42 LIMIT 10000"]}
-{"sql":"SELECT OriginState, DaysSinceEpoch FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'noodles' OR DivTailNums BETWEEN 'N726SK' AND 'N13988' LIMIT 10","hsqls":["SELECT OriginState, DaysSinceEpoch FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'noodles' OR (DivTailNums__MV0 BETWEEN 'N726SK' AND 'N13988' OR DivTailNums__MV1 BETWEEN 'N726SK' AND 'N13988' OR DivTailNums__MV2 BETWEEN 'N726SK' AND 'N13988' OR DivTailNums__MV3 BETWEEN 'N726SK' AND 'N13988' OR DivTailNums__MV4 BETWEEN 'N726SK' AND 'N13988') LIMIT 10000"]}
-{"sql":"SELECT ActualElapsedTime, DaysSinceEpoch FROM mytable WHERE DivAirportIDs > 14113 ORDER BY TaxiOut LIMIT 8","hsqls":["SELECT ActualElapsedTime, DaysSinceEpoch FROM mytable WHERE (DivAirportIDs__MV0 > 14113 OR DivAirportIDs__MV1 > 14113 OR DivAirportIDs__MV2 > 14113 OR DivAirportIDs__MV3 > 14113 OR DivAirportIDs__MV4 > 14113) ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivAirportIDs, Origin FROM mytable WHERE OriginStateFips BETWEEN 47 AND 37 ORDER BY Distance, OriginCityName, DepTime LIMIT 28","hsqls":["SELECT FlightNum, DivAirportIDs, Origin FROM mytable WHERE OriginStateFips BETWEEN 47 AND 37 ORDER BY Distance, OriginCityName, DepTime LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier, DivTotalGTimes FROM mytable WHERE CRSDepTime BETWEEN 1904 AND 2320 OR DestWac >= 42 LIMIT 26","hsqls":["SELECT UniqueCarrier, DivTotalGTimes FROM mytable WHERE CRSDepTime BETWEEN 1904 AND 2320 OR DestWac >= 42 LIMIT 10000"]}
+{"sql":"SELECT OriginState, DaysSinceEpoch FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'noodles' OR DivTailNums BETWEEN 'N726SK' AND 'N13988' LIMIT 10","hsqls":["SELECT OriginState, DaysSinceEpoch FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'noodles' OR (DivTailNums[1] BETWEEN 'N726SK' AND 'N13988' OR DivTailNums[2] BETWEEN 'N726SK' AND 'N13988' OR DivTailNums[3] BETWEEN 'N726SK' AND 'N13988' OR DivTailNums[4] BETWEEN 'N726SK' AND 'N13988' OR DivTailNums[5] BETWEEN 'N726SK' AND 'N13988') LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DaysSinceEpoch FROM mytable WHERE DivAirportIDs > 14113 ORDER BY TaxiOut LIMIT 8","hsqls":["SELECT ActualElapsedTime, DaysSinceEpoch FROM mytable WHERE (DivAirportIDs[1] > 14113 OR DivAirportIDs[2] > 14113 OR DivAirportIDs[3] > 14113 OR DivAirportIDs[4] > 14113 OR DivAirportIDs[5] > 14113) ORDER BY TaxiOut LIMIT 10000"]}
 {"sql":"SELECT DestStateName, DaysSinceEpoch FROM mytable ORDER BY DestState, WeatherDelay, OriginWac LIMIT 6"}
-{"sql":"SELECT ArrDel15 FROM mytable WHERE DivTailNums BETWEEN 'N641SW' AND 'N982SW' ORDER BY TotalAddGTime LIMIT 3","hsqls":["SELECT ArrDel15 FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums__MV1 BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums__MV2 BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums__MV3 BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums__MV4 BETWEEN 'N641SW' AND 'N982SW') ORDER BY TotalAddGTime LIMIT 10000"]}
-{"sql":"SELECT \"Year\", OriginState, DivLongestGTimes FROM mytable WHERE Quarter > 1 AND DivReachedDest BETWEEN 0 AND 0 OR DayOfWeek <= 2 LIMIT 8","hsqls":["SELECT Year, OriginState, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE Quarter > 1 AND DivReachedDest BETWEEN 0 AND 0 OR DayOfWeek <= 2 LIMIT 10000"]}
+{"sql":"SELECT ArrDel15 FROM mytable WHERE DivTailNums BETWEEN 'N641SW' AND 'N982SW' ORDER BY TotalAddGTime LIMIT 3","hsqls":["SELECT ArrDel15 FROM mytable WHERE (DivTailNums[1] BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums[2] BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums[3] BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums[4] BETWEEN 'N641SW' AND 'N982SW' OR DivTailNums[5] BETWEEN 'N641SW' AND 'N982SW') ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\", OriginState, DivLongestGTimes FROM mytable WHERE Quarter > 1 AND DivReachedDest BETWEEN 0 AND 0 OR DayOfWeek <= 2 LIMIT 8","hsqls":["SELECT Year, OriginState, DivLongestGTimes FROM mytable WHERE Quarter > 1 AND DivReachedDest BETWEEN 0 AND 0 OR DayOfWeek <= 2 LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, LateAircraftDelay, CRSArrTime, COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' AND TaxiIn < 40 GROUP BY WheelsOff, LateAircraftDelay, CRSArrTime  ORDER BY WheelsOff, LateAircraftDelay, CRSArrTime LIMIT 12","hsqls":["SELECT WheelsOff, LateAircraftDelay, CRSArrTime, COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' AND TaxiIn < 40 GROUP BY WheelsOff, LateAircraftDelay, CRSArrTime  ORDER BY WheelsOff, LateAircraftDelay, CRSArrTime LIMIT 12"]}
 {"sql":"SELECT ArrivalDelayGroups, COUNT(DivActualElapsedTime), MIN(ArrDel15), MIN(CarrierDelay) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 16","hsqls":["SELECT ArrivalDelayGroups, COUNT(DivActualElapsedTime), MIN(ArrDel15), MIN(CarrierDelay) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 16"]}
 {"sql":"SELECT CarrierDelay, ArrivalDelayGroups FROM mytable WHERE Dest <> 'CVG' AND OriginCityMarketID IN (33344, 34945, 34992) LIMIT 14"}
@@ -3297,7 +3297,7 @@
 {"sql":"SELECT AVG(ArrDel15), MIN(DivDistance), MIN(DestCityMarketID) FROM mytable WHERE TailNum IN ('N651SW', 'N156UW') OR ArrTimeBlk BETWEEN '1200-1259' AND '1500-1559' LIMIT 1"}
 {"sql":"SELECT Diverted, OriginCityName, DepDel15 FROM mytable WHERE TaxiIn NOT IN (79, 75, 89) AND DestCityName > 'San Angelo, TX' ORDER BY Origin LIMIT 29"}
 {"sql":"SELECT ArrTimeBlk, COUNT(DivAirportLandings) FROM mytable WHERE AirlineID BETWEEN 19790 AND 19690 OR DepDelayMinutes IN (397.0, 69.0) GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 13","hsqls":["SELECT ArrTimeBlk, COUNT(DivAirportLandings) FROM mytable WHERE AirlineID BETWEEN 19790 AND 19690 OR DepDelayMinutes IN (397.0, 69.0) GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 13"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Flights = 1 AND ArrTimeBlk > '1500-1559' ORDER BY WheelsOff LIMIT 8","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Flights = 1 AND ArrTimeBlk > '1500-1559' ORDER BY WheelsOff LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE Flights = 1 AND ArrTimeBlk > '1500-1559' ORDER BY WheelsOff LIMIT 8","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE Flights = 1 AND ArrTimeBlk > '1500-1559' ORDER BY WheelsOff LIMIT 10000"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE TaxiIn BETWEEN 36 AND 65 AND DestWac >= 88 LIMIT 27"}
 {"sql":"SELECT DestCityName, WheelsOn FROM mytable WHERE ArrTimeBlk <> '2300-2359' OR FlightDate NOT IN ('2014-01-21', '2014-01-30', '2014-01-11', '2014-01-26', '2014-01-16') OR UniqueCarrier NOT IN ('DL', 'F9', 'WN', 'FL') ORDER BY DestStateFips, TotalAddGTime LIMIT 11"}
 {"sql":"SELECT Diverted, OriginCityMarketID FROM mytable WHERE OriginWac IN (3, 67, 83, 87) LIMIT 12"}
@@ -3308,117 +3308,117 @@
 {"sql":"SELECT OriginState, Flights, DestCityMarketID, MIN(DivActualElapsedTime), MAX(ArrDel15), AVG(DayofMonth) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DaysSinceEpoch BETWEEN 16090 AND 16073 GROUP BY OriginState, Flights, DestCityMarketID  ORDER BY OriginState, Flights, DestCityMarketID LIMIT 10","hsqls":["SELECT OriginState, Flights, DestCityMarketID, MIN(DivActualElapsedTime), MAX(ArrDel15), AVG(DayofMonth) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DaysSinceEpoch BETWEEN 16090 AND 16073 GROUP BY OriginState, Flights, DestCityMarketID  ORDER BY OriginState, Flights, DestCityMarketID LIMIT 10"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 28"}
 {"sql":"SELECT AirTime, COUNT(DaysSinceEpoch) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 20","hsqls":["SELECT AirTime, COUNT(DaysSinceEpoch) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 20"]}
-{"sql":"SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR \"Year\" IN (2014) LIMIT 14","hsqls":["SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR Year IN (2014) LIMIT 14"]}
+{"sql":"SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR \"Year\" IN (2014) LIMIT 14","hsqls":["SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR `Year` IN (2014) LIMIT 14"]}
 {"sql":"SELECT SUM(DepartureDelayGroups) FROM mytable WHERE OriginState = 'MD' OR DestWac BETWEEN 83 AND 43 OR Flights < 1 LIMIT 26"}
 {"sql":"SELECT DivDistance, COUNT(*) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 6","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 6"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 295.0 AND 103.0 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 21","hsqls":["SELECT DaysSinceEpoch, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 295.0 AND 103.0 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 21"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE DayOfWeek >= 1 LIMIT 15"}
 {"sql":"SELECT Cancelled, DivArrDelay, DayOfWeek, COUNT(CancellationCode) FROM mytable WHERE AirTime NOT IN (112, 305, 177) OR DistanceGroup BETWEEN 7 AND 8 GROUP BY Cancelled, DivArrDelay, DayOfWeek  ORDER BY Cancelled, DivArrDelay, DayOfWeek LIMIT 10","hsqls":["SELECT Cancelled, DivArrDelay, DayOfWeek, COUNT(CancellationCode) FROM mytable WHERE AirTime NOT IN (112, 305, 177) OR DistanceGroup BETWEEN 7 AND 8 GROUP BY Cancelled, DivArrDelay, DayOfWeek  ORDER BY Cancelled, DivArrDelay, DayOfWeek LIMIT 10"]}
-{"sql":"SELECT OriginAirportSeqID, DivArrDelay FROM mytable WHERE DivTailNums > 'N565AA' AND DestAirportID BETWEEN 11603 AND 11865 LIMIT 22","hsqls":["SELECT OriginAirportSeqID, DivArrDelay FROM mytable WHERE (DivTailNums__MV0 > 'N565AA' OR DivTailNums__MV1 > 'N565AA' OR DivTailNums__MV2 > 'N565AA' OR DivTailNums__MV3 > 'N565AA' OR DivTailNums__MV4 > 'N565AA') AND DestAirportID BETWEEN 11603 AND 11865 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivArrDelay FROM mytable WHERE DivTailNums > 'N565AA' AND DestAirportID BETWEEN 11603 AND 11865 LIMIT 22","hsqls":["SELECT OriginAirportSeqID, DivArrDelay FROM mytable WHERE (DivTailNums[1] > 'N565AA' OR DivTailNums[2] > 'N565AA' OR DivTailNums[3] > 'N565AA' OR DivTailNums[4] > 'N565AA' OR DivTailNums[5] > 'N565AA') AND DestAirportID BETWEEN 11603 AND 11865 LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, NASDelay, SUM(WheelsOff), AVG(DistanceGroup) FROM mytable WHERE DivReachedDest >= 1 GROUP BY FirstDepTime, NASDelay  ORDER BY FirstDepTime, NASDelay LIMIT 16","hsqls":["SELECT FirstDepTime, NASDelay, SUM(WheelsOff), AVG(DistanceGroup) FROM mytable WHERE DivReachedDest >= 1 GROUP BY FirstDepTime, NASDelay  ORDER BY FirstDepTime, NASDelay LIMIT 16"]}
 {"sql":"SELECT LongestAddGTime, DayofMonth, OriginAirportID FROM mytable WHERE OriginState = 'OR' AND Cancelled = 0 LIMIT 23"}
-{"sql":"SELECT Carrier, OriginAirportID FROM mytable WHERE DivAirportSeqIDs IN (1385103, 1302402) ORDER BY OriginState LIMIT 25","hsqls":["SELECT Carrier, OriginAirportID FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1385103, 1302402) OR DivAirportSeqIDs__MV1 IN (1385103, 1302402) OR DivAirportSeqIDs__MV2 IN (1385103, 1302402) OR DivAirportSeqIDs__MV3 IN (1385103, 1302402) OR DivAirportSeqIDs__MV4 IN (1385103, 1302402)) ORDER BY OriginState LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, ArrDelayMinutes, DayOfWeek FROM mytable WHERE AirTime BETWEEN 265 AND 481 AND DivLongestGTimes IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivWheelsOffs BETWEEN 1955 AND 1240 ORDER BY DestStateName LIMIT 4","hsqls":["SELECT OriginCityName, ArrDelayMinutes, DayOfWeek FROM mytable WHERE AirTime BETWEEN 265 AND 481 AND (DivLongestGTimes__MV0 IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes__MV1 IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes__MV2 IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes__MV3 IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes__MV4 IN (13.0, 22.0, 118.0, 62.0, 90.0)) OR (DivWheelsOffs__MV0 BETWEEN 1955 AND 1240 OR DivWheelsOffs__MV1 BETWEEN 1955 AND 1240 OR DivWheelsOffs__MV2 BETWEEN 1955 AND 1240 OR DivWheelsOffs__MV3 BETWEEN 1955 AND 1240 OR DivWheelsOffs__MV4 BETWEEN 1955 AND 1240) ORDER BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT SUM(\"Year\") FROM mytable WHERE ArrivalDelayGroups NOT IN (10, 0, 4, 9, -9999) LIMIT 24","hsqls":["SELECT SUM(Year) FROM mytable WHERE ArrivalDelayGroups NOT IN (10, 0, 4, 9, -9999) LIMIT 24"]}
-{"sql":"SELECT OriginWac, CRSDepTime FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND OriginStateName BETWEEN 'Mississippi' AND 'Utah' AND AirlineID BETWEEN 20436 AND 20304 ORDER BY DivArrDelay LIMIT 2","hsqls":["SELECT OriginWac, CRSDepTime FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND OriginStateName BETWEEN 'Mississippi' AND 'Utah' AND AirlineID BETWEEN 20436 AND 20304 ORDER BY DivArrDelay LIMIT 2"]}
+{"sql":"SELECT Carrier, OriginAirportID FROM mytable WHERE DivAirportSeqIDs IN (1385103, 1302402) ORDER BY OriginState LIMIT 25","hsqls":["SELECT Carrier, OriginAirportID FROM mytable WHERE (DivAirportSeqIDs[1] IN (1385103, 1302402) OR DivAirportSeqIDs[2] IN (1385103, 1302402) OR DivAirportSeqIDs[3] IN (1385103, 1302402) OR DivAirportSeqIDs[4] IN (1385103, 1302402) OR DivAirportSeqIDs[5] IN (1385103, 1302402)) ORDER BY OriginState LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, ArrDelayMinutes, DayOfWeek FROM mytable WHERE AirTime BETWEEN 265 AND 481 AND DivLongestGTimes IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivWheelsOffs BETWEEN 1955 AND 1240 ORDER BY DestStateName LIMIT 4","hsqls":["SELECT OriginCityName, ArrDelayMinutes, DayOfWeek FROM mytable WHERE AirTime BETWEEN 265 AND 481 AND (DivLongestGTimes[1] IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes[2] IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes[3] IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes[4] IN (13.0, 22.0, 118.0, 62.0, 90.0) OR DivLongestGTimes[5] IN (13.0, 22.0, 118.0, 62.0, 90.0)) OR (DivWheelsOffs[1] BETWEEN 1955 AND 1240 OR DivWheelsOffs[2] BETWEEN 1955 AND 1240 OR DivWheelsOffs[3] BETWEEN 1955 AND 1240 OR DivWheelsOffs[4] BETWEEN 1955 AND 1240 OR DivWheelsOffs[5] BETWEEN 1955 AND 1240) ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT SUM(\"Year\") FROM mytable WHERE ArrivalDelayGroups NOT IN (10, 0, 4, 9, -9999) LIMIT 24","hsqls":["SELECT SUM(`Year`) FROM mytable WHERE ArrivalDelayGroups NOT IN (10, 0, 4, 9, -9999) LIMIT 24"]}
+{"sql":"SELECT OriginWac, CRSDepTime FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND OriginStateName BETWEEN 'Mississippi' AND 'Utah' AND AirlineID BETWEEN 20436 AND 20304 ORDER BY DivArrDelay LIMIT 2","hsqls":["SELECT OriginWac, CRSDepTime FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND OriginStateName BETWEEN 'Mississippi' AND 'Utah' AND AirlineID BETWEEN 20436 AND 20304 ORDER BY DivArrDelay LIMIT 2"]}
 {"sql":"SELECT OriginStateFips, ArrDel15, OriginStateName, AVG(OriginWac), MAX(DepDel15), SUM(TaxiIn) FROM mytable WHERE LateAircraftDelay = 31 OR DivReachedDest = 0 OR OriginCityMarketID = 30255 GROUP BY OriginStateFips, ArrDel15, OriginStateName  ORDER BY OriginStateFips, ArrDel15, OriginStateName LIMIT 23","hsqls":["SELECT OriginStateFips, ArrDel15, OriginStateName, AVG(OriginWac), MAX(DepDel15), SUM(TaxiIn) FROM mytable WHERE LateAircraftDelay = 31 OR DivReachedDest = 0 OR OriginCityMarketID = 30255 GROUP BY OriginStateFips, ArrDel15, OriginStateName  ORDER BY OriginStateFips, ArrDel15, OriginStateName LIMIT 23"]}
 {"sql":"SELECT OriginStateFips, AirlineID, ArrivalDelayGroups, AVG(Quarter) FROM mytable GROUP BY OriginStateFips, AirlineID, ArrivalDelayGroups  ORDER BY OriginStateFips, AirlineID, ArrivalDelayGroups LIMIT 2","hsqls":["SELECT OriginStateFips, AirlineID, ArrivalDelayGroups, AVG(Quarter) FROM mytable GROUP BY OriginStateFips, AirlineID, ArrivalDelayGroups  ORDER BY OriginStateFips, AirlineID, ArrivalDelayGroups LIMIT 2"]}
 {"sql":"SELECT DivReachedDest, CRSArrTime, FlightDate, COUNT(DepTimeBlk) FROM mytable WHERE OriginAirportID < 14842 GROUP BY DivReachedDest, CRSArrTime, FlightDate  ORDER BY DivReachedDest, CRSArrTime, FlightDate LIMIT 15","hsqls":["SELECT DivReachedDest, CRSArrTime, FlightDate, COUNT(DepTimeBlk) FROM mytable WHERE OriginAirportID < 14842 GROUP BY DivReachedDest, CRSArrTime, FlightDate  ORDER BY DivReachedDest, CRSArrTime, FlightDate LIMIT 15"]}
-{"sql":"SELECT DestStateFips, ArrivalDelayGroups FROM mytable WHERE OriginAirportSeqID BETWEEN 1357702 AND 1153703 ORDER BY \"Month\" LIMIT 5","hsqls":["SELECT DestStateFips, ArrivalDelayGroups FROM mytable WHERE OriginAirportSeqID BETWEEN 1357702 AND 1153703 ORDER BY Month LIMIT 5"]}
-{"sql":"SELECT DestState, FlightNum, DaysSinceEpoch, SUM(OriginAirportID), AVG(Quarter) FROM mytable WHERE DivWheelsOns < 1226 OR AirTime = 163 GROUP BY DestState, FlightNum, DaysSinceEpoch LIMIT 25","hsqls":["SELECT DestState, FlightNum, DaysSinceEpoch, SUM(OriginAirportID), AVG(Quarter) FROM mytable WHERE (DivWheelsOns__MV0 < 1226 OR DivWheelsOns__MV1 < 1226 OR DivWheelsOns__MV2 < 1226 OR DivWheelsOns__MV3 < 1226 OR DivWheelsOns__MV4 < 1226) OR AirTime = 163 GROUP BY DestState, FlightNum, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, ArrivalDelayGroups FROM mytable WHERE OriginAirportSeqID BETWEEN 1357702 AND 1153703 ORDER BY \"Month\" LIMIT 5","hsqls":["SELECT DestStateFips, ArrivalDelayGroups FROM mytable WHERE OriginAirportSeqID BETWEEN 1357702 AND 1153703 ORDER BY `Month` LIMIT 5"]}
+{"sql":"SELECT DestState, FlightNum, DaysSinceEpoch, SUM(OriginAirportID), AVG(Quarter) FROM mytable WHERE DivWheelsOns < 1226 OR AirTime = 163 GROUP BY DestState, FlightNum, DaysSinceEpoch LIMIT 25","hsqls":["SELECT DestState, FlightNum, DaysSinceEpoch, SUM(OriginAirportID), AVG(Quarter) FROM mytable WHERE (DivWheelsOns[1] < 1226 OR DivWheelsOns[2] < 1226 OR DivWheelsOns[3] < 1226 OR DivWheelsOns[4] < 1226 OR DivWheelsOns[5] < 1226) OR AirTime = 163 GROUP BY DestState, FlightNum, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT AVG(ArrTime), COUNT(DistanceGroup), MIN(DepTime) FROM mytable WHERE OriginStateName IN ('Colorado', 'Kansas', 'New York')"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTime IN (19, 1835) OR OriginAirportID NOT IN (13502, 14570, 13487) OR NASDelay BETWEEN 60 AND 42 LIMIT 28"}
 {"sql":"SELECT TaxiOut, NASDelay, DepTimeBlk FROM mytable WHERE Diverted IN (1, 0) AND DestAirportSeqID = 1336703 ORDER BY DestStateName, ArrivalDelayGroups LIMIT 14"}
-{"sql":"SELECT DestAirportID, COUNT(*) FROM mytable WHERE DivAirportIDs BETWEEN 10135 AND 11109 GROUP BY DestAirportID LIMIT 12","hsqls":["SELECT DestAirportID, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 10135 AND 11109 OR DivAirportIDs__MV1 BETWEEN 10135 AND 11109 OR DivAirportIDs__MV2 BETWEEN 10135 AND 11109 OR DivAirportIDs__MV3 BETWEEN 10135 AND 11109 OR DivAirportIDs__MV4 BETWEEN 10135 AND 11109) GROUP BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, COUNT(*) FROM mytable WHERE DivAirportIDs BETWEEN 10135 AND 11109 GROUP BY DestAirportID LIMIT 12","hsqls":["SELECT DestAirportID, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 10135 AND 11109 OR DivAirportIDs[2] BETWEEN 10135 AND 11109 OR DivAirportIDs[3] BETWEEN 10135 AND 11109 OR DivAirportIDs[4] BETWEEN 10135 AND 11109 OR DivAirportIDs[5] BETWEEN 10135 AND 11109) GROUP BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DivReachedDest BETWEEN 1 AND 1 ORDER BY DepartureDelayGroups, CRSElapsedTime LIMIT 10"}
 {"sql":"SELECT DepDelayMinutes, MIN(DestAirportID) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 2","hsqls":["SELECT DepDelayMinutes, MIN(DestAirportID) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 2"]}
-{"sql":"SELECT OriginStateFips, TailNum, COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N914DE' AND 'N703JB' OR Carrier BETWEEN 'EV' AND 'F9' GROUP BY OriginStateFips, TailNum LIMIT 20","hsqls":["SELECT OriginStateFips, TailNum, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums__MV1 BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums__MV2 BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums__MV3 BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums__MV4 BETWEEN 'N914DE' AND 'N703JB') OR Carrier BETWEEN 'EV' AND 'F9' GROUP BY OriginStateFips, TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, TailNum, COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N914DE' AND 'N703JB' OR Carrier BETWEEN 'EV' AND 'F9' GROUP BY OriginStateFips, TailNum LIMIT 20","hsqls":["SELECT OriginStateFips, TailNum, COUNT(*) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums[2] BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums[3] BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums[4] BETWEEN 'N914DE' AND 'N703JB' OR DivTailNums[5] BETWEEN 'N914DE' AND 'N703JB') OR Carrier BETWEEN 'EV' AND 'F9' GROUP BY OriginStateFips, TailNum LIMIT 10000"]}
 {"sql":"SELECT AVG(AirTime), COUNT(ArrDel15) FROM mytable WHERE CRSDepTime BETWEEN 1834 AND 607 AND Flights > 1 LIMIT 18"}
 {"sql":"SELECT Distance, COUNT(TaxiIn) FROM mytable WHERE OriginState IN ('MT', 'VA', 'KY', 'WV') OR OriginStateName >= 'South Dakota' GROUP BY Distance  ORDER BY Distance LIMIT 19","hsqls":["SELECT Distance, COUNT(TaxiIn) FROM mytable WHERE OriginState IN ('MT', 'VA', 'KY', 'WV') OR OriginStateName >= 'South Dakota' GROUP BY Distance  ORDER BY Distance LIMIT 19"]}
-{"sql":"SELECT COUNT(DistanceGroup) FROM mytable WHERE DivTailNums BETWEEN 'N541AA' AND 'N14174' OR \"Month\" = 1 AND TaxiOut BETWEEN -9999 AND 34 LIMIT 7","hsqls":["SELECT COUNT(DistanceGroup) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N541AA' AND 'N14174' OR DivTailNums__MV1 BETWEEN 'N541AA' AND 'N14174' OR DivTailNums__MV2 BETWEEN 'N541AA' AND 'N14174' OR DivTailNums__MV3 BETWEEN 'N541AA' AND 'N14174' OR DivTailNums__MV4 BETWEEN 'N541AA' AND 'N14174') OR Month = 1 AND TaxiOut BETWEEN -9999 AND 34 LIMIT 10000"]}
+{"sql":"SELECT COUNT(DistanceGroup) FROM mytable WHERE DivTailNums BETWEEN 'N541AA' AND 'N14174' OR \"Month\" = 1 AND TaxiOut BETWEEN -9999 AND 34 LIMIT 7","hsqls":["SELECT COUNT(DistanceGroup) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N541AA' AND 'N14174' OR DivTailNums[2] BETWEEN 'N541AA' AND 'N14174' OR DivTailNums[3] BETWEEN 'N541AA' AND 'N14174' OR DivTailNums[4] BETWEEN 'N541AA' AND 'N14174' OR DivTailNums[5] BETWEEN 'N541AA' AND 'N14174') OR `Month` = 1 AND TaxiOut BETWEEN -9999 AND 34 LIMIT 10000"]}
 {"sql":"SELECT DepDel15, COUNT(*) FROM mytable GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 4","hsqls":["SELECT DepDel15, COUNT(*) FROM mytable GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 4"]}
 {"sql":"SELECT OriginAirportSeqID, FirstDepTime, SUM(CarrierDelay), MAX(Flights), AVG(DestStateFips) FROM mytable GROUP BY OriginAirportSeqID, FirstDepTime  ORDER BY OriginAirportSeqID, FirstDepTime LIMIT 7","hsqls":["SELECT OriginAirportSeqID, FirstDepTime, SUM(CarrierDelay), MAX(Flights), AVG(DestStateFips) FROM mytable GROUP BY OriginAirportSeqID, FirstDepTime  ORDER BY OriginAirportSeqID, FirstDepTime LIMIT 7"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'US' LIMIT 12"}
-{"sql":"SELECT OriginState, DepTimeBlk, UniqueCarrier FROM mytable WHERE Flights NOT IN (1) OR DivAirportSeqIDs > 1234302 ORDER BY DivReachedDest, ArrTimeBlk LIMIT 1","hsqls":["SELECT OriginState, DepTimeBlk, UniqueCarrier FROM mytable WHERE Flights NOT IN (1) OR (DivAirportSeqIDs__MV0 > 1234302 OR DivAirportSeqIDs__MV1 > 1234302 OR DivAirportSeqIDs__MV2 > 1234302 OR DivAirportSeqIDs__MV3 > 1234302 OR DivAirportSeqIDs__MV4 > 1234302) ORDER BY DivReachedDest, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT OriginState, DepTimeBlk, UniqueCarrier FROM mytable WHERE Flights NOT IN (1) OR DivAirportSeqIDs > 1234302 ORDER BY DivReachedDest, ArrTimeBlk LIMIT 1","hsqls":["SELECT OriginState, DepTimeBlk, UniqueCarrier FROM mytable WHERE Flights NOT IN (1) OR (DivAirportSeqIDs[1] > 1234302 OR DivAirportSeqIDs[2] > 1234302 OR DivAirportSeqIDs[3] > 1234302 OR DivAirportSeqIDs[4] > 1234302 OR DivAirportSeqIDs[5] > 1234302) ORDER BY DivReachedDest, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE OriginStateName >= 'Oklahoma' AND ActualElapsedTime <> 200 OR DayOfWeek < 3 ORDER BY \"Year\", OriginState LIMIT 29","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE OriginStateName >= 'Oklahoma' AND ActualElapsedTime <> 200 OR DayOfWeek < 3 ORDER BY Year, OriginState LIMIT 29"]}
-{"sql":"SELECT DivAirportLandings, UniqueCarrier, DayOfWeek FROM mytable WHERE \"Year\" <> 2014 LIMIT 19","hsqls":["SELECT DivAirportLandings, UniqueCarrier, DayOfWeek FROM mytable WHERE Year <> 2014 LIMIT 19"]}
+{"sql":"SELECT DivAirportLandings, UniqueCarrier, DayOfWeek FROM mytable WHERE \"Year\" <> 2014 LIMIT 19","hsqls":["SELECT DivAirportLandings, UniqueCarrier, DayOfWeek FROM mytable WHERE `Year` <> 2014 LIMIT 19"]}
 {"sql":"SELECT Cancelled, TailNum, MIN(DepDel15) FROM mytable WHERE CRSDepTime <= 1621 GROUP BY Cancelled, TailNum  ORDER BY Cancelled, TailNum LIMIT 6","hsqls":["SELECT Cancelled, TailNum, MIN(DepDel15) FROM mytable WHERE CRSDepTime <= 1621 GROUP BY Cancelled, TailNum  ORDER BY Cancelled, TailNum LIMIT 6"]}
-{"sql":"SELECT DepDelay, DivAirports, CarrierDelay FROM mytable WHERE OriginStateName BETWEEN 'Georgia' AND 'Pennsylvania' ORDER BY OriginState, OriginStateFips, UniqueCarrier LIMIT 28","hsqls":["SELECT DepDelay, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CarrierDelay FROM mytable WHERE OriginStateName BETWEEN 'Georgia' AND 'Pennsylvania' ORDER BY OriginState, OriginStateFips, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivAirports, CarrierDelay FROM mytable WHERE OriginStateName BETWEEN 'Georgia' AND 'Pennsylvania' ORDER BY OriginState, OriginStateFips, UniqueCarrier LIMIT 28","hsqls":["SELECT DepDelay, DivAirports, CarrierDelay FROM mytable WHERE OriginStateName BETWEEN 'Georgia' AND 'Pennsylvania' ORDER BY OriginState, OriginStateFips, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT MAX(DepTime), AVG(OriginWac), AVG(OriginCityMarketID) FROM mytable LIMIT 15"}
 {"sql":"SELECT OriginCityMarketID, OriginCityName, Cancelled, COUNT(*) FROM mytable WHERE DestAirportID <> 14952 AND ArrDelay IN (80.0, 194.0, 15.0) GROUP BY OriginCityMarketID, OriginCityName, Cancelled  ORDER BY OriginCityMarketID, OriginCityName, Cancelled LIMIT 8","hsqls":["SELECT OriginCityMarketID, OriginCityName, Cancelled, COUNT(*) FROM mytable WHERE DestAirportID <> 14952 AND ArrDelay IN (80.0, 194.0, 15.0) GROUP BY OriginCityMarketID, OriginCityName, Cancelled  ORDER BY OriginCityMarketID, OriginCityName, Cancelled LIMIT 8"]}
 {"sql":"SELECT TaxiIn, COUNT(TotalAddGTime) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10","hsqls":["SELECT TaxiIn, COUNT(TotalAddGTime) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10"]}
 {"sql":"SELECT Diverted, COUNT(WheelsOn) FROM mytable WHERE OriginCityName <= 'Raleigh/Durham, NC' GROUP BY Diverted  ORDER BY Diverted LIMIT 5","hsqls":["SELECT Diverted, COUNT(WheelsOn) FROM mytable WHERE OriginCityName <= 'Raleigh/Durham, NC' GROUP BY Diverted  ORDER BY Diverted LIMIT 5"]}
 {"sql":"SELECT DepartureDelayGroups, DestAirportID, CancellationCode FROM mytable WHERE DayofMonth BETWEEN 23 AND 26 OR Flights NOT IN (1) OR OriginAirportID BETWEEN 10157 AND 14193 ORDER BY DepDelay, DestState, DepTimeBlk LIMIT 19"}
-{"sql":"SELECT Flights, DivTailNums FROM mytable WHERE Flights < 1 AND FlightNum < 1843 OR FlightNum < 3384 ORDER BY NASDelay LIMIT 4","hsqls":["SELECT Flights, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Flights < 1 AND FlightNum < 1843 OR FlightNum < 3384 ORDER BY NASDelay LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, CRSArrTime, DivTailNums FROM mytable WHERE CarrierDelay <= 23 LIMIT 21","hsqls":["SELECT WheelsOff, CRSArrTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE CarrierDelay <= 23 LIMIT 10000"]}
+{"sql":"SELECT Flights, DivTailNums FROM mytable WHERE Flights < 1 AND FlightNum < 1843 OR FlightNum < 3384 ORDER BY NASDelay LIMIT 4","hsqls":["SELECT Flights, DivTailNums FROM mytable WHERE Flights < 1 AND FlightNum < 1843 OR FlightNum < 3384 ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, CRSArrTime, DivTailNums FROM mytable WHERE CarrierDelay <= 23 LIMIT 21","hsqls":["SELECT WheelsOff, CRSArrTime, DivTailNums FROM mytable WHERE CarrierDelay <= 23 LIMIT 10000"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE CRSElapsedTime NOT IN (186) AND OriginCityMarketID BETWEEN 30620 AND 32511 AND DayOfWeek BETWEEN 1 AND 4 ORDER BY DestWac, LateAircraftDelay LIMIT 26"}
 {"sql":"SELECT WheelsOff, FlightDate, COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (1445, 2019, 2044, 1801) AND DivArrDelay IN (1068, 246) AND DestAirportSeqID BETWEEN 1217301 AND 1091802 GROUP BY WheelsOff, FlightDate  ORDER BY WheelsOff, FlightDate LIMIT 10","hsqls":["SELECT WheelsOff, FlightDate, COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (1445, 2019, 2044, 1801) AND DivArrDelay IN (1068, 246) AND DestAirportSeqID BETWEEN 1217301 AND 1091802 GROUP BY WheelsOff, FlightDate  ORDER BY WheelsOff, FlightDate LIMIT 10"]}
 {"sql":"SELECT FirstDepTime FROM mytable LIMIT 1"}
 {"sql":"SELECT DepDelay FROM mytable WHERE WeatherDelay <> 2 OR DaysSinceEpoch NOT IN (16082, 16097, 16095, 16092, 16076) AND Diverted <= 1 ORDER BY AirlineID, OriginAirportID LIMIT 3"}
 {"sql":"SELECT AVG(DestAirportSeqID), AVG(DestCityMarketID) FROM mytable LIMIT 8"}
-{"sql":"SELECT TotalAddGTime, ArrTimeBlk, COUNT(ArrDelayMinutes), MAX(\"Year\") FROM mytable WHERE DestStateFips IN (31, 38, 50) OR TailNum NOT IN ('N45905', 'N12924') GROUP BY TotalAddGTime, ArrTimeBlk LIMIT 7","hsqls":["SELECT TotalAddGTime, ArrTimeBlk, COUNT(ArrDelayMinutes), MAX(Year) FROM mytable WHERE DestStateFips IN (31, 38, 50) OR TailNum NOT IN ('N45905', 'N12924') GROUP BY TotalAddGTime, ArrTimeBlk LIMIT 7"]}
-{"sql":"SELECT CRSArrTime, Flights FROM mytable WHERE LateAircraftDelay BETWEEN 166 AND 203 AND DivLongestGTimes BETWEEN 4.0 AND 89.0 AND Distance BETWEEN 611 AND 1312 ORDER BY Diverted, AirlineID LIMIT 21","hsqls":["SELECT CRSArrTime, Flights FROM mytable WHERE LateAircraftDelay BETWEEN 166 AND 203 AND (DivLongestGTimes__MV0 BETWEEN 4.0 AND 89.0 OR DivLongestGTimes__MV1 BETWEEN 4.0 AND 89.0 OR DivLongestGTimes__MV2 BETWEEN 4.0 AND 89.0 OR DivLongestGTimes__MV3 BETWEEN 4.0 AND 89.0 OR DivLongestGTimes__MV4 BETWEEN 4.0 AND 89.0) AND Distance BETWEEN 611 AND 1312 ORDER BY Diverted, AirlineID LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, ArrTimeBlk, COUNT(ArrDelayMinutes), MAX(\"Year\") FROM mytable WHERE DestStateFips IN (31, 38, 50) OR TailNum NOT IN ('N45905', 'N12924') GROUP BY TotalAddGTime, ArrTimeBlk LIMIT 7","hsqls":["SELECT TotalAddGTime, ArrTimeBlk, COUNT(ArrDelayMinutes), MAX(`Year`) FROM mytable WHERE DestStateFips IN (31, 38, 50) OR TailNum NOT IN ('N45905', 'N12924') GROUP BY TotalAddGTime, ArrTimeBlk LIMIT 7"]}
+{"sql":"SELECT CRSArrTime, Flights FROM mytable WHERE LateAircraftDelay BETWEEN 166 AND 203 AND DivLongestGTimes BETWEEN 4.0 AND 89.0 AND Distance BETWEEN 611 AND 1312 ORDER BY Diverted, AirlineID LIMIT 21","hsqls":["SELECT CRSArrTime, Flights FROM mytable WHERE LateAircraftDelay BETWEEN 166 AND 203 AND (DivLongestGTimes[1] BETWEEN 4.0 AND 89.0 OR DivLongestGTimes[2] BETWEEN 4.0 AND 89.0 OR DivLongestGTimes[3] BETWEEN 4.0 AND 89.0 OR DivLongestGTimes[4] BETWEEN 4.0 AND 89.0 OR DivLongestGTimes[5] BETWEEN 4.0 AND 89.0) AND Distance BETWEEN 611 AND 1312 ORDER BY Diverted, AirlineID LIMIT 10000"]}
 {"sql":"SELECT AVG(DayofMonth) FROM mytable LIMIT 16"}
 {"sql":"SELECT WeatherDelay, TailNum, DayOfWeek, SUM(AirTime) FROM mytable GROUP BY WeatherDelay, TailNum, DayOfWeek  ORDER BY WeatherDelay, TailNum, DayOfWeek LIMIT 19","hsqls":["SELECT WeatherDelay, TailNum, DayOfWeek, SUM(AirTime) FROM mytable GROUP BY WeatherDelay, TailNum, DayOfWeek  ORDER BY WeatherDelay, TailNum, DayOfWeek LIMIT 19"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes BETWEEN 116.0 AND 41.0 AND CRSArrTime >= 1537 LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 116.0 AND 41.0 OR DivLongestGTimes__MV1 BETWEEN 116.0 AND 41.0 OR DivLongestGTimes__MV2 BETWEEN 116.0 AND 41.0 OR DivLongestGTimes__MV3 BETWEEN 116.0 AND 41.0 OR DivLongestGTimes__MV4 BETWEEN 116.0 AND 41.0) AND CRSArrTime >= 1537 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes BETWEEN 116.0 AND 41.0 AND CRSArrTime >= 1537 LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 116.0 AND 41.0 OR DivLongestGTimes[2] BETWEEN 116.0 AND 41.0 OR DivLongestGTimes[3] BETWEEN 116.0 AND 41.0 OR DivLongestGTimes[4] BETWEEN 116.0 AND 41.0 OR DivLongestGTimes[5] BETWEEN 116.0 AND 41.0) AND CRSArrTime >= 1537 LIMIT 10000"]}
 {"sql":"SELECT DepTime, CRSDepTime, OriginAirportID FROM mytable WHERE ArrDel15 NOT IN (1, -9999) ORDER BY DepDelay, Flights LIMIT 2"}
 {"sql":"SELECT MAX(LateAircraftDelay) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR OriginWac = 85 AND DistanceGroup IN (3, 9) LIMIT 6"}
 {"sql":"SELECT DepTime, DepDel15, COUNT(*) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1700-1759', '1300-1359', '0800-0859', '0600-0659') OR Quarter <= 1 AND CRSDepTime BETWEEN 1838 AND 1654 GROUP BY DepTime, DepDel15  ORDER BY DepTime, DepDel15 LIMIT 21","hsqls":["SELECT DepTime, DepDel15, COUNT(*) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1700-1759', '1300-1359', '0800-0859', '0600-0659') OR Quarter <= 1 AND CRSDepTime BETWEEN 1838 AND 1654 GROUP BY DepTime, DepDel15  ORDER BY DepTime, DepDel15 LIMIT 21"]}
 {"sql":"SELECT TailNum, AVG(LongestAddGTime) FROM mytable WHERE OriginState IN ('GA', 'TT', 'SD', 'FL', 'MA') GROUP BY TailNum  ORDER BY TailNum LIMIT 12","hsqls":["SELECT TailNum, AVG(LongestAddGTime) FROM mytable WHERE OriginState IN ('GA', 'TT', 'SD', 'FL', 'MA') GROUP BY TailNum  ORDER BY TailNum LIMIT 12"]}
 {"sql":"SELECT CancellationCode, SUM(WheelsOn), MIN(DaysSinceEpoch), MIN(AirlineID) FROM mytable WHERE Quarter NOT IN (1) OR Cancelled BETWEEN 1 AND 0 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 29","hsqls":["SELECT CancellationCode, SUM(WheelsOn), MIN(DaysSinceEpoch), MIN(AirlineID) FROM mytable WHERE Quarter NOT IN (1) OR Cancelled BETWEEN 1 AND 0 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 29"]}
-{"sql":"SELECT DivAirports, TaxiIn, DivAirportLandings FROM mytable ORDER BY CRSArrTime, CRSDepTime, DaysSinceEpoch","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, TaxiIn, DivAirportLandings FROM mytable ORDER BY CRSArrTime, CRSDepTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivAirports, TaxiIn, DivAirportLandings FROM mytable ORDER BY CRSArrTime, CRSDepTime, DaysSinceEpoch","hsqls":["SELECT DivAirports, TaxiIn, DivAirportLandings FROM mytable ORDER BY CRSArrTime, CRSDepTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY Carrier LIMIT 12"}
-{"sql":"SELECT DestState, DepDel15 FROM mytable WHERE DivAirports IN ('BDL', 'PAH', 'ATL', 'PVU') ORDER BY OriginAirportID LIMIT 26","hsqls":["SELECT DestState, DepDel15 FROM mytable WHERE (DivAirports__MV0 IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports__MV1 IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports__MV2 IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports__MV3 IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports__MV4 IN ('BDL', 'PAH', 'ATL', 'PVU')) ORDER BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DestState, DepDel15 FROM mytable WHERE DivAirports IN ('BDL', 'PAH', 'ATL', 'PVU') ORDER BY OriginAirportID LIMIT 26","hsqls":["SELECT DestState, DepDel15 FROM mytable WHERE (DivAirports[1] IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports[2] IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports[3] IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports[4] IN ('BDL', 'PAH', 'ATL', 'PVU') OR DivAirports[5] IN ('BDL', 'PAH', 'ATL', 'PVU')) ORDER BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DayofMonth FROM mytable WHERE DestAirportSeqID IN (1148102, 1532302, 1104103, 1383002) AND Dest NOT IN ('PAH') ORDER BY \"Month\", DayOfWeek LIMIT 7","hsqls":["SELECT FlightNum, DayofMonth FROM mytable WHERE DestAirportSeqID IN (1148102, 1532302, 1104103, 1383002) AND Dest NOT IN ('PAH') ORDER BY Month, DayOfWeek LIMIT 7"]}
 {"sql":"SELECT CarrierDelay, DestStateFips, DivArrDelay FROM mytable ORDER BY DivAirportLandings, DivActualElapsedTime LIMIT 10"}
 {"sql":"SELECT UniqueCarrier, OriginAirportID FROM mytable WHERE CancellationCode = 'C' AND DestCityMarketID NOT IN (30693, 33184, 33029, 33486, 34027) AND DepDelay IN (414.0) ORDER BY TaxiOut LIMIT 11"}
 {"sql":"SELECT DestCityName FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 AND UniqueCarrier <> 'EV' ORDER BY LateAircraftDelay, FlightDate, DestCityMarketID LIMIT 2"}
 {"sql":"SELECT ArrDelay, AVG(TaxiOut) FROM mytable WHERE OriginStateName IN ('U.S. Virgin Islands') AND DivReachedDest > 0 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 15","hsqls":["SELECT ArrDelay, AVG(TaxiOut) FROM mytable WHERE OriginStateName IN ('U.S. Virgin Islands') AND DivReachedDest > 0 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 15"]}
 {"sql":"SELECT Carrier, MIN(DestWac), COUNT(OriginAirportID) FROM mytable WHERE TailNum BETWEEN 'N902DA' AND 'N618WN' GROUP BY Carrier  ORDER BY Carrier LIMIT 20","hsqls":["SELECT Carrier, MIN(DestWac), COUNT(OriginAirportID) FROM mytable WHERE TailNum BETWEEN 'N902DA' AND 'N618WN' GROUP BY Carrier  ORDER BY Carrier LIMIT 20"]}
-{"sql":"SELECT DestStateFips, DivArrDelay, DivTotalGTimes FROM mytable WHERE CRSElapsedTime IN (374, 324, 413) ORDER BY TaxiOut LIMIT 22","hsqls":["SELECT DestStateFips, DivArrDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CRSElapsedTime IN (374, 324, 413) ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivArrDelay, DivTotalGTimes FROM mytable WHERE CRSElapsedTime IN (374, 324, 413) ORDER BY TaxiOut LIMIT 22","hsqls":["SELECT DestStateFips, DivArrDelay, DivTotalGTimes FROM mytable WHERE CRSElapsedTime IN (374, 324, 413) ORDER BY TaxiOut LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, ArrDelay FROM mytable LIMIT 14"}
 {"sql":"SELECT OriginAirportID, MIN(Quarter), COUNT(DaysSinceEpoch), SUM(Distance) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 29","hsqls":["SELECT OriginAirportID, MIN(Quarter), COUNT(DaysSinceEpoch), SUM(Distance) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 29"]}
 {"sql":"SELECT DestWac, LateAircraftDelay, DepDelayMinutes, COUNT(DayOfWeek), SUM(FlightNum), MAX(ArrTime) FROM mytable WHERE Origin IN ('LMT', 'MGM', 'AUS') OR OriginState > 'TT' GROUP BY DestWac, LateAircraftDelay, DepDelayMinutes  ORDER BY DestWac, LateAircraftDelay, DepDelayMinutes LIMIT 16","hsqls":["SELECT DestWac, LateAircraftDelay, DepDelayMinutes, COUNT(DayOfWeek), SUM(FlightNum), MAX(ArrTime) FROM mytable WHERE Origin IN ('LMT', 'MGM', 'AUS') OR OriginState > 'TT' GROUP BY DestWac, LateAircraftDelay, DepDelayMinutes  ORDER BY DestWac, LateAircraftDelay, DepDelayMinutes LIMIT 16"]}
 {"sql":"SELECT DepartureDelayGroups, Distance, DestAirportSeqID, AVG(CarrierDelay), AVG(CRSElapsedTime), MIN(TaxiOut) FROM mytable GROUP BY DepartureDelayGroups, Distance, DestAirportSeqID  ORDER BY DepartureDelayGroups, Distance, DestAirportSeqID LIMIT 8","hsqls":["SELECT DepartureDelayGroups, Distance, DestAirportSeqID, AVG(CarrierDelay), AVG(CRSElapsedTime), MIN(TaxiOut) FROM mytable GROUP BY DepartureDelayGroups, Distance, DestAirportSeqID  ORDER BY DepartureDelayGroups, Distance, DestAirportSeqID LIMIT 8"]}
 {"sql":"SELECT OriginCityMarketID, TotalAddGTime, DivActualElapsedTime FROM mytable ORDER BY WeatherDelay, DepDelayMinutes, SecurityDelay LIMIT 18"}
-{"sql":"SELECT AirlineID, MIN(Diverted), MAX(DestAirportID), MAX(DestAirportSeqID) FROM mytable WHERE DepDelayMinutes IN (92.0, 161.0, 173.0) AND DestStateFips <> 9 AND DivLongestGTimes IN (53.0, 128.0, 98.0, 139.0) GROUP BY AirlineID LIMIT 16","hsqls":["SELECT AirlineID, MIN(Diverted), MAX(DestAirportID), MAX(DestAirportSeqID) FROM mytable WHERE DepDelayMinutes IN (92.0, 161.0, 173.0) AND DestStateFips <> 9 AND (DivLongestGTimes__MV0 IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes__MV1 IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes__MV2 IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes__MV3 IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes__MV4 IN (53.0, 128.0, 98.0, 139.0)) GROUP BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT AirlineID, MIN(Diverted), MAX(DestAirportID), MAX(DestAirportSeqID) FROM mytable WHERE DepDelayMinutes IN (92.0, 161.0, 173.0) AND DestStateFips <> 9 AND DivLongestGTimes IN (53.0, 128.0, 98.0, 139.0) GROUP BY AirlineID LIMIT 16","hsqls":["SELECT AirlineID, MIN(Diverted), MAX(DestAirportID), MAX(DestAirportSeqID) FROM mytable WHERE DepDelayMinutes IN (92.0, 161.0, 173.0) AND DestStateFips <> 9 AND (DivLongestGTimes[1] IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes[2] IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes[3] IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes[4] IN (53.0, 128.0, 98.0, 139.0) OR DivLongestGTimes[5] IN (53.0, 128.0, 98.0, 139.0)) GROUP BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT MIN(FlightNum), MIN(WheelsOff), MIN(AirlineID) FROM mytable WHERE TaxiIn IN (59, 63, 102, 37) OR DaysSinceEpoch BETWEEN 16076 AND 16086 LIMIT 23"}
 {"sql":"SELECT DestStateFips, DepTimeBlk, COUNT(CarrierDelay), MIN(DivAirportLandings) FROM mytable WHERE ArrTimeBlk >= '2000-2059' OR AirlineID NOT IN (19690, 19393, 20355, 19977) GROUP BY DestStateFips, DepTimeBlk  ORDER BY DestStateFips, DepTimeBlk LIMIT 8","hsqls":["SELECT DestStateFips, DepTimeBlk, COUNT(CarrierDelay), MIN(DivAirportLandings) FROM mytable WHERE ArrTimeBlk >= '2000-2059' OR AirlineID NOT IN (19690, 19393, 20355, 19977) GROUP BY DestStateFips, DepTimeBlk  ORDER BY DestStateFips, DepTimeBlk LIMIT 8"]}
 {"sql":"SELECT MIN(CRSDepTime), MAX(DayofMonth) FROM mytable WHERE ActualElapsedTime = 276 LIMIT 10"}
 {"sql":"SELECT COUNT(OriginCityMarketID), MIN(ArrDelayMinutes), MAX(CRSDepTime) FROM mytable WHERE TaxiIn BETWEEN 52 AND 13 AND DestCityMarketID NOT IN (34794, 30146, 33970) LIMIT 6"}
-{"sql":"SELECT DestAirportSeqID, AVG(NASDelay), MAX(CRSDepTime) FROM mytable WHERE DivTotalGTimes BETWEEN 96 AND 31 OR Flights BETWEEN 1 AND 1 GROUP BY DestAirportSeqID LIMIT 28","hsqls":["SELECT DestAirportSeqID, AVG(NASDelay), MAX(CRSDepTime) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 96 AND 31 OR DivTotalGTimes__MV1 BETWEEN 96 AND 31 OR DivTotalGTimes__MV2 BETWEEN 96 AND 31 OR DivTotalGTimes__MV3 BETWEEN 96 AND 31 OR DivTotalGTimes__MV4 BETWEEN 96 AND 31) OR Flights BETWEEN 1 AND 1 GROUP BY DestAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT OriginState, DivAirports, DivAirportLandings FROM mytable ORDER BY SecurityDelay LIMIT 19","hsqls":["SELECT OriginState, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DivAirportLandings FROM mytable ORDER BY SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, AVG(NASDelay), MAX(CRSDepTime) FROM mytable WHERE DivTotalGTimes BETWEEN 96 AND 31 OR Flights BETWEEN 1 AND 1 GROUP BY DestAirportSeqID LIMIT 28","hsqls":["SELECT DestAirportSeqID, AVG(NASDelay), MAX(CRSDepTime) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 96 AND 31 OR DivTotalGTimes[2] BETWEEN 96 AND 31 OR DivTotalGTimes[3] BETWEEN 96 AND 31 OR DivTotalGTimes[4] BETWEEN 96 AND 31 OR DivTotalGTimes[5] BETWEEN 96 AND 31) OR Flights BETWEEN 1 AND 1 GROUP BY DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirports, DivAirportLandings FROM mytable ORDER BY SecurityDelay LIMIT 19","hsqls":["SELECT OriginState, DivAirports, DivAirportLandings FROM mytable ORDER BY SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 7 LIMIT 21"}
 {"sql":"SELECT WheelsOff, DepDelayMinutes, OriginWac, AVG(ArrTime), COUNT(LateAircraftDelay), COUNT(DivAirportLandings) FROM mytable WHERE TaxiIn > 16 GROUP BY WheelsOff, DepDelayMinutes, OriginWac  ORDER BY WheelsOff, DepDelayMinutes, OriginWac LIMIT 7","hsqls":["SELECT WheelsOff, DepDelayMinutes, OriginWac, AVG(ArrTime), COUNT(LateAircraftDelay), COUNT(DivAirportLandings) FROM mytable WHERE TaxiIn > 16 GROUP BY WheelsOff, DepDelayMinutes, OriginWac  ORDER BY WheelsOff, DepDelayMinutes, OriginWac LIMIT 7"]}
 {"sql":"SELECT DivDistance, FlightNum FROM mytable WHERE OriginStateFips NOT IN (32, 35) ORDER BY DestState, CarrierDelay LIMIT 1"}
 {"sql":"SELECT DestCityName, WheelsOn FROM mytable WHERE SecurityDelay >= 1 OR DepDel15 BETWEEN -9999 AND -9999 ORDER BY CarrierDelay, ArrDel15, DestStateName LIMIT 22"}
 {"sql":"SELECT Dest, CRSElapsedTime, COUNT(Carrier), COUNT(DivArrDelay) FROM mytable GROUP BY Dest, CRSElapsedTime  ORDER BY Dest, CRSElapsedTime LIMIT 16","hsqls":["SELECT Dest, CRSElapsedTime, COUNT(Carrier), COUNT(DivArrDelay) FROM mytable GROUP BY Dest, CRSElapsedTime  ORDER BY Dest, CRSElapsedTime LIMIT 16"]}
-{"sql":"SELECT DivLongestGTimes, ActualElapsedTime FROM mytable WHERE DestState NOT IN ('NM', 'VI', 'MA') AND OriginCityName BETWEEN 'Petersburg, AK' AND 'Brainerd, MN' AND DivAirportSeqIDs >= 1599102 LIMIT 7","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ActualElapsedTime FROM mytable WHERE DestState NOT IN ('NM', 'VI', 'MA') AND OriginCityName BETWEEN 'Petersburg, AK' AND 'Brainerd, MN' AND (DivAirportSeqIDs__MV0 >= 1599102 OR DivAirportSeqIDs__MV1 >= 1599102 OR DivAirportSeqIDs__MV2 >= 1599102 OR DivAirportSeqIDs__MV3 >= 1599102 OR DivAirportSeqIDs__MV4 >= 1599102) LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 4 OR ArrivalDelayGroups <> 5 AND SecurityDelay BETWEEN 4 AND 0 ORDER BY FlightNum, DepTimeBlk LIMIT 23","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 4 OR ArrivalDelayGroups <> 5 AND SecurityDelay BETWEEN 4 AND 0 ORDER BY FlightNum, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ActualElapsedTime FROM mytable WHERE DestState NOT IN ('NM', 'VI', 'MA') AND OriginCityName BETWEEN 'Petersburg, AK' AND 'Brainerd, MN' AND DivAirportSeqIDs >= 1599102 LIMIT 7","hsqls":["SELECT DivLongestGTimes, ActualElapsedTime FROM mytable WHERE DestState NOT IN ('NM', 'VI', 'MA') AND OriginCityName BETWEEN 'Petersburg, AK' AND 'Brainerd, MN' AND (DivAirportSeqIDs[1] >= 1599102 OR DivAirportSeqIDs[2] >= 1599102 OR DivAirportSeqIDs[3] >= 1599102 OR DivAirportSeqIDs[4] >= 1599102 OR DivAirportSeqIDs[5] >= 1599102) LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 4 OR ArrivalDelayGroups <> 5 AND SecurityDelay BETWEEN 4 AND 0 ORDER BY FlightNum, DepTimeBlk LIMIT 23","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 4 OR ArrivalDelayGroups <> 5 AND SecurityDelay BETWEEN 4 AND 0 ORDER BY FlightNum, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiOut IN (54) AND CRSElapsedTime NOT IN (143, 108, 155) LIMIT 28"}
-{"sql":"SELECT DistanceGroup, Quarter, MAX(DepDelayMinutes) FROM mytable WHERE DivReachedDest IN (-9999) AND DivAirportIDs = 11471 OR DepDel15 IN (1, 0, -9999) GROUP BY DistanceGroup, Quarter LIMIT 8","hsqls":["SELECT DistanceGroup, Quarter, MAX(DepDelayMinutes) FROM mytable WHERE DivReachedDest IN (-9999) AND (DivAirportIDs__MV0 = 11471 OR DivAirportIDs__MV1 = 11471 OR DivAirportIDs__MV2 = 11471 OR DivAirportIDs__MV3 = 11471 OR DivAirportIDs__MV4 = 11471) OR DepDel15 IN (1, 0, -9999) GROUP BY DistanceGroup, Quarter LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, Quarter, MAX(DepDelayMinutes) FROM mytable WHERE DivReachedDest IN (-9999) AND DivAirportIDs = 11471 OR DepDel15 IN (1, 0, -9999) GROUP BY DistanceGroup, Quarter LIMIT 8","hsqls":["SELECT DistanceGroup, Quarter, MAX(DepDelayMinutes) FROM mytable WHERE DivReachedDest IN (-9999) AND (DivAirportIDs[1] = 11471 OR DivAirportIDs[2] = 11471 OR DivAirportIDs[3] = 11471 OR DivAirportIDs[4] = 11471 OR DivAirportIDs[5] = 11471) OR DepDel15 IN (1, 0, -9999) GROUP BY DistanceGroup, Quarter LIMIT 10000"]}
 {"sql":"SELECT Flights, DestCityMarketID FROM mytable WHERE TotalAddGTime BETWEEN 128 AND 37 ORDER BY NASDelay LIMIT 10"}
 {"sql":"SELECT TaxiOut, ArrTimeBlk, UniqueCarrier FROM mytable WHERE DestAirportSeqID <> 1015502 ORDER BY FlightDate LIMIT 27"}
 {"sql":"SELECT DestWac, OriginWac, CRSDepTime, COUNT(*) FROM mytable GROUP BY DestWac, OriginWac, CRSDepTime  ORDER BY DestWac, OriginWac, CRSDepTime LIMIT 19","hsqls":["SELECT DestWac, OriginWac, CRSDepTime, COUNT(*) FROM mytable GROUP BY DestWac, OriginWac, CRSDepTime  ORDER BY DestWac, OriginWac, CRSDepTime LIMIT 19"]}
 {"sql":"SELECT ArrDel15, OriginWac FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) ORDER BY DestWac, DayofMonth LIMIT 7"}
 {"sql":"SELECT \"Year\", DepDelayMinutes, Dest FROM mytable WHERE OriginCityMarketID <= 31517 LIMIT 9","hsqls":["SELECT Year, DepDelayMinutes, Dest FROM mytable WHERE OriginCityMarketID <= 31517 LIMIT 9"]}
-{"sql":"SELECT MAX(DivActualElapsedTime), MIN(\"Month\"), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27","hsqls":["SELECT MAX(DivActualElapsedTime), MIN(Month), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27"]}
+{"sql":"SELECT MAX(DivActualElapsedTime), MIN(\"Month\"), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27","hsqls":["SELECT MAX(DivActualElapsedTime), MIN(`Month`), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE DayOfWeek IN (3, 6, 4) ORDER BY TaxiIn LIMIT 1"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE ActualElapsedTime BETWEEN 164 AND 228 ORDER BY ArrDelay, DestAirportID, DivArrDelay LIMIT 22","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE ActualElapsedTime BETWEEN 164 AND 228 ORDER BY ArrDelay, DestAirportID, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE ActualElapsedTime BETWEEN 164 AND 228 ORDER BY ArrDelay, DestAirportID, DivArrDelay LIMIT 22","hsqls":["SELECT DivWheelsOns FROM mytable WHERE ActualElapsedTime BETWEEN 164 AND 228 ORDER BY ArrDelay, DestAirportID, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, OriginCityMarketID, ArrTimeBlk FROM mytable WHERE OriginCityMarketID IN (32951, 33192) ORDER BY DepartureDelayGroups LIMIT 24"}
 {"sql":"SELECT DivDistance, FirstDepTime FROM mytable ORDER BY CRSArrTime, AirlineID LIMIT 3"}
-{"sql":"SELECT DivArrDelay FROM mytable WHERE WheelsOn <> 704 AND \"Year\" = 2014 ORDER BY FlightDate, DestCityName LIMIT 18","hsqls":["SELECT DivArrDelay FROM mytable WHERE WheelsOn <> 704 AND Year = 2014 ORDER BY FlightDate, DestCityName LIMIT 18"]}
+{"sql":"SELECT DivArrDelay FROM mytable WHERE WheelsOn <> 704 AND \"Year\" = 2014 ORDER BY FlightDate, DestCityName LIMIT 18","hsqls":["SELECT DivArrDelay FROM mytable WHERE WheelsOn <> 704 AND `Year` = 2014 ORDER BY FlightDate, DestCityName LIMIT 18"]}
 {"sql":"SELECT FlightNum, DestStateFips, DestCityName, SUM(ArrDelay), COUNT(CancellationCode) FROM mytable WHERE SecurityDelay BETWEEN 1 AND 14 GROUP BY FlightNum, DestStateFips, DestCityName  ORDER BY FlightNum, DestStateFips, DestCityName LIMIT 27","hsqls":["SELECT FlightNum, DestStateFips, DestCityName, SUM(ArrDelay), COUNT(CancellationCode) FROM mytable WHERE SecurityDelay BETWEEN 1 AND 14 GROUP BY FlightNum, DestStateFips, DestCityName  ORDER BY FlightNum, DestStateFips, DestCityName LIMIT 27"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE DayOfWeek BETWEEN 3 AND 6 ORDER BY DayOfWeek LIMIT 29"}
 {"sql":"SELECT DepartureDelayGroups, DepDelayMinutes, DestCityName, COUNT(*) FROM mytable WHERE TaxiOut NOT IN (124, 80) AND DistanceGroup BETWEEN 5 AND 1 AND DestWac IN (43, 41, 34, 73, 13) GROUP BY DepartureDelayGroups, DepDelayMinutes, DestCityName  ORDER BY DepartureDelayGroups, DepDelayMinutes, DestCityName LIMIT 9","hsqls":["SELECT DepartureDelayGroups, DepDelayMinutes, DestCityName, COUNT(*) FROM mytable WHERE TaxiOut NOT IN (124, 80) AND DistanceGroup BETWEEN 5 AND 1 AND DestWac IN (43, 41, 34, 73, 13) GROUP BY DepartureDelayGroups, DepDelayMinutes, DestCityName  ORDER BY DepartureDelayGroups, DepDelayMinutes, DestCityName LIMIT 9"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivReachedDest NOT IN (0, -9999) AND DivAirportSeqIDs IN (1348702, 1192102, 1432103, 1410002) AND DistanceGroup = 2 LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE DivReachedDest NOT IN (0, -9999) AND (DivAirportSeqIDs__MV0 IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs__MV1 IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs__MV2 IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs__MV3 IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs__MV4 IN (1348702, 1192102, 1432103, 1410002)) AND DistanceGroup = 2 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivReachedDest NOT IN (0, -9999) AND DivAirportSeqIDs IN (1348702, 1192102, 1432103, 1410002) AND DistanceGroup = 2 LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE DivReachedDest NOT IN (0, -9999) AND (DivAirportSeqIDs[1] IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs[2] IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs[3] IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs[4] IN (1348702, 1192102, 1432103, 1410002) OR DivAirportSeqIDs[5] IN (1348702, 1192102, 1432103, 1410002)) AND DistanceGroup = 2 LIMIT 10000"]}
 {"sql":"SELECT COUNT(TaxiOut), MAX(DepDelay) FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'B6' LIMIT 10"}
 {"sql":"SELECT COUNT(TaxiOut) FROM mytable LIMIT 14"}
 {"sql":"SELECT AirTime FROM mytable WHERE DestStateName BETWEEN 'Louisiana' AND 'U.S. Virgin Islands' AND ArrDelay BETWEEN -9999.0 AND 184.0 LIMIT 16"}
-{"sql":"SELECT DivTotalGTimes, OriginStateName FROM mytable WHERE OriginStateFips IN (21, 53) ORDER BY NASDelay, \"Month\", OriginStateName LIMIT 16","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, OriginStateName FROM mytable WHERE OriginStateFips IN (21, 53) ORDER BY NASDelay, Month, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes, OriginStateName FROM mytable WHERE OriginStateFips IN (21, 53) ORDER BY NASDelay, \"Month\", OriginStateName LIMIT 16","hsqls":["SELECT DivTotalGTimes, OriginStateName FROM mytable WHERE OriginStateFips IN (21, 53) ORDER BY NASDelay, Month, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT AirTime, COUNT(DestStateName), MAX(DepDel15), MIN(TaxiIn) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 3","hsqls":["SELECT AirTime, COUNT(DestStateName), MAX(DepDel15), MIN(TaxiIn) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 3"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DepTimeBlk IN ('2300-2359') AND DivWheelsOffs IN (2010, 1555, 1940, 1251) LIMIT 14","hsqls":["SELECT Month FROM mytable WHERE DepTimeBlk IN ('2300-2359') AND (DivWheelsOffs__MV0 IN (2010, 1555, 1940, 1251) OR DivWheelsOffs__MV1 IN (2010, 1555, 1940, 1251) OR DivWheelsOffs__MV2 IN (2010, 1555, 1940, 1251) OR DivWheelsOffs__MV3 IN (2010, 1555, 1940, 1251) OR DivWheelsOffs__MV4 IN (2010, 1555, 1940, 1251)) LIMIT 10000"]}
-{"sql":"SELECT DayofMonth, ArrDelay FROM mytable WHERE DivActualElapsedTime NOT IN (102) OR ArrivalDelayGroups BETWEEN -2 AND 7 ORDER BY \"Year\" LIMIT 28","hsqls":["SELECT DayofMonth, ArrDelay FROM mytable WHERE DivActualElapsedTime NOT IN (102) OR ArrivalDelayGroups BETWEEN -2 AND 7 ORDER BY Year LIMIT 28"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DepTimeBlk IN ('2300-2359') AND DivWheelsOffs IN (2010, 1555, 1940, 1251) LIMIT 14","hsqls":["SELECT `Month` FROM mytable WHERE DepTimeBlk IN ('2300-2359') AND (DivWheelsOffs[1] IN (2010, 1555, 1940, 1251) OR DivWheelsOffs[2] IN (2010, 1555, 1940, 1251) OR DivWheelsOffs[3] IN (2010, 1555, 1940, 1251) OR DivWheelsOffs[4] IN (2010, 1555, 1940, 1251) OR DivWheelsOffs[5] IN (2010, 1555, 1940, 1251)) LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, ArrDelay FROM mytable WHERE DivActualElapsedTime NOT IN (102) OR ArrivalDelayGroups BETWEEN -2 AND 7 ORDER BY \"Year\" LIMIT 28","hsqls":["SELECT DayofMonth, ArrDelay FROM mytable WHERE DivActualElapsedTime NOT IN (102) OR ArrivalDelayGroups BETWEEN -2 AND 7 ORDER BY `Year` LIMIT 28"]}
 {"sql":"SELECT DestWac, DestCityName FROM mytable WHERE OriginWac IN (12) AND OriginCityMarketID BETWEEN 30279 AND 34986 LIMIT 6"}
 {"sql":"SELECT OriginStateFips, SUM(DepDel15), SUM(AirlineID), COUNT(Diverted) FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 24 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18","hsqls":["SELECT OriginStateFips, SUM(DepDel15), SUM(AirlineID), COUNT(Diverted) FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 24 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18"]}
 {"sql":"SELECT DistanceGroup, DivDistance, OriginCityName, COUNT(*) FROM mytable WHERE DestCityMarketID IN (32012, 32343) GROUP BY DistanceGroup, DivDistance, OriginCityName  ORDER BY DistanceGroup, DivDistance, OriginCityName LIMIT 9","hsqls":["SELECT DistanceGroup, DivDistance, OriginCityName, COUNT(*) FROM mytable WHERE DestCityMarketID IN (32012, 32343) GROUP BY DistanceGroup, DivDistance, OriginCityName  ORDER BY DistanceGroup, DivDistance, OriginCityName LIMIT 9"]}
@@ -3427,40 +3427,40 @@
 {"sql":"SELECT DestWac, FirstDepTime FROM mytable LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) LIMIT 17"}
 {"sql":"SELECT DestStateName, COUNT(*) FROM mytable WHERE DivDistance NOT IN (570, 74) OR UniqueCarrier <= 'VX' GROUP BY DestStateName  ORDER BY DestStateName LIMIT 23","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable WHERE DivDistance NOT IN (570, 74) OR UniqueCarrier <= 'VX' GROUP BY DestStateName  ORDER BY DestStateName LIMIT 23"]}
-{"sql":"SELECT DivAirportIDs, CancellationCode FROM mytable WHERE OriginState NOT IN ('TT', 'AL') OR Diverted <> 0 AND Carrier NOT IN ('US', 'OO', 'MQ', 'AA') ORDER BY Quarter LIMIT 15","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CancellationCode FROM mytable WHERE OriginState NOT IN ('TT', 'AL') OR Diverted <> 0 AND Carrier NOT IN ('US', 'OO', 'MQ', 'AA') ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, CancellationCode FROM mytable WHERE OriginState NOT IN ('TT', 'AL') OR Diverted <> 0 AND Carrier NOT IN ('US', 'OO', 'MQ', 'AA') ORDER BY Quarter LIMIT 15","hsqls":["SELECT DivAirportIDs, CancellationCode FROM mytable WHERE OriginState NOT IN ('TT', 'AL') OR Diverted <> 0 AND Carrier NOT IN ('US', 'OO', 'MQ', 'AA') ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, Cancelled, OriginWac, MIN(DestStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND OriginState NOT IN ('TN', 'NE', 'MI', 'FL', 'MD') GROUP BY LongestAddGTime, Cancelled, OriginWac  ORDER BY LongestAddGTime, Cancelled, OriginWac LIMIT 15","hsqls":["SELECT LongestAddGTime, Cancelled, OriginWac, MIN(DestStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND OriginState NOT IN ('TN', 'NE', 'MI', 'FL', 'MD') GROUP BY LongestAddGTime, Cancelled, OriginWac  ORDER BY LongestAddGTime, Cancelled, OriginWac LIMIT 15"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE OriginAirportID <= 12323 AND TotalAddGTime BETWEEN 29 AND 7 AND OriginAirportSeqID IN (1302402, 1027903, 1014602, 1105703) LIMIT 13"}
 {"sql":"SELECT DepDelayMinutes, DayofMonth FROM mytable WHERE TotalAddGTime > 14 OR Quarter IN (1) ORDER BY DestAirportSeqID LIMIT 28"}
 {"sql":"SELECT TailNum, Origin FROM mytable ORDER BY SecurityDelay LIMIT 9"}
-{"sql":"SELECT OriginState, DivAirportIDs, ArrDel15 FROM mytable ORDER BY DepTime LIMIT 15","hsqls":["SELECT OriginState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDel15 FROM mytable ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirportIDs, ArrDel15 FROM mytable ORDER BY DepTime LIMIT 15","hsqls":["SELECT OriginState, DivAirportIDs, ArrDel15 FROM mytable ORDER BY DepTime LIMIT 10000"]}
 {"sql":"SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE WeatherDelay NOT IN (166) AND DaysSinceEpoch BETWEEN 16071 AND 16100 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 2","hsqls":["SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE WeatherDelay NOT IN (166) AND DaysSinceEpoch BETWEEN 16071 AND 16100 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 2"]}
-{"sql":"SELECT DestStateFips, AirlineID FROM mytable WHERE DivWheelsOffs IN (5, 1403) ORDER BY \"Month\" LIMIT 9","hsqls":["SELECT DestStateFips, AirlineID FROM mytable WHERE (DivWheelsOffs__MV0 IN (5, 1403) OR DivWheelsOffs__MV1 IN (5, 1403) OR DivWheelsOffs__MV2 IN (5, 1403) OR DivWheelsOffs__MV3 IN (5, 1403) OR DivWheelsOffs__MV4 IN (5, 1403)) ORDER BY Month LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, Diverted, ArrDel15 FROM mytable WHERE DivAirportSeqIDs >= 1498603 AND DestStateFips BETWEEN 45 AND 12 ORDER BY WheelsOff LIMIT 9","hsqls":["SELECT DistanceGroup, Diverted, ArrDel15 FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1498603 OR DivAirportSeqIDs__MV1 >= 1498603 OR DivAirportSeqIDs__MV2 >= 1498603 OR DivAirportSeqIDs__MV3 >= 1498603 OR DivAirportSeqIDs__MV4 >= 1498603) AND DestStateFips BETWEEN 45 AND 12 ORDER BY WheelsOff LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, AirlineID FROM mytable WHERE DivWheelsOffs IN (5, 1403) ORDER BY \"Month\" LIMIT 9","hsqls":["SELECT DestStateFips, AirlineID FROM mytable WHERE (DivWheelsOffs[1] IN (5, 1403) OR DivWheelsOffs[2] IN (5, 1403) OR DivWheelsOffs[3] IN (5, 1403) OR DivWheelsOffs[4] IN (5, 1403) OR DivWheelsOffs[5] IN (5, 1403)) ORDER BY `Month` LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, Diverted, ArrDel15 FROM mytable WHERE DivAirportSeqIDs >= 1498603 AND DestStateFips BETWEEN 45 AND 12 ORDER BY WheelsOff LIMIT 9","hsqls":["SELECT DistanceGroup, Diverted, ArrDel15 FROM mytable WHERE (DivAirportSeqIDs[1] >= 1498603 OR DivAirportSeqIDs[2] >= 1498603 OR DivAirportSeqIDs[3] >= 1498603 OR DivAirportSeqIDs[4] >= 1498603 OR DivAirportSeqIDs[5] >= 1498603) AND DestStateFips BETWEEN 45 AND 12 ORDER BY WheelsOff LIMIT 10000"]}
 {"sql":"SELECT DepTime, MAX(DivReachedDest) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 24","hsqls":["SELECT DepTime, MAX(DivReachedDest) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 24"]}
-{"sql":"SELECT DepTimeBlk, OriginStateName FROM mytable WHERE ArrTime BETWEEN 2158 AND 1331 AND DivTailNums IN ('N868CA') AND DestStateFips IN (40) LIMIT 6","hsqls":["SELECT DepTimeBlk, OriginStateName FROM mytable WHERE ArrTime BETWEEN 2158 AND 1331 AND (DivTailNums__MV0 IN ('N868CA') OR DivTailNums__MV1 IN ('N868CA') OR DivTailNums__MV2 IN ('N868CA') OR DivTailNums__MV3 IN ('N868CA') OR DivTailNums__MV4 IN ('N868CA')) AND DestStateFips IN (40) LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, OriginStateName FROM mytable WHERE ArrTime BETWEEN 2158 AND 1331 AND DivTailNums IN ('N868CA') AND DestStateFips IN (40) LIMIT 6","hsqls":["SELECT DepTimeBlk, OriginStateName FROM mytable WHERE ArrTime BETWEEN 2158 AND 1331 AND (DivTailNums[1] IN ('N868CA') OR DivTailNums[2] IN ('N868CA') OR DivTailNums[3] IN ('N868CA') OR DivTailNums[4] IN ('N868CA') OR DivTailNums[5] IN ('N868CA')) AND DestStateFips IN (40) LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, DivDistance FROM mytable WHERE CRSArrTime BETWEEN 840 AND 859 OR DivReachedDest NOT IN (1, -9999) OR DayofMonth = 24 LIMIT 3"}
-{"sql":"SELECT DivReachedDest, ArrDelay, UniqueCarrier FROM mytable WHERE DivAirportSeqIDs IN (1228002, 1405702, 1448702) OR TailNum <> 'N524UW' ORDER BY WheelsOff LIMIT 3","hsqls":["SELECT DivReachedDest, ArrDelay, UniqueCarrier FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs__MV1 IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs__MV2 IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs__MV3 IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs__MV4 IN (1228002, 1405702, 1448702)) OR TailNum <> 'N524UW' ORDER BY WheelsOff LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, ArrDelay, UniqueCarrier FROM mytable WHERE DivAirportSeqIDs IN (1228002, 1405702, 1448702) OR TailNum <> 'N524UW' ORDER BY WheelsOff LIMIT 3","hsqls":["SELECT DivReachedDest, ArrDelay, UniqueCarrier FROM mytable WHERE (DivAirportSeqIDs[1] IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs[2] IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs[3] IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs[4] IN (1228002, 1405702, 1448702) OR DivAirportSeqIDs[5] IN (1228002, 1405702, 1448702)) OR TailNum <> 'N524UW' ORDER BY WheelsOff LIMIT 10000"]}
 {"sql":"SELECT Distance FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 ORDER BY WeatherDelay LIMIT 4"}
-{"sql":"SELECT DepartureDelayGroups, OriginAirportSeqID, DepTime, AVG(\"Year\"), MAX(DepDel15), COUNT(OriginState) FROM mytable WHERE DestWac BETWEEN 61 AND 88 OR OriginWac BETWEEN 82 AND 54 GROUP BY DepartureDelayGroups, OriginAirportSeqID, DepTime LIMIT 5","hsqls":["SELECT DepartureDelayGroups, OriginAirportSeqID, DepTime, AVG(Year), MAX(DepDel15), COUNT(OriginState) FROM mytable WHERE DestWac BETWEEN 61 AND 88 OR OriginWac BETWEEN 82 AND 54 GROUP BY DepartureDelayGroups, OriginAirportSeqID, DepTime LIMIT 5"]}
+{"sql":"SELECT DepartureDelayGroups, OriginAirportSeqID, DepTime, AVG(\"Year\"), MAX(DepDel15), COUNT(OriginState) FROM mytable WHERE DestWac BETWEEN 61 AND 88 OR OriginWac BETWEEN 82 AND 54 GROUP BY DepartureDelayGroups, OriginAirportSeqID, DepTime LIMIT 5","hsqls":["SELECT DepartureDelayGroups, OriginAirportSeqID, DepTime, AVG(`Year`), MAX(DepDel15), COUNT(OriginState) FROM mytable WHERE DestWac BETWEEN 61 AND 88 OR OriginWac BETWEEN 82 AND 54 GROUP BY DepartureDelayGroups, OriginAirportSeqID, DepTime LIMIT 5"]}
 {"sql":"SELECT DestState, DayofMonth, COUNT(*) FROM mytable GROUP BY DestState, DayofMonth  ORDER BY DestState, DayofMonth LIMIT 29","hsqls":["SELECT DestState, DayofMonth, COUNT(*) FROM mytable GROUP BY DestState, DayofMonth  ORDER BY DestState, DayofMonth LIMIT 29"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDel15 <= -9999 OR DaysSinceEpoch <> 16089 LIMIT 9"}
-{"sql":"SELECT WheelsOff, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE CarrierDelay = 62 OR TaxiOut <= 39 AND Dest NOT IN ('BTR', 'SJC') ORDER BY FlightNum LIMIT 8","hsqls":["SELECT WheelsOff, ArrDelayMinutes, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE CarrierDelay = 62 OR TaxiOut <= 39 AND Dest NOT IN ('BTR', 'SJC') ORDER BY FlightNum LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE DepDelay BETWEEN 50.0 AND 298.0 ORDER BY WheelsOff LIMIT 18","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, OriginAirportID FROM mytable WHERE DepDelay BETWEEN 50.0 AND 298.0 ORDER BY WheelsOff LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE CarrierDelay = 62 OR TaxiOut <= 39 AND Dest NOT IN ('BTR', 'SJC') ORDER BY FlightNum LIMIT 8","hsqls":["SELECT WheelsOff, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE CarrierDelay = 62 OR TaxiOut <= 39 AND Dest NOT IN ('BTR', 'SJC') ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE DepDelay BETWEEN 50.0 AND 298.0 ORDER BY WheelsOff LIMIT 18","hsqls":["SELECT DivWheelsOffs, OriginAirportID FROM mytable WHERE DepDelay BETWEEN 50.0 AND 298.0 ORDER BY WheelsOff LIMIT 10000"]}
 {"sql":"SELECT FlightDate, DestAirportSeqID, ArrivalDelayGroups FROM mytable WHERE WheelsOff BETWEEN 1355 AND 1245 AND OriginCityMarketID NOT IN (30208) LIMIT 19"}
 {"sql":"SELECT DestAirportID FROM mytable LIMIT 14"}
 {"sql":"SELECT OriginAirportSeqID, Cancelled FROM mytable WHERE OriginCityMarketID >= 33158 OR AirTime NOT IN (222, 236, 461, 167) ORDER BY TaxiOut, LateAircraftDelay, AirTime LIMIT 10"}
 {"sql":"SELECT AVG(NASDelay), MAX(DistanceGroup) FROM mytable WHERE TaxiIn BETWEEN 140 AND 11 LIMIT 17"}
-{"sql":"SELECT DepTime, SUM(Diverted), AVG(FirstDepTime), MIN(DestAirportSeqID) FROM mytable WHERE DivTailNums <= 'N283JB' AND \"Month\" IN (1) OR Carrier BETWEEN 'AS' AND 'F9' GROUP BY DepTime LIMIT 6","hsqls":["SELECT DepTime, SUM(Diverted), AVG(FirstDepTime), MIN(DestAirportSeqID) FROM mytable WHERE (DivTailNums__MV0 <= 'N283JB' OR DivTailNums__MV1 <= 'N283JB' OR DivTailNums__MV2 <= 'N283JB' OR DivTailNums__MV3 <= 'N283JB' OR DivTailNums__MV4 <= 'N283JB') AND Month IN (1) OR Carrier BETWEEN 'AS' AND 'F9' GROUP BY DepTime LIMIT 10000"]}
+{"sql":"SELECT DepTime, SUM(Diverted), AVG(FirstDepTime), MIN(DestAirportSeqID) FROM mytable WHERE DivTailNums <= 'N283JB' AND \"Month\" IN (1) OR Carrier BETWEEN 'AS' AND 'F9' GROUP BY DepTime LIMIT 6","hsqls":["SELECT DepTime, SUM(Diverted), AVG(FirstDepTime), MIN(DestAirportSeqID) FROM mytable WHERE (DivTailNums[1] <= 'N283JB' OR DivTailNums[2] <= 'N283JB' OR DivTailNums[3] <= 'N283JB' OR DivTailNums[4] <= 'N283JB' OR DivTailNums[5] <= 'N283JB') AND `Month` IN (1) OR Carrier BETWEEN 'AS' AND 'F9' GROUP BY DepTime LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, Cancelled, ArrDel15 FROM mytable WHERE SecurityDelay NOT IN (-9999) ORDER BY WheelsOff, FlightDate, OriginCityName LIMIT 13"}
-{"sql":"SELECT CarrierDelay, DivTailNums, UniqueCarrier FROM mytable WHERE DivAirportSeqIDs = 1114002 OR OriginAirportSeqID BETWEEN 1100303 AND 1078102 OR DestState NOT IN ('SD', 'AZ', 'RI') LIMIT 7","hsqls":["SELECT CarrierDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, UniqueCarrier FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1114002 OR DivAirportSeqIDs__MV1 = 1114002 OR DivAirportSeqIDs__MV2 = 1114002 OR DivAirportSeqIDs__MV3 = 1114002 OR DivAirportSeqIDs__MV4 = 1114002) OR OriginAirportSeqID BETWEEN 1100303 AND 1078102 OR DestState NOT IN ('SD', 'AZ', 'RI') LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivTailNums, UniqueCarrier FROM mytable WHERE DivAirportSeqIDs = 1114002 OR OriginAirportSeqID BETWEEN 1100303 AND 1078102 OR DestState NOT IN ('SD', 'AZ', 'RI') LIMIT 7","hsqls":["SELECT CarrierDelay, DivTailNums, UniqueCarrier FROM mytable WHERE (DivAirportSeqIDs[1] = 1114002 OR DivAirportSeqIDs[2] = 1114002 OR DivAirportSeqIDs[3] = 1114002 OR DivAirportSeqIDs[4] = 1114002 OR DivAirportSeqIDs[5] = 1114002) OR OriginAirportSeqID BETWEEN 1100303 AND 1078102 OR DestState NOT IN ('SD', 'AZ', 'RI') LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, \"Month\", OriginStateName, COUNT(CRSDepTime), MAX(TaxiIn), MAX(DivReachedDest) FROM mytable GROUP BY ArrDelayMinutes, \"Month\", OriginStateName LIMIT 27","hsqls":["SELECT ArrDelayMinutes, Month, OriginStateName, COUNT(CRSDepTime), MAX(TaxiIn), MAX(DivReachedDest) FROM mytable GROUP BY ArrDelayMinutes, Month, OriginStateName LIMIT 27"]}
-{"sql":"SELECT NASDelay FROM mytable WHERE Flights IN (1) OR OriginStateName IN ('New Hampshire', 'Iowa') ORDER BY Origin, \"Month\" LIMIT 4","hsqls":["SELECT NASDelay FROM mytable WHERE Flights IN (1) OR OriginStateName IN ('New Hampshire', 'Iowa') ORDER BY Origin, Month LIMIT 4"]}
+{"sql":"SELECT NASDelay FROM mytable WHERE Flights IN (1) OR OriginStateName IN ('New Hampshire', 'Iowa') ORDER BY Origin, \"Month\" LIMIT 4","hsqls":["SELECT NASDelay FROM mytable WHERE Flights IN (1) OR OriginStateName IN ('New Hampshire', 'Iowa') ORDER BY Origin, `Month` LIMIT 4"]}
 {"sql":"SELECT OriginAirportID, MIN(DivActualElapsedTime), MIN(LateAircraftDelay), MAX(ArrDelayMinutes) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 27","hsqls":["SELECT OriginAirportID, MIN(DivActualElapsedTime), MIN(LateAircraftDelay), MAX(ArrDelayMinutes) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 27"]}
-{"sql":"SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime) FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND DivWheelsOns IN (1717, 102, 1835) LIMIT 24","hsqls":["SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime)  FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND (DivWheelsOns__MV0 IN (1717, 102, 1835) OR DivWheelsOns__MV1 IN (1717, 102, 1835) OR DivWheelsOns__MV2 IN (1717, 102, 1835) OR DivWheelsOns__MV3 IN (1717, 102, 1835) OR DivWheelsOns__MV4 IN (1717, 102, 1835)) LIMIT 10000"]}
+{"sql":"SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime) FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND DivWheelsOns IN (1717, 102, 1835) LIMIT 24","hsqls":["SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime)  FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND (DivWheelsOns[1] IN (1717, 102, 1835) OR DivWheelsOns[2] IN (1717, 102, 1835) OR DivWheelsOns[3] IN (1717, 102, 1835) OR DivWheelsOns[4] IN (1717, 102, 1835) OR DivWheelsOns[5] IN (1717, 102, 1835)) LIMIT 10000"]}
 {"sql":"SELECT COUNT(TaxiIn) FROM mytable WHERE OriginCityName > 'Great Falls, MT' AND OriginWac IN (44, 42, 73, 61, 85) AND DivAirportLandings NOT IN (1, 9) LIMIT 4"}
 {"sql":"SELECT DivDistance, ArrTimeBlk, Origin FROM mytable LIMIT 27"}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE OriginStateFips >= 2 ORDER BY ArrTimeBlk, DepTimeBlk, UniqueCarrier LIMIT 23"}
-{"sql":"SELECT DestState, NASDelay, AVG(\"Year\"), MAX(NASDelay), MIN(LongestAddGTime) FROM mytable WHERE DivAirportLandings IN (2) OR DayOfWeek = 4 OR \"Year\" NOT IN (2014) GROUP BY DestState, NASDelay LIMIT 23","hsqls":["SELECT DestState, NASDelay, AVG(Year), MAX(NASDelay), MIN(LongestAddGTime) FROM mytable WHERE DivAirportLandings IN (2) OR DayOfWeek = 4 OR Year NOT IN (2014) GROUP BY DestState, NASDelay LIMIT 23"]}
+{"sql":"SELECT DestState, NASDelay, AVG(\"Year\"), MAX(NASDelay), MIN(LongestAddGTime) FROM mytable WHERE DivAirportLandings IN (2) OR DayOfWeek = 4 OR \"Year\" NOT IN (2014) GROUP BY DestState, NASDelay LIMIT 23","hsqls":["SELECT DestState, NASDelay, AVG(`Year`), MAX(NASDelay), MIN(LongestAddGTime) FROM mytable WHERE DivAirportLandings IN (2) OR DayOfWeek = 4 OR `Year` NOT IN (2014) GROUP BY DestState, NASDelay LIMIT 23"]}
 {"sql":"SELECT DestStateFips, ArrDel15, Origin, MIN(TotalAddGTime) FROM mytable WHERE AirlineID IN (19790, 20355) GROUP BY DestStateFips, ArrDel15, Origin  ORDER BY DestStateFips, ArrDel15, Origin LIMIT 2","hsqls":["SELECT DestStateFips, ArrDel15, Origin, MIN(TotalAddGTime) FROM mytable WHERE AirlineID IN (19790, 20355) GROUP BY DestStateFips, ArrDel15, Origin  ORDER BY DestStateFips, ArrDel15, Origin LIMIT 2"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE OriginAirportSeqID <> 1411302 AND DepDelay BETWEEN 34.0 AND 155.0 OR AirlineID >= 19805 ORDER BY OriginState LIMIT 10"}
 {"sql":"SELECT MIN(CarrierDelay) FROM mytable WHERE ArrivalDelayGroups <> 12 AND DestCityName >= 'Peoria, IL' LIMIT 4"}
@@ -3468,39 +3468,39 @@
 {"sql":"SELECT Flights, MIN(DepDel15), MIN(CarrierDelay) FROM mytable GROUP BY Flights","hsqls":["SELECT Flights, MIN(DepDel15), MIN(CarrierDelay) FROM mytable GROUP BY Flights"]}
 {"sql":"SELECT FlightNum, NASDelay, DivArrDelay, MIN(Cancelled) FROM mytable GROUP BY FlightNum, NASDelay, DivArrDelay  ORDER BY FlightNum, NASDelay, DivArrDelay LIMIT 26","hsqls":["SELECT FlightNum, NASDelay, DivArrDelay, MIN(Cancelled) FROM mytable GROUP BY FlightNum, NASDelay, DivArrDelay  ORDER BY FlightNum, NASDelay, DivArrDelay LIMIT 26"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE Origin BETWEEN 'RHI' AND 'MDW' ORDER BY CRSArrTime, OriginAirportID LIMIT 26"}
-{"sql":"SELECT Flights FROM mytable WHERE DepDelayMinutes BETWEEN 56.0 AND 24.0 AND DivAirportSeqIDs IN (1482802, 1330303, 1323002) ORDER BY DistanceGroup, FlightNum LIMIT 17","hsqls":["SELECT Flights FROM mytable WHERE DepDelayMinutes BETWEEN 56.0 AND 24.0 AND (DivAirportSeqIDs__MV0 IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs__MV1 IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs__MV2 IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs__MV3 IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs__MV4 IN (1482802, 1330303, 1323002)) ORDER BY DistanceGroup, FlightNum LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE DepDelayMinutes BETWEEN 56.0 AND 24.0 AND DivAirportSeqIDs IN (1482802, 1330303, 1323002) ORDER BY DistanceGroup, FlightNum LIMIT 17","hsqls":["SELECT Flights FROM mytable WHERE DepDelayMinutes BETWEEN 56.0 AND 24.0 AND (DivAirportSeqIDs[1] IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs[2] IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs[3] IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs[4] IN (1482802, 1330303, 1323002) OR DivAirportSeqIDs[5] IN (1482802, 1330303, 1323002)) ORDER BY DistanceGroup, FlightNum LIMIT 10000"]}
 {"sql":"SELECT Carrier, ArrTime, Origin, SUM(ArrDelay), MAX(DivReachedDest) FROM mytable WHERE Quarter IN (1) GROUP BY Carrier, ArrTime, Origin  ORDER BY Carrier, ArrTime, Origin LIMIT 10","hsqls":["SELECT Carrier, ArrTime, Origin, SUM(ArrDelay), MAX(DivReachedDest) FROM mytable WHERE Quarter IN (1) GROUP BY Carrier, ArrTime, Origin  ORDER BY Carrier, ArrTime, Origin LIMIT 10"]}
 {"sql":"SELECT ArrTime, CRSElapsedTime, MIN(DestAirportID), AVG(CRSArrTime) FROM mytable GROUP BY ArrTime, CRSElapsedTime  ORDER BY ArrTime, CRSElapsedTime LIMIT 29","hsqls":["SELECT ArrTime, CRSElapsedTime, MIN(DestAirportID), AVG(CRSArrTime) FROM mytable GROUP BY ArrTime, CRSElapsedTime  ORDER BY ArrTime, CRSElapsedTime LIMIT 29"]}
 {"sql":"SELECT ActualElapsedTime, DaysSinceEpoch FROM mytable WHERE AirlineID <> 20437 OR TaxiIn BETWEEN 25 AND 56 AND TailNum > 'N416UA' ORDER BY Cancelled, DestStateName LIMIT 10"}
-{"sql":"SELECT DivWheelsOns, ArrTime, ArrDel15 FROM mytable ORDER BY Quarter LIMIT 25","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ArrTime, ArrDel15 FROM mytable ORDER BY Quarter LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, FlightNum, NASDelay, MIN(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE DivAirportIDs IN (13796) OR OriginStateFips <= 13 AND DestStateName IN ('Michigan', 'Iowa') GROUP BY LongestAddGTime, FlightNum, NASDelay LIMIT 29","hsqls":["SELECT LongestAddGTime, FlightNum, NASDelay, MIN(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE (DivAirportIDs__MV0 IN (13796) OR DivAirportIDs__MV1 IN (13796) OR DivAirportIDs__MV2 IN (13796) OR DivAirportIDs__MV3 IN (13796) OR DivAirportIDs__MV4 IN (13796)) OR OriginStateFips <= 13 AND DestStateName IN ('Michigan', 'Iowa') GROUP BY LongestAddGTime, FlightNum, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, ArrTime, ArrDel15 FROM mytable ORDER BY Quarter LIMIT 25","hsqls":["SELECT DivWheelsOns, ArrTime, ArrDel15 FROM mytable ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, FlightNum, NASDelay, MIN(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE DivAirportIDs IN (13796) OR OriginStateFips <= 13 AND DestStateName IN ('Michigan', 'Iowa') GROUP BY LongestAddGTime, FlightNum, NASDelay LIMIT 29","hsqls":["SELECT LongestAddGTime, FlightNum, NASDelay, MIN(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE (DivAirportIDs[1] IN (13796) OR DivAirportIDs[2] IN (13796) OR DivAirportIDs[3] IN (13796) OR DivAirportIDs[4] IN (13796) OR DivAirportIDs[5] IN (13796)) OR OriginStateFips <= 13 AND DestStateName IN ('Michigan', 'Iowa') GROUP BY LongestAddGTime, FlightNum, NASDelay LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DistanceGroup, OriginAirportID, MAX(DepartureDelayGroups) FROM mytable WHERE CRSArrTime BETWEEN 2114 AND 1702 AND DestCityMarketID BETWEEN 33570 AND 31537 AND ArrDelay <> 3.0 GROUP BY DivReachedDest, DistanceGroup, OriginAirportID  ORDER BY DivReachedDest, DistanceGroup, OriginAirportID LIMIT 4","hsqls":["SELECT DivReachedDest, DistanceGroup, OriginAirportID, MAX(DepartureDelayGroups) FROM mytable WHERE CRSArrTime BETWEEN 2114 AND 1702 AND DestCityMarketID BETWEEN 33570 AND 31537 AND ArrDelay <> 3.0 GROUP BY DivReachedDest, DistanceGroup, OriginAirportID  ORDER BY DivReachedDest, DistanceGroup, OriginAirportID LIMIT 4"]}
 {"sql":"SELECT DepTime, WheelsOn FROM mytable WHERE DaysSinceEpoch IN (16082, 16088) OR DayofMonth IN (19, 13, 12) AND ArrTimeBlk < '2300-2359' ORDER BY OriginAirportID LIMIT 15"}
 {"sql":"SELECT FlightDate, OriginStateName, COUNT(Dest), SUM(CRSElapsedTime), COUNT(AirTime) FROM mytable WHERE DepDelay < 73.0 AND AirTime IN (219) GROUP BY FlightDate, OriginStateName  ORDER BY FlightDate, OriginStateName LIMIT 10","hsqls":["SELECT FlightDate, OriginStateName, COUNT(Dest), SUM(CRSElapsedTime), COUNT(AirTime) FROM mytable WHERE DepDelay < 73.0 AND AirTime IN (219) GROUP BY FlightDate, OriginStateName  ORDER BY FlightDate, OriginStateName LIMIT 10"]}
 {"sql":"SELECT DivDistance, DestCityMarketID FROM mytable WHERE DivDistance NOT IN (777, 83, 169, 439) ORDER BY DepTimeBlk LIMIT 10"}
 {"sql":"SELECT ArrDel15, MIN(OriginStateFips), COUNT(OriginWac), MIN(ArrDel15) FROM mytable WHERE DestCityMarketID < 30928 GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 24","hsqls":["SELECT ArrDel15, MIN(OriginStateFips), COUNT(OriginWac), MIN(ArrDel15) FROM mytable WHERE DestCityMarketID < 30928 GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 24"]}
 {"sql":"SELECT AirlineID, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (0) GROUP BY AirlineID  ORDER BY AirlineID LIMIT 27","hsqls":["SELECT AirlineID, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (0) GROUP BY AirlineID  ORDER BY AirlineID LIMIT 27"]}
-{"sql":"SELECT DivAirportSeqIDs, ActualElapsedTime, AirTime FROM mytable ORDER BY DivReachedDest, OriginStateFips, DayofMonth LIMIT 18","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ActualElapsedTime, AirTime FROM mytable ORDER BY DivReachedDest, OriginStateFips, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, ActualElapsedTime, AirTime FROM mytable ORDER BY DivReachedDest, OriginStateFips, DayofMonth LIMIT 18","hsqls":["SELECT DivAirportSeqIDs, ActualElapsedTime, AirTime FROM mytable ORDER BY DivReachedDest, OriginStateFips, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT Quarter, FlightDate, DestAirportID FROM mytable WHERE ActualElapsedTime BETWEEN 271 AND 299 ORDER BY Diverted, Distance, ArrDelayMinutes LIMIT 25"}
 {"sql":"SELECT Flights FROM mytable WHERE ArrTime > 919 ORDER BY CarrierDelay LIMIT 4"}
 {"sql":"SELECT OriginState, Distance, UniqueCarrier FROM mytable ORDER BY FirstDepTime LIMIT 12"}
 {"sql":"SELECT LateAircraftDelay, LongestAddGTime FROM mytable ORDER BY OriginWac, DestCityMarketID LIMIT 4"}
-{"sql":"SELECT DestAirportID, MIN(Distance) FROM mytable WHERE \"Month\" IN (1) GROUP BY DestAirportID LIMIT 1","hsqls":["SELECT DestAirportID, MIN(Distance) FROM mytable WHERE Month IN (1) GROUP BY DestAirportID LIMIT 1"]}
+{"sql":"SELECT DestAirportID, MIN(Distance) FROM mytable WHERE \"Month\" IN (1) GROUP BY DestAirportID LIMIT 1","hsqls":["SELECT DestAirportID, MIN(Distance) FROM mytable WHERE `Month` IN (1) GROUP BY DestAirportID LIMIT 1"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(TaxiOut), AVG(Distance), SUM(OriginStateFips) FROM mytable WHERE UniqueCarrier = 'WN' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 5","hsqls":["SELECT DaysSinceEpoch, COUNT(TaxiOut), AVG(Distance), SUM(OriginStateFips) FROM mytable WHERE UniqueCarrier = 'WN' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 5"]}
 {"sql":"SELECT ActualElapsedTime, AirTime, DestAirportID FROM mytable WHERE DestAirportSeqID BETWEEN 1062702 AND 1397002 OR Flights = 1 AND DayofMonth >= 12 ORDER BY DistanceGroup LIMIT 3"}
-{"sql":"SELECT TotalAddGTime, DivWheelsOffs, DepTimeBlk FROM mytable WHERE TaxiOut IN (97, 78, 51) AND WheelsOn = 1333 ORDER BY DestCityMarketID, DaysSinceEpoch LIMIT 23","hsqls":["SELECT TotalAddGTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DepTimeBlk FROM mytable WHERE TaxiOut IN (97, 78, 51) AND WheelsOn = 1333 ORDER BY DestCityMarketID, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DivWheelsOffs, DepTimeBlk FROM mytable WHERE TaxiOut IN (97, 78, 51) AND WheelsOn = 1333 ORDER BY DestCityMarketID, DaysSinceEpoch LIMIT 23","hsqls":["SELECT TotalAddGTime, DivWheelsOffs, DepTimeBlk FROM mytable WHERE TaxiOut IN (97, 78, 51) AND WheelsOn = 1333 ORDER BY DestCityMarketID, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DivAirportLandings, WheelsOn FROM mytable WHERE NASDelay NOT IN (58, 107, 23, 62) OR Flights BETWEEN 1 AND 1 ORDER BY LongestAddGTime, DepTime, DayOfWeek LIMIT 11"}
 {"sql":"SELECT OriginCityName, TaxiIn, ArrDelay, SUM(CRSArrTime), MIN(DestAirportSeqID) FROM mytable WHERE CRSDepTime > 2310 AND DivArrDelay NOT IN (144) AND CRSArrTime BETWEEN 1841 AND 2157 GROUP BY OriginCityName, TaxiIn, ArrDelay  ORDER BY OriginCityName, TaxiIn, ArrDelay LIMIT 21","hsqls":["SELECT OriginCityName, TaxiIn, ArrDelay, SUM(CRSArrTime), MIN(DestAirportSeqID) FROM mytable WHERE CRSDepTime > 2310 AND DivArrDelay NOT IN (144) AND CRSArrTime BETWEEN 1841 AND 2157 GROUP BY OriginCityName, TaxiIn, ArrDelay  ORDER BY OriginCityName, TaxiIn, ArrDelay LIMIT 21"]}
 {"sql":"SELECT TaxiIn, DivActualElapsedTime, MAX(Cancelled) FROM mytable WHERE CRSDepTime <> 2123 GROUP BY TaxiIn, DivActualElapsedTime  ORDER BY TaxiIn, DivActualElapsedTime LIMIT 27","hsqls":["SELECT TaxiIn, DivActualElapsedTime, MAX(Cancelled) FROM mytable WHERE CRSDepTime <> 2123 GROUP BY TaxiIn, DivActualElapsedTime  ORDER BY TaxiIn, DivActualElapsedTime LIMIT 27"]}
 {"sql":"SELECT CarrierDelay, DivArrDelay, ArrivalDelayGroups, MAX(DestStateFips), MAX(FirstDepTime), MIN(DistanceGroup) FROM mytable GROUP BY CarrierDelay, DivArrDelay, ArrivalDelayGroups  ORDER BY CarrierDelay, DivArrDelay, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT CarrierDelay, DivArrDelay, ArrivalDelayGroups, MAX(DestStateFips), MAX(FirstDepTime), MIN(DistanceGroup) FROM mytable GROUP BY CarrierDelay, DivArrDelay, ArrivalDelayGroups  ORDER BY CarrierDelay, DivArrDelay, ArrivalDelayGroups LIMIT 16"]}
-{"sql":"SELECT DestStateFips, SecurityDelay, CancellationCode, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) OR DivReachedDest >= 0 OR DivAirportIDs <= -9999 GROUP BY DestStateFips, SecurityDelay, CancellationCode LIMIT 3","hsqls":["SELECT DestStateFips, SecurityDelay, CancellationCode, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) OR DivReachedDest >= 0 OR (DivAirportIDs__MV0 <= -9999 OR DivAirportIDs__MV1 <= -9999 OR DivAirportIDs__MV2 <= -9999 OR DivAirportIDs__MV3 <= -9999 OR DivAirportIDs__MV4 <= -9999) GROUP BY DestStateFips, SecurityDelay, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, SecurityDelay, CancellationCode, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) OR DivReachedDest >= 0 OR DivAirportIDs <= -9999 GROUP BY DestStateFips, SecurityDelay, CancellationCode LIMIT 3","hsqls":["SELECT DestStateFips, SecurityDelay, CancellationCode, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) OR DivReachedDest >= 0 OR (DivAirportIDs[1] <= -9999 OR DivAirportIDs[2] <= -9999 OR DivAirportIDs[3] <= -9999 OR DivAirportIDs[4] <= -9999 OR DivAirportIDs[5] <= -9999) GROUP BY DestStateFips, SecurityDelay, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DepTime, MIN(Distance) FROM mytable WHERE DepartureDelayGroups BETWEEN 3 AND 6 GROUP BY DepTime  ORDER BY DepTime LIMIT 22","hsqls":["SELECT DepTime, MIN(Distance) FROM mytable WHERE DepartureDelayGroups BETWEEN 3 AND 6 GROUP BY DepTime  ORDER BY DepTime LIMIT 22"]}
 {"sql":"SELECT CRSArrTime, OriginStateName, SUM(LongestAddGTime), SUM(AirlineID) FROM mytable WHERE OriginCityMarketID BETWEEN 31995 AND 30279 GROUP BY CRSArrTime, OriginStateName  ORDER BY CRSArrTime, OriginStateName LIMIT 15","hsqls":["SELECT CRSArrTime, OriginStateName, SUM(LongestAddGTime), SUM(AirlineID) FROM mytable WHERE OriginCityMarketID BETWEEN 31995 AND 30279 GROUP BY CRSArrTime, OriginStateName  ORDER BY CRSArrTime, OriginStateName LIMIT 15"]}
 {"sql":"SELECT AirlineID, SUM(TaxiIn), AVG(Flights) FROM mytable WHERE ArrDelayMinutes <= 52.0 AND DestAirportID BETWEEN 12945 AND 12094 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 16","hsqls":["SELECT AirlineID, SUM(TaxiIn), AVG(Flights) FROM mytable WHERE ArrDelayMinutes <= 52.0 AND DestAirportID BETWEEN 12945 AND 12094 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 16"]}
 {"sql":"SELECT OriginState FROM mytable WHERE DepartureDelayGroups <> 3 ORDER BY DivReachedDest, CRSDepTime LIMIT 5"}
 {"sql":"SELECT CRSArrTime, CRSDepTime, OriginStateName FROM mytable WHERE OriginCityName BETWEEN 'Fayetteville, AR' AND 'Helena, MT' AND AirTime >= 238 ORDER BY DivReachedDest, DepDel15, DivActualElapsedTime LIMIT 1"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE DivDistance BETWEEN 369 AND 108 AND OriginStateFips BETWEEN 23 AND 17 ORDER BY CarrierDelay LIMIT 20","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DivDistance BETWEEN 369 AND 108 AND OriginStateFips BETWEEN 23 AND 17 ORDER BY CarrierDelay LIMIT 10000"]}
-{"sql":"SELECT DayofMonth, DivAirportLandings, DivArrDelay FROM mytable WHERE \"Year\" IN (2014) ORDER BY FlightDate, DestAirportID LIMIT 1","hsqls":["SELECT DayofMonth, DivAirportLandings, DivArrDelay FROM mytable WHERE Year IN (2014) ORDER BY FlightDate, DestAirportID LIMIT 1"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE DivDistance BETWEEN 369 AND 108 AND OriginStateFips BETWEEN 23 AND 17 ORDER BY CarrierDelay LIMIT 20","hsqls":["SELECT DivAirportIDs FROM mytable WHERE DivDistance BETWEEN 369 AND 108 AND OriginStateFips BETWEEN 23 AND 17 ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, DivAirportLandings, DivArrDelay FROM mytable WHERE \"Year\" IN (2014) ORDER BY FlightDate, DestAirportID LIMIT 1","hsqls":["SELECT DayofMonth, DivAirportLandings, DivArrDelay FROM mytable WHERE `Year` IN (2014) ORDER BY FlightDate, DestAirportID LIMIT 1"]}
 {"sql":"SELECT FirstDepTime, MAX(Flights) FROM mytable WHERE FlightDate BETWEEN '2014-01-17' AND '2014-01-22' GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 2","hsqls":["SELECT FirstDepTime, MAX(Flights) FROM mytable WHERE FlightDate BETWEEN '2014-01-17' AND '2014-01-22' GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 2"]}
 {"sql":"SELECT WheelsOff, Diverted FROM mytable ORDER BY DivActualElapsedTime LIMIT 9"}
 {"sql":"SELECT FlightDate, ArrTime, CRSDepTime FROM mytable LIMIT 11"}
@@ -3508,26 +3508,26 @@
 {"sql":"SELECT MAX(ArrDelay) FROM mytable WHERE TotalAddGTime IN (97, 7) LIMIT 2"}
 {"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 4 AND DivAirportLandings BETWEEN 2 AND 1 GROUP BY DepDelay  ORDER BY DepDelay LIMIT 10","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 4 AND DivAirportLandings BETWEEN 2 AND 1 GROUP BY DepDelay  ORDER BY DepDelay LIMIT 10"]}
 {"sql":"SELECT WheelsOn, COUNT(OriginStateFips) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 13","hsqls":["SELECT WheelsOn, COUNT(OriginStateFips) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 13"]}
-{"sql":"SELECT WeatherDelay, OriginCityName, WheelsOn, AVG(LongestAddGTime), SUM(ArrTime), AVG(DivAirportLandings) FROM mytable WHERE DivAirportSeqIDs = 1342402 OR DestCityName BETWEEN 'Oklahoma City, OK' AND 'Green Bay, WI' AND DepTimeBlk BETWEEN '0700-0759' AND '0600-0659' GROUP BY WeatherDelay, OriginCityName, WheelsOn LIMIT 20","hsqls":["SELECT WeatherDelay, OriginCityName, WheelsOn, AVG(LongestAddGTime), SUM(ArrTime), AVG(DivAirportLandings) FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1342402 OR DivAirportSeqIDs__MV1 = 1342402 OR DivAirportSeqIDs__MV2 = 1342402 OR DivAirportSeqIDs__MV3 = 1342402 OR DivAirportSeqIDs__MV4 = 1342402) OR DestCityName BETWEEN 'Oklahoma City, OK' AND 'Green Bay, WI' AND DepTimeBlk BETWEEN '0700-0759' AND '0600-0659' GROUP BY WeatherDelay, OriginCityName, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE OriginWac NOT IN (5, 31, 62) AND \"Year\" <> 2014 AND FirstDepTime >= 1018 ORDER BY LateAircraftDelay, DestStateFips, ActualElapsedTime LIMIT 22","hsqls":["SELECT CRSArrTime FROM mytable WHERE OriginWac NOT IN (5, 31, 62) AND Year <> 2014 AND FirstDepTime >= 1018 ORDER BY LateAircraftDelay, DestStateFips, ActualElapsedTime LIMIT 22"]}
+{"sql":"SELECT WeatherDelay, OriginCityName, WheelsOn, AVG(LongestAddGTime), SUM(ArrTime), AVG(DivAirportLandings) FROM mytable WHERE DivAirportSeqIDs = 1342402 OR DestCityName BETWEEN 'Oklahoma City, OK' AND 'Green Bay, WI' AND DepTimeBlk BETWEEN '0700-0759' AND '0600-0659' GROUP BY WeatherDelay, OriginCityName, WheelsOn LIMIT 20","hsqls":["SELECT WeatherDelay, OriginCityName, WheelsOn, AVG(LongestAddGTime), SUM(ArrTime), AVG(DivAirportLandings) FROM mytable WHERE (DivAirportSeqIDs[1] = 1342402 OR DivAirportSeqIDs[2] = 1342402 OR DivAirportSeqIDs[3] = 1342402 OR DivAirportSeqIDs[4] = 1342402 OR DivAirportSeqIDs[5] = 1342402) OR DestCityName BETWEEN 'Oklahoma City, OK' AND 'Green Bay, WI' AND DepTimeBlk BETWEEN '0700-0759' AND '0600-0659' GROUP BY WeatherDelay, OriginCityName, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE OriginWac NOT IN (5, 31, 62) AND \"Year\" <> 2014 AND FirstDepTime >= 1018 ORDER BY LateAircraftDelay, DestStateFips, ActualElapsedTime LIMIT 22","hsqls":["SELECT CRSArrTime FROM mytable WHERE OriginWac NOT IN (5, 31, 62) AND `Year` <> 2014 AND FirstDepTime >= 1018 ORDER BY LateAircraftDelay, DestStateFips, ActualElapsedTime LIMIT 22"]}
 {"sql":"SELECT Flights, DepTime FROM mytable WHERE WeatherDelay NOT IN (10, 100) AND FlightDate BETWEEN '2014-01-20' AND '2014-01-17' LIMIT 24"}
 {"sql":"SELECT DestAirportSeqID, DivAirportLandings, SUM(DivAirportLandings), SUM(OriginAirportID) FROM mytable WHERE DepTimeBlk <= '1800-1859' AND DestAirportID NOT IN (11267, 10620, 11049, 11252, 14576) GROUP BY DestAirportSeqID, DivAirportLandings  ORDER BY DestAirportSeqID, DivAirportLandings LIMIT 27","hsqls":["SELECT DestAirportSeqID, DivAirportLandings, SUM(DivAirportLandings), SUM(OriginAirportID) FROM mytable WHERE DepTimeBlk <= '1800-1859' AND DestAirportID NOT IN (11267, 10620, 11049, 11252, 14576) GROUP BY DestAirportSeqID, DivAirportLandings  ORDER BY DestAirportSeqID, DivAirportLandings LIMIT 27"]}
 {"sql":"SELECT NASDelay, AirlineID, COUNT(*) FROM mytable GROUP BY NASDelay, AirlineID  ORDER BY NASDelay, AirlineID LIMIT 9","hsqls":["SELECT NASDelay, AirlineID, COUNT(*) FROM mytable GROUP BY NASDelay, AirlineID  ORDER BY NASDelay, AirlineID LIMIT 9"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE DestAirportID NOT IN (13184, 14107) OR ArrivalDelayGroups BETWEEN 4 AND 2 ORDER BY TaxiIn, DayOfWeek LIMIT 10"}
 {"sql":"SELECT OriginStateFips, OriginCityName, TailNum, MIN(OriginAirportSeqID), COUNT(DestStateFips), MAX(DestCityMarketID) FROM mytable WHERE ActualElapsedTime = 361 OR OriginWac NOT IN (65) GROUP BY OriginStateFips, OriginCityName, TailNum  ORDER BY OriginStateFips, OriginCityName, TailNum LIMIT 25","hsqls":["SELECT OriginStateFips, OriginCityName, TailNum, MIN(OriginAirportSeqID), COUNT(DestStateFips), MAX(DestCityMarketID) FROM mytable WHERE ActualElapsedTime = 361 OR OriginWac NOT IN (65) GROUP BY OriginStateFips, OriginCityName, TailNum  ORDER BY OriginStateFips, OriginCityName, TailNum LIMIT 25"]}
 {"sql":"SELECT MAX(DestAirportSeqID), COUNT(DaysSinceEpoch), SUM(FlightNum) FROM mytable WHERE CRSElapsedTime >= 102 OR LongestAddGTime IN (19, 54) AND FlightDate IN ('2014-01-05', '2014-01-06', '2014-01-03', '2014-01-20', '2014-01-24') LIMIT 19"}
-{"sql":"SELECT Origin, DivWheelsOffs, DepTimeBlk FROM mytable ORDER BY LongestAddGTime, DivAirportLandings LIMIT 12","hsqls":["SELECT Origin, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DepTimeBlk FROM mytable ORDER BY LongestAddGTime, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT Origin, DivWheelsOffs, DepTimeBlk FROM mytable ORDER BY LongestAddGTime, DivAirportLandings LIMIT 12","hsqls":["SELECT Origin, DivWheelsOffs, DepTimeBlk FROM mytable ORDER BY LongestAddGTime, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT Quarter, DestState, TaxiIn FROM mytable WHERE DestAirportSeqID IN (1074702, 1073203) AND OriginCityMarketID >= 31986 ORDER BY SecurityDelay LIMIT 4"}
 {"sql":"SELECT DivDistance, AirlineID FROM mytable WHERE DestStateName IN ('Virginia', 'New York', 'Rhode Island', 'Florida') ORDER BY CRSArrTime, TailNum, DivArrDelay LIMIT 6"}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 25","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 25"]}
 {"sql":"SELECT OriginAirportSeqID, TailNum, MIN(FlightNum), SUM(DestAirportSeqID), MAX(CRSArrTime) FROM mytable WHERE AirTime = 51 GROUP BY OriginAirportSeqID, TailNum","hsqls":["SELECT OriginAirportSeqID, TailNum, MIN(FlightNum), SUM(DestAirportSeqID), MAX(CRSArrTime) FROM mytable WHERE AirTime = 51 GROUP BY OriginAirportSeqID, TailNum"]}
 {"sql":"SELECT CarrierDelay, NASDelay FROM mytable WHERE DivDistance BETWEEN 401 AND 814 OR DestAirportSeqID > 1063104 LIMIT 14"}
 {"sql":"SELECT OriginState, FlightNum FROM mytable ORDER BY Quarter, TotalAddGTime, AirlineID LIMIT 16"}
-{"sql":"SELECT DivAirports, CancellationCode, CRSDepTime FROM mytable LIMIT 9","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CancellationCode, CRSDepTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirports, CancellationCode, CRSDepTime FROM mytable LIMIT 9","hsqls":["SELECT DivAirports, CancellationCode, CRSDepTime FROM mytable LIMIT 10000"]}
 {"sql":"SELECT FlightNum, OriginCityName FROM mytable WHERE DestCityName IN ('Eagle, CO', 'Branson, MO') ORDER BY FlightDate, SecurityDelay, DivActualElapsedTime LIMIT 12"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' AND DepDel15 IN (1, 0, -9999) LIMIT 2"}
-{"sql":"SELECT DestCityName, TailNum FROM mytable WHERE OriginAirportSeqID <> 1079204 OR FlightDate = '2014-01-19' AND DivWheelsOns BETWEEN 929 AND 1445 ORDER BY WheelsOn, OriginStateName LIMIT 25","hsqls":["SELECT DestCityName, TailNum FROM mytable WHERE OriginAirportSeqID <> 1079204 OR FlightDate = '2014-01-19' AND (DivWheelsOns__MV0 BETWEEN 929 AND 1445 OR DivWheelsOns__MV1 BETWEEN 929 AND 1445 OR DivWheelsOns__MV2 BETWEEN 929 AND 1445 OR DivWheelsOns__MV3 BETWEEN 929 AND 1445 OR DivWheelsOns__MV4 BETWEEN 929 AND 1445) ORDER BY WheelsOn, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes, ActualElapsedTime, MAX(FirstDepTime), MIN(ArrDel15) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND DivWheelsOffs BETWEEN 2104 AND 1138 GROUP BY ArrDelayMinutes, ActualElapsedTime LIMIT 8","hsqls":["SELECT ArrDelayMinutes, ActualElapsedTime, MAX(FirstDepTime), MIN(ArrDel15) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND (DivWheelsOffs__MV0 BETWEEN 2104 AND 1138 OR DivWheelsOffs__MV1 BETWEEN 2104 AND 1138 OR DivWheelsOffs__MV2 BETWEEN 2104 AND 1138 OR DivWheelsOffs__MV3 BETWEEN 2104 AND 1138 OR DivWheelsOffs__MV4 BETWEEN 2104 AND 1138) GROUP BY ArrDelayMinutes, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestCityName, TailNum FROM mytable WHERE OriginAirportSeqID <> 1079204 OR FlightDate = '2014-01-19' AND DivWheelsOns BETWEEN 929 AND 1445 ORDER BY WheelsOn, OriginStateName LIMIT 25","hsqls":["SELECT DestCityName, TailNum FROM mytable WHERE OriginAirportSeqID <> 1079204 OR FlightDate = '2014-01-19' AND (DivWheelsOns[1] BETWEEN 929 AND 1445 OR DivWheelsOns[2] BETWEEN 929 AND 1445 OR DivWheelsOns[3] BETWEEN 929 AND 1445 OR DivWheelsOns[4] BETWEEN 929 AND 1445 OR DivWheelsOns[5] BETWEEN 929 AND 1445) ORDER BY WheelsOn, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, ActualElapsedTime, MAX(FirstDepTime), MIN(ArrDel15) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND DivWheelsOffs BETWEEN 2104 AND 1138 GROUP BY ArrDelayMinutes, ActualElapsedTime LIMIT 8","hsqls":["SELECT ArrDelayMinutes, ActualElapsedTime, MAX(FirstDepTime), MIN(ArrDel15) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) AND (DivWheelsOffs[1] BETWEEN 2104 AND 1138 OR DivWheelsOffs[2] BETWEEN 2104 AND 1138 OR DivWheelsOffs[3] BETWEEN 2104 AND 1138 OR DivWheelsOffs[4] BETWEEN 2104 AND 1138 OR DivWheelsOffs[5] BETWEEN 2104 AND 1138) GROUP BY ArrDelayMinutes, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityName < 'Tyler, TX' OR ArrDel15 <= 0"}
 {"sql":"SELECT TaxiIn, CancellationCode FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 OR CRSElapsedTime <= 183 LIMIT 9"}
 {"sql":"SELECT ActualElapsedTime, DaysSinceEpoch, AVG(FirstDepTime), SUM(DestWac) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR ArrTimeBlk <= '1200-1259' AND OriginAirportSeqID IN (1066602, 1540103) GROUP BY ActualElapsedTime, DaysSinceEpoch  ORDER BY ActualElapsedTime, DaysSinceEpoch LIMIT 7","hsqls":["SELECT ActualElapsedTime, DaysSinceEpoch, AVG(FirstDepTime), SUM(DestWac) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR ArrTimeBlk <= '1200-1259' AND OriginAirportSeqID IN (1066602, 1540103) GROUP BY ActualElapsedTime, DaysSinceEpoch  ORDER BY ActualElapsedTime, DaysSinceEpoch LIMIT 7"]}
@@ -3535,32 +3535,32 @@
 {"sql":"SELECT \"Year\", FlightNum FROM mytable WHERE Flights IN (1) AND CarrierDelay IN (153, 8) LIMIT 1","hsqls":["SELECT Year, FlightNum FROM mytable WHERE Flights IN (1) AND CarrierDelay IN (153, 8) LIMIT 1"]}
 {"sql":"SELECT \"Year\", Dest, COUNT(*) FROM mytable GROUP BY \"Year\", Dest LIMIT 8","hsqls":["SELECT Year, Dest, COUNT(*) FROM mytable GROUP BY Year, Dest LIMIT 8"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE FirstDepTime >= 814 OR FlightNum BETWEEN 5431 AND 6288 LIMIT 29"}
-{"sql":"SELECT DivAirportSeqIDs, DivAirportLandings, \"Month\" FROM mytable WHERE ArrTimeBlk <= '1200-1259' AND DestWac > 86 AND SecurityDelay BETWEEN 27 AND 10 LIMIT 9","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportLandings, Month FROM mytable WHERE ArrTimeBlk <= '1200-1259' AND DestWac > 86 AND SecurityDelay BETWEEN 27 AND 10 LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivAirportLandings, \"Month\" FROM mytable WHERE ArrTimeBlk <= '1200-1259' AND DestWac > 86 AND SecurityDelay BETWEEN 27 AND 10 LIMIT 9","hsqls":["SELECT DivAirportSeqIDs, DivAirportLandings, `Month` FROM mytable WHERE ArrTimeBlk <= '1200-1259' AND DestWac > 86 AND SecurityDelay BETWEEN 27 AND 10 LIMIT 10000"]}
 {"sql":"SELECT Quarter, CRSArrTime, DestStateName, COUNT(Cancelled) FROM mytable WHERE AirlineID BETWEEN 19393 AND 19393 GROUP BY Quarter, CRSArrTime, DestStateName  ORDER BY Quarter, CRSArrTime, DestStateName LIMIT 10","hsqls":["SELECT Quarter, CRSArrTime, DestStateName, COUNT(Cancelled) FROM mytable WHERE AirlineID BETWEEN 19393 AND 19393 GROUP BY Quarter, CRSArrTime, DestStateName  ORDER BY Quarter, CRSArrTime, DestStateName LIMIT 10"]}
-{"sql":"SELECT DestState FROM mytable ORDER BY \"Month\" LIMIT 1","hsqls":["SELECT DestState FROM mytable ORDER BY Month LIMIT 1"]}
+{"sql":"SELECT DestState FROM mytable ORDER BY \"Month\" LIMIT 1","hsqls":["SELECT DestState FROM mytable ORDER BY `Month` LIMIT 1"]}
 {"sql":"SELECT DivReachedDest, DepDelay FROM mytable WHERE DivReachedDest = 0 ORDER BY DepDelay, Flights, NASDelay LIMIT 18"}
 {"sql":"SELECT WheelsOff, SecurityDelay, ArrDelayMinutes, COUNT(DivAirportLandings) FROM mytable WHERE ArrTimeBlk <> '0800-0859' AND AirlineID BETWEEN 20436 AND 20436 GROUP BY WheelsOff, SecurityDelay, ArrDelayMinutes  ORDER BY WheelsOff, SecurityDelay, ArrDelayMinutes LIMIT 7","hsqls":["SELECT WheelsOff, SecurityDelay, ArrDelayMinutes, COUNT(DivAirportLandings) FROM mytable WHERE ArrTimeBlk <> '0800-0859' AND AirlineID BETWEEN 20436 AND 20436 GROUP BY WheelsOff, SecurityDelay, ArrDelayMinutes  ORDER BY WheelsOff, SecurityDelay, ArrDelayMinutes LIMIT 7"]}
 {"sql":"SELECT WheelsOn FROM mytable WHERE DepartureDelayGroups > -2 ORDER BY OriginState LIMIT 20"}
-{"sql":"SELECT DepartureDelayGroups, Dest FROM mytable WHERE DivTailNums < 'N337NW' AND DivWheelsOffs BETWEEN 1512 AND 1509 AND DestState NOT IN ('IA') ORDER BY ArrDelayMinutes, DestAirportID, DayOfWeek LIMIT 25","hsqls":["SELECT DepartureDelayGroups, Dest FROM mytable WHERE (DivTailNums__MV0 < 'N337NW' OR DivTailNums__MV1 < 'N337NW' OR DivTailNums__MV2 < 'N337NW' OR DivTailNums__MV3 < 'N337NW' OR DivTailNums__MV4 < 'N337NW') AND (DivWheelsOffs__MV0 BETWEEN 1512 AND 1509 OR DivWheelsOffs__MV1 BETWEEN 1512 AND 1509 OR DivWheelsOffs__MV2 BETWEEN 1512 AND 1509 OR DivWheelsOffs__MV3 BETWEEN 1512 AND 1509 OR DivWheelsOffs__MV4 BETWEEN 1512 AND 1509) AND DestState NOT IN ('IA') ORDER BY ArrDelayMinutes, DestAirportID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Dest FROM mytable WHERE DivTailNums < 'N337NW' AND DivWheelsOffs BETWEEN 1512 AND 1509 AND DestState NOT IN ('IA') ORDER BY ArrDelayMinutes, DestAirportID, DayOfWeek LIMIT 25","hsqls":["SELECT DepartureDelayGroups, Dest FROM mytable WHERE (DivTailNums[1] < 'N337NW' OR DivTailNums[2] < 'N337NW' OR DivTailNums[3] < 'N337NW' OR DivTailNums[4] < 'N337NW' OR DivTailNums[5] < 'N337NW') AND (DivWheelsOffs[1] BETWEEN 1512 AND 1509 OR DivWheelsOffs[2] BETWEEN 1512 AND 1509 OR DivWheelsOffs[3] BETWEEN 1512 AND 1509 OR DivWheelsOffs[4] BETWEEN 1512 AND 1509 OR DivWheelsOffs[5] BETWEEN 1512 AND 1509) AND DestState NOT IN ('IA') ORDER BY ArrDelayMinutes, DestAirportID, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, TaxiOut, DepDelayMinutes, COUNT(*) FROM mytable WHERE WheelsOff IN (1537, 1746) OR DivArrDelay < 258 OR TaxiIn > 38 GROUP BY OriginAirportSeqID, TaxiOut, DepDelayMinutes  ORDER BY OriginAirportSeqID, TaxiOut, DepDelayMinutes LIMIT 17","hsqls":["SELECT OriginAirportSeqID, TaxiOut, DepDelayMinutes, COUNT(*) FROM mytable WHERE WheelsOff IN (1537, 1746) OR DivArrDelay < 258 OR TaxiIn > 38 GROUP BY OriginAirportSeqID, TaxiOut, DepDelayMinutes  ORDER BY OriginAirportSeqID, TaxiOut, DepDelayMinutes LIMIT 17"]}
-{"sql":"SELECT DestState FROM mytable WHERE WeatherDelay BETWEEN 20 AND 78 AND DivAirportIDs IN (10792, 14570) ORDER BY ArrTime, CancellationCode LIMIT 22","hsqls":["SELECT DestState FROM mytable WHERE WeatherDelay BETWEEN 20 AND 78 AND (DivAirportIDs__MV0 IN (10792, 14570) OR DivAirportIDs__MV1 IN (10792, 14570) OR DivAirportIDs__MV2 IN (10792, 14570) OR DivAirportIDs__MV3 IN (10792, 14570) OR DivAirportIDs__MV4 IN (10792, 14570)) ORDER BY ArrTime, CancellationCode LIMIT 10000"]}
-{"sql":"SELECT SecurityDelay, DepDel15, MAX(\"Month\") FROM mytable WHERE DepartureDelayGroups NOT IN (10, 0, 6, 9, 12) GROUP BY SecurityDelay, DepDel15 LIMIT 15","hsqls":["SELECT SecurityDelay, DepDel15, MAX(Month) FROM mytable WHERE DepartureDelayGroups NOT IN (10, 0, 6, 9, 12) GROUP BY SecurityDelay, DepDel15 LIMIT 15"]}
+{"sql":"SELECT DestState FROM mytable WHERE WeatherDelay BETWEEN 20 AND 78 AND DivAirportIDs IN (10792, 14570) ORDER BY ArrTime, CancellationCode LIMIT 22","hsqls":["SELECT DestState FROM mytable WHERE WeatherDelay BETWEEN 20 AND 78 AND (DivAirportIDs[1] IN (10792, 14570) OR DivAirportIDs[2] IN (10792, 14570) OR DivAirportIDs[3] IN (10792, 14570) OR DivAirportIDs[4] IN (10792, 14570) OR DivAirportIDs[5] IN (10792, 14570)) ORDER BY ArrTime, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, DepDel15, MAX(\"Month\") FROM mytable WHERE DepartureDelayGroups NOT IN (10, 0, 6, 9, 12) GROUP BY SecurityDelay, DepDel15 LIMIT 15","hsqls":["SELECT SecurityDelay, DepDel15, MAX(`Month`) FROM mytable WHERE DepartureDelayGroups NOT IN (10, 0, 6, 9, 12) GROUP BY SecurityDelay, DepDel15 LIMIT 15"]}
 {"sql":"SELECT DivReachedDest FROM mytable ORDER BY DepartureDelayGroups, Flights, ArrTime LIMIT 3"}
-{"sql":"SELECT WeatherDelay, DivTailNums, Origin FROM mytable WHERE Cancelled <= 1 OR DaysSinceEpoch BETWEEN 16071 AND 16080 ORDER BY OriginCityMarketID LIMIT 10","hsqls":["SELECT WeatherDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Origin FROM mytable WHERE Cancelled <= 1 OR DaysSinceEpoch BETWEEN 16071 AND 16080 ORDER BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DivTailNums, Origin FROM mytable WHERE Cancelled <= 1 OR DaysSinceEpoch BETWEEN 16071 AND 16080 ORDER BY OriginCityMarketID LIMIT 10","hsqls":["SELECT WeatherDelay, DivTailNums, Origin FROM mytable WHERE Cancelled <= 1 OR DaysSinceEpoch BETWEEN 16071 AND 16080 ORDER BY OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT ArrTime, DaysSinceEpoch, MAX(AirlineID), AVG(SecurityDelay), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID BETWEEN 1337702 AND 1126702 GROUP BY ArrTime, DaysSinceEpoch  ORDER BY ArrTime, DaysSinceEpoch LIMIT 17","hsqls":["SELECT ArrTime, DaysSinceEpoch, MAX(AirlineID), AVG(SecurityDelay), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID BETWEEN 1337702 AND 1126702 GROUP BY ArrTime, DaysSinceEpoch  ORDER BY ArrTime, DaysSinceEpoch LIMIT 17"]}
 {"sql":"SELECT Flights, WheelsOn FROM mytable WHERE DivActualElapsedTime = 901 OR DaysSinceEpoch NOT IN (16074) ORDER BY FirstDepTime LIMIT 16"}
-{"sql":"SELECT FlightNum, ActualElapsedTime, \"Month\" FROM mytable ORDER BY SecurityDelay LIMIT 10","hsqls":["SELECT FlightNum, ActualElapsedTime, Month FROM mytable ORDER BY SecurityDelay LIMIT 10"]}
+{"sql":"SELECT FlightNum, ActualElapsedTime, \"Month\" FROM mytable ORDER BY SecurityDelay LIMIT 10","hsqls":["SELECT FlightNum, ActualElapsedTime, `Month` FROM mytable ORDER BY SecurityDelay LIMIT 10"]}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY OriginCityName LIMIT 3"}
 {"sql":"SELECT Cancelled, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime NOT IN (519) OR FirstDepTime > 1016 GROUP BY Cancelled, CRSElapsedTime  ORDER BY Cancelled, CRSElapsedTime LIMIT 5","hsqls":["SELECT Cancelled, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime NOT IN (519) OR FirstDepTime > 1016 GROUP BY Cancelled, CRSElapsedTime  ORDER BY Cancelled, CRSElapsedTime LIMIT 5"]}
 {"sql":"SELECT DepDelayMinutes, DestAirportSeqID FROM mytable WHERE OriginAirportID NOT IN (11721) LIMIT 24"}
-{"sql":"SELECT DivAirports, TaxiIn, ArrDelay FROM mytable WHERE OriginWac NOT IN (54, 34) OR DestWac >= 88 ORDER BY DepartureDelayGroups LIMIT 3","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, TaxiIn, ArrDelay FROM mytable WHERE OriginWac NOT IN (54, 34) OR DestWac >= 88 ORDER BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivAirports, TaxiIn, ArrDelay FROM mytable WHERE OriginWac NOT IN (54, 34) OR DestWac >= 88 ORDER BY DepartureDelayGroups LIMIT 3","hsqls":["SELECT DivAirports, TaxiIn, ArrDelay FROM mytable WHERE OriginWac NOT IN (54, 34) OR DestWac >= 88 ORDER BY DepartureDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, ArrDel15 FROM mytable WHERE DestCityName BETWEEN 'Key West, FL' AND 'Twin Falls, ID' ORDER BY OriginStateFips, Distance, CRSElapsedTime LIMIT 4"}
 {"sql":"SELECT TailNum, DestStateName, AirTime FROM mytable WHERE DepDelay IN (359.0, 243.0, -12.0, 87.0) OR NASDelay NOT IN (26, 61) AND OriginStateName < 'Rhode Island' ORDER BY DestStateFips, ActualElapsedTime LIMIT 26"}
 {"sql":"SELECT OriginWac, COUNT(ArrTime), MAX(ActualElapsedTime) FROM mytable WHERE DivDistance <> 1028 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 22","hsqls":["SELECT OriginWac, COUNT(ArrTime), MAX(ActualElapsedTime) FROM mytable WHERE DivDistance <> 1028 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 22"]}
-{"sql":"SELECT DivLongestGTimes, UniqueCarrier FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY DepTime, ArrTime LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, UniqueCarrier FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY DepTime, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, UniqueCarrier FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY DepTime, ArrTime LIMIT 4","hsqls":["SELECT DivLongestGTimes, UniqueCarrier FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY DepTime, ArrTime LIMIT 10000"]}
 {"sql":"SELECT DepTime, DepDel15, DayofMonth, COUNT(WeatherDelay) FROM mytable WHERE TaxiOut >= 82 OR TailNum = 'N961SW' GROUP BY DepTime, DepDel15, DayofMonth","hsqls":["SELECT DepTime, DepDel15, DayofMonth, COUNT(WeatherDelay) FROM mytable WHERE TaxiOut >= 82 OR TailNum = 'N961SW' GROUP BY DepTime, DepDel15, DayofMonth"]}
 {"sql":"SELECT OriginCityMarketID, DepDel15, AVG(DivActualElapsedTime) FROM mytable WHERE WeatherDelay NOT IN (21, 316, 33, 54, 100) AND OriginStateFips = 42 OR DivReachedDest <> 0 GROUP BY OriginCityMarketID, DepDel15  ORDER BY OriginCityMarketID, DepDel15 LIMIT 26","hsqls":["SELECT OriginCityMarketID, DepDel15, AVG(DivActualElapsedTime) FROM mytable WHERE WeatherDelay NOT IN (21, 316, 33, 54, 100) AND OriginStateFips = 42 OR DivReachedDest <> 0 GROUP BY OriginCityMarketID, DepDel15  ORDER BY OriginCityMarketID, DepDel15 LIMIT 26"]}
-{"sql":"SELECT TaxiIn, DivAirportIDs, NASDelay FROM mytable WHERE DestStateName < 'U.S. Pacific Trust Territories and Possessions' ORDER BY LongestAddGTime LIMIT 27","hsqls":["SELECT TaxiIn, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, NASDelay FROM mytable WHERE DestStateName < 'U.S. Pacific Trust Territories and Possessions' ORDER BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DivAirportIDs, NASDelay FROM mytable WHERE DestStateName < 'U.S. Pacific Trust Territories and Possessions' ORDER BY LongestAddGTime LIMIT 27","hsqls":["SELECT TaxiIn, DivAirportIDs, NASDelay FROM mytable WHERE DestStateName < 'U.S. Pacific Trust Territories and Possessions' ORDER BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, TaxiIn, COUNT(*) FROM mytable WHERE WheelsOn <= 1027 OR CRSDepTime NOT IN (2329, 1529) GROUP BY DestStateFips, TaxiIn  ORDER BY DestStateFips, TaxiIn LIMIT 11","hsqls":["SELECT DestStateFips, TaxiIn, COUNT(*) FROM mytable WHERE WheelsOn <= 1027 OR CRSDepTime NOT IN (2329, 1529) GROUP BY DestStateFips, TaxiIn  ORDER BY DestStateFips, TaxiIn LIMIT 11"]}
 {"sql":"SELECT Carrier, Dest, COUNT(*) FROM mytable GROUP BY Carrier, Dest  ORDER BY Carrier, Dest LIMIT 25","hsqls":["SELECT Carrier, Dest, COUNT(*) FROM mytable GROUP BY Carrier, Dest  ORDER BY Carrier, Dest LIMIT 25"]}
 {"sql":"SELECT LongestAddGTime, TaxiIn, DaysSinceEpoch, SUM(OriginAirportSeqID), MIN(DivAirportLandings) FROM mytable GROUP BY LongestAddGTime, TaxiIn, DaysSinceEpoch","hsqls":["SELECT LongestAddGTime, TaxiIn, DaysSinceEpoch, SUM(OriginAirportSeqID), MIN(DivAirportLandings) FROM mytable GROUP BY LongestAddGTime, TaxiIn, DaysSinceEpoch"]}
@@ -3574,20 +3574,20 @@
 {"sql":"SELECT DepartureDelayGroups, \"Year\", DepDelayMinutes, COUNT(*) FROM mytable WHERE DayofMonth <> 28 GROUP BY DepartureDelayGroups, \"Year\", DepDelayMinutes LIMIT 8","hsqls":["SELECT DepartureDelayGroups, Year, DepDelayMinutes, COUNT(*) FROM mytable WHERE DayofMonth <> 28 GROUP BY DepartureDelayGroups, Year, DepDelayMinutes LIMIT 8"]}
 {"sql":"SELECT OriginAirportSeqID, Flights, AirTime, MAX(DepDelayMinutes), AVG(Cancelled), SUM(DestCityMarketID) FROM mytable WHERE AirlineID = 19930 OR DivArrDelay >= 284 GROUP BY OriginAirportSeqID, Flights, AirTime  ORDER BY OriginAirportSeqID, Flights, AirTime LIMIT 7","hsqls":["SELECT OriginAirportSeqID, Flights, AirTime, MAX(DepDelayMinutes), AVG(Cancelled), SUM(DestCityMarketID) FROM mytable WHERE AirlineID = 19930 OR DivArrDelay >= 284 GROUP BY OriginAirportSeqID, Flights, AirTime  ORDER BY OriginAirportSeqID, Flights, AirTime LIMIT 7"]}
 {"sql":"SELECT Distance, OriginCityName, DestStateName, MIN(FlightNum), AVG(FlightNum), SUM(OriginWac) FROM mytable WHERE TotalAddGTime NOT IN (96, 13) GROUP BY Distance, OriginCityName, DestStateName  ORDER BY Distance, OriginCityName, DestStateName LIMIT 13","hsqls":["SELECT Distance, OriginCityName, DestStateName, MIN(FlightNum), AVG(FlightNum), SUM(OriginWac) FROM mytable WHERE TotalAddGTime NOT IN (96, 13) GROUP BY Distance, OriginCityName, DestStateName  ORDER BY Distance, OriginCityName, DestStateName LIMIT 13"]}
-{"sql":"SELECT ArrivalDelayGroups, AVG(OriginWac) FROM mytable WHERE DayofMonth > 21 OR DivAirports IN ('CHS') GROUP BY ArrivalDelayGroups LIMIT 18","hsqls":["SELECT ArrivalDelayGroups, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE DayofMonth > 21 OR (DivAirports__MV0 IN ('CHS') OR DivAirports__MV1 IN ('CHS') OR DivAirports__MV2 IN ('CHS') OR DivAirports__MV3 IN ('CHS') OR DivAirports__MV4 IN ('CHS')) GROUP BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups, AVG(OriginWac) FROM mytable WHERE DayofMonth > 21 OR DivAirports IN ('CHS') GROUP BY ArrivalDelayGroups LIMIT 18","hsqls":["SELECT ArrivalDelayGroups, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE DayofMonth > 21 OR (DivAirports[1] IN ('CHS') OR DivAirports[2] IN ('CHS') OR DivAirports[3] IN ('CHS') OR DivAirports[4] IN ('CHS') OR DivAirports[5] IN ('CHS')) GROUP BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT FlightNum, ArrDelayMinutes FROM mytable ORDER BY DepDelay, DivAirportLandings, DivArrDelay LIMIT 13"}
 {"sql":"SELECT OriginAirportSeqID, TaxiIn, UniqueCarrier, MAX(DivActualElapsedTime), COUNT(WheelsOn), MAX(CRSDepTime) FROM mytable WHERE ArrTime BETWEEN 1242 AND 404 GROUP BY OriginAirportSeqID, TaxiIn, UniqueCarrier  ORDER BY OriginAirportSeqID, TaxiIn, UniqueCarrier LIMIT 3","hsqls":["SELECT OriginAirportSeqID, TaxiIn, UniqueCarrier, MAX(DivActualElapsedTime), COUNT(WheelsOn), MAX(CRSDepTime) FROM mytable WHERE ArrTime BETWEEN 1242 AND 404 GROUP BY OriginAirportSeqID, TaxiIn, UniqueCarrier  ORDER BY OriginAirportSeqID, TaxiIn, UniqueCarrier LIMIT 3"]}
-{"sql":"SELECT DivLongestGTimes, ArrDelayMinutes FROM mytable WHERE UniqueCarrier > 'AS' OR DepDel15 BETWEEN 1 AND -9999 OR OriginCityMarketID BETWEEN 31205 AND 30434 ORDER BY TotalAddGTime LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrDelayMinutes FROM mytable WHERE UniqueCarrier > 'AS' OR DepDel15 BETWEEN 1 AND -9999 OR OriginCityMarketID BETWEEN 31205 AND 30434 ORDER BY TotalAddGTime LIMIT 10000"]}
-{"sql":"SELECT COUNT(DepDel15), SUM(DivArrDelay) FROM mytable WHERE \"Year\" NOT IN (2014) OR DayofMonth BETWEEN 31 AND 11 LIMIT 4","hsqls":["SELECT COUNT(DepDel15), SUM(DivArrDelay) FROM mytable WHERE Year NOT IN (2014) OR DayofMonth BETWEEN 31 AND 11 LIMIT 4"]}
+{"sql":"SELECT DivLongestGTimes, ArrDelayMinutes FROM mytable WHERE UniqueCarrier > 'AS' OR DepDel15 BETWEEN 1 AND -9999 OR OriginCityMarketID BETWEEN 31205 AND 30434 ORDER BY TotalAddGTime LIMIT 2","hsqls":["SELECT DivLongestGTimes, ArrDelayMinutes FROM mytable WHERE UniqueCarrier > 'AS' OR DepDel15 BETWEEN 1 AND -9999 OR OriginCityMarketID BETWEEN 31205 AND 30434 ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepDel15), SUM(DivArrDelay) FROM mytable WHERE \"Year\" NOT IN (2014) OR DayofMonth BETWEEN 31 AND 11 LIMIT 4","hsqls":["SELECT COUNT(DepDel15), SUM(DivArrDelay) FROM mytable WHERE `Year` NOT IN (2014) OR DayofMonth BETWEEN 31 AND 11 LIMIT 4"]}
 {"sql":"SELECT OriginAirportID, COUNT(Dest), COUNT(DestWac), AVG(DepTime) FROM mytable WHERE OriginCityMarketID <> 30647 AND DayOfWeek NOT IN (3, 7, 5, 4) GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 15","hsqls":["SELECT OriginAirportID, COUNT(Dest), COUNT(DestWac), AVG(DepTime) FROM mytable WHERE OriginCityMarketID <> 30647 AND DayOfWeek NOT IN (3, 7, 5, 4) GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 15"]}
-{"sql":"SELECT DivLongestGTimes, DivDistance FROM mytable WHERE DivWheelsOffs <= 2100 AND ArrDel15 >= -9999 OR Quarter IN (1) LIMIT 20","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivDistance FROM mytable WHERE (DivWheelsOffs__MV0 <= 2100 OR DivWheelsOffs__MV1 <= 2100 OR DivWheelsOffs__MV2 <= 2100 OR DivWheelsOffs__MV3 <= 2100 OR DivWheelsOffs__MV4 <= 2100) AND ArrDel15 >= -9999 OR Quarter IN (1) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivDistance FROM mytable WHERE DivWheelsOffs <= 2100 AND ArrDel15 >= -9999 OR Quarter IN (1) LIMIT 20","hsqls":["SELECT DivLongestGTimes, DivDistance FROM mytable WHERE (DivWheelsOffs[1] <= 2100 OR DivWheelsOffs[2] <= 2100 OR DivWheelsOffs[3] <= 2100 OR DivWheelsOffs[4] <= 2100 OR DivWheelsOffs[5] <= 2100) AND ArrDel15 >= -9999 OR Quarter IN (1) LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier, OriginStateName, MIN(LateAircraftDelay), MIN(Cancelled) FROM mytable WHERE OriginAirportSeqID BETWEEN 1357702 AND 1349503 GROUP BY UniqueCarrier, OriginStateName  ORDER BY UniqueCarrier, OriginStateName LIMIT 8","hsqls":["SELECT UniqueCarrier, OriginStateName, MIN(LateAircraftDelay), MIN(Cancelled) FROM mytable WHERE OriginAirportSeqID BETWEEN 1357702 AND 1349503 GROUP BY UniqueCarrier, OriginStateName  ORDER BY UniqueCarrier, OriginStateName LIMIT 8"]}
-{"sql":"SELECT DepDel15, Origin, AVG(\"Year\"), MAX(Distance) FROM mytable WHERE OriginState BETWEEN 'CT' AND 'WI' AND ArrDel15 BETWEEN 0 AND -9999 AND AirTime BETWEEN 256 AND 265 GROUP BY DepDel15, Origin LIMIT 9","hsqls":["SELECT DepDel15, Origin, AVG(Year), MAX(Distance) FROM mytable WHERE OriginState BETWEEN 'CT' AND 'WI' AND ArrDel15 BETWEEN 0 AND -9999 AND AirTime BETWEEN 256 AND 265 GROUP BY DepDel15, Origin LIMIT 9"]}
+{"sql":"SELECT DepDel15, Origin, AVG(\"Year\"), MAX(Distance) FROM mytable WHERE OriginState BETWEEN 'CT' AND 'WI' AND ArrDel15 BETWEEN 0 AND -9999 AND AirTime BETWEEN 256 AND 265 GROUP BY DepDel15, Origin LIMIT 9","hsqls":["SELECT DepDel15, Origin, AVG(`Year`), MAX(Distance) FROM mytable WHERE OriginState BETWEEN 'CT' AND 'WI' AND ArrDel15 BETWEEN 0 AND -9999 AND AirTime BETWEEN 256 AND 265 GROUP BY DepDel15, Origin LIMIT 9"]}
 {"sql":"SELECT COUNT(DepDel15), AVG(Distance) FROM mytable WHERE OriginCityName > 'Dickinson, ND' OR OriginCityMarketID <= 32467 OR DestStateName BETWEEN 'Illinois' AND 'Idaho' LIMIT 18"}
-{"sql":"SELECT DivWheelsOns, Carrier FROM mytable WHERE DaysSinceEpoch BETWEEN 16083 AND 16085 AND CRSElapsedTime <= 122 ORDER BY DistanceGroup, FlightDate, CRSDepTime LIMIT 7","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Carrier FROM mytable WHERE DaysSinceEpoch BETWEEN 16083 AND 16085 AND CRSElapsedTime <= 122 ORDER BY DistanceGroup, FlightDate, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, CRSElapsedTime FROM mytable ORDER BY DestState, OriginCityMarketID, DayOfWeek LIMIT 10","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, CRSElapsedTime FROM mytable ORDER BY DestState, OriginCityMarketID, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DestCityName, DepTimeBlk, COUNT(Flights) FROM mytable WHERE ActualElapsedTime <> 114 OR DivTotalGTimes <= 79 AND DivLongestGTimes IN (10.0, 40.0) GROUP BY DistanceGroup, DestCityName, DepTimeBlk LIMIT 4","hsqls":["SELECT DistanceGroup, DestCityName, DepTimeBlk, COUNT(Flights) FROM mytable WHERE ActualElapsedTime <> 114 OR (DivTotalGTimes__MV0 <= 79 OR DivTotalGTimes__MV1 <= 79 OR DivTotalGTimes__MV2 <= 79 OR DivTotalGTimes__MV3 <= 79 OR DivTotalGTimes__MV4 <= 79) AND (DivLongestGTimes__MV0 IN (10.0, 40.0) OR DivLongestGTimes__MV1 IN (10.0, 40.0) OR DivLongestGTimes__MV2 IN (10.0, 40.0) OR DivLongestGTimes__MV3 IN (10.0, 40.0) OR DivLongestGTimes__MV4 IN (10.0, 40.0)) GROUP BY DistanceGroup, DestCityName, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DepDelay FROM mytable WHERE DivAirportSeqIDs IN (1195302, 1448902, 1227802, 1469605, 1449202) AND DivTailNums IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') LIMIT 5","hsqls":["SELECT DepDelay FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs__MV1 IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs__MV2 IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs__MV3 IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs__MV4 IN (1195302, 1448902, 1227802, 1469605, 1449202)) AND (DivTailNums__MV0 IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums__MV1 IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums__MV2 IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums__MV3 IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums__MV4 IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK')) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Carrier FROM mytable WHERE DaysSinceEpoch BETWEEN 16083 AND 16085 AND CRSElapsedTime <= 122 ORDER BY DistanceGroup, FlightDate, CRSDepTime LIMIT 7","hsqls":["SELECT DivWheelsOns, Carrier FROM mytable WHERE DaysSinceEpoch BETWEEN 16083 AND 16085 AND CRSElapsedTime <= 122 ORDER BY DistanceGroup, FlightDate, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, CRSElapsedTime FROM mytable ORDER BY DestState, OriginCityMarketID, DayOfWeek LIMIT 10","hsqls":["SELECT DivTailNums, CRSElapsedTime FROM mytable ORDER BY DestState, OriginCityMarketID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestCityName, DepTimeBlk, COUNT(Flights) FROM mytable WHERE ActualElapsedTime <> 114 OR DivTotalGTimes <= 79 AND DivLongestGTimes IN (10.0, 40.0) GROUP BY DistanceGroup, DestCityName, DepTimeBlk LIMIT 4","hsqls":["SELECT DistanceGroup, DestCityName, DepTimeBlk, COUNT(Flights) FROM mytable WHERE ActualElapsedTime <> 114 OR (DivTotalGTimes[1] <= 79 OR DivTotalGTimes[2] <= 79 OR DivTotalGTimes[3] <= 79 OR DivTotalGTimes[4] <= 79 OR DivTotalGTimes[5] <= 79) AND (DivLongestGTimes[1] IN (10.0, 40.0) OR DivLongestGTimes[2] IN (10.0, 40.0) OR DivLongestGTimes[3] IN (10.0, 40.0) OR DivLongestGTimes[4] IN (10.0, 40.0) OR DivLongestGTimes[5] IN (10.0, 40.0)) GROUP BY DistanceGroup, DestCityName, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DepDelay FROM mytable WHERE DivAirportSeqIDs IN (1195302, 1448902, 1227802, 1469605, 1449202) AND DivTailNums IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') LIMIT 5","hsqls":["SELECT DepDelay FROM mytable WHERE (DivAirportSeqIDs[1] IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs[2] IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs[3] IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs[4] IN (1195302, 1448902, 1227802, 1469605, 1449202) OR DivAirportSeqIDs[5] IN (1195302, 1448902, 1227802, 1469605, 1449202)) AND (DivTailNums[1] IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums[2] IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums[3] IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums[4] IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK') OR DivTailNums[5] IN ('N839UA', 'N908EV', 'N709BR', 'N27213', 'N738SK')) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'US' OR DepDelay IN (251.0) AND DestWac NOT IN (67, 44, 41) LIMIT 24"}
 {"sql":"SELECT DivDistance, OriginCityMarketID, SUM(TaxiIn) FROM mytable WHERE ArrTimeBlk = '1900-1959' GROUP BY DivDistance, OriginCityMarketID  ORDER BY DivDistance, OriginCityMarketID LIMIT 8","hsqls":["SELECT DivDistance, OriginCityMarketID, SUM(TaxiIn) FROM mytable WHERE ArrTimeBlk = '1900-1959' GROUP BY DivDistance, OriginCityMarketID  ORDER BY DivDistance, OriginCityMarketID LIMIT 8"]}
 {"sql":"SELECT AVG(DepDel15) FROM mytable WHERE DivArrDelay < 79 LIMIT 1"}
@@ -3597,10 +3597,10 @@
 {"sql":"SELECT OriginState, FlightDate, MAX(WheelsOff), AVG(ArrDel15), MAX(Quarter) FROM mytable WHERE DepTimeBlk BETWEEN '2200-2259' AND '1700-1759' AND CRSArrTime NOT IN (2023) GROUP BY OriginState, FlightDate  ORDER BY OriginState, FlightDate LIMIT 7","hsqls":["SELECT OriginState, FlightDate, MAX(WheelsOff), AVG(ArrDel15), MAX(Quarter) FROM mytable WHERE DepTimeBlk BETWEEN '2200-2259' AND '1700-1759' AND CRSArrTime NOT IN (2023) GROUP BY OriginState, FlightDate  ORDER BY OriginState, FlightDate LIMIT 7"]}
 {"sql":"SELECT FlightDate, TailNum, OriginWac, AVG(DestAirportID), AVG(AirTime) FROM mytable WHERE DestWac <> 54 GROUP BY FlightDate, TailNum, OriginWac  ORDER BY FlightDate, TailNum, OriginWac LIMIT 2","hsqls":["SELECT FlightDate, TailNum, OriginWac, AVG(DestAirportID), AVG(AirTime) FROM mytable WHERE DestWac <> 54 GROUP BY FlightDate, TailNum, OriginWac  ORDER BY FlightDate, TailNum, OriginWac LIMIT 2"]}
 {"sql":"SELECT WheelsOn, ArrivalDelayGroups FROM mytable WHERE ArrDel15 NOT IN (0, -9999) AND ArrTimeBlk BETWEEN '0600-0659' AND '1700-1759' LIMIT 4"}
-{"sql":"SELECT DepTimeBlk, AVG(CRSDepTime), MAX(CRSElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay <= 14 OR DivWheelsOffs > 1212 GROUP BY DepTimeBlk LIMIT 5","hsqls":["SELECT DepTimeBlk, AVG(CRSDepTime), MAX(CRSElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay <= 14 OR (DivWheelsOffs__MV0 > 1212 OR DivWheelsOffs__MV1 > 1212 OR DivWheelsOffs__MV2 > 1212 OR DivWheelsOffs__MV3 > 1212 OR DivWheelsOffs__MV4 > 1212) GROUP BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, AVG(CRSDepTime), MAX(CRSElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay <= 14 OR DivWheelsOffs > 1212 GROUP BY DepTimeBlk LIMIT 5","hsqls":["SELECT DepTimeBlk, AVG(CRSDepTime), MAX(CRSElapsedTime), AVG(WheelsOn) FROM mytable WHERE SecurityDelay <= 14 OR (DivWheelsOffs[1] > 1212 OR DivWheelsOffs[2] > 1212 OR DivWheelsOffs[3] > 1212 OR DivWheelsOffs[4] > 1212 OR DivWheelsOffs[5] > 1212) GROUP BY DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE AirTime NOT IN (204, 96, 277, 252) AND OriginAirportSeqID NOT IN (1148102) ORDER BY DestWac, DestAirportID LIMIT 11"}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE OriginCityName >= 'Indianapolis, IN' AND DepDel15 = 1 OR Flights = 1 LIMIT 13"}
-{"sql":"SELECT DivAirportIDs, ArrDelay FROM mytable WHERE DivAirportIDs > 15323 ORDER BY DepartureDelayGroups, \"Month\" LIMIT 3","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay FROM mytable WHERE (DivAirportIDs__MV0 > 15323 OR DivAirportIDs__MV1 > 15323 OR DivAirportIDs__MV2 > 15323 OR DivAirportIDs__MV3 > 15323 OR DivAirportIDs__MV4 > 15323) ORDER BY DepartureDelayGroups, Month LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, ArrDelay FROM mytable WHERE DivAirportIDs > 15323 ORDER BY DepartureDelayGroups, \"Month\" LIMIT 3","hsqls":["SELECT DivAirportIDs, ArrDelay FROM mytable WHERE (DivAirportIDs[1] > 15323 OR DivAirportIDs[2] > 15323 OR DivAirportIDs[3] > 15323 OR DivAirportIDs[4] > 15323 OR DivAirportIDs[5] > 15323) ORDER BY DepartureDelayGroups, `Month` LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, AirlineID, DaysSinceEpoch FROM mytable WHERE WheelsOn BETWEEN 1219 AND 2226 ORDER BY DestStateFips LIMIT 24"}
 {"sql":"SELECT DivDistance, DestStateName, OriginWac, COUNT(DistanceGroup), COUNT(DepartureDelayGroups) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 10, 0, 4, 12) AND ActualElapsedTime IN (258) GROUP BY DivDistance, DestStateName, OriginWac  ORDER BY DivDistance, DestStateName, OriginWac LIMIT 29","hsqls":["SELECT DivDistance, DestStateName, OriginWac, COUNT(DistanceGroup), COUNT(DepartureDelayGroups) FROM mytable WHERE ArrivalDelayGroups NOT IN (2, 10, 0, 4, 12) AND ActualElapsedTime IN (258) GROUP BY DivDistance, DestStateName, OriginWac  ORDER BY DivDistance, DestStateName, OriginWac LIMIT 29"]}
 {"sql":"SELECT ArrTime, ArrivalDelayGroups, OriginAirportID FROM mytable LIMIT 16"}
@@ -3611,21 +3611,21 @@
 {"sql":"SELECT DistanceGroup, Quarter, DepTime, COUNT(CarrierDelay) FROM mytable WHERE Origin IN ('BIL', 'FWA', 'FOE', 'LAS', 'OTZ') OR Quarter BETWEEN 1 AND 1 GROUP BY DistanceGroup, Quarter, DepTime  ORDER BY DistanceGroup, Quarter, DepTime LIMIT 28","hsqls":["SELECT DistanceGroup, Quarter, DepTime, COUNT(CarrierDelay) FROM mytable WHERE Origin IN ('BIL', 'FWA', 'FOE', 'LAS', 'OTZ') OR Quarter BETWEEN 1 AND 1 GROUP BY DistanceGroup, Quarter, DepTime  ORDER BY DistanceGroup, Quarter, DepTime LIMIT 28"]}
 {"sql":"SELECT TailNum FROM mytable WHERE Origin <= 'BRO' ORDER BY CRSArrTime, Dest LIMIT 10"}
 {"sql":"SELECT DestWac, OriginStateFips, DaysSinceEpoch, MAX(DestAirportID) FROM mytable GROUP BY DestWac, OriginStateFips, DaysSinceEpoch  ORDER BY DestWac, OriginStateFips, DaysSinceEpoch LIMIT 14","hsqls":["SELECT DestWac, OriginStateFips, DaysSinceEpoch, MAX(DestAirportID) FROM mytable GROUP BY DestWac, OriginStateFips, DaysSinceEpoch  ORDER BY DestWac, OriginStateFips, DaysSinceEpoch LIMIT 14"]}
-{"sql":"SELECT DestWac, Flights, ArrDel15, AVG(\"Year\"), COUNT(ArrivalDelayGroups) FROM mytable WHERE DepartureDelayGroups BETWEEN -9999 AND 11 AND ArrDelay <= 188.0 GROUP BY DestWac, Flights, ArrDel15 LIMIT 14","hsqls":["SELECT DestWac, Flights, ArrDel15, AVG(Year), COUNT(ArrivalDelayGroups) FROM mytable WHERE DepartureDelayGroups BETWEEN -9999 AND 11 AND ArrDelay <= 188.0 GROUP BY DestWac, Flights, ArrDel15 LIMIT 14"]}
-{"sql":"SELECT DepDelayMinutes, SecurityDelay, DepTime, SUM(AirlineID) FROM mytable WHERE DivWheelsOffs IN (1638, 1151, 2058) GROUP BY DepDelayMinutes, SecurityDelay, DepTime LIMIT 21","hsqls":["SELECT DepDelayMinutes, SecurityDelay, DepTime, SUM(AirlineID) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1638, 1151, 2058) OR DivWheelsOffs__MV1 IN (1638, 1151, 2058) OR DivWheelsOffs__MV2 IN (1638, 1151, 2058) OR DivWheelsOffs__MV3 IN (1638, 1151, 2058) OR DivWheelsOffs__MV4 IN (1638, 1151, 2058)) GROUP BY DepDelayMinutes, SecurityDelay, DepTime LIMIT 10000"]}
+{"sql":"SELECT DestWac, Flights, ArrDel15, AVG(\"Year\"), COUNT(ArrivalDelayGroups) FROM mytable WHERE DepartureDelayGroups BETWEEN -9999 AND 11 AND ArrDelay <= 188.0 GROUP BY DestWac, Flights, ArrDel15 LIMIT 14","hsqls":["SELECT DestWac, Flights, ArrDel15, AVG(`Year`), COUNT(ArrivalDelayGroups) FROM mytable WHERE DepartureDelayGroups BETWEEN -9999 AND 11 AND ArrDelay <= 188.0 GROUP BY DestWac, Flights, ArrDel15 LIMIT 14"]}
+{"sql":"SELECT DepDelayMinutes, SecurityDelay, DepTime, SUM(AirlineID) FROM mytable WHERE DivWheelsOffs IN (1638, 1151, 2058) GROUP BY DepDelayMinutes, SecurityDelay, DepTime LIMIT 21","hsqls":["SELECT DepDelayMinutes, SecurityDelay, DepTime, SUM(AirlineID) FROM mytable WHERE (DivWheelsOffs[1] IN (1638, 1151, 2058) OR DivWheelsOffs[2] IN (1638, 1151, 2058) OR DivWheelsOffs[3] IN (1638, 1151, 2058) OR DivWheelsOffs[4] IN (1638, 1151, 2058) OR DivWheelsOffs[5] IN (1638, 1151, 2058)) GROUP BY DepDelayMinutes, SecurityDelay, DepTime LIMIT 10000"]}
 {"sql":"SELECT SUM(NASDelay), SUM(ArrDelay) FROM mytable WHERE CRSDepTime NOT IN (723, 1141) OR DepartureDelayGroups NOT IN (10, 7, 9, 11, 12) LIMIT 13"}
 {"sql":"SELECT OriginWac, AVG(OriginWac), MAX(TaxiIn) FROM mytable WHERE OriginWac NOT IN (84) GROUP BY OriginWac  ORDER BY OriginWac LIMIT 10","hsqls":["SELECT OriginWac, AVG(OriginWac), MAX(TaxiIn) FROM mytable WHERE OriginWac NOT IN (84) GROUP BY OriginWac  ORDER BY OriginWac LIMIT 10"]}
 {"sql":"SELECT DepDelay, COUNT(FlightDate) FROM mytable GROUP BY DepDelay","hsqls":["SELECT DepDelay, COUNT(FlightDate) FROM mytable GROUP BY DepDelay"]}
-{"sql":"SELECT DivAirportSeqIDs, DivWheelsOffs, DestCityMarketID FROM mytable WHERE ActualElapsedTime IN (150, 65, 249) ORDER BY \"Year\", DestWac, CarrierDelay LIMIT 22","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DestCityMarketID FROM mytable WHERE ActualElapsedTime IN (150, 65, 249) ORDER BY Year, DestWac, CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivWheelsOffs, DestCityMarketID FROM mytable WHERE ActualElapsedTime IN (150, 65, 249) ORDER BY \"Year\", DestWac, CarrierDelay LIMIT 22","hsqls":["SELECT DivAirportSeqIDs, DivWheelsOffs, DestCityMarketID FROM mytable WHERE ActualElapsedTime IN (150, 65, 249) ORDER BY Year, DestWac, CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT Quarter, DepDelayMinutes FROM mytable WHERE DepDelayMinutes < 26.0 OR TailNum < 'N439US' AND CancellationCode BETWEEN 'C' AND 'A' ORDER BY DistanceGroup LIMIT 15"}
-{"sql":"SELECT DistanceGroup, FlightDate, ArrTime, COUNT(*) FROM mytable WHERE DivAirportIDs BETWEEN 14960 AND 12335 GROUP BY DistanceGroup, FlightDate, ArrTime LIMIT 2","hsqls":["SELECT DistanceGroup, FlightDate, ArrTime, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14960 AND 12335 OR DivAirportIDs__MV1 BETWEEN 14960 AND 12335 OR DivAirportIDs__MV2 BETWEEN 14960 AND 12335 OR DivAirportIDs__MV3 BETWEEN 14960 AND 12335 OR DivAirportIDs__MV4 BETWEEN 14960 AND 12335) GROUP BY DistanceGroup, FlightDate, ArrTime LIMIT 10000"]}
-{"sql":"SELECT \"Year\", OriginCityName, DayofMonth, AVG(\"Year\"), COUNT(DestStateFips), COUNT(Cancelled) FROM mytable WHERE Quarter <> 1 AND DestAirportSeqID IN (1448902, 1504102) GROUP BY \"Year\", OriginCityName, DayofMonth LIMIT 20","hsqls":["SELECT Year, OriginCityName, DayofMonth, AVG(Year), COUNT(DestStateFips), COUNT(Cancelled) FROM mytable WHERE Quarter <> 1 AND DestAirportSeqID IN (1448902, 1504102) GROUP BY Year, OriginCityName, DayofMonth LIMIT 20"]}
+{"sql":"SELECT DistanceGroup, FlightDate, ArrTime, COUNT(*) FROM mytable WHERE DivAirportIDs BETWEEN 14960 AND 12335 GROUP BY DistanceGroup, FlightDate, ArrTime LIMIT 2","hsqls":["SELECT DistanceGroup, FlightDate, ArrTime, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14960 AND 12335 OR DivAirportIDs[2] BETWEEN 14960 AND 12335 OR DivAirportIDs[3] BETWEEN 14960 AND 12335 OR DivAirportIDs[4] BETWEEN 14960 AND 12335 OR DivAirportIDs[5] BETWEEN 14960 AND 12335) GROUP BY DistanceGroup, FlightDate, ArrTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\", OriginCityName, DayofMonth, AVG(\"Year\"), COUNT(DestStateFips), COUNT(Cancelled) FROM mytable WHERE Quarter <> 1 AND DestAirportSeqID IN (1448902, 1504102) GROUP BY \"Year\", OriginCityName, DayofMonth LIMIT 20","hsqls":["SELECT Year, OriginCityName, DayofMonth, AVG(`Year`), COUNT(DestStateFips), COUNT(Cancelled) FROM mytable WHERE Quarter <> 1 AND DestAirportSeqID IN (1448902, 1504102) GROUP BY Year, OriginCityName, DayofMonth LIMIT 20"]}
 {"sql":"SELECT DestStateFips, ArrTime, DaysSinceEpoch, COUNT(*) FROM mytable GROUP BY DestStateFips, ArrTime, DaysSinceEpoch  ORDER BY DestStateFips, ArrTime, DaysSinceEpoch LIMIT 7","hsqls":["SELECT DestStateFips, ArrTime, DaysSinceEpoch, COUNT(*) FROM mytable GROUP BY DestStateFips, ArrTime, DaysSinceEpoch  ORDER BY DestStateFips, ArrTime, DaysSinceEpoch LIMIT 7"]}
 {"sql":"SELECT Diverted, TaxiIn FROM mytable WHERE UniqueCarrier > 'FL' ORDER BY Carrier LIMIT 2"}
 {"sql":"SELECT AVG(CRSElapsedTime), SUM(DayOfWeek), MIN(DivAirportLandings) FROM mytable WHERE OriginStateFips BETWEEN 29 AND 34 LIMIT 10"}
 {"sql":"SELECT WheelsOff, OriginCityName, DivArrDelay FROM mytable WHERE DaysSinceEpoch NOT IN (16095, 16079) OR Flights BETWEEN 1 AND 1 OR Quarter > 1 ORDER BY DestAirportSeqID LIMIT 28"}
 {"sql":"SELECT CRSArrTime, WheelsOn FROM mytable ORDER BY DestState, FlightNum, DivAirportLandings LIMIT 22"}
-{"sql":"SELECT DestState, Distance, DivWheelsOffs FROM mytable WHERE TaxiOut >= 51 LIMIT 1","hsqls":["SELECT DestState, Distance, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiOut >= 51 LIMIT 10000"]}
+{"sql":"SELECT DestState, Distance, DivWheelsOffs FROM mytable WHERE TaxiOut >= 51 LIMIT 1","hsqls":["SELECT DestState, Distance, DivWheelsOffs FROM mytable WHERE TaxiOut >= 51 LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, NASDelay, OriginAirportID, SUM(ArrDelay), AVG(LateAircraftDelay) FROM mytable WHERE Carrier NOT IN ('DL', 'F9', 'UA') AND OriginStateName BETWEEN 'Massachusetts' AND 'Minnesota' GROUP BY TaxiOut, NASDelay, OriginAirportID  ORDER BY TaxiOut, NASDelay, OriginAirportID LIMIT 6","hsqls":["SELECT TaxiOut, NASDelay, OriginAirportID, SUM(ArrDelay), AVG(LateAircraftDelay) FROM mytable WHERE Carrier NOT IN ('DL', 'F9', 'UA') AND OriginStateName BETWEEN 'Massachusetts' AND 'Minnesota' GROUP BY TaxiOut, NASDelay, OriginAirportID  ORDER BY TaxiOut, NASDelay, OriginAirportID LIMIT 6"]}
 {"sql":"SELECT DivDistance, DestAirportSeqID, SUM(ArrDel15), AVG(CRSElapsedTime), MIN(DestCityMarketID) FROM mytable WHERE Carrier NOT IN ('OO') GROUP BY DivDistance, DestAirportSeqID  ORDER BY DivDistance, DestAirportSeqID LIMIT 4","hsqls":["SELECT DivDistance, DestAirportSeqID, SUM(ArrDel15), AVG(CRSElapsedTime), MIN(DestCityMarketID) FROM mytable WHERE Carrier NOT IN ('OO') GROUP BY DivDistance, DestAirportSeqID  ORDER BY DivDistance, DestAirportSeqID LIMIT 4"]}
 {"sql":"SELECT LateAircraftDelay, Cancelled, COUNT(OriginAirportID) FROM mytable GROUP BY LateAircraftDelay, Cancelled  ORDER BY LateAircraftDelay, Cancelled LIMIT 14","hsqls":["SELECT LateAircraftDelay, Cancelled, COUNT(OriginAirportID) FROM mytable GROUP BY LateAircraftDelay, Cancelled  ORDER BY LateAircraftDelay, Cancelled LIMIT 14"]}
@@ -3633,9 +3633,9 @@
 {"sql":"SELECT UniqueCarrier FROM mytable ORDER BY CRSDepTime LIMIT 25"}
 {"sql":"SELECT Carrier, FlightNum, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY Carrier, FlightNum, ArrTimeBlk  ORDER BY Carrier, FlightNum, ArrTimeBlk LIMIT 2","hsqls":["SELECT Carrier, FlightNum, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY Carrier, FlightNum, ArrTimeBlk  ORDER BY Carrier, FlightNum, ArrTimeBlk LIMIT 2"]}
 {"sql":"SELECT ArrDel15, DestCityMarketID FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND LateAircraftDelay BETWEEN 118 AND 123 ORDER BY Quarter LIMIT 1"}
-{"sql":"SELECT AirTime, COUNT(*) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivWheelsOffs = 1907 AND OriginStateName >= 'Delaware' GROUP BY AirTime LIMIT 18","hsqls":["SELECT AirTime, COUNT(*) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND (DivWheelsOffs__MV0 = 1907 OR DivWheelsOffs__MV1 = 1907 OR DivWheelsOffs__MV2 = 1907 OR DivWheelsOffs__MV3 = 1907 OR DivWheelsOffs__MV4 = 1907) AND OriginStateName >= 'Delaware' GROUP BY AirTime LIMIT 10000"]}
+{"sql":"SELECT AirTime, COUNT(*) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivWheelsOffs = 1907 AND OriginStateName >= 'Delaware' GROUP BY AirTime LIMIT 18","hsqls":["SELECT AirTime, COUNT(*) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND (DivWheelsOffs[1] = 1907 OR DivWheelsOffs[2] = 1907 OR DivWheelsOffs[3] = 1907 OR DivWheelsOffs[4] = 1907 OR DivWheelsOffs[5] = 1907) AND OriginStateName >= 'Delaware' GROUP BY AirTime LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, OriginState, AirlineID FROM mytable WHERE DestCityName NOT IN ('Seattle, WA', 'Valparaiso, FL', 'Louisville, KY') AND Dest BETWEEN 'CHO' AND 'IMT' LIMIT 10"}
-{"sql":"SELECT DivTailNums, TailNum FROM mytable LIMIT 5","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, TailNum FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, TailNum FROM mytable LIMIT 5","hsqls":["SELECT DivTailNums, TailNum FROM mytable LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE WheelsOn IN (252, 1503, 2047) OR DestStateFips NOT IN (33, 34, 75, 37, 38) AND ActualElapsedTime BETWEEN 252 AND 461 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 2","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE WheelsOn IN (252, 1503, 2047) OR DestStateFips NOT IN (33, 34, 75, 37, 38) AND ActualElapsedTime BETWEEN 252 AND 461 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 2"]}
 {"sql":"SELECT ArrTimeBlk, DaysSinceEpoch FROM mytable WHERE DaysSinceEpoch = 16100 LIMIT 24"}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 105 AND 306 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 13","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 105 AND 306 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 13"]}
@@ -3647,44 +3647,44 @@
 {"sql":"SELECT TotalAddGTime, AirTime, MAX(ArrivalDelayGroups), SUM(AirTime) FROM mytable WHERE ArrTime NOT IN (1156, 150, 2130, 852, 1230) OR DepDel15 BETWEEN 0 AND -9999 GROUP BY TotalAddGTime, AirTime  ORDER BY TotalAddGTime, AirTime LIMIT 11","hsqls":["SELECT TotalAddGTime, AirTime, MAX(ArrivalDelayGroups), SUM(AirTime) FROM mytable WHERE ArrTime NOT IN (1156, 150, 2130, 852, 1230) OR DepDel15 BETWEEN 0 AND -9999 GROUP BY TotalAddGTime, AirTime  ORDER BY TotalAddGTime, AirTime LIMIT 11"]}
 {"sql":"SELECT Carrier, WheelsOn, ArrivalDelayGroups FROM mytable WHERE DayOfWeek BETWEEN 5 AND 4 OR ArrTime BETWEEN 221 AND 1613 OR DivActualElapsedTime >= 244 ORDER BY OriginState, DaysSinceEpoch LIMIT 9"}
 {"sql":"SELECT DestAirportSeqID, ArrivalDelayGroups FROM mytable WHERE DestAirportID BETWEEN 13388 AND 12915 LIMIT 17"}
-{"sql":"SELECT DivLongestGTimes, Diverted FROM mytable ORDER BY Quarter, AirlineID LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Diverted FROM mytable ORDER BY Quarter, AirlineID LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, DivLongestGTimes, SecurityDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DestState = 'LA' OR OriginAirportSeqID IN (1315802, 1393003, 1348502) ORDER BY DestStateName","hsqls":["SELECT DepartureDelayGroups, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, SecurityDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DestState = 'LA' OR OriginAirportSeqID IN (1315802, 1393003, 1348502) ORDER BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, TaxiIn, UniqueCarrier FROM mytable WHERE ArrDel15 <> 0 OR DestCityMarketID < 31135 ORDER BY DestStateName, OriginWac, \"Month\" LIMIT 18","hsqls":["SELECT LateAircraftDelay, TaxiIn, UniqueCarrier FROM mytable WHERE ArrDel15 <> 0 OR DestCityMarketID < 31135 ORDER BY DestStateName, OriginWac, Month LIMIT 18"]}
+{"sql":"SELECT DivLongestGTimes, Diverted FROM mytable ORDER BY Quarter, AirlineID LIMIT 10","hsqls":["SELECT DivLongestGTimes, Diverted FROM mytable ORDER BY Quarter, AirlineID LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivLongestGTimes, SecurityDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DestState = 'LA' OR OriginAirportSeqID IN (1315802, 1393003, 1348502) ORDER BY DestStateName","hsqls":["SELECT DepartureDelayGroups, DivLongestGTimes, SecurityDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR DestState = 'LA' OR OriginAirportSeqID IN (1315802, 1393003, 1348502) ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, TaxiIn, UniqueCarrier FROM mytable WHERE ArrDel15 <> 0 OR DestCityMarketID < 31135 ORDER BY DestStateName, OriginWac, \"Month\" LIMIT 18","hsqls":["SELECT LateAircraftDelay, TaxiIn, UniqueCarrier FROM mytable WHERE ArrDel15 <> 0 OR DestCityMarketID < 31135 ORDER BY DestStateName, OriginWac, `Month` LIMIT 18"]}
 {"sql":"SELECT OriginStateFips, Distance, DivActualElapsedTime, AVG(Flights) FROM mytable WHERE CRSArrTime > 1302 AND OriginWac = 15 GROUP BY OriginStateFips, Distance, DivActualElapsedTime  ORDER BY OriginStateFips, Distance, DivActualElapsedTime LIMIT 28","hsqls":["SELECT OriginStateFips, Distance, DivActualElapsedTime, AVG(Flights) FROM mytable WHERE CRSArrTime > 1302 AND OriginWac = 15 GROUP BY OriginStateFips, Distance, DivActualElapsedTime  ORDER BY OriginStateFips, Distance, DivActualElapsedTime LIMIT 28"]}
 {"sql":"SELECT FlightDate, DestStateName, MIN(CRSDepTime), SUM(OriginStateFips) FROM mytable WHERE ArrTime BETWEEN 2358 AND 1337 OR AirTime NOT IN (299) OR ArrDelay BETWEEN 229.0 AND 223.0 GROUP BY FlightDate, DestStateName  ORDER BY FlightDate, DestStateName LIMIT 13","hsqls":["SELECT FlightDate, DestStateName, MIN(CRSDepTime), SUM(OriginStateFips) FROM mytable WHERE ArrTime BETWEEN 2358 AND 1337 OR AirTime NOT IN (299) OR ArrDelay BETWEEN 229.0 AND 223.0 GROUP BY FlightDate, DestStateName  ORDER BY FlightDate, DestStateName LIMIT 13"]}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY TaxiOut, OriginState, DestCityName LIMIT 8"}
-{"sql":"SELECT WheelsOn FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND 1 AND DivAirports IN ('SYR') LIMIT 7","hsqls":["SELECT WheelsOn FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND 1 AND (DivAirports__MV0 IN ('SYR') OR DivAirports__MV1 IN ('SYR') OR DivAirports__MV2 IN ('SYR') OR DivAirports__MV3 IN ('SYR') OR DivAirports__MV4 IN ('SYR')) LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DestStateFips BETWEEN 32 AND 47 OR DivAirportSeqIDs IN (1221702, 1014002, 1329604, 1323002) AND DestStateFips NOT IN (4, 33, 53, 15, 50) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 2","hsqls":["SELECT CRSArrTime FROM mytable WHERE DestStateFips BETWEEN 32 AND 47 OR (DivAirportSeqIDs__MV0 IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs__MV1 IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs__MV2 IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs__MV3 IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs__MV4 IN (1221702, 1014002, 1329604, 1323002)) AND DestStateFips NOT IN (4, 33, 53, 15, 50) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT WheelsOn FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND 1 AND DivAirports IN ('SYR') LIMIT 7","hsqls":["SELECT WheelsOn FROM mytable WHERE DepartureDelayGroups BETWEEN -2 AND 1 AND (DivAirports[1] IN ('SYR') OR DivAirports[2] IN ('SYR') OR DivAirports[3] IN ('SYR') OR DivAirports[4] IN ('SYR') OR DivAirports[5] IN ('SYR')) LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DestStateFips BETWEEN 32 AND 47 OR DivAirportSeqIDs IN (1221702, 1014002, 1329604, 1323002) AND DestStateFips NOT IN (4, 33, 53, 15, 50) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 2","hsqls":["SELECT CRSArrTime FROM mytable WHERE DestStateFips BETWEEN 32 AND 47 OR (DivAirportSeqIDs[1] IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs[2] IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs[3] IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs[4] IN (1221702, 1014002, 1329604, 1323002) OR DivAirportSeqIDs[5] IN (1221702, 1014002, 1329604, 1323002)) AND DestStateFips NOT IN (4, 33, 53, 15, 50) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DepDel15, CRSDepTime, MAX(DestWac) FROM mytable WHERE Distance = 908 OR OriginStateFips IN (53, 27, 12) OR TaxiIn <= 67 GROUP BY DepDel15, CRSDepTime  ORDER BY DepDel15, CRSDepTime LIMIT 2","hsqls":["SELECT DepDel15, CRSDepTime, MAX(DestWac) FROM mytable WHERE Distance = 908 OR OriginStateFips IN (53, 27, 12) OR TaxiIn <= 67 GROUP BY DepDel15, CRSDepTime  ORDER BY DepDel15, CRSDepTime LIMIT 2"]}
 {"sql":"SELECT Dest FROM mytable WHERE ArrDel15 <> 0 ORDER BY DepartureDelayGroups, Diverted LIMIT 27"}
 {"sql":"SELECT DestAirportSeqID, AirlineID, OriginStateName FROM mytable WHERE CRSElapsedTime NOT IN (162, 204, 455, 86) ORDER BY OriginCityName, DestAirportSeqID, OriginStateName LIMIT 16"}
 {"sql":"SELECT DestStateFips, OriginAirportID, MAX(Quarter), SUM(ActualElapsedTime), COUNT(DivArrDelay) FROM mytable WHERE OriginCityMarketID NOT IN (31714, 31865) OR DaysSinceEpoch = 16087 AND FlightNum BETWEEN 4607 AND 279 GROUP BY DestStateFips, OriginAirportID  ORDER BY DestStateFips, OriginAirportID LIMIT 19","hsqls":["SELECT DestStateFips, OriginAirportID, MAX(Quarter), SUM(ActualElapsedTime), COUNT(DivArrDelay) FROM mytable WHERE OriginCityMarketID NOT IN (31714, 31865) OR DaysSinceEpoch = 16087 AND FlightNum BETWEEN 4607 AND 279 GROUP BY DestStateFips, OriginAirportID  ORDER BY DestStateFips, OriginAirportID LIMIT 19"]}
-{"sql":"SELECT LateAircraftDelay FROM mytable WHERE DivAirportIDs IN (11905, 10185, 13244, 13433, 10397) LIMIT 20","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE (DivAirportIDs__MV0 IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs__MV1 IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs__MV2 IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs__MV3 IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs__MV4 IN (11905, 10185, 13244, 13433, 10397)) LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay FROM mytable WHERE DivAirportIDs IN (11905, 10185, 13244, 13433, 10397) LIMIT 20","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE (DivAirportIDs[1] IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs[2] IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs[3] IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs[4] IN (11905, 10185, 13244, 13433, 10397) OR DivAirportIDs[5] IN (11905, 10185, 13244, 13433, 10397)) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, Origin FROM mytable WHERE OriginState BETWEEN 'LA' AND 'WY' OR ActualElapsedTime NOT IN (260, 544, 508, 423) AND DayofMonth NOT IN (3, 30, 22, 16, 11) ORDER BY Cancelled, Dest LIMIT 16"}
 {"sql":"SELECT NASDelay, AirTime FROM mytable LIMIT 29"}
 {"sql":"SELECT DestStateName, DepDel15, OriginWac FROM mytable LIMIT 19"}
 {"sql":"SELECT SUM(NASDelay), MAX(WheelsOff), SUM(ArrDelay) FROM mytable LIMIT 13"}
 {"sql":"SELECT DepartureDelayGroups, DivArrDelay, SUM(ArrDel15), SUM(Distance) FROM mytable WHERE TailNum BETWEEN 'N910WN' AND 'N14105' OR CRSElapsedTime IN (277, 91, 307, 118) GROUP BY DepartureDelayGroups, DivArrDelay  ORDER BY DepartureDelayGroups, DivArrDelay LIMIT 5","hsqls":["SELECT DepartureDelayGroups, DivArrDelay, SUM(ArrDel15), SUM(Distance) FROM mytable WHERE TailNum BETWEEN 'N910WN' AND 'N14105' OR CRSElapsedTime IN (277, 91, 307, 118) GROUP BY DepartureDelayGroups, DivArrDelay  ORDER BY DepartureDelayGroups, DivArrDelay LIMIT 5"]}
-{"sql":"SELECT COUNT(Carrier), SUM(Cancelled), MIN(DestStateFips) FROM mytable WHERE \"Month\" > 1 AND OriginStateFips BETWEEN 45 AND 48 LIMIT 12","hsqls":["SELECT COUNT(Carrier), SUM(Cancelled), MIN(DestStateFips) FROM mytable WHERE Month > 1 AND OriginStateFips BETWEEN 45 AND 48 LIMIT 12"]}
-{"sql":"SELECT WheelsOff FROM mytable WHERE DivTotalGTimes IN (98, 57, 9, 118) OR DepTime <> 1910 AND DayofMonth <> 25 LIMIT 29","hsqls":["SELECT WheelsOff FROM mytable WHERE (DivTotalGTimes__MV0 IN (98, 57, 9, 118) OR DivTotalGTimes__MV1 IN (98, 57, 9, 118) OR DivTotalGTimes__MV2 IN (98, 57, 9, 118) OR DivTotalGTimes__MV3 IN (98, 57, 9, 118) OR DivTotalGTimes__MV4 IN (98, 57, 9, 118)) OR DepTime <> 1910 AND DayofMonth <> 25 LIMIT 10000"]}
-{"sql":"SELECT ArrDelay, MIN(SecurityDelay), COUNT(TaxiOut), COUNT(DestAirportID) FROM mytable WHERE DestAirportSeqID IN (1199603) AND DivTailNums < 'N754SW' GROUP BY ArrDelay LIMIT 16","hsqls":["SELECT ArrDelay, MIN(SecurityDelay), COUNT(TaxiOut), COUNT(DestAirportID) FROM mytable WHERE DestAirportSeqID IN (1199603) AND (DivTailNums__MV0 < 'N754SW' OR DivTailNums__MV1 < 'N754SW' OR DivTailNums__MV2 < 'N754SW' OR DivTailNums__MV3 < 'N754SW' OR DivTailNums__MV4 < 'N754SW') GROUP BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT COUNT(Carrier), SUM(Cancelled), MIN(DestStateFips) FROM mytable WHERE \"Month\" > 1 AND OriginStateFips BETWEEN 45 AND 48 LIMIT 12","hsqls":["SELECT COUNT(Carrier), SUM(Cancelled), MIN(DestStateFips) FROM mytable WHERE `Month` > 1 AND OriginStateFips BETWEEN 45 AND 48 LIMIT 12"]}
+{"sql":"SELECT WheelsOff FROM mytable WHERE DivTotalGTimes IN (98, 57, 9, 118) OR DepTime <> 1910 AND DayofMonth <> 25 LIMIT 29","hsqls":["SELECT WheelsOff FROM mytable WHERE (DivTotalGTimes[1] IN (98, 57, 9, 118) OR DivTotalGTimes[2] IN (98, 57, 9, 118) OR DivTotalGTimes[3] IN (98, 57, 9, 118) OR DivTotalGTimes[4] IN (98, 57, 9, 118) OR DivTotalGTimes[5] IN (98, 57, 9, 118)) OR DepTime <> 1910 AND DayofMonth <> 25 LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, MIN(SecurityDelay), COUNT(TaxiOut), COUNT(DestAirportID) FROM mytable WHERE DestAirportSeqID IN (1199603) AND DivTailNums < 'N754SW' GROUP BY ArrDelay LIMIT 16","hsqls":["SELECT ArrDelay, MIN(SecurityDelay), COUNT(TaxiOut), COUNT(DestAirportID) FROM mytable WHERE DestAirportSeqID IN (1199603) AND (DivTailNums[1] < 'N754SW' OR DivTailNums[2] < 'N754SW' OR DivTailNums[3] < 'N754SW' OR DivTailNums[4] < 'N754SW' OR DivTailNums[5] < 'N754SW') GROUP BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, NASDelay FROM mytable LIMIT 11"}
 {"sql":"SELECT OriginStateFips, DepDelayMinutes, COUNT(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID IN (1106702) GROUP BY OriginStateFips, DepDelayMinutes  ORDER BY OriginStateFips, DepDelayMinutes LIMIT 15","hsqls":["SELECT OriginStateFips, DepDelayMinutes, COUNT(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID IN (1106702) GROUP BY OriginStateFips, DepDelayMinutes  ORDER BY OriginStateFips, DepDelayMinutes LIMIT 15"]}
-{"sql":"SELECT DivAirportLandings, ArrivalDelayGroups, DayOfWeek, SUM(\"Year\") FROM mytable WHERE TailNum IN ('N180DN', 'N409SW', 'N754UW') AND AirTime NOT IN (88, 154) AND Cancelled NOT IN (1, 0) GROUP BY DivAirportLandings, ArrivalDelayGroups, DayOfWeek LIMIT 8","hsqls":["SELECT DivAirportLandings, ArrivalDelayGroups, DayOfWeek, SUM(Year) FROM mytable WHERE TailNum IN ('N180DN', 'N409SW', 'N754UW') AND AirTime NOT IN (88, 154) AND Cancelled NOT IN (1, 0) GROUP BY DivAirportLandings, ArrivalDelayGroups, DayOfWeek LIMIT 8"]}
+{"sql":"SELECT DivAirportLandings, ArrivalDelayGroups, DayOfWeek, SUM(\"Year\") FROM mytable WHERE TailNum IN ('N180DN', 'N409SW', 'N754UW') AND AirTime NOT IN (88, 154) AND Cancelled NOT IN (1, 0) GROUP BY DivAirportLandings, ArrivalDelayGroups, DayOfWeek LIMIT 8","hsqls":["SELECT DivAirportLandings, ArrivalDelayGroups, DayOfWeek, SUM(`Year`) FROM mytable WHERE TailNum IN ('N180DN', 'N409SW', 'N754UW') AND AirTime NOT IN (88, 154) AND Cancelled NOT IN (1, 0) GROUP BY DivAirportLandings, ArrivalDelayGroups, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT DepTime, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE Dest IN ('SCC', 'PWM', 'MCI', 'LFT', 'BGR') GROUP BY DepTime, DestCityName, DepTimeBlk  ORDER BY DepTime, DestCityName, DepTimeBlk LIMIT 21","hsqls":["SELECT DepTime, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE Dest IN ('SCC', 'PWM', 'MCI', 'LFT', 'BGR') GROUP BY DepTime, DestCityName, DepTimeBlk  ORDER BY DepTime, DestCityName, DepTimeBlk LIMIT 21"]}
 {"sql":"SELECT AVG(WeatherDelay), MAX(AirlineID), MAX(DestStateFips) FROM mytable WHERE OriginWac = 53 LIMIT 8"}
-{"sql":"SELECT DivLongestGTimes, Carrier, DepDel15 FROM mytable WHERE Quarter >= 1 OR FirstDepTime = 1742 AND Carrier NOT IN ('US', 'FL', 'UA', 'AS', 'VX') ORDER BY DestStateFips, DestStateName LIMIT 24","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Carrier, DepDel15 FROM mytable WHERE Quarter >= 1 OR FirstDepTime = 1742 AND Carrier NOT IN ('US', 'FL', 'UA', 'AS', 'VX') ORDER BY DestStateFips, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Carrier, DepDel15 FROM mytable WHERE Quarter >= 1 OR FirstDepTime = 1742 AND Carrier NOT IN ('US', 'FL', 'UA', 'AS', 'VX') ORDER BY DestStateFips, DestStateName LIMIT 24","hsqls":["SELECT DivLongestGTimes, Carrier, DepDel15 FROM mytable WHERE Quarter >= 1 OR FirstDepTime = 1742 AND Carrier NOT IN ('US', 'FL', 'UA', 'AS', 'VX') ORDER BY DestStateFips, DestStateName LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY OriginStateName LIMIT 26"}
 {"sql":"SELECT Distance, ArrTime, DivActualElapsedTime FROM mytable WHERE DistanceGroup NOT IN (6, 5, 4) AND DestAirportSeqID IN (1014102, 1200702, 1306104) ORDER BY OriginState, Diverted, OriginAirportID LIMIT 4"}
 {"sql":"SELECT AVG(ArrTime), SUM(NASDelay) FROM mytable WHERE DestAirportID BETWEEN 10926 AND 10620 OR WheelsOff < 716 LIMIT 29"}
-{"sql":"SELECT CancellationCode, SUM(DivReachedDest) FROM mytable WHERE \"Month\" <= 1 AND Distance = 990 OR Quarter <> 1 GROUP BY CancellationCode LIMIT 7","hsqls":["SELECT CancellationCode, SUM(DivReachedDest) FROM mytable WHERE Month <= 1 AND Distance = 990 OR Quarter <> 1 GROUP BY CancellationCode LIMIT 7"]}
+{"sql":"SELECT CancellationCode, SUM(DivReachedDest) FROM mytable WHERE \"Month\" <= 1 AND Distance = 990 OR Quarter <> 1 GROUP BY CancellationCode LIMIT 7","hsqls":["SELECT CancellationCode, SUM(DivReachedDest) FROM mytable WHERE `Month` <= 1 AND Distance = 990 OR Quarter <> 1 GROUP BY CancellationCode LIMIT 7"]}
 {"sql":"SELECT AVG(LateAircraftDelay) FROM mytable LIMIT 10"}
-{"sql":"SELECT FlightDate, OriginStateName, DayOfWeek, MIN(DayofMonth) FROM mytable WHERE DivTailNums IN ('N614SK', 'N278AT', 'N14174') OR FirstDepTime IN (1859) GROUP BY FlightDate, OriginStateName, DayOfWeek LIMIT 10","hsqls":["SELECT FlightDate, OriginStateName, DayOfWeek, MIN(DayofMonth) FROM mytable WHERE (DivTailNums__MV0 IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums__MV1 IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums__MV2 IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums__MV3 IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums__MV4 IN ('N614SK', 'N278AT', 'N14174')) OR FirstDepTime IN (1859) GROUP BY FlightDate, OriginStateName, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT FlightDate, OriginStateName, DayOfWeek, MIN(DayofMonth) FROM mytable WHERE DivTailNums IN ('N614SK', 'N278AT', 'N14174') OR FirstDepTime IN (1859) GROUP BY FlightDate, OriginStateName, DayOfWeek LIMIT 10","hsqls":["SELECT FlightDate, OriginStateName, DayOfWeek, MIN(DayofMonth) FROM mytable WHERE (DivTailNums[1] IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums[2] IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums[3] IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums[4] IN ('N614SK', 'N278AT', 'N14174') OR DivTailNums[5] IN ('N614SK', 'N278AT', 'N14174')) OR FirstDepTime IN (1859) GROUP BY FlightDate, OriginStateName, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT AirTime FROM mytable LIMIT 15"}
 {"sql":"SELECT AVG(CRSElapsedTime) FROM mytable LIMIT 27"}
 {"sql":"SELECT DepDelay, Dest, DestAirportID FROM mytable WHERE LateAircraftDelay >= 41 AND DepartureDelayGroups <= 10 OR DepDelayMinutes <> 164.0 LIMIT 10"}
 {"sql":"SELECT DestState, OriginAirportID, MAX(WheelsOn), MIN(DivArrDelay), AVG(WheelsOn) FROM mytable WHERE DepTime = 651 AND Quarter IN (1) GROUP BY DestState, OriginAirportID","hsqls":["SELECT DestState, OriginAirportID, MAX(WheelsOn), MIN(DivArrDelay), AVG(WheelsOn) FROM mytable WHERE DepTime = 651 AND Quarter IN (1) GROUP BY DestState, OriginAirportID"]}
-{"sql":"SELECT UniqueCarrier, MIN(\"Year\"), COUNT(OriginStateName), SUM(DivActualElapsedTime) FROM mytable GROUP BY UniqueCarrier LIMIT 3","hsqls":["SELECT UniqueCarrier, MIN(Year), COUNT(OriginStateName), SUM(DivActualElapsedTime) FROM mytable GROUP BY UniqueCarrier LIMIT 3"]}
+{"sql":"SELECT UniqueCarrier, MIN(\"Year\"), COUNT(OriginStateName), SUM(DivActualElapsedTime) FROM mytable GROUP BY UniqueCarrier LIMIT 3","hsqls":["SELECT UniqueCarrier, MIN(`Year`), COUNT(OriginStateName), SUM(DivActualElapsedTime) FROM mytable GROUP BY UniqueCarrier LIMIT 3"]}
 {"sql":"SELECT DestCityName, DepDel15 FROM mytable WHERE LongestAddGTime > 97 ORDER BY DestCityName"}
 {"sql":"SELECT ArrDel15, COUNT(*) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 29","hsqls":["SELECT ArrDel15, COUNT(*) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 29"]}
 {"sql":"SELECT NASDelay, \"Month\", ArrivalDelayGroups, AVG(CRSDepTime), MIN(WheelsOff), COUNT(WheelsOff) FROM mytable WHERE Carrier BETWEEN 'WN' AND 'MQ' OR WeatherDelay IN (0, 7) OR ActualElapsedTime BETWEEN 108 AND 295 GROUP BY NASDelay, \"Month\", ArrivalDelayGroups LIMIT 5","hsqls":["SELECT NASDelay, Month, ArrivalDelayGroups, AVG(CRSDepTime), MIN(WheelsOff), COUNT(WheelsOff) FROM mytable WHERE Carrier BETWEEN 'WN' AND 'MQ' OR WeatherDelay IN (0, 7) OR ActualElapsedTime BETWEEN 108 AND 295 GROUP BY NASDelay, Month, ArrivalDelayGroups LIMIT 5"]}
@@ -3692,11 +3692,11 @@
 {"sql":"SELECT FirstDepTime, DivDistance, ArrDelay, MIN(Flights) FROM mytable GROUP BY FirstDepTime, DivDistance, ArrDelay  ORDER BY FirstDepTime, DivDistance, ArrDelay LIMIT 26","hsqls":["SELECT FirstDepTime, DivDistance, ArrDelay, MIN(Flights) FROM mytable GROUP BY FirstDepTime, DivDistance, ArrDelay  ORDER BY FirstDepTime, DivDistance, ArrDelay LIMIT 26"]}
 {"sql":"SELECT ArrTime FROM mytable WHERE ArrivalDelayGroups = -2 OR DayOfWeek BETWEEN 1 AND 7 ORDER BY FlightNum, NASDelay LIMIT 24"}
 {"sql":"SELECT DistanceGroup, DestState, OriginAirportID, MIN(CarrierDelay), SUM(ArrTime) FROM mytable GROUP BY DistanceGroup, DestState, OriginAirportID  ORDER BY DistanceGroup, DestState, OriginAirportID LIMIT 3","hsqls":["SELECT DistanceGroup, DestState, OriginAirportID, MIN(CarrierDelay), SUM(ArrTime) FROM mytable GROUP BY DistanceGroup, DestState, OriginAirportID  ORDER BY DistanceGroup, DestState, OriginAirportID LIMIT 3"]}
-{"sql":"SELECT \"Month\", MIN(DivArrDelay) FROM mytable WHERE LongestAddGTime BETWEEN 55 AND 24 OR FlightDate NOT IN ('2014-01-03', '2014-01-24', '2014-01-01', '2014-01-10') OR UniqueCarrier IN ('B6', 'US', 'AA') GROUP BY \"Month\" LIMIT 21","hsqls":["SELECT Month, MIN(DivArrDelay) FROM mytable WHERE LongestAddGTime BETWEEN 55 AND 24 OR FlightDate NOT IN ('2014-01-03', '2014-01-24', '2014-01-01', '2014-01-10') OR UniqueCarrier IN ('B6', 'US', 'AA') GROUP BY Month LIMIT 21"]}
+{"sql":"SELECT \"Month\", MIN(DivArrDelay) FROM mytable WHERE LongestAddGTime BETWEEN 55 AND 24 OR FlightDate NOT IN ('2014-01-03', '2014-01-24', '2014-01-01', '2014-01-10') OR UniqueCarrier IN ('B6', 'US', 'AA') GROUP BY \"Month\" LIMIT 21","hsqls":["SELECT Month, MIN(DivArrDelay) FROM mytable WHERE LongestAddGTime BETWEEN 55 AND 24 OR FlightDate NOT IN ('2014-01-03', '2014-01-24', '2014-01-01', '2014-01-10') OR UniqueCarrier IN ('B6', 'US', 'AA') GROUP BY `Month` LIMIT 21"]}
 {"sql":"SELECT SUM(TotalAddGTime), SUM(DestCityMarketID) FROM mytable WHERE DestCityName = 'Colorado Springs, CO' AND DestAirportID IN (12441, 11433, 11111) OR Carrier BETWEEN 'FL' AND 'HA' LIMIT 27"}
-{"sql":"SELECT DepDelay, \"Month\", MIN(Flights), MAX(CRSDepTime), SUM(DivActualElapsedTime) FROM mytable WHERE CRSDepTime BETWEEN 2305 AND 1806 GROUP BY DepDelay, \"Month\" LIMIT 5","hsqls":["SELECT DepDelay, Month, MIN(Flights), MAX(CRSDepTime), SUM(DivActualElapsedTime) FROM mytable WHERE CRSDepTime BETWEEN 2305 AND 1806 GROUP BY DepDelay, Month LIMIT 5"]}
-{"sql":"SELECT Flights, MIN(\"Month\") FROM mytable WHERE ArrDelay BETWEEN 108.0 AND 275.0 AND CRSDepTime BETWEEN 1137 AND 2141 GROUP BY Flights LIMIT 20","hsqls":["SELECT Flights, MIN(Month) FROM mytable WHERE ArrDelay BETWEEN 108.0 AND 275.0 AND CRSDepTime BETWEEN 1137 AND 2141 GROUP BY Flights LIMIT 20"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DivArrDelay = 66 ORDER BY Quarter LIMIT 3","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE DivArrDelay = 66 ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT DepDelay, \"Month\", MIN(Flights), MAX(CRSDepTime), SUM(DivActualElapsedTime) FROM mytable WHERE CRSDepTime BETWEEN 2305 AND 1806 GROUP BY DepDelay, \"Month\" LIMIT 5","hsqls":["SELECT DepDelay, Month, MIN(Flights), MAX(CRSDepTime), SUM(DivActualElapsedTime) FROM mytable WHERE CRSDepTime BETWEEN 2305 AND 1806 GROUP BY DepDelay, `Month` LIMIT 5"]}
+{"sql":"SELECT Flights, MIN(\"Month\") FROM mytable WHERE ArrDelay BETWEEN 108.0 AND 275.0 AND CRSDepTime BETWEEN 1137 AND 2141 GROUP BY Flights LIMIT 20","hsqls":["SELECT Flights, MIN(`Month`) FROM mytable WHERE ArrDelay BETWEEN 108.0 AND 275.0 AND CRSDepTime BETWEEN 1137 AND 2141 GROUP BY Flights LIMIT 20"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DivArrDelay = 66 ORDER BY Quarter LIMIT 3","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE DivArrDelay = 66 ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 246.0 AND 198.0 LIMIT 15"}
 {"sql":"SELECT MAX(OriginWac) FROM mytable WHERE OriginAirportSeqID BETWEEN 1342402 AND 1323202 AND CRSDepTime > 1340 LIMIT 18"}
 {"sql":"SELECT DivReachedDest, DivDistance, Dest FROM mytable WHERE CRSDepTime < 2240 OR SecurityDelay <= 0 AND DestWac >= 52 ORDER BY Carrier, DepDelayMinutes, ActualElapsedTime LIMIT 6"}
@@ -3708,111 +3708,111 @@
 {"sql":"SELECT LongestAddGTime, TotalAddGTime, DivAirportLandings FROM mytable ORDER BY FlightNum LIMIT 9"}
 {"sql":"SELECT DestWac, DestState, ArrivalDelayGroups FROM mytable WHERE DestCityName = 'Palm Springs, CA' OR DestAirportSeqID BETWEEN 1127802 AND 1026802 OR WeatherDelay NOT IN (66, 7, 103) ORDER BY DestState, ActualElapsedTime, DayofMonth LIMIT 23"}
 {"sql":"SELECT DestCityName, DivArrDelay, OriginStateName FROM mytable WHERE Diverted NOT IN (1, 0) OR DestState BETWEEN 'NJ' AND 'PA' ORDER BY LateAircraftDelay, DepTime LIMIT 6"}
-{"sql":"SELECT LateAircraftDelay, ArrTimeBlk, \"Month\" FROM mytable WHERE DepDelayMinutes IN (145.0, 43.0) OR TaxiIn >= 56 LIMIT 15","hsqls":["SELECT LateAircraftDelay, ArrTimeBlk, Month FROM mytable WHERE DepDelayMinutes IN (145.0, 43.0) OR TaxiIn >= 56 LIMIT 15"]}
+{"sql":"SELECT LateAircraftDelay, ArrTimeBlk, \"Month\" FROM mytable WHERE DepDelayMinutes IN (145.0, 43.0) OR TaxiIn >= 56 LIMIT 15","hsqls":["SELECT LateAircraftDelay, ArrTimeBlk, `Month` FROM mytable WHERE DepDelayMinutes IN (145.0, 43.0) OR TaxiIn >= 56 LIMIT 15"]}
 {"sql":"SELECT ArrDelay, SUM(TaxiIn) FROM mytable WHERE CarrierDelay BETWEEN 41 AND 157 AND FlightDate BETWEEN '2014-01-29' AND '2014-01-04' GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 19","hsqls":["SELECT ArrDelay, SUM(TaxiIn) FROM mytable WHERE CarrierDelay BETWEEN 41 AND 157 AND FlightDate BETWEEN '2014-01-29' AND '2014-01-04' GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 19"]}
 {"sql":"SELECT DestState, DestCityMarketID, DivActualElapsedTime FROM mytable WHERE OriginCityName >= 'Waco, TX' OR CancellationCode <> 'A' OR CRSArrTime BETWEEN 1535 AND 1937 LIMIT 25"}
 {"sql":"SELECT DestWac, CarrierDelay FROM mytable WHERE DayofMonth BETWEEN 18 AND 11 OR ArrDelay IN (78.0, 205.0) ORDER BY Carrier, OriginCityMarketID, DestStateName LIMIT 5"}
-{"sql":"SELECT DepDel15, MIN(OriginCityMarketID) FROM mytable WHERE DivWheelsOns > 1751 OR DestAirportID <= 10561 AND DepDel15 = -9999 GROUP BY DepDel15 LIMIT 10","hsqls":["SELECT DepDel15, MIN(OriginCityMarketID) FROM mytable WHERE (DivWheelsOns__MV0 > 1751 OR DivWheelsOns__MV1 > 1751 OR DivWheelsOns__MV2 > 1751 OR DivWheelsOns__MV3 > 1751 OR DivWheelsOns__MV4 > 1751) OR DestAirportID <= 10561 AND DepDel15 = -9999 GROUP BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DepDel15, MIN(OriginCityMarketID) FROM mytable WHERE DivWheelsOns > 1751 OR DestAirportID <= 10561 AND DepDel15 = -9999 GROUP BY DepDel15 LIMIT 10","hsqls":["SELECT DepDel15, MIN(OriginCityMarketID) FROM mytable WHERE (DivWheelsOns[1] > 1751 OR DivWheelsOns[2] > 1751 OR DivWheelsOns[3] > 1751 OR DivWheelsOns[4] > 1751 OR DivWheelsOns[5] > 1751) OR DestAirportID <= 10561 AND DepDel15 = -9999 GROUP BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable WHERE DepartureDelayGroups IN (1, -1) AND UniqueCarrier BETWEEN 'OO' AND 'UA' AND Distance IN (78, 624) ORDER BY OriginAirportSeqID, ArrDel15"}
 {"sql":"SELECT ActualElapsedTime, COUNT(DestStateName), COUNT(DaysSinceEpoch), AVG(DivArrDelay) FROM mytable WHERE DestWac < 34 AND DestCityName <= 'Springfield, IL' OR DestAirportSeqID > 1294503 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 2","hsqls":["SELECT ActualElapsedTime, COUNT(DestStateName), COUNT(DaysSinceEpoch), AVG(DivArrDelay) FROM mytable WHERE DestWac < 34 AND DestCityName <= 'Springfield, IL' OR DestAirportSeqID > 1294503 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 2"]}
 {"sql":"SELECT DestWac, LateAircraftDelay, Origin FROM mytable WHERE FirstDepTime >= 1534 ORDER BY \"Year\", DivReachedDest, ArrTimeBlk LIMIT 7","hsqls":["SELECT DestWac, LateAircraftDelay, Origin FROM mytable WHERE FirstDepTime >= 1534 ORDER BY Year, DivReachedDest, ArrTimeBlk LIMIT 7"]}
 {"sql":"SELECT Flights, ActualElapsedTime, COUNT(*) FROM mytable GROUP BY Flights, ActualElapsedTime  ORDER BY Flights, ActualElapsedTime LIMIT 1","hsqls":["SELECT Flights, ActualElapsedTime, COUNT(*) FROM mytable GROUP BY Flights, ActualElapsedTime  ORDER BY Flights, ActualElapsedTime LIMIT 1"]}
-{"sql":"SELECT OriginStateFips, WeatherDelay, DestStateName FROM mytable WHERE TaxiOut IN (3, 108, 52) AND DivWheelsOffs BETWEEN 1148 AND 2159 AND DistanceGroup BETWEEN 8 AND 3 ORDER BY DayofMonth LIMIT 3","hsqls":["SELECT OriginStateFips, WeatherDelay, DestStateName FROM mytable WHERE TaxiOut IN (3, 108, 52) AND (DivWheelsOffs__MV0 BETWEEN 1148 AND 2159 OR DivWheelsOffs__MV1 BETWEEN 1148 AND 2159 OR DivWheelsOffs__MV2 BETWEEN 1148 AND 2159 OR DivWheelsOffs__MV3 BETWEEN 1148 AND 2159 OR DivWheelsOffs__MV4 BETWEEN 1148 AND 2159) AND DistanceGroup BETWEEN 8 AND 3 ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, WeatherDelay, DestStateName FROM mytable WHERE TaxiOut IN (3, 108, 52) AND DivWheelsOffs BETWEEN 1148 AND 2159 AND DistanceGroup BETWEEN 8 AND 3 ORDER BY DayofMonth LIMIT 3","hsqls":["SELECT OriginStateFips, WeatherDelay, DestStateName FROM mytable WHERE TaxiOut IN (3, 108, 52) AND (DivWheelsOffs[1] BETWEEN 1148 AND 2159 OR DivWheelsOffs[2] BETWEEN 1148 AND 2159 OR DivWheelsOffs[3] BETWEEN 1148 AND 2159 OR DivWheelsOffs[4] BETWEEN 1148 AND 2159 OR DivWheelsOffs[5] BETWEEN 1148 AND 2159) AND DistanceGroup BETWEEN 8 AND 3 ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, OriginAirportID, DayOfWeek, MIN(DayOfWeek), MAX(AirTime) FROM mytable WHERE DestCityName >= 'Norfolk, VA' AND DepartureDelayGroups = 9 AND DayofMonth BETWEEN 19 AND 13 GROUP BY SecurityDelay, OriginAirportID, DayOfWeek  ORDER BY SecurityDelay, OriginAirportID, DayOfWeek LIMIT 10","hsqls":["SELECT SecurityDelay, OriginAirportID, DayOfWeek, MIN(DayOfWeek), MAX(AirTime) FROM mytable WHERE DestCityName >= 'Norfolk, VA' AND DepartureDelayGroups = 9 AND DayofMonth BETWEEN 19 AND 13 GROUP BY SecurityDelay, OriginAirportID, DayOfWeek  ORDER BY SecurityDelay, OriginAirportID, DayOfWeek LIMIT 10"]}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE DepTimeBlk BETWEEN '1900-1959' AND '2300-2359' AND Quarter NOT IN (1) ORDER BY Distance LIMIT 26"}
 {"sql":"SELECT CarrierDelay, ArrDelayMinutes, CancellationCode FROM mytable WHERE UniqueCarrier < 'VX' AND ArrDelay >= 82.0 AND FlightNum BETWEEN 2140 AND 1655 LIMIT 17"}
-{"sql":"SELECT DestWac, DivAirportIDs, CancellationCode FROM mytable WHERE TaxiIn IN (79, 95, 46, 64, 15) ORDER BY FlightDate LIMIT 4","hsqls":["SELECT DestWac, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CancellationCode FROM mytable WHERE TaxiIn IN (79, 95, 46, 64, 15) ORDER BY FlightDate LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirportIDs, CancellationCode FROM mytable WHERE TaxiIn IN (79, 95, 46, 64, 15) ORDER BY FlightDate LIMIT 4","hsqls":["SELECT DestWac, DivAirportIDs, CancellationCode FROM mytable WHERE TaxiIn IN (79, 95, 46, 64, 15) ORDER BY FlightDate LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState <= 'IN' LIMIT 1"}
 {"sql":"SELECT LongestAddGTime, DepTime, ArrDel15, COUNT(ArrTime), SUM(Distance), MAX(DayofMonth) FROM mytable WHERE DestAirportSeqID NOT IN (1330303, 1201202, 1323002) AND DestCityMarketID <= 31650 GROUP BY LongestAddGTime, DepTime, ArrDel15  ORDER BY LongestAddGTime, DepTime, ArrDel15 LIMIT 29","hsqls":["SELECT LongestAddGTime, DepTime, ArrDel15, COUNT(ArrTime), SUM(Distance), MAX(DayofMonth) FROM mytable WHERE DestAirportSeqID NOT IN (1330303, 1201202, 1323002) AND DestCityMarketID <= 31650 GROUP BY LongestAddGTime, DepTime, ArrDel15  ORDER BY LongestAddGTime, DepTime, ArrDel15 LIMIT 29"]}
 {"sql":"SELECT NASDelay, COUNT(DepartureDelayGroups) FROM mytable GROUP BY NASDelay  ORDER BY NASDelay LIMIT 21","hsqls":["SELECT NASDelay, COUNT(DepartureDelayGroups) FROM mytable GROUP BY NASDelay  ORDER BY NASDelay LIMIT 21"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (145, 213, 341, 74) OR ArrTimeBlk BETWEEN '2000-2059' AND '0600-0659' OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 27","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (145, 213, 341, 74) OR ArrTimeBlk BETWEEN '2000-2059' AND '0600-0659' OR Year BETWEEN 2014 AND 2014 LIMIT 27"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (145, 213, 341, 74) OR ArrTimeBlk BETWEEN '2000-2059' AND '0600-0659' OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 27","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (145, 213, 341, 74) OR ArrTimeBlk BETWEEN '2000-2059' AND '0600-0659' OR `Year` BETWEEN 2014 AND 2014 LIMIT 27"]}
 {"sql":"SELECT DepDelayMinutes, OriginCityMarketID, DivActualElapsedTime, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, OriginCityMarketID, DivActualElapsedTime  ORDER BY DepDelayMinutes, OriginCityMarketID, DivActualElapsedTime LIMIT 15","hsqls":["SELECT DepDelayMinutes, OriginCityMarketID, DivActualElapsedTime, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, OriginCityMarketID, DivActualElapsedTime  ORDER BY DepDelayMinutes, OriginCityMarketID, DivActualElapsedTime LIMIT 15"]}
 {"sql":"SELECT WheelsOff, Carrier FROM mytable WHERE OriginCityName NOT IN ('Aspen, CO', 'Kahului, HI') ORDER BY DepTime, \"Month\", DayOfWeek LIMIT 11","hsqls":["SELECT WheelsOff, Carrier FROM mytable WHERE OriginCityName NOT IN ('Aspen, CO', 'Kahului, HI') ORDER BY DepTime, Month, DayOfWeek LIMIT 11"]}
 {"sql":"SELECT OriginAirportID FROM mytable ORDER BY DivAirportLandings LIMIT 21"}
-{"sql":"SELECT DivLongestGTimes, DayofMonth FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR Quarter BETWEEN 1 AND 1 AND FlightNum >= 562 LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DayofMonth FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR Quarter BETWEEN 1 AND 1 AND FlightNum >= 562 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DayofMonth FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR Quarter BETWEEN 1 AND 1 AND FlightNum >= 562 LIMIT 10","hsqls":["SELECT DivLongestGTimes, DayofMonth FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR Quarter BETWEEN 1 AND 1 AND FlightNum >= 562 LIMIT 10000"]}
 {"sql":"SELECT OriginState, Origin FROM mytable WHERE TaxiIn BETWEEN 140 AND 42 AND OriginCityMarketID <= 33342 ORDER BY FlightDate, Cancelled, DayofMonth LIMIT 15"}
-{"sql":"SELECT DepTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE Origin BETWEEN 'SPI' AND 'CID' OR Flights > 1 AND DivLongestGTimes >= 77.0 ORDER BY Dest, CRSDepTime LIMIT 16","hsqls":["SELECT DepTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE Origin BETWEEN 'SPI' AND 'CID' OR Flights > 1 AND (DivLongestGTimes__MV0 >= 77.0 OR DivLongestGTimes__MV1 >= 77.0 OR DivLongestGTimes__MV2 >= 77.0 OR DivLongestGTimes__MV3 >= 77.0 OR DivLongestGTimes__MV4 >= 77.0) ORDER BY Dest, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivAirports, WheelsOn FROM mytable WHERE OriginStateFips = 33 LIMIT 18","hsqls":["SELECT DestWac, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, WheelsOn FROM mytable WHERE OriginStateFips = 33 LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE DepDelay = 6.0 AND DepTimeBlk IN ('1300-1359', '1100-1159', '2300-2359') ORDER BY DepDelay, Carrier, ActualElapsedTime LIMIT 26","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CRSElapsedTime FROM mytable WHERE DepDelay = 6.0 AND DepTimeBlk IN ('1300-1359', '1100-1159', '2300-2359') ORDER BY DepDelay, Carrier, ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, Origin, AVG(WeatherDelay), MAX(DayOfWeek), MAX(DayofMonth) FROM mytable WHERE OriginState < 'AK' AND FirstDepTime NOT IN (639, 736) AND DivAirportIDs IN (16101, 13829, 12953, 13029) GROUP BY OriginStateFips, Origin LIMIT 6","hsqls":["SELECT OriginStateFips, Origin, AVG(WeatherDelay), MAX(DayOfWeek), MAX(DayofMonth) FROM mytable WHERE OriginState < 'AK' AND FirstDepTime NOT IN (639, 736) AND (DivAirportIDs__MV0 IN (16101, 13829, 12953, 13029) OR DivAirportIDs__MV1 IN (16101, 13829, 12953, 13029) OR DivAirportIDs__MV2 IN (16101, 13829, 12953, 13029) OR DivAirportIDs__MV3 IN (16101, 13829, 12953, 13029) OR DivAirportIDs__MV4 IN (16101, 13829, 12953, 13029)) GROUP BY OriginStateFips, Origin LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes, WheelsOn FROM mytable WHERE DivAirportLandings NOT IN (2, 0, 9) AND DivWheelsOffs IN (842, 1816, 2152, 1907) AND Dest <> 'PIT' ORDER BY OriginAirportSeqID, DepartureDelayGroups, DestAirportID LIMIT 13","hsqls":["SELECT ArrDelayMinutes, WheelsOn FROM mytable WHERE DivAirportLandings NOT IN (2, 0, 9) AND (DivWheelsOffs__MV0 IN (842, 1816, 2152, 1907) OR DivWheelsOffs__MV1 IN (842, 1816, 2152, 1907) OR DivWheelsOffs__MV2 IN (842, 1816, 2152, 1907) OR DivWheelsOffs__MV3 IN (842, 1816, 2152, 1907) OR DivWheelsOffs__MV4 IN (842, 1816, 2152, 1907)) AND Dest <> 'PIT' ORDER BY OriginAirportSeqID, DepartureDelayGroups, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE Origin BETWEEN 'SPI' AND 'CID' OR Flights > 1 AND DivLongestGTimes >= 77.0 ORDER BY Dest, CRSDepTime LIMIT 16","hsqls":["SELECT DepTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE Origin BETWEEN 'SPI' AND 'CID' OR Flights > 1 AND (DivLongestGTimes[1] >= 77.0 OR DivLongestGTimes[2] >= 77.0 OR DivLongestGTimes[3] >= 77.0 OR DivLongestGTimes[4] >= 77.0 OR DivLongestGTimes[5] >= 77.0) ORDER BY Dest, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirports, WheelsOn FROM mytable WHERE OriginStateFips = 33 LIMIT 18","hsqls":["SELECT DestWac, DivAirports, WheelsOn FROM mytable WHERE OriginStateFips = 33 LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE DepDelay = 6.0 AND DepTimeBlk IN ('1300-1359', '1100-1159', '2300-2359') ORDER BY DepDelay, Carrier, ActualElapsedTime LIMIT 26","hsqls":["SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE DepDelay = 6.0 AND DepTimeBlk IN ('1300-1359', '1100-1159', '2300-2359') ORDER BY DepDelay, Carrier, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, Origin, AVG(WeatherDelay), MAX(DayOfWeek), MAX(DayofMonth) FROM mytable WHERE OriginState < 'AK' AND FirstDepTime NOT IN (639, 736) AND DivAirportIDs IN (16101, 13829, 12953, 13029) GROUP BY OriginStateFips, Origin LIMIT 6","hsqls":["SELECT OriginStateFips, Origin, AVG(WeatherDelay), MAX(DayOfWeek), MAX(DayofMonth) FROM mytable WHERE OriginState < 'AK' AND FirstDepTime NOT IN (639, 736) AND (DivAirportIDs[1] IN (16101, 13829, 12953, 13029) OR DivAirportIDs[2] IN (16101, 13829, 12953, 13029) OR DivAirportIDs[3] IN (16101, 13829, 12953, 13029) OR DivAirportIDs[4] IN (16101, 13829, 12953, 13029) OR DivAirportIDs[5] IN (16101, 13829, 12953, 13029)) GROUP BY OriginStateFips, Origin LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, WheelsOn FROM mytable WHERE DivAirportLandings NOT IN (2, 0, 9) AND DivWheelsOffs IN (842, 1816, 2152, 1907) AND Dest <> 'PIT' ORDER BY OriginAirportSeqID, DepartureDelayGroups, DestAirportID LIMIT 13","hsqls":["SELECT ArrDelayMinutes, WheelsOn FROM mytable WHERE DivAirportLandings NOT IN (2, 0, 9) AND (DivWheelsOffs[1] IN (842, 1816, 2152, 1907) OR DivWheelsOffs[2] IN (842, 1816, 2152, 1907) OR DivWheelsOffs[3] IN (842, 1816, 2152, 1907) OR DivWheelsOffs[4] IN (842, 1816, 2152, 1907) OR DivWheelsOffs[5] IN (842, 1816, 2152, 1907)) AND Dest <> 'PIT' ORDER BY OriginAirportSeqID, DepartureDelayGroups, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DestStateName, OriginStateName FROM mytable WHERE DestStateFips BETWEEN 5 AND 5 OR DestAirportID IN (15027, 13377, 13424, 11624) OR DepartureDelayGroups NOT IN (0, -9999)"}
 {"sql":"SELECT ActualElapsedTime, COUNT(DayofMonth), AVG(Cancelled), MIN(OriginCityMarketID) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 22","hsqls":["SELECT ActualElapsedTime, COUNT(DayofMonth), AVG(Cancelled), MIN(OriginCityMarketID) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 22"]}
 {"sql":"SELECT LateAircraftDelay, DestAirportID, COUNT(CRSDepTime), MAX(Distance) FROM mytable WHERE OriginCityMarketID < 35380 GROUP BY LateAircraftDelay, DestAirportID  ORDER BY LateAircraftDelay, DestAirportID LIMIT 17","hsqls":["SELECT LateAircraftDelay, DestAirportID, COUNT(CRSDepTime), MAX(Distance) FROM mytable WHERE OriginCityMarketID < 35380 GROUP BY LateAircraftDelay, DestAirportID  ORDER BY LateAircraftDelay, DestAirportID LIMIT 17"]}
-{"sql":"SELECT OriginCityMarketID FROM mytable WHERE DivWheelsOffs BETWEEN 1759 AND 17 AND LongestAddGTime IN (31, 25, 63, 26) OR TaxiOut BETWEEN 20 AND 69 LIMIT 16","hsqls":["SELECT OriginCityMarketID FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1759 AND 17 OR DivWheelsOffs__MV1 BETWEEN 1759 AND 17 OR DivWheelsOffs__MV2 BETWEEN 1759 AND 17 OR DivWheelsOffs__MV3 BETWEEN 1759 AND 17 OR DivWheelsOffs__MV4 BETWEEN 1759 AND 17) AND LongestAddGTime IN (31, 25, 63, 26) OR TaxiOut BETWEEN 20 AND 69 LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID FROM mytable WHERE DivWheelsOffs BETWEEN 1759 AND 17 AND LongestAddGTime IN (31, 25, 63, 26) OR TaxiOut BETWEEN 20 AND 69 LIMIT 16","hsqls":["SELECT OriginCityMarketID FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1759 AND 17 OR DivWheelsOffs[2] BETWEEN 1759 AND 17 OR DivWheelsOffs[3] BETWEEN 1759 AND 17 OR DivWheelsOffs[4] BETWEEN 1759 AND 17 OR DivWheelsOffs[5] BETWEEN 1759 AND 17) AND LongestAddGTime IN (31, 25, 63, 26) OR TaxiOut BETWEEN 20 AND 69 LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE WeatherDelay <> 72 LIMIT 18"}
 {"sql":"SELECT DivReachedDest, OriginCityName, WheelsOn FROM mytable WHERE CRSArrTime < 1206 LIMIT 7"}
 {"sql":"SELECT DepDelayMinutes, DestStateName FROM mytable WHERE DayofMonth IN (2, 5, 4, 14) AND WheelsOff < 1613 OR Cancelled = 0 ORDER BY OriginAirportSeqID, Diverted, CarrierDelay LIMIT 24"}
 {"sql":"SELECT FirstDepTime, COUNT(TaxiOut), MIN(CRSArrTime) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 6","hsqls":["SELECT FirstDepTime, COUNT(TaxiOut), MIN(CRSArrTime) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 6"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE Flights NOT IN (1) AND DestStateFips <> 36 ORDER BY DepDelay, LateAircraftDelay, DivDistance LIMIT 6","hsqls":["SELECT Month FROM mytable WHERE Flights NOT IN (1) AND DestStateFips <> 36 ORDER BY DepDelay, LateAircraftDelay, DivDistance LIMIT 6"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE Flights NOT IN (1) AND DestStateFips <> 36 ORDER BY DepDelay, LateAircraftDelay, DivDistance LIMIT 6","hsqls":["SELECT `Month` FROM mytable WHERE Flights NOT IN (1) AND DestStateFips <> 36 ORDER BY DepDelay, LateAircraftDelay, DivDistance LIMIT 6"]}
 {"sql":"SELECT CarrierDelay, DepDelayMinutes, OriginCityName, COUNT(*) FROM mytable GROUP BY CarrierDelay, DepDelayMinutes, OriginCityName  ORDER BY CarrierDelay, DepDelayMinutes, OriginCityName LIMIT 6","hsqls":["SELECT CarrierDelay, DepDelayMinutes, OriginCityName, COUNT(*) FROM mytable GROUP BY CarrierDelay, DepDelayMinutes, OriginCityName  ORDER BY CarrierDelay, DepDelayMinutes, OriginCityName LIMIT 6"]}
 {"sql":"SELECT Diverted, COUNT(Diverted) FROM mytable GROUP BY Diverted  ORDER BY Diverted LIMIT 12","hsqls":["SELECT Diverted, COUNT(Diverted) FROM mytable GROUP BY Diverted  ORDER BY Diverted LIMIT 12"]}
 {"sql":"SELECT TailNum, OriginWac, AVG(DivDistance), AVG(Cancelled), MAX(DivReachedDest) FROM mytable WHERE OriginAirportID NOT IN (10170, 12323, 14698, 13495, 11413) GROUP BY TailNum, OriginWac  ORDER BY TailNum, OriginWac LIMIT 17","hsqls":["SELECT TailNum, OriginWac, AVG(DivDistance), AVG(Cancelled), MAX(DivReachedDest) FROM mytable WHERE OriginAirportID NOT IN (10170, 12323, 14698, 13495, 11413) GROUP BY TailNum, OriginWac  ORDER BY TailNum, OriginWac LIMIT 17"]}
-{"sql":"SELECT ArrDelay FROM mytable WHERE DivAirportLandings > 2 OR CancellationCode <= 'A' ORDER BY ArrDelayMinutes, Dest, \"Month\" LIMIT 29","hsqls":["SELECT ArrDelay FROM mytable WHERE DivAirportLandings > 2 OR CancellationCode <= 'A' ORDER BY ArrDelayMinutes, Dest, Month LIMIT 29"]}
+{"sql":"SELECT ArrDelay FROM mytable WHERE DivAirportLandings > 2 OR CancellationCode <= 'A' ORDER BY ArrDelayMinutes, Dest, \"Month\" LIMIT 29","hsqls":["SELECT ArrDelay FROM mytable WHERE DivAirportLandings > 2 OR CancellationCode <= 'A' ORDER BY ArrDelayMinutes, Dest, `Month` LIMIT 29"]}
 {"sql":"SELECT DestStateFips, DayOfWeek FROM mytable ORDER BY DepDelay, FlightDate, CRSDepTime LIMIT 20"}
-{"sql":"SELECT Diverted, DepDelayMinutes, MIN(OriginAirportSeqID), COUNT(DayOfWeek) FROM mytable WHERE Dest BETWEEN 'GRI' AND 'EGE' AND \"Year\" > 2014 GROUP BY Diverted, DepDelayMinutes LIMIT 9","hsqls":["SELECT Diverted, DepDelayMinutes, MIN(OriginAirportSeqID), COUNT(DayOfWeek) FROM mytable WHERE Dest BETWEEN 'GRI' AND 'EGE' AND Year > 2014 GROUP BY Diverted, DepDelayMinutes LIMIT 9"]}
+{"sql":"SELECT Diverted, DepDelayMinutes, MIN(OriginAirportSeqID), COUNT(DayOfWeek) FROM mytable WHERE Dest BETWEEN 'GRI' AND 'EGE' AND \"Year\" > 2014 GROUP BY Diverted, DepDelayMinutes LIMIT 9","hsqls":["SELECT Diverted, DepDelayMinutes, MIN(OriginAirportSeqID), COUNT(DayOfWeek) FROM mytable WHERE Dest BETWEEN 'GRI' AND 'EGE' AND `Year` > 2014 GROUP BY Diverted, DepDelayMinutes LIMIT 9"]}
 {"sql":"SELECT AVG(WheelsOff) FROM mytable LIMIT 10"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DivAirportLandings IN (2, 1, 9) ORDER BY AirTime LIMIT 20","hsqls":["SELECT Month FROM mytable WHERE DivAirportLandings IN (2, 1, 9) ORDER BY AirTime LIMIT 20"]}
-{"sql":"SELECT OriginState, FlightDate, MAX(ArrivalDelayGroups), MAX(DepartureDelayGroups), MAX(DestWac) FROM mytable WHERE \"Year\" = 2014 AND \"Year\" IN (2014) GROUP BY OriginState, FlightDate LIMIT 24","hsqls":["SELECT OriginState, FlightDate, MAX(ArrivalDelayGroups), MAX(DepartureDelayGroups), MAX(DestWac) FROM mytable WHERE Year = 2014 AND Year IN (2014) GROUP BY OriginState, FlightDate LIMIT 24"]}
-{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 1","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE Year BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 1"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DivAirportLandings IN (2, 1, 9) ORDER BY AirTime LIMIT 20","hsqls":["SELECT `Month` FROM mytable WHERE DivAirportLandings IN (2, 1, 9) ORDER BY AirTime LIMIT 20"]}
+{"sql":"SELECT OriginState, FlightDate, MAX(ArrivalDelayGroups), MAX(DepartureDelayGroups), MAX(DestWac) FROM mytable WHERE \"Year\" = 2014 AND \"Year\" IN (2014) GROUP BY OriginState, FlightDate LIMIT 24","hsqls":["SELECT OriginState, FlightDate, MAX(ArrivalDelayGroups), MAX(DepartureDelayGroups), MAX(DestWac) FROM mytable WHERE `Year` = 2014 AND `Year` IN (2014) GROUP BY OriginState, FlightDate LIMIT 24"]}
+{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 1","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 1"]}
 {"sql":"SELECT \"Year\", CancellationCode, UniqueCarrier FROM mytable WHERE DepTimeBlk > '1600-1659' ORDER BY DestAirportSeqID, CRSElapsedTime LIMIT 8","hsqls":["SELECT Year, CancellationCode, UniqueCarrier FROM mytable WHERE DepTimeBlk > '1600-1659' ORDER BY DestAirportSeqID, CRSElapsedTime LIMIT 8"]}
 {"sql":"SELECT LongestAddGTime, DestAirportID FROM mytable WHERE Dest > 'RDD' OR ArrTimeBlk IN ('1600-1659') ORDER BY DepTimeBlk, DayofMonth, DaysSinceEpoch LIMIT 1"}
-{"sql":"SELECT DivWheelsOns, DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE CancellationCode < 'noodles' OR TaxiOut BETWEEN 42 AND 68 LIMIT 10","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivActualElapsedTime FROM mytable WHERE CancellationCode < 'noodles' OR TaxiOut BETWEEN 42 AND 68 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE CancellationCode < 'noodles' OR TaxiOut BETWEEN 42 AND 68 LIMIT 10","hsqls":["SELECT DivWheelsOns, DivAirportSeqIDs, DivActualElapsedTime FROM mytable WHERE CancellationCode < 'noodles' OR TaxiOut BETWEEN 42 AND 68 LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, DivArrDelay FROM mytable WHERE CRSElapsedTime IN (97, 332, 231, 308) ORDER BY OriginCityMarketID, Origin, ArrivalDelayGroups LIMIT 9"}
-{"sql":"SELECT DestStateFips FROM mytable WHERE DepTimeBlk >= '0001-0559' AND ActualElapsedTime <> 199 OR DivTailNums IN ('N326NB', 'N292SW') ORDER BY DivDistance LIMIT 24","hsqls":["SELECT DestStateFips FROM mytable WHERE DepTimeBlk >= '0001-0559' AND ActualElapsedTime <> 199 OR (DivTailNums__MV0 IN ('N326NB', 'N292SW') OR DivTailNums__MV1 IN ('N326NB', 'N292SW') OR DivTailNums__MV2 IN ('N326NB', 'N292SW') OR DivTailNums__MV3 IN ('N326NB', 'N292SW') OR DivTailNums__MV4 IN ('N326NB', 'N292SW')) ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DestStateFips FROM mytable WHERE DepTimeBlk >= '0001-0559' AND ActualElapsedTime <> 199 OR DivTailNums IN ('N326NB', 'N292SW') ORDER BY DivDistance LIMIT 24","hsqls":["SELECT DestStateFips FROM mytable WHERE DepTimeBlk >= '0001-0559' AND ActualElapsedTime <> 199 OR (DivTailNums[1] IN ('N326NB', 'N292SW') OR DivTailNums[2] IN ('N326NB', 'N292SW') OR DivTailNums[3] IN ('N326NB', 'N292SW') OR DivTailNums[4] IN ('N326NB', 'N292SW') OR DivTailNums[5] IN ('N326NB', 'N292SW')) ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT DepTime, CancellationCode, DivArrDelay FROM mytable WHERE OriginStateName IN ('Pennsylvania') AND AirlineID <= 20355 LIMIT 2"}
-{"sql":"SELECT DepDelay, AirlineID FROM mytable WHERE Quarter IN (1) OR DivWheelsOns < 1806 OR DestCityMarketID IN (30285, 35412, 32896, 33244) ORDER BY DestAirportID LIMIT 14","hsqls":["SELECT DepDelay, AirlineID FROM mytable WHERE Quarter IN (1) OR (DivWheelsOns__MV0 < 1806 OR DivWheelsOns__MV1 < 1806 OR DivWheelsOns__MV2 < 1806 OR DivWheelsOns__MV3 < 1806 OR DivWheelsOns__MV4 < 1806) OR DestCityMarketID IN (30285, 35412, 32896, 33244) ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DepDelay, AirlineID FROM mytable WHERE Quarter IN (1) OR DivWheelsOns < 1806 OR DestCityMarketID IN (30285, 35412, 32896, 33244) ORDER BY DestAirportID LIMIT 14","hsqls":["SELECT DepDelay, AirlineID FROM mytable WHERE Quarter IN (1) OR (DivWheelsOns[1] < 1806 OR DivWheelsOns[2] < 1806 OR DivWheelsOns[3] < 1806 OR DivWheelsOns[4] < 1806 OR DivWheelsOns[5] < 1806) OR DestCityMarketID IN (30285, 35412, 32896, 33244) ORDER BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, OriginCityName, DaysSinceEpoch FROM mytable WHERE WheelsOff <= 1301 AND WheelsOff > 2300 OR DestAirportSeqID BETWEEN 1232303 AND 1299204 ORDER BY DayofMonth LIMIT 1"}
 {"sql":"SELECT ArrDelay FROM mytable WHERE DivDistance NOT IN (289) ORDER BY AirlineID LIMIT 27"}
 {"sql":"SELECT Flights, OriginStateName FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 AND DivDistance BETWEEN 998 AND 191 OR ArrivalDelayGroups > 4 LIMIT 1"}
-{"sql":"SELECT DivLongestGTimes, ArrTime FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 OR Flights <= 1 ORDER BY DistanceGroup, DepDelayMinutes, DestAirportSeqID LIMIT 29","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTime FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 OR Flights <= 1 ORDER BY DistanceGroup, DepDelayMinutes, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTime FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 OR Flights <= 1 ORDER BY DistanceGroup, DepDelayMinutes, DestAirportSeqID LIMIT 29","hsqls":["SELECT DivLongestGTimes, ArrTime FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 OR Flights <= 1 ORDER BY DistanceGroup, DepDelayMinutes, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, DepDel15, CRSElapsedTime, AVG(DestAirportID) FROM mytable GROUP BY DestAirportSeqID, DepDel15, CRSElapsedTime  ORDER BY DestAirportSeqID, DepDel15, CRSElapsedTime LIMIT 4","hsqls":["SELECT DestAirportSeqID, DepDel15, CRSElapsedTime, AVG(DestAirportID) FROM mytable GROUP BY DestAirportSeqID, DepDel15, CRSElapsedTime  ORDER BY DestAirportSeqID, DepDel15, CRSElapsedTime LIMIT 4"]}
 {"sql":"SELECT AVG(OriginWac) FROM mytable LIMIT 20"}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE CancellationCode = 'B' OR ArrivalDelayGroups <= 3 AND ArrivalDelayGroups BETWEEN 4 AND 12 ORDER BY DayofMonth, ArrDelay LIMIT 10"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE WheelsOff BETWEEN 1555 AND 1458 AND ArrDel15 BETWEEN -9999 AND 1 ORDER BY DestStateFips, DayofMonth, OriginAirportID LIMIT 10","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE WheelsOff BETWEEN 1555 AND 1458 AND ArrDel15 BETWEEN -9999 AND 1 ORDER BY DestStateFips, DayofMonth, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE WheelsOff BETWEEN 1555 AND 1458 AND ArrDel15 BETWEEN -9999 AND 1 ORDER BY DestStateFips, DayofMonth, OriginAirportID LIMIT 10","hsqls":["SELECT DivAirportIDs FROM mytable WHERE WheelsOff BETWEEN 1555 AND 1458 AND ArrDel15 BETWEEN -9999 AND 1 ORDER BY DestStateFips, DayofMonth, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DestStateName, ArrivalDelayGroups FROM mytable LIMIT 20"}
 {"sql":"SELECT MIN(FirstDepTime), COUNT(Distance) FROM mytable WHERE DayOfWeek > 5 OR DestCityName BETWEEN 'Appleton, WI' AND 'White Plains, NY' OR DivAirportLandings < 1 LIMIT 28"}
 {"sql":"SELECT WeatherDelay, MAX(TotalAddGTime), COUNT(ArrivalDelayGroups), MAX(DayOfWeek) FROM mytable WHERE Quarter >= 1 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 10","hsqls":["SELECT WeatherDelay, MAX(TotalAddGTime), COUNT(ArrivalDelayGroups), MAX(DayOfWeek) FROM mytable WHERE Quarter >= 1 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 10"]}
 {"sql":"SELECT DestCityMarketID, CRSElapsedTime, DivActualElapsedTime FROM mytable ORDER BY LateAircraftDelay LIMIT 5"}
 {"sql":"SELECT CarrierDelay, DepTime, COUNT(*) FROM mytable WHERE LateAircraftDelay <> 142 GROUP BY CarrierDelay, DepTime  ORDER BY CarrierDelay, DepTime LIMIT 9","hsqls":["SELECT CarrierDelay, DepTime, COUNT(*) FROM mytable WHERE LateAircraftDelay <> 142 GROUP BY CarrierDelay, DepTime  ORDER BY CarrierDelay, DepTime LIMIT 9"]}
-{"sql":"SELECT DepTime, DestAirportSeqID, DestAirportID FROM mytable WHERE Diverted IN (1, 0) AND DivAirportIDs IN (12892, 11259, 12478) AND ArrivalDelayGroups > 9 LIMIT 7","hsqls":["SELECT DepTime, DestAirportSeqID, DestAirportID FROM mytable WHERE Diverted IN (1, 0) AND (DivAirportIDs__MV0 IN (12892, 11259, 12478) OR DivAirportIDs__MV1 IN (12892, 11259, 12478) OR DivAirportIDs__MV2 IN (12892, 11259, 12478) OR DivAirportIDs__MV3 IN (12892, 11259, 12478) OR DivAirportIDs__MV4 IN (12892, 11259, 12478)) AND ArrivalDelayGroups > 9 LIMIT 10000"]}
+{"sql":"SELECT DepTime, DestAirportSeqID, DestAirportID FROM mytable WHERE Diverted IN (1, 0) AND DivAirportIDs IN (12892, 11259, 12478) AND ArrivalDelayGroups > 9 LIMIT 7","hsqls":["SELECT DepTime, DestAirportSeqID, DestAirportID FROM mytable WHERE Diverted IN (1, 0) AND (DivAirportIDs[1] IN (12892, 11259, 12478) OR DivAirportIDs[2] IN (12892, 11259, 12478) OR DivAirportIDs[3] IN (12892, 11259, 12478) OR DivAirportIDs[4] IN (12892, 11259, 12478) OR DivAirportIDs[5] IN (12892, 11259, 12478)) AND ArrivalDelayGroups > 9 LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, TaxiOut, COUNT(*) FROM mytable GROUP BY WheelsOff, TaxiOut  ORDER BY WheelsOff, TaxiOut LIMIT 18","hsqls":["SELECT WheelsOff, TaxiOut, COUNT(*) FROM mytable GROUP BY WheelsOff, TaxiOut  ORDER BY WheelsOff, TaxiOut LIMIT 18"]}
 {"sql":"SELECT AVG(TotalAddGTime), SUM(WeatherDelay) FROM mytable LIMIT 20"}
-{"sql":"SELECT DivAirports FROM mytable WHERE Dest <= 'DLH' ORDER BY DepDelayMinutes, DepTimeBlk LIMIT 12","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE Dest <= 'DLH' ORDER BY DepDelayMinutes, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, AVG(SecurityDelay), MIN(DestAirportSeqID), MIN(AirlineID) FROM mytable WHERE DivWheelsOns BETWEEN 1459 AND 1410 GROUP BY TotalAddGTime LIMIT 18","hsqls":["SELECT TotalAddGTime, AVG(SecurityDelay), MIN(DestAirportSeqID), MIN(AirlineID) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1459 AND 1410 OR DivWheelsOns__MV1 BETWEEN 1459 AND 1410 OR DivWheelsOns__MV2 BETWEEN 1459 AND 1410 OR DivWheelsOns__MV3 BETWEEN 1459 AND 1410 OR DivWheelsOns__MV4 BETWEEN 1459 AND 1410) GROUP BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE Dest <= 'DLH' ORDER BY DepDelayMinutes, DepTimeBlk LIMIT 12","hsqls":["SELECT DivAirports FROM mytable WHERE Dest <= 'DLH' ORDER BY DepDelayMinutes, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, AVG(SecurityDelay), MIN(DestAirportSeqID), MIN(AirlineID) FROM mytable WHERE DivWheelsOns BETWEEN 1459 AND 1410 GROUP BY TotalAddGTime LIMIT 18","hsqls":["SELECT TotalAddGTime, AVG(SecurityDelay), MIN(DestAirportSeqID), MIN(AirlineID) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1459 AND 1410 OR DivWheelsOns[2] BETWEEN 1459 AND 1410 OR DivWheelsOns[3] BETWEEN 1459 AND 1410 OR DivWheelsOns[4] BETWEEN 1459 AND 1410 OR DivWheelsOns[5] BETWEEN 1459 AND 1410) GROUP BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT DepDelay, Quarter, SUM(ArrDel15), AVG(Quarter), MIN(Distance) FROM mytable WHERE DestState BETWEEN 'AK' AND 'WY' AND DestStateFips < 32 GROUP BY DepDelay, Quarter  ORDER BY DepDelay, Quarter LIMIT 7","hsqls":["SELECT DepDelay, Quarter, SUM(ArrDel15), AVG(Quarter), MIN(Distance) FROM mytable WHERE DestState BETWEEN 'AK' AND 'WY' AND DestStateFips < 32 GROUP BY DepDelay, Quarter  ORDER BY DepDelay, Quarter LIMIT 7"]}
-{"sql":"SELECT ArrTimeBlk, DepDel15, DepTimeBlk, MAX(CRSArrTime), AVG(ArrivalDelayGroups) FROM mytable WHERE CRSDepTime BETWEEN 1512 AND 1644 AND DivWheelsOns BETWEEN 1313 AND 1426 OR DivWheelsOns > 1401 GROUP BY ArrTimeBlk, DepDel15, DepTimeBlk LIMIT 27","hsqls":["SELECT ArrTimeBlk, DepDel15, DepTimeBlk, MAX(CRSArrTime), AVG(ArrivalDelayGroups) FROM mytable WHERE CRSDepTime BETWEEN 1512 AND 1644 AND (DivWheelsOns__MV0 BETWEEN 1313 AND 1426 OR DivWheelsOns__MV1 BETWEEN 1313 AND 1426 OR DivWheelsOns__MV2 BETWEEN 1313 AND 1426 OR DivWheelsOns__MV3 BETWEEN 1313 AND 1426 OR DivWheelsOns__MV4 BETWEEN 1313 AND 1426) OR (DivWheelsOns__MV0 > 1401 OR DivWheelsOns__MV1 > 1401 OR DivWheelsOns__MV2 > 1401 OR DivWheelsOns__MV3 > 1401 OR DivWheelsOns__MV4 > 1401) GROUP BY ArrTimeBlk, DepDel15, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DepDel15, DepTimeBlk, MAX(CRSArrTime), AVG(ArrivalDelayGroups) FROM mytable WHERE CRSDepTime BETWEEN 1512 AND 1644 AND DivWheelsOns BETWEEN 1313 AND 1426 OR DivWheelsOns > 1401 GROUP BY ArrTimeBlk, DepDel15, DepTimeBlk LIMIT 27","hsqls":["SELECT ArrTimeBlk, DepDel15, DepTimeBlk, MAX(CRSArrTime), AVG(ArrivalDelayGroups) FROM mytable WHERE CRSDepTime BETWEEN 1512 AND 1644 AND (DivWheelsOns[1] BETWEEN 1313 AND 1426 OR DivWheelsOns[2] BETWEEN 1313 AND 1426 OR DivWheelsOns[3] BETWEEN 1313 AND 1426 OR DivWheelsOns[4] BETWEEN 1313 AND 1426 OR DivWheelsOns[5] BETWEEN 1313 AND 1426) OR (DivWheelsOns[1] > 1401 OR DivWheelsOns[2] > 1401 OR DivWheelsOns[3] > 1401 OR DivWheelsOns[4] > 1401 OR DivWheelsOns[5] > 1401) GROUP BY ArrTimeBlk, DepDel15, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Carrier, TaxiIn, COUNT(*) FROM mytable WHERE OriginStateFips <= 32 AND DaysSinceEpoch <> 16091 AND ArrDelayMinutes BETWEEN 39.0 AND 207.0 GROUP BY Carrier, TaxiIn  ORDER BY Carrier, TaxiIn LIMIT 7","hsqls":["SELECT Carrier, TaxiIn, COUNT(*) FROM mytable WHERE OriginStateFips <= 32 AND DaysSinceEpoch <> 16091 AND ArrDelayMinutes BETWEEN 39.0 AND 207.0 GROUP BY Carrier, TaxiIn  ORDER BY Carrier, TaxiIn LIMIT 7"]}
-{"sql":"SELECT DestCityName, SUM(DayOfWeek), SUM(DepDelay), MIN(\"Month\") FROM mytable GROUP BY DestCityName LIMIT 18","hsqls":["SELECT DestCityName, SUM(DayOfWeek), SUM(DepDelay), MIN(Month) FROM mytable GROUP BY DestCityName LIMIT 18"]}
+{"sql":"SELECT DestCityName, SUM(DayOfWeek), SUM(DepDelay), MIN(\"Month\") FROM mytable GROUP BY DestCityName LIMIT 18","hsqls":["SELECT DestCityName, SUM(DayOfWeek), SUM(DepDelay), MIN(`Month`) FROM mytable GROUP BY DestCityName LIMIT 18"]}
 {"sql":"SELECT FlightDate, TotalAddGTime, DestCityName FROM mytable ORDER BY DestState, NASDelay, CancellationCode LIMIT 21"}
-{"sql":"SELECT ActualElapsedTime, DestCityName FROM mytable WHERE DivLongestGTimes < 74.0 LIMIT 22","hsqls":["SELECT ActualElapsedTime, DestCityName FROM mytable WHERE (DivLongestGTimes__MV0 < 74.0 OR DivLongestGTimes__MV1 < 74.0 OR DivLongestGTimes__MV2 < 74.0 OR DivLongestGTimes__MV3 < 74.0 OR DivLongestGTimes__MV4 < 74.0) LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DestCityName FROM mytable WHERE DivLongestGTimes < 74.0 LIMIT 22","hsqls":["SELECT ActualElapsedTime, DestCityName FROM mytable WHERE (DivLongestGTimes[1] < 74.0 OR DivLongestGTimes[2] < 74.0 OR DivLongestGTimes[3] < 74.0 OR DivLongestGTimes[4] < 74.0 OR DivLongestGTimes[5] < 74.0) LIMIT 10000"]}
 {"sql":"SELECT FlightDate, ArrDelay, UniqueCarrier FROM mytable WHERE OriginCityName NOT IN ('Greensboro/High Point, NC', 'Valparaiso, FL', 'Tallahassee, FL', 'Asheville, NC', 'Bakersfield, CA') AND DepDelay IN (215.0, 67.0, 159.0, 298.0) AND FirstDepTime NOT IN (2110, 1136, 921, 1534) ORDER BY CRSArrTime, CRSDepTime LIMIT 19"}
 {"sql":"SELECT COUNT(OriginStateName), COUNT(LateAircraftDelay), SUM(ArrTime) FROM mytable LIMIT 21"}
 {"sql":"SELECT SUM(ArrDel15) FROM mytable LIMIT 18"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DistanceGroup IN (2, 1, 6, 11) OR DivWheelsOffs > 1638 LIMIT 7","hsqls":["SELECT COUNT(*) FROM mytable WHERE DistanceGroup IN (2, 1, 6, 11) OR (DivWheelsOffs__MV0 > 1638 OR DivWheelsOffs__MV1 > 1638 OR DivWheelsOffs__MV2 > 1638 OR DivWheelsOffs__MV3 > 1638 OR DivWheelsOffs__MV4 > 1638) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DistanceGroup IN (2, 1, 6, 11) OR DivWheelsOffs > 1638 LIMIT 7","hsqls":["SELECT COUNT(*) FROM mytable WHERE DistanceGroup IN (2, 1, 6, 11) OR (DivWheelsOffs[1] > 1638 OR DivWheelsOffs[2] > 1638 OR DivWheelsOffs[3] > 1638 OR DivWheelsOffs[4] > 1638 OR DivWheelsOffs[5] > 1638) LIMIT 10000"]}
 {"sql":"SELECT FlightNum FROM mytable WHERE CarrierDelay BETWEEN 4 AND 78 ORDER BY ArrivalDelayGroups LIMIT 27"}
 {"sql":"SELECT FlightDate, DivAirportLandings FROM mytable WHERE DestCityName IN ('Kalispell, MT') LIMIT 4"}
 {"sql":"SELECT TaxiIn, UniqueCarrier, DivActualElapsedTime, SUM(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay IN (164, 91, 39, 101) GROUP BY TaxiIn, UniqueCarrier, DivActualElapsedTime","hsqls":["SELECT TaxiIn, UniqueCarrier, DivActualElapsedTime, SUM(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay IN (164, 91, 39, 101) GROUP BY TaxiIn, UniqueCarrier, DivActualElapsedTime"]}
 {"sql":"SELECT DepDel15, DestCityName, UniqueCarrier FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 ORDER BY DistanceGroup, AirTime LIMIT 14"}
 {"sql":"SELECT TaxiOut, WeatherDelay, LongestAddGTime, COUNT(*) FROM mytable WHERE DepartureDelayGroups IN (0, 7, 6) GROUP BY TaxiOut, WeatherDelay, LongestAddGTime  ORDER BY TaxiOut, WeatherDelay, LongestAddGTime LIMIT 22","hsqls":["SELECT TaxiOut, WeatherDelay, LongestAddGTime, COUNT(*) FROM mytable WHERE DepartureDelayGroups IN (0, 7, 6) GROUP BY TaxiOut, WeatherDelay, LongestAddGTime  ORDER BY TaxiOut, WeatherDelay, LongestAddGTime LIMIT 22"]}
-{"sql":"SELECT AirTime, SUM(DivAirportLandings), MIN(DestAirportID), MAX(DivReachedDest) FROM mytable WHERE DivAirportIDs > 14574 OR CRSArrTime > 1207 GROUP BY AirTime LIMIT 27","hsqls":["SELECT AirTime, SUM(DivAirportLandings), MIN(DestAirportID), MAX(DivReachedDest) FROM mytable WHERE (DivAirportIDs__MV0 > 14574 OR DivAirportIDs__MV1 > 14574 OR DivAirportIDs__MV2 > 14574 OR DivAirportIDs__MV3 > 14574 OR DivAirportIDs__MV4 > 14574) OR CRSArrTime > 1207 GROUP BY AirTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportLandings, DivTotalGTimes FROM mytable WHERE DepDelayMinutes NOT IN (71.0, 59.0, 84.0, 229.0, 57.0) ORDER BY ArrDelayMinutes, AirTime LIMIT 10","hsqls":["SELECT DivAirportLandings, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DepDelayMinutes NOT IN (71.0, 59.0, 84.0, 229.0, 57.0) ORDER BY ArrDelayMinutes, AirTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivActualElapsedTime BETWEEN 248 AND 500 AND OriginAirportID BETWEEN 14108 AND 12003 LIMIT 20","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DivActualElapsedTime BETWEEN 248 AND 500 AND OriginAirportID BETWEEN 14108 AND 12003 LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes, AirTime FROM mytable WHERE DestCityMarketID BETWEEN 32335 AND 32448 OR DestStateFips IN (5, 40, 37) OR \"Year\" < 2014 ORDER BY FlightNum, CarrierDelay, DestCityName LIMIT 6","hsqls":["SELECT ArrDelayMinutes, AirTime FROM mytable WHERE DestCityMarketID BETWEEN 32335 AND 32448 OR DestStateFips IN (5, 40, 37) OR Year < 2014 ORDER BY FlightNum, CarrierDelay, DestCityName LIMIT 6"]}
+{"sql":"SELECT AirTime, SUM(DivAirportLandings), MIN(DestAirportID), MAX(DivReachedDest) FROM mytable WHERE DivAirportIDs > 14574 OR CRSArrTime > 1207 GROUP BY AirTime LIMIT 27","hsqls":["SELECT AirTime, SUM(DivAirportLandings), MIN(DestAirportID), MAX(DivReachedDest) FROM mytable WHERE (DivAirportIDs[1] > 14574 OR DivAirportIDs[2] > 14574 OR DivAirportIDs[3] > 14574 OR DivAirportIDs[4] > 14574 OR DivAirportIDs[5] > 14574) OR CRSArrTime > 1207 GROUP BY AirTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, DivTotalGTimes FROM mytable WHERE DepDelayMinutes NOT IN (71.0, 59.0, 84.0, 229.0, 57.0) ORDER BY ArrDelayMinutes, AirTime LIMIT 10","hsqls":["SELECT DivAirportLandings, DivTotalGTimes FROM mytable WHERE DepDelayMinutes NOT IN (71.0, 59.0, 84.0, 229.0, 57.0) ORDER BY ArrDelayMinutes, AirTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivActualElapsedTime BETWEEN 248 AND 500 AND OriginAirportID BETWEEN 14108 AND 12003 LIMIT 20","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE DivActualElapsedTime BETWEEN 248 AND 500 AND OriginAirportID BETWEEN 14108 AND 12003 LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, AirTime FROM mytable WHERE DestCityMarketID BETWEEN 32335 AND 32448 OR DestStateFips IN (5, 40, 37) OR \"Year\" < 2014 ORDER BY FlightNum, CarrierDelay, DestCityName LIMIT 6","hsqls":["SELECT ArrDelayMinutes, AirTime FROM mytable WHERE DestCityMarketID BETWEEN 32335 AND 32448 OR DestStateFips IN (5, 40, 37) OR `Year` < 2014 ORDER BY FlightNum, CarrierDelay, DestCityName LIMIT 6"]}
 {"sql":"SELECT DepDelay, DepTime, TaxiIn FROM mytable WHERE DivArrDelay BETWEEN 90 AND 129 ORDER BY Carrier, ArrTimeBlk LIMIT 15"}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE ArrivalDelayGroups IN (2, 7, 9) OR AirlineID NOT IN (20409) LIMIT 22","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE ArrivalDelayGroups IN (2, 7, 9) OR AirlineID NOT IN (20409) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE ArrivalDelayGroups IN (2, 7, 9) OR AirlineID NOT IN (20409) LIMIT 22","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE ArrivalDelayGroups IN (2, 7, 9) OR AirlineID NOT IN (20409) LIMIT 10000"]}
 {"sql":"SELECT MAX(DistanceGroup), SUM(DepDelayMinutes) FROM mytable LIMIT 3"}
 {"sql":"SELECT MIN(OriginAirportID), MIN(DestWac) FROM mytable LIMIT 21"}
-{"sql":"SELECT ArrDelayMinutes, DestCityName, \"Month\" FROM mytable LIMIT 10","hsqls":["SELECT ArrDelayMinutes, DestCityName, Month FROM mytable LIMIT 10"]}
+{"sql":"SELECT ArrDelayMinutes, DestCityName, \"Month\" FROM mytable LIMIT 10","hsqls":["SELECT ArrDelayMinutes, DestCityName, `Month` FROM mytable LIMIT 10"]}
 {"sql":"SELECT Dest FROM mytable WHERE CRSElapsedTime NOT IN (98, 153, 36, 291, 273) AND CRSElapsedTime BETWEEN 151 AND 204 ORDER BY DepDelay, Origin, OriginWac LIMIT 12"}
 {"sql":"SELECT DestWac, WheelsOn, MAX(DaysSinceEpoch) FROM mytable GROUP BY DestWac, WheelsOn  ORDER BY DestWac, WheelsOn LIMIT 5","hsqls":["SELECT DestWac, WheelsOn, MAX(DaysSinceEpoch) FROM mytable GROUP BY DestWac, WheelsOn  ORDER BY DestWac, WheelsOn LIMIT 5"]}
-{"sql":"SELECT TaxiOut, DepTime FROM mytable WHERE DivTotalGTimes BETWEEN 6 AND 25 OR DivAirportSeqIDs IN (1244805, 1080003) AND NASDelay <> 3 LIMIT 10","hsqls":["SELECT TaxiOut, DepTime FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 6 AND 25 OR DivTotalGTimes__MV1 BETWEEN 6 AND 25 OR DivTotalGTimes__MV2 BETWEEN 6 AND 25 OR DivTotalGTimes__MV3 BETWEEN 6 AND 25 OR DivTotalGTimes__MV4 BETWEEN 6 AND 25) OR (DivAirportSeqIDs__MV0 IN (1244805, 1080003) OR DivAirportSeqIDs__MV1 IN (1244805, 1080003) OR DivAirportSeqIDs__MV2 IN (1244805, 1080003) OR DivAirportSeqIDs__MV3 IN (1244805, 1080003) OR DivAirportSeqIDs__MV4 IN (1244805, 1080003)) AND NASDelay <> 3 LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DepTime FROM mytable WHERE DivTotalGTimes BETWEEN 6 AND 25 OR DivAirportSeqIDs IN (1244805, 1080003) AND NASDelay <> 3 LIMIT 10","hsqls":["SELECT TaxiOut, DepTime FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 6 AND 25 OR DivTotalGTimes[2] BETWEEN 6 AND 25 OR DivTotalGTimes[3] BETWEEN 6 AND 25 OR DivTotalGTimes[4] BETWEEN 6 AND 25 OR DivTotalGTimes[5] BETWEEN 6 AND 25) OR (DivAirportSeqIDs[1] IN (1244805, 1080003) OR DivAirportSeqIDs[2] IN (1244805, 1080003) OR DivAirportSeqIDs[3] IN (1244805, 1080003) OR DivAirportSeqIDs[4] IN (1244805, 1080003) OR DivAirportSeqIDs[5] IN (1244805, 1080003)) AND NASDelay <> 3 LIMIT 10000"]}
 {"sql":"SELECT MAX(ArrDelay), AVG(AirlineID) FROM mytable WHERE AirlineID <= 20398 LIMIT 11"}
 {"sql":"SELECT DivReachedDest, DepTimeBlk, COUNT(*) FROM mytable WHERE NASDelay <> 18 OR ArrivalDelayGroups BETWEEN 1 AND 12 AND TailNum >= 'N929DL' GROUP BY DivReachedDest, DepTimeBlk  ORDER BY DivReachedDest, DepTimeBlk LIMIT 28","hsqls":["SELECT DivReachedDest, DepTimeBlk, COUNT(*) FROM mytable WHERE NASDelay <> 18 OR ArrivalDelayGroups BETWEEN 1 AND 12 AND TailNum >= 'N929DL' GROUP BY DivReachedDest, DepTimeBlk  ORDER BY DivReachedDest, DepTimeBlk LIMIT 28"]}
 {"sql":"SELECT DayofMonth, CRSElapsedTime, COUNT(*) FROM mytable WHERE DayofMonth NOT IN (9, 25, 28) GROUP BY DayofMonth, CRSElapsedTime  ORDER BY DayofMonth, CRSElapsedTime LIMIT 16","hsqls":["SELECT DayofMonth, CRSElapsedTime, COUNT(*) FROM mytable WHERE DayofMonth NOT IN (9, 25, 28) GROUP BY DayofMonth, CRSElapsedTime  ORDER BY DayofMonth, CRSElapsedTime LIMIT 16"]}
 {"sql":"SELECT Flights FROM mytable WHERE Origin BETWEEN 'SRQ' AND 'GTF' AND FlightDate BETWEEN '2014-01-15' AND '2014-01-21' OR Cancelled = 1 ORDER BY DestWac, DestStateName, DivActualElapsedTime LIMIT 19"}
 {"sql":"SELECT DistanceGroup, TotalAddGTime, CRSDepTime, SUM(NASDelay), COUNT(DestAirportID), SUM(ArrDelay) FROM mytable GROUP BY DistanceGroup, TotalAddGTime, CRSDepTime  ORDER BY DistanceGroup, TotalAddGTime, CRSDepTime LIMIT 29","hsqls":["SELECT DistanceGroup, TotalAddGTime, CRSDepTime, SUM(NASDelay), COUNT(DestAirportID), SUM(ArrDelay) FROM mytable GROUP BY DistanceGroup, TotalAddGTime, CRSDepTime  ORDER BY DistanceGroup, TotalAddGTime, CRSDepTime LIMIT 29"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE Distance BETWEEN 821 AND 1053 OR ArrDelayMinutes NOT IN (86.0, 124.0) OR DepDelayMinutes IN (129.0, 92.0, 148.0, 7.0) ORDER BY CRSArrTime LIMIT 23","hsqls":["SELECT Year FROM mytable WHERE Distance BETWEEN 821 AND 1053 OR ArrDelayMinutes NOT IN (86.0, 124.0) OR DepDelayMinutes IN (129.0, 92.0, 148.0, 7.0) ORDER BY CRSArrTime LIMIT 23"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE Distance BETWEEN 821 AND 1053 OR ArrDelayMinutes NOT IN (86.0, 124.0) OR DepDelayMinutes IN (129.0, 92.0, 148.0, 7.0) ORDER BY CRSArrTime LIMIT 23","hsqls":["SELECT `Year` FROM mytable WHERE Distance BETWEEN 821 AND 1053 OR ArrDelayMinutes NOT IN (86.0, 124.0) OR DepDelayMinutes IN (129.0, 92.0, 148.0, 7.0) ORDER BY CRSArrTime LIMIT 23"]}
 {"sql":"SELECT DepDelay, DepDelayMinutes, ArrDelayMinutes, COUNT(*) FROM mytable WHERE DepTimeBlk <> '1700-1759' OR ArrTime BETWEEN 917 AND 732 OR DivActualElapsedTime = 278 GROUP BY DepDelay, DepDelayMinutes, ArrDelayMinutes  ORDER BY DepDelay, DepDelayMinutes, ArrDelayMinutes LIMIT 24","hsqls":["SELECT DepDelay, DepDelayMinutes, ArrDelayMinutes, COUNT(*) FROM mytable WHERE DepTimeBlk <> '1700-1759' OR ArrTime BETWEEN 917 AND 732 OR DivActualElapsedTime = 278 GROUP BY DepDelay, DepDelayMinutes, ArrDelayMinutes  ORDER BY DepDelay, DepDelayMinutes, ArrDelayMinutes LIMIT 24"]}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE FlightNum BETWEEN 26 AND 2973 AND CRSArrTime <= 639 OR NASDelay IN (6, 41) ORDER BY DistanceGroup, UniqueCarrier LIMIT 12"}
 {"sql":"SELECT Diverted, DepDel15, DivAirportLandings FROM mytable WHERE FlightNum BETWEEN 318 AND 3139 OR Carrier BETWEEN 'MQ' AND 'AA' OR DivAirportLandings BETWEEN 9 AND 9 LIMIT 14"}
@@ -3820,33 +3820,33 @@
 {"sql":"SELECT TaxiOut, Diverted, OriginAirportID FROM mytable LIMIT 10"}
 {"sql":"SELECT OriginCityName, DestAirportID, ArrDelay, COUNT(Quarter), COUNT(NASDelay), MIN(OriginWac) FROM mytable WHERE Carrier BETWEEN 'HA' AND 'UA' GROUP BY OriginCityName, DestAirportID, ArrDelay  ORDER BY OriginCityName, DestAirportID, ArrDelay LIMIT 9","hsqls":["SELECT OriginCityName, DestAirportID, ArrDelay, COUNT(Quarter), COUNT(NASDelay), MIN(OriginWac) FROM mytable WHERE Carrier BETWEEN 'HA' AND 'UA' GROUP BY OriginCityName, DestAirportID, ArrDelay  ORDER BY OriginCityName, DestAirportID, ArrDelay LIMIT 9"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 24"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 OR DepDel15 BETWEEN -9999 AND 1 AND DivLongestGTimes IN (19.0, 32.0) LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 OR DepDel15 BETWEEN -9999 AND 1 AND (DivLongestGTimes__MV0 IN (19.0, 32.0) OR DivLongestGTimes__MV1 IN (19.0, 32.0) OR DivLongestGTimes__MV2 IN (19.0, 32.0) OR DivLongestGTimes__MV3 IN (19.0, 32.0) OR DivLongestGTimes__MV4 IN (19.0, 32.0)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 OR DepDel15 BETWEEN -9999 AND 1 AND DivLongestGTimes IN (19.0, 32.0) LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 OR DepDel15 BETWEEN -9999 AND 1 AND (DivLongestGTimes[1] IN (19.0, 32.0) OR DivLongestGTimes[2] IN (19.0, 32.0) OR DivLongestGTimes[3] IN (19.0, 32.0) OR DivLongestGTimes[4] IN (19.0, 32.0) OR DivLongestGTimes[5] IN (19.0, 32.0)) LIMIT 10000"]}
 {"sql":"SELECT \"Year\", FlightNum FROM mytable WHERE OriginAirportID BETWEEN 15412 AND 12177 OR Diverted NOT IN (1, 0) OR DestWac = 84 ORDER BY FirstDepTime, DestCityName LIMIT 10","hsqls":["SELECT Year, FlightNum FROM mytable WHERE OriginAirportID BETWEEN 15412 AND 12177 OR Diverted NOT IN (1, 0) OR DestWac = 84 ORDER BY FirstDepTime, DestCityName LIMIT 10"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE WeatherDelay BETWEEN 78 AND 16 OR AirTime > 39 AND Distance < 615 ORDER BY AirTime LIMIT 18"}
 {"sql":"SELECT TaxiOut, ArrivalDelayGroups FROM mytable WHERE DepDelayMinutes BETWEEN 76.0 AND 243.0 AND NASDelay NOT IN (41, 25) ORDER BY ArrTimeBlk, CRSDepTime LIMIT 17"}
-{"sql":"SELECT ArrDelay, AirTime, \"Month\" FROM mytable WHERE DivAirportSeqIDs = 1195302 OR DestState >= 'WI' ORDER BY WeatherDelay, UniqueCarrier LIMIT 14","hsqls":["SELECT ArrDelay, AirTime, Month FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1195302 OR DivAirportSeqIDs__MV1 = 1195302 OR DivAirportSeqIDs__MV2 = 1195302 OR DivAirportSeqIDs__MV3 = 1195302 OR DivAirportSeqIDs__MV4 = 1195302) OR DestState >= 'WI' ORDER BY WeatherDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, AirTime, \"Month\" FROM mytable WHERE DivAirportSeqIDs = 1195302 OR DestState >= 'WI' ORDER BY WeatherDelay, UniqueCarrier LIMIT 14","hsqls":["SELECT ArrDelay, AirTime, `Month` FROM mytable WHERE (DivAirportSeqIDs[1] = 1195302 OR DivAirportSeqIDs[2] = 1195302 OR DivAirportSeqIDs[3] = 1195302 OR DivAirportSeqIDs[4] = 1195302 OR DivAirportSeqIDs[5] = 1195302) OR DestState >= 'WI' ORDER BY WeatherDelay, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, CRSElapsedTime, MAX(DestWac) FROM mytable WHERE TaxiOut BETWEEN 34 AND 64 OR OriginAirportID NOT IN (13476, 13296, 13970, 12016, 15389) GROUP BY ActualElapsedTime, CRSElapsedTime  ORDER BY ActualElapsedTime, CRSElapsedTime LIMIT 26","hsqls":["SELECT ActualElapsedTime, CRSElapsedTime, MAX(DestWac) FROM mytable WHERE TaxiOut BETWEEN 34 AND 64 OR OriginAirportID NOT IN (13476, 13296, 13970, 12016, 15389) GROUP BY ActualElapsedTime, CRSElapsedTime  ORDER BY ActualElapsedTime, CRSElapsedTime LIMIT 26"]}
 {"sql":"SELECT DestState, CarrierDelay, DestStateName, AVG(DaysSinceEpoch), MAX(DivActualElapsedTime) FROM mytable WHERE DestAirportID IN (10529, 14489, 14771, 11618) OR DistanceGroup NOT IN (4, 11) GROUP BY DestState, CarrierDelay, DestStateName  ORDER BY DestState, CarrierDelay, DestStateName LIMIT 9","hsqls":["SELECT DestState, CarrierDelay, DestStateName, AVG(DaysSinceEpoch), MAX(DivActualElapsedTime) FROM mytable WHERE DestAirportID IN (10529, 14489, 14771, 11618) OR DistanceGroup NOT IN (4, 11) GROUP BY DestState, CarrierDelay, DestStateName  ORDER BY DestState, CarrierDelay, DestStateName LIMIT 9"]}
 {"sql":"SELECT ActualElapsedTime, AirTime, MIN(DistanceGroup), SUM(OriginAirportSeqID) FROM mytable WHERE ArrTime BETWEEN 2017 AND 2216 GROUP BY ActualElapsedTime, AirTime  ORDER BY ActualElapsedTime, AirTime LIMIT 14","hsqls":["SELECT ActualElapsedTime, AirTime, MIN(DistanceGroup), SUM(OriginAirportSeqID) FROM mytable WHERE ArrTime BETWEEN 2017 AND 2216 GROUP BY ActualElapsedTime, AirTime  ORDER BY ActualElapsedTime, AirTime LIMIT 14"]}
-{"sql":"SELECT \"Year\", COUNT(DestState) FROM mytable WHERE DepTime <> 636 GROUP BY \"Year\" LIMIT 2","hsqls":["SELECT Year, COUNT(DestState) FROM mytable WHERE DepTime <> 636 GROUP BY Year LIMIT 2"]}
-{"sql":"SELECT TaxiOut, DivAirportIDs, DestCityMarketID FROM mytable WHERE DayofMonth > 16 OR DestCityName < 'Butte, MT' LIMIT 26","hsqls":["SELECT TaxiOut, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DestCityMarketID FROM mytable WHERE DayofMonth > 16 OR DestCityName < 'Butte, MT' LIMIT 10000"]}
+{"sql":"SELECT \"Year\", COUNT(DestState) FROM mytable WHERE DepTime <> 636 GROUP BY \"Year\" LIMIT 2","hsqls":["SELECT Year, COUNT(DestState) FROM mytable WHERE DepTime <> 636 GROUP BY `Year` LIMIT 2"]}
+{"sql":"SELECT TaxiOut, DivAirportIDs, DestCityMarketID FROM mytable WHERE DayofMonth > 16 OR DestCityName < 'Butte, MT' LIMIT 26","hsqls":["SELECT TaxiOut, DivAirportIDs, DestCityMarketID FROM mytable WHERE DayofMonth > 16 OR DestCityName < 'Butte, MT' LIMIT 10000"]}
 {"sql":"SELECT \"Year\", AirlineID, SUM(DivReachedDest), MAX(FlightNum), MIN(DayofMonth) FROM mytable WHERE DaysSinceEpoch IN (16078, 16091) AND WheelsOff <> 1536 GROUP BY \"Year\", AirlineID LIMIT 22","hsqls":["SELECT Year, AirlineID, SUM(DivReachedDest), MAX(FlightNum), MIN(DayofMonth) FROM mytable WHERE DaysSinceEpoch IN (16078, 16091) AND WheelsOff <> 1536 GROUP BY Year, AirlineID LIMIT 22"]}
 {"sql":"SELECT OriginAirportSeqID, DivAirportLandings, DestAirportID FROM mytable WHERE TotalAddGTime BETWEEN 94 AND 42 AND DepTimeBlk NOT IN ('2200-2259') ORDER BY DepDelay, DestState, DestCityMarketID LIMIT 4"}
-{"sql":"SELECT AVG(SecurityDelay), AVG(WheelsOff) FROM mytable WHERE DivAirports >= 'PHF' AND DepDel15 NOT IN (1, 0, -9999) AND CRSElapsedTime IN (353, 98, 332, 157, 60) LIMIT 19","hsqls":["SELECT AVG(SecurityDelay), AVG(WheelsOff)  FROM mytable WHERE (DivAirports__MV0 >= 'PHF' OR DivAirports__MV1 >= 'PHF' OR DivAirports__MV2 >= 'PHF' OR DivAirports__MV3 >= 'PHF' OR DivAirports__MV4 >= 'PHF') AND DepDel15 NOT IN (1, 0, -9999) AND CRSElapsedTime IN (353, 98, 332, 157, 60) LIMIT 10000"]}
+{"sql":"SELECT AVG(SecurityDelay), AVG(WheelsOff) FROM mytable WHERE DivAirports >= 'PHF' AND DepDel15 NOT IN (1, 0, -9999) AND CRSElapsedTime IN (353, 98, 332, 157, 60) LIMIT 19","hsqls":["SELECT AVG(SecurityDelay), AVG(WheelsOff)  FROM mytable WHERE (DivAirports[1] >= 'PHF' OR DivAirports[2] >= 'PHF' OR DivAirports[3] >= 'PHF' OR DivAirports[4] >= 'PHF' OR DivAirports[5] >= 'PHF') AND DepDel15 NOT IN (1, 0, -9999) AND CRSElapsedTime IN (353, 98, 332, 157, 60) LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE OriginAirportSeqID = 1233904 AND DaysSinceEpoch IN (16071, 16096, 16097, 16093) OR OriginStateFips BETWEEN 37 AND 30 ORDER BY Diverted, DestState LIMIT 21"}
 {"sql":"SELECT DepTimeBlk, COUNT(NASDelay), AVG(DestWac) FROM mytable WHERE DepartureDelayGroups < 2 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 21","hsqls":["SELECT DepTimeBlk, COUNT(NASDelay), AVG(DestWac) FROM mytable WHERE DepartureDelayGroups < 2 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 21"]}
 {"sql":"SELECT Cancelled, MAX(ArrivalDelayGroups), AVG(FlightNum), MIN(Cancelled) FROM mytable WHERE ArrDelay = 77.0 AND Carrier BETWEEN 'OO' AND 'WN' OR ArrTime < 854 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 28","hsqls":["SELECT Cancelled, MAX(ArrivalDelayGroups), AVG(FlightNum), MIN(Cancelled) FROM mytable WHERE ArrDelay = 77.0 AND Carrier BETWEEN 'OO' AND 'WN' OR ArrTime < 854 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 28"]}
-{"sql":"SELECT LongestAddGTime, COUNT(ArrTime) FROM mytable WHERE CarrierDelay > 47 AND DivLongestGTimes BETWEEN 44.0 AND 80.0 AND DayOfWeek BETWEEN 1 AND 4 GROUP BY LongestAddGTime LIMIT 18","hsqls":["SELECT LongestAddGTime, COUNT(ArrTime) FROM mytable WHERE CarrierDelay > 47 AND (DivLongestGTimes__MV0 BETWEEN 44.0 AND 80.0 OR DivLongestGTimes__MV1 BETWEEN 44.0 AND 80.0 OR DivLongestGTimes__MV2 BETWEEN 44.0 AND 80.0 OR DivLongestGTimes__MV3 BETWEEN 44.0 AND 80.0 OR DivLongestGTimes__MV4 BETWEEN 44.0 AND 80.0) AND DayOfWeek BETWEEN 1 AND 4 GROUP BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, COUNT(ArrTime) FROM mytable WHERE CarrierDelay > 47 AND DivLongestGTimes BETWEEN 44.0 AND 80.0 AND DayOfWeek BETWEEN 1 AND 4 GROUP BY LongestAddGTime LIMIT 18","hsqls":["SELECT LongestAddGTime, COUNT(ArrTime) FROM mytable WHERE CarrierDelay > 47 AND (DivLongestGTimes[1] BETWEEN 44.0 AND 80.0 OR DivLongestGTimes[2] BETWEEN 44.0 AND 80.0 OR DivLongestGTimes[3] BETWEEN 44.0 AND 80.0 OR DivLongestGTimes[4] BETWEEN 44.0 AND 80.0 OR DivLongestGTimes[5] BETWEEN 44.0 AND 80.0) AND DayOfWeek BETWEEN 1 AND 4 GROUP BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT SUM(DepDelayMinutes), MIN(ActualElapsedTime), SUM(DivDistance) FROM mytable LIMIT 24"}
 {"sql":"SELECT DestAirportSeqID, DestCityMarketID FROM mytable WHERE CancellationCode <> 'noodles' ORDER BY WeatherDelay, DestStateName LIMIT 17"}
-{"sql":"SELECT DivDistance FROM mytable WHERE DivLongestGTimes IN (73.0, 104.0, 2.0, 139.0) OR DivTailNums BETWEEN 'N825SK' AND 'N920SW' ORDER BY Diverted","hsqls":["SELECT DivDistance FROM mytable WHERE (DivLongestGTimes__MV0 IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes__MV1 IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes__MV2 IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes__MV3 IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes__MV4 IN (73.0, 104.0, 2.0, 139.0)) OR (DivTailNums__MV0 BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums__MV1 BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums__MV2 BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums__MV3 BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums__MV4 BETWEEN 'N825SK' AND 'N920SW') ORDER BY Diverted LIMIT 10000"]}
+{"sql":"SELECT DivDistance FROM mytable WHERE DivLongestGTimes IN (73.0, 104.0, 2.0, 139.0) OR DivTailNums BETWEEN 'N825SK' AND 'N920SW' ORDER BY Diverted","hsqls":["SELECT DivDistance FROM mytable WHERE (DivLongestGTimes[1] IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes[2] IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes[3] IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes[4] IN (73.0, 104.0, 2.0, 139.0) OR DivLongestGTimes[5] IN (73.0, 104.0, 2.0, 139.0)) OR (DivTailNums[1] BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums[2] BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums[3] BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums[4] BETWEEN 'N825SK' AND 'N920SW' OR DivTailNums[5] BETWEEN 'N825SK' AND 'N920SW') ORDER BY Diverted LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, FirstDepTime, DestAirportSeqID, COUNT(*) FROM mytable WHERE DestStateFips BETWEEN 75 AND 13 GROUP BY DistanceGroup, FirstDepTime, DestAirportSeqID  ORDER BY DistanceGroup, FirstDepTime, DestAirportSeqID LIMIT 22","hsqls":["SELECT DistanceGroup, FirstDepTime, DestAirportSeqID, COUNT(*) FROM mytable WHERE DestStateFips BETWEEN 75 AND 13 GROUP BY DistanceGroup, FirstDepTime, DestAirportSeqID  ORDER BY DistanceGroup, FirstDepTime, DestAirportSeqID LIMIT 22"]}
 {"sql":"SELECT SUM(Cancelled), MAX(DestAirportSeqID), MIN(CRSArrTime) FROM mytable WHERE TailNum NOT IN ('N14162', 'N612AS') AND OriginCityName NOT IN ('Durango, CO', 'Myrtle Beach, SC', 'Boston, MA', 'Mobile, AL', 'Chicago, IL') OR Dest BETWEEN 'BRO' AND 'OMA' LIMIT 24"}
 {"sql":"SELECT DestState, CRSDepTime, DivActualElapsedTime FROM mytable ORDER BY DepDelayMinutes, AirTime LIMIT 26"}
 {"sql":"SELECT ArrDelayMinutes, ArrivalDelayGroups, MAX(DestAirportSeqID), MIN(TotalAddGTime), COUNT(LateAircraftDelay) FROM mytable GROUP BY ArrDelayMinutes, ArrivalDelayGroups  ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 19","hsqls":["SELECT ArrDelayMinutes, ArrivalDelayGroups, MAX(DestAirportSeqID), MIN(TotalAddGTime), COUNT(LateAircraftDelay) FROM mytable GROUP BY ArrDelayMinutes, ArrivalDelayGroups  ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 19"]}
 {"sql":"SELECT CRSArrTime, DestStateName, ArrDel15 FROM mytable WHERE OriginCityName NOT IN ('Greensboro/High Point, NC') AND DestStateFips IN (24, 25, 38) AND CRSElapsedTime BETWEEN 119 AND 66 LIMIT 25"}
-{"sql":"SELECT Distance, DaysSinceEpoch FROM mytable WHERE LateAircraftDelay > 88 ORDER BY \"Month\" LIMIT 7","hsqls":["SELECT Distance, DaysSinceEpoch FROM mytable WHERE LateAircraftDelay > 88 ORDER BY Month LIMIT 7"]}
-{"sql":"SELECT Quarter, DivTailNums, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (175, 64) OR ArrTime = 1005 ORDER BY FirstDepTime, ActualElapsedTime, AirlineID LIMIT 24","hsqls":["SELECT Quarter, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (175, 64) OR ArrTime = 1005 ORDER BY FirstDepTime, ActualElapsedTime, AirlineID LIMIT 10000"]}
+{"sql":"SELECT Distance, DaysSinceEpoch FROM mytable WHERE LateAircraftDelay > 88 ORDER BY \"Month\" LIMIT 7","hsqls":["SELECT Distance, DaysSinceEpoch FROM mytable WHERE LateAircraftDelay > 88 ORDER BY `Month` LIMIT 7"]}
+{"sql":"SELECT Quarter, DivTailNums, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (175, 64) OR ArrTime = 1005 ORDER BY FirstDepTime, ActualElapsedTime, AirlineID LIMIT 24","hsqls":["SELECT Quarter, DivTailNums, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (175, 64) OR ArrTime = 1005 ORDER BY FirstDepTime, ActualElapsedTime, AirlineID LIMIT 10000"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DestWac BETWEEN 53 AND 61 AND WeatherDelay IN (134, 78, 138, 44, 100) LIMIT 1"}
 {"sql":"SELECT LateAircraftDelay, DepDelayMinutes, Dest FROM mytable WHERE Diverted IN (1, 0) ORDER BY DistanceGroup LIMIT 6"}
 {"sql":"SELECT DestAirportSeqID, ArrTimeBlk FROM mytable ORDER BY DivReachedDest, AirTime LIMIT 25"}
@@ -3855,16 +3855,16 @@
 {"sql":"SELECT TaxiOut FROM mytable WHERE LateAircraftDelay BETWEEN 70 AND 7 ORDER BY DepDelay, ArrDelayMinutes LIMIT 4"}
 {"sql":"SELECT MIN(DepDelayMinutes), MIN(AirTime), MAX(DepDelay) FROM mytable WHERE DepDel15 NOT IN (1, 0) LIMIT 5"}
 {"sql":"SELECT LateAircraftDelay, Origin, AirTime, MAX(DayofMonth), MIN(DayofMonth) FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 6 AND Flights BETWEEN 1 AND 1 GROUP BY LateAircraftDelay, Origin, AirTime  ORDER BY LateAircraftDelay, Origin, AirTime LIMIT 20","hsqls":["SELECT LateAircraftDelay, Origin, AirTime, MAX(DayofMonth), MIN(DayofMonth) FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 6 AND Flights BETWEEN 1 AND 1 GROUP BY LateAircraftDelay, Origin, AirTime  ORDER BY LateAircraftDelay, Origin, AirTime LIMIT 20"]}
-{"sql":"SELECT DepartureDelayGroups, DayOfWeek FROM mytable WHERE DepDelayMinutes BETWEEN 177.0 AND 157.0 OR DepDel15 IN (1, 0) AND Origin IN ('DAY', 'MSO', 'CRP') ORDER BY \"Month\" LIMIT 16","hsqls":["SELECT DepartureDelayGroups, DayOfWeek FROM mytable WHERE DepDelayMinutes BETWEEN 177.0 AND 157.0 OR DepDel15 IN (1, 0) AND Origin IN ('DAY', 'MSO', 'CRP') ORDER BY Month LIMIT 16"]}
-{"sql":"SELECT DepTime, ArrTimeBlk FROM mytable ORDER BY LateAircraftDelay, CRSDepTime, \"Month\" LIMIT 14","hsqls":["SELECT DepTime, ArrTimeBlk FROM mytable ORDER BY LateAircraftDelay, CRSDepTime, Month LIMIT 14"]}
+{"sql":"SELECT DepartureDelayGroups, DayOfWeek FROM mytable WHERE DepDelayMinutes BETWEEN 177.0 AND 157.0 OR DepDel15 IN (1, 0) AND Origin IN ('DAY', 'MSO', 'CRP') ORDER BY \"Month\" LIMIT 16","hsqls":["SELECT DepartureDelayGroups, DayOfWeek FROM mytable WHERE DepDelayMinutes BETWEEN 177.0 AND 157.0 OR DepDel15 IN (1, 0) AND Origin IN ('DAY', 'MSO', 'CRP') ORDER BY `Month` LIMIT 16"]}
+{"sql":"SELECT DepTime, ArrTimeBlk FROM mytable ORDER BY LateAircraftDelay, CRSDepTime, \"Month\" LIMIT 14","hsqls":["SELECT DepTime, ArrTimeBlk FROM mytable ORDER BY LateAircraftDelay, CRSDepTime, `Month` LIMIT 14"]}
 {"sql":"SELECT DepTime, Cancelled FROM mytable LIMIT 19"}
-{"sql":"SELECT DestCityMarketID, DayOfWeek FROM mytable WHERE UniqueCarrier >= 'MQ' OR DivActualElapsedTime < 379 OR DivTotalGTimes BETWEEN 55 AND 58 ORDER BY DepDelayMinutes, AirTime LIMIT 20","hsqls":["SELECT DestCityMarketID, DayOfWeek FROM mytable WHERE UniqueCarrier >= 'MQ' OR DivActualElapsedTime < 379 OR (DivTotalGTimes__MV0 BETWEEN 55 AND 58 OR DivTotalGTimes__MV1 BETWEEN 55 AND 58 OR DivTotalGTimes__MV2 BETWEEN 55 AND 58 OR DivTotalGTimes__MV3 BETWEEN 55 AND 58 OR DivTotalGTimes__MV4 BETWEEN 55 AND 58) ORDER BY DepDelayMinutes, AirTime LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, DayOfWeek FROM mytable WHERE UniqueCarrier >= 'MQ' OR DivActualElapsedTime < 379 OR DivTotalGTimes BETWEEN 55 AND 58 ORDER BY DepDelayMinutes, AirTime LIMIT 20","hsqls":["SELECT DestCityMarketID, DayOfWeek FROM mytable WHERE UniqueCarrier >= 'MQ' OR DivActualElapsedTime < 379 OR (DivTotalGTimes[1] BETWEEN 55 AND 58 OR DivTotalGTimes[2] BETWEEN 55 AND 58 OR DivTotalGTimes[3] BETWEEN 55 AND 58 OR DivTotalGTimes[4] BETWEEN 55 AND 58 OR DivTotalGTimes[5] BETWEEN 55 AND 58) ORDER BY DepDelayMinutes, AirTime LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE OriginWac NOT IN (83, 72, 84) OR ArrTime BETWEEN 1243 AND 2116 ORDER BY OriginState, DaysSinceEpoch LIMIT 8"}
 {"sql":"SELECT Diverted, DestStateName FROM mytable WHERE WeatherDelay IN (55, 62) OR ArrDelay < 9.0 OR DivReachedDest BETWEEN 0 AND -9999 LIMIT 17"}
 {"sql":"SELECT Dest, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 47 AND 24 AND OriginState <= 'ND' AND Diverted > 0 GROUP BY Dest  ORDER BY Dest LIMIT 22","hsqls":["SELECT Dest, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 47 AND 24 AND OriginState <= 'ND' AND Diverted > 0 GROUP BY Dest  ORDER BY Dest LIMIT 22"]}
-{"sql":"SELECT DepDelayMinutes, DivWheelsOffs, AirlineID FROM mytable LIMIT 27","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, AirlineID FROM mytable LIMIT 10000"]}
-{"sql":"SELECT COUNT(CarrierDelay), SUM(DestAirportID) FROM mytable WHERE DaysSinceEpoch <= 16073 AND DivAirportIDs IN (12278, 12451, 11973, 13424) LIMIT 15","hsqls":["SELECT COUNT(CarrierDelay), SUM(DestAirportID)  FROM mytable WHERE DaysSinceEpoch <= 16073 AND (DivAirportIDs__MV0 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV1 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV2 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV3 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV4 IN (12278, 12451, 11973, 13424)) LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, UniqueCarrier, SUM(WheelsOn), COUNT(DestStateName) FROM mytable WHERE DivWheelsOffs BETWEEN 2050 AND 1135 AND Origin NOT IN ('CHO', 'GNV', 'BUF') OR TaxiIn >= 38 GROUP BY OriginStateFips, UniqueCarrier LIMIT 29","hsqls":["SELECT OriginStateFips, UniqueCarrier, SUM(WheelsOn), COUNT(DestStateName) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2050 AND 1135 OR DivWheelsOffs__MV1 BETWEEN 2050 AND 1135 OR DivWheelsOffs__MV2 BETWEEN 2050 AND 1135 OR DivWheelsOffs__MV3 BETWEEN 2050 AND 1135 OR DivWheelsOffs__MV4 BETWEEN 2050 AND 1135) AND Origin NOT IN ('CHO', 'GNV', 'BUF') OR TaxiIn >= 38 GROUP BY OriginStateFips, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivWheelsOffs, AirlineID FROM mytable LIMIT 27","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs, AirlineID FROM mytable LIMIT 10000"]}
+{"sql":"SELECT COUNT(CarrierDelay), SUM(DestAirportID) FROM mytable WHERE DaysSinceEpoch <= 16073 AND DivAirportIDs IN (12278, 12451, 11973, 13424) LIMIT 15","hsqls":["SELECT COUNT(CarrierDelay), SUM(DestAirportID)  FROM mytable WHERE DaysSinceEpoch <= 16073 AND (DivAirportIDs[1] IN (12278, 12451, 11973, 13424) OR DivAirportIDs[2] IN (12278, 12451, 11973, 13424) OR DivAirportIDs[3] IN (12278, 12451, 11973, 13424) OR DivAirportIDs[4] IN (12278, 12451, 11973, 13424) OR DivAirportIDs[5] IN (12278, 12451, 11973, 13424)) LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, UniqueCarrier, SUM(WheelsOn), COUNT(DestStateName) FROM mytable WHERE DivWheelsOffs BETWEEN 2050 AND 1135 AND Origin NOT IN ('CHO', 'GNV', 'BUF') OR TaxiIn >= 38 GROUP BY OriginStateFips, UniqueCarrier LIMIT 29","hsqls":["SELECT OriginStateFips, UniqueCarrier, SUM(WheelsOn), COUNT(DestStateName) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2050 AND 1135 OR DivWheelsOffs[2] BETWEEN 2050 AND 1135 OR DivWheelsOffs[3] BETWEEN 2050 AND 1135 OR DivWheelsOffs[4] BETWEEN 2050 AND 1135 OR DivWheelsOffs[5] BETWEEN 2050 AND 1135) AND Origin NOT IN ('CHO', 'GNV', 'BUF') OR TaxiIn >= 38 GROUP BY OriginStateFips, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable LIMIT 17"}
 {"sql":"SELECT DestWac, DivDistance, DestAirportSeqID FROM mytable WHERE WeatherDelay < 9 OR OriginWac > 53 AND DepDel15 NOT IN (1, 0, -9999) LIMIT 23"}
 {"sql":"SELECT Cancelled, DepDel15, CancellationCode FROM mytable LIMIT 12"}
@@ -3872,14 +3872,14 @@
 {"sql":"SELECT DestWac, SUM(OriginAirportID), COUNT(DepartureDelayGroups), MIN(DayofMonth) FROM mytable WHERE Flights NOT IN (1) GROUP BY DestWac  ORDER BY DestWac LIMIT 13","hsqls":["SELECT DestWac, SUM(OriginAirportID), COUNT(DepartureDelayGroups), MIN(DayofMonth) FROM mytable WHERE Flights NOT IN (1) GROUP BY DestWac  ORDER BY DestWac LIMIT 13"]}
 {"sql":"SELECT OriginAirportSeqID, DepDelay, OriginStateName FROM mytable WHERE Quarter BETWEEN 1 AND 1 LIMIT 29"}
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE DivArrDelay BETWEEN 309 AND 199 LIMIT 2"}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE CarrierDelay NOT IN (25) AND ArrDelay IN (20.0, 104.0, 74.0) LIMIT 17","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE CarrierDelay NOT IN (25) AND ArrDelay IN (20.0, 104.0, 74.0) LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, DivLongestGTimes, DestStateFips FROM mytable WHERE DivWheelsOffs IN (1041, 2313) AND DepTimeBlk BETWEEN '2100-2159' AND '2100-2159' OR DepDel15 > 0 ORDER BY Flights, DivArrDelay, OriginStateName LIMIT 14","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestStateFips FROM mytable WHERE (DivWheelsOffs__MV0 IN (1041, 2313) OR DivWheelsOffs__MV1 IN (1041, 2313) OR DivWheelsOffs__MV2 IN (1041, 2313) OR DivWheelsOffs__MV3 IN (1041, 2313) OR DivWheelsOffs__MV4 IN (1041, 2313)) AND DepTimeBlk BETWEEN '2100-2159' AND '2100-2159' OR DepDel15 > 0 ORDER BY Flights, DivArrDelay, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE CarrierDelay NOT IN (25) AND ArrDelay IN (20.0, 104.0, 74.0) LIMIT 17","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE CarrierDelay NOT IN (25) AND ArrDelay IN (20.0, 104.0, 74.0) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivLongestGTimes, DestStateFips FROM mytable WHERE DivWheelsOffs IN (1041, 2313) AND DepTimeBlk BETWEEN '2100-2159' AND '2100-2159' OR DepDel15 > 0 ORDER BY Flights, DivArrDelay, OriginStateName LIMIT 14","hsqls":["SELECT DivWheelsOns, DivLongestGTimes, DestStateFips FROM mytable WHERE (DivWheelsOffs[1] IN (1041, 2313) OR DivWheelsOffs[2] IN (1041, 2313) OR DivWheelsOffs[3] IN (1041, 2313) OR DivWheelsOffs[4] IN (1041, 2313) OR DivWheelsOffs[5] IN (1041, 2313)) AND DepTimeBlk BETWEEN '2100-2159' AND '2100-2159' OR DepDel15 > 0 ORDER BY Flights, DivArrDelay, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT MAX(CRSArrTime), SUM(ArrDelay), MAX(DayOfWeek) FROM mytable LIMIT 4"}
 {"sql":"SELECT OriginAirportSeqID, DepDel15, AirlineID, AVG(Diverted) FROM mytable WHERE Diverted IN (1, 0) AND UniqueCarrier BETWEEN 'VX' AND 'DL' OR LongestAddGTime > 7 GROUP BY OriginAirportSeqID, DepDel15, AirlineID  ORDER BY OriginAirportSeqID, DepDel15, AirlineID LIMIT 29","hsqls":["SELECT OriginAirportSeqID, DepDel15, AirlineID, AVG(Diverted) FROM mytable WHERE Diverted IN (1, 0) AND UniqueCarrier BETWEEN 'VX' AND 'DL' OR LongestAddGTime > 7 GROUP BY OriginAirportSeqID, DepDel15, AirlineID  ORDER BY OriginAirportSeqID, DepDel15, AirlineID LIMIT 29"]}
-{"sql":"SELECT DivAirportIDs, CRSDepTime FROM mytable ORDER BY ActualElapsedTime LIMIT 6","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CRSDepTime FROM mytable ORDER BY ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginCityName FROM mytable WHERE \"Month\" <= 1 LIMIT 14","hsqls":["SELECT OriginCityName FROM mytable WHERE Month <= 1 LIMIT 14"]}
+{"sql":"SELECT DivAirportIDs, CRSDepTime FROM mytable ORDER BY ActualElapsedTime LIMIT 6","hsqls":["SELECT DivAirportIDs, CRSDepTime FROM mytable ORDER BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE \"Month\" <= 1 LIMIT 14","hsqls":["SELECT OriginCityName FROM mytable WHERE `Month` <= 1 LIMIT 14"]}
 {"sql":"SELECT Diverted, DestStateName, MIN(DestAirportSeqID) FROM mytable WHERE DestWac <= 44 OR TotalAddGTime IN (20, 30, 23, 13) GROUP BY Diverted, DestStateName  ORDER BY Diverted, DestStateName LIMIT 10","hsqls":["SELECT Diverted, DestStateName, MIN(DestAirportSeqID) FROM mytable WHERE DestWac <= 44 OR TotalAddGTime IN (20, 30, 23, 13) GROUP BY Diverted, DestStateName  ORDER BY Diverted, DestStateName LIMIT 10"]}
-{"sql":"SELECT Quarter, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DestWac NOT IN (73) AND DivReachedDest <> -9999 OR LongestAddGTime BETWEEN 60 AND -9999 ORDER BY Quarter, Flights LIMIT 6","hsqls":["SELECT Quarter, ArrDelayMinutes, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DestWac NOT IN (73) AND DivReachedDest <> -9999 OR LongestAddGTime BETWEEN 60 AND -9999 ORDER BY Quarter, Flights LIMIT 10000"]}
+{"sql":"SELECT Quarter, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DestWac NOT IN (73) AND DivReachedDest <> -9999 OR LongestAddGTime BETWEEN 60 AND -9999 ORDER BY Quarter, Flights LIMIT 6","hsqls":["SELECT Quarter, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DestWac NOT IN (73) AND DivReachedDest <> -9999 OR LongestAddGTime BETWEEN 60 AND -9999 ORDER BY Quarter, Flights LIMIT 10000"]}
 {"sql":"SELECT DestWac, DestStateName, CRSElapsedTime FROM mytable WHERE DaysSinceEpoch >= 16085 OR OriginAirportID BETWEEN 10980 AND 13360 ORDER BY Carrier, ActualElapsedTime, CancellationCode LIMIT 26"}
 {"sql":"SELECT SUM(LongestAddGTime), SUM(DivReachedDest), SUM(CRSArrTime) FROM mytable WHERE OriginAirportID BETWEEN 10431 AND 11337 AND OriginAirportSeqID <= 1409803 AND DepDel15 IN (1, 0, -9999) LIMIT 14"}
 {"sql":"SELECT WheelsOff, Origin FROM mytable WHERE DayofMonth NOT IN (2, 6, 31, 22, 25) AND DepartureDelayGroups <> 2 ORDER BY OriginCityMarketID LIMIT 25"}
@@ -3887,92 +3887,92 @@
 {"sql":"SELECT WeatherDelay, DestCityName, DestCityMarketID, COUNT(DaysSinceEpoch) FROM mytable WHERE TailNum IN ('N963DN', 'N77871', 'N843UA') GROUP BY WeatherDelay, DestCityName, DestCityMarketID  ORDER BY WeatherDelay, DestCityName, DestCityMarketID LIMIT 17","hsqls":["SELECT WeatherDelay, DestCityName, DestCityMarketID, COUNT(DaysSinceEpoch) FROM mytable WHERE TailNum IN ('N963DN', 'N77871', 'N843UA') GROUP BY WeatherDelay, DestCityName, DestCityMarketID  ORDER BY WeatherDelay, DestCityName, DestCityMarketID LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, FirstDepTime, CarrierDelay, SUM(OriginAirportSeqID), AVG(Flights), COUNT(WeatherDelay) FROM mytable GROUP BY OriginAirportSeqID, FirstDepTime, CarrierDelay  ORDER BY OriginAirportSeqID, FirstDepTime, CarrierDelay LIMIT 28","hsqls":["SELECT OriginAirportSeqID, FirstDepTime, CarrierDelay, SUM(OriginAirportSeqID), AVG(Flights), COUNT(WeatherDelay) FROM mytable GROUP BY OriginAirportSeqID, FirstDepTime, CarrierDelay  ORDER BY OriginAirportSeqID, FirstDepTime, CarrierDelay LIMIT 28"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE CRSDepTime <= 1207 AND AirTime IN (151) ORDER BY DestAirportSeqID, ArrTimeBlk LIMIT 2"}
-{"sql":"SELECT DivDistance, SecurityDelay, DivAirportSeqIDs FROM mytable WHERE DepDel15 NOT IN (1, -9999) AND DepartureDelayGroups BETWEEN -1 AND 12 ORDER BY DepDelayMinutes, \"Month\" LIMIT 10","hsqls":["SELECT DivDistance, SecurityDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DepDel15 NOT IN (1, -9999) AND DepartureDelayGroups BETWEEN -1 AND 12 ORDER BY DepDelayMinutes, Month LIMIT 10000"]}
+{"sql":"SELECT DivDistance, SecurityDelay, DivAirportSeqIDs FROM mytable WHERE DepDel15 NOT IN (1, -9999) AND DepartureDelayGroups BETWEEN -1 AND 12 ORDER BY DepDelayMinutes, \"Month\" LIMIT 10","hsqls":["SELECT DivDistance, SecurityDelay, DivAirportSeqIDs FROM mytable WHERE DepDel15 NOT IN (1, -9999) AND DepartureDelayGroups BETWEEN -1 AND 12 ORDER BY DepDelayMinutes, `Month` LIMIT 10000"]}
 {"sql":"SELECT DepDelay, CRSArrTime, DestStateName, COUNT(*) FROM mytable GROUP BY DepDelay, CRSArrTime, DestStateName  ORDER BY DepDelay, CRSArrTime, DestStateName LIMIT 19","hsqls":["SELECT DepDelay, CRSArrTime, DestStateName, COUNT(*) FROM mytable GROUP BY DepDelay, CRSArrTime, DestStateName  ORDER BY DepDelay, CRSArrTime, DestStateName LIMIT 19"]}
 {"sql":"SELECT COUNT(OriginWac), COUNT(DestCityMarketID), MIN(TaxiOut) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 6 AND DestAirportID IN (14635) OR SecurityDelay <> 18 LIMIT 19"}
 {"sql":"SELECT CRSDepTime FROM mytable ORDER BY FlightNum LIMIT 14"}
 {"sql":"SELECT DestAirportSeqID, WheelsOn, CRSElapsedTime FROM mytable WHERE ArrDelayMinutes = 20.0 LIMIT 3"}
 {"sql":"SELECT TailNum FROM mytable WHERE ArrDelayMinutes BETWEEN 224.0 AND 21.0 AND CarrierDelay IN (77, 200, 8, 310) OR OriginAirportSeqID BETWEEN 1425403 AND 1129202 LIMIT 21"}
-{"sql":"SELECT OriginWac FROM mytable WHERE Origin <> 'FAI' OR OriginCityName > 'Rapid City, SD' ORDER BY DestStateName, \"Month\" LIMIT 18","hsqls":["SELECT OriginWac FROM mytable WHERE Origin <> 'FAI' OR OriginCityName > 'Rapid City, SD' ORDER BY DestStateName, Month LIMIT 18"]}
+{"sql":"SELECT OriginWac FROM mytable WHERE Origin <> 'FAI' OR OriginCityName > 'Rapid City, SD' ORDER BY DestStateName, \"Month\" LIMIT 18","hsqls":["SELECT OriginWac FROM mytable WHERE Origin <> 'FAI' OR OriginCityName > 'Rapid City, SD' ORDER BY DestStateName, `Month` LIMIT 18"]}
 {"sql":"SELECT Diverted, DestWac FROM mytable ORDER BY Distance, OriginCityName LIMIT 26"}
 {"sql":"SELECT CarrierDelay, DivAirportLandings, DayOfWeek FROM mytable WHERE ActualElapsedTime <> 413 LIMIT 1"}
-{"sql":"SELECT LongestAddGTime, DivAirportSeqIDs, ArrTime FROM mytable WHERE Distance NOT IN (204, 439) OR AirTime = 194 AND DestStateName IN ('U.S. Virgin Islands') ORDER BY AirTime LIMIT 10","hsqls":["SELECT LongestAddGTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrTime FROM mytable WHERE Distance NOT IN (204, 439) OR AirTime = 194 AND DestStateName IN ('U.S. Virgin Islands') ORDER BY AirTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivAirportSeqIDs, ArrTime FROM mytable WHERE Distance NOT IN (204, 439) OR AirTime = 194 AND DestStateName IN ('U.S. Virgin Islands') ORDER BY AirTime LIMIT 10","hsqls":["SELECT LongestAddGTime, DivAirportSeqIDs, ArrTime FROM mytable WHERE Distance NOT IN (204, 439) OR AirTime = 194 AND DestStateName IN ('U.S. Virgin Islands') ORDER BY AirTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DayofMonth BETWEEN 17 AND 22 OR UniqueCarrier <= 'HA' OR UniqueCarrier <= 'EV' LIMIT 27"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DivReachedDest >= 1 AND DayOfWeek BETWEEN 5 AND 6 ORDER BY FlightNum, DestCityMarketID, OriginStateName LIMIT 13"}
 {"sql":"SELECT \"Year\", Dest, AirlineID, SUM(WeatherDelay), MIN(Cancelled), AVG(OriginCityMarketID) FROM mytable GROUP BY \"Year\", Dest, AirlineID LIMIT 15","hsqls":["SELECT Year, Dest, AirlineID, SUM(WeatherDelay), MIN(Cancelled), AVG(OriginCityMarketID) FROM mytable GROUP BY Year, Dest, AirlineID LIMIT 15"]}
-{"sql":"SELECT TotalAddGTime FROM mytable WHERE DivActualElapsedTime NOT IN (773, 369, 258, 459, 479) AND DepDelay NOT IN (81.0, -15.0, 159.0) OR DivAirportIDs BETWEEN 14783 AND 12003 ORDER BY Dest LIMIT 18","hsqls":["SELECT TotalAddGTime FROM mytable WHERE DivActualElapsedTime NOT IN (773, 369, 258, 459, 479) AND DepDelay NOT IN (81.0, -15.0, 159.0) OR (DivAirportIDs__MV0 BETWEEN 14783 AND 12003 OR DivAirportIDs__MV1 BETWEEN 14783 AND 12003 OR DivAirportIDs__MV2 BETWEEN 14783 AND 12003 OR DivAirportIDs__MV3 BETWEEN 14783 AND 12003 OR DivAirportIDs__MV4 BETWEEN 14783 AND 12003) ORDER BY Dest LIMIT 10000"]}
-{"sql":"SELECT WheelsOn FROM mytable WHERE WeatherDelay IN (316, 14) AND \"Month\" >= 1 ORDER BY CRSArrTime LIMIT 23","hsqls":["SELECT WheelsOn FROM mytable WHERE WeatherDelay IN (316, 14) AND Month >= 1 ORDER BY CRSArrTime LIMIT 23"]}
+{"sql":"SELECT TotalAddGTime FROM mytable WHERE DivActualElapsedTime NOT IN (773, 369, 258, 459, 479) AND DepDelay NOT IN (81.0, -15.0, 159.0) OR DivAirportIDs BETWEEN 14783 AND 12003 ORDER BY Dest LIMIT 18","hsqls":["SELECT TotalAddGTime FROM mytable WHERE DivActualElapsedTime NOT IN (773, 369, 258, 459, 479) AND DepDelay NOT IN (81.0, -15.0, 159.0) OR (DivAirportIDs[1] BETWEEN 14783 AND 12003 OR DivAirportIDs[2] BETWEEN 14783 AND 12003 OR DivAirportIDs[3] BETWEEN 14783 AND 12003 OR DivAirportIDs[4] BETWEEN 14783 AND 12003 OR DivAirportIDs[5] BETWEEN 14783 AND 12003) ORDER BY Dest LIMIT 10000"]}
+{"sql":"SELECT WheelsOn FROM mytable WHERE WeatherDelay IN (316, 14) AND \"Month\" >= 1 ORDER BY CRSArrTime LIMIT 23","hsqls":["SELECT WheelsOn FROM mytable WHERE WeatherDelay IN (316, 14) AND `Month` >= 1 ORDER BY CRSArrTime LIMIT 23"]}
 {"sql":"SELECT OriginCityMarketID, TaxiIn, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 52 AND 82 AND DepTimeBlk = '1200-1259' OR ArrDelayMinutes BETWEEN 278.0 AND 222.0 GROUP BY OriginCityMarketID, TaxiIn  ORDER BY OriginCityMarketID, TaxiIn LIMIT 5","hsqls":["SELECT OriginCityMarketID, TaxiIn, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 52 AND 82 AND DepTimeBlk = '1200-1259' OR ArrDelayMinutes BETWEEN 278.0 AND 222.0 GROUP BY OriginCityMarketID, TaxiIn  ORDER BY OriginCityMarketID, TaxiIn LIMIT 5"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE OriginStateName > 'Arizona' OR DivAirportIDs BETWEEN 13232 AND 12217 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE OriginStateName > 'Arizona' OR (DivAirportIDs__MV0 BETWEEN 13232 AND 12217 OR DivAirportIDs__MV1 BETWEEN 13232 AND 12217 OR DivAirportIDs__MV2 BETWEEN 13232 AND 12217 OR DivAirportIDs__MV3 BETWEEN 13232 AND 12217 OR DivAirportIDs__MV4 BETWEEN 13232 AND 12217) LIMIT 10000"]}
-{"sql":"SELECT DestState, DaysSinceEpoch FROM mytable WHERE ArrTime IN (202, 1318, 1819) AND DivAirports BETWEEN 'SGU' AND 'GJT' LIMIT 10","hsqls":["SELECT DestState, DaysSinceEpoch FROM mytable WHERE ArrTime IN (202, 1318, 1819) AND (DivAirports__MV0 BETWEEN 'SGU' AND 'GJT' OR DivAirports__MV1 BETWEEN 'SGU' AND 'GJT' OR DivAirports__MV2 BETWEEN 'SGU' AND 'GJT' OR DivAirports__MV3 BETWEEN 'SGU' AND 'GJT' OR DivAirports__MV4 BETWEEN 'SGU' AND 'GJT') LIMIT 10000"]}
-{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE UniqueCarrier IN ('AA') OR DivAirportIDs BETWEEN 10208 AND 12173 AND OriginCityName BETWEEN 'Buffalo, NY' AND 'Bend/Redmond, OR' ORDER BY DestWac, DestState, Dest LIMIT 13","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE UniqueCarrier IN ('AA') OR (DivAirportIDs__MV0 BETWEEN 10208 AND 12173 OR DivAirportIDs__MV1 BETWEEN 10208 AND 12173 OR DivAirportIDs__MV2 BETWEEN 10208 AND 12173 OR DivAirportIDs__MV3 BETWEEN 10208 AND 12173 OR DivAirportIDs__MV4 BETWEEN 10208 AND 12173) AND OriginCityName BETWEEN 'Buffalo, NY' AND 'Bend/Redmond, OR' ORDER BY DestWac, DestState, Dest LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE OriginStateName > 'Arizona' OR DivAirportIDs BETWEEN 13232 AND 12217 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE OriginStateName > 'Arizona' OR (DivAirportIDs[1] BETWEEN 13232 AND 12217 OR DivAirportIDs[2] BETWEEN 13232 AND 12217 OR DivAirportIDs[3] BETWEEN 13232 AND 12217 OR DivAirportIDs[4] BETWEEN 13232 AND 12217 OR DivAirportIDs[5] BETWEEN 13232 AND 12217) LIMIT 10000"]}
+{"sql":"SELECT DestState, DaysSinceEpoch FROM mytable WHERE ArrTime IN (202, 1318, 1819) AND DivAirports BETWEEN 'SGU' AND 'GJT' LIMIT 10","hsqls":["SELECT DestState, DaysSinceEpoch FROM mytable WHERE ArrTime IN (202, 1318, 1819) AND (DivAirports[1] BETWEEN 'SGU' AND 'GJT' OR DivAirports[2] BETWEEN 'SGU' AND 'GJT' OR DivAirports[3] BETWEEN 'SGU' AND 'GJT' OR DivAirports[4] BETWEEN 'SGU' AND 'GJT' OR DivAirports[5] BETWEEN 'SGU' AND 'GJT') LIMIT 10000"]}
+{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE UniqueCarrier IN ('AA') OR DivAirportIDs BETWEEN 10208 AND 12173 AND OriginCityName BETWEEN 'Buffalo, NY' AND 'Bend/Redmond, OR' ORDER BY DestWac, DestState, Dest LIMIT 13","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE UniqueCarrier IN ('AA') OR (DivAirportIDs[1] BETWEEN 10208 AND 12173 OR DivAirportIDs[2] BETWEEN 10208 AND 12173 OR DivAirportIDs[3] BETWEEN 10208 AND 12173 OR DivAirportIDs[4] BETWEEN 10208 AND 12173 OR DivAirportIDs[5] BETWEEN 10208 AND 12173) AND OriginCityName BETWEEN 'Buffalo, NY' AND 'Bend/Redmond, OR' ORDER BY DestWac, DestState, Dest LIMIT 10000"]}
 {"sql":"SELECT SUM(DivActualElapsedTime) FROM mytable WHERE Flights IN (1) LIMIT 8"}
 {"sql":"SELECT AVG(DepDelay) FROM mytable WHERE OriginState IN ('DE', 'CT') LIMIT 4"}
 {"sql":"SELECT DestAirportID FROM mytable WHERE DivArrDelay BETWEEN 107 AND 81 AND OriginWac BETWEEN 33 AND 41 ORDER BY ArrDelay LIMIT 2"}
 {"sql":"SELECT DestAirportSeqID, DepTimeBlk, AirlineID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1233904 AND 1066602 OR SecurityDelay BETWEEN 1 AND 0 GROUP BY DestAirportSeqID, DepTimeBlk, AirlineID  ORDER BY DestAirportSeqID, DepTimeBlk, AirlineID LIMIT 10","hsqls":["SELECT DestAirportSeqID, DepTimeBlk, AirlineID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1233904 AND 1066602 OR SecurityDelay BETWEEN 1 AND 0 GROUP BY DestAirportSeqID, DepTimeBlk, AirlineID  ORDER BY DestAirportSeqID, DepTimeBlk, AirlineID LIMIT 10"]}
-{"sql":"SELECT Dest, DepTimeBlk FROM mytable WHERE CancellationCode IN ('A', 'B') OR LateAircraftDelay IN (48, 11, 89) OR DivTailNums <= 'N8602F' ORDER BY UniqueCarrier, DivActualElapsedTime, DayOfWeek LIMIT 1","hsqls":["SELECT Dest, DepTimeBlk FROM mytable WHERE CancellationCode IN ('A', 'B') OR LateAircraftDelay IN (48, 11, 89) OR (DivTailNums__MV0 <= 'N8602F' OR DivTailNums__MV1 <= 'N8602F' OR DivTailNums__MV2 <= 'N8602F' OR DivTailNums__MV3 <= 'N8602F' OR DivTailNums__MV4 <= 'N8602F') ORDER BY UniqueCarrier, DivActualElapsedTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT Dest, DepTimeBlk FROM mytable WHERE CancellationCode IN ('A', 'B') OR LateAircraftDelay IN (48, 11, 89) OR DivTailNums <= 'N8602F' ORDER BY UniqueCarrier, DivActualElapsedTime, DayOfWeek LIMIT 1","hsqls":["SELECT Dest, DepTimeBlk FROM mytable WHERE CancellationCode IN ('A', 'B') OR LateAircraftDelay IN (48, 11, 89) OR (DivTailNums[1] <= 'N8602F' OR DivTailNums[2] <= 'N8602F' OR DivTailNums[3] <= 'N8602F' OR DivTailNums[4] <= 'N8602F' OR DivTailNums[5] <= 'N8602F') ORDER BY UniqueCarrier, DivActualElapsedTime, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, ArrDelayMinutes, ArrivalDelayGroups, COUNT(Quarter) FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 OR DestCityMarketID IN (30647, 34520, 30792) GROUP BY CarrierDelay, ArrDelayMinutes, ArrivalDelayGroups  ORDER BY CarrierDelay, ArrDelayMinutes, ArrivalDelayGroups LIMIT 12","hsqls":["SELECT CarrierDelay, ArrDelayMinutes, ArrivalDelayGroups, COUNT(Quarter) FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 OR DestCityMarketID IN (30647, 34520, 30792) GROUP BY CarrierDelay, ArrDelayMinutes, ArrivalDelayGroups  ORDER BY CarrierDelay, ArrDelayMinutes, ArrivalDelayGroups LIMIT 12"]}
 {"sql":"SELECT MIN(DivArrDelay), COUNT(DestCityName) FROM mytable WHERE DestStateName >= 'Utah' OR DivAirportLandings BETWEEN 0 AND 2 LIMIT 20"}
 {"sql":"SELECT DestState, AVG(OriginAirportSeqID), MAX(DivAirportLandings), AVG(DepartureDelayGroups) FROM mytable WHERE DestAirportSeqID > 1410702 OR DestAirportSeqID IN (1426202, 1150303, 1302402, 1111102) OR OriginAirportSeqID BETWEEN 1298202 AND 1504102 GROUP BY DestState  ORDER BY DestState LIMIT 22","hsqls":["SELECT DestState, AVG(OriginAirportSeqID), MAX(DivAirportLandings), AVG(DepartureDelayGroups) FROM mytable WHERE DestAirportSeqID > 1410702 OR DestAirportSeqID IN (1426202, 1150303, 1302402, 1111102) OR OriginAirportSeqID BETWEEN 1298202 AND 1504102 GROUP BY DestState  ORDER BY DestState LIMIT 22"]}
 {"sql":"SELECT MIN(DivReachedDest) FROM mytable LIMIT 15"}
 {"sql":"SELECT DivActualElapsedTime, AVG(Flights) FROM mytable WHERE DepartureDelayGroups >= 12 AND DivArrDelay <> 74 AND OriginStateName NOT IN ('Wyoming', 'Minnesota', 'West Virginia', 'Arizona', 'Nebraska') GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 18","hsqls":["SELECT DivActualElapsedTime, AVG(Flights) FROM mytable WHERE DepartureDelayGroups >= 12 AND DivArrDelay <> 74 AND OriginStateName NOT IN ('Wyoming', 'Minnesota', 'West Virginia', 'Arizona', 'Nebraska') GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 18"]}
-{"sql":"SELECT DivWheelsOns, DivTailNums, ArrDelay FROM mytable WHERE DestWac <> 2 OR DepTime BETWEEN 623 AND 1026 ORDER BY CRSDepTime, DayOfWeek LIMIT 2","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, ArrDelay FROM mytable WHERE DestWac <> 2 OR DepTime BETWEEN 623 AND 1026 ORDER BY CRSDepTime, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT TailNum, \"Month\", COUNT(*) FROM mytable WHERE DivArrDelay NOT IN (753, 148, 284) AND DivReachedDest IN (0, -9999) AND \"Month\" <> 1 GROUP BY TailNum, \"Month\"","hsqls":["SELECT TailNum, Month, COUNT(*) FROM mytable WHERE DivArrDelay NOT IN (753, 148, 284) AND DivReachedDest IN (0, -9999) AND Month <> 1 GROUP BY TailNum, Month"]}
+{"sql":"SELECT DivWheelsOns, DivTailNums, ArrDelay FROM mytable WHERE DestWac <> 2 OR DepTime BETWEEN 623 AND 1026 ORDER BY CRSDepTime, DayOfWeek LIMIT 2","hsqls":["SELECT DivWheelsOns, DivTailNums, ArrDelay FROM mytable WHERE DestWac <> 2 OR DepTime BETWEEN 623 AND 1026 ORDER BY CRSDepTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT TailNum, \"Month\", COUNT(*) FROM mytable WHERE DivArrDelay NOT IN (753, 148, 284) AND DivReachedDest IN (0, -9999) AND \"Month\" <> 1 GROUP BY TailNum, \"Month\"","hsqls":["SELECT TailNum, Month, COUNT(*) FROM mytable WHERE DivArrDelay NOT IN (753, 148, 284) AND DivReachedDest IN (0, -9999) AND `Month` <> 1 GROUP BY TailNum, Month"]}
 {"sql":"SELECT Quarter, AirTime FROM mytable WHERE AirlineID IN (19805) AND Flights <> 1 ORDER BY UniqueCarrier LIMIT 20"}
 {"sql":"SELECT OriginWac, COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 2","hsqls":["SELECT OriginWac, COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 2"]}
 {"sql":"SELECT LateAircraftDelay, DestAirportSeqID, CRSElapsedTime, SUM(DistanceGroup) FROM mytable WHERE NASDelay BETWEEN 133 AND 12 AND DepTimeBlk BETWEEN '1600-1659' AND '1400-1459' GROUP BY LateAircraftDelay, DestAirportSeqID, CRSElapsedTime  ORDER BY LateAircraftDelay, DestAirportSeqID, CRSElapsedTime LIMIT 13","hsqls":["SELECT LateAircraftDelay, DestAirportSeqID, CRSElapsedTime, SUM(DistanceGroup) FROM mytable WHERE NASDelay BETWEEN 133 AND 12 AND DepTimeBlk BETWEEN '1600-1659' AND '1400-1459' GROUP BY LateAircraftDelay, DestAirportSeqID, CRSElapsedTime  ORDER BY LateAircraftDelay, DestAirportSeqID, CRSElapsedTime LIMIT 13"]}
 {"sql":"SELECT DayofMonth, DestCityMarketID, AVG(DistanceGroup), MAX(ArrTime) FROM mytable WHERE DestStateName BETWEEN 'Ohio' AND 'Wisconsin' OR FlightDate IN ('2014-01-04', '2014-01-27', '2014-01-22', '2014-01-25') GROUP BY DayofMonth, DestCityMarketID","hsqls":["SELECT DayofMonth, DestCityMarketID, AVG(DistanceGroup), MAX(ArrTime) FROM mytable WHERE DestStateName BETWEEN 'Ohio' AND 'Wisconsin' OR FlightDate IN ('2014-01-04', '2014-01-27', '2014-01-22', '2014-01-25') GROUP BY DayofMonth, DestCityMarketID"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE WheelsOff <= 2322 OR CancellationCode NOT IN ('C', 'noodles') LIMIT 17"}
-{"sql":"SELECT SecurityDelay, OriginWac, ArrDelay FROM mytable ORDER BY DestAirportSeqID, DestCityMarketID, \"Month\" LIMIT 7","hsqls":["SELECT SecurityDelay, OriginWac, ArrDelay FROM mytable ORDER BY DestAirportSeqID, DestCityMarketID, Month LIMIT 7"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE AirTime < 36 OR TotalAddGTime NOT IN (24, 54) ORDER BY ArrTime, DepTimeBlk LIMIT 6","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE AirTime < 36 OR TotalAddGTime NOT IN (24, 54) ORDER BY ArrTime, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, OriginWac, ArrDelay FROM mytable ORDER BY DestAirportSeqID, DestCityMarketID, \"Month\" LIMIT 7","hsqls":["SELECT SecurityDelay, OriginWac, ArrDelay FROM mytable ORDER BY DestAirportSeqID, DestCityMarketID, `Month` LIMIT 7"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE AirTime < 36 OR TotalAddGTime NOT IN (24, 54) ORDER BY ArrTime, DepTimeBlk LIMIT 6","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE AirTime < 36 OR TotalAddGTime NOT IN (24, 54) ORDER BY ArrTime, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT MAX(TotalAddGTime), SUM(OriginWac), COUNT(ArrDel15) FROM mytable WHERE DestCityName <= 'Ketchikan, AK' OR OriginWac BETWEEN 62 AND 34 AND OriginWac IN (91, 15, 73) LIMIT 26"}
-{"sql":"SELECT ActualElapsedTime FROM mytable WHERE \"Month\" IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE Month IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11"]}
-{"sql":"SELECT DepDelay, OriginCityMarketID, DayofMonth, COUNT(ArrDelayMinutes), AVG(Flights) FROM mytable WHERE \"Year\" NOT IN (2014) OR DivTotalGTimes IN (50) GROUP BY DepDelay, OriginCityMarketID, DayofMonth LIMIT 25","hsqls":["SELECT DepDelay, OriginCityMarketID, DayofMonth, COUNT(ArrDelayMinutes), AVG(Flights) FROM mytable WHERE Year NOT IN (2014) OR (DivTotalGTimes__MV0 IN (50) OR DivTotalGTimes__MV1 IN (50) OR DivTotalGTimes__MV2 IN (50) OR DivTotalGTimes__MV3 IN (50) OR DivTotalGTimes__MV4 IN (50)) GROUP BY DepDelay, OriginCityMarketID, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime FROM mytable WHERE \"Month\" IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE `Month` IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11"]}
+{"sql":"SELECT DepDelay, OriginCityMarketID, DayofMonth, COUNT(ArrDelayMinutes), AVG(Flights) FROM mytable WHERE \"Year\" NOT IN (2014) OR DivTotalGTimes IN (50) GROUP BY DepDelay, OriginCityMarketID, DayofMonth LIMIT 25","hsqls":["SELECT DepDelay, OriginCityMarketID, DayofMonth, COUNT(ArrDelayMinutes), AVG(Flights) FROM mytable WHERE `Year` NOT IN (2014) OR (DivTotalGTimes[1] IN (50) OR DivTotalGTimes[2] IN (50) OR DivTotalGTimes[3] IN (50) OR DivTotalGTimes[4] IN (50) OR DivTotalGTimes[5] IN (50)) GROUP BY DepDelay, OriginCityMarketID, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT Cancelled, CancellationCode, COUNT(Quarter) FROM mytable GROUP BY Cancelled, CancellationCode  ORDER BY Cancelled, CancellationCode LIMIT 29","hsqls":["SELECT Cancelled, CancellationCode, COUNT(Quarter) FROM mytable GROUP BY Cancelled, CancellationCode  ORDER BY Cancelled, CancellationCode LIMIT 29"]}
 {"sql":"SELECT FlightNum, DivActualElapsedTime FROM mytable WHERE FlightNum <> 359 ORDER BY WeatherDelay, DaysSinceEpoch LIMIT 22"}
-{"sql":"SELECT DestState, CancellationCode, MAX(DaysSinceEpoch), COUNT(LongestAddGTime), SUM(DestCityMarketID) FROM mytable WHERE DivWheelsOns = 1017 OR LateAircraftDelay BETWEEN 57 AND 103 GROUP BY DestState, CancellationCode LIMIT 6","hsqls":["SELECT DestState, CancellationCode, MAX(DaysSinceEpoch), COUNT(LongestAddGTime), SUM(DestCityMarketID) FROM mytable WHERE (DivWheelsOns__MV0 = 1017 OR DivWheelsOns__MV1 = 1017 OR DivWheelsOns__MV2 = 1017 OR DivWheelsOns__MV3 = 1017 OR DivWheelsOns__MV4 = 1017) OR LateAircraftDelay BETWEEN 57 AND 103 GROUP BY DestState, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DestState, CancellationCode, MAX(DaysSinceEpoch), COUNT(LongestAddGTime), SUM(DestCityMarketID) FROM mytable WHERE DivWheelsOns = 1017 OR LateAircraftDelay BETWEEN 57 AND 103 GROUP BY DestState, CancellationCode LIMIT 6","hsqls":["SELECT DestState, CancellationCode, MAX(DaysSinceEpoch), COUNT(LongestAddGTime), SUM(DestCityMarketID) FROM mytable WHERE (DivWheelsOns[1] = 1017 OR DivWheelsOns[2] = 1017 OR DivWheelsOns[3] = 1017 OR DivWheelsOns[4] = 1017 OR DivWheelsOns[5] = 1017) OR LateAircraftDelay BETWEEN 57 AND 103 GROUP BY DestState, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE AirTime < 309 GROUP BY DivArrDelay, ArrivalDelayGroups  ORDER BY DivArrDelay, ArrivalDelayGroups LIMIT 17","hsqls":["SELECT DivArrDelay, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE AirTime < 309 GROUP BY DivArrDelay, ArrivalDelayGroups  ORDER BY DivArrDelay, ArrivalDelayGroups LIMIT 17"]}
-{"sql":"SELECT SUM(\"Year\"), COUNT(ArrTime) FROM mytable WHERE OriginCityMarketID NOT IN (32457, 33795, 33495, 31049) OR DestWac BETWEEN 65 AND 87 OR OriginState NOT IN ('ND', 'CO') LIMIT 29","hsqls":["SELECT SUM(Year), COUNT(ArrTime) FROM mytable WHERE OriginCityMarketID NOT IN (32457, 33795, 33495, 31049) OR DestWac BETWEEN 65 AND 87 OR OriginState NOT IN ('ND', 'CO') LIMIT 29"]}
+{"sql":"SELECT SUM(\"Year\"), COUNT(ArrTime) FROM mytable WHERE OriginCityMarketID NOT IN (32457, 33795, 33495, 31049) OR DestWac BETWEEN 65 AND 87 OR OriginState NOT IN ('ND', 'CO') LIMIT 29","hsqls":["SELECT SUM(`Year`), COUNT(ArrTime) FROM mytable WHERE OriginCityMarketID NOT IN (32457, 33795, 33495, 31049) OR DestWac BETWEEN 65 AND 87 OR OriginState NOT IN ('ND', 'CO') LIMIT 29"]}
 {"sql":"SELECT DivArrDelay, AVG(CRSElapsedTime), COUNT(OriginState), SUM(DestCityMarketID) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 25","hsqls":["SELECT DivArrDelay, AVG(CRSElapsedTime), COUNT(OriginState), SUM(DestCityMarketID) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 25"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE WheelsOff < 2056 AND DepTimeBlk <= '2000-2059' ORDER BY DestStateName LIMIT 24"}
 {"sql":"SELECT DepDelayMinutes, MIN(DayofMonth), MIN(OriginCityMarketID) FROM mytable WHERE DepTimeBlk >= '1700-1759' GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 9","hsqls":["SELECT DepDelayMinutes, MIN(DayofMonth), MIN(OriginCityMarketID) FROM mytable WHERE DepTimeBlk >= '1700-1759' GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 9"]}
 {"sql":"SELECT DestStateFips, ArrTimeBlk, MIN(FlightNum), SUM(CRSDepTime), SUM(TaxiIn) FROM mytable WHERE DepDel15 BETWEEN 0 AND 0 GROUP BY DestStateFips, ArrTimeBlk","hsqls":["SELECT DestStateFips, ArrTimeBlk, MIN(FlightNum), SUM(CRSDepTime), SUM(TaxiIn) FROM mytable WHERE DepDel15 BETWEEN 0 AND 0 GROUP BY DestStateFips, ArrTimeBlk"]}
-{"sql":"SELECT FlightDate, CancellationCode, MAX(DepartureDelayGroups), MAX(OriginAirportID), COUNT(WeatherDelay) FROM mytable WHERE DayOfWeek NOT IN (3, 2, 5) OR DivAirports BETWEEN 'SJU' AND 'MSO' AND DestCityMarketID <= 32457 GROUP BY FlightDate, CancellationCode LIMIT 21","hsqls":["SELECT FlightDate, CancellationCode, MAX(DepartureDelayGroups), MAX(OriginAirportID), COUNT(WeatherDelay) FROM mytable WHERE DayOfWeek NOT IN (3, 2, 5) OR (DivAirports__MV0 BETWEEN 'SJU' AND 'MSO' OR DivAirports__MV1 BETWEEN 'SJU' AND 'MSO' OR DivAirports__MV2 BETWEEN 'SJU' AND 'MSO' OR DivAirports__MV3 BETWEEN 'SJU' AND 'MSO' OR DivAirports__MV4 BETWEEN 'SJU' AND 'MSO') AND DestCityMarketID <= 32457 GROUP BY FlightDate, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT FlightDate, CancellationCode, MAX(DepartureDelayGroups), MAX(OriginAirportID), COUNT(WeatherDelay) FROM mytable WHERE DayOfWeek NOT IN (3, 2, 5) OR DivAirports BETWEEN 'SJU' AND 'MSO' AND DestCityMarketID <= 32457 GROUP BY FlightDate, CancellationCode LIMIT 21","hsqls":["SELECT FlightDate, CancellationCode, MAX(DepartureDelayGroups), MAX(OriginAirportID), COUNT(WeatherDelay) FROM mytable WHERE DayOfWeek NOT IN (3, 2, 5) OR (DivAirports[1] BETWEEN 'SJU' AND 'MSO' OR DivAirports[2] BETWEEN 'SJU' AND 'MSO' OR DivAirports[3] BETWEEN 'SJU' AND 'MSO' OR DivAirports[4] BETWEEN 'SJU' AND 'MSO' OR DivAirports[5] BETWEEN 'SJU' AND 'MSO') AND DestCityMarketID <= 32457 GROUP BY FlightDate, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, FlightNum FROM mytable ORDER BY DestWac, OriginAirportID LIMIT 20"}
 {"sql":"SELECT DestStateName, DayofMonth, UniqueCarrier, AVG(OriginAirportSeqID), MAX(NASDelay), MAX(Diverted) FROM mytable WHERE OriginCityMarketID IN (30466, 33038) AND DivAirportLandings = 0 AND DayOfWeek BETWEEN 4 AND 6 GROUP BY DestStateName, DayofMonth, UniqueCarrier  ORDER BY DestStateName, DayofMonth, UniqueCarrier LIMIT 8","hsqls":["SELECT DestStateName, DayofMonth, UniqueCarrier, AVG(OriginAirportSeqID), MAX(NASDelay), MAX(Diverted) FROM mytable WHERE OriginCityMarketID IN (30466, 33038) AND DivAirportLandings = 0 AND DayOfWeek BETWEEN 4 AND 6 GROUP BY DestStateName, DayofMonth, UniqueCarrier  ORDER BY DestStateName, DayofMonth, UniqueCarrier LIMIT 8"]}
 {"sql":"SELECT DestCityMarketID FROM mytable WHERE ArrDelayMinutes NOT IN (171.0, 199.0, 252.0) ORDER BY Dest LIMIT 6"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 13"}
-{"sql":"SELECT AirlineID, \"Month\" FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND ArrDel15 <> 0 ORDER BY WeatherDelay, ArrDelay LIMIT 24","hsqls":["SELECT AirlineID, Month FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND ArrDel15 <> 0 ORDER BY WeatherDelay, ArrDelay LIMIT 24"]}
+{"sql":"SELECT AirlineID, \"Month\" FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND ArrDel15 <> 0 ORDER BY WeatherDelay, ArrDelay LIMIT 24","hsqls":["SELECT AirlineID, `Month` FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND ArrDel15 <> 0 ORDER BY WeatherDelay, ArrDelay LIMIT 24"]}
 {"sql":"SELECT OriginAirportSeqID, ArrTime, DestStateName, COUNT(DepDelay), AVG(TaxiOut) FROM mytable GROUP BY OriginAirportSeqID, ArrTime, DestStateName  ORDER BY OriginAirportSeqID, ArrTime, DestStateName LIMIT 28","hsqls":["SELECT OriginAirportSeqID, ArrTime, DestStateName, COUNT(DepDelay), AVG(TaxiOut) FROM mytable GROUP BY OriginAirportSeqID, ArrTime, DestStateName  ORDER BY OriginAirportSeqID, ArrTime, DestStateName LIMIT 28"]}
 {"sql":"SELECT DepDelayMinutes, CancellationCode, MIN(OriginAirportID), AVG(DaysSinceEpoch), SUM(DistanceGroup) FROM mytable WHERE ArrTimeBlk NOT IN ('0600-0659', '1800-1859') GROUP BY DepDelayMinutes, CancellationCode  ORDER BY DepDelayMinutes, CancellationCode LIMIT 2","hsqls":["SELECT DepDelayMinutes, CancellationCode, MIN(OriginAirportID), AVG(DaysSinceEpoch), SUM(DistanceGroup) FROM mytable WHERE ArrTimeBlk NOT IN ('0600-0659', '1800-1859') GROUP BY DepDelayMinutes, CancellationCode  ORDER BY DepDelayMinutes, CancellationCode LIMIT 2"]}
-{"sql":"SELECT Quarter, DepDelayMinutes, CancellationCode, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (2, 1, 0, 9) OR Diverted IN (1, 0) AND DivTotalGTimes IN (44, 57) GROUP BY Quarter, DepDelayMinutes, CancellationCode LIMIT 23","hsqls":["SELECT Quarter, DepDelayMinutes, CancellationCode, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (2, 1, 0, 9) OR Diverted IN (1, 0) AND (DivTotalGTimes__MV0 IN (44, 57) OR DivTotalGTimes__MV1 IN (44, 57) OR DivTotalGTimes__MV2 IN (44, 57) OR DivTotalGTimes__MV3 IN (44, 57) OR DivTotalGTimes__MV4 IN (44, 57)) GROUP BY Quarter, DepDelayMinutes, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT Quarter, DepDelayMinutes, CancellationCode, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (2, 1, 0, 9) OR Diverted IN (1, 0) AND DivTotalGTimes IN (44, 57) GROUP BY Quarter, DepDelayMinutes, CancellationCode LIMIT 23","hsqls":["SELECT Quarter, DepDelayMinutes, CancellationCode, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (2, 1, 0, 9) OR Diverted IN (1, 0) AND (DivTotalGTimes[1] IN (44, 57) OR DivTotalGTimes[2] IN (44, 57) OR DivTotalGTimes[3] IN (44, 57) OR DivTotalGTimes[4] IN (44, 57) OR DivTotalGTimes[5] IN (44, 57)) GROUP BY Quarter, DepDelayMinutes, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DestWac, OriginCityName, DestStateName FROM mytable WHERE DivAirportLandings IN (2, 1) AND DayOfWeek BETWEEN 4 AND 7 ORDER BY CRSArrTime LIMIT 28"}
-{"sql":"SELECT FlightNum, MIN(DaysSinceEpoch) FROM mytable WHERE DivWheelsOns IN (822) GROUP BY FlightNum LIMIT 24","hsqls":["SELECT FlightNum, MIN(DaysSinceEpoch) FROM mytable WHERE (DivWheelsOns__MV0 IN (822) OR DivWheelsOns__MV1 IN (822) OR DivWheelsOns__MV2 IN (822) OR DivWheelsOns__MV3 IN (822) OR DivWheelsOns__MV4 IN (822)) GROUP BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT FlightNum, MIN(DaysSinceEpoch) FROM mytable WHERE DivWheelsOns IN (822) GROUP BY FlightNum LIMIT 24","hsqls":["SELECT FlightNum, MIN(DaysSinceEpoch) FROM mytable WHERE (DivWheelsOns[1] IN (822) OR DivWheelsOns[2] IN (822) OR DivWheelsOns[3] IN (822) OR DivWheelsOns[4] IN (822) OR DivWheelsOns[5] IN (822)) GROUP BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DepDelay, DepDel15 FROM mytable WHERE TailNum = 'N13550' AND ArrDelayMinutes NOT IN (996.0, 84.0) AND CRSDepTime NOT IN (1655)","hsqls":["SELECT Year, DepDelay, DepDel15 FROM mytable WHERE TailNum = 'N13550' AND ArrDelayMinutes NOT IN (996.0, 84.0) AND CRSDepTime NOT IN (1655)"]}
 {"sql":"SELECT CRSArrTime, AirlineID, MIN(AirTime), MIN(DestWac), MIN(ActualElapsedTime) FROM mytable WHERE OriginStateFips NOT IN (1) GROUP BY CRSArrTime, AirlineID  ORDER BY CRSArrTime, AirlineID LIMIT 20","hsqls":["SELECT CRSArrTime, AirlineID, MIN(AirTime), MIN(DestWac), MIN(ActualElapsedTime) FROM mytable WHERE OriginStateFips NOT IN (1) GROUP BY CRSArrTime, AirlineID  ORDER BY CRSArrTime, AirlineID LIMIT 20"]}
-{"sql":"SELECT UniqueCarrier, WheelsOn, MIN(TaxiIn), MAX(DayOfWeek) FROM mytable WHERE CarrierDelay NOT IN (290) OR CRSArrTime = 1850 AND DivTotalGTimes BETWEEN 104 AND 80 GROUP BY UniqueCarrier, WheelsOn LIMIT 7","hsqls":["SELECT UniqueCarrier, WheelsOn, MIN(TaxiIn), MAX(DayOfWeek) FROM mytable WHERE CarrierDelay NOT IN (290) OR CRSArrTime = 1850 AND (DivTotalGTimes__MV0 BETWEEN 104 AND 80 OR DivTotalGTimes__MV1 BETWEEN 104 AND 80 OR DivTotalGTimes__MV2 BETWEEN 104 AND 80 OR DivTotalGTimes__MV3 BETWEEN 104 AND 80 OR DivTotalGTimes__MV4 BETWEEN 104 AND 80) GROUP BY UniqueCarrier, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier, WheelsOn, MIN(TaxiIn), MAX(DayOfWeek) FROM mytable WHERE CarrierDelay NOT IN (290) OR CRSArrTime = 1850 AND DivTotalGTimes BETWEEN 104 AND 80 GROUP BY UniqueCarrier, WheelsOn LIMIT 7","hsqls":["SELECT UniqueCarrier, WheelsOn, MIN(TaxiIn), MAX(DayOfWeek) FROM mytable WHERE CarrierDelay NOT IN (290) OR CRSArrTime = 1850 AND (DivTotalGTimes[1] BETWEEN 104 AND 80 OR DivTotalGTimes[2] BETWEEN 104 AND 80 OR DivTotalGTimes[3] BETWEEN 104 AND 80 OR DivTotalGTimes[4] BETWEEN 104 AND 80 OR DivTotalGTimes[5] BETWEEN 104 AND 80) GROUP BY UniqueCarrier, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID, MIN(CarrierDelay), SUM(Distance), MIN(FirstDepTime) FROM mytable WHERE DayofMonth <> 19 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 6","hsqls":["SELECT DestCityMarketID, MIN(CarrierDelay), SUM(Distance), MIN(FirstDepTime) FROM mytable WHERE DayofMonth <> 19 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 6"]}
-{"sql":"SELECT LongestAddGTime, ArrTimeBlk, \"Month\", COUNT(*) FROM mytable WHERE OriginStateName < 'Wyoming' AND LateAircraftDelay BETWEEN 95 AND 114 OR DestStateFips = 39 GROUP BY LongestAddGTime, ArrTimeBlk, \"Month\" LIMIT 7","hsqls":["SELECT LongestAddGTime, ArrTimeBlk, Month, COUNT(*) FROM mytable WHERE OriginStateName < 'Wyoming' AND LateAircraftDelay BETWEEN 95 AND 114 OR DestStateFips = 39 GROUP BY LongestAddGTime, ArrTimeBlk, Month LIMIT 7"]}
-{"sql":"SELECT DivAirportIDs, DayofMonth, UniqueCarrier FROM mytable ORDER BY NASDelay LIMIT 15","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DayofMonth, UniqueCarrier FROM mytable ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, ArrTimeBlk, \"Month\", COUNT(*) FROM mytable WHERE OriginStateName < 'Wyoming' AND LateAircraftDelay BETWEEN 95 AND 114 OR DestStateFips = 39 GROUP BY LongestAddGTime, ArrTimeBlk, \"Month\" LIMIT 7","hsqls":["SELECT LongestAddGTime, ArrTimeBlk, Month, COUNT(*) FROM mytable WHERE OriginStateName < 'Wyoming' AND LateAircraftDelay BETWEEN 95 AND 114 OR DestStateFips = 39 GROUP BY LongestAddGTime, ArrTimeBlk, `Month` LIMIT 7"]}
+{"sql":"SELECT DivAirportIDs, DayofMonth, UniqueCarrier FROM mytable ORDER BY NASDelay LIMIT 15","hsqls":["SELECT DivAirportIDs, DayofMonth, UniqueCarrier FROM mytable ORDER BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT Carrier, DestStateFips, DayOfWeek, MAX(OriginAirportSeqID), MIN(DivReachedDest), MIN(CarrierDelay) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 9 AND CancellationCode IN ('A', 'B', 'C', 'noodles') AND AirTime NOT IN (258) GROUP BY Carrier, DestStateFips, DayOfWeek  ORDER BY Carrier, DestStateFips, DayOfWeek LIMIT 6","hsqls":["SELECT Carrier, DestStateFips, DayOfWeek, MAX(OriginAirportSeqID), MIN(DivReachedDest), MIN(CarrierDelay) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 9 AND CancellationCode IN ('A', 'B', 'C', 'noodles') AND AirTime NOT IN (258) GROUP BY Carrier, DestStateFips, DayOfWeek  ORDER BY Carrier, DestStateFips, DayOfWeek LIMIT 6"]}
-{"sql":"SELECT CRSArrTime, TotalAddGTime FROM mytable WHERE DivAirportSeqIDs >= 1015804 AND ArrivalDelayGroups <> 2 OR TaxiIn <= 33 ORDER BY ArrivalDelayGroups LIMIT 8","hsqls":["SELECT CRSArrTime, TotalAddGTime FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1015804 OR DivAirportSeqIDs__MV1 >= 1015804 OR DivAirportSeqIDs__MV2 >= 1015804 OR DivAirportSeqIDs__MV3 >= 1015804 OR DivAirportSeqIDs__MV4 >= 1015804) AND ArrivalDelayGroups <> 2 OR TaxiIn <= 33 ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, TotalAddGTime FROM mytable WHERE DivAirportSeqIDs >= 1015804 AND ArrivalDelayGroups <> 2 OR TaxiIn <= 33 ORDER BY ArrivalDelayGroups LIMIT 8","hsqls":["SELECT CRSArrTime, TotalAddGTime FROM mytable WHERE (DivAirportSeqIDs[1] >= 1015804 OR DivAirportSeqIDs[2] >= 1015804 OR DivAirportSeqIDs[3] >= 1015804 OR DivAirportSeqIDs[4] >= 1015804 OR DivAirportSeqIDs[5] >= 1015804) AND ArrivalDelayGroups <> 2 OR TaxiIn <= 33 ORDER BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, TaxiIn, DestCityMarketID FROM mytable LIMIT 22"}
-{"sql":"SELECT OriginCityName FROM mytable WHERE DepTime < 1307 ORDER BY DestAirportID, UniqueCarrier, \"Month\" LIMIT 23","hsqls":["SELECT OriginCityName FROM mytable WHERE DepTime < 1307 ORDER BY DestAirportID, UniqueCarrier, Month LIMIT 23"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE DepTime < 1307 ORDER BY DestAirportID, UniqueCarrier, \"Month\" LIMIT 23","hsqls":["SELECT OriginCityName FROM mytable WHERE DepTime < 1307 ORDER BY DestAirportID, UniqueCarrier, `Month` LIMIT 23"]}
 {"sql":"SELECT OriginStateFips FROM mytable ORDER BY CarrierDelay, DaysSinceEpoch LIMIT 15"}
 {"sql":"SELECT WeatherDelay, MIN(TaxiIn), MAX(TaxiIn), AVG(Distance) FROM mytable WHERE NASDelay <> 15 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 3","hsqls":["SELECT WeatherDelay, MIN(TaxiIn), MAX(TaxiIn), AVG(Distance) FROM mytable WHERE NASDelay <> 15 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 3"]}
 {"sql":"SELECT DivReachedDest, LateAircraftDelay, Flights FROM mytable WHERE FlightNum < 2418 OR CarrierDelay BETWEEN 112 AND 22 OR OriginState NOT IN ('NM', 'DE', 'OR', 'AL') ORDER BY LongestAddGTime LIMIT 10"}
 {"sql":"SELECT ActualElapsedTime, DepTimeBlk FROM mytable WHERE WeatherDelay BETWEEN 23 AND 52 AND OriginStateName BETWEEN 'Oregon' AND 'Colorado' OR OriginStateName NOT IN ('Wyoming', 'Mississippi', 'Delaware', 'Massachusetts', 'Florida') ORDER BY OriginStateFips, Dest LIMIT 13"}
 {"sql":"SELECT AVG(DivActualElapsedTime) FROM mytable WHERE TailNum IN ('N442SW') AND OriginCityMarketID NOT IN (30666) LIMIT 10"}
 {"sql":"SELECT SUM(LongestAddGTime), MIN(ActualElapsedTime), COUNT(Distance) FROM mytable WHERE DestCityMarketID IN (31308, 30779) AND CancellationCode IN ('C') OR LateAircraftDelay NOT IN (123)"}
-{"sql":"SELECT MIN(Flights), SUM(CRSArrTime) FROM mytable WHERE FlightNum NOT IN (4484) AND DivAirportSeqIDs >= 1323202 AND DayOfWeek NOT IN (2, 1) LIMIT 14","hsqls":["SELECT MIN(Flights), SUM(CRSArrTime)  FROM mytable WHERE FlightNum NOT IN (4484) AND (DivAirportSeqIDs__MV0 >= 1323202 OR DivAirportSeqIDs__MV1 >= 1323202 OR DivAirportSeqIDs__MV2 >= 1323202 OR DivAirportSeqIDs__MV3 >= 1323202 OR DivAirportSeqIDs__MV4 >= 1323202) AND DayOfWeek NOT IN (2, 1) LIMIT 10000"]}
+{"sql":"SELECT MIN(Flights), SUM(CRSArrTime) FROM mytable WHERE FlightNum NOT IN (4484) AND DivAirportSeqIDs >= 1323202 AND DayOfWeek NOT IN (2, 1) LIMIT 14","hsqls":["SELECT MIN(Flights), SUM(CRSArrTime)  FROM mytable WHERE FlightNum NOT IN (4484) AND (DivAirportSeqIDs[1] >= 1323202 OR DivAirportSeqIDs[2] >= 1323202 OR DivAirportSeqIDs[3] >= 1323202 OR DivAirportSeqIDs[4] >= 1323202 OR DivAirportSeqIDs[5] >= 1323202) AND DayOfWeek NOT IN (2, 1) LIMIT 10000"]}
 {"sql":"SELECT MIN(CRSElapsedTime), AVG(DivActualElapsedTime) FROM mytable LIMIT 10"}
-{"sql":"SELECT WheelsOff, AirTime, DivTotalGTimes FROM mytable WHERE DestWac NOT IN (31, 51, 15, 54) OR LongestAddGTime IN (96) AND DivDistance NOT IN (0, 175, 40, 51, 307) ORDER BY \"Year\", LateAircraftDelay LIMIT 17","hsqls":["SELECT WheelsOff, AirTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestWac NOT IN (31, 51, 15, 54) OR LongestAddGTime IN (96) AND DivDistance NOT IN (0, 175, 40, 51, 307) ORDER BY Year, LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, AirTime, DivTotalGTimes FROM mytable WHERE DestWac NOT IN (31, 51, 15, 54) OR LongestAddGTime IN (96) AND DivDistance NOT IN (0, 175, 40, 51, 307) ORDER BY \"Year\", LateAircraftDelay LIMIT 17","hsqls":["SELECT WheelsOff, AirTime, DivTotalGTimes FROM mytable WHERE DestWac NOT IN (31, 51, 15, 54) OR LongestAddGTime IN (96) AND DivDistance NOT IN (0, 175, 40, 51, 307) ORDER BY Year, LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, OriginCityName, Origin FROM mytable WHERE ArrDel15 NOT IN (1) ORDER BY Dest"}
 {"sql":"SELECT DestAirportSeqID, ArrivalDelayGroups FROM mytable WHERE TotalAddGTime IN (47, 31, 28) ORDER BY DepDel15"}
 {"sql":"SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE DivActualElapsedTime NOT IN (387) GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 10","hsqls":["SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE DivActualElapsedTime NOT IN (387) GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 10"]}
 {"sql":"SELECT Quarter, ArrTimeBlk, COUNT(*) FROM mytable WHERE Distance BETWEEN 362 AND 1148 AND ArrTimeBlk BETWEEN '1200-1259' AND '1300-1359' GROUP BY Quarter, ArrTimeBlk  ORDER BY Quarter, ArrTimeBlk LIMIT 16","hsqls":["SELECT Quarter, ArrTimeBlk, COUNT(*) FROM mytable WHERE Distance BETWEEN 362 AND 1148 AND ArrTimeBlk BETWEEN '1200-1259' AND '1300-1359' GROUP BY Quarter, ArrTimeBlk  ORDER BY Quarter, ArrTimeBlk LIMIT 16"]}
 {"sql":"SELECT Carrier, DestAirportSeqID FROM mytable ORDER BY FlightDate LIMIT 14"}
-{"sql":"SELECT CancellationCode, SUM(\"Month\"), MIN(DestCityMarketID), SUM(OriginAirportSeqID) FROM mytable WHERE LateAircraftDelay BETWEEN 72 AND 111 GROUP BY CancellationCode LIMIT 17","hsqls":["SELECT CancellationCode, SUM(Month), MIN(DestCityMarketID), SUM(OriginAirportSeqID) FROM mytable WHERE LateAircraftDelay BETWEEN 72 AND 111 GROUP BY CancellationCode LIMIT 17"]}
+{"sql":"SELECT CancellationCode, SUM(\"Month\"), MIN(DestCityMarketID), SUM(OriginAirportSeqID) FROM mytable WHERE LateAircraftDelay BETWEEN 72 AND 111 GROUP BY CancellationCode LIMIT 17","hsqls":["SELECT CancellationCode, SUM(`Month`), MIN(DestCityMarketID), SUM(OriginAirportSeqID) FROM mytable WHERE LateAircraftDelay BETWEEN 72 AND 111 GROUP BY CancellationCode LIMIT 17"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTime BETWEEN 1352 AND 2239 AND DepTime >= 1913 AND DivReachedDest NOT IN (1, 0, -9999) LIMIT 16"}
 {"sql":"SELECT LateAircraftDelay, DepDelayMinutes, DepTime, SUM(DayofMonth), COUNT(ArrDelay), MIN(OriginCityMarketID) FROM mytable WHERE DepTime NOT IN (1146, 2021) AND DivDistance NOT IN (449, 88) AND OriginAirportID NOT IN (10561, 14543, 14698, 12003) GROUP BY LateAircraftDelay, DepDelayMinutes, DepTime  ORDER BY LateAircraftDelay, DepDelayMinutes, DepTime LIMIT 20","hsqls":["SELECT LateAircraftDelay, DepDelayMinutes, DepTime, SUM(DayofMonth), COUNT(ArrDelay), MIN(OriginCityMarketID) FROM mytable WHERE DepTime NOT IN (1146, 2021) AND DivDistance NOT IN (449, 88) AND OriginAirportID NOT IN (10561, 14543, 14698, 12003) GROUP BY LateAircraftDelay, DepDelayMinutes, DepTime  ORDER BY LateAircraftDelay, DepDelayMinutes, DepTime LIMIT 20"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) OR CRSArrTime >= 1138 LIMIT 10"}
@@ -3982,11 +3982,11 @@
 {"sql":"SELECT Distance, DestStateName, COUNT(*) FROM mytable WHERE Distance <> 622 AND Quarter IN (1) GROUP BY Distance, DestStateName  ORDER BY Distance, DestStateName LIMIT 6","hsqls":["SELECT Distance, DestStateName, COUNT(*) FROM mytable WHERE Distance <> 622 AND Quarter IN (1) GROUP BY Distance, DestStateName  ORDER BY Distance, DestStateName LIMIT 6"]}
 {"sql":"SELECT OriginCityMarketID, DepDel15, CancellationCode, COUNT(SecurityDelay), COUNT(NASDelay), COUNT(ArrivalDelayGroups) FROM mytable WHERE ArrDelay = -25.0 GROUP BY OriginCityMarketID, DepDel15, CancellationCode  ORDER BY OriginCityMarketID, DepDel15, CancellationCode LIMIT 10","hsqls":["SELECT OriginCityMarketID, DepDel15, CancellationCode, COUNT(SecurityDelay), COUNT(NASDelay), COUNT(ArrivalDelayGroups) FROM mytable WHERE ArrDelay = -25.0 GROUP BY OriginCityMarketID, DepDel15, CancellationCode  ORDER BY OriginCityMarketID, DepDel15, CancellationCode LIMIT 10"]}
 {"sql":"SELECT MAX(DivReachedDest) FROM mytable LIMIT 22"}
-{"sql":"SELECT AVG(\"Month\"), AVG(LateAircraftDelay), MAX(\"Month\") FROM mytable LIMIT 4","hsqls":["SELECT AVG(Month), AVG(LateAircraftDelay), MAX(Month) FROM mytable LIMIT 4"]}
+{"sql":"SELECT AVG(\"Month\"), AVG(LateAircraftDelay), MAX(\"Month\") FROM mytable LIMIT 4","hsqls":["SELECT AVG(`Month`), AVG(LateAircraftDelay), MAX(`Month`) FROM mytable LIMIT 4"]}
 {"sql":"SELECT DestWac, DestState FROM mytable ORDER BY OriginWac LIMIT 23"}
 {"sql":"SELECT FlightDate, DestCityName FROM mytable ORDER BY DestState, CancellationCode LIMIT 16"}
 {"sql":"SELECT DepDelayMinutes, Distance, Dest, SUM(ArrivalDelayGroups), COUNT(FlightDate) FROM mytable GROUP BY DepDelayMinutes, Distance, Dest  ORDER BY DepDelayMinutes, Distance, Dest LIMIT 21","hsqls":["SELECT DepDelayMinutes, Distance, Dest, SUM(ArrivalDelayGroups), COUNT(FlightDate) FROM mytable GROUP BY DepDelayMinutes, Distance, Dest  ORDER BY DepDelayMinutes, Distance, Dest LIMIT 21"]}
-{"sql":"SELECT DepTimeBlk, SUM(FirstDepTime), COUNT(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 2148 AND 1218 AND CarrierDelay <> 30 AND OriginWac BETWEEN 12 AND 13 GROUP BY DepTimeBlk LIMIT 17","hsqls":["SELECT DepTimeBlk, SUM(FirstDepTime), COUNT(DestWac) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 2148 AND 1218 OR DivWheelsOns__MV1 BETWEEN 2148 AND 1218 OR DivWheelsOns__MV2 BETWEEN 2148 AND 1218 OR DivWheelsOns__MV3 BETWEEN 2148 AND 1218 OR DivWheelsOns__MV4 BETWEEN 2148 AND 1218) AND CarrierDelay <> 30 AND OriginWac BETWEEN 12 AND 13 GROUP BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, SUM(FirstDepTime), COUNT(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 2148 AND 1218 AND CarrierDelay <> 30 AND OriginWac BETWEEN 12 AND 13 GROUP BY DepTimeBlk LIMIT 17","hsqls":["SELECT DepTimeBlk, SUM(FirstDepTime), COUNT(DestWac) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 2148 AND 1218 OR DivWheelsOns[2] BETWEEN 2148 AND 1218 OR DivWheelsOns[3] BETWEEN 2148 AND 1218 OR DivWheelsOns[4] BETWEEN 2148 AND 1218 OR DivWheelsOns[5] BETWEEN 2148 AND 1218) AND CarrierDelay <> 30 AND OriginWac BETWEEN 12 AND 13 GROUP BY DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Cancelled, TailNum, MAX(DepDelayMinutes), COUNT(DestStateFips) FROM mytable WHERE DaysSinceEpoch = 16094 GROUP BY Cancelled, TailNum  ORDER BY Cancelled, TailNum LIMIT 10","hsqls":["SELECT Cancelled, TailNum, MAX(DepDelayMinutes), COUNT(DestStateFips) FROM mytable WHERE DaysSinceEpoch = 16094 GROUP BY Cancelled, TailNum  ORDER BY Cancelled, TailNum LIMIT 10"]}
 {"sql":"SELECT MIN(DepTime), MAX(DayofMonth) FROM mytable WHERE TailNum IN ('N709EV', 'N963DN', 'N656JB', 'N12900') AND DepTimeBlk = '0800-0859' LIMIT 20"}
 {"sql":"SELECT AVG(DivReachedDest), COUNT(TaxiIn) FROM mytable LIMIT 29"}
@@ -3997,11 +3997,11 @@
 {"sql":"SELECT SUM(SecurityDelay) FROM mytable WHERE DepDelay BETWEEN -9.0 AND 235.0 LIMIT 9"}
 {"sql":"SELECT \"Year\", UniqueCarrier, AVG(ArrTime), COUNT(DestWac) FROM mytable WHERE Carrier BETWEEN 'US' AND 'F9' GROUP BY \"Year\", UniqueCarrier LIMIT 15","hsqls":["SELECT Year, UniqueCarrier, AVG(ArrTime), COUNT(DestWac) FROM mytable WHERE Carrier BETWEEN 'US' AND 'F9' GROUP BY Year, UniqueCarrier LIMIT 15"]}
 {"sql":"SELECT DestStateFips, ArrDel15, Dest, COUNT(*) FROM mytable WHERE DestStateName NOT IN ('Louisiana', 'Montana') GROUP BY DestStateFips, ArrDel15, Dest  ORDER BY DestStateFips, ArrDel15, Dest LIMIT 10","hsqls":["SELECT DestStateFips, ArrDel15, Dest, COUNT(*) FROM mytable WHERE DestStateName NOT IN ('Louisiana', 'Montana') GROUP BY DestStateFips, ArrDel15, Dest  ORDER BY DestStateFips, ArrDel15, Dest LIMIT 10"]}
-{"sql":"SELECT DepDel15, \"Month\" FROM mytable WHERE FirstDepTime BETWEEN 2110 AND 2041 AND DepTime >= 2142 LIMIT 6","hsqls":["SELECT DepDel15, Month FROM mytable WHERE FirstDepTime BETWEEN 2110 AND 2041 AND DepTime >= 2142 LIMIT 6"]}
+{"sql":"SELECT DepDel15, \"Month\" FROM mytable WHERE FirstDepTime BETWEEN 2110 AND 2041 AND DepTime >= 2142 LIMIT 6","hsqls":["SELECT DepDel15, `Month` FROM mytable WHERE FirstDepTime BETWEEN 2110 AND 2041 AND DepTime >= 2142 LIMIT 6"]}
 {"sql":"SELECT COUNT(Flights), MAX(Diverted), MIN(OriginCityMarketID) FROM mytable WHERE DestCityMarketID BETWEEN 33792 AND 32335 AND Dest IN ('SAF') OR DepTimeBlk IN ('1600-1659', '1700-1759', '2200-2259', '1400-1459') LIMIT 10"}
 {"sql":"SELECT TotalAddGTime, Dest, DayofMonth, MIN(OriginAirportSeqID), COUNT(DayofMonth), MAX(DivActualElapsedTime) FROM mytable WHERE CRSElapsedTime NOT IN (95, 106, 177, 80, 320) AND TotalAddGTime IN (20, 97, 47, 41, 4) GROUP BY TotalAddGTime, Dest, DayofMonth  ORDER BY TotalAddGTime, Dest, DayofMonth LIMIT 12","hsqls":["SELECT TotalAddGTime, Dest, DayofMonth, MIN(OriginAirportSeqID), COUNT(DayofMonth), MAX(DivActualElapsedTime) FROM mytable WHERE CRSElapsedTime NOT IN (95, 106, 177, 80, 320) AND TotalAddGTime IN (20, 97, 47, 41, 4) GROUP BY TotalAddGTime, Dest, DayofMonth  ORDER BY TotalAddGTime, Dest, DayofMonth LIMIT 12"]}
 {"sql":"SELECT TaxiIn, COUNT(OriginCityMarketID), SUM(DivActualElapsedTime) FROM mytable WHERE DepartureDelayGroups IN (6, 9) OR CRSElapsedTime BETWEEN 97 AND 491 OR WheelsOn IN (1146, 1711) GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 8","hsqls":["SELECT TaxiIn, COUNT(OriginCityMarketID), SUM(DivActualElapsedTime) FROM mytable WHERE DepartureDelayGroups IN (6, 9) OR CRSElapsedTime BETWEEN 97 AND 491 OR WheelsOn IN (1146, 1711) GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 8"]}
-{"sql":"SELECT OriginStateFips, TaxiIn FROM mytable WHERE Quarter NOT IN (1) OR DivAirportSeqIDs > 1498603 OR DivAirportSeqIDs IN (1449202) ORDER BY ArrTimeBlk, CRSDepTime LIMIT 5","hsqls":["SELECT OriginStateFips, TaxiIn FROM mytable WHERE Quarter NOT IN (1) OR (DivAirportSeqIDs__MV0 > 1498603 OR DivAirportSeqIDs__MV1 > 1498603 OR DivAirportSeqIDs__MV2 > 1498603 OR DivAirportSeqIDs__MV3 > 1498603 OR DivAirportSeqIDs__MV4 > 1498603) OR (DivAirportSeqIDs__MV0 IN (1449202) OR DivAirportSeqIDs__MV1 IN (1449202) OR DivAirportSeqIDs__MV2 IN (1449202) OR DivAirportSeqIDs__MV3 IN (1449202) OR DivAirportSeqIDs__MV4 IN (1449202)) ORDER BY ArrTimeBlk, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, TaxiIn FROM mytable WHERE Quarter NOT IN (1) OR DivAirportSeqIDs > 1498603 OR DivAirportSeqIDs IN (1449202) ORDER BY ArrTimeBlk, CRSDepTime LIMIT 5","hsqls":["SELECT OriginStateFips, TaxiIn FROM mytable WHERE Quarter NOT IN (1) OR (DivAirportSeqIDs[1] > 1498603 OR DivAirportSeqIDs[2] > 1498603 OR DivAirportSeqIDs[3] > 1498603 OR DivAirportSeqIDs[4] > 1498603 OR DivAirportSeqIDs[5] > 1498603) OR (DivAirportSeqIDs[1] IN (1449202) OR DivAirportSeqIDs[2] IN (1449202) OR DivAirportSeqIDs[3] IN (1449202) OR DivAirportSeqIDs[4] IN (1449202) OR DivAirportSeqIDs[5] IN (1449202)) ORDER BY ArrTimeBlk, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DepDel15, DivArrDelay, AVG(CarrierDelay) FROM mytable WHERE OriginCityName <> 'Dothan, AL' GROUP BY DepDel15, DivArrDelay  ORDER BY DepDel15, DivArrDelay LIMIT 20","hsqls":["SELECT DepDel15, DivArrDelay, AVG(CarrierDelay) FROM mytable WHERE OriginCityName <> 'Dothan, AL' GROUP BY DepDel15, DivArrDelay  ORDER BY DepDel15, DivArrDelay LIMIT 20"]}
 {"sql":"SELECT ArrTimeBlk, Dest, COUNT(*) FROM mytable WHERE OriginAirportSeqID <= 1524903 AND Cancelled >= 1 GROUP BY ArrTimeBlk, Dest  ORDER BY ArrTimeBlk, Dest LIMIT 14","hsqls":["SELECT ArrTimeBlk, Dest, COUNT(*) FROM mytable WHERE OriginAirportSeqID <= 1524903 AND Cancelled >= 1 GROUP BY ArrTimeBlk, Dest  ORDER BY ArrTimeBlk, Dest LIMIT 14"]}
 {"sql":"SELECT DivReachedDest, ArrDelayMinutes, COUNT(DayOfWeek), COUNT(DivDistance), AVG(CRSArrTime) FROM mytable GROUP BY DivReachedDest, ArrDelayMinutes  ORDER BY DivReachedDest, ArrDelayMinutes LIMIT 24","hsqls":["SELECT DivReachedDest, ArrDelayMinutes, COUNT(DayOfWeek), COUNT(DivDistance), AVG(CRSArrTime) FROM mytable GROUP BY DivReachedDest, ArrDelayMinutes  ORDER BY DivReachedDest, ArrDelayMinutes LIMIT 24"]}
@@ -4010,28 +4010,28 @@
 {"sql":"SELECT DivReachedDest, Diverted, DepDelayMinutes, COUNT(*) FROM mytable WHERE WeatherDelay = 55 OR Dest BETWEEN 'SYR' AND 'ABQ' GROUP BY DivReachedDest, Diverted, DepDelayMinutes  ORDER BY DivReachedDest, Diverted, DepDelayMinutes LIMIT 15","hsqls":["SELECT DivReachedDest, Diverted, DepDelayMinutes, COUNT(*) FROM mytable WHERE WeatherDelay = 55 OR Dest BETWEEN 'SYR' AND 'ABQ' GROUP BY DivReachedDest, Diverted, DepDelayMinutes  ORDER BY DivReachedDest, Diverted, DepDelayMinutes LIMIT 15"]}
 {"sql":"SELECT MAX(DivReachedDest), AVG(OriginStateFips), MIN(OriginCityMarketID) FROM mytable WHERE DayofMonth > 30 OR DistanceGroup BETWEEN 7 AND 6 LIMIT 9"}
 {"sql":"SELECT OriginAirportSeqID, DestState, SUM(ActualElapsedTime), MIN(TaxiIn) FROM mytable WHERE CancellationCode IN ('A', 'C') AND DestStateFips IN (20, 42, 50) AND Dest BETWEEN 'CHA' AND 'TUL' GROUP BY OriginAirportSeqID, DestState  ORDER BY OriginAirportSeqID, DestState LIMIT 18","hsqls":["SELECT OriginAirportSeqID, DestState, SUM(ActualElapsedTime), MIN(TaxiIn) FROM mytable WHERE CancellationCode IN ('A', 'C') AND DestStateFips IN (20, 42, 50) AND Dest BETWEEN 'CHA' AND 'TUL' GROUP BY OriginAirportSeqID, DestState  ORDER BY OriginAirportSeqID, DestState LIMIT 18"]}
-{"sql":"SELECT CarrierDelay, DestCityName, MIN(WheelsOn), MIN(DistanceGroup), MIN(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 32134 AND DivAirportSeqIDs BETWEEN 1227802 AND 1348602 GROUP BY CarrierDelay, DestCityName LIMIT 2","hsqls":["SELECT CarrierDelay, DestCityName, MIN(WheelsOn), MIN(DistanceGroup), MIN(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 32134 AND (DivAirportSeqIDs__MV0 BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs__MV1 BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs__MV2 BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs__MV3 BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs__MV4 BETWEEN 1227802 AND 1348602) GROUP BY CarrierDelay, DestCityName LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DestCityName, MIN(WheelsOn), MIN(DistanceGroup), MIN(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 32134 AND DivAirportSeqIDs BETWEEN 1227802 AND 1348602 GROUP BY CarrierDelay, DestCityName LIMIT 2","hsqls":["SELECT CarrierDelay, DestCityName, MIN(WheelsOn), MIN(DistanceGroup), MIN(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID <= 32134 AND (DivAirportSeqIDs[1] BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs[2] BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs[3] BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs[4] BETWEEN 1227802 AND 1348602 OR DivAirportSeqIDs[5] BETWEEN 1227802 AND 1348602) GROUP BY CarrierDelay, DestCityName LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DepDelayMinutes FROM mytable WHERE DivArrDelay BETWEEN 165 AND 163 AND Carrier BETWEEN 'OO' AND 'F9' OR OriginStateName >= 'Louisiana' ORDER BY DestWac, WheelsOn"}
 {"sql":"SELECT DestWac, ArrDelay FROM mytable WHERE UniqueCarrier >= 'AS' OR CRSElapsedTime > 215 AND OriginAirportSeqID NOT IN (1106702, 1201602) ORDER BY Diverted LIMIT 27"}
 {"sql":"SELECT MIN(DivDistance), AVG(WheelsOff), MIN(ArrivalDelayGroups) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 OR FirstDepTime BETWEEN 726 AND 1018 LIMIT 5"}
 {"sql":"SELECT FlightNum, TotalAddGTime FROM mytable WHERE DepDelay BETWEEN 229.0 AND 254.0 OR DestAirportSeqID >= 1400602 AND CancellationCode IN ('A', 'noodles') ORDER BY DestCityName LIMIT 17"}
-{"sql":"SELECT Quarter, DivTailNums, UniqueCarrier FROM mytable WHERE Carrier IN ('EV', 'B6', 'AA', 'VX') AND OriginAirportID < 11996 AND CRSArrTime IN (1225, 1303) LIMIT 25","hsqls":["SELECT Quarter, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, UniqueCarrier FROM mytable WHERE Carrier IN ('EV', 'B6', 'AA', 'VX') AND OriginAirportID < 11996 AND CRSArrTime IN (1225, 1303) LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup FROM mytable WHERE Carrier < 'B6' OR TotalAddGTime BETWEEN 63 AND 4 AND \"Year\" IN (2014) ORDER BY CancellationCode, OriginStateName LIMIT 16","hsqls":["SELECT DistanceGroup FROM mytable WHERE Carrier < 'B6' OR TotalAddGTime BETWEEN 63 AND 4 AND Year IN (2014) ORDER BY CancellationCode, OriginStateName LIMIT 16"]}
+{"sql":"SELECT Quarter, DivTailNums, UniqueCarrier FROM mytable WHERE Carrier IN ('EV', 'B6', 'AA', 'VX') AND OriginAirportID < 11996 AND CRSArrTime IN (1225, 1303) LIMIT 25","hsqls":["SELECT Quarter, DivTailNums, UniqueCarrier FROM mytable WHERE Carrier IN ('EV', 'B6', 'AA', 'VX') AND OriginAirportID < 11996 AND CRSArrTime IN (1225, 1303) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup FROM mytable WHERE Carrier < 'B6' OR TotalAddGTime BETWEEN 63 AND 4 AND \"Year\" IN (2014) ORDER BY CancellationCode, OriginStateName LIMIT 16","hsqls":["SELECT DistanceGroup FROM mytable WHERE Carrier < 'B6' OR TotalAddGTime BETWEEN 63 AND 4 AND `Year` IN (2014) ORDER BY CancellationCode, OriginStateName LIMIT 16"]}
 {"sql":"SELECT OriginWac, DestCityMarketID, OriginStateName FROM mytable WHERE DaysSinceEpoch <= 16081 OR DaysSinceEpoch IN (16080, 16084, 16100, 16082, 16085) ORDER BY WheelsOff, FlightNum, DestStateName"}
-{"sql":"SELECT DestState, DayOfWeek FROM mytable WHERE \"Month\" < 1 LIMIT 6","hsqls":["SELECT DestState, DayOfWeek FROM mytable WHERE Month < 1 LIMIT 6"]}
-{"sql":"SELECT Dest, COUNT(*) FROM mytable WHERE OriginAirportSeqID NOT IN (1379502, 1591902, 1430702, 1043403, 1226402) AND DivAirportSeqIDs IN (1452401, 1411302, 1020803, 1323002) OR DestState BETWEEN 'SD' AND 'OR' GROUP BY Dest LIMIT 11","hsqls":["SELECT Dest, COUNT(*) FROM mytable WHERE OriginAirportSeqID NOT IN (1379502, 1591902, 1430702, 1043403, 1226402) AND (DivAirportSeqIDs__MV0 IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs__MV1 IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs__MV2 IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs__MV3 IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs__MV4 IN (1452401, 1411302, 1020803, 1323002)) OR DestState BETWEEN 'SD' AND 'OR' GROUP BY Dest LIMIT 10000"]}
+{"sql":"SELECT DestState, DayOfWeek FROM mytable WHERE \"Month\" < 1 LIMIT 6","hsqls":["SELECT DestState, DayOfWeek FROM mytable WHERE `Month` < 1 LIMIT 6"]}
+{"sql":"SELECT Dest, COUNT(*) FROM mytable WHERE OriginAirportSeqID NOT IN (1379502, 1591902, 1430702, 1043403, 1226402) AND DivAirportSeqIDs IN (1452401, 1411302, 1020803, 1323002) OR DestState BETWEEN 'SD' AND 'OR' GROUP BY Dest LIMIT 11","hsqls":["SELECT Dest, COUNT(*) FROM mytable WHERE OriginAirportSeqID NOT IN (1379502, 1591902, 1430702, 1043403, 1226402) AND (DivAirportSeqIDs[1] IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs[2] IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs[3] IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs[4] IN (1452401, 1411302, 1020803, 1323002) OR DivAirportSeqIDs[5] IN (1452401, 1411302, 1020803, 1323002)) OR DestState BETWEEN 'SD' AND 'OR' GROUP BY Dest LIMIT 10000"]}
 {"sql":"SELECT NASDelay, Origin FROM mytable ORDER BY DepDelayMinutes"}
 {"sql":"SELECT OriginCityName FROM mytable WHERE DivArrDelay <> 275 LIMIT 27"}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE OriginCityName NOT IN ('Hibbing, MN') AND TaxiOut BETWEEN 50 AND 37 ORDER BY Distance, ArrDelayMinutes, DestCityMarketID LIMIT 22"}
-{"sql":"SELECT DivReachedDest, COUNT(FlightNum), MAX(SecurityDelay), MIN(Distance) FROM mytable WHERE DivLongestGTimes < 7.0 GROUP BY DivReachedDest LIMIT 25","hsqls":["SELECT DivReachedDest, COUNT(FlightNum), MAX(SecurityDelay), MIN(Distance) FROM mytable WHERE (DivLongestGTimes__MV0 < 7.0 OR DivLongestGTimes__MV1 < 7.0 OR DivLongestGTimes__MV2 < 7.0 OR DivLongestGTimes__MV3 < 7.0 OR DivLongestGTimes__MV4 < 7.0) GROUP BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, COUNT(FlightNum), MAX(SecurityDelay), MIN(Distance) FROM mytable WHERE DivLongestGTimes < 7.0 GROUP BY DivReachedDest LIMIT 25","hsqls":["SELECT DivReachedDest, COUNT(FlightNum), MAX(SecurityDelay), MIN(Distance) FROM mytable WHERE (DivLongestGTimes[1] < 7.0 OR DivLongestGTimes[2] < 7.0 OR DivLongestGTimes[3] < 7.0 OR DivLongestGTimes[4] < 7.0 OR DivLongestGTimes[5] < 7.0) GROUP BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, ArrTime, MAX(ArrDelayMinutes), MAX(WeatherDelay) FROM mytable GROUP BY TotalAddGTime, ArrTime  ORDER BY TotalAddGTime, ArrTime LIMIT 27","hsqls":["SELECT TotalAddGTime, ArrTime, MAX(ArrDelayMinutes), MAX(WeatherDelay) FROM mytable GROUP BY TotalAddGTime, ArrTime  ORDER BY TotalAddGTime, ArrTime LIMIT 27"]}
 {"sql":"SELECT ArrDel15, COUNT(CRSArrTime) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 18","hsqls":["SELECT ArrDel15, COUNT(CRSArrTime) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 18"]}
 {"sql":"SELECT DivDistance, WeatherDelay, AVG(DepDel15), COUNT(DestStateFips) FROM mytable WHERE Cancelled NOT IN (1, 0) AND CRSArrTime NOT IN (1857, 906, 1403, 631, 952) AND DepartureDelayGroups < -9999 GROUP BY DivDistance, WeatherDelay  ORDER BY DivDistance, WeatherDelay LIMIT 4","hsqls":["SELECT DivDistance, WeatherDelay, AVG(DepDel15), COUNT(DestStateFips) FROM mytable WHERE Cancelled NOT IN (1, 0) AND CRSArrTime NOT IN (1857, 906, 1403, 631, 952) AND DepartureDelayGroups < -9999 GROUP BY DivDistance, WeatherDelay  ORDER BY DivDistance, WeatherDelay LIMIT 4"]}
 {"sql":"SELECT ArrDel15 FROM mytable ORDER BY AirTime LIMIT 20"}
-{"sql":"SELECT TaxiOut, Diverted, OriginCityMarketID FROM mytable WHERE DivAirportIDs BETWEEN 15412 AND 15841 OR DistanceGroup IN (2) ORDER BY DepDelayMinutes, OriginStateName LIMIT 4","hsqls":["SELECT TaxiOut, Diverted, OriginCityMarketID FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 15412 AND 15841 OR DivAirportIDs__MV1 BETWEEN 15412 AND 15841 OR DivAirportIDs__MV2 BETWEEN 15412 AND 15841 OR DivAirportIDs__MV3 BETWEEN 15412 AND 15841 OR DivAirportIDs__MV4 BETWEEN 15412 AND 15841) OR DistanceGroup IN (2) ORDER BY DepDelayMinutes, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, Diverted, OriginCityMarketID FROM mytable WHERE DivAirportIDs BETWEEN 15412 AND 15841 OR DistanceGroup IN (2) ORDER BY DepDelayMinutes, OriginStateName LIMIT 4","hsqls":["SELECT TaxiOut, Diverted, OriginCityMarketID FROM mytable WHERE (DivAirportIDs[1] BETWEEN 15412 AND 15841 OR DivAirportIDs[2] BETWEEN 15412 AND 15841 OR DivAirportIDs[3] BETWEEN 15412 AND 15841 OR DivAirportIDs[4] BETWEEN 15412 AND 15841 OR DivAirportIDs[5] BETWEEN 15412 AND 15841) OR DistanceGroup IN (2) ORDER BY DepDelayMinutes, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT \"Year\", OriginCityName, COUNT(*) FROM mytable WHERE Carrier IN ('F9', 'MQ', 'AS') GROUP BY \"Year\", OriginCityName LIMIT 23","hsqls":["SELECT Year, OriginCityName, COUNT(*) FROM mytable WHERE Carrier IN ('F9', 'MQ', 'AS') GROUP BY Year, OriginCityName LIMIT 23"]}
-{"sql":"SELECT DistanceGroup, DestAirportID, AVG(\"Month\"), COUNT(DepDel15), COUNT(OriginStateFips) FROM mytable GROUP BY DistanceGroup, DestAirportID LIMIT 27","hsqls":["SELECT DistanceGroup, DestAirportID, AVG(Month), COUNT(DepDel15), COUNT(OriginStateFips) FROM mytable GROUP BY DistanceGroup, DestAirportID LIMIT 27"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE Origin = 'SRQ' AND DivWheelsOns IN (1910, 1655, 1408) AND DestStateFips NOT IN (4, 33) LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE Origin = 'SRQ' AND (DivWheelsOns__MV0 IN (1910, 1655, 1408) OR DivWheelsOns__MV1 IN (1910, 1655, 1408) OR DivWheelsOns__MV2 IN (1910, 1655, 1408) OR DivWheelsOns__MV3 IN (1910, 1655, 1408) OR DivWheelsOns__MV4 IN (1910, 1655, 1408)) AND DestStateFips NOT IN (4, 33) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestAirportID, AVG(\"Month\"), COUNT(DepDel15), COUNT(OriginStateFips) FROM mytable GROUP BY DistanceGroup, DestAirportID LIMIT 27","hsqls":["SELECT DistanceGroup, DestAirportID, AVG(`Month`), COUNT(DepDel15), COUNT(OriginStateFips) FROM mytable GROUP BY DistanceGroup, DestAirportID LIMIT 27"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE Origin = 'SRQ' AND DivWheelsOns IN (1910, 1655, 1408) AND DestStateFips NOT IN (4, 33) LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE Origin = 'SRQ' AND (DivWheelsOns[1] IN (1910, 1655, 1408) OR DivWheelsOns[2] IN (1910, 1655, 1408) OR DivWheelsOns[3] IN (1910, 1655, 1408) OR DivWheelsOns[4] IN (1910, 1655, 1408) OR DivWheelsOns[5] IN (1910, 1655, 1408)) AND DestStateFips NOT IN (4, 33) LIMIT 10000"]}
 {"sql":"SELECT MAX(CarrierDelay) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 LIMIT 28"}
 {"sql":"SELECT FlightDate FROM mytable WHERE TailNum BETWEEN 'N428WN' AND 'N5ESAA' LIMIT 28"}
 {"sql":"SELECT DivReachedDest FROM mytable LIMIT 17"}
@@ -4039,29 +4039,29 @@
 {"sql":"SELECT COUNT(SecurityDelay), AVG(ArrDelayMinutes), MAX(DestCityMarketID) FROM mytable WHERE CRSDepTime BETWEEN 1141 AND 1931 AND LongestAddGTime IN (21, 58, 39, 26, 29) LIMIT 6"}
 {"sql":"SELECT SUM(LongestAddGTime), AVG(TaxiIn), SUM(DaysSinceEpoch) FROM mytable WHERE WheelsOn NOT IN (1708) OR TotalAddGTime BETWEEN 40 AND 38 OR DepTimeBlk > '1300-1359' LIMIT 7"}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE Cancelled <> 0 OR Dest NOT IN ('BDL', 'EGE') OR ArrDelay NOT IN (48.0, 250.0) ORDER BY OriginState LIMIT 14"}
-{"sql":"SELECT LongestAddGTime, FlightNum, DivWheelsOffs FROM mytable ORDER BY OriginStateFips LIMIT 23","hsqls":["SELECT LongestAddGTime, FlightNum, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, FlightNum, DivWheelsOffs FROM mytable ORDER BY OriginStateFips LIMIT 23","hsqls":["SELECT LongestAddGTime, FlightNum, DivWheelsOffs FROM mytable ORDER BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT OriginState, MIN(DepDel15) FROM mytable WHERE TaxiOut BETWEEN 62 AND 77 GROUP BY OriginState  ORDER BY OriginState LIMIT 9","hsqls":["SELECT OriginState, MIN(DepDel15) FROM mytable WHERE TaxiOut BETWEEN 62 AND 77 GROUP BY OriginState  ORDER BY OriginState LIMIT 9"]}
 {"sql":"SELECT DestState, AirTime, DaysSinceEpoch FROM mytable ORDER BY CRSDepTime LIMIT 5"}
-{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY DepartureDelayGroups, DepDelayMinutes LIMIT 3","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable ORDER BY DepartureDelayGroups, DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable ORDER BY DepartureDelayGroups, DepDelayMinutes LIMIT 3","hsqls":["SELECT DivWheelsOns FROM mytable ORDER BY DepartureDelayGroups, DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, Origin, CRSElapsedTime, MAX(OriginAirportSeqID), SUM(Flights), SUM(Diverted) FROM mytable GROUP BY ArrTimeBlk, Origin, CRSElapsedTime  ORDER BY ArrTimeBlk, Origin, CRSElapsedTime LIMIT 2","hsqls":["SELECT ArrTimeBlk, Origin, CRSElapsedTime, MAX(OriginAirportSeqID), SUM(Flights), SUM(Diverted) FROM mytable GROUP BY ArrTimeBlk, Origin, CRSElapsedTime  ORDER BY ArrTimeBlk, Origin, CRSElapsedTime LIMIT 2"]}
-{"sql":"SELECT LongestAddGTime, Origin FROM mytable WHERE DivLongestGTimes <= 1.0 OR Cancelled IN (1, 0) OR \"Month\" IN (1) LIMIT 10","hsqls":["SELECT LongestAddGTime, Origin FROM mytable WHERE (DivLongestGTimes__MV0 <= 1.0 OR DivLongestGTimes__MV1 <= 1.0 OR DivLongestGTimes__MV2 <= 1.0 OR DivLongestGTimes__MV3 <= 1.0 OR DivLongestGTimes__MV4 <= 1.0) OR Cancelled IN (1, 0) OR Month IN (1) LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Origin FROM mytable WHERE DivLongestGTimes <= 1.0 OR Cancelled IN (1, 0) OR \"Month\" IN (1) LIMIT 10","hsqls":["SELECT LongestAddGTime, Origin FROM mytable WHERE (DivLongestGTimes[1] <= 1.0 OR DivLongestGTimes[2] <= 1.0 OR DivLongestGTimes[3] <= 1.0 OR DivLongestGTimes[4] <= 1.0 OR DivLongestGTimes[5] <= 1.0) OR Cancelled IN (1, 0) OR `Month` IN (1) LIMIT 10000"]}
 {"sql":"SELECT Carrier, CRSArrTime, MAX(DestAirportSeqID), SUM(CRSDepTime) FROM mytable WHERE OriginStateName NOT IN ('North Carolina', 'Montana', 'Oregon') OR OriginWac < 39 AND LongestAddGTime BETWEEN 21 AND 31 GROUP BY Carrier, CRSArrTime  ORDER BY Carrier, CRSArrTime LIMIT 11","hsqls":["SELECT Carrier, CRSArrTime, MAX(DestAirportSeqID), SUM(CRSDepTime) FROM mytable WHERE OriginStateName NOT IN ('North Carolina', 'Montana', 'Oregon') OR OriginWac < 39 AND LongestAddGTime BETWEEN 21 AND 31 GROUP BY Carrier, CRSArrTime  ORDER BY Carrier, CRSArrTime LIMIT 11"]}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE DivArrDelay IN (735) AND ArrTimeBlk BETWEEN '1000-1059' AND '0001-0559' ORDER BY Quarter, CRSArrTime LIMIT 15"}
 {"sql":"SELECT DivReachedDest, CRSDepTime FROM mytable WHERE DayofMonth NOT IN (23, 25, 13, 28) OR DepartureDelayGroups BETWEEN 12 AND 10 OR DestCityMarketID BETWEEN 32982 AND 32211 ORDER BY CarrierDelay, OriginCityName, AirTime LIMIT 26"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE ArrDelay NOT IN (-7.0, -31.0) AND TotalAddGTime <= 29 AND OriginStateName IN ('New Hampshire', 'Kentucky', 'Arkansas', 'Massachusetts', 'California') LIMIT 16","hsqls":["SELECT Month FROM mytable WHERE ArrDelay NOT IN (-7.0, -31.0) AND TotalAddGTime <= 29 AND OriginStateName IN ('New Hampshire', 'Kentucky', 'Arkansas', 'Massachusetts', 'California') LIMIT 16"]}
-{"sql":"SELECT DivAirports FROM mytable ORDER BY WeatherDelay, Origin, DayOfWeek LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY WeatherDelay, Origin, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE ArrDelay NOT IN (-7.0, -31.0) AND TotalAddGTime <= 29 AND OriginStateName IN ('New Hampshire', 'Kentucky', 'Arkansas', 'Massachusetts', 'California') LIMIT 16","hsqls":["SELECT `Month` FROM mytable WHERE ArrDelay NOT IN (-7.0, -31.0) AND TotalAddGTime <= 29 AND OriginStateName IN ('New Hampshire', 'Kentucky', 'Arkansas', 'Massachusetts', 'California') LIMIT 16"]}
+{"sql":"SELECT DivAirports FROM mytable ORDER BY WeatherDelay, Origin, DayOfWeek LIMIT 10","hsqls":["SELECT DivAirports FROM mytable ORDER BY WeatherDelay, Origin, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT \"Year\", LateAircraftDelay FROM mytable WHERE Flights IN (1) AND AirTime <> 208 ORDER BY TotalAddGTime LIMIT 29","hsqls":["SELECT Year, LateAircraftDelay FROM mytable WHERE Flights IN (1) AND AirTime <> 208 ORDER BY TotalAddGTime LIMIT 29"]}
 {"sql":"SELECT DestWac, DayofMonth, SUM(DestAirportSeqID), MIN(DivDistance) FROM mytable GROUP BY DestWac, DayofMonth  ORDER BY DestWac, DayofMonth LIMIT 8","hsqls":["SELECT DestWac, DayofMonth, SUM(DestAirportSeqID), MIN(DivDistance) FROM mytable GROUP BY DestWac, DayofMonth  ORDER BY DestWac, DayofMonth LIMIT 8"]}
 {"sql":"SELECT OriginStateFips, DestState, FlightNum, COUNT(*) FROM mytable WHERE FlightNum <= 395 AND DepDelay NOT IN (-1.0, 143.0, 12.0, 62.0, 11.0) GROUP BY OriginStateFips, DestState, FlightNum  ORDER BY OriginStateFips, DestState, FlightNum LIMIT 8","hsqls":["SELECT OriginStateFips, DestState, FlightNum, COUNT(*) FROM mytable WHERE FlightNum <= 395 AND DepDelay NOT IN (-1.0, 143.0, 12.0, 62.0, 11.0) GROUP BY OriginStateFips, DestState, FlightNum  ORDER BY OriginStateFips, DestState, FlightNum LIMIT 8"]}
-{"sql":"SELECT NASDelay FROM mytable WHERE DivLongestGTimes BETWEEN 107.0 AND 60.0 ORDER BY OriginState, Distance, OriginCityName LIMIT 21","hsqls":["SELECT NASDelay FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 107.0 AND 60.0 OR DivLongestGTimes__MV1 BETWEEN 107.0 AND 60.0 OR DivLongestGTimes__MV2 BETWEEN 107.0 AND 60.0 OR DivLongestGTimes__MV3 BETWEEN 107.0 AND 60.0 OR DivLongestGTimes__MV4 BETWEEN 107.0 AND 60.0) ORDER BY OriginState, Distance, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT NASDelay FROM mytable WHERE DivLongestGTimes BETWEEN 107.0 AND 60.0 ORDER BY OriginState, Distance, OriginCityName LIMIT 21","hsqls":["SELECT NASDelay FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 107.0 AND 60.0 OR DivLongestGTimes[2] BETWEEN 107.0 AND 60.0 OR DivLongestGTimes[3] BETWEEN 107.0 AND 60.0 OR DivLongestGTimes[4] BETWEEN 107.0 AND 60.0 OR DivLongestGTimes[5] BETWEEN 107.0 AND 60.0) ORDER BY OriginState, Distance, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DivDistance, Dest FROM mytable WHERE OriginAirportID <> 12280 ORDER BY LateAircraftDelay, Flights LIMIT 5"}
-{"sql":"SELECT Diverted, DivActualElapsedTime FROM mytable WHERE OriginWac IN (67, 54, 72, 39, 88) OR DayOfWeek <= 1 OR \"Year\" IN (2014) ORDER BY SecurityDelay, ArrTime LIMIT 2","hsqls":["SELECT Diverted, DivActualElapsedTime FROM mytable WHERE OriginWac IN (67, 54, 72, 39, 88) OR DayOfWeek <= 1 OR Year IN (2014) ORDER BY SecurityDelay, ArrTime LIMIT 2"]}
+{"sql":"SELECT Diverted, DivActualElapsedTime FROM mytable WHERE OriginWac IN (67, 54, 72, 39, 88) OR DayOfWeek <= 1 OR \"Year\" IN (2014) ORDER BY SecurityDelay, ArrTime LIMIT 2","hsqls":["SELECT Diverted, DivActualElapsedTime FROM mytable WHERE OriginWac IN (67, 54, 72, 39, 88) OR DayOfWeek <= 1 OR `Year` IN (2014) ORDER BY SecurityDelay, ArrTime LIMIT 2"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 23"}
-{"sql":"SELECT MIN(DepartureDelayGroups) FROM mytable WHERE DivReachedDest IN (1) OR DivWheelsOffs IN (1523, 1157, 2046, 1219) OR DivAirportSeqIDs BETWEEN 1062002 AND 1233904 LIMIT 28","hsqls":["SELECT MIN(DepartureDelayGroups) FROM mytable WHERE DivReachedDest IN (1) OR (DivWheelsOffs__MV0 IN (1523, 1157, 2046, 1219) OR DivWheelsOffs__MV1 IN (1523, 1157, 2046, 1219) OR DivWheelsOffs__MV2 IN (1523, 1157, 2046, 1219) OR DivWheelsOffs__MV3 IN (1523, 1157, 2046, 1219) OR DivWheelsOffs__MV4 IN (1523, 1157, 2046, 1219)) OR (DivAirportSeqIDs__MV0 BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs__MV1 BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs__MV2 BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs__MV3 BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs__MV4 BETWEEN 1062002 AND 1233904) LIMIT 10000"]}
-{"sql":"SELECT DepDelay, NASDelay, DivWheelsOffs FROM mytable WHERE DivAirportLandings <> 2 OR ArrDelayMinutes NOT IN (246.0, 81.0, 215.0, 24.0) OR OriginAirportSeqID NOT IN (1411302, 1228002, 1288802, 1410702, 1027903) ORDER BY ArrTimeBlk, WheelsOn, CRSElapsedTime LIMIT 6","hsqls":["SELECT DepDelay, NASDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DivAirportLandings <> 2 OR ArrDelayMinutes NOT IN (246.0, 81.0, 215.0, 24.0) OR OriginAirportSeqID NOT IN (1411302, 1228002, 1288802, 1410702, 1027903) ORDER BY ArrTimeBlk, WheelsOn, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT MIN(DepartureDelayGroups) FROM mytable WHERE DivReachedDest IN (1) OR DivWheelsOffs IN (1523, 1157, 2046, 1219) OR DivAirportSeqIDs BETWEEN 1062002 AND 1233904 LIMIT 28","hsqls":["SELECT MIN(DepartureDelayGroups) FROM mytable WHERE DivReachedDest IN (1) OR (DivWheelsOffs[1] IN (1523, 1157, 2046, 1219) OR DivWheelsOffs[2] IN (1523, 1157, 2046, 1219) OR DivWheelsOffs[3] IN (1523, 1157, 2046, 1219) OR DivWheelsOffs[4] IN (1523, 1157, 2046, 1219) OR DivWheelsOffs[5] IN (1523, 1157, 2046, 1219)) OR (DivAirportSeqIDs[1] BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs[2] BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs[3] BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs[4] BETWEEN 1062002 AND 1233904 OR DivAirportSeqIDs[5] BETWEEN 1062002 AND 1233904) LIMIT 10000"]}
+{"sql":"SELECT DepDelay, NASDelay, DivWheelsOffs FROM mytable WHERE DivAirportLandings <> 2 OR ArrDelayMinutes NOT IN (246.0, 81.0, 215.0, 24.0) OR OriginAirportSeqID NOT IN (1411302, 1228002, 1288802, 1410702, 1027903) ORDER BY ArrTimeBlk, WheelsOn, CRSElapsedTime LIMIT 6","hsqls":["SELECT DepDelay, NASDelay, DivWheelsOffs FROM mytable WHERE DivAirportLandings <> 2 OR ArrDelayMinutes NOT IN (246.0, 81.0, 215.0, 24.0) OR OriginAirportSeqID NOT IN (1411302, 1228002, 1288802, 1410702, 1027903) ORDER BY ArrTimeBlk, WheelsOn, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Diverted FROM mytable ORDER BY OriginState, Quarter, WeatherDelay LIMIT 19"}
 {"sql":"SELECT DayofMonth, CancellationCode FROM mytable WHERE DepartureDelayGroups < -1 OR DayOfWeek NOT IN (3, 2, 1, 5, 4) OR DivReachedDest <= -9999 LIMIT 24"}
-{"sql":"SELECT DivAirportLandings, WheelsOn FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY OriginAirportSeqID, CRSElapsedTime LIMIT 7","hsqls":["SELECT DivAirportLandings, WheelsOn FROM mytable WHERE Year NOT IN (2014) ORDER BY OriginAirportSeqID, CRSElapsedTime LIMIT 7"]}
+{"sql":"SELECT DivAirportLandings, WheelsOn FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY OriginAirportSeqID, CRSElapsedTime LIMIT 7","hsqls":["SELECT DivAirportLandings, WheelsOn FROM mytable WHERE `Year` NOT IN (2014) ORDER BY OriginAirportSeqID, CRSElapsedTime LIMIT 7"]}
 {"sql":"SELECT FlightDate, Cancelled, AVG(DayOfWeek), MIN(DivArrDelay) FROM mytable GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 14","hsqls":["SELECT FlightDate, Cancelled, AVG(DayOfWeek), MIN(DivArrDelay) FROM mytable GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 14"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable ORDER BY OriginStateFips, FirstDepTime, Origin LIMIT 8"}
 {"sql":"SELECT WheelsOff, LateAircraftDelay, DivAirportLandings FROM mytable WHERE TailNum BETWEEN 'N807UA' AND 'N963DN' AND AirTime IN (319, 70, 343, 189) ORDER BY FirstDepTime LIMIT 3"}
@@ -4072,92 +4072,92 @@
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE LateAircraftDelay BETWEEN 364 AND 98 LIMIT 16"}
 {"sql":"SELECT AirlineID, WheelsOn, AVG(LateAircraftDelay) FROM mytable GROUP BY AirlineID, WheelsOn  ORDER BY AirlineID, WheelsOn LIMIT 11","hsqls":["SELECT AirlineID, WheelsOn, AVG(LateAircraftDelay) FROM mytable GROUP BY AirlineID, WheelsOn  ORDER BY AirlineID, WheelsOn LIMIT 11"]}
 {"sql":"SELECT AVG(Quarter), MIN(DayOfWeek), SUM(TaxiIn) FROM mytable"}
-{"sql":"SELECT SUM(DepDelayMinutes) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 AND DivWheelsOns = 1231 LIMIT 26","hsqls":["SELECT SUM(DepDelayMinutes) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 AND (DivWheelsOns__MV0 = 1231 OR DivWheelsOns__MV1 = 1231 OR DivWheelsOns__MV2 = 1231 OR DivWheelsOns__MV3 = 1231 OR DivWheelsOns__MV4 = 1231) LIMIT 10000"]}
+{"sql":"SELECT SUM(DepDelayMinutes) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 AND DivWheelsOns = 1231 LIMIT 26","hsqls":["SELECT SUM(DepDelayMinutes) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 AND (DivWheelsOns[1] = 1231 OR DivWheelsOns[2] = 1231 OR DivWheelsOns[3] = 1231 OR DivWheelsOns[4] = 1231 OR DivWheelsOns[5] = 1231) LIMIT 10000"]}
 {"sql":"SELECT DepTime, MAX(DivActualElapsedTime), COUNT(CarrierDelay), MAX(WeatherDelay) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 26","hsqls":["SELECT DepTime, MAX(DivActualElapsedTime), COUNT(CarrierDelay), MAX(WeatherDelay) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 26"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 37.0 AND 18.0 OR \"Year\" NOT IN (2014) LIMIT 1","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 37.0 AND 18.0 OR Year NOT IN (2014) LIMIT 1"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 37.0 AND 18.0 OR \"Year\" NOT IN (2014) LIMIT 1","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 37.0 AND 18.0 OR `Year` NOT IN (2014) LIMIT 1"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE Flights BETWEEN 1 AND 1 AND OriginAirportSeqID BETWEEN 1281902 AND 1115003 ORDER BY WheelsOn, DayOfWeek LIMIT 7"}
 {"sql":"SELECT DivReachedDest, CRSElapsedTime, DaysSinceEpoch FROM mytable WHERE Dest <> 'CLL' ORDER BY DepDelayMinutes, DivActualElapsedTime LIMIT 16"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR DivTailNums > 'N854AS' AND DayOfWeek NOT IN (3, 1, 6) LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR (DivTailNums__MV0 > 'N854AS' OR DivTailNums__MV1 > 'N854AS' OR DivTailNums__MV2 > 'N854AS' OR DivTailNums__MV3 > 'N854AS' OR DivTailNums__MV4 > 'N854AS') AND DayOfWeek NOT IN (3, 1, 6) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR DivTailNums > 'N854AS' AND DayOfWeek NOT IN (3, 1, 6) LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR (DivTailNums[1] > 'N854AS' OR DivTailNums[2] > 'N854AS' OR DivTailNums[3] > 'N854AS' OR DivTailNums[4] > 'N854AS' OR DivTailNums[5] > 'N854AS') AND DayOfWeek NOT IN (3, 1, 6) LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, ArrTime, AirTime, MAX(DistanceGroup), COUNT(ArrTime), COUNT(WheelsOff) FROM mytable WHERE DivActualElapsedTime > 331 OR Cancelled NOT IN (1, 0) AND DestAirportSeqID IN (1150303) GROUP BY DestStateFips, ArrTime, AirTime  ORDER BY DestStateFips, ArrTime, AirTime LIMIT 10","hsqls":["SELECT DestStateFips, ArrTime, AirTime, MAX(DistanceGroup), COUNT(ArrTime), COUNT(WheelsOff) FROM mytable WHERE DivActualElapsedTime > 331 OR Cancelled NOT IN (1, 0) AND DestAirportSeqID IN (1150303) GROUP BY DestStateFips, ArrTime, AirTime  ORDER BY DestStateFips, ArrTime, AirTime LIMIT 10"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE WheelsOff <= 117 ORDER BY Carrier, Cancelled LIMIT 17"}
-{"sql":"SELECT OriginCityName, DestCityName FROM mytable WHERE DivWheelsOffs IN (1708, 2116, 2213) ORDER BY WheelsOff, DestState, DestStateName LIMIT 23","hsqls":["SELECT OriginCityName, DestCityName FROM mytable WHERE (DivWheelsOffs__MV0 IN (1708, 2116, 2213) OR DivWheelsOffs__MV1 IN (1708, 2116, 2213) OR DivWheelsOffs__MV2 IN (1708, 2116, 2213) OR DivWheelsOffs__MV3 IN (1708, 2116, 2213) OR DivWheelsOffs__MV4 IN (1708, 2116, 2213)) ORDER BY WheelsOff, DestState, DestStateName LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DestCityName FROM mytable WHERE DivWheelsOffs IN (1708, 2116, 2213) ORDER BY WheelsOff, DestState, DestStateName LIMIT 23","hsqls":["SELECT OriginCityName, DestCityName FROM mytable WHERE (DivWheelsOffs[1] IN (1708, 2116, 2213) OR DivWheelsOffs[2] IN (1708, 2116, 2213) OR DivWheelsOffs[3] IN (1708, 2116, 2213) OR DivWheelsOffs[4] IN (1708, 2116, 2213) OR DivWheelsOffs[5] IN (1708, 2116, 2213)) ORDER BY WheelsOff, DestState, DestStateName LIMIT 10000"]}
 {"sql":"SELECT OriginState, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY OriginState, ArrivalDelayGroups  ORDER BY OriginState, ArrivalDelayGroups LIMIT 19","hsqls":["SELECT OriginState, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY OriginState, ArrivalDelayGroups  ORDER BY OriginState, ArrivalDelayGroups LIMIT 19"]}
-{"sql":"SELECT DivAirports, ArrivalDelayGroups FROM mytable ORDER BY FlightDate LIMIT 27","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrivalDelayGroups FROM mytable ORDER BY FlightDate LIMIT 10000"]}
-{"sql":"SELECT DepDelay, SUM(\"Year\") FROM mytable WHERE DestCityMarketID NOT IN (32206, 30299) AND DayofMonth = 30 AND OriginStateFips IN (19, 12) GROUP BY DepDelay LIMIT 8","hsqls":["SELECT DepDelay, SUM(Year) FROM mytable WHERE DestCityMarketID NOT IN (32206, 30299) AND DayofMonth = 30 AND OriginStateFips IN (19, 12) GROUP BY DepDelay LIMIT 8"]}
+{"sql":"SELECT DivAirports, ArrivalDelayGroups FROM mytable ORDER BY FlightDate LIMIT 27","hsqls":["SELECT DivAirports, ArrivalDelayGroups FROM mytable ORDER BY FlightDate LIMIT 10000"]}
+{"sql":"SELECT DepDelay, SUM(\"Year\") FROM mytable WHERE DestCityMarketID NOT IN (32206, 30299) AND DayofMonth = 30 AND OriginStateFips IN (19, 12) GROUP BY DepDelay LIMIT 8","hsqls":["SELECT DepDelay, SUM(`Year`) FROM mytable WHERE DestCityMarketID NOT IN (32206, 30299) AND DayofMonth = 30 AND OriginStateFips IN (19, 12) GROUP BY DepDelay LIMIT 8"]}
 {"sql":"SELECT DivReachedDest, ArrTimeBlk FROM mytable ORDER BY DivAirportLandings LIMIT 10"}
 {"sql":"SELECT MIN(TotalAddGTime) FROM mytable WHERE CRSElapsedTime = 308 LIMIT 11"}
 {"sql":"SELECT SecurityDelay, ActualElapsedTime, ArrivalDelayGroups FROM mytable LIMIT 9"}
-{"sql":"SELECT Quarter, ArrTimeBlk, \"Month\", COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'Alaska' AND 'Oklahoma' OR UniqueCarrier BETWEEN 'OO' AND 'F9' GROUP BY Quarter, ArrTimeBlk, \"Month\" LIMIT 18","hsqls":["SELECT Quarter, ArrTimeBlk, Month, COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'Alaska' AND 'Oklahoma' OR UniqueCarrier BETWEEN 'OO' AND 'F9' GROUP BY Quarter, ArrTimeBlk, Month LIMIT 18"]}
+{"sql":"SELECT Quarter, ArrTimeBlk, \"Month\", COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'Alaska' AND 'Oklahoma' OR UniqueCarrier BETWEEN 'OO' AND 'F9' GROUP BY Quarter, ArrTimeBlk, \"Month\" LIMIT 18","hsqls":["SELECT Quarter, ArrTimeBlk, Month, COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'Alaska' AND 'Oklahoma' OR UniqueCarrier BETWEEN 'OO' AND 'F9' GROUP BY Quarter, ArrTimeBlk, `Month` LIMIT 18"]}
 {"sql":"SELECT OriginCityMarketID, COUNT(DepartureDelayGroups), AVG(AirTime), SUM(OriginCityMarketID) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 18","hsqls":["SELECT OriginCityMarketID, COUNT(DepartureDelayGroups), AVG(AirTime), SUM(OriginCityMarketID) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 18"]}
 {"sql":"SELECT COUNT(DepartureDelayGroups), SUM(ArrTime), AVG(DepDelayMinutes) FROM mytable WHERE DayofMonth BETWEEN 12 AND 26 OR DistanceGroup IN (7, 11) LIMIT 12"}
 {"sql":"SELECT DestCityMarketID, COUNT(*) FROM mytable WHERE DestCityName <= 'Salt Lake City, UT' GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 17","hsqls":["SELECT DestCityMarketID, COUNT(*) FROM mytable WHERE DestCityName <= 'Salt Lake City, UT' GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, OriginStateFips, Quarter, SUM(NASDelay), MIN(DivArrDelay), MAX(DivReachedDest) FROM mytable GROUP BY OriginAirportSeqID, OriginStateFips, Quarter  ORDER BY OriginAirportSeqID, OriginStateFips, Quarter LIMIT 17","hsqls":["SELECT OriginAirportSeqID, OriginStateFips, Quarter, SUM(NASDelay), MIN(DivArrDelay), MAX(DivReachedDest) FROM mytable GROUP BY OriginAirportSeqID, OriginStateFips, Quarter  ORDER BY OriginAirportSeqID, OriginStateFips, Quarter LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, TaxiIn, DivActualElapsedTime, SUM(ArrDel15), MAX(DivArrDelay), MIN(DayofMonth) FROM mytable WHERE ArrTimeBlk BETWEEN '1300-1359' AND '0001-0559' OR CarrierDelay <= 213 GROUP BY OriginAirportSeqID, TaxiIn, DivActualElapsedTime  ORDER BY OriginAirportSeqID, TaxiIn, DivActualElapsedTime LIMIT 14","hsqls":["SELECT OriginAirportSeqID, TaxiIn, DivActualElapsedTime, SUM(ArrDel15), MAX(DivArrDelay), MIN(DayofMonth) FROM mytable WHERE ArrTimeBlk BETWEEN '1300-1359' AND '0001-0559' OR CarrierDelay <= 213 GROUP BY OriginAirportSeqID, TaxiIn, DivActualElapsedTime  ORDER BY OriginAirportSeqID, TaxiIn, DivActualElapsedTime LIMIT 14"]}
-{"sql":"SELECT Carrier, \"Month\", COUNT(DestCityName), AVG(DivArrDelay) FROM mytable WHERE DivAirportLandings IN (2, 0) AND ArrTime BETWEEN 947 AND 649 AND LateAircraftDelay > 15 GROUP BY Carrier, \"Month\" LIMIT 22","hsqls":["SELECT Carrier, Month, COUNT(DestCityName), AVG(DivArrDelay) FROM mytable WHERE DivAirportLandings IN (2, 0) AND ArrTime BETWEEN 947 AND 649 AND LateAircraftDelay > 15 GROUP BY Carrier, Month LIMIT 22"]}
-{"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DivAirportIDs BETWEEN 11292 AND 11996 OR DistanceGroup = 5 ORDER BY CRSElapsedTime LIMIT 19","hsqls":["SELECT OriginAirportSeqID FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11292 AND 11996 OR DivAirportIDs__MV1 BETWEEN 11292 AND 11996 OR DivAirportIDs__MV2 BETWEEN 11292 AND 11996 OR DivAirportIDs__MV3 BETWEEN 11292 AND 11996 OR DivAirportIDs__MV4 BETWEEN 11292 AND 11996) OR DistanceGroup = 5 ORDER BY CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DestState, CRSElapsedTime FROM mytable WHERE DivLongestGTimes >= 65.0 OR ArrTimeBlk NOT IN ('1700-1759', '2200-2259', '0001-0559', '1800-1859') LIMIT 8","hsqls":["SELECT DestState, CRSElapsedTime FROM mytable WHERE (DivLongestGTimes__MV0 >= 65.0 OR DivLongestGTimes__MV1 >= 65.0 OR DivLongestGTimes__MV2 >= 65.0 OR DivLongestGTimes__MV3 >= 65.0 OR DivLongestGTimes__MV4 >= 65.0) OR ArrTimeBlk NOT IN ('1700-1759', '2200-2259', '0001-0559', '1800-1859') LIMIT 10000"]}
-{"sql":"SELECT Flights FROM mytable WHERE WeatherDelay <= 105 AND DivWheelsOffs < 1240 ORDER BY Quarter LIMIT 19","hsqls":["SELECT Flights FROM mytable WHERE WeatherDelay <= 105 AND (DivWheelsOffs__MV0 < 1240 OR DivWheelsOffs__MV1 < 1240 OR DivWheelsOffs__MV2 < 1240 OR DivWheelsOffs__MV3 < 1240 OR DivWheelsOffs__MV4 < 1240) ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT Carrier, \"Month\", COUNT(DestCityName), AVG(DivArrDelay) FROM mytable WHERE DivAirportLandings IN (2, 0) AND ArrTime BETWEEN 947 AND 649 AND LateAircraftDelay > 15 GROUP BY Carrier, \"Month\" LIMIT 22","hsqls":["SELECT Carrier, Month, COUNT(DestCityName), AVG(DivArrDelay) FROM mytable WHERE DivAirportLandings IN (2, 0) AND ArrTime BETWEEN 947 AND 649 AND LateAircraftDelay > 15 GROUP BY Carrier, `Month` LIMIT 22"]}
+{"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DivAirportIDs BETWEEN 11292 AND 11996 OR DistanceGroup = 5 ORDER BY CRSElapsedTime LIMIT 19","hsqls":["SELECT OriginAirportSeqID FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11292 AND 11996 OR DivAirportIDs[2] BETWEEN 11292 AND 11996 OR DivAirportIDs[3] BETWEEN 11292 AND 11996 OR DivAirportIDs[4] BETWEEN 11292 AND 11996 OR DivAirportIDs[5] BETWEEN 11292 AND 11996) OR DistanceGroup = 5 ORDER BY CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestState, CRSElapsedTime FROM mytable WHERE DivLongestGTimes >= 65.0 OR ArrTimeBlk NOT IN ('1700-1759', '2200-2259', '0001-0559', '1800-1859') LIMIT 8","hsqls":["SELECT DestState, CRSElapsedTime FROM mytable WHERE (DivLongestGTimes[1] >= 65.0 OR DivLongestGTimes[2] >= 65.0 OR DivLongestGTimes[3] >= 65.0 OR DivLongestGTimes[4] >= 65.0 OR DivLongestGTimes[5] >= 65.0) OR ArrTimeBlk NOT IN ('1700-1759', '2200-2259', '0001-0559', '1800-1859') LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE WeatherDelay <= 105 AND DivWheelsOffs < 1240 ORDER BY Quarter LIMIT 19","hsqls":["SELECT Flights FROM mytable WHERE WeatherDelay <= 105 AND (DivWheelsOffs[1] < 1240 OR DivWheelsOffs[2] < 1240 OR DivWheelsOffs[3] < 1240 OR DivWheelsOffs[4] < 1240 OR DivWheelsOffs[5] < 1240) ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT AVG(FlightNum), COUNT(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE DestCityName BETWEEN 'Sacramento, CA' AND 'Mobile, AL' AND Cancelled >= 1"}
 {"sql":"SELECT FlightNum, OriginAirportID, MIN(AirTime), SUM(DepDelay) FROM mytable GROUP BY FlightNum, OriginAirportID  ORDER BY FlightNum, OriginAirportID LIMIT 1","hsqls":["SELECT FlightNum, OriginAirportID, MIN(AirTime), SUM(DepDelay) FROM mytable GROUP BY FlightNum, OriginAirportID  ORDER BY FlightNum, OriginAirportID LIMIT 1"]}
 {"sql":"SELECT CarrierDelay, Distance, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 2 OR DestWac NOT IN (45, 72, 13, 61, 84) AND NASDelay BETWEEN 32 AND 19 GROUP BY CarrierDelay, Distance  ORDER BY CarrierDelay, Distance LIMIT 2","hsqls":["SELECT CarrierDelay, Distance, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 2 OR DestWac NOT IN (45, 72, 13, 61, 84) AND NASDelay BETWEEN 32 AND 19 GROUP BY CarrierDelay, Distance  ORDER BY CarrierDelay, Distance LIMIT 2"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE ArrivalDelayGroups < 9 AND ArrivalDelayGroups <> 7 AND Origin IN ('STL', 'BRO', 'SLC', 'MFE') LIMIT 21"}
-{"sql":"SELECT OriginCityName, MAX(AirlineID), COUNT(DivActualElapsedTime), SUM(CRSArrTime) FROM mytable WHERE DivWheelsOffs IN (1900, 844) GROUP BY OriginCityName LIMIT 13","hsqls":["SELECT OriginCityName, MAX(AirlineID), COUNT(DivActualElapsedTime), SUM(CRSArrTime) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1900, 844) OR DivWheelsOffs__MV1 IN (1900, 844) OR DivWheelsOffs__MV2 IN (1900, 844) OR DivWheelsOffs__MV3 IN (1900, 844) OR DivWheelsOffs__MV4 IN (1900, 844)) GROUP BY OriginCityName LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, MAX(AirlineID), COUNT(DivActualElapsedTime), SUM(CRSArrTime) FROM mytable WHERE DivWheelsOffs IN (1900, 844) GROUP BY OriginCityName LIMIT 13","hsqls":["SELECT OriginCityName, MAX(AirlineID), COUNT(DivActualElapsedTime), SUM(CRSArrTime) FROM mytable WHERE (DivWheelsOffs[1] IN (1900, 844) OR DivWheelsOffs[2] IN (1900, 844) OR DivWheelsOffs[3] IN (1900, 844) OR DivWheelsOffs[4] IN (1900, 844) OR DivWheelsOffs[5] IN (1900, 844)) GROUP BY OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, MIN(DepartureDelayGroups) FROM mytable WHERE DepDelay NOT IN (48.0) AND DayOfWeek NOT IN (7) OR OriginState <> 'CT' GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 3","hsqls":["SELECT DepTimeBlk, MIN(DepartureDelayGroups) FROM mytable WHERE DepDelay NOT IN (48.0) AND DayOfWeek NOT IN (7) OR OriginState <> 'CT' GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 3"]}
-{"sql":"SELECT \"Month\", SUM(Cancelled), COUNT(DestAirportID), AVG(DepartureDelayGroups) FROM mytable WHERE Dest BETWEEN 'ATL' AND 'PSE' AND UniqueCarrier BETWEEN 'US' AND 'US' OR ArrTimeBlk <= '0800-0859' GROUP BY \"Month\" LIMIT 2","hsqls":["SELECT Month, SUM(Cancelled), COUNT(DestAirportID), AVG(DepartureDelayGroups) FROM mytable WHERE Dest BETWEEN 'ATL' AND 'PSE' AND UniqueCarrier BETWEEN 'US' AND 'US' OR ArrTimeBlk <= '0800-0859' GROUP BY Month LIMIT 2"]}
+{"sql":"SELECT \"Month\", SUM(Cancelled), COUNT(DestAirportID), AVG(DepartureDelayGroups) FROM mytable WHERE Dest BETWEEN 'ATL' AND 'PSE' AND UniqueCarrier BETWEEN 'US' AND 'US' OR ArrTimeBlk <= '0800-0859' GROUP BY \"Month\" LIMIT 2","hsqls":["SELECT Month, SUM(Cancelled), COUNT(DestAirportID), AVG(DepartureDelayGroups) FROM mytable WHERE Dest BETWEEN 'ATL' AND 'PSE' AND UniqueCarrier BETWEEN 'US' AND 'US' OR ArrTimeBlk <= '0800-0859' GROUP BY `Month` LIMIT 2"]}
 {"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE CarrierDelay = 99 GROUP BY TailNum  ORDER BY TailNum LIMIT 20","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE CarrierDelay = 99 GROUP BY TailNum  ORDER BY TailNum LIMIT 20"]}
 {"sql":"SELECT FlightDate, OriginWac, DivActualElapsedTime, SUM(Quarter) FROM mytable GROUP BY FlightDate, OriginWac, DivActualElapsedTime  ORDER BY FlightDate, OriginWac, DivActualElapsedTime LIMIT 26","hsqls":["SELECT FlightDate, OriginWac, DivActualElapsedTime, SUM(Quarter) FROM mytable GROUP BY FlightDate, OriginWac, DivActualElapsedTime  ORDER BY FlightDate, OriginWac, DivActualElapsedTime LIMIT 26"]}
 {"sql":"SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 AND OriginCityName BETWEEN 'Des Moines, IA' AND 'Dallas/Fort Worth, TX' AND SecurityDelay BETWEEN 0 AND 4 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 3","hsqls":["SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 AND OriginCityName BETWEEN 'Des Moines, IA' AND 'Dallas/Fort Worth, TX' AND SecurityDelay BETWEEN 0 AND 4 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 3"]}
-{"sql":"SELECT MAX(DepDel15), SUM(TaxiOut), SUM(\"Year\") FROM mytable WHERE Distance BETWEEN 615 AND 221 LIMIT 16","hsqls":["SELECT MAX(DepDel15), SUM(TaxiOut), SUM(Year) FROM mytable WHERE Distance BETWEEN 615 AND 221 LIMIT 16"]}
-{"sql":"SELECT WheelsOff, \"Month\" FROM mytable WHERE Origin > 'PBI' AND DestAirportSeqID = 1127402 OR DestStateFips > 27 ORDER BY CRSArrTime, Origin, DestAirportID LIMIT 14","hsqls":["SELECT WheelsOff, Month FROM mytable WHERE Origin > 'PBI' AND DestAirportSeqID = 1127402 OR DestStateFips > 27 ORDER BY CRSArrTime, Origin, DestAirportID LIMIT 14"]}
+{"sql":"SELECT MAX(DepDel15), SUM(TaxiOut), SUM(\"Year\") FROM mytable WHERE Distance BETWEEN 615 AND 221 LIMIT 16","hsqls":["SELECT MAX(DepDel15), SUM(TaxiOut), SUM(`Year`) FROM mytable WHERE Distance BETWEEN 615 AND 221 LIMIT 16"]}
+{"sql":"SELECT WheelsOff, \"Month\" FROM mytable WHERE Origin > 'PBI' AND DestAirportSeqID = 1127402 OR DestStateFips > 27 ORDER BY CRSArrTime, Origin, DestAirportID LIMIT 14","hsqls":["SELECT WheelsOff, `Month` FROM mytable WHERE Origin > 'PBI' AND DestAirportSeqID = 1127402 OR DestStateFips > 27 ORDER BY CRSArrTime, Origin, DestAirportID LIMIT 14"]}
 {"sql":"SELECT WheelsOn, AVG(CRSArrTime), COUNT(Distance) FROM mytable WHERE WheelsOn > 1550 GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 21","hsqls":["SELECT WheelsOn, AVG(CRSArrTime), COUNT(Distance) FROM mytable WHERE WheelsOn > 1550 GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 21"]}
 {"sql":"SELECT WheelsOff, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 49 AND 6 AND NASDelay NOT IN (63) GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 10","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 49 AND 6 AND NASDelay NOT IN (63) GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 10"]}
-{"sql":"SELECT ArrTimeBlk, DivAirportIDs, AirTime FROM mytable ORDER BY ArrTime, Dest, DivArrDelay LIMIT 5","hsqls":["SELECT ArrTimeBlk, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirTime FROM mytable ORDER BY ArrTime, Dest, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DivAirportIDs, AirTime FROM mytable ORDER BY ArrTime, Dest, DivArrDelay LIMIT 5","hsqls":["SELECT ArrTimeBlk, DivAirportIDs, AirTime FROM mytable ORDER BY ArrTime, Dest, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTime, CRSElapsedTime, AVG(FirstDepTime) FROM mytable GROUP BY ArrTime, CRSElapsedTime  ORDER BY ArrTime, CRSElapsedTime LIMIT 13","hsqls":["SELECT ArrTime, CRSElapsedTime, AVG(FirstDepTime) FROM mytable GROUP BY ArrTime, CRSElapsedTime  ORDER BY ArrTime, CRSElapsedTime LIMIT 13"]}
-{"sql":"SELECT Flights FROM mytable WHERE TaxiIn IN (7) AND DivWheelsOffs IN (1356, 1535, 1115, 1836) ORDER BY FlightNum, WeatherDelay, OriginCityName LIMIT 27","hsqls":["SELECT Flights FROM mytable WHERE TaxiIn IN (7) AND (DivWheelsOffs__MV0 IN (1356, 1535, 1115, 1836) OR DivWheelsOffs__MV1 IN (1356, 1535, 1115, 1836) OR DivWheelsOffs__MV2 IN (1356, 1535, 1115, 1836) OR DivWheelsOffs__MV3 IN (1356, 1535, 1115, 1836) OR DivWheelsOffs__MV4 IN (1356, 1535, 1115, 1836)) ORDER BY FlightNum, WeatherDelay, OriginCityName LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes FROM mytable WHERE FlightNum NOT IN (1289, 196, 5288, 6079, 4093) AND \"Month\" <> 1 OR FlightNum BETWEEN 4443 AND 1276 ORDER BY DestAirportID LIMIT 27","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE FlightNum NOT IN (1289, 196, 5288, 6079, 4093) AND Month <> 1 OR FlightNum BETWEEN 4443 AND 1276 ORDER BY DestAirportID LIMIT 27"]}
+{"sql":"SELECT Flights FROM mytable WHERE TaxiIn IN (7) AND DivWheelsOffs IN (1356, 1535, 1115, 1836) ORDER BY FlightNum, WeatherDelay, OriginCityName LIMIT 27","hsqls":["SELECT Flights FROM mytable WHERE TaxiIn IN (7) AND (DivWheelsOffs[1] IN (1356, 1535, 1115, 1836) OR DivWheelsOffs[2] IN (1356, 1535, 1115, 1836) OR DivWheelsOffs[3] IN (1356, 1535, 1115, 1836) OR DivWheelsOffs[4] IN (1356, 1535, 1115, 1836) OR DivWheelsOffs[5] IN (1356, 1535, 1115, 1836)) ORDER BY FlightNum, WeatherDelay, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes FROM mytable WHERE FlightNum NOT IN (1289, 196, 5288, 6079, 4093) AND \"Month\" <> 1 OR FlightNum BETWEEN 4443 AND 1276 ORDER BY DestAirportID LIMIT 27","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE FlightNum NOT IN (1289, 196, 5288, 6079, 4093) AND `Month` <> 1 OR FlightNum BETWEEN 4443 AND 1276 ORDER BY DestAirportID LIMIT 27"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE LongestAddGTime NOT IN (13) ORDER BY DivDistance, FlightNum, OriginStateName LIMIT 10"}
 {"sql":"SELECT CancellationCode, MIN(WheelsOn), MAX(SecurityDelay) FROM mytable WHERE ArrTimeBlk <= '1000-1059' AND OriginWac <> 82 OR OriginStateFips BETWEEN 32 AND 21 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 21","hsqls":["SELECT CancellationCode, MIN(WheelsOn), MAX(SecurityDelay) FROM mytable WHERE ArrTimeBlk <= '1000-1059' AND OriginWac <> 82 OR OriginStateFips BETWEEN 32 AND 21 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 21"]}
-{"sql":"SELECT DivAirportIDs, DivWheelsOffs FROM mytable WHERE WheelsOff BETWEEN 641 AND 2055 ORDER BY TailNum","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE WheelsOff BETWEEN 641 AND 2055 ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, DivWheelsOffs FROM mytable WHERE WheelsOff BETWEEN 641 AND 2055 ORDER BY TailNum","hsqls":["SELECT DivAirportIDs, DivWheelsOffs FROM mytable WHERE WheelsOff BETWEEN 641 AND 2055 ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, OriginCityName, DivActualElapsedTime, AVG(TaxiIn), COUNT(DestState) FROM mytable WHERE FirstDepTime BETWEEN 1653 AND 639 OR Quarter < 1 OR OriginCityName <= 'Williston, ND' GROUP BY OriginAirportSeqID, OriginCityName, DivActualElapsedTime  ORDER BY OriginAirportSeqID, OriginCityName, DivActualElapsedTime LIMIT 20","hsqls":["SELECT OriginAirportSeqID, OriginCityName, DivActualElapsedTime, AVG(TaxiIn), COUNT(DestState) FROM mytable WHERE FirstDepTime BETWEEN 1653 AND 639 OR Quarter < 1 OR OriginCityName <= 'Williston, ND' GROUP BY OriginAirportSeqID, OriginCityName, DivActualElapsedTime  ORDER BY OriginAirportSeqID, OriginCityName, DivActualElapsedTime LIMIT 20"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled IN (1, 0) LIMIT 5"}
 {"sql":"SELECT OriginCityName, ArrTime, ArrDel15, AVG(DepDelay) FROM mytable WHERE FlightNum BETWEEN 3038 AND 478 OR ArrTimeBlk IN ('1100-1159', '0800-0859', '0600-0659', '1400-1459', '1500-1559') GROUP BY OriginCityName, ArrTime, ArrDel15  ORDER BY OriginCityName, ArrTime, ArrDel15 LIMIT 23","hsqls":["SELECT OriginCityName, ArrTime, ArrDel15, AVG(DepDelay) FROM mytable WHERE FlightNum BETWEEN 3038 AND 478 OR ArrTimeBlk IN ('1100-1159', '0800-0859', '0600-0659', '1400-1459', '1500-1559') GROUP BY OriginCityName, ArrTime, ArrDel15  ORDER BY OriginCityName, ArrTime, ArrDel15 LIMIT 23"]}
-{"sql":"SELECT Quarter FROM mytable WHERE DivTailNums <= 'N449US' AND Flights > 1 OR \"Month\" = 1 ORDER BY \"Month\", OriginStateName LIMIT 14","hsqls":["SELECT Quarter FROM mytable WHERE (DivTailNums__MV0 <= 'N449US' OR DivTailNums__MV1 <= 'N449US' OR DivTailNums__MV2 <= 'N449US' OR DivTailNums__MV3 <= 'N449US' OR DivTailNums__MV4 <= 'N449US') AND Flights > 1 OR Month = 1 ORDER BY Month, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivWheelsOffs <= 2313 LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 <= 2313 OR DivWheelsOffs__MV1 <= 2313 OR DivWheelsOffs__MV2 <= 2313 OR DivWheelsOffs__MV3 <= 2313 OR DivWheelsOffs__MV4 <= 2313) LIMIT 10000"]}
+{"sql":"SELECT Quarter FROM mytable WHERE DivTailNums <= 'N449US' AND Flights > 1 OR \"Month\" = 1 ORDER BY \"Month\", OriginStateName LIMIT 14","hsqls":["SELECT Quarter FROM mytable WHERE (DivTailNums[1] <= 'N449US' OR DivTailNums[2] <= 'N449US' OR DivTailNums[3] <= 'N449US' OR DivTailNums[4] <= 'N449US' OR DivTailNums[5] <= 'N449US') AND Flights > 1 OR `Month` = 1 ORDER BY Month, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivWheelsOffs <= 2313 LIMIT 25","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] <= 2313 OR DivWheelsOffs[2] <= 2313 OR DivWheelsOffs[3] <= 2313 OR DivWheelsOffs[4] <= 2313 OR DivWheelsOffs[5] <= 2313) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, ArrDelayMinutes FROM mytable WHERE WheelsOn = 2329 ORDER BY CRSArrTime LIMIT 17"}
 {"sql":"SELECT MIN(SecurityDelay), AVG(DestStateFips), MAX(DestWac) FROM mytable WHERE UniqueCarrier NOT IN ('DL') LIMIT 18"}
 {"sql":"SELECT \"Year\", CancellationCode, SUM(ArrDel15), COUNT(OriginStateName) FROM mytable GROUP BY \"Year\", CancellationCode LIMIT 21","hsqls":["SELECT Year, CancellationCode, SUM(ArrDel15), COUNT(OriginStateName) FROM mytable GROUP BY Year, CancellationCode LIMIT 21"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE ArrDelayMinutes NOT IN (150.0) ORDER BY FlightNum LIMIT 7","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE ArrDelayMinutes NOT IN (150.0) ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE ArrDelayMinutes NOT IN (150.0) ORDER BY FlightNum LIMIT 7","hsqls":["SELECT DivAirports FROM mytable WHERE ArrDelayMinutes NOT IN (150.0) ORDER BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DestStateFips BETWEEN 26 AND 26 GROUP BY DivReachedDest, DaysSinceEpoch  ORDER BY DivReachedDest, DaysSinceEpoch LIMIT 18","hsqls":["SELECT DivReachedDest, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DestStateFips BETWEEN 26 AND 26 GROUP BY DivReachedDest, DaysSinceEpoch  ORDER BY DivReachedDest, DaysSinceEpoch LIMIT 18"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportIDs BETWEEN 12264 AND 11986 AND Flights <> 1 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 12264 AND 11986 OR DivAirportIDs__MV1 BETWEEN 12264 AND 11986 OR DivAirportIDs__MV2 BETWEEN 12264 AND 11986 OR DivAirportIDs__MV3 BETWEEN 12264 AND 11986 OR DivAirportIDs__MV4 BETWEEN 12264 AND 11986) AND Flights <> 1 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportIDs BETWEEN 12264 AND 11986 AND Flights <> 1 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 12264 AND 11986 OR DivAirportIDs[2] BETWEEN 12264 AND 11986 OR DivAirportIDs[3] BETWEEN 12264 AND 11986 OR DivAirportIDs[4] BETWEEN 12264 AND 11986 OR DivAirportIDs[5] BETWEEN 12264 AND 11986) AND Flights <> 1 LIMIT 10000"]}
 {"sql":"SELECT Carrier, FlightNum, ArrDelayMinutes FROM mytable WHERE Distance >= 859 OR ArrDel15 BETWEEN 1 AND 1 LIMIT 10"}
 {"sql":"SELECT DepDelay, DestState, AirTime FROM mytable WHERE CRSArrTime IN (2357, 2247, 800, 1105, 732) ORDER BY OriginWac LIMIT 27"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE LateAircraftDelay IN (180, 70, 246) LIMIT 16"}
 {"sql":"SELECT OriginState, OriginCityMarketID FROM mytable WHERE DivActualElapsedTime IN (363, 1121, 317, 615, 938) OR AirlineID >= 21171 OR UniqueCarrier > 'FL' LIMIT 26"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DayOfWeek IN (2, 5) ORDER BY DepTimeBlk LIMIT 9"}
 {"sql":"SELECT ArrivalDelayGroups, MAX(TaxiOut), COUNT(WheelsOff), COUNT(DepDelayMinutes) FROM mytable WHERE TailNum <= 'N3746H' GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 2","hsqls":["SELECT ArrivalDelayGroups, MAX(TaxiOut), COUNT(WheelsOff), COUNT(DepDelayMinutes) FROM mytable WHERE TailNum <= 'N3746H' GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 2"]}
-{"sql":"SELECT ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DestStateFips = 2 AND DepDelay BETWEEN 45.0 AND 292.0 OR DestWac BETWEEN 34 AND 84 LIMIT 23","hsqls":["SELECT ArrDelayMinutes, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DestStateFips = 2 AND DepDelay BETWEEN 45.0 AND 292.0 OR DestWac BETWEEN 34 AND 84 LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, DepTime FROM mytable WHERE OriginStateName = 'Michigan' AND DepDelay IN (253.0, 191.0) LIMIT 8","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepTime FROM mytable WHERE OriginStateName = 'Michigan' AND DepDelay IN (253.0, 191.0) LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, AVG(\"Month\"), COUNT(SecurityDelay), SUM(ActualElapsedTime) FROM mytable GROUP BY TotalAddGTime LIMIT 23","hsqls":["SELECT TotalAddGTime, AVG(Month), COUNT(SecurityDelay), SUM(ActualElapsedTime) FROM mytable GROUP BY TotalAddGTime LIMIT 23"]}
+{"sql":"SELECT ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DestStateFips = 2 AND DepDelay BETWEEN 45.0 AND 292.0 OR DestWac BETWEEN 34 AND 84 LIMIT 23","hsqls":["SELECT ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DestStateFips = 2 AND DepDelay BETWEEN 45.0 AND 292.0 OR DestWac BETWEEN 34 AND 84 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepTime FROM mytable WHERE OriginStateName = 'Michigan' AND DepDelay IN (253.0, 191.0) LIMIT 8","hsqls":["SELECT DivWheelsOns, DepTime FROM mytable WHERE OriginStateName = 'Michigan' AND DepDelay IN (253.0, 191.0) LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, AVG(\"Month\"), COUNT(SecurityDelay), SUM(ActualElapsedTime) FROM mytable GROUP BY TotalAddGTime LIMIT 23","hsqls":["SELECT TotalAddGTime, AVG(`Month`), COUNT(SecurityDelay), SUM(ActualElapsedTime) FROM mytable GROUP BY TotalAddGTime LIMIT 23"]}
 {"sql":"SELECT NASDelay, COUNT(DepartureDelayGroups), COUNT(Distance) FROM mytable WHERE TaxiOut IN (3, 48, 7, 35, 24) OR WheelsOn BETWEEN 1248 AND 2357 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 19","hsqls":["SELECT NASDelay, COUNT(DepartureDelayGroups), COUNT(Distance) FROM mytable WHERE TaxiOut IN (3, 48, 7, 35, 24) OR WheelsOn BETWEEN 1248 AND 2357 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 19"]}
 {"sql":"SELECT DivReachedDest, Quarter, DivArrDelay, SUM(FirstDepTime) FROM mytable GROUP BY DivReachedDest, Quarter, DivArrDelay  ORDER BY DivReachedDest, Quarter, DivArrDelay LIMIT 10","hsqls":["SELECT DivReachedDest, Quarter, DivArrDelay, SUM(FirstDepTime) FROM mytable GROUP BY DivReachedDest, Quarter, DivArrDelay  ORDER BY DivReachedDest, Quarter, DivArrDelay LIMIT 10"]}
-{"sql":"SELECT MIN(WheelsOn), SUM(DivDistance) FROM mytable WHERE DivTotalGTimes IN (1, 59, 44, 56, 201)","hsqls":["SELECT MIN(WheelsOn), SUM(DivDistance)  FROM mytable WHERE (DivTotalGTimes__MV0 IN (1, 59, 44, 56, 201) OR DivTotalGTimes__MV1 IN (1, 59, 44, 56, 201) OR DivTotalGTimes__MV2 IN (1, 59, 44, 56, 201) OR DivTotalGTimes__MV3 IN (1, 59, 44, 56, 201) OR DivTotalGTimes__MV4 IN (1, 59, 44, 56, 201)) LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE OriginState IN ('IN', 'NJ') AND OriginStateName <> 'Texas' AND DivAirportIDs IN (11630, 14828, 14006, 10785) LIMIT 14","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE OriginState IN ('IN', 'NJ') AND OriginStateName <> 'Texas' AND (DivAirportIDs__MV0 IN (11630, 14828, 14006, 10785) OR DivAirportIDs__MV1 IN (11630, 14828, 14006, 10785) OR DivAirportIDs__MV2 IN (11630, 14828, 14006, 10785) OR DivAirportIDs__MV3 IN (11630, 14828, 14006, 10785) OR DivAirportIDs__MV4 IN (11630, 14828, 14006, 10785)) LIMIT 10000"]}
+{"sql":"SELECT MIN(WheelsOn), SUM(DivDistance) FROM mytable WHERE DivTotalGTimes IN (1, 59, 44, 56, 201)","hsqls":["SELECT MIN(WheelsOn), SUM(DivDistance)  FROM mytable WHERE (DivTotalGTimes[1] IN (1, 59, 44, 56, 201) OR DivTotalGTimes[2] IN (1, 59, 44, 56, 201) OR DivTotalGTimes[3] IN (1, 59, 44, 56, 201) OR DivTotalGTimes[4] IN (1, 59, 44, 56, 201) OR DivTotalGTimes[5] IN (1, 59, 44, 56, 201)) LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE OriginState IN ('IN', 'NJ') AND OriginStateName <> 'Texas' AND DivAirportIDs IN (11630, 14828, 14006, 10785) LIMIT 14","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE OriginState IN ('IN', 'NJ') AND OriginStateName <> 'Texas' AND (DivAirportIDs[1] IN (11630, 14828, 14006, 10785) OR DivAirportIDs[2] IN (11630, 14828, 14006, 10785) OR DivAirportIDs[3] IN (11630, 14828, 14006, 10785) OR DivAirportIDs[4] IN (11630, 14828, 14006, 10785) OR DivAirportIDs[5] IN (11630, 14828, 14006, 10785)) LIMIT 10000"]}
 {"sql":"SELECT TailNum, CRSDepTime, CRSElapsedTime, COUNT(Carrier), AVG(OriginWac), MIN(NASDelay) FROM mytable WHERE ArrTime >= 1837 OR DepTime > 1413 AND OriginState IN ('CA') GROUP BY TailNum, CRSDepTime, CRSElapsedTime  ORDER BY TailNum, CRSDepTime, CRSElapsedTime LIMIT 11","hsqls":["SELECT TailNum, CRSDepTime, CRSElapsedTime, COUNT(Carrier), AVG(OriginWac), MIN(NASDelay) FROM mytable WHERE ArrTime >= 1837 OR DepTime > 1413 AND OriginState IN ('CA') GROUP BY TailNum, CRSDepTime, CRSElapsedTime  ORDER BY TailNum, CRSDepTime, CRSElapsedTime LIMIT 11"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE DivArrDelay BETWEEN 383 AND 1363 ORDER BY DistanceGroup LIMIT 23"}
 {"sql":"SELECT MIN(CRSArrTime) FROM mytable WHERE DistanceGroup > 6 AND TailNum NOT IN ('N247WN') LIMIT 11"}
 {"sql":"SELECT ArrTime, COUNT(*) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 5","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 5"]}
-{"sql":"SELECT Distance, DepTime, DivTailNums FROM mytable ORDER BY LateAircraftDelay, CRSDepTime LIMIT 10","hsqls":["SELECT Distance, DepTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY LateAircraftDelay, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT Distance, DepTime, DivTailNums FROM mytable ORDER BY LateAircraftDelay, CRSDepTime LIMIT 10","hsqls":["SELECT Distance, DepTime, DivTailNums FROM mytable ORDER BY LateAircraftDelay, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, MIN(DivReachedDest), MIN(AirlineID) FROM mytable WHERE CarrierDelay BETWEEN 189 AND 235 AND OriginState BETWEEN 'NM' AND 'WY' OR NASDelay BETWEEN 64 AND 29 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 17","hsqls":["SELECT DaysSinceEpoch, MIN(DivReachedDest), MIN(AirlineID) FROM mytable WHERE CarrierDelay BETWEEN 189 AND 235 AND OriginState BETWEEN 'NM' AND 'WY' OR NASDelay BETWEEN 64 AND 29 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 17"]}
 {"sql":"SELECT TaxiOut, DivReachedDest, FlightDate FROM mytable WHERE TailNum BETWEEN 'N176UW' AND 'N3HGAA' OR DepDelayMinutes BETWEEN 16.0 AND 472.0 ORDER BY DistanceGroup, Diverted LIMIT 13"}
 {"sql":"SELECT AirlineID FROM mytable WHERE ActualElapsedTime <> 72 LIMIT 29"}
 {"sql":"SELECT OriginState, SUM(DivActualElapsedTime) FROM mytable WHERE DestAirportID < 14674 GROUP BY OriginState  ORDER BY OriginState LIMIT 23","hsqls":["SELECT OriginState, SUM(DivActualElapsedTime) FROM mytable WHERE DestAirportID < 14674 GROUP BY OriginState  ORDER BY OriginState LIMIT 23"]}
-{"sql":"SELECT Diverted, Carrier, ArrivalDelayGroups FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY DepDel15, AirlineID LIMIT 18","hsqls":["SELECT Diverted, Carrier, ArrivalDelayGroups FROM mytable WHERE Year NOT IN (2014) ORDER BY DepDel15, AirlineID LIMIT 18"]}
+{"sql":"SELECT Diverted, Carrier, ArrivalDelayGroups FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY DepDel15, AirlineID LIMIT 18","hsqls":["SELECT Diverted, Carrier, ArrivalDelayGroups FROM mytable WHERE `Year` NOT IN (2014) ORDER BY DepDel15, AirlineID LIMIT 18"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 1"}
 {"sql":"SELECT OriginStateFips, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DestStateFips BETWEEN 56 AND 24 OR Origin >= 'SJU' GROUP BY OriginStateFips, DivActualElapsedTime  ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 9","hsqls":["SELECT OriginStateFips, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DestStateFips BETWEEN 56 AND 24 OR Origin >= 'SJU' GROUP BY OriginStateFips, DivActualElapsedTime  ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 9"]}
-{"sql":"SELECT WheelsOff, DivAirportSeqIDs, \"Month\" FROM mytable ORDER BY AirlineID, DestAirportID LIMIT 6","hsqls":["SELECT WheelsOff, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Month FROM mytable ORDER BY AirlineID, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivAirportLandings > 0 OR AirlineID BETWEEN 20398 AND 19805 OR \"Year\" BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 20","hsqls":["SELECT DepTimeBlk FROM mytable WHERE DivAirportLandings > 0 OR AirlineID BETWEEN 20398 AND 19805 OR Year BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 20"]}
+{"sql":"SELECT WheelsOff, DivAirportSeqIDs, \"Month\" FROM mytable ORDER BY AirlineID, DestAirportID LIMIT 6","hsqls":["SELECT WheelsOff, DivAirportSeqIDs, `Month` FROM mytable ORDER BY AirlineID, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivAirportLandings > 0 OR AirlineID BETWEEN 20398 AND 19805 OR \"Year\" BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 20","hsqls":["SELECT DepTimeBlk FROM mytable WHERE DivAirportLandings > 0 OR AirlineID BETWEEN 20398 AND 19805 OR `Year` BETWEEN 2014 AND 2014 ORDER BY DivReachedDest LIMIT 20"]}
 {"sql":"SELECT TotalAddGTime, ActualElapsedTime, COUNT(*) FROM mytable WHERE Origin >= 'SAN' AND DepTimeBlk NOT IN ('2200-2259', '1300-1359', '1000-1059', '0800-0859', '0900-0959') GROUP BY TotalAddGTime, ActualElapsedTime  ORDER BY TotalAddGTime, ActualElapsedTime LIMIT 4","hsqls":["SELECT TotalAddGTime, ActualElapsedTime, COUNT(*) FROM mytable WHERE Origin >= 'SAN' AND DepTimeBlk NOT IN ('2200-2259', '1300-1359', '1000-1059', '0800-0859', '0900-0959') GROUP BY TotalAddGTime, ActualElapsedTime  ORDER BY TotalAddGTime, ActualElapsedTime LIMIT 4"]}
-{"sql":"SELECT TaxiIn, CRSDepTime, AVG(FirstDepTime) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 AND DayofMonth BETWEEN 1 AND 25 OR DivTotalGTimes BETWEEN 55 AND 56 GROUP BY TaxiIn, CRSDepTime LIMIT 8","hsqls":["SELECT TaxiIn, CRSDepTime, AVG(CAST(FirstDepTime AS DOUBLE)) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 AND DayofMonth BETWEEN 1 AND 25 OR (DivTotalGTimes__MV0 BETWEEN 55 AND 56 OR DivTotalGTimes__MV1 BETWEEN 55 AND 56 OR DivTotalGTimes__MV2 BETWEEN 55 AND 56 OR DivTotalGTimes__MV3 BETWEEN 55 AND 56 OR DivTotalGTimes__MV4 BETWEEN 55 AND 56) GROUP BY TaxiIn, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, CRSDepTime, AVG(FirstDepTime) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 AND DayofMonth BETWEEN 1 AND 25 OR DivTotalGTimes BETWEEN 55 AND 56 GROUP BY TaxiIn, CRSDepTime LIMIT 8","hsqls":["SELECT TaxiIn, CRSDepTime, AVG(CAST(FirstDepTime AS DOUBLE)) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 AND DayofMonth BETWEEN 1 AND 25 OR (DivTotalGTimes[1] BETWEEN 55 AND 56 OR DivTotalGTimes[2] BETWEEN 55 AND 56 OR DivTotalGTimes[3] BETWEEN 55 AND 56 OR DivTotalGTimes[4] BETWEEN 55 AND 56 OR DivTotalGTimes[5] BETWEEN 55 AND 56) GROUP BY TaxiIn, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, DayOfWeek, COUNT(*) FROM mytable WHERE DestWac IN (53, 37) AND CRSDepTime IN (600, 1016) OR DestStateName <> 'North Carolina' GROUP BY DaysSinceEpoch, DayOfWeek  ORDER BY DaysSinceEpoch, DayOfWeek LIMIT 28","hsqls":["SELECT DaysSinceEpoch, DayOfWeek, COUNT(*) FROM mytable WHERE DestWac IN (53, 37) AND CRSDepTime IN (600, 1016) OR DestStateName <> 'North Carolina' GROUP BY DaysSinceEpoch, DayOfWeek  ORDER BY DaysSinceEpoch, DayOfWeek LIMIT 28"]}
 {"sql":"SELECT DepDelay, FlightNum, OriginCityMarketID FROM mytable WHERE Flights NOT IN (1) AND ActualElapsedTime <> 127 AND DestStateName BETWEEN 'Connecticut' AND 'Washington' ORDER BY FlightNum LIMIT 23"}
 {"sql":"SELECT Quarter, Carrier, OriginAirportID FROM mytable WHERE DayOfWeek IN (2, 1, 7, 6) OR SecurityDelay BETWEEN 4 AND 14 LIMIT 1"}
@@ -4170,74 +4170,74 @@
 {"sql":"SELECT Quarter, FirstDepTime, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 194.0 AND 329.0 AND DivDistance > 544 OR AirTime NOT IN (221, 276, 41, 124) GROUP BY Quarter, FirstDepTime  ORDER BY Quarter, FirstDepTime LIMIT 19","hsqls":["SELECT Quarter, FirstDepTime, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 194.0 AND 329.0 AND DivDistance > 544 OR AirTime NOT IN (221, 276, 41, 124) GROUP BY Quarter, FirstDepTime  ORDER BY Quarter, FirstDepTime LIMIT 19"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DepTimeBlk >= '1700-1759' OR OriginAirportSeqID >= 1288403 AND DestAirportSeqID NOT IN (1055102, 1245102, 1469802, 1190502) ORDER BY DivReachedDest, Distance LIMIT 26"}
 {"sql":"SELECT ActualElapsedTime, Origin FROM mytable ORDER BY WeatherDelay, Distance, CRSElapsedTime LIMIT 19"}
-{"sql":"SELECT DestStateName, OriginWac, \"Month\", MAX(DaysSinceEpoch) FROM mytable WHERE DepDel15 IN (-9999) GROUP BY DestStateName, OriginWac, \"Month\" LIMIT 2","hsqls":["SELECT DestStateName, OriginWac, Month, MAX(DaysSinceEpoch) FROM mytable WHERE DepDel15 IN (-9999) GROUP BY DestStateName, OriginWac, Month LIMIT 2"]}
+{"sql":"SELECT DestStateName, OriginWac, \"Month\", MAX(DaysSinceEpoch) FROM mytable WHERE DepDel15 IN (-9999) GROUP BY DestStateName, OriginWac, \"Month\" LIMIT 2","hsqls":["SELECT DestStateName, OriginWac, Month, MAX(DaysSinceEpoch) FROM mytable WHERE DepDel15 IN (-9999) GROUP BY DestStateName, OriginWac, `Month` LIMIT 2"]}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'VX' OR DestAirportID IN (10141, 12892, 11049, 13232) ORDER BY DivReachedDest LIMIT 23"}
 {"sql":"SELECT OriginCityMarketID, Flights, TaxiIn FROM mytable WHERE DepDel15 < 1 AND CRSArrTime BETWEEN 1358 AND 2104 OR DestCityMarketID NOT IN (31401) ORDER BY ArrDelayMinutes LIMIT 10"}
 {"sql":"SELECT MIN(SecurityDelay), MIN(DivArrDelay), MIN(DestAirportSeqID) FROM mytable LIMIT 13"}
 {"sql":"SELECT DestWac, DepDelay FROM mytable WHERE DestCityMarketID IN (30620, 32070, 31995, 30073, 30731) ORDER BY DepartureDelayGroups, DaysSinceEpoch LIMIT 8"}
-{"sql":"SELECT DivAirportIDs, AirlineID FROM mytable WHERE DestCityName >= 'Deadhorse, AK' OR CancellationCode BETWEEN 'B' AND 'B' ORDER BY Distance, TaxiIn LIMIT 15","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirlineID FROM mytable WHERE DestCityName >= 'Deadhorse, AK' OR CancellationCode BETWEEN 'B' AND 'B' ORDER BY Distance, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, AirlineID FROM mytable WHERE DestCityName >= 'Deadhorse, AK' OR CancellationCode BETWEEN 'B' AND 'B' ORDER BY Distance, TaxiIn LIMIT 15","hsqls":["SELECT DivAirportIDs, AirlineID FROM mytable WHERE DestCityName >= 'Deadhorse, AK' OR CancellationCode BETWEEN 'B' AND 'B' ORDER BY Distance, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT ArrDelay FROM mytable LIMIT 27"}
 {"sql":"SELECT OriginAirportSeqID, NASDelay FROM mytable WHERE DestAirportSeqID <> 1161802 AND Origin NOT IN ('CAE', 'SAV') OR CRSDepTime >= 1902 ORDER BY TaxiIn, AirlineID LIMIT 18"}
-{"sql":"SELECT LateAircraftDelay, AVG(ArrDelayMinutes), SUM(Distance), MIN(Distance) FROM mytable WHERE DivWheelsOns BETWEEN 1715 AND 2314 GROUP BY LateAircraftDelay LIMIT 28","hsqls":["SELECT LateAircraftDelay, AVG(ArrDelayMinutes), SUM(Distance), MIN(Distance) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1715 AND 2314 OR DivWheelsOns__MV1 BETWEEN 1715 AND 2314 OR DivWheelsOns__MV2 BETWEEN 1715 AND 2314 OR DivWheelsOns__MV3 BETWEEN 1715 AND 2314 OR DivWheelsOns__MV4 BETWEEN 1715 AND 2314) GROUP BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, AVG(ArrDelayMinutes), SUM(Distance), MIN(Distance) FROM mytable WHERE DivWheelsOns BETWEEN 1715 AND 2314 GROUP BY LateAircraftDelay LIMIT 28","hsqls":["SELECT LateAircraftDelay, AVG(ArrDelayMinutes), SUM(Distance), MIN(Distance) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1715 AND 2314 OR DivWheelsOns[2] BETWEEN 1715 AND 2314 OR DivWheelsOns[3] BETWEEN 1715 AND 2314 OR DivWheelsOns[4] BETWEEN 1715 AND 2314 OR DivWheelsOns[5] BETWEEN 1715 AND 2314) GROUP BY LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, DepDel15, COUNT(OriginAirportSeqID) FROM mytable WHERE LongestAddGTime >= 148 GROUP BY TotalAddGTime, DepDel15  ORDER BY TotalAddGTime, DepDel15 LIMIT 25","hsqls":["SELECT TotalAddGTime, DepDel15, COUNT(OriginAirportSeqID) FROM mytable WHERE LongestAddGTime >= 148 GROUP BY TotalAddGTime, DepDel15  ORDER BY TotalAddGTime, DepDel15 LIMIT 25"]}
 {"sql":"SELECT TotalAddGTime, CRSDepTime FROM mytable ORDER BY Quarter, DivAirportLandings LIMIT 10"}
 {"sql":"SELECT OriginState, COUNT(Origin) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 22","hsqls":["SELECT OriginState, COUNT(Origin) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 22"]}
-{"sql":"SELECT DepDelay, Carrier, DestCityName, SUM(\"Month\"), MAX(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE DaysSinceEpoch IN (16101) GROUP BY DepDelay, Carrier, DestCityName LIMIT 1","hsqls":["SELECT DepDelay, Carrier, DestCityName, SUM(Month), MAX(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE DaysSinceEpoch IN (16101) GROUP BY DepDelay, Carrier, DestCityName LIMIT 1"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE OriginState NOT IN ('TN', 'AZ', 'AK', 'HI', 'NH') OR DestAirportID NOT IN (11003) OR AirlineID = 19930 ORDER BY Quarter, DestState LIMIT 11","hsqls":["SELECT Month FROM mytable WHERE OriginState NOT IN ('TN', 'AZ', 'AK', 'HI', 'NH') OR DestAirportID NOT IN (11003) OR AirlineID = 19930 ORDER BY Quarter, DestState LIMIT 11"]}
+{"sql":"SELECT DepDelay, Carrier, DestCityName, SUM(\"Month\"), MAX(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE DaysSinceEpoch IN (16101) GROUP BY DepDelay, Carrier, DestCityName LIMIT 1","hsqls":["SELECT DepDelay, Carrier, DestCityName, SUM(`Month`), MAX(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE DaysSinceEpoch IN (16101) GROUP BY DepDelay, Carrier, DestCityName LIMIT 1"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE OriginState NOT IN ('TN', 'AZ', 'AK', 'HI', 'NH') OR DestAirportID NOT IN (11003) OR AirlineID = 19930 ORDER BY Quarter, DestState LIMIT 11","hsqls":["SELECT `Month` FROM mytable WHERE OriginState NOT IN ('TN', 'AZ', 'AK', 'HI', 'NH') OR DestAirportID NOT IN (11003) OR AirlineID = 19930 ORDER BY Quarter, DestState LIMIT 11"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE TaxiIn IN (10) LIMIT 24"}
 {"sql":"SELECT COUNT(DepartureDelayGroups), AVG(WheelsOff) FROM mytable WHERE CarrierDelay <> 43 AND DestStateFips BETWEEN 40 AND 17 LIMIT 13"}
-{"sql":"SELECT Quarter, DestCityName, DivTotalGTimes FROM mytable WHERE TaxiIn NOT IN (42, 47, 27) LIMIT 9","hsqls":["SELECT Quarter, DestCityName, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE TaxiIn NOT IN (42, 47, 27) LIMIT 10000"]}
+{"sql":"SELECT Quarter, DestCityName, DivTotalGTimes FROM mytable WHERE TaxiIn NOT IN (42, 47, 27) LIMIT 9","hsqls":["SELECT Quarter, DestCityName, DivTotalGTimes FROM mytable WHERE TaxiIn NOT IN (42, 47, 27) LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, FlightNum, CRSArrTime, COUNT(*) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND Carrier BETWEEN 'WN' AND 'OO' AND DaysSinceEpoch NOT IN (16095, 16085, 16078, 16089) GROUP BY LateAircraftDelay, FlightNum, CRSArrTime  ORDER BY LateAircraftDelay, FlightNum, CRSArrTime LIMIT 27","hsqls":["SELECT LateAircraftDelay, FlightNum, CRSArrTime, COUNT(*) FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND Carrier BETWEEN 'WN' AND 'OO' AND DaysSinceEpoch NOT IN (16095, 16085, 16078, 16089) GROUP BY LateAircraftDelay, FlightNum, CRSArrTime  ORDER BY LateAircraftDelay, FlightNum, CRSArrTime LIMIT 27"]}
-{"sql":"SELECT DivLongestGTimes, DayofMonth FROM mytable WHERE DestCityName BETWEEN 'Hilo, HI' AND 'Boston, MA' AND CarrierDelay BETWEEN 17 AND 141 OR ArrDelayMinutes = 93.0 ORDER BY OriginStateFips, Flights LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DayofMonth FROM mytable WHERE DestCityName BETWEEN 'Hilo, HI' AND 'Boston, MA' AND CarrierDelay BETWEEN 17 AND 141 OR ArrDelayMinutes = 93.0 ORDER BY OriginStateFips, Flights LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, DivAirportSeqIDs, ArrTimeBlk FROM mytable WHERE SecurityDelay NOT IN (0, 4, 27) AND ArrDelay NOT IN (198.0, 96.0, 291.0, 340.0) LIMIT 2","hsqls":["SELECT DivReachedDest, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrTimeBlk FROM mytable WHERE SecurityDelay NOT IN (0, 4, 27) AND ArrDelay NOT IN (198.0, 96.0, 291.0, 340.0) LIMIT 10000"]}
-{"sql":"SELECT \"Month\" FROM mytable LIMIT 6","hsqls":["SELECT Month FROM mytable LIMIT 6"]}
-{"sql":"SELECT WheelsOff FROM mytable WHERE WheelsOff BETWEEN 1107 AND 2222 OR DivAirports IN ('STL', 'IDA', 'noodles', 'TLH') LIMIT 12","hsqls":["SELECT WheelsOff FROM mytable WHERE WheelsOff BETWEEN 1107 AND 2222 OR (DivAirports__MV0 IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports__MV1 IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports__MV2 IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports__MV3 IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports__MV4 IN ('STL', 'IDA', 'noodles', 'TLH')) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DayofMonth FROM mytable WHERE DestCityName BETWEEN 'Hilo, HI' AND 'Boston, MA' AND CarrierDelay BETWEEN 17 AND 141 OR ArrDelayMinutes = 93.0 ORDER BY OriginStateFips, Flights LIMIT 10","hsqls":["SELECT DivLongestGTimes, DayofMonth FROM mytable WHERE DestCityName BETWEEN 'Hilo, HI' AND 'Boston, MA' AND CarrierDelay BETWEEN 17 AND 141 OR ArrDelayMinutes = 93.0 ORDER BY OriginStateFips, Flights LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivAirportSeqIDs, ArrTimeBlk FROM mytable WHERE SecurityDelay NOT IN (0, 4, 27) AND ArrDelay NOT IN (198.0, 96.0, 291.0, 340.0) LIMIT 2","hsqls":["SELECT DivReachedDest, DivAirportSeqIDs, ArrTimeBlk FROM mytable WHERE SecurityDelay NOT IN (0, 4, 27) AND ArrDelay NOT IN (198.0, 96.0, 291.0, 340.0) LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable LIMIT 6","hsqls":["SELECT `Month` FROM mytable LIMIT 6"]}
+{"sql":"SELECT WheelsOff FROM mytable WHERE WheelsOff BETWEEN 1107 AND 2222 OR DivAirports IN ('STL', 'IDA', 'noodles', 'TLH') LIMIT 12","hsqls":["SELECT WheelsOff FROM mytable WHERE WheelsOff BETWEEN 1107 AND 2222 OR (DivAirports[1] IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports[2] IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports[3] IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports[4] IN ('STL', 'IDA', 'noodles', 'TLH') OR DivAirports[5] IN ('STL', 'IDA', 'noodles', 'TLH')) LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DepTime, DepDel15, MAX(WheelsOn), COUNT(DepDelayMinutes) FROM mytable GROUP BY FirstDepTime, DepTime, DepDel15  ORDER BY FirstDepTime, DepTime, DepDel15 LIMIT 2","hsqls":["SELECT FirstDepTime, DepTime, DepDel15, MAX(WheelsOn), COUNT(DepDelayMinutes) FROM mytable GROUP BY FirstDepTime, DepTime, DepDel15  ORDER BY FirstDepTime, DepTime, DepDel15 LIMIT 2"]}
 {"sql":"SELECT MAX(DivDistance), SUM(CarrierDelay) FROM mytable WHERE Diverted BETWEEN 0 AND 0 LIMIT 7"}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE ActualElapsedTime BETWEEN 344 AND 156 OR DestAirportID NOT IN (10141, 14960, 11603, 11337) AND Quarter BETWEEN 1 AND 1 ORDER BY DestAirportID, DaysSinceEpoch LIMIT 20"}
-{"sql":"SELECT DivLongestGTimes, ArrTime FROM mytable ORDER BY WheelsOff, WeatherDelay, DepDel15 LIMIT 23","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTime FROM mytable ORDER BY WheelsOff, WeatherDelay, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTime FROM mytable ORDER BY WheelsOff, WeatherDelay, DepDel15 LIMIT 23","hsqls":["SELECT DivLongestGTimes, ArrTime FROM mytable ORDER BY WheelsOff, WeatherDelay, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, SUM(NASDelay) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 21","hsqls":["SELECT LongestAddGTime, SUM(NASDelay) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 21"]}
 {"sql":"SELECT DestStateFips, ArrTime FROM mytable WHERE ArrTimeBlk BETWEEN '1600-1659' AND '2100-2159' OR LongestAddGTime NOT IN (47, 13, 27, -9999) ORDER BY OriginStateFips, Cancelled, AirlineID LIMIT 16"}
 {"sql":"SELECT OriginAirportSeqID, SUM(LateAircraftDelay), MIN(DistanceGroup), COUNT(DaysSinceEpoch) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 2","hsqls":["SELECT OriginAirportSeqID, SUM(LateAircraftDelay), MIN(DistanceGroup), COUNT(DaysSinceEpoch) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 2"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE DestStateFips IN (20, 10, 30, 32) LIMIT 12"}
-{"sql":"SELECT DestAirportSeqID, ArrTimeBlk FROM mytable WHERE DivAirportSeqIDs >= 1232303 AND TaxiIn NOT IN (113, 65, 15, 63) OR DivAirports BETWEEN 'YYC' AND 'LIT' ORDER BY ArrTime, DestAirportSeqID LIMIT 19","hsqls":["SELECT DestAirportSeqID, ArrTimeBlk FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1232303 OR DivAirportSeqIDs__MV1 >= 1232303 OR DivAirportSeqIDs__MV2 >= 1232303 OR DivAirportSeqIDs__MV3 >= 1232303 OR DivAirportSeqIDs__MV4 >= 1232303) AND TaxiIn NOT IN (113, 65, 15, 63) OR (DivAirports__MV0 BETWEEN 'YYC' AND 'LIT' OR DivAirports__MV1 BETWEEN 'YYC' AND 'LIT' OR DivAirports__MV2 BETWEEN 'YYC' AND 'LIT' OR DivAirports__MV3 BETWEEN 'YYC' AND 'LIT' OR DivAirports__MV4 BETWEEN 'YYC' AND 'LIT') ORDER BY ArrTime, DestAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE OriginStateName = 'Oregon' OR DivAirportSeqIDs = 1425202 AND DepDelay BETWEEN 218.0 AND 180.0 GROUP BY DayOfWeek LIMIT 25","hsqls":["SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE OriginStateName = 'Oregon' OR (DivAirportSeqIDs__MV0 = 1425202 OR DivAirportSeqIDs__MV1 = 1425202 OR DivAirportSeqIDs__MV2 = 1425202 OR DivAirportSeqIDs__MV3 = 1425202 OR DivAirportSeqIDs__MV4 = 1425202) AND DepDelay BETWEEN 218.0 AND 180.0 GROUP BY DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT OriginCityName FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 9","hsqls":["SELECT OriginCityName FROM mytable WHERE Year BETWEEN 2014 AND 2014 LIMIT 9"]}
+{"sql":"SELECT DestAirportSeqID, ArrTimeBlk FROM mytable WHERE DivAirportSeqIDs >= 1232303 AND TaxiIn NOT IN (113, 65, 15, 63) OR DivAirports BETWEEN 'YYC' AND 'LIT' ORDER BY ArrTime, DestAirportSeqID LIMIT 19","hsqls":["SELECT DestAirportSeqID, ArrTimeBlk FROM mytable WHERE (DivAirportSeqIDs[1] >= 1232303 OR DivAirportSeqIDs[2] >= 1232303 OR DivAirportSeqIDs[3] >= 1232303 OR DivAirportSeqIDs[4] >= 1232303 OR DivAirportSeqIDs[5] >= 1232303) AND TaxiIn NOT IN (113, 65, 15, 63) OR (DivAirports[1] BETWEEN 'YYC' AND 'LIT' OR DivAirports[2] BETWEEN 'YYC' AND 'LIT' OR DivAirports[3] BETWEEN 'YYC' AND 'LIT' OR DivAirports[4] BETWEEN 'YYC' AND 'LIT' OR DivAirports[5] BETWEEN 'YYC' AND 'LIT') ORDER BY ArrTime, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE OriginStateName = 'Oregon' OR DivAirportSeqIDs = 1425202 AND DepDelay BETWEEN 218.0 AND 180.0 GROUP BY DayOfWeek LIMIT 25","hsqls":["SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE OriginStateName = 'Oregon' OR (DivAirportSeqIDs[1] = 1425202 OR DivAirportSeqIDs[2] = 1425202 OR DivAirportSeqIDs[3] = 1425202 OR DivAirportSeqIDs[4] = 1425202 OR DivAirportSeqIDs[5] = 1425202) AND DepDelay BETWEEN 218.0 AND 180.0 GROUP BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 9","hsqls":["SELECT OriginCityName FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 LIMIT 9"]}
 {"sql":"SELECT DepartureDelayGroups, Carrier FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY NASDelay, AirTime, OriginStateName LIMIT 24"}
 {"sql":"SELECT WeatherDelay, DestAirportID, COUNT(*) FROM mytable WHERE Distance <= 1310 GROUP BY WeatherDelay, DestAirportID  ORDER BY WeatherDelay, DestAirportID LIMIT 16","hsqls":["SELECT WeatherDelay, DestAirportID, COUNT(*) FROM mytable WHERE Distance <= 1310 GROUP BY WeatherDelay, DestAirportID  ORDER BY WeatherDelay, DestAirportID LIMIT 16"]}
 {"sql":"SELECT AVG(DivReachedDest), COUNT(DayOfWeek), MAX(DistanceGroup) FROM mytable WHERE OriginStateFips NOT IN (10, 36, 72) LIMIT 10"}
-{"sql":"SELECT DistanceGroup, DivWheelsOns, TailNum FROM mytable WHERE DepartureDelayGroups < 4 AND DepDelay < 26.0 AND WheelsOn > 2155 ORDER BY DepDelay, OriginCityName, ArrDelayMinutes LIMIT 10","hsqls":["SELECT DistanceGroup, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, TailNum FROM mytable WHERE DepartureDelayGroups < 4 AND DepDelay < 26.0 AND WheelsOn > 2155 ORDER BY DepDelay, OriginCityName, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivWheelsOns, TailNum FROM mytable WHERE DepartureDelayGroups < 4 AND DepDelay < 26.0 AND WheelsOn > 2155 ORDER BY DepDelay, OriginCityName, ArrDelayMinutes LIMIT 10","hsqls":["SELECT DistanceGroup, DivWheelsOns, TailNum FROM mytable WHERE DepartureDelayGroups < 4 AND DepDelay < 26.0 AND WheelsOn > 2155 ORDER BY DepDelay, OriginCityName, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, LateAircraftDelay, Origin, COUNT(*) FROM mytable WHERE FlightNum = 5611 OR ArrTimeBlk = '1300-1359' GROUP BY DivReachedDest, LateAircraftDelay, Origin  ORDER BY DivReachedDest, LateAircraftDelay, Origin LIMIT 11","hsqls":["SELECT DivReachedDest, LateAircraftDelay, Origin, COUNT(*) FROM mytable WHERE FlightNum = 5611 OR ArrTimeBlk = '1300-1359' GROUP BY DivReachedDest, LateAircraftDelay, Origin  ORDER BY DivReachedDest, LateAircraftDelay, Origin LIMIT 11"]}
-{"sql":"SELECT DestStateFips, AirlineID, DestAirportID FROM mytable WHERE DivAirportSeqIDs >= 1540103 OR WheelsOff NOT IN (957) OR DivWheelsOns >= 1550 ORDER BY DivReachedDest, CarrierDelay, WheelsOn","hsqls":["SELECT DestStateFips, AirlineID, DestAirportID FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1540103 OR DivAirportSeqIDs__MV1 >= 1540103 OR DivAirportSeqIDs__MV2 >= 1540103 OR DivAirportSeqIDs__MV3 >= 1540103 OR DivAirportSeqIDs__MV4 >= 1540103) OR WheelsOff NOT IN (957) OR (DivWheelsOns__MV0 >= 1550 OR DivWheelsOns__MV1 >= 1550 OR DivWheelsOns__MV2 >= 1550 OR DivWheelsOns__MV3 >= 1550 OR DivWheelsOns__MV4 >= 1550) ORDER BY DivReachedDest, CarrierDelay, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, AirlineID, DestAirportID FROM mytable WHERE DivAirportSeqIDs >= 1540103 OR WheelsOff NOT IN (957) OR DivWheelsOns >= 1550 ORDER BY DivReachedDest, CarrierDelay, WheelsOn","hsqls":["SELECT DestStateFips, AirlineID, DestAirportID FROM mytable WHERE (DivAirportSeqIDs[1] >= 1540103 OR DivAirportSeqIDs[2] >= 1540103 OR DivAirportSeqIDs[3] >= 1540103 OR DivAirportSeqIDs[4] >= 1540103 OR DivAirportSeqIDs[5] >= 1540103) OR WheelsOff NOT IN (957) OR (DivWheelsOns[1] >= 1550 OR DivWheelsOns[2] >= 1550 OR DivWheelsOns[3] >= 1550 OR DivWheelsOns[4] >= 1550 OR DivWheelsOns[5] >= 1550) ORDER BY DivReachedDest, CarrierDelay, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DivAirportLandings, COUNT(*) FROM mytable WHERE CRSDepTime NOT IN (1306, 908, 1146, 1038) AND DestAirportID > 12448 AND DivDistance BETWEEN 496 AND 588 GROUP BY DistanceGroup, DivAirportLandings  ORDER BY DistanceGroup, DivAirportLandings LIMIT 7","hsqls":["SELECT DistanceGroup, DivAirportLandings, COUNT(*) FROM mytable WHERE CRSDepTime NOT IN (1306, 908, 1146, 1038) AND DestAirportID > 12448 AND DivDistance BETWEEN 496 AND 588 GROUP BY DistanceGroup, DivAirportLandings  ORDER BY DistanceGroup, DivAirportLandings LIMIT 7"]}
 {"sql":"SELECT SUM(DayOfWeek) FROM mytable WHERE DaysSinceEpoch BETWEEN 16079 AND 16087 LIMIT 16"}
 {"sql":"SELECT FlightNum, DepDelayMinutes, DepTimeBlk, AVG(ArrDel15), MAX(DepartureDelayGroups) FROM mytable WHERE DayOfWeek NOT IN (3, 1) GROUP BY FlightNum, DepDelayMinutes, DepTimeBlk","hsqls":["SELECT FlightNum, DepDelayMinutes, DepTimeBlk, AVG(ArrDel15), MAX(DepartureDelayGroups) FROM mytable WHERE DayOfWeek NOT IN (3, 1) GROUP BY FlightNum, DepDelayMinutes, DepTimeBlk"]}
-{"sql":"SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE DivAirports IN ('BUR', 'OME') AND FlightNum BETWEEN 3364 AND 5606 LIMIT 10","hsqls":["SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE (DivAirports__MV0 IN ('BUR', 'OME') OR DivAirports__MV1 IN ('BUR', 'OME') OR DivAirports__MV2 IN ('BUR', 'OME') OR DivAirports__MV3 IN ('BUR', 'OME') OR DivAirports__MV4 IN ('BUR', 'OME')) AND FlightNum BETWEEN 3364 AND 5606 LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE DivAirports IN ('BUR', 'OME') AND FlightNum BETWEEN 3364 AND 5606 LIMIT 10","hsqls":["SELECT DistanceGroup, DepDelayMinutes FROM mytable WHERE (DivAirports[1] IN ('BUR', 'OME') OR DivAirports[2] IN ('BUR', 'OME') OR DivAirports[3] IN ('BUR', 'OME') OR DivAirports[4] IN ('BUR', 'OME') OR DivAirports[5] IN ('BUR', 'OME')) AND FlightNum BETWEEN 3364 AND 5606 LIMIT 10000"]}
 {"sql":"SELECT ArrTime, NASDelay FROM mytable WHERE ArrDelay = 0.0 AND DaysSinceEpoch BETWEEN 16080 AND 16101 ORDER BY DestAirportSeqID LIMIT 10"}
 {"sql":"SELECT OriginCityMarketID, Dest, DepTimeBlk FROM mytable WHERE DestStateFips IN (30) LIMIT 14"}
 {"sql":"SELECT LongestAddGTime, DestStateFips, DestCityMarketID FROM mytable ORDER BY DivReachedDest, ArrDelayMinutes, AirTime LIMIT 18"}
 {"sql":"SELECT DepTimeBlk, DivArrDelay FROM mytable LIMIT 2"}
 {"sql":"SELECT Quarter, DivAirportLandings, UniqueCarrier, COUNT(DivActualElapsedTime), MAX(NASDelay), AVG(Diverted) FROM mytable GROUP BY Quarter, DivAirportLandings, UniqueCarrier  ORDER BY Quarter, DivAirportLandings, UniqueCarrier LIMIT 19","hsqls":["SELECT Quarter, DivAirportLandings, UniqueCarrier, COUNT(DivActualElapsedTime), MAX(NASDelay), AVG(Diverted) FROM mytable GROUP BY Quarter, DivAirportLandings, UniqueCarrier  ORDER BY Quarter, DivAirportLandings, UniqueCarrier LIMIT 19"]}
-{"sql":"SELECT Distance, COUNT(DivReachedDest) FROM mytable WHERE DivAirportSeqIDs <= 1412202 OR ArrDelayMinutes IN (21.0, 105.0, 194.0) GROUP BY Distance LIMIT 6","hsqls":["SELECT Distance, COUNT(DivReachedDest) FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1412202 OR DivAirportSeqIDs__MV1 <= 1412202 OR DivAirportSeqIDs__MV2 <= 1412202 OR DivAirportSeqIDs__MV3 <= 1412202 OR DivAirportSeqIDs__MV4 <= 1412202) OR ArrDelayMinutes IN (21.0, 105.0, 194.0) GROUP BY Distance LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY DistanceGroup, DepDelayMinutes LIMIT 23","hsqls":["SELECT FirstDepTime FROM mytable WHERE Year NOT IN (2014) ORDER BY DistanceGroup, DepDelayMinutes LIMIT 23"]}
+{"sql":"SELECT Distance, COUNT(DivReachedDest) FROM mytable WHERE DivAirportSeqIDs <= 1412202 OR ArrDelayMinutes IN (21.0, 105.0, 194.0) GROUP BY Distance LIMIT 6","hsqls":["SELECT Distance, COUNT(DivReachedDest) FROM mytable WHERE (DivAirportSeqIDs[1] <= 1412202 OR DivAirportSeqIDs[2] <= 1412202 OR DivAirportSeqIDs[3] <= 1412202 OR DivAirportSeqIDs[4] <= 1412202 OR DivAirportSeqIDs[5] <= 1412202) OR ArrDelayMinutes IN (21.0, 105.0, 194.0) GROUP BY Distance LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY DistanceGroup, DepDelayMinutes LIMIT 23","hsqls":["SELECT FirstDepTime FROM mytable WHERE `Year` NOT IN (2014) ORDER BY DistanceGroup, DepDelayMinutes LIMIT 23"]}
 {"sql":"SELECT DestState FROM mytable ORDER BY DivReachedDest, DayOfWeek LIMIT 25"}
-{"sql":"SELECT OriginAirportSeqID, AirlineID, DivTotalGTimes FROM mytable WHERE DivWheelsOns BETWEEN 121 AND 1554 OR SecurityDelay IN (0, 18, 8, 14, -9999) LIMIT 8","hsqls":["SELECT OriginAirportSeqID, AirlineID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 121 AND 1554 OR DivWheelsOns__MV1 BETWEEN 121 AND 1554 OR DivWheelsOns__MV2 BETWEEN 121 AND 1554 OR DivWheelsOns__MV3 BETWEEN 121 AND 1554 OR DivWheelsOns__MV4 BETWEEN 121 AND 1554) OR SecurityDelay IN (0, 18, 8, 14, -9999) LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 OR DivWheelsOns < 942 LIMIT 23","hsqls":["SELECT TotalAddGTime FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 OR (DivWheelsOns__MV0 < 942 OR DivWheelsOns__MV1 < 942 OR DivWheelsOns__MV2 < 942 OR DivWheelsOns__MV3 < 942 OR DivWheelsOns__MV4 < 942) LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, AirlineID, DivTotalGTimes FROM mytable WHERE DivWheelsOns BETWEEN 121 AND 1554 OR SecurityDelay IN (0, 18, 8, 14, -9999) LIMIT 8","hsqls":["SELECT OriginAirportSeqID, AirlineID, DivTotalGTimes FROM mytable WHERE (DivWheelsOns[1] BETWEEN 121 AND 1554 OR DivWheelsOns[2] BETWEEN 121 AND 1554 OR DivWheelsOns[3] BETWEEN 121 AND 1554 OR DivWheelsOns[4] BETWEEN 121 AND 1554 OR DivWheelsOns[5] BETWEEN 121 AND 1554) OR SecurityDelay IN (0, 18, 8, 14, -9999) LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 OR DivWheelsOns < 942 LIMIT 23","hsqls":["SELECT TotalAddGTime FROM mytable WHERE DayOfWeek BETWEEN 5 AND 2 OR (DivWheelsOns[1] < 942 OR DivWheelsOns[2] < 942 OR DivWheelsOns[3] < 942 OR DivWheelsOns[4] < 942 OR DivWheelsOns[5] < 942) LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 ORDER BY CRSDepTime LIMIT 27"}
 {"sql":"SELECT Dest, COUNT(Diverted) FROM mytable WHERE Dest BETWEEN 'SBP' AND 'LAR' GROUP BY Dest","hsqls":["SELECT Dest, COUNT(Diverted) FROM mytable WHERE Dest BETWEEN 'SBP' AND 'LAR' GROUP BY Dest"]}
-{"sql":"SELECT DivWheelsOns, Flights FROM mytable WHERE DestCityName NOT IN ('Sarasota/Bradenton, FL', 'Lake Charles, LA', 'Atlanta, GA') OR ArrDel15 = 0 AND WheelsOn BETWEEN 1955 AND 1255 ORDER BY OriginAirportSeqID LIMIT 16","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Flights FROM mytable WHERE DestCityName NOT IN ('Sarasota/Bradenton, FL', 'Lake Charles, LA', 'Atlanta, GA') OR ArrDel15 = 0 AND WheelsOn BETWEEN 1955 AND 1255 ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Flights FROM mytable WHERE DestCityName NOT IN ('Sarasota/Bradenton, FL', 'Lake Charles, LA', 'Atlanta, GA') OR ArrDel15 = 0 AND WheelsOn BETWEEN 1955 AND 1255 ORDER BY OriginAirportSeqID LIMIT 16","hsqls":["SELECT DivWheelsOns, Flights FROM mytable WHERE DestCityName NOT IN ('Sarasota/Bradenton, FL', 'Lake Charles, LA', 'Atlanta, GA') OR ArrDel15 = 0 AND WheelsOn BETWEEN 1955 AND 1255 ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, TailNum, MAX(Quarter), AVG(SecurityDelay), SUM(OriginAirportSeqID) FROM mytable GROUP BY DepDelayMinutes, TailNum  ORDER BY DepDelayMinutes, TailNum LIMIT 23","hsqls":["SELECT DepDelayMinutes, TailNum, MAX(Quarter), AVG(SecurityDelay), SUM(OriginAirportSeqID) FROM mytable GROUP BY DepDelayMinutes, TailNum  ORDER BY DepDelayMinutes, TailNum LIMIT 23"]}
-{"sql":"SELECT LongestAddGTime, DivTotalGTimes FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND ActualElapsedTime NOT IN (300, 74, 265) AND DepartureDelayGroups IN (3, 2, 8) ORDER BY DivReachedDest, OriginCityMarketID LIMIT 26","hsqls":["SELECT LongestAddGTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Month BETWEEN 1 AND 1 AND ActualElapsedTime NOT IN (300, 74, 265) AND DepartureDelayGroups IN (3, 2, 8) ORDER BY DivReachedDest, OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivTotalGTimes FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND ActualElapsedTime NOT IN (300, 74, 265) AND DepartureDelayGroups IN (3, 2, 8) ORDER BY DivReachedDest, OriginCityMarketID LIMIT 26","hsqls":["SELECT LongestAddGTime, DivTotalGTimes FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND ActualElapsedTime NOT IN (300, 74, 265) AND DepartureDelayGroups IN (3, 2, 8) ORDER BY DivReachedDest, OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable ORDER BY WheelsOff, ArrDelayMinutes, DepTimeBlk LIMIT 8"}
 {"sql":"SELECT DistanceGroup, LongestAddGTime, CRSElapsedTime FROM mytable WHERE ActualElapsedTime > 332 LIMIT 5"}
 {"sql":"SELECT CRSDepTime, OriginStateName FROM mytable WHERE LateAircraftDelay = 33 AND DestAirportID NOT IN (11433, 10994, 11721, 12191, 15389) ORDER BY Diverted, DayofMonth LIMIT 10"}
-{"sql":"SELECT ArrTime, AirlineID, COUNT(OriginState), MIN(WheelsOff) FROM mytable WHERE DepDel15 BETWEEN 1 AND -9999 OR DivArrDelay BETWEEN 92 AND 835 AND DivTotalGTimes IN (123, 4, 90, 33, 85) GROUP BY ArrTime, AirlineID LIMIT 19","hsqls":["SELECT ArrTime, AirlineID, COUNT(OriginState), MIN(WheelsOff) FROM mytable WHERE DepDel15 BETWEEN 1 AND -9999 OR DivArrDelay BETWEEN 92 AND 835 AND (DivTotalGTimes__MV0 IN (123, 4, 90, 33, 85) OR DivTotalGTimes__MV1 IN (123, 4, 90, 33, 85) OR DivTotalGTimes__MV2 IN (123, 4, 90, 33, 85) OR DivTotalGTimes__MV3 IN (123, 4, 90, 33, 85) OR DivTotalGTimes__MV4 IN (123, 4, 90, 33, 85)) GROUP BY ArrTime, AirlineID LIMIT 10000"]}
+{"sql":"SELECT ArrTime, AirlineID, COUNT(OriginState), MIN(WheelsOff) FROM mytable WHERE DepDel15 BETWEEN 1 AND -9999 OR DivArrDelay BETWEEN 92 AND 835 AND DivTotalGTimes IN (123, 4, 90, 33, 85) GROUP BY ArrTime, AirlineID LIMIT 19","hsqls":["SELECT ArrTime, AirlineID, COUNT(OriginState), MIN(WheelsOff) FROM mytable WHERE DepDel15 BETWEEN 1 AND -9999 OR DivArrDelay BETWEEN 92 AND 835 AND (DivTotalGTimes[1] IN (123, 4, 90, 33, 85) OR DivTotalGTimes[2] IN (123, 4, 90, 33, 85) OR DivTotalGTimes[3] IN (123, 4, 90, 33, 85) OR DivTotalGTimes[4] IN (123, 4, 90, 33, 85) OR DivTotalGTimes[5] IN (123, 4, 90, 33, 85)) GROUP BY ArrTime, AirlineID LIMIT 10000"]}
 {"sql":"SELECT Distance, OriginWac, MIN(CRSElapsedTime), MIN(FirstDepTime) FROM mytable GROUP BY Distance, OriginWac  ORDER BY Distance, OriginWac LIMIT 24","hsqls":["SELECT Distance, OriginWac, MIN(CRSElapsedTime), MIN(FirstDepTime) FROM mytable GROUP BY Distance, OriginWac  ORDER BY Distance, OriginWac LIMIT 24"]}
 {"sql":"SELECT DepTime, ArrTime, NASDelay, AVG(OriginAirportID) FROM mytable WHERE Flights NOT IN (1) OR DestStateName BETWEEN 'Connecticut' AND 'Kentucky' AND CRSElapsedTime BETWEEN 230 AND 376 GROUP BY DepTime, ArrTime, NASDelay  ORDER BY DepTime, ArrTime, NASDelay LIMIT 28","hsqls":["SELECT DepTime, ArrTime, NASDelay, AVG(OriginAirportID) FROM mytable WHERE Flights NOT IN (1) OR DestStateName BETWEEN 'Connecticut' AND 'Kentucky' AND CRSElapsedTime BETWEEN 230 AND 376 GROUP BY DepTime, ArrTime, NASDelay  ORDER BY DepTime, ArrTime, NASDelay LIMIT 28"]}
-{"sql":"SELECT \"Month\", DaysSinceEpoch FROM mytable WHERE DivAirportSeqIDs IN (1302902, 1405702, 1625702, 1289203, 1078502) AND Dest > 'SBP' ORDER BY Dest, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT Month, DaysSinceEpoch FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs__MV1 IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs__MV2 IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs__MV3 IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs__MV4 IN (1302902, 1405702, 1625702, 1289203, 1078502)) AND Dest > 'SBP' ORDER BY Dest, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime, SUM(Quarter), MIN(\"Month\") FROM mytable GROUP BY CRSArrTime LIMIT 24","hsqls":["SELECT CRSArrTime, SUM(Quarter), MIN(Month) FROM mytable GROUP BY CRSArrTime LIMIT 24"]}
+{"sql":"SELECT \"Month\", DaysSinceEpoch FROM mytable WHERE DivAirportSeqIDs IN (1302902, 1405702, 1625702, 1289203, 1078502) AND Dest > 'SBP' ORDER BY Dest, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT Month, DaysSinceEpoch FROM mytable WHERE (DivAirportSeqIDs[1] IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs[2] IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs[3] IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs[4] IN (1302902, 1405702, 1625702, 1289203, 1078502) OR DivAirportSeqIDs[5] IN (1302902, 1405702, 1625702, 1289203, 1078502)) AND Dest > 'SBP' ORDER BY Dest, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, SUM(Quarter), MIN(\"Month\") FROM mytable GROUP BY CRSArrTime LIMIT 24","hsqls":["SELECT CRSArrTime, SUM(Quarter), MIN(`Month`) FROM mytable GROUP BY CRSArrTime LIMIT 24"]}
 {"sql":"SELECT Quarter, DepTime, WheelsOn, AVG(LongestAddGTime), SUM(AirlineID), SUM(DaysSinceEpoch) FROM mytable GROUP BY Quarter, DepTime, WheelsOn  ORDER BY Quarter, DepTime, WheelsOn LIMIT 14","hsqls":["SELECT Quarter, DepTime, WheelsOn, AVG(LongestAddGTime), SUM(AirlineID), SUM(DaysSinceEpoch) FROM mytable GROUP BY Quarter, DepTime, WheelsOn  ORDER BY Quarter, DepTime, WheelsOn LIMIT 14"]}
-{"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DestStateFips IN (56, 33, 27, 75) AND DestState BETWEEN 'SD' AND 'RI' AND \"Year\" NOT IN (2014) GROUP BY FirstDepTime LIMIT 10","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DestStateFips IN (56, 33, 27, 75) AND DestState BETWEEN 'SD' AND 'RI' AND Year NOT IN (2014) GROUP BY FirstDepTime LIMIT 10"]}
+{"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DestStateFips IN (56, 33, 27, 75) AND DestState BETWEEN 'SD' AND 'RI' AND \"Year\" NOT IN (2014) GROUP BY FirstDepTime LIMIT 10","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DestStateFips IN (56, 33, 27, 75) AND DestState BETWEEN 'SD' AND 'RI' AND `Year` NOT IN (2014) GROUP BY FirstDepTime LIMIT 10"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE TaxiOut IN (97, 138, 41, 22) AND DestWac BETWEEN 74 AND 52 OR CarrierDelay > 38 ORDER BY FlightNum, Cancelled, DivArrDelay LIMIT 4"}
 {"sql":"SELECT DivReachedDest, FlightNum, DivActualElapsedTime, SUM(LongestAddGTime), AVG(FirstDepTime) FROM mytable GROUP BY DivReachedDest, FlightNum, DivActualElapsedTime  ORDER BY DivReachedDest, FlightNum, DivActualElapsedTime LIMIT 22","hsqls":["SELECT DivReachedDest, FlightNum, DivActualElapsedTime, SUM(LongestAddGTime), AVG(FirstDepTime) FROM mytable GROUP BY DivReachedDest, FlightNum, DivActualElapsedTime  ORDER BY DivReachedDest, FlightNum, DivActualElapsedTime LIMIT 22"]}
 {"sql":"SELECT DivDistance, DepDel15, COUNT(*) FROM mytable GROUP BY DivDistance, DepDel15  ORDER BY DivDistance, DepDel15 LIMIT 5","hsqls":["SELECT DivDistance, DepDel15, COUNT(*) FROM mytable GROUP BY DivDistance, DepDel15  ORDER BY DivDistance, DepDel15 LIMIT 5"]}
@@ -4245,10 +4245,10 @@
 {"sql":"SELECT DepDelay, ArrDel15, OriginStateName FROM mytable WHERE ArrDelayMinutes BETWEEN 77.0 AND 164.0 AND DestStateFips NOT IN (2, 50) OR ArrTime <> 2054 ORDER BY Diverted LIMIT 27"}
 {"sql":"SELECT DivDistance, OriginAirportID FROM mytable LIMIT 16"}
 {"sql":"SELECT Distance, ArrDel15, MAX(DestAirportSeqID), MAX(WheelsOn), MAX(AirTime) FROM mytable WHERE WeatherDelay IN (47, 39, 29) OR ArrDelayMinutes <= 227.0 GROUP BY Distance, ArrDel15  ORDER BY Distance, ArrDel15 LIMIT 27","hsqls":["SELECT Distance, ArrDel15, MAX(DestAirportSeqID), MAX(WheelsOn), MAX(AirTime) FROM mytable WHERE WeatherDelay IN (47, 39, 29) OR ArrDelayMinutes <= 227.0 GROUP BY Distance, ArrDel15  ORDER BY Distance, ArrDel15 LIMIT 27"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable LIMIT 10","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, FlightNum FROM mytable WHERE DivAirportIDs IN (12992) OR OriginAirportID BETWEEN 12177 AND 10721 AND \"Month\" NOT IN (1) ORDER BY CRSArrTime LIMIT 1","hsqls":["SELECT OriginCityMarketID, FlightNum FROM mytable WHERE (DivAirportIDs__MV0 IN (12992) OR DivAirportIDs__MV1 IN (12992) OR DivAirportIDs__MV2 IN (12992) OR DivAirportIDs__MV3 IN (12992) OR DivAirportIDs__MV4 IN (12992)) OR OriginAirportID BETWEEN 12177 AND 10721 AND Month NOT IN (1) ORDER BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable LIMIT 10","hsqls":["SELECT DivLongestGTimes FROM mytable LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, FlightNum FROM mytable WHERE DivAirportIDs IN (12992) OR OriginAirportID BETWEEN 12177 AND 10721 AND \"Month\" NOT IN (1) ORDER BY CRSArrTime LIMIT 1","hsqls":["SELECT OriginCityMarketID, FlightNum FROM mytable WHERE (DivAirportIDs[1] IN (12992) OR DivAirportIDs[2] IN (12992) OR DivAirportIDs[3] IN (12992) OR DivAirportIDs[4] IN (12992) OR DivAirportIDs[5] IN (12992)) OR OriginAirportID BETWEEN 12177 AND 10721 AND `Month` NOT IN (1) ORDER BY CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT DestWac, Quarter, OriginCityName FROM mytable ORDER BY DaysSinceEpoch LIMIT 15"}
-{"sql":"SELECT DivReachedDest, OriginStateFips, MAX(\"Year\"), MIN(DestStateFips) FROM mytable WHERE WheelsOn >= 1415 OR ArrTime IN (5, 644, 847, 1129, 1907) OR DaysSinceEpoch <= 16087 GROUP BY DivReachedDest, OriginStateFips LIMIT 23","hsqls":["SELECT DivReachedDest, OriginStateFips, MAX(Year), MIN(DestStateFips) FROM mytable WHERE WheelsOn >= 1415 OR ArrTime IN (5, 644, 847, 1129, 1907) OR DaysSinceEpoch <= 16087 GROUP BY DivReachedDest, OriginStateFips LIMIT 23"]}
+{"sql":"SELECT DivReachedDest, OriginStateFips, MAX(\"Year\"), MIN(DestStateFips) FROM mytable WHERE WheelsOn >= 1415 OR ArrTime IN (5, 644, 847, 1129, 1907) OR DaysSinceEpoch <= 16087 GROUP BY DivReachedDest, OriginStateFips LIMIT 23","hsqls":["SELECT DivReachedDest, OriginStateFips, MAX(`Year`), MIN(DestStateFips) FROM mytable WHERE WheelsOn >= 1415 OR ArrTime IN (5, 644, 847, 1129, 1907) OR DaysSinceEpoch <= 16087 GROUP BY DivReachedDest, OriginStateFips LIMIT 23"]}
 {"sql":"SELECT Flights FROM mytable WHERE LongestAddGTime >= 25 OR ArrivalDelayGroups NOT IN (-1) AND AirlineID IN (20436, 19393, 19930, 20355) LIMIT 26"}
 {"sql":"SELECT FlightNum, ArrDel15, COUNT(*) FROM mytable WHERE DivArrDelay > 9 AND LateAircraftDelay NOT IN (132) AND DistanceGroup BETWEEN 9 AND 9 GROUP BY FlightNum, ArrDel15  ORDER BY FlightNum, ArrDel15 LIMIT 16","hsqls":["SELECT FlightNum, ArrDel15, COUNT(*) FROM mytable WHERE DivArrDelay > 9 AND LateAircraftDelay NOT IN (132) AND DistanceGroup BETWEEN 9 AND 9 GROUP BY FlightNum, ArrDel15  ORDER BY FlightNum, ArrDel15 LIMIT 16"]}
 {"sql":"SELECT OriginAirportID, SUM(CRSArrTime), MAX(CRSDepTime), MAX(Cancelled) FROM mytable WHERE DepDelay IN (270.0) OR OriginCityMarketID BETWEEN 32389 AND 32511 OR CRSDepTime BETWEEN 1028 AND 1408 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 27","hsqls":["SELECT OriginAirportID, SUM(CRSArrTime), MAX(CRSDepTime), MAX(Cancelled) FROM mytable WHERE DepDelay IN (270.0) OR OriginCityMarketID BETWEEN 32389 AND 32511 OR CRSDepTime BETWEEN 1028 AND 1408 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 27"]}
@@ -4266,124 +4266,124 @@
 {"sql":"SELECT FlightNum, MAX(DaysSinceEpoch), AVG(TaxiOut), SUM(ArrDelay) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'noodles' OR SecurityDelay BETWEEN 0 AND 0 AND OriginState IN ('OH', 'CA', 'TX') GROUP BY FlightNum  ORDER BY FlightNum LIMIT 13","hsqls":["SELECT FlightNum, MAX(DaysSinceEpoch), AVG(TaxiOut), SUM(ArrDelay) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'noodles' OR SecurityDelay BETWEEN 0 AND 0 AND OriginState IN ('OH', 'CA', 'TX') GROUP BY FlightNum  ORDER BY FlightNum LIMIT 13"]}
 {"sql":"SELECT FlightNum FROM mytable WHERE WheelsOff IN (1428) OR LateAircraftDelay < 249 AND DivReachedDest NOT IN (1, 0, -9999) LIMIT 2"}
 {"sql":"SELECT OriginAirportSeqID, ArrivalDelayGroups, DaysSinceEpoch FROM mytable WHERE FlightNum <= 3037 AND FirstDepTime <> 1043 ORDER BY OriginCityMarketID LIMIT 8"}
-{"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 908 AND 1856 GROUP BY TailNum LIMIT 29","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 908 AND 1856 OR DivWheelsOffs__MV1 BETWEEN 908 AND 1856 OR DivWheelsOffs__MV2 BETWEEN 908 AND 1856 OR DivWheelsOffs__MV3 BETWEEN 908 AND 1856 OR DivWheelsOffs__MV4 BETWEEN 908 AND 1856) GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 908 AND 1856 GROUP BY TailNum LIMIT 29","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 908 AND 1856 OR DivWheelsOffs[2] BETWEEN 908 AND 1856 OR DivWheelsOffs[3] BETWEEN 908 AND 1856 OR DivWheelsOffs[4] BETWEEN 908 AND 1856 OR DivWheelsOffs[5] BETWEEN 908 AND 1856) GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, AVG(ArrDelayMinutes), MIN(Distance) FROM mytable WHERE ArrivalDelayGroups < 6 AND OriginAirportSeqID >= 1238902 AND OriginAirportSeqID BETWEEN 1073203 AND 1458801 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 10","hsqls":["SELECT DistanceGroup, AVG(ArrDelayMinutes), MIN(Distance) FROM mytable WHERE ArrivalDelayGroups < 6 AND OriginAirportSeqID >= 1238902 AND OriginAirportSeqID BETWEEN 1073203 AND 1458801 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 10"]}
 {"sql":"SELECT WeatherDelay, AirlineID, DivArrDelay FROM mytable ORDER BY LateAircraftDelay, DepDelayMinutes, TaxiIn LIMIT 17"}
 {"sql":"SELECT DestCityName FROM mytable WHERE TaxiIn BETWEEN 32 AND 106 OR DivDistance <> 162 AND LateAircraftDelay = 69 ORDER BY ArrDelayMinutes LIMIT 20"}
-{"sql":"SELECT Quarter, CancellationCode FROM mytable WHERE DivDistance > 448 AND DestStateName <= 'Mississippi' AND ArrTime <> 1804 ORDER BY Quarter, Distance, \"Month\" LIMIT 15","hsqls":["SELECT Quarter, CancellationCode FROM mytable WHERE DivDistance > 448 AND DestStateName <= 'Mississippi' AND ArrTime <> 1804 ORDER BY Quarter, Distance, Month LIMIT 15"]}
+{"sql":"SELECT Quarter, CancellationCode FROM mytable WHERE DivDistance > 448 AND DestStateName <= 'Mississippi' AND ArrTime <> 1804 ORDER BY Quarter, Distance, \"Month\" LIMIT 15","hsqls":["SELECT Quarter, CancellationCode FROM mytable WHERE DivDistance > 448 AND DestStateName <= 'Mississippi' AND ArrTime <> 1804 ORDER BY Quarter, Distance, `Month` LIMIT 15"]}
 {"sql":"SELECT OriginCityMarketID, SUM(ArrivalDelayGroups), MAX(DepDel15), MAX(Diverted) FROM mytable WHERE ArrDelayMinutes NOT IN (68.0, 86.0, 244.0, 30.0, 154.0) AND OriginAirportID < 12129 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 21","hsqls":["SELECT OriginCityMarketID, SUM(ArrivalDelayGroups), MAX(DepDel15), MAX(Diverted) FROM mytable WHERE ArrDelayMinutes NOT IN (68.0, 86.0, 244.0, 30.0, 154.0) AND OriginAirportID < 12129 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 21"]}
 {"sql":"SELECT SUM(CarrierDelay), SUM(DivActualElapsedTime), AVG(DepDelayMinutes) FROM mytable LIMIT 25"}
 {"sql":"SELECT DepTime, COUNT(*) FROM mytable WHERE CancellationCode IN ('A') AND ArrTimeBlk NOT IN ('1600-1659', '1700-1759', '2200-2259', '0900-0959') GROUP BY DepTime  ORDER BY DepTime LIMIT 13","hsqls":["SELECT DepTime, COUNT(*) FROM mytable WHERE CancellationCode IN ('A') AND ArrTimeBlk NOT IN ('1600-1659', '1700-1759', '2200-2259', '0900-0959') GROUP BY DepTime  ORDER BY DepTime LIMIT 13"]}
 {"sql":"SELECT Diverted, FirstDepTime, SUM(OriginCityMarketID) FROM mytable GROUP BY Diverted, FirstDepTime  ORDER BY Diverted, FirstDepTime LIMIT 2","hsqls":["SELECT Diverted, FirstDepTime, SUM(OriginCityMarketID) FROM mytable GROUP BY Diverted, FirstDepTime  ORDER BY Diverted, FirstDepTime LIMIT 2"]}
 {"sql":"SELECT OriginCityMarketID, ArrTime, DivAirportLandings, MAX(AirTime), MIN(DayofMonth) FROM mytable GROUP BY OriginCityMarketID, ArrTime, DivAirportLandings  ORDER BY OriginCityMarketID, ArrTime, DivAirportLandings LIMIT 18","hsqls":["SELECT OriginCityMarketID, ArrTime, DivAirportLandings, MAX(AirTime), MIN(DayofMonth) FROM mytable GROUP BY OriginCityMarketID, ArrTime, DivAirportLandings  ORDER BY OriginCityMarketID, ArrTime, DivAirportLandings LIMIT 18"]}
 {"sql":"SELECT Cancelled, OriginAirportID FROM mytable WHERE DivReachedDest > 1 OR FlightDate BETWEEN '2014-01-07' AND '2014-01-29' ORDER BY OriginAirportID LIMIT 10"}
-{"sql":"SELECT TotalAddGTime, MIN(ArrDelayMinutes), SUM(WheelsOn), MIN(OriginWac) FROM mytable WHERE Origin IN ('RHI', 'COD') OR DivWheelsOns = 1857 GROUP BY TotalAddGTime","hsqls":["SELECT TotalAddGTime, MIN(ArrDelayMinutes), SUM(WheelsOn), MIN(OriginWac) FROM mytable WHERE Origin IN ('RHI', 'COD') OR (DivWheelsOns__MV0 = 1857 OR DivWheelsOns__MV1 = 1857 OR DivWheelsOns__MV2 = 1857 OR DivWheelsOns__MV3 = 1857 OR DivWheelsOns__MV4 = 1857) GROUP BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, MIN(ArrDelayMinutes), SUM(WheelsOn), MIN(OriginWac) FROM mytable WHERE Origin IN ('RHI', 'COD') OR DivWheelsOns = 1857 GROUP BY TotalAddGTime","hsqls":["SELECT TotalAddGTime, MIN(ArrDelayMinutes), SUM(WheelsOn), MIN(OriginWac) FROM mytable WHERE Origin IN ('RHI', 'COD') OR (DivWheelsOns[1] = 1857 OR DivWheelsOns[2] = 1857 OR DivWheelsOns[3] = 1857 OR DivWheelsOns[4] = 1857 OR DivWheelsOns[5] = 1857) GROUP BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT AVG(ArrDelayMinutes) FROM mytable LIMIT 23"}
 {"sql":"SELECT NASDelay, ArrivalDelayGroups, DivActualElapsedTime FROM mytable ORDER BY DepDelayMinutes, DepTimeBlk, CRSElapsedTime LIMIT 23"}
 {"sql":"SELECT ArrDel15, DestAirportID, MAX(ArrivalDelayGroups), MAX(DivAirportLandings) FROM mytable WHERE DestAirportID BETWEEN 10146 AND 11041 OR Quarter BETWEEN 1 AND 1 OR TailNum NOT IN ('N843VA', 'N762US', 'N926FR', 'N236JB', 'N719SW') GROUP BY ArrDel15, DestAirportID  ORDER BY ArrDel15, DestAirportID LIMIT 8","hsqls":["SELECT ArrDel15, DestAirportID, MAX(ArrivalDelayGroups), MAX(DivAirportLandings) FROM mytable WHERE DestAirportID BETWEEN 10146 AND 11041 OR Quarter BETWEEN 1 AND 1 OR TailNum NOT IN ('N843VA', 'N762US', 'N926FR', 'N236JB', 'N719SW') GROUP BY ArrDel15, DestAirportID  ORDER BY ArrDel15, DestAirportID LIMIT 8"]}
-{"sql":"SELECT DivAirportSeqIDs, CancellationCode FROM mytable LIMIT 10","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, CancellationCode FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, CancellationCode FROM mytable LIMIT 10","hsqls":["SELECT DivAirportSeqIDs, CancellationCode FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup FROM mytable ORDER BY OriginAirportSeqID LIMIT 3"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDelay < 132.0 LIMIT 26"}
-{"sql":"SELECT OriginStateFips, DestAirportSeqID, WheelsOn, COUNT(\"Month\") FROM mytable GROUP BY OriginStateFips, DestAirportSeqID, WheelsOn LIMIT 13","hsqls":["SELECT OriginStateFips, DestAirportSeqID, WheelsOn, COUNT(Month) FROM mytable GROUP BY OriginStateFips, DestAirportSeqID, WheelsOn LIMIT 13"]}
-{"sql":"SELECT Origin FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY FlightNum, AirTime, \"Month\" LIMIT 26","hsqls":["SELECT Origin FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY FlightNum, AirTime, Month LIMIT 26"]}
+{"sql":"SELECT OriginStateFips, DestAirportSeqID, WheelsOn, COUNT(\"Month\") FROM mytable GROUP BY OriginStateFips, DestAirportSeqID, WheelsOn LIMIT 13","hsqls":["SELECT OriginStateFips, DestAirportSeqID, WheelsOn, COUNT(`Month`) FROM mytable GROUP BY OriginStateFips, DestAirportSeqID, WheelsOn LIMIT 13"]}
+{"sql":"SELECT Origin FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY FlightNum, AirTime, \"Month\" LIMIT 26","hsqls":["SELECT Origin FROM mytable WHERE Diverted BETWEEN 1 AND 0 ORDER BY FlightNum, AirTime, `Month` LIMIT 26"]}
 {"sql":"SELECT OriginStateName FROM mytable WHERE DepDel15 <> 1 LIMIT 14"}
 {"sql":"SELECT Cancelled, CRSElapsedTime FROM mytable WHERE AirlineID BETWEEN 20436 AND 19393 OR WeatherDelay BETWEEN 58 AND 1 ORDER BY ArrDelayMinutes, TaxiIn, OriginStateName LIMIT 12"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1500-1559' AND CRSDepTime BETWEEN 914 AND 1927 ORDER BY TaxiOut, DayofMonth LIMIT 16","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1500-1559' AND CRSDepTime BETWEEN 914 AND 1927 ORDER BY TaxiOut, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1500-1559' AND CRSDepTime BETWEEN 914 AND 1927 ORDER BY TaxiOut, DayofMonth LIMIT 16","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1500-1559' AND CRSDepTime BETWEEN 914 AND 1927 ORDER BY TaxiOut, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT Flights, Distance, Cancelled FROM mytable WHERE OriginState <> 'CA' ORDER BY OriginStateFips, DivAirportLandings, OriginAirportID LIMIT 23"}
-{"sql":"SELECT DepTimeBlk, MAX(DestAirportSeqID), SUM(FirstDepTime), SUM(\"Month\") FROM mytable WHERE AirTime >= 437 GROUP BY DepTimeBlk LIMIT 7","hsqls":["SELECT DepTimeBlk, MAX(DestAirportSeqID), SUM(FirstDepTime), SUM(Month) FROM mytable WHERE AirTime >= 437 GROUP BY DepTimeBlk LIMIT 7"]}
+{"sql":"SELECT DepTimeBlk, MAX(DestAirportSeqID), SUM(FirstDepTime), SUM(\"Month\") FROM mytable WHERE AirTime >= 437 GROUP BY DepTimeBlk LIMIT 7","hsqls":["SELECT DepTimeBlk, MAX(DestAirportSeqID), SUM(FirstDepTime), SUM(`Month`) FROM mytable WHERE AirTime >= 437 GROUP BY DepTimeBlk LIMIT 7"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityMarketID BETWEEN 33485 AND 32335 AND OriginCityName BETWEEN 'New York, NY' AND 'Monterey, CA' LIMIT 28"}
 {"sql":"SELECT Diverted FROM mytable WHERE Flights <= 1 OR Flights <> 1 ORDER BY TaxiOut"}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE DaysSinceEpoch > 16098 ORDER BY OriginAirportID LIMIT 1"}
 {"sql":"SELECT LateAircraftDelay, DayofMonth, MAX(OriginCityMarketID), MIN(ArrTime) FROM mytable WHERE Dest <> 'BTV' GROUP BY LateAircraftDelay, DayofMonth  ORDER BY LateAircraftDelay, DayofMonth LIMIT 26","hsqls":["SELECT LateAircraftDelay, DayofMonth, MAX(OriginCityMarketID), MIN(ArrTime) FROM mytable WHERE Dest <> 'BTV' GROUP BY LateAircraftDelay, DayofMonth  ORDER BY LateAircraftDelay, DayofMonth LIMIT 26"]}
-{"sql":"SELECT OriginAirportSeqID, DivTotalGTimes FROM mytable WHERE DepDel15 < 1 OR DepDelayMinutes > 306.0 LIMIT 10","hsqls":["SELECT OriginAirportSeqID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DepDel15 < 1 OR DepDelayMinutes > 306.0 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivTotalGTimes FROM mytable WHERE DepDel15 < 1 OR DepDelayMinutes > 306.0 LIMIT 10","hsqls":["SELECT OriginAirportSeqID, DivTotalGTimes FROM mytable WHERE DepDel15 < 1 OR DepDelayMinutes > 306.0 LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, Carrier FROM mytable ORDER BY FlightNum, ArrDelay, CRSDepTime LIMIT 20"}
 {"sql":"SELECT OriginState, MAX(CarrierDelay), COUNT(ArrDel15), SUM(DepartureDelayGroups) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 6","hsqls":["SELECT OriginState, MAX(CarrierDelay), COUNT(ArrDel15), SUM(DepartureDelayGroups) FROM mytable GROUP BY OriginState  ORDER BY OriginState LIMIT 6"]}
-{"sql":"SELECT DestStateName, COUNT(OriginWac), AVG(CRSElapsedTime), COUNT(FlightDate) FROM mytable WHERE DivAirportIDs BETWEEN 14113 AND 14828 AND DivTotalGTimes IN (58) OR DivReachedDest IN (0, -9999) GROUP BY DestStateName LIMIT 20","hsqls":["SELECT DestStateName, COUNT(OriginWac), AVG(CRSElapsedTime), COUNT(FlightDate) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14113 AND 14828 OR DivAirportIDs__MV1 BETWEEN 14113 AND 14828 OR DivAirportIDs__MV2 BETWEEN 14113 AND 14828 OR DivAirportIDs__MV3 BETWEEN 14113 AND 14828 OR DivAirportIDs__MV4 BETWEEN 14113 AND 14828) AND (DivTotalGTimes__MV0 IN (58) OR DivTotalGTimes__MV1 IN (58) OR DivTotalGTimes__MV2 IN (58) OR DivTotalGTimes__MV3 IN (58) OR DivTotalGTimes__MV4 IN (58)) OR DivReachedDest IN (0, -9999) GROUP BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT WheelsOn, SUM(\"Year\") FROM mytable WHERE DivAirports IN ('TUS', 'DAY', 'TWF') OR CRSDepTime NOT IN (735, 813, 1042, 946) OR DestAirportID NOT IN (12523, 10185, 11612, 12888, 13367) GROUP BY WheelsOn LIMIT 4","hsqls":["SELECT WheelsOn, SUM(Year) FROM mytable WHERE (DivAirports__MV0 IN ('TUS', 'DAY', 'TWF') OR DivAirports__MV1 IN ('TUS', 'DAY', 'TWF') OR DivAirports__MV2 IN ('TUS', 'DAY', 'TWF') OR DivAirports__MV3 IN ('TUS', 'DAY', 'TWF') OR DivAirports__MV4 IN ('TUS', 'DAY', 'TWF')) OR CRSDepTime NOT IN (735, 813, 1042, 946) OR DestAirportID NOT IN (12523, 10185, 11612, 12888, 13367) GROUP BY WheelsOn LIMIT 10000"]}
-{"sql":"SELECT MIN(\"Month\"), MIN(Distance), AVG(DivAirportLandings) FROM mytable WHERE OriginStateFips NOT IN (48, 6, 33, 38) LIMIT 23","hsqls":["SELECT MIN(Month), MIN(Distance), AVG(DivAirportLandings) FROM mytable WHERE OriginStateFips NOT IN (48, 6, 33, 38) LIMIT 23"]}
+{"sql":"SELECT DestStateName, COUNT(OriginWac), AVG(CRSElapsedTime), COUNT(FlightDate) FROM mytable WHERE DivAirportIDs BETWEEN 14113 AND 14828 AND DivTotalGTimes IN (58) OR DivReachedDest IN (0, -9999) GROUP BY DestStateName LIMIT 20","hsqls":["SELECT DestStateName, COUNT(OriginWac), AVG(CRSElapsedTime), COUNT(FlightDate) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14113 AND 14828 OR DivAirportIDs[2] BETWEEN 14113 AND 14828 OR DivAirportIDs[3] BETWEEN 14113 AND 14828 OR DivAirportIDs[4] BETWEEN 14113 AND 14828 OR DivAirportIDs[5] BETWEEN 14113 AND 14828) AND (DivTotalGTimes[1] IN (58) OR DivTotalGTimes[2] IN (58) OR DivTotalGTimes[3] IN (58) OR DivTotalGTimes[4] IN (58) OR DivTotalGTimes[5] IN (58)) OR DivReachedDest IN (0, -9999) GROUP BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT WheelsOn, SUM(\"Year\") FROM mytable WHERE DivAirports IN ('TUS', 'DAY', 'TWF') OR CRSDepTime NOT IN (735, 813, 1042, 946) OR DestAirportID NOT IN (12523, 10185, 11612, 12888, 13367) GROUP BY WheelsOn LIMIT 4","hsqls":["SELECT WheelsOn, SUM(`Year`) FROM mytable WHERE (DivAirports[1] IN ('TUS', 'DAY', 'TWF') OR DivAirports[2] IN ('TUS', 'DAY', 'TWF') OR DivAirports[3] IN ('TUS', 'DAY', 'TWF') OR DivAirports[4] IN ('TUS', 'DAY', 'TWF') OR DivAirports[5] IN ('TUS', 'DAY', 'TWF')) OR CRSDepTime NOT IN (735, 813, 1042, 946) OR DestAirportID NOT IN (12523, 10185, 11612, 12888, 13367) GROUP BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT MIN(\"Month\"), MIN(Distance), AVG(DivAirportLandings) FROM mytable WHERE OriginStateFips NOT IN (48, 6, 33, 38) LIMIT 23","hsqls":["SELECT MIN(`Month`), MIN(Distance), AVG(DivAirportLandings) FROM mytable WHERE OriginStateFips NOT IN (48, 6, 33, 38) LIMIT 23"]}
 {"sql":"SELECT DestState, OriginCityMarketID, ArrDelayMinutes, SUM(DestAirportSeqID), SUM(TaxiIn), MIN(Distance) FROM mytable WHERE OriginAirportID >= 12441 AND LateAircraftDelay IN (151, 246) GROUP BY DestState, OriginCityMarketID, ArrDelayMinutes","hsqls":["SELECT DestState, OriginCityMarketID, ArrDelayMinutes, SUM(DestAirportSeqID), SUM(TaxiIn), MIN(Distance) FROM mytable WHERE OriginAirportID >= 12441 AND LateAircraftDelay IN (151, 246) GROUP BY DestState, OriginCityMarketID, ArrDelayMinutes"]}
-{"sql":"SELECT OriginState, DivAirportLandings, OriginStateName FROM mytable WHERE DivLongestGTimes BETWEEN 85.0 AND 44.0 OR FlightNum <> 4390 ORDER BY DestAirportSeqID, DayOfWeek LIMIT 23","hsqls":["SELECT OriginState, DivAirportLandings, OriginStateName FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 85.0 AND 44.0 OR DivLongestGTimes__MV1 BETWEEN 85.0 AND 44.0 OR DivLongestGTimes__MV2 BETWEEN 85.0 AND 44.0 OR DivLongestGTimes__MV3 BETWEEN 85.0 AND 44.0 OR DivLongestGTimes__MV4 BETWEEN 85.0 AND 44.0) OR FlightNum <> 4390 ORDER BY DestAirportSeqID, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT Diverted, CRSDepTime, SUM(\"Month\") FROM mytable WHERE OriginStateFips IN (49, 32, 4) GROUP BY Diverted, CRSDepTime LIMIT 9","hsqls":["SELECT Diverted, CRSDepTime, SUM(Month) FROM mytable WHERE OriginStateFips IN (49, 32, 4) GROUP BY Diverted, CRSDepTime LIMIT 9"]}
+{"sql":"SELECT OriginState, DivAirportLandings, OriginStateName FROM mytable WHERE DivLongestGTimes BETWEEN 85.0 AND 44.0 OR FlightNum <> 4390 ORDER BY DestAirportSeqID, DayOfWeek LIMIT 23","hsqls":["SELECT OriginState, DivAirportLandings, OriginStateName FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 85.0 AND 44.0 OR DivLongestGTimes[2] BETWEEN 85.0 AND 44.0 OR DivLongestGTimes[3] BETWEEN 85.0 AND 44.0 OR DivLongestGTimes[4] BETWEEN 85.0 AND 44.0 OR DivLongestGTimes[5] BETWEEN 85.0 AND 44.0) OR FlightNum <> 4390 ORDER BY DestAirportSeqID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT Diverted, CRSDepTime, SUM(\"Month\") FROM mytable WHERE OriginStateFips IN (49, 32, 4) GROUP BY Diverted, CRSDepTime LIMIT 9","hsqls":["SELECT Diverted, CRSDepTime, SUM(`Month`) FROM mytable WHERE OriginStateFips IN (49, 32, 4) GROUP BY Diverted, CRSDepTime LIMIT 9"]}
 {"sql":"SELECT ActualElapsedTime, DestAirportSeqID, CRSElapsedTime FROM mytable WHERE FlightNum IN (1168, 5463, 2876, 4106) AND TotalAddGTime = 2 ORDER BY Carrier, OriginWac, UniqueCarrier LIMIT 28"}
 {"sql":"SELECT DivDistance, CarrierDelay, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 78 AND 51 GROUP BY DivDistance, CarrierDelay  ORDER BY DivDistance, CarrierDelay LIMIT 23","hsqls":["SELECT DivDistance, CarrierDelay, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 78 AND 51 GROUP BY DivDistance, CarrierDelay  ORDER BY DivDistance, CarrierDelay LIMIT 23"]}
 {"sql":"SELECT CRSArrTime, UniqueCarrier, DayOfWeek FROM mytable WHERE DepartureDelayGroups > 5 OR DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY CRSArrTime, \"Month\", UniqueCarrier LIMIT 3","hsqls":["SELECT CRSArrTime, UniqueCarrier, DayOfWeek FROM mytable WHERE DepartureDelayGroups > 5 OR DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY CRSArrTime, Month, UniqueCarrier LIMIT 3"]}
-{"sql":"SELECT DepTime, DaysSinceEpoch, COUNT(NASDelay), MIN(DestAirportID) FROM mytable WHERE DestState BETWEEN 'KY' AND 'AL' AND Dest BETWEEN 'GRK' AND 'ALB' AND DivAirportSeqIDs IN (1099402, 1226402, 1161802, 1190502) GROUP BY DepTime, DaysSinceEpoch LIMIT 24","hsqls":["SELECT DepTime, DaysSinceEpoch, COUNT(NASDelay), MIN(DestAirportID) FROM mytable WHERE DestState BETWEEN 'KY' AND 'AL' AND Dest BETWEEN 'GRK' AND 'ALB' AND (DivAirportSeqIDs__MV0 IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs__MV1 IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs__MV2 IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs__MV3 IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs__MV4 IN (1099402, 1226402, 1161802, 1190502)) GROUP BY DepTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepTime, DaysSinceEpoch, COUNT(NASDelay), MIN(DestAirportID) FROM mytable WHERE DestState BETWEEN 'KY' AND 'AL' AND Dest BETWEEN 'GRK' AND 'ALB' AND DivAirportSeqIDs IN (1099402, 1226402, 1161802, 1190502) GROUP BY DepTime, DaysSinceEpoch LIMIT 24","hsqls":["SELECT DepTime, DaysSinceEpoch, COUNT(NASDelay), MIN(DestAirportID) FROM mytable WHERE DestState BETWEEN 'KY' AND 'AL' AND Dest BETWEEN 'GRK' AND 'ALB' AND (DivAirportSeqIDs[1] IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs[2] IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs[3] IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs[4] IN (1099402, 1226402, 1161802, 1190502) OR DivAirportSeqIDs[5] IN (1099402, 1226402, 1161802, 1190502)) GROUP BY DepTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 4"}
-{"sql":"SELECT FlightNum, DivAirportIDs FROM mytable WHERE DivTailNums IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') LIMIT 3","hsqls":["SELECT FlightNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE (DivTailNums__MV0 IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums__MV1 IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums__MV2 IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums__MV3 IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums__MV4 IN ('N905DE', 'N479AA', 'N824SK', 'N971SW')) LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivAirportIDs FROM mytable WHERE DivTailNums IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') LIMIT 3","hsqls":["SELECT FlightNum, DivAirportIDs FROM mytable WHERE (DivTailNums[1] IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums[2] IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums[3] IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums[4] IN ('N905DE', 'N479AA', 'N824SK', 'N971SW') OR DivTailNums[5] IN ('N905DE', 'N479AA', 'N824SK', 'N971SW')) LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable ORDER BY ArrTimeBlk, ArrDel15 LIMIT 8"}
-{"sql":"SELECT UniqueCarrier, COUNT(ArrDelayMinutes) FROM mytable WHERE DivWheelsOffs = 1840 OR WheelsOff >= 628 GROUP BY UniqueCarrier LIMIT 24","hsqls":["SELECT UniqueCarrier, COUNT(ArrDelayMinutes) FROM mytable WHERE (DivWheelsOffs__MV0 = 1840 OR DivWheelsOffs__MV1 = 1840 OR DivWheelsOffs__MV2 = 1840 OR DivWheelsOffs__MV3 = 1840 OR DivWheelsOffs__MV4 = 1840) OR WheelsOff >= 628 GROUP BY UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT UniqueCarrier, COUNT(ArrDelayMinutes) FROM mytable WHERE DivWheelsOffs = 1840 OR WheelsOff >= 628 GROUP BY UniqueCarrier LIMIT 24","hsqls":["SELECT UniqueCarrier, COUNT(ArrDelayMinutes) FROM mytable WHERE (DivWheelsOffs[1] = 1840 OR DivWheelsOffs[2] = 1840 OR DivWheelsOffs[3] = 1840 OR DivWheelsOffs[4] = 1840 OR DivWheelsOffs[5] = 1840) OR WheelsOff >= 628 GROUP BY UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, Distance, OriginCityName FROM mytable WHERE DivArrDelay <= 222 AND WeatherDelay > 103 OR DivAirportLandings BETWEEN 1 AND 9 ORDER BY FlightDate, OriginCityName LIMIT 10"}
-{"sql":"SELECT Flights, SUM(DepTime), AVG(AirTime) FROM mytable WHERE DivAirportIDs IN (11003, 13303, 13204, 11337, 14683) AND DivWheelsOns <= 2347 AND DivDistance NOT IN (813, 69, 198, 539) GROUP BY Flights LIMIT 20","hsqls":["SELECT Flights, SUM(DepTime), AVG(AirTime) FROM mytable WHERE (DivAirportIDs__MV0 IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs__MV1 IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs__MV2 IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs__MV3 IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs__MV4 IN (11003, 13303, 13204, 11337, 14683)) AND (DivWheelsOns__MV0 <= 2347 OR DivWheelsOns__MV1 <= 2347 OR DivWheelsOns__MV2 <= 2347 OR DivWheelsOns__MV3 <= 2347 OR DivWheelsOns__MV4 <= 2347) AND DivDistance NOT IN (813, 69, 198, 539) GROUP BY Flights LIMIT 10000"]}
+{"sql":"SELECT Flights, SUM(DepTime), AVG(AirTime) FROM mytable WHERE DivAirportIDs IN (11003, 13303, 13204, 11337, 14683) AND DivWheelsOns <= 2347 AND DivDistance NOT IN (813, 69, 198, 539) GROUP BY Flights LIMIT 20","hsqls":["SELECT Flights, SUM(DepTime), AVG(AirTime) FROM mytable WHERE (DivAirportIDs[1] IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs[2] IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs[3] IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs[4] IN (11003, 13303, 13204, 11337, 14683) OR DivAirportIDs[5] IN (11003, 13303, 13204, 11337, 14683)) AND (DivWheelsOns[1] <= 2347 OR DivWheelsOns[2] <= 2347 OR DivWheelsOns[3] <= 2347 OR DivWheelsOns[4] <= 2347 OR DivWheelsOns[5] <= 2347) AND DivDistance NOT IN (813, 69, 198, 539) GROUP BY Flights LIMIT 10000"]}
 {"sql":"SELECT Carrier, Distance, WheelsOn, COUNT(*) FROM mytable WHERE DestAirportID NOT IN (14814) GROUP BY Carrier, Distance, WheelsOn  ORDER BY Carrier, Distance, WheelsOn LIMIT 15","hsqls":["SELECT Carrier, Distance, WheelsOn, COUNT(*) FROM mytable WHERE DestAirportID NOT IN (14814) GROUP BY Carrier, Distance, WheelsOn  ORDER BY Carrier, Distance, WheelsOn LIMIT 15"]}
 {"sql":"SELECT DepartureDelayGroups, Carrier, MIN(WeatherDelay), COUNT(OriginCityName), MAX(Cancelled) FROM mytable WHERE DestAirportID IN (14730, 14674, 11471, 10136, 11298) GROUP BY DepartureDelayGroups, Carrier  ORDER BY DepartureDelayGroups, Carrier LIMIT 22","hsqls":["SELECT DepartureDelayGroups, Carrier, MIN(WeatherDelay), COUNT(OriginCityName), MAX(Cancelled) FROM mytable WHERE DestAirportID IN (14730, 14674, 11471, 10136, 11298) GROUP BY DepartureDelayGroups, Carrier  ORDER BY DepartureDelayGroups, Carrier LIMIT 22"]}
-{"sql":"SELECT CarrierDelay, DivAirportLandings FROM mytable WHERE DepDelayMinutes BETWEEN 162.0 AND 142.0 AND DivTailNums = 'N914DE' OR DaysSinceEpoch IN (16075) ORDER BY DaysSinceEpoch LIMIT 1","hsqls":["SELECT CarrierDelay, DivAirportLandings FROM mytable WHERE DepDelayMinutes BETWEEN 162.0 AND 142.0 AND (DivTailNums__MV0 = 'N914DE' OR DivTailNums__MV1 = 'N914DE' OR DivTailNums__MV2 = 'N914DE' OR DivTailNums__MV3 = 'N914DE' OR DivTailNums__MV4 = 'N914DE') OR DaysSinceEpoch IN (16075) ORDER BY DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivAirportLandings FROM mytable WHERE DepDelayMinutes BETWEEN 162.0 AND 142.0 AND DivTailNums = 'N914DE' OR DaysSinceEpoch IN (16075) ORDER BY DaysSinceEpoch LIMIT 1","hsqls":["SELECT CarrierDelay, DivAirportLandings FROM mytable WHERE DepDelayMinutes BETWEEN 162.0 AND 142.0 AND (DivTailNums[1] = 'N914DE' OR DivTailNums[2] = 'N914DE' OR DivTailNums[3] = 'N914DE' OR DivTailNums[4] = 'N914DE' OR DivTailNums[5] = 'N914DE') OR DaysSinceEpoch IN (16075) ORDER BY DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE ActualElapsedTime BETWEEN 404 AND 43 ORDER BY Flights, DestCityName, OriginStateName LIMIT 5"}
 {"sql":"SELECT OriginStateName, COUNT(DestWac), COUNT(AirTime) FROM mytable WHERE Diverted NOT IN (1, 0) GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 25","hsqls":["SELECT OriginStateName, COUNT(DestWac), COUNT(AirTime) FROM mytable WHERE Diverted NOT IN (1, 0) GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 25"]}
 {"sql":"SELECT Diverted, CancellationCode, CRSDepTime, COUNT(FlightNum), AVG(Quarter), COUNT(LateAircraftDelay) FROM mytable WHERE DivDistance BETWEEN 277 AND 404 OR DestAirportSeqID BETWEEN 1411302 AND 1150303 OR TotalAddGTime > 27 GROUP BY Diverted, CancellationCode, CRSDepTime  ORDER BY Diverted, CancellationCode, CRSDepTime LIMIT 17","hsqls":["SELECT Diverted, CancellationCode, CRSDepTime, COUNT(FlightNum), AVG(Quarter), COUNT(LateAircraftDelay) FROM mytable WHERE DivDistance BETWEEN 277 AND 404 OR DestAirportSeqID BETWEEN 1411302 AND 1150303 OR TotalAddGTime > 27 GROUP BY Diverted, CancellationCode, CRSDepTime  ORDER BY Diverted, CancellationCode, CRSDepTime LIMIT 17"]}
 {"sql":"SELECT \"Year\", LongestAddGTime, ArrDelayMinutes FROM mytable WHERE DestStateFips < 48 AND DestWac <= 21 ORDER BY DestCityMarketID LIMIT 21","hsqls":["SELECT Year, LongestAddGTime, ArrDelayMinutes FROM mytable WHERE DestStateFips < 48 AND DestWac <= 21 ORDER BY DestCityMarketID LIMIT 21"]}
-{"sql":"SELECT COUNT(DepDelay), SUM(FirstDepTime), SUM(SecurityDelay) FROM mytable WHERE DivTailNums BETWEEN 'N309DE' AND 'N631VA' AND TailNum BETWEEN 'N5FMAA' AND 'N295SW' LIMIT 4","hsqls":["SELECT COUNT(DepDelay), SUM(FirstDepTime), SUM(SecurityDelay)  FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums__MV1 BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums__MV2 BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums__MV3 BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums__MV4 BETWEEN 'N309DE' AND 'N631VA') AND TailNum BETWEEN 'N5FMAA' AND 'N295SW' LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepDelay), SUM(FirstDepTime), SUM(SecurityDelay) FROM mytable WHERE DivTailNums BETWEEN 'N309DE' AND 'N631VA' AND TailNum BETWEEN 'N5FMAA' AND 'N295SW' LIMIT 4","hsqls":["SELECT COUNT(DepDelay), SUM(FirstDepTime), SUM(SecurityDelay)  FROM mytable WHERE (DivTailNums[1] BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums[2] BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums[3] BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums[4] BETWEEN 'N309DE' AND 'N631VA' OR DivTailNums[5] BETWEEN 'N309DE' AND 'N631VA') AND TailNum BETWEEN 'N5FMAA' AND 'N295SW' LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 4 LIMIT 14"}
 {"sql":"SELECT DepTimeBlk, DestAirportID, MIN(DistanceGroup) FROM mytable GROUP BY DepTimeBlk, DestAirportID","hsqls":["SELECT DepTimeBlk, DestAirportID, MIN(DistanceGroup) FROM mytable GROUP BY DepTimeBlk, DestAirportID"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE ArrivalDelayGroups NOT IN (1, 10, 4, 8, 12) OR Distance IN (558, 603, 1304) ORDER BY DistanceGroup, CRSArrTime, DestStateFips LIMIT 5"}
-{"sql":"SELECT Dest, DivAirportLandings FROM mytable WHERE \"Month\" = 1 AND DepTimeBlk > '1600-1659' AND Quarter IN (1) ORDER BY CRSArrTime, OriginCityMarketID LIMIT 26","hsqls":["SELECT Dest, DivAirportLandings FROM mytable WHERE Month = 1 AND DepTimeBlk > '1600-1659' AND Quarter IN (1) ORDER BY CRSArrTime, OriginCityMarketID LIMIT 26"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY DivReachedDest, AirTime LIMIT 10","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY DivReachedDest, AirTime LIMIT 10000"]}
+{"sql":"SELECT Dest, DivAirportLandings FROM mytable WHERE \"Month\" = 1 AND DepTimeBlk > '1600-1659' AND Quarter IN (1) ORDER BY CRSArrTime, OriginCityMarketID LIMIT 26","hsqls":["SELECT Dest, DivAirportLandings FROM mytable WHERE `Month` = 1 AND DepTimeBlk > '1600-1659' AND Quarter IN (1) ORDER BY CRSArrTime, OriginCityMarketID LIMIT 26"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY DivReachedDest, AirTime LIMIT 10","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY DivReachedDest, AirTime LIMIT 10000"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE ArrDelay > 18.0 OR OriginCityName < 'Champaign/Urbana, IL' OR DepartureDelayGroups IN (5, 11, -9999, 12) ORDER BY LateAircraftDelay LIMIT 8"}
 {"sql":"SELECT DepDel15, CancellationCode, DayOfWeek, COUNT(*) FROM mytable WHERE DestWac IN (1, 72, 81, 14) OR DestAirportSeqID NOT IN (1125203, 1349503, 1142303, 1537002, 1072804) AND DaysSinceEpoch <= 16087 GROUP BY DepDel15, CancellationCode, DayOfWeek  ORDER BY DepDel15, CancellationCode, DayOfWeek LIMIT 16","hsqls":["SELECT DepDel15, CancellationCode, DayOfWeek, COUNT(*) FROM mytable WHERE DestWac IN (1, 72, 81, 14) OR DestAirportSeqID NOT IN (1125203, 1349503, 1142303, 1537002, 1072804) AND DaysSinceEpoch <= 16087 GROUP BY DepDel15, CancellationCode, DayOfWeek  ORDER BY DepDel15, CancellationCode, DayOfWeek LIMIT 16"]}
 {"sql":"SELECT DestWac, DepDel15 FROM mytable ORDER BY DepTime, DestCityName, AirTime LIMIT 24"}
 {"sql":"SELECT DestStateFips, DayOfWeek, OriginStateName, MIN(TotalAddGTime), MAX(NASDelay), AVG(DivActualElapsedTime) FROM mytable WHERE WheelsOn BETWEEN 821 AND 1748 OR DestStateFips BETWEEN 36 AND 31 GROUP BY DestStateFips, DayOfWeek, OriginStateName  ORDER BY DestStateFips, DayOfWeek, OriginStateName LIMIT 6","hsqls":["SELECT DestStateFips, DayOfWeek, OriginStateName, MIN(TotalAddGTime), MAX(NASDelay), AVG(DivActualElapsedTime) FROM mytable WHERE WheelsOn BETWEEN 821 AND 1748 OR DestStateFips BETWEEN 36 AND 31 GROUP BY DestStateFips, DayOfWeek, OriginStateName  ORDER BY DestStateFips, DayOfWeek, OriginStateName LIMIT 6"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE SecurityDelay = -9999 OR DestAirportSeqID BETWEEN 1323002 AND 1295103 OR AirlineID IN (20304, 20436, 20437, 19930) ORDER BY FlightDate LIMIT 24"}
-{"sql":"SELECT TotalAddGTime, ArrDelay, \"Month\" FROM mytable ORDER BY ArrDelay, UniqueCarrier LIMIT 8","hsqls":["SELECT TotalAddGTime, ArrDelay, Month FROM mytable ORDER BY ArrDelay, UniqueCarrier LIMIT 8"]}
+{"sql":"SELECT TotalAddGTime, ArrDelay, \"Month\" FROM mytable ORDER BY ArrDelay, UniqueCarrier LIMIT 8","hsqls":["SELECT TotalAddGTime, ArrDelay, `Month` FROM mytable ORDER BY ArrDelay, UniqueCarrier LIMIT 8"]}
 {"sql":"SELECT DestState, CRSArrTime, FlightDate, COUNT(CRSArrTime) FROM mytable WHERE DepDelayMinutes > 45.0 AND CRSDepTime >= 1000 GROUP BY DestState, CRSArrTime, FlightDate  ORDER BY DestState, CRSArrTime, FlightDate LIMIT 10","hsqls":["SELECT DestState, CRSArrTime, FlightDate, COUNT(CRSArrTime) FROM mytable WHERE DepDelayMinutes > 45.0 AND CRSDepTime >= 1000 GROUP BY DestState, CRSArrTime, FlightDate  ORDER BY DestState, CRSArrTime, FlightDate LIMIT 10"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable LIMIT 10"}
 {"sql":"SELECT DepDelay, CRSDepTime, DayOfWeek FROM mytable ORDER BY SecurityDelay LIMIT 19"}
 {"sql":"SELECT DivArrDelay, DivActualElapsedTime, COUNT(ArrTime), MIN(DivAirportLandings), COUNT(DestCityMarketID) FROM mytable WHERE TotalAddGTime IN (94, 24, 27) OR DepDelay IN (129.0, 197.0, 144.0, 140.0, 109.0) OR ArrivalDelayGroups NOT IN (5, 4) GROUP BY DivArrDelay, DivActualElapsedTime  ORDER BY DivArrDelay, DivActualElapsedTime LIMIT 17","hsqls":["SELECT DivArrDelay, DivActualElapsedTime, COUNT(ArrTime), MIN(DivAirportLandings), COUNT(DestCityMarketID) FROM mytable WHERE TotalAddGTime IN (94, 24, 27) OR DepDelay IN (129.0, 197.0, 144.0, 140.0, 109.0) OR ArrivalDelayGroups NOT IN (5, 4) GROUP BY DivArrDelay, DivActualElapsedTime  ORDER BY DivArrDelay, DivActualElapsedTime LIMIT 17"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE CarrierDelay NOT IN (164, 64) OR DivArrDelay < 25 OR OriginState < 'DE' ORDER BY TotalAddGTime, OriginAirportID LIMIT 29"}
-{"sql":"SELECT DivLongestGTimes, NASDelay, DayOfWeek FROM mytable WHERE DestWac BETWEEN 39 AND 53 ORDER BY TotalAddGTime, OriginCityName, Dest LIMIT 24","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, NASDelay, DayOfWeek FROM mytable WHERE DestWac BETWEEN 39 AND 53 ORDER BY TotalAddGTime, OriginCityName, Dest LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, NASDelay, DayOfWeek FROM mytable WHERE DestWac BETWEEN 39 AND 53 ORDER BY TotalAddGTime, OriginCityName, Dest LIMIT 24","hsqls":["SELECT DivLongestGTimes, NASDelay, DayOfWeek FROM mytable WHERE DestWac BETWEEN 39 AND 53 ORDER BY TotalAddGTime, OriginCityName, Dest LIMIT 10000"]}
 {"sql":"SELECT DepTime, ActualElapsedTime FROM mytable WHERE FirstDepTime BETWEEN 1621 AND 2356 AND CancellationCode < 'noodles' AND ArrTime BETWEEN 1921 AND 1704 ORDER BY OriginAirportSeqID, OriginStateFips, CarrierDelay LIMIT 7"}
 {"sql":"SELECT ArrDelay FROM mytable WHERE TaxiOut IN (61, 155) ORDER BY CRSElapsedTime LIMIT 11"}
-{"sql":"SELECT TaxiIn, TailNum, \"Month\", COUNT(Quarter), MAX(OriginCityMarketID), COUNT(DestAirportSeqID) FROM mytable GROUP BY TaxiIn, TailNum, \"Month\" LIMIT 11","hsqls":["SELECT TaxiIn, TailNum, Month, COUNT(Quarter), MAX(OriginCityMarketID), COUNT(DestAirportSeqID) FROM mytable GROUP BY TaxiIn, TailNum, Month LIMIT 11"]}
+{"sql":"SELECT TaxiIn, TailNum, \"Month\", COUNT(Quarter), MAX(OriginCityMarketID), COUNT(DestAirportSeqID) FROM mytable GROUP BY TaxiIn, TailNum, \"Month\" LIMIT 11","hsqls":["SELECT TaxiIn, TailNum, Month, COUNT(Quarter), MAX(OriginCityMarketID), COUNT(DestAirportSeqID) FROM mytable GROUP BY TaxiIn, TailNum, `Month` LIMIT 11"]}
 {"sql":"SELECT LateAircraftDelay, ArrivalDelayGroups, MIN(DivArrDelay), AVG(DepartureDelayGroups) FROM mytable GROUP BY LateAircraftDelay, ArrivalDelayGroups  ORDER BY LateAircraftDelay, ArrivalDelayGroups LIMIT 23","hsqls":["SELECT LateAircraftDelay, ArrivalDelayGroups, MIN(DivArrDelay), AVG(DepartureDelayGroups) FROM mytable GROUP BY LateAircraftDelay, ArrivalDelayGroups  ORDER BY LateAircraftDelay, ArrivalDelayGroups LIMIT 23"]}
-{"sql":"SELECT DestStateName FROM mytable WHERE Quarter IN (1) OR DivAirports IN ('BPT', 'EUG', 'BWI', 'PVU') LIMIT 7","hsqls":["SELECT DestStateName FROM mytable WHERE Quarter IN (1) OR (DivAirports__MV0 IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports__MV1 IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports__MV2 IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports__MV3 IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports__MV4 IN ('BPT', 'EUG', 'BWI', 'PVU')) LIMIT 10000"]}
+{"sql":"SELECT DestStateName FROM mytable WHERE Quarter IN (1) OR DivAirports IN ('BPT', 'EUG', 'BWI', 'PVU') LIMIT 7","hsqls":["SELECT DestStateName FROM mytable WHERE Quarter IN (1) OR (DivAirports[1] IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports[2] IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports[3] IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports[4] IN ('BPT', 'EUG', 'BWI', 'PVU') OR DivAirports[5] IN ('BPT', 'EUG', 'BWI', 'PVU')) LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime FROM mytable LIMIT 6"}
-{"sql":"SELECT CarrierDelay, DivAirportLandings, OriginStateName FROM mytable WHERE DivWheelsOns IN (1411, 1648, 2228, 1122, 2339) LIMIT 5","hsqls":["SELECT CarrierDelay, DivAirportLandings, OriginStateName FROM mytable WHERE (DivWheelsOns__MV0 IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns__MV1 IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns__MV2 IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns__MV3 IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns__MV4 IN (1411, 1648, 2228, 1122, 2339)) LIMIT 10000"]}
-{"sql":"SELECT DestStateName, CRSElapsedTime, SUM(WeatherDelay), SUM(OriginStateFips) FROM mytable WHERE DivAirports = 'MCN' AND ArrDel15 BETWEEN 0 AND 1 GROUP BY DestStateName, CRSElapsedTime LIMIT 14","hsqls":["SELECT DestStateName, CRSElapsedTime, SUM(WeatherDelay), SUM(OriginStateFips) FROM mytable WHERE (DivAirports__MV0 = 'MCN' OR DivAirports__MV1 = 'MCN' OR DivAirports__MV2 = 'MCN' OR DivAirports__MV3 = 'MCN' OR DivAirports__MV4 = 'MCN') AND ArrDel15 BETWEEN 0 AND 1 GROUP BY DestStateName, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivAirportLandings, OriginStateName FROM mytable WHERE DivWheelsOns IN (1411, 1648, 2228, 1122, 2339) LIMIT 5","hsqls":["SELECT CarrierDelay, DivAirportLandings, OriginStateName FROM mytable WHERE (DivWheelsOns[1] IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns[2] IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns[3] IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns[4] IN (1411, 1648, 2228, 1122, 2339) OR DivWheelsOns[5] IN (1411, 1648, 2228, 1122, 2339)) LIMIT 10000"]}
+{"sql":"SELECT DestStateName, CRSElapsedTime, SUM(WeatherDelay), SUM(OriginStateFips) FROM mytable WHERE DivAirports = 'MCN' AND ArrDel15 BETWEEN 0 AND 1 GROUP BY DestStateName, CRSElapsedTime LIMIT 14","hsqls":["SELECT DestStateName, CRSElapsedTime, SUM(WeatherDelay), SUM(OriginStateFips) FROM mytable WHERE (DivAirports[1] = 'MCN' OR DivAirports[2] = 'MCN' OR DivAirports[3] = 'MCN' OR DivAirports[4] = 'MCN' OR DivAirports[5] = 'MCN') AND ArrDel15 BETWEEN 0 AND 1 GROUP BY DestStateName, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE OriginCityMarketID BETWEEN 31638 AND 33486 LIMIT 13"}
 {"sql":"SELECT DepTimeBlk, AVG(DivDistance), COUNT(DestStateName), SUM(DayOfWeek) FROM mytable WHERE DaysSinceEpoch > 16099 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 17","hsqls":["SELECT DepTimeBlk, AVG(DivDistance), COUNT(DestStateName), SUM(DayOfWeek) FROM mytable WHERE DaysSinceEpoch > 16099 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 17"]}
 {"sql":"SELECT CRSArrTime, DepDelayMinutes, MIN(OriginAirportID), AVG(Diverted) FROM mytable WHERE ArrTime IN (2228, 828) OR OriginWac IN (92, 63, 39, 11, 85) OR ArrDelayMinutes < 99.0 GROUP BY CRSArrTime, DepDelayMinutes  ORDER BY CRSArrTime, DepDelayMinutes LIMIT 23","hsqls":["SELECT CRSArrTime, DepDelayMinutes, MIN(OriginAirportID), AVG(Diverted) FROM mytable WHERE ArrTime IN (2228, 828) OR OriginWac IN (92, 63, 39, 11, 85) OR ArrDelayMinutes < 99.0 GROUP BY CRSArrTime, DepDelayMinutes  ORDER BY CRSArrTime, DepDelayMinutes LIMIT 23"]}
 {"sql":"SELECT Origin FROM mytable WHERE ArrTimeBlk BETWEEN '0600-0659' AND '2100-2159' OR DistanceGroup NOT IN (7, 11) ORDER BY FlightDate LIMIT 26"}
-{"sql":"SELECT \"Year\", MIN(ActualElapsedTime) FROM mytable WHERE DepDelayMinutes IN (72.0, 224.0) GROUP BY \"Year\" LIMIT 29","hsqls":["SELECT Year, MIN(ActualElapsedTime) FROM mytable WHERE DepDelayMinutes IN (72.0, 224.0) GROUP BY Year LIMIT 29"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE CarrierDelay NOT IN (150, 179, 53, 99) OR FirstDepTime NOT IN (1859, 2009, 727, 624, 12) AND Diverted NOT IN (1, 0) ORDER BY AirTime LIMIT 22","hsqls":["SELECT Month FROM mytable WHERE CarrierDelay NOT IN (150, 179, 53, 99) OR FirstDepTime NOT IN (1859, 2009, 727, 624, 12) AND Diverted NOT IN (1, 0) ORDER BY AirTime LIMIT 22"]}
+{"sql":"SELECT \"Year\", MIN(ActualElapsedTime) FROM mytable WHERE DepDelayMinutes IN (72.0, 224.0) GROUP BY \"Year\" LIMIT 29","hsqls":["SELECT Year, MIN(ActualElapsedTime) FROM mytable WHERE DepDelayMinutes IN (72.0, 224.0) GROUP BY `Year` LIMIT 29"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE CarrierDelay NOT IN (150, 179, 53, 99) OR FirstDepTime NOT IN (1859, 2009, 727, 624, 12) AND Diverted NOT IN (1, 0) ORDER BY AirTime LIMIT 22","hsqls":["SELECT `Month` FROM mytable WHERE CarrierDelay NOT IN (150, 179, 53, 99) OR FirstDepTime NOT IN (1859, 2009, 727, 624, 12) AND Diverted NOT IN (1, 0) ORDER BY AirTime LIMIT 22"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable LIMIT 15"}
 {"sql":"SELECT FlightNum, Dest, AirTime FROM mytable WHERE OriginAirportSeqID IN (1315802, 1432103, 1312702) OR AirlineID BETWEEN 20436 AND 20437 ORDER BY DepDelay, Origin LIMIT 19"}
 {"sql":"SELECT LongestAddGTime, CancellationCode, OriginStateName FROM mytable WHERE CRSDepTime <= 1106 ORDER BY TaxiIn, DestAirportID, AirlineID LIMIT 20"}
 {"sql":"SELECT WeatherDelay, ArrTimeBlk FROM mytable WHERE DestStateFips BETWEEN 33 AND 6 OR ArrDelay IN (363.0) ORDER BY \"Year\", Dest, DivArrDelay LIMIT 14","hsqls":["SELECT WeatherDelay, ArrTimeBlk FROM mytable WHERE DestStateFips BETWEEN 33 AND 6 OR ArrDelay IN (363.0) ORDER BY Year, Dest, DivArrDelay LIMIT 14"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Origin IN ('DHN', 'ISP', 'ONT') AND DivReachedDest >= 0 LIMIT 13"}
-{"sql":"SELECT DepDelayMinutes, MIN(DaysSinceEpoch), AVG(AirTime), AVG(AirlineID) FROM mytable WHERE DivAirports <= 'MGM' AND DayofMonth < 14 AND Origin BETWEEN 'MGM' AND 'MCO' GROUP BY DepDelayMinutes LIMIT 12","hsqls":["SELECT DepDelayMinutes, MIN(DaysSinceEpoch), AVG(AirTime), AVG(AirlineID) FROM mytable WHERE (DivAirports__MV0 <= 'MGM' OR DivAirports__MV1 <= 'MGM' OR DivAirports__MV2 <= 'MGM' OR DivAirports__MV3 <= 'MGM' OR DivAirports__MV4 <= 'MGM') AND DayofMonth < 14 AND Origin BETWEEN 'MGM' AND 'MCO' GROUP BY DepDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DivAirportIDs FROM mytable WHERE DepDel15 IN (0) AND FirstDepTime <> 1309 LIMIT 4","hsqls":["SELECT DepDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DepDel15 IN (0) AND FirstDepTime <> 1309 LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, MIN(DaysSinceEpoch), AVG(AirTime), AVG(AirlineID) FROM mytable WHERE DivAirports <= 'MGM' AND DayofMonth < 14 AND Origin BETWEEN 'MGM' AND 'MCO' GROUP BY DepDelayMinutes LIMIT 12","hsqls":["SELECT DepDelayMinutes, MIN(DaysSinceEpoch), AVG(AirTime), AVG(AirlineID) FROM mytable WHERE (DivAirports[1] <= 'MGM' OR DivAirports[2] <= 'MGM' OR DivAirports[3] <= 'MGM' OR DivAirports[4] <= 'MGM' OR DivAirports[5] <= 'MGM') AND DayofMonth < 14 AND Origin BETWEEN 'MGM' AND 'MCO' GROUP BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivAirportIDs FROM mytable WHERE DepDel15 IN (0) AND FirstDepTime <> 1309 LIMIT 4","hsqls":["SELECT DepDelay, DivAirportIDs FROM mytable WHERE DepDel15 IN (0) AND FirstDepTime <> 1309 LIMIT 10000"]}
 {"sql":"SELECT SUM(OriginStateFips) FROM mytable LIMIT 15"}
 {"sql":"SELECT DestAirportSeqID, DestCityName, DivAirportLandings, COUNT(Carrier), MAX(NASDelay), MAX(TaxiIn) FROM mytable WHERE WeatherDelay > 49 GROUP BY DestAirportSeqID, DestCityName, DivAirportLandings  ORDER BY DestAirportSeqID, DestCityName, DivAirportLandings LIMIT 22","hsqls":["SELECT DestAirportSeqID, DestCityName, DivAirportLandings, COUNT(Carrier), MAX(NASDelay), MAX(TaxiIn) FROM mytable WHERE WeatherDelay > 49 GROUP BY DestAirportSeqID, DestCityName, DivAirportLandings  ORDER BY DestAirportSeqID, DestCityName, DivAirportLandings LIMIT 22"]}
 {"sql":"SELECT FlightNum, CancellationCode, OriginAirportID, MAX(SecurityDelay), AVG(DistanceGroup) FROM mytable WHERE DepartureDelayGroups = 1 GROUP BY FlightNum, CancellationCode, OriginAirportID  ORDER BY FlightNum, CancellationCode, OriginAirportID LIMIT 21","hsqls":["SELECT FlightNum, CancellationCode, OriginAirportID, MAX(SecurityDelay), AVG(DistanceGroup) FROM mytable WHERE DepartureDelayGroups = 1 GROUP BY FlightNum, CancellationCode, OriginAirportID  ORDER BY FlightNum, CancellationCode, OriginAirportID LIMIT 21"]}
-{"sql":"SELECT LateAircraftDelay, DestStateFips, TailNum, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 279 AND 181 OR DivTotalGTimes BETWEEN 27 AND 87 GROUP BY LateAircraftDelay, DestStateFips, TailNum LIMIT 14","hsqls":["SELECT LateAircraftDelay, DestStateFips, TailNum, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 279 AND 181 OR (DivTotalGTimes__MV0 BETWEEN 27 AND 87 OR DivTotalGTimes__MV1 BETWEEN 27 AND 87 OR DivTotalGTimes__MV2 BETWEEN 27 AND 87 OR DivTotalGTimes__MV3 BETWEEN 27 AND 87 OR DivTotalGTimes__MV4 BETWEEN 27 AND 87) GROUP BY LateAircraftDelay, DestStateFips, TailNum LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, DestStateFips, TailNum, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 279 AND 181 OR DivTotalGTimes BETWEEN 27 AND 87 GROUP BY LateAircraftDelay, DestStateFips, TailNum LIMIT 14","hsqls":["SELECT LateAircraftDelay, DestStateFips, TailNum, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 279 AND 181 OR (DivTotalGTimes[1] BETWEEN 27 AND 87 OR DivTotalGTimes[2] BETWEEN 27 AND 87 OR DivTotalGTimes[3] BETWEEN 27 AND 87 OR DivTotalGTimes[4] BETWEEN 27 AND 87 OR DivTotalGTimes[5] BETWEEN 27 AND 87) GROUP BY LateAircraftDelay, DestStateFips, TailNum LIMIT 10000"]}
 {"sql":"SELECT DepTime, AirTime, AirlineID, MIN(WheelsOn), MAX(Diverted), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DepTime, AirTime, AirlineID  ORDER BY DepTime, AirTime, AirlineID LIMIT 7","hsqls":["SELECT DepTime, AirTime, AirlineID, MIN(WheelsOn), MAX(Diverted), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DepTime, AirTime, AirlineID  ORDER BY DepTime, AirTime, AirlineID LIMIT 7"]}
 {"sql":"SELECT OriginCityName FROM mytable WHERE ArrTime BETWEEN 1853 AND 137 ORDER BY Origin, OriginStateName LIMIT 18"}
 {"sql":"SELECT DivReachedDest, OriginCityMarketID, ArrDel15, COUNT(*) FROM mytable WHERE FlightDate <= '2014-01-13' AND DistanceGroup >= 1 GROUP BY DivReachedDest, OriginCityMarketID, ArrDel15  ORDER BY DivReachedDest, OriginCityMarketID, ArrDel15 LIMIT 16","hsqls":["SELECT DivReachedDest, OriginCityMarketID, ArrDel15, COUNT(*) FROM mytable WHERE FlightDate <= '2014-01-13' AND DistanceGroup >= 1 GROUP BY DivReachedDest, OriginCityMarketID, ArrDel15  ORDER BY DivReachedDest, OriginCityMarketID, ArrDel15 LIMIT 16"]}
-{"sql":"SELECT Distance, FlightDate, \"Month\" FROM mytable WHERE DepartureDelayGroups BETWEEN 5 AND 1 ORDER BY WheelsOff LIMIT 10","hsqls":["SELECT Distance, FlightDate, Month FROM mytable WHERE DepartureDelayGroups BETWEEN 5 AND 1 ORDER BY WheelsOff LIMIT 10"]}
+{"sql":"SELECT Distance, FlightDate, \"Month\" FROM mytable WHERE DepartureDelayGroups BETWEEN 5 AND 1 ORDER BY WheelsOff LIMIT 10","hsqls":["SELECT Distance, FlightDate, `Month` FROM mytable WHERE DepartureDelayGroups BETWEEN 5 AND 1 ORDER BY WheelsOff LIMIT 10"]}
 {"sql":"SELECT Carrier FROM mytable WHERE DepTimeBlk >= '1200-1259' OR Distance BETWEEN 3904 AND 445 OR WheelsOff > 555 ORDER BY DestAirportSeqID, NASDelay, TailNum LIMIT 5"}
-{"sql":"SELECT DivAirportLandings, AVG(TaxiOut), AVG(ArrDelay) FROM mytable WHERE DivAirportIDs BETWEEN 10994 AND 13158 OR CRSElapsedTime >= 271 AND DivWheelsOns >= 2126 GROUP BY DivAirportLandings LIMIT 18","hsqls":["SELECT DivAirportLandings, AVG(TaxiOut), AVG(ArrDelay) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 10994 AND 13158 OR DivAirportIDs__MV1 BETWEEN 10994 AND 13158 OR DivAirportIDs__MV2 BETWEEN 10994 AND 13158 OR DivAirportIDs__MV3 BETWEEN 10994 AND 13158 OR DivAirportIDs__MV4 BETWEEN 10994 AND 13158) OR CRSElapsedTime >= 271 AND (DivWheelsOns__MV0 >= 2126 OR DivWheelsOns__MV1 >= 2126 OR DivWheelsOns__MV2 >= 2126 OR DivWheelsOns__MV3 >= 2126 OR DivWheelsOns__MV4 >= 2126) GROUP BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, AVG(TaxiOut), AVG(ArrDelay) FROM mytable WHERE DivAirportIDs BETWEEN 10994 AND 13158 OR CRSElapsedTime >= 271 AND DivWheelsOns >= 2126 GROUP BY DivAirportLandings LIMIT 18","hsqls":["SELECT DivAirportLandings, AVG(TaxiOut), AVG(ArrDelay) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 10994 AND 13158 OR DivAirportIDs[2] BETWEEN 10994 AND 13158 OR DivAirportIDs[3] BETWEEN 10994 AND 13158 OR DivAirportIDs[4] BETWEEN 10994 AND 13158 OR DivAirportIDs[5] BETWEEN 10994 AND 13158) OR CRSElapsedTime >= 271 AND (DivWheelsOns[1] >= 2126 OR DivWheelsOns[2] >= 2126 OR DivWheelsOns[3] >= 2126 OR DivWheelsOns[4] >= 2126 OR DivWheelsOns[5] >= 2126) GROUP BY DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, AirlineID, MAX(DistanceGroup) FROM mytable GROUP BY ActualElapsedTime, AirlineID  ORDER BY ActualElapsedTime, AirlineID LIMIT 8","hsqls":["SELECT ActualElapsedTime, AirlineID, MAX(DistanceGroup) FROM mytable GROUP BY ActualElapsedTime, AirlineID  ORDER BY ActualElapsedTime, AirlineID LIMIT 8"]}
 {"sql":"SELECT ArrTime, AVG(DayOfWeek), MIN(DistanceGroup) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND ArrDelay NOT IN (54.0) GROUP BY ArrTime  ORDER BY ArrTime LIMIT 25","hsqls":["SELECT ArrTime, AVG(DayOfWeek), MIN(DistanceGroup) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND ArrDelay NOT IN (54.0) GROUP BY ArrTime  ORDER BY ArrTime LIMIT 25"]}
 {"sql":"SELECT CarrierDelay, MIN(ArrDelay), MIN(AirlineID), MAX(DepDelay) FROM mytable WHERE ArrDelayMinutes >= 108.0 AND DestStateFips IN (75, 38) GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 21","hsqls":["SELECT CarrierDelay, MIN(ArrDelay), MIN(AirlineID), MAX(DepDelay) FROM mytable WHERE ArrDelayMinutes >= 108.0 AND DestStateFips IN (75, 38) GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 21"]}
-{"sql":"SELECT TotalAddGTime, DivAirportSeqIDs FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 ORDER BY DestState, TailNum, UniqueCarrier LIMIT 14","hsqls":["SELECT TotalAddGTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 ORDER BY DestState, TailNum, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DivAirportSeqIDs FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 ORDER BY DestState, TailNum, UniqueCarrier LIMIT 14","hsqls":["SELECT TotalAddGTime, DivAirportSeqIDs FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 ORDER BY DestState, TailNum, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, CarrierDelay, AirlineID, COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (58, 403, 351) OR ArrDelayMinutes IN (63.0, 232.0, 176.0, 36.0, 27.0) GROUP BY CRSArrTime, CarrierDelay, AirlineID  ORDER BY CRSArrTime, CarrierDelay, AirlineID LIMIT 28","hsqls":["SELECT CRSArrTime, CarrierDelay, AirlineID, COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (58, 403, 351) OR ArrDelayMinutes IN (63.0, 232.0, 176.0, 36.0, 27.0) GROUP BY CRSArrTime, CarrierDelay, AirlineID  ORDER BY CRSArrTime, CarrierDelay, AirlineID LIMIT 28"]}
 {"sql":"SELECT AirTime, DaysSinceEpoch FROM mytable WHERE DestAirportID BETWEEN 11433 AND 10423 LIMIT 16"}
 {"sql":"SELECT FirstDepTime, OriginCityName, AVG(DestCityMarketID), AVG(DepDelayMinutes) FROM mytable WHERE LongestAddGTime BETWEEN 5 AND 58 AND DepTimeBlk BETWEEN '0600-0659' AND '0001-0559' GROUP BY FirstDepTime, OriginCityName  ORDER BY FirstDepTime, OriginCityName LIMIT 19","hsqls":["SELECT FirstDepTime, OriginCityName, AVG(DestCityMarketID), AVG(DepDelayMinutes) FROM mytable WHERE LongestAddGTime BETWEEN 5 AND 58 AND DepTimeBlk BETWEEN '0600-0659' AND '0001-0559' GROUP BY FirstDepTime, OriginCityName  ORDER BY FirstDepTime, OriginCityName LIMIT 19"]}
-{"sql":"SELECT MIN(DivActualElapsedTime), MAX(OriginAirportID) FROM mytable WHERE DivAirports IN ('BDL', 'OAK') LIMIT 25","hsqls":["SELECT MIN(DivActualElapsedTime), MAX(OriginAirportID)  FROM mytable WHERE (DivAirports__MV0 IN ('BDL', 'OAK') OR DivAirports__MV1 IN ('BDL', 'OAK') OR DivAirports__MV2 IN ('BDL', 'OAK') OR DivAirports__MV3 IN ('BDL', 'OAK') OR DivAirports__MV4 IN ('BDL', 'OAK')) LIMIT 10000"]}
+{"sql":"SELECT MIN(DivActualElapsedTime), MAX(OriginAirportID) FROM mytable WHERE DivAirports IN ('BDL', 'OAK') LIMIT 25","hsqls":["SELECT MIN(DivActualElapsedTime), MAX(OriginAirportID)  FROM mytable WHERE (DivAirports[1] IN ('BDL', 'OAK') OR DivAirports[2] IN ('BDL', 'OAK') OR DivAirports[3] IN ('BDL', 'OAK') OR DivAirports[4] IN ('BDL', 'OAK') OR DivAirports[5] IN ('BDL', 'OAK')) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, Origin, CRSElapsedTime FROM mytable WHERE UniqueCarrier < 'WN' OR OriginAirportID NOT IN (10792) LIMIT 25"}
-{"sql":"SELECT MAX(DepTime), SUM(\"Month\"), MIN(WheelsOff) FROM mytable WHERE DepTime IN (1005, 1811, 1016, 1354, 2023) AND ArrivalDelayGroups = -1 OR TailNum IN ('N597AA', 'N14125', 'N902FR', 'N280WN') LIMIT 17","hsqls":["SELECT MAX(DepTime), SUM(Month), MIN(WheelsOff) FROM mytable WHERE DepTime IN (1005, 1811, 1016, 1354, 2023) AND ArrivalDelayGroups = -1 OR TailNum IN ('N597AA', 'N14125', 'N902FR', 'N280WN') LIMIT 17"]}
+{"sql":"SELECT MAX(DepTime), SUM(\"Month\"), MIN(WheelsOff) FROM mytable WHERE DepTime IN (1005, 1811, 1016, 1354, 2023) AND ArrivalDelayGroups = -1 OR TailNum IN ('N597AA', 'N14125', 'N902FR', 'N280WN') LIMIT 17","hsqls":["SELECT MAX(DepTime), SUM(`Month`), MIN(WheelsOff) FROM mytable WHERE DepTime IN (1005, 1811, 1016, 1354, 2023) AND ArrivalDelayGroups = -1 OR TailNum IN ('N597AA', 'N14125', 'N902FR', 'N280WN') LIMIT 17"]}
 {"sql":"SELECT Distance, DestStateName, COUNT(*) FROM mytable WHERE CRSArrTime IN (1020, 8, 1527, 655, 1012) GROUP BY Distance, DestStateName  ORDER BY Distance, DestStateName LIMIT 29","hsqls":["SELECT Distance, DestStateName, COUNT(*) FROM mytable WHERE CRSArrTime IN (1020, 8, 1527, 655, 1012) GROUP BY Distance, DestStateName  ORDER BY Distance, DestStateName LIMIT 29"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 13"}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE DestAirportID IN (14730, 13256, 11775, 12953) LIMIT 26"}
-{"sql":"SELECT COUNT(ActualElapsedTime), AVG(DestWac) FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR DivTotalGTimes IN (62) LIMIT 18","hsqls":["SELECT COUNT(ActualElapsedTime), AVG(DestWac)  FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR (DivTotalGTimes__MV0 IN (62) OR DivTotalGTimes__MV1 IN (62) OR DivTotalGTimes__MV2 IN (62) OR DivTotalGTimes__MV3 IN (62) OR DivTotalGTimes__MV4 IN (62)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(ActualElapsedTime), AVG(DestWac) FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR DivTotalGTimes IN (62) LIMIT 18","hsqls":["SELECT COUNT(ActualElapsedTime), AVG(DestWac)  FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR (DivTotalGTimes[1] IN (62) OR DivTotalGTimes[2] IN (62) OR DivTotalGTimes[3] IN (62) OR DivTotalGTimes[4] IN (62) OR DivTotalGTimes[5] IN (62)) LIMIT 10000"]}
 {"sql":"SELECT AVG(OriginAirportSeqID), AVG(FlightNum), MIN(DivDistance) FROM mytable WHERE FlightDate <= '2014-01-17' LIMIT 24"}
 {"sql":"SELECT OriginCityName, MIN(WeatherDelay), MAX(FirstDepTime), COUNT(DestWac) FROM mytable WHERE ArrTimeBlk >= '2100-2159' OR ActualElapsedTime >= 257 OR DepTimeBlk NOT IN ('2000-2059', '2200-2259', '1300-1359', '0700-0759', '1400-1459') GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 23","hsqls":["SELECT OriginCityName, MIN(WeatherDelay), MAX(FirstDepTime), COUNT(DestWac) FROM mytable WHERE ArrTimeBlk >= '2100-2159' OR ActualElapsedTime >= 257 OR DepTimeBlk NOT IN ('2000-2059', '2200-2259', '1300-1359', '0700-0759', '1400-1459') GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 23"]}
 {"sql":"SELECT FlightNum, CRSArrTime, CRSElapsedTime, COUNT(Flights), MIN(ArrTime), SUM(ArrTime) FROM mytable WHERE OriginAirportSeqID > 1502403 GROUP BY FlightNum, CRSArrTime, CRSElapsedTime  ORDER BY FlightNum, CRSArrTime, CRSElapsedTime LIMIT 11","hsqls":["SELECT FlightNum, CRSArrTime, CRSElapsedTime, COUNT(Flights), MIN(ArrTime), SUM(ArrTime) FROM mytable WHERE OriginAirportSeqID > 1502403 GROUP BY FlightNum, CRSArrTime, CRSElapsedTime  ORDER BY FlightNum, CRSArrTime, CRSElapsedTime LIMIT 11"]}
@@ -4393,52 +4393,52 @@
 {"sql":"SELECT \"Year\", FlightDate, ArrivalDelayGroups FROM mytable ORDER BY DestStateFips, DepTimeBlk, CRSDepTime LIMIT 6","hsqls":["SELECT Year, FlightDate, ArrivalDelayGroups FROM mytable ORDER BY DestStateFips, DepTimeBlk, CRSDepTime LIMIT 6"]}
 {"sql":"SELECT DepartureDelayGroups, OriginWac, COUNT(OriginState), COUNT(ArrDelay) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16084 AND CRSArrTime NOT IN (1718, 610, 46, 1925) GROUP BY DepartureDelayGroups, OriginWac","hsqls":["SELECT DepartureDelayGroups, OriginWac, COUNT(OriginState), COUNT(ArrDelay) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16084 AND CRSArrTime NOT IN (1718, 610, 46, 1925) GROUP BY DepartureDelayGroups, OriginWac"]}
 {"sql":"SELECT Diverted, SUM(ArrivalDelayGroups), MIN(Flights) FROM mytable WHERE CRSDepTime NOT IN (1659, 1642) GROUP BY Diverted  ORDER BY Diverted LIMIT 8","hsqls":["SELECT Diverted, SUM(ArrivalDelayGroups), MIN(Flights) FROM mytable WHERE CRSDepTime NOT IN (1659, 1642) GROUP BY Diverted  ORDER BY Diverted LIMIT 8"]}
-{"sql":"SELECT DestStateName, CancellationCode FROM mytable WHERE DivDistance <= 334 OR DepartureDelayGroups BETWEEN 0 AND 1 OR DivTailNums IN ('N7702A', 'N569JB', 'N728SW') ORDER BY FlightNum, ArrivalDelayGroups LIMIT 25","hsqls":["SELECT DestStateName, CancellationCode FROM mytable WHERE DivDistance <= 334 OR DepartureDelayGroups BETWEEN 0 AND 1 OR (DivTailNums__MV0 IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums__MV1 IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums__MV2 IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums__MV3 IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums__MV4 IN ('N7702A', 'N569JB', 'N728SW')) ORDER BY FlightNum, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DestStateName, CancellationCode FROM mytable WHERE DivDistance <= 334 OR DepartureDelayGroups BETWEEN 0 AND 1 OR DivTailNums IN ('N7702A', 'N569JB', 'N728SW') ORDER BY FlightNum, ArrivalDelayGroups LIMIT 25","hsqls":["SELECT DestStateName, CancellationCode FROM mytable WHERE DivDistance <= 334 OR DepartureDelayGroups BETWEEN 0 AND 1 OR (DivTailNums[1] IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums[2] IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums[3] IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums[4] IN ('N7702A', 'N569JB', 'N728SW') OR DivTailNums[5] IN ('N7702A', 'N569JB', 'N728SW')) ORDER BY FlightNum, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT OriginState, AirTime FROM mytable WHERE ArrDelayMinutes NOT IN (179.0, 75.0) OR CancellationCode BETWEEN 'noodles' AND 'noodles' LIMIT 10"}
 {"sql":"SELECT DivActualElapsedTime, AVG(TaxiIn), AVG(WheelsOff) FROM mytable WHERE FlightDate NOT IN ('2014-01-16') OR OriginStateFips BETWEEN 27 AND 49 OR CarrierDelay NOT IN (62) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 18","hsqls":["SELECT DivActualElapsedTime, AVG(TaxiIn), AVG(WheelsOff) FROM mytable WHERE FlightDate NOT IN ('2014-01-16') OR OriginStateFips BETWEEN 27 AND 49 OR CarrierDelay NOT IN (62) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 18"]}
 {"sql":"SELECT DivAirportLandings, SUM(ActualElapsedTime), MIN(DestCityMarketID) FROM mytable WHERE TailNum IN ('N21197', 'N8310C', 'N13718') GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 19","hsqls":["SELECT DivAirportLandings, SUM(ActualElapsedTime), MIN(DestCityMarketID) FROM mytable WHERE TailNum IN ('N21197', 'N8310C', 'N13718') GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 19"]}
-{"sql":"SELECT SUM(Flights), AVG(ArrDelayMinutes) FROM mytable WHERE ActualElapsedTime BETWEEN 124 AND 189 AND ArrDelayMinutes <= 116.0 AND DivAirportSeqIDs < 1291503 LIMIT 25","hsqls":["SELECT SUM(Flights), AVG(ArrDelayMinutes)  FROM mytable WHERE ActualElapsedTime BETWEEN 124 AND 189 AND ArrDelayMinutes <= 116.0 AND (DivAirportSeqIDs__MV0 < 1291503 OR DivAirportSeqIDs__MV1 < 1291503 OR DivAirportSeqIDs__MV2 < 1291503 OR DivAirportSeqIDs__MV3 < 1291503 OR DivAirportSeqIDs__MV4 < 1291503) LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, DivArrDelay FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND ArrDel15 <> 1 LIMIT 29","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DivArrDelay FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND ArrDel15 <> 1 LIMIT 10000"]}
+{"sql":"SELECT SUM(Flights), AVG(ArrDelayMinutes) FROM mytable WHERE ActualElapsedTime BETWEEN 124 AND 189 AND ArrDelayMinutes <= 116.0 AND DivAirportSeqIDs < 1291503 LIMIT 25","hsqls":["SELECT SUM(Flights), AVG(ArrDelayMinutes)  FROM mytable WHERE ActualElapsedTime BETWEEN 124 AND 189 AND ArrDelayMinutes <= 116.0 AND (DivAirportSeqIDs[1] < 1291503 OR DivAirportSeqIDs[2] < 1291503 OR DivAirportSeqIDs[3] < 1291503 OR DivAirportSeqIDs[4] < 1291503 OR DivAirportSeqIDs[5] < 1291503) LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, DivArrDelay FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND ArrDel15 <> 1 LIMIT 29","hsqls":["SELECT DivTailNums, DivArrDelay FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND ArrDel15 <> 1 LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, ArrDelay, DivActualElapsedTime, AVG(CRSElapsedTime), MAX(DepDelay) FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 20 GROUP BY CancellationCode, ArrDelay, DivActualElapsedTime  ORDER BY CancellationCode, ArrDelay, DivActualElapsedTime LIMIT 14","hsqls":["SELECT CancellationCode, ArrDelay, DivActualElapsedTime, AVG(CRSElapsedTime), MAX(DepDelay) FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 20 GROUP BY CancellationCode, ArrDelay, DivActualElapsedTime  ORDER BY CancellationCode, ArrDelay, DivActualElapsedTime LIMIT 14"]}
 {"sql":"SELECT ArrDelayMinutes, MAX(TotalAddGTime) FROM mytable WHERE DestCityMarketID BETWEEN 34489 AND 31721 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 2","hsqls":["SELECT ArrDelayMinutes, MAX(TotalAddGTime) FROM mytable WHERE DestCityMarketID BETWEEN 34489 AND 31721 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 2"]}
-{"sql":"SELECT DivReachedDest, OriginState FROM mytable WHERE DivAirports IN ('HNL', 'MIA') AND Flights BETWEEN 1 AND 1 LIMIT 14","hsqls":["SELECT DivReachedDest, OriginState FROM mytable WHERE (DivAirports__MV0 IN ('HNL', 'MIA') OR DivAirports__MV1 IN ('HNL', 'MIA') OR DivAirports__MV2 IN ('HNL', 'MIA') OR DivAirports__MV3 IN ('HNL', 'MIA') OR DivAirports__MV4 IN ('HNL', 'MIA')) AND Flights BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, OriginState FROM mytable WHERE DivAirports IN ('HNL', 'MIA') AND Flights BETWEEN 1 AND 1 LIMIT 14","hsqls":["SELECT DivReachedDest, OriginState FROM mytable WHERE (DivAirports[1] IN ('HNL', 'MIA') OR DivAirports[2] IN ('HNL', 'MIA') OR DivAirports[3] IN ('HNL', 'MIA') OR DivAirports[4] IN ('HNL', 'MIA') OR DivAirports[5] IN ('HNL', 'MIA')) AND Flights BETWEEN 1 AND 1 LIMIT 10000"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE TaxiIn <> 59 AND DestCityName <= 'Hartford, CT' ORDER BY ArrTimeBlk LIMIT 21"}
 {"sql":"SELECT SUM(AirlineID), COUNT(DestState) FROM mytable WHERE ArrDelay NOT IN (185.0, 193.0, 190.0) LIMIT 18"}
-{"sql":"SELECT LateAircraftDelay, AVG(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE Quarter <> 1 AND DivWheelsOns > 1403 AND Dest IN ('KOA', 'DFW', 'DSM', 'JNU', 'INL') GROUP BY LateAircraftDelay LIMIT 18","hsqls":["SELECT LateAircraftDelay, AVG(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE Quarter <> 1 AND (DivWheelsOns__MV0 > 1403 OR DivWheelsOns__MV1 > 1403 OR DivWheelsOns__MV2 > 1403 OR DivWheelsOns__MV3 > 1403 OR DivWheelsOns__MV4 > 1403) AND Dest IN ('KOA', 'DFW', 'DSM', 'JNU', 'INL') GROUP BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, AVG(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE Quarter <> 1 AND DivWheelsOns > 1403 AND Dest IN ('KOA', 'DFW', 'DSM', 'JNU', 'INL') GROUP BY LateAircraftDelay LIMIT 18","hsqls":["SELECT LateAircraftDelay, AVG(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE Quarter <> 1 AND (DivWheelsOns[1] > 1403 OR DivWheelsOns[2] > 1403 OR DivWheelsOns[3] > 1403 OR DivWheelsOns[4] > 1403 OR DivWheelsOns[5] > 1403) AND Dest IN ('KOA', 'DFW', 'DSM', 'JNU', 'INL') GROUP BY LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, OriginWac, ArrDelay, COUNT(*) FROM mytable GROUP BY ActualElapsedTime, OriginWac, ArrDelay  ORDER BY ActualElapsedTime, OriginWac, ArrDelay LIMIT 3","hsqls":["SELECT ActualElapsedTime, OriginWac, ArrDelay, COUNT(*) FROM mytable GROUP BY ActualElapsedTime, OriginWac, ArrDelay  ORDER BY ActualElapsedTime, OriginWac, ArrDelay LIMIT 3"]}
 {"sql":"SELECT ArrTime, DestStateName FROM mytable ORDER BY LongestAddGTime, OriginCityName, ActualElapsedTime LIMIT 24"}
 {"sql":"SELECT OriginWac, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DestCityMarketID = 34794 OR DepartureDelayGroups >= 3 OR DivReachedDest > 0 GROUP BY OriginWac, DivActualElapsedTime  ORDER BY OriginWac, DivActualElapsedTime LIMIT 8","hsqls":["SELECT OriginWac, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DestCityMarketID = 34794 OR DepartureDelayGroups >= 3 OR DivReachedDest > 0 GROUP BY OriginWac, DivActualElapsedTime  ORDER BY OriginWac, DivActualElapsedTime LIMIT 8"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DivDistance BETWEEN 120 AND 110 OR Distance NOT IN (67, 228) AND FlightNum >= 6111 LIMIT 29"}
-{"sql":"SELECT FlightNum, TaxiIn, DivAirportIDs FROM mytable WHERE Origin <= 'TTN' AND Dest BETWEEN 'OKC' AND 'HRL' LIMIT 26","hsqls":["SELECT FlightNum, TaxiIn, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Origin <= 'TTN' AND Dest BETWEEN 'OKC' AND 'HRL' LIMIT 10000"]}
+{"sql":"SELECT FlightNum, TaxiIn, DivAirportIDs FROM mytable WHERE Origin <= 'TTN' AND Dest BETWEEN 'OKC' AND 'HRL' LIMIT 26","hsqls":["SELECT FlightNum, TaxiIn, DivAirportIDs FROM mytable WHERE Origin <= 'TTN' AND Dest BETWEEN 'OKC' AND 'HRL' LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, Origin, DestCityMarketID FROM mytable ORDER BY Quarter, DestCityMarketID LIMIT 2"}
 {"sql":"SELECT LateAircraftDelay, NASDelay FROM mytable WHERE AirlineID IN (19690, 19393, 19930, 20409, 20355) LIMIT 3"}
-{"sql":"SELECT DivLongestGTimes, CarrierDelay, DestStateFips FROM mytable WHERE OriginCityName < 'Arcata/Eureka, CA' AND OriginCityName = 'Springfield, MO' OR TaxiIn BETWEEN 71 AND 43 ORDER BY DistanceGroup LIMIT 12","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CarrierDelay, DestStateFips FROM mytable WHERE OriginCityName < 'Arcata/Eureka, CA' AND OriginCityName = 'Springfield, MO' OR TaxiIn BETWEEN 71 AND 43 ORDER BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CarrierDelay, DestStateFips FROM mytable WHERE OriginCityName < 'Arcata/Eureka, CA' AND OriginCityName = 'Springfield, MO' OR TaxiIn BETWEEN 71 AND 43 ORDER BY DistanceGroup LIMIT 12","hsqls":["SELECT DivLongestGTimes, CarrierDelay, DestStateFips FROM mytable WHERE OriginCityName < 'Arcata/Eureka, CA' AND OriginCityName = 'Springfield, MO' OR TaxiIn BETWEEN 71 AND 43 ORDER BY DistanceGroup LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, AirTime, DayofMonth, COUNT(*) FROM mytable WHERE SecurityDelay < 27 GROUP BY TaxiOut, AirTime, DayofMonth  ORDER BY TaxiOut, AirTime, DayofMonth LIMIT 10","hsqls":["SELECT TaxiOut, AirTime, DayofMonth, COUNT(*) FROM mytable WHERE SecurityDelay < 27 GROUP BY TaxiOut, AirTime, DayofMonth  ORDER BY TaxiOut, AirTime, DayofMonth LIMIT 10"]}
 {"sql":"SELECT WheelsOff, CRSArrTime, DepDelayMinutes FROM mytable WHERE FirstDepTime BETWEEN 1540 AND 726 AND DivActualElapsedTime NOT IN (300) AND ArrDelay BETWEEN -40.0 AND 34.0 LIMIT 18"}
-{"sql":"SELECT ActualElapsedTime, COUNT(DestStateName), AVG(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N917DL' AND 'N235SW' OR DaysSinceEpoch BETWEEN 16076 AND 16092 GROUP BY ActualElapsedTime","hsqls":["SELECT ActualElapsedTime, COUNT(DestStateName), AVG(OriginStateFips) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums__MV1 BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums__MV2 BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums__MV3 BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums__MV4 BETWEEN 'N917DL' AND 'N235SW') OR DaysSinceEpoch BETWEEN 16076 AND 16092 GROUP BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, COUNT(DestStateName), AVG(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N917DL' AND 'N235SW' OR DaysSinceEpoch BETWEEN 16076 AND 16092 GROUP BY ActualElapsedTime","hsqls":["SELECT ActualElapsedTime, COUNT(DestStateName), AVG(OriginStateFips) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums[2] BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums[3] BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums[4] BETWEEN 'N917DL' AND 'N235SW' OR DivTailNums[5] BETWEEN 'N917DL' AND 'N235SW') OR DaysSinceEpoch BETWEEN 16076 AND 16092 GROUP BY ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE SecurityDelay BETWEEN 0 AND 27 OR OriginWac < 34 AND OriginState IN ('MT') ORDER BY DestStateFips, Dest LIMIT 22"}
-{"sql":"SELECT DepartureDelayGroups, TaxiIn, OriginAirportID, COUNT(*) FROM mytable WHERE DivTotalGTimes >= 50 GROUP BY DepartureDelayGroups, TaxiIn, OriginAirportID LIMIT 6","hsqls":["SELECT DepartureDelayGroups, TaxiIn, OriginAirportID, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 >= 50 OR DivTotalGTimes__MV1 >= 50 OR DivTotalGTimes__MV2 >= 50 OR DivTotalGTimes__MV3 >= 50 OR DivTotalGTimes__MV4 >= 50) GROUP BY DepartureDelayGroups, TaxiIn, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT COUNT(\"Month\") FROM mytable WHERE Origin <= 'SIT' LIMIT 16","hsqls":["SELECT COUNT(Month) FROM mytable WHERE Origin <= 'SIT' LIMIT 16"]}
+{"sql":"SELECT DepartureDelayGroups, TaxiIn, OriginAirportID, COUNT(*) FROM mytable WHERE DivTotalGTimes >= 50 GROUP BY DepartureDelayGroups, TaxiIn, OriginAirportID LIMIT 6","hsqls":["SELECT DepartureDelayGroups, TaxiIn, OriginAirportID, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] >= 50 OR DivTotalGTimes[2] >= 50 OR DivTotalGTimes[3] >= 50 OR DivTotalGTimes[4] >= 50 OR DivTotalGTimes[5] >= 50) GROUP BY DepartureDelayGroups, TaxiIn, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT COUNT(\"Month\") FROM mytable WHERE Origin <= 'SIT' LIMIT 16","hsqls":["SELECT COUNT(`Month`) FROM mytable WHERE Origin <= 'SIT' LIMIT 16"]}
 {"sql":"SELECT \"Year\", DivArrDelay, DivActualElapsedTime FROM mytable WHERE DivDistance IN (436, 814, 636, 88, 50) AND Flights NOT IN (1) LIMIT 15","hsqls":["SELECT Year, DivArrDelay, DivActualElapsedTime FROM mytable WHERE DivDistance IN (436, 814, 636, 88, 50) AND Flights NOT IN (1) LIMIT 15"]}
 {"sql":"SELECT COUNT(DestStateFips), SUM(CRSElapsedTime) FROM mytable LIMIT 13"}
 {"sql":"SELECT MIN(DepDelayMinutes), SUM(CRSDepTime) FROM mytable LIMIT 26"}
 {"sql":"SELECT SUM(LongestAddGTime), AVG(ArrDelayMinutes), MAX(TaxiOut) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR CancellationCode NOT IN ('A', 'noodles') LIMIT 6"}
 {"sql":"SELECT DestState, Quarter, NASDelay, COUNT(*) FROM mytable WHERE Cancelled NOT IN (1, 0) OR OriginCityMarketID BETWEEN 30325 AND 35096 AND NASDelay <> 320 GROUP BY DestState, Quarter, NASDelay  ORDER BY DestState, Quarter, NASDelay LIMIT 1","hsqls":["SELECT DestState, Quarter, NASDelay, COUNT(*) FROM mytable WHERE Cancelled NOT IN (1, 0) OR OriginCityMarketID BETWEEN 30325 AND 35096 AND NASDelay <> 320 GROUP BY DestState, Quarter, NASDelay  ORDER BY DestState, Quarter, NASDelay LIMIT 1"]}
-{"sql":"SELECT Quarter, DestCityName FROM mytable WHERE Dest BETWEEN 'DRO' AND 'GPT' OR DepTime IN (1511, 1927, 948) AND DivAirports > 'IND' ORDER BY OriginCityMarketID, Dest, DestCityName LIMIT 24","hsqls":["SELECT Quarter, DestCityName FROM mytable WHERE Dest BETWEEN 'DRO' AND 'GPT' OR DepTime IN (1511, 1927, 948) AND (DivAirports__MV0 > 'IND' OR DivAirports__MV1 > 'IND' OR DivAirports__MV2 > 'IND' OR DivAirports__MV3 > 'IND' OR DivAirports__MV4 > 'IND') ORDER BY OriginCityMarketID, Dest, DestCityName LIMIT 10000"]}
+{"sql":"SELECT Quarter, DestCityName FROM mytable WHERE Dest BETWEEN 'DRO' AND 'GPT' OR DepTime IN (1511, 1927, 948) AND DivAirports > 'IND' ORDER BY OriginCityMarketID, Dest, DestCityName LIMIT 24","hsqls":["SELECT Quarter, DestCityName FROM mytable WHERE Dest BETWEEN 'DRO' AND 'GPT' OR DepTime IN (1511, 1927, 948) AND (DivAirports[1] > 'IND' OR DivAirports[2] > 'IND' OR DivAirports[3] > 'IND' OR DivAirports[4] > 'IND' OR DivAirports[5] > 'IND') ORDER BY OriginCityMarketID, Dest, DestCityName LIMIT 10000"]}
 {"sql":"SELECT DivDistance, SecurityDelay, DepTimeBlk FROM mytable WHERE DayOfWeek BETWEEN 6 AND 2 LIMIT 20"}
 {"sql":"SELECT Origin, DestCityMarketID, CRSElapsedTime, AVG(ArrDelay) FROM mytable WHERE DestAirportSeqID < 1330303 OR AirlineID = 21171 AND CRSDepTime IN (1548, 705, 2000, 2200) GROUP BY Origin, DestCityMarketID, CRSElapsedTime  ORDER BY Origin, DestCityMarketID, CRSElapsedTime LIMIT 25","hsqls":["SELECT Origin, DestCityMarketID, CRSElapsedTime, AVG(ArrDelay) FROM mytable WHERE DestAirportSeqID < 1330303 OR AirlineID = 21171 AND CRSDepTime IN (1548, 705, 2000, 2200) GROUP BY Origin, DestCityMarketID, CRSElapsedTime  ORDER BY Origin, DestCityMarketID, CRSElapsedTime LIMIT 25"]}
-{"sql":"SELECT DestState FROM mytable WHERE DivLongestGTimes > 145.0 ORDER BY DepDelay, WeatherDelay LIMIT 6","hsqls":["SELECT DestState FROM mytable WHERE (DivLongestGTimes__MV0 > 145.0 OR DivLongestGTimes__MV1 > 145.0 OR DivLongestGTimes__MV2 > 145.0 OR DivLongestGTimes__MV3 > 145.0 OR DivLongestGTimes__MV4 > 145.0) ORDER BY DepDelay, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DestState FROM mytable WHERE DivLongestGTimes > 145.0 ORDER BY DepDelay, WeatherDelay LIMIT 6","hsqls":["SELECT DestState FROM mytable WHERE (DivLongestGTimes[1] > 145.0 OR DivLongestGTimes[2] > 145.0 OR DivLongestGTimes[3] > 145.0 OR DivLongestGTimes[4] > 145.0 OR DivLongestGTimes[5] > 145.0) ORDER BY DepDelay, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT Origin FROM mytable WHERE CRSElapsedTime NOT IN (325) OR DestAirportSeqID IN (1033302, 1357702, 1379602) AND ArrDelay NOT IN (9.0, 315.0, 174.0) LIMIT 8"}
-{"sql":"SELECT Flights, CancellationCode, \"Month\" FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 0 ORDER BY OriginState, FlightDate LIMIT 22","hsqls":["SELECT Flights, CancellationCode, Month FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 0 ORDER BY OriginState, FlightDate LIMIT 22"]}
+{"sql":"SELECT Flights, CancellationCode, \"Month\" FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 0 ORDER BY OriginState, FlightDate LIMIT 22","hsqls":["SELECT Flights, CancellationCode, `Month` FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 0 ORDER BY OriginState, FlightDate LIMIT 22"]}
 {"sql":"SELECT DepartureDelayGroups, FirstDepTime, FlightNum FROM mytable LIMIT 24"}
 {"sql":"SELECT WheelsOn, CRSElapsedTime, OriginStateName FROM mytable WHERE DepartureDelayGroups < 1 OR DivReachedDest > -9999 ORDER BY DivActualElapsedTime, CRSElapsedTime LIMIT 15"}
 {"sql":"SELECT WeatherDelay, TaxiIn, AirTime FROM mytable LIMIT 19"}
 {"sql":"SELECT DestStateName, DivAirportLandings FROM mytable WHERE OriginStateFips IN (45, 6, 56, 31, 35) LIMIT 24"}
 {"sql":"SELECT COUNT(FlightNum), SUM(DistanceGroup) FROM mytable WHERE OriginState >= 'OH' AND DaysSinceEpoch BETWEEN 16100 AND 16092 LIMIT 17"}
-{"sql":"SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE DivWheelsOns IN (1705, 1955, 2258, 1606, 845) AND ArrivalDelayGroups BETWEEN 6 AND -2 AND OriginCityMarketID NOT IN (31308) ORDER BY OriginStateFips LIMIT 26","hsqls":["SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE (DivWheelsOns__MV0 IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns__MV1 IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns__MV2 IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns__MV3 IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns__MV4 IN (1705, 1955, 2258, 1606, 845)) AND ArrivalDelayGroups BETWEEN 6 AND -2 AND OriginCityMarketID NOT IN (31308) ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE DivWheelsOns IN (1705, 1955, 2258, 1606, 845) AND ArrivalDelayGroups BETWEEN 6 AND -2 AND OriginCityMarketID NOT IN (31308) ORDER BY OriginStateFips LIMIT 26","hsqls":["SELECT Cancelled, DayofMonth, ArrivalDelayGroups FROM mytable WHERE (DivWheelsOns[1] IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns[2] IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns[3] IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns[4] IN (1705, 1955, 2258, 1606, 845) OR DivWheelsOns[5] IN (1705, 1955, 2258, 1606, 845)) AND ArrivalDelayGroups BETWEEN 6 AND -2 AND OriginCityMarketID NOT IN (31308) ORDER BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, ArrDelay, COUNT(TailNum) FROM mytable WHERE LateAircraftDelay BETWEEN 112 AND 46 GROUP BY TaxiOut, ArrDelay  ORDER BY TaxiOut, ArrDelay LIMIT 20","hsqls":["SELECT TaxiOut, ArrDelay, COUNT(TailNum) FROM mytable WHERE LateAircraftDelay BETWEEN 112 AND 46 GROUP BY TaxiOut, ArrDelay  ORDER BY TaxiOut, ArrDelay LIMIT 20"]}
 {"sql":"SELECT FlightNum, ArrivalDelayGroups FROM mytable ORDER BY TaxiIn LIMIT 20"}
-{"sql":"SELECT \"Year\", DivAirports FROM mytable WHERE DestWac NOT IN (51) OR Diverted NOT IN (1, 0) ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT Year, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DestWac NOT IN (51) OR Diverted NOT IN (1, 0) ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivAirports FROM mytable WHERE DestWac NOT IN (51) OR Diverted NOT IN (1, 0) ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT Year, DivAirports FROM mytable WHERE DestWac NOT IN (51) OR Diverted NOT IN (1, 0) ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, Cancelled FROM mytable LIMIT 29"}
 {"sql":"SELECT Diverted, DestStateName, COUNT(*) FROM mytable WHERE LongestAddGTime NOT IN (58, 63) OR NASDelay NOT IN (146, 109) AND TailNum <> 'N944AT' GROUP BY Diverted, DestStateName  ORDER BY Diverted, DestStateName LIMIT 21","hsqls":["SELECT Diverted, DestStateName, COUNT(*) FROM mytable WHERE LongestAddGTime NOT IN (58, 63) OR NASDelay NOT IN (146, 109) AND TailNum <> 'N944AT' GROUP BY Diverted, DestStateName  ORDER BY Diverted, DestStateName LIMIT 21"]}
 {"sql":"SELECT DestWac, DivDistance, SUM(Flights) FROM mytable WHERE DaysSinceEpoch BETWEEN 16078 AND 16072 OR DestWac > 83 AND ArrTime > 1637 GROUP BY DestWac, DivDistance","hsqls":["SELECT DestWac, DivDistance, SUM(Flights) FROM mytable WHERE DaysSinceEpoch BETWEEN 16078 AND 16072 OR DestWac > 83 AND ArrTime > 1637 GROUP BY DestWac, DivDistance"]}
@@ -4446,31 +4446,31 @@
 {"sql":"SELECT FirstDepTime, DivArrDelay FROM mytable WHERE DestAirportID BETWEEN 11146 AND 12511 AND DestCityMarketID NOT IN (31267, 34674) OR ArrDelay BETWEEN 12.0 AND 131.0 ORDER BY DestState, WeatherDelay, OriginAirportID LIMIT 13"}
 {"sql":"SELECT CarrierDelay, COUNT(TaxiIn), COUNT(ArrTimeBlk), COUNT(TotalAddGTime) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 11","hsqls":["SELECT CarrierDelay, COUNT(TaxiIn), COUNT(ArrTimeBlk), COUNT(TotalAddGTime) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 11"]}
 {"sql":"SELECT OriginAirportSeqID, AirlineID FROM mytable WHERE ArrivalDelayGroups = 0 ORDER BY DepDelay, OriginWac LIMIT 20"}
-{"sql":"SELECT OriginState, ArrivalDelayGroups, DivTotalGTimes FROM mytable ORDER BY OriginAirportSeqID, OriginCityName, Cancelled LIMIT 29","hsqls":["SELECT OriginState, ArrivalDelayGroups, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY OriginAirportSeqID, OriginCityName, Cancelled LIMIT 10000"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE DepTime BETWEEN 2238 AND 1621 OR DivAirports IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') AND LateAircraftDelay BETWEEN 53 AND 61 LIMIT 29","hsqls":["SELECT DestCityName FROM mytable WHERE DepTime BETWEEN 2238 AND 1621 OR (DivAirports__MV0 IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports__MV1 IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports__MV2 IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports__MV3 IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports__MV4 IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU')) AND LateAircraftDelay BETWEEN 53 AND 61 LIMIT 10000"]}
+{"sql":"SELECT OriginState, ArrivalDelayGroups, DivTotalGTimes FROM mytable ORDER BY OriginAirportSeqID, OriginCityName, Cancelled LIMIT 29","hsqls":["SELECT OriginState, ArrivalDelayGroups, DivTotalGTimes FROM mytable ORDER BY OriginAirportSeqID, OriginCityName, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE DepTime BETWEEN 2238 AND 1621 OR DivAirports IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') AND LateAircraftDelay BETWEEN 53 AND 61 LIMIT 29","hsqls":["SELECT DestCityName FROM mytable WHERE DepTime BETWEEN 2238 AND 1621 OR (DivAirports[1] IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports[2] IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports[3] IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports[4] IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU') OR DivAirports[5] IN ('HLN', 'LMT', 'OAK', 'RNO', 'HOU')) AND LateAircraftDelay BETWEEN 53 AND 61 LIMIT 10000"]}
 {"sql":"SELECT DepDel15, CRSElapsedTime, DaysSinceEpoch, MIN(Distance), AVG(DivActualElapsedTime) FROM mytable WHERE ArrivalDelayGroups NOT IN (3, 10, 6) GROUP BY DepDel15, CRSElapsedTime, DaysSinceEpoch  ORDER BY DepDel15, CRSElapsedTime, DaysSinceEpoch LIMIT 15","hsqls":["SELECT DepDel15, CRSElapsedTime, DaysSinceEpoch, MIN(Distance), AVG(DivActualElapsedTime) FROM mytable WHERE ArrivalDelayGroups NOT IN (3, 10, 6) GROUP BY DepDel15, CRSElapsedTime, DaysSinceEpoch  ORDER BY DepDel15, CRSElapsedTime, DaysSinceEpoch LIMIT 15"]}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE Origin BETWEEN 'MDW' AND 'BTM' OR FlightNum BETWEEN 5013 AND 5419 OR DivTotalGTimes IN (77, 30, 43) ORDER BY WeatherDelay, DivArrDelay LIMIT 8","hsqls":["SELECT CarrierDelay FROM mytable WHERE Origin BETWEEN 'MDW' AND 'BTM' OR FlightNum BETWEEN 5013 AND 5419 OR (DivTotalGTimes__MV0 IN (77, 30, 43) OR DivTotalGTimes__MV1 IN (77, 30, 43) OR DivTotalGTimes__MV2 IN (77, 30, 43) OR DivTotalGTimes__MV3 IN (77, 30, 43) OR DivTotalGTimes__MV4 IN (77, 30, 43)) ORDER BY WeatherDelay, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT DestWac, DestStateName FROM mytable WHERE AirlineID BETWEEN 19930 AND 20437 AND DepartureDelayGroups < -1 OR \"Month\" NOT IN (1) ORDER BY Quarter, LateAircraftDelay, OriginCityName LIMIT 10","hsqls":["SELECT DestWac, DestStateName FROM mytable WHERE AirlineID BETWEEN 19930 AND 20437 AND DepartureDelayGroups < -1 OR Month NOT IN (1) ORDER BY Quarter, LateAircraftDelay, OriginCityName LIMIT 10"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE Origin BETWEEN 'MDW' AND 'BTM' OR FlightNum BETWEEN 5013 AND 5419 OR DivTotalGTimes IN (77, 30, 43) ORDER BY WeatherDelay, DivArrDelay LIMIT 8","hsqls":["SELECT CarrierDelay FROM mytable WHERE Origin BETWEEN 'MDW' AND 'BTM' OR FlightNum BETWEEN 5013 AND 5419 OR (DivTotalGTimes[1] IN (77, 30, 43) OR DivTotalGTimes[2] IN (77, 30, 43) OR DivTotalGTimes[3] IN (77, 30, 43) OR DivTotalGTimes[4] IN (77, 30, 43) OR DivTotalGTimes[5] IN (77, 30, 43)) ORDER BY WeatherDelay, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestWac, DestStateName FROM mytable WHERE AirlineID BETWEEN 19930 AND 20437 AND DepartureDelayGroups < -1 OR \"Month\" NOT IN (1) ORDER BY Quarter, LateAircraftDelay, OriginCityName LIMIT 10","hsqls":["SELECT DestWac, DestStateName FROM mytable WHERE AirlineID BETWEEN 19930 AND 20437 AND DepartureDelayGroups < -1 OR `Month` NOT IN (1) ORDER BY Quarter, LateAircraftDelay, OriginCityName LIMIT 10"]}
 {"sql":"SELECT FlightNum FROM mytable WHERE AirlineID BETWEEN 20409 AND 19690 OR DepDelay BETWEEN 62.0 AND 287.0 OR DistanceGroup <> 6 ORDER BY WeatherDelay, SecurityDelay, NASDelay LIMIT 3"}
-{"sql":"SELECT OriginCityMarketID, DivWheelsOffs, ArrDelay FROM mytable WHERE DestAirportSeqID BETWEEN 1107602 AND 1349503 ORDER BY \"Year\", OriginStateFips, TailNum LIMIT 10","hsqls":["SELECT OriginCityMarketID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, ArrDelay FROM mytable WHERE DestAirportSeqID BETWEEN 1107602 AND 1349503 ORDER BY Year, OriginStateFips, TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivWheelsOffs, ArrDelay FROM mytable WHERE DestAirportSeqID BETWEEN 1107602 AND 1349503 ORDER BY \"Year\", OriginStateFips, TailNum LIMIT 10","hsqls":["SELECT OriginCityMarketID, DivWheelsOffs, ArrDelay FROM mytable WHERE DestAirportSeqID BETWEEN 1107602 AND 1349503 ORDER BY Year, OriginStateFips, TailNum LIMIT 10000"]}
 {"sql":"SELECT OriginState, TailNum, DivActualElapsedTime FROM mytable WHERE NASDelay NOT IN (59, 27) LIMIT 6"}
 {"sql":"SELECT NASDelay, CRSDepTime FROM mytable"}
-{"sql":"SELECT TotalAddGTime, DivTotalGTimes FROM mytable WHERE AirlineID = 20304 AND ActualElapsedTime BETWEEN 266 AND 300 ORDER BY FlightNum LIMIT 18","hsqls":["SELECT TotalAddGTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE AirlineID = 20304 AND ActualElapsedTime BETWEEN 266 AND 300 ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DivTotalGTimes FROM mytable WHERE AirlineID = 20304 AND ActualElapsedTime BETWEEN 266 AND 300 ORDER BY FlightNum LIMIT 18","hsqls":["SELECT TotalAddGTime, DivTotalGTimes FROM mytable WHERE AirlineID = 20304 AND ActualElapsedTime BETWEEN 266 AND 300 ORDER BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, MIN(DepDelay) FROM mytable WHERE Distance <> 1391 AND DepDelay NOT IN (121.0, 161.0) OR NASDelay <> 185 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 23","hsqls":["SELECT ArrDelayMinutes, MIN(DepDelay) FROM mytable WHERE Distance <> 1391 AND DepDelay NOT IN (121.0, 161.0) OR NASDelay <> 185 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 23"]}
-{"sql":"SELECT FlightDate, AirTime, OriginAirportID, SUM(TaxiIn) FROM mytable WHERE Flights NOT IN (1) AND FlightDate = '2014-01-30' OR DivWheelsOns > 1252 GROUP BY FlightDate, AirTime, OriginAirportID LIMIT 27","hsqls":["SELECT FlightDate, AirTime, OriginAirportID, SUM(TaxiIn) FROM mytable WHERE Flights NOT IN (1) AND FlightDate = '2014-01-30' OR (DivWheelsOns__MV0 > 1252 OR DivWheelsOns__MV1 > 1252 OR DivWheelsOns__MV2 > 1252 OR DivWheelsOns__MV3 > 1252 OR DivWheelsOns__MV4 > 1252) GROUP BY FlightDate, AirTime, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, \"Month\", MIN(LongestAddGTime), MIN(FirstDepTime) FROM mytable WHERE LateAircraftDelay <= 160 AND CarrierDelay BETWEEN 132 AND 70 GROUP BY TaxiOut, \"Month\" LIMIT 17","hsqls":["SELECT TaxiOut, Month, MIN(LongestAddGTime), MIN(FirstDepTime) FROM mytable WHERE LateAircraftDelay <= 160 AND CarrierDelay BETWEEN 132 AND 70 GROUP BY TaxiOut, Month LIMIT 17"]}
+{"sql":"SELECT FlightDate, AirTime, OriginAirportID, SUM(TaxiIn) FROM mytable WHERE Flights NOT IN (1) AND FlightDate = '2014-01-30' OR DivWheelsOns > 1252 GROUP BY FlightDate, AirTime, OriginAirportID LIMIT 27","hsqls":["SELECT FlightDate, AirTime, OriginAirportID, SUM(TaxiIn) FROM mytable WHERE Flights NOT IN (1) AND FlightDate = '2014-01-30' OR (DivWheelsOns[1] > 1252 OR DivWheelsOns[2] > 1252 OR DivWheelsOns[3] > 1252 OR DivWheelsOns[4] > 1252 OR DivWheelsOns[5] > 1252) GROUP BY FlightDate, AirTime, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, \"Month\", MIN(LongestAddGTime), MIN(FirstDepTime) FROM mytable WHERE LateAircraftDelay <= 160 AND CarrierDelay BETWEEN 132 AND 70 GROUP BY TaxiOut, \"Month\" LIMIT 17","hsqls":["SELECT TaxiOut, Month, MIN(LongestAddGTime), MIN(FirstDepTime) FROM mytable WHERE LateAircraftDelay <= 160 AND CarrierDelay BETWEEN 132 AND 70 GROUP BY TaxiOut, `Month` LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, LongestAddGTime, FlightDate, SUM(OriginWac), SUM(AirlineID) FROM mytable GROUP BY OriginAirportSeqID, LongestAddGTime, FlightDate  ORDER BY OriginAirportSeqID, LongestAddGTime, FlightDate LIMIT 24","hsqls":["SELECT OriginAirportSeqID, LongestAddGTime, FlightDate, SUM(OriginWac), SUM(AirlineID) FROM mytable GROUP BY OriginAirportSeqID, LongestAddGTime, FlightDate  ORDER BY OriginAirportSeqID, LongestAddGTime, FlightDate LIMIT 24"]}
 {"sql":"SELECT OriginStateFips, SUM(ArrDelay) FROM mytable WHERE OriginCityName >= 'Muskegon, MI' OR CRSDepTime BETWEEN 1558 AND 1336 OR SecurityDelay IN (1, 14) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 6","hsqls":["SELECT OriginStateFips, SUM(ArrDelay) FROM mytable WHERE OriginCityName >= 'Muskegon, MI' OR CRSDepTime BETWEEN 1558 AND 1336 OR SecurityDelay IN (1, 14) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 6"]}
-{"sql":"SELECT DepTime FROM mytable WHERE FlightDate BETWEEN '2014-01-27' AND '2014-01-13' OR \"Month\" BETWEEN 1 AND 1 OR ActualElapsedTime IN (444, 255) ORDER BY ArrivalDelayGroups LIMIT 3","hsqls":["SELECT DepTime FROM mytable WHERE FlightDate BETWEEN '2014-01-27' AND '2014-01-13' OR Month BETWEEN 1 AND 1 OR ActualElapsedTime IN (444, 255) ORDER BY ArrivalDelayGroups LIMIT 3"]}
+{"sql":"SELECT DepTime FROM mytable WHERE FlightDate BETWEEN '2014-01-27' AND '2014-01-13' OR \"Month\" BETWEEN 1 AND 1 OR ActualElapsedTime IN (444, 255) ORDER BY ArrivalDelayGroups LIMIT 3","hsqls":["SELECT DepTime FROM mytable WHERE FlightDate BETWEEN '2014-01-27' AND '2014-01-13' OR `Month` BETWEEN 1 AND 1 OR ActualElapsedTime IN (444, 255) ORDER BY ArrivalDelayGroups LIMIT 3"]}
 {"sql":"SELECT TailNum, Dest, NASDelay, SUM(DepDelayMinutes) FROM mytable GROUP BY TailNum, Dest, NASDelay  ORDER BY TailNum, Dest, NASDelay LIMIT 15","hsqls":["SELECT TailNum, Dest, NASDelay, SUM(DepDelayMinutes) FROM mytable GROUP BY TailNum, Dest, NASDelay  ORDER BY TailNum, Dest, NASDelay LIMIT 15"]}
 {"sql":"SELECT TaxiOut, DivDistance FROM mytable WHERE DestWac BETWEEN 42 AND 85 AND DivAirportLandings <> 0 AND DivActualElapsedTime <> 289 ORDER BY DepDel15, \"Month\", DivActualElapsedTime LIMIT 15","hsqls":["SELECT TaxiOut, DivDistance FROM mytable WHERE DestWac BETWEEN 42 AND 85 AND DivAirportLandings <> 0 AND DivActualElapsedTime <> 289 ORDER BY DepDel15, Month, DivActualElapsedTime LIMIT 15"]}
-{"sql":"SELECT ActualElapsedTime, COUNT(Diverted), COUNT(WheelsOff), AVG(OriginAirportID) FROM mytable WHERE DivActualElapsedTime IN (180, 198) OR OriginCityName BETWEEN 'Huntsville, AL' AND 'Kalispell, MT' OR DivWheelsOffs < 2006 GROUP BY ActualElapsedTime LIMIT 16","hsqls":["SELECT ActualElapsedTime, COUNT(Diverted), COUNT(WheelsOff), AVG(OriginAirportID) FROM mytable WHERE DivActualElapsedTime IN (180, 198) OR OriginCityName BETWEEN 'Huntsville, AL' AND 'Kalispell, MT' OR (DivWheelsOffs__MV0 < 2006 OR DivWheelsOffs__MV1 < 2006 OR DivWheelsOffs__MV2 < 2006 OR DivWheelsOffs__MV3 < 2006 OR DivWheelsOffs__MV4 < 2006) GROUP BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, COUNT(Diverted), COUNT(WheelsOff), AVG(OriginAirportID) FROM mytable WHERE DivActualElapsedTime IN (180, 198) OR OriginCityName BETWEEN 'Huntsville, AL' AND 'Kalispell, MT' OR DivWheelsOffs < 2006 GROUP BY ActualElapsedTime LIMIT 16","hsqls":["SELECT ActualElapsedTime, COUNT(Diverted), COUNT(WheelsOff), AVG(OriginAirportID) FROM mytable WHERE DivActualElapsedTime IN (180, 198) OR OriginCityName BETWEEN 'Huntsville, AL' AND 'Kalispell, MT' OR (DivWheelsOffs[1] < 2006 OR DivWheelsOffs[2] < 2006 OR DivWheelsOffs[3] < 2006 OR DivWheelsOffs[4] < 2006 OR DivWheelsOffs[5] < 2006) GROUP BY ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Diverted, CarrierDelay, DestCityName, MIN(Diverted) FROM mytable GROUP BY Diverted, CarrierDelay, DestCityName  ORDER BY Diverted, CarrierDelay, DestCityName LIMIT 15","hsqls":["SELECT Diverted, CarrierDelay, DestCityName, MIN(Diverted) FROM mytable GROUP BY Diverted, CarrierDelay, DestCityName  ORDER BY Diverted, CarrierDelay, DestCityName LIMIT 15"]}
-{"sql":"SELECT TotalAddGTime, AirlineID, DaysSinceEpoch FROM mytable WHERE DivWheelsOffs < 1231 OR ArrDelayMinutes BETWEEN 22.0 AND 164.0 AND DivAirportIDs IN (13476, 15376, 13029, 14831) ORDER BY TailNum LIMIT 13","hsqls":["SELECT TotalAddGTime, AirlineID, DaysSinceEpoch FROM mytable WHERE (DivWheelsOffs__MV0 < 1231 OR DivWheelsOffs__MV1 < 1231 OR DivWheelsOffs__MV2 < 1231 OR DivWheelsOffs__MV3 < 1231 OR DivWheelsOffs__MV4 < 1231) OR ArrDelayMinutes BETWEEN 22.0 AND 164.0 AND (DivAirportIDs__MV0 IN (13476, 15376, 13029, 14831) OR DivAirportIDs__MV1 IN (13476, 15376, 13029, 14831) OR DivAirportIDs__MV2 IN (13476, 15376, 13029, 14831) OR DivAirportIDs__MV3 IN (13476, 15376, 13029, 14831) OR DivAirportIDs__MV4 IN (13476, 15376, 13029, 14831)) ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, AirlineID, DaysSinceEpoch FROM mytable WHERE DivWheelsOffs < 1231 OR ArrDelayMinutes BETWEEN 22.0 AND 164.0 AND DivAirportIDs IN (13476, 15376, 13029, 14831) ORDER BY TailNum LIMIT 13","hsqls":["SELECT TotalAddGTime, AirlineID, DaysSinceEpoch FROM mytable WHERE (DivWheelsOffs[1] < 1231 OR DivWheelsOffs[2] < 1231 OR DivWheelsOffs[3] < 1231 OR DivWheelsOffs[4] < 1231 OR DivWheelsOffs[5] < 1231) OR ArrDelayMinutes BETWEEN 22.0 AND 164.0 AND (DivAirportIDs[1] IN (13476, 15376, 13029, 14831) OR DivAirportIDs[2] IN (13476, 15376, 13029, 14831) OR DivAirportIDs[3] IN (13476, 15376, 13029, 14831) OR DivAirportIDs[4] IN (13476, 15376, 13029, 14831) OR DivAirportIDs[5] IN (13476, 15376, 13029, 14831)) ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, AirlineID, AVG(DivDistance), MIN(LongestAddGTime), SUM(OriginStateFips) FROM mytable GROUP BY DestAirportSeqID, AirlineID  ORDER BY DestAirportSeqID, AirlineID LIMIT 14","hsqls":["SELECT DestAirportSeqID, AirlineID, AVG(DivDistance), MIN(LongestAddGTime), SUM(OriginStateFips) FROM mytable GROUP BY DestAirportSeqID, AirlineID  ORDER BY DestAirportSeqID, AirlineID LIMIT 14"]}
 {"sql":"SELECT CRSElapsedTime, MAX(SecurityDelay), AVG(Diverted), COUNT(UniqueCarrier) FROM mytable WHERE DivArrDelay NOT IN (128, 199, 232, 626, 81) AND CancellationCode BETWEEN 'A' AND 'C' GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 1","hsqls":["SELECT CRSElapsedTime, MAX(SecurityDelay), AVG(Diverted), COUNT(UniqueCarrier) FROM mytable WHERE DivArrDelay NOT IN (128, 199, 232, 626, 81) AND CancellationCode BETWEEN 'A' AND 'C' GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 1"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDelayMinutes NOT IN (155.0, 136.0, 397.0) AND Dest NOT IN ('OGG', 'ABR', 'PHX', 'CLT', 'YUM') LIMIT 16"}
-{"sql":"SELECT COUNT(OriginCityMarketID) FROM mytable WHERE DivWheelsOns <= 324 AND LongestAddGTime >= 30 AND \"Year\" NOT IN (2014) LIMIT 4","hsqls":["SELECT COUNT(OriginCityMarketID) FROM mytable WHERE (DivWheelsOns__MV0 <= 324 OR DivWheelsOns__MV1 <= 324 OR DivWheelsOns__MV2 <= 324 OR DivWheelsOns__MV3 <= 324 OR DivWheelsOns__MV4 <= 324) AND LongestAddGTime >= 30 AND Year NOT IN (2014) LIMIT 10000"]}
+{"sql":"SELECT COUNT(OriginCityMarketID) FROM mytable WHERE DivWheelsOns <= 324 AND LongestAddGTime >= 30 AND \"Year\" NOT IN (2014) LIMIT 4","hsqls":["SELECT COUNT(OriginCityMarketID) FROM mytable WHERE (DivWheelsOns[1] <= 324 OR DivWheelsOns[2] <= 324 OR DivWheelsOns[3] <= 324 OR DivWheelsOns[4] <= 324 OR DivWheelsOns[5] <= 324) AND LongestAddGTime >= 30 AND `Year` NOT IN (2014) LIMIT 10000"]}
 {"sql":"SELECT DivActualElapsedTime, AVG(AirTime) FROM mytable WHERE DivReachedDest <> 0 AND CancellationCode <> 'B' AND OriginCityMarketID <> 30647 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 14","hsqls":["SELECT DivActualElapsedTime, AVG(AirTime) FROM mytable WHERE DivReachedDest <> 0 AND CancellationCode <> 'B' AND OriginCityMarketID <> 30647 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 14"]}
 {"sql":"SELECT OriginCityName, AirTime, OriginWac FROM mytable WHERE DepTime IN (2050) ORDER BY \"Year\", DivDistance, DestStateFips LIMIT 29","hsqls":["SELECT OriginCityName, AirTime, OriginWac FROM mytable WHERE DepTime IN (2050) ORDER BY Year, DivDistance, DestStateFips LIMIT 29"]}
 {"sql":"SELECT CRSArrTime, ArrivalDelayGroups, AVG(DestCityMarketID), MIN(Quarter), AVG(DistanceGroup) FROM mytable GROUP BY CRSArrTime, ArrivalDelayGroups  ORDER BY CRSArrTime, ArrivalDelayGroups LIMIT 10","hsqls":["SELECT CRSArrTime, ArrivalDelayGroups, AVG(DestCityMarketID), MIN(Quarter), AVG(DistanceGroup) FROM mytable GROUP BY CRSArrTime, ArrivalDelayGroups  ORDER BY CRSArrTime, ArrivalDelayGroups LIMIT 10"]}
@@ -4482,31 +4482,31 @@
 {"sql":"SELECT Carrier FROM mytable WHERE DestCityMarketID NOT IN (31471, 35096, 31057) OR Origin = 'DCA' LIMIT 17"}
 {"sql":"SELECT Cancelled, TailNum FROM mytable ORDER BY Carrier, ArrTimeBlk, ArrDel15 LIMIT 19"}
 {"sql":"SELECT DistanceGroup, OriginAirportID, OriginStateName, MAX(DestAirportID), AVG(DayOfWeek), SUM(OriginWac) FROM mytable WHERE Origin BETWEEN 'TOL' AND 'PSC' OR SecurityDelay IN (-9999) AND TotalAddGTime BETWEEN 58 AND 11 GROUP BY DistanceGroup, OriginAirportID, OriginStateName  ORDER BY DistanceGroup, OriginAirportID, OriginStateName LIMIT 12","hsqls":["SELECT DistanceGroup, OriginAirportID, OriginStateName, MAX(DestAirportID), AVG(DayOfWeek), SUM(OriginWac) FROM mytable WHERE Origin BETWEEN 'TOL' AND 'PSC' OR SecurityDelay IN (-9999) AND TotalAddGTime BETWEEN 58 AND 11 GROUP BY DistanceGroup, OriginAirportID, OriginStateName  ORDER BY DistanceGroup, OriginAirportID, OriginStateName LIMIT 12"]}
-{"sql":"SELECT ArrTime, OriginAirportID FROM mytable WHERE DivWheelsOns IN (2025, 2322, 1923) AND DivArrDelay BETWEEN 383 AND 202 ORDER BY OriginState, DestWac, OriginStateName LIMIT 19","hsqls":["SELECT ArrTime, OriginAirportID FROM mytable WHERE (DivWheelsOns__MV0 IN (2025, 2322, 1923) OR DivWheelsOns__MV1 IN (2025, 2322, 1923) OR DivWheelsOns__MV2 IN (2025, 2322, 1923) OR DivWheelsOns__MV3 IN (2025, 2322, 1923) OR DivWheelsOns__MV4 IN (2025, 2322, 1923)) AND DivArrDelay BETWEEN 383 AND 202 ORDER BY OriginState, DestWac, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrTime, OriginAirportID FROM mytable WHERE DivWheelsOns IN (2025, 2322, 1923) AND DivArrDelay BETWEEN 383 AND 202 ORDER BY OriginState, DestWac, OriginStateName LIMIT 19","hsqls":["SELECT ArrTime, OriginAirportID FROM mytable WHERE (DivWheelsOns[1] IN (2025, 2322, 1923) OR DivWheelsOns[2] IN (2025, 2322, 1923) OR DivWheelsOns[3] IN (2025, 2322, 1923) OR DivWheelsOns[4] IN (2025, 2322, 1923) OR DivWheelsOns[5] IN (2025, 2322, 1923)) AND DivArrDelay BETWEEN 383 AND 202 ORDER BY OriginState, DestWac, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestAirportID IN (14574, 11041) AND DepDelay IN (18.0, 145.0, 233.0, 29.0, 139.0) AND DepTimeBlk = '2000-2059' LIMIT 23"}
 {"sql":"SELECT Flights, DestAirportSeqID, ActualElapsedTime, AVG(CRSElapsedTime), MAX(NASDelay), SUM(DestAirportSeqID) FROM mytable WHERE DestCityMarketID BETWEEN 34696 AND 30977 OR ArrTimeBlk NOT IN ('1100-1159', '1300-1359', '1200-1259', '0001-0559') OR OriginAirportSeqID IN (1342202) GROUP BY Flights, DestAirportSeqID, ActualElapsedTime  ORDER BY Flights, DestAirportSeqID, ActualElapsedTime LIMIT 14","hsqls":["SELECT Flights, DestAirportSeqID, ActualElapsedTime, AVG(CRSElapsedTime), MAX(NASDelay), SUM(DestAirportSeqID) FROM mytable WHERE DestCityMarketID BETWEEN 34696 AND 30977 OR ArrTimeBlk NOT IN ('1100-1159', '1300-1359', '1200-1259', '0001-0559') OR OriginAirportSeqID IN (1342202) GROUP BY Flights, DestAirportSeqID, ActualElapsedTime  ORDER BY Flights, DestAirportSeqID, ActualElapsedTime LIMIT 14"]}
-{"sql":"SELECT LongestAddGTime, \"Month\" FROM mytable ORDER BY DepartureDelayGroups, ArrTimeBlk LIMIT 5","hsqls":["SELECT LongestAddGTime, Month FROM mytable ORDER BY DepartureDelayGroups, ArrTimeBlk LIMIT 5"]}
+{"sql":"SELECT LongestAddGTime, \"Month\" FROM mytable ORDER BY DepartureDelayGroups, ArrTimeBlk LIMIT 5","hsqls":["SELECT LongestAddGTime, `Month` FROM mytable ORDER BY DepartureDelayGroups, ArrTimeBlk LIMIT 5"]}
 {"sql":"SELECT OriginStateFips, UniqueCarrier, CRSDepTime, SUM(DepDelay), SUM(DestAirportID) FROM mytable WHERE AirTime >= 461 GROUP BY OriginStateFips, UniqueCarrier, CRSDepTime  ORDER BY OriginStateFips, UniqueCarrier, CRSDepTime LIMIT 26","hsqls":["SELECT OriginStateFips, UniqueCarrier, CRSDepTime, SUM(DepDelay), SUM(DestAirportID) FROM mytable WHERE AirTime >= 461 GROUP BY OriginStateFips, UniqueCarrier, CRSDepTime  ORDER BY OriginStateFips, UniqueCarrier, CRSDepTime LIMIT 26"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 19"}
-{"sql":"SELECT DestState, DepDelayMinutes FROM mytable WHERE Flights BETWEEN 1 AND 1 OR DivAirportIDs >= 13433 AND TailNum = 'N5DVAA' ORDER BY FirstDepTime, DestStateFips, DestStateName LIMIT 18","hsqls":["SELECT DestState, DepDelayMinutes FROM mytable WHERE Flights BETWEEN 1 AND 1 OR (DivAirportIDs__MV0 >= 13433 OR DivAirportIDs__MV1 >= 13433 OR DivAirportIDs__MV2 >= 13433 OR DivAirportIDs__MV3 >= 13433 OR DivAirportIDs__MV4 >= 13433) AND TailNum = 'N5DVAA' ORDER BY FirstDepTime, DestStateFips, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestState, DepDelayMinutes FROM mytable WHERE Flights BETWEEN 1 AND 1 OR DivAirportIDs >= 13433 AND TailNum = 'N5DVAA' ORDER BY FirstDepTime, DestStateFips, DestStateName LIMIT 18","hsqls":["SELECT DestState, DepDelayMinutes FROM mytable WHERE Flights BETWEEN 1 AND 1 OR (DivAirportIDs[1] >= 13433 OR DivAirportIDs[2] >= 13433 OR DivAirportIDs[3] >= 13433 OR DivAirportIDs[4] >= 13433 OR DivAirportIDs[5] >= 13433) AND TailNum = 'N5DVAA' ORDER BY FirstDepTime, DestStateFips, DestStateName LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, COUNT(DivArrDelay), MAX(ArrTime) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 4","hsqls":["SELECT LateAircraftDelay, COUNT(DivArrDelay), MAX(ArrTime) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 4"]}
-{"sql":"SELECT DepartureDelayGroups, AVG(\"Year\"), MIN(Flights), AVG(CRSElapsedTime) FROM mytable GROUP BY DepartureDelayGroups LIMIT 5","hsqls":["SELECT DepartureDelayGroups, AVG(Year), MIN(Flights), AVG(CRSElapsedTime) FROM mytable GROUP BY DepartureDelayGroups LIMIT 5"]}
-{"sql":"SELECT DivDistance, CRSArrTime FROM mytable WHERE OriginState < 'MA' OR \"Month\" <= 1 AND DivReachedDest BETWEEN 0 AND -9999 ORDER BY DestState LIMIT 10","hsqls":["SELECT DivDistance, CRSArrTime FROM mytable WHERE OriginState < 'MA' OR Month <= 1 AND DivReachedDest BETWEEN 0 AND -9999 ORDER BY DestState LIMIT 10"]}
+{"sql":"SELECT DepartureDelayGroups, AVG(\"Year\"), MIN(Flights), AVG(CRSElapsedTime) FROM mytable GROUP BY DepartureDelayGroups LIMIT 5","hsqls":["SELECT DepartureDelayGroups, AVG(`Year`), MIN(Flights), AVG(CRSElapsedTime) FROM mytable GROUP BY DepartureDelayGroups LIMIT 5"]}
+{"sql":"SELECT DivDistance, CRSArrTime FROM mytable WHERE OriginState < 'MA' OR \"Month\" <= 1 AND DivReachedDest BETWEEN 0 AND -9999 ORDER BY DestState LIMIT 10","hsqls":["SELECT DivDistance, CRSArrTime FROM mytable WHERE OriginState < 'MA' OR `Month` <= 1 AND DivReachedDest BETWEEN 0 AND -9999 ORDER BY DestState LIMIT 10"]}
 {"sql":"SELECT Distance, OriginWac, COUNT(*) FROM mytable GROUP BY Distance, OriginWac  ORDER BY Distance, OriginWac LIMIT 10","hsqls":["SELECT Distance, OriginWac, COUNT(*) FROM mytable GROUP BY Distance, OriginWac  ORDER BY Distance, OriginWac LIMIT 10"]}
-{"sql":"SELECT DivAirports, DepTimeBlk, DivWheelsOffs FROM mytable ORDER BY Cancelled, CRSDepTime LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepTimeBlk, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY Cancelled, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DepTimeBlk, DivWheelsOffs FROM mytable ORDER BY Cancelled, CRSDepTime LIMIT 24","hsqls":["SELECT DivAirports, DepTimeBlk, DivWheelsOffs FROM mytable ORDER BY Cancelled, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DepDel15, DestCityName FROM mytable WHERE DivDistance NOT IN (137, 584, 36, 528) AND DepTime <= 647 LIMIT 24"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DestStateName < 'Puerto Rico' LIMIT 27","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DestStateName < 'Puerto Rico' LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DestStateName < 'Puerto Rico' LIMIT 27","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DestStateName < 'Puerto Rico' LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DestAirportID FROM mytable ORDER BY DepDelayMinutes, DaysSinceEpoch LIMIT 19"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) OR DestCityName NOT IN ('Nashville, TN', 'Houston, TX', 'Syracuse, NY') LIMIT 21"}
 {"sql":"SELECT DestStateFips FROM mytable WHERE TaxiOut BETWEEN 44 AND 64 LIMIT 10"}
-{"sql":"SELECT LateAircraftDelay, ArrDelayMinutes, DivTotalGTimes FROM mytable WHERE DepTime NOT IN (1510, 1145, 550) OR DayofMonth NOT IN (4, 9, 24, 27, 11) OR OriginWac IN (21, 2, 43, 45, 36) ORDER BY DestStateFips, AirTime, DayOfWeek LIMIT 27","hsqls":["SELECT LateAircraftDelay, ArrDelayMinutes, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DepTime NOT IN (1510, 1145, 550) OR DayofMonth NOT IN (4, 9, 24, 27, 11) OR OriginWac IN (21, 2, 43, 45, 36) ORDER BY DestStateFips, AirTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, ArrDelayMinutes, DivTotalGTimes FROM mytable WHERE DepTime NOT IN (1510, 1145, 550) OR DayofMonth NOT IN (4, 9, 24, 27, 11) OR OriginWac IN (21, 2, 43, 45, 36) ORDER BY DestStateFips, AirTime, DayOfWeek LIMIT 27","hsqls":["SELECT LateAircraftDelay, ArrDelayMinutes, DivTotalGTimes FROM mytable WHERE DepTime NOT IN (1510, 1145, 550) OR DayofMonth NOT IN (4, 9, 24, 27, 11) OR OriginWac IN (21, 2, 43, 45, 36) ORDER BY DestStateFips, AirTime, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT \"Year\", Quarter FROM mytable WHERE DestCityMarketID NOT IN (34960, 33316, 33127, 31973, 32982) LIMIT 19","hsqls":["SELECT Year, Quarter FROM mytable WHERE DestCityMarketID NOT IN (34960, 33316, 33127, 31973, 32982) LIMIT 19"]}
 {"sql":"SELECT ArrTimeBlk, DestAirportID FROM mytable WHERE Origin BETWEEN 'LAW' AND 'SGU' AND FlightNum NOT IN (2090, 1949, 4354, 82) ORDER BY Dest LIMIT 24"}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE Origin BETWEEN 'SBN' AND 'RDD' AND Dest BETWEEN 'LAN' AND 'MHK' ORDER BY DepDelay, DestStateFips, Origin LIMIT 27"}
-{"sql":"SELECT \"Year\", SUM(NASDelay), AVG(CRSElapsedTime) FROM mytable WHERE Cancelled = 0 AND OriginAirportID IN (11503, 11884, 12891, 12206) AND Cancelled BETWEEN 0 AND 0 GROUP BY \"Year\" LIMIT 12","hsqls":["SELECT Year, SUM(NASDelay), AVG(CRSElapsedTime) FROM mytable WHERE Cancelled = 0 AND OriginAirportID IN (11503, 11884, 12891, 12206) AND Cancelled BETWEEN 0 AND 0 GROUP BY Year LIMIT 12"]}
+{"sql":"SELECT \"Year\", SUM(NASDelay), AVG(CRSElapsedTime) FROM mytable WHERE Cancelled = 0 AND OriginAirportID IN (11503, 11884, 12891, 12206) AND Cancelled BETWEEN 0 AND 0 GROUP BY \"Year\" LIMIT 12","hsqls":["SELECT Year, SUM(NASDelay), AVG(CRSElapsedTime) FROM mytable WHERE Cancelled = 0 AND OriginAirportID IN (11503, 11884, 12891, 12206) AND Cancelled BETWEEN 0 AND 0 GROUP BY `Year` LIMIT 12"]}
 {"sql":"SELECT WheelsOff, DestCityName FROM mytable ORDER BY DestStateFips LIMIT 16"}
-{"sql":"SELECT ActualElapsedTime FROM mytable WHERE DivLongestGTimes = 35.0 AND DestState NOT IN ('LA', 'DE', 'VT', 'NV', 'SC') OR OriginAirportID BETWEEN 11996 AND 13277 ORDER BY DepTimeBlk LIMIT 1","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE (DivLongestGTimes__MV0 = 35.0 OR DivLongestGTimes__MV1 = 35.0 OR DivLongestGTimes__MV2 = 35.0 OR DivLongestGTimes__MV3 = 35.0 OR DivLongestGTimes__MV4 = 35.0) AND DestState NOT IN ('LA', 'DE', 'VT', 'NV', 'SC') OR OriginAirportID BETWEEN 11996 AND 13277 ORDER BY DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DestAirportID BETWEEN 12892 AND 10333 ORDER BY OriginCityName, ArrTimeBlk LIMIT 18","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE DestAirportID BETWEEN 12892 AND 10333 ORDER BY OriginCityName, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime FROM mytable WHERE DivLongestGTimes = 35.0 AND DestState NOT IN ('LA', 'DE', 'VT', 'NV', 'SC') OR OriginAirportID BETWEEN 11996 AND 13277 ORDER BY DepTimeBlk LIMIT 1","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE (DivLongestGTimes[1] = 35.0 OR DivLongestGTimes[2] = 35.0 OR DivLongestGTimes[3] = 35.0 OR DivLongestGTimes[4] = 35.0 OR DivLongestGTimes[5] = 35.0) AND DestState NOT IN ('LA', 'DE', 'VT', 'NV', 'SC') OR OriginAirportID BETWEEN 11996 AND 13277 ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DestAirportID BETWEEN 12892 AND 10333 ORDER BY OriginCityName, ArrTimeBlk LIMIT 18","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE DestAirportID BETWEEN 12892 AND 10333 ORDER BY OriginCityName, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DepDel15, OriginAirportID, COUNT(*) FROM mytable GROUP BY DepDel15, OriginAirportID  ORDER BY DepDel15, OriginAirportID LIMIT 2","hsqls":["SELECT DepDel15, OriginAirportID, COUNT(*) FROM mytable GROUP BY DepDel15, OriginAirportID  ORDER BY DepDel15, OriginAirportID LIMIT 2"]}
 {"sql":"SELECT OriginStateFips, Flights, FlightDate FROM mytable LIMIT 10"}
 {"sql":"SELECT DepartureDelayGroups, DivArrDelay, MIN(DepartureDelayGroups), MIN(DestCityMarketID), COUNT(AirTime) FROM mytable WHERE OriginState BETWEEN 'FL' AND 'CT' AND DepDelayMinutes BETWEEN 234.0 AND 205.0 GROUP BY DepartureDelayGroups, DivArrDelay  ORDER BY DepartureDelayGroups, DivArrDelay LIMIT 27","hsqls":["SELECT DepartureDelayGroups, DivArrDelay, MIN(DepartureDelayGroups), MIN(DestCityMarketID), COUNT(AirTime) FROM mytable WHERE OriginState BETWEEN 'FL' AND 'CT' AND DepDelayMinutes BETWEEN 234.0 AND 205.0 GROUP BY DepartureDelayGroups, DivArrDelay  ORDER BY DepartureDelayGroups, DivArrDelay LIMIT 27"]}
@@ -4517,100 +4517,100 @@
 {"sql":"SELECT LongestAddGTime FROM mytable ORDER BY ArrDelayMinutes, NASDelay LIMIT 7"}
 {"sql":"SELECT DestState, Dest, DestAirportID, MIN(OriginStateFips), COUNT(DivDistance) FROM mytable GROUP BY DestState, Dest, DestAirportID  ORDER BY DestState, Dest, DestAirportID LIMIT 22","hsqls":["SELECT DestState, Dest, DestAirportID, MIN(OriginStateFips), COUNT(DivDistance) FROM mytable GROUP BY DestState, Dest, DestAirportID  ORDER BY DestState, Dest, DestAirportID LIMIT 22"]}
 {"sql":"SELECT TaxiIn, AirTime, MIN(DepTime) FROM mytable WHERE Distance BETWEEN 589 AND 546 GROUP BY TaxiIn, AirTime  ORDER BY TaxiIn, AirTime LIMIT 3","hsqls":["SELECT TaxiIn, AirTime, MIN(DepTime) FROM mytable WHERE Distance BETWEEN 589 AND 546 GROUP BY TaxiIn, AirTime  ORDER BY TaxiIn, AirTime LIMIT 3"]}
-{"sql":"SELECT OriginAirportSeqID, DivDistance, DivTotalGTimes FROM mytable ORDER BY DayOfWeek LIMIT 18","hsqls":["SELECT OriginAirportSeqID, DivDistance, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT MAX(DestStateFips), AVG(DepDel15) FROM mytable WHERE DivWheelsOffs BETWEEN 927 AND 1113 AND ArrDelayMinutes = 274.0 AND ActualElapsedTime BETWEEN 150 AND 299 LIMIT 12","hsqls":["SELECT MAX(DestStateFips), AVG(DepDel15)  FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 927 AND 1113 OR DivWheelsOffs__MV1 BETWEEN 927 AND 1113 OR DivWheelsOffs__MV2 BETWEEN 927 AND 1113 OR DivWheelsOffs__MV3 BETWEEN 927 AND 1113 OR DivWheelsOffs__MV4 BETWEEN 927 AND 1113) AND ArrDelayMinutes = 274.0 AND ActualElapsedTime BETWEEN 150 AND 299 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivDistance, DivTotalGTimes FROM mytable ORDER BY DayOfWeek LIMIT 18","hsqls":["SELECT OriginAirportSeqID, DivDistance, DivTotalGTimes FROM mytable ORDER BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT MAX(DestStateFips), AVG(DepDel15) FROM mytable WHERE DivWheelsOffs BETWEEN 927 AND 1113 AND ArrDelayMinutes = 274.0 AND ActualElapsedTime BETWEEN 150 AND 299 LIMIT 12","hsqls":["SELECT MAX(DestStateFips), AVG(DepDel15)  FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 927 AND 1113 OR DivWheelsOffs[2] BETWEEN 927 AND 1113 OR DivWheelsOffs[3] BETWEEN 927 AND 1113 OR DivWheelsOffs[4] BETWEEN 927 AND 1113 OR DivWheelsOffs[5] BETWEEN 927 AND 1113) AND ArrDelayMinutes = 274.0 AND ActualElapsedTime BETWEEN 150 AND 299 LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime, \"Month\", WheelsOn FROM mytable ORDER BY DaysSinceEpoch LIMIT 6","hsqls":["SELECT CRSDepTime, Month, WheelsOn FROM mytable ORDER BY DaysSinceEpoch LIMIT 6"]}
 {"sql":"SELECT OriginStateFips, TaxiIn FROM mytable WHERE TaxiOut NOT IN (59, 6, 88) ORDER BY WeatherDelay LIMIT 17"}
-{"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 10140 AND 14520 OR DivAirportSeqIDs <= 1537602 AND TaxiOut = 7 GROUP BY OriginStateFips LIMIT 23","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 10140 AND 14520 OR (DivAirportSeqIDs__MV0 <= 1537602 OR DivAirportSeqIDs__MV1 <= 1537602 OR DivAirportSeqIDs__MV2 <= 1537602 OR DivAirportSeqIDs__MV3 <= 1537602 OR DivAirportSeqIDs__MV4 <= 1537602) AND TaxiOut = 7 GROUP BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 10140 AND 14520 OR DivAirportSeqIDs <= 1537602 AND TaxiOut = 7 GROUP BY OriginStateFips LIMIT 23","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 10140 AND 14520 OR (DivAirportSeqIDs[1] <= 1537602 OR DivAirportSeqIDs[2] <= 1537602 OR DivAirportSeqIDs[3] <= 1537602 OR DivAirportSeqIDs[4] <= 1537602 OR DivAirportSeqIDs[5] <= 1537602) AND TaxiOut = 7 GROUP BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE Cancelled BETWEEN 0 AND 0 AND ArrDel15 >= 0 OR ArrDelay BETWEEN 53.0 AND 312.0 ORDER BY DestCityMarketID LIMIT 26"}
 {"sql":"SELECT OriginAirportSeqID, Dest, DestAirportID FROM mytable WHERE OriginAirportSeqID BETWEEN 1591902 AND 1073203 AND Origin BETWEEN 'EWR' AND 'DLH' ORDER BY DivDistance, OriginCityName LIMIT 17"}
 {"sql":"SELECT TaxiOut, WheelsOn, AVG(DaysSinceEpoch), MAX(TaxiIn), AVG(DistanceGroup) FROM mytable WHERE NASDelay IN (78) OR DepTimeBlk BETWEEN '2100-2159' AND '1700-1759' GROUP BY TaxiOut, WheelsOn  ORDER BY TaxiOut, WheelsOn LIMIT 7","hsqls":["SELECT TaxiOut, WheelsOn, AVG(DaysSinceEpoch), MAX(TaxiIn), AVG(DistanceGroup) FROM mytable WHERE NASDelay IN (78) OR DepTimeBlk BETWEEN '2100-2159' AND '1700-1759' GROUP BY TaxiOut, WheelsOn  ORDER BY TaxiOut, WheelsOn LIMIT 7"]}
-{"sql":"SELECT DestState, DivAirportIDs, DivAirportLandings FROM mytable ORDER BY OriginCityMarketID, WeatherDelay, ArrDelayMinutes LIMIT 10","hsqls":["SELECT DestState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivAirportLandings FROM mytable ORDER BY OriginCityMarketID, WeatherDelay, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DestState, DivAirportIDs, DivAirportLandings FROM mytable ORDER BY OriginCityMarketID, WeatherDelay, ArrDelayMinutes LIMIT 10","hsqls":["SELECT DestState, DivAirportIDs, DivAirportLandings FROM mytable ORDER BY OriginCityMarketID, WeatherDelay, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (2, -2, 11) AND CRSElapsedTime = 36 ORDER BY Dest, ArrDelay, DivArrDelay LIMIT 25"}
 {"sql":"SELECT OriginState, OriginStateFips, DestCityMarketID FROM mytable WHERE TailNum NOT IN ('N615MQ', 'N995DL', 'N537AA') ORDER BY DayOfWeek LIMIT 28"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DaysSinceEpoch BETWEEN 16092 AND 16078 LIMIT 2","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DaysSinceEpoch BETWEEN 16092 AND 16078 LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DaysSinceEpoch BETWEEN 16092 AND 16078 LIMIT 2","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DaysSinceEpoch BETWEEN 16092 AND 16078 LIMIT 10000"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE Flights BETWEEN 1 AND 1 LIMIT 18"}
 {"sql":"SELECT DepartureDelayGroups, SecurityDelay FROM mytable WHERE DepartureDelayGroups = 5 OR DestAirportSeqID BETWEEN 1397002 AND 1291503 LIMIT 10"}
-{"sql":"SELECT OriginStateFips, AirlineID, ArrDelay, COUNT(CancellationCode) FROM mytable WHERE DivTailNums IN ('N206JB', 'N715SK') GROUP BY OriginStateFips, AirlineID, ArrDelay","hsqls":["SELECT OriginStateFips, AirlineID, ArrDelay, COUNT(CancellationCode) FROM mytable WHERE (DivTailNums__MV0 IN ('N206JB', 'N715SK') OR DivTailNums__MV1 IN ('N206JB', 'N715SK') OR DivTailNums__MV2 IN ('N206JB', 'N715SK') OR DivTailNums__MV3 IN ('N206JB', 'N715SK') OR DivTailNums__MV4 IN ('N206JB', 'N715SK')) GROUP BY OriginStateFips, AirlineID, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT ActualElapsedTime, \"Month\", SUM(ArrDelay), MAX(ArrDelayMinutes), COUNT(DepDelayMinutes) FROM mytable WHERE DivArrDelay BETWEEN 144 AND 735 AND Diverted BETWEEN 1 AND 0 AND DivAirportSeqIDs <= 1419303 GROUP BY ActualElapsedTime, \"Month\" LIMIT 22","hsqls":["SELECT ActualElapsedTime, Month, SUM(ArrDelay), MAX(ArrDelayMinutes), COUNT(DepDelayMinutes) FROM mytable WHERE DivArrDelay BETWEEN 144 AND 735 AND Diverted BETWEEN 1 AND 0 AND (DivAirportSeqIDs__MV0 <= 1419303 OR DivAirportSeqIDs__MV1 <= 1419303 OR DivAirportSeqIDs__MV2 <= 1419303 OR DivAirportSeqIDs__MV3 <= 1419303 OR DivAirportSeqIDs__MV4 <= 1419303) GROUP BY ActualElapsedTime, Month LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, AirlineID, ArrDelay, COUNT(CancellationCode) FROM mytable WHERE DivTailNums IN ('N206JB', 'N715SK') GROUP BY OriginStateFips, AirlineID, ArrDelay","hsqls":["SELECT OriginStateFips, AirlineID, ArrDelay, COUNT(CancellationCode) FROM mytable WHERE (DivTailNums[1] IN ('N206JB', 'N715SK') OR DivTailNums[2] IN ('N206JB', 'N715SK') OR DivTailNums[3] IN ('N206JB', 'N715SK') OR DivTailNums[4] IN ('N206JB', 'N715SK') OR DivTailNums[5] IN ('N206JB', 'N715SK')) GROUP BY OriginStateFips, AirlineID, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, \"Month\", SUM(ArrDelay), MAX(ArrDelayMinutes), COUNT(DepDelayMinutes) FROM mytable WHERE DivArrDelay BETWEEN 144 AND 735 AND Diverted BETWEEN 1 AND 0 AND DivAirportSeqIDs <= 1419303 GROUP BY ActualElapsedTime, \"Month\" LIMIT 22","hsqls":["SELECT ActualElapsedTime, Month, SUM(ArrDelay), MAX(ArrDelayMinutes), COUNT(DepDelayMinutes) FROM mytable WHERE DivArrDelay BETWEEN 144 AND 735 AND Diverted BETWEEN 1 AND 0 AND (DivAirportSeqIDs[1] <= 1419303 OR DivAirportSeqIDs[2] <= 1419303 OR DivAirportSeqIDs[3] <= 1419303 OR DivAirportSeqIDs[4] <= 1419303 OR DivAirportSeqIDs[5] <= 1419303) GROUP BY ActualElapsedTime, `Month` LIMIT 10000"]}
 {"sql":"SELECT Flights, OriginWac FROM mytable WHERE WeatherDelay IN (68, 37, 38) ORDER BY NASDelay LIMIT 15"}
-{"sql":"SELECT OriginCityMarketID, DestCityName, COUNT(*) FROM mytable WHERE DivWheelsOns IN (1713, 1821, 56, 2020) AND ActualElapsedTime NOT IN (78, 58, 383, 370, 194) GROUP BY OriginCityMarketID, DestCityName LIMIT 8","hsqls":["SELECT OriginCityMarketID, DestCityName, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 IN (1713, 1821, 56, 2020) OR DivWheelsOns__MV1 IN (1713, 1821, 56, 2020) OR DivWheelsOns__MV2 IN (1713, 1821, 56, 2020) OR DivWheelsOns__MV3 IN (1713, 1821, 56, 2020) OR DivWheelsOns__MV4 IN (1713, 1821, 56, 2020)) AND ActualElapsedTime NOT IN (78, 58, 383, 370, 194) GROUP BY OriginCityMarketID, DestCityName LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestCityName, COUNT(*) FROM mytable WHERE DivWheelsOns IN (1713, 1821, 56, 2020) AND ActualElapsedTime NOT IN (78, 58, 383, 370, 194) GROUP BY OriginCityMarketID, DestCityName LIMIT 8","hsqls":["SELECT OriginCityMarketID, DestCityName, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] IN (1713, 1821, 56, 2020) OR DivWheelsOns[2] IN (1713, 1821, 56, 2020) OR DivWheelsOns[3] IN (1713, 1821, 56, 2020) OR DivWheelsOns[4] IN (1713, 1821, 56, 2020) OR DivWheelsOns[5] IN (1713, 1821, 56, 2020)) AND ActualElapsedTime NOT IN (78, 58, 383, 370, 194) GROUP BY OriginCityMarketID, DestCityName LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrDelayMinutes), MAX(ArrDelayMinutes), SUM(TaxiIn) FROM mytable LIMIT 16"}
-{"sql":"SELECT DestWac, DivAirports, CRSArrTime FROM mytable LIMIT 27","hsqls":["SELECT DestWac, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CRSArrTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirports, CRSArrTime FROM mytable LIMIT 27","hsqls":["SELECT DestWac, DivAirports, CRSArrTime FROM mytable LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DestCityName, OriginWac FROM mytable WHERE FlightDate BETWEEN '2014-01-23' AND '2014-01-22' ORDER BY TaxiOut LIMIT 9"}
 {"sql":"SELECT LateAircraftDelay, DepTimeBlk, OriginAirportID FROM mytable WHERE CRSArrTime NOT IN (1234, 2014, 1618, 1926) OR Origin BETWEEN 'LFT' AND 'BTV' AND NASDelay IN (55) LIMIT 24"}
-{"sql":"SELECT DistanceGroup, DivReachedDest, ArrDelayMinutes, AVG(CarrierDelay) FROM mytable WHERE OriginStateName < 'Kentucky' AND WheelsOff <> 2313 OR DivWheelsOffs BETWEEN 2059 AND 1930 GROUP BY DistanceGroup, DivReachedDest, ArrDelayMinutes","hsqls":["SELECT DistanceGroup, DivReachedDest, ArrDelayMinutes, AVG(CAST(CarrierDelay AS DOUBLE)) FROM mytable WHERE OriginStateName < 'Kentucky' AND WheelsOff <> 2313 OR (DivWheelsOffs__MV0 BETWEEN 2059 AND 1930 OR DivWheelsOffs__MV1 BETWEEN 2059 AND 1930 OR DivWheelsOffs__MV2 BETWEEN 2059 AND 1930 OR DivWheelsOffs__MV3 BETWEEN 2059 AND 1930 OR DivWheelsOffs__MV4 BETWEEN 2059 AND 1930) GROUP BY DistanceGroup, DivReachedDest, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivReachedDest, ArrDelayMinutes, AVG(CarrierDelay) FROM mytable WHERE OriginStateName < 'Kentucky' AND WheelsOff <> 2313 OR DivWheelsOffs BETWEEN 2059 AND 1930 GROUP BY DistanceGroup, DivReachedDest, ArrDelayMinutes","hsqls":["SELECT DistanceGroup, DivReachedDest, ArrDelayMinutes, AVG(CAST(CarrierDelay AS DOUBLE)) FROM mytable WHERE OriginStateName < 'Kentucky' AND WheelsOff <> 2313 OR (DivWheelsOffs[1] BETWEEN 2059 AND 1930 OR DivWheelsOffs[2] BETWEEN 2059 AND 1930 OR DivWheelsOffs[3] BETWEEN 2059 AND 1930 OR DivWheelsOffs[4] BETWEEN 2059 AND 1930 OR DivWheelsOffs[5] BETWEEN 2059 AND 1930) GROUP BY DistanceGroup, DivReachedDest, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, DivArrDelay, OriginAirportID, SUM(Distance) FROM mytable WHERE CRSArrTime < 755 AND DivAirportLandings = 9 GROUP BY DestAirportSeqID, DivArrDelay, OriginAirportID  ORDER BY DestAirportSeqID, DivArrDelay, OriginAirportID LIMIT 21","hsqls":["SELECT DestAirportSeqID, DivArrDelay, OriginAirportID, SUM(Distance) FROM mytable WHERE CRSArrTime < 755 AND DivAirportLandings = 9 GROUP BY DestAirportSeqID, DivArrDelay, OriginAirportID  ORDER BY DestAirportSeqID, DivArrDelay, OriginAirportID LIMIT 21"]}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE ArrivalDelayGroups BETWEEN -1 AND 5 ORDER BY TailNum LIMIT 20"}
-{"sql":"SELECT OriginCityName, DivTailNums, DivWheelsOffs FROM mytable WHERE Flights = 1 ORDER BY DestStateName LIMIT 7","hsqls":["SELECT OriginCityName, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Flights = 1 ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DivTailNums, DivWheelsOffs FROM mytable WHERE Flights = 1 ORDER BY DestStateName LIMIT 7","hsqls":["SELECT OriginCityName, DivTailNums, DivWheelsOffs FROM mytable WHERE Flights = 1 ORDER BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, COUNT(Carrier) FROM mytable WHERE OriginStateName <= 'Missouri' OR ArrDelay > 100.0 GROUP BY OriginAirportSeqID","hsqls":["SELECT OriginAirportSeqID, COUNT(Carrier) FROM mytable WHERE OriginStateName <= 'Missouri' OR ArrDelay > 100.0 GROUP BY OriginAirportSeqID"]}
 {"sql":"SELECT DestWac, DestAirportID, AirTime, COUNT(Carrier), AVG(Cancelled), MAX(NASDelay) FROM mytable WHERE OriginCityMarketID IN (31637, 30466, 31525, 33792, 33024) AND DestWac <> 16 GROUP BY DestWac, DestAirportID, AirTime  ORDER BY DestWac, DestAirportID, AirTime LIMIT 10","hsqls":["SELECT DestWac, DestAirportID, AirTime, COUNT(Carrier), AVG(Cancelled), MAX(NASDelay) FROM mytable WHERE OriginCityMarketID IN (31637, 30466, 31525, 33792, 33024) AND DestWac <> 16 GROUP BY DestWac, DestAirportID, AirTime  ORDER BY DestWac, DestAirportID, AirTime LIMIT 10"]}
-{"sql":"SELECT MIN(OriginAirportSeqID), COUNT(SecurityDelay), COUNT(TaxiOut) FROM mytable WHERE DepTimeBlk NOT IN ('0800-0859') OR DepTime < 111 AND \"Year\" < 2014 LIMIT 4","hsqls":["SELECT MIN(OriginAirportSeqID), COUNT(SecurityDelay), COUNT(TaxiOut) FROM mytable WHERE DepTimeBlk NOT IN ('0800-0859') OR DepTime < 111 AND Year < 2014 LIMIT 4"]}
+{"sql":"SELECT MIN(OriginAirportSeqID), COUNT(SecurityDelay), COUNT(TaxiOut) FROM mytable WHERE DepTimeBlk NOT IN ('0800-0859') OR DepTime < 111 AND \"Year\" < 2014 LIMIT 4","hsqls":["SELECT MIN(OriginAirportSeqID), COUNT(SecurityDelay), COUNT(TaxiOut) FROM mytable WHERE DepTimeBlk NOT IN ('0800-0859') OR DepTime < 111 AND `Year` < 2014 LIMIT 4"]}
 {"sql":"SELECT Origin, MAX(DivDistance) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 28","hsqls":["SELECT Origin, MAX(DivDistance) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 28"]}
-{"sql":"SELECT DestState, DivArrDelay, MAX(LongestAddGTime), COUNT(LateAircraftDelay), MAX(Cancelled) FROM mytable WHERE DivAirports BETWEEN 'OMA' AND 'YKM' AND Cancelled NOT IN (1, 0) AND DestCityMarketID BETWEEN 34905 AND 31315 GROUP BY DestState, DivArrDelay LIMIT 23","hsqls":["SELECT DestState, DivArrDelay, MAX(LongestAddGTime), COUNT(LateAircraftDelay), MAX(Cancelled) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'OMA' AND 'YKM' OR DivAirports__MV1 BETWEEN 'OMA' AND 'YKM' OR DivAirports__MV2 BETWEEN 'OMA' AND 'YKM' OR DivAirports__MV3 BETWEEN 'OMA' AND 'YKM' OR DivAirports__MV4 BETWEEN 'OMA' AND 'YKM') AND Cancelled NOT IN (1, 0) AND DestCityMarketID BETWEEN 34905 AND 31315 GROUP BY DestState, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestState, DivArrDelay, MAX(LongestAddGTime), COUNT(LateAircraftDelay), MAX(Cancelled) FROM mytable WHERE DivAirports BETWEEN 'OMA' AND 'YKM' AND Cancelled NOT IN (1, 0) AND DestCityMarketID BETWEEN 34905 AND 31315 GROUP BY DestState, DivArrDelay LIMIT 23","hsqls":["SELECT DestState, DivArrDelay, MAX(LongestAddGTime), COUNT(LateAircraftDelay), MAX(Cancelled) FROM mytable WHERE (DivAirports[1] BETWEEN 'OMA' AND 'YKM' OR DivAirports[2] BETWEEN 'OMA' AND 'YKM' OR DivAirports[3] BETWEEN 'OMA' AND 'YKM' OR DivAirports[4] BETWEEN 'OMA' AND 'YKM' OR DivAirports[5] BETWEEN 'OMA' AND 'YKM') AND Cancelled NOT IN (1, 0) AND DestCityMarketID BETWEEN 34905 AND 31315 GROUP BY DestState, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTime FROM mytable WHERE DepDelayMinutes BETWEEN 83.0 AND 89.0 AND DepDel15 BETWEEN -9999 AND -9999 OR DestAirportID >= 13377 ORDER BY ArrDelay, OriginAirportID LIMIT 24"}
 {"sql":"SELECT WheelsOff, ActualElapsedTime, COUNT(*) FROM mytable GROUP BY WheelsOff, ActualElapsedTime  ORDER BY WheelsOff, ActualElapsedTime LIMIT 2","hsqls":["SELECT WheelsOff, ActualElapsedTime, COUNT(*) FROM mytable GROUP BY WheelsOff, ActualElapsedTime  ORDER BY WheelsOff, ActualElapsedTime LIMIT 2"]}
-{"sql":"SELECT FirstDepTime, \"Month\", ArrivalDelayGroups FROM mytable WHERE DivTotalGTimes BETWEEN 50 AND 16 ORDER BY DivArrDelay LIMIT 3","hsqls":["SELECT FirstDepTime, Month, ArrivalDelayGroups FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 50 AND 16 OR DivTotalGTimes__MV1 BETWEEN 50 AND 16 OR DivTotalGTimes__MV2 BETWEEN 50 AND 16 OR DivTotalGTimes__MV3 BETWEEN 50 AND 16 OR DivTotalGTimes__MV4 BETWEEN 50 AND 16) ORDER BY DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR WheelsOn BETWEEN 48 AND 819 ORDER BY DestStateName, DestAirportID LIMIT 16","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR WheelsOn BETWEEN 48 AND 819 ORDER BY DestStateName, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, \"Month\", ArrivalDelayGroups FROM mytable WHERE DivTotalGTimes BETWEEN 50 AND 16 ORDER BY DivArrDelay LIMIT 3","hsqls":["SELECT FirstDepTime, Month, ArrivalDelayGroups FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 50 AND 16 OR DivTotalGTimes[2] BETWEEN 50 AND 16 OR DivTotalGTimes[3] BETWEEN 50 AND 16 OR DivTotalGTimes[4] BETWEEN 50 AND 16 OR DivTotalGTimes[5] BETWEEN 50 AND 16) ORDER BY DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR WheelsOn BETWEEN 48 AND 819 ORDER BY DestStateName, DestAirportID LIMIT 16","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR WheelsOn BETWEEN 48 AND 819 ORDER BY DestStateName, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT \"Year\", WeatherDelay, ArrDel15 FROM mytable WHERE Diverted IN (1, 0) OR DayofMonth >= 9 OR DestStateName <> 'North Carolina' ORDER BY OriginAirportSeqID LIMIT 6","hsqls":["SELECT Year, WeatherDelay, ArrDel15 FROM mytable WHERE Diverted IN (1, 0) OR DayofMonth >= 9 OR DestStateName <> 'North Carolina' ORDER BY OriginAirportSeqID LIMIT 6"]}
-{"sql":"SELECT DestCityMarketID, DivTotalGTimes FROM mytable WHERE DestCityName <= 'Greensboro/High Point, NC' ORDER BY DestWac, Carrier, Dest LIMIT 27","hsqls":["SELECT DestCityMarketID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestCityName <= 'Greensboro/High Point, NC' ORDER BY DestWac, Carrier, Dest LIMIT 10000"]}
-{"sql":"SELECT OriginWac, AirTime, COUNT(DestWac), COUNT(OriginStateName), SUM(ActualElapsedTime) FROM mytable WHERE DivWheelsOns BETWEEN 103 AND 728 OR DivAirportSeqIDs >= 1320302 GROUP BY OriginWac, AirTime LIMIT 17","hsqls":["SELECT OriginWac, AirTime, COUNT(DestWac), COUNT(OriginStateName), SUM(ActualElapsedTime) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 103 AND 728 OR DivWheelsOns__MV1 BETWEEN 103 AND 728 OR DivWheelsOns__MV2 BETWEEN 103 AND 728 OR DivWheelsOns__MV3 BETWEEN 103 AND 728 OR DivWheelsOns__MV4 BETWEEN 103 AND 728) OR (DivAirportSeqIDs__MV0 >= 1320302 OR DivAirportSeqIDs__MV1 >= 1320302 OR DivAirportSeqIDs__MV2 >= 1320302 OR DivAirportSeqIDs__MV3 >= 1320302 OR DivAirportSeqIDs__MV4 >= 1320302) GROUP BY OriginWac, AirTime LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, DivTotalGTimes FROM mytable WHERE DestCityName <= 'Greensboro/High Point, NC' ORDER BY DestWac, Carrier, Dest LIMIT 27","hsqls":["SELECT DestCityMarketID, DivTotalGTimes FROM mytable WHERE DestCityName <= 'Greensboro/High Point, NC' ORDER BY DestWac, Carrier, Dest LIMIT 10000"]}
+{"sql":"SELECT OriginWac, AirTime, COUNT(DestWac), COUNT(OriginStateName), SUM(ActualElapsedTime) FROM mytable WHERE DivWheelsOns BETWEEN 103 AND 728 OR DivAirportSeqIDs >= 1320302 GROUP BY OriginWac, AirTime LIMIT 17","hsqls":["SELECT OriginWac, AirTime, COUNT(DestWac), COUNT(OriginStateName), SUM(ActualElapsedTime) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 103 AND 728 OR DivWheelsOns[2] BETWEEN 103 AND 728 OR DivWheelsOns[3] BETWEEN 103 AND 728 OR DivWheelsOns[4] BETWEEN 103 AND 728 OR DivWheelsOns[5] BETWEEN 103 AND 728) OR (DivAirportSeqIDs[1] >= 1320302 OR DivAirportSeqIDs[2] >= 1320302 OR DivAirportSeqIDs[3] >= 1320302 OR DivAirportSeqIDs[4] >= 1320302 OR DivAirportSeqIDs[5] >= 1320302) GROUP BY OriginWac, AirTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled IN (0) OR ArrTime BETWEEN 1004 AND 639 LIMIT 17"}
 {"sql":"SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE LongestAddGTime > 24 AND WheelsOff BETWEEN 1245 AND 1829 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 12","hsqls":["SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE LongestAddGTime > 24 AND WheelsOff BETWEEN 1245 AND 1829 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 12"]}
 {"sql":"SELECT COUNT(TaxiIn), COUNT(CarrierDelay) FROM mytable LIMIT 13"}
-{"sql":"SELECT OriginCityMarketID FROM mytable WHERE DivWheelsOns IN (1727, 1715, 1428, 2218) AND FlightDate BETWEEN '2014-01-12' AND '2014-01-03' ORDER BY OriginAirportSeqID, \"Year\", ArrDelay LIMIT 12","hsqls":["SELECT OriginCityMarketID FROM mytable WHERE (DivWheelsOns__MV0 IN (1727, 1715, 1428, 2218) OR DivWheelsOns__MV1 IN (1727, 1715, 1428, 2218) OR DivWheelsOns__MV2 IN (1727, 1715, 1428, 2218) OR DivWheelsOns__MV3 IN (1727, 1715, 1428, 2218) OR DivWheelsOns__MV4 IN (1727, 1715, 1428, 2218)) AND FlightDate BETWEEN '2014-01-12' AND '2014-01-03' ORDER BY OriginAirportSeqID, Year, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT SUM(\"Month\") FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23","hsqls":["SELECT SUM(Month) FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23"]}
+{"sql":"SELECT OriginCityMarketID FROM mytable WHERE DivWheelsOns IN (1727, 1715, 1428, 2218) AND FlightDate BETWEEN '2014-01-12' AND '2014-01-03' ORDER BY OriginAirportSeqID, \"Year\", ArrDelay LIMIT 12","hsqls":["SELECT OriginCityMarketID FROM mytable WHERE (DivWheelsOns[1] IN (1727, 1715, 1428, 2218) OR DivWheelsOns[2] IN (1727, 1715, 1428, 2218) OR DivWheelsOns[3] IN (1727, 1715, 1428, 2218) OR DivWheelsOns[4] IN (1727, 1715, 1428, 2218) OR DivWheelsOns[5] IN (1727, 1715, 1428, 2218)) AND FlightDate BETWEEN '2014-01-12' AND '2014-01-03' ORDER BY OriginAirportSeqID, Year, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT SUM(\"Month\") FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23","hsqls":["SELECT SUM(`Month`) FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23"]}
 {"sql":"SELECT Cancelled FROM mytable ORDER BY DestState, OriginStateName LIMIT 16"}
 {"sql":"SELECT Quarter, Flights, DepTimeBlk FROM mytable WHERE DestStateName NOT IN ('Wyoming', 'Virginia', 'Arkansas', 'Maryland') AND Quarter IN (1) ORDER BY ArrTime, ArrTimeBlk, OriginStateName LIMIT 10"}
 {"sql":"SELECT DestWac, AVG(TaxiOut) FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'US' GROUP BY DestWac  ORDER BY DestWac LIMIT 14","hsqls":["SELECT DestWac, AVG(TaxiOut) FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'US' GROUP BY DestWac  ORDER BY DestWac LIMIT 14"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE NASDelay BETWEEN 54 AND 106 LIMIT 18"}
 {"sql":"SELECT OriginStateFips, WeatherDelay, DestAirportSeqID FROM mytable WHERE LateAircraftDelay <= 99 AND OriginWac BETWEEN 2 AND 2 ORDER BY DivReachedDest, DestCityName LIMIT 27"}
 {"sql":"SELECT SUM(OriginAirportSeqID), AVG(DivArrDelay) FROM mytable WHERE NASDelay BETWEEN 98 AND 33 AND DepTimeBlk NOT IN ('1700-1759', '1100-1159', '0700-0759', '2100-2159', '0600-0659')"}
-{"sql":"SELECT Quarter, DaysSinceEpoch, OriginStateName FROM mytable WHERE WeatherDelay BETWEEN 47 AND 20 OR DivWheelsOns BETWEEN 1239 AND 2337 ORDER BY DepartureDelayGroups, OriginStateName LIMIT 9","hsqls":["SELECT Quarter, DaysSinceEpoch, OriginStateName FROM mytable WHERE WeatherDelay BETWEEN 47 AND 20 OR (DivWheelsOns__MV0 BETWEEN 1239 AND 2337 OR DivWheelsOns__MV1 BETWEEN 1239 AND 2337 OR DivWheelsOns__MV2 BETWEEN 1239 AND 2337 OR DivWheelsOns__MV3 BETWEEN 1239 AND 2337 OR DivWheelsOns__MV4 BETWEEN 1239 AND 2337) ORDER BY DepartureDelayGroups, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT Quarter, DaysSinceEpoch, OriginStateName FROM mytable WHERE WeatherDelay BETWEEN 47 AND 20 OR DivWheelsOns BETWEEN 1239 AND 2337 ORDER BY DepartureDelayGroups, OriginStateName LIMIT 9","hsqls":["SELECT Quarter, DaysSinceEpoch, OriginStateName FROM mytable WHERE WeatherDelay BETWEEN 47 AND 20 OR (DivWheelsOns[1] BETWEEN 1239 AND 2337 OR DivWheelsOns[2] BETWEEN 1239 AND 2337 OR DivWheelsOns[3] BETWEEN 1239 AND 2337 OR DivWheelsOns[4] BETWEEN 1239 AND 2337 OR DivWheelsOns[5] BETWEEN 1239 AND 2337) ORDER BY DepartureDelayGroups, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, DivActualElapsedTime FROM mytable WHERE DestWac IN (21, 42, 81, 54) ORDER BY Cancelled, Dest LIMIT 2"}
-{"sql":"SELECT LongestAddGTime, DivAirportIDs, WheelsOn FROM mytable WHERE Quarter IN (1) AND DestCityMarketID BETWEEN 31481 AND 31921 OR UniqueCarrier NOT IN ('UA') LIMIT 2","hsqls":["SELECT LongestAddGTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, WheelsOn FROM mytable WHERE Quarter IN (1) AND DestCityMarketID BETWEEN 31481 AND 31921 OR UniqueCarrier NOT IN ('UA') LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, Flights, OriginWac, MAX(WheelsOff), MIN(TotalAddGTime), MIN(DepDel15) FROM mytable WHERE DivAirportSeqIDs < 1479402 OR ArrDel15 IN (1, 0, -9999) GROUP BY DepartureDelayGroups, Flights, OriginWac LIMIT 5","hsqls":["SELECT DepartureDelayGroups, Flights, OriginWac, MAX(WheelsOff), MIN(TotalAddGTime), MIN(DepDel15) FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1479402 OR DivAirportSeqIDs__MV1 < 1479402 OR DivAirportSeqIDs__MV2 < 1479402 OR DivAirportSeqIDs__MV3 < 1479402 OR DivAirportSeqIDs__MV4 < 1479402) OR ArrDel15 IN (1, 0, -9999) GROUP BY DepartureDelayGroups, Flights, OriginWac LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivAirportIDs, WheelsOn FROM mytable WHERE Quarter IN (1) AND DestCityMarketID BETWEEN 31481 AND 31921 OR UniqueCarrier NOT IN ('UA') LIMIT 2","hsqls":["SELECT LongestAddGTime, DivAirportIDs, WheelsOn FROM mytable WHERE Quarter IN (1) AND DestCityMarketID BETWEEN 31481 AND 31921 OR UniqueCarrier NOT IN ('UA') LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Flights, OriginWac, MAX(WheelsOff), MIN(TotalAddGTime), MIN(DepDel15) FROM mytable WHERE DivAirportSeqIDs < 1479402 OR ArrDel15 IN (1, 0, -9999) GROUP BY DepartureDelayGroups, Flights, OriginWac LIMIT 5","hsqls":["SELECT DepartureDelayGroups, Flights, OriginWac, MAX(WheelsOff), MIN(TotalAddGTime), MIN(DepDel15) FROM mytable WHERE (DivAirportSeqIDs[1] < 1479402 OR DivAirportSeqIDs[2] < 1479402 OR DivAirportSeqIDs[3] < 1479402 OR DivAirportSeqIDs[4] < 1479402 OR DivAirportSeqIDs[5] < 1479402) OR ArrDel15 IN (1, 0, -9999) GROUP BY DepartureDelayGroups, Flights, OriginWac LIMIT 10000"]}
 {"sql":"SELECT \"Year\", FirstDepTime, COUNT(*) FROM mytable WHERE CRSElapsedTime <= 203 GROUP BY \"Year\", FirstDepTime LIMIT 18","hsqls":["SELECT Year, FirstDepTime, COUNT(*) FROM mytable WHERE CRSElapsedTime <= 203 GROUP BY Year, FirstDepTime LIMIT 18"]}
-{"sql":"SELECT DestAirportSeqID, DivTotalGTimes, DaysSinceEpoch FROM mytable WHERE Carrier >= 'WN' AND DivWheelsOffs = 1513 LIMIT 12","hsqls":["SELECT DestAirportSeqID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, DaysSinceEpoch FROM mytable WHERE Carrier >= 'WN' AND (DivWheelsOffs__MV0 = 1513 OR DivWheelsOffs__MV1 = 1513 OR DivWheelsOffs__MV2 = 1513 OR DivWheelsOffs__MV3 = 1513 OR DivWheelsOffs__MV4 = 1513) LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivTotalGTimes, DaysSinceEpoch FROM mytable WHERE Carrier >= 'WN' AND DivWheelsOffs = 1513 LIMIT 12","hsqls":["SELECT DestAirportSeqID, DivTotalGTimes, DaysSinceEpoch FROM mytable WHERE Carrier >= 'WN' AND (DivWheelsOffs[1] = 1513 OR DivWheelsOffs[2] = 1513 OR DivWheelsOffs[3] = 1513 OR DivWheelsOffs[4] = 1513 OR DivWheelsOffs[5] = 1513) LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, CRSElapsedTime FROM mytable WHERE DayOfWeek NOT IN (4) AND DestAirportSeqID BETWEEN 1141303 AND 1430702 OR DepTimeBlk < '2000-2059' LIMIT 7"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 27"}
-{"sql":"SELECT Cancelled, MAX(LateAircraftDelay), COUNT(FlightDate) FROM mytable WHERE OriginAirportID = 14696 AND \"Year\" NOT IN (2014) AND DivAirportSeqIDs IN (1120302, 1449202, 1430702) GROUP BY Cancelled LIMIT 6","hsqls":["SELECT Cancelled, MAX(LateAircraftDelay), COUNT(FlightDate) FROM mytable WHERE OriginAirportID = 14696 AND Year NOT IN (2014) AND (DivAirportSeqIDs__MV0 IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs__MV1 IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs__MV2 IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs__MV3 IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs__MV4 IN (1120302, 1449202, 1430702)) GROUP BY Cancelled LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, DivAirportIDs, ArrivalDelayGroups FROM mytable WHERE DivActualElapsedTime > 268 AND DepDel15 BETWEEN 0 AND 0 OR CRSArrTime BETWEEN 1901 AND 1257 ORDER BY DepTime LIMIT 10","hsqls":["SELECT TaxiIn, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrivalDelayGroups FROM mytable WHERE DivActualElapsedTime > 268 AND DepDel15 BETWEEN 0 AND 0 OR CRSArrTime BETWEEN 1901 AND 1257 ORDER BY DepTime LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime FROM mytable WHERE DivTotalGTimes < 25 AND Quarter BETWEEN 1 AND 1 OR DestWac < 33 ORDER BY OriginAirportSeqID LIMIT 10","hsqls":["SELECT TotalAddGTime FROM mytable WHERE (DivTotalGTimes__MV0 < 25 OR DivTotalGTimes__MV1 < 25 OR DivTotalGTimes__MV2 < 25 OR DivTotalGTimes__MV3 < 25 OR DivTotalGTimes__MV4 < 25) AND Quarter BETWEEN 1 AND 1 OR DestWac < 33 ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT Cancelled, MAX(LateAircraftDelay), COUNT(FlightDate) FROM mytable WHERE OriginAirportID = 14696 AND \"Year\" NOT IN (2014) AND DivAirportSeqIDs IN (1120302, 1449202, 1430702) GROUP BY Cancelled LIMIT 6","hsqls":["SELECT Cancelled, MAX(LateAircraftDelay), COUNT(FlightDate) FROM mytable WHERE OriginAirportID = 14696 AND `Year` NOT IN (2014) AND (DivAirportSeqIDs[1] IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs[2] IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs[3] IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs[4] IN (1120302, 1449202, 1430702) OR DivAirportSeqIDs[5] IN (1120302, 1449202, 1430702)) GROUP BY Cancelled LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DivAirportIDs, ArrivalDelayGroups FROM mytable WHERE DivActualElapsedTime > 268 AND DepDel15 BETWEEN 0 AND 0 OR CRSArrTime BETWEEN 1901 AND 1257 ORDER BY DepTime LIMIT 10","hsqls":["SELECT TaxiIn, DivAirportIDs, ArrivalDelayGroups FROM mytable WHERE DivActualElapsedTime > 268 AND DepDel15 BETWEEN 0 AND 0 OR CRSArrTime BETWEEN 1901 AND 1257 ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime FROM mytable WHERE DivTotalGTimes < 25 AND Quarter BETWEEN 1 AND 1 OR DestWac < 33 ORDER BY OriginAirportSeqID LIMIT 10","hsqls":["SELECT TotalAddGTime FROM mytable WHERE (DivTotalGTimes[1] < 25 OR DivTotalGTimes[2] < 25 OR DivTotalGTimes[3] < 25 OR DivTotalGTimes[4] < 25 OR DivTotalGTimes[5] < 25) AND Quarter BETWEEN 1 AND 1 OR DestWac < 33 ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE WeatherDelay > 170 AND AirlineID IN (20304, 19690, 19393) AND DepartureDelayGroups IN (0, 11) LIMIT 2"}
-{"sql":"SELECT ArrTime, Origin FROM mytable WHERE DivAirportIDs IN (14153, 11905) ORDER BY DestStateName LIMIT 26","hsqls":["SELECT ArrTime, Origin FROM mytable WHERE (DivAirportIDs__MV0 IN (14153, 11905) OR DivAirportIDs__MV1 IN (14153, 11905) OR DivAirportIDs__MV2 IN (14153, 11905) OR DivAirportIDs__MV3 IN (14153, 11905) OR DivAirportIDs__MV4 IN (14153, 11905)) ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT ArrTime, Origin FROM mytable WHERE DivAirportIDs IN (14153, 11905) ORDER BY DestStateName LIMIT 26","hsqls":["SELECT ArrTime, Origin FROM mytable WHERE (DivAirportIDs[1] IN (14153, 11905) OR DivAirportIDs[2] IN (14153, 11905) OR DivAirportIDs[3] IN (14153, 11905) OR DivAirportIDs[4] IN (14153, 11905) OR DivAirportIDs[5] IN (14153, 11905)) ORDER BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, WeatherDelay FROM mytable WHERE LongestAddGTime BETWEEN 8 AND 15 OR TailNum <= 'N905SW' LIMIT 24"}
 {"sql":"SELECT Flights, ActualElapsedTime FROM mytable WHERE DestStateFips <> 2 OR Cancelled >= 1 ORDER BY DepTime, DepDel15, Origin LIMIT 28"}
-{"sql":"SELECT Flights, NASDelay, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N479AA', 'N976EV', 'N14993') AND DivAirportLandings <= 2 OR WheelsOff <> 1241 ORDER BY DistanceGroup LIMIT 6","hsqls":["SELECT Flights, NASDelay, DivActualElapsedTime FROM mytable WHERE (DivTailNums__MV0 IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums__MV1 IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums__MV2 IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums__MV3 IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums__MV4 IN ('N479AA', 'N976EV', 'N14993')) AND DivAirportLandings <= 2 OR WheelsOff <> 1241 ORDER BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT Flights, NASDelay, DivActualElapsedTime FROM mytable WHERE DivTailNums IN ('N479AA', 'N976EV', 'N14993') AND DivAirportLandings <= 2 OR WheelsOff <> 1241 ORDER BY DistanceGroup LIMIT 6","hsqls":["SELECT Flights, NASDelay, DivActualElapsedTime FROM mytable WHERE (DivTailNums[1] IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums[2] IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums[3] IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums[4] IN ('N479AA', 'N976EV', 'N14993') OR DivTailNums[5] IN ('N479AA', 'N976EV', 'N14993')) AND DivAirportLandings <= 2 OR WheelsOff <> 1241 ORDER BY DistanceGroup LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DestStateName, WheelsOn, COUNT(*) FROM mytable GROUP BY OriginStateFips, DestStateName, WheelsOn  ORDER BY OriginStateFips, DestStateName, WheelsOn LIMIT 29","hsqls":["SELECT OriginStateFips, DestStateName, WheelsOn, COUNT(*) FROM mytable GROUP BY OriginStateFips, DestStateName, WheelsOn  ORDER BY OriginStateFips, DestStateName, WheelsOn LIMIT 29"]}
 {"sql":"SELECT DestAirportSeqID, DestCityMarketID FROM mytable WHERE CRSDepTime < 2055 ORDER BY FlightDate, OriginCityName LIMIT 3"}
-{"sql":"SELECT OriginAirportSeqID, Flights, MAX(CarrierDelay), SUM(ArrivalDelayGroups), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 AND DivAirportIDs IN (14843, 14635) GROUP BY OriginAirportSeqID, Flights LIMIT 12","hsqls":["SELECT OriginAirportSeqID, Flights, MAX(CarrierDelay), SUM(ArrivalDelayGroups), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 AND (DivAirportIDs__MV0 IN (14843, 14635) OR DivAirportIDs__MV1 IN (14843, 14635) OR DivAirportIDs__MV2 IN (14843, 14635) OR DivAirportIDs__MV3 IN (14843, 14635) OR DivAirportIDs__MV4 IN (14843, 14635)) GROUP BY OriginAirportSeqID, Flights LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, SecurityDelay, Distance, COUNT(CRSDepTime), COUNT(OriginCityName) FROM mytable WHERE LongestAddGTime <> -9999 OR TaxiOut > 112 AND \"Year\" NOT IN (2014) GROUP BY WheelsOff, SecurityDelay, Distance LIMIT 24","hsqls":["SELECT WheelsOff, SecurityDelay, Distance, COUNT(CRSDepTime), COUNT(OriginCityName) FROM mytable WHERE LongestAddGTime <> -9999 OR TaxiOut > 112 AND Year NOT IN (2014) GROUP BY WheelsOff, SecurityDelay, Distance LIMIT 24"]}
+{"sql":"SELECT OriginAirportSeqID, Flights, MAX(CarrierDelay), SUM(ArrivalDelayGroups), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 AND DivAirportIDs IN (14843, 14635) GROUP BY OriginAirportSeqID, Flights LIMIT 12","hsqls":["SELECT OriginAirportSeqID, Flights, MAX(CarrierDelay), SUM(ArrivalDelayGroups), MAX(ArrivalDelayGroups) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 AND (DivAirportIDs[1] IN (14843, 14635) OR DivAirportIDs[2] IN (14843, 14635) OR DivAirportIDs[3] IN (14843, 14635) OR DivAirportIDs[4] IN (14843, 14635) OR DivAirportIDs[5] IN (14843, 14635)) GROUP BY OriginAirportSeqID, Flights LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, SecurityDelay, Distance, COUNT(CRSDepTime), COUNT(OriginCityName) FROM mytable WHERE LongestAddGTime <> -9999 OR TaxiOut > 112 AND \"Year\" NOT IN (2014) GROUP BY WheelsOff, SecurityDelay, Distance LIMIT 24","hsqls":["SELECT WheelsOff, SecurityDelay, Distance, COUNT(CRSDepTime), COUNT(OriginCityName) FROM mytable WHERE LongestAddGTime <> -9999 OR TaxiOut > 112 AND `Year` NOT IN (2014) GROUP BY WheelsOff, SecurityDelay, Distance LIMIT 24"]}
 {"sql":"SELECT WheelsOff, DistanceGroup, Dest FROM mytable WHERE DayOfWeek BETWEEN 1 AND 7 AND WheelsOff = 1451 ORDER BY OriginAirportSeqID, DistanceGroup LIMIT 23"}
-{"sql":"SELECT DivReachedDest FROM mytable WHERE \"Year\" < 2014 OR ArrDel15 < -9999 AND Flights <= 1 ORDER BY Diverted, Dest, Origin LIMIT 6","hsqls":["SELECT DivReachedDest FROM mytable WHERE Year < 2014 OR ArrDel15 < -9999 AND Flights <= 1 ORDER BY Diverted, Dest, Origin LIMIT 6"]}
+{"sql":"SELECT DivReachedDest FROM mytable WHERE \"Year\" < 2014 OR ArrDel15 < -9999 AND Flights <= 1 ORDER BY Diverted, Dest, Origin LIMIT 6","hsqls":["SELECT DivReachedDest FROM mytable WHERE `Year` < 2014 OR ArrDel15 < -9999 AND Flights <= 1 ORDER BY Diverted, Dest, Origin LIMIT 6"]}
 {"sql":"SELECT COUNT(OriginAirportID), AVG(FlightNum) FROM mytable LIMIT 23"}
 {"sql":"SELECT TaxiOut, OriginCityMarketID, DestStateName, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19690 AND 19690 OR OriginCityName IN ('Fort Smith, AR', 'Wrangell, AK', 'Montgomery, AL') AND LateAircraftDelay = 166 GROUP BY TaxiOut, OriginCityMarketID, DestStateName  ORDER BY TaxiOut, OriginCityMarketID, DestStateName LIMIT 17","hsqls":["SELECT TaxiOut, OriginCityMarketID, DestStateName, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19690 AND 19690 OR OriginCityName IN ('Fort Smith, AR', 'Wrangell, AK', 'Montgomery, AL') AND LateAircraftDelay = 166 GROUP BY TaxiOut, OriginCityMarketID, DestStateName  ORDER BY TaxiOut, OriginCityMarketID, DestStateName LIMIT 17"]}
 {"sql":"SELECT OriginCityName, AirlineID, DayOfWeek FROM mytable WHERE Dest IN ('ATL', 'SMF', 'GTF') AND DayOfWeek < 5 AND CRSArrTime IN (1843, 2007, 1708, 1255) ORDER BY OriginCityMarketID LIMIT 4"}
 {"sql":"SELECT Diverted, LongestAddGTime FROM mytable WHERE ArrDelayMinutes < 162.0 ORDER BY DivDistance LIMIT 5"}
-{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY FirstDepTime, CarrierDelay, DivActualElapsedTime LIMIT 12","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY FirstDepTime, CarrierDelay, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY FirstDepTime, CarrierDelay, DivActualElapsedTime LIMIT 12","hsqls":["SELECT DivAirportIDs FROM mytable ORDER BY FirstDepTime, CarrierDelay, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, SUM(NASDelay), AVG(Distance), AVG(Quarter) FROM mytable WHERE DestState IN ('KS', 'KY') GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 1","hsqls":["SELECT DepTimeBlk, SUM(NASDelay), AVG(Distance), AVG(Quarter) FROM mytable WHERE DestState IN ('KS', 'KY') GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 1"]}
 {"sql":"SELECT \"Year\", Cancelled, MIN(ActualElapsedTime), MAX(DayofMonth), MIN(ArrTime) FROM mytable GROUP BY \"Year\", Cancelled","hsqls":["SELECT Year, Cancelled, MIN(ActualElapsedTime), MAX(DayofMonth), MIN(ArrTime) FROM mytable GROUP BY Year, Cancelled"]}
-{"sql":"SELECT DivLongestGTimes, TotalAddGTime, DivAirportIDs FROM mytable ORDER BY ArrivalDelayGroups LIMIT 19","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, TotalAddGTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, TotalAddGTime, DivAirportIDs FROM mytable ORDER BY ArrivalDelayGroups LIMIT 19","hsqls":["SELECT DivLongestGTimes, TotalAddGTime, DivAirportIDs FROM mytable ORDER BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled <> 1 OR WheelsOff IN (1250) AND CancellationCode NOT IN ('A', 'C', 'noodles') LIMIT 23"}
 {"sql":"SELECT ArrTime, MAX(DepTime), SUM(ArrivalDelayGroups), SUM(DepDelayMinutes) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 24","hsqls":["SELECT ArrTime, MAX(DepTime), SUM(ArrivalDelayGroups), SUM(DepDelayMinutes) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 24"]}
 {"sql":"SELECT FlightNum FROM mytable WHERE AirlineID BETWEEN 20409 AND 20436 ORDER BY Cancelled, DestStateName, CRSDepTime LIMIT 28"}
 {"sql":"SELECT Cancelled FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 AND DestCityMarketID IN (32070, 32945, 33495, 30792, 31986) ORDER BY LateAircraftDelay LIMIT 13"}
-{"sql":"SELECT Origin, OriginStateName FROM mytable WHERE OriginAirportID IN (10792, 10713) AND DepDelayMinutes <= 245.0 AND DivReachedDest NOT IN (-9999) ORDER BY SecurityDelay, DivArrDelay, \"Month\" LIMIT 7","hsqls":["SELECT Origin, OriginStateName FROM mytable WHERE OriginAirportID IN (10792, 10713) AND DepDelayMinutes <= 245.0 AND DivReachedDest NOT IN (-9999) ORDER BY SecurityDelay, DivArrDelay, Month LIMIT 7"]}
+{"sql":"SELECT Origin, OriginStateName FROM mytable WHERE OriginAirportID IN (10792, 10713) AND DepDelayMinutes <= 245.0 AND DivReachedDest NOT IN (-9999) ORDER BY SecurityDelay, DivArrDelay, \"Month\" LIMIT 7","hsqls":["SELECT Origin, OriginStateName FROM mytable WHERE OriginAirportID IN (10792, 10713) AND DepDelayMinutes <= 245.0 AND DivReachedDest NOT IN (-9999) ORDER BY SecurityDelay, DivArrDelay, `Month` LIMIT 7"]}
 {"sql":"SELECT OriginAirportSeqID, DivReachedDest, LateAircraftDelay FROM mytable ORDER BY CarrierDelay, OriginWac LIMIT 10"}
-{"sql":"SELECT Cancelled, ArrDel15, CRSElapsedTime FROM mytable WHERE DivWheelsOffs >= 851 AND \"Month\" BETWEEN 1 AND 1 ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 6","hsqls":["SELECT Cancelled, ArrDel15, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs__MV0 >= 851 OR DivWheelsOffs__MV1 >= 851 OR DivWheelsOffs__MV2 >= 851 OR DivWheelsOffs__MV3 >= 851 OR DivWheelsOffs__MV4 >= 851) AND Month BETWEEN 1 AND 1 ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DepTime, DestStateName FROM mytable WHERE DivAirportSeqIDs BETWEEN 1098002 AND 1501603 AND \"Month\" NOT IN (1) ORDER BY DivDistance LIMIT 27","hsqls":["SELECT DepTime, DestStateName FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs__MV1 BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs__MV2 BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs__MV3 BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs__MV4 BETWEEN 1098002 AND 1501603) AND Month NOT IN (1) ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT Cancelled, ArrDel15, CRSElapsedTime FROM mytable WHERE DivWheelsOffs >= 851 AND \"Month\" BETWEEN 1 AND 1 ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 6","hsqls":["SELECT Cancelled, ArrDel15, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs[1] >= 851 OR DivWheelsOffs[2] >= 851 OR DivWheelsOffs[3] >= 851 OR DivWheelsOffs[4] >= 851 OR DivWheelsOffs[5] >= 851) AND `Month` BETWEEN 1 AND 1 ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DepTime, DestStateName FROM mytable WHERE DivAirportSeqIDs BETWEEN 1098002 AND 1501603 AND \"Month\" NOT IN (1) ORDER BY DivDistance LIMIT 27","hsqls":["SELECT DepTime, DestStateName FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs[2] BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs[3] BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs[4] BETWEEN 1098002 AND 1501603 OR DivAirportSeqIDs[5] BETWEEN 1098002 AND 1501603) AND `Month` NOT IN (1) ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, COUNT(*) FROM mytable WHERE FlightDate NOT IN ('2014-01-07', '2014-01-10', '2014-01-16') OR TaxiIn BETWEEN 43 AND 67 OR LateAircraftDelay NOT IN (250, 27) GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 7","hsqls":["SELECT DestAirportID, COUNT(*) FROM mytable WHERE FlightDate NOT IN ('2014-01-07', '2014-01-10', '2014-01-16') OR TaxiIn BETWEEN 43 AND 67 OR LateAircraftDelay NOT IN (250, 27) GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 7"]}
 {"sql":"SELECT DestAirportSeqID, DayofMonth, UniqueCarrier FROM mytable ORDER BY DestStateFips, OriginCityName, DivAirportLandings LIMIT 23"}
 {"sql":"SELECT ArrTimeBlk, ArrDel15, AirlineID FROM mytable WHERE UniqueCarrier > 'HA' OR ActualElapsedTime IN (80) OR OriginStateFips BETWEEN 29 AND 39 LIMIT 1"}
 {"sql":"SELECT DayofMonth, DestCityMarketID FROM mytable ORDER BY TailNum LIMIT 18"}
 {"sql":"SELECT WheelsOff, Carrier, DivArrDelay FROM mytable WHERE DivReachedDest <= 0 OR ArrTime BETWEEN 1019 AND 1409 OR Carrier BETWEEN 'OO' AND 'UA' ORDER BY DestState, FlightNum, ArrTimeBlk LIMIT 28"}
 {"sql":"SELECT TaxiOut, DestCityMarketID, DivArrDelay FROM mytable WHERE DestState >= 'MO' AND CarrierDelay IN (42, 29) AND OriginWac IN (34) ORDER BY OriginState, Distance, \"Month\"","hsqls":["SELECT TaxiOut, DestCityMarketID, DivArrDelay FROM mytable WHERE DestState >= 'MO' AND CarrierDelay IN (42, 29) AND OriginWac IN (34) ORDER BY OriginState, Distance, Month"]}
-{"sql":"SELECT DivDistance, NASDelay, DivWheelsOffs FROM mytable ORDER BY DestAirportID LIMIT 22","hsqls":["SELECT DivDistance, NASDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivDistance, NASDelay, DivWheelsOffs FROM mytable ORDER BY DestAirportID LIMIT 22","hsqls":["SELECT DivDistance, NASDelay, DivWheelsOffs FROM mytable ORDER BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, MIN(DayOfWeek) FROM mytable WHERE DestStateFips BETWEEN 28 AND 18 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 28","hsqls":["SELECT ActualElapsedTime, MIN(DayOfWeek) FROM mytable WHERE DestStateFips BETWEEN 28 AND 18 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 28"]}
 {"sql":"SELECT TaxiIn, MIN(DepartureDelayGroups), MAX(CRSDepTime) FROM mytable WHERE DestWac <> 82 AND DaysSinceEpoch BETWEEN 16087 AND 16099 OR ArrTime = 314 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 29","hsqls":["SELECT TaxiIn, MIN(DepartureDelayGroups), MAX(CRSDepTime) FROM mytable WHERE DestWac <> 82 AND DaysSinceEpoch BETWEEN 16087 AND 16099 OR ArrTime = 314 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 29"]}
 {"sql":"SELECT DestStateFips, ArrTime, COUNT(Flights), MIN(TotalAddGTime), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DestStateFips, ArrTime  ORDER BY DestStateFips, ArrTime LIMIT 23","hsqls":["SELECT DestStateFips, ArrTime, COUNT(Flights), MIN(TotalAddGTime), MIN(ArrivalDelayGroups) FROM mytable GROUP BY DestStateFips, ArrTime  ORDER BY DestStateFips, ArrTime LIMIT 23"]}
@@ -4620,18 +4620,18 @@
 {"sql":"SELECT AVG(DepDel15), MAX(LateAircraftDelay) FROM mytable LIMIT 17"}
 {"sql":"SELECT TaxiIn, DestAirportID, SUM(CRSDepTime) FROM mytable WHERE DepTime <= 547 AND DestAirportID NOT IN (15401, 12280) AND ActualElapsedTime BETWEEN 111 AND 364 GROUP BY TaxiIn, DestAirportID  ORDER BY TaxiIn, DestAirportID LIMIT 10","hsqls":["SELECT TaxiIn, DestAirportID, SUM(CRSDepTime) FROM mytable WHERE DepTime <= 547 AND DestAirportID NOT IN (15401, 12280) AND ActualElapsedTime BETWEEN 111 AND 364 GROUP BY TaxiIn, DestAirportID  ORDER BY TaxiIn, DestAirportID LIMIT 10"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE ArrTimeBlk BETWEEN '1600-1659' AND '0700-0759' ORDER BY CRSArrTime, DestStateName, OriginWac LIMIT 10"}
-{"sql":"SELECT DivLongestGTimes, OriginStateName FROM mytable WHERE DepDelay BETWEEN 580.0 AND 65.0 ORDER BY CRSArrTime, Dest LIMIT 21","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginStateName FROM mytable WHERE DepDelay BETWEEN 580.0 AND 65.0 ORDER BY CRSArrTime, Dest LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginStateName FROM mytable WHERE DepDelay BETWEEN 580.0 AND 65.0 ORDER BY CRSArrTime, Dest LIMIT 21","hsqls":["SELECT DivLongestGTimes, OriginStateName FROM mytable WHERE DepDelay BETWEEN 580.0 AND 65.0 ORDER BY CRSArrTime, Dest LIMIT 10000"]}
 {"sql":"SELECT DepTime FROM mytable WHERE TaxiIn BETWEEN 14 AND 162 ORDER BY DivReachedDest, DestStateFips LIMIT 16"}
 {"sql":"SELECT SecurityDelay, DepDel15, DestStateName FROM mytable WHERE CRSElapsedTime = 430 LIMIT 12"}
-{"sql":"SELECT DepTime, OriginStateName, MIN(OriginWac), SUM(DepartureDelayGroups) FROM mytable WHERE DivWheelsOns = 1118 OR LongestAddGTime > 128 OR WheelsOff = 2320 GROUP BY DepTime, OriginStateName LIMIT 25","hsqls":["SELECT DepTime, OriginStateName, MIN(OriginWac), SUM(DepartureDelayGroups) FROM mytable WHERE (DivWheelsOns__MV0 = 1118 OR DivWheelsOns__MV1 = 1118 OR DivWheelsOns__MV2 = 1118 OR DivWheelsOns__MV3 = 1118 OR DivWheelsOns__MV4 = 1118) OR LongestAddGTime > 128 OR WheelsOff = 2320 GROUP BY DepTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DepTime, OriginStateName, MIN(OriginWac), SUM(DepartureDelayGroups) FROM mytable WHERE DivWheelsOns = 1118 OR LongestAddGTime > 128 OR WheelsOff = 2320 GROUP BY DepTime, OriginStateName LIMIT 25","hsqls":["SELECT DepTime, OriginStateName, MIN(OriginWac), SUM(DepartureDelayGroups) FROM mytable WHERE (DivWheelsOns[1] = 1118 OR DivWheelsOns[2] = 1118 OR DivWheelsOns[3] = 1118 OR DivWheelsOns[4] = 1118 OR DivWheelsOns[5] = 1118) OR LongestAddGTime > 128 OR WheelsOff = 2320 GROUP BY DepTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT COUNT(DestAirportID), AVG(AirlineID) FROM mytable WHERE Distance IN (1020, 529, 422, 589) LIMIT 4"}
 {"sql":"SELECT OriginAirportSeqID, DepTimeBlk, AVG(Diverted), MIN(DestStateFips), SUM(ArrTime) FROM mytable GROUP BY OriginAirportSeqID, DepTimeBlk  ORDER BY OriginAirportSeqID, DepTimeBlk LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DepTimeBlk, AVG(Diverted), MIN(DestStateFips), SUM(ArrTime) FROM mytable GROUP BY OriginAirportSeqID, DepTimeBlk  ORDER BY OriginAirportSeqID, DepTimeBlk LIMIT 8"]}
-{"sql":"SELECT DepTimeBlk, \"Month\", COUNT(DestStateName), MIN(DestStateFips) FROM mytable GROUP BY DepTimeBlk, \"Month\" LIMIT 1","hsqls":["SELECT DepTimeBlk, Month, COUNT(DestStateName), MIN(DestStateFips) FROM mytable GROUP BY DepTimeBlk, Month LIMIT 1"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime = 891 AND DivAirports = 'DAY' LIMIT 17","hsqls":["SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime = 891 AND (DivAirports__MV0 = 'DAY' OR DivAirports__MV1 = 'DAY' OR DivAirports__MV2 = 'DAY' OR DivAirports__MV3 = 'DAY' OR DivAirports__MV4 = 'DAY') LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, \"Month\", COUNT(DestStateName), MIN(DestStateFips) FROM mytable GROUP BY DepTimeBlk, \"Month\" LIMIT 1","hsqls":["SELECT DepTimeBlk, Month, COUNT(DestStateName), MIN(DestStateFips) FROM mytable GROUP BY DepTimeBlk, `Month` LIMIT 1"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime = 891 AND DivAirports = 'DAY' LIMIT 17","hsqls":["SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime = 891 AND (DivAirports[1] = 'DAY' OR DivAirports[2] = 'DAY' OR DivAirports[3] = 'DAY' OR DivAirports[4] = 'DAY' OR DivAirports[5] = 'DAY') LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, OriginCityName, DivArrDelay, MIN(OriginWac), SUM(DayOfWeek), COUNT(AirlineID) FROM mytable WHERE DepartureDelayGroups IN (10, 0, 5) AND FlightDate <> '2014-01-03' GROUP BY OriginCityMarketID, OriginCityName, DivArrDelay  ORDER BY OriginCityMarketID, OriginCityName, DivArrDelay LIMIT 6","hsqls":["SELECT OriginCityMarketID, OriginCityName, DivArrDelay, MIN(OriginWac), SUM(DayOfWeek), COUNT(AirlineID) FROM mytable WHERE DepartureDelayGroups IN (10, 0, 5) AND FlightDate <> '2014-01-03' GROUP BY OriginCityMarketID, OriginCityName, DivArrDelay  ORDER BY OriginCityMarketID, OriginCityName, DivArrDelay LIMIT 6"]}
 {"sql":"SELECT DestCityName, CRSDepTime FROM mytable WHERE AirTime IN (203, 148, 280, 362) OR OriginCityMarketID < 34492 ORDER BY Dest LIMIT 23"}
-{"sql":"SELECT ArrTime, ArrDel15, \"Month\", COUNT(DivAirportLandings) FROM mytable GROUP BY ArrTime, ArrDel15, \"Month\" LIMIT 8","hsqls":["SELECT ArrTime, ArrDel15, Month, COUNT(DivAirportLandings) FROM mytable GROUP BY ArrTime, ArrDel15, Month LIMIT 8"]}
-{"sql":"SELECT CRSElapsedTime FROM mytable WHERE DivWheelsOns >= 1528 AND DivLongestGTimes <= 2.0 OR DivWheelsOffs < 833 ORDER BY OriginState, WeatherDelay LIMIT 20","hsqls":["SELECT CRSElapsedTime FROM mytable WHERE (DivWheelsOns__MV0 >= 1528 OR DivWheelsOns__MV1 >= 1528 OR DivWheelsOns__MV2 >= 1528 OR DivWheelsOns__MV3 >= 1528 OR DivWheelsOns__MV4 >= 1528) AND (DivLongestGTimes__MV0 <= 2.0 OR DivLongestGTimes__MV1 <= 2.0 OR DivLongestGTimes__MV2 <= 2.0 OR DivLongestGTimes__MV3 <= 2.0 OR DivLongestGTimes__MV4 <= 2.0) OR (DivWheelsOffs__MV0 < 833 OR DivWheelsOffs__MV1 < 833 OR DivWheelsOffs__MV2 < 833 OR DivWheelsOffs__MV3 < 833 OR DivWheelsOffs__MV4 < 833) ORDER BY OriginState, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT ArrTime, ArrDel15, \"Month\", COUNT(DivAirportLandings) FROM mytable GROUP BY ArrTime, ArrDel15, \"Month\" LIMIT 8","hsqls":["SELECT ArrTime, ArrDel15, Month, COUNT(DivAirportLandings) FROM mytable GROUP BY ArrTime, ArrDel15, `Month` LIMIT 8"]}
+{"sql":"SELECT CRSElapsedTime FROM mytable WHERE DivWheelsOns >= 1528 AND DivLongestGTimes <= 2.0 OR DivWheelsOffs < 833 ORDER BY OriginState, WeatherDelay LIMIT 20","hsqls":["SELECT CRSElapsedTime FROM mytable WHERE (DivWheelsOns[1] >= 1528 OR DivWheelsOns[2] >= 1528 OR DivWheelsOns[3] >= 1528 OR DivWheelsOns[4] >= 1528 OR DivWheelsOns[5] >= 1528) AND (DivLongestGTimes[1] <= 2.0 OR DivLongestGTimes[2] <= 2.0 OR DivLongestGTimes[3] <= 2.0 OR DivLongestGTimes[4] <= 2.0 OR DivLongestGTimes[5] <= 2.0) OR (DivWheelsOffs[1] < 833 OR DivWheelsOffs[2] < 833 OR DivWheelsOffs[3] < 833 OR DivWheelsOffs[4] < 833 OR DivWheelsOffs[5] < 833) ORDER BY OriginState, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT FlightDate, OriginWac, DestAirportID FROM mytable LIMIT 14"}
 {"sql":"SELECT MAX(DivDistance), COUNT(LongestAddGTime), SUM(DepartureDelayGroups) FROM mytable WHERE DepTimeBlk = '0700-0759' OR DestStateName > 'Kansas' LIMIT 26"}
 {"sql":"SELECT DestState, CRSArrTime, UniqueCarrier FROM mytable WHERE DestAirportID NOT IN (15016, 10372, 11775, 11193, 11057) AND OriginCityMarketID IN (35356, 30894) ORDER BY DepartureDelayGroups LIMIT 26"}
@@ -4641,10 +4641,10 @@
 {"sql":"SELECT TaxiOut, DestAirportSeqID, NASDelay FROM mytable LIMIT 7"}
 {"sql":"SELECT WeatherDelay, ArrTime, ArrDelay, COUNT(ArrTimeBlk), COUNT(DepTimeBlk) FROM mytable GROUP BY WeatherDelay, ArrTime, ArrDelay  ORDER BY WeatherDelay, ArrTime, ArrDelay LIMIT 24","hsqls":["SELECT WeatherDelay, ArrTime, ArrDelay, COUNT(ArrTimeBlk), COUNT(DepTimeBlk) FROM mytable GROUP BY WeatherDelay, ArrTime, ArrDelay  ORDER BY WeatherDelay, ArrTime, ArrDelay LIMIT 24"]}
 {"sql":"SELECT TaxiIn, CancellationCode, DaysSinceEpoch FROM mytable WHERE TaxiOut IN (79, 77, 112, 6) OR CRSElapsedTime >= 41 ORDER BY DivAirportLandings, WheelsOn, DayOfWeek LIMIT 27"}
-{"sql":"SELECT FirstDepTime, TotalAddGTime FROM mytable WHERE DivTotalGTimes BETWEEN 73 AND 58 AND ActualElapsedTime IN (340) LIMIT 11","hsqls":["SELECT FirstDepTime, TotalAddGTime FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 73 AND 58 OR DivTotalGTimes__MV1 BETWEEN 73 AND 58 OR DivTotalGTimes__MV2 BETWEEN 73 AND 58 OR DivTotalGTimes__MV3 BETWEEN 73 AND 58 OR DivTotalGTimes__MV4 BETWEEN 73 AND 58) AND ActualElapsedTime IN (340) LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, TotalAddGTime FROM mytable WHERE DivTotalGTimes BETWEEN 73 AND 58 AND ActualElapsedTime IN (340) LIMIT 11","hsqls":["SELECT FirstDepTime, TotalAddGTime FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 73 AND 58 OR DivTotalGTimes[2] BETWEEN 73 AND 58 OR DivTotalGTimes[3] BETWEEN 73 AND 58 OR DivTotalGTimes[4] BETWEEN 73 AND 58 OR DivTotalGTimes[5] BETWEEN 73 AND 58) AND ActualElapsedTime IN (340) LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DivActualElapsedTime, COUNT(*) FROM mytable WHERE AirTime BETWEEN 79 AND 363 GROUP BY TaxiOut, DivActualElapsedTime  ORDER BY TaxiOut, DivActualElapsedTime LIMIT 10","hsqls":["SELECT TaxiOut, DivActualElapsedTime, COUNT(*) FROM mytable WHERE AirTime BETWEEN 79 AND 363 GROUP BY TaxiOut, DivActualElapsedTime  ORDER BY TaxiOut, DivActualElapsedTime LIMIT 10"]}
-{"sql":"SELECT DestCityMarketID, OriginWac, COUNT(*) FROM mytable WHERE DivAirports >= 'TRI' GROUP BY DestCityMarketID, OriginWac","hsqls":["SELECT DestCityMarketID, OriginWac, COUNT(*) FROM mytable WHERE (DivAirports__MV0 >= 'TRI' OR DivAirports__MV1 >= 'TRI' OR DivAirports__MV2 >= 'TRI' OR DivAirports__MV3 >= 'TRI' OR DivAirports__MV4 >= 'TRI') GROUP BY DestCityMarketID, OriginWac LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, OriginCityName, \"Month\", COUNT(*) FROM mytable WHERE FlightNum NOT IN (4215, 3813, 5347, 4642) GROUP BY DestStateFips, OriginCityName, \"Month\" LIMIT 2","hsqls":["SELECT DestStateFips, OriginCityName, Month, COUNT(*) FROM mytable WHERE FlightNum NOT IN (4215, 3813, 5347, 4642) GROUP BY DestStateFips, OriginCityName, Month LIMIT 2"]}
+{"sql":"SELECT DestCityMarketID, OriginWac, COUNT(*) FROM mytable WHERE DivAirports >= 'TRI' GROUP BY DestCityMarketID, OriginWac","hsqls":["SELECT DestCityMarketID, OriginWac, COUNT(*) FROM mytable WHERE (DivAirports[1] >= 'TRI' OR DivAirports[2] >= 'TRI' OR DivAirports[3] >= 'TRI' OR DivAirports[4] >= 'TRI' OR DivAirports[5] >= 'TRI') GROUP BY DestCityMarketID, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, OriginCityName, \"Month\", COUNT(*) FROM mytable WHERE FlightNum NOT IN (4215, 3813, 5347, 4642) GROUP BY DestStateFips, OriginCityName, \"Month\" LIMIT 2","hsqls":["SELECT DestStateFips, OriginCityName, Month, COUNT(*) FROM mytable WHERE FlightNum NOT IN (4215, 3813, 5347, 4642) GROUP BY DestStateFips, OriginCityName, `Month` LIMIT 2"]}
 {"sql":"SELECT DivReachedDest, DivDistance FROM mytable WHERE LateAircraftDelay <> 132 AND OriginStateFips IN (44, 19, 55, 17, 24) AND DivReachedDest NOT IN (1, -9999) ORDER BY \"Year\", FirstDepTime, CarrierDelay LIMIT 6","hsqls":["SELECT DivReachedDest, DivDistance FROM mytable WHERE LateAircraftDelay <> 132 AND OriginStateFips IN (44, 19, 55, 17, 24) AND DivReachedDest NOT IN (1, -9999) ORDER BY Year, FirstDepTime, CarrierDelay LIMIT 6"]}
 {"sql":"SELECT DepDelayMinutes, TaxiIn FROM mytable ORDER BY OriginWac LIMIT 13"}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE WheelsOff IN (544, 1635, 1336, 119) OR OriginStateFips = 34 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 28","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE WheelsOff IN (544, 1635, 1336, 119) OR OriginStateFips = 34 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 28"]}
@@ -4652,35 +4652,35 @@
 {"sql":"SELECT FlightNum, COUNT(*) FROM mytable WHERE DivAirportLandings >= 9 OR OriginCityName BETWEEN 'Corpus Christi, TX' AND 'Baton Rouge, LA' AND DestAirportSeqID IN (1389101) GROUP BY FlightNum  ORDER BY FlightNum LIMIT 7","hsqls":["SELECT FlightNum, COUNT(*) FROM mytable WHERE DivAirportLandings >= 9 OR OriginCityName BETWEEN 'Corpus Christi, TX' AND 'Baton Rouge, LA' AND DestAirportSeqID IN (1389101) GROUP BY FlightNum  ORDER BY FlightNum LIMIT 7"]}
 {"sql":"SELECT DepDelayMinutes, MAX(DestWac) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 26","hsqls":["SELECT DepDelayMinutes, MAX(DestWac) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 26"]}
 {"sql":"SELECT Diverted, COUNT(*) FROM mytable WHERE Dest IN ('CID') GROUP BY Diverted  ORDER BY Diverted LIMIT 22","hsqls":["SELECT Diverted, COUNT(*) FROM mytable WHERE Dest IN ('CID') GROUP BY Diverted  ORDER BY Diverted LIMIT 22"]}
-{"sql":"SELECT TaxiIn, DepDel15, MIN(\"Year\"), AVG(Distance), MIN(CRSArrTime) FROM mytable GROUP BY TaxiIn, DepDel15 LIMIT 24","hsqls":["SELECT TaxiIn, DepDel15, MIN(Year), AVG(Distance), MIN(CRSArrTime) FROM mytable GROUP BY TaxiIn, DepDel15 LIMIT 24"]}
+{"sql":"SELECT TaxiIn, DepDel15, MIN(\"Year\"), AVG(Distance), MIN(CRSArrTime) FROM mytable GROUP BY TaxiIn, DepDel15 LIMIT 24","hsqls":["SELECT TaxiIn, DepDel15, MIN(`Year`), AVG(Distance), MIN(CRSArrTime) FROM mytable GROUP BY TaxiIn, DepDel15 LIMIT 24"]}
 {"sql":"SELECT Origin FROM mytable WHERE ArrDel15 <= 0 ORDER BY Diverted, LongestAddGTime LIMIT 29"}
-{"sql":"SELECT AirlineID FROM mytable WHERE DivLongestGTimes BETWEEN 17.0 AND 118.0 ORDER BY ArrTimeBlk LIMIT 29","hsqls":["SELECT AirlineID FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 17.0 AND 118.0 OR DivLongestGTimes__MV1 BETWEEN 17.0 AND 118.0 OR DivLongestGTimes__MV2 BETWEEN 17.0 AND 118.0 OR DivLongestGTimes__MV3 BETWEEN 17.0 AND 118.0 OR DivLongestGTimes__MV4 BETWEEN 17.0 AND 118.0) ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT AirlineID FROM mytable WHERE DivLongestGTimes BETWEEN 17.0 AND 118.0 ORDER BY ArrTimeBlk LIMIT 29","hsqls":["SELECT AirlineID FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 17.0 AND 118.0 OR DivLongestGTimes[2] BETWEEN 17.0 AND 118.0 OR DivLongestGTimes[3] BETWEEN 17.0 AND 118.0 OR DivLongestGTimes[4] BETWEEN 17.0 AND 118.0 OR DivLongestGTimes[5] BETWEEN 17.0 AND 118.0) ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, DivAirportLandings, UniqueCarrier, COUNT(*) FROM mytable WHERE DepDelay <= 102.0 AND TaxiOut BETWEEN 13 AND 44 OR Dest < 'PHX' GROUP BY TotalAddGTime, DivAirportLandings, UniqueCarrier  ORDER BY TotalAddGTime, DivAirportLandings, UniqueCarrier LIMIT 2","hsqls":["SELECT TotalAddGTime, DivAirportLandings, UniqueCarrier, COUNT(*) FROM mytable WHERE DepDelay <= 102.0 AND TaxiOut BETWEEN 13 AND 44 OR Dest < 'PHX' GROUP BY TotalAddGTime, DivAirportLandings, UniqueCarrier  ORDER BY TotalAddGTime, DivAirportLandings, UniqueCarrier LIMIT 2"]}
-{"sql":"SELECT DivReachedDest, NASDelay FROM mytable WHERE \"Year\" NOT IN (2014) AND \"Month\" <= 1 ORDER BY FlightNum, DestCityMarketID, DestAirportID LIMIT 24","hsqls":["SELECT DivReachedDest, NASDelay FROM mytable WHERE Year NOT IN (2014) AND Month <= 1 ORDER BY FlightNum, DestCityMarketID, DestAirportID LIMIT 24"]}
-{"sql":"SELECT Carrier, ArrDel15, DayOfWeek FROM mytable WHERE ArrDelayMinutes >= 116.0 AND DivTailNums IN ('N3HHAA') OR ArrivalDelayGroups BETWEEN 1 AND -1 LIMIT 3","hsqls":["SELECT Carrier, ArrDel15, DayOfWeek FROM mytable WHERE ArrDelayMinutes >= 116.0 AND (DivTailNums__MV0 IN ('N3HHAA') OR DivTailNums__MV1 IN ('N3HHAA') OR DivTailNums__MV2 IN ('N3HHAA') OR DivTailNums__MV3 IN ('N3HHAA') OR DivTailNums__MV4 IN ('N3HHAA')) OR ArrivalDelayGroups BETWEEN 1 AND -1 LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, NASDelay FROM mytable WHERE \"Year\" NOT IN (2014) AND \"Month\" <= 1 ORDER BY FlightNum, DestCityMarketID, DestAirportID LIMIT 24","hsqls":["SELECT DivReachedDest, NASDelay FROM mytable WHERE `Year` NOT IN (2014) AND `Month` <= 1 ORDER BY FlightNum, DestCityMarketID, DestAirportID LIMIT 24"]}
+{"sql":"SELECT Carrier, ArrDel15, DayOfWeek FROM mytable WHERE ArrDelayMinutes >= 116.0 AND DivTailNums IN ('N3HHAA') OR ArrivalDelayGroups BETWEEN 1 AND -1 LIMIT 3","hsqls":["SELECT Carrier, ArrDel15, DayOfWeek FROM mytable WHERE ArrDelayMinutes >= 116.0 AND (DivTailNums[1] IN ('N3HHAA') OR DivTailNums[2] IN ('N3HHAA') OR DivTailNums[3] IN ('N3HHAA') OR DivTailNums[4] IN ('N3HHAA') OR DivTailNums[5] IN ('N3HHAA')) OR ArrivalDelayGroups BETWEEN 1 AND -1 LIMIT 10000"]}
 {"sql":"SELECT Quarter, CarrierDelay, DivArrDelay FROM mytable ORDER BY OriginCityName, DivActualElapsedTime LIMIT 9"}
 {"sql":"SELECT MIN(NASDelay), MIN(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE SecurityDelay IN (10, 1, 18, 14) LIMIT 10"}
-{"sql":"SELECT Carrier, ArrTimeBlk, DivTailNums FROM mytable WHERE OriginStateFips >= 55 ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportID LIMIT 15","hsqls":["SELECT Carrier, ArrTimeBlk, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE OriginStateFips >= 55 ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT Carrier, ArrTimeBlk, DivTailNums FROM mytable WHERE OriginStateFips >= 55 ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportID LIMIT 15","hsqls":["SELECT Carrier, ArrTimeBlk, DivTailNums FROM mytable WHERE OriginStateFips >= 55 ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT Origin, MAX(Flights) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 3","hsqls":["SELECT Origin, MAX(Flights) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 3"]}
 {"sql":"SELECT Diverted, FirstDepTime, OriginWac FROM mytable WHERE DepDelay BETWEEN 293.0 AND 1.0 AND DestWac = 52 ORDER BY WeatherDelay, DepTime, DivActualElapsedTime LIMIT 1"}
-{"sql":"SELECT DivDistance, ArrDel15, CRSDepTime FROM mytable WHERE DivAirportIDs BETWEEN 14869 AND 10397 OR DestStateFips IN (32, 24, 16, 28, 38) AND DayOfWeek <> 4 LIMIT 3","hsqls":["SELECT DivDistance, ArrDel15, CRSDepTime FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14869 AND 10397 OR DivAirportIDs__MV1 BETWEEN 14869 AND 10397 OR DivAirportIDs__MV2 BETWEEN 14869 AND 10397 OR DivAirportIDs__MV3 BETWEEN 14869 AND 10397 OR DivAirportIDs__MV4 BETWEEN 14869 AND 10397) OR DestStateFips IN (32, 24, 16, 28, 38) AND DayOfWeek <> 4 LIMIT 10000"]}
+{"sql":"SELECT DivDistance, ArrDel15, CRSDepTime FROM mytable WHERE DivAirportIDs BETWEEN 14869 AND 10397 OR DestStateFips IN (32, 24, 16, 28, 38) AND DayOfWeek <> 4 LIMIT 3","hsqls":["SELECT DivDistance, ArrDel15, CRSDepTime FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14869 AND 10397 OR DivAirportIDs[2] BETWEEN 14869 AND 10397 OR DivAirportIDs[3] BETWEEN 14869 AND 10397 OR DivAirportIDs[4] BETWEEN 14869 AND 10397 OR DivAirportIDs[5] BETWEEN 14869 AND 10397) OR DestStateFips IN (32, 24, 16, 28, 38) AND DayOfWeek <> 4 LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID, MAX(DestStateFips), AVG(DivArrDelay), MIN(ArrTime) FROM mytable WHERE TotalAddGTime BETWEEN 8 AND 94 AND CRSArrTime < 2212 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 5","hsqls":["SELECT DestCityMarketID, MAX(DestStateFips), AVG(DivArrDelay), MIN(ArrTime) FROM mytable WHERE TotalAddGTime BETWEEN 8 AND 94 AND CRSArrTime < 2212 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 5"]}
 {"sql":"SELECT MAX(SecurityDelay), SUM(DivReachedDest), MAX(DivReachedDest) FROM mytable WHERE Origin NOT IN ('BQN', 'HIB') AND ArrDelayMinutes NOT IN (15.0, 218.0) AND DivReachedDest BETWEEN -9999 AND 0 LIMIT 1"}
 {"sql":"SELECT DivDistance, CRSDepTime FROM mytable WHERE TaxiIn NOT IN (1, 43, 44, 5) OR Quarter < 1 OR TaxiOut BETWEEN 56 AND 32 ORDER BY Origin LIMIT 12"}
 {"sql":"SELECT DepDel15 FROM mytable WHERE Diverted BETWEEN 1 AND 1 LIMIT 1"}
-{"sql":"SELECT Quarter, DivWheelsOffs, DayofMonth FROM mytable ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT Quarter, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DayofMonth FROM mytable ORDER BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT Quarter, DivWheelsOffs, DayofMonth FROM mytable ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT Quarter, DivWheelsOffs, DayofMonth FROM mytable ORDER BY DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DepDelay, FlightDate, MIN(ArrDelayMinutes), AVG(LateAircraftDelay), COUNT(Distance) FROM mytable GROUP BY DivReachedDest, DepDelay, FlightDate  ORDER BY DivReachedDest, DepDelay, FlightDate LIMIT 18","hsqls":["SELECT DivReachedDest, DepDelay, FlightDate, MIN(ArrDelayMinutes), AVG(LateAircraftDelay), COUNT(Distance) FROM mytable GROUP BY DivReachedDest, DepDelay, FlightDate  ORDER BY DivReachedDest, DepDelay, FlightDate LIMIT 18"]}
-{"sql":"SELECT Diverted, OriginStateFips, WeatherDelay, COUNT(DepDel15), AVG(CRSArrTime) FROM mytable WHERE DestState IN ('WI') OR DivLongestGTimes > 64.0 OR DivDistance BETWEEN 440 AND 106 GROUP BY Diverted, OriginStateFips, WeatherDelay LIMIT 12","hsqls":["SELECT Diverted, OriginStateFips, WeatherDelay, COUNT(DepDel15), AVG(CRSArrTime) FROM mytable WHERE DestState IN ('WI') OR (DivLongestGTimes__MV0 > 64.0 OR DivLongestGTimes__MV1 > 64.0 OR DivLongestGTimes__MV2 > 64.0 OR DivLongestGTimes__MV3 > 64.0 OR DivLongestGTimes__MV4 > 64.0) OR DivDistance BETWEEN 440 AND 106 GROUP BY Diverted, OriginStateFips, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT Diverted, OriginStateFips, WeatherDelay, COUNT(DepDel15), AVG(CRSArrTime) FROM mytable WHERE DestState IN ('WI') OR DivLongestGTimes > 64.0 OR DivDistance BETWEEN 440 AND 106 GROUP BY Diverted, OriginStateFips, WeatherDelay LIMIT 12","hsqls":["SELECT Diverted, OriginStateFips, WeatherDelay, COUNT(DepDel15), AVG(CRSArrTime) FROM mytable WHERE DestState IN ('WI') OR (DivLongestGTimes[1] > 64.0 OR DivLongestGTimes[2] > 64.0 OR DivLongestGTimes[3] > 64.0 OR DivLongestGTimes[4] > 64.0 OR DivLongestGTimes[5] > 64.0) OR DivDistance BETWEEN 440 AND 106 GROUP BY Diverted, OriginStateFips, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, \"Month\", ArrivalDelayGroups FROM mytable WHERE Quarter <> 1 OR ArrivalDelayGroups IN (2, 4, 8, 11, 12) OR Distance IN (970) ORDER BY DepartureDelayGroups, OriginState, TailNum LIMIT 9","hsqls":["SELECT CancellationCode, Month, ArrivalDelayGroups FROM mytable WHERE Quarter <> 1 OR ArrivalDelayGroups IN (2, 4, 8, 11, 12) OR Distance IN (970) ORDER BY DepartureDelayGroups, OriginState, TailNum LIMIT 9"]}
 {"sql":"SELECT NASDelay, COUNT(*) FROM mytable WHERE ArrTime < 2242 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 26","hsqls":["SELECT NASDelay, COUNT(*) FROM mytable WHERE ArrTime < 2242 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 26"]}
 {"sql":"SELECT Dest FROM mytable WHERE DistanceGroup > 5 ORDER BY ArrTime, ArrDel15"}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE CRSElapsedTime BETWEEN 505 AND 238 OR Carrier NOT IN ('EV', 'B6', 'OO', 'UA') ORDER BY DaysSinceEpoch LIMIT 8"}
 {"sql":"SELECT AirTime FROM mytable WHERE AirlineID NOT IN (20398, 20304, 19393, 19930, 19805) AND DayofMonth >= 5 AND OriginAirportSeqID <= 1405702 ORDER BY OriginCityName, DepTimeBlk, WheelsOn LIMIT 14"}
 {"sql":"SELECT OriginCityMarketID, DestStateFips, TotalAddGTime, AVG(SecurityDelay), SUM(DestCityMarketID) FROM mytable GROUP BY OriginCityMarketID, DestStateFips, TotalAddGTime  ORDER BY OriginCityMarketID, DestStateFips, TotalAddGTime LIMIT 23","hsqls":["SELECT OriginCityMarketID, DestStateFips, TotalAddGTime, AVG(SecurityDelay), SUM(DestCityMarketID) FROM mytable GROUP BY OriginCityMarketID, DestStateFips, TotalAddGTime  ORDER BY OriginCityMarketID, DestStateFips, TotalAddGTime LIMIT 23"]}
-{"sql":"SELECT FirstDepTime, DivTailNums, DestCityMarketID FROM mytable WHERE DivReachedDest <= 1 AND Distance BETWEEN 972 AND 188 ORDER BY LateAircraftDelay, DayOfWeek LIMIT 11","hsqls":["SELECT FirstDepTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestCityMarketID FROM mytable WHERE DivReachedDest <= 1 AND Distance BETWEEN 972 AND 188 ORDER BY LateAircraftDelay, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DivTailNums, DestCityMarketID FROM mytable WHERE DivReachedDest <= 1 AND Distance BETWEEN 972 AND 188 ORDER BY LateAircraftDelay, DayOfWeek LIMIT 11","hsqls":["SELECT FirstDepTime, DivTailNums, DestCityMarketID FROM mytable WHERE DivReachedDest <= 1 AND Distance BETWEEN 972 AND 188 ORDER BY LateAircraftDelay, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE ArrDel15 <> 0 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 7","hsqls":["SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE ArrDel15 <> 0 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 7"]}
-{"sql":"SELECT Distance, DivWheelsOffs FROM mytable WHERE DestState BETWEEN 'NY' AND 'IA' AND TailNum BETWEEN 'N764SK' AND 'N15985' AND \"Month\" <> 1 LIMIT 3","hsqls":["SELECT Distance, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DestState BETWEEN 'NY' AND 'IA' AND TailNum BETWEEN 'N764SK' AND 'N15985' AND Month <> 1 LIMIT 10000"]}
-{"sql":"SELECT TailNum, MIN(DayOfWeek) FROM mytable WHERE DestAirportID <= 11471 OR DivAirportSeqIDs IN (1245102, 1091802, 1610102, 1479402, 1075402) AND Diverted NOT IN (0) GROUP BY TailNum LIMIT 9","hsqls":["SELECT TailNum, MIN(DayOfWeek) FROM mytable WHERE DestAirportID <= 11471 OR (DivAirportSeqIDs__MV0 IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs__MV1 IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs__MV2 IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs__MV3 IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs__MV4 IN (1245102, 1091802, 1610102, 1479402, 1075402)) AND Diverted NOT IN (0) GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT Distance, DivWheelsOffs FROM mytable WHERE DestState BETWEEN 'NY' AND 'IA' AND TailNum BETWEEN 'N764SK' AND 'N15985' AND \"Month\" <> 1 LIMIT 3","hsqls":["SELECT Distance, DivWheelsOffs FROM mytable WHERE DestState BETWEEN 'NY' AND 'IA' AND TailNum BETWEEN 'N764SK' AND 'N15985' AND `Month` <> 1 LIMIT 10000"]}
+{"sql":"SELECT TailNum, MIN(DayOfWeek) FROM mytable WHERE DestAirportID <= 11471 OR DivAirportSeqIDs IN (1245102, 1091802, 1610102, 1479402, 1075402) AND Diverted NOT IN (0) GROUP BY TailNum LIMIT 9","hsqls":["SELECT TailNum, MIN(DayOfWeek) FROM mytable WHERE DestAirportID <= 11471 OR (DivAirportSeqIDs[1] IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs[2] IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs[3] IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs[4] IN (1245102, 1091802, 1610102, 1479402, 1075402) OR DivAirportSeqIDs[5] IN (1245102, 1091802, 1610102, 1479402, 1075402)) AND Diverted NOT IN (0) GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, AVG(DivDistance), COUNT(ArrTime) FROM mytable WHERE DistanceGroup IN (6) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 28","hsqls":["SELECT DistanceGroup, AVG(DivDistance), COUNT(ArrTime) FROM mytable WHERE DistanceGroup IN (6) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 28"]}
 {"sql":"SELECT DepDelay, DestState, Origin, MAX(FirstDepTime), AVG(Cancelled), MIN(ActualElapsedTime) FROM mytable GROUP BY DepDelay, DestState, Origin  ORDER BY DepDelay, DestState, Origin LIMIT 26","hsqls":["SELECT DepDelay, DestState, Origin, MAX(FirstDepTime), AVG(Cancelled), MIN(ActualElapsedTime) FROM mytable GROUP BY DepDelay, DestState, Origin  ORDER BY DepDelay, DestState, Origin LIMIT 26"]}
 {"sql":"SELECT TailNum FROM mytable ORDER BY OriginAirportSeqID LIMIT 1"}
@@ -4689,20 +4689,20 @@
 {"sql":"SELECT MIN(DepDel15) FROM mytable WHERE Origin >= 'BIL' LIMIT 7"}
 {"sql":"SELECT OriginWac, UniqueCarrier FROM mytable WHERE ActualElapsedTime BETWEEN 70 AND 191 OR DivDistance >= 24 AND AirlineID <> 19805 LIMIT 23"}
 {"sql":"SELECT TaxiOut, DivDistance, TotalAddGTime FROM mytable WHERE LongestAddGTime = 63 OR DestAirportSeqID < 1197702 ORDER BY DepDelay LIMIT 10"}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups IN (1, 7) OR DivAirports IN ('ATW', 'YAK', 'PWM', 'DCA') AND Distance >= 119 ORDER BY Diverted, Quarter, CancellationCode LIMIT 23","hsqls":["SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups IN (1, 7) OR (DivAirports__MV0 IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports__MV1 IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports__MV2 IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports__MV3 IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports__MV4 IN ('ATW', 'YAK', 'PWM', 'DCA')) AND Distance >= 119 ORDER BY Diverted, Quarter, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups IN (1, 7) OR DivAirports IN ('ATW', 'YAK', 'PWM', 'DCA') AND Distance >= 119 ORDER BY Diverted, Quarter, CancellationCode LIMIT 23","hsqls":["SELECT WeatherDelay FROM mytable WHERE DepartureDelayGroups IN (1, 7) OR (DivAirports[1] IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports[2] IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports[3] IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports[4] IN ('ATW', 'YAK', 'PWM', 'DCA') OR DivAirports[5] IN ('ATW', 'YAK', 'PWM', 'DCA')) AND Distance >= 119 ORDER BY Diverted, Quarter, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DivArrDelay, MIN(WheelsOn) FROM mytable WHERE DestWac BETWEEN 86 AND 11 GROUP BY DepDelayMinutes, DivArrDelay  ORDER BY DepDelayMinutes, DivArrDelay LIMIT 16","hsqls":["SELECT DepDelayMinutes, DivArrDelay, MIN(WheelsOn) FROM mytable WHERE DestWac BETWEEN 86 AND 11 GROUP BY DepDelayMinutes, DivArrDelay  ORDER BY DepDelayMinutes, DivArrDelay LIMIT 16"]}
 {"sql":"SELECT OriginAirportSeqID, MAX(Flights), MIN(FlightNum) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 8","hsqls":["SELECT OriginAirportSeqID, MAX(Flights), MIN(FlightNum) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 8"]}
 {"sql":"SELECT Quarter, WheelsOn, MAX(CarrierDelay), AVG(ArrivalDelayGroups), MIN(LongestAddGTime) FROM mytable GROUP BY Quarter, WheelsOn  ORDER BY Quarter, WheelsOn LIMIT 19","hsqls":["SELECT Quarter, WheelsOn, MAX(CarrierDelay), AVG(ArrivalDelayGroups), MIN(LongestAddGTime) FROM mytable GROUP BY Quarter, WheelsOn  ORDER BY Quarter, WheelsOn LIMIT 19"]}
 {"sql":"SELECT Dest, CRSDepTime, MAX(OriginWac) FROM mytable WHERE CarrierDelay BETWEEN 23 AND 130 AND TotalAddGTime BETWEEN 39 AND 31 GROUP BY Dest, CRSDepTime  ORDER BY Dest, CRSDepTime LIMIT 3","hsqls":["SELECT Dest, CRSDepTime, MAX(OriginWac) FROM mytable WHERE CarrierDelay BETWEEN 23 AND 130 AND TotalAddGTime BETWEEN 39 AND 31 GROUP BY Dest, CRSDepTime  ORDER BY Dest, CRSDepTime LIMIT 3"]}
 {"sql":"SELECT MAX(FirstDepTime) FROM mytable WHERE DepTimeBlk BETWEEN '1200-1259' AND '0700-0759' LIMIT 8"}
-{"sql":"SELECT OriginCityMarketID, ActualElapsedTime, OriginWac, AVG(\"Month\"), COUNT(DepartureDelayGroups) FROM mytable GROUP BY OriginCityMarketID, ActualElapsedTime, OriginWac LIMIT 24","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, OriginWac, AVG(Month), COUNT(DepartureDelayGroups) FROM mytable GROUP BY OriginCityMarketID, ActualElapsedTime, OriginWac LIMIT 24"]}
+{"sql":"SELECT OriginCityMarketID, ActualElapsedTime, OriginWac, AVG(\"Month\"), COUNT(DepartureDelayGroups) FROM mytable GROUP BY OriginCityMarketID, ActualElapsedTime, OriginWac LIMIT 24","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, OriginWac, AVG(`Month`), COUNT(DepartureDelayGroups) FROM mytable GROUP BY OriginCityMarketID, ActualElapsedTime, OriginWac LIMIT 24"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE Distance IN (599, 661, 350) LIMIT 25"}
-{"sql":"SELECT MAX(\"Year\"), COUNT(DistanceGroup) FROM mytable WHERE OriginCityName BETWEEN 'Knoxville, TN' AND 'Medford, OR' OR Carrier NOT IN ('EV', 'DL', 'FL', 'AS') AND OriginAirportSeqID BETWEEN 1410002 AND 1584102 LIMIT 26","hsqls":["SELECT MAX(Year), COUNT(DistanceGroup) FROM mytable WHERE OriginCityName BETWEEN 'Knoxville, TN' AND 'Medford, OR' OR Carrier NOT IN ('EV', 'DL', 'FL', 'AS') AND OriginAirportSeqID BETWEEN 1410002 AND 1584102 LIMIT 26"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrTimeBlk IN ('1100-1159', '2100-2159', '0800-0859', '1800-1859') OR OriginState NOT IN ('SD', 'WA', 'MI', 'MA', 'KY') AND DivWheelsOns BETWEEN 913 AND 2044 ORDER BY CRSElapsedTime, OriginStateName LIMIT 15","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrTimeBlk IN ('1100-1159', '2100-2159', '0800-0859', '1800-1859') OR OriginState NOT IN ('SD', 'WA', 'MI', 'MA', 'KY') AND (DivWheelsOns__MV0 BETWEEN 913 AND 2044 OR DivWheelsOns__MV1 BETWEEN 913 AND 2044 OR DivWheelsOns__MV2 BETWEEN 913 AND 2044 OR DivWheelsOns__MV3 BETWEEN 913 AND 2044 OR DivWheelsOns__MV4 BETWEEN 913 AND 2044) ORDER BY CRSElapsedTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT MAX(\"Year\"), COUNT(DistanceGroup) FROM mytable WHERE OriginCityName BETWEEN 'Knoxville, TN' AND 'Medford, OR' OR Carrier NOT IN ('EV', 'DL', 'FL', 'AS') AND OriginAirportSeqID BETWEEN 1410002 AND 1584102 LIMIT 26","hsqls":["SELECT MAX(`Year`), COUNT(DistanceGroup) FROM mytable WHERE OriginCityName BETWEEN 'Knoxville, TN' AND 'Medford, OR' OR Carrier NOT IN ('EV', 'DL', 'FL', 'AS') AND OriginAirportSeqID BETWEEN 1410002 AND 1584102 LIMIT 26"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrTimeBlk IN ('1100-1159', '2100-2159', '0800-0859', '1800-1859') OR OriginState NOT IN ('SD', 'WA', 'MI', 'MA', 'KY') AND DivWheelsOns BETWEEN 913 AND 2044 ORDER BY CRSElapsedTime, OriginStateName LIMIT 15","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE ArrTimeBlk IN ('1100-1159', '2100-2159', '0800-0859', '1800-1859') OR OriginState NOT IN ('SD', 'WA', 'MI', 'MA', 'KY') AND (DivWheelsOns[1] BETWEEN 913 AND 2044 OR DivWheelsOns[2] BETWEEN 913 AND 2044 OR DivWheelsOns[3] BETWEEN 913 AND 2044 OR DivWheelsOns[4] BETWEEN 913 AND 2044 OR DivWheelsOns[5] BETWEEN 913 AND 2044) ORDER BY CRSElapsedTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, NASDelay, DayofMonth, MAX(DestAirportSeqID) FROM mytable GROUP BY WeatherDelay, NASDelay, DayofMonth  ORDER BY WeatherDelay, NASDelay, DayofMonth LIMIT 6","hsqls":["SELECT WeatherDelay, NASDelay, DayofMonth, MAX(DestAirportSeqID) FROM mytable GROUP BY WeatherDelay, NASDelay, DayofMonth  ORDER BY WeatherDelay, NASDelay, DayofMonth LIMIT 6"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepartureDelayGroups IN (1) AND TailNum IN ('N784JB', 'N568UW') AND TaxiOut BETWEEN 6 AND 13 LIMIT 15"}
 {"sql":"SELECT WeatherDelay, MIN(AirTime), AVG(ArrDelayMinutes), SUM(FlightNum) FROM mytable WHERE DivActualElapsedTime BETWEEN 266 AND 326 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 19","hsqls":["SELECT WeatherDelay, MIN(AirTime), AVG(ArrDelayMinutes), SUM(FlightNum) FROM mytable WHERE DivActualElapsedTime BETWEEN 266 AND 326 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 19"]}
-{"sql":"SELECT TaxiOut, DepDel15, DivWheelsOffs FROM mytable WHERE DivAirports < 'MCO' ORDER BY OriginState LIMIT 23","hsqls":["SELECT TaxiOut, DepDel15, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE (DivAirports__MV0 < 'MCO' OR DivAirports__MV1 < 'MCO' OR DivAirports__MV2 < 'MCO' OR DivAirports__MV3 < 'MCO' OR DivAirports__MV4 < 'MCO') ORDER BY OriginState LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DepDel15, DivWheelsOffs FROM mytable WHERE DivAirports < 'MCO' ORDER BY OriginState LIMIT 23","hsqls":["SELECT TaxiOut, DepDel15, DivWheelsOffs FROM mytable WHERE (DivAirports[1] < 'MCO' OR DivAirports[2] < 'MCO' OR DivAirports[3] < 'MCO' OR DivAirports[4] < 'MCO' OR DivAirports[5] < 'MCO') ORDER BY OriginState LIMIT 10000"]}
 {"sql":"SELECT Carrier, LongestAddGTime, ArrTime, MAX(WheelsOff), AVG(DestWac) FROM mytable WHERE Origin BETWEEN 'BFL' AND 'PSE' AND DepTimeBlk < '1600-1659' GROUP BY Carrier, LongestAddGTime, ArrTime  ORDER BY Carrier, LongestAddGTime, ArrTime LIMIT 14","hsqls":["SELECT Carrier, LongestAddGTime, ArrTime, MAX(WheelsOff), AVG(DestWac) FROM mytable WHERE Origin BETWEEN 'BFL' AND 'PSE' AND DepTimeBlk < '1600-1659' GROUP BY Carrier, LongestAddGTime, ArrTime  ORDER BY Carrier, LongestAddGTime, ArrTime LIMIT 14"]}
 {"sql":"SELECT LongestAddGTime, OriginCityName, NASDelay FROM mytable WHERE FirstDepTime BETWEEN 908 AND 1153 ORDER BY FlightNum, CRSArrTime, DayOfWeek LIMIT 27"}
 {"sql":"SELECT WeatherDelay, Flights, MAX(DestStateFips), AVG(LateAircraftDelay) FROM mytable WHERE DepDelay NOT IN (-13.0, -14.0, -10.0, 228.0, 97.0) AND DestState >= 'WI' AND FlightDate NOT IN ('2014-01-26', '2014-01-16') GROUP BY WeatherDelay, Flights  ORDER BY WeatherDelay, Flights LIMIT 19","hsqls":["SELECT WeatherDelay, Flights, MAX(DestStateFips), AVG(LateAircraftDelay) FROM mytable WHERE DepDelay NOT IN (-13.0, -14.0, -10.0, 228.0, 97.0) AND DestState >= 'WI' AND FlightDate NOT IN ('2014-01-26', '2014-01-16') GROUP BY WeatherDelay, Flights  ORDER BY WeatherDelay, Flights LIMIT 19"]}
@@ -4710,59 +4710,59 @@
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 20"}
 {"sql":"SELECT SecurityDelay, DepTimeBlk, WheelsOn, COUNT(*) FROM mytable GROUP BY SecurityDelay, DepTimeBlk, WheelsOn  ORDER BY SecurityDelay, DepTimeBlk, WheelsOn LIMIT 22","hsqls":["SELECT SecurityDelay, DepTimeBlk, WheelsOn, COUNT(*) FROM mytable GROUP BY SecurityDelay, DepTimeBlk, WheelsOn  ORDER BY SecurityDelay, DepTimeBlk, WheelsOn LIMIT 22"]}
 {"sql":"SELECT WeatherDelay, ArrTimeBlk FROM mytable WHERE DestAirportID BETWEEN 11618 AND 12264 OR DepDelay NOT IN (37.0, 109.0, 644.0, 156.0) LIMIT 18"}
-{"sql":"SELECT MAX(DestStateFips) FROM mytable WHERE DivAirportIDs IN (15919, 14783, 11252, 14288, 11638) LIMIT 9","hsqls":["SELECT MAX(DestStateFips) FROM mytable WHERE (DivAirportIDs__MV0 IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs__MV1 IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs__MV2 IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs__MV3 IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs__MV4 IN (15919, 14783, 11252, 14288, 11638)) LIMIT 10000"]}
+{"sql":"SELECT MAX(DestStateFips) FROM mytable WHERE DivAirportIDs IN (15919, 14783, 11252, 14288, 11638) LIMIT 9","hsqls":["SELECT MAX(DestStateFips) FROM mytable WHERE (DivAirportIDs[1] IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs[2] IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs[3] IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs[4] IN (15919, 14783, 11252, 14288, 11638) OR DivAirportIDs[5] IN (15919, 14783, 11252, 14288, 11638)) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE CarrierDelay < 62 ORDER BY DepartureDelayGroups, CRSArrTime, ArrivalDelayGroups LIMIT 18"}
-{"sql":"SELECT TaxiIn, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE CRSElapsedTime >= 210 AND DivLongestGTimes > 46.0 OR DepDelay <> 250.0 GROUP BY TaxiIn, ArrivalDelayGroups LIMIT 10","hsqls":["SELECT TaxiIn, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE CRSElapsedTime >= 210 AND (DivLongestGTimes__MV0 > 46.0 OR DivLongestGTimes__MV1 > 46.0 OR DivLongestGTimes__MV2 > 46.0 OR DivLongestGTimes__MV3 > 46.0 OR DivLongestGTimes__MV4 > 46.0) OR DepDelay <> 250.0 GROUP BY TaxiIn, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime FROM mytable WHERE DepTimeBlk <> '0900-0959' OR TaxiIn BETWEEN 29 AND 35 OR \"Year\" > 2014 ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT LongestAddGTime FROM mytable WHERE DepTimeBlk <> '0900-0959' OR TaxiIn BETWEEN 29 AND 35 OR Year > 2014 ORDER BY DepDelayMinutes LIMIT 13"]}
+{"sql":"SELECT TaxiIn, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE CRSElapsedTime >= 210 AND DivLongestGTimes > 46.0 OR DepDelay <> 250.0 GROUP BY TaxiIn, ArrivalDelayGroups LIMIT 10","hsqls":["SELECT TaxiIn, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE CRSElapsedTime >= 210 AND (DivLongestGTimes[1] > 46.0 OR DivLongestGTimes[2] > 46.0 OR DivLongestGTimes[3] > 46.0 OR DivLongestGTimes[4] > 46.0 OR DivLongestGTimes[5] > 46.0) OR DepDelay <> 250.0 GROUP BY TaxiIn, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime FROM mytable WHERE DepTimeBlk <> '0900-0959' OR TaxiIn BETWEEN 29 AND 35 OR \"Year\" > 2014 ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT LongestAddGTime FROM mytable WHERE DepTimeBlk <> '0900-0959' OR TaxiIn BETWEEN 29 AND 35 OR `Year` > 2014 ORDER BY DepDelayMinutes LIMIT 13"]}
 {"sql":"SELECT OriginCityMarketID, DestStateFips FROM mytable ORDER BY WeatherDelay, WheelsOn LIMIT 17"}
 {"sql":"SELECT Diverted, COUNT(*) FROM mytable WHERE Carrier NOT IN ('B6', 'AA') AND OriginStateName BETWEEN 'North Dakota' AND 'Texas' GROUP BY Diverted  ORDER BY Diverted LIMIT 3","hsqls":["SELECT Diverted, COUNT(*) FROM mytable WHERE Carrier NOT IN ('B6', 'AA') AND OriginStateName BETWEEN 'North Dakota' AND 'Texas' GROUP BY Diverted  ORDER BY Diverted LIMIT 3"]}
 {"sql":"SELECT DivArrDelay, OriginAirportID FROM mytable WHERE FlightDate >= '2014-01-10' ORDER BY TaxiOut, Carrier, SecurityDelay LIMIT 24"}
 {"sql":"SELECT CRSArrTime, MIN(FlightNum), COUNT(DepartureDelayGroups), COUNT(CRSElapsedTime) FROM mytable WHERE OriginCityName IN ('Kodiak, AK', 'Fort Myers, FL', 'Albany, GA', 'Bakersfield, CA', 'Louisville, KY') AND CRSElapsedTime <> 68 GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 22","hsqls":["SELECT CRSArrTime, MIN(FlightNum), COUNT(DepartureDelayGroups), COUNT(CRSElapsedTime) FROM mytable WHERE OriginCityName IN ('Kodiak, AK', 'Fort Myers, FL', 'Albany, GA', 'Bakersfield, CA', 'Louisville, KY') AND CRSElapsedTime <> 68 GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 22"]}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE Carrier NOT IN ('EV', 'HA', 'MQ') OR DivWheelsOns IN (1144, 1259, 1558, 1303) AND DivAirportSeqIDs IN (1120302, 1160302, 1106603) ORDER BY TotalAddGTime, CancellationCode LIMIT 16","hsqls":["SELECT WeatherDelay FROM mytable WHERE Carrier NOT IN ('EV', 'HA', 'MQ') OR (DivWheelsOns__MV0 IN (1144, 1259, 1558, 1303) OR DivWheelsOns__MV1 IN (1144, 1259, 1558, 1303) OR DivWheelsOns__MV2 IN (1144, 1259, 1558, 1303) OR DivWheelsOns__MV3 IN (1144, 1259, 1558, 1303) OR DivWheelsOns__MV4 IN (1144, 1259, 1558, 1303)) AND (DivAirportSeqIDs__MV0 IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs__MV1 IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs__MV2 IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs__MV3 IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs__MV4 IN (1120302, 1160302, 1106603)) ORDER BY TotalAddGTime, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE Carrier NOT IN ('EV', 'HA', 'MQ') OR DivWheelsOns IN (1144, 1259, 1558, 1303) AND DivAirportSeqIDs IN (1120302, 1160302, 1106603) ORDER BY TotalAddGTime, CancellationCode LIMIT 16","hsqls":["SELECT WeatherDelay FROM mytable WHERE Carrier NOT IN ('EV', 'HA', 'MQ') OR (DivWheelsOns[1] IN (1144, 1259, 1558, 1303) OR DivWheelsOns[2] IN (1144, 1259, 1558, 1303) OR DivWheelsOns[3] IN (1144, 1259, 1558, 1303) OR DivWheelsOns[4] IN (1144, 1259, 1558, 1303) OR DivWheelsOns[5] IN (1144, 1259, 1558, 1303)) AND (DivAirportSeqIDs[1] IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs[2] IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs[3] IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs[4] IN (1120302, 1160302, 1106603) OR DivAirportSeqIDs[5] IN (1120302, 1160302, 1106603)) ORDER BY TotalAddGTime, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DepDelay, COUNT(*) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 11","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 11"]}
 {"sql":"SELECT SecurityDelay, MIN(DayOfWeek), MIN(FirstDepTime), MAX(ArrTime) FROM mytable WHERE Distance > 928 OR DivAirportLandings NOT IN (2, 1, 0, 9) GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 28","hsqls":["SELECT SecurityDelay, MIN(DayOfWeek), MIN(FirstDepTime), MAX(ArrTime) FROM mytable WHERE Distance > 928 OR DivAirportLandings NOT IN (2, 1, 0, 9) GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 28"]}
 {"sql":"SELECT \"Year\", AirlineID, AVG(TotalAddGTime), AVG(DepDel15) FROM mytable WHERE OriginStateFips BETWEEN 18 AND 42 OR DivDistance = 151 AND TailNum BETWEEN 'N5EGAA' AND 'N24212' GROUP BY \"Year\", AirlineID LIMIT 28","hsqls":["SELECT Year, AirlineID, AVG(TotalAddGTime), AVG(DepDel15) FROM mytable WHERE OriginStateFips BETWEEN 18 AND 42 OR DivDistance = 151 AND TailNum BETWEEN 'N5EGAA' AND 'N24212' GROUP BY Year, AirlineID LIMIT 28"]}
-{"sql":"SELECT DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DivAirports IN ('KTN', 'IND', 'DCA', 'GTF') OR ArrDelay BETWEEN 11.0 AND 105.0 ORDER BY \"Year\", DivReachedDest, TotalAddGTime LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrivalDelayGroups FROM mytable WHERE (DivAirports__MV0 IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports__MV1 IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports__MV2 IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports__MV3 IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports__MV4 IN ('KTN', 'IND', 'DCA', 'GTF')) OR ArrDelay BETWEEN 11.0 AND 105.0 ORDER BY Year, DivReachedDest, TotalAddGTime LIMIT 10000"]}
-{"sql":"SELECT Distance, ArrDelay, COUNT(\"Year\"), AVG(OriginAirportSeqID), SUM(LongestAddGTime) FROM mytable WHERE DayOfWeek IN (2, 7) GROUP BY Distance, ArrDelay LIMIT 9","hsqls":["SELECT Distance, ArrDelay, COUNT(Year), AVG(OriginAirportSeqID), SUM(LongestAddGTime) FROM mytable WHERE DayOfWeek IN (2, 7) GROUP BY Distance, ArrDelay LIMIT 9"]}
+{"sql":"SELECT DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DivAirports IN ('KTN', 'IND', 'DCA', 'GTF') OR ArrDelay BETWEEN 11.0 AND 105.0 ORDER BY \"Year\", DivReachedDest, TotalAddGTime LIMIT 2","hsqls":["SELECT DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE (DivAirports[1] IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports[2] IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports[3] IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports[4] IN ('KTN', 'IND', 'DCA', 'GTF') OR DivAirports[5] IN ('KTN', 'IND', 'DCA', 'GTF')) OR ArrDelay BETWEEN 11.0 AND 105.0 ORDER BY Year, DivReachedDest, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT Distance, ArrDelay, COUNT(\"Year\"), AVG(OriginAirportSeqID), SUM(LongestAddGTime) FROM mytable WHERE DayOfWeek IN (2, 7) GROUP BY Distance, ArrDelay LIMIT 9","hsqls":["SELECT Distance, ArrDelay, COUNT(`Year`), AVG(OriginAirportSeqID), SUM(LongestAddGTime) FROM mytable WHERE DayOfWeek IN (2, 7) GROUP BY Distance, ArrDelay LIMIT 9"]}
 {"sql":"SELECT DestState FROM mytable WHERE DestWac >= 22 OR NASDelay NOT IN (1, 19) ORDER BY DepDelay, DivAirportLandings, OriginStateName LIMIT 10"}
 {"sql":"SELECT MIN(FlightNum), MAX(TaxiOut) FROM mytable WHERE FlightDate <> '2014-01-22' OR CarrierDelay BETWEEN 201 AND 182 LIMIT 7"}
 {"sql":"SELECT LongestAddGTime, MAX(Flights), SUM(OriginAirportID), AVG(WheelsOff) FROM mytable WHERE DestAirportSeqID > 1529502 AND CarrierDelay BETWEEN 343 AND 14 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 29","hsqls":["SELECT LongestAddGTime, MAX(Flights), SUM(OriginAirportID), AVG(WheelsOff) FROM mytable WHERE DestAirportSeqID > 1529502 AND CarrierDelay BETWEEN 343 AND 14 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 29"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CRSDepTime IN (834, 1630, 629) LIMIT 9"}
 {"sql":"SELECT TailNum, AVG(DaysSinceEpoch), MIN(DepartureDelayGroups), COUNT(CarrierDelay) FROM mytable WHERE DepartureDelayGroups BETWEEN 10 AND 1 AND Diverted IN (1, 0) OR Flights BETWEEN 1 AND 1 GROUP BY TailNum  ORDER BY TailNum LIMIT 15","hsqls":["SELECT TailNum, AVG(DaysSinceEpoch), MIN(DepartureDelayGroups), COUNT(CarrierDelay) FROM mytable WHERE DepartureDelayGroups BETWEEN 10 AND 1 AND Diverted IN (1, 0) OR Flights BETWEEN 1 AND 1 GROUP BY TailNum  ORDER BY TailNum LIMIT 15"]}
-{"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY DivReachedDest, \"Month\" LIMIT 24","hsqls":["SELECT DestAirportSeqID FROM mytable ORDER BY DivReachedDest, Month LIMIT 24"]}
+{"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY DivReachedDest, \"Month\" LIMIT 24","hsqls":["SELECT DestAirportSeqID FROM mytable ORDER BY DivReachedDest, `Month` LIMIT 24"]}
 {"sql":"SELECT Carrier, Cancelled, DepTimeBlk FROM mytable WHERE NASDelay IN (54) AND DepartureDelayGroups >= -9999 ORDER BY LongestAddGTime, SecurityDelay LIMIT 10"}
 {"sql":"SELECT CRSElapsedTime FROM mytable ORDER BY NASDelay LIMIT 23"}
-{"sql":"SELECT DivArrDelay FROM mytable WHERE DivLongestGTimes < 85.0 AND DivReachedDest BETWEEN -9999 AND 0 ORDER BY WheelsOff LIMIT 20","hsqls":["SELECT DivArrDelay FROM mytable WHERE (DivLongestGTimes__MV0 < 85.0 OR DivLongestGTimes__MV1 < 85.0 OR DivLongestGTimes__MV2 < 85.0 OR DivLongestGTimes__MV3 < 85.0 OR DivLongestGTimes__MV4 < 85.0) AND DivReachedDest BETWEEN -9999 AND 0 ORDER BY WheelsOff LIMIT 10000"]}
+{"sql":"SELECT DivArrDelay FROM mytable WHERE DivLongestGTimes < 85.0 AND DivReachedDest BETWEEN -9999 AND 0 ORDER BY WheelsOff LIMIT 20","hsqls":["SELECT DivArrDelay FROM mytable WHERE (DivLongestGTimes[1] < 85.0 OR DivLongestGTimes[2] < 85.0 OR DivLongestGTimes[3] < 85.0 OR DivLongestGTimes[4] < 85.0 OR DivLongestGTimes[5] < 85.0) AND DivReachedDest BETWEEN -9999 AND 0 ORDER BY WheelsOff LIMIT 10000"]}
 {"sql":"SELECT MIN(Diverted), MIN(DistanceGroup), MAX(CRSDepTime) FROM mytable WHERE Carrier = 'F9' LIMIT 5"}
-{"sql":"SELECT MAX(OriginAirportSeqID), AVG(DepartureDelayGroups) FROM mytable WHERE DivLongestGTimes IN (74.0) OR TaxiOut BETWEEN 87 AND 30 AND WeatherDelay IN (1) LIMIT 8","hsqls":["SELECT MAX(OriginAirportSeqID), AVG(DepartureDelayGroups)  FROM mytable WHERE (DivLongestGTimes__MV0 IN (74.0) OR DivLongestGTimes__MV1 IN (74.0) OR DivLongestGTimes__MV2 IN (74.0) OR DivLongestGTimes__MV3 IN (74.0) OR DivLongestGTimes__MV4 IN (74.0)) OR TaxiOut BETWEEN 87 AND 30 AND WeatherDelay IN (1) LIMIT 10000"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE DivTotalGTimes IN (145) OR WheelsOff NOT IN (2159, 1001, 114, 1421, 2226) AND NASDelay BETWEEN 32 AND 18 ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT DestCityName FROM mytable WHERE (DivTotalGTimes__MV0 IN (145) OR DivTotalGTimes__MV1 IN (145) OR DivTotalGTimes__MV2 IN (145) OR DivTotalGTimes__MV3 IN (145) OR DivTotalGTimes__MV4 IN (145)) OR WheelsOff NOT IN (2159, 1001, 114, 1421, 2226) AND NASDelay BETWEEN 32 AND 18 ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT MAX(OriginAirportSeqID), AVG(DepartureDelayGroups) FROM mytable WHERE DivLongestGTimes IN (74.0) OR TaxiOut BETWEEN 87 AND 30 AND WeatherDelay IN (1) LIMIT 8","hsqls":["SELECT MAX(OriginAirportSeqID), AVG(DepartureDelayGroups)  FROM mytable WHERE (DivLongestGTimes[1] IN (74.0) OR DivLongestGTimes[2] IN (74.0) OR DivLongestGTimes[3] IN (74.0) OR DivLongestGTimes[4] IN (74.0) OR DivLongestGTimes[5] IN (74.0)) OR TaxiOut BETWEEN 87 AND 30 AND WeatherDelay IN (1) LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE DivTotalGTimes IN (145) OR WheelsOff NOT IN (2159, 1001, 114, 1421, 2226) AND NASDelay BETWEEN 32 AND 18 ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT DestCityName FROM mytable WHERE (DivTotalGTimes[1] IN (145) OR DivTotalGTimes[2] IN (145) OR DivTotalGTimes[3] IN (145) OR DivTotalGTimes[4] IN (145) OR DivTotalGTimes[5] IN (145)) OR WheelsOff NOT IN (2159, 1001, 114, 1421, 2226) AND NASDelay BETWEEN 32 AND 18 ORDER BY DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, DivActualElapsedTime FROM mytable WHERE DivReachedDest IN (1, 0, -9999) OR DestCityMarketID BETWEEN 32320 AND 33495 OR OriginState = 'NM' LIMIT 11"}
-{"sql":"SELECT DivAirports, CancellationCode FROM mytable WHERE DivLongestGTimes IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR FlightDate > '2014-01-02' LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CancellationCode FROM mytable WHERE (DivLongestGTimes__MV0 IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes__MV1 IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes__MV2 IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes__MV3 IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes__MV4 IN (35.0, -9999.0, 51.0, 107.0, 111.0)) OR FlightDate > '2014-01-02' LIMIT 10000"]}
+{"sql":"SELECT DivAirports, CancellationCode FROM mytable WHERE DivLongestGTimes IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR FlightDate > '2014-01-02' LIMIT 10","hsqls":["SELECT DivAirports, CancellationCode FROM mytable WHERE (DivLongestGTimes[1] IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes[2] IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes[3] IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes[4] IN (35.0, -9999.0, 51.0, 107.0, 111.0) OR DivLongestGTimes[5] IN (35.0, -9999.0, 51.0, 107.0, 111.0)) OR FlightDate > '2014-01-02' LIMIT 10000"]}
 {"sql":"SELECT Quarter, CancellationCode, AVG(DestAirportID), SUM(DestAirportID), SUM(ArrTime) FROM mytable WHERE CancellationCode >= 'C' GROUP BY Quarter, CancellationCode  ORDER BY Quarter, CancellationCode LIMIT 28","hsqls":["SELECT Quarter, CancellationCode, AVG(DestAirportID), SUM(DestAirportID), SUM(ArrTime) FROM mytable WHERE CancellationCode >= 'C' GROUP BY Quarter, CancellationCode  ORDER BY Quarter, CancellationCode LIMIT 28"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDel15 = 0 OR ArrDelay > 154.0 OR CancellationCode BETWEEN 'A' AND 'B' LIMIT 23"}
 {"sql":"SELECT OriginWac, DivArrDelay, DivActualElapsedTime FROM mytable LIMIT 12"}
 {"sql":"SELECT Diverted, OriginWac FROM mytable ORDER BY FlightNum LIMIT 8"}
 {"sql":"SELECT DepDelay, ArrDelay, COUNT(TailNum), SUM(Quarter) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 GROUP BY DepDelay, ArrDelay  ORDER BY DepDelay, ArrDelay LIMIT 19","hsqls":["SELECT DepDelay, ArrDelay, COUNT(TailNum), SUM(Quarter) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 GROUP BY DepDelay, ArrDelay  ORDER BY DepDelay, ArrDelay LIMIT 19"]}
-{"sql":"SELECT ActualElapsedTime, OriginWac FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DivTailNums BETWEEN 'N971SW' AND 'N515MQ' ORDER BY DestCityName, UniqueCarrier LIMIT 9","hsqls":["SELECT ActualElapsedTime, OriginWac FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR (DivTailNums__MV0 BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums__MV1 BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums__MV2 BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums__MV3 BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums__MV4 BETWEEN 'N971SW' AND 'N515MQ') ORDER BY DestCityName, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, OriginWac FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DivTailNums BETWEEN 'N971SW' AND 'N515MQ' ORDER BY DestCityName, UniqueCarrier LIMIT 9","hsqls":["SELECT ActualElapsedTime, OriginWac FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR (DivTailNums[1] BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums[2] BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums[3] BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums[4] BETWEEN 'N971SW' AND 'N515MQ' OR DivTailNums[5] BETWEEN 'N971SW' AND 'N515MQ') ORDER BY DestCityName, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginState) FROM mytable LIMIT 21"}
-{"sql":"SELECT DaysSinceEpoch, MIN(CRSDepTime), MAX(\"Month\") FROM mytable WHERE WheelsOn >= 1714 GROUP BY DaysSinceEpoch LIMIT 20","hsqls":["SELECT DaysSinceEpoch, MIN(CRSDepTime), MAX(Month) FROM mytable WHERE WheelsOn >= 1714 GROUP BY DaysSinceEpoch LIMIT 20"]}
+{"sql":"SELECT DaysSinceEpoch, MIN(CRSDepTime), MAX(\"Month\") FROM mytable WHERE WheelsOn >= 1714 GROUP BY DaysSinceEpoch LIMIT 20","hsqls":["SELECT DaysSinceEpoch, MIN(CRSDepTime), MAX(`Month`) FROM mytable WHERE WheelsOn >= 1714 GROUP BY DaysSinceEpoch LIMIT 20"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE CRSDepTime IN (1752, 701, 905, 1012, 1129) ORDER BY CarrierDelay, DayofMonth LIMIT 9"}
 {"sql":"SELECT Origin, COUNT(DistanceGroup), SUM(DepartureDelayGroups), AVG(DepDelayMinutes) FROM mytable WHERE DepDelay NOT IN (-9.0, 316.0, 355.0) AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Origin  ORDER BY Origin LIMIT 21","hsqls":["SELECT Origin, COUNT(DistanceGroup), SUM(DepartureDelayGroups), AVG(DepDelayMinutes) FROM mytable WHERE DepDelay NOT IN (-9.0, 316.0, 355.0) AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Origin  ORDER BY Origin LIMIT 21"]}
-{"sql":"SELECT OriginAirportID, MIN(Quarter), MIN(Cancelled) FROM mytable WHERE DivWheelsOffs > 1309 AND DivTailNums BETWEEN 'N27213' AND 'N5CCAA' GROUP BY OriginAirportID LIMIT 7","hsqls":["SELECT OriginAirportID, MIN(Quarter), MIN(Cancelled) FROM mytable WHERE (DivWheelsOffs__MV0 > 1309 OR DivWheelsOffs__MV1 > 1309 OR DivWheelsOffs__MV2 > 1309 OR DivWheelsOffs__MV3 > 1309 OR DivWheelsOffs__MV4 > 1309) AND (DivTailNums__MV0 BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums__MV1 BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums__MV2 BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums__MV3 BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums__MV4 BETWEEN 'N27213' AND 'N5CCAA') GROUP BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT OriginAirportID, MIN(Quarter), MIN(Cancelled) FROM mytable WHERE DivWheelsOffs > 1309 AND DivTailNums BETWEEN 'N27213' AND 'N5CCAA' GROUP BY OriginAirportID LIMIT 7","hsqls":["SELECT OriginAirportID, MIN(Quarter), MIN(Cancelled) FROM mytable WHERE (DivWheelsOffs[1] > 1309 OR DivWheelsOffs[2] > 1309 OR DivWheelsOffs[3] > 1309 OR DivWheelsOffs[4] > 1309 OR DivWheelsOffs[5] > 1309) AND (DivTailNums[1] BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums[2] BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums[3] BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums[4] BETWEEN 'N27213' AND 'N5CCAA' OR DivTailNums[5] BETWEEN 'N27213' AND 'N5CCAA') GROUP BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT OriginState, AirTime FROM mytable ORDER BY WheelsOn LIMIT 25"}
 {"sql":"SELECT ArrDelay, DestAirportID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1275803 AND 1082103 GROUP BY ArrDelay, DestAirportID  ORDER BY ArrDelay, DestAirportID LIMIT 12","hsqls":["SELECT ArrDelay, DestAirportID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1275803 AND 1082103 GROUP BY ArrDelay, DestAirportID  ORDER BY ArrDelay, DestAirportID LIMIT 12"]}
 {"sql":"SELECT ArrTime, AVG(DayOfWeek), AVG(DepDelay), AVG(WheelsOn) FROM mytable WHERE LateAircraftDelay >= 50 OR UniqueCarrier NOT IN ('WN', 'FL', 'UA', 'AA') GROUP BY ArrTime  ORDER BY ArrTime LIMIT 15","hsqls":["SELECT ArrTime, AVG(DayOfWeek), AVG(DepDelay), AVG(WheelsOn) FROM mytable WHERE LateAircraftDelay >= 50 OR UniqueCarrier NOT IN ('WN', 'FL', 'UA', 'AA') GROUP BY ArrTime  ORDER BY ArrTime LIMIT 15"]}
 {"sql":"SELECT DepartureDelayGroups, WheelsOn, OriginAirportID FROM mytable WHERE DivArrDelay > 94 LIMIT 21"}
 {"sql":"SELECT DepartureDelayGroups, OriginStateName, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, OriginStateName  ORDER BY DepartureDelayGroups, OriginStateName LIMIT 18","hsqls":["SELECT DepartureDelayGroups, OriginStateName, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, OriginStateName  ORDER BY DepartureDelayGroups, OriginStateName LIMIT 18"]}
 {"sql":"SELECT TotalAddGTime, SUM(Cancelled), AVG(DayofMonth), MAX(DivAirportLandings) FROM mytable WHERE Carrier <> 'WN' AND NASDelay BETWEEN 234 AND 2 GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 8","hsqls":["SELECT TotalAddGTime, SUM(Cancelled), AVG(DayofMonth), MAX(DivAirportLandings) FROM mytable WHERE Carrier <> 'WN' AND NASDelay BETWEEN 234 AND 2 GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 8"]}
-{"sql":"SELECT LongestAddGTime, ArrDel15, AVG(TotalAddGTime) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND DivLongestGTimes BETWEEN -9999.0 AND 60.0 GROUP BY LongestAddGTime, ArrDel15 LIMIT 2","hsqls":["SELECT LongestAddGTime, ArrDel15, AVG(CAST(TotalAddGTime AS DOUBLE)) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND (DivLongestGTimes__MV0 BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes__MV1 BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes__MV2 BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes__MV3 BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes__MV4 BETWEEN -9999.0 AND 60.0) GROUP BY LongestAddGTime, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, ArrDel15, AVG(TotalAddGTime) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND DivLongestGTimes BETWEEN -9999.0 AND 60.0 GROUP BY LongestAddGTime, ArrDel15 LIMIT 2","hsqls":["SELECT LongestAddGTime, ArrDel15, AVG(CAST(TotalAddGTime AS DOUBLE)) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) AND (DivLongestGTimes[1] BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes[2] BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes[3] BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes[4] BETWEEN -9999.0 AND 60.0 OR DivLongestGTimes[5] BETWEEN -9999.0 AND 60.0) GROUP BY LongestAddGTime, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE DepDelay > 85.0 OR DivAirportLandings NOT IN (2, 9) ORDER BY DayofMonth LIMIT 19"}
 {"sql":"SELECT FlightNum, OriginStateName FROM mytable WHERE Distance BETWEEN 901 AND 1144 ORDER BY DestState, FlightDate LIMIT 10"}
-{"sql":"SELECT FlightDate, DivTailNums, DivAirportLandings FROM mytable ORDER BY OriginAirportSeqID, DestState LIMIT 16","hsqls":["SELECT FlightDate, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DivAirportLandings FROM mytable ORDER BY OriginAirportSeqID, DestState LIMIT 10000"]}
+{"sql":"SELECT FlightDate, DivTailNums, DivAirportLandings FROM mytable ORDER BY OriginAirportSeqID, DestState LIMIT 16","hsqls":["SELECT FlightDate, DivTailNums, DivAirportLandings FROM mytable ORDER BY OriginAirportSeqID, DestState LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, Flights, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE OriginState >= 'CA' OR NASDelay BETWEEN 36 AND 55 OR OriginCityName <> 'Sitka, AK' GROUP BY CarrierDelay, Flights, ArrivalDelayGroups  ORDER BY CarrierDelay, Flights, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT CarrierDelay, Flights, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE OriginState >= 'CA' OR NASDelay BETWEEN 36 AND 55 OR OriginCityName <> 'Sitka, AK' GROUP BY CarrierDelay, Flights, ArrivalDelayGroups  ORDER BY CarrierDelay, Flights, ArrivalDelayGroups LIMIT 11"]}
-{"sql":"SELECT DivAirportIDs, AirlineID FROM mytable WHERE AirTime < 123 ORDER BY DestCityName, NASDelay, CRSElapsedTime LIMIT 5","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirlineID FROM mytable WHERE AirTime < 123 ORDER BY DestCityName, NASDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, UniqueCarrier, CRSElapsedTime FROM mytable ORDER BY CRSArrTime, DestCityName, DayOfWeek LIMIT 19","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, UniqueCarrier, CRSElapsedTime FROM mytable ORDER BY CRSArrTime, DestCityName, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT DivAirportLandings, DestCityMarketID, DayOfWeek FROM mytable WHERE CancellationCode IN ('C') AND DivAirportIDs IN (12266, 11721, 11122, 10781) AND DepDelayMinutes BETWEEN 211.0 AND 57.0 ORDER BY TotalAddGTime LIMIT 25","hsqls":["SELECT DivAirportLandings, DestCityMarketID, DayOfWeek FROM mytable WHERE CancellationCode IN ('C') AND (DivAirportIDs__MV0 IN (12266, 11721, 11122, 10781) OR DivAirportIDs__MV1 IN (12266, 11721, 11122, 10781) OR DivAirportIDs__MV2 IN (12266, 11721, 11122, 10781) OR DivAirportIDs__MV3 IN (12266, 11721, 11122, 10781) OR DivAirportIDs__MV4 IN (12266, 11721, 11122, 10781)) AND DepDelayMinutes BETWEEN 211.0 AND 57.0 ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, AirlineID FROM mytable WHERE AirTime < 123 ORDER BY DestCityName, NASDelay, CRSElapsedTime LIMIT 5","hsqls":["SELECT DivAirportIDs, AirlineID FROM mytable WHERE AirTime < 123 ORDER BY DestCityName, NASDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, UniqueCarrier, CRSElapsedTime FROM mytable ORDER BY CRSArrTime, DestCityName, DayOfWeek LIMIT 19","hsqls":["SELECT DivAirportSeqIDs, UniqueCarrier, CRSElapsedTime FROM mytable ORDER BY CRSArrTime, DestCityName, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, DestCityMarketID, DayOfWeek FROM mytable WHERE CancellationCode IN ('C') AND DivAirportIDs IN (12266, 11721, 11122, 10781) AND DepDelayMinutes BETWEEN 211.0 AND 57.0 ORDER BY TotalAddGTime LIMIT 25","hsqls":["SELECT DivAirportLandings, DestCityMarketID, DayOfWeek FROM mytable WHERE CancellationCode IN ('C') AND (DivAirportIDs[1] IN (12266, 11721, 11122, 10781) OR DivAirportIDs[2] IN (12266, 11721, 11122, 10781) OR DivAirportIDs[3] IN (12266, 11721, 11122, 10781) OR DivAirportIDs[4] IN (12266, 11721, 11122, 10781) OR DivAirportIDs[5] IN (12266, 11721, 11122, 10781)) AND DepDelayMinutes BETWEEN 211.0 AND 57.0 ORDER BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, Dest FROM mytable WHERE DivDistance BETWEEN 814 AND 39 OR FlightDate IN ('2014-01-13', '2014-01-19', '2014-01-24') OR DepDelay BETWEEN 144.0 AND 276.0 ORDER BY OriginAirportSeqID, NASDelay, DestCityMarketID LIMIT 10"}
 {"sql":"SELECT DivDistance, Flights, DestAirportSeqID FROM mytable WHERE LateAircraftDelay IN (52) OR Diverted BETWEEN 1 AND 1 OR DepDel15 NOT IN (0, -9999) LIMIT 22"}
 {"sql":"SELECT DepartureDelayGroups FROM mytable ORDER BY DivReachedDest, CarrierDelay LIMIT 28"}
@@ -4770,106 +4770,106 @@
 {"sql":"SELECT AirTime, SUM(CRSDepTime) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 6","hsqls":["SELECT AirTime, SUM(CRSDepTime) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 6"]}
 {"sql":"SELECT OriginStateName FROM mytable LIMIT 7"}
 {"sql":"SELECT DepDelay, TailNum, DayofMonth FROM mytable ORDER BY Distance LIMIT 26"}
-{"sql":"SELECT OriginCityMarketID, ActualElapsedTime, DepTimeBlk, COUNT(*) FROM mytable WHERE DivLongestGTimes IN (63.0, 15.0, 37.0) AND DepartureDelayGroups > 10 GROUP BY OriginCityMarketID, ActualElapsedTime, DepTimeBlk LIMIT 17","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, DepTimeBlk, COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 IN (63.0, 15.0, 37.0) OR DivLongestGTimes__MV1 IN (63.0, 15.0, 37.0) OR DivLongestGTimes__MV2 IN (63.0, 15.0, 37.0) OR DivLongestGTimes__MV3 IN (63.0, 15.0, 37.0) OR DivLongestGTimes__MV4 IN (63.0, 15.0, 37.0)) AND DepartureDelayGroups > 10 GROUP BY OriginCityMarketID, ActualElapsedTime, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, ActualElapsedTime, DepTimeBlk, COUNT(*) FROM mytable WHERE DivLongestGTimes IN (63.0, 15.0, 37.0) AND DepartureDelayGroups > 10 GROUP BY OriginCityMarketID, ActualElapsedTime, DepTimeBlk LIMIT 17","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, DepTimeBlk, COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] IN (63.0, 15.0, 37.0) OR DivLongestGTimes[2] IN (63.0, 15.0, 37.0) OR DivLongestGTimes[3] IN (63.0, 15.0, 37.0) OR DivLongestGTimes[4] IN (63.0, 15.0, 37.0) OR DivLongestGTimes[5] IN (63.0, 15.0, 37.0)) AND DepartureDelayGroups > 10 GROUP BY OriginCityMarketID, ActualElapsedTime, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay, COUNT(ArrTimeBlk) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 23","hsqls":["SELECT DivArrDelay, COUNT(ArrTimeBlk) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 23"]}
 {"sql":"SELECT OriginState, Carrier, Dest FROM mytable WHERE DestAirportSeqID BETWEEN 1141303 AND 1198603 OR CRSDepTime NOT IN (300, 1630) ORDER BY DivDistance, DayOfWeek LIMIT 24"}
-{"sql":"SELECT DepDelayMinutes, MIN(\"Year\"), MAX(DivReachedDest) FROM mytable GROUP BY DepDelayMinutes LIMIT 23","hsqls":["SELECT DepDelayMinutes, MIN(Year), MAX(DivReachedDest) FROM mytable GROUP BY DepDelayMinutes LIMIT 23"]}
+{"sql":"SELECT DepDelayMinutes, MIN(\"Year\"), MAX(DivReachedDest) FROM mytable GROUP BY DepDelayMinutes LIMIT 23","hsqls":["SELECT DepDelayMinutes, MIN(`Year`), MAX(DivReachedDest) FROM mytable GROUP BY DepDelayMinutes LIMIT 23"]}
 {"sql":"SELECT MIN(ArrDelayMinutes), MAX(DestWac) FROM mytable WHERE LateAircraftDelay BETWEEN 8 AND 145 OR OriginStateFips BETWEEN 51 AND 13 LIMIT 18"}
 {"sql":"SELECT DepartureDelayGroups, DestStateName, Origin, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, DestStateName, Origin  ORDER BY DepartureDelayGroups, DestStateName, Origin LIMIT 26","hsqls":["SELECT DepartureDelayGroups, DestStateName, Origin, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, DestStateName, Origin  ORDER BY DepartureDelayGroups, DestStateName, Origin LIMIT 26"]}
 {"sql":"SELECT OriginState, CRSArrTime FROM mytable WHERE LateAircraftDelay <= 54 ORDER BY CRSDepTime, DaysSinceEpoch LIMIT 25"}
 {"sql":"SELECT MIN(Diverted), SUM(ActualElapsedTime), AVG(DepTime) FROM mytable WHERE AirTime BETWEEN 355 AND 148 LIMIT 14"}
-{"sql":"SELECT DestStateName, DestAirportID, MIN(OriginAirportID), MIN(DivArrDelay), SUM(DivReachedDest) FROM mytable WHERE DivAirportSeqIDs = 1411302 AND DivReachedDest BETWEEN 1 AND -9999 AND ArrTimeBlk BETWEEN '1600-1659' AND '0900-0959' GROUP BY DestStateName, DestAirportID LIMIT 28","hsqls":["SELECT DestStateName, DestAirportID, MIN(OriginAirportID), MIN(DivArrDelay), SUM(DivReachedDest) FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1411302 OR DivAirportSeqIDs__MV1 = 1411302 OR DivAirportSeqIDs__MV2 = 1411302 OR DivAirportSeqIDs__MV3 = 1411302 OR DivAirportSeqIDs__MV4 = 1411302) AND DivReachedDest BETWEEN 1 AND -9999 AND ArrTimeBlk BETWEEN '1600-1659' AND '0900-0959' GROUP BY DestStateName, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestStateName, DestAirportID, MIN(OriginAirportID), MIN(DivArrDelay), SUM(DivReachedDest) FROM mytable WHERE DivAirportSeqIDs = 1411302 AND DivReachedDest BETWEEN 1 AND -9999 AND ArrTimeBlk BETWEEN '1600-1659' AND '0900-0959' GROUP BY DestStateName, DestAirportID LIMIT 28","hsqls":["SELECT DestStateName, DestAirportID, MIN(OriginAirportID), MIN(DivArrDelay), SUM(DivReachedDest) FROM mytable WHERE (DivAirportSeqIDs[1] = 1411302 OR DivAirportSeqIDs[2] = 1411302 OR DivAirportSeqIDs[3] = 1411302 OR DivAirportSeqIDs[4] = 1411302 OR DivAirportSeqIDs[5] = 1411302) AND DivReachedDest BETWEEN 1 AND -9999 AND ArrTimeBlk BETWEEN '1600-1659' AND '0900-0959' GROUP BY DestStateName, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT \"Year\", ArrDel15, DaysSinceEpoch, SUM(FirstDepTime), SUM(TaxiOut), COUNT(TotalAddGTime) FROM mytable GROUP BY \"Year\", ArrDel15, DaysSinceEpoch LIMIT 1","hsqls":["SELECT Year, ArrDel15, DaysSinceEpoch, SUM(FirstDepTime), SUM(TaxiOut), COUNT(TotalAddGTime) FROM mytable GROUP BY Year, ArrDel15, DaysSinceEpoch LIMIT 1"]}
 {"sql":"SELECT AVG(DepDel15), MIN(DestCityMarketID) FROM mytable WHERE TailNum BETWEEN 'N906AT' AND 'N384DA' LIMIT 8"}
 {"sql":"SELECT LateAircraftDelay, UniqueCarrier, COUNT(AirTime), AVG(ArrDelay) FROM mytable WHERE WeatherDelay NOT IN (-9999) OR DivAirportLandings < 0 GROUP BY LateAircraftDelay, UniqueCarrier  ORDER BY LateAircraftDelay, UniqueCarrier LIMIT 27","hsqls":["SELECT LateAircraftDelay, UniqueCarrier, COUNT(AirTime), AVG(ArrDelay) FROM mytable WHERE WeatherDelay NOT IN (-9999) OR DivAirportLandings < 0 GROUP BY LateAircraftDelay, UniqueCarrier  ORDER BY LateAircraftDelay, UniqueCarrier LIMIT 27"]}
 {"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 20","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 20"]}
 {"sql":"SELECT Origin, DestCityMarketID, ArrivalDelayGroups FROM mytable WHERE OriginCityMarketID < 32547 AND LateAircraftDelay >= 8 AND DivDistance <= 862 LIMIT 1"}
-{"sql":"SELECT WheelsOn FROM mytable WHERE \"Month\" <= 1 ORDER BY AirlineID, DayofMonth LIMIT 27","hsqls":["SELECT WheelsOn FROM mytable WHERE Month <= 1 ORDER BY AirlineID, DayofMonth LIMIT 27"]}
+{"sql":"SELECT WheelsOn FROM mytable WHERE \"Month\" <= 1 ORDER BY AirlineID, DayofMonth LIMIT 27","hsqls":["SELECT WheelsOn FROM mytable WHERE `Month` <= 1 ORDER BY AirlineID, DayofMonth LIMIT 27"]}
 {"sql":"SELECT TaxiIn, COUNT(UniqueCarrier), MAX(ArrDelayMinutes), MAX(DivReachedDest) FROM mytable WHERE CRSArrTime < 530 AND DepTime BETWEEN 547 AND 939 OR Quarter = 1 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10","hsqls":["SELECT TaxiIn, COUNT(UniqueCarrier), MAX(ArrDelayMinutes), MAX(DivReachedDest) FROM mytable WHERE CRSArrTime < 530 AND DepTime BETWEEN 547 AND 939 OR Quarter = 1 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10"]}
-{"sql":"SELECT Carrier FROM mytable WHERE CarrierDelay > 7 AND DivWheelsOffs BETWEEN 1336 AND 1115 LIMIT 15","hsqls":["SELECT Carrier FROM mytable WHERE CarrierDelay > 7 AND (DivWheelsOffs__MV0 BETWEEN 1336 AND 1115 OR DivWheelsOffs__MV1 BETWEEN 1336 AND 1115 OR DivWheelsOffs__MV2 BETWEEN 1336 AND 1115 OR DivWheelsOffs__MV3 BETWEEN 1336 AND 1115 OR DivWheelsOffs__MV4 BETWEEN 1336 AND 1115) LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE DepTime NOT IN (1000) AND TaxiOut NOT IN (10, 36, 70, 11) AND DivAirports BETWEEN 'SYR' AND 'TUL' ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportSeqID LIMIT 20","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DepTime NOT IN (1000) AND TaxiOut NOT IN (10, 36, 70, 11) AND (DivAirports__MV0 BETWEEN 'SYR' AND 'TUL' OR DivAirports__MV1 BETWEEN 'SYR' AND 'TUL' OR DivAirports__MV2 BETWEEN 'SYR' AND 'TUL' OR DivAirports__MV3 BETWEEN 'SYR' AND 'TUL' OR DivAirports__MV4 BETWEEN 'SYR' AND 'TUL') ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT Carrier FROM mytable WHERE CarrierDelay > 7 AND DivWheelsOffs BETWEEN 1336 AND 1115 LIMIT 15","hsqls":["SELECT Carrier FROM mytable WHERE CarrierDelay > 7 AND (DivWheelsOffs[1] BETWEEN 1336 AND 1115 OR DivWheelsOffs[2] BETWEEN 1336 AND 1115 OR DivWheelsOffs[3] BETWEEN 1336 AND 1115 OR DivWheelsOffs[4] BETWEEN 1336 AND 1115 OR DivWheelsOffs[5] BETWEEN 1336 AND 1115) LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DepTime NOT IN (1000) AND TaxiOut NOT IN (10, 36, 70, 11) AND DivAirports BETWEEN 'SYR' AND 'TUL' ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportSeqID LIMIT 20","hsqls":["SELECT DivAirports FROM mytable WHERE DepTime NOT IN (1000) AND TaxiOut NOT IN (10, 36, 70, 11) AND (DivAirports[1] BETWEEN 'SYR' AND 'TUL' OR DivAirports[2] BETWEEN 'SYR' AND 'TUL' OR DivAirports[3] BETWEEN 'SYR' AND 'TUL' OR DivAirports[4] BETWEEN 'SYR' AND 'TUL' OR DivAirports[5] BETWEEN 'SYR' AND 'TUL') ORDER BY LateAircraftDelay, TotalAddGTime, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT Cancelled, COUNT(*) FROM mytable WHERE Flights <> 1 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 4","hsqls":["SELECT Cancelled, COUNT(*) FROM mytable WHERE Flights <> 1 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 4"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 6 AND 26 OR DivAirportLandings BETWEEN 0 AND 0 AND ArrTimeBlk IN ('1300-1359', '0900-0959') ORDER BY LongestAddGTime, FlightDate LIMIT 29","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginStateFips BETWEEN 6 AND 26 OR DivAirportLandings BETWEEN 0 AND 0 AND ArrTimeBlk IN ('1300-1359', '0900-0959') ORDER BY LongestAddGTime, FlightDate LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 6 AND 26 OR DivAirportLandings BETWEEN 0 AND 0 AND ArrTimeBlk IN ('1300-1359', '0900-0959') ORDER BY LongestAddGTime, FlightDate LIMIT 29","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 6 AND 26 OR DivAirportLandings BETWEEN 0 AND 0 AND ArrTimeBlk IN ('1300-1359', '0900-0959') ORDER BY LongestAddGTime, FlightDate LIMIT 10000"]}
 {"sql":"SELECT MAX(ArrDel15), AVG(DivArrDelay), COUNT(DivAirportLandings) FROM mytable WHERE LongestAddGTime IN (54) LIMIT 14"}
 {"sql":"SELECT DepDelayMinutes, DestAirportID FROM mytable WHERE OriginCityMarketID NOT IN (31905, 30615, 30627) OR FirstDepTime >= 1902 ORDER BY DivActualElapsedTime LIMIT 16"}
-{"sql":"SELECT DivDistance, DestState, MAX(DepDelayMinutes), COUNT(WheelsOff), AVG(AirlineID) FROM mytable WHERE DestAirportSeqID IN (1490803) AND DestCityName NOT IN ('Great Falls, MT', 'Cincinnati, OH', 'Medford, OR', 'Atlanta, GA') AND DivTailNums = 'N344NW' GROUP BY DivDistance, DestState LIMIT 17","hsqls":["SELECT DivDistance, DestState, MAX(DepDelayMinutes), COUNT(WheelsOff), AVG(AirlineID) FROM mytable WHERE DestAirportSeqID IN (1490803) AND DestCityName NOT IN ('Great Falls, MT', 'Cincinnati, OH', 'Medford, OR', 'Atlanta, GA') AND (DivTailNums__MV0 = 'N344NW' OR DivTailNums__MV1 = 'N344NW' OR DivTailNums__MV2 = 'N344NW' OR DivTailNums__MV3 = 'N344NW' OR DivTailNums__MV4 = 'N344NW') GROUP BY DivDistance, DestState LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DestState, MAX(DepDelayMinutes), COUNT(WheelsOff), AVG(AirlineID) FROM mytable WHERE DestAirportSeqID IN (1490803) AND DestCityName NOT IN ('Great Falls, MT', 'Cincinnati, OH', 'Medford, OR', 'Atlanta, GA') AND DivTailNums = 'N344NW' GROUP BY DivDistance, DestState LIMIT 17","hsqls":["SELECT DivDistance, DestState, MAX(DepDelayMinutes), COUNT(WheelsOff), AVG(AirlineID) FROM mytable WHERE DestAirportSeqID IN (1490803) AND DestCityName NOT IN ('Great Falls, MT', 'Cincinnati, OH', 'Medford, OR', 'Atlanta, GA') AND (DivTailNums[1] = 'N344NW' OR DivTailNums[2] = 'N344NW' OR DivTailNums[3] = 'N344NW' OR DivTailNums[4] = 'N344NW' OR DivTailNums[5] = 'N344NW') GROUP BY DivDistance, DestState LIMIT 10000"]}
 {"sql":"SELECT DepDelay FROM mytable ORDER BY OriginAirportSeqID LIMIT 10"}
 {"sql":"SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 31 AND 23 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 10","hsqls":["SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 31 AND 23 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 10"]}
-{"sql":"SELECT ArrTimeBlk, \"Month\", COUNT(DaysSinceEpoch), AVG(AirlineID), SUM(OriginStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR ActualElapsedTime NOT IN (124) GROUP BY ArrTimeBlk, \"Month\" LIMIT 10","hsqls":["SELECT ArrTimeBlk, Month, COUNT(DaysSinceEpoch), AVG(AirlineID), SUM(OriginStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR ActualElapsedTime NOT IN (124) GROUP BY ArrTimeBlk, Month LIMIT 10"]}
+{"sql":"SELECT ArrTimeBlk, \"Month\", COUNT(DaysSinceEpoch), AVG(AirlineID), SUM(OriginStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR ActualElapsedTime NOT IN (124) GROUP BY ArrTimeBlk, \"Month\" LIMIT 10","hsqls":["SELECT ArrTimeBlk, Month, COUNT(DaysSinceEpoch), AVG(AirlineID), SUM(OriginStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR ActualElapsedTime NOT IN (124) GROUP BY ArrTimeBlk, `Month` LIMIT 10"]}
 {"sql":"SELECT OriginAirportID FROM mytable ORDER BY DivArrDelay LIMIT 10"}
 {"sql":"SELECT FlightDate FROM mytable WHERE DestCityName BETWEEN 'Santa Barbara, CA' AND 'San Luis Obispo, CA' ORDER BY FirstDepTime LIMIT 7"}
-{"sql":"SELECT TaxiOut, OriginAirportSeqID, DivAirports FROM mytable WHERE TaxiOut BETWEEN 52 AND 45 AND OriginAirportID NOT IN (10170, 12889, 11049, 14576) OR DivDistance BETWEEN 175 AND 196 ORDER BY DestStateFips LIMIT 10","hsqls":["SELECT TaxiOut, OriginAirportSeqID, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE TaxiOut BETWEEN 52 AND 45 AND OriginAirportID NOT IN (10170, 12889, 11049, 14576) OR DivDistance BETWEEN 175 AND 196 ORDER BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, OriginAirportSeqID, DivAirports FROM mytable WHERE TaxiOut BETWEEN 52 AND 45 AND OriginAirportID NOT IN (10170, 12889, 11049, 14576) OR DivDistance BETWEEN 175 AND 196 ORDER BY DestStateFips LIMIT 10","hsqls":["SELECT TaxiOut, OriginAirportSeqID, DivAirports FROM mytable WHERE TaxiOut BETWEEN 52 AND 45 AND OriginAirportID NOT IN (10170, 12889, 11049, 14576) OR DivDistance BETWEEN 175 AND 196 ORDER BY DestStateFips LIMIT 10000"]}
 {"sql":"SELECT Dest, CRSDepTime, MAX(SecurityDelay), MIN(DestStateFips), MAX(OriginWac) FROM mytable WHERE Carrier > 'F9' GROUP BY Dest, CRSDepTime  ORDER BY Dest, CRSDepTime LIMIT 29","hsqls":["SELECT Dest, CRSDepTime, MAX(SecurityDelay), MIN(DestStateFips), MAX(OriginWac) FROM mytable WHERE Carrier > 'F9' GROUP BY Dest, CRSDepTime  ORDER BY Dest, CRSDepTime LIMIT 29"]}
 {"sql":"SELECT MAX(TotalAddGTime), SUM(ArrTime) FROM mytable LIMIT 11"}
-{"sql":"SELECT DepartureDelayGroups, Flights, CRSDepTime, COUNT(SecurityDelay), COUNT(ActualElapsedTime) FROM mytable WHERE OriginCityMarketID NOT IN (30146, 33851, 31002, 31315, 33244) OR DivAirports BETWEEN 'SLC' AND 'STL' GROUP BY DepartureDelayGroups, Flights, CRSDepTime LIMIT 25","hsqls":["SELECT DepartureDelayGroups, Flights, CRSDepTime, COUNT(SecurityDelay), COUNT(ActualElapsedTime) FROM mytable WHERE OriginCityMarketID NOT IN (30146, 33851, 31002, 31315, 33244) OR (DivAirports__MV0 BETWEEN 'SLC' AND 'STL' OR DivAirports__MV1 BETWEEN 'SLC' AND 'STL' OR DivAirports__MV2 BETWEEN 'SLC' AND 'STL' OR DivAirports__MV3 BETWEEN 'SLC' AND 'STL' OR DivAirports__MV4 BETWEEN 'SLC' AND 'STL') GROUP BY DepartureDelayGroups, Flights, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Flights, CRSDepTime, COUNT(SecurityDelay), COUNT(ActualElapsedTime) FROM mytable WHERE OriginCityMarketID NOT IN (30146, 33851, 31002, 31315, 33244) OR DivAirports BETWEEN 'SLC' AND 'STL' GROUP BY DepartureDelayGroups, Flights, CRSDepTime LIMIT 25","hsqls":["SELECT DepartureDelayGroups, Flights, CRSDepTime, COUNT(SecurityDelay), COUNT(ActualElapsedTime) FROM mytable WHERE OriginCityMarketID NOT IN (30146, 33851, 31002, 31315, 33244) OR (DivAirports[1] BETWEEN 'SLC' AND 'STL' OR DivAirports[2] BETWEEN 'SLC' AND 'STL' OR DivAirports[3] BETWEEN 'SLC' AND 'STL' OR DivAirports[4] BETWEEN 'SLC' AND 'STL' OR DivAirports[5] BETWEEN 'SLC' AND 'STL') GROUP BY DepartureDelayGroups, Flights, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE OriginStateName > 'Wyoming' LIMIT 15"}
-{"sql":"SELECT DepTime, \"Month\", COUNT(DepartureDelayGroups), AVG(ArrivalDelayGroups) FROM mytable GROUP BY DepTime, \"Month\" LIMIT 24","hsqls":["SELECT DepTime, Month, COUNT(DepartureDelayGroups), AVG(ArrivalDelayGroups) FROM mytable GROUP BY DepTime, Month LIMIT 24"]}
+{"sql":"SELECT DepTime, \"Month\", COUNT(DepartureDelayGroups), AVG(ArrivalDelayGroups) FROM mytable GROUP BY DepTime, \"Month\" LIMIT 24","hsqls":["SELECT DepTime, Month, COUNT(DepartureDelayGroups), AVG(ArrivalDelayGroups) FROM mytable GROUP BY DepTime, `Month` LIMIT 24"]}
 {"sql":"SELECT MIN(OriginAirportSeqID) FROM mytable WHERE UniqueCarrier NOT IN ('OO', 'MQ') LIMIT 14"}
 {"sql":"SELECT FlightDate, TailNum FROM mytable WHERE Distance BETWEEN 571 AND 438 ORDER BY CRSArrTime, OriginAirportID LIMIT 11"}
 {"sql":"SELECT DepartureDelayGroups, NASDelay, DestAirportID, MIN(OriginWac), MIN(TaxiOut) FROM mytable GROUP BY DepartureDelayGroups, NASDelay, DestAirportID  ORDER BY DepartureDelayGroups, NASDelay, DestAirportID LIMIT 21","hsqls":["SELECT DepartureDelayGroups, NASDelay, DestAirportID, MIN(OriginWac), MIN(TaxiOut) FROM mytable GROUP BY DepartureDelayGroups, NASDelay, DestAirportID  ORDER BY DepartureDelayGroups, NASDelay, DestAirportID LIMIT 21"]}
 {"sql":"SELECT OriginAirportSeqID, OriginStateFips, Dest FROM mytable WHERE DestState < 'IL' AND Origin NOT IN ('DAL', 'SAV') ORDER BY FirstDepTime LIMIT 22"}
-{"sql":"SELECT ArrTime, COUNT(TaxiIn), MIN(DepDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 58.0 AND 22.0 AND DivAirportSeqIDs BETWEEN 1160302 AND 1479402 OR WheelsOff IN (1539, 1830) GROUP BY ArrTime LIMIT 28","hsqls":["SELECT ArrTime, COUNT(TaxiIn), MIN(DepDelay) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 58.0 AND 22.0 OR DivLongestGTimes__MV1 BETWEEN 58.0 AND 22.0 OR DivLongestGTimes__MV2 BETWEEN 58.0 AND 22.0 OR DivLongestGTimes__MV3 BETWEEN 58.0 AND 22.0 OR DivLongestGTimes__MV4 BETWEEN 58.0 AND 22.0) AND (DivAirportSeqIDs__MV0 BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs__MV1 BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs__MV2 BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs__MV3 BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs__MV4 BETWEEN 1160302 AND 1479402) OR WheelsOff IN (1539, 1830) GROUP BY ArrTime LIMIT 10000"]}
-{"sql":"SELECT DestStateName FROM mytable WHERE ActualElapsedTime > 302 OR CRSArrTime BETWEEN 1244 AND 2216 ORDER BY LateAircraftDelay, Origin, \"Month\" LIMIT 27","hsqls":["SELECT DestStateName FROM mytable WHERE ActualElapsedTime > 302 OR CRSArrTime BETWEEN 1244 AND 2216 ORDER BY LateAircraftDelay, Origin, Month LIMIT 27"]}
+{"sql":"SELECT ArrTime, COUNT(TaxiIn), MIN(DepDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 58.0 AND 22.0 AND DivAirportSeqIDs BETWEEN 1160302 AND 1479402 OR WheelsOff IN (1539, 1830) GROUP BY ArrTime LIMIT 28","hsqls":["SELECT ArrTime, COUNT(TaxiIn), MIN(DepDelay) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 58.0 AND 22.0 OR DivLongestGTimes[2] BETWEEN 58.0 AND 22.0 OR DivLongestGTimes[3] BETWEEN 58.0 AND 22.0 OR DivLongestGTimes[4] BETWEEN 58.0 AND 22.0 OR DivLongestGTimes[5] BETWEEN 58.0 AND 22.0) AND (DivAirportSeqIDs[1] BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs[2] BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs[3] BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs[4] BETWEEN 1160302 AND 1479402 OR DivAirportSeqIDs[5] BETWEEN 1160302 AND 1479402) OR WheelsOff IN (1539, 1830) GROUP BY ArrTime LIMIT 10000"]}
+{"sql":"SELECT DestStateName FROM mytable WHERE ActualElapsedTime > 302 OR CRSArrTime BETWEEN 1244 AND 2216 ORDER BY LateAircraftDelay, Origin, \"Month\" LIMIT 27","hsqls":["SELECT DestStateName FROM mytable WHERE ActualElapsedTime > 302 OR CRSArrTime BETWEEN 1244 AND 2216 ORDER BY LateAircraftDelay, Origin, `Month` LIMIT 27"]}
 {"sql":"SELECT Origin FROM mytable LIMIT 15"}
-{"sql":"SELECT DistanceGroup, DivWheelsOns, OriginState FROM mytable WHERE Origin BETWEEN 'ELM' AND 'GCC' ORDER BY DivActualElapsedTime LIMIT 27","hsqls":["SELECT DistanceGroup, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginState FROM mytable WHERE Origin BETWEEN 'ELM' AND 'GCC' ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivWheelsOns, OriginState FROM mytable WHERE Origin BETWEEN 'ELM' AND 'GCC' ORDER BY DivActualElapsedTime LIMIT 27","hsqls":["SELECT DistanceGroup, DivWheelsOns, OriginState FROM mytable WHERE Origin BETWEEN 'ELM' AND 'GCC' ORDER BY DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, COUNT(WheelsOff), MIN(FirstDepTime) FROM mytable WHERE DayOfWeek IN (3, 2, 6, 5, 4) GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 10","hsqls":["SELECT OriginCityMarketID, COUNT(WheelsOff), MIN(FirstDepTime) FROM mytable WHERE DayOfWeek IN (3, 2, 6, 5, 4) GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 10"]}
-{"sql":"SELECT TaxiOut, DepDelay, MAX(ArrDel15), SUM(\"Month\"), MIN(AirlineID) FROM mytable WHERE DestWac BETWEEN 66 AND 11 AND TaxiIn BETWEEN 32 AND 89 AND DepartureDelayGroups IN (4, -9999) GROUP BY TaxiOut, DepDelay LIMIT 28","hsqls":["SELECT TaxiOut, DepDelay, MAX(ArrDel15), SUM(Month), MIN(AirlineID) FROM mytable WHERE DestWac BETWEEN 66 AND 11 AND TaxiIn BETWEEN 32 AND 89 AND DepartureDelayGroups IN (4, -9999) GROUP BY TaxiOut, DepDelay LIMIT 28"]}
-{"sql":"SELECT CarrierDelay, DivAirportSeqIDs FROM mytable WHERE OriginAirportID BETWEEN 12016 AND 10208 AND OriginCityName IN ('Hancock/Houghton, MI', 'Grand Junction, CO', 'New Orleans, LA', 'Louisville, KY') OR ArrDelay <= 137.0 ORDER BY Diverted, ArrTime LIMIT 20","hsqls":["SELECT CarrierDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE OriginAirportID BETWEEN 12016 AND 10208 AND OriginCityName IN ('Hancock/Houghton, MI', 'Grand Junction, CO', 'New Orleans, LA', 'Louisville, KY') OR ArrDelay <= 137.0 ORDER BY Diverted, ArrTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, DestStateName FROM mytable ORDER BY CarrierDelay, ArrDelayMinutes, DestStateName LIMIT 9","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestStateName FROM mytable ORDER BY CarrierDelay, ArrDelayMinutes, DestStateName LIMIT 10000"]}
-{"sql":"SELECT DestState, \"Month\", WheelsOn, AVG(DepDelay), AVG(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 1554 AND 1629 OR FlightNum NOT IN (2936) GROUP BY DestState, \"Month\", WheelsOn LIMIT 11","hsqls":["SELECT DestState, Month, WheelsOn, AVG(DepDelay), AVG(DestWac) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1554 AND 1629 OR DivWheelsOns__MV1 BETWEEN 1554 AND 1629 OR DivWheelsOns__MV2 BETWEEN 1554 AND 1629 OR DivWheelsOns__MV3 BETWEEN 1554 AND 1629 OR DivWheelsOns__MV4 BETWEEN 1554 AND 1629) OR FlightNum NOT IN (2936) GROUP BY DestState, Month, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT DestState, Quarter FROM mytable WHERE WheelsOn = 2230 OR AirlineID BETWEEN 20436 AND 20304 OR DivAirportSeqIDs BETWEEN 1489302 AND 1197302 ORDER BY DepTimeBlk LIMIT 20","hsqls":["SELECT DestState, Quarter FROM mytable WHERE WheelsOn = 2230 OR AirlineID BETWEEN 20436 AND 20304 OR (DivAirportSeqIDs__MV0 BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs__MV1 BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs__MV2 BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs__MV3 BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs__MV4 BETWEEN 1489302 AND 1197302) ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DepDelay, MAX(ArrDel15), SUM(\"Month\"), MIN(AirlineID) FROM mytable WHERE DestWac BETWEEN 66 AND 11 AND TaxiIn BETWEEN 32 AND 89 AND DepartureDelayGroups IN (4, -9999) GROUP BY TaxiOut, DepDelay LIMIT 28","hsqls":["SELECT TaxiOut, DepDelay, MAX(ArrDel15), SUM(`Month`), MIN(AirlineID) FROM mytable WHERE DestWac BETWEEN 66 AND 11 AND TaxiIn BETWEEN 32 AND 89 AND DepartureDelayGroups IN (4, -9999) GROUP BY TaxiOut, DepDelay LIMIT 28"]}
+{"sql":"SELECT CarrierDelay, DivAirportSeqIDs FROM mytable WHERE OriginAirportID BETWEEN 12016 AND 10208 AND OriginCityName IN ('Hancock/Houghton, MI', 'Grand Junction, CO', 'New Orleans, LA', 'Louisville, KY') OR ArrDelay <= 137.0 ORDER BY Diverted, ArrTime LIMIT 20","hsqls":["SELECT CarrierDelay, DivAirportSeqIDs FROM mytable WHERE OriginAirportID BETWEEN 12016 AND 10208 AND OriginCityName IN ('Hancock/Houghton, MI', 'Grand Junction, CO', 'New Orleans, LA', 'Louisville, KY') OR ArrDelay <= 137.0 ORDER BY Diverted, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestStateName FROM mytable ORDER BY CarrierDelay, ArrDelayMinutes, DestStateName LIMIT 9","hsqls":["SELECT DivAirportSeqIDs, DestStateName FROM mytable ORDER BY CarrierDelay, ArrDelayMinutes, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestState, \"Month\", WheelsOn, AVG(DepDelay), AVG(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 1554 AND 1629 OR FlightNum NOT IN (2936) GROUP BY DestState, \"Month\", WheelsOn LIMIT 11","hsqls":["SELECT DestState, Month, WheelsOn, AVG(DepDelay), AVG(DestWac) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1554 AND 1629 OR DivWheelsOns[2] BETWEEN 1554 AND 1629 OR DivWheelsOns[3] BETWEEN 1554 AND 1629 OR DivWheelsOns[4] BETWEEN 1554 AND 1629 OR DivWheelsOns[5] BETWEEN 1554 AND 1629) OR FlightNum NOT IN (2936) GROUP BY DestState, Month, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DestState, Quarter FROM mytable WHERE WheelsOn = 2230 OR AirlineID BETWEEN 20436 AND 20304 OR DivAirportSeqIDs BETWEEN 1489302 AND 1197302 ORDER BY DepTimeBlk LIMIT 20","hsqls":["SELECT DestState, Quarter FROM mytable WHERE WheelsOn = 2230 OR AirlineID BETWEEN 20436 AND 20304 OR (DivAirportSeqIDs[1] BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs[2] BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs[3] BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs[4] BETWEEN 1489302 AND 1197302 OR DivAirportSeqIDs[5] BETWEEN 1489302 AND 1197302) ORDER BY DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT OriginWac, DivArrDelay, AVG(DestStateFips) FROM mytable GROUP BY OriginWac, DivArrDelay  ORDER BY OriginWac, DivArrDelay LIMIT 17","hsqls":["SELECT OriginWac, DivArrDelay, AVG(DestStateFips) FROM mytable GROUP BY OriginWac, DivArrDelay  ORDER BY OriginWac, DivArrDelay LIMIT 17"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE DestStateName <> 'Montana' LIMIT 19"}
 {"sql":"SELECT WheelsOff, \"Year\", CRSDepTime FROM mytable WHERE OriginAirportID BETWEEN 15249 AND 15323 ORDER BY CarrierDelay, OriginAirportID LIMIT 12","hsqls":["SELECT WheelsOff, Year, CRSDepTime FROM mytable WHERE OriginAirportID BETWEEN 15249 AND 15323 ORDER BY CarrierDelay, OriginAirportID LIMIT 12"]}
 {"sql":"SELECT DepDelay, DivAirportLandings, CRSElapsedTime FROM mytable WHERE DayofMonth BETWEEN 4 AND 13 AND DestState IN ('SD', 'IL', 'MA', 'SC') ORDER BY ArrTimeBlk LIMIT 6"}
 {"sql":"SELECT MAX(ArrDel15), SUM(WheelsOff) FROM mytable LIMIT 10"}
 {"sql":"SELECT \"Year\", TaxiIn FROM mytable LIMIT 6","hsqls":["SELECT Year, TaxiIn FROM mytable LIMIT 6"]}
-{"sql":"SELECT DivAirportSeqIDs, AirlineID FROM mytable WHERE ArrTimeBlk BETWEEN '1100-1159' AND '2000-2059' LIMIT 7","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, AirlineID FROM mytable WHERE ArrTimeBlk BETWEEN '1100-1159' AND '2000-2059' LIMIT 10000"]}
-{"sql":"SELECT Flights, WheelsOn, COUNT(DepTime) FROM mytable WHERE DivWheelsOffs > 2007 GROUP BY Flights, WheelsOn LIMIT 9","hsqls":["SELECT Flights, WheelsOn, COUNT(DepTime) FROM mytable WHERE (DivWheelsOffs__MV0 > 2007 OR DivWheelsOffs__MV1 > 2007 OR DivWheelsOffs__MV2 > 2007 OR DivWheelsOffs__MV3 > 2007 OR DivWheelsOffs__MV4 > 2007) GROUP BY Flights, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, AirlineID FROM mytable WHERE ArrTimeBlk BETWEEN '1100-1159' AND '2000-2059' LIMIT 7","hsqls":["SELECT DivAirportSeqIDs, AirlineID FROM mytable WHERE ArrTimeBlk BETWEEN '1100-1159' AND '2000-2059' LIMIT 10000"]}
+{"sql":"SELECT Flights, WheelsOn, COUNT(DepTime) FROM mytable WHERE DivWheelsOffs > 2007 GROUP BY Flights, WheelsOn LIMIT 9","hsqls":["SELECT Flights, WheelsOn, COUNT(DepTime) FROM mytable WHERE (DivWheelsOffs[1] > 2007 OR DivWheelsOffs[2] > 2007 OR DivWheelsOffs[3] > 2007 OR DivWheelsOffs[4] > 2007 OR DivWheelsOffs[5] > 2007) GROUP BY Flights, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, DepDel15, MIN(OriginStateFips), AVG(DayOfWeek) FROM mytable GROUP BY TotalAddGTime, DepDel15  ORDER BY TotalAddGTime, DepDel15 LIMIT 7","hsqls":["SELECT TotalAddGTime, DepDel15, MIN(OriginStateFips), AVG(DayOfWeek) FROM mytable GROUP BY TotalAddGTime, DepDel15  ORDER BY TotalAddGTime, DepDel15 LIMIT 7"]}
 {"sql":"SELECT ArrTime, COUNT(*) FROM mytable WHERE DivDistance IN (135, 666) AND DestWac BETWEEN 53 AND 39 OR WeatherDelay BETWEEN 5 AND 23 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 22","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable WHERE DivDistance IN (135, 666) AND DestWac BETWEEN 53 AND 39 OR WeatherDelay BETWEEN 5 AND 23 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 22"]}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND UniqueCarrier IN ('B6', 'OO') LIMIT 2"}
 {"sql":"SELECT DestWac, OriginCityMarketID, DestStateName, AVG(ArrDelayMinutes) FROM mytable WHERE DivArrDelay BETWEEN 271 AND 308 GROUP BY DestWac, OriginCityMarketID, DestStateName  ORDER BY DestWac, OriginCityMarketID, DestStateName LIMIT 19","hsqls":["SELECT DestWac, OriginCityMarketID, DestStateName, AVG(ArrDelayMinutes) FROM mytable WHERE DivArrDelay BETWEEN 271 AND 308 GROUP BY DestWac, OriginCityMarketID, DestStateName  ORDER BY DestWac, OriginCityMarketID, DestStateName LIMIT 19"]}
-{"sql":"SELECT Origin FROM mytable WHERE TaxiIn < 14 AND Origin NOT IN ('BIL', 'AVP', 'ABQ', 'RAP') AND \"Year\" IN (2014) ORDER BY ArrTime, NASDelay, DestAirportID LIMIT 11","hsqls":["SELECT Origin FROM mytable WHERE TaxiIn < 14 AND Origin NOT IN ('BIL', 'AVP', 'ABQ', 'RAP') AND Year IN (2014) ORDER BY ArrTime, NASDelay, DestAirportID LIMIT 11"]}
+{"sql":"SELECT Origin FROM mytable WHERE TaxiIn < 14 AND Origin NOT IN ('BIL', 'AVP', 'ABQ', 'RAP') AND \"Year\" IN (2014) ORDER BY ArrTime, NASDelay, DestAirportID LIMIT 11","hsqls":["SELECT Origin FROM mytable WHERE TaxiIn < 14 AND Origin NOT IN ('BIL', 'AVP', 'ABQ', 'RAP') AND `Year` IN (2014) ORDER BY ArrTime, NASDelay, DestAirportID LIMIT 11"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDelayMinutes < 135.0 LIMIT 13"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginAirportID IN (11041, 10620, 13891, 14842) LIMIT 5"}
-{"sql":"SELECT DivAirportSeqIDs, DestStateName FROM mytable ORDER BY DestCityName, CancellationCode","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestStateName FROM mytable ORDER BY DestCityName, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestStateName FROM mytable ORDER BY DestCityName, CancellationCode","hsqls":["SELECT DivAirportSeqIDs, DestStateName FROM mytable ORDER BY DestCityName, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DestCityName, DestStateName, COUNT(*) FROM mytable GROUP BY DestCityName, DestStateName  ORDER BY DestCityName, DestStateName LIMIT 14","hsqls":["SELECT DestCityName, DestStateName, COUNT(*) FROM mytable GROUP BY DestCityName, DestStateName  ORDER BY DestCityName, DestStateName LIMIT 14"]}
 {"sql":"SELECT DivReachedDest FROM mytable ORDER BY DistanceGroup, OriginStateFips, WeatherDelay LIMIT 17"}
 {"sql":"SELECT OriginAirportSeqID, Cancelled, OriginAirportID FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 LIMIT 18"}
-{"sql":"SELECT OriginAirportSeqID, DestAirportSeqID, DivArrDelay FROM mytable WHERE DivAirportSeqIDs <= 1039705 AND Carrier BETWEEN 'HA' AND 'UA' ORDER BY CRSArrTime, SecurityDelay, CancellationCode LIMIT 10","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID, DivArrDelay FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1039705 OR DivAirportSeqIDs__MV1 <= 1039705 OR DivAirportSeqIDs__MV2 <= 1039705 OR DivAirportSeqIDs__MV3 <= 1039705 OR DivAirportSeqIDs__MV4 <= 1039705) AND Carrier BETWEEN 'HA' AND 'UA' ORDER BY CRSArrTime, SecurityDelay, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DestAirportSeqID, DivArrDelay FROM mytable WHERE DivAirportSeqIDs <= 1039705 AND Carrier BETWEEN 'HA' AND 'UA' ORDER BY CRSArrTime, SecurityDelay, CancellationCode LIMIT 10","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID, DivArrDelay FROM mytable WHERE (DivAirportSeqIDs[1] <= 1039705 OR DivAirportSeqIDs[2] <= 1039705 OR DivAirportSeqIDs[3] <= 1039705 OR DivAirportSeqIDs[4] <= 1039705 OR DivAirportSeqIDs[5] <= 1039705) AND Carrier BETWEEN 'HA' AND 'UA' ORDER BY CRSArrTime, SecurityDelay, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE FlightNum NOT IN (713) LIMIT 15"}
-{"sql":"SELECT DestCityName FROM mytable WHERE DivTailNums BETWEEN 'N960AT' AND 'N344NW' OR ArrTime IN (2359, 1043, 1801, 2227, 1332) ORDER BY TaxiIn, AirlineID, DaysSinceEpoch","hsqls":["SELECT DestCityName FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums__MV1 BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums__MV2 BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums__MV3 BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums__MV4 BETWEEN 'N960AT' AND 'N344NW') OR ArrTime IN (2359, 1043, 1801, 2227, 1332) ORDER BY TaxiIn, AirlineID, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE DivTailNums BETWEEN 'N960AT' AND 'N344NW' OR ArrTime IN (2359, 1043, 1801, 2227, 1332) ORDER BY TaxiIn, AirlineID, DaysSinceEpoch","hsqls":["SELECT DestCityName FROM mytable WHERE (DivTailNums[1] BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums[2] BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums[3] BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums[4] BETWEEN 'N960AT' AND 'N344NW' OR DivTailNums[5] BETWEEN 'N960AT' AND 'N344NW') OR ArrTime IN (2359, 1043, 1801, 2227, 1332) ORDER BY TaxiIn, AirlineID, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, TotalAddGTime, DivAirportLandings, AVG(WeatherDelay), MIN(FirstDepTime) FROM mytable WHERE WheelsOn BETWEEN 118 AND 725 GROUP BY OriginCityName, TotalAddGTime, DivAirportLandings  ORDER BY OriginCityName, TotalAddGTime, DivAirportLandings LIMIT 18","hsqls":["SELECT OriginCityName, TotalAddGTime, DivAirportLandings, AVG(WeatherDelay), MIN(FirstDepTime) FROM mytable WHERE WheelsOn BETWEEN 118 AND 725 GROUP BY OriginCityName, TotalAddGTime, DivAirportLandings  ORDER BY OriginCityName, TotalAddGTime, DivAirportLandings LIMIT 18"]}
 {"sql":"SELECT DestStateFips, ArrTimeBlk, CancellationCode, MAX(DestAirportID), COUNT(CarrierDelay), MIN(DestStateFips) FROM mytable WHERE DestAirportSeqID < 1334205 GROUP BY DestStateFips, ArrTimeBlk, CancellationCode  ORDER BY DestStateFips, ArrTimeBlk, CancellationCode LIMIT 26","hsqls":["SELECT DestStateFips, ArrTimeBlk, CancellationCode, MAX(DestAirportID), COUNT(CarrierDelay), MIN(DestStateFips) FROM mytable WHERE DestAirportSeqID < 1334205 GROUP BY DestStateFips, ArrTimeBlk, CancellationCode  ORDER BY DestStateFips, ArrTimeBlk, CancellationCode LIMIT 26"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE SecurityDelay NOT IN (1, 10, 0, 18, 14) OR FirstDepTime < 1309 LIMIT 9"}
-{"sql":"SELECT TaxiIn, Origin FROM mytable WHERE DivLongestGTimes IN (63.0, 85.0, 10.0, 110.0, 112.0) AND LongestAddGTime BETWEEN 14 AND 40 AND DestState IN ('OH', 'AZ', 'WY', 'VT') ORDER BY OriginCityMarketID, FlightDate, Origin","hsqls":["SELECT TaxiIn, Origin FROM mytable WHERE (DivLongestGTimes__MV0 IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes__MV1 IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes__MV2 IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes__MV3 IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes__MV4 IN (63.0, 85.0, 10.0, 110.0, 112.0)) AND LongestAddGTime BETWEEN 14 AND 40 AND DestState IN ('OH', 'AZ', 'WY', 'VT') ORDER BY OriginCityMarketID, FlightDate, Origin LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, COUNT(*) FROM mytable WHERE DestCityMarketID BETWEEN 35550 AND 30647 OR DivLongestGTimes BETWEEN 4.0 AND 31.0 AND ArrDelayMinutes BETWEEN 119.0 AND 95.0 GROUP BY TaxiOut LIMIT 5","hsqls":["SELECT TaxiOut, COUNT(*) FROM mytable WHERE DestCityMarketID BETWEEN 35550 AND 30647 OR (DivLongestGTimes__MV0 BETWEEN 4.0 AND 31.0 OR DivLongestGTimes__MV1 BETWEEN 4.0 AND 31.0 OR DivLongestGTimes__MV2 BETWEEN 4.0 AND 31.0 OR DivLongestGTimes__MV3 BETWEEN 4.0 AND 31.0 OR DivLongestGTimes__MV4 BETWEEN 4.0 AND 31.0) AND ArrDelayMinutes BETWEEN 119.0 AND 95.0 GROUP BY TaxiOut LIMIT 10000"]}
-{"sql":"SELECT SUM(Flights) FROM mytable WHERE DestState = 'OR' OR DivAirports IN ('SLC', 'MSO') OR AirlineID > 20398 LIMIT 15","hsqls":["SELECT SUM(Flights) FROM mytable WHERE DestState = 'OR' OR (DivAirports__MV0 IN ('SLC', 'MSO') OR DivAirports__MV1 IN ('SLC', 'MSO') OR DivAirports__MV2 IN ('SLC', 'MSO') OR DivAirports__MV3 IN ('SLC', 'MSO') OR DivAirports__MV4 IN ('SLC', 'MSO')) OR AirlineID > 20398 LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, Origin FROM mytable WHERE DivLongestGTimes IN (63.0, 85.0, 10.0, 110.0, 112.0) AND LongestAddGTime BETWEEN 14 AND 40 AND DestState IN ('OH', 'AZ', 'WY', 'VT') ORDER BY OriginCityMarketID, FlightDate, Origin","hsqls":["SELECT TaxiIn, Origin FROM mytable WHERE (DivLongestGTimes[1] IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes[2] IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes[3] IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes[4] IN (63.0, 85.0, 10.0, 110.0, 112.0) OR DivLongestGTimes[5] IN (63.0, 85.0, 10.0, 110.0, 112.0)) AND LongestAddGTime BETWEEN 14 AND 40 AND DestState IN ('OH', 'AZ', 'WY', 'VT') ORDER BY OriginCityMarketID, FlightDate, Origin LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, COUNT(*) FROM mytable WHERE DestCityMarketID BETWEEN 35550 AND 30647 OR DivLongestGTimes BETWEEN 4.0 AND 31.0 AND ArrDelayMinutes BETWEEN 119.0 AND 95.0 GROUP BY TaxiOut LIMIT 5","hsqls":["SELECT TaxiOut, COUNT(*) FROM mytable WHERE DestCityMarketID BETWEEN 35550 AND 30647 OR (DivLongestGTimes[1] BETWEEN 4.0 AND 31.0 OR DivLongestGTimes[2] BETWEEN 4.0 AND 31.0 OR DivLongestGTimes[3] BETWEEN 4.0 AND 31.0 OR DivLongestGTimes[4] BETWEEN 4.0 AND 31.0 OR DivLongestGTimes[5] BETWEEN 4.0 AND 31.0) AND ArrDelayMinutes BETWEEN 119.0 AND 95.0 GROUP BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT SUM(Flights) FROM mytable WHERE DestState = 'OR' OR DivAirports IN ('SLC', 'MSO') OR AirlineID > 20398 LIMIT 15","hsqls":["SELECT SUM(Flights) FROM mytable WHERE DestState = 'OR' OR (DivAirports[1] IN ('SLC', 'MSO') OR DivAirports[2] IN ('SLC', 'MSO') OR DivAirports[3] IN ('SLC', 'MSO') OR DivAirports[4] IN ('SLC', 'MSO') OR DivAirports[5] IN ('SLC', 'MSO')) OR AirlineID > 20398 LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrDelay), MIN(TotalAddGTime), SUM(OriginCityMarketID) FROM mytable WHERE DestAirportID BETWEEN 15041 AND 15376 AND NASDelay <> 68 LIMIT 27"}
 {"sql":"SELECT DestStateName, DestCityName FROM mytable ORDER BY TotalAddGTime, ArrivalDelayGroups, DayOfWeek LIMIT 21"}
 {"sql":"SELECT DestState, SUM(DestCityMarketID) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 3","hsqls":["SELECT DestState, SUM(DestCityMarketID) FROM mytable GROUP BY DestState  ORDER BY DestState LIMIT 3"]}
 {"sql":"SELECT FirstDepTime, UniqueCarrier FROM mytable LIMIT 29"}
-{"sql":"SELECT OriginAirportSeqID, Distance, DivTailNums FROM mytable LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Distance, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, Distance, DivTailNums FROM mytable LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Distance, DivTailNums FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DestWac, FirstDepTime FROM mytable WHERE ArrTime BETWEEN 1221 AND 6 AND LongestAddGTime < 39 ORDER BY Diverted LIMIT 10"}
 {"sql":"SELECT DestStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes > 120.0 AND OriginWac >= 54 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 12","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes > 120.0 AND OriginWac >= 54 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 12"]}
 {"sql":"SELECT Diverted FROM mytable WHERE DayofMonth NOT IN (20, 4, 18, 15, 14) ORDER BY CancellationCode LIMIT 14"}
-{"sql":"SELECT DivLongestGTimes, ActualElapsedTime FROM mytable WHERE DepDelay BETWEEN 286.0 AND 145.0 ORDER BY AirTime LIMIT 14","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ActualElapsedTime FROM mytable WHERE DepDelay BETWEEN 286.0 AND 145.0 ORDER BY AirTime LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DivDistance, DivAirportSeqIDs FROM mytable WHERE TaxiOut BETWEEN 67 AND 79 AND WheelsOff > 1443 LIMIT 24","hsqls":["SELECT OriginAirportSeqID, DivDistance, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE TaxiOut BETWEEN 67 AND 79 AND WheelsOff > 1443 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ActualElapsedTime FROM mytable WHERE DepDelay BETWEEN 286.0 AND 145.0 ORDER BY AirTime LIMIT 14","hsqls":["SELECT DivLongestGTimes, ActualElapsedTime FROM mytable WHERE DepDelay BETWEEN 286.0 AND 145.0 ORDER BY AirTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivDistance, DivAirportSeqIDs FROM mytable WHERE TaxiOut BETWEEN 67 AND 79 AND WheelsOff > 1443 LIMIT 24","hsqls":["SELECT OriginAirportSeqID, DivDistance, DivAirportSeqIDs FROM mytable WHERE TaxiOut BETWEEN 67 AND 79 AND WheelsOff > 1443 LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, Dest, DepTimeBlk, COUNT(NASDelay) FROM mytable GROUP BY OriginCityMarketID, Dest, DepTimeBlk  ORDER BY OriginCityMarketID, Dest, DepTimeBlk LIMIT 10","hsqls":["SELECT OriginCityMarketID, Dest, DepTimeBlk, COUNT(NASDelay) FROM mytable GROUP BY OriginCityMarketID, Dest, DepTimeBlk  ORDER BY OriginCityMarketID, Dest, DepTimeBlk LIMIT 10"]}
 {"sql":"SELECT OriginCityName, ArrDel15 FROM mytable WHERE Distance = 2447 ORDER BY LateAircraftDelay, DepDel15 LIMIT 11"}
 {"sql":"SELECT TaxiOut, CRSDepTime FROM mytable WHERE ArrDelay = 35.0 OR LongestAddGTime BETWEEN 34 AND 47 LIMIT 10"}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE DestStateFips NOT IN (48, 35, 22, 36, 39) AND CRSElapsedTime > 146 AND DivArrDelay BETWEEN 353 AND 328 ORDER BY Flights LIMIT 11"}
-{"sql":"SELECT AVG(Diverted) FROM mytable WHERE DivAirportIDs > 11921 AND DistanceGroup BETWEEN 6 AND 3 LIMIT 6","hsqls":["SELECT AVG(CAST(Diverted AS DOUBLE)) FROM mytable WHERE (DivAirportIDs__MV0 > 11921 OR DivAirportIDs__MV1 > 11921 OR DivAirportIDs__MV2 > 11921 OR DivAirportIDs__MV3 > 11921 OR DivAirportIDs__MV4 > 11921) AND DistanceGroup BETWEEN 6 AND 3 LIMIT 10000"]}
+{"sql":"SELECT AVG(Diverted) FROM mytable WHERE DivAirportIDs > 11921 AND DistanceGroup BETWEEN 6 AND 3 LIMIT 6","hsqls":["SELECT AVG(CAST(Diverted AS DOUBLE)) FROM mytable WHERE (DivAirportIDs[1] > 11921 OR DivAirportIDs[2] > 11921 OR DivAirportIDs[3] > 11921 OR DivAirportIDs[4] > 11921 OR DivAirportIDs[5] > 11921) AND DistanceGroup BETWEEN 6 AND 3 LIMIT 10000"]}
 {"sql":"SELECT Distance, ArrTimeBlk FROM mytable WHERE TaxiOut BETWEEN 52 AND 108 AND TailNum NOT IN ('N220WN', 'N561SW') AND TaxiIn BETWEEN 33 AND 116 ORDER BY AirlineID, OriginAirportID LIMIT 10"}
 {"sql":"SELECT AVG(ArrDelayMinutes) FROM mytable WHERE ArrTimeBlk IN ('1900-1959', '1800-1859') LIMIT 27"}
 {"sql":"SELECT UniqueCarrier, AVG(NASDelay) FROM mytable WHERE UniqueCarrier NOT IN ('US') OR OriginStateName NOT IN ('Pennsylvania', 'Missouri', 'New Jersey', 'Montana', 'Kansas') AND OriginStateFips NOT IN (21, 49, 42, 19, 55) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 20","hsqls":["SELECT UniqueCarrier, AVG(NASDelay) FROM mytable WHERE UniqueCarrier NOT IN ('US') OR OriginStateName NOT IN ('Pennsylvania', 'Missouri', 'New Jersey', 'Montana', 'Kansas') AND OriginStateFips NOT IN (21, 49, 42, 19, 55) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 20"]}
-{"sql":"SELECT DivLongestGTimes, DepDelayMinutes, CarrierDelay FROM mytable WHERE DayOfWeek IN (3, 6) ORDER BY OriginCityName LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DepDelayMinutes, CarrierDelay FROM mytable WHERE DayOfWeek IN (3, 6) ORDER BY OriginCityName LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, DestCityMarketID, COUNT(OriginAirportID), COUNT(DestAirportID), MAX(\"Month\") FROM mytable WHERE ArrivalDelayGroups IN (-2) GROUP BY DestStateFips, DestCityMarketID LIMIT 22","hsqls":["SELECT DestStateFips, DestCityMarketID, COUNT(OriginAirportID), COUNT(DestAirportID), MAX(Month) FROM mytable WHERE ArrivalDelayGroups IN (-2) GROUP BY DestStateFips, DestCityMarketID LIMIT 22"]}
-{"sql":"SELECT DivAirportSeqIDs, DivAirportLandings, ArrDelay FROM mytable WHERE DivTotalGTimes < 51 AND OriginAirportSeqID NOT IN (1473003) OR \"Month\" IN (1) ORDER BY SecurityDelay, ArrDel15 LIMIT 29","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportLandings, ArrDelay FROM mytable WHERE (DivTotalGTimes__MV0 < 51 OR DivTotalGTimes__MV1 < 51 OR DivTotalGTimes__MV2 < 51 OR DivTotalGTimes__MV3 < 51 OR DivTotalGTimes__MV4 < 51) AND OriginAirportSeqID NOT IN (1473003) OR Month IN (1) ORDER BY SecurityDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DepDelayMinutes, CarrierDelay FROM mytable WHERE DayOfWeek IN (3, 6) ORDER BY OriginCityName LIMIT 4","hsqls":["SELECT DivLongestGTimes, DepDelayMinutes, CarrierDelay FROM mytable WHERE DayOfWeek IN (3, 6) ORDER BY OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DestCityMarketID, COUNT(OriginAirportID), COUNT(DestAirportID), MAX(\"Month\") FROM mytable WHERE ArrivalDelayGroups IN (-2) GROUP BY DestStateFips, DestCityMarketID LIMIT 22","hsqls":["SELECT DestStateFips, DestCityMarketID, COUNT(OriginAirportID), COUNT(DestAirportID), MAX(`Month`) FROM mytable WHERE ArrivalDelayGroups IN (-2) GROUP BY DestStateFips, DestCityMarketID LIMIT 22"]}
+{"sql":"SELECT DivAirportSeqIDs, DivAirportLandings, ArrDelay FROM mytable WHERE DivTotalGTimes < 51 AND OriginAirportSeqID NOT IN (1473003) OR \"Month\" IN (1) ORDER BY SecurityDelay, ArrDel15 LIMIT 29","hsqls":["SELECT DivAirportSeqIDs, DivAirportLandings, ArrDelay FROM mytable WHERE (DivTotalGTimes[1] < 51 OR DivTotalGTimes[2] < 51 OR DivTotalGTimes[3] < 51 OR DivTotalGTimes[4] < 51 OR DivTotalGTimes[5] < 51) AND OriginAirportSeqID NOT IN (1473003) OR `Month` IN (1) ORDER BY SecurityDelay, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DepTime, DepDel15 FROM mytable WHERE ActualElapsedTime > 163 ORDER BY ArrDelayMinutes LIMIT 28"}
 {"sql":"SELECT CarrierDelay, CancellationCode FROM mytable WHERE LateAircraftDelay BETWEEN 291 AND 13 OR CRSArrTime = 652 LIMIT 22"}
-{"sql":"SELECT DepartureDelayGroups, OriginStateFips FROM mytable WHERE DepTime NOT IN (1446, 2148, 1159) AND DivTotalGTimes IN (20, 42, 51, 50) ORDER BY DepartureDelayGroups, Diverted LIMIT 17","hsqls":["SELECT DepartureDelayGroups, OriginStateFips FROM mytable WHERE DepTime NOT IN (1446, 2148, 1159) AND (DivTotalGTimes__MV0 IN (20, 42, 51, 50) OR DivTotalGTimes__MV1 IN (20, 42, 51, 50) OR DivTotalGTimes__MV2 IN (20, 42, 51, 50) OR DivTotalGTimes__MV3 IN (20, 42, 51, 50) OR DivTotalGTimes__MV4 IN (20, 42, 51, 50)) ORDER BY DepartureDelayGroups, Diverted LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, OriginStateFips FROM mytable WHERE DepTime NOT IN (1446, 2148, 1159) AND DivTotalGTimes IN (20, 42, 51, 50) ORDER BY DepartureDelayGroups, Diverted LIMIT 17","hsqls":["SELECT DepartureDelayGroups, OriginStateFips FROM mytable WHERE DepTime NOT IN (1446, 2148, 1159) AND (DivTotalGTimes[1] IN (20, 42, 51, 50) OR DivTotalGTimes[2] IN (20, 42, 51, 50) OR DivTotalGTimes[3] IN (20, 42, 51, 50) OR DivTotalGTimes[4] IN (20, 42, 51, 50) OR DivTotalGTimes[5] IN (20, 42, 51, 50)) ORDER BY DepartureDelayGroups, Diverted LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, FlightDate, TotalAddGTime FROM mytable WHERE TotalAddGTime IN (19, 40) OR ActualElapsedTime >= 97 ORDER BY DepDelayMinutes LIMIT 21"}
 {"sql":"SELECT OriginWac, COUNT(*) FROM mytable WHERE FlightDate <= '2014-01-01' AND DepDel15 BETWEEN -9999 AND 0 AND Carrier > 'MQ' GROUP BY OriginWac  ORDER BY OriginWac LIMIT 2","hsqls":["SELECT OriginWac, COUNT(*) FROM mytable WHERE FlightDate <= '2014-01-01' AND DepDel15 BETWEEN -9999 AND 0 AND Carrier > 'MQ' GROUP BY OriginWac  ORDER BY OriginWac LIMIT 2"]}
 {"sql":"SELECT \"Month\", CRSElapsedTime, DivActualElapsedTime, MIN(DestAirportSeqID), SUM(OriginStateFips) FROM mytable WHERE DestCityMarketID IN (33388, 34783) GROUP BY \"Month\", CRSElapsedTime, DivActualElapsedTime LIMIT 27","hsqls":["SELECT Month, CRSElapsedTime, DivActualElapsedTime, MIN(DestAirportSeqID), SUM(OriginStateFips) FROM mytable WHERE DestCityMarketID IN (33388, 34783) GROUP BY Month, CRSElapsedTime, DivActualElapsedTime LIMIT 27"]}
@@ -4883,55 +4883,55 @@
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 20"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 ORDER BY LateAircraftDelay LIMIT 24"}
 {"sql":"SELECT TotalAddGTime, MAX(ArrivalDelayGroups), SUM(DestAirportID) FROM mytable GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 29","hsqls":["SELECT TotalAddGTime, MAX(ArrivalDelayGroups), SUM(DestAirportID) FROM mytable GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 29"]}
-{"sql":"SELECT Distance FROM mytable WHERE DivAirportSeqIDs BETWEEN 1025702 AND 1221702 AND AirTime NOT IN (204, 40, 33) ORDER BY DestWac, DepDelayMinutes, DivAirportLandings LIMIT 16","hsqls":["SELECT Distance FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs__MV1 BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs__MV2 BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs__MV3 BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs__MV4 BETWEEN 1025702 AND 1221702) AND AirTime NOT IN (204, 40, 33) ORDER BY DestWac, DepDelayMinutes, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT Distance FROM mytable WHERE DivAirportSeqIDs BETWEEN 1025702 AND 1221702 AND AirTime NOT IN (204, 40, 33) ORDER BY DestWac, DepDelayMinutes, DivAirportLandings LIMIT 16","hsqls":["SELECT Distance FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs[2] BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs[3] BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs[4] BETWEEN 1025702 AND 1221702 OR DivAirportSeqIDs[5] BETWEEN 1025702 AND 1221702) AND AirTime NOT IN (204, 40, 33) ORDER BY DestWac, DepDelayMinutes, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, ArrDel15 FROM mytable ORDER BY DepDelay, TotalAddGTime, DestStateName LIMIT 5"}
-{"sql":"SELECT AirTime, COUNT(DayOfWeek) FROM mytable WHERE DivWheelsOffs BETWEEN 1324 AND 34 OR ArrivalDelayGroups <= 12 AND ArrDel15 NOT IN (1, 0, -9999) GROUP BY AirTime LIMIT 11","hsqls":["SELECT AirTime, COUNT(DayOfWeek) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1324 AND 34 OR DivWheelsOffs__MV1 BETWEEN 1324 AND 34 OR DivWheelsOffs__MV2 BETWEEN 1324 AND 34 OR DivWheelsOffs__MV3 BETWEEN 1324 AND 34 OR DivWheelsOffs__MV4 BETWEEN 1324 AND 34) OR ArrivalDelayGroups <= 12 AND ArrDel15 NOT IN (1, 0, -9999) GROUP BY AirTime LIMIT 10000"]}
+{"sql":"SELECT AirTime, COUNT(DayOfWeek) FROM mytable WHERE DivWheelsOffs BETWEEN 1324 AND 34 OR ArrivalDelayGroups <= 12 AND ArrDel15 NOT IN (1, 0, -9999) GROUP BY AirTime LIMIT 11","hsqls":["SELECT AirTime, COUNT(DayOfWeek) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1324 AND 34 OR DivWheelsOffs[2] BETWEEN 1324 AND 34 OR DivWheelsOffs[3] BETWEEN 1324 AND 34 OR DivWheelsOffs[4] BETWEEN 1324 AND 34 OR DivWheelsOffs[5] BETWEEN 1324 AND 34) OR ArrivalDelayGroups <= 12 AND ArrDel15 NOT IN (1, 0, -9999) GROUP BY AirTime LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, COUNT(*) FROM mytable WHERE Carrier <> 'EV' AND Quarter >= 1 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 28","hsqls":["SELECT TaxiIn, COUNT(*) FROM mytable WHERE Carrier <> 'EV' AND Quarter >= 1 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 28"]}
 {"sql":"SELECT SUM(DayofMonth) FROM mytable LIMIT 14"}
 {"sql":"SELECT TaxiOut, FirstDepTime, NASDelay, COUNT(OriginAirportID), SUM(AirlineID), SUM(SecurityDelay) FROM mytable WHERE Origin IN ('IAH', 'LRD', 'SBP', 'SPI', 'LGA') OR DaysSinceEpoch BETWEEN 16075 AND 16083 AND ArrivalDelayGroups IN (7, 4, 11, -9999, 12) GROUP BY TaxiOut, FirstDepTime, NASDelay  ORDER BY TaxiOut, FirstDepTime, NASDelay LIMIT 16","hsqls":["SELECT TaxiOut, FirstDepTime, NASDelay, COUNT(OriginAirportID), SUM(AirlineID), SUM(SecurityDelay) FROM mytable WHERE Origin IN ('IAH', 'LRD', 'SBP', 'SPI', 'LGA') OR DaysSinceEpoch BETWEEN 16075 AND 16083 AND ArrivalDelayGroups IN (7, 4, 11, -9999, 12) GROUP BY TaxiOut, FirstDepTime, NASDelay  ORDER BY TaxiOut, FirstDepTime, NASDelay LIMIT 16"]}
-{"sql":"SELECT ArrTimeBlk, CRSElapsedTime FROM mytable WHERE DivTailNums IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') AND DepartureDelayGroups = 5 OR CancellationCode < 'C' ORDER BY DepTime, DepTimeBlk, DestAirportID LIMIT 7","hsqls":["SELECT ArrTimeBlk, CRSElapsedTime FROM mytable WHERE (DivTailNums__MV0 IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums__MV1 IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums__MV2 IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums__MV3 IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums__MV4 IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL')) AND DepartureDelayGroups = 5 OR CancellationCode < 'C' ORDER BY DepTime, DepTimeBlk, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, CRSElapsedTime FROM mytable WHERE DivTailNums IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') AND DepartureDelayGroups = 5 OR CancellationCode < 'C' ORDER BY DepTime, DepTimeBlk, DestAirportID LIMIT 7","hsqls":["SELECT ArrTimeBlk, CRSElapsedTime FROM mytable WHERE (DivTailNums[1] IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums[2] IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums[3] IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums[4] IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL') OR DivTailNums[5] IN ('N568UA', 'N631MQ', 'N728SW', 'N926DL')) AND DepartureDelayGroups = 5 OR CancellationCode < 'C' ORDER BY DepTime, DepTimeBlk, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, DestStateName, Origin FROM mytable WHERE OriginState <> 'MT' AND ActualElapsedTime <> 188 OR ArrDelayMinutes BETWEEN 12.0 AND 108.0 ORDER BY WheelsOff, LateAircraftDelay, Flights LIMIT 24"}
-{"sql":"SELECT DivLongestGTimes, Cancelled FROM mytable WHERE CRSElapsedTime BETWEEN 247 AND 171 OR Dest NOT IN ('MSY', 'SDF', 'ORD', 'MSP') ORDER BY Carrier, ArrDel15, OriginStateName LIMIT 1","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Cancelled FROM mytable WHERE CRSElapsedTime BETWEEN 247 AND 171 OR Dest NOT IN ('MSY', 'SDF', 'ORD', 'MSP') ORDER BY Carrier, ArrDel15, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Cancelled FROM mytable WHERE CRSElapsedTime BETWEEN 247 AND 171 OR Dest NOT IN ('MSY', 'SDF', 'ORD', 'MSP') ORDER BY Carrier, ArrDel15, OriginStateName LIMIT 1","hsqls":["SELECT DivLongestGTimes, Cancelled FROM mytable WHERE CRSElapsedTime BETWEEN 247 AND 171 OR Dest NOT IN ('MSY', 'SDF', 'ORD', 'MSP') ORDER BY Carrier, ArrDel15, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DestAirportID, AVG(WheelsOn) FROM mytable WHERE OriginStateFips > 50 OR WheelsOn BETWEEN 1543 AND 1334 GROUP BY LongestAddGTime, DestAirportID  ORDER BY LongestAddGTime, DestAirportID LIMIT 10","hsqls":["SELECT LongestAddGTime, DestAirportID, AVG(WheelsOn) FROM mytable WHERE OriginStateFips > 50 OR WheelsOn BETWEEN 1543 AND 1334 GROUP BY LongestAddGTime, DestAirportID  ORDER BY LongestAddGTime, DestAirportID LIMIT 10"]}
 {"sql":"SELECT Distance, COUNT(*) FROM mytable GROUP BY Distance  ORDER BY Distance LIMIT 5","hsqls":["SELECT Distance, COUNT(*) FROM mytable GROUP BY Distance  ORDER BY Distance LIMIT 5"]}
-{"sql":"SELECT Flights, DepDelayMinutes FROM mytable WHERE DestAirportID IN (12945, 13264, 14489, 13891, 13830) OR DivWheelsOffs > 835 OR CRSDepTime IN (2209, 2117, 845, 1528) ORDER BY OriginAirportSeqID LIMIT 3","hsqls":["SELECT Flights, DepDelayMinutes FROM mytable WHERE DestAirportID IN (12945, 13264, 14489, 13891, 13830) OR (DivWheelsOffs__MV0 > 835 OR DivWheelsOffs__MV1 > 835 OR DivWheelsOffs__MV2 > 835 OR DivWheelsOffs__MV3 > 835 OR DivWheelsOffs__MV4 > 835) OR CRSDepTime IN (2209, 2117, 845, 1528) ORDER BY OriginAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT OriginAirportID, MAX(Quarter), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE DivLongestGTimes IN (51.0, 27.0, 52.0, 104.0) OR FirstDepTime >= 736 GROUP BY OriginAirportID LIMIT 15","hsqls":["SELECT OriginAirportID, MAX(Quarter), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE (DivLongestGTimes__MV0 IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes__MV1 IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes__MV2 IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes__MV3 IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes__MV4 IN (51.0, 27.0, 52.0, 104.0)) OR FirstDepTime >= 736 GROUP BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT Flights, DepDelayMinutes FROM mytable WHERE DestAirportID IN (12945, 13264, 14489, 13891, 13830) OR DivWheelsOffs > 835 OR CRSDepTime IN (2209, 2117, 845, 1528) ORDER BY OriginAirportSeqID LIMIT 3","hsqls":["SELECT Flights, DepDelayMinutes FROM mytable WHERE DestAirportID IN (12945, 13264, 14489, 13891, 13830) OR (DivWheelsOffs[1] > 835 OR DivWheelsOffs[2] > 835 OR DivWheelsOffs[3] > 835 OR DivWheelsOffs[4] > 835 OR DivWheelsOffs[5] > 835) OR CRSDepTime IN (2209, 2117, 845, 1528) ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT OriginAirportID, MAX(Quarter), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE DivLongestGTimes IN (51.0, 27.0, 52.0, 104.0) OR FirstDepTime >= 736 GROUP BY OriginAirportID LIMIT 15","hsqls":["SELECT OriginAirportID, MAX(Quarter), SUM(DepTime), AVG(DivArrDelay) FROM mytable WHERE (DivLongestGTimes[1] IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes[2] IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes[3] IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes[4] IN (51.0, 27.0, 52.0, 104.0) OR DivLongestGTimes[5] IN (51.0, 27.0, 52.0, 104.0)) OR FirstDepTime >= 736 GROUP BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, SUM(DestAirportSeqID) FROM mytable WHERE OriginStateName >= 'Colorado' AND AirlineID = 20304 OR TotalAddGTime IN (7, 37, 11) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 22","hsqls":["SELECT DepTimeBlk, SUM(DestAirportSeqID) FROM mytable WHERE OriginStateName >= 'Colorado' AND AirlineID = 20304 OR TotalAddGTime IN (7, 37, 11) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 22"]}
 {"sql":"SELECT OriginWac FROM mytable WHERE Origin = 'BZN' ORDER BY Diverted LIMIT 1"}
 {"sql":"SELECT FlightNum FROM mytable WHERE ArrivalDelayGroups >= 5 ORDER BY Dest, OriginAirportID LIMIT 15"}
-{"sql":"SELECT WheelsOff, FlightNum, MAX(DaysSinceEpoch), MAX(NASDelay), SUM(DayofMonth) FROM mytable WHERE \"Year\" NOT IN (2014) GROUP BY WheelsOff, FlightNum LIMIT 12","hsqls":["SELECT WheelsOff, FlightNum, MAX(DaysSinceEpoch), MAX(NASDelay), SUM(DayofMonth) FROM mytable WHERE Year NOT IN (2014) GROUP BY WheelsOff, FlightNum LIMIT 12"]}
+{"sql":"SELECT WheelsOff, FlightNum, MAX(DaysSinceEpoch), MAX(NASDelay), SUM(DayofMonth) FROM mytable WHERE \"Year\" NOT IN (2014) GROUP BY WheelsOff, FlightNum LIMIT 12","hsqls":["SELECT WheelsOff, FlightNum, MAX(DaysSinceEpoch), MAX(NASDelay), SUM(DayofMonth) FROM mytable WHERE `Year` NOT IN (2014) GROUP BY WheelsOff, FlightNum LIMIT 12"]}
 {"sql":"SELECT \"Year\", FirstDepTime, Origin, COUNT(DivActualElapsedTime) FROM mytable WHERE DestAirportID BETWEEN 12982 AND 15304 GROUP BY \"Year\", FirstDepTime, Origin LIMIT 12","hsqls":["SELECT Year, FirstDepTime, Origin, COUNT(DivActualElapsedTime) FROM mytable WHERE DestAirportID BETWEEN 12982 AND 15304 GROUP BY Year, FirstDepTime, Origin LIMIT 12"]}
-{"sql":"SELECT OriginAirportSeqID, CRSDepTime FROM mytable WHERE DivAirportSeqIDs BETWEEN 1473003 AND 1200302 OR DivTailNums IN ('N13202', 'N687SW', 'N956AT') OR OriginState IN ('LA') ORDER BY LateAircraftDelay, Cancelled, DayOfWeek LIMIT 5","hsqls":["SELECT OriginAirportSeqID, CRSDepTime FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs__MV1 BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs__MV2 BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs__MV3 BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs__MV4 BETWEEN 1473003 AND 1200302) OR (DivTailNums__MV0 IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums__MV1 IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums__MV2 IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums__MV3 IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums__MV4 IN ('N13202', 'N687SW', 'N956AT')) OR OriginState IN ('LA') ORDER BY LateAircraftDelay, Cancelled, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, CRSDepTime FROM mytable WHERE DivAirportSeqIDs BETWEEN 1473003 AND 1200302 OR DivTailNums IN ('N13202', 'N687SW', 'N956AT') OR OriginState IN ('LA') ORDER BY LateAircraftDelay, Cancelled, DayOfWeek LIMIT 5","hsqls":["SELECT OriginAirportSeqID, CRSDepTime FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs[2] BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs[3] BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs[4] BETWEEN 1473003 AND 1200302 OR DivAirportSeqIDs[5] BETWEEN 1473003 AND 1200302) OR (DivTailNums[1] IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums[2] IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums[3] IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums[4] IN ('N13202', 'N687SW', 'N956AT') OR DivTailNums[5] IN ('N13202', 'N687SW', 'N956AT')) OR OriginState IN ('LA') ORDER BY LateAircraftDelay, Cancelled, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, DestStateName, NASDelay FROM mytable WHERE CRSArrTime = 1534 OR TailNum IN ('N480WN') AND WheelsOn IN (1243, 957, 156) ORDER BY ArrTimeBlk, DepDel15 LIMIT 7"}
 {"sql":"SELECT WeatherDelay, DepTime, DestStateName FROM mytable WHERE DepDelay BETWEEN 160.0 AND 125.0 ORDER BY DivReachedDest, DestAirportSeqID, CRSElapsedTime"}
 {"sql":"SELECT DepDelay, MIN(DestCityMarketID), MIN(ArrTime) FROM mytable WHERE DestState <> 'KY' OR DestAirportSeqID > 1541103 OR DepTimeBlk > '1300-1359' GROUP BY DepDelay  ORDER BY DepDelay LIMIT 1","hsqls":["SELECT DepDelay, MIN(DestCityMarketID), MIN(ArrTime) FROM mytable WHERE DestState <> 'KY' OR DestAirportSeqID > 1541103 OR DepTimeBlk > '1300-1359' GROUP BY DepDelay  ORDER BY DepDelay LIMIT 1"]}
-{"sql":"SELECT DivWheelsOns, TotalAddGTime, TailNum FROM mytable WHERE DivAirportSeqIDs IN (1468902) ORDER BY OriginCityMarketID, ArrDel15, DestCityMarketID LIMIT 29","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, TotalAddGTime, TailNum FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1468902) OR DivAirportSeqIDs__MV1 IN (1468902) OR DivAirportSeqIDs__MV2 IN (1468902) OR DivAirportSeqIDs__MV3 IN (1468902) OR DivAirportSeqIDs__MV4 IN (1468902)) ORDER BY OriginCityMarketID, ArrDel15, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, TotalAddGTime, TailNum FROM mytable WHERE DivAirportSeqIDs IN (1468902) ORDER BY OriginCityMarketID, ArrDel15, DestCityMarketID LIMIT 29","hsqls":["SELECT DivWheelsOns, TotalAddGTime, TailNum FROM mytable WHERE (DivAirportSeqIDs[1] IN (1468902) OR DivAirportSeqIDs[2] IN (1468902) OR DivAirportSeqIDs[3] IN (1468902) OR DivAirportSeqIDs[4] IN (1468902) OR DivAirportSeqIDs[5] IN (1468902)) ORDER BY OriginCityMarketID, ArrDel15, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, TaxiIn, AirTime FROM mytable ORDER BY WheelsOff, DayofMonth, DayOfWeek LIMIT 23"}
 {"sql":"SELECT FlightDate, Origin, AirTime, COUNT(*) FROM mytable WHERE DivAirportLandings <= 0 OR Cancelled <= 1 OR LongestAddGTime >= 41 GROUP BY FlightDate, Origin, AirTime  ORDER BY FlightDate, Origin, AirTime LIMIT 29","hsqls":["SELECT FlightDate, Origin, AirTime, COUNT(*) FROM mytable WHERE DivAirportLandings <= 0 OR Cancelled <= 1 OR LongestAddGTime >= 41 GROUP BY FlightDate, Origin, AirTime  ORDER BY FlightDate, Origin, AirTime LIMIT 29"]}
 {"sql":"SELECT AVG(LongestAddGTime), MAX(DivArrDelay) FROM mytable LIMIT 17"}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY ArrDelay LIMIT 6","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY ArrDelay LIMIT 6","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 1707 AND 1121 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 21","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 1707 AND 1121 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 21"]}
 {"sql":"SELECT ArrDelay, CRSElapsedTime FROM mytable WHERE CRSElapsedTime <> 299 OR ArrivalDelayGroups IN (1, 6, -9999) OR AirlineID BETWEEN 20437 AND 20304 ORDER BY DestAirportSeqID LIMIT 16"}
-{"sql":"SELECT DepartureDelayGroups, AirTime, SUM(DepDelayMinutes), COUNT(DivDistance) FROM mytable WHERE DivWheelsOffs BETWEEN 1715 AND 1506 OR AirlineID NOT IN (19977) GROUP BY DepartureDelayGroups, AirTime LIMIT 3","hsqls":["SELECT DepartureDelayGroups, AirTime, SUM(DepDelayMinutes), COUNT(DivDistance) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1715 AND 1506 OR DivWheelsOffs__MV1 BETWEEN 1715 AND 1506 OR DivWheelsOffs__MV2 BETWEEN 1715 AND 1506 OR DivWheelsOffs__MV3 BETWEEN 1715 AND 1506 OR DivWheelsOffs__MV4 BETWEEN 1715 AND 1506) OR AirlineID NOT IN (19977) GROUP BY DepartureDelayGroups, AirTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, AirTime, SUM(DepDelayMinutes), COUNT(DivDistance) FROM mytable WHERE DivWheelsOffs BETWEEN 1715 AND 1506 OR AirlineID NOT IN (19977) GROUP BY DepartureDelayGroups, AirTime LIMIT 3","hsqls":["SELECT DepartureDelayGroups, AirTime, SUM(DepDelayMinutes), COUNT(DivDistance) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1715 AND 1506 OR DivWheelsOffs[2] BETWEEN 1715 AND 1506 OR DivWheelsOffs[3] BETWEEN 1715 AND 1506 OR DivWheelsOffs[4] BETWEEN 1715 AND 1506 OR DivWheelsOffs[5] BETWEEN 1715 AND 1506) OR AirlineID NOT IN (19977) GROUP BY DepartureDelayGroups, AirTime LIMIT 10000"]}
 {"sql":"SELECT SUM(ArrDel15), SUM(OriginCityMarketID) FROM mytable WHERE AirlineID NOT IN (19393) AND AirTime BETWEEN 378 AND 331 LIMIT 6"}
-{"sql":"SELECT DestWac, LongestAddGTime, OriginAirportID FROM mytable WHERE DivWheelsOns > 1712 LIMIT 6","hsqls":["SELECT DestWac, LongestAddGTime, OriginAirportID FROM mytable WHERE (DivWheelsOns__MV0 > 1712 OR DivWheelsOns__MV1 > 1712 OR DivWheelsOns__MV2 > 1712 OR DivWheelsOns__MV3 > 1712 OR DivWheelsOns__MV4 > 1712) LIMIT 10000"]}
+{"sql":"SELECT DestWac, LongestAddGTime, OriginAirportID FROM mytable WHERE DivWheelsOns > 1712 LIMIT 6","hsqls":["SELECT DestWac, LongestAddGTime, OriginAirportID FROM mytable WHERE (DivWheelsOns[1] > 1712 OR DivWheelsOns[2] > 1712 OR DivWheelsOns[3] > 1712 OR DivWheelsOns[4] > 1712 OR DivWheelsOns[5] > 1712) LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, TaxiIn, DayofMonth FROM mytable WHERE ArrDelay = 78.0 AND DepDel15 NOT IN (1) LIMIT 6"}
-{"sql":"SELECT DestStateName, DepTimeBlk, ArrivalDelayGroups, COUNT(ArrDelay) FROM mytable WHERE AirTime <> 404 OR \"Year\" BETWEEN 2014 AND 2014 GROUP BY DestStateName, DepTimeBlk, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT DestStateName, DepTimeBlk, ArrivalDelayGroups, COUNT(ArrDelay) FROM mytable WHERE AirTime <> 404 OR Year BETWEEN 2014 AND 2014 GROUP BY DestStateName, DepTimeBlk, ArrivalDelayGroups LIMIT 7"]}
+{"sql":"SELECT DestStateName, DepTimeBlk, ArrivalDelayGroups, COUNT(ArrDelay) FROM mytable WHERE AirTime <> 404 OR \"Year\" BETWEEN 2014 AND 2014 GROUP BY DestStateName, DepTimeBlk, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT DestStateName, DepTimeBlk, ArrivalDelayGroups, COUNT(ArrDelay) FROM mytable WHERE AirTime <> 404 OR `Year` BETWEEN 2014 AND 2014 GROUP BY DestStateName, DepTimeBlk, ArrivalDelayGroups LIMIT 7"]}
 {"sql":"SELECT CRSArrTime, FlightDate, DivArrDelay, AVG(WeatherDelay) FROM mytable GROUP BY CRSArrTime, FlightDate, DivArrDelay  ORDER BY CRSArrTime, FlightDate, DivArrDelay LIMIT 15","hsqls":["SELECT CRSArrTime, FlightDate, DivArrDelay, AVG(WeatherDelay) FROM mytable GROUP BY CRSArrTime, FlightDate, DivArrDelay  ORDER BY CRSArrTime, FlightDate, DivArrDelay LIMIT 15"]}
-{"sql":"SELECT LateAircraftDelay, TailNum FROM mytable WHERE DestCityMarketID NOT IN (33316, 30141, 33277, 31823) OR \"Month\" BETWEEN 1 AND 1 AND Cancelled BETWEEN 1 AND 0 ORDER BY OriginStateFips, ArrTimeBlk LIMIT 16","hsqls":["SELECT LateAircraftDelay, TailNum FROM mytable WHERE DestCityMarketID NOT IN (33316, 30141, 33277, 31823) OR Month BETWEEN 1 AND 1 AND Cancelled BETWEEN 1 AND 0 ORDER BY OriginStateFips, ArrTimeBlk LIMIT 16"]}
-{"sql":"SELECT DivWheelsOns, OriginCityName FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'HA' ORDER BY ArrDelayMinutes LIMIT 19","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginCityName FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'HA' ORDER BY ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, TailNum FROM mytable WHERE DestCityMarketID NOT IN (33316, 30141, 33277, 31823) OR \"Month\" BETWEEN 1 AND 1 AND Cancelled BETWEEN 1 AND 0 ORDER BY OriginStateFips, ArrTimeBlk LIMIT 16","hsqls":["SELECT LateAircraftDelay, TailNum FROM mytable WHERE DestCityMarketID NOT IN (33316, 30141, 33277, 31823) OR `Month` BETWEEN 1 AND 1 AND Cancelled BETWEEN 1 AND 0 ORDER BY OriginStateFips, ArrTimeBlk LIMIT 16"]}
+{"sql":"SELECT DivWheelsOns, OriginCityName FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'HA' ORDER BY ArrDelayMinutes LIMIT 19","hsqls":["SELECT DivWheelsOns, OriginCityName FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'HA' ORDER BY ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, ArrDel15 FROM mytable WHERE DivActualElapsedTime <> 315 OR DestCityMarketID IN (31905, 32945, 32600, 30792) AND Dest < 'MBS' LIMIT 23"}
 {"sql":"SELECT MAX(FirstDepTime), COUNT(FlightDate), SUM(DepartureDelayGroups) FROM mytable LIMIT 26"}
 {"sql":"SELECT DivActualElapsedTime, COUNT(DepTimeBlk), SUM(DepDelay) FROM mytable WHERE DestWac NOT IN (53, 54, 13, 39, 12) OR LongestAddGTime = 86 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 26","hsqls":["SELECT DivActualElapsedTime, COUNT(DepTimeBlk), SUM(DepDelay) FROM mytable WHERE DestWac NOT IN (53, 54, 13, 39, 12) OR LongestAddGTime = 86 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 26"]}
-{"sql":"SELECT Carrier, DepTimeBlk FROM mytable WHERE DivAirportIDs BETWEEN 11995 AND 15370 ORDER BY CarrierDelay LIMIT 2","hsqls":["SELECT Carrier, DepTimeBlk FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11995 AND 15370 OR DivAirportIDs__MV1 BETWEEN 11995 AND 15370 OR DivAirportIDs__MV2 BETWEEN 11995 AND 15370 OR DivAirportIDs__MV3 BETWEEN 11995 AND 15370 OR DivAirportIDs__MV4 BETWEEN 11995 AND 15370) ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT Carrier, DepTimeBlk FROM mytable WHERE DivAirportIDs BETWEEN 11995 AND 15370 ORDER BY CarrierDelay LIMIT 2","hsqls":["SELECT Carrier, DepTimeBlk FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11995 AND 15370 OR DivAirportIDs[2] BETWEEN 11995 AND 15370 OR DivAirportIDs[3] BETWEEN 11995 AND 15370 OR DivAirportIDs[4] BETWEEN 11995 AND 15370 OR DivAirportIDs[5] BETWEEN 11995 AND 15370) ORDER BY CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable ORDER BY DestAirportSeqID, Dest, DayofMonth LIMIT 24"}
 {"sql":"SELECT WheelsOff, DestAirportSeqID, DayofMonth, AVG(CarrierDelay), MIN(WheelsOff), MIN(AirlineID) FROM mytable WHERE OriginState BETWEEN 'OH' AND 'ID' AND DivAirportLandings BETWEEN 0 AND 2 GROUP BY WheelsOff, DestAirportSeqID, DayofMonth  ORDER BY WheelsOff, DestAirportSeqID, DayofMonth LIMIT 29","hsqls":["SELECT WheelsOff, DestAirportSeqID, DayofMonth, AVG(CarrierDelay), MIN(WheelsOff), MIN(AirlineID) FROM mytable WHERE OriginState BETWEEN 'OH' AND 'ID' AND DivAirportLandings BETWEEN 0 AND 2 GROUP BY WheelsOff, DestAirportSeqID, DayofMonth  ORDER BY WheelsOff, DestAirportSeqID, DayofMonth LIMIT 29"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirports BETWEEN 'GPT' AND 'MAF' AND OriginState NOT IN ('MI', 'PR') OR DestCityName < 'Eagle, CO' LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'GPT' AND 'MAF' OR DivAirports__MV1 BETWEEN 'GPT' AND 'MAF' OR DivAirports__MV2 BETWEEN 'GPT' AND 'MAF' OR DivAirports__MV3 BETWEEN 'GPT' AND 'MAF' OR DivAirports__MV4 BETWEEN 'GPT' AND 'MAF') AND OriginState NOT IN ('MI', 'PR') OR DestCityName < 'Eagle, CO' LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirports BETWEEN 'GPT' AND 'MAF' AND OriginState NOT IN ('MI', 'PR') OR DestCityName < 'Eagle, CO' LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirports[1] BETWEEN 'GPT' AND 'MAF' OR DivAirports[2] BETWEEN 'GPT' AND 'MAF' OR DivAirports[3] BETWEEN 'GPT' AND 'MAF' OR DivAirports[4] BETWEEN 'GPT' AND 'MAF' OR DivAirports[5] BETWEEN 'GPT' AND 'MAF') AND OriginState NOT IN ('MI', 'PR') OR DestCityName < 'Eagle, CO' LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE Carrier IN ('DL', 'HA', 'US', 'FL', 'MQ') OR UniqueCarrier >= 'UA' ORDER BY OriginAirportID LIMIT 25"}
 {"sql":"SELECT DestAirportID, CancellationCode, MAX(CRSElapsedTime) FROM mytable WHERE CRSElapsedTime BETWEEN 99 AND 39 GROUP BY DestAirportID, CancellationCode  ORDER BY DestAirportID, CancellationCode LIMIT 2","hsqls":["SELECT DestAirportID, CancellationCode, MAX(CRSElapsedTime) FROM mytable WHERE CRSElapsedTime BETWEEN 99 AND 39 GROUP BY DestAirportID, CancellationCode  ORDER BY DestAirportID, CancellationCode LIMIT 2"]}
 {"sql":"SELECT TailNum FROM mytable ORDER BY DayofMonth, ArrDelay LIMIT 4"}
 {"sql":"SELECT TotalAddGTime, OriginCityName, ArrDel15 FROM mytable WHERE SecurityDelay >= 8 ORDER BY DepartureDelayGroups, DestWac, DayofMonth LIMIT 13"}
-{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR DivWheelsOns = 1317 LIMIT 11","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR (DivWheelsOns__MV0 = 1317 OR DivWheelsOns__MV1 = 1317 OR DivWheelsOns__MV2 = 1317 OR DivWheelsOns__MV3 = 1317 OR DivWheelsOns__MV4 = 1317) LIMIT 10000"]}
+{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR DivWheelsOns = 1317 LIMIT 11","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR (DivWheelsOns[1] = 1317 OR DivWheelsOns[2] = 1317 OR DivWheelsOns[3] = 1317 OR DivWheelsOns[4] = 1317 OR DivWheelsOns[5] = 1317) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestState = 'WA' AND AirTime <= 97 OR UniqueCarrier BETWEEN 'DL' AND 'AS' LIMIT 12"}
 {"sql":"SELECT Flights FROM mytable WHERE CRSElapsedTime >= 151 ORDER BY FlightDate LIMIT 25"}
 {"sql":"SELECT WheelsOff, DivReachedDest, DivActualElapsedTime, MAX(DayOfWeek), COUNT(WeatherDelay) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 AND ArrDelayMinutes NOT IN (207.0, 119.0, 140.0, 117.0) AND OriginCityName = 'Cedar Rapids/Iowa City, IA' GROUP BY WheelsOff, DivReachedDest, DivActualElapsedTime  ORDER BY WheelsOff, DivReachedDest, DivActualElapsedTime LIMIT 24","hsqls":["SELECT WheelsOff, DivReachedDest, DivActualElapsedTime, MAX(DayOfWeek), COUNT(WeatherDelay) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 AND ArrDelayMinutes NOT IN (207.0, 119.0, 140.0, 117.0) AND OriginCityName = 'Cedar Rapids/Iowa City, IA' GROUP BY WheelsOff, DivReachedDest, DivActualElapsedTime  ORDER BY WheelsOff, DivReachedDest, DivActualElapsedTime LIMIT 24"]}
@@ -4942,63 +4942,63 @@
 {"sql":"SELECT Diverted, ArrTimeBlk, WheelsOn FROM mytable WHERE Distance BETWEEN 704 AND 318 OR ArrDelayMinutes = 269.0 LIMIT 29"}
 {"sql":"SELECT OriginAirportSeqID, CRSArrTime FROM mytable WHERE FlightNum NOT IN (2438, 2642, 2012, 6051) OR DepDelayMinutes <> 973.0 OR WheelsOn BETWEEN 1544 AND 2344 ORDER BY DestStateName, AirlineID, CancellationCode LIMIT 12"}
 {"sql":"SELECT Flights, LongestAddGTime, AVG(ArrivalDelayGroups) FROM mytable WHERE Flights <= 1 GROUP BY Flights, LongestAddGTime  ORDER BY Flights, LongestAddGTime LIMIT 26","hsqls":["SELECT Flights, LongestAddGTime, AVG(ArrivalDelayGroups) FROM mytable WHERE Flights <= 1 GROUP BY Flights, LongestAddGTime  ORDER BY Flights, LongestAddGTime LIMIT 26"]}
-{"sql":"SELECT OriginWac, COUNT(*) FROM mytable WHERE DivWheelsOffs >= 2325 OR OriginCityMarketID NOT IN (31638, 35411, 32441) OR CarrierDelay BETWEEN 72 AND 102 GROUP BY OriginWac LIMIT 16","hsqls":["SELECT OriginWac, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 >= 2325 OR DivWheelsOffs__MV1 >= 2325 OR DivWheelsOffs__MV2 >= 2325 OR DivWheelsOffs__MV3 >= 2325 OR DivWheelsOffs__MV4 >= 2325) OR OriginCityMarketID NOT IN (31638, 35411, 32441) OR CarrierDelay BETWEEN 72 AND 102 GROUP BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT OriginWac, COUNT(*) FROM mytable WHERE DivWheelsOffs >= 2325 OR OriginCityMarketID NOT IN (31638, 35411, 32441) OR CarrierDelay BETWEEN 72 AND 102 GROUP BY OriginWac LIMIT 16","hsqls":["SELECT OriginWac, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] >= 2325 OR DivWheelsOffs[2] >= 2325 OR DivWheelsOffs[3] >= 2325 OR DivWheelsOffs[4] >= 2325 OR DivWheelsOffs[5] >= 2325) OR OriginCityMarketID NOT IN (31638, 35411, 32441) OR CarrierDelay BETWEEN 72 AND 102 GROUP BY OriginWac LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups IN (1) OR WheelsOff >= 1031 LIMIT 1"}
-{"sql":"SELECT WheelsOff, DepDelayMinutes, ArrDelay FROM mytable WHERE DivAirportIDs < 15991 AND CRSElapsedTime IN (223, 35, 324, 449) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY DivReachedDest, OriginCityMarketID, OriginCityName","hsqls":["SELECT WheelsOff, DepDelayMinutes, ArrDelay FROM mytable WHERE (DivAirportIDs__MV0 < 15991 OR DivAirportIDs__MV1 < 15991 OR DivAirportIDs__MV2 < 15991 OR DivAirportIDs__MV3 < 15991 OR DivAirportIDs__MV4 < 15991) AND CRSElapsedTime IN (223, 35, 324, 449) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY DivReachedDest, OriginCityMarketID, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DepDelayMinutes, ArrDelay FROM mytable WHERE DivAirportIDs < 15991 AND CRSElapsedTime IN (223, 35, 324, 449) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY DivReachedDest, OriginCityMarketID, OriginCityName","hsqls":["SELECT WheelsOff, DepDelayMinutes, ArrDelay FROM mytable WHERE (DivAirportIDs[1] < 15991 OR DivAirportIDs[2] < 15991 OR DivAirportIDs[3] < 15991 OR DivAirportIDs[4] < 15991 OR DivAirportIDs[5] < 15991) AND CRSElapsedTime IN (223, 35, 324, 449) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY DivReachedDest, OriginCityMarketID, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, CancellationCode FROM mytable WHERE OriginStateFips <= 9 OR WeatherDelay IN (54, 101) OR CRSElapsedTime BETWEEN 292 AND 238 LIMIT 5"}
 {"sql":"SELECT Cancelled, UniqueCarrier FROM mytable LIMIT 4"}
 {"sql":"SELECT DepDelay FROM mytable WHERE LateAircraftDelay < 159 OR DayofMonth BETWEEN 2 AND 28 AND CarrierDelay NOT IN (455, 201) ORDER BY CarrierDelay, CRSDepTime, DivActualElapsedTime LIMIT 25"}
-{"sql":"SELECT DepDelay, DestAirportSeqID, DivWheelsOffs FROM mytable ORDER BY FlightNum, FlightDate, Cancelled LIMIT 23","hsqls":["SELECT DepDelay, DestAirportSeqID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY FlightNum, FlightDate, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DestAirportSeqID, DivWheelsOffs FROM mytable ORDER BY FlightNum, FlightDate, Cancelled LIMIT 23","hsqls":["SELECT DepDelay, DestAirportSeqID, DivWheelsOffs FROM mytable ORDER BY FlightNum, FlightDate, Cancelled LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DivArrDelay, UniqueCarrier FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16088) ORDER BY ActualElapsedTime, DestAirportSeqID LIMIT 12"}
 {"sql":"SELECT DestAirportSeqID, ArrTimeBlk, UniqueCarrier FROM mytable WHERE TotalAddGTime NOT IN (20, 42, 5, 60) AND DestWac BETWEEN 92 AND 38 OR DestAirportSeqID >= 1385103 ORDER BY WeatherDelay LIMIT 1"}
-{"sql":"SELECT DepDel15, OriginWac, COUNT(*) FROM mytable WHERE \"Year\" >= 2014 OR OriginStateFips BETWEEN 27 AND 5 GROUP BY DepDel15, OriginWac LIMIT 8","hsqls":["SELECT DepDel15, OriginWac, COUNT(*) FROM mytable WHERE Year >= 2014 OR OriginStateFips BETWEEN 27 AND 5 GROUP BY DepDel15, OriginWac LIMIT 8"]}
-{"sql":"SELECT WheelsOn FROM mytable WHERE DivWheelsOffs < 1908 ORDER BY DepTime LIMIT 4","hsqls":["SELECT WheelsOn FROM mytable WHERE (DivWheelsOffs__MV0 < 1908 OR DivWheelsOffs__MV1 < 1908 OR DivWheelsOffs__MV2 < 1908 OR DivWheelsOffs__MV3 < 1908 OR DivWheelsOffs__MV4 < 1908) ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT DepDel15, OriginWac, COUNT(*) FROM mytable WHERE \"Year\" >= 2014 OR OriginStateFips BETWEEN 27 AND 5 GROUP BY DepDel15, OriginWac LIMIT 8","hsqls":["SELECT DepDel15, OriginWac, COUNT(*) FROM mytable WHERE `Year` >= 2014 OR OriginStateFips BETWEEN 27 AND 5 GROUP BY DepDel15, OriginWac LIMIT 8"]}
+{"sql":"SELECT WheelsOn FROM mytable WHERE DivWheelsOffs < 1908 ORDER BY DepTime LIMIT 4","hsqls":["SELECT WheelsOn FROM mytable WHERE (DivWheelsOffs[1] < 1908 OR DivWheelsOffs[2] < 1908 OR DivWheelsOffs[3] < 1908 OR DivWheelsOffs[4] < 1908 OR DivWheelsOffs[5] < 1908) ORDER BY DepTime LIMIT 10000"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE DaysSinceEpoch BETWEEN 16088 AND 16096 ORDER BY DivAirportLandings"}
-{"sql":"SELECT CRSArrTime, ArrTimeBlk, DepTimeBlk, COUNT(DayofMonth), COUNT(AirTime), MIN(Distance) FROM mytable WHERE DivReachedDest <> -9999 OR DestWac NOT IN (33) AND DivLongestGTimes < 58.0 GROUP BY CRSArrTime, ArrTimeBlk, DepTimeBlk LIMIT 10","hsqls":["SELECT CRSArrTime, ArrTimeBlk, DepTimeBlk, COUNT(DayofMonth), COUNT(AirTime), MIN(Distance) FROM mytable WHERE DivReachedDest <> -9999 OR DestWac NOT IN (33) AND (DivLongestGTimes__MV0 < 58.0 OR DivLongestGTimes__MV1 < 58.0 OR DivLongestGTimes__MV2 < 58.0 OR DivLongestGTimes__MV3 < 58.0 OR DivLongestGTimes__MV4 < 58.0) GROUP BY CRSArrTime, ArrTimeBlk, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, ArrTimeBlk, DepTimeBlk, COUNT(DayofMonth), COUNT(AirTime), MIN(Distance) FROM mytable WHERE DivReachedDest <> -9999 OR DestWac NOT IN (33) AND DivLongestGTimes < 58.0 GROUP BY CRSArrTime, ArrTimeBlk, DepTimeBlk LIMIT 10","hsqls":["SELECT CRSArrTime, ArrTimeBlk, DepTimeBlk, COUNT(DayofMonth), COUNT(AirTime), MIN(Distance) FROM mytable WHERE DivReachedDest <> -9999 OR DestWac NOT IN (33) AND (DivLongestGTimes[1] < 58.0 OR DivLongestGTimes[2] < 58.0 OR DivLongestGTimes[3] < 58.0 OR DivLongestGTimes[4] < 58.0 OR DivLongestGTimes[5] < 58.0) GROUP BY CRSArrTime, ArrTimeBlk, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, Cancelled, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, Cancelled  ORDER BY DestAirportSeqID, Cancelled LIMIT 17","hsqls":["SELECT DestAirportSeqID, Cancelled, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, Cancelled  ORDER BY DestAirportSeqID, Cancelled LIMIT 17"]}
 {"sql":"SELECT MAX(Quarter), SUM(DepDelay) FROM mytable LIMIT 25"}
-{"sql":"SELECT DepartureDelayGroups, FlightDate, DivActualElapsedTime, COUNT(DepDel15), COUNT(\"Month\"), SUM(OriginCityMarketID) FROM mytable WHERE DayofMonth BETWEEN 21 AND 12 GROUP BY DepartureDelayGroups, FlightDate, DivActualElapsedTime LIMIT 18","hsqls":["SELECT DepartureDelayGroups, FlightDate, DivActualElapsedTime, COUNT(DepDel15), COUNT(Month), SUM(OriginCityMarketID) FROM mytable WHERE DayofMonth BETWEEN 21 AND 12 GROUP BY DepartureDelayGroups, FlightDate, DivActualElapsedTime LIMIT 18"]}
+{"sql":"SELECT DepartureDelayGroups, FlightDate, DivActualElapsedTime, COUNT(DepDel15), COUNT(\"Month\"), SUM(OriginCityMarketID) FROM mytable WHERE DayofMonth BETWEEN 21 AND 12 GROUP BY DepartureDelayGroups, FlightDate, DivActualElapsedTime LIMIT 18","hsqls":["SELECT DepartureDelayGroups, FlightDate, DivActualElapsedTime, COUNT(DepDel15), COUNT(`Month`), SUM(OriginCityMarketID) FROM mytable WHERE DayofMonth BETWEEN 21 AND 12 GROUP BY DepartureDelayGroups, FlightDate, DivActualElapsedTime LIMIT 18"]}
 {"sql":"SELECT Carrier FROM mytable ORDER BY DivAirportLandings, DaysSinceEpoch LIMIT 11"}
-{"sql":"SELECT FlightNum, Flights, CancellationCode, SUM(DepDelayMinutes), AVG(Cancelled), AVG(OriginAirportID) FROM mytable WHERE DivAirports IN ('FLL', 'MOT', 'YYZ') GROUP BY FlightNum, Flights, CancellationCode LIMIT 15","hsqls":["SELECT FlightNum, Flights, CancellationCode, SUM(DepDelayMinutes), AVG(Cancelled), AVG(OriginAirportID) FROM mytable WHERE (DivAirports__MV0 IN ('FLL', 'MOT', 'YYZ') OR DivAirports__MV1 IN ('FLL', 'MOT', 'YYZ') OR DivAirports__MV2 IN ('FLL', 'MOT', 'YYZ') OR DivAirports__MV3 IN ('FLL', 'MOT', 'YYZ') OR DivAirports__MV4 IN ('FLL', 'MOT', 'YYZ')) GROUP BY FlightNum, Flights, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT FlightNum, Flights, CancellationCode, SUM(DepDelayMinutes), AVG(Cancelled), AVG(OriginAirportID) FROM mytable WHERE DivAirports IN ('FLL', 'MOT', 'YYZ') GROUP BY FlightNum, Flights, CancellationCode LIMIT 15","hsqls":["SELECT FlightNum, Flights, CancellationCode, SUM(DepDelayMinutes), AVG(Cancelled), AVG(OriginAirportID) FROM mytable WHERE (DivAirports[1] IN ('FLL', 'MOT', 'YYZ') OR DivAirports[2] IN ('FLL', 'MOT', 'YYZ') OR DivAirports[3] IN ('FLL', 'MOT', 'YYZ') OR DivAirports[4] IN ('FLL', 'MOT', 'YYZ') OR DivAirports[5] IN ('FLL', 'MOT', 'YYZ')) GROUP BY FlightNum, Flights, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT AVG(DayOfWeek), COUNT(ActualElapsedTime) FROM mytable WHERE TaxiIn IN (2, 48, 7) OR DepTime <> 2151 LIMIT 1"}
-{"sql":"SELECT DayOfWeek, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DestCityMarketID BETWEEN 31401 AND 34828 GROUP BY DayOfWeek LIMIT 22","hsqls":["SELECT DayOfWeek, COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DestCityMarketID BETWEEN 31401 AND 34828 GROUP BY DayOfWeek LIMIT 22"]}
+{"sql":"SELECT DayOfWeek, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DestCityMarketID BETWEEN 31401 AND 34828 GROUP BY DayOfWeek LIMIT 22","hsqls":["SELECT DayOfWeek, COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DestCityMarketID BETWEEN 31401 AND 34828 GROUP BY DayOfWeek LIMIT 22"]}
 {"sql":"SELECT DepTime, MAX(FirstDepTime), AVG(Diverted), MIN(Cancelled) FROM mytable GROUP BY DepTime","hsqls":["SELECT DepTime, MAX(FirstDepTime), AVG(Diverted), MIN(Cancelled) FROM mytable GROUP BY DepTime"]}
-{"sql":"SELECT TaxiOut, LateAircraftDelay, DivAirportIDs FROM mytable WHERE DayofMonth IN (29) OR WheelsOff NOT IN (1931) ORDER BY DestAirportSeqID LIMIT 22","hsqls":["SELECT TaxiOut, LateAircraftDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DayofMonth IN (29) OR WheelsOff NOT IN (1931) ORDER BY DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, LateAircraftDelay, DivAirportIDs FROM mytable WHERE DayofMonth IN (29) OR WheelsOff NOT IN (1931) ORDER BY DestAirportSeqID LIMIT 22","hsqls":["SELECT TaxiOut, LateAircraftDelay, DivAirportIDs FROM mytable WHERE DayofMonth IN (29) OR WheelsOff NOT IN (1931) ORDER BY DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DivDistance, DivArrDelay, MAX(WheelsOn), MAX(OriginCityMarketID), MIN(DestCityMarketID) FROM mytable WHERE AirlineID = 20355 AND OriginCityMarketID BETWEEN 33195 AND 31140 GROUP BY DivDistance, DivArrDelay  ORDER BY DivDistance, DivArrDelay LIMIT 17","hsqls":["SELECT DivDistance, DivArrDelay, MAX(WheelsOn), MAX(OriginCityMarketID), MIN(DestCityMarketID) FROM mytable WHERE AirlineID = 20355 AND OriginCityMarketID BETWEEN 33195 AND 31140 GROUP BY DivDistance, DivArrDelay  ORDER BY DivDistance, DivArrDelay LIMIT 17"]}
 {"sql":"SELECT DivReachedDest, OriginStateName, DayOfWeek, COUNT(OriginCityMarketID), AVG(FirstDepTime), MIN(ArrTime) FROM mytable WHERE Distance BETWEEN 622 AND 383 OR DestStateFips <> 36 GROUP BY DivReachedDest, OriginStateName, DayOfWeek  ORDER BY DivReachedDest, OriginStateName, DayOfWeek LIMIT 11","hsqls":["SELECT DivReachedDest, OriginStateName, DayOfWeek, COUNT(OriginCityMarketID), AVG(FirstDepTime), MIN(ArrTime) FROM mytable WHERE Distance BETWEEN 622 AND 383 OR DestStateFips <> 36 GROUP BY DivReachedDest, OriginStateName, DayOfWeek  ORDER BY DivReachedDest, OriginStateName, DayOfWeek LIMIT 11"]}
 {"sql":"SELECT DaysSinceEpoch, MAX(ArrDelayMinutes) FROM mytable GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 26","hsqls":["SELECT DaysSinceEpoch, MAX(ArrDelayMinutes) FROM mytable GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 26"]}
 {"sql":"SELECT Carrier, DivActualElapsedTime FROM mytable LIMIT 29"}
 {"sql":"SELECT OriginCityName, DepDel15, AirTime FROM mytable WHERE DivDistance IN (158) OR DestAirportSeqID < 1470903 ORDER BY DepTimeBlk LIMIT 9"}
 {"sql":"SELECT DivReachedDest FROM mytable ORDER BY UniqueCarrier, OriginAirportID LIMIT 11"}
-{"sql":"SELECT ArrDel15, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE DistanceGroup < 5 ORDER BY ArrDelayMinutes, DestCityName LIMIT 28","hsqls":["SELECT ArrDel15, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DistanceGroup < 5 ORDER BY ArrDelayMinutes, DestCityName LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE DistanceGroup < 5 ORDER BY ArrDelayMinutes, DestCityName LIMIT 28","hsqls":["SELECT ArrDel15, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE DistanceGroup < 5 ORDER BY ArrDelayMinutes, DestCityName LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE TaxiOut BETWEEN 80 AND 63 OR WheelsOff BETWEEN 1817 AND 1227 LIMIT 7"}
 {"sql":"SELECT NASDelay, DestCityMarketID, DivArrDelay, MIN(DayOfWeek) FROM mytable GROUP BY NASDelay, DestCityMarketID, DivArrDelay  ORDER BY NASDelay, DestCityMarketID, DivArrDelay LIMIT 14","hsqls":["SELECT NASDelay, DestCityMarketID, DivArrDelay, MIN(DayOfWeek) FROM mytable GROUP BY NASDelay, DestCityMarketID, DivArrDelay  ORDER BY NASDelay, DestCityMarketID, DivArrDelay LIMIT 14"]}
-{"sql":"SELECT Flights, CRSArrTime, Cancelled FROM mytable WHERE DestStateName NOT IN ('Puerto Rico', 'Alaska', 'California', 'Oregon', 'Washington') OR DivAirportSeqIDs IN (1245102, 1161802) ORDER BY OriginStateFips, OriginCityMarketID, UniqueCarrier LIMIT 6","hsqls":["SELECT Flights, CRSArrTime, Cancelled FROM mytable WHERE DestStateName NOT IN ('Puerto Rico', 'Alaska', 'California', 'Oregon', 'Washington') OR (DivAirportSeqIDs__MV0 IN (1245102, 1161802) OR DivAirportSeqIDs__MV1 IN (1245102, 1161802) OR DivAirportSeqIDs__MV2 IN (1245102, 1161802) OR DivAirportSeqIDs__MV3 IN (1245102, 1161802) OR DivAirportSeqIDs__MV4 IN (1245102, 1161802)) ORDER BY OriginStateFips, OriginCityMarketID, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT Flights, CRSArrTime, Cancelled FROM mytable WHERE DestStateName NOT IN ('Puerto Rico', 'Alaska', 'California', 'Oregon', 'Washington') OR DivAirportSeqIDs IN (1245102, 1161802) ORDER BY OriginStateFips, OriginCityMarketID, UniqueCarrier LIMIT 6","hsqls":["SELECT Flights, CRSArrTime, Cancelled FROM mytable WHERE DestStateName NOT IN ('Puerto Rico', 'Alaska', 'California', 'Oregon', 'Washington') OR (DivAirportSeqIDs[1] IN (1245102, 1161802) OR DivAirportSeqIDs[2] IN (1245102, 1161802) OR DivAirportSeqIDs[3] IN (1245102, 1161802) OR DivAirportSeqIDs[4] IN (1245102, 1161802) OR DivAirportSeqIDs[5] IN (1245102, 1161802)) ORDER BY OriginStateFips, OriginCityMarketID, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT Diverted, Dest, DivAirportLandings FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'AA' OR Quarter IN (1) ORDER BY WeatherDelay LIMIT 25"}
-{"sql":"SELECT DepartureDelayGroups, DestState, CRSElapsedTime FROM mytable WHERE DivWheelsOffs = 1839 OR DepDel15 >= 0 LIMIT 11","hsqls":["SELECT DepartureDelayGroups, DestState, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs__MV0 = 1839 OR DivWheelsOffs__MV1 = 1839 OR DivWheelsOffs__MV2 = 1839 OR DivWheelsOffs__MV3 = 1839 OR DivWheelsOffs__MV4 = 1839) OR DepDel15 >= 0 LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DestState, CRSElapsedTime FROM mytable WHERE DivWheelsOffs = 1839 OR DepDel15 >= 0 LIMIT 11","hsqls":["SELECT DepartureDelayGroups, DestState, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs[1] = 1839 OR DivWheelsOffs[2] = 1839 OR DivWheelsOffs[3] = 1839 OR DivWheelsOffs[4] = 1839 OR DivWheelsOffs[5] = 1839) OR DepDel15 >= 0 LIMIT 10000"]}
 {"sql":"SELECT Diverted, DayofMonth FROM mytable WHERE AirlineID = 19690 AND Distance BETWEEN 2089 AND 273 OR TotalAddGTime BETWEEN 28 AND 73 ORDER BY DestStateFips LIMIT 25"}
 {"sql":"SELECT SecurityDelay, DayofMonth, AVG(CRSElapsedTime) FROM mytable WHERE ArrTime > 1752 GROUP BY SecurityDelay, DayofMonth  ORDER BY SecurityDelay, DayofMonth LIMIT 5","hsqls":["SELECT SecurityDelay, DayofMonth, AVG(CRSElapsedTime) FROM mytable WHERE ArrTime > 1752 GROUP BY SecurityDelay, DayofMonth  ORDER BY SecurityDelay, DayofMonth LIMIT 5"]}
-{"sql":"SELECT OriginStateFips, \"Month\" FROM mytable WHERE CarrierDelay = 35 OR DayofMonth >= 8 ORDER BY LongestAddGTime LIMIT 14","hsqls":["SELECT OriginStateFips, Month FROM mytable WHERE CarrierDelay = 35 OR DayofMonth >= 8 ORDER BY LongestAddGTime LIMIT 14"]}
-{"sql":"SELECT DepDelay, DivTotalGTimes FROM mytable WHERE DivTotalGTimes IN (52) OR DepTime NOT IN (2220, 2344, 1407, 55, 625) LIMIT 9","hsqls":["SELECT DepDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 IN (52) OR DivTotalGTimes__MV1 IN (52) OR DivTotalGTimes__MV2 IN (52) OR DivTotalGTimes__MV3 IN (52) OR DivTotalGTimes__MV4 IN (52)) OR DepTime NOT IN (2220, 2344, 1407, 55, 625) LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, \"Month\" FROM mytable WHERE CarrierDelay = 35 OR DayofMonth >= 8 ORDER BY LongestAddGTime LIMIT 14","hsqls":["SELECT OriginStateFips, `Month` FROM mytable WHERE CarrierDelay = 35 OR DayofMonth >= 8 ORDER BY LongestAddGTime LIMIT 14"]}
+{"sql":"SELECT DepDelay, DivTotalGTimes FROM mytable WHERE DivTotalGTimes IN (52) OR DepTime NOT IN (2220, 2344, 1407, 55, 625) LIMIT 9","hsqls":["SELECT DepDelay, DivTotalGTimes FROM mytable WHERE (DivTotalGTimes[1] IN (52) OR DivTotalGTimes[2] IN (52) OR DivTotalGTimes[3] IN (52) OR DivTotalGTimes[4] IN (52) OR DivTotalGTimes[5] IN (52)) OR DepTime NOT IN (2220, 2344, 1407, 55, 625) LIMIT 10000"]}
 {"sql":"SELECT Carrier, Origin, WheelsOn FROM mytable WHERE AirlineID NOT IN (19393, 20437, 20366, 19930, 20409) AND DivDistance <= 861 OR FirstDepTime NOT IN (814, 908, 750, 1800, 947) ORDER BY Flights LIMIT 25"}
 {"sql":"SELECT AirlineID, MAX(DestStateFips), COUNT(CRSArrTime) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 6","hsqls":["SELECT AirlineID, MAX(DestStateFips), COUNT(CRSArrTime) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 6"]}
 {"sql":"SELECT DepDel15 FROM mytable WHERE Dest <> 'IDA' OR Cancelled NOT IN (1, 0) OR Quarter BETWEEN 1 AND 1 LIMIT 10"}
 {"sql":"SELECT MIN(OriginAirportID), MIN(Quarter), MIN(DepDel15) FROM mytable WHERE ArrivalDelayGroups IN (11, 12) LIMIT 24"}
-{"sql":"SELECT DepDelay, ArrDelayMinutes, DivAirportLandings, SUM(DivReachedDest), AVG(LateAircraftDelay), MAX(AirTime) FROM mytable WHERE DivTotalGTimes BETWEEN 45 AND 42 OR OriginStateName BETWEEN 'Georgia' AND 'Arizona' OR Distance <= 2419 GROUP BY DepDelay, ArrDelayMinutes, DivAirportLandings LIMIT 4","hsqls":["SELECT DepDelay, ArrDelayMinutes, DivAirportLandings, SUM(DivReachedDest), AVG(LateAircraftDelay), MAX(AirTime) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 45 AND 42 OR DivTotalGTimes__MV1 BETWEEN 45 AND 42 OR DivTotalGTimes__MV2 BETWEEN 45 AND 42 OR DivTotalGTimes__MV3 BETWEEN 45 AND 42 OR DivTotalGTimes__MV4 BETWEEN 45 AND 42) OR OriginStateName BETWEEN 'Georgia' AND 'Arizona' OR Distance <= 2419 GROUP BY DepDelay, ArrDelayMinutes, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DepDelay, ArrDelayMinutes, DivAirportLandings, SUM(DivReachedDest), AVG(LateAircraftDelay), MAX(AirTime) FROM mytable WHERE DivTotalGTimes BETWEEN 45 AND 42 OR OriginStateName BETWEEN 'Georgia' AND 'Arizona' OR Distance <= 2419 GROUP BY DepDelay, ArrDelayMinutes, DivAirportLandings LIMIT 4","hsqls":["SELECT DepDelay, ArrDelayMinutes, DivAirportLandings, SUM(DivReachedDest), AVG(LateAircraftDelay), MAX(AirTime) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 45 AND 42 OR DivTotalGTimes[2] BETWEEN 45 AND 42 OR DivTotalGTimes[3] BETWEEN 45 AND 42 OR DivTotalGTimes[4] BETWEEN 45 AND 42 OR DivTotalGTimes[5] BETWEEN 45 AND 42) OR OriginStateName BETWEEN 'Georgia' AND 'Arizona' OR Distance <= 2419 GROUP BY DepDelay, ArrDelayMinutes, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, DestStateFips, SUM(WeatherDelay), MIN(DistanceGroup), MAX(FlightNum) FROM mytable WHERE OriginCityName BETWEEN 'Jacksonville, FL' AND 'Panama City, FL' AND DepTimeBlk NOT IN ('1000-1059', '1100-1159') AND Quarter BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, DestStateFips  ORDER BY OriginCityMarketID, DestStateFips LIMIT 12","hsqls":["SELECT OriginCityMarketID, DestStateFips, SUM(WeatherDelay), MIN(DistanceGroup), MAX(FlightNum) FROM mytable WHERE OriginCityName BETWEEN 'Jacksonville, FL' AND 'Panama City, FL' AND DepTimeBlk NOT IN ('1000-1059', '1100-1159') AND Quarter BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, DestStateFips  ORDER BY OriginCityMarketID, DestStateFips LIMIT 12"]}
-{"sql":"SELECT DivAirports, LongestAddGTime, DivActualElapsedTime FROM mytable WHERE DivReachedDest NOT IN (0) ORDER BY TaxiIn LIMIT 27","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, LongestAddGTime, DivActualElapsedTime FROM mytable WHERE DivReachedDest NOT IN (0) ORDER BY TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivAirports, LongestAddGTime, DivActualElapsedTime FROM mytable WHERE DivReachedDest NOT IN (0) ORDER BY TaxiIn LIMIT 27","hsqls":["SELECT DivAirports, LongestAddGTime, DivActualElapsedTime FROM mytable WHERE DivReachedDest NOT IN (0) ORDER BY TaxiIn LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable ORDER BY DestStateName, DivAirportLandings, DivActualElapsedTime LIMIT 29"}
 {"sql":"SELECT OriginStateName, AVG(Diverted) FROM mytable WHERE DestAirportSeqID NOT IN (1336703) OR DivArrDelay <= 70 GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 2","hsqls":["SELECT OriginStateName, AVG(Diverted) FROM mytable WHERE DestAirportSeqID NOT IN (1336703) OR DivArrDelay <= 70 GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 2"]}
 {"sql":"SELECT WheelsOn, DivActualElapsedTime, MAX(ArrDel15) FROM mytable GROUP BY WheelsOn, DivActualElapsedTime  ORDER BY WheelsOn, DivActualElapsedTime LIMIT 18","hsqls":["SELECT WheelsOn, DivActualElapsedTime, MAX(ArrDel15) FROM mytable GROUP BY WheelsOn, DivActualElapsedTime  ORDER BY WheelsOn, DivActualElapsedTime LIMIT 18"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 9 AND 11 AND DivTailNums < 'N13903' LIMIT 11","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 9 AND 11 AND (DivTailNums__MV0 < 'N13903' OR DivTailNums__MV1 < 'N13903' OR DivTailNums__MV2 < 'N13903' OR DivTailNums__MV3 < 'N13903' OR DivTailNums__MV4 < 'N13903') LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND DivAirportSeqIDs BETWEEN 1252302 AND 1232303 LIMIT 4","hsqls":["SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND (DivAirportSeqIDs__MV0 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV1 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV2 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV3 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV4 BETWEEN 1252302 AND 1232303) LIMIT 10000"]}
-{"sql":"SELECT DepTime, DivAirportSeqIDs FROM mytable WHERE DepTimeBlk >= '0700-0759' ORDER BY ArrDel15, UniqueCarrier, DaysSinceEpoch LIMIT 21","hsqls":["SELECT DepTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DepTimeBlk >= '0700-0759' ORDER BY ArrDel15, UniqueCarrier, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 9 AND 11 AND DivTailNums < 'N13903' LIMIT 11","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 9 AND 11 AND (DivTailNums[1] < 'N13903' OR DivTailNums[2] < 'N13903' OR DivTailNums[3] < 'N13903' OR DivTailNums[4] < 'N13903' OR DivTailNums[5] < 'N13903') LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND DivAirportSeqIDs BETWEEN 1252302 AND 1232303 LIMIT 4","hsqls":["SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND (DivAirportSeqIDs[1] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[2] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[3] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[4] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[5] BETWEEN 1252302 AND 1232303) LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivAirportSeqIDs FROM mytable WHERE DepTimeBlk >= '0700-0759' ORDER BY ArrDel15, UniqueCarrier, DaysSinceEpoch LIMIT 21","hsqls":["SELECT DepTime, DivAirportSeqIDs FROM mytable WHERE DepTimeBlk >= '0700-0759' ORDER BY ArrDel15, UniqueCarrier, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Dest NOT IN ('MLI', 'SEA') LIMIT 29"}
-{"sql":"SELECT FlightNum, CarrierDelay, DepDel15 FROM mytable WHERE AirlineID <= 19690 OR DivTailNums >= 'N530MQ' ORDER BY DistanceGroup, Diverted, DestAirportID LIMIT 1","hsqls":["SELECT FlightNum, CarrierDelay, DepDel15 FROM mytable WHERE AirlineID <= 19690 OR (DivTailNums__MV0 >= 'N530MQ' OR DivTailNums__MV1 >= 'N530MQ' OR DivTailNums__MV2 >= 'N530MQ' OR DivTailNums__MV3 >= 'N530MQ' OR DivTailNums__MV4 >= 'N530MQ') ORDER BY DistanceGroup, Diverted, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT CRSDepTime, MAX(OriginAirportSeqID), MIN(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 52 AND 43 OR Quarter BETWEEN 1 AND 1 AND DivAirportSeqIDs IN (1013603, 1091802, 1112202) GROUP BY CRSDepTime LIMIT 29","hsqls":["SELECT CRSDepTime, MAX(OriginAirportSeqID), MIN(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 52 AND 43 OR Quarter BETWEEN 1 AND 1 AND (DivAirportSeqIDs__MV0 IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs__MV1 IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs__MV2 IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs__MV3 IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs__MV4 IN (1013603, 1091802, 1112202)) GROUP BY CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivAirports, WheelsOn FROM mytable LIMIT 22","hsqls":["SELECT DestWac, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, WheelsOn FROM mytable LIMIT 10000"]}
+{"sql":"SELECT FlightNum, CarrierDelay, DepDel15 FROM mytable WHERE AirlineID <= 19690 OR DivTailNums >= 'N530MQ' ORDER BY DistanceGroup, Diverted, DestAirportID LIMIT 1","hsqls":["SELECT FlightNum, CarrierDelay, DepDel15 FROM mytable WHERE AirlineID <= 19690 OR (DivTailNums[1] >= 'N530MQ' OR DivTailNums[2] >= 'N530MQ' OR DivTailNums[3] >= 'N530MQ' OR DivTailNums[4] >= 'N530MQ' OR DivTailNums[5] >= 'N530MQ') ORDER BY DistanceGroup, Diverted, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime, MAX(OriginAirportSeqID), MIN(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 52 AND 43 OR Quarter BETWEEN 1 AND 1 AND DivAirportSeqIDs IN (1013603, 1091802, 1112202) GROUP BY CRSDepTime LIMIT 29","hsqls":["SELECT CRSDepTime, MAX(OriginAirportSeqID), MIN(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 52 AND 43 OR Quarter BETWEEN 1 AND 1 AND (DivAirportSeqIDs[1] IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs[2] IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs[3] IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs[4] IN (1013603, 1091802, 1112202) OR DivAirportSeqIDs[5] IN (1013603, 1091802, 1112202)) GROUP BY CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivAirports, WheelsOn FROM mytable LIMIT 22","hsqls":["SELECT DestWac, DivAirports, WheelsOn FROM mytable LIMIT 10000"]}
 {"sql":"SELECT Distance, SecurityDelay, DestAirportSeqID FROM mytable WHERE AirTime > 368 ORDER BY DepDelayMinutes LIMIT 3"}
-{"sql":"SELECT COUNT(CRSDepTime), SUM(\"Year\") FROM mytable WHERE OriginAirportID NOT IN (14794, 12094, 13290, 10754) LIMIT 20","hsqls":["SELECT COUNT(CRSDepTime), SUM(Year) FROM mytable WHERE OriginAirportID NOT IN (14794, 12094, 13290, 10754) LIMIT 20"]}
+{"sql":"SELECT COUNT(CRSDepTime), SUM(\"Year\") FROM mytable WHERE OriginAirportID NOT IN (14794, 12094, 13290, 10754) LIMIT 20","hsqls":["SELECT COUNT(CRSDepTime), SUM(`Year`) FROM mytable WHERE OriginAirportID NOT IN (14794, 12094, 13290, 10754) LIMIT 20"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE WeatherDelay = 10 LIMIT 23"}
 {"sql":"SELECT DepartureDelayGroups, NASDelay FROM mytable WHERE DivReachedDest <> 0 OR DivAirportLandings IN (1, 0, 9) ORDER BY LateAircraftDelay, WeatherDelay LIMIT 9"}
 {"sql":"SELECT DivReachedDest, Flights FROM mytable WHERE WeatherDelay IN (59, 214, 105, 72, 37) OR FlightNum <= 172 AND SecurityDelay NOT IN (1, 10, 27) ORDER BY CRSArrTime, DepDelayMinutes LIMIT 3"}
@@ -5008,7 +5008,7 @@
 {"sql":"SELECT TailNum, DestStateName, DepDel15, MIN(AirlineID), COUNT(FlightDate), AVG(DivAirportLandings) FROM mytable WHERE ArrTime BETWEEN 1219 AND 1420 AND ArrDel15 NOT IN (1, -9999) OR DivArrDelay <= 663 GROUP BY TailNum, DestStateName, DepDel15  ORDER BY TailNum, DestStateName, DepDel15 LIMIT 21","hsqls":["SELECT TailNum, DestStateName, DepDel15, MIN(AirlineID), COUNT(FlightDate), AVG(DivAirportLandings) FROM mytable WHERE ArrTime BETWEEN 1219 AND 1420 AND ArrDel15 NOT IN (1, -9999) OR DivArrDelay <= 663 GROUP BY TailNum, DestStateName, DepDel15  ORDER BY TailNum, DestStateName, DepDel15 LIMIT 21"]}
 {"sql":"SELECT DistanceGroup, Flights, ArrTimeBlk FROM mytable ORDER BY DivDistance LIMIT 17"}
 {"sql":"SELECT OriginStateFips, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE WheelsOff NOT IN (2044) GROUP BY OriginStateFips, ArrivalDelayGroups  ORDER BY OriginStateFips, ArrivalDelayGroups LIMIT 21","hsqls":["SELECT OriginStateFips, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE WheelsOff NOT IN (2044) GROUP BY OriginStateFips, ArrivalDelayGroups  ORDER BY OriginStateFips, ArrivalDelayGroups LIMIT 21"]}
-{"sql":"SELECT COUNT(DivActualElapsedTime), COUNT(OriginCityName) FROM mytable WHERE DestStateFips IN (35) AND ArrDelay BETWEEN 180.0 AND 66.0 OR DivWheelsOffs IN (1842, 1022, 1318) LIMIT 8","hsqls":["SELECT COUNT(DivActualElapsedTime), COUNT(OriginCityName)  FROM mytable WHERE DestStateFips IN (35) AND ArrDelay BETWEEN 180.0 AND 66.0 OR (DivWheelsOffs__MV0 IN (1842, 1022, 1318) OR DivWheelsOffs__MV1 IN (1842, 1022, 1318) OR DivWheelsOffs__MV2 IN (1842, 1022, 1318) OR DivWheelsOffs__MV3 IN (1842, 1022, 1318) OR DivWheelsOffs__MV4 IN (1842, 1022, 1318)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(DivActualElapsedTime), COUNT(OriginCityName) FROM mytable WHERE DestStateFips IN (35) AND ArrDelay BETWEEN 180.0 AND 66.0 OR DivWheelsOffs IN (1842, 1022, 1318) LIMIT 8","hsqls":["SELECT COUNT(DivActualElapsedTime), COUNT(OriginCityName)  FROM mytable WHERE DestStateFips IN (35) AND ArrDelay BETWEEN 180.0 AND 66.0 OR (DivWheelsOffs[1] IN (1842, 1022, 1318) OR DivWheelsOffs[2] IN (1842, 1022, 1318) OR DivWheelsOffs[3] IN (1842, 1022, 1318) OR DivWheelsOffs[4] IN (1842, 1022, 1318) OR DivWheelsOffs[5] IN (1842, 1022, 1318)) LIMIT 10000"]}
 {"sql":"SELECT CancellationCode FROM mytable ORDER BY DepartureDelayGroups, ArrivalDelayGroups LIMIT 7"}
 {"sql":"SELECT DepartureDelayGroups, DayOfWeek, DaysSinceEpoch FROM mytable ORDER BY FirstDepTime LIMIT 21"}
 {"sql":"SELECT FlightDate, DestStateName, AVG(WheelsOn) FROM mytable GROUP BY FlightDate, DestStateName  ORDER BY FlightDate, DestStateName LIMIT 14","hsqls":["SELECT FlightDate, DestStateName, AVG(WheelsOn) FROM mytable GROUP BY FlightDate, DestStateName  ORDER BY FlightDate, DestStateName LIMIT 14"]}
@@ -5018,36 +5018,36 @@
 {"sql":"SELECT AVG(DayOfWeek), AVG(FirstDepTime) FROM mytable LIMIT 27"}
 {"sql":"SELECT DayofMonth, AVG(OriginAirportSeqID), COUNT(DistanceGroup), SUM(DaysSinceEpoch) FROM mytable WHERE DepDelayMinutes NOT IN (51.0, 311.0, 153.0, 110.0, 223.0) GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 2","hsqls":["SELECT DayofMonth, AVG(OriginAirportSeqID), COUNT(DistanceGroup), SUM(DaysSinceEpoch) FROM mytable WHERE DepDelayMinutes NOT IN (51.0, 311.0, 153.0, 110.0, 223.0) GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 2"]}
 {"sql":"SELECT DestWac, DepTimeBlk, CancellationCode, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 85 AND 52 GROUP BY DestWac, DepTimeBlk, CancellationCode  ORDER BY DestWac, DepTimeBlk, CancellationCode LIMIT 26","hsqls":["SELECT DestWac, DepTimeBlk, CancellationCode, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 85 AND 52 GROUP BY DestWac, DepTimeBlk, CancellationCode  ORDER BY DestWac, DepTimeBlk, CancellationCode LIMIT 26"]}
-{"sql":"SELECT ArrDelay, AirTime FROM mytable WHERE OriginCityName IN ('Shreveport, LA', 'Monroe, LA', 'Spokane, WA', 'South Bend, IN', 'Wichita, KS') AND DivAirportSeqIDs IN (1467903) ORDER BY DestAirportID, DivArrDelay LIMIT 19","hsqls":["SELECT ArrDelay, AirTime FROM mytable WHERE OriginCityName IN ('Shreveport, LA', 'Monroe, LA', 'Spokane, WA', 'South Bend, IN', 'Wichita, KS') AND (DivAirportSeqIDs__MV0 IN (1467903) OR DivAirportSeqIDs__MV1 IN (1467903) OR DivAirportSeqIDs__MV2 IN (1467903) OR DivAirportSeqIDs__MV3 IN (1467903) OR DivAirportSeqIDs__MV4 IN (1467903)) ORDER BY DestAirportID, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DivWheelsOffs FROM mytable WHERE AirTime BETWEEN 63 AND 116 ORDER BY DepartureDelayGroups, OriginState, OriginCityName LIMIT 19","hsqls":["SELECT Year, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE AirTime BETWEEN 63 AND 116 ORDER BY DepartureDelayGroups, OriginState, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, AirTime FROM mytable WHERE OriginCityName IN ('Shreveport, LA', 'Monroe, LA', 'Spokane, WA', 'South Bend, IN', 'Wichita, KS') AND DivAirportSeqIDs IN (1467903) ORDER BY DestAirportID, DivArrDelay LIMIT 19","hsqls":["SELECT ArrDelay, AirTime FROM mytable WHERE OriginCityName IN ('Shreveport, LA', 'Monroe, LA', 'Spokane, WA', 'South Bend, IN', 'Wichita, KS') AND (DivAirportSeqIDs[1] IN (1467903) OR DivAirportSeqIDs[2] IN (1467903) OR DivAirportSeqIDs[3] IN (1467903) OR DivAirportSeqIDs[4] IN (1467903) OR DivAirportSeqIDs[5] IN (1467903)) ORDER BY DestAirportID, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivWheelsOffs FROM mytable WHERE AirTime BETWEEN 63 AND 116 ORDER BY DepartureDelayGroups, OriginState, OriginCityName LIMIT 19","hsqls":["SELECT Year, DivWheelsOffs FROM mytable WHERE AirTime BETWEEN 63 AND 116 ORDER BY DepartureDelayGroups, OriginState, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT COUNT(Origin) FROM mytable LIMIT 12"}
-{"sql":"SELECT DivLongestGTimes, NASDelay, DestCityName FROM mytable WHERE CRSElapsedTime IN (193) ORDER BY CRSArrTime, UniqueCarrier LIMIT 14","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, NASDelay, DestCityName FROM mytable WHERE CRSElapsedTime IN (193) ORDER BY CRSArrTime, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, NASDelay, DestCityName FROM mytable WHERE CRSElapsedTime IN (193) ORDER BY CRSArrTime, UniqueCarrier LIMIT 14","hsqls":["SELECT DivLongestGTimes, NASDelay, DestCityName FROM mytable WHERE CRSElapsedTime IN (193) ORDER BY CRSArrTime, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, ArrDel15, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, ArrDel15, CRSElapsedTime  ORDER BY DepDelayMinutes, ArrDel15, CRSElapsedTime LIMIT 18","hsqls":["SELECT DepDelayMinutes, ArrDel15, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, ArrDel15, CRSElapsedTime  ORDER BY DepDelayMinutes, ArrDel15, CRSElapsedTime LIMIT 18"]}
 {"sql":"SELECT \"Year\", OriginWac, CRSDepTime FROM mytable WHERE DivDistance BETWEEN 1011 AND 68 OR UniqueCarrier < 'VX' LIMIT 4","hsqls":["SELECT Year, OriginWac, CRSDepTime FROM mytable WHERE DivDistance BETWEEN 1011 AND 68 OR UniqueCarrier < 'VX' LIMIT 4"]}
 {"sql":"SELECT DepartureDelayGroups, Flights, UniqueCarrier FROM mytable ORDER BY AirTime, DaysSinceEpoch LIMIT 3"}
-{"sql":"SELECT OriginAirportID FROM mytable WHERE ArrTime BETWEEN 712 AND 1536 AND DivWheelsOns IN (716, 2050, 1347, 1533, 741) AND ActualElapsedTime <> 302 ORDER BY Quarter, ActualElapsedTime, ArrTimeBlk LIMIT 8","hsqls":["SELECT OriginAirportID FROM mytable WHERE ArrTime BETWEEN 712 AND 1536 AND (DivWheelsOns__MV0 IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns__MV1 IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns__MV2 IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns__MV3 IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns__MV4 IN (716, 2050, 1347, 1533, 741)) AND ActualElapsedTime <> 302 ORDER BY Quarter, ActualElapsedTime, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT OriginAirportID FROM mytable WHERE ArrTime BETWEEN 712 AND 1536 AND DivWheelsOns IN (716, 2050, 1347, 1533, 741) AND ActualElapsedTime <> 302 ORDER BY Quarter, ActualElapsedTime, ArrTimeBlk LIMIT 8","hsqls":["SELECT OriginAirportID FROM mytable WHERE ArrTime BETWEEN 712 AND 1536 AND (DivWheelsOns[1] IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns[2] IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns[3] IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns[4] IN (716, 2050, 1347, 1533, 741) OR DivWheelsOns[5] IN (716, 2050, 1347, 1533, 741)) AND ActualElapsedTime <> 302 ORDER BY Quarter, ActualElapsedTime, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, FlightDate, TaxiIn, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, FlightDate, TaxiIn  ORDER BY DepartureDelayGroups, FlightDate, TaxiIn LIMIT 6","hsqls":["SELECT DepartureDelayGroups, FlightDate, TaxiIn, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, FlightDate, TaxiIn  ORDER BY DepartureDelayGroups, FlightDate, TaxiIn LIMIT 6"]}
 {"sql":"SELECT FlightDate, DepTime, ArrTime, MIN(WeatherDelay) FROM mytable GROUP BY FlightDate, DepTime, ArrTime  ORDER BY FlightDate, DepTime, ArrTime LIMIT 16","hsqls":["SELECT FlightDate, DepTime, ArrTime, MIN(WeatherDelay) FROM mytable GROUP BY FlightDate, DepTime, ArrTime  ORDER BY FlightDate, DepTime, ArrTime LIMIT 16"]}
-{"sql":"SELECT DepDel15, DivAirportIDs, CancellationCode FROM mytable ORDER BY OriginAirportID LIMIT 10","hsqls":["SELECT DepDel15, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CancellationCode FROM mytable ORDER BY OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE Dest <> 'MBS' OR TailNum IN ('N784SK', 'N492AA', 'N696MQ', 'N388SW', 'N418UA') AND DivAirportLandings IN (2, 1, 9) ORDER BY WeatherDelay, TailNum LIMIT 15","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Dest <> 'MBS' OR TailNum IN ('N784SK', 'N492AA', 'N696MQ', 'N388SW', 'N418UA') AND DivAirportLandings IN (2, 1, 9) ORDER BY WeatherDelay, TailNum LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DivAirportIDs, CancellationCode FROM mytable ORDER BY OriginAirportID LIMIT 10","hsqls":["SELECT DepDel15, DivAirportIDs, CancellationCode FROM mytable ORDER BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE Dest <> 'MBS' OR TailNum IN ('N784SK', 'N492AA', 'N696MQ', 'N388SW', 'N418UA') AND DivAirportLandings IN (2, 1, 9) ORDER BY WeatherDelay, TailNum LIMIT 15","hsqls":["SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE Dest <> 'MBS' OR TailNum IN ('N784SK', 'N492AA', 'N696MQ', 'N388SW', 'N418UA') AND DivAirportLandings IN (2, 1, 9) ORDER BY WeatherDelay, TailNum LIMIT 10000"]}
 {"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 12 OR Quarter BETWEEN 1 AND 1 GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 20","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 12 OR Quarter BETWEEN 1 AND 1 GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 20"]}
 {"sql":"SELECT OriginStateFips, COUNT(*) FROM mytable WHERE UniqueCarrier NOT IN ('B6', 'FL', 'VX') OR FirstDepTime BETWEEN 1605 AND 921 AND DivAirportLandings IN (2, 1, 0, 9) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 26","hsqls":["SELECT OriginStateFips, COUNT(*) FROM mytable WHERE UniqueCarrier NOT IN ('B6', 'FL', 'VX') OR FirstDepTime BETWEEN 1605 AND 921 AND DivAirportLandings IN (2, 1, 0, 9) GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 26"]}
 {"sql":"SELECT LateAircraftDelay, ArrDelayMinutes, CRSDepTime, MIN(DaysSinceEpoch), MIN(DepDel15) FROM mytable GROUP BY LateAircraftDelay, ArrDelayMinutes, CRSDepTime  ORDER BY LateAircraftDelay, ArrDelayMinutes, CRSDepTime LIMIT 11","hsqls":["SELECT LateAircraftDelay, ArrDelayMinutes, CRSDepTime, MIN(DaysSinceEpoch), MIN(DepDel15) FROM mytable GROUP BY LateAircraftDelay, ArrDelayMinutes, CRSDepTime  ORDER BY LateAircraftDelay, ArrDelayMinutes, CRSDepTime LIMIT 11"]}
 {"sql":"SELECT OriginCityName, DivActualElapsedTime FROM mytable WHERE ArrivalDelayGroups NOT IN (1, 0, -9999) OR DestStateFips BETWEEN 4 AND 49 ORDER BY DaysSinceEpoch LIMIT 1"}
-{"sql":"SELECT OriginStateFips, AVG(\"Month\"), MAX(AirlineID), COUNT(Dest) FROM mytable WHERE ArrDelayMinutes IN (226.0, 261.0, -9999.0, 67.0, 271.0) AND DivActualElapsedTime NOT IN (238) GROUP BY OriginStateFips LIMIT 26","hsqls":["SELECT OriginStateFips, AVG(Month), MAX(AirlineID), COUNT(Dest) FROM mytable WHERE ArrDelayMinutes IN (226.0, 261.0, -9999.0, 67.0, 271.0) AND DivActualElapsedTime NOT IN (238) GROUP BY OriginStateFips LIMIT 26"]}
+{"sql":"SELECT OriginStateFips, AVG(\"Month\"), MAX(AirlineID), COUNT(Dest) FROM mytable WHERE ArrDelayMinutes IN (226.0, 261.0, -9999.0, 67.0, 271.0) AND DivActualElapsedTime NOT IN (238) GROUP BY OriginStateFips LIMIT 26","hsqls":["SELECT OriginStateFips, AVG(`Month`), MAX(AirlineID), COUNT(Dest) FROM mytable WHERE ArrDelayMinutes IN (226.0, 261.0, -9999.0, 67.0, 271.0) AND DivActualElapsedTime NOT IN (238) GROUP BY OriginStateFips LIMIT 26"]}
 {"sql":"SELECT FlightNum, DepDelayMinutes FROM mytable WHERE OriginCityName NOT IN ('Alpena, MI', 'Roanoke, VA') AND Cancelled <> 0 ORDER BY DestState, DayofMonth LIMIT 5"}
 {"sql":"SELECT DepDelay, DestState, DepTime, COUNT(*) FROM mytable WHERE SecurityDelay IN (18) GROUP BY DepDelay, DestState, DepTime  ORDER BY DepDelay, DestState, DepTime LIMIT 3","hsqls":["SELECT DepDelay, DestState, DepTime, COUNT(*) FROM mytable WHERE SecurityDelay IN (18) GROUP BY DepDelay, DestState, DepTime  ORDER BY DepDelay, DestState, DepTime LIMIT 3"]}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE DivTotalGTimes = 4 AND Quarter NOT IN (1) AND Dest BETWEEN 'SPI' AND 'SHV' ORDER BY FirstDepTime LIMIT 16","hsqls":["SELECT CarrierDelay FROM mytable WHERE (DivTotalGTimes__MV0 = 4 OR DivTotalGTimes__MV1 = 4 OR DivTotalGTimes__MV2 = 4 OR DivTotalGTimes__MV3 = 4 OR DivTotalGTimes__MV4 = 4) AND Quarter NOT IN (1) AND Dest BETWEEN 'SPI' AND 'SHV' ORDER BY FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE DivTotalGTimes = 4 AND Quarter NOT IN (1) AND Dest BETWEEN 'SPI' AND 'SHV' ORDER BY FirstDepTime LIMIT 16","hsqls":["SELECT CarrierDelay FROM mytable WHERE (DivTotalGTimes[1] = 4 OR DivTotalGTimes[2] = 4 OR DivTotalGTimes[3] = 4 OR DivTotalGTimes[4] = 4 OR DivTotalGTimes[5] = 4) AND Quarter NOT IN (1) AND Dest BETWEEN 'SPI' AND 'SHV' ORDER BY FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, AirTime, COUNT(DepDelayMinutes), AVG(DepTime), MIN(OriginCityMarketID) FROM mytable GROUP BY SecurityDelay, AirTime  ORDER BY SecurityDelay, AirTime LIMIT 8","hsqls":["SELECT SecurityDelay, AirTime, COUNT(DepDelayMinutes), AVG(DepTime), MIN(OriginCityMarketID) FROM mytable GROUP BY SecurityDelay, AirTime  ORDER BY SecurityDelay, AirTime LIMIT 8"]}
-{"sql":"SELECT FlightDate, ArrTimeBlk, AirTime, AVG(NASDelay), AVG(DepDelay), MAX(\"Month\") FROM mytable WHERE Distance BETWEEN 759 AND 502 GROUP BY FlightDate, ArrTimeBlk, AirTime LIMIT 21","hsqls":["SELECT FlightDate, ArrTimeBlk, AirTime, AVG(NASDelay), AVG(DepDelay), MAX(Month) FROM mytable WHERE Distance BETWEEN 759 AND 502 GROUP BY FlightDate, ArrTimeBlk, AirTime LIMIT 21"]}
-{"sql":"SELECT DivAirportSeqIDs, AirlineID FROM mytable WHERE AirTime > 42 AND DivWheelsOffs < 2010 ORDER BY DivReachedDest, OriginState, Carrier LIMIT 29","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, AirlineID FROM mytable WHERE AirTime > 42 AND (DivWheelsOffs__MV0 < 2010 OR DivWheelsOffs__MV1 < 2010 OR DivWheelsOffs__MV2 < 2010 OR DivWheelsOffs__MV3 < 2010 OR DivWheelsOffs__MV4 < 2010) ORDER BY DivReachedDest, OriginState, Carrier LIMIT 10000"]}
+{"sql":"SELECT FlightDate, ArrTimeBlk, AirTime, AVG(NASDelay), AVG(DepDelay), MAX(\"Month\") FROM mytable WHERE Distance BETWEEN 759 AND 502 GROUP BY FlightDate, ArrTimeBlk, AirTime LIMIT 21","hsqls":["SELECT FlightDate, ArrTimeBlk, AirTime, AVG(NASDelay), AVG(DepDelay), MAX(`Month`) FROM mytable WHERE Distance BETWEEN 759 AND 502 GROUP BY FlightDate, ArrTimeBlk, AirTime LIMIT 21"]}
+{"sql":"SELECT DivAirportSeqIDs, AirlineID FROM mytable WHERE AirTime > 42 AND DivWheelsOffs < 2010 ORDER BY DivReachedDest, OriginState, Carrier LIMIT 29","hsqls":["SELECT DivAirportSeqIDs, AirlineID FROM mytable WHERE AirTime > 42 AND (DivWheelsOffs[1] < 2010 OR DivWheelsOffs[2] < 2010 OR DivWheelsOffs[3] < 2010 OR DivWheelsOffs[4] < 2010 OR DivWheelsOffs[5] < 2010) ORDER BY DivReachedDest, OriginState, Carrier LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, DivAirportLandings, MAX(WheelsOff), MAX(OriginAirportID) FROM mytable GROUP BY DayofMonth, DivAirportLandings  ORDER BY DayofMonth, DivAirportLandings LIMIT 9","hsqls":["SELECT DayofMonth, DivAirportLandings, MAX(WheelsOff), MAX(OriginAirportID) FROM mytable GROUP BY DayofMonth, DivAirportLandings  ORDER BY DayofMonth, DivAirportLandings LIMIT 9"]}
 {"sql":"SELECT DivDistance, ArrTime, DestCityName FROM mytable WHERE DestCityMarketID <= 33304 AND DestAirportSeqID BETWEEN 1074702 AND 1086803 AND DayofMonth BETWEEN 18 AND 23 ORDER BY OriginCityMarketID, FlightNum, WheelsOn LIMIT 29"}
 {"sql":"SELECT ArrTimeBlk, DivAirportLandings, MAX(ArrDelay), AVG(CRSArrTime) FROM mytable GROUP BY ArrTimeBlk, DivAirportLandings  ORDER BY ArrTimeBlk, DivAirportLandings LIMIT 3","hsqls":["SELECT ArrTimeBlk, DivAirportLandings, MAX(ArrDelay), AVG(CRSArrTime) FROM mytable GROUP BY ArrTimeBlk, DivAirportLandings  ORDER BY ArrTimeBlk, DivAirportLandings LIMIT 3"]}
-{"sql":"SELECT DivAirports, Flights, OriginStateName FROM mytable WHERE DaysSinceEpoch < 16089 OR ArrDelayMinutes > 305.0 ORDER BY ArrTime, ArrDelayMinutes LIMIT 27","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Flights, OriginStateName FROM mytable WHERE DaysSinceEpoch < 16089 OR ArrDelayMinutes > 305.0 ORDER BY ArrTime, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivAirports, Flights, OriginStateName FROM mytable WHERE DaysSinceEpoch < 16089 OR ArrDelayMinutes > 305.0 ORDER BY ArrTime, ArrDelayMinutes LIMIT 27","hsqls":["SELECT DivAirports, Flights, OriginStateName FROM mytable WHERE DaysSinceEpoch < 16089 OR ArrDelayMinutes > 305.0 ORDER BY ArrTime, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE ActualElapsedTime BETWEEN 326 AND 427 AND FlightNum NOT IN (800, 6051, 4426) AND DestAirportID IN (11042) ORDER BY DestState, ArrivalDelayGroups LIMIT 10"}
-{"sql":"SELECT Origin FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY SecurityDelay, CancellationCode, \"Month\" LIMIT 16","hsqls":["SELECT Origin FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY SecurityDelay, CancellationCode, Month LIMIT 16"]}
-{"sql":"SELECT LateAircraftDelay, MAX(OriginWac), COUNT(DivAirportLandings) FROM mytable WHERE Quarter >= 1 AND DivActualElapsedTime NOT IN (909, 296, 311) OR \"Month\" BETWEEN 1 AND 1 GROUP BY LateAircraftDelay LIMIT 18","hsqls":["SELECT LateAircraftDelay, MAX(OriginWac), COUNT(DivAirportLandings) FROM mytable WHERE Quarter >= 1 AND DivActualElapsedTime NOT IN (909, 296, 311) OR Month BETWEEN 1 AND 1 GROUP BY LateAircraftDelay LIMIT 18"]}
+{"sql":"SELECT Origin FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY SecurityDelay, CancellationCode, \"Month\" LIMIT 16","hsqls":["SELECT Origin FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 ORDER BY SecurityDelay, CancellationCode, `Month` LIMIT 16"]}
+{"sql":"SELECT LateAircraftDelay, MAX(OriginWac), COUNT(DivAirportLandings) FROM mytable WHERE Quarter >= 1 AND DivActualElapsedTime NOT IN (909, 296, 311) OR \"Month\" BETWEEN 1 AND 1 GROUP BY LateAircraftDelay LIMIT 18","hsqls":["SELECT LateAircraftDelay, MAX(OriginWac), COUNT(DivAirportLandings) FROM mytable WHERE Quarter >= 1 AND DivActualElapsedTime NOT IN (909, 296, 311) OR `Month` BETWEEN 1 AND 1 GROUP BY LateAircraftDelay LIMIT 18"]}
 {"sql":"SELECT TotalAddGTime, DayOfWeek, COUNT(*) FROM mytable WHERE OriginState IN ('OK', 'KY') AND WheelsOff BETWEEN 831 AND 909 AND DepartureDelayGroups IN (2, 9, -9999, 12) GROUP BY TotalAddGTime, DayOfWeek  ORDER BY TotalAddGTime, DayOfWeek LIMIT 23","hsqls":["SELECT TotalAddGTime, DayOfWeek, COUNT(*) FROM mytable WHERE OriginState IN ('OK', 'KY') AND WheelsOff BETWEEN 831 AND 909 AND DepartureDelayGroups IN (2, 9, -9999, 12) GROUP BY TotalAddGTime, DayOfWeek  ORDER BY TotalAddGTime, DayOfWeek LIMIT 23"]}
 {"sql":"SELECT Cancelled, DivArrDelay, MIN(Diverted) FROM mytable WHERE OriginStateName IN ('Indiana') GROUP BY Cancelled, DivArrDelay","hsqls":["SELECT Cancelled, DivArrDelay, MIN(Diverted) FROM mytable WHERE OriginStateName IN ('Indiana') GROUP BY Cancelled, DivArrDelay"]}
 {"sql":"SELECT COUNT(TaxiIn), MIN(DaysSinceEpoch), SUM(OriginAirportSeqID) FROM mytable WHERE DestAirportSeqID >= 1560702 OR SecurityDelay NOT IN (0, 18) OR WeatherDelay = 103 LIMIT 28"}
@@ -5061,45 +5061,45 @@
 {"sql":"SELECT OriginState, OriginStateFips, ArrDelay FROM mytable ORDER BY Cancelled LIMIT 4"}
 {"sql":"SELECT FlightNum, CRSArrTime, ArrivalDelayGroups FROM mytable WHERE FlightDate IN ('2014-01-06') AND OriginState BETWEEN 'NC' AND 'CA' ORDER BY Flights, DepDel15 LIMIT 21"}
 {"sql":"SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 1951 AND 1021 OR CRSDepTime BETWEEN 1034 AND 1849 OR DestAirportSeqID BETWEEN 1150303 AND 1291503 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 24","hsqls":["SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 1951 AND 1021 OR CRSDepTime BETWEEN 1034 AND 1849 OR DestAirportSeqID BETWEEN 1150303 AND 1291503 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 24"]}
-{"sql":"SELECT ArrTime FROM mytable WHERE DivArrDelay <= 136 AND \"Year\" IN (2014) AND DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY LateAircraftDelay, AirlineID, DivAirportLandings LIMIT 28","hsqls":["SELECT ArrTime FROM mytable WHERE DivArrDelay <= 136 AND Year IN (2014) AND DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY LateAircraftDelay, AirlineID, DivAirportLandings LIMIT 28"]}
+{"sql":"SELECT ArrTime FROM mytable WHERE DivArrDelay <= 136 AND \"Year\" IN (2014) AND DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY LateAircraftDelay, AirlineID, DivAirportLandings LIMIT 28","hsqls":["SELECT ArrTime FROM mytable WHERE DivArrDelay <= 136 AND `Year` IN (2014) AND DivAirportLandings NOT IN (2, 1, 0, 9) ORDER BY LateAircraftDelay, AirlineID, DivAirportLandings LIMIT 28"]}
 {"sql":"SELECT ArrTimeBlk, COUNT(DestStateFips), COUNT(AirlineID) FROM mytable WHERE CRSArrTime <> 1613 AND SecurityDelay NOT IN (10, 1, 8, 27) AND OriginCityMarketID <= 31714 GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 22","hsqls":["SELECT ArrTimeBlk, COUNT(DestStateFips), COUNT(AirlineID) FROM mytable WHERE CRSArrTime <> 1613 AND SecurityDelay NOT IN (10, 1, 8, 27) AND OriginCityMarketID <= 31714 GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 22"]}
 {"sql":"SELECT TaxiOut, DistanceGroup, COUNT(*) FROM mytable WHERE DivArrDelay BETWEEN 129 AND 160 GROUP BY TaxiOut, DistanceGroup  ORDER BY TaxiOut, DistanceGroup LIMIT 24","hsqls":["SELECT TaxiOut, DistanceGroup, COUNT(*) FROM mytable WHERE DivArrDelay BETWEEN 129 AND 160 GROUP BY TaxiOut, DistanceGroup  ORDER BY TaxiOut, DistanceGroup LIMIT 24"]}
 {"sql":"SELECT FlightDate, TailNum, DayofMonth FROM mytable WHERE UniqueCarrier NOT IN ('B6', 'OO', 'UA') OR FlightNum NOT IN (1593, 1991, 5345, 5288) AND OriginAirportID IN (12320, 15041) ORDER BY WheelsOff, WheelsOn, OriginAirportID LIMIT 21"}
 {"sql":"SELECT TaxiOut, Quarter FROM mytable WHERE LateAircraftDelay > 147 AND DistanceGroup BETWEEN 4 AND 10 ORDER BY DestStateFips, ArrDelay, DayOfWeek LIMIT 10"}
 {"sql":"SELECT DestState FROM mytable ORDER BY FlightDate"}
 {"sql":"SELECT OriginCityMarketID FROM mytable ORDER BY UniqueCarrier LIMIT 25"}
-{"sql":"SELECT DivAirports, OriginCityMarketID, \"Month\" FROM mytable WHERE DepTime <> 1040 OR OriginStateFips <= 37 ORDER BY OriginAirportSeqID, DestStateName, CancellationCode LIMIT 3","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityMarketID, Month FROM mytable WHERE DepTime <> 1040 OR OriginStateFips <= 37 ORDER BY OriginAirportSeqID, DestStateName, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityMarketID, \"Month\" FROM mytable WHERE DepTime <> 1040 OR OriginStateFips <= 37 ORDER BY OriginAirportSeqID, DestStateName, CancellationCode LIMIT 3","hsqls":["SELECT DivAirports, OriginCityMarketID, `Month` FROM mytable WHERE DepTime <> 1040 OR OriginStateFips <= 37 ORDER BY OriginAirportSeqID, DestStateName, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT OriginState, ArrTimeBlk, AVG(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 57 AND 77 AND DestAirportID <> 13296 GROUP BY OriginState, ArrTimeBlk  ORDER BY OriginState, ArrTimeBlk LIMIT 24","hsqls":["SELECT OriginState, ArrTimeBlk, AVG(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 57 AND 77 AND DestAirportID <> 13296 GROUP BY OriginState, ArrTimeBlk  ORDER BY OriginState, ArrTimeBlk LIMIT 24"]}
-{"sql":"SELECT DestStateFips, TaxiIn FROM mytable WHERE TotalAddGTime BETWEEN 34 AND 31 OR DivAirportIDs < 13502 OR DepDelayMinutes IN (150.0, 153.0, 75.0) LIMIT 5","hsqls":["SELECT DestStateFips, TaxiIn FROM mytable WHERE TotalAddGTime BETWEEN 34 AND 31 OR (DivAirportIDs__MV0 < 13502 OR DivAirportIDs__MV1 < 13502 OR DivAirportIDs__MV2 < 13502 OR DivAirportIDs__MV3 < 13502 OR DivAirportIDs__MV4 < 13502) OR DepDelayMinutes IN (150.0, 153.0, 75.0) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, TaxiIn FROM mytable WHERE TotalAddGTime BETWEEN 34 AND 31 OR DivAirportIDs < 13502 OR DepDelayMinutes IN (150.0, 153.0, 75.0) LIMIT 5","hsqls":["SELECT DestStateFips, TaxiIn FROM mytable WHERE TotalAddGTime BETWEEN 34 AND 31 OR (DivAirportIDs[1] < 13502 OR DivAirportIDs[2] < 13502 OR DivAirportIDs[3] < 13502 OR DivAirportIDs[4] < 13502 OR DivAirportIDs[5] < 13502) OR DepDelayMinutes IN (150.0, 153.0, 75.0) LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay FROM mytable ORDER BY ArrTime LIMIT 16"}
 {"sql":"SELECT COUNT(OriginStateName), COUNT(DestStateName), AVG(Quarter) FROM mytable WHERE Flights IN (1) AND ArrivalDelayGroups >= -9999 LIMIT 19"}
-{"sql":"SELECT COUNT(DestAirportSeqID), SUM(WeatherDelay), AVG(DepTime) FROM mytable WHERE DivReachedDest BETWEEN 0 AND 0 AND DivLongestGTimes BETWEEN 34.0 AND 51.0 OR WeatherDelay BETWEEN 6 AND 72 LIMIT 23","hsqls":["SELECT COUNT(DestAirportSeqID), SUM(WeatherDelay), AVG(DepTime)  FROM mytable WHERE DivReachedDest BETWEEN 0 AND 0 AND (DivLongestGTimes__MV0 BETWEEN 34.0 AND 51.0 OR DivLongestGTimes__MV1 BETWEEN 34.0 AND 51.0 OR DivLongestGTimes__MV2 BETWEEN 34.0 AND 51.0 OR DivLongestGTimes__MV3 BETWEEN 34.0 AND 51.0 OR DivLongestGTimes__MV4 BETWEEN 34.0 AND 51.0) OR WeatherDelay BETWEEN 6 AND 72 LIMIT 10000"]}
+{"sql":"SELECT COUNT(DestAirportSeqID), SUM(WeatherDelay), AVG(DepTime) FROM mytable WHERE DivReachedDest BETWEEN 0 AND 0 AND DivLongestGTimes BETWEEN 34.0 AND 51.0 OR WeatherDelay BETWEEN 6 AND 72 LIMIT 23","hsqls":["SELECT COUNT(DestAirportSeqID), SUM(WeatherDelay), AVG(DepTime)  FROM mytable WHERE DivReachedDest BETWEEN 0 AND 0 AND (DivLongestGTimes[1] BETWEEN 34.0 AND 51.0 OR DivLongestGTimes[2] BETWEEN 34.0 AND 51.0 OR DivLongestGTimes[3] BETWEEN 34.0 AND 51.0 OR DivLongestGTimes[4] BETWEEN 34.0 AND 51.0 OR DivLongestGTimes[5] BETWEEN 34.0 AND 51.0) OR WeatherDelay BETWEEN 6 AND 72 LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DestCityMarketID, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 2037 AND 524 AND LateAircraftDelay > 59 AND CarrierDelay BETWEEN 96 AND 84 GROUP BY CarrierDelay, DestCityMarketID  ORDER BY CarrierDelay, DestCityMarketID LIMIT 6","hsqls":["SELECT CarrierDelay, DestCityMarketID, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 2037 AND 524 AND LateAircraftDelay > 59 AND CarrierDelay BETWEEN 96 AND 84 GROUP BY CarrierDelay, DestCityMarketID  ORDER BY CarrierDelay, DestCityMarketID LIMIT 6"]}
 {"sql":"SELECT DepTime, TailNum, SUM(TaxiOut), SUM(DivArrDelay) FROM mytable GROUP BY DepTime, TailNum  ORDER BY DepTime, TailNum LIMIT 16","hsqls":["SELECT DepTime, TailNum, SUM(TaxiOut), SUM(DivArrDelay) FROM mytable GROUP BY DepTime, TailNum  ORDER BY DepTime, TailNum LIMIT 16"]}
 {"sql":"SELECT OriginStateFips, ActualElapsedTime, WheelsOn, MIN(AirTime), MIN(DistanceGroup) FROM mytable WHERE Distance <> 643 GROUP BY OriginStateFips, ActualElapsedTime, WheelsOn  ORDER BY OriginStateFips, ActualElapsedTime, WheelsOn LIMIT 10","hsqls":["SELECT OriginStateFips, ActualElapsedTime, WheelsOn, MIN(AirTime), MIN(DistanceGroup) FROM mytable WHERE Distance <> 643 GROUP BY OriginStateFips, ActualElapsedTime, WheelsOn  ORDER BY OriginStateFips, ActualElapsedTime, WheelsOn LIMIT 10"]}
-{"sql":"SELECT DistanceGroup, COUNT(\"Month\"), SUM(ArrTime) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND ArrDelay IN (410.0, 59.0, 49.0) AND DayofMonth BETWEEN 12 AND 23 GROUP BY DistanceGroup LIMIT 7","hsqls":["SELECT DistanceGroup, COUNT(Month), SUM(ArrTime) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND ArrDelay IN (410.0, 59.0, 49.0) AND DayofMonth BETWEEN 12 AND 23 GROUP BY DistanceGroup LIMIT 7"]}
+{"sql":"SELECT DistanceGroup, COUNT(\"Month\"), SUM(ArrTime) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND ArrDelay IN (410.0, 59.0, 49.0) AND DayofMonth BETWEEN 12 AND 23 GROUP BY DistanceGroup LIMIT 7","hsqls":["SELECT DistanceGroup, COUNT(`Month`), SUM(ArrTime) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND ArrDelay IN (410.0, 59.0, 49.0) AND DayofMonth BETWEEN 12 AND 23 GROUP BY DistanceGroup LIMIT 7"]}
 {"sql":"SELECT DestStateName, UniqueCarrier, MIN(DestAirportID), MAX(DepDel15) FROM mytable WHERE AirlineID <= 21171 GROUP BY DestStateName, UniqueCarrier  ORDER BY DestStateName, UniqueCarrier LIMIT 13","hsqls":["SELECT DestStateName, UniqueCarrier, MIN(DestAirportID), MAX(DepDel15) FROM mytable WHERE AirlineID <= 21171 GROUP BY DestStateName, UniqueCarrier  ORDER BY DestStateName, UniqueCarrier LIMIT 13"]}
 {"sql":"SELECT CRSArrTime, SUM(DayofMonth), SUM(ArrTime) FROM mytable WHERE DaysSinceEpoch IN (16095, 16079) AND DivAirportLandings BETWEEN 1 AND 2 OR DestCityName <= 'Tucson, AZ' GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 22","hsqls":["SELECT CRSArrTime, SUM(DayofMonth), SUM(ArrTime) FROM mytable WHERE DaysSinceEpoch IN (16095, 16079) AND DivAirportLandings BETWEEN 1 AND 2 OR DestCityName <= 'Tucson, AZ' GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 22"]}
 {"sql":"SELECT DaysSinceEpoch, DayOfWeek, SUM(FirstDepTime), COUNT(AirTime), MAX(LateAircraftDelay) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestState IN ('UT') GROUP BY DaysSinceEpoch, DayOfWeek  ORDER BY DaysSinceEpoch, DayOfWeek LIMIT 29","hsqls":["SELECT DaysSinceEpoch, DayOfWeek, SUM(FirstDepTime), COUNT(AirTime), MAX(LateAircraftDelay) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestState IN ('UT') GROUP BY DaysSinceEpoch, DayOfWeek  ORDER BY DaysSinceEpoch, DayOfWeek LIMIT 29"]}
 {"sql":"SELECT SecurityDelay, ArrDel15, AVG(DivArrDelay), MAX(FlightNum) FROM mytable GROUP BY SecurityDelay, ArrDel15  ORDER BY SecurityDelay, ArrDel15 LIMIT 11","hsqls":["SELECT SecurityDelay, ArrDel15, AVG(DivArrDelay), MAX(FlightNum) FROM mytable GROUP BY SecurityDelay, ArrDel15  ORDER BY SecurityDelay, ArrDel15 LIMIT 11"]}
-{"sql":"SELECT DivAirports, Distance FROM mytable WHERE DepartureDelayGroups IN (5, 9, 11) AND OriginStateName BETWEEN 'California' AND 'Vermont' LIMIT 13","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Distance FROM mytable WHERE DepartureDelayGroups IN (5, 9, 11) AND OriginStateName BETWEEN 'California' AND 'Vermont' LIMIT 10000"]}
+{"sql":"SELECT DivAirports, Distance FROM mytable WHERE DepartureDelayGroups IN (5, 9, 11) AND OriginStateName BETWEEN 'California' AND 'Vermont' LIMIT 13","hsqls":["SELECT DivAirports, Distance FROM mytable WHERE DepartureDelayGroups IN (5, 9, 11) AND OriginStateName BETWEEN 'California' AND 'Vermont' LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, DepTime, DepTimeBlk, MAX(SecurityDelay), MIN(WheelsOff), SUM(OriginStateFips) FROM mytable GROUP BY DestStateFips, DepTime, DepTimeBlk  ORDER BY DestStateFips, DepTime, DepTimeBlk LIMIT 20","hsqls":["SELECT DestStateFips, DepTime, DepTimeBlk, MAX(SecurityDelay), MIN(WheelsOff), SUM(OriginStateFips) FROM mytable GROUP BY DestStateFips, DepTime, DepTimeBlk  ORDER BY DestStateFips, DepTime, DepTimeBlk LIMIT 20"]}
 {"sql":"SELECT DepartureDelayGroups, Carrier, DepTime FROM mytable WHERE CarrierDelay > 73 AND DepDelay NOT IN (126.0, 57.0) ORDER BY FlightDate, ArrTime, DestAirportID LIMIT 7"}
-{"sql":"SELECT WeatherDelay, AirlineID, DivTotalGTimes FROM mytable WHERE DivAirportLandings IN (2, 0, 9) OR SecurityDelay BETWEEN 4 AND 10 ORDER BY CRSDepTime, \"Month\" LIMIT 28","hsqls":["SELECT WeatherDelay, AirlineID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DivAirportLandings IN (2, 0, 9) OR SecurityDelay BETWEEN 4 AND 10 ORDER BY CRSDepTime, Month LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, AirlineID, DivTotalGTimes FROM mytable WHERE DivAirportLandings IN (2, 0, 9) OR SecurityDelay BETWEEN 4 AND 10 ORDER BY CRSDepTime, \"Month\" LIMIT 28","hsqls":["SELECT WeatherDelay, AirlineID, DivTotalGTimes FROM mytable WHERE DivAirportLandings IN (2, 0, 9) OR SecurityDelay BETWEEN 4 AND 10 ORDER BY CRSDepTime, `Month` LIMIT 10000"]}
 {"sql":"SELECT DepTime, NASDelay, OriginAirportID, COUNT(Flights), SUM(DestAirportSeqID) FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'WN' GROUP BY DepTime, NASDelay, OriginAirportID  ORDER BY DepTime, NASDelay, OriginAirportID LIMIT 24","hsqls":["SELECT DepTime, NASDelay, OriginAirportID, COUNT(Flights), SUM(DestAirportSeqID) FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'WN' GROUP BY DepTime, NASDelay, OriginAirportID  ORDER BY DepTime, NASDelay, OriginAirportID LIMIT 24"]}
-{"sql":"SELECT DivReachedDest, AirTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirportIDs IN (11252, 13830, 13232, 15389) OR DepTime NOT IN (1411, 1421, 1249, 420, 1128) GROUP BY DivReachedDest, AirTime, DaysSinceEpoch LIMIT 29","hsqls":["SELECT DivReachedDest, AirTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (11252, 13830, 13232, 15389) OR DivAirportIDs__MV1 IN (11252, 13830, 13232, 15389) OR DivAirportIDs__MV2 IN (11252, 13830, 13232, 15389) OR DivAirportIDs__MV3 IN (11252, 13830, 13232, 15389) OR DivAirportIDs__MV4 IN (11252, 13830, 13232, 15389)) OR DepTime NOT IN (1411, 1421, 1249, 420, 1128) GROUP BY DivReachedDest, AirTime, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, AirTime, MAX(\"Year\"), COUNT(Cancelled) FROM mytable WHERE DivTotalGTimes = 53 AND OriginState = 'MO' GROUP BY TotalAddGTime, AirTime LIMIT 4","hsqls":["SELECT TotalAddGTime, AirTime, MAX(Year), COUNT(Cancelled) FROM mytable WHERE (DivTotalGTimes__MV0 = 53 OR DivTotalGTimes__MV1 = 53 OR DivTotalGTimes__MV2 = 53 OR DivTotalGTimes__MV3 = 53 OR DivTotalGTimes__MV4 = 53) AND OriginState = 'MO' GROUP BY TotalAddGTime, AirTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, AirTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirportIDs IN (11252, 13830, 13232, 15389) OR DepTime NOT IN (1411, 1421, 1249, 420, 1128) GROUP BY DivReachedDest, AirTime, DaysSinceEpoch LIMIT 29","hsqls":["SELECT DivReachedDest, AirTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (11252, 13830, 13232, 15389) OR DivAirportIDs[2] IN (11252, 13830, 13232, 15389) OR DivAirportIDs[3] IN (11252, 13830, 13232, 15389) OR DivAirportIDs[4] IN (11252, 13830, 13232, 15389) OR DivAirportIDs[5] IN (11252, 13830, 13232, 15389)) OR DepTime NOT IN (1411, 1421, 1249, 420, 1128) GROUP BY DivReachedDest, AirTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, AirTime, MAX(\"Year\"), COUNT(Cancelled) FROM mytable WHERE DivTotalGTimes = 53 AND OriginState = 'MO' GROUP BY TotalAddGTime, AirTime LIMIT 4","hsqls":["SELECT TotalAddGTime, AirTime, MAX(`Year`), COUNT(Cancelled) FROM mytable WHERE (DivTotalGTimes[1] = 53 OR DivTotalGTimes[2] = 53 OR DivTotalGTimes[3] = 53 OR DivTotalGTimes[4] = 53 OR DivTotalGTimes[5] = 53) AND OriginState = 'MO' GROUP BY TotalAddGTime, AirTime LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(DivArrDelay), SUM(DestAirportID) FROM mytable WHERE WheelsOn NOT IN (1244, 1414) OR OriginStateName NOT IN ('Delaware', 'U.S. Pacific Trust Territories and Possessions', 'Kansas', 'Montana') OR DivActualElapsedTime < 277 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 28","hsqls":["SELECT DaysSinceEpoch, COUNT(DivArrDelay), SUM(DestAirportID) FROM mytable WHERE WheelsOn NOT IN (1244, 1414) OR OriginStateName NOT IN ('Delaware', 'U.S. Pacific Trust Territories and Possessions', 'Kansas', 'Montana') OR DivActualElapsedTime < 277 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 28"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE DistanceGroup BETWEEN 7 AND 4 AND OriginState NOT IN ('FL') OR Dest <= 'WRG' ORDER BY UniqueCarrier, DivArrDelay, ArrivalDelayGroups LIMIT 7"}
-{"sql":"SELECT COUNT(DivAirportLandings) FROM mytable WHERE DivDistance BETWEEN 539 AND 39 OR DivAirportIDs IN (13486, 10930, 11057) LIMIT 8","hsqls":["SELECT COUNT(DivAirportLandings) FROM mytable WHERE DivDistance BETWEEN 539 AND 39 OR (DivAirportIDs__MV0 IN (13486, 10930, 11057) OR DivAirportIDs__MV1 IN (13486, 10930, 11057) OR DivAirportIDs__MV2 IN (13486, 10930, 11057) OR DivAirportIDs__MV3 IN (13486, 10930, 11057) OR DivAirportIDs__MV4 IN (13486, 10930, 11057)) LIMIT 10000"]}
-{"sql":"SELECT DivActualElapsedTime, OriginStateName, SUM(DestAirportSeqID), MIN(DepDel15), MIN(\"Month\") FROM mytable WHERE DivWheelsOffs IN (2205) AND WeatherDelay IN (16) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 18","hsqls":["SELECT DivActualElapsedTime, OriginStateName, SUM(DestAirportSeqID), MIN(DepDel15), MIN(Month) FROM mytable WHERE (DivWheelsOffs__MV0 IN (2205) OR DivWheelsOffs__MV1 IN (2205) OR DivWheelsOffs__MV2 IN (2205) OR DivWheelsOffs__MV3 IN (2205) OR DivWheelsOffs__MV4 IN (2205)) AND WeatherDelay IN (16) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT COUNT(DivAirportLandings) FROM mytable WHERE DivDistance BETWEEN 539 AND 39 OR DivAirportIDs IN (13486, 10930, 11057) LIMIT 8","hsqls":["SELECT COUNT(DivAirportLandings) FROM mytable WHERE DivDistance BETWEEN 539 AND 39 OR (DivAirportIDs[1] IN (13486, 10930, 11057) OR DivAirportIDs[2] IN (13486, 10930, 11057) OR DivAirportIDs[3] IN (13486, 10930, 11057) OR DivAirportIDs[4] IN (13486, 10930, 11057) OR DivAirportIDs[5] IN (13486, 10930, 11057)) LIMIT 10000"]}
+{"sql":"SELECT DivActualElapsedTime, OriginStateName, SUM(DestAirportSeqID), MIN(DepDel15), MIN(\"Month\") FROM mytable WHERE DivWheelsOffs IN (2205) AND WeatherDelay IN (16) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 18","hsqls":["SELECT DivActualElapsedTime, OriginStateName, SUM(DestAirportSeqID), MIN(DepDel15), MIN(`Month`) FROM mytable WHERE (DivWheelsOffs[1] IN (2205) OR DivWheelsOffs[2] IN (2205) OR DivWheelsOffs[3] IN (2205) OR DivWheelsOffs[4] IN (2205) OR DivWheelsOffs[5] IN (2205)) AND WeatherDelay IN (16) GROUP BY DivActualElapsedTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, ArrDelay FROM mytable WHERE Distance <= 280 ORDER BY DepDel15, NASDelay LIMIT 9"}
 {"sql":"SELECT DistanceGroup, Quarter FROM mytable WHERE OriginAirportSeqID = 1163002 AND DestStateFips BETWEEN 45 AND 22 OR ActualElapsedTime NOT IN (128, 113, 323, 384, 248) ORDER BY Distance, ArrivalDelayGroups LIMIT 28"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime BETWEEN 374 AND 370 OR \"Month\" NOT IN (1) LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime BETWEEN 374 AND 370 OR Month NOT IN (1) LIMIT 8"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime BETWEEN 374 AND 370 OR \"Month\" NOT IN (1) LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime BETWEEN 374 AND 370 OR `Month` NOT IN (1) LIMIT 8"]}
 {"sql":"SELECT DivReachedDest, DepTime, TaxiIn, MIN(DepTime) FROM mytable WHERE TotalAddGTime NOT IN (21, 20, 74, -9999) OR OriginCityName BETWEEN 'Huntsville, AL' AND 'Dallas, TX' GROUP BY DivReachedDest, DepTime, TaxiIn  ORDER BY DivReachedDest, DepTime, TaxiIn LIMIT 24","hsqls":["SELECT DivReachedDest, DepTime, TaxiIn, MIN(DepTime) FROM mytable WHERE TotalAddGTime NOT IN (21, 20, 74, -9999) OR OriginCityName BETWEEN 'Huntsville, AL' AND 'Dallas, TX' GROUP BY DivReachedDest, DepTime, TaxiIn  ORDER BY DivReachedDest, DepTime, TaxiIn LIMIT 24"]}
 {"sql":"SELECT UniqueCarrier FROM mytable LIMIT 5"}
-{"sql":"SELECT DistanceGroup, CRSArrTime, DestStateName FROM mytable WHERE DivTotalGTimes BETWEEN 53 AND 26 OR DivWheelsOns > 908 AND DestWac < 88 ORDER BY DestStateFips LIMIT 16","hsqls":["SELECT DistanceGroup, CRSArrTime, DestStateName FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 53 AND 26 OR DivTotalGTimes__MV1 BETWEEN 53 AND 26 OR DivTotalGTimes__MV2 BETWEEN 53 AND 26 OR DivTotalGTimes__MV3 BETWEEN 53 AND 26 OR DivTotalGTimes__MV4 BETWEEN 53 AND 26) OR (DivWheelsOns__MV0 > 908 OR DivWheelsOns__MV1 > 908 OR DivWheelsOns__MV2 > 908 OR DivWheelsOns__MV3 > 908 OR DivWheelsOns__MV4 > 908) AND DestWac < 88 ORDER BY DestStateFips LIMIT 10000"]}
-{"sql":"SELECT OriginState, DivTailNums, AirlineID FROM mytable ORDER BY Quarter LIMIT 8","hsqls":["SELECT OriginState, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, AirlineID FROM mytable ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, CRSArrTime, DestStateName FROM mytable WHERE DivTotalGTimes BETWEEN 53 AND 26 OR DivWheelsOns > 908 AND DestWac < 88 ORDER BY DestStateFips LIMIT 16","hsqls":["SELECT DistanceGroup, CRSArrTime, DestStateName FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 53 AND 26 OR DivTotalGTimes[2] BETWEEN 53 AND 26 OR DivTotalGTimes[3] BETWEEN 53 AND 26 OR DivTotalGTimes[4] BETWEEN 53 AND 26 OR DivTotalGTimes[5] BETWEEN 53 AND 26) OR (DivWheelsOns[1] > 908 OR DivWheelsOns[2] > 908 OR DivWheelsOns[3] > 908 OR DivWheelsOns[4] > 908 OR DivWheelsOns[5] > 908) AND DestWac < 88 ORDER BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivTailNums, AirlineID FROM mytable ORDER BY Quarter LIMIT 8","hsqls":["SELECT OriginState, DivTailNums, AirlineID FROM mytable ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, ArrDelay FROM mytable WHERE LateAircraftDelay NOT IN (265) OR AirTime >= 402 AND CRSArrTime >= 822 ORDER BY LongestAddGTime LIMIT 19"}
 {"sql":"SELECT DivReachedDest, CarrierDelay, WheelsOn FROM mytable ORDER BY OriginCityMarketID, OriginCityName, DaysSinceEpoch LIMIT 20"}
 {"sql":"SELECT DivActualElapsedTime, SUM(WheelsOff) FROM mytable GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 22","hsqls":["SELECT DivActualElapsedTime, SUM(WheelsOff) FROM mytable GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 22"]}
@@ -5107,9 +5107,9 @@
 {"sql":"SELECT DepDel15 FROM mytable WHERE SecurityDelay IN (10, 4, 18, -9999) AND CRSArrTime >= 1111 AND OriginState BETWEEN 'MA' AND 'IL' ORDER BY DepartureDelayGroups, DestCityName, OriginStateName LIMIT 11"}
 {"sql":"SELECT FlightDate, Cancelled, COUNT(*) FROM mytable GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 23","hsqls":["SELECT FlightDate, Cancelled, COUNT(*) FROM mytable GROUP BY FlightDate, Cancelled  ORDER BY FlightDate, Cancelled LIMIT 23"]}
 {"sql":"SELECT CarrierDelay, DepTime, DestCityName FROM mytable WHERE DestWac IN (72) ORDER BY TaxiIn LIMIT 17"}
-{"sql":"SELECT FirstDepTime, Distance, DivTotalGTimes FROM mytable WHERE Carrier IN ('AS') AND \"Year\" < 2014 OR CRSElapsedTime = 37 ORDER BY FlightNum, WheelsOn LIMIT 13","hsqls":["SELECT FirstDepTime, Distance, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Carrier IN ('AS') AND Year < 2014 OR CRSElapsedTime = 37 ORDER BY FlightNum, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, ActualElapsedTime, Cancelled, COUNT(DestStateFips), MIN(TaxiOut) FROM mytable WHERE DivAirports > 'PHX' GROUP BY OriginAirportSeqID, ActualElapsedTime, Cancelled LIMIT 17","hsqls":["SELECT OriginAirportSeqID, ActualElapsedTime, Cancelled, COUNT(DestStateFips), MIN(TaxiOut) FROM mytable WHERE (DivAirports__MV0 > 'PHX' OR DivAirports__MV1 > 'PHX' OR DivAirports__MV2 > 'PHX' OR DivAirports__MV3 > 'PHX' OR DivAirports__MV4 > 'PHX') GROUP BY OriginAirportSeqID, ActualElapsedTime, Cancelled LIMIT 10000"]}
-{"sql":"SELECT DepDel15, DivActualElapsedTime, MAX(FirstDepTime), COUNT(FlightDate) FROM mytable WHERE DivAirportSeqIDs IN (1126702, 1343302, 1112202) GROUP BY DepDel15, DivActualElapsedTime LIMIT 13","hsqls":["SELECT DepDel15, DivActualElapsedTime, MAX(FirstDepTime), COUNT(FlightDate) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs__MV1 IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs__MV2 IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs__MV3 IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs__MV4 IN (1126702, 1343302, 1112202)) GROUP BY DepDel15, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, Distance, DivTotalGTimes FROM mytable WHERE Carrier IN ('AS') AND \"Year\" < 2014 OR CRSElapsedTime = 37 ORDER BY FlightNum, WheelsOn LIMIT 13","hsqls":["SELECT FirstDepTime, Distance, DivTotalGTimes FROM mytable WHERE Carrier IN ('AS') AND `Year` < 2014 OR CRSElapsedTime = 37 ORDER BY FlightNum, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, ActualElapsedTime, Cancelled, COUNT(DestStateFips), MIN(TaxiOut) FROM mytable WHERE DivAirports > 'PHX' GROUP BY OriginAirportSeqID, ActualElapsedTime, Cancelled LIMIT 17","hsqls":["SELECT OriginAirportSeqID, ActualElapsedTime, Cancelled, COUNT(DestStateFips), MIN(TaxiOut) FROM mytable WHERE (DivAirports[1] > 'PHX' OR DivAirports[2] > 'PHX' OR DivAirports[3] > 'PHX' OR DivAirports[4] > 'PHX' OR DivAirports[5] > 'PHX') GROUP BY OriginAirportSeqID, ActualElapsedTime, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DivActualElapsedTime, MAX(FirstDepTime), COUNT(FlightDate) FROM mytable WHERE DivAirportSeqIDs IN (1126702, 1343302, 1112202) GROUP BY DepDel15, DivActualElapsedTime LIMIT 13","hsqls":["SELECT DepDel15, DivActualElapsedTime, MAX(FirstDepTime), COUNT(FlightDate) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs[2] IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs[3] IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs[4] IN (1126702, 1343302, 1112202) OR DivAirportSeqIDs[5] IN (1126702, 1343302, 1112202)) GROUP BY DepDel15, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID, MIN(OriginAirportID), MAX(DistanceGroup), AVG(WheelsOn) FROM mytable WHERE DivDistance = 551 AND FlightNum < 777 AND DivActualElapsedTime BETWEEN 346 AND 1108 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 13","hsqls":["SELECT OriginAirportID, MIN(OriginAirportID), MAX(DistanceGroup), AVG(WheelsOn) FROM mytable WHERE DivDistance = 551 AND FlightNum < 777 AND DivActualElapsedTime BETWEEN 346 AND 1108 GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 13"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE DivReachedDest > 1 LIMIT 7"}
 {"sql":"SELECT LateAircraftDelay, DepTime FROM mytable LIMIT 3"}
@@ -5117,41 +5117,41 @@
 {"sql":"SELECT TotalAddGTime, ArrDelay, MIN(CRSElapsedTime) FROM mytable GROUP BY TotalAddGTime, ArrDelay  ORDER BY TotalAddGTime, ArrDelay LIMIT 4","hsqls":["SELECT TotalAddGTime, ArrDelay, MIN(CRSElapsedTime) FROM mytable GROUP BY TotalAddGTime, ArrDelay  ORDER BY TotalAddGTime, ArrDelay LIMIT 4"]}
 {"sql":"SELECT NASDelay, Origin, OriginAirportID FROM mytable WHERE DayOfWeek BETWEEN 5 AND 5 AND Dest BETWEEN 'WRG' AND 'GUC' AND DestCityName BETWEEN 'Topeka, KS' AND 'Pocatello, ID' ORDER BY ActualElapsedTime, DayofMonth, OriginStateName LIMIT 28"}
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY ArrTimeBlk LIMIT 22"}
-{"sql":"SELECT DepDelayMinutes, CarrierDelay, MAX(DivDistance), AVG(Quarter), MAX(ArrTime) FROM mytable WHERE TaxiOut IN (42, 32, 124, 17, 60) AND TaxiOut BETWEEN 30 AND 13 OR DivAirportSeqIDs <= 1226402 GROUP BY DepDelayMinutes, CarrierDelay LIMIT 22","hsqls":["SELECT DepDelayMinutes, CarrierDelay, MAX(DivDistance), AVG(Quarter), MAX(ArrTime) FROM mytable WHERE TaxiOut IN (42, 32, 124, 17, 60) AND TaxiOut BETWEEN 30 AND 13 OR (DivAirportSeqIDs__MV0 <= 1226402 OR DivAirportSeqIDs__MV1 <= 1226402 OR DivAirportSeqIDs__MV2 <= 1226402 OR DivAirportSeqIDs__MV3 <= 1226402 OR DivAirportSeqIDs__MV4 <= 1226402) GROUP BY DepDelayMinutes, CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, CarrierDelay, MAX(DivDistance), AVG(Quarter), MAX(ArrTime) FROM mytable WHERE TaxiOut IN (42, 32, 124, 17, 60) AND TaxiOut BETWEEN 30 AND 13 OR DivAirportSeqIDs <= 1226402 GROUP BY DepDelayMinutes, CarrierDelay LIMIT 22","hsqls":["SELECT DepDelayMinutes, CarrierDelay, MAX(DivDistance), AVG(Quarter), MAX(ArrTime) FROM mytable WHERE TaxiOut IN (42, 32, 124, 17, 60) AND TaxiOut BETWEEN 30 AND 13 OR (DivAirportSeqIDs[1] <= 1226402 OR DivAirportSeqIDs[2] <= 1226402 OR DivAirportSeqIDs[3] <= 1226402 OR DivAirportSeqIDs[4] <= 1226402 OR DivAirportSeqIDs[5] <= 1226402) GROUP BY DepDelayMinutes, CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID, MIN(Diverted), COUNT(DayofMonth), SUM(Distance) FROM mytable WHERE DayofMonth IN (3, 1) OR ArrDel15 <> -9999 AND AirlineID <> 20366 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 19","hsqls":["SELECT DestCityMarketID, MIN(Diverted), COUNT(DayofMonth), SUM(Distance) FROM mytable WHERE DayofMonth IN (3, 1) OR ArrDel15 <> -9999 AND AirlineID <> 20366 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 19"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE ArrTime NOT IN (1136, 2024, 720, 917, 1332) LIMIT 23"}
 {"sql":"SELECT COUNT(CarrierDelay), SUM(DepartureDelayGroups) FROM mytable LIMIT 9"}
-{"sql":"SELECT FlightNum, DivAirportIDs, Origin FROM mytable WHERE DepTimeBlk BETWEEN '1500-1559' AND '1000-1059' AND Distance BETWEEN 302 AND 2521 OR FlightNum <> 2718 LIMIT 13","hsqls":["SELECT FlightNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, Origin FROM mytable WHERE DepTimeBlk BETWEEN '1500-1559' AND '1000-1059' AND Distance BETWEEN 302 AND 2521 OR FlightNum <> 2718 LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivAirportIDs, Origin FROM mytable WHERE DepTimeBlk BETWEEN '1500-1559' AND '1000-1059' AND Distance BETWEEN 302 AND 2521 OR FlightNum <> 2718 LIMIT 13","hsqls":["SELECT FlightNum, DivAirportIDs, Origin FROM mytable WHERE DepTimeBlk BETWEEN '1500-1559' AND '1000-1059' AND Distance BETWEEN 302 AND 2521 OR FlightNum <> 2718 LIMIT 10000"]}
 {"sql":"SELECT FlightNum, AirlineID, SUM(DepDel15), COUNT(ArrTimeBlk), MAX(CRSArrTime) FROM mytable WHERE OriginAirportID NOT IN (15411, 13184, 11049, 12003, 12884) OR CancellationCode > 'C' GROUP BY FlightNum, AirlineID  ORDER BY FlightNum, AirlineID LIMIT 20","hsqls":["SELECT FlightNum, AirlineID, SUM(DepDel15), COUNT(ArrTimeBlk), MAX(CRSArrTime) FROM mytable WHERE OriginAirportID NOT IN (15411, 13184, 11049, 12003, 12884) OR CancellationCode > 'C' GROUP BY FlightNum, AirlineID  ORDER BY FlightNum, AirlineID LIMIT 20"]}
-{"sql":"SELECT DepDelayMinutes, DivTailNums, Origin FROM mytable ORDER BY DestStateFips, TaxiIn, OriginStateName LIMIT 10","hsqls":["SELECT DepDelayMinutes, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Origin FROM mytable ORDER BY DestStateFips, TaxiIn, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivTailNums, Origin FROM mytable ORDER BY DestStateFips, TaxiIn, OriginStateName LIMIT 10","hsqls":["SELECT DepDelayMinutes, DivTailNums, Origin FROM mytable ORDER BY DestStateFips, TaxiIn, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Quarter, DestCityName, WheelsOn, MIN(LateAircraftDelay), COUNT(DepTimeBlk), SUM(DestAirportID) FROM mytable GROUP BY Quarter, DestCityName, WheelsOn  ORDER BY Quarter, DestCityName, WheelsOn LIMIT 19","hsqls":["SELECT Quarter, DestCityName, WheelsOn, MIN(LateAircraftDelay), COUNT(DepTimeBlk), SUM(DestAirportID) FROM mytable GROUP BY Quarter, DestCityName, WheelsOn  ORDER BY Quarter, DestCityName, WheelsOn LIMIT 19"]}
-{"sql":"SELECT SecurityDelay, FlightDate, ArrTimeBlk, COUNT(*) FROM mytable WHERE DaysSinceEpoch IN (16098, 16099, 16100, 16081, 16086) OR DivAirportSeqIDs IN (1232303, 1052904, 1382902) AND OriginCityMarketID BETWEEN 30431 AND 33214 GROUP BY SecurityDelay, FlightDate, ArrTimeBlk LIMIT 29","hsqls":["SELECT SecurityDelay, FlightDate, ArrTimeBlk, COUNT(*) FROM mytable WHERE DaysSinceEpoch IN (16098, 16099, 16100, 16081, 16086) OR (DivAirportSeqIDs__MV0 IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs__MV1 IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs__MV2 IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs__MV3 IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs__MV4 IN (1232303, 1052904, 1382902)) AND OriginCityMarketID BETWEEN 30431 AND 33214 GROUP BY SecurityDelay, FlightDate, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, FlightDate, ArrTimeBlk, COUNT(*) FROM mytable WHERE DaysSinceEpoch IN (16098, 16099, 16100, 16081, 16086) OR DivAirportSeqIDs IN (1232303, 1052904, 1382902) AND OriginCityMarketID BETWEEN 30431 AND 33214 GROUP BY SecurityDelay, FlightDate, ArrTimeBlk LIMIT 29","hsqls":["SELECT SecurityDelay, FlightDate, ArrTimeBlk, COUNT(*) FROM mytable WHERE DaysSinceEpoch IN (16098, 16099, 16100, 16081, 16086) OR (DivAirportSeqIDs[1] IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs[2] IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs[3] IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs[4] IN (1232303, 1052904, 1382902) OR DivAirportSeqIDs[5] IN (1232303, 1052904, 1382902)) AND OriginCityMarketID BETWEEN 30431 AND 33214 GROUP BY SecurityDelay, FlightDate, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT COUNT(DepartureDelayGroups), COUNT(WheelsOff), MAX(DayofMonth) FROM mytable"}
 {"sql":"SELECT MAX(ArrDel15), MIN(OriginAirportSeqID), COUNT(WheelsOn) FROM mytable WHERE SecurityDelay <= 18 AND AirTime <> 361 OR FlightDate <> '2014-01-09' LIMIT 20"}
-{"sql":"SELECT DivAirportSeqIDs, OriginWac FROM mytable WHERE TaxiIn BETWEEN 30 AND 17 ORDER BY DestWac, DestAirportID LIMIT 2","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, OriginWac FROM mytable WHERE TaxiIn BETWEEN 30 AND 17 ORDER BY DestWac, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, OriginWac FROM mytable WHERE TaxiIn BETWEEN 30 AND 17 ORDER BY DestWac, DestAirportID LIMIT 2","hsqls":["SELECT DivAirportSeqIDs, OriginWac FROM mytable WHERE TaxiIn BETWEEN 30 AND 17 ORDER BY DestWac, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT DepDelay, DestStateName, NASDelay, COUNT(OriginCityName) FROM mytable WHERE OriginAirportSeqID IN (1457604, 1082103, 1142303, 1397002, 1125903) AND FlightNum BETWEEN 1033 AND 3130 GROUP BY DepDelay, DestStateName, NASDelay  ORDER BY DepDelay, DestStateName, NASDelay LIMIT 7","hsqls":["SELECT DepDelay, DestStateName, NASDelay, COUNT(OriginCityName) FROM mytable WHERE OriginAirportSeqID IN (1457604, 1082103, 1142303, 1397002, 1125903) AND FlightNum BETWEEN 1033 AND 3130 GROUP BY DepDelay, DestStateName, NASDelay  ORDER BY DepDelay, DestStateName, NASDelay LIMIT 7"]}
 {"sql":"SELECT SUM(OriginAirportID), COUNT(TailNum), MIN(DestStateFips) FROM mytable LIMIT 8"}
 {"sql":"SELECT LongestAddGTime, TaxiIn, Dest, COUNT(OriginWac), SUM(ArrTime), AVG(WheelsOff) FROM mytable WHERE CRSArrTime <> 1548 AND DestAirportID IN (12448, 12335, 13930, 11111) GROUP BY LongestAddGTime, TaxiIn, Dest  ORDER BY LongestAddGTime, TaxiIn, Dest LIMIT 8","hsqls":["SELECT LongestAddGTime, TaxiIn, Dest, COUNT(OriginWac), SUM(ArrTime), AVG(WheelsOff) FROM mytable WHERE CRSArrTime <> 1548 AND DestAirportID IN (12448, 12335, 13930, 11111) GROUP BY LongestAddGTime, TaxiIn, Dest  ORDER BY LongestAddGTime, TaxiIn, Dest LIMIT 8"]}
 {"sql":"SELECT FlightDate, SecurityDelay, OriginAirportID FROM mytable WHERE WheelsOn >= 1318 ORDER BY OriginCityName, CancellationCode LIMIT 1"}
-{"sql":"SELECT ArrDelay FROM mytable WHERE AirlineID BETWEEN 20409 AND 20398 AND OriginAirportSeqID BETWEEN 1099002 AND 1337702 ORDER BY \"Month\" LIMIT 13","hsqls":["SELECT ArrDelay FROM mytable WHERE AirlineID BETWEEN 20409 AND 20398 AND OriginAirportSeqID BETWEEN 1099002 AND 1337702 ORDER BY Month LIMIT 13"]}
-{"sql":"SELECT DivDistance, NASDelay, DayofMonth FROM mytable WHERE Origin <> 'LAX' AND \"Month\" < 1 ORDER BY \"Year\" LIMIT 13","hsqls":["SELECT DivDistance, NASDelay, DayofMonth FROM mytable WHERE Origin <> 'LAX' AND Month < 1 ORDER BY Year LIMIT 13"]}
-{"sql":"SELECT Flights, DestCityMarketID, DivArrDelay, MIN(ArrDelayMinutes), SUM(\"Month\"), SUM(Quarter) FROM mytable GROUP BY Flights, DestCityMarketID, DivArrDelay LIMIT 5","hsqls":["SELECT Flights, DestCityMarketID, DivArrDelay, MIN(ArrDelayMinutes), SUM(Month), SUM(Quarter) FROM mytable GROUP BY Flights, DestCityMarketID, DivArrDelay LIMIT 5"]}
+{"sql":"SELECT ArrDelay FROM mytable WHERE AirlineID BETWEEN 20409 AND 20398 AND OriginAirportSeqID BETWEEN 1099002 AND 1337702 ORDER BY \"Month\" LIMIT 13","hsqls":["SELECT ArrDelay FROM mytable WHERE AirlineID BETWEEN 20409 AND 20398 AND OriginAirportSeqID BETWEEN 1099002 AND 1337702 ORDER BY `Month` LIMIT 13"]}
+{"sql":"SELECT DivDistance, NASDelay, DayofMonth FROM mytable WHERE Origin <> 'LAX' AND \"Month\" < 1 ORDER BY \"Year\" LIMIT 13","hsqls":["SELECT DivDistance, NASDelay, DayofMonth FROM mytable WHERE Origin <> 'LAX' AND `Month` < 1 ORDER BY `Year` LIMIT 13"]}
+{"sql":"SELECT Flights, DestCityMarketID, DivArrDelay, MIN(ArrDelayMinutes), SUM(\"Month\"), SUM(Quarter) FROM mytable GROUP BY Flights, DestCityMarketID, DivArrDelay LIMIT 5","hsqls":["SELECT Flights, DestCityMarketID, DivArrDelay, MIN(ArrDelayMinutes), SUM(`Month`), SUM(Quarter) FROM mytable GROUP BY Flights, DestCityMarketID, DivArrDelay LIMIT 5"]}
 {"sql":"SELECT DestCityName, DayofMonth, DivAirportLandings FROM mytable WHERE NASDelay BETWEEN 41 AND 179 ORDER BY Diverted, Dest LIMIT 7"}
 {"sql":"SELECT CRSArrTime, MAX(ArrDel15), MAX(CarrierDelay), SUM(OriginCityMarketID) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 23","hsqls":["SELECT CRSArrTime, MAX(ArrDel15), MAX(CarrierDelay), SUM(OriginCityMarketID) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 23"]}
 {"sql":"SELECT TaxiIn, Dest, DivArrDelay FROM mytable WHERE NASDelay = 47 ORDER BY DestWac, Carrier LIMIT 15"}
-{"sql":"SELECT MIN(DaysSinceEpoch), AVG(FlightNum) FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR DivAirportIDs IN (14730, 14262, 10868) LIMIT 6","hsqls":["SELECT MIN(DaysSinceEpoch), AVG(FlightNum)  FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR (DivAirportIDs__MV0 IN (14730, 14262, 10868) OR DivAirportIDs__MV1 IN (14730, 14262, 10868) OR DivAirportIDs__MV2 IN (14730, 14262, 10868) OR DivAirportIDs__MV3 IN (14730, 14262, 10868) OR DivAirportIDs__MV4 IN (14730, 14262, 10868)) LIMIT 10000"]}
+{"sql":"SELECT MIN(DaysSinceEpoch), AVG(FlightNum) FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR DivAirportIDs IN (14730, 14262, 10868) LIMIT 6","hsqls":["SELECT MIN(DaysSinceEpoch), AVG(FlightNum)  FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR (DivAirportIDs[1] IN (14730, 14262, 10868) OR DivAirportIDs[2] IN (14730, 14262, 10868) OR DivAirportIDs[3] IN (14730, 14262, 10868) OR DivAirportIDs[4] IN (14730, 14262, 10868) OR DivAirportIDs[5] IN (14730, 14262, 10868)) LIMIT 10000"]}
 {"sql":"SELECT DepDelay, ArrDel15, DestStateName, COUNT(Quarter), MIN(DepDel15), COUNT(AirTime) FROM mytable GROUP BY DepDelay, ArrDel15, DestStateName  ORDER BY DepDelay, ArrDel15, DestStateName LIMIT 18","hsqls":["SELECT DepDelay, ArrDel15, DestStateName, COUNT(Quarter), MIN(DepDel15), COUNT(AirTime) FROM mytable GROUP BY DepDelay, ArrDel15, DestStateName  ORDER BY DepDelay, ArrDel15, DestStateName LIMIT 18"]}
 {"sql":"SELECT DistanceGroup, ArrTimeBlk, UniqueCarrier FROM mytable ORDER BY CRSArrTime, OriginAirportID LIMIT 21"}
 {"sql":"SELECT OriginAirportSeqID, CancellationCode, ArrivalDelayGroups, MAX(WheelsOff), COUNT(Cancelled), SUM(DivReachedDest) FROM mytable WHERE DivActualElapsedTime BETWEEN 196 AND 291 AND DivArrDelay NOT IN (418, 96, 364, 441, 308) AND DayOfWeek NOT IN (2) GROUP BY OriginAirportSeqID, CancellationCode, ArrivalDelayGroups  ORDER BY OriginAirportSeqID, CancellationCode, ArrivalDelayGroups LIMIT 18","hsqls":["SELECT OriginAirportSeqID, CancellationCode, ArrivalDelayGroups, MAX(WheelsOff), COUNT(Cancelled), SUM(DivReachedDest) FROM mytable WHERE DivActualElapsedTime BETWEEN 196 AND 291 AND DivArrDelay NOT IN (418, 96, 364, 441, 308) AND DayOfWeek NOT IN (2) GROUP BY OriginAirportSeqID, CancellationCode, ArrivalDelayGroups  ORDER BY OriginAirportSeqID, CancellationCode, ArrivalDelayGroups LIMIT 18"]}
-{"sql":"SELECT Origin FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR Carrier <> 'VX' ORDER BY DepTime","hsqls":["SELECT Origin FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR Carrier <> 'VX' ORDER BY DepTime"]}
-{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 ORDER BY DestState, FirstDepTime, \"Month\" LIMIT 10","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 ORDER BY DestState, FirstDepTime, Month LIMIT 10"]}
+{"sql":"SELECT Origin FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR Carrier <> 'VX' ORDER BY DepTime","hsqls":["SELECT Origin FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR Carrier <> 'VX' ORDER BY DepTime"]}
+{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 ORDER BY DestState, FirstDepTime, \"Month\" LIMIT 10","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 ORDER BY DestState, FirstDepTime, `Month` LIMIT 10"]}
 {"sql":"SELECT DivReachedDest FROM mytable LIMIT 14"}
-{"sql":"SELECT CRSArrTime, MAX(DivActualElapsedTime), COUNT(WheelsOff) FROM mytable WHERE DivAirportIDs < 15016 GROUP BY CRSArrTime LIMIT 2","hsqls":["SELECT CRSArrTime, MAX(DivActualElapsedTime), COUNT(WheelsOff) FROM mytable WHERE (DivAirportIDs__MV0 < 15016 OR DivAirportIDs__MV1 < 15016 OR DivAirportIDs__MV2 < 15016 OR DivAirportIDs__MV3 < 15016 OR DivAirportIDs__MV4 < 15016) GROUP BY CRSArrTime LIMIT 10000"]}
-{"sql":"SELECT COUNT(AirTime) FROM mytable WHERE DivAirportSeqIDs <= 1329604 LIMIT 21","hsqls":["SELECT COUNT(AirTime) FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1329604 OR DivAirportSeqIDs__MV1 <= 1329604 OR DivAirportSeqIDs__MV2 <= 1329604 OR DivAirportSeqIDs__MV3 <= 1329604 OR DivAirportSeqIDs__MV4 <= 1329604) LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, MAX(DivActualElapsedTime), COUNT(WheelsOff) FROM mytable WHERE DivAirportIDs < 15016 GROUP BY CRSArrTime LIMIT 2","hsqls":["SELECT CRSArrTime, MAX(DivActualElapsedTime), COUNT(WheelsOff) FROM mytable WHERE (DivAirportIDs[1] < 15016 OR DivAirportIDs[2] < 15016 OR DivAirportIDs[3] < 15016 OR DivAirportIDs[4] < 15016 OR DivAirportIDs[5] < 15016) GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(AirTime) FROM mytable WHERE DivAirportSeqIDs <= 1329604 LIMIT 21","hsqls":["SELECT COUNT(AirTime) FROM mytable WHERE (DivAirportSeqIDs[1] <= 1329604 OR DivAirportSeqIDs[2] <= 1329604 OR DivAirportSeqIDs[3] <= 1329604 OR DivAirportSeqIDs[4] <= 1329604 OR DivAirportSeqIDs[5] <= 1329604) LIMIT 10000"]}
 {"sql":"SELECT ArrTime, DestCityName FROM mytable ORDER BY Distance, TaxiIn, OriginAirportID LIMIT 13"}
-{"sql":"SELECT DepDel15, Origin, DivWheelsOffs FROM mytable LIMIT 13","hsqls":["SELECT DepDel15, Origin, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DepDel15, Origin, DivWheelsOffs FROM mytable LIMIT 13","hsqls":["SELECT DepDel15, Origin, DivWheelsOffs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DayOfWeek BETWEEN 1 AND 6 OR ArrTimeBlk = '0600-0659' AND DepDelayMinutes = 53.0 ORDER BY UniqueCarrier LIMIT 1"}
-{"sql":"SELECT DestStateFips, DivTailNums, OriginAirportID FROM mytable WHERE DestCityName NOT IN ('Grand Rapids, MI', 'Beaumont/Port Arthur, TX', 'Laredo, TX', 'Cordova, AK') OR DivAirports = 'TPA' ORDER BY \"Year\", CRSElapsedTime LIMIT 17","hsqls":["SELECT DestStateFips, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, OriginAirportID FROM mytable WHERE DestCityName NOT IN ('Grand Rapids, MI', 'Beaumont/Port Arthur, TX', 'Laredo, TX', 'Cordova, AK') OR (DivAirports__MV0 = 'TPA' OR DivAirports__MV1 = 'TPA' OR DivAirports__MV2 = 'TPA' OR DivAirports__MV3 = 'TPA' OR DivAirports__MV4 = 'TPA') ORDER BY Year, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivTailNums, OriginAirportID FROM mytable WHERE DestCityName NOT IN ('Grand Rapids, MI', 'Beaumont/Port Arthur, TX', 'Laredo, TX', 'Cordova, AK') OR DivAirports = 'TPA' ORDER BY \"Year\", CRSElapsedTime LIMIT 17","hsqls":["SELECT DestStateFips, DivTailNums, OriginAirportID FROM mytable WHERE DestCityName NOT IN ('Grand Rapids, MI', 'Beaumont/Port Arthur, TX', 'Laredo, TX', 'Cordova, AK') OR (DivAirports[1] = 'TPA' OR DivAirports[2] = 'TPA' OR DivAirports[3] = 'TPA' OR DivAirports[4] = 'TPA' OR DivAirports[5] = 'TPA') ORDER BY Year, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DestAirportID, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE CRSElapsedTime <> 295 AND WheelsOff >= 1129 OR CarrierDelay IN (196) GROUP BY LongestAddGTime, DestAirportID, ArrivalDelayGroups  ORDER BY LongestAddGTime, DestAirportID, ArrivalDelayGroups LIMIT 12","hsqls":["SELECT LongestAddGTime, DestAirportID, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE CRSElapsedTime <> 295 AND WheelsOff >= 1129 OR CarrierDelay IN (196) GROUP BY LongestAddGTime, DestAirportID, ArrivalDelayGroups  ORDER BY LongestAddGTime, DestAirportID, ArrivalDelayGroups LIMIT 12"]}
 {"sql":"SELECT Diverted FROM mytable WHERE ArrTime = 1504 AND DivReachedDest NOT IN (1, 0, -9999) AND DivActualElapsedTime IN (429, 388, 290, 351) ORDER BY \"Year\", TotalAddGTime, NASDelay LIMIT 16","hsqls":["SELECT Diverted FROM mytable WHERE ArrTime = 1504 AND DivReachedDest NOT IN (1, 0, -9999) AND DivActualElapsedTime IN (429, 388, 290, 351) ORDER BY Year, TotalAddGTime, NASDelay LIMIT 16"]}
 {"sql":"SELECT NASDelay, MIN(OriginAirportSeqID), MIN(Diverted), COUNT(DestWac) FROM mytable WHERE OriginStateFips BETWEEN 55 AND 8 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 20","hsqls":["SELECT NASDelay, MIN(OriginAirportSeqID), MIN(Diverted), COUNT(DestWac) FROM mytable WHERE OriginStateFips BETWEEN 55 AND 8 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 20"]}
@@ -5160,45 +5160,45 @@
 {"sql":"SELECT WeatherDelay, MIN(DestAirportSeqID), MIN(LongestAddGTime) FROM mytable WHERE DayofMonth BETWEEN 11 AND 10 AND FlightNum = 1619 OR OriginCityName BETWEEN 'Charlotte, NC' AND 'Killeen, TX' GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 7","hsqls":["SELECT WeatherDelay, MIN(DestAirportSeqID), MIN(LongestAddGTime) FROM mytable WHERE DayofMonth BETWEEN 11 AND 10 AND FlightNum = 1619 OR OriginCityName BETWEEN 'Charlotte, NC' AND 'Killeen, TX' GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 7"]}
 {"sql":"SELECT WeatherDelay, DestAirportSeqID, ActualElapsedTime FROM mytable ORDER BY Quarter, CRSDepTime LIMIT 23"}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE Carrier > 'B6' LIMIT 10"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE DepTime IN (518) OR ArrTime > 2154 ORDER BY DivReachedDest, Cancelled LIMIT 14","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DepTime IN (518) OR ArrTime > 2154 ORDER BY DivReachedDest, Cancelled LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepTime >= 33 ORDER BY WheelsOn LIMIT 16","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DepTime >= 33 ORDER BY WheelsOn LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, Origin, DaysSinceEpoch FROM mytable WHERE Carrier IN ('EV', 'FL', 'AS') OR DestStateName = 'Massachusetts' OR DivLongestGTimes > 27.0 ORDER BY Cancelled, DayofMonth LIMIT 28","hsqls":["SELECT LongestAddGTime, Origin, DaysSinceEpoch FROM mytable WHERE Carrier IN ('EV', 'FL', 'AS') OR DestStateName = 'Massachusetts' OR (DivLongestGTimes__MV0 > 27.0 OR DivLongestGTimes__MV1 > 27.0 OR DivLongestGTimes__MV2 > 27.0 OR DivLongestGTimes__MV3 > 27.0 OR DivLongestGTimes__MV4 > 27.0) ORDER BY Cancelled, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DepDel15 FROM mytable WHERE DivAirports BETWEEN 'MAF' AND 'MEM' ORDER BY DayofMonth LIMIT 27","hsqls":["SELECT DistanceGroup, DepDel15 FROM mytable WHERE (DivAirports__MV0 BETWEEN 'MAF' AND 'MEM' OR DivAirports__MV1 BETWEEN 'MAF' AND 'MEM' OR DivAirports__MV2 BETWEEN 'MAF' AND 'MEM' OR DivAirports__MV3 BETWEEN 'MAF' AND 'MEM' OR DivAirports__MV4 BETWEEN 'MAF' AND 'MEM') ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE DepTime IN (518) OR ArrTime > 2154 ORDER BY DivReachedDest, Cancelled LIMIT 14","hsqls":["SELECT DivAirportIDs FROM mytable WHERE DepTime IN (518) OR ArrTime > 2154 ORDER BY DivReachedDest, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepTime >= 33 ORDER BY WheelsOn LIMIT 16","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DepTime >= 33 ORDER BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Origin, DaysSinceEpoch FROM mytable WHERE Carrier IN ('EV', 'FL', 'AS') OR DestStateName = 'Massachusetts' OR DivLongestGTimes > 27.0 ORDER BY Cancelled, DayofMonth LIMIT 28","hsqls":["SELECT LongestAddGTime, Origin, DaysSinceEpoch FROM mytable WHERE Carrier IN ('EV', 'FL', 'AS') OR DestStateName = 'Massachusetts' OR (DivLongestGTimes[1] > 27.0 OR DivLongestGTimes[2] > 27.0 OR DivLongestGTimes[3] > 27.0 OR DivLongestGTimes[4] > 27.0 OR DivLongestGTimes[5] > 27.0) ORDER BY Cancelled, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DepDel15 FROM mytable WHERE DivAirports BETWEEN 'MAF' AND 'MEM' ORDER BY DayofMonth LIMIT 27","hsqls":["SELECT DistanceGroup, DepDel15 FROM mytable WHERE (DivAirports[1] BETWEEN 'MAF' AND 'MEM' OR DivAirports[2] BETWEEN 'MAF' AND 'MEM' OR DivAirports[3] BETWEEN 'MAF' AND 'MEM' OR DivAirports[4] BETWEEN 'MAF' AND 'MEM' OR DivAirports[5] BETWEEN 'MAF' AND 'MEM') ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE CRSArrTime NOT IN (1652, 1110, 1203, 1157, 1644) OR OriginAirportSeqID IN (1445702, 1449202, 1112202) ORDER BY OriginStateFips, DivActualElapsedTime"}
 {"sql":"SELECT MIN(Flights), MAX(ArrTime) FROM mytable WHERE LateAircraftDelay < 150 OR ArrTime >= 514 LIMIT 6"}
-{"sql":"SELECT CRSArrTime, DivArrDelay, \"Month\", MAX(OriginCityMarketID), AVG(Diverted), AVG(DepartureDelayGroups) FROM mytable WHERE WheelsOff < 1616 GROUP BY CRSArrTime, DivArrDelay, \"Month\" LIMIT 15","hsqls":["SELECT CRSArrTime, DivArrDelay, Month, MAX(OriginCityMarketID), AVG(Diverted), AVG(DepartureDelayGroups) FROM mytable WHERE WheelsOff < 1616 GROUP BY CRSArrTime, DivArrDelay, Month LIMIT 15"]}
-{"sql":"SELECT FlightDate, Origin, MIN(DepDel15), MIN(\"Month\") FROM mytable GROUP BY FlightDate, Origin LIMIT 11","hsqls":["SELECT FlightDate, Origin, MIN(DepDel15), MIN(Month) FROM mytable GROUP BY FlightDate, Origin LIMIT 11"]}
-{"sql":"SELECT TailNum, DivTotalGTimes FROM mytable WHERE LongestAddGTime BETWEEN 111 AND 47 OR DivTotalGTimes IN (78, 68, 6, 35) ORDER BY DivDistance, Carrier, CancellationCode LIMIT 21","hsqls":["SELECT TailNum, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE LongestAddGTime BETWEEN 111 AND 47 OR (DivTotalGTimes__MV0 IN (78, 68, 6, 35) OR DivTotalGTimes__MV1 IN (78, 68, 6, 35) OR DivTotalGTimes__MV2 IN (78, 68, 6, 35) OR DivTotalGTimes__MV3 IN (78, 68, 6, 35) OR DivTotalGTimes__MV4 IN (78, 68, 6, 35)) ORDER BY DivDistance, Carrier, CancellationCode LIMIT 10000"]}
-{"sql":"SELECT TailNum, Origin, AVG(OriginAirportSeqID), AVG(DestCityMarketID), MAX(\"Month\") FROM mytable WHERE CRSDepTime IN (1457, 725, 1145, 1359) GROUP BY TailNum, Origin LIMIT 24","hsqls":["SELECT TailNum, Origin, AVG(OriginAirportSeqID), AVG(DestCityMarketID), MAX(Month) FROM mytable WHERE CRSDepTime IN (1457, 725, 1145, 1359) GROUP BY TailNum, Origin LIMIT 24"]}
+{"sql":"SELECT CRSArrTime, DivArrDelay, \"Month\", MAX(OriginCityMarketID), AVG(Diverted), AVG(DepartureDelayGroups) FROM mytable WHERE WheelsOff < 1616 GROUP BY CRSArrTime, DivArrDelay, \"Month\" LIMIT 15","hsqls":["SELECT CRSArrTime, DivArrDelay, Month, MAX(OriginCityMarketID), AVG(Diverted), AVG(DepartureDelayGroups) FROM mytable WHERE WheelsOff < 1616 GROUP BY CRSArrTime, DivArrDelay, `Month` LIMIT 15"]}
+{"sql":"SELECT FlightDate, Origin, MIN(DepDel15), MIN(\"Month\") FROM mytable GROUP BY FlightDate, Origin LIMIT 11","hsqls":["SELECT FlightDate, Origin, MIN(DepDel15), MIN(`Month`) FROM mytable GROUP BY FlightDate, Origin LIMIT 11"]}
+{"sql":"SELECT TailNum, DivTotalGTimes FROM mytable WHERE LongestAddGTime BETWEEN 111 AND 47 OR DivTotalGTimes IN (78, 68, 6, 35) ORDER BY DivDistance, Carrier, CancellationCode LIMIT 21","hsqls":["SELECT TailNum, DivTotalGTimes FROM mytable WHERE LongestAddGTime BETWEEN 111 AND 47 OR (DivTotalGTimes[1] IN (78, 68, 6, 35) OR DivTotalGTimes[2] IN (78, 68, 6, 35) OR DivTotalGTimes[3] IN (78, 68, 6, 35) OR DivTotalGTimes[4] IN (78, 68, 6, 35) OR DivTotalGTimes[5] IN (78, 68, 6, 35)) ORDER BY DivDistance, Carrier, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT TailNum, Origin, AVG(OriginAirportSeqID), AVG(DestCityMarketID), MAX(\"Month\") FROM mytable WHERE CRSDepTime IN (1457, 725, 1145, 1359) GROUP BY TailNum, Origin LIMIT 24","hsqls":["SELECT TailNum, Origin, AVG(OriginAirportSeqID), AVG(DestCityMarketID), MAX(`Month`) FROM mytable WHERE CRSDepTime IN (1457, 725, 1145, 1359) GROUP BY TailNum, Origin LIMIT 24"]}
 {"sql":"SELECT Diverted FROM mytable WHERE DepTime NOT IN (1351, 2115, 730) OR OriginStateFips BETWEEN 41 AND 31 OR Carrier = 'AS' ORDER BY FlightDate, ArrTimeBlk, DestCityName LIMIT 3"}
 {"sql":"SELECT SecurityDelay, CancellationCode, COUNT(*) FROM mytable GROUP BY SecurityDelay, CancellationCode  ORDER BY SecurityDelay, CancellationCode LIMIT 2","hsqls":["SELECT SecurityDelay, CancellationCode, COUNT(*) FROM mytable GROUP BY SecurityDelay, CancellationCode  ORDER BY SecurityDelay, CancellationCode LIMIT 2"]}
-{"sql":"SELECT TotalAddGTime, OriginWac FROM mytable WHERE DivTailNums <= 'N399WN' ORDER BY DepDelay, Distance LIMIT 16","hsqls":["SELECT TotalAddGTime, OriginWac FROM mytable WHERE (DivTailNums__MV0 <= 'N399WN' OR DivTailNums__MV1 <= 'N399WN' OR DivTailNums__MV2 <= 'N399WN' OR DivTailNums__MV3 <= 'N399WN' OR DivTailNums__MV4 <= 'N399WN') ORDER BY DepDelay, Distance LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, OriginWac FROM mytable WHERE DivTailNums <= 'N399WN' ORDER BY DepDelay, Distance LIMIT 16","hsqls":["SELECT TotalAddGTime, OriginWac FROM mytable WHERE (DivTailNums[1] <= 'N399WN' OR DivTailNums[2] <= 'N399WN' OR DivTailNums[3] <= 'N399WN' OR DivTailNums[4] <= 'N399WN' OR DivTailNums[5] <= 'N399WN') ORDER BY DepDelay, Distance LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (3, -9999) AND TaxiOut BETWEEN 74 AND 57 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 11","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (3, -9999) AND TaxiOut BETWEEN 74 AND 57 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 11"]}
 {"sql":"SELECT LateAircraftDelay, Dest, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (32, 384, 120) AND CRSElapsedTime NOT IN (94) OR WeatherDelay BETWEEN 39 AND 101 GROUP BY LateAircraftDelay, Dest  ORDER BY LateAircraftDelay, Dest LIMIT 10","hsqls":["SELECT LateAircraftDelay, Dest, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (32, 384, 120) AND CRSElapsedTime NOT IN (94) OR WeatherDelay BETWEEN 39 AND 101 GROUP BY LateAircraftDelay, Dest  ORDER BY LateAircraftDelay, Dest LIMIT 10"]}
 {"sql":"SELECT NASDelay, TailNum, Origin, MAX(DepDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DivDistance BETWEEN 39 AND 1592 GROUP BY NASDelay, TailNum, Origin","hsqls":["SELECT NASDelay, TailNum, Origin, MAX(DepDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DivDistance BETWEEN 39 AND 1592 GROUP BY NASDelay, TailNum, Origin"]}
 {"sql":"SELECT Carrier, UniqueCarrier, MAX(DivDistance), AVG(CarrierDelay), AVG(SecurityDelay) FROM mytable GROUP BY Carrier, UniqueCarrier  ORDER BY Carrier, UniqueCarrier LIMIT 10","hsqls":["SELECT Carrier, UniqueCarrier, MAX(DivDistance), AVG(CarrierDelay), AVG(SecurityDelay) FROM mytable GROUP BY Carrier, UniqueCarrier  ORDER BY Carrier, UniqueCarrier LIMIT 10"]}
 {"sql":"SELECT NASDelay, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 1757 AND 932 OR DestCityName > 'Jacksonville/Camp Lejeune, NC' GROUP BY NASDelay  ORDER BY NASDelay LIMIT 3","hsqls":["SELECT NASDelay, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 1757 AND 932 OR DestCityName > 'Jacksonville/Camp Lejeune, NC' GROUP BY NASDelay  ORDER BY NASDelay LIMIT 3"]}
 {"sql":"SELECT OriginAirportSeqID, TotalAddGTime, OriginAirportID FROM mytable ORDER BY DivArrDelay, ArrivalDelayGroups LIMIT 28"}
-{"sql":"SELECT Distance, DestStateFips, DestCityName, AVG(TaxiIn) FROM mytable WHERE OriginCityMarketID <= 32896 AND \"Year\" <> 2014 AND TaxiOut >= 72 GROUP BY Distance, DestStateFips, DestCityName LIMIT 23","hsqls":["SELECT Distance, DestStateFips, DestCityName, AVG(TaxiIn) FROM mytable WHERE OriginCityMarketID <= 32896 AND Year <> 2014 AND TaxiOut >= 72 GROUP BY Distance, DestStateFips, DestCityName LIMIT 23"]}
-{"sql":"SELECT DivLongestGTimes, DestAirportSeqID, AirTime FROM mytable WHERE AirlineID BETWEEN 20436 AND 20304 OR DestWac = 21 ORDER BY DistanceGroup, Dest, CRSDepTime LIMIT 25","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestAirportSeqID, AirTime FROM mytable WHERE AirlineID BETWEEN 20436 AND 20304 OR DestWac = 21 ORDER BY DistanceGroup, Dest, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT Distance, DestStateFips, DestCityName, AVG(TaxiIn) FROM mytable WHERE OriginCityMarketID <= 32896 AND \"Year\" <> 2014 AND TaxiOut >= 72 GROUP BY Distance, DestStateFips, DestCityName LIMIT 23","hsqls":["SELECT Distance, DestStateFips, DestCityName, AVG(TaxiIn) FROM mytable WHERE OriginCityMarketID <= 32896 AND `Year` <> 2014 AND TaxiOut >= 72 GROUP BY Distance, DestStateFips, DestCityName LIMIT 23"]}
+{"sql":"SELECT DivLongestGTimes, DestAirportSeqID, AirTime FROM mytable WHERE AirlineID BETWEEN 20436 AND 20304 OR DestWac = 21 ORDER BY DistanceGroup, Dest, CRSDepTime LIMIT 25","hsqls":["SELECT DivLongestGTimes, DestAirportSeqID, AirTime FROM mytable WHERE AirlineID BETWEEN 20436 AND 20304 OR DestWac = 21 ORDER BY DistanceGroup, Dest, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT Diverted, AVG(TotalAddGTime) FROM mytable WHERE DepTime IN (1314, 939) GROUP BY Diverted  ORDER BY Diverted LIMIT 27","hsqls":["SELECT Diverted, AVG(TotalAddGTime) FROM mytable WHERE DepTime IN (1314, 939) GROUP BY Diverted  ORDER BY Diverted LIMIT 27"]}
 {"sql":"SELECT CarrierDelay, AirTime, OriginStateName, MIN(DivActualElapsedTime), COUNT(DestCityMarketID), MAX(DestWac) FROM mytable WHERE OriginAirportID > 10170 OR CancellationCode >= 'C' GROUP BY CarrierDelay, AirTime, OriginStateName  ORDER BY CarrierDelay, AirTime, OriginStateName LIMIT 3","hsqls":["SELECT CarrierDelay, AirTime, OriginStateName, MIN(DivActualElapsedTime), COUNT(DestCityMarketID), MAX(DestWac) FROM mytable WHERE OriginAirportID > 10170 OR CancellationCode >= 'C' GROUP BY CarrierDelay, AirTime, OriginStateName  ORDER BY CarrierDelay, AirTime, OriginStateName LIMIT 3"]}
 {"sql":"SELECT FlightDate, MIN(Distance) FROM mytable WHERE OriginAirportID NOT IN (10140, 10980) OR ArrTime IN (2100, 1123, 1829, 1621) OR CRSElapsedTime BETWEEN 425 AND 195 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 26","hsqls":["SELECT FlightDate, MIN(Distance) FROM mytable WHERE OriginAirportID NOT IN (10140, 10980) OR ArrTime IN (2100, 1123, 1829, 1621) OR CRSElapsedTime BETWEEN 425 AND 195 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 26"]}
-{"sql":"SELECT FlightDate, DepTime, SUM(AirTime) FROM mytable WHERE OriginCityName IN ('Rochester, NY', 'Columbus, MS') AND FlightDate NOT IN ('2014-01-30', '2014-01-24') OR DivLongestGTimes > 108.0 GROUP BY FlightDate, DepTime LIMIT 18","hsqls":["SELECT FlightDate, DepTime, SUM(AirTime) FROM mytable WHERE OriginCityName IN ('Rochester, NY', 'Columbus, MS') AND FlightDate NOT IN ('2014-01-30', '2014-01-24') OR (DivLongestGTimes__MV0 > 108.0 OR DivLongestGTimes__MV1 > 108.0 OR DivLongestGTimes__MV2 > 108.0 OR DivLongestGTimes__MV3 > 108.0 OR DivLongestGTimes__MV4 > 108.0) GROUP BY FlightDate, DepTime LIMIT 10000"]}
+{"sql":"SELECT FlightDate, DepTime, SUM(AirTime) FROM mytable WHERE OriginCityName IN ('Rochester, NY', 'Columbus, MS') AND FlightDate NOT IN ('2014-01-30', '2014-01-24') OR DivLongestGTimes > 108.0 GROUP BY FlightDate, DepTime LIMIT 18","hsqls":["SELECT FlightDate, DepTime, SUM(AirTime) FROM mytable WHERE OriginCityName IN ('Rochester, NY', 'Columbus, MS') AND FlightDate NOT IN ('2014-01-30', '2014-01-24') OR (DivLongestGTimes[1] > 108.0 OR DivLongestGTimes[2] > 108.0 OR DivLongestGTimes[3] > 108.0 OR DivLongestGTimes[4] > 108.0 OR DivLongestGTimes[5] > 108.0) GROUP BY FlightDate, DepTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrivalDelayGroups), SUM(Distance) FROM mytable WHERE LongestAddGTime = 42 AND ArrTime BETWEEN 2013 AND 1604 OR DivArrDelay BETWEEN 156 AND 348 LIMIT 4"}
 {"sql":"SELECT Carrier, MAX(DestStateFips), MIN(NASDelay), AVG(DivAirportLandings) FROM mytable GROUP BY Carrier  ORDER BY Carrier LIMIT 5","hsqls":["SELECT Carrier, MAX(DestStateFips), MIN(NASDelay), AVG(DivAirportLandings) FROM mytable GROUP BY Carrier  ORDER BY Carrier LIMIT 5"]}
-{"sql":"SELECT FlightNum FROM mytable WHERE DestAirportID BETWEEN 11525 AND 14100 AND FlightDate IN ('2014-01-06', '2014-01-23', '2014-01-16', '2014-01-02') OR NASDelay > 234 ORDER BY \"Month\" LIMIT 3","hsqls":["SELECT FlightNum FROM mytable WHERE DestAirportID BETWEEN 11525 AND 14100 AND FlightDate IN ('2014-01-06', '2014-01-23', '2014-01-16', '2014-01-02') OR NASDelay > 234 ORDER BY Month LIMIT 3"]}
+{"sql":"SELECT FlightNum FROM mytable WHERE DestAirportID BETWEEN 11525 AND 14100 AND FlightDate IN ('2014-01-06', '2014-01-23', '2014-01-16', '2014-01-02') OR NASDelay > 234 ORDER BY \"Month\" LIMIT 3","hsqls":["SELECT FlightNum FROM mytable WHERE DestAirportID BETWEEN 11525 AND 14100 AND FlightDate IN ('2014-01-06', '2014-01-23', '2014-01-16', '2014-01-02') OR NASDelay > 234 ORDER BY `Month` LIMIT 3"]}
 {"sql":"SELECT DistanceGroup, DestCityMarketID, OriginStateName, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 2356 AND 1540 GROUP BY DistanceGroup, DestCityMarketID, OriginStateName  ORDER BY DistanceGroup, DestCityMarketID, OriginStateName LIMIT 13","hsqls":["SELECT DistanceGroup, DestCityMarketID, OriginStateName, COUNT(*) FROM mytable WHERE FirstDepTime BETWEEN 2356 AND 1540 GROUP BY DistanceGroup, DestCityMarketID, OriginStateName  ORDER BY DistanceGroup, DestCityMarketID, OriginStateName LIMIT 13"]}
-{"sql":"SELECT Flights FROM mytable WHERE FirstDepTime NOT IN (1957, 1800, 1016, 944, 617) OR DivAirportSeqIDs IN (1302402, 1052904, 1425202, 1599102) AND DivActualElapsedTime IN (464, 611, 342) ORDER BY OriginStateFips LIMIT 11","hsqls":["SELECT Flights FROM mytable WHERE FirstDepTime NOT IN (1957, 1800, 1016, 944, 617) OR (DivAirportSeqIDs__MV0 IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs__MV1 IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs__MV2 IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs__MV3 IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs__MV4 IN (1302402, 1052904, 1425202, 1599102)) AND DivActualElapsedTime IN (464, 611, 342) ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE FirstDepTime NOT IN (1957, 1800, 1016, 944, 617) OR DivAirportSeqIDs IN (1302402, 1052904, 1425202, 1599102) AND DivActualElapsedTime IN (464, 611, 342) ORDER BY OriginStateFips LIMIT 11","hsqls":["SELECT Flights FROM mytable WHERE FirstDepTime NOT IN (1957, 1800, 1016, 944, 617) OR (DivAirportSeqIDs[1] IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs[2] IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs[3] IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs[4] IN (1302402, 1052904, 1425202, 1599102) OR DivAirportSeqIDs[5] IN (1302402, 1052904, 1425202, 1599102)) AND DivActualElapsedTime IN (464, 611, 342) ORDER BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, Dest, ArrDelay FROM mytable WHERE Dest < 'GCK' ORDER BY OriginStateFips, DivActualElapsedTime LIMIT 28"}
 {"sql":"SELECT Diverted, COUNT(*) FROM mytable WHERE TotalAddGTime >= 42 OR LongestAddGTime BETWEEN 28 AND 58 AND AirTime NOT IN (225, 64, 23, 238) GROUP BY Diverted  ORDER BY Diverted LIMIT 26","hsqls":["SELECT Diverted, COUNT(*) FROM mytable WHERE TotalAddGTime >= 42 OR LongestAddGTime BETWEEN 28 AND 58 AND AirTime NOT IN (225, 64, 23, 238) GROUP BY Diverted  ORDER BY Diverted LIMIT 26"]}
-{"sql":"SELECT DestStateFips, MIN(DivAirportLandings) FROM mytable WHERE DistanceGroup NOT IN (1, 10, 4, 9, 8) OR LateAircraftDelay BETWEEN 82 AND 22 AND DivAirportSeqIDs > 1584102 GROUP BY DestStateFips LIMIT 28","hsqls":["SELECT DestStateFips, MIN(DivAirportLandings) FROM mytable WHERE DistanceGroup NOT IN (1, 10, 4, 9, 8) OR LateAircraftDelay BETWEEN 82 AND 22 AND (DivAirportSeqIDs__MV0 > 1584102 OR DivAirportSeqIDs__MV1 > 1584102 OR DivAirportSeqIDs__MV2 > 1584102 OR DivAirportSeqIDs__MV3 > 1584102 OR DivAirportSeqIDs__MV4 > 1584102) GROUP BY DestStateFips LIMIT 10000"]}
-{"sql":"SELECT ActualElapsedTime, DepDel15, OriginAirportID, MAX(DaysSinceEpoch) FROM mytable WHERE \"Month\" NOT IN (1) GROUP BY ActualElapsedTime, DepDel15, OriginAirportID","hsqls":["SELECT ActualElapsedTime, DepDel15, OriginAirportID, MAX(DaysSinceEpoch) FROM mytable WHERE Month NOT IN (1) GROUP BY ActualElapsedTime, DepDel15, OriginAirportID"]}
+{"sql":"SELECT DestStateFips, MIN(DivAirportLandings) FROM mytable WHERE DistanceGroup NOT IN (1, 10, 4, 9, 8) OR LateAircraftDelay BETWEEN 82 AND 22 AND DivAirportSeqIDs > 1584102 GROUP BY DestStateFips LIMIT 28","hsqls":["SELECT DestStateFips, MIN(DivAirportLandings) FROM mytable WHERE DistanceGroup NOT IN (1, 10, 4, 9, 8) OR LateAircraftDelay BETWEEN 82 AND 22 AND (DivAirportSeqIDs[1] > 1584102 OR DivAirportSeqIDs[2] > 1584102 OR DivAirportSeqIDs[3] > 1584102 OR DivAirportSeqIDs[4] > 1584102 OR DivAirportSeqIDs[5] > 1584102) GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DepDel15, OriginAirportID, MAX(DaysSinceEpoch) FROM mytable WHERE \"Month\" NOT IN (1) GROUP BY ActualElapsedTime, DepDel15, OriginAirportID","hsqls":["SELECT ActualElapsedTime, DepDel15, OriginAirportID, MAX(DaysSinceEpoch) FROM mytable WHERE `Month` NOT IN (1) GROUP BY ActualElapsedTime, DepDel15, OriginAirportID"]}
 {"sql":"SELECT FirstDepTime, SUM(DivArrDelay) FROM mytable WHERE ArrTimeBlk IN ('1300-1359', '0700-0759', '1000-1059', '0800-0859') AND DestStateName NOT IN ('Louisiana', 'Maine') GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 5","hsqls":["SELECT FirstDepTime, SUM(DivArrDelay) FROM mytable WHERE ArrTimeBlk IN ('1300-1359', '0700-0759', '1000-1059', '0800-0859') AND DestStateName NOT IN ('Louisiana', 'Maine') GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 5"]}
 {"sql":"SELECT TaxiOut, TaxiIn, DayOfWeek FROM mytable WHERE TotalAddGTime NOT IN (8) AND CRSArrTime BETWEEN 923 AND 2150 ORDER BY Flights, WeatherDelay, DivActualElapsedTime LIMIT 15"}
-{"sql":"SELECT DivLongestGTimes, DestWac, TailNum FROM mytable WHERE FirstDepTime BETWEEN 2031 AND 750 AND DestState NOT IN ('MS', 'UT', 'NH', 'MA') AND SecurityDelay <= 27 LIMIT 11","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestWac, TailNum FROM mytable WHERE FirstDepTime BETWEEN 2031 AND 750 AND DestState NOT IN ('MS', 'UT', 'NH', 'MA') AND SecurityDelay <= 27 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestWac, TailNum FROM mytable WHERE FirstDepTime BETWEEN 2031 AND 750 AND DestState NOT IN ('MS', 'UT', 'NH', 'MA') AND SecurityDelay <= 27 LIMIT 11","hsqls":["SELECT DivLongestGTimes, DestWac, TailNum FROM mytable WHERE FirstDepTime BETWEEN 2031 AND 750 AND DestState NOT IN ('MS', 'UT', 'NH', 'MA') AND SecurityDelay <= 27 LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginStateFips), COUNT(ArrTimeBlk), SUM(DivActualElapsedTime) FROM mytable WHERE FlightNum NOT IN (3918, 1885) AND Cancelled BETWEEN 0 AND 1 AND CRSDepTime BETWEEN 1612 AND 1434 LIMIT 5"}
-{"sql":"SELECT DestWac, WeatherDelay, DepDel15 FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'Minnesota' OR DepDelay BETWEEN 30.0 AND 88.0 AND DivAirports BETWEEN 'ALB' AND 'ABQ' LIMIT 22","hsqls":["SELECT DestWac, WeatherDelay, DepDel15 FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'Minnesota' OR DepDelay BETWEEN 30.0 AND 88.0 AND (DivAirports__MV0 BETWEEN 'ALB' AND 'ABQ' OR DivAirports__MV1 BETWEEN 'ALB' AND 'ABQ' OR DivAirports__MV2 BETWEEN 'ALB' AND 'ABQ' OR DivAirports__MV3 BETWEEN 'ALB' AND 'ABQ' OR DivAirports__MV4 BETWEEN 'ALB' AND 'ABQ') LIMIT 10000"]}
+{"sql":"SELECT DestWac, WeatherDelay, DepDel15 FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'Minnesota' OR DepDelay BETWEEN 30.0 AND 88.0 AND DivAirports BETWEEN 'ALB' AND 'ABQ' LIMIT 22","hsqls":["SELECT DestWac, WeatherDelay, DepDel15 FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'Minnesota' OR DepDelay BETWEEN 30.0 AND 88.0 AND (DivAirports[1] BETWEEN 'ALB' AND 'ABQ' OR DivAirports[2] BETWEEN 'ALB' AND 'ABQ' OR DivAirports[3] BETWEEN 'ALB' AND 'ABQ' OR DivAirports[4] BETWEEN 'ALB' AND 'ABQ' OR DivAirports[5] BETWEEN 'ALB' AND 'ABQ') LIMIT 10000"]}
 {"sql":"SELECT MIN(DestWac), AVG(DepDelay) FROM mytable WHERE WheelsOn <> 1411"}
 {"sql":"SELECT ArrDel15, DestStateName, DayofMonth, COUNT(SecurityDelay), AVG(CarrierDelay), COUNT(FirstDepTime) FROM mytable GROUP BY ArrDel15, DestStateName, DayofMonth  ORDER BY ArrDel15, DestStateName, DayofMonth LIMIT 23","hsqls":["SELECT ArrDel15, DestStateName, DayofMonth, COUNT(SecurityDelay), AVG(CarrierDelay), COUNT(FirstDepTime) FROM mytable GROUP BY ArrDel15, DestStateName, DayofMonth  ORDER BY ArrDel15, DestStateName, DayofMonth LIMIT 23"]}
 {"sql":"SELECT OriginAirportSeqID, WheelsOff, OriginCityMarketID, COUNT(*) FROM mytable WHERE DestAirportSeqID < 1161203 AND ActualElapsedTime BETWEEN 392 AND 244 GROUP BY OriginAirportSeqID, WheelsOff, OriginCityMarketID  ORDER BY OriginAirportSeqID, WheelsOff, OriginCityMarketID LIMIT 9","hsqls":["SELECT OriginAirportSeqID, WheelsOff, OriginCityMarketID, COUNT(*) FROM mytable WHERE DestAirportSeqID < 1161203 AND ActualElapsedTime BETWEEN 392 AND 244 GROUP BY OriginAirportSeqID, WheelsOff, OriginCityMarketID  ORDER BY OriginAirportSeqID, WheelsOff, OriginCityMarketID LIMIT 9"]}
@@ -5209,36 +5209,36 @@
 {"sql":"SELECT MAX(OriginAirportSeqID), SUM(DepDel15), MIN(DepartureDelayGroups) FROM mytable WHERE DestAirportID = 14828 LIMIT 6"}
 {"sql":"SELECT DestWac, ArrDel15, ArrDelay FROM mytable WHERE LongestAddGTime BETWEEN 86 AND 19 AND AirTime >= 156 ORDER BY Origin LIMIT 9"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'A' OR DepTime IN (1003, 812, 1957) LIMIT 10"}
-{"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 618 AND 1441 AND TailNum BETWEEN 'N510JB' AND 'N12122' AND DivAirports BETWEEN 'SEA' AND 'CLE' GROUP BY Quarter LIMIT 21","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 618 AND 1441 AND TailNum BETWEEN 'N510JB' AND 'N12122' AND (DivAirports__MV0 BETWEEN 'SEA' AND 'CLE' OR DivAirports__MV1 BETWEEN 'SEA' AND 'CLE' OR DivAirports__MV2 BETWEEN 'SEA' AND 'CLE' OR DivAirports__MV3 BETWEEN 'SEA' AND 'CLE' OR DivAirports__MV4 BETWEEN 'SEA' AND 'CLE') GROUP BY Quarter LIMIT 10000"]}
+{"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 618 AND 1441 AND TailNum BETWEEN 'N510JB' AND 'N12122' AND DivAirports BETWEEN 'SEA' AND 'CLE' GROUP BY Quarter LIMIT 21","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE CRSArrTime BETWEEN 618 AND 1441 AND TailNum BETWEEN 'N510JB' AND 'N12122' AND (DivAirports[1] BETWEEN 'SEA' AND 'CLE' OR DivAirports[2] BETWEEN 'SEA' AND 'CLE' OR DivAirports[3] BETWEEN 'SEA' AND 'CLE' OR DivAirports[4] BETWEEN 'SEA' AND 'CLE' OR DivAirports[5] BETWEEN 'SEA' AND 'CLE') GROUP BY Quarter LIMIT 10000"]}
 {"sql":"SELECT MIN(DivArrDelay), MIN(WheelsOff), AVG(WheelsOn) FROM mytable LIMIT 17"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DayOfWeek < 2 OR OriginStateName BETWEEN 'Nebraska' AND 'Delaware' AND DestAirportSeqID NOT IN (1320402, 1131502, 1069302) LIMIT 10"}
-{"sql":"SELECT TaxiOut, DivAirportIDs FROM mytable ORDER BY OriginAirportSeqID, DivReachedDest, DepDelay LIMIT 17","hsqls":["SELECT TaxiOut, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY OriginAirportSeqID, DivReachedDest, DepDelay LIMIT 10000"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DaysSinceEpoch IN (16084, 16095, 16086, 16079) AND DestStateName NOT IN ('Wyoming', 'Texas') LIMIT 25","hsqls":["SELECT Month FROM mytable WHERE DaysSinceEpoch IN (16084, 16095, 16086, 16079) AND DestStateName NOT IN ('Wyoming', 'Texas') LIMIT 25"]}
+{"sql":"SELECT TaxiOut, DivAirportIDs FROM mytable ORDER BY OriginAirportSeqID, DivReachedDest, DepDelay LIMIT 17","hsqls":["SELECT TaxiOut, DivAirportIDs FROM mytable ORDER BY OriginAirportSeqID, DivReachedDest, DepDelay LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DaysSinceEpoch IN (16084, 16095, 16086, 16079) AND DestStateName NOT IN ('Wyoming', 'Texas') LIMIT 25","hsqls":["SELECT `Month` FROM mytable WHERE DaysSinceEpoch IN (16084, 16095, 16086, 16079) AND DestStateName NOT IN ('Wyoming', 'Texas') LIMIT 25"]}
 {"sql":"SELECT Flights, TaxiIn, DivAirportLandings FROM mytable WHERE DestCityMarketID = 31637 ORDER BY OriginCityName"}
 {"sql":"SELECT Quarter, SecurityDelay, DestStateFips, COUNT(OriginAirportID), SUM(FlightNum) FROM mytable WHERE DestAirportID <= 13342 OR DepTime NOT IN (1408) AND CarrierDelay IN (67, 33) GROUP BY Quarter, SecurityDelay, DestStateFips  ORDER BY Quarter, SecurityDelay, DestStateFips LIMIT 11","hsqls":["SELECT Quarter, SecurityDelay, DestStateFips, COUNT(OriginAirportID), SUM(FlightNum) FROM mytable WHERE DestAirportID <= 13342 OR DepTime NOT IN (1408) AND CarrierDelay IN (67, 33) GROUP BY Quarter, SecurityDelay, DestStateFips  ORDER BY Quarter, SecurityDelay, DestStateFips LIMIT 11"]}
 {"sql":"SELECT AirTime, MAX(DivDistance), SUM(DayOfWeek) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 22","hsqls":["SELECT AirTime, MAX(DivDistance), SUM(DayOfWeek) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 22"]}
 {"sql":"SELECT CRSDepTime, COUNT(*) FROM mytable WHERE OriginCityName < 'Palm Springs, CA' GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 12","hsqls":["SELECT CRSDepTime, COUNT(*) FROM mytable WHERE OriginCityName < 'Palm Springs, CA' GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 12"]}
 {"sql":"SELECT SecurityDelay, ActualElapsedTime, WheelsOn, SUM(Distance), COUNT(WeatherDelay) FROM mytable WHERE ActualElapsedTime > 251 GROUP BY SecurityDelay, ActualElapsedTime, WheelsOn  ORDER BY SecurityDelay, ActualElapsedTime, WheelsOn LIMIT 27","hsqls":["SELECT SecurityDelay, ActualElapsedTime, WheelsOn, SUM(Distance), COUNT(WeatherDelay) FROM mytable WHERE ActualElapsedTime > 251 GROUP BY SecurityDelay, ActualElapsedTime, WheelsOn  ORDER BY SecurityDelay, ActualElapsedTime, WheelsOn LIMIT 27"]}
-{"sql":"SELECT OriginCityMarketID, DivActualElapsedTime, MIN(DivReachedDest), MAX(WeatherDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY OriginCityMarketID, DivActualElapsedTime LIMIT 19","hsqls":["SELECT OriginCityMarketID, DivActualElapsedTime, MIN(DivReachedDest), MAX(WeatherDelay) FROM mytable WHERE Year BETWEEN 2014 AND 2014 GROUP BY OriginCityMarketID, DivActualElapsedTime LIMIT 19"]}
-{"sql":"SELECT WheelsOff, DivAirports, FlightNum FROM mytable LIMIT 20","hsqls":["SELECT WheelsOff, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, FlightNum FROM mytable LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivActualElapsedTime, MIN(DivReachedDest), MAX(WeatherDelay) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY OriginCityMarketID, DivActualElapsedTime LIMIT 19","hsqls":["SELECT OriginCityMarketID, DivActualElapsedTime, MIN(DivReachedDest), MAX(WeatherDelay) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 GROUP BY OriginCityMarketID, DivActualElapsedTime LIMIT 19"]}
+{"sql":"SELECT WheelsOff, DivAirports, FlightNum FROM mytable LIMIT 20","hsqls":["SELECT WheelsOff, DivAirports, FlightNum FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DepTime, MAX(AirlineID), SUM(WheelsOff), AVG(WheelsOn) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 16","hsqls":["SELECT DepTime, MAX(AirlineID), SUM(WheelsOff), AVG(WheelsOn) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 16"]}
 {"sql":"SELECT DepDelayMinutes, OriginAirportID, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, OriginAirportID  ORDER BY DepDelayMinutes, OriginAirportID LIMIT 26","hsqls":["SELECT DepDelayMinutes, OriginAirportID, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, OriginAirportID  ORDER BY DepDelayMinutes, OriginAirportID LIMIT 26"]}
 {"sql":"SELECT DayofMonth, AirTime, OriginAirportID, MAX(TaxiOut), SUM(DivActualElapsedTime) FROM mytable GROUP BY DayofMonth, AirTime, OriginAirportID  ORDER BY DayofMonth, AirTime, OriginAirportID LIMIT 12","hsqls":["SELECT DayofMonth, AirTime, OriginAirportID, MAX(TaxiOut), SUM(DivActualElapsedTime) FROM mytable GROUP BY DayofMonth, AirTime, OriginAirportID  ORDER BY DayofMonth, AirTime, OriginAirportID LIMIT 12"]}
-{"sql":"SELECT Flights, Origin, \"Month\" FROM mytable LIMIT 3","hsqls":["SELECT Flights, Origin, Month FROM mytable LIMIT 3"]}
+{"sql":"SELECT Flights, Origin, \"Month\" FROM mytable LIMIT 3","hsqls":["SELECT Flights, Origin, `Month` FROM mytable LIMIT 3"]}
 {"sql":"SELECT ArrDel15, DepTimeBlk, COUNT(*) FROM mytable WHERE DestStateFips IN (78, 40, 28) OR OriginWac BETWEEN 72 AND 93 OR DivArrDelay <= 464 GROUP BY ArrDel15, DepTimeBlk  ORDER BY ArrDel15, DepTimeBlk LIMIT 11","hsqls":["SELECT ArrDel15, DepTimeBlk, COUNT(*) FROM mytable WHERE DestStateFips IN (78, 40, 28) OR OriginWac BETWEEN 72 AND 93 OR DivArrDelay <= 464 GROUP BY ArrDel15, DepTimeBlk  ORDER BY ArrDel15, DepTimeBlk LIMIT 11"]}
-{"sql":"SELECT OriginCityName, DivAirportSeqIDs, DestCityName FROM mytable WHERE FirstDepTime BETWEEN 944 AND 1030 AND DestState NOT IN ('IN', 'MN', 'HI', 'MD', 'ME') LIMIT 26","hsqls":["SELECT OriginCityName, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestCityName FROM mytable WHERE FirstDepTime BETWEEN 944 AND 1030 AND DestState NOT IN ('IN', 'MN', 'HI', 'MD', 'ME') LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DivAirportSeqIDs, DestCityName FROM mytable WHERE FirstDepTime BETWEEN 944 AND 1030 AND DestState NOT IN ('IN', 'MN', 'HI', 'MD', 'ME') LIMIT 26","hsqls":["SELECT OriginCityName, DivAirportSeqIDs, DestCityName FROM mytable WHERE FirstDepTime BETWEEN 944 AND 1030 AND DestState NOT IN ('IN', 'MN', 'HI', 'MD', 'ME') LIMIT 10000"]}
 {"sql":"SELECT DestWac, DestState, DaysSinceEpoch FROM mytable WHERE DestWac IN (2, 93, 83, 53) AND ArrivalDelayGroups BETWEEN -1 AND 5 ORDER BY ActualElapsedTime, OriginWac, UniqueCarrier LIMIT 12"}
 {"sql":"SELECT FlightDate FROM mytable LIMIT 2"}
-{"sql":"SELECT MIN(\"Month\") FROM mytable WHERE DestAirportID <= 14027 AND DepartureDelayGroups BETWEEN 12 AND 11 LIMIT 26","hsqls":["SELECT MIN(Month) FROM mytable WHERE DestAirportID <= 14027 AND DepartureDelayGroups BETWEEN 12 AND 11 LIMIT 26"]}
+{"sql":"SELECT MIN(\"Month\") FROM mytable WHERE DestAirportID <= 14027 AND DepartureDelayGroups BETWEEN 12 AND 11 LIMIT 26","hsqls":["SELECT MIN(`Month`) FROM mytable WHERE DestAirportID <= 14027 AND DepartureDelayGroups BETWEEN 12 AND 11 LIMIT 26"]}
 {"sql":"SELECT DivReachedDest, Distance, CRSDepTime FROM mytable WHERE WeatherDelay IN (115, 55, 23, 84) OR DestCityName > 'Reno, NV' ORDER BY LateAircraftDelay, DepDelayMinutes LIMIT 9"}
 {"sql":"SELECT DepTimeBlk, OriginAirportID FROM mytable WHERE ArrDelayMinutes <= 221.0 ORDER BY CarrierDelay LIMIT 12"}
 {"sql":"SELECT MAX(FirstDepTime), MAX(SecurityDelay) FROM mytable LIMIT 19"}
-{"sql":"SELECT DepTime, AirlineID FROM mytable WHERE \"Year\" <= 2014 ORDER BY LongestAddGTime, CRSArrTime LIMIT 2","hsqls":["SELECT DepTime, AirlineID FROM mytable WHERE Year <= 2014 ORDER BY LongestAddGTime, CRSArrTime LIMIT 2"]}
+{"sql":"SELECT DepTime, AirlineID FROM mytable WHERE \"Year\" <= 2014 ORDER BY LongestAddGTime, CRSArrTime LIMIT 2","hsqls":["SELECT DepTime, AirlineID FROM mytable WHERE `Year` <= 2014 ORDER BY LongestAddGTime, CRSArrTime LIMIT 2"]}
 {"sql":"SELECT DayOfWeek FROM mytable LIMIT 3"}
 {"sql":"SELECT DestWac, Diverted, LateAircraftDelay, AVG(NASDelay) FROM mytable WHERE UniqueCarrier IN ('HA') OR DestStateName BETWEEN 'Kansas' AND 'Missouri' AND SecurityDelay > 14 GROUP BY DestWac, Diverted, LateAircraftDelay  ORDER BY DestWac, Diverted, LateAircraftDelay LIMIT 2","hsqls":["SELECT DestWac, Diverted, LateAircraftDelay, AVG(NASDelay) FROM mytable WHERE UniqueCarrier IN ('HA') OR DestStateName BETWEEN 'Kansas' AND 'Missouri' AND SecurityDelay > 14 GROUP BY DestWac, Diverted, LateAircraftDelay  ORDER BY DestWac, Diverted, LateAircraftDelay LIMIT 2"]}
 {"sql":"SELECT DivReachedDest, Diverted, CRSArrTime, COUNT(*) FROM mytable WHERE Flights NOT IN (1) GROUP BY DivReachedDest, Diverted, CRSArrTime  ORDER BY DivReachedDest, Diverted, CRSArrTime LIMIT 16","hsqls":["SELECT DivReachedDest, Diverted, CRSArrTime, COUNT(*) FROM mytable WHERE Flights NOT IN (1) GROUP BY DivReachedDest, Diverted, CRSArrTime  ORDER BY DivReachedDest, Diverted, CRSArrTime LIMIT 16"]}
-{"sql":"SELECT OriginCityMarketID, \"Month\", MIN(DepTime) FROM mytable WHERE DivAirportIDs BETWEEN 14986 AND 10397 AND FlightNum > 2790 OR DepDel15 BETWEEN 0 AND -9999 GROUP BY OriginCityMarketID, \"Month\" LIMIT 19","hsqls":["SELECT OriginCityMarketID, Month, MIN(DepTime) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14986 AND 10397 OR DivAirportIDs__MV1 BETWEEN 14986 AND 10397 OR DivAirportIDs__MV2 BETWEEN 14986 AND 10397 OR DivAirportIDs__MV3 BETWEEN 14986 AND 10397 OR DivAirportIDs__MV4 BETWEEN 14986 AND 10397) AND FlightNum > 2790 OR DepDel15 BETWEEN 0 AND -9999 GROUP BY OriginCityMarketID, Month LIMIT 10000"]}
-{"sql":"SELECT Diverted, AirlineID, OriginWac, MIN(WheelsOff) FROM mytable WHERE \"Year\" > 2014 AND OriginAirportID <= 14489 AND DepDel15 BETWEEN 1 AND 0 GROUP BY Diverted, AirlineID, OriginWac LIMIT 11","hsqls":["SELECT Diverted, AirlineID, OriginWac, MIN(WheelsOff) FROM mytable WHERE Year > 2014 AND OriginAirportID <= 14489 AND DepDel15 BETWEEN 1 AND 0 GROUP BY Diverted, AirlineID, OriginWac LIMIT 11"]}
+{"sql":"SELECT OriginCityMarketID, \"Month\", MIN(DepTime) FROM mytable WHERE DivAirportIDs BETWEEN 14986 AND 10397 AND FlightNum > 2790 OR DepDel15 BETWEEN 0 AND -9999 GROUP BY OriginCityMarketID, \"Month\" LIMIT 19","hsqls":["SELECT OriginCityMarketID, Month, MIN(DepTime) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14986 AND 10397 OR DivAirportIDs[2] BETWEEN 14986 AND 10397 OR DivAirportIDs[3] BETWEEN 14986 AND 10397 OR DivAirportIDs[4] BETWEEN 14986 AND 10397 OR DivAirportIDs[5] BETWEEN 14986 AND 10397) AND FlightNum > 2790 OR DepDel15 BETWEEN 0 AND -9999 GROUP BY OriginCityMarketID, `Month` LIMIT 10000"]}
+{"sql":"SELECT Diverted, AirlineID, OriginWac, MIN(WheelsOff) FROM mytable WHERE \"Year\" > 2014 AND OriginAirportID <= 14489 AND DepDel15 BETWEEN 1 AND 0 GROUP BY Diverted, AirlineID, OriginWac LIMIT 11","hsqls":["SELECT Diverted, AirlineID, OriginWac, MIN(WheelsOff) FROM mytable WHERE `Year` > 2014 AND OriginAirportID <= 14489 AND DepDel15 BETWEEN 1 AND 0 GROUP BY Diverted, AirlineID, OriginWac LIMIT 11"]}
 {"sql":"SELECT OriginAirportSeqID, MAX(ArrDelayMinutes), COUNT(WheelsOff) FROM mytable WHERE FlightNum IN (6024, 2489) GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 21","hsqls":["SELECT OriginAirportSeqID, MAX(ArrDelayMinutes), COUNT(WheelsOff) FROM mytable WHERE FlightNum IN (6024, 2489) GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 21"]}
 {"sql":"SELECT UniqueCarrier, ArrivalDelayGroups, CRSElapsedTime FROM mytable WHERE DestStateName BETWEEN 'Arizona' AND 'South Dakota' ORDER BY OriginAirportSeqID LIMIT 22"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState IN ('GA', 'MN', 'WV') LIMIT 7"}
@@ -5251,72 +5251,72 @@
 {"sql":"SELECT CarrierDelay, ArrivalDelayGroups FROM mytable ORDER BY FirstDepTime, NASDelay, DivArrDelay LIMIT 2"}
 {"sql":"SELECT WheelsOff, MIN(DayofMonth) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'OO' OR DivActualElapsedTime >= 291 OR DepDelayMinutes BETWEEN 117.0 AND 417.0 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 8","hsqls":["SELECT WheelsOff, MIN(DayofMonth) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'OO' OR DivActualElapsedTime >= 291 OR DepDelayMinutes BETWEEN 117.0 AND 417.0 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 8"]}
 {"sql":"SELECT OriginAirportSeqID, DepDelayMinutes, AVG(DivActualElapsedTime) FROM mytable GROUP BY OriginAirportSeqID, DepDelayMinutes  ORDER BY OriginAirportSeqID, DepDelayMinutes LIMIT 11","hsqls":["SELECT OriginAirportSeqID, DepDelayMinutes, AVG(DivActualElapsedTime) FROM mytable GROUP BY OriginAirportSeqID, DepDelayMinutes  ORDER BY OriginAirportSeqID, DepDelayMinutes LIMIT 11"]}
-{"sql":"SELECT OriginCityMarketID, DepTime FROM mytable WHERE DepDelayMinutes >= 88.0 AND NASDelay BETWEEN 281 AND 38 OR UniqueCarrier IN ('DL', 'HA', 'FL', 'MQ') ORDER BY DistanceGroup, DepTime, \"Month\" LIMIT 27","hsqls":["SELECT OriginCityMarketID, DepTime FROM mytable WHERE DepDelayMinutes >= 88.0 AND NASDelay BETWEEN 281 AND 38 OR UniqueCarrier IN ('DL', 'HA', 'FL', 'MQ') ORDER BY DistanceGroup, DepTime, Month LIMIT 27"]}
+{"sql":"SELECT OriginCityMarketID, DepTime FROM mytable WHERE DepDelayMinutes >= 88.0 AND NASDelay BETWEEN 281 AND 38 OR UniqueCarrier IN ('DL', 'HA', 'FL', 'MQ') ORDER BY DistanceGroup, DepTime, \"Month\" LIMIT 27","hsqls":["SELECT OriginCityMarketID, DepTime FROM mytable WHERE DepDelayMinutes >= 88.0 AND NASDelay BETWEEN 281 AND 38 OR UniqueCarrier IN ('DL', 'HA', 'FL', 'MQ') ORDER BY DistanceGroup, DepTime, `Month` LIMIT 27"]}
 {"sql":"SELECT TaxiIn, DepDel15, COUNT(*) FROM mytable GROUP BY TaxiIn, DepDel15  ORDER BY TaxiIn, DepDel15 LIMIT 4","hsqls":["SELECT TaxiIn, DepDel15, COUNT(*) FROM mytable GROUP BY TaxiIn, DepDel15  ORDER BY TaxiIn, DepDel15 LIMIT 4"]}
 {"sql":"SELECT OriginCityMarketID, MIN(FlightNum) FROM mytable WHERE CRSDepTime NOT IN (752) GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 22","hsqls":["SELECT OriginCityMarketID, MIN(FlightNum) FROM mytable WHERE CRSDepTime NOT IN (752) GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 22"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE Distance <= 1943 AND CRSArrTime BETWEEN 1130 AND 810 OR OriginAirportSeqID BETWEEN 1066602 AND 1043102 ORDER BY DistanceGroup LIMIT 15"}
-{"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, ArrDel15, COUNT(\"Year\") FROM mytable WHERE DivWheelsOffs < 1725 GROUP BY OriginAirportSeqID, LateAircraftDelay, ArrDel15 LIMIT 10","hsqls":["SELECT OriginAirportSeqID, LateAircraftDelay, ArrDel15, COUNT(Year) FROM mytable WHERE (DivWheelsOffs__MV0 < 1725 OR DivWheelsOffs__MV1 < 1725 OR DivWheelsOffs__MV2 < 1725 OR DivWheelsOffs__MV3 < 1725 OR DivWheelsOffs__MV4 < 1725) GROUP BY OriginAirportSeqID, LateAircraftDelay, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, ArrDelay, WheelsOn FROM mytable WHERE DivTotalGTimes <= 37 OR LateAircraftDelay <> 68 ORDER BY ActualElapsedTime, NASDelay, AirTime LIMIT 12","hsqls":["SELECT TaxiIn, ArrDelay, WheelsOn FROM mytable WHERE (DivTotalGTimes__MV0 <= 37 OR DivTotalGTimes__MV1 <= 37 OR DivTotalGTimes__MV2 <= 37 OR DivTotalGTimes__MV3 <= 37 OR DivTotalGTimes__MV4 <= 37) OR LateAircraftDelay <> 68 ORDER BY ActualElapsedTime, NASDelay, AirTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, LateAircraftDelay, ArrDel15, COUNT(\"Year\") FROM mytable WHERE DivWheelsOffs < 1725 GROUP BY OriginAirportSeqID, LateAircraftDelay, ArrDel15 LIMIT 10","hsqls":["SELECT OriginAirportSeqID, LateAircraftDelay, ArrDel15, COUNT(`Year`) FROM mytable WHERE (DivWheelsOffs[1] < 1725 OR DivWheelsOffs[2] < 1725 OR DivWheelsOffs[3] < 1725 OR DivWheelsOffs[4] < 1725 OR DivWheelsOffs[5] < 1725) GROUP BY OriginAirportSeqID, LateAircraftDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, ArrDelay, WheelsOn FROM mytable WHERE DivTotalGTimes <= 37 OR LateAircraftDelay <> 68 ORDER BY ActualElapsedTime, NASDelay, AirTime LIMIT 12","hsqls":["SELECT TaxiIn, ArrDelay, WheelsOn FROM mytable WHERE (DivTotalGTimes[1] <= 37 OR DivTotalGTimes[2] <= 37 OR DivTotalGTimes[3] <= 37 OR DivTotalGTimes[4] <= 37 OR DivTotalGTimes[5] <= 37) OR LateAircraftDelay <> 68 ORDER BY ActualElapsedTime, NASDelay, AirTime LIMIT 10000"]}
 {"sql":"SELECT SUM(Cancelled), MAX(TotalAddGTime) FROM mytable WHERE UniqueCarrier BETWEEN 'AA' AND 'F9' AND DestStateFips BETWEEN 27 AND 16 AND LongestAddGTime <> 24 LIMIT 17"}
 {"sql":"SELECT DayofMonth, DaysSinceEpoch, MIN(FirstDepTime) FROM mytable GROUP BY DayofMonth, DaysSinceEpoch  ORDER BY DayofMonth, DaysSinceEpoch LIMIT 18","hsqls":["SELECT DayofMonth, DaysSinceEpoch, MIN(FirstDepTime) FROM mytable GROUP BY DayofMonth, DaysSinceEpoch  ORDER BY DayofMonth, DaysSinceEpoch LIMIT 18"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE DestState BETWEEN 'LA' AND 'NJ' OR DivAirportIDs IN (11953) OR ArrDel15 NOT IN (1, -9999) LIMIT 26","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DestState BETWEEN 'LA' AND 'NJ' OR (DivAirportIDs__MV0 IN (11953) OR DivAirportIDs__MV1 IN (11953) OR DivAirportIDs__MV2 IN (11953) OR DivAirportIDs__MV3 IN (11953) OR DivAirportIDs__MV4 IN (11953)) OR ArrDel15 NOT IN (1, -9999) LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DestState BETWEEN 'LA' AND 'NJ' OR DivAirportIDs IN (11953) OR ArrDel15 NOT IN (1, -9999) LIMIT 26","hsqls":["SELECT DivAirports FROM mytable WHERE DestState BETWEEN 'LA' AND 'NJ' OR (DivAirportIDs[1] IN (11953) OR DivAirportIDs[2] IN (11953) OR DivAirportIDs[3] IN (11953) OR DivAirportIDs[4] IN (11953) OR DivAirportIDs[5] IN (11953)) OR ArrDel15 NOT IN (1, -9999) LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable ORDER BY LongestAddGTime, DayofMonth LIMIT 27"}
 {"sql":"SELECT DayOfWeek, COUNT(Origin) FROM mytable GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 29","hsqls":["SELECT DayOfWeek, COUNT(Origin) FROM mytable GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 29"]}
 {"sql":"SELECT WheelsOff, MIN(Distance) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 9","hsqls":["SELECT WheelsOff, MIN(Distance) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 9"]}
 {"sql":"SELECT Flights, ArrTimeBlk FROM mytable WHERE Distance >= 1166 AND DestWac IN (41, 34, 37, 12) OR AirTime BETWEEN 191 AND 40 LIMIT 6"}
-{"sql":"SELECT OriginStateFips FROM mytable WHERE DestStateFips IN (20, 10, 54, 75) OR LongestAddGTime BETWEEN 74 AND 29 AND DivLongestGTimes BETWEEN 43.0 AND 46.0 ORDER BY FirstDepTime, DestStateFips LIMIT 6","hsqls":["SELECT OriginStateFips FROM mytable WHERE DestStateFips IN (20, 10, 54, 75) OR LongestAddGTime BETWEEN 74 AND 29 AND (DivLongestGTimes__MV0 BETWEEN 43.0 AND 46.0 OR DivLongestGTimes__MV1 BETWEEN 43.0 AND 46.0 OR DivLongestGTimes__MV2 BETWEEN 43.0 AND 46.0 OR DivLongestGTimes__MV3 BETWEEN 43.0 AND 46.0 OR DivLongestGTimes__MV4 BETWEEN 43.0 AND 46.0) ORDER BY FirstDepTime, DestStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips FROM mytable WHERE DestStateFips IN (20, 10, 54, 75) OR LongestAddGTime BETWEEN 74 AND 29 AND DivLongestGTimes BETWEEN 43.0 AND 46.0 ORDER BY FirstDepTime, DestStateFips LIMIT 6","hsqls":["SELECT OriginStateFips FROM mytable WHERE DestStateFips IN (20, 10, 54, 75) OR LongestAddGTime BETWEEN 74 AND 29 AND (DivLongestGTimes[1] BETWEEN 43.0 AND 46.0 OR DivLongestGTimes[2] BETWEEN 43.0 AND 46.0 OR DivLongestGTimes[3] BETWEEN 43.0 AND 46.0 OR DivLongestGTimes[4] BETWEEN 43.0 AND 46.0 OR DivLongestGTimes[5] BETWEEN 43.0 AND 46.0) ORDER BY FirstDepTime, DestStateFips LIMIT 10000"]}
 {"sql":"SELECT OriginState FROM mytable ORDER BY DestCityName LIMIT 19"}
 {"sql":"SELECT OriginStateFips, MAX(FirstDepTime), SUM(FirstDepTime), MAX(DivArrDelay) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 11","hsqls":["SELECT OriginStateFips, MAX(FirstDepTime), SUM(FirstDepTime), MAX(DivArrDelay) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 11"]}
-{"sql":"SELECT OriginState, DepDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirports IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') AND TaxiOut = 49 AND DivArrDelay BETWEEN 427 AND 136 GROUP BY OriginState, DepDelay, DaysSinceEpoch LIMIT 28","hsqls":["SELECT OriginState, DepDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirports__MV0 IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports__MV1 IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports__MV2 IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports__MV3 IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports__MV4 IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW')) AND TaxiOut = 49 AND DivArrDelay BETWEEN 427 AND 136 GROUP BY OriginState, DepDelay, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, ActualElapsedTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE Carrier <> 'DL' AND DivAirportSeqIDs >= 1091802 AND DayofMonth BETWEEN 14 AND 29 GROUP BY DestStateFips, ActualElapsedTime, ArrDelayMinutes LIMIT 18","hsqls":["SELECT DestStateFips, ActualElapsedTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE Carrier <> 'DL' AND (DivAirportSeqIDs__MV0 >= 1091802 OR DivAirportSeqIDs__MV1 >= 1091802 OR DivAirportSeqIDs__MV2 >= 1091802 OR DivAirportSeqIDs__MV3 >= 1091802 OR DivAirportSeqIDs__MV4 >= 1091802) AND DayofMonth BETWEEN 14 AND 29 GROUP BY DestStateFips, ActualElapsedTime, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT OriginState, DepDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirports IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') AND TaxiOut = 49 AND DivArrDelay BETWEEN 427 AND 136 GROUP BY OriginState, DepDelay, DaysSinceEpoch LIMIT 28","hsqls":["SELECT OriginState, DepDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirports[1] IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports[2] IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports[3] IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports[4] IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW') OR DivAirports[5] IN ('SJC', 'SBN', 'ALB', 'AUS', 'BRW')) AND TaxiOut = 49 AND DivArrDelay BETWEEN 427 AND 136 GROUP BY OriginState, DepDelay, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, ActualElapsedTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE Carrier <> 'DL' AND DivAirportSeqIDs >= 1091802 AND DayofMonth BETWEEN 14 AND 29 GROUP BY DestStateFips, ActualElapsedTime, ArrDelayMinutes LIMIT 18","hsqls":["SELECT DestStateFips, ActualElapsedTime, ArrDelayMinutes, COUNT(*) FROM mytable WHERE Carrier <> 'DL' AND (DivAirportSeqIDs[1] >= 1091802 OR DivAirportSeqIDs[2] >= 1091802 OR DivAirportSeqIDs[3] >= 1091802 OR DivAirportSeqIDs[4] >= 1091802 OR DivAirportSeqIDs[5] >= 1091802) AND DayofMonth BETWEEN 14 AND 29 GROUP BY DestStateFips, ActualElapsedTime, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, DestStateFips, DayofMonth, MAX(DistanceGroup), SUM(DepDelay) FROM mytable GROUP BY LateAircraftDelay, DestStateFips, DayofMonth  ORDER BY LateAircraftDelay, DestStateFips, DayofMonth LIMIT 12","hsqls":["SELECT LateAircraftDelay, DestStateFips, DayofMonth, MAX(DistanceGroup), SUM(DepDelay) FROM mytable GROUP BY LateAircraftDelay, DestStateFips, DayofMonth  ORDER BY LateAircraftDelay, DestStateFips, DayofMonth LIMIT 12"]}
-{"sql":"SELECT Cancelled, DivWheelsOffs FROM mytable WHERE OriginCityName < 'San Luis Obispo, CA' ORDER BY DayofMonth, AirTime, \"Month\" LIMIT 26","hsqls":["SELECT Cancelled, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE OriginCityName < 'San Luis Obispo, CA' ORDER BY DayofMonth, AirTime, Month LIMIT 10000"]}
+{"sql":"SELECT Cancelled, DivWheelsOffs FROM mytable WHERE OriginCityName < 'San Luis Obispo, CA' ORDER BY DayofMonth, AirTime, \"Month\" LIMIT 26","hsqls":["SELECT Cancelled, DivWheelsOffs FROM mytable WHERE OriginCityName < 'San Luis Obispo, CA' ORDER BY DayofMonth, AirTime, `Month` LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DestStateName, Dest, COUNT(*) FROM mytable WHERE DepDelayMinutes >= 254.0 GROUP BY FirstDepTime, DestStateName, Dest  ORDER BY FirstDepTime, DestStateName, Dest LIMIT 9","hsqls":["SELECT FirstDepTime, DestStateName, Dest, COUNT(*) FROM mytable WHERE DepDelayMinutes >= 254.0 GROUP BY FirstDepTime, DestStateName, Dest  ORDER BY FirstDepTime, DestStateName, Dest LIMIT 9"]}
-{"sql":"SELECT FirstDepTime, CarrierDelay, DivAirportIDs FROM mytable WHERE CRSArrTime BETWEEN 657 AND 633 ORDER BY OriginCityMarketID, OriginAirportID LIMIT 10","hsqls":["SELECT FirstDepTime, CarrierDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE CRSArrTime BETWEEN 657 AND 633 ORDER BY OriginCityMarketID, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, CarrierDelay, DivAirportIDs FROM mytable WHERE CRSArrTime BETWEEN 657 AND 633 ORDER BY OriginCityMarketID, OriginAirportID LIMIT 10","hsqls":["SELECT FirstDepTime, CarrierDelay, DivAirportIDs FROM mytable WHERE CRSArrTime BETWEEN 657 AND 633 ORDER BY OriginCityMarketID, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, FirstDepTime, Origin, AVG(OriginCityMarketID) FROM mytable WHERE Quarter NOT IN (1) OR DistanceGroup IN (4) OR LateAircraftDelay NOT IN (182, 185, 119) GROUP BY DepartureDelayGroups, FirstDepTime, Origin  ORDER BY DepartureDelayGroups, FirstDepTime, Origin LIMIT 6","hsqls":["SELECT DepartureDelayGroups, FirstDepTime, Origin, AVG(OriginCityMarketID) FROM mytable WHERE Quarter NOT IN (1) OR DistanceGroup IN (4) OR LateAircraftDelay NOT IN (182, 185, 119) GROUP BY DepartureDelayGroups, FirstDepTime, Origin  ORDER BY DepartureDelayGroups, FirstDepTime, Origin LIMIT 6"]}
-{"sql":"SELECT TailNum, DivAirportIDs, DestCityMarketID FROM mytable WHERE DivWheelsOffs BETWEEN 1940 AND 34 AND DepDel15 > 0 LIMIT 18","hsqls":["SELECT TailNum, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DestCityMarketID FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1940 AND 34 OR DivWheelsOffs__MV1 BETWEEN 1940 AND 34 OR DivWheelsOffs__MV2 BETWEEN 1940 AND 34 OR DivWheelsOffs__MV3 BETWEEN 1940 AND 34 OR DivWheelsOffs__MV4 BETWEEN 1940 AND 34) AND DepDel15 > 0 LIMIT 10000"]}
+{"sql":"SELECT TailNum, DivAirportIDs, DestCityMarketID FROM mytable WHERE DivWheelsOffs BETWEEN 1940 AND 34 AND DepDel15 > 0 LIMIT 18","hsqls":["SELECT TailNum, DivAirportIDs, DestCityMarketID FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1940 AND 34 OR DivWheelsOffs[2] BETWEEN 1940 AND 34 OR DivWheelsOffs[3] BETWEEN 1940 AND 34 OR DivWheelsOffs[4] BETWEEN 1940 AND 34 OR DivWheelsOffs[5] BETWEEN 1940 AND 34) AND DepDel15 > 0 LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE OriginAirportID NOT IN (11867) OR DepDelayMinutes IN (12.0, 55.0, 139.0) LIMIT 9"}
-{"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable WHERE CarrierDelay <> 20 OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 27","hsqls":["SELECT COUNT(CRSElapsedTime) FROM mytable WHERE CarrierDelay <> 20 OR Year BETWEEN 2014 AND 2014 LIMIT 27"]}
+{"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable WHERE CarrierDelay <> 20 OR \"Year\" BETWEEN 2014 AND 2014 LIMIT 27","hsqls":["SELECT COUNT(CRSElapsedTime) FROM mytable WHERE CarrierDelay <> 20 OR `Year` BETWEEN 2014 AND 2014 LIMIT 27"]}
 {"sql":"SELECT DepDelay, MIN(OriginWac) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 20","hsqls":["SELECT DepDelay, MIN(OriginWac) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 20"]}
 {"sql":"SELECT Cancelled, Dest, DaysSinceEpoch, MIN(LateAircraftDelay), AVG(NASDelay), MIN(DivReachedDest) FROM mytable GROUP BY Cancelled, Dest, DaysSinceEpoch  ORDER BY Cancelled, Dest, DaysSinceEpoch LIMIT 18","hsqls":["SELECT Cancelled, Dest, DaysSinceEpoch, MIN(LateAircraftDelay), AVG(NASDelay), MIN(DivReachedDest) FROM mytable GROUP BY Cancelled, Dest, DaysSinceEpoch  ORDER BY Cancelled, Dest, DaysSinceEpoch LIMIT 18"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE Cancelled IN (1, 0) ORDER BY Diverted LIMIT 19"}
 {"sql":"SELECT DistanceGroup, AVG(OriginWac), SUM(DepTime) FROM mytable WHERE DivDistance BETWEEN 45 AND 220 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 22","hsqls":["SELECT DistanceGroup, AVG(OriginWac), SUM(DepTime) FROM mytable WHERE DivDistance BETWEEN 45 AND 220 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 22"]}
 {"sql":"SELECT OriginAirportID FROM mytable ORDER BY Diverted, DepDelay LIMIT 13"}
 {"sql":"SELECT Diverted, ArrTimeBlk, SUM(TaxiOut), SUM(OriginAirportSeqID) FROM mytable WHERE TaxiOut IN (55, 40, 37) AND FlightDate BETWEEN '2014-01-22' AND '2014-01-24' OR DistanceGroup BETWEEN 6 AND 7 GROUP BY Diverted, ArrTimeBlk  ORDER BY Diverted, ArrTimeBlk LIMIT 29","hsqls":["SELECT Diverted, ArrTimeBlk, SUM(TaxiOut), SUM(OriginAirportSeqID) FROM mytable WHERE TaxiOut IN (55, 40, 37) AND FlightDate BETWEEN '2014-01-22' AND '2014-01-24' OR DistanceGroup BETWEEN 6 AND 7 GROUP BY Diverted, ArrTimeBlk  ORDER BY Diverted, ArrTimeBlk LIMIT 29"]}
-{"sql":"SELECT MAX(TotalAddGTime), SUM(WeatherDelay) FROM mytable WHERE \"Month\" <> 1 OR Distance >= 3904 OR DivActualElapsedTime BETWEEN 252 AND 552 LIMIT 21","hsqls":["SELECT MAX(TotalAddGTime), SUM(WeatherDelay) FROM mytable WHERE Month <> 1 OR Distance >= 3904 OR DivActualElapsedTime BETWEEN 252 AND 552 LIMIT 21"]}
+{"sql":"SELECT MAX(TotalAddGTime), SUM(WeatherDelay) FROM mytable WHERE \"Month\" <> 1 OR Distance >= 3904 OR DivActualElapsedTime BETWEEN 252 AND 552 LIMIT 21","hsqls":["SELECT MAX(TotalAddGTime), SUM(WeatherDelay) FROM mytable WHERE `Month` <> 1 OR Distance >= 3904 OR DivActualElapsedTime BETWEEN 252 AND 552 LIMIT 21"]}
 {"sql":"SELECT DistanceGroup, ArrTimeBlk, DestCityMarketID, MAX(LongestAddGTime) FROM mytable GROUP BY DistanceGroup, ArrTimeBlk, DestCityMarketID  ORDER BY DistanceGroup, ArrTimeBlk, DestCityMarketID LIMIT 22","hsqls":["SELECT DistanceGroup, ArrTimeBlk, DestCityMarketID, MAX(LongestAddGTime) FROM mytable GROUP BY DistanceGroup, ArrTimeBlk, DestCityMarketID  ORDER BY DistanceGroup, ArrTimeBlk, DestCityMarketID LIMIT 22"]}
-{"sql":"SELECT FlightNum, NASDelay, MIN(DaysSinceEpoch), MIN(OriginWac), COUNT(DestState) FROM mytable WHERE DivTailNums >= 'N915DL' OR TotalAddGTime IN (2, 42, 51, 103, 27) GROUP BY FlightNum, NASDelay LIMIT 4","hsqls":["SELECT FlightNum, NASDelay, MIN(DaysSinceEpoch), MIN(OriginWac), COUNT(DestState) FROM mytable WHERE (DivTailNums__MV0 >= 'N915DL' OR DivTailNums__MV1 >= 'N915DL' OR DivTailNums__MV2 >= 'N915DL' OR DivTailNums__MV3 >= 'N915DL' OR DivTailNums__MV4 >= 'N915DL') OR TotalAddGTime IN (2, 42, 51, 103, 27) GROUP BY FlightNum, NASDelay LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY DistanceGroup, DepDelay LIMIT 23","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY DistanceGroup, DepDelay LIMIT 10000"]}
+{"sql":"SELECT FlightNum, NASDelay, MIN(DaysSinceEpoch), MIN(OriginWac), COUNT(DestState) FROM mytable WHERE DivTailNums >= 'N915DL' OR TotalAddGTime IN (2, 42, 51, 103, 27) GROUP BY FlightNum, NASDelay LIMIT 4","hsqls":["SELECT FlightNum, NASDelay, MIN(DaysSinceEpoch), MIN(OriginWac), COUNT(DestState) FROM mytable WHERE (DivTailNums[1] >= 'N915DL' OR DivTailNums[2] >= 'N915DL' OR DivTailNums[3] >= 'N915DL' OR DivTailNums[4] >= 'N915DL' OR DivTailNums[5] >= 'N915DL') OR TotalAddGTime IN (2, 42, 51, 103, 27) GROUP BY FlightNum, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY DistanceGroup, DepDelay LIMIT 23","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY DistanceGroup, DepDelay LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DayofMonth > 24 LIMIT 18"}
 {"sql":"SELECT MAX(ArrDelay) FROM mytable LIMIT 24"}
 {"sql":"SELECT Quarter, Distance FROM mytable WHERE WheelsOn IN (2019, 1821, 2105) OR ArrDel15 NOT IN (1) LIMIT 17"}
-{"sql":"SELECT ArrTime, AirTime FROM mytable WHERE CancellationCode BETWEEN 'B' AND 'B' AND DivAirportSeqIDs IN (1467903) AND DivArrDelay NOT IN (115, 136) ORDER BY DepartureDelayGroups, TaxiIn, CRSElapsedTime LIMIT 18","hsqls":["SELECT ArrTime, AirTime FROM mytable WHERE CancellationCode BETWEEN 'B' AND 'B' AND (DivAirportSeqIDs__MV0 IN (1467903) OR DivAirportSeqIDs__MV1 IN (1467903) OR DivAirportSeqIDs__MV2 IN (1467903) OR DivAirportSeqIDs__MV3 IN (1467903) OR DivAirportSeqIDs__MV4 IN (1467903)) AND DivArrDelay NOT IN (115, 136) ORDER BY DepartureDelayGroups, TaxiIn, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ArrTime, AirTime FROM mytable WHERE CancellationCode BETWEEN 'B' AND 'B' AND DivAirportSeqIDs IN (1467903) AND DivArrDelay NOT IN (115, 136) ORDER BY DepartureDelayGroups, TaxiIn, CRSElapsedTime LIMIT 18","hsqls":["SELECT ArrTime, AirTime FROM mytable WHERE CancellationCode BETWEEN 'B' AND 'B' AND (DivAirportSeqIDs[1] IN (1467903) OR DivAirportSeqIDs[2] IN (1467903) OR DivAirportSeqIDs[3] IN (1467903) OR DivAirportSeqIDs[4] IN (1467903) OR DivAirportSeqIDs[5] IN (1467903)) AND DivArrDelay NOT IN (115, 136) ORDER BY DepartureDelayGroups, TaxiIn, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, DayOfWeek, COUNT(LongestAddGTime) FROM mytable GROUP BY DepartureDelayGroups, DayOfWeek  ORDER BY DepartureDelayGroups, DayOfWeek LIMIT 20","hsqls":["SELECT DepartureDelayGroups, DayOfWeek, COUNT(LongestAddGTime) FROM mytable GROUP BY DepartureDelayGroups, DayOfWeek  ORDER BY DepartureDelayGroups, DayOfWeek LIMIT 20"]}
-{"sql":"SELECT WheelsOn FROM mytable WHERE DivWheelsOffs = 2242 ORDER BY DepTimeBlk, AirTime LIMIT 25","hsqls":["SELECT WheelsOn FROM mytable WHERE (DivWheelsOffs__MV0 = 2242 OR DivWheelsOffs__MV1 = 2242 OR DivWheelsOffs__MV2 = 2242 OR DivWheelsOffs__MV3 = 2242 OR DivWheelsOffs__MV4 = 2242) ORDER BY DepTimeBlk, AirTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOn FROM mytable WHERE DivWheelsOffs = 2242 ORDER BY DepTimeBlk, AirTime LIMIT 25","hsqls":["SELECT WheelsOn FROM mytable WHERE (DivWheelsOffs[1] = 2242 OR DivWheelsOffs[2] = 2242 OR DivWheelsOffs[3] = 2242 OR DivWheelsOffs[4] = 2242 OR DivWheelsOffs[5] = 2242) ORDER BY DepTimeBlk, AirTime LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE CRSElapsedTime IN (50) ORDER BY CRSArrTime LIMIT 14"}
 {"sql":"SELECT Carrier FROM mytable ORDER BY CRSArrTime, AirTime LIMIT 7"}
 {"sql":"SELECT DepDelay, OriginCityName, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 930 AND 2028 GROUP BY DepDelay, OriginCityName  ORDER BY DepDelay, OriginCityName LIMIT 23","hsqls":["SELECT DepDelay, OriginCityName, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 930 AND 2028 GROUP BY DepDelay, OriginCityName  ORDER BY DepDelay, OriginCityName LIMIT 23"]}
 {"sql":"SELECT SUM(WheelsOn), MIN(DistanceGroup), MAX(CRSArrTime) FROM mytable WHERE TailNum IN ('N313US', 'N544AA', 'N619AS')"}
-{"sql":"SELECT DayofMonth, COUNT(*) FROM mytable WHERE TailNum < 'N639AA' AND DivLongestGTimes IN (61.0) AND DestCityMarketID BETWEEN 31612 AND 31337 GROUP BY DayofMonth LIMIT 28","hsqls":["SELECT DayofMonth, COUNT(*) FROM mytable WHERE TailNum < 'N639AA' AND (DivLongestGTimes__MV0 IN (61.0) OR DivLongestGTimes__MV1 IN (61.0) OR DivLongestGTimes__MV2 IN (61.0) OR DivLongestGTimes__MV3 IN (61.0) OR DivLongestGTimes__MV4 IN (61.0)) AND DestCityMarketID BETWEEN 31612 AND 31337 GROUP BY DayofMonth LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes BETWEEN 45.0 AND 96.0","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 45.0 AND 96.0 OR DivLongestGTimes__MV1 BETWEEN 45.0 AND 96.0 OR DivLongestGTimes__MV2 BETWEEN 45.0 AND 96.0 OR DivLongestGTimes__MV3 BETWEEN 45.0 AND 96.0 OR DivLongestGTimes__MV4 BETWEEN 45.0 AND 96.0) LIMIT 10000"]}
+{"sql":"SELECT DayofMonth, COUNT(*) FROM mytable WHERE TailNum < 'N639AA' AND DivLongestGTimes IN (61.0) AND DestCityMarketID BETWEEN 31612 AND 31337 GROUP BY DayofMonth LIMIT 28","hsqls":["SELECT DayofMonth, COUNT(*) FROM mytable WHERE TailNum < 'N639AA' AND (DivLongestGTimes[1] IN (61.0) OR DivLongestGTimes[2] IN (61.0) OR DivLongestGTimes[3] IN (61.0) OR DivLongestGTimes[4] IN (61.0) OR DivLongestGTimes[5] IN (61.0)) AND DestCityMarketID BETWEEN 31612 AND 31337 GROUP BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes BETWEEN 45.0 AND 96.0","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 45.0 AND 96.0 OR DivLongestGTimes[2] BETWEEN 45.0 AND 96.0 OR DivLongestGTimes[3] BETWEEN 45.0 AND 96.0 OR DivLongestGTimes[4] BETWEEN 45.0 AND 96.0 OR DivLongestGTimes[5] BETWEEN 45.0 AND 96.0) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, OriginStateFips, COUNT(*) FROM mytable GROUP BY DivReachedDest, OriginStateFips  ORDER BY DivReachedDest, OriginStateFips LIMIT 8","hsqls":["SELECT DivReachedDest, OriginStateFips, COUNT(*) FROM mytable GROUP BY DivReachedDest, OriginStateFips  ORDER BY DivReachedDest, OriginStateFips LIMIT 8"]}
 {"sql":"SELECT WheelsOn, DayOfWeek FROM mytable WHERE UniqueCarrier BETWEEN 'HA' AND 'UA' AND ArrDel15 BETWEEN 0 AND 0 OR WeatherDelay BETWEEN 50 AND 38 ORDER BY \"Year\", Distance LIMIT 29","hsqls":["SELECT WheelsOn, DayOfWeek FROM mytable WHERE UniqueCarrier BETWEEN 'HA' AND 'UA' AND ArrDel15 BETWEEN 0 AND 0 OR WeatherDelay BETWEEN 50 AND 38 ORDER BY Year, Distance LIMIT 29"]}
 {"sql":"SELECT DistanceGroup, OriginAirportID FROM mytable WHERE LateAircraftDelay NOT IN (68, 75) OR Cancelled BETWEEN 0 AND 1 ORDER BY ArrDelayMinutes, DestStateName LIMIT 29"}
-{"sql":"SELECT Quarter FROM mytable WHERE NASDelay BETWEEN 60 AND 229 OR Dest IN ('ELM') AND DivAirports = 'MIA' ORDER BY Origin, ArrDelay LIMIT 4","hsqls":["SELECT Quarter FROM mytable WHERE NASDelay BETWEEN 60 AND 229 OR Dest IN ('ELM') AND (DivAirports__MV0 = 'MIA' OR DivAirports__MV1 = 'MIA' OR DivAirports__MV2 = 'MIA' OR DivAirports__MV3 = 'MIA' OR DivAirports__MV4 = 'MIA') ORDER BY Origin, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT FlightNum FROM mytable WHERE DivAirportSeqIDs >= 1419303 LIMIT 6","hsqls":["SELECT FlightNum FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1419303 OR DivAirportSeqIDs__MV1 >= 1419303 OR DivAirportSeqIDs__MV2 >= 1419303 OR DivAirportSeqIDs__MV3 >= 1419303 OR DivAirportSeqIDs__MV4 >= 1419303) LIMIT 10000"]}
+{"sql":"SELECT Quarter FROM mytable WHERE NASDelay BETWEEN 60 AND 229 OR Dest IN ('ELM') AND DivAirports = 'MIA' ORDER BY Origin, ArrDelay LIMIT 4","hsqls":["SELECT Quarter FROM mytable WHERE NASDelay BETWEEN 60 AND 229 OR Dest IN ('ELM') AND (DivAirports[1] = 'MIA' OR DivAirports[2] = 'MIA' OR DivAirports[3] = 'MIA' OR DivAirports[4] = 'MIA' OR DivAirports[5] = 'MIA') ORDER BY Origin, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT FlightNum FROM mytable WHERE DivAirportSeqIDs >= 1419303 LIMIT 6","hsqls":["SELECT FlightNum FROM mytable WHERE (DivAirportSeqIDs[1] >= 1419303 OR DivAirportSeqIDs[2] >= 1419303 OR DivAirportSeqIDs[3] >= 1419303 OR DivAirportSeqIDs[4] >= 1419303 OR DivAirportSeqIDs[5] >= 1419303) LIMIT 10000"]}
 {"sql":"SELECT DivDistance, AVG(ArrDel15) FROM mytable WHERE FlightNum BETWEEN 4778 AND 3142 AND Quarter IN (1) GROUP BY DivDistance  ORDER BY DivDistance LIMIT 18","hsqls":["SELECT DivDistance, AVG(ArrDel15) FROM mytable WHERE FlightNum BETWEEN 4778 AND 3142 AND Quarter IN (1) GROUP BY DivDistance  ORDER BY DivDistance LIMIT 18"]}
-{"sql":"SELECT OriginState, COUNT(\"Month\"), SUM(CRSDepTime), MAX(TaxiIn) FROM mytable WHERE AirTime <= 60 AND Quarter IN (1) GROUP BY OriginState LIMIT 21","hsqls":["SELECT OriginState, COUNT(Month), SUM(CRSDepTime), MAX(TaxiIn) FROM mytable WHERE AirTime <= 60 AND Quarter IN (1) GROUP BY OriginState LIMIT 21"]}
+{"sql":"SELECT OriginState, COUNT(\"Month\"), SUM(CRSDepTime), MAX(TaxiIn) FROM mytable WHERE AirTime <= 60 AND Quarter IN (1) GROUP BY OriginState LIMIT 21","hsqls":["SELECT OriginState, COUNT(`Month`), SUM(CRSDepTime), MAX(TaxiIn) FROM mytable WHERE AirTime <= 60 AND Quarter IN (1) GROUP BY OriginState LIMIT 21"]}
 {"sql":"SELECT COUNT(CRSDepTime), MIN(LongestAddGTime) FROM mytable WHERE FirstDepTime NOT IN (1200, 12) AND WeatherDelay >= 35 OR DivReachedDest > 1 LIMIT 3"}
-{"sql":"SELECT DepTime, DivAirportSeqIDs, AirlineID FROM mytable WHERE TaxiIn BETWEEN 113 AND 65 LIMIT 20","hsqls":["SELECT DepTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, AirlineID FROM mytable WHERE TaxiIn BETWEEN 113 AND 65 LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, DestAirportSeqID, DivWheelsOffs FROM mytable WHERE UniqueCarrier NOT IN ('F9', 'MQ', 'VX') ORDER BY DivReachedDest, DivActualElapsedTime","hsqls":["SELECT DivReachedDest, DestAirportSeqID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE UniqueCarrier NOT IN ('F9', 'MQ', 'VX') ORDER BY DivReachedDest, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivAirportSeqIDs, AirlineID FROM mytable WHERE TaxiIn BETWEEN 113 AND 65 LIMIT 20","hsqls":["SELECT DepTime, DivAirportSeqIDs, AirlineID FROM mytable WHERE TaxiIn BETWEEN 113 AND 65 LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DestAirportSeqID, DivWheelsOffs FROM mytable WHERE UniqueCarrier NOT IN ('F9', 'MQ', 'VX') ORDER BY DivReachedDest, DivActualElapsedTime","hsqls":["SELECT DivReachedDest, DestAirportSeqID, DivWheelsOffs FROM mytable WHERE UniqueCarrier NOT IN ('F9', 'MQ', 'VX') ORDER BY DivReachedDest, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT MAX(DestAirportSeqID), MIN(DivReachedDest), SUM(Quarter) FROM mytable WHERE FlightNum NOT IN (5065, 2539, 3182, 3605) LIMIT 26"}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE FlightDate NOT IN ('2014-01-06', '2014-01-20', '2014-01-18', '2014-01-25') LIMIT 12"}
 {"sql":"SELECT \"Year\", Quarter, DayOfWeek FROM mytable ORDER BY Carrier, LongestAddGTime, FlightDate LIMIT 25","hsqls":["SELECT Year, Quarter, DayOfWeek FROM mytable ORDER BY Carrier, LongestAddGTime, FlightDate LIMIT 25"]}
-{"sql":"SELECT AirlineID FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestAirportSeqID BETWEEN 1029904 AND 1219702 OR DivTotalGTimes BETWEEN 63 AND 90 LIMIT 24","hsqls":["SELECT AirlineID FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestAirportSeqID BETWEEN 1029904 AND 1219702 OR (DivTotalGTimes__MV0 BETWEEN 63 AND 90 OR DivTotalGTimes__MV1 BETWEEN 63 AND 90 OR DivTotalGTimes__MV2 BETWEEN 63 AND 90 OR DivTotalGTimes__MV3 BETWEEN 63 AND 90 OR DivTotalGTimes__MV4 BETWEEN 63 AND 90) LIMIT 10000"]}
+{"sql":"SELECT AirlineID FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestAirportSeqID BETWEEN 1029904 AND 1219702 OR DivTotalGTimes BETWEEN 63 AND 90 LIMIT 24","hsqls":["SELECT AirlineID FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestAirportSeqID BETWEEN 1029904 AND 1219702 OR (DivTotalGTimes[1] BETWEEN 63 AND 90 OR DivTotalGTimes[2] BETWEEN 63 AND 90 OR DivTotalGTimes[3] BETWEEN 63 AND 90 OR DivTotalGTimes[4] BETWEEN 63 AND 90 OR DivTotalGTimes[5] BETWEEN 63 AND 90) LIMIT 10000"]}
 {"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20437 OR CRSElapsedTime IN (150, 328, 273) OR CancellationCode NOT IN ('C') GROUP BY Quarter  ORDER BY Quarter LIMIT 3","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20437 OR CRSElapsedTime IN (150, 328, 273) OR CancellationCode NOT IN ('C') GROUP BY Quarter  ORDER BY Quarter LIMIT 3"]}
-{"sql":"SELECT SUM(CRSArrTime), SUM(OriginAirportSeqID), MIN(LongestAddGTime) FROM mytable WHERE DivAirportSeqIDs >= 1099402 OR AirTime IN (152, 239, 240, 264) LIMIT 20","hsqls":["SELECT SUM(CRSArrTime), SUM(OriginAirportSeqID), MIN(LongestAddGTime)  FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1099402 OR DivAirportSeqIDs__MV1 >= 1099402 OR DivAirportSeqIDs__MV2 >= 1099402 OR DivAirportSeqIDs__MV3 >= 1099402 OR DivAirportSeqIDs__MV4 >= 1099402) OR AirTime IN (152, 239, 240, 264) LIMIT 10000"]}
+{"sql":"SELECT SUM(CRSArrTime), SUM(OriginAirportSeqID), MIN(LongestAddGTime) FROM mytable WHERE DivAirportSeqIDs >= 1099402 OR AirTime IN (152, 239, 240, 264) LIMIT 20","hsqls":["SELECT SUM(CRSArrTime), SUM(OriginAirportSeqID), MIN(LongestAddGTime)  FROM mytable WHERE (DivAirportSeqIDs[1] >= 1099402 OR DivAirportSeqIDs[2] >= 1099402 OR DivAirportSeqIDs[3] >= 1099402 OR DivAirportSeqIDs[4] >= 1099402 OR DivAirportSeqIDs[5] >= 1099402) OR AirTime IN (152, 239, 240, 264) LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DepDelay FROM mytable LIMIT 23"}
-{"sql":"SELECT FlightNum, DestCityName, DivAirportLandings, SUM(WheelsOff), MIN(DestCityMarketID) FROM mytable WHERE DivWheelsOffs BETWEEN 1706 AND 1559 AND Dest BETWEEN 'MSY' AND 'MOT' OR DayOfWeek BETWEEN 3 AND 5 GROUP BY FlightNum, DestCityName, DivAirportLandings LIMIT 29","hsqls":["SELECT FlightNum, DestCityName, DivAirportLandings, SUM(WheelsOff), MIN(DestCityMarketID) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1706 AND 1559 OR DivWheelsOffs__MV1 BETWEEN 1706 AND 1559 OR DivWheelsOffs__MV2 BETWEEN 1706 AND 1559 OR DivWheelsOffs__MV3 BETWEEN 1706 AND 1559 OR DivWheelsOffs__MV4 BETWEEN 1706 AND 1559) AND Dest BETWEEN 'MSY' AND 'MOT' OR DayOfWeek BETWEEN 3 AND 5 GROUP BY FlightNum, DestCityName, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DestCityName, DivAirportLandings, SUM(WheelsOff), MIN(DestCityMarketID) FROM mytable WHERE DivWheelsOffs BETWEEN 1706 AND 1559 AND Dest BETWEEN 'MSY' AND 'MOT' OR DayOfWeek BETWEEN 3 AND 5 GROUP BY FlightNum, DestCityName, DivAirportLandings LIMIT 29","hsqls":["SELECT FlightNum, DestCityName, DivAirportLandings, SUM(WheelsOff), MIN(DestCityMarketID) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1706 AND 1559 OR DivWheelsOffs[2] BETWEEN 1706 AND 1559 OR DivWheelsOffs[3] BETWEEN 1706 AND 1559 OR DivWheelsOffs[4] BETWEEN 1706 AND 1559 OR DivWheelsOffs[5] BETWEEN 1706 AND 1559) AND Dest BETWEEN 'MSY' AND 'MOT' OR DayOfWeek BETWEEN 3 AND 5 GROUP BY FlightNum, DestCityName, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE ActualElapsedTime IN (390, 314, 361, 246) OR CarrierDelay BETWEEN 288 AND 153 OR WheelsOff = 1746 ORDER BY DaysSinceEpoch LIMIT 24"}
 {"sql":"SELECT Distance, DepDel15, ArrDel15, COUNT(*) FROM mytable GROUP BY Distance, DepDel15, ArrDel15  ORDER BY Distance, DepDel15, ArrDel15 LIMIT 11","hsqls":["SELECT Distance, DepDel15, ArrDel15, COUNT(*) FROM mytable GROUP BY Distance, DepDel15, ArrDel15  ORDER BY Distance, DepDel15, ArrDel15 LIMIT 11"]}
 {"sql":"SELECT ActualElapsedTime, DayOfWeek FROM mytable ORDER BY FirstDepTime, OriginCityMarketID, TailNum LIMIT 6"}
@@ -5327,12 +5327,12 @@
 {"sql":"SELECT WeatherDelay, SUM(ArrDel15) FROM mytable WHERE OriginAirportID NOT IN (10333, 12441, 11481, 12156, 13795) AND ArrTime BETWEEN 2058 AND 803 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 2","hsqls":["SELECT WeatherDelay, SUM(ArrDel15) FROM mytable WHERE OriginAirportID NOT IN (10333, 12441, 11481, 12156, 13795) AND ArrTime BETWEEN 2058 AND 803 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 2"]}
 {"sql":"SELECT OriginStateFips, FlightNum, AirTime, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (12.0, 184.0, 364.0, 106.0, 156.0) GROUP BY OriginStateFips, FlightNum, AirTime","hsqls":["SELECT OriginStateFips, FlightNum, AirTime, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (12.0, 184.0, 364.0, 106.0, 156.0) GROUP BY OriginStateFips, FlightNum, AirTime"]}
 {"sql":"SELECT TaxiIn, DaysSinceEpoch, OriginStateName FROM mytable ORDER BY DestState, ArrTime LIMIT 6"}
-{"sql":"SELECT DivAirportSeqIDs, DivArrDelay FROM mytable WHERE ActualElapsedTime BETWEEN 156 AND 102 AND DivArrDelay BETWEEN 198 AND 426 OR TaxiOut IN (8, 61, 29, 12) LIMIT 23","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivArrDelay FROM mytable WHERE ActualElapsedTime BETWEEN 156 AND 102 AND DivArrDelay BETWEEN 198 AND 426 OR TaxiOut IN (8, 61, 29, 12) LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivArrDelay FROM mytable WHERE ActualElapsedTime BETWEEN 156 AND 102 AND DivArrDelay BETWEEN 198 AND 426 OR TaxiOut IN (8, 61, 29, 12) LIMIT 23","hsqls":["SELECT DivAirportSeqIDs, DivArrDelay FROM mytable WHERE ActualElapsedTime BETWEEN 156 AND 102 AND DivArrDelay BETWEEN 198 AND 426 OR TaxiOut IN (8, 61, 29, 12) LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, TailNum, MIN(OriginStateFips), MAX(SecurityDelay), AVG(FirstDepTime) FROM mytable GROUP BY CRSArrTime, TailNum  ORDER BY CRSArrTime, TailNum LIMIT 26","hsqls":["SELECT CRSArrTime, TailNum, MIN(OriginStateFips), MAX(SecurityDelay), AVG(FirstDepTime) FROM mytable GROUP BY CRSArrTime, TailNum  ORDER BY CRSArrTime, TailNum LIMIT 26"]}
-{"sql":"SELECT ArrDelay, DayofMonth, MAX(Diverted) FROM mytable WHERE TotalAddGTime NOT IN (11) OR OriginState BETWEEN 'GA' AND 'ND' AND DivWheelsOffs < 2346 GROUP BY ArrDelay, DayofMonth LIMIT 20","hsqls":["SELECT ArrDelay, DayofMonth, MAX(Diverted) FROM mytable WHERE TotalAddGTime NOT IN (11) OR OriginState BETWEEN 'GA' AND 'ND' AND (DivWheelsOffs__MV0 < 2346 OR DivWheelsOffs__MV1 < 2346 OR DivWheelsOffs__MV2 < 2346 OR DivWheelsOffs__MV3 < 2346 OR DivWheelsOffs__MV4 < 2346) GROUP BY ArrDelay, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, DayofMonth, MAX(Diverted) FROM mytable WHERE TotalAddGTime NOT IN (11) OR OriginState BETWEEN 'GA' AND 'ND' AND DivWheelsOffs < 2346 GROUP BY ArrDelay, DayofMonth LIMIT 20","hsqls":["SELECT ArrDelay, DayofMonth, MAX(Diverted) FROM mytable WHERE TotalAddGTime NOT IN (11) OR OriginState BETWEEN 'GA' AND 'ND' AND (DivWheelsOffs[1] < 2346 OR DivWheelsOffs[2] < 2346 OR DivWheelsOffs[3] < 2346 OR DivWheelsOffs[4] < 2346 OR DivWheelsOffs[5] < 2346) GROUP BY ArrDelay, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, COUNT(NASDelay) FROM mytable WHERE Origin >= 'ILM' OR OriginWac BETWEEN 38 AND 61 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT DepTimeBlk, COUNT(NASDelay) FROM mytable WHERE Origin >= 'ILM' OR OriginWac BETWEEN 38 AND 61 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 10"]}
-{"sql":"SELECT DepartureDelayGroups, DepTime, \"Month\" FROM mytable WHERE OriginAirportSeqID <> 1154003 AND DivAirportIDs < 14783 AND FlightNum >= 511 ORDER BY Quarter, Flights, DestCityMarketID LIMIT 15","hsqls":["SELECT DepartureDelayGroups, DepTime, Month FROM mytable WHERE OriginAirportSeqID <> 1154003 AND (DivAirportIDs__MV0 < 14783 OR DivAirportIDs__MV1 < 14783 OR DivAirportIDs__MV2 < 14783 OR DivAirportIDs__MV3 < 14783 OR DivAirportIDs__MV4 < 14783) AND FlightNum >= 511 ORDER BY Quarter, Flights, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, DivAirports, DivArrDelay FROM mytable ORDER BY DepDelayMinutes LIMIT 2","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DivArrDelay FROM mytable ORDER BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DepTime, \"Month\" FROM mytable WHERE OriginAirportSeqID <> 1154003 AND DivAirportIDs < 14783 AND FlightNum >= 511 ORDER BY Quarter, Flights, DestCityMarketID LIMIT 15","hsqls":["SELECT DepartureDelayGroups, DepTime, `Month` FROM mytable WHERE OriginAirportSeqID <> 1154003 AND (DivAirportIDs[1] < 14783 OR DivAirportIDs[2] < 14783 OR DivAirportIDs[3] < 14783 OR DivAirportIDs[4] < 14783 OR DivAirportIDs[5] < 14783) AND FlightNum >= 511 ORDER BY Quarter, Flights, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivAirports, DivArrDelay FROM mytable ORDER BY DepDelayMinutes LIMIT 2","hsqls":["SELECT DivWheelsOns, DivAirports, DivArrDelay FROM mytable ORDER BY DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 29"}
 {"sql":"SELECT AirTime, DayOfWeek FROM mytable WHERE DaysSinceEpoch <> 16076 AND DivDistance NOT IN (55) ORDER BY FirstDepTime, ArrDelay LIMIT 27"}
 {"sql":"SELECT DepDelay, CarrierDelay, SecurityDelay, AVG(DepDelay), AVG(OriginAirportID) FROM mytable GROUP BY DepDelay, CarrierDelay, SecurityDelay  ORDER BY DepDelay, CarrierDelay, SecurityDelay LIMIT 1","hsqls":["SELECT DepDelay, CarrierDelay, SecurityDelay, AVG(DepDelay), AVG(OriginAirportID) FROM mytable GROUP BY DepDelay, CarrierDelay, SecurityDelay  ORDER BY DepDelay, CarrierDelay, SecurityDelay LIMIT 1"]}
@@ -5343,26 +5343,26 @@
 {"sql":"SELECT AVG(LongestAddGTime) FROM mytable WHERE DestWac > 93 OR Diverted NOT IN (1, 0) LIMIT 29"}
 {"sql":"SELECT MAX(Flights), COUNT(DestAirportID) FROM mytable WHERE Diverted <> 0 OR DepTimeBlk NOT IN ('2300-2359', '0001-0559') OR DivAirportLandings IN (2, 1, 0, 9) LIMIT 11"}
 {"sql":"SELECT WheelsOff FROM mytable WHERE LateAircraftDelay IN (138, 111) OR AirTime <> 131 AND DepDel15 IN (1, 0, -9999) ORDER BY FirstDepTime, TaxiIn LIMIT 4"}
-{"sql":"SELECT Flights, SecurityDelay, Cancelled, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 12339 AND 12280 OR DistanceGroup <> 5 OR DivWheelsOffs IN (1614, 2247, 2316, 2125) GROUP BY Flights, SecurityDelay, Cancelled LIMIT 17","hsqls":["SELECT Flights, SecurityDelay, Cancelled, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 12339 AND 12280 OR DistanceGroup <> 5 OR (DivWheelsOffs__MV0 IN (1614, 2247, 2316, 2125) OR DivWheelsOffs__MV1 IN (1614, 2247, 2316, 2125) OR DivWheelsOffs__MV2 IN (1614, 2247, 2316, 2125) OR DivWheelsOffs__MV3 IN (1614, 2247, 2316, 2125) OR DivWheelsOffs__MV4 IN (1614, 2247, 2316, 2125)) GROUP BY Flights, SecurityDelay, Cancelled LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime, DivAirportSeqIDs, Origin FROM mytable WHERE DepDel15 < -9999 AND CRSArrTime BETWEEN 753 AND 2108 AND Quarter > 1 LIMIT 5","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Origin FROM mytable WHERE DepDel15 < -9999 AND CRSArrTime BETWEEN 753 AND 2108 AND Quarter > 1 LIMIT 10000"]}
+{"sql":"SELECT Flights, SecurityDelay, Cancelled, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 12339 AND 12280 OR DistanceGroup <> 5 OR DivWheelsOffs IN (1614, 2247, 2316, 2125) GROUP BY Flights, SecurityDelay, Cancelled LIMIT 17","hsqls":["SELECT Flights, SecurityDelay, Cancelled, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 12339 AND 12280 OR DistanceGroup <> 5 OR (DivWheelsOffs[1] IN (1614, 2247, 2316, 2125) OR DivWheelsOffs[2] IN (1614, 2247, 2316, 2125) OR DivWheelsOffs[3] IN (1614, 2247, 2316, 2125) OR DivWheelsOffs[4] IN (1614, 2247, 2316, 2125) OR DivWheelsOffs[5] IN (1614, 2247, 2316, 2125)) GROUP BY Flights, SecurityDelay, Cancelled LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivAirportSeqIDs, Origin FROM mytable WHERE DepDel15 < -9999 AND CRSArrTime BETWEEN 753 AND 2108 AND Quarter > 1 LIMIT 5","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs, Origin FROM mytable WHERE DepDel15 < -9999 AND CRSArrTime BETWEEN 753 AND 2108 AND Quarter > 1 LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, OriginAirportID, SUM(NASDelay), MAX(DepDel15) FROM mytable WHERE NASDelay = 61 GROUP BY ArrDel15, OriginAirportID  ORDER BY ArrDel15, OriginAirportID LIMIT 23","hsqls":["SELECT ArrDel15, OriginAirportID, SUM(NASDelay), MAX(DepDel15) FROM mytable WHERE NASDelay = 61 GROUP BY ArrDel15, OriginAirportID  ORDER BY ArrDel15, OriginAirportID LIMIT 23"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE CarrierDelay BETWEEN 23 AND 43 AND DivReachedDest BETWEEN -9999 AND 0 LIMIT 17"}
 {"sql":"SELECT DestState, COUNT(ArrivalDelayGroups) FROM mytable WHERE Dest BETWEEN 'RIC' AND 'CLT' OR OriginStateName <= 'Alaska' OR Dest BETWEEN 'BFL' AND 'MMH' GROUP BY DestState  ORDER BY DestState LIMIT 13","hsqls":["SELECT DestState, COUNT(ArrivalDelayGroups) FROM mytable WHERE Dest BETWEEN 'RIC' AND 'CLT' OR OriginStateName <= 'Alaska' OR Dest BETWEEN 'BFL' AND 'MMH' GROUP BY DestState  ORDER BY DestState LIMIT 13"]}
 {"sql":"SELECT DepartureDelayGroups, AirlineID, OriginStateName FROM mytable WHERE Quarter BETWEEN 1 AND 1 ORDER BY DivReachedDest, DestStateName, AirTime LIMIT 16"}
-{"sql":"SELECT TailNum, DivTotalGTimes FROM mytable WHERE SecurityDelay <= 8 OR ArrTimeBlk BETWEEN '2100-2159' AND '2300-2359' AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY LongestAddGTime, OriginCityMarketID LIMIT 29","hsqls":["SELECT TailNum, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE SecurityDelay <= 8 OR ArrTimeBlk BETWEEN '2100-2159' AND '2300-2359' AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY LongestAddGTime, OriginCityMarketID LIMIT 10000"]}
-{"sql":"SELECT Cancelled, ArrDel15, TailNum, MIN(DivActualElapsedTime), COUNT(TailNum), COUNT(DestCityMarketID) FROM mytable WHERE DivArrDelay < 163 AND Cancelled BETWEEN 1 AND 1 OR \"Month\" NOT IN (1) GROUP BY Cancelled, ArrDel15, TailNum","hsqls":["SELECT Cancelled, ArrDel15, TailNum, MIN(DivActualElapsedTime), COUNT(TailNum), COUNT(DestCityMarketID) FROM mytable WHERE DivArrDelay < 163 AND Cancelled BETWEEN 1 AND 1 OR Month NOT IN (1) GROUP BY Cancelled, ArrDel15, TailNum"]}
+{"sql":"SELECT TailNum, DivTotalGTimes FROM mytable WHERE SecurityDelay <= 8 OR ArrTimeBlk BETWEEN '2100-2159' AND '2300-2359' AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY LongestAddGTime, OriginCityMarketID LIMIT 29","hsqls":["SELECT TailNum, DivTotalGTimes FROM mytable WHERE SecurityDelay <= 8 OR ArrTimeBlk BETWEEN '2100-2159' AND '2300-2359' AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY LongestAddGTime, OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT Cancelled, ArrDel15, TailNum, MIN(DivActualElapsedTime), COUNT(TailNum), COUNT(DestCityMarketID) FROM mytable WHERE DivArrDelay < 163 AND Cancelled BETWEEN 1 AND 1 OR \"Month\" NOT IN (1) GROUP BY Cancelled, ArrDel15, TailNum","hsqls":["SELECT Cancelled, ArrDel15, TailNum, MIN(DivActualElapsedTime), COUNT(TailNum), COUNT(DestCityMarketID) FROM mytable WHERE DivArrDelay < 163 AND Cancelled BETWEEN 1 AND 1 OR `Month` NOT IN (1) GROUP BY Cancelled, ArrDel15, TailNum"]}
 {"sql":"SELECT FlightDate, OriginCityName, CRSElapsedTime FROM mytable ORDER BY DepDelayMinutes, DivArrDelay LIMIT 1"}
 {"sql":"SELECT Distance, TotalAddGTime, DepDel15 FROM mytable WHERE AirTime BETWEEN 187 AND 33 ORDER BY TotalAddGTime, DestAirportSeqID LIMIT 8"}
 {"sql":"SELECT COUNT(OriginState) FROM mytable WHERE LongestAddGTime BETWEEN 39 AND 28 OR DepTime >= 724 OR DepartureDelayGroups NOT IN (3, 1, 5, 8, 12) LIMIT 13"}
 {"sql":"SELECT COUNT(DepDel15), COUNT(DepDelay), SUM(DepartureDelayGroups) FROM mytable LIMIT 13"}
-{"sql":"SELECT DivReachedDest, AirlineID, DayOfWeek, COUNT(TaxiOut), AVG(ArrivalDelayGroups), MAX(ActualElapsedTime) FROM mytable WHERE DivAirports IN ('STL', 'MSN', 'EWR', 'ILM') OR DepDel15 BETWEEN 1 AND 1 OR OriginAirportID IN (13158, 12448, 11648, 14689, 11884) GROUP BY DivReachedDest, AirlineID, DayOfWeek LIMIT 8","hsqls":["SELECT DivReachedDest, AirlineID, DayOfWeek, COUNT(TaxiOut), AVG(ArrivalDelayGroups), MAX(ActualElapsedTime) FROM mytable WHERE (DivAirports__MV0 IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports__MV1 IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports__MV2 IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports__MV3 IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports__MV4 IN ('STL', 'MSN', 'EWR', 'ILM')) OR DepDel15 BETWEEN 1 AND 1 OR OriginAirportID IN (13158, 12448, 11648, 14689, 11884) GROUP BY DivReachedDest, AirlineID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, AirlineID, DayOfWeek, COUNT(TaxiOut), AVG(ArrivalDelayGroups), MAX(ActualElapsedTime) FROM mytable WHERE DivAirports IN ('STL', 'MSN', 'EWR', 'ILM') OR DepDel15 BETWEEN 1 AND 1 OR OriginAirportID IN (13158, 12448, 11648, 14689, 11884) GROUP BY DivReachedDest, AirlineID, DayOfWeek LIMIT 8","hsqls":["SELECT DivReachedDest, AirlineID, DayOfWeek, COUNT(TaxiOut), AVG(ArrivalDelayGroups), MAX(ActualElapsedTime) FROM mytable WHERE (DivAirports[1] IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports[2] IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports[3] IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports[4] IN ('STL', 'MSN', 'EWR', 'ILM') OR DivAirports[5] IN ('STL', 'MSN', 'EWR', 'ILM')) OR DepDel15 BETWEEN 1 AND 1 OR OriginAirportID IN (13158, 12448, 11648, 14689, 11884) GROUP BY DivReachedDest, AirlineID, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DepTime, SUM(AirlineID), COUNT(WeatherDelay) FROM mytable WHERE DestState IN ('MT', 'IL', 'WI', 'KS', 'HI') GROUP BY DepTime  ORDER BY DepTime LIMIT 21","hsqls":["SELECT DepTime, SUM(AirlineID), COUNT(WeatherDelay) FROM mytable WHERE DestState IN ('MT', 'IL', 'WI', 'KS', 'HI') GROUP BY DepTime  ORDER BY DepTime LIMIT 21"]}
-{"sql":"SELECT ActualElapsedTime, DivWheelsOffs FROM mytable WHERE OriginCityName < 'Hayden, CO' LIMIT 10","hsqls":["SELECT ActualElapsedTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE OriginCityName < 'Hayden, CO' LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DivWheelsOffs FROM mytable WHERE OriginCityName < 'Hayden, CO' LIMIT 10","hsqls":["SELECT ActualElapsedTime, DivWheelsOffs FROM mytable WHERE OriginCityName < 'Hayden, CO' LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, SUM(WheelsOn), AVG(SecurityDelay), COUNT(CarrierDelay) FROM mytable WHERE Distance BETWEEN 1749 AND 349 AND SecurityDelay IN (1, 0, 14, 27) GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 2","hsqls":["SELECT WeatherDelay, SUM(WheelsOn), AVG(SecurityDelay), COUNT(CarrierDelay) FROM mytable WHERE Distance BETWEEN 1749 AND 349 AND SecurityDelay IN (1, 0, 14, 27) GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 2"]}
 {"sql":"SELECT SUM(DepDelayMinutes), AVG(DivActualElapsedTime) FROM mytable WHERE CarrierDelay >= 49 AND Carrier BETWEEN 'OO' AND 'EV' OR DepDel15 >= -9999 LIMIT 24"}
-{"sql":"SELECT DestState, WheelsOn FROM mytable WHERE DepDel15 IN (0, -9999) OR DivWheelsOns <= 2213 OR DivTotalGTimes >= 40 ORDER BY DivDistance LIMIT 24","hsqls":["SELECT DestState, WheelsOn FROM mytable WHERE DepDel15 IN (0, -9999) OR (DivWheelsOns__MV0 <= 2213 OR DivWheelsOns__MV1 <= 2213 OR DivWheelsOns__MV2 <= 2213 OR DivWheelsOns__MV3 <= 2213 OR DivWheelsOns__MV4 <= 2213) OR (DivTotalGTimes__MV0 >= 40 OR DivTotalGTimes__MV1 >= 40 OR DivTotalGTimes__MV2 >= 40 OR DivTotalGTimes__MV3 >= 40 OR DivTotalGTimes__MV4 >= 40) ORDER BY DivDistance LIMIT 10000"]}
-{"sql":"SELECT DepTimeBlk, COUNT(DayOfWeek), MAX(OriginAirportID) FROM mytable WHERE DivTailNums >= 'N507JB' AND DestAirportID BETWEEN 11203 AND 10551 OR UniqueCarrier < 'AS' GROUP BY DepTimeBlk LIMIT 19","hsqls":["SELECT DepTimeBlk, COUNT(DayOfWeek), MAX(OriginAirportID) FROM mytable WHERE (DivTailNums__MV0 >= 'N507JB' OR DivTailNums__MV1 >= 'N507JB' OR DivTailNums__MV2 >= 'N507JB' OR DivTailNums__MV3 >= 'N507JB' OR DivTailNums__MV4 >= 'N507JB') AND DestAirportID BETWEEN 11203 AND 10551 OR UniqueCarrier < 'AS' GROUP BY DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiIn IN (31, 55) AND DivLongestGTimes > 2.0 LIMIT 2","hsqls":["SELECT COUNT(*) FROM mytable WHERE TaxiIn IN (31, 55) AND (DivLongestGTimes__MV0 > 2.0 OR DivLongestGTimes__MV1 > 2.0 OR DivLongestGTimes__MV2 > 2.0 OR DivLongestGTimes__MV3 > 2.0 OR DivLongestGTimes__MV4 > 2.0) LIMIT 10000"]}
+{"sql":"SELECT DestState, WheelsOn FROM mytable WHERE DepDel15 IN (0, -9999) OR DivWheelsOns <= 2213 OR DivTotalGTimes >= 40 ORDER BY DivDistance LIMIT 24","hsqls":["SELECT DestState, WheelsOn FROM mytable WHERE DepDel15 IN (0, -9999) OR (DivWheelsOns[1] <= 2213 OR DivWheelsOns[2] <= 2213 OR DivWheelsOns[3] <= 2213 OR DivWheelsOns[4] <= 2213 OR DivWheelsOns[5] <= 2213) OR (DivTotalGTimes[1] >= 40 OR DivTotalGTimes[2] >= 40 OR DivTotalGTimes[3] >= 40 OR DivTotalGTimes[4] >= 40 OR DivTotalGTimes[5] >= 40) ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, COUNT(DayOfWeek), MAX(OriginAirportID) FROM mytable WHERE DivTailNums >= 'N507JB' AND DestAirportID BETWEEN 11203 AND 10551 OR UniqueCarrier < 'AS' GROUP BY DepTimeBlk LIMIT 19","hsqls":["SELECT DepTimeBlk, COUNT(DayOfWeek), MAX(OriginAirportID) FROM mytable WHERE (DivTailNums[1] >= 'N507JB' OR DivTailNums[2] >= 'N507JB' OR DivTailNums[3] >= 'N507JB' OR DivTailNums[4] >= 'N507JB' OR DivTailNums[5] >= 'N507JB') AND DestAirportID BETWEEN 11203 AND 10551 OR UniqueCarrier < 'AS' GROUP BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiIn IN (31, 55) AND DivLongestGTimes > 2.0 LIMIT 2","hsqls":["SELECT COUNT(*) FROM mytable WHERE TaxiIn IN (31, 55) AND (DivLongestGTimes[1] > 2.0 OR DivLongestGTimes[2] > 2.0 OR DivLongestGTimes[3] > 2.0 OR DivLongestGTimes[4] > 2.0 OR DivLongestGTimes[5] > 2.0) LIMIT 10000"]}
 {"sql":"SELECT Diverted, UniqueCarrier FROM mytable LIMIT 6"}
 {"sql":"SELECT SUM(ActualElapsedTime), MAX(DayOfWeek) FROM mytable WHERE DepTime BETWEEN 1520 AND 2221 LIMIT 17"}
 {"sql":"SELECT DepTime FROM mytable WHERE TotalAddGTime BETWEEN 31 AND 45 OR OriginState <= 'MS' ORDER BY DepartureDelayGroups LIMIT 4"}
@@ -5370,40 +5370,40 @@
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE WheelsOff <> 555 ORDER BY AirlineID, CancellationCode LIMIT 12"}
 {"sql":"SELECT DepartureDelayGroups, WheelsOff, Origin, COUNT(DepDel15), AVG(LongestAddGTime), SUM(LateAircraftDelay) FROM mytable GROUP BY DepartureDelayGroups, WheelsOff, Origin  ORDER BY DepartureDelayGroups, WheelsOff, Origin LIMIT 3","hsqls":["SELECT DepartureDelayGroups, WheelsOff, Origin, COUNT(DepDel15), AVG(LongestAddGTime), SUM(LateAircraftDelay) FROM mytable GROUP BY DepartureDelayGroups, WheelsOff, Origin  ORDER BY DepartureDelayGroups, WheelsOff, Origin LIMIT 3"]}
 {"sql":"SELECT OriginStateFips, WheelsOn FROM mytable WHERE Cancelled > 1 ORDER BY OriginCityName, Cancelled, DepDel15 LIMIT 20"}
-{"sql":"SELECT MAX(ArrivalDelayGroups), AVG(DepartureDelayGroups) FROM mytable WHERE DivWheelsOns IN (1750, 910, 1624) OR DayofMonth BETWEEN 9 AND 31 LIMIT 11","hsqls":["SELECT MAX(ArrivalDelayGroups), AVG(DepartureDelayGroups)  FROM mytable WHERE (DivWheelsOns__MV0 IN (1750, 910, 1624) OR DivWheelsOns__MV1 IN (1750, 910, 1624) OR DivWheelsOns__MV2 IN (1750, 910, 1624) OR DivWheelsOns__MV3 IN (1750, 910, 1624) OR DivWheelsOns__MV4 IN (1750, 910, 1624)) OR DayofMonth BETWEEN 9 AND 31 LIMIT 10000"]}
+{"sql":"SELECT MAX(ArrivalDelayGroups), AVG(DepartureDelayGroups) FROM mytable WHERE DivWheelsOns IN (1750, 910, 1624) OR DayofMonth BETWEEN 9 AND 31 LIMIT 11","hsqls":["SELECT MAX(ArrivalDelayGroups), AVG(DepartureDelayGroups)  FROM mytable WHERE (DivWheelsOns[1] IN (1750, 910, 1624) OR DivWheelsOns[2] IN (1750, 910, 1624) OR DivWheelsOns[3] IN (1750, 910, 1624) OR DivWheelsOns[4] IN (1750, 910, 1624) OR DivWheelsOns[5] IN (1750, 910, 1624)) OR DayofMonth BETWEEN 9 AND 31 LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DivReachedDest, DistanceGroup FROM mytable WHERE ArrDelayMinutes NOT IN (53.0, 455.0, 67.0, 123.0, 38.0) AND ArrDelayMinutes > 173.0 ORDER BY DestStateName, DayofMonth LIMIT 28"}
 {"sql":"SELECT ArrDel15, MAX(TotalAddGTime), COUNT(DestAirportID) FROM mytable WHERE TailNum BETWEEN 'N11565' AND 'N703SW' GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 20","hsqls":["SELECT ArrDel15, MAX(TotalAddGTime), COUNT(DestAirportID) FROM mytable WHERE TailNum BETWEEN 'N11565' AND 'N703SW' GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 20"]}
 {"sql":"SELECT SecurityDelay, COUNT(WeatherDelay) FROM mytable WHERE Origin BETWEEN 'DCA' AND 'TVC' GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 24","hsqls":["SELECT SecurityDelay, COUNT(WeatherDelay) FROM mytable WHERE Origin BETWEEN 'DCA' AND 'TVC' GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 24"]}
-{"sql":"SELECT DepDelayMinutes, DivWheelsOffs FROM mytable LIMIT 15","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable LIMIT 10000"]}
-{"sql":"SELECT \"Year\" FROM mytable LIMIT 2","hsqls":["SELECT Year FROM mytable LIMIT 2"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE OriginState NOT IN ('LA', 'UT', 'NV') AND FlightDate = '2014-01-31' LIMIT 20","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE OriginState NOT IN ('LA', 'UT', 'NV') AND FlightDate = '2014-01-31' LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivWheelsOffs FROM mytable LIMIT 15","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs FROM mytable LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable LIMIT 2","hsqls":["SELECT `Year` FROM mytable LIMIT 2"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE OriginState NOT IN ('LA', 'UT', 'NV') AND FlightDate = '2014-01-31' LIMIT 20","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE OriginState NOT IN ('LA', 'UT', 'NV') AND FlightDate = '2014-01-31' LIMIT 10000"]}
 {"sql":"SELECT DepDelay, Carrier, Quarter, MAX(DivAirportLandings) FROM mytable WHERE OriginAirportID BETWEEN 11648 AND 14262 AND DepartureDelayGroups NOT IN (8, 11) AND ArrDel15 > 1 GROUP BY DepDelay, Carrier, Quarter  ORDER BY DepDelay, Carrier, Quarter LIMIT 17","hsqls":["SELECT DepDelay, Carrier, Quarter, MAX(DivAirportLandings) FROM mytable WHERE OriginAirportID BETWEEN 11648 AND 14262 AND DepartureDelayGroups NOT IN (8, 11) AND ArrDel15 > 1 GROUP BY DepDelay, Carrier, Quarter  ORDER BY DepDelay, Carrier, Quarter LIMIT 17"]}
-{"sql":"SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE DivTotalGTimes IN (128, 32, 15, 99) GROUP BY DayOfWeek LIMIT 7","hsqls":["SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE (DivTotalGTimes__MV0 IN (128, 32, 15, 99) OR DivTotalGTimes__MV1 IN (128, 32, 15, 99) OR DivTotalGTimes__MV2 IN (128, 32, 15, 99) OR DivTotalGTimes__MV3 IN (128, 32, 15, 99) OR DivTotalGTimes__MV4 IN (128, 32, 15, 99)) GROUP BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE DivTotalGTimes IN (128, 32, 15, 99) GROUP BY DayOfWeek LIMIT 7","hsqls":["SELECT DayOfWeek, MAX(ArrDelayMinutes) FROM mytable WHERE (DivTotalGTimes[1] IN (128, 32, 15, 99) OR DivTotalGTimes[2] IN (128, 32, 15, 99) OR DivTotalGTimes[3] IN (128, 32, 15, 99) OR DivTotalGTimes[4] IN (128, 32, 15, 99) OR DivTotalGTimes[5] IN (128, 32, 15, 99)) GROUP BY DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT MAX(DestAirportID) FROM mytable WHERE Flights NOT IN (1) AND OriginStateName NOT IN ('Utah', 'Kentucky', 'Arkansas', 'Wisconsin', 'Rhode Island') AND DepDel15 NOT IN (1, -9999) LIMIT 10"}
 {"sql":"SELECT DepDelayMinutes, DepTime, DayOfWeek FROM mytable WHERE CancellationCode IN ('B') AND Distance NOT IN (842) AND ArrTime BETWEEN 1445 AND 858 ORDER BY DepDelayMinutes, DestCityName, Dest LIMIT 23"}
-{"sql":"SELECT WeatherDelay, DestAirportSeqID, ArrDel15, AVG(DivDistance), MAX(LongestAddGTime), MAX(OriginStateFips) FROM mytable WHERE DivLongestGTimes BETWEEN 77.0 AND 58.0 OR DestWac IN (44, 22, 61) GROUP BY WeatherDelay, DestAirportSeqID, ArrDel15 LIMIT 9","hsqls":["SELECT WeatherDelay, DestAirportSeqID, ArrDel15, AVG(DivDistance), MAX(LongestAddGTime), MAX(OriginStateFips) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 77.0 AND 58.0 OR DivLongestGTimes__MV1 BETWEEN 77.0 AND 58.0 OR DivLongestGTimes__MV2 BETWEEN 77.0 AND 58.0 OR DivLongestGTimes__MV3 BETWEEN 77.0 AND 58.0 OR DivLongestGTimes__MV4 BETWEEN 77.0 AND 58.0) OR DestWac IN (44, 22, 61) GROUP BY WeatherDelay, DestAirportSeqID, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DestAirportSeqID, ArrDel15, AVG(DivDistance), MAX(LongestAddGTime), MAX(OriginStateFips) FROM mytable WHERE DivLongestGTimes BETWEEN 77.0 AND 58.0 OR DestWac IN (44, 22, 61) GROUP BY WeatherDelay, DestAirportSeqID, ArrDel15 LIMIT 9","hsqls":["SELECT WeatherDelay, DestAirportSeqID, ArrDel15, AVG(DivDistance), MAX(LongestAddGTime), MAX(OriginStateFips) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 77.0 AND 58.0 OR DivLongestGTimes[2] BETWEEN 77.0 AND 58.0 OR DivLongestGTimes[3] BETWEEN 77.0 AND 58.0 OR DivLongestGTimes[4] BETWEEN 77.0 AND 58.0 OR DivLongestGTimes[5] BETWEEN 77.0 AND 58.0) OR DestWac IN (44, 22, 61) GROUP BY WeatherDelay, DestAirportSeqID, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DepDel15, DaysSinceEpoch FROM mytable WHERE DestState = 'KS' ORDER BY Flights, ArrDelayMinutes, CancellationCode LIMIT 1"}
-{"sql":"SELECT FlightNum, ArrDelay, MIN(DestAirportID), AVG(TaxiOut), COUNT(OriginCityName) FROM mytable WHERE DivWheelsOffs IN (137, 1151) GROUP BY FlightNum, ArrDelay LIMIT 21","hsqls":["SELECT FlightNum, ArrDelay, MIN(DestAirportID), AVG(TaxiOut), COUNT(OriginCityName) FROM mytable WHERE (DivWheelsOffs__MV0 IN (137, 1151) OR DivWheelsOffs__MV1 IN (137, 1151) OR DivWheelsOffs__MV2 IN (137, 1151) OR DivWheelsOffs__MV3 IN (137, 1151) OR DivWheelsOffs__MV4 IN (137, 1151)) GROUP BY FlightNum, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT FlightNum, ArrDelay, MIN(DestAirportID), AVG(TaxiOut), COUNT(OriginCityName) FROM mytable WHERE DivWheelsOffs IN (137, 1151) GROUP BY FlightNum, ArrDelay LIMIT 21","hsqls":["SELECT FlightNum, ArrDelay, MIN(DestAirportID), AVG(TaxiOut), COUNT(OriginCityName) FROM mytable WHERE (DivWheelsOffs[1] IN (137, 1151) OR DivWheelsOffs[2] IN (137, 1151) OR DivWheelsOffs[3] IN (137, 1151) OR DivWheelsOffs[4] IN (137, 1151) OR DivWheelsOffs[5] IN (137, 1151)) GROUP BY FlightNum, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE DestState NOT IN ('DE', 'VI', 'AZ', 'FL', 'RI') ORDER BY LongestAddGTime, FlightDate LIMIT 21"}
 {"sql":"SELECT DistanceGroup, ActualElapsedTime, MIN(ArrDelayMinutes) FROM mytable WHERE DestCityName < 'Durango, CO' GROUP BY DistanceGroup, ActualElapsedTime  ORDER BY DistanceGroup, ActualElapsedTime LIMIT 12","hsqls":["SELECT DistanceGroup, ActualElapsedTime, MIN(ArrDelayMinutes) FROM mytable WHERE DestCityName < 'Durango, CO' GROUP BY DistanceGroup, ActualElapsedTime  ORDER BY DistanceGroup, ActualElapsedTime LIMIT 12"]}
-{"sql":"SELECT FlightDate, OriginStateName, AVG(DepDelayMinutes) FROM mytable WHERE FlightNum <> 5261 AND DivTailNums IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') GROUP BY FlightDate, OriginStateName LIMIT 8","hsqls":["SELECT FlightDate, OriginStateName, AVG(CAST(DepDelayMinutes AS DOUBLE)) FROM mytable WHERE FlightNum <> 5261 AND (DivTailNums__MV0 IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums__MV1 IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums__MV2 IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums__MV3 IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums__MV4 IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV')) GROUP BY FlightDate, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivWheelsOns IN (1351, 1553, 936, 1515, 948) OR LongestAddGTime BETWEEN 24 AND 97 AND Diverted <= 0 ORDER BY DestAirportID LIMIT 10","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivWheelsOns__MV0 IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns__MV1 IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns__MV2 IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns__MV3 IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns__MV4 IN (1351, 1553, 936, 1515, 948)) OR LongestAddGTime BETWEEN 24 AND 97 AND Diverted <= 0 ORDER BY DestAirportID LIMIT 10000"]}
-{"sql":"SELECT DivAirports, DivAirportIDs FROM mytable WHERE UniqueCarrier IN ('US') OR OriginCityMarketID NOT IN (31401, 32467, 31695, 31726) AND DestState IN ('IN', 'WI', 'FL') LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE UniqueCarrier IN ('US') OR OriginCityMarketID NOT IN (31401, 32467, 31695, 31726) AND DestState IN ('IN', 'WI', 'FL') LIMIT 10000"]}
-{"sql":"SELECT DestStateName, AirTime, \"Month\", COUNT(DivReachedDest), MAX(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE CRSElapsedTime BETWEEN 314 AND 77 GROUP BY DestStateName, AirTime, \"Month\" LIMIT 10","hsqls":["SELECT DestStateName, AirTime, Month, COUNT(DivReachedDest), MAX(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE CRSElapsedTime BETWEEN 314 AND 77 GROUP BY DestStateName, AirTime, Month LIMIT 10"]}
+{"sql":"SELECT FlightDate, OriginStateName, AVG(DepDelayMinutes) FROM mytable WHERE FlightNum <> 5261 AND DivTailNums IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') GROUP BY FlightDate, OriginStateName LIMIT 8","hsqls":["SELECT FlightDate, OriginStateName, AVG(CAST(DepDelayMinutes AS DOUBLE)) FROM mytable WHERE FlightNum <> 5261 AND (DivTailNums[1] IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums[2] IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums[3] IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums[4] IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV') OR DivTailNums[5] IN ('N961WN', 'N5CNAA', 'N796SK', 'N933EV')) GROUP BY FlightDate, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivWheelsOns IN (1351, 1553, 936, 1515, 948) OR LongestAddGTime BETWEEN 24 AND 97 AND Diverted <= 0 ORDER BY DestAirportID LIMIT 10","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE (DivWheelsOns[1] IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns[2] IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns[3] IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns[4] IN (1351, 1553, 936, 1515, 948) OR DivWheelsOns[5] IN (1351, 1553, 936, 1515, 948)) OR LongestAddGTime BETWEEN 24 AND 97 AND Diverted <= 0 ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DivAirportIDs FROM mytable WHERE UniqueCarrier IN ('US') OR OriginCityMarketID NOT IN (31401, 32467, 31695, 31726) AND DestState IN ('IN', 'WI', 'FL') LIMIT 10","hsqls":["SELECT DivAirports, DivAirportIDs FROM mytable WHERE UniqueCarrier IN ('US') OR OriginCityMarketID NOT IN (31401, 32467, 31695, 31726) AND DestState IN ('IN', 'WI', 'FL') LIMIT 10000"]}
+{"sql":"SELECT DestStateName, AirTime, \"Month\", COUNT(DivReachedDest), MAX(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE CRSElapsedTime BETWEEN 314 AND 77 GROUP BY DestStateName, AirTime, \"Month\" LIMIT 10","hsqls":["SELECT DestStateName, AirTime, Month, COUNT(DivReachedDest), MAX(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE CRSElapsedTime BETWEEN 314 AND 77 GROUP BY DestStateName, AirTime, `Month` LIMIT 10"]}
 {"sql":"SELECT Flights, FlightDate, ArrTimeBlk, MIN(DaysSinceEpoch), MIN(DivArrDelay), MIN(DivAirportLandings) FROM mytable WHERE CRSArrTime > 1259 AND DayOfWeek BETWEEN 7 AND 4 OR DestStateName BETWEEN 'Colorado' AND 'Kentucky' GROUP BY Flights, FlightDate, ArrTimeBlk  ORDER BY Flights, FlightDate, ArrTimeBlk LIMIT 25","hsqls":["SELECT Flights, FlightDate, ArrTimeBlk, MIN(DaysSinceEpoch), MIN(DivArrDelay), MIN(DivAirportLandings) FROM mytable WHERE CRSArrTime > 1259 AND DayOfWeek BETWEEN 7 AND 4 OR DestStateName BETWEEN 'Colorado' AND 'Kentucky' GROUP BY Flights, FlightDate, ArrTimeBlk  ORDER BY Flights, FlightDate, ArrTimeBlk LIMIT 25"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE OriginCityName BETWEEN 'Jacksonville/Camp Lejeune, NC' AND 'St. George, UT' OR ArrivalDelayGroups < -9999 OR TotalAddGTime < 2 ORDER BY TotalAddGTime, DestCityName LIMIT 9","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginCityName BETWEEN 'Jacksonville/Camp Lejeune, NC' AND 'St. George, UT' OR ArrivalDelayGroups < -9999 OR TotalAddGTime < 2 ORDER BY TotalAddGTime, DestCityName LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DivTotalGTimes, OriginAirportID FROM mytable WHERE CRSDepTime IN (638, 1732) OR ArrTimeBlk BETWEEN '2000-2059' AND '2300-2359' OR OriginCityMarketID >= 33360 ORDER BY CancellationCode, DestAirportID, DivArrDelay LIMIT 14","hsqls":["SELECT DepDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, OriginAirportID FROM mytable WHERE CRSDepTime IN (638, 1732) OR ArrTimeBlk BETWEEN '2000-2059' AND '2300-2359' OR OriginCityMarketID >= 33360 ORDER BY CancellationCode, DestAirportID, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE OriginCityName BETWEEN 'Jacksonville/Camp Lejeune, NC' AND 'St. George, UT' OR ArrivalDelayGroups < -9999 OR TotalAddGTime < 2 ORDER BY TotalAddGTime, DestCityName LIMIT 9","hsqls":["SELECT DivAirportIDs FROM mytable WHERE OriginCityName BETWEEN 'Jacksonville/Camp Lejeune, NC' AND 'St. George, UT' OR ArrivalDelayGroups < -9999 OR TotalAddGTime < 2 ORDER BY TotalAddGTime, DestCityName LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivTotalGTimes, OriginAirportID FROM mytable WHERE CRSDepTime IN (638, 1732) OR ArrTimeBlk BETWEEN '2000-2059' AND '2300-2359' OR OriginCityMarketID >= 33360 ORDER BY CancellationCode, DestAirportID, DivArrDelay LIMIT 14","hsqls":["SELECT DepDelay, DivTotalGTimes, OriginAirportID FROM mytable WHERE CRSDepTime IN (638, 1732) OR ArrTimeBlk BETWEEN '2000-2059' AND '2300-2359' OR OriginCityMarketID >= 33360 ORDER BY CancellationCode, DestAirportID, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, MAX(OriginWac) FROM mytable WHERE Origin > 'MFE' AND DivAirportLandings IN (2, 1, 0) GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 15","hsqls":["SELECT ArrTimeBlk, MAX(OriginWac) FROM mytable WHERE Origin > 'MFE' AND DivAirportLandings IN (2, 1, 0) GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 15"]}
 {"sql":"SELECT Diverted, SecurityDelay, Cancelled FROM mytable WHERE CarrierDelay = 72 ORDER BY DestAirportSeqID LIMIT 25"}
 {"sql":"SELECT Diverted, DestStateFips, MAX(TaxiOut), AVG(DepTime) FROM mytable GROUP BY Diverted, DestStateFips  ORDER BY Diverted, DestStateFips LIMIT 3","hsqls":["SELECT Diverted, DestStateFips, MAX(TaxiOut), AVG(DepTime) FROM mytable GROUP BY Diverted, DestStateFips  ORDER BY Diverted, DestStateFips LIMIT 3"]}
 {"sql":"SELECT SUM(ArrivalDelayGroups), SUM(DayOfWeek), SUM(DepDelay) FROM mytable WHERE AirlineID IN (21171) OR TotalAddGTime NOT IN (128, 31, 34, 37) LIMIT 23"}
 {"sql":"SELECT OriginCityName, Cancelled, DestStateName FROM mytable WHERE TaxiOut > 19 AND DestState <> 'SC' ORDER BY DivArrDelay, ArrivalDelayGroups LIMIT 8"}
-{"sql":"SELECT DivAirports, ArrTime, DivWheelsOffs FROM mytable WHERE CarrierDelay <> 91 ORDER BY ArrDelay LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE CarrierDelay <> 91 ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ArrTime, DivWheelsOffs FROM mytable WHERE CarrierDelay <> 91 ORDER BY ArrDelay LIMIT 2","hsqls":["SELECT DivAirports, ArrTime, DivWheelsOffs FROM mytable WHERE CarrierDelay <> 91 ORDER BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable ORDER BY WheelsOn LIMIT 16"}
 {"sql":"SELECT Carrier, ArrTime FROM mytable WHERE DepTime > 1938 OR OriginStateFips IN (2, 33) OR FlightDate BETWEEN '2014-01-25' AND '2014-01-14' ORDER BY Diverted LIMIT 22"}
-{"sql":"SELECT \"Year\", MAX(TotalAddGTime), COUNT(Diverted), AVG(WheelsOff) FROM mytable WHERE DivTailNums BETWEEN 'N12142' AND 'N5ETAA' GROUP BY \"Year\" LIMIT 21","hsqls":["SELECT Year, MAX(TotalAddGTime), COUNT(Diverted), AVG(WheelsOff) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums__MV1 BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums__MV2 BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums__MV3 BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums__MV4 BETWEEN 'N12142' AND 'N5ETAA') GROUP BY Year LIMIT 10000"]}
-{"sql":"SELECT OriginStateName FROM mytable WHERE Cancelled > 0 OR OriginWac NOT IN (31, 4, 15, 63, 81) OR DivWheelsOns IN (1240, 1828) ORDER BY DestAirportSeqID, DayOfWeek LIMIT 2","hsqls":["SELECT OriginStateName FROM mytable WHERE Cancelled > 0 OR OriginWac NOT IN (31, 4, 15, 63, 81) OR (DivWheelsOns__MV0 IN (1240, 1828) OR DivWheelsOns__MV1 IN (1240, 1828) OR DivWheelsOns__MV2 IN (1240, 1828) OR DivWheelsOns__MV3 IN (1240, 1828) OR DivWheelsOns__MV4 IN (1240, 1828)) ORDER BY DestAirportSeqID, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT CRSElapsedTime, ArrivalDelayGroups, COUNT(FlightDate), AVG(AirlineID) FROM mytable WHERE DivAirportIDs BETWEEN 14262 AND 15401 GROUP BY CRSElapsedTime, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT CRSElapsedTime, ArrivalDelayGroups, COUNT(FlightDate), AVG(AirlineID) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14262 AND 15401 OR DivAirportIDs__MV1 BETWEEN 14262 AND 15401 OR DivAirportIDs__MV2 BETWEEN 14262 AND 15401 OR DivAirportIDs__MV3 BETWEEN 14262 AND 15401 OR DivAirportIDs__MV4 BETWEEN 14262 AND 15401) GROUP BY CRSElapsedTime, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT \"Year\", MAX(TotalAddGTime), COUNT(Diverted), AVG(WheelsOff) FROM mytable WHERE DivTailNums BETWEEN 'N12142' AND 'N5ETAA' GROUP BY \"Year\" LIMIT 21","hsqls":["SELECT Year, MAX(TotalAddGTime), COUNT(Diverted), AVG(WheelsOff) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums[2] BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums[3] BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums[4] BETWEEN 'N12142' AND 'N5ETAA' OR DivTailNums[5] BETWEEN 'N12142' AND 'N5ETAA') GROUP BY `Year` LIMIT 10000"]}
+{"sql":"SELECT OriginStateName FROM mytable WHERE Cancelled > 0 OR OriginWac NOT IN (31, 4, 15, 63, 81) OR DivWheelsOns IN (1240, 1828) ORDER BY DestAirportSeqID, DayOfWeek LIMIT 2","hsqls":["SELECT OriginStateName FROM mytable WHERE Cancelled > 0 OR OriginWac NOT IN (31, 4, 15, 63, 81) OR (DivWheelsOns[1] IN (1240, 1828) OR DivWheelsOns[2] IN (1240, 1828) OR DivWheelsOns[3] IN (1240, 1828) OR DivWheelsOns[4] IN (1240, 1828) OR DivWheelsOns[5] IN (1240, 1828)) ORDER BY DestAirportSeqID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT CRSElapsedTime, ArrivalDelayGroups, COUNT(FlightDate), AVG(AirlineID) FROM mytable WHERE DivAirportIDs BETWEEN 14262 AND 15401 GROUP BY CRSElapsedTime, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT CRSElapsedTime, ArrivalDelayGroups, COUNT(FlightDate), AVG(AirlineID) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14262 AND 15401 OR DivAirportIDs[2] BETWEEN 14262 AND 15401 OR DivAirportIDs[3] BETWEEN 14262 AND 15401 OR DivAirportIDs[4] BETWEEN 14262 AND 15401 OR DivAirportIDs[5] BETWEEN 14262 AND 15401) GROUP BY CRSElapsedTime, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DayOfWeek FROM mytable ORDER BY OriginAirportSeqID LIMIT 6"}
 {"sql":"SELECT DestCityName, MIN(CRSElapsedTime) FROM mytable WHERE DistanceGroup IN (6, 4) AND ArrDelayMinutes NOT IN (355.0, 124.0) OR DivReachedDest NOT IN (1, 0, -9999) GROUP BY DestCityName  ORDER BY DestCityName LIMIT 25","hsqls":["SELECT DestCityName, MIN(CRSElapsedTime) FROM mytable WHERE DistanceGroup IN (6, 4) AND ArrDelayMinutes NOT IN (355.0, 124.0) OR DivReachedDest NOT IN (1, 0, -9999) GROUP BY DestCityName  ORDER BY DestCityName LIMIT 25"]}
 {"sql":"SELECT AirTime FROM mytable ORDER BY CRSDepTime, DaysSinceEpoch LIMIT 9"}
@@ -5411,89 +5411,89 @@
 {"sql":"SELECT DivActualElapsedTime, COUNT(DestCityName), MAX(CRSElapsedTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 21","hsqls":["SELECT DivActualElapsedTime, COUNT(DestCityName), MAX(CRSElapsedTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 21"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE TaxiOut NOT IN (57, 62, 24, 38) OR TotalAddGTime < 28 OR WeatherDelay <= 170 ORDER BY WheelsOff, DestCityName LIMIT 20"}
 {"sql":"SELECT DestCityMarketID, COUNT(*) FROM mytable WHERE OriginState BETWEEN 'CA' AND 'CA' AND CRSDepTime NOT IN (812, 818, 2227, 1847) OR TailNum NOT IN ('N187PQ', 'N821AS') GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 28","hsqls":["SELECT DestCityMarketID, COUNT(*) FROM mytable WHERE OriginState BETWEEN 'CA' AND 'CA' AND CRSDepTime NOT IN (812, 818, 2227, 1847) OR TailNum NOT IN ('N187PQ', 'N821AS') GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 28"]}
-{"sql":"SELECT DivReachedDest, DestWac, TailNum FROM mytable WHERE DayofMonth BETWEEN 7 AND 29 OR DivTailNums IN ('N936DN', 'N204WN', 'N307AS') LIMIT 10","hsqls":["SELECT DivReachedDest, DestWac, TailNum FROM mytable WHERE DayofMonth BETWEEN 7 AND 29 OR (DivTailNums__MV0 IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums__MV1 IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums__MV2 IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums__MV3 IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums__MV4 IN ('N936DN', 'N204WN', 'N307AS')) LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DestWac, TailNum FROM mytable WHERE DayofMonth BETWEEN 7 AND 29 OR DivTailNums IN ('N936DN', 'N204WN', 'N307AS') LIMIT 10","hsqls":["SELECT DivReachedDest, DestWac, TailNum FROM mytable WHERE DayofMonth BETWEEN 7 AND 29 OR (DivTailNums[1] IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums[2] IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums[3] IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums[4] IN ('N936DN', 'N204WN', 'N307AS') OR DivTailNums[5] IN ('N936DN', 'N204WN', 'N307AS')) LIMIT 10000"]}
 {"sql":"SELECT MIN(DestAirportID), MIN(TaxiIn), COUNT(DivAirportLandings) FROM mytable LIMIT 19"}
-{"sql":"SELECT OriginAirportSeqID, DivWheelsOffs FROM mytable WHERE TaxiIn <> 42 AND Distance IN (1623) OR OriginAirportID > 14524 LIMIT 15","hsqls":["SELECT OriginAirportSeqID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiIn <> 42 AND Distance IN (1623) OR OriginAirportID > 14524 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivWheelsOffs FROM mytable WHERE TaxiIn <> 42 AND Distance IN (1623) OR OriginAirportID > 14524 LIMIT 15","hsqls":["SELECT OriginAirportSeqID, DivWheelsOffs FROM mytable WHERE TaxiIn <> 42 AND Distance IN (1623) OR OriginAirportID > 14524 LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, DestCityName, DivAirportLandings FROM mytable WHERE DestCityMarketID NOT IN (34520) AND TailNum BETWEEN 'N612MQ' AND 'N7713A' OR WheelsOff < 1814 LIMIT 18"}
 {"sql":"SELECT DestStateFips, TailNum FROM mytable ORDER BY LateAircraftDelay, DestAirportSeqID, ArrDelay LIMIT 25"}
-{"sql":"SELECT Carrier, Cancelled FROM mytable WHERE DivTailNums <= 'N486WN' ORDER BY TaxiOut LIMIT 19","hsqls":["SELECT Carrier, Cancelled FROM mytable WHERE (DivTailNums__MV0 <= 'N486WN' OR DivTailNums__MV1 <= 'N486WN' OR DivTailNums__MV2 <= 'N486WN' OR DivTailNums__MV3 <= 'N486WN' OR DivTailNums__MV4 <= 'N486WN') ORDER BY TaxiOut LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, CRSArrTime, DivWheelsOffs FROM mytable LIMIT 2","hsqls":["SELECT LateAircraftDelay, CRSArrTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT Carrier, Cancelled FROM mytable WHERE DivTailNums <= 'N486WN' ORDER BY TaxiOut LIMIT 19","hsqls":["SELECT Carrier, Cancelled FROM mytable WHERE (DivTailNums[1] <= 'N486WN' OR DivTailNums[2] <= 'N486WN' OR DivTailNums[3] <= 'N486WN' OR DivTailNums[4] <= 'N486WN' OR DivTailNums[5] <= 'N486WN') ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, CRSArrTime, DivWheelsOffs FROM mytable LIMIT 2","hsqls":["SELECT LateAircraftDelay, CRSArrTime, DivWheelsOffs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(OriginCityMarketID), SUM(ArrTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-04' AND '2014-01-26' AND OriginState NOT IN ('MT', 'MO', 'NV', 'VA') AND ArrDel15 < 1 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 22","hsqls":["SELECT DaysSinceEpoch, COUNT(OriginCityMarketID), SUM(ArrTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-04' AND '2014-01-26' AND OriginState NOT IN ('MT', 'MO', 'NV', 'VA') AND ArrDel15 < 1 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 22"]}
 {"sql":"SELECT FlightNum, DestAirportSeqID, COUNT(*) FROM mytable WHERE DestAirportSeqID >= 1129202 GROUP BY FlightNum, DestAirportSeqID  ORDER BY FlightNum, DestAirportSeqID LIMIT 5","hsqls":["SELECT FlightNum, DestAirportSeqID, COUNT(*) FROM mytable WHERE DestAirportSeqID >= 1129202 GROUP BY FlightNum, DestAirportSeqID  ORDER BY FlightNum, DestAirportSeqID LIMIT 5"]}
 {"sql":"SELECT DepDel15, DestAirportID, OriginAirportID, MIN(ArrDelayMinutes) FROM mytable WHERE SecurityDelay >= -9999 AND FirstDepTime BETWEEN 1742 AND 2031 AND TaxiOut NOT IN (41) GROUP BY DepDel15, DestAirportID, OriginAirportID  ORDER BY DepDel15, DestAirportID, OriginAirportID LIMIT 10","hsqls":["SELECT DepDel15, DestAirportID, OriginAirportID, MIN(ArrDelayMinutes) FROM mytable WHERE SecurityDelay >= -9999 AND FirstDepTime BETWEEN 1742 AND 2031 AND TaxiOut NOT IN (41) GROUP BY DepDel15, DestAirportID, OriginAirportID  ORDER BY DepDel15, DestAirportID, OriginAirportID LIMIT 10"]}
 {"sql":"SELECT FlightNum, OriginStateName FROM mytable ORDER BY AirTime LIMIT 24"}
-{"sql":"SELECT ArrDelayMinutes, \"Month\" FROM mytable WHERE DestState >= 'WY' OR DestAirportID = 10918 AND FlightDate BETWEEN '2014-01-01' AND '2014-01-04' ORDER BY OriginAirportSeqID, TaxiIn, TailNum LIMIT 4","hsqls":["SELECT ArrDelayMinutes, Month FROM mytable WHERE DestState >= 'WY' OR DestAirportID = 10918 AND FlightDate BETWEEN '2014-01-01' AND '2014-01-04' ORDER BY OriginAirportSeqID, TaxiIn, TailNum LIMIT 4"]}
+{"sql":"SELECT ArrDelayMinutes, \"Month\" FROM mytable WHERE DestState >= 'WY' OR DestAirportID = 10918 AND FlightDate BETWEEN '2014-01-01' AND '2014-01-04' ORDER BY OriginAirportSeqID, TaxiIn, TailNum LIMIT 4","hsqls":["SELECT ArrDelayMinutes, `Month` FROM mytable WHERE DestState >= 'WY' OR DestAirportID = 10918 AND FlightDate BETWEEN '2014-01-01' AND '2014-01-04' ORDER BY OriginAirportSeqID, TaxiIn, TailNum LIMIT 4"]}
 {"sql":"SELECT DestState, COUNT(NASDelay), MAX(Distance) FROM mytable WHERE DepTimeBlk BETWEEN '1200-1259' AND '1400-1459' GROUP BY DestState  ORDER BY DestState LIMIT 16","hsqls":["SELECT DestState, COUNT(NASDelay), MAX(Distance) FROM mytable WHERE DepTimeBlk BETWEEN '1200-1259' AND '1400-1459' GROUP BY DestState  ORDER BY DestState LIMIT 16"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE CRSElapsedTime BETWEEN 117 AND 118 LIMIT 24"}
 {"sql":"SELECT OriginStateFips, ArrTimeBlk, OriginStateName FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 OR DestWac >= 92 AND DepTimeBlk BETWEEN '1500-1559' AND '1800-1859' ORDER BY DayofMonth LIMIT 7"}
-{"sql":"SELECT MAX(TotalAddGTime), SUM(DayofMonth), MIN(\"Month\") FROM mytable WHERE DivAirportIDs BETWEEN 10721 AND 11953 OR SecurityDelay BETWEEN 18 AND -9999 AND ArrTime > 1548 LIMIT 9","hsqls":["SELECT MAX(TotalAddGTime), SUM(DayofMonth), MIN(Month) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 10721 AND 11953 OR DivAirportIDs__MV1 BETWEEN 10721 AND 11953 OR DivAirportIDs__MV2 BETWEEN 10721 AND 11953 OR DivAirportIDs__MV3 BETWEEN 10721 AND 11953 OR DivAirportIDs__MV4 BETWEEN 10721 AND 11953) OR SecurityDelay BETWEEN 18 AND -9999 AND ArrTime > 1548 LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, DivAirportLandings, DivArrDelay FROM mytable WHERE UniqueCarrier <= 'HA' OR DivWheelsOffs IN (2141) OR DivAirportSeqIDs BETWEEN 1015804 AND 1320402 ORDER BY ArrDel15, \"Month\" LIMIT 27","hsqls":["SELECT OriginStateFips, DivAirportLandings, DivArrDelay FROM mytable WHERE UniqueCarrier <= 'HA' OR (DivWheelsOffs__MV0 IN (2141) OR DivWheelsOffs__MV1 IN (2141) OR DivWheelsOffs__MV2 IN (2141) OR DivWheelsOffs__MV3 IN (2141) OR DivWheelsOffs__MV4 IN (2141)) OR (DivAirportSeqIDs__MV0 BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs__MV1 BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs__MV2 BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs__MV3 BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs__MV4 BETWEEN 1015804 AND 1320402) ORDER BY ArrDel15, Month LIMIT 10000"]}
-{"sql":"SELECT DestStateFips FROM mytable WHERE DepDelay BETWEEN 248.0 AND 240.0 AND DivAirports IN ('SDF', 'ORD') LIMIT 11","hsqls":["SELECT DestStateFips FROM mytable WHERE DepDelay BETWEEN 248.0 AND 240.0 AND (DivAirports__MV0 IN ('SDF', 'ORD') OR DivAirports__MV1 IN ('SDF', 'ORD') OR DivAirports__MV2 IN ('SDF', 'ORD') OR DivAirports__MV3 IN ('SDF', 'ORD') OR DivAirports__MV4 IN ('SDF', 'ORD')) LIMIT 10000"]}
+{"sql":"SELECT MAX(TotalAddGTime), SUM(DayofMonth), MIN(\"Month\") FROM mytable WHERE DivAirportIDs BETWEEN 10721 AND 11953 OR SecurityDelay BETWEEN 18 AND -9999 AND ArrTime > 1548 LIMIT 9","hsqls":["SELECT MAX(TotalAddGTime), SUM(DayofMonth), MIN(`Month`) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 10721 AND 11953 OR DivAirportIDs[2] BETWEEN 10721 AND 11953 OR DivAirportIDs[3] BETWEEN 10721 AND 11953 OR DivAirportIDs[4] BETWEEN 10721 AND 11953 OR DivAirportIDs[5] BETWEEN 10721 AND 11953) OR SecurityDelay BETWEEN 18 AND -9999 AND ArrTime > 1548 LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DivAirportLandings, DivArrDelay FROM mytable WHERE UniqueCarrier <= 'HA' OR DivWheelsOffs IN (2141) OR DivAirportSeqIDs BETWEEN 1015804 AND 1320402 ORDER BY ArrDel15, \"Month\" LIMIT 27","hsqls":["SELECT OriginStateFips, DivAirportLandings, DivArrDelay FROM mytable WHERE UniqueCarrier <= 'HA' OR (DivWheelsOffs[1] IN (2141) OR DivWheelsOffs[2] IN (2141) OR DivWheelsOffs[3] IN (2141) OR DivWheelsOffs[4] IN (2141) OR DivWheelsOffs[5] IN (2141)) OR (DivAirportSeqIDs[1] BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs[2] BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs[3] BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs[4] BETWEEN 1015804 AND 1320402 OR DivAirportSeqIDs[5] BETWEEN 1015804 AND 1320402) ORDER BY ArrDel15, `Month` LIMIT 10000"]}
+{"sql":"SELECT DestStateFips FROM mytable WHERE DepDelay BETWEEN 248.0 AND 240.0 AND DivAirports IN ('SDF', 'ORD') LIMIT 11","hsqls":["SELECT DestStateFips FROM mytable WHERE DepDelay BETWEEN 248.0 AND 240.0 AND (DivAirports[1] IN ('SDF', 'ORD') OR DivAirports[2] IN ('SDF', 'ORD') OR DivAirports[3] IN ('SDF', 'ORD') OR DivAirports[4] IN ('SDF', 'ORD') OR DivAirports[5] IN ('SDF', 'ORD')) LIMIT 10000"]}
 {"sql":"SELECT MAX(CRSElapsedTime) FROM mytable WHERE Distance <= 1444 LIMIT 16"}
 {"sql":"SELECT Carrier, SUM(ArrivalDelayGroups), MIN(TotalAddGTime) FROM mytable WHERE Cancelled IN (1) AND DestWac <= 3 GROUP BY Carrier  ORDER BY Carrier LIMIT 18","hsqls":["SELECT Carrier, SUM(ArrivalDelayGroups), MIN(TotalAddGTime) FROM mytable WHERE Cancelled IN (1) AND DestWac <= 3 GROUP BY Carrier  ORDER BY Carrier LIMIT 18"]}
-{"sql":"SELECT OriginCityName, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE DivTailNums IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR AirTime IN (189, 130, 167) AND CarrierDelay <= 59 GROUP BY OriginCityName, DestCityName, DepTimeBlk LIMIT 9","hsqls":["SELECT OriginCityName, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums__MV1 IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums__MV2 IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums__MV3 IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums__MV4 IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN')) OR AirTime IN (189, 130, 167) AND CarrierDelay <= 59 GROUP BY OriginCityName, DestCityName, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE DivTailNums IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR AirTime IN (189, 130, 167) AND CarrierDelay <= 59 GROUP BY OriginCityName, DestCityName, DepTimeBlk LIMIT 9","hsqls":["SELECT OriginCityName, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE (DivTailNums[1] IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums[2] IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums[3] IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums[4] IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN') OR DivTailNums[5] IN ('N934SW', 'N500MQ', 'N8606C', 'N3FKAA', 'N214WN')) OR AirTime IN (189, 130, 167) AND CarrierDelay <= 59 GROUP BY OriginCityName, DestCityName, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Carrier FROM mytable ORDER BY OriginCityMarketID, DestCityName, Origin LIMIT 2"}
 {"sql":"SELECT Flights, SecurityDelay, Cancelled, COUNT(*) FROM mytable WHERE WheelsOff IN (221, 1216, 1840, 2015, 1122) OR LateAircraftDelay = 104 GROUP BY Flights, SecurityDelay, Cancelled  ORDER BY Flights, SecurityDelay, Cancelled LIMIT 20","hsqls":["SELECT Flights, SecurityDelay, Cancelled, COUNT(*) FROM mytable WHERE WheelsOff IN (221, 1216, 1840, 2015, 1122) OR LateAircraftDelay = 104 GROUP BY Flights, SecurityDelay, Cancelled  ORDER BY Flights, SecurityDelay, Cancelled LIMIT 20"]}
 {"sql":"SELECT DepartureDelayGroups, TailNum, OriginAirportID FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 9 OR ArrDelay IN (-1.0, 76.0, -30.0, -45.0, 135.0) ORDER BY WeatherDelay LIMIT 25"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 28"}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE DestWac BETWEEN 93 AND 44 ORDER BY DivDistance LIMIT 9"}
-{"sql":"SELECT DepTimeBlk, AirTime, CRSDepTime FROM mytable WHERE ArrTimeBlk IN ('0800-0859') OR \"Year\" BETWEEN 2014 AND 2014 OR DivReachedDest = 1 ORDER BY \"Year\", Origin, DestCityMarketID LIMIT 20","hsqls":["SELECT DepTimeBlk, AirTime, CRSDepTime FROM mytable WHERE ArrTimeBlk IN ('0800-0859') OR Year BETWEEN 2014 AND 2014 OR DivReachedDest = 1 ORDER BY Year, Origin, DestCityMarketID LIMIT 20"]}
+{"sql":"SELECT DepTimeBlk, AirTime, CRSDepTime FROM mytable WHERE ArrTimeBlk IN ('0800-0859') OR \"Year\" BETWEEN 2014 AND 2014 OR DivReachedDest = 1 ORDER BY \"Year\", Origin, DestCityMarketID LIMIT 20","hsqls":["SELECT DepTimeBlk, AirTime, CRSDepTime FROM mytable WHERE ArrTimeBlk IN ('0800-0859') OR `Year` BETWEEN 2014 AND 2014 OR DivReachedDest = 1 ORDER BY Year, Origin, DestCityMarketID LIMIT 20"]}
 {"sql":"SELECT ArrTime, UniqueCarrier FROM mytable WHERE DestAirportSeqID BETWEEN 1410002 AND 1509602 ORDER BY DivReachedDest, LateAircraftDelay, DestCityName LIMIT 6"}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE DayOfWeek BETWEEN 2 AND 6 ORDER BY FirstDepTime, DivAirportLandings LIMIT 27"}
-{"sql":"SELECT DivWheelsOns, DayofMonth FROM mytable WHERE TaxiIn IN (1, 43, 16) AND DivWheelsOns BETWEEN 1514 AND 2121 ORDER BY DestAirportID LIMIT 1","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DayofMonth FROM mytable WHERE TaxiIn IN (1, 43, 16) AND (DivWheelsOns__MV0 BETWEEN 1514 AND 2121 OR DivWheelsOns__MV1 BETWEEN 1514 AND 2121 OR DivWheelsOns__MV2 BETWEEN 1514 AND 2121 OR DivWheelsOns__MV3 BETWEEN 1514 AND 2121 OR DivWheelsOns__MV4 BETWEEN 1514 AND 2121) ORDER BY DestAirportID LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DayofMonth FROM mytable WHERE UniqueCarrier = 'FL' OR \"Year\" BETWEEN 2014 AND 2014 OR DestState BETWEEN 'GA' AND 'IA' ORDER BY DayOfWeek LIMIT 2","hsqls":["SELECT DepDelay, DayofMonth FROM mytable WHERE UniqueCarrier = 'FL' OR Year BETWEEN 2014 AND 2014 OR DestState BETWEEN 'GA' AND 'IA' ORDER BY DayOfWeek LIMIT 2"]}
+{"sql":"SELECT DivWheelsOns, DayofMonth FROM mytable WHERE TaxiIn IN (1, 43, 16) AND DivWheelsOns BETWEEN 1514 AND 2121 ORDER BY DestAirportID LIMIT 1","hsqls":["SELECT DivWheelsOns, DayofMonth FROM mytable WHERE TaxiIn IN (1, 43, 16) AND (DivWheelsOns[1] BETWEEN 1514 AND 2121 OR DivWheelsOns[2] BETWEEN 1514 AND 2121 OR DivWheelsOns[3] BETWEEN 1514 AND 2121 OR DivWheelsOns[4] BETWEEN 1514 AND 2121 OR DivWheelsOns[5] BETWEEN 1514 AND 2121) ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DayofMonth FROM mytable WHERE UniqueCarrier = 'FL' OR \"Year\" BETWEEN 2014 AND 2014 OR DestState BETWEEN 'GA' AND 'IA' ORDER BY DayOfWeek LIMIT 2","hsqls":["SELECT DepDelay, DayofMonth FROM mytable WHERE UniqueCarrier = 'FL' OR `Year` BETWEEN 2014 AND 2014 OR DestState BETWEEN 'GA' AND 'IA' ORDER BY DayOfWeek LIMIT 2"]}
 {"sql":"SELECT CarrierDelay, TaxiIn FROM mytable ORDER BY DestCityName, NASDelay LIMIT 1"}
 {"sql":"SELECT DistanceGroup, OriginCityName, DaysSinceEpoch FROM mytable WHERE DestWac <= 36 AND DistanceGroup BETWEEN 10 AND 7 ORDER BY OriginCityName, NASDelay LIMIT 17"}
-{"sql":"SELECT OriginCityMarketID, FlightDate FROM mytable ORDER BY \"Year\" LIMIT 3","hsqls":["SELECT OriginCityMarketID, FlightDate FROM mytable ORDER BY Year LIMIT 3"]}
+{"sql":"SELECT OriginCityMarketID, FlightDate FROM mytable ORDER BY \"Year\" LIMIT 3","hsqls":["SELECT OriginCityMarketID, FlightDate FROM mytable ORDER BY `Year` LIMIT 3"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE Quarter = 1 ORDER BY FlightDate LIMIT 15"}
 {"sql":"SELECT DepDelay, ArrDelayMinutes FROM mytable WHERE Quarter < 1 ORDER BY OriginCityName LIMIT 13"}
 {"sql":"SELECT DestState FROM mytable WHERE ActualElapsedTime BETWEEN 32 AND 316 AND Dest BETWEEN 'EWR' AND 'HSV' AND WeatherDelay <= 72 ORDER BY ArrDelay, ArrivalDelayGroups LIMIT 11"}
-{"sql":"SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState) FROM mytable WHERE DivAirports IN ('RFD') AND TaxiIn BETWEEN -9999 AND 94 LIMIT 29","hsqls":["SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState)  FROM mytable WHERE (DivAirports__MV0 IN ('RFD') OR DivAirports__MV1 IN ('RFD') OR DivAirports__MV2 IN ('RFD') OR DivAirports__MV3 IN ('RFD') OR DivAirports__MV4 IN ('RFD')) AND TaxiIn BETWEEN -9999 AND 94 LIMIT 10000"]}
+{"sql":"SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState) FROM mytable WHERE DivAirports IN ('RFD') AND TaxiIn BETWEEN -9999 AND 94 LIMIT 29","hsqls":["SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState)  FROM mytable WHERE (DivAirports[1] IN ('RFD') OR DivAirports[2] IN ('RFD') OR DivAirports[3] IN ('RFD') OR DivAirports[4] IN ('RFD') OR DivAirports[5] IN ('RFD')) AND TaxiIn BETWEEN -9999 AND 94 LIMIT 10000"]}
 {"sql":"SELECT Flights, ArrDelayMinutes, ArrDelay, COUNT(Distance) FROM mytable GROUP BY Flights, ArrDelayMinutes, ArrDelay  ORDER BY Flights, ArrDelayMinutes, ArrDelay LIMIT 26","hsqls":["SELECT Flights, ArrDelayMinutes, ArrDelay, COUNT(Distance) FROM mytable GROUP BY Flights, ArrDelayMinutes, ArrDelay  ORDER BY Flights, ArrDelayMinutes, ArrDelay LIMIT 26"]}
-{"sql":"SELECT TailNum, SUM(WheelsOff) FROM mytable WHERE DivAirports >= 'SGU' AND DayOfWeek >= 3 GROUP BY TailNum LIMIT 3","hsqls":["SELECT TailNum, SUM(WheelsOff) FROM mytable WHERE (DivAirports__MV0 >= 'SGU' OR DivAirports__MV1 >= 'SGU' OR DivAirports__MV2 >= 'SGU' OR DivAirports__MV3 >= 'SGU' OR DivAirports__MV4 >= 'SGU') AND DayOfWeek >= 3 GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT TailNum, SUM(WheelsOff) FROM mytable WHERE DivAirports >= 'SGU' AND DayOfWeek >= 3 GROUP BY TailNum LIMIT 3","hsqls":["SELECT TailNum, SUM(WheelsOff) FROM mytable WHERE (DivAirports[1] >= 'SGU' OR DivAirports[2] >= 'SGU' OR DivAirports[3] >= 'SGU' OR DivAirports[4] >= 'SGU' OR DivAirports[5] >= 'SGU') AND DayOfWeek >= 3 GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT FlightNum, ArrDelay FROM mytable WHERE CarrierDelay = 290 AND DaysSinceEpoch <> 16080 LIMIT 15"}
-{"sql":"SELECT AVG(DestAirportID) FROM mytable WHERE DestCityMarketID BETWEEN 30476 AND 31481 AND DivTailNums BETWEEN 'N118US' AND 'N962SW' AND DistanceGroup <= 7 LIMIT 10","hsqls":["SELECT AVG(CAST(DestAirportID AS DOUBLE)) FROM mytable WHERE DestCityMarketID BETWEEN 30476 AND 31481 AND (DivTailNums__MV0 BETWEEN 'N118US' AND 'N962SW' OR DivTailNums__MV1 BETWEEN 'N118US' AND 'N962SW' OR DivTailNums__MV2 BETWEEN 'N118US' AND 'N962SW' OR DivTailNums__MV3 BETWEEN 'N118US' AND 'N962SW' OR DivTailNums__MV4 BETWEEN 'N118US' AND 'N962SW') AND DistanceGroup <= 7 LIMIT 10000"]}
+{"sql":"SELECT AVG(DestAirportID) FROM mytable WHERE DestCityMarketID BETWEEN 30476 AND 31481 AND DivTailNums BETWEEN 'N118US' AND 'N962SW' AND DistanceGroup <= 7 LIMIT 10","hsqls":["SELECT AVG(CAST(DestAirportID AS DOUBLE)) FROM mytable WHERE DestCityMarketID BETWEEN 30476 AND 31481 AND (DivTailNums[1] BETWEEN 'N118US' AND 'N962SW' OR DivTailNums[2] BETWEEN 'N118US' AND 'N962SW' OR DivTailNums[3] BETWEEN 'N118US' AND 'N962SW' OR DivTailNums[4] BETWEEN 'N118US' AND 'N962SW' OR DivTailNums[5] BETWEEN 'N118US' AND 'N962SW') AND DistanceGroup <= 7 LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, DivArrDelay, MAX(DestAirportID), AVG(DepDel15), COUNT(CRSDepTime) FROM mytable WHERE Origin NOT IN ('DHN') AND DaysSinceEpoch <= 16097 GROUP BY ArrDelay, DivArrDelay  ORDER BY ArrDelay, DivArrDelay LIMIT 16","hsqls":["SELECT ArrDelay, DivArrDelay, MAX(DestAirportID), AVG(DepDel15), COUNT(CRSDepTime) FROM mytable WHERE Origin NOT IN ('DHN') AND DaysSinceEpoch <= 16097 GROUP BY ArrDelay, DivArrDelay  ORDER BY ArrDelay, DivArrDelay LIMIT 16"]}
-{"sql":"SELECT DivReachedDest, LateAircraftDelay, COUNT(*) FROM mytable WHERE DivReachedDest <= 0 OR DivWheelsOffs IN (2228, 1106) OR OriginAirportSeqID BETWEEN 1498603 AND 1072102 GROUP BY DivReachedDest, LateAircraftDelay LIMIT 25","hsqls":["SELECT DivReachedDest, LateAircraftDelay, COUNT(*) FROM mytable WHERE DivReachedDest <= 0 OR (DivWheelsOffs__MV0 IN (2228, 1106) OR DivWheelsOffs__MV1 IN (2228, 1106) OR DivWheelsOffs__MV2 IN (2228, 1106) OR DivWheelsOffs__MV3 IN (2228, 1106) OR DivWheelsOffs__MV4 IN (2228, 1106)) OR OriginAirportSeqID BETWEEN 1498603 AND 1072102 GROUP BY DivReachedDest, LateAircraftDelay LIMIT 10000"]}
-{"sql":"SELECT Cancelled, ArrTimeBlk, MAX(ArrDelayMinutes) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1324402 AND 1129202 AND DivDistance IN (420, 998) GROUP BY Cancelled, ArrTimeBlk LIMIT 8","hsqls":["SELECT Cancelled, ArrTimeBlk, MAX(ArrDelayMinutes) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs__MV1 BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs__MV2 BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs__MV3 BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs__MV4 BETWEEN 1324402 AND 1129202) AND DivDistance IN (420, 998) GROUP BY Cancelled, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, LateAircraftDelay, COUNT(*) FROM mytable WHERE DivReachedDest <= 0 OR DivWheelsOffs IN (2228, 1106) OR OriginAirportSeqID BETWEEN 1498603 AND 1072102 GROUP BY DivReachedDest, LateAircraftDelay LIMIT 25","hsqls":["SELECT DivReachedDest, LateAircraftDelay, COUNT(*) FROM mytable WHERE DivReachedDest <= 0 OR (DivWheelsOffs[1] IN (2228, 1106) OR DivWheelsOffs[2] IN (2228, 1106) OR DivWheelsOffs[3] IN (2228, 1106) OR DivWheelsOffs[4] IN (2228, 1106) OR DivWheelsOffs[5] IN (2228, 1106)) OR OriginAirportSeqID BETWEEN 1498603 AND 1072102 GROUP BY DivReachedDest, LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT Cancelled, ArrTimeBlk, MAX(ArrDelayMinutes) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1324402 AND 1129202 AND DivDistance IN (420, 998) GROUP BY Cancelled, ArrTimeBlk LIMIT 8","hsqls":["SELECT Cancelled, ArrTimeBlk, MAX(ArrDelayMinutes) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs[2] BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs[3] BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs[4] BETWEEN 1324402 AND 1129202 OR DivAirportSeqIDs[5] BETWEEN 1324402 AND 1129202) AND DivDistance IN (420, 998) GROUP BY Cancelled, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT ArrDelay FROM mytable WHERE DivReachedDest BETWEEN 1 AND 1 AND ArrDelay NOT IN (182.0, 223.0) ORDER BY FlightNum, ArrDelayMinutes, OriginAirportID LIMIT 5"}
 {"sql":"SELECT Distance, TailNum, COUNT(*) FROM mytable GROUP BY Distance, TailNum  ORDER BY Distance, TailNum LIMIT 29","hsqls":["SELECT Distance, TailNum, COUNT(*) FROM mytable GROUP BY Distance, TailNum  ORDER BY Distance, TailNum LIMIT 29"]}
 {"sql":"SELECT OriginCityMarketID, Dest, CRSElapsedTime, MIN(OriginAirportID), COUNT(FirstDepTime), MIN(DivDistance) FROM mytable GROUP BY OriginCityMarketID, Dest, CRSElapsedTime  ORDER BY OriginCityMarketID, Dest, CRSElapsedTime LIMIT 17","hsqls":["SELECT OriginCityMarketID, Dest, CRSElapsedTime, MIN(OriginAirportID), COUNT(FirstDepTime), MIN(DivDistance) FROM mytable GROUP BY OriginCityMarketID, Dest, CRSElapsedTime  ORDER BY OriginCityMarketID, Dest, CRSElapsedTime LIMIT 17"]}
 {"sql":"SELECT DepDel15, DepTimeBlk, DestAirportID FROM mytable ORDER BY ArrDelay, DivArrDelay, DivActualElapsedTime LIMIT 18"}
 {"sql":"SELECT MIN(SecurityDelay), SUM(FirstDepTime), MIN(WheelsOff) FROM mytable WHERE FlightDate < '2014-01-11' OR FlightDate BETWEEN '2014-01-31' AND '2014-01-04' LIMIT 4"}
 {"sql":"SELECT Cancelled, DestCityMarketID, DivActualElapsedTime, MIN(AirlineID) FROM mytable WHERE ArrDelayMinutes BETWEEN 63.0 AND 116.0 OR ArrTime IN (1, 957, 1413, 620, 2243) AND DepDelayMinutes NOT IN (78.0) GROUP BY Cancelled, DestCityMarketID, DivActualElapsedTime  ORDER BY Cancelled, DestCityMarketID, DivActualElapsedTime LIMIT 22","hsqls":["SELECT Cancelled, DestCityMarketID, DivActualElapsedTime, MIN(AirlineID) FROM mytable WHERE ArrDelayMinutes BETWEEN 63.0 AND 116.0 OR ArrTime IN (1, 957, 1413, 620, 2243) AND DepDelayMinutes NOT IN (78.0) GROUP BY Cancelled, DestCityMarketID, DivActualElapsedTime  ORDER BY Cancelled, DestCityMarketID, DivActualElapsedTime LIMIT 22"]}
-{"sql":"SELECT FlightNum, SUM(DayofMonth), MAX(OriginStateFips) FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR \"Month\" BETWEEN 1 AND 1 GROUP BY FlightNum LIMIT 17","hsqls":["SELECT FlightNum, SUM(DayofMonth), MAX(OriginStateFips) FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR Month BETWEEN 1 AND 1 GROUP BY FlightNum LIMIT 17"]}
+{"sql":"SELECT FlightNum, SUM(DayofMonth), MAX(OriginStateFips) FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR \"Month\" BETWEEN 1 AND 1 GROUP BY FlightNum LIMIT 17","hsqls":["SELECT FlightNum, SUM(DayofMonth), MAX(OriginStateFips) FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR `Month` BETWEEN 1 AND 1 GROUP BY FlightNum LIMIT 17"]}
 {"sql":"SELECT DepDelay, DaysSinceEpoch FROM mytable WHERE ActualElapsedTime = 370 LIMIT 3"}
-{"sql":"SELECT FirstDepTime, COUNT(\"Month\"), AVG(DivArrDelay) FROM mytable WHERE DivAirports IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivTotalGTimes BETWEEN 99 AND 1 GROUP BY FirstDepTime LIMIT 26","hsqls":["SELECT FirstDepTime, COUNT(Month), AVG(DivArrDelay) FROM mytable WHERE (DivAirports__MV0 IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports__MV1 IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports__MV2 IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports__MV3 IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports__MV4 IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH')) OR (DivTotalGTimes__MV0 BETWEEN 99 AND 1 OR DivTotalGTimes__MV1 BETWEEN 99 AND 1 OR DivTotalGTimes__MV2 BETWEEN 99 AND 1 OR DivTotalGTimes__MV3 BETWEEN 99 AND 1 OR DivTotalGTimes__MV4 BETWEEN 99 AND 1) GROUP BY FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, COUNT(\"Month\"), AVG(DivArrDelay) FROM mytable WHERE DivAirports IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivTotalGTimes BETWEEN 99 AND 1 GROUP BY FirstDepTime LIMIT 26","hsqls":["SELECT FirstDepTime, COUNT(`Month`), AVG(DivArrDelay) FROM mytable WHERE (DivAirports[1] IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports[2] IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports[3] IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports[4] IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH') OR DivAirports[5] IN ('LMT', 'PVD', 'DCA', 'PVU', 'TLH')) OR (DivTotalGTimes[1] BETWEEN 99 AND 1 OR DivTotalGTimes[2] BETWEEN 99 AND 1 OR DivTotalGTimes[3] BETWEEN 99 AND 1 OR DivTotalGTimes[4] BETWEEN 99 AND 1 OR DivTotalGTimes[5] BETWEEN 99 AND 1) GROUP BY FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE LateAircraftDelay NOT IN (95) OR ArrTimeBlk NOT IN ('2200-2259', '1100-1159', '1200-1259', '0900-0959', '1400-1459') AND CRSArrTime BETWEEN 1227 AND 915 ORDER BY NASDelay, DepTimeBlk, CancellationCode LIMIT 24"}
 {"sql":"SELECT DestState, COUNT(DestStateName), MAX(FlightNum) FROM mytable WHERE DayOfWeek >= 6 OR OriginStateFips < 42 OR WeatherDelay BETWEEN 111 AND 214 GROUP BY DestState  ORDER BY DestState LIMIT 11","hsqls":["SELECT DestState, COUNT(DestStateName), MAX(FlightNum) FROM mytable WHERE DayOfWeek >= 6 OR OriginStateFips < 42 OR WeatherDelay BETWEEN 111 AND 214 GROUP BY DestState  ORDER BY DestState LIMIT 11"]}
-{"sql":"SELECT DestAirportSeqID, MIN(DestCityMarketID) FROM mytable WHERE \"Year\" NOT IN (2014) OR OriginStateName = 'Rhode Island' GROUP BY DestAirportSeqID LIMIT 12","hsqls":["SELECT DestAirportSeqID, MIN(DestCityMarketID) FROM mytable WHERE Year NOT IN (2014) OR OriginStateName = 'Rhode Island' GROUP BY DestAirportSeqID LIMIT 12"]}
+{"sql":"SELECT DestAirportSeqID, MIN(DestCityMarketID) FROM mytable WHERE \"Year\" NOT IN (2014) OR OriginStateName = 'Rhode Island' GROUP BY DestAirportSeqID LIMIT 12","hsqls":["SELECT DestAirportSeqID, MIN(DestCityMarketID) FROM mytable WHERE `Year` NOT IN (2014) OR OriginStateName = 'Rhode Island' GROUP BY DestAirportSeqID LIMIT 12"]}
 {"sql":"SELECT DivDistance, MIN(AirlineID) FROM mytable WHERE OriginAirportID = 11986 AND DestAirportID = 10785 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 14","hsqls":["SELECT DivDistance, MIN(AirlineID) FROM mytable WHERE OriginAirportID = 11986 AND DestAirportID = 10785 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 14"]}
 {"sql":"SELECT Carrier FROM mytable LIMIT 9"}
 {"sql":"SELECT COUNT(DepDel15), SUM(Distance) FROM mytable LIMIT 9"}
 {"sql":"SELECT Flights, ArrDelayMinutes, DestAirportSeqID FROM mytable WHERE Distance IN (1187, 764, 961, 496, 767) OR DayofMonth BETWEEN 6 AND 12 OR OriginAirportID < 12451 ORDER BY Flights, DepDel15 LIMIT 10"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DivArrDelay >= 187 OR OriginWac BETWEEN 5 AND 3 AND DaysSinceEpoch BETWEEN 16086 AND 16079 LIMIT 9"}
-{"sql":"SELECT Origin, ArrivalDelayGroups, MAX(DestAirportSeqID), SUM(NASDelay), MAX(SecurityDelay) FROM mytable WHERE DivTailNums >= 'N661JB' OR Distance BETWEEN 296 AND 647 GROUP BY Origin, ArrivalDelayGroups LIMIT 4","hsqls":["SELECT Origin, ArrivalDelayGroups, MAX(DestAirportSeqID), SUM(NASDelay), MAX(SecurityDelay) FROM mytable WHERE (DivTailNums__MV0 >= 'N661JB' OR DivTailNums__MV1 >= 'N661JB' OR DivTailNums__MV2 >= 'N661JB' OR DivTailNums__MV3 >= 'N661JB' OR DivTailNums__MV4 >= 'N661JB') OR Distance BETWEEN 296 AND 647 GROUP BY Origin, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT Origin, ArrivalDelayGroups, MAX(DestAirportSeqID), SUM(NASDelay), MAX(SecurityDelay) FROM mytable WHERE DivTailNums >= 'N661JB' OR Distance BETWEEN 296 AND 647 GROUP BY Origin, ArrivalDelayGroups LIMIT 4","hsqls":["SELECT Origin, ArrivalDelayGroups, MAX(DestAirportSeqID), SUM(NASDelay), MAX(SecurityDelay) FROM mytable WHERE (DivTailNums[1] >= 'N661JB' OR DivTailNums[2] >= 'N661JB' OR DivTailNums[3] >= 'N661JB' OR DivTailNums[4] >= 'N661JB' OR DivTailNums[5] >= 'N661JB') OR Distance BETWEEN 296 AND 647 GROUP BY Origin, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DestState FROM mytable LIMIT 23"}
 {"sql":"SELECT ArrDel15, UniqueCarrier FROM mytable WHERE DestAirportID >= 10800 AND DestStateFips BETWEEN 75 AND 36 OR ActualElapsedTime = 34 ORDER BY Carrier LIMIT 15"}
 {"sql":"SELECT OriginState, FirstDepTime, OriginCityName, COUNT(*) FROM mytable WHERE LongestAddGTime > 63 OR OriginCityMarketID <> 35401 GROUP BY OriginState, FirstDepTime, OriginCityName  ORDER BY OriginState, FirstDepTime, OriginCityName LIMIT 13","hsqls":["SELECT OriginState, FirstDepTime, OriginCityName, COUNT(*) FROM mytable WHERE LongestAddGTime > 63 OR OriginCityMarketID <> 35401 GROUP BY OriginState, FirstDepTime, OriginCityName  ORDER BY OriginState, FirstDepTime, OriginCityName LIMIT 13"]}
-{"sql":"SELECT WheelsOff, Distance, AVG(DestAirportSeqID), MAX(DivActualElapsedTime), COUNT(OriginCityName) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 OR DepDelayMinutes < 419.0 OR \"Month\" NOT IN (1) GROUP BY WheelsOff, Distance LIMIT 8","hsqls":["SELECT WheelsOff, Distance, AVG(DestAirportSeqID), MAX(DivActualElapsedTime), COUNT(OriginCityName) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 OR DepDelayMinutes < 419.0 OR Month NOT IN (1) GROUP BY WheelsOff, Distance LIMIT 8"]}
+{"sql":"SELECT WheelsOff, Distance, AVG(DestAirportSeqID), MAX(DivActualElapsedTime), COUNT(OriginCityName) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 OR DepDelayMinutes < 419.0 OR \"Month\" NOT IN (1) GROUP BY WheelsOff, Distance LIMIT 8","hsqls":["SELECT WheelsOff, Distance, AVG(DestAirportSeqID), MAX(DivActualElapsedTime), COUNT(OriginCityName) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 1 OR DepDelayMinutes < 419.0 OR `Month` NOT IN (1) GROUP BY WheelsOff, Distance LIMIT 8"]}
 {"sql":"SELECT DestAirportSeqID, OriginAirportID FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY Distance, OriginCityName, AirTime LIMIT 11"}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE LongestAddGTime BETWEEN 103 AND 97 OR ActualElapsedTime > 111 LIMIT 2"}
-{"sql":"SELECT DivLongestGTimes, DestAirportSeqID FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DepTimeBlk NOT IN ('1900-1959', '1400-1459', '1500-1559') ORDER BY DepDelayMinutes, AirlineID, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestAirportSeqID FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DepTimeBlk NOT IN ('1900-1959', '1400-1459', '1500-1559') ORDER BY DepDelayMinutes, AirlineID, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestAirportSeqID FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DepTimeBlk NOT IN ('1900-1959', '1400-1459', '1500-1559') ORDER BY DepDelayMinutes, AirlineID, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT DivLongestGTimes, DestAirportSeqID FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DepTimeBlk NOT IN ('1900-1959', '1400-1459', '1500-1559') ORDER BY DepDelayMinutes, AirlineID, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, AVG(OriginAirportSeqID), COUNT(DestStateFips), MIN(CRSArrTime) FROM mytable WHERE AirTime > 277 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 21","hsqls":["SELECT DepTimeBlk, AVG(OriginAirportSeqID), COUNT(DestStateFips), MIN(CRSArrTime) FROM mytable WHERE AirTime > 277 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 21"]}
-{"sql":"SELECT OriginCityName, DivArrDelay, DivTotalGTimes FROM mytable LIMIT 20","hsqls":["SELECT OriginCityName, DivArrDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DivArrDelay, DivTotalGTimes FROM mytable LIMIT 20","hsqls":["SELECT OriginCityName, DivArrDelay, DivTotalGTimes FROM mytable LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DestCityName, AirlineID FROM mytable LIMIT 27"}
 {"sql":"SELECT Origin FROM mytable WHERE CRSElapsedTime BETWEEN 79 AND 394 ORDER BY CarrierDelay, Flights, Origin LIMIT 13"}
 {"sql":"SELECT OriginStateFips, OriginCityName, SUM(DivAirportLandings), MIN(ArrDel15), SUM(DivDistance) FROM mytable WHERE OriginCityName BETWEEN 'Harrisburg, PA' AND 'Great Falls, MT' GROUP BY OriginStateFips, OriginCityName  ORDER BY OriginStateFips, OriginCityName LIMIT 1","hsqls":["SELECT OriginStateFips, OriginCityName, SUM(DivAirportLandings), MIN(ArrDel15), SUM(DivDistance) FROM mytable WHERE OriginCityName BETWEEN 'Harrisburg, PA' AND 'Great Falls, MT' GROUP BY OriginStateFips, OriginCityName  ORDER BY OriginStateFips, OriginCityName LIMIT 1"]}
-{"sql":"SELECT ArrTimeBlk, DivAirportIDs, CancellationCode FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY DestCityMarketID, OriginStateName LIMIT 10","hsqls":["SELECT ArrTimeBlk, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CancellationCode FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY DestCityMarketID, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DivAirportIDs, CancellationCode FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY DestCityMarketID, OriginStateName LIMIT 10","hsqls":["SELECT ArrTimeBlk, DivAirportIDs, CancellationCode FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY DestCityMarketID, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DivArrDelay FROM mytable ORDER BY DestAirportID LIMIT 25"}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE LongestAddGTime BETWEEN 148 AND 38 ORDER BY FirstDepTime, DestStateFips, CRSDepTime"}
 {"sql":"SELECT DivDistance, CRSElapsedTime, MIN(OriginStateFips) FROM mytable WHERE WheelsOn <> 1405 OR Diverted BETWEEN 0 AND 0 GROUP BY DivDistance, CRSElapsedTime  ORDER BY DivDistance, CRSElapsedTime LIMIT 3","hsqls":["SELECT DivDistance, CRSElapsedTime, MIN(OriginStateFips) FROM mytable WHERE WheelsOn <> 1405 OR Diverted BETWEEN 0 AND 0 GROUP BY DivDistance, CRSElapsedTime  ORDER BY DivDistance, CRSElapsedTime LIMIT 3"]}
 {"sql":"SELECT Distance, ActualElapsedTime FROM mytable WHERE Origin <> 'SGU' AND DepTime BETWEEN 2241 AND 1753 LIMIT 2"}
 {"sql":"SELECT FirstDepTime, DepTime, TailNum, COUNT(*) FROM mytable WHERE OriginCityMarketID NOT IN (34696) GROUP BY FirstDepTime, DepTime, TailNum  ORDER BY FirstDepTime, DepTime, TailNum LIMIT 13","hsqls":["SELECT FirstDepTime, DepTime, TailNum, COUNT(*) FROM mytable WHERE OriginCityMarketID NOT IN (34696) GROUP BY FirstDepTime, DepTime, TailNum  ORDER BY FirstDepTime, DepTime, TailNum LIMIT 13"]}
-{"sql":"SELECT DestAirportID, DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 63 AND 63 ORDER BY ArrDel15, Dest, \"Month\" LIMIT 2","hsqls":["SELECT DestAirportID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginWac BETWEEN 63 AND 63 ORDER BY ArrDel15, Dest, Month LIMIT 10000"]}
-{"sql":"SELECT \"Month\", CRSDepTime, CRSElapsedTime, AVG(\"Month\"), MIN(FlightNum) FROM mytable GROUP BY \"Month\", CRSDepTime, CRSElapsedTime LIMIT 14","hsqls":["SELECT Month, CRSDepTime, CRSElapsedTime, AVG(Month), MIN(FlightNum) FROM mytable GROUP BY Month, CRSDepTime, CRSElapsedTime LIMIT 14"]}
+{"sql":"SELECT DestAirportID, DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 63 AND 63 ORDER BY ArrDel15, Dest, \"Month\" LIMIT 2","hsqls":["SELECT DestAirportID, DivTotalGTimes FROM mytable WHERE OriginWac BETWEEN 63 AND 63 ORDER BY ArrDel15, Dest, `Month` LIMIT 10000"]}
+{"sql":"SELECT \"Month\", CRSDepTime, CRSElapsedTime, AVG(\"Month\"), MIN(FlightNum) FROM mytable GROUP BY \"Month\", CRSDepTime, CRSElapsedTime LIMIT 14","hsqls":["SELECT Month, CRSDepTime, CRSElapsedTime, AVG(`Month`), MIN(FlightNum) FROM mytable GROUP BY Month, CRSDepTime, CRSElapsedTime LIMIT 14"]}
 {"sql":"SELECT Cancelled FROM mytable WHERE CarrierDelay BETWEEN 144 AND 12 OR DestWac NOT IN (2, 93) OR DivDistance <> 89 ORDER BY OriginAirportSeqID, Diverted, DepTime LIMIT 9"}
 {"sql":"SELECT MIN(Quarter), COUNT(DepTime) FROM mytable LIMIT 4"}
 {"sql":"SELECT DepDelay, WeatherDelay FROM mytable ORDER BY NASDelay LIMIT 17"}
@@ -5501,7 +5501,7 @@
 {"sql":"SELECT NASDelay, DayofMonth, ArrDelay, MIN(OriginStateFips), COUNT(WeatherDelay) FROM mytable GROUP BY NASDelay, DayofMonth, ArrDelay  ORDER BY NASDelay, DayofMonth, ArrDelay LIMIT 1","hsqls":["SELECT NASDelay, DayofMonth, ArrDelay, MIN(OriginStateFips), COUNT(WeatherDelay) FROM mytable GROUP BY NASDelay, DayofMonth, ArrDelay  ORDER BY NASDelay, DayofMonth, ArrDelay LIMIT 1"]}
 {"sql":"SELECT MIN(DayofMonth), MAX(Distance) FROM mytable WHERE Carrier = 'FL' OR Carrier NOT IN ('FL') LIMIT 17"}
 {"sql":"SELECT COUNT(DestCityName) FROM mytable LIMIT 16"}
-{"sql":"SELECT DestState, DivDistance FROM mytable WHERE DivAirportSeqIDs BETWEEN 1477101 AND 1105703 ORDER BY DepDelayMinutes, ArrDelayMinutes, CancellationCode LIMIT 5","hsqls":["SELECT DestState, DivDistance FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs__MV1 BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs__MV2 BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs__MV3 BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs__MV4 BETWEEN 1477101 AND 1105703) ORDER BY DepDelayMinutes, ArrDelayMinutes, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DestState, DivDistance FROM mytable WHERE DivAirportSeqIDs BETWEEN 1477101 AND 1105703 ORDER BY DepDelayMinutes, ArrDelayMinutes, CancellationCode LIMIT 5","hsqls":["SELECT DestState, DivDistance FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs[2] BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs[3] BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs[4] BETWEEN 1477101 AND 1105703 OR DivAirportSeqIDs[5] BETWEEN 1477101 AND 1105703) ORDER BY DepDelayMinutes, ArrDelayMinutes, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DivAirportLandings FROM mytable WHERE Origin NOT IN ('OGG', 'EVV', 'SAT') AND DepartureDelayGroups IN (2) AND Origin NOT IN ('IMT', 'MGM', 'ALB', 'ROW') LIMIT 7"}
 {"sql":"SELECT AVG(DepartureDelayGroups), MIN(ArrivalDelayGroups), AVG(OriginAirportID) FROM mytable WHERE ArrTime BETWEEN 2011 AND 2239 AND OriginCityName IN ('Guam, TT', 'Albuquerque, NM', 'Joplin, MO') LIMIT 25"}
 {"sql":"SELECT DestCityName, OriginAirportID FROM mytable WHERE WheelsOff = 1619 OR LongestAddGTime BETWEEN -9999 AND 86 ORDER BY FirstDepTime LIMIT 8"}
@@ -5515,74 +5515,74 @@
 {"sql":"SELECT DistanceGroup, FirstDepTime FROM mytable WHERE LongestAddGTime BETWEEN 45 AND 15 OR ArrDelay > 252.0 LIMIT 29"}
 {"sql":"SELECT CarrierDelay, ArrDel15, Origin, MIN(ArrDelayMinutes), MIN(DestStateFips), MIN(AirlineID) FROM mytable WHERE DepDelay BETWEEN 107.0 AND 80.0 AND TotalAddGTime BETWEEN 40 AND 23 GROUP BY CarrierDelay, ArrDel15, Origin  ORDER BY CarrierDelay, ArrDel15, Origin LIMIT 2","hsqls":["SELECT CarrierDelay, ArrDel15, Origin, MIN(ArrDelayMinutes), MIN(DestStateFips), MIN(AirlineID) FROM mytable WHERE DepDelay BETWEEN 107.0 AND 80.0 AND TotalAddGTime BETWEEN 40 AND 23 GROUP BY CarrierDelay, ArrDel15, Origin  ORDER BY CarrierDelay, ArrDel15, Origin LIMIT 2"]}
 {"sql":"SELECT DepDelay, Quarter, TailNum, SUM(DepDelayMinutes), SUM(WeatherDelay), SUM(SecurityDelay) FROM mytable WHERE WheelsOn BETWEEN 1712 AND 643 GROUP BY DepDelay, Quarter, TailNum  ORDER BY DepDelay, Quarter, TailNum LIMIT 4","hsqls":["SELECT DepDelay, Quarter, TailNum, SUM(DepDelayMinutes), SUM(WeatherDelay), SUM(SecurityDelay) FROM mytable WHERE WheelsOn BETWEEN 1712 AND 643 GROUP BY DepDelay, Quarter, TailNum  ORDER BY DepDelay, Quarter, TailNum LIMIT 4"]}
-{"sql":"SELECT AirTime, DivTotalGTimes FROM mytable WHERE DepTimeBlk BETWEEN '0800-0859' AND '1200-1259' ORDER BY OriginCityName, DayofMonth LIMIT 21","hsqls":["SELECT AirTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DepTimeBlk BETWEEN '0800-0859' AND '1200-1259' ORDER BY OriginCityName, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest FROM mytable WHERE DestState < 'IN' OR DivWheelsOffs <= 1447 ORDER BY CRSDepTime LIMIT 17","hsqls":["SELECT DivReachedDest FROM mytable WHERE DestState < 'IN' OR (DivWheelsOffs__MV0 <= 1447 OR DivWheelsOffs__MV1 <= 1447 OR DivWheelsOffs__MV2 <= 1447 OR DivWheelsOffs__MV3 <= 1447 OR DivWheelsOffs__MV4 <= 1447) ORDER BY CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT AirTime, DivTotalGTimes FROM mytable WHERE DepTimeBlk BETWEEN '0800-0859' AND '1200-1259' ORDER BY OriginCityName, DayofMonth LIMIT 21","hsqls":["SELECT AirTime, DivTotalGTimes FROM mytable WHERE DepTimeBlk BETWEEN '0800-0859' AND '1200-1259' ORDER BY OriginCityName, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest FROM mytable WHERE DestState < 'IN' OR DivWheelsOffs <= 1447 ORDER BY CRSDepTime LIMIT 17","hsqls":["SELECT DivReachedDest FROM mytable WHERE DestState < 'IN' OR (DivWheelsOffs[1] <= 1447 OR DivWheelsOffs[2] <= 1447 OR DivWheelsOffs[3] <= 1447 OR DivWheelsOffs[4] <= 1447 OR DivWheelsOffs[5] <= 1447) ORDER BY CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(DepTimeBlk) FROM mytable WHERE DestCityMarketID = 32280 AND OriginAirportID IN (12264) AND LongestAddGTime IN (31, 24, 60, 13, 27) LIMIT 3"}
 {"sql":"SELECT TaxiOut, OriginCityName, DayOfWeek FROM mytable ORDER BY DestAirportID LIMIT 6"}
 {"sql":"SELECT Quarter, OriginStateName, MIN(WeatherDelay), SUM(Diverted), AVG(OriginCityMarketID) FROM mytable WHERE OriginAirportSeqID < 1234302 OR Dest BETWEEN 'MGM' AND 'OAK' AND DayofMonth IN (3, 30, 4) GROUP BY Quarter, OriginStateName  ORDER BY Quarter, OriginStateName LIMIT 15","hsqls":["SELECT Quarter, OriginStateName, MIN(WeatherDelay), SUM(Diverted), AVG(OriginCityMarketID) FROM mytable WHERE OriginAirportSeqID < 1234302 OR Dest BETWEEN 'MGM' AND 'OAK' AND DayofMonth IN (3, 30, 4) GROUP BY Quarter, OriginStateName  ORDER BY Quarter, OriginStateName LIMIT 15"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE DivAirports BETWEEN 'OMA' AND 'TUL' AND DivDistance <= 128 ORDER BY ArrDel15 LIMIT 24","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivAirports__MV0 BETWEEN 'OMA' AND 'TUL' OR DivAirports__MV1 BETWEEN 'OMA' AND 'TUL' OR DivAirports__MV2 BETWEEN 'OMA' AND 'TUL' OR DivAirports__MV3 BETWEEN 'OMA' AND 'TUL' OR DivAirports__MV4 BETWEEN 'OMA' AND 'TUL') AND DivDistance <= 128 ORDER BY ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 19.0 OR DivTailNums BETWEEN 'N422WN' AND 'N956AT' OR Quarter NOT IN (1) GROUP BY WeatherDelay LIMIT 12","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 19.0 OR (DivTailNums__MV0 BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums__MV1 BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums__MV2 BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums__MV3 BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums__MV4 BETWEEN 'N422WN' AND 'N956AT') OR Quarter NOT IN (1) GROUP BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE DivAirports BETWEEN 'OMA' AND 'TUL' AND DivDistance <= 128 ORDER BY ArrDel15 LIMIT 24","hsqls":["SELECT DivTailNums FROM mytable WHERE (DivAirports[1] BETWEEN 'OMA' AND 'TUL' OR DivAirports[2] BETWEEN 'OMA' AND 'TUL' OR DivAirports[3] BETWEEN 'OMA' AND 'TUL' OR DivAirports[4] BETWEEN 'OMA' AND 'TUL' OR DivAirports[5] BETWEEN 'OMA' AND 'TUL') AND DivDistance <= 128 ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 19.0 OR DivTailNums BETWEEN 'N422WN' AND 'N956AT' OR Quarter NOT IN (1) GROUP BY WeatherDelay LIMIT 12","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE ArrDelayMinutes < 19.0 OR (DivTailNums[1] BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums[2] BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums[3] BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums[4] BETWEEN 'N422WN' AND 'N956AT' OR DivTailNums[5] BETWEEN 'N422WN' AND 'N956AT') OR Quarter NOT IN (1) GROUP BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, FlightDate, DepTime FROM mytable WHERE OriginWac NOT IN (31, 16, 12) LIMIT 24"}
 {"sql":"SELECT MAX(Distance) FROM mytable LIMIT 29"}
 {"sql":"SELECT Quarter, DivArrDelay FROM mytable WHERE ArrDelay >= 66.0 AND DayOfWeek <= 4 ORDER BY Distance LIMIT 20"}
-{"sql":"SELECT WheelsOff, Diverted, DepTime FROM mytable WHERE DestAirportSeqID = 1411302 ORDER BY \"Month\" LIMIT 29","hsqls":["SELECT WheelsOff, Diverted, DepTime FROM mytable WHERE DestAirportSeqID = 1411302 ORDER BY Month LIMIT 29"]}
+{"sql":"SELECT WheelsOff, Diverted, DepTime FROM mytable WHERE DestAirportSeqID = 1411302 ORDER BY \"Month\" LIMIT 29","hsqls":["SELECT WheelsOff, Diverted, DepTime FROM mytable WHERE DestAirportSeqID = 1411302 ORDER BY `Month` LIMIT 29"]}
 {"sql":"SELECT DepDelay, DestState, Cancelled FROM mytable WHERE ArrDelayMinutes BETWEEN 414.0 AND 171.0 LIMIT 2"}
 {"sql":"SELECT MIN(ArrDel15) FROM mytable WHERE Distance > 594 LIMIT 19"}
-{"sql":"SELECT LateAircraftDelay, \"Month\", COUNT(*) FROM mytable WHERE DivWheelsOffs IN (1600, 1851, 1113) AND WheelsOn NOT IN (714, 2012, 1359) GROUP BY LateAircraftDelay, \"Month\" LIMIT 13","hsqls":["SELECT LateAircraftDelay, Month, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1600, 1851, 1113) OR DivWheelsOffs__MV1 IN (1600, 1851, 1113) OR DivWheelsOffs__MV2 IN (1600, 1851, 1113) OR DivWheelsOffs__MV3 IN (1600, 1851, 1113) OR DivWheelsOffs__MV4 IN (1600, 1851, 1113)) AND WheelsOn NOT IN (714, 2012, 1359) GROUP BY LateAircraftDelay, Month LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, \"Month\", COUNT(*) FROM mytable WHERE DivWheelsOffs IN (1600, 1851, 1113) AND WheelsOn NOT IN (714, 2012, 1359) GROUP BY LateAircraftDelay, \"Month\" LIMIT 13","hsqls":["SELECT LateAircraftDelay, Month, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] IN (1600, 1851, 1113) OR DivWheelsOffs[2] IN (1600, 1851, 1113) OR DivWheelsOffs[3] IN (1600, 1851, 1113) OR DivWheelsOffs[4] IN (1600, 1851, 1113) OR DivWheelsOffs[5] IN (1600, 1851, 1113)) AND WheelsOn NOT IN (714, 2012, 1359) GROUP BY LateAircraftDelay, `Month` LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, FlightDate, Origin FROM mytable ORDER BY FirstDepTime, LongestAddGTime, FlightNum LIMIT 21"}
-{"sql":"SELECT DivAirportSeqIDs, Cancelled FROM mytable WHERE DivAirports BETWEEN 'CWA' AND 'ILM' AND DivAirportIDs IN (11953, 14100, 12448, 11109, 10620) ORDER BY SecurityDelay, CancellationCode LIMIT 2","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Cancelled FROM mytable WHERE (DivAirports__MV0 BETWEEN 'CWA' AND 'ILM' OR DivAirports__MV1 BETWEEN 'CWA' AND 'ILM' OR DivAirports__MV2 BETWEEN 'CWA' AND 'ILM' OR DivAirports__MV3 BETWEEN 'CWA' AND 'ILM' OR DivAirports__MV4 BETWEEN 'CWA' AND 'ILM') AND (DivAirportIDs__MV0 IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs__MV1 IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs__MV2 IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs__MV3 IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs__MV4 IN (11953, 14100, 12448, 11109, 10620)) ORDER BY SecurityDelay, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, Cancelled FROM mytable WHERE DivAirports BETWEEN 'CWA' AND 'ILM' AND DivAirportIDs IN (11953, 14100, 12448, 11109, 10620) ORDER BY SecurityDelay, CancellationCode LIMIT 2","hsqls":["SELECT DivAirportSeqIDs, Cancelled FROM mytable WHERE (DivAirports[1] BETWEEN 'CWA' AND 'ILM' OR DivAirports[2] BETWEEN 'CWA' AND 'ILM' OR DivAirports[3] BETWEEN 'CWA' AND 'ILM' OR DivAirports[4] BETWEEN 'CWA' AND 'ILM' OR DivAirports[5] BETWEEN 'CWA' AND 'ILM') AND (DivAirportIDs[1] IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs[2] IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs[3] IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs[4] IN (11953, 14100, 12448, 11109, 10620) OR DivAirportIDs[5] IN (11953, 14100, 12448, 11109, 10620)) ORDER BY SecurityDelay, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT AVG(DepDelay) FROM mytable WHERE DestState IN ('TN', 'SD', 'OK', 'WI', 'PR') AND OriginAirportID IN (10990) LIMIT 17"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE FlightNum NOT IN (3343) OR LongestAddGTime NOT IN (24) AND DivTailNums IN ('N17196', 'N373JB', 'N608SW', 'N14174') LIMIT 10","hsqls":["SELECT Year FROM mytable WHERE FlightNum NOT IN (3343) OR LongestAddGTime NOT IN (24) AND (DivTailNums__MV0 IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums__MV1 IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums__MV2 IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums__MV3 IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums__MV4 IN ('N17196', 'N373JB', 'N608SW', 'N14174')) LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, Flights, DivAirportLandings FROM mytable WHERE WheelsOn NOT IN (1140) AND Cancelled <= 0 LIMIT 13","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Flights, DivAirportLandings FROM mytable WHERE WheelsOn NOT IN (1140) AND Cancelled <= 0 LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE FlightNum NOT IN (3343) OR LongestAddGTime NOT IN (24) AND DivTailNums IN ('N17196', 'N373JB', 'N608SW', 'N14174') LIMIT 10","hsqls":["SELECT `Year` FROM mytable WHERE FlightNum NOT IN (3343) OR LongestAddGTime NOT IN (24) AND (DivTailNums[1] IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums[2] IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums[3] IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums[4] IN ('N17196', 'N373JB', 'N608SW', 'N14174') OR DivTailNums[5] IN ('N17196', 'N373JB', 'N608SW', 'N14174')) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Flights, DivAirportLandings FROM mytable WHERE WheelsOn NOT IN (1140) AND Cancelled <= 0 LIMIT 13","hsqls":["SELECT DivWheelsOns, Flights, DivAirportLandings FROM mytable WHERE WheelsOn NOT IN (1140) AND Cancelled <= 0 LIMIT 10000"]}
 {"sql":"SELECT AVG(DivActualElapsedTime) FROM mytable LIMIT 12"}
 {"sql":"SELECT FlightNum, ArrivalDelayGroups, DayOfWeek, COUNT(*) FROM mytable GROUP BY FlightNum, ArrivalDelayGroups, DayOfWeek  ORDER BY FlightNum, ArrivalDelayGroups, DayOfWeek LIMIT 2","hsqls":["SELECT FlightNum, ArrivalDelayGroups, DayOfWeek, COUNT(*) FROM mytable GROUP BY FlightNum, ArrivalDelayGroups, DayOfWeek  ORDER BY FlightNum, ArrivalDelayGroups, DayOfWeek LIMIT 2"]}
-{"sql":"SELECT ArrTime, \"Month\" FROM mytable WHERE Carrier BETWEEN 'EV' AND 'AA' OR CarrierDelay BETWEEN 106 AND 118 ORDER BY DivReachedDest, DepTime, DivAirportLandings LIMIT 3","hsqls":["SELECT ArrTime, Month FROM mytable WHERE Carrier BETWEEN 'EV' AND 'AA' OR CarrierDelay BETWEEN 106 AND 118 ORDER BY DivReachedDest, DepTime, DivAirportLandings LIMIT 3"]}
+{"sql":"SELECT ArrTime, \"Month\" FROM mytable WHERE Carrier BETWEEN 'EV' AND 'AA' OR CarrierDelay BETWEEN 106 AND 118 ORDER BY DivReachedDest, DepTime, DivAirportLandings LIMIT 3","hsqls":["SELECT ArrTime, `Month` FROM mytable WHERE Carrier BETWEEN 'EV' AND 'AA' OR CarrierDelay BETWEEN 106 AND 118 ORDER BY DivReachedDest, DepTime, DivAirportLandings LIMIT 3"]}
 {"sql":"SELECT OriginCityName, Dest, DaysSinceEpoch, MAX(DivDistance) FROM mytable WHERE TailNum BETWEEN 'N9EAMQ' AND 'N750UW' GROUP BY OriginCityName, Dest, DaysSinceEpoch  ORDER BY OriginCityName, Dest, DaysSinceEpoch LIMIT 28","hsqls":["SELECT OriginCityName, Dest, DaysSinceEpoch, MAX(DivDistance) FROM mytable WHERE TailNum BETWEEN 'N9EAMQ' AND 'N750UW' GROUP BY OriginCityName, Dest, DaysSinceEpoch  ORDER BY OriginCityName, Dest, DaysSinceEpoch LIMIT 28"]}
 {"sql":"SELECT OriginState, OriginStateFips, MAX(ArrDelay) FROM mytable GROUP BY OriginState, OriginStateFips  ORDER BY OriginState, OriginStateFips LIMIT 24","hsqls":["SELECT OriginState, OriginStateFips, MAX(ArrDelay) FROM mytable GROUP BY OriginState, OriginStateFips  ORDER BY OriginState, OriginStateFips LIMIT 24"]}
-{"sql":"SELECT ArrDelay, SUM(DistanceGroup), MAX(OriginWac) FROM mytable WHERE LateAircraftDelay > 105 OR \"Month\" NOT IN (1) GROUP BY ArrDelay LIMIT 24","hsqls":["SELECT ArrDelay, SUM(DistanceGroup), MAX(OriginWac) FROM mytable WHERE LateAircraftDelay > 105 OR Month NOT IN (1) GROUP BY ArrDelay LIMIT 24"]}
+{"sql":"SELECT ArrDelay, SUM(DistanceGroup), MAX(OriginWac) FROM mytable WHERE LateAircraftDelay > 105 OR \"Month\" NOT IN (1) GROUP BY ArrDelay LIMIT 24","hsqls":["SELECT ArrDelay, SUM(DistanceGroup), MAX(OriginWac) FROM mytable WHERE LateAircraftDelay > 105 OR `Month` NOT IN (1) GROUP BY ArrDelay LIMIT 24"]}
 {"sql":"SELECT DivDistance, TailNum, DayOfWeek, SUM(ArrTime) FROM mytable WHERE DestState NOT IN ('VA', 'MA') OR ArrivalDelayGroups NOT IN (3, -2, 12) GROUP BY DivDistance, TailNum, DayOfWeek  ORDER BY DivDistance, TailNum, DayOfWeek LIMIT 8","hsqls":["SELECT DivDistance, TailNum, DayOfWeek, SUM(ArrTime) FROM mytable WHERE DestState NOT IN ('VA', 'MA') OR ArrivalDelayGroups NOT IN (3, -2, 12) GROUP BY DivDistance, TailNum, DayOfWeek  ORDER BY DivDistance, TailNum, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT TailNum, OriginWac FROM mytable WHERE OriginAirportSeqID BETWEEN 1393303 AND 1295402 LIMIT 2"}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY WeatherDelay, DestCityName LIMIT 10"}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE OriginCityMarketID BETWEEN 34794 AND 33377 ORDER BY DestAirportSeqID LIMIT 21"}
-{"sql":"SELECT OriginWac, ArrDelay FROM mytable WHERE CancellationCode < 'B' AND DivWheelsOns BETWEEN 2223 AND 830 LIMIT 3","hsqls":["SELECT OriginWac, ArrDelay FROM mytable WHERE CancellationCode < 'B' AND (DivWheelsOns__MV0 BETWEEN 2223 AND 830 OR DivWheelsOns__MV1 BETWEEN 2223 AND 830 OR DivWheelsOns__MV2 BETWEEN 2223 AND 830 OR DivWheelsOns__MV3 BETWEEN 2223 AND 830 OR DivWheelsOns__MV4 BETWEEN 2223 AND 830) LIMIT 10000"]}
-{"sql":"SELECT Flights FROM mytable WHERE WheelsOff NOT IN (728, 1810, 1142) AND DivAirports IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirportSeqIDs IN (1110902, 1302402, 1540103, 1078502) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 2","hsqls":["SELECT Flights FROM mytable WHERE WheelsOff NOT IN (728, 1810, 1142) AND (DivAirports__MV0 IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports__MV1 IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports__MV2 IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports__MV3 IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports__MV4 IN ('BDL', 'BNA', 'SBN', 'DCA')) OR (DivAirportSeqIDs__MV0 IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs__MV1 IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs__MV2 IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs__MV3 IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs__MV4 IN (1110902, 1302402, 1540103, 1078502)) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT OriginWac, ArrDelay FROM mytable WHERE CancellationCode < 'B' AND DivWheelsOns BETWEEN 2223 AND 830 LIMIT 3","hsqls":["SELECT OriginWac, ArrDelay FROM mytable WHERE CancellationCode < 'B' AND (DivWheelsOns[1] BETWEEN 2223 AND 830 OR DivWheelsOns[2] BETWEEN 2223 AND 830 OR DivWheelsOns[3] BETWEEN 2223 AND 830 OR DivWheelsOns[4] BETWEEN 2223 AND 830 OR DivWheelsOns[5] BETWEEN 2223 AND 830) LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE WheelsOff NOT IN (728, 1810, 1142) AND DivAirports IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirportSeqIDs IN (1110902, 1302402, 1540103, 1078502) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 2","hsqls":["SELECT Flights FROM mytable WHERE WheelsOff NOT IN (728, 1810, 1142) AND (DivAirports[1] IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports[2] IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports[3] IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports[4] IN ('BDL', 'BNA', 'SBN', 'DCA') OR DivAirports[5] IN ('BDL', 'BNA', 'SBN', 'DCA')) OR (DivAirportSeqIDs[1] IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs[2] IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs[3] IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs[4] IN (1110902, 1302402, 1540103, 1078502) OR DivAirportSeqIDs[5] IN (1110902, 1302402, 1540103, 1078502)) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT MIN(DepDel15) FROM mytable WHERE CRSArrTime NOT IN (740) OR DivReachedDest BETWEEN -9999 AND 0 LIMIT 23"}
 {"sql":"SELECT AirTime, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'B6' AND 'EV' AND DestStateFips = 56 AND ActualElapsedTime <> 33 GROUP BY AirTime  ORDER BY AirTime LIMIT 25","hsqls":["SELECT AirTime, COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'B6' AND 'EV' AND DestStateFips = 56 AND ActualElapsedTime <> 33 GROUP BY AirTime  ORDER BY AirTime LIMIT 25"]}
-{"sql":"SELECT ArrDelayMinutes, CancellationCode, MAX(\"Year\"), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE DivWheelsOffs IN (1054) OR DivActualElapsedTime IN (392) GROUP BY ArrDelayMinutes, CancellationCode LIMIT 23","hsqls":["SELECT ArrDelayMinutes, CancellationCode, MAX(Year), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1054) OR DivWheelsOffs__MV1 IN (1054) OR DivWheelsOffs__MV2 IN (1054) OR DivWheelsOffs__MV3 IN (1054) OR DivWheelsOffs__MV4 IN (1054)) OR DivActualElapsedTime IN (392) GROUP BY ArrDelayMinutes, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, CancellationCode, MAX(\"Year\"), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE DivWheelsOffs IN (1054) OR DivActualElapsedTime IN (392) GROUP BY ArrDelayMinutes, CancellationCode LIMIT 23","hsqls":["SELECT ArrDelayMinutes, CancellationCode, MAX(`Year`), SUM(CRSElapsedTime), SUM(Quarter) FROM mytable WHERE (DivWheelsOffs[1] IN (1054) OR DivWheelsOffs[2] IN (1054) OR DivWheelsOffs[3] IN (1054) OR DivWheelsOffs[4] IN (1054) OR DivWheelsOffs[5] IN (1054)) OR DivActualElapsedTime IN (392) GROUP BY ArrDelayMinutes, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk FROM mytable ORDER BY DepDelayMinutes LIMIT 13"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 27"}
-{"sql":"SELECT CRSArrTime, \"Month\", SUM(\"Year\") FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'F9' OR DepDelay BETWEEN 197.0 AND 162.0 GROUP BY CRSArrTime, \"Month\" LIMIT 2","hsqls":["SELECT CRSArrTime, Month, SUM(Year) FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'F9' OR DepDelay BETWEEN 197.0 AND 162.0 GROUP BY CRSArrTime, Month LIMIT 2"]}
+{"sql":"SELECT CRSArrTime, \"Month\", SUM(\"Year\") FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'F9' OR DepDelay BETWEEN 197.0 AND 162.0 GROUP BY CRSArrTime, \"Month\" LIMIT 2","hsqls":["SELECT CRSArrTime, Month, SUM(`Year`) FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'F9' OR DepDelay BETWEEN 197.0 AND 162.0 GROUP BY CRSArrTime, `Month` LIMIT 2"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled IN (1, 0) LIMIT 27"}
 {"sql":"SELECT DivArrDelay, DaysSinceEpoch FROM mytable WHERE DestCityName IN ('Key West, FL', 'New Bern/Morehead/Beaufort, NC', 'Chicago, IL') AND Flights BETWEEN 1 AND 1 AND DivArrDelay NOT IN (215, 148, 306, 233, 437) LIMIT 25"}
 {"sql":"SELECT DaysSinceEpoch, COUNT(*) FROM mytable WHERE ArrTimeBlk NOT IN ('1700-1759', '1100-1159', '1000-1059') OR AirTime BETWEEN 121 AND 281 AND WheelsOn NOT IN (227, 2150, 2125) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 7","hsqls":["SELECT DaysSinceEpoch, COUNT(*) FROM mytable WHERE ArrTimeBlk NOT IN ('1700-1759', '1100-1159', '1000-1059') OR AirTime BETWEEN 121 AND 281 AND WheelsOn NOT IN (227, 2150, 2125) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 7"]}
 {"sql":"SELECT DepDelay, CRSArrTime, CRSDepTime, SUM(ActualElapsedTime) FROM mytable WHERE OriginCityName IN ('Yuma, AZ', 'Kahului, HI', 'Newport News/Williamsburg, VA') GROUP BY DepDelay, CRSArrTime, CRSDepTime  ORDER BY DepDelay, CRSArrTime, CRSDepTime LIMIT 7","hsqls":["SELECT DepDelay, CRSArrTime, CRSDepTime, SUM(ActualElapsedTime) FROM mytable WHERE OriginCityName IN ('Yuma, AZ', 'Kahului, HI', 'Newport News/Williamsburg, VA') GROUP BY DepDelay, CRSArrTime, CRSDepTime  ORDER BY DepDelay, CRSArrTime, CRSDepTime LIMIT 7"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DestAirportID >= 13486 OR DivActualElapsedTime BETWEEN 174 AND 207 AND LateAircraftDelay BETWEEN 109 AND 85 ORDER BY DivDistance, TailNum, UniqueCarrier LIMIT 27","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestAirportID >= 13486 OR DivActualElapsedTime BETWEEN 174 AND 207 AND LateAircraftDelay BETWEEN 109 AND 85 ORDER BY DivDistance, TailNum, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DestAirportID >= 13486 OR DivActualElapsedTime BETWEEN 174 AND 207 AND LateAircraftDelay BETWEEN 109 AND 85 ORDER BY DivDistance, TailNum, UniqueCarrier LIMIT 27","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE DestAirportID >= 13486 OR DivActualElapsedTime BETWEEN 174 AND 207 AND LateAircraftDelay BETWEEN 109 AND 85 ORDER BY DivDistance, TailNum, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE DepTime BETWEEN 1043 AND 1250 ORDER BY DivReachedDest, OriginState, OriginStateName LIMIT 17"}
 {"sql":"SELECT CarrierDelay, MIN(DivDistance), MIN(CRSElapsedTime), AVG(Flights) FROM mytable WHERE DestAirportID <= 10868 OR FirstDepTime NOT IN (1621) OR DepTime IN (717, 1053, 827) GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 4","hsqls":["SELECT CarrierDelay, MIN(DivDistance), MIN(CRSElapsedTime), AVG(Flights) FROM mytable WHERE DestAirportID <= 10868 OR FirstDepTime NOT IN (1621) OR DepTime IN (717, 1053, 827) GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 4"]}
-{"sql":"SELECT DepartureDelayGroups, DivAirports, CRSElapsedTime FROM mytable ORDER BY CRSDepTime LIMIT 26","hsqls":["SELECT DepartureDelayGroups, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CRSElapsedTime FROM mytable ORDER BY CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirports, CRSElapsedTime FROM mytable ORDER BY CRSDepTime LIMIT 26","hsqls":["SELECT DepartureDelayGroups, DivAirports, CRSElapsedTime FROM mytable ORDER BY CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT Carrier FROM mytable ORDER BY ArrTimeBlk LIMIT 12"}
 {"sql":"SELECT TaxiOut, DestStateName, AirTime, COUNT(DestStateFips) FROM mytable WHERE DestStateFips BETWEEN 19 AND 40 OR UniqueCarrier BETWEEN 'MQ' AND 'AA' AND ActualElapsedTime >= 269 GROUP BY TaxiOut, DestStateName, AirTime  ORDER BY TaxiOut, DestStateName, AirTime LIMIT 3","hsqls":["SELECT TaxiOut, DestStateName, AirTime, COUNT(DestStateFips) FROM mytable WHERE DestStateFips BETWEEN 19 AND 40 OR UniqueCarrier BETWEEN 'MQ' AND 'AA' AND ActualElapsedTime >= 269 GROUP BY TaxiOut, DestStateName, AirTime  ORDER BY TaxiOut, DestStateName, AirTime LIMIT 3"]}
-{"sql":"SELECT LongestAddGTime, DestCityMarketID, \"Month\" FROM mytable WHERE AirlineID BETWEEN 20398 AND 19805 AND OriginWac <= 4 ORDER BY NASDelay LIMIT 26","hsqls":["SELECT LongestAddGTime, DestCityMarketID, Month FROM mytable WHERE AirlineID BETWEEN 20398 AND 19805 AND OriginWac <= 4 ORDER BY NASDelay LIMIT 26"]}
-{"sql":"SELECT OriginAirportID FROM mytable WHERE WheelsOn <= 1333 AND DivWheelsOns IN (845) OR DestStateFips < 32 ORDER BY LateAircraftDelay, NASDelay, \"Month\" LIMIT 10","hsqls":["SELECT OriginAirportID FROM mytable WHERE WheelsOn <= 1333 AND (DivWheelsOns__MV0 IN (845) OR DivWheelsOns__MV1 IN (845) OR DivWheelsOns__MV2 IN (845) OR DivWheelsOns__MV3 IN (845) OR DivWheelsOns__MV4 IN (845)) OR DestStateFips < 32 ORDER BY LateAircraftDelay, NASDelay, Month LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirports IN ('CHS', 'OME') AND OriginCityName < 'Fort Smith, AR' GROUP BY FirstDepTime, DaysSinceEpoch LIMIT 3","hsqls":["SELECT FirstDepTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirports__MV0 IN ('CHS', 'OME') OR DivAirports__MV1 IN ('CHS', 'OME') OR DivAirports__MV2 IN ('CHS', 'OME') OR DivAirports__MV3 IN ('CHS', 'OME') OR DivAirports__MV4 IN ('CHS', 'OME')) AND OriginCityName < 'Fort Smith, AR' GROUP BY FirstDepTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DestCityMarketID, \"Month\" FROM mytable WHERE AirlineID BETWEEN 20398 AND 19805 AND OriginWac <= 4 ORDER BY NASDelay LIMIT 26","hsqls":["SELECT LongestAddGTime, DestCityMarketID, `Month` FROM mytable WHERE AirlineID BETWEEN 20398 AND 19805 AND OriginWac <= 4 ORDER BY NASDelay LIMIT 26"]}
+{"sql":"SELECT OriginAirportID FROM mytable WHERE WheelsOn <= 1333 AND DivWheelsOns IN (845) OR DestStateFips < 32 ORDER BY LateAircraftDelay, NASDelay, \"Month\" LIMIT 10","hsqls":["SELECT OriginAirportID FROM mytable WHERE WheelsOn <= 1333 AND (DivWheelsOns[1] IN (845) OR DivWheelsOns[2] IN (845) OR DivWheelsOns[3] IN (845) OR DivWheelsOns[4] IN (845) OR DivWheelsOns[5] IN (845)) OR DestStateFips < 32 ORDER BY LateAircraftDelay, NASDelay, `Month` LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirports IN ('CHS', 'OME') AND OriginCityName < 'Fort Smith, AR' GROUP BY FirstDepTime, DaysSinceEpoch LIMIT 3","hsqls":["SELECT FirstDepTime, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirports[1] IN ('CHS', 'OME') OR DivAirports[2] IN ('CHS', 'OME') OR DivAirports[3] IN ('CHS', 'OME') OR DivAirports[4] IN ('CHS', 'OME') OR DivAirports[5] IN ('CHS', 'OME')) AND OriginCityName < 'Fort Smith, AR' GROUP BY FirstDepTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Diverted IN (0) LIMIT 27"}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE Carrier IN ('DL', 'EV', 'US', 'FL', 'MQ') AND FlightNum <> 6476 AND OriginWac = 54 ORDER BY WeatherDelay"}
 {"sql":"SELECT ArrDelayMinutes, AirlineID FROM mytable ORDER BY Carrier, DivDistance, ArrDel15 LIMIT 9"}
 {"sql":"SELECT DestState, OriginAirportID FROM mytable WHERE OriginAirportID NOT IN (15356, 10136) LIMIT 2"}
-{"sql":"SELECT Dest, MIN(DivActualElapsedTime), MAX(\"Year\"), COUNT(OriginWac) FROM mytable GROUP BY Dest LIMIT 29","hsqls":["SELECT Dest, MIN(DivActualElapsedTime), MAX(Year), COUNT(OriginWac) FROM mytable GROUP BY Dest LIMIT 29"]}
+{"sql":"SELECT Dest, MIN(DivActualElapsedTime), MAX(\"Year\"), COUNT(OriginWac) FROM mytable GROUP BY Dest LIMIT 29","hsqls":["SELECT Dest, MIN(DivActualElapsedTime), MAX(`Year`), COUNT(OriginWac) FROM mytable GROUP BY Dest LIMIT 29"]}
 {"sql":"SELECT Quarter, CancellationCode, COUNT(*) FROM mytable WHERE OriginAirportSeqID BETWEEN 1192102 AND 1289605 GROUP BY Quarter, CancellationCode  ORDER BY Quarter, CancellationCode LIMIT 24","hsqls":["SELECT Quarter, CancellationCode, COUNT(*) FROM mytable WHERE OriginAirportSeqID BETWEEN 1192102 AND 1289605 GROUP BY Quarter, CancellationCode  ORDER BY Quarter, CancellationCode LIMIT 24"]}
 {"sql":"SELECT ArrDelayMinutes, Cancelled, MIN(Flights) FROM mytable WHERE FlightNum IN (5735, 5178, 4112, 1540) GROUP BY ArrDelayMinutes, Cancelled  ORDER BY ArrDelayMinutes, Cancelled LIMIT 26","hsqls":["SELECT ArrDelayMinutes, Cancelled, MIN(Flights) FROM mytable WHERE FlightNum IN (5735, 5178, 4112, 1540) GROUP BY ArrDelayMinutes, Cancelled  ORDER BY ArrDelayMinutes, Cancelled LIMIT 26"]}
-{"sql":"SELECT TotalAddGTime, DepTimeBlk, \"Month\" FROM mytable WHERE DestState NOT IN ('MI', 'IN', 'WV', 'KY') LIMIT 25","hsqls":["SELECT TotalAddGTime, DepTimeBlk, Month FROM mytable WHERE DestState NOT IN ('MI', 'IN', 'WV', 'KY') LIMIT 25"]}
+{"sql":"SELECT TotalAddGTime, DepTimeBlk, \"Month\" FROM mytable WHERE DestState NOT IN ('MI', 'IN', 'WV', 'KY') LIMIT 25","hsqls":["SELECT TotalAddGTime, DepTimeBlk, `Month` FROM mytable WHERE DestState NOT IN ('MI', 'IN', 'WV', 'KY') LIMIT 25"]}
 {"sql":"SELECT DestStateFips FROM mytable ORDER BY FlightNum LIMIT 8"}
-{"sql":"SELECT \"Year\" FROM mytable ORDER BY Diverted, TaxiIn LIMIT 10","hsqls":["SELECT Year FROM mytable ORDER BY Diverted, TaxiIn LIMIT 10"]}
+{"sql":"SELECT \"Year\" FROM mytable ORDER BY Diverted, TaxiIn LIMIT 10","hsqls":["SELECT `Year` FROM mytable ORDER BY Diverted, TaxiIn LIMIT 10"]}
 {"sql":"SELECT SecurityDelay, DepDel15, ArrDelay FROM mytable WHERE CarrierDelay > 83 AND CRSElapsedTime NOT IN (216, 41) ORDER BY OriginAirportSeqID, WeatherDelay, ArrivalDelayGroups LIMIT 19"}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE DivReachedDest = 1 OR TailNum > 'N543UA' OR DestAirportSeqID = 1402702 ORDER BY TaxiIn, AirlineID LIMIT 23"}
-{"sql":"SELECT SUM(DestAirportSeqID) FROM mytable WHERE DivLongestGTimes >= 58.0 AND DayofMonth BETWEEN 20 AND 30 AND FlightDate >= '2014-01-25' LIMIT 10","hsqls":["SELECT SUM(DestAirportSeqID) FROM mytable WHERE (DivLongestGTimes__MV0 >= 58.0 OR DivLongestGTimes__MV1 >= 58.0 OR DivLongestGTimes__MV2 >= 58.0 OR DivLongestGTimes__MV3 >= 58.0 OR DivLongestGTimes__MV4 >= 58.0) AND DayofMonth BETWEEN 20 AND 30 AND FlightDate >= '2014-01-25' LIMIT 10000"]}
+{"sql":"SELECT SUM(DestAirportSeqID) FROM mytable WHERE DivLongestGTimes >= 58.0 AND DayofMonth BETWEEN 20 AND 30 AND FlightDate >= '2014-01-25' LIMIT 10","hsqls":["SELECT SUM(DestAirportSeqID) FROM mytable WHERE (DivLongestGTimes[1] >= 58.0 OR DivLongestGTimes[2] >= 58.0 OR DivLongestGTimes[3] >= 58.0 OR DivLongestGTimes[4] >= 58.0 OR DivLongestGTimes[5] >= 58.0) AND DayofMonth BETWEEN 20 AND 30 AND FlightDate >= '2014-01-25' LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY OriginAirportSeqID, CRSElapsedTime LIMIT 9"}
 {"sql":"SELECT SUM(OriginWac), MIN(Quarter), AVG(Quarter) FROM mytable WHERE ArrTime > 903 AND DivAirportLandings IN (2, 1, 0, 9) OR ArrDelayMinutes NOT IN (7.0) LIMIT 11"}
 {"sql":"SELECT LateAircraftDelay, MAX(DivAirportLandings), MAX(WeatherDelay) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 3","hsqls":["SELECT LateAircraftDelay, MAX(DivAirportLandings), MAX(WeatherDelay) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 3"]}
 {"sql":"SELECT CancellationCode, CRSElapsedTime FROM mytable ORDER BY DivReachedDest LIMIT 22"}
-{"sql":"SELECT OriginAirportSeqID, TaxiIn, AVG(LateAircraftDelay) FROM mytable WHERE \"Month\" <= 1 OR ActualElapsedTime BETWEEN 81 AND 63 GROUP BY OriginAirportSeqID, TaxiIn LIMIT 21","hsqls":["SELECT OriginAirportSeqID, TaxiIn, AVG(LateAircraftDelay) FROM mytable WHERE Month <= 1 OR ActualElapsedTime BETWEEN 81 AND 63 GROUP BY OriginAirportSeqID, TaxiIn LIMIT 21"]}
+{"sql":"SELECT OriginAirportSeqID, TaxiIn, AVG(LateAircraftDelay) FROM mytable WHERE \"Month\" <= 1 OR ActualElapsedTime BETWEEN 81 AND 63 GROUP BY OriginAirportSeqID, TaxiIn LIMIT 21","hsqls":["SELECT OriginAirportSeqID, TaxiIn, AVG(LateAircraftDelay) FROM mytable WHERE `Month` <= 1 OR ActualElapsedTime BETWEEN 81 AND 63 GROUP BY OriginAirportSeqID, TaxiIn LIMIT 21"]}
 {"sql":"SELECT LateAircraftDelay, ArrDel15, DivAirportLandings, COUNT(*) FROM mytable WHERE DestWac BETWEEN 34 AND 15 GROUP BY LateAircraftDelay, ArrDel15, DivAirportLandings  ORDER BY LateAircraftDelay, ArrDel15, DivAirportLandings LIMIT 29","hsqls":["SELECT LateAircraftDelay, ArrDel15, DivAirportLandings, COUNT(*) FROM mytable WHERE DestWac BETWEEN 34 AND 15 GROUP BY LateAircraftDelay, ArrDel15, DivAirportLandings  ORDER BY LateAircraftDelay, ArrDel15, DivAirportLandings LIMIT 29"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 10"}
 {"sql":"SELECT LongestAddGTime, COUNT(*) FROM mytable WHERE TotalAddGTime NOT IN (21, 41, 15) OR TotalAddGTime BETWEEN 96 AND 28 OR DestAirportSeqID < 1163703 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 3","hsqls":["SELECT LongestAddGTime, COUNT(*) FROM mytable WHERE TotalAddGTime NOT IN (21, 41, 15) OR TotalAddGTime BETWEEN 96 AND 28 OR DestAirportSeqID < 1163703 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 3"]}
@@ -5592,10 +5592,10 @@
 {"sql":"SELECT LongestAddGTime, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-05', '2014-01-15') OR DepartureDelayGroups <= 6 AND DistanceGroup NOT IN (2, 10, 8) GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 13","hsqls":["SELECT LongestAddGTime, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-05', '2014-01-15') OR DepartureDelayGroups <= 6 AND DistanceGroup NOT IN (2, 10, 8) GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 13"]}
 {"sql":"SELECT OriginState FROM mytable WHERE TotalAddGTime NOT IN (21, 47, 24, 103, 38) OR Carrier NOT IN ('WN') OR OriginCityName BETWEEN 'Duluth, MN' AND 'Little Rock, AR' ORDER BY DayofMonth, ArrivalDelayGroups"}
 {"sql":"SELECT WheelsOff, COUNT(*) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 11","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 11"]}
-{"sql":"SELECT LateAircraftDelay, DestCityName FROM mytable WHERE TaxiIn BETWEEN 37 AND 52 AND DivLongestGTimes > -9999.0 ORDER BY UniqueCarrier, \"Month\" LIMIT 18","hsqls":["SELECT LateAircraftDelay, DestCityName FROM mytable WHERE TaxiIn BETWEEN 37 AND 52 AND (DivLongestGTimes__MV0 > -9999.0 OR DivLongestGTimes__MV1 > -9999.0 OR DivLongestGTimes__MV2 > -9999.0 OR DivLongestGTimes__MV3 > -9999.0 OR DivLongestGTimes__MV4 > -9999.0) ORDER BY UniqueCarrier, Month LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, DestCityName FROM mytable WHERE TaxiIn BETWEEN 37 AND 52 AND DivLongestGTimes > -9999.0 ORDER BY UniqueCarrier, \"Month\" LIMIT 18","hsqls":["SELECT LateAircraftDelay, DestCityName FROM mytable WHERE TaxiIn BETWEEN 37 AND 52 AND (DivLongestGTimes[1] > -9999.0 OR DivLongestGTimes[2] > -9999.0 OR DivLongestGTimes[3] > -9999.0 OR DivLongestGTimes[4] > -9999.0 OR DivLongestGTimes[5] > -9999.0) ORDER BY UniqueCarrier, `Month` LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DepDelayMinutes, OriginWac FROM mytable WHERE OriginWac IN (44, 36, 88) AND OriginStateName < 'Virginia' ORDER BY DestStateName, DestCityName, DepDel15 LIMIT 2"}
 {"sql":"SELECT DestStateFips, DivAirportLandings, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20409 GROUP BY DestStateFips, DivAirportLandings  ORDER BY DestStateFips, DivAirportLandings LIMIT 27","hsqls":["SELECT DestStateFips, DivAirportLandings, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 20409 GROUP BY DestStateFips, DivAirportLandings  ORDER BY DestStateFips, DivAirportLandings LIMIT 27"]}
-{"sql":"SELECT TailNum, MIN(TotalAddGTime), AVG(ArrivalDelayGroups) FROM mytable WHERE DivLongestGTimes < 91.0 AND WheelsOff >= 1304 OR CancellationCode IN ('A', 'B', 'C', 'noodles') GROUP BY TailNum LIMIT 1","hsqls":["SELECT TailNum, MIN(TotalAddGTime), AVG(ArrivalDelayGroups) FROM mytable WHERE (DivLongestGTimes__MV0 < 91.0 OR DivLongestGTimes__MV1 < 91.0 OR DivLongestGTimes__MV2 < 91.0 OR DivLongestGTimes__MV3 < 91.0 OR DivLongestGTimes__MV4 < 91.0) AND WheelsOff >= 1304 OR CancellationCode IN ('A', 'B', 'C', 'noodles') GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT TailNum, MIN(TotalAddGTime), AVG(ArrivalDelayGroups) FROM mytable WHERE DivLongestGTimes < 91.0 AND WheelsOff >= 1304 OR CancellationCode IN ('A', 'B', 'C', 'noodles') GROUP BY TailNum LIMIT 1","hsqls":["SELECT TailNum, MIN(TotalAddGTime), AVG(ArrivalDelayGroups) FROM mytable WHERE (DivLongestGTimes[1] < 91.0 OR DivLongestGTimes[2] < 91.0 OR DivLongestGTimes[3] < 91.0 OR DivLongestGTimes[4] < 91.0 OR DivLongestGTimes[5] < 91.0) AND WheelsOff >= 1304 OR CancellationCode IN ('A', 'B', 'C', 'noodles') GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, DepTimeBlk FROM mytable WHERE AirlineID IN (19805) ORDER BY DepTime LIMIT 23"}
 {"sql":"SELECT MAX(Diverted) FROM mytable WHERE AirTime NOT IN (42, 341, 53, 344, 165) OR LongestAddGTime > 5 LIMIT 12"}
 {"sql":"SELECT TaxiOut, TailNum, AVG(WeatherDelay), MIN(OriginStateFips), MIN(CRSArrTime) FROM mytable WHERE FlightDate IN ('2014-01-02') OR CRSArrTime IN (601, 1421, 210, 1744) GROUP BY TaxiOut, TailNum  ORDER BY TaxiOut, TailNum LIMIT 17","hsqls":["SELECT TaxiOut, TailNum, AVG(WeatherDelay), MIN(OriginStateFips), MIN(CRSArrTime) FROM mytable WHERE FlightDate IN ('2014-01-02') OR CRSArrTime IN (601, 1421, 210, 1744) GROUP BY TaxiOut, TailNum  ORDER BY TaxiOut, TailNum LIMIT 17"]}
@@ -5603,46 +5603,46 @@
 {"sql":"SELECT DepDelayMinutes, OriginStateName FROM mytable WHERE DestState >= 'VA' ORDER BY WeatherDelay, DayofMonth LIMIT 8"}
 {"sql":"SELECT TailNum, DepDel15, DestCityMarketID FROM mytable LIMIT 3"}
 {"sql":"SELECT CarrierDelay, \"Month\", UniqueCarrier, COUNT(*) FROM mytable WHERE TotalAddGTime IN (40) GROUP BY CarrierDelay, \"Month\", UniqueCarrier LIMIT 11","hsqls":["SELECT CarrierDelay, Month, UniqueCarrier, COUNT(*) FROM mytable WHERE TotalAddGTime IN (40) GROUP BY CarrierDelay, Month, UniqueCarrier LIMIT 11"]}
-{"sql":"SELECT DivAirportSeqIDs, DestCityName FROM mytable ORDER BY FirstDepTime, OriginCityMarketID LIMIT 10","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestCityName FROM mytable ORDER BY FirstDepTime, OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestCityName FROM mytable ORDER BY FirstDepTime, OriginCityMarketID LIMIT 10","hsqls":["SELECT DivAirportSeqIDs, DestCityName FROM mytable ORDER BY FirstDepTime, OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT SUM(DestAirportSeqID), MIN(DivArrDelay) FROM mytable WHERE OriginAirportID NOT IN (13388, 14730, 12889, 11995) LIMIT 6"}
-{"sql":"SELECT DepartureDelayGroups, ActualElapsedTime, MIN(DivActualElapsedTime), AVG(DestStateFips), SUM(\"Month\") FROM mytable WHERE LateAircraftDelay <> 209 OR TaxiIn BETWEEN 7 AND 49 GROUP BY DepartureDelayGroups, ActualElapsedTime LIMIT 5","hsqls":["SELECT DepartureDelayGroups, ActualElapsedTime, MIN(DivActualElapsedTime), AVG(DestStateFips), SUM(Month) FROM mytable WHERE LateAircraftDelay <> 209 OR TaxiIn BETWEEN 7 AND 49 GROUP BY DepartureDelayGroups, ActualElapsedTime LIMIT 5"]}
-{"sql":"SELECT WheelsOff, ArrDelayMinutes, Cancelled, MAX(NASDelay), AVG(DepDelay) FROM mytable WHERE DepDel15 IN (-9999) OR DivTailNums IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') GROUP BY WheelsOff, ArrDelayMinutes, Cancelled LIMIT 24","hsqls":["SELECT WheelsOff, ArrDelayMinutes, Cancelled, MAX(NASDelay), AVG(DepDelay) FROM mytable WHERE DepDel15 IN (-9999) OR (DivTailNums__MV0 IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums__MV1 IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums__MV2 IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums__MV3 IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums__MV4 IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB')) GROUP BY WheelsOff, ArrDelayMinutes, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, ActualElapsedTime, MIN(DivActualElapsedTime), AVG(DestStateFips), SUM(\"Month\") FROM mytable WHERE LateAircraftDelay <> 209 OR TaxiIn BETWEEN 7 AND 49 GROUP BY DepartureDelayGroups, ActualElapsedTime LIMIT 5","hsqls":["SELECT DepartureDelayGroups, ActualElapsedTime, MIN(DivActualElapsedTime), AVG(DestStateFips), SUM(`Month`) FROM mytable WHERE LateAircraftDelay <> 209 OR TaxiIn BETWEEN 7 AND 49 GROUP BY DepartureDelayGroups, ActualElapsedTime LIMIT 5"]}
+{"sql":"SELECT WheelsOff, ArrDelayMinutes, Cancelled, MAX(NASDelay), AVG(DepDelay) FROM mytable WHERE DepDel15 IN (-9999) OR DivTailNums IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') GROUP BY WheelsOff, ArrDelayMinutes, Cancelled LIMIT 24","hsqls":["SELECT WheelsOff, ArrDelayMinutes, Cancelled, MAX(NASDelay), AVG(DepDelay) FROM mytable WHERE DepDel15 IN (-9999) OR (DivTailNums[1] IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums[2] IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums[3] IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums[4] IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB') OR DivTailNums[5] IN ('N14950', 'N783SK', 'N417UA', 'N12996', 'N589JB')) GROUP BY WheelsOff, ArrDelayMinutes, Cancelled LIMIT 10000"]}
 {"sql":"SELECT MIN(DestCityMarketID), MAX(CRSDepTime) FROM mytable WHERE OriginStateFips > 8 LIMIT 13"}
-{"sql":"SELECT DivDistance, DivAirports, SecurityDelay FROM mytable WHERE ArrDelay IN (23.0, 84.0, 307.0, 7.0) OR CarrierDelay BETWEEN 2 AND 266 OR DestWac BETWEEN 91 AND 65 ORDER BY FlightNum, DepTimeBlk LIMIT 18","hsqls":["SELECT DivDistance, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, SecurityDelay FROM mytable WHERE ArrDelay IN (23.0, 84.0, 307.0, 7.0) OR CarrierDelay BETWEEN 2 AND 266 OR DestWac BETWEEN 91 AND 65 ORDER BY FlightNum, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(\"Month\") FROM mytable LIMIT 24","hsqls":["SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(Month) FROM mytable LIMIT 24"]}
+{"sql":"SELECT DivDistance, DivAirports, SecurityDelay FROM mytable WHERE ArrDelay IN (23.0, 84.0, 307.0, 7.0) OR CarrierDelay BETWEEN 2 AND 266 OR DestWac BETWEEN 91 AND 65 ORDER BY FlightNum, DepTimeBlk LIMIT 18","hsqls":["SELECT DivDistance, DivAirports, SecurityDelay FROM mytable WHERE ArrDelay IN (23.0, 84.0, 307.0, 7.0) OR CarrierDelay BETWEEN 2 AND 266 OR DestWac BETWEEN 91 AND 65 ORDER BY FlightNum, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(\"Month\") FROM mytable LIMIT 24","hsqls":["SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(`Month`) FROM mytable LIMIT 24"]}
 {"sql":"SELECT MIN(TotalAddGTime), MAX(CRSArrTime) FROM mytable LIMIT 26"}
-{"sql":"SELECT ArrTimeBlk, ArrDelay FROM mytable WHERE DivTotalGTimes <= 23 OR DepTime BETWEEN 1749 AND 630 AND FlightNum = 5511 ORDER BY ArrTimeBlk LIMIT 1","hsqls":["SELECT ArrTimeBlk, ArrDelay FROM mytable WHERE (DivTotalGTimes__MV0 <= 23 OR DivTotalGTimes__MV1 <= 23 OR DivTotalGTimes__MV2 <= 23 OR DivTotalGTimes__MV3 <= 23 OR DivTotalGTimes__MV4 <= 23) OR DepTime BETWEEN 1749 AND 630 AND FlightNum = 5511 ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, ArrDelay FROM mytable WHERE DivTotalGTimes <= 23 OR DepTime BETWEEN 1749 AND 630 AND FlightNum = 5511 ORDER BY ArrTimeBlk LIMIT 1","hsqls":["SELECT ArrTimeBlk, ArrDelay FROM mytable WHERE (DivTotalGTimes[1] <= 23 OR DivTotalGTimes[2] <= 23 OR DivTotalGTimes[3] <= 23 OR DivTotalGTimes[4] <= 23 OR DivTotalGTimes[5] <= 23) OR DepTime BETWEEN 1749 AND 630 AND FlightNum = 5511 ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DepDelay, FirstDepTime, DepTime FROM mytable ORDER BY CRSArrTime, TaxiIn, Dest LIMIT 7"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable ORDER BY Carrier LIMIT 29"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 7"}
 {"sql":"SELECT Quarter, DivArrDelay FROM mytable WHERE DepDelay NOT IN (48.0) OR DaysSinceEpoch BETWEEN 16097 AND 16083 ORDER BY \"Year\", DivAirportLandings LIMIT 4","hsqls":["SELECT Quarter, DivArrDelay FROM mytable WHERE DepDelay NOT IN (48.0) OR DaysSinceEpoch BETWEEN 16097 AND 16083 ORDER BY Year, DivAirportLandings LIMIT 4"]}
 {"sql":"SELECT LongestAddGTime, AirTime FROM mytable ORDER BY OriginCityName, OriginAirportID LIMIT 23"}
-{"sql":"SELECT DivReachedDest, WeatherDelay, AVG(ArrTime), SUM(\"Month\") FROM mytable WHERE DestCityName BETWEEN 'Nashville, TN' AND 'Butte, MT' AND DestStateFips NOT IN (9) GROUP BY DivReachedDest, WeatherDelay LIMIT 2","hsqls":["SELECT DivReachedDest, WeatherDelay, AVG(ArrTime), SUM(Month) FROM mytable WHERE DestCityName BETWEEN 'Nashville, TN' AND 'Butte, MT' AND DestStateFips NOT IN (9) GROUP BY DivReachedDest, WeatherDelay LIMIT 2"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 125.0 AND 83.0 OR DivWheelsOffs BETWEEN 2307 AND 923 LIMIT 27","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 125.0 AND 83.0 OR (DivWheelsOffs__MV0 BETWEEN 2307 AND 923 OR DivWheelsOffs__MV1 BETWEEN 2307 AND 923 OR DivWheelsOffs__MV2 BETWEEN 2307 AND 923 OR DivWheelsOffs__MV3 BETWEEN 2307 AND 923 OR DivWheelsOffs__MV4 BETWEEN 2307 AND 923) LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, WeatherDelay, AVG(ArrTime), SUM(\"Month\") FROM mytable WHERE DestCityName BETWEEN 'Nashville, TN' AND 'Butte, MT' AND DestStateFips NOT IN (9) GROUP BY DivReachedDest, WeatherDelay LIMIT 2","hsqls":["SELECT DivReachedDest, WeatherDelay, AVG(ArrTime), SUM(`Month`) FROM mytable WHERE DestCityName BETWEEN 'Nashville, TN' AND 'Butte, MT' AND DestStateFips NOT IN (9) GROUP BY DivReachedDest, WeatherDelay LIMIT 2"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 125.0 AND 83.0 OR DivWheelsOffs BETWEEN 2307 AND 923 LIMIT 27","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 125.0 AND 83.0 OR (DivWheelsOffs[1] BETWEEN 2307 AND 923 OR DivWheelsOffs[2] BETWEEN 2307 AND 923 OR DivWheelsOffs[3] BETWEEN 2307 AND 923 OR DivWheelsOffs[4] BETWEEN 2307 AND 923 OR DivWheelsOffs[5] BETWEEN 2307 AND 923) LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, FlightDate, ArrDel15, COUNT(OriginCityMarketID), MAX(FlightNum) FROM mytable WHERE DestAirportID NOT IN (13388, 14689, 13891, 14783, 11337) OR ArrTime NOT IN (17) OR Flights <> 1 GROUP BY DistanceGroup, FlightDate, ArrDel15  ORDER BY DistanceGroup, FlightDate, ArrDel15 LIMIT 7","hsqls":["SELECT DistanceGroup, FlightDate, ArrDel15, COUNT(OriginCityMarketID), MAX(FlightNum) FROM mytable WHERE DestAirportID NOT IN (13388, 14689, 13891, 14783, 11337) OR ArrTime NOT IN (17) OR Flights <> 1 GROUP BY DistanceGroup, FlightDate, ArrDel15  ORDER BY DistanceGroup, FlightDate, ArrDel15 LIMIT 7"]}
 {"sql":"SELECT Cancelled, ArrTimeBlk, AVG(CRSArrTime) FROM mytable WHERE DivDistance = 483 AND DayOfWeek IN (3, 7, 5) AND DepTime BETWEEN 506 AND 1002 GROUP BY Cancelled, ArrTimeBlk  ORDER BY Cancelled, ArrTimeBlk LIMIT 1","hsqls":["SELECT Cancelled, ArrTimeBlk, AVG(CRSArrTime) FROM mytable WHERE DivDistance = 483 AND DayOfWeek IN (3, 7, 5) AND DepTime BETWEEN 506 AND 1002 GROUP BY Cancelled, ArrTimeBlk  ORDER BY Cancelled, ArrTimeBlk LIMIT 1"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY ArrDelayMinutes, AirTime LIMIT 21"}
-{"sql":"SELECT DepDelay, CRSArrTime, DivArrDelay FROM mytable WHERE DivWheelsOns < 1115 ORDER BY DistanceGroup, FirstDepTime, CRSDepTime LIMIT 12","hsqls":["SELECT DepDelay, CRSArrTime, DivArrDelay FROM mytable WHERE (DivWheelsOns__MV0 < 1115 OR DivWheelsOns__MV1 < 1115 OR DivWheelsOns__MV2 < 1115 OR DivWheelsOns__MV3 < 1115 OR DivWheelsOns__MV4 < 1115) ORDER BY DistanceGroup, FirstDepTime, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT Cancelled, Dest, OriginStateName, SUM(\"Month\"), MAX(OriginWac) FROM mytable GROUP BY Cancelled, Dest, OriginStateName LIMIT 14","hsqls":["SELECT Cancelled, Dest, OriginStateName, SUM(Month), MAX(OriginWac) FROM mytable GROUP BY Cancelled, Dest, OriginStateName LIMIT 14"]}
+{"sql":"SELECT DepDelay, CRSArrTime, DivArrDelay FROM mytable WHERE DivWheelsOns < 1115 ORDER BY DistanceGroup, FirstDepTime, CRSDepTime LIMIT 12","hsqls":["SELECT DepDelay, CRSArrTime, DivArrDelay FROM mytable WHERE (DivWheelsOns[1] < 1115 OR DivWheelsOns[2] < 1115 OR DivWheelsOns[3] < 1115 OR DivWheelsOns[4] < 1115 OR DivWheelsOns[5] < 1115) ORDER BY DistanceGroup, FirstDepTime, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT Cancelled, Dest, OriginStateName, SUM(\"Month\"), MAX(OriginWac) FROM mytable GROUP BY Cancelled, Dest, OriginStateName LIMIT 14","hsqls":["SELECT Cancelled, Dest, OriginStateName, SUM(`Month`), MAX(OriginWac) FROM mytable GROUP BY Cancelled, Dest, OriginStateName LIMIT 14"]}
 {"sql":"SELECT OriginState, DepDelay FROM mytable WHERE ArrDelayMinutes IN (114.0, 129.0, 57.0, 188.0, 26.0) ORDER BY Flights, UniqueCarrier LIMIT 19"}
-{"sql":"SELECT TaxiOut FROM mytable WHERE WheelsOff = 649 ORDER BY \"Month\" LIMIT 24","hsqls":["SELECT TaxiOut FROM mytable WHERE WheelsOff = 649 ORDER BY Month LIMIT 24"]}
+{"sql":"SELECT TaxiOut FROM mytable WHERE WheelsOff = 649 ORDER BY \"Month\" LIMIT 24","hsqls":["SELECT TaxiOut FROM mytable WHERE WheelsOff = 649 ORDER BY `Month` LIMIT 24"]}
 {"sql":"SELECT Carrier, AirlineID FROM mytable WHERE DayOfWeek BETWEEN 4 AND 6 AND ArrDelayMinutes NOT IN (143.0) OR FlightDate BETWEEN '2014-01-11' AND '2014-01-18' LIMIT 21"}
 {"sql":"SELECT DivDistance, MIN(LongestAddGTime) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 24","hsqls":["SELECT DivDistance, MIN(LongestAddGTime) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 24"]}
 {"sql":"SELECT COUNT(ArrDelayMinutes), SUM(SecurityDelay) FROM mytable LIMIT 11"}
-{"sql":"SELECT OriginStateFips, DestCityMarketID, COUNT(DestCityMarketID), AVG(WheelsOn) FROM mytable WHERE WeatherDelay NOT IN (2, 10) AND \"Month\" BETWEEN 1 AND 1 AND DivArrDelay BETWEEN 1020 AND 84 GROUP BY OriginStateFips, DestCityMarketID LIMIT 16","hsqls":["SELECT OriginStateFips, DestCityMarketID, COUNT(DestCityMarketID), AVG(WheelsOn) FROM mytable WHERE WeatherDelay NOT IN (2, 10) AND Month BETWEEN 1 AND 1 AND DivArrDelay BETWEEN 1020 AND 84 GROUP BY OriginStateFips, DestCityMarketID LIMIT 16"]}
+{"sql":"SELECT OriginStateFips, DestCityMarketID, COUNT(DestCityMarketID), AVG(WheelsOn) FROM mytable WHERE WeatherDelay NOT IN (2, 10) AND \"Month\" BETWEEN 1 AND 1 AND DivArrDelay BETWEEN 1020 AND 84 GROUP BY OriginStateFips, DestCityMarketID LIMIT 16","hsqls":["SELECT OriginStateFips, DestCityMarketID, COUNT(DestCityMarketID), AVG(WheelsOn) FROM mytable WHERE WeatherDelay NOT IN (2, 10) AND `Month` BETWEEN 1 AND 1 AND DivArrDelay BETWEEN 1020 AND 84 GROUP BY OriginStateFips, DestCityMarketID LIMIT 16"]}
 {"sql":"SELECT WheelsOff, Carrier, DepDelayMinutes, MIN(DepDelayMinutes), AVG(DivArrDelay) FROM mytable GROUP BY WheelsOff, Carrier, DepDelayMinutes  ORDER BY WheelsOff, Carrier, DepDelayMinutes LIMIT 9","hsqls":["SELECT WheelsOff, Carrier, DepDelayMinutes, MIN(DepDelayMinutes), AVG(DivArrDelay) FROM mytable GROUP BY WheelsOff, Carrier, DepDelayMinutes  ORDER BY WheelsOff, Carrier, DepDelayMinutes LIMIT 9"]}
 {"sql":"SELECT CarrierDelay, DestCityMarketID FROM mytable ORDER BY DestStateName LIMIT 9"}
-{"sql":"SELECT DivDistance, SecurityDelay, COUNT(*) FROM mytable WHERE DivAirportSeqIDs > 1336703 OR CancellationCode NOT IN ('A', 'C', 'noodles') GROUP BY DivDistance, SecurityDelay LIMIT 27","hsqls":["SELECT DivDistance, SecurityDelay, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 > 1336703 OR DivAirportSeqIDs__MV1 > 1336703 OR DivAirportSeqIDs__MV2 > 1336703 OR DivAirportSeqIDs__MV3 > 1336703 OR DivAirportSeqIDs__MV4 > 1336703) OR CancellationCode NOT IN ('A', 'C', 'noodles') GROUP BY DivDistance, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivDistance, SecurityDelay, COUNT(*) FROM mytable WHERE DivAirportSeqIDs > 1336703 OR CancellationCode NOT IN ('A', 'C', 'noodles') GROUP BY DivDistance, SecurityDelay LIMIT 27","hsqls":["SELECT DivDistance, SecurityDelay, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] > 1336703 OR DivAirportSeqIDs[2] > 1336703 OR DivAirportSeqIDs[3] > 1336703 OR DivAirportSeqIDs[4] > 1336703 OR DivAirportSeqIDs[5] > 1336703) OR CancellationCode NOT IN ('A', 'C', 'noodles') GROUP BY DivDistance, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest FROM mytable ORDER BY ArrDelayMinutes, DayOfWeek LIMIT 24"}
-{"sql":"SELECT WeatherDelay, TotalAddGTime FROM mytable WHERE \"Year\" IN (2014) LIMIT 26","hsqls":["SELECT WeatherDelay, TotalAddGTime FROM mytable WHERE Year IN (2014) LIMIT 26"]}
+{"sql":"SELECT WeatherDelay, TotalAddGTime FROM mytable WHERE \"Year\" IN (2014) LIMIT 26","hsqls":["SELECT WeatherDelay, TotalAddGTime FROM mytable WHERE `Year` IN (2014) LIMIT 26"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Flights IN (1) OR DivActualElapsedTime BETWEEN 937 AND 391 LIMIT 23"}
-{"sql":"SELECT OriginState, COUNT(Origin) FROM mytable WHERE DivTotalGTimes <= 65 GROUP BY OriginState LIMIT 3","hsqls":["SELECT OriginState, COUNT(Origin) FROM mytable WHERE (DivTotalGTimes__MV0 <= 65 OR DivTotalGTimes__MV1 <= 65 OR DivTotalGTimes__MV2 <= 65 OR DivTotalGTimes__MV3 <= 65 OR DivTotalGTimes__MV4 <= 65) GROUP BY OriginState LIMIT 10000"]}
+{"sql":"SELECT OriginState, COUNT(Origin) FROM mytable WHERE DivTotalGTimes <= 65 GROUP BY OriginState LIMIT 3","hsqls":["SELECT OriginState, COUNT(Origin) FROM mytable WHERE (DivTotalGTimes[1] <= 65 OR DivTotalGTimes[2] <= 65 OR DivTotalGTimes[3] <= 65 OR DivTotalGTimes[4] <= 65 OR DivTotalGTimes[5] <= 65) GROUP BY OriginState LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, OriginStateName, SUM(ArrDelay), AVG(FirstDepTime) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 OR DistanceGroup BETWEEN 3 AND 9 AND ArrDel15 IN (1, 0, -9999) GROUP BY DepDelayMinutes, OriginStateName  ORDER BY DepDelayMinutes, OriginStateName LIMIT 12","hsqls":["SELECT DepDelayMinutes, OriginStateName, SUM(ArrDelay), AVG(FirstDepTime) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 OR DistanceGroup BETWEEN 3 AND 9 AND ArrDel15 IN (1, 0, -9999) GROUP BY DepDelayMinutes, OriginStateName  ORDER BY DepDelayMinutes, OriginStateName LIMIT 12"]}
-{"sql":"SELECT DivAirportIDs, AirlineID FROM mytable WHERE DivAirportSeqIDs > 1120302 ORDER BY DistanceGroup, DestStateFips, TaxiIn LIMIT 21","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirlineID FROM mytable WHERE (DivAirportSeqIDs__MV0 > 1120302 OR DivAirportSeqIDs__MV1 > 1120302 OR DivAirportSeqIDs__MV2 > 1120302 OR DivAirportSeqIDs__MV3 > 1120302 OR DivAirportSeqIDs__MV4 > 1120302) ORDER BY DistanceGroup, DestStateFips, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, AirlineID FROM mytable WHERE DivAirportSeqIDs > 1120302 ORDER BY DistanceGroup, DestStateFips, TaxiIn LIMIT 21","hsqls":["SELECT DivAirportIDs, AirlineID FROM mytable WHERE (DivAirportSeqIDs[1] > 1120302 OR DivAirportSeqIDs[2] > 1120302 OR DivAirportSeqIDs[3] > 1120302 OR DivAirportSeqIDs[4] > 1120302 OR DivAirportSeqIDs[5] > 1120302) ORDER BY DistanceGroup, DestStateFips, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT MAX(LateAircraftDelay) FROM mytable LIMIT 2"}
 {"sql":"SELECT AirTime, MIN(DestWac), SUM(TotalAddGTime) FROM mytable WHERE DepTime <= 906 AND DivDistance BETWEEN 136 AND 138 GROUP BY AirTime  ORDER BY AirTime LIMIT 23","hsqls":["SELECT AirTime, MIN(DestWac), SUM(TotalAddGTime) FROM mytable WHERE DepTime <= 906 AND DivDistance BETWEEN 136 AND 138 GROUP BY AirTime  ORDER BY AirTime LIMIT 23"]}
 {"sql":"SELECT DepTime, OriginCityName, MAX(NASDelay) FROM mytable WHERE DivDistance BETWEEN 483 AND 159 AND OriginAirportID <> 14683 GROUP BY DepTime, OriginCityName  ORDER BY DepTime, OriginCityName LIMIT 22","hsqls":["SELECT DepTime, OriginCityName, MAX(NASDelay) FROM mytable WHERE DivDistance BETWEEN 483 AND 159 AND OriginAirportID <> 14683 GROUP BY DepTime, OriginCityName  ORDER BY DepTime, OriginCityName LIMIT 22"]}
-{"sql":"SELECT Flights, OriginCityMarketID, DestCityMarketID, MIN(OriginAirportSeqID), SUM(\"Month\"), MAX(Distance) FROM mytable WHERE Diverted BETWEEN 1 AND 0 GROUP BY Flights, OriginCityMarketID, DestCityMarketID LIMIT 16","hsqls":["SELECT Flights, OriginCityMarketID, DestCityMarketID, MIN(OriginAirportSeqID), SUM(Month), MAX(Distance) FROM mytable WHERE Diverted BETWEEN 1 AND 0 GROUP BY Flights, OriginCityMarketID, DestCityMarketID LIMIT 16"]}
+{"sql":"SELECT Flights, OriginCityMarketID, DestCityMarketID, MIN(OriginAirportSeqID), SUM(\"Month\"), MAX(Distance) FROM mytable WHERE Diverted BETWEEN 1 AND 0 GROUP BY Flights, OriginCityMarketID, DestCityMarketID LIMIT 16","hsqls":["SELECT Flights, OriginCityMarketID, DestCityMarketID, MIN(OriginAirportSeqID), SUM(`Month`), MAX(Distance) FROM mytable WHERE Diverted BETWEEN 1 AND 0 GROUP BY Flights, OriginCityMarketID, DestCityMarketID LIMIT 16"]}
 {"sql":"SELECT OriginState, Quarter, UniqueCarrier FROM mytable WHERE AirlineID BETWEEN 19690 AND 19930 AND ArrTimeBlk NOT IN ('2000-2059', '2200-2259', '2300-2359', '1200-1259', '1800-1859') ORDER BY DepartureDelayGroups, WeatherDelay, CancellationCode LIMIT 24"}
 {"sql":"SELECT ArrDelay FROM mytable ORDER BY TotalAddGTime, Dest, DivActualElapsedTime LIMIT 1"}
 {"sql":"SELECT MAX(DestWac) FROM mytable WHERE DaysSinceEpoch = 16088 LIMIT 28"}
@@ -5651,53 +5651,53 @@
 {"sql":"SELECT OriginAirportSeqID, Distance, Dest FROM mytable WHERE FlightNum < 4305 AND DepDelayMinutes < 134.0 OR ArrTime NOT IN (1833, 637, 1136, 1606, 1835) LIMIT 27"}
 {"sql":"SELECT Carrier, DepDel15, DivArrDelay, COUNT(*) FROM mytable WHERE DepDelay <> 35.0 OR OriginAirportSeqID BETWEEN 1457002 AND 1489302 GROUP BY Carrier, DepDel15, DivArrDelay  ORDER BY Carrier, DepDel15, DivArrDelay LIMIT 17","hsqls":["SELECT Carrier, DepDel15, DivArrDelay, COUNT(*) FROM mytable WHERE DepDelay <> 35.0 OR OriginAirportSeqID BETWEEN 1457002 AND 1489302 GROUP BY Carrier, DepDel15, DivArrDelay  ORDER BY Carrier, DepDel15, DivArrDelay LIMIT 17"]}
 {"sql":"SELECT TailNum, COUNT(OriginWac), SUM(DaysSinceEpoch), MAX(WeatherDelay) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 26","hsqls":["SELECT TailNum, COUNT(OriginWac), SUM(DaysSinceEpoch), MAX(WeatherDelay) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 26"]}
-{"sql":"SELECT Diverted, DepDel15, DivArrDelay, COUNT(ActualElapsedTime), MIN(CRSArrTime), AVG(DepartureDelayGroups) FROM mytable WHERE Cancelled NOT IN (0) OR DayOfWeek IN (6, 5) AND DivLongestGTimes BETWEEN 136.0 AND 6.0 GROUP BY Diverted, DepDel15, DivArrDelay LIMIT 27","hsqls":["SELECT Diverted, DepDel15, DivArrDelay, COUNT(ActualElapsedTime), MIN(CRSArrTime), AVG(DepartureDelayGroups) FROM mytable WHERE Cancelled NOT IN (0) OR DayOfWeek IN (6, 5) AND (DivLongestGTimes__MV0 BETWEEN 136.0 AND 6.0 OR DivLongestGTimes__MV1 BETWEEN 136.0 AND 6.0 OR DivLongestGTimes__MV2 BETWEEN 136.0 AND 6.0 OR DivLongestGTimes__MV3 BETWEEN 136.0 AND 6.0 OR DivLongestGTimes__MV4 BETWEEN 136.0 AND 6.0) GROUP BY Diverted, DepDel15, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT Diverted, DepDel15, DivArrDelay, COUNT(ActualElapsedTime), MIN(CRSArrTime), AVG(DepartureDelayGroups) FROM mytable WHERE Cancelled NOT IN (0) OR DayOfWeek IN (6, 5) AND DivLongestGTimes BETWEEN 136.0 AND 6.0 GROUP BY Diverted, DepDel15, DivArrDelay LIMIT 27","hsqls":["SELECT Diverted, DepDel15, DivArrDelay, COUNT(ActualElapsedTime), MIN(CRSArrTime), AVG(DepartureDelayGroups) FROM mytable WHERE Cancelled NOT IN (0) OR DayOfWeek IN (6, 5) AND (DivLongestGTimes[1] BETWEEN 136.0 AND 6.0 OR DivLongestGTimes[2] BETWEEN 136.0 AND 6.0 OR DivLongestGTimes[3] BETWEEN 136.0 AND 6.0 OR DivLongestGTimes[4] BETWEEN 136.0 AND 6.0 OR DivLongestGTimes[5] BETWEEN 136.0 AND 6.0) GROUP BY Diverted, DepDel15, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT Dest, MAX(Cancelled) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 16","hsqls":["SELECT Dest, MAX(Cancelled) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 16"]}
 {"sql":"SELECT CRSArrTime, DestAirportSeqID, MAX(DestAirportSeqID), MIN(Cancelled) FROM mytable WHERE CRSElapsedTime < 51 GROUP BY CRSArrTime, DestAirportSeqID  ORDER BY CRSArrTime, DestAirportSeqID LIMIT 20","hsqls":["SELECT CRSArrTime, DestAirportSeqID, MAX(DestAirportSeqID), MIN(Cancelled) FROM mytable WHERE CRSElapsedTime < 51 GROUP BY CRSArrTime, DestAirportSeqID  ORDER BY CRSArrTime, DestAirportSeqID LIMIT 20"]}
 {"sql":"SELECT DepDel15 FROM mytable WHERE Flights IN (1) OR Carrier > 'UA' ORDER BY DestState LIMIT 3"}
 {"sql":"SELECT Quarter, Distance, DaysSinceEpoch FROM mytable WHERE WheelsOn > 1557 ORDER BY WheelsOn LIMIT 6"}
 {"sql":"SELECT Quarter FROM mytable LIMIT 19"}
 {"sql":"SELECT Carrier FROM mytable WHERE DepDelayMinutes <= 101.0 LIMIT 7"}
-{"sql":"SELECT DestCityMarketID, MAX(DepartureDelayGroups), MAX(Distance) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR ArrTime IN (2224, 1744, 557, 525) OR ArrDel15 NOT IN (1, 0, -9999) GROUP BY DestCityMarketID LIMIT 28","hsqls":["SELECT DestCityMarketID, MAX(DepartureDelayGroups), MAX(Distance) FROM mytable WHERE Month BETWEEN 1 AND 1 OR ArrTime IN (2224, 1744, 557, 525) OR ArrDel15 NOT IN (1, 0, -9999) GROUP BY DestCityMarketID LIMIT 28"]}
+{"sql":"SELECT DestCityMarketID, MAX(DepartureDelayGroups), MAX(Distance) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR ArrTime IN (2224, 1744, 557, 525) OR ArrDel15 NOT IN (1, 0, -9999) GROUP BY DestCityMarketID LIMIT 28","hsqls":["SELECT DestCityMarketID, MAX(DepartureDelayGroups), MAX(Distance) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR ArrTime IN (2224, 1744, 557, 525) OR ArrDel15 NOT IN (1, 0, -9999) GROUP BY DestCityMarketID LIMIT 28"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE CRSArrTime >= 1707 AND TaxiOut = 16 ORDER BY OriginAirportSeqID, DepTimeBlk LIMIT 25"}
 {"sql":"SELECT DestState, DestAirportSeqID, ActualElapsedTime FROM mytable WHERE FlightDate BETWEEN '2014-01-10' AND '2014-01-11' OR DestStateFips BETWEEN 48 AND 55 OR OriginState NOT IN ('NH', 'SC') ORDER BY CRSArrTime LIMIT 15"}
 {"sql":"SELECT FlightDate, DivActualElapsedTime FROM mytable WHERE TotalAddGTime BETWEEN 47 AND 148 OR DestAirportID > 11298 ORDER BY DestState LIMIT 14"}
 {"sql":"SELECT DepDelayMinutes, OriginCityName, DivActualElapsedTime, SUM(WheelsOff), AVG(ArrivalDelayGroups), MIN(Distance) FROM mytable WHERE DivAirportLandings BETWEEN 0 AND 1 OR Dest BETWEEN 'HDN' AND 'DLH' AND Origin BETWEEN 'CIC' AND 'PAH' GROUP BY DepDelayMinutes, OriginCityName, DivActualElapsedTime  ORDER BY DepDelayMinutes, OriginCityName, DivActualElapsedTime LIMIT 22","hsqls":["SELECT DepDelayMinutes, OriginCityName, DivActualElapsedTime, SUM(WheelsOff), AVG(ArrivalDelayGroups), MIN(Distance) FROM mytable WHERE DivAirportLandings BETWEEN 0 AND 1 OR Dest BETWEEN 'HDN' AND 'DLH' AND Origin BETWEEN 'CIC' AND 'PAH' GROUP BY DepDelayMinutes, OriginCityName, DivActualElapsedTime  ORDER BY DepDelayMinutes, OriginCityName, DivActualElapsedTime LIMIT 22"]}
-{"sql":"SELECT Dest, AirTime, DivTotalGTimes FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 ORDER BY DepartureDelayGroups, FlightNum, Dest LIMIT 22","hsqls":["SELECT Dest, AirTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 ORDER BY DepartureDelayGroups, FlightNum, Dest LIMIT 10000"]}
+{"sql":"SELECT Dest, AirTime, DivTotalGTimes FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 ORDER BY DepartureDelayGroups, FlightNum, Dest LIMIT 22","hsqls":["SELECT Dest, AirTime, DivTotalGTimes FROM mytable WHERE SecurityDelay BETWEEN 27 AND 27 ORDER BY DepartureDelayGroups, FlightNum, Dest LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, DestAirportID, DivArrDelay FROM mytable WHERE DivAirportLandings IN (2, 9) ORDER BY OriginStateFips, OriginAirportID, DaysSinceEpoch LIMIT 25"}
 {"sql":"SELECT MAX(DepDelayMinutes) FROM mytable LIMIT 27"}
 {"sql":"SELECT CancellationCode, DaysSinceEpoch FROM mytable WHERE WheelsOn BETWEEN 658 AND 1214 OR ArrTimeBlk NOT IN ('1500-1559') ORDER BY DestAirportSeqID, UniqueCarrier LIMIT 27"}
 {"sql":"SELECT LateAircraftDelay, UniqueCarrier FROM mytable ORDER BY OriginAirportID LIMIT 9"}
 {"sql":"SELECT DepDelay, LongestAddGTime, TailNum FROM mytable WHERE DaysSinceEpoch BETWEEN 16076 AND 16101 AND OriginCityMarketID <= 30140 ORDER BY OriginCityMarketID LIMIT 27"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DivDistance BETWEEN 480 AND 159 ORDER BY DistanceGroup, WheelsOn LIMIT 5","hsqls":["SELECT Month FROM mytable WHERE DivDistance BETWEEN 480 AND 159 ORDER BY DistanceGroup, WheelsOn LIMIT 5"]}
-{"sql":"SELECT OriginCityMarketID, DivAirportSeqIDs FROM mytable WHERE Origin < 'BUR' LIMIT 24","hsqls":["SELECT OriginCityMarketID, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE Origin < 'BUR' LIMIT 10000"]}
-{"sql":"SELECT DestAirportID, ArrivalDelayGroups, COUNT(DepTimeBlk) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'Alaska' AND DivAirportSeqIDs IN (1288903, 1402702, 1451202, 1498603, 1334205) GROUP BY DestAirportID, ArrivalDelayGroups LIMIT 24","hsqls":["SELECT DestAirportID, ArrivalDelayGroups, COUNT(DepTimeBlk) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'Alaska' AND (DivAirportSeqIDs__MV0 IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs__MV1 IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs__MV2 IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs__MV3 IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs__MV4 IN (1288903, 1402702, 1451202, 1498603, 1334205)) GROUP BY DestAirportID, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DivDistance BETWEEN 480 AND 159 ORDER BY DistanceGroup, WheelsOn LIMIT 5","hsqls":["SELECT `Month` FROM mytable WHERE DivDistance BETWEEN 480 AND 159 ORDER BY DistanceGroup, WheelsOn LIMIT 5"]}
+{"sql":"SELECT OriginCityMarketID, DivAirportSeqIDs FROM mytable WHERE Origin < 'BUR' LIMIT 24","hsqls":["SELECT OriginCityMarketID, DivAirportSeqIDs FROM mytable WHERE Origin < 'BUR' LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, ArrivalDelayGroups, COUNT(DepTimeBlk) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'Alaska' AND DivAirportSeqIDs IN (1288903, 1402702, 1451202, 1498603, 1334205) GROUP BY DestAirportID, ArrivalDelayGroups LIMIT 24","hsqls":["SELECT DestAirportID, ArrivalDelayGroups, COUNT(DepTimeBlk) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'Alaska' AND (DivAirportSeqIDs[1] IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs[2] IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs[3] IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs[4] IN (1288903, 1402702, 1451202, 1498603, 1334205) OR DivAirportSeqIDs[5] IN (1288903, 1402702, 1451202, 1498603, 1334205)) GROUP BY DestAirportID, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Distance, DivArrDelay FROM mytable ORDER BY \"Year\", AirlineID LIMIT 26","hsqls":["SELECT TaxiOut, Distance, DivArrDelay FROM mytable ORDER BY Year, AirlineID LIMIT 26"]}
 {"sql":"SELECT AirlineID, UniqueCarrier FROM mytable LIMIT 19"}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DivAirportSeqIDs IN (1489302, 1479402, 1072102) AND DivActualElapsedTime BETWEEN 499 AND 278 LIMIT 3","hsqls":["SELECT WeatherDelay FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR (DivAirportSeqIDs__MV0 IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs__MV1 IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs__MV2 IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs__MV3 IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs__MV4 IN (1489302, 1479402, 1072102)) AND DivActualElapsedTime BETWEEN 499 AND 278 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DivAirportSeqIDs IN (1489302, 1479402, 1072102) AND DivActualElapsedTime BETWEEN 499 AND 278 LIMIT 3","hsqls":["SELECT WeatherDelay FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR (DivAirportSeqIDs[1] IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs[2] IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs[3] IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs[4] IN (1489302, 1479402, 1072102) OR DivAirportSeqIDs[5] IN (1489302, 1479402, 1072102)) AND DivActualElapsedTime BETWEEN 499 AND 278 LIMIT 10000"]}
 {"sql":"SELECT DepTime, CancellationCode, ArrDelay FROM mytable WHERE DepDelay BETWEEN 7.0 AND 190.0 OR CancellationCode IN ('B') ORDER BY Dest, OriginStateName LIMIT 1"}
 {"sql":"SELECT CRSDepTime FROM mytable ORDER BY DestWac, Diverted, ArrTime LIMIT 9"}
-{"sql":"SELECT TaxiOut, CancellationCode, DivArrDelay, AVG(DayofMonth), MAX(CRSElapsedTime) FROM mytable WHERE UniqueCarrier > 'AS' OR DivTailNums BETWEEN 'N8623F' AND 'N378SW' GROUP BY TaxiOut, CancellationCode, DivArrDelay LIMIT 28","hsqls":["SELECT TaxiOut, CancellationCode, DivArrDelay, AVG(DayofMonth), MAX(CRSElapsedTime) FROM mytable WHERE UniqueCarrier > 'AS' OR (DivTailNums__MV0 BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums__MV1 BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums__MV2 BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums__MV3 BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums__MV4 BETWEEN 'N8623F' AND 'N378SW') GROUP BY TaxiOut, CancellationCode, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, CancellationCode, DivArrDelay, AVG(DayofMonth), MAX(CRSElapsedTime) FROM mytable WHERE UniqueCarrier > 'AS' OR DivTailNums BETWEEN 'N8623F' AND 'N378SW' GROUP BY TaxiOut, CancellationCode, DivArrDelay LIMIT 28","hsqls":["SELECT TaxiOut, CancellationCode, DivArrDelay, AVG(DayofMonth), MAX(CRSElapsedTime) FROM mytable WHERE UniqueCarrier > 'AS' OR (DivTailNums[1] BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums[2] BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums[3] BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums[4] BETWEEN 'N8623F' AND 'N378SW' OR DivTailNums[5] BETWEEN 'N8623F' AND 'N378SW') GROUP BY TaxiOut, CancellationCode, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, Cancelled, OriginWac FROM mytable WHERE ArrTime < 635 AND LongestAddGTime <> 27 LIMIT 27"}
-{"sql":"SELECT WheelsOn, MAX(\"Year\"), COUNT(TailNum) FROM mytable WHERE OriginAirportID IN (11641) AND ArrTime BETWEEN 57 AND 2031 GROUP BY WheelsOn LIMIT 20","hsqls":["SELECT WheelsOn, MAX(Year), COUNT(TailNum) FROM mytable WHERE OriginAirportID IN (11641) AND ArrTime BETWEEN 57 AND 2031 GROUP BY WheelsOn LIMIT 20"]}
+{"sql":"SELECT WheelsOn, MAX(\"Year\"), COUNT(TailNum) FROM mytable WHERE OriginAirportID IN (11641) AND ArrTime BETWEEN 57 AND 2031 GROUP BY WheelsOn LIMIT 20","hsqls":["SELECT WheelsOn, MAX(`Year`), COUNT(TailNum) FROM mytable WHERE OriginAirportID IN (11641) AND ArrTime BETWEEN 57 AND 2031 GROUP BY WheelsOn LIMIT 20"]}
 {"sql":"SELECT \"Year\", TaxiIn, TailNum FROM mytable WHERE OriginCityName NOT IN ('Amarillo, TX', 'Islip, NY', 'Palm Springs, CA') ORDER BY OriginAirportID LIMIT 24","hsqls":["SELECT Year, TaxiIn, TailNum FROM mytable WHERE OriginCityName NOT IN ('Amarillo, TX', 'Islip, NY', 'Palm Springs, CA') ORDER BY OriginAirportID LIMIT 24"]}
 {"sql":"SELECT DestState, Cancelled, TailNum FROM mytable WHERE ArrTimeBlk IN ('1000-1059', '2100-2159', '0600-0659', '1200-1259', '1800-1859') OR OriginAirportSeqID BETWEEN 1186502 AND 1131502 ORDER BY ArrTime LIMIT 10"}
-{"sql":"SELECT DepDelay, LongestAddGTime, DepDel15, MAX(DepTime), SUM(DestWac), MAX(CRSElapsedTime) FROM mytable WHERE Cancelled <= 1 OR DivAirportSeqIDs > 1482802 OR DestAirportSeqID IN (1445702, 1052904, 1484304, 1075402) GROUP BY DepDelay, LongestAddGTime, DepDel15 LIMIT 28","hsqls":["SELECT DepDelay, LongestAddGTime, DepDel15, MAX(DepTime), SUM(DestWac), MAX(CRSElapsedTime) FROM mytable WHERE Cancelled <= 1 OR (DivAirportSeqIDs__MV0 > 1482802 OR DivAirportSeqIDs__MV1 > 1482802 OR DivAirportSeqIDs__MV2 > 1482802 OR DivAirportSeqIDs__MV3 > 1482802 OR DivAirportSeqIDs__MV4 > 1482802) OR DestAirportSeqID IN (1445702, 1052904, 1484304, 1075402) GROUP BY DepDelay, LongestAddGTime, DepDel15 LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE DestWac <> 38 ORDER BY OriginState, DestAirportSeqID LIMIT 15","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DestWac <> 38 ORDER BY OriginState, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DepDelay, LongestAddGTime, DepDel15, MAX(DepTime), SUM(DestWac), MAX(CRSElapsedTime) FROM mytable WHERE Cancelled <= 1 OR DivAirportSeqIDs > 1482802 OR DestAirportSeqID IN (1445702, 1052904, 1484304, 1075402) GROUP BY DepDelay, LongestAddGTime, DepDel15 LIMIT 28","hsqls":["SELECT DepDelay, LongestAddGTime, DepDel15, MAX(DepTime), SUM(DestWac), MAX(CRSElapsedTime) FROM mytable WHERE Cancelled <= 1 OR (DivAirportSeqIDs[1] > 1482802 OR DivAirportSeqIDs[2] > 1482802 OR DivAirportSeqIDs[3] > 1482802 OR DivAirportSeqIDs[4] > 1482802 OR DivAirportSeqIDs[5] > 1482802) OR DestAirportSeqID IN (1445702, 1052904, 1484304, 1075402) GROUP BY DepDelay, LongestAddGTime, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DestWac <> 38 ORDER BY OriginState, DestAirportSeqID LIMIT 15","hsqls":["SELECT DivAirports FROM mytable WHERE DestWac <> 38 ORDER BY OriginState, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT Origin, DestAirportID FROM mytable WHERE Carrier <= 'WN' ORDER BY DepDelay, LateAircraftDelay, DestStateName LIMIT 14"}
-{"sql":"SELECT DepDelayMinutes, CarrierDelay, NASDelay FROM mytable WHERE DivTotalGTimes BETWEEN 47 AND 80 OR DepTime IN (822, 1447, 655) OR WheelsOn BETWEEN 2029 AND 829 ORDER BY Dest LIMIT 27","hsqls":["SELECT DepDelayMinutes, CarrierDelay, NASDelay FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 47 AND 80 OR DivTotalGTimes__MV1 BETWEEN 47 AND 80 OR DivTotalGTimes__MV2 BETWEEN 47 AND 80 OR DivTotalGTimes__MV3 BETWEEN 47 AND 80 OR DivTotalGTimes__MV4 BETWEEN 47 AND 80) OR DepTime IN (822, 1447, 655) OR WheelsOn BETWEEN 2029 AND 829 ORDER BY Dest LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, CarrierDelay, NASDelay FROM mytable WHERE DivTotalGTimes BETWEEN 47 AND 80 OR DepTime IN (822, 1447, 655) OR WheelsOn BETWEEN 2029 AND 829 ORDER BY Dest LIMIT 27","hsqls":["SELECT DepDelayMinutes, CarrierDelay, NASDelay FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 47 AND 80 OR DivTotalGTimes[2] BETWEEN 47 AND 80 OR DivTotalGTimes[3] BETWEEN 47 AND 80 OR DivTotalGTimes[4] BETWEEN 47 AND 80 OR DivTotalGTimes[5] BETWEEN 47 AND 80) OR DepTime IN (822, 1447, 655) OR WheelsOn BETWEEN 2029 AND 829 ORDER BY Dest LIMIT 10000"]}
 {"sql":"SELECT OriginState, Origin, COUNT(OriginStateName) FROM mytable WHERE OriginCityMarketID BETWEEN 30155 AND 34113 GROUP BY OriginState, Origin  ORDER BY OriginState, Origin LIMIT 4","hsqls":["SELECT OriginState, Origin, COUNT(OriginStateName) FROM mytable WHERE OriginCityMarketID BETWEEN 30155 AND 34113 GROUP BY OriginState, Origin  ORDER BY OriginState, Origin LIMIT 4"]}
 {"sql":"SELECT AirTime FROM mytable LIMIT 6"}
 {"sql":"SELECT DistanceGroup, Quarter, DivDistance FROM mytable WHERE FirstDepTime = 1136 AND DestAirportSeqID < 1323002 ORDER BY FirstDepTime, NASDelay, DayOfWeek LIMIT 23"}
 {"sql":"SELECT DestWac, ArrDel15, CRSDepTime FROM mytable ORDER BY DepDelay LIMIT 22"}
 {"sql":"SELECT DistanceGroup, CRSElapsedTime, AVG(DepDelay) FROM mytable GROUP BY DistanceGroup, CRSElapsedTime  ORDER BY DistanceGroup, CRSElapsedTime LIMIT 10","hsqls":["SELECT DistanceGroup, CRSElapsedTime, AVG(DepDelay) FROM mytable GROUP BY DistanceGroup, CRSElapsedTime  ORDER BY DistanceGroup, CRSElapsedTime LIMIT 10"]}
 {"sql":"SELECT DepDel15, DepTimeBlk, MIN(Diverted), MAX(AirTime), SUM(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 67 AND 53 OR ArrivalDelayGroups NOT IN (-1, 4) GROUP BY DepDel15, DepTimeBlk  ORDER BY DepDel15, DepTimeBlk LIMIT 10","hsqls":["SELECT DepDel15, DepTimeBlk, MIN(Diverted), MAX(AirTime), SUM(OriginStateFips) FROM mytable WHERE OriginWac BETWEEN 67 AND 53 OR ArrivalDelayGroups NOT IN (-1, 4) GROUP BY DepDel15, DepTimeBlk  ORDER BY DepDel15, DepTimeBlk LIMIT 10"]}
-{"sql":"SELECT CarrierDelay, Dest, CRSElapsedTime, COUNT(Cancelled), COUNT(DestAirportID), COUNT(CRSArrTime) FROM mytable WHERE OriginStateFips < 25 AND DivTailNums BETWEEN 'N434UA' AND 'N767AS' GROUP BY CarrierDelay, Dest, CRSElapsedTime LIMIT 29","hsqls":["SELECT CarrierDelay, Dest, CRSElapsedTime, COUNT(Cancelled), COUNT(DestAirportID), COUNT(CRSArrTime) FROM mytable WHERE OriginStateFips < 25 AND (DivTailNums__MV0 BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums__MV1 BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums__MV2 BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums__MV3 BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums__MV4 BETWEEN 'N434UA' AND 'N767AS') GROUP BY CarrierDelay, Dest, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE DivTotalGTimes < 136 OR OriginState BETWEEN 'AK' AND 'MN' ORDER BY FlightNum, OriginStateName LIMIT 15","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 < 136 OR DivTotalGTimes__MV1 < 136 OR DivTotalGTimes__MV2 < 136 OR DivTotalGTimes__MV3 < 136 OR DivTotalGTimes__MV4 < 136) OR OriginState BETWEEN 'AK' AND 'MN' ORDER BY FlightNum, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, Dest, CRSElapsedTime, COUNT(Cancelled), COUNT(DestAirportID), COUNT(CRSArrTime) FROM mytable WHERE OriginStateFips < 25 AND DivTailNums BETWEEN 'N434UA' AND 'N767AS' GROUP BY CarrierDelay, Dest, CRSElapsedTime LIMIT 29","hsqls":["SELECT CarrierDelay, Dest, CRSElapsedTime, COUNT(Cancelled), COUNT(DestAirportID), COUNT(CRSArrTime) FROM mytable WHERE OriginStateFips < 25 AND (DivTailNums[1] BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums[2] BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums[3] BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums[4] BETWEEN 'N434UA' AND 'N767AS' OR DivTailNums[5] BETWEEN 'N434UA' AND 'N767AS') GROUP BY CarrierDelay, Dest, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE DivTotalGTimes < 136 OR OriginState BETWEEN 'AK' AND 'MN' ORDER BY FlightNum, OriginStateName LIMIT 15","hsqls":["SELECT DivWheelsOns FROM mytable WHERE (DivTotalGTimes[1] < 136 OR DivTotalGTimes[2] < 136 OR DivTotalGTimes[3] < 136 OR DivTotalGTimes[4] < 136 OR DivTotalGTimes[5] < 136) OR OriginState BETWEEN 'AK' AND 'MN' ORDER BY FlightNum, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Distance, DepTime, COUNT(UniqueCarrier), SUM(ArrDelay), SUM(DestStateFips) FROM mytable GROUP BY Distance, DepTime  ORDER BY Distance, DepTime LIMIT 17","hsqls":["SELECT Distance, DepTime, COUNT(UniqueCarrier), SUM(ArrDelay), SUM(DestStateFips) FROM mytable GROUP BY Distance, DepTime  ORDER BY Distance, DepTime LIMIT 17"]}
 {"sql":"SELECT AVG(DayOfWeek) FROM mytable LIMIT 20"}
 {"sql":"SELECT DistanceGroup, OriginCityMarketID, ArrDel15, COUNT(*) FROM mytable GROUP BY DistanceGroup, OriginCityMarketID, ArrDel15  ORDER BY DistanceGroup, OriginCityMarketID, ArrDel15 LIMIT 1","hsqls":["SELECT DistanceGroup, OriginCityMarketID, ArrDel15, COUNT(*) FROM mytable GROUP BY DistanceGroup, OriginCityMarketID, ArrDel15  ORDER BY DistanceGroup, OriginCityMarketID, ArrDel15 LIMIT 1"]}
-{"sql":"SELECT LateAircraftDelay, Cancelled, Origin, SUM(DivArrDelay) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 18 AND \"Year\" BETWEEN 2014 AND 2014 GROUP BY LateAircraftDelay, Cancelled, Origin LIMIT 18","hsqls":["SELECT LateAircraftDelay, Cancelled, Origin, SUM(DivArrDelay) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 18 AND Year BETWEEN 2014 AND 2014 GROUP BY LateAircraftDelay, Cancelled, Origin LIMIT 18"]}
+{"sql":"SELECT LateAircraftDelay, Cancelled, Origin, SUM(DivArrDelay) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 18 AND \"Year\" BETWEEN 2014 AND 2014 GROUP BY LateAircraftDelay, Cancelled, Origin LIMIT 18","hsqls":["SELECT LateAircraftDelay, Cancelled, Origin, SUM(DivArrDelay) FROM mytable WHERE SecurityDelay BETWEEN 27 AND 18 AND `Year` BETWEEN 2014 AND 2014 GROUP BY LateAircraftDelay, Cancelled, Origin LIMIT 18"]}
 {"sql":"SELECT COUNT(DepDelay) FROM mytable WHERE DestStateName > 'Hawaii' AND Flights BETWEEN 1 AND 1 AND OriginCityName IN ('Traverse City, MI') LIMIT 28"}
 {"sql":"SELECT ArrDel15, DestAirportID, MAX(CarrierDelay), MAX(Quarter) FROM mytable WHERE OriginStateFips BETWEEN 34 AND 31 GROUP BY ArrDel15, DestAirportID  ORDER BY ArrDel15, DestAirportID LIMIT 20","hsqls":["SELECT ArrDel15, DestAirportID, MAX(CarrierDelay), MAX(Quarter) FROM mytable WHERE OriginStateFips BETWEEN 34 AND 31 GROUP BY ArrDel15, DestAirportID  ORDER BY ArrDel15, DestAirportID LIMIT 20"]}
 {"sql":"SELECT ArrTimeBlk, CancellationCode FROM mytable WHERE Origin < 'CMI' LIMIT 9"}
@@ -5705,10 +5705,10 @@
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 19"}
 {"sql":"SELECT Distance, ArrTimeBlk, DestStateName, MAX(DepartureDelayGroups), AVG(Cancelled) FROM mytable WHERE DestStateName BETWEEN 'Montana' AND 'U.S. Pacific Trust Territories and Possessions' GROUP BY Distance, ArrTimeBlk, DestStateName  ORDER BY Distance, ArrTimeBlk, DestStateName LIMIT 18","hsqls":["SELECT Distance, ArrTimeBlk, DestStateName, MAX(DepartureDelayGroups), AVG(Cancelled) FROM mytable WHERE DestStateName BETWEEN 'Montana' AND 'U.S. Pacific Trust Territories and Possessions' GROUP BY Distance, ArrTimeBlk, DestStateName  ORDER BY Distance, ArrTimeBlk, DestStateName LIMIT 18"]}
 {"sql":"SELECT TaxiIn, Origin, COUNT(SecurityDelay), MAX(ActualElapsedTime) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY TaxiIn, Origin  ORDER BY TaxiIn, Origin LIMIT 19","hsqls":["SELECT TaxiIn, Origin, COUNT(SecurityDelay), MAX(ActualElapsedTime) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY TaxiIn, Origin  ORDER BY TaxiIn, Origin LIMIT 19"]}
-{"sql":"SELECT DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups, MIN(DestWac), MAX(\"Month\") FROM mytable WHERE DivDistance BETWEEN 169 AND 349 AND FirstDepTime > 2041 AND Cancelled BETWEEN 0 AND 0 GROUP BY DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups LIMIT 18","hsqls":["SELECT DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups, MIN(DestWac), MAX(Month) FROM mytable WHERE DivDistance BETWEEN 169 AND 349 AND FirstDepTime > 2041 AND Cancelled BETWEEN 0 AND 0 GROUP BY DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups LIMIT 18"]}
+{"sql":"SELECT DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups, MIN(DestWac), MAX(\"Month\") FROM mytable WHERE DivDistance BETWEEN 169 AND 349 AND FirstDepTime > 2041 AND Cancelled BETWEEN 0 AND 0 GROUP BY DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups LIMIT 18","hsqls":["SELECT DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups, MIN(DestWac), MAX(`Month`) FROM mytable WHERE DivDistance BETWEEN 169 AND 349 AND FirstDepTime > 2041 AND Cancelled BETWEEN 0 AND 0 GROUP BY DepDelayMinutes, DestAirportSeqID, ArrivalDelayGroups LIMIT 18"]}
 {"sql":"SELECT LongestAddGTime, DestAirportID, DivActualElapsedTime FROM mytable WHERE CRSElapsedTime BETWEEN 365 AND 367 AND DestCityMarketID BETWEEN 31049 AND 30728 ORDER BY OriginState, CarrierDelay LIMIT 19"}
-{"sql":"SELECT Origin FROM mytable WHERE DivAirportIDs = 13198 ORDER BY OriginAirportSeqID, DistanceGroup, DestCityMarketID LIMIT 7","hsqls":["SELECT Origin FROM mytable WHERE (DivAirportIDs__MV0 = 13198 OR DivAirportIDs__MV1 = 13198 OR DivAirportIDs__MV2 = 13198 OR DivAirportIDs__MV3 = 13198 OR DivAirportIDs__MV4 = 13198) ORDER BY OriginAirportSeqID, DistanceGroup, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT TailNum, MAX(WeatherDelay), MAX(ArrTime) FROM mytable WHERE DivTotalGTimes <= 112 AND DivTailNums > 'N568SW' GROUP BY TailNum LIMIT 28","hsqls":["SELECT TailNum, MAX(WeatherDelay), MAX(ArrTime) FROM mytable WHERE (DivTotalGTimes__MV0 <= 112 OR DivTotalGTimes__MV1 <= 112 OR DivTotalGTimes__MV2 <= 112 OR DivTotalGTimes__MV3 <= 112 OR DivTotalGTimes__MV4 <= 112) AND (DivTailNums__MV0 > 'N568SW' OR DivTailNums__MV1 > 'N568SW' OR DivTailNums__MV2 > 'N568SW' OR DivTailNums__MV3 > 'N568SW' OR DivTailNums__MV4 > 'N568SW') GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT Origin FROM mytable WHERE DivAirportIDs = 13198 ORDER BY OriginAirportSeqID, DistanceGroup, DestCityMarketID LIMIT 7","hsqls":["SELECT Origin FROM mytable WHERE (DivAirportIDs[1] = 13198 OR DivAirportIDs[2] = 13198 OR DivAirportIDs[3] = 13198 OR DivAirportIDs[4] = 13198 OR DivAirportIDs[5] = 13198) ORDER BY OriginAirportSeqID, DistanceGroup, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT TailNum, MAX(WeatherDelay), MAX(ArrTime) FROM mytable WHERE DivTotalGTimes <= 112 AND DivTailNums > 'N568SW' GROUP BY TailNum LIMIT 28","hsqls":["SELECT TailNum, MAX(WeatherDelay), MAX(ArrTime) FROM mytable WHERE (DivTotalGTimes[1] <= 112 OR DivTotalGTimes[2] <= 112 OR DivTotalGTimes[3] <= 112 OR DivTotalGTimes[4] <= 112 OR DivTotalGTimes[5] <= 112) AND (DivTailNums[1] > 'N568SW' OR DivTailNums[2] > 'N568SW' OR DivTailNums[3] > 'N568SW' OR DivTailNums[4] > 'N568SW' OR DivTailNums[5] > 'N568SW') GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT OriginCityName FROM mytable WHERE NASDelay <= 69 OR FlightDate <> '2014-01-08' ORDER BY DivDistance, Carrier, TotalAddGTime LIMIT 5"}
 {"sql":"SELECT DestAirportSeqID FROM mytable LIMIT 13"}
 {"sql":"SELECT OriginState, FlightDate, CancellationCode FROM mytable WHERE DestCityName IN ('Durango, CO', 'Bellingham, WA', 'College Station/Bryan, TX') ORDER BY CRSArrTime LIMIT 21"}
@@ -5716,46 +5716,46 @@
 {"sql":"SELECT COUNT(ArrDelayMinutes), AVG(DestCityMarketID) FROM mytable LIMIT 18"}
 {"sql":"SELECT WheelsOff, CRSArrTime, OriginCityMarketID, MAX(DestAirportSeqID), MIN(CRSElapsedTime), SUM(OriginAirportSeqID) FROM mytable WHERE DayOfWeek BETWEEN 2 AND 7 GROUP BY WheelsOff, CRSArrTime, OriginCityMarketID  ORDER BY WheelsOff, CRSArrTime, OriginCityMarketID LIMIT 8","hsqls":["SELECT WheelsOff, CRSArrTime, OriginCityMarketID, MAX(DestAirportSeqID), MIN(CRSElapsedTime), SUM(OriginAirportSeqID) FROM mytable WHERE DayOfWeek BETWEEN 2 AND 7 GROUP BY WheelsOff, CRSArrTime, OriginCityMarketID  ORDER BY WheelsOff, CRSArrTime, OriginCityMarketID LIMIT 8"]}
 {"sql":"SELECT DivReachedDest, CancellationCode, CRSElapsedTime, COUNT(DepDelayMinutes) FROM mytable WHERE TailNum BETWEEN 'N936SW' AND 'N407UA' OR OriginAirportID BETWEEN 14814 AND 11423 GROUP BY DivReachedDest, CancellationCode, CRSElapsedTime  ORDER BY DivReachedDest, CancellationCode, CRSElapsedTime LIMIT 23","hsqls":["SELECT DivReachedDest, CancellationCode, CRSElapsedTime, COUNT(DepDelayMinutes) FROM mytable WHERE TailNum BETWEEN 'N936SW' AND 'N407UA' OR OriginAirportID BETWEEN 14814 AND 11423 GROUP BY DivReachedDest, CancellationCode, CRSElapsedTime  ORDER BY DivReachedDest, CancellationCode, CRSElapsedTime LIMIT 23"]}
-{"sql":"SELECT DestWac, ArrDel15, AVG(OriginAirportID) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepTime BETWEEN 413 AND 1237 GROUP BY DestWac, ArrDel15 LIMIT 18","hsqls":["SELECT DestWac, ArrDel15, AVG(OriginAirportID) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DepTime BETWEEN 413 AND 1237 GROUP BY DestWac, ArrDel15 LIMIT 18"]}
+{"sql":"SELECT DestWac, ArrDel15, AVG(OriginAirportID) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepTime BETWEEN 413 AND 1237 GROUP BY DestWac, ArrDel15 LIMIT 18","hsqls":["SELECT DestWac, ArrDel15, AVG(OriginAirportID) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DepTime BETWEEN 413 AND 1237 GROUP BY DestWac, ArrDel15 LIMIT 18"]}
 {"sql":"SELECT DestCityName, MAX(DayOfWeek) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 7","hsqls":["SELECT DestCityName, MAX(DayOfWeek) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 7"]}
 {"sql":"SELECT \"Year\", OriginCityMarketID, COUNT(DestCityMarketID), AVG(DistanceGroup) FROM mytable GROUP BY \"Year\", OriginCityMarketID LIMIT 5","hsqls":["SELECT Year, OriginCityMarketID, COUNT(DestCityMarketID), AVG(DistanceGroup) FROM mytable GROUP BY Year, OriginCityMarketID LIMIT 5"]}
 {"sql":"SELECT TotalAddGTime, DestStateName FROM mytable"}
 {"sql":"SELECT DestStateName, COUNT(SecurityDelay), AVG(CRSDepTime), MAX(DestWac) FROM mytable WHERE WeatherDelay >= 24 AND TailNum > 'N525US' GROUP BY DestStateName  ORDER BY DestStateName LIMIT 26","hsqls":["SELECT DestStateName, COUNT(SecurityDelay), AVG(CRSDepTime), MAX(DestWac) FROM mytable WHERE WeatherDelay >= 24 AND TailNum > 'N525US' GROUP BY DestStateName  ORDER BY DestStateName LIMIT 26"]}
 {"sql":"SELECT DivReachedDest, DestCityName, Origin, COUNT(*) FROM mytable GROUP BY DivReachedDest, DestCityName, Origin  ORDER BY DivReachedDest, DestCityName, Origin LIMIT 22","hsqls":["SELECT DivReachedDest, DestCityName, Origin, COUNT(*) FROM mytable GROUP BY DivReachedDest, DestCityName, Origin  ORDER BY DivReachedDest, DestCityName, Origin LIMIT 22"]}
 {"sql":"SELECT AirTime FROM mytable WHERE OriginAirportSeqID IN (1017001) OR ArrTimeBlk > '2100-2159' ORDER BY AirlineID LIMIT 27"}
-{"sql":"SELECT \"Month\", COUNT(*) FROM mytable WHERE DayofMonth >= 9 AND Origin >= 'ONT' OR DestAirportSeqID BETWEEN 1013603 AND 1289203 GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, COUNT(*) FROM mytable WHERE DayofMonth >= 9 AND Origin >= 'ONT' OR DestAirportSeqID BETWEEN 1013603 AND 1289203 GROUP BY Month LIMIT 10"]}
+{"sql":"SELECT \"Month\", COUNT(*) FROM mytable WHERE DayofMonth >= 9 AND Origin >= 'ONT' OR DestAirportSeqID BETWEEN 1013603 AND 1289203 GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, COUNT(*) FROM mytable WHERE DayofMonth >= 9 AND Origin >= 'ONT' OR DestAirportSeqID BETWEEN 1013603 AND 1289203 GROUP BY `Month` LIMIT 10"]}
 {"sql":"SELECT DepDelay, CRSArrTime FROM mytable ORDER BY OriginState, OriginStateFips, Flights LIMIT 12"}
-{"sql":"SELECT DivLongestGTimes, NASDelay, Origin FROM mytable WHERE OriginCityMarketID <= 31703 OR DivArrDelay NOT IN (146, 185) AND WheelsOff BETWEEN 1610 AND 738 LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, NASDelay, Origin FROM mytable WHERE OriginCityMarketID <= 31703 OR DivArrDelay NOT IN (146, 185) AND WheelsOff BETWEEN 1610 AND 738 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, NASDelay, Origin FROM mytable WHERE OriginCityMarketID <= 31703 OR DivArrDelay NOT IN (146, 185) AND WheelsOff BETWEEN 1610 AND 738 LIMIT 4","hsqls":["SELECT DivLongestGTimes, NASDelay, Origin FROM mytable WHERE OriginCityMarketID <= 31703 OR DivArrDelay NOT IN (146, 185) AND WheelsOff BETWEEN 1610 AND 738 LIMIT 10000"]}
 {"sql":"SELECT DestStateName, AVG(DestStateFips), SUM(WeatherDelay), AVG(DepTime) FROM mytable WHERE Cancelled = 1 AND DaysSinceEpoch < 16095 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 2","hsqls":["SELECT DestStateName, AVG(DestStateFips), SUM(WeatherDelay), AVG(DepTime) FROM mytable WHERE Cancelled = 1 AND DaysSinceEpoch < 16095 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 2"]}
 {"sql":"SELECT COUNT(Diverted) FROM mytable WHERE WeatherDelay < 71 AND DestStateName NOT IN ('New Mexico', 'Maine', 'Kansas') OR Origin IN ('CMX', 'BRD') LIMIT 13"}
-{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE SecurityDelay = 4 AND DivAirportIDs = 14107 AND NASDelay NOT IN (67, 79, 111, 55) ORDER BY TaxiOut, Dest LIMIT 4","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE SecurityDelay = 4 AND (DivAirportIDs__MV0 = 14107 OR DivAirportIDs__MV1 = 14107 OR DivAirportIDs__MV2 = 14107 OR DivAirportIDs__MV3 = 14107 OR DivAirportIDs__MV4 = 14107) AND NASDelay NOT IN (67, 79, 111, 55) ORDER BY TaxiOut, Dest LIMIT 10000"]}
+{"sql":"SELECT DaysSinceEpoch FROM mytable WHERE SecurityDelay = 4 AND DivAirportIDs = 14107 AND NASDelay NOT IN (67, 79, 111, 55) ORDER BY TaxiOut, Dest LIMIT 4","hsqls":["SELECT DaysSinceEpoch FROM mytable WHERE SecurityDelay = 4 AND (DivAirportIDs[1] = 14107 OR DivAirportIDs[2] = 14107 OR DivAirportIDs[3] = 14107 OR DivAirportIDs[4] = 14107 OR DivAirportIDs[5] = 14107) AND NASDelay NOT IN (67, 79, 111, 55) ORDER BY TaxiOut, Dest LIMIT 10000"]}
 {"sql":"SELECT \"Year\", ArrTime, SUM(DistanceGroup) FROM mytable WHERE DestAirportID NOT IN (11076, 14193) AND DestWac <= 86 AND ArrTime = 1343 GROUP BY \"Year\", ArrTime LIMIT 1","hsqls":["SELECT Year, ArrTime, SUM(DistanceGroup) FROM mytable WHERE DestAirportID NOT IN (11076, 14193) AND DestWac <= 86 AND ArrTime = 1343 GROUP BY Year, ArrTime LIMIT 1"]}
 {"sql":"SELECT NASDelay, Origin, UniqueCarrier FROM mytable ORDER BY WheelsOff, Cancelled LIMIT 23"}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 7 LIMIT 15"}
 {"sql":"SELECT WheelsOff, DivReachedDest, Cancelled FROM mytable ORDER BY DivReachedDest LIMIT 7"}
 {"sql":"SELECT FirstDepTime, Distance, ArrDelay FROM mytable WHERE ActualElapsedTime = 502 OR TotalAddGTime = 13 ORDER BY CRSArrTime, NASDelay LIMIT 8"}
-{"sql":"SELECT DivReachedDest, CRSArrTime, MIN(Quarter), SUM(\"Year\") FROM mytable WHERE AirlineID = 19805 AND TaxiIn BETWEEN 30 AND 106 AND Carrier > 'AS' GROUP BY DivReachedDest, CRSArrTime LIMIT 20","hsqls":["SELECT DivReachedDest, CRSArrTime, MIN(Quarter), SUM(Year) FROM mytable WHERE AirlineID = 19805 AND TaxiIn BETWEEN 30 AND 106 AND Carrier > 'AS' GROUP BY DivReachedDest, CRSArrTime LIMIT 20"]}
+{"sql":"SELECT DivReachedDest, CRSArrTime, MIN(Quarter), SUM(\"Year\") FROM mytable WHERE AirlineID = 19805 AND TaxiIn BETWEEN 30 AND 106 AND Carrier > 'AS' GROUP BY DivReachedDest, CRSArrTime LIMIT 20","hsqls":["SELECT DivReachedDest, CRSArrTime, MIN(Quarter), SUM(`Year`) FROM mytable WHERE AirlineID = 19805 AND TaxiIn BETWEEN 30 AND 106 AND Carrier > 'AS' GROUP BY DivReachedDest, CRSArrTime LIMIT 20"]}
 {"sql":"SELECT Diverted, DayofMonth, DestCityMarketID FROM mytable WHERE Dest NOT IN ('GRK', 'FLL', 'MSN', 'TPA', 'DLH') ORDER BY \"Year\", DepDelay, AirlineID LIMIT 3","hsqls":["SELECT Diverted, DayofMonth, DestCityMarketID FROM mytable WHERE Dest NOT IN ('GRK', 'FLL', 'MSN', 'TPA', 'DLH') ORDER BY Year, DepDelay, AirlineID LIMIT 3"]}
 {"sql":"SELECT OriginAirportSeqID, DivReachedDest, ActualElapsedTime, COUNT(ArrDel15), SUM(DivActualElapsedTime) FROM mytable WHERE OriginCityMarketID IN (31865) OR Quarter > 1 GROUP BY OriginAirportSeqID, DivReachedDest, ActualElapsedTime  ORDER BY OriginAirportSeqID, DivReachedDest, ActualElapsedTime LIMIT 22","hsqls":["SELECT OriginAirportSeqID, DivReachedDest, ActualElapsedTime, COUNT(ArrDel15), SUM(DivActualElapsedTime) FROM mytable WHERE OriginCityMarketID IN (31865) OR Quarter > 1 GROUP BY OriginAirportSeqID, DivReachedDest, ActualElapsedTime  ORDER BY OriginAirportSeqID, DivReachedDest, ActualElapsedTime LIMIT 22"]}
-{"sql":"SELECT OriginState, DestStateFips, CRSElapsedTime FROM mytable WHERE FirstDepTime < 2254 OR DivAirports < 'BIL' AND ActualElapsedTime <= 185 ORDER BY FlightNum, OriginAirportID LIMIT 16","hsqls":["SELECT OriginState, DestStateFips, CRSElapsedTime FROM mytable WHERE FirstDepTime < 2254 OR (DivAirports__MV0 < 'BIL' OR DivAirports__MV1 < 'BIL' OR DivAirports__MV2 < 'BIL' OR DivAirports__MV3 < 'BIL' OR DivAirports__MV4 < 'BIL') AND ActualElapsedTime <= 185 ORDER BY FlightNum, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, ArrivalDelayGroups FROM mytable LIMIT 27","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ArrivalDelayGroups FROM mytable LIMIT 10000"]}
-{"sql":"SELECT CarrierDelay, DivTailNums, DestCityName FROM mytable ORDER BY DestState LIMIT 22","hsqls":["SELECT CarrierDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestCityName FROM mytable ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT OriginState, DestStateFips, CRSElapsedTime FROM mytable WHERE FirstDepTime < 2254 OR DivAirports < 'BIL' AND ActualElapsedTime <= 185 ORDER BY FlightNum, OriginAirportID LIMIT 16","hsqls":["SELECT OriginState, DestStateFips, CRSElapsedTime FROM mytable WHERE FirstDepTime < 2254 OR (DivAirports[1] < 'BIL' OR DivAirports[2] < 'BIL' OR DivAirports[3] < 'BIL' OR DivAirports[4] < 'BIL' OR DivAirports[5] < 'BIL') AND ActualElapsedTime <= 185 ORDER BY FlightNum, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, ArrivalDelayGroups FROM mytable LIMIT 27","hsqls":["SELECT DivWheelsOns, ArrivalDelayGroups FROM mytable LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivTailNums, DestCityName FROM mytable ORDER BY DestState LIMIT 22","hsqls":["SELECT CarrierDelay, DivTailNums, DestCityName FROM mytable ORDER BY DestState LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, CancellationCode, COUNT(*) FROM mytable GROUP BY TaxiIn, CancellationCode  ORDER BY TaxiIn, CancellationCode LIMIT 9","hsqls":["SELECT TaxiIn, CancellationCode, COUNT(*) FROM mytable GROUP BY TaxiIn, CancellationCode  ORDER BY TaxiIn, CancellationCode LIMIT 9"]}
-{"sql":"SELECT DivLongestGTimes, CRSDepTime FROM mytable WHERE DaysSinceEpoch IN (16080, 16099, 16074, 16091) ORDER BY OriginAirportSeqID, TaxiIn, DestCityMarketID LIMIT 26","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CRSDepTime FROM mytable WHERE DaysSinceEpoch IN (16080, 16099, 16074, 16091) ORDER BY OriginAirportSeqID, TaxiIn, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CRSDepTime FROM mytable WHERE DaysSinceEpoch IN (16080, 16099, 16074, 16091) ORDER BY OriginAirportSeqID, TaxiIn, DestCityMarketID LIMIT 26","hsqls":["SELECT DivLongestGTimes, CRSDepTime FROM mytable WHERE DaysSinceEpoch IN (16080, 16099, 16074, 16091) ORDER BY OriginAirportSeqID, TaxiIn, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DestCityName, MIN(CRSElapsedTime) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' OR Diverted IN (1, 0) OR DepTime IN (34) GROUP BY OriginAirportSeqID, DestCityName  ORDER BY OriginAirportSeqID, DestCityName LIMIT 23","hsqls":["SELECT OriginAirportSeqID, DestCityName, MIN(CRSElapsedTime) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' OR Diverted IN (1, 0) OR DepTime IN (34) GROUP BY OriginAirportSeqID, DestCityName  ORDER BY OriginAirportSeqID, DestCityName LIMIT 23"]}
-{"sql":"SELECT DivLongestGTimes, LateAircraftDelay, DivAirportLandings FROM mytable WHERE ArrDel15 <= 0 OR DivActualElapsedTime NOT IN (305) LIMIT 1","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, LateAircraftDelay, DivAirportLandings FROM mytable WHERE ArrDel15 <= 0 OR DivActualElapsedTime NOT IN (305) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, LateAircraftDelay, DivAirportLandings FROM mytable WHERE ArrDel15 <= 0 OR DivActualElapsedTime NOT IN (305) LIMIT 1","hsqls":["SELECT DivLongestGTimes, LateAircraftDelay, DivAirportLandings FROM mytable WHERE ArrDel15 <= 0 OR DivActualElapsedTime NOT IN (305) LIMIT 10000"]}
 {"sql":"SELECT DepDelay, MIN(Flights), AVG(DepDelayMinutes) FROM mytable WHERE ActualElapsedTime BETWEEN 180 AND 310 OR DayofMonth IN (15) GROUP BY DepDelay  ORDER BY DepDelay LIMIT 25","hsqls":["SELECT DepDelay, MIN(Flights), AVG(DepDelayMinutes) FROM mytable WHERE ActualElapsedTime BETWEEN 180 AND 310 OR DayofMonth IN (15) GROUP BY DepDelay  ORDER BY DepDelay LIMIT 25"]}
 {"sql":"SELECT ArrDelayMinutes, Cancelled, Origin FROM mytable LIMIT 6"}
 {"sql":"SELECT DivArrDelay, COUNT(DepDel15) FROM mytable WHERE ActualElapsedTime BETWEEN 240 AND 361 AND DayOfWeek BETWEEN 5 AND 5 GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 14","hsqls":["SELECT DivArrDelay, COUNT(DepDel15) FROM mytable WHERE ActualElapsedTime BETWEEN 240 AND 361 AND DayOfWeek BETWEEN 5 AND 5 GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 14"]}
-{"sql":"SELECT DepDel15, DivTailNums FROM mytable WHERE ArrTime NOT IN (1935) OR DestStateFips <> 48 AND DivAirportSeqIDs BETWEEN 1227802 AND 1059904 ORDER BY DestCityMarketID LIMIT 20","hsqls":["SELECT DepDel15, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE ArrTime NOT IN (1935) OR DestStateFips <> 48 AND (DivAirportSeqIDs__MV0 BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs__MV1 BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs__MV2 BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs__MV3 BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs__MV4 BETWEEN 1227802 AND 1059904) ORDER BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DivTailNums FROM mytable WHERE ArrTime NOT IN (1935) OR DestStateFips <> 48 AND DivAirportSeqIDs BETWEEN 1227802 AND 1059904 ORDER BY DestCityMarketID LIMIT 20","hsqls":["SELECT DepDel15, DivTailNums FROM mytable WHERE ArrTime NOT IN (1935) OR DestStateFips <> 48 AND (DivAirportSeqIDs[1] BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs[2] BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs[3] BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs[4] BETWEEN 1227802 AND 1059904 OR DivAirportSeqIDs[5] BETWEEN 1227802 AND 1059904) ORDER BY DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, ArrTime, DivActualElapsedTime FROM mytable ORDER BY SecurityDelay LIMIT 8"}
 {"sql":"SELECT COUNT(DepDelay) FROM mytable WHERE OriginStateName IN ('Idaho', 'New Mexico', 'Connecticut', 'Oregon') AND DepTimeBlk NOT IN ('0700-0759', '0800-0859') LIMIT 26"}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE WeatherDelay < 316 AND DepDelayMinutes NOT IN (195.0) LIMIT 5"}
 {"sql":"SELECT LateAircraftDelay, DivAirportLandings, COUNT(WheelsOn) FROM mytable WHERE ArrDelay BETWEEN 2.0 AND 7.0 AND OriginCityMarketID > 30208 GROUP BY LateAircraftDelay, DivAirportLandings  ORDER BY LateAircraftDelay, DivAirportLandings LIMIT 13","hsqls":["SELECT LateAircraftDelay, DivAirportLandings, COUNT(WheelsOn) FROM mytable WHERE ArrDelay BETWEEN 2.0 AND 7.0 AND OriginCityMarketID > 30208 GROUP BY LateAircraftDelay, DivAirportLandings  ORDER BY LateAircraftDelay, DivAirportLandings LIMIT 13"]}
 {"sql":"SELECT TailNum, SUM(DepartureDelayGroups) FROM mytable WHERE DepDel15 NOT IN (1, 0) AND DestWac NOT IN (51, 34, 61, 84, 11) GROUP BY TailNum  ORDER BY TailNum LIMIT 16","hsqls":["SELECT TailNum, SUM(DepartureDelayGroups) FROM mytable WHERE DepDel15 NOT IN (1, 0) AND DestWac NOT IN (51, 34, 61, 84, 11) GROUP BY TailNum  ORDER BY TailNum LIMIT 16"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DestStateName BETWEEN 'Michigan' AND 'Nevada' AND DestWac > 92 AND ArrDelay > 166.0 LIMIT 13","hsqls":["SELECT Year FROM mytable WHERE DestStateName BETWEEN 'Michigan' AND 'Nevada' AND DestWac > 92 AND ArrDelay > 166.0 LIMIT 13"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DestStateName BETWEEN 'Michigan' AND 'Nevada' AND DestWac > 92 AND ArrDelay > 166.0 LIMIT 13","hsqls":["SELECT `Year` FROM mytable WHERE DestStateName BETWEEN 'Michigan' AND 'Nevada' AND DestWac > 92 AND ArrDelay > 166.0 LIMIT 13"]}
 {"sql":"SELECT FlightDate, Distance, DayofMonth FROM mytable WHERE Diverted IN (1, 0) AND FirstDepTime BETWEEN 726 AND 1534 OR CRSDepTime <= 612 ORDER BY NASDelay LIMIT 19"}
-{"sql":"SELECT DestState, DivAirportIDs, ArrDelay FROM mytable WHERE Origin <= 'MOB' OR AirTime > 127 ORDER BY CRSArrTime, OriginAirportID LIMIT 10","hsqls":["SELECT DestState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay FROM mytable WHERE Origin <= 'MOB' OR AirTime > 127 ORDER BY CRSArrTime, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DestState, DivAirportIDs, ArrDelay FROM mytable WHERE Origin <= 'MOB' OR AirTime > 127 ORDER BY CRSArrTime, OriginAirportID LIMIT 10","hsqls":["SELECT DestState, DivAirportIDs, ArrDelay FROM mytable WHERE Origin <= 'MOB' OR AirTime > 127 ORDER BY CRSArrTime, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Diverted, DepDel15 FROM mytable WHERE DestCityMarketID <= 30561 AND ArrivalDelayGroups > 7 ORDER BY DestAirportSeqID LIMIT 7"}
 {"sql":"SELECT Carrier, DayofMonth, OriginAirportID FROM mytable WHERE WheelsOff < 30 OR Origin BETWEEN 'SGU' AND 'FWA' ORDER BY DivActualElapsedTime LIMIT 10"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 1"}
@@ -5768,14 +5768,14 @@
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginCityMarketID BETWEEN 31995 AND 33795 AND Distance > 1747 LIMIT 10"}
 {"sql":"SELECT Flights, SecurityDelay, AirTime, AVG(WeatherDelay), AVG(NASDelay) FROM mytable WHERE DayOfWeek BETWEEN 3 AND 3 AND TaxiOut >= 56 OR AirTime BETWEEN 80 AND 318 GROUP BY Flights, SecurityDelay, AirTime  ORDER BY Flights, SecurityDelay, AirTime LIMIT 15","hsqls":["SELECT Flights, SecurityDelay, AirTime, AVG(WeatherDelay), AVG(NASDelay) FROM mytable WHERE DayOfWeek BETWEEN 3 AND 3 AND TaxiOut >= 56 OR AirTime BETWEEN 80 AND 318 GROUP BY Flights, SecurityDelay, AirTime  ORDER BY Flights, SecurityDelay, AirTime LIMIT 15"]}
 {"sql":"SELECT DivReachedDest, SUM(DivAirportLandings), MAX(DayofMonth), MAX(OriginStateFips) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 10","hsqls":["SELECT DivReachedDest, SUM(DivAirportLandings), MAX(DayofMonth), MAX(OriginStateFips) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 10"]}
-{"sql":"SELECT OriginWac, COUNT(DestAirportSeqID), MAX(CRSDepTime) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND DivAirportSeqIDs IN (1289203, 1432103, 1348502, 1100303) GROUP BY OriginWac LIMIT 13","hsqls":["SELECT OriginWac, COUNT(DestAirportSeqID), MAX(CRSDepTime) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND (DivAirportSeqIDs__MV0 IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs__MV1 IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs__MV2 IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs__MV3 IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs__MV4 IN (1289203, 1432103, 1348502, 1100303)) GROUP BY OriginWac LIMIT 10000"]}
-{"sql":"SELECT \"Year\", COUNT(Origin), AVG(WheelsOff) FROM mytable WHERE DayOfWeek <= 2 OR Dest BETWEEN 'CLD' AND 'BOS' GROUP BY \"Year\" LIMIT 2","hsqls":["SELECT Year, COUNT(Origin), AVG(WheelsOff) FROM mytable WHERE DayOfWeek <= 2 OR Dest BETWEEN 'CLD' AND 'BOS' GROUP BY Year LIMIT 2"]}
+{"sql":"SELECT OriginWac, COUNT(DestAirportSeqID), MAX(CRSDepTime) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND DivAirportSeqIDs IN (1289203, 1432103, 1348502, 1100303) GROUP BY OriginWac LIMIT 13","hsqls":["SELECT OriginWac, COUNT(DestAirportSeqID), MAX(CRSDepTime) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND (DivAirportSeqIDs[1] IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs[2] IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs[3] IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs[4] IN (1289203, 1432103, 1348502, 1100303) OR DivAirportSeqIDs[5] IN (1289203, 1432103, 1348502, 1100303)) GROUP BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT \"Year\", COUNT(Origin), AVG(WheelsOff) FROM mytable WHERE DayOfWeek <= 2 OR Dest BETWEEN 'CLD' AND 'BOS' GROUP BY \"Year\" LIMIT 2","hsqls":["SELECT Year, COUNT(Origin), AVG(WheelsOff) FROM mytable WHERE DayOfWeek <= 2 OR Dest BETWEEN 'CLD' AND 'BOS' GROUP BY `Year` LIMIT 2"]}
 {"sql":"SELECT OriginAirportSeqID, ArrivalDelayGroups, DayOfWeek FROM mytable WHERE CRSArrTime >= 2008 AND Dest IN ('SJU', 'MSO', 'TLH') AND DivArrDelay BETWEEN 133 AND 115 ORDER BY DestCityName LIMIT 21"}
 {"sql":"SELECT DepDelay, Distance FROM mytable WHERE Distance BETWEEN 1678 AND 918 OR NASDelay NOT IN (96, 64) ORDER BY TaxiOut, Distance, DayofMonth LIMIT 16"}
 {"sql":"SELECT DivReachedDest, CancellationCode FROM mytable ORDER BY TaxiIn, ArrTime, ArrTimeBlk LIMIT 12"}
 {"sql":"SELECT TailNum, DivAirportLandings, SUM(DestAirportSeqID), SUM(DepDelay) FROM mytable WHERE FlightNum IN (4925, 5156, 4484, 656) AND DivActualElapsedTime BETWEEN 305 AND 363 GROUP BY TailNum, DivAirportLandings  ORDER BY TailNum, DivAirportLandings LIMIT 5","hsqls":["SELECT TailNum, DivAirportLandings, SUM(DestAirportSeqID), SUM(DepDelay) FROM mytable WHERE FlightNum IN (4925, 5156, 4484, 656) AND DivActualElapsedTime BETWEEN 305 AND 363 GROUP BY TailNum, DivAirportLandings  ORDER BY TailNum, DivAirportLandings LIMIT 5"]}
 {"sql":"SELECT OriginStateFips, DestCityMarketID FROM mytable ORDER BY DestState LIMIT 15"}
-{"sql":"SELECT DivAirports, WeatherDelay FROM mytable WHERE DayOfWeek NOT IN (3, 7) OR OriginAirportID <> 15919 AND OriginStateName NOT IN ('Utah', 'Arkansas', 'West Virginia', 'Nevada', 'Nebraska') LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, WeatherDelay FROM mytable WHERE DayOfWeek NOT IN (3, 7) OR OriginAirportID <> 15919 AND OriginStateName NOT IN ('Utah', 'Arkansas', 'West Virginia', 'Nevada', 'Nebraska') LIMIT 10000"]}
+{"sql":"SELECT DivAirports, WeatherDelay FROM mytable WHERE DayOfWeek NOT IN (3, 7) OR OriginAirportID <> 15919 AND OriginStateName NOT IN ('Utah', 'Arkansas', 'West Virginia', 'Nevada', 'Nebraska') LIMIT 24","hsqls":["SELECT DivAirports, WeatherDelay FROM mytable WHERE DayOfWeek NOT IN (3, 7) OR OriginAirportID <> 15919 AND OriginStateName NOT IN ('Utah', 'Arkansas', 'West Virginia', 'Nevada', 'Nebraska') LIMIT 10000"]}
 {"sql":"SELECT COUNT(Origin), AVG(ArrDelay) FROM mytable WHERE Diverted IN (1, 0) LIMIT 23"}
 {"sql":"SELECT AVG(WeatherDelay) FROM mytable WHERE DepTimeBlk NOT IN ('1700-1759') AND DestStateFips BETWEEN 24 AND 2 LIMIT 27"}
 {"sql":"SELECT DepDelay, MIN(WheelsOn) FROM mytable WHERE WheelsOn BETWEEN 1238 AND 2350 GROUP BY DepDelay  ORDER BY DepDelay LIMIT 16","hsqls":["SELECT DepDelay, MIN(WheelsOn) FROM mytable WHERE WheelsOn BETWEEN 1238 AND 2350 GROUP BY DepDelay  ORDER BY DepDelay LIMIT 16"]}
@@ -5790,17 +5790,17 @@
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE DepDelay NOT IN (225.0, 89.0, 105.0) ORDER BY FirstDepTime, DestAirportID LIMIT 4"}
 {"sql":"SELECT NASDelay, SUM(CRSElapsedTime), AVG(DepDelayMinutes) FROM mytable GROUP BY NASDelay","hsqls":["SELECT NASDelay, SUM(CRSElapsedTime), AVG(DepDelayMinutes) FROM mytable GROUP BY NASDelay"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE CRSElapsedTime IN (330) ORDER BY OriginAirportSeqID, DepDel15 LIMIT 1"}
-{"sql":"SELECT DivTailNums, ArrDel15, DaysSinceEpoch FROM mytable WHERE Distance = 570 AND TaxiOut BETWEEN 5 AND 71 ORDER BY TaxiOut","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, ArrDel15, DaysSinceEpoch FROM mytable WHERE Distance = 570 AND TaxiOut BETWEEN 5 AND 71 ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, ArrDel15, DaysSinceEpoch FROM mytable WHERE Distance = 570 AND TaxiOut BETWEEN 5 AND 71 ORDER BY TaxiOut","hsqls":["SELECT DivTailNums, ArrDel15, DaysSinceEpoch FROM mytable WHERE Distance = 570 AND TaxiOut BETWEEN 5 AND 71 ORDER BY TaxiOut LIMIT 10000"]}
 {"sql":"SELECT DepDel15 FROM mytable WHERE FlightNum >= 5188 ORDER BY WeatherDelay, ArrDelay LIMIT 18"}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE FlightDate NOT IN ('2014-01-19') OR OriginStateName NOT IN ('Wisconsin', 'Nevada') ORDER BY DestCityMarketID, CRSElapsedTime LIMIT 8"}
-{"sql":"SELECT FirstDepTime, Cancelled, ArrTimeBlk FROM mytable WHERE ArrDelay NOT IN (43.0, 146.0) AND DivTailNums = 'N607SK' ORDER BY ArrivalDelayGroups LIMIT 24","hsqls":["SELECT FirstDepTime, Cancelled, ArrTimeBlk FROM mytable WHERE ArrDelay NOT IN (43.0, 146.0) AND (DivTailNums__MV0 = 'N607SK' OR DivTailNums__MV1 = 'N607SK' OR DivTailNums__MV2 = 'N607SK' OR DivTailNums__MV3 = 'N607SK' OR DivTailNums__MV4 = 'N607SK') ORDER BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, Cancelled, ArrTimeBlk FROM mytable WHERE ArrDelay NOT IN (43.0, 146.0) AND DivTailNums = 'N607SK' ORDER BY ArrivalDelayGroups LIMIT 24","hsqls":["SELECT FirstDepTime, Cancelled, ArrTimeBlk FROM mytable WHERE ArrDelay NOT IN (43.0, 146.0) AND (DivTailNums[1] = 'N607SK' OR DivTailNums[2] = 'N607SK' OR DivTailNums[3] = 'N607SK' OR DivTailNums[4] = 'N607SK' OR DivTailNums[5] = 'N607SK') ORDER BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DestWac, DayofMonth, UniqueCarrier, COUNT(ArrTimeBlk) FROM mytable GROUP BY DestWac, DayofMonth, UniqueCarrier  ORDER BY DestWac, DayofMonth, UniqueCarrier LIMIT 9","hsqls":["SELECT DestWac, DayofMonth, UniqueCarrier, COUNT(ArrTimeBlk) FROM mytable GROUP BY DestWac, DayofMonth, UniqueCarrier  ORDER BY DestWac, DayofMonth, UniqueCarrier LIMIT 9"]}
 {"sql":"SELECT DivDistance, AirlineID, DayOfWeek, SUM(DayOfWeek), MAX(OriginStateFips), MAX(ActualElapsedTime) FROM mytable GROUP BY DivDistance, AirlineID, DayOfWeek  ORDER BY DivDistance, AirlineID, DayOfWeek LIMIT 26","hsqls":["SELECT DivDistance, AirlineID, DayOfWeek, SUM(DayOfWeek), MAX(OriginStateFips), MAX(ActualElapsedTime) FROM mytable GROUP BY DivDistance, AirlineID, DayOfWeek  ORDER BY DivDistance, AirlineID, DayOfWeek LIMIT 26"]}
-{"sql":"SELECT DepartureDelayGroups, DestStateFips, ArrDelayMinutes, COUNT(Quarter), AVG(ArrDel15), AVG(ArrDelay) FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1400-1459' OR DivTotalGTimes BETWEEN 97 AND 83 OR OriginCityMarketID IN (35165) GROUP BY DepartureDelayGroups, DestStateFips, ArrDelayMinutes LIMIT 26","hsqls":["SELECT DepartureDelayGroups, DestStateFips, ArrDelayMinutes, COUNT(Quarter), AVG(ArrDel15), AVG(ArrDelay) FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1400-1459' OR (DivTotalGTimes__MV0 BETWEEN 97 AND 83 OR DivTotalGTimes__MV1 BETWEEN 97 AND 83 OR DivTotalGTimes__MV2 BETWEEN 97 AND 83 OR DivTotalGTimes__MV3 BETWEEN 97 AND 83 OR DivTotalGTimes__MV4 BETWEEN 97 AND 83) OR OriginCityMarketID IN (35165) GROUP BY DepartureDelayGroups, DestStateFips, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DestStateFips, ArrDelayMinutes, COUNT(Quarter), AVG(ArrDel15), AVG(ArrDelay) FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1400-1459' OR DivTotalGTimes BETWEEN 97 AND 83 OR OriginCityMarketID IN (35165) GROUP BY DepartureDelayGroups, DestStateFips, ArrDelayMinutes LIMIT 26","hsqls":["SELECT DepartureDelayGroups, DestStateFips, ArrDelayMinutes, COUNT(Quarter), AVG(ArrDel15), AVG(ArrDelay) FROM mytable WHERE DepTimeBlk BETWEEN '2000-2059' AND '1400-1459' OR (DivTotalGTimes[1] BETWEEN 97 AND 83 OR DivTotalGTimes[2] BETWEEN 97 AND 83 OR DivTotalGTimes[3] BETWEEN 97 AND 83 OR DivTotalGTimes[4] BETWEEN 97 AND 83 OR DivTotalGTimes[5] BETWEEN 97 AND 83) OR OriginCityMarketID IN (35165) GROUP BY DepartureDelayGroups, DestStateFips, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, WheelsOff, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, WheelsOff  ORDER BY DepartureDelayGroups, WheelsOff LIMIT 29","hsqls":["SELECT DepartureDelayGroups, WheelsOff, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, WheelsOff  ORDER BY DepartureDelayGroups, WheelsOff LIMIT 29"]}
-{"sql":"SELECT CRSArrTime, CRSDepTime FROM mytable WHERE DivWheelsOns BETWEEN 1443 AND 1122 AND CRSElapsedTime BETWEEN 114 AND 349 OR WheelsOff BETWEEN 1552 AND 2310 ORDER BY DistanceGroup, DepDelayMinutes, DepDel15 LIMIT 10","hsqls":["SELECT CRSArrTime, CRSDepTime FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1443 AND 1122 OR DivWheelsOns__MV1 BETWEEN 1443 AND 1122 OR DivWheelsOns__MV2 BETWEEN 1443 AND 1122 OR DivWheelsOns__MV3 BETWEEN 1443 AND 1122 OR DivWheelsOns__MV4 BETWEEN 1443 AND 1122) AND CRSElapsedTime BETWEEN 114 AND 349 OR WheelsOff BETWEEN 1552 AND 2310 ORDER BY DistanceGroup, DepDelayMinutes, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, CRSDepTime FROM mytable WHERE DivWheelsOns BETWEEN 1443 AND 1122 AND CRSElapsedTime BETWEEN 114 AND 349 OR WheelsOff BETWEEN 1552 AND 2310 ORDER BY DistanceGroup, DepDelayMinutes, DepDel15 LIMIT 10","hsqls":["SELECT CRSArrTime, CRSDepTime FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1443 AND 1122 OR DivWheelsOns[2] BETWEEN 1443 AND 1122 OR DivWheelsOns[3] BETWEEN 1443 AND 1122 OR DivWheelsOns[4] BETWEEN 1443 AND 1122 OR DivWheelsOns[5] BETWEEN 1443 AND 1122) AND CRSElapsedTime BETWEEN 114 AND 349 OR WheelsOff BETWEEN 1552 AND 2310 ORDER BY DistanceGroup, DepDelayMinutes, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DepDelayMinutes, Distance FROM mytable WHERE Cancelled > 1 OR ArrDelayMinutes BETWEEN 170.0 AND 63.0 ORDER BY DestState, FlightNum LIMIT 3"}
-{"sql":"SELECT DivLongestGTimes FROM mytable ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 21","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 21","hsqls":["SELECT DivLongestGTimes FROM mytable ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, AVG(Diverted) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 18","hsqls":["SELECT ArrDel15, AVG(Diverted) FROM mytable GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 18"]}
 {"sql":"SELECT MIN(DaysSinceEpoch), SUM(AirTime) FROM mytable WHERE Distance IN (1139, 471, 1162) AND CRSDepTime BETWEEN 2152 AND 539 LIMIT 7"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime >= 59 LIMIT 26"}
@@ -5809,157 +5809,157 @@
 {"sql":"SELECT OriginAirportSeqID, FlightNum FROM mytable WHERE OriginState > 'CT' ORDER BY Dest LIMIT 22"}
 {"sql":"SELECT CRSArrTime, ActualElapsedTime FROM mytable LIMIT 20"}
 {"sql":"SELECT Distance, MAX(DestAirportID) FROM mytable WHERE DivDistance BETWEEN 967 AND 603 AND OriginWac <> 71 GROUP BY Distance  ORDER BY Distance LIMIT 10","hsqls":["SELECT Distance, MAX(DestAirportID) FROM mytable WHERE DivDistance BETWEEN 967 AND 603 AND OriginWac <> 71 GROUP BY Distance  ORDER BY Distance LIMIT 10"]}
-{"sql":"SELECT DivWheelsOns, WeatherDelay FROM mytable ORDER BY LateAircraftDelay, Quarter, SecurityDelay LIMIT 2","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, WeatherDelay FROM mytable ORDER BY LateAircraftDelay, Quarter, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, WeatherDelay FROM mytable ORDER BY LateAircraftDelay, Quarter, SecurityDelay LIMIT 2","hsqls":["SELECT DivWheelsOns, WeatherDelay FROM mytable ORDER BY LateAircraftDelay, Quarter, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, ArrDelay, CRSElapsedTime FROM mytable WHERE CRSArrTime < 741 LIMIT 13"}
 {"sql":"SELECT FirstDepTime, TotalAddGTime FROM mytable WHERE OriginStateName = 'Alaska' AND Dest BETWEEN 'RNO' AND 'LRD' ORDER BY TotalAddGTime, DestAirportSeqID, CancellationCode LIMIT 19"}
-{"sql":"SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay) FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR DivWheelsOffs BETWEEN 1719 AND 1720 LIMIT 16","hsqls":["SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay)  FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR (DivWheelsOffs__MV0 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV1 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV2 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV3 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV4 BETWEEN 1719 AND 1720) LIMIT 10000"]}
+{"sql":"SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay) FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR DivWheelsOffs BETWEEN 1719 AND 1720 LIMIT 16","hsqls":["SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay)  FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR (DivWheelsOffs[1] BETWEEN 1719 AND 1720 OR DivWheelsOffs[2] BETWEEN 1719 AND 1720 OR DivWheelsOffs[3] BETWEEN 1719 AND 1720 OR DivWheelsOffs[4] BETWEEN 1719 AND 1720 OR DivWheelsOffs[5] BETWEEN 1719 AND 1720) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, COUNT(NASDelay), COUNT(WheelsOff) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 1","hsqls":["SELECT TaxiIn, COUNT(NASDelay), COUNT(WheelsOff) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 1"]}
 {"sql":"SELECT DestStateFips, DestStateName, DestAirportID FROM mytable WHERE DestStateFips IN (32) OR LongestAddGTime <> 15 OR DistanceGroup BETWEEN 7 AND 10 LIMIT 29"}
 {"sql":"SELECT ArrTimeBlk, AVG(DestAirportID) FROM mytable WHERE CancellationCode NOT IN ('noodles') OR DestWac BETWEEN 53 AND 1 GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrTimeBlk, AVG(DestAirportID) FROM mytable WHERE CancellationCode NOT IN ('noodles') OR DestWac BETWEEN 53 AND 1 GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 10"]}
-{"sql":"SELECT DivWheelsOns, DistanceGroup, WeatherDelay FROM mytable ORDER BY CarrierDelay, AirTime LIMIT 3","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DistanceGroup, WeatherDelay FROM mytable ORDER BY CarrierDelay, AirTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DistanceGroup, WeatherDelay FROM mytable ORDER BY CarrierDelay, AirTime LIMIT 3","hsqls":["SELECT DivWheelsOns, DistanceGroup, WeatherDelay FROM mytable ORDER BY CarrierDelay, AirTime LIMIT 10000"]}
 {"sql":"SELECT MAX(DepDelay) FROM mytable WHERE OriginStateName NOT IN ('Ohio') AND DestAirportSeqID BETWEEN 1092603 AND 1562401 OR AirTime BETWEEN 481 AND 247 LIMIT 28"}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY OriginStateFips, LongestAddGTime LIMIT 26"}
 {"sql":"SELECT Flights, DepTime, WheelsOn, COUNT(DepartureDelayGroups), AVG(TaxiIn), SUM(FlightNum) FROM mytable WHERE Quarter NOT IN (1) AND DepartureDelayGroups < 12 GROUP BY Flights, DepTime, WheelsOn  ORDER BY Flights, DepTime, WheelsOn LIMIT 4","hsqls":["SELECT Flights, DepTime, WheelsOn, COUNT(DepartureDelayGroups), AVG(TaxiIn), SUM(FlightNum) FROM mytable WHERE Quarter NOT IN (1) AND DepartureDelayGroups < 12 GROUP BY Flights, DepTime, WheelsOn  ORDER BY Flights, DepTime, WheelsOn LIMIT 4"]}
 {"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE DepartureDelayGroups BETWEEN 1 AND -1 ORDER BY TotalAddGTime, TailNum, DivArrDelay LIMIT 18"}
 {"sql":"SELECT TaxiOut, COUNT(*) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 OR UniqueCarrier BETWEEN 'B6' AND 'US' AND Diverted NOT IN (1, 0) GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 15","hsqls":["SELECT TaxiOut, COUNT(*) FROM mytable WHERE ArrDel15 BETWEEN 0 AND -9999 OR UniqueCarrier BETWEEN 'B6' AND 'US' AND Diverted NOT IN (1, 0) GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 15"]}
 {"sql":"SELECT \"Year\", Diverted, MIN(AirTime), MIN(Flights), MAX(LateAircraftDelay) FROM mytable WHERE Quarter <= 1 OR OriginCityMarketID <> 32891 GROUP BY \"Year\", Diverted LIMIT 22","hsqls":["SELECT Year, Diverted, MIN(AirTime), MIN(Flights), MAX(LateAircraftDelay) FROM mytable WHERE Quarter <= 1 OR OriginCityMarketID <> 32891 GROUP BY Year, Diverted LIMIT 22"]}
-{"sql":"SELECT DivDistance, ArrTimeBlk, \"Month\" FROM mytable WHERE DivTailNums BETWEEN 'N703TW' AND 'N478HA' OR DivTotalGTimes BETWEEN 64 AND 45 OR DestCityName BETWEEN 'Billings, MT' AND 'Sarasota/Bradenton, FL'","hsqls":["SELECT DivDistance, ArrTimeBlk, Month FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums__MV1 BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums__MV2 BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums__MV3 BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums__MV4 BETWEEN 'N703TW' AND 'N478HA') OR (DivTotalGTimes__MV0 BETWEEN 64 AND 45 OR DivTotalGTimes__MV1 BETWEEN 64 AND 45 OR DivTotalGTimes__MV2 BETWEEN 64 AND 45 OR DivTotalGTimes__MV3 BETWEEN 64 AND 45 OR DivTotalGTimes__MV4 BETWEEN 64 AND 45) OR DestCityName BETWEEN 'Billings, MT' AND 'Sarasota/Bradenton, FL' LIMIT 10000"]}
+{"sql":"SELECT DivDistance, ArrTimeBlk, \"Month\" FROM mytable WHERE DivTailNums BETWEEN 'N703TW' AND 'N478HA' OR DivTotalGTimes BETWEEN 64 AND 45 OR DestCityName BETWEEN 'Billings, MT' AND 'Sarasota/Bradenton, FL'","hsqls":["SELECT DivDistance, ArrTimeBlk, `Month` FROM mytable WHERE (DivTailNums[1] BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums[2] BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums[3] BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums[4] BETWEEN 'N703TW' AND 'N478HA' OR DivTailNums[5] BETWEEN 'N703TW' AND 'N478HA') OR (DivTotalGTimes[1] BETWEEN 64 AND 45 OR DivTotalGTimes[2] BETWEEN 64 AND 45 OR DivTotalGTimes[3] BETWEEN 64 AND 45 OR DivTotalGTimes[4] BETWEEN 64 AND 45 OR DivTotalGTimes[5] BETWEEN 64 AND 45) OR DestCityName BETWEEN 'Billings, MT' AND 'Sarasota/Bradenton, FL' LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DepDel15, DepTimeBlk FROM mytable ORDER BY CarrierDelay, OriginCityMarketID, TailNum LIMIT 3"}
 {"sql":"SELECT TaxiOut, DivDistance, DepDel15, MAX(SecurityDelay) FROM mytable GROUP BY TaxiOut, DivDistance, DepDel15","hsqls":["SELECT TaxiOut, DivDistance, DepDel15, MAX(SecurityDelay) FROM mytable GROUP BY TaxiOut, DivDistance, DepDel15"]}
 {"sql":"SELECT TaxiIn, DestStateName, DestCityName FROM mytable WHERE WeatherDelay IN (-9999) ORDER BY DivActualElapsedTime LIMIT 26"}
 {"sql":"SELECT Carrier FROM mytable WHERE UniqueCarrier NOT IN ('DL', 'WN', 'B6', 'FL', 'MQ') AND DestWac NOT IN (71, 39, 13, 74, 37) LIMIT 17"}
 {"sql":"SELECT FlightDate, TaxiIn, MAX(DistanceGroup), MAX(WeatherDelay) FROM mytable WHERE LateAircraftDelay >= 180 AND CRSElapsedTime BETWEEN 90 AND 339 AND CRSElapsedTime > 96 GROUP BY FlightDate, TaxiIn  ORDER BY FlightDate, TaxiIn LIMIT 13","hsqls":["SELECT FlightDate, TaxiIn, MAX(DistanceGroup), MAX(WeatherDelay) FROM mytable WHERE LateAircraftDelay >= 180 AND CRSElapsedTime BETWEEN 90 AND 339 AND CRSElapsedTime > 96 GROUP BY FlightDate, TaxiIn  ORDER BY FlightDate, TaxiIn LIMIT 13"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE OriginState <> 'IA' OR DivAirportIDs BETWEEN 14027 AND 15249 OR TaxiIn NOT IN (8) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 12","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE OriginState <> 'IA' OR (DivAirportIDs__MV0 BETWEEN 14027 AND 15249 OR DivAirportIDs__MV1 BETWEEN 14027 AND 15249 OR DivAirportIDs__MV2 BETWEEN 14027 AND 15249 OR DivAirportIDs__MV3 BETWEEN 14027 AND 15249 OR DivAirportIDs__MV4 BETWEEN 14027 AND 15249) OR TaxiIn NOT IN (8) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE OriginState <> 'IA' OR DivAirportIDs BETWEEN 14027 AND 15249 OR TaxiIn NOT IN (8) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 12","hsqls":["SELECT DivTailNums FROM mytable WHERE OriginState <> 'IA' OR (DivAirportIDs[1] BETWEEN 14027 AND 15249 OR DivAirportIDs[2] BETWEEN 14027 AND 15249 OR DivAirportIDs[3] BETWEEN 14027 AND 15249 OR DivAirportIDs[4] BETWEEN 14027 AND 15249 OR DivAirportIDs[5] BETWEEN 14027 AND 15249) OR TaxiIn NOT IN (8) ORDER BY DepDelayMinutes, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, Dest FROM mytable WHERE FlightNum <= 6183 AND DestWac IN (35, 63) OR DistanceGroup > 6 ORDER BY Flights LIMIT 16"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE DivTotalGTimes IN (97, 41, 80, 39) AND DivAirportIDs >= 11292 ORDER BY DepDel15 LIMIT 7","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 IN (97, 41, 80, 39) OR DivTotalGTimes__MV1 IN (97, 41, 80, 39) OR DivTotalGTimes__MV2 IN (97, 41, 80, 39) OR DivTotalGTimes__MV3 IN (97, 41, 80, 39) OR DivTotalGTimes__MV4 IN (97, 41, 80, 39)) AND (DivAirportIDs__MV0 >= 11292 OR DivAirportIDs__MV1 >= 11292 OR DivAirportIDs__MV2 >= 11292 OR DivAirportIDs__MV3 >= 11292 OR DivAirportIDs__MV4 >= 11292) ORDER BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE DivTotalGTimes IN (97, 41, 80, 39) AND DivAirportIDs >= 11292 ORDER BY DepDel15 LIMIT 7","hsqls":["SELECT DivAirportIDs FROM mytable WHERE (DivTotalGTimes[1] IN (97, 41, 80, 39) OR DivTotalGTimes[2] IN (97, 41, 80, 39) OR DivTotalGTimes[3] IN (97, 41, 80, 39) OR DivTotalGTimes[4] IN (97, 41, 80, 39) OR DivTotalGTimes[5] IN (97, 41, 80, 39)) AND (DivAirportIDs[1] >= 11292 OR DivAirportIDs[2] >= 11292 OR DivAirportIDs[3] >= 11292 OR DivAirportIDs[4] >= 11292 OR DivAirportIDs[5] >= 11292) ORDER BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT AirTime, COUNT(DestCityMarketID) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 28","hsqls":["SELECT AirTime, COUNT(DestCityMarketID) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 28"]}
 {"sql":"SELECT LateAircraftDelay, TotalAddGTime FROM mytable WHERE LateAircraftDelay <= 87 OR UniqueCarrier = 'AA' OR UniqueCarrier >= 'WN' ORDER BY DepDelayMinutes, Cancelled, DepDel15 LIMIT 14"}
-{"sql":"SELECT OriginState FROM mytable WHERE DivAirportIDs IN (14512, 14057, 13485, 10620, 13424) LIMIT 17","hsqls":["SELECT OriginState FROM mytable WHERE (DivAirportIDs__MV0 IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs__MV1 IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs__MV2 IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs__MV3 IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs__MV4 IN (14512, 14057, 13485, 10620, 13424)) LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE DivAirportIDs IN (14512, 14057, 13485, 10620, 13424) LIMIT 17","hsqls":["SELECT OriginState FROM mytable WHERE (DivAirportIDs[1] IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs[2] IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs[3] IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs[4] IN (14512, 14057, 13485, 10620, 13424) OR DivAirportIDs[5] IN (14512, 14057, 13485, 10620, 13424)) LIMIT 10000"]}
 {"sql":"SELECT CRSElapsedTime FROM mytable WHERE DivActualElapsedTime IN (364, 466, 160, 268) LIMIT 8"}
 {"sql":"SELECT OriginAirportSeqID, AirTime FROM mytable WHERE DepDel15 = 1 AND LongestAddGTime IN (148, 39) LIMIT 12"}
 {"sql":"SELECT WheelsOn, MIN(OriginStateFips), AVG(DivArrDelay), MAX(ActualElapsedTime) FROM mytable WHERE DestStateName BETWEEN 'Alabama' AND 'Rhode Island' AND DayofMonth BETWEEN 24 AND 25 OR WheelsOn BETWEEN 1823 AND 1723 GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 29","hsqls":["SELECT WheelsOn, MIN(OriginStateFips), AVG(DivArrDelay), MAX(ActualElapsedTime) FROM mytable WHERE DestStateName BETWEEN 'Alabama' AND 'Rhode Island' AND DayofMonth BETWEEN 24 AND 25 OR WheelsOn BETWEEN 1823 AND 1723 GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 29"]}
 {"sql":"SELECT TaxiIn, DivArrDelay, DaysSinceEpoch FROM mytable WHERE DivActualElapsedTime > 372 AND ArrDelayMinutes <> 60.0 OR TaxiIn BETWEEN 22 AND 84 ORDER BY \"Year\", LongestAddGTime, ActualElapsedTime LIMIT 6","hsqls":["SELECT TaxiIn, DivArrDelay, DaysSinceEpoch FROM mytable WHERE DivActualElapsedTime > 372 AND ArrDelayMinutes <> 60.0 OR TaxiIn BETWEEN 22 AND 84 ORDER BY Year, LongestAddGTime, ActualElapsedTime LIMIT 6"]}
 {"sql":"SELECT DestAirportSeqID, DayofMonth, ArrivalDelayGroups FROM mytable LIMIT 24"}
 {"sql":"SELECT MAX(DivActualElapsedTime) FROM mytable WHERE FirstDepTime BETWEEN 1043 AND 727 OR TailNum < 'N4XKAA' AND CancellationCode BETWEEN 'noodles' AND 'B' LIMIT 10"}
-{"sql":"SELECT DepartureDelayGroups, \"Month\", OriginStateName FROM mytable WHERE Distance BETWEEN 852 AND 543 OR ActualElapsedTime = 357 OR DivWheelsOffs BETWEEN 1833 AND 1503 ORDER BY WheelsOn LIMIT 24","hsqls":["SELECT DepartureDelayGroups, Month, OriginStateName FROM mytable WHERE Distance BETWEEN 852 AND 543 OR ActualElapsedTime = 357 OR (DivWheelsOffs__MV0 BETWEEN 1833 AND 1503 OR DivWheelsOffs__MV1 BETWEEN 1833 AND 1503 OR DivWheelsOffs__MV2 BETWEEN 1833 AND 1503 OR DivWheelsOffs__MV3 BETWEEN 1833 AND 1503 OR DivWheelsOffs__MV4 BETWEEN 1833 AND 1503) ORDER BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, \"Month\", OriginStateName FROM mytable WHERE Distance BETWEEN 852 AND 543 OR ActualElapsedTime = 357 OR DivWheelsOffs BETWEEN 1833 AND 1503 ORDER BY WheelsOn LIMIT 24","hsqls":["SELECT DepartureDelayGroups, Month, OriginStateName FROM mytable WHERE Distance BETWEEN 852 AND 543 OR ActualElapsedTime = 357 OR (DivWheelsOffs[1] BETWEEN 1833 AND 1503 OR DivWheelsOffs[2] BETWEEN 1833 AND 1503 OR DivWheelsOffs[3] BETWEEN 1833 AND 1503 OR DivWheelsOffs[4] BETWEEN 1833 AND 1503 OR DivWheelsOffs[5] BETWEEN 1833 AND 1503) ORDER BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT Cancelled FROM mytable WHERE SecurityDelay BETWEEN -9999 AND 18 AND DayOfWeek IN (5) OR DivArrDelay NOT IN (979, 114, 225) ORDER BY Flights, DivActualElapsedTime, OriginAirportID LIMIT 25"}
 {"sql":"SELECT OriginCityMarketID FROM mytable ORDER BY TaxiOut, OriginCityName LIMIT 26"}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE OriginAirportID BETWEEN 10792 AND 14709 AND DestCityName < 'Cleveland, OH' LIMIT 16"}
 {"sql":"SELECT SUM(DivAirportLandings), MAX(WeatherDelay) FROM mytable WHERE WeatherDelay IN (111, 23, 86, 39, -9999) AND Distance IN (2554, 2165) OR Flights = 1 LIMIT 14"}
-{"sql":"SELECT OriginCityMarketID, DivWheelsOffs, WheelsOn FROM mytable WHERE TotalAddGTime IN (7) AND ArrTime BETWEEN 1736 AND 2126 ORDER BY TotalAddGTime, Origin, DaysSinceEpoch LIMIT 13","hsqls":["SELECT OriginCityMarketID, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, WheelsOn FROM mytable WHERE TotalAddGTime IN (7) AND ArrTime BETWEEN 1736 AND 2126 ORDER BY TotalAddGTime, Origin, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT TailNum, DestAirportID, MIN(\"Year\"), MAX(CRSElapsedTime) FROM mytable WHERE OriginCityName BETWEEN 'Helena, MT' AND 'Palm Springs, CA' OR DestAirportID = 11982 GROUP BY TailNum, DestAirportID LIMIT 5","hsqls":["SELECT TailNum, DestAirportID, MIN(Year), MAX(CRSElapsedTime) FROM mytable WHERE OriginCityName BETWEEN 'Helena, MT' AND 'Palm Springs, CA' OR DestAirportID = 11982 GROUP BY TailNum, DestAirportID LIMIT 5"]}
+{"sql":"SELECT OriginCityMarketID, DivWheelsOffs, WheelsOn FROM mytable WHERE TotalAddGTime IN (7) AND ArrTime BETWEEN 1736 AND 2126 ORDER BY TotalAddGTime, Origin, DaysSinceEpoch LIMIT 13","hsqls":["SELECT OriginCityMarketID, DivWheelsOffs, WheelsOn FROM mytable WHERE TotalAddGTime IN (7) AND ArrTime BETWEEN 1736 AND 2126 ORDER BY TotalAddGTime, Origin, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT TailNum, DestAirportID, MIN(\"Year\"), MAX(CRSElapsedTime) FROM mytable WHERE OriginCityName BETWEEN 'Helena, MT' AND 'Palm Springs, CA' OR DestAirportID = 11982 GROUP BY TailNum, DestAirportID LIMIT 5","hsqls":["SELECT TailNum, DestAirportID, MIN(`Year`), MAX(CRSElapsedTime) FROM mytable WHERE OriginCityName BETWEEN 'Helena, MT' AND 'Palm Springs, CA' OR DestAirportID = 11982 GROUP BY TailNum, DestAirportID LIMIT 5"]}
 {"sql":"SELECT DivReachedDest, DestWac, Quarter, MAX(DayofMonth), COUNT(FlightDate) FROM mytable WHERE OriginStateFips IN (47, 17, 16, 29) OR Carrier BETWEEN 'OO' AND 'UA' AND DayofMonth NOT IN (3, 6, 27, 28) GROUP BY DivReachedDest, DestWac, Quarter  ORDER BY DivReachedDest, DestWac, Quarter LIMIT 14","hsqls":["SELECT DivReachedDest, DestWac, Quarter, MAX(DayofMonth), COUNT(FlightDate) FROM mytable WHERE OriginStateFips IN (47, 17, 16, 29) OR Carrier BETWEEN 'OO' AND 'UA' AND DayofMonth NOT IN (3, 6, 27, 28) GROUP BY DivReachedDest, DestWac, Quarter  ORDER BY DivReachedDest, DestWac, Quarter LIMIT 14"]}
 {"sql":"SELECT Origin, ArrDelay, OriginWac, MAX(Flights), AVG(DestStateFips) FROM mytable GROUP BY Origin, ArrDelay, OriginWac  ORDER BY Origin, ArrDelay, OriginWac LIMIT 26","hsqls":["SELECT Origin, ArrDelay, OriginWac, MAX(Flights), AVG(DestStateFips) FROM mytable GROUP BY Origin, ArrDelay, OriginWac  ORDER BY Origin, ArrDelay, OriginWac LIMIT 26"]}
 {"sql":"SELECT SUM(FlightNum), SUM(OriginStateFips) FROM mytable LIMIT 28"}
 {"sql":"SELECT TaxiOut, DepDelay, DestAirportSeqID FROM mytable WHERE OriginCityMarketID BETWEEN 33377 AND 33195 AND DayofMonth <= 6 ORDER BY Quarter, Distance, DepTime LIMIT 18"}
 {"sql":"SELECT DepartureDelayGroups, TotalAddGTime, ArrDelayMinutes FROM mytable WHERE CRSArrTime IN (852, 1230, 1711, 1529) AND DestAirportID >= 14193 ORDER BY Dest, OriginAirportID LIMIT 9"}
-{"sql":"SELECT DestAirportSeqID FROM mytable WHERE DivWheelsOffs < 1212 ORDER BY OriginStateFips, Cancelled, UniqueCarrier LIMIT 2","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE (DivWheelsOffs__MV0 < 1212 OR DivWheelsOffs__MV1 < 1212 OR DivWheelsOffs__MV2 < 1212 OR DivWheelsOffs__MV3 < 1212 OR DivWheelsOffs__MV4 < 1212) ORDER BY OriginStateFips, Cancelled, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID FROM mytable WHERE DivWheelsOffs < 1212 ORDER BY OriginStateFips, Cancelled, UniqueCarrier LIMIT 2","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE (DivWheelsOffs[1] < 1212 OR DivWheelsOffs[2] < 1212 OR DivWheelsOffs[3] < 1212 OR DivWheelsOffs[4] < 1212 OR DivWheelsOffs[5] < 1212) ORDER BY OriginStateFips, Cancelled, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable ORDER BY DestState, OriginStateName, DayOfWeek LIMIT 9"}
 {"sql":"SELECT MAX(TaxiIn), MAX(DivAirportLandings) FROM mytable LIMIT 1"}
 {"sql":"SELECT DestCityName, DayofMonth, OriginStateName FROM mytable WHERE DepDelayMinutes < 160.0 OR Quarter <> 1 ORDER BY DistanceGroup, CancellationCode LIMIT 24"}
-{"sql":"SELECT DepartureDelayGroups, Flights, DepDelayMinutes, MAX(\"Year\"), MIN(Flights), MAX(DivActualElapsedTime) FROM mytable WHERE DestWac <> 62 AND DivWheelsOns BETWEEN 2015 AND 1313 OR DepartureDelayGroups > 2 GROUP BY DepartureDelayGroups, Flights, DepDelayMinutes LIMIT 21","hsqls":["SELECT DepartureDelayGroups, Flights, DepDelayMinutes, MAX(Year), MIN(Flights), MAX(DivActualElapsedTime) FROM mytable WHERE DestWac <> 62 AND (DivWheelsOns__MV0 BETWEEN 2015 AND 1313 OR DivWheelsOns__MV1 BETWEEN 2015 AND 1313 OR DivWheelsOns__MV2 BETWEEN 2015 AND 1313 OR DivWheelsOns__MV3 BETWEEN 2015 AND 1313 OR DivWheelsOns__MV4 BETWEEN 2015 AND 1313) OR DepartureDelayGroups > 2 GROUP BY DepartureDelayGroups, Flights, DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Flights, DepDelayMinutes, MAX(\"Year\"), MIN(Flights), MAX(DivActualElapsedTime) FROM mytable WHERE DestWac <> 62 AND DivWheelsOns BETWEEN 2015 AND 1313 OR DepartureDelayGroups > 2 GROUP BY DepartureDelayGroups, Flights, DepDelayMinutes LIMIT 21","hsqls":["SELECT DepartureDelayGroups, Flights, DepDelayMinutes, MAX(`Year`), MIN(Flights), MAX(DivActualElapsedTime) FROM mytable WHERE DestWac <> 62 AND (DivWheelsOns[1] BETWEEN 2015 AND 1313 OR DivWheelsOns[2] BETWEEN 2015 AND 1313 OR DivWheelsOns[3] BETWEEN 2015 AND 1313 OR DivWheelsOns[4] BETWEEN 2015 AND 1313 OR DivWheelsOns[5] BETWEEN 2015 AND 1313) OR DepartureDelayGroups > 2 GROUP BY DepartureDelayGroups, Flights, DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE TaxiIn BETWEEN 41 AND 31 LIMIT 4"}
 {"sql":"SELECT OriginStateFips, NASDelay, MAX(ArrDelayMinutes) FROM mytable WHERE OriginAirportID IN (12523, 11066, 10620) OR LateAircraftDelay NOT IN (10, 107) GROUP BY OriginStateFips, NASDelay  ORDER BY OriginStateFips, NASDelay LIMIT 25","hsqls":["SELECT OriginStateFips, NASDelay, MAX(ArrDelayMinutes) FROM mytable WHERE OriginAirportID IN (12523, 11066, 10620) OR LateAircraftDelay NOT IN (10, 107) GROUP BY OriginStateFips, NASDelay  ORDER BY OriginStateFips, NASDelay LIMIT 25"]}
 {"sql":"SELECT LateAircraftDelay, Carrier, DayofMonth, MIN(WheelsOn), MIN(ArrTime) FROM mytable GROUP BY LateAircraftDelay, Carrier, DayofMonth  ORDER BY LateAircraftDelay, Carrier, DayofMonth LIMIT 5","hsqls":["SELECT LateAircraftDelay, Carrier, DayofMonth, MIN(WheelsOn), MIN(ArrTime) FROM mytable GROUP BY LateAircraftDelay, Carrier, DayofMonth  ORDER BY LateAircraftDelay, Carrier, DayofMonth LIMIT 5"]}
 {"sql":"SELECT DestState FROM mytable LIMIT 29"}
-{"sql":"SELECT NASDelay FROM mytable WHERE DivAirportSeqIDs BETWEEN 1052103 AND 1233904 OR ActualElapsedTime >= 173 AND NASDelay BETWEEN 68 AND 78 ORDER BY DepTime LIMIT 9","hsqls":["SELECT NASDelay FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs__MV1 BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs__MV2 BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs__MV3 BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs__MV4 BETWEEN 1052103 AND 1233904) OR ActualElapsedTime >= 173 AND NASDelay BETWEEN 68 AND 78 ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT NASDelay FROM mytable WHERE DivAirportSeqIDs BETWEEN 1052103 AND 1233904 OR ActualElapsedTime >= 173 AND NASDelay BETWEEN 68 AND 78 ORDER BY DepTime LIMIT 9","hsqls":["SELECT NASDelay FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs[2] BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs[3] BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs[4] BETWEEN 1052103 AND 1233904 OR DivAirportSeqIDs[5] BETWEEN 1052103 AND 1233904) OR ActualElapsedTime >= 173 AND NASDelay BETWEEN 68 AND 78 ORDER BY DepTime LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, OriginWac, COUNT(*) FROM mytable WHERE DestCityMarketID NOT IN (30990, 30599) GROUP BY OriginStateFips, OriginWac  ORDER BY OriginStateFips, OriginWac LIMIT 4","hsqls":["SELECT OriginStateFips, OriginWac, COUNT(*) FROM mytable WHERE DestCityMarketID NOT IN (30990, 30599) GROUP BY OriginStateFips, OriginWac  ORDER BY OriginStateFips, OriginWac LIMIT 4"]}
 {"sql":"SELECT FlightNum, DayOfWeek FROM mytable LIMIT 16"}
 {"sql":"SELECT DepartureDelayGroups, WheelsOff, DepDelayMinutes, COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' GROUP BY DepartureDelayGroups, WheelsOff, DepDelayMinutes  ORDER BY DepartureDelayGroups, WheelsOff, DepDelayMinutes LIMIT 10","hsqls":["SELECT DepartureDelayGroups, WheelsOff, DepDelayMinutes, COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' GROUP BY DepartureDelayGroups, WheelsOff, DepDelayMinutes  ORDER BY DepartureDelayGroups, WheelsOff, DepDelayMinutes LIMIT 10"]}
-{"sql":"SELECT DivAirports, DivAirportLandings FROM mytable LIMIT 26","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DivAirportLandings FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DivAirportLandings FROM mytable LIMIT 26","hsqls":["SELECT DivAirports, DivAirportLandings FROM mytable LIMIT 10000"]}
 {"sql":"SELECT FlightDate, OriginAirportID FROM mytable WHERE OriginCityName IN ('Grand Rapids, MI', 'Mosinee, WI', 'Saginaw/Bay City/Midland, MI') OR DestStateName IN ('New Hampshire', 'Pennsylvania', 'Utah', 'Puerto Rico', 'Alaska') ORDER BY Carrier LIMIT 21"}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable WHERE WheelsOff = 1115 OR DestStateFips BETWEEN 41 AND 24 AND Dest NOT IN ('LRD') GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 2","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable WHERE WheelsOff = 1115 OR DestStateFips BETWEEN 41 AND 24 AND Dest NOT IN ('LRD') GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 2"]}
 {"sql":"SELECT DestCityName, DivAirportLandings FROM mytable WHERE DestState IN ('MS') AND Origin IN ('BDL', 'GPT') OR Origin = 'CMX' ORDER BY CancellationCode LIMIT 22"}
-{"sql":"SELECT TotalAddGTime, DivTotalGTimes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DivReachedDest, CRSDepTime, DaysSinceEpoch LIMIT 13","hsqls":["SELECT TotalAddGTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DivReachedDest, CRSDepTime, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes, CancellationCode, OriginAirportID, MIN(TotalAddGTime), MAX(ArrTime) FROM mytable WHERE DivAirports IN ('LMT', 'MAF', 'SRQ') GROUP BY ArrDelayMinutes, CancellationCode, OriginAirportID LIMIT 15","hsqls":["SELECT ArrDelayMinutes, CancellationCode, OriginAirportID, MIN(TotalAddGTime), MAX(ArrTime) FROM mytable WHERE (DivAirports__MV0 IN ('LMT', 'MAF', 'SRQ') OR DivAirports__MV1 IN ('LMT', 'MAF', 'SRQ') OR DivAirports__MV2 IN ('LMT', 'MAF', 'SRQ') OR DivAirports__MV3 IN ('LMT', 'MAF', 'SRQ') OR DivAirports__MV4 IN ('LMT', 'MAF', 'SRQ')) GROUP BY ArrDelayMinutes, CancellationCode, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DivTotalGTimes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DivReachedDest, CRSDepTime, DaysSinceEpoch LIMIT 13","hsqls":["SELECT TotalAddGTime, DivTotalGTimes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY DivReachedDest, CRSDepTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, CancellationCode, OriginAirportID, MIN(TotalAddGTime), MAX(ArrTime) FROM mytable WHERE DivAirports IN ('LMT', 'MAF', 'SRQ') GROUP BY ArrDelayMinutes, CancellationCode, OriginAirportID LIMIT 15","hsqls":["SELECT ArrDelayMinutes, CancellationCode, OriginAirportID, MIN(TotalAddGTime), MAX(ArrTime) FROM mytable WHERE (DivAirports[1] IN ('LMT', 'MAF', 'SRQ') OR DivAirports[2] IN ('LMT', 'MAF', 'SRQ') OR DivAirports[3] IN ('LMT', 'MAF', 'SRQ') OR DivAirports[4] IN ('LMT', 'MAF', 'SRQ') OR DivAirports[5] IN ('LMT', 'MAF', 'SRQ')) GROUP BY ArrDelayMinutes, CancellationCode, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT TailNum, OriginAirportID FROM mytable WHERE CarrierDelay >= 72 OR ArrDelayMinutes <> 234.0 AND CarrierDelay BETWEEN 106 AND 131 LIMIT 23"}
 {"sql":"SELECT DepDelay, OriginCityName, DaysSinceEpoch, MIN(ArrDelayMinutes) FROM mytable WHERE Origin >= 'DHN' GROUP BY DepDelay, OriginCityName, DaysSinceEpoch  ORDER BY DepDelay, OriginCityName, DaysSinceEpoch LIMIT 18","hsqls":["SELECT DepDelay, OriginCityName, DaysSinceEpoch, MIN(ArrDelayMinutes) FROM mytable WHERE Origin >= 'DHN' GROUP BY DepDelay, OriginCityName, DaysSinceEpoch  ORDER BY DepDelay, OriginCityName, DaysSinceEpoch LIMIT 18"]}
 {"sql":"SELECT DivReachedDest, COUNT(*) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 29","hsqls":["SELECT DivReachedDest, COUNT(*) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 29"]}
 {"sql":"SELECT ArrDelay, \"Month\", OriginStateName FROM mytable ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 26","hsqls":["SELECT ArrDelay, Month, OriginStateName FROM mytable ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 26"]}
 {"sql":"SELECT DepDelay, LateAircraftDelay, DepTimeBlk, SUM(OriginWac) FROM mytable WHERE DivArrDelay IN (87) AND DestCityMarketID IN (32457) AND ArrDelay IN (-13.0, 78.0, 73.0, 151.0) GROUP BY DepDelay, LateAircraftDelay, DepTimeBlk  ORDER BY DepDelay, LateAircraftDelay, DepTimeBlk LIMIT 16","hsqls":["SELECT DepDelay, LateAircraftDelay, DepTimeBlk, SUM(OriginWac) FROM mytable WHERE DivArrDelay IN (87) AND DestCityMarketID IN (32457) AND ArrDelay IN (-13.0, 78.0, 73.0, 151.0) GROUP BY DepDelay, LateAircraftDelay, DepTimeBlk  ORDER BY DepDelay, LateAircraftDelay, DepTimeBlk LIMIT 16"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE TaxiIn BETWEEN 27 AND 116 OR DayOfWeek > 5 LIMIT 19"}
-{"sql":"SELECT DepDelay, DivAirportIDs, WheelsOn FROM mytable WHERE DestAirportID < 11540 OR \"Month\" BETWEEN 1 AND 1 AND \"Year\" IN (2014) LIMIT 9","hsqls":["SELECT DepDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, WheelsOn FROM mytable WHERE DestAirportID < 11540 OR Month BETWEEN 1 AND 1 AND Year IN (2014) LIMIT 10000"]}
-{"sql":"SELECT Dest, ArrDel15, CRSElapsedTime FROM mytable WHERE DivAirportSeqIDs BETWEEN 1432103 AND 1147103 OR WheelsOn BETWEEN 1328 AND 641 OR DestState >= 'SD' ORDER BY DivAirportLandings LIMIT 22","hsqls":["SELECT Dest, ArrDel15, CRSElapsedTime FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs__MV1 BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs__MV2 BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs__MV3 BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs__MV4 BETWEEN 1432103 AND 1147103) OR WheelsOn BETWEEN 1328 AND 641 OR DestState >= 'SD' ORDER BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivAirportIDs, WheelsOn FROM mytable WHERE DestAirportID < 11540 OR \"Month\" BETWEEN 1 AND 1 AND \"Year\" IN (2014) LIMIT 9","hsqls":["SELECT DepDelay, DivAirportIDs, WheelsOn FROM mytable WHERE DestAirportID < 11540 OR `Month` BETWEEN 1 AND 1 AND `Year` IN (2014) LIMIT 10000"]}
+{"sql":"SELECT Dest, ArrDel15, CRSElapsedTime FROM mytable WHERE DivAirportSeqIDs BETWEEN 1432103 AND 1147103 OR WheelsOn BETWEEN 1328 AND 641 OR DestState >= 'SD' ORDER BY DivAirportLandings LIMIT 22","hsqls":["SELECT Dest, ArrDel15, CRSElapsedTime FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs[2] BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs[3] BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs[4] BETWEEN 1432103 AND 1147103 OR DivAirportSeqIDs[5] BETWEEN 1432103 AND 1147103) OR WheelsOn BETWEEN 1328 AND 641 OR DestState >= 'SD' ORDER BY DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT AVG(OriginWac) FROM mytable LIMIT 7"}
-{"sql":"SELECT DivReachedDest, MAX(CRSDepTime) FROM mytable WHERE DivLongestGTimes BETWEEN 66.0 AND 23.0 GROUP BY DivReachedDest LIMIT 7","hsqls":["SELECT DivReachedDest, MAX(CRSDepTime) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 66.0 AND 23.0 OR DivLongestGTimes__MV1 BETWEEN 66.0 AND 23.0 OR DivLongestGTimes__MV2 BETWEEN 66.0 AND 23.0 OR DivLongestGTimes__MV3 BETWEEN 66.0 AND 23.0 OR DivLongestGTimes__MV4 BETWEEN 66.0 AND 23.0) GROUP BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, MAX(CRSDepTime) FROM mytable WHERE DivLongestGTimes BETWEEN 66.0 AND 23.0 GROUP BY DivReachedDest LIMIT 7","hsqls":["SELECT DivReachedDest, MAX(CRSDepTime) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 66.0 AND 23.0 OR DivLongestGTimes[2] BETWEEN 66.0 AND 23.0 OR DivLongestGTimes[3] BETWEEN 66.0 AND 23.0 OR DivLongestGTimes[4] BETWEEN 66.0 AND 23.0 OR DivLongestGTimes[5] BETWEEN 66.0 AND 23.0) GROUP BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT OriginWac, COUNT(*) FROM mytable WHERE OriginWac NOT IN (43, 82, 83, 88) OR WheelsOff BETWEEN 857 AND 1627 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 17","hsqls":["SELECT OriginWac, COUNT(*) FROM mytable WHERE OriginWac NOT IN (43, 82, 83, 88) OR WheelsOff BETWEEN 857 AND 1627 GROUP BY OriginWac  ORDER BY OriginWac LIMIT 17"]}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 7","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 7"]}
 {"sql":"SELECT Quarter, ActualElapsedTime, CRSElapsedTime, COUNT(*) FROM mytable WHERE Diverted < 0 GROUP BY Quarter, ActualElapsedTime, CRSElapsedTime  ORDER BY Quarter, ActualElapsedTime, CRSElapsedTime LIMIT 27","hsqls":["SELECT Quarter, ActualElapsedTime, CRSElapsedTime, COUNT(*) FROM mytable WHERE Diverted < 0 GROUP BY Quarter, ActualElapsedTime, CRSElapsedTime  ORDER BY Quarter, ActualElapsedTime, CRSElapsedTime LIMIT 27"]}
 {"sql":"SELECT OriginCityMarketID, DepTime, DaysSinceEpoch FROM mytable WHERE OriginState BETWEEN 'VT' AND 'HI' ORDER BY CRSArrTime LIMIT 22"}
 {"sql":"SELECT TaxiOut, AirlineID FROM mytable LIMIT 21"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelay IN (174.0) OR TaxiOut IN (48, 121, 93, 9) LIMIT 12"}
-{"sql":"SELECT DestStateFips, MAX(DepDelayMinutes), AVG(DestCityMarketID) FROM mytable WHERE DestStateFips = 10 AND DivActualElapsedTime NOT IN (417, 474) AND DivAirportSeqIDs IN (1425202, 1233904, 1143302, 1177502) GROUP BY DestStateFips LIMIT 26","hsqls":["SELECT DestStateFips, MAX(DepDelayMinutes), AVG(DestCityMarketID) FROM mytable WHERE DestStateFips = 10 AND DivActualElapsedTime NOT IN (417, 474) AND (DivAirportSeqIDs__MV0 IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs__MV1 IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs__MV2 IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs__MV3 IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs__MV4 IN (1425202, 1233904, 1143302, 1177502)) GROUP BY DestStateFips LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DestStateFips, Origin FROM mytable LIMIT 17","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestStateFips, Origin FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, MAX(DepDelayMinutes), AVG(DestCityMarketID) FROM mytable WHERE DestStateFips = 10 AND DivActualElapsedTime NOT IN (417, 474) AND DivAirportSeqIDs IN (1425202, 1233904, 1143302, 1177502) GROUP BY DestStateFips LIMIT 26","hsqls":["SELECT DestStateFips, MAX(DepDelayMinutes), AVG(DestCityMarketID) FROM mytable WHERE DestStateFips = 10 AND DivActualElapsedTime NOT IN (417, 474) AND (DivAirportSeqIDs[1] IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs[2] IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs[3] IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs[4] IN (1425202, 1233904, 1143302, 1177502) OR DivAirportSeqIDs[5] IN (1425202, 1233904, 1143302, 1177502)) GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestStateFips, Origin FROM mytable LIMIT 17","hsqls":["SELECT DivLongestGTimes, DestStateFips, Origin FROM mytable LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE DestCityMarketID = 30781 ORDER BY CarrierDelay LIMIT 20"}
-{"sql":"SELECT Flights, ArrDel15, SUM(DivAirportLandings) FROM mytable WHERE DivWheelsOffs BETWEEN 1614 AND 1107 OR FirstDepTime IN (1136) OR ArrTime IN (1011) GROUP BY Flights, ArrDel15 LIMIT 15","hsqls":["SELECT Flights, ArrDel15, SUM(DivAirportLandings) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1614 AND 1107 OR DivWheelsOffs__MV1 BETWEEN 1614 AND 1107 OR DivWheelsOffs__MV2 BETWEEN 1614 AND 1107 OR DivWheelsOffs__MV3 BETWEEN 1614 AND 1107 OR DivWheelsOffs__MV4 BETWEEN 1614 AND 1107) OR FirstDepTime IN (1136) OR ArrTime IN (1011) GROUP BY Flights, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19393 AND 20366 AND DivAirportIDs IN (13029, -9999) GROUP BY TailNum LIMIT 7","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19393 AND 20366 AND (DivAirportIDs__MV0 IN (13029, -9999) OR DivAirportIDs__MV1 IN (13029, -9999) OR DivAirportIDs__MV2 IN (13029, -9999) OR DivAirportIDs__MV3 IN (13029, -9999) OR DivAirportIDs__MV4 IN (13029, -9999)) GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT Flights, ArrDel15, SUM(DivAirportLandings) FROM mytable WHERE DivWheelsOffs BETWEEN 1614 AND 1107 OR FirstDepTime IN (1136) OR ArrTime IN (1011) GROUP BY Flights, ArrDel15 LIMIT 15","hsqls":["SELECT Flights, ArrDel15, SUM(DivAirportLandings) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1614 AND 1107 OR DivWheelsOffs[2] BETWEEN 1614 AND 1107 OR DivWheelsOffs[3] BETWEEN 1614 AND 1107 OR DivWheelsOffs[4] BETWEEN 1614 AND 1107 OR DivWheelsOffs[5] BETWEEN 1614 AND 1107) OR FirstDepTime IN (1136) OR ArrTime IN (1011) GROUP BY Flights, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19393 AND 20366 AND DivAirportIDs IN (13029, -9999) GROUP BY TailNum LIMIT 7","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19393 AND 20366 AND (DivAirportIDs[1] IN (13029, -9999) OR DivAirportIDs[2] IN (13029, -9999) OR DivAirportIDs[3] IN (13029, -9999) OR DivAirportIDs[4] IN (13029, -9999) OR DivAirportIDs[5] IN (13029, -9999)) GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT SUM(ArrDel15) FROM mytable WHERE AirTime <= 220 OR OriginCityName BETWEEN 'Columbus, MS' AND 'Mosinee, WI' OR WeatherDelay NOT IN (170, 92, 46, 31) LIMIT 29"}
 {"sql":"SELECT Origin, AirlineID, COUNT(*) FROM mytable GROUP BY Origin, AirlineID  ORDER BY Origin, AirlineID LIMIT 9","hsqls":["SELECT Origin, AirlineID, COUNT(*) FROM mytable GROUP BY Origin, AirlineID  ORDER BY Origin, AirlineID LIMIT 9"]}
 {"sql":"SELECT OriginAirportSeqID, DestStateFips, DayOfWeek, MIN(DepDel15), COUNT(DaysSinceEpoch) FROM mytable WHERE NASDelay BETWEEN 7 AND 211 GROUP BY OriginAirportSeqID, DestStateFips, DayOfWeek  ORDER BY OriginAirportSeqID, DestStateFips, DayOfWeek LIMIT 26","hsqls":["SELECT OriginAirportSeqID, DestStateFips, DayOfWeek, MIN(DepDel15), COUNT(DaysSinceEpoch) FROM mytable WHERE NASDelay BETWEEN 7 AND 211 GROUP BY OriginAirportSeqID, DestStateFips, DayOfWeek  ORDER BY OriginAirportSeqID, DestStateFips, DayOfWeek LIMIT 26"]}
-{"sql":"SELECT ArrTimeBlk FROM mytable WHERE Cancelled NOT IN (1, 0) AND TaxiOut > 87 OR DistanceGroup BETWEEN 9 AND 2 ORDER BY DepartureDelayGroups, \"Year\" LIMIT 12","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE Cancelled NOT IN (1, 0) AND TaxiOut > 87 OR DistanceGroup BETWEEN 9 AND 2 ORDER BY DepartureDelayGroups, Year LIMIT 12"]}
-{"sql":"SELECT DivLongestGTimes, Quarter, DivAirportSeqIDs FROM mytable WHERE LongestAddGTime NOT IN (96, 41, 31, 15, 8) AND Dest BETWEEN 'ROC' AND 'BQK' ORDER BY LongestAddGTime, FlightNum, UniqueCarrier LIMIT 18","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Quarter, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE LongestAddGTime NOT IN (96, 41, 31, 15, 8) AND Dest BETWEEN 'ROC' AND 'BQK' ORDER BY LongestAddGTime, FlightNum, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk FROM mytable WHERE Cancelled NOT IN (1, 0) AND TaxiOut > 87 OR DistanceGroup BETWEEN 9 AND 2 ORDER BY DepartureDelayGroups, \"Year\" LIMIT 12","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE Cancelled NOT IN (1, 0) AND TaxiOut > 87 OR DistanceGroup BETWEEN 9 AND 2 ORDER BY DepartureDelayGroups, `Year` LIMIT 12"]}
+{"sql":"SELECT DivLongestGTimes, Quarter, DivAirportSeqIDs FROM mytable WHERE LongestAddGTime NOT IN (96, 41, 31, 15, 8) AND Dest BETWEEN 'ROC' AND 'BQK' ORDER BY LongestAddGTime, FlightNum, UniqueCarrier LIMIT 18","hsqls":["SELECT DivLongestGTimes, Quarter, DivAirportSeqIDs FROM mytable WHERE LongestAddGTime NOT IN (96, 41, 31, 15, 8) AND Dest BETWEEN 'ROC' AND 'BQK' ORDER BY LongestAddGTime, FlightNum, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DivActualElapsedTime, MIN(OriginAirportID), MAX(CRSDepTime), AVG(DepTime) FROM mytable GROUP BY CRSArrTime, DivActualElapsedTime  ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 28","hsqls":["SELECT CRSArrTime, DivActualElapsedTime, MIN(OriginAirportID), MAX(CRSDepTime), AVG(DepTime) FROM mytable GROUP BY CRSArrTime, DivActualElapsedTime  ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 28"]}
 {"sql":"SELECT TotalAddGTime, DestCityMarketID FROM mytable WHERE OriginStateName <> 'U.S. Pacific Trust Territories and Possessions' ORDER BY WheelsOff, DestState, CRSDepTime LIMIT 9"}
 {"sql":"SELECT OriginState, DivActualElapsedTime FROM mytable WHERE DepDel15 IN (-9999) ORDER BY DistanceGroup, DivArrDelay LIMIT 29"}
 {"sql":"SELECT FlightDate, NASDelay FROM mytable WHERE ActualElapsedTime >= 73 OR OriginAirportSeqID NOT IN (1490803, 1540103, 1312702, 1075402) OR DestCityMarketID BETWEEN 31076 AND 31537 ORDER BY WheelsOn LIMIT 5"}
-{"sql":"SELECT OriginStateFips, AirlineID, OriginAirportID, AVG(SecurityDelay), SUM(DestCityMarketID) FROM mytable WHERE DivAirportSeqIDs IN (1098002, 1389101, 1247802) GROUP BY OriginStateFips, AirlineID, OriginAirportID LIMIT 14","hsqls":["SELECT OriginStateFips, AirlineID, OriginAirportID, AVG(SecurityDelay), SUM(DestCityMarketID) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs__MV1 IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs__MV2 IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs__MV3 IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs__MV4 IN (1098002, 1389101, 1247802)) GROUP BY OriginStateFips, AirlineID, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT Flights FROM mytable WHERE DestCityMarketID NOT IN (30685, 30785) OR TotalAddGTime IN (38) AND DivTotalGTimes <= 83 ORDER BY DistanceGroup, Diverted LIMIT 25","hsqls":["SELECT Flights FROM mytable WHERE DestCityMarketID NOT IN (30685, 30785) OR TotalAddGTime IN (38) AND (DivTotalGTimes__MV0 <= 83 OR DivTotalGTimes__MV1 <= 83 OR DivTotalGTimes__MV2 <= 83 OR DivTotalGTimes__MV3 <= 83 OR DivTotalGTimes__MV4 <= 83) ORDER BY DistanceGroup, Diverted LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, AirlineID, OriginAirportID, AVG(SecurityDelay), SUM(DestCityMarketID) FROM mytable WHERE DivAirportSeqIDs IN (1098002, 1389101, 1247802) GROUP BY OriginStateFips, AirlineID, OriginAirportID LIMIT 14","hsqls":["SELECT OriginStateFips, AirlineID, OriginAirportID, AVG(SecurityDelay), SUM(DestCityMarketID) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs[2] IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs[3] IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs[4] IN (1098002, 1389101, 1247802) OR DivAirportSeqIDs[5] IN (1098002, 1389101, 1247802)) GROUP BY OriginStateFips, AirlineID, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT Flights FROM mytable WHERE DestCityMarketID NOT IN (30685, 30785) OR TotalAddGTime IN (38) AND DivTotalGTimes <= 83 ORDER BY DistanceGroup, Diverted LIMIT 25","hsqls":["SELECT Flights FROM mytable WHERE DestCityMarketID NOT IN (30685, 30785) OR TotalAddGTime IN (38) AND (DivTotalGTimes[1] <= 83 OR DivTotalGTimes[2] <= 83 OR DivTotalGTimes[3] <= 83 OR DivTotalGTimes[4] <= 83 OR DivTotalGTimes[5] <= 83) ORDER BY DistanceGroup, Diverted LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, Quarter, AirTime FROM mytable ORDER BY OriginState, OriginWac LIMIT 2"}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 ORDER BY Diverted, DivDistance, FlightNum LIMIT 14","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 ORDER BY Diverted, DivDistance, FlightNum LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 ORDER BY Diverted, DivDistance, FlightNum LIMIT 14","hsqls":["SELECT DivAirportIDs FROM mytable WHERE ArrDel15 BETWEEN 1 AND 0 ORDER BY Diverted, DivDistance, FlightNum LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay, MAX(DepDelayMinutes), MIN(DestCityMarketID), SUM(Distance) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 1 AND DepTime <> 32 AND FlightDate BETWEEN '2014-01-18' AND '2014-01-21' GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 29","hsqls":["SELECT DivArrDelay, MAX(DepDelayMinutes), MIN(DestCityMarketID), SUM(Distance) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 1 AND DepTime <> 32 AND FlightDate BETWEEN '2014-01-18' AND '2014-01-21' GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 29"]}
 {"sql":"SELECT SecurityDelay, ArrTime, DestCityMarketID, COUNT(*) FROM mytable WHERE TaxiOut = 92 GROUP BY SecurityDelay, ArrTime, DestCityMarketID  ORDER BY SecurityDelay, ArrTime, DestCityMarketID LIMIT 8","hsqls":["SELECT SecurityDelay, ArrTime, DestCityMarketID, COUNT(*) FROM mytable WHERE TaxiOut = 92 GROUP BY SecurityDelay, ArrTime, DestCityMarketID  ORDER BY SecurityDelay, ArrTime, DestCityMarketID LIMIT 8"]}
 {"sql":"SELECT CarrierDelay, WeatherDelay, ArrDelay, AVG(DestAirportID), COUNT(Diverted) FROM mytable WHERE DepDelay IN (16.0, 158.0, 55.0, -8.0, 340.0) GROUP BY CarrierDelay, WeatherDelay, ArrDelay  ORDER BY CarrierDelay, WeatherDelay, ArrDelay LIMIT 10","hsqls":["SELECT CarrierDelay, WeatherDelay, ArrDelay, AVG(DestAirportID), COUNT(Diverted) FROM mytable WHERE DepDelay IN (16.0, 158.0, 55.0, -8.0, 340.0) GROUP BY CarrierDelay, WeatherDelay, ArrDelay  ORDER BY CarrierDelay, WeatherDelay, ArrDelay LIMIT 10"]}
-{"sql":"SELECT TaxiOut, DivTailNums, AirTime FROM mytable WHERE CRSArrTime IN (1512, 2248, 1218, 248) OR OriginCityMarketID BETWEEN 33342 AND 31778 LIMIT 8","hsqls":["SELECT TaxiOut, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, AirTime FROM mytable WHERE CRSArrTime IN (1512, 2248, 1218, 248) OR OriginCityMarketID BETWEEN 33342 AND 31778 LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivTailNums, AirTime FROM mytable WHERE CRSArrTime IN (1512, 2248, 1218, 248) OR OriginCityMarketID BETWEEN 33342 AND 31778 LIMIT 8","hsqls":["SELECT TaxiOut, DivTailNums, AirTime FROM mytable WHERE CRSArrTime IN (1512, 2248, 1218, 248) OR OriginCityMarketID BETWEEN 33342 AND 31778 LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, DestAirportID FROM mytable WHERE DepDelay BETWEEN 194.0 AND 4.0 OR OriginCityName NOT IN ('Tampa, FL', 'Monroe, LA', 'Bemidji, MN') ORDER BY TailNum, UniqueCarrier LIMIT 24"}
 {"sql":"SELECT DivReachedDest, Diverted, ArrDelay FROM mytable WHERE CancellationCode <= 'A' ORDER BY FirstDepTime, AirTime LIMIT 19"}
 {"sql":"SELECT AVG(CRSArrTime), COUNT(DepTime) FROM mytable WHERE SecurityDelay BETWEEN 18 AND 10 OR TaxiIn <> 140 OR DivReachedDest >= 1 LIMIT 16"}
 {"sql":"SELECT FlightDate, TaxiIn, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY FlightDate, TaxiIn, DestAirportSeqID  ORDER BY FlightDate, TaxiIn, DestAirportSeqID LIMIT 11","hsqls":["SELECT FlightDate, TaxiIn, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY FlightDate, TaxiIn, DestAirportSeqID  ORDER BY FlightDate, TaxiIn, DestAirportSeqID LIMIT 11"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE DestAirportSeqID IN (1127802) LIMIT 21"}
 {"sql":"SELECT Distance, MIN(OriginStateFips), MAX(NASDelay) FROM mytable WHERE TaxiOut = 19 GROUP BY Distance  ORDER BY Distance LIMIT 5","hsqls":["SELECT Distance, MIN(OriginStateFips), MAX(NASDelay) FROM mytable WHERE TaxiOut = 19 GROUP BY Distance  ORDER BY Distance LIMIT 5"]}
-{"sql":"SELECT DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DepDelay NOT IN (257.0, 188.0, 54.0, 47.0, 87.0) OR DestWac <> 4 AND LateAircraftDelay <= 4 ORDER BY TotalAddGTime, AirTime LIMIT 25","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrivalDelayGroups FROM mytable WHERE DepDelay NOT IN (257.0, 188.0, 54.0, 47.0, 87.0) OR DestWac <> 4 AND LateAircraftDelay <= 4 ORDER BY TotalAddGTime, AirTime LIMIT 10000"]}
-{"sql":"SELECT Carrier, ArrDelayMinutes, AVG(OriginWac) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 7 OR DivAirportSeqIDs BETWEEN 1410803 AND 1299204 GROUP BY Carrier, ArrDelayMinutes LIMIT 22","hsqls":["SELECT Carrier, ArrDelayMinutes, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 7 OR (DivAirportSeqIDs__MV0 BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs__MV1 BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs__MV2 BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs__MV3 BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs__MV4 BETWEEN 1410803 AND 1299204) GROUP BY Carrier, ArrDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, FlightNum, SecurityDelay FROM mytable WHERE DepDel15 NOT IN (1) LIMIT 8","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, FlightNum, SecurityDelay FROM mytable WHERE DepDel15 NOT IN (1) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DepDelay NOT IN (257.0, 188.0, 54.0, 47.0, 87.0) OR DestWac <> 4 AND LateAircraftDelay <= 4 ORDER BY TotalAddGTime, AirTime LIMIT 25","hsqls":["SELECT DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DepDelay NOT IN (257.0, 188.0, 54.0, 47.0, 87.0) OR DestWac <> 4 AND LateAircraftDelay <= 4 ORDER BY TotalAddGTime, AirTime LIMIT 10000"]}
+{"sql":"SELECT Carrier, ArrDelayMinutes, AVG(OriginWac) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 7 OR DivAirportSeqIDs BETWEEN 1410803 AND 1299204 GROUP BY Carrier, ArrDelayMinutes LIMIT 22","hsqls":["SELECT Carrier, ArrDelayMinutes, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 7 OR (DivAirportSeqIDs[1] BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs[2] BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs[3] BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs[4] BETWEEN 1410803 AND 1299204 OR DivAirportSeqIDs[5] BETWEEN 1410803 AND 1299204) GROUP BY Carrier, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, FlightNum, SecurityDelay FROM mytable WHERE DepDel15 NOT IN (1) LIMIT 8","hsqls":["SELECT DivLongestGTimes, FlightNum, SecurityDelay FROM mytable WHERE DepDel15 NOT IN (1) LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, FlightNum, DayofMonth, COUNT(*) FROM mytable GROUP BY OriginStateFips, FlightNum, DayofMonth  ORDER BY OriginStateFips, FlightNum, DayofMonth LIMIT 5","hsqls":["SELECT OriginStateFips, FlightNum, DayofMonth, COUNT(*) FROM mytable GROUP BY OriginStateFips, FlightNum, DayofMonth  ORDER BY OriginStateFips, FlightNum, DayofMonth LIMIT 5"]}
-{"sql":"SELECT WeatherDelay, DivAirportIDs, CancellationCode FROM mytable WHERE OriginState BETWEEN 'ID' AND 'PA' AND DestWac BETWEEN 45 AND 15 OR Dest BETWEEN 'BPT' AND 'MDT' ORDER BY OriginAirportSeqID, Dest LIMIT 11","hsqls":["SELECT WeatherDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CancellationCode FROM mytable WHERE OriginState BETWEEN 'ID' AND 'PA' AND DestWac BETWEEN 45 AND 15 OR Dest BETWEEN 'BPT' AND 'MDT' ORDER BY OriginAirportSeqID, Dest LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DivAirportIDs, CancellationCode FROM mytable WHERE OriginState BETWEEN 'ID' AND 'PA' AND DestWac BETWEEN 45 AND 15 OR Dest BETWEEN 'BPT' AND 'MDT' ORDER BY OriginAirportSeqID, Dest LIMIT 11","hsqls":["SELECT WeatherDelay, DivAirportIDs, CancellationCode FROM mytable WHERE OriginState BETWEEN 'ID' AND 'PA' AND DestWac BETWEEN 45 AND 15 OR Dest BETWEEN 'BPT' AND 'MDT' ORDER BY OriginAirportSeqID, Dest LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime FROM mytable LIMIT 24"}
 {"sql":"SELECT \"Year\", DepDel15, WheelsOn FROM mytable WHERE ArrivalDelayGroups NOT IN (3, 10, 12) ORDER BY DestCityName, DivActualElapsedTime LIMIT 3","hsqls":["SELECT Year, DepDel15, WheelsOn FROM mytable WHERE ArrivalDelayGroups NOT IN (3, 10, 12) ORDER BY DestCityName, DivActualElapsedTime LIMIT 3"]}
-{"sql":"SELECT AVG(WeatherDelay), MIN(ArrTime) FROM mytable WHERE TaxiIn < 162 OR DivAirports >= 'SIT' OR OriginWac BETWEEN 1 AND 71 LIMIT 21","hsqls":["SELECT AVG(WeatherDelay), MIN(ArrTime)  FROM mytable WHERE TaxiIn < 162 OR (DivAirports__MV0 >= 'SIT' OR DivAirports__MV1 >= 'SIT' OR DivAirports__MV2 >= 'SIT' OR DivAirports__MV3 >= 'SIT' OR DivAirports__MV4 >= 'SIT') OR OriginWac BETWEEN 1 AND 71 LIMIT 10000"]}
+{"sql":"SELECT AVG(WeatherDelay), MIN(ArrTime) FROM mytable WHERE TaxiIn < 162 OR DivAirports >= 'SIT' OR OriginWac BETWEEN 1 AND 71 LIMIT 21","hsqls":["SELECT AVG(WeatherDelay), MIN(ArrTime)  FROM mytable WHERE TaxiIn < 162 OR (DivAirports[1] >= 'SIT' OR DivAirports[2] >= 'SIT' OR DivAirports[3] >= 'SIT' OR DivAirports[4] >= 'SIT' OR DivAirports[5] >= 'SIT') OR OriginWac BETWEEN 1 AND 71 LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, ActualElapsedTime FROM mytable WHERE DayofMonth BETWEEN 13 AND 6 ORDER BY \"Year\", DepDel15 LIMIT 14","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime FROM mytable WHERE DayofMonth BETWEEN 13 AND 6 ORDER BY Year, DepDel15 LIMIT 14"]}
-{"sql":"SELECT Diverted, DivTotalGTimes FROM mytable WHERE DestStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Montana') OR CarrierDelay IN (304, 36) LIMIT 11","hsqls":["SELECT Diverted, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Montana') OR CarrierDelay IN (304, 36) LIMIT 10000"]}
+{"sql":"SELECT Diverted, DivTotalGTimes FROM mytable WHERE DestStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Montana') OR CarrierDelay IN (304, 36) LIMIT 11","hsqls":["SELECT Diverted, DivTotalGTimes FROM mytable WHERE DestStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Montana') OR CarrierDelay IN (304, 36) LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, FlightNum FROM mytable ORDER BY DivReachedDest, LongestAddGTime, DestStateName LIMIT 23"}
 {"sql":"SELECT AirlineID, AVG(DepDelay) FROM mytable WHERE OriginCityMarketID NOT IN (32457, 30894, 34489, 34254) OR WheelsOn <= 552 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 29","hsqls":["SELECT AirlineID, AVG(DepDelay) FROM mytable WHERE OriginCityMarketID NOT IN (32457, 30894, 34489, 34254) OR WheelsOn <= 552 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 29"]}
 {"sql":"SELECT NASDelay, DivActualElapsedTime FROM mytable WHERE CRSElapsedTime >= 128 ORDER BY UniqueCarrier LIMIT 20"}
 {"sql":"SELECT LateAircraftDelay, LongestAddGTime, ActualElapsedTime, SUM(OriginWac) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C') GROUP BY LateAircraftDelay, LongestAddGTime, ActualElapsedTime  ORDER BY LateAircraftDelay, LongestAddGTime, ActualElapsedTime LIMIT 11","hsqls":["SELECT LateAircraftDelay, LongestAddGTime, ActualElapsedTime, SUM(OriginWac) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C') GROUP BY LateAircraftDelay, LongestAddGTime, ActualElapsedTime  ORDER BY LateAircraftDelay, LongestAddGTime, ActualElapsedTime LIMIT 11"]}
-{"sql":"SELECT DivAirports, DepTime FROM mytable WHERE OriginState NOT IN ('KS', 'MA', 'ME') AND Origin BETWEEN 'BOI' AND 'SBP' OR DivActualElapsedTime <> 247 ORDER BY DestState, DivActualElapsedTime LIMIT 15","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepTime FROM mytable WHERE OriginState NOT IN ('KS', 'MA', 'ME') AND Origin BETWEEN 'BOI' AND 'SBP' OR DivActualElapsedTime <> 247 ORDER BY DestState, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT Carrier, Quarter, SecurityDelay FROM mytable WHERE TotalAddGTime <= 25 AND \"Month\" NOT IN (1) ORDER BY DepDelay LIMIT 20","hsqls":["SELECT Carrier, Quarter, SecurityDelay FROM mytable WHERE TotalAddGTime <= 25 AND Month NOT IN (1) ORDER BY DepDelay LIMIT 20"]}
+{"sql":"SELECT DivAirports, DepTime FROM mytable WHERE OriginState NOT IN ('KS', 'MA', 'ME') AND Origin BETWEEN 'BOI' AND 'SBP' OR DivActualElapsedTime <> 247 ORDER BY DestState, DivActualElapsedTime LIMIT 15","hsqls":["SELECT DivAirports, DepTime FROM mytable WHERE OriginState NOT IN ('KS', 'MA', 'ME') AND Origin BETWEEN 'BOI' AND 'SBP' OR DivActualElapsedTime <> 247 ORDER BY DestState, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT Carrier, Quarter, SecurityDelay FROM mytable WHERE TotalAddGTime <= 25 AND \"Month\" NOT IN (1) ORDER BY DepDelay LIMIT 20","hsqls":["SELECT Carrier, Quarter, SecurityDelay FROM mytable WHERE TotalAddGTime <= 25 AND `Month` NOT IN (1) ORDER BY DepDelay LIMIT 20"]}
 {"sql":"SELECT OriginCityMarketID, TaxiIn FROM mytable WHERE DestWac BETWEEN 33 AND 66 AND WheelsOff NOT IN (10, 2117, 1000) ORDER BY DepartureDelayGroups, DestState LIMIT 9"}
 {"sql":"SELECT OriginAirportSeqID, SUM(TaxiIn) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 5","hsqls":["SELECT OriginAirportSeqID, SUM(TaxiIn) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 5"]}
 {"sql":"SELECT ActualElapsedTime, CancellationCode FROM mytable WHERE DepTimeBlk IN ('0700-0759', '1900-1959', '0001-0559') AND Dest < 'APN' ORDER BY OriginAirportSeqID, DayofMonth, CRSDepTime"}
-{"sql":"SELECT FlightNum, WeatherDelay, OriginAirportID FROM mytable WHERE DivAirportSeqIDs BETWEEN 1091802 AND 1029904 AND Origin > 'LGB' LIMIT 19","hsqls":["SELECT FlightNum, WeatherDelay, OriginAirportID FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs__MV1 BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs__MV2 BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs__MV3 BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs__MV4 BETWEEN 1091802 AND 1029904) AND Origin > 'LGB' LIMIT 10000"]}
-{"sql":"SELECT AVG(OriginAirportID) FROM mytable WHERE \"Year\" = 2014 AND DivReachedDest <> 0 LIMIT 2","hsqls":["SELECT AVG(OriginAirportID) FROM mytable WHERE Year = 2014 AND DivReachedDest <> 0 LIMIT 2"]}
+{"sql":"SELECT FlightNum, WeatherDelay, OriginAirportID FROM mytable WHERE DivAirportSeqIDs BETWEEN 1091802 AND 1029904 AND Origin > 'LGB' LIMIT 19","hsqls":["SELECT FlightNum, WeatherDelay, OriginAirportID FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs[2] BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs[3] BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs[4] BETWEEN 1091802 AND 1029904 OR DivAirportSeqIDs[5] BETWEEN 1091802 AND 1029904) AND Origin > 'LGB' LIMIT 10000"]}
+{"sql":"SELECT AVG(OriginAirportID) FROM mytable WHERE \"Year\" = 2014 AND DivReachedDest <> 0 LIMIT 2","hsqls":["SELECT AVG(OriginAirportID) FROM mytable WHERE `Year` = 2014 AND DivReachedDest <> 0 LIMIT 2"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Diverted IN (0) OR OriginState BETWEEN 'AR' AND 'VI' OR DepTime BETWEEN 120 AND 2312 LIMIT 1"}
-{"sql":"SELECT DivReachedDest, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DivWheelsOns BETWEEN 1002 AND 856 GROUP BY DivReachedDest LIMIT 7","hsqls":["SELECT DivReachedDest, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND (DivWheelsOns__MV0 BETWEEN 1002 AND 856 OR DivWheelsOns__MV1 BETWEEN 1002 AND 856 OR DivWheelsOns__MV2 BETWEEN 1002 AND 856 OR DivWheelsOns__MV3 BETWEEN 1002 AND 856 OR DivWheelsOns__MV4 BETWEEN 1002 AND 856) GROUP BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DivWheelsOns BETWEEN 1002 AND 856 GROUP BY DivReachedDest LIMIT 7","hsqls":["SELECT DivReachedDest, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND (DivWheelsOns[1] BETWEEN 1002 AND 856 OR DivWheelsOns[2] BETWEEN 1002 AND 856 OR DivWheelsOns[3] BETWEEN 1002 AND 856 OR DivWheelsOns[4] BETWEEN 1002 AND 856 OR DivWheelsOns[5] BETWEEN 1002 AND 856) GROUP BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DestAirportSeqID, DivActualElapsedTime, COUNT(DestCityName), MAX(ActualElapsedTime) FROM mytable GROUP BY TaxiOut, DestAirportSeqID, DivActualElapsedTime  ORDER BY TaxiOut, DestAirportSeqID, DivActualElapsedTime LIMIT 15","hsqls":["SELECT TaxiOut, DestAirportSeqID, DivActualElapsedTime, COUNT(DestCityName), MAX(ActualElapsedTime) FROM mytable GROUP BY TaxiOut, DestAirportSeqID, DivActualElapsedTime  ORDER BY TaxiOut, DestAirportSeqID, DivActualElapsedTime LIMIT 15"]}
-{"sql":"SELECT DivReachedDest, DestCityMarketID, SUM(ArrDelayMinutes), AVG(ArrDelay) FROM mytable WHERE DivActualElapsedTime IN (114, 213, 399, 191, 411) OR DivAirportSeqIDs <= 1330303 GROUP BY DivReachedDest, DestCityMarketID LIMIT 7","hsqls":["SELECT DivReachedDest, DestCityMarketID, SUM(ArrDelayMinutes), AVG(ArrDelay) FROM mytable WHERE DivActualElapsedTime IN (114, 213, 399, 191, 411) OR (DivAirportSeqIDs__MV0 <= 1330303 OR DivAirportSeqIDs__MV1 <= 1330303 OR DivAirportSeqIDs__MV2 <= 1330303 OR DivAirportSeqIDs__MV3 <= 1330303 OR DivAirportSeqIDs__MV4 <= 1330303) GROUP BY DivReachedDest, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DestCityMarketID, SUM(ArrDelayMinutes), AVG(ArrDelay) FROM mytable WHERE DivActualElapsedTime IN (114, 213, 399, 191, 411) OR DivAirportSeqIDs <= 1330303 GROUP BY DivReachedDest, DestCityMarketID LIMIT 7","hsqls":["SELECT DivReachedDest, DestCityMarketID, SUM(ArrDelayMinutes), AVG(ArrDelay) FROM mytable WHERE DivActualElapsedTime IN (114, 213, 399, 191, 411) OR (DivAirportSeqIDs[1] <= 1330303 OR DivAirportSeqIDs[2] <= 1330303 OR DivAirportSeqIDs[3] <= 1330303 OR DivAirportSeqIDs[4] <= 1330303 OR DivAirportSeqIDs[5] <= 1330303) GROUP BY DivReachedDest, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT Quarter, WheelsOn FROM mytable WHERE FlightNum < 3173 ORDER BY CRSArrTime LIMIT 1"}
 {"sql":"SELECT LateAircraftDelay, MIN(SecurityDelay), MIN(Quarter) FROM mytable WHERE TailNum < 'N521SW' OR ArrTimeBlk <> '1700-1759' AND DepDelay NOT IN (8.0, 82.0, 103.0, 47.0) GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 29","hsqls":["SELECT LateAircraftDelay, MIN(SecurityDelay), MIN(Quarter) FROM mytable WHERE TailNum < 'N521SW' OR ArrTimeBlk <> '1700-1759' AND DepDelay NOT IN (8.0, 82.0, 103.0, 47.0) GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 29"]}
-{"sql":"SELECT WeatherDelay, ActualElapsedTime, \"Month\", MIN(FlightNum), MAX(WheelsOff) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND DestState <> 'SD' OR ArrDelayMinutes BETWEEN 305.0 AND 66.0 GROUP BY WeatherDelay, ActualElapsedTime, \"Month\" LIMIT 7","hsqls":["SELECT WeatherDelay, ActualElapsedTime, Month, MIN(FlightNum), MAX(WheelsOff) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND DestState <> 'SD' OR ArrDelayMinutes BETWEEN 305.0 AND 66.0 GROUP BY WeatherDelay, ActualElapsedTime, Month LIMIT 7"]}
+{"sql":"SELECT WeatherDelay, ActualElapsedTime, \"Month\", MIN(FlightNum), MAX(WheelsOff) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND DestState <> 'SD' OR ArrDelayMinutes BETWEEN 305.0 AND 66.0 GROUP BY WeatherDelay, ActualElapsedTime, \"Month\" LIMIT 7","hsqls":["SELECT WeatherDelay, ActualElapsedTime, Month, MIN(FlightNum), MAX(WheelsOff) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND DestState <> 'SD' OR ArrDelayMinutes BETWEEN 305.0 AND 66.0 GROUP BY WeatherDelay, ActualElapsedTime, `Month` LIMIT 7"]}
 {"sql":"SELECT DepDelayMinutes, DestCityMarketID, COUNT(TaxiIn) FROM mytable WHERE DestCityMarketID IN (33570) AND Cancelled NOT IN (0) AND DistanceGroup BETWEEN 11 AND 6 GROUP BY DepDelayMinutes, DestCityMarketID  ORDER BY DepDelayMinutes, DestCityMarketID LIMIT 29","hsqls":["SELECT DepDelayMinutes, DestCityMarketID, COUNT(TaxiIn) FROM mytable WHERE DestCityMarketID IN (33570) AND Cancelled NOT IN (0) AND DistanceGroup BETWEEN 11 AND 6 GROUP BY DepDelayMinutes, DestCityMarketID  ORDER BY DepDelayMinutes, DestCityMarketID LIMIT 29"]}
 {"sql":"SELECT DistanceGroup, WheelsOn, DayOfWeek FROM mytable WHERE DestStateFips BETWEEN 40 AND 26 OR Dest BETWEEN 'ICT' AND 'BDL' OR OriginStateName = 'Maine' ORDER BY DepDelay, DayofMonth, DayOfWeek LIMIT 13"}
 {"sql":"SELECT DepartureDelayGroups, AirlineID, AVG(DayOfWeek) FROM mytable WHERE Flights BETWEEN 1 AND 1 GROUP BY DepartureDelayGroups, AirlineID  ORDER BY DepartureDelayGroups, AirlineID LIMIT 4","hsqls":["SELECT DepartureDelayGroups, AirlineID, AVG(DayOfWeek) FROM mytable WHERE Flights BETWEEN 1 AND 1 GROUP BY DepartureDelayGroups, AirlineID  ORDER BY DepartureDelayGroups, AirlineID LIMIT 4"]}
 {"sql":"SELECT OriginAirportSeqID, DivReachedDest, NASDelay FROM mytable WHERE Dest < 'TOL' AND AirTime BETWEEN 30 AND 256 OR DaysSinceEpoch IN (16095, 16085) LIMIT 12"}
 {"sql":"SELECT TailNum, OriginStateName FROM mytable WHERE CRSArrTime <> 2125 OR LateAircraftDelay > 4 ORDER BY TailNum LIMIT 24"}
 {"sql":"SELECT OriginState, ArrTimeBlk FROM mytable WHERE CRSElapsedTime = 238 AND WheelsOn > 1317 LIMIT 10"}
-{"sql":"SELECT DivAirports, OriginCityName FROM mytable WHERE Quarter <> 1 AND OriginCityMarketID BETWEEN 34674 AND 32016 ORDER BY FlightDate, TaxiIn, CancellationCode","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityName FROM mytable WHERE Quarter <> 1 AND OriginCityMarketID BETWEEN 34674 AND 32016 ORDER BY FlightDate, TaxiIn, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityName FROM mytable WHERE Quarter <> 1 AND OriginCityMarketID BETWEEN 34674 AND 32016 ORDER BY FlightDate, TaxiIn, CancellationCode","hsqls":["SELECT DivAirports, OriginCityName FROM mytable WHERE Quarter <> 1 AND OriginCityMarketID BETWEEN 34674 AND 32016 ORDER BY FlightDate, TaxiIn, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, CRSArrTime FROM mytable WHERE DestStateFips NOT IN (16, 13) OR ArrTime <= 545 ORDER BY ArrTimeBlk LIMIT 20"}
-{"sql":"SELECT Cancelled, OriginAirportID, COUNT(Diverted), COUNT(DestCityMarketID) FROM mytable WHERE DivAirportSeqIDs IN (1217301, 1091802, 1198603) AND DaysSinceEpoch IN (16101, 16099) GROUP BY Cancelled, OriginAirportID LIMIT 28","hsqls":["SELECT Cancelled, OriginAirportID, COUNT(Diverted), COUNT(DestCityMarketID) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs__MV1 IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs__MV2 IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs__MV3 IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs__MV4 IN (1217301, 1091802, 1198603)) AND DaysSinceEpoch IN (16101, 16099) GROUP BY Cancelled, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT Cancelled, OriginAirportID, COUNT(Diverted), COUNT(DestCityMarketID) FROM mytable WHERE DivAirportSeqIDs IN (1217301, 1091802, 1198603) AND DaysSinceEpoch IN (16101, 16099) GROUP BY Cancelled, OriginAirportID LIMIT 28","hsqls":["SELECT Cancelled, OriginAirportID, COUNT(Diverted), COUNT(DestCityMarketID) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs[2] IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs[3] IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs[4] IN (1217301, 1091802, 1198603) OR DivAirportSeqIDs[5] IN (1217301, 1091802, 1198603)) AND DaysSinceEpoch IN (16101, 16099) GROUP BY Cancelled, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DistanceGroup BETWEEN 4 AND 1 OR DepDelay <> 124.0 ORDER BY OriginStateName LIMIT 7"}
 {"sql":"SELECT OriginAirportSeqID, COUNT(OriginWac), MAX(TaxiIn) FROM mytable WHERE NASDelay BETWEEN 179 AND 107 AND DepTimeBlk IN ('1700-1759', '1500-1559') GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 21","hsqls":["SELECT OriginAirportSeqID, COUNT(OriginWac), MAX(TaxiIn) FROM mytable WHERE NASDelay BETWEEN 179 AND 107 AND DepTimeBlk IN ('1700-1759', '1500-1559') GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 21"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '1000-1059') AND DivLongestGTimes >= 21.0 LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '1000-1059') AND (DivLongestGTimes__MV0 >= 21.0 OR DivLongestGTimes__MV1 >= 21.0 OR DivLongestGTimes__MV2 >= 21.0 OR DivLongestGTimes__MV3 >= 21.0 OR DivLongestGTimes__MV4 >= 21.0) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '1000-1059') AND DivLongestGTimes >= 21.0 LIMIT 3","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '1000-1059') AND (DivLongestGTimes[1] >= 21.0 OR DivLongestGTimes[2] >= 21.0 OR DivLongestGTimes[3] >= 21.0 OR DivLongestGTimes[4] >= 21.0 OR DivLongestGTimes[5] >= 21.0) LIMIT 10000"]}
 {"sql":"SELECT DivAirportLandings, COUNT(*) FROM mytable GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 26","hsqls":["SELECT DivAirportLandings, COUNT(*) FROM mytable GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 26"]}
 {"sql":"SELECT ArrTime, DestCityMarketID, OriginAirportID, COUNT(WheelsOn), AVG(CRSArrTime), SUM(OriginStateFips) FROM mytable GROUP BY ArrTime, DestCityMarketID, OriginAirportID  ORDER BY ArrTime, DestCityMarketID, OriginAirportID LIMIT 2","hsqls":["SELECT ArrTime, DestCityMarketID, OriginAirportID, COUNT(WheelsOn), AVG(CRSArrTime), SUM(OriginStateFips) FROM mytable GROUP BY ArrTime, DestCityMarketID, OriginAirportID  ORDER BY ArrTime, DestCityMarketID, OriginAirportID LIMIT 2"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 19"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirports > 'CDC' LIMIT 7","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirports__MV0 > 'CDC' OR DivAirports__MV1 > 'CDC' OR DivAirports__MV2 > 'CDC' OR DivAirports__MV3 > 'CDC' OR DivAirports__MV4 > 'CDC') LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirports > 'CDC' LIMIT 7","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirports[1] > 'CDC' OR DivAirports[2] > 'CDC' OR DivAirports[3] > 'CDC' OR DivAirports[4] > 'CDC' OR DivAirports[5] > 'CDC') LIMIT 10000"]}
 {"sql":"SELECT Carrier, DestCityMarketID FROM mytable LIMIT 23"}
 {"sql":"SELECT FlightDate, AVG(WeatherDelay), SUM(WheelsOff), COUNT(Distance) FROM mytable GROUP BY FlightDate  ORDER BY FlightDate LIMIT 19","hsqls":["SELECT FlightDate, AVG(WeatherDelay), SUM(WheelsOff), COUNT(Distance) FROM mytable GROUP BY FlightDate  ORDER BY FlightDate LIMIT 19"]}
 {"sql":"SELECT DepDelay, DaysSinceEpoch FROM mytable WHERE OriginWac IN (2, 92, 91, 54, 38) AND DestAirportSeqID BETWEEN 1198002 AND 1347603 LIMIT 19"}
@@ -5970,82 +5970,82 @@
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE DayOfWeek < 1 AND LongestAddGTime BETWEEN 63 AND 24 LIMIT 11"}
 {"sql":"SELECT UniqueCarrier FROM mytable ORDER BY LongestAddGTime LIMIT 25"}
 {"sql":"SELECT ArrDel15, DestStateName, DestCityMarketID FROM mytable WHERE AirlineID > 19930 AND OriginStateName IN ('Illinois', 'New York') AND UniqueCarrier NOT IN ('US') ORDER BY DivAirportLandings, WheelsOn, ArrivalDelayGroups LIMIT 3"}
-{"sql":"SELECT DivAirports FROM mytable WHERE DivWheelsOffs < 121 ORDER BY WheelsOff, DivReachedDest LIMIT 23","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE (DivWheelsOffs__MV0 < 121 OR DivWheelsOffs__MV1 < 121 OR DivWheelsOffs__MV2 < 121 OR DivWheelsOffs__MV3 < 121 OR DivWheelsOffs__MV4 < 121) ORDER BY WheelsOff, DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DivWheelsOffs < 121 ORDER BY WheelsOff, DivReachedDest LIMIT 23","hsqls":["SELECT DivAirports FROM mytable WHERE (DivWheelsOffs[1] < 121 OR DivWheelsOffs[2] < 121 OR DivWheelsOffs[3] < 121 OR DivWheelsOffs[4] < 121 OR DivWheelsOffs[5] < 121) ORDER BY WheelsOff, DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT DepDelay, CancellationCode FROM mytable LIMIT 9"}
 {"sql":"SELECT Diverted, CarrierDelay, TailNum FROM mytable WHERE SecurityDelay IN (18, 8, 27) OR LongestAddGTime BETWEEN 5 AND 23 ORDER BY CarrierDelay, OriginAirportID LIMIT 15"}
 {"sql":"SELECT AVG(Quarter), MIN(FirstDepTime) FROM mytable LIMIT 18"}
-{"sql":"SELECT DivAirportSeqIDs, Dest FROM mytable ORDER BY \"Year\", ArrTime LIMIT 17","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Dest FROM mytable ORDER BY Year, ArrTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, Dest, CRSElapsedTime FROM mytable WHERE LateAircraftDelay IN (10, 25, 265) AND UniqueCarrier <> 'B6' ORDER BY FlightDate, TotalAddGTime, DayofMonth LIMIT 11","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Dest, CRSElapsedTime FROM mytable WHERE LateAircraftDelay IN (10, 25, 265) AND UniqueCarrier <> 'B6' ORDER BY FlightDate, TotalAddGTime, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, Dest FROM mytable ORDER BY \"Year\", ArrTime LIMIT 17","hsqls":["SELECT DivAirportSeqIDs, Dest FROM mytable ORDER BY Year, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Dest, CRSElapsedTime FROM mytable WHERE LateAircraftDelay IN (10, 25, 265) AND UniqueCarrier <> 'B6' ORDER BY FlightDate, TotalAddGTime, DayofMonth LIMIT 11","hsqls":["SELECT DivWheelsOns, Dest, CRSElapsedTime FROM mytable WHERE LateAircraftDelay IN (10, 25, 265) AND UniqueCarrier <> 'B6' ORDER BY FlightDate, TotalAddGTime, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT \"Year\", CancellationCode, SUM(LongestAddGTime), SUM(DivReachedDest) FROM mytable WHERE DayofMonth BETWEEN 27 AND 6 OR LongestAddGTime NOT IN (20, 29) AND DestAirportID >= 10170 GROUP BY \"Year\", CancellationCode LIMIT 9","hsqls":["SELECT Year, CancellationCode, SUM(LongestAddGTime), SUM(DivReachedDest) FROM mytable WHERE DayofMonth BETWEEN 27 AND 6 OR LongestAddGTime NOT IN (20, 29) AND DestAirportID >= 10170 GROUP BY Year, CancellationCode LIMIT 9"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE DivAirportLandings NOT IN (1, 9) ORDER BY DestState LIMIT 6","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DivAirportLandings NOT IN (1, 9) ORDER BY DestState LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, MAX(OriginCityMarketID), SUM(CRSDepTime), SUM(\"Year\") FROM mytable WHERE DestCityName BETWEEN 'Charlotte Amalie, VI' AND 'Yuma, AZ' AND Cancelled NOT IN (0) GROUP BY TotalAddGTime LIMIT 17","hsqls":["SELECT TotalAddGTime, MAX(OriginCityMarketID), SUM(CRSDepTime), SUM(Year) FROM mytable WHERE DestCityName BETWEEN 'Charlotte Amalie, VI' AND 'Yuma, AZ' AND Cancelled NOT IN (0) GROUP BY TotalAddGTime LIMIT 17"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE DivAirportLandings NOT IN (1, 9) ORDER BY DestState LIMIT 6","hsqls":["SELECT DivTailNums FROM mytable WHERE DivAirportLandings NOT IN (1, 9) ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, MAX(OriginCityMarketID), SUM(CRSDepTime), SUM(\"Year\") FROM mytable WHERE DestCityName BETWEEN 'Charlotte Amalie, VI' AND 'Yuma, AZ' AND Cancelled NOT IN (0) GROUP BY TotalAddGTime LIMIT 17","hsqls":["SELECT TotalAddGTime, MAX(OriginCityMarketID), SUM(CRSDepTime), SUM(`Year`) FROM mytable WHERE DestCityName BETWEEN 'Charlotte Amalie, VI' AND 'Yuma, AZ' AND Cancelled NOT IN (0) GROUP BY TotalAddGTime LIMIT 17"]}
 {"sql":"SELECT Carrier, ArrDelay, AirlineID FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND Flights < 1 AND DestCityName BETWEEN 'Mammoth Lakes, CA' AND 'Midland/Odessa, TX' ORDER BY Flights, DayOfWeek LIMIT 11"}
 {"sql":"SELECT ArrTime, DestStateName FROM mytable WHERE ArrDelay BETWEEN -5.0 AND 273.0 AND OriginAirportID IN (12012, 11503, 13367, 14193) ORDER BY OriginAirportSeqID, Distance, DestStateName LIMIT 22"}
 {"sql":"SELECT DestAirportSeqID, NASDelay FROM mytable WHERE DivArrDelay >= 156 OR DestAirportID <> 14730 AND Quarter NOT IN (1) LIMIT 25"}
 {"sql":"SELECT CRSArrTime, DestStateFips, COUNT(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 413 AND 232 GROUP BY CRSArrTime, DestStateFips  ORDER BY CRSArrTime, DestStateFips LIMIT 17","hsqls":["SELECT CRSArrTime, DestStateFips, COUNT(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 413 AND 232 GROUP BY CRSArrTime, DestStateFips  ORDER BY CRSArrTime, DestStateFips LIMIT 17"]}
 {"sql":"SELECT DestWac, TotalAddGTime, MAX(DepTime), AVG(DepDel15) FROM mytable WHERE TaxiOut BETWEEN 68 AND 79 AND CRSDepTime IN (2104) GROUP BY DestWac, TotalAddGTime  ORDER BY DestWac, TotalAddGTime LIMIT 23","hsqls":["SELECT DestWac, TotalAddGTime, MAX(DepTime), AVG(DepDel15) FROM mytable WHERE TaxiOut BETWEEN 68 AND 79 AND CRSDepTime IN (2104) GROUP BY DestWac, TotalAddGTime  ORDER BY DestWac, TotalAddGTime LIMIT 23"]}
-{"sql":"SELECT WheelsOff, DestState, DivWheelsOffs FROM mytable WHERE Carrier BETWEEN 'FL' AND 'MQ' AND OriginStateName BETWEEN 'Maine' AND 'California' AND DivArrDelay NOT IN (289, 281) ORDER BY DivActualElapsedTime LIMIT 19","hsqls":["SELECT WheelsOff, DestState, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Carrier BETWEEN 'FL' AND 'MQ' AND OriginStateName BETWEEN 'Maine' AND 'California' AND DivArrDelay NOT IN (289, 281) ORDER BY DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DivTailNums FROM mytable WHERE FlightDate NOT IN ('2014-01-28', '2014-01-01', '2014-01-25') AND DivReachedDest < 0 ORDER BY DistanceGroup LIMIT 11","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE FlightDate NOT IN ('2014-01-28', '2014-01-01', '2014-01-25') AND DivReachedDest < 0 ORDER BY DistanceGroup LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, ArrTime, DestAirportID, SUM(LateAircraftDelay), AVG(SecurityDelay) FROM mytable WHERE \"Month\" < 1 OR SecurityDelay IN (18, 8, 27) GROUP BY OriginCityName, ArrTime, DestAirportID LIMIT 21","hsqls":["SELECT OriginCityName, ArrTime, DestAirportID, SUM(LateAircraftDelay), AVG(SecurityDelay) FROM mytable WHERE Month < 1 OR SecurityDelay IN (18, 8, 27) GROUP BY OriginCityName, ArrTime, DestAirportID LIMIT 21"]}
-{"sql":"SELECT COUNT(FirstDepTime) FROM mytable WHERE ArrTimeBlk = '1400-1459' OR DivAirports < 'GTF' AND TaxiIn NOT IN (96, 23, 13) LIMIT 21","hsqls":["SELECT COUNT(FirstDepTime) FROM mytable WHERE ArrTimeBlk = '1400-1459' OR (DivAirports__MV0 < 'GTF' OR DivAirports__MV1 < 'GTF' OR DivAirports__MV2 < 'GTF' OR DivAirports__MV3 < 'GTF' OR DivAirports__MV4 < 'GTF') AND TaxiIn NOT IN (96, 23, 13) LIMIT 10000"]}
-{"sql":"SELECT DestStateName, DivArrDelay, \"Month\", MAX(AirlineID) FROM mytable WHERE OriginCityName BETWEEN 'College Station/Bryan, TX' AND 'Rochester, MN' GROUP BY DestStateName, DivArrDelay, \"Month\" LIMIT 23","hsqls":["SELECT DestStateName, DivArrDelay, Month, MAX(AirlineID) FROM mytable WHERE OriginCityName BETWEEN 'College Station/Bryan, TX' AND 'Rochester, MN' GROUP BY DestStateName, DivArrDelay, Month LIMIT 23"]}
+{"sql":"SELECT WheelsOff, DestState, DivWheelsOffs FROM mytable WHERE Carrier BETWEEN 'FL' AND 'MQ' AND OriginStateName BETWEEN 'Maine' AND 'California' AND DivArrDelay NOT IN (289, 281) ORDER BY DivActualElapsedTime LIMIT 19","hsqls":["SELECT WheelsOff, DestState, DivWheelsOffs FROM mytable WHERE Carrier BETWEEN 'FL' AND 'MQ' AND OriginStateName BETWEEN 'Maine' AND 'California' AND DivArrDelay NOT IN (289, 281) ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivTailNums FROM mytable WHERE FlightDate NOT IN ('2014-01-28', '2014-01-01', '2014-01-25') AND DivReachedDest < 0 ORDER BY DistanceGroup LIMIT 11","hsqls":["SELECT DivLongestGTimes, DivTailNums FROM mytable WHERE FlightDate NOT IN ('2014-01-28', '2014-01-01', '2014-01-25') AND DivReachedDest < 0 ORDER BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, ArrTime, DestAirportID, SUM(LateAircraftDelay), AVG(SecurityDelay) FROM mytable WHERE \"Month\" < 1 OR SecurityDelay IN (18, 8, 27) GROUP BY OriginCityName, ArrTime, DestAirportID LIMIT 21","hsqls":["SELECT OriginCityName, ArrTime, DestAirportID, SUM(LateAircraftDelay), AVG(SecurityDelay) FROM mytable WHERE `Month` < 1 OR SecurityDelay IN (18, 8, 27) GROUP BY OriginCityName, ArrTime, DestAirportID LIMIT 21"]}
+{"sql":"SELECT COUNT(FirstDepTime) FROM mytable WHERE ArrTimeBlk = '1400-1459' OR DivAirports < 'GTF' AND TaxiIn NOT IN (96, 23, 13) LIMIT 21","hsqls":["SELECT COUNT(FirstDepTime) FROM mytable WHERE ArrTimeBlk = '1400-1459' OR (DivAirports[1] < 'GTF' OR DivAirports[2] < 'GTF' OR DivAirports[3] < 'GTF' OR DivAirports[4] < 'GTF' OR DivAirports[5] < 'GTF') AND TaxiIn NOT IN (96, 23, 13) LIMIT 10000"]}
+{"sql":"SELECT DestStateName, DivArrDelay, \"Month\", MAX(AirlineID) FROM mytable WHERE OriginCityName BETWEEN 'College Station/Bryan, TX' AND 'Rochester, MN' GROUP BY DestStateName, DivArrDelay, \"Month\" LIMIT 23","hsqls":["SELECT DestStateName, DivArrDelay, Month, MAX(AirlineID) FROM mytable WHERE OriginCityName BETWEEN 'College Station/Bryan, TX' AND 'Rochester, MN' GROUP BY DestStateName, DivArrDelay, `Month` LIMIT 23"]}
 {"sql":"SELECT TaxiOut, DestCityMarketID FROM mytable WHERE WheelsOn BETWEEN 1711 AND 1848 AND ActualElapsedTime >= 84 OR DivActualElapsedTime NOT IN (251) ORDER BY OriginStateFips, ArrDel15, DayofMonth LIMIT 13"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepTime >= 1856 LIMIT 22","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DepTime >= 1856 LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepTime >= 1856 LIMIT 22","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DepTime >= 1856 LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, ArrDel15, MAX(FirstDepTime) FROM mytable GROUP BY CarrierDelay, ArrDel15  ORDER BY CarrierDelay, ArrDel15 LIMIT 1","hsqls":["SELECT CarrierDelay, ArrDel15, MAX(FirstDepTime) FROM mytable GROUP BY CarrierDelay, ArrDel15  ORDER BY CarrierDelay, ArrDel15 LIMIT 1"]}
 {"sql":"SELECT OriginWac, MIN(DayofMonth) FROM mytable WHERE DivReachedDest IN (1, 0, -9999) GROUP BY OriginWac  ORDER BY OriginWac LIMIT 1","hsqls":["SELECT OriginWac, MIN(DayofMonth) FROM mytable WHERE DivReachedDest IN (1, 0, -9999) GROUP BY OriginWac  ORDER BY OriginWac LIMIT 1"]}
 {"sql":"SELECT CRSDepTime, OriginAirportID FROM mytable WHERE OriginStateFips BETWEEN 30 AND 19 OR DestAirportID NOT IN (10627, 15027, 13433, 10918, 11111) LIMIT 6"}
-{"sql":"SELECT Quarter, AirlineID, COUNT(ArrTimeBlk), MIN(CarrierDelay) FROM mytable WHERE \"Month\" <> 1 GROUP BY Quarter, AirlineID LIMIT 19","hsqls":["SELECT Quarter, AirlineID, COUNT(ArrTimeBlk), MIN(CarrierDelay) FROM mytable WHERE Month <> 1 GROUP BY Quarter, AirlineID LIMIT 19"]}
+{"sql":"SELECT Quarter, AirlineID, COUNT(ArrTimeBlk), MIN(CarrierDelay) FROM mytable WHERE \"Month\" <> 1 GROUP BY Quarter, AirlineID LIMIT 19","hsqls":["SELECT Quarter, AirlineID, COUNT(ArrTimeBlk), MIN(CarrierDelay) FROM mytable WHERE `Month` <> 1 GROUP BY Quarter, AirlineID LIMIT 19"]}
 {"sql":"SELECT DestState, AirlineID, COUNT(*) FROM mytable GROUP BY DestState, AirlineID  ORDER BY DestState, AirlineID LIMIT 20","hsqls":["SELECT DestState, AirlineID, COUNT(*) FROM mytable GROUP BY DestState, AirlineID  ORDER BY DestState, AirlineID LIMIT 20"]}
-{"sql":"SELECT DepDelayMinutes, DivAirportLandings, OriginWac, MIN(TaxiIn), MIN(DistanceGroup) FROM mytable WHERE DepartureDelayGroups BETWEEN -1 AND 9 AND DivAirportIDs BETWEEN 10299 AND 13487 AND NASDelay NOT IN (110, 65, 74, 75) GROUP BY DepDelayMinutes, DivAirportLandings, OriginWac LIMIT 7","hsqls":["SELECT DepDelayMinutes, DivAirportLandings, OriginWac, MIN(TaxiIn), MIN(DistanceGroup) FROM mytable WHERE DepartureDelayGroups BETWEEN -1 AND 9 AND (DivAirportIDs__MV0 BETWEEN 10299 AND 13487 OR DivAirportIDs__MV1 BETWEEN 10299 AND 13487 OR DivAirportIDs__MV2 BETWEEN 10299 AND 13487 OR DivAirportIDs__MV3 BETWEEN 10299 AND 13487 OR DivAirportIDs__MV4 BETWEEN 10299 AND 13487) AND NASDelay NOT IN (110, 65, 74, 75) GROUP BY DepDelayMinutes, DivAirportLandings, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivAirportLandings, OriginWac, MIN(TaxiIn), MIN(DistanceGroup) FROM mytable WHERE DepartureDelayGroups BETWEEN -1 AND 9 AND DivAirportIDs BETWEEN 10299 AND 13487 AND NASDelay NOT IN (110, 65, 74, 75) GROUP BY DepDelayMinutes, DivAirportLandings, OriginWac LIMIT 7","hsqls":["SELECT DepDelayMinutes, DivAirportLandings, OriginWac, MIN(TaxiIn), MIN(DistanceGroup) FROM mytable WHERE DepartureDelayGroups BETWEEN -1 AND 9 AND (DivAirportIDs[1] BETWEEN 10299 AND 13487 OR DivAirportIDs[2] BETWEEN 10299 AND 13487 OR DivAirportIDs[3] BETWEEN 10299 AND 13487 OR DivAirportIDs[4] BETWEEN 10299 AND 13487 OR DivAirportIDs[5] BETWEEN 10299 AND 13487) AND NASDelay NOT IN (110, 65, 74, 75) GROUP BY DepDelayMinutes, DivAirportLandings, OriginWac LIMIT 10000"]}
 {"sql":"SELECT DepTime, COUNT(*) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 4","hsqls":["SELECT DepTime, COUNT(*) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 4"]}
 {"sql":"SELECT TaxiOut, OriginAirportSeqID, Quarter, SUM(FirstDepTime), SUM(AirTime), AVG(DivArrDelay) FROM mytable WHERE CRSElapsedTime <= 272 GROUP BY TaxiOut, OriginAirportSeqID, Quarter  ORDER BY TaxiOut, OriginAirportSeqID, Quarter LIMIT 25","hsqls":["SELECT TaxiOut, OriginAirportSeqID, Quarter, SUM(FirstDepTime), SUM(AirTime), AVG(DivArrDelay) FROM mytable WHERE CRSElapsedTime <= 272 GROUP BY TaxiOut, OriginAirportSeqID, Quarter  ORDER BY TaxiOut, OriginAirportSeqID, Quarter LIMIT 25"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE FlightDate <= '2014-01-15' LIMIT 11"}
 {"sql":"SELECT ArrTimeBlk, DepDel15, OriginStateName FROM mytable ORDER BY CarrierDelay LIMIT 10"}
 {"sql":"SELECT Diverted, DayOfWeek, AVG(DestCityMarketID), SUM(DepartureDelayGroups), AVG(DestWac) FROM mytable GROUP BY Diverted, DayOfWeek  ORDER BY Diverted, DayOfWeek LIMIT 17","hsqls":["SELECT Diverted, DayOfWeek, AVG(DestCityMarketID), SUM(DepartureDelayGroups), AVG(DestWac) FROM mytable GROUP BY Diverted, DayOfWeek  ORDER BY Diverted, DayOfWeek LIMIT 17"]}
-{"sql":"SELECT DivLongestGTimes, ActualElapsedTime, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('A', 'C') ORDER BY WeatherDelay, DepTimeBlk, UniqueCarrier LIMIT 20","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ActualElapsedTime, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('A', 'C') ORDER BY WeatherDelay, DepTimeBlk, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT ActualElapsedTime, MIN(Distance) FROM mytable WHERE DivAirports IN ('GRR', 'PSG', 'CDC', 'TRI') OR FlightNum BETWEEN 4175 AND 241 GROUP BY ActualElapsedTime LIMIT 27","hsqls":["SELECT ActualElapsedTime, MIN(Distance) FROM mytable WHERE (DivAirports__MV0 IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports__MV1 IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports__MV2 IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports__MV3 IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports__MV4 IN ('GRR', 'PSG', 'CDC', 'TRI')) OR FlightNum BETWEEN 4175 AND 241 GROUP BY ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrTime NOT IN (1132, 1751, 2036, 1845) AND \"Month\" BETWEEN 1 AND 1 OR WheelsOn BETWEEN 844 AND 1918 LIMIT 14","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE ArrTime NOT IN (1132, 1751, 2036, 1845) AND Month BETWEEN 1 AND 1 OR WheelsOn BETWEEN 844 AND 1918 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ActualElapsedTime, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('A', 'C') ORDER BY WeatherDelay, DepTimeBlk, UniqueCarrier LIMIT 20","hsqls":["SELECT DivLongestGTimes, ActualElapsedTime, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('A', 'C') ORDER BY WeatherDelay, DepTimeBlk, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, MIN(Distance) FROM mytable WHERE DivAirports IN ('GRR', 'PSG', 'CDC', 'TRI') OR FlightNum BETWEEN 4175 AND 241 GROUP BY ActualElapsedTime LIMIT 27","hsqls":["SELECT ActualElapsedTime, MIN(Distance) FROM mytable WHERE (DivAirports[1] IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports[2] IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports[3] IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports[4] IN ('GRR', 'PSG', 'CDC', 'TRI') OR DivAirports[5] IN ('GRR', 'PSG', 'CDC', 'TRI')) OR FlightNum BETWEEN 4175 AND 241 GROUP BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrTime NOT IN (1132, 1751, 2036, 1845) AND \"Month\" BETWEEN 1 AND 1 OR WheelsOn BETWEEN 844 AND 1918 LIMIT 14","hsqls":["SELECT DivWheelsOns FROM mytable WHERE ArrTime NOT IN (1132, 1751, 2036, 1845) AND `Month` BETWEEN 1 AND 1 OR WheelsOn BETWEEN 844 AND 1918 LIMIT 10000"]}
 {"sql":"SELECT \"Month\", UniqueCarrier, OriginStateName, COUNT(DivDistance), MIN(CarrierDelay) FROM mytable WHERE TaxiIn BETWEEN 19 AND 67 OR WheelsOff BETWEEN 1620 AND 958 GROUP BY \"Month\", UniqueCarrier, OriginStateName LIMIT 8","hsqls":["SELECT Month, UniqueCarrier, OriginStateName, COUNT(DivDistance), MIN(CarrierDelay) FROM mytable WHERE TaxiIn BETWEEN 19 AND 67 OR WheelsOff BETWEEN 1620 AND 958 GROUP BY Month, UniqueCarrier, OriginStateName LIMIT 8"]}
-{"sql":"SELECT DivAirports, ArrDelayMinutes, OriginStateName FROM mytable ORDER BY OriginCityName, ActualElapsedTime, ArrDel15 LIMIT 21","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrDelayMinutes, OriginStateName FROM mytable ORDER BY OriginCityName, ActualElapsedTime, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DivAirportSeqIDs IN (1099402, 1198603, 1387302, 1127802) AND ArrDelayMinutes BETWEEN 19.0 AND 148.0 ORDER BY LateAircraftDelay LIMIT 22","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs__MV1 IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs__MV2 IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs__MV3 IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs__MV4 IN (1099402, 1198603, 1387302, 1127802)) AND ArrDelayMinutes BETWEEN 19.0 AND 148.0 ORDER BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ArrDelayMinutes, OriginStateName FROM mytable ORDER BY OriginCityName, ActualElapsedTime, ArrDel15 LIMIT 21","hsqls":["SELECT DivAirports, ArrDelayMinutes, OriginStateName FROM mytable ORDER BY OriginCityName, ActualElapsedTime, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DivAirportSeqIDs IN (1099402, 1198603, 1387302, 1127802) AND ArrDelayMinutes BETWEEN 19.0 AND 148.0 ORDER BY LateAircraftDelay LIMIT 22","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivAirportSeqIDs[1] IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs[2] IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs[3] IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs[4] IN (1099402, 1198603, 1387302, 1127802) OR DivAirportSeqIDs[5] IN (1099402, 1198603, 1387302, 1127802)) AND ArrDelayMinutes BETWEEN 19.0 AND 148.0 ORDER BY LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT MAX(OriginStateFips) FROM mytable WHERE Distance IN (269) LIMIT 29"}
 {"sql":"SELECT AirlineID FROM mytable ORDER BY Flights, Cancelled LIMIT 8"}
 {"sql":"SELECT DestWac, Quarter, ArrivalDelayGroups, MAX(DepartureDelayGroups), MIN(Cancelled), AVG(DivArrDelay) FROM mytable WHERE OriginAirportID BETWEEN 14674 AND 13290 AND DestCityName IN ('Santa Fe, NM', 'Indianapolis, IN', 'Washington, DC') GROUP BY DestWac, Quarter, ArrivalDelayGroups  ORDER BY DestWac, Quarter, ArrivalDelayGroups LIMIT 28","hsqls":["SELECT DestWac, Quarter, ArrivalDelayGroups, MAX(DepartureDelayGroups), MIN(Cancelled), AVG(DivArrDelay) FROM mytable WHERE OriginAirportID BETWEEN 14674 AND 13290 AND DestCityName IN ('Santa Fe, NM', 'Indianapolis, IN', 'Washington, DC') GROUP BY DestWac, Quarter, ArrivalDelayGroups  ORDER BY DestWac, Quarter, ArrivalDelayGroups LIMIT 28"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 42 AND 10 OR DepDelay > 154.0 LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 42 AND 10 OR DivTotalGTimes__MV1 BETWEEN 42 AND 10 OR DivTotalGTimes__MV2 BETWEEN 42 AND 10 OR DivTotalGTimes__MV3 BETWEEN 42 AND 10 OR DivTotalGTimes__MV4 BETWEEN 42 AND 10) OR DepDelay > 154.0 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 42 AND 10 OR DepDelay > 154.0 LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 42 AND 10 OR DivTotalGTimes[2] BETWEEN 42 AND 10 OR DivTotalGTimes[3] BETWEEN 42 AND 10 OR DivTotalGTimes[4] BETWEEN 42 AND 10 OR DivTotalGTimes[5] BETWEEN 42 AND 10) OR DepDelay > 154.0 LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, DestAirportID, CRSDepTime FROM mytable WHERE DepDel15 <= 1 OR OriginStateFips IN (49, 47, 35, 13) ORDER BY LateAircraftDelay, \"Month\", DaysSinceEpoch LIMIT 4","hsqls":["SELECT LateAircraftDelay, DestAirportID, CRSDepTime FROM mytable WHERE DepDel15 <= 1 OR OriginStateFips IN (49, 47, 35, 13) ORDER BY LateAircraftDelay, Month, DaysSinceEpoch LIMIT 4"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE LateAircraftDelay BETWEEN 88 AND 6 AND DepartureDelayGroups <> -9999 ORDER BY OriginWac LIMIT 10"}
-{"sql":"SELECT FlightNum, CRSElapsedTime FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-04' AND \"Year\" >= 2014 OR DivAirports IN ('SWF', 'IAH', 'MSN', 'PHX') ORDER BY WheelsOff, ArrivalDelayGroups","hsqls":["SELECT FlightNum, CRSElapsedTime FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-04' AND Year >= 2014 OR (DivAirports__MV0 IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports__MV1 IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports__MV2 IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports__MV3 IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports__MV4 IN ('SWF', 'IAH', 'MSN', 'PHX')) ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT FlightNum, CRSElapsedTime FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-04' AND \"Year\" >= 2014 OR DivAirports IN ('SWF', 'IAH', 'MSN', 'PHX') ORDER BY WheelsOff, ArrivalDelayGroups","hsqls":["SELECT FlightNum, CRSElapsedTime FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-04' AND `Year` >= 2014 OR (DivAirports[1] IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports[2] IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports[3] IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports[4] IN ('SWF', 'IAH', 'MSN', 'PHX') OR DivAirports[5] IN ('SWF', 'IAH', 'MSN', 'PHX')) ORDER BY WheelsOff, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginCityMarketID), COUNT(DivAirportLandings) FROM mytable WHERE OriginCityName > 'Eagle, CO' OR CRSDepTime >= 1158 LIMIT 14"}
 {"sql":"SELECT Diverted, OriginStateFips, DayOfWeek, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 1 GROUP BY Diverted, OriginStateFips, DayOfWeek  ORDER BY Diverted, OriginStateFips, DayOfWeek LIMIT 6","hsqls":["SELECT Diverted, OriginStateFips, DayOfWeek, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 4 AND 1 GROUP BY Diverted, OriginStateFips, DayOfWeek  ORDER BY Diverted, OriginStateFips, DayOfWeek LIMIT 6"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE DestAirportSeqID BETWEEN 1409803 AND 1055102 ORDER BY \"Year\", DepDelayMinutes LIMIT 4","hsqls":["SELECT DivAirportLandings FROM mytable WHERE DestAirportSeqID BETWEEN 1409803 AND 1055102 ORDER BY Year, DepDelayMinutes LIMIT 4"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestStateName BETWEEN 'Vermont' AND 'Montana' LIMIT 9"}
-{"sql":"SELECT LongestAddGTime, DivAirportLandings, MIN(DestWac), MAX(TaxiIn), AVG(WheelsOn) FROM mytable WHERE DivTailNums BETWEEN 'N646SW' AND 'N14173' OR \"Month\" IN (1) GROUP BY LongestAddGTime, DivAirportLandings LIMIT 9","hsqls":["SELECT LongestAddGTime, DivAirportLandings, MIN(DestWac), MAX(TaxiIn), AVG(WheelsOn) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N646SW' AND 'N14173' OR DivTailNums__MV1 BETWEEN 'N646SW' AND 'N14173' OR DivTailNums__MV2 BETWEEN 'N646SW' AND 'N14173' OR DivTailNums__MV3 BETWEEN 'N646SW' AND 'N14173' OR DivTailNums__MV4 BETWEEN 'N646SW' AND 'N14173') OR Month IN (1) GROUP BY LongestAddGTime, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DestWac, Distance, DivTailNums FROM mytable WHERE WeatherDelay BETWEEN 134 AND 316 AND DistanceGroup BETWEEN 8 AND 7 LIMIT 23","hsqls":["SELECT DestWac, Distance, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE WeatherDelay BETWEEN 134 AND 316 AND DistanceGroup BETWEEN 8 AND 7 LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, TailNum, CRSElapsedTime FROM mytable LIMIT 13","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, TailNum, CRSElapsedTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivAirportLandings, MIN(DestWac), MAX(TaxiIn), AVG(WheelsOn) FROM mytable WHERE DivTailNums BETWEEN 'N646SW' AND 'N14173' OR \"Month\" IN (1) GROUP BY LongestAddGTime, DivAirportLandings LIMIT 9","hsqls":["SELECT LongestAddGTime, DivAirportLandings, MIN(DestWac), MAX(TaxiIn), AVG(WheelsOn) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N646SW' AND 'N14173' OR DivTailNums[2] BETWEEN 'N646SW' AND 'N14173' OR DivTailNums[3] BETWEEN 'N646SW' AND 'N14173' OR DivTailNums[4] BETWEEN 'N646SW' AND 'N14173' OR DivTailNums[5] BETWEEN 'N646SW' AND 'N14173') OR `Month` IN (1) GROUP BY LongestAddGTime, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DestWac, Distance, DivTailNums FROM mytable WHERE WeatherDelay BETWEEN 134 AND 316 AND DistanceGroup BETWEEN 8 AND 7 LIMIT 23","hsqls":["SELECT DestWac, Distance, DivTailNums FROM mytable WHERE WeatherDelay BETWEEN 134 AND 316 AND DistanceGroup BETWEEN 8 AND 7 LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, TailNum, CRSElapsedTime FROM mytable LIMIT 13","hsqls":["SELECT DivTailNums, TailNum, CRSElapsedTime FROM mytable LIMIT 10000"]}
 {"sql":"SELECT Quarter, OriginStateName FROM mytable ORDER BY LateAircraftDelay, DepDel15, DivActualElapsedTime LIMIT 23"}
-{"sql":"SELECT \"Month\" FROM mytable WHERE NASDelay IN (94, 17, 65, 60, 157) OR OriginAirportSeqID NOT IN (1467402, 1393003, 1161802) ORDER BY TaxiOut, Dest, ArrDel15 LIMIT 9","hsqls":["SELECT Month FROM mytable WHERE NASDelay IN (94, 17, 65, 60, 157) OR OriginAirportSeqID NOT IN (1467402, 1393003, 1161802) ORDER BY TaxiOut, Dest, ArrDel15 LIMIT 9"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE NASDelay IN (94, 17, 65, 60, 157) OR OriginAirportSeqID NOT IN (1467402, 1393003, 1161802) ORDER BY TaxiOut, Dest, ArrDel15 LIMIT 9","hsqls":["SELECT `Month` FROM mytable WHERE NASDelay IN (94, 17, 65, 60, 157) OR OriginAirportSeqID NOT IN (1467402, 1393003, 1161802) ORDER BY TaxiOut, Dest, ArrDel15 LIMIT 9"]}
 {"sql":"SELECT DestStateFips, DestCityMarketID FROM mytable WHERE DestStateFips > 46 AND DaysSinceEpoch BETWEEN 16082 AND 16097 ORDER BY OriginCityMarketID, Origin, DivActualElapsedTime"}
 {"sql":"SELECT Flights, DepTime, SUM(LongestAddGTime), AVG(Distance), MAX(DepDelay) FROM mytable WHERE FirstDepTime BETWEEN 1200 AND 750 OR DepDelay IN (92.0, 96.0, 297.0, 39.0, 66.0) GROUP BY Flights, DepTime  ORDER BY Flights, DepTime LIMIT 3","hsqls":["SELECT Flights, DepTime, SUM(LongestAddGTime), AVG(Distance), MAX(DepDelay) FROM mytable WHERE FirstDepTime BETWEEN 1200 AND 750 OR DepDelay IN (92.0, 96.0, 297.0, 39.0, 66.0) GROUP BY Flights, DepTime  ORDER BY Flights, DepTime LIMIT 3"]}
 {"sql":"SELECT AVG(WeatherDelay), COUNT(DayofMonth) FROM mytable WHERE OriginCityMarketID > 32474 LIMIT 12"}
 {"sql":"SELECT DestWac, DepDelay, FirstDepTime, COUNT(ArrDelayMinutes), MIN(ArrDelay) FROM mytable WHERE AirlineID NOT IN (19977) AND DestCityName BETWEEN 'Midland/Odessa, TX' AND 'Lake Charles, LA' AND DepartureDelayGroups BETWEEN -1 AND 4 GROUP BY DestWac, DepDelay, FirstDepTime  ORDER BY DestWac, DepDelay, FirstDepTime LIMIT 18","hsqls":["SELECT DestWac, DepDelay, FirstDepTime, COUNT(ArrDelayMinutes), MIN(ArrDelay) FROM mytable WHERE AirlineID NOT IN (19977) AND DestCityName BETWEEN 'Midland/Odessa, TX' AND 'Lake Charles, LA' AND DepartureDelayGroups BETWEEN -1 AND 4 GROUP BY DestWac, DepDelay, FirstDepTime  ORDER BY DestWac, DepDelay, FirstDepTime LIMIT 18"]}
 {"sql":"SELECT TaxiOut, DepDelayMinutes, DayOfWeek FROM mytable WHERE OriginAirportSeqID <= 1484202 OR DestCityMarketID BETWEEN 32888 AND 30194 ORDER BY Quarter LIMIT 6"}
-{"sql":"SELECT CarrierDelay, TotalAddGTime, DivActualElapsedTime FROM mytable WHERE DivAirportIDs > 12323","hsqls":["SELECT CarrierDelay, TotalAddGTime, DivActualElapsedTime FROM mytable WHERE (DivAirportIDs__MV0 > 12323 OR DivAirportIDs__MV1 > 12323 OR DivAirportIDs__MV2 > 12323 OR DivAirportIDs__MV3 > 12323 OR DivAirportIDs__MV4 > 12323) LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, TotalAddGTime, DivActualElapsedTime FROM mytable WHERE DivAirportIDs > 12323","hsqls":["SELECT CarrierDelay, TotalAddGTime, DivActualElapsedTime FROM mytable WHERE (DivAirportIDs[1] > 12323 OR DivAirportIDs[2] > 12323 OR DivAirportIDs[3] > 12323 OR DivAirportIDs[4] > 12323 OR DivAirportIDs[5] > 12323) LIMIT 10000"]}
 {"sql":"SELECT Diverted, ArrTimeBlk, Dest, AVG(DivArrDelay), MAX(CRSDepTime), MAX(ActualElapsedTime) FROM mytable WHERE OriginAirportID <= 11003 OR LongestAddGTime >= 8 GROUP BY Diverted, ArrTimeBlk, Dest  ORDER BY Diverted, ArrTimeBlk, Dest LIMIT 14","hsqls":["SELECT Diverted, ArrTimeBlk, Dest, AVG(DivArrDelay), MAX(CRSDepTime), MAX(ActualElapsedTime) FROM mytable WHERE OriginAirportID <= 11003 OR LongestAddGTime >= 8 GROUP BY Diverted, ArrTimeBlk, Dest  ORDER BY Diverted, ArrTimeBlk, Dest LIMIT 14"]}
 {"sql":"SELECT Diverted, AVG(LongestAddGTime), MAX(CRSArrTime), AVG(CRSArrTime) FROM mytable WHERE DivActualElapsedTime <> 516 GROUP BY Diverted  ORDER BY Diverted LIMIT 23","hsqls":["SELECT Diverted, AVG(LongestAddGTime), MAX(CRSArrTime), AVG(CRSArrTime) FROM mytable WHERE DivActualElapsedTime <> 516 GROUP BY Diverted  ORDER BY Diverted LIMIT 23"]}
-{"sql":"SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE Carrier NOT IN ('OO', 'FL', 'MQ', 'AA') OR \"Year\" IN (2014) OR CRSElapsedTime NOT IN (178) ORDER BY SecurityDelay, DestCityMarketID, \"Month\" LIMIT 3","hsqls":["SELECT FirstDepTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Carrier NOT IN ('OO', 'FL', 'MQ', 'AA') OR Year IN (2014) OR CRSElapsedTime NOT IN (178) ORDER BY SecurityDelay, DestCityMarketID, Month LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE Carrier NOT IN ('OO', 'FL', 'MQ', 'AA') OR \"Year\" IN (2014) OR CRSElapsedTime NOT IN (178) ORDER BY SecurityDelay, DestCityMarketID, \"Month\" LIMIT 3","hsqls":["SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE Carrier NOT IN ('OO', 'FL', 'MQ', 'AA') OR `Year` IN (2014) OR CRSElapsedTime NOT IN (178) ORDER BY SecurityDelay, DestCityMarketID, `Month` LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, COUNT(DepTimeBlk), MAX(DepDelay) FROM mytable WHERE AirTime BETWEEN 330 AND 148 AND DestCityName >= 'White Plains, NY' GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 6","hsqls":["SELECT CancellationCode, COUNT(DepTimeBlk), MAX(DepDelay) FROM mytable WHERE AirTime BETWEEN 330 AND 148 AND DestCityName >= 'White Plains, NY' GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 6"]}
 {"sql":"SELECT WheelsOff, AirlineID, MIN(FlightNum), AVG(CRSDepTime), SUM(ArrDel15) FROM mytable WHERE CancellationCode IN ('A', 'B', 'noodles') GROUP BY WheelsOff, AirlineID  ORDER BY WheelsOff, AirlineID LIMIT 8","hsqls":["SELECT WheelsOff, AirlineID, MIN(FlightNum), AVG(CRSDepTime), SUM(ArrDel15) FROM mytable WHERE CancellationCode IN ('A', 'B', 'noodles') GROUP BY WheelsOff, AirlineID  ORDER BY WheelsOff, AirlineID LIMIT 8"]}
 {"sql":"SELECT SUM(CRSArrTime) FROM mytable WHERE TotalAddGTime <= 24 LIMIT 6"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginAirportSeqID BETWEEN 1020803 AND 1062002 OR DestAirportID <> 10713 LIMIT 10"}
-{"sql":"SELECT \"Month\", COUNT(DestStateFips), SUM(ActualElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE DepTime IN (1340, 1750, 1544) GROUP BY \"Month\" LIMIT 5","hsqls":["SELECT Month, COUNT(DestStateFips), SUM(ActualElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE DepTime IN (1340, 1750, 1544) GROUP BY Month LIMIT 5"]}
+{"sql":"SELECT \"Month\", COUNT(DestStateFips), SUM(ActualElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE DepTime IN (1340, 1750, 1544) GROUP BY \"Month\" LIMIT 5","hsqls":["SELECT Month, COUNT(DestStateFips), SUM(ActualElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE DepTime IN (1340, 1750, 1544) GROUP BY `Month` LIMIT 5"]}
 {"sql":"SELECT DestAirportSeqID, DestCityName, MIN(ArrDelay) FROM mytable GROUP BY DestAirportSeqID, DestCityName  ORDER BY DestAirportSeqID, DestCityName LIMIT 13","hsqls":["SELECT DestAirportSeqID, DestCityName, MIN(ArrDelay) FROM mytable GROUP BY DestAirportSeqID, DestCityName  ORDER BY DestAirportSeqID, DestCityName LIMIT 13"]}
-{"sql":"SELECT DestWac, Carrier, UniqueCarrier, COUNT(TaxiOut) FROM mytable WHERE CRSDepTime > 1708 OR DivAirports IN ('MSY', 'FLL', 'TYS', 'SEA') GROUP BY DestWac, Carrier, UniqueCarrier LIMIT 17","hsqls":["SELECT DestWac, Carrier, UniqueCarrier, COUNT(TaxiOut) FROM mytable WHERE CRSDepTime > 1708 OR (DivAirports__MV0 IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports__MV1 IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports__MV2 IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports__MV3 IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports__MV4 IN ('MSY', 'FLL', 'TYS', 'SEA')) GROUP BY DestWac, Carrier, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT Diverted, COUNT(\"Month\") FROM mytable WHERE DivLongestGTimes IN (44.0, 101.0) AND DepTime IN (613, 1953) OR FirstDepTime NOT IN (2110, 1742, 907, 1153, 631) GROUP BY Diverted LIMIT 4","hsqls":["SELECT Diverted, COUNT(Month) FROM mytable WHERE (DivLongestGTimes__MV0 IN (44.0, 101.0) OR DivLongestGTimes__MV1 IN (44.0, 101.0) OR DivLongestGTimes__MV2 IN (44.0, 101.0) OR DivLongestGTimes__MV3 IN (44.0, 101.0) OR DivLongestGTimes__MV4 IN (44.0, 101.0)) AND DepTime IN (613, 1953) OR FirstDepTime NOT IN (2110, 1742, 907, 1153, 631) GROUP BY Diverted LIMIT 10000"]}
+{"sql":"SELECT DestWac, Carrier, UniqueCarrier, COUNT(TaxiOut) FROM mytable WHERE CRSDepTime > 1708 OR DivAirports IN ('MSY', 'FLL', 'TYS', 'SEA') GROUP BY DestWac, Carrier, UniqueCarrier LIMIT 17","hsqls":["SELECT DestWac, Carrier, UniqueCarrier, COUNT(TaxiOut) FROM mytable WHERE CRSDepTime > 1708 OR (DivAirports[1] IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports[2] IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports[3] IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports[4] IN ('MSY', 'FLL', 'TYS', 'SEA') OR DivAirports[5] IN ('MSY', 'FLL', 'TYS', 'SEA')) GROUP BY DestWac, Carrier, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT Diverted, COUNT(\"Month\") FROM mytable WHERE DivLongestGTimes IN (44.0, 101.0) AND DepTime IN (613, 1953) OR FirstDepTime NOT IN (2110, 1742, 907, 1153, 631) GROUP BY Diverted LIMIT 4","hsqls":["SELECT Diverted, COUNT(`Month`) FROM mytable WHERE (DivLongestGTimes[1] IN (44.0, 101.0) OR DivLongestGTimes[2] IN (44.0, 101.0) OR DivLongestGTimes[3] IN (44.0, 101.0) OR DivLongestGTimes[4] IN (44.0, 101.0) OR DivLongestGTimes[5] IN (44.0, 101.0)) AND DepTime IN (613, 1953) OR FirstDepTime NOT IN (2110, 1742, 907, 1153, 631) GROUP BY Diverted LIMIT 10000"]}
 {"sql":"SELECT FlightDate, DepTime, Origin FROM mytable WHERE DivActualElapsedTime > 416 ORDER BY Diverted LIMIT 28"}
-{"sql":"SELECT Dest, DivWheelsOffs FROM mytable WHERE OriginCityName >= 'Killeen, TX' OR DivLongestGTimes IN (19.0, 99.0, 40.0, 34.0) ORDER BY LongestAddGTime, DestAirportSeqID LIMIT 26","hsqls":["SELECT Dest, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE OriginCityName >= 'Killeen, TX' OR (DivLongestGTimes__MV0 IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes__MV1 IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes__MV2 IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes__MV3 IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes__MV4 IN (19.0, 99.0, 40.0, 34.0)) ORDER BY LongestAddGTime, DestAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, ArrTime, DivTailNums FROM mytable WHERE DivWheelsOffs BETWEEN 1841 AND 1340 ORDER BY \"Month\" LIMIT 10","hsqls":["SELECT DepDelayMinutes, ArrTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1841 AND 1340 OR DivWheelsOffs__MV1 BETWEEN 1841 AND 1340 OR DivWheelsOffs__MV2 BETWEEN 1841 AND 1340 OR DivWheelsOffs__MV3 BETWEEN 1841 AND 1340 OR DivWheelsOffs__MV4 BETWEEN 1841 AND 1340) ORDER BY Month LIMIT 10000"]}
+{"sql":"SELECT Dest, DivWheelsOffs FROM mytable WHERE OriginCityName >= 'Killeen, TX' OR DivLongestGTimes IN (19.0, 99.0, 40.0, 34.0) ORDER BY LongestAddGTime, DestAirportSeqID LIMIT 26","hsqls":["SELECT Dest, DivWheelsOffs FROM mytable WHERE OriginCityName >= 'Killeen, TX' OR (DivLongestGTimes[1] IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes[2] IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes[3] IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes[4] IN (19.0, 99.0, 40.0, 34.0) OR DivLongestGTimes[5] IN (19.0, 99.0, 40.0, 34.0)) ORDER BY LongestAddGTime, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, ArrTime, DivTailNums FROM mytable WHERE DivWheelsOffs BETWEEN 1841 AND 1340 ORDER BY \"Month\" LIMIT 10","hsqls":["SELECT DepDelayMinutes, ArrTime, DivTailNums FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1841 AND 1340 OR DivWheelsOffs[2] BETWEEN 1841 AND 1340 OR DivWheelsOffs[3] BETWEEN 1841 AND 1340 OR DivWheelsOffs[4] BETWEEN 1841 AND 1340 OR DivWheelsOffs[5] BETWEEN 1841 AND 1340) ORDER BY `Month` LIMIT 10000"]}
 {"sql":"SELECT SUM(DepDelayMinutes) FROM mytable WHERE FlightDate BETWEEN '2014-01-06' AND '2014-01-26' AND NASDelay >= 42 AND ArrDelayMinutes > 126.0 LIMIT 11"}
-{"sql":"SELECT Diverted, DestState, DestCityName FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY DistanceGroup, ArrTime, Origin LIMIT 16","hsqls":["SELECT Diverted, DestState, DestCityName FROM mytable WHERE Year BETWEEN 2014 AND 2014 ORDER BY DistanceGroup, ArrTime, Origin LIMIT 16"]}
+{"sql":"SELECT Diverted, DestState, DestCityName FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY DistanceGroup, ArrTime, Origin LIMIT 16","hsqls":["SELECT Diverted, DestState, DestCityName FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 ORDER BY DistanceGroup, ArrTime, Origin LIMIT 16"]}
 {"sql":"SELECT Cancelled, DivActualElapsedTime, DayOfWeek, MIN(TaxiOut) FROM mytable WHERE CarrierDelay IN (87, 118, 12) GROUP BY Cancelled, DivActualElapsedTime, DayOfWeek  ORDER BY Cancelled, DivActualElapsedTime, DayOfWeek LIMIT 12","hsqls":["SELECT Cancelled, DivActualElapsedTime, DayOfWeek, MIN(TaxiOut) FROM mytable WHERE CarrierDelay IN (87, 118, 12) GROUP BY Cancelled, DivActualElapsedTime, DayOfWeek  ORDER BY Cancelled, DivActualElapsedTime, DayOfWeek LIMIT 12"]}
 {"sql":"SELECT LongestAddGTime, OriginWac FROM mytable WHERE DepTime NOT IN (1235) AND DivDistance <> 471 ORDER BY ArrTimeBlk LIMIT 16"}
 {"sql":"SELECT MIN(Flights), MIN(DepDel15) FROM mytable WHERE WheelsOff > 828 OR Origin NOT IN ('APN', 'HSV', 'GSP', 'BRW') OR OriginStateFips BETWEEN 41 AND 49 LIMIT 14"}
@@ -6056,29 +6056,29 @@
 {"sql":"SELECT Origin, AVG(OriginAirportSeqID), MIN(FirstDepTime), MIN(Distance) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 10","hsqls":["SELECT Origin, AVG(OriginAirportSeqID), MIN(FirstDepTime), MIN(Distance) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 10"]}
 {"sql":"SELECT WheelsOff, ArrDelayMinutes, UniqueCarrier FROM mytable WHERE OriginAirportSeqID IN (1153703, 1295402, 1541202, 1501603, 1161802) AND OriginStateName BETWEEN 'Georgia' AND 'Texas' ORDER BY DestState, DivActualElapsedTime, OriginAirportID LIMIT 13"}
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY DepartureDelayGroups, DestWac, CancellationCode LIMIT 29"}
-{"sql":"SELECT FlightDate, TotalAddGTime, AVG(DepDel15) FROM mytable WHERE \"Month\" IN (1) AND Cancelled <= 0 OR DepDel15 IN (1, 0, -9999) GROUP BY FlightDate, TotalAddGTime LIMIT 26","hsqls":["SELECT FlightDate, TotalAddGTime, AVG(DepDel15) FROM mytable WHERE Month IN (1) AND Cancelled <= 0 OR DepDel15 IN (1, 0, -9999) GROUP BY FlightDate, TotalAddGTime LIMIT 26"]}
-{"sql":"SELECT FirstDepTime, CRSArrTime, DestStateFips FROM mytable WHERE DivAirports IN ('FAI', 'KTN') OR CarrierDelay BETWEEN 28 AND 93 ORDER BY OriginAirportSeqID, DestWac LIMIT 28","hsqls":["SELECT FirstDepTime, CRSArrTime, DestStateFips FROM mytable WHERE (DivAirports__MV0 IN ('FAI', 'KTN') OR DivAirports__MV1 IN ('FAI', 'KTN') OR DivAirports__MV2 IN ('FAI', 'KTN') OR DivAirports__MV3 IN ('FAI', 'KTN') OR DivAirports__MV4 IN ('FAI', 'KTN')) OR CarrierDelay BETWEEN 28 AND 93 ORDER BY OriginAirportSeqID, DestWac LIMIT 10000"]}
-{"sql":"SELECT DivArrDelay FROM mytable WHERE DivDistance NOT IN (1138, 1246, 115) ORDER BY AirlineID, DivArrDelay, \"Month\" LIMIT 21","hsqls":["SELECT DivArrDelay FROM mytable WHERE DivDistance NOT IN (1138, 1246, 115) ORDER BY AirlineID, DivArrDelay, Month LIMIT 21"]}
+{"sql":"SELECT FlightDate, TotalAddGTime, AVG(DepDel15) FROM mytable WHERE \"Month\" IN (1) AND Cancelled <= 0 OR DepDel15 IN (1, 0, -9999) GROUP BY FlightDate, TotalAddGTime LIMIT 26","hsqls":["SELECT FlightDate, TotalAddGTime, AVG(DepDel15) FROM mytable WHERE `Month` IN (1) AND Cancelled <= 0 OR DepDel15 IN (1, 0, -9999) GROUP BY FlightDate, TotalAddGTime LIMIT 26"]}
+{"sql":"SELECT FirstDepTime, CRSArrTime, DestStateFips FROM mytable WHERE DivAirports IN ('FAI', 'KTN') OR CarrierDelay BETWEEN 28 AND 93 ORDER BY OriginAirportSeqID, DestWac LIMIT 28","hsqls":["SELECT FirstDepTime, CRSArrTime, DestStateFips FROM mytable WHERE (DivAirports[1] IN ('FAI', 'KTN') OR DivAirports[2] IN ('FAI', 'KTN') OR DivAirports[3] IN ('FAI', 'KTN') OR DivAirports[4] IN ('FAI', 'KTN') OR DivAirports[5] IN ('FAI', 'KTN')) OR CarrierDelay BETWEEN 28 AND 93 ORDER BY OriginAirportSeqID, DestWac LIMIT 10000"]}
+{"sql":"SELECT DivArrDelay FROM mytable WHERE DivDistance NOT IN (1138, 1246, 115) ORDER BY AirlineID, DivArrDelay, \"Month\" LIMIT 21","hsqls":["SELECT DivArrDelay FROM mytable WHERE DivDistance NOT IN (1138, 1246, 115) ORDER BY AirlineID, DivArrDelay, `Month` LIMIT 21"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE DestCityMarketID IN (34252, 30141, 31097) OR OriginState BETWEEN 'WA' AND 'TT' LIMIT 14"}
 {"sql":"SELECT Flights FROM mytable ORDER BY TaxiOut, FlightDate, DepTimeBlk LIMIT 26"}
 {"sql":"SELECT LongestAddGTime, SecurityDelay, ArrDelay, MIN(Cancelled), SUM(OriginCityMarketID), MAX(DivAirportLandings) FROM mytable WHERE Quarter <= 1 GROUP BY LongestAddGTime, SecurityDelay, ArrDelay  ORDER BY LongestAddGTime, SecurityDelay, ArrDelay LIMIT 17","hsqls":["SELECT LongestAddGTime, SecurityDelay, ArrDelay, MIN(Cancelled), SUM(OriginCityMarketID), MAX(DivAirportLandings) FROM mytable WHERE Quarter <= 1 GROUP BY LongestAddGTime, SecurityDelay, ArrDelay  ORDER BY LongestAddGTime, SecurityDelay, ArrDelay LIMIT 17"]}
 {"sql":"SELECT AirTime, UniqueCarrier, OriginStateName, COUNT(NASDelay), MIN(DivAirportLandings) FROM mytable WHERE DivAirportLandings NOT IN (1, 9) GROUP BY AirTime, UniqueCarrier, OriginStateName  ORDER BY AirTime, UniqueCarrier, OriginStateName LIMIT 13","hsqls":["SELECT AirTime, UniqueCarrier, OriginStateName, COUNT(NASDelay), MIN(DivAirportLandings) FROM mytable WHERE DivAirportLandings NOT IN (1, 9) GROUP BY AirTime, UniqueCarrier, OriginStateName  ORDER BY AirTime, UniqueCarrier, OriginStateName LIMIT 13"]}
 {"sql":"SELECT Distance FROM mytable WHERE FlightDate >= '2014-01-29' AND LateAircraftDelay BETWEEN 181 AND 113 ORDER BY DivDistance, OriginCityName LIMIT 9"}
-{"sql":"SELECT DestStateFips, DivWheelsOffs, DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime NOT IN (901) AND \"Year\" NOT IN (2014) ORDER BY Flights, FlightDate, CancellationCode LIMIT 1","hsqls":["SELECT DestStateFips, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime NOT IN (901) AND Year NOT IN (2014) ORDER BY Flights, FlightDate, CancellationCode LIMIT 10000"]}
-{"sql":"SELECT WheelsOn, AVG(DepDel15), SUM(AirlineID), SUM(ArrDelay) FROM mytable WHERE OriginCityMarketID = 33264 AND DivWheelsOns <= 1418 GROUP BY WheelsOn LIMIT 3","hsqls":["SELECT WheelsOn, AVG(DepDel15), SUM(AirlineID), SUM(ArrDelay) FROM mytable WHERE OriginCityMarketID = 33264 AND (DivWheelsOns__MV0 <= 1418 OR DivWheelsOns__MV1 <= 1418 OR DivWheelsOns__MV2 <= 1418 OR DivWheelsOns__MV3 <= 1418 OR DivWheelsOns__MV4 <= 1418) GROUP BY WheelsOn LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE Diverted < 1 OR ArrivalDelayGroups NOT IN (9, 12) OR FlightDate <= '2014-01-20' ORDER BY DestState LIMIT 23","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE Diverted < 1 OR ArrivalDelayGroups NOT IN (9, 12) OR FlightDate <= '2014-01-20' ORDER BY DestState LIMIT 10000"]}
-{"sql":"SELECT AVG(DestAirportID), COUNT(DepartureDelayGroups), MIN(LongestAddGTime) FROM mytable WHERE DivAirports IN ('GGG') LIMIT 3","hsqls":["SELECT AVG(DestAirportID), COUNT(DepartureDelayGroups), MIN(LongestAddGTime)  FROM mytable WHERE (DivAirports__MV0 IN ('GGG') OR DivAirports__MV1 IN ('GGG') OR DivAirports__MV2 IN ('GGG') OR DivAirports__MV3 IN ('GGG') OR DivAirports__MV4 IN ('GGG')) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivWheelsOffs, DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime NOT IN (901) AND \"Year\" NOT IN (2014) ORDER BY Flights, FlightDate, CancellationCode LIMIT 1","hsqls":["SELECT DestStateFips, DivWheelsOffs, DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime NOT IN (901) AND `Year` NOT IN (2014) ORDER BY Flights, FlightDate, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT WheelsOn, AVG(DepDel15), SUM(AirlineID), SUM(ArrDelay) FROM mytable WHERE OriginCityMarketID = 33264 AND DivWheelsOns <= 1418 GROUP BY WheelsOn LIMIT 3","hsqls":["SELECT WheelsOn, AVG(DepDel15), SUM(AirlineID), SUM(ArrDelay) FROM mytable WHERE OriginCityMarketID = 33264 AND (DivWheelsOns[1] <= 1418 OR DivWheelsOns[2] <= 1418 OR DivWheelsOns[3] <= 1418 OR DivWheelsOns[4] <= 1418 OR DivWheelsOns[5] <= 1418) GROUP BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE Diverted < 1 OR ArrivalDelayGroups NOT IN (9, 12) OR FlightDate <= '2014-01-20' ORDER BY DestState LIMIT 23","hsqls":["SELECT DivAirports FROM mytable WHERE Diverted < 1 OR ArrivalDelayGroups NOT IN (9, 12) OR FlightDate <= '2014-01-20' ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT AVG(DestAirportID), COUNT(DepartureDelayGroups), MIN(LongestAddGTime) FROM mytable WHERE DivAirports IN ('GGG') LIMIT 3","hsqls":["SELECT AVG(DestAirportID), COUNT(DepartureDelayGroups), MIN(LongestAddGTime)  FROM mytable WHERE (DivAirports[1] IN ('GGG') OR DivAirports[2] IN ('GGG') OR DivAirports[3] IN ('GGG') OR DivAirports[4] IN ('GGG') OR DivAirports[5] IN ('GGG')) LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, SUM(Cancelled), SUM(TaxiOut), MAX(Distance) FROM mytable WHERE TaxiOut BETWEEN 67 AND 112 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 6","hsqls":["SELECT DestAirportSeqID, SUM(Cancelled), SUM(TaxiOut), MAX(Distance) FROM mytable WHERE TaxiOut BETWEEN 67 AND 112 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 6"]}
-{"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE DivAirports IN ('XNA', 'BTV', 'CAK', 'YYC') GROUP BY Quarter LIMIT 19","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE (DivAirports__MV0 IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports__MV1 IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports__MV2 IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports__MV3 IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports__MV4 IN ('XNA', 'BTV', 'CAK', 'YYC')) GROUP BY Quarter LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, ArrDelayMinutes, DestAirportID FROM mytable WHERE DivWheelsOffs BETWEEN 1231 AND 1631 OR DivTotalGTimes IN (45, 32, 25, 89) LIMIT 29","hsqls":["SELECT TaxiOut, ArrDelayMinutes, DestAirportID FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1231 AND 1631 OR DivWheelsOffs__MV1 BETWEEN 1231 AND 1631 OR DivWheelsOffs__MV2 BETWEEN 1231 AND 1631 OR DivWheelsOffs__MV3 BETWEEN 1231 AND 1631 OR DivWheelsOffs__MV4 BETWEEN 1231 AND 1631) OR (DivTotalGTimes__MV0 IN (45, 32, 25, 89) OR DivTotalGTimes__MV1 IN (45, 32, 25, 89) OR DivTotalGTimes__MV2 IN (45, 32, 25, 89) OR DivTotalGTimes__MV3 IN (45, 32, 25, 89) OR DivTotalGTimes__MV4 IN (45, 32, 25, 89)) LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, DivLongestGTimes FROM mytable ORDER BY DestState, Flights LIMIT 1","hsqls":["SELECT TaxiOut, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable ORDER BY DestState, Flights LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, DayofMonth, MIN(DistanceGroup) FROM mytable WHERE DepDel15 < 1 AND DivAirportIDs IN (13476, 14057, 11721, 13232) GROUP BY FirstDepTime, DayofMonth LIMIT 21","hsqls":["SELECT FirstDepTime, DayofMonth, MIN(DistanceGroup) FROM mytable WHERE DepDel15 < 1 AND (DivAirportIDs__MV0 IN (13476, 14057, 11721, 13232) OR DivAirportIDs__MV1 IN (13476, 14057, 11721, 13232) OR DivAirportIDs__MV2 IN (13476, 14057, 11721, 13232) OR DivAirportIDs__MV3 IN (13476, 14057, 11721, 13232) OR DivAirportIDs__MV4 IN (13476, 14057, 11721, 13232)) GROUP BY FirstDepTime, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE DivAirports IN ('XNA', 'BTV', 'CAK', 'YYC') GROUP BY Quarter LIMIT 19","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE (DivAirports[1] IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports[2] IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports[3] IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports[4] IN ('XNA', 'BTV', 'CAK', 'YYC') OR DivAirports[5] IN ('XNA', 'BTV', 'CAK', 'YYC')) GROUP BY Quarter LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, ArrDelayMinutes, DestAirportID FROM mytable WHERE DivWheelsOffs BETWEEN 1231 AND 1631 OR DivTotalGTimes IN (45, 32, 25, 89) LIMIT 29","hsqls":["SELECT TaxiOut, ArrDelayMinutes, DestAirportID FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1231 AND 1631 OR DivWheelsOffs[2] BETWEEN 1231 AND 1631 OR DivWheelsOffs[3] BETWEEN 1231 AND 1631 OR DivWheelsOffs[4] BETWEEN 1231 AND 1631 OR DivWheelsOffs[5] BETWEEN 1231 AND 1631) OR (DivTotalGTimes[1] IN (45, 32, 25, 89) OR DivTotalGTimes[2] IN (45, 32, 25, 89) OR DivTotalGTimes[3] IN (45, 32, 25, 89) OR DivTotalGTimes[4] IN (45, 32, 25, 89) OR DivTotalGTimes[5] IN (45, 32, 25, 89)) LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivLongestGTimes FROM mytable ORDER BY DestState, Flights LIMIT 1","hsqls":["SELECT TaxiOut, DivLongestGTimes FROM mytable ORDER BY DestState, Flights LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DayofMonth, MIN(DistanceGroup) FROM mytable WHERE DepDel15 < 1 AND DivAirportIDs IN (13476, 14057, 11721, 13232) GROUP BY FirstDepTime, DayofMonth LIMIT 21","hsqls":["SELECT FirstDepTime, DayofMonth, MIN(DistanceGroup) FROM mytable WHERE DepDel15 < 1 AND (DivAirportIDs[1] IN (13476, 14057, 11721, 13232) OR DivAirportIDs[2] IN (13476, 14057, 11721, 13232) OR DivAirportIDs[3] IN (13476, 14057, 11721, 13232) OR DivAirportIDs[4] IN (13476, 14057, 11721, 13232) OR DivAirportIDs[5] IN (13476, 14057, 11721, 13232)) GROUP BY FirstDepTime, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, DepDel15, MAX(CRSDepTime) FROM mytable WHERE ArrTimeBlk NOT IN ('0700-0759') GROUP BY OriginCityMarketID, DepDel15  ORDER BY OriginCityMarketID, DepDel15 LIMIT 6","hsqls":["SELECT OriginCityMarketID, DepDel15, MAX(CRSDepTime) FROM mytable WHERE ArrTimeBlk NOT IN ('0700-0759') GROUP BY OriginCityMarketID, DepDel15  ORDER BY OriginCityMarketID, DepDel15 LIMIT 6"]}
-{"sql":"SELECT DestState, DepTime FROM mytable WHERE DivAirportIDs BETWEEN 11603 AND 11638 ORDER BY DivDistance, ArrTimeBlk, DivAirportLandings LIMIT 7","hsqls":["SELECT DestState, DepTime FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11603 AND 11638 OR DivAirportIDs__MV1 BETWEEN 11603 AND 11638 OR DivAirportIDs__MV2 BETWEEN 11603 AND 11638 OR DivAirportIDs__MV3 BETWEEN 11603 AND 11638 OR DivAirportIDs__MV4 BETWEEN 11603 AND 11638) ORDER BY DivDistance, ArrTimeBlk, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DestState, DepTime FROM mytable WHERE DivAirportIDs BETWEEN 11603 AND 11638 ORDER BY DivDistance, ArrTimeBlk, DivAirportLandings LIMIT 7","hsqls":["SELECT DestState, DepTime FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11603 AND 11638 OR DivAirportIDs[2] BETWEEN 11603 AND 11638 OR DivAirportIDs[3] BETWEEN 11603 AND 11638 OR DivAirportIDs[4] BETWEEN 11603 AND 11638 OR DivAirportIDs[5] BETWEEN 11603 AND 11638) ORDER BY DivDistance, ArrTimeBlk, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE FirstDepTime BETWEEN 1043 AND 227 AND DestStateFips BETWEEN 49 AND 49 ORDER BY Carrier, CancellationCode, OriginStateName LIMIT 3"}
 {"sql":"SELECT Carrier, DestState, LongestAddGTime FROM mytable WHERE DepDel15 < 1 OR Distance BETWEEN 144 AND 581 OR DivArrDelay <> 69 LIMIT 11"}
 {"sql":"SELECT NASDelay, AirTime, CRSDepTime, MIN(TotalAddGTime) FROM mytable GROUP BY NASDelay, AirTime, CRSDepTime  ORDER BY NASDelay, AirTime, CRSDepTime LIMIT 8","hsqls":["SELECT NASDelay, AirTime, CRSDepTime, MIN(TotalAddGTime) FROM mytable GROUP BY NASDelay, AirTime, CRSDepTime  ORDER BY NASDelay, AirTime, CRSDepTime LIMIT 8"]}
-{"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE DestStateFips <> 49 AND DivAirportSeqIDs BETWEEN 1496002 AND 1584102 OR DivTailNums BETWEEN 'N13903' AND 'N14188' GROUP BY TailNum LIMIT 14","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE DestStateFips <> 49 AND (DivAirportSeqIDs__MV0 BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs__MV1 BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs__MV2 BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs__MV3 BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs__MV4 BETWEEN 1496002 AND 1584102) OR (DivTailNums__MV0 BETWEEN 'N13903' AND 'N14188' OR DivTailNums__MV1 BETWEEN 'N13903' AND 'N14188' OR DivTailNums__MV2 BETWEEN 'N13903' AND 'N14188' OR DivTailNums__MV3 BETWEEN 'N13903' AND 'N14188' OR DivTailNums__MV4 BETWEEN 'N13903' AND 'N14188') GROUP BY TailNum LIMIT 10000"]}
+{"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE DestStateFips <> 49 AND DivAirportSeqIDs BETWEEN 1496002 AND 1584102 OR DivTailNums BETWEEN 'N13903' AND 'N14188' GROUP BY TailNum LIMIT 14","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE DestStateFips <> 49 AND (DivAirportSeqIDs[1] BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs[2] BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs[3] BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs[4] BETWEEN 1496002 AND 1584102 OR DivAirportSeqIDs[5] BETWEEN 1496002 AND 1584102) OR (DivTailNums[1] BETWEEN 'N13903' AND 'N14188' OR DivTailNums[2] BETWEEN 'N13903' AND 'N14188' OR DivTailNums[3] BETWEEN 'N13903' AND 'N14188' OR DivTailNums[4] BETWEEN 'N13903' AND 'N14188' OR DivTailNums[5] BETWEEN 'N13903' AND 'N14188') GROUP BY TailNum LIMIT 10000"]}
 {"sql":"SELECT DepDelay FROM mytable WHERE DayofMonth IN (7, 31, 25, 8) OR DivAirportLandings NOT IN (2) ORDER BY OriginStateName LIMIT 7"}
 {"sql":"SELECT DestState FROM mytable WHERE AirTime = 158 ORDER BY DepDelay, FlightNum, TotalAddGTime LIMIT 7"}
 {"sql":"SELECT OriginAirportSeqID, Dest FROM mytable ORDER BY AirlineID LIMIT 4"}
@@ -6087,33 +6087,33 @@
 {"sql":"SELECT DestState, ArrTime, DestAirportID, COUNT(DivActualElapsedTime) FROM mytable WHERE Quarter NOT IN (1) GROUP BY DestState, ArrTime, DestAirportID  ORDER BY DestState, ArrTime, DestAirportID LIMIT 1","hsqls":["SELECT DestState, ArrTime, DestAirportID, COUNT(DivActualElapsedTime) FROM mytable WHERE Quarter NOT IN (1) GROUP BY DestState, ArrTime, DestAirportID  ORDER BY DestState, ArrTime, DestAirportID LIMIT 1"]}
 {"sql":"SELECT MAX(DistanceGroup), MAX(SecurityDelay) FROM mytable WHERE WheelsOff BETWEEN 1733 AND 1403 OR WheelsOff IN (1306, 1731, 1316, 1711) OR OriginCityMarketID > 32951 LIMIT 28"}
 {"sql":"SELECT Cancelled, DivAirportLandings, COUNT(*) FROM mytable GROUP BY Cancelled, DivAirportLandings  ORDER BY Cancelled, DivAirportLandings LIMIT 10","hsqls":["SELECT Cancelled, DivAirportLandings, COUNT(*) FROM mytable GROUP BY Cancelled, DivAirportLandings  ORDER BY Cancelled, DivAirportLandings LIMIT 10"]}
-{"sql":"SELECT OriginCityMarketID, DivAirportSeqIDs FROM mytable WHERE DestState BETWEEN 'CO' AND 'OK' ORDER BY ArrDelayMinutes, ArrDelay LIMIT 27","hsqls":["SELECT OriginCityMarketID, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DestState BETWEEN 'CO' AND 'OK' ORDER BY ArrDelayMinutes, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivAirportSeqIDs FROM mytable WHERE DestState BETWEEN 'CO' AND 'OK' ORDER BY ArrDelayMinutes, ArrDelay LIMIT 27","hsqls":["SELECT OriginCityMarketID, DivAirportSeqIDs FROM mytable WHERE DestState BETWEEN 'CO' AND 'OK' ORDER BY ArrDelayMinutes, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, OriginWac, OriginStateName FROM mytable WHERE DestAirportID <> 15412 AND OriginCityName > 'Flint, MI' OR DepDelay BETWEEN 304.0 AND 78.0 ORDER BY LongestAddGTime, Cancelled LIMIT 9"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DayofMonth <= 6 OR DestCityMarketID IN (30559, 31995, 30868, 33360, 32335) LIMIT 10"}
-{"sql":"SELECT OriginState FROM mytable WHERE DivWheelsOffs <= 1058 AND DepTimeBlk BETWEEN '0001-0559' AND '1100-1159' OR DivReachedDest < 0 ORDER BY DestAirportSeqID, TailNum LIMIT 29","hsqls":["SELECT OriginState FROM mytable WHERE (DivWheelsOffs__MV0 <= 1058 OR DivWheelsOffs__MV1 <= 1058 OR DivWheelsOffs__MV2 <= 1058 OR DivWheelsOffs__MV3 <= 1058 OR DivWheelsOffs__MV4 <= 1058) AND DepTimeBlk BETWEEN '0001-0559' AND '1100-1159' OR DivReachedDest < 0 ORDER BY DestAirportSeqID, TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE DivWheelsOffs <= 1058 AND DepTimeBlk BETWEEN '0001-0559' AND '1100-1159' OR DivReachedDest < 0 ORDER BY DestAirportSeqID, TailNum LIMIT 29","hsqls":["SELECT OriginState FROM mytable WHERE (DivWheelsOffs[1] <= 1058 OR DivWheelsOffs[2] <= 1058 OR DivWheelsOffs[3] <= 1058 OR DivWheelsOffs[4] <= 1058 OR DivWheelsOffs[5] <= 1058) AND DepTimeBlk BETWEEN '0001-0559' AND '1100-1159' OR DivReachedDest < 0 ORDER BY DestAirportSeqID, TailNum LIMIT 10000"]}
 {"sql":"SELECT Cancelled, ArrTimeBlk, OriginWac FROM mytable ORDER BY ArrDel15 LIMIT 3"}
 {"sql":"SELECT DivDistance, ArrDelayMinutes, AVG(NASDelay), COUNT(FirstDepTime), MAX(OriginWac) FROM mytable GROUP BY DivDistance, ArrDelayMinutes  ORDER BY DivDistance, ArrDelayMinutes LIMIT 20","hsqls":["SELECT DivDistance, ArrDelayMinutes, AVG(NASDelay), COUNT(FirstDepTime), MAX(OriginWac) FROM mytable GROUP BY DivDistance, ArrDelayMinutes  ORDER BY DivDistance, ArrDelayMinutes LIMIT 20"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 18"}
 {"sql":"SELECT Carrier, ArrDelayMinutes FROM mytable LIMIT 7"}
 {"sql":"SELECT OriginCityMarketID, AVG(TaxiIn), SUM(DivDistance) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 18","hsqls":["SELECT OriginCityMarketID, AVG(TaxiIn), SUM(DivDistance) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 18"]}
-{"sql":"SELECT Diverted, OriginAirportID, OriginStateName FROM mytable WHERE FlightNum <> 5050 AND DivAirports <= 'MSO' ORDER BY DivDistance, DepTime LIMIT 16","hsqls":["SELECT Diverted, OriginAirportID, OriginStateName FROM mytable WHERE FlightNum <> 5050 AND (DivAirports__MV0 <= 'MSO' OR DivAirports__MV1 <= 'MSO' OR DivAirports__MV2 <= 'MSO' OR DivAirports__MV3 <= 'MSO' OR DivAirports__MV4 <= 'MSO') ORDER BY DivDistance, DepTime LIMIT 10000"]}
+{"sql":"SELECT Diverted, OriginAirportID, OriginStateName FROM mytable WHERE FlightNum <> 5050 AND DivAirports <= 'MSO' ORDER BY DivDistance, DepTime LIMIT 16","hsqls":["SELECT Diverted, OriginAirportID, OriginStateName FROM mytable WHERE FlightNum <> 5050 AND (DivAirports[1] <= 'MSO' OR DivAirports[2] <= 'MSO' OR DivAirports[3] <= 'MSO' OR DivAirports[4] <= 'MSO' OR DivAirports[5] <= 'MSO') ORDER BY DivDistance, DepTime LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrDelayMinutes), COUNT(FirstDepTime), COUNT(OriginState) FROM mytable LIMIT 10"}
 {"sql":"SELECT TaxiOut, DestAirportSeqID, DestStateName FROM mytable ORDER BY TaxiOut, DestWac, CRSDepTime LIMIT 24"}
-{"sql":"SELECT TotalAddGTime, SUM(ArrivalDelayGroups), MAX(\"Month\") FROM mytable GROUP BY TotalAddGTime LIMIT 24","hsqls":["SELECT TotalAddGTime, SUM(ArrivalDelayGroups), MAX(Month) FROM mytable GROUP BY TotalAddGTime LIMIT 24"]}
-{"sql":"SELECT DivAirports FROM mytable ORDER BY OriginState LIMIT 14","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY OriginState LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, SUM(ArrivalDelayGroups), MAX(\"Month\") FROM mytable GROUP BY TotalAddGTime LIMIT 24","hsqls":["SELECT TotalAddGTime, SUM(ArrivalDelayGroups), MAX(`Month`) FROM mytable GROUP BY TotalAddGTime LIMIT 24"]}
+{"sql":"SELECT DivAirports FROM mytable ORDER BY OriginState LIMIT 14","hsqls":["SELECT DivAirports FROM mytable ORDER BY OriginState LIMIT 10000"]}
 {"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE WeatherDelay IN (14) AND DestStateFips <= 5 GROUP BY Quarter  ORDER BY Quarter LIMIT 23","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE WeatherDelay IN (14) AND DestStateFips <= 5 GROUP BY Quarter  ORDER BY Quarter LIMIT 23"]}
 {"sql":"SELECT TotalAddGTime, DepDel15, Origin, COUNT(*) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 10 OR FlightNum > 4146 OR DistanceGroup BETWEEN 7 AND 2 GROUP BY TotalAddGTime, DepDel15, Origin  ORDER BY TotalAddGTime, DepDel15, Origin LIMIT 12","hsqls":["SELECT TotalAddGTime, DepDel15, Origin, COUNT(*) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 10 OR FlightNum > 4146 OR DistanceGroup BETWEEN 7 AND 2 GROUP BY TotalAddGTime, DepDel15, Origin  ORDER BY TotalAddGTime, DepDel15, Origin LIMIT 12"]}
 {"sql":"SELECT Dest FROM mytable WHERE DestStateFips BETWEEN 56 AND 24 AND AirTime BETWEEN 63 AND 61 OR DayOfWeek BETWEEN 2 AND 7 LIMIT 1"}
 {"sql":"SELECT DepartureDelayGroups, ArrTime, AVG(DestCityMarketID) FROM mytable WHERE SecurityDelay BETWEEN 1 AND 1 GROUP BY DepartureDelayGroups, ArrTime  ORDER BY DepartureDelayGroups, ArrTime LIMIT 29","hsqls":["SELECT DepartureDelayGroups, ArrTime, AVG(DestCityMarketID) FROM mytable WHERE SecurityDelay BETWEEN 1 AND 1 GROUP BY DepartureDelayGroups, ArrTime  ORDER BY DepartureDelayGroups, ArrTime LIMIT 29"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE FlightDate >= '2014-01-05' OR DaysSinceEpoch BETWEEN 16073 AND 16085 OR Origin NOT IN ('AVP', 'FAI', 'MYR') LIMIT 20"}
 {"sql":"SELECT CarrierDelay, DestStateName FROM mytable WHERE CarrierDelay > 151 AND Diverted BETWEEN 0 AND 0"}
-{"sql":"SELECT DivWheelsOns, ArrDelayMinutes, ArrDelay FROM mytable ORDER BY CarrierDelay LIMIT 4","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ArrDelayMinutes, ArrDelay FROM mytable ORDER BY CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, ArrDelayMinutes, ArrDelay FROM mytable ORDER BY CarrierDelay LIMIT 4","hsqls":["SELECT DivWheelsOns, ArrDelayMinutes, ArrDelay FROM mytable ORDER BY CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, OriginWac FROM mytable WHERE CarrierDelay <= 12 ORDER BY Diverted, OriginCityName LIMIT 27"}
 {"sql":"SELECT Diverted, DepDelay, ArrTimeBlk, SUM(DaysSinceEpoch), MIN(ArrivalDelayGroups) FROM mytable WHERE NASDelay = 61 OR ArrTime NOT IN (1228, 2005, 107, 2106) OR DestAirportSeqID IN (1245102, 1133703) GROUP BY Diverted, DepDelay, ArrTimeBlk","hsqls":["SELECT Diverted, DepDelay, ArrTimeBlk, SUM(DaysSinceEpoch), MIN(ArrivalDelayGroups) FROM mytable WHERE NASDelay = 61 OR ArrTime NOT IN (1228, 2005, 107, 2106) OR DestAirportSeqID IN (1245102, 1133703) GROUP BY Diverted, DepDelay, ArrTimeBlk"]}
-{"sql":"SELECT DivAirports, AirTime, DivArrDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND LongestAddGTime > 24 LIMIT 11","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, AirTime, DivArrDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND LongestAddGTime > 24 LIMIT 10000"]}
-{"sql":"SELECT DepDelay, \"Month\", AVG(DistanceGroup) FROM mytable GROUP BY DepDelay, \"Month\" LIMIT 6","hsqls":["SELECT DepDelay, Month, AVG(DistanceGroup) FROM mytable GROUP BY DepDelay, Month LIMIT 6"]}
-{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1100303 AND 1532302 OR DestWac NOT IN (5, 51, 35, 65, 36) OR OriginCityMarketID >= 31504 GROUP BY OriginStateName LIMIT 26","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs__MV1 BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs__MV2 BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs__MV3 BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs__MV4 BETWEEN 1100303 AND 1532302) OR DestWac NOT IN (5, 51, 35, 65, 36) OR OriginCityMarketID >= 31504 GROUP BY OriginStateName LIMIT 10000"]}
-{"sql":"SELECT CarrierDelay, DivAirportIDs, UniqueCarrier FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DivDistance IN (51) OR Quarter IN (1) ORDER BY CRSArrTime, DestStateFips, DaysSinceEpoch LIMIT 2","hsqls":["SELECT CarrierDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, UniqueCarrier FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DivDistance IN (51) OR Quarter IN (1) ORDER BY CRSArrTime, DestStateFips, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivAirports, AirTime, DivArrDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND LongestAddGTime > 24 LIMIT 11","hsqls":["SELECT DivAirports, AirTime, DivArrDelay FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND LongestAddGTime > 24 LIMIT 10000"]}
+{"sql":"SELECT DepDelay, \"Month\", AVG(DistanceGroup) FROM mytable GROUP BY DepDelay, \"Month\" LIMIT 6","hsqls":["SELECT DepDelay, Month, AVG(DistanceGroup) FROM mytable GROUP BY DepDelay, `Month` LIMIT 6"]}
+{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1100303 AND 1532302 OR DestWac NOT IN (5, 51, 35, 65, 36) OR OriginCityMarketID >= 31504 GROUP BY OriginStateName LIMIT 26","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs[2] BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs[3] BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs[4] BETWEEN 1100303 AND 1532302 OR DivAirportSeqIDs[5] BETWEEN 1100303 AND 1532302) OR DestWac NOT IN (5, 51, 35, 65, 36) OR OriginCityMarketID >= 31504 GROUP BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DivAirportIDs, UniqueCarrier FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DivDistance IN (51) OR Quarter IN (1) ORDER BY CRSArrTime, DestStateFips, DaysSinceEpoch LIMIT 2","hsqls":["SELECT CarrierDelay, DivAirportIDs, UniqueCarrier FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DivDistance IN (51) OR Quarter IN (1) ORDER BY CRSArrTime, DestStateFips, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, OriginCityMarketID, DayofMonth FROM mytable ORDER BY TotalAddGTime, TailNum, DepTimeBlk LIMIT 10"}
 {"sql":"SELECT OriginCityMarketID, COUNT(DivArrDelay) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 22","hsqls":["SELECT OriginCityMarketID, COUNT(DivArrDelay) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 22"]}
 {"sql":"SELECT FlightDate, MAX(OriginStateFips) FROM mytable WHERE DivReachedDest > 0 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 23","hsqls":["SELECT FlightDate, MAX(OriginStateFips) FROM mytable WHERE DivReachedDest > 0 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 23"]}
@@ -6123,24 +6123,24 @@
 {"sql":"SELECT DepartureDelayGroups, SUM(DepTime), SUM(DestWac) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 23","hsqls":["SELECT DepartureDelayGroups, SUM(DepTime), SUM(DestWac) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 23"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE TailNum IN ('N732US', 'N4YBAA', 'N349NW') AND DivActualElapsedTime NOT IN (368, 219, 218, 350) AND TaxiOut IN (93, 81) ORDER BY DestCityMarketID LIMIT 9"}
 {"sql":"SELECT MIN(AirlineID) FROM mytable WHERE OriginState IN ('WY') AND OriginCityMarketID NOT IN (34492, 32343, 30627, 30852) AND AirlineID > 21171 LIMIT 4"}
-{"sql":"SELECT DivActualElapsedTime, SUM(ArrDel15), MAX(ArrivalDelayGroups), AVG(ArrivalDelayGroups) FROM mytable WHERE \"Month\" IN (1) AND CRSDepTime IN (1441, 1630) OR SecurityDelay <> 18 GROUP BY DivActualElapsedTime LIMIT 13","hsqls":["SELECT DivActualElapsedTime, SUM(ArrDel15), MAX(ArrivalDelayGroups), AVG(ArrivalDelayGroups) FROM mytable WHERE Month IN (1) AND CRSDepTime IN (1441, 1630) OR SecurityDelay <> 18 GROUP BY DivActualElapsedTime LIMIT 13"]}
+{"sql":"SELECT DivActualElapsedTime, SUM(ArrDel15), MAX(ArrivalDelayGroups), AVG(ArrivalDelayGroups) FROM mytable WHERE \"Month\" IN (1) AND CRSDepTime IN (1441, 1630) OR SecurityDelay <> 18 GROUP BY DivActualElapsedTime LIMIT 13","hsqls":["SELECT DivActualElapsedTime, SUM(ArrDel15), MAX(ArrivalDelayGroups), AVG(ArrivalDelayGroups) FROM mytable WHERE `Month` IN (1) AND CRSDepTime IN (1441, 1630) OR SecurityDelay <> 18 GROUP BY DivActualElapsedTime LIMIT 13"]}
 {"sql":"SELECT SecurityDelay, DestCityName FROM mytable WHERE CRSDepTime NOT IN (1020, 1401, 1124, 1916, 1438) AND WheelsOn BETWEEN 1049 AND 917 LIMIT 13"}
-{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR DivTotalGTimes > 76 LIMIT 1","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR (DivTotalGTimes__MV0 > 76 OR DivTotalGTimes__MV1 > 76 OR DivTotalGTimes__MV2 > 76 OR DivTotalGTimes__MV3 > 76 OR DivTotalGTimes__MV4 > 76) LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, DepTimeBlk, DivAirportLandings, MAX(ArrivalDelayGroups), MIN(CRSElapsedTime) FROM mytable WHERE DivTailNums IN ('N505JB', 'N783SK', 'N12967') AND DayofMonth BETWEEN 30 AND 22 AND DivWheelsOffs > 1802 GROUP BY TotalAddGTime, DepTimeBlk, DivAirportLandings LIMIT 8","hsqls":["SELECT TotalAddGTime, DepTimeBlk, DivAirportLandings, MAX(ArrivalDelayGroups), MIN(CRSElapsedTime) FROM mytable WHERE (DivTailNums__MV0 IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums__MV1 IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums__MV2 IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums__MV3 IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums__MV4 IN ('N505JB', 'N783SK', 'N12967')) AND DayofMonth BETWEEN 30 AND 22 AND (DivWheelsOffs__MV0 > 1802 OR DivWheelsOffs__MV1 > 1802 OR DivWheelsOffs__MV2 > 1802 OR DivWheelsOffs__MV3 > 1802 OR DivWheelsOffs__MV4 > 1802) GROUP BY TotalAddGTime, DepTimeBlk, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR DivTotalGTimes > 76 LIMIT 1","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR (DivTotalGTimes[1] > 76 OR DivTotalGTimes[2] > 76 OR DivTotalGTimes[3] > 76 OR DivTotalGTimes[4] > 76 OR DivTotalGTimes[5] > 76) LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DepTimeBlk, DivAirportLandings, MAX(ArrivalDelayGroups), MIN(CRSElapsedTime) FROM mytable WHERE DivTailNums IN ('N505JB', 'N783SK', 'N12967') AND DayofMonth BETWEEN 30 AND 22 AND DivWheelsOffs > 1802 GROUP BY TotalAddGTime, DepTimeBlk, DivAirportLandings LIMIT 8","hsqls":["SELECT TotalAddGTime, DepTimeBlk, DivAirportLandings, MAX(ArrivalDelayGroups), MIN(CRSElapsedTime) FROM mytable WHERE (DivTailNums[1] IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums[2] IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums[3] IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums[4] IN ('N505JB', 'N783SK', 'N12967') OR DivTailNums[5] IN ('N505JB', 'N783SK', 'N12967')) AND DayofMonth BETWEEN 30 AND 22 AND (DivWheelsOffs[1] > 1802 OR DivWheelsOffs[2] > 1802 OR DivWheelsOffs[3] > 1802 OR DivWheelsOffs[4] > 1802 OR DivWheelsOffs[5] > 1802) GROUP BY TotalAddGTime, DepTimeBlk, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DepTimeBlk, SUM(WheelsOff), SUM(WeatherDelay), SUM(DistanceGroup) FROM mytable GROUP BY FlightNum, DepTimeBlk  ORDER BY FlightNum, DepTimeBlk LIMIT 3","hsqls":["SELECT FlightNum, DepTimeBlk, SUM(WheelsOff), SUM(WeatherDelay), SUM(DistanceGroup) FROM mytable GROUP BY FlightNum, DepTimeBlk  ORDER BY FlightNum, DepTimeBlk LIMIT 3"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE OriginCityMarketID < 32335 OR OriginAirportSeqID BETWEEN 1120302 AND 1454302 ORDER BY Dest, DivActualElapsedTime"}
 {"sql":"SELECT FlightNum, DepTime, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY FlightNum, DepTime, DestAirportSeqID  ORDER BY FlightNum, DepTime, DestAirportSeqID LIMIT 17","hsqls":["SELECT FlightNum, DepTime, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY FlightNum, DepTime, DestAirportSeqID  ORDER BY FlightNum, DepTime, DestAirportSeqID LIMIT 17"]}
 {"sql":"SELECT Distance, CancellationCode FROM mytable ORDER BY Cancelled LIMIT 23"}
-{"sql":"SELECT AirlineID, MIN(Diverted), COUNT(WeatherDelay) FROM mytable WHERE DivAirports >= 'LCH' OR DayOfWeek = 5 GROUP BY AirlineID LIMIT 14","hsqls":["SELECT AirlineID, MIN(Diverted), COUNT(WeatherDelay) FROM mytable WHERE (DivAirports__MV0 >= 'LCH' OR DivAirports__MV1 >= 'LCH' OR DivAirports__MV2 >= 'LCH' OR DivAirports__MV3 >= 'LCH' OR DivAirports__MV4 >= 'LCH') OR DayOfWeek = 5 GROUP BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT AirlineID, MIN(Diverted), COUNT(WeatherDelay) FROM mytable WHERE DivAirports >= 'LCH' OR DayOfWeek = 5 GROUP BY AirlineID LIMIT 14","hsqls":["SELECT AirlineID, MIN(Diverted), COUNT(WeatherDelay) FROM mytable WHERE (DivAirports[1] >= 'LCH' OR DivAirports[2] >= 'LCH' OR DivAirports[3] >= 'LCH' OR DivAirports[4] >= 'LCH' OR DivAirports[5] >= 'LCH') OR DayOfWeek = 5 GROUP BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT AirTime, DestAirportID, COUNT(Flights), COUNT(DestAirportID), SUM(ArrTime) FROM mytable GROUP BY AirTime, DestAirportID  ORDER BY AirTime, DestAirportID LIMIT 29","hsqls":["SELECT AirTime, DestAirportID, COUNT(Flights), COUNT(DestAirportID), SUM(ArrTime) FROM mytable GROUP BY AirTime, DestAirportID  ORDER BY AirTime, DestAirportID LIMIT 29"]}
 {"sql":"SELECT FirstDepTime, ArrTime, COUNT(DestWac) FROM mytable WHERE OriginAirportID <= 10739 GROUP BY FirstDepTime, ArrTime  ORDER BY FirstDepTime, ArrTime LIMIT 28","hsqls":["SELECT FirstDepTime, ArrTime, COUNT(DestWac) FROM mytable WHERE OriginAirportID <= 10739 GROUP BY FirstDepTime, ArrTime  ORDER BY FirstDepTime, ArrTime LIMIT 28"]}
 {"sql":"SELECT FlightDate, SecurityDelay, DepDel15, COUNT(OriginStateFips), MIN(DestStateFips), AVG(DepartureDelayGroups) FROM mytable GROUP BY FlightDate, SecurityDelay, DepDel15  ORDER BY FlightDate, SecurityDelay, DepDel15 LIMIT 12","hsqls":["SELECT FlightDate, SecurityDelay, DepDel15, COUNT(OriginStateFips), MIN(DestStateFips), AVG(DepartureDelayGroups) FROM mytable GROUP BY FlightDate, SecurityDelay, DepDel15  ORDER BY FlightDate, SecurityDelay, DepDel15 LIMIT 12"]}
-{"sql":"SELECT DestStateFips, DayOfWeek, SUM(CRSDepTime), MIN(CRSElapsedTime) FROM mytable WHERE TotalAddGTime NOT IN (103) AND OriginWac BETWEEN 16 AND 61 OR DivWheelsOffs >= 2159 GROUP BY DestStateFips, DayOfWeek LIMIT 2","hsqls":["SELECT DestStateFips, DayOfWeek, SUM(CRSDepTime), MIN(CRSElapsedTime) FROM mytable WHERE TotalAddGTime NOT IN (103) AND OriginWac BETWEEN 16 AND 61 OR (DivWheelsOffs__MV0 >= 2159 OR DivWheelsOffs__MV1 >= 2159 OR DivWheelsOffs__MV2 >= 2159 OR DivWheelsOffs__MV3 >= 2159 OR DivWheelsOffs__MV4 >= 2159) GROUP BY DestStateFips, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DepDelayMinutes, MIN(Flights), MAX(ActualElapsedTime) FROM mytable WHERE OriginWac BETWEEN 82 AND 35 AND \"Year\" BETWEEN 2014 AND 2014 AND DayofMonth BETWEEN 30 AND 16 GROUP BY DepDelay, DepDelayMinutes LIMIT 4","hsqls":["SELECT DepDelay, DepDelayMinutes, MIN(Flights), MAX(ActualElapsedTime) FROM mytable WHERE OriginWac BETWEEN 82 AND 35 AND Year BETWEEN 2014 AND 2014 AND DayofMonth BETWEEN 30 AND 16 GROUP BY DepDelay, DepDelayMinutes LIMIT 4"]}
+{"sql":"SELECT DestStateFips, DayOfWeek, SUM(CRSDepTime), MIN(CRSElapsedTime) FROM mytable WHERE TotalAddGTime NOT IN (103) AND OriginWac BETWEEN 16 AND 61 OR DivWheelsOffs >= 2159 GROUP BY DestStateFips, DayOfWeek LIMIT 2","hsqls":["SELECT DestStateFips, DayOfWeek, SUM(CRSDepTime), MIN(CRSElapsedTime) FROM mytable WHERE TotalAddGTime NOT IN (103) AND OriginWac BETWEEN 16 AND 61 OR (DivWheelsOffs[1] >= 2159 OR DivWheelsOffs[2] >= 2159 OR DivWheelsOffs[3] >= 2159 OR DivWheelsOffs[4] >= 2159 OR DivWheelsOffs[5] >= 2159) GROUP BY DestStateFips, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DepDelayMinutes, MIN(Flights), MAX(ActualElapsedTime) FROM mytable WHERE OriginWac BETWEEN 82 AND 35 AND \"Year\" BETWEEN 2014 AND 2014 AND DayofMonth BETWEEN 30 AND 16 GROUP BY DepDelay, DepDelayMinutes LIMIT 4","hsqls":["SELECT DepDelay, DepDelayMinutes, MIN(Flights), MAX(ActualElapsedTime) FROM mytable WHERE OriginWac BETWEEN 82 AND 35 AND `Year` BETWEEN 2014 AND 2014 AND DayofMonth BETWEEN 30 AND 16 GROUP BY DepDelay, DepDelayMinutes LIMIT 4"]}
 {"sql":"SELECT TaxiOut, DestAirportID, MAX(CRSElapsedTime) FROM mytable WHERE OriginCityName BETWEEN 'Toledo, OH' AND 'Charlotte Amalie, VI' OR UniqueCarrier < 'OO' GROUP BY TaxiOut, DestAirportID  ORDER BY TaxiOut, DestAirportID LIMIT 14","hsqls":["SELECT TaxiOut, DestAirportID, MAX(CRSElapsedTime) FROM mytable WHERE OriginCityName BETWEEN 'Toledo, OH' AND 'Charlotte Amalie, VI' OR UniqueCarrier < 'OO' GROUP BY TaxiOut, DestAirportID  ORDER BY TaxiOut, DestAirportID LIMIT 14"]}
 {"sql":"SELECT COUNT(DepDelay), MAX(DivActualElapsedTime) FROM mytable LIMIT 3"}
 {"sql":"SELECT TaxiOut, DestCityMarketID, OriginAirportID, COUNT(DepTimeBlk), MIN(ArrDel15), MIN(DivAirportLandings) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'North Dakota' OR DepartureDelayGroups <= 10 GROUP BY TaxiOut, DestCityMarketID, OriginAirportID  ORDER BY TaxiOut, DestCityMarketID, OriginAirportID LIMIT 8","hsqls":["SELECT TaxiOut, DestCityMarketID, OriginAirportID, COUNT(DepTimeBlk), MIN(ArrDel15), MIN(DivAirportLandings) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'North Dakota' OR DepartureDelayGroups <= 10 GROUP BY TaxiOut, DestCityMarketID, OriginAirportID  ORDER BY TaxiOut, DestCityMarketID, OriginAirportID LIMIT 8"]}
-{"sql":"SELECT COUNT(AirTime), MAX(DivArrDelay), MAX(\"Month\") FROM mytable WHERE TailNum NOT IN ('N3768', 'N13968', 'N117UW', 'N318JB') LIMIT 13","hsqls":["SELECT COUNT(AirTime), MAX(DivArrDelay), MAX(Month) FROM mytable WHERE TailNum NOT IN ('N3768', 'N13968', 'N117UW', 'N318JB') LIMIT 13"]}
+{"sql":"SELECT COUNT(AirTime), MAX(DivArrDelay), MAX(\"Month\") FROM mytable WHERE TailNum NOT IN ('N3768', 'N13968', 'N117UW', 'N318JB') LIMIT 13","hsqls":["SELECT COUNT(AirTime), MAX(DivArrDelay), MAX(`Month`) FROM mytable WHERE TailNum NOT IN ('N3768', 'N13968', 'N117UW', 'N318JB') LIMIT 13"]}
 {"sql":"SELECT TotalAddGTime, COUNT(DivReachedDest) FROM mytable WHERE DestWac BETWEEN 23 AND 67 AND WheelsOff IN (1840, 609) GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 29","hsqls":["SELECT TotalAddGTime, COUNT(DivReachedDest) FROM mytable WHERE DestWac BETWEEN 23 AND 67 AND WheelsOff IN (1840, 609) GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 29"]}
 {"sql":"SELECT DivReachedDest, SUM(WheelsOff) FROM mytable WHERE DayofMonth < 10 AND SecurityDelay BETWEEN 27 AND 1 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 24","hsqls":["SELECT DivReachedDest, SUM(WheelsOff) FROM mytable WHERE DayofMonth < 10 AND SecurityDelay BETWEEN 27 AND 1 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 24"]}
 {"sql":"SELECT TotalAddGTime, COUNT(DistanceGroup) FROM mytable GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 5","hsqls":["SELECT TotalAddGTime, COUNT(DistanceGroup) FROM mytable GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 5"]}
@@ -6148,38 +6148,38 @@
 {"sql":"SELECT DepDelay, DestStateFips, Dest, AVG(TaxiOut), MIN(DepDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DistanceGroup NOT IN (5, 4) OR DistanceGroup <> 3 AND OriginAirportID > 14679 GROUP BY DepDelay, DestStateFips, Dest  ORDER BY DepDelay, DestStateFips, Dest LIMIT 17","hsqls":["SELECT DepDelay, DestStateFips, Dest, AVG(TaxiOut), MIN(DepDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DistanceGroup NOT IN (5, 4) OR DistanceGroup <> 3 AND OriginAirportID > 14679 GROUP BY DepDelay, DestStateFips, Dest  ORDER BY DepDelay, DestStateFips, Dest LIMIT 17"]}
 {"sql":"SELECT AVG(TotalAddGTime), MIN(OriginStateFips), COUNT(TotalAddGTime) FROM mytable WHERE SecurityDelay <= 27 AND DepartureDelayGroups < 8 OR ArrDelay <= 20.0 LIMIT 10"}
 {"sql":"SELECT DistanceGroup, OriginStateFips FROM mytable ORDER BY Flights, AirlineID LIMIT 13"}
-{"sql":"SELECT SecurityDelay, TailNum, MIN(NASDelay), COUNT(DestAirportID) FROM mytable WHERE Cancelled > 1 OR DivWheelsOffs < 1836 AND Dest <> 'BLI' GROUP BY SecurityDelay, TailNum LIMIT 24","hsqls":["SELECT SecurityDelay, TailNum, MIN(NASDelay), COUNT(DestAirportID) FROM mytable WHERE Cancelled > 1 OR (DivWheelsOffs__MV0 < 1836 OR DivWheelsOffs__MV1 < 1836 OR DivWheelsOffs__MV2 < 1836 OR DivWheelsOffs__MV3 < 1836 OR DivWheelsOffs__MV4 < 1836) AND Dest <> 'BLI' GROUP BY SecurityDelay, TailNum LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, TailNum, MIN(NASDelay), COUNT(DestAirportID) FROM mytable WHERE Cancelled > 1 OR DivWheelsOffs < 1836 AND Dest <> 'BLI' GROUP BY SecurityDelay, TailNum LIMIT 24","hsqls":["SELECT SecurityDelay, TailNum, MIN(NASDelay), COUNT(DestAirportID) FROM mytable WHERE Cancelled > 1 OR (DivWheelsOffs[1] < 1836 OR DivWheelsOffs[2] < 1836 OR DivWheelsOffs[3] < 1836 OR DivWheelsOffs[4] < 1836 OR DivWheelsOffs[5] < 1836) AND Dest <> 'BLI' GROUP BY SecurityDelay, TailNum LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, Distance, MIN(DivDistance) FROM mytable GROUP BY WheelsOff, Distance  ORDER BY WheelsOff, Distance LIMIT 10","hsqls":["SELECT WheelsOff, Distance, MIN(DivDistance) FROM mytable GROUP BY WheelsOff, Distance  ORDER BY WheelsOff, Distance LIMIT 10"]}
 {"sql":"SELECT LongestAddGTime, ArrDelayMinutes, SUM(CRSArrTime), MAX(TaxiIn) FROM mytable WHERE CRSDepTime <= 1448 AND DestState NOT IN ('LA', 'RI') GROUP BY LongestAddGTime, ArrDelayMinutes  ORDER BY LongestAddGTime, ArrDelayMinutes LIMIT 7","hsqls":["SELECT LongestAddGTime, ArrDelayMinutes, SUM(CRSArrTime), MAX(TaxiIn) FROM mytable WHERE CRSDepTime <= 1448 AND DestState NOT IN ('LA', 'RI') GROUP BY LongestAddGTime, ArrDelayMinutes  ORDER BY LongestAddGTime, ArrDelayMinutes LIMIT 7"]}
 {"sql":"SELECT DistanceGroup, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY DistanceGroup, DestAirportSeqID  ORDER BY DistanceGroup, DestAirportSeqID LIMIT 1","hsqls":["SELECT DistanceGroup, DestAirportSeqID, COUNT(*) FROM mytable GROUP BY DistanceGroup, DestAirportSeqID  ORDER BY DistanceGroup, DestAirportSeqID LIMIT 1"]}
-{"sql":"SELECT Distance, OriginCityName, AVG(\"Year\"), SUM(DayOfWeek), MIN(TaxiOut) FROM mytable WHERE DepDelay IN (250.0) GROUP BY Distance, OriginCityName LIMIT 19","hsqls":["SELECT Distance, OriginCityName, AVG(Year), SUM(DayOfWeek), MIN(TaxiOut) FROM mytable WHERE DepDelay IN (250.0) GROUP BY Distance, OriginCityName LIMIT 19"]}
-{"sql":"SELECT TaxiOut, \"Year\" FROM mytable WHERE DestAirportSeqID BETWEEN 1490503 AND 1432103 AND DayofMonth IN (28) AND DivAirportIDs IN (14113, 14057, 14006) ORDER BY OriginAirportSeqID, OriginState, TailNum LIMIT 10","hsqls":["SELECT TaxiOut, Year FROM mytable WHERE DestAirportSeqID BETWEEN 1490503 AND 1432103 AND DayofMonth IN (28) AND (DivAirportIDs__MV0 IN (14113, 14057, 14006) OR DivAirportIDs__MV1 IN (14113, 14057, 14006) OR DivAirportIDs__MV2 IN (14113, 14057, 14006) OR DivAirportIDs__MV3 IN (14113, 14057, 14006) OR DivAirportIDs__MV4 IN (14113, 14057, 14006)) ORDER BY OriginAirportSeqID, OriginState, TailNum LIMIT 10000"]}
+{"sql":"SELECT Distance, OriginCityName, AVG(\"Year\"), SUM(DayOfWeek), MIN(TaxiOut) FROM mytable WHERE DepDelay IN (250.0) GROUP BY Distance, OriginCityName LIMIT 19","hsqls":["SELECT Distance, OriginCityName, AVG(`Year`), SUM(DayOfWeek), MIN(TaxiOut) FROM mytable WHERE DepDelay IN (250.0) GROUP BY Distance, OriginCityName LIMIT 19"]}
+{"sql":"SELECT TaxiOut, \"Year\" FROM mytable WHERE DestAirportSeqID BETWEEN 1490503 AND 1432103 AND DayofMonth IN (28) AND DivAirportIDs IN (14113, 14057, 14006) ORDER BY OriginAirportSeqID, OriginState, TailNum LIMIT 10","hsqls":["SELECT TaxiOut, `Year` FROM mytable WHERE DestAirportSeqID BETWEEN 1490503 AND 1432103 AND DayofMonth IN (28) AND (DivAirportIDs[1] IN (14113, 14057, 14006) OR DivAirportIDs[2] IN (14113, 14057, 14006) OR DivAirportIDs[3] IN (14113, 14057, 14006) OR DivAirportIDs[4] IN (14113, 14057, 14006) OR DivAirportIDs[5] IN (14113, 14057, 14006)) ORDER BY OriginAirportSeqID, OriginState, TailNum LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, Distance, TaxiIn FROM mytable WHERE ArrivalDelayGroups NOT IN (2, -2, 7, 5, -9999) LIMIT 4"}
 {"sql":"SELECT SecurityDelay, CancellationCode FROM mytable LIMIT 8"}
 {"sql":"SELECT DestWac, OriginStateFips, MAX(DestWac) FROM mytable WHERE LongestAddGTime BETWEEN 96 AND 23 OR FirstDepTime < 703 GROUP BY DestWac, OriginStateFips  ORDER BY DestWac, OriginStateFips LIMIT 6","hsqls":["SELECT DestWac, OriginStateFips, MAX(DestWac) FROM mytable WHERE LongestAddGTime BETWEEN 96 AND 23 OR FirstDepTime < 703 GROUP BY DestWac, OriginStateFips  ORDER BY DestWac, OriginStateFips LIMIT 6"]}
-{"sql":"SELECT Flights FROM mytable WHERE DivDistance BETWEEN 449 AND 349 ORDER BY \"Year\" LIMIT 25","hsqls":["SELECT Flights FROM mytable WHERE DivDistance BETWEEN 449 AND 349 ORDER BY Year LIMIT 25"]}
+{"sql":"SELECT Flights FROM mytable WHERE DivDistance BETWEEN 449 AND 349 ORDER BY \"Year\" LIMIT 25","hsqls":["SELECT Flights FROM mytable WHERE DivDistance BETWEEN 449 AND 349 ORDER BY `Year` LIMIT 25"]}
 {"sql":"SELECT DepDel15, MAX(DivReachedDest) FROM mytable WHERE DivReachedDest <= -9999 GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 11","hsqls":["SELECT DepDel15, MAX(DivReachedDest) FROM mytable WHERE DivReachedDest <= -9999 GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 11"]}
 {"sql":"SELECT DepTime, ArrTime, ArrDel15 FROM mytable WHERE Origin <= 'ORH' AND LongestAddGTime IN (148, 23, 15, 8, 26) ORDER BY DepTime LIMIT 20"}
 {"sql":"SELECT LateAircraftDelay, MAX(ArrDel15), COUNT(ActualElapsedTime), MIN(LongestAddGTime) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 17","hsqls":["SELECT LateAircraftDelay, MAX(ArrDel15), COUNT(ActualElapsedTime), MIN(LongestAddGTime) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 17"]}
 {"sql":"SELECT ArrDel15, TailNum, COUNT(DepDel15), COUNT(DaysSinceEpoch), SUM(DepDelay) FROM mytable GROUP BY ArrDel15, TailNum  ORDER BY ArrDel15, TailNum LIMIT 18","hsqls":["SELECT ArrDel15, TailNum, COUNT(DepDel15), COUNT(DaysSinceEpoch), SUM(DepDelay) FROM mytable GROUP BY ArrDel15, TailNum  ORDER BY ArrDel15, TailNum LIMIT 18"]}
 {"sql":"SELECT LateAircraftDelay, NASDelay, OriginWac FROM mytable WHERE FlightDate IN ('2014-01-05', '2014-01-20', '2014-01-31', '2014-01-30', '2014-01-24') ORDER BY OriginAirportSeqID, OriginState LIMIT 15"}
-{"sql":"SELECT OriginState, LateAircraftDelay, Quarter, AVG(\"Month\"), SUM(OriginStateFips) FROM mytable GROUP BY OriginState, LateAircraftDelay, Quarter LIMIT 10","hsqls":["SELECT OriginState, LateAircraftDelay, Quarter, AVG(Month), SUM(OriginStateFips) FROM mytable GROUP BY OriginState, LateAircraftDelay, Quarter LIMIT 10"]}
+{"sql":"SELECT OriginState, LateAircraftDelay, Quarter, AVG(\"Month\"), SUM(OriginStateFips) FROM mytable GROUP BY OriginState, LateAircraftDelay, Quarter LIMIT 10","hsqls":["SELECT OriginState, LateAircraftDelay, Quarter, AVG(`Month`), SUM(OriginStateFips) FROM mytable GROUP BY OriginState, LateAircraftDelay, Quarter LIMIT 10"]}
 {"sql":"SELECT MIN(CRSDepTime), MIN(DivDistance), SUM(DivReachedDest) FROM mytable WHERE FlightDate < '2014-01-28' OR CarrierDelay IN (153, 414, 157) LIMIT 8"}
 {"sql":"SELECT DestStateFips, ArrTime, AirTime FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR UniqueCarrier <= 'AA' LIMIT 16"}
-{"sql":"SELECT ArrTimeBlk, \"Month\" FROM mytable WHERE WheelsOn NOT IN (612) ORDER BY CarrierDelay, FlightDate, DivActualElapsedTime LIMIT 13","hsqls":["SELECT ArrTimeBlk, Month FROM mytable WHERE WheelsOn NOT IN (612) ORDER BY CarrierDelay, FlightDate, DivActualElapsedTime LIMIT 13"]}
+{"sql":"SELECT ArrTimeBlk, \"Month\" FROM mytable WHERE WheelsOn NOT IN (612) ORDER BY CarrierDelay, FlightDate, DivActualElapsedTime LIMIT 13","hsqls":["SELECT ArrTimeBlk, `Month` FROM mytable WHERE WheelsOn NOT IN (612) ORDER BY CarrierDelay, FlightDate, DivActualElapsedTime LIMIT 13"]}
 {"sql":"SELECT OriginAirportSeqID, Quarter FROM mytable LIMIT 25"}
-{"sql":"SELECT DivWheelsOns, LateAircraftDelay FROM mytable WHERE Dest = 'TYR' ORDER BY DistanceGroup LIMIT 25","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LateAircraftDelay FROM mytable WHERE Dest = 'TYR' ORDER BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, LateAircraftDelay FROM mytable WHERE Dest = 'TYR' ORDER BY DistanceGroup LIMIT 25","hsqls":["SELECT DivWheelsOns, LateAircraftDelay FROM mytable WHERE Dest = 'TYR' ORDER BY DistanceGroup LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, UniqueCarrier, OriginAirportID FROM mytable ORDER BY DestStateName, CRSElapsedTime LIMIT 22"}
 {"sql":"SELECT DepartureDelayGroups, SecurityDelay, MAX(DivDistance), COUNT(OriginStateFips), SUM(DestCityMarketID) FROM mytable WHERE DayofMonth IN (3, 17, 27) AND DepartureDelayGroups BETWEEN -2 AND 4 GROUP BY DepartureDelayGroups, SecurityDelay  ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 8","hsqls":["SELECT DepartureDelayGroups, SecurityDelay, MAX(DivDistance), COUNT(OriginStateFips), SUM(DestCityMarketID) FROM mytable WHERE DayofMonth IN (3, 17, 27) AND DepartureDelayGroups BETWEEN -2 AND 4 GROUP BY DepartureDelayGroups, SecurityDelay  ORDER BY DepartureDelayGroups, SecurityDelay LIMIT 8"]}
 {"sql":"SELECT MAX(AirlineID), MIN(DepartureDelayGroups), COUNT(CarrierDelay) FROM mytable LIMIT 19"}
-{"sql":"SELECT TaxiOut, DivAirportIDs FROM mytable WHERE DepartureDelayGroups NOT IN (6, -9999) OR Cancelled BETWEEN 1 AND 0 OR DivTailNums > 'N73445' ORDER BY LateAircraftDelay, Cancelled LIMIT 25","hsqls":["SELECT TaxiOut, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DepartureDelayGroups NOT IN (6, -9999) OR Cancelled BETWEEN 1 AND 0 OR (DivTailNums__MV0 > 'N73445' OR DivTailNums__MV1 > 'N73445' OR DivTailNums__MV2 > 'N73445' OR DivTailNums__MV3 > 'N73445' OR DivTailNums__MV4 > 'N73445') ORDER BY LateAircraftDelay, Cancelled LIMIT 10000"]}
-{"sql":"SELECT DestState, ArrDelay, COUNT(ArrDelay) FROM mytable WHERE DivTotalGTimes IN (182, 57, 4, 159, 196) OR TaxiOut NOT IN (59, 112, 64, 72) OR DivAirportIDs > 11298 GROUP BY DestState, ArrDelay LIMIT 25","hsqls":["SELECT DestState, ArrDelay, COUNT(ArrDelay) FROM mytable WHERE (DivTotalGTimes__MV0 IN (182, 57, 4, 159, 196) OR DivTotalGTimes__MV1 IN (182, 57, 4, 159, 196) OR DivTotalGTimes__MV2 IN (182, 57, 4, 159, 196) OR DivTotalGTimes__MV3 IN (182, 57, 4, 159, 196) OR DivTotalGTimes__MV4 IN (182, 57, 4, 159, 196)) OR TaxiOut NOT IN (59, 112, 64, 72) OR (DivAirportIDs__MV0 > 11298 OR DivAirportIDs__MV1 > 11298 OR DivAirportIDs__MV2 > 11298 OR DivAirportIDs__MV3 > 11298 OR DivAirportIDs__MV4 > 11298) GROUP BY DestState, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT Diverted, MIN(AirlineID) FROM mytable WHERE \"Month\" = 1 OR DivLongestGTimes <= 101.0 AND DestWac BETWEEN 61 AND 44 GROUP BY Diverted LIMIT 19","hsqls":["SELECT Diverted, MIN(AirlineID) FROM mytable WHERE Month = 1 OR (DivLongestGTimes__MV0 <= 101.0 OR DivLongestGTimes__MV1 <= 101.0 OR DivLongestGTimes__MV2 <= 101.0 OR DivLongestGTimes__MV3 <= 101.0 OR DivLongestGTimes__MV4 <= 101.0) AND DestWac BETWEEN 61 AND 44 GROUP BY Diverted LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivAirportIDs FROM mytable WHERE DepartureDelayGroups NOT IN (6, -9999) OR Cancelled BETWEEN 1 AND 0 OR DivTailNums > 'N73445' ORDER BY LateAircraftDelay, Cancelled LIMIT 25","hsqls":["SELECT TaxiOut, DivAirportIDs FROM mytable WHERE DepartureDelayGroups NOT IN (6, -9999) OR Cancelled BETWEEN 1 AND 0 OR (DivTailNums[1] > 'N73445' OR DivTailNums[2] > 'N73445' OR DivTailNums[3] > 'N73445' OR DivTailNums[4] > 'N73445' OR DivTailNums[5] > 'N73445') ORDER BY LateAircraftDelay, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DestState, ArrDelay, COUNT(ArrDelay) FROM mytable WHERE DivTotalGTimes IN (182, 57, 4, 159, 196) OR TaxiOut NOT IN (59, 112, 64, 72) OR DivAirportIDs > 11298 GROUP BY DestState, ArrDelay LIMIT 25","hsqls":["SELECT DestState, ArrDelay, COUNT(ArrDelay) FROM mytable WHERE (DivTotalGTimes[1] IN (182, 57, 4, 159, 196) OR DivTotalGTimes[2] IN (182, 57, 4, 159, 196) OR DivTotalGTimes[3] IN (182, 57, 4, 159, 196) OR DivTotalGTimes[4] IN (182, 57, 4, 159, 196) OR DivTotalGTimes[5] IN (182, 57, 4, 159, 196)) OR TaxiOut NOT IN (59, 112, 64, 72) OR (DivAirportIDs[1] > 11298 OR DivAirportIDs[2] > 11298 OR DivAirportIDs[3] > 11298 OR DivAirportIDs[4] > 11298 OR DivAirportIDs[5] > 11298) GROUP BY DestState, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT Diverted, MIN(AirlineID) FROM mytable WHERE \"Month\" = 1 OR DivLongestGTimes <= 101.0 AND DestWac BETWEEN 61 AND 44 GROUP BY Diverted LIMIT 19","hsqls":["SELECT Diverted, MIN(AirlineID) FROM mytable WHERE `Month` = 1 OR (DivLongestGTimes[1] <= 101.0 OR DivLongestGTimes[2] <= 101.0 OR DivLongestGTimes[3] <= 101.0 OR DivLongestGTimes[4] <= 101.0 OR DivLongestGTimes[5] <= 101.0) AND DestWac BETWEEN 61 AND 44 GROUP BY Diverted LIMIT 10000"]}
 {"sql":"SELECT Flights, TaxiIn, DestCityMarketID, MAX(DaysSinceEpoch), AVG(ArrDelayMinutes), SUM(DepTime) FROM mytable GROUP BY Flights, TaxiIn, DestCityMarketID  ORDER BY Flights, TaxiIn, DestCityMarketID LIMIT 6","hsqls":["SELECT Flights, TaxiIn, DestCityMarketID, MAX(DaysSinceEpoch), AVG(ArrDelayMinutes), SUM(DepTime) FROM mytable GROUP BY Flights, TaxiIn, DestCityMarketID  ORDER BY Flights, TaxiIn, DestCityMarketID LIMIT 6"]}
 {"sql":"SELECT AirlineID, COUNT(Carrier), MAX(DestAirportID), MAX(OriginAirportID) FROM mytable WHERE DaysSinceEpoch BETWEEN 16073 AND 16101 OR OriginCityName BETWEEN 'Tulsa, OK' AND 'Columbus, OH' GROUP BY AirlineID  ORDER BY AirlineID LIMIT 11","hsqls":["SELECT AirlineID, COUNT(Carrier), MAX(DestAirportID), MAX(OriginAirportID) FROM mytable WHERE DaysSinceEpoch BETWEEN 16073 AND 16101 OR OriginCityName BETWEEN 'Tulsa, OK' AND 'Columbus, OH' GROUP BY AirlineID  ORDER BY AirlineID LIMIT 11"]}
 {"sql":"SELECT Quarter, DestStateName, CRSElapsedTime, COUNT(NASDelay), MIN(DepTime), MIN(DivArrDelay) FROM mytable GROUP BY Quarter, DestStateName, CRSElapsedTime  ORDER BY Quarter, DestStateName, CRSElapsedTime LIMIT 16","hsqls":["SELECT Quarter, DestStateName, CRSElapsedTime, COUNT(NASDelay), MIN(DepTime), MIN(DivArrDelay) FROM mytable GROUP BY Quarter, DestStateName, CRSElapsedTime  ORDER BY Quarter, DestStateName, CRSElapsedTime LIMIT 16"]}
 {"sql":"SELECT ArrDelayMinutes, TailNum, AirTime, AVG(TaxiIn), MIN(DestAirportSeqID), SUM(DivActualElapsedTime) FROM mytable WHERE OriginCityMarketID NOT IN (30994, 30599) GROUP BY ArrDelayMinutes, TailNum, AirTime  ORDER BY ArrDelayMinutes, TailNum, AirTime LIMIT 8","hsqls":["SELECT ArrDelayMinutes, TailNum, AirTime, AVG(TaxiIn), MIN(DestAirportSeqID), SUM(DivActualElapsedTime) FROM mytable WHERE OriginCityMarketID NOT IN (30994, 30599) GROUP BY ArrDelayMinutes, TailNum, AirTime  ORDER BY ArrDelayMinutes, TailNum, AirTime LIMIT 8"]}
-{"sql":"SELECT DivReachedDest, DivDistance, DivTailNums FROM mytable WHERE WheelsOff BETWEEN 1833 AND 2124 OR OriginAirportID = 15096 ORDER BY TaxiIn, WheelsOn LIMIT 11","hsqls":["SELECT DivReachedDest, DivDistance, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE WheelsOff BETWEEN 1833 AND 2124 OR OriginAirportID = 15096 ORDER BY TaxiIn, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivDistance, DivTailNums FROM mytable WHERE WheelsOff BETWEEN 1833 AND 2124 OR OriginAirportID = 15096 ORDER BY TaxiIn, WheelsOn LIMIT 11","hsqls":["SELECT DivReachedDest, DivDistance, DivTailNums FROM mytable WHERE WheelsOff BETWEEN 1833 AND 2124 OR OriginAirportID = 15096 ORDER BY TaxiIn, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE OriginAirportID BETWEEN 10299 AND 13204 OR Carrier BETWEEN 'HA' AND 'FL' OR ArrivalDelayGroups BETWEEN 7 AND 6 ORDER BY OriginAirportSeqID, OriginCityName, DepDel15 LIMIT 1"}
 {"sql":"SELECT DestState, ArrDelayMinutes, SUM(DestAirportID) FROM mytable GROUP BY DestState, ArrDelayMinutes  ORDER BY DestState, ArrDelayMinutes LIMIT 3","hsqls":["SELECT DestState, ArrDelayMinutes, SUM(DestAirportID) FROM mytable GROUP BY DestState, ArrDelayMinutes  ORDER BY DestState, ArrDelayMinutes LIMIT 3"]}
 {"sql":"SELECT SUM(DepDelayMinutes), AVG(WheelsOff) FROM mytable WHERE FirstDepTime < 1039 AND ArrDelay BETWEEN 123.0 AND -26.0 OR AirTime <= 329 LIMIT 22"}
@@ -6188,41 +6188,41 @@
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepartureDelayGroups = 4 LIMIT 15"}
 {"sql":"SELECT \"Year\", DepDelayMinutes, ArrDel15, SUM(OriginAirportID), AVG(Diverted) FROM mytable WHERE FlightDate BETWEEN '2014-01-06' AND '2014-01-09' GROUP BY \"Year\", DepDelayMinutes, ArrDel15 LIMIT 10","hsqls":["SELECT Year, DepDelayMinutes, ArrDel15, SUM(OriginAirportID), AVG(Diverted) FROM mytable WHERE FlightDate BETWEEN '2014-01-06' AND '2014-01-09' GROUP BY Year, DepDelayMinutes, ArrDel15 LIMIT 10"]}
 {"sql":"SELECT WheelsOff, ArrTimeBlk, AVG(CRSDepTime), SUM(DepTime), MIN(DayofMonth) FROM mytable WHERE Origin < 'HNL' OR DepDel15 BETWEEN -9999 AND -9999 GROUP BY WheelsOff, ArrTimeBlk  ORDER BY WheelsOff, ArrTimeBlk LIMIT 22","hsqls":["SELECT WheelsOff, ArrTimeBlk, AVG(CRSDepTime), SUM(DepTime), MIN(DayofMonth) FROM mytable WHERE Origin < 'HNL' OR DepDel15 BETWEEN -9999 AND -9999 GROUP BY WheelsOff, ArrTimeBlk  ORDER BY WheelsOff, ArrTimeBlk LIMIT 22"]}
-{"sql":"SELECT Carrier, OriginCityMarketID FROM mytable WHERE ArrDelay IN (-34.0) OR \"Year\" > 2014 OR DepTimeBlk > '0900-0959' LIMIT 17","hsqls":["SELECT Carrier, OriginCityMarketID FROM mytable WHERE ArrDelay IN (-34.0) OR Year > 2014 OR DepTimeBlk > '0900-0959' LIMIT 17"]}
+{"sql":"SELECT Carrier, OriginCityMarketID FROM mytable WHERE ArrDelay IN (-34.0) OR \"Year\" > 2014 OR DepTimeBlk > '0900-0959' LIMIT 17","hsqls":["SELECT Carrier, OriginCityMarketID FROM mytable WHERE ArrDelay IN (-34.0) OR `Year` > 2014 OR DepTimeBlk > '0900-0959' LIMIT 17"]}
 {"sql":"SELECT DestWac, NASDelay, UniqueCarrier, MIN(LateAircraftDelay), MAX(Quarter), AVG(WheelsOn) FROM mytable GROUP BY DestWac, NASDelay, UniqueCarrier","hsqls":["SELECT DestWac, NASDelay, UniqueCarrier, MIN(LateAircraftDelay), MAX(Quarter), AVG(WheelsOn) FROM mytable GROUP BY DestWac, NASDelay, UniqueCarrier"]}
 {"sql":"SELECT OriginCityMarketID, Origin, UniqueCarrier, SUM(DayOfWeek), MAX(ActualElapsedTime) FROM mytable WHERE DestState >= 'NC' GROUP BY OriginCityMarketID, Origin, UniqueCarrier  ORDER BY OriginCityMarketID, Origin, UniqueCarrier LIMIT 15","hsqls":["SELECT OriginCityMarketID, Origin, UniqueCarrier, SUM(DayOfWeek), MAX(ActualElapsedTime) FROM mytable WHERE DestState >= 'NC' GROUP BY OriginCityMarketID, Origin, UniqueCarrier  ORDER BY OriginCityMarketID, Origin, UniqueCarrier LIMIT 15"]}
-{"sql":"SELECT DivAirports, OriginCityMarketID, AirTime FROM mytable WHERE Carrier IN ('HA', 'AS') ORDER BY DestCityName LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityMarketID, AirTime FROM mytable WHERE Carrier IN ('HA', 'AS') ORDER BY DestCityName LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityMarketID, AirTime FROM mytable WHERE Carrier IN ('HA', 'AS') ORDER BY DestCityName LIMIT 10","hsqls":["SELECT DivAirports, OriginCityMarketID, AirTime FROM mytable WHERE Carrier IN ('HA', 'AS') ORDER BY DestCityName LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, DestStateName, AVG(DivAirportLandings) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY ArrTimeBlk, DestStateName  ORDER BY ArrTimeBlk, DestStateName LIMIT 16","hsqls":["SELECT ArrTimeBlk, DestStateName, AVG(DivAirportLandings) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) GROUP BY ArrTimeBlk, DestStateName  ORDER BY ArrTimeBlk, DestStateName LIMIT 16"]}
 {"sql":"SELECT AirTime, MIN(AirTime), MIN(CRSDepTime), AVG(ArrDelay) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 18","hsqls":["SELECT AirTime, MIN(AirTime), MIN(CRSDepTime), AVG(ArrDelay) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 18"]}
-{"sql":"SELECT DepartureDelayGroups, DivReachedDest, MIN(FlightNum), AVG(AirTime) FROM mytable WHERE DayOfWeek <= 5 OR DivWheelsOns IN (1520, 644, 25) GROUP BY DepartureDelayGroups, DivReachedDest LIMIT 10","hsqls":["SELECT DepartureDelayGroups, DivReachedDest, MIN(FlightNum), AVG(AirTime) FROM mytable WHERE DayOfWeek <= 5 OR (DivWheelsOns__MV0 IN (1520, 644, 25) OR DivWheelsOns__MV1 IN (1520, 644, 25) OR DivWheelsOns__MV2 IN (1520, 644, 25) OR DivWheelsOns__MV3 IN (1520, 644, 25) OR DivWheelsOns__MV4 IN (1520, 644, 25)) GROUP BY DepartureDelayGroups, DivReachedDest LIMIT 10000"]}
-{"sql":"SELECT Carrier FROM mytable WHERE DivWheelsOffs BETWEEN 1317 AND 2322 AND DepTime BETWEEN 738 AND 1324 ORDER BY ArrTimeBlk LIMIT 20","hsqls":["SELECT Carrier FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1317 AND 2322 OR DivWheelsOffs__MV1 BETWEEN 1317 AND 2322 OR DivWheelsOffs__MV2 BETWEEN 1317 AND 2322 OR DivWheelsOffs__MV3 BETWEEN 1317 AND 2322 OR DivWheelsOffs__MV4 BETWEEN 1317 AND 2322) AND DepTime BETWEEN 738 AND 1324 ORDER BY ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT FlightNum, AirlineID FROM mytable WHERE DivTotalGTimes IN (3, 1, 45, 35) ORDER BY DepDelayMinutes, ActualElapsedTime LIMIT 1","hsqls":["SELECT FlightNum, AirlineID FROM mytable WHERE (DivTotalGTimes__MV0 IN (3, 1, 45, 35) OR DivTotalGTimes__MV1 IN (3, 1, 45, 35) OR DivTotalGTimes__MV2 IN (3, 1, 45, 35) OR DivTotalGTimes__MV3 IN (3, 1, 45, 35) OR DivTotalGTimes__MV4 IN (3, 1, 45, 35)) ORDER BY DepDelayMinutes, ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, Origin, CRSDepTime, AVG(Distance) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND -9999 AND DivWheelsOns IN (729) GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 19","hsqls":["SELECT LongestAddGTime, Origin, CRSDepTime, AVG(CAST(Distance AS DOUBLE)) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND -9999 AND (DivWheelsOns__MV0 IN (729) OR DivWheelsOns__MV1 IN (729) OR DivWheelsOns__MV2 IN (729) OR DivWheelsOns__MV3 IN (729) OR DivWheelsOns__MV4 IN (729)) GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivReachedDest, MIN(FlightNum), AVG(AirTime) FROM mytable WHERE DayOfWeek <= 5 OR DivWheelsOns IN (1520, 644, 25) GROUP BY DepartureDelayGroups, DivReachedDest LIMIT 10","hsqls":["SELECT DepartureDelayGroups, DivReachedDest, MIN(FlightNum), AVG(AirTime) FROM mytable WHERE DayOfWeek <= 5 OR (DivWheelsOns[1] IN (1520, 644, 25) OR DivWheelsOns[2] IN (1520, 644, 25) OR DivWheelsOns[3] IN (1520, 644, 25) OR DivWheelsOns[4] IN (1520, 644, 25) OR DivWheelsOns[5] IN (1520, 644, 25)) GROUP BY DepartureDelayGroups, DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT Carrier FROM mytable WHERE DivWheelsOffs BETWEEN 1317 AND 2322 AND DepTime BETWEEN 738 AND 1324 ORDER BY ArrTimeBlk LIMIT 20","hsqls":["SELECT Carrier FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1317 AND 2322 OR DivWheelsOffs[2] BETWEEN 1317 AND 2322 OR DivWheelsOffs[3] BETWEEN 1317 AND 2322 OR DivWheelsOffs[4] BETWEEN 1317 AND 2322 OR DivWheelsOffs[5] BETWEEN 1317 AND 2322) AND DepTime BETWEEN 738 AND 1324 ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT FlightNum, AirlineID FROM mytable WHERE DivTotalGTimes IN (3, 1, 45, 35) ORDER BY DepDelayMinutes, ActualElapsedTime LIMIT 1","hsqls":["SELECT FlightNum, AirlineID FROM mytable WHERE (DivTotalGTimes[1] IN (3, 1, 45, 35) OR DivTotalGTimes[2] IN (3, 1, 45, 35) OR DivTotalGTimes[3] IN (3, 1, 45, 35) OR DivTotalGTimes[4] IN (3, 1, 45, 35) OR DivTotalGTimes[5] IN (3, 1, 45, 35)) ORDER BY DepDelayMinutes, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Origin, CRSDepTime, AVG(Distance) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND -9999 AND DivWheelsOns IN (729) GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 19","hsqls":["SELECT LongestAddGTime, Origin, CRSDepTime, AVG(CAST(Distance AS DOUBLE)) FROM mytable WHERE ArrivalDelayGroups BETWEEN 4 AND -9999 AND (DivWheelsOns[1] IN (729) OR DivWheelsOns[2] IN (729) OR DivWheelsOns[3] IN (729) OR DivWheelsOns[4] IN (729) OR DivWheelsOns[5] IN (729)) GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DepTime, ArrDelayMinutes FROM mytable WHERE DestCityMarketID NOT IN (30620) OR ArrDelay IN (-21.0, 58.0, 16.0, -43.0) LIMIT 8"}
 {"sql":"SELECT NASDelay, OriginWac, AVG(DepDel15) FROM mytable WHERE ActualElapsedTime BETWEEN 127 AND 197 GROUP BY NASDelay, OriginWac  ORDER BY NASDelay, OriginWac LIMIT 24","hsqls":["SELECT NASDelay, OriginWac, AVG(DepDel15) FROM mytable WHERE ActualElapsedTime BETWEEN 127 AND 197 GROUP BY NASDelay, OriginWac  ORDER BY NASDelay, OriginWac LIMIT 24"]}
 {"sql":"SELECT ArrTimeBlk, NASDelay, MAX(ArrivalDelayGroups), MAX(DivArrDelay) FROM mytable GROUP BY ArrTimeBlk, NASDelay  ORDER BY ArrTimeBlk, NASDelay LIMIT 20","hsqls":["SELECT ArrTimeBlk, NASDelay, MAX(ArrivalDelayGroups), MAX(DivArrDelay) FROM mytable GROUP BY ArrTimeBlk, NASDelay  ORDER BY ArrTimeBlk, NASDelay LIMIT 20"]}
 {"sql":"SELECT AVG(OriginAirportID) FROM mytable WHERE LateAircraftDelay NOT IN (70, 76) AND CRSDepTime BETWEEN 2050 AND 1332 OR DepDelay IN (207.0, 7.0) LIMIT 21"}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DepTime <= 1726 AND OriginState BETWEEN 'ID' AND 'NE' ORDER BY CarrierDelay, DestStateName LIMIT 9"}
-{"sql":"SELECT CRSArrTime, DivAirportIDs FROM mytable WHERE DivDistance < 409 AND DivReachedDest NOT IN (1, -9999) ORDER BY TaxiIn, ArrDel15","hsqls":["SELECT CRSArrTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DivDistance < 409 AND DivReachedDest NOT IN (1, -9999) ORDER BY TaxiIn, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT ActualElapsedTime, WheelsOn, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1115 AND 1127 AND DestState IN ('TN', 'NC', 'OK', 'ID', 'SC') GROUP BY ActualElapsedTime, WheelsOn LIMIT 10","hsqls":["SELECT ActualElapsedTime, WheelsOn, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1115 AND 1127 OR DivWheelsOffs__MV1 BETWEEN 1115 AND 1127 OR DivWheelsOffs__MV2 BETWEEN 1115 AND 1127 OR DivWheelsOffs__MV3 BETWEEN 1115 AND 1127 OR DivWheelsOffs__MV4 BETWEEN 1115 AND 1127) AND DestState IN ('TN', 'NC', 'OK', 'ID', 'SC') GROUP BY ActualElapsedTime, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivAirportIDs FROM mytable WHERE DivDistance < 409 AND DivReachedDest NOT IN (1, -9999) ORDER BY TaxiIn, ArrDel15","hsqls":["SELECT CRSArrTime, DivAirportIDs FROM mytable WHERE DivDistance < 409 AND DivReachedDest NOT IN (1, -9999) ORDER BY TaxiIn, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, WheelsOn, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1115 AND 1127 AND DestState IN ('TN', 'NC', 'OK', 'ID', 'SC') GROUP BY ActualElapsedTime, WheelsOn LIMIT 10","hsqls":["SELECT ActualElapsedTime, WheelsOn, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1115 AND 1127 OR DivWheelsOffs[2] BETWEEN 1115 AND 1127 OR DivWheelsOffs[3] BETWEEN 1115 AND 1127 OR DivWheelsOffs[4] BETWEEN 1115 AND 1127 OR DivWheelsOffs[5] BETWEEN 1115 AND 1127) AND DestState IN ('TN', 'NC', 'OK', 'ID', 'SC') GROUP BY ActualElapsedTime, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DepTime FROM mytable WHERE DivDistance IN (159, 268, 207) ORDER BY CRSDepTime LIMIT 16"}
-{"sql":"SELECT SUM(ArrDelay), SUM(DestAirportID), SUM(Distance) FROM mytable WHERE DestCityMarketID BETWEEN 30325 AND 32467 OR \"Year\" BETWEEN 2014 AND 2014","hsqls":["SELECT SUM(ArrDelay), SUM(DestAirportID), SUM(Distance) FROM mytable WHERE DestCityMarketID BETWEEN 30325 AND 32467 OR Year BETWEEN 2014 AND 2014"]}
-{"sql":"SELECT TaxiOut, OriginAirportID, MIN(\"Year\") FROM mytable WHERE DivAirports <= 'LIT' OR DestCityMarketID > 34794 GROUP BY TaxiOut, OriginAirportID LIMIT 24","hsqls":["SELECT TaxiOut, OriginAirportID, MIN(Year) FROM mytable WHERE (DivAirports__MV0 <= 'LIT' OR DivAirports__MV1 <= 'LIT' OR DivAirports__MV2 <= 'LIT' OR DivAirports__MV3 <= 'LIT' OR DivAirports__MV4 <= 'LIT') OR DestCityMarketID > 34794 GROUP BY TaxiOut, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT SUM(ArrDelay), SUM(DestAirportID), SUM(Distance) FROM mytable WHERE DestCityMarketID BETWEEN 30325 AND 32467 OR \"Year\" BETWEEN 2014 AND 2014","hsqls":["SELECT SUM(ArrDelay), SUM(DestAirportID), SUM(Distance) FROM mytable WHERE DestCityMarketID BETWEEN 30325 AND 32467 OR `Year` BETWEEN 2014 AND 2014"]}
+{"sql":"SELECT TaxiOut, OriginAirportID, MIN(\"Year\") FROM mytable WHERE DivAirports <= 'LIT' OR DestCityMarketID > 34794 GROUP BY TaxiOut, OriginAirportID LIMIT 24","hsqls":["SELECT TaxiOut, OriginAirportID, MIN(`Year`) FROM mytable WHERE (DivAirports[1] <= 'LIT' OR DivAirports[2] <= 'LIT' OR DivAirports[3] <= 'LIT' OR DivAirports[4] <= 'LIT' OR DivAirports[5] <= 'LIT') OR DestCityMarketID > 34794 GROUP BY TaxiOut, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, UniqueCarrier, MIN(ArrTime), COUNT(FlightDate) FROM mytable WHERE ArrTimeBlk > '0900-0959' AND OriginAirportID BETWEEN 12191 AND 10333 GROUP BY ArrDelayMinutes, UniqueCarrier  ORDER BY ArrDelayMinutes, UniqueCarrier LIMIT 1","hsqls":["SELECT ArrDelayMinutes, UniqueCarrier, MIN(ArrTime), COUNT(FlightDate) FROM mytable WHERE ArrTimeBlk > '0900-0959' AND OriginAirportID BETWEEN 12191 AND 10333 GROUP BY ArrDelayMinutes, UniqueCarrier  ORDER BY ArrDelayMinutes, UniqueCarrier LIMIT 1"]}
 {"sql":"SELECT \"Year\", TaxiIn, COUNT(DestAirportID) FROM mytable WHERE DestWac IN (45, 44, 42, 88) OR CRSArrTime NOT IN (1756, 2148, 1739, 50, 2302) AND SecurityDelay < 18 GROUP BY \"Year\", TaxiIn","hsqls":["SELECT Year, TaxiIn, COUNT(DestAirportID) FROM mytable WHERE DestWac IN (45, 44, 42, 88) OR CRSArrTime NOT IN (1756, 2148, 1739, 50, 2302) AND SecurityDelay < 18 GROUP BY Year, TaxiIn"]}
-{"sql":"SELECT FirstDepTime, OriginAirportID, SUM(ActualElapsedTime), SUM(Quarter) FROM mytable WHERE DivTailNums BETWEEN 'N318JB' AND 'N3745B' AND Flights NOT IN (1) GROUP BY FirstDepTime, OriginAirportID LIMIT 10","hsqls":["SELECT FirstDepTime, OriginAirportID, SUM(ActualElapsedTime), SUM(Quarter) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums__MV1 BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums__MV2 BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums__MV3 BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums__MV4 BETWEEN 'N318JB' AND 'N3745B') AND Flights NOT IN (1) GROUP BY FirstDepTime, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, OriginAirportID, SUM(ActualElapsedTime), SUM(Quarter) FROM mytable WHERE DivTailNums BETWEEN 'N318JB' AND 'N3745B' AND Flights NOT IN (1) GROUP BY FirstDepTime, OriginAirportID LIMIT 10","hsqls":["SELECT FirstDepTime, OriginAirportID, SUM(ActualElapsedTime), SUM(Quarter) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums[2] BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums[3] BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums[4] BETWEEN 'N318JB' AND 'N3745B' OR DivTailNums[5] BETWEEN 'N318JB' AND 'N3745B') AND Flights NOT IN (1) GROUP BY FirstDepTime, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT Cancelled FROM mytable WHERE ActualElapsedTime BETWEEN 362 AND 67 LIMIT 18"}
-{"sql":"SELECT DayofMonth, \"Month\", SUM(CarrierDelay), MIN(DestWac), AVG(TaxiIn) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 GROUP BY DayofMonth, \"Month\" LIMIT 17","hsqls":["SELECT DayofMonth, Month, SUM(CarrierDelay), MIN(DestWac), AVG(TaxiIn) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 GROUP BY DayofMonth, Month LIMIT 17"]}
+{"sql":"SELECT DayofMonth, \"Month\", SUM(CarrierDelay), MIN(DestWac), AVG(TaxiIn) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 GROUP BY DayofMonth, \"Month\" LIMIT 17","hsqls":["SELECT DayofMonth, Month, SUM(CarrierDelay), MIN(DestWac), AVG(TaxiIn) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 GROUP BY DayofMonth, `Month` LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, FirstDepTime, FlightNum FROM mytable ORDER BY Flights, ArrDelayMinutes, ArrDel15 LIMIT 23"}
-{"sql":"SELECT DivWheelsOns, DestAirportSeqID FROM mytable ORDER BY LateAircraftDelay, DepTime, CancellationCode LIMIT 9","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestAirportSeqID FROM mytable ORDER BY LateAircraftDelay, DepTime, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DestAirportSeqID FROM mytable ORDER BY LateAircraftDelay, DepTime, CancellationCode LIMIT 9","hsqls":["SELECT DivWheelsOns, DestAirportSeqID FROM mytable ORDER BY LateAircraftDelay, DepTime, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT Origin FROM mytable WHERE OriginWac BETWEEN 66 AND 23 LIMIT 19"}
 {"sql":"SELECT WheelsOff, ArrTime, DepDel15, COUNT(*) FROM mytable WHERE DestWac BETWEEN 82 AND 16 OR TotalAddGTime >= 26 OR DestAirportSeqID NOT IN (1426202, 1197302, 1532302, 1484202, 1291503) GROUP BY WheelsOff, ArrTime, DepDel15  ORDER BY WheelsOff, ArrTime, DepDel15 LIMIT 14","hsqls":["SELECT WheelsOff, ArrTime, DepDel15, COUNT(*) FROM mytable WHERE DestWac BETWEEN 82 AND 16 OR TotalAddGTime >= 26 OR DestAirportSeqID NOT IN (1426202, 1197302, 1532302, 1484202, 1291503) GROUP BY WheelsOff, ArrTime, DepDel15  ORDER BY WheelsOff, ArrTime, DepDel15 LIMIT 14"]}
-{"sql":"SELECT WheelsOff, Diverted, AirlineID FROM mytable WHERE TaxiIn NOT IN (67, 1) AND CancellationCode >= 'B' OR DivAirportSeqIDs IN (1468303, 1524903, 1343302, 1086803, 1190502) LIMIT 5","hsqls":["SELECT WheelsOff, Diverted, AirlineID FROM mytable WHERE TaxiIn NOT IN (67, 1) AND CancellationCode >= 'B' OR (DivAirportSeqIDs__MV0 IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs__MV1 IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs__MV2 IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs__MV3 IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs__MV4 IN (1468303, 1524903, 1343302, 1086803, 1190502)) LIMIT 10000"]}
-{"sql":"SELECT DivAirportLandings, AirlineID, \"Month\" FROM mytable WHERE DivDistance BETWEEN 302 AND 967 OR TotalAddGTime <> 60 ORDER BY DivArrDelay LIMIT 6","hsqls":["SELECT DivAirportLandings, AirlineID, Month FROM mytable WHERE DivDistance BETWEEN 302 AND 967 OR TotalAddGTime <> 60 ORDER BY DivArrDelay LIMIT 6"]}
+{"sql":"SELECT WheelsOff, Diverted, AirlineID FROM mytable WHERE TaxiIn NOT IN (67, 1) AND CancellationCode >= 'B' OR DivAirportSeqIDs IN (1468303, 1524903, 1343302, 1086803, 1190502) LIMIT 5","hsqls":["SELECT WheelsOff, Diverted, AirlineID FROM mytable WHERE TaxiIn NOT IN (67, 1) AND CancellationCode >= 'B' OR (DivAirportSeqIDs[1] IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs[2] IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs[3] IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs[4] IN (1468303, 1524903, 1343302, 1086803, 1190502) OR DivAirportSeqIDs[5] IN (1468303, 1524903, 1343302, 1086803, 1190502)) LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, AirlineID, \"Month\" FROM mytable WHERE DivDistance BETWEEN 302 AND 967 OR TotalAddGTime <> 60 ORDER BY DivArrDelay LIMIT 6","hsqls":["SELECT DivAirportLandings, AirlineID, `Month` FROM mytable WHERE DivDistance BETWEEN 302 AND 967 OR TotalAddGTime <> 60 ORDER BY DivArrDelay LIMIT 6"]}
 {"sql":"SELECT WheelsOn, DayOfWeek, SUM(FirstDepTime), COUNT(DayOfWeek), MAX(DayOfWeek) FROM mytable GROUP BY WheelsOn, DayOfWeek  ORDER BY WheelsOn, DayOfWeek LIMIT 1","hsqls":["SELECT WheelsOn, DayOfWeek, SUM(FirstDepTime), COUNT(DayOfWeek), MAX(DayOfWeek) FROM mytable GROUP BY WheelsOn, DayOfWeek  ORDER BY WheelsOn, DayOfWeek LIMIT 1"]}
 {"sql":"SELECT DivAirportLandings, DaysSinceEpoch FROM mytable WHERE ActualElapsedTime NOT IN (544, 335) ORDER BY CarrierDelay, ArrTime, OriginAirportID LIMIT 21"}
 {"sql":"SELECT ArrTime, COUNT(*) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 17","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 17"]}
-{"sql":"SELECT OriginState, Dest, SUM(AirTime), SUM(DestAirportSeqID) FROM mytable WHERE DivLongestGTimes < 6.0 AND FlightDate NOT IN ('2014-01-14', '2014-01-13', '2014-01-09', '2014-01-23') GROUP BY OriginState, Dest LIMIT 29","hsqls":["SELECT OriginState, Dest, SUM(AirTime), SUM(DestAirportSeqID) FROM mytable WHERE (DivLongestGTimes__MV0 < 6.0 OR DivLongestGTimes__MV1 < 6.0 OR DivLongestGTimes__MV2 < 6.0 OR DivLongestGTimes__MV3 < 6.0 OR DivLongestGTimes__MV4 < 6.0) AND FlightDate NOT IN ('2014-01-14', '2014-01-13', '2014-01-09', '2014-01-23') GROUP BY OriginState, Dest LIMIT 10000"]}
+{"sql":"SELECT OriginState, Dest, SUM(AirTime), SUM(DestAirportSeqID) FROM mytable WHERE DivLongestGTimes < 6.0 AND FlightDate NOT IN ('2014-01-14', '2014-01-13', '2014-01-09', '2014-01-23') GROUP BY OriginState, Dest LIMIT 29","hsqls":["SELECT OriginState, Dest, SUM(AirTime), SUM(DestAirportSeqID) FROM mytable WHERE (DivLongestGTimes[1] < 6.0 OR DivLongestGTimes[2] < 6.0 OR DivLongestGTimes[3] < 6.0 OR DivLongestGTimes[4] < 6.0 OR DivLongestGTimes[5] < 6.0) AND FlightDate NOT IN ('2014-01-14', '2014-01-13', '2014-01-09', '2014-01-23') GROUP BY OriginState, Dest LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, MIN(Diverted), COUNT(TaxiIn) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 9","hsqls":["SELECT LateAircraftDelay, MIN(Diverted), COUNT(TaxiIn) FROM mytable GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 9"]}
 {"sql":"SELECT Carrier, TaxiIn, DestCityMarketID FROM mytable WHERE FlightNum NOT IN (818, 2603, 6411, 4552) ORDER BY WheelsOff LIMIT 10"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 29"}
@@ -6234,43 +6234,43 @@
 {"sql":"SELECT COUNT(ArrTime) FROM mytable WHERE OriginAirportID < 14709 OR OriginStateName < 'Idaho' AND ActualElapsedTime BETWEEN 93 AND 252 LIMIT 20"}
 {"sql":"SELECT CancellationCode FROM mytable WHERE SecurityDelay > -9999 ORDER BY DivDistance, DayofMonth LIMIT 17"}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE TotalAddGTime BETWEEN 11 AND 23 AND DestStateName IN ('Kansas', 'South Dakota') ORDER BY OriginStateFips, Cancelled, OriginAirportID LIMIT 6"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivArrDelay BETWEEN 175 AND 552 AND DepartureDelayGroups BETWEEN 6 AND 0 OR OriginCityMarketID NOT IN (34321, 31041) ORDER BY DayofMonth LIMIT 3","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DivArrDelay BETWEEN 175 AND 552 AND DepartureDelayGroups BETWEEN 6 AND 0 OR OriginCityMarketID NOT IN (34321, 31041) ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivArrDelay BETWEEN 175 AND 552 AND DepartureDelayGroups BETWEEN 6 AND 0 OR OriginCityMarketID NOT IN (34321, 31041) ORDER BY DayofMonth LIMIT 3","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DivArrDelay BETWEEN 175 AND 552 AND DepartureDelayGroups BETWEEN 6 AND 0 OR OriginCityMarketID NOT IN (34321, 31041) ORDER BY DayofMonth LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, DaysSinceEpoch FROM mytable ORDER BY NASDelay, DestCityName LIMIT 10"}
-{"sql":"SELECT DepDel15, MAX(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N612JB' AND 'N648MQ' AND DivWheelsOns <= 1619 OR DayOfWeek NOT IN (3, 1, 7, 5, 4) GROUP BY DepDel15 LIMIT 8","hsqls":["SELECT DepDel15, MAX(OriginStateFips) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums__MV1 BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums__MV2 BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums__MV3 BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums__MV4 BETWEEN 'N612JB' AND 'N648MQ') AND (DivWheelsOns__MV0 <= 1619 OR DivWheelsOns__MV1 <= 1619 OR DivWheelsOns__MV2 <= 1619 OR DivWheelsOns__MV3 <= 1619 OR DivWheelsOns__MV4 <= 1619) OR DayOfWeek NOT IN (3, 1, 7, 5, 4) GROUP BY DepDel15 LIMIT 10000"]}
-{"sql":"SELECT DivAirportLandings, DayOfWeek, COUNT(*) FROM mytable WHERE DivWheelsOffs = 1049 GROUP BY DivAirportLandings, DayOfWeek LIMIT 21","hsqls":["SELECT DivAirportLandings, DayOfWeek, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 = 1049 OR DivWheelsOffs__MV1 = 1049 OR DivWheelsOffs__MV2 = 1049 OR DivWheelsOffs__MV3 = 1049 OR DivWheelsOffs__MV4 = 1049) GROUP BY DivAirportLandings, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DepDel15, MAX(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N612JB' AND 'N648MQ' AND DivWheelsOns <= 1619 OR DayOfWeek NOT IN (3, 1, 7, 5, 4) GROUP BY DepDel15 LIMIT 8","hsqls":["SELECT DepDel15, MAX(OriginStateFips) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums[2] BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums[3] BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums[4] BETWEEN 'N612JB' AND 'N648MQ' OR DivTailNums[5] BETWEEN 'N612JB' AND 'N648MQ') AND (DivWheelsOns[1] <= 1619 OR DivWheelsOns[2] <= 1619 OR DivWheelsOns[3] <= 1619 OR DivWheelsOns[4] <= 1619 OR DivWheelsOns[5] <= 1619) OR DayOfWeek NOT IN (3, 1, 7, 5, 4) GROUP BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, DayOfWeek, COUNT(*) FROM mytable WHERE DivWheelsOffs = 1049 GROUP BY DivAirportLandings, DayOfWeek LIMIT 21","hsqls":["SELECT DivAirportLandings, DayOfWeek, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] = 1049 OR DivWheelsOffs[2] = 1049 OR DivWheelsOffs[3] = 1049 OR DivWheelsOffs[4] = 1049 OR DivWheelsOffs[5] = 1049) GROUP BY DivAirportLandings, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, DestState, DestStateName FROM mytable WHERE Carrier <> 'HA' AND OriginStateName BETWEEN 'Missouri' AND 'Kentucky' LIMIT 29"}
 {"sql":"SELECT WheelsOn, SUM(ArrDelayMinutes), SUM(DaysSinceEpoch), AVG(Flights) FROM mytable WHERE TailNum IN ('N3EEAA', 'N646JB', 'N453SW', 'N929DL', 'N913SW') OR Origin <> 'CMI' GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 5","hsqls":["SELECT WheelsOn, SUM(ArrDelayMinutes), SUM(DaysSinceEpoch), AVG(Flights) FROM mytable WHERE TailNum IN ('N3EEAA', 'N646JB', 'N453SW', 'N929DL', 'N913SW') OR Origin <> 'CMI' GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 5"]}
-{"sql":"SELECT UniqueCarrier, \"Month\", COUNT(DestAirportSeqID), MIN(ArrivalDelayGroups) FROM mytable WHERE \"Month\" > 1 OR CRSDepTime <> 804 GROUP BY UniqueCarrier, \"Month\" LIMIT 9","hsqls":["SELECT UniqueCarrier, Month, COUNT(DestAirportSeqID), MIN(ArrivalDelayGroups) FROM mytable WHERE Month > 1 OR CRSDepTime <> 804 GROUP BY UniqueCarrier, Month LIMIT 9"]}
+{"sql":"SELECT UniqueCarrier, \"Month\", COUNT(DestAirportSeqID), MIN(ArrivalDelayGroups) FROM mytable WHERE \"Month\" > 1 OR CRSDepTime <> 804 GROUP BY UniqueCarrier, \"Month\" LIMIT 9","hsqls":["SELECT UniqueCarrier, Month, COUNT(DestAirportSeqID), MIN(ArrivalDelayGroups) FROM mytable WHERE `Month` > 1 OR CRSDepTime <> 804 GROUP BY UniqueCarrier, `Month` LIMIT 9"]}
 {"sql":"SELECT COUNT(AirTime) FROM mytable WHERE DestAirportID BETWEEN 11049 AND 14908 LIMIT 4"}
-{"sql":"SELECT FirstDepTime FROM mytable WHERE DivReachedDest <= 1 OR \"Year\" <> 2014 OR DestStateName BETWEEN 'Mississippi' AND 'New Hampshire' ORDER BY DestWac, ArrDel15, CancellationCode LIMIT 22","hsqls":["SELECT FirstDepTime FROM mytable WHERE DivReachedDest <= 1 OR Year <> 2014 OR DestStateName BETWEEN 'Mississippi' AND 'New Hampshire' ORDER BY DestWac, ArrDel15, CancellationCode LIMIT 22"]}
+{"sql":"SELECT FirstDepTime FROM mytable WHERE DivReachedDest <= 1 OR \"Year\" <> 2014 OR DestStateName BETWEEN 'Mississippi' AND 'New Hampshire' ORDER BY DestWac, ArrDel15, CancellationCode LIMIT 22","hsqls":["SELECT FirstDepTime FROM mytable WHERE DivReachedDest <= 1 OR `Year` <> 2014 OR DestStateName BETWEEN 'Mississippi' AND 'New Hampshire' ORDER BY DestWac, ArrDel15, CancellationCode LIMIT 22"]}
 {"sql":"SELECT Flights, TotalAddGTime FROM mytable ORDER BY DepTimeBlk LIMIT 21"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 15"}
-{"sql":"SELECT DepartureDelayGroups, OriginState, DivAirports FROM mytable WHERE FlightDate BETWEEN '2014-01-04' AND '2014-01-12' OR LongestAddGTime = 28 ORDER BY Distance, DestAirportSeqID, Origin LIMIT 21","hsqls":["SELECT DepartureDelayGroups, OriginState, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE FlightDate BETWEEN '2014-01-04' AND '2014-01-12' OR LongestAddGTime = 28 ORDER BY Distance, DestAirportSeqID, Origin LIMIT 10000"]}
-{"sql":"SELECT SecurityDelay, DivAirportIDs, AirTime FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) LIMIT 2","hsqls":["SELECT SecurityDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirTime FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, OriginState, DivAirports FROM mytable WHERE FlightDate BETWEEN '2014-01-04' AND '2014-01-12' OR LongestAddGTime = 28 ORDER BY Distance, DestAirportSeqID, Origin LIMIT 21","hsqls":["SELECT DepartureDelayGroups, OriginState, DivAirports FROM mytable WHERE FlightDate BETWEEN '2014-01-04' AND '2014-01-12' OR LongestAddGTime = 28 ORDER BY Distance, DestAirportSeqID, Origin LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, DivAirportIDs, AirTime FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) LIMIT 2","hsqls":["SELECT SecurityDelay, DivAirportIDs, AirTime FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) LIMIT 10000"]}
 {"sql":"SELECT SUM(ArrDelayMinutes), MIN(OriginAirportID), MIN(ArrDelay) FROM mytable LIMIT 15"}
 {"sql":"SELECT ArrDelayMinutes, DestCityMarketID FROM mytable WHERE OriginCityMarketID NOT IN (33105) ORDER BY DestState, SecurityDelay, NASDelay LIMIT 16"}
 {"sql":"SELECT DestAirportSeqID, Cancelled, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, Cancelled  ORDER BY DestAirportSeqID, Cancelled LIMIT 29","hsqls":["SELECT DestAirportSeqID, Cancelled, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, Cancelled  ORDER BY DestAirportSeqID, Cancelled LIMIT 29"]}
 {"sql":"SELECT DivReachedDest, FirstDepTime, ArrDelayMinutes FROM mytable WHERE CRSElapsedTime NOT IN (252) AND FirstDepTime = 624 AND Carrier BETWEEN 'EV' AND 'FL' ORDER BY ArrTimeBlk, UniqueCarrier LIMIT 27"}
 {"sql":"SELECT ArrTime FROM mytable WHERE Distance >= 1999 OR OriginState NOT IN ('IA', 'VA', 'WI') ORDER BY Carrier, OriginStateFips LIMIT 23"}
-{"sql":"SELECT Origin FROM mytable WHERE LongestAddGTime IN (78, 31, 4, 15, 28) AND DivTailNums > 'N526AA' OR DayOfWeek IN (2, 6, 5, 4) ORDER BY TotalAddGTime LIMIT 16","hsqls":["SELECT Origin FROM mytable WHERE LongestAddGTime IN (78, 31, 4, 15, 28) AND (DivTailNums__MV0 > 'N526AA' OR DivTailNums__MV1 > 'N526AA' OR DivTailNums__MV2 > 'N526AA' OR DivTailNums__MV3 > 'N526AA' OR DivTailNums__MV4 > 'N526AA') OR DayOfWeek IN (2, 6, 5, 4) ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT Origin FROM mytable WHERE LongestAddGTime IN (78, 31, 4, 15, 28) AND DivTailNums > 'N526AA' OR DayOfWeek IN (2, 6, 5, 4) ORDER BY TotalAddGTime LIMIT 16","hsqls":["SELECT Origin FROM mytable WHERE LongestAddGTime IN (78, 31, 4, 15, 28) AND (DivTailNums[1] > 'N526AA' OR DivTailNums[2] > 'N526AA' OR DivTailNums[3] > 'N526AA' OR DivTailNums[4] > 'N526AA' OR DivTailNums[5] > 'N526AA') OR DayOfWeek IN (2, 6, 5, 4) ORDER BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT NASDelay, DestCityName FROM mytable WHERE DivActualElapsedTime NOT IN (482, 315, 274) ORDER BY DestAirportID LIMIT 7"}
 {"sql":"SELECT Dest, AirlineID, MAX(ArrDelay), COUNT(ArrivalDelayGroups), MAX(FlightNum) FROM mytable WHERE ArrTime BETWEEN 924 AND 721 OR ArrTimeBlk BETWEEN '0700-0759' AND '1800-1859' GROUP BY Dest, AirlineID  ORDER BY Dest, AirlineID LIMIT 25","hsqls":["SELECT Dest, AirlineID, MAX(ArrDelay), COUNT(ArrivalDelayGroups), MAX(FlightNum) FROM mytable WHERE ArrTime BETWEEN 924 AND 721 OR ArrTimeBlk BETWEEN '0700-0759' AND '1800-1859' GROUP BY Dest, AirlineID  ORDER BY Dest, AirlineID LIMIT 25"]}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivTailNums BETWEEN 'N337JB' AND 'N603SK' AND AirlineID <= 20409 ORDER BY DistanceGroup, DestState, TailNum LIMIT 15","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums__MV1 BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums__MV2 BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums__MV3 BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums__MV4 BETWEEN 'N337JB' AND 'N603SK') AND AirlineID <= 20409 ORDER BY DistanceGroup, DestState, TailNum LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivTailNums BETWEEN 'N337JB' AND 'N603SK' AND AirlineID <= 20409 ORDER BY DistanceGroup, DestState, TailNum LIMIT 15","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivTailNums[1] BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums[2] BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums[3] BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums[4] BETWEEN 'N337JB' AND 'N603SK' OR DivTailNums[5] BETWEEN 'N337JB' AND 'N603SK') AND AirlineID <= 20409 ORDER BY DistanceGroup, DestState, TailNum LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, MAX(CRSDepTime) FROM mytable WHERE DestWac NOT IN (41, 62) AND Diverted IN (1, 0) GROUP BY DestAirportID","hsqls":["SELECT DestAirportID, MAX(CRSDepTime) FROM mytable WHERE DestWac NOT IN (41, 62) AND Diverted IN (1, 0) GROUP BY DestAirportID"]}
 {"sql":"SELECT MIN(OriginAirportID), MIN(Quarter), SUM(DivReachedDest) FROM mytable"}
-{"sql":"SELECT OriginCityName FROM mytable WHERE DivWheelsOffs IN (1832, 1350, 1810, 2205) OR ArrivalDelayGroups BETWEEN 1 AND 8 LIMIT 8","hsqls":["SELECT OriginCityName FROM mytable WHERE (DivWheelsOffs__MV0 IN (1832, 1350, 1810, 2205) OR DivWheelsOffs__MV1 IN (1832, 1350, 1810, 2205) OR DivWheelsOffs__MV2 IN (1832, 1350, 1810, 2205) OR DivWheelsOffs__MV3 IN (1832, 1350, 1810, 2205) OR DivWheelsOffs__MV4 IN (1832, 1350, 1810, 2205)) OR ArrivalDelayGroups BETWEEN 1 AND 8 LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, DivReachedDest, DivArrDelay FROM mytable WHERE LateAircraftDelay BETWEEN -9999 AND 32 OR DivTotalGTimes IN (21, 68, 112, 54, 87) AND DepTime > 723 ORDER BY TailNum LIMIT 18","hsqls":["SELECT DepartureDelayGroups, DivReachedDest, DivArrDelay FROM mytable WHERE LateAircraftDelay BETWEEN -9999 AND 32 OR (DivTotalGTimes__MV0 IN (21, 68, 112, 54, 87) OR DivTotalGTimes__MV1 IN (21, 68, 112, 54, 87) OR DivTotalGTimes__MV2 IN (21, 68, 112, 54, 87) OR DivTotalGTimes__MV3 IN (21, 68, 112, 54, 87) OR DivTotalGTimes__MV4 IN (21, 68, 112, 54, 87)) AND DepTime > 723 ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE DivWheelsOffs IN (1832, 1350, 1810, 2205) OR ArrivalDelayGroups BETWEEN 1 AND 8 LIMIT 8","hsqls":["SELECT OriginCityName FROM mytable WHERE (DivWheelsOffs[1] IN (1832, 1350, 1810, 2205) OR DivWheelsOffs[2] IN (1832, 1350, 1810, 2205) OR DivWheelsOffs[3] IN (1832, 1350, 1810, 2205) OR DivWheelsOffs[4] IN (1832, 1350, 1810, 2205) OR DivWheelsOffs[5] IN (1832, 1350, 1810, 2205)) OR ArrivalDelayGroups BETWEEN 1 AND 8 LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivReachedDest, DivArrDelay FROM mytable WHERE LateAircraftDelay BETWEEN -9999 AND 32 OR DivTotalGTimes IN (21, 68, 112, 54, 87) AND DepTime > 723 ORDER BY TailNum LIMIT 18","hsqls":["SELECT DepartureDelayGroups, DivReachedDest, DivArrDelay FROM mytable WHERE LateAircraftDelay BETWEEN -9999 AND 32 OR (DivTotalGTimes[1] IN (21, 68, 112, 54, 87) OR DivTotalGTimes[2] IN (21, 68, 112, 54, 87) OR DivTotalGTimes[3] IN (21, 68, 112, 54, 87) OR DivTotalGTimes[4] IN (21, 68, 112, 54, 87) OR DivTotalGTimes[5] IN (21, 68, 112, 54, 87)) AND DepTime > 723 ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT OriginWac, OriginStateName FROM mytable WHERE TailNum BETWEEN 'N627JB' AND 'N609MQ' ORDER BY TaxiOut, Origin, DivActualElapsedTime LIMIT 15"}
 {"sql":"SELECT DepTime FROM mytable LIMIT 7"}
 {"sql":"SELECT WheelsOff, DivActualElapsedTime FROM mytable WHERE ArrTimeBlk NOT IN ('1100-1159', '0800-0859', '0900-0959', '1900-1959', '0001-0559') OR Cancelled BETWEEN 1 AND 0"}
-{"sql":"SELECT OriginState FROM mytable WHERE DivWheelsOns >= 1906 OR Dest BETWEEN 'LEX' AND 'FLL' AND DestCityName NOT IN ('Little Rock, AR', 'Petersburg, AK', 'Iron Mountain/Kingsfd, MI') ORDER BY ActualElapsedTime, ArrDel15, OriginAirportID LIMIT 10","hsqls":["SELECT OriginState FROM mytable WHERE (DivWheelsOns__MV0 >= 1906 OR DivWheelsOns__MV1 >= 1906 OR DivWheelsOns__MV2 >= 1906 OR DivWheelsOns__MV3 >= 1906 OR DivWheelsOns__MV4 >= 1906) OR Dest BETWEEN 'LEX' AND 'FLL' AND DestCityName NOT IN ('Little Rock, AR', 'Petersburg, AK', 'Iron Mountain/Kingsfd, MI') ORDER BY ActualElapsedTime, ArrDel15, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE DivWheelsOns >= 1906 OR Dest BETWEEN 'LEX' AND 'FLL' AND DestCityName NOT IN ('Little Rock, AR', 'Petersburg, AK', 'Iron Mountain/Kingsfd, MI') ORDER BY ActualElapsedTime, ArrDel15, OriginAirportID LIMIT 10","hsqls":["SELECT OriginState FROM mytable WHERE (DivWheelsOns[1] >= 1906 OR DivWheelsOns[2] >= 1906 OR DivWheelsOns[3] >= 1906 OR DivWheelsOns[4] >= 1906 OR DivWheelsOns[5] >= 1906) OR Dest BETWEEN 'LEX' AND 'FLL' AND DestCityName NOT IN ('Little Rock, AR', 'Petersburg, AK', 'Iron Mountain/Kingsfd, MI') ORDER BY ActualElapsedTime, ArrDel15, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE OriginCityMarketID BETWEEN 33360 AND 31624 OR ActualElapsedTime BETWEEN 185 AND 199 GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 3","hsqls":["SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE OriginCityMarketID BETWEEN 33360 AND 31624 OR ActualElapsedTime BETWEEN 185 AND 199 GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 3"]}
-{"sql":"SELECT DivReachedDest, TailNum FROM mytable WHERE DivTotalGTimes BETWEEN 32 AND 90 AND WheelsOn NOT IN (2017, 812, 1521, 1541, 928) AND DivAirports BETWEEN 'LAS' AND 'SYR' ORDER BY DepTime LIMIT 29","hsqls":["SELECT DivReachedDest, TailNum FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 32 AND 90 OR DivTotalGTimes__MV1 BETWEEN 32 AND 90 OR DivTotalGTimes__MV2 BETWEEN 32 AND 90 OR DivTotalGTimes__MV3 BETWEEN 32 AND 90 OR DivTotalGTimes__MV4 BETWEEN 32 AND 90) AND WheelsOn NOT IN (2017, 812, 1521, 1541, 928) AND (DivAirports__MV0 BETWEEN 'LAS' AND 'SYR' OR DivAirports__MV1 BETWEEN 'LAS' AND 'SYR' OR DivAirports__MV2 BETWEEN 'LAS' AND 'SYR' OR DivAirports__MV3 BETWEEN 'LAS' AND 'SYR' OR DivAirports__MV4 BETWEEN 'LAS' AND 'SYR') ORDER BY DepTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportLandings, MAX(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE DivTailNums <= 'N237WN' GROUP BY DivAirportLandings LIMIT 1","hsqls":["SELECT DivAirportLandings, MAX(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE (DivTailNums__MV0 <= 'N237WN' OR DivTailNums__MV1 <= 'N237WN' OR DivTailNums__MV2 <= 'N237WN' OR DivTailNums__MV3 <= 'N237WN' OR DivTailNums__MV4 <= 'N237WN') GROUP BY DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 OR DivAirportLandings > 1 ORDER BY DepartureDelayGroups","hsqls":["SELECT Year FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 OR DivAirportLandings > 1 ORDER BY DepartureDelayGroups"]}
+{"sql":"SELECT DivReachedDest, TailNum FROM mytable WHERE DivTotalGTimes BETWEEN 32 AND 90 AND WheelsOn NOT IN (2017, 812, 1521, 1541, 928) AND DivAirports BETWEEN 'LAS' AND 'SYR' ORDER BY DepTime LIMIT 29","hsqls":["SELECT DivReachedDest, TailNum FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 32 AND 90 OR DivTotalGTimes[2] BETWEEN 32 AND 90 OR DivTotalGTimes[3] BETWEEN 32 AND 90 OR DivTotalGTimes[4] BETWEEN 32 AND 90 OR DivTotalGTimes[5] BETWEEN 32 AND 90) AND WheelsOn NOT IN (2017, 812, 1521, 1541, 928) AND (DivAirports[1] BETWEEN 'LAS' AND 'SYR' OR DivAirports[2] BETWEEN 'LAS' AND 'SYR' OR DivAirports[3] BETWEEN 'LAS' AND 'SYR' OR DivAirports[4] BETWEEN 'LAS' AND 'SYR' OR DivAirports[5] BETWEEN 'LAS' AND 'SYR') ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, MAX(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE DivTailNums <= 'N237WN' GROUP BY DivAirportLandings LIMIT 1","hsqls":["SELECT DivAirportLandings, MAX(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE (DivTailNums[1] <= 'N237WN' OR DivTailNums[2] <= 'N237WN' OR DivTailNums[3] <= 'N237WN' OR DivTailNums[4] <= 'N237WN' OR DivTailNums[5] <= 'N237WN') GROUP BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 OR DivAirportLandings > 1 ORDER BY DepartureDelayGroups","hsqls":["SELECT `Year` FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 OR DivAirportLandings > 1 ORDER BY DepartureDelayGroups"]}
 {"sql":"SELECT SUM(DayOfWeek) FROM mytable WHERE DivArrDelay >= 42 OR DestCityName BETWEEN 'Sacramento, CA' AND 'Daytona Beach, FL' AND DayofMonth <> 21 LIMIT 6"}
 {"sql":"SELECT FlightDate FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1700-1759', '1200-1259', '0900-0959') ORDER BY OriginCityMarketID LIMIT 10"}
-{"sql":"SELECT DivWheelsOns, DestStateName, ArrivalDelayGroups FROM mytable WHERE DepTime IN (648, 2245, 642, 102, 1252) OR DayofMonth BETWEEN 27 AND 3 OR CancellationCode > 'A' ORDER BY TaxiOut, TotalAddGTime LIMIT 6","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestStateName, ArrivalDelayGroups FROM mytable WHERE DepTime IN (648, 2245, 642, 102, 1252) OR DayofMonth BETWEEN 27 AND 3 OR CancellationCode > 'A' ORDER BY TaxiOut, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DestStateName, ArrivalDelayGroups FROM mytable WHERE DepTime IN (648, 2245, 642, 102, 1252) OR DayofMonth BETWEEN 27 AND 3 OR CancellationCode > 'A' ORDER BY TaxiOut, TotalAddGTime LIMIT 6","hsqls":["SELECT DivWheelsOns, DestStateName, ArrivalDelayGroups FROM mytable WHERE DepTime IN (648, 2245, 642, 102, 1252) OR DayofMonth BETWEEN 27 AND 3 OR CancellationCode > 'A' ORDER BY TaxiOut, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT DayOfWeek FROM mytable ORDER BY TaxiOut, FirstDepTime, DayofMonth LIMIT 4"}
 {"sql":"SELECT DepTime, Origin FROM mytable ORDER BY CarrierDelay LIMIT 22"}
 {"sql":"SELECT COUNT(OriginCityMarketID), SUM(LateAircraftDelay), MIN(WheelsOff) FROM mytable LIMIT 10"}
@@ -6287,27 +6287,27 @@
 {"sql":"SELECT \"Year\", OriginStateName FROM mytable WHERE Cancelled BETWEEN 0 AND 1 ORDER BY Quarter, DepTimeBlk, AirTime LIMIT 28","hsqls":["SELECT Year, OriginStateName FROM mytable WHERE Cancelled BETWEEN 0 AND 1 ORDER BY Quarter, DepTimeBlk, AirTime LIMIT 28"]}
 {"sql":"SELECT FirstDepTime, ArrTime, ArrDel15 FROM mytable WHERE AirlineID = 19690 AND ArrivalDelayGroups BETWEEN 11 AND 5 ORDER BY ArrDelayMinutes, AirTime"}
 {"sql":"SELECT DepTimeBlk, COUNT(*) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 27","hsqls":["SELECT DepTimeBlk, COUNT(*) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 27"]}
-{"sql":"SELECT LongestAddGTime, DivTailNums FROM mytable WHERE DivTailNums IN ('N601WN', 'N948SW') AND DayOfWeek < 6 LIMIT 29","hsqls":["SELECT LongestAddGTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivTailNums__MV0 IN ('N601WN', 'N948SW') OR DivTailNums__MV1 IN ('N601WN', 'N948SW') OR DivTailNums__MV2 IN ('N601WN', 'N948SW') OR DivTailNums__MV3 IN ('N601WN', 'N948SW') OR DivTailNums__MV4 IN ('N601WN', 'N948SW')) AND DayOfWeek < 6 LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivTailNums FROM mytable WHERE DivTailNums IN ('N601WN', 'N948SW') AND DayOfWeek < 6 LIMIT 29","hsqls":["SELECT LongestAddGTime, DivTailNums FROM mytable WHERE (DivTailNums[1] IN ('N601WN', 'N948SW') OR DivTailNums[2] IN ('N601WN', 'N948SW') OR DivTailNums[3] IN ('N601WN', 'N948SW') OR DivTailNums[4] IN ('N601WN', 'N948SW') OR DivTailNums[5] IN ('N601WN', 'N948SW')) AND DayOfWeek < 6 LIMIT 10000"]}
 {"sql":"SELECT SUM(DestCityMarketID) FROM mytable WHERE DepDelayMinutes NOT IN (13.0, 58.0) OR CRSElapsedTime BETWEEN 182 AND 335 OR DepDel15 IN (1, 0, -9999) LIMIT 8"}
-{"sql":"SELECT LateAircraftDelay, DestCityMarketID, \"Month\" FROM mytable WHERE WheelsOff NOT IN (1456, 1153, 1122, 604, 653) OR OriginStateName BETWEEN 'Maryland' AND 'New Hampshire' ORDER BY Diverted, FirstDepTime, TotalAddGTime LIMIT 25","hsqls":["SELECT LateAircraftDelay, DestCityMarketID, Month FROM mytable WHERE WheelsOff NOT IN (1456, 1153, 1122, 604, 653) OR OriginStateName BETWEEN 'Maryland' AND 'New Hampshire' ORDER BY Diverted, FirstDepTime, TotalAddGTime LIMIT 25"]}
-{"sql":"SELECT LongestAddGTime, DivArrDelay, COUNT(DistanceGroup), AVG(Quarter) FROM mytable WHERE DivAirports BETWEEN 'ABE' AND 'FAI' AND DestStateName < 'New Jersey' OR DestStateFips > 36 GROUP BY LongestAddGTime, DivArrDelay LIMIT 14","hsqls":["SELECT LongestAddGTime, DivArrDelay, COUNT(DistanceGroup), AVG(Quarter) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'ABE' AND 'FAI' OR DivAirports__MV1 BETWEEN 'ABE' AND 'FAI' OR DivAirports__MV2 BETWEEN 'ABE' AND 'FAI' OR DivAirports__MV3 BETWEEN 'ABE' AND 'FAI' OR DivAirports__MV4 BETWEEN 'ABE' AND 'FAI') AND DestStateName < 'New Jersey' OR DestStateFips > 36 GROUP BY LongestAddGTime, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE OriginStateFips BETWEEN 5 AND 32 ORDER BY DepTime LIMIT 12","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE OriginStateFips BETWEEN 5 AND 32 ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, DestCityMarketID, \"Month\" FROM mytable WHERE WheelsOff NOT IN (1456, 1153, 1122, 604, 653) OR OriginStateName BETWEEN 'Maryland' AND 'New Hampshire' ORDER BY Diverted, FirstDepTime, TotalAddGTime LIMIT 25","hsqls":["SELECT LateAircraftDelay, DestCityMarketID, `Month` FROM mytable WHERE WheelsOff NOT IN (1456, 1153, 1122, 604, 653) OR OriginStateName BETWEEN 'Maryland' AND 'New Hampshire' ORDER BY Diverted, FirstDepTime, TotalAddGTime LIMIT 25"]}
+{"sql":"SELECT LongestAddGTime, DivArrDelay, COUNT(DistanceGroup), AVG(Quarter) FROM mytable WHERE DivAirports BETWEEN 'ABE' AND 'FAI' AND DestStateName < 'New Jersey' OR DestStateFips > 36 GROUP BY LongestAddGTime, DivArrDelay LIMIT 14","hsqls":["SELECT LongestAddGTime, DivArrDelay, COUNT(DistanceGroup), AVG(Quarter) FROM mytable WHERE (DivAirports[1] BETWEEN 'ABE' AND 'FAI' OR DivAirports[2] BETWEEN 'ABE' AND 'FAI' OR DivAirports[3] BETWEEN 'ABE' AND 'FAI' OR DivAirports[4] BETWEEN 'ABE' AND 'FAI' OR DivAirports[5] BETWEEN 'ABE' AND 'FAI') AND DestStateName < 'New Jersey' OR DestStateFips > 36 GROUP BY LongestAddGTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE OriginStateFips BETWEEN 5 AND 32 ORDER BY DepTime LIMIT 12","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE OriginStateFips BETWEEN 5 AND 32 ORDER BY DepTime LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable WHERE ArrivalDelayGroups >= 1 OR DestCityMarketID >= 33785 OR DestWac <= 45 ORDER BY TaxiOut, WeatherDelay, DivArrDelay LIMIT 22"}
-{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DivAirports = 'RSW' OR DivReachedDest = 0 AND AirlineID >= 20409 ORDER BY DestState LIMIT 11","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE (DivAirports__MV0 = 'RSW' OR DivAirports__MV1 = 'RSW' OR DivAirports__MV2 = 'RSW' OR DivAirports__MV3 = 'RSW' OR DivAirports__MV4 = 'RSW') OR DivReachedDest = 0 AND AirlineID >= 20409 ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DivAirports = 'RSW' OR DivReachedDest = 0 AND AirlineID >= 20409 ORDER BY DestState LIMIT 11","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE (DivAirports[1] = 'RSW' OR DivAirports[2] = 'RSW' OR DivAirports[3] = 'RSW' OR DivAirports[4] = 'RSW' OR DivAirports[5] = 'RSW') OR DivReachedDest = 0 AND AirlineID >= 20409 ORDER BY DestState LIMIT 10000"]}
 {"sql":"SELECT AVG(DestAirportSeqID), SUM(DestCityMarketID) FROM mytable LIMIT 10"}
-{"sql":"SELECT DivDistance FROM mytable WHERE TotalAddGTime <> 63 OR DivTotalGTimes < 21 ORDER BY OriginWac LIMIT 21","hsqls":["SELECT DivDistance FROM mytable WHERE TotalAddGTime <> 63 OR (DivTotalGTimes__MV0 < 21 OR DivTotalGTimes__MV1 < 21 OR DivTotalGTimes__MV2 < 21 OR DivTotalGTimes__MV3 < 21 OR DivTotalGTimes__MV4 < 21) ORDER BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT DivDistance FROM mytable WHERE TotalAddGTime <> 63 OR DivTotalGTimes < 21 ORDER BY OriginWac LIMIT 21","hsqls":["SELECT DivDistance FROM mytable WHERE TotalAddGTime <> 63 OR (DivTotalGTimes[1] < 21 OR DivTotalGTimes[2] < 21 OR DivTotalGTimes[3] < 21 OR DivTotalGTimes[4] < 21 OR DivTotalGTimes[5] < 21) ORDER BY OriginWac LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrTimeBlk), MIN(TaxiOut) FROM mytable WHERE SecurityDelay BETWEEN 0 AND 14 OR OriginWac <= 93 AND DepDelayMinutes IN (63.0, 230.0, 224.0, 41.0) LIMIT 10"}
 {"sql":"SELECT DepDelay, Carrier, UniqueCarrier FROM mytable WHERE DepDelay BETWEEN -27.0 AND 162.0 ORDER BY OriginState, ArrDelayMinutes, CRSElapsedTime LIMIT 9"}
 {"sql":"SELECT DistanceGroup, CancellationCode, COUNT(ArrTimeBlk), AVG(DayofMonth), MIN(ActualElapsedTime) FROM mytable GROUP BY DistanceGroup, CancellationCode  ORDER BY DistanceGroup, CancellationCode LIMIT 26","hsqls":["SELECT DistanceGroup, CancellationCode, COUNT(ArrTimeBlk), AVG(DayofMonth), MIN(ActualElapsedTime) FROM mytable GROUP BY DistanceGroup, CancellationCode  ORDER BY DistanceGroup, CancellationCode LIMIT 26"]}
 {"sql":"SELECT DistanceGroup, FlightNum, MIN(LateAircraftDelay) FROM mytable WHERE AirTime > 312 OR OriginState BETWEEN 'MS' AND 'TT' GROUP BY DistanceGroup, FlightNum  ORDER BY DistanceGroup, FlightNum LIMIT 23","hsqls":["SELECT DistanceGroup, FlightNum, MIN(LateAircraftDelay) FROM mytable WHERE AirTime > 312 OR OriginState BETWEEN 'MS' AND 'TT' GROUP BY DistanceGroup, FlightNum  ORDER BY DistanceGroup, FlightNum LIMIT 23"]}
 {"sql":"SELECT TaxiOut, FlightDate, Origin, MAX(ArrivalDelayGroups) FROM mytable WHERE UniqueCarrier <= 'MQ' AND OriginCityName > 'Birmingham, AL' GROUP BY TaxiOut, FlightDate, Origin  ORDER BY TaxiOut, FlightDate, Origin LIMIT 21","hsqls":["SELECT TaxiOut, FlightDate, Origin, MAX(ArrivalDelayGroups) FROM mytable WHERE UniqueCarrier <= 'MQ' AND OriginCityName > 'Birmingham, AL' GROUP BY TaxiOut, FlightDate, Origin  ORDER BY TaxiOut, FlightDate, Origin LIMIT 21"]}
 {"sql":"SELECT TotalAddGTime, DestStateName FROM mytable LIMIT 13"}
-{"sql":"SELECT DepartureDelayGroups, ActualElapsedTime, OriginWac, COUNT(TaxiIn), MIN(NASDelay) FROM mytable WHERE DivWheelsOffs IN (1512, 1900, 1931) GROUP BY DepartureDelayGroups, ActualElapsedTime, OriginWac LIMIT 18","hsqls":["SELECT DepartureDelayGroups, ActualElapsedTime, OriginWac, COUNT(TaxiIn), MIN(NASDelay) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1512, 1900, 1931) OR DivWheelsOffs__MV1 IN (1512, 1900, 1931) OR DivWheelsOffs__MV2 IN (1512, 1900, 1931) OR DivWheelsOffs__MV3 IN (1512, 1900, 1931) OR DivWheelsOffs__MV4 IN (1512, 1900, 1931)) GROUP BY DepartureDelayGroups, ActualElapsedTime, OriginWac LIMIT 10000"]}
-{"sql":"SELECT DepTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 OR DaysSinceEpoch NOT IN (16095, 16092) OR DivLongestGTimes IN (145.0, 85.0, 111.0) LIMIT 23","hsqls":["SELECT DepTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 OR DaysSinceEpoch NOT IN (16095, 16092) OR (DivLongestGTimes__MV0 IN (145.0, 85.0, 111.0) OR DivLongestGTimes__MV1 IN (145.0, 85.0, 111.0) OR DivLongestGTimes__MV2 IN (145.0, 85.0, 111.0) OR DivLongestGTimes__MV3 IN (145.0, 85.0, 111.0) OR DivLongestGTimes__MV4 IN (145.0, 85.0, 111.0)) LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, ActualElapsedTime, OriginWac, COUNT(TaxiIn), MIN(NASDelay) FROM mytable WHERE DivWheelsOffs IN (1512, 1900, 1931) GROUP BY DepartureDelayGroups, ActualElapsedTime, OriginWac LIMIT 18","hsqls":["SELECT DepartureDelayGroups, ActualElapsedTime, OriginWac, COUNT(TaxiIn), MIN(NASDelay) FROM mytable WHERE (DivWheelsOffs[1] IN (1512, 1900, 1931) OR DivWheelsOffs[2] IN (1512, 1900, 1931) OR DivWheelsOffs[3] IN (1512, 1900, 1931) OR DivWheelsOffs[4] IN (1512, 1900, 1931) OR DivWheelsOffs[5] IN (1512, 1900, 1931)) GROUP BY DepartureDelayGroups, ActualElapsedTime, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DepTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 OR DaysSinceEpoch NOT IN (16095, 16092) OR DivLongestGTimes IN (145.0, 85.0, 111.0) LIMIT 23","hsqls":["SELECT DepTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 OR DaysSinceEpoch NOT IN (16095, 16092) OR (DivLongestGTimes[1] IN (145.0, 85.0, 111.0) OR DivLongestGTimes[2] IN (145.0, 85.0, 111.0) OR DivLongestGTimes[3] IN (145.0, 85.0, 111.0) OR DivLongestGTimes[4] IN (145.0, 85.0, 111.0) OR DivLongestGTimes[5] IN (145.0, 85.0, 111.0)) LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, WeatherDelay, ArrTimeBlk FROM mytable WHERE Origin BETWEEN 'COD' AND 'BFL' ORDER BY OriginWac LIMIT 24"}
 {"sql":"SELECT ActualElapsedTime, ArrTimeBlk FROM mytable ORDER BY DistanceGroup LIMIT 23"}
 {"sql":"SELECT Diverted, MAX(Flights), MIN(DaysSinceEpoch) FROM mytable WHERE DepartureDelayGroups IN (1, -1, 12) GROUP BY Diverted  ORDER BY Diverted LIMIT 10","hsqls":["SELECT Diverted, MAX(Flights), MIN(DaysSinceEpoch) FROM mytable WHERE DepartureDelayGroups IN (1, -1, 12) GROUP BY Diverted  ORDER BY Diverted LIMIT 10"]}
-{"sql":"SELECT TaxiOut, Distance, DestAirportSeqID FROM mytable WHERE \"Month\" > 1 OR WeatherDelay BETWEEN 24 AND 19 ORDER BY \"Year\" LIMIT 10","hsqls":["SELECT TaxiOut, Distance, DestAirportSeqID FROM mytable WHERE Month > 1 OR WeatherDelay BETWEEN 24 AND 19 ORDER BY Year LIMIT 10"]}
+{"sql":"SELECT TaxiOut, Distance, DestAirportSeqID FROM mytable WHERE \"Month\" > 1 OR WeatherDelay BETWEEN 24 AND 19 ORDER BY \"Year\" LIMIT 10","hsqls":["SELECT TaxiOut, Distance, DestAirportSeqID FROM mytable WHERE `Month` > 1 OR WeatherDelay BETWEEN 24 AND 19 ORDER BY `Year` LIMIT 10"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 28"}
 {"sql":"SELECT Carrier FROM mytable WHERE AirlineID IN (19690) OR SecurityDelay BETWEEN 27 AND 27 ORDER BY LongestAddGTime, OriginAirportID LIMIT 4"}
 {"sql":"SELECT ArrDel15, DayOfWeek FROM mytable WHERE DestCityMarketID NOT IN (34614, 34574) AND DestCityMarketID BETWEEN 30141 AND 30208 ORDER BY UniqueCarrier LIMIT 1"}
@@ -6315,24 +6315,24 @@
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 23"}
 {"sql":"SELECT FirstDepTime, OriginCityName, Cancelled FROM mytable LIMIT 12"}
 {"sql":"SELECT SecurityDelay, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 10","hsqls":["SELECT SecurityDelay, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 10"]}
-{"sql":"SELECT ArrDel15, DivWheelsOffs, \"Month\" FROM mytable ORDER BY DepDelay, DestAirportID LIMIT 18","hsqls":["SELECT ArrDel15, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, Month FROM mytable ORDER BY DepDelay, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT NASDelay, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE WeatherDelay > 138 AND DivWheelsOffs BETWEEN 130 AND 1133 ORDER BY Dest, TailNum, DaysSinceEpoch LIMIT 24","hsqls":["SELECT NASDelay, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE WeatherDelay > 138 AND (DivWheelsOffs__MV0 BETWEEN 130 AND 1133 OR DivWheelsOffs__MV1 BETWEEN 130 AND 1133 OR DivWheelsOffs__MV2 BETWEEN 130 AND 1133 OR DivWheelsOffs__MV3 BETWEEN 130 AND 1133 OR DivWheelsOffs__MV4 BETWEEN 130 AND 1133) ORDER BY Dest, TailNum, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DivWheelsOffs, \"Month\" FROM mytable ORDER BY DepDelay, DestAirportID LIMIT 18","hsqls":["SELECT ArrDel15, DivWheelsOffs, `Month` FROM mytable ORDER BY DepDelay, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT NASDelay, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE WeatherDelay > 138 AND DivWheelsOffs BETWEEN 130 AND 1133 ORDER BY Dest, TailNum, DaysSinceEpoch LIMIT 24","hsqls":["SELECT NASDelay, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE WeatherDelay > 138 AND (DivWheelsOffs[1] BETWEEN 130 AND 1133 OR DivWheelsOffs[2] BETWEEN 130 AND 1133 OR DivWheelsOffs[3] BETWEEN 130 AND 1133 OR DivWheelsOffs[4] BETWEEN 130 AND 1133 OR DivWheelsOffs[5] BETWEEN 130 AND 1133) ORDER BY Dest, TailNum, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, MIN(ArrDelay), COUNT(CRSElapsedTime) FROM mytable WHERE Distance >= 189 OR DivDistance <> 680 OR OriginAirportSeqID BETWEEN 1233502 AND 1537002 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 1","hsqls":["SELECT DistanceGroup, MIN(ArrDelay), COUNT(CRSElapsedTime) FROM mytable WHERE Distance >= 189 OR DivDistance <> 680 OR OriginAirportSeqID BETWEEN 1233502 AND 1537002 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 1"]}
 {"sql":"SELECT DestAirportSeqID, CancellationCode, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, CancellationCode  ORDER BY DestAirportSeqID, CancellationCode LIMIT 6","hsqls":["SELECT DestAirportSeqID, CancellationCode, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, CancellationCode  ORDER BY DestAirportSeqID, CancellationCode LIMIT 6"]}
-{"sql":"SELECT OriginWac FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR ActualElapsedTime BETWEEN 345 AND 166 OR CRSDepTime < 1321 ORDER BY DepartureDelayGroups, OriginState LIMIT 19","hsqls":["SELECT OriginWac FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR ActualElapsedTime BETWEEN 345 AND 166 OR CRSDepTime < 1321 ORDER BY DepartureDelayGroups, OriginState LIMIT 19"]}
+{"sql":"SELECT OriginWac FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR ActualElapsedTime BETWEEN 345 AND 166 OR CRSDepTime < 1321 ORDER BY DepartureDelayGroups, OriginState LIMIT 19","hsqls":["SELECT OriginWac FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR ActualElapsedTime BETWEEN 345 AND 166 OR CRSDepTime < 1321 ORDER BY DepartureDelayGroups, OriginState LIMIT 19"]}
 {"sql":"SELECT TaxiIn, COUNT(*) FROM mytable WHERE DepTime BETWEEN 1036 AND 2136 OR FlightDate <= '2014-01-03' GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10","hsqls":["SELECT TaxiIn, COUNT(*) FROM mytable WHERE DepTime BETWEEN 1036 AND 2136 OR FlightDate <= '2014-01-03' GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10"]}
-{"sql":"SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR \"Month\" <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5","hsqls":["SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR Month <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5"]}
+{"sql":"SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR \"Month\" <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5","hsqls":["SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR `Month` <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5"]}
 {"sql":"SELECT AirlineID, MIN(DepDelayMinutes) FROM mytable WHERE FlightNum BETWEEN 3326 AND 1022 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 20","hsqls":["SELECT AirlineID, MIN(DepDelayMinutes) FROM mytable WHERE FlightNum BETWEEN 3326 AND 1022 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 20"]}
-{"sql":"SELECT CarrierDelay, UniqueCarrier, DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 46 AND 8 AND Dest IN ('MOT') ORDER BY Quarter, TaxiIn, DestCityName LIMIT 3","hsqls":["SELECT CarrierDelay, UniqueCarrier, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginStateFips BETWEEN 46 AND 8 AND Dest IN ('MOT') ORDER BY Quarter, TaxiIn, DestCityName LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, UniqueCarrier, DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 46 AND 8 AND Dest IN ('MOT') ORDER BY Quarter, TaxiIn, DestCityName LIMIT 3","hsqls":["SELECT CarrierDelay, UniqueCarrier, DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 46 AND 8 AND Dest IN ('MOT') ORDER BY Quarter, TaxiIn, DestCityName LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, OriginAirportSeqID, CRSElapsedTime, COUNT(DepTimeBlk), COUNT(TaxiOut), COUNT(ArrDel15) FROM mytable WHERE DepartureDelayGroups <= 2 OR TailNum <= 'N783SW' GROUP BY TaxiOut, OriginAirportSeqID, CRSElapsedTime  ORDER BY TaxiOut, OriginAirportSeqID, CRSElapsedTime LIMIT 19","hsqls":["SELECT TaxiOut, OriginAirportSeqID, CRSElapsedTime, COUNT(DepTimeBlk), COUNT(TaxiOut), COUNT(ArrDel15) FROM mytable WHERE DepartureDelayGroups <= 2 OR TailNum <= 'N783SW' GROUP BY TaxiOut, OriginAirportSeqID, CRSElapsedTime  ORDER BY TaxiOut, OriginAirportSeqID, CRSElapsedTime LIMIT 19"]}
-{"sql":"SELECT DistanceGroup, CRSArrTime FROM mytable WHERE DivWheelsOns BETWEEN 21 AND 2322 AND \"Year\" >= 2014 OR \"Year\" <= 2014 ORDER BY DayofMonth, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT DistanceGroup, CRSArrTime FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 21 AND 2322 OR DivWheelsOns__MV1 BETWEEN 21 AND 2322 OR DivWheelsOns__MV2 BETWEEN 21 AND 2322 OR DivWheelsOns__MV3 BETWEEN 21 AND 2322 OR DivWheelsOns__MV4 BETWEEN 21 AND 2322) AND Year >= 2014 OR Year <= 2014 ORDER BY DayofMonth, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, CRSArrTime FROM mytable WHERE DivWheelsOns BETWEEN 21 AND 2322 AND \"Year\" >= 2014 OR \"Year\" <= 2014 ORDER BY DayofMonth, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT DistanceGroup, CRSArrTime FROM mytable WHERE (DivWheelsOns[1] BETWEEN 21 AND 2322 OR DivWheelsOns[2] BETWEEN 21 AND 2322 OR DivWheelsOns[3] BETWEEN 21 AND 2322 OR DivWheelsOns[4] BETWEEN 21 AND 2322 OR DivWheelsOns[5] BETWEEN 21 AND 2322) AND `Year` >= 2014 OR `Year` <= 2014 ORDER BY DayofMonth, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DepDel15, AVG(DaysSinceEpoch), SUM(DestStateFips) FROM mytable GROUP BY DepDelayMinutes, DepDel15  ORDER BY DepDelayMinutes, DepDel15 LIMIT 8","hsqls":["SELECT DepDelayMinutes, DepDel15, AVG(DaysSinceEpoch), SUM(DestStateFips) FROM mytable GROUP BY DepDelayMinutes, DepDel15  ORDER BY DepDelayMinutes, DepDel15 LIMIT 8"]}
 {"sql":"SELECT DepartureDelayGroups, OriginWac, CRSDepTime FROM mytable WHERE ArrTimeBlk IN ('1800-1859') ORDER BY Distance, DayofMonth LIMIT 16"}
 {"sql":"SELECT ArrDel15, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 OR Cancelled <> 1 AND Quarter = 1 GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 5","hsqls":["SELECT ArrDel15, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 OR Cancelled <> 1 AND Quarter = 1 GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 5"]}
 {"sql":"SELECT OriginCityMarketID, UniqueCarrier, ArrivalDelayGroups, MIN(DayOfWeek) FROM mytable WHERE ArrDelay = 83.0 AND FirstDepTime BETWEEN 903 AND 1653 OR OriginCityMarketID >= 30693 GROUP BY OriginCityMarketID, UniqueCarrier, ArrivalDelayGroups  ORDER BY OriginCityMarketID, UniqueCarrier, ArrivalDelayGroups LIMIT 18","hsqls":["SELECT OriginCityMarketID, UniqueCarrier, ArrivalDelayGroups, MIN(DayOfWeek) FROM mytable WHERE ArrDelay = 83.0 AND FirstDepTime BETWEEN 903 AND 1653 OR OriginCityMarketID >= 30693 GROUP BY OriginCityMarketID, UniqueCarrier, ArrivalDelayGroups  ORDER BY OriginCityMarketID, UniqueCarrier, ArrivalDelayGroups LIMIT 18"]}
-{"sql":"SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes FROM mytable ORDER BY Diverted, TaxiIn LIMIT 3","hsqls":["SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY Diverted, TaxiIn LIMIT 10000"]}
-{"sql":"SELECT Flights, DivAirportSeqIDs, DivWheelsOffs FROM mytable WHERE ActualElapsedTime NOT IN (289, 224, 147) AND DestCityMarketID BETWEEN 33158 AND 31295 OR \"Year\" < 2014 LIMIT 21","hsqls":["SELECT Flights, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE ActualElapsedTime NOT IN (289, 224, 147) AND DestCityMarketID BETWEEN 33158 AND 31295 OR Year < 2014 LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, COUNT(TaxiOut) FROM mytable WHERE CRSElapsedTime < 505 AND Flights >= 1 OR DivTailNums = 'N907DL' GROUP BY OriginCityMarketID LIMIT 23","hsqls":["SELECT OriginCityMarketID, COUNT(TaxiOut) FROM mytable WHERE CRSElapsedTime < 505 AND Flights >= 1 OR (DivTailNums__MV0 = 'N907DL' OR DivTailNums__MV1 = 'N907DL' OR DivTailNums__MV2 = 'N907DL' OR DivTailNums__MV3 = 'N907DL' OR DivTailNums__MV4 = 'N907DL') GROUP BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes FROM mytable ORDER BY Diverted, TaxiIn LIMIT 3","hsqls":["SELECT OriginStateFips, ActualElapsedTime, DivTotalGTimes FROM mytable ORDER BY Diverted, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT Flights, DivAirportSeqIDs, DivWheelsOffs FROM mytable WHERE ActualElapsedTime NOT IN (289, 224, 147) AND DestCityMarketID BETWEEN 33158 AND 31295 OR \"Year\" < 2014 LIMIT 21","hsqls":["SELECT Flights, DivAirportSeqIDs, DivWheelsOffs FROM mytable WHERE ActualElapsedTime NOT IN (289, 224, 147) AND DestCityMarketID BETWEEN 33158 AND 31295 OR `Year` < 2014 LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, COUNT(TaxiOut) FROM mytable WHERE CRSElapsedTime < 505 AND Flights >= 1 OR DivTailNums = 'N907DL' GROUP BY OriginCityMarketID LIMIT 23","hsqls":["SELECT OriginCityMarketID, COUNT(TaxiOut) FROM mytable WHERE CRSElapsedTime < 505 AND Flights >= 1 OR (DivTailNums[1] = 'N907DL' OR DivTailNums[2] = 'N907DL' OR DivTailNums[3] = 'N907DL' OR DivTailNums[4] = 'N907DL' OR DivTailNums[5] = 'N907DL') GROUP BY OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DestWac FROM mytable WHERE DestAirportSeqID = 1192102 ORDER BY Diverted, DepDelayMinutes, ArrDelayMinutes LIMIT 27"}
 {"sql":"SELECT NASDelay, DivActualElapsedTime FROM mytable WHERE WheelsOff < 1311 ORDER BY DepartureDelayGroups, Carrier, CarrierDelay LIMIT 14"}
 {"sql":"SELECT DestWac FROM mytable LIMIT 3"}
@@ -6351,7 +6351,7 @@
 {"sql":"SELECT WheelsOff, OriginCityName, Dest, COUNT(OriginWac) FROM mytable WHERE FirstDepTime BETWEEN 2254 AND 1018 OR CRSElapsedTime IN (269) AND DepDel15 NOT IN (1, 0, -9999) GROUP BY WheelsOff, OriginCityName, Dest  ORDER BY WheelsOff, OriginCityName, Dest LIMIT 2","hsqls":["SELECT WheelsOff, OriginCityName, Dest, COUNT(OriginWac) FROM mytable WHERE FirstDepTime BETWEEN 2254 AND 1018 OR CRSElapsedTime IN (269) AND DepDel15 NOT IN (1, 0, -9999) GROUP BY WheelsOff, OriginCityName, Dest  ORDER BY WheelsOff, OriginCityName, Dest LIMIT 2"]}
 {"sql":"SELECT AVG(DestCityMarketID), COUNT(OriginState) FROM mytable LIMIT 26"}
 {"sql":"SELECT DestStateFips FROM mytable WHERE AirTime IN (378, 162, 249) ORDER BY ArrDelayMinutes, CRSElapsedTime LIMIT 22"}
-{"sql":"SELECT DayofMonth FROM mytable WHERE DivLongestGTimes BETWEEN 60.0 AND 21.0 AND AirTime IN (288, 183) OR DaysSinceEpoch IN (16084, 16100, 16096, 16074, 16089) LIMIT 17","hsqls":["SELECT DayofMonth FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 60.0 AND 21.0 OR DivLongestGTimes__MV1 BETWEEN 60.0 AND 21.0 OR DivLongestGTimes__MV2 BETWEEN 60.0 AND 21.0 OR DivLongestGTimes__MV3 BETWEEN 60.0 AND 21.0 OR DivLongestGTimes__MV4 BETWEEN 60.0 AND 21.0) AND AirTime IN (288, 183) OR DaysSinceEpoch IN (16084, 16100, 16096, 16074, 16089) LIMIT 10000"]}
+{"sql":"SELECT DayofMonth FROM mytable WHERE DivLongestGTimes BETWEEN 60.0 AND 21.0 AND AirTime IN (288, 183) OR DaysSinceEpoch IN (16084, 16100, 16096, 16074, 16089) LIMIT 17","hsqls":["SELECT DayofMonth FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 60.0 AND 21.0 OR DivLongestGTimes[2] BETWEEN 60.0 AND 21.0 OR DivLongestGTimes[3] BETWEEN 60.0 AND 21.0 OR DivLongestGTimes[4] BETWEEN 60.0 AND 21.0 OR DivLongestGTimes[5] BETWEEN 60.0 AND 21.0) AND AirTime IN (288, 183) OR DaysSinceEpoch IN (16084, 16100, 16096, 16074, 16089) LIMIT 10000"]}
 {"sql":"SELECT AVG(DayOfWeek), COUNT(Diverted), COUNT(ArrDel15) FROM mytable WHERE DistanceGroup BETWEEN 2 AND 3 OR WeatherDelay BETWEEN 26 AND 26 OR AirTime NOT IN (225, 281, 397, 325) LIMIT 28"}
 {"sql":"SELECT COUNT(DayOfWeek), SUM(ActualElapsedTime) FROM mytable WHERE FirstDepTime BETWEEN 908 AND 2153 AND NASDelay > 62 OR DepTimeBlk BETWEEN '1000-1059' AND '0001-0559' LIMIT 19"}
 {"sql":"SELECT COUNT(DepDel15), MAX(DistanceGroup) FROM mytable WHERE DepTime IN (1119, 2256, 651, 1230) LIMIT 16"}
@@ -6363,25 +6363,25 @@
 {"sql":"SELECT ArrDelayMinutes, CRSDepTime FROM mytable WHERE LongestAddGTime IN (148, 11) OR OriginAirportSeqID = 1245102 ORDER BY Carrier, AirTime, DivArrDelay LIMIT 14"}
 {"sql":"SELECT DepDel15, OriginStateName, SUM(CRSDepTime), AVG(FlightNum), MIN(CarrierDelay) FROM mytable WHERE DivArrDelay NOT IN (751) OR LateAircraftDelay > 37 AND DivActualElapsedTime NOT IN (219) GROUP BY DepDel15, OriginStateName  ORDER BY DepDel15, OriginStateName LIMIT 1","hsqls":["SELECT DepDel15, OriginStateName, SUM(CRSDepTime), AVG(FlightNum), MIN(CarrierDelay) FROM mytable WHERE DivArrDelay NOT IN (751) OR LateAircraftDelay > 37 AND DivActualElapsedTime NOT IN (219) GROUP BY DepDel15, OriginStateName  ORDER BY DepDel15, OriginStateName LIMIT 1"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestStateName IN ('Minnesota', 'Wyoming', 'Mississippi', 'North Dakota', 'Missouri') AND TaxiIn IN (32, 65, 75, 38) OR DivReachedDest >= 0 LIMIT 10"}
-{"sql":"SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE \"Year\" NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15","hsqls":["SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE Year NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15"]}
+{"sql":"SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE \"Year\" NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15","hsqls":["SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE `Year` NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15"]}
 {"sql":"SELECT WheelsOff, Flights, DivAirportLandings, MIN(DepDelayMinutes), MIN(DepDel15) FROM mytable GROUP BY WheelsOff, Flights, DivAirportLandings  ORDER BY WheelsOff, Flights, DivAirportLandings LIMIT 21","hsqls":["SELECT WheelsOff, Flights, DivAirportLandings, MIN(DepDelayMinutes), MIN(DepDel15) FROM mytable GROUP BY WheelsOff, Flights, DivAirportLandings  ORDER BY WheelsOff, Flights, DivAirportLandings LIMIT 21"]}
 {"sql":"SELECT SUM(NASDelay) FROM mytable WHERE DayofMonth = 22 AND OriginAirportID BETWEEN 10821 AND 14489 AND OriginCityMarketID = 32511 LIMIT 20"}
 {"sql":"SELECT DistanceGroup, DestCityMarketID, MAX(DivDistance), AVG(CRSArrTime) FROM mytable WHERE CarrierDelay >= 168 AND OriginWac = 63 GROUP BY DistanceGroup, DestCityMarketID  ORDER BY DistanceGroup, DestCityMarketID LIMIT 10","hsqls":["SELECT DistanceGroup, DestCityMarketID, MAX(DivDistance), AVG(CRSArrTime) FROM mytable WHERE CarrierDelay >= 168 AND OriginWac = 63 GROUP BY DistanceGroup, DestCityMarketID  ORDER BY DistanceGroup, DestCityMarketID LIMIT 10"]}
-{"sql":"SELECT LateAircraftDelay, DestAirportSeqID, AVG(\"Month\"), AVG(FlightNum), MAX(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 105 AND 359 AND ArrTime NOT IN (1214, 2042, 1954, 1610) GROUP BY LateAircraftDelay, DestAirportSeqID LIMIT 15","hsqls":["SELECT LateAircraftDelay, DestAirportSeqID, AVG(Month), AVG(FlightNum), MAX(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 105 AND 359 AND ArrTime NOT IN (1214, 2042, 1954, 1610) GROUP BY LateAircraftDelay, DestAirportSeqID LIMIT 15"]}
+{"sql":"SELECT LateAircraftDelay, DestAirportSeqID, AVG(\"Month\"), AVG(FlightNum), MAX(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 105 AND 359 AND ArrTime NOT IN (1214, 2042, 1954, 1610) GROUP BY LateAircraftDelay, DestAirportSeqID LIMIT 15","hsqls":["SELECT LateAircraftDelay, DestAirportSeqID, AVG(`Month`), AVG(FlightNum), MAX(OriginStateFips) FROM mytable WHERE CRSElapsedTime BETWEEN 105 AND 359 AND ArrTime NOT IN (1214, 2042, 1954, 1610) GROUP BY LateAircraftDelay, DestAirportSeqID LIMIT 15"]}
 {"sql":"SELECT DepDelay, COUNT(ArrivalDelayGroups), SUM(DestAirportSeqID) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 16","hsqls":["SELECT DepDelay, COUNT(ArrivalDelayGroups), SUM(DestAirportSeqID) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 16"]}
 {"sql":"SELECT OriginState, COUNT(*) FROM mytable WHERE DestState <= 'TX' OR CancellationCode NOT IN ('A', 'noodles') OR FirstDepTime <= 1016 GROUP BY OriginState  ORDER BY OriginState LIMIT 10","hsqls":["SELECT OriginState, COUNT(*) FROM mytable WHERE DestState <= 'TX' OR CancellationCode NOT IN ('A', 'noodles') OR FirstDepTime <= 1016 GROUP BY OriginState  ORDER BY OriginState LIMIT 10"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE ArrDelay >= 81.0 OR OriginCityName >= 'Corpus Christi, TX' ORDER BY DivDistance, ArrDel15, DepDel15 LIMIT 6"}
 {"sql":"SELECT WheelsOff, ArrTimeBlk, DestCityMarketID, AVG(DaysSinceEpoch) FROM mytable WHERE DepDelay BETWEEN 132.0 AND -11.0 OR OriginState BETWEEN 'NC' AND 'ME' AND DivArrDelay >= 182 GROUP BY WheelsOff, ArrTimeBlk, DestCityMarketID  ORDER BY WheelsOff, ArrTimeBlk, DestCityMarketID LIMIT 12","hsqls":["SELECT WheelsOff, ArrTimeBlk, DestCityMarketID, AVG(DaysSinceEpoch) FROM mytable WHERE DepDelay BETWEEN 132.0 AND -11.0 OR OriginState BETWEEN 'NC' AND 'ME' AND DivArrDelay >= 182 GROUP BY WheelsOff, ArrTimeBlk, DestCityMarketID  ORDER BY WheelsOff, ArrTimeBlk, DestCityMarketID LIMIT 12"]}
 {"sql":"SELECT DistanceGroup, ArrTime FROM mytable LIMIT 8"}
-{"sql":"SELECT DivWheelsOns, DepDel15, OriginAirportID FROM mytable WHERE \"Month\" IN (1) AND \"Month\" BETWEEN 1 AND 1 ORDER BY SecurityDelay","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepDel15, OriginAirportID FROM mytable WHERE Month IN (1) AND Month BETWEEN 1 AND 1 ORDER BY SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepDel15, OriginAirportID FROM mytable WHERE \"Month\" IN (1) AND \"Month\" BETWEEN 1 AND 1 ORDER BY SecurityDelay","hsqls":["SELECT DivWheelsOns, DepDel15, OriginAirportID FROM mytable WHERE `Month` IN (1) AND `Month` BETWEEN 1 AND 1 ORDER BY SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT DayOfWeek, MAX(ArrDel15) FROM mytable GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 13","hsqls":["SELECT DayOfWeek, MAX(ArrDel15) FROM mytable GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 13"]}
-{"sql":"SELECT TaxiIn, DivAirportSeqIDs, ArrDelayMinutes FROM mytable LIMIT 25","hsqls":["SELECT TaxiIn, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrDelayMinutes FROM mytable LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DivAirportSeqIDs, ArrDelayMinutes FROM mytable LIMIT 25","hsqls":["SELECT TaxiIn, DivAirportSeqIDs, ArrDelayMinutes FROM mytable LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, OriginCityName, AirTime FROM mytable ORDER BY TotalAddGTime, AirTime, WheelsOn"}
 {"sql":"SELECT Carrier, DestAirportSeqID, ArrDelayMinutes, MIN(Quarter), AVG(Flights), MAX(DivAirportLandings) FROM mytable GROUP BY Carrier, DestAirportSeqID, ArrDelayMinutes  ORDER BY Carrier, DestAirportSeqID, ArrDelayMinutes LIMIT 15","hsqls":["SELECT Carrier, DestAirportSeqID, ArrDelayMinutes, MIN(Quarter), AVG(Flights), MAX(DivAirportLandings) FROM mytable GROUP BY Carrier, DestAirportSeqID, ArrDelayMinutes  ORDER BY Carrier, DestAirportSeqID, ArrDelayMinutes LIMIT 15"]}
 {"sql":"SELECT MAX(Quarter), AVG(TaxiIn), COUNT(DestState) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'New Mexico', 'Arkansas', 'Georgia', 'Montana') OR Cancelled IN (1, 0) LIMIT 3"}
 {"sql":"SELECT DestCityName, AirlineID, CRSElapsedTime, SUM(Cancelled), MAX(DepartureDelayGroups), COUNT(CancellationCode) FROM mytable WHERE DivReachedDest < 0 AND Origin IN ('RSW', 'RIC', 'MOD', 'BGR') AND Flights IN (1) GROUP BY DestCityName, AirlineID, CRSElapsedTime  ORDER BY DestCityName, AirlineID, CRSElapsedTime LIMIT 5","hsqls":["SELECT DestCityName, AirlineID, CRSElapsedTime, SUM(Cancelled), MAX(DepartureDelayGroups), COUNT(CancellationCode) FROM mytable WHERE DivReachedDest < 0 AND Origin IN ('RSW', 'RIC', 'MOD', 'BGR') AND Flights IN (1) GROUP BY DestCityName, AirlineID, CRSElapsedTime  ORDER BY DestCityName, AirlineID, CRSElapsedTime LIMIT 5"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE AirlineID IN (20437, 19977) ORDER BY DepTimeBlk LIMIT 27"}
-{"sql":"SELECT CRSArrTime, DivAirportSeqIDs, Origin FROM mytable ORDER BY ArrTime, NASDelay, DayofMonth LIMIT 10","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Origin FROM mytable ORDER BY ArrTime, NASDelay, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivAirportSeqIDs, Origin FROM mytable ORDER BY ArrTime, NASDelay, DayofMonth LIMIT 10","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs, Origin FROM mytable ORDER BY ArrTime, NASDelay, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT FlightDate, DepTime, DepDel15 FROM mytable WHERE Diverted NOT IN (0) OR DaysSinceEpoch BETWEEN 16095 AND 16086 AND DepDelayMinutes IN (182.0, 27.0, 190.0, 142.0) ORDER BY SecurityDelay, DestAirportSeqID LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 1"}
 {"sql":"SELECT ArrDelay, MIN(WheelsOn) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DestState BETWEEN 'WY' AND 'UT' GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 24","hsqls":["SELECT ArrDelay, MIN(WheelsOn) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DestState BETWEEN 'WY' AND 'UT' GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 24"]}
@@ -6391,7 +6391,7 @@
 {"sql":"SELECT DestStateName, SUM(LongestAddGTime), MIN(TaxiOut) FROM mytable WHERE DayofMonth IN (6, 19, 5, 24, 11) OR WheelsOn >= 2214 AND OriginStateFips BETWEEN 26 AND 22 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 12","hsqls":["SELECT DestStateName, SUM(LongestAddGTime), MIN(TaxiOut) FROM mytable WHERE DayofMonth IN (6, 19, 5, 24, 11) OR WheelsOn >= 2214 AND OriginStateFips BETWEEN 26 AND 22 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 12"]}
 {"sql":"SELECT DistanceGroup, Dest, COUNT(Origin) FROM mytable WHERE DepDelay >= 26.0 AND CRSArrTime BETWEEN 958 AND 2030 AND DivReachedDest BETWEEN 0 AND 0 GROUP BY DistanceGroup, Dest  ORDER BY DistanceGroup, Dest LIMIT 23","hsqls":["SELECT DistanceGroup, Dest, COUNT(Origin) FROM mytable WHERE DepDelay >= 26.0 AND CRSArrTime BETWEEN 958 AND 2030 AND DivReachedDest BETWEEN 0 AND 0 GROUP BY DistanceGroup, Dest  ORDER BY DistanceGroup, Dest LIMIT 23"]}
 {"sql":"SELECT WeatherDelay FROM mytable ORDER BY ArrDelayMinutes, DepDel15 LIMIT 29"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Month\" NOT IN (1) LIMIT 24","hsqls":["SELECT COUNT(*) FROM mytable WHERE Month NOT IN (1) LIMIT 24"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Month\" NOT IN (1) LIMIT 24","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Month` NOT IN (1) LIMIT 24"]}
 {"sql":"SELECT Distance, AVG(OriginAirportSeqID), SUM(DepTime) FROM mytable WHERE AirlineID BETWEEN 19690 AND 20409 AND FlightDate NOT IN ('2014-01-29', '2014-01-14') AND DayofMonth > 9 GROUP BY Distance  ORDER BY Distance LIMIT 2","hsqls":["SELECT Distance, AVG(OriginAirportSeqID), SUM(DepTime) FROM mytable WHERE AirlineID BETWEEN 19690 AND 20409 AND FlightDate NOT IN ('2014-01-29', '2014-01-14') AND DayofMonth > 9 GROUP BY Distance  ORDER BY Distance LIMIT 2"]}
 {"sql":"SELECT AVG(FirstDepTime) FROM mytable WHERE OriginCityMarketID BETWEEN 33038 AND 30255 OR FlightDate = '2014-01-03'"}
 {"sql":"SELECT WheelsOff, Diverted, COUNT(*) FROM mytable WHERE OriginStateName > 'Arizona' GROUP BY WheelsOff, Diverted  ORDER BY WheelsOff, Diverted LIMIT 20","hsqls":["SELECT WheelsOff, Diverted, COUNT(*) FROM mytable WHERE OriginStateName > 'Arizona' GROUP BY WheelsOff, Diverted  ORDER BY WheelsOff, Diverted LIMIT 20"]}
@@ -6400,95 +6400,95 @@
 {"sql":"SELECT OriginCityName, UniqueCarrier FROM mytable WHERE AirTime <> 194 AND OriginAirportID BETWEEN 10731 AND 12094 ORDER BY WeatherDelay, AirlineID, ArrDelay LIMIT 20"}
 {"sql":"SELECT DestWac FROM mytable WHERE ArrTime BETWEEN 2202 AND 2352 LIMIT 23"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE DepartureDelayGroups NOT IN (2, -2, 4, 8, 12) OR DestStateName >= 'Illinois' AND DestAirportSeqID NOT IN (1227802, 1449202, 1318403, 1100303) ORDER BY CRSElapsedTime LIMIT 12"}
-{"sql":"SELECT DestState, Quarter, Carrier, COUNT(NASDelay), MIN(DivAirportLandings) FROM mytable WHERE DivReachedDest IN (1, -9999) OR DivAirportSeqIDs BETWEEN 1330303 AND -9999 GROUP BY DestState, Quarter, Carrier LIMIT 1","hsqls":["SELECT DestState, Quarter, Carrier, COUNT(NASDelay), MIN(DivAirportLandings) FROM mytable WHERE DivReachedDest IN (1, -9999) OR (DivAirportSeqIDs__MV0 BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs__MV1 BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs__MV2 BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs__MV3 BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs__MV4 BETWEEN 1330303 AND -9999) GROUP BY DestState, Quarter, Carrier LIMIT 10000"]}
-{"sql":"SELECT DestState, DivAirports, DepTime FROM mytable WHERE DestStateName < 'Connecticut' ORDER BY Dest LIMIT 24","hsqls":["SELECT DestState, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepTime FROM mytable WHERE DestStateName < 'Connecticut' ORDER BY Dest LIMIT 10000"]}
+{"sql":"SELECT DestState, Quarter, Carrier, COUNT(NASDelay), MIN(DivAirportLandings) FROM mytable WHERE DivReachedDest IN (1, -9999) OR DivAirportSeqIDs BETWEEN 1330303 AND -9999 GROUP BY DestState, Quarter, Carrier LIMIT 1","hsqls":["SELECT DestState, Quarter, Carrier, COUNT(NASDelay), MIN(DivAirportLandings) FROM mytable WHERE DivReachedDest IN (1, -9999) OR (DivAirportSeqIDs[1] BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs[2] BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs[3] BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs[4] BETWEEN 1330303 AND -9999 OR DivAirportSeqIDs[5] BETWEEN 1330303 AND -9999) GROUP BY DestState, Quarter, Carrier LIMIT 10000"]}
+{"sql":"SELECT DestState, DivAirports, DepTime FROM mytable WHERE DestStateName < 'Connecticut' ORDER BY Dest LIMIT 24","hsqls":["SELECT DestState, DivAirports, DepTime FROM mytable WHERE DestStateName < 'Connecticut' ORDER BY Dest LIMIT 10000"]}
 {"sql":"SELECT DestCityName, ArrivalDelayGroups, AVG(DepDelayMinutes) FROM mytable WHERE DestState BETWEEN 'VT' AND 'FL' AND DaysSinceEpoch NOT IN (16080, 16087, 16095, 16077, 16086) OR LongestAddGTime <> 47 GROUP BY DestCityName, ArrivalDelayGroups  ORDER BY DestCityName, ArrivalDelayGroups LIMIT 15","hsqls":["SELECT DestCityName, ArrivalDelayGroups, AVG(DepDelayMinutes) FROM mytable WHERE DestState BETWEEN 'VT' AND 'FL' AND DaysSinceEpoch NOT IN (16080, 16087, 16095, 16077, 16086) OR LongestAddGTime <> 47 GROUP BY DestCityName, ArrivalDelayGroups  ORDER BY DestCityName, ArrivalDelayGroups LIMIT 15"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE DestAirportSeqID BETWEEN 1037203 AND 1584102 ORDER BY DepartureDelayGroups, Cancelled LIMIT 10"}
 {"sql":"SELECT TaxiOut FROM mytable WHERE CRSDepTime NOT IN (2210, 716, 1510, 1153, 1517) AND ArrTimeBlk BETWEEN '1900-1959' AND '0700-0759' ORDER BY Flights, OriginCityMarketID LIMIT 25"}
-{"sql":"SELECT Origin FROM mytable WHERE DivTotalGTimes < 40 OR FirstDepTime NOT IN (2356, 1016, 849) OR NASDelay IN (93, 107, 111, 15, 12) LIMIT 12","hsqls":["SELECT Origin FROM mytable WHERE (DivTotalGTimes__MV0 < 40 OR DivTotalGTimes__MV1 < 40 OR DivTotalGTimes__MV2 < 40 OR DivTotalGTimes__MV3 < 40 OR DivTotalGTimes__MV4 < 40) OR FirstDepTime NOT IN (2356, 1016, 849) OR NASDelay IN (93, 107, 111, 15, 12) LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, Cancelled, DivWheelsOffs FROM mytable WHERE LateAircraftDelay BETWEEN 149 AND 232 ORDER BY FlightDate, DestAirportSeqID, DayOfWeek LIMIT 14","hsqls":["SELECT OriginStateFips, Cancelled, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE LateAircraftDelay BETWEEN 149 AND 232 ORDER BY FlightDate, DestAirportSeqID, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT Origin FROM mytable WHERE DivTotalGTimes < 40 OR FirstDepTime NOT IN (2356, 1016, 849) OR NASDelay IN (93, 107, 111, 15, 12) LIMIT 12","hsqls":["SELECT Origin FROM mytable WHERE (DivTotalGTimes[1] < 40 OR DivTotalGTimes[2] < 40 OR DivTotalGTimes[3] < 40 OR DivTotalGTimes[4] < 40 OR DivTotalGTimes[5] < 40) OR FirstDepTime NOT IN (2356, 1016, 849) OR NASDelay IN (93, 107, 111, 15, 12) LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, Cancelled, DivWheelsOffs FROM mytable WHERE LateAircraftDelay BETWEEN 149 AND 232 ORDER BY FlightDate, DestAirportSeqID, DayOfWeek LIMIT 14","hsqls":["SELECT OriginStateFips, Cancelled, DivWheelsOffs FROM mytable WHERE LateAircraftDelay BETWEEN 149 AND 232 ORDER BY FlightDate, DestAirportSeqID, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DepDel15, DestAirportID, SUM(ArrDel15), AVG(Cancelled) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 1 AND ArrTime BETWEEN 1609 AND 1631 OR SecurityDelay IN (1, 0, 18, 14, -9999) GROUP BY TaxiOut, DepDel15, DestAirportID  ORDER BY TaxiOut, DepDel15, DestAirportID LIMIT 20","hsqls":["SELECT TaxiOut, DepDel15, DestAirportID, SUM(ArrDel15), AVG(Cancelled) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 1 AND ArrTime BETWEEN 1609 AND 1631 OR SecurityDelay IN (1, 0, 18, 14, -9999) GROUP BY TaxiOut, DepDel15, DestAirportID  ORDER BY TaxiOut, DepDel15, DestAirportID LIMIT 20"]}
-{"sql":"SELECT DestState, Carrier, DestCityMarketID, MIN(\"Year\"), AVG(DistanceGroup) FROM mytable GROUP BY DestState, Carrier, DestCityMarketID LIMIT 18","hsqls":["SELECT DestState, Carrier, DestCityMarketID, MIN(Year), AVG(DistanceGroup) FROM mytable GROUP BY DestState, Carrier, DestCityMarketID LIMIT 18"]}
+{"sql":"SELECT DestState, Carrier, DestCityMarketID, MIN(\"Year\"), AVG(DistanceGroup) FROM mytable GROUP BY DestState, Carrier, DestCityMarketID LIMIT 18","hsqls":["SELECT DestState, Carrier, DestCityMarketID, MIN(`Year`), AVG(DistanceGroup) FROM mytable GROUP BY DestState, Carrier, DestCityMarketID LIMIT 18"]}
 {"sql":"SELECT DestCityName, Origin FROM mytable WHERE ActualElapsedTime > 402 OR AirTime IN (117, 121, 185, 197, 255) ORDER BY Carrier, Quarter LIMIT 11"}
 {"sql":"SELECT WheelsOff, DepTimeBlk, COUNT(*) FROM mytable WHERE CRSElapsedTime >= 291 AND LateAircraftDelay BETWEEN 75 AND 174 GROUP BY WheelsOff, DepTimeBlk  ORDER BY WheelsOff, DepTimeBlk LIMIT 21","hsqls":["SELECT WheelsOff, DepTimeBlk, COUNT(*) FROM mytable WHERE CRSElapsedTime >= 291 AND LateAircraftDelay BETWEEN 75 AND 174 GROUP BY WheelsOff, DepTimeBlk  ORDER BY WheelsOff, DepTimeBlk LIMIT 21"]}
 {"sql":"SELECT DestAirportSeqID, DayofMonth, DaysSinceEpoch, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DayofMonth, DaysSinceEpoch  ORDER BY DestAirportSeqID, DayofMonth, DaysSinceEpoch LIMIT 9","hsqls":["SELECT DestAirportSeqID, DayofMonth, DaysSinceEpoch, COUNT(*) FROM mytable GROUP BY DestAirportSeqID, DayofMonth, DaysSinceEpoch  ORDER BY DestAirportSeqID, DayofMonth, DaysSinceEpoch LIMIT 9"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Carrier > 'AS' LIMIT 24"}
 {"sql":"SELECT DepTimeBlk, DayOfWeek FROM mytable WHERE Carrier <= 'DL' ORDER BY OriginAirportSeqID, LateAircraftDelay, Carrier LIMIT 19"}
-{"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 63 AND 72 AND DivWheelsOffs IN (21, 1045, 2313, 1603, 246) OR DivAirports IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') GROUP BY FirstDepTime LIMIT 24","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 63 AND 72 OR DivTotalGTimes__MV1 BETWEEN 63 AND 72 OR DivTotalGTimes__MV2 BETWEEN 63 AND 72 OR DivTotalGTimes__MV3 BETWEEN 63 AND 72 OR DivTotalGTimes__MV4 BETWEEN 63 AND 72) AND (DivWheelsOffs__MV0 IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs__MV1 IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs__MV2 IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs__MV3 IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs__MV4 IN (21, 1045, 2313, 1603, 246)) OR (DivAirports__MV0 IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports__MV1 IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports__MV2 IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports__MV3 IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports__MV4 IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS')) GROUP BY FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DivTotalGTimes BETWEEN 63 AND 72 AND DivWheelsOffs IN (21, 1045, 2313, 1603, 246) OR DivAirports IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') GROUP BY FirstDepTime LIMIT 24","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 63 AND 72 OR DivTotalGTimes[2] BETWEEN 63 AND 72 OR DivTotalGTimes[3] BETWEEN 63 AND 72 OR DivTotalGTimes[4] BETWEEN 63 AND 72 OR DivTotalGTimes[5] BETWEEN 63 AND 72) AND (DivWheelsOffs[1] IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs[2] IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs[3] IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs[4] IN (21, 1045, 2313, 1603, 246) OR DivWheelsOffs[5] IN (21, 1045, 2313, 1603, 246)) OR (DivAirports[1] IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports[2] IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports[3] IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports[4] IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS') OR DivAirports[5] IN ('CLE', 'SDF', 'MOD', 'EUG', 'CHS')) GROUP BY FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT DestWac, FlightDate, DepTime FROM mytable ORDER BY DestCityName, OriginWac, CRSElapsedTime LIMIT 4"}
-{"sql":"SELECT SecurityDelay, DepTime, UniqueCarrier FROM mytable WHERE DepDelayMinutes NOT IN (276.0, 199.0) AND ArrDelayMinutes IN (274.0) AND \"Month\" BETWEEN 1 AND 1 ORDER BY \"Month\", OriginAirportID LIMIT 26","hsqls":["SELECT SecurityDelay, DepTime, UniqueCarrier FROM mytable WHERE DepDelayMinutes NOT IN (276.0, 199.0) AND ArrDelayMinutes IN (274.0) AND Month BETWEEN 1 AND 1 ORDER BY Month, OriginAirportID LIMIT 26"]}
-{"sql":"SELECT MIN(DivActualElapsedTime), MIN(TotalAddGTime) FROM mytable WHERE \"Month\" = 1 OR DepTimeBlk <> '2000-2059' LIMIT 22","hsqls":["SELECT MIN(DivActualElapsedTime), MIN(TotalAddGTime) FROM mytable WHERE Month = 1 OR DepTimeBlk <> '2000-2059' LIMIT 22"]}
+{"sql":"SELECT SecurityDelay, DepTime, UniqueCarrier FROM mytable WHERE DepDelayMinutes NOT IN (276.0, 199.0) AND ArrDelayMinutes IN (274.0) AND \"Month\" BETWEEN 1 AND 1 ORDER BY \"Month\", OriginAirportID LIMIT 26","hsqls":["SELECT SecurityDelay, DepTime, UniqueCarrier FROM mytable WHERE DepDelayMinutes NOT IN (276.0, 199.0) AND ArrDelayMinutes IN (274.0) AND `Month` BETWEEN 1 AND 1 ORDER BY Month, OriginAirportID LIMIT 26"]}
+{"sql":"SELECT MIN(DivActualElapsedTime), MIN(TotalAddGTime) FROM mytable WHERE \"Month\" = 1 OR DepTimeBlk <> '2000-2059' LIMIT 22","hsqls":["SELECT MIN(DivActualElapsedTime), MIN(TotalAddGTime) FROM mytable WHERE `Month` = 1 OR DepTimeBlk <> '2000-2059' LIMIT 22"]}
 {"sql":"SELECT WheelsOff, OriginState, ArrDelayMinutes, SUM(Distance), MIN(AirlineID) FROM mytable WHERE OriginAirportID < 14683 GROUP BY WheelsOff, OriginState, ArrDelayMinutes  ORDER BY WheelsOff, OriginState, ArrDelayMinutes LIMIT 23","hsqls":["SELECT WheelsOff, OriginState, ArrDelayMinutes, SUM(Distance), MIN(AirlineID) FROM mytable WHERE OriginAirportID < 14683 GROUP BY WheelsOff, OriginState, ArrDelayMinutes  ORDER BY WheelsOff, OriginState, ArrDelayMinutes LIMIT 23"]}
 {"sql":"SELECT Cancelled, DepDel15, DaysSinceEpoch FROM mytable WHERE OriginStateFips BETWEEN 12 AND 25 AND TaxiOut > 18 LIMIT 18"}
-{"sql":"SELECT TaxiOut, COUNT(\"Year\"), MIN(DepartureDelayGroups) FROM mytable WHERE FirstDepTime > 550 AND DaysSinceEpoch NOT IN (16083, 16073, 16077, 16086, 16089) OR LongestAddGTime < 39 GROUP BY TaxiOut LIMIT 4","hsqls":["SELECT TaxiOut, COUNT(Year), MIN(DepartureDelayGroups) FROM mytable WHERE FirstDepTime > 550 AND DaysSinceEpoch NOT IN (16083, 16073, 16077, 16086, 16089) OR LongestAddGTime < 39 GROUP BY TaxiOut LIMIT 4"]}
+{"sql":"SELECT TaxiOut, COUNT(\"Year\"), MIN(DepartureDelayGroups) FROM mytable WHERE FirstDepTime > 550 AND DaysSinceEpoch NOT IN (16083, 16073, 16077, 16086, 16089) OR LongestAddGTime < 39 GROUP BY TaxiOut LIMIT 4","hsqls":["SELECT TaxiOut, COUNT(`Year`), MIN(DepartureDelayGroups) FROM mytable WHERE FirstDepTime > 550 AND DaysSinceEpoch NOT IN (16083, 16073, 16077, 16086, 16089) OR LongestAddGTime < 39 GROUP BY TaxiOut LIMIT 4"]}
 {"sql":"SELECT SUM(OriginAirportID), MAX(DayofMonth), COUNT(ArrDelay) FROM mytable WHERE DepDelayMinutes <> 104.0 OR Cancelled > 0 LIMIT 1"}
-{"sql":"SELECT TaxiOut, AirlineID FROM mytable WHERE WheelsOff BETWEEN 2211 AND 1006 AND DaysSinceEpoch BETWEEN 16083 AND 16097 AND DivWheelsOffs IN (1756, 1350, 1850) ORDER BY OriginState LIMIT 25","hsqls":["SELECT TaxiOut, AirlineID FROM mytable WHERE WheelsOff BETWEEN 2211 AND 1006 AND DaysSinceEpoch BETWEEN 16083 AND 16097 AND (DivWheelsOffs__MV0 IN (1756, 1350, 1850) OR DivWheelsOffs__MV1 IN (1756, 1350, 1850) OR DivWheelsOffs__MV2 IN (1756, 1350, 1850) OR DivWheelsOffs__MV3 IN (1756, 1350, 1850) OR DivWheelsOffs__MV4 IN (1756, 1350, 1850)) ORDER BY OriginState LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime FROM mytable WHERE LateAircraftDelay >= 327 AND DivWheelsOns BETWEEN 59 AND 2245 AND Diverted <> 0 ORDER BY OriginAirportSeqID, ArrTime LIMIT 21","hsqls":["SELECT TotalAddGTime FROM mytable WHERE LateAircraftDelay >= 327 AND (DivWheelsOns__MV0 BETWEEN 59 AND 2245 OR DivWheelsOns__MV1 BETWEEN 59 AND 2245 OR DivWheelsOns__MV2 BETWEEN 59 AND 2245 OR DivWheelsOns__MV3 BETWEEN 59 AND 2245 OR DivWheelsOns__MV4 BETWEEN 59 AND 2245) AND Diverted <> 0 ORDER BY OriginAirportSeqID, ArrTime LIMIT 10000"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE FlightDate BETWEEN '2014-01-01' AND '2014-01-12' ORDER BY TotalAddGTime LIMIT 9","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE FlightDate BETWEEN '2014-01-01' AND '2014-01-12' ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, AirlineID FROM mytable WHERE WheelsOff BETWEEN 2211 AND 1006 AND DaysSinceEpoch BETWEEN 16083 AND 16097 AND DivWheelsOffs IN (1756, 1350, 1850) ORDER BY OriginState LIMIT 25","hsqls":["SELECT TaxiOut, AirlineID FROM mytable WHERE WheelsOff BETWEEN 2211 AND 1006 AND DaysSinceEpoch BETWEEN 16083 AND 16097 AND (DivWheelsOffs[1] IN (1756, 1350, 1850) OR DivWheelsOffs[2] IN (1756, 1350, 1850) OR DivWheelsOffs[3] IN (1756, 1350, 1850) OR DivWheelsOffs[4] IN (1756, 1350, 1850) OR DivWheelsOffs[5] IN (1756, 1350, 1850)) ORDER BY OriginState LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime FROM mytable WHERE LateAircraftDelay >= 327 AND DivWheelsOns BETWEEN 59 AND 2245 AND Diverted <> 0 ORDER BY OriginAirportSeqID, ArrTime LIMIT 21","hsqls":["SELECT TotalAddGTime FROM mytable WHERE LateAircraftDelay >= 327 AND (DivWheelsOns[1] BETWEEN 59 AND 2245 OR DivWheelsOns[2] BETWEEN 59 AND 2245 OR DivWheelsOns[3] BETWEEN 59 AND 2245 OR DivWheelsOns[4] BETWEEN 59 AND 2245 OR DivWheelsOns[5] BETWEEN 59 AND 2245) AND Diverted <> 0 ORDER BY OriginAirportSeqID, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE FlightDate BETWEEN '2014-01-01' AND '2014-01-12' ORDER BY TotalAddGTime LIMIT 9","hsqls":["SELECT DivTailNums FROM mytable WHERE FlightDate BETWEEN '2014-01-01' AND '2014-01-12' ORDER BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, DepTime, DepDel15, SUM(DestCityMarketID) FROM mytable WHERE TailNum <= 'N963DN' AND DivReachedDest IN (1, -9999) OR ArrTimeBlk NOT IN ('2200-2259', '2300-2359', '1200-1259', '0001-0559', '1400-1459') GROUP BY OriginCityMarketID, DepTime, DepDel15  ORDER BY OriginCityMarketID, DepTime, DepDel15 LIMIT 24","hsqls":["SELECT OriginCityMarketID, DepTime, DepDel15, SUM(DestCityMarketID) FROM mytable WHERE TailNum <= 'N963DN' AND DivReachedDest IN (1, -9999) OR ArrTimeBlk NOT IN ('2200-2259', '2300-2359', '1200-1259', '0001-0559', '1400-1459') GROUP BY OriginCityMarketID, DepTime, DepDel15  ORDER BY OriginCityMarketID, DepTime, DepDel15 LIMIT 24"]}
 {"sql":"SELECT OriginCityName, DestCityName, DivArrDelay FROM mytable LIMIT 15"}
 {"sql":"SELECT DestWac, CRSArrTime, FlightNum FROM mytable LIMIT 2"}
 {"sql":"SELECT OriginState FROM mytable LIMIT 20"}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE DivTailNums BETWEEN 'N73445' AND 'N766JB' AND \"Month\" BETWEEN 1 AND 1 OR DivDistance NOT IN (151, 575, 71, 972) ORDER BY OriginAirportSeqID, DepDelay, UniqueCarrier LIMIT 15","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N73445' AND 'N766JB' OR DivTailNums__MV1 BETWEEN 'N73445' AND 'N766JB' OR DivTailNums__MV2 BETWEEN 'N73445' AND 'N766JB' OR DivTailNums__MV3 BETWEEN 'N73445' AND 'N766JB' OR DivTailNums__MV4 BETWEEN 'N73445' AND 'N766JB') AND Month BETWEEN 1 AND 1 OR DivDistance NOT IN (151, 575, 71, 972) ORDER BY OriginAirportSeqID, DepDelay, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, AVG(CRSArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DivDistance <> 397 AND DivReachedDest BETWEEN -9999 AND 1 GROUP BY TotalAddGTime LIMIT 10","hsqls":["SELECT TotalAddGTime, AVG(CRSArrTime) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DivDistance <> 397 AND DivReachedDest BETWEEN -9999 AND 1 GROUP BY TotalAddGTime LIMIT 10"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE DivTailNums BETWEEN 'N73445' AND 'N766JB' AND \"Month\" BETWEEN 1 AND 1 OR DivDistance NOT IN (151, 575, 71, 972) ORDER BY OriginAirportSeqID, DepDelay, UniqueCarrier LIMIT 15","hsqls":["SELECT CRSArrTime FROM mytable WHERE (DivTailNums[1] BETWEEN 'N73445' AND 'N766JB' OR DivTailNums[2] BETWEEN 'N73445' AND 'N766JB' OR DivTailNums[3] BETWEEN 'N73445' AND 'N766JB' OR DivTailNums[4] BETWEEN 'N73445' AND 'N766JB' OR DivTailNums[5] BETWEEN 'N73445' AND 'N766JB') AND `Month` BETWEEN 1 AND 1 OR DivDistance NOT IN (151, 575, 71, 972) ORDER BY OriginAirportSeqID, DepDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, AVG(CRSArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DivDistance <> 397 AND DivReachedDest BETWEEN -9999 AND 1 GROUP BY TotalAddGTime LIMIT 10","hsqls":["SELECT TotalAddGTime, AVG(CRSArrTime) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DivDistance <> 397 AND DivReachedDest BETWEEN -9999 AND 1 GROUP BY TotalAddGTime LIMIT 10"]}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE ArrivalDelayGroups > 5 AND ArrivalDelayGroups NOT IN (5, 9) AND AirTime IN (53) ORDER BY DivReachedDest, OriginState LIMIT 9"}
 {"sql":"SELECT OriginStateFips, Origin, COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '2100-2159', '1200-1259', '1900-1959') OR TotalAddGTime <> 63 GROUP BY OriginStateFips, Origin  ORDER BY OriginStateFips, Origin LIMIT 10","hsqls":["SELECT OriginStateFips, Origin, COUNT(*) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '2100-2159', '1200-1259', '1900-1959') OR TotalAddGTime <> 63 GROUP BY OriginStateFips, Origin  ORDER BY OriginStateFips, Origin LIMIT 10"]}
 {"sql":"SELECT Carrier, Distance, DepDel15 FROM mytable WHERE ArrDel15 <= 1 OR Cancelled NOT IN (1) ORDER BY Distance LIMIT 11"}
-{"sql":"SELECT Distance, DivAirportIDs FROM mytable WHERE OriginAirportID NOT IN (12320, 13891, 10146, 11641) LIMIT 28","hsqls":["SELECT Distance, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginAirportID NOT IN (12320, 13891, 10146, 11641) LIMIT 10000"]}
+{"sql":"SELECT Distance, DivAirportIDs FROM mytable WHERE OriginAirportID NOT IN (12320, 13891, 10146, 11641) LIMIT 28","hsqls":["SELECT Distance, DivAirportIDs FROM mytable WHERE OriginAirportID NOT IN (12320, 13891, 10146, 11641) LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID FROM mytable LIMIT 6"}
 {"sql":"SELECT DepDelayMinutes, Cancelled, AVG(Distance), COUNT(FlightDate) FROM mytable WHERE DestCityMarketID BETWEEN 31504 AND 32206 AND OriginCityMarketID IN (30918, 33502, 31695, 32016, 33486) OR ArrTimeBlk >= '1400-1459' GROUP BY DepDelayMinutes, Cancelled  ORDER BY DepDelayMinutes, Cancelled LIMIT 6","hsqls":["SELECT DepDelayMinutes, Cancelled, AVG(Distance), COUNT(FlightDate) FROM mytable WHERE DestCityMarketID BETWEEN 31504 AND 32206 AND OriginCityMarketID IN (30918, 33502, 31695, 32016, 33486) OR ArrTimeBlk >= '1400-1459' GROUP BY DepDelayMinutes, Cancelled  ORDER BY DepDelayMinutes, Cancelled LIMIT 6"]}
-{"sql":"SELECT CRSArrTime, DestCityName FROM mytable WHERE Carrier IN ('F9', 'HA', 'AA') AND DivAirportIDs BETWEEN 15070 AND 10918 ORDER BY ArrTimeBlk, DestCityMarketID LIMIT 1","hsqls":["SELECT CRSArrTime, DestCityName FROM mytable WHERE Carrier IN ('F9', 'HA', 'AA') AND (DivAirportIDs__MV0 BETWEEN 15070 AND 10918 OR DivAirportIDs__MV1 BETWEEN 15070 AND 10918 OR DivAirportIDs__MV2 BETWEEN 15070 AND 10918 OR DivAirportIDs__MV3 BETWEEN 15070 AND 10918 OR DivAirportIDs__MV4 BETWEEN 15070 AND 10918) ORDER BY ArrTimeBlk, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DivAirports, SecurityDelay, DestCityMarketID FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16086) AND DivArrDelay BETWEEN 148 AND 191 OR OriginWac > 71 LIMIT 28","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, SecurityDelay, DestCityMarketID FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16086) AND DivArrDelay BETWEEN 148 AND 191 OR OriginWac > 71 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DestCityName FROM mytable WHERE Carrier IN ('F9', 'HA', 'AA') AND DivAirportIDs BETWEEN 15070 AND 10918 ORDER BY ArrTimeBlk, DestCityMarketID LIMIT 1","hsqls":["SELECT CRSArrTime, DestCityName FROM mytable WHERE Carrier IN ('F9', 'HA', 'AA') AND (DivAirportIDs[1] BETWEEN 15070 AND 10918 OR DivAirportIDs[2] BETWEEN 15070 AND 10918 OR DivAirportIDs[3] BETWEEN 15070 AND 10918 OR DivAirportIDs[4] BETWEEN 15070 AND 10918 OR DivAirportIDs[5] BETWEEN 15070 AND 10918) ORDER BY ArrTimeBlk, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivAirports, SecurityDelay, DestCityMarketID FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16086) AND DivArrDelay BETWEEN 148 AND 191 OR OriginWac > 71 LIMIT 28","hsqls":["SELECT DivAirports, SecurityDelay, DestCityMarketID FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16086) AND DivArrDelay BETWEEN 148 AND 191 OR OriginWac > 71 LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'noodles' OR DestState BETWEEN 'OH' AND 'VT' AND DepartureDelayGroups IN (1, 0, 9) LIMIT 10"}
-{"sql":"SELECT DivAirports, CRSArrTime, DepTimeBlk FROM mytable WHERE DestWac < 72 LIMIT 17","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CRSArrTime, DepTimeBlk FROM mytable WHERE DestWac < 72 LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, Dest, UniqueCarrier FROM mytable WHERE \"Month\" NOT IN (1) OR Dest IN ('MOB', 'MMH', 'HSV', 'TRI', 'GJT') AND DepDel15 BETWEEN -9999 AND -9999 ORDER BY DivDistance, DayOfWeek LIMIT 3","hsqls":["SELECT TaxiIn, Dest, UniqueCarrier FROM mytable WHERE Month NOT IN (1) OR Dest IN ('MOB', 'MMH', 'HSV', 'TRI', 'GJT') AND DepDel15 BETWEEN -9999 AND -9999 ORDER BY DivDistance, DayOfWeek LIMIT 3"]}
-{"sql":"SELECT FirstDepTime, OriginWac, DaysSinceEpoch, MIN(Flights), COUNT(DivDistance), MAX(DivReachedDest) FROM mytable WHERE DestAirportID BETWEEN 10728 AND 14674 OR DivWheelsOns BETWEEN 917 AND 2328 GROUP BY FirstDepTime, OriginWac, DaysSinceEpoch LIMIT 12","hsqls":["SELECT FirstDepTime, OriginWac, DaysSinceEpoch, MIN(Flights), COUNT(DivDistance), MAX(DivReachedDest) FROM mytable WHERE DestAirportID BETWEEN 10728 AND 14674 OR (DivWheelsOns__MV0 BETWEEN 917 AND 2328 OR DivWheelsOns__MV1 BETWEEN 917 AND 2328 OR DivWheelsOns__MV2 BETWEEN 917 AND 2328 OR DivWheelsOns__MV3 BETWEEN 917 AND 2328 OR DivWheelsOns__MV4 BETWEEN 917 AND 2328) GROUP BY FirstDepTime, OriginWac, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivAirports, CRSArrTime, DepTimeBlk FROM mytable WHERE DestWac < 72 LIMIT 17","hsqls":["SELECT DivAirports, CRSArrTime, DepTimeBlk FROM mytable WHERE DestWac < 72 LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, Dest, UniqueCarrier FROM mytable WHERE \"Month\" NOT IN (1) OR Dest IN ('MOB', 'MMH', 'HSV', 'TRI', 'GJT') AND DepDel15 BETWEEN -9999 AND -9999 ORDER BY DivDistance, DayOfWeek LIMIT 3","hsqls":["SELECT TaxiIn, Dest, UniqueCarrier FROM mytable WHERE `Month` NOT IN (1) OR Dest IN ('MOB', 'MMH', 'HSV', 'TRI', 'GJT') AND DepDel15 BETWEEN -9999 AND -9999 ORDER BY DivDistance, DayOfWeek LIMIT 3"]}
+{"sql":"SELECT FirstDepTime, OriginWac, DaysSinceEpoch, MIN(Flights), COUNT(DivDistance), MAX(DivReachedDest) FROM mytable WHERE DestAirportID BETWEEN 10728 AND 14674 OR DivWheelsOns BETWEEN 917 AND 2328 GROUP BY FirstDepTime, OriginWac, DaysSinceEpoch LIMIT 12","hsqls":["SELECT FirstDepTime, OriginWac, DaysSinceEpoch, MIN(Flights), COUNT(DivDistance), MAX(DivReachedDest) FROM mytable WHERE DestAirportID BETWEEN 10728 AND 14674 OR (DivWheelsOns[1] BETWEEN 917 AND 2328 OR DivWheelsOns[2] BETWEEN 917 AND 2328 OR DivWheelsOns[3] BETWEEN 917 AND 2328 OR DivWheelsOns[4] BETWEEN 917 AND 2328 OR DivWheelsOns[5] BETWEEN 917 AND 2328) GROUP BY FirstDepTime, OriginWac, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT AVG(DestAirportSeqID), SUM(DestAirportID) FROM mytable LIMIT 9"}
 {"sql":"SELECT DestWac FROM mytable WHERE DestState BETWEEN 'TX' AND 'PA' LIMIT 21"}
-{"sql":"SELECT Distance FROM mytable WHERE DivDistance >= 109 OR DivWheelsOns BETWEEN 1628 AND 1554 LIMIT 23","hsqls":["SELECT Distance FROM mytable WHERE DivDistance >= 109 OR (DivWheelsOns__MV0 BETWEEN 1628 AND 1554 OR DivWheelsOns__MV1 BETWEEN 1628 AND 1554 OR DivWheelsOns__MV2 BETWEEN 1628 AND 1554 OR DivWheelsOns__MV3 BETWEEN 1628 AND 1554 OR DivWheelsOns__MV4 BETWEEN 1628 AND 1554) LIMIT 10000"]}
+{"sql":"SELECT Distance FROM mytable WHERE DivDistance >= 109 OR DivWheelsOns BETWEEN 1628 AND 1554 LIMIT 23","hsqls":["SELECT Distance FROM mytable WHERE DivDistance >= 109 OR (DivWheelsOns[1] BETWEEN 1628 AND 1554 OR DivWheelsOns[2] BETWEEN 1628 AND 1554 OR DivWheelsOns[3] BETWEEN 1628 AND 1554 OR DivWheelsOns[4] BETWEEN 1628 AND 1554 OR DivWheelsOns[5] BETWEEN 1628 AND 1554) LIMIT 10000"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE WeatherDelay BETWEEN 234 AND 1 AND ArrDel15 BETWEEN -9999 AND 1 OR ArrivalDelayGroups > 7 ORDER BY OriginAirportSeqID, FlightDate LIMIT 28"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (2109, 1158, 1750) AND DivTotalGTimes BETWEEN 45 AND 8 AND ArrDelay BETWEEN 173.0 AND 158.0 LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (2109, 1158, 1750) AND (DivTotalGTimes__MV0 BETWEEN 45 AND 8 OR DivTotalGTimes__MV1 BETWEEN 45 AND 8 OR DivTotalGTimes__MV2 BETWEEN 45 AND 8 OR DivTotalGTimes__MV3 BETWEEN 45 AND 8 OR DivTotalGTimes__MV4 BETWEEN 45 AND 8) AND ArrDelay BETWEEN 173.0 AND 158.0 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (2109, 1158, 1750) AND DivTotalGTimes BETWEEN 45 AND 8 AND ArrDelay BETWEEN 173.0 AND 158.0 LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime NOT IN (2109, 1158, 1750) AND (DivTotalGTimes[1] BETWEEN 45 AND 8 OR DivTotalGTimes[2] BETWEEN 45 AND 8 OR DivTotalGTimes[3] BETWEEN 45 AND 8 OR DivTotalGTimes[4] BETWEEN 45 AND 8 OR DivTotalGTimes[5] BETWEEN 45 AND 8) AND ArrDelay BETWEEN 173.0 AND 158.0 LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, MAX(OriginCityMarketID), MAX(Diverted) FROM mytable WHERE DayOfWeek <= 4 AND ActualElapsedTime BETWEEN 92 AND 275 OR WeatherDelay NOT IN (58) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 7","hsqls":["SELECT ActualElapsedTime, MAX(OriginCityMarketID), MAX(Diverted) FROM mytable WHERE DayOfWeek <= 4 AND ActualElapsedTime BETWEEN 92 AND 275 OR WeatherDelay NOT IN (58) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 7"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE WheelsOn <> 1045 OR Distance >= 1187 AND TaxiOut IN (35, 36) ORDER BY CRSArrTime, ArrDelay, OriginStateName LIMIT 14"}
-{"sql":"SELECT DestStateName, DaysSinceEpoch, COUNT(DepTimeBlk), MIN(\"Month\") FROM mytable WHERE DayofMonth NOT IN (7, 16) GROUP BY DestStateName, DaysSinceEpoch LIMIT 26","hsqls":["SELECT DestStateName, DaysSinceEpoch, COUNT(DepTimeBlk), MIN(Month) FROM mytable WHERE DayofMonth NOT IN (7, 16) GROUP BY DestStateName, DaysSinceEpoch LIMIT 26"]}
+{"sql":"SELECT DestStateName, DaysSinceEpoch, COUNT(DepTimeBlk), MIN(\"Month\") FROM mytable WHERE DayofMonth NOT IN (7, 16) GROUP BY DestStateName, DaysSinceEpoch LIMIT 26","hsqls":["SELECT DestStateName, DaysSinceEpoch, COUNT(DepTimeBlk), MIN(`Month`) FROM mytable WHERE DayofMonth NOT IN (7, 16) GROUP BY DestStateName, DaysSinceEpoch LIMIT 26"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 20"}
 {"sql":"SELECT DepDelay, DestStateFips, Cancelled, MAX(TaxiIn) FROM mytable GROUP BY DepDelay, DestStateFips, Cancelled  ORDER BY DepDelay, DestStateFips, Cancelled LIMIT 20","hsqls":["SELECT DepDelay, DestStateFips, Cancelled, MAX(TaxiIn) FROM mytable GROUP BY DepDelay, DestStateFips, Cancelled  ORDER BY DepDelay, DestStateFips, Cancelled LIMIT 20"]}
 {"sql":"SELECT COUNT(Diverted), MAX(FlightNum) FROM mytable WHERE DivAirportLandings <> 2 LIMIT 25"}
 {"sql":"SELECT NASDelay, DepTimeBlk, COUNT(DepTimeBlk), COUNT(DestWac), MIN(TaxiOut) FROM mytable WHERE WeatherDelay BETWEEN 177 AND 74 GROUP BY NASDelay, DepTimeBlk  ORDER BY NASDelay, DepTimeBlk LIMIT 9","hsqls":["SELECT NASDelay, DepTimeBlk, COUNT(DepTimeBlk), COUNT(DestWac), MIN(TaxiOut) FROM mytable WHERE WeatherDelay BETWEEN 177 AND 74 GROUP BY NASDelay, DepTimeBlk  ORDER BY NASDelay, DepTimeBlk LIMIT 9"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE TailNum NOT IN ('N8612K', 'N918MQ', 'N954WN') OR Quarter BETWEEN 1 AND 1 ORDER BY Dest, DepTimeBlk LIMIT 15","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE TailNum NOT IN ('N8612K', 'N918MQ', 'N954WN') OR Quarter BETWEEN 1 AND 1 ORDER BY Dest, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE TailNum NOT IN ('N8612K', 'N918MQ', 'N954WN') OR Quarter BETWEEN 1 AND 1 ORDER BY Dest, DepTimeBlk LIMIT 15","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE TailNum NOT IN ('N8612K', 'N918MQ', 'N954WN') OR Quarter BETWEEN 1 AND 1 ORDER BY Dest, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState <= 'PA' AND DivArrDelay BETWEEN 207 AND 281 LIMIT 8"}
 {"sql":"SELECT CarrierDelay, SecurityDelay, DepDel15 FROM mytable ORDER BY DepartureDelayGroups, ArrivalDelayGroups LIMIT 13"}
-{"sql":"SELECT TaxiIn, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1538902, 1451202, 1330303) OR DistanceGroup = 5 OR DestState BETWEEN 'WA' AND 'IL' GROUP BY TaxiIn, DaysSinceEpoch LIMIT 11","hsqls":["SELECT TaxiIn, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs__MV1 IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs__MV2 IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs__MV3 IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs__MV4 IN (1538902, 1451202, 1330303)) OR DistanceGroup = 5 OR DestState BETWEEN 'WA' AND 'IL' GROUP BY TaxiIn, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT \"Year\", Cancelled FROM mytable WHERE DivTailNums IN ('N12157') OR CarrierDelay BETWEEN 268 AND 19 LIMIT 3","hsqls":["SELECT Year, Cancelled FROM mytable WHERE (DivTailNums__MV0 IN ('N12157') OR DivTailNums__MV1 IN ('N12157') OR DivTailNums__MV2 IN ('N12157') OR DivTailNums__MV3 IN ('N12157') OR DivTailNums__MV4 IN ('N12157')) OR CarrierDelay BETWEEN 268 AND 19 LIMIT 10000"]}
-{"sql":"SELECT TotalAddGTime, DivTailNums, UniqueCarrier FROM mytable WHERE Distance BETWEEN 978 AND 1092 OR DestAirportID = 13388 OR OriginStateFips BETWEEN 6 AND 5 LIMIT 4","hsqls":["SELECT TotalAddGTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, UniqueCarrier FROM mytable WHERE Distance BETWEEN 978 AND 1092 OR DestAirportID = 13388 OR OriginStateFips BETWEEN 6 AND 5 LIMIT 10000"]}
-{"sql":"SELECT OriginState, DivTotalGTimes FROM mytable ORDER BY OriginState, CarrierDelay, TaxiIn LIMIT 9","hsqls":["SELECT OriginState, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY OriginState, CarrierDelay, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1538902, 1451202, 1330303) OR DistanceGroup = 5 OR DestState BETWEEN 'WA' AND 'IL' GROUP BY TaxiIn, DaysSinceEpoch LIMIT 11","hsqls":["SELECT TaxiIn, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs[2] IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs[3] IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs[4] IN (1538902, 1451202, 1330303) OR DivAirportSeqIDs[5] IN (1538902, 1451202, 1330303)) OR DistanceGroup = 5 OR DestState BETWEEN 'WA' AND 'IL' GROUP BY TaxiIn, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT \"Year\", Cancelled FROM mytable WHERE DivTailNums IN ('N12157') OR CarrierDelay BETWEEN 268 AND 19 LIMIT 3","hsqls":["SELECT Year, Cancelled FROM mytable WHERE (DivTailNums[1] IN ('N12157') OR DivTailNums[2] IN ('N12157') OR DivTailNums[3] IN ('N12157') OR DivTailNums[4] IN ('N12157') OR DivTailNums[5] IN ('N12157')) OR CarrierDelay BETWEEN 268 AND 19 LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DivTailNums, UniqueCarrier FROM mytable WHERE Distance BETWEEN 978 AND 1092 OR DestAirportID = 13388 OR OriginStateFips BETWEEN 6 AND 5 LIMIT 4","hsqls":["SELECT TotalAddGTime, DivTailNums, UniqueCarrier FROM mytable WHERE Distance BETWEEN 978 AND 1092 OR DestAirportID = 13388 OR OriginStateFips BETWEEN 6 AND 5 LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivTotalGTimes FROM mytable ORDER BY OriginState, CarrierDelay, TaxiIn LIMIT 9","hsqls":["SELECT OriginState, DivTotalGTimes FROM mytable ORDER BY OriginState, CarrierDelay, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, OriginWac, DaysSinceEpoch, MIN(DistanceGroup), COUNT(AirTime) FROM mytable GROUP BY DestStateFips, OriginWac, DaysSinceEpoch  ORDER BY DestStateFips, OriginWac, DaysSinceEpoch LIMIT 8","hsqls":["SELECT DestStateFips, OriginWac, DaysSinceEpoch, MIN(DistanceGroup), COUNT(AirTime) FROM mytable GROUP BY DestStateFips, OriginWac, DaysSinceEpoch  ORDER BY DestStateFips, OriginWac, DaysSinceEpoch LIMIT 8"]}
 {"sql":"SELECT COUNT(NASDelay), SUM(DepDelayMinutes) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR OriginAirportID >= 12177 LIMIT 6"}
 {"sql":"SELECT DestStateName, TailNum, MIN(AirTime), COUNT(CarrierDelay), SUM(OriginAirportSeqID) FROM mytable WHERE LateAircraftDelay NOT IN (63, 100) OR OriginCityName NOT IN ('Cody, WY', 'Raleigh/Durham, NC', 'Lawton/Fort Sill, OK', 'Dickinson, ND', 'Worcester, MA') GROUP BY DestStateName, TailNum  ORDER BY DestStateName, TailNum LIMIT 19","hsqls":["SELECT DestStateName, TailNum, MIN(AirTime), COUNT(CarrierDelay), SUM(OriginAirportSeqID) FROM mytable WHERE LateAircraftDelay NOT IN (63, 100) OR OriginCityName NOT IN ('Cody, WY', 'Raleigh/Durham, NC', 'Lawton/Fort Sill, OK', 'Dickinson, ND', 'Worcester, MA') GROUP BY DestStateName, TailNum  ORDER BY DestStateName, TailNum LIMIT 19"]}
-{"sql":"SELECT OriginAirportSeqID, SecurityDelay, DepTime, SUM(WheelsOff) FROM mytable WHERE DivAirportSeqIDs < 1431402 OR Flights IN (1) GROUP BY OriginAirportSeqID, SecurityDelay, DepTime LIMIT 25","hsqls":["SELECT OriginAirportSeqID, SecurityDelay, DepTime, SUM(WheelsOff) FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1431402 OR DivAirportSeqIDs__MV1 < 1431402 OR DivAirportSeqIDs__MV2 < 1431402 OR DivAirportSeqIDs__MV3 < 1431402 OR DivAirportSeqIDs__MV4 < 1431402) OR Flights IN (1) GROUP BY OriginAirportSeqID, SecurityDelay, DepTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, SecurityDelay, DepTime, SUM(WheelsOff) FROM mytable WHERE DivAirportSeqIDs < 1431402 OR Flights IN (1) GROUP BY OriginAirportSeqID, SecurityDelay, DepTime LIMIT 25","hsqls":["SELECT OriginAirportSeqID, SecurityDelay, DepTime, SUM(WheelsOff) FROM mytable WHERE (DivAirportSeqIDs[1] < 1431402 OR DivAirportSeqIDs[2] < 1431402 OR DivAirportSeqIDs[3] < 1431402 OR DivAirportSeqIDs[4] < 1431402 OR DivAirportSeqIDs[5] < 1431402) OR Flights IN (1) GROUP BY OriginAirportSeqID, SecurityDelay, DepTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(DestState), COUNT(WeatherDelay) FROM mytable WHERE OriginStateFips NOT IN (78, 31, 40, 13) AND LateAircraftDelay BETWEEN 232 AND 278 AND NASDelay < 145 LIMIT 19"}
 {"sql":"SELECT CancellationCode FROM mytable WHERE ArrivalDelayGroups NOT IN (3) ORDER BY OriginStateFips, LongestAddGTime, UniqueCarrier LIMIT 15"}
 {"sql":"SELECT DepartureDelayGroups, MIN(CRSElapsedTime) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 9","hsqls":["SELECT DepartureDelayGroups, MIN(CRSElapsedTime) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 9"]}
-{"sql":"SELECT DepDelayMinutes, DestCityName, \"Month\", MIN(\"Year\"), COUNT(Cancelled), MAX(DayOfWeek) FROM mytable WHERE OriginStateName BETWEEN 'Michigan' AND 'Hawaii' AND DepartureDelayGroups BETWEEN 7 AND 8 OR DepartureDelayGroups BETWEEN 11 AND 7 GROUP BY DepDelayMinutes, DestCityName, \"Month\" LIMIT 18","hsqls":["SELECT DepDelayMinutes, DestCityName, Month, MIN(Year), COUNT(Cancelled), MAX(DayOfWeek) FROM mytable WHERE OriginStateName BETWEEN 'Michigan' AND 'Hawaii' AND DepartureDelayGroups BETWEEN 7 AND 8 OR DepartureDelayGroups BETWEEN 11 AND 7 GROUP BY DepDelayMinutes, DestCityName, Month LIMIT 18"]}
-{"sql":"SELECT AVG(OriginWac), MAX(DistanceGroup), MAX(Quarter) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND NASDelay IN (39) OR DivWheelsOffs <= 1742 LIMIT 25","hsqls":["SELECT AVG(OriginWac), MAX(DistanceGroup), MAX(Quarter)  FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND NASDelay IN (39) OR (DivWheelsOffs__MV0 <= 1742 OR DivWheelsOffs__MV1 <= 1742 OR DivWheelsOffs__MV2 <= 1742 OR DivWheelsOffs__MV3 <= 1742 OR DivWheelsOffs__MV4 <= 1742) LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DestCityName, \"Month\", MIN(\"Year\"), COUNT(Cancelled), MAX(DayOfWeek) FROM mytable WHERE OriginStateName BETWEEN 'Michigan' AND 'Hawaii' AND DepartureDelayGroups BETWEEN 7 AND 8 OR DepartureDelayGroups BETWEEN 11 AND 7 GROUP BY DepDelayMinutes, DestCityName, \"Month\" LIMIT 18","hsqls":["SELECT DepDelayMinutes, DestCityName, Month, MIN(`Year`), COUNT(Cancelled), MAX(DayOfWeek) FROM mytable WHERE OriginStateName BETWEEN 'Michigan' AND 'Hawaii' AND DepartureDelayGroups BETWEEN 7 AND 8 OR DepartureDelayGroups BETWEEN 11 AND 7 GROUP BY DepDelayMinutes, DestCityName, `Month` LIMIT 18"]}
+{"sql":"SELECT AVG(OriginWac), MAX(DistanceGroup), MAX(Quarter) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND NASDelay IN (39) OR DivWheelsOffs <= 1742 LIMIT 25","hsqls":["SELECT AVG(OriginWac), MAX(DistanceGroup), MAX(Quarter)  FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND NASDelay IN (39) OR (DivWheelsOffs[1] <= 1742 OR DivWheelsOffs[2] <= 1742 OR DivWheelsOffs[3] <= 1742 OR DivWheelsOffs[4] <= 1742 OR DivWheelsOffs[5] <= 1742) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, ActualElapsedTime, AVG(Flights) FROM mytable WHERE ArrDel15 = 0 OR DayOfWeek BETWEEN 1 AND 2 AND DestState <= 'IL' GROUP BY DivReachedDest, ActualElapsedTime  ORDER BY DivReachedDest, ActualElapsedTime LIMIT 16","hsqls":["SELECT DivReachedDest, ActualElapsedTime, AVG(Flights) FROM mytable WHERE ArrDel15 = 0 OR DayOfWeek BETWEEN 1 AND 2 AND DestState <= 'IL' GROUP BY DivReachedDest, ActualElapsedTime  ORDER BY DivReachedDest, ActualElapsedTime LIMIT 16"]}
 {"sql":"SELECT MIN(DestCityMarketID) FROM mytable LIMIT 4"}
 {"sql":"SELECT AVG(LongestAddGTime), SUM(DestStateFips) FROM mytable WHERE DivReachedDest <= 0 LIMIT 22"}
 {"sql":"SELECT DestState, DayofMonth, DivArrDelay FROM mytable WHERE TotalAddGTime IN (94) OR DepTime >= 947 ORDER BY DestWac, Quarter LIMIT 17"}
 {"sql":"SELECT TotalAddGTime, CRSDepTime, COUNT(UniqueCarrier) FROM mytable WHERE ArrDelayMinutes IN (18.0, 126.0) AND DayofMonth BETWEEN 15 AND 17 GROUP BY TotalAddGTime, CRSDepTime  ORDER BY TotalAddGTime, CRSDepTime LIMIT 6","hsqls":["SELECT TotalAddGTime, CRSDepTime, COUNT(UniqueCarrier) FROM mytable WHERE ArrDelayMinutes IN (18.0, 126.0) AND DayofMonth BETWEEN 15 AND 17 GROUP BY TotalAddGTime, CRSDepTime  ORDER BY TotalAddGTime, CRSDepTime LIMIT 6"]}
 {"sql":"SELECT Diverted, CRSDepTime, SUM(TaxiOut), MAX(WeatherDelay) FROM mytable WHERE DestCityName BETWEEN 'Fort Wayne, IN' AND 'El Paso, TX' OR ArrTime NOT IN (2236) AND DayofMonth IN (14) GROUP BY Diverted, CRSDepTime  ORDER BY Diverted, CRSDepTime LIMIT 14","hsqls":["SELECT Diverted, CRSDepTime, SUM(TaxiOut), MAX(WeatherDelay) FROM mytable WHERE DestCityName BETWEEN 'Fort Wayne, IN' AND 'El Paso, TX' OR ArrTime NOT IN (2236) AND DayofMonth IN (14) GROUP BY Diverted, CRSDepTime  ORDER BY Diverted, CRSDepTime LIMIT 14"]}
-{"sql":"SELECT FirstDepTime, DivAirportIDs FROM mytable WHERE NASDelay IN (35) ORDER BY DestStateName LIMIT 26","hsqls":["SELECT FirstDepTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE NASDelay IN (35) ORDER BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, MIN(\"Year\"), SUM(DistanceGroup) FROM mytable GROUP BY LateAircraftDelay LIMIT 1","hsqls":["SELECT LateAircraftDelay, MIN(Year), SUM(DistanceGroup) FROM mytable GROUP BY LateAircraftDelay LIMIT 1"]}
+{"sql":"SELECT FirstDepTime, DivAirportIDs FROM mytable WHERE NASDelay IN (35) ORDER BY DestStateName LIMIT 26","hsqls":["SELECT FirstDepTime, DivAirportIDs FROM mytable WHERE NASDelay IN (35) ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, MIN(\"Year\"), SUM(DistanceGroup) FROM mytable GROUP BY LateAircraftDelay LIMIT 1","hsqls":["SELECT LateAircraftDelay, MIN(`Year`), SUM(DistanceGroup) FROM mytable GROUP BY LateAircraftDelay LIMIT 1"]}
 {"sql":"SELECT LongestAddGTime, DestAirportSeqID, ArrDel15 FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 34 AND AirlineID <= 20437 AND DestAirportSeqID >= 1043102 ORDER BY FlightNum LIMIT 4"}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE DaysSinceEpoch < 16082 AND DivLongestGTimes = 20.0 ORDER BY OriginAirportID LIMIT 11","hsqls":["SELECT DepTimeBlk FROM mytable WHERE DaysSinceEpoch < 16082 AND (DivLongestGTimes__MV0 = 20.0 OR DivLongestGTimes__MV1 = 20.0 OR DivLongestGTimes__MV2 = 20.0 OR DivLongestGTimes__MV3 = 20.0 OR DivLongestGTimes__MV4 = 20.0) ORDER BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE DaysSinceEpoch < 16082 AND DivLongestGTimes = 20.0 ORDER BY OriginAirportID LIMIT 11","hsqls":["SELECT DepTimeBlk FROM mytable WHERE DaysSinceEpoch < 16082 AND (DivLongestGTimes[1] = 20.0 OR DivLongestGTimes[2] = 20.0 OR DivLongestGTimes[3] = 20.0 OR DivLongestGTimes[4] = 20.0 OR DivLongestGTimes[5] = 20.0) ORDER BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT \"Year\", LateAircraftDelay, DivActualElapsedTime FROM mytable ORDER BY FlightNum, ArrDelayMinutes, ArrDel15 LIMIT 24","hsqls":["SELECT Year, LateAircraftDelay, DivActualElapsedTime FROM mytable ORDER BY FlightNum, ArrDelayMinutes, ArrDel15 LIMIT 24"]}
-{"sql":"SELECT DepDel15, AVG(\"Year\"), SUM(DistanceGroup), MAX(OriginAirportID) FROM mytable WHERE ArrDel15 < 1 GROUP BY DepDel15 LIMIT 19","hsqls":["SELECT DepDel15, AVG(Year), SUM(DistanceGroup), MAX(OriginAirportID) FROM mytable WHERE ArrDel15 < 1 GROUP BY DepDel15 LIMIT 19"]}
+{"sql":"SELECT DepDel15, AVG(\"Year\"), SUM(DistanceGroup), MAX(OriginAirportID) FROM mytable WHERE ArrDel15 < 1 GROUP BY DepDel15 LIMIT 19","hsqls":["SELECT DepDel15, AVG(`Year`), SUM(DistanceGroup), MAX(OriginAirportID) FROM mytable WHERE ArrDel15 < 1 GROUP BY DepDel15 LIMIT 19"]}
 {"sql":"SELECT Dest FROM mytable WHERE OriginState NOT IN ('OK') AND OriginCityName < 'Brainerd, MN' ORDER BY WheelsOff LIMIT 16"}
 {"sql":"SELECT AVG(TotalAddGTime) FROM mytable WHERE NASDelay NOT IN (146) OR LongestAddGTime = 27 LIMIT 3"}
 {"sql":"SELECT OriginAirportSeqID, DestState, WheelsOn FROM mytable ORDER BY Carrier, OriginCityName, DivArrDelay LIMIT 24"}
 {"sql":"SELECT DepTimeBlk, CRSElapsedTime FROM mytable WHERE TaxiIn BETWEEN 24 AND 80 OR CRSElapsedTime BETWEEN 74 AND 196 ORDER BY OriginAirportSeqID, Dest, ArrDelay LIMIT 4"}
 {"sql":"SELECT OriginStateFips, SecurityDelay, DestStateName, SUM(CRSDepTime), MAX(FlightNum), AVG(DepartureDelayGroups) FROM mytable WHERE Origin >= 'CLT' GROUP BY OriginStateFips, SecurityDelay, DestStateName  ORDER BY OriginStateFips, SecurityDelay, DestStateName LIMIT 29","hsqls":["SELECT OriginStateFips, SecurityDelay, DestStateName, SUM(CRSDepTime), MAX(FlightNum), AVG(DepartureDelayGroups) FROM mytable WHERE Origin >= 'CLT' GROUP BY OriginStateFips, SecurityDelay, DestStateName  ORDER BY OriginStateFips, SecurityDelay, DestStateName LIMIT 29"]}
-{"sql":"SELECT FlightNum, DepDelayMinutes, ActualElapsedTime, COUNT(TaxiIn) FROM mytable WHERE DivWheelsOffs IN (1349, 844) AND CRSElapsedTime BETWEEN 54 AND 154 GROUP BY FlightNum, DepDelayMinutes, ActualElapsedTime LIMIT 6","hsqls":["SELECT FlightNum, DepDelayMinutes, ActualElapsedTime, COUNT(TaxiIn) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1349, 844) OR DivWheelsOffs__MV1 IN (1349, 844) OR DivWheelsOffs__MV2 IN (1349, 844) OR DivWheelsOffs__MV3 IN (1349, 844) OR DivWheelsOffs__MV4 IN (1349, 844)) AND CRSElapsedTime BETWEEN 54 AND 154 GROUP BY FlightNum, DepDelayMinutes, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DepDelayMinutes, ActualElapsedTime, COUNT(TaxiIn) FROM mytable WHERE DivWheelsOffs IN (1349, 844) AND CRSElapsedTime BETWEEN 54 AND 154 GROUP BY FlightNum, DepDelayMinutes, ActualElapsedTime LIMIT 6","hsqls":["SELECT FlightNum, DepDelayMinutes, ActualElapsedTime, COUNT(TaxiIn) FROM mytable WHERE (DivWheelsOffs[1] IN (1349, 844) OR DivWheelsOffs[2] IN (1349, 844) OR DivWheelsOffs[3] IN (1349, 844) OR DivWheelsOffs[4] IN (1349, 844) OR DivWheelsOffs[5] IN (1349, 844)) AND CRSElapsedTime BETWEEN 54 AND 154 GROUP BY FlightNum, DepDelayMinutes, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginCityName, DivArrDelay FROM mytable WHERE WheelsOn > 549 ORDER BY \"Year\", OriginStateName LIMIT 25","hsqls":["SELECT OriginCityName, DivArrDelay FROM mytable WHERE WheelsOn > 549 ORDER BY Year, OriginStateName LIMIT 25"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DepDelay <= 206.0 AND DistanceGroup <> 2 OR DivActualElapsedTime < 292 ORDER BY WeatherDelay LIMIT 18"}
 {"sql":"SELECT CarrierDelay, ActualElapsedTime FROM mytable WHERE Dest BETWEEN 'FOE' AND 'VPS' OR DayofMonth <= 4 ORDER BY FlightDate, AirTime LIMIT 19"}
@@ -6497,157 +6497,157 @@
 {"sql":"SELECT \"Year\", SecurityDelay, NASDelay, MAX(DestAirportSeqID), SUM(OriginAirportSeqID), COUNT(TailNum) FROM mytable WHERE AirlineID BETWEEN 20409 AND 19690 OR CancellationCode BETWEEN 'C' AND 'C' GROUP BY \"Year\", SecurityDelay, NASDelay","hsqls":["SELECT Year, SecurityDelay, NASDelay, MAX(DestAirportSeqID), SUM(OriginAirportSeqID), COUNT(TailNum) FROM mytable WHERE AirlineID BETWEEN 20409 AND 19690 OR CancellationCode BETWEEN 'C' AND 'C' GROUP BY Year, SecurityDelay, NASDelay"]}
 {"sql":"SELECT OriginCityMarketID FROM mytable ORDER BY TaxiOut, DestCityName LIMIT 19"}
 {"sql":"SELECT WheelsOn FROM mytable WHERE CarrierDelay IN (26) AND WheelsOff IN (2019, 829, 1956) LIMIT 2"}
-{"sql":"SELECT ArrDel15, DivAirportIDs FROM mytable ORDER BY OriginState, OriginCityMarketID, DestCityName LIMIT 21","hsqls":["SELECT ArrDel15, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY OriginState, OriginCityMarketID, DestCityName LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DivAirportIDs FROM mytable ORDER BY OriginState, OriginCityMarketID, DestCityName LIMIT 21","hsqls":["SELECT ArrDel15, DivAirportIDs FROM mytable ORDER BY OriginState, OriginCityMarketID, DestCityName LIMIT 10000"]}
 {"sql":"SELECT ArrTime, TailNum FROM mytable WHERE OriginWac NOT IN (74, 11, 85) AND CRSArrTime > 1054 AND CRSElapsedTime NOT IN (391, 297, 372) ORDER BY DestState, OriginCityName LIMIT 19"}
-{"sql":"SELECT ArrTime FROM mytable WHERE \"Month\" < 1 AND DivAirportIDs BETWEEN 14314 AND 13244 OR DivDistance BETWEEN 65 AND 632 LIMIT 3","hsqls":["SELECT ArrTime FROM mytable WHERE Month < 1 AND (DivAirportIDs__MV0 BETWEEN 14314 AND 13244 OR DivAirportIDs__MV1 BETWEEN 14314 AND 13244 OR DivAirportIDs__MV2 BETWEEN 14314 AND 13244 OR DivAirportIDs__MV3 BETWEEN 14314 AND 13244 OR DivAirportIDs__MV4 BETWEEN 14314 AND 13244) OR DivDistance BETWEEN 65 AND 632 LIMIT 10000"]}
+{"sql":"SELECT ArrTime FROM mytable WHERE \"Month\" < 1 AND DivAirportIDs BETWEEN 14314 AND 13244 OR DivDistance BETWEEN 65 AND 632 LIMIT 3","hsqls":["SELECT ArrTime FROM mytable WHERE `Month` < 1 AND (DivAirportIDs[1] BETWEEN 14314 AND 13244 OR DivAirportIDs[2] BETWEEN 14314 AND 13244 OR DivAirportIDs[3] BETWEEN 14314 AND 13244 OR DivAirportIDs[4] BETWEEN 14314 AND 13244 OR DivAirportIDs[5] BETWEEN 14314 AND 13244) OR DivDistance BETWEEN 65 AND 632 LIMIT 10000"]}
 {"sql":"SELECT DivActualElapsedTime, MAX(WheelsOn) FROM mytable WHERE TailNum IN ('N910DE', 'N829AW', 'N458UA') GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 5","hsqls":["SELECT DivActualElapsedTime, MAX(WheelsOn) FROM mytable WHERE TailNum IN ('N910DE', 'N829AW', 'N458UA') GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 5"]}
-{"sql":"SELECT DivReachedDest, DestCityMarketID, COUNT(*) FROM mytable WHERE DivWheelsOns IN (1602, 2144, 2022, 632, 938) OR DivActualElapsedTime IN (453, 406, 487, 295) GROUP BY DivReachedDest, DestCityMarketID","hsqls":["SELECT DivReachedDest, DestCityMarketID, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns__MV1 IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns__MV2 IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns__MV3 IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns__MV4 IN (1602, 2144, 2022, 632, 938)) OR DivActualElapsedTime IN (453, 406, 487, 295) GROUP BY DivReachedDest, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DestCityMarketID, COUNT(*) FROM mytable WHERE DivWheelsOns IN (1602, 2144, 2022, 632, 938) OR DivActualElapsedTime IN (453, 406, 487, 295) GROUP BY DivReachedDest, DestCityMarketID","hsqls":["SELECT DivReachedDest, DestCityMarketID, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns[2] IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns[3] IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns[4] IN (1602, 2144, 2022, 632, 938) OR DivWheelsOns[5] IN (1602, 2144, 2022, 632, 938)) OR DivActualElapsedTime IN (453, 406, 487, 295) GROUP BY DivReachedDest, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT NASDelay, OriginStateName FROM mytable ORDER BY Cancelled, DestCityMarketID, OriginAirportID LIMIT 8"}
-{"sql":"SELECT OriginAirportID, MAX(Quarter), SUM(\"Year\"), MAX(ArrDelayMinutes) FROM mytable WHERE Flights NOT IN (1) OR TaxiOut < 39 OR DistanceGroup BETWEEN 6 AND 8 GROUP BY OriginAirportID LIMIT 7","hsqls":["SELECT OriginAirportID, MAX(Quarter), SUM(Year), MAX(ArrDelayMinutes) FROM mytable WHERE Flights NOT IN (1) OR TaxiOut < 39 OR DistanceGroup BETWEEN 6 AND 8 GROUP BY OriginAirportID LIMIT 7"]}
+{"sql":"SELECT OriginAirportID, MAX(Quarter), SUM(\"Year\"), MAX(ArrDelayMinutes) FROM mytable WHERE Flights NOT IN (1) OR TaxiOut < 39 OR DistanceGroup BETWEEN 6 AND 8 GROUP BY OriginAirportID LIMIT 7","hsqls":["SELECT OriginAirportID, MAX(Quarter), SUM(`Year`), MAX(ArrDelayMinutes) FROM mytable WHERE Flights NOT IN (1) OR TaxiOut < 39 OR DistanceGroup BETWEEN 6 AND 8 GROUP BY OriginAirportID LIMIT 7"]}
 {"sql":"SELECT CRSElapsedTime, MAX(WheelsOff), COUNT(DepartureDelayGroups), AVG(Distance) FROM mytable GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 12","hsqls":["SELECT CRSElapsedTime, MAX(WheelsOff), COUNT(DepartureDelayGroups), AVG(Distance) FROM mytable GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 12"]}
 {"sql":"SELECT ArrTime, DestAirportID, DayofMonth FROM mytable ORDER BY DestState, DivArrDelay, OriginStateName LIMIT 26"}
-{"sql":"SELECT \"Month\", COUNT(DepDelay), COUNT(TailNum), SUM(ArrTime) FROM mytable WHERE \"Year\" = 2014 OR DepDelayMinutes BETWEEN 202.0 AND 99.0 AND LongestAddGTime < 23 GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, COUNT(DepDelay), COUNT(TailNum), SUM(ArrTime) FROM mytable WHERE Year = 2014 OR DepDelayMinutes BETWEEN 202.0 AND 99.0 AND LongestAddGTime < 23 GROUP BY Month LIMIT 10"]}
-{"sql":"SELECT FlightNum FROM mytable WHERE CRSArrTime BETWEEN 722 AND 2115 OR DivReachedDest > 0 AND DivAirportIDs BETWEEN 14512 AND 12915 ORDER BY SecurityDelay, OriginStateName LIMIT 11","hsqls":["SELECT FlightNum FROM mytable WHERE CRSArrTime BETWEEN 722 AND 2115 OR DivReachedDest > 0 AND (DivAirportIDs__MV0 BETWEEN 14512 AND 12915 OR DivAirportIDs__MV1 BETWEEN 14512 AND 12915 OR DivAirportIDs__MV2 BETWEEN 14512 AND 12915 OR DivAirportIDs__MV3 BETWEEN 14512 AND 12915 OR DivAirportIDs__MV4 BETWEEN 14512 AND 12915) ORDER BY SecurityDelay, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT \"Month\", COUNT(DepDelay), COUNT(TailNum), SUM(ArrTime) FROM mytable WHERE \"Year\" = 2014 OR DepDelayMinutes BETWEEN 202.0 AND 99.0 AND LongestAddGTime < 23 GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, COUNT(DepDelay), COUNT(TailNum), SUM(ArrTime) FROM mytable WHERE `Year` = 2014 OR DepDelayMinutes BETWEEN 202.0 AND 99.0 AND LongestAddGTime < 23 GROUP BY `Month` LIMIT 10"]}
+{"sql":"SELECT FlightNum FROM mytable WHERE CRSArrTime BETWEEN 722 AND 2115 OR DivReachedDest > 0 AND DivAirportIDs BETWEEN 14512 AND 12915 ORDER BY SecurityDelay, OriginStateName LIMIT 11","hsqls":["SELECT FlightNum FROM mytable WHERE CRSArrTime BETWEEN 722 AND 2115 OR DivReachedDest > 0 AND (DivAirportIDs[1] BETWEEN 14512 AND 12915 OR DivAirportIDs[2] BETWEEN 14512 AND 12915 OR DivAirportIDs[3] BETWEEN 14512 AND 12915 OR DivAirportIDs[4] BETWEEN 14512 AND 12915 OR DivAirportIDs[5] BETWEEN 14512 AND 12915) ORDER BY SecurityDelay, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT \"Month\", UniqueCarrier FROM mytable ORDER BY DistanceGroup LIMIT 25","hsqls":["SELECT Month, UniqueCarrier FROM mytable ORDER BY DistanceGroup LIMIT 25"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE TotalAddGTime IN (32, 19) OR TailNum NOT IN ('N563UA', 'N3749D', 'N216AG', 'N543US', 'N829UA') OR DivLongestGTimes = 15.0 LIMIT 18","hsqls":["SELECT COUNT(*) FROM mytable WHERE TotalAddGTime IN (32, 19) OR TailNum NOT IN ('N563UA', 'N3749D', 'N216AG', 'N543US', 'N829UA') OR (DivLongestGTimes__MV0 = 15.0 OR DivLongestGTimes__MV1 = 15.0 OR DivLongestGTimes__MV2 = 15.0 OR DivLongestGTimes__MV3 = 15.0 OR DivLongestGTimes__MV4 = 15.0) LIMIT 10000"]}
-{"sql":"SELECT TailNum, Dest, MAX(DistanceGroup), MAX(LongestAddGTime) FROM mytable WHERE TailNum BETWEEN 'N357NB' AND 'N370SW' OR \"Year\" BETWEEN 2014 AND 2014 GROUP BY TailNum, Dest LIMIT 7","hsqls":["SELECT TailNum, Dest, MAX(DistanceGroup), MAX(LongestAddGTime) FROM mytable WHERE TailNum BETWEEN 'N357NB' AND 'N370SW' OR Year BETWEEN 2014 AND 2014 GROUP BY TailNum, Dest LIMIT 7"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE TotalAddGTime IN (32, 19) OR TailNum NOT IN ('N563UA', 'N3749D', 'N216AG', 'N543US', 'N829UA') OR DivLongestGTimes = 15.0 LIMIT 18","hsqls":["SELECT COUNT(*) FROM mytable WHERE TotalAddGTime IN (32, 19) OR TailNum NOT IN ('N563UA', 'N3749D', 'N216AG', 'N543US', 'N829UA') OR (DivLongestGTimes[1] = 15.0 OR DivLongestGTimes[2] = 15.0 OR DivLongestGTimes[3] = 15.0 OR DivLongestGTimes[4] = 15.0 OR DivLongestGTimes[5] = 15.0) LIMIT 10000"]}
+{"sql":"SELECT TailNum, Dest, MAX(DistanceGroup), MAX(LongestAddGTime) FROM mytable WHERE TailNum BETWEEN 'N357NB' AND 'N370SW' OR \"Year\" BETWEEN 2014 AND 2014 GROUP BY TailNum, Dest LIMIT 7","hsqls":["SELECT TailNum, Dest, MAX(DistanceGroup), MAX(LongestAddGTime) FROM mytable WHERE TailNum BETWEEN 'N357NB' AND 'N370SW' OR `Year` BETWEEN 2014 AND 2014 GROUP BY TailNum, Dest LIMIT 7"]}
 {"sql":"SELECT OriginAirportSeqID, DestWac, OriginWac, COUNT(*) FROM mytable WHERE DestWac NOT IN (44, 93, 91, 62) AND AirTime BETWEEN 213 AND 128 GROUP BY OriginAirportSeqID, DestWac, OriginWac  ORDER BY OriginAirportSeqID, DestWac, OriginWac LIMIT 24","hsqls":["SELECT OriginAirportSeqID, DestWac, OriginWac, COUNT(*) FROM mytable WHERE DestWac NOT IN (44, 93, 91, 62) AND AirTime BETWEEN 213 AND 128 GROUP BY OriginAirportSeqID, DestWac, OriginWac  ORDER BY OriginAirportSeqID, DestWac, OriginWac LIMIT 24"]}
 {"sql":"SELECT DestStateFips, TotalAddGTime, MAX(DepTime), COUNT(LongestAddGTime), AVG(AirlineID) FROM mytable WHERE DestAirportSeqID = 1177502 OR DepTimeBlk <> '1700-1759' GROUP BY DestStateFips, TotalAddGTime  ORDER BY DestStateFips, TotalAddGTime LIMIT 14","hsqls":["SELECT DestStateFips, TotalAddGTime, MAX(DepTime), COUNT(LongestAddGTime), AVG(AirlineID) FROM mytable WHERE DestAirportSeqID = 1177502 OR DepTimeBlk <> '1700-1759' GROUP BY DestStateFips, TotalAddGTime  ORDER BY DestStateFips, TotalAddGTime LIMIT 14"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Distance BETWEEN 1165 AND 323 OR OriginWac BETWEEN 64 AND 83 OR DestState NOT IN ('CO') LIMIT 25"}
-{"sql":"SELECT DivWheelsOns, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE TaxiIn BETWEEN 35 AND 40 ORDER BY TailNum, Origin LIMIT 15","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE TaxiIn BETWEEN 35 AND 40 ORDER BY TailNum, Origin LIMIT 10000"]}
-{"sql":"SELECT OriginState FROM mytable WHERE DivAirportIDs > 11433 OR Carrier BETWEEN 'WN' AND 'WN' LIMIT 25","hsqls":["SELECT OriginState FROM mytable WHERE (DivAirportIDs__MV0 > 11433 OR DivAirportIDs__MV1 > 11433 OR DivAirportIDs__MV2 > 11433 OR DivAirportIDs__MV3 > 11433 OR DivAirportIDs__MV4 > 11433) OR Carrier BETWEEN 'WN' AND 'WN' LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE TaxiIn BETWEEN 35 AND 40 ORDER BY TailNum, Origin LIMIT 15","hsqls":["SELECT DivWheelsOns, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE TaxiIn BETWEEN 35 AND 40 ORDER BY TailNum, Origin LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE DivAirportIDs > 11433 OR Carrier BETWEEN 'WN' AND 'WN' LIMIT 25","hsqls":["SELECT OriginState FROM mytable WHERE (DivAirportIDs[1] > 11433 OR DivAirportIDs[2] > 11433 OR DivAirportIDs[3] > 11433 OR DivAirportIDs[4] > 11433 OR DivAirportIDs[5] > 11433) OR Carrier BETWEEN 'WN' AND 'WN' LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch, DayOfWeek FROM mytable WHERE DepDelay NOT IN (51.0, 61.0, 45.0, 331.0) ORDER BY TaxiOut LIMIT 13"}
 {"sql":"SELECT DestStateName, OriginStateName, AVG(Cancelled), SUM(OriginStateFips) FROM mytable GROUP BY DestStateName, OriginStateName  ORDER BY DestStateName, OriginStateName LIMIT 28","hsqls":["SELECT DestStateName, OriginStateName, AVG(Cancelled), SUM(OriginStateFips) FROM mytable GROUP BY DestStateName, OriginStateName  ORDER BY DestStateName, OriginStateName LIMIT 28"]}
 {"sql":"SELECT \"Year\", OriginCityMarketID, COUNT(OriginAirportID), AVG(ArrDelay) FROM mytable WHERE Origin BETWEEN 'CMH' AND 'CWA' OR DepartureDelayGroups NOT IN (0, 8) OR DayofMonth >= 18 GROUP BY \"Year\", OriginCityMarketID LIMIT 2","hsqls":["SELECT Year, OriginCityMarketID, COUNT(OriginAirportID), AVG(ArrDelay) FROM mytable WHERE Origin BETWEEN 'CMH' AND 'CWA' OR DepartureDelayGroups NOT IN (0, 8) OR DayofMonth >= 18 GROUP BY Year, OriginCityMarketID LIMIT 2"]}
 {"sql":"SELECT OriginState FROM mytable ORDER BY Flights LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiOut NOT IN (66, 78, 121, 9, 60) LIMIT 12"}
 {"sql":"SELECT OriginState, DayofMonth FROM mytable WHERE WeatherDelay BETWEEN 132 AND 5 AND Carrier NOT IN ('DL', 'MQ', 'AA') AND TaxiIn NOT IN (2, 20) ORDER BY DestStateName, DestAirportID, WheelsOn LIMIT 10"}
-{"sql":"SELECT Quarter, ArrTime, DivTailNums FROM mytable WHERE CRSArrTime IN (1351, 1338, 2203, 2105) AND FlightDate > '2014-01-27' LIMIT 12","hsqls":["SELECT Quarter, ArrTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE CRSArrTime IN (1351, 1338, 2203, 2105) AND FlightDate > '2014-01-27' LIMIT 10000"]}
+{"sql":"SELECT Quarter, ArrTime, DivTailNums FROM mytable WHERE CRSArrTime IN (1351, 1338, 2203, 2105) AND FlightDate > '2014-01-27' LIMIT 12","hsqls":["SELECT Quarter, ArrTime, DivTailNums FROM mytable WHERE CRSArrTime IN (1351, 1338, 2203, 2105) AND FlightDate > '2014-01-27' LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, DivAirportLandings FROM mytable WHERE DivDistance NOT IN (175) ORDER BY DivReachedDest, TotalAddGTime LIMIT 23"}
 {"sql":"SELECT AirTime, COUNT(CRSElapsedTime) FROM mytable WHERE DepDelayMinutes NOT IN (12.0, 4.0, 104.0) AND DepartureDelayGroups BETWEEN 5 AND 0 OR TaxiIn BETWEEN 84 AND 72 GROUP BY AirTime  ORDER BY AirTime LIMIT 1","hsqls":["SELECT AirTime, COUNT(CRSElapsedTime) FROM mytable WHERE DepDelayMinutes NOT IN (12.0, 4.0, 104.0) AND DepartureDelayGroups BETWEEN 5 AND 0 OR TaxiIn BETWEEN 84 AND 72 GROUP BY AirTime  ORDER BY AirTime LIMIT 1"]}
 {"sql":"SELECT ArrDel15, UniqueCarrier FROM mytable WHERE DestCityMarketID BETWEEN 31648 AND 34711 LIMIT 10"}
 {"sql":"SELECT ArrDel15, Origin FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 ORDER BY DepTime LIMIT 14"}
 {"sql":"SELECT SUM(Flights), COUNT(CRSElapsedTime) FROM mytable LIMIT 24"}
-{"sql":"SELECT LongestAddGTime, Dest, AVG(WeatherDelay), COUNT(DepDelay) FROM mytable WHERE DivWheelsOns >= 2104 OR DestCityMarketID <= 32016 GROUP BY LongestAddGTime, Dest LIMIT 28","hsqls":["SELECT LongestAddGTime, Dest, AVG(WeatherDelay), COUNT(DepDelay) FROM mytable WHERE (DivWheelsOns__MV0 >= 2104 OR DivWheelsOns__MV1 >= 2104 OR DivWheelsOns__MV2 >= 2104 OR DivWheelsOns__MV3 >= 2104 OR DivWheelsOns__MV4 >= 2104) OR DestCityMarketID <= 32016 GROUP BY LongestAddGTime, Dest LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, AirlineID FROM mytable WHERE DayOfWeek <> 3 OR FlightDate BETWEEN '2014-01-10' AND '2014-01-28' ORDER BY FlightDate, UniqueCarrier LIMIT 19","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, AirlineID FROM mytable WHERE DayOfWeek <> 3 OR FlightDate BETWEEN '2014-01-10' AND '2014-01-28' ORDER BY FlightDate, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, DivAirportIDs, WheelsOn FROM mytable ORDER BY Cancelled, Origin LIMIT 17","hsqls":["SELECT OriginCityMarketID, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, WheelsOn FROM mytable ORDER BY Cancelled, Origin LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Dest, AVG(WeatherDelay), COUNT(DepDelay) FROM mytable WHERE DivWheelsOns >= 2104 OR DestCityMarketID <= 32016 GROUP BY LongestAddGTime, Dest LIMIT 28","hsqls":["SELECT LongestAddGTime, Dest, AVG(WeatherDelay), COUNT(DepDelay) FROM mytable WHERE (DivWheelsOns[1] >= 2104 OR DivWheelsOns[2] >= 2104 OR DivWheelsOns[3] >= 2104 OR DivWheelsOns[4] >= 2104 OR DivWheelsOns[5] >= 2104) OR DestCityMarketID <= 32016 GROUP BY LongestAddGTime, Dest LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, AirlineID FROM mytable WHERE DayOfWeek <> 3 OR FlightDate BETWEEN '2014-01-10' AND '2014-01-28' ORDER BY FlightDate, UniqueCarrier LIMIT 19","hsqls":["SELECT DivLongestGTimes, AirlineID FROM mytable WHERE DayOfWeek <> 3 OR FlightDate BETWEEN '2014-01-10' AND '2014-01-28' ORDER BY FlightDate, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivAirportIDs, WheelsOn FROM mytable ORDER BY Cancelled, Origin LIMIT 17","hsqls":["SELECT OriginCityMarketID, DivAirportIDs, WheelsOn FROM mytable ORDER BY Cancelled, Origin LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DestAirportSeqID, ArrDelayMinutes FROM mytable ORDER BY DistanceGroup LIMIT 28"}
 {"sql":"SELECT DestWac, LateAircraftDelay, DestStateName FROM mytable WHERE LateAircraftDelay >= 157 ORDER BY OriginState, CancellationCode, DayofMonth LIMIT 17"}
 {"sql":"SELECT COUNT(ArrDelayMinutes), AVG(DivReachedDest), MIN(DepTime) FROM mytable WHERE DaysSinceEpoch BETWEEN 16098 AND 16091 LIMIT 20"}
 {"sql":"SELECT FirstDepTime, ArrDelay, DestCityMarketID FROM mytable WHERE ArrDel15 >= 1 ORDER BY OriginStateFips, FlightNum, DepDelayMinutes LIMIT 23"}
 {"sql":"SELECT Carrier, DestStateFips FROM mytable ORDER BY FlightDate LIMIT 15"}
-{"sql":"SELECT \"Year\", ActualElapsedTime, DivArrDelay FROM mytable WHERE DepTimeBlk NOT IN ('2000-2059', '1600-1659', '0700-0759', '1500-1559', '1800-1859') ORDER BY OriginStateFips, \"Month\" LIMIT 10","hsqls":["SELECT Year, ActualElapsedTime, DivArrDelay FROM mytable WHERE DepTimeBlk NOT IN ('2000-2059', '1600-1659', '0700-0759', '1500-1559', '1800-1859') ORDER BY OriginStateFips, Month LIMIT 10"]}
+{"sql":"SELECT \"Year\", ActualElapsedTime, DivArrDelay FROM mytable WHERE DepTimeBlk NOT IN ('2000-2059', '1600-1659', '0700-0759', '1500-1559', '1800-1859') ORDER BY OriginStateFips, \"Month\" LIMIT 10","hsqls":["SELECT Year, ActualElapsedTime, DivArrDelay FROM mytable WHERE DepTimeBlk NOT IN ('2000-2059', '1600-1659', '0700-0759', '1500-1559', '1800-1859') ORDER BY OriginStateFips, `Month` LIMIT 10"]}
 {"sql":"SELECT CarrierDelay, AVG(SecurityDelay) FROM mytable WHERE CRSDepTime <= 825 GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 11","hsqls":["SELECT CarrierDelay, AVG(SecurityDelay) FROM mytable WHERE CRSDepTime <= 825 GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 11"]}
 {"sql":"SELECT DepDelay, CRSElapsedTime, AVG(NASDelay), SUM(DivReachedDest), AVG(DivArrDelay) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 GROUP BY DepDelay, CRSElapsedTime  ORDER BY DepDelay, CRSElapsedTime LIMIT 10","hsqls":["SELECT DepDelay, CRSElapsedTime, AVG(NASDelay), SUM(DivReachedDest), AVG(DivArrDelay) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 GROUP BY DepDelay, CRSElapsedTime  ORDER BY DepDelay, CRSElapsedTime LIMIT 10"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1233502, 1198603, 1247802) OR WheelsOff IN (1008, 1009, 1114, 1326) AND DestAirportSeqID NOT IN (1188402, 1198202) LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs__MV1 IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs__MV2 IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs__MV3 IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs__MV4 IN (1233502, 1198603, 1247802)) OR WheelsOff IN (1008, 1009, 1114, 1326) AND DestAirportSeqID NOT IN (1188402, 1198202) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1233502, 1198603, 1247802) OR WheelsOff IN (1008, 1009, 1114, 1326) AND DestAirportSeqID NOT IN (1188402, 1198202) LIMIT 26","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs[2] IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs[3] IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs[4] IN (1233502, 1198603, 1247802) OR DivAirportSeqIDs[5] IN (1233502, 1198603, 1247802)) OR WheelsOff IN (1008, 1009, 1114, 1326) AND DestAirportSeqID NOT IN (1188402, 1198202) LIMIT 10000"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE DestCityName BETWEEN 'College Station/Bryan, TX' AND 'Dallas, TX' OR WeatherDelay < 8 ORDER BY ArrTimeBlk, DepDel15, DivActualElapsedTime LIMIT 23"}
-{"sql":"SELECT ArrDelay FROM mytable WHERE DivAirportIDs IN (10299, 14487, 13931, 13433, 10930) AND Cancelled >= 1 AND OriginStateFips BETWEEN 1 AND 72 ORDER BY DivDistance LIMIT 4","hsqls":["SELECT ArrDelay FROM mytable WHERE (DivAirportIDs__MV0 IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs__MV1 IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs__MV2 IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs__MV3 IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs__MV4 IN (10299, 14487, 13931, 13433, 10930)) AND Cancelled >= 1 AND OriginStateFips BETWEEN 1 AND 72 ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT ArrDelay FROM mytable WHERE DivAirportIDs IN (10299, 14487, 13931, 13433, 10930) AND Cancelled >= 1 AND OriginStateFips BETWEEN 1 AND 72 ORDER BY DivDistance LIMIT 4","hsqls":["SELECT ArrDelay FROM mytable WHERE (DivAirportIDs[1] IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs[2] IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs[3] IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs[4] IN (10299, 14487, 13931, 13433, 10930) OR DivAirportIDs[5] IN (10299, 14487, 13931, 13433, 10930)) AND Cancelled >= 1 AND OriginStateFips BETWEEN 1 AND 72 ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT DestCityName, DepTimeBlk FROM mytable WHERE DepDel15 <= 0 AND CarrierDelay = 46 LIMIT 28"}
-{"sql":"SELECT CRSDepTime, OriginStateName FROM mytable WHERE Quarter = 1 OR DivTailNums > 'N654MQ' AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY TotalAddGTime, NASDelay LIMIT 5","hsqls":["SELECT CRSDepTime, OriginStateName FROM mytable WHERE Quarter = 1 OR (DivTailNums__MV0 > 'N654MQ' OR DivTailNums__MV1 > 'N654MQ' OR DivTailNums__MV2 > 'N654MQ' OR DivTailNums__MV3 > 'N654MQ' OR DivTailNums__MV4 > 'N654MQ') AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY TotalAddGTime, NASDelay LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable LIMIT 22","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime, OriginStateName FROM mytable WHERE Quarter = 1 OR DivTailNums > 'N654MQ' AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY TotalAddGTime, NASDelay LIMIT 5","hsqls":["SELECT CRSDepTime, OriginStateName FROM mytable WHERE Quarter = 1 OR (DivTailNums[1] > 'N654MQ' OR DivTailNums[2] > 'N654MQ' OR DivTailNums[3] > 'N654MQ' OR DivTailNums[4] > 'N654MQ' OR DivTailNums[5] > 'N654MQ') AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY TotalAddGTime, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable LIMIT 22","hsqls":["SELECT DivAirportSeqIDs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, OriginStateName FROM mytable WHERE ArrDelayMinutes IN (253.0, 153.0, 42.0, 88.0, 17.0) ORDER BY WheelsOff, Quarter, DestStateName LIMIT 22"}
 {"sql":"SELECT TaxiOut, DivDistance, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY TaxiOut, DivDistance, ArrTimeBlk  ORDER BY TaxiOut, DivDistance, ArrTimeBlk LIMIT 28","hsqls":["SELECT TaxiOut, DivDistance, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY TaxiOut, DivDistance, ArrTimeBlk  ORDER BY TaxiOut, DivDistance, ArrTimeBlk LIMIT 28"]}
 {"sql":"SELECT COUNT(DepTimeBlk), MAX(DivActualElapsedTime) FROM mytable LIMIT 19"}
-{"sql":"SELECT DepDelay, FlightDate, ArrDel15 FROM mytable WHERE DivLongestGTimes BETWEEN 5.0 AND 24.0 ORDER BY DestAirportID LIMIT 23","hsqls":["SELECT DepDelay, FlightDate, ArrDel15 FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 5.0 AND 24.0 OR DivLongestGTimes__MV1 BETWEEN 5.0 AND 24.0 OR DivLongestGTimes__MV2 BETWEEN 5.0 AND 24.0 OR DivLongestGTimes__MV3 BETWEEN 5.0 AND 24.0 OR DivLongestGTimes__MV4 BETWEEN 5.0 AND 24.0) ORDER BY DestAirportID LIMIT 10000"]}
-{"sql":"SELECT MIN(AirTime), SUM(ActualElapsedTime), MAX(LateAircraftDelay) FROM mytable WHERE DivAirports IN ('DAB', 'HOU') AND WheelsOff <= 1502 OR OriginWac >= 21 LIMIT 24","hsqls":["SELECT MIN(AirTime), SUM(ActualElapsedTime), MAX(LateAircraftDelay)  FROM mytable WHERE (DivAirports__MV0 IN ('DAB', 'HOU') OR DivAirports__MV1 IN ('DAB', 'HOU') OR DivAirports__MV2 IN ('DAB', 'HOU') OR DivAirports__MV3 IN ('DAB', 'HOU') OR DivAirports__MV4 IN ('DAB', 'HOU')) AND WheelsOff <= 1502 OR OriginWac >= 21 LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, ArrTime, DivAirportLandings FROM mytable WHERE DivTotalGTimes BETWEEN 70 AND 201 ORDER BY Diverted, LateAircraftDelay, FlightNum LIMIT 15","hsqls":["SELECT TaxiOut, ArrTime, DivAirportLandings FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 70 AND 201 OR DivTotalGTimes__MV1 BETWEEN 70 AND 201 OR DivTotalGTimes__MV2 BETWEEN 70 AND 201 OR DivTotalGTimes__MV3 BETWEEN 70 AND 201 OR DivTotalGTimes__MV4 BETWEEN 70 AND 201) ORDER BY Diverted, LateAircraftDelay, FlightNum LIMIT 10000"]}
+{"sql":"SELECT DepDelay, FlightDate, ArrDel15 FROM mytable WHERE DivLongestGTimes BETWEEN 5.0 AND 24.0 ORDER BY DestAirportID LIMIT 23","hsqls":["SELECT DepDelay, FlightDate, ArrDel15 FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 5.0 AND 24.0 OR DivLongestGTimes[2] BETWEEN 5.0 AND 24.0 OR DivLongestGTimes[3] BETWEEN 5.0 AND 24.0 OR DivLongestGTimes[4] BETWEEN 5.0 AND 24.0 OR DivLongestGTimes[5] BETWEEN 5.0 AND 24.0) ORDER BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT MIN(AirTime), SUM(ActualElapsedTime), MAX(LateAircraftDelay) FROM mytable WHERE DivAirports IN ('DAB', 'HOU') AND WheelsOff <= 1502 OR OriginWac >= 21 LIMIT 24","hsqls":["SELECT MIN(AirTime), SUM(ActualElapsedTime), MAX(LateAircraftDelay)  FROM mytable WHERE (DivAirports[1] IN ('DAB', 'HOU') OR DivAirports[2] IN ('DAB', 'HOU') OR DivAirports[3] IN ('DAB', 'HOU') OR DivAirports[4] IN ('DAB', 'HOU') OR DivAirports[5] IN ('DAB', 'HOU')) AND WheelsOff <= 1502 OR OriginWac >= 21 LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, ArrTime, DivAirportLandings FROM mytable WHERE DivTotalGTimes BETWEEN 70 AND 201 ORDER BY Diverted, LateAircraftDelay, FlightNum LIMIT 15","hsqls":["SELECT TaxiOut, ArrTime, DivAirportLandings FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 70 AND 201 OR DivTotalGTimes[2] BETWEEN 70 AND 201 OR DivTotalGTimes[3] BETWEEN 70 AND 201 OR DivTotalGTimes[4] BETWEEN 70 AND 201 OR DivTotalGTimes[5] BETWEEN 70 AND 201) ORDER BY Diverted, LateAircraftDelay, FlightNum LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, TotalAddGTime, OriginWac, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N3JYAA', 'N429SW') OR TotalAddGTime NOT IN (60) OR OriginCityName <> 'Deadhorse, AK' GROUP BY CarrierDelay, TotalAddGTime, OriginWac  ORDER BY CarrierDelay, TotalAddGTime, OriginWac LIMIT 25","hsqls":["SELECT CarrierDelay, TotalAddGTime, OriginWac, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N3JYAA', 'N429SW') OR TotalAddGTime NOT IN (60) OR OriginCityName <> 'Deadhorse, AK' GROUP BY CarrierDelay, TotalAddGTime, OriginWac  ORDER BY CarrierDelay, TotalAddGTime, OriginWac LIMIT 25"]}
-{"sql":"SELECT DivWheelsOns, DepDelay, DivAirportLandings FROM mytable WHERE DivArrDelay IN (233, 206, 102) AND ActualElapsedTime = 376 ORDER BY DistanceGroup, DestAirportSeqID, OriginWac LIMIT 15","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepDelay, DivAirportLandings FROM mytable WHERE DivArrDelay IN (233, 206, 102) AND ActualElapsedTime = 376 ORDER BY DistanceGroup, DestAirportSeqID, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepDelay, DivAirportLandings FROM mytable WHERE DivArrDelay IN (233, 206, 102) AND ActualElapsedTime = 376 ORDER BY DistanceGroup, DestAirportSeqID, OriginWac LIMIT 15","hsqls":["SELECT DivWheelsOns, DepDelay, DivAirportLandings FROM mytable WHERE DivArrDelay IN (233, 206, 102) AND ActualElapsedTime = 376 ORDER BY DistanceGroup, DestAirportSeqID, OriginWac LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE DepTimeBlk >= '1600-1659' ORDER BY OriginState, ArrivalDelayGroups, CRSElapsedTime LIMIT 14"}
 {"sql":"SELECT DepDelay FROM mytable WHERE DivDistance IN (444, 825, 328)"}
-{"sql":"SELECT DepartureDelayGroups, FirstDepTime, ActualElapsedTime FROM mytable WHERE DivAirportSeqIDs < 1182304 OR AirlineID <= 20355 AND DepartureDelayGroups IN (3, -9999) ORDER BY DivDistance LIMIT 25","hsqls":["SELECT DepartureDelayGroups, FirstDepTime, ActualElapsedTime FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1182304 OR DivAirportSeqIDs__MV1 < 1182304 OR DivAirportSeqIDs__MV2 < 1182304 OR DivAirportSeqIDs__MV3 < 1182304 OR DivAirportSeqIDs__MV4 < 1182304) OR AirlineID <= 20355 AND DepartureDelayGroups IN (3, -9999) ORDER BY DivDistance LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, FlightNum FROM mytable ORDER BY CRSElapsedTime LIMIT 21","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, FlightNum FROM mytable ORDER BY CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, TotalAddGTime, DestStateName, COUNT(Flights) FROM mytable WHERE WeatherDelay BETWEEN 29 AND 100 AND LateAircraftDelay NOT IN (7, 123, 104, 197) AND \"Month\" IN (1) GROUP BY WheelsOff, TotalAddGTime, DestStateName LIMIT 24","hsqls":["SELECT WheelsOff, TotalAddGTime, DestStateName, COUNT(Flights) FROM mytable WHERE WeatherDelay BETWEEN 29 AND 100 AND LateAircraftDelay NOT IN (7, 123, 104, 197) AND Month IN (1) GROUP BY WheelsOff, TotalAddGTime, DestStateName LIMIT 24"]}
-{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime IN (751, 267) OR DivAirports >= 'SPS' LIMIT 6","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime IN (751, 267) OR (DivAirports__MV0 >= 'SPS' OR DivAirports__MV1 >= 'SPS' OR DivAirports__MV2 >= 'SPS' OR DivAirports__MV3 >= 'SPS' OR DivAirports__MV4 >= 'SPS') LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, FirstDepTime, ActualElapsedTime FROM mytable WHERE DivAirportSeqIDs < 1182304 OR AirlineID <= 20355 AND DepartureDelayGroups IN (3, -9999) ORDER BY DivDistance LIMIT 25","hsqls":["SELECT DepartureDelayGroups, FirstDepTime, ActualElapsedTime FROM mytable WHERE (DivAirportSeqIDs[1] < 1182304 OR DivAirportSeqIDs[2] < 1182304 OR DivAirportSeqIDs[3] < 1182304 OR DivAirportSeqIDs[4] < 1182304 OR DivAirportSeqIDs[5] < 1182304) OR AirlineID <= 20355 AND DepartureDelayGroups IN (3, -9999) ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, FlightNum FROM mytable ORDER BY CRSElapsedTime LIMIT 21","hsqls":["SELECT DivLongestGTimes, FlightNum FROM mytable ORDER BY CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, TotalAddGTime, DestStateName, COUNT(Flights) FROM mytable WHERE WeatherDelay BETWEEN 29 AND 100 AND LateAircraftDelay NOT IN (7, 123, 104, 197) AND \"Month\" IN (1) GROUP BY WheelsOff, TotalAddGTime, DestStateName LIMIT 24","hsqls":["SELECT WheelsOff, TotalAddGTime, DestStateName, COUNT(Flights) FROM mytable WHERE WeatherDelay BETWEEN 29 AND 100 AND LateAircraftDelay NOT IN (7, 123, 104, 197) AND `Month` IN (1) GROUP BY WheelsOff, TotalAddGTime, DestStateName LIMIT 24"]}
+{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime IN (751, 267) OR DivAirports >= 'SPS' LIMIT 6","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE DivActualElapsedTime IN (751, 267) OR (DivAirports[1] >= 'SPS' OR DivAirports[2] >= 'SPS' OR DivAirports[3] >= 'SPS' OR DivAirports[4] >= 'SPS' OR DivAirports[5] >= 'SPS') LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE DestState <= 'KY' AND WeatherDelay = 25 AND CRSDepTime BETWEEN 1857 AND 1138 LIMIT 10"}
-{"sql":"SELECT UniqueCarrier FROM mytable WHERE DivDistance NOT IN (67, 423) OR DepTimeBlk BETWEEN '0001-0559' AND '2200-2259' OR \"Month\" BETWEEN 1 AND 1 LIMIT 11","hsqls":["SELECT UniqueCarrier FROM mytable WHERE DivDistance NOT IN (67, 423) OR DepTimeBlk BETWEEN '0001-0559' AND '2200-2259' OR Month BETWEEN 1 AND 1 LIMIT 11"]}
+{"sql":"SELECT UniqueCarrier FROM mytable WHERE DivDistance NOT IN (67, 423) OR DepTimeBlk BETWEEN '0001-0559' AND '2200-2259' OR \"Month\" BETWEEN 1 AND 1 LIMIT 11","hsqls":["SELECT UniqueCarrier FROM mytable WHERE DivDistance NOT IN (67, 423) OR DepTimeBlk BETWEEN '0001-0559' AND '2200-2259' OR `Month` BETWEEN 1 AND 1 LIMIT 11"]}
 {"sql":"SELECT DestWac, CRSElapsedTime FROM mytable ORDER BY Distance, FlightDate, ArrTime"}
 {"sql":"SELECT TotalAddGTime, CancellationCode, AirlineID FROM mytable LIMIT 8"}
 {"sql":"SELECT Cancelled, UniqueCarrier, MAX(Flights), MAX(ArrivalDelayGroups) FROM mytable WHERE ActualElapsedTime >= 390 OR FirstDepTime < 1030 AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Cancelled, UniqueCarrier  ORDER BY Cancelled, UniqueCarrier LIMIT 17","hsqls":["SELECT Cancelled, UniqueCarrier, MAX(Flights), MAX(ArrivalDelayGroups) FROM mytable WHERE ActualElapsedTime >= 390 OR FirstDepTime < 1030 AND DivReachedDest BETWEEN 0 AND 1 GROUP BY Cancelled, UniqueCarrier  ORDER BY Cancelled, UniqueCarrier LIMIT 17"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 8"}
 {"sql":"SELECT \"Year\", DivActualElapsedTime FROM mytable ORDER BY ArrDelayMinutes, DayOfWeek, DaysSinceEpoch LIMIT 9","hsqls":["SELECT Year, DivActualElapsedTime FROM mytable ORDER BY ArrDelayMinutes, DayOfWeek, DaysSinceEpoch LIMIT 9"]}
-{"sql":"SELECT DestAirportSeqID, DivAirportIDs, UniqueCarrier FROM mytable WHERE DestCityName = 'Albany, GA' AND DepDel15 = 0 OR DivAirportSeqIDs <= 1112202 LIMIT 9","hsqls":["SELECT DestAirportSeqID, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, UniqueCarrier FROM mytable WHERE DestCityName = 'Albany, GA' AND DepDel15 = 0 OR (DivAirportSeqIDs__MV0 <= 1112202 OR DivAirportSeqIDs__MV1 <= 1112202 OR DivAirportSeqIDs__MV2 <= 1112202 OR DivAirportSeqIDs__MV3 <= 1112202 OR DivAirportSeqIDs__MV4 <= 1112202) LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 175.0 AND UniqueCarrier NOT IN ('F9', 'B6') AND OriginCityMarketID <> 31624 ORDER BY DayofMonth LIMIT 2","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 175.0 AND UniqueCarrier NOT IN ('F9', 'B6') AND OriginCityMarketID <> 31624 ORDER BY DayofMonth LIMIT 10000"]}
-{"sql":"SELECT OriginState, DivTailNums, OriginWac FROM mytable WHERE OriginCityMarketID NOT IN (33316, 30693, 31995, 30994) OR \"Month\" <> 1 OR OriginStateFips <= 24 ORDER BY LateAircraftDelay, DivActualElapsedTime LIMIT 18","hsqls":["SELECT OriginState, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, OriginWac FROM mytable WHERE OriginCityMarketID NOT IN (33316, 30693, 31995, 30994) OR Month <> 1 OR OriginStateFips <= 24 ORDER BY LateAircraftDelay, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DivAirportIDs FROM mytable WHERE Diverted < 0 ORDER BY OriginStateFips, FlightNum, DayOfWeek LIMIT 23","hsqls":["SELECT OriginAirportSeqID, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Diverted < 0 ORDER BY OriginStateFips, FlightNum, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE AirTime NOT IN (276, 11) OR CarrierDelay NOT IN (201) LIMIT 29","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE AirTime NOT IN (276, 11) OR CarrierDelay NOT IN (201) LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, OriginCityMarketID, AirTime FROM mytable WHERE DivWheelsOffs IN (1309) ORDER BY CancellationCode","hsqls":["SELECT DivReachedDest, OriginCityMarketID, AirTime FROM mytable WHERE (DivWheelsOffs__MV0 IN (1309) OR DivWheelsOffs__MV1 IN (1309) OR DivWheelsOffs__MV2 IN (1309) OR DivWheelsOffs__MV3 IN (1309) OR DivWheelsOffs__MV4 IN (1309)) ORDER BY CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, DivAirportIDs, UniqueCarrier FROM mytable WHERE DestCityName = 'Albany, GA' AND DepDel15 = 0 OR DivAirportSeqIDs <= 1112202 LIMIT 9","hsqls":["SELECT DestAirportSeqID, DivAirportIDs, UniqueCarrier FROM mytable WHERE DestCityName = 'Albany, GA' AND DepDel15 = 0 OR (DivAirportSeqIDs[1] <= 1112202 OR DivAirportSeqIDs[2] <= 1112202 OR DivAirportSeqIDs[3] <= 1112202 OR DivAirportSeqIDs[4] <= 1112202 OR DivAirportSeqIDs[5] <= 1112202) LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 175.0 AND UniqueCarrier NOT IN ('F9', 'B6') AND OriginCityMarketID <> 31624 ORDER BY DayofMonth LIMIT 2","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 175.0 AND UniqueCarrier NOT IN ('F9', 'B6') AND OriginCityMarketID <> 31624 ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivTailNums, OriginWac FROM mytable WHERE OriginCityMarketID NOT IN (33316, 30693, 31995, 30994) OR \"Month\" <> 1 OR OriginStateFips <= 24 ORDER BY LateAircraftDelay, DivActualElapsedTime LIMIT 18","hsqls":["SELECT OriginState, DivTailNums, OriginWac FROM mytable WHERE OriginCityMarketID NOT IN (33316, 30693, 31995, 30994) OR `Month` <> 1 OR OriginStateFips <= 24 ORDER BY LateAircraftDelay, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivAirportIDs FROM mytable WHERE Diverted < 0 ORDER BY OriginStateFips, FlightNum, DayOfWeek LIMIT 23","hsqls":["SELECT OriginAirportSeqID, DivAirportIDs FROM mytable WHERE Diverted < 0 ORDER BY OriginStateFips, FlightNum, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE AirTime NOT IN (276, 11) OR CarrierDelay NOT IN (201) LIMIT 29","hsqls":["SELECT DivTailNums FROM mytable WHERE AirTime NOT IN (276, 11) OR CarrierDelay NOT IN (201) LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, OriginCityMarketID, AirTime FROM mytable WHERE DivWheelsOffs IN (1309) ORDER BY CancellationCode","hsqls":["SELECT DivReachedDest, OriginCityMarketID, AirTime FROM mytable WHERE (DivWheelsOffs[1] IN (1309) OR DivWheelsOffs[2] IN (1309) OR DivWheelsOffs[3] IN (1309) OR DivWheelsOffs[4] IN (1309) OR DivWheelsOffs[5] IN (1309)) ORDER BY CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DestStateName, SUM(ActualElapsedTime), SUM(OriginAirportSeqID) FROM mytable WHERE OriginStateName < 'New York' AND CancellationCode < 'C' GROUP BY DivReachedDest, DestStateName  ORDER BY DivReachedDest, DestStateName LIMIT 12","hsqls":["SELECT DivReachedDest, DestStateName, SUM(ActualElapsedTime), SUM(OriginAirportSeqID) FROM mytable WHERE OriginStateName < 'New York' AND CancellationCode < 'C' GROUP BY DivReachedDest, DestStateName  ORDER BY DivReachedDest, DestStateName LIMIT 12"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'FL' OR DivReachedDest NOT IN (1, -9999) OR DestAirportID < 11726 ORDER BY ArrDel15 LIMIT 4","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'FL' OR DivReachedDest NOT IN (1, -9999) OR DestAirportID < 11726 ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'FL' OR DivReachedDest NOT IN (1, -9999) OR DestAirportID < 11726 ORDER BY ArrDel15 LIMIT 4","hsqls":["SELECT DivAirports FROM mytable WHERE UniqueCarrier BETWEEN 'DL' AND 'FL' OR DivReachedDest NOT IN (1, -9999) OR DestAirportID < 11726 ORDER BY ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT Distance, SUM(DistanceGroup) FROM mytable WHERE CRSArrTime > 937 AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR WheelsOff < 919 GROUP BY Distance  ORDER BY Distance LIMIT 5","hsqls":["SELECT Distance, SUM(DistanceGroup) FROM mytable WHERE CRSArrTime > 937 AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR WheelsOff < 919 GROUP BY Distance  ORDER BY Distance LIMIT 5"]}
 {"sql":"SELECT SecurityDelay, MAX(DivArrDelay) FROM mytable WHERE OriginState IN ('IA', 'AZ', 'VT', 'MN', 'MD') OR Diverted BETWEEN 1 AND 1 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 15","hsqls":["SELECT SecurityDelay, MAX(DivArrDelay) FROM mytable WHERE OriginState IN ('IA', 'AZ', 'VT', 'MN', 'MD') OR Diverted BETWEEN 1 AND 1 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 15"]}
 {"sql":"SELECT Flights, DivActualElapsedTime FROM mytable ORDER BY DestWac, ArrTime LIMIT 10"}
 {"sql":"SELECT DestCityMarketID, OriginWac FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'noodles' ORDER BY DivAirportLandings LIMIT 20"}
 {"sql":"SELECT DivDistance, COUNT(*) FROM mytable WHERE Carrier < 'AS' AND TaxiOut BETWEEN 41 AND 42 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 26","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable WHERE Carrier < 'AS' AND TaxiOut BETWEEN 41 AND 42 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 26"]}
 {"sql":"SELECT SUM(Flights), SUM(DivReachedDest), SUM(DestAirportID) FROM mytable WHERE DayOfWeek IN (4) OR TotalAddGTime BETWEEN 19 AND 5 OR AirlineID BETWEEN 19393 AND 20355 LIMIT 8"}
-{"sql":"SELECT \"Year\" FROM mytable ORDER BY DestWac, DepTimeBlk, DivArrDelay LIMIT 5","hsqls":["SELECT Year FROM mytable ORDER BY DestWac, DepTimeBlk, DivArrDelay LIMIT 5"]}
+{"sql":"SELECT \"Year\" FROM mytable ORDER BY DestWac, DepTimeBlk, DivArrDelay LIMIT 5","hsqls":["SELECT `Year` FROM mytable ORDER BY DestWac, DepTimeBlk, DivArrDelay LIMIT 5"]}
 {"sql":"SELECT Flights FROM mytable WHERE ArrivalDelayGroups <= -1 OR Diverted BETWEEN 1 AND 0 AND NASDelay = 179 ORDER BY LongestAddGTime, NASDelay LIMIT 18"}
 {"sql":"SELECT DepDelayMinutes, FlightNum, DepDel15 FROM mytable WHERE DivAirportLandings BETWEEN 0 AND 9 ORDER BY Carrier, ArrDel15, CRSElapsedTime LIMIT 2"}
-{"sql":"SELECT FlightNum, DestStateFips, ArrDel15 FROM mytable WHERE ArrDel15 <= -9999 AND OriginStateFips IN (19, 16) OR DivWheelsOffs IN (1212, 1135) LIMIT 19","hsqls":["SELECT FlightNum, DestStateFips, ArrDel15 FROM mytable WHERE ArrDel15 <= -9999 AND OriginStateFips IN (19, 16) OR (DivWheelsOffs__MV0 IN (1212, 1135) OR DivWheelsOffs__MV1 IN (1212, 1135) OR DivWheelsOffs__MV2 IN (1212, 1135) OR DivWheelsOffs__MV3 IN (1212, 1135) OR DivWheelsOffs__MV4 IN (1212, 1135)) LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DestStateFips, ArrDel15 FROM mytable WHERE ArrDel15 <= -9999 AND OriginStateFips IN (19, 16) OR DivWheelsOffs IN (1212, 1135) LIMIT 19","hsqls":["SELECT FlightNum, DestStateFips, ArrDel15 FROM mytable WHERE ArrDel15 <= -9999 AND OriginStateFips IN (19, 16) OR (DivWheelsOffs[1] IN (1212, 1135) OR DivWheelsOffs[2] IN (1212, 1135) OR DivWheelsOffs[3] IN (1212, 1135) OR DivWheelsOffs[4] IN (1212, 1135) OR DivWheelsOffs[5] IN (1212, 1135)) LIMIT 10000"]}
 {"sql":"SELECT FlightNum, AVG(OriginAirportSeqID), MAX(DivReachedDest), COUNT(LateAircraftDelay) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 28","hsqls":["SELECT FlightNum, AVG(OriginAirportSeqID), MAX(DivReachedDest), COUNT(LateAircraftDelay) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 28"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY DivActualElapsedTime LIMIT 21"}
-{"sql":"SELECT OriginState, AirTime, OriginAirportID, AVG(OriginWac), AVG(DestAirportID), MIN(ActualElapsedTime) FROM mytable WHERE \"Year\" NOT IN (2014) AND OriginStateName < 'New Hampshire' GROUP BY OriginState, AirTime, OriginAirportID LIMIT 16","hsqls":["SELECT OriginState, AirTime, OriginAirportID, AVG(OriginWac), AVG(DestAirportID), MIN(ActualElapsedTime) FROM mytable WHERE Year NOT IN (2014) AND OriginStateName < 'New Hampshire' GROUP BY OriginState, AirTime, OriginAirportID LIMIT 16"]}
+{"sql":"SELECT OriginState, AirTime, OriginAirportID, AVG(OriginWac), AVG(DestAirportID), MIN(ActualElapsedTime) FROM mytable WHERE \"Year\" NOT IN (2014) AND OriginStateName < 'New Hampshire' GROUP BY OriginState, AirTime, OriginAirportID LIMIT 16","hsqls":["SELECT OriginState, AirTime, OriginAirportID, AVG(OriginWac), AVG(DestAirportID), MIN(ActualElapsedTime) FROM mytable WHERE `Year` NOT IN (2014) AND OriginStateName < 'New Hampshire' GROUP BY OriginState, AirTime, OriginAirportID LIMIT 16"]}
 {"sql":"SELECT OriginWac FROM mytable ORDER BY DivDistance, DivActualElapsedTime, DaysSinceEpoch LIMIT 24"}
-{"sql":"SELECT LongestAddGTime, OriginCityName, DayOfWeek FROM mytable WHERE ArrTime BETWEEN 1537 AND 2258 AND DivAirportLandings >= 0 AND DivTotalGTimes < 99 ORDER BY OriginState, \"Month\" LIMIT 24","hsqls":["SELECT LongestAddGTime, OriginCityName, DayOfWeek FROM mytable WHERE ArrTime BETWEEN 1537 AND 2258 AND DivAirportLandings >= 0 AND (DivTotalGTimes__MV0 < 99 OR DivTotalGTimes__MV1 < 99 OR DivTotalGTimes__MV2 < 99 OR DivTotalGTimes__MV3 < 99 OR DivTotalGTimes__MV4 < 99) ORDER BY OriginState, Month LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, OriginCityName, DayOfWeek FROM mytable WHERE ArrTime BETWEEN 1537 AND 2258 AND DivAirportLandings >= 0 AND DivTotalGTimes < 99 ORDER BY OriginState, \"Month\" LIMIT 24","hsqls":["SELECT LongestAddGTime, OriginCityName, DayOfWeek FROM mytable WHERE ArrTime BETWEEN 1537 AND 2258 AND DivAirportLandings >= 0 AND (DivTotalGTimes[1] < 99 OR DivTotalGTimes[2] < 99 OR DivTotalGTimes[3] < 99 OR DivTotalGTimes[4] < 99 OR DivTotalGTimes[5] < 99) ORDER BY OriginState, `Month` LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk FROM mytable ORDER BY ArrDelay LIMIT 21"}
 {"sql":"SELECT TaxiOut, ArrDel15, SUM(AirTime) FROM mytable WHERE TailNum = 'N76528' OR OriginWac BETWEEN 13 AND 22 GROUP BY TaxiOut, ArrDel15  ORDER BY TaxiOut, ArrDel15 LIMIT 9","hsqls":["SELECT TaxiOut, ArrDel15, SUM(AirTime) FROM mytable WHERE TailNum = 'N76528' OR OriginWac BETWEEN 13 AND 22 GROUP BY TaxiOut, ArrDel15  ORDER BY TaxiOut, ArrDel15 LIMIT 9"]}
 {"sql":"SELECT CarrierDelay, OriginCityMarketID FROM mytable WHERE DayOfWeek IN (3, 5, 4) OR DepDelayMinutes >= 12.0 AND OriginWac >= 21 ORDER BY DivAirportLandings, DivArrDelay, UniqueCarrier LIMIT 10"}
 {"sql":"SELECT DepDelay, CRSArrTime FROM mytable WHERE DepTime > 2212 ORDER BY TaxiOut, LateAircraftDelay, CRSArrTime LIMIT 19"}
-{"sql":"SELECT WheelsOff, TotalAddGTime, MIN(AirTime), MAX(\"Year\") FROM mytable WHERE UniqueCarrier IN ('MQ') OR DepDel15 BETWEEN -9999 AND -9999 OR OriginAirportSeqID NOT IN (1232303, 1393303, 1169502, 1125903) GROUP BY WheelsOff, TotalAddGTime LIMIT 23","hsqls":["SELECT WheelsOff, TotalAddGTime, MIN(AirTime), MAX(Year) FROM mytable WHERE UniqueCarrier IN ('MQ') OR DepDel15 BETWEEN -9999 AND -9999 OR OriginAirportSeqID NOT IN (1232303, 1393303, 1169502, 1125903) GROUP BY WheelsOff, TotalAddGTime LIMIT 23"]}
-{"sql":"SELECT WeatherDelay, DayofMonth, MIN(ArrDel15), MIN(DivAirportLandings), COUNT(LateAircraftDelay) FROM mytable WHERE DivAirportSeqIDs < 1411302 AND DivDistance BETWEEN 745 AND 666 GROUP BY WeatherDelay, DayofMonth LIMIT 24","hsqls":["SELECT WeatherDelay, DayofMonth, MIN(ArrDel15), MIN(DivAirportLandings), COUNT(LateAircraftDelay) FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1411302 OR DivAirportSeqIDs__MV1 < 1411302 OR DivAirportSeqIDs__MV2 < 1411302 OR DivAirportSeqIDs__MV3 < 1411302 OR DivAirportSeqIDs__MV4 < 1411302) AND DivDistance BETWEEN 745 AND 666 GROUP BY WeatherDelay, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, TotalAddGTime, MIN(AirTime), MAX(\"Year\") FROM mytable WHERE UniqueCarrier IN ('MQ') OR DepDel15 BETWEEN -9999 AND -9999 OR OriginAirportSeqID NOT IN (1232303, 1393303, 1169502, 1125903) GROUP BY WheelsOff, TotalAddGTime LIMIT 23","hsqls":["SELECT WheelsOff, TotalAddGTime, MIN(AirTime), MAX(`Year`) FROM mytable WHERE UniqueCarrier IN ('MQ') OR DepDel15 BETWEEN -9999 AND -9999 OR OriginAirportSeqID NOT IN (1232303, 1393303, 1169502, 1125903) GROUP BY WheelsOff, TotalAddGTime LIMIT 23"]}
+{"sql":"SELECT WeatherDelay, DayofMonth, MIN(ArrDel15), MIN(DivAirportLandings), COUNT(LateAircraftDelay) FROM mytable WHERE DivAirportSeqIDs < 1411302 AND DivDistance BETWEEN 745 AND 666 GROUP BY WeatherDelay, DayofMonth LIMIT 24","hsqls":["SELECT WeatherDelay, DayofMonth, MIN(ArrDel15), MIN(DivAirportLandings), COUNT(LateAircraftDelay) FROM mytable WHERE (DivAirportSeqIDs[1] < 1411302 OR DivAirportSeqIDs[2] < 1411302 OR DivAirportSeqIDs[3] < 1411302 OR DivAirportSeqIDs[4] < 1411302 OR DivAirportSeqIDs[5] < 1411302) AND DivDistance BETWEEN 745 AND 666 GROUP BY WeatherDelay, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, ArrTime, MIN(Flights), AVG(DayofMonth), MAX(FlightNum) FROM mytable WHERE LongestAddGTime >= 31 AND CRSElapsedTime = 257 AND OriginCityName <= 'Dayton, OH' GROUP BY DivReachedDest, ArrTime  ORDER BY DivReachedDest, ArrTime LIMIT 15","hsqls":["SELECT DivReachedDest, ArrTime, MIN(Flights), AVG(DayofMonth), MAX(FlightNum) FROM mytable WHERE LongestAddGTime >= 31 AND CRSElapsedTime = 257 AND OriginCityName <= 'Dayton, OH' GROUP BY DivReachedDest, ArrTime  ORDER BY DivReachedDest, ArrTime LIMIT 15"]}
 {"sql":"SELECT COUNT(Flights) FROM mytable WHERE LateAircraftDelay BETWEEN 70 AND 38 LIMIT 19"}
 {"sql":"SELECT DepDelayMinutes, DepDel15, OriginAirportID FROM mytable ORDER BY DepTime, DivAirportLandings LIMIT 18"}
-{"sql":"SELECT TaxiOut, TaxiIn, WheelsOn, MAX(\"Month\") FROM mytable WHERE OriginStateName IN ('Massachusetts', 'U.S. Virgin Islands', 'U.S. Pacific Trust Territories and Possessions', 'Nevada', 'Washington') AND DivWheelsOffs BETWEEN 1256 AND 1903 GROUP BY TaxiOut, TaxiIn, WheelsOn LIMIT 9","hsqls":["SELECT TaxiOut, TaxiIn, WheelsOn, MAX(Month) FROM mytable WHERE OriginStateName IN ('Massachusetts', 'U.S. Virgin Islands', 'U.S. Pacific Trust Territories and Possessions', 'Nevada', 'Washington') AND (DivWheelsOffs__MV0 BETWEEN 1256 AND 1903 OR DivWheelsOffs__MV1 BETWEEN 1256 AND 1903 OR DivWheelsOffs__MV2 BETWEEN 1256 AND 1903 OR DivWheelsOffs__MV3 BETWEEN 1256 AND 1903 OR DivWheelsOffs__MV4 BETWEEN 1256 AND 1903) GROUP BY TaxiOut, TaxiIn, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, TaxiIn, WheelsOn, MAX(\"Month\") FROM mytable WHERE OriginStateName IN ('Massachusetts', 'U.S. Virgin Islands', 'U.S. Pacific Trust Territories and Possessions', 'Nevada', 'Washington') AND DivWheelsOffs BETWEEN 1256 AND 1903 GROUP BY TaxiOut, TaxiIn, WheelsOn LIMIT 9","hsqls":["SELECT TaxiOut, TaxiIn, WheelsOn, MAX(`Month`) FROM mytable WHERE OriginStateName IN ('Massachusetts', 'U.S. Virgin Islands', 'U.S. Pacific Trust Territories and Possessions', 'Nevada', 'Washington') AND (DivWheelsOffs[1] BETWEEN 1256 AND 1903 OR DivWheelsOffs[2] BETWEEN 1256 AND 1903 OR DivWheelsOffs[3] BETWEEN 1256 AND 1903 OR DivWheelsOffs[4] BETWEEN 1256 AND 1903 OR DivWheelsOffs[5] BETWEEN 1256 AND 1903) GROUP BY TaxiOut, TaxiIn, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DestStateName, DepDel15, Origin, SUM(ArrDelayMinutes) FROM mytable WHERE DestAirportSeqID > 1312702 AND ArrDelayMinutes BETWEEN 14.0 AND 305.0 GROUP BY DestStateName, DepDel15, Origin  ORDER BY DestStateName, DepDel15, Origin LIMIT 11","hsqls":["SELECT DestStateName, DepDel15, Origin, SUM(ArrDelayMinutes) FROM mytable WHERE DestAirportSeqID > 1312702 AND ArrDelayMinutes BETWEEN 14.0 AND 305.0 GROUP BY DestStateName, DepDel15, Origin  ORDER BY DestStateName, DepDel15, Origin LIMIT 11"]}
-{"sql":"SELECT TailNum, \"Month\", CRSElapsedTime, MAX(ArrDelay), MIN(\"Year\"), SUM(FlightNum) FROM mytable WHERE DivWheelsOffs IN (1338) GROUP BY TailNum, \"Month\", CRSElapsedTime LIMIT 4","hsqls":["SELECT TailNum, Month, CRSElapsedTime, MAX(ArrDelay), MIN(Year), SUM(FlightNum) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1338) OR DivWheelsOffs__MV1 IN (1338) OR DivWheelsOffs__MV2 IN (1338) OR DivWheelsOffs__MV3 IN (1338) OR DivWheelsOffs__MV4 IN (1338)) GROUP BY TailNum, Month, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT TailNum, \"Month\", CRSElapsedTime, MAX(ArrDelay), MIN(\"Year\"), SUM(FlightNum) FROM mytable WHERE DivWheelsOffs IN (1338) GROUP BY TailNum, \"Month\", CRSElapsedTime LIMIT 4","hsqls":["SELECT TailNum, Month, CRSElapsedTime, MAX(ArrDelay), MIN(`Year`), SUM(FlightNum) FROM mytable WHERE (DivWheelsOffs[1] IN (1338) OR DivWheelsOffs[2] IN (1338) OR DivWheelsOffs[3] IN (1338) OR DivWheelsOffs[4] IN (1338) OR DivWheelsOffs[5] IN (1338)) GROUP BY TailNum, Month, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE OriginCityName IN ('Sitka, AK', 'Charlotte, NC', 'Joplin, MO', 'Jackson, WY', 'Wichita, KS') AND AirTime <= 229 LIMIT 6"}
 {"sql":"SELECT CRSDepTime FROM mytable ORDER BY FirstDepTime, WheelsOn LIMIT 12"}
 {"sql":"SELECT DepDel15 FROM mytable WHERE DayofMonth BETWEEN 14 AND 4 ORDER BY DepDelay, DivDistance LIMIT 8"}
-{"sql":"SELECT ArrTimeBlk, NASDelay FROM mytable WHERE DivWheelsOns >= 2147 OR OriginState BETWEEN 'NV' AND 'SC' LIMIT 13","hsqls":["SELECT ArrTimeBlk, NASDelay FROM mytable WHERE (DivWheelsOns__MV0 >= 2147 OR DivWheelsOns__MV1 >= 2147 OR DivWheelsOns__MV2 >= 2147 OR DivWheelsOns__MV3 >= 2147 OR DivWheelsOns__MV4 >= 2147) OR OriginState BETWEEN 'NV' AND 'SC' LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, NASDelay FROM mytable WHERE DivWheelsOns >= 2147 OR OriginState BETWEEN 'NV' AND 'SC' LIMIT 13","hsqls":["SELECT ArrTimeBlk, NASDelay FROM mytable WHERE (DivWheelsOns[1] >= 2147 OR DivWheelsOns[2] >= 2147 OR DivWheelsOns[3] >= 2147 OR DivWheelsOns[4] >= 2147 OR DivWheelsOns[5] >= 2147) OR OriginState BETWEEN 'NV' AND 'SC' LIMIT 10000"]}
 {"sql":"SELECT Origin, CRSDepTime, DayOfWeek FROM mytable WHERE AirTime <> 218 ORDER BY Distance, SecurityDelay, TotalAddGTime LIMIT 3"}
 {"sql":"SELECT DestWac FROM mytable WHERE DivDistance BETWEEN 402 AND 0 AND WheelsOff NOT IN (1410, 627, 1312) AND TaxiIn > 4 ORDER BY OriginAirportSeqID, ArrTimeBlk, DepDel15 LIMIT 22"}
 {"sql":"SELECT DestStateFips, OriginCityName FROM mytable ORDER BY DistanceGroup, Diverted, DivActualElapsedTime LIMIT 29"}
-{"sql":"SELECT DivWheelsOns, OriginState, Carrier FROM mytable WHERE WheelsOn NOT IN (606) ORDER BY OriginCityMarketID, Dest LIMIT 19","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginState, Carrier FROM mytable WHERE WheelsOn NOT IN (606) ORDER BY OriginCityMarketID, Dest LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, OriginState, Carrier FROM mytable WHERE WheelsOn NOT IN (606) ORDER BY OriginCityMarketID, Dest LIMIT 19","hsqls":["SELECT DivWheelsOns, OriginState, Carrier FROM mytable WHERE WheelsOn NOT IN (606) ORDER BY OriginCityMarketID, Dest LIMIT 10000"]}
 {"sql":"SELECT Diverted, DestState FROM mytable WHERE DestWac BETWEEN 91 AND 31 ORDER BY DestStateFips, ArrivalDelayGroups LIMIT 9"}
 {"sql":"SELECT DepTime, AVG(DivDistance), MIN(DivAirportLandings) FROM mytable GROUP BY DepTime","hsqls":["SELECT DepTime, AVG(DivDistance), MIN(DivAirportLandings) FROM mytable GROUP BY DepTime"]}
 {"sql":"SELECT MIN(AirTime), MAX(OriginAirportID) FROM mytable LIMIT 10"}
 {"sql":"SELECT Quarter FROM mytable WHERE TailNum NOT IN ('N3EXAA') ORDER BY OriginCityName LIMIT 10"}
-{"sql":"SELECT DivArrDelay FROM mytable WHERE DivTotalGTimes IN (109, 41, 47, 73) ORDER BY DepTimeBlk LIMIT 21","hsqls":["SELECT DivArrDelay FROM mytable WHERE (DivTotalGTimes__MV0 IN (109, 41, 47, 73) OR DivTotalGTimes__MV1 IN (109, 41, 47, 73) OR DivTotalGTimes__MV2 IN (109, 41, 47, 73) OR DivTotalGTimes__MV3 IN (109, 41, 47, 73) OR DivTotalGTimes__MV4 IN (109, 41, 47, 73)) ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivArrDelay FROM mytable WHERE DivTotalGTimes IN (109, 41, 47, 73) ORDER BY DepTimeBlk LIMIT 21","hsqls":["SELECT DivArrDelay FROM mytable WHERE (DivTotalGTimes[1] IN (109, 41, 47, 73) OR DivTotalGTimes[2] IN (109, 41, 47, 73) OR DivTotalGTimes[3] IN (109, 41, 47, 73) OR DivTotalGTimes[4] IN (109, 41, 47, 73) OR DivTotalGTimes[5] IN (109, 41, 47, 73)) ORDER BY DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable ORDER BY CRSDepTime LIMIT 2"}
 {"sql":"SELECT OriginAirportSeqID, SUM(DestStateFips), COUNT(WeatherDelay) FROM mytable WHERE ArrTime BETWEEN 1925 AND 1914 AND DivDistance <> 158 GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 20","hsqls":["SELECT OriginAirportSeqID, SUM(DestStateFips), COUNT(WeatherDelay) FROM mytable WHERE ArrTime BETWEEN 1925 AND 1914 AND DivDistance <> 158 GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 20"]}
-{"sql":"SELECT \"Year\", ArrDelayMinutes, DayofMonth FROM mytable ORDER BY \"Month\" LIMIT 1","hsqls":["SELECT Year, ArrDelayMinutes, DayofMonth FROM mytable ORDER BY Month LIMIT 1"]}
+{"sql":"SELECT \"Year\", ArrDelayMinutes, DayofMonth FROM mytable ORDER BY \"Month\" LIMIT 1","hsqls":["SELECT Year, ArrDelayMinutes, DayofMonth FROM mytable ORDER BY `Month` LIMIT 1"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY DivReachedDest LIMIT 2"}
 {"sql":"SELECT Dest, OriginStateName, COUNT(OriginState), MAX(Diverted), MAX(DayofMonth) FROM mytable GROUP BY Dest, OriginStateName  ORDER BY Dest, OriginStateName LIMIT 29","hsqls":["SELECT Dest, OriginStateName, COUNT(OriginState), MAX(Diverted), MAX(DayofMonth) FROM mytable GROUP BY Dest, OriginStateName  ORDER BY Dest, OriginStateName LIMIT 29"]}
-{"sql":"SELECT DepartureDelayGroups, FlightNum, DaysSinceEpoch, AVG(DepDel15), SUM(TaxiOut), SUM(DayofMonth) FROM mytable WHERE DivActualElapsedTime <= 517 AND DivAirports < 'SRQ' GROUP BY DepartureDelayGroups, FlightNum, DaysSinceEpoch LIMIT 28","hsqls":["SELECT DepartureDelayGroups, FlightNum, DaysSinceEpoch, AVG(DepDel15), SUM(TaxiOut), SUM(DayofMonth) FROM mytable WHERE DivActualElapsedTime <= 517 AND (DivAirports__MV0 < 'SRQ' OR DivAirports__MV1 < 'SRQ' OR DivAirports__MV2 < 'SRQ' OR DivAirports__MV3 < 'SRQ' OR DivAirports__MV4 < 'SRQ') GROUP BY DepartureDelayGroups, FlightNum, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DestStateFips, DivAirportSeqIDs FROM mytable WHERE TaxiOut > 12 OR DistanceGroup NOT IN (3, 2, 7, 4) ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT DistanceGroup, DestStateFips, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE TaxiOut > 12 OR DistanceGroup NOT IN (3, 2, 7, 4) ORDER BY DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivAirports BETWEEN 'DSM' AND 'YYC' OR DepDelayMinutes >= 205.0 OR SecurityDelay <= 1 LIMIT 20","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE (DivAirports__MV0 BETWEEN 'DSM' AND 'YYC' OR DivAirports__MV1 BETWEEN 'DSM' AND 'YYC' OR DivAirports__MV2 BETWEEN 'DSM' AND 'YYC' OR DivAirports__MV3 BETWEEN 'DSM' AND 'YYC' OR DivAirports__MV4 BETWEEN 'DSM' AND 'YYC') OR DepDelayMinutes >= 205.0 OR SecurityDelay <= 1 LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, FlightNum, DaysSinceEpoch, AVG(DepDel15), SUM(TaxiOut), SUM(DayofMonth) FROM mytable WHERE DivActualElapsedTime <= 517 AND DivAirports < 'SRQ' GROUP BY DepartureDelayGroups, FlightNum, DaysSinceEpoch LIMIT 28","hsqls":["SELECT DepartureDelayGroups, FlightNum, DaysSinceEpoch, AVG(DepDel15), SUM(TaxiOut), SUM(DayofMonth) FROM mytable WHERE DivActualElapsedTime <= 517 AND (DivAirports[1] < 'SRQ' OR DivAirports[2] < 'SRQ' OR DivAirports[3] < 'SRQ' OR DivAirports[4] < 'SRQ' OR DivAirports[5] < 'SRQ') GROUP BY DepartureDelayGroups, FlightNum, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestStateFips, DivAirportSeqIDs FROM mytable WHERE TaxiOut > 12 OR DistanceGroup NOT IN (3, 2, 7, 4) ORDER BY DepTimeBlk LIMIT 10","hsqls":["SELECT DistanceGroup, DestStateFips, DivAirportSeqIDs FROM mytable WHERE TaxiOut > 12 OR DistanceGroup NOT IN (3, 2, 7, 4) ORDER BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivAirports BETWEEN 'DSM' AND 'YYC' OR DepDelayMinutes >= 205.0 OR SecurityDelay <= 1 LIMIT 20","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE (DivAirports[1] BETWEEN 'DSM' AND 'YYC' OR DivAirports[2] BETWEEN 'DSM' AND 'YYC' OR DivAirports[3] BETWEEN 'DSM' AND 'YYC' OR DivAirports[4] BETWEEN 'DSM' AND 'YYC' OR DivAirports[5] BETWEEN 'DSM' AND 'YYC') OR DepDelayMinutes >= 205.0 OR SecurityDelay <= 1 LIMIT 10000"]}
 {"sql":"SELECT Dest, SUM(DepDelay), COUNT(FlightDate) FROM mytable WHERE TaxiOut > 61 GROUP BY Dest  ORDER BY Dest LIMIT 7","hsqls":["SELECT Dest, SUM(DepDelay), COUNT(FlightDate) FROM mytable WHERE TaxiOut > 61 GROUP BY Dest  ORDER BY Dest LIMIT 7"]}
-{"sql":"SELECT Cancelled, CancellationCode FROM mytable WHERE \"Month\" NOT IN (1) AND OriginStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Illinois', 'Indiana', 'Rhode Island') AND TaxiIn = 48 ORDER BY OriginState LIMIT 9","hsqls":["SELECT Cancelled, CancellationCode FROM mytable WHERE Month NOT IN (1) AND OriginStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Illinois', 'Indiana', 'Rhode Island') AND TaxiIn = 48 ORDER BY OriginState LIMIT 9"]}
+{"sql":"SELECT Cancelled, CancellationCode FROM mytable WHERE \"Month\" NOT IN (1) AND OriginStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Illinois', 'Indiana', 'Rhode Island') AND TaxiIn = 48 ORDER BY OriginState LIMIT 9","hsqls":["SELECT Cancelled, CancellationCode FROM mytable WHERE `Month` NOT IN (1) AND OriginStateName NOT IN ('U.S. Pacific Trust Territories and Possessions', 'West Virginia', 'Illinois', 'Indiana', 'Rhode Island') AND TaxiIn = 48 ORDER BY OriginState LIMIT 9"]}
 {"sql":"SELECT OriginCityName, DayofMonth FROM mytable WHERE ArrTime <> 10 OR TaxiIn <= 32 OR OriginCityName NOT IN ('Manhattan/Ft. Riley, KS') ORDER BY DivDistance, Flights, ArrDel15 LIMIT 21"}
 {"sql":"SELECT DayOfWeek, COUNT(*) FROM mytable WHERE Cancelled < 1 GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 17","hsqls":["SELECT DayOfWeek, COUNT(*) FROM mytable WHERE Cancelled < 1 GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 17"]}
-{"sql":"SELECT AVG(CRSArrTime), AVG(DivAirportLandings), MIN(FirstDepTime) FROM mytable WHERE DivActualElapsedTime IN (455, 172, 234, 141) OR DivAirports BETWEEN 'OKC' AND 'SGF' OR DivDistance <> 68 LIMIT 24","hsqls":["SELECT AVG(CRSArrTime), AVG(DivAirportLandings), MIN(FirstDepTime)  FROM mytable WHERE DivActualElapsedTime IN (455, 172, 234, 141) OR (DivAirports__MV0 BETWEEN 'OKC' AND 'SGF' OR DivAirports__MV1 BETWEEN 'OKC' AND 'SGF' OR DivAirports__MV2 BETWEEN 'OKC' AND 'SGF' OR DivAirports__MV3 BETWEEN 'OKC' AND 'SGF' OR DivAirports__MV4 BETWEEN 'OKC' AND 'SGF') OR DivDistance <> 68 LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, Carrier FROM mytable WHERE CRSDepTime <> 1826 OR FirstDepTime BETWEEN 2146 AND 1540 AND \"Year\" >= 2014 ORDER BY WeatherDelay, DivArrDelay LIMIT 9","hsqls":["SELECT FirstDepTime, Carrier FROM mytable WHERE CRSDepTime <> 1826 OR FirstDepTime BETWEEN 2146 AND 1540 AND Year >= 2014 ORDER BY WeatherDelay, DivArrDelay LIMIT 9"]}
-{"sql":"SELECT OriginAirportID, DaysSinceEpoch FROM mytable WHERE DivAirportIDs IN (11252, 13851) OR Cancelled IN (1, 0) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepTime LIMIT 2","hsqls":["SELECT OriginAirportID, DaysSinceEpoch FROM mytable WHERE (DivAirportIDs__MV0 IN (11252, 13851) OR DivAirportIDs__MV1 IN (11252, 13851) OR DivAirportIDs__MV2 IN (11252, 13851) OR DivAirportIDs__MV3 IN (11252, 13851) OR DivAirportIDs__MV4 IN (11252, 13851)) OR Cancelled IN (1, 0) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepTime LIMIT 10000"]}
+{"sql":"SELECT AVG(CRSArrTime), AVG(DivAirportLandings), MIN(FirstDepTime) FROM mytable WHERE DivActualElapsedTime IN (455, 172, 234, 141) OR DivAirports BETWEEN 'OKC' AND 'SGF' OR DivDistance <> 68 LIMIT 24","hsqls":["SELECT AVG(CRSArrTime), AVG(DivAirportLandings), MIN(FirstDepTime)  FROM mytable WHERE DivActualElapsedTime IN (455, 172, 234, 141) OR (DivAirports[1] BETWEEN 'OKC' AND 'SGF' OR DivAirports[2] BETWEEN 'OKC' AND 'SGF' OR DivAirports[3] BETWEEN 'OKC' AND 'SGF' OR DivAirports[4] BETWEEN 'OKC' AND 'SGF' OR DivAirports[5] BETWEEN 'OKC' AND 'SGF') OR DivDistance <> 68 LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, Carrier FROM mytable WHERE CRSDepTime <> 1826 OR FirstDepTime BETWEEN 2146 AND 1540 AND \"Year\" >= 2014 ORDER BY WeatherDelay, DivArrDelay LIMIT 9","hsqls":["SELECT FirstDepTime, Carrier FROM mytable WHERE CRSDepTime <> 1826 OR FirstDepTime BETWEEN 2146 AND 1540 AND `Year` >= 2014 ORDER BY WeatherDelay, DivArrDelay LIMIT 9"]}
+{"sql":"SELECT OriginAirportID, DaysSinceEpoch FROM mytable WHERE DivAirportIDs IN (11252, 13851) OR Cancelled IN (1, 0) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepTime LIMIT 2","hsqls":["SELECT OriginAirportID, DaysSinceEpoch FROM mytable WHERE (DivAirportIDs[1] IN (11252, 13851) OR DivAirportIDs[2] IN (11252, 13851) OR DivAirportIDs[3] IN (11252, 13851) OR DivAirportIDs[4] IN (11252, 13851) OR DivAirportIDs[5] IN (11252, 13851)) OR Cancelled IN (1, 0) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepTime LIMIT 10000"]}
 {"sql":"SELECT Dest, MIN(TotalAddGTime) FROM mytable WHERE DestStateFips IN (49, 5, 17, 37) OR DestCityMarketID BETWEEN 30325 AND 30615 GROUP BY Dest  ORDER BY Dest LIMIT 10","hsqls":["SELECT Dest, MIN(TotalAddGTime) FROM mytable WHERE DestStateFips IN (49, 5, 17, 37) OR DestCityMarketID BETWEEN 30325 AND 30615 GROUP BY Dest  ORDER BY Dest LIMIT 10"]}
 {"sql":"SELECT DepartureDelayGroups, FlightNum, ArrDelay, SUM(CarrierDelay) FROM mytable WHERE DestCityName >= 'Durango, CO' OR TaxiIn = 106 OR OriginWac BETWEEN 71 AND 72 GROUP BY DepartureDelayGroups, FlightNum, ArrDelay  ORDER BY DepartureDelayGroups, FlightNum, ArrDelay LIMIT 25","hsqls":["SELECT DepartureDelayGroups, FlightNum, ArrDelay, SUM(CarrierDelay) FROM mytable WHERE DestCityName >= 'Durango, CO' OR TaxiIn = 106 OR OriginWac BETWEEN 71 AND 72 GROUP BY DepartureDelayGroups, FlightNum, ArrDelay  ORDER BY DepartureDelayGroups, FlightNum, ArrDelay LIMIT 25"]}
 {"sql":"SELECT Carrier, ActualElapsedTime, UniqueCarrier FROM mytable ORDER BY OriginState, DivAirportLandings, WheelsOn LIMIT 28"}
 {"sql":"SELECT WeatherDelay, DestStateFips FROM mytable WHERE FlightNum > 4153 AND CRSElapsedTime BETWEEN 370 AND 178 AND DestStateFips BETWEEN 78 AND 28 ORDER BY FlightNum, Dest LIMIT 13"}
-{"sql":"SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek) FROM mytable WHERE DivWheelsOffs >= 2009 AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 29","hsqls":["SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek)  FROM mytable WHERE (DivWheelsOffs__MV0 >= 2009 OR DivWheelsOffs__MV1 >= 2009 OR DivWheelsOffs__MV2 >= 2009 OR DivWheelsOffs__MV3 >= 2009 OR DivWheelsOffs__MV4 >= 2009) AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 10000"]}
-{"sql":"SELECT CancellationCode FROM mytable WHERE DayOfWeek NOT IN (2, 1, 7, 5, 4) OR FlightDate BETWEEN '2014-01-07' AND '2014-01-23' AND DivWheelsOffs = 2131 ORDER BY \"Month\" LIMIT 12","hsqls":["SELECT CancellationCode FROM mytable WHERE DayOfWeek NOT IN (2, 1, 7, 5, 4) OR FlightDate BETWEEN '2014-01-07' AND '2014-01-23' AND (DivWheelsOffs__MV0 = 2131 OR DivWheelsOffs__MV1 = 2131 OR DivWheelsOffs__MV2 = 2131 OR DivWheelsOffs__MV3 = 2131 OR DivWheelsOffs__MV4 = 2131) ORDER BY Month LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, SecurityDelay, ActualElapsedTime FROM mytable WHERE DayofMonth BETWEEN 9 AND 2 OR \"Month\" >= 1 OR Dest BETWEEN 'DAB' AND 'BKG' LIMIT 10","hsqls":["SELECT WeatherDelay, SecurityDelay, ActualElapsedTime FROM mytable WHERE DayofMonth BETWEEN 9 AND 2 OR Month >= 1 OR Dest BETWEEN 'DAB' AND 'BKG' LIMIT 10"]}
+{"sql":"SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek) FROM mytable WHERE DivWheelsOffs >= 2009 AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 29","hsqls":["SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek)  FROM mytable WHERE (DivWheelsOffs[1] >= 2009 OR DivWheelsOffs[2] >= 2009 OR DivWheelsOffs[3] >= 2009 OR DivWheelsOffs[4] >= 2009 OR DivWheelsOffs[5] >= 2009) AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 10000"]}
+{"sql":"SELECT CancellationCode FROM mytable WHERE DayOfWeek NOT IN (2, 1, 7, 5, 4) OR FlightDate BETWEEN '2014-01-07' AND '2014-01-23' AND DivWheelsOffs = 2131 ORDER BY \"Month\" LIMIT 12","hsqls":["SELECT CancellationCode FROM mytable WHERE DayOfWeek NOT IN (2, 1, 7, 5, 4) OR FlightDate BETWEEN '2014-01-07' AND '2014-01-23' AND (DivWheelsOffs[1] = 2131 OR DivWheelsOffs[2] = 2131 OR DivWheelsOffs[3] = 2131 OR DivWheelsOffs[4] = 2131 OR DivWheelsOffs[5] = 2131) ORDER BY `Month` LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, SecurityDelay, ActualElapsedTime FROM mytable WHERE DayofMonth BETWEEN 9 AND 2 OR \"Month\" >= 1 OR Dest BETWEEN 'DAB' AND 'BKG' LIMIT 10","hsqls":["SELECT WeatherDelay, SecurityDelay, ActualElapsedTime FROM mytable WHERE DayofMonth BETWEEN 9 AND 2 OR `Month` >= 1 OR Dest BETWEEN 'DAB' AND 'BKG' LIMIT 10"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DayofMonth > 4 ORDER BY Diverted, DestAirportSeqID LIMIT 24"}
-{"sql":"SELECT OriginStateFips, Origin, COUNT(\"Month\"), AVG(FlightNum) FROM mytable GROUP BY OriginStateFips, Origin LIMIT 11","hsqls":["SELECT OriginStateFips, Origin, COUNT(Month), AVG(FlightNum) FROM mytable GROUP BY OriginStateFips, Origin LIMIT 11"]}
+{"sql":"SELECT OriginStateFips, Origin, COUNT(\"Month\"), AVG(FlightNum) FROM mytable GROUP BY OriginStateFips, Origin LIMIT 11","hsqls":["SELECT OriginStateFips, Origin, COUNT(`Month`), AVG(FlightNum) FROM mytable GROUP BY OriginStateFips, Origin LIMIT 11"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE AirTime NOT IN (69) OR DepDel15 > -9999 AND SecurityDelay = 0 LIMIT 10"}
 {"sql":"SELECT TaxiIn, DepDel15, MAX(FirstDepTime), MAX(DivActualElapsedTime), MAX(WeatherDelay) FROM mytable WHERE WeatherDelay <= 16 GROUP BY TaxiIn, DepDel15  ORDER BY TaxiIn, DepDel15 LIMIT 7","hsqls":["SELECT TaxiIn, DepDel15, MAX(FirstDepTime), MAX(DivActualElapsedTime), MAX(WeatherDelay) FROM mytable WHERE WeatherDelay <= 16 GROUP BY TaxiIn, DepDel15  ORDER BY TaxiIn, DepDel15 LIMIT 7"]}
-{"sql":"SELECT CancellationCode, \"Month\" FROM mytable WHERE Diverted <= 0 ORDER BY OriginState, Quarter LIMIT 19","hsqls":["SELECT CancellationCode, Month FROM mytable WHERE Diverted <= 0 ORDER BY OriginState, Quarter LIMIT 19"]}
+{"sql":"SELECT CancellationCode, \"Month\" FROM mytable WHERE Diverted <= 0 ORDER BY OriginState, Quarter LIMIT 19","hsqls":["SELECT CancellationCode, `Month` FROM mytable WHERE Diverted <= 0 ORDER BY OriginState, Quarter LIMIT 19"]}
 {"sql":"SELECT DepDelay, TotalAddGTime, DestStateName, MIN(OriginAirportID), AVG(LateAircraftDelay) FROM mytable WHERE SecurityDelay BETWEEN 4 AND 0 GROUP BY DepDelay, TotalAddGTime, DestStateName  ORDER BY DepDelay, TotalAddGTime, DestStateName LIMIT 27","hsqls":["SELECT DepDelay, TotalAddGTime, DestStateName, MIN(OriginAirportID), AVG(LateAircraftDelay) FROM mytable WHERE SecurityDelay BETWEEN 4 AND 0 GROUP BY DepDelay, TotalAddGTime, DestStateName  ORDER BY DepDelay, TotalAddGTime, DestStateName LIMIT 27"]}
-{"sql":"SELECT Diverted, COUNT(Dest), AVG(DestStateFips) FROM mytable WHERE DivTotalGTimes < 2 OR DivWheelsOffs < 901 OR ArrTimeBlk = '1700-1759' GROUP BY Diverted LIMIT 4","hsqls":["SELECT Diverted, COUNT(Dest), AVG(DestStateFips) FROM mytable WHERE (DivTotalGTimes__MV0 < 2 OR DivTotalGTimes__MV1 < 2 OR DivTotalGTimes__MV2 < 2 OR DivTotalGTimes__MV3 < 2 OR DivTotalGTimes__MV4 < 2) OR (DivWheelsOffs__MV0 < 901 OR DivWheelsOffs__MV1 < 901 OR DivWheelsOffs__MV2 < 901 OR DivWheelsOffs__MV3 < 901 OR DivWheelsOffs__MV4 < 901) OR ArrTimeBlk = '1700-1759' GROUP BY Diverted LIMIT 10000"]}
+{"sql":"SELECT Diverted, COUNT(Dest), AVG(DestStateFips) FROM mytable WHERE DivTotalGTimes < 2 OR DivWheelsOffs < 901 OR ArrTimeBlk = '1700-1759' GROUP BY Diverted LIMIT 4","hsqls":["SELECT Diverted, COUNT(Dest), AVG(DestStateFips) FROM mytable WHERE (DivTotalGTimes[1] < 2 OR DivTotalGTimes[2] < 2 OR DivTotalGTimes[3] < 2 OR DivTotalGTimes[4] < 2 OR DivTotalGTimes[5] < 2) OR (DivWheelsOffs[1] < 901 OR DivWheelsOffs[2] < 901 OR DivWheelsOffs[3] < 901 OR DivWheelsOffs[4] < 901 OR DivWheelsOffs[5] < 901) OR ArrTimeBlk = '1700-1759' GROUP BY Diverted LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DivArrDelay FROM mytable WHERE DestCityName <= 'Minneapolis, MN' ORDER BY Diverted, UniqueCarrier LIMIT 16"}
 {"sql":"SELECT SUM(DepDel15), SUM(WeatherDelay), AVG(Cancelled) FROM mytable LIMIT 16"}
 {"sql":"SELECT TaxiIn, ArrTime, ArrDel15, MAX(TotalAddGTime), MIN(DestCityMarketID) FROM mytable WHERE ArrivalDelayGroups >= 10 OR FlightNum IN (493, 446, 1696, 553) OR DaysSinceEpoch BETWEEN 16085 AND 16083 GROUP BY TaxiIn, ArrTime, ArrDel15  ORDER BY TaxiIn, ArrTime, ArrDel15 LIMIT 2","hsqls":["SELECT TaxiIn, ArrTime, ArrDel15, MAX(TotalAddGTime), MIN(DestCityMarketID) FROM mytable WHERE ArrivalDelayGroups >= 10 OR FlightNum IN (493, 446, 1696, 553) OR DaysSinceEpoch BETWEEN 16085 AND 16083 GROUP BY TaxiIn, ArrTime, ArrDel15  ORDER BY TaxiIn, ArrTime, ArrDel15 LIMIT 2"]}
 {"sql":"SELECT DepDel15, WheelsOn, DivArrDelay FROM mytable WHERE DepDelayMinutes BETWEEN 252.0 AND 85.0 ORDER BY DepDelayMinutes LIMIT 19"}
-{"sql":"SELECT DivAirports FROM mytable ORDER BY DivDistance, TotalAddGTime LIMIT 6","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY DivDistance, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable ORDER BY DivDistance, TotalAddGTime LIMIT 6","hsqls":["SELECT DivAirports FROM mytable ORDER BY DivDistance, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT ArrTime, COUNT(*) FROM mytable WHERE DepDelay BETWEEN 337.0 AND 324.0 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 23","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable WHERE DepDelay BETWEEN 337.0 AND 324.0 GROUP BY ArrTime  ORDER BY ArrTime LIMIT 23"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE OriginAirportSeqID IN (1385103) ORDER BY ArrDelay"}
 {"sql":"SELECT DistanceGroup, Diverted FROM mytable WHERE DistanceGroup > 2 ORDER BY CRSArrTime LIMIT 12"}
@@ -6658,123 +6658,123 @@
 {"sql":"SELECT MIN(Diverted) FROM mytable WHERE TailNum BETWEEN 'N661JB' AND 'N353AT' LIMIT 29"}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE Dest NOT IN ('SNA', 'GTR', 'STT') ORDER BY CarrierDelay, ArrTime, DivActualElapsedTime"}
 {"sql":"SELECT Origin, ArrivalDelayGroups, DayOfWeek, COUNT(OriginCityMarketID), AVG(DestCityMarketID), MAX(AirTime) FROM mytable WHERE Carrier <= 'F9' AND DayofMonth <= 22 GROUP BY Origin, ArrivalDelayGroups, DayOfWeek  ORDER BY Origin, ArrivalDelayGroups, DayOfWeek LIMIT 21","hsqls":["SELECT Origin, ArrivalDelayGroups, DayOfWeek, COUNT(OriginCityMarketID), AVG(DestCityMarketID), MAX(AirTime) FROM mytable WHERE Carrier <= 'F9' AND DayofMonth <= 22 GROUP BY Origin, ArrivalDelayGroups, DayOfWeek  ORDER BY Origin, ArrivalDelayGroups, DayOfWeek LIMIT 21"]}
-{"sql":"SELECT Distance, DestStateName, Origin FROM mytable WHERE ArrDelay BETWEEN -27.0 AND 238.0 OR DivTotalGTimes BETWEEN 15 AND 75 OR OriginCityName NOT IN ('Detroit, MI') ORDER BY WheelsOff, FlightDate, DestAirportID LIMIT 15","hsqls":["SELECT Distance, DestStateName, Origin FROM mytable WHERE ArrDelay BETWEEN -27.0 AND 238.0 OR (DivTotalGTimes__MV0 BETWEEN 15 AND 75 OR DivTotalGTimes__MV1 BETWEEN 15 AND 75 OR DivTotalGTimes__MV2 BETWEEN 15 AND 75 OR DivTotalGTimes__MV3 BETWEEN 15 AND 75 OR DivTotalGTimes__MV4 BETWEEN 15 AND 75) OR OriginCityName NOT IN ('Detroit, MI') ORDER BY WheelsOff, FlightDate, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT Distance, DestStateName, Origin FROM mytable WHERE ArrDelay BETWEEN -27.0 AND 238.0 OR DivTotalGTimes BETWEEN 15 AND 75 OR OriginCityName NOT IN ('Detroit, MI') ORDER BY WheelsOff, FlightDate, DestAirportID LIMIT 15","hsqls":["SELECT Distance, DestStateName, Origin FROM mytable WHERE ArrDelay BETWEEN -27.0 AND 238.0 OR (DivTotalGTimes[1] BETWEEN 15 AND 75 OR DivTotalGTimes[2] BETWEEN 15 AND 75 OR DivTotalGTimes[3] BETWEEN 15 AND 75 OR DivTotalGTimes[4] BETWEEN 15 AND 75 OR DivTotalGTimes[5] BETWEEN 15 AND 75) OR OriginCityName NOT IN ('Detroit, MI') ORDER BY WheelsOff, FlightDate, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT MIN(CRSDepTime), SUM(ActualElapsedTime) FROM mytable LIMIT 7"}
 {"sql":"SELECT DepTime, AirlineID FROM mytable WHERE ArrDelay BETWEEN 83.0 AND 269.0 OR DivAirportLandings BETWEEN 1 AND 9 ORDER BY DepartureDelayGroups, Carrier LIMIT 12"}
 {"sql":"SELECT Diverted, OriginStateFips, DestCityName, SUM(DayofMonth) FROM mytable WHERE FlightNum < 3526 OR CRSDepTime NOT IN (1658) GROUP BY Diverted, OriginStateFips, DestCityName  ORDER BY Diverted, OriginStateFips, DestCityName LIMIT 12","hsqls":["SELECT Diverted, OriginStateFips, DestCityName, SUM(DayofMonth) FROM mytable WHERE FlightNum < 3526 OR CRSDepTime NOT IN (1658) GROUP BY Diverted, OriginStateFips, DestCityName  ORDER BY Diverted, OriginStateFips, DestCityName LIMIT 12"]}
-{"sql":"SELECT LongestAddGTime, ArrDelay, COUNT(*) FROM mytable WHERE OriginAirportSeqID >= 1017001 OR DivWheelsOns BETWEEN 2110 AND 1656 GROUP BY LongestAddGTime, ArrDelay LIMIT 23","hsqls":["SELECT LongestAddGTime, ArrDelay, COUNT(*) FROM mytable WHERE OriginAirportSeqID >= 1017001 OR (DivWheelsOns__MV0 BETWEEN 2110 AND 1656 OR DivWheelsOns__MV1 BETWEEN 2110 AND 1656 OR DivWheelsOns__MV2 BETWEEN 2110 AND 1656 OR DivWheelsOns__MV3 BETWEEN 2110 AND 1656 OR DivWheelsOns__MV4 BETWEEN 2110 AND 1656) GROUP BY LongestAddGTime, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, ArrDelay, COUNT(*) FROM mytable WHERE OriginAirportSeqID >= 1017001 OR DivWheelsOns BETWEEN 2110 AND 1656 GROUP BY LongestAddGTime, ArrDelay LIMIT 23","hsqls":["SELECT LongestAddGTime, ArrDelay, COUNT(*) FROM mytable WHERE OriginAirportSeqID >= 1017001 OR (DivWheelsOns[1] BETWEEN 2110 AND 1656 OR DivWheelsOns[2] BETWEEN 2110 AND 1656 OR DivWheelsOns[3] BETWEEN 2110 AND 1656 OR DivWheelsOns[4] BETWEEN 2110 AND 1656 OR DivWheelsOns[5] BETWEEN 2110 AND 1656) GROUP BY LongestAddGTime, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DepTimeBlk, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE FlightNum IN (4580) GROUP BY OriginStateFips, DepTimeBlk, ArrivalDelayGroups  ORDER BY OriginStateFips, DepTimeBlk, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT OriginStateFips, DepTimeBlk, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE FlightNum IN (4580) GROUP BY OriginStateFips, DepTimeBlk, ArrivalDelayGroups  ORDER BY OriginStateFips, DepTimeBlk, ArrivalDelayGroups LIMIT 16"]}
 {"sql":"SELECT WheelsOff, DestStateFips, AirlineID, MIN(DestAirportSeqID) FROM mytable WHERE OriginStateFips BETWEEN 20 AND 27 GROUP BY WheelsOff, DestStateFips, AirlineID  ORDER BY WheelsOff, DestStateFips, AirlineID LIMIT 18","hsqls":["SELECT WheelsOff, DestStateFips, AirlineID, MIN(DestAirportSeqID) FROM mytable WHERE OriginStateFips BETWEEN 20 AND 27 GROUP BY WheelsOff, DestStateFips, AirlineID  ORDER BY WheelsOff, DestStateFips, AirlineID LIMIT 18"]}
 {"sql":"SELECT Distance FROM mytable WHERE ArrDelayMinutes NOT IN (179.0, 192.0, 98.0, 29.0, 122.0) LIMIT 19"}
-{"sql":"SELECT Origin, \"Month\" FROM mytable WHERE Distance > 337 ORDER BY CancellationCode LIMIT 21","hsqls":["SELECT Origin, Month FROM mytable WHERE Distance > 337 ORDER BY CancellationCode LIMIT 21"]}
+{"sql":"SELECT Origin, \"Month\" FROM mytable WHERE Distance > 337 ORDER BY CancellationCode LIMIT 21","hsqls":["SELECT Origin, `Month` FROM mytable WHERE Distance > 337 ORDER BY CancellationCode LIMIT 21"]}
 {"sql":"SELECT \"Year\", TailNum, DivArrDelay, COUNT(*) FROM mytable GROUP BY \"Year\", TailNum, DivArrDelay LIMIT 25","hsqls":["SELECT Year, TailNum, DivArrDelay, COUNT(*) FROM mytable GROUP BY Year, TailNum, DivArrDelay LIMIT 25"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 56 AND 487 OR DestStateFips NOT IN (31) LIMIT 1"}
-{"sql":"SELECT WheelsOff, \"Month\", DivActualElapsedTime, COUNT(CRSDepTime), MIN(DestAirportSeqID) FROM mytable WHERE DivAirportIDs > 11042 AND DivTotalGTimes >= 196 GROUP BY WheelsOff, \"Month\", DivActualElapsedTime LIMIT 10","hsqls":["SELECT WheelsOff, Month, DivActualElapsedTime, COUNT(CRSDepTime), MIN(DestAirportSeqID) FROM mytable WHERE (DivAirportIDs__MV0 > 11042 OR DivAirportIDs__MV1 > 11042 OR DivAirportIDs__MV2 > 11042 OR DivAirportIDs__MV3 > 11042 OR DivAirportIDs__MV4 > 11042) AND (DivTotalGTimes__MV0 >= 196 OR DivTotalGTimes__MV1 >= 196 OR DivTotalGTimes__MV2 >= 196 OR DivTotalGTimes__MV3 >= 196 OR DivTotalGTimes__MV4 >= 196) GROUP BY WheelsOff, Month, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT SUM(CRSArrTime), AVG(FirstDepTime), AVG(OriginAirportID) FROM mytable WHERE OriginCityMarketID NOT IN (31205, 31624, 30980, 31097) AND DivAirports >= 'ELP' LIMIT 10","hsqls":["SELECT SUM(CRSArrTime), AVG(FirstDepTime), AVG(OriginAirportID)  FROM mytable WHERE OriginCityMarketID NOT IN (31205, 31624, 30980, 31097) AND (DivAirports__MV0 >= 'ELP' OR DivAirports__MV1 >= 'ELP' OR DivAirports__MV2 >= 'ELP' OR DivAirports__MV3 >= 'ELP' OR DivAirports__MV4 >= 'ELP') LIMIT 10000"]}
-{"sql":"SELECT SUM(ArrDelayMinutes), COUNT(OriginWac), MAX(FlightNum) FROM mytable WHERE DivAirportIDs >= 13830 AND CRSElapsedTime <= 553 LIMIT 20","hsqls":["SELECT SUM(ArrDelayMinutes), COUNT(OriginWac), MAX(FlightNum)  FROM mytable WHERE (DivAirportIDs__MV0 >= 13830 OR DivAirportIDs__MV1 >= 13830 OR DivAirportIDs__MV2 >= 13830 OR DivAirportIDs__MV3 >= 13830 OR DivAirportIDs__MV4 >= 13830) AND CRSElapsedTime <= 553 LIMIT 10000"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'OO' OR DestStateName = 'Delaware' ORDER BY ArrTimeBlk, Origin, DivAirportLandings LIMIT 28","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'OO' OR DestStateName = 'Delaware' ORDER BY ArrTimeBlk, Origin, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, \"Month\", DivActualElapsedTime, COUNT(CRSDepTime), MIN(DestAirportSeqID) FROM mytable WHERE DivAirportIDs > 11042 AND DivTotalGTimes >= 196 GROUP BY WheelsOff, \"Month\", DivActualElapsedTime LIMIT 10","hsqls":["SELECT WheelsOff, Month, DivActualElapsedTime, COUNT(CRSDepTime), MIN(DestAirportSeqID) FROM mytable WHERE (DivAirportIDs[1] > 11042 OR DivAirportIDs[2] > 11042 OR DivAirportIDs[3] > 11042 OR DivAirportIDs[4] > 11042 OR DivAirportIDs[5] > 11042) AND (DivTotalGTimes[1] >= 196 OR DivTotalGTimes[2] >= 196 OR DivTotalGTimes[3] >= 196 OR DivTotalGTimes[4] >= 196 OR DivTotalGTimes[5] >= 196) GROUP BY WheelsOff, Month, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT SUM(CRSArrTime), AVG(FirstDepTime), AVG(OriginAirportID) FROM mytable WHERE OriginCityMarketID NOT IN (31205, 31624, 30980, 31097) AND DivAirports >= 'ELP' LIMIT 10","hsqls":["SELECT SUM(CRSArrTime), AVG(FirstDepTime), AVG(OriginAirportID)  FROM mytable WHERE OriginCityMarketID NOT IN (31205, 31624, 30980, 31097) AND (DivAirports[1] >= 'ELP' OR DivAirports[2] >= 'ELP' OR DivAirports[3] >= 'ELP' OR DivAirports[4] >= 'ELP' OR DivAirports[5] >= 'ELP') LIMIT 10000"]}
+{"sql":"SELECT SUM(ArrDelayMinutes), COUNT(OriginWac), MAX(FlightNum) FROM mytable WHERE DivAirportIDs >= 13830 AND CRSElapsedTime <= 553 LIMIT 20","hsqls":["SELECT SUM(ArrDelayMinutes), COUNT(OriginWac), MAX(FlightNum)  FROM mytable WHERE (DivAirportIDs[1] >= 13830 OR DivAirportIDs[2] >= 13830 OR DivAirportIDs[3] >= 13830 OR DivAirportIDs[4] >= 13830 OR DivAirportIDs[5] >= 13830) AND CRSElapsedTime <= 553 LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'OO' OR DestStateName = 'Delaware' ORDER BY ArrTimeBlk, Origin, DivAirportLandings LIMIT 28","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'OO' OR DestStateName = 'Delaware' ORDER BY ArrTimeBlk, Origin, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DepTime IN (1653, 1740, 1722, 1332) AND AirlineID >= 19930 OR OriginStateName BETWEEN 'Louisiana' AND 'Wyoming' ORDER BY OriginAirportSeqID, ArrTime LIMIT 2"}
-{"sql":"SELECT Quarter, UniqueCarrier, DayOfWeek FROM mytable WHERE DivTailNums IN ('N452WN') AND CRSArrTime BETWEEN 2224 AND 1338 ORDER BY Diverted, OriginStateFips LIMIT 28","hsqls":["SELECT Quarter, UniqueCarrier, DayOfWeek FROM mytable WHERE (DivTailNums__MV0 IN ('N452WN') OR DivTailNums__MV1 IN ('N452WN') OR DivTailNums__MV2 IN ('N452WN') OR DivTailNums__MV3 IN ('N452WN') OR DivTailNums__MV4 IN ('N452WN')) AND CRSArrTime BETWEEN 2224 AND 1338 ORDER BY Diverted, OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT Quarter, UniqueCarrier, DayOfWeek FROM mytable WHERE DivTailNums IN ('N452WN') AND CRSArrTime BETWEEN 2224 AND 1338 ORDER BY Diverted, OriginStateFips LIMIT 28","hsqls":["SELECT Quarter, UniqueCarrier, DayOfWeek FROM mytable WHERE (DivTailNums[1] IN ('N452WN') OR DivTailNums[2] IN ('N452WN') OR DivTailNums[3] IN ('N452WN') OR DivTailNums[4] IN ('N452WN') OR DivTailNums[5] IN ('N452WN')) AND CRSArrTime BETWEEN 2224 AND 1338 ORDER BY Diverted, OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT TailNum, WheelsOn, UniqueCarrier, COUNT(*) FROM mytable GROUP BY TailNum, WheelsOn, UniqueCarrier  ORDER BY TailNum, WheelsOn, UniqueCarrier LIMIT 5","hsqls":["SELECT TailNum, WheelsOn, UniqueCarrier, COUNT(*) FROM mytable GROUP BY TailNum, WheelsOn, UniqueCarrier  ORDER BY TailNum, WheelsOn, UniqueCarrier LIMIT 5"]}
-{"sql":"SELECT AirlineID, \"Month\", COUNT(*) FROM mytable GROUP BY AirlineID, \"Month\" LIMIT 7","hsqls":["SELECT AirlineID, Month, COUNT(*) FROM mytable GROUP BY AirlineID, Month LIMIT 7"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 9 ORDER BY Diverted, LongestAddGTime LIMIT 22","hsqls":["SELECT Year FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 9 ORDER BY Diverted, LongestAddGTime LIMIT 22"]}
+{"sql":"SELECT AirlineID, \"Month\", COUNT(*) FROM mytable GROUP BY AirlineID, \"Month\" LIMIT 7","hsqls":["SELECT AirlineID, Month, COUNT(*) FROM mytable GROUP BY AirlineID, `Month` LIMIT 7"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 9 ORDER BY Diverted, LongestAddGTime LIMIT 22","hsqls":["SELECT `Year` FROM mytable WHERE ArrivalDelayGroups BETWEEN -9999 AND 9 ORDER BY Diverted, LongestAddGTime LIMIT 22"]}
 {"sql":"SELECT Flights, DayOfWeek FROM mytable WHERE WheelsOff BETWEEN 1310 AND 1904 ORDER BY SecurityDelay, Dest, DayOfWeek LIMIT 6"}
 {"sql":"SELECT FirstDepTime, DestAirportID, DayOfWeek, COUNT(*) FROM mytable WHERE CRSDepTime <> 2350 GROUP BY FirstDepTime, DestAirportID, DayOfWeek  ORDER BY FirstDepTime, DestAirportID, DayOfWeek LIMIT 29","hsqls":["SELECT FirstDepTime, DestAirportID, DayOfWeek, COUNT(*) FROM mytable WHERE CRSDepTime <> 2350 GROUP BY FirstDepTime, DestAirportID, DayOfWeek  ORDER BY FirstDepTime, DestAirportID, DayOfWeek LIMIT 29"]}
-{"sql":"SELECT NASDelay, Origin FROM mytable WHERE DivWheelsOns BETWEEN 2237 AND 1408 LIMIT 20","hsqls":["SELECT NASDelay, Origin FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 2237 AND 1408 OR DivWheelsOns__MV1 BETWEEN 2237 AND 1408 OR DivWheelsOns__MV2 BETWEEN 2237 AND 1408 OR DivWheelsOns__MV3 BETWEEN 2237 AND 1408 OR DivWheelsOns__MV4 BETWEEN 2237 AND 1408) LIMIT 10000"]}
+{"sql":"SELECT NASDelay, Origin FROM mytable WHERE DivWheelsOns BETWEEN 2237 AND 1408 LIMIT 20","hsqls":["SELECT NASDelay, Origin FROM mytable WHERE (DivWheelsOns[1] BETWEEN 2237 AND 1408 OR DivWheelsOns[2] BETWEEN 2237 AND 1408 OR DivWheelsOns[3] BETWEEN 2237 AND 1408 OR DivWheelsOns[4] BETWEEN 2237 AND 1408 OR DivWheelsOns[5] BETWEEN 2237 AND 1408) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, DestCityMarketID FROM mytable WHERE ArrDelay IN (255.0, -25.0) ORDER BY WheelsOff LIMIT 18"}
 {"sql":"SELECT Dest, Origin, DivArrDelay FROM mytable ORDER BY DestStateFips, OriginStateName LIMIT 7"}
 {"sql":"SELECT UniqueCarrier, DaysSinceEpoch, MAX(Cancelled) FROM mytable WHERE AirTime IN (99) GROUP BY UniqueCarrier, DaysSinceEpoch  ORDER BY UniqueCarrier, DaysSinceEpoch LIMIT 15","hsqls":["SELECT UniqueCarrier, DaysSinceEpoch, MAX(Cancelled) FROM mytable WHERE AirTime IN (99) GROUP BY UniqueCarrier, DaysSinceEpoch  ORDER BY UniqueCarrier, DaysSinceEpoch LIMIT 15"]}
-{"sql":"SELECT OriginAirportSeqID, DepartureDelayGroups, \"Year\" FROM mytable WHERE SecurityDelay < 14 AND CancellationCode >= 'B' AND OriginWac <= 93 ORDER BY Carrier LIMIT 11","hsqls":["SELECT OriginAirportSeqID, DepartureDelayGroups, Year FROM mytable WHERE SecurityDelay < 14 AND CancellationCode >= 'B' AND OriginWac <= 93 ORDER BY Carrier LIMIT 11"]}
+{"sql":"SELECT OriginAirportSeqID, DepartureDelayGroups, \"Year\" FROM mytable WHERE SecurityDelay < 14 AND CancellationCode >= 'B' AND OriginWac <= 93 ORDER BY Carrier LIMIT 11","hsqls":["SELECT OriginAirportSeqID, DepartureDelayGroups, `Year` FROM mytable WHERE SecurityDelay < 14 AND CancellationCode >= 'B' AND OriginWac <= 93 ORDER BY Carrier LIMIT 11"]}
 {"sql":"SELECT Cancelled, COUNT(*) FROM mytable GROUP BY Cancelled  ORDER BY Cancelled LIMIT 21","hsqls":["SELECT Cancelled, COUNT(*) FROM mytable GROUP BY Cancelled  ORDER BY Cancelled LIMIT 21"]}
 {"sql":"SELECT DepDelay FROM mytable ORDER BY FlightNum, DepDel15 LIMIT 4"}
 {"sql":"SELECT \"Year\", OriginCityName, ArrDelayMinutes, MIN(DestAirportID), COUNT(FlightDate), COUNT(DivAirportLandings) FROM mytable WHERE DepDel15 BETWEEN -9999 AND -9999 AND DepTimeBlk < '2200-2259' GROUP BY \"Year\", OriginCityName, ArrDelayMinutes LIMIT 13","hsqls":["SELECT Year, OriginCityName, ArrDelayMinutes, MIN(DestAirportID), COUNT(FlightDate), COUNT(DivAirportLandings) FROM mytable WHERE DepDel15 BETWEEN -9999 AND -9999 AND DepTimeBlk < '2200-2259' GROUP BY Year, OriginCityName, ArrDelayMinutes LIMIT 13"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE WheelsOff <= 1500 ORDER BY DivReachedDest LIMIT 19"}
-{"sql":"SELECT DivArrDelay FROM mytable WHERE DivAirports IN ('SJC') OR DepTimeBlk < '0900-0959' ORDER BY WheelsOff, FlightNum, Distance LIMIT 5","hsqls":["SELECT DivArrDelay FROM mytable WHERE (DivAirports__MV0 IN ('SJC') OR DivAirports__MV1 IN ('SJC') OR DivAirports__MV2 IN ('SJC') OR DivAirports__MV3 IN ('SJC') OR DivAirports__MV4 IN ('SJC')) OR DepTimeBlk < '0900-0959' ORDER BY WheelsOff, FlightNum, Distance LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes FROM mytable WHERE DivAirportSeqIDs <= 1400602 ORDER BY DepDelayMinutes, DestStateName, ArrDel15 LIMIT 22","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1400602 OR DivAirportSeqIDs__MV1 <= 1400602 OR DivAirportSeqIDs__MV2 <= 1400602 OR DivAirportSeqIDs__MV3 <= 1400602 OR DivAirportSeqIDs__MV4 <= 1400602) ORDER BY DepDelayMinutes, DestStateName, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DivArrDelay FROM mytable WHERE DivAirports IN ('SJC') OR DepTimeBlk < '0900-0959' ORDER BY WheelsOff, FlightNum, Distance LIMIT 5","hsqls":["SELECT DivArrDelay FROM mytable WHERE (DivAirports[1] IN ('SJC') OR DivAirports[2] IN ('SJC') OR DivAirports[3] IN ('SJC') OR DivAirports[4] IN ('SJC') OR DivAirports[5] IN ('SJC')) OR DepTimeBlk < '0900-0959' ORDER BY WheelsOff, FlightNum, Distance LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes FROM mytable WHERE DivAirportSeqIDs <= 1400602 ORDER BY DepDelayMinutes, DestStateName, ArrDel15 LIMIT 22","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE (DivAirportSeqIDs[1] <= 1400602 OR DivAirportSeqIDs[2] <= 1400602 OR DivAirportSeqIDs[3] <= 1400602 OR DivAirportSeqIDs[4] <= 1400602 OR DivAirportSeqIDs[5] <= 1400602) ORDER BY DepDelayMinutes, DestStateName, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DepDelay FROM mytable ORDER BY CRSDepTime LIMIT 23"}
 {"sql":"SELECT WheelsOff FROM mytable WHERE WeatherDelay BETWEEN 18 AND 112 OR DivReachedDest < -9999 LIMIT 27"}
 {"sql":"SELECT WheelsOff, DepDelay, OriginStateFips, MIN(AirTime), AVG(DepDel15), COUNT(DivAirportLandings) FROM mytable GROUP BY WheelsOff, DepDelay, OriginStateFips  ORDER BY WheelsOff, DepDelay, OriginStateFips LIMIT 3","hsqls":["SELECT WheelsOff, DepDelay, OriginStateFips, MIN(AirTime), AVG(DepDel15), COUNT(DivAirportLandings) FROM mytable GROUP BY WheelsOff, DepDelay, OriginStateFips  ORDER BY WheelsOff, DepDelay, OriginStateFips LIMIT 3"]}
-{"sql":"SELECT LongestAddGTime, DepTime, Origin FROM mytable WHERE \"Year\" <> 2014 ORDER BY \"Year\", OriginCityMarketID LIMIT 26","hsqls":["SELECT LongestAddGTime, DepTime, Origin FROM mytable WHERE Year <> 2014 ORDER BY Year, OriginCityMarketID LIMIT 26"]}
+{"sql":"SELECT LongestAddGTime, DepTime, Origin FROM mytable WHERE \"Year\" <> 2014 ORDER BY \"Year\", OriginCityMarketID LIMIT 26","hsqls":["SELECT LongestAddGTime, DepTime, Origin FROM mytable WHERE `Year` <> 2014 ORDER BY Year, OriginCityMarketID LIMIT 26"]}
 {"sql":"SELECT COUNT(DestCityMarketID) FROM mytable LIMIT 13"}
-{"sql":"SELECT COUNT(DepTime) FROM mytable WHERE DivTailNums IN ('N3CYAA', 'N675AW') OR \"Month\" NOT IN (1) OR DivAirportIDs BETWEEN 14869 AND -9999 LIMIT 26","hsqls":["SELECT COUNT(DepTime) FROM mytable WHERE (DivTailNums__MV0 IN ('N3CYAA', 'N675AW') OR DivTailNums__MV1 IN ('N3CYAA', 'N675AW') OR DivTailNums__MV2 IN ('N3CYAA', 'N675AW') OR DivTailNums__MV3 IN ('N3CYAA', 'N675AW') OR DivTailNums__MV4 IN ('N3CYAA', 'N675AW')) OR Month NOT IN (1) OR (DivAirportIDs__MV0 BETWEEN 14869 AND -9999 OR DivAirportIDs__MV1 BETWEEN 14869 AND -9999 OR DivAirportIDs__MV2 BETWEEN 14869 AND -9999 OR DivAirportIDs__MV3 BETWEEN 14869 AND -9999 OR DivAirportIDs__MV4 BETWEEN 14869 AND -9999) LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepTime) FROM mytable WHERE DivTailNums IN ('N3CYAA', 'N675AW') OR \"Month\" NOT IN (1) OR DivAirportIDs BETWEEN 14869 AND -9999 LIMIT 26","hsqls":["SELECT COUNT(DepTime) FROM mytable WHERE (DivTailNums[1] IN ('N3CYAA', 'N675AW') OR DivTailNums[2] IN ('N3CYAA', 'N675AW') OR DivTailNums[3] IN ('N3CYAA', 'N675AW') OR DivTailNums[4] IN ('N3CYAA', 'N675AW') OR DivTailNums[5] IN ('N3CYAA', 'N675AW')) OR `Month` NOT IN (1) OR (DivAirportIDs[1] BETWEEN 14869 AND -9999 OR DivAirportIDs[2] BETWEEN 14869 AND -9999 OR DivAirportIDs[3] BETWEEN 14869 AND -9999 OR DivAirportIDs[4] BETWEEN 14869 AND -9999 OR DivAirportIDs[5] BETWEEN 14869 AND -9999) LIMIT 10000"]}
 {"sql":"SELECT MIN(DepDel15), AVG(ArrivalDelayGroups) FROM mytable WHERE Distance <= 554 OR OriginStateName BETWEEN 'North Dakota' AND 'California' LIMIT 23"}
 {"sql":"SELECT OriginCityMarketID, COUNT(WheelsOn), MIN(AirlineID) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 10","hsqls":["SELECT OriginCityMarketID, COUNT(WheelsOn), MIN(AirlineID) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 10"]}
 {"sql":"SELECT MIN(Quarter), MIN(DestCityMarketID), MIN(NASDelay) FROM mytable LIMIT 21"}
 {"sql":"SELECT Flights FROM mytable ORDER BY TaxiIn, DestCityMarketID, OriginWac LIMIT 6"}
 {"sql":"SELECT \"Year\", DayOfWeek, SUM(CRSArrTime), MIN(WheelsOff) FROM mytable WHERE DestState IN ('TX', 'MS', 'IL', 'MI') OR WeatherDelay IN (2, 10, 30, 62, 177) GROUP BY \"Year\", DayOfWeek LIMIT 16","hsqls":["SELECT Year, DayOfWeek, SUM(CRSArrTime), MIN(WheelsOff) FROM mytable WHERE DestState IN ('TX', 'MS', 'IL', 'MI') OR WeatherDelay IN (2, 10, 30, 62, 177) GROUP BY Year, DayOfWeek LIMIT 16"]}
 {"sql":"SELECT Quarter, CRSElapsedTime, DayOfWeek, AVG(TaxiOut), MIN(DepDel15), MIN(CRSElapsedTime) FROM mytable WHERE OriginWac NOT IN (93, 81) AND OriginAirportID = 10434 OR DestState > 'PA' GROUP BY Quarter, CRSElapsedTime, DayOfWeek  ORDER BY Quarter, CRSElapsedTime, DayOfWeek LIMIT 18","hsqls":["SELECT Quarter, CRSElapsedTime, DayOfWeek, AVG(TaxiOut), MIN(DepDel15), MIN(CRSElapsedTime) FROM mytable WHERE OriginWac NOT IN (93, 81) AND OriginAirportID = 10434 OR DestState > 'PA' GROUP BY Quarter, CRSElapsedTime, DayOfWeek  ORDER BY Quarter, CRSElapsedTime, DayOfWeek LIMIT 18"]}
-{"sql":"SELECT DestWac, TaxiIn, ArrivalDelayGroups FROM mytable WHERE DivWheelsOns <= 1814 AND Distance BETWEEN 1099 AND 110 AND DestCityName NOT IN ('Watertown, NY', 'Grand Rapids, MI', 'Kahului, HI', 'Salt Lake City, UT') ORDER BY Flights LIMIT 14","hsqls":["SELECT DestWac, TaxiIn, ArrivalDelayGroups FROM mytable WHERE (DivWheelsOns__MV0 <= 1814 OR DivWheelsOns__MV1 <= 1814 OR DivWheelsOns__MV2 <= 1814 OR DivWheelsOns__MV3 <= 1814 OR DivWheelsOns__MV4 <= 1814) AND Distance BETWEEN 1099 AND 110 AND DestCityName NOT IN ('Watertown, NY', 'Grand Rapids, MI', 'Kahului, HI', 'Salt Lake City, UT') ORDER BY Flights LIMIT 10000"]}
-{"sql":"SELECT DepDelay, Distance, ArrDelay FROM mytable WHERE DivTailNums BETWEEN 'N835UA' AND 'N483HA' OR WheelsOff <= 1201 LIMIT 2","hsqls":["SELECT DepDelay, Distance, ArrDelay FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums__MV1 BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums__MV2 BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums__MV3 BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums__MV4 BETWEEN 'N835UA' AND 'N483HA') OR WheelsOff <= 1201 LIMIT 10000"]}
+{"sql":"SELECT DestWac, TaxiIn, ArrivalDelayGroups FROM mytable WHERE DivWheelsOns <= 1814 AND Distance BETWEEN 1099 AND 110 AND DestCityName NOT IN ('Watertown, NY', 'Grand Rapids, MI', 'Kahului, HI', 'Salt Lake City, UT') ORDER BY Flights LIMIT 14","hsqls":["SELECT DestWac, TaxiIn, ArrivalDelayGroups FROM mytable WHERE (DivWheelsOns[1] <= 1814 OR DivWheelsOns[2] <= 1814 OR DivWheelsOns[3] <= 1814 OR DivWheelsOns[4] <= 1814 OR DivWheelsOns[5] <= 1814) AND Distance BETWEEN 1099 AND 110 AND DestCityName NOT IN ('Watertown, NY', 'Grand Rapids, MI', 'Kahului, HI', 'Salt Lake City, UT') ORDER BY Flights LIMIT 10000"]}
+{"sql":"SELECT DepDelay, Distance, ArrDelay FROM mytable WHERE DivTailNums BETWEEN 'N835UA' AND 'N483HA' OR WheelsOff <= 1201 LIMIT 2","hsqls":["SELECT DepDelay, Distance, ArrDelay FROM mytable WHERE (DivTailNums[1] BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums[2] BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums[3] BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums[4] BETWEEN 'N835UA' AND 'N483HA' OR DivTailNums[5] BETWEEN 'N835UA' AND 'N483HA') OR WheelsOff <= 1201 LIMIT 10000"]}
 {"sql":"SELECT MAX(DepDel15), SUM(Diverted) FROM mytable WHERE DestCityName = 'Laramie, WY'"}
 {"sql":"SELECT LongestAddGTime, AVG(ArrivalDelayGroups), AVG(AirlineID), SUM(DivDistance) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 10","hsqls":["SELECT LongestAddGTime, AVG(ArrivalDelayGroups), AVG(AirlineID), SUM(DivDistance) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 10"]}
 {"sql":"SELECT TaxiOut, DepDel15, OriginAirportID FROM mytable LIMIT 23"}
 {"sql":"SELECT CRSArrTime, DestStateFips, TailNum, AVG(Cancelled), MAX(LateAircraftDelay) FROM mytable WHERE DistanceGroup IN (3, 9) GROUP BY CRSArrTime, DestStateFips, TailNum  ORDER BY CRSArrTime, DestStateFips, TailNum LIMIT 17","hsqls":["SELECT CRSArrTime, DestStateFips, TailNum, AVG(Cancelled), MAX(LateAircraftDelay) FROM mytable WHERE DistanceGroup IN (3, 9) GROUP BY CRSArrTime, DestStateFips, TailNum  ORDER BY CRSArrTime, DestStateFips, TailNum LIMIT 17"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivAirportIDs BETWEEN 16101 AND 12266 OR OriginStateFips BETWEEN 45 AND 27 AND ArrDelay NOT IN (129.0, 184.0, 288.0) ORDER BY Flights LIMIT 3","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 16101 AND 12266 OR DivAirportIDs__MV1 BETWEEN 16101 AND 12266 OR DivAirportIDs__MV2 BETWEEN 16101 AND 12266 OR DivAirportIDs__MV3 BETWEEN 16101 AND 12266 OR DivAirportIDs__MV4 BETWEEN 16101 AND 12266) OR OriginStateFips BETWEEN 45 AND 27 AND ArrDelay NOT IN (129.0, 184.0, 288.0) ORDER BY Flights LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivAirportIDs BETWEEN 16101 AND 12266 OR OriginStateFips BETWEEN 45 AND 27 AND ArrDelay NOT IN (129.0, 184.0, 288.0) ORDER BY Flights LIMIT 3","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE (DivAirportIDs[1] BETWEEN 16101 AND 12266 OR DivAirportIDs[2] BETWEEN 16101 AND 12266 OR DivAirportIDs[3] BETWEEN 16101 AND 12266 OR DivAirportIDs[4] BETWEEN 16101 AND 12266 OR DivAirportIDs[5] BETWEEN 16101 AND 12266) OR OriginStateFips BETWEEN 45 AND 27 AND ArrDelay NOT IN (129.0, 184.0, 288.0) ORDER BY Flights LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, ArrTimeBlk, AirTime FROM mytable WHERE OriginState >= 'MS' OR Dest >= 'KOA' AND FlightNum BETWEEN 4360 AND 5293 ORDER BY Flights, ArrTime, DivActualElapsedTime LIMIT 22"}
 {"sql":"SELECT MIN(FlightNum), MIN(FirstDepTime), MAX(Distance) FROM mytable WHERE DepDelay BETWEEN -8.0 AND 82.0 LIMIT 28"}
 {"sql":"SELECT DepartureDelayGroups, OriginWac FROM mytable WHERE FirstDepTime IN (2146, 1856) AND FlightNum BETWEEN 313 AND 1692 OR DestWac BETWEEN 37 AND 93 LIMIT 8"}
 {"sql":"SELECT DistanceGroup, TaxiIn, COUNT(*) FROM mytable GROUP BY DistanceGroup, TaxiIn  ORDER BY DistanceGroup, TaxiIn LIMIT 23","hsqls":["SELECT DistanceGroup, TaxiIn, COUNT(*) FROM mytable GROUP BY DistanceGroup, TaxiIn  ORDER BY DistanceGroup, TaxiIn LIMIT 23"]}
 {"sql":"SELECT DepDelayMinutes, COUNT(*) FROM mytable WHERE DistanceGroup = 9 AND FlightNum < 397 OR DaysSinceEpoch NOT IN (16076, 16079) GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 14","hsqls":["SELECT DepDelayMinutes, COUNT(*) FROM mytable WHERE DistanceGroup = 9 AND FlightNum < 397 OR DaysSinceEpoch NOT IN (16076, 16079) GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 14"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1605 AND 1239 LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1605 AND 1239 OR DivWheelsOffs__MV1 BETWEEN 1605 AND 1239 OR DivWheelsOffs__MV2 BETWEEN 1605 AND 1239 OR DivWheelsOffs__MV3 BETWEEN 1605 AND 1239 OR DivWheelsOffs__MV4 BETWEEN 1605 AND 1239) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1605 AND 1239 LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1605 AND 1239 OR DivWheelsOffs[2] BETWEEN 1605 AND 1239 OR DivWheelsOffs[3] BETWEEN 1605 AND 1239 OR DivWheelsOffs[4] BETWEEN 1605 AND 1239 OR DivWheelsOffs[5] BETWEEN 1605 AND 1239) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, Diverted, DepTimeBlk, MIN(DestCityMarketID), SUM(DestCityMarketID) FROM mytable WHERE ArrDelayMinutes NOT IN (170.0, 320.0, 104.0, 218.0, 97.0) AND DestState BETWEEN 'MT' AND 'ID' GROUP BY DivReachedDest, Diverted, DepTimeBlk  ORDER BY DivReachedDest, Diverted, DepTimeBlk LIMIT 24","hsqls":["SELECT DivReachedDest, Diverted, DepTimeBlk, MIN(DestCityMarketID), SUM(DestCityMarketID) FROM mytable WHERE ArrDelayMinutes NOT IN (170.0, 320.0, 104.0, 218.0, 97.0) AND DestState BETWEEN 'MT' AND 'ID' GROUP BY DivReachedDest, Diverted, DepTimeBlk  ORDER BY DivReachedDest, Diverted, DepTimeBlk LIMIT 24"]}
-{"sql":"SELECT Diverted, MAX(CarrierDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 AND DepartureDelayGroups = -9999 OR \"Year\" IN (2014) GROUP BY Diverted LIMIT 16","hsqls":["SELECT Diverted, MAX(CarrierDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 AND DepartureDelayGroups = -9999 OR Year IN (2014) GROUP BY Diverted LIMIT 16"]}
+{"sql":"SELECT Diverted, MAX(CarrierDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 AND DepartureDelayGroups = -9999 OR \"Year\" IN (2014) GROUP BY Diverted LIMIT 16","hsqls":["SELECT Diverted, MAX(CarrierDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 AND DepartureDelayGroups = -9999 OR `Year` IN (2014) GROUP BY Diverted LIMIT 16"]}
 {"sql":"SELECT DayOfWeek, AVG(DaysSinceEpoch), MAX(DepDelay) FROM mytable WHERE DestAirportID < 14574 AND NASDelay >= 59 OR OriginCityMarketID <> 33830 GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 17","hsqls":["SELECT DayOfWeek, AVG(DaysSinceEpoch), MAX(DepDelay) FROM mytable WHERE DestAirportID < 14574 AND NASDelay >= 59 OR OriginCityMarketID <> 33830 GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 17"]}
 {"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 13","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 13"]}
 {"sql":"SELECT DivReachedDest, AVG(SecurityDelay), SUM(ArrTime) FROM mytable WHERE OriginStateName IN ('Utah', 'Pennsylvania', 'South Carolina', 'Nebraska') AND CarrierDelay IN (0, 19, 81) AND DestAirportID > 14842 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 14","hsqls":["SELECT DivReachedDest, AVG(SecurityDelay), SUM(ArrTime) FROM mytable WHERE OriginStateName IN ('Utah', 'Pennsylvania', 'South Carolina', 'Nebraska') AND CarrierDelay IN (0, 19, 81) AND DestAirportID > 14842 GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 14"]}
 {"sql":"SELECT OriginState, DestCityMarketID, DivActualElapsedTime, COUNT(OriginWac), COUNT(CancellationCode) FROM mytable WHERE OriginStateFips BETWEEN 1 AND 27 OR DivAirportLandings IN (1) GROUP BY OriginState, DestCityMarketID, DivActualElapsedTime  ORDER BY OriginState, DestCityMarketID, DivActualElapsedTime LIMIT 4","hsqls":["SELECT OriginState, DestCityMarketID, DivActualElapsedTime, COUNT(OriginWac), COUNT(CancellationCode) FROM mytable WHERE OriginStateFips BETWEEN 1 AND 27 OR DivAirportLandings IN (1) GROUP BY OriginState, DestCityMarketID, DivActualElapsedTime  ORDER BY OriginState, DestCityMarketID, DivActualElapsedTime LIMIT 4"]}
-{"sql":"SELECT TaxiIn, Origin, WheelsOn, SUM(DivReachedDest) FROM mytable WHERE DivAirportIDs < 14869 OR ArrDelayMinutes BETWEEN 125.0 AND 215.0 GROUP BY TaxiIn, Origin, WheelsOn LIMIT 21","hsqls":["SELECT TaxiIn, Origin, WheelsOn, SUM(DivReachedDest) FROM mytable WHERE (DivAirportIDs__MV0 < 14869 OR DivAirportIDs__MV1 < 14869 OR DivAirportIDs__MV2 < 14869 OR DivAirportIDs__MV3 < 14869 OR DivAirportIDs__MV4 < 14869) OR ArrDelayMinutes BETWEEN 125.0 AND 215.0 GROUP BY TaxiIn, Origin, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT AirlineID, COUNT(ArrTimeBlk), SUM(\"Year\") FROM mytable WHERE DestStateName <> 'Washington' OR DayofMonth BETWEEN 30 AND 27 AND CancellationCode >= 'A' GROUP BY AirlineID LIMIT 19","hsqls":["SELECT AirlineID, COUNT(ArrTimeBlk), SUM(Year) FROM mytable WHERE DestStateName <> 'Washington' OR DayofMonth BETWEEN 30 AND 27 AND CancellationCode >= 'A' GROUP BY AirlineID LIMIT 19"]}
+{"sql":"SELECT TaxiIn, Origin, WheelsOn, SUM(DivReachedDest) FROM mytable WHERE DivAirportIDs < 14869 OR ArrDelayMinutes BETWEEN 125.0 AND 215.0 GROUP BY TaxiIn, Origin, WheelsOn LIMIT 21","hsqls":["SELECT TaxiIn, Origin, WheelsOn, SUM(DivReachedDest) FROM mytable WHERE (DivAirportIDs[1] < 14869 OR DivAirportIDs[2] < 14869 OR DivAirportIDs[3] < 14869 OR DivAirportIDs[4] < 14869 OR DivAirportIDs[5] < 14869) OR ArrDelayMinutes BETWEEN 125.0 AND 215.0 GROUP BY TaxiIn, Origin, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT AirlineID, COUNT(ArrTimeBlk), SUM(\"Year\") FROM mytable WHERE DestStateName <> 'Washington' OR DayofMonth BETWEEN 30 AND 27 AND CancellationCode >= 'A' GROUP BY AirlineID LIMIT 19","hsqls":["SELECT AirlineID, COUNT(ArrTimeBlk), SUM(`Year`) FROM mytable WHERE DestStateName <> 'Washington' OR DayofMonth BETWEEN 30 AND 27 AND CancellationCode >= 'A' GROUP BY AirlineID LIMIT 19"]}
 {"sql":"SELECT Origin FROM mytable WHERE DivActualElapsedTime >= 328 AND OriginStateName BETWEEN 'Utah' AND 'New Hampshire' OR OriginCityName <> 'San Diego, CA' ORDER BY FirstDepTime LIMIT 8"}
 {"sql":"SELECT CarrierDelay FROM mytable ORDER BY \"Year\", DestState, DaysSinceEpoch LIMIT 16","hsqls":["SELECT CarrierDelay FROM mytable ORDER BY Year, DestState, DaysSinceEpoch LIMIT 16"]}
 {"sql":"SELECT DepartureDelayGroups, MIN(DepDel15), MIN(OriginCityMarketID) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 26","hsqls":["SELECT DepartureDelayGroups, MIN(DepDel15), MIN(OriginCityMarketID) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 26"]}
-{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE DestState IN ('OR') AND DivActualElapsedTime BETWEEN 477 AND 295 OR DayofMonth BETWEEN 23 AND 19 LIMIT 13","hsqls":["SELECT MAX(Year) FROM mytable WHERE DestState IN ('OR') AND DivActualElapsedTime BETWEEN 477 AND 295 OR DayofMonth BETWEEN 23 AND 19 LIMIT 13"]}
+{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE DestState IN ('OR') AND DivActualElapsedTime BETWEEN 477 AND 295 OR DayofMonth BETWEEN 23 AND 19 LIMIT 13","hsqls":["SELECT MAX(`Year`) FROM mytable WHERE DestState IN ('OR') AND DivActualElapsedTime BETWEEN 477 AND 295 OR DayofMonth BETWEEN 23 AND 19 LIMIT 13"]}
 {"sql":"SELECT LongestAddGTime, DestAirportSeqID, AirlineID, COUNT(*) FROM mytable WHERE DestCityMarketID NOT IN (31337, 31721, 31977, 31504, 34108) GROUP BY LongestAddGTime, DestAirportSeqID, AirlineID  ORDER BY LongestAddGTime, DestAirportSeqID, AirlineID LIMIT 8","hsqls":["SELECT LongestAddGTime, DestAirportSeqID, AirlineID, COUNT(*) FROM mytable WHERE DestCityMarketID NOT IN (31337, 31721, 31977, 31504, 34108) GROUP BY LongestAddGTime, DestAirportSeqID, AirlineID  ORDER BY LongestAddGTime, DestAirportSeqID, AirlineID LIMIT 8"]}
 {"sql":"SELECT ActualElapsedTime, COUNT(OriginAirportSeqID), MIN(DestAirportSeqID) FROM mytable WHERE DepDelayMinutes > 136.0 OR Quarter IN (1) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 24","hsqls":["SELECT ActualElapsedTime, COUNT(OriginAirportSeqID), MIN(DestAirportSeqID) FROM mytable WHERE DepDelayMinutes > 136.0 OR Quarter IN (1) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 24"]}
 {"sql":"SELECT ArrivalDelayGroups, AVG(DestCityMarketID), COUNT(Diverted), AVG(LateAircraftDelay) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 19","hsqls":["SELECT ArrivalDelayGroups, AVG(DestCityMarketID), COUNT(Diverted), AVG(LateAircraftDelay) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 19"]}
 {"sql":"SELECT \"Year\", ArrTimeBlk FROM mytable WHERE FlightDate NOT IN ('2014-01-14', '2014-01-30', '2014-01-16') AND DistanceGroup BETWEEN 2 AND 11 ORDER BY ArrDelayMinutes, DepDel15 LIMIT 5","hsqls":["SELECT Year, ArrTimeBlk FROM mytable WHERE FlightDate NOT IN ('2014-01-14', '2014-01-30', '2014-01-16') AND DistanceGroup BETWEEN 2 AND 11 ORDER BY ArrDelayMinutes, DepDel15 LIMIT 5"]}
-{"sql":"SELECT Diverted, TailNum FROM mytable WHERE DayofMonth BETWEEN 8 AND 16 ORDER BY \"Month\" LIMIT 8","hsqls":["SELECT Diverted, TailNum FROM mytable WHERE DayofMonth BETWEEN 8 AND 16 ORDER BY Month LIMIT 8"]}
+{"sql":"SELECT Diverted, TailNum FROM mytable WHERE DayofMonth BETWEEN 8 AND 16 ORDER BY \"Month\" LIMIT 8","hsqls":["SELECT Diverted, TailNum FROM mytable WHERE DayofMonth BETWEEN 8 AND 16 ORDER BY `Month` LIMIT 8"]}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 24","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 24"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE DivAirportLandings = 1 AND Flights >= 1 AND DivAirportLandings BETWEEN 9 AND 9 ORDER BY \"Year\", Dest LIMIT 22","hsqls":["SELECT OriginAirportID FROM mytable WHERE DivAirportLandings = 1 AND Flights >= 1 AND DivAirportLandings BETWEEN 9 AND 9 ORDER BY Year, Dest LIMIT 22"]}
-{"sql":"SELECT AVG(\"Year\"), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups) FROM mytable WHERE DivWheelsOffs IN (1702, 2226, 749, 2328, 844) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 2","hsqls":["SELECT AVG(Year), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups)  FROM mytable WHERE (DivWheelsOffs__MV0 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV1 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV2 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV3 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV4 IN (1702, 2226, 749, 2328, 844)) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 10000"]}
+{"sql":"SELECT AVG(\"Year\"), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups) FROM mytable WHERE DivWheelsOffs IN (1702, 2226, 749, 2328, 844) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 2","hsqls":["SELECT AVG(`Year`), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups)  FROM mytable WHERE (DivWheelsOffs[1] IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs[2] IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs[3] IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs[4] IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs[5] IN (1702, 2226, 749, 2328, 844)) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 10000"]}
 {"sql":"SELECT Dest, COUNT(*) FROM mytable WHERE WheelsOff <= 2310 GROUP BY Dest  ORDER BY Dest LIMIT 11","hsqls":["SELECT Dest, COUNT(*) FROM mytable WHERE WheelsOff <= 2310 GROUP BY Dest  ORDER BY Dest LIMIT 11"]}
 {"sql":"SELECT DestAirportSeqID, MAX(CarrierDelay), MIN(CarrierDelay), COUNT(TailNum) FROM mytable WHERE OriginCityName < 'Mobile, AL' AND CRSDepTime BETWEEN 1849 AND 949 OR DistanceGroup = 5 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 5","hsqls":["SELECT DestAirportSeqID, MAX(CarrierDelay), MIN(CarrierDelay), COUNT(TailNum) FROM mytable WHERE OriginCityName < 'Mobile, AL' AND CRSDepTime BETWEEN 1849 AND 949 OR DistanceGroup = 5 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 5"]}
-{"sql":"SELECT DistanceGroup, COUNT(*) FROM mytable WHERE DivWheelsOns BETWEEN 1605 AND 946 GROUP BY DistanceGroup LIMIT 8","hsqls":["SELECT DistanceGroup, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1605 AND 946 OR DivWheelsOns__MV1 BETWEEN 1605 AND 946 OR DivWheelsOns__MV2 BETWEEN 1605 AND 946 OR DivWheelsOns__MV3 BETWEEN 1605 AND 946 OR DivWheelsOns__MV4 BETWEEN 1605 AND 946) GROUP BY DistanceGroup LIMIT 10000"]}
-{"sql":"SELECT SUM(DayOfWeek) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND WheelsOn BETWEEN 1417 AND 1955 LIMIT 2","hsqls":["SELECT SUM(DayOfWeek) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND WheelsOn BETWEEN 1417 AND 1955 LIMIT 2"]}
-{"sql":"SELECT DivWheelsOns, CancellationCode, WheelsOn FROM mytable WHERE OriginCityName IN ('Detroit, MI', 'Cincinnati, OH', 'Allentown/Bethlehem/Easton, PA', 'Springfield, IL', 'Peoria, IL') OR CRSElapsedTime NOT IN (59, 357, 328, 229) ORDER BY DestState, SecurityDelay, ArrDelay LIMIT 13","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, CancellationCode, WheelsOn FROM mytable WHERE OriginCityName IN ('Detroit, MI', 'Cincinnati, OH', 'Allentown/Bethlehem/Easton, PA', 'Springfield, IL', 'Peoria, IL') OR CRSElapsedTime NOT IN (59, 357, 328, 229) ORDER BY DestState, SecurityDelay, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT DayOfWeek, AVG(CRSElapsedTime), SUM(OriginAirportSeqID), MAX(DayofMonth) FROM mytable WHERE DepDelay > 14.0 AND WheelsOff BETWEEN 1702 AND 1004 OR DivWheelsOffs >= 2121 GROUP BY DayOfWeek LIMIT 23","hsqls":["SELECT DayOfWeek, AVG(CRSElapsedTime), SUM(OriginAirportSeqID), MAX(DayofMonth) FROM mytable WHERE DepDelay > 14.0 AND WheelsOff BETWEEN 1702 AND 1004 OR (DivWheelsOffs__MV0 >= 2121 OR DivWheelsOffs__MV1 >= 2121 OR DivWheelsOffs__MV2 >= 2121 OR DivWheelsOffs__MV3 >= 2121 OR DivWheelsOffs__MV4 >= 2121) GROUP BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, COUNT(*) FROM mytable WHERE DivWheelsOns BETWEEN 1605 AND 946 GROUP BY DistanceGroup LIMIT 8","hsqls":["SELECT DistanceGroup, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1605 AND 946 OR DivWheelsOns[2] BETWEEN 1605 AND 946 OR DivWheelsOns[3] BETWEEN 1605 AND 946 OR DivWheelsOns[4] BETWEEN 1605 AND 946 OR DivWheelsOns[5] BETWEEN 1605 AND 946) GROUP BY DistanceGroup LIMIT 10000"]}
+{"sql":"SELECT SUM(DayOfWeek) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND WheelsOn BETWEEN 1417 AND 1955 LIMIT 2","hsqls":["SELECT SUM(DayOfWeek) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND WheelsOn BETWEEN 1417 AND 1955 LIMIT 2"]}
+{"sql":"SELECT DivWheelsOns, CancellationCode, WheelsOn FROM mytable WHERE OriginCityName IN ('Detroit, MI', 'Cincinnati, OH', 'Allentown/Bethlehem/Easton, PA', 'Springfield, IL', 'Peoria, IL') OR CRSElapsedTime NOT IN (59, 357, 328, 229) ORDER BY DestState, SecurityDelay, ArrDelay LIMIT 13","hsqls":["SELECT DivWheelsOns, CancellationCode, WheelsOn FROM mytable WHERE OriginCityName IN ('Detroit, MI', 'Cincinnati, OH', 'Allentown/Bethlehem/Easton, PA', 'Springfield, IL', 'Peoria, IL') OR CRSElapsedTime NOT IN (59, 357, 328, 229) ORDER BY DestState, SecurityDelay, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DayOfWeek, AVG(CRSElapsedTime), SUM(OriginAirportSeqID), MAX(DayofMonth) FROM mytable WHERE DepDelay > 14.0 AND WheelsOff BETWEEN 1702 AND 1004 OR DivWheelsOffs >= 2121 GROUP BY DayOfWeek LIMIT 23","hsqls":["SELECT DayOfWeek, AVG(CRSElapsedTime), SUM(OriginAirportSeqID), MAX(DayofMonth) FROM mytable WHERE DepDelay > 14.0 AND WheelsOff BETWEEN 1702 AND 1004 OR (DivWheelsOffs[1] >= 2121 OR DivWheelsOffs[2] >= 2121 OR DivWheelsOffs[3] >= 2121 OR DivWheelsOffs[4] >= 2121 OR DivWheelsOffs[5] >= 2121) GROUP BY DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, DestAirportID, COUNT(*) FROM mytable WHERE Diverted = 0 AND TailNum BETWEEN 'N669MQ' AND 'N458WN' GROUP BY ArrDel15, DestAirportID  ORDER BY ArrDel15, DestAirportID LIMIT 12","hsqls":["SELECT ArrDel15, DestAirportID, COUNT(*) FROM mytable WHERE Diverted = 0 AND TailNum BETWEEN 'N669MQ' AND 'N458WN' GROUP BY ArrDel15, DestAirportID  ORDER BY ArrDel15, DestAirportID LIMIT 12"]}
 {"sql":"SELECT DepDelayMinutes, DestCityMarketID, COUNT(CRSArrTime), SUM(DestCityMarketID) FROM mytable WHERE OriginStateName <> 'Colorado' OR DivReachedDest >= -9999 OR CancellationCode < 'B' GROUP BY DepDelayMinutes, DestCityMarketID  ORDER BY DepDelayMinutes, DestCityMarketID LIMIT 28","hsqls":["SELECT DepDelayMinutes, DestCityMarketID, COUNT(CRSArrTime), SUM(DestCityMarketID) FROM mytable WHERE OriginStateName <> 'Colorado' OR DivReachedDest >= -9999 OR CancellationCode < 'B' GROUP BY DepDelayMinutes, DestCityMarketID  ORDER BY DepDelayMinutes, DestCityMarketID LIMIT 28"]}
-{"sql":"SELECT DivAirportSeqIDs, AirTime, CancellationCode FROM mytable WHERE WheelsOff BETWEEN 1745 AND 943 OR WheelsOff IN (1205) AND DepDelayMinutes < 119.0 ORDER BY FlightDate, DestCityName, DaysSinceEpoch LIMIT 7","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, AirTime, CancellationCode FROM mytable WHERE WheelsOff BETWEEN 1745 AND 943 OR WheelsOff IN (1205) AND DepDelayMinutes < 119.0 ORDER BY FlightDate, DestCityName, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, AirTime, CancellationCode FROM mytable WHERE WheelsOff BETWEEN 1745 AND 943 OR WheelsOff IN (1205) AND DepDelayMinutes < 119.0 ORDER BY FlightDate, DestCityName, DaysSinceEpoch LIMIT 7","hsqls":["SELECT DivAirportSeqIDs, AirTime, CancellationCode FROM mytable WHERE WheelsOff BETWEEN 1745 AND 943 OR WheelsOff IN (1205) AND DepDelayMinutes < 119.0 ORDER BY FlightDate, DestCityName, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DepTime FROM mytable WHERE WheelsOff NOT IN (1043, 2345) ORDER BY DepDelayMinutes, TaxiIn LIMIT 9"}
 {"sql":"SELECT \"Month\", OriginStateName, COUNT(ArrDelay) FROM mytable GROUP BY \"Month\", OriginStateName LIMIT 25","hsqls":["SELECT Month, OriginStateName, COUNT(ArrDelay) FROM mytable GROUP BY Month, OriginStateName LIMIT 25"]}
 {"sql":"SELECT DestCityName, NASDelay FROM mytable LIMIT 12"}
 {"sql":"SELECT LateAircraftDelay, ActualElapsedTime, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-14' AND '2014-01-09' GROUP BY LateAircraftDelay, ActualElapsedTime  ORDER BY LateAircraftDelay, ActualElapsedTime LIMIT 23","hsqls":["SELECT LateAircraftDelay, ActualElapsedTime, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-14' AND '2014-01-09' GROUP BY LateAircraftDelay, ActualElapsedTime  ORDER BY LateAircraftDelay, ActualElapsedTime LIMIT 23"]}
-{"sql":"SELECT TailNum, DestCityName, \"Month\" FROM mytable ORDER BY DistanceGroup, DestWac LIMIT 6","hsqls":["SELECT TailNum, DestCityName, Month FROM mytable ORDER BY DistanceGroup, DestWac LIMIT 6"]}
+{"sql":"SELECT TailNum, DestCityName, \"Month\" FROM mytable ORDER BY DistanceGroup, DestWac LIMIT 6","hsqls":["SELECT TailNum, DestCityName, `Month` FROM mytable ORDER BY DistanceGroup, DestWac LIMIT 6"]}
 {"sql":"SELECT OriginAirportSeqID, OriginCityMarketID, ArrTimeBlk, MIN(DepDel15), SUM(DayOfWeek) FROM mytable WHERE FlightDate IN ('2014-01-11') GROUP BY OriginAirportSeqID, OriginCityMarketID, ArrTimeBlk  ORDER BY OriginAirportSeqID, OriginCityMarketID, ArrTimeBlk LIMIT 4","hsqls":["SELECT OriginAirportSeqID, OriginCityMarketID, ArrTimeBlk, MIN(DepDel15), SUM(DayOfWeek) FROM mytable WHERE FlightDate IN ('2014-01-11') GROUP BY OriginAirportSeqID, OriginCityMarketID, ArrTimeBlk  ORDER BY OriginAirportSeqID, OriginCityMarketID, ArrTimeBlk LIMIT 4"]}
-{"sql":"SELECT CRSArrTime, OriginWac, MIN(\"Year\"), MIN(NASDelay), MAX(FlightNum) FROM mytable WHERE TaxiOut BETWEEN 65 AND 68 AND ArrivalDelayGroups = 10 AND ArrDelay IN (-36.0, 120.0) GROUP BY CRSArrTime, OriginWac LIMIT 12","hsqls":["SELECT CRSArrTime, OriginWac, MIN(Year), MIN(NASDelay), MAX(FlightNum) FROM mytable WHERE TaxiOut BETWEEN 65 AND 68 AND ArrivalDelayGroups = 10 AND ArrDelay IN (-36.0, 120.0) GROUP BY CRSArrTime, OriginWac LIMIT 12"]}
+{"sql":"SELECT CRSArrTime, OriginWac, MIN(\"Year\"), MIN(NASDelay), MAX(FlightNum) FROM mytable WHERE TaxiOut BETWEEN 65 AND 68 AND ArrivalDelayGroups = 10 AND ArrDelay IN (-36.0, 120.0) GROUP BY CRSArrTime, OriginWac LIMIT 12","hsqls":["SELECT CRSArrTime, OriginWac, MIN(`Year`), MIN(NASDelay), MAX(FlightNum) FROM mytable WHERE TaxiOut BETWEEN 65 AND 68 AND ArrivalDelayGroups = 10 AND ArrDelay IN (-36.0, 120.0) GROUP BY CRSArrTime, OriginWac LIMIT 12"]}
 {"sql":"SELECT TaxiOut, CarrierDelay, ArrDelay FROM mytable WHERE Carrier NOT IN ('HA', 'MQ') OR CRSElapsedTime BETWEEN 58 AND 294 ORDER BY DestCityName LIMIT 15"}
 {"sql":"SELECT DepDel15, CRSDepTime FROM mytable WHERE DepDelay BETWEEN 268.0 AND 89.0 OR OriginAirportSeqID > 1385103 ORDER BY OriginState, ArrTime, Cancelled LIMIT 15"}
 {"sql":"SELECT Dest, CancellationCode, SUM(WheelsOn), SUM(CRSElapsedTime) FROM mytable GROUP BY Dest, CancellationCode  ORDER BY Dest, CancellationCode LIMIT 10","hsqls":["SELECT Dest, CancellationCode, SUM(WheelsOn), SUM(CRSElapsedTime) FROM mytable GROUP BY Dest, CancellationCode  ORDER BY Dest, CancellationCode LIMIT 10"]}
 {"sql":"SELECT DivActualElapsedTime, OriginStateName, COUNT(*) FROM mytable GROUP BY DivActualElapsedTime, OriginStateName  ORDER BY DivActualElapsedTime, OriginStateName LIMIT 20","hsqls":["SELECT DivActualElapsedTime, OriginStateName, COUNT(*) FROM mytable GROUP BY DivActualElapsedTime, OriginStateName  ORDER BY DivActualElapsedTime, OriginStateName LIMIT 20"]}
-{"sql":"SELECT DepDelayMinutes, DivArrDelay FROM mytable WHERE DivWheelsOns BETWEEN 2237 AND 825 AND DivAirports IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivDistance BETWEEN 254 AND 551 ORDER BY DivReachedDest, ArrTime, DivArrDelay","hsqls":["SELECT DepDelayMinutes, DivArrDelay FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 2237 AND 825 OR DivWheelsOns__MV1 BETWEEN 2237 AND 825 OR DivWheelsOns__MV2 BETWEEN 2237 AND 825 OR DivWheelsOns__MV3 BETWEEN 2237 AND 825 OR DivWheelsOns__MV4 BETWEEN 2237 AND 825) AND (DivAirports__MV0 IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports__MV1 IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports__MV2 IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports__MV3 IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports__MV4 IN ('OGD', 'SBA', 'TPA', 'OKC')) OR DivDistance BETWEEN 254 AND 551 ORDER BY DivReachedDest, ArrTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivArrDelay FROM mytable WHERE DivWheelsOns BETWEEN 2237 AND 825 AND DivAirports IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivDistance BETWEEN 254 AND 551 ORDER BY DivReachedDest, ArrTime, DivArrDelay","hsqls":["SELECT DepDelayMinutes, DivArrDelay FROM mytable WHERE (DivWheelsOns[1] BETWEEN 2237 AND 825 OR DivWheelsOns[2] BETWEEN 2237 AND 825 OR DivWheelsOns[3] BETWEEN 2237 AND 825 OR DivWheelsOns[4] BETWEEN 2237 AND 825 OR DivWheelsOns[5] BETWEEN 2237 AND 825) AND (DivAirports[1] IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports[2] IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports[3] IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports[4] IN ('OGD', 'SBA', 'TPA', 'OKC') OR DivAirports[5] IN ('OGD', 'SBA', 'TPA', 'OKC')) OR DivDistance BETWEEN 254 AND 551 ORDER BY DivReachedDest, ArrTime, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE DestCityName IN ('Providence, RI', 'Branson, MO') LIMIT 1"}
 {"sql":"SELECT DepDel15, ArrDelay, COUNT(LateAircraftDelay) FROM mytable WHERE Cancelled > 0 GROUP BY DepDel15, ArrDelay  ORDER BY DepDel15, ArrDelay LIMIT 25","hsqls":["SELECT DepDel15, ArrDelay, COUNT(LateAircraftDelay) FROM mytable WHERE Cancelled > 0 GROUP BY DepDel15, ArrDelay  ORDER BY DepDel15, ArrDelay LIMIT 25"]}
-{"sql":"SELECT SUM(SecurityDelay) FROM mytable WHERE DivTailNums < 'N712SW' OR Distance BETWEEN 426 AND 994 AND TaxiIn BETWEEN 65 AND 9 LIMIT 17","hsqls":["SELECT SUM(SecurityDelay) FROM mytable WHERE (DivTailNums__MV0 < 'N712SW' OR DivTailNums__MV1 < 'N712SW' OR DivTailNums__MV2 < 'N712SW' OR DivTailNums__MV3 < 'N712SW' OR DivTailNums__MV4 < 'N712SW') OR Distance BETWEEN 426 AND 994 AND TaxiIn BETWEEN 65 AND 9 LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, OriginWac, \"Month\" FROM mytable WHERE DivAirports BETWEEN 'SAT' AND 'DAB' AND CRSDepTime <= 700 LIMIT 17","hsqls":["SELECT DestStateFips, OriginWac, Month FROM mytable WHERE (DivAirports__MV0 BETWEEN 'SAT' AND 'DAB' OR DivAirports__MV1 BETWEEN 'SAT' AND 'DAB' OR DivAirports__MV2 BETWEEN 'SAT' AND 'DAB' OR DivAirports__MV3 BETWEEN 'SAT' AND 'DAB' OR DivAirports__MV4 BETWEEN 'SAT' AND 'DAB') AND CRSDepTime <= 700 LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes FROM mytable WHERE ArrDelay > 118.0 OR DivWheelsOffs <= 2322 ORDER BY TaxiOut, DivDistance, Distance LIMIT 16","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE ArrDelay > 118.0 OR (DivWheelsOffs__MV0 <= 2322 OR DivWheelsOffs__MV1 <= 2322 OR DivWheelsOffs__MV2 <= 2322 OR DivWheelsOffs__MV3 <= 2322 OR DivWheelsOffs__MV4 <= 2322) ORDER BY TaxiOut, DivDistance, Distance LIMIT 10000"]}
+{"sql":"SELECT SUM(SecurityDelay) FROM mytable WHERE DivTailNums < 'N712SW' OR Distance BETWEEN 426 AND 994 AND TaxiIn BETWEEN 65 AND 9 LIMIT 17","hsqls":["SELECT SUM(SecurityDelay) FROM mytable WHERE (DivTailNums[1] < 'N712SW' OR DivTailNums[2] < 'N712SW' OR DivTailNums[3] < 'N712SW' OR DivTailNums[4] < 'N712SW' OR DivTailNums[5] < 'N712SW') OR Distance BETWEEN 426 AND 994 AND TaxiIn BETWEEN 65 AND 9 LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, OriginWac, \"Month\" FROM mytable WHERE DivAirports BETWEEN 'SAT' AND 'DAB' AND CRSDepTime <= 700 LIMIT 17","hsqls":["SELECT DestStateFips, OriginWac, `Month` FROM mytable WHERE (DivAirports[1] BETWEEN 'SAT' AND 'DAB' OR DivAirports[2] BETWEEN 'SAT' AND 'DAB' OR DivAirports[3] BETWEEN 'SAT' AND 'DAB' OR DivAirports[4] BETWEEN 'SAT' AND 'DAB' OR DivAirports[5] BETWEEN 'SAT' AND 'DAB') AND CRSDepTime <= 700 LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes FROM mytable WHERE ArrDelay > 118.0 OR DivWheelsOffs <= 2322 ORDER BY TaxiOut, DivDistance, Distance LIMIT 16","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE ArrDelay > 118.0 OR (DivWheelsOffs[1] <= 2322 OR DivWheelsOffs[2] <= 2322 OR DivWheelsOffs[3] <= 2322 OR DivWheelsOffs[4] <= 2322 OR DivWheelsOffs[5] <= 2322) ORDER BY TaxiOut, DivDistance, Distance LIMIT 10000"]}
 {"sql":"SELECT CRSElapsedTime, MIN(DivAirportLandings), SUM(DestAirportID), MAX(DayOfWeek) FROM mytable WHERE NASDelay = 179 OR UniqueCarrier BETWEEN 'WN' AND 'US' GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 20","hsqls":["SELECT CRSElapsedTime, MIN(DivAirportLandings), SUM(DestAirportID), MAX(DayOfWeek) FROM mytable WHERE NASDelay = 179 OR UniqueCarrier BETWEEN 'WN' AND 'US' GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 20"]}
 {"sql":"SELECT DivDistance, ArrTime FROM mytable WHERE Carrier NOT IN ('DL', 'WN', 'HA', 'UA')"}
-{"sql":"SELECT MIN(OriginAirportID), COUNT(DestAirportSeqID), SUM(Distance) FROM mytable WHERE \"Month\" < 1 LIMIT 25","hsqls":["SELECT MIN(OriginAirportID), COUNT(DestAirportSeqID), SUM(Distance) FROM mytable WHERE Month < 1 LIMIT 25"]}
+{"sql":"SELECT MIN(OriginAirportID), COUNT(DestAirportSeqID), SUM(Distance) FROM mytable WHERE \"Month\" < 1 LIMIT 25","hsqls":["SELECT MIN(OriginAirportID), COUNT(DestAirportSeqID), SUM(Distance) FROM mytable WHERE `Month` < 1 LIMIT 25"]}
 {"sql":"SELECT DepTime FROM mytable WHERE OriginCityMarketID NOT IN (33570) LIMIT 9"}
-{"sql":"SELECT DivAirports, DestAirportID, DivActualElapsedTime FROM mytable WHERE SecurityDelay = 8 OR DivActualElapsedTime BETWEEN 224 AND 388 OR ArrTimeBlk > '1200-1259' ORDER BY SecurityDelay LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportID, DivActualElapsedTime FROM mytable WHERE SecurityDelay = 8 OR DivActualElapsedTime BETWEEN 224 AND 388 OR ArrTimeBlk > '1200-1259' ORDER BY SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestAirportID, DivActualElapsedTime FROM mytable WHERE SecurityDelay = 8 OR DivActualElapsedTime BETWEEN 224 AND 388 OR ArrTimeBlk > '1200-1259' ORDER BY SecurityDelay LIMIT 24","hsqls":["SELECT DivAirports, DestAirportID, DivActualElapsedTime FROM mytable WHERE SecurityDelay = 8 OR DivActualElapsedTime BETWEEN 224 AND 388 OR ArrTimeBlk > '1200-1259' ORDER BY SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT DepDel15 FROM mytable ORDER BY \"Year\", FlightNum, DestCityMarketID LIMIT 20","hsqls":["SELECT DepDel15 FROM mytable ORDER BY Year, FlightNum, DestCityMarketID LIMIT 20"]}
 {"sql":"SELECT DepDelay FROM mytable WHERE LateAircraftDelay IN (77, 115, 219, 103) OR DestStateFips BETWEEN 47 AND 19 ORDER BY OriginCityName, TotalAddGTime, Cancelled LIMIT 6"}
 {"sql":"SELECT DivAirportLandings FROM mytable ORDER BY OriginAirportSeqID, ArrDelay LIMIT 11"}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY Flights LIMIT 10","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Year BETWEEN 2014 AND 2014 ORDER BY Flights LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY Flights LIMIT 10","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 ORDER BY Flights LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY FlightDate, CancellationCode LIMIT 23"}
-{"sql":"SELECT Flights, DestCityName, CRSDepTime, COUNT(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE DivAirports <= 'PHF' AND DivDistance IN (721) OR OriginStateName BETWEEN 'Georgia' AND 'U.S. Virgin Islands' GROUP BY Flights, DestCityName, CRSDepTime LIMIT 14","hsqls":["SELECT Flights, DestCityName, CRSDepTime, COUNT(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE (DivAirports__MV0 <= 'PHF' OR DivAirports__MV1 <= 'PHF' OR DivAirports__MV2 <= 'PHF' OR DivAirports__MV3 <= 'PHF' OR DivAirports__MV4 <= 'PHF') AND DivDistance IN (721) OR OriginStateName BETWEEN 'Georgia' AND 'U.S. Virgin Islands' GROUP BY Flights, DestCityName, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT Flights, DestCityName, CRSDepTime, COUNT(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE DivAirports <= 'PHF' AND DivDistance IN (721) OR OriginStateName BETWEEN 'Georgia' AND 'U.S. Virgin Islands' GROUP BY Flights, DestCityName, CRSDepTime LIMIT 14","hsqls":["SELECT Flights, DestCityName, CRSDepTime, COUNT(DivActualElapsedTime), AVG(DivArrDelay) FROM mytable WHERE (DivAirports[1] <= 'PHF' OR DivAirports[2] <= 'PHF' OR DivAirports[3] <= 'PHF' OR DivAirports[4] <= 'PHF' OR DivAirports[5] <= 'PHF') AND DivDistance IN (721) OR OriginStateName BETWEEN 'Georgia' AND 'U.S. Virgin Islands' GROUP BY Flights, DestCityName, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DepDelay, TotalAddGTime, MIN(CRSElapsedTime), MAX(AirTime), MAX(ActualElapsedTime) FROM mytable WHERE DivAirportLandings >= 9 OR Cancelled > 0 OR WheelsOn BETWEEN 1047 AND 1409 GROUP BY DepDelay, TotalAddGTime  ORDER BY DepDelay, TotalAddGTime LIMIT 22","hsqls":["SELECT DepDelay, TotalAddGTime, MIN(CRSElapsedTime), MAX(AirTime), MAX(ActualElapsedTime) FROM mytable WHERE DivAirportLandings >= 9 OR Cancelled > 0 OR WheelsOn BETWEEN 1047 AND 1409 GROUP BY DepDelay, TotalAddGTime  ORDER BY DepDelay, TotalAddGTime LIMIT 22"]}
-{"sql":"SELECT DestCityName, Dest FROM mytable WHERE FlightDate <= '2014-01-10' OR DivTailNums IN ('N630JB', 'N130DL', 'N371SW') AND DivWheelsOffs IN (1715) ORDER BY DestStateFips, ArrDelayMinutes LIMIT 29","hsqls":["SELECT DestCityName, Dest FROM mytable WHERE FlightDate <= '2014-01-10' OR (DivTailNums__MV0 IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums__MV1 IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums__MV2 IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums__MV3 IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums__MV4 IN ('N630JB', 'N130DL', 'N371SW')) AND (DivWheelsOffs__MV0 IN (1715) OR DivWheelsOffs__MV1 IN (1715) OR DivWheelsOffs__MV2 IN (1715) OR DivWheelsOffs__MV3 IN (1715) OR DivWheelsOffs__MV4 IN (1715)) ORDER BY DestStateFips, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DestCityName, Dest FROM mytable WHERE FlightDate <= '2014-01-10' OR DivTailNums IN ('N630JB', 'N130DL', 'N371SW') AND DivWheelsOffs IN (1715) ORDER BY DestStateFips, ArrDelayMinutes LIMIT 29","hsqls":["SELECT DestCityName, Dest FROM mytable WHERE FlightDate <= '2014-01-10' OR (DivTailNums[1] IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums[2] IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums[3] IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums[4] IN ('N630JB', 'N130DL', 'N371SW') OR DivTailNums[5] IN ('N630JB', 'N130DL', 'N371SW')) AND (DivWheelsOffs[1] IN (1715) OR DivWheelsOffs[2] IN (1715) OR DivWheelsOffs[3] IN (1715) OR DivWheelsOffs[4] IN (1715) OR DivWheelsOffs[5] IN (1715)) ORDER BY DestStateFips, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE TotalAddGTime BETWEEN 24 AND 47 ORDER BY OriginCityMarketID, ArrDel15 LIMIT 15"}
 {"sql":"SELECT FlightNum, OriginCityName, DayofMonth FROM mytable WHERE DestCityMarketID >= 35401 OR AirlineID < 20355 AND DestState BETWEEN 'VA' AND 'UT' LIMIT 10"}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE OriginCityMarketID >= 30073 ORDER BY CRSElapsedTime LIMIT 9"}
@@ -6787,27 +6787,27 @@
 {"sql":"SELECT DepDelay FROM mytable WHERE OriginWac <= 5 OR DestStateFips > 78 AND SecurityDelay < 8 ORDER BY DepTimeBlk LIMIT 10"}
 {"sql":"SELECT Quarter, FlightDate, OriginWac, COUNT(*) FROM mytable WHERE OriginStateName IN ('Maine', 'Alaska', 'Oklahoma') OR DepTimeBlk >= '1500-1559' AND Flights BETWEEN 1 AND 1 GROUP BY Quarter, FlightDate, OriginWac  ORDER BY Quarter, FlightDate, OriginWac LIMIT 27","hsqls":["SELECT Quarter, FlightDate, OriginWac, COUNT(*) FROM mytable WHERE OriginStateName IN ('Maine', 'Alaska', 'Oklahoma') OR DepTimeBlk >= '1500-1559' AND Flights BETWEEN 1 AND 1 GROUP BY Quarter, FlightDate, OriginWac  ORDER BY Quarter, FlightDate, OriginWac LIMIT 27"]}
 {"sql":"SELECT ArrTimeBlk, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 13377 AND 10926 AND DestStateFips NOT IN (31, 26) OR OriginStateName >= 'Tennessee' GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 11","hsqls":["SELECT ArrTimeBlk, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 13377 AND 10926 AND DestStateFips NOT IN (31, 26) OR OriginStateName >= 'Tennessee' GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 11"]}
-{"sql":"SELECT DistanceGroup, DestWac, ArrTime, AVG(DivReachedDest), AVG(Flights) FROM mytable WHERE TaxiIn BETWEEN 45 AND 106 OR DepartureDelayGroups <> -1 OR DivLongestGTimes <= 79.0 GROUP BY DistanceGroup, DestWac, ArrTime LIMIT 27","hsqls":["SELECT DistanceGroup, DestWac, ArrTime, AVG(DivReachedDest), AVG(Flights) FROM mytable WHERE TaxiIn BETWEEN 45 AND 106 OR DepartureDelayGroups <> -1 OR (DivLongestGTimes__MV0 <= 79.0 OR DivLongestGTimes__MV1 <= 79.0 OR DivLongestGTimes__MV2 <= 79.0 OR DivLongestGTimes__MV3 <= 79.0 OR DivLongestGTimes__MV4 <= 79.0) GROUP BY DistanceGroup, DestWac, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestWac, ArrTime, AVG(DivReachedDest), AVG(Flights) FROM mytable WHERE TaxiIn BETWEEN 45 AND 106 OR DepartureDelayGroups <> -1 OR DivLongestGTimes <= 79.0 GROUP BY DistanceGroup, DestWac, ArrTime LIMIT 27","hsqls":["SELECT DistanceGroup, DestWac, ArrTime, AVG(DivReachedDest), AVG(Flights) FROM mytable WHERE TaxiIn BETWEEN 45 AND 106 OR DepartureDelayGroups <> -1 OR (DivLongestGTimes[1] <= 79.0 OR DivLongestGTimes[2] <= 79.0 OR DivLongestGTimes[3] <= 79.0 OR DivLongestGTimes[4] <= 79.0 OR DivLongestGTimes[5] <= 79.0) GROUP BY DistanceGroup, DestWac, ArrTime LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DayofMonth, MAX(AirlineID), MAX(DepDelayMinutes), MIN(ArrTime) FROM mytable WHERE OriginAirportID IN (11905, 13303, 11066, 13127) OR OriginState BETWEEN 'TN' AND 'ME' AND LateAircraftDelay < 138 GROUP BY \"Year\", DayofMonth LIMIT 12","hsqls":["SELECT Year, DayofMonth, MAX(AirlineID), MAX(DepDelayMinutes), MIN(ArrTime) FROM mytable WHERE OriginAirportID IN (11905, 13303, 11066, 13127) OR OriginState BETWEEN 'TN' AND 'ME' AND LateAircraftDelay < 138 GROUP BY Year, DayofMonth LIMIT 12"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE Dest > 'BQN' LIMIT 17"}
 {"sql":"SELECT OriginState, DepDelay, OriginWac FROM mytable WHERE WheelsOff IN (1235, 2134) ORDER BY NASDelay, AirlineID, ArrDelay LIMIT 14"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TailNum NOT IN ('N945DL', 'N436WN', 'N926DL') OR ArrDelayMinutes IN (4.0, 42.0, 125.0) LIMIT 5"}
 {"sql":"SELECT FlightDate FROM mytable WHERE DepDelayMinutes BETWEEN 192.0 AND 41.0 OR DepartureDelayGroups NOT IN (2, 1, 0) OR DayOfWeek BETWEEN 5 AND 6 ORDER BY CancellationCode, DayofMonth LIMIT 23"}
-{"sql":"SELECT FlightDate FROM mytable WHERE DivWheelsOffs BETWEEN 2107 AND 1129 LIMIT 10","hsqls":["SELECT FlightDate FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2107 AND 1129 OR DivWheelsOffs__MV1 BETWEEN 2107 AND 1129 OR DivWheelsOffs__MV2 BETWEEN 2107 AND 1129 OR DivWheelsOffs__MV3 BETWEEN 2107 AND 1129 OR DivWheelsOffs__MV4 BETWEEN 2107 AND 1129) LIMIT 10000"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE DivWheelsOffs BETWEEN 2107 AND 1129 LIMIT 10","hsqls":["SELECT FlightDate FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2107 AND 1129 OR DivWheelsOffs[2] BETWEEN 2107 AND 1129 OR DivWheelsOffs[3] BETWEEN 2107 AND 1129 OR DivWheelsOffs[4] BETWEEN 2107 AND 1129 OR DivWheelsOffs[5] BETWEEN 2107 AND 1129) LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, AirTime, OriginStateName FROM mytable WHERE DestAirportID BETWEEN 10728 AND 11525 OR DivArrDelay NOT IN (212, 117, 287) OR WeatherDelay BETWEEN 112 AND 15 ORDER BY LateAircraftDelay, DepTime, ArrDelay LIMIT 12"}
 {"sql":"SELECT ArrTime FROM mytable LIMIT 5"}
-{"sql":"SELECT DepDelay, LongestAddGTime, \"Month\" FROM mytable WHERE TotalAddGTime BETWEEN 103 AND 96 OR DestCityName BETWEEN 'Oakland, CA' AND 'Oklahoma City, OK' ORDER BY FirstDepTime, Carrier, ArrTimeBlk LIMIT 16","hsqls":["SELECT DepDelay, LongestAddGTime, Month FROM mytable WHERE TotalAddGTime BETWEEN 103 AND 96 OR DestCityName BETWEEN 'Oakland, CA' AND 'Oklahoma City, OK' ORDER BY FirstDepTime, Carrier, ArrTimeBlk LIMIT 16"]}
+{"sql":"SELECT DepDelay, LongestAddGTime, \"Month\" FROM mytable WHERE TotalAddGTime BETWEEN 103 AND 96 OR DestCityName BETWEEN 'Oakland, CA' AND 'Oklahoma City, OK' ORDER BY FirstDepTime, Carrier, ArrTimeBlk LIMIT 16","hsqls":["SELECT DepDelay, LongestAddGTime, `Month` FROM mytable WHERE TotalAddGTime BETWEEN 103 AND 96 OR DestCityName BETWEEN 'Oakland, CA' AND 'Oklahoma City, OK' ORDER BY FirstDepTime, Carrier, ArrTimeBlk LIMIT 16"]}
 {"sql":"SELECT DivDistance, OriginStateName FROM mytable WHERE ArrTime NOT IN (26) OR DayofMonth NOT IN (20) ORDER BY Dest, DivAirportLandings LIMIT 10"}
 {"sql":"SELECT DaysSinceEpoch FROM mytable LIMIT 19"}
 {"sql":"SELECT OriginCityMarketID, COUNT(UniqueCarrier) FROM mytable WHERE OriginCityMarketID NOT IN (30721, 31638, 30562, 31823) AND ArrivalDelayGroups <> 7 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 4","hsqls":["SELECT OriginCityMarketID, COUNT(UniqueCarrier) FROM mytable WHERE OriginCityMarketID NOT IN (30721, 31638, 30562, 31823) AND ArrivalDelayGroups <> 7 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 4"]}
-{"sql":"SELECT OriginCityMarketID, DepDel15, DivAirportIDs FROM mytable ORDER BY ArrTimeBlk","hsqls":["SELECT OriginCityMarketID, DepDel15, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY ArrTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DestState, UniqueCarrier, COUNT(\"Month\"), MIN(DestAirportID), SUM(Flights) FROM mytable GROUP BY DestState, UniqueCarrier LIMIT 24","hsqls":["SELECT DestState, UniqueCarrier, COUNT(Month), MIN(DestAirportID), SUM(Flights) FROM mytable GROUP BY DestState, UniqueCarrier LIMIT 24"]}
+{"sql":"SELECT OriginCityMarketID, DepDel15, DivAirportIDs FROM mytable ORDER BY ArrTimeBlk","hsqls":["SELECT OriginCityMarketID, DepDel15, DivAirportIDs FROM mytable ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DestState, UniqueCarrier, COUNT(\"Month\"), MIN(DestAirportID), SUM(Flights) FROM mytable GROUP BY DestState, UniqueCarrier LIMIT 24","hsqls":["SELECT DestState, UniqueCarrier, COUNT(`Month`), MIN(DestAirportID), SUM(Flights) FROM mytable GROUP BY DestState, UniqueCarrier LIMIT 24"]}
 {"sql":"SELECT DepTime, COUNT(*) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 7","hsqls":["SELECT DepTime, COUNT(*) FROM mytable GROUP BY DepTime  ORDER BY DepTime LIMIT 7"]}
 {"sql":"SELECT CRSElapsedTime FROM mytable WHERE DestState <= 'VT' OR DestWac BETWEEN 88 AND 53"}
 {"sql":"SELECT Cancelled, SUM(DepDel15), MIN(DivDistance) FROM mytable GROUP BY Cancelled  ORDER BY Cancelled LIMIT 5","hsqls":["SELECT Cancelled, SUM(DepDel15), MIN(DivDistance) FROM mytable GROUP BY Cancelled  ORDER BY Cancelled LIMIT 5"]}
 {"sql":"SELECT Distance FROM mytable WHERE ActualElapsedTime >= 42 OR CRSDepTime <> 635 ORDER BY TaxiIn, Dest, DestCityMarketID LIMIT 18"}
 {"sql":"SELECT LongestAddGTime, DestAirportSeqID FROM mytable WHERE DivDistance BETWEEN 1246 AND 483 ORDER BY Distance, NASDelay, CRSElapsedTime LIMIT 29"}
-{"sql":"SELECT DestState, CRSArrTime, TailNum FROM mytable WHERE DivReachedDest NOT IN (1) OR DepTimeBlk <> '0800-0859' AND DivAirportIDs >= 16271 LIMIT 27","hsqls":["SELECT DestState, CRSArrTime, TailNum FROM mytable WHERE DivReachedDest NOT IN (1) OR DepTimeBlk <> '0800-0859' AND (DivAirportIDs__MV0 >= 16271 OR DivAirportIDs__MV1 >= 16271 OR DivAirportIDs__MV2 >= 16271 OR DivAirportIDs__MV3 >= 16271 OR DivAirportIDs__MV4 >= 16271) LIMIT 10000"]}
+{"sql":"SELECT DestState, CRSArrTime, TailNum FROM mytable WHERE DivReachedDest NOT IN (1) OR DepTimeBlk <> '0800-0859' AND DivAirportIDs >= 16271 LIMIT 27","hsqls":["SELECT DestState, CRSArrTime, TailNum FROM mytable WHERE DivReachedDest NOT IN (1) OR DepTimeBlk <> '0800-0859' AND (DivAirportIDs[1] >= 16271 OR DivAirportIDs[2] >= 16271 OR DivAirportIDs[3] >= 16271 OR DivAirportIDs[4] >= 16271 OR DivAirportIDs[5] >= 16271) LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, OriginAirportID, SUM(TotalAddGTime), MAX(Distance) FROM mytable WHERE DestStateFips <> 75 OR Distance BETWEEN 1282 AND 1183 GROUP BY CarrierDelay, OriginAirportID  ORDER BY CarrierDelay, OriginAirportID LIMIT 27","hsqls":["SELECT CarrierDelay, OriginAirportID, SUM(TotalAddGTime), MAX(Distance) FROM mytable WHERE DestStateFips <> 75 OR Distance BETWEEN 1282 AND 1183 GROUP BY CarrierDelay, OriginAirportID  ORDER BY CarrierDelay, OriginAirportID LIMIT 27"]}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE CancellationCode IN ('noodles') ORDER BY LateAircraftDelay, ArrTime, ActualElapsedTime LIMIT 27"}
 {"sql":"SELECT ArrDelayMinutes, MAX(DestStateFips) FROM mytable WHERE DestCityMarketID NOT IN (30739, 33277, 31986) GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21","hsqls":["SELECT ArrDelayMinutes, MAX(DestStateFips) FROM mytable WHERE DestCityMarketID NOT IN (30739, 33277, 31986) GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21"]}
@@ -6816,31 +6816,31 @@
 {"sql":"SELECT MAX(AirlineID) FROM mytable WHERE DivActualElapsedTime NOT IN (178) LIMIT 18"}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE DepTimeBlk BETWEEN '2200-2259' AND '0900-0959' ORDER BY TaxiOut, ArrTimeBlk LIMIT 29"}
 {"sql":"SELECT DivDistance, OriginCityMarketID, OriginAirportID FROM mytable WHERE CRSElapsedTime IN (48, 86, 165) LIMIT 23"}
-{"sql":"SELECT DestWac, OriginStateName, MIN(DepDel15) FROM mytable WHERE AirTime IN (304, 16, 346, 27, 11) OR DivAirports > 'LGB' AND DivDistance > 153 GROUP BY DestWac, OriginStateName LIMIT 3","hsqls":["SELECT DestWac, OriginStateName, MIN(DepDel15) FROM mytable WHERE AirTime IN (304, 16, 346, 27, 11) OR (DivAirports__MV0 > 'LGB' OR DivAirports__MV1 > 'LGB' OR DivAirports__MV2 > 'LGB' OR DivAirports__MV3 > 'LGB' OR DivAirports__MV4 > 'LGB') AND DivDistance > 153 GROUP BY DestWac, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestWac, OriginStateName, MIN(DepDel15) FROM mytable WHERE AirTime IN (304, 16, 346, 27, 11) OR DivAirports > 'LGB' AND DivDistance > 153 GROUP BY DestWac, OriginStateName LIMIT 3","hsqls":["SELECT DestWac, OriginStateName, MIN(DepDel15) FROM mytable WHERE AirTime IN (304, 16, 346, 27, 11) OR (DivAirports[1] > 'LGB' OR DivAirports[2] > 'LGB' OR DivAirports[3] > 'LGB' OR DivAirports[4] > 'LGB' OR DivAirports[5] > 'LGB') AND DivDistance > 153 GROUP BY DestWac, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT AVG(CarrierDelay), AVG(CRSElapsedTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR Dest <> 'BTM' LIMIT 4"}
 {"sql":"SELECT MIN(WheelsOn) FROM mytable WHERE FirstDepTime NOT IN (1859) LIMIT 8"}
-{"sql":"SELECT LongestAddGTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE DestAirportID BETWEEN 13931 AND 13198 OR LongestAddGTime >= 14 OR DivTailNums = 'N348JB' ORDER BY DistanceGroup, FirstDepTime, WheelsOn LIMIT 5","hsqls":["SELECT LongestAddGTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE DestAirportID BETWEEN 13931 AND 13198 OR LongestAddGTime >= 14 OR (DivTailNums__MV0 = 'N348JB' OR DivTailNums__MV1 = 'N348JB' OR DivTailNums__MV2 = 'N348JB' OR DivTailNums__MV3 = 'N348JB' OR DivTailNums__MV4 = 'N348JB') ORDER BY DistanceGroup, FirstDepTime, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT MIN(DepartureDelayGroups) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND \"Year\" > 2014 OR OriginCityMarketID > 30627 LIMIT 23","hsqls":["SELECT MIN(DepartureDelayGroups) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND Year > 2014 OR OriginCityMarketID > 30627 LIMIT 23"]}
+{"sql":"SELECT LongestAddGTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE DestAirportID BETWEEN 13931 AND 13198 OR LongestAddGTime >= 14 OR DivTailNums = 'N348JB' ORDER BY DistanceGroup, FirstDepTime, WheelsOn LIMIT 5","hsqls":["SELECT LongestAddGTime, DivArrDelay, ArrivalDelayGroups FROM mytable WHERE DestAirportID BETWEEN 13931 AND 13198 OR LongestAddGTime >= 14 OR (DivTailNums[1] = 'N348JB' OR DivTailNums[2] = 'N348JB' OR DivTailNums[3] = 'N348JB' OR DivTailNums[4] = 'N348JB' OR DivTailNums[5] = 'N348JB') ORDER BY DistanceGroup, FirstDepTime, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT MIN(DepartureDelayGroups) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND \"Year\" > 2014 OR OriginCityMarketID > 30627 LIMIT 23","hsqls":["SELECT MIN(DepartureDelayGroups) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND `Year` > 2014 OR OriginCityMarketID > 30627 LIMIT 23"]}
 {"sql":"SELECT DestWac, OriginStateName, SUM(DistanceGroup), MAX(CRSDepTime) FROM mytable WHERE DepartureDelayGroups <= 6 GROUP BY DestWac, OriginStateName  ORDER BY DestWac, OriginStateName LIMIT 15","hsqls":["SELECT DestWac, OriginStateName, SUM(DistanceGroup), MAX(CRSDepTime) FROM mytable WHERE DepartureDelayGroups <= 6 GROUP BY DestWac, OriginStateName  ORDER BY DestWac, OriginStateName LIMIT 15"]}
 {"sql":"SELECT DestAirportSeqID, DestStateName, COUNT(*) FROM mytable WHERE DaysSinceEpoch >= 16084 AND DivAirportLandings = 1 AND DayOfWeek BETWEEN 1 AND 1 GROUP BY DestAirportSeqID, DestStateName  ORDER BY DestAirportSeqID, DestStateName LIMIT 25","hsqls":["SELECT DestAirportSeqID, DestStateName, COUNT(*) FROM mytable WHERE DaysSinceEpoch >= 16084 AND DivAirportLandings = 1 AND DayOfWeek BETWEEN 1 AND 1 GROUP BY DestAirportSeqID, DestStateName  ORDER BY DestAirportSeqID, DestStateName LIMIT 25"]}
-{"sql":"SELECT CarrierDelay, FlightNum, CRSDepTime, SUM(\"Month\"), SUM(DivDistance) FROM mytable WHERE Quarter IN (1) AND \"Year\" >= 2014 OR OriginCityMarketID >= 32457 GROUP BY CarrierDelay, FlightNum, CRSDepTime LIMIT 15","hsqls":["SELECT CarrierDelay, FlightNum, CRSDepTime, SUM(Month), SUM(DivDistance) FROM mytable WHERE Quarter IN (1) AND Year >= 2014 OR OriginCityMarketID >= 32457 GROUP BY CarrierDelay, FlightNum, CRSDepTime LIMIT 15"]}
-{"sql":"SELECT OriginCityName, DivTailNums FROM mytable ORDER BY Diverted, OriginStateFips LIMIT 10","hsqls":["SELECT OriginCityName, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY Diverted, OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, FlightNum, CRSDepTime, SUM(\"Month\"), SUM(DivDistance) FROM mytable WHERE Quarter IN (1) AND \"Year\" >= 2014 OR OriginCityMarketID >= 32457 GROUP BY CarrierDelay, FlightNum, CRSDepTime LIMIT 15","hsqls":["SELECT CarrierDelay, FlightNum, CRSDepTime, SUM(`Month`), SUM(DivDistance) FROM mytable WHERE Quarter IN (1) AND `Year` >= 2014 OR OriginCityMarketID >= 32457 GROUP BY CarrierDelay, FlightNum, CRSDepTime LIMIT 15"]}
+{"sql":"SELECT OriginCityName, DivTailNums FROM mytable ORDER BY Diverted, OriginStateFips LIMIT 10","hsqls":["SELECT OriginCityName, DivTailNums FROM mytable ORDER BY Diverted, OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT Diverted, OriginStateFips FROM mytable WHERE DepDelayMinutes IN (18.0, 36.0, 254.0, 124.0) LIMIT 9"}
 {"sql":"SELECT DepDelayMinutes, DestCityName, AirTime FROM mytable WHERE OriginCityMarketID BETWEEN 30333 AND 33570 LIMIT 10"}
 {"sql":"SELECT DaysSinceEpoch FROM mytable ORDER BY FirstDepTime, DepTime, ArrTime LIMIT 28"}
 {"sql":"SELECT DivAirportLandings, DivArrDelay, MAX(DepDelay) FROM mytable WHERE UniqueCarrier <> 'B6' OR DivAirportLandings IN (2, 1, 9) OR ActualElapsedTime = 302 GROUP BY DivAirportLandings, DivArrDelay  ORDER BY DivAirportLandings, DivArrDelay LIMIT 14","hsqls":["SELECT DivAirportLandings, DivArrDelay, MAX(DepDelay) FROM mytable WHERE UniqueCarrier <> 'B6' OR DivAirportLandings IN (2, 1, 9) OR ActualElapsedTime = 302 GROUP BY DivAirportLandings, DivArrDelay  ORDER BY DivAirportLandings, DivArrDelay LIMIT 14"]}
 {"sql":"SELECT AVG(LongestAddGTime), COUNT(ArrDel15), MIN(DayofMonth) FROM mytable WHERE WheelsOff IN (1638, 1008, 2036, 1300, 845) OR DepTime BETWEEN 1250 AND 1629 AND CRSElapsedTime >= 286"}
-{"sql":"SELECT DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelay LIMIT 24","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelay LIMIT 24","hsqls":["SELECT DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrDelay FROM mytable WHERE OriginWac IN (5, 51, 61) ORDER BY ArrDel15 LIMIT 18"}
-{"sql":"SELECT FirstDepTime, ArrTime, DivWheelsOffs FROM mytable WHERE DestCityMarketID NOT IN (31865) OR CRSDepTime > 1120 LIMIT 17","hsqls":["SELECT FirstDepTime, ArrTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DestCityMarketID NOT IN (31865) OR CRSDepTime > 1120 LIMIT 10000"]}
-{"sql":"SELECT DepDelay, Carrier, DayofMonth, COUNT(*) FROM mytable WHERE \"Month\" IN (1) OR WeatherDelay = 25 AND DivAirportLandings IN (2, 1, 0, 9) GROUP BY DepDelay, Carrier, DayofMonth LIMIT 13","hsqls":["SELECT DepDelay, Carrier, DayofMonth, COUNT(*) FROM mytable WHERE Month IN (1) OR WeatherDelay = 25 AND DivAirportLandings IN (2, 1, 0, 9) GROUP BY DepDelay, Carrier, DayofMonth LIMIT 13"]}
+{"sql":"SELECT FirstDepTime, ArrTime, DivWheelsOffs FROM mytable WHERE DestCityMarketID NOT IN (31865) OR CRSDepTime > 1120 LIMIT 17","hsqls":["SELECT FirstDepTime, ArrTime, DivWheelsOffs FROM mytable WHERE DestCityMarketID NOT IN (31865) OR CRSDepTime > 1120 LIMIT 10000"]}
+{"sql":"SELECT DepDelay, Carrier, DayofMonth, COUNT(*) FROM mytable WHERE \"Month\" IN (1) OR WeatherDelay = 25 AND DivAirportLandings IN (2, 1, 0, 9) GROUP BY DepDelay, Carrier, DayofMonth LIMIT 13","hsqls":["SELECT DepDelay, Carrier, DayofMonth, COUNT(*) FROM mytable WHERE `Month` IN (1) OR WeatherDelay = 25 AND DivAirportLandings IN (2, 1, 0, 9) GROUP BY DepDelay, Carrier, DayofMonth LIMIT 13"]}
 {"sql":"SELECT DepTime, AirTime, SUM(ActualElapsedTime), MAX(DepDelay) FROM mytable WHERE FlightDate IN ('2014-01-03') OR CRSArrTime <> 2341 GROUP BY DepTime, AirTime  ORDER BY DepTime, AirTime LIMIT 3","hsqls":["SELECT DepTime, AirTime, SUM(ActualElapsedTime), MAX(DepDelay) FROM mytable WHERE FlightDate IN ('2014-01-03') OR CRSArrTime <> 2341 GROUP BY DepTime, AirTime  ORDER BY DepTime, AirTime LIMIT 3"]}
 {"sql":"SELECT Flights, DayofMonth, OriginAirportID, COUNT(Origin), MIN(TotalAddGTime), MAX(DivAirportLandings) FROM mytable WHERE DayOfWeek IN (3, 1, 6, 5, 4) OR Flights = 1 GROUP BY Flights, DayofMonth, OriginAirportID  ORDER BY Flights, DayofMonth, OriginAirportID LIMIT 2","hsqls":["SELECT Flights, DayofMonth, OriginAirportID, COUNT(Origin), MIN(TotalAddGTime), MAX(DivAirportLandings) FROM mytable WHERE DayOfWeek IN (3, 1, 6, 5, 4) OR Flights = 1 GROUP BY Flights, DayofMonth, OriginAirportID  ORDER BY Flights, DayofMonth, OriginAirportID LIMIT 2"]}
-{"sql":"SELECT DivAirportSeqIDs, ArrTimeBlk, CRSElapsedTime FROM mytable ORDER BY DepDelayMinutes, DestCityMarketID, OriginAirportID LIMIT 11","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrTimeBlk, CRSElapsedTime FROM mytable ORDER BY DepDelayMinutes, DestCityMarketID, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, ArrTimeBlk, CRSElapsedTime FROM mytable ORDER BY DepDelayMinutes, DestCityMarketID, OriginAirportID LIMIT 11","hsqls":["SELECT DivAirportSeqIDs, ArrTimeBlk, CRSElapsedTime FROM mytable ORDER BY DepDelayMinutes, DestCityMarketID, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT Diverted, CarrierDelay, COUNT(*) FROM mytable WHERE DaysSinceEpoch <= 16076 AND DestCityMarketID BETWEEN 34252 AND 31726 OR DivArrDelay <= 436 GROUP BY Diverted, CarrierDelay  ORDER BY Diverted, CarrierDelay LIMIT 19","hsqls":["SELECT Diverted, CarrierDelay, COUNT(*) FROM mytable WHERE DaysSinceEpoch <= 16076 AND DestCityMarketID BETWEEN 34252 AND 31726 OR DivArrDelay <= 436 GROUP BY Diverted, CarrierDelay  ORDER BY Diverted, CarrierDelay LIMIT 19"]}
 {"sql":"SELECT SecurityDelay, DivArrDelay, COUNT(OriginAirportSeqID), SUM(CRSArrTime), AVG(ArrDelay) FROM mytable GROUP BY SecurityDelay, DivArrDelay  ORDER BY SecurityDelay, DivArrDelay LIMIT 4","hsqls":["SELECT SecurityDelay, DivArrDelay, COUNT(OriginAirportSeqID), SUM(CRSArrTime), AVG(ArrDelay) FROM mytable GROUP BY SecurityDelay, DivArrDelay  ORDER BY SecurityDelay, DivArrDelay LIMIT 4"]}
-{"sql":"SELECT DivAirports, CRSDepTime, OriginAirportID FROM mytable WHERE DestWac <= 37 AND DestStateName BETWEEN 'Montana' AND 'Texas' ORDER BY DepDel15 LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, CRSDepTime, OriginAirportID FROM mytable WHERE DestWac <= 37 AND DestStateName BETWEEN 'Montana' AND 'Texas' ORDER BY DepDel15 LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, DepartureDelayGroups, FlightNum FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR CarrierDelay >= 74 OR DivAirportIDs BETWEEN 14689 AND 11953 ORDER BY Flights, DestStateName, CancellationCode LIMIT 21","hsqls":["SELECT TaxiOut, DepartureDelayGroups, FlightNum FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR CarrierDelay >= 74 OR (DivAirportIDs__MV0 BETWEEN 14689 AND 11953 OR DivAirportIDs__MV1 BETWEEN 14689 AND 11953 OR DivAirportIDs__MV2 BETWEEN 14689 AND 11953 OR DivAirportIDs__MV3 BETWEEN 14689 AND 11953 OR DivAirportIDs__MV4 BETWEEN 14689 AND 11953) ORDER BY Flights, DestStateName, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirports, CRSDepTime, OriginAirportID FROM mytable WHERE DestWac <= 37 AND DestStateName BETWEEN 'Montana' AND 'Texas' ORDER BY DepDel15 LIMIT 2","hsqls":["SELECT DivAirports, CRSDepTime, OriginAirportID FROM mytable WHERE DestWac <= 37 AND DestStateName BETWEEN 'Montana' AND 'Texas' ORDER BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DepartureDelayGroups, FlightNum FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR CarrierDelay >= 74 OR DivAirportIDs BETWEEN 14689 AND 11953 ORDER BY Flights, DestStateName, CancellationCode LIMIT 21","hsqls":["SELECT TaxiOut, DepartureDelayGroups, FlightNum FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') OR CarrierDelay >= 74 OR (DivAirportIDs[1] BETWEEN 14689 AND 11953 OR DivAirportIDs[2] BETWEEN 14689 AND 11953 OR DivAirportIDs[3] BETWEEN 14689 AND 11953 OR DivAirportIDs[4] BETWEEN 14689 AND 11953 OR DivAirportIDs[5] BETWEEN 14689 AND 11953) ORDER BY Flights, DestStateName, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT \"Year\", FlightNum, SUM(DestCityMarketID) FROM mytable WHERE DepTime IN (2222, 1323, 1310, 1604) GROUP BY \"Year\", FlightNum LIMIT 10","hsqls":["SELECT Year, FlightNum, SUM(DestCityMarketID) FROM mytable WHERE DepTime IN (2222, 1323, 1310, 1604) GROUP BY Year, FlightNum LIMIT 10"]}
 {"sql":"SELECT TotalAddGTime, ArrivalDelayGroups, OriginStateName, MAX(WheelsOff), SUM(FirstDepTime), MAX(DayOfWeek) FROM mytable WHERE FlightDate < '2014-01-28' OR WheelsOn > 1218 OR TaxiIn NOT IN (116, 67, 31, 36) GROUP BY TotalAddGTime, ArrivalDelayGroups, OriginStateName  ORDER BY TotalAddGTime, ArrivalDelayGroups, OriginStateName LIMIT 14","hsqls":["SELECT TotalAddGTime, ArrivalDelayGroups, OriginStateName, MAX(WheelsOff), SUM(FirstDepTime), MAX(DayOfWeek) FROM mytable WHERE FlightDate < '2014-01-28' OR WheelsOn > 1218 OR TaxiIn NOT IN (116, 67, 31, 36) GROUP BY TotalAddGTime, ArrivalDelayGroups, OriginStateName  ORDER BY TotalAddGTime, ArrivalDelayGroups, OriginStateName LIMIT 14"]}
 {"sql":"SELECT MIN(ArrDelayMinutes), COUNT(ActualElapsedTime), SUM(FlightNum) FROM mytable WHERE DistanceGroup = 3 AND CancellationCode IN ('A', 'B', 'C') OR Distance IN (4983, 723, 1120, 214, 1635) LIMIT 18"}
@@ -6848,10 +6848,10 @@
 {"sql":"SELECT ActualElapsedTime, DepDel15, MAX(OriginAirportID), MAX(FlightNum) FROM mytable GROUP BY ActualElapsedTime, DepDel15  ORDER BY ActualElapsedTime, DepDel15 LIMIT 27","hsqls":["SELECT ActualElapsedTime, DepDel15, MAX(OriginAirportID), MAX(FlightNum) FROM mytable GROUP BY ActualElapsedTime, DepDel15  ORDER BY ActualElapsedTime, DepDel15 LIMIT 27"]}
 {"sql":"SELECT OriginState, CRSArrTime FROM mytable WHERE DestState BETWEEN 'WA' AND 'UT' ORDER BY DepDel15 LIMIT 18"}
 {"sql":"SELECT MAX(DestStateFips), MIN(DestStateFips) FROM mytable WHERE DestState = 'NM' LIMIT 10"}
-{"sql":"SELECT ArrTimeBlk, DivActualElapsedTime, COUNT(FlightNum), COUNT(OriginState), SUM(DivDistance) FROM mytable WHERE DivWheelsOns > 2020 AND TotalAddGTime IN (21, 30, 47, 19, 27) AND DestStateName <> 'Texas' GROUP BY ArrTimeBlk, DivActualElapsedTime LIMIT 22","hsqls":["SELECT ArrTimeBlk, DivActualElapsedTime, COUNT(FlightNum), COUNT(OriginState), SUM(DivDistance) FROM mytable WHERE (DivWheelsOns__MV0 > 2020 OR DivWheelsOns__MV1 > 2020 OR DivWheelsOns__MV2 > 2020 OR DivWheelsOns__MV3 > 2020 OR DivWheelsOns__MV4 > 2020) AND TotalAddGTime IN (21, 30, 47, 19, 27) AND DestStateName <> 'Texas' GROUP BY ArrTimeBlk, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DivActualElapsedTime, COUNT(FlightNum), COUNT(OriginState), SUM(DivDistance) FROM mytable WHERE DivWheelsOns > 2020 AND TotalAddGTime IN (21, 30, 47, 19, 27) AND DestStateName <> 'Texas' GROUP BY ArrTimeBlk, DivActualElapsedTime LIMIT 22","hsqls":["SELECT ArrTimeBlk, DivActualElapsedTime, COUNT(FlightNum), COUNT(OriginState), SUM(DivDistance) FROM mytable WHERE (DivWheelsOns[1] > 2020 OR DivWheelsOns[2] > 2020 OR DivWheelsOns[3] > 2020 OR DivWheelsOns[4] > 2020 OR DivWheelsOns[5] > 2020) AND TotalAddGTime IN (21, 30, 47, 19, 27) AND DestStateName <> 'Texas' GROUP BY ArrTimeBlk, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Diverted FROM mytable WHERE TailNum BETWEEN 'N652BR' AND 'N493UA' AND FirstDepTime BETWEEN 227 AND 1856 ORDER BY DivActualElapsedTime LIMIT 12"}
 {"sql":"SELECT COUNT(SecurityDelay), MIN(TotalAddGTime), MIN(LongestAddGTime) FROM mytable WHERE ActualElapsedTime BETWEEN 270 AND 487 AND DistanceGroup > 10 LIMIT 17"}
-{"sql":"SELECT DivAirportSeqIDs, DivTotalGTimes FROM mytable WHERE LateAircraftDelay BETWEEN 249 AND 160 OR DepTimeBlk < '1900-1959' OR OriginCityMarketID NOT IN (30647, 34262, 35401, 33785) ORDER BY FlightNum LIMIT 16","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE LateAircraftDelay BETWEEN 249 AND 160 OR DepTimeBlk < '1900-1959' OR OriginCityMarketID NOT IN (30647, 34262, 35401, 33785) ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivTotalGTimes FROM mytable WHERE LateAircraftDelay BETWEEN 249 AND 160 OR DepTimeBlk < '1900-1959' OR OriginCityMarketID NOT IN (30647, 34262, 35401, 33785) ORDER BY FlightNum LIMIT 16","hsqls":["SELECT DivAirportSeqIDs, DivTotalGTimes FROM mytable WHERE LateAircraftDelay BETWEEN 249 AND 160 OR DepTimeBlk < '1900-1959' OR OriginCityMarketID NOT IN (30647, 34262, 35401, 33785) ORDER BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT DestCityName, COUNT(*) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 21","hsqls":["SELECT DestCityName, COUNT(*) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 21"]}
 {"sql":"SELECT Carrier, AVG(CRSElapsedTime) FROM mytable WHERE ActualElapsedTime = 372 OR ArrivalDelayGroups BETWEEN 0 AND 3 GROUP BY Carrier  ORDER BY Carrier LIMIT 6","hsqls":["SELECT Carrier, AVG(CRSElapsedTime) FROM mytable WHERE ActualElapsedTime = 372 OR ArrivalDelayGroups BETWEEN 0 AND 3 GROUP BY Carrier  ORDER BY Carrier LIMIT 6"]}
 {"sql":"SELECT CarrierDelay, MAX(DestCityMarketID), SUM(DivDistance), COUNT(DivAirportLandings) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 27","hsqls":["SELECT CarrierDelay, MAX(DestCityMarketID), SUM(DivDistance), COUNT(DivAirportLandings) FROM mytable GROUP BY CarrierDelay  ORDER BY CarrierDelay LIMIT 27"]}
@@ -6865,26 +6865,26 @@
 {"sql":"SELECT NASDelay, AirTime FROM mytable ORDER BY DivReachedDest, ArrDel15, OriginWac LIMIT 19"}
 {"sql":"SELECT TaxiIn FROM mytable WHERE OriginAirportID NOT IN (10279, 10529, 11603) OR AirTime <> 205 AND OriginStateFips NOT IN (49, 20, 37) ORDER BY CRSArrTime LIMIT 23"}
 {"sql":"SELECT OriginStateFips, ArrTimeBlk, COUNT(FirstDepTime), AVG(Quarter) FROM mytable WHERE ArrTime IN (739) OR DestStateName NOT IN ('Rhode Island') AND ArrDel15 IN (0) GROUP BY OriginStateFips, ArrTimeBlk  ORDER BY OriginStateFips, ArrTimeBlk LIMIT 4","hsqls":["SELECT OriginStateFips, ArrTimeBlk, COUNT(FirstDepTime), AVG(Quarter) FROM mytable WHERE ArrTime IN (739) OR DestStateName NOT IN ('Rhode Island') AND ArrDel15 IN (0) GROUP BY OriginStateFips, ArrTimeBlk  ORDER BY OriginStateFips, ArrTimeBlk LIMIT 4"]}
-{"sql":"SELECT LongestAddGTime, Dest, DivAirportIDs FROM mytable LIMIT 26","hsqls":["SELECT LongestAddGTime, Dest, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Dest, DivAirportIDs FROM mytable LIMIT 26","hsqls":["SELECT LongestAddGTime, Dest, DivAirportIDs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, MAX(OriginAirportID), AVG(AirlineID) FROM mytable WHERE OriginWac IN (52, 86) OR OriginAirportID >= 10792 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18","hsqls":["SELECT OriginStateFips, MAX(OriginAirportID), AVG(AirlineID) FROM mytable WHERE OriginWac IN (52, 86) OR OriginAirportID >= 10792 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE TotalAddGTime = 78 OR DivAirportLandings IN (1, 0, 9) ORDER BY TaxiIn LIMIT 28"}
 {"sql":"SELECT OriginAirportSeqID, OriginCityMarketID FROM mytable ORDER BY DestAirportID LIMIT 20"}
-{"sql":"SELECT \"Year\", ArrTimeBlk, COUNT(FirstDepTime), MAX(DayOfWeek) FROM mytable WHERE DivWheelsOns <= 1303 GROUP BY \"Year\", ArrTimeBlk LIMIT 25","hsqls":["SELECT Year, ArrTimeBlk, COUNT(FirstDepTime), MAX(DayOfWeek) FROM mytable WHERE (DivWheelsOns__MV0 <= 1303 OR DivWheelsOns__MV1 <= 1303 OR DivWheelsOns__MV2 <= 1303 OR DivWheelsOns__MV3 <= 1303 OR DivWheelsOns__MV4 <= 1303) GROUP BY Year, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT \"Year\", ArrTimeBlk, COUNT(FirstDepTime), MAX(DayOfWeek) FROM mytable WHERE DivWheelsOns <= 1303 GROUP BY \"Year\", ArrTimeBlk LIMIT 25","hsqls":["SELECT Year, ArrTimeBlk, COUNT(FirstDepTime), MAX(DayOfWeek) FROM mytable WHERE (DivWheelsOns[1] <= 1303 OR DivWheelsOns[2] <= 1303 OR DivWheelsOns[3] <= 1303 OR DivWheelsOns[4] <= 1303 OR DivWheelsOns[5] <= 1303) GROUP BY Year, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable"}
 {"sql":"SELECT MIN(ArrTime) FROM mytable WHERE OriginAirportSeqID BETWEEN 1200702 AND 1295302 AND DepDelayMinutes = 19.0 LIMIT 3"}
 {"sql":"SELECT AVG(OriginCityMarketID) FROM mytable WHERE DestState BETWEEN 'CA' AND 'ME' AND DepTimeBlk BETWEEN '2000-2059' AND '1100-1159' AND AirTime BETWEEN 166 AND 99 LIMIT 26"}
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE FirstDepTime BETWEEN 1734 AND 1200 AND CRSArrTime >= 1313 ORDER BY TaxiOut, DaysSinceEpoch LIMIT 17"}
-{"sql":"SELECT DepDelayMinutes, OriginStateName FROM mytable WHERE DivAirports BETWEEN 'MRY' AND 'IND' ORDER BY Carrier, OriginCityName, TaxiIn LIMIT 11","hsqls":["SELECT DepDelayMinutes, OriginStateName FROM mytable WHERE (DivAirports__MV0 BETWEEN 'MRY' AND 'IND' OR DivAirports__MV1 BETWEEN 'MRY' AND 'IND' OR DivAirports__MV2 BETWEEN 'MRY' AND 'IND' OR DivAirports__MV3 BETWEEN 'MRY' AND 'IND' OR DivAirports__MV4 BETWEEN 'MRY' AND 'IND') ORDER BY Carrier, OriginCityName, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, OriginStateName FROM mytable WHERE DivAirports BETWEEN 'MRY' AND 'IND' ORDER BY Carrier, OriginCityName, TaxiIn LIMIT 11","hsqls":["SELECT DepDelayMinutes, OriginStateName FROM mytable WHERE (DivAirports[1] BETWEEN 'MRY' AND 'IND' OR DivAirports[2] BETWEEN 'MRY' AND 'IND' OR DivAirports[3] BETWEEN 'MRY' AND 'IND' OR DivAirports[4] BETWEEN 'MRY' AND 'IND' OR DivAirports[5] BETWEEN 'MRY' AND 'IND') ORDER BY Carrier, OriginCityName, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT SUM(DestAirportID) FROM mytable LIMIT 9"}
 {"sql":"SELECT Diverted, DivDistance, DayofMonth FROM mytable WHERE DepDelayMinutes > 14.0 AND Flights NOT IN (1) OR ArrTimeBlk > '1700-1759' ORDER BY WeatherDelay, DestStateName LIMIT 17"}
 {"sql":"SELECT ArrDelayMinutes, DestCityName, COUNT(*) FROM mytable WHERE OriginCityName IN ('Eagle, CO', 'Paducah, KY') AND OriginStateFips > 8 GROUP BY ArrDelayMinutes, DestCityName  ORDER BY ArrDelayMinutes, DestCityName LIMIT 12","hsqls":["SELECT ArrDelayMinutes, DestCityName, COUNT(*) FROM mytable WHERE OriginCityName IN ('Eagle, CO', 'Paducah, KY') AND OriginStateFips > 8 GROUP BY ArrDelayMinutes, DestCityName  ORDER BY ArrDelayMinutes, DestCityName LIMIT 12"]}
 {"sql":"SELECT OriginStateName, COUNT(*) FROM mytable GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 7","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 7"]}
 {"sql":"SELECT DepartureDelayGroups, ArrDelay, AVG(Cancelled), SUM(OriginAirportID), MIN(CRSElapsedTime) FROM mytable WHERE AirlineID <> 19790 OR OriginStateFips <> 35 AND DestState >= 'SD' GROUP BY DepartureDelayGroups, ArrDelay  ORDER BY DepartureDelayGroups, ArrDelay LIMIT 11","hsqls":["SELECT DepartureDelayGroups, ArrDelay, AVG(Cancelled), SUM(OriginAirportID), MIN(CRSElapsedTime) FROM mytable WHERE AirlineID <> 19790 OR OriginStateFips <> 35 AND DestState >= 'SD' GROUP BY DepartureDelayGroups, ArrDelay  ORDER BY DepartureDelayGroups, ArrDelay LIMIT 11"]}
 {"sql":"SELECT Diverted, OriginState, DestState, AVG(DestCityMarketID), COUNT(CRSElapsedTime) FROM mytable WHERE Flights = 1 AND TaxiIn BETWEEN 1 AND 12 GROUP BY Diverted, OriginState, DestState  ORDER BY Diverted, OriginState, DestState LIMIT 6","hsqls":["SELECT Diverted, OriginState, DestState, AVG(DestCityMarketID), COUNT(CRSElapsedTime) FROM mytable WHERE Flights = 1 AND TaxiIn BETWEEN 1 AND 12 GROUP BY Diverted, OriginState, DestState  ORDER BY Diverted, OriginState, DestState LIMIT 6"]}
-{"sql":"SELECT DestState, WeatherDelay, CancellationCode, MAX(OriginWac) FROM mytable WHERE DivAirports > 'JFK' OR DivAirportLandings <> 2 GROUP BY DestState, WeatherDelay, CancellationCode LIMIT 9","hsqls":["SELECT DestState, WeatherDelay, CancellationCode, MAX(OriginWac) FROM mytable WHERE (DivAirports__MV0 > 'JFK' OR DivAirports__MV1 > 'JFK' OR DivAirports__MV2 > 'JFK' OR DivAirports__MV3 > 'JFK' OR DivAirports__MV4 > 'JFK') OR DivAirportLandings <> 2 GROUP BY DestState, WeatherDelay, CancellationCode LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, Origin, \"Month\" FROM mytable WHERE DivReachedDest BETWEEN 1 AND 0 ORDER BY DestStateName, Origin, OriginStateName LIMIT 16","hsqls":["SELECT OriginAirportSeqID, Origin, Month FROM mytable WHERE DivReachedDest BETWEEN 1 AND 0 ORDER BY DestStateName, Origin, OriginStateName LIMIT 16"]}
+{"sql":"SELECT DestState, WeatherDelay, CancellationCode, MAX(OriginWac) FROM mytable WHERE DivAirports > 'JFK' OR DivAirportLandings <> 2 GROUP BY DestState, WeatherDelay, CancellationCode LIMIT 9","hsqls":["SELECT DestState, WeatherDelay, CancellationCode, MAX(OriginWac) FROM mytable WHERE (DivAirports[1] > 'JFK' OR DivAirports[2] > 'JFK' OR DivAirports[3] > 'JFK' OR DivAirports[4] > 'JFK' OR DivAirports[5] > 'JFK') OR DivAirportLandings <> 2 GROUP BY DestState, WeatherDelay, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, Origin, \"Month\" FROM mytable WHERE DivReachedDest BETWEEN 1 AND 0 ORDER BY DestStateName, Origin, OriginStateName LIMIT 16","hsqls":["SELECT OriginAirportSeqID, Origin, `Month` FROM mytable WHERE DivReachedDest BETWEEN 1 AND 0 ORDER BY DestStateName, Origin, OriginStateName LIMIT 16"]}
 {"sql":"SELECT MIN(WeatherDelay), MAX(DepTime), AVG(FirstDepTime) FROM mytable WHERE DepDel15 BETWEEN 0 AND 1 OR DepTimeBlk NOT IN ('2000-2059', '1600-1659', '1200-1259', '1500-1559') LIMIT 11"}
-{"sql":"SELECT Distance, OriginCityName FROM mytable WHERE TaxiOut NOT IN (43, 113, 32, 40, 72) AND DivLongestGTimes IN (59.0) AND ArrivalDelayGroups BETWEEN 10 AND 8 LIMIT 19","hsqls":["SELECT Distance, OriginCityName FROM mytable WHERE TaxiOut NOT IN (43, 113, 32, 40, 72) AND (DivLongestGTimes__MV0 IN (59.0) OR DivLongestGTimes__MV1 IN (59.0) OR DivLongestGTimes__MV2 IN (59.0) OR DivLongestGTimes__MV3 IN (59.0) OR DivLongestGTimes__MV4 IN (59.0)) AND ArrivalDelayGroups BETWEEN 10 AND 8 LIMIT 10000"]}
+{"sql":"SELECT Distance, OriginCityName FROM mytable WHERE TaxiOut NOT IN (43, 113, 32, 40, 72) AND DivLongestGTimes IN (59.0) AND ArrivalDelayGroups BETWEEN 10 AND 8 LIMIT 19","hsqls":["SELECT Distance, OriginCityName FROM mytable WHERE TaxiOut NOT IN (43, 113, 32, 40, 72) AND (DivLongestGTimes[1] IN (59.0) OR DivLongestGTimes[2] IN (59.0) OR DivLongestGTimes[3] IN (59.0) OR DivLongestGTimes[4] IN (59.0) OR DivLongestGTimes[5] IN (59.0)) AND ArrivalDelayGroups BETWEEN 10 AND 8 LIMIT 10000"]}
 {"sql":"SELECT MAX(NASDelay), MIN(DayOfWeek) FROM mytable WHERE ArrTimeBlk <> '2300-2359' AND OriginAirportID NOT IN (10792, 12016, 14771, 14588) LIMIT 14"}
 {"sql":"SELECT ArrDel15, DestCityMarketID, OriginStateName, COUNT(*) FROM mytable WHERE DestState <> 'NE' OR ArrivalDelayGroups IN (2, -1) AND ArrDelay <> -25.0 GROUP BY ArrDel15, DestCityMarketID, OriginStateName  ORDER BY ArrDel15, DestCityMarketID, OriginStateName LIMIT 19","hsqls":["SELECT ArrDel15, DestCityMarketID, OriginStateName, COUNT(*) FROM mytable WHERE DestState <> 'NE' OR ArrivalDelayGroups IN (2, -1) AND ArrDelay <> -25.0 GROUP BY ArrDel15, DestCityMarketID, OriginStateName  ORDER BY ArrDel15, DestCityMarketID, OriginStateName LIMIT 19"]}
 {"sql":"SELECT MIN(OriginAirportSeqID) FROM mytable LIMIT 13"}
@@ -6895,7 +6895,7 @@
 {"sql":"SELECT DivReachedDest, OriginCityName FROM mytable WHERE OriginCityMarketID NOT IN (31057) OR CarrierDelay BETWEEN 105 AND 123 LIMIT 27"}
 {"sql":"SELECT AirTime, CRSElapsedTime FROM mytable WHERE Carrier BETWEEN 'HA' AND 'EV' AND DistanceGroup = 2 AND OriginAirportID >= 14524 LIMIT 8"}
 {"sql":"SELECT \"Year\", DivReachedDest, FlightNum, COUNT(*) FROM mytable WHERE DepTime NOT IN (517) AND OriginStateName BETWEEN 'Utah' AND 'Michigan' GROUP BY \"Year\", DivReachedDest, FlightNum LIMIT 13","hsqls":["SELECT Year, DivReachedDest, FlightNum, COUNT(*) FROM mytable WHERE DepTime NOT IN (517) AND OriginStateName BETWEEN 'Utah' AND 'Michigan' GROUP BY Year, DivReachedDest, FlightNum LIMIT 13"]}
-{"sql":"SELECT DestStateFips, OriginCityName, ArrivalDelayGroups, AVG(\"Month\"), AVG(FirstDepTime) FROM mytable GROUP BY DestStateFips, OriginCityName, ArrivalDelayGroups LIMIT 9","hsqls":["SELECT DestStateFips, OriginCityName, ArrivalDelayGroups, AVG(Month), AVG(FirstDepTime) FROM mytable GROUP BY DestStateFips, OriginCityName, ArrivalDelayGroups LIMIT 9"]}
+{"sql":"SELECT DestStateFips, OriginCityName, ArrivalDelayGroups, AVG(\"Month\"), AVG(FirstDepTime) FROM mytable GROUP BY DestStateFips, OriginCityName, ArrivalDelayGroups LIMIT 9","hsqls":["SELECT DestStateFips, OriginCityName, ArrivalDelayGroups, AVG(`Month`), AVG(FirstDepTime) FROM mytable GROUP BY DestStateFips, OriginCityName, ArrivalDelayGroups LIMIT 9"]}
 {"sql":"SELECT Diverted, SUM(WeatherDelay) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 1 AND DivAirportLandings >= 9 GROUP BY Diverted  ORDER BY Diverted LIMIT 13","hsqls":["SELECT Diverted, SUM(WeatherDelay) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 1 AND DivAirportLandings >= 9 GROUP BY Diverted  ORDER BY Diverted LIMIT 13"]}
 {"sql":"SELECT COUNT(*) FROM mytable"}
 {"sql":"SELECT OriginCityMarketID, Origin, ArrivalDelayGroups FROM mytable LIMIT 3"}
@@ -6903,8 +6903,8 @@
 {"sql":"SELECT \"Year\", DestCityMarketID, MAX(OriginStateFips), MIN(Distance) FROM mytable WHERE CarrierDelay IN (93, 179, 268, 29) OR DestStateFips BETWEEN 78 AND 45 GROUP BY \"Year\", DestCityMarketID LIMIT 26","hsqls":["SELECT Year, DestCityMarketID, MAX(OriginStateFips), MIN(Distance) FROM mytable WHERE CarrierDelay IN (93, 179, 268, 29) OR DestStateFips BETWEEN 78 AND 45 GROUP BY Year, DestCityMarketID LIMIT 26"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE OriginStateName BETWEEN 'Tennessee' AND 'Oklahoma' AND FirstDepTime <> 814 ORDER BY OriginWac, DivAirportLandings, DayOfWeek LIMIT 16"}
 {"sql":"SELECT DistanceGroup, AVG(OriginWac), COUNT(NASDelay), MIN(DepDelay) FROM mytable WHERE AirlineID >= 19805 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 19","hsqls":["SELECT DistanceGroup, AVG(OriginWac), COUNT(NASDelay), MIN(DepDelay) FROM mytable WHERE AirlineID >= 19805 GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 19"]}
-{"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND WeatherDelay BETWEEN 207 AND 319 OR DivLongestGTimes < 107.0 GROUP BY DepDelay LIMIT 1","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE Month BETWEEN 1 AND 1 AND WeatherDelay BETWEEN 207 AND 319 OR (DivLongestGTimes__MV0 < 107.0 OR DivLongestGTimes__MV1 < 107.0 OR DivLongestGTimes__MV2 < 107.0 OR DivLongestGTimes__MV3 < 107.0 OR DivLongestGTimes__MV4 < 107.0) GROUP BY DepDelay LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, NASDelay, CRSElapsedTime FROM mytable WHERE OriginStateFips = 22 OR \"Month\" IN (1) OR ArrDelay <= 43.0 ORDER BY OriginAirportSeqID, DestWac LIMIT 20","hsqls":["SELECT LateAircraftDelay, NASDelay, CRSElapsedTime FROM mytable WHERE OriginStateFips = 22 OR Month IN (1) OR ArrDelay <= 43.0 ORDER BY OriginAirportSeqID, DestWac LIMIT 20"]}
+{"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND WeatherDelay BETWEEN 207 AND 319 OR DivLongestGTimes < 107.0 GROUP BY DepDelay LIMIT 1","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND WeatherDelay BETWEEN 207 AND 319 OR (DivLongestGTimes[1] < 107.0 OR DivLongestGTimes[2] < 107.0 OR DivLongestGTimes[3] < 107.0 OR DivLongestGTimes[4] < 107.0 OR DivLongestGTimes[5] < 107.0) GROUP BY DepDelay LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, NASDelay, CRSElapsedTime FROM mytable WHERE OriginStateFips = 22 OR \"Month\" IN (1) OR ArrDelay <= 43.0 ORDER BY OriginAirportSeqID, DestWac LIMIT 20","hsqls":["SELECT LateAircraftDelay, NASDelay, CRSElapsedTime FROM mytable WHERE OriginStateFips = 22 OR `Month` IN (1) OR ArrDelay <= 43.0 ORDER BY OriginAirportSeqID, DestWac LIMIT 20"]}
 {"sql":"SELECT DepDelayMinutes, CRSArrTime FROM mytable ORDER BY WheelsOff, Cancelled LIMIT 25"}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE WheelsOff > 1902 ORDER BY ArrDel15, AirlineID LIMIT 26"}
 {"sql":"SELECT \"Year\", ActualElapsedTime, DepDel15, SUM(DivAirportLandings), MAX(CRSElapsedTime), AVG(AirlineID) FROM mytable WHERE DivDistance BETWEEN 997 AND 584 GROUP BY \"Year\", ActualElapsedTime, DepDel15 LIMIT 16","hsqls":["SELECT Year, ActualElapsedTime, DepDel15, SUM(DivAirportLandings), MAX(CRSElapsedTime), AVG(AirlineID) FROM mytable WHERE DivDistance BETWEEN 997 AND 584 GROUP BY Year, ActualElapsedTime, DepDel15 LIMIT 16"]}
@@ -6912,18 +6912,18 @@
 {"sql":"SELECT \"Year\", Origin, COUNT(*) FROM mytable WHERE TaxiOut BETWEEN 121 AND 70 AND Diverted IN (0) GROUP BY \"Year\", Origin LIMIT 20","hsqls":["SELECT Year, Origin, COUNT(*) FROM mytable WHERE TaxiOut BETWEEN 121 AND 70 AND Diverted IN (0) GROUP BY Year, Origin LIMIT 20"]}
 {"sql":"SELECT DivAirportLandings FROM mytable ORDER BY Flights, OriginCityName LIMIT 15"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityMarketID IN (31337) OR OriginAirportSeqID IN (1125203, 1338801) OR FirstDepTime IN (2146, 750, 1153, 640) LIMIT 9"}
-{"sql":"SELECT NASDelay, DivTailNums FROM mytable WHERE DivTailNums BETWEEN 'N618WN' AND 'N5CSAA' OR OriginAirportID BETWEEN 14107 AND 11726 ORDER BY TaxiIn, \"Month\", OriginStateName LIMIT 1","hsqls":["SELECT NASDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums__MV1 BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums__MV2 BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums__MV3 BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums__MV4 BETWEEN 'N618WN' AND 'N5CSAA') OR OriginAirportID BETWEEN 14107 AND 11726 ORDER BY TaxiIn, Month, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT NASDelay, DivTailNums FROM mytable WHERE DivTailNums BETWEEN 'N618WN' AND 'N5CSAA' OR OriginAirportID BETWEEN 14107 AND 11726 ORDER BY TaxiIn, \"Month\", OriginStateName LIMIT 1","hsqls":["SELECT NASDelay, DivTailNums FROM mytable WHERE (DivTailNums[1] BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums[2] BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums[3] BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums[4] BETWEEN 'N618WN' AND 'N5CSAA' OR DivTailNums[5] BETWEEN 'N618WN' AND 'N5CSAA') OR OriginAirportID BETWEEN 14107 AND 11726 ORDER BY TaxiIn, Month, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, DepDel15 FROM mytable WHERE FirstDepTime >= 1301 ORDER BY DestWac LIMIT 16"}
-{"sql":"SELECT DestStateName, DestCityMarketID, COUNT(Carrier), COUNT(TaxiOut), SUM(\"Year\") FROM mytable GROUP BY DestStateName, DestCityMarketID LIMIT 2","hsqls":["SELECT DestStateName, DestCityMarketID, COUNT(Carrier), COUNT(TaxiOut), SUM(Year) FROM mytable GROUP BY DestStateName, DestCityMarketID LIMIT 2"]}
+{"sql":"SELECT DestStateName, DestCityMarketID, COUNT(Carrier), COUNT(TaxiOut), SUM(\"Year\") FROM mytable GROUP BY DestStateName, DestCityMarketID LIMIT 2","hsqls":["SELECT DestStateName, DestCityMarketID, COUNT(Carrier), COUNT(TaxiOut), SUM(`Year`) FROM mytable GROUP BY DestStateName, DestCityMarketID LIMIT 2"]}
 {"sql":"SELECT MAX(AirTime) FROM mytable WHERE FlightNum IN (4452) OR LongestAddGTime NOT IN (15) AND ArrDelay <> 181.0 LIMIT 13"}
 {"sql":"SELECT UniqueCarrier, MAX(DepTime), MIN(DepTime) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 26","hsqls":["SELECT UniqueCarrier, MAX(DepTime), MIN(DepTime) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 26"]}
 {"sql":"SELECT OriginState, DestStateName, AirlineID FROM mytable ORDER BY NASDelay, OriginWac LIMIT 2"}
-{"sql":"SELECT Carrier, NASDelay, ArrDelay FROM mytable WHERE \"Month\" <> 1 AND DivDistance NOT IN (725, 368, 160, 158, 237) ORDER BY ArrDelay LIMIT 10","hsqls":["SELECT Carrier, NASDelay, ArrDelay FROM mytable WHERE Month <> 1 AND DivDistance NOT IN (725, 368, 160, 158, 237) ORDER BY ArrDelay LIMIT 10"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrTimeBlk BETWEEN '2000-2059' AND '1800-1859' OR Quarter IN (1) OR SecurityDelay NOT IN (10, 4) ORDER BY DayOfWeek LIMIT 3","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrTimeBlk BETWEEN '2000-2059' AND '1800-1859' OR Quarter IN (1) OR SecurityDelay NOT IN (10, 4) ORDER BY DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT Carrier, NASDelay, ArrDelay FROM mytable WHERE \"Month\" <> 1 AND DivDistance NOT IN (725, 368, 160, 158, 237) ORDER BY ArrDelay LIMIT 10","hsqls":["SELECT Carrier, NASDelay, ArrDelay FROM mytable WHERE `Month` <> 1 AND DivDistance NOT IN (725, 368, 160, 158, 237) ORDER BY ArrDelay LIMIT 10"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrTimeBlk BETWEEN '2000-2059' AND '1800-1859' OR Quarter IN (1) OR SecurityDelay NOT IN (10, 4) ORDER BY DayOfWeek LIMIT 3","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE ArrTimeBlk BETWEEN '2000-2059' AND '1800-1859' OR Quarter IN (1) OR SecurityDelay NOT IN (10, 4) ORDER BY DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT Diverted, TailNum, DayOfWeek, COUNT(*) FROM mytable GROUP BY Diverted, TailNum, DayOfWeek","hsqls":["SELECT Diverted, TailNum, DayOfWeek, COUNT(*) FROM mytable GROUP BY Diverted, TailNum, DayOfWeek"]}
 {"sql":"SELECT MAX(ArrDelay), AVG(Distance), MIN(DayofMonth) FROM mytable LIMIT 23"}
 {"sql":"SELECT OriginState, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY OriginState, ArrTimeBlk  ORDER BY OriginState, ArrTimeBlk LIMIT 8","hsqls":["SELECT OriginState, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY OriginState, ArrTimeBlk  ORDER BY OriginState, ArrTimeBlk LIMIT 8"]}
-{"sql":"SELECT DivLongestGTimes, WeatherDelay, OriginAirportID FROM mytable WHERE DestStateName > 'North Carolina' AND ArrTimeBlk >= '1600-1659' AND Distance BETWEEN 630 AND 320 ORDER BY CRSArrTime, DayOfWeek LIMIT 9","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, WeatherDelay, OriginAirportID FROM mytable WHERE DestStateName > 'North Carolina' AND ArrTimeBlk >= '1600-1659' AND Distance BETWEEN 630 AND 320 ORDER BY CRSArrTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, WeatherDelay, OriginAirportID FROM mytable WHERE DestStateName > 'North Carolina' AND ArrTimeBlk >= '1600-1659' AND Distance BETWEEN 630 AND 320 ORDER BY CRSArrTime, DayOfWeek LIMIT 9","hsqls":["SELECT DivLongestGTimes, WeatherDelay, OriginAirportID FROM mytable WHERE DestStateName > 'North Carolina' AND ArrTimeBlk >= '1600-1659' AND Distance BETWEEN 630 AND 320 ORDER BY CRSArrTime, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, ArrDel15 FROM mytable WHERE WheelsOff BETWEEN 2116 AND 1550 ORDER BY DepTimeBlk, CRSDepTime LIMIT 11"}
 {"sql":"SELECT ArrTimeBlk, DepDel15 FROM mytable WHERE WeatherDelay <= 198 ORDER BY DestWac, Distance LIMIT 8"}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE OriginWac NOT IN (2, 43, 35, 38) ORDER BY Quarter LIMIT 16"}
@@ -6936,16 +6936,16 @@
 {"sql":"SELECT DestStateName, TailNum FROM mytable WHERE Distance < 1123 LIMIT 10"}
 {"sql":"SELECT ActualElapsedTime, TailNum, CRSElapsedTime FROM mytable WHERE TailNum NOT IN ('N24202', 'N396DA', 'N922AT') AND WeatherDelay NOT IN (20, 66, 205) ORDER BY DestCityMarketID, \"Month\", OriginStateName LIMIT 14","hsqls":["SELECT ActualElapsedTime, TailNum, CRSElapsedTime FROM mytable WHERE TailNum NOT IN ('N24202', 'N396DA', 'N922AT') AND WeatherDelay NOT IN (20, 66, 205) ORDER BY DestCityMarketID, Month, OriginStateName LIMIT 14"]}
 {"sql":"SELECT AVG(Diverted), MIN(OriginWac), MIN(NASDelay) FROM mytable WHERE DaysSinceEpoch BETWEEN 16088 AND 16083 LIMIT 16"}
-{"sql":"SELECT SecurityDelay, TotalAddGTime, DepTime FROM mytable WHERE OriginStateFips NOT IN (55, 46, 12) OR DivAirports IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') AND LateAircraftDelay IN (80) ORDER BY DepDelayMinutes, TotalAddGTime LIMIT 1","hsqls":["SELECT SecurityDelay, TotalAddGTime, DepTime FROM mytable WHERE OriginStateFips NOT IN (55, 46, 12) OR (DivAirports__MV0 IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports__MV1 IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports__MV2 IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports__MV3 IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports__MV4 IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT')) AND LateAircraftDelay IN (80) ORDER BY DepDelayMinutes, TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, TotalAddGTime, DepTime FROM mytable WHERE OriginStateFips NOT IN (55, 46, 12) OR DivAirports IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') AND LateAircraftDelay IN (80) ORDER BY DepDelayMinutes, TotalAddGTime LIMIT 1","hsqls":["SELECT SecurityDelay, TotalAddGTime, DepTime FROM mytable WHERE OriginStateFips NOT IN (55, 46, 12) OR (DivAirports[1] IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports[2] IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports[3] IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports[4] IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT') OR DivAirports[5] IN ('DFW', 'YKM', 'IDA', 'ICT', 'FAT')) AND LateAircraftDelay IN (80) ORDER BY DepDelayMinutes, TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, AVG(DestWac) FROM mytable WHERE LongestAddGTime > 34 GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 4","hsqls":["SELECT TaxiOut, AVG(DestWac) FROM mytable WHERE LongestAddGTime > 34 GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 4"]}
 {"sql":"SELECT DepDelay, CRSDepTime, UniqueCarrier, MIN(OriginAirportSeqID) FROM mytable GROUP BY DepDelay, CRSDepTime, UniqueCarrier  ORDER BY DepDelay, CRSDepTime, UniqueCarrier LIMIT 27","hsqls":["SELECT DepDelay, CRSDepTime, UniqueCarrier, MIN(OriginAirportSeqID) FROM mytable GROUP BY DepDelay, CRSDepTime, UniqueCarrier  ORDER BY DepDelay, CRSDepTime, UniqueCarrier LIMIT 27"]}
-{"sql":"SELECT DivAirportLandings, COUNT(*) FROM mytable WHERE DivWheelsOffs < 1839 GROUP BY DivAirportLandings LIMIT 10","hsqls":["SELECT DivAirportLandings, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 < 1839 OR DivWheelsOffs__MV1 < 1839 OR DivWheelsOffs__MV2 < 1839 OR DivWheelsOffs__MV3 < 1839 OR DivWheelsOffs__MV4 < 1839) GROUP BY DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs, AirTime FROM mytable WHERE DivAirports IN ('LCH') OR CRSElapsedTime = 352 AND DivReachedDest BETWEEN 0 AND 0 ORDER BY ArrDelayMinutes, UniqueCarrier LIMIT 8","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirTime FROM mytable WHERE (DivAirports__MV0 IN ('LCH') OR DivAirports__MV1 IN ('LCH') OR DivAirports__MV2 IN ('LCH') OR DivAirports__MV3 IN ('LCH') OR DivAirports__MV4 IN ('LCH')) OR CRSElapsedTime = 352 AND DivReachedDest BETWEEN 0 AND 0 ORDER BY ArrDelayMinutes, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, COUNT(*) FROM mytable WHERE DivWheelsOffs < 1839 GROUP BY DivAirportLandings LIMIT 10","hsqls":["SELECT DivAirportLandings, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] < 1839 OR DivWheelsOffs[2] < 1839 OR DivWheelsOffs[3] < 1839 OR DivWheelsOffs[4] < 1839 OR DivWheelsOffs[5] < 1839) GROUP BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, AirTime FROM mytable WHERE DivAirports IN ('LCH') OR CRSElapsedTime = 352 AND DivReachedDest BETWEEN 0 AND 0 ORDER BY ArrDelayMinutes, UniqueCarrier LIMIT 8","hsqls":["SELECT DivAirportIDs, AirTime FROM mytable WHERE (DivAirports[1] IN ('LCH') OR DivAirports[2] IN ('LCH') OR DivAirports[3] IN ('LCH') OR DivAirports[4] IN ('LCH') OR DivAirports[5] IN ('LCH')) OR CRSElapsedTime = 352 AND DivReachedDest BETWEEN 0 AND 0 ORDER BY ArrDelayMinutes, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, COUNT(Origin) FROM mytable WHERE WheelsOn NOT IN (1202, 2022, 1100) AND FirstDepTime > 2153 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 17","hsqls":["SELECT DepTimeBlk, COUNT(Origin) FROM mytable WHERE WheelsOn NOT IN (1202, 2022, 1100) AND FirstDepTime > 2153 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 17"]}
-{"sql":"SELECT DepartureDelayGroups, AVG(CRSDepTime), COUNT(DepDelayMinutes) FROM mytable WHERE DivLongestGTimes IN (10.0, 110.0) AND DivTailNums IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') GROUP BY DepartureDelayGroups LIMIT 29","hsqls":["SELECT DepartureDelayGroups, AVG(CRSDepTime), COUNT(DepDelayMinutes) FROM mytable WHERE (DivLongestGTimes__MV0 IN (10.0, 110.0) OR DivLongestGTimes__MV1 IN (10.0, 110.0) OR DivLongestGTimes__MV2 IN (10.0, 110.0) OR DivLongestGTimes__MV3 IN (10.0, 110.0) OR DivLongestGTimes__MV4 IN (10.0, 110.0)) AND (DivTailNums__MV0 IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums__MV1 IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums__MV2 IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums__MV3 IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums__MV4 IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW')) GROUP BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, AVG(CRSDepTime), COUNT(DepDelayMinutes) FROM mytable WHERE DivLongestGTimes IN (10.0, 110.0) AND DivTailNums IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') GROUP BY DepartureDelayGroups LIMIT 29","hsqls":["SELECT DepartureDelayGroups, AVG(CRSDepTime), COUNT(DepDelayMinutes) FROM mytable WHERE (DivLongestGTimes[1] IN (10.0, 110.0) OR DivLongestGTimes[2] IN (10.0, 110.0) OR DivLongestGTimes[3] IN (10.0, 110.0) OR DivLongestGTimes[4] IN (10.0, 110.0) OR DivLongestGTimes[5] IN (10.0, 110.0)) AND (DivTailNums[1] IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums[2] IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums[3] IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums[4] IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW') OR DivTailNums[5] IN ('N438SW', 'N477CA', 'N522VA', 'N301YV', 'N224SW')) GROUP BY DepartureDelayGroups LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE DepDel15 < 0 OR CRSDepTime NOT IN (2235) AND DestAirportSeqID BETWEEN 1397002 AND 1162402 ORDER BY OriginCityMarketID LIMIT 20"}
-{"sql":"SELECT DestState, OriginCityName, CRSDepTime, AVG(DayOfWeek), AVG(DepDelay), MAX(OriginStateFips) FROM mytable WHERE OriginWac > 42 AND WeatherDelay BETWEEN 26 AND 12 AND DivTotalGTimes <= 65 GROUP BY DestState, OriginCityName, CRSDepTime LIMIT 9","hsqls":["SELECT DestState, OriginCityName, CRSDepTime, AVG(DayOfWeek), AVG(DepDelay), MAX(OriginStateFips) FROM mytable WHERE OriginWac > 42 AND WeatherDelay BETWEEN 26 AND 12 AND (DivTotalGTimes__MV0 <= 65 OR DivTotalGTimes__MV1 <= 65 OR DivTotalGTimes__MV2 <= 65 OR DivTotalGTimes__MV3 <= 65 OR DivTotalGTimes__MV4 <= 65) GROUP BY DestState, OriginCityName, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivAirports FROM mytable WHERE Quarter NOT IN (1) AND CarrierDelay BETWEEN 414 AND 280 OR WheelsOn BETWEEN 157 AND 1336 ORDER BY \"Year\" LIMIT 4","hsqls":["SELECT DistanceGroup, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE Quarter NOT IN (1) AND CarrierDelay BETWEEN 414 AND 280 OR WheelsOn BETWEEN 157 AND 1336 ORDER BY Year LIMIT 10000"]}
+{"sql":"SELECT DestState, OriginCityName, CRSDepTime, AVG(DayOfWeek), AVG(DepDelay), MAX(OriginStateFips) FROM mytable WHERE OriginWac > 42 AND WeatherDelay BETWEEN 26 AND 12 AND DivTotalGTimes <= 65 GROUP BY DestState, OriginCityName, CRSDepTime LIMIT 9","hsqls":["SELECT DestState, OriginCityName, CRSDepTime, AVG(DayOfWeek), AVG(DepDelay), MAX(OriginStateFips) FROM mytable WHERE OriginWac > 42 AND WeatherDelay BETWEEN 26 AND 12 AND (DivTotalGTimes[1] <= 65 OR DivTotalGTimes[2] <= 65 OR DivTotalGTimes[3] <= 65 OR DivTotalGTimes[4] <= 65 OR DivTotalGTimes[5] <= 65) GROUP BY DestState, OriginCityName, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivAirports FROM mytable WHERE Quarter NOT IN (1) AND CarrierDelay BETWEEN 414 AND 280 OR WheelsOn BETWEEN 157 AND 1336 ORDER BY \"Year\" LIMIT 4","hsqls":["SELECT DistanceGroup, DivAirports FROM mytable WHERE Quarter NOT IN (1) AND CarrierDelay BETWEEN 414 AND 280 OR WheelsOn BETWEEN 157 AND 1336 ORDER BY `Year` LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, MAX(OriginAirportSeqID), AVG(NASDelay), SUM(FlightNum) FROM mytable WHERE DepDelay IN (164.0, 12.0, 194.0, 292.0, 142.0) OR WheelsOff = 1633 GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 18","hsqls":["SELECT ArrDel15, MAX(OriginAirportSeqID), AVG(NASDelay), SUM(FlightNum) FROM mytable WHERE DepDelay IN (164.0, 12.0, 194.0, 292.0, 142.0) OR WheelsOff = 1633 GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 18"]}
 {"sql":"SELECT DepDelay, COUNT(*) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 26","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 26"]}
 {"sql":"SELECT DestState FROM mytable ORDER BY DestAirportSeqID, ArrDelay, CRSElapsedTime LIMIT 22"}
@@ -6953,35 +6953,35 @@
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID, AVG(DivReachedDest), MIN(OriginAirportID), SUM(DivDistance) FROM mytable WHERE DestAirportSeqID NOT IN (1026802) OR LateAircraftDelay <= 25 GROUP BY OriginAirportSeqID, DestAirportSeqID  ORDER BY OriginAirportSeqID, DestAirportSeqID LIMIT 18","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID, AVG(DivReachedDest), MIN(OriginAirportID), SUM(DivDistance) FROM mytable WHERE DestAirportSeqID NOT IN (1026802) OR LateAircraftDelay <= 25 GROUP BY OriginAirportSeqID, DestAirportSeqID  ORDER BY OriginAirportSeqID, DestAirportSeqID LIMIT 18"]}
 {"sql":"SELECT DepDelayMinutes, Cancelled, OriginStateName FROM mytable WHERE OriginState < 'AR' OR DistanceGroup BETWEEN 9 AND 6 OR DestStateFips IN (47, 41, 51, 15) ORDER BY ArrTime LIMIT 13"}
 {"sql":"SELECT DivAirportLandings, COUNT(*) FROM mytable WHERE FirstDepTime IN (1742, 617, 947, 835) GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 17","hsqls":["SELECT DivAirportLandings, COUNT(*) FROM mytable WHERE FirstDepTime IN (1742, 617, 947, 835) GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 17"]}
-{"sql":"SELECT \"Month\", MAX(TaxiIn), AVG(DepTime) FROM mytable GROUP BY \"Month\" LIMIT 5","hsqls":["SELECT Month, MAX(TaxiIn), AVG(DepTime) FROM mytable GROUP BY Month LIMIT 5"]}
+{"sql":"SELECT \"Month\", MAX(TaxiIn), AVG(DepTime) FROM mytable GROUP BY \"Month\" LIMIT 5","hsqls":["SELECT Month, MAX(TaxiIn), AVG(DepTime) FROM mytable GROUP BY `Month` LIMIT 5"]}
 {"sql":"SELECT ArrDelayMinutes, ArrivalDelayGroups FROM mytable ORDER BY ArrTime, ArrTimeBlk LIMIT 24"}
-{"sql":"SELECT DepDelay, FlightNum, DestAirportSeqID, MIN(DivDistance) FROM mytable WHERE DivAirportLandings <= 1 AND \"Month\" IN (1) GROUP BY DepDelay, FlightNum, DestAirportSeqID LIMIT 10","hsqls":["SELECT DepDelay, FlightNum, DestAirportSeqID, MIN(DivDistance) FROM mytable WHERE DivAirportLandings <= 1 AND Month IN (1) GROUP BY DepDelay, FlightNum, DestAirportSeqID LIMIT 10"]}
+{"sql":"SELECT DepDelay, FlightNum, DestAirportSeqID, MIN(DivDistance) FROM mytable WHERE DivAirportLandings <= 1 AND \"Month\" IN (1) GROUP BY DepDelay, FlightNum, DestAirportSeqID LIMIT 10","hsqls":["SELECT DepDelay, FlightNum, DestAirportSeqID, MIN(DivDistance) FROM mytable WHERE DivAirportLandings <= 1 AND `Month` IN (1) GROUP BY DepDelay, FlightNum, DestAirportSeqID LIMIT 10"]}
 {"sql":"SELECT Flights, ArrTimeBlk, COUNT(Cancelled) FROM mytable GROUP BY Flights, ArrTimeBlk  ORDER BY Flights, ArrTimeBlk LIMIT 19","hsqls":["SELECT Flights, ArrTimeBlk, COUNT(Cancelled) FROM mytable GROUP BY Flights, ArrTimeBlk  ORDER BY Flights, ArrTimeBlk LIMIT 19"]}
-{"sql":"SELECT DivAirports, DepTime, CRSDepTime FROM mytable WHERE DepDelayMinutes > 93.0 LIMIT 26","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepTime, CRSDepTime FROM mytable WHERE DepDelayMinutes > 93.0 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DepTime, CRSDepTime FROM mytable WHERE DepDelayMinutes > 93.0 LIMIT 26","hsqls":["SELECT DivAirports, DepTime, CRSDepTime FROM mytable WHERE DepDelayMinutes > 93.0 LIMIT 10000"]}
 {"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE DepDelay <> 235.0 GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 8","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE DepDelay <> 235.0 GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 8"]}
 {"sql":"SELECT OriginCityMarketID, UniqueCarrier FROM mytable WHERE DepDelay BETWEEN 15.0 AND 42.0 AND DepTime BETWEEN 803 AND 845 ORDER BY FlightNum, UniqueCarrier LIMIT 11"}
 {"sql":"SELECT LongestAddGTime FROM mytable LIMIT 23"}
 {"sql":"SELECT CRSArrTime, DayofMonth, OriginStateName FROM mytable WHERE Distance <= 767 ORDER BY ArrDelayMinutes LIMIT 28"}
 {"sql":"SELECT AVG(TotalAddGTime), SUM(WheelsOn) FROM mytable WHERE WheelsOff BETWEEN 2347 AND 1545 LIMIT 23"}
-{"sql":"SELECT DestState, Cancelled, WheelsOn, COUNT(DayOfWeek), AVG(ArrDel15), MIN(DepTime) FROM mytable WHERE DepDelayMinutes IN (43.0, 303.0, 127.0) AND \"Month\" BETWEEN 1 AND 1 AND AirlineID BETWEEN 19805 AND 20398 GROUP BY DestState, Cancelled, WheelsOn LIMIT 15","hsqls":["SELECT DestState, Cancelled, WheelsOn, COUNT(DayOfWeek), AVG(ArrDel15), MIN(DepTime) FROM mytable WHERE DepDelayMinutes IN (43.0, 303.0, 127.0) AND Month BETWEEN 1 AND 1 AND AirlineID BETWEEN 19805 AND 20398 GROUP BY DestState, Cancelled, WheelsOn LIMIT 15"]}
-{"sql":"SELECT DivDistance, OriginCityName, CRSDepTime FROM mytable WHERE DivAirports IN ('JAN', 'CHA') ORDER BY Distance LIMIT 20","hsqls":["SELECT DivDistance, OriginCityName, CRSDepTime FROM mytable WHERE (DivAirports__MV0 IN ('JAN', 'CHA') OR DivAirports__MV1 IN ('JAN', 'CHA') OR DivAirports__MV2 IN ('JAN', 'CHA') OR DivAirports__MV3 IN ('JAN', 'CHA') OR DivAirports__MV4 IN ('JAN', 'CHA')) ORDER BY Distance LIMIT 10000"]}
+{"sql":"SELECT DestState, Cancelled, WheelsOn, COUNT(DayOfWeek), AVG(ArrDel15), MIN(DepTime) FROM mytable WHERE DepDelayMinutes IN (43.0, 303.0, 127.0) AND \"Month\" BETWEEN 1 AND 1 AND AirlineID BETWEEN 19805 AND 20398 GROUP BY DestState, Cancelled, WheelsOn LIMIT 15","hsqls":["SELECT DestState, Cancelled, WheelsOn, COUNT(DayOfWeek), AVG(ArrDel15), MIN(DepTime) FROM mytable WHERE DepDelayMinutes IN (43.0, 303.0, 127.0) AND `Month` BETWEEN 1 AND 1 AND AirlineID BETWEEN 19805 AND 20398 GROUP BY DestState, Cancelled, WheelsOn LIMIT 15"]}
+{"sql":"SELECT DivDistance, OriginCityName, CRSDepTime FROM mytable WHERE DivAirports IN ('JAN', 'CHA') ORDER BY Distance LIMIT 20","hsqls":["SELECT DivDistance, OriginCityName, CRSDepTime FROM mytable WHERE (DivAirports[1] IN ('JAN', 'CHA') OR DivAirports[2] IN ('JAN', 'CHA') OR DivAirports[3] IN ('JAN', 'CHA') OR DivAirports[4] IN ('JAN', 'CHA') OR DivAirports[5] IN ('JAN', 'CHA')) ORDER BY Distance LIMIT 10000"]}
 {"sql":"SELECT Flights, WeatherDelay, SecurityDelay FROM mytable WHERE DestAirportID <> 11308 ORDER BY TaxiIn, DestCityName LIMIT 24"}
 {"sql":"SELECT LongestAddGTime, MAX(DestAirportID), AVG(DestCityMarketID), SUM(DayofMonth) FROM mytable WHERE TaxiIn BETWEEN 45 AND 28 OR ArrDel15 BETWEEN 0 AND -9999 OR DestStateName NOT IN ('New Jersey', 'North Carolina', 'Wisconsin') GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 11","hsqls":["SELECT LongestAddGTime, MAX(DestAirportID), AVG(DestCityMarketID), SUM(DayofMonth) FROM mytable WHERE TaxiIn BETWEEN 45 AND 28 OR ArrDel15 BETWEEN 0 AND -9999 OR DestStateName NOT IN ('New Jersey', 'North Carolina', 'Wisconsin') GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 11"]}
-{"sql":"SELECT DestState, CarrierDelay, TaxiIn FROM mytable WHERE OriginCityMarketID <> 32951 OR DivWheelsOns BETWEEN 1338 AND 2300 AND ArrDelayMinutes BETWEEN 83.0 AND 56.0 LIMIT 13","hsqls":["SELECT DestState, CarrierDelay, TaxiIn FROM mytable WHERE OriginCityMarketID <> 32951 OR (DivWheelsOns__MV0 BETWEEN 1338 AND 2300 OR DivWheelsOns__MV1 BETWEEN 1338 AND 2300 OR DivWheelsOns__MV2 BETWEEN 1338 AND 2300 OR DivWheelsOns__MV3 BETWEEN 1338 AND 2300 OR DivWheelsOns__MV4 BETWEEN 1338 AND 2300) AND ArrDelayMinutes BETWEEN 83.0 AND 56.0 LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, COUNT(AirTime), SUM(DivArrDelay), COUNT(WeatherDelay) FROM mytable WHERE OriginAirportSeqID NOT IN (1013503) AND DivAirportIDs IN (14524, 13029) OR OriginWac NOT IN (5, 35, 14) GROUP BY FirstDepTime LIMIT 12","hsqls":["SELECT FirstDepTime, COUNT(AirTime), SUM(DivArrDelay), COUNT(WeatherDelay) FROM mytable WHERE OriginAirportSeqID NOT IN (1013503) AND (DivAirportIDs__MV0 IN (14524, 13029) OR DivAirportIDs__MV1 IN (14524, 13029) OR DivAirportIDs__MV2 IN (14524, 13029) OR DivAirportIDs__MV3 IN (14524, 13029) OR DivAirportIDs__MV4 IN (14524, 13029)) OR OriginWac NOT IN (5, 35, 14) GROUP BY FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT DestState, CarrierDelay, TaxiIn FROM mytable WHERE OriginCityMarketID <> 32951 OR DivWheelsOns BETWEEN 1338 AND 2300 AND ArrDelayMinutes BETWEEN 83.0 AND 56.0 LIMIT 13","hsqls":["SELECT DestState, CarrierDelay, TaxiIn FROM mytable WHERE OriginCityMarketID <> 32951 OR (DivWheelsOns[1] BETWEEN 1338 AND 2300 OR DivWheelsOns[2] BETWEEN 1338 AND 2300 OR DivWheelsOns[3] BETWEEN 1338 AND 2300 OR DivWheelsOns[4] BETWEEN 1338 AND 2300 OR DivWheelsOns[5] BETWEEN 1338 AND 2300) AND ArrDelayMinutes BETWEEN 83.0 AND 56.0 LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, COUNT(AirTime), SUM(DivArrDelay), COUNT(WeatherDelay) FROM mytable WHERE OriginAirportSeqID NOT IN (1013503) AND DivAirportIDs IN (14524, 13029) OR OriginWac NOT IN (5, 35, 14) GROUP BY FirstDepTime LIMIT 12","hsqls":["SELECT FirstDepTime, COUNT(AirTime), SUM(DivArrDelay), COUNT(WeatherDelay) FROM mytable WHERE OriginAirportSeqID NOT IN (1013503) AND (DivAirportIDs[1] IN (14524, 13029) OR DivAirportIDs[2] IN (14524, 13029) OR DivAirportIDs[3] IN (14524, 13029) OR DivAirportIDs[4] IN (14524, 13029) OR DivAirportIDs[5] IN (14524, 13029)) OR OriginWac NOT IN (5, 35, 14) GROUP BY FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DestWac, DepTimeBlk FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) ORDER BY OriginState, Carrier, OriginWac LIMIT 11"}
 {"sql":"SELECT DepDelayMinutes, ActualElapsedTime FROM mytable WHERE CarrierDelay <> 14 OR CRSElapsedTime <> 160 LIMIT 28"}
 {"sql":"SELECT DestWac, DepTimeBlk FROM mytable ORDER BY CRSElapsedTime LIMIT 2"}
 {"sql":"SELECT DivReachedDest, TailNum, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 71 AND 57 AND DistanceGroup BETWEEN 5 AND 1 AND WheelsOn = 1128 GROUP BY DivReachedDest, TailNum  ORDER BY DivReachedDest, TailNum LIMIT 25","hsqls":["SELECT DivReachedDest, TailNum, COUNT(*) FROM mytable WHERE ActualElapsedTime BETWEEN 71 AND 57 AND DistanceGroup BETWEEN 5 AND 1 AND WheelsOn = 1128 GROUP BY DivReachedDest, TailNum  ORDER BY DivReachedDest, TailNum LIMIT 25"]}
 {"sql":"SELECT WeatherDelay, DepDel15, DepTimeBlk, COUNT(*) FROM mytable GROUP BY WeatherDelay, DepDel15, DepTimeBlk  ORDER BY WeatherDelay, DepDel15, DepTimeBlk LIMIT 16","hsqls":["SELECT WeatherDelay, DepDel15, DepTimeBlk, COUNT(*) FROM mytable GROUP BY WeatherDelay, DepDel15, DepTimeBlk  ORDER BY WeatherDelay, DepDel15, DepTimeBlk LIMIT 16"]}
-{"sql":"SELECT TaxiOut FROM mytable WHERE DivAirportIDs IN (-9999, 11973) OR DepTime BETWEEN 1721 AND 1105 AND CRSDepTime < 953 ORDER BY OriginCityMarketID, ArrDelayMinutes, DayofMonth LIMIT 19","hsqls":["SELECT TaxiOut FROM mytable WHERE (DivAirportIDs__MV0 IN (-9999, 11973) OR DivAirportIDs__MV1 IN (-9999, 11973) OR DivAirportIDs__MV2 IN (-9999, 11973) OR DivAirportIDs__MV3 IN (-9999, 11973) OR DivAirportIDs__MV4 IN (-9999, 11973)) OR DepTime BETWEEN 1721 AND 1105 AND CRSDepTime < 953 ORDER BY OriginCityMarketID, ArrDelayMinutes, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT TaxiOut FROM mytable WHERE DivAirportIDs IN (-9999, 11973) OR DepTime BETWEEN 1721 AND 1105 AND CRSDepTime < 953 ORDER BY OriginCityMarketID, ArrDelayMinutes, DayofMonth LIMIT 19","hsqls":["SELECT TaxiOut FROM mytable WHERE (DivAirportIDs[1] IN (-9999, 11973) OR DivAirportIDs[2] IN (-9999, 11973) OR DivAirportIDs[3] IN (-9999, 11973) OR DivAirportIDs[4] IN (-9999, 11973) OR DivAirportIDs[5] IN (-9999, 11973)) OR DepTime BETWEEN 1721 AND 1105 AND CRSDepTime < 953 ORDER BY OriginCityMarketID, ArrDelayMinutes, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT Diverted, Carrier, DivArrDelay, COUNT(*) FROM mytable WHERE TailNum IN ('N594JB', 'N3JBAA') GROUP BY Diverted, Carrier, DivArrDelay  ORDER BY Diverted, Carrier, DivArrDelay LIMIT 11","hsqls":["SELECT Diverted, Carrier, DivArrDelay, COUNT(*) FROM mytable WHERE TailNum IN ('N594JB', 'N3JBAA') GROUP BY Diverted, Carrier, DivArrDelay  ORDER BY Diverted, Carrier, DivArrDelay LIMIT 11"]}
 {"sql":"SELECT SecurityDelay, OriginCityName FROM mytable WHERE DaysSinceEpoch IN (16101, 16096, 16072, 16087, 16090) OR DepDel15 <> 1 AND DepTime IN (611, 932, 1141, 917) LIMIT 22"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginStateFips NOT IN (10, 42, 33, 75, 29) LIMIT 7"}
 {"sql":"SELECT WheelsOff, TaxiOut, Diverted, COUNT(*) FROM mytable WHERE Origin > 'AEX' GROUP BY WheelsOff, TaxiOut, Diverted  ORDER BY WheelsOff, TaxiOut, Diverted LIMIT 10","hsqls":["SELECT WheelsOff, TaxiOut, Diverted, COUNT(*) FROM mytable WHERE Origin > 'AEX' GROUP BY WheelsOff, TaxiOut, Diverted  ORDER BY WheelsOff, TaxiOut, Diverted LIMIT 10"]}
 {"sql":"SELECT Cancelled, AirTime FROM mytable WHERE Dest BETWEEN 'FSD' AND 'LWS' AND Diverted BETWEEN 0 AND 1 OR OriginCityName = 'Juneau, AK' ORDER BY DepartureDelayGroups, DestStateFips LIMIT 2"}
 {"sql":"SELECT DestStateFips, AirlineID FROM mytable WHERE WheelsOn = 1928 OR CRSElapsedTime NOT IN (328, 82, 242, 413, 209) AND DayOfWeek < 7 LIMIT 3"}
-{"sql":"SELECT DestStateName, ArrDel15, AVG(\"Year\"), AVG(CarrierDelay), AVG(OriginWac) FROM mytable WHERE OriginCityMarketID IN (31637, 35356, 30894) GROUP BY DestStateName, ArrDel15 LIMIT 21","hsqls":["SELECT DestStateName, ArrDel15, AVG(Year), AVG(CarrierDelay), AVG(OriginWac) FROM mytable WHERE OriginCityMarketID IN (31637, 35356, 30894) GROUP BY DestStateName, ArrDel15 LIMIT 21"]}
+{"sql":"SELECT DestStateName, ArrDel15, AVG(\"Year\"), AVG(CarrierDelay), AVG(OriginWac) FROM mytable WHERE OriginCityMarketID IN (31637, 35356, 30894) GROUP BY DestStateName, ArrDel15 LIMIT 21","hsqls":["SELECT DestStateName, ArrDel15, AVG(`Year`), AVG(CarrierDelay), AVG(OriginWac) FROM mytable WHERE OriginCityMarketID IN (31637, 35356, 30894) GROUP BY DestStateName, ArrDel15 LIMIT 21"]}
 {"sql":"SELECT MIN(DepDel15) FROM mytable WHERE AirTime NOT IN (79, 114, 248) AND LongestAddGTime BETWEEN 11 AND 32 AND TaxiOut NOT IN (78, 18) LIMIT 14"}
 {"sql":"SELECT OriginWac FROM mytable WHERE DivDistance > 181 LIMIT 19"}
 {"sql":"SELECT DepDelayMinutes, FlightDate, ArrDelayMinutes FROM mytable ORDER BY OriginCityName, Origin LIMIT 9"}
@@ -6993,46 +6993,46 @@
 {"sql":"SELECT TaxiOut, DestStateName, OriginStateName FROM mytable WHERE DestWac BETWEEN 45 AND 38 OR DepTime NOT IN (2248, 1715, 1430, 618) ORDER BY LateAircraftDelay, DivAirportLandings LIMIT 20"}
 {"sql":"SELECT DestCityName, ArrDelay, DayOfWeek, COUNT(OriginState) FROM mytable WHERE ArrivalDelayGroups <> -9999 GROUP BY DestCityName, ArrDelay, DayOfWeek  ORDER BY DestCityName, ArrDelay, DayOfWeek LIMIT 12","hsqls":["SELECT DestCityName, ArrDelay, DayOfWeek, COUNT(OriginState) FROM mytable WHERE ArrivalDelayGroups <> -9999 GROUP BY DestCityName, ArrDelay, DayOfWeek  ORDER BY DestCityName, ArrDelay, DayOfWeek LIMIT 12"]}
 {"sql":"SELECT NASDelay, COUNT(*) FROM mytable WHERE CRSArrTime <> 1529 AND OriginCityMarketID BETWEEN 31503 AND 31471 AND ActualElapsedTime = 400 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 19","hsqls":["SELECT NASDelay, COUNT(*) FROM mytable WHERE CRSArrTime <> 1529 AND OriginCityMarketID BETWEEN 31503 AND 31471 AND ActualElapsedTime = 400 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 19"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY SecurityDelay, DestCityName, \"Month\" LIMIT 20","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Year NOT IN (2014) ORDER BY SecurityDelay, DestCityName, Month LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY SecurityDelay, DestCityName, \"Month\" LIMIT 20","hsqls":["SELECT DivTailNums FROM mytable WHERE `Year` NOT IN (2014) ORDER BY SecurityDelay, DestCityName, `Month` LIMIT 10000"]}
 {"sql":"SELECT Diverted, Cancelled, AirTime FROM mytable WHERE NASDelay NOT IN (20, 82) ORDER BY DestState LIMIT 19"}
 {"sql":"SELECT DistanceGroup, WeatherDelay, DepDel15, COUNT(DestStateFips) FROM mytable WHERE DayOfWeek <> 6 GROUP BY DistanceGroup, WeatherDelay, DepDel15  ORDER BY DistanceGroup, WeatherDelay, DepDel15 LIMIT 29","hsqls":["SELECT DistanceGroup, WeatherDelay, DepDel15, COUNT(DestStateFips) FROM mytable WHERE DayOfWeek <> 6 GROUP BY DistanceGroup, WeatherDelay, DepDel15  ORDER BY DistanceGroup, WeatherDelay, DepDel15 LIMIT 29"]}
-{"sql":"SELECT CRSArrTime, ArrDelayMinutes, DivAirportSeqIDs FROM mytable WHERE \"Month\" IN (1) AND ArrDel15 BETWEEN 0 AND 0 AND DivTailNums BETWEEN 'N636MQ' AND 'N16976' LIMIT 26","hsqls":["SELECT CRSArrTime, ArrDelayMinutes, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE Month IN (1) AND ArrDel15 BETWEEN 0 AND 0 AND (DivTailNums__MV0 BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums__MV1 BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums__MV2 BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums__MV3 BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums__MV4 BETWEEN 'N636MQ' AND 'N16976') LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, ArrDelayMinutes, DivAirportSeqIDs FROM mytable WHERE \"Month\" IN (1) AND ArrDel15 BETWEEN 0 AND 0 AND DivTailNums BETWEEN 'N636MQ' AND 'N16976' LIMIT 26","hsqls":["SELECT CRSArrTime, ArrDelayMinutes, DivAirportSeqIDs FROM mytable WHERE `Month` IN (1) AND ArrDel15 BETWEEN 0 AND 0 AND (DivTailNums[1] BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums[2] BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums[3] BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums[4] BETWEEN 'N636MQ' AND 'N16976' OR DivTailNums[5] BETWEEN 'N636MQ' AND 'N16976') LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 13"}
 {"sql":"SELECT WheelsOff, OriginStateFips, OriginStateName, MAX(DestCityMarketID) FROM mytable WHERE FirstDepTime BETWEEN 550 AND 736 GROUP BY WheelsOff, OriginStateFips, OriginStateName  ORDER BY WheelsOff, OriginStateFips, OriginStateName LIMIT 10","hsqls":["SELECT WheelsOff, OriginStateFips, OriginStateName, MAX(DestCityMarketID) FROM mytable WHERE FirstDepTime BETWEEN 550 AND 736 GROUP BY WheelsOff, OriginStateFips, OriginStateName  ORDER BY WheelsOff, OriginStateFips, OriginStateName LIMIT 10"]}
 {"sql":"SELECT DestStateFips, DaysSinceEpoch FROM mytable WHERE FirstDepTime = 1902 ORDER BY WheelsOff, DestCityName LIMIT 9"}
 {"sql":"SELECT ArrDelayMinutes, DaysSinceEpoch FROM mytable WHERE FirstDepTime BETWEEN 624 AND 1016 AND DestStateName BETWEEN 'Maryland' AND 'Washington' ORDER BY FirstDepTime, DestCityMarketID LIMIT 3"}
 {"sql":"SELECT DepDelay, DepDelayMinutes FROM mytable WHERE CRSDepTime < 1002 ORDER BY TaxiIn, DestAirportSeqID, CancellationCode LIMIT 7"}
-{"sql":"SELECT DivTailNums FROM mytable LIMIT 5","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable LIMIT 5","hsqls":["SELECT DivTailNums FROM mytable LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DestCityMarketID, DivActualElapsedTime FROM mytable ORDER BY Quarter, Flights LIMIT 7"}
 {"sql":"SELECT OriginState, DestAirportID, DayofMonth FROM mytable WHERE DestCityName BETWEEN 'Paducah, KY' AND 'Sitka, AK' AND ArrTime BETWEEN 1048 AND 2302 LIMIT 10"}
 {"sql":"SELECT DepDelay, LateAircraftDelay, DestStateFips FROM mytable ORDER BY TailNum, CRSElapsedTime LIMIT 14"}
-{"sql":"SELECT LongestAddGTime, DestCityName, \"Month\", MIN(DivActualElapsedTime), COUNT(NASDelay) FROM mytable WHERE DayOfWeek = 6 GROUP BY LongestAddGTime, DestCityName, \"Month\" LIMIT 12","hsqls":["SELECT LongestAddGTime, DestCityName, Month, MIN(DivActualElapsedTime), COUNT(NASDelay) FROM mytable WHERE DayOfWeek = 6 GROUP BY LongestAddGTime, DestCityName, Month LIMIT 12"]}
+{"sql":"SELECT LongestAddGTime, DestCityName, \"Month\", MIN(DivActualElapsedTime), COUNT(NASDelay) FROM mytable WHERE DayOfWeek = 6 GROUP BY LongestAddGTime, DestCityName, \"Month\" LIMIT 12","hsqls":["SELECT LongestAddGTime, DestCityName, Month, MIN(DivActualElapsedTime), COUNT(NASDelay) FROM mytable WHERE DayOfWeek = 6 GROUP BY LongestAddGTime, DestCityName, `Month` LIMIT 12"]}
 {"sql":"SELECT Dest, COUNT(*) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 22","hsqls":["SELECT Dest, COUNT(*) FROM mytable GROUP BY Dest  ORDER BY Dest LIMIT 22"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE TaxiOut IN (45, 55, 70) OR ArrDel15 >= 0 OR CRSElapsedTime <= 61 ORDER BY Flights, DepTimeBlk LIMIT 16"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE TaxiOut BETWEEN 83 AND 55 AND Diverted <> 0 AND DestAirportSeqID BETWEEN 1411302 AND 1502403 ORDER BY CarrierDelay, TotalAddGTime, DestCityName LIMIT 10","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE TaxiOut BETWEEN 83 AND 55 AND Diverted <> 0 AND DestAirportSeqID BETWEEN 1411302 AND 1502403 ORDER BY CarrierDelay, TotalAddGTime, DestCityName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE TaxiOut BETWEEN 83 AND 55 AND Diverted <> 0 AND DestAirportSeqID BETWEEN 1411302 AND 1502403 ORDER BY CarrierDelay, TotalAddGTime, DestCityName LIMIT 10","hsqls":["SELECT DivWheelsOns FROM mytable WHERE TaxiOut BETWEEN 83 AND 55 AND Diverted <> 0 AND DestAirportSeqID BETWEEN 1411302 AND 1502403 ORDER BY CarrierDelay, TotalAddGTime, DestCityName LIMIT 10000"]}
 {"sql":"SELECT DivDistance, DepDelayMinutes, CancellationCode FROM mytable ORDER BY CRSElapsedTime LIMIT 29"}
 {"sql":"SELECT \"Year\", ArrDel15, AirlineID, COUNT(*) FROM mytable GROUP BY \"Year\", ArrDel15, AirlineID LIMIT 17","hsqls":["SELECT Year, ArrDel15, AirlineID, COUNT(*) FROM mytable GROUP BY Year, ArrDel15, AirlineID LIMIT 17"]}
-{"sql":"SELECT OriginStateFips FROM mytable WHERE DivTailNums IN ('N585SW') OR ArrTimeBlk = '1400-1459' ORDER BY Carrier LIMIT 18","hsqls":["SELECT OriginStateFips FROM mytable WHERE (DivTailNums__MV0 IN ('N585SW') OR DivTailNums__MV1 IN ('N585SW') OR DivTailNums__MV2 IN ('N585SW') OR DivTailNums__MV3 IN ('N585SW') OR DivTailNums__MV4 IN ('N585SW')) OR ArrTimeBlk = '1400-1459' ORDER BY Carrier LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, DestAirportSeqID, NASDelay, MIN(DepDel15), AVG(TaxiIn), COUNT(FlightDate) FROM mytable WHERE DivTailNums IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR Dest < 'TXK' GROUP BY OriginCityName, DestAirportSeqID, NASDelay LIMIT 10","hsqls":["SELECT OriginCityName, DestAirportSeqID, NASDelay, MIN(DepDel15), AVG(TaxiIn), COUNT(FlightDate) FROM mytable WHERE (DivTailNums__MV0 IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums__MV1 IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums__MV2 IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums__MV3 IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums__MV4 IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN')) OR Dest < 'TXK' GROUP BY OriginCityName, DestAirportSeqID, NASDelay LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips FROM mytable WHERE DivTailNums IN ('N585SW') OR ArrTimeBlk = '1400-1459' ORDER BY Carrier LIMIT 18","hsqls":["SELECT OriginStateFips FROM mytable WHERE (DivTailNums[1] IN ('N585SW') OR DivTailNums[2] IN ('N585SW') OR DivTailNums[3] IN ('N585SW') OR DivTailNums[4] IN ('N585SW') OR DivTailNums[5] IN ('N585SW')) OR ArrTimeBlk = '1400-1459' ORDER BY Carrier LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, DestAirportSeqID, NASDelay, MIN(DepDel15), AVG(TaxiIn), COUNT(FlightDate) FROM mytable WHERE DivTailNums IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR Dest < 'TXK' GROUP BY OriginCityName, DestAirportSeqID, NASDelay LIMIT 10","hsqls":["SELECT OriginCityName, DestAirportSeqID, NASDelay, MIN(DepDel15), AVG(TaxiIn), COUNT(FlightDate) FROM mytable WHERE (DivTailNums[1] IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums[2] IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums[3] IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums[4] IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN') OR DivTailNums[5] IN ('N698DL', 'N786SK', 'N3JPAA', 'N413WN')) OR Dest < 'TXK' GROUP BY OriginCityName, DestAirportSeqID, NASDelay LIMIT 10000"]}
 {"sql":"SELECT MAX(OriginCityMarketID), MAX(CarrierDelay) FROM mytable LIMIT 9"}
-{"sql":"SELECT ArrDelayMinutes, DivAirportSeqIDs, DestAirportSeqID FROM mytable ORDER BY DepDel15, AirTime, CRSDepTime LIMIT 1","hsqls":["SELECT ArrDelayMinutes, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestAirportSeqID FROM mytable ORDER BY DepDel15, AirTime, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DivAirportSeqIDs, DestAirportSeqID FROM mytable ORDER BY DepDel15, AirTime, CRSDepTime LIMIT 1","hsqls":["SELECT ArrDelayMinutes, DivAirportSeqIDs, DestAirportSeqID FROM mytable ORDER BY DepDel15, AirTime, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT DestStateName, AirlineID FROM mytable LIMIT 6"}
 {"sql":"SELECT TaxiOut FROM mytable WHERE TotalAddGTime <= 38 OR Quarter > 1 OR ArrDel15 BETWEEN -9999 AND 0 ORDER BY OriginCityMarketID, TailNum LIMIT 17"}
 {"sql":"SELECT DestState, MAX(CRSArrTime) FROM mytable WHERE DayofMonth BETWEEN 7 AND 4 AND ArrTime BETWEEN 2137 AND 105 GROUP BY DestState  ORDER BY DestState LIMIT 29","hsqls":["SELECT DestState, MAX(CRSArrTime) FROM mytable WHERE DayofMonth BETWEEN 7 AND 4 AND ArrTime BETWEEN 2137 AND 105 GROUP BY DestState  ORDER BY DestState LIMIT 29"]}
-{"sql":"SELECT DepDelay, MAX(DepTime) FROM mytable WHERE DivAirportIDs IN (12323, 14122) AND Quarter NOT IN (1) GROUP BY DepDelay LIMIT 21","hsqls":["SELECT DepDelay, MAX(DepTime) FROM mytable WHERE (DivAirportIDs__MV0 IN (12323, 14122) OR DivAirportIDs__MV1 IN (12323, 14122) OR DivAirportIDs__MV2 IN (12323, 14122) OR DivAirportIDs__MV3 IN (12323, 14122) OR DivAirportIDs__MV4 IN (12323, 14122)) AND Quarter NOT IN (1) GROUP BY DepDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelay, MAX(DepTime) FROM mytable WHERE DivAirportIDs IN (12323, 14122) AND Quarter NOT IN (1) GROUP BY DepDelay LIMIT 21","hsqls":["SELECT DepDelay, MAX(DepTime) FROM mytable WHERE (DivAirportIDs[1] IN (12323, 14122) OR DivAirportIDs[2] IN (12323, 14122) OR DivAirportIDs[3] IN (12323, 14122) OR DivAirportIDs[4] IN (12323, 14122) OR DivAirportIDs[5] IN (12323, 14122)) AND Quarter NOT IN (1) GROUP BY DepDelay LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE LateAircraftDelay BETWEEN 147 AND 95 OR LateAircraftDelay > 232 AND DestStateFips <= 9 ORDER BY Diverted, OriginCityName LIMIT 16"}
 {"sql":"SELECT TailNum, Dest, NASDelay, COUNT(*) FROM mytable WHERE Quarter <= 1 OR FirstDepTime IN (1745, 903, 640) GROUP BY TailNum, Dest, NASDelay  ORDER BY TailNum, Dest, NASDelay LIMIT 23","hsqls":["SELECT TailNum, Dest, NASDelay, COUNT(*) FROM mytable WHERE Quarter <= 1 OR FirstDepTime IN (1745, 903, 640) GROUP BY TailNum, Dest, NASDelay  ORDER BY TailNum, Dest, NASDelay LIMIT 23"]}
 {"sql":"SELECT Quarter, FirstDepTime, DepTimeBlk FROM mytable WHERE DivAirportLandings <> 1 AND FirstDepTime BETWEEN 703 AND 750 OR TaxiIn NOT IN (162, 96, 19, 46, 83) ORDER BY ArrTimeBlk"}
 {"sql":"SELECT CRSArrTime, MAX(DaysSinceEpoch), SUM(DepTime), AVG(AirlineID) FROM mytable WHERE DepartureDelayGroups BETWEEN 7 AND 4 AND ArrDel15 >= 1 OR DepDelay IN (165.0, 36.0, 199.0) GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 12","hsqls":["SELECT CRSArrTime, MAX(DaysSinceEpoch), SUM(DepTime), AVG(AirlineID) FROM mytable WHERE DepartureDelayGroups BETWEEN 7 AND 4 AND ArrDel15 >= 1 OR DepDelay IN (165.0, 36.0, 199.0) GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 12"]}
-{"sql":"SELECT TaxiOut, COUNT(*) FROM mytable WHERE DivAirportSeqIDs > 1334205 GROUP BY TaxiOut LIMIT 22","hsqls":["SELECT TaxiOut, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 > 1334205 OR DivAirportSeqIDs__MV1 > 1334205 OR DivAirportSeqIDs__MV2 > 1334205 OR DivAirportSeqIDs__MV3 > 1334205 OR DivAirportSeqIDs__MV4 > 1334205) GROUP BY TaxiOut LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, TaxiIn, ArrivalDelayGroups FROM mytable WHERE DivLongestGTimes IN (25.0) AND Dest BETWEEN 'DHN' AND 'BRO' OR \"Month\" BETWEEN 1 AND 1 ORDER BY OriginWac, DestAirportID LIMIT 3","hsqls":["SELECT OriginCityName, TaxiIn, ArrivalDelayGroups FROM mytable WHERE (DivLongestGTimes__MV0 IN (25.0) OR DivLongestGTimes__MV1 IN (25.0) OR DivLongestGTimes__MV2 IN (25.0) OR DivLongestGTimes__MV3 IN (25.0) OR DivLongestGTimes__MV4 IN (25.0)) AND Dest BETWEEN 'DHN' AND 'BRO' OR Month BETWEEN 1 AND 1 ORDER BY OriginWac, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, COUNT(*) FROM mytable WHERE DivAirportSeqIDs > 1334205 GROUP BY TaxiOut LIMIT 22","hsqls":["SELECT TaxiOut, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] > 1334205 OR DivAirportSeqIDs[2] > 1334205 OR DivAirportSeqIDs[3] > 1334205 OR DivAirportSeqIDs[4] > 1334205 OR DivAirportSeqIDs[5] > 1334205) GROUP BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, TaxiIn, ArrivalDelayGroups FROM mytable WHERE DivLongestGTimes IN (25.0) AND Dest BETWEEN 'DHN' AND 'BRO' OR \"Month\" BETWEEN 1 AND 1 ORDER BY OriginWac, DestAirportID LIMIT 3","hsqls":["SELECT OriginCityName, TaxiIn, ArrivalDelayGroups FROM mytable WHERE (DivLongestGTimes[1] IN (25.0) OR DivLongestGTimes[2] IN (25.0) OR DivLongestGTimes[3] IN (25.0) OR DivLongestGTimes[4] IN (25.0) OR DivLongestGTimes[5] IN (25.0)) AND Dest BETWEEN 'DHN' AND 'BRO' OR `Month` BETWEEN 1 AND 1 ORDER BY OriginWac, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelay BETWEEN 157.0 AND 103.0 LIMIT 14"}
 {"sql":"SELECT DestState, AirTime, SUM(OriginAirportID), AVG(CRSArrTime) FROM mytable WHERE CarrierDelay BETWEEN 26 AND 144 GROUP BY DestState, AirTime  ORDER BY DestState, AirTime LIMIT 16","hsqls":["SELECT DestState, AirTime, SUM(OriginAirportID), AVG(CRSArrTime) FROM mytable WHERE CarrierDelay BETWEEN 26 AND 144 GROUP BY DestState, AirTime  ORDER BY DestState, AirTime LIMIT 16"]}
-{"sql":"SELECT DestWac, DepTime, DivTailNums FROM mytable ORDER BY DepDelay, \"Month\", DaysSinceEpoch LIMIT 25","hsqls":["SELECT DestWac, DepTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY DepDelay, Month, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, COUNT(CRSElapsedTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 6 AND DivLongestGTimes IN (63.0, 36.0, 104.0, 14.0) GROUP BY TaxiOut LIMIT 24","hsqls":["SELECT TaxiOut, COUNT(CRSElapsedTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 6 AND (DivLongestGTimes__MV0 IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes__MV1 IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes__MV2 IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes__MV3 IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes__MV4 IN (63.0, 36.0, 104.0, 14.0)) GROUP BY TaxiOut LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE TotalAddGTime NOT IN (78, 94, 5, 73) OR DestAirportSeqID IN (1244102, 1584102, 1062002) ORDER BY DivReachedDest, OriginState LIMIT 2","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TotalAddGTime NOT IN (78, 94, 5, 73) OR DestAirportSeqID IN (1244102, 1584102, 1062002) ORDER BY DivReachedDest, OriginState LIMIT 10000"]}
+{"sql":"SELECT DestWac, DepTime, DivTailNums FROM mytable ORDER BY DepDelay, \"Month\", DaysSinceEpoch LIMIT 25","hsqls":["SELECT DestWac, DepTime, DivTailNums FROM mytable ORDER BY DepDelay, Month, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, COUNT(CRSElapsedTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 6 AND DivLongestGTimes IN (63.0, 36.0, 104.0, 14.0) GROUP BY TaxiOut LIMIT 24","hsqls":["SELECT TaxiOut, COUNT(CRSElapsedTime) FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 6 AND (DivLongestGTimes[1] IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes[2] IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes[3] IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes[4] IN (63.0, 36.0, 104.0, 14.0) OR DivLongestGTimes[5] IN (63.0, 36.0, 104.0, 14.0)) GROUP BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE TotalAddGTime NOT IN (78, 94, 5, 73) OR DestAirportSeqID IN (1244102, 1584102, 1062002) ORDER BY DivReachedDest, OriginState LIMIT 2","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE TotalAddGTime NOT IN (78, 94, 5, 73) OR DestAirportSeqID IN (1244102, 1584102, 1062002) ORDER BY DivReachedDest, OriginState LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DayofMonth FROM mytable WHERE TotalAddGTime BETWEEN 19 AND 40 AND Diverted BETWEEN 1 AND 1 AND DayOfWeek BETWEEN 3 AND 7 LIMIT 10"}
-{"sql":"SELECT DepDelayMinutes, UniqueCarrier FROM mytable WHERE \"Year\" > 2014 OR ArrTime IN (1557, 104) AND DivArrDelay NOT IN (427, 385, 572) ORDER BY DestWac, Cancelled, Dest LIMIT 13","hsqls":["SELECT DepDelayMinutes, UniqueCarrier FROM mytable WHERE Year > 2014 OR ArrTime IN (1557, 104) AND DivArrDelay NOT IN (427, 385, 572) ORDER BY DestWac, Cancelled, Dest LIMIT 13"]}
+{"sql":"SELECT DepDelayMinutes, UniqueCarrier FROM mytable WHERE \"Year\" > 2014 OR ArrTime IN (1557, 104) AND DivArrDelay NOT IN (427, 385, 572) ORDER BY DestWac, Cancelled, Dest LIMIT 13","hsqls":["SELECT DepDelayMinutes, UniqueCarrier FROM mytable WHERE `Year` > 2014 OR ArrTime IN (1557, 104) AND DivArrDelay NOT IN (427, 385, 572) ORDER BY DestWac, Cancelled, Dest LIMIT 13"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityName <> 'Fayetteville, AR' OR DepDel15 BETWEEN -9999 AND 0 OR DestAirportSeqID BETWEEN 1131502 AND 1013503 LIMIT 21"}
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE CRSArrTime BETWEEN 1104 AND 811 AND DivAirportLandings BETWEEN 9 AND 9 LIMIT 23"}
 {"sql":"SELECT FlightNum, DepDel15 FROM mytable WHERE DepDelayMinutes > 113.0 AND ArrTimeBlk < '1800-1859' AND DestCityName = 'Atlanta, GA' ORDER BY DivAirportLandings LIMIT 10"}
@@ -7042,46 +7042,46 @@
 {"sql":"SELECT DepTime, OriginStateName, COUNT(DestWac), SUM(LateAircraftDelay), MIN(DepTime) FROM mytable GROUP BY DepTime, OriginStateName  ORDER BY DepTime, OriginStateName LIMIT 18","hsqls":["SELECT DepTime, OriginStateName, COUNT(DestWac), SUM(LateAircraftDelay), MIN(DepTime) FROM mytable GROUP BY DepTime, OriginStateName  ORDER BY DepTime, OriginStateName LIMIT 18"]}
 {"sql":"SELECT CRSArrTime, TailNum FROM mytable WHERE DepartureDelayGroups BETWEEN 8 AND 7 OR DepDel15 NOT IN (1, 0, -9999) ORDER BY WheelsOff, DepDelay, DepTimeBlk LIMIT 25"}
 {"sql":"SELECT OriginState, DayOfWeek, MIN(TotalAddGTime), COUNT(DepartureDelayGroups), SUM(Quarter) FROM mytable WHERE ArrTime IN (314) AND Carrier BETWEEN 'WN' AND 'AS' AND ArrTimeBlk BETWEEN '1400-1459' AND '2200-2259' GROUP BY OriginState, DayOfWeek  ORDER BY OriginState, DayOfWeek LIMIT 14","hsqls":["SELECT OriginState, DayOfWeek, MIN(TotalAddGTime), COUNT(DepartureDelayGroups), SUM(Quarter) FROM mytable WHERE ArrTime IN (314) AND Carrier BETWEEN 'WN' AND 'AS' AND ArrTimeBlk BETWEEN '1400-1459' AND '2200-2259' GROUP BY OriginState, DayOfWeek  ORDER BY OriginState, DayOfWeek LIMIT 14"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 14","hsqls":["SELECT COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 LIMIT 14"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 14","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 LIMIT 14"]}
 {"sql":"SELECT FlightNum, AVG(OriginStateFips), AVG(DivAirportLandings) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 28","hsqls":["SELECT FlightNum, AVG(OriginStateFips), AVG(DivAirportLandings) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 28"]}
 {"sql":"SELECT MIN(DayofMonth) FROM mytable WHERE DaysSinceEpoch >= 16092 LIMIT 10"}
-{"sql":"SELECT DestStateName, AVG(OriginAirportSeqID) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR DivAirportIDs < 13303 GROUP BY DestStateName LIMIT 4","hsqls":["SELECT DestStateName, AVG(CAST(OriginAirportSeqID AS DOUBLE)) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR (DivAirportIDs__MV0 < 13303 OR DivAirportIDs__MV1 < 13303 OR DivAirportIDs__MV2 < 13303 OR DivAirportIDs__MV3 < 13303 OR DivAirportIDs__MV4 < 13303) GROUP BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestStateName, AVG(OriginAirportSeqID) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR DivAirportIDs < 13303 GROUP BY DestStateName LIMIT 4","hsqls":["SELECT DestStateName, AVG(CAST(OriginAirportSeqID AS DOUBLE)) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR (DivAirportIDs[1] < 13303 OR DivAirportIDs[2] < 13303 OR DivAirportIDs[3] < 13303 OR DivAirportIDs[4] < 13303 OR DivAirportIDs[5] < 13303) GROUP BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE WeatherDelay BETWEEN 177 AND 319 AND DivActualElapsedTime >= 350 ORDER BY OriginStateFips LIMIT 3"}
-{"sql":"SELECT AirTime, COUNT(FlightNum), SUM(Flights), SUM(ArrTime) FROM mytable WHERE DivDistance BETWEEN 1521 AND 280 OR \"Month\" = 1 OR AirTime NOT IN (480, 64) GROUP BY AirTime LIMIT 16","hsqls":["SELECT AirTime, COUNT(FlightNum), SUM(Flights), SUM(ArrTime) FROM mytable WHERE DivDistance BETWEEN 1521 AND 280 OR Month = 1 OR AirTime NOT IN (480, 64) GROUP BY AirTime LIMIT 16"]}
+{"sql":"SELECT AirTime, COUNT(FlightNum), SUM(Flights), SUM(ArrTime) FROM mytable WHERE DivDistance BETWEEN 1521 AND 280 OR \"Month\" = 1 OR AirTime NOT IN (480, 64) GROUP BY AirTime LIMIT 16","hsqls":["SELECT AirTime, COUNT(FlightNum), SUM(Flights), SUM(ArrTime) FROM mytable WHERE DivDistance BETWEEN 1521 AND 280 OR `Month` = 1 OR AirTime NOT IN (480, 64) GROUP BY AirTime LIMIT 16"]}
 {"sql":"SELECT OriginCityName, MAX(TotalAddGTime), MIN(DistanceGroup) FROM mytable WHERE Dest NOT IN ('MSN') OR FirstDepTime <= 1859 OR Distance = 422 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 1","hsqls":["SELECT OriginCityName, MAX(TotalAddGTime), MIN(DistanceGroup) FROM mytable WHERE Dest NOT IN ('MSN') OR FirstDepTime <= 1859 OR Distance = 422 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 1"]}
-{"sql":"SELECT \"Month\", AVG(ArrivalDelayGroups), COUNT(TotalAddGTime), AVG(DivActualElapsedTime) FROM mytable WHERE DestWac BETWEEN 52 AND 53 OR DestAirportSeqID NOT IN (1147103, 1502403, 1164102, 1201602, 1410002) AND ArrivalDelayGroups >= 10 GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, AVG(ArrivalDelayGroups), COUNT(TotalAddGTime), AVG(DivActualElapsedTime) FROM mytable WHERE DestWac BETWEEN 52 AND 53 OR DestAirportSeqID NOT IN (1147103, 1502403, 1164102, 1201602, 1410002) AND ArrivalDelayGroups >= 10 GROUP BY Month LIMIT 10"]}
+{"sql":"SELECT \"Month\", AVG(ArrivalDelayGroups), COUNT(TotalAddGTime), AVG(DivActualElapsedTime) FROM mytable WHERE DestWac BETWEEN 52 AND 53 OR DestAirportSeqID NOT IN (1147103, 1502403, 1164102, 1201602, 1410002) AND ArrivalDelayGroups >= 10 GROUP BY \"Month\" LIMIT 10","hsqls":["SELECT Month, AVG(ArrivalDelayGroups), COUNT(TotalAddGTime), AVG(DivActualElapsedTime) FROM mytable WHERE DestWac BETWEEN 52 AND 53 OR DestAirportSeqID NOT IN (1147103, 1502403, 1164102, 1201602, 1410002) AND ArrivalDelayGroups >= 10 GROUP BY `Month` LIMIT 10"]}
 {"sql":"SELECT CarrierDelay, DestStateFips, OriginStateName, COUNT(DivArrDelay), SUM(DestWac), SUM(DivDistance) FROM mytable WHERE TailNum BETWEEN 'N644MQ' AND 'N13123' OR FlightDate IN ('2014-01-18', '2014-01-08') GROUP BY CarrierDelay, DestStateFips, OriginStateName  ORDER BY CarrierDelay, DestStateFips, OriginStateName LIMIT 21","hsqls":["SELECT CarrierDelay, DestStateFips, OriginStateName, COUNT(DivArrDelay), SUM(DestWac), SUM(DivDistance) FROM mytable WHERE TailNum BETWEEN 'N644MQ' AND 'N13123' OR FlightDate IN ('2014-01-18', '2014-01-08') GROUP BY CarrierDelay, DestStateFips, OriginStateName  ORDER BY CarrierDelay, DestStateFips, OriginStateName LIMIT 21"]}
 {"sql":"SELECT DestAirportID, CRSDepTime, WheelsOn FROM mytable WHERE OriginStateName BETWEEN 'Pennsylvania' AND 'Minnesota' LIMIT 7"}
 {"sql":"SELECT DepDel15 FROM mytable WHERE DestAirportSeqID BETWEEN 1495203 AND 1084903 ORDER BY DivReachedDest LIMIT 8"}
 {"sql":"SELECT OriginState, DivDistance, Dest, COUNT(*) FROM mytable WHERE DayOfWeek NOT IN (1, 7, 6, 4) GROUP BY OriginState, DivDistance, Dest  ORDER BY OriginState, DivDistance, Dest LIMIT 26","hsqls":["SELECT OriginState, DivDistance, Dest, COUNT(*) FROM mytable WHERE DayOfWeek NOT IN (1, 7, 6, 4) GROUP BY OriginState, DivDistance, Dest  ORDER BY OriginState, DivDistance, Dest LIMIT 26"]}
-{"sql":"SELECT OriginCityMarketID, DestCityMarketID FROM mytable WHERE DivLongestGTimes = 73.0 OR OriginCityName BETWEEN 'Gillette, WY' AND 'Phoenix, AZ' ORDER BY CRSElapsedTime, OriginStateName","hsqls":["SELECT OriginCityMarketID, DestCityMarketID FROM mytable WHERE (DivLongestGTimes__MV0 = 73.0 OR DivLongestGTimes__MV1 = 73.0 OR DivLongestGTimes__MV2 = 73.0 OR DivLongestGTimes__MV3 = 73.0 OR DivLongestGTimes__MV4 = 73.0) OR OriginCityName BETWEEN 'Gillette, WY' AND 'Phoenix, AZ' ORDER BY CRSElapsedTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestCityMarketID FROM mytable WHERE DivLongestGTimes = 73.0 OR OriginCityName BETWEEN 'Gillette, WY' AND 'Phoenix, AZ' ORDER BY CRSElapsedTime, OriginStateName","hsqls":["SELECT OriginCityMarketID, DestCityMarketID FROM mytable WHERE (DivLongestGTimes[1] = 73.0 OR DivLongestGTimes[2] = 73.0 OR DivLongestGTimes[3] = 73.0 OR DivLongestGTimes[4] = 73.0 OR DivLongestGTimes[5] = 73.0) OR OriginCityName BETWEEN 'Gillette, WY' AND 'Phoenix, AZ' ORDER BY CRSElapsedTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, Carrier, LongestAddGTime FROM mytable WHERE DayOfWeek IN (3, 1, 7, 6) AND NASDelay BETWEEN 74 AND 74 AND OriginStateName BETWEEN 'Oregon' AND 'Iowa' LIMIT 16"}
 {"sql":"SELECT MIN(SecurityDelay), MIN(DistanceGroup), AVG(DepartureDelayGroups) FROM mytable WHERE Flights < 1 AND DestAirportSeqID <> 1220603 OR ArrDel15 IN (0) LIMIT 24"}
-{"sql":"SELECT CRSArrTime, TotalAddGTime, \"Month\" FROM mytable WHERE DepDelayMinutes NOT IN (149.0, 298.0) ORDER BY Distance, DivAirportLandings, DayOfWeek LIMIT 6","hsqls":["SELECT CRSArrTime, TotalAddGTime, Month FROM mytable WHERE DepDelayMinutes NOT IN (149.0, 298.0) ORDER BY Distance, DivAirportLandings, DayOfWeek LIMIT 6"]}
+{"sql":"SELECT CRSArrTime, TotalAddGTime, \"Month\" FROM mytable WHERE DepDelayMinutes NOT IN (149.0, 298.0) ORDER BY Distance, DivAirportLandings, DayOfWeek LIMIT 6","hsqls":["SELECT CRSArrTime, TotalAddGTime, `Month` FROM mytable WHERE DepDelayMinutes NOT IN (149.0, 298.0) ORDER BY Distance, DivAirportLandings, DayOfWeek LIMIT 6"]}
 {"sql":"SELECT AirTime FROM mytable ORDER BY CRSElapsedTime"}
 {"sql":"SELECT DaysSinceEpoch, AVG(DepDel15), SUM(ActualElapsedTime), SUM(DestStateFips) FROM mytable WHERE TotalAddGTime = 94 OR DestCityName BETWEEN 'Kansas City, MO' AND 'Chicago, IL' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 20","hsqls":["SELECT DaysSinceEpoch, AVG(DepDel15), SUM(ActualElapsedTime), SUM(DestStateFips) FROM mytable WHERE TotalAddGTime = 94 OR DestCityName BETWEEN 'Kansas City, MO' AND 'Chicago, IL' GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 20"]}
-{"sql":"SELECT \"Month\", SUM(DepDelayMinutes), SUM(ActualElapsedTime) FROM mytable GROUP BY \"Month\" LIMIT 11","hsqls":["SELECT Month, SUM(DepDelayMinutes), SUM(ActualElapsedTime) FROM mytable GROUP BY Month LIMIT 11"]}
+{"sql":"SELECT \"Month\", SUM(DepDelayMinutes), SUM(ActualElapsedTime) FROM mytable GROUP BY \"Month\" LIMIT 11","hsqls":["SELECT Month, SUM(DepDelayMinutes), SUM(ActualElapsedTime) FROM mytable GROUP BY `Month` LIMIT 11"]}
 {"sql":"SELECT Flights, DestStateName, DestCityMarketID FROM mytable ORDER BY DestAirportSeqID, ArrTime, UniqueCarrier LIMIT 8"}
 {"sql":"SELECT MIN(TotalAddGTime), MIN(DivDistance), AVG(OriginAirportID) FROM mytable WHERE OriginWac <= 74 AND WeatherDelay <> 205 OR OriginWac IN (31) LIMIT 24"}
 {"sql":"SELECT OriginCityName, DepTime, UniqueCarrier, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 5 AND 7 GROUP BY OriginCityName, DepTime, UniqueCarrier  ORDER BY OriginCityName, DepTime, UniqueCarrier LIMIT 19","hsqls":["SELECT OriginCityName, DepTime, UniqueCarrier, COUNT(*) FROM mytable WHERE ArrivalDelayGroups BETWEEN 5 AND 7 GROUP BY OriginCityName, DepTime, UniqueCarrier  ORDER BY OriginCityName, DepTime, UniqueCarrier LIMIT 19"]}
-{"sql":"SELECT ArrDelay, MAX(\"Year\"), MIN(ArrivalDelayGroups) FROM mytable WHERE FlightDate NOT IN ('2014-01-27') OR DivTotalGTimes > 26 AND DivAirportIDs < 13486 GROUP BY ArrDelay LIMIT 14","hsqls":["SELECT ArrDelay, MAX(Year), MIN(ArrivalDelayGroups) FROM mytable WHERE FlightDate NOT IN ('2014-01-27') OR (DivTotalGTimes__MV0 > 26 OR DivTotalGTimes__MV1 > 26 OR DivTotalGTimes__MV2 > 26 OR DivTotalGTimes__MV3 > 26 OR DivTotalGTimes__MV4 > 26) AND (DivAirportIDs__MV0 < 13486 OR DivAirportIDs__MV1 < 13486 OR DivAirportIDs__MV2 < 13486 OR DivAirportIDs__MV3 < 13486 OR DivAirportIDs__MV4 < 13486) GROUP BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, MAX(\"Year\"), MIN(ArrivalDelayGroups) FROM mytable WHERE FlightDate NOT IN ('2014-01-27') OR DivTotalGTimes > 26 AND DivAirportIDs < 13486 GROUP BY ArrDelay LIMIT 14","hsqls":["SELECT ArrDelay, MAX(`Year`), MIN(ArrivalDelayGroups) FROM mytable WHERE FlightDate NOT IN ('2014-01-27') OR (DivTotalGTimes[1] > 26 OR DivTotalGTimes[2] > 26 OR DivTotalGTimes[3] > 26 OR DivTotalGTimes[4] > 26 OR DivTotalGTimes[5] > 26) AND (DivAirportIDs[1] < 13486 OR DivAirportIDs[2] < 13486 OR DivAirportIDs[3] < 13486 OR DivAirportIDs[4] < 13486 OR DivAirportIDs[5] < 13486) GROUP BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, TailNum, WheelsOn, MAX(ArrDelay), SUM(ArrDel15), COUNT(LateAircraftDelay) FROM mytable WHERE TailNum <> 'N12221' GROUP BY TaxiOut, TailNum, WheelsOn  ORDER BY TaxiOut, TailNum, WheelsOn LIMIT 19","hsqls":["SELECT TaxiOut, TailNum, WheelsOn, MAX(ArrDelay), SUM(ArrDel15), COUNT(LateAircraftDelay) FROM mytable WHERE TailNum <> 'N12221' GROUP BY TaxiOut, TailNum, WheelsOn  ORDER BY TaxiOut, TailNum, WheelsOn LIMIT 19"]}
-{"sql":"SELECT Distance, MAX(TotalAddGTime), COUNT(DestStateName), MAX(WeatherDelay) FROM mytable WHERE DivAirportSeqIDs IN (1198603, 1451202) GROUP BY Distance LIMIT 27","hsqls":["SELECT Distance, MAX(TotalAddGTime), COUNT(DestStateName), MAX(WeatherDelay) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1198603, 1451202) OR DivAirportSeqIDs__MV1 IN (1198603, 1451202) OR DivAirportSeqIDs__MV2 IN (1198603, 1451202) OR DivAirportSeqIDs__MV3 IN (1198603, 1451202) OR DivAirportSeqIDs__MV4 IN (1198603, 1451202)) GROUP BY Distance LIMIT 10000"]}
+{"sql":"SELECT Distance, MAX(TotalAddGTime), COUNT(DestStateName), MAX(WeatherDelay) FROM mytable WHERE DivAirportSeqIDs IN (1198603, 1451202) GROUP BY Distance LIMIT 27","hsqls":["SELECT Distance, MAX(TotalAddGTime), COUNT(DestStateName), MAX(WeatherDelay) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1198603, 1451202) OR DivAirportSeqIDs[2] IN (1198603, 1451202) OR DivAirportSeqIDs[3] IN (1198603, 1451202) OR DivAirportSeqIDs[4] IN (1198603, 1451202) OR DivAirportSeqIDs[5] IN (1198603, 1451202)) GROUP BY Distance LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, CRSDepTime, COUNT(DestAirportSeqID), MAX(DistanceGroup), SUM(CRSElapsedTime) FROM mytable WHERE DestState IN ('NV', 'FL', 'KY') OR Carrier <= 'AA' AND CRSArrTime BETWEEN 1215 AND 2221 GROUP BY LongestAddGTime, CRSDepTime  ORDER BY LongestAddGTime, CRSDepTime LIMIT 28","hsqls":["SELECT LongestAddGTime, CRSDepTime, COUNT(DestAirportSeqID), MAX(DistanceGroup), SUM(CRSElapsedTime) FROM mytable WHERE DestState IN ('NV', 'FL', 'KY') OR Carrier <= 'AA' AND CRSArrTime BETWEEN 1215 AND 2221 GROUP BY LongestAddGTime, CRSDepTime  ORDER BY LongestAddGTime, CRSDepTime LIMIT 28"]}
-{"sql":"SELECT ArrDelayMinutes, DaysSinceEpoch FROM mytable WHERE DivTotalGTimes BETWEEN 70 AND 23 AND Diverted > 0 LIMIT 2","hsqls":["SELECT ArrDelayMinutes, DaysSinceEpoch FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 70 AND 23 OR DivTotalGTimes__MV1 BETWEEN 70 AND 23 OR DivTotalGTimes__MV2 BETWEEN 70 AND 23 OR DivTotalGTimes__MV3 BETWEEN 70 AND 23 OR DivTotalGTimes__MV4 BETWEEN 70 AND 23) AND Diverted > 0 LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DaysSinceEpoch FROM mytable WHERE DivTotalGTimes BETWEEN 70 AND 23 AND Diverted > 0 LIMIT 2","hsqls":["SELECT ArrDelayMinutes, DaysSinceEpoch FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 70 AND 23 OR DivTotalGTimes[2] BETWEEN 70 AND 23 OR DivTotalGTimes[3] BETWEEN 70 AND 23 OR DivTotalGTimes[4] BETWEEN 70 AND 23 OR DivTotalGTimes[5] BETWEEN 70 AND 23) AND Diverted > 0 LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, DestStateName, DestAirportID, MIN(DepTime), MIN(AirlineID) FROM mytable WHERE DepartureDelayGroups NOT IN (3, -1, 6, 12) GROUP BY SecurityDelay, DestStateName, DestAirportID  ORDER BY SecurityDelay, DestStateName, DestAirportID LIMIT 14","hsqls":["SELECT SecurityDelay, DestStateName, DestAirportID, MIN(DepTime), MIN(AirlineID) FROM mytable WHERE DepartureDelayGroups NOT IN (3, -1, 6, 12) GROUP BY SecurityDelay, DestStateName, DestAirportID  ORDER BY SecurityDelay, DestStateName, DestAirportID LIMIT 14"]}
-{"sql":"SELECT DestCityMarketID FROM mytable WHERE DivReachedDest > -9999 OR DivAirportIDs = 15389 AND DestCityName IN ('Guam, TT', 'Sun Valley/Hailey/Ketchum, ID') ORDER BY Quarter, FirstDepTime, OriginWac LIMIT 5","hsqls":["SELECT DestCityMarketID FROM mytable WHERE DivReachedDest > -9999 OR (DivAirportIDs__MV0 = 15389 OR DivAirportIDs__MV1 = 15389 OR DivAirportIDs__MV2 = 15389 OR DivAirportIDs__MV3 = 15389 OR DivAirportIDs__MV4 = 15389) AND DestCityName IN ('Guam, TT', 'Sun Valley/Hailey/Ketchum, ID') ORDER BY Quarter, FirstDepTime, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID FROM mytable WHERE DivReachedDest > -9999 OR DivAirportIDs = 15389 AND DestCityName IN ('Guam, TT', 'Sun Valley/Hailey/Ketchum, ID') ORDER BY Quarter, FirstDepTime, OriginWac LIMIT 5","hsqls":["SELECT DestCityMarketID FROM mytable WHERE DivReachedDest > -9999 OR (DivAirportIDs[1] = 15389 OR DivAirportIDs[2] = 15389 OR DivAirportIDs[3] = 15389 OR DivAirportIDs[4] = 15389 OR DivAirportIDs[5] = 15389) AND DestCityName IN ('Guam, TT', 'Sun Valley/Hailey/Ketchum, ID') ORDER BY Quarter, FirstDepTime, OriginWac LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable WHERE Flights IN (1) ORDER BY DepartureDelayGroups, OriginWac LIMIT 1"}
 {"sql":"SELECT MAX(FlightNum), COUNT(AirlineID), MAX(ActualElapsedTime) FROM mytable WHERE OriginStateName < 'Nebraska' AND OriginAirportSeqID BETWEEN 1334402 AND 1329604 OR WheelsOff BETWEEN 1649 AND 715 LIMIT 6"}
 {"sql":"SELECT LateAircraftDelay, DepTime, TaxiIn, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 OR DayOfWeek IN (2, 1) AND ArrDel15 BETWEEN -9999 AND 1 GROUP BY LateAircraftDelay, DepTime, TaxiIn  ORDER BY LateAircraftDelay, DepTime, TaxiIn LIMIT 15","hsqls":["SELECT LateAircraftDelay, DepTime, TaxiIn, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 0 OR DayOfWeek IN (2, 1) AND ArrDel15 BETWEEN -9999 AND 1 GROUP BY LateAircraftDelay, DepTime, TaxiIn  ORDER BY LateAircraftDelay, DepTime, TaxiIn LIMIT 15"]}
 {"sql":"SELECT Carrier FROM mytable ORDER BY LateAircraftDelay, CRSArrTime, ArrivalDelayGroups LIMIT 16"}
-{"sql":"SELECT OriginState, DivWheelsOffs FROM mytable WHERE LongestAddGTime <= 45 AND DistanceGroup IN (3, 2, 1, 9) AND DivAirportIDs BETWEEN 14307 AND 14524 LIMIT 4","hsqls":["SELECT OriginState, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE LongestAddGTime <= 45 AND DistanceGroup IN (3, 2, 1, 9) AND (DivAirportIDs__MV0 BETWEEN 14307 AND 14524 OR DivAirportIDs__MV1 BETWEEN 14307 AND 14524 OR DivAirportIDs__MV2 BETWEEN 14307 AND 14524 OR DivAirportIDs__MV3 BETWEEN 14307 AND 14524 OR DivAirportIDs__MV4 BETWEEN 14307 AND 14524) LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivActualElapsedTime, DivTotalGTimes FROM mytable WHERE DestStateName <= 'Arkansas' LIMIT 23","hsqls":["SELECT DistanceGroup, DivActualElapsedTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestStateName <= 'Arkansas' LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivWheelsOffs FROM mytable WHERE LongestAddGTime <= 45 AND DistanceGroup IN (3, 2, 1, 9) AND DivAirportIDs BETWEEN 14307 AND 14524 LIMIT 4","hsqls":["SELECT OriginState, DivWheelsOffs FROM mytable WHERE LongestAddGTime <= 45 AND DistanceGroup IN (3, 2, 1, 9) AND (DivAirportIDs[1] BETWEEN 14307 AND 14524 OR DivAirportIDs[2] BETWEEN 14307 AND 14524 OR DivAirportIDs[3] BETWEEN 14307 AND 14524 OR DivAirportIDs[4] BETWEEN 14307 AND 14524 OR DivAirportIDs[5] BETWEEN 14307 AND 14524) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivActualElapsedTime, DivTotalGTimes FROM mytable WHERE DestStateName <= 'Arkansas' LIMIT 23","hsqls":["SELECT DistanceGroup, DivActualElapsedTime, DivTotalGTimes FROM mytable WHERE DestStateName <= 'Arkansas' LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE AirlineID BETWEEN 19805 AND 21171 AND OriginState BETWEEN 'CO' AND 'CO' LIMIT 10"}
 {"sql":"SELECT Distance, CRSElapsedTime FROM mytable WHERE DivReachedDest NOT IN (1, 0, -9999) AND LongestAddGTime BETWEEN 103 AND 37 AND NASDelay BETWEEN 41 AND 150 ORDER BY CarrierDelay, ArrDelayMinutes, UniqueCarrier LIMIT 7"}
-{"sql":"SELECT DivAirportSeqIDs, TailNum FROM mytable LIMIT 18","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, TailNum FROM mytable LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE NASDelay BETWEEN 15 AND 6 AND Diverted NOT IN (1, 0) ORDER BY CRSArrTime, CarrierDelay, ArrDel15 LIMIT 29","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE NASDelay BETWEEN 15 AND 6 AND Diverted NOT IN (1, 0) ORDER BY CRSArrTime, CarrierDelay, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, FirstDepTime, DivWheelsOffs FROM mytable WHERE CRSDepTime <> 1006 AND CarrierDelay BETWEEN 96 AND 266 AND DestCityName IN ('Mammoth Lakes, CA', 'Louisville, KY', 'Garden City, KS', 'Dothan, AL') ORDER BY FlightNum LIMIT 13","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, FirstDepTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE CRSDepTime <> 1006 AND CarrierDelay BETWEEN 96 AND 266 AND DestCityName IN ('Mammoth Lakes, CA', 'Louisville, KY', 'Garden City, KS', 'Dothan, AL') ORDER BY FlightNum LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, TailNum FROM mytable LIMIT 18","hsqls":["SELECT DivAirportSeqIDs, TailNum FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE NASDelay BETWEEN 15 AND 6 AND Diverted NOT IN (1, 0) ORDER BY CRSArrTime, CarrierDelay, ArrDel15 LIMIT 29","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE NASDelay BETWEEN 15 AND 6 AND Diverted NOT IN (1, 0) ORDER BY CRSArrTime, CarrierDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, FirstDepTime, DivWheelsOffs FROM mytable WHERE CRSDepTime <> 1006 AND CarrierDelay BETWEEN 96 AND 266 AND DestCityName IN ('Mammoth Lakes, CA', 'Louisville, KY', 'Garden City, KS', 'Dothan, AL') ORDER BY FlightNum LIMIT 13","hsqls":["SELECT DivWheelsOns, FirstDepTime, DivWheelsOffs FROM mytable WHERE CRSDepTime <> 1006 AND CarrierDelay BETWEEN 96 AND 266 AND DestCityName IN ('Mammoth Lakes, CA', 'Louisville, KY', 'Garden City, KS', 'Dothan, AL') ORDER BY FlightNum LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, DestCityName, COUNT(DestAirportSeqID), COUNT(Distance), MAX(Distance) FROM mytable WHERE DestAirportSeqID IN (1037203, 1163805, 1104103, 1327702) GROUP BY DestAirportSeqID, DestCityName  ORDER BY DestAirportSeqID, DestCityName LIMIT 12","hsqls":["SELECT DestAirportSeqID, DestCityName, COUNT(DestAirportSeqID), COUNT(Distance), MAX(Distance) FROM mytable WHERE DestAirportSeqID IN (1037203, 1163805, 1104103, 1327702) GROUP BY DestAirportSeqID, DestCityName  ORDER BY DestAirportSeqID, DestCityName LIMIT 12"]}
 {"sql":"SELECT SUM(WeatherDelay), SUM(DepTime), MIN(TaxiOut) FROM mytable WHERE DaysSinceEpoch NOT IN (16073, 16090, 16079) AND DivAirportLandings BETWEEN 2 AND 1 OR ArrTimeBlk IN ('2000-2059', '0700-0759', '1100-1159', '1300-1359') LIMIT 22"}
 {"sql":"SELECT DestStateName, NASDelay, ArrDelay FROM mytable ORDER BY AirTime LIMIT 17"}
@@ -7093,30 +7093,30 @@
 {"sql":"SELECT SUM(DestStateFips) FROM mytable LIMIT 24"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 24"}
 {"sql":"SELECT AVG(DayOfWeek), AVG(DestAirportID), AVG(DepTime) FROM mytable LIMIT 16"}
-{"sql":"SELECT SUM(AirlineID) FROM mytable WHERE WeatherDelay <= 52 OR Cancelled IN (1) AND DivAirportIDs IN (11953) LIMIT 11","hsqls":["SELECT SUM(AirlineID) FROM mytable WHERE WeatherDelay <= 52 OR Cancelled IN (1) AND (DivAirportIDs__MV0 IN (11953) OR DivAirportIDs__MV1 IN (11953) OR DivAirportIDs__MV2 IN (11953) OR DivAirportIDs__MV3 IN (11953) OR DivAirportIDs__MV4 IN (11953)) LIMIT 10000"]}
+{"sql":"SELECT SUM(AirlineID) FROM mytable WHERE WeatherDelay <= 52 OR Cancelled IN (1) AND DivAirportIDs IN (11953) LIMIT 11","hsqls":["SELECT SUM(AirlineID) FROM mytable WHERE WeatherDelay <= 52 OR Cancelled IN (1) AND (DivAirportIDs[1] IN (11953) OR DivAirportIDs[2] IN (11953) OR DivAirportIDs[3] IN (11953) OR DivAirportIDs[4] IN (11953) OR DivAirportIDs[5] IN (11953)) LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, Dest FROM mytable WHERE AirTime IN (143, 323, 274, 168) LIMIT 18"}
 {"sql":"SELECT MAX(DepDel15), MAX(DayofMonth), MAX(AirTime) FROM mytable WHERE DivDistance BETWEEN 895 AND 488 OR CRSElapsedTime NOT IN (135, 38) LIMIT 6"}
-{"sql":"SELECT LongestAddGTime, Origin, CRSDepTime, MIN(ArrDelay), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE OriginWac NOT IN (67, 13, 11, 12) AND DivWheelsOffs BETWEEN 2105 AND 1821 GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 19","hsqls":["SELECT LongestAddGTime, Origin, CRSDepTime, MIN(ArrDelay), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE OriginWac NOT IN (67, 13, 11, 12) AND (DivWheelsOffs__MV0 BETWEEN 2105 AND 1821 OR DivWheelsOffs__MV1 BETWEEN 2105 AND 1821 OR DivWheelsOffs__MV2 BETWEEN 2105 AND 1821 OR DivWheelsOffs__MV3 BETWEEN 2105 AND 1821 OR DivWheelsOffs__MV4 BETWEEN 2105 AND 1821) GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Origin, CRSDepTime, MIN(ArrDelay), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE OriginWac NOT IN (67, 13, 11, 12) AND DivWheelsOffs BETWEEN 2105 AND 1821 GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 19","hsqls":["SELECT LongestAddGTime, Origin, CRSDepTime, MIN(ArrDelay), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE OriginWac NOT IN (67, 13, 11, 12) AND (DivWheelsOffs[1] BETWEEN 2105 AND 1821 OR DivWheelsOffs[2] BETWEEN 2105 AND 1821 OR DivWheelsOffs[3] BETWEEN 2105 AND 1821 OR DivWheelsOffs[4] BETWEEN 2105 AND 1821 OR DivWheelsOffs[5] BETWEEN 2105 AND 1821) GROUP BY LongestAddGTime, Origin, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT FlightDate, DestAirportID, COUNT(*) FROM mytable WHERE Dest BETWEEN 'BQN' AND 'YUM' AND OriginStateName < 'South Dakota' AND ActualElapsedTime IN (353, 357, 242) GROUP BY FlightDate, DestAirportID  ORDER BY FlightDate, DestAirportID LIMIT 5","hsqls":["SELECT FlightDate, DestAirportID, COUNT(*) FROM mytable WHERE Dest BETWEEN 'BQN' AND 'YUM' AND OriginStateName < 'South Dakota' AND ActualElapsedTime IN (353, 357, 242) GROUP BY FlightDate, DestAirportID  ORDER BY FlightDate, DestAirportID LIMIT 5"]}
 {"sql":"SELECT CRSArrTime, Origin FROM mytable WHERE Distance < 1053 OR ArrivalDelayGroups > -1 AND Carrier BETWEEN 'WN' AND 'B6' ORDER BY WheelsOff, DestState LIMIT 1"}
 {"sql":"SELECT LongestAddGTime, Cancelled FROM mytable WHERE OriginAirportID IN (10170, 11433) ORDER BY OriginAirportSeqID, Diverted LIMIT 10"}
 {"sql":"SELECT TaxiOut, ArrTime, ArrivalDelayGroups, COUNT(Carrier), SUM(CRSElapsedTime), COUNT(DepTime) FROM mytable WHERE ArrDelay BETWEEN 130.0 AND 215.0 AND DepDelayMinutes BETWEEN 77.0 AND 116.0 AND DepTime IN (1206, 2219, 1957, 1344) GROUP BY TaxiOut, ArrTime, ArrivalDelayGroups  ORDER BY TaxiOut, ArrTime, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT TaxiOut, ArrTime, ArrivalDelayGroups, COUNT(Carrier), SUM(CRSElapsedTime), COUNT(DepTime) FROM mytable WHERE ArrDelay BETWEEN 130.0 AND 215.0 AND DepDelayMinutes BETWEEN 77.0 AND 116.0 AND DepTime IN (1206, 2219, 1957, 1344) GROUP BY TaxiOut, ArrTime, ArrivalDelayGroups  ORDER BY TaxiOut, ArrTime, ArrivalDelayGroups LIMIT 8"]}
-{"sql":"SELECT WheelsOff, UniqueCarrier, MIN(DepDelayMinutes), AVG(Distance), SUM(OriginStateFips) FROM mytable WHERE DivAirportSeqIDs IN (1154003) OR ActualElapsedTime <= 320 GROUP BY WheelsOff, UniqueCarrier LIMIT 9","hsqls":["SELECT WheelsOff, UniqueCarrier, MIN(DepDelayMinutes), AVG(Distance), SUM(OriginStateFips) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1154003) OR DivAirportSeqIDs__MV1 IN (1154003) OR DivAirportSeqIDs__MV2 IN (1154003) OR DivAirportSeqIDs__MV3 IN (1154003) OR DivAirportSeqIDs__MV4 IN (1154003)) OR ActualElapsedTime <= 320 GROUP BY WheelsOff, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs, \"Month\" FROM mytable ORDER BY FlightDate, ArrTime LIMIT 3","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, Month FROM mytable ORDER BY FlightDate, ArrTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, UniqueCarrier, MIN(DepDelayMinutes), AVG(Distance), SUM(OriginStateFips) FROM mytable WHERE DivAirportSeqIDs IN (1154003) OR ActualElapsedTime <= 320 GROUP BY WheelsOff, UniqueCarrier LIMIT 9","hsqls":["SELECT WheelsOff, UniqueCarrier, MIN(DepDelayMinutes), AVG(Distance), SUM(OriginStateFips) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1154003) OR DivAirportSeqIDs[2] IN (1154003) OR DivAirportSeqIDs[3] IN (1154003) OR DivAirportSeqIDs[4] IN (1154003) OR DivAirportSeqIDs[5] IN (1154003)) OR ActualElapsedTime <= 320 GROUP BY WheelsOff, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, \"Month\" FROM mytable ORDER BY FlightDate, ArrTime LIMIT 3","hsqls":["SELECT DivAirportIDs, `Month` FROM mytable ORDER BY FlightDate, ArrTime LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, Distance, COUNT(*) FROM mytable GROUP BY FirstDepTime, Distance  ORDER BY FirstDepTime, Distance LIMIT 27","hsqls":["SELECT FirstDepTime, Distance, COUNT(*) FROM mytable GROUP BY FirstDepTime, Distance  ORDER BY FirstDepTime, Distance LIMIT 27"]}
 {"sql":"SELECT AirTime FROM mytable WHERE OriginAirportID BETWEEN 11066 AND 13303 OR AirTime = 17 ORDER BY WheelsOff, OriginCityName, TotalAddGTime LIMIT 16"}
 {"sql":"SELECT WheelsOn, MIN(Cancelled), COUNT(AirTime), MAX(ActualElapsedTime) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 12","hsqls":["SELECT WheelsOn, MIN(Cancelled), COUNT(AirTime), MAX(ActualElapsedTime) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 12"]}
-{"sql":"SELECT DestCityName, MIN(TotalAddGTime) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1342402 AND 1199603 AND TaxiIn NOT IN (3, 32, 29, -9999) OR DivAirports IN ('FSD', 'OMA', 'BTV') GROUP BY DestCityName LIMIT 8","hsqls":["SELECT DestCityName, MIN(TotalAddGTime) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs__MV1 BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs__MV2 BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs__MV3 BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs__MV4 BETWEEN 1342402 AND 1199603) AND TaxiIn NOT IN (3, 32, 29, -9999) OR (DivAirports__MV0 IN ('FSD', 'OMA', 'BTV') OR DivAirports__MV1 IN ('FSD', 'OMA', 'BTV') OR DivAirports__MV2 IN ('FSD', 'OMA', 'BTV') OR DivAirports__MV3 IN ('FSD', 'OMA', 'BTV') OR DivAirports__MV4 IN ('FSD', 'OMA', 'BTV')) GROUP BY DestCityName LIMIT 10000"]}
+{"sql":"SELECT DestCityName, MIN(TotalAddGTime) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1342402 AND 1199603 AND TaxiIn NOT IN (3, 32, 29, -9999) OR DivAirports IN ('FSD', 'OMA', 'BTV') GROUP BY DestCityName LIMIT 8","hsqls":["SELECT DestCityName, MIN(TotalAddGTime) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs[2] BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs[3] BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs[4] BETWEEN 1342402 AND 1199603 OR DivAirportSeqIDs[5] BETWEEN 1342402 AND 1199603) AND TaxiIn NOT IN (3, 32, 29, -9999) OR (DivAirports[1] IN ('FSD', 'OMA', 'BTV') OR DivAirports[2] IN ('FSD', 'OMA', 'BTV') OR DivAirports[3] IN ('FSD', 'OMA', 'BTV') OR DivAirports[4] IN ('FSD', 'OMA', 'BTV') OR DivAirports[5] IN ('FSD', 'OMA', 'BTV')) GROUP BY DestCityName LIMIT 10000"]}
 {"sql":"SELECT Origin, CRSElapsedTime FROM mytable ORDER BY DivReachedDest, CRSArrTime, DepDel15 LIMIT 16"}
 {"sql":"SELECT CancellationCode, DayOfWeek, OriginStateName FROM mytable WHERE ArrTime NOT IN (1110, 729) LIMIT 20"}
 {"sql":"SELECT WheelsOff, CancellationCode, WheelsOn FROM mytable WHERE DayofMonth IN (7, 5, 22, 27, 11) ORDER BY NASDelay LIMIT 23"}
 {"sql":"SELECT ActualElapsedTime, DestAirportID FROM mytable ORDER BY DepDelayMinutes, ArrTime LIMIT 2"}
 {"sql":"SELECT SUM(DestCityMarketID) FROM mytable LIMIT 1"}
-{"sql":"SELECT FlightDate, COUNT(CRSArrTime) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DayOfWeek BETWEEN 6 AND 1 GROUP BY FlightDate LIMIT 18","hsqls":["SELECT FlightDate, COUNT(CRSArrTime) FROM mytable WHERE Month BETWEEN 1 AND 1 AND DayOfWeek BETWEEN 6 AND 1 GROUP BY FlightDate LIMIT 18"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums IN ('N393HA', 'N284JB') OR DivActualElapsedTime BETWEEN 290 AND 474 LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums__MV0 IN ('N393HA', 'N284JB') OR DivTailNums__MV1 IN ('N393HA', 'N284JB') OR DivTailNums__MV2 IN ('N393HA', 'N284JB') OR DivTailNums__MV3 IN ('N393HA', 'N284JB') OR DivTailNums__MV4 IN ('N393HA', 'N284JB')) OR DivActualElapsedTime BETWEEN 290 AND 474 LIMIT 10000"]}
+{"sql":"SELECT FlightDate, COUNT(CRSArrTime) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND DayOfWeek BETWEEN 6 AND 1 GROUP BY FlightDate LIMIT 18","hsqls":["SELECT FlightDate, COUNT(CRSArrTime) FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND DayOfWeek BETWEEN 6 AND 1 GROUP BY FlightDate LIMIT 18"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums IN ('N393HA', 'N284JB') OR DivActualElapsedTime BETWEEN 290 AND 474 LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums[1] IN ('N393HA', 'N284JB') OR DivTailNums[2] IN ('N393HA', 'N284JB') OR DivTailNums[3] IN ('N393HA', 'N284JB') OR DivTailNums[4] IN ('N393HA', 'N284JB') OR DivTailNums[5] IN ('N393HA', 'N284JB')) OR DivActualElapsedTime BETWEEN 290 AND 474 LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DestCityName FROM mytable ORDER BY DayOfWeek LIMIT 18"}
 {"sql":"SELECT Origin, OriginStateName FROM mytable ORDER BY DepDelayMinutes LIMIT 4"}
-{"sql":"SELECT DepDelay, COUNT(OriginStateFips), SUM(\"Month\") FROM mytable WHERE Diverted IN (1, 0) GROUP BY DepDelay LIMIT 24","hsqls":["SELECT DepDelay, COUNT(OriginStateFips), SUM(Month) FROM mytable WHERE Diverted IN (1, 0) GROUP BY DepDelay LIMIT 24"]}
+{"sql":"SELECT DepDelay, COUNT(OriginStateFips), SUM(\"Month\") FROM mytable WHERE Diverted IN (1, 0) GROUP BY DepDelay LIMIT 24","hsqls":["SELECT DepDelay, COUNT(OriginStateFips), SUM(`Month`) FROM mytable WHERE Diverted IN (1, 0) GROUP BY DepDelay LIMIT 24"]}
 {"sql":"SELECT DepTime, OriginStateName, MAX(DaysSinceEpoch), MIN(DivDistance) FROM mytable WHERE DestStateFips BETWEEN 20 AND 31 OR CRSArrTime BETWEEN 1656 AND 1849 GROUP BY DepTime, OriginStateName","hsqls":["SELECT DepTime, OriginStateName, MAX(DaysSinceEpoch), MIN(DivDistance) FROM mytable WHERE DestStateFips BETWEEN 20 AND 31 OR CRSArrTime BETWEEN 1656 AND 1849 GROUP BY DepTime, OriginStateName"]}
 {"sql":"SELECT Cancelled FROM mytable WHERE TaxiOut <= 7 AND CancellationCode BETWEEN 'noodles' AND 'noodles' AND OriginAirportID < 11146 LIMIT 8"}
 {"sql":"SELECT DepDelay, TotalAddGTime, Origin FROM mytable WHERE CRSArrTime > 942 OR OriginAirportID < 11076 ORDER BY FlightDate, DestCityMarketID LIMIT 21"}
@@ -7138,57 +7138,57 @@
 {"sql":"SELECT Diverted, TotalAddGTime FROM mytable WHERE DepTime <= 1126 LIMIT 25"}
 {"sql":"SELECT DepartureDelayGroups, COUNT(Cancelled) FROM mytable WHERE LongestAddGTime BETWEEN 31 AND 58 AND DepTimeBlk BETWEEN '1300-1359' AND '0900-0959' OR CRSElapsedTime BETWEEN 120 AND 210 GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 13","hsqls":["SELECT DepartureDelayGroups, COUNT(Cancelled) FROM mytable WHERE LongestAddGTime BETWEEN 31 AND 58 AND DepTimeBlk BETWEEN '1300-1359' AND '0900-0959' OR CRSElapsedTime BETWEEN 120 AND 210 GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 13"]}
 {"sql":"SELECT DivDistance, OriginWac, MIN(ActualElapsedTime), SUM(DepDelay) FROM mytable WHERE Distance BETWEEN 1129 AND 2521 AND ArrDelay BETWEEN 414.0 AND 40.0 GROUP BY DivDistance, OriginWac  ORDER BY DivDistance, OriginWac LIMIT 9","hsqls":["SELECT DivDistance, OriginWac, MIN(ActualElapsedTime), SUM(DepDelay) FROM mytable WHERE Distance BETWEEN 1129 AND 2521 AND ArrDelay BETWEEN 414.0 AND 40.0 GROUP BY DivDistance, OriginWac  ORDER BY DivDistance, OriginWac LIMIT 9"]}
-{"sql":"SELECT TaxiOut, SecurityDelay, TailNum FROM mytable WHERE TotalAddGTime NOT IN (63, 37) OR DivLongestGTimes IN (20.0, 18.0, 44.0, 96.0, 70.0) OR Quarter IN (1) ORDER BY WeatherDelay, DepTimeBlk LIMIT 26","hsqls":["SELECT TaxiOut, SecurityDelay, TailNum FROM mytable WHERE TotalAddGTime NOT IN (63, 37) OR (DivLongestGTimes__MV0 IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes__MV1 IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes__MV2 IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes__MV3 IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes__MV4 IN (20.0, 18.0, 44.0, 96.0, 70.0)) OR Quarter IN (1) ORDER BY WeatherDelay, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DivAirports, DepDelayMinutes FROM mytable WHERE Flights IN (1) OR OriginStateName BETWEEN 'Tennessee' AND 'North Carolina' ORDER BY WeatherDelay, DestCityName LIMIT 26","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepDelayMinutes FROM mytable WHERE Flights IN (1) OR OriginStateName BETWEEN 'Tennessee' AND 'North Carolina' ORDER BY WeatherDelay, DestCityName LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, SecurityDelay, TailNum FROM mytable WHERE TotalAddGTime NOT IN (63, 37) OR DivLongestGTimes IN (20.0, 18.0, 44.0, 96.0, 70.0) OR Quarter IN (1) ORDER BY WeatherDelay, DepTimeBlk LIMIT 26","hsqls":["SELECT TaxiOut, SecurityDelay, TailNum FROM mytable WHERE TotalAddGTime NOT IN (63, 37) OR (DivLongestGTimes[1] IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes[2] IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes[3] IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes[4] IN (20.0, 18.0, 44.0, 96.0, 70.0) OR DivLongestGTimes[5] IN (20.0, 18.0, 44.0, 96.0, 70.0)) OR Quarter IN (1) ORDER BY WeatherDelay, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DepDelayMinutes FROM mytable WHERE Flights IN (1) OR OriginStateName BETWEEN 'Tennessee' AND 'North Carolina' ORDER BY WeatherDelay, DestCityName LIMIT 26","hsqls":["SELECT DivAirports, DepDelayMinutes FROM mytable WHERE Flights IN (1) OR OriginStateName BETWEEN 'Tennessee' AND 'North Carolina' ORDER BY WeatherDelay, DestCityName LIMIT 10000"]}
 {"sql":"SELECT NASDelay, DayOfWeek, MIN(ActualElapsedTime) FROM mytable GROUP BY NASDelay, DayOfWeek  ORDER BY NASDelay, DayOfWeek LIMIT 1","hsqls":["SELECT NASDelay, DayOfWeek, MIN(ActualElapsedTime) FROM mytable GROUP BY NASDelay, DayOfWeek  ORDER BY NASDelay, DayOfWeek LIMIT 1"]}
 {"sql":"SELECT DestWac FROM mytable WHERE CRSDepTime NOT IN (1132, 1312) AND UniqueCarrier < 'US' AND OriginCityMarketID < 30868 LIMIT 7"}
 {"sql":"SELECT DepDelayMinutes, OriginCityMarketID, TaxiIn, SUM(Distance), MIN(ArrTime) FROM mytable GROUP BY DepDelayMinutes, OriginCityMarketID, TaxiIn  ORDER BY DepDelayMinutes, OriginCityMarketID, TaxiIn LIMIT 22","hsqls":["SELECT DepDelayMinutes, OriginCityMarketID, TaxiIn, SUM(Distance), MIN(ArrTime) FROM mytable GROUP BY DepDelayMinutes, OriginCityMarketID, TaxiIn  ORDER BY DepDelayMinutes, OriginCityMarketID, TaxiIn LIMIT 22"]}
 {"sql":"SELECT \"Year\", Distance, ArrTimeBlk FROM mytable ORDER BY TaxiIn, ArrTime LIMIT 16","hsqls":["SELECT Year, Distance, ArrTimeBlk FROM mytable ORDER BY TaxiIn, ArrTime LIMIT 16"]}
 {"sql":"SELECT OriginAirportSeqID, Cancelled FROM mytable WHERE ArrTime BETWEEN 2338 AND 2113 OR OriginCityName IN ('Hancock/Houghton, MI', 'Lubbock, TX', 'Lexington, KY', 'Atlanta, GA') OR TotalAddGTime <> 27 ORDER BY DepDelay, DestAirportSeqID, TaxiIn LIMIT 18"}
-{"sql":"SELECT DivWheelsOns, CRSElapsedTime FROM mytable WHERE DestCityName IN ('Casper, WY', 'Dallas/Fort Worth, TX', 'Fort Smith, AR', 'Topeka, KS', 'Ketchikan, AK') OR DepDelay >= 329.0 ORDER BY DaysSinceEpoch LIMIT 29","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, CRSElapsedTime FROM mytable WHERE DestCityName IN ('Casper, WY', 'Dallas/Fort Worth, TX', 'Fort Smith, AR', 'Topeka, KS', 'Ketchikan, AK') OR DepDelay >= 329.0 ORDER BY DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, CRSElapsedTime FROM mytable WHERE DestCityName IN ('Casper, WY', 'Dallas/Fort Worth, TX', 'Fort Smith, AR', 'Topeka, KS', 'Ketchikan, AK') OR DepDelay >= 329.0 ORDER BY DaysSinceEpoch LIMIT 29","hsqls":["SELECT DivWheelsOns, CRSElapsedTime FROM mytable WHERE DestCityName IN ('Casper, WY', 'Dallas/Fort Worth, TX', 'Fort Smith, AR', 'Topeka, KS', 'Ketchikan, AK') OR DepDelay >= 329.0 ORDER BY DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, AirlineID FROM mytable WHERE DestAirportSeqID BETWEEN 1014602 AND 1153703 AND OriginAirportID <> 10185 ORDER BY WheelsOn LIMIT 2"}
 {"sql":"SELECT OriginAirportSeqID, LongestAddGTime, DestAirportSeqID FROM mytable ORDER BY DayOfWeek LIMIT 9"}
 {"sql":"SELECT COUNT(DayofMonth), COUNT(OriginCityName), COUNT(TailNum) FROM mytable LIMIT 5"}
-{"sql":"SELECT WheelsOff, DivReachedDest, DivAirports FROM mytable ORDER BY ArrDelay LIMIT 27","hsqls":["SELECT WheelsOff, DivReachedDest, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY ArrDelay LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, MIN(TaxiIn), SUM(ArrDelay), SUM(DivActualElapsedTime) FROM mytable WHERE DivWheelsOns IN (2341, 140, 2339) AND DivTailNums IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR NASDelay IN (234, 27) GROUP BY LongestAddGTime LIMIT 10","hsqls":["SELECT LongestAddGTime, MIN(TaxiIn), SUM(ArrDelay), SUM(DivActualElapsedTime) FROM mytable WHERE (DivWheelsOns__MV0 IN (2341, 140, 2339) OR DivWheelsOns__MV1 IN (2341, 140, 2339) OR DivWheelsOns__MV2 IN (2341, 140, 2339) OR DivWheelsOns__MV3 IN (2341, 140, 2339) OR DivWheelsOns__MV4 IN (2341, 140, 2339)) AND (DivTailNums__MV0 IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums__MV1 IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums__MV2 IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums__MV3 IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums__MV4 IN ('N8328A', 'N16183', 'N3758Y', 'N8622A')) OR NASDelay IN (234, 27) GROUP BY LongestAddGTime LIMIT 10000"]}
-{"sql":"SELECT CancellationCode, DaysSinceEpoch FROM mytable WHERE DivAirports <= 'LAS' ORDER BY OriginCityName, NASDelay, DayofMonth LIMIT 9","hsqls":["SELECT CancellationCode, DaysSinceEpoch FROM mytable WHERE (DivAirports__MV0 <= 'LAS' OR DivAirports__MV1 <= 'LAS' OR DivAirports__MV2 <= 'LAS' OR DivAirports__MV3 <= 'LAS' OR DivAirports__MV4 <= 'LAS') ORDER BY OriginCityName, NASDelay, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivReachedDest, DivAirports FROM mytable ORDER BY ArrDelay LIMIT 27","hsqls":["SELECT WheelsOff, DivReachedDest, DivAirports FROM mytable ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, MIN(TaxiIn), SUM(ArrDelay), SUM(DivActualElapsedTime) FROM mytable WHERE DivWheelsOns IN (2341, 140, 2339) AND DivTailNums IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR NASDelay IN (234, 27) GROUP BY LongestAddGTime LIMIT 10","hsqls":["SELECT LongestAddGTime, MIN(TaxiIn), SUM(ArrDelay), SUM(DivActualElapsedTime) FROM mytable WHERE (DivWheelsOns[1] IN (2341, 140, 2339) OR DivWheelsOns[2] IN (2341, 140, 2339) OR DivWheelsOns[3] IN (2341, 140, 2339) OR DivWheelsOns[4] IN (2341, 140, 2339) OR DivWheelsOns[5] IN (2341, 140, 2339)) AND (DivTailNums[1] IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums[2] IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums[3] IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums[4] IN ('N8328A', 'N16183', 'N3758Y', 'N8622A') OR DivTailNums[5] IN ('N8328A', 'N16183', 'N3758Y', 'N8622A')) OR NASDelay IN (234, 27) GROUP BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT CancellationCode, DaysSinceEpoch FROM mytable WHERE DivAirports <= 'LAS' ORDER BY OriginCityName, NASDelay, DayofMonth LIMIT 9","hsqls":["SELECT CancellationCode, DaysSinceEpoch FROM mytable WHERE (DivAirports[1] <= 'LAS' OR DivAirports[2] <= 'LAS' OR DivAirports[3] <= 'LAS' OR DivAirports[4] <= 'LAS' OR DivAirports[5] <= 'LAS') ORDER BY OriginCityName, NASDelay, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT OriginState, Carrier, COUNT(*) FROM mytable GROUP BY OriginState, Carrier  ORDER BY OriginState, Carrier LIMIT 20","hsqls":["SELECT OriginState, Carrier, COUNT(*) FROM mytable GROUP BY OriginState, Carrier  ORDER BY OriginState, Carrier LIMIT 20"]}
-{"sql":"SELECT Quarter, MAX(\"Year\"), SUM(Flights), SUM(DivDistance) FROM mytable WHERE LateAircraftDelay IN (221, 182, 138, 373) AND FirstDepTime BETWEEN 1040 AND 731 GROUP BY Quarter LIMIT 22","hsqls":["SELECT Quarter, MAX(Year), SUM(Flights), SUM(DivDistance) FROM mytable WHERE LateAircraftDelay IN (221, 182, 138, 373) AND FirstDepTime BETWEEN 1040 AND 731 GROUP BY Quarter LIMIT 22"]}
+{"sql":"SELECT Quarter, MAX(\"Year\"), SUM(Flights), SUM(DivDistance) FROM mytable WHERE LateAircraftDelay IN (221, 182, 138, 373) AND FirstDepTime BETWEEN 1040 AND 731 GROUP BY Quarter LIMIT 22","hsqls":["SELECT Quarter, MAX(`Year`), SUM(Flights), SUM(DivDistance) FROM mytable WHERE LateAircraftDelay IN (221, 182, 138, 373) AND FirstDepTime BETWEEN 1040 AND 731 GROUP BY Quarter LIMIT 22"]}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE FlightDate NOT IN ('2014-01-27', '2014-01-18', '2014-01-15', '2014-01-11', '2014-01-10') ORDER BY DivReachedDest, DivDistance, CRSArrTime LIMIT 22"}
-{"sql":"SELECT OriginStateFips, \"Month\" FROM mytable LIMIT 3","hsqls":["SELECT OriginStateFips, Month FROM mytable LIMIT 3"]}
+{"sql":"SELECT OriginStateFips, \"Month\" FROM mytable LIMIT 3","hsqls":["SELECT OriginStateFips, `Month` FROM mytable LIMIT 3"]}
 {"sql":"SELECT OriginAirportSeqID, Diverted, DepTimeBlk, COUNT(CRSDepTime), MAX(OriginAirportID) FROM mytable GROUP BY OriginAirportSeqID, Diverted, DepTimeBlk  ORDER BY OriginAirportSeqID, Diverted, DepTimeBlk LIMIT 1","hsqls":["SELECT OriginAirportSeqID, Diverted, DepTimeBlk, COUNT(CRSDepTime), MAX(OriginAirportID) FROM mytable GROUP BY OriginAirportSeqID, Diverted, DepTimeBlk  ORDER BY OriginAirportSeqID, Diverted, DepTimeBlk LIMIT 1"]}
-{"sql":"SELECT DepDel15, DestStateName, DivArrDelay, COUNT(ArrDelayMinutes), COUNT(Dest), COUNT(\"Year\") FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'U.S. Pacific Trust Territories and Possessions' OR \"Month\" <= 1 OR DivTailNums IN ('N658CT') GROUP BY DepDel15, DestStateName, DivArrDelay LIMIT 8","hsqls":["SELECT DepDel15, DestStateName, DivArrDelay, COUNT(ArrDelayMinutes), COUNT(Dest), COUNT(Year) FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'U.S. Pacific Trust Territories and Possessions' OR Month <= 1 OR (DivTailNums__MV0 IN ('N658CT') OR DivTailNums__MV1 IN ('N658CT') OR DivTailNums__MV2 IN ('N658CT') OR DivTailNums__MV3 IN ('N658CT') OR DivTailNums__MV4 IN ('N658CT')) GROUP BY DepDel15, DestStateName, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes > 3.0 AND OriginWac BETWEEN 91 AND 42 LIMIT 1","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 > 3.0 OR DivLongestGTimes__MV1 > 3.0 OR DivLongestGTimes__MV2 > 3.0 OR DivLongestGTimes__MV3 > 3.0 OR DivLongestGTimes__MV4 > 3.0) AND OriginWac BETWEEN 91 AND 42 LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DestStateName, DivArrDelay, COUNT(ArrDelayMinutes), COUNT(Dest), COUNT(\"Year\") FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'U.S. Pacific Trust Territories and Possessions' OR \"Month\" <= 1 OR DivTailNums IN ('N658CT') GROUP BY DepDel15, DestStateName, DivArrDelay LIMIT 8","hsqls":["SELECT DepDel15, DestStateName, DivArrDelay, COUNT(ArrDelayMinutes), COUNT(Dest), COUNT(`Year`) FROM mytable WHERE OriginStateName BETWEEN 'Ohio' AND 'U.S. Pacific Trust Territories and Possessions' OR `Month` <= 1 OR (DivTailNums[1] IN ('N658CT') OR DivTailNums[2] IN ('N658CT') OR DivTailNums[3] IN ('N658CT') OR DivTailNums[4] IN ('N658CT') OR DivTailNums[5] IN ('N658CT')) GROUP BY DepDel15, DestStateName, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes > 3.0 AND OriginWac BETWEEN 91 AND 42 LIMIT 1","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] > 3.0 OR DivLongestGTimes[2] > 3.0 OR DivLongestGTimes[3] > 3.0 OR DivLongestGTimes[4] > 3.0 OR DivLongestGTimes[5] > 3.0) AND OriginWac BETWEEN 91 AND 42 LIMIT 10000"]}
 {"sql":"SELECT \"Year\", FlightDate, DivAirportLandings FROM mytable WHERE DepDel15 IN (1, -9999) AND WeatherDelay NOT IN (132, 205, 0) LIMIT 20","hsqls":["SELECT Year, FlightDate, DivAirportLandings FROM mytable WHERE DepDel15 IN (1, -9999) AND WeatherDelay NOT IN (132, 205, 0) LIMIT 20"]}
-{"sql":"SELECT Distance, \"Month\" FROM mytable WHERE CRSDepTime = 1037 AND DivAirports IN ('MCN') ORDER BY \"Year\", Distance, SecurityDelay LIMIT 11","hsqls":["SELECT Distance, Month FROM mytable WHERE CRSDepTime = 1037 AND (DivAirports__MV0 IN ('MCN') OR DivAirports__MV1 IN ('MCN') OR DivAirports__MV2 IN ('MCN') OR DivAirports__MV3 IN ('MCN') OR DivAirports__MV4 IN ('MCN')) ORDER BY Year, Distance, SecurityDelay LIMIT 10000"]}
-{"sql":"SELECT ArrTimeBlk, DivArrDelay FROM mytable WHERE Carrier = 'B6' AND Diverted = 1 OR DivWheelsOffs IN (2148, 1109, 917, 2135) LIMIT 19","hsqls":["SELECT ArrTimeBlk, DivArrDelay FROM mytable WHERE Carrier = 'B6' AND Diverted = 1 OR (DivWheelsOffs__MV0 IN (2148, 1109, 917, 2135) OR DivWheelsOffs__MV1 IN (2148, 1109, 917, 2135) OR DivWheelsOffs__MV2 IN (2148, 1109, 917, 2135) OR DivWheelsOffs__MV3 IN (2148, 1109, 917, 2135) OR DivWheelsOffs__MV4 IN (2148, 1109, 917, 2135)) LIMIT 10000"]}
+{"sql":"SELECT Distance, \"Month\" FROM mytable WHERE CRSDepTime = 1037 AND DivAirports IN ('MCN') ORDER BY \"Year\", Distance, SecurityDelay LIMIT 11","hsqls":["SELECT Distance, `Month` FROM mytable WHERE CRSDepTime = 1037 AND (DivAirports[1] IN ('MCN') OR DivAirports[2] IN ('MCN') OR DivAirports[3] IN ('MCN') OR DivAirports[4] IN ('MCN') OR DivAirports[5] IN ('MCN')) ORDER BY Year, Distance, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DivArrDelay FROM mytable WHERE Carrier = 'B6' AND Diverted = 1 OR DivWheelsOffs IN (2148, 1109, 917, 2135) LIMIT 19","hsqls":["SELECT ArrTimeBlk, DivArrDelay FROM mytable WHERE Carrier = 'B6' AND Diverted = 1 OR (DivWheelsOffs[1] IN (2148, 1109, 917, 2135) OR DivWheelsOffs[2] IN (2148, 1109, 917, 2135) OR DivWheelsOffs[3] IN (2148, 1109, 917, 2135) OR DivWheelsOffs[4] IN (2148, 1109, 917, 2135) OR DivWheelsOffs[5] IN (2148, 1109, 917, 2135)) LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DepTime BETWEEN 1321 AND 1115 AND OriginStateFips BETWEEN 13 AND 44 OR FlightDate >= '2014-01-06' ORDER BY DistanceGroup LIMIT 5"}
-{"sql":"SELECT DistanceGroup, ActualElapsedTime, NASDelay, COUNT(*) FROM mytable WHERE DivWheelsOns IN (2053, 842, 227, 1609, 23) AND DivWheelsOns BETWEEN 1027 AND 1142 GROUP BY DistanceGroup, ActualElapsedTime, NASDelay LIMIT 25","hsqls":["SELECT DistanceGroup, ActualElapsedTime, NASDelay, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 IN (2053, 842, 227, 1609, 23) OR DivWheelsOns__MV1 IN (2053, 842, 227, 1609, 23) OR DivWheelsOns__MV2 IN (2053, 842, 227, 1609, 23) OR DivWheelsOns__MV3 IN (2053, 842, 227, 1609, 23) OR DivWheelsOns__MV4 IN (2053, 842, 227, 1609, 23)) AND (DivWheelsOns__MV0 BETWEEN 1027 AND 1142 OR DivWheelsOns__MV1 BETWEEN 1027 AND 1142 OR DivWheelsOns__MV2 BETWEEN 1027 AND 1142 OR DivWheelsOns__MV3 BETWEEN 1027 AND 1142 OR DivWheelsOns__MV4 BETWEEN 1027 AND 1142) GROUP BY DistanceGroup, ActualElapsedTime, NASDelay LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, TotalAddGTime, DivTailNums FROM mytable WHERE Origin <= 'CHS' AND DestState >= 'HI' ORDER BY OriginAirportSeqID, ArrTime, DivArrDelay LIMIT 28","hsqls":["SELECT FirstDepTime, TotalAddGTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Origin <= 'CHS' AND DestState >= 'HI' ORDER BY OriginAirportSeqID, ArrTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, ActualElapsedTime, NASDelay, COUNT(*) FROM mytable WHERE DivWheelsOns IN (2053, 842, 227, 1609, 23) AND DivWheelsOns BETWEEN 1027 AND 1142 GROUP BY DistanceGroup, ActualElapsedTime, NASDelay LIMIT 25","hsqls":["SELECT DistanceGroup, ActualElapsedTime, NASDelay, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] IN (2053, 842, 227, 1609, 23) OR DivWheelsOns[2] IN (2053, 842, 227, 1609, 23) OR DivWheelsOns[3] IN (2053, 842, 227, 1609, 23) OR DivWheelsOns[4] IN (2053, 842, 227, 1609, 23) OR DivWheelsOns[5] IN (2053, 842, 227, 1609, 23)) AND (DivWheelsOns[1] BETWEEN 1027 AND 1142 OR DivWheelsOns[2] BETWEEN 1027 AND 1142 OR DivWheelsOns[3] BETWEEN 1027 AND 1142 OR DivWheelsOns[4] BETWEEN 1027 AND 1142 OR DivWheelsOns[5] BETWEEN 1027 AND 1142) GROUP BY DistanceGroup, ActualElapsedTime, NASDelay LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, TotalAddGTime, DivTailNums FROM mytable WHERE Origin <= 'CHS' AND DestState >= 'HI' ORDER BY OriginAirportSeqID, ArrTime, DivArrDelay LIMIT 28","hsqls":["SELECT FirstDepTime, TotalAddGTime, DivTailNums FROM mytable WHERE Origin <= 'CHS' AND DestState >= 'HI' ORDER BY OriginAirportSeqID, ArrTime, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, Dest, AirlineID FROM mytable ORDER BY DepTime, DestStateName LIMIT 27"}
 {"sql":"SELECT Origin, CRSDepTime, DivArrDelay FROM mytable WHERE AirlineID NOT IN (20437, 20409, 21171) OR OriginWac IN (41, 51, 33, 39, 37) LIMIT 9"}
 {"sql":"SELECT DestCityMarketID, AVG(ArrTime), SUM(LateAircraftDelay), AVG(Distance) FROM mytable WHERE NASDelay IN (16) AND Distance BETWEEN 144 AND 1269 OR ArrDelay <= 8.0 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 3","hsqls":["SELECT DestCityMarketID, AVG(ArrTime), SUM(LateAircraftDelay), AVG(Distance) FROM mytable WHERE NASDelay IN (16) AND Distance BETWEEN 144 AND 1269 OR ArrDelay <= 8.0 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 3"]}
-{"sql":"SELECT Distance, \"Month\" FROM mytable WHERE Dest = 'SGF' LIMIT 15","hsqls":["SELECT Distance, Month FROM mytable WHERE Dest = 'SGF' LIMIT 15"]}
+{"sql":"SELECT Distance, \"Month\" FROM mytable WHERE Dest = 'SGF' LIMIT 15","hsqls":["SELECT Distance, `Month` FROM mytable WHERE Dest = 'SGF' LIMIT 15"]}
 {"sql":"SELECT ArrTime, DestCityMarketID, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DestAirportID NOT IN (14674, 10721, 13256, 10990, 11471) AND DepTime <= 2046 AND OriginStateName IN ('Indiana', 'Rhode Island', 'Washington', 'Nebraska') GROUP BY ArrTime, DestCityMarketID, DaysSinceEpoch  ORDER BY ArrTime, DestCityMarketID, DaysSinceEpoch LIMIT 2","hsqls":["SELECT ArrTime, DestCityMarketID, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DestAirportID NOT IN (14674, 10721, 13256, 10990, 11471) AND DepTime <= 2046 AND OriginStateName IN ('Indiana', 'Rhode Island', 'Washington', 'Nebraska') GROUP BY ArrTime, DestCityMarketID, DaysSinceEpoch  ORDER BY ArrTime, DestCityMarketID, DaysSinceEpoch LIMIT 2"]}
 {"sql":"SELECT COUNT(Flights), MIN(OriginStateFips), COUNT(DivArrDelay) FROM mytable WHERE ActualElapsedTime BETWEEN 176 AND 287 LIMIT 14"}
-{"sql":"SELECT \"Year\" FROM mytable LIMIT 4","hsqls":["SELECT Year FROM mytable LIMIT 4"]}
+{"sql":"SELECT \"Year\" FROM mytable LIMIT 4","hsqls":["SELECT `Year` FROM mytable LIMIT 4"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE OriginCityMarketID BETWEEN 30073 AND 33244 OR DestWac NOT IN (31, 23, 13) ORDER BY OriginStateFips, DestStateFips, DaysSinceEpoch LIMIT 11"}
 {"sql":"SELECT COUNT(WeatherDelay) FROM mytable WHERE DaysSinceEpoch IN (16099, 16072, 16088, 16093) LIMIT 9"}
-{"sql":"SELECT MIN(ArrDelay), MIN(\"Year\"), AVG(AirlineID) FROM mytable WHERE TotalAddGTime BETWEEN 54 AND 25 LIMIT 18","hsqls":["SELECT MIN(ArrDelay), MIN(Year), AVG(AirlineID) FROM mytable WHERE TotalAddGTime BETWEEN 54 AND 25 LIMIT 18"]}
-{"sql":"SELECT OriginState, Diverted, CRSDepTime, SUM(\"Year\"), COUNT(ArrDelay) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND SecurityDelay IN (0, 4, 14) OR LateAircraftDelay IN (82) GROUP BY OriginState, Diverted, CRSDepTime LIMIT 8","hsqls":["SELECT OriginState, Diverted, CRSDepTime, SUM(Year), COUNT(ArrDelay) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND SecurityDelay IN (0, 4, 14) OR LateAircraftDelay IN (82) GROUP BY OriginState, Diverted, CRSDepTime LIMIT 8"]}
-{"sql":"SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes) FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR DivTotalGTimes BETWEEN 57 AND 76","hsqls":["SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes)  FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR (DivTotalGTimes__MV0 BETWEEN 57 AND 76 OR DivTotalGTimes__MV1 BETWEEN 57 AND 76 OR DivTotalGTimes__MV2 BETWEEN 57 AND 76 OR DivTotalGTimes__MV3 BETWEEN 57 AND 76 OR DivTotalGTimes__MV4 BETWEEN 57 AND 76) LIMIT 10000"]}
+{"sql":"SELECT MIN(ArrDelay), MIN(\"Year\"), AVG(AirlineID) FROM mytable WHERE TotalAddGTime BETWEEN 54 AND 25 LIMIT 18","hsqls":["SELECT MIN(ArrDelay), MIN(`Year`), AVG(AirlineID) FROM mytable WHERE TotalAddGTime BETWEEN 54 AND 25 LIMIT 18"]}
+{"sql":"SELECT OriginState, Diverted, CRSDepTime, SUM(\"Year\"), COUNT(ArrDelay) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND SecurityDelay IN (0, 4, 14) OR LateAircraftDelay IN (82) GROUP BY OriginState, Diverted, CRSDepTime LIMIT 8","hsqls":["SELECT OriginState, Diverted, CRSDepTime, SUM(`Year`), COUNT(ArrDelay) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND SecurityDelay IN (0, 4, 14) OR LateAircraftDelay IN (82) GROUP BY OriginState, Diverted, CRSDepTime LIMIT 8"]}
+{"sql":"SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes) FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR DivTotalGTimes BETWEEN 57 AND 76","hsqls":["SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes)  FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR (DivTotalGTimes[1] BETWEEN 57 AND 76 OR DivTotalGTimes[2] BETWEEN 57 AND 76 OR DivTotalGTimes[3] BETWEEN 57 AND 76 OR DivTotalGTimes[4] BETWEEN 57 AND 76 OR DivTotalGTimes[5] BETWEEN 57 AND 76) LIMIT 10000"]}
 {"sql":"SELECT DestState, DestAirportSeqID, DivAirportLandings FROM mytable WHERE FirstDepTime IN (1119, 1639) OR SecurityDelay IN (10, 0, 4, 18, 14) AND OriginAirportID BETWEEN 12884 AND 10781 ORDER BY Carrier, Dest LIMIT 4"}
 {"sql":"SELECT \"Year\", DestStateName, MIN(CRSDepTime), AVG(TaxiIn) FROM mytable GROUP BY \"Year\", DestStateName LIMIT 10","hsqls":["SELECT Year, DestStateName, MIN(CRSDepTime), AVG(TaxiIn) FROM mytable GROUP BY Year, DestStateName LIMIT 10"]}
 {"sql":"SELECT FlightNum, DestAirportID, CRSElapsedTime FROM mytable WHERE DestCityMarketID NOT IN (32884, 30894, 31471, 30155, 33873) AND OriginStateName BETWEEN 'Iowa' AND 'Kansas' ORDER BY DepDel15 LIMIT 6"}
-{"sql":"SELECT ArrDelayMinutes, CRSElapsedTime, DivTotalGTimes FROM mytable WHERE OriginState BETWEEN 'NE' AND 'MN' AND DivDistance BETWEEN 176 AND 406 LIMIT 5","hsqls":["SELECT ArrDelayMinutes, CRSElapsedTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginState BETWEEN 'NE' AND 'MN' AND DivDistance BETWEEN 176 AND 406 LIMIT 10000"]}
-{"sql":"SELECT AirTime, SUM(DivAirportLandings), MAX(CRSArrTime) FROM mytable WHERE DepartureDelayGroups >= 0 AND WheelsOn IN (951) AND DivWheelsOffs <= 1505 GROUP BY AirTime LIMIT 10","hsqls":["SELECT AirTime, SUM(DivAirportLandings), MAX(CRSArrTime) FROM mytable WHERE DepartureDelayGroups >= 0 AND WheelsOn IN (951) AND (DivWheelsOffs__MV0 <= 1505 OR DivWheelsOffs__MV1 <= 1505 OR DivWheelsOffs__MV2 <= 1505 OR DivWheelsOffs__MV3 <= 1505 OR DivWheelsOffs__MV4 <= 1505) GROUP BY AirTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, CRSElapsedTime, DivTotalGTimes FROM mytable WHERE OriginState BETWEEN 'NE' AND 'MN' AND DivDistance BETWEEN 176 AND 406 LIMIT 5","hsqls":["SELECT ArrDelayMinutes, CRSElapsedTime, DivTotalGTimes FROM mytable WHERE OriginState BETWEEN 'NE' AND 'MN' AND DivDistance BETWEEN 176 AND 406 LIMIT 10000"]}
+{"sql":"SELECT AirTime, SUM(DivAirportLandings), MAX(CRSArrTime) FROM mytable WHERE DepartureDelayGroups >= 0 AND WheelsOn IN (951) AND DivWheelsOffs <= 1505 GROUP BY AirTime LIMIT 10","hsqls":["SELECT AirTime, SUM(DivAirportLandings), MAX(CRSArrTime) FROM mytable WHERE DepartureDelayGroups >= 0 AND WheelsOn IN (951) AND (DivWheelsOffs[1] <= 1505 OR DivWheelsOffs[2] <= 1505 OR DivWheelsOffs[3] <= 1505 OR DivWheelsOffs[4] <= 1505 OR DivWheelsOffs[5] <= 1505) GROUP BY AirTime LIMIT 10000"]}
 {"sql":"SELECT DestWac, AVG(DestAirportID) FROM mytable GROUP BY DestWac  ORDER BY DestWac LIMIT 2","hsqls":["SELECT DestWac, AVG(DestAirportID) FROM mytable GROUP BY DestWac  ORDER BY DestWac LIMIT 2"]}
 {"sql":"SELECT DepartureDelayGroups, CarrierDelay, DestCityName, COUNT(*) FROM mytable WHERE DivAirportLandings > 1 GROUP BY DepartureDelayGroups, CarrierDelay, DestCityName  ORDER BY DepartureDelayGroups, CarrierDelay, DestCityName LIMIT 2","hsqls":["SELECT DepartureDelayGroups, CarrierDelay, DestCityName, COUNT(*) FROM mytable WHERE DivAirportLandings > 1 GROUP BY DepartureDelayGroups, CarrierDelay, DestCityName  ORDER BY DepartureDelayGroups, CarrierDelay, DestCityName LIMIT 2"]}
-{"sql":"SELECT DepartureDelayGroups, DivAirportIDs, DepTimeBlk FROM mytable WHERE DistanceGroup BETWEEN 8 AND 7 ORDER BY DestWac, OriginCityName, DayOfWeek LIMIT 13","hsqls":["SELECT DepartureDelayGroups, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DepTimeBlk FROM mytable WHERE DistanceGroup BETWEEN 8 AND 7 ORDER BY DestWac, OriginCityName, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirportIDs, DepTimeBlk FROM mytable WHERE DistanceGroup BETWEEN 8 AND 7 ORDER BY DestWac, OriginCityName, DayOfWeek LIMIT 13","hsqls":["SELECT DepartureDelayGroups, DivAirportIDs, DepTimeBlk FROM mytable WHERE DistanceGroup BETWEEN 8 AND 7 ORDER BY DestWac, OriginCityName, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DestCityName, COUNT(*) FROM mytable WHERE DistanceGroup BETWEEN 8 AND 2 OR DaysSinceEpoch >= 16101 AND DivActualElapsedTime BETWEEN 569 AND 203 GROUP BY DestCityName  ORDER BY DestCityName LIMIT 21","hsqls":["SELECT DestCityName, COUNT(*) FROM mytable WHERE DistanceGroup BETWEEN 8 AND 2 OR DaysSinceEpoch >= 16101 AND DivActualElapsedTime BETWEEN 569 AND 203 GROUP BY DestCityName  ORDER BY DestCityName LIMIT 21"]}
-{"sql":"SELECT OriginAirportSeqID, ArrDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE Flights < 1 AND DivLongestGTimes BETWEEN 34.0 AND 95.0 GROUP BY OriginAirportSeqID, ArrDelay, UniqueCarrier LIMIT 13","hsqls":["SELECT OriginAirportSeqID, ArrDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE Flights < 1 AND (DivLongestGTimes__MV0 BETWEEN 34.0 AND 95.0 OR DivLongestGTimes__MV1 BETWEEN 34.0 AND 95.0 OR DivLongestGTimes__MV2 BETWEEN 34.0 AND 95.0 OR DivLongestGTimes__MV3 BETWEEN 34.0 AND 95.0 OR DivLongestGTimes__MV4 BETWEEN 34.0 AND 95.0) GROUP BY OriginAirportSeqID, ArrDelay, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT AVG(DepDelayMinutes) FROM mytable WHERE \"Month\" >= 1 AND AirlineID IN (19790) LIMIT 29","hsqls":["SELECT AVG(DepDelayMinutes) FROM mytable WHERE Month >= 1 AND AirlineID IN (19790) LIMIT 29"]}
-{"sql":"SELECT WheelsOff, TotalAddGTime, \"Month\" FROM mytable ORDER BY OriginState LIMIT 24","hsqls":["SELECT WheelsOff, TotalAddGTime, Month FROM mytable ORDER BY OriginState LIMIT 24"]}
+{"sql":"SELECT OriginAirportSeqID, ArrDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE Flights < 1 AND DivLongestGTimes BETWEEN 34.0 AND 95.0 GROUP BY OriginAirportSeqID, ArrDelay, UniqueCarrier LIMIT 13","hsqls":["SELECT OriginAirportSeqID, ArrDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE Flights < 1 AND (DivLongestGTimes[1] BETWEEN 34.0 AND 95.0 OR DivLongestGTimes[2] BETWEEN 34.0 AND 95.0 OR DivLongestGTimes[3] BETWEEN 34.0 AND 95.0 OR DivLongestGTimes[4] BETWEEN 34.0 AND 95.0 OR DivLongestGTimes[5] BETWEEN 34.0 AND 95.0) GROUP BY OriginAirportSeqID, ArrDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT AVG(DepDelayMinutes) FROM mytable WHERE \"Month\" >= 1 AND AirlineID IN (19790) LIMIT 29","hsqls":["SELECT AVG(DepDelayMinutes) FROM mytable WHERE `Month` >= 1 AND AirlineID IN (19790) LIMIT 29"]}
+{"sql":"SELECT WheelsOff, TotalAddGTime, \"Month\" FROM mytable ORDER BY OriginState LIMIT 24","hsqls":["SELECT WheelsOff, TotalAddGTime, `Month` FROM mytable ORDER BY OriginState LIMIT 24"]}
 {"sql":"SELECT TailNum, SUM(ArrDel15) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 5","hsqls":["SELECT TailNum, SUM(ArrDel15) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 5"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE Flights >= 1 ORDER BY DepDel15, AirlineID LIMIT 18"}
 {"sql":"SELECT DestState, LongestAddGTime, DestStateFips FROM mytable WHERE DestCityName <= 'Fort Smith, AR' OR Diverted BETWEEN 1 AND 0 ORDER BY WeatherDelay, ArrTime, NASDelay LIMIT 9"}
@@ -7202,22 +7202,22 @@
 {"sql":"SELECT AVG(DestAirportSeqID), AVG(CRSElapsedTime), AVG(DepDelay) FROM mytable WHERE CancellationCode <= 'noodles' LIMIT 10"}
 {"sql":"SELECT ActualElapsedTime, \"Month\", DivActualElapsedTime FROM mytable WHERE CarrierDelay IN (80) OR DestStateName <= 'Tennessee' LIMIT 21","hsqls":["SELECT ActualElapsedTime, Month, DivActualElapsedTime FROM mytable WHERE CarrierDelay IN (80) OR DestStateName <= 'Tennessee' LIMIT 21"]}
 {"sql":"SELECT Cancelled, Origin, ArrivalDelayGroups, MIN(Diverted), COUNT(UniqueCarrier) FROM mytable GROUP BY Cancelled, Origin, ArrivalDelayGroups","hsqls":["SELECT Cancelled, Origin, ArrivalDelayGroups, MIN(Diverted), COUNT(UniqueCarrier) FROM mytable GROUP BY Cancelled, Origin, ArrivalDelayGroups"]}
-{"sql":"SELECT DepDelay, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE Origin <= 'ALB' AND ArrDelay >= 996.0 LIMIT 15","hsqls":["SELECT DepDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Origin <= 'ALB' AND ArrDelay >= 996.0 LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE Origin <= 'ALB' AND ArrDelay >= 996.0 LIMIT 15","hsqls":["SELECT DepDelay, DivWheelsOffs, DivTotalGTimes FROM mytable WHERE Origin <= 'ALB' AND ArrDelay >= 996.0 LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, ArrivalDelayGroups, OriginStateName FROM mytable WHERE DivActualElapsedTime NOT IN (454, 568, 283) OR DivActualElapsedTime = 529 ORDER BY ArrDel15, DepTimeBlk, Origin LIMIT 21"}
 {"sql":"SELECT DepDelayMinutes, AVG(OriginWac), SUM(DestWac), AVG(DivArrDelay) FROM mytable WHERE SecurityDelay BETWEEN 18 AND -9999 AND WeatherDelay BETWEEN 112 AND 13 GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 28","hsqls":["SELECT DepDelayMinutes, AVG(OriginWac), SUM(DestWac), AVG(DivArrDelay) FROM mytable WHERE SecurityDelay BETWEEN 18 AND -9999 AND WeatherDelay BETWEEN 112 AND 13 GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 28"]}
-{"sql":"SELECT Origin, DivTotalGTimes, OriginStateName FROM mytable LIMIT 26","hsqls":["SELECT Origin, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, OriginStateName FROM mytable LIMIT 10000"]}
+{"sql":"SELECT Origin, DivTotalGTimes, OriginStateName FROM mytable LIMIT 26","hsqls":["SELECT Origin, DivTotalGTimes, OriginStateName FROM mytable LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime, SUM(WeatherDelay), MIN(DestAirportSeqID), MAX(DayOfWeek) FROM mytable WHERE WheelsOn BETWEEN 1939 AND 2335 OR Quarter NOT IN (1) GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 25","hsqls":["SELECT CRSDepTime, SUM(WeatherDelay), MIN(DestAirportSeqID), MAX(DayOfWeek) FROM mytable WHERE WheelsOn BETWEEN 1939 AND 2335 OR Quarter NOT IN (1) GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 25"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE TailNum < 'N36272' AND TotalAddGTime NOT IN (42) LIMIT 5"}
 {"sql":"SELECT DestAirportSeqID, DestAirportID, COUNT(ActualElapsedTime) FROM mytable WHERE DestAirportSeqID IN (1387102, 1410702, 1430702, 1104902, 1234302) AND Distance NOT IN (850, 589) GROUP BY DestAirportSeqID, DestAirportID  ORDER BY DestAirportSeqID, DestAirportID LIMIT 12","hsqls":["SELECT DestAirportSeqID, DestAirportID, COUNT(ActualElapsedTime) FROM mytable WHERE DestAirportSeqID IN (1387102, 1410702, 1430702, 1104902, 1234302) AND Distance NOT IN (850, 589) GROUP BY DestAirportSeqID, DestAirportID  ORDER BY DestAirportSeqID, DestAirportID LIMIT 12"]}
 {"sql":"SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 97 AND 480 AND DepTime < 1923 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 24","hsqls":["SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE DivDistance BETWEEN 97 AND 480 AND DepTime < 1923 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 24"]}
-{"sql":"SELECT OriginCityMarketID, DepTime, MIN(WeatherDelay), AVG(LongestAddGTime), MAX(TaxiIn) FROM mytable WHERE DivLongestGTimes <= 18.0 AND DestStateFips IN (48, 31, 17, 36, 53) AND Quarter IN (1) GROUP BY OriginCityMarketID, DepTime LIMIT 8","hsqls":["SELECT OriginCityMarketID, DepTime, MIN(WeatherDelay), AVG(LongestAddGTime), MAX(TaxiIn) FROM mytable WHERE (DivLongestGTimes__MV0 <= 18.0 OR DivLongestGTimes__MV1 <= 18.0 OR DivLongestGTimes__MV2 <= 18.0 OR DivLongestGTimes__MV3 <= 18.0 OR DivLongestGTimes__MV4 <= 18.0) AND DestStateFips IN (48, 31, 17, 36, 53) AND Quarter IN (1) GROUP BY OriginCityMarketID, DepTime LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DepTime, MIN(WeatherDelay), AVG(LongestAddGTime), MAX(TaxiIn) FROM mytable WHERE DivLongestGTimes <= 18.0 AND DestStateFips IN (48, 31, 17, 36, 53) AND Quarter IN (1) GROUP BY OriginCityMarketID, DepTime LIMIT 8","hsqls":["SELECT OriginCityMarketID, DepTime, MIN(WeatherDelay), AVG(LongestAddGTime), MAX(TaxiIn) FROM mytable WHERE (DivLongestGTimes[1] <= 18.0 OR DivLongestGTimes[2] <= 18.0 OR DivLongestGTimes[3] <= 18.0 OR DivLongestGTimes[4] <= 18.0 OR DivLongestGTimes[5] <= 18.0) AND DestStateFips IN (48, 31, 17, 36, 53) AND Quarter IN (1) GROUP BY OriginCityMarketID, DepTime LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, CancellationCode FROM mytable ORDER BY DestState, FirstDepTime, DestStateFips LIMIT 25"}
 {"sql":"SELECT Dest, Origin, DivAirportLandings, COUNT(*) FROM mytable GROUP BY Dest, Origin, DivAirportLandings  ORDER BY Dest, Origin, DivAirportLandings LIMIT 7","hsqls":["SELECT Dest, Origin, DivAirportLandings, COUNT(*) FROM mytable GROUP BY Dest, Origin, DivAirportLandings  ORDER BY Dest, Origin, DivAirportLandings LIMIT 7"]}
 {"sql":"SELECT MIN(Flights), SUM(WheelsOff) FROM mytable WHERE DayofMonth >= 12 OR DepDelayMinutes <= 171.0 OR Quarter BETWEEN 1 AND 1 LIMIT 10"}
-{"sql":"SELECT ActualElapsedTime FROM mytable WHERE DepartureDelayGroups IN (11) OR \"Year\" IN (2014) AND DepartureDelayGroups <> 0 ORDER BY OriginAirportSeqID, DaysSinceEpoch LIMIT 6","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE DepartureDelayGroups IN (11) OR Year IN (2014) AND DepartureDelayGroups <> 0 ORDER BY OriginAirportSeqID, DaysSinceEpoch LIMIT 6"]}
+{"sql":"SELECT ActualElapsedTime FROM mytable WHERE DepartureDelayGroups IN (11) OR \"Year\" IN (2014) AND DepartureDelayGroups <> 0 ORDER BY OriginAirportSeqID, DaysSinceEpoch LIMIT 6","hsqls":["SELECT ActualElapsedTime FROM mytable WHERE DepartureDelayGroups IN (11) OR `Year` IN (2014) AND DepartureDelayGroups <> 0 ORDER BY OriginAirportSeqID, DaysSinceEpoch LIMIT 6"]}
 {"sql":"SELECT AVG(OriginWac) FROM mytable WHERE ActualElapsedTime <> 262 LIMIT 17"}
-{"sql":"SELECT DestState, DivTailNums FROM mytable ORDER BY Carrier LIMIT 25","hsqls":["SELECT DestState, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY Carrier LIMIT 10000"]}
-{"sql":"SELECT Dest, WheelsOn, AVG(\"Year\") FROM mytable WHERE NASDelay BETWEEN 1 AND 36 GROUP BY Dest, WheelsOn LIMIT 24","hsqls":["SELECT Dest, WheelsOn, AVG(Year) FROM mytable WHERE NASDelay BETWEEN 1 AND 36 GROUP BY Dest, WheelsOn LIMIT 24"]}
+{"sql":"SELECT DestState, DivTailNums FROM mytable ORDER BY Carrier LIMIT 25","hsqls":["SELECT DestState, DivTailNums FROM mytable ORDER BY Carrier LIMIT 10000"]}
+{"sql":"SELECT Dest, WheelsOn, AVG(\"Year\") FROM mytable WHERE NASDelay BETWEEN 1 AND 36 GROUP BY Dest, WheelsOn LIMIT 24","hsqls":["SELECT Dest, WheelsOn, AVG(`Year`) FROM mytable WHERE NASDelay BETWEEN 1 AND 36 GROUP BY Dest, WheelsOn LIMIT 24"]}
 {"sql":"SELECT DestAirportSeqID, WheelsOn FROM mytable ORDER BY CRSElapsedTime LIMIT 28"}
 {"sql":"SELECT TailNum, SUM(DepDelay), AVG(WheelsOn) FROM mytable WHERE OriginStateName NOT IN ('Texas', 'Rhode Island') AND DivArrDelay NOT IN (145, 175, 167) GROUP BY TailNum  ORDER BY TailNum LIMIT 27","hsqls":["SELECT TailNum, SUM(DepDelay), AVG(WheelsOn) FROM mytable WHERE OriginStateName NOT IN ('Texas', 'Rhode Island') AND DivArrDelay NOT IN (145, 175, 167) GROUP BY TailNum  ORDER BY TailNum LIMIT 27"]}
 {"sql":"SELECT DestState, ArrDel15 FROM mytable WHERE DivDistance BETWEEN 251 AND 0 OR DepTime > 1157 ORDER BY FlightNum, TaxiIn LIMIT 15"}
@@ -7229,7 +7229,7 @@
 {"sql":"SELECT COUNT(TaxiOut) FROM mytable WHERE AirlineID > 20366 AND WeatherDelay BETWEEN 22 AND 205 AND DayofMonth > 23 LIMIT 6"}
 {"sql":"SELECT Carrier FROM mytable WHERE CarrierDelay BETWEEN 19 AND 99"}
 {"sql":"SELECT COUNT(Origin) FROM mytable WHERE OriginAirportID < 10170"}
-{"sql":"SELECT \"Year\", Flights, AVG(DivReachedDest), MAX(Quarter) FROM mytable WHERE DivArrDelay >= 235 AND \"Month\" > 1 AND OriginCityName BETWEEN 'Greer, SC' AND 'Nashville, TN' GROUP BY \"Year\", Flights LIMIT 10","hsqls":["SELECT Year, Flights, AVG(DivReachedDest), MAX(Quarter) FROM mytable WHERE DivArrDelay >= 235 AND Month > 1 AND OriginCityName BETWEEN 'Greer, SC' AND 'Nashville, TN' GROUP BY Year, Flights LIMIT 10"]}
+{"sql":"SELECT \"Year\", Flights, AVG(DivReachedDest), MAX(Quarter) FROM mytable WHERE DivArrDelay >= 235 AND \"Month\" > 1 AND OriginCityName BETWEEN 'Greer, SC' AND 'Nashville, TN' GROUP BY \"Year\", Flights LIMIT 10","hsqls":["SELECT Year, Flights, AVG(DivReachedDest), MAX(Quarter) FROM mytable WHERE DivArrDelay >= 235 AND `Month` > 1 AND OriginCityName BETWEEN 'Greer, SC' AND 'Nashville, TN' GROUP BY Year, Flights LIMIT 10"]}
 {"sql":"SELECT DestStateName, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 3 AND 4 OR OriginAirportSeqID IN (1200302, 1288903, 1470903) GROUP BY DestStateName, DivActualElapsedTime  ORDER BY DestStateName, DivActualElapsedTime LIMIT 24","hsqls":["SELECT DestStateName, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 3 AND 4 OR OriginAirportSeqID IN (1200302, 1288903, 1470903) GROUP BY DestStateName, DivActualElapsedTime  ORDER BY DestStateName, DivActualElapsedTime LIMIT 24"]}
 {"sql":"SELECT \"Year\", SecurityDelay, DivAirportLandings, SUM(DestCityMarketID) FROM mytable GROUP BY \"Year\", SecurityDelay, DivAirportLandings LIMIT 22","hsqls":["SELECT Year, SecurityDelay, DivAirportLandings, SUM(DestCityMarketID) FROM mytable GROUP BY Year, SecurityDelay, DivAirportLandings LIMIT 22"]}
 {"sql":"SELECT DivDistance, DestState, CRSDepTime, MIN(DepTime), AVG(DivArrDelay) FROM mytable WHERE DestCityName > 'Roanoke, VA' AND WeatherDelay <= 39 AND DistanceGroup <> 8 GROUP BY DivDistance, DestState, CRSDepTime  ORDER BY DivDistance, DestState, CRSDepTime LIMIT 21","hsqls":["SELECT DivDistance, DestState, CRSDepTime, MIN(DepTime), AVG(DivArrDelay) FROM mytable WHERE DestCityName > 'Roanoke, VA' AND WeatherDelay <= 39 AND DistanceGroup <> 8 GROUP BY DivDistance, DestState, CRSDepTime  ORDER BY DivDistance, DestState, CRSDepTime LIMIT 21"]}
@@ -7238,19 +7238,19 @@
 {"sql":"SELECT FlightDate, DepTimeBlk, SUM(LateAircraftDelay) FROM mytable WHERE DivAirportLandings >= 0 GROUP BY FlightDate, DepTimeBlk  ORDER BY FlightDate, DepTimeBlk LIMIT 25","hsqls":["SELECT FlightDate, DepTimeBlk, SUM(LateAircraftDelay) FROM mytable WHERE DivAirportLandings >= 0 GROUP BY FlightDate, DepTimeBlk  ORDER BY FlightDate, DepTimeBlk LIMIT 25"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE OriginStateName IN ('Alabama', 'West Virginia', 'Oklahoma', 'Florida') OR UniqueCarrier BETWEEN 'F9' AND 'F9' LIMIT 25"}
 {"sql":"SELECT Diverted, MAX(DayofMonth) FROM mytable WHERE OriginCityName BETWEEN 'Dallas/Fort Worth, TX' AND 'Harlingen/San Benito, TX' AND DepartureDelayGroups NOT IN (10) AND AirTime < 120 GROUP BY Diverted  ORDER BY Diverted LIMIT 4","hsqls":["SELECT Diverted, MAX(DayofMonth) FROM mytable WHERE OriginCityName BETWEEN 'Dallas/Fort Worth, TX' AND 'Harlingen/San Benito, TX' AND DepartureDelayGroups NOT IN (10) AND AirTime < 120 GROUP BY Diverted  ORDER BY Diverted LIMIT 4"]}
-{"sql":"SELECT DestStateFips, DepTime, DivAirportIDs FROM mytable WHERE ArrDel15 < 0 ORDER BY DestState, AirlineID LIMIT 19","hsqls":["SELECT DestStateFips, DepTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE ArrDel15 < 0 ORDER BY DestState, AirlineID LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DepTime, DivAirportIDs FROM mytable WHERE ArrDel15 < 0 ORDER BY DestState, AirlineID LIMIT 19","hsqls":["SELECT DestStateFips, DepTime, DivAirportIDs FROM mytable WHERE ArrDel15 < 0 ORDER BY DestState, AirlineID LIMIT 10000"]}
 {"sql":"SELECT DestAirportSeqID, ActualElapsedTime, SUM(DestStateFips) FROM mytable WHERE TaxiIn BETWEEN 67 AND 106 AND OriginAirportID BETWEEN 14574 AND 11953 OR OriginAirportSeqID < 1389101 GROUP BY DestAirportSeqID, ActualElapsedTime  ORDER BY DestAirportSeqID, ActualElapsedTime LIMIT 20","hsqls":["SELECT DestAirportSeqID, ActualElapsedTime, SUM(DestStateFips) FROM mytable WHERE TaxiIn BETWEEN 67 AND 106 AND OriginAirportID BETWEEN 14574 AND 11953 OR OriginAirportSeqID < 1389101 GROUP BY DestAirportSeqID, ActualElapsedTime  ORDER BY DestAirportSeqID, ActualElapsedTime LIMIT 20"]}
-{"sql":"SELECT OriginAirportSeqID, \"Month\" FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 5 AND DestAirportID BETWEEN 13851 AND 14709 OR FirstDepTime NOT IN (1939, 1745, 2254) ORDER BY DestWac LIMIT 2","hsqls":["SELECT OriginAirportSeqID, Month FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 5 AND DestAirportID BETWEEN 13851 AND 14709 OR FirstDepTime NOT IN (1939, 1745, 2254) ORDER BY DestWac LIMIT 2"]}
+{"sql":"SELECT OriginAirportSeqID, \"Month\" FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 5 AND DestAirportID BETWEEN 13851 AND 14709 OR FirstDepTime NOT IN (1939, 1745, 2254) ORDER BY DestWac LIMIT 2","hsqls":["SELECT OriginAirportSeqID, `Month` FROM mytable WHERE ArrivalDelayGroups BETWEEN -2 AND 5 AND DestAirportID BETWEEN 13851 AND 14709 OR FirstDepTime NOT IN (1939, 1745, 2254) ORDER BY DestWac LIMIT 2"]}
 {"sql":"SELECT TaxiOut, NASDelay, DepTimeBlk FROM mytable ORDER BY OriginCityMarketID, Distance LIMIT 1"}
-{"sql":"SELECT DepDelay, DepTime, MAX(\"Month\") FROM mytable GROUP BY DepDelay, DepTime LIMIT 9","hsqls":["SELECT DepDelay, DepTime, MAX(Month) FROM mytable GROUP BY DepDelay, DepTime LIMIT 9"]}
+{"sql":"SELECT DepDelay, DepTime, MAX(\"Month\") FROM mytable GROUP BY DepDelay, DepTime LIMIT 9","hsqls":["SELECT DepDelay, DepTime, MAX(`Month`) FROM mytable GROUP BY DepDelay, DepTime LIMIT 9"]}
 {"sql":"SELECT DestWac, WheelsOn FROM mytable ORDER BY DayofMonth LIMIT 17"}
-{"sql":"SELECT DepartureDelayGroups, DepTimeBlk, DayOfWeek, COUNT(\"Month\"), SUM(NASDelay), MAX(FlightNum) FROM mytable WHERE DestAirportSeqID NOT IN (1197302, 1233904) OR DivDistance >= 1300 GROUP BY DepartureDelayGroups, DepTimeBlk, DayOfWeek LIMIT 14","hsqls":["SELECT DepartureDelayGroups, DepTimeBlk, DayOfWeek, COUNT(Month), SUM(NASDelay), MAX(FlightNum) FROM mytable WHERE DestAirportSeqID NOT IN (1197302, 1233904) OR DivDistance >= 1300 GROUP BY DepartureDelayGroups, DepTimeBlk, DayOfWeek LIMIT 14"]}
+{"sql":"SELECT DepartureDelayGroups, DepTimeBlk, DayOfWeek, COUNT(\"Month\"), SUM(NASDelay), MAX(FlightNum) FROM mytable WHERE DestAirportSeqID NOT IN (1197302, 1233904) OR DivDistance >= 1300 GROUP BY DepartureDelayGroups, DepTimeBlk, DayOfWeek LIMIT 14","hsqls":["SELECT DepartureDelayGroups, DepTimeBlk, DayOfWeek, COUNT(`Month`), SUM(NASDelay), MAX(FlightNum) FROM mytable WHERE DestAirportSeqID NOT IN (1197302, 1233904) OR DivDistance >= 1300 GROUP BY DepartureDelayGroups, DepTimeBlk, DayOfWeek LIMIT 14"]}
 {"sql":"SELECT DistanceGroup, SecurityDelay, ArrTime FROM mytable WHERE ActualElapsedTime < 382 AND DivActualElapsedTime BETWEEN 509 AND 231 ORDER BY AirlineID LIMIT 29"}
-{"sql":"SELECT Distance, NASDelay, OriginStateName, COUNT(*) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND ArrTime BETWEEN 646 AND 702 GROUP BY Distance, NASDelay, OriginStateName LIMIT 13","hsqls":["SELECT Distance, NASDelay, OriginStateName, COUNT(*) FROM mytable WHERE Month BETWEEN 1 AND 1 AND ArrTime BETWEEN 646 AND 702 GROUP BY Distance, NASDelay, OriginStateName LIMIT 13"]}
+{"sql":"SELECT Distance, NASDelay, OriginStateName, COUNT(*) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND ArrTime BETWEEN 646 AND 702 GROUP BY Distance, NASDelay, OriginStateName LIMIT 13","hsqls":["SELECT Distance, NASDelay, OriginStateName, COUNT(*) FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND ArrTime BETWEEN 646 AND 702 GROUP BY Distance, NASDelay, OriginStateName LIMIT 13"]}
 {"sql":"SELECT Origin, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 1 AND 73 AND ArrDelayMinutes IN (128.0, 215.0, 144.0) AND OriginState >= 'MN' GROUP BY Origin  ORDER BY Origin LIMIT 2","hsqls":["SELECT Origin, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 1 AND 73 AND ArrDelayMinutes IN (128.0, 215.0, 144.0) AND OriginState >= 'MN' GROUP BY Origin  ORDER BY Origin LIMIT 2"]}
-{"sql":"SELECT DestStateName, COUNT(*) FROM mytable WHERE Dest BETWEEN 'XNA' AND 'ALO' OR DivAirports BETWEEN 'SFO' AND 'LMT' GROUP BY DestStateName LIMIT 24","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable WHERE Dest BETWEEN 'XNA' AND 'ALO' OR (DivAirports__MV0 BETWEEN 'SFO' AND 'LMT' OR DivAirports__MV1 BETWEEN 'SFO' AND 'LMT' OR DivAirports__MV2 BETWEEN 'SFO' AND 'LMT' OR DivAirports__MV3 BETWEEN 'SFO' AND 'LMT' OR DivAirports__MV4 BETWEEN 'SFO' AND 'LMT') GROUP BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestStateName, COUNT(*) FROM mytable WHERE Dest BETWEEN 'XNA' AND 'ALO' OR DivAirports BETWEEN 'SFO' AND 'LMT' GROUP BY DestStateName LIMIT 24","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable WHERE Dest BETWEEN 'XNA' AND 'ALO' OR (DivAirports[1] BETWEEN 'SFO' AND 'LMT' OR DivAirports[2] BETWEEN 'SFO' AND 'LMT' OR DivAirports[3] BETWEEN 'SFO' AND 'LMT' OR DivAirports[4] BETWEEN 'SFO' AND 'LMT' OR DivAirports[5] BETWEEN 'SFO' AND 'LMT') GROUP BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT ArrTime, Origin, DivArrDelay FROM mytable LIMIT 10"}
-{"sql":"SELECT LongestAddGTime, COUNT(DayofMonth), COUNT(DepartureDelayGroups) FROM mytable WHERE DestWac NOT IN (81) AND DivTotalGTimes BETWEEN 159 AND 95 GROUP BY LongestAddGTime LIMIT 23","hsqls":["SELECT LongestAddGTime, COUNT(DayofMonth), COUNT(DepartureDelayGroups) FROM mytable WHERE DestWac NOT IN (81) AND (DivTotalGTimes__MV0 BETWEEN 159 AND 95 OR DivTotalGTimes__MV1 BETWEEN 159 AND 95 OR DivTotalGTimes__MV2 BETWEEN 159 AND 95 OR DivTotalGTimes__MV3 BETWEEN 159 AND 95 OR DivTotalGTimes__MV4 BETWEEN 159 AND 95) GROUP BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, COUNT(DayofMonth), COUNT(DepartureDelayGroups) FROM mytable WHERE DestWac NOT IN (81) AND DivTotalGTimes BETWEEN 159 AND 95 GROUP BY LongestAddGTime LIMIT 23","hsqls":["SELECT LongestAddGTime, COUNT(DayofMonth), COUNT(DepartureDelayGroups) FROM mytable WHERE DestWac NOT IN (81) AND (DivTotalGTimes[1] BETWEEN 159 AND 95 OR DivTotalGTimes[2] BETWEEN 159 AND 95 OR DivTotalGTimes[3] BETWEEN 159 AND 95 OR DivTotalGTimes[4] BETWEEN 159 AND 95 OR DivTotalGTimes[5] BETWEEN 159 AND 95) GROUP BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Flights BETWEEN 1 AND 1 LIMIT 12"}
 {"sql":"SELECT COUNT(DestCityMarketID) FROM mytable WHERE LongestAddGTime BETWEEN 40 AND 40 AND OriginWac >= 36 LIMIT 28"}
 {"sql":"SELECT DivActualElapsedTime, CRSElapsedTime FROM mytable WHERE DestAirportID = 14262 AND SecurityDelay IN (10, 14) OR DestAirportID IN (11775, 11471, 11637) ORDER BY WheelsOff, FlightNum LIMIT 15"}
@@ -7261,7 +7261,7 @@
 {"sql":"SELECT TotalAddGTime, DepDel15, DayofMonth, MIN(DepTime) FROM mytable WHERE ArrDelayMinutes BETWEEN 223.0 AND 116.0 AND FlightNum NOT IN (4527, 18, 4167) GROUP BY TotalAddGTime, DepDel15, DayofMonth  ORDER BY TotalAddGTime, DepDel15, DayofMonth LIMIT 3","hsqls":["SELECT TotalAddGTime, DepDel15, DayofMonth, MIN(DepTime) FROM mytable WHERE ArrDelayMinutes BETWEEN 223.0 AND 116.0 AND FlightNum NOT IN (4527, 18, 4167) GROUP BY TotalAddGTime, DepDel15, DayofMonth  ORDER BY TotalAddGTime, DepDel15, DayofMonth LIMIT 3"]}
 {"sql":"SELECT SUM(CRSDepTime), COUNT(DestStateFips) FROM mytable LIMIT 19"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Dest < 'PSE'"}
-{"sql":"SELECT TaxiOut, LateAircraftDelay, DestAirportSeqID, AVG(\"Year\"), AVG(\"Month\"), MAX(ActualElapsedTime) FROM mytable WHERE DivWheelsOffs = 1530 AND Diverted BETWEEN 0 AND 0 GROUP BY TaxiOut, LateAircraftDelay, DestAirportSeqID LIMIT 20","hsqls":["SELECT TaxiOut, LateAircraftDelay, DestAirportSeqID, AVG(Year), AVG(Month), MAX(ActualElapsedTime) FROM mytable WHERE (DivWheelsOffs__MV0 = 1530 OR DivWheelsOffs__MV1 = 1530 OR DivWheelsOffs__MV2 = 1530 OR DivWheelsOffs__MV3 = 1530 OR DivWheelsOffs__MV4 = 1530) AND Diverted BETWEEN 0 AND 0 GROUP BY TaxiOut, LateAircraftDelay, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, LateAircraftDelay, DestAirportSeqID, AVG(\"Year\"), AVG(\"Month\"), MAX(ActualElapsedTime) FROM mytable WHERE DivWheelsOffs = 1530 AND Diverted BETWEEN 0 AND 0 GROUP BY TaxiOut, LateAircraftDelay, DestAirportSeqID LIMIT 20","hsqls":["SELECT TaxiOut, LateAircraftDelay, DestAirportSeqID, AVG(`Year`), AVG(`Month`), MAX(ActualElapsedTime) FROM mytable WHERE (DivWheelsOffs[1] = 1530 OR DivWheelsOffs[2] = 1530 OR DivWheelsOffs[3] = 1530 OR DivWheelsOffs[4] = 1530 OR DivWheelsOffs[5] = 1530) AND Diverted BETWEEN 0 AND 0 GROUP BY TaxiOut, LateAircraftDelay, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT FlightNum, SUM(Distance), MAX(Cancelled) FROM mytable WHERE DestWac BETWEEN 71 AND 51 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 10","hsqls":["SELECT FlightNum, SUM(Distance), MAX(Cancelled) FROM mytable WHERE DestWac BETWEEN 71 AND 51 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 10"]}
 {"sql":"SELECT LateAircraftDelay, DestStateFips, DestAirportSeqID FROM mytable WHERE DistanceGroup >= 6 ORDER BY Carrier, SecurityDelay LIMIT 5"}
 {"sql":"SELECT DestCityMarketID, MAX(OriginAirportID) FROM mytable WHERE Distance BETWEEN 1282 AND 2345 AND ArrDel15 <> 1 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 13","hsqls":["SELECT DestCityMarketID, MAX(OriginAirportID) FROM mytable WHERE Distance BETWEEN 1282 AND 2345 AND ArrDel15 <> 1 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 13"]}
@@ -7269,33 +7269,33 @@
 {"sql":"SELECT CRSArrTime, FlightDate FROM mytable WHERE DestAirportSeqID < 1289102 OR DepTime = 2024 AND CancellationCode BETWEEN 'noodles' AND 'C' LIMIT 29"}
 {"sql":"SELECT DivReachedDest, DestCityName, DivAirportLandings FROM mytable WHERE TotalAddGTime NOT IN (47, 29) ORDER BY CancellationCode LIMIT 9"}
 {"sql":"SELECT DepartureDelayGroups, ArrTime, DivArrDelay FROM mytable WHERE ArrTimeBlk <> '1400-1459' OR DivReachedDest >= 0 ORDER BY DepTimeBlk, OriginStateName LIMIT 19"}
-{"sql":"SELECT TaxiIn, DepTimeBlk FROM mytable WHERE DivWheelsOffs IN (2007, 1952, 2102) AND DestAirportID NOT IN (10141, 11076, 14057, 12003, 15304) AND DivTailNums < 'N813SK' ORDER BY WheelsOff, DivArrDelay LIMIT 11","hsqls":["SELECT TaxiIn, DepTimeBlk FROM mytable WHERE (DivWheelsOffs__MV0 IN (2007, 1952, 2102) OR DivWheelsOffs__MV1 IN (2007, 1952, 2102) OR DivWheelsOffs__MV2 IN (2007, 1952, 2102) OR DivWheelsOffs__MV3 IN (2007, 1952, 2102) OR DivWheelsOffs__MV4 IN (2007, 1952, 2102)) AND DestAirportID NOT IN (10141, 11076, 14057, 12003, 15304) AND (DivTailNums__MV0 < 'N813SK' OR DivTailNums__MV1 < 'N813SK' OR DivTailNums__MV2 < 'N813SK' OR DivTailNums__MV3 < 'N813SK' OR DivTailNums__MV4 < 'N813SK') ORDER BY WheelsOff, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT CancellationCode, MIN(Quarter), COUNT(WheelsOff) FROM mytable WHERE DayofMonth NOT IN (25) AND OriginAirportSeqID BETWEEN 1063104 AND 1591902 OR DivWheelsOffs IN (1431, 2202) GROUP BY CancellationCode LIMIT 13","hsqls":["SELECT CancellationCode, MIN(Quarter), COUNT(WheelsOff) FROM mytable WHERE DayofMonth NOT IN (25) AND OriginAirportSeqID BETWEEN 1063104 AND 1591902 OR (DivWheelsOffs__MV0 IN (1431, 2202) OR DivWheelsOffs__MV1 IN (1431, 2202) OR DivWheelsOffs__MV2 IN (1431, 2202) OR DivWheelsOffs__MV3 IN (1431, 2202) OR DivWheelsOffs__MV4 IN (1431, 2202)) GROUP BY CancellationCode LIMIT 10000"]}
-{"sql":"SELECT AVG(DestStateFips), AVG(CRSElapsedTime), AVG(OriginCityMarketID) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR DestAirportSeqID > 1182304 LIMIT 8","hsqls":["SELECT AVG(DestStateFips), AVG(CRSElapsedTime), AVG(OriginCityMarketID) FROM mytable WHERE Month BETWEEN 1 AND 1 OR DestAirportSeqID > 1182304 LIMIT 8"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE DepDel15 <= -9999 ORDER BY OriginStateFips LIMIT 11","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE DepDel15 <= -9999 ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DepTimeBlk FROM mytable WHERE DivWheelsOffs IN (2007, 1952, 2102) AND DestAirportID NOT IN (10141, 11076, 14057, 12003, 15304) AND DivTailNums < 'N813SK' ORDER BY WheelsOff, DivArrDelay LIMIT 11","hsqls":["SELECT TaxiIn, DepTimeBlk FROM mytable WHERE (DivWheelsOffs[1] IN (2007, 1952, 2102) OR DivWheelsOffs[2] IN (2007, 1952, 2102) OR DivWheelsOffs[3] IN (2007, 1952, 2102) OR DivWheelsOffs[4] IN (2007, 1952, 2102) OR DivWheelsOffs[5] IN (2007, 1952, 2102)) AND DestAirportID NOT IN (10141, 11076, 14057, 12003, 15304) AND (DivTailNums[1] < 'N813SK' OR DivTailNums[2] < 'N813SK' OR DivTailNums[3] < 'N813SK' OR DivTailNums[4] < 'N813SK' OR DivTailNums[5] < 'N813SK') ORDER BY WheelsOff, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT CancellationCode, MIN(Quarter), COUNT(WheelsOff) FROM mytable WHERE DayofMonth NOT IN (25) AND OriginAirportSeqID BETWEEN 1063104 AND 1591902 OR DivWheelsOffs IN (1431, 2202) GROUP BY CancellationCode LIMIT 13","hsqls":["SELECT CancellationCode, MIN(Quarter), COUNT(WheelsOff) FROM mytable WHERE DayofMonth NOT IN (25) AND OriginAirportSeqID BETWEEN 1063104 AND 1591902 OR (DivWheelsOffs[1] IN (1431, 2202) OR DivWheelsOffs[2] IN (1431, 2202) OR DivWheelsOffs[3] IN (1431, 2202) OR DivWheelsOffs[4] IN (1431, 2202) OR DivWheelsOffs[5] IN (1431, 2202)) GROUP BY CancellationCode LIMIT 10000"]}
+{"sql":"SELECT AVG(DestStateFips), AVG(CRSElapsedTime), AVG(OriginCityMarketID) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR DestAirportSeqID > 1182304 LIMIT 8","hsqls":["SELECT AVG(DestStateFips), AVG(CRSElapsedTime), AVG(OriginCityMarketID) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR DestAirportSeqID > 1182304 LIMIT 8"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE DepDel15 <= -9999 ORDER BY OriginStateFips LIMIT 11","hsqls":["SELECT DivWheelsOns FROM mytable WHERE DepDel15 <= -9999 ORDER BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, SUM(OriginAirportID) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 29","hsqls":["SELECT DepTimeBlk, SUM(OriginAirportID) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 29"]}
 {"sql":"SELECT DayofMonth, DivAirportLandings, ArrivalDelayGroups FROM mytable WHERE OriginStateName BETWEEN 'Tennessee' AND 'Oklahoma' LIMIT 9"}
 {"sql":"SELECT LongestAddGTime, DepDel15 FROM mytable WHERE DestState IN ('MN') ORDER BY DestCityName, DayofMonth, AirlineID LIMIT 10"}
-{"sql":"SELECT DivLongestGTimes, OriginStateName FROM mytable WHERE OriginWac NOT IN (33) ORDER BY LateAircraftDelay LIMIT 13","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginStateName FROM mytable WHERE OriginWac NOT IN (33) ORDER BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginStateName FROM mytable WHERE OriginWac NOT IN (33) ORDER BY LateAircraftDelay LIMIT 13","hsqls":["SELECT DivLongestGTimes, OriginStateName FROM mytable WHERE OriginWac NOT IN (33) ORDER BY LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT AVG(DivArrDelay) FROM mytable WHERE DepTime NOT IN (1228, 638, 2341, 529) LIMIT 3"}
 {"sql":"SELECT Diverted, CarrierDelay FROM mytable ORDER BY DistanceGroup, Distance, DestAirportSeqID LIMIT 17"}
-{"sql":"SELECT WeatherDelay, SecurityDelay, DivTotalGTimes FROM mytable ORDER BY ActualElapsedTime, DayofMonth, DivActualElapsedTime LIMIT 7","hsqls":["SELECT WeatherDelay, SecurityDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY ActualElapsedTime, DayofMonth, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivDistance, FlightNum, COUNT(*) FROM mytable WHERE LongestAddGTime >= 34 OR OriginAirportID NOT IN (14696) AND DivWheelsOffs > 2030 GROUP BY DistanceGroup, DivDistance, FlightNum LIMIT 28","hsqls":["SELECT DistanceGroup, DivDistance, FlightNum, COUNT(*) FROM mytable WHERE LongestAddGTime >= 34 OR OriginAirportID NOT IN (14696) AND (DivWheelsOffs__MV0 > 2030 OR DivWheelsOffs__MV1 > 2030 OR DivWheelsOffs__MV2 > 2030 OR DivWheelsOffs__MV3 > 2030 OR DivWheelsOffs__MV4 > 2030) GROUP BY DistanceGroup, DivDistance, FlightNum LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, SecurityDelay, DivTotalGTimes FROM mytable ORDER BY ActualElapsedTime, DayofMonth, DivActualElapsedTime LIMIT 7","hsqls":["SELECT WeatherDelay, SecurityDelay, DivTotalGTimes FROM mytable ORDER BY ActualElapsedTime, DayofMonth, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivDistance, FlightNum, COUNT(*) FROM mytable WHERE LongestAddGTime >= 34 OR OriginAirportID NOT IN (14696) AND DivWheelsOffs > 2030 GROUP BY DistanceGroup, DivDistance, FlightNum LIMIT 28","hsqls":["SELECT DistanceGroup, DivDistance, FlightNum, COUNT(*) FROM mytable WHERE LongestAddGTime >= 34 OR OriginAirportID NOT IN (14696) AND (DivWheelsOffs[1] > 2030 OR DivWheelsOffs[2] > 2030 OR DivWheelsOffs[3] > 2030 OR DivWheelsOffs[4] > 2030 OR DivWheelsOffs[5] > 2030) GROUP BY DistanceGroup, DivDistance, FlightNum LIMIT 10000"]}
 {"sql":"SELECT ArrivalDelayGroups, SUM(OriginCityMarketID) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 5","hsqls":["SELECT ArrivalDelayGroups, SUM(OriginCityMarketID) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 5"]}
 {"sql":"SELECT OriginStateName, COUNT(Cancelled), MAX(DivReachedDest), AVG(OriginAirportID) FROM mytable WHERE ArrDelayMinutes BETWEEN 78.0 AND 138.0 AND TailNum NOT IN ('N528CA', 'N522SW') GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 7","hsqls":["SELECT OriginStateName, COUNT(Cancelled), MAX(DivReachedDest), AVG(OriginAirportID) FROM mytable WHERE ArrDelayMinutes BETWEEN 78.0 AND 138.0 AND TailNum NOT IN ('N528CA', 'N522SW') GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 7"]}
-{"sql":"SELECT LateAircraftDelay FROM mytable WHERE DepDelay = 96.0 OR \"Year\" = 2014 AND \"Year\" IN (2014) LIMIT 6","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE DepDelay = 96.0 OR Year = 2014 AND Year IN (2014) LIMIT 6"]}
+{"sql":"SELECT LateAircraftDelay FROM mytable WHERE DepDelay = 96.0 OR \"Year\" = 2014 AND \"Year\" IN (2014) LIMIT 6","hsqls":["SELECT LateAircraftDelay FROM mytable WHERE DepDelay = 96.0 OR `Year` = 2014 AND `Year` IN (2014) LIMIT 6"]}
 {"sql":"SELECT \"Month\", DayOfWeek, AVG(Diverted), AVG(DepDelayMinutes) FROM mytable WHERE OriginCityMarketID <= 31865 GROUP BY \"Month\", DayOfWeek LIMIT 4","hsqls":["SELECT Month, DayOfWeek, AVG(Diverted), AVG(DepDelayMinutes) FROM mytable WHERE OriginCityMarketID <= 31865 GROUP BY Month, DayOfWeek LIMIT 4"]}
 {"sql":"SELECT UniqueCarrier, COUNT(*) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 25","hsqls":["SELECT UniqueCarrier, COUNT(*) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 25"]}
 {"sql":"SELECT TaxiIn, COUNT(*) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 18","hsqls":["SELECT TaxiIn, COUNT(*) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 18"]}
 {"sql":"SELECT DivAirportLandings, UniqueCarrier FROM mytable ORDER BY DepTime, OriginAirportID LIMIT 3"}
 {"sql":"SELECT DestWac, OriginCityMarketID FROM mytable ORDER BY DepartureDelayGroups, Flights"}
-{"sql":"SELECT DestWac, DestAirportID, COUNT(*) FROM mytable WHERE DivAirports IN ('MSN', 'JFK') OR DepTimeBlk IN ('1500-1559') GROUP BY DestWac, DestAirportID LIMIT 7","hsqls":["SELECT DestWac, DestAirportID, COUNT(*) FROM mytable WHERE (DivAirports__MV0 IN ('MSN', 'JFK') OR DivAirports__MV1 IN ('MSN', 'JFK') OR DivAirports__MV2 IN ('MSN', 'JFK') OR DivAirports__MV3 IN ('MSN', 'JFK') OR DivAirports__MV4 IN ('MSN', 'JFK')) OR DepTimeBlk IN ('1500-1559') GROUP BY DestWac, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestWac, DestAirportID, COUNT(*) FROM mytable WHERE DivAirports IN ('MSN', 'JFK') OR DepTimeBlk IN ('1500-1559') GROUP BY DestWac, DestAirportID LIMIT 7","hsqls":["SELECT DestWac, DestAirportID, COUNT(*) FROM mytable WHERE (DivAirports[1] IN ('MSN', 'JFK') OR DivAirports[2] IN ('MSN', 'JFK') OR DivAirports[3] IN ('MSN', 'JFK') OR DivAirports[4] IN ('MSN', 'JFK') OR DivAirports[5] IN ('MSN', 'JFK')) OR DepTimeBlk IN ('1500-1559') GROUP BY DestWac, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT FlightNum, ArrTimeBlk, COUNT(*) FROM mytable WHERE LongestAddGTime >= 5 GROUP BY FlightNum, ArrTimeBlk  ORDER BY FlightNum, ArrTimeBlk LIMIT 8","hsqls":["SELECT FlightNum, ArrTimeBlk, COUNT(*) FROM mytable WHERE LongestAddGTime >= 5 GROUP BY FlightNum, ArrTimeBlk  ORDER BY FlightNum, ArrTimeBlk LIMIT 8"]}
 {"sql":"SELECT ArrTime, DepTimeBlk, AVG(FlightNum) FROM mytable WHERE DayOfWeek BETWEEN 3 AND 3 OR Flights NOT IN (1) AND OriginStateName >= 'Michigan' GROUP BY ArrTime, DepTimeBlk  ORDER BY ArrTime, DepTimeBlk LIMIT 18","hsqls":["SELECT ArrTime, DepTimeBlk, AVG(FlightNum) FROM mytable WHERE DayOfWeek BETWEEN 3 AND 3 OR Flights NOT IN (1) AND OriginStateName >= 'Michigan' GROUP BY ArrTime, DepTimeBlk  ORDER BY ArrTime, DepTimeBlk LIMIT 18"]}
-{"sql":"SELECT DistanceGroup, OriginAirportID, AVG(LateAircraftDelay), MAX(\"Month\") FROM mytable WHERE DestAirportSeqID BETWEEN 1504803 AND 1247802 OR AirlineID NOT IN (19393, 20437, 21171) OR LongestAddGTime < 15 GROUP BY DistanceGroup, OriginAirportID LIMIT 26","hsqls":["SELECT DistanceGroup, OriginAirportID, AVG(LateAircraftDelay), MAX(Month) FROM mytable WHERE DestAirportSeqID BETWEEN 1504803 AND 1247802 OR AirlineID NOT IN (19393, 20437, 21171) OR LongestAddGTime < 15 GROUP BY DistanceGroup, OriginAirportID LIMIT 26"]}
-{"sql":"SELECT AVG(\"Month\"), COUNT(DepDelay), MAX(LongestAddGTime) FROM mytable WHERE FlightDate = '2014-01-26' OR OriginAirportID < 11433 AND AirlineID NOT IN (20304, 20355) LIMIT 27","hsqls":["SELECT AVG(Month), COUNT(DepDelay), MAX(LongestAddGTime) FROM mytable WHERE FlightDate = '2014-01-26' OR OriginAirportID < 11433 AND AirlineID NOT IN (20304, 20355) LIMIT 27"]}
+{"sql":"SELECT DistanceGroup, OriginAirportID, AVG(LateAircraftDelay), MAX(\"Month\") FROM mytable WHERE DestAirportSeqID BETWEEN 1504803 AND 1247802 OR AirlineID NOT IN (19393, 20437, 21171) OR LongestAddGTime < 15 GROUP BY DistanceGroup, OriginAirportID LIMIT 26","hsqls":["SELECT DistanceGroup, OriginAirportID, AVG(LateAircraftDelay), MAX(`Month`) FROM mytable WHERE DestAirportSeqID BETWEEN 1504803 AND 1247802 OR AirlineID NOT IN (19393, 20437, 21171) OR LongestAddGTime < 15 GROUP BY DistanceGroup, OriginAirportID LIMIT 26"]}
+{"sql":"SELECT AVG(\"Month\"), COUNT(DepDelay), MAX(LongestAddGTime) FROM mytable WHERE FlightDate = '2014-01-26' OR OriginAirportID < 11433 AND AirlineID NOT IN (20304, 20355) LIMIT 27","hsqls":["SELECT AVG(`Month`), COUNT(DepDelay), MAX(LongestAddGTime) FROM mytable WHERE FlightDate = '2014-01-26' OR OriginAirportID < 11433 AND AirlineID NOT IN (20304, 20355) LIMIT 27"]}
 {"sql":"SELECT AVG(DaysSinceEpoch), AVG(DayofMonth) FROM mytable WHERE ActualElapsedTime NOT IN (373, 208) LIMIT 23"}
-{"sql":"SELECT OriginState, Distance, DivActualElapsedTime FROM mytable WHERE DivTotalGTimes = 76 OR Cancelled = 1 OR DestAirportID <> 13851 ORDER BY TaxiOut, DivActualElapsedTime, DaysSinceEpoch LIMIT 5","hsqls":["SELECT OriginState, Distance, DivActualElapsedTime FROM mytable WHERE (DivTotalGTimes__MV0 = 76 OR DivTotalGTimes__MV1 = 76 OR DivTotalGTimes__MV2 = 76 OR DivTotalGTimes__MV3 = 76 OR DivTotalGTimes__MV4 = 76) OR Cancelled = 1 OR DestAirportID <> 13851 ORDER BY TaxiOut, DivActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT OriginState, Distance, DivActualElapsedTime FROM mytable WHERE DivTotalGTimes = 76 OR Cancelled = 1 OR DestAirportID <> 13851 ORDER BY TaxiOut, DivActualElapsedTime, DaysSinceEpoch LIMIT 5","hsqls":["SELECT OriginState, Distance, DivActualElapsedTime FROM mytable WHERE (DivTotalGTimes[1] = 76 OR DivTotalGTimes[2] = 76 OR DivTotalGTimes[3] = 76 OR DivTotalGTimes[4] = 76 OR DivTotalGTimes[5] = 76) OR Cancelled = 1 OR DestAirportID <> 13851 ORDER BY TaxiOut, DivActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DivDistance, DestAirportSeqID FROM mytable WHERE Diverted <= 0 AND DestAirportSeqID BETWEEN 1327702 AND 1445702 OR OriginState > 'MI' LIMIT 14"}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE Carrier <> 'HA' ORDER BY OriginCityName LIMIT 19"}
 {"sql":"SELECT Carrier, ArrDel15, ArrivalDelayGroups, COUNT(NASDelay), MAX(DivActualElapsedTime), MAX(CRSDepTime) FROM mytable GROUP BY Carrier, ArrDel15, ArrivalDelayGroups  ORDER BY Carrier, ArrDel15, ArrivalDelayGroups LIMIT 4","hsqls":["SELECT Carrier, ArrDel15, ArrivalDelayGroups, COUNT(NASDelay), MAX(DivActualElapsedTime), MAX(CRSDepTime) FROM mytable GROUP BY Carrier, ArrDel15, ArrivalDelayGroups  ORDER BY Carrier, ArrDel15, ArrivalDelayGroups LIMIT 4"]}
@@ -7304,228 +7304,228 @@
 {"sql":"SELECT DivReachedDest, DivActualElapsedTime, COUNT(*) FROM mytable WHERE AirlineID <= 19977 AND DivDistance >= 45 AND DepDelayMinutes NOT IN (455.0, 105.0, 217.0, 206.0) GROUP BY DivReachedDest, DivActualElapsedTime  ORDER BY DivReachedDest, DivActualElapsedTime LIMIT 21","hsqls":["SELECT DivReachedDest, DivActualElapsedTime, COUNT(*) FROM mytable WHERE AirlineID <= 19977 AND DivDistance >= 45 AND DepDelayMinutes NOT IN (455.0, 105.0, 217.0, 206.0) GROUP BY DivReachedDest, DivActualElapsedTime  ORDER BY DivReachedDest, DivActualElapsedTime LIMIT 21"]}
 {"sql":"SELECT DistanceGroup, TotalAddGTime FROM mytable WHERE CRSArrTime BETWEEN 1508 AND 30 AND TaxiOut IN (77, 41, 9, -9999) LIMIT 16"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 7"}
-{"sql":"SELECT SUM(WheelsOn), MAX(SecurityDelay), SUM(DestAirportSeqID) FROM mytable WHERE Distance <= 1085 OR ArrDel15 BETWEEN 1 AND 0 OR DivTotalGTimes = 79 LIMIT 24","hsqls":["SELECT SUM(WheelsOn), MAX(SecurityDelay), SUM(DestAirportSeqID)  FROM mytable WHERE Distance <= 1085 OR ArrDel15 BETWEEN 1 AND 0 OR (DivTotalGTimes__MV0 = 79 OR DivTotalGTimes__MV1 = 79 OR DivTotalGTimes__MV2 = 79 OR DivTotalGTimes__MV3 = 79 OR DivTotalGTimes__MV4 = 79) LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, Carrier, ArrivalDelayGroups FROM mytable WHERE \"Month\" IN (1) AND DivArrDelay BETWEEN 362 AND 399 OR TailNum NOT IN ('N266WN', 'N3GVAA', 'N593JB') LIMIT 20","hsqls":["SELECT TaxiOut, Carrier, ArrivalDelayGroups FROM mytable WHERE Month IN (1) AND DivArrDelay BETWEEN 362 AND 399 OR TailNum NOT IN ('N266WN', 'N3GVAA', 'N593JB') LIMIT 20"]}
+{"sql":"SELECT SUM(WheelsOn), MAX(SecurityDelay), SUM(DestAirportSeqID) FROM mytable WHERE Distance <= 1085 OR ArrDel15 BETWEEN 1 AND 0 OR DivTotalGTimes = 79 LIMIT 24","hsqls":["SELECT SUM(WheelsOn), MAX(SecurityDelay), SUM(DestAirportSeqID)  FROM mytable WHERE Distance <= 1085 OR ArrDel15 BETWEEN 1 AND 0 OR (DivTotalGTimes[1] = 79 OR DivTotalGTimes[2] = 79 OR DivTotalGTimes[3] = 79 OR DivTotalGTimes[4] = 79 OR DivTotalGTimes[5] = 79) LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, Carrier, ArrivalDelayGroups FROM mytable WHERE \"Month\" IN (1) AND DivArrDelay BETWEEN 362 AND 399 OR TailNum NOT IN ('N266WN', 'N3GVAA', 'N593JB') LIMIT 20","hsqls":["SELECT TaxiOut, Carrier, ArrivalDelayGroups FROM mytable WHERE `Month` IN (1) AND DivArrDelay BETWEEN 362 AND 399 OR TailNum NOT IN ('N266WN', 'N3GVAA', 'N593JB') LIMIT 20"]}
 {"sql":"SELECT Diverted, Carrier, WeatherDelay, COUNT(*) FROM mytable GROUP BY Diverted, Carrier, WeatherDelay  ORDER BY Diverted, Carrier, WeatherDelay LIMIT 28","hsqls":["SELECT Diverted, Carrier, WeatherDelay, COUNT(*) FROM mytable GROUP BY Diverted, Carrier, WeatherDelay  ORDER BY Diverted, Carrier, WeatherDelay LIMIT 28"]}
 {"sql":"SELECT ArrDelayMinutes, AirlineID, COUNT(*) FROM mytable WHERE DepDelayMinutes NOT IN (86.0, 101.0, 417.0, 159.0, 124.0) GROUP BY ArrDelayMinutes, AirlineID  ORDER BY ArrDelayMinutes, AirlineID LIMIT 9","hsqls":["SELECT ArrDelayMinutes, AirlineID, COUNT(*) FROM mytable WHERE DepDelayMinutes NOT IN (86.0, 101.0, 417.0, 159.0, 124.0) GROUP BY ArrDelayMinutes, AirlineID  ORDER BY ArrDelayMinutes, AirlineID LIMIT 9"]}
 {"sql":"SELECT DepTime, ArrTime, MAX(DaysSinceEpoch), MAX(LateAircraftDelay), SUM(OriginCityMarketID) FROM mytable WHERE DestStateName > 'California' GROUP BY DepTime, ArrTime  ORDER BY DepTime, ArrTime LIMIT 5","hsqls":["SELECT DepTime, ArrTime, MAX(DaysSinceEpoch), MAX(LateAircraftDelay), SUM(OriginCityMarketID) FROM mytable WHERE DestStateName > 'California' GROUP BY DepTime, ArrTime  ORDER BY DepTime, ArrTime LIMIT 5"]}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY DistanceGroup, CarrierDelay, DepTime LIMIT 26"}
-{"sql":"SELECT DivAirports FROM mytable WHERE Dest <> 'LWS' AND \"Year\" IN (2014) ORDER BY DistanceGroup, OriginCityName LIMIT 14","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE Dest <> 'LWS' AND Year IN (2014) ORDER BY DistanceGroup, OriginCityName LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DestCityName, \"Month\", COUNT(LongestAddGTime), SUM(DestAirportID), MAX(ArrTime) FROM mytable GROUP BY WheelsOff, DestCityName, \"Month\" LIMIT 18","hsqls":["SELECT WheelsOff, DestCityName, Month, COUNT(LongestAddGTime), SUM(DestAirportID), MAX(ArrTime) FROM mytable GROUP BY WheelsOff, DestCityName, Month LIMIT 18"]}
-{"sql":"SELECT DepartureDelayGroups, DepDel15 FROM mytable WHERE DivWheelsOffs IN (1727, 1747) OR DepDelay NOT IN (233.0, -11.0, 62.0, 270.0) OR CRSElapsedTime IN (286, 80, 129, 282, 291) ORDER BY SecurityDelay, CancellationCode LIMIT 14","hsqls":["SELECT DepartureDelayGroups, DepDel15 FROM mytable WHERE (DivWheelsOffs__MV0 IN (1727, 1747) OR DivWheelsOffs__MV1 IN (1727, 1747) OR DivWheelsOffs__MV2 IN (1727, 1747) OR DivWheelsOffs__MV3 IN (1727, 1747) OR DivWheelsOffs__MV4 IN (1727, 1747)) OR DepDelay NOT IN (233.0, -11.0, 62.0, 270.0) OR CRSElapsedTime IN (286, 80, 129, 282, 291) ORDER BY SecurityDelay, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE Dest <> 'LWS' AND \"Year\" IN (2014) ORDER BY DistanceGroup, OriginCityName LIMIT 14","hsqls":["SELECT DivAirports FROM mytable WHERE Dest <> 'LWS' AND `Year` IN (2014) ORDER BY DistanceGroup, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DestCityName, \"Month\", COUNT(LongestAddGTime), SUM(DestAirportID), MAX(ArrTime) FROM mytable GROUP BY WheelsOff, DestCityName, \"Month\" LIMIT 18","hsqls":["SELECT WheelsOff, DestCityName, Month, COUNT(LongestAddGTime), SUM(DestAirportID), MAX(ArrTime) FROM mytable GROUP BY WheelsOff, DestCityName, `Month` LIMIT 18"]}
+{"sql":"SELECT DepartureDelayGroups, DepDel15 FROM mytable WHERE DivWheelsOffs IN (1727, 1747) OR DepDelay NOT IN (233.0, -11.0, 62.0, 270.0) OR CRSElapsedTime IN (286, 80, 129, 282, 291) ORDER BY SecurityDelay, CancellationCode LIMIT 14","hsqls":["SELECT DepartureDelayGroups, DepDel15 FROM mytable WHERE (DivWheelsOffs[1] IN (1727, 1747) OR DivWheelsOffs[2] IN (1727, 1747) OR DivWheelsOffs[3] IN (1727, 1747) OR DivWheelsOffs[4] IN (1727, 1747) OR DivWheelsOffs[5] IN (1727, 1747)) OR DepDelay NOT IN (233.0, -11.0, 62.0, 270.0) OR CRSElapsedTime IN (286, 80, 129, 282, 291) ORDER BY SecurityDelay, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT OriginWac FROM mytable ORDER BY DestAirportID LIMIT 22"}
 {"sql":"SELECT FirstDepTime FROM mytable LIMIT 20"}
-{"sql":"SELECT CarrierDelay, DestAirportSeqID FROM mytable WHERE DivWheelsOffs IN (1407, 921) AND OriginWac <> 13 ORDER BY OriginWac","hsqls":["SELECT CarrierDelay, DestAirportSeqID FROM mytable WHERE (DivWheelsOffs__MV0 IN (1407, 921) OR DivWheelsOffs__MV1 IN (1407, 921) OR DivWheelsOffs__MV2 IN (1407, 921) OR DivWheelsOffs__MV3 IN (1407, 921) OR DivWheelsOffs__MV4 IN (1407, 921)) AND OriginWac <> 13 ORDER BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DestAirportSeqID FROM mytable WHERE DivWheelsOffs IN (1407, 921) AND OriginWac <> 13 ORDER BY OriginWac","hsqls":["SELECT CarrierDelay, DestAirportSeqID FROM mytable WHERE (DivWheelsOffs[1] IN (1407, 921) OR DivWheelsOffs[2] IN (1407, 921) OR DivWheelsOffs[3] IN (1407, 921) OR DivWheelsOffs[4] IN (1407, 921) OR DivWheelsOffs[5] IN (1407, 921)) AND OriginWac <> 13 ORDER BY OriginWac LIMIT 10000"]}
 {"sql":"SELECT AVG(DivDistance), COUNT(OriginStateName), COUNT(OriginState) FROM mytable WHERE ArrivalDelayGroups >= -9999 LIMIT 21"}
 {"sql":"SELECT Quarter, DestAirportID, COUNT(DistanceGroup), MIN(ArrivalDelayGroups) FROM mytable GROUP BY Quarter, DestAirportID  ORDER BY Quarter, DestAirportID LIMIT 4","hsqls":["SELECT Quarter, DestAirportID, COUNT(DistanceGroup), MIN(ArrivalDelayGroups) FROM mytable GROUP BY Quarter, DestAirportID  ORDER BY Quarter, DestAirportID LIMIT 4"]}
-{"sql":"SELECT DivWheelsOns, DestCityName FROM mytable WHERE DayOfWeek > 3 AND TaxiOut NOT IN (3, 93, 72, 61) LIMIT 9","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestCityName FROM mytable WHERE DayOfWeek > 3 AND TaxiOut NOT IN (3, 93, 72, 61) LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivAirportIDs = 11603 ORDER BY Quarter, Origin LIMIT 13","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE (DivAirportIDs__MV0 = 11603 OR DivAirportIDs__MV1 = 11603 OR DivAirportIDs__MV2 = 11603 OR DivAirportIDs__MV3 = 11603 OR DivAirportIDs__MV4 = 11603) ORDER BY Quarter, Origin LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, FlightNum, MAX(DayofMonth), SUM(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 31 AND 69 AND DivAirports IN ('CID', 'BNA', 'SAT', 'EAU') GROUP BY OriginAirportSeqID, FlightNum LIMIT 23","hsqls":["SELECT OriginAirportSeqID, FlightNum, MAX(DayofMonth), SUM(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 31 AND 69 AND (DivAirports__MV0 IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports__MV1 IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports__MV2 IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports__MV3 IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports__MV4 IN ('CID', 'BNA', 'SAT', 'EAU')) GROUP BY OriginAirportSeqID, FlightNum LIMIT 10000"]}
-{"sql":"SELECT OriginWac, ArrivalDelayGroups FROM mytable WHERE ArrTime BETWEEN 1540 AND 553 AND Diverted IN (1, 0) ORDER BY \"Month\" LIMIT 28","hsqls":["SELECT OriginWac, ArrivalDelayGroups FROM mytable WHERE ArrTime BETWEEN 1540 AND 553 AND Diverted IN (1, 0) ORDER BY Month LIMIT 28"]}
+{"sql":"SELECT DivWheelsOns, DestCityName FROM mytable WHERE DayOfWeek > 3 AND TaxiOut NOT IN (3, 93, 72, 61) LIMIT 9","hsqls":["SELECT DivWheelsOns, DestCityName FROM mytable WHERE DayOfWeek > 3 AND TaxiOut NOT IN (3, 93, 72, 61) LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DivAirportIDs = 11603 ORDER BY Quarter, Origin LIMIT 13","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE (DivAirportIDs[1] = 11603 OR DivAirportIDs[2] = 11603 OR DivAirportIDs[3] = 11603 OR DivAirportIDs[4] = 11603 OR DivAirportIDs[5] = 11603) ORDER BY Quarter, Origin LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, FlightNum, MAX(DayofMonth), SUM(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 31 AND 69 AND DivAirports IN ('CID', 'BNA', 'SAT', 'EAU') GROUP BY OriginAirportSeqID, FlightNum LIMIT 23","hsqls":["SELECT OriginAirportSeqID, FlightNum, MAX(DayofMonth), SUM(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 31 AND 69 AND (DivAirports[1] IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports[2] IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports[3] IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports[4] IN ('CID', 'BNA', 'SAT', 'EAU') OR DivAirports[5] IN ('CID', 'BNA', 'SAT', 'EAU')) GROUP BY OriginAirportSeqID, FlightNum LIMIT 10000"]}
+{"sql":"SELECT OriginWac, ArrivalDelayGroups FROM mytable WHERE ArrTime BETWEEN 1540 AND 553 AND Diverted IN (1, 0) ORDER BY \"Month\" LIMIT 28","hsqls":["SELECT OriginWac, ArrivalDelayGroups FROM mytable WHERE ArrTime BETWEEN 1540 AND 553 AND Diverted IN (1, 0) ORDER BY `Month` LIMIT 28"]}
 {"sql":"SELECT Carrier, DestStateFips, SUM(NASDelay), MIN(DepDel15) FROM mytable WHERE Origin BETWEEN 'GRR' AND 'TTN' OR DestCityName BETWEEN 'Greensboro/High Point, NC' AND 'Deadhorse, AK' GROUP BY Carrier, DestStateFips  ORDER BY Carrier, DestStateFips LIMIT 7","hsqls":["SELECT Carrier, DestStateFips, SUM(NASDelay), MIN(DepDel15) FROM mytable WHERE Origin BETWEEN 'GRR' AND 'TTN' OR DestCityName BETWEEN 'Greensboro/High Point, NC' AND 'Deadhorse, AK' GROUP BY Carrier, DestStateFips  ORDER BY Carrier, DestStateFips LIMIT 7"]}
 {"sql":"SELECT SecurityDelay, MAX(Flights), AVG(OriginAirportID), AVG(OriginCityMarketID) FROM mytable WHERE ArrDelay NOT IN (34.0, 95.0, 160.0) OR DayOfWeek <> 3 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 11","hsqls":["SELECT SecurityDelay, MAX(Flights), AVG(OriginAirportID), AVG(OriginCityMarketID) FROM mytable WHERE ArrDelay NOT IN (34.0, 95.0, 160.0) OR DayOfWeek <> 3 GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 11"]}
 {"sql":"SELECT COUNT(DestAirportSeqID), SUM(ArrTime) FROM mytable WHERE DestCityMarketID NOT IN (33377) OR CRSElapsedTime <= 156 LIMIT 14"}
 {"sql":"SELECT DepDelay, SUM(DivActualElapsedTime) FROM mytable WHERE DestState BETWEEN 'PR' AND 'PA' AND DivReachedDest < 0 GROUP BY DepDelay  ORDER BY DepDelay LIMIT 13","hsqls":["SELECT DepDelay, SUM(DivActualElapsedTime) FROM mytable WHERE DestState BETWEEN 'PR' AND 'PA' AND DivReachedDest < 0 GROUP BY DepDelay  ORDER BY DepDelay LIMIT 13"]}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE Diverted = 0 AND DivLongestGTimes >= 16.0 ORDER BY DepartureDelayGroups, DestAirportSeqID","hsqls":["SELECT CarrierDelay FROM mytable WHERE Diverted = 0 AND (DivLongestGTimes__MV0 >= 16.0 OR DivLongestGTimes__MV1 >= 16.0 OR DivLongestGTimes__MV2 >= 16.0 OR DivLongestGTimes__MV3 >= 16.0 OR DivLongestGTimes__MV4 >= 16.0) ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE Diverted = 0 AND DivLongestGTimes >= 16.0 ORDER BY DepartureDelayGroups, DestAirportSeqID","hsqls":["SELECT CarrierDelay FROM mytable WHERE Diverted = 0 AND (DivLongestGTimes[1] >= 16.0 OR DivLongestGTimes[2] >= 16.0 OR DivLongestGTimes[3] >= 16.0 OR DivLongestGTimes[4] >= 16.0 OR DivLongestGTimes[5] >= 16.0) ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT MAX(AirTime) FROM mytable LIMIT 17"}
 {"sql":"SELECT DivDistance, CancellationCode, MAX(DayOfWeek) FROM mytable WHERE DayOfWeek IN (3, 7, 6) GROUP BY DivDistance, CancellationCode  ORDER BY DivDistance, CancellationCode LIMIT 12","hsqls":["SELECT DivDistance, CancellationCode, MAX(DayOfWeek) FROM mytable WHERE DayOfWeek IN (3, 7, 6) GROUP BY DivDistance, CancellationCode  ORDER BY DivDistance, CancellationCode LIMIT 12"]}
 {"sql":"SELECT Origin FROM mytable WHERE DestStateName < 'Oklahoma' ORDER BY DivDistance LIMIT 20"}
-{"sql":"SELECT TaxiOut, Quarter, DivAirports FROM mytable WHERE DivArrDelay NOT IN (284, 437) OR DayOfWeek IN (3, 2, 7, 6, 4) LIMIT 28","hsqls":["SELECT TaxiOut, Quarter, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DivArrDelay NOT IN (284, 437) OR DayOfWeek IN (3, 2, 7, 6, 4) LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DestWac FROM mytable WHERE DivTotalGTimes BETWEEN 89 AND 56 AND Origin BETWEEN 'BIL' AND 'ALO' ORDER BY DepDelay LIMIT 6","hsqls":["SELECT DistanceGroup, DestWac FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 89 AND 56 OR DivTotalGTimes__MV1 BETWEEN 89 AND 56 OR DivTotalGTimes__MV2 BETWEEN 89 AND 56 OR DivTotalGTimes__MV3 BETWEEN 89 AND 56 OR DivTotalGTimes__MV4 BETWEEN 89 AND 56) AND Origin BETWEEN 'BIL' AND 'ALO' ORDER BY DepDelay LIMIT 10000"]}
-{"sql":"SELECT DepDelay, DepTimeBlk FROM mytable WHERE DivAirportSeqIDs < 1172102 OR ArrivalDelayGroups BETWEEN 9 AND 3 ORDER BY DivDistance, ActualElapsedTime, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DepDelay, DepTimeBlk FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1172102 OR DivAirportSeqIDs__MV1 < 1172102 OR DivAirportSeqIDs__MV2 < 1172102 OR DivAirportSeqIDs__MV3 < 1172102 OR DivAirportSeqIDs__MV4 < 1172102) OR ArrivalDelayGroups BETWEEN 9 AND 3 ORDER BY DivDistance, ActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, Quarter, DivAirports FROM mytable WHERE DivArrDelay NOT IN (284, 437) OR DayOfWeek IN (3, 2, 7, 6, 4) LIMIT 28","hsqls":["SELECT TaxiOut, Quarter, DivAirports FROM mytable WHERE DivArrDelay NOT IN (284, 437) OR DayOfWeek IN (3, 2, 7, 6, 4) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DestWac FROM mytable WHERE DivTotalGTimes BETWEEN 89 AND 56 AND Origin BETWEEN 'BIL' AND 'ALO' ORDER BY DepDelay LIMIT 6","hsqls":["SELECT DistanceGroup, DestWac FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 89 AND 56 OR DivTotalGTimes[2] BETWEEN 89 AND 56 OR DivTotalGTimes[3] BETWEEN 89 AND 56 OR DivTotalGTimes[4] BETWEEN 89 AND 56 OR DivTotalGTimes[5] BETWEEN 89 AND 56) AND Origin BETWEEN 'BIL' AND 'ALO' ORDER BY DepDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DepTimeBlk FROM mytable WHERE DivAirportSeqIDs < 1172102 OR ArrivalDelayGroups BETWEEN 9 AND 3 ORDER BY DivDistance, ActualElapsedTime, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DepDelay, DepTimeBlk FROM mytable WHERE (DivAirportSeqIDs[1] < 1172102 OR DivAirportSeqIDs[2] < 1172102 OR DivAirportSeqIDs[3] < 1172102 OR DivAirportSeqIDs[4] < 1172102 OR DivAirportSeqIDs[5] < 1172102) OR ArrivalDelayGroups BETWEEN 9 AND 3 ORDER BY DivDistance, ActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE LongestAddGTime BETWEEN 34 AND -9999 OR Origin NOT IN ('MOD', 'BUF', 'PHX', 'SEA') OR OriginStateName NOT IN ('Pennsylvania', 'Puerto Rico', 'West Virginia', 'Arizona', 'Connecticut') ORDER BY DivAirportLandings LIMIT 10"}
-{"sql":"SELECT DivDistance, DivAirportIDs, ArrDelay FROM mytable WHERE NASDelay NOT IN (22) ORDER BY OriginAirportID LIMIT 27","hsqls":["SELECT DivDistance, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay FROM mytable WHERE NASDelay NOT IN (22) ORDER BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DivAirportIDs, ArrDelay FROM mytable WHERE NASDelay NOT IN (22) ORDER BY OriginAirportID LIMIT 27","hsqls":["SELECT DivDistance, DivAirportIDs, ArrDelay FROM mytable WHERE NASDelay NOT IN (22) ORDER BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT MIN(DivDistance), MAX(Cancelled) FROM mytable LIMIT 25"}
-{"sql":"SELECT ArrDel15 FROM mytable WHERE CRSDepTime IN (1337, 744) OR DivLongestGTimes BETWEEN 78.0 AND 79.0 OR OriginStateFips <> 8 LIMIT 21","hsqls":["SELECT ArrDel15 FROM mytable WHERE CRSDepTime IN (1337, 744) OR (DivLongestGTimes__MV0 BETWEEN 78.0 AND 79.0 OR DivLongestGTimes__MV1 BETWEEN 78.0 AND 79.0 OR DivLongestGTimes__MV2 BETWEEN 78.0 AND 79.0 OR DivLongestGTimes__MV3 BETWEEN 78.0 AND 79.0 OR DivLongestGTimes__MV4 BETWEEN 78.0 AND 79.0) OR OriginStateFips <> 8 LIMIT 10000"]}
+{"sql":"SELECT ArrDel15 FROM mytable WHERE CRSDepTime IN (1337, 744) OR DivLongestGTimes BETWEEN 78.0 AND 79.0 OR OriginStateFips <> 8 LIMIT 21","hsqls":["SELECT ArrDel15 FROM mytable WHERE CRSDepTime IN (1337, 744) OR (DivLongestGTimes[1] BETWEEN 78.0 AND 79.0 OR DivLongestGTimes[2] BETWEEN 78.0 AND 79.0 OR DivLongestGTimes[3] BETWEEN 78.0 AND 79.0 OR DivLongestGTimes[4] BETWEEN 78.0 AND 79.0 OR DivLongestGTimes[5] BETWEEN 78.0 AND 79.0) OR OriginStateFips <> 8 LIMIT 10000"]}
 {"sql":"SELECT Carrier, ArrDel15, CancellationCode FROM mytable WHERE CarrierDelay BETWEEN 71 AND 14 OR CancellationCode BETWEEN 'C' AND 'A' ORDER BY DaysSinceEpoch LIMIT 20"}
 {"sql":"SELECT ArrDelay, CancellationCode, SUM(LongestAddGTime), COUNT(DestCityMarketID) FROM mytable WHERE TailNum <= 'N465WN' GROUP BY ArrDelay, CancellationCode  ORDER BY ArrDelay, CancellationCode LIMIT 18","hsqls":["SELECT ArrDelay, CancellationCode, SUM(LongestAddGTime), COUNT(DestCityMarketID) FROM mytable WHERE TailNum <= 'N465WN' GROUP BY ArrDelay, CancellationCode  ORDER BY ArrDelay, CancellationCode LIMIT 18"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE Flights > 1 AND DivAirportSeqIDs <= 1323002 AND DivAirportLandings BETWEEN 2 AND 2 LIMIT 16","hsqls":["SELECT COUNT(*) FROM mytable WHERE Flights > 1 AND (DivAirportSeqIDs__MV0 <= 1323002 OR DivAirportSeqIDs__MV1 <= 1323002 OR DivAirportSeqIDs__MV2 <= 1323002 OR DivAirportSeqIDs__MV3 <= 1323002 OR DivAirportSeqIDs__MV4 <= 1323002) AND DivAirportLandings BETWEEN 2 AND 2 LIMIT 10000"]}
-{"sql":"SELECT SecurityDelay, ArrDelayMinutes FROM mytable WHERE DivTailNums IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') AND WheelsOn NOT IN (1149, 1236, 234) LIMIT 20","hsqls":["SELECT SecurityDelay, ArrDelayMinutes FROM mytable WHERE (DivTailNums__MV0 IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums__MV1 IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums__MV2 IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums__MV3 IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums__MV4 IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA')) AND WheelsOn NOT IN (1149, 1236, 234) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE Flights > 1 AND DivAirportSeqIDs <= 1323002 AND DivAirportLandings BETWEEN 2 AND 2 LIMIT 16","hsqls":["SELECT COUNT(*) FROM mytable WHERE Flights > 1 AND (DivAirportSeqIDs[1] <= 1323002 OR DivAirportSeqIDs[2] <= 1323002 OR DivAirportSeqIDs[3] <= 1323002 OR DivAirportSeqIDs[4] <= 1323002 OR DivAirportSeqIDs[5] <= 1323002) AND DivAirportLandings BETWEEN 2 AND 2 LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, ArrDelayMinutes FROM mytable WHERE DivTailNums IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') AND WheelsOn NOT IN (1149, 1236, 234) LIMIT 20","hsqls":["SELECT SecurityDelay, ArrDelayMinutes FROM mytable WHERE (DivTailNums[1] IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums[2] IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums[3] IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums[4] IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA') OR DivTailNums[5] IN ('N607SK', 'N615MQ', 'N195PQ', 'N3FAAA')) AND WheelsOn NOT IN (1149, 1236, 234) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityName <= 'Beaumont/Port Arthur, TX' OR DestAirportID NOT IN (10980, 11076, 10930, 11274) LIMIT 16"}
 {"sql":"SELECT DestStateName, OriginStateName, MAX(WheelsOff), COUNT(FlightNum), AVG(Flights) FROM mytable WHERE DestCityName NOT IN ('Brainerd, MN', 'Evansville, IN', 'Hayden, CO', 'Greer, SC') OR DepTimeBlk BETWEEN '0700-0759' AND '1000-1059' GROUP BY DestStateName, OriginStateName  ORDER BY DestStateName, OriginStateName LIMIT 2","hsqls":["SELECT DestStateName, OriginStateName, MAX(WheelsOff), COUNT(FlightNum), AVG(Flights) FROM mytable WHERE DestCityName NOT IN ('Brainerd, MN', 'Evansville, IN', 'Hayden, CO', 'Greer, SC') OR DepTimeBlk BETWEEN '0700-0759' AND '1000-1059' GROUP BY DestStateName, OriginStateName  ORDER BY DestStateName, OriginStateName LIMIT 2"]}
 {"sql":"SELECT TailNum, MAX(OriginAirportID), AVG(OriginStateFips) FROM mytable WHERE SecurityDelay BETWEEN 10 AND 10 OR ArrTime BETWEEN 325 AND 1929 AND ArrTimeBlk > '2200-2259' GROUP BY TailNum  ORDER BY TailNum LIMIT 28","hsqls":["SELECT TailNum, MAX(OriginAirportID), AVG(OriginStateFips) FROM mytable WHERE SecurityDelay BETWEEN 10 AND 10 OR ArrTime BETWEEN 325 AND 1929 AND ArrTimeBlk > '2200-2259' GROUP BY TailNum  ORDER BY TailNum LIMIT 28"]}
 {"sql":"SELECT Dest FROM mytable LIMIT 7"}
 {"sql":"SELECT DestCityMarketID, DivArrDelay, DayOfWeek, COUNT(*) FROM mytable GROUP BY DestCityMarketID, DivArrDelay, DayOfWeek  ORDER BY DestCityMarketID, DivArrDelay, DayOfWeek LIMIT 21","hsqls":["SELECT DestCityMarketID, DivArrDelay, DayOfWeek, COUNT(*) FROM mytable GROUP BY DestCityMarketID, DivArrDelay, DayOfWeek  ORDER BY DestCityMarketID, DivArrDelay, DayOfWeek LIMIT 21"]}
-{"sql":"SELECT SUM(DestAirportSeqID), MIN(\"Month\"), MAX(DayOfWeek) FROM mytable LIMIT 20","hsqls":["SELECT SUM(DestAirportSeqID), MIN(Month), MAX(DayOfWeek) FROM mytable LIMIT 20"]}
+{"sql":"SELECT SUM(DestAirportSeqID), MIN(\"Month\"), MAX(DayOfWeek) FROM mytable LIMIT 20","hsqls":["SELECT SUM(DestAirportSeqID), MIN(`Month`), MAX(DayOfWeek) FROM mytable LIMIT 20"]}
 {"sql":"SELECT Carrier, OriginCityName, ActualElapsedTime, MIN(DepDelayMinutes), MIN(ArrDelay) FROM mytable WHERE FlightDate BETWEEN '2014-01-30' AND '2014-01-09' OR DivDistance BETWEEN 369 AND 416 GROUP BY Carrier, OriginCityName, ActualElapsedTime  ORDER BY Carrier, OriginCityName, ActualElapsedTime LIMIT 7","hsqls":["SELECT Carrier, OriginCityName, ActualElapsedTime, MIN(DepDelayMinutes), MIN(ArrDelay) FROM mytable WHERE FlightDate BETWEEN '2014-01-30' AND '2014-01-09' OR DivDistance BETWEEN 369 AND 416 GROUP BY Carrier, OriginCityName, ActualElapsedTime  ORDER BY Carrier, OriginCityName, ActualElapsedTime LIMIT 7"]}
 {"sql":"SELECT DivReachedDest, Quarter, OriginStateFips, MAX(ArrDelay), MAX(DivAirportLandings) FROM mytable WHERE OriginAirportSeqID = 1198603 GROUP BY DivReachedDest, Quarter, OriginStateFips  ORDER BY DivReachedDest, Quarter, OriginStateFips LIMIT 12","hsqls":["SELECT DivReachedDest, Quarter, OriginStateFips, MAX(ArrDelay), MAX(DivAirportLandings) FROM mytable WHERE OriginAirportSeqID = 1198603 GROUP BY DivReachedDest, Quarter, OriginStateFips  ORDER BY DivReachedDest, Quarter, OriginStateFips LIMIT 12"]}
 {"sql":"SELECT ArrTime, Origin FROM mytable WHERE LongestAddGTime BETWEEN 55 AND 7 ORDER BY DistanceGroup, OriginCityName, CRSDepTime LIMIT 15"}
 {"sql":"SELECT DivDistance FROM mytable WHERE CRSArrTime NOT IN (1455, 545, 1932, 1127) AND OriginAirportSeqID > 1336003 AND ArrTimeBlk < '1900-1959' ORDER BY CarrierDelay, AirlineID LIMIT 5"}
 {"sql":"SELECT DestStateFips, DestAirportSeqID FROM mytable WHERE DestAirportID BETWEEN 14747 AND 12451 OR DivDistance IN (687, 68, 51, 296, 402) AND ArrDel15 BETWEEN 1 AND -9999 ORDER BY Carrier, DepDelayMinutes, ArrivalDelayGroups LIMIT 5"}
 {"sql":"SELECT OriginState, DepTime, COUNT(*) FROM mytable WHERE Origin < 'LAW' AND ArrivalDelayGroups <> 11 OR DayofMonth BETWEEN 30 AND 15 GROUP BY OriginState, DepTime  ORDER BY OriginState, DepTime LIMIT 22","hsqls":["SELECT OriginState, DepTime, COUNT(*) FROM mytable WHERE Origin < 'LAW' AND ArrivalDelayGroups <> 11 OR DayofMonth BETWEEN 30 AND 15 GROUP BY OriginState, DepTime  ORDER BY OriginState, DepTime LIMIT 22"]}
-{"sql":"SELECT Distance, Origin FROM mytable ORDER BY \"Month\" LIMIT 2","hsqls":["SELECT Distance, Origin FROM mytable ORDER BY Month LIMIT 2"]}
-{"sql":"SELECT NASDelay, DivTotalGTimes, DayOfWeek FROM mytable WHERE DivAirportLandings NOT IN (2, 9) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 2","hsqls":["SELECT NASDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, DayOfWeek FROM mytable WHERE DivAirportLandings NOT IN (2, 9) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT \"Year\", COUNT(*) FROM mytable WHERE OriginStateFips IN (31, 36, 53, 16, 38) OR SecurityDelay = 4 GROUP BY \"Year\" LIMIT 18","hsqls":["SELECT Year, COUNT(*) FROM mytable WHERE OriginStateFips IN (31, 36, 53, 16, 38) OR SecurityDelay = 4 GROUP BY Year LIMIT 18"]}
-{"sql":"SELECT DepDelay, Distance, DestStateName FROM mytable WHERE LateAircraftDelay >= 149 ORDER BY OriginCityName, TaxiIn, \"Month\" LIMIT 26","hsqls":["SELECT DepDelay, Distance, DestStateName FROM mytable WHERE LateAircraftDelay >= 149 ORDER BY OriginCityName, TaxiIn, Month LIMIT 26"]}
+{"sql":"SELECT Distance, Origin FROM mytable ORDER BY \"Month\" LIMIT 2","hsqls":["SELECT Distance, Origin FROM mytable ORDER BY `Month` LIMIT 2"]}
+{"sql":"SELECT NASDelay, DivTotalGTimes, DayOfWeek FROM mytable WHERE DivAirportLandings NOT IN (2, 9) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 2","hsqls":["SELECT NASDelay, DivTotalGTimes, DayOfWeek FROM mytable WHERE DivAirportLandings NOT IN (2, 9) ORDER BY ArrDel15, AirlineID, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT \"Year\", COUNT(*) FROM mytable WHERE OriginStateFips IN (31, 36, 53, 16, 38) OR SecurityDelay = 4 GROUP BY \"Year\" LIMIT 18","hsqls":["SELECT Year, COUNT(*) FROM mytable WHERE OriginStateFips IN (31, 36, 53, 16, 38) OR SecurityDelay = 4 GROUP BY `Year` LIMIT 18"]}
+{"sql":"SELECT DepDelay, Distance, DestStateName FROM mytable WHERE LateAircraftDelay >= 149 ORDER BY OriginCityName, TaxiIn, \"Month\" LIMIT 26","hsqls":["SELECT DepDelay, Distance, DestStateName FROM mytable WHERE LateAircraftDelay >= 149 ORDER BY OriginCityName, TaxiIn, `Month` LIMIT 26"]}
 {"sql":"SELECT ArrDelayMinutes, SUM(Quarter) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 5","hsqls":["SELECT ArrDelayMinutes, SUM(Quarter) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 5"]}
-{"sql":"SELECT Diverted, Quarter, DivAirportSeqIDs FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'AS' ORDER BY CRSArrTime, ActualElapsedTime LIMIT 11","hsqls":["SELECT Diverted, Quarter, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'AS' ORDER BY CRSArrTime, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT Diverted, Quarter, DivAirportSeqIDs FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'AS' ORDER BY CRSArrTime, ActualElapsedTime LIMIT 11","hsqls":["SELECT Diverted, Quarter, DivAirportSeqIDs FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'AS' ORDER BY CRSArrTime, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDel15 IN (1, 0, -9999) LIMIT 12"}
 {"sql":"SELECT DivReachedDest, Cancelled, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY DivReachedDest, Cancelled, ArrivalDelayGroups  ORDER BY DivReachedDest, Cancelled, ArrivalDelayGroups LIMIT 2","hsqls":["SELECT DivReachedDest, Cancelled, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY DivReachedDest, Cancelled, ArrivalDelayGroups  ORDER BY DivReachedDest, Cancelled, ArrivalDelayGroups LIMIT 2"]}
-{"sql":"SELECT DivArrDelay, CRSElapsedTime, AVG(TaxiOut), SUM(SecurityDelay) FROM mytable WHERE DivWheelsOns BETWEEN 2050 AND 1101 GROUP BY DivArrDelay, CRSElapsedTime LIMIT 17","hsqls":["SELECT DivArrDelay, CRSElapsedTime, AVG(TaxiOut), SUM(SecurityDelay) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 2050 AND 1101 OR DivWheelsOns__MV1 BETWEEN 2050 AND 1101 OR DivWheelsOns__MV2 BETWEEN 2050 AND 1101 OR DivWheelsOns__MV3 BETWEEN 2050 AND 1101 OR DivWheelsOns__MV4 BETWEEN 2050 AND 1101) GROUP BY DivArrDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginState, CarrierDelay FROM mytable WHERE Quarter IN (1) AND DivAirportSeqIDs < 1410803 OR DepDelayMinutes BETWEEN 38.0 AND 121.0 ORDER BY DaysSinceEpoch LIMIT 3","hsqls":["SELECT OriginState, CarrierDelay FROM mytable WHERE Quarter IN (1) AND (DivAirportSeqIDs__MV0 < 1410803 OR DivAirportSeqIDs__MV1 < 1410803 OR DivAirportSeqIDs__MV2 < 1410803 OR DivAirportSeqIDs__MV3 < 1410803 OR DivAirportSeqIDs__MV4 < 1410803) OR DepDelayMinutes BETWEEN 38.0 AND 121.0 ORDER BY DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivArrDelay, CRSElapsedTime, AVG(TaxiOut), SUM(SecurityDelay) FROM mytable WHERE DivWheelsOns BETWEEN 2050 AND 1101 GROUP BY DivArrDelay, CRSElapsedTime LIMIT 17","hsqls":["SELECT DivArrDelay, CRSElapsedTime, AVG(TaxiOut), SUM(SecurityDelay) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 2050 AND 1101 OR DivWheelsOns[2] BETWEEN 2050 AND 1101 OR DivWheelsOns[3] BETWEEN 2050 AND 1101 OR DivWheelsOns[4] BETWEEN 2050 AND 1101 OR DivWheelsOns[5] BETWEEN 2050 AND 1101) GROUP BY DivArrDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginState, CarrierDelay FROM mytable WHERE Quarter IN (1) AND DivAirportSeqIDs < 1410803 OR DepDelayMinutes BETWEEN 38.0 AND 121.0 ORDER BY DaysSinceEpoch LIMIT 3","hsqls":["SELECT OriginState, CarrierDelay FROM mytable WHERE Quarter IN (1) AND (DivAirportSeqIDs[1] < 1410803 OR DivAirportSeqIDs[2] < 1410803 OR DivAirportSeqIDs[3] < 1410803 OR DivAirportSeqIDs[4] < 1410803 OR DivAirportSeqIDs[5] < 1410803) OR DepDelayMinutes BETWEEN 38.0 AND 121.0 ORDER BY DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, COUNT(*) FROM mytable WHERE DepDelay BETWEEN 123.0 AND 199.0 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 10","hsqls":["SELECT WheelsOff, COUNT(*) FROM mytable WHERE DepDelay BETWEEN 123.0 AND 199.0 GROUP BY WheelsOff  ORDER BY WheelsOff LIMIT 10"]}
 {"sql":"SELECT DivReachedDest, CarrierDelay FROM mytable WHERE ArrivalDelayGroups <= 8 OR CRSArrTime = 1618 ORDER BY ArrDel15, CRSDepTime LIMIT 23"}
 {"sql":"SELECT DayofMonth, DivArrDelay, MIN(DepDelayMinutes), COUNT(WheelsOn), MIN(DivArrDelay) FROM mytable WHERE TaxiOut BETWEEN 4 AND 44 OR TaxiIn NOT IN (21, 41, 14, 84) OR Origin >= 'CLT' GROUP BY DayofMonth, DivArrDelay  ORDER BY DayofMonth, DivArrDelay LIMIT 13","hsqls":["SELECT DayofMonth, DivArrDelay, MIN(DepDelayMinutes), COUNT(WheelsOn), MIN(DivArrDelay) FROM mytable WHERE TaxiOut BETWEEN 4 AND 44 OR TaxiIn NOT IN (21, 41, 14, 84) OR Origin >= 'CLT' GROUP BY DayofMonth, DivArrDelay  ORDER BY DayofMonth, DivArrDelay LIMIT 13"]}
 {"sql":"SELECT SUM(DivAirportLandings), MAX(Quarter), MAX(DivActualElapsedTime) FROM mytable WHERE DestCityMarketID < 34570 AND DestCityMarketID NOT IN (32402, 30299) OR ActualElapsedTime IN (298, 502, 603, 28) LIMIT 19"}
 {"sql":"SELECT OriginStateFips, ArrTimeBlk, OriginAirportID FROM mytable WHERE DivArrDelay NOT IN (161, 864, 410, 9, 710) LIMIT 13"}
 {"sql":"SELECT ArrDelayMinutes, ArrTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (1, -2) GROUP BY ArrDelayMinutes, ArrTimeBlk, OriginAirportID  ORDER BY ArrDelayMinutes, ArrTimeBlk, OriginAirportID LIMIT 3","hsqls":["SELECT ArrDelayMinutes, ArrTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE ArrivalDelayGroups NOT IN (1, -2) GROUP BY ArrDelayMinutes, ArrTimeBlk, OriginAirportID  ORDER BY ArrDelayMinutes, ArrTimeBlk, OriginAirportID LIMIT 3"]}
-{"sql":"SELECT OriginState, ArrDelay, COUNT(ArrivalDelayGroups) FROM mytable WHERE \"Year\" NOT IN (2014) AND DivWheelsOns > 1455 GROUP BY OriginState, ArrDelay","hsqls":["SELECT OriginState, ArrDelay, COUNT(ArrivalDelayGroups) FROM mytable WHERE Year NOT IN (2014) AND (DivWheelsOns__MV0 > 1455 OR DivWheelsOns__MV1 > 1455 OR DivWheelsOns__MV2 > 1455 OR DivWheelsOns__MV3 > 1455 OR DivWheelsOns__MV4 > 1455) GROUP BY OriginState, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT OriginState, ArrDelay, COUNT(ArrivalDelayGroups) FROM mytable WHERE \"Year\" NOT IN (2014) AND DivWheelsOns > 1455 GROUP BY OriginState, ArrDelay","hsqls":["SELECT OriginState, ArrDelay, COUNT(ArrivalDelayGroups) FROM mytable WHERE `Year` NOT IN (2014) AND (DivWheelsOns[1] > 1455 OR DivWheelsOns[2] > 1455 OR DivWheelsOns[3] > 1455 OR DivWheelsOns[4] > 1455 OR DivWheelsOns[5] > 1455) GROUP BY OriginState, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT Diverted, Origin, COUNT(*) FROM mytable GROUP BY Diverted, Origin  ORDER BY Diverted, Origin LIMIT 14","hsqls":["SELECT Diverted, Origin, COUNT(*) FROM mytable GROUP BY Diverted, Origin  ORDER BY Diverted, Origin LIMIT 14"]}
 {"sql":"SELECT TaxiIn, DestStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 120.0 AND 134.0 GROUP BY TaxiIn, DestStateName","hsqls":["SELECT TaxiIn, DestStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 120.0 AND 134.0 GROUP BY TaxiIn, DestStateName"]}
-{"sql":"SELECT WheelsOff, DivTotalGTimes FROM mytable ORDER BY SecurityDelay, Distance, DestCityMarketID LIMIT 13","hsqls":["SELECT WheelsOff, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY SecurityDelay, Distance, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT Carrier, Distance, TotalAddGTime FROM mytable WHERE DivAirportLandings >= 0 AND DivTotalGTimes BETWEEN 78 AND 69 ORDER BY Quarter LIMIT 20","hsqls":["SELECT Carrier, Distance, TotalAddGTime FROM mytable WHERE DivAirportLandings >= 0 AND (DivTotalGTimes__MV0 BETWEEN 78 AND 69 OR DivTotalGTimes__MV1 BETWEEN 78 AND 69 OR DivTotalGTimes__MV2 BETWEEN 78 AND 69 OR DivTotalGTimes__MV3 BETWEEN 78 AND 69 OR DivTotalGTimes__MV4 BETWEEN 78 AND 69) ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivTotalGTimes FROM mytable ORDER BY SecurityDelay, Distance, DestCityMarketID LIMIT 13","hsqls":["SELECT WheelsOff, DivTotalGTimes FROM mytable ORDER BY SecurityDelay, Distance, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT Carrier, Distance, TotalAddGTime FROM mytable WHERE DivAirportLandings >= 0 AND DivTotalGTimes BETWEEN 78 AND 69 ORDER BY Quarter LIMIT 20","hsqls":["SELECT Carrier, Distance, TotalAddGTime FROM mytable WHERE DivAirportLandings >= 0 AND (DivTotalGTimes[1] BETWEEN 78 AND 69 OR DivTotalGTimes[2] BETWEEN 78 AND 69 OR DivTotalGTimes[3] BETWEEN 78 AND 69 OR DivTotalGTimes[4] BETWEEN 78 AND 69 OR DivTotalGTimes[5] BETWEEN 78 AND 69) ORDER BY Quarter LIMIT 10000"]}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY Quarter, ActualElapsedTime LIMIT 4"}
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE DestCityMarketID BETWEEN 35165 AND 35323 AND DestStateFips = 51 AND OriginCityName <= 'Manhattan/Ft. Riley, KS' ORDER BY Flights LIMIT 6"}
-{"sql":"SELECT CRSArrTime, MAX(CRSArrTime), SUM(Quarter), MAX(OriginStateFips) FROM mytable WHERE DivLongestGTimes BETWEEN 145.0 AND 96.0 GROUP BY CRSArrTime LIMIT 23","hsqls":["SELECT CRSArrTime, MAX(CRSArrTime), SUM(Quarter), MAX(OriginStateFips) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 145.0 AND 96.0 OR DivLongestGTimes__MV1 BETWEEN 145.0 AND 96.0 OR DivLongestGTimes__MV2 BETWEEN 145.0 AND 96.0 OR DivLongestGTimes__MV3 BETWEEN 145.0 AND 96.0 OR DivLongestGTimes__MV4 BETWEEN 145.0 AND 96.0) GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, MAX(CRSArrTime), SUM(Quarter), MAX(OriginStateFips) FROM mytable WHERE DivLongestGTimes BETWEEN 145.0 AND 96.0 GROUP BY CRSArrTime LIMIT 23","hsqls":["SELECT CRSArrTime, MAX(CRSArrTime), SUM(Quarter), MAX(OriginStateFips) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 145.0 AND 96.0 OR DivLongestGTimes[2] BETWEEN 145.0 AND 96.0 OR DivLongestGTimes[3] BETWEEN 145.0 AND 96.0 OR DivLongestGTimes[4] BETWEEN 145.0 AND 96.0 OR DivLongestGTimes[5] BETWEEN 145.0 AND 96.0) GROUP BY CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, TailNum FROM mytable WHERE DestStateName <> 'Nevada' OR DepartureDelayGroups IN (2, 12) ORDER BY DestWac, TailNum LIMIT 6"}
 {"sql":"SELECT DestWac, DepDelay FROM mytable WHERE Origin BETWEEN 'ABE' AND 'LGB' OR AirlineID IN (20436, 19790, 19805, 21171, 19977) AND LongestAddGTime < 54 ORDER BY FlightNum, Distance, DepDel15 LIMIT 16"}
 {"sql":"SELECT LongestAddGTime, AirTime FROM mytable WHERE AirlineID = 20398 OR DaysSinceEpoch >= 16072 AND OriginAirportID <> 11042 ORDER BY OriginCityMarketID, ActualElapsedTime LIMIT 22"}
 {"sql":"SELECT OriginCityMarketID, CRSElapsedTime, AVG(WheelsOn), MAX(Diverted), AVG(DivAirportLandings) FROM mytable WHERE ArrTime = 620 OR CancellationCode >= 'noodles' GROUP BY OriginCityMarketID, CRSElapsedTime  ORDER BY OriginCityMarketID, CRSElapsedTime LIMIT 16","hsqls":["SELECT OriginCityMarketID, CRSElapsedTime, AVG(WheelsOn), MAX(Diverted), AVG(DivAirportLandings) FROM mytable WHERE ArrTime = 620 OR CancellationCode >= 'noodles' GROUP BY OriginCityMarketID, CRSElapsedTime  ORDER BY OriginCityMarketID, CRSElapsedTime LIMIT 16"]}
 {"sql":"SELECT CRSArrTime, DepTimeBlk, DaysSinceEpoch FROM mytable ORDER BY DestStateFips, DayofMonth LIMIT 28"}
-{"sql":"SELECT Diverted, TailNum, COUNT(DivArrDelay), AVG(AirTime), MAX(\"Month\") FROM mytable GROUP BY Diverted, TailNum LIMIT 27","hsqls":["SELECT Diverted, TailNum, COUNT(DivArrDelay), AVG(AirTime), MAX(Month) FROM mytable GROUP BY Diverted, TailNum LIMIT 27"]}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16084 ORDER BY DivDistance LIMIT 25","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16084 ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT Diverted, TailNum, COUNT(DivArrDelay), AVG(AirTime), MAX(\"Month\") FROM mytable GROUP BY Diverted, TailNum LIMIT 27","hsqls":["SELECT Diverted, TailNum, COUNT(DivArrDelay), AVG(AirTime), MAX(`Month`) FROM mytable GROUP BY Diverted, TailNum LIMIT 27"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16084 ORDER BY DivDistance LIMIT 25","hsqls":["SELECT DivWheelsOns FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16084 ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, Diverted, OriginAirportID FROM mytable WHERE WheelsOn < 27 ORDER BY CRSElapsedTime LIMIT 13"}
 {"sql":"SELECT DivArrDelay FROM mytable ORDER BY DayOfWeek LIMIT 3"}
-{"sql":"SELECT WeatherDelay, NASDelay, DivAirportLandings, COUNT(NASDelay), AVG(TaxiIn), COUNT(Distance) FROM mytable WHERE FlightNum > 886 OR Dest > 'PWM' OR DivAirportSeqIDs BETWEEN 1507002 AND 1020803 GROUP BY WeatherDelay, NASDelay, DivAirportLandings LIMIT 16","hsqls":["SELECT WeatherDelay, NASDelay, DivAirportLandings, COUNT(NASDelay), AVG(TaxiIn), COUNT(Distance) FROM mytable WHERE FlightNum > 886 OR Dest > 'PWM' OR (DivAirportSeqIDs__MV0 BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs__MV1 BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs__MV2 BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs__MV3 BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs__MV4 BETWEEN 1507002 AND 1020803) GROUP BY WeatherDelay, NASDelay, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, NASDelay, DivAirportLandings, COUNT(NASDelay), AVG(TaxiIn), COUNT(Distance) FROM mytable WHERE FlightNum > 886 OR Dest > 'PWM' OR DivAirportSeqIDs BETWEEN 1507002 AND 1020803 GROUP BY WeatherDelay, NASDelay, DivAirportLandings LIMIT 16","hsqls":["SELECT WeatherDelay, NASDelay, DivAirportLandings, COUNT(NASDelay), AVG(TaxiIn), COUNT(Distance) FROM mytable WHERE FlightNum > 886 OR Dest > 'PWM' OR (DivAirportSeqIDs[1] BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs[2] BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs[3] BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs[4] BETWEEN 1507002 AND 1020803 OR DivAirportSeqIDs[5] BETWEEN 1507002 AND 1020803) GROUP BY WeatherDelay, NASDelay, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE OriginCityName IN ('Dallas/Fort Worth, TX', 'Knoxville, TN', 'Burbank, CA') ORDER BY DistanceGroup, OriginState LIMIT 8"}
 {"sql":"SELECT ArrTime, ArrDel15 FROM mytable ORDER BY FlightNum, NASDelay, OriginAirportID LIMIT 23"}
 {"sql":"SELECT WheelsOff FROM mytable WHERE DistanceGroup IN (1, 7, 6, 4, 8) LIMIT 7"}
-{"sql":"SELECT ArrTime, DestStateName, DivAirportLandings FROM mytable WHERE Origin < 'DLH' OR DivWheelsOffs BETWEEN 1921 AND 1840 OR Diverted BETWEEN 1 AND 1 LIMIT 19","hsqls":["SELECT ArrTime, DestStateName, DivAirportLandings FROM mytable WHERE Origin < 'DLH' OR (DivWheelsOffs__MV0 BETWEEN 1921 AND 1840 OR DivWheelsOffs__MV1 BETWEEN 1921 AND 1840 OR DivWheelsOffs__MV2 BETWEEN 1921 AND 1840 OR DivWheelsOffs__MV3 BETWEEN 1921 AND 1840 OR DivWheelsOffs__MV4 BETWEEN 1921 AND 1840) OR Diverted BETWEEN 1 AND 1 LIMIT 10000"]}
-{"sql":"SELECT Diverted, CRSElapsedTime, DivTotalGTimes FROM mytable WHERE ArrTime BETWEEN 2325 AND 1956 AND DivReachedDest BETWEEN 0 AND 1 AND WheelsOff <> 707 ORDER BY OriginStateName LIMIT 13","hsqls":["SELECT Diverted, CRSElapsedTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE ArrTime BETWEEN 2325 AND 1956 AND DivReachedDest BETWEEN 0 AND 1 AND WheelsOff <> 707 ORDER BY OriginStateName LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums <= 'N796SK' LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums__MV0 <= 'N796SK' OR DivTailNums__MV1 <= 'N796SK' OR DivTailNums__MV2 <= 'N796SK' OR DivTailNums__MV3 <= 'N796SK' OR DivTailNums__MV4 <= 'N796SK') LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, Quarter FROM mytable WHERE DivAirports = 'GRR' ORDER BY OriginStateFips, WheelsOn LIMIT 21","hsqls":["SELECT DivReachedDest, Quarter FROM mytable WHERE (DivAirports__MV0 = 'GRR' OR DivAirports__MV1 = 'GRR' OR DivAirports__MV2 = 'GRR' OR DivAirports__MV3 = 'GRR' OR DivAirports__MV4 = 'GRR') ORDER BY OriginStateFips, WheelsOn LIMIT 10000"]}
-{"sql":"SELECT DivDistance FROM mytable WHERE CarrierDelay < 184 OR DivLongestGTimes IN (102.0, 136.0, 38.0) ORDER BY Carrier, TaxiIn LIMIT 26","hsqls":["SELECT DivDistance FROM mytable WHERE CarrierDelay < 184 OR (DivLongestGTimes__MV0 IN (102.0, 136.0, 38.0) OR DivLongestGTimes__MV1 IN (102.0, 136.0, 38.0) OR DivLongestGTimes__MV2 IN (102.0, 136.0, 38.0) OR DivLongestGTimes__MV3 IN (102.0, 136.0, 38.0) OR DivLongestGTimes__MV4 IN (102.0, 136.0, 38.0)) ORDER BY Carrier, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT ArrTime, DestStateName, DivAirportLandings FROM mytable WHERE Origin < 'DLH' OR DivWheelsOffs BETWEEN 1921 AND 1840 OR Diverted BETWEEN 1 AND 1 LIMIT 19","hsqls":["SELECT ArrTime, DestStateName, DivAirportLandings FROM mytable WHERE Origin < 'DLH' OR (DivWheelsOffs[1] BETWEEN 1921 AND 1840 OR DivWheelsOffs[2] BETWEEN 1921 AND 1840 OR DivWheelsOffs[3] BETWEEN 1921 AND 1840 OR DivWheelsOffs[4] BETWEEN 1921 AND 1840 OR DivWheelsOffs[5] BETWEEN 1921 AND 1840) OR Diverted BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT Diverted, CRSElapsedTime, DivTotalGTimes FROM mytable WHERE ArrTime BETWEEN 2325 AND 1956 AND DivReachedDest BETWEEN 0 AND 1 AND WheelsOff <> 707 ORDER BY OriginStateName LIMIT 13","hsqls":["SELECT Diverted, CRSElapsedTime, DivTotalGTimes FROM mytable WHERE ArrTime BETWEEN 2325 AND 1956 AND DivReachedDest BETWEEN 0 AND 1 AND WheelsOff <> 707 ORDER BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTailNums <= 'N796SK' LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTailNums[1] <= 'N796SK' OR DivTailNums[2] <= 'N796SK' OR DivTailNums[3] <= 'N796SK' OR DivTailNums[4] <= 'N796SK' OR DivTailNums[5] <= 'N796SK') LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, Quarter FROM mytable WHERE DivAirports = 'GRR' ORDER BY OriginStateFips, WheelsOn LIMIT 21","hsqls":["SELECT DivReachedDest, Quarter FROM mytable WHERE (DivAirports[1] = 'GRR' OR DivAirports[2] = 'GRR' OR DivAirports[3] = 'GRR' OR DivAirports[4] = 'GRR' OR DivAirports[5] = 'GRR') ORDER BY OriginStateFips, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivDistance FROM mytable WHERE CarrierDelay < 184 OR DivLongestGTimes IN (102.0, 136.0, 38.0) ORDER BY Carrier, TaxiIn LIMIT 26","hsqls":["SELECT DivDistance FROM mytable WHERE CarrierDelay < 184 OR (DivLongestGTimes[1] IN (102.0, 136.0, 38.0) OR DivLongestGTimes[2] IN (102.0, 136.0, 38.0) OR DivLongestGTimes[3] IN (102.0, 136.0, 38.0) OR DivLongestGTimes[4] IN (102.0, 136.0, 38.0) OR DivLongestGTimes[5] IN (102.0, 136.0, 38.0)) ORDER BY Carrier, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginWac), AVG(ArrDelayMinutes), AVG(WheelsOn) FROM mytable WHERE OriginStateName NOT IN ('Montana') OR NASDelay BETWEEN 7 AND 15 OR TaxiIn > 42 LIMIT 4"}
-{"sql":"SELECT DivLongestGTimes, Cancelled FROM mytable WHERE ArrivalDelayGroups < 8 AND FirstDepTime BETWEEN 640 AND 907 OR DepDelayMinutes <= 37.0 ORDER BY TotalAddGTime LIMIT 7","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Cancelled FROM mytable WHERE ArrivalDelayGroups < 8 AND FirstDepTime BETWEEN 640 AND 907 OR DepDelayMinutes <= 37.0 ORDER BY TotalAddGTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, DivLongestGTimes, ArrDelay FROM mytable WHERE ArrTime <= 1639 AND AirTime > 149 AND FlightNum BETWEEN 3830 AND 904 ORDER BY AirTime, OriginAirportID LIMIT 4","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrDelay FROM mytable WHERE ArrTime <= 1639 AND AirTime > 149 AND FlightNum BETWEEN 3830 AND 904 ORDER BY AirTime, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DivAirports, ArrTime FROM mytable ORDER BY FirstDepTime, OriginCityMarketID, Cancelled LIMIT 10","hsqls":["SELECT Year, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrTime FROM mytable ORDER BY FirstDepTime, OriginCityMarketID, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Cancelled FROM mytable WHERE ArrivalDelayGroups < 8 AND FirstDepTime BETWEEN 640 AND 907 OR DepDelayMinutes <= 37.0 ORDER BY TotalAddGTime LIMIT 7","hsqls":["SELECT DivLongestGTimes, Cancelled FROM mytable WHERE ArrivalDelayGroups < 8 AND FirstDepTime BETWEEN 640 AND 907 OR DepDelayMinutes <= 37.0 ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivLongestGTimes, ArrDelay FROM mytable WHERE ArrTime <= 1639 AND AirTime > 149 AND FlightNum BETWEEN 3830 AND 904 ORDER BY AirTime, OriginAirportID LIMIT 4","hsqls":["SELECT DivWheelsOns, DivLongestGTimes, ArrDelay FROM mytable WHERE ArrTime <= 1639 AND AirTime > 149 AND FlightNum BETWEEN 3830 AND 904 ORDER BY AirTime, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivAirports, ArrTime FROM mytable ORDER BY FirstDepTime, OriginCityMarketID, Cancelled LIMIT 10","hsqls":["SELECT Year, DivAirports, ArrTime FROM mytable ORDER BY FirstDepTime, OriginCityMarketID, Cancelled LIMIT 10000"]}
 {"sql":"SELECT Origin, DepTimeBlk FROM mytable WHERE OriginStateName < 'Montana' AND LateAircraftDelay NOT IN (83) AND DepTime BETWEEN 1741 AND 1053 ORDER BY ArrDelay, DayOfWeek LIMIT 14"}
 {"sql":"SELECT TotalAddGTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE Origin BETWEEN 'ALB' AND 'TRI' GROUP BY TotalAddGTime, DivActualElapsedTime  ORDER BY TotalAddGTime, DivActualElapsedTime LIMIT 19","hsqls":["SELECT TotalAddGTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE Origin BETWEEN 'ALB' AND 'TRI' GROUP BY TotalAddGTime, DivActualElapsedTime  ORDER BY TotalAddGTime, DivActualElapsedTime LIMIT 19"]}
 {"sql":"SELECT DestAirportID, \"Month\", UniqueCarrier, COUNT(*) FROM mytable GROUP BY DestAirportID, \"Month\", UniqueCarrier LIMIT 4","hsqls":["SELECT DestAirportID, Month, UniqueCarrier, COUNT(*) FROM mytable GROUP BY DestAirportID, Month, UniqueCarrier LIMIT 4"]}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE DivAirportLandings NOT IN (9) LIMIT 16"}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE Diverted <= 1 ORDER BY DivDistance LIMIT 3"}
-{"sql":"SELECT DestAirportSeqID, ArrDelayMinutes, OriginStateName, AVG(\"Year\") FROM mytable WHERE DivAirports BETWEEN 'HLN' AND 'BHM' GROUP BY DestAirportSeqID, ArrDelayMinutes, OriginStateName LIMIT 7","hsqls":["SELECT DestAirportSeqID, ArrDelayMinutes, OriginStateName, AVG(CAST(Year AS DOUBLE)) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'HLN' AND 'BHM' OR DivAirports__MV1 BETWEEN 'HLN' AND 'BHM' OR DivAirports__MV2 BETWEEN 'HLN' AND 'BHM' OR DivAirports__MV3 BETWEEN 'HLN' AND 'BHM' OR DivAirports__MV4 BETWEEN 'HLN' AND 'BHM') GROUP BY DestAirportSeqID, ArrDelayMinutes, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, ArrDelayMinutes, OriginStateName, AVG(\"Year\") FROM mytable WHERE DivAirports BETWEEN 'HLN' AND 'BHM' GROUP BY DestAirportSeqID, ArrDelayMinutes, OriginStateName LIMIT 7","hsqls":["SELECT DestAirportSeqID, ArrDelayMinutes, OriginStateName, AVG(CAST(Year AS DOUBLE)) FROM mytable WHERE (DivAirports[1] BETWEEN 'HLN' AND 'BHM' OR DivAirports[2] BETWEEN 'HLN' AND 'BHM' OR DivAirports[3] BETWEEN 'HLN' AND 'BHM' OR DivAirports[4] BETWEEN 'HLN' AND 'BHM' OR DivAirports[5] BETWEEN 'HLN' AND 'BHM') GROUP BY DestAirportSeqID, ArrDelayMinutes, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 ORDER BY ArrTime, NASDelay LIMIT 8"}
 {"sql":"SELECT DepDelay, OriginStateFips, AirlineID FROM mytable ORDER BY DestAirportSeqID LIMIT 14"}
-{"sql":"SELECT \"Year\", Distance, Dest FROM mytable WHERE ArrDel15 <= 0 ORDER BY CancellationCode, \"Month\" LIMIT 19","hsqls":["SELECT Year, Distance, Dest FROM mytable WHERE ArrDel15 <= 0 ORDER BY CancellationCode, Month LIMIT 19"]}
-{"sql":"SELECT LateAircraftDelay, DestStateName, OriginAirportID, COUNT(DepDel15), MAX(DivDistance), AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay BETWEEN 68.0 AND 203.0 AND DivWheelsOns = 2142 GROUP BY LateAircraftDelay, DestStateName, OriginAirportID LIMIT 9","hsqls":["SELECT LateAircraftDelay, DestStateName, OriginAirportID, COUNT(DepDel15), MAX(DivDistance), AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay BETWEEN 68.0 AND 203.0 AND (DivWheelsOns__MV0 = 2142 OR DivWheelsOns__MV1 = 2142 OR DivWheelsOns__MV2 = 2142 OR DivWheelsOns__MV3 = 2142 OR DivWheelsOns__MV4 = 2142) GROUP BY LateAircraftDelay, DestStateName, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT Carrier, DivArrDelay, DaysSinceEpoch, AVG(\"Month\") FROM mytable WHERE NASDelay BETWEEN 33 AND 82 AND UniqueCarrier BETWEEN 'HA' AND 'MQ' GROUP BY Carrier, DivArrDelay, DaysSinceEpoch LIMIT 5","hsqls":["SELECT Carrier, DivArrDelay, DaysSinceEpoch, AVG(Month) FROM mytable WHERE NASDelay BETWEEN 33 AND 82 AND UniqueCarrier BETWEEN 'HA' AND 'MQ' GROUP BY Carrier, DivArrDelay, DaysSinceEpoch LIMIT 5"]}
+{"sql":"SELECT \"Year\", Distance, Dest FROM mytable WHERE ArrDel15 <= 0 ORDER BY CancellationCode, \"Month\" LIMIT 19","hsqls":["SELECT Year, Distance, Dest FROM mytable WHERE ArrDel15 <= 0 ORDER BY CancellationCode, `Month` LIMIT 19"]}
+{"sql":"SELECT LateAircraftDelay, DestStateName, OriginAirportID, COUNT(DepDel15), MAX(DivDistance), AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay BETWEEN 68.0 AND 203.0 AND DivWheelsOns = 2142 GROUP BY LateAircraftDelay, DestStateName, OriginAirportID LIMIT 9","hsqls":["SELECT LateAircraftDelay, DestStateName, OriginAirportID, COUNT(DepDel15), MAX(DivDistance), AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay BETWEEN 68.0 AND 203.0 AND (DivWheelsOns[1] = 2142 OR DivWheelsOns[2] = 2142 OR DivWheelsOns[3] = 2142 OR DivWheelsOns[4] = 2142 OR DivWheelsOns[5] = 2142) GROUP BY LateAircraftDelay, DestStateName, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT Carrier, DivArrDelay, DaysSinceEpoch, AVG(\"Month\") FROM mytable WHERE NASDelay BETWEEN 33 AND 82 AND UniqueCarrier BETWEEN 'HA' AND 'MQ' GROUP BY Carrier, DivArrDelay, DaysSinceEpoch LIMIT 5","hsqls":["SELECT Carrier, DivArrDelay, DaysSinceEpoch, AVG(`Month`) FROM mytable WHERE NASDelay BETWEEN 33 AND 82 AND UniqueCarrier BETWEEN 'HA' AND 'MQ' GROUP BY Carrier, DivArrDelay, DaysSinceEpoch LIMIT 5"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE UniqueCarrier NOT IN ('B6', 'AS') OR WheelsOff NOT IN (1810, 2021) LIMIT 21"}
 {"sql":"SELECT AirTime, DestCityMarketID FROM mytable WHERE DepDelayMinutes >= 114.0 AND DestCityMarketID = 31003 OR OriginCityName > 'Fayetteville, NC' ORDER BY OriginAirportID LIMIT 26"}
 {"sql":"SELECT FlightDate, WheelsOn FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') OR DivReachedDest NOT IN (1, -9999) AND ArrivalDelayGroups BETWEEN 0 AND -2 LIMIT 1"}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE TaxiIn > 51 OR DepDelay BETWEEN 206.0 AND 246.0 AND Carrier = 'MQ' ORDER BY TailNum, DivAirportLandings, DestAirportID LIMIT 16"}
-{"sql":"SELECT WheelsOff, SecurityDelay FROM mytable WHERE ArrTime > 2039 AND CRSArrTime BETWEEN 810 AND 1104 OR \"Month\" NOT IN (1) ORDER BY DestWac, ArrTimeBlk LIMIT 22","hsqls":["SELECT WheelsOff, SecurityDelay FROM mytable WHERE ArrTime > 2039 AND CRSArrTime BETWEEN 810 AND 1104 OR Month NOT IN (1) ORDER BY DestWac, ArrTimeBlk LIMIT 22"]}
-{"sql":"SELECT Flights, DivTailNums FROM mytable WHERE FlightNum <= 4446 OR FlightDate BETWEEN '2014-01-08' AND '2014-01-14' LIMIT 20","hsqls":["SELECT Flights, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE FlightNum <= 4446 OR FlightDate BETWEEN '2014-01-08' AND '2014-01-14' LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, SecurityDelay FROM mytable WHERE ArrTime > 2039 AND CRSArrTime BETWEEN 810 AND 1104 OR \"Month\" NOT IN (1) ORDER BY DestWac, ArrTimeBlk LIMIT 22","hsqls":["SELECT WheelsOff, SecurityDelay FROM mytable WHERE ArrTime > 2039 AND CRSArrTime BETWEEN 810 AND 1104 OR `Month` NOT IN (1) ORDER BY DestWac, ArrTimeBlk LIMIT 22"]}
+{"sql":"SELECT Flights, DivTailNums FROM mytable WHERE FlightNum <= 4446 OR FlightDate BETWEEN '2014-01-08' AND '2014-01-14' LIMIT 20","hsqls":["SELECT Flights, DivTailNums FROM mytable WHERE FlightNum <= 4446 OR FlightDate BETWEEN '2014-01-08' AND '2014-01-14' LIMIT 10000"]}
 {"sql":"SELECT \"Year\", SecurityDelay, OriginStateName, COUNT(*) FROM mytable GROUP BY \"Year\", SecurityDelay, OriginStateName LIMIT 26","hsqls":["SELECT Year, SecurityDelay, OriginStateName, COUNT(*) FROM mytable GROUP BY Year, SecurityDelay, OriginStateName LIMIT 26"]}
-{"sql":"SELECT DestState FROM mytable WHERE FlightDate <= '2014-01-16' OR DivLongestGTimes BETWEEN 31.0 AND 38.0 ORDER BY FlightNum, DepDel15 LIMIT 10","hsqls":["SELECT DestState FROM mytable WHERE FlightDate <= '2014-01-16' OR (DivLongestGTimes__MV0 BETWEEN 31.0 AND 38.0 OR DivLongestGTimes__MV1 BETWEEN 31.0 AND 38.0 OR DivLongestGTimes__MV2 BETWEEN 31.0 AND 38.0 OR DivLongestGTimes__MV3 BETWEEN 31.0 AND 38.0 OR DivLongestGTimes__MV4 BETWEEN 31.0 AND 38.0) ORDER BY FlightNum, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DestState FROM mytable WHERE FlightDate <= '2014-01-16' OR DivLongestGTimes BETWEEN 31.0 AND 38.0 ORDER BY FlightNum, DepDel15 LIMIT 10","hsqls":["SELECT DestState FROM mytable WHERE FlightDate <= '2014-01-16' OR (DivLongestGTimes[1] BETWEEN 31.0 AND 38.0 OR DivLongestGTimes[2] BETWEEN 31.0 AND 38.0 OR DivLongestGTimes[3] BETWEEN 31.0 AND 38.0 OR DivLongestGTimes[4] BETWEEN 31.0 AND 38.0 OR DivLongestGTimes[5] BETWEEN 31.0 AND 38.0) ORDER BY FlightNum, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT DepDelay, OriginWac FROM mytable WHERE OriginAirportSeqID NOT IN (1233502, 1195302, 1073905, 1402702, 1329002) ORDER BY Dest LIMIT 28"}
 {"sql":"SELECT MAX(DayofMonth) FROM mytable WHERE OriginWac NOT IN (31) AND WeatherDelay >= 62 LIMIT 12"}
-{"sql":"SELECT Distance, ArrTime, DivAirportIDs FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'B' AND CRSDepTime BETWEEN 1227 AND 2037 AND SecurityDelay BETWEEN 0 AND 4 ORDER BY DistanceGroup, CRSElapsedTime LIMIT 27","hsqls":["SELECT Distance, ArrTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'B' AND CRSDepTime BETWEEN 1227 AND 2037 AND SecurityDelay BETWEEN 0 AND 4 ORDER BY DistanceGroup, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE \"Year\" IN (2014) AND DepDelayMinutes >= 134.0 ORDER BY OriginAirportSeqID, DepDelayMinutes, AirTime LIMIT 26","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Year IN (2014) AND DepDelayMinutes >= 134.0 ORDER BY OriginAirportSeqID, DepDelayMinutes, AirTime LIMIT 10000"]}
+{"sql":"SELECT Distance, ArrTime, DivAirportIDs FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'B' AND CRSDepTime BETWEEN 1227 AND 2037 AND SecurityDelay BETWEEN 0 AND 4 ORDER BY DistanceGroup, CRSElapsedTime LIMIT 27","hsqls":["SELECT Distance, ArrTime, DivAirportIDs FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'B' AND CRSDepTime BETWEEN 1227 AND 2037 AND SecurityDelay BETWEEN 0 AND 4 ORDER BY DistanceGroup, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE \"Year\" IN (2014) AND DepDelayMinutes >= 134.0 ORDER BY OriginAirportSeqID, DepDelayMinutes, AirTime LIMIT 26","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE `Year` IN (2014) AND DepDelayMinutes >= 134.0 ORDER BY OriginAirportSeqID, DepDelayMinutes, AirTime LIMIT 10000"]}
 {"sql":"SELECT DepDelay, \"Month\", OriginAirportID FROM mytable ORDER BY OriginAirportSeqID, ArrTime, TailNum LIMIT 16","hsqls":["SELECT DepDelay, Month, OriginAirportID FROM mytable ORDER BY OriginAirportSeqID, ArrTime, TailNum LIMIT 16"]}
 {"sql":"SELECT CarrierDelay, ArrTime, DivAirportLandings, AVG(ArrDel15) FROM mytable GROUP BY CarrierDelay, ArrTime, DivAirportLandings  ORDER BY CarrierDelay, ArrTime, DivAirportLandings LIMIT 11","hsqls":["SELECT CarrierDelay, ArrTime, DivAirportLandings, AVG(ArrDel15) FROM mytable GROUP BY CarrierDelay, ArrTime, DivAirportLandings  ORDER BY CarrierDelay, ArrTime, DivAirportLandings LIMIT 11"]}
-{"sql":"SELECT DivReachedDest, COUNT(ArrivalDelayGroups) FROM mytable WHERE DivAirportSeqIDs > 1482802 GROUP BY DivReachedDest LIMIT 4","hsqls":["SELECT DivReachedDest, COUNT(ArrivalDelayGroups) FROM mytable WHERE (DivAirportSeqIDs__MV0 > 1482802 OR DivAirportSeqIDs__MV1 > 1482802 OR DivAirportSeqIDs__MV2 > 1482802 OR DivAirportSeqIDs__MV3 > 1482802 OR DivAirportSeqIDs__MV4 > 1482802) GROUP BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, COUNT(ArrivalDelayGroups) FROM mytable WHERE DivAirportSeqIDs > 1482802 GROUP BY DivReachedDest LIMIT 4","hsqls":["SELECT DivReachedDest, COUNT(ArrivalDelayGroups) FROM mytable WHERE (DivAirportSeqIDs[1] > 1482802 OR DivAirportSeqIDs[2] > 1482802 OR DivAirportSeqIDs[3] > 1482802 OR DivAirportSeqIDs[4] > 1482802 OR DivAirportSeqIDs[5] > 1482802) GROUP BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE DayOfWeek <> 1 OR CancellationCode > 'C' LIMIT 20"}
-{"sql":"SELECT AirTime, CancellationCode, AVG(\"Month\"), MIN(OriginWac), SUM(DepTime) FROM mytable GROUP BY AirTime, CancellationCode LIMIT 3","hsqls":["SELECT AirTime, CancellationCode, AVG(Month), MIN(OriginWac), SUM(DepTime) FROM mytable GROUP BY AirTime, CancellationCode LIMIT 3"]}
+{"sql":"SELECT AirTime, CancellationCode, AVG(\"Month\"), MIN(OriginWac), SUM(DepTime) FROM mytable GROUP BY AirTime, CancellationCode LIMIT 3","hsqls":["SELECT AirTime, CancellationCode, AVG(`Month`), MIN(OriginWac), SUM(DepTime) FROM mytable GROUP BY AirTime, CancellationCode LIMIT 3"]}
 {"sql":"SELECT OriginAirportID, COUNT(ArrTimeBlk) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 6","hsqls":["SELECT OriginAirportID, COUNT(ArrTimeBlk) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 6"]}
-{"sql":"SELECT OriginCityMarketID, NASDelay, TailNum FROM mytable WHERE DivTailNums < 'N654MQ' ORDER BY Quarter, DaysSinceEpoch LIMIT 23","hsqls":["SELECT OriginCityMarketID, NASDelay, TailNum FROM mytable WHERE (DivTailNums__MV0 < 'N654MQ' OR DivTailNums__MV1 < 'N654MQ' OR DivTailNums__MV2 < 'N654MQ' OR DivTailNums__MV3 < 'N654MQ' OR DivTailNums__MV4 < 'N654MQ') ORDER BY Quarter, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, NASDelay, TailNum FROM mytable WHERE DivTailNums < 'N654MQ' ORDER BY Quarter, DaysSinceEpoch LIMIT 23","hsqls":["SELECT OriginCityMarketID, NASDelay, TailNum FROM mytable WHERE (DivTailNums[1] < 'N654MQ' OR DivTailNums[2] < 'N654MQ' OR DivTailNums[3] < 'N654MQ' OR DivTailNums[4] < 'N654MQ' OR DivTailNums[5] < 'N654MQ') ORDER BY Quarter, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, DestAirportID FROM mytable WHERE Cancelled NOT IN (1, 0) ORDER BY WeatherDelay LIMIT 6"}
 {"sql":"SELECT AVG(NASDelay), MAX(CarrierDelay), COUNT(ActualElapsedTime) FROM mytable WHERE DivActualElapsedTime > 435 OR UniqueCarrier BETWEEN 'AA' AND 'EV' LIMIT 15"}
 {"sql":"SELECT Carrier, SUM(WheelsOn), COUNT(OriginStateName), MIN(LongestAddGTime) FROM mytable WHERE CRSArrTime < 1753 GROUP BY Carrier  ORDER BY Carrier LIMIT 2","hsqls":["SELECT Carrier, SUM(WheelsOn), COUNT(OriginStateName), MIN(LongestAddGTime) FROM mytable WHERE CRSArrTime < 1753 GROUP BY Carrier  ORDER BY Carrier LIMIT 2"]}
-{"sql":"SELECT DestWac, SecurityDelay, DestCityMarketID FROM mytable WHERE DestWac IN (1, 64, 36) AND \"Year\" BETWEEN 2014 AND 2014 ORDER BY TailNum LIMIT 9","hsqls":["SELECT DestWac, SecurityDelay, DestCityMarketID FROM mytable WHERE DestWac IN (1, 64, 36) AND Year BETWEEN 2014 AND 2014 ORDER BY TailNum LIMIT 9"]}
-{"sql":"SELECT DestWac, DepDelay, Quarter, AVG(NASDelay), MIN(DaysSinceEpoch) FROM mytable WHERE DivActualElapsedTime BETWEEN 198 AND 260 OR OriginCityMarketID > 32016 AND DivWheelsOns IN (1137, 1148) GROUP BY DestWac, DepDelay, Quarter LIMIT 13","hsqls":["SELECT DestWac, DepDelay, Quarter, AVG(NASDelay), MIN(DaysSinceEpoch) FROM mytable WHERE DivActualElapsedTime BETWEEN 198 AND 260 OR OriginCityMarketID > 32016 AND (DivWheelsOns__MV0 IN (1137, 1148) OR DivWheelsOns__MV1 IN (1137, 1148) OR DivWheelsOns__MV2 IN (1137, 1148) OR DivWheelsOns__MV3 IN (1137, 1148) OR DivWheelsOns__MV4 IN (1137, 1148)) GROUP BY DestWac, DepDelay, Quarter LIMIT 10000"]}
-{"sql":"SELECT COUNT(Carrier) FROM mytable WHERE \"Month\" = 1 OR NASDelay >= 32 LIMIT 20","hsqls":["SELECT COUNT(Carrier) FROM mytable WHERE Month = 1 OR NASDelay >= 32 LIMIT 20"]}
+{"sql":"SELECT DestWac, SecurityDelay, DestCityMarketID FROM mytable WHERE DestWac IN (1, 64, 36) AND \"Year\" BETWEEN 2014 AND 2014 ORDER BY TailNum LIMIT 9","hsqls":["SELECT DestWac, SecurityDelay, DestCityMarketID FROM mytable WHERE DestWac IN (1, 64, 36) AND `Year` BETWEEN 2014 AND 2014 ORDER BY TailNum LIMIT 9"]}
+{"sql":"SELECT DestWac, DepDelay, Quarter, AVG(NASDelay), MIN(DaysSinceEpoch) FROM mytable WHERE DivActualElapsedTime BETWEEN 198 AND 260 OR OriginCityMarketID > 32016 AND DivWheelsOns IN (1137, 1148) GROUP BY DestWac, DepDelay, Quarter LIMIT 13","hsqls":["SELECT DestWac, DepDelay, Quarter, AVG(NASDelay), MIN(DaysSinceEpoch) FROM mytable WHERE DivActualElapsedTime BETWEEN 198 AND 260 OR OriginCityMarketID > 32016 AND (DivWheelsOns[1] IN (1137, 1148) OR DivWheelsOns[2] IN (1137, 1148) OR DivWheelsOns[3] IN (1137, 1148) OR DivWheelsOns[4] IN (1137, 1148) OR DivWheelsOns[5] IN (1137, 1148)) GROUP BY DestWac, DepDelay, Quarter LIMIT 10000"]}
+{"sql":"SELECT COUNT(Carrier) FROM mytable WHERE \"Month\" = 1 OR NASDelay >= 32 LIMIT 20","hsqls":["SELECT COUNT(Carrier) FROM mytable WHERE `Month` = 1 OR NASDelay >= 32 LIMIT 20"]}
 {"sql":"SELECT DepartureDelayGroups, DestStateName, DivArrDelay, MAX(DivAirportLandings), AVG(DivActualElapsedTime) FROM mytable GROUP BY DepartureDelayGroups, DestStateName, DivArrDelay  ORDER BY DepartureDelayGroups, DestStateName, DivArrDelay LIMIT 1","hsqls":["SELECT DepartureDelayGroups, DestStateName, DivArrDelay, MAX(DivAirportLandings), AVG(DivActualElapsedTime) FROM mytable GROUP BY DepartureDelayGroups, DestStateName, DivArrDelay  ORDER BY DepartureDelayGroups, DestStateName, DivArrDelay LIMIT 1"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE DestWac >= 45 OR ActualElapsedTime NOT IN (224, 165) AND DestStateFips = 24 ORDER BY DestWac, ArrDel15, AirTime LIMIT 6"}
 {"sql":"SELECT Carrier, TotalAddGTime, TailNum, MIN(CRSArrTime) FROM mytable GROUP BY Carrier, TotalAddGTime, TailNum  ORDER BY Carrier, TotalAddGTime, TailNum LIMIT 2","hsqls":["SELECT Carrier, TotalAddGTime, TailNum, MIN(CRSArrTime) FROM mytable GROUP BY Carrier, TotalAddGTime, TailNum  ORDER BY Carrier, TotalAddGTime, TailNum LIMIT 2"]}
-{"sql":"SELECT CRSArrTime, MIN(OriginStateFips), MAX(OriginWac) FROM mytable WHERE DivTotalGTimes BETWEEN 32 AND 117 GROUP BY CRSArrTime LIMIT 11","hsqls":["SELECT CRSArrTime, MIN(OriginStateFips), MAX(OriginWac) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 32 AND 117 OR DivTotalGTimes__MV1 BETWEEN 32 AND 117 OR DivTotalGTimes__MV2 BETWEEN 32 AND 117 OR DivTotalGTimes__MV3 BETWEEN 32 AND 117 OR DivTotalGTimes__MV4 BETWEEN 32 AND 117) GROUP BY CRSArrTime LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1078502 AND 1323002 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs__MV1 BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs__MV2 BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs__MV3 BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs__MV4 BETWEEN 1078502 AND 1323002) LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, MIN(OriginStateFips), MAX(OriginWac) FROM mytable WHERE DivTotalGTimes BETWEEN 32 AND 117 GROUP BY CRSArrTime LIMIT 11","hsqls":["SELECT CRSArrTime, MIN(OriginStateFips), MAX(OriginWac) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 32 AND 117 OR DivTotalGTimes[2] BETWEEN 32 AND 117 OR DivTotalGTimes[3] BETWEEN 32 AND 117 OR DivTotalGTimes[4] BETWEEN 32 AND 117 OR DivTotalGTimes[5] BETWEEN 32 AND 117) GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1078502 AND 1323002 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs[2] BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs[3] BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs[4] BETWEEN 1078502 AND 1323002 OR DivAirportSeqIDs[5] BETWEEN 1078502 AND 1323002) LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE WheelsOn IN (752, 1157, 1009) LIMIT 11"}
 {"sql":"SELECT Carrier, Flights, DestCityMarketID, SUM(DepDelay) FROM mytable GROUP BY Carrier, Flights, DestCityMarketID  ORDER BY Carrier, Flights, DestCityMarketID LIMIT 13","hsqls":["SELECT Carrier, Flights, DestCityMarketID, SUM(DepDelay) FROM mytable GROUP BY Carrier, Flights, DestCityMarketID  ORDER BY Carrier, Flights, DestCityMarketID LIMIT 13"]}
-{"sql":"SELECT Flights, DepTimeBlk, CancellationCode, MIN(OriginAirportSeqID), MAX(DepDel15) FROM mytable WHERE DivDistance NOT IN (440, 488) AND DivWheelsOffs IN (809, 1016, 1621) GROUP BY Flights, DepTimeBlk, CancellationCode LIMIT 18","hsqls":["SELECT Flights, DepTimeBlk, CancellationCode, MIN(OriginAirportSeqID), MAX(DepDel15) FROM mytable WHERE DivDistance NOT IN (440, 488) AND (DivWheelsOffs__MV0 IN (809, 1016, 1621) OR DivWheelsOffs__MV1 IN (809, 1016, 1621) OR DivWheelsOffs__MV2 IN (809, 1016, 1621) OR DivWheelsOffs__MV3 IN (809, 1016, 1621) OR DivWheelsOffs__MV4 IN (809, 1016, 1621)) GROUP BY Flights, DepTimeBlk, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT Flights, DepTimeBlk, CancellationCode, MIN(OriginAirportSeqID), MAX(DepDel15) FROM mytable WHERE DivDistance NOT IN (440, 488) AND DivWheelsOffs IN (809, 1016, 1621) GROUP BY Flights, DepTimeBlk, CancellationCode LIMIT 18","hsqls":["SELECT Flights, DepTimeBlk, CancellationCode, MIN(OriginAirportSeqID), MAX(DepDel15) FROM mytable WHERE DivDistance NOT IN (440, 488) AND (DivWheelsOffs[1] IN (809, 1016, 1621) OR DivWheelsOffs[2] IN (809, 1016, 1621) OR DivWheelsOffs[3] IN (809, 1016, 1621) OR DivWheelsOffs[4] IN (809, 1016, 1621) OR DivWheelsOffs[5] IN (809, 1016, 1621)) GROUP BY Flights, DepTimeBlk, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DestWac, MAX(DestCityMarketID), MAX(TaxiOut), COUNT(ArrDel15) FROM mytable WHERE DepTime NOT IN (1734, 1441, 900) GROUP BY DestWac  ORDER BY DestWac LIMIT 6","hsqls":["SELECT DestWac, MAX(DestCityMarketID), MAX(TaxiOut), COUNT(ArrDel15) FROM mytable WHERE DepTime NOT IN (1734, 1441, 900) GROUP BY DestWac  ORDER BY DestWac LIMIT 6"]}
 {"sql":"SELECT DestAirportID, OriginWac, COUNT(*) FROM mytable WHERE AirTime NOT IN (378, 296, 62, 283) OR OriginAirportSeqID BETWEEN 1018502 AND 1172602 GROUP BY DestAirportID, OriginWac  ORDER BY DestAirportID, OriginWac LIMIT 14","hsqls":["SELECT DestAirportID, OriginWac, COUNT(*) FROM mytable WHERE AirTime NOT IN (378, 296, 62, 283) OR OriginAirportSeqID BETWEEN 1018502 AND 1172602 GROUP BY DestAirportID, OriginWac  ORDER BY DestAirportID, OriginWac LIMIT 14"]}
-{"sql":"SELECT OriginCityMarketID, NASDelay, DayOfWeek, MAX(\"Year\"), AVG(DestCityMarketID), MAX(OriginAirportID) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND TaxiOut BETWEEN 36 AND 44 OR Quarter NOT IN (1) GROUP BY OriginCityMarketID, NASDelay, DayOfWeek","hsqls":["SELECT OriginCityMarketID, NASDelay, DayOfWeek, MAX(Year), AVG(DestCityMarketID), MAX(OriginAirportID) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND TaxiOut BETWEEN 36 AND 44 OR Quarter NOT IN (1) GROUP BY OriginCityMarketID, NASDelay, DayOfWeek"]}
+{"sql":"SELECT OriginCityMarketID, NASDelay, DayOfWeek, MAX(\"Year\"), AVG(DestCityMarketID), MAX(OriginAirportID) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND TaxiOut BETWEEN 36 AND 44 OR Quarter NOT IN (1) GROUP BY OriginCityMarketID, NASDelay, DayOfWeek","hsqls":["SELECT OriginCityMarketID, NASDelay, DayOfWeek, MAX(`Year`), AVG(DestCityMarketID), MAX(OriginAirportID) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 AND TaxiOut BETWEEN 36 AND 44 OR Quarter NOT IN (1) GROUP BY OriginCityMarketID, NASDelay, DayOfWeek"]}
 {"sql":"SELECT DestState FROM mytable WHERE DepDelayMinutes BETWEEN 218.0 AND 48.0 OR TaxiIn < 42 ORDER BY OriginState, CRSElapsedTime, DivActualElapsedTime LIMIT 12"}
 {"sql":"SELECT DestWac, Distance, DepTime FROM mytable WHERE DivAirportLandings = 9 OR Origin NOT IN ('SAN', 'RSW', 'PVD') ORDER BY FlightDate, OriginCityName LIMIT 26"}
 {"sql":"SELECT FlightNum, CarrierDelay, SecurityDelay, COUNT(*) FROM mytable WHERE DaysSinceEpoch <> 16072 OR AirTime >= 68 GROUP BY FlightNum, CarrierDelay, SecurityDelay  ORDER BY FlightNum, CarrierDelay, SecurityDelay LIMIT 25","hsqls":["SELECT FlightNum, CarrierDelay, SecurityDelay, COUNT(*) FROM mytable WHERE DaysSinceEpoch <> 16072 OR AirTime >= 68 GROUP BY FlightNum, CarrierDelay, SecurityDelay  ORDER BY FlightNum, CarrierDelay, SecurityDelay LIMIT 25"]}
-{"sql":"SELECT TaxiOut, ArrDelay, MIN(DaysSinceEpoch), COUNT(OriginWac), MAX(\"Month\") FROM mytable WHERE DistanceGroup <= 2 AND Diverted NOT IN (1, 0) AND DepTimeBlk >= '0800-0859' GROUP BY TaxiOut, ArrDelay LIMIT 18","hsqls":["SELECT TaxiOut, ArrDelay, MIN(DaysSinceEpoch), COUNT(OriginWac), MAX(Month) FROM mytable WHERE DistanceGroup <= 2 AND Diverted NOT IN (1, 0) AND DepTimeBlk >= '0800-0859' GROUP BY TaxiOut, ArrDelay LIMIT 18"]}
+{"sql":"SELECT TaxiOut, ArrDelay, MIN(DaysSinceEpoch), COUNT(OriginWac), MAX(\"Month\") FROM mytable WHERE DistanceGroup <= 2 AND Diverted NOT IN (1, 0) AND DepTimeBlk >= '0800-0859' GROUP BY TaxiOut, ArrDelay LIMIT 18","hsqls":["SELECT TaxiOut, ArrDelay, MIN(DaysSinceEpoch), COUNT(OriginWac), MAX(`Month`) FROM mytable WHERE DistanceGroup <= 2 AND Diverted NOT IN (1, 0) AND DepTimeBlk >= '0800-0859' GROUP BY TaxiOut, ArrDelay LIMIT 18"]}
 {"sql":"SELECT DivArrDelay, MIN(DaysSinceEpoch) FROM mytable WHERE DaysSinceEpoch IN (16071, 16099, 16081, 16097, 16086) AND FlightDate BETWEEN '2014-01-24' AND '2014-01-13' GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 24","hsqls":["SELECT DivArrDelay, MIN(DaysSinceEpoch) FROM mytable WHERE DaysSinceEpoch IN (16071, 16099, 16081, 16097, 16086) AND FlightDate BETWEEN '2014-01-24' AND '2014-01-13' GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 24"]}
 {"sql":"SELECT OriginState FROM mytable ORDER BY LateAircraftDelay, DivActualElapsedTime, CRSElapsedTime LIMIT 3"}
 {"sql":"SELECT TaxiIn, MIN(FlightNum), COUNT(ArrTimeBlk), COUNT(DepDelayMinutes) FROM mytable WHERE OriginWac NOT IN (92, 91, 54, 86) AND DayOfWeek IN (2, 5) OR Origin BETWEEN 'SIT' AND 'TYR' GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 6","hsqls":["SELECT TaxiIn, MIN(FlightNum), COUNT(ArrTimeBlk), COUNT(DepDelayMinutes) FROM mytable WHERE OriginWac NOT IN (92, 91, 54, 86) AND DayOfWeek IN (2, 5) OR Origin BETWEEN 'SIT' AND 'TYR' GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 6"]}
 {"sql":"SELECT NASDelay, AVG(DivReachedDest), COUNT(ArrivalDelayGroups), MIN(Flights) FROM mytable WHERE CarrierDelay BETWEEN 113 AND 74 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 11","hsqls":["SELECT NASDelay, AVG(DivReachedDest), COUNT(ArrivalDelayGroups), MIN(Flights) FROM mytable WHERE CarrierDelay BETWEEN 113 AND 74 GROUP BY NASDelay  ORDER BY NASDelay LIMIT 11"]}
-{"sql":"SELECT DivLongestGTimes, OriginAirportID FROM mytable WHERE DestAirportSeqID > 1325602 ORDER BY OriginWac LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginAirportID FROM mytable WHERE DestAirportSeqID > 1325602 ORDER BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginAirportID FROM mytable WHERE DestAirportSeqID > 1325602 ORDER BY OriginWac LIMIT 2","hsqls":["SELECT DivLongestGTimes, OriginAirportID FROM mytable WHERE DestAirportSeqID > 1325602 ORDER BY OriginWac LIMIT 10000"]}
 {"sql":"SELECT Carrier, SecurityDelay, ArrTime FROM mytable WHERE LongestAddGTime BETWEEN 42 AND -9999 ORDER BY DestAirportID LIMIT 29"}
-{"sql":"SELECT DepDelayMinutes, \"Month\", CRSDepTime FROM mytable WHERE NASDelay <= 16 OR FlightDate BETWEEN '2014-01-31' AND '2014-01-08' ORDER BY \"Month\" LIMIT 21","hsqls":["SELECT DepDelayMinutes, Month, CRSDepTime FROM mytable WHERE NASDelay <= 16 OR FlightDate BETWEEN '2014-01-31' AND '2014-01-08' ORDER BY Month LIMIT 21"]}
+{"sql":"SELECT DepDelayMinutes, \"Month\", CRSDepTime FROM mytable WHERE NASDelay <= 16 OR FlightDate BETWEEN '2014-01-31' AND '2014-01-08' ORDER BY \"Month\" LIMIT 21","hsqls":["SELECT DepDelayMinutes, Month, CRSDepTime FROM mytable WHERE NASDelay <= 16 OR FlightDate BETWEEN '2014-01-31' AND '2014-01-08' ORDER BY `Month` LIMIT 21"]}
 {"sql":"SELECT DivReachedDest, DestWac, DivArrDelay FROM mytable ORDER BY Cancelled LIMIT 18"}
 {"sql":"SELECT DivReachedDest, Cancelled, OriginStateName FROM mytable WHERE DepTime NOT IN (1433, 1324) ORDER BY DepartureDelayGroups, Origin LIMIT 13"}
-{"sql":"SELECT AVG(SecurityDelay) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1426202 AND 1486903 OR CRSDepTime NOT IN (919, 1039) LIMIT 19","hsqls":["SELECT AVG(CAST(SecurityDelay AS DOUBLE)) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs__MV1 BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs__MV2 BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs__MV3 BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs__MV4 BETWEEN 1426202 AND 1486903) OR CRSDepTime NOT IN (919, 1039) LIMIT 10000"]}
-{"sql":"SELECT \"Year\", ActualElapsedTime, \"Month\", COUNT(*) FROM mytable WHERE CRSDepTime IN (2259, 812, 1453, 957, 1838) OR OriginCityMarketID BETWEEN 31140 AND 30747 GROUP BY \"Year\", ActualElapsedTime, \"Month\" LIMIT 13","hsqls":["SELECT Year, ActualElapsedTime, Month, COUNT(*) FROM mytable WHERE CRSDepTime IN (2259, 812, 1453, 957, 1838) OR OriginCityMarketID BETWEEN 31140 AND 30747 GROUP BY Year, ActualElapsedTime, Month LIMIT 13"]}
+{"sql":"SELECT AVG(SecurityDelay) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1426202 AND 1486903 OR CRSDepTime NOT IN (919, 1039) LIMIT 19","hsqls":["SELECT AVG(CAST(SecurityDelay AS DOUBLE)) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs[2] BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs[3] BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs[4] BETWEEN 1426202 AND 1486903 OR DivAirportSeqIDs[5] BETWEEN 1426202 AND 1486903) OR CRSDepTime NOT IN (919, 1039) LIMIT 10000"]}
+{"sql":"SELECT \"Year\", ActualElapsedTime, \"Month\", COUNT(*) FROM mytable WHERE CRSDepTime IN (2259, 812, 1453, 957, 1838) OR OriginCityMarketID BETWEEN 31140 AND 30747 GROUP BY \"Year\", ActualElapsedTime, \"Month\" LIMIT 13","hsqls":["SELECT Year, ActualElapsedTime, Month, COUNT(*) FROM mytable WHERE CRSDepTime IN (2259, 812, 1453, 957, 1838) OR OriginCityMarketID BETWEEN 31140 AND 30747 GROUP BY Year, ActualElapsedTime, `Month` LIMIT 13"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE DestCityName BETWEEN 'Fort Myers, FL' AND 'Juneau, AK' AND DestStateName BETWEEN 'Louisiana' AND 'Colorado' ORDER BY FlightDate, DestStateName LIMIT 7"}
-{"sql":"SELECT OriginAirportSeqID, DivAirportIDs FROM mytable ORDER BY Carrier LIMIT 13","hsqls":["SELECT OriginAirportSeqID, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY Carrier LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivAirportIDs FROM mytable ORDER BY Carrier LIMIT 13","hsqls":["SELECT OriginAirportSeqID, DivAirportIDs FROM mytable ORDER BY Carrier LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, LongestAddGTime, SUM(DepartureDelayGroups) FROM mytable WHERE OriginState BETWEEN 'ND' AND 'CT' OR UniqueCarrier >= 'US' GROUP BY TaxiOut, LongestAddGTime  ORDER BY TaxiOut, LongestAddGTime LIMIT 2","hsqls":["SELECT TaxiOut, LongestAddGTime, SUM(DepartureDelayGroups) FROM mytable WHERE OriginState BETWEEN 'ND' AND 'CT' OR UniqueCarrier >= 'US' GROUP BY TaxiOut, LongestAddGTime  ORDER BY TaxiOut, LongestAddGTime LIMIT 2"]}
-{"sql":"SELECT DivAirportSeqIDs, Origin, DepTimeBlk FROM mytable WHERE TotalAddGTime > 7 AND DivWheelsOns >= 955 AND TaxiOut = 6 LIMIT 17","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Origin, DepTimeBlk FROM mytable WHERE TotalAddGTime > 7 AND (DivWheelsOns__MV0 >= 955 OR DivWheelsOns__MV1 >= 955 OR DivWheelsOns__MV2 >= 955 OR DivWheelsOns__MV3 >= 955 OR DivWheelsOns__MV4 >= 955) AND TaxiOut = 6 LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, Distance, DivAirportLandings FROM mytable WHERE DivAirports BETWEEN 'CPR' AND 'ICT' AND TaxiIn NOT IN (56, 46) AND OriginAirportID NOT IN (11778) LIMIT 16","hsqls":["SELECT DepDelayMinutes, Distance, DivAirportLandings FROM mytable WHERE (DivAirports__MV0 BETWEEN 'CPR' AND 'ICT' OR DivAirports__MV1 BETWEEN 'CPR' AND 'ICT' OR DivAirports__MV2 BETWEEN 'CPR' AND 'ICT' OR DivAirports__MV3 BETWEEN 'CPR' AND 'ICT' OR DivAirports__MV4 BETWEEN 'CPR' AND 'ICT') AND TaxiIn NOT IN (56, 46) AND OriginAirportID NOT IN (11778) LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, Origin, DepTimeBlk FROM mytable WHERE TotalAddGTime > 7 AND DivWheelsOns >= 955 AND TaxiOut = 6 LIMIT 17","hsqls":["SELECT DivAirportSeqIDs, Origin, DepTimeBlk FROM mytable WHERE TotalAddGTime > 7 AND (DivWheelsOns[1] >= 955 OR DivWheelsOns[2] >= 955 OR DivWheelsOns[3] >= 955 OR DivWheelsOns[4] >= 955 OR DivWheelsOns[5] >= 955) AND TaxiOut = 6 LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, Distance, DivAirportLandings FROM mytable WHERE DivAirports BETWEEN 'CPR' AND 'ICT' AND TaxiIn NOT IN (56, 46) AND OriginAirportID NOT IN (11778) LIMIT 16","hsqls":["SELECT DepDelayMinutes, Distance, DivAirportLandings FROM mytable WHERE (DivAirports[1] BETWEEN 'CPR' AND 'ICT' OR DivAirports[2] BETWEEN 'CPR' AND 'ICT' OR DivAirports[3] BETWEEN 'CPR' AND 'ICT' OR DivAirports[4] BETWEEN 'CPR' AND 'ICT' OR DivAirports[5] BETWEEN 'CPR' AND 'ICT') AND TaxiIn NOT IN (56, 46) AND OriginAirportID NOT IN (11778) LIMIT 10000"]}
 {"sql":"SELECT DivDistance FROM mytable LIMIT 20"}
-{"sql":"SELECT OriginState, DestWac, CRSElapsedTime, MAX(\"Year\"), COUNT(DestState) FROM mytable GROUP BY OriginState, DestWac, CRSElapsedTime LIMIT 12","hsqls":["SELECT OriginState, DestWac, CRSElapsedTime, MAX(Year), COUNT(DestState) FROM mytable GROUP BY OriginState, DestWac, CRSElapsedTime LIMIT 12"]}
+{"sql":"SELECT OriginState, DestWac, CRSElapsedTime, MAX(\"Year\"), COUNT(DestState) FROM mytable GROUP BY OriginState, DestWac, CRSElapsedTime LIMIT 12","hsqls":["SELECT OriginState, DestWac, CRSElapsedTime, MAX(`Year`), COUNT(DestState) FROM mytable GROUP BY OriginState, DestWac, CRSElapsedTime LIMIT 12"]}
 {"sql":"SELECT DepDelay, DivAirportLandings, DayOfWeek, AVG(OriginWac), MIN(DestStateFips), COUNT(WeatherDelay) FROM mytable GROUP BY DepDelay, DivAirportLandings, DayOfWeek  ORDER BY DepDelay, DivAirportLandings, DayOfWeek LIMIT 4","hsqls":["SELECT DepDelay, DivAirportLandings, DayOfWeek, AVG(OriginWac), MIN(DestStateFips), COUNT(WeatherDelay) FROM mytable GROUP BY DepDelay, DivAirportLandings, DayOfWeek  ORDER BY DepDelay, DivAirportLandings, DayOfWeek LIMIT 4"]}
-{"sql":"SELECT DivAirports, OriginCityMarketID FROM mytable WHERE Dest BETWEEN 'BTV' AND 'DTW' LIMIT 27","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityMarketID FROM mytable WHERE Dest BETWEEN 'BTV' AND 'DTW' LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityMarketID FROM mytable WHERE Dest BETWEEN 'BTV' AND 'DTW' LIMIT 27","hsqls":["SELECT DivAirports, OriginCityMarketID FROM mytable WHERE Dest BETWEEN 'BTV' AND 'DTW' LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DayofMonth, MIN(DepDelayMinutes), AVG(CRSArrTime) FROM mytable WHERE OriginAirportSeqID NOT IN (1013503, 1099002, 1501603) GROUP BY \"Year\", DayofMonth LIMIT 15","hsqls":["SELECT Year, DayofMonth, MIN(DepDelayMinutes), AVG(CRSArrTime) FROM mytable WHERE OriginAirportSeqID NOT IN (1013503, 1099002, 1501603) GROUP BY Year, DayofMonth LIMIT 15"]}
 {"sql":"SELECT CRSArrTime, DestStateName, AVG(DestAirportID), AVG(ArrivalDelayGroups) FROM mytable WHERE OriginStateName IN ('Wyoming', 'Illinois', 'Florida') GROUP BY CRSArrTime, DestStateName  ORDER BY CRSArrTime, DestStateName LIMIT 19","hsqls":["SELECT CRSArrTime, DestStateName, AVG(DestAirportID), AVG(ArrivalDelayGroups) FROM mytable WHERE OriginStateName IN ('Wyoming', 'Illinois', 'Florida') GROUP BY CRSArrTime, DestStateName  ORDER BY CRSArrTime, DestStateName LIMIT 19"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE TaxiIn IN (52) AND AirlineID >= 20304 AND OriginWac NOT IN (3, 23, 81) ORDER BY OriginStateFips, ActualElapsedTime, DaysSinceEpoch LIMIT 22"}
 {"sql":"SELECT OriginAirportSeqID, COUNT(*) FROM mytable WHERE Distance <= 1214 OR OriginCityMarketID NOT IN (30994, 30436) GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 19","hsqls":["SELECT OriginAirportSeqID, COUNT(*) FROM mytable WHERE Distance <= 1214 OR OriginCityMarketID NOT IN (30994, 30436) GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 19"]}
 {"sql":"SELECT Cancelled, ArrTimeBlk FROM mytable WHERE DestAirportID NOT IN (12391, 10739) AND OriginWac BETWEEN 31 AND 83 LIMIT 20"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE WeatherDelay BETWEEN 43 AND 25 ORDER BY FlightDate, ArrTime LIMIT 22","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE WeatherDelay BETWEEN 43 AND 25 ORDER BY FlightDate, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE WeatherDelay BETWEEN 43 AND 25 ORDER BY FlightDate, ArrTime LIMIT 22","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE WeatherDelay BETWEEN 43 AND 25 ORDER BY FlightDate, ArrTime LIMIT 10000"]}
 {"sql":"SELECT SUM(DivAirportLandings), AVG(DepDelayMinutes) FROM mytable"}
 {"sql":"SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE OriginStateName IN ('Hawaii', 'Nebraska') OR AirTime IN (212, 150, 299, 362) OR OriginCityMarketID <= 30852 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 17","hsqls":["SELECT DivActualElapsedTime, COUNT(*) FROM mytable WHERE OriginStateName IN ('Hawaii', 'Nebraska') OR AirTime IN (212, 150, 299, 362) OR OriginCityMarketID <= 30852 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 17"]}
-{"sql":"SELECT Quarter FROM mytable WHERE DivTailNums BETWEEN 'N203UW' AND 'N982SW' OR FlightDate NOT IN ('2014-01-07', '2014-01-16', '2014-01-10') ORDER BY \"Year\", DestStateFips, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT Quarter FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums__MV1 BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums__MV2 BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums__MV3 BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums__MV4 BETWEEN 'N203UW' AND 'N982SW') OR FlightDate NOT IN ('2014-01-07', '2014-01-16', '2014-01-10') ORDER BY Year, DestStateFips, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT Quarter FROM mytable WHERE DivTailNums BETWEEN 'N203UW' AND 'N982SW' OR FlightDate NOT IN ('2014-01-07', '2014-01-16', '2014-01-10') ORDER BY \"Year\", DestStateFips, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT Quarter FROM mytable WHERE (DivTailNums[1] BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums[2] BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums[3] BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums[4] BETWEEN 'N203UW' AND 'N982SW' OR DivTailNums[5] BETWEEN 'N203UW' AND 'N982SW') OR FlightDate NOT IN ('2014-01-07', '2014-01-16', '2014-01-10') ORDER BY Year, DestStateFips, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestWac IN (31, 81, 61) LIMIT 9"}
-{"sql":"SELECT DivWheelsOns FROM mytable","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable","hsqls":["SELECT DivWheelsOns FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE WheelsOn BETWEEN 2122 AND 1023 AND Carrier IN ('EV', 'WN', 'B6', 'OO', 'UA') ORDER BY TailNum, DestCityMarketID LIMIT 7"}
 {"sql":"SELECT TaxiIn, CRSDepTime, DaysSinceEpoch, MAX(DayOfWeek), SUM(DepartureDelayGroups) FROM mytable WHERE DestAirportID BETWEEN 10821 AND 15027 AND FirstDepTime NOT IN (727, 2110, 857) OR ArrTimeBlk NOT IN ('0600-0659') GROUP BY TaxiIn, CRSDepTime, DaysSinceEpoch  ORDER BY TaxiIn, CRSDepTime, DaysSinceEpoch LIMIT 14","hsqls":["SELECT TaxiIn, CRSDepTime, DaysSinceEpoch, MAX(DayOfWeek), SUM(DepartureDelayGroups) FROM mytable WHERE DestAirportID BETWEEN 10821 AND 15027 AND FirstDepTime NOT IN (727, 2110, 857) OR ArrTimeBlk NOT IN ('0600-0659') GROUP BY TaxiIn, CRSDepTime, DaysSinceEpoch  ORDER BY TaxiIn, CRSDepTime, DaysSinceEpoch LIMIT 14"]}
-{"sql":"SELECT LongestAddGTime, Flights, DestStateName FROM mytable WHERE OriginCityMarketID BETWEEN 33851 AND 34614 ORDER BY \"Year\" LIMIT 13","hsqls":["SELECT LongestAddGTime, Flights, DestStateName FROM mytable WHERE OriginCityMarketID BETWEEN 33851 AND 34614 ORDER BY Year LIMIT 13"]}
+{"sql":"SELECT LongestAddGTime, Flights, DestStateName FROM mytable WHERE OriginCityMarketID BETWEEN 33851 AND 34614 ORDER BY \"Year\" LIMIT 13","hsqls":["SELECT LongestAddGTime, Flights, DestStateName FROM mytable WHERE OriginCityMarketID BETWEEN 33851 AND 34614 ORDER BY `Year` LIMIT 13"]}
 {"sql":"SELECT OriginWac, DivArrDelay, MIN(CRSElapsedTime) FROM mytable WHERE FlightNum = 4410 OR Quarter IN (1) AND WheelsOff = 1707 GROUP BY OriginWac, DivArrDelay  ORDER BY OriginWac, DivArrDelay LIMIT 5","hsqls":["SELECT OriginWac, DivArrDelay, MIN(CRSElapsedTime) FROM mytable WHERE FlightNum = 4410 OR Quarter IN (1) AND WheelsOff = 1707 GROUP BY OriginWac, DivArrDelay  ORDER BY OriginWac, DivArrDelay LIMIT 5"]}
-{"sql":"SELECT DepDelayMinutes, DivAirportLandings, COUNT(ArrTime) FROM mytable WHERE DivTotalGTimes BETWEEN 113 AND 12 OR ArrDel15 BETWEEN 1 AND 0 GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 24","hsqls":["SELECT DepDelayMinutes, DivAirportLandings, COUNT(ArrTime) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 113 AND 12 OR DivTotalGTimes__MV1 BETWEEN 113 AND 12 OR DivTotalGTimes__MV2 BETWEEN 113 AND 12 OR DivTotalGTimes__MV3 BETWEEN 113 AND 12 OR DivTotalGTimes__MV4 BETWEEN 113 AND 12) OR ArrDel15 BETWEEN 1 AND 0 GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DivAirports, NASDelay, ArrDelay FROM mytable WHERE CarrierDelay IN (112, 109, 304, 123) OR LongestAddGTime > 42 AND ArrDelay BETWEEN 343.0 AND -16.0 LIMIT 1","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, NASDelay, ArrDelay FROM mytable WHERE CarrierDelay IN (112, 109, 304, 123) OR LongestAddGTime > 42 AND ArrDelay BETWEEN 343.0 AND -16.0 LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivAirportLandings, COUNT(ArrTime) FROM mytable WHERE DivTotalGTimes BETWEEN 113 AND 12 OR ArrDel15 BETWEEN 1 AND 0 GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 24","hsqls":["SELECT DepDelayMinutes, DivAirportLandings, COUNT(ArrTime) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 113 AND 12 OR DivTotalGTimes[2] BETWEEN 113 AND 12 OR DivTotalGTimes[3] BETWEEN 113 AND 12 OR DivTotalGTimes[4] BETWEEN 113 AND 12 OR DivTotalGTimes[5] BETWEEN 113 AND 12) OR ArrDel15 BETWEEN 1 AND 0 GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirports, NASDelay, ArrDelay FROM mytable WHERE CarrierDelay IN (112, 109, 304, 123) OR LongestAddGTime > 42 AND ArrDelay BETWEEN 343.0 AND -16.0 LIMIT 1","hsqls":["SELECT DivAirports, NASDelay, ArrDelay FROM mytable WHERE CarrierDelay IN (112, 109, 304, 123) OR LongestAddGTime > 42 AND ArrDelay BETWEEN 343.0 AND -16.0 LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, ArrDelay FROM mytable WHERE CRSDepTime >= 1124 AND OriginState IN ('ND', 'CA', 'WA', 'AK', 'WI') ORDER BY LateAircraftDelay LIMIT 21"}
 {"sql":"SELECT \"Year\", OriginState, FlightNum, COUNT(DivDistance), MIN(ActualElapsedTime), AVG(DepTime) FROM mytable WHERE FlightNum BETWEEN 1934 AND 375 AND DaysSinceEpoch IN (16095, 16093, 16091, 16089) GROUP BY \"Year\", OriginState, FlightNum LIMIT 5","hsqls":["SELECT Year, OriginState, FlightNum, COUNT(DivDistance), MIN(ActualElapsedTime), AVG(DepTime) FROM mytable WHERE FlightNum BETWEEN 1934 AND 375 AND DaysSinceEpoch IN (16095, 16093, 16091, 16089) GROUP BY Year, OriginState, FlightNum LIMIT 5"]}
 {"sql":"SELECT Origin, DaysSinceEpoch, COUNT(FirstDepTime), MIN(TaxiIn) FROM mytable WHERE WheelsOn > 1807 GROUP BY Origin, DaysSinceEpoch  ORDER BY Origin, DaysSinceEpoch LIMIT 2","hsqls":["SELECT Origin, DaysSinceEpoch, COUNT(FirstDepTime), MIN(TaxiIn) FROM mytable WHERE WheelsOn > 1807 GROUP BY Origin, DaysSinceEpoch  ORDER BY Origin, DaysSinceEpoch LIMIT 2"]}
 {"sql":"SELECT MIN(DivReachedDest) FROM mytable LIMIT 29"}
 {"sql":"SELECT Origin FROM mytable WHERE DepDelayMinutes = 414.0 ORDER BY DepartureDelayGroups LIMIT 28"}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16093) AND TotalAddGTime NOT IN (94) AND TaxiOut IN (3, 5, 81, 102, 73) LIMIT 23","hsqls":["SELECT Year FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16093) AND TotalAddGTime NOT IN (94) AND TaxiOut IN (3, 5, 81, 102, 73) LIMIT 23"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16093) AND TotalAddGTime NOT IN (94) AND TaxiOut IN (3, 5, 81, 102, 73) LIMIT 23","hsqls":["SELECT `Year` FROM mytable WHERE DaysSinceEpoch IN (16098, 16097, 16093) AND TotalAddGTime NOT IN (94) AND TaxiOut IN (3, 5, 81, 102, 73) LIMIT 23"]}
 {"sql":"SELECT DivActualElapsedTime, OriginStateName FROM mytable ORDER BY LongestAddGTime, ArrTime, AirlineID LIMIT 10"}
 {"sql":"SELECT NASDelay FROM mytable WHERE Dest BETWEEN 'SPI' AND 'SAV' OR DepDel15 BETWEEN 1 AND -9999 ORDER BY Origin LIMIT 9"}
 {"sql":"SELECT SUM(WheelsOff), SUM(Flights), MIN(DestStateFips) FROM mytable WHERE DepTime NOT IN (1149) OR TailNum BETWEEN 'N651JB' AND 'N419US' LIMIT 14"}
 {"sql":"SELECT FlightDate, TotalAddGTime, Dest FROM mytable WHERE TaxiOut <= 11 ORDER BY Diverted, ArrivalDelayGroups LIMIT 8"}
 {"sql":"SELECT Cancelled FROM mytable WHERE DaysSinceEpoch BETWEEN 16089 AND 16093 AND CarrierDelay BETWEEN 48 AND 18 OR NASDelay BETWEEN 110 AND 55 ORDER BY TailNum, OriginWac, DayOfWeek LIMIT 24"}
 {"sql":"SELECT COUNT(DivReachedDest), SUM(DivActualElapsedTime) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR TaxiOut BETWEEN 102 AND 18 AND DestStateFips BETWEEN 10 AND 13 LIMIT 20"}
-{"sql":"SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivWheelsOns BETWEEN 1803 AND 1518 GROUP BY ArrivalDelayGroups LIMIT 10","hsqls":["SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1803 AND 1518 OR DivWheelsOns__MV1 BETWEEN 1803 AND 1518 OR DivWheelsOns__MV2 BETWEEN 1803 AND 1518 OR DivWheelsOns__MV3 BETWEEN 1803 AND 1518 OR DivWheelsOns__MV4 BETWEEN 1803 AND 1518) GROUP BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivWheelsOns BETWEEN 1803 AND 1518 GROUP BY ArrivalDelayGroups LIMIT 10","hsqls":["SELECT ArrivalDelayGroups, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1803 AND 1518 OR DivWheelsOns[2] BETWEEN 1803 AND 1518 OR DivWheelsOns[3] BETWEEN 1803 AND 1518 OR DivWheelsOns[4] BETWEEN 1803 AND 1518 OR DivWheelsOns[5] BETWEEN 1803 AND 1518) GROUP BY ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginAirportID), MIN(OriginWac), MIN(CRSArrTime) FROM mytable WHERE DayofMonth = 16 OR ArrDelayMinutes BETWEEN 117.0 AND 996.0 LIMIT 11"}
-{"sql":"SELECT TaxiIn FROM mytable WHERE DivTotalGTimes IN (62, 76) OR OriginCityMarketID <= 34576 ORDER BY TaxiOut, DayofMonth, DayOfWeek LIMIT 3","hsqls":["SELECT TaxiIn FROM mytable WHERE (DivTotalGTimes__MV0 IN (62, 76) OR DivTotalGTimes__MV1 IN (62, 76) OR DivTotalGTimes__MV2 IN (62, 76) OR DivTotalGTimes__MV3 IN (62, 76) OR DivTotalGTimes__MV4 IN (62, 76)) OR OriginCityMarketID <= 34576 ORDER BY TaxiOut, DayofMonth, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT TaxiIn FROM mytable WHERE DivTotalGTimes IN (62, 76) OR OriginCityMarketID <= 34576 ORDER BY TaxiOut, DayofMonth, DayOfWeek LIMIT 3","hsqls":["SELECT TaxiIn FROM mytable WHERE (DivTotalGTimes[1] IN (62, 76) OR DivTotalGTimes[2] IN (62, 76) OR DivTotalGTimes[3] IN (62, 76) OR DivTotalGTimes[4] IN (62, 76) OR DivTotalGTimes[5] IN (62, 76)) OR OriginCityMarketID <= 34576 ORDER BY TaxiOut, DayofMonth, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT Distance, \"Month\", OriginAirportID FROM mytable WHERE Distance IN (594, 647, 1222, 529, 1953) OR ArrDelay NOT IN (82.0, 9.0) ORDER BY ArrivalDelayGroups LIMIT 18","hsqls":["SELECT Distance, Month, OriginAirportID FROM mytable WHERE Distance IN (594, 647, 1222, 529, 1953) OR ArrDelay NOT IN (82.0, 9.0) ORDER BY ArrivalDelayGroups LIMIT 18"]}
 {"sql":"SELECT \"Year\", FlightDate FROM mytable LIMIT 28","hsqls":["SELECT Year, FlightDate FROM mytable LIMIT 28"]}
 {"sql":"SELECT LateAircraftDelay, FlightNum, MAX(Flights), SUM(LateAircraftDelay), AVG(CRSArrTime) FROM mytable GROUP BY LateAircraftDelay, FlightNum  ORDER BY LateAircraftDelay, FlightNum LIMIT 7","hsqls":["SELECT LateAircraftDelay, FlightNum, MAX(Flights), SUM(LateAircraftDelay), AVG(CRSArrTime) FROM mytable GROUP BY LateAircraftDelay, FlightNum  ORDER BY LateAircraftDelay, FlightNum LIMIT 7"]}
 {"sql":"SELECT TaxiOut, OriginCityMarketID, DestCityName, AVG(CRSElapsedTime), SUM(DayofMonth) FROM mytable WHERE Flights <= 1 AND FirstDepTime IN (903, 1605, 1621, 1942) OR DepTimeBlk < '0900-0959' GROUP BY TaxiOut, OriginCityMarketID, DestCityName  ORDER BY TaxiOut, OriginCityMarketID, DestCityName LIMIT 28","hsqls":["SELECT TaxiOut, OriginCityMarketID, DestCityName, AVG(CRSElapsedTime), SUM(DayofMonth) FROM mytable WHERE Flights <= 1 AND FirstDepTime IN (903, 1605, 1621, 1942) OR DepTimeBlk < '0900-0959' GROUP BY TaxiOut, OriginCityMarketID, DestCityName  ORDER BY TaxiOut, OriginCityMarketID, DestCityName LIMIT 28"]}
 {"sql":"SELECT OriginStateFips, WheelsOn, DivActualElapsedTime FROM mytable WHERE DivAirportLandings <> 1 AND LongestAddGTime = 97 OR CRSArrTime BETWEEN 2103 AND 1632 ORDER BY AirTime, DaysSinceEpoch LIMIT 18"}
-{"sql":"SELECT ArrivalDelayGroups, MIN(Diverted), SUM(DivDistance), MAX(\"Month\") FROM mytable WHERE DivTotalGTimes IN (49, 96, 94, 6, -9999) OR Cancelled >= 1 GROUP BY ArrivalDelayGroups LIMIT 10","hsqls":["SELECT ArrivalDelayGroups, MIN(Diverted), SUM(DivDistance), MAX(Month) FROM mytable WHERE (DivTotalGTimes__MV0 IN (49, 96, 94, 6, -9999) OR DivTotalGTimes__MV1 IN (49, 96, 94, 6, -9999) OR DivTotalGTimes__MV2 IN (49, 96, 94, 6, -9999) OR DivTotalGTimes__MV3 IN (49, 96, 94, 6, -9999) OR DivTotalGTimes__MV4 IN (49, 96, 94, 6, -9999)) OR Cancelled >= 1 GROUP BY ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, MAX(CRSDepTime) FROM mytable WHERE Carrier NOT IN ('VX') OR DivAirportIDs IN (14113, 14893, 13303) OR DivActualElapsedTime = 847 GROUP BY FirstDepTime LIMIT 29","hsqls":["SELECT FirstDepTime, MAX(CRSDepTime) FROM mytable WHERE Carrier NOT IN ('VX') OR (DivAirportIDs__MV0 IN (14113, 14893, 13303) OR DivAirportIDs__MV1 IN (14113, 14893, 13303) OR DivAirportIDs__MV2 IN (14113, 14893, 13303) OR DivAirportIDs__MV3 IN (14113, 14893, 13303) OR DivAirportIDs__MV4 IN (14113, 14893, 13303)) OR DivActualElapsedTime = 847 GROUP BY FirstDepTime LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, FlightDate, COUNT(FlightNum), COUNT(DestStateName) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1457604 AND 1334205 OR DivLongestGTimes >= 9.0 GROUP BY FirstDepTime, FlightDate LIMIT 6","hsqls":["SELECT FirstDepTime, FlightDate, COUNT(FlightNum), COUNT(DestStateName) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs__MV1 BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs__MV2 BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs__MV3 BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs__MV4 BETWEEN 1457604 AND 1334205) OR (DivLongestGTimes__MV0 >= 9.0 OR DivLongestGTimes__MV1 >= 9.0 OR DivLongestGTimes__MV2 >= 9.0 OR DivLongestGTimes__MV3 >= 9.0 OR DivLongestGTimes__MV4 >= 9.0) GROUP BY FirstDepTime, FlightDate LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups, MIN(Diverted), SUM(DivDistance), MAX(\"Month\") FROM mytable WHERE DivTotalGTimes IN (49, 96, 94, 6, -9999) OR Cancelled >= 1 GROUP BY ArrivalDelayGroups LIMIT 10","hsqls":["SELECT ArrivalDelayGroups, MIN(Diverted), SUM(DivDistance), MAX(`Month`) FROM mytable WHERE (DivTotalGTimes[1] IN (49, 96, 94, 6, -9999) OR DivTotalGTimes[2] IN (49, 96, 94, 6, -9999) OR DivTotalGTimes[3] IN (49, 96, 94, 6, -9999) OR DivTotalGTimes[4] IN (49, 96, 94, 6, -9999) OR DivTotalGTimes[5] IN (49, 96, 94, 6, -9999)) OR Cancelled >= 1 GROUP BY ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, MAX(CRSDepTime) FROM mytable WHERE Carrier NOT IN ('VX') OR DivAirportIDs IN (14113, 14893, 13303) OR DivActualElapsedTime = 847 GROUP BY FirstDepTime LIMIT 29","hsqls":["SELECT FirstDepTime, MAX(CRSDepTime) FROM mytable WHERE Carrier NOT IN ('VX') OR (DivAirportIDs[1] IN (14113, 14893, 13303) OR DivAirportIDs[2] IN (14113, 14893, 13303) OR DivAirportIDs[3] IN (14113, 14893, 13303) OR DivAirportIDs[4] IN (14113, 14893, 13303) OR DivAirportIDs[5] IN (14113, 14893, 13303)) OR DivActualElapsedTime = 847 GROUP BY FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, FlightDate, COUNT(FlightNum), COUNT(DestStateName) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1457604 AND 1334205 OR DivLongestGTimes >= 9.0 GROUP BY FirstDepTime, FlightDate LIMIT 6","hsqls":["SELECT FirstDepTime, FlightDate, COUNT(FlightNum), COUNT(DestStateName) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs[2] BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs[3] BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs[4] BETWEEN 1457604 AND 1334205 OR DivAirportSeqIDs[5] BETWEEN 1457604 AND 1334205) OR (DivLongestGTimes[1] >= 9.0 OR DivLongestGTimes[2] >= 9.0 OR DivLongestGTimes[3] >= 9.0 OR DivLongestGTimes[4] >= 9.0 OR DivLongestGTimes[5] >= 9.0) GROUP BY FirstDepTime, FlightDate LIMIT 10000"]}
 {"sql":"SELECT ArrDelay FROM mytable WHERE NASDelay NOT IN (67, 68, 54, 61, -9999) OR ArrDel15 <= 1 OR OriginWac > 92 ORDER BY DepDelay, AirTime LIMIT 13"}
 {"sql":"SELECT UniqueCarrier, COUNT(OriginAirportID), AVG(OriginAirportID) FROM mytable WHERE DestCityMarketID BETWEEN 34236 AND 33502 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 18","hsqls":["SELECT UniqueCarrier, COUNT(OriginAirportID), AVG(OriginAirportID) FROM mytable WHERE DestCityMarketID BETWEEN 34236 AND 33502 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 18"]}
-{"sql":"SELECT Carrier, DestStateFips, OriginStateName, MAX(TotalAddGTime), COUNT(DepTime) FROM mytable WHERE DestCityName = 'Anchorage, AK' OR \"Year\" IN (2014) AND DestStateName <> 'Minnesota' GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 7","hsqls":["SELECT Carrier, DestStateFips, OriginStateName, MAX(TotalAddGTime), COUNT(DepTime) FROM mytable WHERE DestCityName = 'Anchorage, AK' OR Year IN (2014) AND DestStateName <> 'Minnesota' GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 7"]}
-{"sql":"SELECT DestStateName, NASDelay, CancellationCode FROM mytable WHERE DestCityMarketID NOT IN (30918, 31865, 33964, 34543, 33277) AND DivWheelsOns BETWEEN 1017 AND 1018 OR TailNum IN ('N3733Z', 'N919DE', 'N658CT', 'N12567') ORDER BY DayofMonth LIMIT 7","hsqls":["SELECT DestStateName, NASDelay, CancellationCode FROM mytable WHERE DestCityMarketID NOT IN (30918, 31865, 33964, 34543, 33277) AND (DivWheelsOns__MV0 BETWEEN 1017 AND 1018 OR DivWheelsOns__MV1 BETWEEN 1017 AND 1018 OR DivWheelsOns__MV2 BETWEEN 1017 AND 1018 OR DivWheelsOns__MV3 BETWEEN 1017 AND 1018 OR DivWheelsOns__MV4 BETWEEN 1017 AND 1018) OR TailNum IN ('N3733Z', 'N919DE', 'N658CT', 'N12567') ORDER BY DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE Cancelled NOT IN (1, 0) OR DepTimeBlk BETWEEN '2100-2159' AND '0700-0759' LIMIT 11","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Cancelled NOT IN (1, 0) OR DepTimeBlk BETWEEN '2100-2159' AND '0700-0759' LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, OriginCityName, DivArrDelay, MIN(FirstDepTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FirstDepTime IN (1032, 1534) AND DivLongestGTimes >= 108.0 GROUP BY WeatherDelay, OriginCityName, DivArrDelay LIMIT 8","hsqls":["SELECT WeatherDelay, OriginCityName, DivArrDelay, MIN(FirstDepTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FirstDepTime IN (1032, 1534) AND (DivLongestGTimes__MV0 >= 108.0 OR DivLongestGTimes__MV1 >= 108.0 OR DivLongestGTimes__MV2 >= 108.0 OR DivLongestGTimes__MV3 >= 108.0 OR DivLongestGTimes__MV4 >= 108.0) GROUP BY WeatherDelay, OriginCityName, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY SecurityDelay, DivAirportLandings LIMIT 1","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY SecurityDelay, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac) FROM mytable WHERE NASDelay IN (49, 145, 45) AND DivWheelsOffs < 917 AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 27","hsqls":["SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac)  FROM mytable WHERE NASDelay IN (49, 145, 45) AND (DivWheelsOffs__MV0 < 917 OR DivWheelsOffs__MV1 < 917 OR DivWheelsOffs__MV2 < 917 OR DivWheelsOffs__MV3 < 917 OR DivWheelsOffs__MV4 < 917) AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 10000"]}
+{"sql":"SELECT Carrier, DestStateFips, OriginStateName, MAX(TotalAddGTime), COUNT(DepTime) FROM mytable WHERE DestCityName = 'Anchorage, AK' OR \"Year\" IN (2014) AND DestStateName <> 'Minnesota' GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 7","hsqls":["SELECT Carrier, DestStateFips, OriginStateName, MAX(TotalAddGTime), COUNT(DepTime) FROM mytable WHERE DestCityName = 'Anchorage, AK' OR `Year` IN (2014) AND DestStateName <> 'Minnesota' GROUP BY Carrier, DestStateFips, OriginStateName LIMIT 7"]}
+{"sql":"SELECT DestStateName, NASDelay, CancellationCode FROM mytable WHERE DestCityMarketID NOT IN (30918, 31865, 33964, 34543, 33277) AND DivWheelsOns BETWEEN 1017 AND 1018 OR TailNum IN ('N3733Z', 'N919DE', 'N658CT', 'N12567') ORDER BY DayofMonth LIMIT 7","hsqls":["SELECT DestStateName, NASDelay, CancellationCode FROM mytable WHERE DestCityMarketID NOT IN (30918, 31865, 33964, 34543, 33277) AND (DivWheelsOns[1] BETWEEN 1017 AND 1018 OR DivWheelsOns[2] BETWEEN 1017 AND 1018 OR DivWheelsOns[3] BETWEEN 1017 AND 1018 OR DivWheelsOns[4] BETWEEN 1017 AND 1018 OR DivWheelsOns[5] BETWEEN 1017 AND 1018) OR TailNum IN ('N3733Z', 'N919DE', 'N658CT', 'N12567') ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE Cancelled NOT IN (1, 0) OR DepTimeBlk BETWEEN '2100-2159' AND '0700-0759' LIMIT 11","hsqls":["SELECT DivAirportIDs FROM mytable WHERE Cancelled NOT IN (1, 0) OR DepTimeBlk BETWEEN '2100-2159' AND '0700-0759' LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, OriginCityName, DivArrDelay, MIN(FirstDepTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FirstDepTime IN (1032, 1534) AND DivLongestGTimes >= 108.0 GROUP BY WeatherDelay, OriginCityName, DivArrDelay LIMIT 8","hsqls":["SELECT WeatherDelay, OriginCityName, DivArrDelay, MIN(FirstDepTime) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FirstDepTime IN (1032, 1534) AND (DivLongestGTimes[1] >= 108.0 OR DivLongestGTimes[2] >= 108.0 OR DivLongestGTimes[3] >= 108.0 OR DivLongestGTimes[4] >= 108.0 OR DivLongestGTimes[5] >= 108.0) GROUP BY WeatherDelay, OriginCityName, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY SecurityDelay, DivAirportLandings LIMIT 1","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY SecurityDelay, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac) FROM mytable WHERE NASDelay IN (49, 145, 45) AND DivWheelsOffs < 917 AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 27","hsqls":["SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac)  FROM mytable WHERE NASDelay IN (49, 145, 45) AND (DivWheelsOffs[1] < 917 OR DivWheelsOffs[2] < 917 OR DivWheelsOffs[3] < 917 OR DivWheelsOffs[4] < 917 OR DivWheelsOffs[5] < 917) AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DepDelay, DayofMonth, AVG(DepDel15), MAX(OriginWac), SUM(SecurityDelay) FROM mytable GROUP BY DistanceGroup, DepDelay, DayofMonth  ORDER BY DistanceGroup, DepDelay, DayofMonth LIMIT 8","hsqls":["SELECT DistanceGroup, DepDelay, DayofMonth, AVG(DepDel15), MAX(OriginWac), SUM(SecurityDelay) FROM mytable GROUP BY DistanceGroup, DepDelay, DayofMonth  ORDER BY DistanceGroup, DepDelay, DayofMonth LIMIT 8"]}
 {"sql":"SELECT DepartureDelayGroups, CRSElapsedTime FROM mytable LIMIT 16"}
-{"sql":"SELECT NASDelay, DivAirportIDs, WheelsOn FROM mytable WHERE CarrierDelay = 115 OR OriginStateName NOT IN ('Massachusetts', 'New Jersey', 'U.S. Pacific Trust Territories and Possessions', 'Oregon') OR OriginStateName BETWEEN 'Colorado' AND 'Indiana' LIMIT 13","hsqls":["SELECT NASDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, WheelsOn FROM mytable WHERE CarrierDelay = 115 OR OriginStateName NOT IN ('Massachusetts', 'New Jersey', 'U.S. Pacific Trust Territories and Possessions', 'Oregon') OR OriginStateName BETWEEN 'Colorado' AND 'Indiana' LIMIT 10000"]}
+{"sql":"SELECT NASDelay, DivAirportIDs, WheelsOn FROM mytable WHERE CarrierDelay = 115 OR OriginStateName NOT IN ('Massachusetts', 'New Jersey', 'U.S. Pacific Trust Territories and Possessions', 'Oregon') OR OriginStateName BETWEEN 'Colorado' AND 'Indiana' LIMIT 13","hsqls":["SELECT NASDelay, DivAirportIDs, WheelsOn FROM mytable WHERE CarrierDelay = 115 OR OriginStateName NOT IN ('Massachusetts', 'New Jersey', 'U.S. Pacific Trust Territories and Possessions', 'Oregon') OR OriginStateName BETWEEN 'Colorado' AND 'Indiana' LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, DivActualElapsedTime FROM mytable ORDER BY DepTimeBlk LIMIT 25"}
 {"sql":"SELECT DestStateName, DestCityMarketID, DaysSinceEpoch, MIN(NASDelay), MIN(DistanceGroup), MAX(DivAirportLandings) FROM mytable GROUP BY DestStateName, DestCityMarketID, DaysSinceEpoch  ORDER BY DestStateName, DestCityMarketID, DaysSinceEpoch LIMIT 7","hsqls":["SELECT DestStateName, DestCityMarketID, DaysSinceEpoch, MIN(NASDelay), MIN(DistanceGroup), MAX(DivAirportLandings) FROM mytable GROUP BY DestStateName, DestCityMarketID, DaysSinceEpoch  ORDER BY DestStateName, DestCityMarketID, DaysSinceEpoch LIMIT 7"]}
 {"sql":"SELECT DepDelay, CRSArrTime, ActualElapsedTime FROM mytable WHERE Quarter < 1 AND Quarter IN (1) ORDER BY CRSArrTime LIMIT 22"}
-{"sql":"SELECT DayofMonth, \"Month\" FROM mytable ORDER BY OriginWac LIMIT 26","hsqls":["SELECT DayofMonth, Month FROM mytable ORDER BY OriginWac LIMIT 26"]}
-{"sql":"SELECT DestAirportID, ArrDelay, OriginAirportID FROM mytable WHERE CarrierDelay NOT IN (144) OR \"Month\" BETWEEN 1 AND 1 ORDER BY LateAircraftDelay, DepDel15 LIMIT 24","hsqls":["SELECT DestAirportID, ArrDelay, OriginAirportID FROM mytable WHERE CarrierDelay NOT IN (144) OR Month BETWEEN 1 AND 1 ORDER BY LateAircraftDelay, DepDel15 LIMIT 24"]}
+{"sql":"SELECT DayofMonth, \"Month\" FROM mytable ORDER BY OriginWac LIMIT 26","hsqls":["SELECT DayofMonth, `Month` FROM mytable ORDER BY OriginWac LIMIT 26"]}
+{"sql":"SELECT DestAirportID, ArrDelay, OriginAirportID FROM mytable WHERE CarrierDelay NOT IN (144) OR \"Month\" BETWEEN 1 AND 1 ORDER BY LateAircraftDelay, DepDel15 LIMIT 24","hsqls":["SELECT DestAirportID, ArrDelay, OriginAirportID FROM mytable WHERE CarrierDelay NOT IN (144) OR `Month` BETWEEN 1 AND 1 ORDER BY LateAircraftDelay, DepDel15 LIMIT 24"]}
 {"sql":"SELECT TaxiIn, NASDelay, MIN(ArrDelayMinutes), COUNT(ArrTimeBlk) FROM mytable WHERE SecurityDelay <= 4 AND Cancelled = 0 GROUP BY TaxiIn, NASDelay  ORDER BY TaxiIn, NASDelay LIMIT 3","hsqls":["SELECT TaxiIn, NASDelay, MIN(ArrDelayMinutes), COUNT(ArrTimeBlk) FROM mytable WHERE SecurityDelay <= 4 AND Cancelled = 0 GROUP BY TaxiIn, NASDelay  ORDER BY TaxiIn, NASDelay LIMIT 3"]}
 {"sql":"SELECT Carrier, DestAirportID, COUNT(OriginAirportID), MIN(Flights), AVG(Quarter) FROM mytable GROUP BY Carrier, DestAirportID  ORDER BY Carrier, DestAirportID LIMIT 25","hsqls":["SELECT Carrier, DestAirportID, COUNT(OriginAirportID), MIN(Flights), AVG(Quarter) FROM mytable GROUP BY Carrier, DestAirportID  ORDER BY Carrier, DestAirportID LIMIT 25"]}
 {"sql":"SELECT TaxiOut, DepTime, ArrTime FROM mytable WHERE DestCityMarketID > 35412 LIMIT 22"}
@@ -7534,13 +7534,13 @@
 {"sql":"SELECT Carrier, TotalAddGTime, UniqueCarrier FROM mytable WHERE OriginAirportID BETWEEN 14543 AND 12448 AND TaxiIn NOT IN (26) AND Carrier < 'DL' LIMIT 13"}
 {"sql":"SELECT SUM(Cancelled), COUNT(AirTime) FROM mytable WHERE TaxiIn NOT IN (20, 40, 22, 26) AND OriginAirportID <= 12206 OR DestCityName >= 'Pensacola, FL' LIMIT 21"}
 {"sql":"SELECT OriginWac, MIN(WeatherDelay), SUM(WheelsOn), AVG(Diverted) FROM mytable WHERE DivAirportLandings <= 9 GROUP BY OriginWac","hsqls":["SELECT OriginWac, MIN(WeatherDelay), SUM(WheelsOn), AVG(Diverted) FROM mytable WHERE DivAirportLandings <= 9 GROUP BY OriginWac"]}
-{"sql":"SELECT DepTime, Cancelled, ArrDel15 FROM mytable WHERE DestCityName >= 'Lihue, HI' AND \"Year\" BETWEEN 2014 AND 2014 ORDER BY CarrierDelay, ArrTime LIMIT 15","hsqls":["SELECT DepTime, Cancelled, ArrDel15 FROM mytable WHERE DestCityName >= 'Lihue, HI' AND Year BETWEEN 2014 AND 2014 ORDER BY CarrierDelay, ArrTime LIMIT 15"]}
+{"sql":"SELECT DepTime, Cancelled, ArrDel15 FROM mytable WHERE DestCityName >= 'Lihue, HI' AND \"Year\" BETWEEN 2014 AND 2014 ORDER BY CarrierDelay, ArrTime LIMIT 15","hsqls":["SELECT DepTime, Cancelled, ArrDel15 FROM mytable WHERE DestCityName >= 'Lihue, HI' AND `Year` BETWEEN 2014 AND 2014 ORDER BY CarrierDelay, ArrTime LIMIT 15"]}
 {"sql":"SELECT Origin FROM mytable LIMIT 17"}
 {"sql":"SELECT DepDelayMinutes, MAX(SecurityDelay) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 8","hsqls":["SELECT DepDelayMinutes, MAX(SecurityDelay) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 8"]}
 {"sql":"SELECT \"Year\", DestStateFips FROM mytable LIMIT 5","hsqls":["SELECT Year, DestStateFips FROM mytable LIMIT 5"]}
-{"sql":"SELECT OriginState, AirTime, COUNT(*) FROM mytable WHERE FlightDate <> '2014-01-16' OR DivWheelsOns BETWEEN 1501 AND 1829 AND DestAirportSeqID BETWEEN 1409803 AND 1052904 GROUP BY OriginState, AirTime LIMIT 10","hsqls":["SELECT OriginState, AirTime, COUNT(*) FROM mytable WHERE FlightDate <> '2014-01-16' OR (DivWheelsOns__MV0 BETWEEN 1501 AND 1829 OR DivWheelsOns__MV1 BETWEEN 1501 AND 1829 OR DivWheelsOns__MV2 BETWEEN 1501 AND 1829 OR DivWheelsOns__MV3 BETWEEN 1501 AND 1829 OR DivWheelsOns__MV4 BETWEEN 1501 AND 1829) AND DestAirportSeqID BETWEEN 1409803 AND 1052904 GROUP BY OriginState, AirTime LIMIT 10000"]}
+{"sql":"SELECT OriginState, AirTime, COUNT(*) FROM mytable WHERE FlightDate <> '2014-01-16' OR DivWheelsOns BETWEEN 1501 AND 1829 AND DestAirportSeqID BETWEEN 1409803 AND 1052904 GROUP BY OriginState, AirTime LIMIT 10","hsqls":["SELECT OriginState, AirTime, COUNT(*) FROM mytable WHERE FlightDate <> '2014-01-16' OR (DivWheelsOns[1] BETWEEN 1501 AND 1829 OR DivWheelsOns[2] BETWEEN 1501 AND 1829 OR DivWheelsOns[3] BETWEEN 1501 AND 1829 OR DivWheelsOns[4] BETWEEN 1501 AND 1829 OR DivWheelsOns[5] BETWEEN 1501 AND 1829) AND DestAirportSeqID BETWEEN 1409803 AND 1052904 GROUP BY OriginState, AirTime LIMIT 10000"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE FlightDate >= '2014-01-26' AND DepTimeBlk <= '1000-1059' OR Distance BETWEEN 1824 AND 584 ORDER BY WeatherDelay, DestAirportSeqID LIMIT 28"}
-{"sql":"SELECT Cancelled, AVG(\"Year\"), AVG(DivDistance), MAX(Distance) FROM mytable WHERE DistanceGroup = 4 AND \"Year\" <> 2014 GROUP BY Cancelled LIMIT 13","hsqls":["SELECT Cancelled, AVG(Year), AVG(DivDistance), MAX(Distance) FROM mytable WHERE DistanceGroup = 4 AND Year <> 2014 GROUP BY Cancelled LIMIT 13"]}
+{"sql":"SELECT Cancelled, AVG(\"Year\"), AVG(DivDistance), MAX(Distance) FROM mytable WHERE DistanceGroup = 4 AND \"Year\" <> 2014 GROUP BY Cancelled LIMIT 13","hsqls":["SELECT Cancelled, AVG(`Year`), AVG(DivDistance), MAX(Distance) FROM mytable WHERE DistanceGroup = 4 AND `Year` <> 2014 GROUP BY Cancelled LIMIT 13"]}
 {"sql":"SELECT FlightNum, OriginCityName, OriginAirportID, MIN(ArrDel15) FROM mytable WHERE OriginAirportSeqID BETWEEN 1111102 AND 1410803 GROUP BY FlightNum, OriginCityName, OriginAirportID  ORDER BY FlightNum, OriginCityName, OriginAirportID LIMIT 25","hsqls":["SELECT FlightNum, OriginCityName, OriginAirportID, MIN(ArrDel15) FROM mytable WHERE OriginAirportSeqID BETWEEN 1111102 AND 1410803 GROUP BY FlightNum, OriginCityName, OriginAirportID  ORDER BY FlightNum, OriginCityName, OriginAirportID LIMIT 25"]}
 {"sql":"SELECT OriginStateName, SUM(OriginStateFips) FROM mytable WHERE AirlineID IN (20398, 19805, 20355, 19977) GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 12","hsqls":["SELECT OriginStateName, SUM(OriginStateFips) FROM mytable WHERE AirlineID IN (20398, 19805, 20355, 19977) GROUP BY OriginStateName  ORDER BY OriginStateName LIMIT 12"]}
 {"sql":"SELECT DestWac, NASDelay, DestAirportID FROM mytable WHERE NASDelay <> 211 OR DestStateName BETWEEN 'Oregon' AND 'Montana' OR OriginWac NOT IN (67, 74) ORDER BY DepTime LIMIT 7"}
@@ -7560,26 +7560,26 @@
 {"sql":"SELECT CRSElapsedTime, MAX(CRSDepTime) FROM mytable WHERE CRSDepTime NOT IN (1344, 1117) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 2","hsqls":["SELECT CRSElapsedTime, MAX(CRSDepTime) FROM mytable WHERE CRSDepTime NOT IN (1344, 1117) GROUP BY CRSElapsedTime  ORDER BY CRSElapsedTime LIMIT 2"]}
 {"sql":"SELECT DestAirportSeqID, Cancelled, SUM(ActualElapsedTime), MAX(NASDelay) FROM mytable GROUP BY DestAirportSeqID, Cancelled  ORDER BY DestAirportSeqID, Cancelled LIMIT 23","hsqls":["SELECT DestAirportSeqID, Cancelled, SUM(ActualElapsedTime), MAX(NASDelay) FROM mytable GROUP BY DestAirportSeqID, Cancelled  ORDER BY DestAirportSeqID, Cancelled LIMIT 23"]}
 {"sql":"SELECT Cancelled, AirTime, ArrivalDelayGroups FROM mytable WHERE Cancelled = 0 AND LateAircraftDelay >= 247 LIMIT 26"}
-{"sql":"SELECT DestCityName, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1625702 AND 1123302 OR ArrTime BETWEEN 21 AND 2132 AND Origin BETWEEN 'LIH' AND 'BRD' GROUP BY DestCityName LIMIT 2","hsqls":["SELECT DestCityName, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs__MV1 BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs__MV2 BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs__MV3 BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs__MV4 BETWEEN 1625702 AND 1123302) OR ArrTime BETWEEN 21 AND 2132 AND Origin BETWEEN 'LIH' AND 'BRD' GROUP BY DestCityName LIMIT 10000"]}
+{"sql":"SELECT DestCityName, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1625702 AND 1123302 OR ArrTime BETWEEN 21 AND 2132 AND Origin BETWEEN 'LIH' AND 'BRD' GROUP BY DestCityName LIMIT 2","hsqls":["SELECT DestCityName, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs[2] BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs[3] BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs[4] BETWEEN 1625702 AND 1123302 OR DivAirportSeqIDs[5] BETWEEN 1625702 AND 1123302) OR ArrTime BETWEEN 21 AND 2132 AND Origin BETWEEN 'LIH' AND 'BRD' GROUP BY DestCityName LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, ActualElapsedTime, DayOfWeek, MAX(OriginAirportSeqID) FROM mytable WHERE OriginStateName BETWEEN 'Alabama' AND 'Virginia' AND DepDel15 NOT IN (1, 0, -9999) GROUP BY WeatherDelay, ActualElapsedTime, DayOfWeek  ORDER BY WeatherDelay, ActualElapsedTime, DayOfWeek LIMIT 16","hsqls":["SELECT WeatherDelay, ActualElapsedTime, DayOfWeek, MAX(OriginAirportSeqID) FROM mytable WHERE OriginStateName BETWEEN 'Alabama' AND 'Virginia' AND DepDel15 NOT IN (1, 0, -9999) GROUP BY WeatherDelay, ActualElapsedTime, DayOfWeek  ORDER BY WeatherDelay, ActualElapsedTime, DayOfWeek LIMIT 16"]}
 {"sql":"SELECT DestWac, DepDelayMinutes, MIN(DestWac), AVG(SecurityDelay) FROM mytable WHERE TaxiIn BETWEEN 127 AND 7 AND FlightNum <= 4208 AND FlightNum < 5108 GROUP BY DestWac, DepDelayMinutes  ORDER BY DestWac, DepDelayMinutes LIMIT 16","hsqls":["SELECT DestWac, DepDelayMinutes, MIN(DestWac), AVG(SecurityDelay) FROM mytable WHERE TaxiIn BETWEEN 127 AND 7 AND FlightNum <= 4208 AND FlightNum < 5108 GROUP BY DestWac, DepDelayMinutes  ORDER BY DestWac, DepDelayMinutes LIMIT 16"]}
-{"sql":"SELECT AirTime, OriginWac, DaysSinceEpoch FROM mytable WHERE DestStateFips BETWEEN 34 AND 28 AND Flights BETWEEN 1 AND 1 OR DivTailNums BETWEEN 'N284JB' AND 'N268WN' ORDER BY ArrDelayMinutes, ArrTimeBlk, WheelsOn LIMIT 1","hsqls":["SELECT AirTime, OriginWac, DaysSinceEpoch FROM mytable WHERE DestStateFips BETWEEN 34 AND 28 AND Flights BETWEEN 1 AND 1 OR (DivTailNums__MV0 BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums__MV1 BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums__MV2 BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums__MV3 BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums__MV4 BETWEEN 'N284JB' AND 'N268WN') ORDER BY ArrDelayMinutes, ArrTimeBlk, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT AirTime, OriginWac, DaysSinceEpoch FROM mytable WHERE DestStateFips BETWEEN 34 AND 28 AND Flights BETWEEN 1 AND 1 OR DivTailNums BETWEEN 'N284JB' AND 'N268WN' ORDER BY ArrDelayMinutes, ArrTimeBlk, WheelsOn LIMIT 1","hsqls":["SELECT AirTime, OriginWac, DaysSinceEpoch FROM mytable WHERE DestStateFips BETWEEN 34 AND 28 AND Flights BETWEEN 1 AND 1 OR (DivTailNums[1] BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums[2] BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums[3] BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums[4] BETWEEN 'N284JB' AND 'N268WN' OR DivTailNums[5] BETWEEN 'N284JB' AND 'N268WN') ORDER BY ArrDelayMinutes, ArrTimeBlk, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DestCityName, COUNT(Quarter), SUM(Flights), AVG(DayofMonth) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 29","hsqls":["SELECT DestCityName, COUNT(Quarter), SUM(Flights), AVG(DayofMonth) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 29"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE ActualElapsedTime NOT IN (180, 145, 415, 177, 347) AND FlightDate BETWEEN '2014-01-06' AND '2014-01-24' OR OriginWac BETWEEN 91 AND 41 LIMIT 9"}
-{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivTotalGTimes BETWEEN 23 AND 50 AND ArrTimeBlk > '2100-2159' ORDER BY CancellationCode LIMIT 22","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 23 AND 50 OR DivTotalGTimes__MV1 BETWEEN 23 AND 50 OR DivTotalGTimes__MV2 BETWEEN 23 AND 50 OR DivTotalGTimes__MV3 BETWEEN 23 AND 50 OR DivTotalGTimes__MV4 BETWEEN 23 AND 50) AND ArrTimeBlk > '2100-2159' ORDER BY CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivTotalGTimes BETWEEN 23 AND 50 AND ArrTimeBlk > '2100-2159' ORDER BY CancellationCode LIMIT 22","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 23 AND 50 OR DivTotalGTimes[2] BETWEEN 23 AND 50 OR DivTotalGTimes[3] BETWEEN 23 AND 50 OR DivTotalGTimes[4] BETWEEN 23 AND 50 OR DivTotalGTimes[5] BETWEEN 23 AND 50) AND ArrTimeBlk > '2100-2159' ORDER BY CancellationCode LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, NASDelay FROM mytable ORDER BY DepartureDelayGroups, TaxiIn, ArrTimeBlk LIMIT 18"}
 {"sql":"SELECT DestWac, ArrDelayMinutes, TaxiIn FROM mytable WHERE NASDelay < -9999 OR Quarter > 1 OR Quarter BETWEEN 1 AND 1 ORDER BY DepTimeBlk LIMIT 14"}
 {"sql":"SELECT SUM(WheelsOff), MAX(DivAirportLandings) FROM mytable WHERE DepartureDelayGroups < 7 AND DepTime BETWEEN 1204 AND 2002 AND DestWac = 81 LIMIT 7"}
-{"sql":"SELECT DestAirportID, DivArrDelay FROM mytable WHERE DivWheelsOffs IN (1138, 1030, 2025, 618) AND \"Year\" < 2014 OR \"Year\" IN (2014) ORDER BY NASDelay LIMIT 6","hsqls":["SELECT DestAirportID, DivArrDelay FROM mytable WHERE (DivWheelsOffs__MV0 IN (1138, 1030, 2025, 618) OR DivWheelsOffs__MV1 IN (1138, 1030, 2025, 618) OR DivWheelsOffs__MV2 IN (1138, 1030, 2025, 618) OR DivWheelsOffs__MV3 IN (1138, 1030, 2025, 618) OR DivWheelsOffs__MV4 IN (1138, 1030, 2025, 618)) AND Year < 2014 OR Year IN (2014) ORDER BY NASDelay LIMIT 10000"]}
-{"sql":"SELECT AVG(FlightNum), COUNT(LongestAddGTime) FROM mytable WHERE FlightNum BETWEEN 664 AND 2269 AND CRSElapsedTime BETWEEN 156 AND 89 AND DivAirports BETWEEN 'MSO' AND 'CLE' LIMIT 22","hsqls":["SELECT AVG(FlightNum), COUNT(LongestAddGTime)  FROM mytable WHERE FlightNum BETWEEN 664 AND 2269 AND CRSElapsedTime BETWEEN 156 AND 89 AND (DivAirports__MV0 BETWEEN 'MSO' AND 'CLE' OR DivAirports__MV1 BETWEEN 'MSO' AND 'CLE' OR DivAirports__MV2 BETWEEN 'MSO' AND 'CLE' OR DivAirports__MV3 BETWEEN 'MSO' AND 'CLE' OR DivAirports__MV4 BETWEEN 'MSO' AND 'CLE') LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, DivArrDelay FROM mytable WHERE DivWheelsOffs IN (1138, 1030, 2025, 618) AND \"Year\" < 2014 OR \"Year\" IN (2014) ORDER BY NASDelay LIMIT 6","hsqls":["SELECT DestAirportID, DivArrDelay FROM mytable WHERE (DivWheelsOffs[1] IN (1138, 1030, 2025, 618) OR DivWheelsOffs[2] IN (1138, 1030, 2025, 618) OR DivWheelsOffs[3] IN (1138, 1030, 2025, 618) OR DivWheelsOffs[4] IN (1138, 1030, 2025, 618) OR DivWheelsOffs[5] IN (1138, 1030, 2025, 618)) AND `Year` < 2014 OR `Year` IN (2014) ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT AVG(FlightNum), COUNT(LongestAddGTime) FROM mytable WHERE FlightNum BETWEEN 664 AND 2269 AND CRSElapsedTime BETWEEN 156 AND 89 AND DivAirports BETWEEN 'MSO' AND 'CLE' LIMIT 22","hsqls":["SELECT AVG(FlightNum), COUNT(LongestAddGTime)  FROM mytable WHERE FlightNum BETWEEN 664 AND 2269 AND CRSElapsedTime BETWEEN 156 AND 89 AND (DivAirports[1] BETWEEN 'MSO' AND 'CLE' OR DivAirports[2] BETWEEN 'MSO' AND 'CLE' OR DivAirports[3] BETWEEN 'MSO' AND 'CLE' OR DivAirports[4] BETWEEN 'MSO' AND 'CLE' OR DivAirports[5] BETWEEN 'MSO' AND 'CLE') LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivDistance IN (829, 666, 37) GROUP BY OriginCityMarketID, DaysSinceEpoch  ORDER BY OriginCityMarketID, DaysSinceEpoch LIMIT 9","hsqls":["SELECT OriginCityMarketID, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivDistance IN (829, 666, 37) GROUP BY OriginCityMarketID, DaysSinceEpoch  ORDER BY OriginCityMarketID, DaysSinceEpoch LIMIT 9"]}
 {"sql":"SELECT WheelsOff, DepDelay, FlightNum FROM mytable WHERE FlightNum BETWEEN 158 AND 2897 OR DivReachedDest < 1 ORDER BY DepDelayMinutes, FlightDate LIMIT 29"}
 {"sql":"SELECT WheelsOff, \"Year\", CarrierDelay, MIN(TaxiOut) FROM mytable GROUP BY WheelsOff, \"Year\", CarrierDelay LIMIT 23","hsqls":["SELECT WheelsOff, Year, CarrierDelay, MIN(TaxiOut) FROM mytable GROUP BY WheelsOff, Year, CarrierDelay LIMIT 23"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE CRSArrTime >= 711 OR Flights IN (1) ORDER BY DayofMonth LIMIT 1"}
 {"sql":"SELECT \"Year\", DivAirportLandings, OriginStateName FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'B6' ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 13","hsqls":["SELECT Year, DivAirportLandings, OriginStateName FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'B6' ORDER BY ArrDelayMinutes, ArrivalDelayGroups LIMIT 13"]}
-{"sql":"SELECT DistanceGroup, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE \"Month\" NOT IN (1) ORDER BY AirlineID LIMIT 14","hsqls":["SELECT DistanceGroup, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE Month NOT IN (1) ORDER BY AirlineID LIMIT 14"]}
+{"sql":"SELECT DistanceGroup, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE \"Month\" NOT IN (1) ORDER BY AirlineID LIMIT 14","hsqls":["SELECT DistanceGroup, UniqueCarrier, DaysSinceEpoch FROM mytable WHERE `Month` NOT IN (1) ORDER BY AirlineID LIMIT 14"]}
 {"sql":"SELECT DepartureDelayGroups, DivReachedDest, ArrDel15, MAX(CRSDepTime) FROM mytable WHERE ArrTime NOT IN (1215, 1812) AND Origin BETWEEN 'JAX' AND 'DTW' OR Diverted IN (1, 0) GROUP BY DepartureDelayGroups, DivReachedDest, ArrDel15  ORDER BY DepartureDelayGroups, DivReachedDest, ArrDel15 LIMIT 12","hsqls":["SELECT DepartureDelayGroups, DivReachedDest, ArrDel15, MAX(CRSDepTime) FROM mytable WHERE ArrTime NOT IN (1215, 1812) AND Origin BETWEEN 'JAX' AND 'DTW' OR Diverted IN (1, 0) GROUP BY DepartureDelayGroups, DivReachedDest, ArrDel15  ORDER BY DepartureDelayGroups, DivReachedDest, ArrDel15 LIMIT 12"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3","hsqls":["SELECT Year FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3","hsqls":["SELECT `Year` FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3"]}
 {"sql":"SELECT Quarter, COUNT(*) FROM mytable WHERE ArrDelay IN (-9.0, -8.0, 222.0, 2.0) OR Flights IN (1) OR Origin NOT IN ('TXK') GROUP BY Quarter  ORDER BY Quarter LIMIT 18","hsqls":["SELECT Quarter, COUNT(*) FROM mytable WHERE ArrDelay IN (-9.0, -8.0, 222.0, 2.0) OR Flights IN (1) OR Origin NOT IN ('TXK') GROUP BY Quarter  ORDER BY Quarter LIMIT 18"]}
 {"sql":"SELECT WheelsOff, CarrierDelay, Dest, MIN(ArrDelay), SUM(DestWac), COUNT(TotalAddGTime) FROM mytable WHERE CarrierDelay BETWEEN 8 AND 11 GROUP BY WheelsOff, CarrierDelay, Dest  ORDER BY WheelsOff, CarrierDelay, Dest LIMIT 12","hsqls":["SELECT WheelsOff, CarrierDelay, Dest, MIN(ArrDelay), SUM(DestWac), COUNT(TotalAddGTime) FROM mytable WHERE CarrierDelay BETWEEN 8 AND 11 GROUP BY WheelsOff, CarrierDelay, Dest  ORDER BY WheelsOff, CarrierDelay, Dest LIMIT 12"]}
 {"sql":"SELECT MAX(DepartureDelayGroups), AVG(DestAirportID) FROM mytable WHERE Carrier IN ('MQ') LIMIT 25"}
@@ -7600,23 +7600,23 @@
 {"sql":"SELECT WheelsOff, OriginCityName FROM mytable ORDER BY TailNum, AirlineID, CRSElapsedTime LIMIT 29"}
 {"sql":"SELECT DestCityMarketID, MIN(Diverted), MIN(ArrDelay), AVG(ActualElapsedTime) FROM mytable WHERE Diverted <= 1 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 3","hsqls":["SELECT DestCityMarketID, MIN(Diverted), MIN(ArrDelay), AVG(ActualElapsedTime) FROM mytable WHERE Diverted <= 1 GROUP BY DestCityMarketID  ORDER BY DestCityMarketID LIMIT 3"]}
 {"sql":"SELECT CRSArrTime, DestAirportID, DaysSinceEpoch, MAX(DestAirportSeqID) FROM mytable GROUP BY CRSArrTime, DestAirportID, DaysSinceEpoch  ORDER BY CRSArrTime, DestAirportID, DaysSinceEpoch LIMIT 19","hsqls":["SELECT CRSArrTime, DestAirportID, DaysSinceEpoch, MAX(DestAirportSeqID) FROM mytable GROUP BY CRSArrTime, DestAirportID, DaysSinceEpoch  ORDER BY CRSArrTime, DestAirportID, DaysSinceEpoch LIMIT 19"]}
-{"sql":"SELECT DepDelayMinutes, Origin, DestCityMarketID FROM mytable ORDER BY FirstDepTime, \"Month\" LIMIT 1","hsqls":["SELECT DepDelayMinutes, Origin, DestCityMarketID FROM mytable ORDER BY FirstDepTime, Month LIMIT 1"]}
+{"sql":"SELECT DepDelayMinutes, Origin, DestCityMarketID FROM mytable ORDER BY FirstDepTime, \"Month\" LIMIT 1","hsqls":["SELECT DepDelayMinutes, Origin, DestCityMarketID FROM mytable ORDER BY FirstDepTime, `Month` LIMIT 1"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable ORDER BY DivDistance, TotalAddGTime LIMIT 13"}
-{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE OriginCityName < 'Deadhorse, AK' OR DivTailNums BETWEEN 'N938FR' AND 'N561SW' ORDER BY DivDistance, WeatherDelay, DaysSinceEpoch LIMIT 28","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE OriginCityName < 'Deadhorse, AK' OR (DivTailNums__MV0 BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums__MV1 BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums__MV2 BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums__MV3 BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums__MV4 BETWEEN 'N938FR' AND 'N561SW') ORDER BY DivDistance, WeatherDelay, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE OriginCityName < 'Deadhorse, AK' OR DivTailNums BETWEEN 'N938FR' AND 'N561SW' ORDER BY DivDistance, WeatherDelay, DaysSinceEpoch LIMIT 28","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE OriginCityName < 'Deadhorse, AK' OR (DivTailNums[1] BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums[2] BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums[3] BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums[4] BETWEEN 'N938FR' AND 'N561SW' OR DivTailNums[5] BETWEEN 'N938FR' AND 'N561SW') ORDER BY DivDistance, WeatherDelay, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT Diverted FROM mytable WHERE TotalAddGTime BETWEEN 128 AND 103 AND NASDelay BETWEEN 20 AND 67 AND TaxiIn IN (20, 59) ORDER BY ActualElapsedTime, AirTime LIMIT 9"}
 {"sql":"SELECT Carrier, Distance, CancellationCode FROM mytable ORDER BY Origin LIMIT 18"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 17 AND 40 LIMIT 15"}
 {"sql":"SELECT MAX(SecurityDelay), AVG(AirTime) FROM mytable WHERE DestStateName <= 'California' LIMIT 21"}
-{"sql":"SELECT DistanceGroup, AVG(\"Month\"), SUM(DepDelay) FROM mytable WHERE DestState BETWEEN 'GA' AND 'NC' AND DestState >= 'PA' GROUP BY DistanceGroup LIMIT 13","hsqls":["SELECT DistanceGroup, AVG(Month), SUM(DepDelay) FROM mytable WHERE DestState BETWEEN 'GA' AND 'NC' AND DestState >= 'PA' GROUP BY DistanceGroup LIMIT 13"]}
-{"sql":"SELECT NASDelay, DepTimeBlk, MIN(OriginAirportID), MAX(DistanceGroup) FROM mytable WHERE DestStateFips = 51 OR DivTailNums BETWEEN 'N465WN' AND 'N754SW' OR SecurityDelay BETWEEN -9999 AND 4 GROUP BY NASDelay, DepTimeBlk LIMIT 25","hsqls":["SELECT NASDelay, DepTimeBlk, MIN(OriginAirportID), MAX(DistanceGroup) FROM mytable WHERE DestStateFips = 51 OR (DivTailNums__MV0 BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums__MV1 BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums__MV2 BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums__MV3 BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums__MV4 BETWEEN 'N465WN' AND 'N754SW') OR SecurityDelay BETWEEN -9999 AND 4 GROUP BY NASDelay, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT \"Year\", Diverted, DivAirportLandings FROM mytable WHERE CRSDepTime BETWEEN 300 AND 1158 OR DivTailNums IN ('N585NW', 'N712JB', 'N676MQ') ORDER BY DestStateFips, CancellationCode LIMIT 23","hsqls":["SELECT Year, Diverted, DivAirportLandings FROM mytable WHERE CRSDepTime BETWEEN 300 AND 1158 OR (DivTailNums__MV0 IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums__MV1 IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums__MV2 IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums__MV3 IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums__MV4 IN ('N585NW', 'N712JB', 'N676MQ')) ORDER BY DestStateFips, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, AVG(\"Month\"), SUM(DepDelay) FROM mytable WHERE DestState BETWEEN 'GA' AND 'NC' AND DestState >= 'PA' GROUP BY DistanceGroup LIMIT 13","hsqls":["SELECT DistanceGroup, AVG(`Month`), SUM(DepDelay) FROM mytable WHERE DestState BETWEEN 'GA' AND 'NC' AND DestState >= 'PA' GROUP BY DistanceGroup LIMIT 13"]}
+{"sql":"SELECT NASDelay, DepTimeBlk, MIN(OriginAirportID), MAX(DistanceGroup) FROM mytable WHERE DestStateFips = 51 OR DivTailNums BETWEEN 'N465WN' AND 'N754SW' OR SecurityDelay BETWEEN -9999 AND 4 GROUP BY NASDelay, DepTimeBlk LIMIT 25","hsqls":["SELECT NASDelay, DepTimeBlk, MIN(OriginAirportID), MAX(DistanceGroup) FROM mytable WHERE DestStateFips = 51 OR (DivTailNums[1] BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums[2] BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums[3] BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums[4] BETWEEN 'N465WN' AND 'N754SW' OR DivTailNums[5] BETWEEN 'N465WN' AND 'N754SW') OR SecurityDelay BETWEEN -9999 AND 4 GROUP BY NASDelay, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT \"Year\", Diverted, DivAirportLandings FROM mytable WHERE CRSDepTime BETWEEN 300 AND 1158 OR DivTailNums IN ('N585NW', 'N712JB', 'N676MQ') ORDER BY DestStateFips, CancellationCode LIMIT 23","hsqls":["SELECT Year, Diverted, DivAirportLandings FROM mytable WHERE CRSDepTime BETWEEN 300 AND 1158 OR (DivTailNums[1] IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums[2] IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums[3] IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums[4] IN ('N585NW', 'N712JB', 'N676MQ') OR DivTailNums[5] IN ('N585NW', 'N712JB', 'N676MQ')) ORDER BY DestStateFips, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT ArrivalDelayGroups, OriginAirportID, COUNT(*) FROM mytable WHERE OriginStateFips > 18 OR OriginAirportID BETWEEN 13303 AND 14262 AND Dest BETWEEN 'ILM' AND 'GRI' GROUP BY ArrivalDelayGroups, OriginAirportID  ORDER BY ArrivalDelayGroups, OriginAirportID LIMIT 18","hsqls":["SELECT ArrivalDelayGroups, OriginAirportID, COUNT(*) FROM mytable WHERE OriginStateFips > 18 OR OriginAirportID BETWEEN 13303 AND 14262 AND Dest BETWEEN 'ILM' AND 'GRI' GROUP BY ArrivalDelayGroups, OriginAirportID  ORDER BY ArrivalDelayGroups, OriginAirportID LIMIT 18"]}
 {"sql":"SELECT DestState, ArrDelay, DayOfWeek FROM mytable ORDER BY OriginWac, CancellationCode, CRSElapsedTime LIMIT 10"}
 {"sql":"SELECT DivArrDelay FROM mytable ORDER BY NASDelay LIMIT 26"}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DestWac BETWEEN 45 AND 1 OR DestWac BETWEEN 53 AND 84 ORDER BY DaysSinceEpoch LIMIT 16"}
 {"sql":"SELECT TaxiIn, ArrDel15, DaysSinceEpoch, COUNT(CancellationCode), SUM(Quarter) FROM mytable WHERE DayOfWeek NOT IN (1, 7, 6) GROUP BY TaxiIn, ArrDel15, DaysSinceEpoch  ORDER BY TaxiIn, ArrDel15, DaysSinceEpoch LIMIT 20","hsqls":["SELECT TaxiIn, ArrDel15, DaysSinceEpoch, COUNT(CancellationCode), SUM(Quarter) FROM mytable WHERE DayOfWeek NOT IN (1, 7, 6) GROUP BY TaxiIn, ArrDel15, DaysSinceEpoch  ORDER BY TaxiIn, ArrDel15, DaysSinceEpoch LIMIT 20"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND TotalAddGTime BETWEEN 34 AND 28 ORDER BY ArrDelayMinutes, AirTime LIMIT 29"}
-{"sql":"SELECT DivAirportIDs, Origin, OriginAirportID FROM mytable WHERE DivAirportSeqIDs >= 1320402 LIMIT 29","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, Origin, OriginAirportID FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1320402 OR DivAirportSeqIDs__MV1 >= 1320402 OR DivAirportSeqIDs__MV2 >= 1320402 OR DivAirportSeqIDs__MV3 >= 1320402 OR DivAirportSeqIDs__MV4 >= 1320402) LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, Origin, OriginAirportID FROM mytable WHERE DivAirportSeqIDs >= 1320402 LIMIT 29","hsqls":["SELECT DivAirportIDs, Origin, OriginAirportID FROM mytable WHERE (DivAirportSeqIDs[1] >= 1320402 OR DivAirportSeqIDs[2] >= 1320402 OR DivAirportSeqIDs[3] >= 1320402 OR DivAirportSeqIDs[4] >= 1320402 OR DivAirportSeqIDs[5] >= 1320402) LIMIT 10000"]}
 {"sql":"SELECT AVG(DestWac) FROM mytable WHERE DepDel15 = 1 OR DestState < 'MO' LIMIT 29"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 19"}
 {"sql":"SELECT ArrDelay, SUM(DivArrDelay), AVG(ArrDelay) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 OR DepartureDelayGroups <> 5 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 7","hsqls":["SELECT ArrDelay, SUM(DivArrDelay), AVG(ArrDelay) FROM mytable WHERE DepDel15 BETWEEN 1 AND 1 OR DepartureDelayGroups <> 5 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 7"]}
@@ -7625,109 +7625,109 @@
 {"sql":"SELECT DepartureDelayGroups, OriginCityMarketID, DestAirportID, MAX(DestAirportID), SUM(DestStateFips) FROM mytable WHERE OriginCityMarketID BETWEEN 34520 AND 30070 AND LateAircraftDelay BETWEEN 147 AND 182 OR OriginStateName <> 'Maryland' GROUP BY DepartureDelayGroups, OriginCityMarketID, DestAirportID  ORDER BY DepartureDelayGroups, OriginCityMarketID, DestAirportID LIMIT 21","hsqls":["SELECT DepartureDelayGroups, OriginCityMarketID, DestAirportID, MAX(DestAirportID), SUM(DestStateFips) FROM mytable WHERE OriginCityMarketID BETWEEN 34520 AND 30070 AND LateAircraftDelay BETWEEN 147 AND 182 OR OriginStateName <> 'Maryland' GROUP BY DepartureDelayGroups, OriginCityMarketID, DestAirportID  ORDER BY DepartureDelayGroups, OriginCityMarketID, DestAirportID LIMIT 21"]}
 {"sql":"SELECT COUNT(OriginWac), COUNT(Diverted), SUM(OriginAirportSeqID) FROM mytable"}
 {"sql":"SELECT Quarter, FlightDate, ArrivalDelayGroups FROM mytable WHERE DivArrDelay = 127 OR Flights < 1 AND FlightNum IN (2223, 1763, 2868, 2137) ORDER BY DepartureDelayGroups, DepDelay, OriginAirportID LIMIT 15"}
-{"sql":"SELECT DepartureDelayGroups, LateAircraftDelay FROM mytable WHERE ArrTimeBlk BETWEEN '0900-0959' AND '1700-1759' ORDER BY \"Month\" LIMIT 2","hsqls":["SELECT DepartureDelayGroups, LateAircraftDelay FROM mytable WHERE ArrTimeBlk BETWEEN '0900-0959' AND '1700-1759' ORDER BY Month LIMIT 2"]}
+{"sql":"SELECT DepartureDelayGroups, LateAircraftDelay FROM mytable WHERE ArrTimeBlk BETWEEN '0900-0959' AND '1700-1759' ORDER BY \"Month\" LIMIT 2","hsqls":["SELECT DepartureDelayGroups, LateAircraftDelay FROM mytable WHERE ArrTimeBlk BETWEEN '0900-0959' AND '1700-1759' ORDER BY `Month` LIMIT 2"]}
 {"sql":"SELECT TaxiOut, TotalAddGTime FROM mytable WHERE DepartureDelayGroups IN (-1, 8) ORDER BY OriginStateFips, ArrivalDelayGroups LIMIT 2"}
-{"sql":"SELECT OriginStateFips FROM mytable WHERE TailNum >= 'N437SW' OR \"Month\" IN (1) OR WheelsOn NOT IN (1831, 919, 2015, 1913, 1439) ORDER BY FirstDepTime LIMIT 8","hsqls":["SELECT OriginStateFips FROM mytable WHERE TailNum >= 'N437SW' OR Month IN (1) OR WheelsOn NOT IN (1831, 919, 2015, 1913, 1439) ORDER BY FirstDepTime LIMIT 8"]}
-{"sql":"SELECT Flights, FlightNum, DivWheelsOffs FROM mytable WHERE TaxiIn BETWEEN 64 AND 40 AND CRSDepTime BETWEEN 1156 AND 1558 LIMIT 16","hsqls":["SELECT Flights, FlightNum, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiIn BETWEEN 64 AND 40 AND CRSDepTime BETWEEN 1156 AND 1558 LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips FROM mytable WHERE TailNum >= 'N437SW' OR \"Month\" IN (1) OR WheelsOn NOT IN (1831, 919, 2015, 1913, 1439) ORDER BY FirstDepTime LIMIT 8","hsqls":["SELECT OriginStateFips FROM mytable WHERE TailNum >= 'N437SW' OR `Month` IN (1) OR WheelsOn NOT IN (1831, 919, 2015, 1913, 1439) ORDER BY FirstDepTime LIMIT 8"]}
+{"sql":"SELECT Flights, FlightNum, DivWheelsOffs FROM mytable WHERE TaxiIn BETWEEN 64 AND 40 AND CRSDepTime BETWEEN 1156 AND 1558 LIMIT 16","hsqls":["SELECT Flights, FlightNum, DivWheelsOffs FROM mytable WHERE TaxiIn BETWEEN 64 AND 40 AND CRSDepTime BETWEEN 1156 AND 1558 LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE DivAirportLandings NOT IN (1, 0) OR AirTime <> 355 LIMIT 26"}
-{"sql":"SELECT TaxiOut, ActualElapsedTime, AVG(TaxiOut), AVG(Quarter), MIN(OriginCityMarketID) FROM mytable WHERE ArrivalDelayGroups <> 4 AND DivAirports = 'ORD' AND Quarter BETWEEN 1 AND 1 GROUP BY TaxiOut, ActualElapsedTime","hsqls":["SELECT TaxiOut, ActualElapsedTime, AVG(TaxiOut), AVG(Quarter), MIN(OriginCityMarketID) FROM mytable WHERE ArrivalDelayGroups <> 4 AND (DivAirports__MV0 = 'ORD' OR DivAirports__MV1 = 'ORD' OR DivAirports__MV2 = 'ORD' OR DivAirports__MV3 = 'ORD' OR DivAirports__MV4 = 'ORD') AND Quarter BETWEEN 1 AND 1 GROUP BY TaxiOut, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, ActualElapsedTime, AVG(TaxiOut), AVG(Quarter), MIN(OriginCityMarketID) FROM mytable WHERE ArrivalDelayGroups <> 4 AND DivAirports = 'ORD' AND Quarter BETWEEN 1 AND 1 GROUP BY TaxiOut, ActualElapsedTime","hsqls":["SELECT TaxiOut, ActualElapsedTime, AVG(TaxiOut), AVG(Quarter), MIN(OriginCityMarketID) FROM mytable WHERE ArrivalDelayGroups <> 4 AND (DivAirports[1] = 'ORD' OR DivAirports[2] = 'ORD' OR DivAirports[3] = 'ORD' OR DivAirports[4] = 'ORD' OR DivAirports[5] = 'ORD') AND Quarter BETWEEN 1 AND 1 GROUP BY TaxiOut, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, OriginStateName FROM mytable ORDER BY TotalAddGTime, ArrDel15 LIMIT 13"}
-{"sql":"SELECT WeatherDelay, DayofMonth, DivActualElapsedTime, SUM(DaysSinceEpoch) FROM mytable WHERE DivTotalGTimes <= 83 GROUP BY WeatherDelay, DayofMonth, DivActualElapsedTime LIMIT 16","hsqls":["SELECT WeatherDelay, DayofMonth, DivActualElapsedTime, SUM(DaysSinceEpoch) FROM mytable WHERE (DivTotalGTimes__MV0 <= 83 OR DivTotalGTimes__MV1 <= 83 OR DivTotalGTimes__MV2 <= 83 OR DivTotalGTimes__MV3 <= 83 OR DivTotalGTimes__MV4 <= 83) GROUP BY WeatherDelay, DayofMonth, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DayofMonth, DivActualElapsedTime, SUM(DaysSinceEpoch) FROM mytable WHERE DivTotalGTimes <= 83 GROUP BY WeatherDelay, DayofMonth, DivActualElapsedTime LIMIT 16","hsqls":["SELECT WeatherDelay, DayofMonth, DivActualElapsedTime, SUM(DaysSinceEpoch) FROM mytable WHERE (DivTotalGTimes[1] <= 83 OR DivTotalGTimes[2] <= 83 OR DivTotalGTimes[3] <= 83 OR DivTotalGTimes[4] <= 83 OR DivTotalGTimes[5] <= 83) GROUP BY WeatherDelay, DayofMonth, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 18"}
 {"sql":"SELECT CRSArrTime, CRSElapsedTime FROM mytable WHERE DestCityMarketID = 33044 OR ArrTimeBlk NOT IN ('1600-1659', '2200-2259', '1000-1059', '1900-1959', '1500-1559') AND WheelsOn IN (840, 642) LIMIT 22"}
 {"sql":"SELECT ArrDelayMinutes, WheelsOn, ArrivalDelayGroups, SUM(DepDelay), MIN(AirlineID) FROM mytable WHERE ArrivalDelayGroups BETWEEN 9 AND 1 OR Distance IN (2724, 73, 2300) GROUP BY ArrDelayMinutes, WheelsOn, ArrivalDelayGroups  ORDER BY ArrDelayMinutes, WheelsOn, ArrivalDelayGroups LIMIT 29","hsqls":["SELECT ArrDelayMinutes, WheelsOn, ArrivalDelayGroups, SUM(DepDelay), MIN(AirlineID) FROM mytable WHERE ArrivalDelayGroups BETWEEN 9 AND 1 OR Distance IN (2724, 73, 2300) GROUP BY ArrDelayMinutes, WheelsOn, ArrivalDelayGroups  ORDER BY ArrDelayMinutes, WheelsOn, ArrivalDelayGroups LIMIT 29"]}
 {"sql":"SELECT Diverted, FlightNum, DepDelayMinutes, SUM(ArrTime) FROM mytable WHERE Flights >= 1 OR OriginStateName <> 'Maine' GROUP BY Diverted, FlightNum, DepDelayMinutes  ORDER BY Diverted, FlightNum, DepDelayMinutes LIMIT 6","hsqls":["SELECT Diverted, FlightNum, DepDelayMinutes, SUM(ArrTime) FROM mytable WHERE Flights >= 1 OR OriginStateName <> 'Maine' GROUP BY Diverted, FlightNum, DepDelayMinutes  ORDER BY Diverted, FlightNum, DepDelayMinutes LIMIT 6"]}
-{"sql":"SELECT Cancelled, Origin, DaysSinceEpoch FROM mytable WHERE DivWheelsOffs IN (1423, 1241) OR Dest NOT IN ('EYW', 'SCC', 'CAK', 'GSP') OR Quarter BETWEEN 1 AND 1 LIMIT 9","hsqls":["SELECT Cancelled, Origin, DaysSinceEpoch FROM mytable WHERE (DivWheelsOffs__MV0 IN (1423, 1241) OR DivWheelsOffs__MV1 IN (1423, 1241) OR DivWheelsOffs__MV2 IN (1423, 1241) OR DivWheelsOffs__MV3 IN (1423, 1241) OR DivWheelsOffs__MV4 IN (1423, 1241)) OR Dest NOT IN ('EYW', 'SCC', 'CAK', 'GSP') OR Quarter BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT Cancelled, Origin, DaysSinceEpoch FROM mytable WHERE DivWheelsOffs IN (1423, 1241) OR Dest NOT IN ('EYW', 'SCC', 'CAK', 'GSP') OR Quarter BETWEEN 1 AND 1 LIMIT 9","hsqls":["SELECT Cancelled, Origin, DaysSinceEpoch FROM mytable WHERE (DivWheelsOffs[1] IN (1423, 1241) OR DivWheelsOffs[2] IN (1423, 1241) OR DivWheelsOffs[3] IN (1423, 1241) OR DivWheelsOffs[4] IN (1423, 1241) OR DivWheelsOffs[5] IN (1423, 1241)) OR Dest NOT IN ('EYW', 'SCC', 'CAK', 'GSP') OR Quarter BETWEEN 1 AND 1 LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, COUNT(*) FROM mytable WHERE DayofMonth BETWEEN 14 AND 28 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 8","hsqls":["SELECT DayofMonth, COUNT(*) FROM mytable WHERE DayofMonth BETWEEN 14 AND 28 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 8"]}
 {"sql":"SELECT DistanceGroup, OriginState, DestStateName, AVG(Distance) FROM mytable GROUP BY DistanceGroup, OriginState, DestStateName  ORDER BY DistanceGroup, OriginState, DestStateName LIMIT 26","hsqls":["SELECT DistanceGroup, OriginState, DestStateName, AVG(Distance) FROM mytable GROUP BY DistanceGroup, OriginState, DestStateName  ORDER BY DistanceGroup, OriginState, DestStateName LIMIT 26"]}
 {"sql":"SELECT TaxiOut, FlightDate, DivAirportLandings, MAX(TaxiIn) FROM mytable GROUP BY TaxiOut, FlightDate, DivAirportLandings  ORDER BY TaxiOut, FlightDate, DivAirportLandings LIMIT 7","hsqls":["SELECT TaxiOut, FlightDate, DivAirportLandings, MAX(TaxiIn) FROM mytable GROUP BY TaxiOut, FlightDate, DivAirportLandings  ORDER BY TaxiOut, FlightDate, DivAirportLandings LIMIT 7"]}
 {"sql":"SELECT WeatherDelay, TotalAddGTime, DivActualElapsedTime FROM mytable ORDER BY ArrDel15 LIMIT 8"}
 {"sql":"SELECT DepDelay, DepDel15 FROM mytable LIMIT 17"}
 {"sql":"SELECT DepTimeBlk, MAX(DestStateFips), AVG(LongestAddGTime) FROM mytable WHERE FlightNum NOT IN (5688, 1432, 2907) OR DivActualElapsedTime >= 164 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 12","hsqls":["SELECT DepTimeBlk, MAX(DestStateFips), AVG(LongestAddGTime) FROM mytable WHERE FlightNum NOT IN (5688, 1432, 2907) OR DivActualElapsedTime >= 164 GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 12"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DivAirportSeqIDs IN (1457604, 1599102, 1410803) OR OriginState IN ('MT', 'NE', 'WY', 'CO') AND FlightNum >= 1572 ORDER BY DestCityMarketID, DayofMonth LIMIT 22","hsqls":["SELECT Year FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs__MV1 IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs__MV2 IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs__MV3 IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs__MV4 IN (1457604, 1599102, 1410803)) OR OriginState IN ('MT', 'NE', 'WY', 'CO') AND FlightNum >= 1572 ORDER BY DestCityMarketID, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DivAirportSeqIDs IN (1457604, 1599102, 1410803) OR OriginState IN ('MT', 'NE', 'WY', 'CO') AND FlightNum >= 1572 ORDER BY DestCityMarketID, DayofMonth LIMIT 22","hsqls":["SELECT `Year` FROM mytable WHERE (DivAirportSeqIDs[1] IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs[2] IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs[3] IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs[4] IN (1457604, 1599102, 1410803) OR DivAirportSeqIDs[5] IN (1457604, 1599102, 1410803)) OR OriginState IN ('MT', 'NE', 'WY', 'CO') AND FlightNum >= 1572 ORDER BY DestCityMarketID, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DepDelayMinutes, TailNum, COUNT(*) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DestStateFips <= 16 AND DivArrDelay >= 176 GROUP BY FirstDepTime, DepDelayMinutes, TailNum  ORDER BY FirstDepTime, DepDelayMinutes, TailNum LIMIT 13","hsqls":["SELECT FirstDepTime, DepDelayMinutes, TailNum, COUNT(*) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DestStateFips <= 16 AND DivArrDelay >= 176 GROUP BY FirstDepTime, DepDelayMinutes, TailNum  ORDER BY FirstDepTime, DepDelayMinutes, TailNum LIMIT 13"]}
 {"sql":"SELECT Flights, DestStateFips, DestAirportSeqID FROM mytable WHERE AirTime BETWEEN 371 AND 344 OR DepartureDelayGroups = 8 ORDER BY TaxiOut, DestWac, DestCityName LIMIT 9"}
 {"sql":"SELECT LateAircraftDelay, FlightNum, DestAirportID, MIN(CRSArrTime) FROM mytable WHERE ArrTime BETWEEN 2145 AND 748 GROUP BY LateAircraftDelay, FlightNum, DestAirportID  ORDER BY LateAircraftDelay, FlightNum, DestAirportID LIMIT 19","hsqls":["SELECT LateAircraftDelay, FlightNum, DestAirportID, MIN(CRSArrTime) FROM mytable WHERE ArrTime BETWEEN 2145 AND 748 GROUP BY LateAircraftDelay, FlightNum, DestAirportID  ORDER BY LateAircraftDelay, FlightNum, DestAirportID LIMIT 19"]}
 {"sql":"SELECT TailNum, ArrivalDelayGroups, OriginAirportID, COUNT(*) FROM mytable WHERE CRSDepTime <= 749 AND OriginAirportID BETWEEN 12945 AND 12206 AND TotalAddGTime BETWEEN 19 AND 34 GROUP BY TailNum, ArrivalDelayGroups, OriginAirportID  ORDER BY TailNum, ArrivalDelayGroups, OriginAirportID LIMIT 12","hsqls":["SELECT TailNum, ArrivalDelayGroups, OriginAirportID, COUNT(*) FROM mytable WHERE CRSDepTime <= 749 AND OriginAirportID BETWEEN 12945 AND 12206 AND TotalAddGTime BETWEEN 19 AND 34 GROUP BY TailNum, ArrivalDelayGroups, OriginAirportID  ORDER BY TailNum, ArrivalDelayGroups, OriginAirportID LIMIT 12"]}
-{"sql":"SELECT DivReachedDest, ActualElapsedTime, SUM(CRSElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 937 AND 1958 GROUP BY DivReachedDest, ActualElapsedTime LIMIT 27","hsqls":["SELECT DivReachedDest, ActualElapsedTime, SUM(CRSElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 937 AND 1958 OR DivWheelsOffs__MV1 BETWEEN 937 AND 1958 OR DivWheelsOffs__MV2 BETWEEN 937 AND 1958 OR DivWheelsOffs__MV3 BETWEEN 937 AND 1958 OR DivWheelsOffs__MV4 BETWEEN 937 AND 1958) GROUP BY DivReachedDest, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, ActualElapsedTime, SUM(CRSElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 937 AND 1958 GROUP BY DivReachedDest, ActualElapsedTime LIMIT 27","hsqls":["SELECT DivReachedDest, ActualElapsedTime, SUM(CRSElapsedTime), MAX(CRSElapsedTime) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 937 AND 1958 OR DivWheelsOffs[2] BETWEEN 937 AND 1958 OR DivWheelsOffs[3] BETWEEN 937 AND 1958 OR DivWheelsOffs[4] BETWEEN 937 AND 1958 OR DivWheelsOffs[5] BETWEEN 937 AND 1958) GROUP BY DivReachedDest, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DepDelay, Quarter, Distance, AVG(DivReachedDest), AVG(OriginStateFips) FROM mytable WHERE DestCityName BETWEEN 'Hancock/Houghton, MI' AND 'Cedar City, UT' AND OriginCityMarketID BETWEEN 34520 AND 30146 OR AirTime BETWEEN 190 AND 178 GROUP BY DepDelay, Quarter, Distance  ORDER BY DepDelay, Quarter, Distance LIMIT 24","hsqls":["SELECT DepDelay, Quarter, Distance, AVG(DivReachedDest), AVG(OriginStateFips) FROM mytable WHERE DestCityName BETWEEN 'Hancock/Houghton, MI' AND 'Cedar City, UT' AND OriginCityMarketID BETWEEN 34520 AND 30146 OR AirTime BETWEEN 190 AND 178 GROUP BY DepDelay, Quarter, Distance  ORDER BY DepDelay, Quarter, Distance LIMIT 24"]}
 {"sql":"SELECT DivAirportLandings, AirlineID, DivArrDelay FROM mytable WHERE DepDelayMinutes NOT IN (126.0, 298.0, 218.0) ORDER BY ActualElapsedTime, DepTimeBlk LIMIT 26"}
-{"sql":"SELECT NASDelay, OriginAirportID FROM mytable WHERE \"Month\" >= 1 ORDER BY DepDel15 LIMIT 27","hsqls":["SELECT NASDelay, OriginAirportID FROM mytable WHERE Month >= 1 ORDER BY DepDel15 LIMIT 27"]}
-{"sql":"SELECT FlightNum, DestStateFips, DivTailNums FROM mytable WHERE OriginCityName = 'Joplin, MO' AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 23","hsqls":["SELECT FlightNum, DestStateFips, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE OriginCityName = 'Joplin, MO' AND Year BETWEEN 2014 AND 2014 LIMIT 10000"]}
+{"sql":"SELECT NASDelay, OriginAirportID FROM mytable WHERE \"Month\" >= 1 ORDER BY DepDel15 LIMIT 27","hsqls":["SELECT NASDelay, OriginAirportID FROM mytable WHERE `Month` >= 1 ORDER BY DepDel15 LIMIT 27"]}
+{"sql":"SELECT FlightNum, DestStateFips, DivTailNums FROM mytable WHERE OriginCityName = 'Joplin, MO' AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 23","hsqls":["SELECT FlightNum, DestStateFips, DivTailNums FROM mytable WHERE OriginCityName = 'Joplin, MO' AND `Year` BETWEEN 2014 AND 2014 LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, DivArrDelay, MAX(Cancelled) FROM mytable GROUP BY ArrDelay, DivArrDelay  ORDER BY ArrDelay, DivArrDelay LIMIT 26","hsqls":["SELECT ArrDelay, DivArrDelay, MAX(Cancelled) FROM mytable GROUP BY ArrDelay, DivArrDelay  ORDER BY ArrDelay, DivArrDelay LIMIT 26"]}
 {"sql":"SELECT FlightNum, COUNT(*) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 22","hsqls":["SELECT FlightNum, COUNT(*) FROM mytable GROUP BY FlightNum  ORDER BY FlightNum LIMIT 22"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DepTimeBlk IN ('1900-1959', '1500-1559') OR DivReachedDest > 0 LIMIT 21"}
 {"sql":"SELECT OriginAirportSeqID, ArrTimeBlk, AirlineID, COUNT(*) FROM mytable WHERE OriginWac <= 88 OR CRSElapsedTime > 275 GROUP BY OriginAirportSeqID, ArrTimeBlk, AirlineID  ORDER BY OriginAirportSeqID, ArrTimeBlk, AirlineID LIMIT 7","hsqls":["SELECT OriginAirportSeqID, ArrTimeBlk, AirlineID, COUNT(*) FROM mytable WHERE OriginWac <= 88 OR CRSElapsedTime > 275 GROUP BY OriginAirportSeqID, ArrTimeBlk, AirlineID  ORDER BY OriginAirportSeqID, ArrTimeBlk, AirlineID LIMIT 7"]}
-{"sql":"SELECT FirstDepTime, OriginCityName, COUNT(*) FROM mytable WHERE \"Month\" NOT IN (1) AND ArrDelayMinutes = 305.0 GROUP BY FirstDepTime, OriginCityName LIMIT 15","hsqls":["SELECT FirstDepTime, OriginCityName, COUNT(*) FROM mytable WHERE Month NOT IN (1) AND ArrDelayMinutes = 305.0 GROUP BY FirstDepTime, OriginCityName LIMIT 15"]}
+{"sql":"SELECT FirstDepTime, OriginCityName, COUNT(*) FROM mytable WHERE \"Month\" NOT IN (1) AND ArrDelayMinutes = 305.0 GROUP BY FirstDepTime, OriginCityName LIMIT 15","hsqls":["SELECT FirstDepTime, OriginCityName, COUNT(*) FROM mytable WHERE `Month` NOT IN (1) AND ArrDelayMinutes = 305.0 GROUP BY FirstDepTime, OriginCityName LIMIT 15"]}
 {"sql":"SELECT SecurityDelay, FlightDate FROM mytable WHERE DestCityName BETWEEN 'Kodiak, AK' AND 'Fayetteville, NC' ORDER BY DayofMonth LIMIT 26"}
 {"sql":"SELECT DestAirportSeqID FROM mytable ORDER BY ArrDel15, CRSElapsedTime LIMIT 7"}
 {"sql":"SELECT DistanceGroup, TailNum FROM mytable LIMIT 17"}
 {"sql":"SELECT DistanceGroup, ArrDelayMinutes FROM mytable WHERE WheelsOn BETWEEN 704 AND 25 ORDER BY DepartureDelayGroups LIMIT 23"}
 {"sql":"SELECT DestCityName, MIN(FlightNum), SUM(DestAirportSeqID), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportID BETWEEN 10821 AND 14893 AND OriginStateFips <> 72 AND Carrier BETWEEN 'OO' AND 'EV' GROUP BY DestCityName  ORDER BY DestCityName LIMIT 22","hsqls":["SELECT DestCityName, MIN(FlightNum), SUM(DestAirportSeqID), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportID BETWEEN 10821 AND 14893 AND OriginStateFips <> 72 AND Carrier BETWEEN 'OO' AND 'EV' GROUP BY DestCityName  ORDER BY DestCityName LIMIT 22"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE FlightNum >= 1672 AND DivLongestGTimes BETWEEN 136.0 AND 66.0 LIMIT 4","hsqls":["SELECT COUNT(*) FROM mytable WHERE FlightNum >= 1672 AND (DivLongestGTimes__MV0 BETWEEN 136.0 AND 66.0 OR DivLongestGTimes__MV1 BETWEEN 136.0 AND 66.0 OR DivLongestGTimes__MV2 BETWEEN 136.0 AND 66.0 OR DivLongestGTimes__MV3 BETWEEN 136.0 AND 66.0 OR DivLongestGTimes__MV4 BETWEEN 136.0 AND 66.0) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE FlightNum >= 1672 AND DivLongestGTimes BETWEEN 136.0 AND 66.0 LIMIT 4","hsqls":["SELECT COUNT(*) FROM mytable WHERE FlightNum >= 1672 AND (DivLongestGTimes[1] BETWEEN 136.0 AND 66.0 OR DivLongestGTimes[2] BETWEEN 136.0 AND 66.0 OR DivLongestGTimes[3] BETWEEN 136.0 AND 66.0 OR DivLongestGTimes[4] BETWEEN 136.0 AND 66.0 OR DivLongestGTimes[5] BETWEEN 136.0 AND 66.0) LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, FirstDepTime, Distance, MAX(WheelsOff), MAX(SecurityDelay) FROM mytable WHERE ArrDelayMinutes <> 218.0 OR Diverted > 0 GROUP BY DepartureDelayGroups, FirstDepTime, Distance  ORDER BY DepartureDelayGroups, FirstDepTime, Distance LIMIT 15","hsqls":["SELECT DepartureDelayGroups, FirstDepTime, Distance, MAX(WheelsOff), MAX(SecurityDelay) FROM mytable WHERE ArrDelayMinutes <> 218.0 OR Diverted > 0 GROUP BY DepartureDelayGroups, FirstDepTime, Distance  ORDER BY DepartureDelayGroups, FirstDepTime, Distance LIMIT 15"]}
 {"sql":"SELECT DepTimeBlk, DivActualElapsedTime FROM mytable WHERE DestState IN ('AR') AND DistanceGroup BETWEEN 8 AND 7 ORDER BY \"Year\", Quarter LIMIT 21","hsqls":["SELECT DepTimeBlk, DivActualElapsedTime FROM mytable WHERE DestState IN ('AR') AND DistanceGroup BETWEEN 8 AND 7 ORDER BY Year, Quarter LIMIT 21"]}
-{"sql":"SELECT ArrTimeBlk, AirTime FROM mytable WHERE LongestAddGTime IN (30, 42, 32, 74, 14) OR \"Month\" <= 1 ORDER BY ArrTimeBlk, AirTime LIMIT 2","hsqls":["SELECT ArrTimeBlk, AirTime FROM mytable WHERE LongestAddGTime IN (30, 42, 32, 74, 14) OR Month <= 1 ORDER BY ArrTimeBlk, AirTime LIMIT 2"]}
+{"sql":"SELECT ArrTimeBlk, AirTime FROM mytable WHERE LongestAddGTime IN (30, 42, 32, 74, 14) OR \"Month\" <= 1 ORDER BY ArrTimeBlk, AirTime LIMIT 2","hsqls":["SELECT ArrTimeBlk, AirTime FROM mytable WHERE LongestAddGTime IN (30, 42, 32, 74, 14) OR `Month` <= 1 ORDER BY ArrTimeBlk, AirTime LIMIT 2"]}
 {"sql":"SELECT FirstDepTime, WeatherDelay, DepTimeBlk, MAX(WheelsOff), SUM(WheelsOff), MIN(ArrivalDelayGroups) FROM mytable WHERE WheelsOff BETWEEN 1128 AND 1013 GROUP BY FirstDepTime, WeatherDelay, DepTimeBlk  ORDER BY FirstDepTime, WeatherDelay, DepTimeBlk LIMIT 4","hsqls":["SELECT FirstDepTime, WeatherDelay, DepTimeBlk, MAX(WheelsOff), SUM(WheelsOff), MIN(ArrivalDelayGroups) FROM mytable WHERE WheelsOff BETWEEN 1128 AND 1013 GROUP BY FirstDepTime, WeatherDelay, DepTimeBlk  ORDER BY FirstDepTime, WeatherDelay, DepTimeBlk LIMIT 4"]}
-{"sql":"SELECT Quarter, DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' OR OriginAirportID BETWEEN 15096 AND 14679 ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT Quarter, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestCityMarketID FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' OR OriginAirportID BETWEEN 15096 AND 14679 ORDER BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT Quarter, DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' OR OriginAirportID BETWEEN 15096 AND 14679 ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT Quarter, DivAirportSeqIDs, DestCityMarketID FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' OR OriginAirportID BETWEEN 15096 AND 14679 ORDER BY DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT OriginState, Distance, NASDelay, COUNT(*) FROM mytable WHERE NASDelay IN (16, 75) GROUP BY OriginState, Distance, NASDelay  ORDER BY OriginState, Distance, NASDelay LIMIT 8","hsqls":["SELECT OriginState, Distance, NASDelay, COUNT(*) FROM mytable WHERE NASDelay IN (16, 75) GROUP BY OriginState, Distance, NASDelay  ORDER BY OriginState, Distance, NASDelay LIMIT 8"]}
 {"sql":"SELECT WheelsOff, LongestAddGTime FROM mytable LIMIT 17"}
 {"sql":"SELECT DestWac, OriginAirportID FROM mytable LIMIT 26"}
 {"sql":"SELECT \"Year\", DepTimeBlk FROM mytable WHERE DepDelay >= 193.0 LIMIT 10","hsqls":["SELECT Year, DepTimeBlk FROM mytable WHERE DepDelay >= 193.0 LIMIT 10"]}
 {"sql":"SELECT DivAirportLandings, COUNT(UniqueCarrier) FROM mytable WHERE DivArrDelay BETWEEN 81 AND 120 AND ArrDel15 <> 0 OR DepartureDelayGroups BETWEEN -2 AND 6 GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 24","hsqls":["SELECT DivAirportLandings, COUNT(UniqueCarrier) FROM mytable WHERE DivArrDelay BETWEEN 81 AND 120 AND ArrDel15 <> 0 OR DepartureDelayGroups BETWEEN -2 AND 6 GROUP BY DivAirportLandings  ORDER BY DivAirportLandings LIMIT 24"]}
 {"sql":"SELECT DivDistance, Distance FROM mytable LIMIT 11"}
-{"sql":"SELECT DepTime, DepTimeBlk, \"Month\", SUM(WeatherDelay), COUNT(ActualElapsedTime) FROM mytable WHERE DivTailNums IN ('N5ENAA', 'N679DA') GROUP BY DepTime, DepTimeBlk, \"Month\" LIMIT 23","hsqls":["SELECT DepTime, DepTimeBlk, Month, SUM(WeatherDelay), COUNT(ActualElapsedTime) FROM mytable WHERE (DivTailNums__MV0 IN ('N5ENAA', 'N679DA') OR DivTailNums__MV1 IN ('N5ENAA', 'N679DA') OR DivTailNums__MV2 IN ('N5ENAA', 'N679DA') OR DivTailNums__MV3 IN ('N5ENAA', 'N679DA') OR DivTailNums__MV4 IN ('N5ENAA', 'N679DA')) GROUP BY DepTime, DepTimeBlk, Month LIMIT 10000"]}
+{"sql":"SELECT DepTime, DepTimeBlk, \"Month\", SUM(WeatherDelay), COUNT(ActualElapsedTime) FROM mytable WHERE DivTailNums IN ('N5ENAA', 'N679DA') GROUP BY DepTime, DepTimeBlk, \"Month\" LIMIT 23","hsqls":["SELECT DepTime, DepTimeBlk, Month, SUM(WeatherDelay), COUNT(ActualElapsedTime) FROM mytable WHERE (DivTailNums[1] IN ('N5ENAA', 'N679DA') OR DivTailNums[2] IN ('N5ENAA', 'N679DA') OR DivTailNums[3] IN ('N5ENAA', 'N679DA') OR DivTailNums[4] IN ('N5ENAA', 'N679DA') OR DivTailNums[5] IN ('N5ENAA', 'N679DA')) GROUP BY DepTime, DepTimeBlk, `Month` LIMIT 10000"]}
 {"sql":"SELECT COUNT(DayOfWeek), MIN(DepTime), MIN(CarrierDelay) FROM mytable WHERE DestAirportID NOT IN (14520) AND DayofMonth <= 28 LIMIT 22"}
 {"sql":"SELECT ArrDelayMinutes, DestCityMarketID, SUM(CarrierDelay), COUNT(OriginCityMarketID), MAX(TaxiIn) FROM mytable WHERE TaxiOut BETWEEN 3 AND 82 OR ArrDelay BETWEEN 61.0 AND -3.0 GROUP BY ArrDelayMinutes, DestCityMarketID  ORDER BY ArrDelayMinutes, DestCityMarketID LIMIT 11","hsqls":["SELECT ArrDelayMinutes, DestCityMarketID, SUM(CarrierDelay), COUNT(OriginCityMarketID), MAX(TaxiIn) FROM mytable WHERE TaxiOut BETWEEN 3 AND 82 OR ArrDelay BETWEEN 61.0 AND -3.0 GROUP BY ArrDelayMinutes, DestCityMarketID  ORDER BY ArrDelayMinutes, DestCityMarketID LIMIT 11"]}
 {"sql":"SELECT DepDelay, OriginAirportID FROM mytable ORDER BY DestStateFips LIMIT 14"}
-{"sql":"SELECT CarrierDelay, SUM(\"Year\"), SUM(DivArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID BETWEEN 1448702 AND 1410803 OR ArrTime BETWEEN 1018 AND 1519 GROUP BY CarrierDelay LIMIT 25","hsqls":["SELECT CarrierDelay, SUM(Year), SUM(DivArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID BETWEEN 1448702 AND 1410803 OR ArrTime BETWEEN 1018 AND 1519 GROUP BY CarrierDelay LIMIT 25"]}
+{"sql":"SELECT CarrierDelay, SUM(\"Year\"), SUM(DivArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID BETWEEN 1448702 AND 1410803 OR ArrTime BETWEEN 1018 AND 1519 GROUP BY CarrierDelay LIMIT 25","hsqls":["SELECT CarrierDelay, SUM(`Year`), SUM(DivArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE OriginAirportSeqID BETWEEN 1448702 AND 1410803 OR ArrTime BETWEEN 1018 AND 1519 GROUP BY CarrierDelay LIMIT 25"]}
 {"sql":"SELECT FlightDate, Origin FROM mytable WHERE ArrDelayMinutes = 79.0 ORDER BY DestStateFips LIMIT 23"}
 {"sql":"SELECT MIN(ArrDelay), MIN(Quarter), COUNT(CancellationCode) FROM mytable WHERE LateAircraftDelay <= 182 LIMIT 25"}
 {"sql":"SELECT OriginCityMarketID, OriginStateName FROM mytable WHERE ArrDel15 BETWEEN 0 AND 0 ORDER BY WheelsOn, CRSDepTime LIMIT 28"}
 {"sql":"SELECT OriginAirportSeqID, LongestAddGTime FROM mytable ORDER BY DepDelayMinutes LIMIT 19"}
-{"sql":"SELECT DivLongestGTimes, DepDelayMinutes, \"Month\" FROM mytable WHERE DivWheelsOffs BETWEEN 1642 AND 2118 ORDER BY AirTime, OriginWac LIMIT 8","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DepDelayMinutes, Month FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1642 AND 2118 OR DivWheelsOffs__MV1 BETWEEN 1642 AND 2118 OR DivWheelsOffs__MV2 BETWEEN 1642 AND 2118 OR DivWheelsOffs__MV3 BETWEEN 1642 AND 2118 OR DivWheelsOffs__MV4 BETWEEN 1642 AND 2118) ORDER BY AirTime, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DepDelayMinutes, \"Month\" FROM mytable WHERE DivWheelsOffs BETWEEN 1642 AND 2118 ORDER BY AirTime, OriginWac LIMIT 8","hsqls":["SELECT DivLongestGTimes, DepDelayMinutes, `Month` FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1642 AND 2118 OR DivWheelsOffs[2] BETWEEN 1642 AND 2118 OR DivWheelsOffs[3] BETWEEN 1642 AND 2118 OR DivWheelsOffs[4] BETWEEN 1642 AND 2118 OR DivWheelsOffs[5] BETWEEN 1642 AND 2118) ORDER BY AirTime, OriginWac LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, Carrier, COUNT(SecurityDelay) FROM mytable GROUP BY OriginAirportSeqID, Carrier  ORDER BY OriginAirportSeqID, Carrier LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Carrier, COUNT(SecurityDelay) FROM mytable GROUP BY OriginAirportSeqID, Carrier  ORDER BY OriginAirportSeqID, Carrier LIMIT 11"]}
 {"sql":"SELECT DayOfWeek, AVG(LongestAddGTime), AVG(ActualElapsedTime), MIN(WheelsOff) FROM mytable WHERE DepTime NOT IN (1933, 1139, 614, 2334, 1255) GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 9","hsqls":["SELECT DayOfWeek, AVG(LongestAddGTime), AVG(ActualElapsedTime), MIN(WheelsOff) FROM mytable WHERE DepTime NOT IN (1933, 1139, 614, 2334, 1255) GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 9"]}
 {"sql":"SELECT DivDistance, MIN(FlightNum), MAX(OriginWac) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 13","hsqls":["SELECT DivDistance, MIN(FlightNum), MAX(OriginWac) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 13"]}
-{"sql":"SELECT DivWheelsOns, ArrTime, Origin FROM mytable WHERE ArrDel15 IN (1, 0, -9999) LIMIT 4","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ArrTime, Origin FROM mytable WHERE ArrDel15 IN (1, 0, -9999) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, ArrTime, Origin FROM mytable WHERE ArrDel15 IN (1, 0, -9999) LIMIT 4","hsqls":["SELECT DivWheelsOns, ArrTime, Origin FROM mytable WHERE ArrDel15 IN (1, 0, -9999) LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, AirTime, WheelsOn, AVG(DepDel15), AVG(DestAirportID), MAX(AirTime) FROM mytable WHERE Dest <= 'MAF' OR DestCityName BETWEEN 'Albany, NY' AND 'Carlsbad, CA' GROUP BY LateAircraftDelay, AirTime, WheelsOn  ORDER BY LateAircraftDelay, AirTime, WheelsOn LIMIT 4","hsqls":["SELECT LateAircraftDelay, AirTime, WheelsOn, AVG(DepDel15), AVG(DestAirportID), MAX(AirTime) FROM mytable WHERE Dest <= 'MAF' OR DestCityName BETWEEN 'Albany, NY' AND 'Carlsbad, CA' GROUP BY LateAircraftDelay, AirTime, WheelsOn  ORDER BY LateAircraftDelay, AirTime, WheelsOn LIMIT 4"]}
-{"sql":"SELECT Quarter, ArrTime FROM mytable WHERE DivAirports = 'GNV' OR LateAircraftDelay IN (5, 149, 160, 73) AND DestStateName NOT IN ('Louisiana', 'Pennsylvania', 'Colorado', 'U.S. Virgin Islands') ORDER BY OriginCityMarketID, DepTime LIMIT 17","hsqls":["SELECT Quarter, ArrTime FROM mytable WHERE (DivAirports__MV0 = 'GNV' OR DivAirports__MV1 = 'GNV' OR DivAirports__MV2 = 'GNV' OR DivAirports__MV3 = 'GNV' OR DivAirports__MV4 = 'GNV') OR LateAircraftDelay IN (5, 149, 160, 73) AND DestStateName NOT IN ('Louisiana', 'Pennsylvania', 'Colorado', 'U.S. Virgin Islands') ORDER BY OriginCityMarketID, DepTime LIMIT 10000"]}
-{"sql":"SELECT CancellationCode FROM mytable WHERE DestCityName NOT IN ('Detroit, MI') ORDER BY FlightNum, WheelsOn, \"Month\" LIMIT 17","hsqls":["SELECT CancellationCode FROM mytable WHERE DestCityName NOT IN ('Detroit, MI') ORDER BY FlightNum, WheelsOn, Month LIMIT 17"]}
+{"sql":"SELECT Quarter, ArrTime FROM mytable WHERE DivAirports = 'GNV' OR LateAircraftDelay IN (5, 149, 160, 73) AND DestStateName NOT IN ('Louisiana', 'Pennsylvania', 'Colorado', 'U.S. Virgin Islands') ORDER BY OriginCityMarketID, DepTime LIMIT 17","hsqls":["SELECT Quarter, ArrTime FROM mytable WHERE (DivAirports[1] = 'GNV' OR DivAirports[2] = 'GNV' OR DivAirports[3] = 'GNV' OR DivAirports[4] = 'GNV' OR DivAirports[5] = 'GNV') OR LateAircraftDelay IN (5, 149, 160, 73) AND DestStateName NOT IN ('Louisiana', 'Pennsylvania', 'Colorado', 'U.S. Virgin Islands') ORDER BY OriginCityMarketID, DepTime LIMIT 10000"]}
+{"sql":"SELECT CancellationCode FROM mytable WHERE DestCityName NOT IN ('Detroit, MI') ORDER BY FlightNum, WheelsOn, \"Month\" LIMIT 17","hsqls":["SELECT CancellationCode FROM mytable WHERE DestCityName NOT IN ('Detroit, MI') ORDER BY FlightNum, WheelsOn, `Month` LIMIT 17"]}
 {"sql":"SELECT DepDelay, DepDel15, SUM(DivAirportLandings) FROM mytable WHERE DepDelay BETWEEN 75.0 AND 78.0 GROUP BY DepDelay, DepDel15  ORDER BY DepDelay, DepDel15 LIMIT 25","hsqls":["SELECT DepDelay, DepDel15, SUM(DivAirportLandings) FROM mytable WHERE DepDelay BETWEEN 75.0 AND 78.0 GROUP BY DepDelay, DepDel15  ORDER BY DepDelay, DepDel15 LIMIT 25"]}
-{"sql":"SELECT DepDel15, DivActualElapsedTime FROM mytable WHERE OriginStateName <> 'Connecticut' OR Carrier BETWEEN 'US' AND 'AA' AND DivAirportSeqIDs BETWEEN 1334205 AND 1163805 ORDER BY DestWac, OriginCityName LIMIT 28","hsqls":["SELECT DepDel15, DivActualElapsedTime FROM mytable WHERE OriginStateName <> 'Connecticut' OR Carrier BETWEEN 'US' AND 'AA' AND (DivAirportSeqIDs__MV0 BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs__MV1 BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs__MV2 BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs__MV3 BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs__MV4 BETWEEN 1334205 AND 1163805) ORDER BY DestWac, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DivActualElapsedTime FROM mytable WHERE OriginStateName <> 'Connecticut' OR Carrier BETWEEN 'US' AND 'AA' AND DivAirportSeqIDs BETWEEN 1334205 AND 1163805 ORDER BY DestWac, OriginCityName LIMIT 28","hsqls":["SELECT DepDel15, DivActualElapsedTime FROM mytable WHERE OriginStateName <> 'Connecticut' OR Carrier BETWEEN 'US' AND 'AA' AND (DivAirportSeqIDs[1] BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs[2] BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs[3] BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs[4] BETWEEN 1334205 AND 1163805 OR DivAirportSeqIDs[5] BETWEEN 1334205 AND 1163805) ORDER BY DestWac, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT FlightNum, ArrDel15 FROM mytable WHERE DivAirportLandings <> 0 OR TotalAddGTime < 25 ORDER BY Carrier LIMIT 22"}
 {"sql":"SELECT OriginStateName FROM mytable WHERE TotalAddGTime < 103 AND DepDelay IN (220.0, 43.0, 230.0, 218.0, 41.0) AND Origin <> 'IMT' ORDER BY ArrTimeBlk, UniqueCarrier LIMIT 4"}
 {"sql":"SELECT SecurityDelay, Cancelled, MIN(Diverted), SUM(ArrivalDelayGroups), MIN(TaxiOut) FROM mytable WHERE OriginAirportSeqID <= 1112202 GROUP BY SecurityDelay, Cancelled  ORDER BY SecurityDelay, Cancelled LIMIT 17","hsqls":["SELECT SecurityDelay, Cancelled, MIN(Diverted), SUM(ArrivalDelayGroups), MIN(TaxiOut) FROM mytable WHERE OriginAirportSeqID <= 1112202 GROUP BY SecurityDelay, Cancelled  ORDER BY SecurityDelay, Cancelled LIMIT 17"]}
-{"sql":"SELECT Diverted, ArrTime, AVG(DivAirportLandings) FROM mytable WHERE DivAirportLandings IN (2, 9) OR DivWheelsOffs >= 1246 GROUP BY Diverted, ArrTime LIMIT 15","hsqls":["SELECT Diverted, ArrTime, AVG(CAST(DivAirportLandings AS DOUBLE)) FROM mytable WHERE DivAirportLandings IN (2, 9) OR (DivWheelsOffs__MV0 >= 1246 OR DivWheelsOffs__MV1 >= 1246 OR DivWheelsOffs__MV2 >= 1246 OR DivWheelsOffs__MV3 >= 1246 OR DivWheelsOffs__MV4 >= 1246) GROUP BY Diverted, ArrTime LIMIT 10000"]}
+{"sql":"SELECT Diverted, ArrTime, AVG(DivAirportLandings) FROM mytable WHERE DivAirportLandings IN (2, 9) OR DivWheelsOffs >= 1246 GROUP BY Diverted, ArrTime LIMIT 15","hsqls":["SELECT Diverted, ArrTime, AVG(CAST(DivAirportLandings AS DOUBLE)) FROM mytable WHERE DivAirportLandings IN (2, 9) OR (DivWheelsOffs[1] >= 1246 OR DivWheelsOffs[2] >= 1246 OR DivWheelsOffs[3] >= 1246 OR DivWheelsOffs[4] >= 1246 OR DivWheelsOffs[5] >= 1246) GROUP BY Diverted, ArrTime LIMIT 10000"]}
 {"sql":"SELECT DepDelay, ArrDelay, COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 255 AND 166 GROUP BY DepDelay, ArrDelay  ORDER BY DepDelay, ArrDelay LIMIT 21","hsqls":["SELECT DepDelay, ArrDelay, COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 255 AND 166 GROUP BY DepDelay, ArrDelay  ORDER BY DepDelay, ArrDelay LIMIT 21"]}
 {"sql":"SELECT DistanceGroup, CRSArrTime, FlightDate, COUNT(*) FROM mytable WHERE ArrivalDelayGroups <= 0 AND CancellationCode IN ('A', 'noodles') GROUP BY DistanceGroup, CRSArrTime, FlightDate  ORDER BY DistanceGroup, CRSArrTime, FlightDate LIMIT 27","hsqls":["SELECT DistanceGroup, CRSArrTime, FlightDate, COUNT(*) FROM mytable WHERE ArrivalDelayGroups <= 0 AND CancellationCode IN ('A', 'noodles') GROUP BY DistanceGroup, CRSArrTime, FlightDate  ORDER BY DistanceGroup, CRSArrTime, FlightDate LIMIT 27"]}
 {"sql":"SELECT DepTimeBlk, MAX(DepDel15), MIN(Cancelled) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 16","hsqls":["SELECT DepTimeBlk, MAX(DepDel15), MIN(Cancelled) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 16"]}
-{"sql":"SELECT CancellationCode FROM mytable WHERE DivLongestGTimes IN (35.0, 59.0, 8.0, 66.0) AND DivTailNums BETWEEN 'N3771K' AND 'N16183' AND LateAircraftDelay NOT IN (138, 9, 119) ORDER BY WheelsOff, OriginAirportSeqID, WheelsOn LIMIT 22","hsqls":["SELECT CancellationCode FROM mytable WHERE (DivLongestGTimes__MV0 IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes__MV1 IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes__MV2 IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes__MV3 IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes__MV4 IN (35.0, 59.0, 8.0, 66.0)) AND (DivTailNums__MV0 BETWEEN 'N3771K' AND 'N16183' OR DivTailNums__MV1 BETWEEN 'N3771K' AND 'N16183' OR DivTailNums__MV2 BETWEEN 'N3771K' AND 'N16183' OR DivTailNums__MV3 BETWEEN 'N3771K' AND 'N16183' OR DivTailNums__MV4 BETWEEN 'N3771K' AND 'N16183') AND LateAircraftDelay NOT IN (138, 9, 119) ORDER BY WheelsOff, OriginAirportSeqID, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT CancellationCode FROM mytable WHERE DivLongestGTimes IN (35.0, 59.0, 8.0, 66.0) AND DivTailNums BETWEEN 'N3771K' AND 'N16183' AND LateAircraftDelay NOT IN (138, 9, 119) ORDER BY WheelsOff, OriginAirportSeqID, WheelsOn LIMIT 22","hsqls":["SELECT CancellationCode FROM mytable WHERE (DivLongestGTimes[1] IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes[2] IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes[3] IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes[4] IN (35.0, 59.0, 8.0, 66.0) OR DivLongestGTimes[5] IN (35.0, 59.0, 8.0, 66.0)) AND (DivTailNums[1] BETWEEN 'N3771K' AND 'N16183' OR DivTailNums[2] BETWEEN 'N3771K' AND 'N16183' OR DivTailNums[3] BETWEEN 'N3771K' AND 'N16183' OR DivTailNums[4] BETWEEN 'N3771K' AND 'N16183' OR DivTailNums[5] BETWEEN 'N3771K' AND 'N16183') AND LateAircraftDelay NOT IN (138, 9, 119) ORDER BY WheelsOff, OriginAirportSeqID, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes FROM mytable ORDER BY DestStateName, OriginWac, DestCityMarketID LIMIT 17"}
-{"sql":"SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups) FROM mytable WHERE DivAirportSeqIDs < 1234302 LIMIT 26","hsqls":["SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups)  FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1234302 OR DivAirportSeqIDs__MV1 < 1234302 OR DivAirportSeqIDs__MV2 < 1234302 OR DivAirportSeqIDs__MV3 < 1234302 OR DivAirportSeqIDs__MV4 < 1234302) LIMIT 10000"]}
+{"sql":"SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups) FROM mytable WHERE DivAirportSeqIDs < 1234302 LIMIT 26","hsqls":["SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups)  FROM mytable WHERE (DivAirportSeqIDs[1] < 1234302 OR DivAirportSeqIDs[2] < 1234302 OR DivAirportSeqIDs[3] < 1234302 OR DivAirportSeqIDs[4] < 1234302 OR DivAirportSeqIDs[5] < 1234302) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes < 32.0 LIMIT 15"}
-{"sql":"SELECT DivReachedDest, DivLongestGTimes, LongestAddGTime FROM mytable ORDER BY TaxiOut, NASDelay","hsqls":["SELECT DivReachedDest, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, LongestAddGTime FROM mytable ORDER BY TaxiOut, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivLongestGTimes, LongestAddGTime FROM mytable ORDER BY TaxiOut, NASDelay","hsqls":["SELECT DivReachedDest, DivLongestGTimes, LongestAddGTime FROM mytable ORDER BY TaxiOut, NASDelay LIMIT 10000"]}
 {"sql":"SELECT SUM(ArrDelayMinutes), MAX(TotalAddGTime) FROM mytable WHERE OriginWac BETWEEN 81 AND 72 AND Dest IN ('LAR', 'IMT', 'XNA', 'SBP', 'BTV') AND OriginStateName < 'Michigan' LIMIT 20"}
-{"sql":"SELECT OriginState, Cancelled, CRSElapsedTime FROM mytable WHERE DivWheelsOffs IN (1959, 1059, 1345) AND DestAirportSeqID BETWEEN 1315802 AND 1125903 LIMIT 11","hsqls":["SELECT OriginState, Cancelled, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs__MV0 IN (1959, 1059, 1345) OR DivWheelsOffs__MV1 IN (1959, 1059, 1345) OR DivWheelsOffs__MV2 IN (1959, 1059, 1345) OR DivWheelsOffs__MV3 IN (1959, 1059, 1345) OR DivWheelsOffs__MV4 IN (1959, 1059, 1345)) AND DestAirportSeqID BETWEEN 1315802 AND 1125903 LIMIT 10000"]}
+{"sql":"SELECT OriginState, Cancelled, CRSElapsedTime FROM mytable WHERE DivWheelsOffs IN (1959, 1059, 1345) AND DestAirportSeqID BETWEEN 1315802 AND 1125903 LIMIT 11","hsqls":["SELECT OriginState, Cancelled, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs[1] IN (1959, 1059, 1345) OR DivWheelsOffs[2] IN (1959, 1059, 1345) OR DivWheelsOffs[3] IN (1959, 1059, 1345) OR DivWheelsOffs[4] IN (1959, 1059, 1345) OR DivWheelsOffs[5] IN (1959, 1059, 1345)) AND DestAirportSeqID BETWEEN 1315802 AND 1125903 LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, OriginCityMarketID, DivActualElapsedTime, AVG(Quarter) FROM mytable GROUP BY OriginAirportSeqID, OriginCityMarketID, DivActualElapsedTime  ORDER BY OriginAirportSeqID, OriginCityMarketID, DivActualElapsedTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, OriginCityMarketID, DivActualElapsedTime, AVG(Quarter) FROM mytable GROUP BY OriginAirportSeqID, OriginCityMarketID, DivActualElapsedTime  ORDER BY OriginAirportSeqID, OriginCityMarketID, DivActualElapsedTime LIMIT 11"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE Diverted BETWEEN 1 AND 1 LIMIT 6","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Diverted BETWEEN 1 AND 1 LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1483103, 1323202, 1289203) AND DestStateFips NOT IN (49, 20, 45, 33, 25) OR OriginCityMarketID <> 34113 LIMIT 20","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs__MV1 IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs__MV2 IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs__MV3 IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs__MV4 IN (1483103, 1323202, 1289203)) AND DestStateFips NOT IN (49, 20, 45, 33, 25) OR OriginCityMarketID <> 34113 LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE Diverted BETWEEN 1 AND 1 LIMIT 6","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE Diverted BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportSeqIDs IN (1483103, 1323202, 1289203) AND DestStateFips NOT IN (49, 20, 45, 33, 25) OR OriginCityMarketID <> 34113 LIMIT 20","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs[2] IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs[3] IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs[4] IN (1483103, 1323202, 1289203) OR DivAirportSeqIDs[5] IN (1483103, 1323202, 1289203)) AND DestStateFips NOT IN (49, 20, 45, 33, 25) OR OriginCityMarketID <> 34113 LIMIT 10000"]}
 {"sql":"SELECT Carrier, \"Month\", CRSElapsedTime FROM mytable LIMIT 15","hsqls":["SELECT Carrier, Month, CRSElapsedTime FROM mytable LIMIT 15"]}
 {"sql":"SELECT LateAircraftDelay, MIN(DestCityMarketID), COUNT(ArrDel15), MIN(ArrTime) FROM mytable WHERE FirstDepTime < 1119 AND DivDistance NOT IN (170) AND TailNum IN ('N939DL', 'N78501', 'N722EV', 'N933EV') GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 14","hsqls":["SELECT LateAircraftDelay, MIN(DestCityMarketID), COUNT(ArrDel15), MIN(ArrTime) FROM mytable WHERE FirstDepTime < 1119 AND DivDistance NOT IN (170) AND TailNum IN ('N939DL', 'N78501', 'N722EV', 'N933EV') GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 14"]}
 {"sql":"SELECT Cancelled, ArrTimeBlk, ArrDel15, SUM(ArrDelayMinutes), MIN(ArrDelayMinutes), AVG(Distance) FROM mytable WHERE FlightNum BETWEEN 5171 AND 4455 GROUP BY Cancelled, ArrTimeBlk, ArrDel15  ORDER BY Cancelled, ArrTimeBlk, ArrDel15 LIMIT 26","hsqls":["SELECT Cancelled, ArrTimeBlk, ArrDel15, SUM(ArrDelayMinutes), MIN(ArrDelayMinutes), AVG(Distance) FROM mytable WHERE FlightNum BETWEEN 5171 AND 4455 GROUP BY Cancelled, ArrTimeBlk, ArrDel15  ORDER BY Cancelled, ArrTimeBlk, ArrDel15 LIMIT 26"]}
 {"sql":"SELECT MAX(DestAirportSeqID), COUNT(ArrTimeBlk), MAX(DivActualElapsedTime) FROM mytable WHERE WeatherDelay >= 12 OR FlightDate IN ('2014-01-29', '2014-01-13', '2014-01-26', '2014-01-25') LIMIT 24"}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE Cancelled IN (1, 0) AND DepTime <> 1438 ORDER BY Carrier, ArrTime LIMIT 13"}
-{"sql":"SELECT ArrDelayMinutes, DestStateName, DivWheelsOffs FROM mytable WHERE TaxiOut = 41 AND Carrier >= 'EV' OR FirstDepTime BETWEEN 1742 AND 750 ORDER BY FirstDepTime, DestStateFips, OriginStateName LIMIT 18","hsqls":["SELECT ArrDelayMinutes, DestStateName, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiOut = 41 AND Carrier >= 'EV' OR FirstDepTime BETWEEN 1742 AND 750 ORDER BY FirstDepTime, DestStateFips, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DestStateName, DivWheelsOffs FROM mytable WHERE TaxiOut = 41 AND Carrier >= 'EV' OR FirstDepTime BETWEEN 1742 AND 750 ORDER BY FirstDepTime, DestStateFips, OriginStateName LIMIT 18","hsqls":["SELECT ArrDelayMinutes, DestStateName, DivWheelsOffs FROM mytable WHERE TaxiOut = 41 AND Carrier >= 'EV' OR FirstDepTime BETWEEN 1742 AND 750 ORDER BY FirstDepTime, DestStateFips, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable ORDER BY DestWac LIMIT 1"}
 {"sql":"SELECT OriginCityMarketID, CancellationCode FROM mytable WHERE Dest IN ('INL') OR DayofMonth IN (6, 19, 22) ORDER BY ArrDel15, NASDelay LIMIT 17"}
 {"sql":"SELECT Origin, DivArrDelay, DayOfWeek, MIN(DivActualElapsedTime), MAX(DepDelayMinutes), SUM(CRSElapsedTime) FROM mytable GROUP BY Origin, DivArrDelay, DayOfWeek  ORDER BY Origin, DivArrDelay, DayOfWeek LIMIT 20","hsqls":["SELECT Origin, DivArrDelay, DayOfWeek, MIN(DivActualElapsedTime), MAX(DepDelayMinutes), SUM(CRSElapsedTime) FROM mytable GROUP BY Origin, DivArrDelay, DayOfWeek  ORDER BY Origin, DivArrDelay, DayOfWeek LIMIT 20"]}
-{"sql":"SELECT \"Year\", DivAirportSeqIDs, DivTotalGTimes FROM mytable WHERE CRSElapsedTime < 251 AND OriginCityName BETWEEN 'Long Beach, CA' AND 'St. Louis, MO' ORDER BY ArrDelay LIMIT 16","hsqls":["SELECT Year, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CRSElapsedTime < 251 AND OriginCityName BETWEEN 'Long Beach, CA' AND 'St. Louis, MO' ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivAirportSeqIDs, DivTotalGTimes FROM mytable WHERE CRSElapsedTime < 251 AND OriginCityName BETWEEN 'Long Beach, CA' AND 'St. Louis, MO' ORDER BY ArrDelay LIMIT 16","hsqls":["SELECT Year, DivAirportSeqIDs, DivTotalGTimes FROM mytable WHERE CRSElapsedTime < 251 AND OriginCityName BETWEEN 'Long Beach, CA' AND 'St. Louis, MO' ORDER BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, Cancelled FROM mytable ORDER BY OriginCityMarketID, DepDelayMinutes LIMIT 19"}
-{"sql":"SELECT DivTailNums FROM mytable WHERE Dest = 'ILG' AND Flights >= 1 ORDER BY TotalAddGTime, DivArrDelay, CRSElapsedTime","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Dest = 'ILG' AND Flights >= 1 ORDER BY TotalAddGTime, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginState, DivAirportIDs, DivTotalGTimes FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 OR ArrTimeBlk = '1600-1659' ORDER BY FlightNum, DestCityMarketID LIMIT 24","hsqls":["SELECT OriginState, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 OR ArrTimeBlk = '1600-1659' ORDER BY FlightNum, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE Dest = 'ILG' AND Flights >= 1 ORDER BY TotalAddGTime, DivArrDelay, CRSElapsedTime","hsqls":["SELECT DivTailNums FROM mytable WHERE Dest = 'ILG' AND Flights >= 1 ORDER BY TotalAddGTime, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirportIDs, DivTotalGTimes FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 OR ArrTimeBlk = '1600-1659' ORDER BY FlightNum, DestCityMarketID LIMIT 24","hsqls":["SELECT OriginState, DivAirportIDs, DivTotalGTimes FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 OR ArrTimeBlk = '1600-1659' ORDER BY FlightNum, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, MAX(ArrDel15), MIN(DivReachedDest), MAX(Distance) FROM mytable WHERE OriginAirportSeqID BETWEEN 1201202 AND 1077902 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 14","hsqls":["SELECT LateAircraftDelay, MAX(ArrDel15), MIN(DivReachedDest), MAX(Distance) FROM mytable WHERE OriginAirportSeqID BETWEEN 1201202 AND 1077902 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 14"]}
-{"sql":"SELECT COUNT(Origin), COUNT(\"Year\"), MIN(Flights) FROM mytable WHERE DivTotalGTimes BETWEEN 77 AND 73 AND DivTotalGTimes BETWEEN 66 AND 112 OR CRSDepTime NOT IN (1908, 1425, 1834) LIMIT 12","hsqls":["SELECT COUNT(Origin), COUNT(Year), MIN(Flights)  FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 77 AND 73 OR DivTotalGTimes__MV1 BETWEEN 77 AND 73 OR DivTotalGTimes__MV2 BETWEEN 77 AND 73 OR DivTotalGTimes__MV3 BETWEEN 77 AND 73 OR DivTotalGTimes__MV4 BETWEEN 77 AND 73) AND (DivTotalGTimes__MV0 BETWEEN 66 AND 112 OR DivTotalGTimes__MV1 BETWEEN 66 AND 112 OR DivTotalGTimes__MV2 BETWEEN 66 AND 112 OR DivTotalGTimes__MV3 BETWEEN 66 AND 112 OR DivTotalGTimes__MV4 BETWEEN 66 AND 112) OR CRSDepTime NOT IN (1908, 1425, 1834) LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, TailNum, ArrivalDelayGroups FROM mytable WHERE DivWheelsOns = 1511 OR DestState BETWEEN 'IN' AND 'LA' ORDER BY Diverted, Dest LIMIT 17","hsqls":["SELECT DepartureDelayGroups, TailNum, ArrivalDelayGroups FROM mytable WHERE (DivWheelsOns__MV0 = 1511 OR DivWheelsOns__MV1 = 1511 OR DivWheelsOns__MV2 = 1511 OR DivWheelsOns__MV3 = 1511 OR DivWheelsOns__MV4 = 1511) OR DestState BETWEEN 'IN' AND 'LA' ORDER BY Diverted, Dest LIMIT 10000"]}
+{"sql":"SELECT COUNT(Origin), COUNT(\"Year\"), MIN(Flights) FROM mytable WHERE DivTotalGTimes BETWEEN 77 AND 73 AND DivTotalGTimes BETWEEN 66 AND 112 OR CRSDepTime NOT IN (1908, 1425, 1834) LIMIT 12","hsqls":["SELECT COUNT(Origin), COUNT(`Year`), MIN(Flights)  FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 77 AND 73 OR DivTotalGTimes[2] BETWEEN 77 AND 73 OR DivTotalGTimes[3] BETWEEN 77 AND 73 OR DivTotalGTimes[4] BETWEEN 77 AND 73 OR DivTotalGTimes[5] BETWEEN 77 AND 73) AND (DivTotalGTimes[1] BETWEEN 66 AND 112 OR DivTotalGTimes[2] BETWEEN 66 AND 112 OR DivTotalGTimes[3] BETWEEN 66 AND 112 OR DivTotalGTimes[4] BETWEEN 66 AND 112 OR DivTotalGTimes[5] BETWEEN 66 AND 112) OR CRSDepTime NOT IN (1908, 1425, 1834) LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, TailNum, ArrivalDelayGroups FROM mytable WHERE DivWheelsOns = 1511 OR DestState BETWEEN 'IN' AND 'LA' ORDER BY Diverted, Dest LIMIT 17","hsqls":["SELECT DepartureDelayGroups, TailNum, ArrivalDelayGroups FROM mytable WHERE (DivWheelsOns[1] = 1511 OR DivWheelsOns[2] = 1511 OR DivWheelsOns[3] = 1511 OR DivWheelsOns[4] = 1511 OR DivWheelsOns[5] = 1511) OR DestState BETWEEN 'IN' AND 'LA' ORDER BY Diverted, Dest LIMIT 10000"]}
 {"sql":"SELECT DepDelay, OriginWac, ArrDelay, COUNT(*) FROM mytable GROUP BY DepDelay, OriginWac, ArrDelay  ORDER BY DepDelay, OriginWac, ArrDelay LIMIT 26","hsqls":["SELECT DepDelay, OriginWac, ArrDelay, COUNT(*) FROM mytable GROUP BY DepDelay, OriginWac, ArrDelay  ORDER BY DepDelay, OriginWac, ArrDelay LIMIT 26"]}
 {"sql":"SELECT DistanceGroup, COUNT(*) FROM mytable GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 15","hsqls":["SELECT DistanceGroup, COUNT(*) FROM mytable GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 15"]}
 {"sql":"SELECT TailNum, SUM(CRSElapsedTime) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 29","hsqls":["SELECT TailNum, SUM(CRSElapsedTime) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 29"]}
@@ -7738,59 +7738,59 @@
 {"sql":"SELECT ActualElapsedTime, AVG(CRSElapsedTime) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 5","hsqls":["SELECT ActualElapsedTime, AVG(CRSElapsedTime) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 5"]}
 {"sql":"SELECT CRSArrTime, COUNT(AirTime), AVG(LateAircraftDelay) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 17","hsqls":["SELECT CRSArrTime, COUNT(AirTime), AVG(LateAircraftDelay) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 17"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE DepartureDelayGroups = 6 ORDER BY ArrDelayMinutes LIMIT 11"}
-{"sql":"SELECT DivReachedDest, DepDelay, CancellationCode FROM mytable WHERE OriginWac BETWEEN 86 AND 14 AND DivAirportSeqIDs BETWEEN 1412202 AND 1584102 OR DestAirportSeqID <= 1064301 ORDER BY DivDistance LIMIT 20","hsqls":["SELECT DivReachedDest, DepDelay, CancellationCode FROM mytable WHERE OriginWac BETWEEN 86 AND 14 AND (DivAirportSeqIDs__MV0 BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs__MV1 BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs__MV2 BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs__MV3 BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs__MV4 BETWEEN 1412202 AND 1584102) OR DestAirportSeqID <= 1064301 ORDER BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DepDelay, CancellationCode FROM mytable WHERE OriginWac BETWEEN 86 AND 14 AND DivAirportSeqIDs BETWEEN 1412202 AND 1584102 OR DestAirportSeqID <= 1064301 ORDER BY DivDistance LIMIT 20","hsqls":["SELECT DivReachedDest, DepDelay, CancellationCode FROM mytable WHERE OriginWac BETWEEN 86 AND 14 AND (DivAirportSeqIDs[1] BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs[2] BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs[3] BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs[4] BETWEEN 1412202 AND 1584102 OR DivAirportSeqIDs[5] BETWEEN 1412202 AND 1584102) OR DestAirportSeqID <= 1064301 ORDER BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT COUNT(Quarter), SUM(FirstDepTime) FROM mytable LIMIT 9"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime IN (492, 150, 580, 481, 165) AND LateAircraftDelay <= -9999 AND DivWheelsOns < 2022 LIMIT 2","hsqls":["SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime IN (492, 150, 580, 481, 165) AND LateAircraftDelay <= -9999 AND (DivWheelsOns__MV0 < 2022 OR DivWheelsOns__MV1 < 2022 OR DivWheelsOns__MV2 < 2022 OR DivWheelsOns__MV3 < 2022 OR DivWheelsOns__MV4 < 2022) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime IN (492, 150, 580, 481, 165) AND LateAircraftDelay <= -9999 AND DivWheelsOns < 2022 LIMIT 2","hsqls":["SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime IN (492, 150, 580, 481, 165) AND LateAircraftDelay <= -9999 AND (DivWheelsOns[1] < 2022 OR DivWheelsOns[2] < 2022 OR DivWheelsOns[3] < 2022 OR DivWheelsOns[4] < 2022 OR DivWheelsOns[5] < 2022) LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, Distance, DayOfWeek FROM mytable WHERE ArrTime >= 2328 ORDER BY DivReachedDest, Origin LIMIT 10"}
 {"sql":"SELECT DivDistance, DestStateFips, TotalAddGTime FROM mytable WHERE LateAircraftDelay IN (127) AND DivReachedDest NOT IN (1, 0, -9999) AND CancellationCode BETWEEN 'noodles' AND 'noodles' LIMIT 17"}
 {"sql":"SELECT DistanceGroup, AirlineID, AVG(DepDelay), COUNT(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE DestAirportSeqID > 1430702 GROUP BY DistanceGroup, AirlineID  ORDER BY DistanceGroup, AirlineID LIMIT 4","hsqls":["SELECT DistanceGroup, AirlineID, AVG(DepDelay), COUNT(CarrierDelay), COUNT(CRSElapsedTime) FROM mytable WHERE DestAirportSeqID > 1430702 GROUP BY DistanceGroup, AirlineID  ORDER BY DistanceGroup, AirlineID LIMIT 4"]}
 {"sql":"SELECT TaxiIn, DaysSinceEpoch FROM mytable ORDER BY WheelsOn LIMIT 16"}
 {"sql":"SELECT DepDelay, COUNT(*) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 20","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable GROUP BY DepDelay  ORDER BY DepDelay LIMIT 20"]}
-{"sql":"SELECT Carrier, CRSElapsedTime, DayOfWeek FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR \"Month\" <> 1 AND DivActualElapsedTime <> 469 ORDER BY AirTime LIMIT 25","hsqls":["SELECT Carrier, CRSElapsedTime, DayOfWeek FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR Month <> 1 AND DivActualElapsedTime <> 469 ORDER BY AirTime LIMIT 25"]}
+{"sql":"SELECT Carrier, CRSElapsedTime, DayOfWeek FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR \"Month\" <> 1 AND DivActualElapsedTime <> 469 ORDER BY AirTime LIMIT 25","hsqls":["SELECT Carrier, CRSElapsedTime, DayOfWeek FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR `Month` <> 1 AND DivActualElapsedTime <> 469 ORDER BY AirTime LIMIT 25"]}
 {"sql":"SELECT DistanceGroup, ArrTime, AirTime FROM mytable WHERE FirstDepTime >= 1043 ORDER BY DepTime, Cancelled, DestCityName LIMIT 7"}
 {"sql":"SELECT LateAircraftDelay, CarrierDelay, CRSElapsedTime, COUNT(DistanceGroup), MIN(CarrierDelay), MAX(DestCityMarketID) FROM mytable WHERE ArrDel15 >= -9999 OR NASDelay <= 19 GROUP BY LateAircraftDelay, CarrierDelay, CRSElapsedTime  ORDER BY LateAircraftDelay, CarrierDelay, CRSElapsedTime LIMIT 22","hsqls":["SELECT LateAircraftDelay, CarrierDelay, CRSElapsedTime, COUNT(DistanceGroup), MIN(CarrierDelay), MAX(DestCityMarketID) FROM mytable WHERE ArrDel15 >= -9999 OR NASDelay <= 19 GROUP BY LateAircraftDelay, CarrierDelay, CRSElapsedTime  ORDER BY LateAircraftDelay, CarrierDelay, CRSElapsedTime LIMIT 22"]}
-{"sql":"SELECT COUNT(OriginAirportID), MIN(OriginWac), MAX(OriginWac) FROM mytable WHERE \"Month\" IN (1) AND DestAirportID BETWEEN 11203 AND 13127 LIMIT 11","hsqls":["SELECT COUNT(OriginAirportID), MIN(OriginWac), MAX(OriginWac) FROM mytable WHERE Month IN (1) AND DestAirportID BETWEEN 11203 AND 13127 LIMIT 11"]}
+{"sql":"SELECT COUNT(OriginAirportID), MIN(OriginWac), MAX(OriginWac) FROM mytable WHERE \"Month\" IN (1) AND DestAirportID BETWEEN 11203 AND 13127 LIMIT 11","hsqls":["SELECT COUNT(OriginAirportID), MIN(OriginWac), MAX(OriginWac) FROM mytable WHERE `Month` IN (1) AND DestAirportID BETWEEN 11203 AND 13127 LIMIT 11"]}
 {"sql":"SELECT DestStateName, DepDel15, AirlineID FROM mytable WHERE Distance NOT IN (1598) OR DivArrDelay <= 189 ORDER BY TotalAddGTime, DivArrDelay LIMIT 5"}
-{"sql":"SELECT AirTime FROM mytable WHERE Distance BETWEEN 1488 AND 578 ORDER BY TotalAddGTime, DestCityMarketID, \"Month\" LIMIT 25","hsqls":["SELECT AirTime FROM mytable WHERE Distance BETWEEN 1488 AND 578 ORDER BY TotalAddGTime, DestCityMarketID, Month LIMIT 25"]}
+{"sql":"SELECT AirTime FROM mytable WHERE Distance BETWEEN 1488 AND 578 ORDER BY TotalAddGTime, DestCityMarketID, \"Month\" LIMIT 25","hsqls":["SELECT AirTime FROM mytable WHERE Distance BETWEEN 1488 AND 578 ORDER BY TotalAddGTime, DestCityMarketID, `Month` LIMIT 25"]}
 {"sql":"SELECT DestAirportID, DaysSinceEpoch FROM mytable ORDER BY DayofMonth"}
 {"sql":"SELECT TailNum, DestCityName, AirlineID FROM mytable WHERE DepDelayMinutes NOT IN (155.0, 189.0, 276.0, 223.0, 154.0) ORDER BY OriginState, DivDistance LIMIT 15"}
 {"sql":"SELECT DepartureDelayGroups, DestWac FROM mytable WHERE DepDel15 NOT IN (1, 0, -9999) AND DestWac BETWEEN 65 AND 43 AND DepDelay IN (116.0, 24.0) ORDER BY Cancelled, WheelsOn LIMIT 27"}
 {"sql":"SELECT AirTime FROM mytable LIMIT 22"}
 {"sql":"SELECT TaxiIn, MIN(OriginStateFips) FROM mytable WHERE OriginStateName <= 'Pennsylvania' OR OriginCityName IN ('Durango, CO', 'Rochester, NY', 'Monterey, CA', 'Abilene, TX', 'Norfolk, VA') GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 23","hsqls":["SELECT TaxiIn, MIN(OriginStateFips) FROM mytable WHERE OriginStateName <= 'Pennsylvania' OR OriginCityName IN ('Durango, CO', 'Rochester, NY', 'Monterey, CA', 'Abilene, TX', 'Norfolk, VA') GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 23"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE CRSArrTime BETWEEN 1249 AND 2239 AND WeatherDelay NOT IN (10) ORDER BY OriginWac LIMIT 13"}
-{"sql":"SELECT DayofMonth FROM mytable WHERE \"Month\" < 1 ORDER BY Diverted, DestState, LongestAddGTime LIMIT 17","hsqls":["SELECT DayofMonth FROM mytable WHERE Month < 1 ORDER BY Diverted, DestState, LongestAddGTime LIMIT 17"]}
+{"sql":"SELECT DayofMonth FROM mytable WHERE \"Month\" < 1 ORDER BY Diverted, DestState, LongestAddGTime LIMIT 17","hsqls":["SELECT DayofMonth FROM mytable WHERE `Month` < 1 ORDER BY Diverted, DestState, LongestAddGTime LIMIT 17"]}
 {"sql":"SELECT OriginAirportSeqID, CarrierDelay, ArrTimeBlk, COUNT(DepTime), AVG(DestWac) FROM mytable WHERE Flights BETWEEN 1 AND 1 GROUP BY OriginAirportSeqID, CarrierDelay, ArrTimeBlk  ORDER BY OriginAirportSeqID, CarrierDelay, ArrTimeBlk LIMIT 15","hsqls":["SELECT OriginAirportSeqID, CarrierDelay, ArrTimeBlk, COUNT(DepTime), AVG(DestWac) FROM mytable WHERE Flights BETWEEN 1 AND 1 GROUP BY OriginAirportSeqID, CarrierDelay, ArrTimeBlk  ORDER BY OriginAirportSeqID, CarrierDelay, ArrTimeBlk LIMIT 15"]}
-{"sql":"SELECT Quarter, \"Month\", MAX(WheelsOff), COUNT(DivReachedDest) FROM mytable GROUP BY Quarter, \"Month\" LIMIT 15","hsqls":["SELECT Quarter, Month, MAX(WheelsOff), COUNT(DivReachedDest) FROM mytable GROUP BY Quarter, Month LIMIT 15"]}
-{"sql":"SELECT FlightNum, SecurityDelay, DivTotalGTimes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' ORDER BY DistanceGroup, DestWac, DepDelay LIMIT 19","hsqls":["SELECT FlightNum, SecurityDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' ORDER BY DistanceGroup, DestWac, DepDelay LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, ArrDelayMinutes, AirlineID, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 13871 AND 14986 OR DestCityName NOT IN ('Newburgh/Poughkeepsie, NY', 'Tucson, AZ', 'Birmingham, AL') AND DivTotalGTimes BETWEEN 84 AND 37 GROUP BY OriginAirportSeqID, ArrDelayMinutes, AirlineID","hsqls":["SELECT OriginAirportSeqID, ArrDelayMinutes, AirlineID, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 13871 AND 14986 OR DestCityName NOT IN ('Newburgh/Poughkeepsie, NY', 'Tucson, AZ', 'Birmingham, AL') AND (DivTotalGTimes__MV0 BETWEEN 84 AND 37 OR DivTotalGTimes__MV1 BETWEEN 84 AND 37 OR DivTotalGTimes__MV2 BETWEEN 84 AND 37 OR DivTotalGTimes__MV3 BETWEEN 84 AND 37 OR DivTotalGTimes__MV4 BETWEEN 84 AND 37) GROUP BY OriginAirportSeqID, ArrDelayMinutes, AirlineID LIMIT 10000"]}
+{"sql":"SELECT Quarter, \"Month\", MAX(WheelsOff), COUNT(DivReachedDest) FROM mytable GROUP BY Quarter, \"Month\" LIMIT 15","hsqls":["SELECT Quarter, Month, MAX(WheelsOff), COUNT(DivReachedDest) FROM mytable GROUP BY Quarter, `Month` LIMIT 15"]}
+{"sql":"SELECT FlightNum, SecurityDelay, DivTotalGTimes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' ORDER BY DistanceGroup, DestWac, DepDelay LIMIT 19","hsqls":["SELECT FlightNum, SecurityDelay, DivTotalGTimes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' ORDER BY DistanceGroup, DestWac, DepDelay LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, ArrDelayMinutes, AirlineID, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 13871 AND 14986 OR DestCityName NOT IN ('Newburgh/Poughkeepsie, NY', 'Tucson, AZ', 'Birmingham, AL') AND DivTotalGTimes BETWEEN 84 AND 37 GROUP BY OriginAirportSeqID, ArrDelayMinutes, AirlineID","hsqls":["SELECT OriginAirportSeqID, ArrDelayMinutes, AirlineID, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 13871 AND 14986 OR DestCityName NOT IN ('Newburgh/Poughkeepsie, NY', 'Tucson, AZ', 'Birmingham, AL') AND (DivTotalGTimes[1] BETWEEN 84 AND 37 OR DivTotalGTimes[2] BETWEEN 84 AND 37 OR DivTotalGTimes[3] BETWEEN 84 AND 37 OR DivTotalGTimes[4] BETWEEN 84 AND 37 OR DivTotalGTimes[5] BETWEEN 84 AND 37) GROUP BY OriginAirportSeqID, ArrDelayMinutes, AirlineID LIMIT 10000"]}
 {"sql":"SELECT LateAircraftDelay, FlightDate, TailNum, COUNT(DayOfWeek) FROM mytable WHERE DepDel15 IN (1, 0, -9999) GROUP BY LateAircraftDelay, FlightDate, TailNum  ORDER BY LateAircraftDelay, FlightDate, TailNum LIMIT 19","hsqls":["SELECT LateAircraftDelay, FlightDate, TailNum, COUNT(DayOfWeek) FROM mytable WHERE DepDel15 IN (1, 0, -9999) GROUP BY LateAircraftDelay, FlightDate, TailNum  ORDER BY LateAircraftDelay, FlightDate, TailNum LIMIT 19"]}
 {"sql":"SELECT ArrDelayMinutes, OriginStateName FROM mytable ORDER BY DestState, Distance, DepTimeBlk LIMIT 2"}
 {"sql":"SELECT OriginStateFips, OriginCityMarketID, Flights FROM mytable WHERE DepTimeBlk BETWEEN '2200-2259' AND '0900-0959' AND OriginAirportID > 13485 ORDER BY DepDelay, DaysSinceEpoch LIMIT 28"}
 {"sql":"SELECT DepTime, MIN(TaxiOut) FROM mytable WHERE OriginCityName BETWEEN 'Mammoth Lakes, CA' AND 'Birmingham, AL' AND Cancelled BETWEEN 1 AND 0 AND DestCityMarketID BETWEEN 34992 AND 30928 GROUP BY DepTime  ORDER BY DepTime LIMIT 4","hsqls":["SELECT DepTime, MIN(TaxiOut) FROM mytable WHERE OriginCityName BETWEEN 'Mammoth Lakes, CA' AND 'Birmingham, AL' AND Cancelled BETWEEN 1 AND 0 AND DestCityMarketID BETWEEN 34992 AND 30928 GROUP BY DepTime  ORDER BY DepTime LIMIT 4"]}
-{"sql":"SELECT DestState, LateAircraftDelay, \"Month\", COUNT(*) FROM mytable WHERE OriginCityName = 'Fresno, CA' GROUP BY DestState, LateAircraftDelay, \"Month\" LIMIT 21","hsqls":["SELECT DestState, LateAircraftDelay, Month, COUNT(*) FROM mytable WHERE OriginCityName = 'Fresno, CA' GROUP BY DestState, LateAircraftDelay, Month LIMIT 21"]}
+{"sql":"SELECT DestState, LateAircraftDelay, \"Month\", COUNT(*) FROM mytable WHERE OriginCityName = 'Fresno, CA' GROUP BY DestState, LateAircraftDelay, \"Month\" LIMIT 21","hsqls":["SELECT DestState, LateAircraftDelay, Month, COUNT(*) FROM mytable WHERE OriginCityName = 'Fresno, CA' GROUP BY DestState, LateAircraftDelay, `Month` LIMIT 21"]}
 {"sql":"SELECT AirTime FROM mytable WHERE DepTimeBlk IN ('1600-1659', '2200-2259', '0900-0959') LIMIT 16"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable ORDER BY Quarter, DestCityName LIMIT 19"}
-{"sql":"SELECT Diverted, Carrier, OriginStateName, AVG(CRSElapsedTime), AVG(LateAircraftDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 73.0 AND 104.0 OR Distance BETWEEN 708 AND 469 GROUP BY Diverted, Carrier, OriginStateName LIMIT 6","hsqls":["SELECT Diverted, Carrier, OriginStateName, AVG(CRSElapsedTime), AVG(LateAircraftDelay) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 73.0 AND 104.0 OR DivLongestGTimes__MV1 BETWEEN 73.0 AND 104.0 OR DivLongestGTimes__MV2 BETWEEN 73.0 AND 104.0 OR DivLongestGTimes__MV3 BETWEEN 73.0 AND 104.0 OR DivLongestGTimes__MV4 BETWEEN 73.0 AND 104.0) OR Distance BETWEEN 708 AND 469 GROUP BY Diverted, Carrier, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT Diverted, Carrier, OriginStateName, AVG(CRSElapsedTime), AVG(LateAircraftDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 73.0 AND 104.0 OR Distance BETWEEN 708 AND 469 GROUP BY Diverted, Carrier, OriginStateName LIMIT 6","hsqls":["SELECT Diverted, Carrier, OriginStateName, AVG(CRSElapsedTime), AVG(LateAircraftDelay) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 73.0 AND 104.0 OR DivLongestGTimes[2] BETWEEN 73.0 AND 104.0 OR DivLongestGTimes[3] BETWEEN 73.0 AND 104.0 OR DivLongestGTimes[4] BETWEEN 73.0 AND 104.0 OR DivLongestGTimes[5] BETWEEN 73.0 AND 104.0) OR Distance BETWEEN 708 AND 469 GROUP BY Diverted, Carrier, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DayofMonth, COUNT(*) FROM mytable GROUP BY OriginStateFips, DayofMonth  ORDER BY OriginStateFips, DayofMonth LIMIT 28","hsqls":["SELECT OriginStateFips, DayofMonth, COUNT(*) FROM mytable GROUP BY OriginStateFips, DayofMonth  ORDER BY OriginStateFips, DayofMonth LIMIT 28"]}
-{"sql":"SELECT Flights FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND AirlineID <= 20436 ORDER BY DestStateName, DayofMonth, AirTime LIMIT 10","hsqls":["SELECT Flights FROM mytable WHERE Month BETWEEN 1 AND 1 AND AirlineID <= 20436 ORDER BY DestStateName, DayofMonth, AirTime LIMIT 10"]}
+{"sql":"SELECT Flights FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 AND AirlineID <= 20436 ORDER BY DestStateName, DayofMonth, AirTime LIMIT 10","hsqls":["SELECT Flights FROM mytable WHERE `Month` BETWEEN 1 AND 1 AND AirlineID <= 20436 ORDER BY DestStateName, DayofMonth, AirTime LIMIT 10"]}
 {"sql":"SELECT DepDelay FROM mytable WHERE DistanceGroup BETWEEN 8 AND 2 OR DestStateName > 'Minnesota' ORDER BY DepartureDelayGroups, Cancelled LIMIT 15"}
-{"sql":"SELECT ArrTime FROM mytable WHERE OriginState NOT IN ('WI') AND DivLongestGTimes IN (79.0, 118.0, 7.0) OR TaxiIn > 49 LIMIT 15","hsqls":["SELECT ArrTime FROM mytable WHERE OriginState NOT IN ('WI') AND (DivLongestGTimes__MV0 IN (79.0, 118.0, 7.0) OR DivLongestGTimes__MV1 IN (79.0, 118.0, 7.0) OR DivLongestGTimes__MV2 IN (79.0, 118.0, 7.0) OR DivLongestGTimes__MV3 IN (79.0, 118.0, 7.0) OR DivLongestGTimes__MV4 IN (79.0, 118.0, 7.0)) OR TaxiIn > 49 LIMIT 10000"]}
+{"sql":"SELECT ArrTime FROM mytable WHERE OriginState NOT IN ('WI') AND DivLongestGTimes IN (79.0, 118.0, 7.0) OR TaxiIn > 49 LIMIT 15","hsqls":["SELECT ArrTime FROM mytable WHERE OriginState NOT IN ('WI') AND (DivLongestGTimes[1] IN (79.0, 118.0, 7.0) OR DivLongestGTimes[2] IN (79.0, 118.0, 7.0) OR DivLongestGTimes[3] IN (79.0, 118.0, 7.0) OR DivLongestGTimes[4] IN (79.0, 118.0, 7.0) OR DivLongestGTimes[5] IN (79.0, 118.0, 7.0)) OR TaxiIn > 49 LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, ArrTimeBlk, Origin FROM mytable ORDER BY ArrDel15, DepDel15 LIMIT 7"}
 {"sql":"SELECT Diverted, WeatherDelay, COUNT(DestStateName), AVG(WheelsOn) FROM mytable GROUP BY Diverted, WeatherDelay  ORDER BY Diverted, WeatherDelay LIMIT 14","hsqls":["SELECT Diverted, WeatherDelay, COUNT(DestStateName), AVG(WheelsOn) FROM mytable GROUP BY Diverted, WeatherDelay  ORDER BY Diverted, WeatherDelay LIMIT 14"]}
 {"sql":"SELECT \"Year\", FirstDepTime, TotalAddGTime FROM mytable ORDER BY TailNum, ArrivalDelayGroups LIMIT 27","hsqls":["SELECT Year, FirstDepTime, TotalAddGTime FROM mytable ORDER BY TailNum, ArrivalDelayGroups LIMIT 27"]}
 {"sql":"SELECT OriginState, COUNT(*) FROM mytable WHERE OriginStateFips BETWEEN 33 AND 55 GROUP BY OriginState  ORDER BY OriginState LIMIT 25","hsqls":["SELECT OriginState, COUNT(*) FROM mytable WHERE OriginStateFips BETWEEN 33 AND 55 GROUP BY OriginState  ORDER BY OriginState LIMIT 25"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE TailNum NOT IN ('N705AS', 'N012AA', 'N312US', 'N13994') ORDER BY ActualElapsedTime LIMIT 1","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE TailNum NOT IN ('N705AS', 'N012AA', 'N312US', 'N13994') ORDER BY ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT \"Year\", COUNT(*) FROM mytable WHERE Cancelled > 1 OR DivAirports BETWEEN 'PSG' AND 'CHA' GROUP BY \"Year\" LIMIT 8","hsqls":["SELECT Year, COUNT(*) FROM mytable WHERE Cancelled > 1 OR (DivAirports__MV0 BETWEEN 'PSG' AND 'CHA' OR DivAirports__MV1 BETWEEN 'PSG' AND 'CHA' OR DivAirports__MV2 BETWEEN 'PSG' AND 'CHA' OR DivAirports__MV3 BETWEEN 'PSG' AND 'CHA' OR DivAirports__MV4 BETWEEN 'PSG' AND 'CHA') GROUP BY Year LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE TailNum NOT IN ('N705AS', 'N012AA', 'N312US', 'N13994') ORDER BY ActualElapsedTime LIMIT 1","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE TailNum NOT IN ('N705AS', 'N012AA', 'N312US', 'N13994') ORDER BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\", COUNT(*) FROM mytable WHERE Cancelled > 1 OR DivAirports BETWEEN 'PSG' AND 'CHA' GROUP BY \"Year\" LIMIT 8","hsqls":["SELECT Year, COUNT(*) FROM mytable WHERE Cancelled > 1 OR (DivAirports[1] BETWEEN 'PSG' AND 'CHA' OR DivAirports[2] BETWEEN 'PSG' AND 'CHA' OR DivAirports[3] BETWEEN 'PSG' AND 'CHA' OR DivAirports[4] BETWEEN 'PSG' AND 'CHA' OR DivAirports[5] BETWEEN 'PSG' AND 'CHA') GROUP BY `Year` LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, OriginWac, OriginStateName FROM mytable WHERE DestCityMarketID <= 31867 ORDER BY \"Year\", LateAircraftDelay, OriginStateFips","hsqls":["SELECT ArrDelayMinutes, OriginWac, OriginStateName FROM mytable WHERE DestCityMarketID <= 31867 ORDER BY Year, LateAircraftDelay, OriginStateFips"]}
-{"sql":"SELECT DivAirports, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable WHERE DepTime BETWEEN 2004 AND 2315 LIMIT 1","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrivalDelayGroups FROM mytable WHERE DepTime BETWEEN 2004 AND 2315 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable WHERE DepTime BETWEEN 2004 AND 2315 LIMIT 1","hsqls":["SELECT DivAirports, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable WHERE DepTime BETWEEN 2004 AND 2315 LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE AirTime IN (328, 87, 119, 192) OR OriginWac > 1 OR Flights = 1 LIMIT 27"}
-{"sql":"SELECT Carrier, DestStateName, ArrivalDelayGroups, COUNT(ArrTime), COUNT(DepTime) FROM mytable WHERE DivAirportSeqIDs IN (1228002, 1245102, 1169703, 1100303) AND DivDistance BETWEEN 50 AND 1371 GROUP BY Carrier, DestStateName, ArrivalDelayGroups LIMIT 19","hsqls":["SELECT Carrier, DestStateName, ArrivalDelayGroups, COUNT(ArrTime), COUNT(DepTime) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs__MV1 IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs__MV2 IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs__MV3 IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs__MV4 IN (1228002, 1245102, 1169703, 1100303)) AND DivDistance BETWEEN 50 AND 1371 GROUP BY Carrier, DestStateName, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT Carrier, DestStateName, ArrivalDelayGroups, COUNT(ArrTime), COUNT(DepTime) FROM mytable WHERE DivAirportSeqIDs IN (1228002, 1245102, 1169703, 1100303) AND DivDistance BETWEEN 50 AND 1371 GROUP BY Carrier, DestStateName, ArrivalDelayGroups LIMIT 19","hsqls":["SELECT Carrier, DestStateName, ArrivalDelayGroups, COUNT(ArrTime), COUNT(DepTime) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs[2] IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs[3] IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs[4] IN (1228002, 1245102, 1169703, 1100303) OR DivAirportSeqIDs[5] IN (1228002, 1245102, 1169703, 1100303)) AND DivDistance BETWEEN 50 AND 1371 GROUP BY Carrier, DestStateName, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, COUNT(DestStateFips), COUNT(OriginState) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 5","hsqls":["SELECT SecurityDelay, COUNT(DestStateFips), COUNT(OriginState) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 5"]}
 {"sql":"SELECT \"Year\", DivArrDelay FROM mytable WHERE WeatherDelay < 26 OR ArrTimeBlk BETWEEN '0700-0759' AND '1100-1159' LIMIT 15","hsqls":["SELECT Year, DivArrDelay FROM mytable WHERE WeatherDelay < 26 OR ArrTimeBlk BETWEEN '0700-0759' AND '1100-1159' LIMIT 15"]}
-{"sql":"SELECT OriginAirportSeqID, Distance, COUNT(OriginAirportID), MIN(DestAirportSeqID), SUM(DepartureDelayGroups) FROM mytable WHERE DivAirports < 'BOS' AND DestCityName BETWEEN 'Juneau, AK' AND 'Sun Valley/Hailey/Ketchum, ID' GROUP BY OriginAirportSeqID, Distance LIMIT 17","hsqls":["SELECT OriginAirportSeqID, Distance, COUNT(OriginAirportID), MIN(DestAirportSeqID), SUM(DepartureDelayGroups) FROM mytable WHERE (DivAirports__MV0 < 'BOS' OR DivAirports__MV1 < 'BOS' OR DivAirports__MV2 < 'BOS' OR DivAirports__MV3 < 'BOS' OR DivAirports__MV4 < 'BOS') AND DestCityName BETWEEN 'Juneau, AK' AND 'Sun Valley/Hailey/Ketchum, ID' GROUP BY OriginAirportSeqID, Distance LIMIT 10000"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DaysSinceEpoch < 16089 ORDER BY Quarter, CRSArrTime, DivAirportLandings LIMIT 29","hsqls":["SELECT Year FROM mytable WHERE DaysSinceEpoch < 16089 ORDER BY Quarter, CRSArrTime, DivAirportLandings LIMIT 29"]}
-{"sql":"SELECT DepTime, MAX(DestAirportID), MIN(LateAircraftDelay) FROM mytable WHERE DepartureDelayGroups NOT IN (3, 2, -1, 6, -9999) AND DivAirportIDs >= 12173 OR CRSElapsedTime = 101 GROUP BY DepTime LIMIT 16","hsqls":["SELECT DepTime, MAX(DestAirportID), MIN(LateAircraftDelay) FROM mytable WHERE DepartureDelayGroups NOT IN (3, 2, -1, 6, -9999) AND (DivAirportIDs__MV0 >= 12173 OR DivAirportIDs__MV1 >= 12173 OR DivAirportIDs__MV2 >= 12173 OR DivAirportIDs__MV3 >= 12173 OR DivAirportIDs__MV4 >= 12173) OR CRSElapsedTime = 101 GROUP BY DepTime LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, CRSArrTime FROM mytable ORDER BY TailNum LIMIT 2","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CRSArrTime FROM mytable ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, Distance, COUNT(OriginAirportID), MIN(DestAirportSeqID), SUM(DepartureDelayGroups) FROM mytable WHERE DivAirports < 'BOS' AND DestCityName BETWEEN 'Juneau, AK' AND 'Sun Valley/Hailey/Ketchum, ID' GROUP BY OriginAirportSeqID, Distance LIMIT 17","hsqls":["SELECT OriginAirportSeqID, Distance, COUNT(OriginAirportID), MIN(DestAirportSeqID), SUM(DepartureDelayGroups) FROM mytable WHERE (DivAirports[1] < 'BOS' OR DivAirports[2] < 'BOS' OR DivAirports[3] < 'BOS' OR DivAirports[4] < 'BOS' OR DivAirports[5] < 'BOS') AND DestCityName BETWEEN 'Juneau, AK' AND 'Sun Valley/Hailey/Ketchum, ID' GROUP BY OriginAirportSeqID, Distance LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DaysSinceEpoch < 16089 ORDER BY Quarter, CRSArrTime, DivAirportLandings LIMIT 29","hsqls":["SELECT `Year` FROM mytable WHERE DaysSinceEpoch < 16089 ORDER BY Quarter, CRSArrTime, DivAirportLandings LIMIT 29"]}
+{"sql":"SELECT DepTime, MAX(DestAirportID), MIN(LateAircraftDelay) FROM mytable WHERE DepartureDelayGroups NOT IN (3, 2, -1, 6, -9999) AND DivAirportIDs >= 12173 OR CRSElapsedTime = 101 GROUP BY DepTime LIMIT 16","hsqls":["SELECT DepTime, MAX(DestAirportID), MIN(LateAircraftDelay) FROM mytable WHERE DepartureDelayGroups NOT IN (3, 2, -1, 6, -9999) AND (DivAirportIDs[1] >= 12173 OR DivAirportIDs[2] >= 12173 OR DivAirportIDs[3] >= 12173 OR DivAirportIDs[4] >= 12173 OR DivAirportIDs[5] >= 12173) OR CRSElapsedTime = 101 GROUP BY DepTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, CRSArrTime FROM mytable ORDER BY TailNum LIMIT 2","hsqls":["SELECT DivLongestGTimes, CRSArrTime FROM mytable ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT AirlineID, AVG(LongestAddGTime), SUM(DivArrDelay), MIN(FirstDepTime) FROM mytable WHERE ArrivalDelayGroups >= -9999 OR OriginCityMarketID <= 32206 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 20","hsqls":["SELECT AirlineID, AVG(LongestAddGTime), SUM(DivArrDelay), MIN(FirstDepTime) FROM mytable WHERE ArrivalDelayGroups >= -9999 OR OriginCityMarketID <= 32206 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 20"]}
 {"sql":"SELECT DepTimeBlk, DivAirportLandings, COUNT(Dest), MIN(OriginAirportSeqID), AVG(NASDelay) FROM mytable GROUP BY DepTimeBlk, DivAirportLandings  ORDER BY DepTimeBlk, DivAirportLandings LIMIT 12","hsqls":["SELECT DepTimeBlk, DivAirportLandings, COUNT(Dest), MIN(OriginAirportSeqID), AVG(NASDelay) FROM mytable GROUP BY DepTimeBlk, DivAirportLandings  ORDER BY DepTimeBlk, DivAirportLandings LIMIT 12"]}
 {"sql":"SELECT SecurityDelay, COUNT(*) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 22","hsqls":["SELECT SecurityDelay, COUNT(*) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 22"]}
@@ -7798,105 +7798,105 @@
 {"sql":"SELECT FlightDate, DaysSinceEpoch FROM mytable ORDER BY DivDistance, OriginStateName LIMIT 12"}
 {"sql":"SELECT ArrTime, Dest, DivArrDelay, COUNT(SecurityDelay), SUM(DepDelay), MIN(OriginCityMarketID) FROM mytable WHERE WeatherDelay BETWEEN 170 AND 214 OR DayofMonth >= 26 GROUP BY ArrTime, Dest, DivArrDelay  ORDER BY ArrTime, Dest, DivArrDelay LIMIT 9","hsqls":["SELECT ArrTime, Dest, DivArrDelay, COUNT(SecurityDelay), SUM(DepDelay), MIN(OriginCityMarketID) FROM mytable WHERE WeatherDelay BETWEEN 170 AND 214 OR DayofMonth >= 26 GROUP BY ArrTime, Dest, DivArrDelay  ORDER BY ArrTime, Dest, DivArrDelay LIMIT 9"]}
 {"sql":"SELECT OriginStateFips, CRSElapsedTime, OriginAirportID FROM mytable ORDER BY DepDelay LIMIT 4"}
-{"sql":"SELECT MAX(WheelsOff), AVG(ArrivalDelayGroups), MAX(CRSElapsedTime) FROM mytable WHERE LongestAddGTime BETWEEN 40 AND 148 AND DivLongestGTimes BETWEEN 36.0 AND 97.0 LIMIT 10","hsqls":["SELECT MAX(WheelsOff), AVG(ArrivalDelayGroups), MAX(CRSElapsedTime)  FROM mytable WHERE LongestAddGTime BETWEEN 40 AND 148 AND (DivLongestGTimes__MV0 BETWEEN 36.0 AND 97.0 OR DivLongestGTimes__MV1 BETWEEN 36.0 AND 97.0 OR DivLongestGTimes__MV2 BETWEEN 36.0 AND 97.0 OR DivLongestGTimes__MV3 BETWEEN 36.0 AND 97.0 OR DivLongestGTimes__MV4 BETWEEN 36.0 AND 97.0) LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, MIN(ArrDelay), SUM(CRSArrTime), MIN(\"Month\") FROM mytable WHERE Distance BETWEEN 901 AND 1626 GROUP BY DestStateFips LIMIT 23","hsqls":["SELECT DestStateFips, MIN(ArrDelay), SUM(CRSArrTime), MIN(Month) FROM mytable WHERE Distance BETWEEN 901 AND 1626 GROUP BY DestStateFips LIMIT 23"]}
-{"sql":"SELECT ActualElapsedTime, DivTailNums FROM mytable WHERE DestAirportSeqID = 1026802 LIMIT 29","hsqls":["SELECT ActualElapsedTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DestAirportSeqID = 1026802 LIMIT 10000"]}
+{"sql":"SELECT MAX(WheelsOff), AVG(ArrivalDelayGroups), MAX(CRSElapsedTime) FROM mytable WHERE LongestAddGTime BETWEEN 40 AND 148 AND DivLongestGTimes BETWEEN 36.0 AND 97.0 LIMIT 10","hsqls":["SELECT MAX(WheelsOff), AVG(ArrivalDelayGroups), MAX(CRSElapsedTime)  FROM mytable WHERE LongestAddGTime BETWEEN 40 AND 148 AND (DivLongestGTimes[1] BETWEEN 36.0 AND 97.0 OR DivLongestGTimes[2] BETWEEN 36.0 AND 97.0 OR DivLongestGTimes[3] BETWEEN 36.0 AND 97.0 OR DivLongestGTimes[4] BETWEEN 36.0 AND 97.0 OR DivLongestGTimes[5] BETWEEN 36.0 AND 97.0) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, MIN(ArrDelay), SUM(CRSArrTime), MIN(\"Month\") FROM mytable WHERE Distance BETWEEN 901 AND 1626 GROUP BY DestStateFips LIMIT 23","hsqls":["SELECT DestStateFips, MIN(ArrDelay), SUM(CRSArrTime), MIN(`Month`) FROM mytable WHERE Distance BETWEEN 901 AND 1626 GROUP BY DestStateFips LIMIT 23"]}
+{"sql":"SELECT ActualElapsedTime, DivTailNums FROM mytable WHERE DestAirportSeqID = 1026802 LIMIT 29","hsqls":["SELECT ActualElapsedTime, DivTailNums FROM mytable WHERE DestAirportSeqID = 1026802 LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, \"Year\", DestAirportID FROM mytable WHERE TaxiOut >= 50 AND CarrierDelay BETWEEN 39 AND 88 LIMIT 4","hsqls":["SELECT DistanceGroup, Year, DestAirportID FROM mytable WHERE TaxiOut >= 50 AND CarrierDelay BETWEEN 39 AND 88 LIMIT 4"]}
-{"sql":"SELECT TaxiIn, WheelsOn, CRSDepTime, AVG(NASDelay), SUM(ArrDelay), MAX(Cancelled) FROM mytable WHERE DivAirports IN ('LAS') OR ArrDelay IN (81.0) AND DivTailNums >= 'N427SW' GROUP BY TaxiIn, WheelsOn, CRSDepTime LIMIT 26","hsqls":["SELECT TaxiIn, WheelsOn, CRSDepTime, AVG(NASDelay), SUM(ArrDelay), MAX(Cancelled) FROM mytable WHERE (DivAirports__MV0 IN ('LAS') OR DivAirports__MV1 IN ('LAS') OR DivAirports__MV2 IN ('LAS') OR DivAirports__MV3 IN ('LAS') OR DivAirports__MV4 IN ('LAS')) OR ArrDelay IN (81.0) AND (DivTailNums__MV0 >= 'N427SW' OR DivTailNums__MV1 >= 'N427SW' OR DivTailNums__MV2 >= 'N427SW' OR DivTailNums__MV3 >= 'N427SW' OR DivTailNums__MV4 >= 'N427SW') GROUP BY TaxiIn, WheelsOn, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest FROM mytable WHERE DivWheelsOns > 2054 LIMIT 21","hsqls":["SELECT DivReachedDest FROM mytable WHERE (DivWheelsOns__MV0 > 2054 OR DivWheelsOns__MV1 > 2054 OR DivWheelsOns__MV2 > 2054 OR DivWheelsOns__MV3 > 2054 OR DivWheelsOns__MV4 > 2054) LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, WheelsOn, CRSDepTime, AVG(NASDelay), SUM(ArrDelay), MAX(Cancelled) FROM mytable WHERE DivAirports IN ('LAS') OR ArrDelay IN (81.0) AND DivTailNums >= 'N427SW' GROUP BY TaxiIn, WheelsOn, CRSDepTime LIMIT 26","hsqls":["SELECT TaxiIn, WheelsOn, CRSDepTime, AVG(NASDelay), SUM(ArrDelay), MAX(Cancelled) FROM mytable WHERE (DivAirports[1] IN ('LAS') OR DivAirports[2] IN ('LAS') OR DivAirports[3] IN ('LAS') OR DivAirports[4] IN ('LAS') OR DivAirports[5] IN ('LAS')) OR ArrDelay IN (81.0) AND (DivTailNums[1] >= 'N427SW' OR DivTailNums[2] >= 'N427SW' OR DivTailNums[3] >= 'N427SW' OR DivTailNums[4] >= 'N427SW' OR DivTailNums[5] >= 'N427SW') GROUP BY TaxiIn, WheelsOn, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest FROM mytable WHERE DivWheelsOns > 2054 LIMIT 21","hsqls":["SELECT DivReachedDest FROM mytable WHERE (DivWheelsOns[1] > 2054 OR DivWheelsOns[2] > 2054 OR DivWheelsOns[3] > 2054 OR DivWheelsOns[4] > 2054 OR DivWheelsOns[5] > 2054) LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, OriginStateName FROM mytable WHERE SecurityDelay BETWEEN 14 AND 10 AND OriginStateFips BETWEEN 78 AND 40 ORDER BY CarrierDelay, AirTime, ArrivalDelayGroups LIMIT 17"}
 {"sql":"SELECT Dest, UniqueCarrier FROM mytable WHERE ActualElapsedTime NOT IN (252, 299, 111, 335) AND CRSElapsedTime = 317 LIMIT 10"}
 {"sql":"SELECT CarrierDelay, Distance FROM mytable WHERE UniqueCarrier BETWEEN 'AS' AND 'B6' AND CRSElapsedTime >= 251 AND WheelsOn BETWEEN 8 AND 1934 ORDER BY DepartureDelayGroups, DistanceGroup, Carrier LIMIT 6"}
-{"sql":"SELECT OriginState, DestStateName FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16071 ORDER BY DestStateFips, Origin, \"Month\" LIMIT 3","hsqls":["SELECT OriginState, DestStateName FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16071 ORDER BY DestStateFips, Origin, Month LIMIT 3"]}
+{"sql":"SELECT OriginState, DestStateName FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16071 ORDER BY DestStateFips, Origin, \"Month\" LIMIT 3","hsqls":["SELECT OriginState, DestStateName FROM mytable WHERE DaysSinceEpoch BETWEEN 16093 AND 16071 ORDER BY DestStateFips, Origin, `Month` LIMIT 3"]}
 {"sql":"SELECT CarrierDelay, DayOfWeek, COUNT(*) FROM mytable WHERE FlightNum IN (3599, 1058, 5057, 2027) GROUP BY CarrierDelay, DayOfWeek  ORDER BY CarrierDelay, DayOfWeek LIMIT 8","hsqls":["SELECT CarrierDelay, DayOfWeek, COUNT(*) FROM mytable WHERE FlightNum IN (3599, 1058, 5057, 2027) GROUP BY CarrierDelay, DayOfWeek  ORDER BY CarrierDelay, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT COUNT(OriginCityMarketID), SUM(DestStateFips) FROM mytable WHERE AirTime IN (67, 254, 76) AND SecurityDelay <= 1 LIMIT 25"}
 {"sql":"SELECT OriginCityMarketID, ActualElapsedTime, OriginWac, COUNT(*) FROM mytable WHERE DepDelay BETWEEN 137.0 AND 355.0 OR DestWac IN (3, 13) OR Flights >= 1 GROUP BY OriginCityMarketID, ActualElapsedTime, OriginWac  ORDER BY OriginCityMarketID, ActualElapsedTime, OriginWac LIMIT 10","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, OriginWac, COUNT(*) FROM mytable WHERE DepDelay BETWEEN 137.0 AND 355.0 OR DestWac IN (3, 13) OR Flights >= 1 GROUP BY OriginCityMarketID, ActualElapsedTime, OriginWac  ORDER BY OriginCityMarketID, ActualElapsedTime, OriginWac LIMIT 10"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Dest BETWEEN 'ACV' AND 'FWA' OR DayofMonth < 2 LIMIT 19"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE CRSDepTime = 1158 OR DestStateFips BETWEEN 22 AND 15 AND OriginState NOT IN ('TX', 'UT', 'VA') ORDER BY DestWac, TaxiIn, DepTimeBlk LIMIT 6","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE CRSDepTime = 1158 OR DestStateFips BETWEEN 22 AND 15 AND OriginState NOT IN ('TX', 'UT', 'VA') ORDER BY DestWac, TaxiIn, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE CRSDepTime = 1158 OR DestStateFips BETWEEN 22 AND 15 AND OriginState NOT IN ('TX', 'UT', 'VA') ORDER BY DestWac, TaxiIn, DepTimeBlk LIMIT 6","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE CRSDepTime = 1158 OR DestStateFips BETWEEN 22 AND 15 AND OriginState NOT IN ('TX', 'UT', 'VA') ORDER BY DestWac, TaxiIn, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, COUNT(*) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 28","hsqls":["SELECT CRSArrTime, COUNT(*) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 28"]}
 {"sql":"SELECT OriginStateFips, FlightDate, ArrDel15 FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 OR Dest IN ('TYR') ORDER BY OriginCityMarketID, OriginCityName LIMIT 26"}
-{"sql":"SELECT OriginStateFips, DivAirports, DestAirportID FROM mytable LIMIT 1","hsqls":["SELECT OriginStateFips, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportID FROM mytable LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DivAirports, DestAirportID FROM mytable LIMIT 1","hsqls":["SELECT OriginStateFips, DivAirports, DestAirportID FROM mytable LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, COUNT(OriginWac), SUM(ActualElapsedTime), COUNT(AirTime) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 25","hsqls":["SELECT OriginAirportSeqID, COUNT(OriginWac), SUM(ActualElapsedTime), COUNT(AirTime) FROM mytable GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 25"]}
 {"sql":"SELECT WheelsOff, TaxiIn, TailNum FROM mytable WHERE OriginCityMarketID NOT IN (33316, 32951, 33290, 30561) AND NASDelay IN (43, 65) ORDER BY DestStateFips, ArrTime, UniqueCarrier LIMIT 2"}
 {"sql":"SELECT SUM(ArrivalDelayGroups) FROM mytable WHERE DestStateFips >= 37 OR AirlineID BETWEEN 19930 AND 20304 LIMIT 5"}
-{"sql":"SELECT ArrTime, COUNT(*) FROM mytable WHERE \"Year\" < 2014 AND DepDelayMinutes <> 23.0 OR DestCityMarketID IN (31884) GROUP BY ArrTime LIMIT 6","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable WHERE Year < 2014 AND DepDelayMinutes <> 23.0 OR DestCityMarketID IN (31884) GROUP BY ArrTime LIMIT 6"]}
+{"sql":"SELECT ArrTime, COUNT(*) FROM mytable WHERE \"Year\" < 2014 AND DepDelayMinutes <> 23.0 OR DestCityMarketID IN (31884) GROUP BY ArrTime LIMIT 6","hsqls":["SELECT ArrTime, COUNT(*) FROM mytable WHERE `Year` < 2014 AND DepDelayMinutes <> 23.0 OR DestCityMarketID IN (31884) GROUP BY ArrTime LIMIT 6"]}
 {"sql":"SELECT DepartureDelayGroups, DestAirportID FROM mytable ORDER BY DepDelay LIMIT 11"}
 {"sql":"SELECT Diverted, AirTime, OriginStateName FROM mytable WHERE OriginStateFips NOT IN (9) ORDER BY DestState LIMIT 21"}
 {"sql":"SELECT WeatherDelay, Dest, DaysSinceEpoch, AVG(FlightNum), COUNT(DivArrDelay) FROM mytable GROUP BY WeatherDelay, Dest, DaysSinceEpoch  ORDER BY WeatherDelay, Dest, DaysSinceEpoch LIMIT 9","hsqls":["SELECT WeatherDelay, Dest, DaysSinceEpoch, AVG(FlightNum), COUNT(DivArrDelay) FROM mytable GROUP BY WeatherDelay, Dest, DaysSinceEpoch  ORDER BY WeatherDelay, Dest, DaysSinceEpoch LIMIT 9"]}
 {"sql":"SELECT LongestAddGTime, DestCityMarketID, OriginAirportID, SUM(LongestAddGTime), COUNT(AirTime), MAX(Distance) FROM mytable GROUP BY LongestAddGTime, DestCityMarketID, OriginAirportID  ORDER BY LongestAddGTime, DestCityMarketID, OriginAirportID LIMIT 6","hsqls":["SELECT LongestAddGTime, DestCityMarketID, OriginAirportID, SUM(LongestAddGTime), COUNT(AirTime), MAX(Distance) FROM mytable GROUP BY LongestAddGTime, DestCityMarketID, OriginAirportID  ORDER BY LongestAddGTime, DestCityMarketID, OriginAirportID LIMIT 6"]}
 {"sql":"SELECT Origin, COUNT(DistanceGroup), MIN(DepTime), SUM(DivReachedDest) FROM mytable WHERE OriginCityMarketID BETWEEN 33360 AND 30620 AND FlightDate BETWEEN '2014-01-08' AND '2014-01-22' GROUP BY Origin  ORDER BY Origin LIMIT 23","hsqls":["SELECT Origin, COUNT(DistanceGroup), MIN(DepTime), SUM(DivReachedDest) FROM mytable WHERE OriginCityMarketID BETWEEN 33360 AND 30620 AND FlightDate BETWEEN '2014-01-08' AND '2014-01-22' GROUP BY Origin  ORDER BY Origin LIMIT 23"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DepDelay BETWEEN 61.0 AND 193.0 AND DepDelayMinutes < 224.0 ORDER BY DestWac, OriginStateFips, DepTime LIMIT 10"}
-{"sql":"SELECT Diverted, DepDel15 FROM mytable WHERE DaysSinceEpoch NOT IN (16098, 16090) OR Quarter BETWEEN 1 AND 1 AND \"Month\" BETWEEN 1 AND 1 ORDER BY TaxiOut LIMIT 28","hsqls":["SELECT Diverted, DepDel15 FROM mytable WHERE DaysSinceEpoch NOT IN (16098, 16090) OR Quarter BETWEEN 1 AND 1 AND Month BETWEEN 1 AND 1 ORDER BY TaxiOut LIMIT 28"]}
-{"sql":"SELECT LateAircraftDelay, DestAirportID FROM mytable WHERE DestAirportSeqID BETWEEN 1323002 AND 1125203 OR DestStateFips NOT IN (5, 4, 36, 15, 28) OR DayOfWeek BETWEEN 4 AND 4 ORDER BY OriginCityName, \"Month\" LIMIT 5","hsqls":["SELECT LateAircraftDelay, DestAirportID FROM mytable WHERE DestAirportSeqID BETWEEN 1323002 AND 1125203 OR DestStateFips NOT IN (5, 4, 36, 15, 28) OR DayOfWeek BETWEEN 4 AND 4 ORDER BY OriginCityName, Month LIMIT 5"]}
+{"sql":"SELECT Diverted, DepDel15 FROM mytable WHERE DaysSinceEpoch NOT IN (16098, 16090) OR Quarter BETWEEN 1 AND 1 AND \"Month\" BETWEEN 1 AND 1 ORDER BY TaxiOut LIMIT 28","hsqls":["SELECT Diverted, DepDel15 FROM mytable WHERE DaysSinceEpoch NOT IN (16098, 16090) OR Quarter BETWEEN 1 AND 1 AND `Month` BETWEEN 1 AND 1 ORDER BY TaxiOut LIMIT 28"]}
+{"sql":"SELECT LateAircraftDelay, DestAirportID FROM mytable WHERE DestAirportSeqID BETWEEN 1323002 AND 1125203 OR DestStateFips NOT IN (5, 4, 36, 15, 28) OR DayOfWeek BETWEEN 4 AND 4 ORDER BY OriginCityName, \"Month\" LIMIT 5","hsqls":["SELECT LateAircraftDelay, DestAirportID FROM mytable WHERE DestAirportSeqID BETWEEN 1323002 AND 1125203 OR DestStateFips NOT IN (5, 4, 36, 15, 28) OR DayOfWeek BETWEEN 4 AND 4 ORDER BY OriginCityName, `Month` LIMIT 5"]}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE ArrivalDelayGroups IN (3, 4, 11, -9999) OR OriginCityName <> 'Flagstaff, AZ' GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 17","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE ArrivalDelayGroups IN (3, 4, 11, -9999) OR OriginCityName <> 'Flagstaff, AZ' GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 17"]}
-{"sql":"SELECT OriginCityName, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY OriginCityName LIMIT 27","hsqls":["SELECT OriginCityName, COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 GROUP BY OriginCityName LIMIT 27"]}
+{"sql":"SELECT OriginCityName, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 GROUP BY OriginCityName LIMIT 27","hsqls":["SELECT OriginCityName, COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 GROUP BY OriginCityName LIMIT 27"]}
 {"sql":"SELECT MAX(DayofMonth), MAX(AirTime) FROM mytable WHERE Diverted BETWEEN 0 AND 1 AND DepDelayMinutes BETWEEN 68.0 AND 316.0 OR OriginStateFips = 2 LIMIT 8"}
-{"sql":"SELECT DivLongestGTimes, OriginStateFips FROM mytable WHERE LateAircraftDelay IN (114, 327, 18, 74) AND DivAirportIDs IN (10423, 13873, 10693) OR ArrTime BETWEEN 2232 AND 701 ORDER BY Diverted, Quarter LIMIT 17","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, OriginStateFips FROM mytable WHERE LateAircraftDelay IN (114, 327, 18, 74) AND (DivAirportIDs__MV0 IN (10423, 13873, 10693) OR DivAirportIDs__MV1 IN (10423, 13873, 10693) OR DivAirportIDs__MV2 IN (10423, 13873, 10693) OR DivAirportIDs__MV3 IN (10423, 13873, 10693) OR DivAirportIDs__MV4 IN (10423, 13873, 10693)) OR ArrTime BETWEEN 2232 AND 701 ORDER BY Diverted, Quarter LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, OriginStateFips FROM mytable WHERE LateAircraftDelay IN (114, 327, 18, 74) AND DivAirportIDs IN (10423, 13873, 10693) OR ArrTime BETWEEN 2232 AND 701 ORDER BY Diverted, Quarter LIMIT 17","hsqls":["SELECT DivLongestGTimes, OriginStateFips FROM mytable WHERE LateAircraftDelay IN (114, 327, 18, 74) AND (DivAirportIDs[1] IN (10423, 13873, 10693) OR DivAirportIDs[2] IN (10423, 13873, 10693) OR DivAirportIDs[3] IN (10423, 13873, 10693) OR DivAirportIDs[4] IN (10423, 13873, 10693) OR DivAirportIDs[5] IN (10423, 13873, 10693)) OR ArrTime BETWEEN 2232 AND 701 ORDER BY Diverted, Quarter LIMIT 10000"]}
 {"sql":"SELECT Carrier, Cancelled, ArrDel15 FROM mytable WHERE Quarter >= 1 OR NASDelay = 68 ORDER BY WeatherDelay, ArrTimeBlk LIMIT 29"}
 {"sql":"SELECT WheelsOff, Distance, OriginCityName, COUNT(*) FROM mytable GROUP BY WheelsOff, Distance, OriginCityName  ORDER BY WheelsOff, Distance, OriginCityName LIMIT 28","hsqls":["SELECT WheelsOff, Distance, OriginCityName, COUNT(*) FROM mytable GROUP BY WheelsOff, Distance, OriginCityName  ORDER BY WheelsOff, Distance, OriginCityName LIMIT 28"]}
-{"sql":"SELECT OriginState, SUM(DepDelay) FROM mytable WHERE UniqueCarrier IN ('F9', 'HA', 'WN', 'VX') AND DivAirportIDs BETWEEN 12954 AND 13930 GROUP BY OriginState LIMIT 22","hsqls":["SELECT OriginState, SUM(DepDelay) FROM mytable WHERE UniqueCarrier IN ('F9', 'HA', 'WN', 'VX') AND (DivAirportIDs__MV0 BETWEEN 12954 AND 13930 OR DivAirportIDs__MV1 BETWEEN 12954 AND 13930 OR DivAirportIDs__MV2 BETWEEN 12954 AND 13930 OR DivAirportIDs__MV3 BETWEEN 12954 AND 13930 OR DivAirportIDs__MV4 BETWEEN 12954 AND 13930) GROUP BY OriginState LIMIT 10000"]}
+{"sql":"SELECT OriginState, SUM(DepDelay) FROM mytable WHERE UniqueCarrier IN ('F9', 'HA', 'WN', 'VX') AND DivAirportIDs BETWEEN 12954 AND 13930 GROUP BY OriginState LIMIT 22","hsqls":["SELECT OriginState, SUM(DepDelay) FROM mytable WHERE UniqueCarrier IN ('F9', 'HA', 'WN', 'VX') AND (DivAirportIDs[1] BETWEEN 12954 AND 13930 OR DivAirportIDs[2] BETWEEN 12954 AND 13930 OR DivAirportIDs[3] BETWEEN 12954 AND 13930 OR DivAirportIDs[4] BETWEEN 12954 AND 13930 OR DivAirportIDs[5] BETWEEN 12954 AND 13930) GROUP BY OriginState LIMIT 10000"]}
 {"sql":"SELECT OriginState, DestState, AirTime, AVG(CRSElapsedTime), MAX(DayOfWeek), AVG(AirlineID) FROM mytable GROUP BY OriginState, DestState, AirTime  ORDER BY OriginState, DestState, AirTime LIMIT 12","hsqls":["SELECT OriginState, DestState, AirTime, AVG(CRSElapsedTime), MAX(DayOfWeek), AVG(AirlineID) FROM mytable GROUP BY OriginState, DestState, AirTime  ORDER BY OriginState, DestState, AirTime LIMIT 12"]}
 {"sql":"SELECT \"Year\", Flights, TailNum, SUM(CRSArrTime), MAX(ArrDelayMinutes), MAX(DayOfWeek) FROM mytable GROUP BY \"Year\", Flights, TailNum LIMIT 14","hsqls":["SELECT Year, Flights, TailNum, SUM(CRSArrTime), MAX(ArrDelayMinutes), MAX(DayOfWeek) FROM mytable GROUP BY Year, Flights, TailNum LIMIT 14"]}
 {"sql":"SELECT MIN(OriginAirportSeqID), COUNT(OriginStateFips), AVG(NASDelay) FROM mytable LIMIT 16"}
-{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND DivAirportSeqIDs > 1463502 OR DepDelay NOT IN (86.0, 81.0, 123.0) ORDER BY DepDel15, CRSElapsedTime LIMIT 17","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND (DivAirportSeqIDs__MV0 > 1463502 OR DivAirportSeqIDs__MV1 > 1463502 OR DivAirportSeqIDs__MV2 > 1463502 OR DivAirportSeqIDs__MV3 > 1463502 OR DivAirportSeqIDs__MV4 > 1463502) OR DepDelay NOT IN (86.0, 81.0, 123.0) ORDER BY DepDel15, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivActualElapsedTime FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND DivAirportSeqIDs > 1463502 OR DepDelay NOT IN (86.0, 81.0, 123.0) ORDER BY DepDel15, CRSElapsedTime LIMIT 17","hsqls":["SELECT DivActualElapsedTime FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND (DivAirportSeqIDs[1] > 1463502 OR DivAirportSeqIDs[2] > 1463502 OR DivAirportSeqIDs[3] > 1463502 OR DivAirportSeqIDs[4] > 1463502 OR DivAirportSeqIDs[5] > 1463502) OR DepDelay NOT IN (86.0, 81.0, 123.0) ORDER BY DepDel15, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, CancellationCode, COUNT(*) FROM mytable WHERE DepTimeBlk < '1300-1359' GROUP BY DestStateFips, CancellationCode  ORDER BY DestStateFips, CancellationCode LIMIT 29","hsqls":["SELECT DestStateFips, CancellationCode, COUNT(*) FROM mytable WHERE DepTimeBlk < '1300-1359' GROUP BY DestStateFips, CancellationCode  ORDER BY DestStateFips, CancellationCode LIMIT 29"]}
 {"sql":"SELECT WeatherDelay, CRSDepTime, COUNT(*) FROM mytable WHERE NASDelay = 40 AND CRSElapsedTime > 206 OR DivDistance <> 888 GROUP BY WeatherDelay, CRSDepTime  ORDER BY WeatherDelay, CRSDepTime LIMIT 1","hsqls":["SELECT WeatherDelay, CRSDepTime, COUNT(*) FROM mytable WHERE NASDelay = 40 AND CRSElapsedTime > 206 OR DivDistance <> 888 GROUP BY WeatherDelay, CRSDepTime  ORDER BY WeatherDelay, CRSDepTime LIMIT 1"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 AND DivAirportSeqIDs >= 1221702 OR DestWac BETWEEN 3 AND 83 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 AND (DivAirportSeqIDs__MV0 >= 1221702 OR DivAirportSeqIDs__MV1 >= 1221702 OR DivAirportSeqIDs__MV2 >= 1221702 OR DivAirportSeqIDs__MV3 >= 1221702 OR DivAirportSeqIDs__MV4 >= 1221702) OR DestWac BETWEEN 3 AND 83 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 AND DivAirportSeqIDs >= 1221702 OR DestWac BETWEEN 3 AND 83 LIMIT 5","hsqls":["SELECT COUNT(*) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 AND (DivAirportSeqIDs[1] >= 1221702 OR DivAirportSeqIDs[2] >= 1221702 OR DivAirportSeqIDs[3] >= 1221702 OR DivAirportSeqIDs[4] >= 1221702 OR DivAirportSeqIDs[5] >= 1221702) OR DestWac BETWEEN 3 AND 83 LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DestStateName, AirlineID, COUNT(*) FROM mytable WHERE ArrDelay NOT IN (-17.0, 211.0, 118.0) GROUP BY OriginStateFips, DestStateName, AirlineID  ORDER BY OriginStateFips, DestStateName, AirlineID LIMIT 11","hsqls":["SELECT OriginStateFips, DestStateName, AirlineID, COUNT(*) FROM mytable WHERE ArrDelay NOT IN (-17.0, 211.0, 118.0) GROUP BY OriginStateFips, DestStateName, AirlineID  ORDER BY OriginStateFips, DestStateName, AirlineID LIMIT 11"]}
 {"sql":"SELECT DepartureDelayGroups, SUM(DepDelayMinutes), MIN(DestAirportSeqID) FROM mytable WHERE DestStateName IN ('North Carolina') GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 6","hsqls":["SELECT DepartureDelayGroups, SUM(DepDelayMinutes), MIN(DestAirportSeqID) FROM mytable WHERE DestStateName IN ('North Carolina') GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 6"]}
 {"sql":"SELECT TaxiIn, MAX(DivActualElapsedTime), COUNT(CRSElapsedTime) FROM mytable WHERE DepTime BETWEEN 1937 AND 600 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 14","hsqls":["SELECT TaxiIn, MAX(DivActualElapsedTime), COUNT(CRSElapsedTime) FROM mytable WHERE DepTime BETWEEN 1937 AND 600 GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 14"]}
 {"sql":"SELECT DestWac, Carrier, Origin, AVG(DestCityMarketID) FROM mytable WHERE CRSDepTime BETWEEN 941 AND 943 OR DestState > 'LA' GROUP BY DestWac, Carrier, Origin  ORDER BY DestWac, Carrier, Origin LIMIT 17","hsqls":["SELECT DestWac, Carrier, Origin, AVG(DestCityMarketID) FROM mytable WHERE CRSDepTime BETWEEN 941 AND 943 OR DestState > 'LA' GROUP BY DestWac, Carrier, Origin  ORDER BY DestWac, Carrier, Origin LIMIT 17"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE FirstDepTime >= 1200 ORDER BY OriginState, LongestAddGTime LIMIT 21"}
 {"sql":"SELECT AVG(TotalAddGTime), COUNT(DivAirportLandings) FROM mytable LIMIT 20"}
-{"sql":"SELECT DivReachedDest, \"Year\", ArrTimeBlk FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR DivTotalGTimes IN (159) OR DaysSinceEpoch BETWEEN 16087 AND 16092 ORDER BY ArrDelayMinutes, DestStateName LIMIT 9","hsqls":["SELECT DivReachedDest, Year, ArrTimeBlk FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR (DivTotalGTimes__MV0 IN (159) OR DivTotalGTimes__MV1 IN (159) OR DivTotalGTimes__MV2 IN (159) OR DivTotalGTimes__MV3 IN (159) OR DivTotalGTimes__MV4 IN (159)) OR DaysSinceEpoch BETWEEN 16087 AND 16092 ORDER BY ArrDelayMinutes, DestStateName LIMIT 10000"]}
-{"sql":"SELECT ArrDel15, DivActualElapsedTime FROM mytable WHERE LongestAddGTime IN (5, 8, 37) AND CRSArrTime BETWEEN 23 AND 826 AND DivWheelsOffs IN (1711) LIMIT 22","hsqls":["SELECT ArrDel15, DivActualElapsedTime FROM mytable WHERE LongestAddGTime IN (5, 8, 37) AND CRSArrTime BETWEEN 23 AND 826 AND (DivWheelsOffs__MV0 IN (1711) OR DivWheelsOffs__MV1 IN (1711) OR DivWheelsOffs__MV2 IN (1711) OR DivWheelsOffs__MV3 IN (1711) OR DivWheelsOffs__MV4 IN (1711)) LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, \"Year\", ArrTimeBlk FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR DivTotalGTimes IN (159) OR DaysSinceEpoch BETWEEN 16087 AND 16092 ORDER BY ArrDelayMinutes, DestStateName LIMIT 9","hsqls":["SELECT DivReachedDest, Year, ArrTimeBlk FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 OR (DivTotalGTimes[1] IN (159) OR DivTotalGTimes[2] IN (159) OR DivTotalGTimes[3] IN (159) OR DivTotalGTimes[4] IN (159) OR DivTotalGTimes[5] IN (159)) OR DaysSinceEpoch BETWEEN 16087 AND 16092 ORDER BY ArrDelayMinutes, DestStateName LIMIT 10000"]}
+{"sql":"SELECT ArrDel15, DivActualElapsedTime FROM mytable WHERE LongestAddGTime IN (5, 8, 37) AND CRSArrTime BETWEEN 23 AND 826 AND DivWheelsOffs IN (1711) LIMIT 22","hsqls":["SELECT ArrDel15, DivActualElapsedTime FROM mytable WHERE LongestAddGTime IN (5, 8, 37) AND CRSArrTime BETWEEN 23 AND 826 AND (DivWheelsOffs[1] IN (1711) OR DivWheelsOffs[2] IN (1711) OR DivWheelsOffs[3] IN (1711) OR DivWheelsOffs[4] IN (1711) OR DivWheelsOffs[5] IN (1711)) LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable ORDER BY LateAircraftDelay LIMIT 17"}
-{"sql":"SELECT CRSArrTime, MIN(ArrDelay), SUM(AirTime), SUM(DivArrDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 1.0 AND 67.0 GROUP BY CRSArrTime LIMIT 12","hsqls":["SELECT CRSArrTime, MIN(ArrDelay), SUM(AirTime), SUM(DivArrDelay) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 1.0 AND 67.0 OR DivLongestGTimes__MV1 BETWEEN 1.0 AND 67.0 OR DivLongestGTimes__MV2 BETWEEN 1.0 AND 67.0 OR DivLongestGTimes__MV3 BETWEEN 1.0 AND 67.0 OR DivLongestGTimes__MV4 BETWEEN 1.0 AND 67.0) GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, MIN(ArrDelay), SUM(AirTime), SUM(DivArrDelay) FROM mytable WHERE DivLongestGTimes BETWEEN 1.0 AND 67.0 GROUP BY CRSArrTime LIMIT 12","hsqls":["SELECT CRSArrTime, MIN(ArrDelay), SUM(AirTime), SUM(DivArrDelay) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 1.0 AND 67.0 OR DivLongestGTimes[2] BETWEEN 1.0 AND 67.0 OR DivLongestGTimes[3] BETWEEN 1.0 AND 67.0 OR DivLongestGTimes[4] BETWEEN 1.0 AND 67.0 OR DivLongestGTimes[5] BETWEEN 1.0 AND 67.0) GROUP BY CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT Flights, DestCityMarketID FROM mytable WHERE DepDelay <> 62.0 OR Cancelled NOT IN (1, 0) OR DivReachedDest NOT IN (1, 0, -9999) ORDER BY DestState, CarrierDelay, Origin LIMIT 19"}
-{"sql":"SELECT FlightNum, MIN(\"Year\"), AVG(DepTime), MAX(DayOfWeek) FROM mytable WHERE DestState <= 'ID' GROUP BY FlightNum LIMIT 10","hsqls":["SELECT FlightNum, MIN(Year), AVG(DepTime), MAX(DayOfWeek) FROM mytable WHERE DestState <= 'ID' GROUP BY FlightNum LIMIT 10"]}
+{"sql":"SELECT FlightNum, MIN(\"Year\"), AVG(DepTime), MAX(DayOfWeek) FROM mytable WHERE DestState <= 'ID' GROUP BY FlightNum LIMIT 10","hsqls":["SELECT FlightNum, MIN(`Year`), AVG(DepTime), MAX(DayOfWeek) FROM mytable WHERE DestState <= 'ID' GROUP BY FlightNum LIMIT 10"]}
 {"sql":"SELECT OriginStateFips, MIN(OriginAirportID), MIN(DaysSinceEpoch), COUNT(DayofMonth) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'New Hampshire' AND ArrivalDelayGroups <> 12 AND DayOfWeek = 4 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 13","hsqls":["SELECT OriginStateFips, MIN(OriginAirportID), MIN(DaysSinceEpoch), COUNT(DayofMonth) FROM mytable WHERE OriginStateName BETWEEN 'Iowa' AND 'New Hampshire' AND ArrivalDelayGroups <> 12 AND DayOfWeek = 4 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 13"]}
-{"sql":"SELECT \"Month\", COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N915DL' AND 'N3CYAA' OR Origin BETWEEN 'GTR' AND 'YUM' GROUP BY \"Month\" LIMIT 12","hsqls":["SELECT Month, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums__MV1 BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums__MV2 BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums__MV3 BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums__MV4 BETWEEN 'N915DL' AND 'N3CYAA') OR Origin BETWEEN 'GTR' AND 'YUM' GROUP BY Month LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, Cancelled, DestStateName FROM mytable WHERE DivTailNums BETWEEN 'N688MQ' AND 'N554JB' AND LateAircraftDelay <= 71 AND ArrDelayMinutes BETWEEN 246.0 AND 171.0 LIMIT 21","hsqls":["SELECT DepDelayMinutes, Cancelled, DestStateName FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums__MV1 BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums__MV2 BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums__MV3 BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums__MV4 BETWEEN 'N688MQ' AND 'N554JB') AND LateAircraftDelay <= 71 AND ArrDelayMinutes BETWEEN 246.0 AND 171.0 LIMIT 10000"]}
-{"sql":"SELECT Origin, COUNT(*) FROM mytable WHERE DestCityName IN ('New Bern/Morehead/Beaufort, NC', 'Jackson/Vicksburg, MS', 'Louisville, KY', 'Alexandria, LA', 'Worcester, MA') AND AirlineID BETWEEN 19930 AND 20355 OR \"Year\" NOT IN (2014) GROUP BY Origin LIMIT 22","hsqls":["SELECT Origin, COUNT(*) FROM mytable WHERE DestCityName IN ('New Bern/Morehead/Beaufort, NC', 'Jackson/Vicksburg, MS', 'Louisville, KY', 'Alexandria, LA', 'Worcester, MA') AND AirlineID BETWEEN 19930 AND 20355 OR Year NOT IN (2014) GROUP BY Origin LIMIT 22"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes < 84.0 OR AirlineID > 20398 AND OriginAirportSeqID IN (1013603, 1410702, 1172102, 1541103)","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 < 84.0 OR DivLongestGTimes__MV1 < 84.0 OR DivLongestGTimes__MV2 < 84.0 OR DivLongestGTimes__MV3 < 84.0 OR DivLongestGTimes__MV4 < 84.0) OR AirlineID > 20398 AND OriginAirportSeqID IN (1013603, 1410702, 1172102, 1541103) LIMIT 10000"]}
-{"sql":"SELECT COUNT(NASDelay), MAX(CarrierDelay), COUNT(DepTime) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR DivLongestGTimes BETWEEN 3.0 AND 40.0 LIMIT 9","hsqls":["SELECT COUNT(NASDelay), MAX(CarrierDelay), COUNT(DepTime)  FROM mytable WHERE Flights BETWEEN 1 AND 1 OR (DivLongestGTimes__MV0 BETWEEN 3.0 AND 40.0 OR DivLongestGTimes__MV1 BETWEEN 3.0 AND 40.0 OR DivLongestGTimes__MV2 BETWEEN 3.0 AND 40.0 OR DivLongestGTimes__MV3 BETWEEN 3.0 AND 40.0 OR DivLongestGTimes__MV4 BETWEEN 3.0 AND 40.0) LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE ArrTime IN (1740, 1800, 944, 1357, 2153) LIMIT 10","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE ArrTime IN (1740, 1800, 944, 1357, 2153) LIMIT 10000"]}
+{"sql":"SELECT \"Month\", COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N915DL' AND 'N3CYAA' OR Origin BETWEEN 'GTR' AND 'YUM' GROUP BY \"Month\" LIMIT 12","hsqls":["SELECT Month, COUNT(*) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums[2] BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums[3] BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums[4] BETWEEN 'N915DL' AND 'N3CYAA' OR DivTailNums[5] BETWEEN 'N915DL' AND 'N3CYAA') OR Origin BETWEEN 'GTR' AND 'YUM' GROUP BY `Month` LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, Cancelled, DestStateName FROM mytable WHERE DivTailNums BETWEEN 'N688MQ' AND 'N554JB' AND LateAircraftDelay <= 71 AND ArrDelayMinutes BETWEEN 246.0 AND 171.0 LIMIT 21","hsqls":["SELECT DepDelayMinutes, Cancelled, DestStateName FROM mytable WHERE (DivTailNums[1] BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums[2] BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums[3] BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums[4] BETWEEN 'N688MQ' AND 'N554JB' OR DivTailNums[5] BETWEEN 'N688MQ' AND 'N554JB') AND LateAircraftDelay <= 71 AND ArrDelayMinutes BETWEEN 246.0 AND 171.0 LIMIT 10000"]}
+{"sql":"SELECT Origin, COUNT(*) FROM mytable WHERE DestCityName IN ('New Bern/Morehead/Beaufort, NC', 'Jackson/Vicksburg, MS', 'Louisville, KY', 'Alexandria, LA', 'Worcester, MA') AND AirlineID BETWEEN 19930 AND 20355 OR \"Year\" NOT IN (2014) GROUP BY Origin LIMIT 22","hsqls":["SELECT Origin, COUNT(*) FROM mytable WHERE DestCityName IN ('New Bern/Morehead/Beaufort, NC', 'Jackson/Vicksburg, MS', 'Louisville, KY', 'Alexandria, LA', 'Worcester, MA') AND AirlineID BETWEEN 19930 AND 20355 OR `Year` NOT IN (2014) GROUP BY Origin LIMIT 22"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes < 84.0 OR AirlineID > 20398 AND OriginAirportSeqID IN (1013603, 1410702, 1172102, 1541103)","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] < 84.0 OR DivLongestGTimes[2] < 84.0 OR DivLongestGTimes[3] < 84.0 OR DivLongestGTimes[4] < 84.0 OR DivLongestGTimes[5] < 84.0) OR AirlineID > 20398 AND OriginAirportSeqID IN (1013603, 1410702, 1172102, 1541103) LIMIT 10000"]}
+{"sql":"SELECT COUNT(NASDelay), MAX(CarrierDelay), COUNT(DepTime) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR DivLongestGTimes BETWEEN 3.0 AND 40.0 LIMIT 9","hsqls":["SELECT COUNT(NASDelay), MAX(CarrierDelay), COUNT(DepTime)  FROM mytable WHERE Flights BETWEEN 1 AND 1 OR (DivLongestGTimes[1] BETWEEN 3.0 AND 40.0 OR DivLongestGTimes[2] BETWEEN 3.0 AND 40.0 OR DivLongestGTimes[3] BETWEEN 3.0 AND 40.0 OR DivLongestGTimes[4] BETWEEN 3.0 AND 40.0 OR DivLongestGTimes[5] BETWEEN 3.0 AND 40.0) LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE ArrTime IN (1740, 1800, 944, 1357, 2153) LIMIT 10","hsqls":["SELECT DivAirports FROM mytable WHERE ArrTime IN (1740, 1800, 944, 1357, 2153) LIMIT 10000"]}
 {"sql":"SELECT OriginState, LateAircraftDelay FROM mytable WHERE DestStateFips BETWEEN 50 AND 15 OR DestWac NOT IN (88, 37) AND ActualElapsedTime > 270 LIMIT 4"}
-{"sql":"SELECT DepartureDelayGroups, COUNT(ArrDelayMinutes) FROM mytable WHERE DivLongestGTimes BETWEEN 73.0 AND 11.0 GROUP BY DepartureDelayGroups LIMIT 11","hsqls":["SELECT DepartureDelayGroups, COUNT(ArrDelayMinutes) FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 73.0 AND 11.0 OR DivLongestGTimes__MV1 BETWEEN 73.0 AND 11.0 OR DivLongestGTimes__MV2 BETWEEN 73.0 AND 11.0 OR DivLongestGTimes__MV3 BETWEEN 73.0 AND 11.0 OR DivLongestGTimes__MV4 BETWEEN 73.0 AND 11.0) GROUP BY DepartureDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, AirlineID FROM mytable WHERE DestStateName BETWEEN 'North Dakota' AND 'Nevada' ORDER BY DestStateName, DivAirportLandings, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, AirlineID FROM mytable WHERE DestStateName BETWEEN 'North Dakota' AND 'Nevada' ORDER BY DestStateName, DivAirportLandings, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT Diverted, \"Month\" FROM mytable WHERE OriginCityMarketID BETWEEN 31504 AND 34543 AND DivAirportLandings BETWEEN 2 AND 9 AND Quarter IN (1) ORDER BY DepDelay LIMIT 15","hsqls":["SELECT Diverted, Month FROM mytable WHERE OriginCityMarketID BETWEEN 31504 AND 34543 AND DivAirportLandings BETWEEN 2 AND 9 AND Quarter IN (1) ORDER BY DepDelay LIMIT 15"]}
+{"sql":"SELECT DepartureDelayGroups, COUNT(ArrDelayMinutes) FROM mytable WHERE DivLongestGTimes BETWEEN 73.0 AND 11.0 GROUP BY DepartureDelayGroups LIMIT 11","hsqls":["SELECT DepartureDelayGroups, COUNT(ArrDelayMinutes) FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 73.0 AND 11.0 OR DivLongestGTimes[2] BETWEEN 73.0 AND 11.0 OR DivLongestGTimes[3] BETWEEN 73.0 AND 11.0 OR DivLongestGTimes[4] BETWEEN 73.0 AND 11.0 OR DivLongestGTimes[5] BETWEEN 73.0 AND 11.0) GROUP BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, AirlineID FROM mytable WHERE DestStateName BETWEEN 'North Dakota' AND 'Nevada' ORDER BY DestStateName, DivAirportLandings, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT DivTailNums, AirlineID FROM mytable WHERE DestStateName BETWEEN 'North Dakota' AND 'Nevada' ORDER BY DestStateName, DivAirportLandings, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT Diverted, \"Month\" FROM mytable WHERE OriginCityMarketID BETWEEN 31504 AND 34543 AND DivAirportLandings BETWEEN 2 AND 9 AND Quarter IN (1) ORDER BY DepDelay LIMIT 15","hsqls":["SELECT Diverted, `Month` FROM mytable WHERE OriginCityMarketID BETWEEN 31504 AND 34543 AND DivAirportLandings BETWEEN 2 AND 9 AND Quarter IN (1) ORDER BY DepDelay LIMIT 15"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DivAirportLandings BETWEEN 0 AND 2 ORDER BY Distance LIMIT 19"}
 {"sql":"SELECT DestState, UniqueCarrier, OriginAirportID, COUNT(OriginState) FROM mytable WHERE DivActualElapsedTime IN (200, 160, 324, 243, 247) GROUP BY DestState, UniqueCarrier, OriginAirportID  ORDER BY DestState, UniqueCarrier, OriginAirportID LIMIT 10","hsqls":["SELECT DestState, UniqueCarrier, OriginAirportID, COUNT(OriginState) FROM mytable WHERE DivActualElapsedTime IN (200, 160, 324, 243, 247) GROUP BY DestState, UniqueCarrier, OriginAirportID  ORDER BY DestState, UniqueCarrier, OriginAirportID LIMIT 10"]}
-{"sql":"SELECT FlightDate, Cancelled, \"Month\", COUNT(*) FROM mytable WHERE DestWac <> 12 GROUP BY FlightDate, Cancelled, \"Month\" LIMIT 25","hsqls":["SELECT FlightDate, Cancelled, Month, COUNT(*) FROM mytable WHERE DestWac <> 12 GROUP BY FlightDate, Cancelled, Month LIMIT 25"]}
-{"sql":"SELECT DestAirportSeqID, \"Month\", DaysSinceEpoch, MIN(DestCityMarketID), MIN(WheelsOff) FROM mytable WHERE \"Year\" IN (2014) GROUP BY DestAirportSeqID, \"Month\", DaysSinceEpoch","hsqls":["SELECT DestAirportSeqID, Month, DaysSinceEpoch, MIN(DestCityMarketID), MIN(WheelsOff) FROM mytable WHERE Year IN (2014) GROUP BY DestAirportSeqID, Month, DaysSinceEpoch"]}
+{"sql":"SELECT FlightDate, Cancelled, \"Month\", COUNT(*) FROM mytable WHERE DestWac <> 12 GROUP BY FlightDate, Cancelled, \"Month\" LIMIT 25","hsqls":["SELECT FlightDate, Cancelled, Month, COUNT(*) FROM mytable WHERE DestWac <> 12 GROUP BY FlightDate, Cancelled, `Month` LIMIT 25"]}
+{"sql":"SELECT DestAirportSeqID, \"Month\", DaysSinceEpoch, MIN(DestCityMarketID), MIN(WheelsOff) FROM mytable WHERE \"Year\" IN (2014) GROUP BY DestAirportSeqID, \"Month\", DaysSinceEpoch","hsqls":["SELECT DestAirportSeqID, Month, DaysSinceEpoch, MIN(DestCityMarketID), MIN(WheelsOff) FROM mytable WHERE `Year` IN (2014) GROUP BY DestAirportSeqID, Month, DaysSinceEpoch"]}
 {"sql":"SELECT ArrDel15 FROM mytable WHERE DivReachedDest NOT IN (1, -9999) LIMIT 13"}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE DayOfWeek IN (3, 2, 1, 4) AND DestWac IN (44) ORDER BY OriginStateFips LIMIT 14"}
 {"sql":"SELECT AVG(TotalAddGTime) FROM mytable WHERE DestStateFips NOT IN (20, 35, 75) OR OriginStateFips > 23 LIMIT 12"}
 {"sql":"SELECT Carrier, ActualElapsedTime, ArrDel15 FROM mytable WHERE CRSElapsedTime BETWEEN 35 AND 391 OR NASDelay IN (58, 281, 23, 12, 38) LIMIT 11"}
 {"sql":"SELECT WheelsOff, DivReachedDest, OriginCityMarketID, COUNT(*) FROM mytable WHERE SecurityDelay IN (10, 0, 4, 14, -9999) AND OriginState >= 'MA' AND DestCityMarketID BETWEEN 30189 AND 31823 GROUP BY WheelsOff, DivReachedDest, OriginCityMarketID  ORDER BY WheelsOff, DivReachedDest, OriginCityMarketID LIMIT 23","hsqls":["SELECT WheelsOff, DivReachedDest, OriginCityMarketID, COUNT(*) FROM mytable WHERE SecurityDelay IN (10, 0, 4, 14, -9999) AND OriginState >= 'MA' AND DestCityMarketID BETWEEN 30189 AND 31823 GROUP BY WheelsOff, DivReachedDest, OriginCityMarketID  ORDER BY WheelsOff, DivReachedDest, OriginCityMarketID LIMIT 23"]}
-{"sql":"SELECT DivAirportSeqIDs, DepTimeBlk, OriginStateName FROM mytable WHERE DepDelay NOT IN (250.0) AND DivTotalGTimes = 50 ORDER BY DivReachedDest LIMIT 7","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DepTimeBlk, OriginStateName FROM mytable WHERE DepDelay NOT IN (250.0) AND (DivTotalGTimes__MV0 = 50 OR DivTotalGTimes__MV1 = 50 OR DivTotalGTimes__MV2 = 50 OR DivTotalGTimes__MV3 = 50 OR DivTotalGTimes__MV4 = 50) ORDER BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DepTimeBlk, OriginStateName FROM mytable WHERE DepDelay NOT IN (250.0) AND DivTotalGTimes = 50 ORDER BY DivReachedDest LIMIT 7","hsqls":["SELECT DivAirportSeqIDs, DepTimeBlk, OriginStateName FROM mytable WHERE DepDelay NOT IN (250.0) AND (DivTotalGTimes[1] = 50 OR DivTotalGTimes[2] = 50 OR DivTotalGTimes[3] = 50 OR DivTotalGTimes[4] = 50 OR DivTotalGTimes[5] = 50) ORDER BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT AVG(OriginWac), SUM(TaxiIn) FROM mytable WHERE DestCityName BETWEEN 'Aspen, CO' AND 'Mosinee, WI' LIMIT 6"}
 {"sql":"SELECT OriginState, OriginWac, COUNT(*) FROM mytable GROUP BY OriginState, OriginWac  ORDER BY OriginState, OriginWac LIMIT 27","hsqls":["SELECT OriginState, OriginWac, COUNT(*) FROM mytable GROUP BY OriginState, OriginWac  ORDER BY OriginState, OriginWac LIMIT 27"]}
 {"sql":"SELECT NASDelay, CancellationCode, DivActualElapsedTime FROM mytable WHERE OriginCityName IN ('Harlingen/San Benito, TX') ORDER BY DepDelay, CarrierDelay LIMIT 15"}
 {"sql":"SELECT Carrier, \"Month\", CRSDepTime, AVG(ArrivalDelayGroups) FROM mytable WHERE DestCityName IN ('Gillette, WY', 'Sioux Falls, SD', 'Christiansted, VI', 'Knoxville, TN', 'Pocatello, ID') OR CarrierDelay <= 60 GROUP BY Carrier, \"Month\", CRSDepTime LIMIT 17","hsqls":["SELECT Carrier, Month, CRSDepTime, AVG(ArrivalDelayGroups) FROM mytable WHERE DestCityName IN ('Gillette, WY', 'Sioux Falls, SD', 'Christiansted, VI', 'Knoxville, TN', 'Pocatello, ID') OR CarrierDelay <= 60 GROUP BY Carrier, Month, CRSDepTime LIMIT 17"]}
 {"sql":"SELECT DivReachedDest, AVG(WheelsOn) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 24","hsqls":["SELECT DivReachedDest, AVG(WheelsOn) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 24"]}
-{"sql":"SELECT DivAirports, DestStateName, UniqueCarrier FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND DepDelayMinutes IN (225.0, 298.0) LIMIT 14","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestStateName, UniqueCarrier FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND DepDelayMinutes IN (225.0, 298.0) LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs, DivArrDelay, DaysSinceEpoch FROM mytable WHERE FlightNum IN (2636, 459, 2153) OR DestStateName BETWEEN 'Puerto Rico' AND 'Rhode Island' AND ArrDelayMinutes BETWEEN 273.0 AND 278.0 ORDER BY DivReachedDest LIMIT 16","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivArrDelay, DaysSinceEpoch FROM mytable WHERE FlightNum IN (2636, 459, 2153) OR DestStateName BETWEEN 'Puerto Rico' AND 'Rhode Island' AND ArrDelayMinutes BETWEEN 273.0 AND 278.0 ORDER BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestStateName, UniqueCarrier FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND DepDelayMinutes IN (225.0, 298.0) LIMIT 14","hsqls":["SELECT DivAirports, DestStateName, UniqueCarrier FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND DepDelayMinutes IN (225.0, 298.0) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DivArrDelay, DaysSinceEpoch FROM mytable WHERE FlightNum IN (2636, 459, 2153) OR DestStateName BETWEEN 'Puerto Rico' AND 'Rhode Island' AND ArrDelayMinutes BETWEEN 273.0 AND 278.0 ORDER BY DivReachedDest LIMIT 16","hsqls":["SELECT DivWheelsOffs, DivArrDelay, DaysSinceEpoch FROM mytable WHERE FlightNum IN (2636, 459, 2153) OR DestStateName BETWEEN 'Puerto Rico' AND 'Rhode Island' AND ArrDelayMinutes BETWEEN 273.0 AND 278.0 ORDER BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE WheelsOff BETWEEN 1023 AND 1050 OR WeatherDelay NOT IN (19, 214, -9999) LIMIT 21"}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE TaxiOut < 77 ORDER BY DestCityName, Dest, DaysSinceEpoch LIMIT 9"}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND CancellationCode IN ('C', 'noodles') OR DivTotalGTimes BETWEEN 25 AND 118 ORDER BY SecurityDelay LIMIT 16","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND CancellationCode IN ('C', 'noodles') OR (DivTotalGTimes__MV0 BETWEEN 25 AND 118 OR DivTotalGTimes__MV1 BETWEEN 25 AND 118 OR DivTotalGTimes__MV2 BETWEEN 25 AND 118 OR DivTotalGTimes__MV3 BETWEEN 25 AND 118 OR DivTotalGTimes__MV4 BETWEEN 25 AND 118) ORDER BY SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND CancellationCode IN ('C', 'noodles') OR DivTotalGTimes BETWEEN 25 AND 118 ORDER BY SecurityDelay LIMIT 16","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'C' AND CancellationCode IN ('C', 'noodles') OR (DivTotalGTimes[1] BETWEEN 25 AND 118 OR DivTotalGTimes[2] BETWEEN 25 AND 118 OR DivTotalGTimes[3] BETWEEN 25 AND 118 OR DivTotalGTimes[4] BETWEEN 25 AND 118 OR DivTotalGTimes[5] BETWEEN 25 AND 118) ORDER BY SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiIn NOT IN (19, 106, 37) OR DivAirportLandings BETWEEN 9 AND 0 AND FlightNum BETWEEN 3247 AND 6192 LIMIT 21"}
 {"sql":"SELECT DivAirportLandings, OriginStateName, COUNT(*) FROM mytable WHERE DestWac = 3 AND AirTime NOT IN (163, 222, 251, 305, 320) GROUP BY DivAirportLandings, OriginStateName  ORDER BY DivAirportLandings, OriginStateName LIMIT 17","hsqls":["SELECT DivAirportLandings, OriginStateName, COUNT(*) FROM mytable WHERE DestWac = 3 AND AirTime NOT IN (163, 222, 251, 305, 320) GROUP BY DivAirportLandings, OriginStateName  ORDER BY DivAirportLandings, OriginStateName LIMIT 17"]}
 {"sql":"SELECT TailNum FROM mytable WHERE FirstDepTime <= 1016 ORDER BY DestStateFips, DestAirportID, DayOfWeek LIMIT 2"}
 {"sql":"SELECT OriginState, DepTime FROM mytable WHERE TaxiOut NOT IN (9) OR ArrTime >= 132 AND CarrierDelay BETWEEN 103 AND 62 LIMIT 5"}
-{"sql":"SELECT OriginWac, CancellationCode, WheelsOn, MIN(DivActualElapsedTime), SUM(DayofMonth) FROM mytable WHERE DivAirportSeqIDs IN (1343302, 1489302, 1327702) AND WheelsOn NOT IN (1742, 1053, 2139) AND OriginWac < 11 GROUP BY OriginWac, CancellationCode, WheelsOn LIMIT 15","hsqls":["SELECT OriginWac, CancellationCode, WheelsOn, MIN(DivActualElapsedTime), SUM(DayofMonth) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs__MV1 IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs__MV2 IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs__MV3 IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs__MV4 IN (1343302, 1489302, 1327702)) AND WheelsOn NOT IN (1742, 1053, 2139) AND OriginWac < 11 GROUP BY OriginWac, CancellationCode, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT OriginWac, CancellationCode, WheelsOn, MIN(DivActualElapsedTime), SUM(DayofMonth) FROM mytable WHERE DivAirportSeqIDs IN (1343302, 1489302, 1327702) AND WheelsOn NOT IN (1742, 1053, 2139) AND OriginWac < 11 GROUP BY OriginWac, CancellationCode, WheelsOn LIMIT 15","hsqls":["SELECT OriginWac, CancellationCode, WheelsOn, MIN(DivActualElapsedTime), SUM(DayofMonth) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs[2] IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs[3] IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs[4] IN (1343302, 1489302, 1327702) OR DivAirportSeqIDs[5] IN (1343302, 1489302, 1327702)) AND WheelsOn NOT IN (1742, 1053, 2139) AND OriginWac < 11 GROUP BY OriginWac, CancellationCode, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT FlightNum, CRSArrTime, OriginAirportID, MAX(DepTime), SUM(DestAirportSeqID) FROM mytable WHERE CRSElapsedTime = 166 AND OriginCityMarketID <> 34108 GROUP BY FlightNum, CRSArrTime, OriginAirportID  ORDER BY FlightNum, CRSArrTime, OriginAirportID LIMIT 13","hsqls":["SELECT FlightNum, CRSArrTime, OriginAirportID, MAX(DepTime), SUM(DestAirportSeqID) FROM mytable WHERE CRSElapsedTime = 166 AND OriginCityMarketID <> 34108 GROUP BY FlightNum, CRSArrTime, OriginAirportID  ORDER BY FlightNum, CRSArrTime, OriginAirportID LIMIT 13"]}
 {"sql":"SELECT Flights, MIN(DivActualElapsedTime) FROM mytable GROUP BY Flights  ORDER BY Flights LIMIT 11","hsqls":["SELECT Flights, MIN(DivActualElapsedTime) FROM mytable GROUP BY Flights  ORDER BY Flights LIMIT 11"]}
-{"sql":"SELECT WheelsOff, OriginAirportSeqID, DestAirportSeqID, COUNT(*) FROM mytable WHERE Diverted > 0 AND DestStateFips IN (2, 36, 26, 27) OR DivTotalGTimes IN (145, 32, 36, 50) GROUP BY WheelsOff, OriginAirportSeqID, DestAirportSeqID LIMIT 16","hsqls":["SELECT WheelsOff, OriginAirportSeqID, DestAirportSeqID, COUNT(*) FROM mytable WHERE Diverted > 0 AND DestStateFips IN (2, 36, 26, 27) OR (DivTotalGTimes__MV0 IN (145, 32, 36, 50) OR DivTotalGTimes__MV1 IN (145, 32, 36, 50) OR DivTotalGTimes__MV2 IN (145, 32, 36, 50) OR DivTotalGTimes__MV3 IN (145, 32, 36, 50) OR DivTotalGTimes__MV4 IN (145, 32, 36, 50)) GROUP BY WheelsOff, OriginAirportSeqID, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, OriginAirportSeqID, DestAirportSeqID, COUNT(*) FROM mytable WHERE Diverted > 0 AND DestStateFips IN (2, 36, 26, 27) OR DivTotalGTimes IN (145, 32, 36, 50) GROUP BY WheelsOff, OriginAirportSeqID, DestAirportSeqID LIMIT 16","hsqls":["SELECT WheelsOff, OriginAirportSeqID, DestAirportSeqID, COUNT(*) FROM mytable WHERE Diverted > 0 AND DestStateFips IN (2, 36, 26, 27) OR (DivTotalGTimes[1] IN (145, 32, 36, 50) OR DivTotalGTimes[2] IN (145, 32, 36, 50) OR DivTotalGTimes[3] IN (145, 32, 36, 50) OR DivTotalGTimes[4] IN (145, 32, 36, 50) OR DivTotalGTimes[5] IN (145, 32, 36, 50)) GROUP BY WheelsOff, OriginAirportSeqID, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT MAX(Diverted), AVG(CRSArrTime), MIN(DayofMonth) FROM mytable WHERE DayofMonth IN (4, 25) OR AirTime <> 293 OR DayOfWeek NOT IN (3) LIMIT 1"}
-{"sql":"SELECT Diverted, DestAirportID, COUNT(OriginCityMarketID) FROM mytable WHERE \"Year\" = 2014 OR AirTime BETWEEN 158 AND 236 AND DestWac IN (66, 4, 54) GROUP BY Diverted, DestAirportID LIMIT 1","hsqls":["SELECT Diverted, DestAirportID, COUNT(OriginCityMarketID) FROM mytable WHERE Year = 2014 OR AirTime BETWEEN 158 AND 236 AND DestWac IN (66, 4, 54) GROUP BY Diverted, DestAirportID LIMIT 1"]}
-{"sql":"SELECT DepartureDelayGroups, AVG(ArrDel15), SUM(DaysSinceEpoch) FROM mytable WHERE DivWheelsOffs BETWEEN 1931 AND 1513 AND OriginWac >= 65 OR CRSDepTime NOT IN (1502, 1015) GROUP BY DepartureDelayGroups LIMIT 27","hsqls":["SELECT DepartureDelayGroups, AVG(ArrDel15), SUM(DaysSinceEpoch) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1931 AND 1513 OR DivWheelsOffs__MV1 BETWEEN 1931 AND 1513 OR DivWheelsOffs__MV2 BETWEEN 1931 AND 1513 OR DivWheelsOffs__MV3 BETWEEN 1931 AND 1513 OR DivWheelsOffs__MV4 BETWEEN 1931 AND 1513) AND OriginWac >= 65 OR CRSDepTime NOT IN (1502, 1015) GROUP BY DepartureDelayGroups LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, Distance FROM mytable WHERE ArrivalDelayGroups <= -2 AND DivLongestGTimes = 145.0 AND DestWac IN (3, 15, 33, 73) ORDER BY DepDelay, DestState, ArrTimeBlk LIMIT 17","hsqls":["SELECT LongestAddGTime, Distance FROM mytable WHERE ArrivalDelayGroups <= -2 AND (DivLongestGTimes__MV0 = 145.0 OR DivLongestGTimes__MV1 = 145.0 OR DivLongestGTimes__MV2 = 145.0 OR DivLongestGTimes__MV3 = 145.0 OR DivLongestGTimes__MV4 = 145.0) AND DestWac IN (3, 15, 33, 73) ORDER BY DepDelay, DestState, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT Diverted, DestAirportID, COUNT(OriginCityMarketID) FROM mytable WHERE \"Year\" = 2014 OR AirTime BETWEEN 158 AND 236 AND DestWac IN (66, 4, 54) GROUP BY Diverted, DestAirportID LIMIT 1","hsqls":["SELECT Diverted, DestAirportID, COUNT(OriginCityMarketID) FROM mytable WHERE `Year` = 2014 OR AirTime BETWEEN 158 AND 236 AND DestWac IN (66, 4, 54) GROUP BY Diverted, DestAirportID LIMIT 1"]}
+{"sql":"SELECT DepartureDelayGroups, AVG(ArrDel15), SUM(DaysSinceEpoch) FROM mytable WHERE DivWheelsOffs BETWEEN 1931 AND 1513 AND OriginWac >= 65 OR CRSDepTime NOT IN (1502, 1015) GROUP BY DepartureDelayGroups LIMIT 27","hsqls":["SELECT DepartureDelayGroups, AVG(ArrDel15), SUM(DaysSinceEpoch) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1931 AND 1513 OR DivWheelsOffs[2] BETWEEN 1931 AND 1513 OR DivWheelsOffs[3] BETWEEN 1931 AND 1513 OR DivWheelsOffs[4] BETWEEN 1931 AND 1513 OR DivWheelsOffs[5] BETWEEN 1931 AND 1513) AND OriginWac >= 65 OR CRSDepTime NOT IN (1502, 1015) GROUP BY DepartureDelayGroups LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Distance FROM mytable WHERE ArrivalDelayGroups <= -2 AND DivLongestGTimes = 145.0 AND DestWac IN (3, 15, 33, 73) ORDER BY DepDelay, DestState, ArrTimeBlk LIMIT 17","hsqls":["SELECT LongestAddGTime, Distance FROM mytable WHERE ArrivalDelayGroups <= -2 AND (DivLongestGTimes[1] = 145.0 OR DivLongestGTimes[2] = 145.0 OR DivLongestGTimes[3] = 145.0 OR DivLongestGTimes[4] = 145.0 OR DivLongestGTimes[5] = 145.0) AND DestWac IN (3, 15, 33, 73) ORDER BY DepDelay, DestState, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE Distance NOT IN (788, 1102, 983) OR OriginWac BETWEEN 12 AND 34 LIMIT 27"}
 {"sql":"SELECT Diverted, TailNum, COUNT(*) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') GROUP BY Diverted, TailNum  ORDER BY Diverted, TailNum LIMIT 18","hsqls":["SELECT Diverted, TailNum, COUNT(*) FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') GROUP BY Diverted, TailNum  ORDER BY Diverted, TailNum LIMIT 18"]}
 {"sql":"SELECT SUM(CRSDepTime), SUM(WeatherDelay) FROM mytable LIMIT 25"}
@@ -7904,59 +7904,59 @@
 {"sql":"SELECT COUNT(DivDistance), SUM(Diverted) FROM mytable WHERE LongestAddGTime IN (20, 74, 28) OR DepTime BETWEEN 1347 AND 944 OR Origin NOT IN ('GRR', 'TUS', 'ALO', 'MDW') LIMIT 9"}
 {"sql":"SELECT FlightDate FROM mytable WHERE ArrivalDelayGroups BETWEEN 12 AND 6 OR ArrTime >= 1335 AND DestCityMarketID BETWEEN 30561 AND 32457 ORDER BY NASDelay LIMIT 13"}
 {"sql":"SELECT DepartureDelayGroups, TailNum, SUM(FirstDepTime), MIN(DepDel15), MAX(DivAirportLandings) FROM mytable WHERE FlightNum IN (1490) AND ArrivalDelayGroups IN (12) GROUP BY DepartureDelayGroups, TailNum  ORDER BY DepartureDelayGroups, TailNum LIMIT 23","hsqls":["SELECT DepartureDelayGroups, TailNum, SUM(FirstDepTime), MIN(DepDel15), MAX(DivAirportLandings) FROM mytable WHERE FlightNum IN (1490) AND ArrivalDelayGroups IN (12) GROUP BY DepartureDelayGroups, TailNum  ORDER BY DepartureDelayGroups, TailNum LIMIT 23"]}
-{"sql":"SELECT DivReachedDest, ActualElapsedTime, DivWheelsOffs FROM mytable WHERE DayofMonth BETWEEN 21 AND 25 OR DepartureDelayGroups NOT IN (5, 4) ORDER BY Carrier, FlightDate, Origin LIMIT 27","hsqls":["SELECT DivReachedDest, ActualElapsedTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DayofMonth BETWEEN 21 AND 25 OR DepartureDelayGroups NOT IN (5, 4) ORDER BY Carrier, FlightDate, Origin LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, ActualElapsedTime, DivWheelsOffs FROM mytable WHERE DayofMonth BETWEEN 21 AND 25 OR DepartureDelayGroups NOT IN (5, 4) ORDER BY Carrier, FlightDate, Origin LIMIT 27","hsqls":["SELECT DivReachedDest, ActualElapsedTime, DivWheelsOffs FROM mytable WHERE DayofMonth BETWEEN 21 AND 25 OR DepartureDelayGroups NOT IN (5, 4) ORDER BY Carrier, FlightDate, Origin LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, Cancelled, UniqueCarrier FROM mytable WHERE TaxiOut BETWEEN 29 AND 79 OR Dest NOT IN ('DBQ') LIMIT 19"}
-{"sql":"SELECT DepDelayMinutes, AirTime, COUNT(*) FROM mytable WHERE \"Year\" >= 2014 GROUP BY DepDelayMinutes, AirTime LIMIT 26","hsqls":["SELECT DepDelayMinutes, AirTime, COUNT(*) FROM mytable WHERE Year >= 2014 GROUP BY DepDelayMinutes, AirTime LIMIT 26"]}
+{"sql":"SELECT DepDelayMinutes, AirTime, COUNT(*) FROM mytable WHERE \"Year\" >= 2014 GROUP BY DepDelayMinutes, AirTime LIMIT 26","hsqls":["SELECT DepDelayMinutes, AirTime, COUNT(*) FROM mytable WHERE `Year` >= 2014 GROUP BY DepDelayMinutes, AirTime LIMIT 26"]}
 {"sql":"SELECT LongestAddGTime, DepDel15, DivAirportLandings FROM mytable LIMIT 1"}
 {"sql":"SELECT DivReachedDest, TaxiIn, UniqueCarrier FROM mytable WHERE AirTime NOT IN (21, 251, 148, 65) AND OriginAirportID NOT IN (10140, 12389, 13970, 10685, 10728) AND DepTimeBlk = '2000-2059' ORDER BY OriginStateFips, OriginCityMarketID LIMIT 22"}
 {"sql":"SELECT DistanceGroup, TaxiIn FROM mytable WHERE AirTime BETWEEN 276 AND 108 ORDER BY ArrTime, NASDelay LIMIT 26"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 10"}
 {"sql":"SELECT ArrTime, Cancelled, CRSDepTime, AVG(ArrDelay), SUM(Distance) FROM mytable WHERE SecurityDelay BETWEEN -9999 AND 4 GROUP BY ArrTime, Cancelled, CRSDepTime","hsqls":["SELECT ArrTime, Cancelled, CRSDepTime, AVG(ArrDelay), SUM(Distance) FROM mytable WHERE SecurityDelay BETWEEN -9999 AND 4 GROUP BY ArrTime, Cancelled, CRSDepTime"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Quarter IN (1) OR OriginState <= 'WY' OR DayOfWeek BETWEEN 1 AND 6 LIMIT 15"}
-{"sql":"SELECT DivTailNums, DestAirportID, \"Month\" FROM mytable ORDER BY TaxiIn, OriginStateName LIMIT 12","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestAirportID, Month FROM mytable ORDER BY TaxiIn, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, DestAirportID, \"Month\" FROM mytable ORDER BY TaxiIn, OriginStateName LIMIT 12","hsqls":["SELECT DivTailNums, DestAirportID, `Month` FROM mytable ORDER BY TaxiIn, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, AVG(OriginAirportSeqID), AVG(DivAirportLandings) FROM mytable WHERE OriginState < 'VI' GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 7","hsqls":["SELECT OriginStateFips, AVG(OriginAirportSeqID), AVG(DivAirportLandings) FROM mytable WHERE OriginState < 'VI' GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 7"]}
 {"sql":"SELECT FlightDate, Distance, MAX(DivAirportLandings), AVG(OriginAirportID) FROM mytable GROUP BY FlightDate, Distance  ORDER BY FlightDate, Distance LIMIT 29","hsqls":["SELECT FlightDate, Distance, MAX(DivAirportLandings), AVG(OriginAirportID) FROM mytable GROUP BY FlightDate, Distance  ORDER BY FlightDate, Distance LIMIT 29"]}
-{"sql":"SELECT FirstDepTime, DivWheelsOffs, DivActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 28","hsqls":["SELECT FirstDepTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DivWheelsOffs, DivActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 28","hsqls":["SELECT FirstDepTime, DivWheelsOffs, DivActualElapsedTime FROM mytable ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT AirlineID, AVG(DivDistance), COUNT(CRSArrTime), MAX(DivArrDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND DestState BETWEEN 'ID' AND 'CO' GROUP BY AirlineID  ORDER BY AirlineID LIMIT 10","hsqls":["SELECT AirlineID, AVG(DivDistance), COUNT(CRSArrTime), MAX(DivArrDelay) FROM mytable WHERE DepDel15 BETWEEN 0 AND -9999 AND DestState BETWEEN 'ID' AND 'CO' GROUP BY AirlineID  ORDER BY AirlineID LIMIT 10"]}
-{"sql":"SELECT DivTailNums FROM mytable ORDER BY Quarter LIMIT 27","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY Quarter LIMIT 10000"]}
-{"sql":"SELECT CRSArrTime FROM mytable WHERE OriginCityMarketID IN (33344, 34945, 30434, 30529) ORDER BY \"Month\" LIMIT 24","hsqls":["SELECT CRSArrTime FROM mytable WHERE OriginCityMarketID IN (33344, 34945, 30434, 30529) ORDER BY Month LIMIT 24"]}
+{"sql":"SELECT DivTailNums FROM mytable ORDER BY Quarter LIMIT 27","hsqls":["SELECT DivTailNums FROM mytable ORDER BY Quarter LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime FROM mytable WHERE OriginCityMarketID IN (33344, 34945, 30434, 30529) ORDER BY \"Month\" LIMIT 24","hsqls":["SELECT CRSArrTime FROM mytable WHERE OriginCityMarketID IN (33344, 34945, 30434, 30529) ORDER BY `Month` LIMIT 24"]}
 {"sql":"SELECT DivDistance, NASDelay, OriginWac FROM mytable WHERE ArrTimeBlk >= '1400-1459' AND ArrDel15 IN (1, 0) ORDER BY OriginStateFips LIMIT 24"}
-{"sql":"SELECT Carrier, UniqueCarrier, DayOfWeek, AVG(DaysSinceEpoch) FROM mytable WHERE DivTotalGTimes IN (128) AND OriginWac = 51 GROUP BY Carrier, UniqueCarrier, DayOfWeek LIMIT 9","hsqls":["SELECT Carrier, UniqueCarrier, DayOfWeek, AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE (DivTotalGTimes__MV0 IN (128) OR DivTotalGTimes__MV1 IN (128) OR DivTotalGTimes__MV2 IN (128) OR DivTotalGTimes__MV3 IN (128) OR DivTotalGTimes__MV4 IN (128)) AND OriginWac = 51 GROUP BY Carrier, UniqueCarrier, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT Carrier, UniqueCarrier, DayOfWeek, AVG(DaysSinceEpoch) FROM mytable WHERE DivTotalGTimes IN (128) AND OriginWac = 51 GROUP BY Carrier, UniqueCarrier, DayOfWeek LIMIT 9","hsqls":["SELECT Carrier, UniqueCarrier, DayOfWeek, AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE (DivTotalGTimes[1] IN (128) OR DivTotalGTimes[2] IN (128) OR DivTotalGTimes[3] IN (128) OR DivTotalGTimes[4] IN (128) OR DivTotalGTimes[5] IN (128)) AND OriginWac = 51 GROUP BY Carrier, UniqueCarrier, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT COUNT(DestCityName) FROM mytable WHERE CarrierDelay BETWEEN 171 AND 119 AND Origin BETWEEN 'CAK' AND 'HPN' AND WheelsOff < 1442 LIMIT 17"}
 {"sql":"SELECT MIN(SecurityDelay), MIN(DivDistance) FROM mytable WHERE FlightNum BETWEEN 3078 AND 1279 LIMIT 18"}
 {"sql":"SELECT Dest, CRSDepTime FROM mytable WHERE ArrTime BETWEEN 1351 AND 2009 OR CRSDepTime NOT IN (1802, 1006) OR CancellationCode NOT IN ('A', 'noodles') ORDER BY DivArrDelay LIMIT 27"}
 {"sql":"SELECT DepDelayMinutes, FlightNum, DaysSinceEpoch FROM mytable LIMIT 11"}
-{"sql":"SELECT Quarter, AVG(NASDelay), COUNT(DestCityMarketID), COUNT(Distance) FROM mytable WHERE CRSDepTime < 1359 OR DivAirports IN ('ABQ', 'SMF', 'PHX', 'PUB') GROUP BY Quarter LIMIT 18","hsqls":["SELECT Quarter, AVG(NASDelay), COUNT(DestCityMarketID), COUNT(Distance) FROM mytable WHERE CRSDepTime < 1359 OR (DivAirports__MV0 IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports__MV1 IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports__MV2 IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports__MV3 IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports__MV4 IN ('ABQ', 'SMF', 'PHX', 'PUB')) GROUP BY Quarter LIMIT 10000"]}
+{"sql":"SELECT Quarter, AVG(NASDelay), COUNT(DestCityMarketID), COUNT(Distance) FROM mytable WHERE CRSDepTime < 1359 OR DivAirports IN ('ABQ', 'SMF', 'PHX', 'PUB') GROUP BY Quarter LIMIT 18","hsqls":["SELECT Quarter, AVG(NASDelay), COUNT(DestCityMarketID), COUNT(Distance) FROM mytable WHERE CRSDepTime < 1359 OR (DivAirports[1] IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports[2] IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports[3] IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports[4] IN ('ABQ', 'SMF', 'PHX', 'PUB') OR DivAirports[5] IN ('ABQ', 'SMF', 'PHX', 'PUB')) GROUP BY Quarter LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, CancellationCode, DaysSinceEpoch FROM mytable WHERE ArrDelayMinutes <= 144.0 AND TaxiIn >= 51 AND DestWac = 5 ORDER BY FlightDate, DestAirportSeqID LIMIT 11"}
-{"sql":"SELECT DistanceGroup, CarrierDelay, DestCityName FROM mytable WHERE \"Month\" NOT IN (1) ORDER BY DestWac LIMIT 2","hsqls":["SELECT DistanceGroup, CarrierDelay, DestCityName FROM mytable WHERE Month NOT IN (1) ORDER BY DestWac LIMIT 2"]}
+{"sql":"SELECT DistanceGroup, CarrierDelay, DestCityName FROM mytable WHERE \"Month\" NOT IN (1) ORDER BY DestWac LIMIT 2","hsqls":["SELECT DistanceGroup, CarrierDelay, DestCityName FROM mytable WHERE `Month` NOT IN (1) ORDER BY DestWac LIMIT 2"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE DestWac BETWEEN 73 AND 35 OR DestWac IN (5, 73) ORDER BY SecurityDelay, ArrDelayMinutes, DayOfWeek LIMIT 4"}
-{"sql":"SELECT Carrier, Flights, DivAirportSeqIDs FROM mytable WHERE LongestAddGTime NOT IN (111, 23, 11) ORDER BY ActualElapsedTime, CRSElapsedTime LIMIT 14","hsqls":["SELECT Carrier, Flights, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE LongestAddGTime NOT IN (111, 23, 11) ORDER BY ActualElapsedTime, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DestCityName, OriginWac, DivActualElapsedTime, MIN(LateAircraftDelay), MIN(TaxiOut), COUNT(Distance) FROM mytable WHERE DivTotalGTimes IN (61, 84) OR DivWheelsOns BETWEEN 1107 AND 1438 GROUP BY DestCityName, OriginWac, DivActualElapsedTime LIMIT 1","hsqls":["SELECT DestCityName, OriginWac, DivActualElapsedTime, MIN(LateAircraftDelay), MIN(TaxiOut), COUNT(Distance) FROM mytable WHERE (DivTotalGTimes__MV0 IN (61, 84) OR DivTotalGTimes__MV1 IN (61, 84) OR DivTotalGTimes__MV2 IN (61, 84) OR DivTotalGTimes__MV3 IN (61, 84) OR DivTotalGTimes__MV4 IN (61, 84)) OR (DivWheelsOns__MV0 BETWEEN 1107 AND 1438 OR DivWheelsOns__MV1 BETWEEN 1107 AND 1438 OR DivWheelsOns__MV2 BETWEEN 1107 AND 1438 OR DivWheelsOns__MV3 BETWEEN 1107 AND 1438 OR DivWheelsOns__MV4 BETWEEN 1107 AND 1438) GROUP BY DestCityName, OriginWac, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT Carrier, Flights, DivAirportSeqIDs FROM mytable WHERE LongestAddGTime NOT IN (111, 23, 11) ORDER BY ActualElapsedTime, CRSElapsedTime LIMIT 14","hsqls":["SELECT Carrier, Flights, DivAirportSeqIDs FROM mytable WHERE LongestAddGTime NOT IN (111, 23, 11) ORDER BY ActualElapsedTime, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestCityName, OriginWac, DivActualElapsedTime, MIN(LateAircraftDelay), MIN(TaxiOut), COUNT(Distance) FROM mytable WHERE DivTotalGTimes IN (61, 84) OR DivWheelsOns BETWEEN 1107 AND 1438 GROUP BY DestCityName, OriginWac, DivActualElapsedTime LIMIT 1","hsqls":["SELECT DestCityName, OriginWac, DivActualElapsedTime, MIN(LateAircraftDelay), MIN(TaxiOut), COUNT(Distance) FROM mytable WHERE (DivTotalGTimes[1] IN (61, 84) OR DivTotalGTimes[2] IN (61, 84) OR DivTotalGTimes[3] IN (61, 84) OR DivTotalGTimes[4] IN (61, 84) OR DivTotalGTimes[5] IN (61, 84)) OR (DivWheelsOns[1] BETWEEN 1107 AND 1438 OR DivWheelsOns[2] BETWEEN 1107 AND 1438 OR DivWheelsOns[3] BETWEEN 1107 AND 1438 OR DivWheelsOns[4] BETWEEN 1107 AND 1438 OR DivWheelsOns[5] BETWEEN 1107 AND 1438) GROUP BY DestCityName, OriginWac, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, TaxiIn, SUM(Diverted), COUNT(ArrDel15) FROM mytable GROUP BY OriginAirportSeqID, TaxiIn  ORDER BY OriginAirportSeqID, TaxiIn LIMIT 23","hsqls":["SELECT OriginAirportSeqID, TaxiIn, SUM(Diverted), COUNT(ArrDel15) FROM mytable GROUP BY OriginAirportSeqID, TaxiIn  ORDER BY OriginAirportSeqID, TaxiIn LIMIT 23"]}
 {"sql":"SELECT CarrierDelay, DivAirportLandings, MAX(WheelsOff), MIN(DivReachedDest) FROM mytable WHERE OriginStateName NOT IN ('Minnesota', 'Hawaii', 'Montana', 'Nevada', 'Oklahoma') GROUP BY CarrierDelay, DivAirportLandings  ORDER BY CarrierDelay, DivAirportLandings LIMIT 9","hsqls":["SELECT CarrierDelay, DivAirportLandings, MAX(WheelsOff), MIN(DivReachedDest) FROM mytable WHERE OriginStateName NOT IN ('Minnesota', 'Hawaii', 'Montana', 'Nevada', 'Oklahoma') GROUP BY CarrierDelay, DivAirportLandings  ORDER BY CarrierDelay, DivAirportLandings LIMIT 9"]}
 {"sql":"SELECT CancellationCode, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 25 AND 21 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 8","hsqls":["SELECT CancellationCode, COUNT(*) FROM mytable WHERE TaxiIn BETWEEN 25 AND 21 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 8"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE TaxiIn NOT IN (35, 106, 9) OR OriginStateFips NOT IN (6, 44, 35, 34, 25) ORDER BY LateAircraftDelay, DepTime LIMIT 20"}
-{"sql":"SELECT \"Year\", DivAirports, ArrDelay FROM mytable WHERE Diverted NOT IN (0) AND TotalAddGTime BETWEEN 23 AND 51 OR LateAircraftDelay <> 54 ORDER BY OriginAirportSeqID, OriginState LIMIT 10","hsqls":["SELECT Year, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrDelay FROM mytable WHERE Diverted NOT IN (0) AND TotalAddGTime BETWEEN 23 AND 51 OR LateAircraftDelay <> 54 ORDER BY OriginAirportSeqID, OriginState LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivAirports, ArrDelay FROM mytable WHERE Diverted NOT IN (0) AND TotalAddGTime BETWEEN 23 AND 51 OR LateAircraftDelay <> 54 ORDER BY OriginAirportSeqID, OriginState LIMIT 10","hsqls":["SELECT Year, DivAirports, ArrDelay FROM mytable WHERE Diverted NOT IN (0) AND TotalAddGTime BETWEEN 23 AND 51 OR LateAircraftDelay <> 54 ORDER BY OriginAirportSeqID, OriginState LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, MAX(WheelsOn), AVG(OriginAirportSeqID), MIN(ArrTime) FROM mytable WHERE Origin BETWEEN 'BQK' AND 'RSW' AND OriginCityMarketID BETWEEN 34699 AND 33667 AND OriginState NOT IN ('TX', 'LA', 'IA', 'OK') GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 16","hsqls":["SELECT TaxiOut, MAX(WheelsOn), AVG(OriginAirportSeqID), MIN(ArrTime) FROM mytable WHERE Origin BETWEEN 'BQK' AND 'RSW' AND OriginCityMarketID BETWEEN 34699 AND 33667 AND OriginState NOT IN ('TX', 'LA', 'IA', 'OK') GROUP BY TaxiOut  ORDER BY TaxiOut LIMIT 16"]}
 {"sql":"SELECT CancellationCode, MAX(Flights), MAX(DaysSinceEpoch) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 9","hsqls":["SELECT CancellationCode, MAX(Flights), MAX(DaysSinceEpoch) FROM mytable GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 9"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE DayofMonth IN (19, 24, 8) OR Origin IN ('OAJ', 'ATL', 'JAX') ORDER BY \"Year\", DepDelay, ArrTime LIMIT 5","hsqls":["SELECT WheelsOff FROM mytable WHERE DayofMonth IN (19, 24, 8) OR Origin IN ('OAJ', 'ATL', 'JAX') ORDER BY Year, DepDelay, ArrTime LIMIT 5"]}
 {"sql":"SELECT ArrDelayMinutes, DestCityName, SUM(WeatherDelay), MIN(DepTime), COUNT(ActualElapsedTime) FROM mytable WHERE DivDistance BETWEEN 369 AND 528 OR DestState BETWEEN 'WI' AND 'VT' OR Quarter BETWEEN 1 AND 1 GROUP BY ArrDelayMinutes, DestCityName  ORDER BY ArrDelayMinutes, DestCityName LIMIT 29","hsqls":["SELECT ArrDelayMinutes, DestCityName, SUM(WeatherDelay), MIN(DepTime), COUNT(ActualElapsedTime) FROM mytable WHERE DivDistance BETWEEN 369 AND 528 OR DestState BETWEEN 'WI' AND 'VT' OR Quarter BETWEEN 1 AND 1 GROUP BY ArrDelayMinutes, DestCityName  ORDER BY ArrDelayMinutes, DestCityName LIMIT 29"]}
 {"sql":"SELECT Origin, MAX(DepTime) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 1","hsqls":["SELECT Origin, MAX(DepTime) FROM mytable GROUP BY Origin  ORDER BY Origin LIMIT 1"]}
 {"sql":"SELECT DepartureDelayGroups, Cancelled FROM mytable WHERE DayofMonth <= 29 OR TotalAddGTime NOT IN (78, 42, 4, 55, 34) OR Diverted NOT IN (1, 0) ORDER BY Flights, DestAirportID LIMIT 13"}
-{"sql":"SELECT OriginCityName, AirlineID, CRSElapsedTime, AVG(AirTime), MIN(\"Month\"), MAX(DayOfWeek) FROM mytable WHERE TaxiIn BETWEEN 80 AND 63 GROUP BY OriginCityName, AirlineID, CRSElapsedTime LIMIT 4","hsqls":["SELECT OriginCityName, AirlineID, CRSElapsedTime, AVG(AirTime), MIN(Month), MAX(DayOfWeek) FROM mytable WHERE TaxiIn BETWEEN 80 AND 63 GROUP BY OriginCityName, AirlineID, CRSElapsedTime LIMIT 4"]}
-{"sql":"SELECT NASDelay, COUNT(CarrierDelay), COUNT(ArrTime), AVG(WheelsOff) FROM mytable WHERE DivAirportIDs IN (11042, 10299, 13198, 11630, 10434) AND DivActualElapsedTime NOT IN (220, 121) AND DestState BETWEEN 'AL' AND 'HI' GROUP BY NASDelay LIMIT 27","hsqls":["SELECT NASDelay, COUNT(CarrierDelay), COUNT(ArrTime), AVG(WheelsOff) FROM mytable WHERE (DivAirportIDs__MV0 IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs__MV1 IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs__MV2 IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs__MV3 IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs__MV4 IN (11042, 10299, 13198, 11630, 10434)) AND DivActualElapsedTime NOT IN (220, 121) AND DestState BETWEEN 'AL' AND 'HI' GROUP BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, AirlineID, CRSElapsedTime, AVG(AirTime), MIN(\"Month\"), MAX(DayOfWeek) FROM mytable WHERE TaxiIn BETWEEN 80 AND 63 GROUP BY OriginCityName, AirlineID, CRSElapsedTime LIMIT 4","hsqls":["SELECT OriginCityName, AirlineID, CRSElapsedTime, AVG(AirTime), MIN(`Month`), MAX(DayOfWeek) FROM mytable WHERE TaxiIn BETWEEN 80 AND 63 GROUP BY OriginCityName, AirlineID, CRSElapsedTime LIMIT 4"]}
+{"sql":"SELECT NASDelay, COUNT(CarrierDelay), COUNT(ArrTime), AVG(WheelsOff) FROM mytable WHERE DivAirportIDs IN (11042, 10299, 13198, 11630, 10434) AND DivActualElapsedTime NOT IN (220, 121) AND DestState BETWEEN 'AL' AND 'HI' GROUP BY NASDelay LIMIT 27","hsqls":["SELECT NASDelay, COUNT(CarrierDelay), COUNT(ArrTime), AVG(WheelsOff) FROM mytable WHERE (DivAirportIDs[1] IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs[2] IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs[3] IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs[4] IN (11042, 10299, 13198, 11630, 10434) OR DivAirportIDs[5] IN (11042, 10299, 13198, 11630, 10434)) AND DivActualElapsedTime NOT IN (220, 121) AND DestState BETWEEN 'AL' AND 'HI' GROUP BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT AVG(DestAirportSeqID), SUM(DayofMonth) FROM mytable LIMIT 3"}
 {"sql":"SELECT DestState, Cancelled, DayofMonth FROM mytable WHERE DepTimeBlk NOT IN ('2000-2059', '1100-1159', '2300-2359', '1200-1259', '1400-1459') OR LongestAddGTime NOT IN (128, 5, 31, 63, 103) AND Carrier IN ('B6') ORDER BY CarrierDelay, DepTimeBlk LIMIT 1"}
-{"sql":"SELECT DivReachedDest, DivAirportIDs, ArrDelay FROM mytable ORDER BY DivActualElapsedTime LIMIT 2","hsqls":["SELECT DivReachedDest, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrDelay FROM mytable ORDER BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivAirportIDs, ArrDelay FROM mytable ORDER BY DivActualElapsedTime LIMIT 2","hsqls":["SELECT DivReachedDest, DivAirportIDs, ArrDelay FROM mytable ORDER BY DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 27","hsqls":["SELECT ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 27"]}
 {"sql":"SELECT DestCityName, ArrivalDelayGroups FROM mytable WHERE Quarter IN (1) ORDER BY DestCityName LIMIT 11"}
 {"sql":"SELECT DivDistance, Carrier, DestStateName, COUNT(Quarter), MIN(WheelsOn), SUM(WheelsOff) FROM mytable WHERE ActualElapsedTime NOT IN (175, 502, 380, 75) OR FlightNum BETWEEN 1670 AND 268 GROUP BY DivDistance, Carrier, DestStateName  ORDER BY DivDistance, Carrier, DestStateName LIMIT 24","hsqls":["SELECT DivDistance, Carrier, DestStateName, COUNT(Quarter), MIN(WheelsOn), SUM(WheelsOff) FROM mytable WHERE ActualElapsedTime NOT IN (175, 502, 380, 75) OR FlightNum BETWEEN 1670 AND 268 GROUP BY DivDistance, Carrier, DestStateName  ORDER BY DivDistance, Carrier, DestStateName LIMIT 24"]}
-{"sql":"SELECT OriginStateFips, TaxiIn, SUM(CarrierDelay), AVG(OriginStateFips) FROM mytable WHERE DivAirportSeqIDs IN (1457604, 1288903, 1324402, 1448702) OR SecurityDelay IN (0, 8, 14, 27, -9999) AND DepartureDelayGroups < 7 GROUP BY OriginStateFips, TaxiIn LIMIT 8","hsqls":["SELECT OriginStateFips, TaxiIn, SUM(CarrierDelay), AVG(OriginStateFips) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs__MV1 IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs__MV2 IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs__MV3 IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs__MV4 IN (1457604, 1288903, 1324402, 1448702)) OR SecurityDelay IN (0, 8, 14, 27, -9999) AND DepartureDelayGroups < 7 GROUP BY OriginStateFips, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, TaxiIn, SUM(CarrierDelay), AVG(OriginStateFips) FROM mytable WHERE DivAirportSeqIDs IN (1457604, 1288903, 1324402, 1448702) OR SecurityDelay IN (0, 8, 14, 27, -9999) AND DepartureDelayGroups < 7 GROUP BY OriginStateFips, TaxiIn LIMIT 8","hsqls":["SELECT OriginStateFips, TaxiIn, SUM(CarrierDelay), AVG(OriginStateFips) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs[2] IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs[3] IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs[4] IN (1457604, 1288903, 1324402, 1448702) OR DivAirportSeqIDs[5] IN (1457604, 1288903, 1324402, 1448702)) OR SecurityDelay IN (0, 8, 14, 27, -9999) AND DepartureDelayGroups < 7 GROUP BY OriginStateFips, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, SUM(TaxiIn) FROM mytable WHERE OriginAirportSeqID < 1469605 OR WheelsOn = 2332 AND DivAirportLandings NOT IN (2, 0, 9) GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 27","hsqls":["SELECT DepDelayMinutes, SUM(TaxiIn) FROM mytable WHERE OriginAirportSeqID < 1469605 OR WheelsOn = 2332 AND DivAirportLandings NOT IN (2, 0, 9) GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 27"]}
 {"sql":"SELECT OriginState, ArrivalDelayGroups FROM mytable WHERE DepDelayMinutes BETWEEN 176.0 AND 50.0 ORDER BY Quarter, DestAirportID LIMIT 26"}
 {"sql":"SELECT OriginState, MAX(DivArrDelay), MIN(CRSArrTime) FROM mytable WHERE OriginCityName <> 'Louisville, KY' OR CRSDepTime IN (1247, 2305, 936) OR OriginAirportSeqID <= 1152502 GROUP BY OriginState  ORDER BY OriginState LIMIT 1","hsqls":["SELECT OriginState, MAX(DivArrDelay), MIN(CRSArrTime) FROM mytable WHERE OriginCityName <> 'Louisville, KY' OR CRSDepTime IN (1247, 2305, 936) OR OriginAirportSeqID <= 1152502 GROUP BY OriginState  ORDER BY OriginState LIMIT 1"]}
 {"sql":"SELECT Distance FROM mytable WHERE CRSArrTime NOT IN (1429) OR DestAirportID BETWEEN 12278 AND 13342 ORDER BY DestAirportSeqID LIMIT 12"}
-{"sql":"SELECT OriginWac FROM mytable WHERE DestStateFips BETWEEN 4 AND 28 OR CRSElapsedTime <= 455 AND DivAirportSeqIDs > 1509602 ORDER BY LongestAddGTime LIMIT 11","hsqls":["SELECT OriginWac FROM mytable WHERE DestStateFips BETWEEN 4 AND 28 OR CRSElapsedTime <= 455 AND (DivAirportSeqIDs__MV0 > 1509602 OR DivAirportSeqIDs__MV1 > 1509602 OR DivAirportSeqIDs__MV2 > 1509602 OR DivAirportSeqIDs__MV3 > 1509602 OR DivAirportSeqIDs__MV4 > 1509602) ORDER BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT OriginWac FROM mytable WHERE DestStateFips BETWEEN 4 AND 28 OR CRSElapsedTime <= 455 AND DivAirportSeqIDs > 1509602 ORDER BY LongestAddGTime LIMIT 11","hsqls":["SELECT OriginWac FROM mytable WHERE DestStateFips BETWEEN 4 AND 28 OR CRSElapsedTime <= 455 AND (DivAirportSeqIDs[1] > 1509602 OR DivAirportSeqIDs[2] > 1509602 OR DivAirportSeqIDs[3] > 1509602 OR DivAirportSeqIDs[4] > 1509602 OR DivAirportSeqIDs[5] > 1509602) ORDER BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT DestState, Flights, AVG(Distance) FROM mytable WHERE OriginAirportID BETWEEN 13360 AND 10731 OR OriginState NOT IN ('LA') OR CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY DestState, Flights  ORDER BY DestState, Flights LIMIT 9","hsqls":["SELECT DestState, Flights, AVG(Distance) FROM mytable WHERE OriginAirportID BETWEEN 13360 AND 10731 OR OriginState NOT IN ('LA') OR CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY DestState, Flights  ORDER BY DestState, Flights LIMIT 9"]}
 {"sql":"SELECT Dest, DepDel15 FROM mytable WHERE TaxiIn <> 83 ORDER BY DayOfWeek LIMIT 13"}
 {"sql":"SELECT DivActualElapsedTime, AVG(DestCityMarketID), MIN(DayOfWeek), MIN(DayofMonth) FROM mytable GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 1","hsqls":["SELECT DivActualElapsedTime, AVG(DestCityMarketID), MIN(DayOfWeek), MIN(DayofMonth) FROM mytable GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 1"]}
@@ -7964,62 +7964,62 @@
 {"sql":"SELECT DestStateFips, MAX(WheelsOff), COUNT(Cancelled), MIN(Distance) FROM mytable WHERE SecurityDelay IN (4, 18, 8, 27, 14) GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 10","hsqls":["SELECT DestStateFips, MAX(WheelsOff), COUNT(Cancelled), MIN(Distance) FROM mytable WHERE SecurityDelay IN (4, 18, 8, 27, 14) GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 10"]}
 {"sql":"SELECT CarrierDelay, DaysSinceEpoch, MIN(DistanceGroup) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 2 OR CancellationCode <> 'B' AND CarrierDelay NOT IN (82) GROUP BY CarrierDelay, DaysSinceEpoch  ORDER BY CarrierDelay, DaysSinceEpoch LIMIT 22","hsqls":["SELECT CarrierDelay, DaysSinceEpoch, MIN(DistanceGroup) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 2 OR CancellationCode <> 'B' AND CarrierDelay NOT IN (82) GROUP BY CarrierDelay, DaysSinceEpoch  ORDER BY CarrierDelay, DaysSinceEpoch LIMIT 22"]}
 {"sql":"SELECT AirlineID, AVG(DepDelayMinutes) FROM mytable WHERE SecurityDelay >= 10 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 9","hsqls":["SELECT AirlineID, AVG(DepDelayMinutes) FROM mytable WHERE SecurityDelay >= 10 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 9"]}
-{"sql":"SELECT Distance, Cancelled, DaysSinceEpoch FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 AND DivWheelsOffs = 1337 OR TailNum NOT IN ('N16149', 'N723UW', 'N76288', 'N66803') ORDER BY DepartureDelayGroups, DestWac, TailNum LIMIT 9","hsqls":["SELECT Distance, Cancelled, DaysSinceEpoch FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 AND (DivWheelsOffs__MV0 = 1337 OR DivWheelsOffs__MV1 = 1337 OR DivWheelsOffs__MV2 = 1337 OR DivWheelsOffs__MV3 = 1337 OR DivWheelsOffs__MV4 = 1337) OR TailNum NOT IN ('N16149', 'N723UW', 'N76288', 'N66803') ORDER BY DepartureDelayGroups, DestWac, TailNum LIMIT 10000"]}
+{"sql":"SELECT Distance, Cancelled, DaysSinceEpoch FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 AND DivWheelsOffs = 1337 OR TailNum NOT IN ('N16149', 'N723UW', 'N76288', 'N66803') ORDER BY DepartureDelayGroups, DestWac, TailNum LIMIT 9","hsqls":["SELECT Distance, Cancelled, DaysSinceEpoch FROM mytable WHERE DistanceGroup BETWEEN 7 AND 9 AND (DivWheelsOffs[1] = 1337 OR DivWheelsOffs[2] = 1337 OR DivWheelsOffs[3] = 1337 OR DivWheelsOffs[4] = 1337 OR DivWheelsOffs[5] = 1337) OR TailNum NOT IN ('N16149', 'N723UW', 'N76288', 'N66803') ORDER BY DepartureDelayGroups, DestWac, TailNum LIMIT 10000"]}
 {"sql":"SELECT MAX(DivDistance), AVG(TaxiOut) FROM mytable LIMIT 26"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 16"}
 {"sql":"SELECT MAX(OriginWac) FROM mytable LIMIT 14"}
-{"sql":"SELECT DistanceGroup, FirstDepTime, \"Month\" FROM mytable WHERE FlightDate NOT IN ('2014-01-18', '2014-01-26') AND WheelsOn IN (1523, 6, 2209, 1152) OR ArrDelay <> -16.0 ORDER BY WeatherDelay LIMIT 1","hsqls":["SELECT DistanceGroup, FirstDepTime, Month FROM mytable WHERE FlightDate NOT IN ('2014-01-18', '2014-01-26') AND WheelsOn IN (1523, 6, 2209, 1152) OR ArrDelay <> -16.0 ORDER BY WeatherDelay LIMIT 1"]}
-{"sql":"SELECT DivTailNums FROM mytable ORDER BY NASDelay LIMIT 13","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, FirstDepTime, \"Month\" FROM mytable WHERE FlightDate NOT IN ('2014-01-18', '2014-01-26') AND WheelsOn IN (1523, 6, 2209, 1152) OR ArrDelay <> -16.0 ORDER BY WeatherDelay LIMIT 1","hsqls":["SELECT DistanceGroup, FirstDepTime, `Month` FROM mytable WHERE FlightDate NOT IN ('2014-01-18', '2014-01-26') AND WheelsOn IN (1523, 6, 2209, 1152) OR ArrDelay <> -16.0 ORDER BY WeatherDelay LIMIT 1"]}
+{"sql":"SELECT DivTailNums FROM mytable ORDER BY NASDelay LIMIT 13","hsqls":["SELECT DivTailNums FROM mytable ORDER BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, COUNT(Origin), MAX(NASDelay) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 25","hsqls":["SELECT DepDelayMinutes, COUNT(Origin), MAX(NASDelay) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 25"]}
 {"sql":"SELECT DaysSinceEpoch, AVG(DestAirportSeqID) FROM mytable WHERE FlightNum IN (6317) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 23","hsqls":["SELECT DaysSinceEpoch, AVG(DestAirportSeqID) FROM mytable WHERE FlightNum IN (6317) GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 23"]}
-{"sql":"SELECT DivAirports, DestAirportSeqID FROM mytable ORDER BY DivAirportLandings LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportSeqID FROM mytable ORDER BY DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT OriginCityMarketID, DivAirportLandings, \"Month\" FROM mytable ORDER BY DistanceGroup, DestState LIMIT 12","hsqls":["SELECT OriginCityMarketID, DivAirportLandings, Month FROM mytable ORDER BY DistanceGroup, DestState LIMIT 12"]}
+{"sql":"SELECT DivAirports, DestAirportSeqID FROM mytable ORDER BY DivAirportLandings LIMIT 2","hsqls":["SELECT DivAirports, DestAirportSeqID FROM mytable ORDER BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DivAirportLandings, \"Month\" FROM mytable ORDER BY DistanceGroup, DestState LIMIT 12","hsqls":["SELECT OriginCityMarketID, DivAirportLandings, `Month` FROM mytable ORDER BY DistanceGroup, DestState LIMIT 12"]}
 {"sql":"SELECT Cancelled, DivAirportLandings, ArrDelay, COUNT(*) FROM mytable WHERE DepTimeBlk IN ('0900-0959') AND DaysSinceEpoch BETWEEN 16074 AND 16083 OR DestState BETWEEN 'LA' AND 'WY' GROUP BY Cancelled, DivAirportLandings, ArrDelay  ORDER BY Cancelled, DivAirportLandings, ArrDelay LIMIT 28","hsqls":["SELECT Cancelled, DivAirportLandings, ArrDelay, COUNT(*) FROM mytable WHERE DepTimeBlk IN ('0900-0959') AND DaysSinceEpoch BETWEEN 16074 AND 16083 OR DestState BETWEEN 'LA' AND 'WY' GROUP BY Cancelled, DivAirportLandings, ArrDelay  ORDER BY Cancelled, DivAirportLandings, ArrDelay LIMIT 28"]}
-{"sql":"SELECT Diverted, WeatherDelay, DivTotalGTimes FROM mytable WHERE DestAirportID NOT IN (13964, 10561, 13303, 10685) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY OriginCityName LIMIT 28","hsqls":["SELECT Diverted, WeatherDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestAirportID NOT IN (13964, 10561, 13303, 10685) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY OriginCityName LIMIT 10000"]}
+{"sql":"SELECT Diverted, WeatherDelay, DivTotalGTimes FROM mytable WHERE DestAirportID NOT IN (13964, 10561, 13303, 10685) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY OriginCityName LIMIT 28","hsqls":["SELECT Diverted, WeatherDelay, DivTotalGTimes FROM mytable WHERE DestAirportID NOT IN (13964, 10561, 13303, 10685) OR DivAirportLandings IN (2, 1, 0, 9) ORDER BY OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE DestCityMarketID > 33195 AND ArrDel15 <> 1 LIMIT 11"}
 {"sql":"SELECT MIN(WeatherDelay) FROM mytable WHERE FirstDepTime BETWEEN 1016 AND 814 LIMIT 6"}
 {"sql":"SELECT OriginStateFips, CancellationCode, MAX(DivActualElapsedTime), AVG(DivAirportLandings) FROM mytable WHERE CancellationCode > 'B' GROUP BY OriginStateFips, CancellationCode  ORDER BY OriginStateFips, CancellationCode LIMIT 19","hsqls":["SELECT OriginStateFips, CancellationCode, MAX(DivActualElapsedTime), AVG(DivAirportLandings) FROM mytable WHERE CancellationCode > 'B' GROUP BY OriginStateFips, CancellationCode  ORDER BY OriginStateFips, CancellationCode LIMIT 19"]}
 {"sql":"SELECT DepartureDelayGroups, Flights, DepDelayMinutes, MAX(NASDelay), AVG(DayofMonth), SUM(FlightNum) FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 AND AirTime BETWEEN 354 AND 246 OR DistanceGroup <= 3 GROUP BY DepartureDelayGroups, Flights, DepDelayMinutes  ORDER BY DepartureDelayGroups, Flights, DepDelayMinutes LIMIT 4","hsqls":["SELECT DepartureDelayGroups, Flights, DepDelayMinutes, MAX(NASDelay), AVG(DayofMonth), SUM(FlightNum) FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 AND AirTime BETWEEN 354 AND 246 OR DistanceGroup <= 3 GROUP BY DepartureDelayGroups, Flights, DepDelayMinutes  ORDER BY DepartureDelayGroups, Flights, DepDelayMinutes LIMIT 4"]}
 {"sql":"SELECT FlightDate, DepDel15, OriginStateName, COUNT(*) FROM mytable GROUP BY FlightDate, DepDel15, OriginStateName","hsqls":["SELECT FlightDate, DepDel15, OriginStateName, COUNT(*) FROM mytable GROUP BY FlightDate, DepDel15, OriginStateName"]}
-{"sql":"SELECT FlightDate, AirTime, WheelsOn FROM mytable WHERE SecurityDelay = 0 OR DivWheelsOffs IN (1510, 2318, 1052, 1305) LIMIT 11","hsqls":["SELECT FlightDate, AirTime, WheelsOn FROM mytable WHERE SecurityDelay = 0 OR (DivWheelsOffs__MV0 IN (1510, 2318, 1052, 1305) OR DivWheelsOffs__MV1 IN (1510, 2318, 1052, 1305) OR DivWheelsOffs__MV2 IN (1510, 2318, 1052, 1305) OR DivWheelsOffs__MV3 IN (1510, 2318, 1052, 1305) OR DivWheelsOffs__MV4 IN (1510, 2318, 1052, 1305)) LIMIT 10000"]}
-{"sql":"SELECT AirlineID, \"Month\", AVG(ArrDelayMinutes), SUM(CRSArrTime) FROM mytable WHERE DepDel15 < 1 GROUP BY AirlineID, \"Month\" LIMIT 23","hsqls":["SELECT AirlineID, Month, AVG(ArrDelayMinutes), SUM(CRSArrTime) FROM mytable WHERE DepDel15 < 1 GROUP BY AirlineID, Month LIMIT 23"]}
+{"sql":"SELECT FlightDate, AirTime, WheelsOn FROM mytable WHERE SecurityDelay = 0 OR DivWheelsOffs IN (1510, 2318, 1052, 1305) LIMIT 11","hsqls":["SELECT FlightDate, AirTime, WheelsOn FROM mytable WHERE SecurityDelay = 0 OR (DivWheelsOffs[1] IN (1510, 2318, 1052, 1305) OR DivWheelsOffs[2] IN (1510, 2318, 1052, 1305) OR DivWheelsOffs[3] IN (1510, 2318, 1052, 1305) OR DivWheelsOffs[4] IN (1510, 2318, 1052, 1305) OR DivWheelsOffs[5] IN (1510, 2318, 1052, 1305)) LIMIT 10000"]}
+{"sql":"SELECT AirlineID, \"Month\", AVG(ArrDelayMinutes), SUM(CRSArrTime) FROM mytable WHERE DepDel15 < 1 GROUP BY AirlineID, \"Month\" LIMIT 23","hsqls":["SELECT AirlineID, Month, AVG(ArrDelayMinutes), SUM(CRSArrTime) FROM mytable WHERE DepDel15 < 1 GROUP BY AirlineID, `Month` LIMIT 23"]}
 {"sql":"SELECT CRSArrTime, AVG(ActualElapsedTime), COUNT(ArrDelay) FROM mytable WHERE DepTimeBlk > '1000-1059' AND WheelsOff NOT IN (1028, 1254) OR Carrier BETWEEN 'HA' AND 'OO' GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 16","hsqls":["SELECT CRSArrTime, AVG(ActualElapsedTime), COUNT(ArrDelay) FROM mytable WHERE DepTimeBlk > '1000-1059' AND WheelsOff NOT IN (1028, 1254) OR Carrier BETWEEN 'HA' AND 'OO' GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 16"]}
 {"sql":"SELECT CRSArrTime, DestStateName, COUNT(*) FROM mytable WHERE DivDistance NOT IN (1138, 453, 611) OR ArrivalDelayGroups BETWEEN 12 AND 5 AND DepDel15 IN (1, 0) GROUP BY CRSArrTime, DestStateName  ORDER BY CRSArrTime, DestStateName LIMIT 2","hsqls":["SELECT CRSArrTime, DestStateName, COUNT(*) FROM mytable WHERE DivDistance NOT IN (1138, 453, 611) OR ArrivalDelayGroups BETWEEN 12 AND 5 AND DepDel15 IN (1, 0) GROUP BY CRSArrTime, DestStateName  ORDER BY CRSArrTime, DestStateName LIMIT 2"]}
-{"sql":"SELECT SUM(WheelsOn), MIN(\"Year\"), MIN(\"Month\") FROM mytable WHERE ArrivalDelayGroups BETWEEN 5 AND 7 AND OriginAirportID <= 14570 LIMIT 4","hsqls":["SELECT SUM(WheelsOn), MIN(Year), MIN(Month) FROM mytable WHERE ArrivalDelayGroups BETWEEN 5 AND 7 AND OriginAirportID <= 14570 LIMIT 4"]}
+{"sql":"SELECT SUM(WheelsOn), MIN(\"Year\"), MIN(\"Month\") FROM mytable WHERE ArrivalDelayGroups BETWEEN 5 AND 7 AND OriginAirportID <= 14570 LIMIT 4","hsqls":["SELECT SUM(WheelsOn), MIN(`Year`), MIN(`Month`) FROM mytable WHERE ArrivalDelayGroups BETWEEN 5 AND 7 AND OriginAirportID <= 14570 LIMIT 4"]}
 {"sql":"SELECT LateAircraftDelay, UniqueCarrier, OriginStateName FROM mytable ORDER BY CRSArrTime, OriginWac LIMIT 21"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) LIMIT 6"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 10"}
 {"sql":"SELECT Flights, DivAirportLandings FROM mytable LIMIT 8"}
 {"sql":"SELECT DepDelayMinutes, WeatherDelay, DestStateName FROM mytable ORDER BY FlightNum, TotalAddGTime, DivActualElapsedTime LIMIT 24"}
 {"sql":"SELECT OriginStateFips, Flights, SUM(CarrierDelay), MAX(DepDelayMinutes), MIN(ArrDelayMinutes) FROM mytable WHERE OriginCityName < 'Pittsburgh, PA' OR ArrTimeBlk IN ('1700-1759', '1000-1059', '0800-0859', '0001-0559') OR DepDelayMinutes IN (337.0, 11.0) GROUP BY OriginStateFips, Flights  ORDER BY OriginStateFips, Flights LIMIT 19","hsqls":["SELECT OriginStateFips, Flights, SUM(CarrierDelay), MAX(DepDelayMinutes), MIN(ArrDelayMinutes) FROM mytable WHERE OriginCityName < 'Pittsburgh, PA' OR ArrTimeBlk IN ('1700-1759', '1000-1059', '0800-0859', '0001-0559') OR DepDelayMinutes IN (337.0, 11.0) GROUP BY OriginStateFips, Flights  ORDER BY OriginStateFips, Flights LIMIT 19"]}
-{"sql":"SELECT DivWheelsOns, FlightDate, AirlineID FROM mytable WHERE OriginWac NOT IN (81) ORDER BY DestStateFips LIMIT 2","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, FlightDate, AirlineID FROM mytable WHERE OriginWac NOT IN (81) ORDER BY DestStateFips LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, ArrTime, DivWheelsOffs FROM mytable WHERE DepDel15 IN (0) ORDER BY FirstDepTime, AirTime, CRSDepTime LIMIT 1","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DepDel15 IN (0) ORDER BY FirstDepTime, AirTime, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '0800-0859' AND \"Year\" = 2014 GROUP BY DepDelay LIMIT 9","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '0800-0859' AND Year = 2014 GROUP BY DepDelay LIMIT 9"]}
-{"sql":"SELECT Carrier, DestCityName, DivTotalGTimes FROM mytable LIMIT 25","hsqls":["SELECT Carrier, DestCityName, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, FlightDate, AirlineID FROM mytable WHERE OriginWac NOT IN (81) ORDER BY DestStateFips LIMIT 2","hsqls":["SELECT DivWheelsOns, FlightDate, AirlineID FROM mytable WHERE OriginWac NOT IN (81) ORDER BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrTime, DivWheelsOffs FROM mytable WHERE DepDel15 IN (0) ORDER BY FirstDepTime, AirTime, CRSDepTime LIMIT 1","hsqls":["SELECT DivLongestGTimes, ArrTime, DivWheelsOffs FROM mytable WHERE DepDel15 IN (0) ORDER BY FirstDepTime, AirTime, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '0800-0859' AND \"Year\" = 2014 GROUP BY DepDelay LIMIT 9","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '0800-0859' AND `Year` = 2014 GROUP BY DepDelay LIMIT 9"]}
+{"sql":"SELECT Carrier, DestCityName, DivTotalGTimes FROM mytable LIMIT 25","hsqls":["SELECT Carrier, DestCityName, DivTotalGTimes FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, COUNT(*) FROM mytable GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 22","hsqls":["SELECT DayofMonth, COUNT(*) FROM mytable GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 22"]}
 {"sql":"SELECT CRSArrTime, SecurityDelay, ArrTimeBlk FROM mytable WHERE ArrTime IN (2302) AND OriginCityName BETWEEN 'Kona, HI' AND 'New York, NY' ORDER BY FlightNum LIMIT 17"}
 {"sql":"SELECT DestWac, DivArrDelay, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-13' AND '2014-01-24' AND ActualElapsedTime < 347 GROUP BY DestWac, DivArrDelay  ORDER BY DestWac, DivArrDelay LIMIT 17","hsqls":["SELECT DestWac, DivArrDelay, COUNT(*) FROM mytable WHERE FlightDate BETWEEN '2014-01-13' AND '2014-01-24' AND ActualElapsedTime < 347 GROUP BY DestWac, DivArrDelay  ORDER BY DestWac, DivArrDelay LIMIT 17"]}
 {"sql":"SELECT Carrier, ArrTime, DestCityMarketID FROM mytable WHERE TailNum NOT IN ('N5ELAA', 'N788AS', 'N558AA') OR CRSArrTime NOT IN (1232, 1924) AND DestStateName NOT IN ('Alaska', 'Rhode Island') LIMIT 23"}
-{"sql":"SELECT DestStateName, DivAirportIDs, WheelsOn FROM mytable ORDER BY ArrTimeBlk LIMIT 22","hsqls":["SELECT DestStateName, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, WheelsOn FROM mytable ORDER BY ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DestStateName, DivAirportIDs, WheelsOn FROM mytable ORDER BY ArrTimeBlk LIMIT 22","hsqls":["SELECT DestStateName, DivAirportIDs, WheelsOn FROM mytable ORDER BY ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrDelayMinutes), MAX(FirstDepTime), COUNT(ArrDel15) FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 OR OriginAirportSeqID BETWEEN 1014002 AND 1115003 LIMIT 21"}
 {"sql":"SELECT Distance, DestStateName FROM mytable WHERE OriginAirportID = 11778 OR CRSArrTime BETWEEN 1207 AND 816 OR DepDelay BETWEEN 65.0 AND 189.0 ORDER BY Flights, DivActualElapsedTime LIMIT 15"}
-{"sql":"SELECT CarrierDelay, DepTime, OriginWac FROM mytable WHERE ArrDel15 < 1 AND CRSArrTime NOT IN (956, 1557, 1850) AND CarrierDelay IN (149, 230, 228, 120) ORDER BY \"Month\" LIMIT 14","hsqls":["SELECT CarrierDelay, DepTime, OriginWac FROM mytable WHERE ArrDel15 < 1 AND CRSArrTime NOT IN (956, 1557, 1850) AND CarrierDelay IN (149, 230, 228, 120) ORDER BY Month LIMIT 14"]}
-{"sql":"SELECT ActualElapsedTime, ArrDel15 FROM mytable WHERE DivTailNums IN ('N413SW', 'N765SK') LIMIT 23","hsqls":["SELECT ActualElapsedTime, ArrDel15 FROM mytable WHERE (DivTailNums__MV0 IN ('N413SW', 'N765SK') OR DivTailNums__MV1 IN ('N413SW', 'N765SK') OR DivTailNums__MV2 IN ('N413SW', 'N765SK') OR DivTailNums__MV3 IN ('N413SW', 'N765SK') OR DivTailNums__MV4 IN ('N413SW', 'N765SK')) LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DepTime, OriginWac FROM mytable WHERE ArrDel15 < 1 AND CRSArrTime NOT IN (956, 1557, 1850) AND CarrierDelay IN (149, 230, 228, 120) ORDER BY \"Month\" LIMIT 14","hsqls":["SELECT CarrierDelay, DepTime, OriginWac FROM mytable WHERE ArrDel15 < 1 AND CRSArrTime NOT IN (956, 1557, 1850) AND CarrierDelay IN (149, 230, 228, 120) ORDER BY `Month` LIMIT 14"]}
+{"sql":"SELECT ActualElapsedTime, ArrDel15 FROM mytable WHERE DivTailNums IN ('N413SW', 'N765SK') LIMIT 23","hsqls":["SELECT ActualElapsedTime, ArrDel15 FROM mytable WHERE (DivTailNums[1] IN ('N413SW', 'N765SK') OR DivTailNums[2] IN ('N413SW', 'N765SK') OR DivTailNums[3] IN ('N413SW', 'N765SK') OR DivTailNums[4] IN ('N413SW', 'N765SK') OR DivTailNums[5] IN ('N413SW', 'N765SK')) LIMIT 10000"]}
 {"sql":"SELECT FlightDate, ArrivalDelayGroups FROM mytable WHERE OriginCityMarketID IN (32323, 32467, 33044, 31834) OR ArrDelayMinutes IN (410.0, 138.0, 123.0, 174.0, 32.0) LIMIT 9"}
 {"sql":"SELECT DivActualElapsedTime, MIN(OriginAirportID), SUM(LongestAddGTime), SUM(ArrDelay) FROM mytable WHERE TaxiIn IN (19, 106, 75) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 22","hsqls":["SELECT DivActualElapsedTime, MIN(OriginAirportID), SUM(LongestAddGTime), SUM(ArrDelay) FROM mytable WHERE TaxiIn IN (19, 106, 75) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 22"]}
 {"sql":"SELECT OriginState, OriginCityName FROM mytable WHERE Carrier <= 'F9' AND ArrTimeBlk NOT IN ('1000-1059', '1500-1559') ORDER BY DepDelayMinutes, TotalAddGTime, CancellationCode LIMIT 7"}
 {"sql":"SELECT AirTime, OriginStateName, MAX(DepTime), AVG(ArrDelayMinutes), COUNT(DepartureDelayGroups) FROM mytable GROUP BY AirTime, OriginStateName","hsqls":["SELECT AirTime, OriginStateName, MAX(DepTime), AVG(ArrDelayMinutes), COUNT(DepartureDelayGroups) FROM mytable GROUP BY AirTime, OriginStateName"]}
-{"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE Diverted > 0 AND DivWheelsOns BETWEEN 1559 AND 1445 LIMIT 20","hsqls":["SELECT ArrivalDelayGroups FROM mytable WHERE Diverted > 0 AND (DivWheelsOns__MV0 BETWEEN 1559 AND 1445 OR DivWheelsOns__MV1 BETWEEN 1559 AND 1445 OR DivWheelsOns__MV2 BETWEEN 1559 AND 1445 OR DivWheelsOns__MV3 BETWEEN 1559 AND 1445 OR DivWheelsOns__MV4 BETWEEN 1559 AND 1445) LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE Diverted > 0 AND DivWheelsOns BETWEEN 1559 AND 1445 LIMIT 20","hsqls":["SELECT ArrivalDelayGroups FROM mytable WHERE Diverted > 0 AND (DivWheelsOns[1] BETWEEN 1559 AND 1445 OR DivWheelsOns[2] BETWEEN 1559 AND 1445 OR DivWheelsOns[3] BETWEEN 1559 AND 1445 OR DivWheelsOns[4] BETWEEN 1559 AND 1445 OR DivWheelsOns[5] BETWEEN 1559 AND 1445) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, FirstDepTime, CRSArrTime FROM mytable ORDER BY ArrTime, WheelsOn LIMIT 16"}
 {"sql":"SELECT WheelsOff, OriginWac FROM mytable WHERE DestStateFips <= 9 ORDER BY DestWac, FlightNum, TaxiIn LIMIT 1"}
 {"sql":"SELECT ActualElapsedTime, CancellationCode, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1142303 AND 1018502 AND TaxiOut <> 50 GROUP BY ActualElapsedTime, CancellationCode  ORDER BY ActualElapsedTime, CancellationCode LIMIT 24","hsqls":["SELECT ActualElapsedTime, CancellationCode, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1142303 AND 1018502 AND TaxiOut <> 50 GROUP BY ActualElapsedTime, CancellationCode  ORDER BY ActualElapsedTime, CancellationCode LIMIT 24"]}
 {"sql":"SELECT SUM(DestCityMarketID), COUNT(DestState) FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059', '1500-1559') OR LongestAddGTime <= 15 AND DistanceGroup NOT IN (3, 10, 7, 8) LIMIT 14"}
-{"sql":"SELECT DivWheelsOns, DivArrDelay FROM mytable ORDER BY LateAircraftDelay, DivDistance, CRSDepTime LIMIT 29","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivArrDelay FROM mytable ORDER BY LateAircraftDelay, DivDistance, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivArrDelay FROM mytable ORDER BY LateAircraftDelay, DivDistance, CRSDepTime LIMIT 29","hsqls":["SELECT DivWheelsOns, DivArrDelay FROM mytable ORDER BY LateAircraftDelay, DivDistance, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT Dest FROM mytable WHERE OriginAirportSeqID BETWEEN 1164802 AND 1197302"}
 {"sql":"SELECT UniqueCarrier, MAX(DepTime), MAX(DepDel15) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 10","hsqls":["SELECT UniqueCarrier, MAX(DepTime), MAX(DepDel15) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 10"]}
 {"sql":"SELECT Carrier, COUNT(*) FROM mytable GROUP BY Carrier  ORDER BY Carrier LIMIT 20","hsqls":["SELECT Carrier, COUNT(*) FROM mytable GROUP BY Carrier  ORDER BY Carrier LIMIT 20"]}
 {"sql":"SELECT DepartureDelayGroups, CarrierDelay, COUNT(*) FROM mytable WHERE WeatherDelay NOT IN (170, 74, 84) GROUP BY DepartureDelayGroups, CarrierDelay  ORDER BY DepartureDelayGroups, CarrierDelay LIMIT 26","hsqls":["SELECT DepartureDelayGroups, CarrierDelay, COUNT(*) FROM mytable WHERE WeatherDelay NOT IN (170, 74, 84) GROUP BY DepartureDelayGroups, CarrierDelay  ORDER BY DepartureDelayGroups, CarrierDelay LIMIT 26"]}
-{"sql":"SELECT DepDelay, DivAirportSeqIDs, DestStateName FROM mytable WHERE OriginStateName BETWEEN 'South Carolina' AND 'Kansas' OR OriginCityMarketID BETWEEN 33667 AND 30434 ORDER BY DestWac, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DepDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestStateName FROM mytable WHERE OriginStateName BETWEEN 'South Carolina' AND 'Kansas' OR OriginCityMarketID BETWEEN 33667 AND 30434 ORDER BY DestWac, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DivAirportSeqIDs, DestStateName FROM mytable WHERE OriginStateName BETWEEN 'South Carolina' AND 'Kansas' OR OriginCityMarketID BETWEEN 33667 AND 30434 ORDER BY DestWac, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DepDelay, DivAirportSeqIDs, DestStateName FROM mytable WHERE OriginStateName BETWEEN 'South Carolina' AND 'Kansas' OR OriginCityMarketID BETWEEN 33667 AND 30434 ORDER BY DestWac, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DestState, CRSArrTime FROM mytable ORDER BY DepartureDelayGroups LIMIT 8"}
 {"sql":"SELECT OriginWac, OriginAirportID, MAX(ActualElapsedTime) FROM mytable WHERE UniqueCarrier IN ('HA', 'US', 'FL') OR ActualElapsedTime BETWEEN 282 AND 79 OR Distance NOT IN (1829) GROUP BY OriginWac, OriginAirportID  ORDER BY OriginWac, OriginAirportID LIMIT 21","hsqls":["SELECT OriginWac, OriginAirportID, MAX(ActualElapsedTime) FROM mytable WHERE UniqueCarrier IN ('HA', 'US', 'FL') OR ActualElapsedTime BETWEEN 282 AND 79 OR Distance NOT IN (1829) GROUP BY OriginWac, OriginAirportID  ORDER BY OriginWac, OriginAirportID LIMIT 21"]}
 {"sql":"SELECT FirstDepTime, COUNT(DestStateName), AVG(OriginAirportID) FROM mytable WHERE TailNum BETWEEN 'N551UA' AND 'N3767' GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 16","hsqls":["SELECT FirstDepTime, COUNT(DestStateName), AVG(OriginAirportID) FROM mytable WHERE TailNum BETWEEN 'N551UA' AND 'N3767' GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 16"]}
@@ -8027,51 +8027,51 @@
 {"sql":"SELECT MAX(FirstDepTime), SUM(OriginCityMarketID) FROM mytable WHERE Origin IN ('FSD', 'BWI') AND FlightNum BETWEEN 6156 AND 4688 LIMIT 8"}
 {"sql":"SELECT ArrTime, CancellationCode, CRSDepTime FROM mytable ORDER BY NASDelay, DivAirportLandings LIMIT 4"}
 {"sql":"SELECT Distance, UniqueCarrier FROM mytable WHERE ArrDelay <> -12.0 LIMIT 26"}
-{"sql":"SELECT DivWheelsOns, DestCityName, UniqueCarrier FROM mytable WHERE ArrDelayMinutes BETWEEN 261.0 AND 39.0 ORDER BY TaxiOut, Cancelled LIMIT 4","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestCityName, UniqueCarrier FROM mytable WHERE ArrDelayMinutes BETWEEN 261.0 AND 39.0 ORDER BY TaxiOut, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DestCityName, UniqueCarrier FROM mytable WHERE ArrDelayMinutes BETWEEN 261.0 AND 39.0 ORDER BY TaxiOut, Cancelled LIMIT 4","hsqls":["SELECT DivWheelsOns, DestCityName, UniqueCarrier FROM mytable WHERE ArrDelayMinutes BETWEEN 261.0 AND 39.0 ORDER BY TaxiOut, Cancelled LIMIT 10000"]}
 {"sql":"SELECT MAX(WeatherDelay) FROM mytable WHERE DepTimeBlk NOT IN ('2300-2359') OR ArrTimeBlk BETWEEN '1700-1759' AND '1000-1059' OR CRSElapsedTime BETWEEN 286 AND 106 LIMIT 13"}
 {"sql":"SELECT DistanceGroup, ArrDelayMinutes, NASDelay, COUNT(*) FROM mytable GROUP BY DistanceGroup, ArrDelayMinutes, NASDelay  ORDER BY DistanceGroup, ArrDelayMinutes, NASDelay LIMIT 9","hsqls":["SELECT DistanceGroup, ArrDelayMinutes, NASDelay, COUNT(*) FROM mytable GROUP BY DistanceGroup, ArrDelayMinutes, NASDelay  ORDER BY DistanceGroup, ArrDelayMinutes, NASDelay LIMIT 9"]}
-{"sql":"SELECT OriginCityMarketID, DestAirportSeqID, SUM(CRSDepTime) FROM mytable WHERE CRSDepTime NOT IN (2002, 2140, 845) AND \"Month\" BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, DestAirportSeqID LIMIT 21","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID, SUM(CRSDepTime) FROM mytable WHERE CRSDepTime NOT IN (2002, 2140, 845) AND Month BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, DestAirportSeqID LIMIT 21"]}
+{"sql":"SELECT OriginCityMarketID, DestAirportSeqID, SUM(CRSDepTime) FROM mytable WHERE CRSDepTime NOT IN (2002, 2140, 845) AND \"Month\" BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, DestAirportSeqID LIMIT 21","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID, SUM(CRSDepTime) FROM mytable WHERE CRSDepTime NOT IN (2002, 2140, 845) AND `Month` BETWEEN 1 AND 1 GROUP BY OriginCityMarketID, DestAirportSeqID LIMIT 21"]}
 {"sql":"SELECT DistanceGroup, DepTime FROM mytable WHERE WeatherDelay >= 45 AND CarrierDelay <= 14 ORDER BY NASDelay, TailNum LIMIT 11"}
 {"sql":"SELECT OriginWac, OriginAirportID FROM mytable WHERE DepartureDelayGroups IN (11) ORDER BY DepartureDelayGroups, ArrTime LIMIT 11"}
-{"sql":"SELECT DivReachedDest, COUNT(NASDelay), SUM(FirstDepTime), AVG(DepDelayMinutes) FROM mytable WHERE DivAirports IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivWheelsOffs IN (901) GROUP BY DivReachedDest LIMIT 5","hsqls":["SELECT DivReachedDest, COUNT(NASDelay), SUM(FirstDepTime), AVG(DepDelayMinutes) FROM mytable WHERE (DivAirports__MV0 IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports__MV1 IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports__MV2 IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports__MV3 IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports__MV4 IN ('ABE', 'PIT', 'SJU', 'FAI')) OR (DivWheelsOffs__MV0 IN (901) OR DivWheelsOffs__MV1 IN (901) OR DivWheelsOffs__MV2 IN (901) OR DivWheelsOffs__MV3 IN (901) OR DivWheelsOffs__MV4 IN (901)) GROUP BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, COUNT(NASDelay), SUM(FirstDepTime), AVG(DepDelayMinutes) FROM mytable WHERE DivAirports IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivWheelsOffs IN (901) GROUP BY DivReachedDest LIMIT 5","hsqls":["SELECT DivReachedDest, COUNT(NASDelay), SUM(FirstDepTime), AVG(DepDelayMinutes) FROM mytable WHERE (DivAirports[1] IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports[2] IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports[3] IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports[4] IN ('ABE', 'PIT', 'SJU', 'FAI') OR DivAirports[5] IN ('ABE', 'PIT', 'SJU', 'FAI')) OR (DivWheelsOffs[1] IN (901) OR DivWheelsOffs[2] IN (901) OR DivWheelsOffs[3] IN (901) OR DivWheelsOffs[4] IN (901) OR DivWheelsOffs[5] IN (901)) GROUP BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, ArrTime, ArrDel15, AVG(DivDistance) FROM mytable WHERE Flights < 1 OR Flights BETWEEN 1 AND 1 GROUP BY DepDelayMinutes, ArrTime, ArrDel15  ORDER BY DepDelayMinutes, ArrTime, ArrDel15 LIMIT 27","hsqls":["SELECT DepDelayMinutes, ArrTime, ArrDel15, AVG(DivDistance) FROM mytable WHERE Flights < 1 OR Flights BETWEEN 1 AND 1 GROUP BY DepDelayMinutes, ArrTime, ArrDel15  ORDER BY DepDelayMinutes, ArrTime, ArrDel15 LIMIT 27"]}
-{"sql":"SELECT OriginAirportSeqID, Origin, CRSDepTime, AVG(TotalAddGTime), SUM(CRSElapsedTime), SUM(TaxiIn) FROM mytable WHERE \"Year\" NOT IN (2014) OR OriginAirportSeqID BETWEEN 1106603 AND 1129803 GROUP BY OriginAirportSeqID, Origin, CRSDepTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Origin, CRSDepTime, AVG(TotalAddGTime), SUM(CRSElapsedTime), SUM(TaxiIn) FROM mytable WHERE Year NOT IN (2014) OR OriginAirportSeqID BETWEEN 1106603 AND 1129803 GROUP BY OriginAirportSeqID, Origin, CRSDepTime LIMIT 11"]}
+{"sql":"SELECT OriginAirportSeqID, Origin, CRSDepTime, AVG(TotalAddGTime), SUM(CRSElapsedTime), SUM(TaxiIn) FROM mytable WHERE \"Year\" NOT IN (2014) OR OriginAirportSeqID BETWEEN 1106603 AND 1129803 GROUP BY OriginAirportSeqID, Origin, CRSDepTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Origin, CRSDepTime, AVG(TotalAddGTime), SUM(CRSElapsedTime), SUM(TaxiIn) FROM mytable WHERE `Year` NOT IN (2014) OR OriginAirportSeqID BETWEEN 1106603 AND 1129803 GROUP BY OriginAirportSeqID, Origin, CRSDepTime LIMIT 11"]}
 {"sql":"SELECT DepartureDelayGroups, OriginStateFips, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, OriginStateFips  ORDER BY DepartureDelayGroups, OriginStateFips LIMIT 22","hsqls":["SELECT DepartureDelayGroups, OriginStateFips, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, OriginStateFips  ORDER BY DepartureDelayGroups, OriginStateFips LIMIT 22"]}
 {"sql":"SELECT DestCityName, COUNT(*) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 13","hsqls":["SELECT DestCityName, COUNT(*) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 13"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE DivDistance = 1807 OR DepDelayMinutes BETWEEN 147.0 AND 337.0 OR FlightNum NOT IN (5011, 4866, 1077, 5530) ORDER BY TaxiOut, UniqueCarrier LIMIT 5"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes = 2.0 AND AirTime <= 59 OR OriginStateFips NOT IN (78, 56, 33) LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes__MV0 = 2.0 OR DivLongestGTimes__MV1 = 2.0 OR DivLongestGTimes__MV2 = 2.0 OR DivLongestGTimes__MV3 = 2.0 OR DivLongestGTimes__MV4 = 2.0) AND AirTime <= 59 OR OriginStateFips NOT IN (78, 56, 33) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivLongestGTimes = 2.0 AND AirTime <= 59 OR OriginStateFips NOT IN (78, 56, 33) LIMIT 10","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivLongestGTimes[1] = 2.0 OR DivLongestGTimes[2] = 2.0 OR DivLongestGTimes[3] = 2.0 OR DivLongestGTimes[4] = 2.0 OR DivLongestGTimes[5] = 2.0) AND AirTime <= 59 OR OriginStateFips NOT IN (78, 56, 33) LIMIT 10000"]}
 {"sql":"SELECT DepTime, TailNum FROM mytable WHERE TailNum IN ('N3JTAA', 'N357AA', 'N615QX', 'N831UA') AND CancellationCode BETWEEN 'A' AND 'noodles' LIMIT 24"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportIDs IN (13796) LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (13796) OR DivAirportIDs__MV1 IN (13796) OR DivAirportIDs__MV2 IN (13796) OR DivAirportIDs__MV3 IN (13796) OR DivAirportIDs__MV4 IN (13796)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivAirportIDs IN (13796) LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (13796) OR DivAirportIDs[2] IN (13796) OR DivAirportIDs[3] IN (13796) OR DivAirportIDs[4] IN (13796) OR DivAirportIDs[5] IN (13796)) LIMIT 10000"]}
 {"sql":"SELECT DepDelay, OriginWac, MIN(DepTime), MIN(DivReachedDest) FROM mytable WHERE Dest IN ('FNT', 'CMI', 'CHA') GROUP BY DepDelay, OriginWac  ORDER BY DepDelay, OriginWac LIMIT 7","hsqls":["SELECT DepDelay, OriginWac, MIN(DepTime), MIN(DivReachedDest) FROM mytable WHERE Dest IN ('FNT', 'CMI', 'CHA') GROUP BY DepDelay, OriginWac  ORDER BY DepDelay, OriginWac LIMIT 7"]}
-{"sql":"SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE WheelsOff NOT IN (46, 1028, 1640, 2336) ORDER BY LateAircraftDelay, SecurityDelay LIMIT 5","hsqls":["SELECT FirstDepTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE WheelsOff NOT IN (46, 1028, 1640, 2336) ORDER BY LateAircraftDelay, SecurityDelay LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE WheelsOff NOT IN (46, 1028, 1640, 2336) ORDER BY LateAircraftDelay, SecurityDelay LIMIT 5","hsqls":["SELECT FirstDepTime, DivWheelsOffs FROM mytable WHERE WheelsOff NOT IN (46, 1028, 1640, 2336) ORDER BY LateAircraftDelay, SecurityDelay LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE DistanceGroup IN (9) OR Diverted < 1 AND DestAirportID <= 11337 ORDER BY SecurityDelay LIMIT 7"}
 {"sql":"SELECT TailNum, DestCityName, DivAirportLandings, COUNT(*) FROM mytable WHERE ActualElapsedTime > 32 OR Cancelled BETWEEN 1 AND 0 GROUP BY TailNum, DestCityName, DivAirportLandings  ORDER BY TailNum, DestCityName, DivAirportLandings LIMIT 24","hsqls":["SELECT TailNum, DestCityName, DivAirportLandings, COUNT(*) FROM mytable WHERE ActualElapsedTime > 32 OR Cancelled BETWEEN 1 AND 0 GROUP BY TailNum, DestCityName, DivAirportLandings  ORDER BY TailNum, DestCityName, DivAirportLandings LIMIT 24"]}
 {"sql":"SELECT WheelsOn, DayOfWeek, SUM(DepDelay), MAX(AirTime), MIN(Distance) FROM mytable WHERE DestAirportSeqID IN (1195302, 1349503, 1425202, 1467903) GROUP BY WheelsOn, DayOfWeek  ORDER BY WheelsOn, DayOfWeek LIMIT 9","hsqls":["SELECT WheelsOn, DayOfWeek, SUM(DepDelay), MAX(AirTime), MIN(Distance) FROM mytable WHERE DestAirportSeqID IN (1195302, 1349503, 1425202, 1467903) GROUP BY WheelsOn, DayOfWeek  ORDER BY WheelsOn, DayOfWeek LIMIT 9"]}
-{"sql":"SELECT DepDelayMinutes, DivWheelsOffs FROM mytable WHERE DivTotalGTimes IN (94, 30, 112, 32, 62) OR WheelsOn IN (736, 559, 927, 2155) LIMIT 10","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 IN (94, 30, 112, 32, 62) OR DivTotalGTimes__MV1 IN (94, 30, 112, 32, 62) OR DivTotalGTimes__MV2 IN (94, 30, 112, 32, 62) OR DivTotalGTimes__MV3 IN (94, 30, 112, 32, 62) OR DivTotalGTimes__MV4 IN (94, 30, 112, 32, 62)) OR WheelsOn IN (736, 559, 927, 2155) LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivWheelsOffs FROM mytable WHERE DivTotalGTimes IN (94, 30, 112, 32, 62) OR WheelsOn IN (736, 559, 927, 2155) LIMIT 10","hsqls":["SELECT DepDelayMinutes, DivWheelsOffs FROM mytable WHERE (DivTotalGTimes[1] IN (94, 30, 112, 32, 62) OR DivTotalGTimes[2] IN (94, 30, 112, 32, 62) OR DivTotalGTimes[3] IN (94, 30, 112, 32, 62) OR DivTotalGTimes[4] IN (94, 30, 112, 32, 62) OR DivTotalGTimes[5] IN (94, 30, 112, 32, 62)) OR WheelsOn IN (736, 559, 927, 2155) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, MIN(WheelsOff) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 7","hsqls":["SELECT TaxiIn, MIN(WheelsOff) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 7"]}
-{"sql":"SELECT Distance, DivTailNums, DayofMonth FROM mytable WHERE DivAirportLandings < 2 AND Cancelled NOT IN (1, 0) ORDER BY DepartureDelayGroups, FlightNum, ArrTimeBlk LIMIT 4","hsqls":["SELECT Distance, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DayofMonth FROM mytable WHERE DivAirportLandings < 2 AND Cancelled NOT IN (1, 0) ORDER BY DepartureDelayGroups, FlightNum, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT Distance, DivTailNums, DayofMonth FROM mytable WHERE DivAirportLandings < 2 AND Cancelled NOT IN (1, 0) ORDER BY DepartureDelayGroups, FlightNum, ArrTimeBlk LIMIT 4","hsqls":["SELECT Distance, DivTailNums, DayofMonth FROM mytable WHERE DivAirportLandings < 2 AND Cancelled NOT IN (1, 0) ORDER BY DepartureDelayGroups, FlightNum, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, AirlineID, SUM(AirTime), MAX(OriginAirportID) FROM mytable WHERE Distance BETWEEN 1773 AND 484 GROUP BY FirstDepTime, AirlineID  ORDER BY FirstDepTime, AirlineID LIMIT 9","hsqls":["SELECT FirstDepTime, AirlineID, SUM(AirTime), MAX(OriginAirportID) FROM mytable WHERE Distance BETWEEN 1773 AND 484 GROUP BY FirstDepTime, AirlineID  ORDER BY FirstDepTime, AirlineID LIMIT 9"]}
 {"sql":"SELECT DepartureDelayGroups, DayofMonth, DivAirportLandings, SUM(DepDelay), AVG(OriginCityMarketID) FROM mytable WHERE ArrTimeBlk IN ('2200-2259', '0700-0759', '1200-1259', '1500-1559') AND CRSDepTime BETWEEN 1906 AND 1126 GROUP BY DepartureDelayGroups, DayofMonth, DivAirportLandings  ORDER BY DepartureDelayGroups, DayofMonth, DivAirportLandings LIMIT 22","hsqls":["SELECT DepartureDelayGroups, DayofMonth, DivAirportLandings, SUM(DepDelay), AVG(OriginCityMarketID) FROM mytable WHERE ArrTimeBlk IN ('2200-2259', '0700-0759', '1200-1259', '1500-1559') AND CRSDepTime BETWEEN 1906 AND 1126 GROUP BY DepartureDelayGroups, DayofMonth, DivAirportLandings  ORDER BY DepartureDelayGroups, DayofMonth, DivAirportLandings LIMIT 22"]}
-{"sql":"SELECT DistanceGroup, DivArrDelay, \"Month\", MAX(DepDelayMinutes), SUM(DepDelay), MAX(\"Month\") FROM mytable WHERE OriginStateName IN ('Washington') GROUP BY DistanceGroup, DivArrDelay, \"Month\" LIMIT 12","hsqls":["SELECT DistanceGroup, DivArrDelay, Month, MAX(DepDelayMinutes), SUM(DepDelay), MAX(Month) FROM mytable WHERE OriginStateName IN ('Washington') GROUP BY DistanceGroup, DivArrDelay, Month LIMIT 12"]}
+{"sql":"SELECT DistanceGroup, DivArrDelay, \"Month\", MAX(DepDelayMinutes), SUM(DepDelay), MAX(\"Month\") FROM mytable WHERE OriginStateName IN ('Washington') GROUP BY DistanceGroup, DivArrDelay, \"Month\" LIMIT 12","hsqls":["SELECT DistanceGroup, DivArrDelay, Month, MAX(DepDelayMinutes), SUM(DepDelay), MAX(`Month`) FROM mytable WHERE OriginStateName IN ('Washington') GROUP BY DistanceGroup, DivArrDelay, `Month` LIMIT 12"]}
 {"sql":"SELECT ActualElapsedTime, COUNT(DepDelay), COUNT(DepartureDelayGroups), SUM(TaxiIn) FROM mytable WHERE FirstDepTime BETWEEN 1540 AND 2356 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 9","hsqls":["SELECT ActualElapsedTime, COUNT(DepDelay), COUNT(DepartureDelayGroups), SUM(TaxiIn) FROM mytable WHERE FirstDepTime BETWEEN 1540 AND 2356 GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 9"]}
 {"sql":"SELECT Diverted, DaysSinceEpoch FROM mytable WHERE DepTime IN (1458, 2232) OR WheelsOn BETWEEN 700 AND 1020 ORDER BY Flights, DestAirportSeqID, DestStateName LIMIT 6"}
-{"sql":"SELECT Quarter, CRSArrTime, \"Month\" FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 ORDER BY ArrDel15, AirTime LIMIT 27","hsqls":["SELECT Quarter, CRSArrTime, Month FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 ORDER BY ArrDel15, AirTime LIMIT 27"]}
-{"sql":"SELECT DivLongestGTimes, DivTotalGTimes FROM mytable ORDER BY TaxiOut, ArrDelayMinutes, Dest LIMIT 17","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY TaxiOut, ArrDelayMinutes, Dest LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, ArrTimeBlk, DivArrDelay FROM mytable WHERE WeatherDelay BETWEEN 71 AND 2 OR SecurityDelay IN (0, 18, 27) OR DivAirportSeqIDs IN (1215602, 1289605) ORDER BY CRSArrTime, DivAirportLandings LIMIT 2","hsqls":["SELECT OriginCityName, ArrTimeBlk, DivArrDelay FROM mytable WHERE WeatherDelay BETWEEN 71 AND 2 OR SecurityDelay IN (0, 18, 27) OR (DivAirportSeqIDs__MV0 IN (1215602, 1289605) OR DivAirportSeqIDs__MV1 IN (1215602, 1289605) OR DivAirportSeqIDs__MV2 IN (1215602, 1289605) OR DivAirportSeqIDs__MV3 IN (1215602, 1289605) OR DivAirportSeqIDs__MV4 IN (1215602, 1289605)) ORDER BY CRSArrTime, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, Dest, COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N223AG' AND 'N791SK' AND OriginCityName <= 'Saginaw/Bay City/Midland, MI' GROUP BY DepartureDelayGroups, Dest LIMIT 8","hsqls":["SELECT DepartureDelayGroups, Dest, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums__MV1 BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums__MV2 BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums__MV3 BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums__MV4 BETWEEN 'N223AG' AND 'N791SK') AND OriginCityName <= 'Saginaw/Bay City/Midland, MI' GROUP BY DepartureDelayGroups, Dest LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable ORDER BY OriginStateName LIMIT 23","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY OriginStateName LIMIT 10000"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE DestCityMarketID NOT IN (33424, 30285, 34543) OR DivAirports >= 'AGS' OR FlightDate BETWEEN '2014-01-06' AND '2014-01-31' ORDER BY Diverted, SecurityDelay, AirlineID LIMIT 21","hsqls":["SELECT DestCityName FROM mytable WHERE DestCityMarketID NOT IN (33424, 30285, 34543) OR (DivAirports__MV0 >= 'AGS' OR DivAirports__MV1 >= 'AGS' OR DivAirports__MV2 >= 'AGS' OR DivAirports__MV3 >= 'AGS' OR DivAirports__MV4 >= 'AGS') OR FlightDate BETWEEN '2014-01-06' AND '2014-01-31' ORDER BY Diverted, SecurityDelay, AirlineID LIMIT 10000"]}
+{"sql":"SELECT Quarter, CRSArrTime, \"Month\" FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 ORDER BY ArrDel15, AirTime LIMIT 27","hsqls":["SELECT Quarter, CRSArrTime, `Month` FROM mytable WHERE ArrDel15 BETWEEN 1 AND -9999 ORDER BY ArrDel15, AirTime LIMIT 27"]}
+{"sql":"SELECT DivLongestGTimes, DivTotalGTimes FROM mytable ORDER BY TaxiOut, ArrDelayMinutes, Dest LIMIT 17","hsqls":["SELECT DivLongestGTimes, DivTotalGTimes FROM mytable ORDER BY TaxiOut, ArrDelayMinutes, Dest LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, ArrTimeBlk, DivArrDelay FROM mytable WHERE WeatherDelay BETWEEN 71 AND 2 OR SecurityDelay IN (0, 18, 27) OR DivAirportSeqIDs IN (1215602, 1289605) ORDER BY CRSArrTime, DivAirportLandings LIMIT 2","hsqls":["SELECT OriginCityName, ArrTimeBlk, DivArrDelay FROM mytable WHERE WeatherDelay BETWEEN 71 AND 2 OR SecurityDelay IN (0, 18, 27) OR (DivAirportSeqIDs[1] IN (1215602, 1289605) OR DivAirportSeqIDs[2] IN (1215602, 1289605) OR DivAirportSeqIDs[3] IN (1215602, 1289605) OR DivAirportSeqIDs[4] IN (1215602, 1289605) OR DivAirportSeqIDs[5] IN (1215602, 1289605)) ORDER BY CRSArrTime, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Dest, COUNT(*) FROM mytable WHERE DivTailNums BETWEEN 'N223AG' AND 'N791SK' AND OriginCityName <= 'Saginaw/Bay City/Midland, MI' GROUP BY DepartureDelayGroups, Dest LIMIT 8","hsqls":["SELECT DepartureDelayGroups, Dest, COUNT(*) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums[2] BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums[3] BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums[4] BETWEEN 'N223AG' AND 'N791SK' OR DivTailNums[5] BETWEEN 'N223AG' AND 'N791SK') AND OriginCityName <= 'Saginaw/Bay City/Midland, MI' GROUP BY DepartureDelayGroups, Dest LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable ORDER BY OriginStateName LIMIT 23","hsqls":["SELECT DivAirports FROM mytable ORDER BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE DestCityMarketID NOT IN (33424, 30285, 34543) OR DivAirports >= 'AGS' OR FlightDate BETWEEN '2014-01-06' AND '2014-01-31' ORDER BY Diverted, SecurityDelay, AirlineID LIMIT 21","hsqls":["SELECT DestCityName FROM mytable WHERE DestCityMarketID NOT IN (33424, 30285, 34543) OR (DivAirports[1] >= 'AGS' OR DivAirports[2] >= 'AGS' OR DivAirports[3] >= 'AGS' OR DivAirports[4] >= 'AGS' OR DivAirports[5] >= 'AGS') OR FlightDate BETWEEN '2014-01-06' AND '2014-01-31' ORDER BY Diverted, SecurityDelay, AirlineID LIMIT 10000"]}
 {"sql":"SELECT SUM(CarrierDelay) FROM mytable WHERE DayOfWeek BETWEEN 2 AND 1 LIMIT 9"}
 {"sql":"SELECT WheelsOff, DestAirportSeqID, DayofMonth, SUM(WheelsOn), SUM(DestWac) FROM mytable WHERE Cancelled NOT IN (1, 0) OR SecurityDelay > -9999 AND DestStateName BETWEEN 'Oklahoma' AND 'South Dakota' GROUP BY WheelsOff, DestAirportSeqID, DayofMonth  ORDER BY WheelsOff, DestAirportSeqID, DayofMonth LIMIT 8","hsqls":["SELECT WheelsOff, DestAirportSeqID, DayofMonth, SUM(WheelsOn), SUM(DestWac) FROM mytable WHERE Cancelled NOT IN (1, 0) OR SecurityDelay > -9999 AND DestStateName BETWEEN 'Oklahoma' AND 'South Dakota' GROUP BY WheelsOff, DestAirportSeqID, DayofMonth  ORDER BY WheelsOff, DestAirportSeqID, DayofMonth LIMIT 8"]}
 {"sql":"SELECT DestAirportID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1106603 AND 1133703 AND DestState IN ('GA', 'OR', 'CO', 'RI') GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 10","hsqls":["SELECT DestAirportID, COUNT(*) FROM mytable WHERE DestAirportSeqID BETWEEN 1106603 AND 1133703 AND DestState IN ('GA', 'OR', 'CO', 'RI') GROUP BY DestAirportID  ORDER BY DestAirportID LIMIT 10"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE NASDelay BETWEEN 80 AND 36 AND DistanceGroup = 10 ORDER BY Distance, TailNum, Origin LIMIT 5"}
-{"sql":"SELECT DestAirportID, CRSDepTime, OriginStateName, SUM(TotalAddGTime) FROM mytable WHERE DivAirportIDs >= 14683 GROUP BY DestAirportID, CRSDepTime, OriginStateName LIMIT 8","hsqls":["SELECT DestAirportID, CRSDepTime, OriginStateName, SUM(TotalAddGTime) FROM mytable WHERE (DivAirportIDs__MV0 >= 14683 OR DivAirportIDs__MV1 >= 14683 OR DivAirportIDs__MV2 >= 14683 OR DivAirportIDs__MV3 >= 14683 OR DivAirportIDs__MV4 >= 14683) GROUP BY DestAirportID, CRSDepTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, CRSDepTime, OriginStateName, SUM(TotalAddGTime) FROM mytable WHERE DivAirportIDs >= 14683 GROUP BY DestAirportID, CRSDepTime, OriginStateName LIMIT 8","hsqls":["SELECT DestAirportID, CRSDepTime, OriginStateName, SUM(TotalAddGTime) FROM mytable WHERE (DivAirportIDs[1] >= 14683 OR DivAirportIDs[2] >= 14683 OR DivAirportIDs[3] >= 14683 OR DivAirportIDs[4] >= 14683 OR DivAirportIDs[5] >= 14683) GROUP BY DestAirportID, CRSDepTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Carrier, FlightNum, COUNT(*) FROM mytable WHERE DepDel15 <> -9999 AND OriginState BETWEEN 'WA' AND 'ME' GROUP BY Carrier, FlightNum  ORDER BY Carrier, FlightNum LIMIT 5","hsqls":["SELECT Carrier, FlightNum, COUNT(*) FROM mytable WHERE DepDel15 <> -9999 AND OriginState BETWEEN 'WA' AND 'ME' GROUP BY Carrier, FlightNum  ORDER BY Carrier, FlightNum LIMIT 5"]}
 {"sql":"SELECT DepDel15 FROM mytable LIMIT 27"}
-{"sql":"SELECT AVG(ArrDel15) FROM mytable WHERE DivWheelsOffs >= 1610 LIMIT 13","hsqls":["SELECT AVG(CAST(ArrDel15 AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs__MV0 >= 1610 OR DivWheelsOffs__MV1 >= 1610 OR DivWheelsOffs__MV2 >= 1610 OR DivWheelsOffs__MV3 >= 1610 OR DivWheelsOffs__MV4 >= 1610) LIMIT 10000"]}
-{"sql":"SELECT Flights, DivWheelsOffs, DaysSinceEpoch FROM mytable WHERE DepTime BETWEEN 903 AND 822 OR Flights NOT IN (1) ORDER BY DistanceGroup, Diverted, \"Month\" LIMIT 26","hsqls":["SELECT Flights, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DaysSinceEpoch FROM mytable WHERE DepTime BETWEEN 903 AND 822 OR Flights NOT IN (1) ORDER BY DistanceGroup, Diverted, Month LIMIT 10000"]}
+{"sql":"SELECT AVG(ArrDel15) FROM mytable WHERE DivWheelsOffs >= 1610 LIMIT 13","hsqls":["SELECT AVG(CAST(ArrDel15 AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs[1] >= 1610 OR DivWheelsOffs[2] >= 1610 OR DivWheelsOffs[3] >= 1610 OR DivWheelsOffs[4] >= 1610 OR DivWheelsOffs[5] >= 1610) LIMIT 10000"]}
+{"sql":"SELECT Flights, DivWheelsOffs, DaysSinceEpoch FROM mytable WHERE DepTime BETWEEN 903 AND 822 OR Flights NOT IN (1) ORDER BY DistanceGroup, Diverted, \"Month\" LIMIT 26","hsqls":["SELECT Flights, DivWheelsOffs, DaysSinceEpoch FROM mytable WHERE DepTime BETWEEN 903 AND 822 OR Flights NOT IN (1) ORDER BY DistanceGroup, Diverted, `Month` LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, COUNT(*) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 22","hsqls":["SELECT ArrDelayMinutes, COUNT(*) FROM mytable GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 22"]}
-{"sql":"SELECT DivLongestGTimes, ArrDelayMinutes FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 LIMIT 16","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrDelayMinutes FROM mytable WHERE Month BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, ArrDelayMinutes FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 LIMIT 16","hsqls":["SELECT DivLongestGTimes, ArrDelayMinutes FROM mytable WHERE `Month` BETWEEN 1 AND 1 LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable ORDER BY DivDistance, Cancelled LIMIT 9"}
 {"sql":"SELECT OriginState, FlightDate FROM mytable ORDER BY DestState, CarrierDelay, DayOfWeek LIMIT 2"}
 {"sql":"SELECT MIN(OriginAirportID), COUNT(SecurityDelay) FROM mytable WHERE ArrTime < 2008 LIMIT 24"}
@@ -8079,79 +8079,79 @@
 {"sql":"SELECT TaxiOut, DestStateFips, SUM(DepDelayMinutes), COUNT(OriginState), MAX(OriginAirportID) FROM mytable GROUP BY TaxiOut, DestStateFips  ORDER BY TaxiOut, DestStateFips LIMIT 3","hsqls":["SELECT TaxiOut, DestStateFips, SUM(DepDelayMinutes), COUNT(OriginState), MAX(OriginAirportID) FROM mytable GROUP BY TaxiOut, DestStateFips  ORDER BY TaxiOut, DestStateFips LIMIT 3"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE ArrTime > 1111 LIMIT 3"}
 {"sql":"SELECT AVG(ArrTime), AVG(SecurityDelay), MAX(DivReachedDest) FROM mytable WHERE WheelsOff < 1546 OR DepTimeBlk < '2300-2359' OR DayofMonth <= 14 LIMIT 5"}
-{"sql":"SELECT DivAirports, Carrier, Cancelled FROM mytable WHERE OriginCityName < 'Fresno, CA' OR Quarter > 1 ORDER BY WheelsOn LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Carrier, Cancelled FROM mytable WHERE OriginCityName < 'Fresno, CA' OR Quarter > 1 ORDER BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivAirports, Carrier, Cancelled FROM mytable WHERE OriginCityName < 'Fresno, CA' OR Quarter > 1 ORDER BY WheelsOn LIMIT 2","hsqls":["SELECT DivAirports, Carrier, Cancelled FROM mytable WHERE OriginCityName < 'Fresno, CA' OR Quarter > 1 ORDER BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, DayofMonth FROM mytable ORDER BY ArrDelay LIMIT 26"}
-{"sql":"SELECT Distance, DestAirportID, MAX(TotalAddGTime), MIN(DepDel15), MIN(\"Month\") FROM mytable WHERE OriginStateFips NOT IN (55) GROUP BY Distance, DestAirportID LIMIT 19","hsqls":["SELECT Distance, DestAirportID, MAX(TotalAddGTime), MIN(DepDel15), MIN(Month) FROM mytable WHERE OriginStateFips NOT IN (55) GROUP BY Distance, DestAirportID LIMIT 19"]}
+{"sql":"SELECT Distance, DestAirportID, MAX(TotalAddGTime), MIN(DepDel15), MIN(\"Month\") FROM mytable WHERE OriginStateFips NOT IN (55) GROUP BY Distance, DestAirportID LIMIT 19","hsqls":["SELECT Distance, DestAirportID, MAX(TotalAddGTime), MIN(DepDel15), MIN(`Month`) FROM mytable WHERE OriginStateFips NOT IN (55) GROUP BY Distance, DestAirportID LIMIT 19"]}
 {"sql":"SELECT ArrDelay, OriginAirportID FROM mytable WHERE Diverted BETWEEN 0 AND 0 OR ArrTimeBlk NOT IN ('1700-1759', '1300-1359', '1800-1859') ORDER BY UniqueCarrier, CRSElapsedTime LIMIT 26"}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE DepDelayMinutes BETWEEN 95.0 AND 195.0 ORDER BY DaysSinceEpoch LIMIT 10"}
-{"sql":"SELECT LongestAddGTime, DestAirportSeqID, CRSDepTime, SUM(\"Month\") FROM mytable WHERE WheelsOn = 1935 AND DivReachedDest IN (0) OR LongestAddGTime BETWEEN 4 AND 97 GROUP BY LongestAddGTime, DestAirportSeqID, CRSDepTime LIMIT 3","hsqls":["SELECT LongestAddGTime, DestAirportSeqID, CRSDepTime, SUM(Month) FROM mytable WHERE WheelsOn = 1935 AND DivReachedDest IN (0) OR LongestAddGTime BETWEEN 4 AND 97 GROUP BY LongestAddGTime, DestAirportSeqID, CRSDepTime LIMIT 3"]}
+{"sql":"SELECT LongestAddGTime, DestAirportSeqID, CRSDepTime, SUM(\"Month\") FROM mytable WHERE WheelsOn = 1935 AND DivReachedDest IN (0) OR LongestAddGTime BETWEEN 4 AND 97 GROUP BY LongestAddGTime, DestAirportSeqID, CRSDepTime LIMIT 3","hsqls":["SELECT LongestAddGTime, DestAirportSeqID, CRSDepTime, SUM(`Month`) FROM mytable WHERE WheelsOn = 1935 AND DivReachedDest IN (0) OR LongestAddGTime BETWEEN 4 AND 97 GROUP BY LongestAddGTime, DestAirportSeqID, CRSDepTime LIMIT 3"]}
 {"sql":"SELECT DestState, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N17730', 'N531MQ', 'N24706', 'N15948', 'N837AW') AND DivReachedDest BETWEEN 0 AND 0 GROUP BY DestState  ORDER BY DestState LIMIT 26","hsqls":["SELECT DestState, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N17730', 'N531MQ', 'N24706', 'N15948', 'N837AW') AND DivReachedDest BETWEEN 0 AND 0 GROUP BY DestState  ORDER BY DestState LIMIT 26"]}
-{"sql":"SELECT DivAirportSeqIDs, DestAirportID, DayOfWeek FROM mytable ORDER BY OriginCityMarketID, DestAirportSeqID, OriginAirportID LIMIT 28","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestAirportID, DayOfWeek FROM mytable ORDER BY OriginCityMarketID, DestAirportSeqID, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs, NASDelay, DivWheelsOffs FROM mytable WHERE TaxiOut <= 18 AND CancellationCode <= 'C' AND DestState <= 'OR' ORDER BY Cancelled, DayofMonth, DivActualElapsedTime LIMIT 14","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, NASDelay, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE TaxiOut <= 18 AND CancellationCode <= 'C' AND DestState <= 'OR' ORDER BY Cancelled, DayofMonth, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE DepDelayMinutes BETWEEN 83.0 AND 253.0 OR DivWheelsOns IN (2146, 1808, 1235) OR OriginAirportID IN (13158, 10874) ORDER BY DepDelay, UniqueCarrier LIMIT 20","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DepDelayMinutes BETWEEN 83.0 AND 253.0 OR (DivWheelsOns__MV0 IN (2146, 1808, 1235) OR DivWheelsOns__MV1 IN (2146, 1808, 1235) OR DivWheelsOns__MV2 IN (2146, 1808, 1235) OR DivWheelsOns__MV3 IN (2146, 1808, 1235) OR DivWheelsOns__MV4 IN (2146, 1808, 1235)) OR OriginAirportID IN (13158, 10874) ORDER BY DepDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestAirportID, DayOfWeek FROM mytable ORDER BY OriginCityMarketID, DestAirportSeqID, OriginAirportID LIMIT 28","hsqls":["SELECT DivAirportSeqIDs, DestAirportID, DayOfWeek FROM mytable ORDER BY OriginCityMarketID, DestAirportSeqID, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, NASDelay, DivWheelsOffs FROM mytable WHERE TaxiOut <= 18 AND CancellationCode <= 'C' AND DestState <= 'OR' ORDER BY Cancelled, DayofMonth, DivActualElapsedTime LIMIT 14","hsqls":["SELECT DivAirportIDs, NASDelay, DivWheelsOffs FROM mytable WHERE TaxiOut <= 18 AND CancellationCode <= 'C' AND DestState <= 'OR' ORDER BY Cancelled, DayofMonth, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DepDelayMinutes BETWEEN 83.0 AND 253.0 OR DivWheelsOns IN (2146, 1808, 1235) OR OriginAirportID IN (13158, 10874) ORDER BY DepDelay, UniqueCarrier LIMIT 20","hsqls":["SELECT DivAirports FROM mytable WHERE DepDelayMinutes BETWEEN 83.0 AND 253.0 OR (DivWheelsOns[1] IN (2146, 1808, 1235) OR DivWheelsOns[2] IN (2146, 1808, 1235) OR DivWheelsOns[3] IN (2146, 1808, 1235) OR DivWheelsOns[4] IN (2146, 1808, 1235) OR DivWheelsOns[5] IN (2146, 1808, 1235)) OR OriginAirportID IN (13158, 10874) ORDER BY DepDelay, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT OriginState, Distance, Cancelled, SUM(Cancelled) FROM mytable GROUP BY OriginState, Distance, Cancelled","hsqls":["SELECT OriginState, Distance, Cancelled, SUM(Cancelled) FROM mytable GROUP BY OriginState, Distance, Cancelled"]}
 {"sql":"SELECT OriginCityName, CRSDepTime, OriginStateName FROM mytable ORDER BY TaxiOut, LongestAddGTime LIMIT 5"}
 {"sql":"SELECT OriginCityName FROM mytable ORDER BY FirstDepTime LIMIT 1"}
-{"sql":"SELECT CarrierDelay, DestCityName FROM mytable WHERE UniqueCarrier = 'EV' AND DaysSinceEpoch BETWEEN 16100 AND 16092 OR DivAirportSeqIDs IN (1410803) ORDER BY DivDistance, DivArrDelay LIMIT 1","hsqls":["SELECT CarrierDelay, DestCityName FROM mytable WHERE UniqueCarrier = 'EV' AND DaysSinceEpoch BETWEEN 16100 AND 16092 OR (DivAirportSeqIDs__MV0 IN (1410803) OR DivAirportSeqIDs__MV1 IN (1410803) OR DivAirportSeqIDs__MV2 IN (1410803) OR DivAirportSeqIDs__MV3 IN (1410803) OR DivAirportSeqIDs__MV4 IN (1410803)) ORDER BY DivDistance, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, DestCityName FROM mytable WHERE UniqueCarrier = 'EV' AND DaysSinceEpoch BETWEEN 16100 AND 16092 OR DivAirportSeqIDs IN (1410803) ORDER BY DivDistance, DivArrDelay LIMIT 1","hsqls":["SELECT CarrierDelay, DestCityName FROM mytable WHERE UniqueCarrier = 'EV' AND DaysSinceEpoch BETWEEN 16100 AND 16092 OR (DivAirportSeqIDs[1] IN (1410803) OR DivAirportSeqIDs[2] IN (1410803) OR DivAirportSeqIDs[3] IN (1410803) OR DivAirportSeqIDs[4] IN (1410803) OR DivAirportSeqIDs[5] IN (1410803)) ORDER BY DivDistance, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT COUNT(TaxiIn) FROM mytable WHERE CRSElapsedTime BETWEEN 205 AND 309 OR AirTime BETWEEN 302 AND 397 LIMIT 20"}
-{"sql":"SELECT DistanceGroup FROM mytable WHERE OriginState BETWEEN 'CT' AND 'SC' OR DivAirportIDs IN (10299, 15376, 13796) OR DestCityName IN ('Santa Barbara, CA', 'Brunswick, GA', 'Muskegon, MI', 'Kahului, HI') ORDER BY OriginAirportSeqID, TailNum LIMIT 10","hsqls":["SELECT DistanceGroup FROM mytable WHERE OriginState BETWEEN 'CT' AND 'SC' OR (DivAirportIDs__MV0 IN (10299, 15376, 13796) OR DivAirportIDs__MV1 IN (10299, 15376, 13796) OR DivAirportIDs__MV2 IN (10299, 15376, 13796) OR DivAirportIDs__MV3 IN (10299, 15376, 13796) OR DivAirportIDs__MV4 IN (10299, 15376, 13796)) OR DestCityName IN ('Santa Barbara, CA', 'Brunswick, GA', 'Muskegon, MI', 'Kahului, HI') ORDER BY OriginAirportSeqID, TailNum LIMIT 10000"]}
-{"sql":"SELECT SUM(CRSArrTime), AVG(Distance), COUNT(AirlineID) FROM mytable WHERE DivAirports BETWEEN 'DSM' AND 'IMT' AND OriginState IN ('GA', 'MO', 'WI') AND DivDistance BETWEEN 239 AND 55 LIMIT 17","hsqls":["SELECT SUM(CRSArrTime), AVG(Distance), COUNT(AirlineID)  FROM mytable WHERE (DivAirports__MV0 BETWEEN 'DSM' AND 'IMT' OR DivAirports__MV1 BETWEEN 'DSM' AND 'IMT' OR DivAirports__MV2 BETWEEN 'DSM' AND 'IMT' OR DivAirports__MV3 BETWEEN 'DSM' AND 'IMT' OR DivAirports__MV4 BETWEEN 'DSM' AND 'IMT') AND OriginState IN ('GA', 'MO', 'WI') AND DivDistance BETWEEN 239 AND 55 LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup FROM mytable WHERE OriginState BETWEEN 'CT' AND 'SC' OR DivAirportIDs IN (10299, 15376, 13796) OR DestCityName IN ('Santa Barbara, CA', 'Brunswick, GA', 'Muskegon, MI', 'Kahului, HI') ORDER BY OriginAirportSeqID, TailNum LIMIT 10","hsqls":["SELECT DistanceGroup FROM mytable WHERE OriginState BETWEEN 'CT' AND 'SC' OR (DivAirportIDs[1] IN (10299, 15376, 13796) OR DivAirportIDs[2] IN (10299, 15376, 13796) OR DivAirportIDs[3] IN (10299, 15376, 13796) OR DivAirportIDs[4] IN (10299, 15376, 13796) OR DivAirportIDs[5] IN (10299, 15376, 13796)) OR DestCityName IN ('Santa Barbara, CA', 'Brunswick, GA', 'Muskegon, MI', 'Kahului, HI') ORDER BY OriginAirportSeqID, TailNum LIMIT 10000"]}
+{"sql":"SELECT SUM(CRSArrTime), AVG(Distance), COUNT(AirlineID) FROM mytable WHERE DivAirports BETWEEN 'DSM' AND 'IMT' AND OriginState IN ('GA', 'MO', 'WI') AND DivDistance BETWEEN 239 AND 55 LIMIT 17","hsqls":["SELECT SUM(CRSArrTime), AVG(Distance), COUNT(AirlineID)  FROM mytable WHERE (DivAirports[1] BETWEEN 'DSM' AND 'IMT' OR DivAirports[2] BETWEEN 'DSM' AND 'IMT' OR DivAirports[3] BETWEEN 'DSM' AND 'IMT' OR DivAirports[4] BETWEEN 'DSM' AND 'IMT' OR DivAirports[5] BETWEEN 'DSM' AND 'IMT') AND OriginState IN ('GA', 'MO', 'WI') AND DivDistance BETWEEN 239 AND 55 LIMIT 10000"]}
 {"sql":"SELECT Distance FROM mytable ORDER BY DepTime, ArrDelayMinutes, DivAirportLandings LIMIT 22"}
 {"sql":"SELECT OriginState, DepDel15, MAX(SecurityDelay), AVG(SecurityDelay), MIN(LongestAddGTime) FROM mytable WHERE DepartureDelayGroups >= 11 GROUP BY OriginState, DepDel15  ORDER BY OriginState, DepDel15 LIMIT 14","hsqls":["SELECT OriginState, DepDel15, MAX(SecurityDelay), AVG(SecurityDelay), MIN(LongestAddGTime) FROM mytable WHERE DepartureDelayGroups >= 11 GROUP BY OriginState, DepDel15  ORDER BY OriginState, DepDel15 LIMIT 14"]}
 {"sql":"SELECT AVG(OriginStateFips), MIN(Distance), AVG(DestWac) FROM mytable WHERE ArrDel15 = -9999 OR OriginStateFips NOT IN (1, 41, 56, 72) LIMIT 28"}
-{"sql":"SELECT OriginCityName FROM mytable WHERE DivAirports IN ('ANC', 'BUF', 'MDW') AND DepDel15 >= -9999 ORDER BY DistanceGroup, DivArrDelay, CRSDepTime LIMIT 29","hsqls":["SELECT OriginCityName FROM mytable WHERE (DivAirports__MV0 IN ('ANC', 'BUF', 'MDW') OR DivAirports__MV1 IN ('ANC', 'BUF', 'MDW') OR DivAirports__MV2 IN ('ANC', 'BUF', 'MDW') OR DivAirports__MV3 IN ('ANC', 'BUF', 'MDW') OR DivAirports__MV4 IN ('ANC', 'BUF', 'MDW')) AND DepDel15 >= -9999 ORDER BY DistanceGroup, DivArrDelay, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE DivAirports IN ('ANC', 'BUF', 'MDW') AND DepDel15 >= -9999 ORDER BY DistanceGroup, DivArrDelay, CRSDepTime LIMIT 29","hsqls":["SELECT OriginCityName FROM mytable WHERE (DivAirports[1] IN ('ANC', 'BUF', 'MDW') OR DivAirports[2] IN ('ANC', 'BUF', 'MDW') OR DivAirports[3] IN ('ANC', 'BUF', 'MDW') OR DivAirports[4] IN ('ANC', 'BUF', 'MDW') OR DivAirports[5] IN ('ANC', 'BUF', 'MDW')) AND DepDel15 >= -9999 ORDER BY DistanceGroup, DivArrDelay, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, TaxiIn FROM mytable WHERE DestStateName BETWEEN 'Delaware' AND 'Oklahoma' ORDER BY OriginCityName, TaxiIn LIMIT 24"}
-{"sql":"SELECT DivAirports FROM mytable WHERE ArrDelay BETWEEN 55.0 AND 241.0 OR CRSElapsedTime BETWEEN 210 AND 146 ORDER BY Flights, ActualElapsedTime, DivAirportLandings LIMIT 5","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE ArrDelay BETWEEN 55.0 AND 241.0 OR CRSElapsedTime BETWEEN 210 AND 146 ORDER BY Flights, ActualElapsedTime, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE ArrDelay BETWEEN 55.0 AND 241.0 OR CRSElapsedTime BETWEEN 210 AND 146 ORDER BY Flights, ActualElapsedTime, DivAirportLandings LIMIT 5","hsqls":["SELECT DivAirports FROM mytable WHERE ArrDelay BETWEEN 55.0 AND 241.0 OR CRSElapsedTime BETWEEN 210 AND 146 ORDER BY Flights, ActualElapsedTime, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, UniqueCarrier, MAX(FirstDepTime), MIN(DayofMonth) FROM mytable WHERE FlightNum IN (4706, 4814, 1253) AND Quarter BETWEEN 1 AND 1 AND Flights > 1 GROUP BY DivReachedDest, UniqueCarrier  ORDER BY DivReachedDest, UniqueCarrier LIMIT 16","hsqls":["SELECT DivReachedDest, UniqueCarrier, MAX(FirstDepTime), MIN(DayofMonth) FROM mytable WHERE FlightNum IN (4706, 4814, 1253) AND Quarter BETWEEN 1 AND 1 AND Flights > 1 GROUP BY DivReachedDest, UniqueCarrier  ORDER BY DivReachedDest, UniqueCarrier LIMIT 16"]}
 {"sql":"SELECT ActualElapsedTime, TailNum, DestAirportID, MAX(WheelsOff), MAX(CRSElapsedTime) FROM mytable GROUP BY ActualElapsedTime, TailNum, DestAirportID  ORDER BY ActualElapsedTime, TailNum, DestAirportID LIMIT 28","hsqls":["SELECT ActualElapsedTime, TailNum, DestAirportID, MAX(WheelsOff), MAX(CRSElapsedTime) FROM mytable GROUP BY ActualElapsedTime, TailNum, DestAirportID  ORDER BY ActualElapsedTime, TailNum, DestAirportID LIMIT 28"]}
-{"sql":"SELECT DepTime FROM mytable WHERE WheelsOff > 1128 OR DivTailNums IN ('N560UW', 'N486WN') OR Cancelled > 1 ORDER BY FirstDepTime, ArrDel15 LIMIT 28","hsqls":["SELECT DepTime FROM mytable WHERE WheelsOff > 1128 OR (DivTailNums__MV0 IN ('N560UW', 'N486WN') OR DivTailNums__MV1 IN ('N560UW', 'N486WN') OR DivTailNums__MV2 IN ('N560UW', 'N486WN') OR DivTailNums__MV3 IN ('N560UW', 'N486WN') OR DivTailNums__MV4 IN ('N560UW', 'N486WN')) OR Cancelled > 1 ORDER BY FirstDepTime, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DepTime FROM mytable WHERE WheelsOff > 1128 OR DivTailNums IN ('N560UW', 'N486WN') OR Cancelled > 1 ORDER BY FirstDepTime, ArrDel15 LIMIT 28","hsqls":["SELECT DepTime FROM mytable WHERE WheelsOff > 1128 OR (DivTailNums[1] IN ('N560UW', 'N486WN') OR DivTailNums[2] IN ('N560UW', 'N486WN') OR DivTailNums[3] IN ('N560UW', 'N486WN') OR DivTailNums[4] IN ('N560UW', 'N486WN') OR DivTailNums[5] IN ('N560UW', 'N486WN')) OR Cancelled > 1 ORDER BY FirstDepTime, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT TailNum, SUM(DivReachedDest) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 3","hsqls":["SELECT TailNum, SUM(DivReachedDest) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 3"]}
 {"sql":"SELECT MAX(CRSArrTime) FROM mytable LIMIT 16"}
-{"sql":"SELECT DivTailNums, DivAirportIDs FROM mytable WHERE OriginAirportID BETWEEN 14027 AND 10868 OR CRSElapsedTime NOT IN (180, 82) ORDER BY DepartureDelayGroups, Origin LIMIT 24","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginAirportID BETWEEN 14027 AND 10868 OR CRSElapsedTime NOT IN (180, 82) ORDER BY DepartureDelayGroups, Origin LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, \"Month\", AVG(TaxiOut), MIN(DivArrDelay), AVG(ArrivalDelayGroups) FROM mytable WHERE OriginStateFips > 44 OR WheelsOff <= 1756 GROUP BY DepDelayMinutes, \"Month\" LIMIT 9","hsqls":["SELECT DepDelayMinutes, Month, AVG(TaxiOut), MIN(DivArrDelay), AVG(ArrivalDelayGroups) FROM mytable WHERE OriginStateFips > 44 OR WheelsOff <= 1756 GROUP BY DepDelayMinutes, Month LIMIT 9"]}
+{"sql":"SELECT DivTailNums, DivAirportIDs FROM mytable WHERE OriginAirportID BETWEEN 14027 AND 10868 OR CRSElapsedTime NOT IN (180, 82) ORDER BY DepartureDelayGroups, Origin LIMIT 24","hsqls":["SELECT DivTailNums, DivAirportIDs FROM mytable WHERE OriginAirportID BETWEEN 14027 AND 10868 OR CRSElapsedTime NOT IN (180, 82) ORDER BY DepartureDelayGroups, Origin LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, \"Month\", AVG(TaxiOut), MIN(DivArrDelay), AVG(ArrivalDelayGroups) FROM mytable WHERE OriginStateFips > 44 OR WheelsOff <= 1756 GROUP BY DepDelayMinutes, \"Month\" LIMIT 9","hsqls":["SELECT DepDelayMinutes, Month, AVG(TaxiOut), MIN(DivArrDelay), AVG(ArrivalDelayGroups) FROM mytable WHERE OriginStateFips > 44 OR WheelsOff <= 1756 GROUP BY DepDelayMinutes, `Month` LIMIT 9"]}
 {"sql":"SELECT Quarter, FlightDate, DivActualElapsedTime, COUNT(DestAirportSeqID), SUM(AirlineID), COUNT(CRSArrTime) FROM mytable WHERE DaysSinceEpoch >= 16085 OR TaxiOut >= 24 GROUP BY Quarter, FlightDate, DivActualElapsedTime  ORDER BY Quarter, FlightDate, DivActualElapsedTime LIMIT 26","hsqls":["SELECT Quarter, FlightDate, DivActualElapsedTime, COUNT(DestAirportSeqID), SUM(AirlineID), COUNT(CRSArrTime) FROM mytable WHERE DaysSinceEpoch >= 16085 OR TaxiOut >= 24 GROUP BY Quarter, FlightDate, DivActualElapsedTime  ORDER BY Quarter, FlightDate, DivActualElapsedTime LIMIT 26"]}
-{"sql":"SELECT DestCityName, DivTotalGTimes FROM mytable LIMIT 10","hsqls":["SELECT DestCityName, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DestCityName, DivTotalGTimes FROM mytable LIMIT 10","hsqls":["SELECT DestCityName, DivTotalGTimes FROM mytable LIMIT 10000"]}
 {"sql":"SELECT TailNum, SUM(ArrDelayMinutes), MIN(DepartureDelayGroups), COUNT(LongestAddGTime) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 1","hsqls":["SELECT TailNum, SUM(ArrDelayMinutes), MIN(DepartureDelayGroups), COUNT(LongestAddGTime) FROM mytable GROUP BY TailNum  ORDER BY TailNum LIMIT 1"]}
 {"sql":"SELECT UniqueCarrier, SUM(DaysSinceEpoch) FROM mytable WHERE FlightDate NOT IN ('2014-01-20', '2014-01-30') AND OriginCityName BETWEEN 'Tallahassee, FL' AND 'Crescent City, CA' AND ArrivalDelayGroups IN (3, 7, 4) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 13","hsqls":["SELECT UniqueCarrier, SUM(DaysSinceEpoch) FROM mytable WHERE FlightDate NOT IN ('2014-01-20', '2014-01-30') AND OriginCityName BETWEEN 'Tallahassee, FL' AND 'Crescent City, CA' AND ArrivalDelayGroups IN (3, 7, 4) GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 13"]}
 {"sql":"SELECT DivAirportLandings FROM mytable ORDER BY DivReachedDest, WheelsOn LIMIT 24"}
 {"sql":"SELECT LongestAddGTime, Dest, MAX(FirstDepTime) FROM mytable WHERE ArrDelayMinutes BETWEEN 173.0 AND 148.0 GROUP BY LongestAddGTime, Dest  ORDER BY LongestAddGTime, Dest LIMIT 10","hsqls":["SELECT LongestAddGTime, Dest, MAX(FirstDepTime) FROM mytable WHERE ArrDelayMinutes BETWEEN 173.0 AND 148.0 GROUP BY LongestAddGTime, Dest  ORDER BY LongestAddGTime, Dest LIMIT 10"]}
-{"sql":"SELECT COUNT(AirTime), MIN(\"Month\"), MIN(OriginCityMarketID) FROM mytable WHERE DepTimeBlk NOT IN ('1600-1659', '0700-0759', '2100-2159', '0900-0959') LIMIT 24","hsqls":["SELECT COUNT(AirTime), MIN(Month), MIN(OriginCityMarketID) FROM mytable WHERE DepTimeBlk NOT IN ('1600-1659', '0700-0759', '2100-2159', '0900-0959') LIMIT 24"]}
-{"sql":"SELECT CRSArrTime, AVG(SecurityDelay), MIN(DistanceGroup) FROM mytable WHERE DepDelayMinutes IN (230.0, 89.0, 79.0) AND DivAirports IN ('ABI') OR ArrTimeBlk IN ('2300-2359') GROUP BY CRSArrTime LIMIT 23","hsqls":["SELECT CRSArrTime, AVG(SecurityDelay), MIN(DistanceGroup) FROM mytable WHERE DepDelayMinutes IN (230.0, 89.0, 79.0) AND (DivAirports__MV0 IN ('ABI') OR DivAirports__MV1 IN ('ABI') OR DivAirports__MV2 IN ('ABI') OR DivAirports__MV3 IN ('ABI') OR DivAirports__MV4 IN ('ABI')) OR ArrTimeBlk IN ('2300-2359') GROUP BY CRSArrTime LIMIT 10000"]}
-{"sql":"SELECT MIN(DivActualElapsedTime), AVG(AirlineID), AVG(OriginCityMarketID) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR OriginState IN ('WY', 'VT', 'OR', 'HI') AND DepartureDelayGroups BETWEEN 5 AND 9 LIMIT 2","hsqls":["SELECT MIN(DivActualElapsedTime), AVG(AirlineID), AVG(OriginCityMarketID) FROM mytable WHERE Month BETWEEN 1 AND 1 OR OriginState IN ('WY', 'VT', 'OR', 'HI') AND DepartureDelayGroups BETWEEN 5 AND 9 LIMIT 2"]}
-{"sql":"SELECT MIN(AirTime), SUM(DepDel15), SUM(DestStateFips) FROM mytable WHERE DivTailNums IN ('N873AS')","hsqls":["SELECT MIN(AirTime), SUM(DepDel15), SUM(DestStateFips)  FROM mytable WHERE (DivTailNums__MV0 IN ('N873AS') OR DivTailNums__MV1 IN ('N873AS') OR DivTailNums__MV2 IN ('N873AS') OR DivTailNums__MV3 IN ('N873AS') OR DivTailNums__MV4 IN ('N873AS')) LIMIT 10000"]}
-{"sql":"SELECT DestWac, DivLongestGTimes FROM mytable WHERE DivArrDelay IN (399, 880, 207) OR Distance BETWEEN 213 AND 1045 OR DivActualElapsedTime NOT IN (392, 358, 868, 237) ORDER BY AirTime, DivArrDelay, CRSElapsedTime LIMIT 11","hsqls":["SELECT DestWac, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE DivArrDelay IN (399, 880, 207) OR Distance BETWEEN 213 AND 1045 OR DivActualElapsedTime NOT IN (392, 358, 868, 237) ORDER BY AirTime, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT COUNT(AirTime), MIN(\"Month\"), MIN(OriginCityMarketID) FROM mytable WHERE DepTimeBlk NOT IN ('1600-1659', '0700-0759', '2100-2159', '0900-0959') LIMIT 24","hsqls":["SELECT COUNT(AirTime), MIN(`Month`), MIN(OriginCityMarketID) FROM mytable WHERE DepTimeBlk NOT IN ('1600-1659', '0700-0759', '2100-2159', '0900-0959') LIMIT 24"]}
+{"sql":"SELECT CRSArrTime, AVG(SecurityDelay), MIN(DistanceGroup) FROM mytable WHERE DepDelayMinutes IN (230.0, 89.0, 79.0) AND DivAirports IN ('ABI') OR ArrTimeBlk IN ('2300-2359') GROUP BY CRSArrTime LIMIT 23","hsqls":["SELECT CRSArrTime, AVG(SecurityDelay), MIN(DistanceGroup) FROM mytable WHERE DepDelayMinutes IN (230.0, 89.0, 79.0) AND (DivAirports[1] IN ('ABI') OR DivAirports[2] IN ('ABI') OR DivAirports[3] IN ('ABI') OR DivAirports[4] IN ('ABI') OR DivAirports[5] IN ('ABI')) OR ArrTimeBlk IN ('2300-2359') GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT MIN(DivActualElapsedTime), AVG(AirlineID), AVG(OriginCityMarketID) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 OR OriginState IN ('WY', 'VT', 'OR', 'HI') AND DepartureDelayGroups BETWEEN 5 AND 9 LIMIT 2","hsqls":["SELECT MIN(DivActualElapsedTime), AVG(AirlineID), AVG(OriginCityMarketID) FROM mytable WHERE `Month` BETWEEN 1 AND 1 OR OriginState IN ('WY', 'VT', 'OR', 'HI') AND DepartureDelayGroups BETWEEN 5 AND 9 LIMIT 2"]}
+{"sql":"SELECT MIN(AirTime), SUM(DepDel15), SUM(DestStateFips) FROM mytable WHERE DivTailNums IN ('N873AS')","hsqls":["SELECT MIN(AirTime), SUM(DepDel15), SUM(DestStateFips)  FROM mytable WHERE (DivTailNums[1] IN ('N873AS') OR DivTailNums[2] IN ('N873AS') OR DivTailNums[3] IN ('N873AS') OR DivTailNums[4] IN ('N873AS') OR DivTailNums[5] IN ('N873AS')) LIMIT 10000"]}
+{"sql":"SELECT DestWac, DivLongestGTimes FROM mytable WHERE DivArrDelay IN (399, 880, 207) OR Distance BETWEEN 213 AND 1045 OR DivActualElapsedTime NOT IN (392, 358, 868, 237) ORDER BY AirTime, DivArrDelay, CRSElapsedTime LIMIT 11","hsqls":["SELECT DestWac, DivLongestGTimes FROM mytable WHERE DivArrDelay IN (399, 880, 207) OR Distance BETWEEN 213 AND 1045 OR DivActualElapsedTime NOT IN (392, 358, 868, 237) ORDER BY AirTime, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, TaxiIn, SUM(ActualElapsedTime), AVG(ArrivalDelayGroups), MIN(WheelsOff) FROM mytable WHERE DivDistance BETWEEN 391 AND 95 OR ActualElapsedTime BETWEEN 239 AND 413 OR Diverted NOT IN (1, 0) GROUP BY DivReachedDest, TaxiIn  ORDER BY DivReachedDest, TaxiIn LIMIT 29","hsqls":["SELECT DivReachedDest, TaxiIn, SUM(ActualElapsedTime), AVG(ArrivalDelayGroups), MIN(WheelsOff) FROM mytable WHERE DivDistance BETWEEN 391 AND 95 OR ActualElapsedTime BETWEEN 239 AND 413 OR Diverted NOT IN (1, 0) GROUP BY DivReachedDest, TaxiIn  ORDER BY DivReachedDest, TaxiIn LIMIT 29"]}
 {"sql":"SELECT ArrTime, DestCityMarketID, COUNT(DayOfWeek), COUNT(OriginStateName), AVG(DivAirportLandings) FROM mytable WHERE UniqueCarrier <> 'B6' OR DestWac IN (3, 44, 35, 23, 73) GROUP BY ArrTime, DestCityMarketID  ORDER BY ArrTime, DestCityMarketID LIMIT 12","hsqls":["SELECT ArrTime, DestCityMarketID, COUNT(DayOfWeek), COUNT(OriginStateName), AVG(DivAirportLandings) FROM mytable WHERE UniqueCarrier <> 'B6' OR DestWac IN (3, 44, 35, 23, 73) GROUP BY ArrTime, DestCityMarketID  ORDER BY ArrTime, DestCityMarketID LIMIT 12"]}
 {"sql":"SELECT FlightNum, ArrTime, ArrivalDelayGroups, MAX(LongestAddGTime), MAX(SecurityDelay), AVG(DivAirportLandings) FROM mytable WHERE DepDelayMinutes IN (31.0, 237.0, 286.0) OR DivDistance > 395 GROUP BY FlightNum, ArrTime, ArrivalDelayGroups  ORDER BY FlightNum, ArrTime, ArrivalDelayGroups LIMIT 15","hsqls":["SELECT FlightNum, ArrTime, ArrivalDelayGroups, MAX(LongestAddGTime), MAX(SecurityDelay), AVG(DivAirportLandings) FROM mytable WHERE DepDelayMinutes IN (31.0, 237.0, 286.0) OR DivDistance > 395 GROUP BY FlightNum, ArrTime, ArrivalDelayGroups  ORDER BY FlightNum, ArrTime, ArrivalDelayGroups LIMIT 15"]}
 {"sql":"SELECT TaxiIn, DepTimeBlk, COUNT(*) FROM mytable WHERE DivActualElapsedTime >= 175 OR CRSDepTime >= 1311 OR AirTime NOT IN (250, 95, 115, 254, 273) GROUP BY TaxiIn, DepTimeBlk  ORDER BY TaxiIn, DepTimeBlk LIMIT 7","hsqls":["SELECT TaxiIn, DepTimeBlk, COUNT(*) FROM mytable WHERE DivActualElapsedTime >= 175 OR CRSDepTime >= 1311 OR AirTime NOT IN (250, 95, 115, 254, 273) GROUP BY TaxiIn, DepTimeBlk  ORDER BY TaxiIn, DepTimeBlk LIMIT 7"]}
-{"sql":"SELECT TaxiIn, CRSElapsedTime, COUNT(*) FROM mytable WHERE \"Year\" NOT IN (2014) GROUP BY TaxiIn, CRSElapsedTime","hsqls":["SELECT TaxiIn, CRSElapsedTime, COUNT(*) FROM mytable WHERE Year NOT IN (2014) GROUP BY TaxiIn, CRSElapsedTime"]}
+{"sql":"SELECT TaxiIn, CRSElapsedTime, COUNT(*) FROM mytable WHERE \"Year\" NOT IN (2014) GROUP BY TaxiIn, CRSElapsedTime","hsqls":["SELECT TaxiIn, CRSElapsedTime, COUNT(*) FROM mytable WHERE `Year` NOT IN (2014) GROUP BY TaxiIn, CRSElapsedTime"]}
 {"sql":"SELECT WheelsOn, CRSDepTime, OriginAirportID FROM mytable WHERE Origin BETWEEN 'ATW' AND 'MYR' ORDER BY Diverted, DayOfWeek LIMIT 24"}
-{"sql":"SELECT DivReachedDest, TotalAddGTime, OriginStateName, AVG(TotalAddGTime), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE DivWheelsOns > 6 OR DayofMonth < 28 AND AirlineID BETWEEN 19930 AND 19690 GROUP BY DivReachedDest, TotalAddGTime, OriginStateName LIMIT 29","hsqls":["SELECT DivReachedDest, TotalAddGTime, OriginStateName, AVG(TotalAddGTime), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE (DivWheelsOns__MV0 > 6 OR DivWheelsOns__MV1 > 6 OR DivWheelsOns__MV2 > 6 OR DivWheelsOns__MV3 > 6 OR DivWheelsOns__MV4 > 6) OR DayofMonth < 28 AND AirlineID BETWEEN 19930 AND 19690 GROUP BY DivReachedDest, TotalAddGTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, TotalAddGTime, OriginStateName, AVG(TotalAddGTime), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE DivWheelsOns > 6 OR DayofMonth < 28 AND AirlineID BETWEEN 19930 AND 19690 GROUP BY DivReachedDest, TotalAddGTime, OriginStateName LIMIT 29","hsqls":["SELECT DivReachedDest, TotalAddGTime, OriginStateName, AVG(TotalAddGTime), MAX(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE (DivWheelsOns[1] > 6 OR DivWheelsOns[2] > 6 OR DivWheelsOns[3] > 6 OR DivWheelsOns[4] > 6 OR DivWheelsOns[5] > 6) OR DayofMonth < 28 AND AirlineID BETWEEN 19930 AND 19690 GROUP BY DivReachedDest, TotalAddGTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE Distance BETWEEN 2565 AND 489 OR WheelsOff BETWEEN 140 AND 1623 AND DepTimeBlk >= '0600-0659' GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 29","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE Distance BETWEEN 2565 AND 489 OR WheelsOff BETWEEN 140 AND 1623 AND DepTimeBlk >= '0600-0659' GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 29"]}
 {"sql":"SELECT OriginCityMarketID, DepTimeBlk FROM mytable WHERE DestStateName BETWEEN 'Kansas' AND 'Utah' OR DepDelay = -11.0 ORDER BY Diverted, DestStateName, DivAirportLandings LIMIT 10"}
 {"sql":"SELECT CancellationCode FROM mytable WHERE OriginState IN ('DE', 'KY', 'SC') OR TaxiIn IN (79, 48, 44, 39) ORDER BY Flights LIMIT 19"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Flights >= 1 AND ActualElapsedTime <= 305 LIMIT 6"}
-{"sql":"SELECT LongestAddGTime, FlightNum, MIN(OriginWac), SUM(\"Year\"), MAX(TaxiOut) FROM mytable WHERE OriginAirportID BETWEEN 11953 AND 13577 GROUP BY LongestAddGTime, FlightNum LIMIT 23","hsqls":["SELECT LongestAddGTime, FlightNum, MIN(OriginWac), SUM(Year), MAX(TaxiOut) FROM mytable WHERE OriginAirportID BETWEEN 11953 AND 13577 GROUP BY LongestAddGTime, FlightNum LIMIT 23"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTotalGTimes <= 116 LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 <= 116 OR DivTotalGTimes__MV1 <= 116 OR DivTotalGTimes__MV2 <= 116 OR DivTotalGTimes__MV3 <= 116 OR DivTotalGTimes__MV4 <= 116) LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, FlightNum, MIN(OriginWac), SUM(\"Year\"), MAX(TaxiOut) FROM mytable WHERE OriginAirportID BETWEEN 11953 AND 13577 GROUP BY LongestAddGTime, FlightNum LIMIT 23","hsqls":["SELECT LongestAddGTime, FlightNum, MIN(OriginWac), SUM(`Year`), MAX(TaxiOut) FROM mytable WHERE OriginAirportID BETWEEN 11953 AND 13577 GROUP BY LongestAddGTime, FlightNum LIMIT 23"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DivTotalGTimes <= 116 LIMIT 6","hsqls":["SELECT COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] <= 116 OR DivTotalGTimes[2] <= 116 OR DivTotalGTimes[3] <= 116 OR DivTotalGTimes[4] <= 116 OR DivTotalGTimes[5] <= 116) LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable ORDER BY DistanceGroup, DayOfWeek LIMIT 27"}
-{"sql":"SELECT WeatherDelay, ArrTime, OriginAirportID, COUNT(*) FROM mytable WHERE DestCityName <> 'Elmira/Corning, NY' AND AirlineID = 20355 OR DivTotalGTimes BETWEEN 104 AND 42 GROUP BY WeatherDelay, ArrTime, OriginAirportID LIMIT 13","hsqls":["SELECT WeatherDelay, ArrTime, OriginAirportID, COUNT(*) FROM mytable WHERE DestCityName <> 'Elmira/Corning, NY' AND AirlineID = 20355 OR (DivTotalGTimes__MV0 BETWEEN 104 AND 42 OR DivTotalGTimes__MV1 BETWEEN 104 AND 42 OR DivTotalGTimes__MV2 BETWEEN 104 AND 42 OR DivTotalGTimes__MV3 BETWEEN 104 AND 42 OR DivTotalGTimes__MV4 BETWEEN 104 AND 42) GROUP BY WeatherDelay, ArrTime, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT DepTimeBlk, CRSDepTime, MAX(CRSArrTime) FROM mytable WHERE DivAirportIDs <= 11996 GROUP BY DepTimeBlk, CRSDepTime LIMIT 28","hsqls":["SELECT DepTimeBlk, CRSDepTime, MAX(CRSArrTime) FROM mytable WHERE (DivAirportIDs__MV0 <= 11996 OR DivAirportIDs__MV1 <= 11996 OR DivAirportIDs__MV2 <= 11996 OR DivAirportIDs__MV3 <= 11996 OR DivAirportIDs__MV4 <= 11996) GROUP BY DepTimeBlk, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivArrDelay NOT IN (1280, 42, 331) OR DepDel15 NOT IN (1, 0, -9999) AND DepDel15 > 0 LIMIT 23","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DivArrDelay NOT IN (1280, 42, 331) OR DepDel15 NOT IN (1, 0, -9999) AND DepDel15 > 0 LIMIT 10000"]}
-{"sql":"SELECT AirTime, \"Month\", SUM(DivAirportLandings), AVG(LongestAddGTime), COUNT(ArrDelay) FROM mytable WHERE DivActualElapsedTime BETWEEN 258 AND 462 GROUP BY AirTime, \"Month\" LIMIT 3","hsqls":["SELECT AirTime, Month, SUM(DivAirportLandings), AVG(LongestAddGTime), COUNT(ArrDelay) FROM mytable WHERE DivActualElapsedTime BETWEEN 258 AND 462 GROUP BY AirTime, Month LIMIT 3"]}
+{"sql":"SELECT WeatherDelay, ArrTime, OriginAirportID, COUNT(*) FROM mytable WHERE DestCityName <> 'Elmira/Corning, NY' AND AirlineID = 20355 OR DivTotalGTimes BETWEEN 104 AND 42 GROUP BY WeatherDelay, ArrTime, OriginAirportID LIMIT 13","hsqls":["SELECT WeatherDelay, ArrTime, OriginAirportID, COUNT(*) FROM mytable WHERE DestCityName <> 'Elmira/Corning, NY' AND AirlineID = 20355 OR (DivTotalGTimes[1] BETWEEN 104 AND 42 OR DivTotalGTimes[2] BETWEEN 104 AND 42 OR DivTotalGTimes[3] BETWEEN 104 AND 42 OR DivTotalGTimes[4] BETWEEN 104 AND 42 OR DivTotalGTimes[5] BETWEEN 104 AND 42) GROUP BY WeatherDelay, ArrTime, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, CRSDepTime, MAX(CRSArrTime) FROM mytable WHERE DivAirportIDs <= 11996 GROUP BY DepTimeBlk, CRSDepTime LIMIT 28","hsqls":["SELECT DepTimeBlk, CRSDepTime, MAX(CRSArrTime) FROM mytable WHERE (DivAirportIDs[1] <= 11996 OR DivAirportIDs[2] <= 11996 OR DivAirportIDs[3] <= 11996 OR DivAirportIDs[4] <= 11996 OR DivAirportIDs[5] <= 11996) GROUP BY DepTimeBlk, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivArrDelay NOT IN (1280, 42, 331) OR DepDel15 NOT IN (1, 0, -9999) AND DepDel15 > 0 LIMIT 23","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE DivArrDelay NOT IN (1280, 42, 331) OR DepDel15 NOT IN (1, 0, -9999) AND DepDel15 > 0 LIMIT 10000"]}
+{"sql":"SELECT AirTime, \"Month\", SUM(DivAirportLandings), AVG(LongestAddGTime), COUNT(ArrDelay) FROM mytable WHERE DivActualElapsedTime BETWEEN 258 AND 462 GROUP BY AirTime, \"Month\" LIMIT 3","hsqls":["SELECT AirTime, Month, SUM(DivAirportLandings), AVG(LongestAddGTime), COUNT(ArrDelay) FROM mytable WHERE DivActualElapsedTime BETWEEN 258 AND 462 GROUP BY AirTime, `Month` LIMIT 3"]}
 {"sql":"SELECT ArrDelayMinutes, DivAirportLandings, SUM(DistanceGroup), COUNT(AirTime) FROM mytable GROUP BY ArrDelayMinutes, DivAirportLandings  ORDER BY ArrDelayMinutes, DivAirportLandings LIMIT 29","hsqls":["SELECT ArrDelayMinutes, DivAirportLandings, SUM(DistanceGroup), COUNT(AirTime) FROM mytable GROUP BY ArrDelayMinutes, DivAirportLandings  ORDER BY ArrDelayMinutes, DivAirportLandings LIMIT 29"]}
 {"sql":"SELECT WeatherDelay, DestCityName, DepTimeBlk FROM mytable ORDER BY LateAircraftDelay, CancellationCode, CRSElapsedTime LIMIT 10"}
-{"sql":"SELECT DivAirportLandings, MAX(CarrierDelay) FROM mytable WHERE OriginCityName BETWEEN 'Baton Rouge, LA' AND 'Lihue, HI' OR DivAirportIDs > 14252 GROUP BY DivAirportLandings LIMIT 10","hsqls":["SELECT DivAirportLandings, MAX(CarrierDelay) FROM mytable WHERE OriginCityName BETWEEN 'Baton Rouge, LA' AND 'Lihue, HI' OR (DivAirportIDs__MV0 > 14252 OR DivAirportIDs__MV1 > 14252 OR DivAirportIDs__MV2 > 14252 OR DivAirportIDs__MV3 > 14252 OR DivAirportIDs__MV4 > 14252) GROUP BY DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirportLandings, MAX(CarrierDelay) FROM mytable WHERE OriginCityName BETWEEN 'Baton Rouge, LA' AND 'Lihue, HI' OR DivAirportIDs > 14252 GROUP BY DivAirportLandings LIMIT 10","hsqls":["SELECT DivAirportLandings, MAX(CarrierDelay) FROM mytable WHERE OriginCityName BETWEEN 'Baton Rouge, LA' AND 'Lihue, HI' OR (DivAirportIDs[1] > 14252 OR DivAirportIDs[2] > 14252 OR DivAirportIDs[3] > 14252 OR DivAirportIDs[4] > 14252 OR DivAirportIDs[5] > 14252) GROUP BY DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DivDistance FROM mytable WHERE LateAircraftDelay IN (3, 136, 12) ORDER BY DepDel15 LIMIT 15"}
-{"sql":"SELECT Distance, AVG(DepDelay), MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE FlightNum IN (2425, 6513) AND Distance BETWEEN 2588 AND 1184 AND \"Month\" <= 1 GROUP BY Distance LIMIT 5","hsqls":["SELECT Distance, AVG(DepDelay), MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE FlightNum IN (2425, 6513) AND Distance BETWEEN 2588 AND 1184 AND Month <= 1 GROUP BY Distance LIMIT 5"]}
+{"sql":"SELECT Distance, AVG(DepDelay), MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE FlightNum IN (2425, 6513) AND Distance BETWEEN 2588 AND 1184 AND \"Month\" <= 1 GROUP BY Distance LIMIT 5","hsqls":["SELECT Distance, AVG(DepDelay), MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE FlightNum IN (2425, 6513) AND Distance BETWEEN 2588 AND 1184 AND `Month` <= 1 GROUP BY Distance LIMIT 5"]}
 {"sql":"SELECT TaxiIn, AirTime FROM mytable WHERE ArrDelayMinutes IN (146.0, 109.0) ORDER BY DistanceGroup, SecurityDelay LIMIT 29"}
 {"sql":"SELECT DistanceGroup, DestCityName, COUNT(TaxiIn), MIN(WheelsOff), COUNT(DepTime) FROM mytable WHERE DepTime NOT IN (1652, 1628) AND CancellationCode <= 'noodles' GROUP BY DistanceGroup, DestCityName  ORDER BY DistanceGroup, DestCityName LIMIT 12","hsqls":["SELECT DistanceGroup, DestCityName, COUNT(TaxiIn), MIN(WheelsOff), COUNT(DepTime) FROM mytable WHERE DepTime NOT IN (1652, 1628) AND CancellationCode <= 'noodles' GROUP BY DistanceGroup, DestCityName  ORDER BY DistanceGroup, DestCityName LIMIT 12"]}
-{"sql":"SELECT OriginCityMarketID, Cancelled, DivWheelsOffs FROM mytable WHERE DaysSinceEpoch NOT IN (16072) AND DestAirportID NOT IN (13342) OR DestAirportSeqID <= 1281902 ORDER BY OriginCityMarketID, Cancelled LIMIT 15","hsqls":["SELECT OriginCityMarketID, Cancelled, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DaysSinceEpoch NOT IN (16072) AND DestAirportID NOT IN (13342) OR DestAirportSeqID <= 1281902 ORDER BY OriginCityMarketID, Cancelled LIMIT 10000"]}
-{"sql":"SELECT Flights, DepDelayMinutes, WheelsOn FROM mytable WHERE \"Month\" NOT IN (1) OR CRSDepTime BETWEEN 1427 AND 1906 AND DestState IN ('MS', 'IN') ORDER BY OriginCityMarketID, SecurityDelay, DestStateName LIMIT 17","hsqls":["SELECT Flights, DepDelayMinutes, WheelsOn FROM mytable WHERE Month NOT IN (1) OR CRSDepTime BETWEEN 1427 AND 1906 AND DestState IN ('MS', 'IN') ORDER BY OriginCityMarketID, SecurityDelay, DestStateName LIMIT 17"]}
+{"sql":"SELECT OriginCityMarketID, Cancelled, DivWheelsOffs FROM mytable WHERE DaysSinceEpoch NOT IN (16072) AND DestAirportID NOT IN (13342) OR DestAirportSeqID <= 1281902 ORDER BY OriginCityMarketID, Cancelled LIMIT 15","hsqls":["SELECT OriginCityMarketID, Cancelled, DivWheelsOffs FROM mytable WHERE DaysSinceEpoch NOT IN (16072) AND DestAirportID NOT IN (13342) OR DestAirportSeqID <= 1281902 ORDER BY OriginCityMarketID, Cancelled LIMIT 10000"]}
+{"sql":"SELECT Flights, DepDelayMinutes, WheelsOn FROM mytable WHERE \"Month\" NOT IN (1) OR CRSDepTime BETWEEN 1427 AND 1906 AND DestState IN ('MS', 'IN') ORDER BY OriginCityMarketID, SecurityDelay, DestStateName LIMIT 17","hsqls":["SELECT Flights, DepDelayMinutes, WheelsOn FROM mytable WHERE `Month` NOT IN (1) OR CRSDepTime BETWEEN 1427 AND 1906 AND DestState IN ('MS', 'IN') ORDER BY OriginCityMarketID, SecurityDelay, DestStateName LIMIT 17"]}
 {"sql":"SELECT ArrTimeBlk, MIN(Diverted), AVG(DepartureDelayGroups) FROM mytable WHERE OriginStateFips > 49 GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 6","hsqls":["SELECT ArrTimeBlk, MIN(Diverted), AVG(DepartureDelayGroups) FROM mytable WHERE OriginStateFips > 49 GROUP BY ArrTimeBlk  ORDER BY ArrTimeBlk LIMIT 6"]}
-{"sql":"SELECT \"Year\", LongestAddGTime, AirlineID FROM mytable WHERE WeatherDelay < 59 OR DivTailNums = 'N742SW' AND DivAirportSeqIDs BETWEEN 1289605 AND 1192102 LIMIT 2","hsqls":["SELECT Year, LongestAddGTime, AirlineID FROM mytable WHERE WeatherDelay < 59 OR (DivTailNums__MV0 = 'N742SW' OR DivTailNums__MV1 = 'N742SW' OR DivTailNums__MV2 = 'N742SW' OR DivTailNums__MV3 = 'N742SW' OR DivTailNums__MV4 = 'N742SW') AND (DivAirportSeqIDs__MV0 BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs__MV1 BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs__MV2 BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs__MV3 BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs__MV4 BETWEEN 1289605 AND 1192102) LIMIT 10000"]}
+{"sql":"SELECT \"Year\", LongestAddGTime, AirlineID FROM mytable WHERE WeatherDelay < 59 OR DivTailNums = 'N742SW' AND DivAirportSeqIDs BETWEEN 1289605 AND 1192102 LIMIT 2","hsqls":["SELECT Year, LongestAddGTime, AirlineID FROM mytable WHERE WeatherDelay < 59 OR (DivTailNums[1] = 'N742SW' OR DivTailNums[2] = 'N742SW' OR DivTailNums[3] = 'N742SW' OR DivTailNums[4] = 'N742SW' OR DivTailNums[5] = 'N742SW') AND (DivAirportSeqIDs[1] BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs[2] BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs[3] BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs[4] BETWEEN 1289605 AND 1192102 OR DivAirportSeqIDs[5] BETWEEN 1289605 AND 1192102) LIMIT 10000"]}
 {"sql":"SELECT OriginState, FlightNum, COUNT(TaxiIn), SUM(AirTime), SUM(CRSArrTime) FROM mytable WHERE Origin NOT IN ('ABE', 'CLL', 'ILG', 'MSY') OR WheelsOn NOT IN (1437, 2133, 1525, 2356, 1853) AND ArrivalDelayGroups >= -9999 GROUP BY OriginState, FlightNum  ORDER BY OriginState, FlightNum LIMIT 27","hsqls":["SELECT OriginState, FlightNum, COUNT(TaxiIn), SUM(AirTime), SUM(CRSArrTime) FROM mytable WHERE Origin NOT IN ('ABE', 'CLL', 'ILG', 'MSY') OR WheelsOn NOT IN (1437, 2133, 1525, 2356, 1853) AND ArrivalDelayGroups >= -9999 GROUP BY OriginState, FlightNum  ORDER BY OriginState, FlightNum LIMIT 27"]}
-{"sql":"SELECT OriginAirportSeqID, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE OriginCityMarketID NOT IN (30431) AND DivWheelsOffs <= 1821 OR DivLongestGTimes BETWEEN 37.0 AND 85.0 LIMIT 5","hsqls":["SELECT OriginAirportSeqID, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE OriginCityMarketID NOT IN (30431) AND (DivWheelsOffs__MV0 <= 1821 OR DivWheelsOffs__MV1 <= 1821 OR DivWheelsOffs__MV2 <= 1821 OR DivWheelsOffs__MV3 <= 1821 OR DivWheelsOffs__MV4 <= 1821) OR (DivLongestGTimes__MV0 BETWEEN 37.0 AND 85.0 OR DivLongestGTimes__MV1 BETWEEN 37.0 AND 85.0 OR DivLongestGTimes__MV2 BETWEEN 37.0 AND 85.0 OR DivLongestGTimes__MV3 BETWEEN 37.0 AND 85.0 OR DivLongestGTimes__MV4 BETWEEN 37.0 AND 85.0) LIMIT 10000"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE DepDelayMinutes > 99.0 AND OriginStateFips IN (29) LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE DepDelayMinutes > 99.0 AND OriginStateFips IN (29) LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE OriginCityMarketID NOT IN (30431) AND DivWheelsOffs <= 1821 OR DivLongestGTimes BETWEEN 37.0 AND 85.0 LIMIT 5","hsqls":["SELECT OriginAirportSeqID, UniqueCarrier, DivActualElapsedTime FROM mytable WHERE OriginCityMarketID NOT IN (30431) AND (DivWheelsOffs[1] <= 1821 OR DivWheelsOffs[2] <= 1821 OR DivWheelsOffs[3] <= 1821 OR DivWheelsOffs[4] <= 1821 OR DivWheelsOffs[5] <= 1821) OR (DivLongestGTimes[1] BETWEEN 37.0 AND 85.0 OR DivLongestGTimes[2] BETWEEN 37.0 AND 85.0 OR DivLongestGTimes[3] BETWEEN 37.0 AND 85.0 OR DivLongestGTimes[4] BETWEEN 37.0 AND 85.0 OR DivLongestGTimes[5] BETWEEN 37.0 AND 85.0) LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE DepDelayMinutes > 99.0 AND OriginStateFips IN (29) LIMIT 24","hsqls":["SELECT DivAirports FROM mytable WHERE DepDelayMinutes > 99.0 AND OriginStateFips IN (29) LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginAirportSeqID), AVG(DestAirportID), AVG(DepTime) FROM mytable LIMIT 23"}
 {"sql":"SELECT DestState, \"Month\", DivArrDelay, MAX(NASDelay), SUM(DestAirportID), MAX(AirTime) FROM mytable WHERE CRSDepTime BETWEEN 1432 AND 1643 AND DivReachedDest <> 1 GROUP BY DestState, \"Month\", DivArrDelay LIMIT 18","hsqls":["SELECT DestState, Month, DivArrDelay, MAX(NASDelay), SUM(DestAirportID), MAX(AirTime) FROM mytable WHERE CRSDepTime BETWEEN 1432 AND 1643 AND DivReachedDest <> 1 GROUP BY DestState, Month, DivArrDelay LIMIT 18"]}
 {"sql":"SELECT WheelsOff, DepTime, DestAirportSeqID FROM mytable WHERE CRSDepTime BETWEEN 2254 AND 2104 AND TotalAddGTime = 40 ORDER BY SecurityDelay LIMIT 10"}
@@ -8160,7 +8160,7 @@
 {"sql":"SELECT NASDelay FROM mytable LIMIT 13"}
 {"sql":"SELECT DepDelay, FirstDepTime, CRSDepTime FROM mytable WHERE Carrier <= 'HA' OR Quarter IN (1) ORDER BY DepDelay, Flights LIMIT 7"}
 {"sql":"SELECT LateAircraftDelay, DaysSinceEpoch, COUNT(OriginWac) FROM mytable WHERE DepDelay NOT IN (58.0) GROUP BY LateAircraftDelay, DaysSinceEpoch  ORDER BY LateAircraftDelay, DaysSinceEpoch LIMIT 21","hsqls":["SELECT LateAircraftDelay, DaysSinceEpoch, COUNT(OriginWac) FROM mytable WHERE DepDelay NOT IN (58.0) GROUP BY LateAircraftDelay, DaysSinceEpoch  ORDER BY LateAircraftDelay, DaysSinceEpoch LIMIT 21"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE AirlineID NOT IN (19690, 19393, 19790, 19930) ORDER BY Diverted LIMIT 5","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE AirlineID NOT IN (19690, 19393, 19790, 19930) ORDER BY Diverted LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE AirlineID NOT IN (19690, 19393, 19790, 19930) ORDER BY Diverted LIMIT 5","hsqls":["SELECT DivTailNums FROM mytable WHERE AirlineID NOT IN (19690, 19393, 19790, 19930) ORDER BY Diverted LIMIT 10000"]}
 {"sql":"SELECT FlightNum FROM mytable ORDER BY NASDelay, Origin LIMIT 23"}
 {"sql":"SELECT FlightDate, OriginCityName, AirlineID FROM mytable WHERE DestWac < 42 OR CRSArrTime BETWEEN 1459 AND 1009 ORDER BY DivDistance, OriginCityName LIMIT 9"}
 {"sql":"SELECT DepDelayMinutes, LongestAddGTime, ArrTime, AVG(OriginAirportSeqID), MAX(Diverted) FROM mytable WHERE AirlineID IN (20398, 19690, 20366, 21171) GROUP BY DepDelayMinutes, LongestAddGTime, ArrTime  ORDER BY DepDelayMinutes, LongestAddGTime, ArrTime LIMIT 16","hsqls":["SELECT DepDelayMinutes, LongestAddGTime, ArrTime, AVG(OriginAirportSeqID), MAX(Diverted) FROM mytable WHERE AirlineID IN (20398, 19690, 20366, 21171) GROUP BY DepDelayMinutes, LongestAddGTime, ArrTime  ORDER BY DepDelayMinutes, LongestAddGTime, ArrTime LIMIT 16"]}
@@ -8169,22 +8169,22 @@
 {"sql":"SELECT LongestAddGTime, UniqueCarrier, COUNT(*) FROM mytable WHERE OriginCityName NOT IN ('Baltimore, MD', 'Sun Valley/Hailey/Ketchum, ID', 'Elmira/Corning, NY', 'Columbus, MS', 'Los Angeles, CA') GROUP BY LongestAddGTime, UniqueCarrier  ORDER BY LongestAddGTime, UniqueCarrier LIMIT 3","hsqls":["SELECT LongestAddGTime, UniqueCarrier, COUNT(*) FROM mytable WHERE OriginCityName NOT IN ('Baltimore, MD', 'Sun Valley/Hailey/Ketchum, ID', 'Elmira/Corning, NY', 'Columbus, MS', 'Los Angeles, CA') GROUP BY LongestAddGTime, UniqueCarrier  ORDER BY LongestAddGTime, UniqueCarrier LIMIT 3"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE NASDelay <= 63 AND AirTime NOT IN (208) OR DivReachedDest NOT IN (1, -9999) ORDER BY TaxiOut LIMIT 22"}
 {"sql":"SELECT DestCityName, MAX(ArrDel15), COUNT(FlightDate) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 27","hsqls":["SELECT DestCityName, MAX(ArrDel15), COUNT(FlightDate) FROM mytable GROUP BY DestCityName  ORDER BY DestCityName LIMIT 27"]}
-{"sql":"SELECT COUNT(DestAirportSeqID) FROM mytable WHERE DivWheelsOns <= 1642 OR DivAirports BETWEEN 'SGU' AND 'ATW' OR OriginWac IN (54) LIMIT 13","hsqls":["SELECT COUNT(DestAirportSeqID) FROM mytable WHERE (DivWheelsOns__MV0 <= 1642 OR DivWheelsOns__MV1 <= 1642 OR DivWheelsOns__MV2 <= 1642 OR DivWheelsOns__MV3 <= 1642 OR DivWheelsOns__MV4 <= 1642) OR (DivAirports__MV0 BETWEEN 'SGU' AND 'ATW' OR DivAirports__MV1 BETWEEN 'SGU' AND 'ATW' OR DivAirports__MV2 BETWEEN 'SGU' AND 'ATW' OR DivAirports__MV3 BETWEEN 'SGU' AND 'ATW' OR DivAirports__MV4 BETWEEN 'SGU' AND 'ATW') OR OriginWac IN (54) LIMIT 10000"]}
-{"sql":"SELECT DivDistance, DestStateFips, AVG(DivReachedDest), COUNT(CancellationCode) FROM mytable WHERE Origin NOT IN ('CLL', 'ROC', 'DAL', 'IDA') AND CRSDepTime IN (510, 1937) OR DivTotalGTimes = 118 GROUP BY DivDistance, DestStateFips LIMIT 13","hsqls":["SELECT DivDistance, DestStateFips, AVG(DivReachedDest), COUNT(CancellationCode) FROM mytable WHERE Origin NOT IN ('CLL', 'ROC', 'DAL', 'IDA') AND CRSDepTime IN (510, 1937) OR (DivTotalGTimes__MV0 = 118 OR DivTotalGTimes__MV1 = 118 OR DivTotalGTimes__MV2 = 118 OR DivTotalGTimes__MV3 = 118 OR DivTotalGTimes__MV4 = 118) GROUP BY DivDistance, DestStateFips LIMIT 10000"]}
-{"sql":"SELECT OriginState, DepTime FROM mytable WHERE DepDelay IN (179.0, 320.0, -15.0, 94.0, 174.0) OR DepDelay BETWEEN 7.0 AND 139.0 ORDER BY OriginCityName, ArrDel15, \"Month\" LIMIT 8","hsqls":["SELECT OriginState, DepTime FROM mytable WHERE DepDelay IN (179.0, 320.0, -15.0, 94.0, 174.0) OR DepDelay BETWEEN 7.0 AND 139.0 ORDER BY OriginCityName, ArrDel15, Month LIMIT 8"]}
+{"sql":"SELECT COUNT(DestAirportSeqID) FROM mytable WHERE DivWheelsOns <= 1642 OR DivAirports BETWEEN 'SGU' AND 'ATW' OR OriginWac IN (54) LIMIT 13","hsqls":["SELECT COUNT(DestAirportSeqID) FROM mytable WHERE (DivWheelsOns[1] <= 1642 OR DivWheelsOns[2] <= 1642 OR DivWheelsOns[3] <= 1642 OR DivWheelsOns[4] <= 1642 OR DivWheelsOns[5] <= 1642) OR (DivAirports[1] BETWEEN 'SGU' AND 'ATW' OR DivAirports[2] BETWEEN 'SGU' AND 'ATW' OR DivAirports[3] BETWEEN 'SGU' AND 'ATW' OR DivAirports[4] BETWEEN 'SGU' AND 'ATW' OR DivAirports[5] BETWEEN 'SGU' AND 'ATW') OR OriginWac IN (54) LIMIT 10000"]}
+{"sql":"SELECT DivDistance, DestStateFips, AVG(DivReachedDest), COUNT(CancellationCode) FROM mytable WHERE Origin NOT IN ('CLL', 'ROC', 'DAL', 'IDA') AND CRSDepTime IN (510, 1937) OR DivTotalGTimes = 118 GROUP BY DivDistance, DestStateFips LIMIT 13","hsqls":["SELECT DivDistance, DestStateFips, AVG(DivReachedDest), COUNT(CancellationCode) FROM mytable WHERE Origin NOT IN ('CLL', 'ROC', 'DAL', 'IDA') AND CRSDepTime IN (510, 1937) OR (DivTotalGTimes[1] = 118 OR DivTotalGTimes[2] = 118 OR DivTotalGTimes[3] = 118 OR DivTotalGTimes[4] = 118 OR DivTotalGTimes[5] = 118) GROUP BY DivDistance, DestStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginState, DepTime FROM mytable WHERE DepDelay IN (179.0, 320.0, -15.0, 94.0, 174.0) OR DepDelay BETWEEN 7.0 AND 139.0 ORDER BY OriginCityName, ArrDel15, \"Month\" LIMIT 8","hsqls":["SELECT OriginState, DepTime FROM mytable WHERE DepDelay IN (179.0, 320.0, -15.0, 94.0, 174.0) OR DepDelay BETWEEN 7.0 AND 139.0 ORDER BY OriginCityName, ArrDel15, `Month` LIMIT 8"]}
 {"sql":"SELECT FlightNum, ArrDelayMinutes, DepDel15, COUNT(DestStateFips), AVG(Distance) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 GROUP BY FlightNum, ArrDelayMinutes, DepDel15  ORDER BY FlightNum, ArrDelayMinutes, DepDel15 LIMIT 24","hsqls":["SELECT FlightNum, ArrDelayMinutes, DepDel15, COUNT(DestStateFips), AVG(Distance) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 GROUP BY FlightNum, ArrDelayMinutes, DepDel15  ORDER BY FlightNum, ArrDelayMinutes, DepDel15 LIMIT 24"]}
 {"sql":"SELECT COUNT(OriginStateFips) FROM mytable LIMIT 25"}
-{"sql":"SELECT CRSArrTime, DivAirportIDs, DaysSinceEpoch FROM mytable WHERE Flights > 1 AND DivArrDelay NOT IN (203, 997, 257, -9999) OR FlightNum <= 4557 ORDER BY LongestAddGTime, Dest LIMIT 29","hsqls":["SELECT CRSArrTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DaysSinceEpoch FROM mytable WHERE Flights > 1 AND DivArrDelay NOT IN (203, 997, 257, -9999) OR FlightNum <= 4557 ORDER BY LongestAddGTime, Dest LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivAirportIDs, DaysSinceEpoch FROM mytable WHERE Flights > 1 AND DivArrDelay NOT IN (203, 997, 257, -9999) OR FlightNum <= 4557 ORDER BY LongestAddGTime, Dest LIMIT 29","hsqls":["SELECT CRSArrTime, DivAirportIDs, DaysSinceEpoch FROM mytable WHERE Flights > 1 AND DivArrDelay NOT IN (203, 997, 257, -9999) OR FlightNum <= 4557 ORDER BY LongestAddGTime, Dest LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, COUNT(*) FROM mytable GROUP BY DivReachedDest","hsqls":["SELECT DivReachedDest, COUNT(*) FROM mytable GROUP BY DivReachedDest"]}
 {"sql":"SELECT DistanceGroup, ArrTimeBlk, ArrDel15 FROM mytable WHERE OriginWac IN (15, 63) AND Diverted NOT IN (1, 0) AND LateAircraftDelay IN (67, 181, 8) LIMIT 21"}
 {"sql":"SELECT MAX(WheelsOff) FROM mytable WHERE AirTime = 27 AND ArrTimeBlk BETWEEN '0800-0859' AND '1400-1459' OR ArrivalDelayGroups NOT IN (10, 0, 12) LIMIT 28"}
 {"sql":"SELECT TaxiOut, Distance FROM mytable WHERE Dest BETWEEN 'ORD' AND 'ANC' OR TaxiOut NOT IN (113, 57, 93, 91, 11) AND DestAirportID NOT IN (15919, 10581, 15389) LIMIT 2"}
 {"sql":"SELECT FirstDepTime, DayOfWeek, MIN(Distance) FROM mytable GROUP BY FirstDepTime, DayOfWeek  ORDER BY FirstDepTime, DayOfWeek LIMIT 2","hsqls":["SELECT FirstDepTime, DayOfWeek, MIN(Distance) FROM mytable GROUP BY FirstDepTime, DayOfWeek  ORDER BY FirstDepTime, DayOfWeek LIMIT 2"]}
-{"sql":"SELECT \"Month\", AVG(\"Month\"), SUM(NASDelay) FROM mytable GROUP BY \"Month\" LIMIT 17","hsqls":["SELECT Month, AVG(Month), SUM(NASDelay) FROM mytable GROUP BY Month LIMIT 17"]}
+{"sql":"SELECT \"Month\", AVG(\"Month\"), SUM(NASDelay) FROM mytable GROUP BY \"Month\" LIMIT 17","hsqls":["SELECT Month, AVG(`Month`), SUM(NASDelay) FROM mytable GROUP BY `Month` LIMIT 17"]}
 {"sql":"SELECT DestWac, Flights, NASDelay, COUNT(*) FROM mytable WHERE CarrierDelay IN (44, 455, 304) GROUP BY DestWac, Flights, NASDelay  ORDER BY DestWac, Flights, NASDelay LIMIT 3","hsqls":["SELECT DestWac, Flights, NASDelay, COUNT(*) FROM mytable WHERE CarrierDelay IN (44, 455, 304) GROUP BY DestWac, Flights, NASDelay  ORDER BY DestWac, Flights, NASDelay LIMIT 3"]}
-{"sql":"SELECT CRSDepTime FROM mytable WHERE DivWheelsOffs BETWEEN 2227 AND 2338 AND DivReachedDest > 1 OR AirlineID = 20437 ORDER BY CancellationCode, DestAirportID LIMIT 1","hsqls":["SELECT CRSDepTime FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2227 AND 2338 OR DivWheelsOffs__MV1 BETWEEN 2227 AND 2338 OR DivWheelsOffs__MV2 BETWEEN 2227 AND 2338 OR DivWheelsOffs__MV3 BETWEEN 2227 AND 2338 OR DivWheelsOffs__MV4 BETWEEN 2227 AND 2338) AND DivReachedDest > 1 OR AirlineID = 20437 ORDER BY CancellationCode, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime FROM mytable WHERE DivWheelsOffs BETWEEN 2227 AND 2338 AND DivReachedDest > 1 OR AirlineID = 20437 ORDER BY CancellationCode, DestAirportID LIMIT 1","hsqls":["SELECT CRSDepTime FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2227 AND 2338 OR DivWheelsOffs[2] BETWEEN 2227 AND 2338 OR DivWheelsOffs[3] BETWEEN 2227 AND 2338 OR DivWheelsOffs[4] BETWEEN 2227 AND 2338 OR DivWheelsOffs[5] BETWEEN 2227 AND 2338) AND DivReachedDest > 1 OR AirlineID = 20437 ORDER BY CancellationCode, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE Dest > 'FAT' OR TaxiIn > 23 ORDER BY DepartureDelayGroups, Dest, ArrDelay LIMIT 29"}
-{"sql":"SELECT WheelsOff, DestAirportID, AVG(ArrTime), SUM(Flights) FROM mytable WHERE DivWheelsOns BETWEEN 1939 AND 1303 GROUP BY WheelsOff, DestAirportID LIMIT 11","hsqls":["SELECT WheelsOff, DestAirportID, AVG(ArrTime), SUM(Flights) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1939 AND 1303 OR DivWheelsOns__MV1 BETWEEN 1939 AND 1303 OR DivWheelsOns__MV2 BETWEEN 1939 AND 1303 OR DivWheelsOns__MV3 BETWEEN 1939 AND 1303 OR DivWheelsOns__MV4 BETWEEN 1939 AND 1303) GROUP BY WheelsOff, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DestAirportID, AVG(ArrTime), SUM(Flights) FROM mytable WHERE DivWheelsOns BETWEEN 1939 AND 1303 GROUP BY WheelsOff, DestAirportID LIMIT 11","hsqls":["SELECT WheelsOff, DestAirportID, AVG(ArrTime), SUM(Flights) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1939 AND 1303 OR DivWheelsOns[2] BETWEEN 1939 AND 1303 OR DivWheelsOns[3] BETWEEN 1939 AND 1303 OR DivWheelsOns[4] BETWEEN 1939 AND 1303 OR DivWheelsOns[5] BETWEEN 1939 AND 1303) GROUP BY WheelsOff, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DayOfWeek, COUNT(*) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 1 OR ArrDel15 < -9999 GROUP BY FlightNum, DayOfWeek  ORDER BY FlightNum, DayOfWeek LIMIT 15","hsqls":["SELECT FlightNum, DayOfWeek, COUNT(*) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 1 OR ArrDel15 < -9999 GROUP BY FlightNum, DayOfWeek  ORDER BY FlightNum, DayOfWeek LIMIT 15"]}
 {"sql":"SELECT OriginStateFips, DepTime, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 7 AND 105 AND DepDelay BETWEEN 69.0 AND 175.0 GROUP BY OriginStateFips, DepTime  ORDER BY OriginStateFips, DepTime LIMIT 9","hsqls":["SELECT OriginStateFips, DepTime, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 7 AND 105 AND DepDelay BETWEEN 69.0 AND 175.0 GROUP BY OriginStateFips, DepTime  ORDER BY OriginStateFips, DepTime LIMIT 9"]}
 {"sql":"SELECT COUNT(Carrier), AVG(DivDistance), SUM(DistanceGroup) FROM mytable LIMIT 14"}
@@ -8192,16 +8192,16 @@
 {"sql":"SELECT DestStateFips, ArrivalDelayGroups, DaysSinceEpoch FROM mytable WHERE CRSDepTime NOT IN (1600, 2004, 1951, 1854) AND CRSArrTime >= 2305 AND OriginStateFips NOT IN (36, 26) LIMIT 15"}
 {"sql":"SELECT DestAirportID FROM mytable WHERE Diverted NOT IN (0) AND ArrDel15 <> -9999 OR DestWac BETWEEN 36 AND 4 ORDER BY Distance, ActualElapsedTime, DivAirportLandings LIMIT 10"}
 {"sql":"SELECT OriginStateName FROM mytable WHERE DestWac BETWEEN 91 AND 91 ORDER BY ActualElapsedTime, AirlineID, DayOfWeek LIMIT 1"}
-{"sql":"SELECT Carrier, OriginCityMarketID FROM mytable WHERE Diverted IN (1, 0) AND OriginState NOT IN ('WY', 'CO', 'SC') AND DivAirportIDs BETWEEN 11433 AND 13829 LIMIT 4","hsqls":["SELECT Carrier, OriginCityMarketID FROM mytable WHERE Diverted IN (1, 0) AND OriginState NOT IN ('WY', 'CO', 'SC') AND (DivAirportIDs__MV0 BETWEEN 11433 AND 13829 OR DivAirportIDs__MV1 BETWEEN 11433 AND 13829 OR DivAirportIDs__MV2 BETWEEN 11433 AND 13829 OR DivAirportIDs__MV3 BETWEEN 11433 AND 13829 OR DivAirportIDs__MV4 BETWEEN 11433 AND 13829) LIMIT 10000"]}
+{"sql":"SELECT Carrier, OriginCityMarketID FROM mytable WHERE Diverted IN (1, 0) AND OriginState NOT IN ('WY', 'CO', 'SC') AND DivAirportIDs BETWEEN 11433 AND 13829 LIMIT 4","hsqls":["SELECT Carrier, OriginCityMarketID FROM mytable WHERE Diverted IN (1, 0) AND OriginState NOT IN ('WY', 'CO', 'SC') AND (DivAirportIDs[1] BETWEEN 11433 AND 13829 OR DivAirportIDs[2] BETWEEN 11433 AND 13829 OR DivAirportIDs[3] BETWEEN 11433 AND 13829 OR DivAirportIDs[4] BETWEEN 11433 AND 13829 OR DivAirportIDs[5] BETWEEN 11433 AND 13829) LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, OriginCityName, SUM(CarrierDelay), AVG(Distance) FROM mytable GROUP BY OriginAirportSeqID, OriginCityName  ORDER BY OriginAirportSeqID, OriginCityName LIMIT 21","hsqls":["SELECT OriginAirportSeqID, OriginCityName, SUM(CarrierDelay), AVG(Distance) FROM mytable GROUP BY OriginAirportSeqID, OriginCityName  ORDER BY OriginAirportSeqID, OriginCityName LIMIT 21"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE DistanceGroup BETWEEN 2 AND 4 ORDER BY FirstDepTime, ArrTime LIMIT 9"}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE DayOfWeek NOT IN (7) OR DivTotalGTimes <= 65 AND WheelsOn >= 49 ORDER BY OriginAirportSeqID, Carrier, DestCityMarketID LIMIT 1","hsqls":["SELECT CarrierDelay FROM mytable WHERE DayOfWeek NOT IN (7) OR (DivTotalGTimes__MV0 <= 65 OR DivTotalGTimes__MV1 <= 65 OR DivTotalGTimes__MV2 <= 65 OR DivTotalGTimes__MV3 <= 65 OR DivTotalGTimes__MV4 <= 65) AND WheelsOn >= 49 ORDER BY OriginAirportSeqID, Carrier, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DepDel15, MAX(DepDelayMinutes), AVG(AirTime), MAX(\"Month\") FROM mytable WHERE DivWheelsOns IN (227, 914, 1823, 1429, 834) GROUP BY DepDel15 LIMIT 29","hsqls":["SELECT DepDel15, MAX(DepDelayMinutes), AVG(AirTime), MAX(Month) FROM mytable WHERE (DivWheelsOns__MV0 IN (227, 914, 1823, 1429, 834) OR DivWheelsOns__MV1 IN (227, 914, 1823, 1429, 834) OR DivWheelsOns__MV2 IN (227, 914, 1823, 1429, 834) OR DivWheelsOns__MV3 IN (227, 914, 1823, 1429, 834) OR DivWheelsOns__MV4 IN (227, 914, 1823, 1429, 834)) GROUP BY DepDel15 LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE DayOfWeek NOT IN (7) OR DivTotalGTimes <= 65 AND WheelsOn >= 49 ORDER BY OriginAirportSeqID, Carrier, DestCityMarketID LIMIT 1","hsqls":["SELECT CarrierDelay FROM mytable WHERE DayOfWeek NOT IN (7) OR (DivTotalGTimes[1] <= 65 OR DivTotalGTimes[2] <= 65 OR DivTotalGTimes[3] <= 65 OR DivTotalGTimes[4] <= 65 OR DivTotalGTimes[5] <= 65) AND WheelsOn >= 49 ORDER BY OriginAirportSeqID, Carrier, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DepDel15, MAX(DepDelayMinutes), AVG(AirTime), MAX(\"Month\") FROM mytable WHERE DivWheelsOns IN (227, 914, 1823, 1429, 834) GROUP BY DepDel15 LIMIT 29","hsqls":["SELECT DepDel15, MAX(DepDelayMinutes), AVG(AirTime), MAX(`Month`) FROM mytable WHERE (DivWheelsOns[1] IN (227, 914, 1823, 1429, 834) OR DivWheelsOns[2] IN (227, 914, 1823, 1429, 834) OR DivWheelsOns[3] IN (227, 914, 1823, 1429, 834) OR DivWheelsOns[4] IN (227, 914, 1823, 1429, 834) OR DivWheelsOns[5] IN (227, 914, 1823, 1429, 834)) GROUP BY DepDel15 LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DayofMonth FROM mytable WHERE FlightDate IN ('2014-01-14', '2014-01-11') AND Cancelled <> 1"}
 {"sql":"SELECT FlightNum, DestStateFips, AVG(DestAirportSeqID) FROM mytable WHERE Diverted BETWEEN 1 AND 1 AND DepDelay NOT IN (324.0) OR DepTimeBlk <= '0900-0959' GROUP BY FlightNum, DestStateFips  ORDER BY FlightNum, DestStateFips LIMIT 19","hsqls":["SELECT FlightNum, DestStateFips, AVG(DestAirportSeqID) FROM mytable WHERE Diverted BETWEEN 1 AND 1 AND DepDelay NOT IN (324.0) OR DepTimeBlk <= '0900-0959' GROUP BY FlightNum, DestStateFips  ORDER BY FlightNum, DestStateFips LIMIT 19"]}
-{"sql":"SELECT DestStateName, OriginAirportID FROM mytable WHERE DepTimeBlk BETWEEN '2100-2159' AND '0800-0859' OR SecurityDelay <= -9999 OR \"Year\" > 2014 ORDER BY Flights LIMIT 28","hsqls":["SELECT DestStateName, OriginAirportID FROM mytable WHERE DepTimeBlk BETWEEN '2100-2159' AND '0800-0859' OR SecurityDelay <= -9999 OR Year > 2014 ORDER BY Flights LIMIT 28"]}
+{"sql":"SELECT DestStateName, OriginAirportID FROM mytable WHERE DepTimeBlk BETWEEN '2100-2159' AND '0800-0859' OR SecurityDelay <= -9999 OR \"Year\" > 2014 ORDER BY Flights LIMIT 28","hsqls":["SELECT DestStateName, OriginAirportID FROM mytable WHERE DepTimeBlk BETWEEN '2100-2159' AND '0800-0859' OR SecurityDelay <= -9999 OR `Year` > 2014 ORDER BY Flights LIMIT 28"]}
 {"sql":"SELECT Quarter, ArrTimeBlk, COUNT(*) FROM mytable WHERE DepDelay IN (18.0, 39.0, 127.0) AND DivActualElapsedTime <> 409 AND TotalAddGTime NOT IN (51) GROUP BY Quarter, ArrTimeBlk  ORDER BY Quarter, ArrTimeBlk LIMIT 6","hsqls":["SELECT Quarter, ArrTimeBlk, COUNT(*) FROM mytable WHERE DepDelay IN (18.0, 39.0, 127.0) AND DivActualElapsedTime <> 409 AND TotalAddGTime NOT IN (51) GROUP BY Quarter, ArrTimeBlk  ORDER BY Quarter, ArrTimeBlk LIMIT 6"]}
-{"sql":"SELECT DivAirportIDs, DivTotalGTimes FROM mytable WHERE DestCityMarketID < 32884 AND FlightDate >= '2014-01-13' OR OriginState IN ('NV') ORDER BY Diverted LIMIT 4","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestCityMarketID < 32884 AND FlightDate >= '2014-01-13' OR OriginState IN ('NV') ORDER BY Diverted LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, DivTotalGTimes FROM mytable WHERE DestCityMarketID < 32884 AND FlightDate >= '2014-01-13' OR OriginState IN ('NV') ORDER BY Diverted LIMIT 4","hsqls":["SELECT DivAirportIDs, DivTotalGTimes FROM mytable WHERE DestCityMarketID < 32884 AND FlightDate >= '2014-01-13' OR OriginState IN ('NV') ORDER BY Diverted LIMIT 10000"]}
 {"sql":"SELECT DepTime, DestCityMarketID FROM mytable ORDER BY ArrDelay LIMIT 27"}
 {"sql":"SELECT DaysSinceEpoch FROM mytable WHERE CRSElapsedTime >= 172 AND DayOfWeek BETWEEN 1 AND 6 LIMIT 8"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepTimeBlk BETWEEN '1500-1559' AND '1900-1959' OR SecurityDelay BETWEEN 1 AND 4 OR DivActualElapsedTime NOT IN (580, 213, 565, 1047, 273) LIMIT 25"}
@@ -8225,24 +8225,24 @@
 {"sql":"SELECT FirstDepTime FROM mytable WHERE ArrivalDelayGroups BETWEEN 12 AND 5 OR DivDistance IN (51, 397, 24, 551) ORDER BY FlightDate, ArrivalDelayGroups LIMIT 29"}
 {"sql":"SELECT TotalAddGTime, CRSElapsedTime, OriginAirportID FROM mytable ORDER BY TaxiOut LIMIT 29"}
 {"sql":"SELECT Carrier, AirlineID FROM mytable ORDER BY DistanceGroup, Diverted, OriginWac LIMIT 23"}
-{"sql":"SELECT DestWac, \"Month\" FROM mytable ORDER BY AirTime LIMIT 10","hsqls":["SELECT DestWac, Month FROM mytable ORDER BY AirTime LIMIT 10"]}
+{"sql":"SELECT DestWac, \"Month\" FROM mytable ORDER BY AirTime LIMIT 10","hsqls":["SELECT DestWac, `Month` FROM mytable ORDER BY AirTime LIMIT 10"]}
 {"sql":"SELECT WeatherDelay FROM mytable ORDER BY TaxiIn LIMIT 2"}
-{"sql":"SELECT OriginAirportSeqID, DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DepTime <> 922 ORDER BY Carrier, OriginStateName LIMIT 1","hsqls":["SELECT OriginAirportSeqID, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrivalDelayGroups FROM mytable WHERE DepTime <> 922 ORDER BY Carrier, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DepTime <> 922 ORDER BY Carrier, OriginStateName LIMIT 1","hsqls":["SELECT OriginAirportSeqID, DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE DepTime <> 922 ORDER BY Carrier, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT SUM(LongestAddGTime), SUM(FlightNum) FROM mytable WHERE FlightDate BETWEEN '2014-01-07' AND '2014-01-03' AND Flights BETWEEN 1 AND 1 LIMIT 13"}
-{"sql":"SELECT FlightNum, DestAirportSeqID, DestCityName FROM mytable ORDER BY WheelsOff, ArrDel15, \"Month\" LIMIT 29","hsqls":["SELECT FlightNum, DestAirportSeqID, DestCityName FROM mytable ORDER BY WheelsOff, ArrDel15, Month LIMIT 29"]}
+{"sql":"SELECT FlightNum, DestAirportSeqID, DestCityName FROM mytable ORDER BY WheelsOff, ArrDel15, \"Month\" LIMIT 29","hsqls":["SELECT FlightNum, DestAirportSeqID, DestCityName FROM mytable ORDER BY WheelsOff, ArrDel15, `Month` LIMIT 29"]}
 {"sql":"SELECT SUM(DepDel15), COUNT(DestCityName) FROM mytable WHERE DestStateFips BETWEEN 31 AND 49 OR AirlineID BETWEEN 20355 AND 19690 LIMIT 17"}
 {"sql":"SELECT MIN(OriginAirportSeqID) FROM mytable WHERE OriginCityMarketID = 31308 OR NASDelay <> 305 OR OriginAirportSeqID BETWEEN 1330303 AND 1201202 LIMIT 25"}
 {"sql":"SELECT TaxiIn, COUNT(Origin), AVG(DepTime) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 8","hsqls":["SELECT TaxiIn, COUNT(Origin), AVG(DepTime) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 8"]}
-{"sql":"SELECT OriginCityMarketID, ArrDelay, DaysSinceEpoch, AVG(\"Month\"), COUNT(\"Year\") FROM mytable WHERE Diverted NOT IN (0) GROUP BY OriginCityMarketID, ArrDelay, DaysSinceEpoch LIMIT 19","hsqls":["SELECT OriginCityMarketID, ArrDelay, DaysSinceEpoch, AVG(Month), COUNT(Year) FROM mytable WHERE Diverted NOT IN (0) GROUP BY OriginCityMarketID, ArrDelay, DaysSinceEpoch LIMIT 19"]}
+{"sql":"SELECT OriginCityMarketID, ArrDelay, DaysSinceEpoch, AVG(\"Month\"), COUNT(\"Year\") FROM mytable WHERE Diverted NOT IN (0) GROUP BY OriginCityMarketID, ArrDelay, DaysSinceEpoch LIMIT 19","hsqls":["SELECT OriginCityMarketID, ArrDelay, DaysSinceEpoch, AVG(`Month`), COUNT(`Year`) FROM mytable WHERE Diverted NOT IN (0) GROUP BY OriginCityMarketID, ArrDelay, DaysSinceEpoch LIMIT 19"]}
 {"sql":"SELECT \"Year\", DivAirportLandings FROM mytable WHERE Diverted BETWEEN 1 AND 1 OR DestCityMarketID IN (30146, 34992, 31503) AND ArrDelay IN (-39.0, 35.0, 184.0, -9.0, 97.0) LIMIT 12","hsqls":["SELECT Year, DivAirportLandings FROM mytable WHERE Diverted BETWEEN 1 AND 1 OR DestCityMarketID IN (30146, 34992, 31503) AND ArrDelay IN (-39.0, 35.0, 184.0, -9.0, 97.0) LIMIT 12"]}
-{"sql":"SELECT DivWheelsOffs, DayofMonth, DaysSinceEpoch FROM mytable WHERE DestCityMarketID < 33344 OR FlightDate <> '2014-01-10' AND LateAircraftDelay BETWEEN 117 AND 278 ORDER BY DaysSinceEpoch LIMIT 23","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DayofMonth, DaysSinceEpoch FROM mytable WHERE DestCityMarketID < 33344 OR FlightDate <> '2014-01-10' AND LateAircraftDelay BETWEEN 117 AND 278 ORDER BY DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DayofMonth, DaysSinceEpoch FROM mytable WHERE DestCityMarketID < 33344 OR FlightDate <> '2014-01-10' AND LateAircraftDelay BETWEEN 117 AND 278 ORDER BY DaysSinceEpoch LIMIT 23","hsqls":["SELECT DivWheelsOffs, DayofMonth, DaysSinceEpoch FROM mytable WHERE DestCityMarketID < 33344 OR FlightDate <> '2014-01-10' AND LateAircraftDelay BETWEEN 117 AND 278 ORDER BY DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, \"Year\", DepTime, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, \"Year\", DepTime LIMIT 20","hsqls":["SELECT DepartureDelayGroups, Year, DepTime, COUNT(*) FROM mytable GROUP BY DepartureDelayGroups, Year, DepTime LIMIT 20"]}
-{"sql":"SELECT DivTailNums FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY CRSArrTime, ArrDelay, DestCityMarketID LIMIT 18","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Year NOT IN (2014) ORDER BY CRSArrTime, ArrDelay, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE \"Year\" NOT IN (2014) ORDER BY CRSArrTime, ArrDelay, DestCityMarketID LIMIT 18","hsqls":["SELECT DivTailNums FROM mytable WHERE `Year` NOT IN (2014) ORDER BY CRSArrTime, ArrDelay, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, ActualElapsedTime, AVG(CRSDepTime), COUNT(DestWac), COUNT(ActualElapsedTime) FROM mytable WHERE AirTime BETWEEN 437 AND 175 OR CRSDepTime NOT IN (1411, 2045, 1747, 845) OR ArrTimeBlk >= '1400-1459' GROUP BY TaxiIn, ActualElapsedTime  ORDER BY TaxiIn, ActualElapsedTime LIMIT 22","hsqls":["SELECT TaxiIn, ActualElapsedTime, AVG(CRSDepTime), COUNT(DestWac), COUNT(ActualElapsedTime) FROM mytable WHERE AirTime BETWEEN 437 AND 175 OR CRSDepTime NOT IN (1411, 2045, 1747, 845) OR ArrTimeBlk >= '1400-1459' GROUP BY TaxiIn, ActualElapsedTime  ORDER BY TaxiIn, ActualElapsedTime LIMIT 22"]}
-{"sql":"SELECT DivAirports, DestCityName, OriginStateName FROM mytable ORDER BY ArrivalDelayGroups, OriginAirportID LIMIT 7","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestCityName, OriginStateName FROM mytable ORDER BY ArrivalDelayGroups, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, DivTailNums FROM mytable WHERE Flights <= 1 OR CRSDepTime BETWEEN 1911 AND 1129 LIMIT 15","hsqls":["SELECT LongestAddGTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE Flights <= 1 OR CRSDepTime BETWEEN 1911 AND 1129 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestCityName, OriginStateName FROM mytable ORDER BY ArrivalDelayGroups, OriginAirportID LIMIT 7","hsqls":["SELECT DivAirports, DestCityName, OriginStateName FROM mytable ORDER BY ArrivalDelayGroups, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivTailNums FROM mytable WHERE Flights <= 1 OR CRSDepTime BETWEEN 1911 AND 1129 LIMIT 15","hsqls":["SELECT LongestAddGTime, DivTailNums FROM mytable WHERE Flights <= 1 OR CRSDepTime BETWEEN 1911 AND 1129 LIMIT 10000"]}
 {"sql":"SELECT Flights, DayofMonth, DayOfWeek, COUNT(*) FROM mytable WHERE OriginAirportSeqID IN (1228002, 1052904) AND DepartureDelayGroups < -2 GROUP BY Flights, DayofMonth, DayOfWeek  ORDER BY Flights, DayofMonth, DayOfWeek LIMIT 23","hsqls":["SELECT Flights, DayofMonth, DayOfWeek, COUNT(*) FROM mytable WHERE OriginAirportSeqID IN (1228002, 1052904) AND DepartureDelayGroups < -2 GROUP BY Flights, DayofMonth, DayOfWeek  ORDER BY Flights, DayofMonth, DayOfWeek LIMIT 23"]}
-{"sql":"SELECT Flights, SUM(\"Month\"), SUM(DayofMonth) FROM mytable WHERE TaxiOut BETWEEN 66 AND -9999 GROUP BY Flights LIMIT 28","hsqls":["SELECT Flights, SUM(Month), SUM(DayofMonth) FROM mytable WHERE TaxiOut BETWEEN 66 AND -9999 GROUP BY Flights LIMIT 28"]}
+{"sql":"SELECT Flights, SUM(\"Month\"), SUM(DayofMonth) FROM mytable WHERE TaxiOut BETWEEN 66 AND -9999 GROUP BY Flights LIMIT 28","hsqls":["SELECT Flights, SUM(`Month`), SUM(DayofMonth) FROM mytable WHERE TaxiOut BETWEEN 66 AND -9999 GROUP BY Flights LIMIT 28"]}
 {"sql":"SELECT AVG(OriginStateFips) FROM mytable WHERE FlightDate IN ('2014-01-01') OR LongestAddGTime >= 148 AND OriginStateName IN ('New Hampshire', 'Minnesota', 'Mississippi', 'West Virginia', 'Oklahoma') LIMIT 13"}
 {"sql":"SELECT TaxiIn, DestAirportID, CRSElapsedTime FROM mytable WHERE CarrierDelay BETWEEN 10 AND 92 OR DestState BETWEEN 'WY' AND 'NM' OR DaysSinceEpoch BETWEEN 16092 AND 16085 LIMIT 3"}
 {"sql":"SELECT Dest FROM mytable WHERE OriginWac IN (66, 22, 86, 87, 88) OR OriginCityName IN ('Helena, MT') ORDER BY Carrier, DivArrDelay LIMIT 2"}
@@ -8250,87 +8250,87 @@
 {"sql":"SELECT Flights, DaysSinceEpoch FROM mytable WHERE CarrierDelay > 2 AND DestAirportSeqID IN (1298202, 1541202, 1410002) AND ArrDel15 BETWEEN -9999 AND 0 ORDER BY DepTimeBlk LIMIT 15"}
 {"sql":"SELECT DepartureDelayGroups, OriginState, DayofMonth FROM mytable WHERE DayOfWeek > 7 ORDER BY LongestAddGTime, ArrTimeBlk, DestCityMarketID LIMIT 18"}
 {"sql":"SELECT OriginAirportID FROM mytable ORDER BY LateAircraftDelay, LongestAddGTime LIMIT 18"}
-{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') OR LongestAddGTime BETWEEN 25 AND 38 OR DivWheelsOns = 2138 ORDER BY TotalAddGTime LIMIT 12","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') OR LongestAddGTime BETWEEN 25 AND 38 OR (DivWheelsOns__MV0 = 2138 OR DivWheelsOns__MV1 = 2138 OR DivWheelsOns__MV2 = 2138 OR DivWheelsOns__MV3 = 2138 OR DivWheelsOns__MV4 = 2138) ORDER BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') OR LongestAddGTime BETWEEN 25 AND 38 OR DivWheelsOns = 2138 ORDER BY TotalAddGTime LIMIT 12","hsqls":["SELECT ArrDelayMinutes FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') OR LongestAddGTime BETWEEN 25 AND 38 OR (DivWheelsOns[1] = 2138 OR DivWheelsOns[2] = 2138 OR DivWheelsOns[3] = 2138 OR DivWheelsOns[4] = 2138 OR DivWheelsOns[5] = 2138) ORDER BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE LongestAddGTime BETWEEN 34 AND 28 OR DaysSinceEpoch IN (16098, 16073, 16081, 16093, 16076) ORDER BY WheelsOff LIMIT 24"}
 {"sql":"SELECT TaxiOut, Flights, TaxiIn FROM mytable ORDER BY Distance LIMIT 4"}
 {"sql":"SELECT CarrierDelay, DestAirportSeqID, DivActualElapsedTime FROM mytable LIMIT 12"}
 {"sql":"SELECT LongestAddGTime, ArrTimeBlk FROM mytable WHERE NASDelay NOT IN (94) AND UniqueCarrier BETWEEN 'OO' AND 'DL' AND DestWac IN (91, 36, 53, 86, 61) ORDER BY DistanceGroup, DepTime LIMIT 17"}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE WheelsOff BETWEEN 1521 AND 1514 ORDER BY \"Year\", FlightDate, CRSDepTime LIMIT 6","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE WheelsOff BETWEEN 1521 AND 1514 ORDER BY Year, FlightDate, CRSDepTime LIMIT 6"]}
-{"sql":"SELECT DivAirports, ArrTimeBlk FROM mytable WHERE DepDelay BETWEEN 126.0 AND 66.0 AND AirlineID < 19977 AND DivArrDelay = 314 LIMIT 28","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrTimeBlk FROM mytable WHERE DepDelay BETWEEN 126.0 AND 66.0 AND AirlineID < 19977 AND DivArrDelay = 314 LIMIT 10000"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DivAirportIDs BETWEEN 10781 AND 10521 ORDER BY OriginStateFips, OriginCityName LIMIT 19","hsqls":["SELECT Month FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 10781 AND 10521 OR DivAirportIDs__MV1 BETWEEN 10781 AND 10521 OR DivAirportIDs__MV2 BETWEEN 10781 AND 10521 OR DivAirportIDs__MV3 BETWEEN 10781 AND 10521 OR DivAirportIDs__MV4 BETWEEN 10781 AND 10521) ORDER BY OriginStateFips, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ArrTimeBlk FROM mytable WHERE DepDelay BETWEEN 126.0 AND 66.0 AND AirlineID < 19977 AND DivArrDelay = 314 LIMIT 28","hsqls":["SELECT DivAirports, ArrTimeBlk FROM mytable WHERE DepDelay BETWEEN 126.0 AND 66.0 AND AirlineID < 19977 AND DivArrDelay = 314 LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DivAirportIDs BETWEEN 10781 AND 10521 ORDER BY OriginStateFips, OriginCityName LIMIT 19","hsqls":["SELECT `Month` FROM mytable WHERE (DivAirportIDs[1] BETWEEN 10781 AND 10521 OR DivAirportIDs[2] BETWEEN 10781 AND 10521 OR DivAirportIDs[3] BETWEEN 10781 AND 10521 OR DivAirportIDs[4] BETWEEN 10781 AND 10521 OR DivAirportIDs[5] BETWEEN 10781 AND 10521) ORDER BY OriginStateFips, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, COUNT(*) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 13","hsqls":["SELECT DepDelayMinutes, COUNT(*) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 13"]}
 {"sql":"SELECT Quarter FROM mytable ORDER BY OriginAirportSeqID, DestCityName LIMIT 4"}
 {"sql":"SELECT DivDistance, COUNT(*) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 13","hsqls":["SELECT DivDistance, COUNT(*) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 13"]}
-{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY TotalAddGTime, DivArrDelay, DayOfWeek LIMIT 7","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY TotalAddGTime, DivArrDelay, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY TotalAddGTime, DivArrDelay, DayOfWeek LIMIT 7","hsqls":["SELECT DivAirportIDs FROM mytable ORDER BY TotalAddGTime, DivArrDelay, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE WheelsOn BETWEEN 1408 AND 1738 ORDER BY DivArrDelay LIMIT 28"}
 {"sql":"SELECT AirTime, AirlineID FROM mytable WHERE DestAirportSeqID > 1457402 AND OriginStateFips = 30 OR Flights BETWEEN 1 AND 1 LIMIT 6"}
 {"sql":"SELECT Carrier, ArrTimeBlk, ArrivalDelayGroups, MAX(ArrivalDelayGroups), MAX(CRSArrTime), COUNT(OriginState) FROM mytable WHERE DistanceGroup BETWEEN 10 AND 8 AND WheelsOn NOT IN (513, 609, 1951, 1534) GROUP BY Carrier, ArrTimeBlk, ArrivalDelayGroups  ORDER BY Carrier, ArrTimeBlk, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT Carrier, ArrTimeBlk, ArrivalDelayGroups, MAX(ArrivalDelayGroups), MAX(CRSArrTime), COUNT(OriginState) FROM mytable WHERE DistanceGroup BETWEEN 10 AND 8 AND WheelsOn NOT IN (513, 609, 1951, 1534) GROUP BY Carrier, ArrTimeBlk, ArrivalDelayGroups  ORDER BY Carrier, ArrTimeBlk, ArrivalDelayGroups LIMIT 11"]}
 {"sql":"SELECT SUM(TaxiIn) FROM mytable WHERE OriginCityMarketID BETWEEN 32016 AND 31308 LIMIT 7"}
 {"sql":"SELECT AVG(ActualElapsedTime), MAX(DivActualElapsedTime), MIN(TaxiIn) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'C' LIMIT 11"}
-{"sql":"SELECT COUNT(DestState) FROM mytable WHERE DivAirportIDs IN (10158) AND OriginCityName NOT IN ('Brainerd, MN', 'Medford, OR') LIMIT 16","hsqls":["SELECT COUNT(DestState) FROM mytable WHERE (DivAirportIDs__MV0 IN (10158) OR DivAirportIDs__MV1 IN (10158) OR DivAirportIDs__MV2 IN (10158) OR DivAirportIDs__MV3 IN (10158) OR DivAirportIDs__MV4 IN (10158)) AND OriginCityName NOT IN ('Brainerd, MN', 'Medford, OR') LIMIT 10000"]}
+{"sql":"SELECT COUNT(DestState) FROM mytable WHERE DivAirportIDs IN (10158) AND OriginCityName NOT IN ('Brainerd, MN', 'Medford, OR') LIMIT 16","hsqls":["SELECT COUNT(DestState) FROM mytable WHERE (DivAirportIDs[1] IN (10158) OR DivAirportIDs[2] IN (10158) OR DivAirportIDs[3] IN (10158) OR DivAirportIDs[4] IN (10158) OR DivAirportIDs[5] IN (10158)) AND OriginCityName NOT IN ('Brainerd, MN', 'Medford, OR') LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, WheelsOn FROM mytable WHERE OriginState > 'HI' AND DaysSinceEpoch < 16078 LIMIT 19"}
-{"sql":"SELECT DivAirportIDs, OriginWac, OriginStateName FROM mytable WHERE WheelsOff > 1427 AND DestAirportID BETWEEN 14576 AND 11274 ORDER BY OriginCityMarketID, TotalAddGTime, DestAirportID LIMIT 15","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, OriginWac, OriginStateName FROM mytable WHERE WheelsOff > 1427 AND DestAirportID BETWEEN 14576 AND 11274 ORDER BY OriginCityMarketID, TotalAddGTime, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DivAirportLandings, OriginAirportID FROM mytable LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivAirportLandings, OriginAirportID FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, OriginWac, OriginStateName FROM mytable WHERE WheelsOff > 1427 AND DestAirportID BETWEEN 14576 AND 11274 ORDER BY OriginCityMarketID, TotalAddGTime, DestAirportID LIMIT 15","hsqls":["SELECT DivAirportIDs, OriginWac, OriginStateName FROM mytable WHERE WheelsOff > 1427 AND DestAirportID BETWEEN 14576 AND 11274 ORDER BY OriginCityMarketID, TotalAddGTime, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivAirportLandings, OriginAirportID FROM mytable LIMIT 4","hsqls":["SELECT DivLongestGTimes, DivAirportLandings, OriginAirportID FROM mytable LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, Cancelled, CRSElapsedTime, MIN(DivDistance), MIN(ArrDel15) FROM mytable GROUP BY DistanceGroup, Cancelled, CRSElapsedTime  ORDER BY DistanceGroup, Cancelled, CRSElapsedTime LIMIT 23","hsqls":["SELECT DistanceGroup, Cancelled, CRSElapsedTime, MIN(DivDistance), MIN(ArrDel15) FROM mytable GROUP BY DistanceGroup, Cancelled, CRSElapsedTime  ORDER BY DistanceGroup, Cancelled, CRSElapsedTime LIMIT 23"]}
-{"sql":"SELECT \"Month\" FROM mytable LIMIT 14","hsqls":["SELECT Month FROM mytable LIMIT 14"]}
+{"sql":"SELECT \"Month\" FROM mytable LIMIT 14","hsqls":["SELECT `Month` FROM mytable LIMIT 14"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DaysSinceEpoch <> 16082 ORDER BY CRSArrTime, DayofMonth LIMIT 28"}
 {"sql":"SELECT DepartureDelayGroups, ArrTimeBlk FROM mytable WHERE DivArrDelay > 216 LIMIT 6"}
 {"sql":"SELECT TotalAddGTime, \"Month\", OriginAirportID FROM mytable WHERE OriginStateFips < 42 OR WheelsOn <> 2337 ORDER BY WeatherDelay, ArrTimeBlk, NASDelay LIMIT 2","hsqls":["SELECT TotalAddGTime, Month, OriginAirportID FROM mytable WHERE OriginStateFips < 42 OR WheelsOn <> 2337 ORDER BY WeatherDelay, ArrTimeBlk, NASDelay LIMIT 2"]}
 {"sql":"SELECT DestAirportID FROM mytable ORDER BY TailNum LIMIT 6"}
 {"sql":"SELECT DepTime, ArrDelayMinutes, ArrTimeBlk, MAX(DepDelay) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR FlightNum > 4489 OR TailNum > 'N9EAMQ' GROUP BY DepTime, ArrDelayMinutes, ArrTimeBlk  ORDER BY DepTime, ArrDelayMinutes, ArrTimeBlk LIMIT 28","hsqls":["SELECT DepTime, ArrDelayMinutes, ArrTimeBlk, MAX(DepDelay) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR FlightNum > 4489 OR TailNum > 'N9EAMQ' GROUP BY DepTime, ArrDelayMinutes, ArrTimeBlk  ORDER BY DepTime, ArrDelayMinutes, ArrTimeBlk LIMIT 28"]}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE OriginCityName = 'Santa Barbara, CA' OR DivWheelsOns BETWEEN 2252 AND 1115 OR OriginAirportID = 12884 ORDER BY CRSArrTime, DivArrDelay LIMIT 21","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE OriginCityName = 'Santa Barbara, CA' OR (DivWheelsOns__MV0 BETWEEN 2252 AND 1115 OR DivWheelsOns__MV1 BETWEEN 2252 AND 1115 OR DivWheelsOns__MV2 BETWEEN 2252 AND 1115 OR DivWheelsOns__MV3 BETWEEN 2252 AND 1115 OR DivWheelsOns__MV4 BETWEEN 2252 AND 1115) OR OriginAirportID = 12884 ORDER BY CRSArrTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE OriginCityName = 'Santa Barbara, CA' OR DivWheelsOns BETWEEN 2252 AND 1115 OR OriginAirportID = 12884 ORDER BY CRSArrTime, DivArrDelay LIMIT 21","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE OriginCityName = 'Santa Barbara, CA' OR (DivWheelsOns[1] BETWEEN 2252 AND 1115 OR DivWheelsOns[2] BETWEEN 2252 AND 1115 OR DivWheelsOns[3] BETWEEN 2252 AND 1115 OR DivWheelsOns[4] BETWEEN 2252 AND 1115 OR DivWheelsOns[5] BETWEEN 2252 AND 1115) OR OriginAirportID = 12884 ORDER BY CRSArrTime, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginStateName FROM mytable WHERE ArrDel15 IN (1, 0, -9999) ORDER BY ActualElapsedTime, NASDelay, UniqueCarrier LIMIT 12"}
-{"sql":"SELECT Distance, FlightDate, TotalAddGTime FROM mytable WHERE DivWheelsOffs <= 1728 LIMIT 20","hsqls":["SELECT Distance, FlightDate, TotalAddGTime FROM mytable WHERE (DivWheelsOffs__MV0 <= 1728 OR DivWheelsOffs__MV1 <= 1728 OR DivWheelsOffs__MV2 <= 1728 OR DivWheelsOffs__MV3 <= 1728 OR DivWheelsOffs__MV4 <= 1728) LIMIT 10000"]}
+{"sql":"SELECT Distance, FlightDate, TotalAddGTime FROM mytable WHERE DivWheelsOffs <= 1728 LIMIT 20","hsqls":["SELECT Distance, FlightDate, TotalAddGTime FROM mytable WHERE (DivWheelsOffs[1] <= 1728 OR DivWheelsOffs[2] <= 1728 OR DivWheelsOffs[3] <= 1728 OR DivWheelsOffs[4] <= 1728 OR DivWheelsOffs[5] <= 1728) LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DestStateName, MIN(AirlineID) FROM mytable GROUP BY Cancelled, DestStateName  ORDER BY Cancelled, DestStateName LIMIT 10","hsqls":["SELECT Cancelled, DestStateName, MIN(AirlineID) FROM mytable GROUP BY Cancelled, DestStateName  ORDER BY Cancelled, DestStateName LIMIT 10"]}
 {"sql":"SELECT Flights, DaysSinceEpoch FROM mytable ORDER BY Flights, DepTime, WheelsOn LIMIT 20"}
 {"sql":"SELECT TaxiIn, ArrTime, DepDel15 FROM mytable ORDER BY CancellationCode"}
-{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY WheelsOff, DayofMonth LIMIT 1","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY WheelsOff, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs FROM mytable WHERE FlightNum NOT IN (5311, 4807, 2089) OR DivLongestGTimes > 59.0 LIMIT 12","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE FlightNum NOT IN (5311, 4807, 2089) OR (DivLongestGTimes__MV0 > 59.0 OR DivLongestGTimes__MV1 > 59.0 OR DivLongestGTimes__MV2 > 59.0 OR DivLongestGTimes__MV3 > 59.0 OR DivLongestGTimes__MV4 > 59.0) LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY WheelsOff, DayofMonth LIMIT 1","hsqls":["SELECT DivAirportIDs FROM mytable ORDER BY WheelsOff, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable WHERE FlightNum NOT IN (5311, 4807, 2089) OR DivLongestGTimes > 59.0 LIMIT 12","hsqls":["SELECT DivAirportIDs FROM mytable WHERE FlightNum NOT IN (5311, 4807, 2089) OR (DivLongestGTimes[1] > 59.0 OR DivLongestGTimes[2] > 59.0 OR DivLongestGTimes[3] > 59.0 OR DivLongestGTimes[4] > 59.0 OR DivLongestGTimes[5] > 59.0) LIMIT 10000"]}
 {"sql":"SELECT DepDel15, COUNT(Dest), MIN(CRSArrTime) FROM mytable GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 23","hsqls":["SELECT DepDel15, COUNT(Dest), MIN(CRSArrTime) FROM mytable GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 23"]}
-{"sql":"SELECT DepTime, DivAirportSeqIDs, DivWheelsOffs FROM mytable WHERE ArrivalDelayGroups BETWEEN 11 AND 5 AND DepDelay IN (106.0) ORDER BY Diverted, DestAirportSeqID, DestStateName LIMIT 5","hsqls":["SELECT DepTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE ArrivalDelayGroups BETWEEN 11 AND 5 AND DepDelay IN (106.0) ORDER BY Diverted, DestAirportSeqID, DestStateName LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, Cancelled, CancellationCode FROM mytable WHERE DivAirportSeqIDs BETWEEN 1498603 AND 1451202 OR DivWheelsOffs >= 952 AND DivWheelsOffs = 1129 LIMIT 7","hsqls":["SELECT TaxiIn, Cancelled, CancellationCode FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs__MV1 BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs__MV2 BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs__MV3 BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs__MV4 BETWEEN 1498603 AND 1451202) OR (DivWheelsOffs__MV0 >= 952 OR DivWheelsOffs__MV1 >= 952 OR DivWheelsOffs__MV2 >= 952 OR DivWheelsOffs__MV3 >= 952 OR DivWheelsOffs__MV4 >= 952) AND (DivWheelsOffs__MV0 = 1129 OR DivWheelsOffs__MV1 = 1129 OR DivWheelsOffs__MV2 = 1129 OR DivWheelsOffs__MV3 = 1129 OR DivWheelsOffs__MV4 = 1129) LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivAirportSeqIDs, DivWheelsOffs FROM mytable WHERE ArrivalDelayGroups BETWEEN 11 AND 5 AND DepDelay IN (106.0) ORDER BY Diverted, DestAirportSeqID, DestStateName LIMIT 5","hsqls":["SELECT DepTime, DivAirportSeqIDs, DivWheelsOffs FROM mytable WHERE ArrivalDelayGroups BETWEEN 11 AND 5 AND DepDelay IN (106.0) ORDER BY Diverted, DestAirportSeqID, DestStateName LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, Cancelled, CancellationCode FROM mytable WHERE DivAirportSeqIDs BETWEEN 1498603 AND 1451202 OR DivWheelsOffs >= 952 AND DivWheelsOffs = 1129 LIMIT 7","hsqls":["SELECT TaxiIn, Cancelled, CancellationCode FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs[2] BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs[3] BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs[4] BETWEEN 1498603 AND 1451202 OR DivAirportSeqIDs[5] BETWEEN 1498603 AND 1451202) OR (DivWheelsOffs[1] >= 952 OR DivWheelsOffs[2] >= 952 OR DivWheelsOffs[3] >= 952 OR DivWheelsOffs[4] >= 952 OR DivWheelsOffs[5] >= 952) AND (DivWheelsOffs[1] = 1129 OR DivWheelsOffs[2] = 1129 OR DivWheelsOffs[3] = 1129 OR DivWheelsOffs[4] = 1129 OR DivWheelsOffs[5] = 1129) LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrDelayMinutes) FROM mytable WHERE OriginCityName BETWEEN 'Indianapolis, IN' AND 'Duluth, MN' OR DestAirportSeqID IN (1069302) OR Origin < 'MHT' LIMIT 4"}
-{"sql":"SELECT LongestAddGTime, ActualElapsedTime, DivTailNums FROM mytable WHERE DivAirportIDs > 10728 ORDER BY DivReachedDest, ArrTimeBlk LIMIT 11","hsqls":["SELECT LongestAddGTime, ActualElapsedTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE (DivAirportIDs__MV0 > 10728 OR DivAirportIDs__MV1 > 10728 OR DivAirportIDs__MV2 > 10728 OR DivAirportIDs__MV3 > 10728 OR DivAirportIDs__MV4 > 10728) ORDER BY DivReachedDest, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, ActualElapsedTime, DivTailNums FROM mytable WHERE DivAirportIDs > 10728 ORDER BY DivReachedDest, ArrTimeBlk LIMIT 11","hsqls":["SELECT LongestAddGTime, ActualElapsedTime, DivTailNums FROM mytable WHERE (DivAirportIDs[1] > 10728 OR DivAirportIDs[2] > 10728 OR DivAirportIDs[3] > 10728 OR DivAirportIDs[4] > 10728 OR DivAirportIDs[5] > 10728) ORDER BY DivReachedDest, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, DaysSinceEpoch FROM mytable LIMIT 12"}
 {"sql":"SELECT Carrier, FlightNum, TotalAddGTime, COUNT(WheelsOn), SUM(DivArrDelay), MAX(WeatherDelay) FROM mytable WHERE CRSElapsedTime IN (112, 63, 344, 103, 89) OR DepTimeBlk BETWEEN '2300-2359' AND '0700-0759' AND SecurityDelay NOT IN (10, 4, 27, 14, -9999) GROUP BY Carrier, FlightNum, TotalAddGTime  ORDER BY Carrier, FlightNum, TotalAddGTime LIMIT 18","hsqls":["SELECT Carrier, FlightNum, TotalAddGTime, COUNT(WheelsOn), SUM(DivArrDelay), MAX(WeatherDelay) FROM mytable WHERE CRSElapsedTime IN (112, 63, 344, 103, 89) OR DepTimeBlk BETWEEN '2300-2359' AND '0700-0759' AND SecurityDelay NOT IN (10, 4, 27, 14, -9999) GROUP BY Carrier, FlightNum, TotalAddGTime  ORDER BY Carrier, FlightNum, TotalAddGTime LIMIT 18"]}
 {"sql":"SELECT MAX(FirstDepTime), MAX(ArrDelayMinutes) FROM mytable WHERE ActualElapsedTime < 26 LIMIT 28"}
-{"sql":"SELECT DivWheelsOns, FlightDate, ArrivalDelayGroups FROM mytable ORDER BY DestCityMarketID LIMIT 13","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, FlightDate, ArrivalDelayGroups FROM mytable ORDER BY DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, OriginCityName, MAX(ArrDelayMinutes) FROM mytable WHERE WheelsOn IN (1340, 1012) AND \"Month\" > 1 GROUP BY DistanceGroup, OriginCityName LIMIT 19","hsqls":["SELECT DistanceGroup, OriginCityName, MAX(ArrDelayMinutes) FROM mytable WHERE WheelsOn IN (1340, 1012) AND Month > 1 GROUP BY DistanceGroup, OriginCityName LIMIT 19"]}
-{"sql":"SELECT SUM(CarrierDelay), SUM(Diverted), MAX(Cancelled) FROM mytable WHERE Origin IN ('CMH') OR DivTotalGTimes > 136 OR OriginAirportSeqID <> 1209402 LIMIT 22","hsqls":["SELECT SUM(CarrierDelay), SUM(Diverted), MAX(Cancelled)  FROM mytable WHERE Origin IN ('CMH') OR (DivTotalGTimes__MV0 > 136 OR DivTotalGTimes__MV1 > 136 OR DivTotalGTimes__MV2 > 136 OR DivTotalGTimes__MV3 > 136 OR DivTotalGTimes__MV4 > 136) OR OriginAirportSeqID <> 1209402 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, FlightDate, ArrivalDelayGroups FROM mytable ORDER BY DestCityMarketID LIMIT 13","hsqls":["SELECT DivWheelsOns, FlightDate, ArrivalDelayGroups FROM mytable ORDER BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, OriginCityName, MAX(ArrDelayMinutes) FROM mytable WHERE WheelsOn IN (1340, 1012) AND \"Month\" > 1 GROUP BY DistanceGroup, OriginCityName LIMIT 19","hsqls":["SELECT DistanceGroup, OriginCityName, MAX(ArrDelayMinutes) FROM mytable WHERE WheelsOn IN (1340, 1012) AND `Month` > 1 GROUP BY DistanceGroup, OriginCityName LIMIT 19"]}
+{"sql":"SELECT SUM(CarrierDelay), SUM(Diverted), MAX(Cancelled) FROM mytable WHERE Origin IN ('CMH') OR DivTotalGTimes > 136 OR OriginAirportSeqID <> 1209402 LIMIT 22","hsqls":["SELECT SUM(CarrierDelay), SUM(Diverted), MAX(Cancelled)  FROM mytable WHERE Origin IN ('CMH') OR (DivTotalGTimes[1] > 136 OR DivTotalGTimes[2] > 136 OR DivTotalGTimes[3] > 136 OR DivTotalGTimes[4] > 136 OR DivTotalGTimes[5] > 136) OR OriginAirportSeqID <> 1209402 LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 OR CRSArrTime NOT IN (1605, 1518) LIMIT 5"}
 {"sql":"SELECT DestWac, SUM(LateAircraftDelay), AVG(ArrDelay), SUM(DayofMonth) FROM mytable WHERE FirstDepTime NOT IN (1016, 1301, 731) GROUP BY DestWac  ORDER BY DestWac LIMIT 10","hsqls":["SELECT DestWac, SUM(LateAircraftDelay), AVG(ArrDelay), SUM(DayofMonth) FROM mytable WHERE FirstDepTime NOT IN (1016, 1301, 731) GROUP BY DestWac  ORDER BY DestWac LIMIT 10"]}
 {"sql":"SELECT Distance FROM mytable ORDER BY CancellationCode LIMIT 16"}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE FirstDepTime = 944 ORDER BY TaxiOut, TailNum, DepTimeBlk LIMIT 11"}
-{"sql":"SELECT CRSArrTime, DestAirportID, DayOfWeek FROM mytable WHERE OriginState <= 'CA' AND \"Month\" NOT IN (1) ORDER BY WheelsOff, OriginState, DestWac LIMIT 9","hsqls":["SELECT CRSArrTime, DestAirportID, DayOfWeek FROM mytable WHERE OriginState <= 'CA' AND Month NOT IN (1) ORDER BY WheelsOff, OriginState, DestWac LIMIT 9"]}
+{"sql":"SELECT CRSArrTime, DestAirportID, DayOfWeek FROM mytable WHERE OriginState <= 'CA' AND \"Month\" NOT IN (1) ORDER BY WheelsOff, OriginState, DestWac LIMIT 9","hsqls":["SELECT CRSArrTime, DestAirportID, DayOfWeek FROM mytable WHERE OriginState <= 'CA' AND `Month` NOT IN (1) ORDER BY WheelsOff, OriginState, DestWac LIMIT 9"]}
 {"sql":"SELECT DivAirportLandings, OriginStateName FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND DivArrDelay NOT IN (552) LIMIT 1"}
-{"sql":"SELECT ArrDelayMinutes, DestCityMarketID FROM mytable WHERE DivLongestGTimes IN (57.0, 104.0) ORDER BY \"Year\" LIMIT 9","hsqls":["SELECT ArrDelayMinutes, DestCityMarketID FROM mytable WHERE (DivLongestGTimes__MV0 IN (57.0, 104.0) OR DivLongestGTimes__MV1 IN (57.0, 104.0) OR DivLongestGTimes__MV2 IN (57.0, 104.0) OR DivLongestGTimes__MV3 IN (57.0, 104.0) OR DivLongestGTimes__MV4 IN (57.0, 104.0)) ORDER BY Year LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DestCityMarketID FROM mytable WHERE DivLongestGTimes IN (57.0, 104.0) ORDER BY \"Year\" LIMIT 9","hsqls":["SELECT ArrDelayMinutes, DestCityMarketID FROM mytable WHERE (DivLongestGTimes[1] IN (57.0, 104.0) OR DivLongestGTimes[2] IN (57.0, 104.0) OR DivLongestGTimes[3] IN (57.0, 104.0) OR DivLongestGTimes[4] IN (57.0, 104.0) OR DivLongestGTimes[5] IN (57.0, 104.0)) ORDER BY `Year` LIMIT 10000"]}
 {"sql":"SELECT OriginState, ArrivalDelayGroups FROM mytable WHERE CarrierDelay NOT IN (94, 109, 35, 25, 131) ORDER BY Flights, DaysSinceEpoch LIMIT 4"}
 {"sql":"SELECT TailNum FROM mytable ORDER BY CRSElapsedTime LIMIT 25"}
 {"sql":"SELECT OriginCityName, CancellationCode, SUM(LateAircraftDelay), SUM(TaxiOut), SUM(CRSElapsedTime) FROM mytable GROUP BY OriginCityName, CancellationCode  ORDER BY OriginCityName, CancellationCode LIMIT 9","hsqls":["SELECT OriginCityName, CancellationCode, SUM(LateAircraftDelay), SUM(TaxiOut), SUM(CRSElapsedTime) FROM mytable GROUP BY OriginCityName, CancellationCode  ORDER BY OriginCityName, CancellationCode LIMIT 9"]}
-{"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE DivWheelsOffs IN (2225, 1234) OR DepTimeBlk BETWEEN '0600-0659' AND '1200-1259' OR DivTailNums IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') LIMIT 3","hsqls":["SELECT ArrivalDelayGroups FROM mytable WHERE (DivWheelsOffs__MV0 IN (2225, 1234) OR DivWheelsOffs__MV1 IN (2225, 1234) OR DivWheelsOffs__MV2 IN (2225, 1234) OR DivWheelsOffs__MV3 IN (2225, 1234) OR DivWheelsOffs__MV4 IN (2225, 1234)) OR DepTimeBlk BETWEEN '0600-0659' AND '1200-1259' OR (DivTailNums__MV0 IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums__MV1 IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums__MV2 IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums__MV3 IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums__MV4 IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB')) LIMIT 10000"]}
+{"sql":"SELECT ArrivalDelayGroups FROM mytable WHERE DivWheelsOffs IN (2225, 1234) OR DepTimeBlk BETWEEN '0600-0659' AND '1200-1259' OR DivTailNums IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') LIMIT 3","hsqls":["SELECT ArrivalDelayGroups FROM mytable WHERE (DivWheelsOffs[1] IN (2225, 1234) OR DivWheelsOffs[2] IN (2225, 1234) OR DivWheelsOffs[3] IN (2225, 1234) OR DivWheelsOffs[4] IN (2225, 1234) OR DivWheelsOffs[5] IN (2225, 1234)) OR DepTimeBlk BETWEEN '0600-0659' AND '1200-1259' OR (DivTailNums[1] IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums[2] IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums[3] IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums[4] IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB') OR DivTailNums[5] IN ('N371DA', 'N734SA', 'N724SK', 'N640JB', 'N318JB')) LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DivActualElapsedTime, SUM(DepDelay) FROM mytable WHERE DaysSinceEpoch > 16086 OR Flights NOT IN (1) GROUP BY Cancelled, DivActualElapsedTime  ORDER BY Cancelled, DivActualElapsedTime LIMIT 5","hsqls":["SELECT Cancelled, DivActualElapsedTime, SUM(DepDelay) FROM mytable WHERE DaysSinceEpoch > 16086 OR Flights NOT IN (1) GROUP BY Cancelled, DivActualElapsedTime  ORDER BY Cancelled, DivActualElapsedTime LIMIT 5"]}
 {"sql":"SELECT TaxiOut, LateAircraftDelay, ArrTime FROM mytable LIMIT 20"}
-{"sql":"SELECT DayofMonth FROM mytable WHERE LongestAddGTime IN (13) AND DivLongestGTimes = 4.0 LIMIT 24","hsqls":["SELECT DayofMonth FROM mytable WHERE LongestAddGTime IN (13) AND (DivLongestGTimes__MV0 = 4.0 OR DivLongestGTimes__MV1 = 4.0 OR DivLongestGTimes__MV2 = 4.0 OR DivLongestGTimes__MV3 = 4.0 OR DivLongestGTimes__MV4 = 4.0) LIMIT 10000"]}
+{"sql":"SELECT DayofMonth FROM mytable WHERE LongestAddGTime IN (13) AND DivLongestGTimes = 4.0 LIMIT 24","hsqls":["SELECT DayofMonth FROM mytable WHERE LongestAddGTime IN (13) AND (DivLongestGTimes[1] = 4.0 OR DivLongestGTimes[2] = 4.0 OR DivLongestGTimes[3] = 4.0 OR DivLongestGTimes[4] = 4.0 OR DivLongestGTimes[5] = 4.0) LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable ORDER BY DepTime LIMIT 7"}
-{"sql":"SELECT LateAircraftDelay, WeatherDelay, CRSDepTime, SUM(LateAircraftDelay), MAX(ArrDelayMinutes), AVG(DivActualElapsedTime) FROM mytable WHERE DivAirports BETWEEN 'LAX' AND 'EAU' GROUP BY LateAircraftDelay, WeatherDelay, CRSDepTime","hsqls":["SELECT LateAircraftDelay, WeatherDelay, CRSDepTime, SUM(LateAircraftDelay), MAX(ArrDelayMinutes), AVG(DivActualElapsedTime) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'LAX' AND 'EAU' OR DivAirports__MV1 BETWEEN 'LAX' AND 'EAU' OR DivAirports__MV2 BETWEEN 'LAX' AND 'EAU' OR DivAirports__MV3 BETWEEN 'LAX' AND 'EAU' OR DivAirports__MV4 BETWEEN 'LAX' AND 'EAU') GROUP BY LateAircraftDelay, WeatherDelay, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, WeatherDelay, CRSDepTime, SUM(LateAircraftDelay), MAX(ArrDelayMinutes), AVG(DivActualElapsedTime) FROM mytable WHERE DivAirports BETWEEN 'LAX' AND 'EAU' GROUP BY LateAircraftDelay, WeatherDelay, CRSDepTime","hsqls":["SELECT LateAircraftDelay, WeatherDelay, CRSDepTime, SUM(LateAircraftDelay), MAX(ArrDelayMinutes), AVG(DivActualElapsedTime) FROM mytable WHERE (DivAirports[1] BETWEEN 'LAX' AND 'EAU' OR DivAirports[2] BETWEEN 'LAX' AND 'EAU' OR DivAirports[3] BETWEEN 'LAX' AND 'EAU' OR DivAirports[4] BETWEEN 'LAX' AND 'EAU' OR DivAirports[5] BETWEEN 'LAX' AND 'EAU') GROUP BY LateAircraftDelay, WeatherDelay, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE ActualElapsedTime BETWEEN 37 AND 46 AND OriginStateName BETWEEN 'Minnesota' AND 'South Carolina' OR CancellationCode BETWEEN 'C' AND 'B' ORDER BY NASDelay LIMIT 16"}
 {"sql":"SELECT AirlineID, WheelsOn, AVG(DestAirportSeqID), AVG(ArrDelayMinutes) FROM mytable WHERE Cancelled IN (1, 0) GROUP BY AirlineID, WheelsOn  ORDER BY AirlineID, WheelsOn LIMIT 16","hsqls":["SELECT AirlineID, WheelsOn, AVG(DestAirportSeqID), AVG(ArrDelayMinutes) FROM mytable WHERE Cancelled IN (1, 0) GROUP BY AirlineID, WheelsOn  ORDER BY AirlineID, WheelsOn LIMIT 16"]}
 {"sql":"SELECT AirTime, UniqueCarrier, ArrivalDelayGroups FROM mytable WHERE DaysSinceEpoch BETWEEN 16088 AND 16091 ORDER BY FlightNum, Cancelled, Origin LIMIT 5"}
 {"sql":"SELECT ArrTime, COUNT(DivActualElapsedTime) FROM mytable WHERE OriginStateFips IN (10, 45, 24, 28) GROUP BY ArrTime  ORDER BY ArrTime LIMIT 5","hsqls":["SELECT ArrTime, COUNT(DivActualElapsedTime) FROM mytable WHERE OriginStateFips IN (10, 45, 24, 28) GROUP BY ArrTime  ORDER BY ArrTime LIMIT 5"]}
-{"sql":"SELECT CRSArrTime, COUNT(*) FROM mytable WHERE DivAirportIDs IN (10792, 13230, 14635, 10693) GROUP BY CRSArrTime LIMIT 10","hsqls":["SELECT CRSArrTime, COUNT(*) FROM mytable WHERE (DivAirportIDs__MV0 IN (10792, 13230, 14635, 10693) OR DivAirportIDs__MV1 IN (10792, 13230, 14635, 10693) OR DivAirportIDs__MV2 IN (10792, 13230, 14635, 10693) OR DivAirportIDs__MV3 IN (10792, 13230, 14635, 10693) OR DivAirportIDs__MV4 IN (10792, 13230, 14635, 10693)) GROUP BY CRSArrTime LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, COUNT(*) FROM mytable WHERE DivAirportIDs IN (10792, 13230, 14635, 10693) GROUP BY CRSArrTime LIMIT 10","hsqls":["SELECT CRSArrTime, COUNT(*) FROM mytable WHERE (DivAirportIDs[1] IN (10792, 13230, 14635, 10693) OR DivAirportIDs[2] IN (10792, 13230, 14635, 10693) OR DivAirportIDs[3] IN (10792, 13230, 14635, 10693) OR DivAirportIDs[4] IN (10792, 13230, 14635, 10693) OR DivAirportIDs[5] IN (10792, 13230, 14635, 10693)) GROUP BY CRSArrTime LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DestCityName, WheelsOn, MIN(DestAirportID) FROM mytable WHERE OriginState BETWEEN 'KS' AND 'WI' OR OriginAirportSeqID NOT IN (1393303, 1161203, 1298202, 1337702, 1234302) AND DestStateName = 'Washington' GROUP BY \"Year\", DestCityName, WheelsOn LIMIT 14","hsqls":["SELECT Year, DestCityName, WheelsOn, MIN(DestAirportID) FROM mytable WHERE OriginState BETWEEN 'KS' AND 'WI' OR OriginAirportSeqID NOT IN (1393303, 1161203, 1298202, 1337702, 1234302) AND DestStateName = 'Washington' GROUP BY Year, DestCityName, WheelsOn LIMIT 14"]}
 {"sql":"SELECT Flights, TaxiIn, COUNT(*) FROM mytable WHERE OriginStateFips <= 2 AND Distance BETWEEN 2311 AND 737 OR Carrier <> 'MQ' GROUP BY Flights, TaxiIn  ORDER BY Flights, TaxiIn LIMIT 10","hsqls":["SELECT Flights, TaxiIn, COUNT(*) FROM mytable WHERE OriginStateFips <= 2 AND Distance BETWEEN 2311 AND 737 OR Carrier <> 'MQ' GROUP BY Flights, TaxiIn  ORDER BY Flights, TaxiIn LIMIT 10"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepTime NOT IN (530, 714, 915, 1723) AND DestAirportID NOT IN (10792, 14262, 10980, 11867) LIMIT 11"}
-{"sql":"SELECT ArrDelay, OriginStateName, AVG(\"Month\"), SUM(DaysSinceEpoch) FROM mytable WHERE OriginCityName BETWEEN 'Bakersfield, CA' AND 'Butte, MT' AND LateAircraftDelay < 123 GROUP BY ArrDelay, OriginStateName LIMIT 10","hsqls":["SELECT ArrDelay, OriginStateName, AVG(Month), SUM(DaysSinceEpoch) FROM mytable WHERE OriginCityName BETWEEN 'Bakersfield, CA' AND 'Butte, MT' AND LateAircraftDelay < 123 GROUP BY ArrDelay, OriginStateName LIMIT 10"]}
+{"sql":"SELECT ArrDelay, OriginStateName, AVG(\"Month\"), SUM(DaysSinceEpoch) FROM mytable WHERE OriginCityName BETWEEN 'Bakersfield, CA' AND 'Butte, MT' AND LateAircraftDelay < 123 GROUP BY ArrDelay, OriginStateName LIMIT 10","hsqls":["SELECT ArrDelay, OriginStateName, AVG(`Month`), SUM(DaysSinceEpoch) FROM mytable WHERE OriginCityName BETWEEN 'Bakersfield, CA' AND 'Butte, MT' AND LateAircraftDelay < 123 GROUP BY ArrDelay, OriginStateName LIMIT 10"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE ActualElapsedTime IN (408, 251, 403, 310) ORDER BY WheelsOff, DestStateFips LIMIT 25"}
 {"sql":"SELECT DepartureDelayGroups, Flights FROM mytable WHERE DepDelayMinutes = 48.0 OR LongestAddGTime < 78 OR ActualElapsedTime BETWEEN 365 AND 256 ORDER BY DistanceGroup, ArrTime LIMIT 17"}
-{"sql":"SELECT DestStateFips FROM mytable WHERE DestStateName BETWEEN 'Montana' AND 'Wyoming' AND \"Year\" <> 2014 LIMIT 10","hsqls":["SELECT DestStateFips FROM mytable WHERE DestStateName BETWEEN 'Montana' AND 'Wyoming' AND Year <> 2014 LIMIT 10"]}
-{"sql":"SELECT ArrDel15, DivAirportIDs, ArrivalDelayGroups FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY ArrDel15 LIMIT 28","hsqls":["SELECT ArrDel15, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, ArrivalDelayGroups FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE DivTailNums IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DestState BETWEEN 'ME' AND 'SC' ORDER BY TaxiOut, CRSArrTime, DestStateName LIMIT 26","hsqls":["SELECT DestCityName FROM mytable WHERE (DivTailNums__MV0 IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums__MV1 IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums__MV2 IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums__MV3 IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums__MV4 IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG')) OR DestState BETWEEN 'ME' AND 'SC' ORDER BY TaxiOut, CRSArrTime, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DestStateFips FROM mytable WHERE DestStateName BETWEEN 'Montana' AND 'Wyoming' AND \"Year\" <> 2014 LIMIT 10","hsqls":["SELECT DestStateFips FROM mytable WHERE DestStateName BETWEEN 'Montana' AND 'Wyoming' AND `Year` <> 2014 LIMIT 10"]}
+{"sql":"SELECT ArrDel15, DivAirportIDs, ArrivalDelayGroups FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY ArrDel15 LIMIT 28","hsqls":["SELECT ArrDel15, DivAirportIDs, ArrivalDelayGroups FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE DivTailNums IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DestState BETWEEN 'ME' AND 'SC' ORDER BY TaxiOut, CRSArrTime, DestStateName LIMIT 26","hsqls":["SELECT DestCityName FROM mytable WHERE (DivTailNums[1] IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums[2] IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums[3] IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums[4] IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG') OR DivTailNums[5] IN ('N636JB', 'N1EAMQ', 'N219AG', 'N223AG')) OR DestState BETWEEN 'ME' AND 'SC' ORDER BY TaxiOut, CRSArrTime, DestStateName LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DestStateFips NOT IN (21, 48, 45, 22, 9) OR DestAirportSeqID <> 1425202 AND TailNum BETWEEN 'N809SK' AND 'N812MQ' LIMIT 10"}
 {"sql":"SELECT DepDel15, MAX(ArrDelay), MAX(DepDelayMinutes), COUNT(DayOfWeek) FROM mytable WHERE DestAirportSeqID IN (1099002, 1152502, 1498603, 1071302) AND CRSDepTime BETWEEN 1412 AND 1240 GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 25","hsqls":["SELECT DepDel15, MAX(ArrDelay), MAX(DepDelayMinutes), COUNT(DayOfWeek) FROM mytable WHERE DestAirportSeqID IN (1099002, 1152502, 1498603, 1071302) AND CRSDepTime BETWEEN 1412 AND 1240 GROUP BY DepDel15  ORDER BY DepDel15 LIMIT 25"]}
-{"sql":"SELECT OriginCityMarketID, DestAirportSeqID, TailNum, COUNT(*) FROM mytable WHERE \"Year\" > 2014 AND DestStateName BETWEEN 'Tennessee' AND 'Wyoming' GROUP BY OriginCityMarketID, DestAirportSeqID, TailNum LIMIT 8","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID, TailNum, COUNT(*) FROM mytable WHERE Year > 2014 AND DestStateName BETWEEN 'Tennessee' AND 'Wyoming' GROUP BY OriginCityMarketID, DestAirportSeqID, TailNum LIMIT 8"]}
-{"sql":"SELECT LongestAddGTime FROM mytable WHERE NASDelay BETWEEN 202 AND 228 OR DivWheelsOffs < 9 ORDER BY DivReachedDest, OriginCityName, DepTimeBlk LIMIT 20","hsqls":["SELECT LongestAddGTime FROM mytable WHERE NASDelay BETWEEN 202 AND 228 OR (DivWheelsOffs__MV0 < 9 OR DivWheelsOffs__MV1 < 9 OR DivWheelsOffs__MV2 < 9 OR DivWheelsOffs__MV3 < 9 OR DivWheelsOffs__MV4 < 9) ORDER BY DivReachedDest, OriginCityName, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DestAirportSeqID, TailNum, COUNT(*) FROM mytable WHERE \"Year\" > 2014 AND DestStateName BETWEEN 'Tennessee' AND 'Wyoming' GROUP BY OriginCityMarketID, DestAirportSeqID, TailNum LIMIT 8","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID, TailNum, COUNT(*) FROM mytable WHERE `Year` > 2014 AND DestStateName BETWEEN 'Tennessee' AND 'Wyoming' GROUP BY OriginCityMarketID, DestAirportSeqID, TailNum LIMIT 8"]}
+{"sql":"SELECT LongestAddGTime FROM mytable WHERE NASDelay BETWEEN 202 AND 228 OR DivWheelsOffs < 9 ORDER BY DivReachedDest, OriginCityName, DepTimeBlk LIMIT 20","hsqls":["SELECT LongestAddGTime FROM mytable WHERE NASDelay BETWEEN 202 AND 228 OR (DivWheelsOffs[1] < 9 OR DivWheelsOffs[2] < 9 OR DivWheelsOffs[3] < 9 OR DivWheelsOffs[4] < 9 OR DivWheelsOffs[5] < 9) ORDER BY DivReachedDest, OriginCityName, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable WHERE FlightNum <> 4830 AND OriginCityName NOT IN ('Modesto, CA', 'Helena, MT') OR DivArrDelay BETWEEN 944 AND 471 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 27","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable WHERE FlightNum <> 4830 AND OriginCityName NOT IN ('Modesto, CA', 'Helena, MT') OR DivArrDelay BETWEEN 944 AND 471 GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 27"]}
 {"sql":"SELECT Cancelled, DayofMonth FROM mytable WHERE NASDelay < 55 AND CRSDepTime BETWEEN 2159 AND 1514 ORDER BY DestStateFips, DayofMonth LIMIT 5"}
 {"sql":"SELECT SUM(DivAirportLandings), SUM(OriginAirportSeqID) FROM mytable LIMIT 27"}
@@ -8343,14 +8343,14 @@
 {"sql":"SELECT Diverted, DestState, DepDel15, MAX(DistanceGroup), AVG(FirstDepTime) FROM mytable GROUP BY Diverted, DestState, DepDel15  ORDER BY Diverted, DestState, DepDel15 LIMIT 11","hsqls":["SELECT Diverted, DestState, DepDel15, MAX(DistanceGroup), AVG(FirstDepTime) FROM mytable GROUP BY Diverted, DestState, DepDel15  ORDER BY Diverted, DestState, DepDel15 LIMIT 11"]}
 {"sql":"SELECT ActualElapsedTime, DestCityName, DaysSinceEpoch FROM mytable ORDER BY OriginAirportSeqID, ArrTimeBlk LIMIT 1"}
 {"sql":"SELECT OriginStateName FROM mytable WHERE Diverted >= 1 LIMIT 16"}
-{"sql":"SELECT OriginCityMarketID, DepTime, DivTailNums FROM mytable WHERE ActualElapsedTime IN (78, 57, 120, 71, 321) AND DayofMonth > 20 AND OriginState = 'MD' ORDER BY DestAirportSeqID LIMIT 4","hsqls":["SELECT OriginCityMarketID, DepTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE ActualElapsedTime IN (78, 57, 120, 71, 321) AND DayofMonth > 20 AND OriginState = 'MD' ORDER BY DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, DepTime, DivTailNums FROM mytable WHERE ActualElapsedTime IN (78, 57, 120, 71, 321) AND DayofMonth > 20 AND OriginState = 'MD' ORDER BY DestAirportSeqID LIMIT 4","hsqls":["SELECT OriginCityMarketID, DepTime, DivTailNums FROM mytable WHERE ActualElapsedTime IN (78, 57, 120, 71, 321) AND DayofMonth > 20 AND OriginState = 'MD' ORDER BY DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DepTime, ArrDel15, ArrivalDelayGroups FROM mytable LIMIT 9"}
 {"sql":"SELECT CarrierDelay, CRSDepTime, AVG(DestWac) FROM mytable WHERE Flights <= 1 OR UniqueCarrier IN ('EV', 'DL', 'HA') GROUP BY CarrierDelay, CRSDepTime","hsqls":["SELECT CarrierDelay, CRSDepTime, AVG(DestWac) FROM mytable WHERE Flights <= 1 OR UniqueCarrier IN ('EV', 'DL', 'HA') GROUP BY CarrierDelay, CRSDepTime"]}
 {"sql":"SELECT DayofMonth, MAX(DestStateFips), MIN(DivDistance), MAX(LateAircraftDelay) FROM mytable GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 21","hsqls":["SELECT DayofMonth, MAX(DestStateFips), MIN(DivDistance), MAX(LateAircraftDelay) FROM mytable GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 21"]}
 {"sql":"SELECT DestWac, OriginCityName, ArrDel15 FROM mytable WHERE CRSArrTime = 1 ORDER BY WheelsOff, CarrierDelay LIMIT 16"}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE FlightNum < 182 ORDER BY Diverted, NASDelay, OriginStateName LIMIT 2"}
-{"sql":"SELECT Distance, OriginCityName FROM mytable WHERE DivDistance BETWEEN 667 AND 453 AND DivAirportIDs IN (12889) LIMIT 18","hsqls":["SELECT Distance, OriginCityName FROM mytable WHERE DivDistance BETWEEN 667 AND 453 AND (DivAirportIDs__MV0 IN (12889) OR DivAirportIDs__MV1 IN (12889) OR DivAirportIDs__MV2 IN (12889) OR DivAirportIDs__MV3 IN (12889) OR DivAirportIDs__MV4 IN (12889)) LIMIT 10000"]}
-{"sql":"SELECT Quarter, LongestAddGTime, DaysSinceEpoch, SUM(OriginAirportID), AVG(ArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE DestAirportID BETWEEN 13232 AND 10800 OR DivAirportSeqIDs IN (1452401, 1469605, 1199603, 1233904, 1069302) GROUP BY Quarter, LongestAddGTime, DaysSinceEpoch LIMIT 3","hsqls":["SELECT Quarter, LongestAddGTime, DaysSinceEpoch, SUM(OriginAirportID), AVG(ArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE DestAirportID BETWEEN 13232 AND 10800 OR (DivAirportSeqIDs__MV0 IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs__MV1 IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs__MV2 IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs__MV3 IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs__MV4 IN (1452401, 1469605, 1199603, 1233904, 1069302)) GROUP BY Quarter, LongestAddGTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT Distance, OriginCityName FROM mytable WHERE DivDistance BETWEEN 667 AND 453 AND DivAirportIDs IN (12889) LIMIT 18","hsqls":["SELECT Distance, OriginCityName FROM mytable WHERE DivDistance BETWEEN 667 AND 453 AND (DivAirportIDs[1] IN (12889) OR DivAirportIDs[2] IN (12889) OR DivAirportIDs[3] IN (12889) OR DivAirportIDs[4] IN (12889) OR DivAirportIDs[5] IN (12889)) LIMIT 10000"]}
+{"sql":"SELECT Quarter, LongestAddGTime, DaysSinceEpoch, SUM(OriginAirportID), AVG(ArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE DestAirportID BETWEEN 13232 AND 10800 OR DivAirportSeqIDs IN (1452401, 1469605, 1199603, 1233904, 1069302) GROUP BY Quarter, LongestAddGTime, DaysSinceEpoch LIMIT 3","hsqls":["SELECT Quarter, LongestAddGTime, DaysSinceEpoch, SUM(OriginAirportID), AVG(ArrDelay), AVG(DepDelayMinutes) FROM mytable WHERE DestAirportID BETWEEN 13232 AND 10800 OR (DivAirportSeqIDs[1] IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs[2] IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs[3] IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs[4] IN (1452401, 1469605, 1199603, 1233904, 1069302) OR DivAirportSeqIDs[5] IN (1452401, 1469605, 1199603, 1233904, 1069302)) GROUP BY Quarter, LongestAddGTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, LateAircraftDelay, DepDel15 FROM mytable WHERE DestState BETWEEN 'LA' AND 'PA' OR Dest <> 'STL' AND LateAircraftDelay BETWEEN 120 AND 132 ORDER BY CRSArrTime, Distance LIMIT 15"}
 {"sql":"SELECT AVG(DestAirportSeqID) FROM mytable LIMIT 11"}
 {"sql":"SELECT DestStateName, DayOfWeek, AVG(SecurityDelay) FROM mytable GROUP BY DestStateName, DayOfWeek  ORDER BY DestStateName, DayOfWeek LIMIT 25","hsqls":["SELECT DestStateName, DayOfWeek, AVG(SecurityDelay) FROM mytable GROUP BY DestStateName, DayOfWeek  ORDER BY DestStateName, DayOfWeek LIMIT 25"]}
@@ -8359,18 +8359,18 @@
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivDistance BETWEEN 112 AND 183 AND DivArrDelay BETWEEN 835 AND 191 AND DayOfWeek = 3 LIMIT 13"}
 {"sql":"SELECT DivReachedDest FROM mytable WHERE Carrier < 'WN' LIMIT 25"}
 {"sql":"SELECT CancellationCode FROM mytable ORDER BY DivDistance, DestAirportID, DivArrDelay LIMIT 17"}
-{"sql":"SELECT CRSDepTime, MAX(DepTime), AVG(TaxiIn) FROM mytable WHERE DivDistance IN (349, 277, 215, 94, 24) AND DivAirportIDs < 14771 GROUP BY CRSDepTime LIMIT 19","hsqls":["SELECT CRSDepTime, MAX(DepTime), AVG(TaxiIn) FROM mytable WHERE DivDistance IN (349, 277, 215, 94, 24) AND (DivAirportIDs__MV0 < 14771 OR DivAirportIDs__MV1 < 14771 OR DivAirportIDs__MV2 < 14771 OR DivAirportIDs__MV3 < 14771 OR DivAirportIDs__MV4 < 14771) GROUP BY CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime, MAX(DepTime), AVG(TaxiIn) FROM mytable WHERE DivDistance IN (349, 277, 215, 94, 24) AND DivAirportIDs < 14771 GROUP BY CRSDepTime LIMIT 19","hsqls":["SELECT CRSDepTime, MAX(DepTime), AVG(TaxiIn) FROM mytable WHERE DivDistance IN (349, 277, 215, 94, 24) AND (DivAirportIDs[1] < 14771 OR DivAirportIDs[2] < 14771 OR DivAirportIDs[3] < 14771 OR DivAirportIDs[4] < 14771 OR DivAirportIDs[5] < 14771) GROUP BY CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, AVG(DestStateFips), MIN(DaysSinceEpoch), SUM(DestAirportSeqID) FROM mytable WHERE DestCityName NOT IN ('Toledo, OH', 'Idaho Falls, ID') AND OriginWac BETWEEN 71 AND 16 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18","hsqls":["SELECT OriginStateFips, AVG(DestStateFips), MIN(DaysSinceEpoch), SUM(DestAirportSeqID) FROM mytable WHERE DestCityName NOT IN ('Toledo, OH', 'Idaho Falls, ID') AND OriginWac BETWEEN 71 AND 16 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18"]}
 {"sql":"SELECT DestState, TaxiIn, DivArrDelay FROM mytable ORDER BY ActualElapsedTime LIMIT 13"}
 {"sql":"SELECT TailNum, COUNT(DepDel15), SUM(DepartureDelayGroups) FROM mytable WHERE DestStateFips NOT IN (6, 18, 15) AND LateAircraftDelay <> -9999 GROUP BY TailNum  ORDER BY TailNum LIMIT 17","hsqls":["SELECT TailNum, COUNT(DepDel15), SUM(DepartureDelayGroups) FROM mytable WHERE DestStateFips NOT IN (6, 18, 15) AND LateAircraftDelay <> -9999 GROUP BY TailNum  ORDER BY TailNum LIMIT 17"]}
 {"sql":"SELECT TailNum, DepTimeBlk, CRSDepTime, MAX(OriginCityMarketID), MIN(DepDel15) FROM mytable WHERE DistanceGroup IN (1, 11) OR DivDistance <> 912 AND DepartureDelayGroups BETWEEN -1 AND 12 GROUP BY TailNum, DepTimeBlk, CRSDepTime  ORDER BY TailNum, DepTimeBlk, CRSDepTime LIMIT 9","hsqls":["SELECT TailNum, DepTimeBlk, CRSDepTime, MAX(OriginCityMarketID), MIN(DepDel15) FROM mytable WHERE DistanceGroup IN (1, 11) OR DivDistance <> 912 AND DepartureDelayGroups BETWEEN -1 AND 12 GROUP BY TailNum, DepTimeBlk, CRSDepTime  ORDER BY TailNum, DepTimeBlk, CRSDepTime LIMIT 9"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY DestWac, CRSDepTime LIMIT 27","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY DestWac, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY DestWac, CRSDepTime LIMIT 27","hsqls":["SELECT DivTotalGTimes FROM mytable ORDER BY DestWac, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips FROM mytable ORDER BY ArrTime, Origin, OriginWac LIMIT 4"}
 {"sql":"SELECT WheelsOff, LateAircraftDelay, TaxiIn FROM mytable WHERE TailNum BETWEEN 'N78511' AND 'N30401' AND Distance > 407 OR CRSDepTime <> 35 ORDER BY Distance, Origin, AirlineID LIMIT 9"}
-{"sql":"SELECT Distance, DepTime, \"Month\", COUNT(*) FROM mytable WHERE DestState BETWEEN 'NV' AND 'TT' GROUP BY Distance, DepTime, \"Month\" LIMIT 3","hsqls":["SELECT Distance, DepTime, Month, COUNT(*) FROM mytable WHERE DestState BETWEEN 'NV' AND 'TT' GROUP BY Distance, DepTime, Month LIMIT 3"]}
-{"sql":"SELECT DayofMonth, DivTotalGTimes, DaysSinceEpoch FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY CRSArrTime, Cancelled, DayofMonth LIMIT 12","hsqls":["SELECT DayofMonth, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4, DaysSinceEpoch FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY CRSArrTime, Cancelled, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, DepDel15, MAX(Cancelled) FROM mytable WHERE DivTailNums IN ('N587JB', 'N8607M', 'N638MQ') GROUP BY DivReachedDest, DepDel15 LIMIT 2","hsqls":["SELECT DivReachedDest, DepDel15, MAX(Cancelled) FROM mytable WHERE (DivTailNums__MV0 IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums__MV1 IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums__MV2 IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums__MV3 IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums__MV4 IN ('N587JB', 'N8607M', 'N638MQ')) GROUP BY DivReachedDest, DepDel15 LIMIT 10000"]}
-{"sql":"SELECT DestCityMarketID FROM mytable WHERE FlightDate > '2014-01-12' AND DivLongestGTimes < 9.0 AND DivLongestGTimes >= 69.0 LIMIT 9","hsqls":["SELECT DestCityMarketID FROM mytable WHERE FlightDate > '2014-01-12' AND (DivLongestGTimes__MV0 < 9.0 OR DivLongestGTimes__MV1 < 9.0 OR DivLongestGTimes__MV2 < 9.0 OR DivLongestGTimes__MV3 < 9.0 OR DivLongestGTimes__MV4 < 9.0) AND (DivLongestGTimes__MV0 >= 69.0 OR DivLongestGTimes__MV1 >= 69.0 OR DivLongestGTimes__MV2 >= 69.0 OR DivLongestGTimes__MV3 >= 69.0 OR DivLongestGTimes__MV4 >= 69.0) LIMIT 10000"]}
+{"sql":"SELECT Distance, DepTime, \"Month\", COUNT(*) FROM mytable WHERE DestState BETWEEN 'NV' AND 'TT' GROUP BY Distance, DepTime, \"Month\" LIMIT 3","hsqls":["SELECT Distance, DepTime, Month, COUNT(*) FROM mytable WHERE DestState BETWEEN 'NV' AND 'TT' GROUP BY Distance, DepTime, `Month` LIMIT 3"]}
+{"sql":"SELECT DayofMonth, DivTotalGTimes, DaysSinceEpoch FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY CRSArrTime, Cancelled, DayofMonth LIMIT 12","hsqls":["SELECT DayofMonth, DivTotalGTimes, DaysSinceEpoch FROM mytable WHERE Diverted BETWEEN 0 AND 1 ORDER BY CRSArrTime, Cancelled, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DepDel15, MAX(Cancelled) FROM mytable WHERE DivTailNums IN ('N587JB', 'N8607M', 'N638MQ') GROUP BY DivReachedDest, DepDel15 LIMIT 2","hsqls":["SELECT DivReachedDest, DepDel15, MAX(Cancelled) FROM mytable WHERE (DivTailNums[1] IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums[2] IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums[3] IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums[4] IN ('N587JB', 'N8607M', 'N638MQ') OR DivTailNums[5] IN ('N587JB', 'N8607M', 'N638MQ')) GROUP BY DivReachedDest, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID FROM mytable WHERE FlightDate > '2014-01-12' AND DivLongestGTimes < 9.0 AND DivLongestGTimes >= 69.0 LIMIT 9","hsqls":["SELECT DestCityMarketID FROM mytable WHERE FlightDate > '2014-01-12' AND (DivLongestGTimes[1] < 9.0 OR DivLongestGTimes[2] < 9.0 OR DivLongestGTimes[3] < 9.0 OR DivLongestGTimes[4] < 9.0 OR DivLongestGTimes[5] < 9.0) AND (DivLongestGTimes[1] >= 69.0 OR DivLongestGTimes[2] >= 69.0 OR DivLongestGTimes[3] >= 69.0 OR DivLongestGTimes[4] >= 69.0 OR DivLongestGTimes[5] >= 69.0) LIMIT 10000"]}
 {"sql":"SELECT Distance FROM mytable WHERE Carrier > 'HA' OR CRSDepTime NOT IN (1921, 2209, 1737, 1126) ORDER BY AirlineID, WheelsOn LIMIT 16"}
 {"sql":"SELECT FlightDate FROM mytable WHERE NASDelay NOT IN (202, 14) ORDER BY OriginWac, CancellationCode, UniqueCarrier LIMIT 29"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 17"}
@@ -8380,7 +8380,7 @@
 {"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 AND LongestAddGTime > 30 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 26","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 AND LongestAddGTime > 30 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 26"]}
 {"sql":"SELECT DistanceGroup, DepTime, WheelsOn FROM mytable WHERE Distance <> 750 OR DepTime BETWEEN 913 AND 1023 ORDER BY DistanceGroup, Origin LIMIT 16"}
 {"sql":"SELECT DestStateName, COUNT(Carrier), MAX(Distance) FROM mytable WHERE DestWac < 84 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 15","hsqls":["SELECT DestStateName, COUNT(Carrier), MAX(Distance) FROM mytable WHERE DestWac < 84 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 15"]}
-{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY ArrDel15, OriginAirportID LIMIT 21","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY ArrDel15, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable ORDER BY ArrDel15, OriginAirportID LIMIT 21","hsqls":["SELECT DivAirportIDs FROM mytable ORDER BY ArrDel15, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE AirTime BETWEEN 397 AND 252 OR Dest NOT IN ('TPA', 'OMA') ORDER BY CancellationCode LIMIT 25"}
 {"sql":"SELECT DivDistance, DepTime, TaxiIn, COUNT(*) FROM mytable GROUP BY DivDistance, DepTime, TaxiIn  ORDER BY DivDistance, DepTime, TaxiIn LIMIT 8","hsqls":["SELECT DivDistance, DepTime, TaxiIn, COUNT(*) FROM mytable GROUP BY DivDistance, DepTime, TaxiIn  ORDER BY DivDistance, DepTime, TaxiIn LIMIT 8"]}
 {"sql":"SELECT Diverted, Origin, MAX(TaxiOut), COUNT(DepDelayMinutes) FROM mytable GROUP BY Diverted, Origin  ORDER BY Diverted, Origin LIMIT 10","hsqls":["SELECT Diverted, Origin, MAX(TaxiOut), COUNT(DepDelayMinutes) FROM mytable GROUP BY Diverted, Origin  ORDER BY Diverted, Origin LIMIT 10"]}
@@ -8388,113 +8388,113 @@
 {"sql":"SELECT TaxiIn, COUNT(DestStateName), SUM(OriginAirportSeqID), MAX(AirTime) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10","hsqls":["SELECT TaxiIn, COUNT(DestStateName), SUM(OriginAirportSeqID), MAX(AirTime) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 10"]}
 {"sql":"SELECT OriginAirportSeqID, FirstDepTime, ArrivalDelayGroups FROM mytable WHERE Flights = 1 OR DivDistance IN (761, 304, 233) AND ActualElapsedTime > 146 ORDER BY LongestAddGTime, DestStateFips, FlightDate LIMIT 16"}
 {"sql":"SELECT Cancelled, MIN(AirTime), SUM(DivDistance) FROM mytable WHERE Carrier BETWEEN 'US' AND 'UA' OR CancellationCode = 'A' AND WheelsOn NOT IN (724, 1955) GROUP BY Cancelled  ORDER BY Cancelled LIMIT 1","hsqls":["SELECT Cancelled, MIN(AirTime), SUM(DivDistance) FROM mytable WHERE Carrier BETWEEN 'US' AND 'UA' OR CancellationCode = 'A' AND WheelsOn NOT IN (724, 1955) GROUP BY Cancelled  ORDER BY Cancelled LIMIT 1"]}
-{"sql":"SELECT FirstDepTime, DestStateFips FROM mytable WHERE NASDelay NOT IN (202, 305, 16, 60) AND DivTailNums IN ('N373SW') LIMIT 17","hsqls":["SELECT FirstDepTime, DestStateFips FROM mytable WHERE NASDelay NOT IN (202, 305, 16, 60) AND (DivTailNums__MV0 IN ('N373SW') OR DivTailNums__MV1 IN ('N373SW') OR DivTailNums__MV2 IN ('N373SW') OR DivTailNums__MV3 IN ('N373SW') OR DivTailNums__MV4 IN ('N373SW')) LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DestStateFips FROM mytable WHERE NASDelay NOT IN (202, 305, 16, 60) AND DivTailNums IN ('N373SW') LIMIT 17","hsqls":["SELECT FirstDepTime, DestStateFips FROM mytable WHERE NASDelay NOT IN (202, 305, 16, 60) AND (DivTailNums[1] IN ('N373SW') OR DivTailNums[2] IN ('N373SW') OR DivTailNums[3] IN ('N373SW') OR DivTailNums[4] IN ('N373SW') OR DivTailNums[5] IN ('N373SW')) LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, TailNum FROM mytable WHERE ArrTime NOT IN (45, 1315, 2036, 1152, 2200) OR OriginWac BETWEEN 91 AND 85 OR FlightNum BETWEEN 491 AND 5155 LIMIT 13"}
-{"sql":"SELECT DestStateFips, DestStateName, CRSElapsedTime FROM mytable WHERE DivWheelsOns > 1351 AND DivAirportSeqIDs < 1226402 OR WeatherDelay BETWEEN 55 AND 45 ORDER BY DepDelay LIMIT 29","hsqls":["SELECT DestStateFips, DestStateName, CRSElapsedTime FROM mytable WHERE (DivWheelsOns__MV0 > 1351 OR DivWheelsOns__MV1 > 1351 OR DivWheelsOns__MV2 > 1351 OR DivWheelsOns__MV3 > 1351 OR DivWheelsOns__MV4 > 1351) AND (DivAirportSeqIDs__MV0 < 1226402 OR DivAirportSeqIDs__MV1 < 1226402 OR DivAirportSeqIDs__MV2 < 1226402 OR DivAirportSeqIDs__MV3 < 1226402 OR DivAirportSeqIDs__MV4 < 1226402) OR WeatherDelay BETWEEN 55 AND 45 ORDER BY DepDelay LIMIT 10000"]}
-{"sql":"SELECT TaxiOut FROM mytable WHERE DivActualElapsedTime NOT IN (200, 801, 218, 461) AND DivAirports IN ('PHL', 'RFD', 'LIT') LIMIT 28","hsqls":["SELECT TaxiOut FROM mytable WHERE DivActualElapsedTime NOT IN (200, 801, 218, 461) AND (DivAirports__MV0 IN ('PHL', 'RFD', 'LIT') OR DivAirports__MV1 IN ('PHL', 'RFD', 'LIT') OR DivAirports__MV2 IN ('PHL', 'RFD', 'LIT') OR DivAirports__MV3 IN ('PHL', 'RFD', 'LIT') OR DivAirports__MV4 IN ('PHL', 'RFD', 'LIT')) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DestStateName, CRSElapsedTime FROM mytable WHERE DivWheelsOns > 1351 AND DivAirportSeqIDs < 1226402 OR WeatherDelay BETWEEN 55 AND 45 ORDER BY DepDelay LIMIT 29","hsqls":["SELECT DestStateFips, DestStateName, CRSElapsedTime FROM mytable WHERE (DivWheelsOns[1] > 1351 OR DivWheelsOns[2] > 1351 OR DivWheelsOns[3] > 1351 OR DivWheelsOns[4] > 1351 OR DivWheelsOns[5] > 1351) AND (DivAirportSeqIDs[1] < 1226402 OR DivAirportSeqIDs[2] < 1226402 OR DivAirportSeqIDs[3] < 1226402 OR DivAirportSeqIDs[4] < 1226402 OR DivAirportSeqIDs[5] < 1226402) OR WeatherDelay BETWEEN 55 AND 45 ORDER BY DepDelay LIMIT 10000"]}
+{"sql":"SELECT TaxiOut FROM mytable WHERE DivActualElapsedTime NOT IN (200, 801, 218, 461) AND DivAirports IN ('PHL', 'RFD', 'LIT') LIMIT 28","hsqls":["SELECT TaxiOut FROM mytable WHERE DivActualElapsedTime NOT IN (200, 801, 218, 461) AND (DivAirports[1] IN ('PHL', 'RFD', 'LIT') OR DivAirports[2] IN ('PHL', 'RFD', 'LIT') OR DivAirports[3] IN ('PHL', 'RFD', 'LIT') OR DivAirports[4] IN ('PHL', 'RFD', 'LIT') OR DivAirports[5] IN ('PHL', 'RFD', 'LIT')) LIMIT 10000"]}
 {"sql":"SELECT AirlineID, MIN(FlightNum), MAX(ArrDelayMinutes) FROM mytable WHERE DestWac = 82 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 4","hsqls":["SELECT AirlineID, MIN(FlightNum), MAX(ArrDelayMinutes) FROM mytable WHERE DestWac = 82 GROUP BY AirlineID  ORDER BY AirlineID LIMIT 4"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CancellationCode = 'B' LIMIT 7"}
 {"sql":"SELECT SUM(WheelsOff), MAX(DivAirportLandings) FROM mytable WHERE ArrDelayMinutes > 220.0 OR OriginCityMarketID IN (32951) OR Quarter BETWEEN 1 AND 1 LIMIT 3"}
 {"sql":"SELECT SUM(DaysSinceEpoch) FROM mytable WHERE DepDel15 IN (0, -9999) LIMIT 20"}
 {"sql":"SELECT DestStateFips, DestCityMarketID FROM mytable LIMIT 25"}
-{"sql":"SELECT Dest FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DestStateName < 'Missouri' ORDER BY DestCityName, NASDelay LIMIT 25","hsqls":["SELECT Dest FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND DestStateName < 'Missouri' ORDER BY DestCityName, NASDelay LIMIT 25"]}
+{"sql":"SELECT Dest FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DestStateName < 'Missouri' ORDER BY DestCityName, NASDelay LIMIT 25","hsqls":["SELECT Dest FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND DestStateName < 'Missouri' ORDER BY DestCityName, NASDelay LIMIT 25"]}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY ActualElapsedTime, DayOfWeek LIMIT 21"}
-{"sql":"SELECT DestWac, DivDistance FROM mytable WHERE ArrTime > 1213 OR LongestAddGTime <= 97 OR \"Year\" = 2014 ORDER BY DivReachedDest, NASDelay, AirlineID LIMIT 4","hsqls":["SELECT DestWac, DivDistance FROM mytable WHERE ArrTime > 1213 OR LongestAddGTime <= 97 OR Year = 2014 ORDER BY DivReachedDest, NASDelay, AirlineID LIMIT 4"]}
+{"sql":"SELECT DestWac, DivDistance FROM mytable WHERE ArrTime > 1213 OR LongestAddGTime <= 97 OR \"Year\" = 2014 ORDER BY DivReachedDest, NASDelay, AirlineID LIMIT 4","hsqls":["SELECT DestWac, DivDistance FROM mytable WHERE ArrTime > 1213 OR LongestAddGTime <= 97 OR `Year` = 2014 ORDER BY DivReachedDest, NASDelay, AirlineID LIMIT 4"]}
 {"sql":"SELECT ActualElapsedTime, Cancelled, CancellationCode, COUNT(*) FROM mytable WHERE DestStateName >= 'West Virginia' OR TaxiIn = 2 GROUP BY ActualElapsedTime, Cancelled, CancellationCode  ORDER BY ActualElapsedTime, Cancelled, CancellationCode LIMIT 3","hsqls":["SELECT ActualElapsedTime, Cancelled, CancellationCode, COUNT(*) FROM mytable WHERE DestStateName >= 'West Virginia' OR TaxiIn = 2 GROUP BY ActualElapsedTime, Cancelled, CancellationCode  ORDER BY ActualElapsedTime, Cancelled, CancellationCode LIMIT 3"]}
-{"sql":"SELECT DivReachedDest, DivAirports, DestAirportSeqID FROM mytable WHERE Cancelled IN (1, 0) ORDER BY ArrTime, UniqueCarrier, \"Month\" LIMIT 27","hsqls":["SELECT DivReachedDest, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportSeqID FROM mytable WHERE Cancelled IN (1, 0) ORDER BY ArrTime, UniqueCarrier, Month LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, DivAirports, DestAirportSeqID FROM mytable WHERE Cancelled IN (1, 0) ORDER BY ArrTime, UniqueCarrier, \"Month\" LIMIT 27","hsqls":["SELECT DivReachedDest, DivAirports, DestAirportSeqID FROM mytable WHERE Cancelled IN (1, 0) ORDER BY ArrTime, UniqueCarrier, `Month` LIMIT 10000"]}
 {"sql":"SELECT FlightDate FROM mytable WHERE Flights < 1 OR OriginWac > 88 OR DestCityName IN ('Tyler, TX', 'Aguadilla, PR') ORDER BY LongestAddGTime LIMIT 10"}
 {"sql":"SELECT DepartureDelayGroups, LateAircraftDelay, ArrTime FROM mytable ORDER BY OriginStateName LIMIT 1"}
 {"sql":"SELECT WeatherDelay, SUM(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID IN (30431, 32177, 32982, 34236, 34027) OR AirlineID IN (20398, 19393) GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 17","hsqls":["SELECT WeatherDelay, SUM(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID IN (30431, 32177, 32982, 34236, 34027) OR AirlineID IN (20398, 19393) GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 17"]}
-{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivWheelsOns BETWEEN 1023 AND 944 OR DaysSinceEpoch > 16097 OR DayofMonth NOT IN (31, 26, 28) LIMIT 10","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1023 AND 944 OR DivWheelsOns__MV1 BETWEEN 1023 AND 944 OR DivWheelsOns__MV2 BETWEEN 1023 AND 944 OR DivWheelsOns__MV3 BETWEEN 1023 AND 944 OR DivWheelsOns__MV4 BETWEEN 1023 AND 944) OR DaysSinceEpoch > 16097 OR DayofMonth NOT IN (31, 26, 28) LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DivWheelsOns BETWEEN 1023 AND 944 OR DaysSinceEpoch > 16097 OR DayofMonth NOT IN (31, 26, 28) LIMIT 10","hsqls":["SELECT DepartureDelayGroups FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1023 AND 944 OR DivWheelsOns[2] BETWEEN 1023 AND 944 OR DivWheelsOns[3] BETWEEN 1023 AND 944 OR DivWheelsOns[4] BETWEEN 1023 AND 944 OR DivWheelsOns[5] BETWEEN 1023 AND 944) OR DaysSinceEpoch > 16097 OR DayofMonth NOT IN (31, 26, 28) LIMIT 10000"]}
 {"sql":"SELECT DepDelay FROM mytable WHERE Diverted NOT IN (1, 0) OR Carrier BETWEEN 'HA' AND 'VX' AND ActualElapsedTime BETWEEN 241 AND 328 LIMIT 28"}
-{"sql":"SELECT Diverted, Cancelled, CRSDepTime, MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 GROUP BY Diverted, Cancelled, CRSDepTime LIMIT 4","hsqls":["SELECT Diverted, Cancelled, CRSDepTime, MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE Month BETWEEN 1 AND 1 GROUP BY Diverted, Cancelled, CRSDepTime LIMIT 4"]}
-{"sql":"SELECT CRSArrTime, DivAirportSeqIDs FROM mytable WHERE CRSElapsedTime BETWEEN 289 AND 150 OR Quarter IN (1) AND DayOfWeek >= 6 ORDER BY OriginState, DivActualElapsedTime, OriginStateName LIMIT 18","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE CRSElapsedTime BETWEEN 289 AND 150 OR Quarter IN (1) AND DayOfWeek >= 6 ORDER BY OriginState, DivActualElapsedTime, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT Diverted, Cancelled, CRSDepTime, MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 GROUP BY Diverted, Cancelled, CRSDepTime LIMIT 4","hsqls":["SELECT Diverted, Cancelled, CRSDepTime, MAX(TaxiOut), AVG(DepTime) FROM mytable WHERE `Month` BETWEEN 1 AND 1 GROUP BY Diverted, Cancelled, CRSDepTime LIMIT 4"]}
+{"sql":"SELECT CRSArrTime, DivAirportSeqIDs FROM mytable WHERE CRSElapsedTime BETWEEN 289 AND 150 OR Quarter IN (1) AND DayOfWeek >= 6 ORDER BY OriginState, DivActualElapsedTime, OriginStateName LIMIT 18","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs FROM mytable WHERE CRSElapsedTime BETWEEN 289 AND 150 OR Quarter IN (1) AND DayOfWeek >= 6 ORDER BY OriginState, DivActualElapsedTime, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT OriginState, DayofMonth, UniqueCarrier FROM mytable WHERE DivAirportLandings >= 9 OR OriginAirportID NOT IN (10980, 12888, 10685, 11111) ORDER BY DestStateFips LIMIT 3"}
-{"sql":"SELECT DepartureDelayGroups, NASDelay, DivAirportIDs FROM mytable ORDER BY LateAircraftDelay, FirstDepTime LIMIT 11","hsqls":["SELECT DepartureDelayGroups, NASDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY LateAircraftDelay, FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, NASDelay, DivAirportIDs FROM mytable ORDER BY LateAircraftDelay, FirstDepTime LIMIT 11","hsqls":["SELECT DepartureDelayGroups, NASDelay, DivAirportIDs FROM mytable ORDER BY LateAircraftDelay, FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID, COUNT(*) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 16","hsqls":["SELECT OriginAirportID, COUNT(*) FROM mytable GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 16"]}
 {"sql":"SELECT DepDelayMinutes, COUNT(*) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 7","hsqls":["SELECT DepDelayMinutes, COUNT(*) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 7"]}
 {"sql":"SELECT OriginStateFips FROM mytable WHERE DestCityName IN ('Tucson, AZ', 'Grand Island, NE', 'Medford, OR', 'El Paso, TX', 'Elko, NV') OR DivReachedDest BETWEEN 0 AND 1 ORDER BY ArrTimeBlk, AirTime, DaysSinceEpoch LIMIT 10"}
 {"sql":"SELECT DepTime, CancellationCode, COUNT(*) FROM mytable WHERE DepDel15 >= 1 OR DestAirportID < 14679 GROUP BY DepTime, CancellationCode  ORDER BY DepTime, CancellationCode LIMIT 6","hsqls":["SELECT DepTime, CancellationCode, COUNT(*) FROM mytable WHERE DepDel15 >= 1 OR DestAirportID < 14679 GROUP BY DepTime, CancellationCode  ORDER BY DepTime, CancellationCode LIMIT 6"]}
 {"sql":"SELECT DepTime FROM mytable WHERE OriginStateName NOT IN ('Michigan', 'U.S. Virgin Islands', 'West Virginia', 'Iowa') AND ArrivalDelayGroups NOT IN (5, 12) AND OriginWac < 4 LIMIT 11"}
-{"sql":"SELECT WheelsOff, DepDelay, DivDistance, AVG(LongestAddGTime), MAX(\"Year\"), SUM(DestStateFips) FROM mytable GROUP BY WheelsOff, DepDelay, DivDistance LIMIT 29","hsqls":["SELECT WheelsOff, DepDelay, DivDistance, AVG(LongestAddGTime), MAX(Year), SUM(DestStateFips) FROM mytable GROUP BY WheelsOff, DepDelay, DivDistance LIMIT 29"]}
+{"sql":"SELECT WheelsOff, DepDelay, DivDistance, AVG(LongestAddGTime), MAX(\"Year\"), SUM(DestStateFips) FROM mytable GROUP BY WheelsOff, DepDelay, DivDistance LIMIT 29","hsqls":["SELECT WheelsOff, DepDelay, DivDistance, AVG(LongestAddGTime), MAX(`Year`), SUM(DestStateFips) FROM mytable GROUP BY WheelsOff, DepDelay, DivDistance LIMIT 29"]}
 {"sql":"SELECT OriginCityName, MIN(DestAirportSeqID) FROM mytable WHERE DivAirportLandings >= 2 OR DivArrDelay IN (274) GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 16","hsqls":["SELECT OriginCityName, MIN(DestAirportSeqID) FROM mytable WHERE DivAirportLandings >= 2 OR DivArrDelay IN (274) GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 16"]}
 {"sql":"SELECT OriginState, Flights, UniqueCarrier FROM mytable WHERE ActualElapsedTime >= 74 ORDER BY OriginAirportSeqID, LateAircraftDelay, AirlineID LIMIT 25"}
 {"sql":"SELECT WeatherDelay, ArrDelay FROM mytable WHERE FirstDepTime NOT IN (726, 2031, 2110, 703, 1301) ORDER BY SecurityDelay, OriginStateName LIMIT 20"}
-{"sql":"SELECT OriginAirportSeqID, DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE TaxiOut BETWEEN 9 AND 37 OR DaysSinceEpoch BETWEEN 16090 AND 16080 ORDER BY TaxiOut LIMIT 10","hsqls":["SELECT OriginAirportSeqID, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrivalDelayGroups FROM mytable WHERE TaxiOut BETWEEN 9 AND 37 OR DaysSinceEpoch BETWEEN 16090 AND 16080 ORDER BY TaxiOut LIMIT 10000"]}
-{"sql":"SELECT MIN(OriginStateFips), MAX(FirstDepTime), AVG(DestAirportID) FROM mytable WHERE DivAirportSeqIDs IN (1327702, 1323002) OR DivDistance <> 272 LIMIT 28","hsqls":["SELECT MIN(OriginStateFips), MAX(FirstDepTime), AVG(DestAirportID)  FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1327702, 1323002) OR DivAirportSeqIDs__MV1 IN (1327702, 1323002) OR DivAirportSeqIDs__MV2 IN (1327702, 1323002) OR DivAirportSeqIDs__MV3 IN (1327702, 1323002) OR DivAirportSeqIDs__MV4 IN (1327702, 1323002)) OR DivDistance <> 272 LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE TaxiOut BETWEEN 9 AND 37 OR DaysSinceEpoch BETWEEN 16090 AND 16080 ORDER BY TaxiOut LIMIT 10","hsqls":["SELECT OriginAirportSeqID, DivLongestGTimes, ArrivalDelayGroups FROM mytable WHERE TaxiOut BETWEEN 9 AND 37 OR DaysSinceEpoch BETWEEN 16090 AND 16080 ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT MIN(OriginStateFips), MAX(FirstDepTime), AVG(DestAirportID) FROM mytable WHERE DivAirportSeqIDs IN (1327702, 1323002) OR DivDistance <> 272 LIMIT 28","hsqls":["SELECT MIN(OriginStateFips), MAX(FirstDepTime), AVG(DestAirportID)  FROM mytable WHERE (DivAirportSeqIDs[1] IN (1327702, 1323002) OR DivAirportSeqIDs[2] IN (1327702, 1323002) OR DivAirportSeqIDs[3] IN (1327702, 1323002) OR DivAirportSeqIDs[4] IN (1327702, 1323002) OR DivAirportSeqIDs[5] IN (1327702, 1323002)) OR DivDistance <> 272 LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, OriginCityName, DivActualElapsedTime FROM mytable WHERE CancellationCode IN ('A') OR Flights BETWEEN 1 AND 1 AND DestCityName IN ('Los Angeles, CA', 'Dothan, AL') ORDER BY LongestAddGTime, WeatherDelay LIMIT 28"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 11"}
 {"sql":"SELECT FirstDepTime, TailNum, Dest FROM mytable ORDER BY DistanceGroup, DestStateName LIMIT 21"}
 {"sql":"SELECT DepartureDelayGroups, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE DestAirportID NOT IN (11618, 13367, 12217) OR TotalAddGTime <= 38 AND ArrDelayMinutes <> 40.0 GROUP BY DepartureDelayGroups, DestCityName, DepTimeBlk  ORDER BY DepartureDelayGroups, DestCityName, DepTimeBlk LIMIT 22","hsqls":["SELECT DepartureDelayGroups, DestCityName, DepTimeBlk, COUNT(*) FROM mytable WHERE DestAirportID NOT IN (11618, 13367, 12217) OR TotalAddGTime <= 38 AND ArrDelayMinutes <> 40.0 GROUP BY DepartureDelayGroups, DestCityName, DepTimeBlk  ORDER BY DepartureDelayGroups, DestCityName, DepTimeBlk LIMIT 22"]}
-{"sql":"SELECT Distance, DestStateFips, DestStateName, MAX(NASDelay) FROM mytable WHERE DivWheelsOffs IN (1741) AND ActualElapsedTime BETWEEN 202 AND 203 AND DistanceGroup < 10 GROUP BY Distance, DestStateFips, DestStateName LIMIT 12","hsqls":["SELECT Distance, DestStateFips, DestStateName, MAX(NASDelay) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1741) OR DivWheelsOffs__MV1 IN (1741) OR DivWheelsOffs__MV2 IN (1741) OR DivWheelsOffs__MV3 IN (1741) OR DivWheelsOffs__MV4 IN (1741)) AND ActualElapsedTime BETWEEN 202 AND 203 AND DistanceGroup < 10 GROUP BY Distance, DestStateFips, DestStateName LIMIT 10000"]}
+{"sql":"SELECT Distance, DestStateFips, DestStateName, MAX(NASDelay) FROM mytable WHERE DivWheelsOffs IN (1741) AND ActualElapsedTime BETWEEN 202 AND 203 AND DistanceGroup < 10 GROUP BY Distance, DestStateFips, DestStateName LIMIT 12","hsqls":["SELECT Distance, DestStateFips, DestStateName, MAX(NASDelay) FROM mytable WHERE (DivWheelsOffs[1] IN (1741) OR DivWheelsOffs[2] IN (1741) OR DivWheelsOffs[3] IN (1741) OR DivWheelsOffs[4] IN (1741) OR DivWheelsOffs[5] IN (1741)) AND ActualElapsedTime BETWEEN 202 AND 203 AND DistanceGroup < 10 GROUP BY Distance, DestStateFips, DestStateName LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, ArrDelay FROM mytable WHERE ArrDelay >= 92.0 AND CRSArrTime BETWEEN 1604 AND 1451 ORDER BY OriginAirportSeqID LIMIT 13"}
-{"sql":"SELECT \"Year\", OriginCityMarketID, DivAirportIDs FROM mytable LIMIT 22","hsqls":["SELECT Year, OriginCityMarketID, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivArrDelay, \"Month\", MIN(DivArrDelay), SUM(CRSArrTime) FROM mytable WHERE AirTime <> 47 OR Distance NOT IN (1061) OR DivActualElapsedTime NOT IN (230, 219, 336) GROUP BY DistanceGroup, DivArrDelay, \"Month\" LIMIT 5","hsqls":["SELECT DistanceGroup, DivArrDelay, Month, MIN(DivArrDelay), SUM(CRSArrTime) FROM mytable WHERE AirTime <> 47 OR Distance NOT IN (1061) OR DivActualElapsedTime NOT IN (230, 219, 336) GROUP BY DistanceGroup, DivArrDelay, Month LIMIT 5"]}
+{"sql":"SELECT \"Year\", OriginCityMarketID, DivAirportIDs FROM mytable LIMIT 22","hsqls":["SELECT Year, OriginCityMarketID, DivAirportIDs FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivArrDelay, \"Month\", MIN(DivArrDelay), SUM(CRSArrTime) FROM mytable WHERE AirTime <> 47 OR Distance NOT IN (1061) OR DivActualElapsedTime NOT IN (230, 219, 336) GROUP BY DistanceGroup, DivArrDelay, \"Month\" LIMIT 5","hsqls":["SELECT DistanceGroup, DivArrDelay, Month, MIN(DivArrDelay), SUM(CRSArrTime) FROM mytable WHERE AirTime <> 47 OR Distance NOT IN (1061) OR DivActualElapsedTime NOT IN (230, 219, 336) GROUP BY DistanceGroup, DivArrDelay, `Month` LIMIT 5"]}
 {"sql":"SELECT FirstDepTime, ActualElapsedTime, DestStateName, MIN(ArrDelayMinutes) FROM mytable WHERE Flights >= 1 OR Carrier NOT IN ('EV') OR Flights >= 1 GROUP BY FirstDepTime, ActualElapsedTime, DestStateName  ORDER BY FirstDepTime, ActualElapsedTime, DestStateName LIMIT 22","hsqls":["SELECT FirstDepTime, ActualElapsedTime, DestStateName, MIN(ArrDelayMinutes) FROM mytable WHERE Flights >= 1 OR Carrier NOT IN ('EV') OR Flights >= 1 GROUP BY FirstDepTime, ActualElapsedTime, DestStateName  ORDER BY FirstDepTime, ActualElapsedTime, DestStateName LIMIT 22"]}
-{"sql":"SELECT DepDelay, OriginCityName, ArrTimeBlk FROM mytable WHERE DivWheelsOns BETWEEN 1145 AND 915 LIMIT 12","hsqls":["SELECT DepDelay, OriginCityName, ArrTimeBlk FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1145 AND 915 OR DivWheelsOns__MV1 BETWEEN 1145 AND 915 OR DivWheelsOns__MV2 BETWEEN 1145 AND 915 OR DivWheelsOns__MV3 BETWEEN 1145 AND 915 OR DivWheelsOns__MV4 BETWEEN 1145 AND 915) LIMIT 10000"]}
-{"sql":"SELECT FirstDepTime, Quarter, DestAirportID, MAX(DestAirportID), MAX(Distance) FROM mytable WHERE DestStateName NOT IN ('Missouri', 'South Carolina') OR CancellationCode BETWEEN 'B' AND 'A' OR DivWheelsOns > 1227 GROUP BY FirstDepTime, Quarter, DestAirportID LIMIT 11","hsqls":["SELECT FirstDepTime, Quarter, DestAirportID, MAX(DestAirportID), MAX(Distance) FROM mytable WHERE DestStateName NOT IN ('Missouri', 'South Carolina') OR CancellationCode BETWEEN 'B' AND 'A' OR (DivWheelsOns__MV0 > 1227 OR DivWheelsOns__MV1 > 1227 OR DivWheelsOns__MV2 > 1227 OR DivWheelsOns__MV3 > 1227 OR DivWheelsOns__MV4 > 1227) GROUP BY FirstDepTime, Quarter, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DepDelay, OriginCityName, ArrTimeBlk FROM mytable WHERE DivWheelsOns BETWEEN 1145 AND 915 LIMIT 12","hsqls":["SELECT DepDelay, OriginCityName, ArrTimeBlk FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1145 AND 915 OR DivWheelsOns[2] BETWEEN 1145 AND 915 OR DivWheelsOns[3] BETWEEN 1145 AND 915 OR DivWheelsOns[4] BETWEEN 1145 AND 915 OR DivWheelsOns[5] BETWEEN 1145 AND 915) LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, Quarter, DestAirportID, MAX(DestAirportID), MAX(Distance) FROM mytable WHERE DestStateName NOT IN ('Missouri', 'South Carolina') OR CancellationCode BETWEEN 'B' AND 'A' OR DivWheelsOns > 1227 GROUP BY FirstDepTime, Quarter, DestAirportID LIMIT 11","hsqls":["SELECT FirstDepTime, Quarter, DestAirportID, MAX(DestAirportID), MAX(Distance) FROM mytable WHERE DestStateName NOT IN ('Missouri', 'South Carolina') OR CancellationCode BETWEEN 'B' AND 'A' OR (DivWheelsOns[1] > 1227 OR DivWheelsOns[2] > 1227 OR DivWheelsOns[3] > 1227 OR DivWheelsOns[4] > 1227 OR DivWheelsOns[5] > 1227) GROUP BY FirstDepTime, Quarter, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT OriginState, ArrivalDelayGroups FROM mytable ORDER BY WheelsOff LIMIT 14"}
 {"sql":"SELECT Flights, CRSElapsedTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 OR OriginState NOT IN ('OK') GROUP BY Flights, CRSElapsedTime, DivActualElapsedTime  ORDER BY Flights, CRSElapsedTime, DivActualElapsedTime LIMIT 17","hsqls":["SELECT Flights, CRSElapsedTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 2 OR OriginState NOT IN ('OK') GROUP BY Flights, CRSElapsedTime, DivActualElapsedTime  ORDER BY Flights, CRSElapsedTime, DivActualElapsedTime LIMIT 17"]}
 {"sql":"SELECT Origin, DepTimeBlk, COUNT(AirlineID) FROM mytable WHERE WheelsOn NOT IN (813, 809) AND OriginAirportID BETWEEN 11308 AND 11637 GROUP BY Origin, DepTimeBlk  ORDER BY Origin, DepTimeBlk LIMIT 6","hsqls":["SELECT Origin, DepTimeBlk, COUNT(AirlineID) FROM mytable WHERE WheelsOn NOT IN (813, 809) AND OriginAirportID BETWEEN 11308 AND 11637 GROUP BY Origin, DepTimeBlk  ORDER BY Origin, DepTimeBlk LIMIT 6"]}
 {"sql":"SELECT FirstDepTime, MAX(ArrDelayMinutes), MAX(OriginAirportID), MAX(WeatherDelay) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 9","hsqls":["SELECT FirstDepTime, MAX(ArrDelayMinutes), MAX(OriginAirportID), MAX(WeatherDelay) FROM mytable GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 9"]}
-{"sql":"SELECT DepDelayMinutes, SecurityDelay, ArrDelay, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE DivAirports BETWEEN 'BTV' AND 'LAX' OR DivAirportIDs IN (12892, 13796) GROUP BY DepDelayMinutes, SecurityDelay, ArrDelay LIMIT 3","hsqls":["SELECT DepDelayMinutes, SecurityDelay, ArrDelay, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'BTV' AND 'LAX' OR DivAirports__MV1 BETWEEN 'BTV' AND 'LAX' OR DivAirports__MV2 BETWEEN 'BTV' AND 'LAX' OR DivAirports__MV3 BETWEEN 'BTV' AND 'LAX' OR DivAirports__MV4 BETWEEN 'BTV' AND 'LAX') OR (DivAirportIDs__MV0 IN (12892, 13796) OR DivAirportIDs__MV1 IN (12892, 13796) OR DivAirportIDs__MV2 IN (12892, 13796) OR DivAirportIDs__MV3 IN (12892, 13796) OR DivAirportIDs__MV4 IN (12892, 13796)) GROUP BY DepDelayMinutes, SecurityDelay, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, SecurityDelay, ArrDelay, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE DivAirports BETWEEN 'BTV' AND 'LAX' OR DivAirportIDs IN (12892, 13796) GROUP BY DepDelayMinutes, SecurityDelay, ArrDelay LIMIT 3","hsqls":["SELECT DepDelayMinutes, SecurityDelay, ArrDelay, AVG(DistanceGroup), MIN(TaxiOut) FROM mytable WHERE (DivAirports[1] BETWEEN 'BTV' AND 'LAX' OR DivAirports[2] BETWEEN 'BTV' AND 'LAX' OR DivAirports[3] BETWEEN 'BTV' AND 'LAX' OR DivAirports[4] BETWEEN 'BTV' AND 'LAX' OR DivAirports[5] BETWEEN 'BTV' AND 'LAX') OR (DivAirportIDs[1] IN (12892, 13796) OR DivAirportIDs[2] IN (12892, 13796) OR DivAirportIDs[3] IN (12892, 13796) OR DivAirportIDs[4] IN (12892, 13796) OR DivAirportIDs[5] IN (12892, 13796)) GROUP BY DepDelayMinutes, SecurityDelay, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 74 AND 1 AND FlightDate BETWEEN '2014-01-04' AND '2014-01-03' GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 21","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable WHERE OriginWac BETWEEN 74 AND 1 AND FlightDate BETWEEN '2014-01-04' AND '2014-01-03' GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 21"]}
 {"sql":"SELECT AVG(LongestAddGTime), COUNT(DepDelayMinutes) FROM mytable LIMIT 2"}
 {"sql":"SELECT OriginState FROM mytable LIMIT 13"}
 {"sql":"SELECT SecurityDelay, ArrDel15, ArrivalDelayGroups, SUM(ArrDelay), SUM(Quarter) FROM mytable WHERE LongestAddGTime <> 11 GROUP BY SecurityDelay, ArrDel15, ArrivalDelayGroups  ORDER BY SecurityDelay, ArrDel15, ArrivalDelayGroups LIMIT 10","hsqls":["SELECT SecurityDelay, ArrDel15, ArrivalDelayGroups, SUM(ArrDelay), SUM(Quarter) FROM mytable WHERE LongestAddGTime <> 11 GROUP BY SecurityDelay, ArrDel15, ArrivalDelayGroups  ORDER BY SecurityDelay, ArrDel15, ArrivalDelayGroups LIMIT 10"]}
 {"sql":"SELECT ArrDel15, OriginAirportID, AVG(FirstDepTime) FROM mytable WHERE DestCityMarketID < 35401 OR DivDistance IN (349, 1089, 138, 290, 88) AND Quarter IN (1) GROUP BY ArrDel15, OriginAirportID  ORDER BY ArrDel15, OriginAirportID LIMIT 23","hsqls":["SELECT ArrDel15, OriginAirportID, AVG(FirstDepTime) FROM mytable WHERE DestCityMarketID < 35401 OR DivDistance IN (349, 1089, 138, 290, 88) AND Quarter IN (1) GROUP BY ArrDel15, OriginAirportID  ORDER BY ArrDel15, OriginAirportID LIMIT 23"]}
 {"sql":"SELECT LongestAddGTime, CarrierDelay, DestCityMarketID FROM mytable WHERE DivAirportLandings BETWEEN 0 AND 0 ORDER BY DestStateFips, DayofMonth LIMIT 6"}
-{"sql":"SELECT FlightDate FROM mytable WHERE CRSArrTime BETWEEN 2048 AND 1637 AND DivWheelsOffs >= 2304","hsqls":["SELECT FlightDate FROM mytable WHERE CRSArrTime BETWEEN 2048 AND 1637 AND (DivWheelsOffs__MV0 >= 2304 OR DivWheelsOffs__MV1 >= 2304 OR DivWheelsOffs__MV2 >= 2304 OR DivWheelsOffs__MV3 >= 2304 OR DivWheelsOffs__MV4 >= 2304) LIMIT 10000"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE CRSArrTime BETWEEN 2048 AND 1637 AND DivWheelsOffs >= 2304","hsqls":["SELECT FlightDate FROM mytable WHERE CRSArrTime BETWEEN 2048 AND 1637 AND (DivWheelsOffs[1] >= 2304 OR DivWheelsOffs[2] >= 2304 OR DivWheelsOffs[3] >= 2304 OR DivWheelsOffs[4] >= 2304 OR DivWheelsOffs[5] >= 2304) LIMIT 10000"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE DaysSinceEpoch BETWEEN 16100 AND 16088 AND OriginStateName BETWEEN 'Mississippi' AND 'Missouri' ORDER BY DestStateFips LIMIT 8"}
-{"sql":"SELECT FirstDepTime, ArrTimeBlk, Origin FROM mytable WHERE DivWheelsOffs <= 945 AND ArrDelayMinutes NOT IN (170.0, 321.0, 192.0) ORDER BY WheelsOff, NASDelay, DivActualElapsedTime LIMIT 27","hsqls":["SELECT FirstDepTime, ArrTimeBlk, Origin FROM mytable WHERE (DivWheelsOffs__MV0 <= 945 OR DivWheelsOffs__MV1 <= 945 OR DivWheelsOffs__MV2 <= 945 OR DivWheelsOffs__MV3 <= 945 OR DivWheelsOffs__MV4 <= 945) AND ArrDelayMinutes NOT IN (170.0, 321.0, 192.0) ORDER BY WheelsOff, NASDelay, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, ArrTimeBlk, Origin FROM mytable WHERE DivWheelsOffs <= 945 AND ArrDelayMinutes NOT IN (170.0, 321.0, 192.0) ORDER BY WheelsOff, NASDelay, DivActualElapsedTime LIMIT 27","hsqls":["SELECT FirstDepTime, ArrTimeBlk, Origin FROM mytable WHERE (DivWheelsOffs[1] <= 945 OR DivWheelsOffs[2] <= 945 OR DivWheelsOffs[3] <= 945 OR DivWheelsOffs[4] <= 945 OR DivWheelsOffs[5] <= 945) AND ArrDelayMinutes NOT IN (170.0, 321.0, 192.0) ORDER BY WheelsOff, NASDelay, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE OriginAirportID IN (10423, 14905, 14635, 12191) LIMIT 19"}
 {"sql":"SELECT FlightNum, UniqueCarrier, MAX(DivArrDelay), MAX(DayOfWeek) FROM mytable WHERE DestAirportSeqID BETWEEN 1078502 AND 1114603 OR DepDelayMinutes BETWEEN 152.0 AND 29.0 GROUP BY FlightNum, UniqueCarrier  ORDER BY FlightNum, UniqueCarrier LIMIT 14","hsqls":["SELECT FlightNum, UniqueCarrier, MAX(DivArrDelay), MAX(DayOfWeek) FROM mytable WHERE DestAirportSeqID BETWEEN 1078502 AND 1114603 OR DepDelayMinutes BETWEEN 152.0 AND 29.0 GROUP BY FlightNum, UniqueCarrier  ORDER BY FlightNum, UniqueCarrier LIMIT 14"]}
 {"sql":"SELECT Diverted, SecurityDelay, COUNT(*) FROM mytable GROUP BY Diverted, SecurityDelay  ORDER BY Diverted, SecurityDelay LIMIT 21","hsqls":["SELECT Diverted, SecurityDelay, COUNT(*) FROM mytable GROUP BY Diverted, SecurityDelay  ORDER BY Diverted, SecurityDelay LIMIT 21"]}
 {"sql":"SELECT Distance FROM mytable WHERE DepTime BETWEEN 1812 AND 2212 ORDER BY Quarter, LongestAddGTime LIMIT 16"}
 {"sql":"SELECT WeatherDelay FROM mytable LIMIT 22"}
 {"sql":"SELECT TaxiIn, NASDelay, DaysSinceEpoch, COUNT(CancellationCode) FROM mytable WHERE CRSElapsedTime <= 65 AND ArrDelayMinutes IN (150.0, 35.0, 57.0, 288.0, 151.0) GROUP BY TaxiIn, NASDelay, DaysSinceEpoch  ORDER BY TaxiIn, NASDelay, DaysSinceEpoch LIMIT 12","hsqls":["SELECT TaxiIn, NASDelay, DaysSinceEpoch, COUNT(CancellationCode) FROM mytable WHERE CRSElapsedTime <= 65 AND ArrDelayMinutes IN (150.0, 35.0, 57.0, 288.0, 151.0) GROUP BY TaxiIn, NASDelay, DaysSinceEpoch  ORDER BY TaxiIn, NASDelay, DaysSinceEpoch LIMIT 12"]}
-{"sql":"SELECT OriginWac, SUM(TaxiOut), AVG(DayofMonth), SUM(DayOfWeek) FROM mytable WHERE Quarter IN (1) OR DivAirportSeqIDs IN (1125203) GROUP BY OriginWac LIMIT 21","hsqls":["SELECT OriginWac, SUM(TaxiOut), AVG(DayofMonth), SUM(DayOfWeek) FROM mytable WHERE Quarter IN (1) OR (DivAirportSeqIDs__MV0 IN (1125203) OR DivAirportSeqIDs__MV1 IN (1125203) OR DivAirportSeqIDs__MV2 IN (1125203) OR DivAirportSeqIDs__MV3 IN (1125203) OR DivAirportSeqIDs__MV4 IN (1125203)) GROUP BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT OriginWac, SUM(TaxiOut), AVG(DayofMonth), SUM(DayOfWeek) FROM mytable WHERE Quarter IN (1) OR DivAirportSeqIDs IN (1125203) GROUP BY OriginWac LIMIT 21","hsqls":["SELECT OriginWac, SUM(TaxiOut), AVG(DayofMonth), SUM(DayOfWeek) FROM mytable WHERE Quarter IN (1) OR (DivAirportSeqIDs[1] IN (1125203) OR DivAirportSeqIDs[2] IN (1125203) OR DivAirportSeqIDs[3] IN (1125203) OR DivAirportSeqIDs[4] IN (1125203) OR DivAirportSeqIDs[5] IN (1125203)) GROUP BY OriginWac LIMIT 10000"]}
 {"sql":"SELECT DepDelay, NASDelay, COUNT(LateAircraftDelay) FROM mytable WHERE DestWac IN (16) OR TailNum > 'N129DL' GROUP BY DepDelay, NASDelay  ORDER BY DepDelay, NASDelay LIMIT 24","hsqls":["SELECT DepDelay, NASDelay, COUNT(LateAircraftDelay) FROM mytable WHERE DestWac IN (16) OR TailNum > 'N129DL' GROUP BY DepDelay, NASDelay  ORDER BY DepDelay, NASDelay LIMIT 24"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1200-1259' AND '1700-1759' LIMIT 4"}
 {"sql":"SELECT ArrDelayMinutes, DayofMonth FROM mytable ORDER BY Dest, DepDel15, ArrDelay LIMIT 24"}
-{"sql":"SELECT DivWheelsOns, WeatherDelay FROM mytable ORDER BY OriginWac LIMIT 9","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, WeatherDelay FROM mytable ORDER BY OriginWac LIMIT 10000"]}
-{"sql":"SELECT TailNum FROM mytable WHERE ActualElapsedTime BETWEEN 322 AND 74 OR CancellationCode <> 'noodles' OR DivWheelsOns IN (102, 1517) LIMIT 4","hsqls":["SELECT TailNum FROM mytable WHERE ActualElapsedTime BETWEEN 322 AND 74 OR CancellationCode <> 'noodles' OR (DivWheelsOns__MV0 IN (102, 1517) OR DivWheelsOns__MV1 IN (102, 1517) OR DivWheelsOns__MV2 IN (102, 1517) OR DivWheelsOns__MV3 IN (102, 1517) OR DivWheelsOns__MV4 IN (102, 1517)) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, WeatherDelay FROM mytable ORDER BY OriginWac LIMIT 9","hsqls":["SELECT DivWheelsOns, WeatherDelay FROM mytable ORDER BY OriginWac LIMIT 10000"]}
+{"sql":"SELECT TailNum FROM mytable WHERE ActualElapsedTime BETWEEN 322 AND 74 OR CancellationCode <> 'noodles' OR DivWheelsOns IN (102, 1517) LIMIT 4","hsqls":["SELECT TailNum FROM mytable WHERE ActualElapsedTime BETWEEN 322 AND 74 OR CancellationCode <> 'noodles' OR (DivWheelsOns[1] IN (102, 1517) OR DivWheelsOns[2] IN (102, 1517) OR DivWheelsOns[3] IN (102, 1517) OR DivWheelsOns[4] IN (102, 1517) OR DivWheelsOns[5] IN (102, 1517)) LIMIT 10000"]}
 {"sql":"SELECT Diverted, SUM(NASDelay), SUM(FirstDepTime), COUNT(CRSDepTime) FROM mytable WHERE Cancelled NOT IN (1) OR Distance IN (764, 301, 715, 945) GROUP BY Diverted  ORDER BY Diverted LIMIT 19","hsqls":["SELECT Diverted, SUM(NASDelay), SUM(FirstDepTime), COUNT(CRSDepTime) FROM mytable WHERE Cancelled NOT IN (1) OR Distance IN (764, 301, 715, 945) GROUP BY Diverted  ORDER BY Diverted LIMIT 19"]}
-{"sql":"SELECT DestWac, DayofMonth, DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 54 AND 51 LIMIT 12","hsqls":["SELECT DestWac, DayofMonth, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginStateFips BETWEEN 54 AND 51 LIMIT 10000"]}
+{"sql":"SELECT DestWac, DayofMonth, DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 54 AND 51 LIMIT 12","hsqls":["SELECT DestWac, DayofMonth, DivTotalGTimes FROM mytable WHERE OriginStateFips BETWEEN 54 AND 51 LIMIT 10000"]}
 {"sql":"SELECT AVG(ArrDelay), MAX(WeatherDelay) FROM mytable WHERE DepartureDelayGroups > 5 LIMIT 10"}
 {"sql":"SELECT OriginCityName, COUNT(*) FROM mytable GROUP BY OriginCityName","hsqls":["SELECT OriginCityName, COUNT(*) FROM mytable GROUP BY OriginCityName"]}
 {"sql":"SELECT DestStateName, DepDel15, NASDelay, AVG(TaxiIn), SUM(DestCityMarketID) FROM mytable WHERE OriginCityName IN ('Waco, TX') AND Carrier < 'WN' GROUP BY DestStateName, DepDel15, NASDelay  ORDER BY DestStateName, DepDel15, NASDelay LIMIT 18","hsqls":["SELECT DestStateName, DepDel15, NASDelay, AVG(TaxiIn), SUM(DestCityMarketID) FROM mytable WHERE OriginCityName IN ('Waco, TX') AND Carrier < 'WN' GROUP BY DestStateName, DepDel15, NASDelay  ORDER BY DestStateName, DepDel15, NASDelay LIMIT 18"]}
 {"sql":"SELECT DestState FROM mytable WHERE OriginCityMarketID NOT IN (31721, 31454) LIMIT 1"}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY ActualElapsedTime LIMIT 11"}
-{"sql":"SELECT LongestAddGTime, Cancelled, DivTailNums FROM mytable ORDER BY DestWac, DivActualElapsedTime, DayOfWeek LIMIT 23","hsqls":["SELECT LongestAddGTime, Cancelled, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY DestWac, DivActualElapsedTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, Cancelled, DivTailNums FROM mytable ORDER BY DestWac, DivActualElapsedTime, DayOfWeek LIMIT 23","hsqls":["SELECT LongestAddGTime, Cancelled, DivTailNums FROM mytable ORDER BY DestWac, DivActualElapsedTime, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, COUNT(TaxiIn) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 3","hsqls":["SELECT SecurityDelay, COUNT(TaxiIn) FROM mytable GROUP BY SecurityDelay  ORDER BY SecurityDelay LIMIT 3"]}
 {"sql":"SELECT Distance, ArrDel15 FROM mytable WHERE OriginAirportID NOT IN (13577) ORDER BY Distance LIMIT 21"}
 {"sql":"SELECT SUM(NASDelay) FROM mytable LIMIT 11"}
 {"sql":"SELECT DepTime, DepTimeBlk FROM mytable ORDER BY LongestAddGTime LIMIT 6"}
 {"sql":"SELECT DistanceGroup, WeatherDelay, COUNT(*) FROM mytable WHERE ArrDelay BETWEEN -48.0 AND 173.0 OR DestAirportSeqID <> 1288903 GROUP BY DistanceGroup, WeatherDelay  ORDER BY DistanceGroup, WeatherDelay LIMIT 2","hsqls":["SELECT DistanceGroup, WeatherDelay, COUNT(*) FROM mytable WHERE ArrDelay BETWEEN -48.0 AND 173.0 OR DestAirportSeqID <> 1288903 GROUP BY DistanceGroup, WeatherDelay  ORDER BY DistanceGroup, WeatherDelay LIMIT 2"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE DepTime NOT IN (2146, 1742, 1613) AND DestState IN ('NM', 'CT', 'VT', 'UT', 'AR') AND DepTime BETWEEN 1415 AND 544 ORDER BY Flights LIMIT 10"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrTimeBlk <> '1700-1759' OR OriginCityName IN ('Aspen, CO', 'Little Rock, AR', 'Charleston, SC', 'Saginaw/Bay City/Midland, MI') ORDER BY Quarter, DepDelayMinutes, OriginStateName LIMIT 6","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE ArrTimeBlk <> '1700-1759' OR OriginCityName IN ('Aspen, CO', 'Little Rock, AR', 'Charleston, SC', 'Saginaw/Bay City/Midland, MI') ORDER BY Quarter, DepDelayMinutes, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE ArrTimeBlk <> '1700-1759' OR OriginCityName IN ('Aspen, CO', 'Little Rock, AR', 'Charleston, SC', 'Saginaw/Bay City/Midland, MI') ORDER BY Quarter, DepDelayMinutes, OriginStateName LIMIT 6","hsqls":["SELECT DivWheelsOns FROM mytable WHERE ArrTimeBlk <> '1700-1759' OR OriginCityName IN ('Aspen, CO', 'Little Rock, AR', 'Charleston, SC', 'Saginaw/Bay City/Midland, MI') ORDER BY Quarter, DepDelayMinutes, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT DestCityName, MAX(DepDelayMinutes) FROM mytable WHERE WeatherDelay < 68 AND CRSArrTime > 2335 GROUP BY DestCityName  ORDER BY DestCityName LIMIT 25","hsqls":["SELECT DestCityName, MAX(DepDelayMinutes) FROM mytable WHERE WeatherDelay < 68 AND CRSArrTime > 2335 GROUP BY DestCityName  ORDER BY DestCityName LIMIT 25"]}
 {"sql":"SELECT DestState, DepDel15 FROM mytable WHERE LongestAddGTime NOT IN (111, 55, 34, 26) ORDER BY CRSArrTime, FlightDate, OriginWac LIMIT 23"}
 {"sql":"SELECT OriginStateFips, DestStateFips, DepTime, MIN(WeatherDelay) FROM mytable GROUP BY OriginStateFips, DestStateFips, DepTime  ORDER BY OriginStateFips, DestStateFips, DepTime LIMIT 24","hsqls":["SELECT OriginStateFips, DestStateFips, DepTime, MIN(WeatherDelay) FROM mytable GROUP BY OriginStateFips, DestStateFips, DepTime  ORDER BY OriginStateFips, DestStateFips, DepTime LIMIT 24"]}
 {"sql":"SELECT WheelsOff, TaxiIn FROM mytable WHERE OriginWac IN (41, 52, 63, 16, 37) OR OriginAirportSeqID BETWEEN 1104103 AND 1169502 ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 10"}
 {"sql":"SELECT Dest FROM mytable WHERE FlightDate <> '2014-01-31' AND OriginAirportID NOT IN (10333, 14986, 11823, 14683) LIMIT 26"}
-{"sql":"SELECT FlightNum, WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE OriginStateName IN ('Colorado', 'Pennsylvania', 'Massachusetts', 'New York') OR DestAirportSeqID BETWEEN 1348602 AND 1232002 OR DivWheelsOns IN (1246, 1319, 733, 29) GROUP BY FlightNum, WeatherDelay, ArrDelay LIMIT 9","hsqls":["SELECT FlightNum, WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE OriginStateName IN ('Colorado', 'Pennsylvania', 'Massachusetts', 'New York') OR DestAirportSeqID BETWEEN 1348602 AND 1232002 OR (DivWheelsOns__MV0 IN (1246, 1319, 733, 29) OR DivWheelsOns__MV1 IN (1246, 1319, 733, 29) OR DivWheelsOns__MV2 IN (1246, 1319, 733, 29) OR DivWheelsOns__MV3 IN (1246, 1319, 733, 29) OR DivWheelsOns__MV4 IN (1246, 1319, 733, 29)) GROUP BY FlightNum, WeatherDelay, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE DistanceGroup NOT IN (8) AND DestStateFips NOT IN (21, 48, 41, 12) OR DivWheelsOffs BETWEEN 245 AND 1857 ORDER BY OriginStateFips, Cancelled, DestStateName LIMIT 8","hsqls":["SELECT DestCityName FROM mytable WHERE DistanceGroup NOT IN (8) AND DestStateFips NOT IN (21, 48, 41, 12) OR (DivWheelsOffs__MV0 BETWEEN 245 AND 1857 OR DivWheelsOffs__MV1 BETWEEN 245 AND 1857 OR DivWheelsOffs__MV2 BETWEEN 245 AND 1857 OR DivWheelsOffs__MV3 BETWEEN 245 AND 1857 OR DivWheelsOffs__MV4 BETWEEN 245 AND 1857) ORDER BY OriginStateFips, Cancelled, DestStateName LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DestState, OriginStateName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 ORDER BY OriginCityName LIMIT 13","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestState, OriginStateName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 ORDER BY OriginCityName LIMIT 10000"]}
-{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE OriginAirportSeqID BETWEEN 1232303 AND 1143302 LIMIT 12","hsqls":["SELECT MAX(Year) FROM mytable WHERE OriginAirportSeqID BETWEEN 1232303 AND 1143302 LIMIT 12"]}
-{"sql":"SELECT ArrDelay, AVG(DestAirportSeqID), COUNT(OriginStateName) FROM mytable WHERE OriginStateName BETWEEN 'Utah' AND 'Wisconsin' OR DivWheelsOns < 2110 AND AirlineID NOT IN (20436, 19790, 20366, 21171, 19977) GROUP BY ArrDelay LIMIT 4","hsqls":["SELECT ArrDelay, AVG(DestAirportSeqID), COUNT(OriginStateName) FROM mytable WHERE OriginStateName BETWEEN 'Utah' AND 'Wisconsin' OR (DivWheelsOns__MV0 < 2110 OR DivWheelsOns__MV1 < 2110 OR DivWheelsOns__MV2 < 2110 OR DivWheelsOns__MV3 < 2110 OR DivWheelsOns__MV4 < 2110) AND AirlineID NOT IN (20436, 19790, 20366, 21171, 19977) GROUP BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT FlightNum, WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE OriginStateName IN ('Colorado', 'Pennsylvania', 'Massachusetts', 'New York') OR DestAirportSeqID BETWEEN 1348602 AND 1232002 OR DivWheelsOns IN (1246, 1319, 733, 29) GROUP BY FlightNum, WeatherDelay, ArrDelay LIMIT 9","hsqls":["SELECT FlightNum, WeatherDelay, ArrDelay, COUNT(*) FROM mytable WHERE OriginStateName IN ('Colorado', 'Pennsylvania', 'Massachusetts', 'New York') OR DestAirportSeqID BETWEEN 1348602 AND 1232002 OR (DivWheelsOns[1] IN (1246, 1319, 733, 29) OR DivWheelsOns[2] IN (1246, 1319, 733, 29) OR DivWheelsOns[3] IN (1246, 1319, 733, 29) OR DivWheelsOns[4] IN (1246, 1319, 733, 29) OR DivWheelsOns[5] IN (1246, 1319, 733, 29)) GROUP BY FlightNum, WeatherDelay, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE DistanceGroup NOT IN (8) AND DestStateFips NOT IN (21, 48, 41, 12) OR DivWheelsOffs BETWEEN 245 AND 1857 ORDER BY OriginStateFips, Cancelled, DestStateName LIMIT 8","hsqls":["SELECT DestCityName FROM mytable WHERE DistanceGroup NOT IN (8) AND DestStateFips NOT IN (21, 48, 41, 12) OR (DivWheelsOffs[1] BETWEEN 245 AND 1857 OR DivWheelsOffs[2] BETWEEN 245 AND 1857 OR DivWheelsOffs[3] BETWEEN 245 AND 1857 OR DivWheelsOffs[4] BETWEEN 245 AND 1857 OR DivWheelsOffs[5] BETWEEN 245 AND 1857) ORDER BY OriginStateFips, Cancelled, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestState, OriginStateName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 ORDER BY OriginCityName LIMIT 13","hsqls":["SELECT DivLongestGTimes, DestState, OriginStateName FROM mytable WHERE DivAirportLandings BETWEEN 1 AND 1 ORDER BY OriginCityName LIMIT 10000"]}
+{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE OriginAirportSeqID BETWEEN 1232303 AND 1143302 LIMIT 12","hsqls":["SELECT MAX(`Year`) FROM mytable WHERE OriginAirportSeqID BETWEEN 1232303 AND 1143302 LIMIT 12"]}
+{"sql":"SELECT ArrDelay, AVG(DestAirportSeqID), COUNT(OriginStateName) FROM mytable WHERE OriginStateName BETWEEN 'Utah' AND 'Wisconsin' OR DivWheelsOns < 2110 AND AirlineID NOT IN (20436, 19790, 20366, 21171, 19977) GROUP BY ArrDelay LIMIT 4","hsqls":["SELECT ArrDelay, AVG(DestAirportSeqID), COUNT(OriginStateName) FROM mytable WHERE OriginStateName BETWEEN 'Utah' AND 'Wisconsin' OR (DivWheelsOns[1] < 2110 OR DivWheelsOns[2] < 2110 OR DivWheelsOns[3] < 2110 OR DivWheelsOns[4] < 2110 OR DivWheelsOns[5] < 2110) AND AirlineID NOT IN (20436, 19790, 20366, 21171, 19977) GROUP BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginState, FlightNum FROM mytable LIMIT 19"}
 {"sql":"SELECT LongestAddGTime, OriginAirportID, MIN(DestStateFips) FROM mytable WHERE AirTime NOT IN (222, 356, 80) OR DistanceGroup >= 5 GROUP BY LongestAddGTime, OriginAirportID  ORDER BY LongestAddGTime, OriginAirportID LIMIT 15","hsqls":["SELECT LongestAddGTime, OriginAirportID, MIN(DestStateFips) FROM mytable WHERE AirTime NOT IN (222, 356, 80) OR DistanceGroup >= 5 GROUP BY LongestAddGTime, OriginAirportID  ORDER BY LongestAddGTime, OriginAirportID LIMIT 15"]}
 {"sql":"SELECT WeatherDelay, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE OriginCityName > 'Fargo, ND' AND DepDelayMinutes >= 207.0 AND LateAircraftDelay BETWEEN 157 AND 195 GROUP BY WeatherDelay, SecurityDelay, DestAirportSeqID  ORDER BY WeatherDelay, SecurityDelay, DestAirportSeqID LIMIT 10","hsqls":["SELECT WeatherDelay, SecurityDelay, DestAirportSeqID, COUNT(*) FROM mytable WHERE OriginCityName > 'Fargo, ND' AND DepDelayMinutes >= 207.0 AND LateAircraftDelay BETWEEN 157 AND 195 GROUP BY WeatherDelay, SecurityDelay, DestAirportSeqID  ORDER BY WeatherDelay, SecurityDelay, DestAirportSeqID LIMIT 10"]}
-{"sql":"SELECT Dest, SUM(CarrierDelay), MIN(DestAirportSeqID) FROM mytable WHERE DivReachedDest IN (1, -9999) OR DivWheelsOffs BETWEEN 940 AND 1534 GROUP BY Dest LIMIT 24","hsqls":["SELECT Dest, SUM(CarrierDelay), MIN(DestAirportSeqID) FROM mytable WHERE DivReachedDest IN (1, -9999) OR (DivWheelsOffs__MV0 BETWEEN 940 AND 1534 OR DivWheelsOffs__MV1 BETWEEN 940 AND 1534 OR DivWheelsOffs__MV2 BETWEEN 940 AND 1534 OR DivWheelsOffs__MV3 BETWEEN 940 AND 1534 OR DivWheelsOffs__MV4 BETWEEN 940 AND 1534) GROUP BY Dest LIMIT 10000"]}
+{"sql":"SELECT Dest, SUM(CarrierDelay), MIN(DestAirportSeqID) FROM mytable WHERE DivReachedDest IN (1, -9999) OR DivWheelsOffs BETWEEN 940 AND 1534 GROUP BY Dest LIMIT 24","hsqls":["SELECT Dest, SUM(CarrierDelay), MIN(DestAirportSeqID) FROM mytable WHERE DivReachedDest IN (1, -9999) OR (DivWheelsOffs[1] BETWEEN 940 AND 1534 OR DivWheelsOffs[2] BETWEEN 940 AND 1534 OR DivWheelsOffs[3] BETWEEN 940 AND 1534 OR DivWheelsOffs[4] BETWEEN 940 AND 1534 OR DivWheelsOffs[5] BETWEEN 940 AND 1534) GROUP BY Dest LIMIT 10000"]}
 {"sql":"SELECT DestStateName, ArrDel15, OriginStateName FROM mytable WHERE AirlineID BETWEEN 19690 AND 20304 OR Flights BETWEEN 1 AND 1 ORDER BY CarrierDelay, FlightDate, ArrDel15 LIMIT 27"}
 {"sql":"SELECT ArrTime FROM mytable WHERE WheelsOn NOT IN (1511, 627) ORDER BY OriginAirportSeqID, OriginStateFips, Cancelled LIMIT 12"}
 {"sql":"SELECT AVG(NASDelay) FROM mytable WHERE ArrDel15 IN (1, -9999) OR SecurityDelay BETWEEN 0 AND 18 LIMIT 5"}
-{"sql":"SELECT DivDistance FROM mytable WHERE DivWheelsOffs IN (1409, 1657, 1317, 2243) ORDER BY DestStateName","hsqls":["SELECT DivDistance FROM mytable WHERE (DivWheelsOffs__MV0 IN (1409, 1657, 1317, 2243) OR DivWheelsOffs__MV1 IN (1409, 1657, 1317, 2243) OR DivWheelsOffs__MV2 IN (1409, 1657, 1317, 2243) OR DivWheelsOffs__MV3 IN (1409, 1657, 1317, 2243) OR DivWheelsOffs__MV4 IN (1409, 1657, 1317, 2243)) ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivDistance FROM mytable WHERE DivWheelsOffs IN (1409, 1657, 1317, 2243) ORDER BY DestStateName","hsqls":["SELECT DivDistance FROM mytable WHERE (DivWheelsOffs[1] IN (1409, 1657, 1317, 2243) OR DivWheelsOffs[2] IN (1409, 1657, 1317, 2243) OR DivWheelsOffs[3] IN (1409, 1657, 1317, 2243) OR DivWheelsOffs[4] IN (1409, 1657, 1317, 2243) OR DivWheelsOffs[5] IN (1409, 1657, 1317, 2243)) ORDER BY DestStateName LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE AirTime >= 135 OR ArrTime BETWEEN 721 AND 58 OR ArrTime NOT IN (1437, 324, 835) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 10","hsqls":["SELECT ActualElapsedTime, COUNT(*) FROM mytable WHERE AirTime >= 135 OR ArrTime BETWEEN 721 AND 58 OR ArrTime NOT IN (1437, 324, 835) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 10"]}
 {"sql":"SELECT OriginState, DepTime, DestAirportID, COUNT(DestStateFips) FROM mytable WHERE UniqueCarrier BETWEEN 'B6' AND 'WN' GROUP BY OriginState, DepTime, DestAirportID  ORDER BY OriginState, DepTime, DestAirportID LIMIT 10","hsqls":["SELECT OriginState, DepTime, DestAirportID, COUNT(DestStateFips) FROM mytable WHERE UniqueCarrier BETWEEN 'B6' AND 'WN' GROUP BY OriginState, DepTime, DestAirportID  ORDER BY OriginState, DepTime, DestAirportID LIMIT 10"]}
-{"sql":"SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay) FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR DivTailNums IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') LIMIT 29","hsqls":["SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay)  FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR (DivTailNums__MV0 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV1 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV2 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV3 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV4 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951')) LIMIT 10000"]}
+{"sql":"SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay) FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR DivTailNums IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') LIMIT 29","hsqls":["SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay)  FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR (DivTailNums[1] IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums[2] IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums[3] IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums[4] IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums[5] IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951')) LIMIT 10000"]}
 {"sql":"SELECT SUM(ArrivalDelayGroups), COUNT(ActualElapsedTime), COUNT(OriginState) FROM mytable WHERE TotalAddGTime IN (58, 37) AND LateAircraftDelay <= 63 AND FlightDate BETWEEN '2014-01-14' AND '2014-01-07' LIMIT 10"}
 {"sql":"SELECT Flights FROM mytable WHERE LateAircraftDelay BETWEEN 59 AND 133 AND Cancelled NOT IN (1, 0) ORDER BY DepTime LIMIT 24"}
 {"sql":"SELECT AVG(DivReachedDest) FROM mytable LIMIT 4"}
@@ -8515,16 +8515,16 @@
 {"sql":"SELECT OriginAirportSeqID, DestAirportSeqID, CancellationCode, SUM(DayOfWeek), AVG(DistanceGroup) FROM mytable WHERE DestStateFips NOT IN (46) OR UniqueCarrier IN ('US') GROUP BY OriginAirportSeqID, DestAirportSeqID, CancellationCode  ORDER BY OriginAirportSeqID, DestAirportSeqID, CancellationCode LIMIT 27","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID, CancellationCode, SUM(DayOfWeek), AVG(DistanceGroup) FROM mytable WHERE DestStateFips NOT IN (46) OR UniqueCarrier IN ('US') GROUP BY OriginAirportSeqID, DestAirportSeqID, CancellationCode  ORDER BY OriginAirportSeqID, DestAirportSeqID, CancellationCode LIMIT 27"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 12"}
 {"sql":"SELECT FirstDepTime, DestState, DivAirportLandings, COUNT(Origin) FROM mytable WHERE DistanceGroup BETWEEN 1 AND 1 AND DepDelayMinutes NOT IN (189.0, 324.0, 1.0, 147.0, 149.0) GROUP BY FirstDepTime, DestState, DivAirportLandings  ORDER BY FirstDepTime, DestState, DivAirportLandings LIMIT 28","hsqls":["SELECT FirstDepTime, DestState, DivAirportLandings, COUNT(Origin) FROM mytable WHERE DistanceGroup BETWEEN 1 AND 1 AND DepDelayMinutes NOT IN (189.0, 324.0, 1.0, 147.0, 149.0) GROUP BY FirstDepTime, DestState, DivAirportLandings  ORDER BY FirstDepTime, DestState, DivAirportLandings LIMIT 28"]}
-{"sql":"SELECT WeatherDelay FROM mytable WHERE \"Year\" > 2014 OR DepTime NOT IN (1031, 1447, 2343, 1557, 821) ORDER BY ArrTime LIMIT 27","hsqls":["SELECT WeatherDelay FROM mytable WHERE Year > 2014 OR DepTime NOT IN (1031, 1447, 2343, 1557, 821) ORDER BY ArrTime LIMIT 27"]}
+{"sql":"SELECT WeatherDelay FROM mytable WHERE \"Year\" > 2014 OR DepTime NOT IN (1031, 1447, 2343, 1557, 821) ORDER BY ArrTime LIMIT 27","hsqls":["SELECT WeatherDelay FROM mytable WHERE `Year` > 2014 OR DepTime NOT IN (1031, 1447, 2343, 1557, 821) ORDER BY ArrTime LIMIT 27"]}
 {"sql":"SELECT WheelsOff, Dest FROM mytable WHERE DestState IN ('GA', 'CA', 'MO') AND ArrDelay = -15.0 AND DaysSinceEpoch <= 16083 ORDER BY CarrierDelay, Flights, DestCityMarketID LIMIT 25"}
 {"sql":"SELECT DepDelayMinutes, CRSArrTime FROM mytable WHERE Distance IN (1313) OR DepTimeBlk > '1800-1859' OR DestWac <= 65 LIMIT 11"}
 {"sql":"SELECT TotalAddGTime, NASDelay, CancellationCode, COUNT(*) FROM mytable GROUP BY TotalAddGTime, NASDelay, CancellationCode  ORDER BY TotalAddGTime, NASDelay, CancellationCode LIMIT 16","hsqls":["SELECT TotalAddGTime, NASDelay, CancellationCode, COUNT(*) FROM mytable GROUP BY TotalAddGTime, NASDelay, CancellationCode  ORDER BY TotalAddGTime, NASDelay, CancellationCode LIMIT 16"]}
-{"sql":"SELECT DivTailNums, DestAirportID FROM mytable LIMIT 13","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestAirportID FROM mytable LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, Dest, DivArrDelay FROM mytable WHERE DepTime BETWEEN 1718 AND 2244 ORDER BY DepTime, ArrDelayMinutes LIMIT 4","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Dest, DivArrDelay FROM mytable WHERE DepTime BETWEEN 1718 AND 2244 ORDER BY DepTime, ArrDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT DestState, COUNT(*) FROM mytable WHERE DivTailNums IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') AND TotalAddGTime BETWEEN 19 AND 58 GROUP BY DestState LIMIT 19","hsqls":["SELECT DestState, COUNT(*) FROM mytable WHERE (DivTailNums__MV0 IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums__MV1 IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums__MV2 IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums__MV3 IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums__MV4 IN ('N915DN', 'N989DL', 'N736SA', 'N372AA')) AND TotalAddGTime BETWEEN 19 AND 58 GROUP BY DestState LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, DestAirportID FROM mytable LIMIT 13","hsqls":["SELECT DivTailNums, DestAirportID FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Dest, DivArrDelay FROM mytable WHERE DepTime BETWEEN 1718 AND 2244 ORDER BY DepTime, ArrDelayMinutes LIMIT 4","hsqls":["SELECT DivLongestGTimes, Dest, DivArrDelay FROM mytable WHERE DepTime BETWEEN 1718 AND 2244 ORDER BY DepTime, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DestState, COUNT(*) FROM mytable WHERE DivTailNums IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') AND TotalAddGTime BETWEEN 19 AND 58 GROUP BY DestState LIMIT 19","hsqls":["SELECT DestState, COUNT(*) FROM mytable WHERE (DivTailNums[1] IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums[2] IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums[3] IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums[4] IN ('N915DN', 'N989DL', 'N736SA', 'N372AA') OR DivTailNums[5] IN ('N915DN', 'N989DL', 'N736SA', 'N372AA')) AND TotalAddGTime BETWEEN 19 AND 58 GROUP BY DestState LIMIT 10000"]}
 {"sql":"SELECT Carrier, OriginCityMarketID, CRSDepTime FROM mytable ORDER BY DivReachedDest, DestWac LIMIT 26"}
 {"sql":"SELECT SUM(AirTime), SUM(DepartureDelayGroups) FROM mytable WHERE DestAirportID BETWEEN 15389 AND 10731 AND DestState NOT IN ('WI', 'WV') OR DestStateFips < 56 LIMIT 24"}
-{"sql":"SELECT Carrier FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'US' AND DivLongestGTimes BETWEEN 145.0 AND 79.0 AND OriginWac < 1 ORDER BY CancellationCode LIMIT 24","hsqls":["SELECT Carrier FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'US' AND (DivLongestGTimes__MV0 BETWEEN 145.0 AND 79.0 OR DivLongestGTimes__MV1 BETWEEN 145.0 AND 79.0 OR DivLongestGTimes__MV2 BETWEEN 145.0 AND 79.0 OR DivLongestGTimes__MV3 BETWEEN 145.0 AND 79.0 OR DivLongestGTimes__MV4 BETWEEN 145.0 AND 79.0) AND OriginWac < 1 ORDER BY CancellationCode LIMIT 10000"]}
+{"sql":"SELECT Carrier FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'US' AND DivLongestGTimes BETWEEN 145.0 AND 79.0 AND OriginWac < 1 ORDER BY CancellationCode LIMIT 24","hsqls":["SELECT Carrier FROM mytable WHERE UniqueCarrier BETWEEN 'OO' AND 'US' AND (DivLongestGTimes[1] BETWEEN 145.0 AND 79.0 OR DivLongestGTimes[2] BETWEEN 145.0 AND 79.0 OR DivLongestGTimes[3] BETWEEN 145.0 AND 79.0 OR DivLongestGTimes[4] BETWEEN 145.0 AND 79.0 OR DivLongestGTimes[5] BETWEEN 145.0 AND 79.0) AND OriginWac < 1 ORDER BY CancellationCode LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, CancellationCode, DaysSinceEpoch FROM mytable WHERE DestCityMarketID = 32448 AND DivReachedDest > 0 AND ArrivalDelayGroups BETWEEN -2 AND -1 ORDER BY DivDistance LIMIT 6"}
 {"sql":"SELECT Quarter, Origin FROM mytable WHERE OriginCityMarketID BETWEEN 31834 AND 33830 ORDER BY TotalAddGTime, DivArrDelay LIMIT 6"}
 {"sql":"SELECT ActualElapsedTime, Dest, COUNT(*) FROM mytable WHERE OriginCityMarketID NOT IN (33195, 34057, 32206, 35412, 31823) AND Flights > 1 GROUP BY ActualElapsedTime, Dest  ORDER BY ActualElapsedTime, Dest LIMIT 7","hsqls":["SELECT ActualElapsedTime, Dest, COUNT(*) FROM mytable WHERE OriginCityMarketID NOT IN (33195, 34057, 32206, 35412, 31823) AND Flights > 1 GROUP BY ActualElapsedTime, Dest  ORDER BY ActualElapsedTime, Dest LIMIT 7"]}
@@ -8533,7 +8533,7 @@
 {"sql":"SELECT AirTime, CRSDepTime, COUNT(*) FROM mytable WHERE OriginState IN ('ND', 'GA', 'SD', 'MO', 'KS') OR NASDelay NOT IN (202, 3, 7, 111, 74) AND DestWac BETWEEN 13 AND 11 GROUP BY AirTime, CRSDepTime","hsqls":["SELECT AirTime, CRSDepTime, COUNT(*) FROM mytable WHERE OriginState IN ('ND', 'GA', 'SD', 'MO', 'KS') OR NASDelay NOT IN (202, 3, 7, 111, 74) AND DestWac BETWEEN 13 AND 11 GROUP BY AirTime, CRSDepTime"]}
 {"sql":"SELECT TaxiIn, ArrDel15, CRSElapsedTime FROM mytable WHERE ArrivalDelayGroups BETWEEN 7 AND 2 LIMIT 21"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 17"}
-{"sql":"SELECT MIN(DistanceGroup), SUM(DestStateFips) FROM mytable WHERE DivAirports BETWEEN 'MSO' AND 'IAD' LIMIT 18","hsqls":["SELECT MIN(DistanceGroup), SUM(DestStateFips)  FROM mytable WHERE (DivAirports__MV0 BETWEEN 'MSO' AND 'IAD' OR DivAirports__MV1 BETWEEN 'MSO' AND 'IAD' OR DivAirports__MV2 BETWEEN 'MSO' AND 'IAD' OR DivAirports__MV3 BETWEEN 'MSO' AND 'IAD' OR DivAirports__MV4 BETWEEN 'MSO' AND 'IAD') LIMIT 10000"]}
+{"sql":"SELECT MIN(DistanceGroup), SUM(DestStateFips) FROM mytable WHERE DivAirports BETWEEN 'MSO' AND 'IAD' LIMIT 18","hsqls":["SELECT MIN(DistanceGroup), SUM(DestStateFips)  FROM mytable WHERE (DivAirports[1] BETWEEN 'MSO' AND 'IAD' OR DivAirports[2] BETWEEN 'MSO' AND 'IAD' OR DivAirports[3] BETWEEN 'MSO' AND 'IAD' OR DivAirports[4] BETWEEN 'MSO' AND 'IAD' OR DivAirports[5] BETWEEN 'MSO' AND 'IAD') LIMIT 10000"]}
 {"sql":"SELECT TailNum FROM mytable WHERE ArrDelayMinutes BETWEEN 66.0 AND -9999.0 OR ActualElapsedTime > 196 ORDER BY ArrDel15 LIMIT 17"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE NASDelay BETWEEN 75 AND 35 AND OriginAirportSeqID > 1299204 OR TaxiIn NOT IN (4, 16, 84) LIMIT 9"}
 {"sql":"SELECT AirTime, SUM(WeatherDelay), AVG(Quarter) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 11","hsqls":["SELECT AirTime, SUM(WeatherDelay), AVG(Quarter) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 11"]}
@@ -8541,15 +8541,15 @@
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrTime IN (1448, 1432, 1221, 1655, 933) LIMIT 19"}
 {"sql":"SELECT Quarter, FlightDate, TailNum FROM mytable WHERE DivArrDelay <> 204 ORDER BY OriginAirportSeqID, OriginCityMarketID, ArrTime LIMIT 17"}
 {"sql":"SELECT DestCityName FROM mytable ORDER BY DepDelayMinutes, TaxiIn, DepTimeBlk LIMIT 3"}
-{"sql":"SELECT DistanceGroup FROM mytable WHERE DivLongestGTimes IN (60.0, 79.0, 14.0, 7.0, 11.0)","hsqls":["SELECT DistanceGroup FROM mytable WHERE (DivLongestGTimes__MV0 IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes__MV1 IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes__MV2 IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes__MV3 IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes__MV4 IN (60.0, 79.0, 14.0, 7.0, 11.0)) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup FROM mytable WHERE DivLongestGTimes IN (60.0, 79.0, 14.0, 7.0, 11.0)","hsqls":["SELECT DistanceGroup FROM mytable WHERE (DivLongestGTimes[1] IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes[2] IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes[3] IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes[4] IN (60.0, 79.0, 14.0, 7.0, 11.0) OR DivLongestGTimes[5] IN (60.0, 79.0, 14.0, 7.0, 11.0)) LIMIT 10000"]}
 {"sql":"SELECT Flights, Distance FROM mytable ORDER BY Carrier, FlightNum LIMIT 24"}
 {"sql":"SELECT Origin, COUNT(Flights), SUM(TaxiIn), AVG(DepartureDelayGroups) FROM mytable WHERE DayOfWeek IN (1, 5) GROUP BY Origin  ORDER BY Origin LIMIT 11","hsqls":["SELECT Origin, COUNT(Flights), SUM(TaxiIn), AVG(DepartureDelayGroups) FROM mytable WHERE DayOfWeek IN (1, 5) GROUP BY Origin  ORDER BY Origin LIMIT 11"]}
-{"sql":"SELECT OriginWac, AirlineID, SUM(\"Year\"), MIN(CRSArrTime) FROM mytable WHERE LongestAddGTime BETWEEN 13 AND 42 GROUP BY OriginWac, AirlineID LIMIT 25","hsqls":["SELECT OriginWac, AirlineID, SUM(Year), MIN(CRSArrTime) FROM mytable WHERE LongestAddGTime BETWEEN 13 AND 42 GROUP BY OriginWac, AirlineID LIMIT 25"]}
+{"sql":"SELECT OriginWac, AirlineID, SUM(\"Year\"), MIN(CRSArrTime) FROM mytable WHERE LongestAddGTime BETWEEN 13 AND 42 GROUP BY OriginWac, AirlineID LIMIT 25","hsqls":["SELECT OriginWac, AirlineID, SUM(`Year`), MIN(CRSArrTime) FROM mytable WHERE LongestAddGTime BETWEEN 13 AND 42 GROUP BY OriginWac, AirlineID LIMIT 25"]}
 {"sql":"SELECT \"Month\", DivArrDelay FROM mytable WHERE DestWac BETWEEN 13 AND 86 OR CRSArrTime > 1133 AND UniqueCarrier IN ('DL', 'HA', 'FL') ORDER BY DepDelay, DepDel15, DivArrDelay LIMIT 9","hsqls":["SELECT Month, DivArrDelay FROM mytable WHERE DestWac BETWEEN 13 AND 86 OR CRSArrTime > 1133 AND UniqueCarrier IN ('DL', 'HA', 'FL') ORDER BY DepDelay, DepDel15, DivArrDelay LIMIT 9"]}
-{"sql":"SELECT MIN(\"Year\") FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 5","hsqls":["SELECT MIN(Year) FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 5"]}
+{"sql":"SELECT MIN(\"Year\") FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 5","hsqls":["SELECT MIN(`Year`) FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 5"]}
 {"sql":"SELECT LongestAddGTime, SecurityDelay, DivActualElapsedTime, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 74 AND 55 GROUP BY LongestAddGTime, SecurityDelay, DivActualElapsedTime  ORDER BY LongestAddGTime, SecurityDelay, DivActualElapsedTime LIMIT 10","hsqls":["SELECT LongestAddGTime, SecurityDelay, DivActualElapsedTime, COUNT(*) FROM mytable WHERE TotalAddGTime BETWEEN 74 AND 55 GROUP BY LongestAddGTime, SecurityDelay, DivActualElapsedTime  ORDER BY LongestAddGTime, SecurityDelay, DivActualElapsedTime LIMIT 10"]}
 {"sql":"SELECT OriginWac FROM mytable LIMIT 19"}
-{"sql":"SELECT DestAirportID, OriginStateName, AVG(ActualElapsedTime) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1291503 AND 1052103 GROUP BY DestAirportID, OriginStateName LIMIT 14","hsqls":["SELECT DestAirportID, OriginStateName, AVG(CAST(ActualElapsedTime AS DOUBLE)) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs__MV1 BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs__MV2 BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs__MV3 BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs__MV4 BETWEEN 1291503 AND 1052103) GROUP BY DestAirportID, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, OriginStateName, AVG(ActualElapsedTime) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1291503 AND 1052103 GROUP BY DestAirportID, OriginStateName LIMIT 14","hsqls":["SELECT DestAirportID, OriginStateName, AVG(CAST(ActualElapsedTime AS DOUBLE)) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs[2] BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs[3] BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs[4] BETWEEN 1291503 AND 1052103 OR DivAirportSeqIDs[5] BETWEEN 1291503 AND 1052103) GROUP BY DestAirportID, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 13"}
 {"sql":"SELECT COUNT(Dest), MAX(FirstDepTime), COUNT(DestStateFips) FROM mytable WHERE Quarter BETWEEN 1 AND 1 LIMIT 4"}
 {"sql":"SELECT ArrDel15, DestCityName, DivAirportLandings, AVG(DaysSinceEpoch), COUNT(DaysSinceEpoch), MIN(DestAirportSeqID) FROM mytable WHERE Diverted NOT IN (1, 0) GROUP BY ArrDel15, DestCityName, DivAirportLandings  ORDER BY ArrDel15, DestCityName, DivAirportLandings LIMIT 3","hsqls":["SELECT ArrDel15, DestCityName, DivAirportLandings, AVG(DaysSinceEpoch), COUNT(DaysSinceEpoch), MIN(DestAirportSeqID) FROM mytable WHERE Diverted NOT IN (1, 0) GROUP BY ArrDel15, DestCityName, DivAirportLandings  ORDER BY ArrDel15, DestCityName, DivAirportLandings LIMIT 3"]}
@@ -8563,7 +8563,7 @@
 {"sql":"SELECT Diverted, DestStateName, AVG(CRSDepTime) FROM mytable GROUP BY Diverted, DestStateName  ORDER BY Diverted, DestStateName LIMIT 17","hsqls":["SELECT Diverted, DestStateName, AVG(CRSDepTime) FROM mytable GROUP BY Diverted, DestStateName  ORDER BY Diverted, DestStateName LIMIT 17"]}
 {"sql":"SELECT ArrivalDelayGroups, SUM(FirstDepTime), MIN(DivAirportLandings) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 10","hsqls":["SELECT ArrivalDelayGroups, SUM(FirstDepTime), MIN(DivAirportLandings) FROM mytable GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 10"]}
 {"sql":"SELECT AirTime FROM mytable WHERE DepTimeBlk IN ('1600-1659', '1700-1759', '1300-1359', '2300-2359', '0900-0959') OR LateAircraftDelay <= 111 ORDER BY DestStateFips, CancellationCode, DivActualElapsedTime LIMIT 13"}
-{"sql":"SELECT AVG(\"Month\"), COUNT(Carrier) FROM mytable WHERE DivLongestGTimes BETWEEN 16.0 AND 118.0 OR DivWheelsOns BETWEEN 1848 AND 2330 LIMIT 29","hsqls":["SELECT AVG(Month), COUNT(Carrier)  FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 16.0 AND 118.0 OR DivLongestGTimes__MV1 BETWEEN 16.0 AND 118.0 OR DivLongestGTimes__MV2 BETWEEN 16.0 AND 118.0 OR DivLongestGTimes__MV3 BETWEEN 16.0 AND 118.0 OR DivLongestGTimes__MV4 BETWEEN 16.0 AND 118.0) OR (DivWheelsOns__MV0 BETWEEN 1848 AND 2330 OR DivWheelsOns__MV1 BETWEEN 1848 AND 2330 OR DivWheelsOns__MV2 BETWEEN 1848 AND 2330 OR DivWheelsOns__MV3 BETWEEN 1848 AND 2330 OR DivWheelsOns__MV4 BETWEEN 1848 AND 2330) LIMIT 10000"]}
+{"sql":"SELECT AVG(\"Month\"), COUNT(Carrier) FROM mytable WHERE DivLongestGTimes BETWEEN 16.0 AND 118.0 OR DivWheelsOns BETWEEN 1848 AND 2330 LIMIT 29","hsqls":["SELECT AVG(`Month`), COUNT(Carrier)  FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 16.0 AND 118.0 OR DivLongestGTimes[2] BETWEEN 16.0 AND 118.0 OR DivLongestGTimes[3] BETWEEN 16.0 AND 118.0 OR DivLongestGTimes[4] BETWEEN 16.0 AND 118.0 OR DivLongestGTimes[5] BETWEEN 16.0 AND 118.0) OR (DivWheelsOns[1] BETWEEN 1848 AND 2330 OR DivWheelsOns[2] BETWEEN 1848 AND 2330 OR DivWheelsOns[3] BETWEEN 1848 AND 2330 OR DivWheelsOns[4] BETWEEN 1848 AND 2330 OR DivWheelsOns[5] BETWEEN 1848 AND 2330) LIMIT 10000"]}
 {"sql":"SELECT AVG(DivReachedDest), COUNT(DivReachedDest), COUNT(DestCityMarketID) FROM mytable WHERE ArrDelayMinutes > 261.0 LIMIT 29"}
 {"sql":"SELECT ArrTimeBlk, ArrDel15 FROM mytable WHERE DayOfWeek >= 3 ORDER BY TotalAddGTime, DestCityName, CRSDepTime LIMIT 10"}
 {"sql":"SELECT WeatherDelay, ActualElapsedTime FROM mytable ORDER BY ArrDelayMinutes, Origin, DestAirportID LIMIT 18"}
@@ -8572,11 +8572,11 @@
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Carrier NOT IN ('DL', 'WN', 'OO') LIMIT 14"}
 {"sql":"SELECT DepDelayMinutes, AirlineID FROM mytable LIMIT 5"}
 {"sql":"SELECT Diverted, DestStateFips, COUNT(*) FROM mytable WHERE WeatherDelay IN (92) GROUP BY Diverted, DestStateFips  ORDER BY Diverted, DestStateFips LIMIT 29","hsqls":["SELECT Diverted, DestStateFips, COUNT(*) FROM mytable WHERE WeatherDelay IN (92) GROUP BY Diverted, DestStateFips  ORDER BY Diverted, DestStateFips LIMIT 29"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE CRSElapsedTime = 392 AND DivTailNums BETWEEN 'N525VA' AND 'N16147' OR DivAirportLandings <> 9 ORDER BY \"Year\", DestWac, FlightDate LIMIT 8","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE CRSElapsedTime = 392 AND (DivTailNums__MV0 BETWEEN 'N525VA' AND 'N16147' OR DivTailNums__MV1 BETWEEN 'N525VA' AND 'N16147' OR DivTailNums__MV2 BETWEEN 'N525VA' AND 'N16147' OR DivTailNums__MV3 BETWEEN 'N525VA' AND 'N16147' OR DivTailNums__MV4 BETWEEN 'N525VA' AND 'N16147') OR DivAirportLandings <> 9 ORDER BY Year, DestWac, FlightDate LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE CRSElapsedTime = 392 AND DivTailNums BETWEEN 'N525VA' AND 'N16147' OR DivAirportLandings <> 9 ORDER BY \"Year\", DestWac, FlightDate LIMIT 8","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE CRSElapsedTime = 392 AND (DivTailNums[1] BETWEEN 'N525VA' AND 'N16147' OR DivTailNums[2] BETWEEN 'N525VA' AND 'N16147' OR DivTailNums[3] BETWEEN 'N525VA' AND 'N16147' OR DivTailNums[4] BETWEEN 'N525VA' AND 'N16147' OR DivTailNums[5] BETWEEN 'N525VA' AND 'N16147') OR DivAirportLandings <> 9 ORDER BY Year, DestWac, FlightDate LIMIT 10000"]}
 {"sql":"SELECT DestWac, DepDel15, OriginWac FROM mytable WHERE WheelsOn = 1351 AND OriginCityMarketID BETWEEN 34952 AND 30466 LIMIT 27"}
 {"sql":"SELECT CancellationCode, COUNT(*) FROM mytable WHERE LateAircraftDelay <= 75 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 28","hsqls":["SELECT CancellationCode, COUNT(*) FROM mytable WHERE LateAircraftDelay <= 75 GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 28"]}
 {"sql":"SELECT OriginAirportSeqID, SecurityDelay, DaysSinceEpoch FROM mytable ORDER BY DestCityName, DestCityMarketID, DivArrDelay LIMIT 12"}
-{"sql":"SELECT OriginStateFips, SUM(DestAirportSeqID), SUM(CRSArrTime), MAX(\"Month\") FROM mytable WHERE DestStateFips IN (55, 24, 37) AND DivAirportIDs <= 12915 OR DivLongestGTimes BETWEEN 25.0 AND 8.0 GROUP BY OriginStateFips LIMIT 20","hsqls":["SELECT OriginStateFips, SUM(DestAirportSeqID), SUM(CRSArrTime), MAX(Month) FROM mytable WHERE DestStateFips IN (55, 24, 37) AND (DivAirportIDs__MV0 <= 12915 OR DivAirportIDs__MV1 <= 12915 OR DivAirportIDs__MV2 <= 12915 OR DivAirportIDs__MV3 <= 12915 OR DivAirportIDs__MV4 <= 12915) OR (DivLongestGTimes__MV0 BETWEEN 25.0 AND 8.0 OR DivLongestGTimes__MV1 BETWEEN 25.0 AND 8.0 OR DivLongestGTimes__MV2 BETWEEN 25.0 AND 8.0 OR DivLongestGTimes__MV3 BETWEEN 25.0 AND 8.0 OR DivLongestGTimes__MV4 BETWEEN 25.0 AND 8.0) GROUP BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, SUM(DestAirportSeqID), SUM(CRSArrTime), MAX(\"Month\") FROM mytable WHERE DestStateFips IN (55, 24, 37) AND DivAirportIDs <= 12915 OR DivLongestGTimes BETWEEN 25.0 AND 8.0 GROUP BY OriginStateFips LIMIT 20","hsqls":["SELECT OriginStateFips, SUM(DestAirportSeqID), SUM(CRSArrTime), MAX(`Month`) FROM mytable WHERE DestStateFips IN (55, 24, 37) AND (DivAirportIDs[1] <= 12915 OR DivAirportIDs[2] <= 12915 OR DivAirportIDs[3] <= 12915 OR DivAirportIDs[4] <= 12915 OR DivAirportIDs[5] <= 12915) OR (DivLongestGTimes[1] BETWEEN 25.0 AND 8.0 OR DivLongestGTimes[2] BETWEEN 25.0 AND 8.0 OR DivLongestGTimes[3] BETWEEN 25.0 AND 8.0 OR DivLongestGTimes[4] BETWEEN 25.0 AND 8.0 OR DivLongestGTimes[5] BETWEEN 25.0 AND 8.0) GROUP BY OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, UniqueCarrier, DayOfWeek FROM mytable ORDER BY Flights, TaxiIn, AirTime LIMIT 7"}
 {"sql":"SELECT Carrier, LongestAddGTime FROM mytable WHERE CRSDepTime BETWEEN 1830 AND 1453 OR WheelsOff NOT IN (2158, 1700, 27, 1400) ORDER BY Dest LIMIT 17"}
 {"sql":"SELECT OriginStateFips, ArrTimeBlk, CRSElapsedTime, MIN(OriginAirportID), AVG(DistanceGroup), MAX(DayOfWeek) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR WeatherDelay = -9999 GROUP BY OriginStateFips, ArrTimeBlk, CRSElapsedTime  ORDER BY OriginStateFips, ArrTimeBlk, CRSElapsedTime LIMIT 19","hsqls":["SELECT OriginStateFips, ArrTimeBlk, CRSElapsedTime, MIN(OriginAirportID), AVG(DistanceGroup), MAX(DayOfWeek) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR WeatherDelay = -9999 GROUP BY OriginStateFips, ArrTimeBlk, CRSElapsedTime  ORDER BY OriginStateFips, ArrTimeBlk, CRSElapsedTime LIMIT 19"]}
@@ -8587,10 +8587,10 @@
 {"sql":"SELECT CRSArrTime, FlightDate, COUNT(*) FROM mytable WHERE OriginCityName NOT IN ('Hancock/Houghton, MI', 'Guam, TT', 'Sacramento, CA', 'Spokane, WA', 'Bloomington/Normal, IL') AND DivReachedDest >= 0 GROUP BY CRSArrTime, FlightDate  ORDER BY CRSArrTime, FlightDate LIMIT 10","hsqls":["SELECT CRSArrTime, FlightDate, COUNT(*) FROM mytable WHERE OriginCityName NOT IN ('Hancock/Houghton, MI', 'Guam, TT', 'Sacramento, CA', 'Spokane, WA', 'Bloomington/Normal, IL') AND DivReachedDest >= 0 GROUP BY CRSArrTime, FlightDate  ORDER BY CRSArrTime, FlightDate LIMIT 10"]}
 {"sql":"SELECT DepDelay, DepTimeBlk, UniqueCarrier FROM mytable WHERE ArrDelayMinutes = 106.0 AND TotalAddGTime = 58 OR DestState <= 'AR' LIMIT 19"}
 {"sql":"SELECT Diverted, CRSElapsedTime, COUNT(*) FROM mytable WHERE ArrDelay BETWEEN 65.0 AND 176.0 OR FlightDate BETWEEN '2014-01-24' AND '2014-01-14' GROUP BY Diverted, CRSElapsedTime  ORDER BY Diverted, CRSElapsedTime LIMIT 7","hsqls":["SELECT Diverted, CRSElapsedTime, COUNT(*) FROM mytable WHERE ArrDelay BETWEEN 65.0 AND 176.0 OR FlightDate BETWEEN '2014-01-24' AND '2014-01-14' GROUP BY Diverted, CRSElapsedTime  ORDER BY Diverted, CRSElapsedTime LIMIT 7"]}
-{"sql":"SELECT FlightNum, DivTailNums, DestCityName FROM mytable WHERE DivAirportSeqIDs > 1419303 AND DestStateFips BETWEEN 50 AND 44 ORDER BY DivDistance, AirlineID, CRSElapsedTime LIMIT 12","hsqls":["SELECT FlightNum, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestCityName FROM mytable WHERE (DivAirportSeqIDs__MV0 > 1419303 OR DivAirportSeqIDs__MV1 > 1419303 OR DivAirportSeqIDs__MV2 > 1419303 OR DivAirportSeqIDs__MV3 > 1419303 OR DivAirportSeqIDs__MV4 > 1419303) AND DestStateFips BETWEEN 50 AND 44 ORDER BY DivDistance, AirlineID, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivTailNums, DestCityName FROM mytable WHERE DivAirportSeqIDs > 1419303 AND DestStateFips BETWEEN 50 AND 44 ORDER BY DivDistance, AirlineID, CRSElapsedTime LIMIT 12","hsqls":["SELECT FlightNum, DivTailNums, DestCityName FROM mytable WHERE (DivAirportSeqIDs[1] > 1419303 OR DivAirportSeqIDs[2] > 1419303 OR DivAirportSeqIDs[3] > 1419303 OR DivAirportSeqIDs[4] > 1419303 OR DivAirportSeqIDs[5] > 1419303) AND DestStateFips BETWEEN 50 AND 44 ORDER BY DivDistance, AirlineID, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Quarter, NASDelay FROM mytable WHERE DayOfWeek IN (3, 2, 1, 6, 4) OR Quarter <> 1 ORDER BY LateAircraftDelay, Quarter, DivAirportLandings LIMIT 4"}
-{"sql":"SELECT DivAirports, DestState, DestCityMarketID FROM mytable WHERE Carrier IN ('WN', 'MQ', 'VX', 'AA') AND Distance = 1171 AND SecurityDelay NOT IN (4, 18, 8, 27, -9999) ORDER BY OriginAirportSeqID, CRSArrTime, DestAirportSeqID","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestState, DestCityMarketID FROM mytable WHERE Carrier IN ('WN', 'MQ', 'VX', 'AA') AND Distance = 1171 AND SecurityDelay NOT IN (4, 18, 8, 27, -9999) ORDER BY OriginAirportSeqID, CRSArrTime, DestAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT MAX(WheelsOn), SUM(DivDistance), MAX(Distance) FROM mytable WHERE DepartureDelayGroups NOT IN (2) AND TotalAddGTime IN (19, 8) AND DivTotalGTimes IN (112, 22, 73) LIMIT 2","hsqls":["SELECT MAX(WheelsOn), SUM(DivDistance), MAX(Distance)  FROM mytable WHERE DepartureDelayGroups NOT IN (2) AND TotalAddGTime IN (19, 8) AND (DivTotalGTimes__MV0 IN (112, 22, 73) OR DivTotalGTimes__MV1 IN (112, 22, 73) OR DivTotalGTimes__MV2 IN (112, 22, 73) OR DivTotalGTimes__MV3 IN (112, 22, 73) OR DivTotalGTimes__MV4 IN (112, 22, 73)) LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestState, DestCityMarketID FROM mytable WHERE Carrier IN ('WN', 'MQ', 'VX', 'AA') AND Distance = 1171 AND SecurityDelay NOT IN (4, 18, 8, 27, -9999) ORDER BY OriginAirportSeqID, CRSArrTime, DestAirportSeqID","hsqls":["SELECT DivAirports, DestState, DestCityMarketID FROM mytable WHERE Carrier IN ('WN', 'MQ', 'VX', 'AA') AND Distance = 1171 AND SecurityDelay NOT IN (4, 18, 8, 27, -9999) ORDER BY OriginAirportSeqID, CRSArrTime, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT MAX(WheelsOn), SUM(DivDistance), MAX(Distance) FROM mytable WHERE DepartureDelayGroups NOT IN (2) AND TotalAddGTime IN (19, 8) AND DivTotalGTimes IN (112, 22, 73) LIMIT 2","hsqls":["SELECT MAX(WheelsOn), SUM(DivDistance), MAX(Distance)  FROM mytable WHERE DepartureDelayGroups NOT IN (2) AND TotalAddGTime IN (19, 8) AND (DivTotalGTimes[1] IN (112, 22, 73) OR DivTotalGTimes[2] IN (112, 22, 73) OR DivTotalGTimes[3] IN (112, 22, 73) OR DivTotalGTimes[4] IN (112, 22, 73) OR DivTotalGTimes[5] IN (112, 22, 73)) LIMIT 10000"]}
 {"sql":"SELECT SUM(CRSElapsedTime), AVG(TaxiIn) FROM mytable WHERE CRSElapsedTime BETWEEN 374 AND 291 AND OriginStateName > 'Nevada' AND LateAircraftDelay IN (104) LIMIT 19"}
 {"sql":"SELECT Carrier, DepTimeBlk, CRSElapsedTime FROM mytable WHERE ArrTime BETWEEN 1406 AND 1102 AND CarrierDelay IN (179, 52, 168, 76) LIMIT 2"}
 {"sql":"SELECT TaxiOut, OriginState, OriginAirportID FROM mytable ORDER BY OriginCityMarketID, CRSArrTime, DestStateName LIMIT 7"}
@@ -8599,59 +8599,59 @@
 {"sql":"SELECT DepDelayMinutes, COUNT(*) FROM mytable WHERE AirTime NOT IN (95, 113, 404, 371, 207) OR TotalAddGTime BETWEEN 51 AND 63 GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 11","hsqls":["SELECT DepDelayMinutes, COUNT(*) FROM mytable WHERE AirTime NOT IN (95, 113, 404, 371, 207) OR TotalAddGTime BETWEEN 51 AND 63 GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 11"]}
 {"sql":"SELECT ArrDelayMinutes, AVG(OriginWac) FROM mytable WHERE OriginStateFips BETWEEN 78 AND 34 AND ArrDelay BETWEEN 255.0 AND 237.0 AND CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21","hsqls":["SELECT ArrDelayMinutes, AVG(OriginWac) FROM mytable WHERE OriginStateFips BETWEEN 78 AND 34 AND ArrDelay BETWEEN 255.0 AND 237.0 AND CancellationCode BETWEEN 'noodles' AND 'noodles' GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 21"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivDistance NOT IN (440, 327, 280, 71) AND CarrierDelay IN (132, 182, 139, 26) ORDER BY CarrierDelay, TaxiIn LIMIT 27"}
-{"sql":"SELECT Diverted, DayOfWeek FROM mytable WHERE ArrDelayMinutes > 150.0 OR DivLongestGTimes IN (43.0, 111.0) ORDER BY Diverted, Flights, DepDel15 LIMIT 23","hsqls":["SELECT Diverted, DayOfWeek FROM mytable WHERE ArrDelayMinutes > 150.0 OR (DivLongestGTimes__MV0 IN (43.0, 111.0) OR DivLongestGTimes__MV1 IN (43.0, 111.0) OR DivLongestGTimes__MV2 IN (43.0, 111.0) OR DivLongestGTimes__MV3 IN (43.0, 111.0) OR DivLongestGTimes__MV4 IN (43.0, 111.0)) ORDER BY Diverted, Flights, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT Diverted, DayOfWeek FROM mytable WHERE ArrDelayMinutes > 150.0 OR DivLongestGTimes IN (43.0, 111.0) ORDER BY Diverted, Flights, DepDel15 LIMIT 23","hsqls":["SELECT Diverted, DayOfWeek FROM mytable WHERE ArrDelayMinutes > 150.0 OR (DivLongestGTimes[1] IN (43.0, 111.0) OR DivLongestGTimes[2] IN (43.0, 111.0) OR DivLongestGTimes[3] IN (43.0, 111.0) OR DivLongestGTimes[4] IN (43.0, 111.0) OR DivLongestGTimes[5] IN (43.0, 111.0)) ORDER BY Diverted, Flights, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT CancellationCode, OriginStateName FROM mytable WHERE DestStateFips < 15 AND OriginStateName < 'Puerto Rico' LIMIT 19"}
-{"sql":"SELECT Distance, AirTime, CancellationCode FROM mytable ORDER BY DepartureDelayGroups, Distance, \"Month\" LIMIT 10","hsqls":["SELECT Distance, AirTime, CancellationCode FROM mytable ORDER BY DepartureDelayGroups, Distance, Month LIMIT 10"]}
+{"sql":"SELECT Distance, AirTime, CancellationCode FROM mytable ORDER BY DepartureDelayGroups, Distance, \"Month\" LIMIT 10","hsqls":["SELECT Distance, AirTime, CancellationCode FROM mytable ORDER BY DepartureDelayGroups, Distance, `Month` LIMIT 10"]}
 {"sql":"SELECT OriginCityMarketID, SecurityDelay FROM mytable ORDER BY TaxiOut, CRSArrTime, DayOfWeek LIMIT 18"}
 {"sql":"SELECT OriginStateFips, ArrDel15, DivActualElapsedTime, AVG(OriginAirportID) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) GROUP BY OriginStateFips, ArrDel15, DivActualElapsedTime  ORDER BY OriginStateFips, ArrDel15, DivActualElapsedTime LIMIT 2","hsqls":["SELECT OriginStateFips, ArrDel15, DivActualElapsedTime, AVG(OriginAirportID) FROM mytable WHERE DivAirportLandings IN (2, 1, 0, 9) GROUP BY OriginStateFips, ArrDel15, DivActualElapsedTime  ORDER BY OriginStateFips, ArrDel15, DivActualElapsedTime LIMIT 2"]}
 {"sql":"SELECT DivArrDelay, SUM(DayofMonth) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 12","hsqls":["SELECT DivArrDelay, SUM(DayofMonth) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 12"]}
 {"sql":"SELECT DayOfWeek, MIN(Quarter) FROM mytable WHERE AirlineID BETWEEN 20437 AND 19790 GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 25","hsqls":["SELECT DayOfWeek, MIN(Quarter) FROM mytable WHERE AirlineID BETWEEN 20437 AND 19790 GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 25"]}
-{"sql":"SELECT LongestAddGTime, DivArrDelay, AVG(OriginStateFips), COUNT(DivAirportLandings) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivActualElapsedTime IN (403, 234, 645, 265) OR DivAirportSeqIDs BETWEEN 1015804 AND 1172102 GROUP BY LongestAddGTime, DivArrDelay LIMIT 20","hsqls":["SELECT LongestAddGTime, DivArrDelay, AVG(OriginStateFips), COUNT(DivAirportLandings) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivActualElapsedTime IN (403, 234, 645, 265) OR (DivAirportSeqIDs__MV0 BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs__MV1 BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs__MV2 BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs__MV3 BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs__MV4 BETWEEN 1015804 AND 1172102) GROUP BY LongestAddGTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivArrDelay, AVG(OriginStateFips), COUNT(DivAirportLandings) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivActualElapsedTime IN (403, 234, 645, 265) OR DivAirportSeqIDs BETWEEN 1015804 AND 1172102 GROUP BY LongestAddGTime, DivArrDelay LIMIT 20","hsqls":["SELECT LongestAddGTime, DivArrDelay, AVG(OriginStateFips), COUNT(DivAirportLandings) FROM mytable WHERE Cancelled BETWEEN 0 AND 1 AND DivActualElapsedTime IN (403, 234, 645, 265) OR (DivAirportSeqIDs[1] BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs[2] BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs[3] BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs[4] BETWEEN 1015804 AND 1172102 OR DivAirportSeqIDs[5] BETWEEN 1015804 AND 1172102) GROUP BY LongestAddGTime, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT SUM(Cancelled), SUM(WeatherDelay), MAX(ArrDelayMinutes) FROM mytable WHERE Cancelled IN (0) LIMIT 1"}
 {"sql":"SELECT WeatherDelay, Flights, CarrierDelay, MIN(LongestAddGTime), COUNT(DivAirportLandings) FROM mytable WHERE Quarter < 1 AND AirTime <= 253 GROUP BY WeatherDelay, Flights, CarrierDelay  ORDER BY WeatherDelay, Flights, CarrierDelay LIMIT 12","hsqls":["SELECT WeatherDelay, Flights, CarrierDelay, MIN(LongestAddGTime), COUNT(DivAirportLandings) FROM mytable WHERE Quarter < 1 AND AirTime <= 253 GROUP BY WeatherDelay, Flights, CarrierDelay  ORDER BY WeatherDelay, Flights, CarrierDelay LIMIT 12"]}
-{"sql":"SELECT COUNT(Cancelled), MIN(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 125 AND 278 AND DistanceGroup NOT IN (7, 5, 8, 11) OR \"Month\" BETWEEN 1 AND 1 LIMIT 2","hsqls":["SELECT COUNT(Cancelled), MIN(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 125 AND 278 AND DistanceGroup NOT IN (7, 5, 8, 11) OR Month BETWEEN 1 AND 1 LIMIT 2"]}
+{"sql":"SELECT COUNT(Cancelled), MIN(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 125 AND 278 AND DistanceGroup NOT IN (7, 5, 8, 11) OR \"Month\" BETWEEN 1 AND 1 LIMIT 2","hsqls":["SELECT COUNT(Cancelled), MIN(DepDelay) FROM mytable WHERE DivArrDelay BETWEEN 125 AND 278 AND DistanceGroup NOT IN (7, 5, 8, 11) OR `Month` BETWEEN 1 AND 1 LIMIT 2"]}
 {"sql":"SELECT TotalAddGTime, TaxiIn, ArrDelayMinutes FROM mytable WHERE DestStateName BETWEEN 'Georgia' AND 'Alaska' OR DestWac IN (1, 45, 41, 83, 74) OR DestWac IN (66, 62, 81, 39, 84) ORDER BY TaxiOut LIMIT 12"}
-{"sql":"SELECT DivReachedDest, FlightDate, Origin FROM mytable WHERE ActualElapsedTime BETWEEN 310 AND 423 OR CRSDepTime NOT IN (1454, 1248, 1737, 1036) AND TailNum BETWEEN 'N37267' AND 'N104UW' ORDER BY CRSArrTime, \"Month\" LIMIT 23","hsqls":["SELECT DivReachedDest, FlightDate, Origin FROM mytable WHERE ActualElapsedTime BETWEEN 310 AND 423 OR CRSDepTime NOT IN (1454, 1248, 1737, 1036) AND TailNum BETWEEN 'N37267' AND 'N104UW' ORDER BY CRSArrTime, Month LIMIT 23"]}
+{"sql":"SELECT DivReachedDest, FlightDate, Origin FROM mytable WHERE ActualElapsedTime BETWEEN 310 AND 423 OR CRSDepTime NOT IN (1454, 1248, 1737, 1036) AND TailNum BETWEEN 'N37267' AND 'N104UW' ORDER BY CRSArrTime, \"Month\" LIMIT 23","hsqls":["SELECT DivReachedDest, FlightDate, Origin FROM mytable WHERE ActualElapsedTime BETWEEN 310 AND 423 OR CRSDepTime NOT IN (1454, 1248, 1737, 1036) AND TailNum BETWEEN 'N37267' AND 'N104UW' ORDER BY CRSArrTime, `Month` LIMIT 23"]}
 {"sql":"SELECT OriginCityName, TailNum, MAX(DayOfWeek) FROM mytable GROUP BY OriginCityName, TailNum  ORDER BY OriginCityName, TailNum LIMIT 13","hsqls":["SELECT OriginCityName, TailNum, MAX(DayOfWeek) FROM mytable GROUP BY OriginCityName, TailNum  ORDER BY OriginCityName, TailNum LIMIT 13"]}
 {"sql":"SELECT ArrivalDelayGroups FROM mytable LIMIT 28"}
 {"sql":"SELECT DestWac, DepDelay, LongestAddGTime FROM mytable WHERE OriginAirportSeqID BETWEEN 1294503 AND 1063104 OR Carrier >= 'B6' ORDER BY DestStateFips LIMIT 7"}
-{"sql":"SELECT ArrTimeBlk, DivAirportIDs, OriginStateName FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1100-1159', '2100-2159', '0800-0859') OR DivActualElapsedTime IN (358, 744) OR WheelsOn BETWEEN 1531 AND 1347 LIMIT 17","hsqls":["SELECT ArrTimeBlk, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, OriginStateName FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1100-1159', '2100-2159', '0800-0859') OR DivActualElapsedTime IN (358, 744) OR WheelsOn BETWEEN 1531 AND 1347 LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, DivAirportIDs, OriginStateName FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1100-1159', '2100-2159', '0800-0859') OR DivActualElapsedTime IN (358, 744) OR WheelsOn BETWEEN 1531 AND 1347 LIMIT 17","hsqls":["SELECT ArrTimeBlk, DivAirportIDs, OriginStateName FROM mytable WHERE ArrTimeBlk IN ('1600-1659', '1100-1159', '2100-2159', '0800-0859') OR DivActualElapsedTime IN (358, 744) OR WheelsOn BETWEEN 1531 AND 1347 LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, ActualElapsedTime, AVG(ArrivalDelayGroups), SUM(FlightNum) FROM mytable WHERE OriginAirportID BETWEEN 13796 AND 11003 OR OriginAirportSeqID NOT IN (1091802, 1014602, 1220603, 1329002) GROUP BY CarrierDelay, ActualElapsedTime  ORDER BY CarrierDelay, ActualElapsedTime LIMIT 23","hsqls":["SELECT CarrierDelay, ActualElapsedTime, AVG(ArrivalDelayGroups), SUM(FlightNum) FROM mytable WHERE OriginAirportID BETWEEN 13796 AND 11003 OR OriginAirportSeqID NOT IN (1091802, 1014602, 1220603, 1329002) GROUP BY CarrierDelay, ActualElapsedTime  ORDER BY CarrierDelay, ActualElapsedTime LIMIT 23"]}
 {"sql":"SELECT OriginCityMarketID, ArrDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' OR DestWac NOT IN (66, 65) GROUP BY OriginCityMarketID, ArrDelay, DaysSinceEpoch  ORDER BY OriginCityMarketID, ArrDelay, DaysSinceEpoch LIMIT 15","hsqls":["SELECT OriginCityMarketID, ArrDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' OR DestWac NOT IN (66, 65) GROUP BY OriginCityMarketID, ArrDelay, DaysSinceEpoch  ORDER BY OriginCityMarketID, ArrDelay, DaysSinceEpoch LIMIT 15"]}
 {"sql":"SELECT COUNT(WheelsOff), MIN(Distance) FROM mytable WHERE CRSDepTime BETWEEN 1446 AND 1920 AND DaysSinceEpoch > 16100"}
-{"sql":"SELECT Diverted, ArrDel15, \"Month\" FROM mytable ORDER BY Quarter, WeatherDelay, DepTimeBlk LIMIT 27","hsqls":["SELECT Diverted, ArrDel15, Month FROM mytable ORDER BY Quarter, WeatherDelay, DepTimeBlk LIMIT 27"]}
-{"sql":"SELECT OriginState, SecurityDelay, ArrDelay, AVG(TaxiOut) FROM mytable WHERE FlightNum IN (5065, 180, 3798, 2670, 3452) AND \"Month\" BETWEEN 1 AND 1 GROUP BY OriginState, SecurityDelay, ArrDelay LIMIT 21","hsqls":["SELECT OriginState, SecurityDelay, ArrDelay, AVG(TaxiOut) FROM mytable WHERE FlightNum IN (5065, 180, 3798, 2670, 3452) AND Month BETWEEN 1 AND 1 GROUP BY OriginState, SecurityDelay, ArrDelay LIMIT 21"]}
+{"sql":"SELECT Diverted, ArrDel15, \"Month\" FROM mytable ORDER BY Quarter, WeatherDelay, DepTimeBlk LIMIT 27","hsqls":["SELECT Diverted, ArrDel15, `Month` FROM mytable ORDER BY Quarter, WeatherDelay, DepTimeBlk LIMIT 27"]}
+{"sql":"SELECT OriginState, SecurityDelay, ArrDelay, AVG(TaxiOut) FROM mytable WHERE FlightNum IN (5065, 180, 3798, 2670, 3452) AND \"Month\" BETWEEN 1 AND 1 GROUP BY OriginState, SecurityDelay, ArrDelay LIMIT 21","hsqls":["SELECT OriginState, SecurityDelay, ArrDelay, AVG(TaxiOut) FROM mytable WHERE FlightNum IN (5065, 180, 3798, 2670, 3452) AND `Month` BETWEEN 1 AND 1 GROUP BY OriginState, SecurityDelay, ArrDelay LIMIT 21"]}
 {"sql":"SELECT DivDistance, ArrTime, DestAirportID FROM mytable WHERE CRSDepTime < 1253 ORDER BY Quarter, ArrTimeBlk, DivActualElapsedTime LIMIT 27"}
 {"sql":"SELECT OriginCityName FROM mytable WHERE LongestAddGTime BETWEEN 42 AND 74 AND DepDelay < 217.0 OR DivReachedDest BETWEEN -9999 AND 1 ORDER BY DepTimeBlk, ArrivalDelayGroups LIMIT 23"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 20"}
 {"sql":"SELECT DepDelay, AirTime FROM mytable WHERE OriginAirportID BETWEEN 14570 AND 12335 OR FlightDate BETWEEN '2014-01-09' AND '2014-01-06' AND OriginState < 'AL' ORDER BY DepartureDelayGroups, OriginCityName, OriginStateName LIMIT 3"}
-{"sql":"SELECT DivWheelsOns FROM mytable WHERE LongestAddGTime >= 74 ORDER BY TotalAddGTime, DepTimeBlk LIMIT 16","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE LongestAddGTime >= 74 ORDER BY TotalAddGTime, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns FROM mytable WHERE LongestAddGTime >= 74 ORDER BY TotalAddGTime, DepTimeBlk LIMIT 16","hsqls":["SELECT DivWheelsOns FROM mytable WHERE LongestAddGTime >= 74 ORDER BY TotalAddGTime, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, DaysSinceEpoch FROM mytable WHERE SecurityDelay >= 8 ORDER BY DepTime, ArrDelay, AirTime LIMIT 17"}
 {"sql":"SELECT FlightNum, ActualElapsedTime, SUM(DivActualElapsedTime) FROM mytable GROUP BY FlightNum, ActualElapsedTime  ORDER BY FlightNum, ActualElapsedTime LIMIT 21","hsqls":["SELECT FlightNum, ActualElapsedTime, SUM(DivActualElapsedTime) FROM mytable GROUP BY FlightNum, ActualElapsedTime  ORDER BY FlightNum, ActualElapsedTime LIMIT 21"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY DestCityName LIMIT 4"}
 {"sql":"SELECT FlightDate FROM mytable WHERE FlightDate = '2014-01-06' ORDER BY DistanceGroup LIMIT 11"}
 {"sql":"SELECT DestWac, Quarter, OriginCityName, COUNT(DepDelay), COUNT(Diverted), COUNT(CarrierDelay) FROM mytable GROUP BY DestWac, Quarter, OriginCityName  ORDER BY DestWac, Quarter, OriginCityName LIMIT 10","hsqls":["SELECT DestWac, Quarter, OriginCityName, COUNT(DepDelay), COUNT(Diverted), COUNT(CarrierDelay) FROM mytable GROUP BY DestWac, Quarter, OriginCityName  ORDER BY DestWac, Quarter, OriginCityName LIMIT 10"]}
-{"sql":"SELECT DestAirportID FROM mytable WHERE DivLongestGTimes BETWEEN 84.0 AND 90.0 OR DepartureDelayGroups IN (7, 6, 5, 11) AND Dest NOT IN ('PSG', 'JFK', 'BOS', 'GTF') ORDER BY LateAircraftDelay, FirstDepTime, Carrier","hsqls":["SELECT DestAirportID FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 84.0 AND 90.0 OR DivLongestGTimes__MV1 BETWEEN 84.0 AND 90.0 OR DivLongestGTimes__MV2 BETWEEN 84.0 AND 90.0 OR DivLongestGTimes__MV3 BETWEEN 84.0 AND 90.0 OR DivLongestGTimes__MV4 BETWEEN 84.0 AND 90.0) OR DepartureDelayGroups IN (7, 6, 5, 11) AND Dest NOT IN ('PSG', 'JFK', 'BOS', 'GTF') ORDER BY LateAircraftDelay, FirstDepTime, Carrier LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivLongestGTimes, ArrTime FROM mytable WHERE DepDelayMinutes IN (81.0) ORDER BY TailNum LIMIT 23","hsqls":["SELECT DistanceGroup, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, ArrTime FROM mytable WHERE DepDelayMinutes IN (81.0) ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT DestAirportID FROM mytable WHERE DivLongestGTimes BETWEEN 84.0 AND 90.0 OR DepartureDelayGroups IN (7, 6, 5, 11) AND Dest NOT IN ('PSG', 'JFK', 'BOS', 'GTF') ORDER BY LateAircraftDelay, FirstDepTime, Carrier","hsqls":["SELECT DestAirportID FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 84.0 AND 90.0 OR DivLongestGTimes[2] BETWEEN 84.0 AND 90.0 OR DivLongestGTimes[3] BETWEEN 84.0 AND 90.0 OR DivLongestGTimes[4] BETWEEN 84.0 AND 90.0 OR DivLongestGTimes[5] BETWEEN 84.0 AND 90.0) OR DepartureDelayGroups IN (7, 6, 5, 11) AND Dest NOT IN ('PSG', 'JFK', 'BOS', 'GTF') ORDER BY LateAircraftDelay, FirstDepTime, Carrier LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivLongestGTimes, ArrTime FROM mytable WHERE DepDelayMinutes IN (81.0) ORDER BY TailNum LIMIT 23","hsqls":["SELECT DistanceGroup, DivLongestGTimes, ArrTime FROM mytable WHERE DepDelayMinutes IN (81.0) ORDER BY TailNum LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DivActualElapsedTime NOT IN (416, 295, 654) OR DistanceGroup BETWEEN 6 AND 7 LIMIT 27"}
 {"sql":"SELECT DepDelay, FlightDate, ActualElapsedTime FROM mytable ORDER BY TaxiOut, DestCityName, DivAirportLandings LIMIT 2"}
 {"sql":"SELECT ActualElapsedTime, DestCityMarketID, MIN(OriginWac), COUNT(OriginState), MAX(DayofMonth) FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DepDel15 < 0 OR OriginStateFips BETWEEN 51 AND 10 GROUP BY ActualElapsedTime, DestCityMarketID  ORDER BY ActualElapsedTime, DestCityMarketID LIMIT 25","hsqls":["SELECT ActualElapsedTime, DestCityMarketID, MIN(OriginWac), COUNT(OriginState), MAX(DayofMonth) FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DepDel15 < 0 OR OriginStateFips BETWEEN 51 AND 10 GROUP BY ActualElapsedTime, DestCityMarketID  ORDER BY ActualElapsedTime, DestCityMarketID LIMIT 25"]}
 {"sql":"SELECT MIN(DepDelay), MAX(OriginStateFips) FROM mytable WHERE AirlineID IN (20304, 20436, 19393, 19930)"}
-{"sql":"SELECT DivAirports, ArrDel15 FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Arizona' AND ArrTime IN (1149, 1019, 2036, 2136) ORDER BY CRSArrTime, Dest, DayofMonth LIMIT 22","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrDel15 FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Arizona' AND ArrTime IN (1149, 1019, 2036, 2136) ORDER BY CRSArrTime, Dest, DayofMonth LIMIT 10000"]}
-{"sql":"SELECT Flights, SUM(\"Month\"), MIN(DistanceGroup), MIN(Cancelled) FROM mytable GROUP BY Flights LIMIT 17","hsqls":["SELECT Flights, SUM(Month), MIN(DistanceGroup), MIN(Cancelled) FROM mytable GROUP BY Flights LIMIT 17"]}
+{"sql":"SELECT DivAirports, ArrDel15 FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Arizona' AND ArrTime IN (1149, 1019, 2036, 2136) ORDER BY CRSArrTime, Dest, DayofMonth LIMIT 22","hsqls":["SELECT DivAirports, ArrDel15 FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Arizona' AND ArrTime IN (1149, 1019, 2036, 2136) ORDER BY CRSArrTime, Dest, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Flights, SUM(\"Month\"), MIN(DistanceGroup), MIN(Cancelled) FROM mytable GROUP BY Flights LIMIT 17","hsqls":["SELECT Flights, SUM(`Month`), MIN(DistanceGroup), MIN(Cancelled) FROM mytable GROUP BY Flights LIMIT 17"]}
 {"sql":"SELECT FlightNum, TaxiIn FROM mytable WHERE DestCityName BETWEEN 'Aspen, CO' AND 'Long Beach, CA' ORDER BY LateAircraftDelay, DivAirportLandings LIMIT 22"}
 {"sql":"SELECT DayofMonth, DaysSinceEpoch, COUNT(*) FROM mytable WHERE NASDelay NOT IN (49, 133, 45, 35, 25) AND Quarter IN (1) GROUP BY DayofMonth, DaysSinceEpoch  ORDER BY DayofMonth, DaysSinceEpoch LIMIT 14","hsqls":["SELECT DayofMonth, DaysSinceEpoch, COUNT(*) FROM mytable WHERE NASDelay NOT IN (49, 133, 45, 35, 25) AND Quarter IN (1) GROUP BY DayofMonth, DaysSinceEpoch  ORDER BY DayofMonth, DaysSinceEpoch LIMIT 14"]}
 {"sql":"SELECT DestWac, DepTime, ArrDel15 FROM mytable WHERE UniqueCarrier > 'UA' OR CRSElapsedTime <> 40 ORDER BY DayofMonth LIMIT 13"}
 {"sql":"SELECT DayofMonth, COUNT(Carrier), COUNT(DestAirportSeqID), AVG(DayofMonth) FROM mytable WHERE ArrTime = 112 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 3","hsqls":["SELECT DayofMonth, COUNT(Carrier), COUNT(DestAirportSeqID), AVG(DayofMonth) FROM mytable WHERE ArrTime = 112 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 3"]}
-{"sql":"SELECT DivWheelsOns, LateAircraftDelay, DivAirportSeqIDs FROM mytable ORDER BY DestState, CarrierDelay, Origin LIMIT 7","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LateAircraftDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable ORDER BY DestState, CarrierDelay, Origin LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, LateAircraftDelay, DivAirportSeqIDs FROM mytable ORDER BY DestState, CarrierDelay, Origin LIMIT 7","hsqls":["SELECT DivWheelsOns, LateAircraftDelay, DivAirportSeqIDs FROM mytable ORDER BY DestState, CarrierDelay, Origin LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, Cancelled, ArrivalDelayGroups, COUNT(OriginAirportID), COUNT(TaxiOut), AVG(AirTime) FROM mytable GROUP BY FirstDepTime, Cancelled, ArrivalDelayGroups  ORDER BY FirstDepTime, Cancelled, ArrivalDelayGroups LIMIT 11","hsqls":["SELECT FirstDepTime, Cancelled, ArrivalDelayGroups, COUNT(OriginAirportID), COUNT(TaxiOut), AVG(AirTime) FROM mytable GROUP BY FirstDepTime, Cancelled, ArrivalDelayGroups  ORDER BY FirstDepTime, Cancelled, ArrivalDelayGroups LIMIT 11"]}
 {"sql":"SELECT OriginStateFips, ArrDel15, COUNT(*) FROM mytable WHERE LongestAddGTime IN (97, 5, 31, 14) GROUP BY OriginStateFips, ArrDel15  ORDER BY OriginStateFips, ArrDel15 LIMIT 12","hsqls":["SELECT OriginStateFips, ArrDel15, COUNT(*) FROM mytable WHERE LongestAddGTime IN (97, 5, 31, 14) GROUP BY OriginStateFips, ArrDel15  ORDER BY OriginStateFips, ArrDel15 LIMIT 12"]}
 {"sql":"SELECT DestWac, ArrDelay, SUM(DivDistance) FROM mytable WHERE WheelsOff IN (2225, 728, 1433, 1737, 1541) AND DestStateFips BETWEEN 12 AND 17 AND FirstDepTime <> 1534 GROUP BY DestWac, ArrDelay  ORDER BY DestWac, ArrDelay LIMIT 16","hsqls":["SELECT DestWac, ArrDelay, SUM(DivDistance) FROM mytable WHERE WheelsOff IN (2225, 728, 1433, 1737, 1541) AND DestStateFips BETWEEN 12 AND 17 AND FirstDepTime <> 1534 GROUP BY DestWac, ArrDelay  ORDER BY DestWac, ArrDelay LIMIT 16"]}
 {"sql":"SELECT DepartureDelayGroups, DestStateName, SUM(WheelsOff) FROM mytable GROUP BY DepartureDelayGroups, DestStateName  ORDER BY DepartureDelayGroups, DestStateName LIMIT 21","hsqls":["SELECT DepartureDelayGroups, DestStateName, SUM(WheelsOff) FROM mytable GROUP BY DepartureDelayGroups, DestStateName  ORDER BY DepartureDelayGroups, DestStateName LIMIT 21"]}
 {"sql":"SELECT FlightNum, COUNT(WheelsOn), MAX(CRSDepTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-29' AND '2014-01-19' AND SecurityDelay NOT IN (1, 10, 14, 27, -9999) GROUP BY FlightNum  ORDER BY FlightNum LIMIT 8","hsqls":["SELECT FlightNum, COUNT(WheelsOn), MAX(CRSDepTime) FROM mytable WHERE FlightDate BETWEEN '2014-01-29' AND '2014-01-19' AND SecurityDelay NOT IN (1, 10, 14, 27, -9999) GROUP BY FlightNum  ORDER BY FlightNum LIMIT 8"]}
-{"sql":"SELECT DestAirportID, SUM(TaxiIn), MIN(\"Month\") FROM mytable WHERE CRSArrTime <= 1646 GROUP BY DestAirportID LIMIT 21","hsqls":["SELECT DestAirportID, SUM(TaxiIn), MIN(Month) FROM mytable WHERE CRSArrTime <= 1646 GROUP BY DestAirportID LIMIT 21"]}
+{"sql":"SELECT DestAirportID, SUM(TaxiIn), MIN(\"Month\") FROM mytable WHERE CRSArrTime <= 1646 GROUP BY DestAirportID LIMIT 21","hsqls":["SELECT DestAirportID, SUM(TaxiIn), MIN(`Month`) FROM mytable WHERE CRSArrTime <= 1646 GROUP BY DestAirportID LIMIT 21"]}
 {"sql":"SELECT ArrDelay, DaysSinceEpoch, AVG(CRSArrTime) FROM mytable WHERE CarrierDelay BETWEEN 50 AND 29 AND AirTime IN (256) GROUP BY ArrDelay, DaysSinceEpoch  ORDER BY ArrDelay, DaysSinceEpoch LIMIT 4","hsqls":["SELECT ArrDelay, DaysSinceEpoch, AVG(CRSArrTime) FROM mytable WHERE CarrierDelay BETWEEN 50 AND 29 AND AirTime IN (256) GROUP BY ArrDelay, DaysSinceEpoch  ORDER BY ArrDelay, DaysSinceEpoch LIMIT 4"]}
-{"sql":"SELECT DivLongestGTimes, TailNum FROM mytable ORDER BY FlightNum, CancellationCode, DayOfWeek LIMIT 20","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, TailNum FROM mytable ORDER BY FlightNum, CancellationCode, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, TailNum FROM mytable ORDER BY FlightNum, CancellationCode, DayOfWeek LIMIT 20","hsqls":["SELECT DivLongestGTimes, TailNum FROM mytable ORDER BY FlightNum, CancellationCode, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DestAirportID FROM mytable ORDER BY CarrierDelay, OriginCityMarketID, Origin LIMIT 9"}
 {"sql":"SELECT OriginStateFips, COUNT(OriginAirportSeqID) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 26","hsqls":["SELECT OriginStateFips, COUNT(OriginAirportSeqID) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 26"]}
 {"sql":"SELECT DepDelay, DepDel15, COUNT(*) FROM mytable GROUP BY DepDelay, DepDel15  ORDER BY DepDelay, DepDel15 LIMIT 25","hsqls":["SELECT DepDelay, DepDel15, COUNT(*) FROM mytable GROUP BY DepDelay, DepDel15  ORDER BY DepDelay, DepDel15 LIMIT 25"]}
@@ -8659,23 +8659,23 @@
 {"sql":"SELECT DistanceGroup, AVG(Distance) FROM mytable WHERE ArrTime NOT IN (2234, 1350) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 10","hsqls":["SELECT DistanceGroup, AVG(Distance) FROM mytable WHERE ArrTime NOT IN (2234, 1350) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 10"]}
 {"sql":"SELECT DepDelayMinutes, SUM(LateAircraftDelay), MAX(DayOfWeek), COUNT(LateAircraftDelay) FROM mytable WHERE OriginCityName <> 'Key West, FL' AND UniqueCarrier BETWEEN 'WN' AND 'EV' OR OriginStateName NOT IN ('New Jersey', 'Rhode Island') GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 10","hsqls":["SELECT DepDelayMinutes, SUM(LateAircraftDelay), MAX(DayOfWeek), COUNT(LateAircraftDelay) FROM mytable WHERE OriginCityName <> 'Key West, FL' AND UniqueCarrier BETWEEN 'WN' AND 'EV' OR OriginStateName NOT IN ('New Jersey', 'Rhode Island') GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 10"]}
 {"sql":"SELECT Distance, OriginWac, AVG(CRSElapsedTime), MAX(DayOfWeek), COUNT(DepTime) FROM mytable WHERE OriginAirportID IN (13158, 14730, 12511, 10627, 10157) GROUP BY Distance, OriginWac  ORDER BY Distance, OriginWac LIMIT 21","hsqls":["SELECT Distance, OriginWac, AVG(CRSElapsedTime), MAX(DayOfWeek), COUNT(DepTime) FROM mytable WHERE OriginAirportID IN (13158, 14730, 12511, 10627, 10157) GROUP BY Distance, OriginWac  ORDER BY Distance, OriginWac LIMIT 21"]}
-{"sql":"SELECT \"Year\" FROM mytable LIMIT 9","hsqls":["SELECT Year FROM mytable LIMIT 9"]}
+{"sql":"SELECT \"Year\" FROM mytable LIMIT 9","hsqls":["SELECT `Year` FROM mytable LIMIT 9"]}
 {"sql":"SELECT CRSArrTime, DaysSinceEpoch FROM mytable WHERE Distance BETWEEN 590 AND 511 ORDER BY DestState, Cancelled, DaysSinceEpoch LIMIT 15"}
 {"sql":"SELECT LongestAddGTime FROM mytable WHERE WheelsOff BETWEEN 1809 AND 2355 AND ArrivalDelayGroups < 7 AND OriginState IN ('MS') ORDER BY DepTimeBlk, ArrivalDelayGroups, OriginAirportID LIMIT 24"}
-{"sql":"SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateFips IN (20, 22, 54, 13) OR DivAirports BETWEEN 'IND' AND 'EWR' OR OriginStateName IN ('Mississippi', 'Georgia', 'Montana') GROUP BY ArrDelayMinutes LIMIT 21","hsqls":["SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateFips IN (20, 22, 54, 13) OR (DivAirports__MV0 BETWEEN 'IND' AND 'EWR' OR DivAirports__MV1 BETWEEN 'IND' AND 'EWR' OR DivAirports__MV2 BETWEEN 'IND' AND 'EWR' OR DivAirports__MV3 BETWEEN 'IND' AND 'EWR' OR DivAirports__MV4 BETWEEN 'IND' AND 'EWR') OR OriginStateName IN ('Mississippi', 'Georgia', 'Montana') GROUP BY ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateFips IN (20, 22, 54, 13) OR DivAirports BETWEEN 'IND' AND 'EWR' OR OriginStateName IN ('Mississippi', 'Georgia', 'Montana') GROUP BY ArrDelayMinutes LIMIT 21","hsqls":["SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE OriginStateFips IN (20, 22, 54, 13) OR (DivAirports[1] BETWEEN 'IND' AND 'EWR' OR DivAirports[2] BETWEEN 'IND' AND 'EWR' OR DivAirports[3] BETWEEN 'IND' AND 'EWR' OR DivAirports[4] BETWEEN 'IND' AND 'EWR' OR DivAirports[5] BETWEEN 'IND' AND 'EWR') OR OriginStateName IN ('Mississippi', 'Georgia', 'Montana') GROUP BY ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime, MIN(CRSDepTime), MIN(CarrierDelay), AVG(Quarter) FROM mytable WHERE DepDelayMinutes = 121.0 AND DestAirportID BETWEEN 14698 AND 10721 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 13","hsqls":["SELECT CRSDepTime, MIN(CRSDepTime), MIN(CarrierDelay), AVG(Quarter) FROM mytable WHERE DepDelayMinutes = 121.0 AND DestAirportID BETWEEN 14698 AND 10721 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 13"]}
-{"sql":"SELECT DivActualElapsedTime, MIN(DestCityMarketID) FROM mytable WHERE DivTailNums IN ('N587JB', 'N561SW', 'N13566') OR DepDel15 BETWEEN 0 AND 1 OR Carrier IN ('DL', 'F9', 'WN') GROUP BY DivActualElapsedTime LIMIT 10","hsqls":["SELECT DivActualElapsedTime, MIN(DestCityMarketID) FROM mytable WHERE (DivTailNums__MV0 IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums__MV1 IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums__MV2 IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums__MV3 IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums__MV4 IN ('N587JB', 'N561SW', 'N13566')) OR DepDel15 BETWEEN 0 AND 1 OR Carrier IN ('DL', 'F9', 'WN') GROUP BY DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivActualElapsedTime, MIN(DestCityMarketID) FROM mytable WHERE DivTailNums IN ('N587JB', 'N561SW', 'N13566') OR DepDel15 BETWEEN 0 AND 1 OR Carrier IN ('DL', 'F9', 'WN') GROUP BY DivActualElapsedTime LIMIT 10","hsqls":["SELECT DivActualElapsedTime, MIN(DestCityMarketID) FROM mytable WHERE (DivTailNums[1] IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums[2] IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums[3] IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums[4] IN ('N587JB', 'N561SW', 'N13566') OR DivTailNums[5] IN ('N587JB', 'N561SW', 'N13566')) OR DepDel15 BETWEEN 0 AND 1 OR Carrier IN ('DL', 'F9', 'WN') GROUP BY DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT CRSElapsedTime, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (2, 5) ORDER BY \"Year\", LateAircraftDelay LIMIT 11","hsqls":["SELECT CRSElapsedTime, DaysSinceEpoch FROM mytable WHERE DepartureDelayGroups IN (2, 5) ORDER BY Year, LateAircraftDelay LIMIT 11"]}
 {"sql":"SELECT TotalAddGTime, ArrTime FROM mytable ORDER BY DestStateFips LIMIT 10"}
 {"sql":"SELECT DivArrDelay, DivActualElapsedTime, COUNT(Dest), COUNT(DestAirportSeqID), SUM(DepartureDelayGroups) FROM mytable WHERE OriginCityName IN ('Jackson, WY', 'Elko, NV') OR ArrTime BETWEEN 1710 AND 1811 GROUP BY DivArrDelay, DivActualElapsedTime  ORDER BY DivArrDelay, DivActualElapsedTime LIMIT 10","hsqls":["SELECT DivArrDelay, DivActualElapsedTime, COUNT(Dest), COUNT(DestAirportSeqID), SUM(DepartureDelayGroups) FROM mytable WHERE OriginCityName IN ('Jackson, WY', 'Elko, NV') OR ArrTime BETWEEN 1710 AND 1811 GROUP BY DivArrDelay, DivActualElapsedTime  ORDER BY DivArrDelay, DivActualElapsedTime LIMIT 10"]}
-{"sql":"SELECT DestStateFips FROM mytable WHERE DivTotalGTimes > 39 AND DayofMonth BETWEEN 12 AND 6 LIMIT 22","hsqls":["SELECT DestStateFips FROM mytable WHERE (DivTotalGTimes__MV0 > 39 OR DivTotalGTimes__MV1 > 39 OR DivTotalGTimes__MV2 > 39 OR DivTotalGTimes__MV3 > 39 OR DivTotalGTimes__MV4 > 39) AND DayofMonth BETWEEN 12 AND 6 LIMIT 10000"]}
+{"sql":"SELECT DestStateFips FROM mytable WHERE DivTotalGTimes > 39 AND DayofMonth BETWEEN 12 AND 6 LIMIT 22","hsqls":["SELECT DestStateFips FROM mytable WHERE (DivTotalGTimes[1] > 39 OR DivTotalGTimes[2] > 39 OR DivTotalGTimes[3] > 39 OR DivTotalGTimes[4] > 39 OR DivTotalGTimes[5] > 39) AND DayofMonth BETWEEN 12 AND 6 LIMIT 10000"]}
 {"sql":"SELECT DivDistance, MIN(DestAirportID) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 28","hsqls":["SELECT DivDistance, MIN(DestAirportID) FROM mytable GROUP BY DivDistance  ORDER BY DivDistance LIMIT 28"]}
 {"sql":"SELECT AVG(DestStateFips), COUNT(DestWac), SUM(OriginAirportSeqID) FROM mytable WHERE DivDistance NOT IN (453, 814, 1036, 998) LIMIT 22"}
-{"sql":"SELECT DivWheelsOffs, DaysSinceEpoch FROM mytable WHERE DivAirportSeqIDs IN (1221702, 1315802, 1161802, 1190502, 1177502) AND Carrier > 'OO' AND FirstDepTime IN (1540, 617, 947) ORDER BY OriginAirportSeqID LIMIT 4","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DaysSinceEpoch FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs__MV1 IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs__MV2 IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs__MV3 IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs__MV4 IN (1221702, 1315802, 1161802, 1190502, 1177502)) AND Carrier > 'OO' AND FirstDepTime IN (1540, 617, 947) ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DaysSinceEpoch FROM mytable WHERE DivAirportSeqIDs IN (1221702, 1315802, 1161802, 1190502, 1177502) AND Carrier > 'OO' AND FirstDepTime IN (1540, 617, 947) ORDER BY OriginAirportSeqID LIMIT 4","hsqls":["SELECT DivWheelsOffs, DaysSinceEpoch FROM mytable WHERE (DivAirportSeqIDs[1] IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs[2] IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs[3] IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs[4] IN (1221702, 1315802, 1161802, 1190502, 1177502) OR DivAirportSeqIDs[5] IN (1221702, 1315802, 1161802, 1190502, 1177502)) AND Carrier > 'OO' AND FirstDepTime IN (1540, 617, 947) ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE AirTime BETWEEN 249 AND 145 OR DestCityMarketID BETWEEN 31146 AND 30913 ORDER BY TaxiIn, ArrDelayMinutes, DaysSinceEpoch LIMIT 27"}
 {"sql":"SELECT TaxiOut, DivReachedDest, WeatherDelay, MIN(Quarter), COUNT(DestAirportID), AVG(Quarter) FROM mytable GROUP BY TaxiOut, DivReachedDest, WeatherDelay  ORDER BY TaxiOut, DivReachedDest, WeatherDelay LIMIT 20","hsqls":["SELECT TaxiOut, DivReachedDest, WeatherDelay, MIN(Quarter), COUNT(DestAirportID), AVG(Quarter) FROM mytable GROUP BY TaxiOut, DivReachedDest, WeatherDelay  ORDER BY TaxiOut, DivReachedDest, WeatherDelay LIMIT 20"]}
 {"sql":"SELECT NASDelay, DivAirportLandings, MIN(Flights), AVG(Distance) FROM mytable WHERE OriginState = 'KS' AND OriginState < 'MO' GROUP BY NASDelay, DivAirportLandings  ORDER BY NASDelay, DivAirportLandings LIMIT 9","hsqls":["SELECT NASDelay, DivAirportLandings, MIN(Flights), AVG(Distance) FROM mytable WHERE OriginState = 'KS' AND OriginState < 'MO' GROUP BY NASDelay, DivAirportLandings  ORDER BY NASDelay, DivAirportLandings LIMIT 9"]}
-{"sql":"SELECT DestCityMarketID, SUM(FirstDepTime), MIN(DestAirportSeqID), MAX(DivAirportLandings) FROM mytable WHERE DestAirportID BETWEEN 12206 AND 10721 AND DivAirportIDs BETWEEN 14098 AND 11278 GROUP BY DestCityMarketID LIMIT 24","hsqls":["SELECT DestCityMarketID, SUM(FirstDepTime), MIN(DestAirportSeqID), MAX(DivAirportLandings) FROM mytable WHERE DestAirportID BETWEEN 12206 AND 10721 AND (DivAirportIDs__MV0 BETWEEN 14098 AND 11278 OR DivAirportIDs__MV1 BETWEEN 14098 AND 11278 OR DivAirportIDs__MV2 BETWEEN 14098 AND 11278 OR DivAirportIDs__MV3 BETWEEN 14098 AND 11278 OR DivAirportIDs__MV4 BETWEEN 14098 AND 11278) GROUP BY DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestCityMarketID, SUM(FirstDepTime), MIN(DestAirportSeqID), MAX(DivAirportLandings) FROM mytable WHERE DestAirportID BETWEEN 12206 AND 10721 AND DivAirportIDs BETWEEN 14098 AND 11278 GROUP BY DestCityMarketID LIMIT 24","hsqls":["SELECT DestCityMarketID, SUM(FirstDepTime), MIN(DestAirportSeqID), MAX(DivAirportLandings) FROM mytable WHERE DestAirportID BETWEEN 12206 AND 10721 AND (DivAirportIDs[1] BETWEEN 14098 AND 11278 OR DivAirportIDs[2] BETWEEN 14098 AND 11278 OR DivAirportIDs[3] BETWEEN 14098 AND 11278 OR DivAirportIDs[4] BETWEEN 14098 AND 11278 OR DivAirportIDs[5] BETWEEN 14098 AND 11278) GROUP BY DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DestWac, Flights FROM mytable WHERE DaysSinceEpoch > 16096 OR CRSDepTime BETWEEN 944 AND 1208 ORDER BY ArrDel15, DestStateName LIMIT 6"}
 {"sql":"SELECT Carrier, ArrivalDelayGroups FROM mytable WHERE DestCityName BETWEEN 'Grand Junction, CO' AND 'Boise, ID' AND OriginCityName = 'Buffalo, NY' OR Quarter > 1 LIMIT 11"}
 {"sql":"SELECT Carrier, SecurityDelay, DayOfWeek FROM mytable WHERE Distance >= 376 OR ArrDelayMinutes > 50.0 AND DepDel15 BETWEEN 0 AND 1 ORDER BY OriginState LIMIT 1"}
@@ -8689,33 +8689,33 @@
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE Quarter NOT IN (1) OR DivAirportLandings NOT IN (9) LIMIT 10"}
 {"sql":"SELECT DestStateFips FROM mytable WHERE DaysSinceEpoch NOT IN (16095) ORDER BY WeatherDelay, WheelsOn LIMIT 10"}
 {"sql":"SELECT DestStateFips, OriginStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes > 384.0 OR AirlineID >= 20398 GROUP BY DestStateFips, OriginStateName  ORDER BY DestStateFips, OriginStateName LIMIT 29","hsqls":["SELECT DestStateFips, OriginStateName, COUNT(*) FROM mytable WHERE ArrDelayMinutes > 384.0 OR AirlineID >= 20398 GROUP BY DestStateFips, OriginStateName  ORDER BY DestStateFips, OriginStateName LIMIT 29"]}
-{"sql":"SELECT \"Month\", AVG(Diverted), COUNT(OriginState) FROM mytable WHERE LateAircraftDelay NOT IN (182, 33) OR DivTotalGTimes IN (43, 92, 29) GROUP BY \"Month\" LIMIT 20","hsqls":["SELECT Month, AVG(Diverted), COUNT(OriginState) FROM mytable WHERE LateAircraftDelay NOT IN (182, 33) OR (DivTotalGTimes__MV0 IN (43, 92, 29) OR DivTotalGTimes__MV1 IN (43, 92, 29) OR DivTotalGTimes__MV2 IN (43, 92, 29) OR DivTotalGTimes__MV3 IN (43, 92, 29) OR DivTotalGTimes__MV4 IN (43, 92, 29)) GROUP BY Month LIMIT 10000"]}
+{"sql":"SELECT \"Month\", AVG(Diverted), COUNT(OriginState) FROM mytable WHERE LateAircraftDelay NOT IN (182, 33) OR DivTotalGTimes IN (43, 92, 29) GROUP BY \"Month\" LIMIT 20","hsqls":["SELECT Month, AVG(Diverted), COUNT(OriginState) FROM mytable WHERE LateAircraftDelay NOT IN (182, 33) OR (DivTotalGTimes[1] IN (43, 92, 29) OR DivTotalGTimes[2] IN (43, 92, 29) OR DivTotalGTimes[3] IN (43, 92, 29) OR DivTotalGTimes[4] IN (43, 92, 29) OR DivTotalGTimes[5] IN (43, 92, 29)) GROUP BY `Month` LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DestCityMarketID, AirlineID, COUNT(*) FROM mytable WHERE DivAirportLandings IN (2, 1) OR CRSElapsedTime IN (366) AND CancellationCode BETWEEN 'B' AND 'noodles' GROUP BY CRSArrTime, DestCityMarketID, AirlineID  ORDER BY CRSArrTime, DestCityMarketID, AirlineID LIMIT 2","hsqls":["SELECT CRSArrTime, DestCityMarketID, AirlineID, COUNT(*) FROM mytable WHERE DivAirportLandings IN (2, 1) OR CRSElapsedTime IN (366) AND CancellationCode BETWEEN 'B' AND 'noodles' GROUP BY CRSArrTime, DestCityMarketID, AirlineID  ORDER BY CRSArrTime, DestCityMarketID, AirlineID LIMIT 2"]}
 {"sql":"SELECT DestWac, DepDelay, COUNT(*) FROM mytable WHERE CRSDepTime IN (809, 556, 1904, 757) AND UniqueCarrier NOT IN ('EV', 'DL', 'B6', 'MQ', 'AS') GROUP BY DestWac, DepDelay  ORDER BY DestWac, DepDelay LIMIT 1","hsqls":["SELECT DestWac, DepDelay, COUNT(*) FROM mytable WHERE CRSDepTime IN (809, 556, 1904, 757) AND UniqueCarrier NOT IN ('EV', 'DL', 'B6', 'MQ', 'AS') GROUP BY DestWac, DepDelay  ORDER BY DestWac, DepDelay LIMIT 1"]}
-{"sql":"SELECT CRSArrTime, DivWheelsOffs, DivActualElapsedTime FROM mytable WHERE DestCityMarketID BETWEEN 34794 AND 31871 ORDER BY TaxiIn, UniqueCarrier, CRSElapsedTime LIMIT 23","hsqls":["SELECT CRSArrTime, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivActualElapsedTime FROM mytable WHERE DestCityMarketID BETWEEN 34794 AND 31871 ORDER BY TaxiIn, UniqueCarrier, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT ArrTime, DestStateName, COUNT(*) FROM mytable WHERE ArrDel15 IN (1, -9999) OR \"Month\" BETWEEN 1 AND 1 GROUP BY ArrTime, DestStateName LIMIT 26","hsqls":["SELECT ArrTime, DestStateName, COUNT(*) FROM mytable WHERE ArrDel15 IN (1, -9999) OR Month BETWEEN 1 AND 1 GROUP BY ArrTime, DestStateName LIMIT 26"]}
+{"sql":"SELECT CRSArrTime, DivWheelsOffs, DivActualElapsedTime FROM mytable WHERE DestCityMarketID BETWEEN 34794 AND 31871 ORDER BY TaxiIn, UniqueCarrier, CRSElapsedTime LIMIT 23","hsqls":["SELECT CRSArrTime, DivWheelsOffs, DivActualElapsedTime FROM mytable WHERE DestCityMarketID BETWEEN 34794 AND 31871 ORDER BY TaxiIn, UniqueCarrier, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT ArrTime, DestStateName, COUNT(*) FROM mytable WHERE ArrDel15 IN (1, -9999) OR \"Month\" BETWEEN 1 AND 1 GROUP BY ArrTime, DestStateName LIMIT 26","hsqls":["SELECT ArrTime, DestStateName, COUNT(*) FROM mytable WHERE ArrDel15 IN (1, -9999) OR `Month` BETWEEN 1 AND 1 GROUP BY ArrTime, DestStateName LIMIT 26"]}
 {"sql":"SELECT DestStateFips, DivActualElapsedTime FROM mytable ORDER BY Flights, DestAirportSeqID LIMIT 1"}
 {"sql":"SELECT AirlineID, DayOfWeek FROM mytable ORDER BY TaxiOut, ActualElapsedTime, AirTime LIMIT 23"}
 {"sql":"SELECT ArrTime, DayofMonth, WheelsOn FROM mytable WHERE ArrivalDelayGroups <= 0 AND DestStateFips BETWEEN 21 AND 75 ORDER BY ArrTimeBlk LIMIT 20"}
 {"sql":"SELECT ActualElapsedTime, DestStateName, NASDelay, COUNT(Origin), COUNT(DestAirportID) FROM mytable WHERE WheelsOn IN (1646, 819) OR OriginStateFips IN (51, 8) GROUP BY ActualElapsedTime, DestStateName, NASDelay  ORDER BY ActualElapsedTime, DestStateName, NASDelay LIMIT 21","hsqls":["SELECT ActualElapsedTime, DestStateName, NASDelay, COUNT(Origin), COUNT(DestAirportID) FROM mytable WHERE WheelsOn IN (1646, 819) OR OriginStateFips IN (51, 8) GROUP BY ActualElapsedTime, DestStateName, NASDelay  ORDER BY ActualElapsedTime, DestStateName, NASDelay LIMIT 21"]}
 {"sql":"SELECT OriginStateFips, DepTime, COUNT(*) FROM mytable WHERE DestWac IN (5, 53, 16, 39, 74) OR DestState BETWEEN 'AR' AND 'AK' GROUP BY OriginStateFips, DepTime  ORDER BY OriginStateFips, DepTime LIMIT 19","hsqls":["SELECT OriginStateFips, DepTime, COUNT(*) FROM mytable WHERE DestWac IN (5, 53, 16, 39, 74) OR DestState BETWEEN 'AR' AND 'AK' GROUP BY OriginStateFips, DepTime  ORDER BY OriginStateFips, DepTime LIMIT 19"]}
-{"sql":"SELECT ArrTime, ArrDel15, DivAirportLandings FROM mytable WHERE ArrDelayMinutes > 60.0 OR DivAirportSeqIDs BETWEEN 1219102 AND 1393003 AND OriginState IN ('WA') LIMIT 15","hsqls":["SELECT ArrTime, ArrDel15, DivAirportLandings FROM mytable WHERE ArrDelayMinutes > 60.0 OR (DivAirportSeqIDs__MV0 BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs__MV1 BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs__MV2 BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs__MV3 BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs__MV4 BETWEEN 1219102 AND 1393003) AND OriginState IN ('WA') LIMIT 10000"]}
+{"sql":"SELECT ArrTime, ArrDel15, DivAirportLandings FROM mytable WHERE ArrDelayMinutes > 60.0 OR DivAirportSeqIDs BETWEEN 1219102 AND 1393003 AND OriginState IN ('WA') LIMIT 15","hsqls":["SELECT ArrTime, ArrDel15, DivAirportLandings FROM mytable WHERE ArrDelayMinutes > 60.0 OR (DivAirportSeqIDs[1] BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs[2] BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs[3] BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs[4] BETWEEN 1219102 AND 1393003 OR DivAirportSeqIDs[5] BETWEEN 1219102 AND 1393003) AND OriginState IN ('WA') LIMIT 10000"]}
 {"sql":"SELECT COUNT(ArrDelayMinutes), AVG(LateAircraftDelay) FROM mytable WHERE OriginStateName BETWEEN 'New Mexico' AND 'Connecticut' AND FlightDate > '2014-01-11' LIMIT 20"}
 {"sql":"SELECT Diverted, Distance, MIN(CRSDepTime) FROM mytable GROUP BY Diverted, Distance","hsqls":["SELECT Diverted, Distance, MIN(CRSDepTime) FROM mytable GROUP BY Diverted, Distance"]}
 {"sql":"SELECT DepDelay, AVG(OriginCityMarketID) FROM mytable WHERE FlightDate BETWEEN '2014-01-27' AND '2014-01-18' GROUP BY DepDelay  ORDER BY DepDelay LIMIT 13","hsqls":["SELECT DepDelay, AVG(OriginCityMarketID) FROM mytable WHERE FlightDate BETWEEN '2014-01-27' AND '2014-01-18' GROUP BY DepDelay  ORDER BY DepDelay LIMIT 13"]}
 {"sql":"SELECT DestWac, DestState FROM mytable ORDER BY NASDelay, DayofMonth, CancellationCode LIMIT 13"}
 {"sql":"SELECT Origin FROM mytable WHERE Flights NOT IN (1) LIMIT 6"}
 {"sql":"SELECT CarrierDelay, Dest, DepTimeBlk FROM mytable WHERE WheelsOff <> 1030 ORDER BY DivAirportLandings LIMIT 21"}
-{"sql":"SELECT DivLongestGTimes, LateAircraftDelay, DestCityName FROM mytable WHERE CRSDepTime BETWEEN 2045 AND 1445 OR DivAirportLandings BETWEEN 1 AND 2 OR UniqueCarrier < 'DL' ORDER BY Carrier, DepDelayMinutes LIMIT 6","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, LateAircraftDelay, DestCityName FROM mytable WHERE CRSDepTime BETWEEN 2045 AND 1445 OR DivAirportLandings BETWEEN 1 AND 2 OR UniqueCarrier < 'DL' ORDER BY Carrier, DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, LateAircraftDelay, DestCityName FROM mytable WHERE CRSDepTime BETWEEN 2045 AND 1445 OR DivAirportLandings BETWEEN 1 AND 2 OR UniqueCarrier < 'DL' ORDER BY Carrier, DepDelayMinutes LIMIT 6","hsqls":["SELECT DivLongestGTimes, LateAircraftDelay, DestCityName FROM mytable WHERE CRSDepTime BETWEEN 2045 AND 1445 OR DivAirportLandings BETWEEN 1 AND 2 OR UniqueCarrier < 'DL' ORDER BY Carrier, DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, CRSArrTime FROM mytable LIMIT 21"}
-{"sql":"SELECT DivLongestGTimes, DestStateName FROM mytable WHERE DivReachedDest NOT IN (1) AND TaxiOut > 112 OR DivAirportLandings = 0 ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 23","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestStateName FROM mytable WHERE DivReachedDest NOT IN (1) AND TaxiOut > 112 OR DivAirportLandings = 0 ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, DivAirportSeqIDs, UniqueCarrier FROM mytable WHERE DivAirportSeqIDs BETWEEN 1198603 AND 1469605 AND DayofMonth BETWEEN 10 AND 24 ORDER BY OriginAirportSeqID LIMIT 17","hsqls":["SELECT DestStateFips, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, UniqueCarrier FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs__MV1 BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs__MV2 BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs__MV3 BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs__MV4 BETWEEN 1198603 AND 1469605) AND DayofMonth BETWEEN 10 AND 24 ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestStateName FROM mytable WHERE DivReachedDest NOT IN (1) AND TaxiOut > 112 OR DivAirportLandings = 0 ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 23","hsqls":["SELECT DivLongestGTimes, DestStateName FROM mytable WHERE DivReachedDest NOT IN (1) AND TaxiOut > 112 OR DivAirportLandings = 0 ORDER BY CRSArrTime, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DivAirportSeqIDs, UniqueCarrier FROM mytable WHERE DivAirportSeqIDs BETWEEN 1198603 AND 1469605 AND DayofMonth BETWEEN 10 AND 24 ORDER BY OriginAirportSeqID LIMIT 17","hsqls":["SELECT DestStateFips, DivAirportSeqIDs, UniqueCarrier FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs[2] BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs[3] BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs[4] BETWEEN 1198603 AND 1469605 OR DivAirportSeqIDs[5] BETWEEN 1198603 AND 1469605) AND DayofMonth BETWEEN 10 AND 24 ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DepTime, DestStateName, Dest FROM mytable LIMIT 19"}
 {"sql":"SELECT ActualElapsedTime, UniqueCarrier, MIN(DestAirportSeqID) FROM mytable WHERE DivActualElapsedTime NOT IN (529) GROUP BY ActualElapsedTime, UniqueCarrier  ORDER BY ActualElapsedTime, UniqueCarrier LIMIT 23","hsqls":["SELECT ActualElapsedTime, UniqueCarrier, MIN(DestAirportSeqID) FROM mytable WHERE DivActualElapsedTime NOT IN (529) GROUP BY ActualElapsedTime, UniqueCarrier  ORDER BY ActualElapsedTime, UniqueCarrier LIMIT 23"]}
 {"sql":"SELECT DestStateFips, MAX(CRSArrTime) FROM mytable WHERE TaxiOut BETWEEN 34 AND 8 AND CarrierDelay BETWEEN 51 AND 141 GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 3","hsqls":["SELECT DestStateFips, MAX(CRSArrTime) FROM mytable WHERE TaxiOut BETWEEN 34 AND 8 AND CarrierDelay BETWEEN 51 AND 141 GROUP BY DestStateFips  ORDER BY DestStateFips LIMIT 3"]}
 {"sql":"SELECT MAX(DivDistance), MAX(DestAirportID), COUNT(ActualElapsedTime) FROM mytable WHERE NASDelay IN (20, 110, 31, 82, 14) LIMIT 12"}
 {"sql":"SELECT WeatherDelay, SecurityDelay, DivActualElapsedTime FROM mytable WHERE DestCityMarketID BETWEEN 30208 AND 30781 ORDER BY AirTime LIMIT 21"}
-{"sql":"SELECT DepartureDelayGroups, ArrTime, DivAirportIDs FROM mytable WHERE DestWac <> 83 AND OriginStateFips IN (10, 40, 53, 34, 13) ORDER BY Origin, DepTimeBlk LIMIT 19","hsqls":["SELECT DepartureDelayGroups, ArrTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DestWac <> 83 AND OriginStateFips IN (10, 40, 53, 34, 13) ORDER BY Origin, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, ArrTime, DivAirportIDs FROM mytable WHERE DestWac <> 83 AND OriginStateFips IN (10, 40, 53, 34, 13) ORDER BY Origin, DepTimeBlk LIMIT 19","hsqls":["SELECT DepartureDelayGroups, ArrTime, DivAirportIDs FROM mytable WHERE DestWac <> 83 AND OriginStateFips IN (10, 40, 53, 34, 13) ORDER BY Origin, DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT Cancelled, TailNum, DestCityMarketID, MIN(WeatherDelay) FROM mytable WHERE Distance < 704 AND WeatherDelay NOT IN (205, 319, 13, 86) AND ActualElapsedTime IN (221, 401, 346, 118) GROUP BY Cancelled, TailNum, DestCityMarketID  ORDER BY Cancelled, TailNum, DestCityMarketID LIMIT 7","hsqls":["SELECT Cancelled, TailNum, DestCityMarketID, MIN(WeatherDelay) FROM mytable WHERE Distance < 704 AND WeatherDelay NOT IN (205, 319, 13, 86) AND ActualElapsedTime IN (221, 401, 346, 118) GROUP BY Cancelled, TailNum, DestCityMarketID  ORDER BY Cancelled, TailNum, DestCityMarketID LIMIT 7"]}
 {"sql":"SELECT MAX(Flights) FROM mytable LIMIT 27"}
 {"sql":"SELECT MIN(LateAircraftDelay), COUNT(DivArrDelay), COUNT(CarrierDelay) FROM mytable WHERE Diverted BETWEEN 1 AND 1 LIMIT 17"}
@@ -8723,22 +8723,22 @@
 {"sql":"SELECT Quarter, TaxiIn, DepTimeBlk, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'Puerto Rico' AND 'Idaho' OR Origin NOT IN ('PIH', 'SDF') GROUP BY Quarter, TaxiIn, DepTimeBlk  ORDER BY Quarter, TaxiIn, DepTimeBlk LIMIT 16","hsqls":["SELECT Quarter, TaxiIn, DepTimeBlk, COUNT(*) FROM mytable WHERE OriginStateName BETWEEN 'Puerto Rico' AND 'Idaho' OR Origin NOT IN ('PIH', 'SDF') GROUP BY Quarter, TaxiIn, DepTimeBlk  ORDER BY Quarter, TaxiIn, DepTimeBlk LIMIT 16"]}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE DepDelay BETWEEN 6.0 AND 169.0 AND CarrierDelay IN (144, 82, 310) ORDER BY Distance LIMIT 27"}
 {"sql":"SELECT COUNT(DayOfWeek) FROM mytable WHERE DestStateName BETWEEN 'Texas' AND 'South Carolina' OR FlightNum = 294 OR DivDistance BETWEEN 668 AND 798 LIMIT 4"}
-{"sql":"SELECT DivWheelsOns, DivLongestGTimes, DivTailNums FROM mytable ORDER BY Flights, FlightDate LIMIT 20","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable ORDER BY Flights, FlightDate LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, DivAirportIDs, DestAirportID FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'HA' ORDER BY WheelsOn LIMIT 24","hsqls":["SELECT DepartureDelayGroups, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DestAirportID FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'HA' ORDER BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivLongestGTimes, DivTailNums FROM mytable ORDER BY Flights, FlightDate LIMIT 20","hsqls":["SELECT DivWheelsOns, DivLongestGTimes, DivTailNums FROM mytable ORDER BY Flights, FlightDate LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirportIDs, DestAirportID FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'HA' ORDER BY WheelsOn LIMIT 24","hsqls":["SELECT DepartureDelayGroups, DivAirportIDs, DestAirportID FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'HA' ORDER BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16095 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 6","hsqls":["SELECT ArrDelayMinutes, COUNT(*) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16095 GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 6"]}
 {"sql":"SELECT DistanceGroup, CRSDepTime FROM mytable LIMIT 10"}
 {"sql":"SELECT WeatherDelay, CRSArrTime, ArrDelay, COUNT(*) FROM mytable WHERE DepTime = 1728 OR TailNum BETWEEN 'N218WN' AND 'N490AA' GROUP BY WeatherDelay, CRSArrTime, ArrDelay  ORDER BY WeatherDelay, CRSArrTime, ArrDelay LIMIT 24","hsqls":["SELECT WeatherDelay, CRSArrTime, ArrDelay, COUNT(*) FROM mytable WHERE DepTime = 1728 OR TailNum BETWEEN 'N218WN' AND 'N490AA' GROUP BY WeatherDelay, CRSArrTime, ArrDelay  ORDER BY WeatherDelay, CRSArrTime, ArrDelay LIMIT 24"]}
 {"sql":"SELECT DestAirportID, WheelsOn FROM mytable ORDER BY DestWac LIMIT 16"}
 {"sql":"SELECT LateAircraftDelay, TailNum FROM mytable WHERE TotalAddGTime BETWEEN 37 AND 51 ORDER BY DayofMonth LIMIT 14"}
 {"sql":"SELECT OriginCityName, ArrTime, DestStateName, COUNT(*) FROM mytable GROUP BY OriginCityName, ArrTime, DestStateName  ORDER BY OriginCityName, ArrTime, DestStateName LIMIT 18","hsqls":["SELECT OriginCityName, ArrTime, DestStateName, COUNT(*) FROM mytable GROUP BY OriginCityName, ArrTime, DestStateName  ORDER BY OriginCityName, ArrTime, DestStateName LIMIT 18"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY WeatherDelay, TaxiIn, DivAirportLandings LIMIT 22","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable ORDER BY WeatherDelay, TaxiIn, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable ORDER BY WeatherDelay, TaxiIn, DivAirportLandings LIMIT 22","hsqls":["SELECT DivWheelsOffs FROM mytable ORDER BY WeatherDelay, TaxiIn, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, Distance, TaxiIn, AVG(CRSElapsedTime) FROM mytable WHERE DivAirportLandings >= 0 AND Quarter >= 1 AND CRSElapsedTime IN (286, 227) GROUP BY SecurityDelay, Distance, TaxiIn  ORDER BY SecurityDelay, Distance, TaxiIn LIMIT 10","hsqls":["SELECT SecurityDelay, Distance, TaxiIn, AVG(CRSElapsedTime) FROM mytable WHERE DivAirportLandings >= 0 AND Quarter >= 1 AND CRSElapsedTime IN (286, 227) GROUP BY SecurityDelay, Distance, TaxiIn  ORDER BY SecurityDelay, Distance, TaxiIn LIMIT 10"]}
 {"sql":"SELECT Cancelled, DepTimeBlk, COUNT(OriginCityName), SUM(CRSArrTime) FROM mytable WHERE CRSDepTime BETWEEN 2112 AND 1900 GROUP BY Cancelled, DepTimeBlk  ORDER BY Cancelled, DepTimeBlk LIMIT 10","hsqls":["SELECT Cancelled, DepTimeBlk, COUNT(OriginCityName), SUM(CRSArrTime) FROM mytable WHERE CRSDepTime BETWEEN 2112 AND 1900 GROUP BY Cancelled, DepTimeBlk  ORDER BY Cancelled, DepTimeBlk LIMIT 10"]}
 {"sql":"SELECT OriginCityName, ArrDelayMinutes FROM mytable WHERE DivActualElapsedTime <= 268 AND DepartureDelayGroups >= 0 OR OriginCityMarketID = 30434 LIMIT 14"}
 {"sql":"SELECT Carrier, OriginAirportID, COUNT(Dest) FROM mytable WHERE WeatherDelay IN (170, 20, 123) OR WheelsOff <= 1752 GROUP BY Carrier, OriginAirportID  ORDER BY Carrier, OriginAirportID LIMIT 15","hsqls":["SELECT Carrier, OriginAirportID, COUNT(Dest) FROM mytable WHERE WeatherDelay IN (170, 20, 123) OR WheelsOff <= 1752 GROUP BY Carrier, OriginAirportID  ORDER BY Carrier, OriginAirportID LIMIT 15"]}
-{"sql":"SELECT OriginAirportSeqID, CRSArrTime, DivTotalGTimes FROM mytable ORDER BY SecurityDelay, DayOfWeek LIMIT 1","hsqls":["SELECT OriginAirportSeqID, CRSArrTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY SecurityDelay, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, CRSArrTime, DivTotalGTimes FROM mytable ORDER BY SecurityDelay, DayOfWeek LIMIT 1","hsqls":["SELECT OriginAirportSeqID, CRSArrTime, DivTotalGTimes FROM mytable ORDER BY SecurityDelay, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, Diverted FROM mytable WHERE CRSDepTime = 1751 ORDER BY Flights, DayOfWeek, OriginAirportID LIMIT 23"}
-{"sql":"SELECT SUM(DivReachedDest), AVG(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 728 AND 1804 LIMIT 13","hsqls":["SELECT SUM(DivReachedDest), AVG(DestWac)  FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 728 AND 1804 OR DivWheelsOns__MV1 BETWEEN 728 AND 1804 OR DivWheelsOns__MV2 BETWEEN 728 AND 1804 OR DivWheelsOns__MV3 BETWEEN 728 AND 1804 OR DivWheelsOns__MV4 BETWEEN 728 AND 1804) LIMIT 10000"]}
+{"sql":"SELECT SUM(DivReachedDest), AVG(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 728 AND 1804 LIMIT 13","hsqls":["SELECT SUM(DivReachedDest), AVG(DestWac)  FROM mytable WHERE (DivWheelsOns[1] BETWEEN 728 AND 1804 OR DivWheelsOns[2] BETWEEN 728 AND 1804 OR DivWheelsOns[3] BETWEEN 728 AND 1804 OR DivWheelsOns[4] BETWEEN 728 AND 1804 OR DivWheelsOns[5] BETWEEN 728 AND 1804) LIMIT 10000"]}
 {"sql":"SELECT DestWac, CRSElapsedTime, OriginStateName, SUM(DivActualElapsedTime) FROM mytable WHERE TailNum IN ('N6710E', 'N79521', 'N423SW', 'N952WN') GROUP BY DestWac, CRSElapsedTime, OriginStateName  ORDER BY DestWac, CRSElapsedTime, OriginStateName LIMIT 6","hsqls":["SELECT DestWac, CRSElapsedTime, OriginStateName, SUM(DivActualElapsedTime) FROM mytable WHERE TailNum IN ('N6710E', 'N79521', 'N423SW', 'N952WN') GROUP BY DestWac, CRSElapsedTime, OriginStateName  ORDER BY DestWac, CRSElapsedTime, OriginStateName LIMIT 6"]}
 {"sql":"SELECT LateAircraftDelay, CarrierDelay, MAX(NASDelay), AVG(TaxiIn) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 GROUP BY LateAircraftDelay, CarrierDelay  ORDER BY LateAircraftDelay, CarrierDelay LIMIT 18","hsqls":["SELECT LateAircraftDelay, CarrierDelay, MAX(NASDelay), AVG(TaxiIn) FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 GROUP BY LateAircraftDelay, CarrierDelay  ORDER BY LateAircraftDelay, CarrierDelay LIMIT 18"]}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE DivAirportLandings NOT IN (2, 0, 9) ORDER BY DepartureDelayGroups, TaxiIn LIMIT 16"}
@@ -8747,7 +8747,7 @@
 {"sql":"SELECT AVG(TotalAddGTime), MAX(DestStateFips), MAX(Cancelled) FROM mytable WHERE DivAirportLandings = 1 LIMIT 12"}
 {"sql":"SELECT Diverted, FlightDate FROM mytable ORDER BY Diverted, AirTime LIMIT 12"}
 {"sql":"SELECT Distance FROM mytable WHERE NASDelay = 31 ORDER BY TotalAddGTime, DepTimeBlk, AirTime LIMIT 26"}
-{"sql":"SELECT DepDelay, DaysSinceEpoch FROM mytable WHERE DivWheelsOns IN (1642, 921, 2213) AND ArrTime NOT IN (9) ORDER BY ActualElapsedTime, UniqueCarrier LIMIT 1","hsqls":["SELECT DepDelay, DaysSinceEpoch FROM mytable WHERE (DivWheelsOns__MV0 IN (1642, 921, 2213) OR DivWheelsOns__MV1 IN (1642, 921, 2213) OR DivWheelsOns__MV2 IN (1642, 921, 2213) OR DivWheelsOns__MV3 IN (1642, 921, 2213) OR DivWheelsOns__MV4 IN (1642, 921, 2213)) AND ArrTime NOT IN (9) ORDER BY ActualElapsedTime, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DepDelay, DaysSinceEpoch FROM mytable WHERE DivWheelsOns IN (1642, 921, 2213) AND ArrTime NOT IN (9) ORDER BY ActualElapsedTime, UniqueCarrier LIMIT 1","hsqls":["SELECT DepDelay, DaysSinceEpoch FROM mytable WHERE (DivWheelsOns[1] IN (1642, 921, 2213) OR DivWheelsOns[2] IN (1642, 921, 2213) OR DivWheelsOns[3] IN (1642, 921, 2213) OR DivWheelsOns[4] IN (1642, 921, 2213) OR DivWheelsOns[5] IN (1642, 921, 2213)) AND ArrTime NOT IN (9) ORDER BY ActualElapsedTime, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT SUM(DivReachedDest) FROM mytable LIMIT 22"}
 {"sql":"SELECT FlightNum, MAX(ArrDelay), MAX(TaxiIn) FROM mytable WHERE DestCityMarketID > 31401 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 19","hsqls":["SELECT FlightNum, MAX(ArrDelay), MAX(TaxiIn) FROM mytable WHERE DestCityMarketID > 31401 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 19"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 11"}
@@ -8755,9 +8755,9 @@
 {"sql":"SELECT DepDelay, FlightNum, LongestAddGTime, COUNT(Diverted), MIN(DayofMonth) FROM mytable WHERE NASDelay NOT IN (49, 1, 70) GROUP BY DepDelay, FlightNum, LongestAddGTime  ORDER BY DepDelay, FlightNum, LongestAddGTime LIMIT 17","hsqls":["SELECT DepDelay, FlightNum, LongestAddGTime, COUNT(Diverted), MIN(DayofMonth) FROM mytable WHERE NASDelay NOT IN (49, 1, 70) GROUP BY DepDelay, FlightNum, LongestAddGTime  ORDER BY DepDelay, FlightNum, LongestAddGTime LIMIT 17"]}
 {"sql":"SELECT DivReachedDest, Cancelled FROM mytable WHERE Carrier BETWEEN 'WN' AND 'F9' ORDER BY WheelsOff, UniqueCarrier LIMIT 27"}
 {"sql":"SELECT DestWac, COUNT(*) FROM mytable GROUP BY DestWac  ORDER BY DestWac LIMIT 14","hsqls":["SELECT DestWac, COUNT(*) FROM mytable GROUP BY DestWac  ORDER BY DestWac LIMIT 14"]}
-{"sql":"SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE \"Year\" < 2014 AND DivTotalGTimes >= 135 AND DaysSinceEpoch <> 16079 GROUP BY TotalAddGTime LIMIT 19","hsqls":["SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE Year < 2014 AND (DivTotalGTimes__MV0 >= 135 OR DivTotalGTimes__MV1 >= 135 OR DivTotalGTimes__MV2 >= 135 OR DivTotalGTimes__MV3 >= 135 OR DivTotalGTimes__MV4 >= 135) AND DaysSinceEpoch <> 16079 GROUP BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE \"Year\" < 2014 AND DivTotalGTimes >= 135 AND DaysSinceEpoch <> 16079 GROUP BY TotalAddGTime LIMIT 19","hsqls":["SELECT TotalAddGTime, COUNT(*) FROM mytable WHERE `Year` < 2014 AND (DivTotalGTimes[1] >= 135 OR DivTotalGTimes[2] >= 135 OR DivTotalGTimes[3] >= 135 OR DivTotalGTimes[4] >= 135 OR DivTotalGTimes[5] >= 135) AND DaysSinceEpoch <> 16079 GROUP BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT Flights, TotalAddGTime, Cancelled, SUM(DestAirportSeqID) FROM mytable WHERE DestStateFips < 32 OR TaxiIn >= 56 GROUP BY Flights, TotalAddGTime, Cancelled  ORDER BY Flights, TotalAddGTime, Cancelled LIMIT 26","hsqls":["SELECT Flights, TotalAddGTime, Cancelled, SUM(DestAirportSeqID) FROM mytable WHERE DestStateFips < 32 OR TaxiIn >= 56 GROUP BY Flights, TotalAddGTime, Cancelled  ORDER BY Flights, TotalAddGTime, Cancelled LIMIT 26"]}
-{"sql":"SELECT TaxiOut, DayOfWeek FROM mytable WHERE CRSElapsedTime <> 520 AND DivWheelsOns > 2327 ORDER BY DepTimeBlk, DivAirportLandings, OriginStateName","hsqls":["SELECT TaxiOut, DayOfWeek FROM mytable WHERE CRSElapsedTime <> 520 AND (DivWheelsOns__MV0 > 2327 OR DivWheelsOns__MV1 > 2327 OR DivWheelsOns__MV2 > 2327 OR DivWheelsOns__MV3 > 2327 OR DivWheelsOns__MV4 > 2327) ORDER BY DepTimeBlk, DivAirportLandings, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DayOfWeek FROM mytable WHERE CRSElapsedTime <> 520 AND DivWheelsOns > 2327 ORDER BY DepTimeBlk, DivAirportLandings, OriginStateName","hsqls":["SELECT TaxiOut, DayOfWeek FROM mytable WHERE CRSElapsedTime <> 520 AND (DivWheelsOns[1] > 2327 OR DivWheelsOns[2] > 2327 OR DivWheelsOns[3] > 2327 OR DivWheelsOns[4] > 2327 OR DivWheelsOns[5] > 2327) ORDER BY DepTimeBlk, DivAirportLandings, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT \"Year\", FirstDepTime, AirTime FROM mytable ORDER BY DivReachedDest, DepDelay, DivAirportLandings LIMIT 13","hsqls":["SELECT Year, FirstDepTime, AirTime FROM mytable ORDER BY DivReachedDest, DepDelay, DivAirportLandings LIMIT 13"]}
 {"sql":"SELECT CRSArrTime, SecurityDelay, DepTimeBlk, COUNT(TaxiOut), SUM(DepDelay), AVG(DistanceGroup) FROM mytable WHERE ArrTime BETWEEN 1357 AND 2233 OR Origin < 'ABY' AND CRSArrTime = 740 GROUP BY CRSArrTime, SecurityDelay, DepTimeBlk  ORDER BY CRSArrTime, SecurityDelay, DepTimeBlk LIMIT 20","hsqls":["SELECT CRSArrTime, SecurityDelay, DepTimeBlk, COUNT(TaxiOut), SUM(DepDelay), AVG(DistanceGroup) FROM mytable WHERE ArrTime BETWEEN 1357 AND 2233 OR Origin < 'ABY' AND CRSArrTime = 740 GROUP BY CRSArrTime, SecurityDelay, DepTimeBlk  ORDER BY CRSArrTime, SecurityDelay, DepTimeBlk LIMIT 20"]}
 {"sql":"SELECT MIN(DestStateFips), COUNT(WheelsOff) FROM mytable WHERE OriginCityName BETWEEN 'Albany, NY' AND 'Harrisburg, PA' AND OriginWac NOT IN (1, 5, 52) OR DepTimeBlk > '1600-1659' LIMIT 18"}
@@ -8765,40 +8765,40 @@
 {"sql":"SELECT DepartureDelayGroups, Diverted, ArrTimeBlk, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (96.0, 242.0) GROUP BY DepartureDelayGroups, Diverted, ArrTimeBlk  ORDER BY DepartureDelayGroups, Diverted, ArrTimeBlk LIMIT 20","hsqls":["SELECT DepartureDelayGroups, Diverted, ArrTimeBlk, COUNT(*) FROM mytable WHERE ArrDelayMinutes IN (96.0, 242.0) GROUP BY DepartureDelayGroups, Diverted, ArrTimeBlk  ORDER BY DepartureDelayGroups, Diverted, ArrTimeBlk LIMIT 20"]}
 {"sql":"SELECT TotalAddGTime, COUNT(CRSDepTime), COUNT(DayofMonth), AVG(Cancelled) FROM mytable WHERE DivAirportLandings = 0 OR FlightNum NOT IN (5745, 710) GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 21","hsqls":["SELECT TotalAddGTime, COUNT(CRSDepTime), COUNT(DayofMonth), AVG(Cancelled) FROM mytable WHERE DivAirportLandings = 0 OR FlightNum NOT IN (5745, 710) GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 21"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE LongestAddGTime <> 63 AND DepTimeBlk IN ('1000-1059', '0900-0959', '1900-1959', '0001-0559', '1400-1459') LIMIT 25"}
-{"sql":"SELECT OriginState, DivAirports FROM mytable WHERE OriginCityName <> 'Williston, ND' ORDER BY DestWac LIMIT 8","hsqls":["SELECT OriginState, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE OriginCityName <> 'Williston, ND' ORDER BY DestWac LIMIT 10000"]}
+{"sql":"SELECT OriginState, DivAirports FROM mytable WHERE OriginCityName <> 'Williston, ND' ORDER BY DestWac LIMIT 8","hsqls":["SELECT OriginState, DivAirports FROM mytable WHERE OriginCityName <> 'Williston, ND' ORDER BY DestWac LIMIT 10000"]}
 {"sql":"SELECT COUNT(OriginCityMarketID), COUNT(Flights), AVG(DestAirportID) FROM mytable WHERE DestStateName IN ('Kentucky', 'Maine') LIMIT 3"}
 {"sql":"SELECT OriginState, DestState FROM mytable WHERE AirTime BETWEEN 223 AND 284 OR TailNum IN ('N17524', 'N841MQ', 'N384HA', 'N198JB', 'N449US') AND CarrierDelay IN (66, 7, 130, 28) LIMIT 13"}
-{"sql":"SELECT MIN(CRSElapsedTime), MIN(DepDelay) FROM mytable WHERE DivArrDelay IN (1024) AND \"Month\" IN (1) AND LateAircraftDelay = 151 LIMIT 4","hsqls":["SELECT MIN(CRSElapsedTime), MIN(DepDelay) FROM mytable WHERE DivArrDelay IN (1024) AND Month IN (1) AND LateAircraftDelay = 151 LIMIT 4"]}
-{"sql":"SELECT TaxiOut, AirlineID, CRSElapsedTime FROM mytable WHERE DivWheelsOffs IN (1954, 2243) OR DivAirportLandings BETWEEN 0 AND 9 AND DepDelayMinutes IN (246.0, 123.0, 270.0) LIMIT 4","hsqls":["SELECT TaxiOut, AirlineID, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs__MV0 IN (1954, 2243) OR DivWheelsOffs__MV1 IN (1954, 2243) OR DivWheelsOffs__MV2 IN (1954, 2243) OR DivWheelsOffs__MV3 IN (1954, 2243) OR DivWheelsOffs__MV4 IN (1954, 2243)) OR DivAirportLandings BETWEEN 0 AND 9 AND DepDelayMinutes IN (246.0, 123.0, 270.0) LIMIT 10000"]}
+{"sql":"SELECT MIN(CRSElapsedTime), MIN(DepDelay) FROM mytable WHERE DivArrDelay IN (1024) AND \"Month\" IN (1) AND LateAircraftDelay = 151 LIMIT 4","hsqls":["SELECT MIN(CRSElapsedTime), MIN(DepDelay) FROM mytable WHERE DivArrDelay IN (1024) AND `Month` IN (1) AND LateAircraftDelay = 151 LIMIT 4"]}
+{"sql":"SELECT TaxiOut, AirlineID, CRSElapsedTime FROM mytable WHERE DivWheelsOffs IN (1954, 2243) OR DivAirportLandings BETWEEN 0 AND 9 AND DepDelayMinutes IN (246.0, 123.0, 270.0) LIMIT 4","hsqls":["SELECT TaxiOut, AirlineID, CRSElapsedTime FROM mytable WHERE (DivWheelsOffs[1] IN (1954, 2243) OR DivWheelsOffs[2] IN (1954, 2243) OR DivWheelsOffs[3] IN (1954, 2243) OR DivWheelsOffs[4] IN (1954, 2243) OR DivWheelsOffs[5] IN (1954, 2243)) OR DivAirportLandings BETWEEN 0 AND 9 AND DepDelayMinutes IN (246.0, 123.0, 270.0) LIMIT 10000"]}
 {"sql":"SELECT MAX(ArrivalDelayGroups) FROM mytable LIMIT 15"}
-{"sql":"SELECT \"Year\", DepDelayMinutes, Origin FROM mytable ORDER BY \"Month\" LIMIT 8","hsqls":["SELECT Year, DepDelayMinutes, Origin FROM mytable ORDER BY Month LIMIT 8"]}
-{"sql":"SELECT DestAirportID, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('B', 'C', 'noodles') AND AirTime NOT IN (146, 385) OR \"Month\" IN (1) LIMIT 29","hsqls":["SELECT DestAirportID, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('B', 'C', 'noodles') AND AirTime NOT IN (146, 385) OR Month IN (1) LIMIT 29"]}
+{"sql":"SELECT \"Year\", DepDelayMinutes, Origin FROM mytable ORDER BY \"Month\" LIMIT 8","hsqls":["SELECT Year, DepDelayMinutes, Origin FROM mytable ORDER BY `Month` LIMIT 8"]}
+{"sql":"SELECT DestAirportID, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('B', 'C', 'noodles') AND AirTime NOT IN (146, 385) OR \"Month\" IN (1) LIMIT 29","hsqls":["SELECT DestAirportID, OriginAirportID FROM mytable WHERE CancellationCode NOT IN ('B', 'C', 'noodles') AND AirTime NOT IN (146, 385) OR `Month` IN (1) LIMIT 29"]}
 {"sql":"SELECT MIN(CRSDepTime), MAX(CRSArrTime), COUNT(DestCityName) FROM mytable WHERE AirTime NOT IN (66, 146, 270) LIMIT 9"}
 {"sql":"SELECT OriginAirportSeqID, Quarter, DaysSinceEpoch FROM mytable WHERE OriginWac NOT IN (93, 39, 14) OR DepDel15 IN (1, 0, -9999) AND DaysSinceEpoch IN (16074, 16086) ORDER BY DayofMonth, OriginWac LIMIT 4"}
 {"sql":"SELECT CarrierDelay, DestAirportSeqID, MIN(LateAircraftDelay), MIN(DepTime), AVG(DistanceGroup) FROM mytable WHERE OriginAirportSeqID <> 1244805 GROUP BY CarrierDelay, DestAirportSeqID  ORDER BY CarrierDelay, DestAirportSeqID LIMIT 3","hsqls":["SELECT CarrierDelay, DestAirportSeqID, MIN(LateAircraftDelay), MIN(DepTime), AVG(DistanceGroup) FROM mytable WHERE OriginAirportSeqID <> 1244805 GROUP BY CarrierDelay, DestAirportSeqID  ORDER BY CarrierDelay, DestAirportSeqID LIMIT 3"]}
 {"sql":"SELECT DestWac, Diverted, FlightDate, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 1724 AND 2207 OR ArrDel15 BETWEEN 1 AND 1 AND DepDel15 IN (1, 0, -9999) GROUP BY DestWac, Diverted, FlightDate  ORDER BY DestWac, Diverted, FlightDate LIMIT 13","hsqls":["SELECT DestWac, Diverted, FlightDate, COUNT(*) FROM mytable WHERE WheelsOn BETWEEN 1724 AND 2207 OR ArrDel15 BETWEEN 1 AND 1 AND DepDel15 IN (1, 0, -9999) GROUP BY DestWac, Diverted, FlightDate  ORDER BY DestWac, Diverted, FlightDate LIMIT 13"]}
-{"sql":"SELECT Quarter, CarrierDelay, DivTotalGTimes FROM mytable WHERE Distance < 335 OR Dest BETWEEN 'JAX' AND 'DBQ' ORDER BY UniqueCarrier LIMIT 28","hsqls":["SELECT Quarter, CarrierDelay, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Distance < 335 OR Dest BETWEEN 'JAX' AND 'DBQ' ORDER BY UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT Quarter, CarrierDelay, DivTotalGTimes FROM mytable WHERE Distance < 335 OR Dest BETWEEN 'JAX' AND 'DBQ' ORDER BY UniqueCarrier LIMIT 28","hsqls":["SELECT Quarter, CarrierDelay, DivTotalGTimes FROM mytable WHERE Distance < 335 OR Dest BETWEEN 'JAX' AND 'DBQ' ORDER BY UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT Cancelled, DayofMonth, AirTime, COUNT(DestStateFips), MAX(DepDelay), MIN(FirstDepTime) FROM mytable WHERE CRSElapsedTime BETWEEN 234 AND 384 AND ArrDelay <> 181.0 OR OriginWac NOT IN (82, 71, 54) GROUP BY Cancelled, DayofMonth, AirTime  ORDER BY Cancelled, DayofMonth, AirTime LIMIT 25","hsqls":["SELECT Cancelled, DayofMonth, AirTime, COUNT(DestStateFips), MAX(DepDelay), MIN(FirstDepTime) FROM mytable WHERE CRSElapsedTime BETWEEN 234 AND 384 AND ArrDelay <> 181.0 OR OriginWac NOT IN (82, 71, 54) GROUP BY Cancelled, DayofMonth, AirTime  ORDER BY Cancelled, DayofMonth, AirTime LIMIT 25"]}
 {"sql":"SELECT LateAircraftDelay, Dest, DepTimeBlk FROM mytable WHERE OriginCityMarketID IN (31895, 35249, 30666, 35389) ORDER BY LateAircraftDelay, DivAirportLandings LIMIT 8"}
-{"sql":"SELECT COUNT(CRSDepTime), AVG(AirlineID) FROM mytable WHERE TaxiIn BETWEEN 10 AND 45 AND DestCityMarketID IN (33367) AND \"Year\" < 2014 LIMIT 20","hsqls":["SELECT COUNT(CRSDepTime), AVG(AirlineID) FROM mytable WHERE TaxiIn BETWEEN 10 AND 45 AND DestCityMarketID IN (33367) AND Year < 2014 LIMIT 20"]}
-{"sql":"SELECT DestAirportID FROM mytable WHERE DivAirports IN ('YYZ', 'TRI', 'PSP') OR DistanceGroup BETWEEN 10 AND 6 OR DestStateName NOT IN ('North Dakota') ORDER BY ArrDel15","hsqls":["SELECT DestAirportID FROM mytable WHERE (DivAirports__MV0 IN ('YYZ', 'TRI', 'PSP') OR DivAirports__MV1 IN ('YYZ', 'TRI', 'PSP') OR DivAirports__MV2 IN ('YYZ', 'TRI', 'PSP') OR DivAirports__MV3 IN ('YYZ', 'TRI', 'PSP') OR DivAirports__MV4 IN ('YYZ', 'TRI', 'PSP')) OR DistanceGroup BETWEEN 10 AND 6 OR DestStateName NOT IN ('North Dakota') ORDER BY ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DepTime, DivTotalGTimes FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 28","hsqls":["SELECT WheelsOff, DepTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 10000"]}
+{"sql":"SELECT COUNT(CRSDepTime), AVG(AirlineID) FROM mytable WHERE TaxiIn BETWEEN 10 AND 45 AND DestCityMarketID IN (33367) AND \"Year\" < 2014 LIMIT 20","hsqls":["SELECT COUNT(CRSDepTime), AVG(AirlineID) FROM mytable WHERE TaxiIn BETWEEN 10 AND 45 AND DestCityMarketID IN (33367) AND `Year` < 2014 LIMIT 20"]}
+{"sql":"SELECT DestAirportID FROM mytable WHERE DivAirports IN ('YYZ', 'TRI', 'PSP') OR DistanceGroup BETWEEN 10 AND 6 OR DestStateName NOT IN ('North Dakota') ORDER BY ArrDel15","hsqls":["SELECT DestAirportID FROM mytable WHERE (DivAirports[1] IN ('YYZ', 'TRI', 'PSP') OR DivAirports[2] IN ('YYZ', 'TRI', 'PSP') OR DivAirports[3] IN ('YYZ', 'TRI', 'PSP') OR DivAirports[4] IN ('YYZ', 'TRI', 'PSP') OR DivAirports[5] IN ('YYZ', 'TRI', 'PSP')) OR DistanceGroup BETWEEN 10 AND 6 OR DestStateName NOT IN ('North Dakota') ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DepTime, DivTotalGTimes FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 28","hsqls":["SELECT WheelsOff, DepTime, DivTotalGTimes FROM mytable WHERE Diverted NOT IN (1, 0) LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 2"}
 {"sql":"SELECT AirlineID, COUNT(*) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 17","hsqls":["SELECT AirlineID, COUNT(*) FROM mytable GROUP BY AirlineID  ORDER BY AirlineID LIMIT 17"]}
 {"sql":"SELECT UniqueCarrier, AVG(DivReachedDest), COUNT(DepDel15), COUNT(Diverted) FROM mytable WHERE TaxiIn > 12 OR DivReachedDest BETWEEN 0 AND -9999 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 11","hsqls":["SELECT UniqueCarrier, AVG(DivReachedDest), COUNT(DepDel15), COUNT(Diverted) FROM mytable WHERE TaxiIn > 12 OR DivReachedDest BETWEEN 0 AND -9999 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 11"]}
-{"sql":"SELECT DivAirports, \"Month\", DivTotalGTimes FROM mytable WHERE OriginCityMarketID BETWEEN 34614 AND 30779 ORDER BY DivReachedDest LIMIT 8","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Month, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginCityMarketID BETWEEN 34614 AND 30779 ORDER BY DivReachedDest LIMIT 10000"]}
-{"sql":"SELECT OriginState, DayofMonth FROM mytable WHERE DivTotalGTimes = 63 ORDER BY CancellationCode, CRSDepTime LIMIT 25","hsqls":["SELECT OriginState, DayofMonth FROM mytable WHERE (DivTotalGTimes__MV0 = 63 OR DivTotalGTimes__MV1 = 63 OR DivTotalGTimes__MV2 = 63 OR DivTotalGTimes__MV3 = 63 OR DivTotalGTimes__MV4 = 63) ORDER BY CancellationCode, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, AirTime FROM mytable WHERE DivWheelsOns > 1204 AND FlightDate BETWEEN '2014-01-16' AND '2014-01-05' ORDER BY DepartureDelayGroups, TaxiIn LIMIT 14","hsqls":["SELECT OriginStateFips, AirTime FROM mytable WHERE (DivWheelsOns__MV0 > 1204 OR DivWheelsOns__MV1 > 1204 OR DivWheelsOns__MV2 > 1204 OR DivWheelsOns__MV3 > 1204 OR DivWheelsOns__MV4 > 1204) AND FlightDate BETWEEN '2014-01-16' AND '2014-01-05' ORDER BY DepartureDelayGroups, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivAirports, \"Month\", DivTotalGTimes FROM mytable WHERE OriginCityMarketID BETWEEN 34614 AND 30779 ORDER BY DivReachedDest LIMIT 8","hsqls":["SELECT DivAirports, Month, DivTotalGTimes FROM mytable WHERE OriginCityMarketID BETWEEN 34614 AND 30779 ORDER BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT OriginState, DayofMonth FROM mytable WHERE DivTotalGTimes = 63 ORDER BY CancellationCode, CRSDepTime LIMIT 25","hsqls":["SELECT OriginState, DayofMonth FROM mytable WHERE (DivTotalGTimes[1] = 63 OR DivTotalGTimes[2] = 63 OR DivTotalGTimes[3] = 63 OR DivTotalGTimes[4] = 63 OR DivTotalGTimes[5] = 63) ORDER BY CancellationCode, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, AirTime FROM mytable WHERE DivWheelsOns > 1204 AND FlightDate BETWEEN '2014-01-16' AND '2014-01-05' ORDER BY DepartureDelayGroups, TaxiIn LIMIT 14","hsqls":["SELECT OriginStateFips, AirTime FROM mytable WHERE (DivWheelsOns[1] > 1204 OR DivWheelsOns[2] > 1204 OR DivWheelsOns[3] > 1204 OR DivWheelsOns[4] > 1204 OR DivWheelsOns[5] > 1204) AND FlightDate BETWEEN '2014-01-16' AND '2014-01-05' ORDER BY DepartureDelayGroups, TaxiIn LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, ActualElapsedTime FROM mytable WHERE AirTime NOT IN (126, 316, 295) AND CRSArrTime <> 1030 AND DaysSinceEpoch NOT IN (16082, 16096, 16077, 16086, 16078) ORDER BY TotalAddGTime, DestAirportSeqID, CRSDepTime LIMIT 5"}
-{"sql":"SELECT TaxiIn, UniqueCarrier, OriginAirportID FROM mytable WHERE DestAirportID BETWEEN 11865 AND 14256 ORDER BY ArrTimeBlk, \"Month\" LIMIT 25","hsqls":["SELECT TaxiIn, UniqueCarrier, OriginAirportID FROM mytable WHERE DestAirportID BETWEEN 11865 AND 14256 ORDER BY ArrTimeBlk, Month LIMIT 25"]}
+{"sql":"SELECT TaxiIn, UniqueCarrier, OriginAirportID FROM mytable WHERE DestAirportID BETWEEN 11865 AND 14256 ORDER BY ArrTimeBlk, \"Month\" LIMIT 25","hsqls":["SELECT TaxiIn, UniqueCarrier, OriginAirportID FROM mytable WHERE DestAirportID BETWEEN 11865 AND 14256 ORDER BY ArrTimeBlk, `Month` LIMIT 25"]}
 {"sql":"SELECT Distance, TaxiIn, Cancelled FROM mytable WHERE DayOfWeek > 4 AND FlightNum IN (6078) OR DestCityMarketID BETWEEN 34783 AND 35380 ORDER BY TaxiIn, DestCityMarketID LIMIT 13"}
 {"sql":"SELECT TaxiOut, UniqueCarrier, SUM(WheelsOn), AVG(DestWac) FROM mytable GROUP BY TaxiOut, UniqueCarrier  ORDER BY TaxiOut, UniqueCarrier LIMIT 20","hsqls":["SELECT TaxiOut, UniqueCarrier, SUM(WheelsOn), AVG(DestWac) FROM mytable GROUP BY TaxiOut, UniqueCarrier  ORDER BY TaxiOut, UniqueCarrier LIMIT 20"]}
 {"sql":"SELECT DepDelayMinutes, ArrDel15, CRSDepTime, COUNT(*) FROM mytable WHERE DepDelay <> 236.0 GROUP BY DepDelayMinutes, ArrDel15, CRSDepTime  ORDER BY DepDelayMinutes, ArrDel15, CRSDepTime LIMIT 2","hsqls":["SELECT DepDelayMinutes, ArrDel15, CRSDepTime, COUNT(*) FROM mytable WHERE DepDelay <> 236.0 GROUP BY DepDelayMinutes, ArrDel15, CRSDepTime  ORDER BY DepDelayMinutes, ArrDel15, CRSDepTime LIMIT 2"]}
 {"sql":"SELECT FlightNum, DepDel15 FROM mytable WHERE OriginStateFips BETWEEN 12 AND 35 LIMIT 10"}
 {"sql":"SELECT DepDelay, OriginStateFips, MAX(SecurityDelay), MIN(DestAirportSeqID) FROM mytable WHERE DivAirportLandings >= 0 GROUP BY DepDelay, OriginStateFips  ORDER BY DepDelay, OriginStateFips LIMIT 7","hsqls":["SELECT DepDelay, OriginStateFips, MAX(SecurityDelay), MIN(DestAirportSeqID) FROM mytable WHERE DivAirportLandings >= 0 GROUP BY DepDelay, OriginStateFips  ORDER BY DepDelay, OriginStateFips LIMIT 7"]}
 {"sql":"SELECT DestState, DepTime, Cancelled FROM mytable WHERE DepartureDelayGroups BETWEEN 10 AND 4 OR LateAircraftDelay NOT IN (6, 17, 140) AND ArrDelayMinutes < 38.0 ORDER BY DepDelayMinutes, AirTime, CRSDepTime LIMIT 25"}
-{"sql":"SELECT DestStateName, DivWheelsOffs, DestAirportID FROM mytable WHERE UniqueCarrier IN ('F9', 'US', 'VX', 'AS') OR ArrTimeBlk BETWEEN '0900-0959' AND '1900-1959' OR DepTimeBlk BETWEEN '1900-1959' AND '1500-1559' ORDER BY FirstDepTime, DestAirportSeqID LIMIT 6","hsqls":["SELECT DestStateName, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DestAirportID FROM mytable WHERE UniqueCarrier IN ('F9', 'US', 'VX', 'AS') OR ArrTimeBlk BETWEEN '0900-0959' AND '1900-1959' OR DepTimeBlk BETWEEN '1900-1959' AND '1500-1559' ORDER BY FirstDepTime, DestAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT \"Year\", DivLongestGTimes, DivAirports FROM mytable LIMIT 28","hsqls":["SELECT Year, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DestStateName, DivWheelsOffs, DestAirportID FROM mytable WHERE UniqueCarrier IN ('F9', 'US', 'VX', 'AS') OR ArrTimeBlk BETWEEN '0900-0959' AND '1900-1959' OR DepTimeBlk BETWEEN '1900-1959' AND '1500-1559' ORDER BY FirstDepTime, DestAirportSeqID LIMIT 6","hsqls":["SELECT DestStateName, DivWheelsOffs, DestAirportID FROM mytable WHERE UniqueCarrier IN ('F9', 'US', 'VX', 'AS') OR ArrTimeBlk BETWEEN '0900-0959' AND '1900-1959' OR DepTimeBlk BETWEEN '1900-1959' AND '1500-1559' ORDER BY FirstDepTime, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivLongestGTimes, DivAirports FROM mytable LIMIT 28","hsqls":["SELECT Year, DivLongestGTimes, DivAirports FROM mytable LIMIT 10000"]}
 {"sql":"SELECT FlightDate, TotalAddGTime FROM mytable WHERE DestAirportID NOT IN (12953, 10747, 11638, 15070, 10754) ORDER BY Quarter, Distance, NASDelay LIMIT 11"}
 {"sql":"SELECT \"Year\", DivDistance, Dest FROM mytable WHERE AirlineID NOT IN (20304, 21171) OR WheelsOff IN (1513, 1033, 700, 2325, 1922) OR OriginAirportID BETWEEN 12156 AND 15919 ORDER BY OriginState LIMIT 10","hsqls":["SELECT Year, DivDistance, Dest FROM mytable WHERE AirlineID NOT IN (20304, 21171) OR WheelsOff IN (1513, 1033, 700, 2325, 1922) OR OriginAirportID BETWEEN 12156 AND 15919 ORDER BY OriginState LIMIT 10"]}
 {"sql":"SELECT TaxiOut, DestState FROM mytable WHERE ActualElapsedTime NOT IN (95, 113, 281, 236, 346)"}
@@ -8808,20 +8808,20 @@
 {"sql":"SELECT DestAirportID FROM mytable ORDER BY WeatherDelay LIMIT 28"}
 {"sql":"SELECT DistanceGroup, LateAircraftDelay, DivArrDelay FROM mytable WHERE WheelsOff = 1432 OR ActualElapsedTime NOT IN (290) ORDER BY DestCityName LIMIT 20"}
 {"sql":"SELECT DepTime, DestCityMarketID FROM mytable WHERE CRSElapsedTime BETWEEN 195 AND 368 ORDER BY FlightDate, OriginWac LIMIT 10"}
-{"sql":"SELECT CarrierDelay, COUNT(*) FROM mytable WHERE OriginState IN ('GA', 'CA', 'AZ', 'WV', 'ID') AND \"Year\" > 2014 AND Diverted BETWEEN 0 AND 1 GROUP BY CarrierDelay LIMIT 25","hsqls":["SELECT CarrierDelay, COUNT(*) FROM mytable WHERE OriginState IN ('GA', 'CA', 'AZ', 'WV', 'ID') AND Year > 2014 AND Diverted BETWEEN 0 AND 1 GROUP BY CarrierDelay LIMIT 25"]}
+{"sql":"SELECT CarrierDelay, COUNT(*) FROM mytable WHERE OriginState IN ('GA', 'CA', 'AZ', 'WV', 'ID') AND \"Year\" > 2014 AND Diverted BETWEEN 0 AND 1 GROUP BY CarrierDelay LIMIT 25","hsqls":["SELECT CarrierDelay, COUNT(*) FROM mytable WHERE OriginState IN ('GA', 'CA', 'AZ', 'WV', 'ID') AND `Year` > 2014 AND Diverted BETWEEN 0 AND 1 GROUP BY CarrierDelay LIMIT 25"]}
 {"sql":"SELECT LateAircraftDelay, ArrDelayMinutes, ArrDelay, SUM(ArrDelayMinutes), AVG(LateAircraftDelay), AVG(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 348 AND 93 AND UniqueCarrier IN ('HA') GROUP BY LateAircraftDelay, ArrDelayMinutes, ArrDelay  ORDER BY LateAircraftDelay, ArrDelayMinutes, ArrDelay LIMIT 17","hsqls":["SELECT LateAircraftDelay, ArrDelayMinutes, ArrDelay, SUM(ArrDelayMinutes), AVG(LateAircraftDelay), AVG(DepTime) FROM mytable WHERE ActualElapsedTime BETWEEN 348 AND 93 AND UniqueCarrier IN ('HA') GROUP BY LateAircraftDelay, ArrDelayMinutes, ArrDelay  ORDER BY LateAircraftDelay, ArrDelayMinutes, ArrDelay LIMIT 17"]}
-{"sql":"SELECT TaxiOut, ActualElapsedTime, Dest, SUM(ArrDelayMinutes), MIN(ArrDelay), AVG(LateAircraftDelay) FROM mytable WHERE DivTotalGTimes = 13 AND DivAirportSeqIDs <= 1385103 AND DestWac <> 14 GROUP BY TaxiOut, ActualElapsedTime, Dest LIMIT 14","hsqls":["SELECT TaxiOut, ActualElapsedTime, Dest, SUM(ArrDelayMinutes), MIN(ArrDelay), AVG(LateAircraftDelay) FROM mytable WHERE (DivTotalGTimes__MV0 = 13 OR DivTotalGTimes__MV1 = 13 OR DivTotalGTimes__MV2 = 13 OR DivTotalGTimes__MV3 = 13 OR DivTotalGTimes__MV4 = 13) AND (DivAirportSeqIDs__MV0 <= 1385103 OR DivAirportSeqIDs__MV1 <= 1385103 OR DivAirportSeqIDs__MV2 <= 1385103 OR DivAirportSeqIDs__MV3 <= 1385103 OR DivAirportSeqIDs__MV4 <= 1385103) AND DestWac <> 14 GROUP BY TaxiOut, ActualElapsedTime, Dest LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, ActualElapsedTime, Dest, SUM(ArrDelayMinutes), MIN(ArrDelay), AVG(LateAircraftDelay) FROM mytable WHERE DivTotalGTimes = 13 AND DivAirportSeqIDs <= 1385103 AND DestWac <> 14 GROUP BY TaxiOut, ActualElapsedTime, Dest LIMIT 14","hsqls":["SELECT TaxiOut, ActualElapsedTime, Dest, SUM(ArrDelayMinutes), MIN(ArrDelay), AVG(LateAircraftDelay) FROM mytable WHERE (DivTotalGTimes[1] = 13 OR DivTotalGTimes[2] = 13 OR DivTotalGTimes[3] = 13 OR DivTotalGTimes[4] = 13 OR DivTotalGTimes[5] = 13) AND (DivAirportSeqIDs[1] <= 1385103 OR DivAirportSeqIDs[2] <= 1385103 OR DivAirportSeqIDs[3] <= 1385103 OR DivAirportSeqIDs[4] <= 1385103 OR DivAirportSeqIDs[5] <= 1385103) AND DestWac <> 14 GROUP BY TaxiOut, ActualElapsedTime, Dest LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, CRSElapsedTime, DayOfWeek, COUNT(Carrier), SUM(DayOfWeek), SUM(DestStateFips) FROM mytable WHERE ArrTime BETWEEN 2201 AND 1059 GROUP BY ArrDel15, CRSElapsedTime, DayOfWeek  ORDER BY ArrDel15, CRSElapsedTime, DayOfWeek LIMIT 28","hsqls":["SELECT ArrDel15, CRSElapsedTime, DayOfWeek, COUNT(Carrier), SUM(DayOfWeek), SUM(DestStateFips) FROM mytable WHERE ArrTime BETWEEN 2201 AND 1059 GROUP BY ArrDel15, CRSElapsedTime, DayOfWeek  ORDER BY ArrDel15, CRSElapsedTime, DayOfWeek LIMIT 28"]}
-{"sql":"SELECT DestState, CarrierDelay, DivAirportLandings FROM mytable WHERE DivWheelsOns IN (1453, 1115) OR DaysSinceEpoch BETWEEN 16085 AND 16096 ORDER BY TailNum LIMIT 10","hsqls":["SELECT DestState, CarrierDelay, DivAirportLandings FROM mytable WHERE (DivWheelsOns__MV0 IN (1453, 1115) OR DivWheelsOns__MV1 IN (1453, 1115) OR DivWheelsOns__MV2 IN (1453, 1115) OR DivWheelsOns__MV3 IN (1453, 1115) OR DivWheelsOns__MV4 IN (1453, 1115)) OR DaysSinceEpoch BETWEEN 16085 AND 16096 ORDER BY TailNum LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, DivDistance, CRSElapsedTime, COUNT(ArrDelayMinutes) FROM mytable WHERE DivTotalGTimes IN (13, 61) AND Cancelled IN (1, 0) AND OriginWac > 3 GROUP BY DistanceGroup, DivDistance, CRSElapsedTime LIMIT 11","hsqls":["SELECT DistanceGroup, DivDistance, CRSElapsedTime, COUNT(ArrDelayMinutes) FROM mytable WHERE (DivTotalGTimes__MV0 IN (13, 61) OR DivTotalGTimes__MV1 IN (13, 61) OR DivTotalGTimes__MV2 IN (13, 61) OR DivTotalGTimes__MV3 IN (13, 61) OR DivTotalGTimes__MV4 IN (13, 61)) AND Cancelled IN (1, 0) AND OriginWac > 3 GROUP BY DistanceGroup, DivDistance, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginState, DepDel15, \"Month\" FROM mytable LIMIT 24","hsqls":["SELECT OriginState, DepDel15, Month FROM mytable LIMIT 24"]}
+{"sql":"SELECT DestState, CarrierDelay, DivAirportLandings FROM mytable WHERE DivWheelsOns IN (1453, 1115) OR DaysSinceEpoch BETWEEN 16085 AND 16096 ORDER BY TailNum LIMIT 10","hsqls":["SELECT DestState, CarrierDelay, DivAirportLandings FROM mytable WHERE (DivWheelsOns[1] IN (1453, 1115) OR DivWheelsOns[2] IN (1453, 1115) OR DivWheelsOns[3] IN (1453, 1115) OR DivWheelsOns[4] IN (1453, 1115) OR DivWheelsOns[5] IN (1453, 1115)) OR DaysSinceEpoch BETWEEN 16085 AND 16096 ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivDistance, CRSElapsedTime, COUNT(ArrDelayMinutes) FROM mytable WHERE DivTotalGTimes IN (13, 61) AND Cancelled IN (1, 0) AND OriginWac > 3 GROUP BY DistanceGroup, DivDistance, CRSElapsedTime LIMIT 11","hsqls":["SELECT DistanceGroup, DivDistance, CRSElapsedTime, COUNT(ArrDelayMinutes) FROM mytable WHERE (DivTotalGTimes[1] IN (13, 61) OR DivTotalGTimes[2] IN (13, 61) OR DivTotalGTimes[3] IN (13, 61) OR DivTotalGTimes[4] IN (13, 61) OR DivTotalGTimes[5] IN (13, 61)) AND Cancelled IN (1, 0) AND OriginWac > 3 GROUP BY DistanceGroup, DivDistance, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginState, DepDel15, \"Month\" FROM mytable LIMIT 24","hsqls":["SELECT OriginState, DepDel15, `Month` FROM mytable LIMIT 24"]}
 {"sql":"SELECT Flights, ArrDelay, MAX(WheelsOff) FROM mytable WHERE OriginAirportSeqID <= 1336703 AND DepDelayMinutes NOT IN (253.0, 65.0, 108.0, 188.0, 120.0) GROUP BY Flights, ArrDelay  ORDER BY Flights, ArrDelay LIMIT 28","hsqls":["SELECT Flights, ArrDelay, MAX(WheelsOff) FROM mytable WHERE OriginAirportSeqID <= 1336703 AND DepDelayMinutes NOT IN (253.0, 65.0, 108.0, 188.0, 120.0) GROUP BY Flights, ArrDelay  ORDER BY Flights, ArrDelay LIMIT 28"]}
 {"sql":"SELECT DepartureDelayGroups, Carrier, TotalAddGTime, COUNT(OriginWac) FROM mytable GROUP BY DepartureDelayGroups, Carrier, TotalAddGTime  ORDER BY DepartureDelayGroups, Carrier, TotalAddGTime LIMIT 12","hsqls":["SELECT DepartureDelayGroups, Carrier, TotalAddGTime, COUNT(OriginWac) FROM mytable GROUP BY DepartureDelayGroups, Carrier, TotalAddGTime  ORDER BY DepartureDelayGroups, Carrier, TotalAddGTime LIMIT 12"]}
 {"sql":"SELECT DivReachedDest, FirstDepTime FROM mytable WHERE DepartureDelayGroups NOT IN (-1, -9999) LIMIT 8"}
 {"sql":"SELECT SUM(FirstDepTime), SUM(DepTime), MIN(DepDelay) FROM mytable LIMIT 13"}
-{"sql":"SELECT MAX(DayOfWeek) FROM mytable WHERE AirTime BETWEEN 349 AND 225 OR DivWheelsOffs IN (1756, 2130, 1453) OR OriginStateFips BETWEEN 34 AND 16 LIMIT 10","hsqls":["SELECT MAX(DayOfWeek) FROM mytable WHERE AirTime BETWEEN 349 AND 225 OR (DivWheelsOffs__MV0 IN (1756, 2130, 1453) OR DivWheelsOffs__MV1 IN (1756, 2130, 1453) OR DivWheelsOffs__MV2 IN (1756, 2130, 1453) OR DivWheelsOffs__MV3 IN (1756, 2130, 1453) OR DivWheelsOffs__MV4 IN (1756, 2130, 1453)) OR OriginStateFips BETWEEN 34 AND 16 LIMIT 10000"]}
-{"sql":"SELECT DestStateName, AirlineID FROM mytable WHERE LateAircraftDelay <> 118 OR DivWheelsOffs <= 1712 OR DestAirportID NOT IN (14711, 10792, 13495, 11433) ORDER BY OriginStateFips, Quarter, ArrDelay LIMIT 28","hsqls":["SELECT DestStateName, AirlineID FROM mytable WHERE LateAircraftDelay <> 118 OR (DivWheelsOffs__MV0 <= 1712 OR DivWheelsOffs__MV1 <= 1712 OR DivWheelsOffs__MV2 <= 1712 OR DivWheelsOffs__MV3 <= 1712 OR DivWheelsOffs__MV4 <= 1712) OR DestAirportID NOT IN (14711, 10792, 13495, 11433) ORDER BY OriginStateFips, Quarter, ArrDelay LIMIT 10000"]}
-{"sql":"SELECT LongestAddGTime, SUM(DepDelayMinutes) FROM mytable WHERE DivWheelsOns IN (1437, 813, 58, 2357, 140) GROUP BY LongestAddGTime LIMIT 19","hsqls":["SELECT LongestAddGTime, SUM(DepDelayMinutes) FROM mytable WHERE (DivWheelsOns__MV0 IN (1437, 813, 58, 2357, 140) OR DivWheelsOns__MV1 IN (1437, 813, 58, 2357, 140) OR DivWheelsOns__MV2 IN (1437, 813, 58, 2357, 140) OR DivWheelsOns__MV3 IN (1437, 813, 58, 2357, 140) OR DivWheelsOns__MV4 IN (1437, 813, 58, 2357, 140)) GROUP BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT MAX(DayOfWeek) FROM mytable WHERE AirTime BETWEEN 349 AND 225 OR DivWheelsOffs IN (1756, 2130, 1453) OR OriginStateFips BETWEEN 34 AND 16 LIMIT 10","hsqls":["SELECT MAX(DayOfWeek) FROM mytable WHERE AirTime BETWEEN 349 AND 225 OR (DivWheelsOffs[1] IN (1756, 2130, 1453) OR DivWheelsOffs[2] IN (1756, 2130, 1453) OR DivWheelsOffs[3] IN (1756, 2130, 1453) OR DivWheelsOffs[4] IN (1756, 2130, 1453) OR DivWheelsOffs[5] IN (1756, 2130, 1453)) OR OriginStateFips BETWEEN 34 AND 16 LIMIT 10000"]}
+{"sql":"SELECT DestStateName, AirlineID FROM mytable WHERE LateAircraftDelay <> 118 OR DivWheelsOffs <= 1712 OR DestAirportID NOT IN (14711, 10792, 13495, 11433) ORDER BY OriginStateFips, Quarter, ArrDelay LIMIT 28","hsqls":["SELECT DestStateName, AirlineID FROM mytable WHERE LateAircraftDelay <> 118 OR (DivWheelsOffs[1] <= 1712 OR DivWheelsOffs[2] <= 1712 OR DivWheelsOffs[3] <= 1712 OR DivWheelsOffs[4] <= 1712 OR DivWheelsOffs[5] <= 1712) OR DestAirportID NOT IN (14711, 10792, 13495, 11433) ORDER BY OriginStateFips, Quarter, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, SUM(DepDelayMinutes) FROM mytable WHERE DivWheelsOns IN (1437, 813, 58, 2357, 140) GROUP BY LongestAddGTime LIMIT 19","hsqls":["SELECT LongestAddGTime, SUM(DepDelayMinutes) FROM mytable WHERE (DivWheelsOns[1] IN (1437, 813, 58, 2357, 140) OR DivWheelsOns[2] IN (1437, 813, 58, 2357, 140) OR DivWheelsOns[3] IN (1437, 813, 58, 2357, 140) OR DivWheelsOns[4] IN (1437, 813, 58, 2357, 140) OR DivWheelsOns[5] IN (1437, 813, 58, 2357, 140)) GROUP BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, ArrTime, OriginWac FROM mytable ORDER BY DepDelayMinutes"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes BETWEEN 140.0 AND 224.0 AND DepTimeBlk BETWEEN '0900-0959' AND '1900-1959' OR LongestAddGTime IN (32, 47, 15, 103) LIMIT 6"}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE TaxiIn IN (19, 40, 63) LIMIT 8"}
@@ -8835,45 +8835,45 @@
 {"sql":"SELECT DivDistance, COUNT(Dest) FROM mytable WHERE DivArrDelay BETWEEN 191 AND 441 OR Flights <= 1 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 21","hsqls":["SELECT DivDistance, COUNT(Dest) FROM mytable WHERE DivArrDelay BETWEEN 191 AND 441 OR Flights <= 1 GROUP BY DivDistance  ORDER BY DivDistance LIMIT 21"]}
 {"sql":"SELECT OriginCityName, DestAirportSeqID, DayofMonth FROM mytable WHERE OriginCityName BETWEEN 'Hilo, HI' AND 'Atlanta, GA' ORDER BY WheelsOn, OriginAirportID LIMIT 20"}
 {"sql":"SELECT COUNT(Origin), COUNT(TaxiIn), MIN(AirlineID) FROM mytable WHERE FlightDate IN ('2014-01-24') LIMIT 2"}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DivArrDelay <> 157 AND DestCityMarketID < 30918 OR CRSElapsedTime <= 187 ORDER BY WheelsOff, DepDel15 LIMIT 8","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE DivArrDelay <> 157 AND DestCityMarketID < 30918 OR CRSElapsedTime <= 187 ORDER BY WheelsOff, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DivArrDelay <> 157 AND DestCityMarketID < 30918 OR CRSElapsedTime <= 187 ORDER BY WheelsOff, DepDel15 LIMIT 8","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE DivArrDelay <> 157 AND DestCityMarketID < 30918 OR CRSElapsedTime <= 187 ORDER BY WheelsOff, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT DepDelay, Carrier, ArrDelayMinutes, COUNT(DaysSinceEpoch), AVG(Flights), SUM(ArrTime) FROM mytable WHERE FlightDate NOT IN ('2014-01-13', '2014-01-23', '2014-01-31', '2014-01-15') AND DistanceGroup BETWEEN 2 AND 6 GROUP BY DepDelay, Carrier, ArrDelayMinutes  ORDER BY DepDelay, Carrier, ArrDelayMinutes LIMIT 18","hsqls":["SELECT DepDelay, Carrier, ArrDelayMinutes, COUNT(DaysSinceEpoch), AVG(Flights), SUM(ArrTime) FROM mytable WHERE FlightDate NOT IN ('2014-01-13', '2014-01-23', '2014-01-31', '2014-01-15') AND DistanceGroup BETWEEN 2 AND 6 GROUP BY DepDelay, Carrier, ArrDelayMinutes  ORDER BY DepDelay, Carrier, ArrDelayMinutes LIMIT 18"]}
 {"sql":"SELECT DepartureDelayGroups FROM mytable WHERE DistanceGroup BETWEEN 8 AND 10 AND DestStateFips IN (6, 40, 18, 16) ORDER BY Carrier LIMIT 11"}
 {"sql":"SELECT DepTimeBlk, WheelsOn, DivArrDelay, SUM(DivReachedDest) FROM mytable WHERE DepDelay BETWEEN 219.0 AND 96.0 AND NASDelay NOT IN (17) GROUP BY DepTimeBlk, WheelsOn, DivArrDelay  ORDER BY DepTimeBlk, WheelsOn, DivArrDelay LIMIT 5","hsqls":["SELECT DepTimeBlk, WheelsOn, DivArrDelay, SUM(DivReachedDest) FROM mytable WHERE DepDelay BETWEEN 219.0 AND 96.0 AND NASDelay NOT IN (17) GROUP BY DepTimeBlk, WheelsOn, DivArrDelay  ORDER BY DepTimeBlk, WheelsOn, DivArrDelay LIMIT 5"]}
-{"sql":"SELECT DepDel15, DivWheelsOffs FROM mytable WHERE DayOfWeek IN (3, 2, 7, 6) OR Diverted <> 1 AND DayOfWeek NOT IN (5) ORDER BY DestWac, DestStateName, NASDelay LIMIT 15","hsqls":["SELECT DepDel15, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DayOfWeek IN (3, 2, 7, 6) OR Diverted <> 1 AND DayOfWeek NOT IN (5) ORDER BY DestWac, DestStateName, NASDelay LIMIT 10000"]}
-{"sql":"SELECT FlightDate FROM mytable WHERE DivAirportSeqIDs < 1015804 OR WheelsOn BETWEEN 927 AND 27 ORDER BY OriginStateName LIMIT 2","hsqls":["SELECT FlightDate FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1015804 OR DivAirportSeqIDs__MV1 < 1015804 OR DivAirportSeqIDs__MV2 < 1015804 OR DivAirportSeqIDs__MV3 < 1015804 OR DivAirportSeqIDs__MV4 < 1015804) OR WheelsOn BETWEEN 927 AND 27 ORDER BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT DepDel15, DivWheelsOffs FROM mytable WHERE DayOfWeek IN (3, 2, 7, 6) OR Diverted <> 1 AND DayOfWeek NOT IN (5) ORDER BY DestWac, DestStateName, NASDelay LIMIT 15","hsqls":["SELECT DepDel15, DivWheelsOffs FROM mytable WHERE DayOfWeek IN (3, 2, 7, 6) OR Diverted <> 1 AND DayOfWeek NOT IN (5) ORDER BY DestWac, DestStateName, NASDelay LIMIT 10000"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE DivAirportSeqIDs < 1015804 OR WheelsOn BETWEEN 927 AND 27 ORDER BY OriginStateName LIMIT 2","hsqls":["SELECT FlightDate FROM mytable WHERE (DivAirportSeqIDs[1] < 1015804 OR DivAirportSeqIDs[2] < 1015804 OR DivAirportSeqIDs[3] < 1015804 OR DivAirportSeqIDs[4] < 1015804 OR DivAirportSeqIDs[5] < 1015804) OR WheelsOn BETWEEN 927 AND 27 ORDER BY OriginStateName LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, ArrDelay, DaysSinceEpoch, MIN(ArrTime) FROM mytable WHERE OriginCityMarketID IN (31637, 34543) AND OriginAirportID IN (10732, 11612, 14487, 12264) AND ArrDel15 IN (1, 0) GROUP BY LongestAddGTime, ArrDelay, DaysSinceEpoch  ORDER BY LongestAddGTime, ArrDelay, DaysSinceEpoch LIMIT 6","hsqls":["SELECT LongestAddGTime, ArrDelay, DaysSinceEpoch, MIN(ArrTime) FROM mytable WHERE OriginCityMarketID IN (31637, 34543) AND OriginAirportID IN (10732, 11612, 14487, 12264) AND ArrDel15 IN (1, 0) GROUP BY LongestAddGTime, ArrDelay, DaysSinceEpoch  ORDER BY LongestAddGTime, ArrDelay, DaysSinceEpoch LIMIT 6"]}
 {"sql":"SELECT FlightNum, Dest, AVG(AirlineID) FROM mytable GROUP BY FlightNum, Dest","hsqls":["SELECT FlightNum, Dest, AVG(AirlineID) FROM mytable GROUP BY FlightNum, Dest"]}
 {"sql":"SELECT DistanceGroup, Quarter, DestStateName FROM mytable WHERE Carrier <> 'VX' OR TaxiIn IN (109, 65, 13) AND OriginWac BETWEEN 87 AND 2 ORDER BY Quarter, DaysSinceEpoch LIMIT 28"}
-{"sql":"SELECT ArrDelayMinutes, DivAirportSeqIDs, Dest FROM mytable WHERE DayOfWeek IN (6) AND DivTailNums = 'N363AA' ORDER BY WeatherDelay, LongestAddGTime LIMIT 26","hsqls":["SELECT ArrDelayMinutes, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Dest FROM mytable WHERE DayOfWeek IN (6) AND (DivTailNums__MV0 = 'N363AA' OR DivTailNums__MV1 = 'N363AA' OR DivTailNums__MV2 = 'N363AA' OR DivTailNums__MV3 = 'N363AA' OR DivTailNums__MV4 = 'N363AA') ORDER BY WeatherDelay, LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DivAirportSeqIDs, Dest FROM mytable WHERE DayOfWeek IN (6) AND DivTailNums = 'N363AA' ORDER BY WeatherDelay, LongestAddGTime LIMIT 26","hsqls":["SELECT ArrDelayMinutes, DivAirportSeqIDs, Dest FROM mytable WHERE DayOfWeek IN (6) AND (DivTailNums[1] = 'N363AA' OR DivTailNums[2] = 'N363AA' OR DivTailNums[3] = 'N363AA' OR DivTailNums[4] = 'N363AA' OR DivTailNums[5] = 'N363AA') ORDER BY WeatherDelay, LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, TaxiIn, COUNT(*) FROM mytable WHERE OriginState <> 'WA' OR ArrTime IN (832, 1805, 1338, 1344, 2232) GROUP BY ActualElapsedTime, TaxiIn  ORDER BY ActualElapsedTime, TaxiIn LIMIT 5","hsqls":["SELECT ActualElapsedTime, TaxiIn, COUNT(*) FROM mytable WHERE OriginState <> 'WA' OR ArrTime IN (832, 1805, 1338, 1344, 2232) GROUP BY ActualElapsedTime, TaxiIn  ORDER BY ActualElapsedTime, TaxiIn LIMIT 5"]}
-{"sql":"SELECT DivWheelsOns, Carrier FROM mytable WHERE CarrierDelay BETWEEN 86 AND 70 OR DivWheelsOns < 1905 AND LongestAddGTime NOT IN (111, 13, 27) ORDER BY DestStateFips, DestStateName, TailNum LIMIT 23","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Carrier FROM mytable WHERE CarrierDelay BETWEEN 86 AND 70 OR (DivWheelsOns__MV0 < 1905 OR DivWheelsOns__MV1 < 1905 OR DivWheelsOns__MV2 < 1905 OR DivWheelsOns__MV3 < 1905 OR DivWheelsOns__MV4 < 1905) AND LongestAddGTime NOT IN (111, 13, 27) ORDER BY DestStateFips, DestStateName, TailNum LIMIT 10000"]}
-{"sql":"SELECT DivReachedDest, WeatherDelay FROM mytable WHERE ArrDelay <> 227.0 OR WheelsOn NOT IN (1227, 2203) AND DivLongestGTimes IN (25.0) ORDER BY LateAircraftDelay, CRSElapsedTime LIMIT 17","hsqls":["SELECT DivReachedDest, WeatherDelay FROM mytable WHERE ArrDelay <> 227.0 OR WheelsOn NOT IN (1227, 2203) AND (DivLongestGTimes__MV0 IN (25.0) OR DivLongestGTimes__MV1 IN (25.0) OR DivLongestGTimes__MV2 IN (25.0) OR DivLongestGTimes__MV3 IN (25.0) OR DivLongestGTimes__MV4 IN (25.0)) ORDER BY LateAircraftDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Carrier FROM mytable WHERE CarrierDelay BETWEEN 86 AND 70 OR DivWheelsOns < 1905 AND LongestAddGTime NOT IN (111, 13, 27) ORDER BY DestStateFips, DestStateName, TailNum LIMIT 23","hsqls":["SELECT DivWheelsOns, Carrier FROM mytable WHERE CarrierDelay BETWEEN 86 AND 70 OR (DivWheelsOns[1] < 1905 OR DivWheelsOns[2] < 1905 OR DivWheelsOns[3] < 1905 OR DivWheelsOns[4] < 1905 OR DivWheelsOns[5] < 1905) AND LongestAddGTime NOT IN (111, 13, 27) ORDER BY DestStateFips, DestStateName, TailNum LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, WeatherDelay FROM mytable WHERE ArrDelay <> 227.0 OR WheelsOn NOT IN (1227, 2203) AND DivLongestGTimes IN (25.0) ORDER BY LateAircraftDelay, CRSElapsedTime LIMIT 17","hsqls":["SELECT DivReachedDest, WeatherDelay FROM mytable WHERE ArrDelay <> 227.0 OR WheelsOn NOT IN (1227, 2203) AND (DivLongestGTimes[1] IN (25.0) OR DivLongestGTimes[2] IN (25.0) OR DivLongestGTimes[3] IN (25.0) OR DivLongestGTimes[4] IN (25.0) OR DivLongestGTimes[5] IN (25.0)) ORDER BY LateAircraftDelay, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, CancellationCode, OriginStateName FROM mytable WHERE DepDelay IN (287.0, 46.0, 121.0, 156.0) ORDER BY DepTimeBlk, DestAirportID, OriginStateName LIMIT 26"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrDelayMinutes NOT IN (108.0) OR Distance BETWEEN 786 AND 4502 AND DivArrDelay NOT IN (79, 144, 276, 681, 880) ORDER BY ArrDelayMinutes, DestAirportSeqID, CancellationCode LIMIT 29","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrDelayMinutes NOT IN (108.0) OR Distance BETWEEN 786 AND 4502 AND DivArrDelay NOT IN (79, 144, 276, 681, 880) ORDER BY ArrDelayMinutes, DestAirportSeqID, CancellationCode LIMIT 10000"]}
-{"sql":"SELECT COUNT(WheelsOn) FROM mytable WHERE \"Month\" <> 1 LIMIT 24","hsqls":["SELECT COUNT(WheelsOn) FROM mytable WHERE Month <> 1 LIMIT 24"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE ArrDelayMinutes NOT IN (108.0) OR Distance BETWEEN 786 AND 4502 AND DivArrDelay NOT IN (79, 144, 276, 681, 880) ORDER BY ArrDelayMinutes, DestAirportSeqID, CancellationCode LIMIT 29","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE ArrDelayMinutes NOT IN (108.0) OR Distance BETWEEN 786 AND 4502 AND DivArrDelay NOT IN (79, 144, 276, 681, 880) ORDER BY ArrDelayMinutes, DestAirportSeqID, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT COUNT(WheelsOn) FROM mytable WHERE \"Month\" <> 1 LIMIT 24","hsqls":["SELECT COUNT(WheelsOn) FROM mytable WHERE `Month` <> 1 LIMIT 24"]}
 {"sql":"SELECT OriginStateFips, MIN(Quarter) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18","hsqls":["SELECT OriginStateFips, MIN(Quarter) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 18"]}
-{"sql":"SELECT WheelsOn, MIN(\"Year\"), MAX(ArrDelayMinutes), SUM(DestCityMarketID) FROM mytable WHERE TaxiIn NOT IN (21, 57, 65, 80, 39) AND DepTime NOT IN (1040, 1405, 1659, 846, 1516) GROUP BY WheelsOn LIMIT 24","hsqls":["SELECT WheelsOn, MIN(Year), MAX(ArrDelayMinutes), SUM(DestCityMarketID) FROM mytable WHERE TaxiIn NOT IN (21, 57, 65, 80, 39) AND DepTime NOT IN (1040, 1405, 1659, 846, 1516) GROUP BY WheelsOn LIMIT 24"]}
-{"sql":"SELECT DepDelayMinutes, DivTailNums, DepDel15 FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY TaxiOut LIMIT 13","hsqls":["SELECT DepDelayMinutes, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DepDel15 FROM mytable WHERE Year BETWEEN 2014 AND 2014 ORDER BY TaxiOut LIMIT 10000"]}
+{"sql":"SELECT WheelsOn, MIN(\"Year\"), MAX(ArrDelayMinutes), SUM(DestCityMarketID) FROM mytable WHERE TaxiIn NOT IN (21, 57, 65, 80, 39) AND DepTime NOT IN (1040, 1405, 1659, 846, 1516) GROUP BY WheelsOn LIMIT 24","hsqls":["SELECT WheelsOn, MIN(`Year`), MAX(ArrDelayMinutes), SUM(DestCityMarketID) FROM mytable WHERE TaxiIn NOT IN (21, 57, 65, 80, 39) AND DepTime NOT IN (1040, 1405, 1659, 846, 1516) GROUP BY WheelsOn LIMIT 24"]}
+{"sql":"SELECT DepDelayMinutes, DivTailNums, DepDel15 FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 ORDER BY TaxiOut LIMIT 13","hsqls":["SELECT DepDelayMinutes, DivTailNums, DepDel15 FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 ORDER BY TaxiOut LIMIT 10000"]}
 {"sql":"SELECT DepTime, ArrDel15 FROM mytable ORDER BY DayOfWeek LIMIT 28"}
-{"sql":"SELECT FlightDate, \"Month\" FROM mytable ORDER BY LongestAddGTime, ArrDelayMinutes LIMIT 8","hsqls":["SELECT FlightDate, Month FROM mytable ORDER BY LongestAddGTime, ArrDelayMinutes LIMIT 8"]}
+{"sql":"SELECT FlightDate, \"Month\" FROM mytable ORDER BY LongestAddGTime, ArrDelayMinutes LIMIT 8","hsqls":["SELECT FlightDate, `Month` FROM mytable ORDER BY LongestAddGTime, ArrDelayMinutes LIMIT 8"]}
 {"sql":"SELECT FlightDate FROM mytable WHERE TaxiIn IN (96, 24, 196) AND WeatherDelay NOT IN (47, 22, -9999) AND DestStateFips IN (21, 5, 19, 53) ORDER BY OriginAirportSeqID, OriginStateFips, ArrTimeBlk LIMIT 24"}
 {"sql":"SELECT OriginState, DepDelay, ArrTime FROM mytable WHERE OriginAirportSeqID IN (1448902, 1298202) OR DivReachedDest <> -9999 OR DepDelayMinutes IN (78.0, 211.0, 17.0) LIMIT 2"}
 {"sql":"SELECT DivReachedDest, LateAircraftDelay, COUNT(*) FROM mytable WHERE TaxiIn <= 98 GROUP BY DivReachedDest, LateAircraftDelay  ORDER BY DivReachedDest, LateAircraftDelay LIMIT 24","hsqls":["SELECT DivReachedDest, LateAircraftDelay, COUNT(*) FROM mytable WHERE TaxiIn <= 98 GROUP BY DivReachedDest, LateAircraftDelay  ORDER BY DivReachedDest, LateAircraftDelay LIMIT 24"]}
 {"sql":"SELECT DepDelayMinutes, ArrDelayMinutes FROM mytable ORDER BY DivAirportLandings LIMIT 23"}
 {"sql":"SELECT CarrierDelay, FlightDate, NASDelay FROM mytable ORDER BY OriginWac LIMIT 2"}
-{"sql":"SELECT OriginWac FROM mytable WHERE FirstDepTime BETWEEN 1309 AND 1856 AND DestAirportID BETWEEN 12191 AND 10208 AND DivLongestGTimes BETWEEN 6.0 AND 64.0 LIMIT 29","hsqls":["SELECT OriginWac FROM mytable WHERE FirstDepTime BETWEEN 1309 AND 1856 AND DestAirportID BETWEEN 12191 AND 10208 AND (DivLongestGTimes__MV0 BETWEEN 6.0 AND 64.0 OR DivLongestGTimes__MV1 BETWEEN 6.0 AND 64.0 OR DivLongestGTimes__MV2 BETWEEN 6.0 AND 64.0 OR DivLongestGTimes__MV3 BETWEEN 6.0 AND 64.0 OR DivLongestGTimes__MV4 BETWEEN 6.0 AND 64.0) LIMIT 10000"]}
+{"sql":"SELECT OriginWac FROM mytable WHERE FirstDepTime BETWEEN 1309 AND 1856 AND DestAirportID BETWEEN 12191 AND 10208 AND DivLongestGTimes BETWEEN 6.0 AND 64.0 LIMIT 29","hsqls":["SELECT OriginWac FROM mytable WHERE FirstDepTime BETWEEN 1309 AND 1856 AND DestAirportID BETWEEN 12191 AND 10208 AND (DivLongestGTimes[1] BETWEEN 6.0 AND 64.0 OR DivLongestGTimes[2] BETWEEN 6.0 AND 64.0 OR DivLongestGTimes[3] BETWEEN 6.0 AND 64.0 OR DivLongestGTimes[4] BETWEEN 6.0 AND 64.0 OR DivLongestGTimes[5] BETWEEN 6.0 AND 64.0) LIMIT 10000"]}
 {"sql":"SELECT TaxiIn, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 551 AND 264 AND LateAircraftDelay BETWEEN 38 AND 12 GROUP BY TaxiIn, ArrivalDelayGroups  ORDER BY TaxiIn, ArrivalDelayGroups LIMIT 14","hsqls":["SELECT TaxiIn, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 551 AND 264 AND LateAircraftDelay BETWEEN 38 AND 12 GROUP BY TaxiIn, ArrivalDelayGroups  ORDER BY TaxiIn, ArrivalDelayGroups LIMIT 14"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE WheelsOn BETWEEN 1709 AND 1401 OR Origin BETWEEN 'CLL' AND 'CEC' LIMIT 9"}
-{"sql":"SELECT AVG(TotalAddGTime), AVG(CarrierDelay), MAX(OriginCityMarketID) FROM mytable WHERE DivTotalGTimes IN (68, 112, 18, 80, 26) LIMIT 9","hsqls":["SELECT AVG(TotalAddGTime), AVG(CarrierDelay), MAX(OriginCityMarketID)  FROM mytable WHERE (DivTotalGTimes__MV0 IN (68, 112, 18, 80, 26) OR DivTotalGTimes__MV1 IN (68, 112, 18, 80, 26) OR DivTotalGTimes__MV2 IN (68, 112, 18, 80, 26) OR DivTotalGTimes__MV3 IN (68, 112, 18, 80, 26) OR DivTotalGTimes__MV4 IN (68, 112, 18, 80, 26)) LIMIT 10000"]}
-{"sql":"SELECT DestCityName, DayofMonth, COUNT(OriginAirportSeqID) FROM mytable WHERE DivAirportSeqIDs IN (1327702, 1448702) OR OriginState = 'DE' OR DaysSinceEpoch BETWEEN 16072 AND 16075 GROUP BY DestCityName, DayofMonth LIMIT 8","hsqls":["SELECT DestCityName, DayofMonth, COUNT(OriginAirportSeqID) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1327702, 1448702) OR DivAirportSeqIDs__MV1 IN (1327702, 1448702) OR DivAirportSeqIDs__MV2 IN (1327702, 1448702) OR DivAirportSeqIDs__MV3 IN (1327702, 1448702) OR DivAirportSeqIDs__MV4 IN (1327702, 1448702)) OR OriginState = 'DE' OR DaysSinceEpoch BETWEEN 16072 AND 16075 GROUP BY DestCityName, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT AVG(TotalAddGTime), AVG(CarrierDelay), MAX(OriginCityMarketID) FROM mytable WHERE DivTotalGTimes IN (68, 112, 18, 80, 26) LIMIT 9","hsqls":["SELECT AVG(TotalAddGTime), AVG(CarrierDelay), MAX(OriginCityMarketID)  FROM mytable WHERE (DivTotalGTimes[1] IN (68, 112, 18, 80, 26) OR DivTotalGTimes[2] IN (68, 112, 18, 80, 26) OR DivTotalGTimes[3] IN (68, 112, 18, 80, 26) OR DivTotalGTimes[4] IN (68, 112, 18, 80, 26) OR DivTotalGTimes[5] IN (68, 112, 18, 80, 26)) LIMIT 10000"]}
+{"sql":"SELECT DestCityName, DayofMonth, COUNT(OriginAirportSeqID) FROM mytable WHERE DivAirportSeqIDs IN (1327702, 1448702) OR OriginState = 'DE' OR DaysSinceEpoch BETWEEN 16072 AND 16075 GROUP BY DestCityName, DayofMonth LIMIT 8","hsqls":["SELECT DestCityName, DayofMonth, COUNT(OriginAirportSeqID) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1327702, 1448702) OR DivAirportSeqIDs[2] IN (1327702, 1448702) OR DivAirportSeqIDs[3] IN (1327702, 1448702) OR DivAirportSeqIDs[4] IN (1327702, 1448702) OR DivAirportSeqIDs[5] IN (1327702, 1448702)) OR OriginState = 'DE' OR DaysSinceEpoch BETWEEN 16072 AND 16075 GROUP BY DestCityName, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, NASDelay, AVG(Quarter), SUM(OriginStateFips) FROM mytable GROUP BY FirstDepTime, NASDelay  ORDER BY FirstDepTime, NASDelay LIMIT 11","hsqls":["SELECT FirstDepTime, NASDelay, AVG(Quarter), SUM(OriginStateFips) FROM mytable GROUP BY FirstDepTime, NASDelay  ORDER BY FirstDepTime, NASDelay LIMIT 11"]}
 {"sql":"SELECT DestWac, OriginWac, DaysSinceEpoch, MIN(SecurityDelay), MAX(TotalAddGTime), AVG(OriginAirportSeqID) FROM mytable GROUP BY DestWac, OriginWac, DaysSinceEpoch  ORDER BY DestWac, OriginWac, DaysSinceEpoch LIMIT 18","hsqls":["SELECT DestWac, OriginWac, DaysSinceEpoch, MIN(SecurityDelay), MAX(TotalAddGTime), AVG(OriginAirportSeqID) FROM mytable GROUP BY DestWac, OriginWac, DaysSinceEpoch  ORDER BY DestWac, OriginWac, DaysSinceEpoch LIMIT 18"]}
-{"sql":"SELECT DestState, MAX(DepDelayMinutes) FROM mytable WHERE ArrDelay > 42.0 AND DivAirportIDs IN (14262, 12896, 14771, 10693, 15070) OR OriginAirportSeqID BETWEEN 1562401 AND 1327702 GROUP BY DestState LIMIT 6","hsqls":["SELECT DestState, MAX(DepDelayMinutes) FROM mytable WHERE ArrDelay > 42.0 AND (DivAirportIDs__MV0 IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs__MV1 IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs__MV2 IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs__MV3 IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs__MV4 IN (14262, 12896, 14771, 10693, 15070)) OR OriginAirportSeqID BETWEEN 1562401 AND 1327702 GROUP BY DestState LIMIT 10000"]}
-{"sql":"SELECT FlightNum, DivAirportSeqIDs FROM mytable WHERE OriginState BETWEEN 'OH' AND 'ME' OR CRSArrTime IN (1420, 2248) ORDER BY AirlineID, UniqueCarrier LIMIT 22","hsqls":["SELECT FlightNum, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE OriginState BETWEEN 'OH' AND 'ME' OR CRSArrTime IN (1420, 2248) ORDER BY AirlineID, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT ArrTime, Dest, ArrivalDelayGroups, AVG(\"Year\") FROM mytable GROUP BY ArrTime, Dest, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT ArrTime, Dest, ArrivalDelayGroups, AVG(Year) FROM mytable GROUP BY ArrTime, Dest, ArrivalDelayGroups LIMIT 7"]}
+{"sql":"SELECT DestState, MAX(DepDelayMinutes) FROM mytable WHERE ArrDelay > 42.0 AND DivAirportIDs IN (14262, 12896, 14771, 10693, 15070) OR OriginAirportSeqID BETWEEN 1562401 AND 1327702 GROUP BY DestState LIMIT 6","hsqls":["SELECT DestState, MAX(DepDelayMinutes) FROM mytable WHERE ArrDelay > 42.0 AND (DivAirportIDs[1] IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs[2] IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs[3] IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs[4] IN (14262, 12896, 14771, 10693, 15070) OR DivAirportIDs[5] IN (14262, 12896, 14771, 10693, 15070)) OR OriginAirportSeqID BETWEEN 1562401 AND 1327702 GROUP BY DestState LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivAirportSeqIDs FROM mytable WHERE OriginState BETWEEN 'OH' AND 'ME' OR CRSArrTime IN (1420, 2248) ORDER BY AirlineID, UniqueCarrier LIMIT 22","hsqls":["SELECT FlightNum, DivAirportSeqIDs FROM mytable WHERE OriginState BETWEEN 'OH' AND 'ME' OR CRSArrTime IN (1420, 2248) ORDER BY AirlineID, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT ArrTime, Dest, ArrivalDelayGroups, AVG(\"Year\") FROM mytable GROUP BY ArrTime, Dest, ArrivalDelayGroups LIMIT 7","hsqls":["SELECT ArrTime, Dest, ArrivalDelayGroups, AVG(`Year`) FROM mytable GROUP BY ArrTime, Dest, ArrivalDelayGroups LIMIT 7"]}
 {"sql":"SELECT DivDistance, CRSDepTime, DivActualElapsedTime FROM mytable WHERE Origin BETWEEN 'GRR' AND 'BUF' ORDER BY DistanceGroup LIMIT 7"}
 {"sql":"SELECT DepDelay, WeatherDelay, TotalAddGTime, AVG(TotalAddGTime), COUNT(TaxiOut), SUM(TaxiOut) FROM mytable WHERE DepDel15 BETWEEN -9999 AND -9999 GROUP BY DepDelay, WeatherDelay, TotalAddGTime  ORDER BY DepDelay, WeatherDelay, TotalAddGTime LIMIT 6","hsqls":["SELECT DepDelay, WeatherDelay, TotalAddGTime, AVG(TotalAddGTime), COUNT(TaxiOut), SUM(TaxiOut) FROM mytable WHERE DepDel15 BETWEEN -9999 AND -9999 GROUP BY DepDelay, WeatherDelay, TotalAddGTime  ORDER BY DepDelay, WeatherDelay, TotalAddGTime LIMIT 6"]}
-{"sql":"SELECT DistanceGroup, DivWheelsOns, DestCityMarketID FROM mytable WHERE CRSArrTime BETWEEN 2201 AND 1308 AND Flights BETWEEN 1 AND 1 ORDER BY Diverted, Distance LIMIT 10","hsqls":["SELECT DistanceGroup, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestCityMarketID FROM mytable WHERE CRSArrTime BETWEEN 2201 AND 1308 AND Flights BETWEEN 1 AND 1 ORDER BY Diverted, Distance LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DivWheelsOns, DestCityMarketID FROM mytable WHERE CRSArrTime BETWEEN 2201 AND 1308 AND Flights BETWEEN 1 AND 1 ORDER BY Diverted, Distance LIMIT 10","hsqls":["SELECT DistanceGroup, DivWheelsOns, DestCityMarketID FROM mytable WHERE CRSArrTime BETWEEN 2201 AND 1308 AND Flights BETWEEN 1 AND 1 ORDER BY Diverted, Distance LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, SecurityDelay FROM mytable WHERE OriginAirportID BETWEEN 13795 AND 13931 AND DestWac BETWEEN 67 AND 16 OR SecurityDelay BETWEEN 1 AND -9999 LIMIT 11"}
 {"sql":"SELECT OriginAirportSeqID, SUM(DivAirportLandings), SUM(AirlineID) FROM mytable WHERE Origin <> 'FLL' OR OriginAirportSeqID BETWEEN 1017001 AND 1323002 GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 3","hsqls":["SELECT OriginAirportSeqID, SUM(DivAirportLandings), SUM(AirlineID) FROM mytable WHERE Origin <> 'FLL' OR OriginAirportSeqID BETWEEN 1017001 AND 1323002 GROUP BY OriginAirportSeqID  ORDER BY OriginAirportSeqID LIMIT 3"]}
 {"sql":"SELECT MAX(DestStateFips), COUNT(OriginAirportID), MIN(CarrierDelay) FROM mytable WHERE WeatherDelay BETWEEN 2 AND 71 AND CRSArrTime IN (1549, 145, 1009, 2128) LIMIT 28"}
@@ -8882,44 +8882,44 @@
 {"sql":"SELECT LateAircraftDelay, OriginWac, AVG(WeatherDelay), AVG(CRSDepTime), MAX(CRSDepTime) FROM mytable GROUP BY LateAircraftDelay, OriginWac  ORDER BY LateAircraftDelay, OriginWac LIMIT 3","hsqls":["SELECT LateAircraftDelay, OriginWac, AVG(WeatherDelay), AVG(CRSDepTime), MAX(CRSDepTime) FROM mytable GROUP BY LateAircraftDelay, OriginWac  ORDER BY LateAircraftDelay, OriginWac LIMIT 3"]}
 {"sql":"SELECT DaysSinceEpoch, OriginStateName FROM mytable WHERE OriginCityName <> 'Helena, MT' ORDER BY FirstDepTime, ArrTimeBlk, AirTime LIMIT 29"}
 {"sql":"SELECT DestWac, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 1809 AND 2110 AND DepDelayMinutes BETWEEN 390.0 AND 287.0 GROUP BY DestWac  ORDER BY DestWac LIMIT 10","hsqls":["SELECT DestWac, COUNT(*) FROM mytable WHERE CRSDepTime BETWEEN 1809 AND 2110 AND DepDelayMinutes BETWEEN 390.0 AND 287.0 GROUP BY DestWac  ORDER BY DestWac LIMIT 10"]}
-{"sql":"SELECT SUM(WheelsOn), SUM(DepDelayMinutes), MAX(CRSElapsedTime) FROM mytable WHERE TailNum <= 'N792SW' OR LateAircraftDelay = 33 OR DivWheelsOns IN (1301, 1517) LIMIT 19","hsqls":["SELECT SUM(WheelsOn), SUM(DepDelayMinutes), MAX(CRSElapsedTime) FROM mytable WHERE TailNum <= 'N792SW' OR LateAircraftDelay = 33 OR (DivWheelsOns__MV0 IN (1301, 1517) OR DivWheelsOns__MV1 IN (1301, 1517) OR DivWheelsOns__MV2 IN (1301, 1517) OR DivWheelsOns__MV3 IN (1301, 1517) OR DivWheelsOns__MV4 IN (1301, 1517)) LIMIT 10000"]}
+{"sql":"SELECT SUM(WheelsOn), SUM(DepDelayMinutes), MAX(CRSElapsedTime) FROM mytable WHERE TailNum <= 'N792SW' OR LateAircraftDelay = 33 OR DivWheelsOns IN (1301, 1517) LIMIT 19","hsqls":["SELECT SUM(WheelsOn), SUM(DepDelayMinutes), MAX(CRSElapsedTime) FROM mytable WHERE TailNum <= 'N792SW' OR LateAircraftDelay = 33 OR (DivWheelsOns[1] IN (1301, 1517) OR DivWheelsOns[2] IN (1301, 1517) OR DivWheelsOns[3] IN (1301, 1517) OR DivWheelsOns[4] IN (1301, 1517) OR DivWheelsOns[5] IN (1301, 1517)) LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, DestStateFips, TaxiIn FROM mytable LIMIT 13"}
 {"sql":"SELECT OriginAirportSeqID, Diverted FROM mytable WHERE DepDel15 IN (0, -9999) OR WeatherDelay BETWEEN 38 AND 68 LIMIT 25"}
 {"sql":"SELECT UniqueCarrier FROM mytable WHERE ArrTimeBlk > '1700-1759' OR DestCityName < 'Orlando, FL' ORDER BY CRSDepTime, WheelsOn LIMIT 4"}
-{"sql":"SELECT \"Month\" FROM mytable ORDER BY SecurityDelay, DestAirportSeqID, CancellationCode LIMIT 26","hsqls":["SELECT Month FROM mytable ORDER BY SecurityDelay, DestAirportSeqID, CancellationCode LIMIT 26"]}
+{"sql":"SELECT \"Month\" FROM mytable ORDER BY SecurityDelay, DestAirportSeqID, CancellationCode LIMIT 26","hsqls":["SELECT `Month` FROM mytable ORDER BY SecurityDelay, DestAirportSeqID, CancellationCode LIMIT 26"]}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY ActualElapsedTime, Origin LIMIT 22"}
 {"sql":"SELECT FirstDepTime, Dest, CRSDepTime, MAX(Cancelled) FROM mytable WHERE DepTimeBlk BETWEEN '1700-1759' AND '0800-0859' AND DestStateName IN ('Puerto Rico', 'Delaware', 'Hawaii') OR DestState < 'NC' GROUP BY FirstDepTime, Dest, CRSDepTime  ORDER BY FirstDepTime, Dest, CRSDepTime LIMIT 14","hsqls":["SELECT FirstDepTime, Dest, CRSDepTime, MAX(Cancelled) FROM mytable WHERE DepTimeBlk BETWEEN '1700-1759' AND '0800-0859' AND DestStateName IN ('Puerto Rico', 'Delaware', 'Hawaii') OR DestState < 'NC' GROUP BY FirstDepTime, Dest, CRSDepTime  ORDER BY FirstDepTime, Dest, CRSDepTime LIMIT 14"]}
-{"sql":"SELECT NASDelay, Origin, COUNT(*) FROM mytable WHERE DivTotalGTimes > 22 GROUP BY NASDelay, Origin LIMIT 21","hsqls":["SELECT NASDelay, Origin, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 > 22 OR DivTotalGTimes__MV1 > 22 OR DivTotalGTimes__MV2 > 22 OR DivTotalGTimes__MV3 > 22 OR DivTotalGTimes__MV4 > 22) GROUP BY NASDelay, Origin LIMIT 10000"]}
+{"sql":"SELECT NASDelay, Origin, COUNT(*) FROM mytable WHERE DivTotalGTimes > 22 GROUP BY NASDelay, Origin LIMIT 21","hsqls":["SELECT NASDelay, Origin, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] > 22 OR DivTotalGTimes[2] > 22 OR DivTotalGTimes[3] > 22 OR DivTotalGTimes[4] > 22 OR DivTotalGTimes[5] > 22) GROUP BY NASDelay, Origin LIMIT 10000"]}
 {"sql":"SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE ArrDelay <> -45.0 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 9","hsqls":["SELECT OriginCityMarketID, COUNT(*) FROM mytable WHERE ArrDelay <> -45.0 GROUP BY OriginCityMarketID  ORDER BY OriginCityMarketID LIMIT 9"]}
 {"sql":"SELECT OriginStateFips, COUNT(DivActualElapsedTime), SUM(DistanceGroup) FROM mytable GROUP BY OriginStateFips","hsqls":["SELECT OriginStateFips, COUNT(DivActualElapsedTime), SUM(DistanceGroup) FROM mytable GROUP BY OriginStateFips"]}
-{"sql":"SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE DistanceGroup BETWEEN 9 AND 4 OR DestWac BETWEEN 91 AND 12 OR DayofMonth BETWEEN 3 AND 12 LIMIT 15","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE DistanceGroup BETWEEN 9 AND 4 OR DestWac BETWEEN 91 AND 12 OR DayofMonth BETWEEN 3 AND 12 LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, Origin, AVG(\"Month\"), SUM(FirstDepTime) FROM mytable WHERE Quarter = 1 AND DivWheelsOns < 1214 AND DivWheelsOffs BETWEEN 1510 AND 1217 GROUP BY OriginCityName, Origin LIMIT 28","hsqls":["SELECT OriginCityName, Origin, AVG(Month), SUM(FirstDepTime) FROM mytable WHERE Quarter = 1 AND (DivWheelsOns__MV0 < 1214 OR DivWheelsOns__MV1 < 1214 OR DivWheelsOns__MV2 < 1214 OR DivWheelsOns__MV3 < 1214 OR DivWheelsOns__MV4 < 1214) AND (DivWheelsOffs__MV0 BETWEEN 1510 AND 1217 OR DivWheelsOffs__MV1 BETWEEN 1510 AND 1217 OR DivWheelsOffs__MV2 BETWEEN 1510 AND 1217 OR DivWheelsOffs__MV3 BETWEEN 1510 AND 1217 OR DivWheelsOffs__MV4 BETWEEN 1510 AND 1217) GROUP BY OriginCityName, Origin LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE DistanceGroup BETWEEN 9 AND 4 OR DestWac BETWEEN 91 AND 12 OR DayofMonth BETWEEN 3 AND 12 LIMIT 15","hsqls":["SELECT DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE DistanceGroup BETWEEN 9 AND 4 OR DestWac BETWEEN 91 AND 12 OR DayofMonth BETWEEN 3 AND 12 LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, Origin, AVG(\"Month\"), SUM(FirstDepTime) FROM mytable WHERE Quarter = 1 AND DivWheelsOns < 1214 AND DivWheelsOffs BETWEEN 1510 AND 1217 GROUP BY OriginCityName, Origin LIMIT 28","hsqls":["SELECT OriginCityName, Origin, AVG(`Month`), SUM(FirstDepTime) FROM mytable WHERE Quarter = 1 AND (DivWheelsOns[1] < 1214 OR DivWheelsOns[2] < 1214 OR DivWheelsOns[3] < 1214 OR DivWheelsOns[4] < 1214 OR DivWheelsOns[5] < 1214) AND (DivWheelsOffs[1] BETWEEN 1510 AND 1217 OR DivWheelsOffs[2] BETWEEN 1510 AND 1217 OR DivWheelsOffs[3] BETWEEN 1510 AND 1217 OR DivWheelsOffs[4] BETWEEN 1510 AND 1217 OR DivWheelsOffs[5] BETWEEN 1510 AND 1217) GROUP BY OriginCityName, Origin LIMIT 10000"]}
 {"sql":"SELECT Diverted, OriginStateFips, COUNT(*) FROM mytable WHERE OriginAirportID = 13433 GROUP BY Diverted, OriginStateFips  ORDER BY Diverted, OriginStateFips LIMIT 15","hsqls":["SELECT Diverted, OriginStateFips, COUNT(*) FROM mytable WHERE OriginAirportID = 13433 GROUP BY Diverted, OriginStateFips  ORDER BY Diverted, OriginStateFips LIMIT 15"]}
 {"sql":"SELECT DepDelay, FirstDepTime, FlightDate, COUNT(*) FROM mytable WHERE Distance IN (90) GROUP BY DepDelay, FirstDepTime, FlightDate  ORDER BY DepDelay, FirstDepTime, FlightDate LIMIT 2","hsqls":["SELECT DepDelay, FirstDepTime, FlightDate, COUNT(*) FROM mytable WHERE Distance IN (90) GROUP BY DepDelay, FirstDepTime, FlightDate  ORDER BY DepDelay, FirstDepTime, FlightDate LIMIT 2"]}
-{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE DivWheelsOns >= 2058 OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 20","hsqls":["SELECT MAX(Year) FROM mytable WHERE (DivWheelsOns__MV0 >= 2058 OR DivWheelsOns__MV1 >= 2058 OR DivWheelsOns__MV2 >= 2058 OR DivWheelsOns__MV3 >= 2058 OR DivWheelsOns__MV4 >= 2058) OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 10000"]}
+{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE DivWheelsOns >= 2058 OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 20","hsqls":["SELECT MAX(`Year`) FROM mytable WHERE (DivWheelsOns[1] >= 2058 OR DivWheelsOns[2] >= 2058 OR DivWheelsOns[3] >= 2058 OR DivWheelsOns[4] >= 2058 OR DivWheelsOns[5] >= 2058) OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 10000"]}
 {"sql":"SELECT MIN(Quarter), SUM(FlightNum) FROM mytable WHERE ArrTimeBlk > '0600-0659' LIMIT 11"}
 {"sql":"SELECT DestCityMarketID FROM mytable WHERE DestCityMarketID <> 32070 ORDER BY Flights, TailNum LIMIT 28"}
-{"sql":"SELECT DestAirportSeqID FROM mytable WHERE DivAirportIDs IN (10529, 14524, 11066, 13230) ORDER BY WeatherDelay LIMIT 11","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE (DivAirportIDs__MV0 IN (10529, 14524, 11066, 13230) OR DivAirportIDs__MV1 IN (10529, 14524, 11066, 13230) OR DivAirportIDs__MV2 IN (10529, 14524, 11066, 13230) OR DivAirportIDs__MV3 IN (10529, 14524, 11066, 13230) OR DivAirportIDs__MV4 IN (10529, 14524, 11066, 13230)) ORDER BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID FROM mytable WHERE DivAirportIDs IN (10529, 14524, 11066, 13230) ORDER BY WeatherDelay LIMIT 11","hsqls":["SELECT DestAirportSeqID FROM mytable WHERE (DivAirportIDs[1] IN (10529, 14524, 11066, 13230) OR DivAirportIDs[2] IN (10529, 14524, 11066, 13230) OR DivAirportIDs[3] IN (10529, 14524, 11066, 13230) OR DivAirportIDs[4] IN (10529, 14524, 11066, 13230) OR DivAirportIDs[5] IN (10529, 14524, 11066, 13230)) ORDER BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT Flights, DepTime, COUNT(*) FROM mytable WHERE TaxiOut < 38 AND AirTime IN (223, 216, 380, 461) GROUP BY Flights, DepTime  ORDER BY Flights, DepTime LIMIT 13","hsqls":["SELECT Flights, DepTime, COUNT(*) FROM mytable WHERE TaxiOut < 38 AND AirTime IN (223, 216, 380, 461) GROUP BY Flights, DepTime  ORDER BY Flights, DepTime LIMIT 13"]}
-{"sql":"SELECT Flights, DepTime, ArrivalDelayGroups FROM mytable WHERE DivAirports IN ('BLI') OR WheelsOn < 1307 ORDER BY AirlineID, OriginStateName LIMIT 27","hsqls":["SELECT Flights, DepTime, ArrivalDelayGroups FROM mytable WHERE (DivAirports__MV0 IN ('BLI') OR DivAirports__MV1 IN ('BLI') OR DivAirports__MV2 IN ('BLI') OR DivAirports__MV3 IN ('BLI') OR DivAirports__MV4 IN ('BLI')) OR WheelsOn < 1307 ORDER BY AirlineID, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT ArrTime, DestCityName, OriginWac FROM mytable WHERE DivTotalGTimes BETWEEN 32 AND 63 OR CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 19","hsqls":["SELECT ArrTime, DestCityName, OriginWac FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 32 AND 63 OR DivTotalGTimes__MV1 BETWEEN 32 AND 63 OR DivTotalGTimes__MV2 BETWEEN 32 AND 63 OR DivTotalGTimes__MV3 BETWEEN 32 AND 63 OR DivTotalGTimes__MV4 BETWEEN 32 AND 63) OR CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT AVG(DivDistance), MIN(FirstDepTime) FROM mytable WHERE DivAirportIDs BETWEEN 11057 AND 10693 AND DayofMonth BETWEEN 10 AND 19 AND \"Year\" > 2014 LIMIT 12","hsqls":["SELECT AVG(DivDistance), MIN(FirstDepTime)  FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11057 AND 10693 OR DivAirportIDs__MV1 BETWEEN 11057 AND 10693 OR DivAirportIDs__MV2 BETWEEN 11057 AND 10693 OR DivAirportIDs__MV3 BETWEEN 11057 AND 10693 OR DivAirportIDs__MV4 BETWEEN 11057 AND 10693) AND DayofMonth BETWEEN 10 AND 19 AND Year > 2014 LIMIT 10000"]}
+{"sql":"SELECT Flights, DepTime, ArrivalDelayGroups FROM mytable WHERE DivAirports IN ('BLI') OR WheelsOn < 1307 ORDER BY AirlineID, OriginStateName LIMIT 27","hsqls":["SELECT Flights, DepTime, ArrivalDelayGroups FROM mytable WHERE (DivAirports[1] IN ('BLI') OR DivAirports[2] IN ('BLI') OR DivAirports[3] IN ('BLI') OR DivAirports[4] IN ('BLI') OR DivAirports[5] IN ('BLI')) OR WheelsOn < 1307 ORDER BY AirlineID, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrTime, DestCityName, OriginWac FROM mytable WHERE DivTotalGTimes BETWEEN 32 AND 63 OR CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 19","hsqls":["SELECT ArrTime, DestCityName, OriginWac FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 32 AND 63 OR DivTotalGTimes[2] BETWEEN 32 AND 63 OR DivTotalGTimes[3] BETWEEN 32 AND 63 OR DivTotalGTimes[4] BETWEEN 32 AND 63 OR DivTotalGTimes[5] BETWEEN 32 AND 63) OR CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT AVG(DivDistance), MIN(FirstDepTime) FROM mytable WHERE DivAirportIDs BETWEEN 11057 AND 10693 AND DayofMonth BETWEEN 10 AND 19 AND \"Year\" > 2014 LIMIT 12","hsqls":["SELECT AVG(DivDistance), MIN(FirstDepTime)  FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11057 AND 10693 OR DivAirportIDs[2] BETWEEN 11057 AND 10693 OR DivAirportIDs[3] BETWEEN 11057 AND 10693 OR DivAirportIDs[4] BETWEEN 11057 AND 10693 OR DivAirportIDs[5] BETWEEN 11057 AND 10693) AND DayofMonth BETWEEN 10 AND 19 AND `Year` > 2014 LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, Origin, CancellationCode FROM mytable WHERE CancellationCode IN ('C') ORDER BY DestWac, DepTimeBlk LIMIT 7"}
 {"sql":"SELECT CRSDepTime, COUNT(FlightNum), MAX(LongestAddGTime), AVG(Cancelled) FROM mytable WHERE Diverted > 1 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 9","hsqls":["SELECT CRSDepTime, COUNT(FlightNum), MAX(LongestAddGTime), AVG(Cancelled) FROM mytable WHERE Diverted > 1 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 9"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivDistance NOT IN (680, 73) ORDER BY FlightNum, DivArrDelay, CRSElapsedTime LIMIT 26","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DivDistance NOT IN (680, 73) ORDER BY FlightNum, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, AirTime FROM mytable WHERE DestState = 'IL' ORDER BY Flights, Cancelled LIMIT 12","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, AirTime FROM mytable WHERE DestState = 'IL' ORDER BY Flights, Cancelled LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivDistance NOT IN (680, 73) ORDER BY FlightNum, DivArrDelay, CRSElapsedTime LIMIT 26","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE DivDistance NOT IN (680, 73) ORDER BY FlightNum, DivArrDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, AirTime FROM mytable WHERE DestState = 'IL' ORDER BY Flights, Cancelled LIMIT 12","hsqls":["SELECT DivAirportSeqIDs, AirTime FROM mytable WHERE DestState = 'IL' ORDER BY Flights, Cancelled LIMIT 10000"]}
 {"sql":"SELECT \"Year\", Distance, ArrDel15, COUNT(*) FROM mytable GROUP BY \"Year\", Distance, ArrDel15 LIMIT 3","hsqls":["SELECT Year, Distance, ArrDel15, COUNT(*) FROM mytable GROUP BY Year, Distance, ArrDel15 LIMIT 3"]}
 {"sql":"SELECT FirstDepTime, CRSArrTime, CRSElapsedTime, MIN(DestAirportID), COUNT(DivDistance) FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'UA' AND OriginState <> 'WI' GROUP BY FirstDepTime, CRSArrTime, CRSElapsedTime","hsqls":["SELECT FirstDepTime, CRSArrTime, CRSElapsedTime, MIN(DestAirportID), COUNT(DivDistance) FROM mytable WHERE Carrier BETWEEN 'MQ' AND 'UA' AND OriginState <> 'WI' GROUP BY FirstDepTime, CRSArrTime, CRSElapsedTime"]}
 {"sql":"SELECT DestWac FROM mytable WHERE OriginWac BETWEEN 23 AND 42 OR OriginCityName NOT IN ('Amarillo, TX', 'Casper, WY', 'Wilmington, DE', 'Kahului, HI') ORDER BY OriginAirportSeqID, ArrDelayMinutes LIMIT 10"}
 {"sql":"SELECT CRSArrTime, CRSElapsedTime, COUNT(Quarter), COUNT(TotalAddGTime), AVG(DivAirportLandings) FROM mytable WHERE TaxiIn BETWEEN 6 AND 57 AND CarrierDelay IN (43, 92, 5, 33) GROUP BY CRSArrTime, CRSElapsedTime  ORDER BY CRSArrTime, CRSElapsedTime LIMIT 21","hsqls":["SELECT CRSArrTime, CRSElapsedTime, COUNT(Quarter), COUNT(TotalAddGTime), AVG(DivAirportLandings) FROM mytable WHERE TaxiIn BETWEEN 6 AND 57 AND CarrierDelay IN (43, 92, 5, 33) GROUP BY CRSArrTime, CRSElapsedTime  ORDER BY CRSArrTime, CRSElapsedTime LIMIT 21"]}
-{"sql":"SELECT LateAircraftDelay, CRSArrTime, DivAirportLandings, MIN(CRSElapsedTime), COUNT(DestState) FROM mytable WHERE CancellationCode <= 'A' AND AirTime BETWEEN 416 AND 330 AND DivAirportIDs IN (13422, 11986, 14683) GROUP BY LateAircraftDelay, CRSArrTime, DivAirportLandings LIMIT 18","hsqls":["SELECT LateAircraftDelay, CRSArrTime, DivAirportLandings, MIN(CRSElapsedTime), COUNT(DestState) FROM mytable WHERE CancellationCode <= 'A' AND AirTime BETWEEN 416 AND 330 AND (DivAirportIDs__MV0 IN (13422, 11986, 14683) OR DivAirportIDs__MV1 IN (13422, 11986, 14683) OR DivAirportIDs__MV2 IN (13422, 11986, 14683) OR DivAirportIDs__MV3 IN (13422, 11986, 14683) OR DivAirportIDs__MV4 IN (13422, 11986, 14683)) GROUP BY LateAircraftDelay, CRSArrTime, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DivAirportIDs FROM mytable LIMIT 2","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, CRSArrTime, DivAirportLandings, MIN(CRSElapsedTime), COUNT(DestState) FROM mytable WHERE CancellationCode <= 'A' AND AirTime BETWEEN 416 AND 330 AND DivAirportIDs IN (13422, 11986, 14683) GROUP BY LateAircraftDelay, CRSArrTime, DivAirportLandings LIMIT 18","hsqls":["SELECT LateAircraftDelay, CRSArrTime, DivAirportLandings, MIN(CRSElapsedTime), COUNT(DestState) FROM mytable WHERE CancellationCode <= 'A' AND AirTime BETWEEN 416 AND 330 AND (DivAirportIDs[1] IN (13422, 11986, 14683) OR DivAirportIDs[2] IN (13422, 11986, 14683) OR DivAirportIDs[3] IN (13422, 11986, 14683) OR DivAirportIDs[4] IN (13422, 11986, 14683) OR DivAirportIDs[5] IN (13422, 11986, 14683)) GROUP BY LateAircraftDelay, CRSArrTime, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs FROM mytable LIMIT 2","hsqls":["SELECT DivAirportIDs FROM mytable LIMIT 10000"]}
 {"sql":"SELECT TailNum, CRSDepTime, MAX(FlightNum) FROM mytable WHERE DestCityMarketID BETWEEN 30107 AND 34006 GROUP BY TailNum, CRSDepTime  ORDER BY TailNum, CRSDepTime LIMIT 12","hsqls":["SELECT TailNum, CRSDepTime, MAX(FlightNum) FROM mytable WHERE DestCityMarketID BETWEEN 30107 AND 34006 GROUP BY TailNum, CRSDepTime  ORDER BY TailNum, CRSDepTime LIMIT 12"]}
 {"sql":"SELECT TaxiOut FROM mytable WHERE SecurityDelay <> 10 AND OriginAirportID > 11867 OR WheelsOff < 2158 LIMIT 11"}
 {"sql":"SELECT MIN(DepTime), AVG(FirstDepTime), MIN(DayOfWeek) FROM mytable WHERE UniqueCarrier >= 'AA' AND OriginStateFips IN (6, 41, 47, 75, 50) LIMIT 5"}
 {"sql":"SELECT COUNT(OriginCityMarketID), MAX(DepDelay) FROM mytable WHERE DepDel15 > -9999 OR CRSArrTime BETWEEN 1717 AND 1904 OR Flights >= 1 LIMIT 5"}
 {"sql":"SELECT AVG(DestAirportID), SUM(FlightNum) FROM mytable LIMIT 8"}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'FL' OR DivAirportSeqIDs > 1164802 LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'FL' OR (DivAirportSeqIDs__MV0 > 1164802 OR DivAirportSeqIDs__MV1 > 1164802 OR DivAirportSeqIDs__MV2 > 1164802 OR DivAirportSeqIDs__MV3 > 1164802 OR DivAirportSeqIDs__MV4 > 1164802) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'FL' OR DivAirportSeqIDs > 1164802 LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE UniqueCarrier BETWEEN 'WN' AND 'FL' OR (DivAirportSeqIDs[1] > 1164802 OR DivAirportSeqIDs[2] > 1164802 OR DivAirportSeqIDs[3] > 1164802 OR DivAirportSeqIDs[4] > 1164802 OR DivAirportSeqIDs[5] > 1164802) LIMIT 10000"]}
 {"sql":"SELECT Origin, DivActualElapsedTime FROM mytable WHERE ActualElapsedTime > 265 OR DaysSinceEpoch BETWEEN 16088 AND 16073 OR DepTime <= 1915 ORDER BY DestState, ArrTimeBlk LIMIT 6"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestCityMarketID BETWEEN 31003 AND 30643 LIMIT 19"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDelay BETWEEN 342.0 AND 332.0 LIMIT 10"}
@@ -8928,65 +8928,65 @@
 {"sql":"SELECT DepDelay, TaxiIn FROM mytable WHERE ArrTimeBlk BETWEEN '1700-1759' AND '1800-1859' AND DestCityName BETWEEN 'Grand Rapids, MI' AND 'State College, PA' ORDER BY ArrivalDelayGroups LIMIT 4"}
 {"sql":"SELECT DivActualElapsedTime, COUNT(DestWac) FROM mytable WHERE DepTimeBlk BETWEEN '1100-1159' AND '1600-1659' OR DepTimeBlk BETWEEN '1500-1559' AND '2200-2259' OR Cancelled > 0 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 6","hsqls":["SELECT DivActualElapsedTime, COUNT(DestWac) FROM mytable WHERE DepTimeBlk BETWEEN '1100-1159' AND '1600-1659' OR DepTimeBlk BETWEEN '1500-1559' AND '2200-2259' OR Cancelled > 0 GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 6"]}
 {"sql":"SELECT OriginCityName, ArrivalDelayGroups FROM mytable ORDER BY OriginAirportSeqID, Carrier LIMIT 14"}
-{"sql":"SELECT DivWheelsOns, DepDelayMinutes FROM mytable ORDER BY DestWac LIMIT 11","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepDelayMinutes FROM mytable ORDER BY DestWac LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepDelayMinutes FROM mytable ORDER BY DestWac LIMIT 11","hsqls":["SELECT DivWheelsOns, DepDelayMinutes FROM mytable ORDER BY DestWac LIMIT 10000"]}
 {"sql":"SELECT DestWac, Carrier, DestAirportID, MAX(DivDistance), MIN(DepDelayMinutes) FROM mytable WHERE DestWac BETWEEN 67 AND 36 GROUP BY DestWac, Carrier, DestAirportID  ORDER BY DestWac, Carrier, DestAirportID LIMIT 14","hsqls":["SELECT DestWac, Carrier, DestAirportID, MAX(DivDistance), MIN(DepDelayMinutes) FROM mytable WHERE DestWac BETWEEN 67 AND 36 GROUP BY DestWac, Carrier, DestAirportID  ORDER BY DestWac, Carrier, DestAirportID LIMIT 14"]}
 {"sql":"SELECT ArrDel15, OriginStateName, MAX(AirTime) FROM mytable GROUP BY ArrDel15, OriginStateName  ORDER BY ArrDel15, OriginStateName LIMIT 2","hsqls":["SELECT ArrDel15, OriginStateName, MAX(AirTime) FROM mytable GROUP BY ArrDel15, OriginStateName  ORDER BY ArrDel15, OriginStateName LIMIT 2"]}
 {"sql":"SELECT OriginState, DestState, UniqueCarrier, AVG(WeatherDelay), COUNT(Origin) FROM mytable WHERE LateAircraftDelay < 291 AND CRSArrTime <= 110 GROUP BY OriginState, DestState, UniqueCarrier  ORDER BY OriginState, DestState, UniqueCarrier LIMIT 9","hsqls":["SELECT OriginState, DestState, UniqueCarrier, AVG(WeatherDelay), COUNT(Origin) FROM mytable WHERE LateAircraftDelay < 291 AND CRSArrTime <= 110 GROUP BY OriginState, DestState, UniqueCarrier  ORDER BY OriginState, DestState, UniqueCarrier LIMIT 9"]}
-{"sql":"SELECT Carrier FROM mytable WHERE DivArrDelay BETWEEN 106 AND 160 AND DistanceGroup BETWEEN 8 AND 8 AND DivTailNums <= 'N944WN' LIMIT 26","hsqls":["SELECT Carrier FROM mytable WHERE DivArrDelay BETWEEN 106 AND 160 AND DistanceGroup BETWEEN 8 AND 8 AND (DivTailNums__MV0 <= 'N944WN' OR DivTailNums__MV1 <= 'N944WN' OR DivTailNums__MV2 <= 'N944WN' OR DivTailNums__MV3 <= 'N944WN' OR DivTailNums__MV4 <= 'N944WN') LIMIT 10000"]}
+{"sql":"SELECT Carrier FROM mytable WHERE DivArrDelay BETWEEN 106 AND 160 AND DistanceGroup BETWEEN 8 AND 8 AND DivTailNums <= 'N944WN' LIMIT 26","hsqls":["SELECT Carrier FROM mytable WHERE DivArrDelay BETWEEN 106 AND 160 AND DistanceGroup BETWEEN 8 AND 8 AND (DivTailNums[1] <= 'N944WN' OR DivTailNums[2] <= 'N944WN' OR DivTailNums[3] <= 'N944WN' OR DivTailNums[4] <= 'N944WN' OR DivTailNums[5] <= 'N944WN') LIMIT 10000"]}
 {"sql":"SELECT ArrTime, DestCityMarketID, ArrDelay, COUNT(*) FROM mytable WHERE Cancelled IN (1, 0) GROUP BY ArrTime, DestCityMarketID, ArrDelay  ORDER BY ArrTime, DestCityMarketID, ArrDelay LIMIT 12","hsqls":["SELECT ArrTime, DestCityMarketID, ArrDelay, COUNT(*) FROM mytable WHERE Cancelled IN (1, 0) GROUP BY ArrTime, DestCityMarketID, ArrDelay  ORDER BY ArrTime, DestCityMarketID, ArrDelay LIMIT 12"]}
 {"sql":"SELECT Distance, SUM(CarrierDelay), SUM(Flights), AVG(Distance) FROM mytable GROUP BY Distance  ORDER BY Distance LIMIT 12","hsqls":["SELECT Distance, SUM(CarrierDelay), SUM(Flights), AVG(Distance) FROM mytable GROUP BY Distance  ORDER BY Distance LIMIT 12"]}
-{"sql":"SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID) FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND DivAirportIDs <= 14006 LIMIT 22","hsqls":["SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID)  FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND (DivAirportIDs__MV0 <= 14006 OR DivAirportIDs__MV1 <= 14006 OR DivAirportIDs__MV2 <= 14006 OR DivAirportIDs__MV3 <= 14006 OR DivAirportIDs__MV4 <= 14006) LIMIT 10000"]}
+{"sql":"SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID) FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND DivAirportIDs <= 14006 LIMIT 22","hsqls":["SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID)  FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND (DivAirportIDs[1] <= 14006 OR DivAirportIDs[2] <= 14006 OR DivAirportIDs[3] <= 14006 OR DivAirportIDs[4] <= 14006 OR DivAirportIDs[5] <= 14006) LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, AirTime, CRSDepTime, COUNT(*) FROM mytable WHERE Distance > 751 OR TaxiIn BETWEEN 46 AND 4 GROUP BY DepDelayMinutes, AirTime, CRSDepTime  ORDER BY DepDelayMinutes, AirTime, CRSDepTime LIMIT 19","hsqls":["SELECT DepDelayMinutes, AirTime, CRSDepTime, COUNT(*) FROM mytable WHERE Distance > 751 OR TaxiIn BETWEEN 46 AND 4 GROUP BY DepDelayMinutes, AirTime, CRSDepTime  ORDER BY DepDelayMinutes, AirTime, CRSDepTime LIMIT 19"]}
 {"sql":"SELECT FlightDate FROM mytable WHERE FlightDate NOT IN ('2014-01-19', '2014-01-09', '2014-01-22', '2014-01-17') OR ActualElapsedTime BETWEEN 375 AND 384 ORDER BY FirstDepTime, DivAirportLandings LIMIT 8"}
 {"sql":"SELECT CancellationCode, COUNT(*) FROM mytable WHERE TailNum IN ('N3BHAA', 'N710SK', 'N3KYAA', 'N291AT') AND DivAirportLandings BETWEEN 2 AND 1 OR CancellationCode NOT IN ('A', 'noodles') GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 20","hsqls":["SELECT CancellationCode, COUNT(*) FROM mytable WHERE TailNum IN ('N3BHAA', 'N710SK', 'N3KYAA', 'N291AT') AND DivAirportLandings BETWEEN 2 AND 1 OR CancellationCode NOT IN ('A', 'noodles') GROUP BY CancellationCode  ORDER BY CancellationCode LIMIT 20"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DayofMonth BETWEEN 19 AND 14 AND DepTimeBlk BETWEEN '2100-2159' AND '2000-2059' AND DivWheelsOffs >= 1559 ORDER BY OriginState, DestWac LIMIT 19","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE DayofMonth BETWEEN 19 AND 14 AND DepTimeBlk BETWEEN '2100-2159' AND '2000-2059' AND (DivWheelsOffs__MV0 >= 1559 OR DivWheelsOffs__MV1 >= 1559 OR DivWheelsOffs__MV2 >= 1559 OR DivWheelsOffs__MV3 >= 1559 OR DivWheelsOffs__MV4 >= 1559) ORDER BY OriginState, DestWac LIMIT 10000"]}
-{"sql":"SELECT DivAirports, DestStateName, DepTimeBlk FROM mytable WHERE NASDelay IN (145, 12) OR DivAirportSeqIDs <= 1330303 OR \"Month\" BETWEEN 1 AND 1 ORDER BY CarrierDelay, FlightNum LIMIT 29","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestStateName, DepTimeBlk FROM mytable WHERE NASDelay IN (145, 12) OR (DivAirportSeqIDs__MV0 <= 1330303 OR DivAirportSeqIDs__MV1 <= 1330303 OR DivAirportSeqIDs__MV2 <= 1330303 OR DivAirportSeqIDs__MV3 <= 1330303 OR DivAirportSeqIDs__MV4 <= 1330303) OR Month BETWEEN 1 AND 1 ORDER BY CarrierDelay, FlightNum LIMIT 10000"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DestAirportID BETWEEN 14698 AND 14027 ORDER BY UniqueCarrier LIMIT 29","hsqls":["SELECT Year FROM mytable WHERE DestAirportID BETWEEN 14698 AND 14027 ORDER BY UniqueCarrier LIMIT 29"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DayofMonth BETWEEN 19 AND 14 AND DepTimeBlk BETWEEN '2100-2159' AND '2000-2059' AND DivWheelsOffs >= 1559 ORDER BY OriginState, DestWac LIMIT 19","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE DayofMonth BETWEEN 19 AND 14 AND DepTimeBlk BETWEEN '2100-2159' AND '2000-2059' AND (DivWheelsOffs[1] >= 1559 OR DivWheelsOffs[2] >= 1559 OR DivWheelsOffs[3] >= 1559 OR DivWheelsOffs[4] >= 1559 OR DivWheelsOffs[5] >= 1559) ORDER BY OriginState, DestWac LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestStateName, DepTimeBlk FROM mytable WHERE NASDelay IN (145, 12) OR DivAirportSeqIDs <= 1330303 OR \"Month\" BETWEEN 1 AND 1 ORDER BY CarrierDelay, FlightNum LIMIT 29","hsqls":["SELECT DivAirports, DestStateName, DepTimeBlk FROM mytable WHERE NASDelay IN (145, 12) OR (DivAirportSeqIDs[1] <= 1330303 OR DivAirportSeqIDs[2] <= 1330303 OR DivAirportSeqIDs[3] <= 1330303 OR DivAirportSeqIDs[4] <= 1330303 OR DivAirportSeqIDs[5] <= 1330303) OR `Month` BETWEEN 1 AND 1 ORDER BY CarrierDelay, FlightNum LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DestAirportID BETWEEN 14698 AND 14027 ORDER BY UniqueCarrier LIMIT 29","hsqls":["SELECT `Year` FROM mytable WHERE DestAirportID BETWEEN 14698 AND 14027 ORDER BY UniqueCarrier LIMIT 29"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE AirTime <> 235 OR OriginAirportID > 10918 OR ArrDel15 >= 0 ORDER BY Distance LIMIT 22"}
-{"sql":"SELECT DepartureDelayGroups, AVG(\"Month\"), MAX(ArrDel15), COUNT(DestAirportID) FROM mytable WHERE CRSElapsedTime NOT IN (411) AND TotalAddGTime > 60 AND DivActualElapsedTime IN (388, 744, 516) GROUP BY DepartureDelayGroups LIMIT 28","hsqls":["SELECT DepartureDelayGroups, AVG(Month), MAX(ArrDel15), COUNT(DestAirportID) FROM mytable WHERE CRSElapsedTime NOT IN (411) AND TotalAddGTime > 60 AND DivActualElapsedTime IN (388, 744, 516) GROUP BY DepartureDelayGroups LIMIT 28"]}
+{"sql":"SELECT DepartureDelayGroups, AVG(\"Month\"), MAX(ArrDel15), COUNT(DestAirportID) FROM mytable WHERE CRSElapsedTime NOT IN (411) AND TotalAddGTime > 60 AND DivActualElapsedTime IN (388, 744, 516) GROUP BY DepartureDelayGroups LIMIT 28","hsqls":["SELECT DepartureDelayGroups, AVG(`Month`), MAX(ArrDel15), COUNT(DestAirportID) FROM mytable WHERE CRSElapsedTime NOT IN (411) AND TotalAddGTime > 60 AND DivActualElapsedTime IN (388, 744, 516) GROUP BY DepartureDelayGroups LIMIT 28"]}
 {"sql":"SELECT Diverted, DepDel15 FROM mytable ORDER BY ActualElapsedTime, Origin LIMIT 9"}
 {"sql":"SELECT OriginAirportSeqID, LongestAddGTime FROM mytable ORDER BY AirTime LIMIT 6"}
-{"sql":"SELECT DepDelay, Quarter, SecurityDelay FROM mytable WHERE DivTailNums < 'N793SA' OR Carrier IN ('EV', 'WN', 'B6', 'VX') ORDER BY Distance, DepTime, OriginWac LIMIT 24","hsqls":["SELECT DepDelay, Quarter, SecurityDelay FROM mytable WHERE (DivTailNums__MV0 < 'N793SA' OR DivTailNums__MV1 < 'N793SA' OR DivTailNums__MV2 < 'N793SA' OR DivTailNums__MV3 < 'N793SA' OR DivTailNums__MV4 < 'N793SA') OR Carrier IN ('EV', 'WN', 'B6', 'VX') ORDER BY Distance, DepTime, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DepDelay, Quarter, SecurityDelay FROM mytable WHERE DivTailNums < 'N793SA' OR Carrier IN ('EV', 'WN', 'B6', 'VX') ORDER BY Distance, DepTime, OriginWac LIMIT 24","hsqls":["SELECT DepDelay, Quarter, SecurityDelay FROM mytable WHERE (DivTailNums[1] < 'N793SA' OR DivTailNums[2] < 'N793SA' OR DivTailNums[3] < 'N793SA' OR DivTailNums[4] < 'N793SA' OR DivTailNums[5] < 'N793SA') OR Carrier IN ('EV', 'WN', 'B6', 'VX') ORDER BY Distance, DepTime, OriginWac LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DestStateName, WheelsOn FROM mytable ORDER BY CRSDepTime LIMIT 25"}
 {"sql":"SELECT COUNT(DestAirportID), SUM(CRSArrTime) FROM mytable WHERE FlightDate NOT IN ('2014-01-14', '2014-01-21', '2014-01-22', '2014-01-20', '2014-01-08') OR WheelsOn NOT IN (2155, 1912) LIMIT 19"}
 {"sql":"SELECT TailNum FROM mytable ORDER BY TotalAddGTime LIMIT 10"}
-{"sql":"SELECT DestWac, ArrTime FROM mytable WHERE DivTotalGTimes IN (79, 60) AND OriginStateFips IN (42, 19) ORDER BY ArrDel15, AirlineID, OriginWac LIMIT 6","hsqls":["SELECT DestWac, ArrTime FROM mytable WHERE (DivTotalGTimes__MV0 IN (79, 60) OR DivTotalGTimes__MV1 IN (79, 60) OR DivTotalGTimes__MV2 IN (79, 60) OR DivTotalGTimes__MV3 IN (79, 60) OR DivTotalGTimes__MV4 IN (79, 60)) AND OriginStateFips IN (42, 19) ORDER BY ArrDel15, AirlineID, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DestWac, ArrTime FROM mytable WHERE DivTotalGTimes IN (79, 60) AND OriginStateFips IN (42, 19) ORDER BY ArrDel15, AirlineID, OriginWac LIMIT 6","hsqls":["SELECT DestWac, ArrTime FROM mytable WHERE (DivTotalGTimes[1] IN (79, 60) OR DivTotalGTimes[2] IN (79, 60) OR DivTotalGTimes[3] IN (79, 60) OR DivTotalGTimes[4] IN (79, 60) OR DivTotalGTimes[5] IN (79, 60)) AND OriginStateFips IN (42, 19) ORDER BY ArrDel15, AirlineID, OriginWac LIMIT 10000"]}
 {"sql":"SELECT DivArrDelay, MAX(ArrDelayMinutes) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 15","hsqls":["SELECT DivArrDelay, MAX(ArrDelayMinutes) FROM mytable GROUP BY DivArrDelay  ORDER BY DivArrDelay LIMIT 15"]}
 {"sql":"SELECT TaxiOut, DestAirportID FROM mytable WHERE ActualElapsedTime <> 267 ORDER BY DepDelay, DivDistance LIMIT 1"}
 {"sql":"SELECT OriginCityName FROM mytable ORDER BY NASDelay LIMIT 25"}
 {"sql":"SELECT NASDelay FROM mytable WHERE DivDistance BETWEEN 967 AND 211 ORDER BY DistanceGroup, DestAirportID, DivArrDelay LIMIT 1"}
 {"sql":"SELECT DestAirportSeqID, TaxiIn FROM mytable ORDER BY DepTime LIMIT 3"}
-{"sql":"SELECT DivDistance, OriginStateFips, UniqueCarrier, AVG(ArrivalDelayGroups), SUM(DivArrDelay) FROM mytable WHERE DivTotalGTimes BETWEEN 4 AND 119 AND DivWheelsOffs IN (1458, 29) GROUP BY DivDistance, OriginStateFips, UniqueCarrier LIMIT 24","hsqls":["SELECT DivDistance, OriginStateFips, UniqueCarrier, AVG(ArrivalDelayGroups), SUM(DivArrDelay) FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 4 AND 119 OR DivTotalGTimes__MV1 BETWEEN 4 AND 119 OR DivTotalGTimes__MV2 BETWEEN 4 AND 119 OR DivTotalGTimes__MV3 BETWEEN 4 AND 119 OR DivTotalGTimes__MV4 BETWEEN 4 AND 119) AND (DivWheelsOffs__MV0 IN (1458, 29) OR DivWheelsOffs__MV1 IN (1458, 29) OR DivWheelsOffs__MV2 IN (1458, 29) OR DivWheelsOffs__MV3 IN (1458, 29) OR DivWheelsOffs__MV4 IN (1458, 29)) GROUP BY DivDistance, OriginStateFips, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivDistance, OriginStateFips, UniqueCarrier, AVG(ArrivalDelayGroups), SUM(DivArrDelay) FROM mytable WHERE DivTotalGTimes BETWEEN 4 AND 119 AND DivWheelsOffs IN (1458, 29) GROUP BY DivDistance, OriginStateFips, UniqueCarrier LIMIT 24","hsqls":["SELECT DivDistance, OriginStateFips, UniqueCarrier, AVG(ArrivalDelayGroups), SUM(DivArrDelay) FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 4 AND 119 OR DivTotalGTimes[2] BETWEEN 4 AND 119 OR DivTotalGTimes[3] BETWEEN 4 AND 119 OR DivTotalGTimes[4] BETWEEN 4 AND 119 OR DivTotalGTimes[5] BETWEEN 4 AND 119) AND (DivWheelsOffs[1] IN (1458, 29) OR DivWheelsOffs[2] IN (1458, 29) OR DivWheelsOffs[3] IN (1458, 29) OR DivWheelsOffs[4] IN (1458, 29) OR DivWheelsOffs[5] IN (1458, 29)) GROUP BY DivDistance, OriginStateFips, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, Quarter, ArrDel15 FROM mytable ORDER BY DepTimeBlk, DivAirportLandings LIMIT 6"}
-{"sql":"SELECT DepTimeBlk, MAX(CRSElapsedTime) FROM mytable WHERE DivLongestGTimes > 69.0 GROUP BY DepTimeBlk LIMIT 27","hsqls":["SELECT DepTimeBlk, MAX(CRSElapsedTime) FROM mytable WHERE (DivLongestGTimes__MV0 > 69.0 OR DivLongestGTimes__MV1 > 69.0 OR DivLongestGTimes__MV2 > 69.0 OR DivLongestGTimes__MV3 > 69.0 OR DivLongestGTimes__MV4 > 69.0) GROUP BY DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, MAX(CRSElapsedTime) FROM mytable WHERE DivLongestGTimes > 69.0 GROUP BY DepTimeBlk LIMIT 27","hsqls":["SELECT DepTimeBlk, MAX(CRSElapsedTime) FROM mytable WHERE (DivLongestGTimes[1] > 69.0 OR DivLongestGTimes[2] > 69.0 OR DivLongestGTimes[3] > 69.0 OR DivLongestGTimes[4] > 69.0 OR DivLongestGTimes[5] > 69.0) GROUP BY DepTimeBlk LIMIT 10000"]}
 {"sql":"SELECT AVG(Diverted), MAX(TaxiIn) FROM mytable WHERE OriginAirportID BETWEEN 12451 AND 13933 OR NASDelay NOT IN (185, 106, 64) OR DistanceGroup NOT IN (2, 1) LIMIT 25"}
 {"sql":"SELECT DivActualElapsedTime, MAX(ArrDelay) FROM mytable GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 27","hsqls":["SELECT DivActualElapsedTime, MAX(ArrDelay) FROM mytable GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 27"]}
 {"sql":"SELECT COUNT(ArrTimeBlk), AVG(Cancelled), COUNT(CarrierDelay) FROM mytable LIMIT 6"}
 {"sql":"SELECT WheelsOff, Carrier, DivArrDelay FROM mytable WHERE LateAircraftDelay IN (250, 24) ORDER BY DestWac, Distance, SecurityDelay LIMIT 14"}
 {"sql":"SELECT LateAircraftDelay, Quarter FROM mytable WHERE DistanceGroup >= 2 AND DaysSinceEpoch <= 16085 ORDER BY OriginStateFips, OriginStateName LIMIT 18"}
-{"sql":"SELECT Distance, DepTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE DivTotalGTimes IN (49, 42, 84) OR Origin BETWEEN 'KOA' AND 'XNA' GROUP BY Distance, DepTimeBlk, OriginAirportID LIMIT 10","hsqls":["SELECT Distance, DepTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE (DivTotalGTimes__MV0 IN (49, 42, 84) OR DivTotalGTimes__MV1 IN (49, 42, 84) OR DivTotalGTimes__MV2 IN (49, 42, 84) OR DivTotalGTimes__MV3 IN (49, 42, 84) OR DivTotalGTimes__MV4 IN (49, 42, 84)) OR Origin BETWEEN 'KOA' AND 'XNA' GROUP BY Distance, DepTimeBlk, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT Distance, DepTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE DivTotalGTimes IN (49, 42, 84) OR Origin BETWEEN 'KOA' AND 'XNA' GROUP BY Distance, DepTimeBlk, OriginAirportID LIMIT 10","hsqls":["SELECT Distance, DepTimeBlk, OriginAirportID, COUNT(*) FROM mytable WHERE (DivTotalGTimes[1] IN (49, 42, 84) OR DivTotalGTimes[2] IN (49, 42, 84) OR DivTotalGTimes[3] IN (49, 42, 84) OR DivTotalGTimes[4] IN (49, 42, 84) OR DivTotalGTimes[5] IN (49, 42, 84)) OR Origin BETWEEN 'KOA' AND 'XNA' GROUP BY Distance, DepTimeBlk, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, OriginStateName FROM mytable WHERE DivArrDelay >= 315 OR DistanceGroup <> 1 AND CRSArrTime BETWEEN 624 AND 1533 ORDER BY Cancelled, DivActualElapsedTime LIMIT 13"}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY WeatherDelay, TailNum, DepTimeBlk LIMIT 14"}
 {"sql":"SELECT OriginState, OriginStateFips, WheelsOn FROM mytable WHERE WheelsOn BETWEEN 1016 AND 727 AND Distance NOT IN (246) LIMIT 13"}
 {"sql":"SELECT FlightDate, DestStateFips, Origin, AVG(AirlineID) FROM mytable WHERE DestWac BETWEEN 66 AND 41 GROUP BY FlightDate, DestStateFips, Origin  ORDER BY FlightDate, DestStateFips, Origin LIMIT 24","hsqls":["SELECT FlightDate, DestStateFips, Origin, AVG(AirlineID) FROM mytable WHERE DestWac BETWEEN 66 AND 41 GROUP BY FlightDate, DestStateFips, Origin  ORDER BY FlightDate, DestStateFips, Origin LIMIT 24"]}
 {"sql":"SELECT \"Year\", WheelsOn FROM mytable WHERE WheelsOn = 1751 AND SecurityDelay NOT IN (10, 1, 4, 27) ORDER BY DivDistance, ArrDel15, DivAirportLandings LIMIT 8","hsqls":["SELECT Year, WheelsOn FROM mytable WHERE WheelsOn = 1751 AND SecurityDelay NOT IN (10, 1, 4, 27) ORDER BY DivDistance, ArrDel15, DivAirportLandings LIMIT 8"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes NOT IN (105.0) OR DivAirportSeqIDs BETWEEN 1040802 AND 1610102 LIMIT 23","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes NOT IN (105.0) OR (DivAirportSeqIDs__MV0 BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs__MV1 BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs__MV2 BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs__MV3 BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs__MV4 BETWEEN 1040802 AND 1610102) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes NOT IN (105.0) OR DivAirportSeqIDs BETWEEN 1040802 AND 1610102 LIMIT 23","hsqls":["SELECT COUNT(*) FROM mytable WHERE ArrDelayMinutes NOT IN (105.0) OR (DivAirportSeqIDs[1] BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs[2] BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs[3] BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs[4] BETWEEN 1040802 AND 1610102 OR DivAirportSeqIDs[5] BETWEEN 1040802 AND 1610102) LIMIT 10000"]}
 {"sql":"SELECT Carrier FROM mytable ORDER BY DepDelayMinutes, ArrTime, OriginAirportID LIMIT 9"}
-{"sql":"SELECT DivWheelsOns, DepTime FROM mytable WHERE TaxiOut BETWEEN 75 AND 93 ORDER BY CancellationCode, \"Month\" LIMIT 11","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DepTime FROM mytable WHERE TaxiOut BETWEEN 75 AND 93 ORDER BY CancellationCode, Month LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DepTime FROM mytable WHERE TaxiOut BETWEEN 75 AND 93 ORDER BY CancellationCode, \"Month\" LIMIT 11","hsqls":["SELECT DivWheelsOns, DepTime FROM mytable WHERE TaxiOut BETWEEN 75 AND 93 ORDER BY CancellationCode, `Month` LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE ArrDelay <> -55.0 OR DepDelayMinutes <> 76.0 LIMIT 7"}
-{"sql":"SELECT SecurityDelay, TailNum, DaysSinceEpoch, COUNT(OriginStateName) FROM mytable WHERE DivAirportIDs BETWEEN 11057 AND 10140 GROUP BY SecurityDelay, TailNum, DaysSinceEpoch LIMIT 9","hsqls":["SELECT SecurityDelay, TailNum, DaysSinceEpoch, COUNT(OriginStateName) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11057 AND 10140 OR DivAirportIDs__MV1 BETWEEN 11057 AND 10140 OR DivAirportIDs__MV2 BETWEEN 11057 AND 10140 OR DivAirportIDs__MV3 BETWEEN 11057 AND 10140 OR DivAirportIDs__MV4 BETWEEN 11057 AND 10140) GROUP BY SecurityDelay, TailNum, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, TailNum, DaysSinceEpoch, COUNT(OriginStateName) FROM mytable WHERE DivAirportIDs BETWEEN 11057 AND 10140 GROUP BY SecurityDelay, TailNum, DaysSinceEpoch LIMIT 9","hsqls":["SELECT SecurityDelay, TailNum, DaysSinceEpoch, COUNT(OriginStateName) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11057 AND 10140 OR DivAirportIDs[2] BETWEEN 11057 AND 10140 OR DivAirportIDs[3] BETWEEN 11057 AND 10140 OR DivAirportIDs[4] BETWEEN 11057 AND 10140 OR DivAirportIDs[5] BETWEEN 11057 AND 10140) GROUP BY SecurityDelay, TailNum, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT Quarter, MAX(AirlineID), SUM(DivActualElapsedTime) FROM mytable WHERE DestCityMarketID IN (31308, 31401, 33256, 32600, 31049) OR WheelsOn BETWEEN 1820 AND 1654 GROUP BY Quarter  ORDER BY Quarter LIMIT 7","hsqls":["SELECT Quarter, MAX(AirlineID), SUM(DivActualElapsedTime) FROM mytable WHERE DestCityMarketID IN (31308, 31401, 33256, 32600, 31049) OR WheelsOn BETWEEN 1820 AND 1654 GROUP BY Quarter  ORDER BY Quarter LIMIT 7"]}
-{"sql":"SELECT ArrTimeBlk, \"Month\", DayOfWeek, SUM(NASDelay), COUNT(ArrivalDelayGroups) FROM mytable WHERE DivTotalGTimes IN (66, 112, 107, 118) OR DepTime NOT IN (1211) OR ArrTimeBlk >= '0800-0859' GROUP BY ArrTimeBlk, \"Month\", DayOfWeek LIMIT 2","hsqls":["SELECT ArrTimeBlk, Month, DayOfWeek, SUM(NASDelay), COUNT(ArrivalDelayGroups) FROM mytable WHERE (DivTotalGTimes__MV0 IN (66, 112, 107, 118) OR DivTotalGTimes__MV1 IN (66, 112, 107, 118) OR DivTotalGTimes__MV2 IN (66, 112, 107, 118) OR DivTotalGTimes__MV3 IN (66, 112, 107, 118) OR DivTotalGTimes__MV4 IN (66, 112, 107, 118)) OR DepTime NOT IN (1211) OR ArrTimeBlk >= '0800-0859' GROUP BY ArrTimeBlk, Month, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk, \"Month\", DayOfWeek, SUM(NASDelay), COUNT(ArrivalDelayGroups) FROM mytable WHERE DivTotalGTimes IN (66, 112, 107, 118) OR DepTime NOT IN (1211) OR ArrTimeBlk >= '0800-0859' GROUP BY ArrTimeBlk, \"Month\", DayOfWeek LIMIT 2","hsqls":["SELECT ArrTimeBlk, Month, DayOfWeek, SUM(NASDelay), COUNT(ArrivalDelayGroups) FROM mytable WHERE (DivTotalGTimes[1] IN (66, 112, 107, 118) OR DivTotalGTimes[2] IN (66, 112, 107, 118) OR DivTotalGTimes[3] IN (66, 112, 107, 118) OR DivTotalGTimes[4] IN (66, 112, 107, 118) OR DivTotalGTimes[5] IN (66, 112, 107, 118)) OR DepTime NOT IN (1211) OR ArrTimeBlk >= '0800-0859' GROUP BY ArrTimeBlk, Month, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT Diverted, DaysSinceEpoch FROM mytable WHERE OriginWac IN (44, 74) ORDER BY Diverted, DestStateName LIMIT 23"}
-{"sql":"SELECT OriginWac FROM mytable WHERE DayOfWeek NOT IN (3, 2, 6, 5) OR DivTotalGTimes >= 35 AND OriginStateFips BETWEEN 2 AND 16 LIMIT 23","hsqls":["SELECT OriginWac FROM mytable WHERE DayOfWeek NOT IN (3, 2, 6, 5) OR (DivTotalGTimes__MV0 >= 35 OR DivTotalGTimes__MV1 >= 35 OR DivTotalGTimes__MV2 >= 35 OR DivTotalGTimes__MV3 >= 35 OR DivTotalGTimes__MV4 >= 35) AND OriginStateFips BETWEEN 2 AND 16 LIMIT 10000"]}
+{"sql":"SELECT OriginWac FROM mytable WHERE DayOfWeek NOT IN (3, 2, 6, 5) OR DivTotalGTimes >= 35 AND OriginStateFips BETWEEN 2 AND 16 LIMIT 23","hsqls":["SELECT OriginWac FROM mytable WHERE DayOfWeek NOT IN (3, 2, 6, 5) OR (DivTotalGTimes[1] >= 35 OR DivTotalGTimes[2] >= 35 OR DivTotalGTimes[3] >= 35 OR DivTotalGTimes[4] >= 35 OR DivTotalGTimes[5] >= 35) AND OriginStateFips BETWEEN 2 AND 16 LIMIT 10000"]}
 {"sql":"SELECT AVG(NASDelay), SUM(FirstDepTime) FROM mytable WHERE CRSArrTime = 1850 OR DestStateName <= 'Maryland' LIMIT 6"}
 {"sql":"SELECT DepTimeBlk FROM mytable WHERE OriginWac <> 91 OR DayofMonth IN (7) ORDER BY DestAirportSeqID, ArrDelay LIMIT 13"}
-{"sql":"SELECT Carrier, DestCityName, DestAirportID FROM mytable WHERE TaxiOut NOT IN (77, 93, 56) AND DivLongestGTimes IN (46.0, 116.0, 112.0, 94.0, 74.0) ORDER BY WheelsOff, SecurityDelay, DestAirportSeqID LIMIT 13","hsqls":["SELECT Carrier, DestCityName, DestAirportID FROM mytable WHERE TaxiOut NOT IN (77, 93, 56) AND (DivLongestGTimes__MV0 IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes__MV1 IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes__MV2 IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes__MV3 IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes__MV4 IN (46.0, 116.0, 112.0, 94.0, 74.0)) ORDER BY WheelsOff, SecurityDelay, DestAirportSeqID LIMIT 10000"]}
-{"sql":"SELECT SUM(WheelsOff), MIN(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE DivLongestGTimes > 39.0 LIMIT 9","hsqls":["SELECT SUM(WheelsOff), MIN(DivReachedDest), MAX(TaxiOut)  FROM mytable WHERE (DivLongestGTimes__MV0 > 39.0 OR DivLongestGTimes__MV1 > 39.0 OR DivLongestGTimes__MV2 > 39.0 OR DivLongestGTimes__MV3 > 39.0 OR DivLongestGTimes__MV4 > 39.0) LIMIT 10000"]}
-{"sql":"SELECT TaxiOut, DistanceGroup, WeatherDelay, MIN(WheelsOff) FROM mytable WHERE DestAirportID = 14747 AND ArrDelay IN (-3.0, 203.0) OR DivTotalGTimes >= 8 GROUP BY TaxiOut, DistanceGroup, WeatherDelay LIMIT 27","hsqls":["SELECT TaxiOut, DistanceGroup, WeatherDelay, MIN(WheelsOff) FROM mytable WHERE DestAirportID = 14747 AND ArrDelay IN (-3.0, 203.0) OR (DivTotalGTimes__MV0 >= 8 OR DivTotalGTimes__MV1 >= 8 OR DivTotalGTimes__MV2 >= 8 OR DivTotalGTimes__MV3 >= 8 OR DivTotalGTimes__MV4 >= 8) GROUP BY TaxiOut, DistanceGroup, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT Carrier, DestCityName, DestAirportID FROM mytable WHERE TaxiOut NOT IN (77, 93, 56) AND DivLongestGTimes IN (46.0, 116.0, 112.0, 94.0, 74.0) ORDER BY WheelsOff, SecurityDelay, DestAirportSeqID LIMIT 13","hsqls":["SELECT Carrier, DestCityName, DestAirportID FROM mytable WHERE TaxiOut NOT IN (77, 93, 56) AND (DivLongestGTimes[1] IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes[2] IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes[3] IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes[4] IN (46.0, 116.0, 112.0, 94.0, 74.0) OR DivLongestGTimes[5] IN (46.0, 116.0, 112.0, 94.0, 74.0)) ORDER BY WheelsOff, SecurityDelay, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT SUM(WheelsOff), MIN(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE DivLongestGTimes > 39.0 LIMIT 9","hsqls":["SELECT SUM(WheelsOff), MIN(DivReachedDest), MAX(TaxiOut)  FROM mytable WHERE (DivLongestGTimes[1] > 39.0 OR DivLongestGTimes[2] > 39.0 OR DivLongestGTimes[3] > 39.0 OR DivLongestGTimes[4] > 39.0 OR DivLongestGTimes[5] > 39.0) LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DistanceGroup, WeatherDelay, MIN(WheelsOff) FROM mytable WHERE DestAirportID = 14747 AND ArrDelay IN (-3.0, 203.0) OR DivTotalGTimes >= 8 GROUP BY TaxiOut, DistanceGroup, WeatherDelay LIMIT 27","hsqls":["SELECT TaxiOut, DistanceGroup, WeatherDelay, MIN(WheelsOff) FROM mytable WHERE DestAirportID = 14747 AND ArrDelay IN (-3.0, 203.0) OR (DivTotalGTimes[1] >= 8 OR DivTotalGTimes[2] >= 8 OR DivTotalGTimes[3] >= 8 OR DivTotalGTimes[4] >= 8 OR DivTotalGTimes[5] >= 8) GROUP BY TaxiOut, DistanceGroup, WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT TailNum, COUNT(*) FROM mytable WHERE Carrier NOT IN ('AS') AND ActualElapsedTime NOT IN (131) GROUP BY TailNum  ORDER BY TailNum LIMIT 22","hsqls":["SELECT TailNum, COUNT(*) FROM mytable WHERE Carrier NOT IN ('AS') AND ActualElapsedTime NOT IN (131) GROUP BY TailNum  ORDER BY TailNum LIMIT 22"]}
 {"sql":"SELECT DistanceGroup, DestStateName FROM mytable WHERE WheelsOn >= 1740 AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') AND CarrierDelay <> 90 ORDER BY Quarter, ArrDel15, OriginStateName LIMIT 10"}
-{"sql":"SELECT DepDelayMinutes, DivAirportLandings, MIN(WheelsOn), MIN(DaysSinceEpoch), MAX(CRSDepTime) FROM mytable WHERE DepTime BETWEEN 1923 AND 1435 OR DivTailNums BETWEEN 'N336NB' AND 'N600WN' GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 19","hsqls":["SELECT DepDelayMinutes, DivAirportLandings, MIN(WheelsOn), MIN(DaysSinceEpoch), MAX(CRSDepTime) FROM mytable WHERE DepTime BETWEEN 1923 AND 1435 OR (DivTailNums__MV0 BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums__MV1 BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums__MV2 BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums__MV3 BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums__MV4 BETWEEN 'N336NB' AND 'N600WN') GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, DivAirportLandings, MIN(WheelsOn), MIN(DaysSinceEpoch), MAX(CRSDepTime) FROM mytable WHERE DepTime BETWEEN 1923 AND 1435 OR DivTailNums BETWEEN 'N336NB' AND 'N600WN' GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 19","hsqls":["SELECT DepDelayMinutes, DivAirportLandings, MIN(WheelsOn), MIN(DaysSinceEpoch), MAX(CRSDepTime) FROM mytable WHERE DepTime BETWEEN 1923 AND 1435 OR (DivTailNums[1] BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums[2] BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums[3] BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums[4] BETWEEN 'N336NB' AND 'N600WN' OR DivTailNums[5] BETWEEN 'N336NB' AND 'N600WN') GROUP BY DepDelayMinutes, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT FirstDepTime, SecurityDelay, DestStateFips, COUNT(OriginCityMarketID), MIN(DepDelay) FROM mytable GROUP BY FirstDepTime, SecurityDelay, DestStateFips  ORDER BY FirstDepTime, SecurityDelay, DestStateFips LIMIT 13","hsqls":["SELECT FirstDepTime, SecurityDelay, DestStateFips, COUNT(OriginCityMarketID), MIN(DepDelay) FROM mytable GROUP BY FirstDepTime, SecurityDelay, DestStateFips  ORDER BY FirstDepTime, SecurityDelay, DestStateFips LIMIT 13"]}
 {"sql":"SELECT DestCityName, MAX(DestStateFips), AVG(Diverted) FROM mytable WHERE Distance BETWEEN 2349 AND 970 OR Quarter BETWEEN 1 AND 1 OR DepDelayMinutes BETWEEN 214.0 AND 166.0 GROUP BY DestCityName  ORDER BY DestCityName LIMIT 11","hsqls":["SELECT DestCityName, MAX(DestStateFips), AVG(Diverted) FROM mytable WHERE Distance BETWEEN 2349 AND 970 OR Quarter BETWEEN 1 AND 1 OR DepDelayMinutes BETWEEN 214.0 AND 166.0 GROUP BY DestCityName  ORDER BY DestCityName LIMIT 11"]}
 {"sql":"SELECT OriginStateFips, Flights, SecurityDelay, COUNT(DepDel15) FROM mytable WHERE DestCityName BETWEEN 'West Palm Beach/Palm Beach, FL' AND 'Myrtle Beach, SC' GROUP BY OriginStateFips, Flights, SecurityDelay  ORDER BY OriginStateFips, Flights, SecurityDelay LIMIT 22","hsqls":["SELECT OriginStateFips, Flights, SecurityDelay, COUNT(DepDel15) FROM mytable WHERE DestCityName BETWEEN 'West Palm Beach/Palm Beach, FL' AND 'Myrtle Beach, SC' GROUP BY OriginStateFips, Flights, SecurityDelay  ORDER BY OriginStateFips, Flights, SecurityDelay LIMIT 22"]}
@@ -8995,7 +8995,7 @@
 {"sql":"SELECT TaxiOut, DepTimeBlk, MAX(CarrierDelay), COUNT(LateAircraftDelay) FROM mytable WHERE DestState BETWEEN 'IL' AND 'NH' AND OriginCityMarketID IN (30424, 32441) GROUP BY TaxiOut, DepTimeBlk  ORDER BY TaxiOut, DepTimeBlk LIMIT 28","hsqls":["SELECT TaxiOut, DepTimeBlk, MAX(CarrierDelay), COUNT(LateAircraftDelay) FROM mytable WHERE DestState BETWEEN 'IL' AND 'NH' AND OriginCityMarketID IN (30424, 32441) GROUP BY TaxiOut, DepTimeBlk  ORDER BY TaxiOut, DepTimeBlk LIMIT 28"]}
 {"sql":"SELECT MAX(OriginCityMarketID) FROM mytable LIMIT 19"}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE OriginWac BETWEEN 31 AND 85 OR DepDelayMinutes = 96.0 ORDER BY TotalAddGTime, DivAirportLandings LIMIT 20"}
-{"sql":"SELECT OriginState, \"Month\" FROM mytable WHERE DivActualElapsedTime < 257 OR DivWheelsOns <= 1828 OR ArrDelay >= 147.0 LIMIT 26","hsqls":["SELECT OriginState, Month FROM mytable WHERE DivActualElapsedTime < 257 OR (DivWheelsOns__MV0 <= 1828 OR DivWheelsOns__MV1 <= 1828 OR DivWheelsOns__MV2 <= 1828 OR DivWheelsOns__MV3 <= 1828 OR DivWheelsOns__MV4 <= 1828) OR ArrDelay >= 147.0 LIMIT 10000"]}
+{"sql":"SELECT OriginState, \"Month\" FROM mytable WHERE DivActualElapsedTime < 257 OR DivWheelsOns <= 1828 OR ArrDelay >= 147.0 LIMIT 26","hsqls":["SELECT OriginState, `Month` FROM mytable WHERE DivActualElapsedTime < 257 OR (DivWheelsOns[1] <= 1828 OR DivWheelsOns[2] <= 1828 OR DivWheelsOns[3] <= 1828 OR DivWheelsOns[4] <= 1828 OR DivWheelsOns[5] <= 1828) OR ArrDelay >= 147.0 LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DepDelay, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, DepDelay  ORDER BY OriginAirportSeqID, DepDelay LIMIT 24","hsqls":["SELECT OriginAirportSeqID, DepDelay, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, DepDelay  ORDER BY OriginAirportSeqID, DepDelay LIMIT 24"]}
 {"sql":"SELECT Flights, DivArrDelay FROM mytable WHERE WheelsOff <= 920 ORDER BY TaxiOut, Distance, DestAirportID LIMIT 11"}
 {"sql":"SELECT Distance FROM mytable LIMIT 17"}
@@ -9003,52 +9003,52 @@
 {"sql":"SELECT LateAircraftDelay, ArrDelay, OriginStateName, COUNT(*) FROM mytable WHERE FlightNum <= 5487 AND DestState BETWEEN 'IN' AND 'AZ' GROUP BY LateAircraftDelay, ArrDelay, OriginStateName  ORDER BY LateAircraftDelay, ArrDelay, OriginStateName LIMIT 1","hsqls":["SELECT LateAircraftDelay, ArrDelay, OriginStateName, COUNT(*) FROM mytable WHERE FlightNum <= 5487 AND DestState BETWEEN 'IN' AND 'AZ' GROUP BY LateAircraftDelay, ArrDelay, OriginStateName  ORDER BY LateAircraftDelay, ArrDelay, OriginStateName LIMIT 1"]}
 {"sql":"SELECT CarrierDelay, Cancelled, MAX(AirlineID), COUNT(ArrDelayMinutes) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 GROUP BY CarrierDelay, Cancelled  ORDER BY CarrierDelay, Cancelled LIMIT 22","hsqls":["SELECT CarrierDelay, Cancelled, MAX(AirlineID), COUNT(ArrDelayMinutes) FROM mytable WHERE SecurityDelay BETWEEN 14 AND 4 GROUP BY CarrierDelay, Cancelled  ORDER BY CarrierDelay, Cancelled LIMIT 22"]}
 {"sql":"SELECT CancellationCode FROM mytable WHERE OriginAirportID > 13230 OR NASDelay IN (48, 20, 305) ORDER BY WeatherDelay LIMIT 22"}
-{"sql":"SELECT UniqueCarrier, MAX(DivActualElapsedTime), SUM(DepDelay), AVG(WheelsOff) FROM mytable WHERE \"Year\" <> 2014 GROUP BY UniqueCarrier LIMIT 26","hsqls":["SELECT UniqueCarrier, MAX(DivActualElapsedTime), SUM(DepDelay), AVG(WheelsOff) FROM mytable WHERE Year <> 2014 GROUP BY UniqueCarrier LIMIT 26"]}
+{"sql":"SELECT UniqueCarrier, MAX(DivActualElapsedTime), SUM(DepDelay), AVG(WheelsOff) FROM mytable WHERE \"Year\" <> 2014 GROUP BY UniqueCarrier LIMIT 26","hsqls":["SELECT UniqueCarrier, MAX(DivActualElapsedTime), SUM(DepDelay), AVG(WheelsOff) FROM mytable WHERE `Year` <> 2014 GROUP BY UniqueCarrier LIMIT 26"]}
 {"sql":"SELECT DestStateFips, NASDelay, DaysSinceEpoch FROM mytable WHERE WheelsOff NOT IN (833) OR ArrDelay = 201.0 ORDER BY OriginState, Distance, ArrivalDelayGroups LIMIT 29"}
-{"sql":"SELECT LongestAddGTime, DivTailNums, CancellationCode FROM mytable WHERE FlightDate BETWEEN '2014-01-22' AND '2014-01-03' LIMIT 23","hsqls":["SELECT LongestAddGTime, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, CancellationCode FROM mytable WHERE FlightDate BETWEEN '2014-01-22' AND '2014-01-03' LIMIT 10000"]}
-{"sql":"SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivTailNums BETWEEN 'N397DA' AND 'N940DN' LIMIT 5","hsqls":["SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND (DivTailNums__MV0 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV1 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV2 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV3 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV4 BETWEEN 'N397DA' AND 'N940DN') LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, DivTailNums, CancellationCode FROM mytable WHERE FlightDate BETWEEN '2014-01-22' AND '2014-01-03' LIMIT 23","hsqls":["SELECT LongestAddGTime, DivTailNums, CancellationCode FROM mytable WHERE FlightDate BETWEEN '2014-01-22' AND '2014-01-03' LIMIT 10000"]}
+{"sql":"SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivTailNums BETWEEN 'N397DA' AND 'N940DN' LIMIT 5","hsqls":["SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND (DivTailNums[1] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[2] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[3] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[4] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[5] BETWEEN 'N397DA' AND 'N940DN') LIMIT 10000"]}
 {"sql":"SELECT MAX(DestAirportSeqID), MAX(DestAirportID), MAX(DivReachedDest) FROM mytable WHERE DayofMonth BETWEEN 10 AND 16 OR TaxiIn BETWEEN 79 AND 42 LIMIT 29"}
 {"sql":"SELECT DepartureDelayGroups, CRSElapsedTime FROM mytable WHERE DestStateName = 'Iowa' AND TaxiIn NOT IN (109, 16, 73, 12) OR DestCityMarketID = 33214 ORDER BY DistanceGroup, WeatherDelay LIMIT 26"}
-{"sql":"SELECT Flights, DepTime, DivAirportIDs FROM mytable WHERE CarrierDelay NOT IN (182) OR Carrier NOT IN ('EV', 'US', 'VX') ORDER BY OriginCityName","hsqls":["SELECT Flights, DepTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE CarrierDelay NOT IN (182) OR Carrier NOT IN ('EV', 'US', 'VX') ORDER BY OriginCityName LIMIT 10000"]}
-{"sql":"SELECT FlightDate FROM mytable WHERE AirTime BETWEEN 256 AND 299 OR Flights BETWEEN 1 AND 1 AND DestAirportSeqID < 1106702 ORDER BY ArrTimeBlk, DestStateName, \"Month\" LIMIT 21","hsqls":["SELECT FlightDate FROM mytable WHERE AirTime BETWEEN 256 AND 299 OR Flights BETWEEN 1 AND 1 AND DestAirportSeqID < 1106702 ORDER BY ArrTimeBlk, DestStateName, Month LIMIT 21"]}
+{"sql":"SELECT Flights, DepTime, DivAirportIDs FROM mytable WHERE CarrierDelay NOT IN (182) OR Carrier NOT IN ('EV', 'US', 'VX') ORDER BY OriginCityName","hsqls":["SELECT Flights, DepTime, DivAirportIDs FROM mytable WHERE CarrierDelay NOT IN (182) OR Carrier NOT IN ('EV', 'US', 'VX') ORDER BY OriginCityName LIMIT 10000"]}
+{"sql":"SELECT FlightDate FROM mytable WHERE AirTime BETWEEN 256 AND 299 OR Flights BETWEEN 1 AND 1 AND DestAirportSeqID < 1106702 ORDER BY ArrTimeBlk, DestStateName, \"Month\" LIMIT 21","hsqls":["SELECT FlightDate FROM mytable WHERE AirTime BETWEEN 256 AND 299 OR Flights BETWEEN 1 AND 1 AND DestAirportSeqID < 1106702 ORDER BY ArrTimeBlk, DestStateName, `Month` LIMIT 21"]}
 {"sql":"SELECT Cancelled, COUNT(*) FROM mytable GROUP BY Cancelled  ORDER BY Cancelled LIMIT 17","hsqls":["SELECT Cancelled, COUNT(*) FROM mytable GROUP BY Cancelled  ORDER BY Cancelled LIMIT 17"]}
-{"sql":"SELECT Origin, DestAirportID, WheelsOn, SUM(WheelsOn) FROM mytable WHERE DivTailNums IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR ArrTime NOT IN (1020, 1317, 900) GROUP BY Origin, DestAirportID, WheelsOn LIMIT 20","hsqls":["SELECT Origin, DestAirportID, WheelsOn, SUM(WheelsOn) FROM mytable WHERE (DivTailNums__MV0 IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums__MV1 IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums__MV2 IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums__MV3 IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums__MV4 IN ('N630JB', 'N373JB', 'N622AW', 'N683BR')) OR ArrTime NOT IN (1020, 1317, 900) GROUP BY Origin, DestAirportID, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT Origin, DestAirportID, WheelsOn, SUM(WheelsOn) FROM mytable WHERE DivTailNums IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR ArrTime NOT IN (1020, 1317, 900) GROUP BY Origin, DestAirportID, WheelsOn LIMIT 20","hsqls":["SELECT Origin, DestAirportID, WheelsOn, SUM(WheelsOn) FROM mytable WHERE (DivTailNums[1] IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums[2] IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums[3] IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums[4] IN ('N630JB', 'N373JB', 'N622AW', 'N683BR') OR DivTailNums[5] IN ('N630JB', 'N373JB', 'N622AW', 'N683BR')) OR ArrTime NOT IN (1020, 1317, 900) GROUP BY Origin, DestAirportID, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DestCityName, UniqueCarrier FROM mytable WHERE DivAirportLandings BETWEEN 2 AND 9 ORDER BY OriginWac LIMIT 13"}
-{"sql":"SELECT DepDel15, Origin, SUM(LateAircraftDelay), SUM(\"Month\"), SUM(DestWac) FROM mytable WHERE OriginWac NOT IN (52, 62, 14) OR FirstDepTime IN (814, 2110, 721, 921) OR TaxiOut IN (113, 141) GROUP BY DepDel15, Origin LIMIT 11","hsqls":["SELECT DepDel15, Origin, SUM(LateAircraftDelay), SUM(Month), SUM(DestWac) FROM mytable WHERE OriginWac NOT IN (52, 62, 14) OR FirstDepTime IN (814, 2110, 721, 921) OR TaxiOut IN (113, 141) GROUP BY DepDel15, Origin LIMIT 11"]}
-{"sql":"SELECT ActualElapsedTime, ArrTimeBlk, OriginWac FROM mytable WHERE DaysSinceEpoch BETWEEN 16084 AND 16072 OR ArrTimeBlk > '1900-1959' ORDER BY FlightDate, DestAirportID, \"Month\" LIMIT 17","hsqls":["SELECT ActualElapsedTime, ArrTimeBlk, OriginWac FROM mytable WHERE DaysSinceEpoch BETWEEN 16084 AND 16072 OR ArrTimeBlk > '1900-1959' ORDER BY FlightDate, DestAirportID, Month LIMIT 17"]}
+{"sql":"SELECT DepDel15, Origin, SUM(LateAircraftDelay), SUM(\"Month\"), SUM(DestWac) FROM mytable WHERE OriginWac NOT IN (52, 62, 14) OR FirstDepTime IN (814, 2110, 721, 921) OR TaxiOut IN (113, 141) GROUP BY DepDel15, Origin LIMIT 11","hsqls":["SELECT DepDel15, Origin, SUM(LateAircraftDelay), SUM(`Month`), SUM(DestWac) FROM mytable WHERE OriginWac NOT IN (52, 62, 14) OR FirstDepTime IN (814, 2110, 721, 921) OR TaxiOut IN (113, 141) GROUP BY DepDel15, Origin LIMIT 11"]}
+{"sql":"SELECT ActualElapsedTime, ArrTimeBlk, OriginWac FROM mytable WHERE DaysSinceEpoch BETWEEN 16084 AND 16072 OR ArrTimeBlk > '1900-1959' ORDER BY FlightDate, DestAirportID, \"Month\" LIMIT 17","hsqls":["SELECT ActualElapsedTime, ArrTimeBlk, OriginWac FROM mytable WHERE DaysSinceEpoch BETWEEN 16084 AND 16072 OR ArrTimeBlk > '1900-1959' ORDER BY FlightDate, DestAirportID, `Month` LIMIT 17"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TaxiOut BETWEEN 10 AND 24 LIMIT 16"}
 {"sql":"SELECT Diverted, Dest, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 OR DayofMonth BETWEEN 7 AND 30 GROUP BY Diverted, Dest  ORDER BY Diverted, Dest LIMIT 14","hsqls":["SELECT Diverted, Dest, COUNT(*) FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 OR DayofMonth BETWEEN 7 AND 30 GROUP BY Diverted, Dest  ORDER BY Diverted, Dest LIMIT 14"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DivAirportSeqIDs IN (1448902, 1524903, 1129803, 1348602) OR OriginStateFips IN (49, 4, 36) ORDER BY CRSArrTime, ArrTime LIMIT 28","hsqls":["SELECT Year FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs__MV1 IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs__MV2 IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs__MV3 IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs__MV4 IN (1448902, 1524903, 1129803, 1348602)) OR OriginStateFips IN (49, 4, 36) ORDER BY CRSArrTime, ArrTime LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, DepTime, CRSElapsedTime, AVG(LongestAddGTime), MAX(Quarter), SUM(DivReachedDest) FROM mytable WHERE DivTotalGTimes IN (117, 94, 52, 85) GROUP BY WeatherDelay, DepTime, CRSElapsedTime LIMIT 16","hsqls":["SELECT WeatherDelay, DepTime, CRSElapsedTime, AVG(LongestAddGTime), MAX(Quarter), SUM(DivReachedDest) FROM mytable WHERE (DivTotalGTimes__MV0 IN (117, 94, 52, 85) OR DivTotalGTimes__MV1 IN (117, 94, 52, 85) OR DivTotalGTimes__MV2 IN (117, 94, 52, 85) OR DivTotalGTimes__MV3 IN (117, 94, 52, 85) OR DivTotalGTimes__MV4 IN (117, 94, 52, 85)) GROUP BY WeatherDelay, DepTime, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DivAirportSeqIDs IN (1448902, 1524903, 1129803, 1348602) OR OriginStateFips IN (49, 4, 36) ORDER BY CRSArrTime, ArrTime LIMIT 28","hsqls":["SELECT `Year` FROM mytable WHERE (DivAirportSeqIDs[1] IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs[2] IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs[3] IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs[4] IN (1448902, 1524903, 1129803, 1348602) OR DivAirportSeqIDs[5] IN (1448902, 1524903, 1129803, 1348602)) OR OriginStateFips IN (49, 4, 36) ORDER BY CRSArrTime, ArrTime LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, DepTime, CRSElapsedTime, AVG(LongestAddGTime), MAX(Quarter), SUM(DivReachedDest) FROM mytable WHERE DivTotalGTimes IN (117, 94, 52, 85) GROUP BY WeatherDelay, DepTime, CRSElapsedTime LIMIT 16","hsqls":["SELECT WeatherDelay, DepTime, CRSElapsedTime, AVG(LongestAddGTime), MAX(Quarter), SUM(DivReachedDest) FROM mytable WHERE (DivTotalGTimes[1] IN (117, 94, 52, 85) OR DivTotalGTimes[2] IN (117, 94, 52, 85) OR DivTotalGTimes[3] IN (117, 94, 52, 85) OR DivTotalGTimes[4] IN (117, 94, 52, 85) OR DivTotalGTimes[5] IN (117, 94, 52, 85)) GROUP BY WeatherDelay, DepTime, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT MIN(DaysSinceEpoch) FROM mytable LIMIT 23"}
 {"sql":"SELECT MIN(Quarter), SUM(DestAirportID), MIN(TaxiOut) FROM mytable WHERE DestState BETWEEN 'CT' AND 'SC' OR Origin IN ('SJU', 'MGM', 'ORF', 'STT', 'GSO') AND DestCityName NOT IN ('Valdosta, GA', 'San Antonio, TX', 'Alexandria, LA') LIMIT 10"}
-{"sql":"SELECT DivLongestGTimes, DestStateFips FROM mytable WHERE DestStateName > 'New Mexico' OR ArrDel15 BETWEEN -9999 AND 0 ORDER BY DivReachedDest LIMIT 19","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DestStateFips FROM mytable WHERE DestStateName > 'New Mexico' OR ArrDel15 BETWEEN -9999 AND 0 ORDER BY DivReachedDest LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DestStateFips FROM mytable WHERE DestStateName > 'New Mexico' OR ArrDel15 BETWEEN -9999 AND 0 ORDER BY DivReachedDest LIMIT 19","hsqls":["SELECT DivLongestGTimes, DestStateFips FROM mytable WHERE DestStateName > 'New Mexico' OR ArrDel15 BETWEEN -9999 AND 0 ORDER BY DivReachedDest LIMIT 10000"]}
 {"sql":"SELECT SUM(WeatherDelay), SUM(DestAirportSeqID) FROM mytable WHERE CRSElapsedTime BETWEEN 385 AND 116 LIMIT 6"}
 {"sql":"SELECT \"Year\", DepDel15 FROM mytable WHERE Flights <> 1 LIMIT 5","hsqls":["SELECT Year, DepDel15 FROM mytable WHERE Flights <> 1 LIMIT 5"]}
 {"sql":"SELECT TaxiOut, AirTime FROM mytable WHERE DepTime = 553 LIMIT 6"}
 {"sql":"SELECT WheelsOff, DivArrDelay, CRSElapsedTime, COUNT(DivAirportLandings) FROM mytable WHERE CarrierDelay NOT IN (280, 73) GROUP BY WheelsOff, DivArrDelay, CRSElapsedTime  ORDER BY WheelsOff, DivArrDelay, CRSElapsedTime LIMIT 12","hsqls":["SELECT WheelsOff, DivArrDelay, CRSElapsedTime, COUNT(DivAirportLandings) FROM mytable WHERE CarrierDelay NOT IN (280, 73) GROUP BY WheelsOff, DivArrDelay, CRSElapsedTime  ORDER BY WheelsOff, DivArrDelay, CRSElapsedTime LIMIT 12"]}
 {"sql":"SELECT NASDelay, DayofMonth, CRSDepTime, MIN(DepDelayMinutes), AVG(Diverted), AVG(DayofMonth) FROM mytable WHERE ArrDel15 > -9999 AND OriginCityName IN ('Champaign/Urbana, IL', 'Tyler, TX', 'Newport News/Williamsburg, VA', 'Peoria, IL', 'South Bend, IN') OR DepDelay <> 5.0 GROUP BY NASDelay, DayofMonth, CRSDepTime  ORDER BY NASDelay, DayofMonth, CRSDepTime LIMIT 16","hsqls":["SELECT NASDelay, DayofMonth, CRSDepTime, MIN(DepDelayMinutes), AVG(Diverted), AVG(DayofMonth) FROM mytable WHERE ArrDel15 > -9999 AND OriginCityName IN ('Champaign/Urbana, IL', 'Tyler, TX', 'Newport News/Williamsburg, VA', 'Peoria, IL', 'South Bend, IN') OR DepDelay <> 5.0 GROUP BY NASDelay, DayofMonth, CRSDepTime  ORDER BY NASDelay, DayofMonth, CRSDepTime LIMIT 16"]}
 {"sql":"SELECT CarrierDelay, WeatherDelay, OriginStateName FROM mytable ORDER BY Diverted"}
-{"sql":"SELECT DestWac, LongestAddGTime, WeatherDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DivLongestGTimes IN (36.0) AND DivWheelsOffs < 1849 ORDER BY LongestAddGTime, TailNum, Dest LIMIT 19","hsqls":["SELECT DestWac, LongestAddGTime, WeatherDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 AND (DivLongestGTimes__MV0 IN (36.0) OR DivLongestGTimes__MV1 IN (36.0) OR DivLongestGTimes__MV2 IN (36.0) OR DivLongestGTimes__MV3 IN (36.0) OR DivLongestGTimes__MV4 IN (36.0)) AND (DivWheelsOffs__MV0 < 1849 OR DivWheelsOffs__MV1 < 1849 OR DivWheelsOffs__MV2 < 1849 OR DivWheelsOffs__MV3 < 1849 OR DivWheelsOffs__MV4 < 1849) ORDER BY LongestAddGTime, TailNum, Dest LIMIT 10000"]}
+{"sql":"SELECT DestWac, LongestAddGTime, WeatherDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DivLongestGTimes IN (36.0) AND DivWheelsOffs < 1849 ORDER BY LongestAddGTime, TailNum, Dest LIMIT 19","hsqls":["SELECT DestWac, LongestAddGTime, WeatherDelay FROM mytable WHERE Flights BETWEEN 1 AND 1 AND (DivLongestGTimes[1] IN (36.0) OR DivLongestGTimes[2] IN (36.0) OR DivLongestGTimes[3] IN (36.0) OR DivLongestGTimes[4] IN (36.0) OR DivLongestGTimes[5] IN (36.0)) AND (DivWheelsOffs[1] < 1849 OR DivWheelsOffs[2] < 1849 OR DivWheelsOffs[3] < 1849 OR DivWheelsOffs[4] < 1849 OR DivWheelsOffs[5] < 1849) ORDER BY LongestAddGTime, TailNum, Dest LIMIT 10000"]}
 {"sql":"SELECT AirlineID, UniqueCarrier FROM mytable ORDER BY DepTimeBlk, DayOfWeek LIMIT 18"}
-{"sql":"SELECT FlightDate, ArrDelay, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1177502 AND 1498603 GROUP BY FlightDate, ArrDelay LIMIT 25","hsqls":["SELECT FlightDate, ArrDelay, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs__MV1 BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs__MV2 BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs__MV3 BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs__MV4 BETWEEN 1177502 AND 1498603) GROUP BY FlightDate, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT FlightDate, ArrDelay, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1177502 AND 1498603 GROUP BY FlightDate, ArrDelay LIMIT 25","hsqls":["SELECT FlightDate, ArrDelay, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs[2] BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs[3] BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs[4] BETWEEN 1177502 AND 1498603 OR DivAirportSeqIDs[5] BETWEEN 1177502 AND 1498603) GROUP BY FlightDate, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT SUM(ActualElapsedTime), COUNT(ArrDelay), MAX(ActualElapsedTime) FROM mytable WHERE DestCityMarketID IN (32884, 30070, 30466, 30868, 34696) OR Cancelled <= 1 OR Quarter BETWEEN 1 AND 1 LIMIT 26"}
 {"sql":"SELECT Quarter, CRSArrTime, DestStateFips FROM mytable WHERE CRSDepTime NOT IN (30) AND ArrDelay BETWEEN 176.0 AND 62.0 ORDER BY LongestAddGTime, DepDelayMinutes LIMIT 11"}
 {"sql":"SELECT OriginCityMarketID, CarrierDelay, AVG(DestAirportSeqID) FROM mytable GROUP BY OriginCityMarketID, CarrierDelay  ORDER BY OriginCityMarketID, CarrierDelay LIMIT 17","hsqls":["SELECT OriginCityMarketID, CarrierDelay, AVG(DestAirportSeqID) FROM mytable GROUP BY OriginCityMarketID, CarrierDelay  ORDER BY OriginCityMarketID, CarrierDelay LIMIT 17"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE TotalAddGTime >= 47 ORDER BY TaxiOut, DestWac LIMIT 27"}
-{"sql":"SELECT NASDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1251 AND 1025 GROUP BY NASDelay, DaysSinceEpoch LIMIT 16","hsqls":["SELECT NASDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1251 AND 1025 OR DivWheelsOffs__MV1 BETWEEN 1251 AND 1025 OR DivWheelsOffs__MV2 BETWEEN 1251 AND 1025 OR DivWheelsOffs__MV3 BETWEEN 1251 AND 1025 OR DivWheelsOffs__MV4 BETWEEN 1251 AND 1025) GROUP BY NASDelay, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT NASDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivWheelsOffs BETWEEN 1251 AND 1025 GROUP BY NASDelay, DaysSinceEpoch LIMIT 16","hsqls":["SELECT NASDelay, DaysSinceEpoch, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1251 AND 1025 OR DivWheelsOffs[2] BETWEEN 1251 AND 1025 OR DivWheelsOffs[3] BETWEEN 1251 AND 1025 OR DivWheelsOffs[4] BETWEEN 1251 AND 1025 OR DivWheelsOffs[5] BETWEEN 1251 AND 1025) GROUP BY NASDelay, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, ArrDel15, OriginWac FROM mytable ORDER BY WheelsOff, DivArrDelay LIMIT 8"}
 {"sql":"SELECT ArrDelay, WheelsOn, COUNT(*) FROM mytable WHERE DestStateName < 'Ohio' GROUP BY ArrDelay, WheelsOn  ORDER BY ArrDelay, WheelsOn LIMIT 23","hsqls":["SELECT ArrDelay, WheelsOn, COUNT(*) FROM mytable WHERE DestStateName < 'Ohio' GROUP BY ArrDelay, WheelsOn  ORDER BY ArrDelay, WheelsOn LIMIT 23"]}
 {"sql":"SELECT NASDelay FROM mytable WHERE SecurityDelay IN (8) ORDER BY FlightDate LIMIT 28"}
 {"sql":"SELECT AirlineID FROM mytable WHERE Diverted <> 0 OR DepTimeBlk BETWEEN '1300-1359' AND '0700-0759' OR OriginCityMarketID <> 30779 ORDER BY CancellationCode LIMIT 23"}
-{"sql":"SELECT OriginAirportSeqID, OriginState, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR AirTime BETWEEN 196 AND 252 GROUP BY OriginAirportSeqID, OriginState LIMIT 23","hsqls":["SELECT OriginAirportSeqID, OriginState, COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR AirTime BETWEEN 196 AND 252 GROUP BY OriginAirportSeqID, OriginState LIMIT 23"]}
+{"sql":"SELECT OriginAirportSeqID, OriginState, COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR AirTime BETWEEN 196 AND 252 GROUP BY OriginAirportSeqID, OriginState LIMIT 23","hsqls":["SELECT OriginAirportSeqID, OriginState, COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR AirTime BETWEEN 196 AND 252 GROUP BY OriginAirportSeqID, OriginState LIMIT 23"]}
 {"sql":"SELECT OriginStateFips, DayofMonth, ArrDelay, MIN(FirstDepTime) FROM mytable WHERE DestCityMarketID = 34262 GROUP BY OriginStateFips, DayofMonth, ArrDelay  ORDER BY OriginStateFips, DayofMonth, ArrDelay LIMIT 11","hsqls":["SELECT OriginStateFips, DayofMonth, ArrDelay, MIN(FirstDepTime) FROM mytable WHERE DestCityMarketID = 34262 GROUP BY OriginStateFips, DayofMonth, ArrDelay  ORDER BY OriginStateFips, DayofMonth, ArrDelay LIMIT 11"]}
 {"sql":"SELECT DivDistance, OriginWac FROM mytable WHERE NASDelay > 57 ORDER BY Dest, OriginAirportID LIMIT 24"}
 {"sql":"SELECT DepDelayMinutes, Origin, CRSDepTime FROM mytable ORDER BY DestState, Origin, WheelsOn LIMIT 28"}
 {"sql":"SELECT \"Year\", LateAircraftDelay, NASDelay FROM mytable WHERE CarrierDelay = 140 ORDER BY \"Year\", ActualElapsedTime LIMIT 12","hsqls":["SELECT Year, LateAircraftDelay, NASDelay FROM mytable WHERE CarrierDelay = 140 ORDER BY Year, ActualElapsedTime LIMIT 12"]}
 {"sql":"SELECT FirstDepTime, COUNT(*) FROM mytable WHERE OriginCityName >= 'Elmira/Corning, NY' GROUP BY FirstDepTime","hsqls":["SELECT FirstDepTime, COUNT(*) FROM mytable WHERE OriginCityName >= 'Elmira/Corning, NY' GROUP BY FirstDepTime"]}
 {"sql":"SELECT DepTimeBlk FROM mytable ORDER BY DivDistance, OriginCityMarketID, Distance LIMIT 25"}
-{"sql":"SELECT DestStateFips, COUNT(*) FROM mytable WHERE DivWheelsOns >= 2111 AND DayOfWeek IN (3, 4) AND OriginCityName BETWEEN 'Syracuse, NY' AND 'Kona, HI' GROUP BY DestStateFips LIMIT 17","hsqls":["SELECT DestStateFips, COUNT(*) FROM mytable WHERE (DivWheelsOns__MV0 >= 2111 OR DivWheelsOns__MV1 >= 2111 OR DivWheelsOns__MV2 >= 2111 OR DivWheelsOns__MV3 >= 2111 OR DivWheelsOns__MV4 >= 2111) AND DayOfWeek IN (3, 4) AND OriginCityName BETWEEN 'Syracuse, NY' AND 'Kona, HI' GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, COUNT(*) FROM mytable WHERE DivWheelsOns >= 2111 AND DayOfWeek IN (3, 4) AND OriginCityName BETWEEN 'Syracuse, NY' AND 'Kona, HI' GROUP BY DestStateFips LIMIT 17","hsqls":["SELECT DestStateFips, COUNT(*) FROM mytable WHERE (DivWheelsOns[1] >= 2111 OR DivWheelsOns[2] >= 2111 OR DivWheelsOns[3] >= 2111 OR DivWheelsOns[4] >= 2111 OR DivWheelsOns[5] >= 2111) AND DayOfWeek IN (3, 4) AND OriginCityName BETWEEN 'Syracuse, NY' AND 'Kona, HI' GROUP BY DestStateFips LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, ArrivalDelayGroups FROM mytable WHERE OriginAirportSeqID >= 1329002 AND DistanceGroup IN (2, 5, 9) ORDER BY WheelsOff, ArrTime LIMIT 14"}
 {"sql":"SELECT OriginState, Diverted, ArrDelayMinutes FROM mytable WHERE ArrivalDelayGroups IN (1, 10, 7, -2, 11) LIMIT 17"}
 {"sql":"SELECT DayofMonth FROM mytable WHERE OriginAirportID <= 10599 ORDER BY WheelsOn LIMIT 11"}
@@ -9056,74 +9056,74 @@
 {"sql":"SELECT OriginCityName, ArrTime, SUM(ArrDelayMinutes), MIN(Quarter), SUM(DayOfWeek) FROM mytable WHERE DaysSinceEpoch NOT IN (16076, 16078) AND DistanceGroup IN (5) GROUP BY OriginCityName, ArrTime  ORDER BY OriginCityName, ArrTime LIMIT 15","hsqls":["SELECT OriginCityName, ArrTime, SUM(ArrDelayMinutes), MIN(Quarter), SUM(DayOfWeek) FROM mytable WHERE DaysSinceEpoch NOT IN (16076, 16078) AND DistanceGroup IN (5) GROUP BY OriginCityName, ArrTime  ORDER BY OriginCityName, ArrTime LIMIT 15"]}
 {"sql":"SELECT FirstDepTime, DivAirportLandings, DivArrDelay, SUM(DepartureDelayGroups) FROM mytable GROUP BY FirstDepTime, DivAirportLandings, DivArrDelay  ORDER BY FirstDepTime, DivAirportLandings, DivArrDelay LIMIT 16","hsqls":["SELECT FirstDepTime, DivAirportLandings, DivArrDelay, SUM(DepartureDelayGroups) FROM mytable GROUP BY FirstDepTime, DivAirportLandings, DivArrDelay  ORDER BY FirstDepTime, DivAirportLandings, DivArrDelay LIMIT 16"]}
 {"sql":"SELECT TaxiOut FROM mytable ORDER BY DepTime LIMIT 23"}
-{"sql":"SELECT AVG(CRSDepTime), MAX(\"Month\") FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 LIMIT 14","hsqls":["SELECT AVG(CRSDepTime), MAX(Month) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 LIMIT 14"]}
+{"sql":"SELECT AVG(CRSDepTime), MAX(\"Month\") FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 LIMIT 14","hsqls":["SELECT AVG(CRSDepTime), MAX(`Month`) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 LIMIT 14"]}
 {"sql":"SELECT ArrTime, NASDelay, WheelsOn, COUNT(ArrDel15), MIN(OriginCityMarketID) FROM mytable GROUP BY ArrTime, NASDelay, WheelsOn  ORDER BY ArrTime, NASDelay, WheelsOn LIMIT 27","hsqls":["SELECT ArrTime, NASDelay, WheelsOn, COUNT(ArrDel15), MIN(OriginCityMarketID) FROM mytable GROUP BY ArrTime, NASDelay, WheelsOn  ORDER BY ArrTime, NASDelay, WheelsOn LIMIT 27"]}
 {"sql":"SELECT CRSDepTime FROM mytable WHERE FlightDate IN ('2014-01-04') LIMIT 21"}
 {"sql":"SELECT DestWac, DayofMonth FROM mytable WHERE ArrDel15 BETWEEN 1 AND 1 OR NASDelay = 109 LIMIT 3"}
 {"sql":"SELECT OriginCityMarketID, ActualElapsedTime, DestCityMarketID FROM mytable WHERE Origin IN ('JLN') OR AirlineID IN (20436, 20355) ORDER BY DestState, ArrTime, CRSElapsedTime LIMIT 19"}
 {"sql":"SELECT DepDel15 FROM mytable LIMIT 8"}
-{"sql":"SELECT DivAirportIDs, DivTotalGTimes FROM mytable ORDER BY Quarter, FirstDepTime LIMIT 9","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY Quarter, FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, DivTotalGTimes FROM mytable ORDER BY Quarter, FirstDepTime LIMIT 9","hsqls":["SELECT DivAirportIDs, DivTotalGTimes FROM mytable ORDER BY Quarter, FirstDepTime LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DayOfWeek, COUNT(*) FROM mytable WHERE SecurityDelay NOT IN (1, 0, 18, 27, -9999) AND WheelsOff IN (850) AND CancellationCode IN ('A', 'B', 'C', 'noodles') GROUP BY \"Year\", DayOfWeek LIMIT 22","hsqls":["SELECT Year, DayOfWeek, COUNT(*) FROM mytable WHERE SecurityDelay NOT IN (1, 0, 18, 27, -9999) AND WheelsOff IN (850) AND CancellationCode IN ('A', 'B', 'C', 'noodles') GROUP BY Year, DayOfWeek LIMIT 22"]}
 {"sql":"SELECT ActualElapsedTime, DestStateName, DivAirportLandings, SUM(DivReachedDest), COUNT(WheelsOff) FROM mytable GROUP BY ActualElapsedTime, DestStateName, DivAirportLandings  ORDER BY ActualElapsedTime, DestStateName, DivAirportLandings LIMIT 24","hsqls":["SELECT ActualElapsedTime, DestStateName, DivAirportLandings, SUM(DivReachedDest), COUNT(WheelsOff) FROM mytable GROUP BY ActualElapsedTime, DestStateName, DivAirportLandings  ORDER BY ActualElapsedTime, DestStateName, DivAirportLandings LIMIT 24"]}
 {"sql":"SELECT FirstDepTime FROM mytable WHERE TailNum >= 'N478WN' AND DivActualElapsedTime NOT IN (301, 193) OR AirTime IN (91, 188, 155, 118) ORDER BY Flights, AirTime LIMIT 16"}
-{"sql":"SELECT TaxiOut, CarrierDelay, ActualElapsedTime, COUNT(DivDistance), SUM(TaxiIn), MAX(DepDelay) FROM mytable WHERE DivTotalGTimes IN (78, 46, 87) GROUP BY TaxiOut, CarrierDelay, ActualElapsedTime LIMIT 11","hsqls":["SELECT TaxiOut, CarrierDelay, ActualElapsedTime, COUNT(DivDistance), SUM(TaxiIn), MAX(DepDelay) FROM mytable WHERE (DivTotalGTimes__MV0 IN (78, 46, 87) OR DivTotalGTimes__MV1 IN (78, 46, 87) OR DivTotalGTimes__MV2 IN (78, 46, 87) OR DivTotalGTimes__MV3 IN (78, 46, 87) OR DivTotalGTimes__MV4 IN (78, 46, 87)) GROUP BY TaxiOut, CarrierDelay, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, CarrierDelay, ActualElapsedTime, COUNT(DivDistance), SUM(TaxiIn), MAX(DepDelay) FROM mytable WHERE DivTotalGTimes IN (78, 46, 87) GROUP BY TaxiOut, CarrierDelay, ActualElapsedTime LIMIT 11","hsqls":["SELECT TaxiOut, CarrierDelay, ActualElapsedTime, COUNT(DivDistance), SUM(TaxiIn), MAX(DepDelay) FROM mytable WHERE (DivTotalGTimes[1] IN (78, 46, 87) OR DivTotalGTimes[2] IN (78, 46, 87) OR DivTotalGTimes[3] IN (78, 46, 87) OR DivTotalGTimes[4] IN (78, 46, 87) OR DivTotalGTimes[5] IN (78, 46, 87)) GROUP BY TaxiOut, CarrierDelay, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, DayofMonth FROM mytable WHERE LongestAddGTime IN (128, 42, 11) OR Cancelled BETWEEN 1 AND 1 OR Carrier NOT IN ('HA', 'AS') LIMIT 18"}
 {"sql":"SELECT TaxiOut FROM mytable WHERE Distance BETWEEN 4243 AND 1172 LIMIT 7"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState BETWEEN 'ME' AND 'WV' AND DestAirportID IN (14828) AND TotalAddGTime <= -9999 LIMIT 29"}
-{"sql":"SELECT DivLongestGTimes, LateAircraftDelay, CancellationCode FROM mytable WHERE DestCityName NOT IN ('Lubbock, TX', 'Melbourne, FL') OR WeatherDelay BETWEEN 55 AND 46 ORDER BY ActualElapsedTime LIMIT 20","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, LateAircraftDelay, CancellationCode FROM mytable WHERE DestCityName NOT IN ('Lubbock, TX', 'Melbourne, FL') OR WeatherDelay BETWEEN 55 AND 46 ORDER BY ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, LateAircraftDelay, CancellationCode FROM mytable WHERE DestCityName NOT IN ('Lubbock, TX', 'Melbourne, FL') OR WeatherDelay BETWEEN 55 AND 46 ORDER BY ActualElapsedTime LIMIT 20","hsqls":["SELECT DivLongestGTimes, LateAircraftDelay, CancellationCode FROM mytable WHERE DestCityName NOT IN ('Lubbock, TX', 'Melbourne, FL') OR WeatherDelay BETWEEN 55 AND 46 ORDER BY ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, ArrivalDelayGroups, COUNT(ArrTime) FROM mytable WHERE TailNum BETWEEN 'N785SK' AND 'N537UW' GROUP BY TaxiOut, ArrivalDelayGroups  ORDER BY TaxiOut, ArrivalDelayGroups LIMIT 21","hsqls":["SELECT TaxiOut, ArrivalDelayGroups, COUNT(ArrTime) FROM mytable WHERE TailNum BETWEEN 'N785SK' AND 'N537UW' GROUP BY TaxiOut, ArrivalDelayGroups  ORDER BY TaxiOut, ArrivalDelayGroups LIMIT 21"]}
 {"sql":"SELECT TaxiOut FROM mytable LIMIT 12"}
 {"sql":"SELECT DepDel15, ArrDelay FROM mytable WHERE DepTimeBlk BETWEEN '0700-0759' AND '1700-1759' AND CRSArrTime BETWEEN 903 AND 914 OR DepDel15 BETWEEN -9999 AND 1 ORDER BY DaysSinceEpoch LIMIT 2"}
 {"sql":"SELECT NASDelay, COUNT(Flights) FROM mytable WHERE DepartureDelayGroups BETWEEN 6 AND 4 AND DistanceGroup IN (2, 10, 7, 6, 8) GROUP BY NASDelay  ORDER BY NASDelay LIMIT 21","hsqls":["SELECT NASDelay, COUNT(Flights) FROM mytable WHERE DepartureDelayGroups BETWEEN 6 AND 4 AND DistanceGroup IN (2, 10, 7, 6, 8) GROUP BY NASDelay  ORDER BY NASDelay LIMIT 21"]}
 {"sql":"SELECT Origin, AirTime FROM mytable WHERE LongestAddGTime BETWEEN -9999 AND 5 AND OriginStateFips BETWEEN 37 AND 55 ORDER BY FlightDate, OriginAirportID LIMIT 18"}
-{"sql":"SELECT WheelsOff, OriginCityName, ArrTime, AVG(DepDel15), MIN(DivDistance), MIN(Cancelled) FROM mytable WHERE DivAirports < 'BOI' GROUP BY WheelsOff, OriginCityName, ArrTime LIMIT 21","hsqls":["SELECT WheelsOff, OriginCityName, ArrTime, AVG(DepDel15), MIN(DivDistance), MIN(Cancelled) FROM mytable WHERE (DivAirports__MV0 < 'BOI' OR DivAirports__MV1 < 'BOI' OR DivAirports__MV2 < 'BOI' OR DivAirports__MV3 < 'BOI' OR DivAirports__MV4 < 'BOI') GROUP BY WheelsOff, OriginCityName, ArrTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, OriginCityName, ArrTime, AVG(DepDel15), MIN(DivDistance), MIN(Cancelled) FROM mytable WHERE DivAirports < 'BOI' GROUP BY WheelsOff, OriginCityName, ArrTime LIMIT 21","hsqls":["SELECT WheelsOff, OriginCityName, ArrTime, AVG(DepDel15), MIN(DivDistance), MIN(Cancelled) FROM mytable WHERE (DivAirports[1] < 'BOI' OR DivAirports[2] < 'BOI' OR DivAirports[3] < 'BOI' OR DivAirports[4] < 'BOI' OR DivAirports[5] < 'BOI') GROUP BY WheelsOff, OriginCityName, ArrTime LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, DivDistance FROM mytable WHERE SecurityDelay BETWEEN 10 AND -9999 OR DayOfWeek BETWEEN 3 AND 7 OR ArrivalDelayGroups IN (-2, 5, 8) LIMIT 16"}
-{"sql":"SELECT \"Year\" FROM mytable ORDER BY TaxiIn LIMIT 28","hsqls":["SELECT Year FROM mytable ORDER BY TaxiIn LIMIT 28"]}
+{"sql":"SELECT \"Year\" FROM mytable ORDER BY TaxiIn LIMIT 28","hsqls":["SELECT `Year` FROM mytable ORDER BY TaxiIn LIMIT 28"]}
 {"sql":"SELECT DepTime, ArrDel15 FROM mytable ORDER BY ActualElapsedTime, WheelsOn LIMIT 10"}
 {"sql":"SELECT DestState, ArrDel15, OriginAirportID, MAX(DepDel15) FROM mytable GROUP BY DestState, ArrDel15, OriginAirportID  ORDER BY DestState, ArrDel15, OriginAirportID LIMIT 18","hsqls":["SELECT DestState, ArrDel15, OriginAirportID, MAX(DepDel15) FROM mytable GROUP BY DestState, ArrDel15, OriginAirportID  ORDER BY DestState, ArrDel15, OriginAirportID LIMIT 18"]}
 {"sql":"SELECT MAX(DaysSinceEpoch), SUM(DestStateFips) FROM mytable"}
 {"sql":"SELECT OriginCityName FROM mytable ORDER BY DivReachedDest, TailNum LIMIT 24"}
-{"sql":"SELECT DistanceGroup, Origin, SUM(TaxiIn), AVG(DepTime) FROM mytable WHERE DivAirportSeqIDs >= 1143302 GROUP BY DistanceGroup, Origin LIMIT 7","hsqls":["SELECT DistanceGroup, Origin, SUM(TaxiIn), AVG(DepTime) FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1143302 OR DivAirportSeqIDs__MV1 >= 1143302 OR DivAirportSeqIDs__MV2 >= 1143302 OR DivAirportSeqIDs__MV3 >= 1143302 OR DivAirportSeqIDs__MV4 >= 1143302) GROUP BY DistanceGroup, Origin LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, Origin, SUM(TaxiIn), AVG(DepTime) FROM mytable WHERE DivAirportSeqIDs >= 1143302 GROUP BY DistanceGroup, Origin LIMIT 7","hsqls":["SELECT DistanceGroup, Origin, SUM(TaxiIn), AVG(DepTime) FROM mytable WHERE (DivAirportSeqIDs[1] >= 1143302 OR DivAirportSeqIDs[2] >= 1143302 OR DivAirportSeqIDs[3] >= 1143302 OR DivAirportSeqIDs[4] >= 1143302 OR DivAirportSeqIDs[5] >= 1143302) GROUP BY DistanceGroup, Origin LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DepDelay IN (238.0, 51.0, 34.0, 218.0, 379.0) OR TailNum IN ('N823SK') LIMIT 10"}
-{"sql":"SELECT OriginState, \"Month\", OriginStateName, SUM(TaxiIn) FROM mytable WHERE \"Month\" <> 1 AND DivAirportLandings NOT IN (2) GROUP BY OriginState, \"Month\", OriginStateName LIMIT 24","hsqls":["SELECT OriginState, Month, OriginStateName, SUM(TaxiIn) FROM mytable WHERE Month <> 1 AND DivAirportLandings NOT IN (2) GROUP BY OriginState, Month, OriginStateName LIMIT 24"]}
+{"sql":"SELECT OriginState, \"Month\", OriginStateName, SUM(TaxiIn) FROM mytable WHERE \"Month\" <> 1 AND DivAirportLandings NOT IN (2) GROUP BY OriginState, \"Month\", OriginStateName LIMIT 24","hsqls":["SELECT OriginState, Month, OriginStateName, SUM(TaxiIn) FROM mytable WHERE `Month` <> 1 AND DivAirportLandings NOT IN (2) GROUP BY OriginState, Month, OriginStateName LIMIT 24"]}
 {"sql":"SELECT DistanceGroup, DestCityName, DestAirportID, MIN(DivActualElapsedTime), SUM(DepartureDelayGroups) FROM mytable GROUP BY DistanceGroup, DestCityName, DestAirportID  ORDER BY DistanceGroup, DestCityName, DestAirportID LIMIT 25","hsqls":["SELECT DistanceGroup, DestCityName, DestAirportID, MIN(DivActualElapsedTime), SUM(DepartureDelayGroups) FROM mytable GROUP BY DistanceGroup, DestCityName, DestAirportID  ORDER BY DistanceGroup, DestCityName, DestAirportID LIMIT 25"]}
 {"sql":"SELECT DivDistance, TaxiIn, MAX(LongestAddGTime), AVG(DaysSinceEpoch), MAX(ArrTime) FROM mytable GROUP BY DivDistance, TaxiIn  ORDER BY DivDistance, TaxiIn LIMIT 10","hsqls":["SELECT DivDistance, TaxiIn, MAX(LongestAddGTime), AVG(DaysSinceEpoch), MAX(ArrTime) FROM mytable GROUP BY DivDistance, TaxiIn  ORDER BY DivDistance, TaxiIn LIMIT 10"]}
 {"sql":"SELECT SUM(DepDelayMinutes), COUNT(OriginCityName), COUNT(DivAirportLandings) FROM mytable LIMIT 29"}
 {"sql":"SELECT DestAirportID FROM mytable WHERE ArrTime IN (1318, 2212, 2049) OR DepDelayMinutes < 93.0 ORDER BY OriginState, SecurityDelay, NASDelay LIMIT 19"}
 {"sql":"SELECT DepartureDelayGroups, DivDistance, COUNT(DestState) FROM mytable GROUP BY DepartureDelayGroups, DivDistance  ORDER BY DepartureDelayGroups, DivDistance LIMIT 10","hsqls":["SELECT DepartureDelayGroups, DivDistance, COUNT(DestState) FROM mytable GROUP BY DepartureDelayGroups, DivDistance  ORDER BY DepartureDelayGroups, DivDistance LIMIT 10"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Month\" = 1","hsqls":["SELECT COUNT(*) FROM mytable WHERE Month = 1"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Month\" = 1","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Month` = 1"]}
 {"sql":"SELECT MAX(CRSDepTime) FROM mytable WHERE DistanceGroup < 7 LIMIT 28"}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE DepartureDelayGroups IN (10, 7, -1) OR DepTimeBlk NOT IN ('2200-2259', '1100-1159', '0600-0659', '1900-1959') OR LateAircraftDelay BETWEEN 159 AND 221 ORDER BY TaxiOut LIMIT 26"}
 {"sql":"SELECT FlightNum, \"Month\", DayOfWeek, COUNT(*) FROM mytable WHERE FlightNum NOT IN (2960) GROUP BY FlightNum, \"Month\", DayOfWeek LIMIT 8","hsqls":["SELECT FlightNum, Month, DayOfWeek, COUNT(*) FROM mytable WHERE FlightNum NOT IN (2960) GROUP BY FlightNum, Month, DayOfWeek LIMIT 8"]}
 {"sql":"SELECT DestWac FROM mytable WHERE ArrDelayMinutes NOT IN (220.0, 197.0, 156.0) ORDER BY TaxiIn, DestCityName, CancellationCode LIMIT 20"}
 {"sql":"SELECT DivDistance, Distance, Cancelled, AVG(Diverted), SUM(DepartureDelayGroups) FROM mytable GROUP BY DivDistance, Distance, Cancelled  ORDER BY DivDistance, Distance, Cancelled LIMIT 17","hsqls":["SELECT DivDistance, Distance, Cancelled, AVG(Diverted), SUM(DepartureDelayGroups) FROM mytable GROUP BY DivDistance, Distance, Cancelled  ORDER BY DivDistance, Distance, Cancelled LIMIT 17"]}
-{"sql":"SELECT FirstDepTime, LateAircraftDelay, DivActualElapsedTime FROM mytable WHERE \"Year\" <= 2014 ORDER BY DestWac LIMIT 16","hsqls":["SELECT FirstDepTime, LateAircraftDelay, DivActualElapsedTime FROM mytable WHERE Year <= 2014 ORDER BY DestWac LIMIT 16"]}
+{"sql":"SELECT FirstDepTime, LateAircraftDelay, DivActualElapsedTime FROM mytable WHERE \"Year\" <= 2014 ORDER BY DestWac LIMIT 16","hsqls":["SELECT FirstDepTime, LateAircraftDelay, DivActualElapsedTime FROM mytable WHERE `Year` <= 2014 ORDER BY DestWac LIMIT 16"]}
 {"sql":"SELECT COUNT(Carrier), SUM(TaxiIn), AVG(OriginAirportID) FROM mytable LIMIT 29"}
 {"sql":"SELECT Origin FROM mytable WHERE NASDelay BETWEEN 15 AND 179 OR LateAircraftDelay IN (97, 78, 4, 106) AND CRSElapsedTime > 162 ORDER BY WheelsOff, FirstDepTime, TailNum LIMIT 12"}
 {"sql":"SELECT DivDistance, FlightDate, DepDel15 FROM mytable WHERE DivReachedDest BETWEEN 0 AND 0 OR DayOfWeek BETWEEN 7 AND 2 ORDER BY DepTimeBlk LIMIT 10"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestWac BETWEEN 1 AND 13 AND OriginState BETWEEN 'LA' AND 'CA' LIMIT 24"}
-{"sql":"SELECT DestState, Distance, OriginCityName FROM mytable WHERE \"Month\" <= 1 ORDER BY DepTime, DestStateName LIMIT 22","hsqls":["SELECT DestState, Distance, OriginCityName FROM mytable WHERE Month <= 1 ORDER BY DepTime, DestStateName LIMIT 22"]}
+{"sql":"SELECT DestState, Distance, OriginCityName FROM mytable WHERE \"Month\" <= 1 ORDER BY DepTime, DestStateName LIMIT 22","hsqls":["SELECT DestState, Distance, OriginCityName FROM mytable WHERE `Month` <= 1 ORDER BY DepTime, DestStateName LIMIT 22"]}
 {"sql":"SELECT OriginAirportSeqID, DestState, DestStateFips, SUM(ArrDelayMinutes), COUNT(ArrTime), MIN(DivAirportLandings) FROM mytable WHERE DepDelayMinutes <= 166.0 GROUP BY OriginAirportSeqID, DestState, DestStateFips  ORDER BY OriginAirportSeqID, DestState, DestStateFips LIMIT 3","hsqls":["SELECT OriginAirportSeqID, DestState, DestStateFips, SUM(ArrDelayMinutes), COUNT(ArrTime), MIN(DivAirportLandings) FROM mytable WHERE DepDelayMinutes <= 166.0 GROUP BY OriginAirportSeqID, DestState, DestStateFips  ORDER BY OriginAirportSeqID, DestState, DestStateFips LIMIT 3"]}
 {"sql":"SELECT WheelsOff, TailNum, Origin, COUNT(*) FROM mytable GROUP BY WheelsOff, TailNum, Origin  ORDER BY WheelsOff, TailNum, Origin LIMIT 25","hsqls":["SELECT WheelsOff, TailNum, Origin, COUNT(*) FROM mytable GROUP BY WheelsOff, TailNum, Origin  ORDER BY WheelsOff, TailNum, Origin LIMIT 25"]}
 {"sql":"SELECT FlightNum, DestStateFips, OriginWac FROM mytable ORDER BY CRSElapsedTime LIMIT 17"}
 {"sql":"SELECT ArrTime, OriginWac, UniqueCarrier, COUNT(OriginAirportSeqID), COUNT(NASDelay), SUM(DayofMonth) FROM mytable WHERE DestWac BETWEEN 85 AND 91 AND AirlineID <> 20437 AND ArrDelay BETWEEN 170.0 AND 120.0 GROUP BY ArrTime, OriginWac, UniqueCarrier  ORDER BY ArrTime, OriginWac, UniqueCarrier LIMIT 27","hsqls":["SELECT ArrTime, OriginWac, UniqueCarrier, COUNT(OriginAirportSeqID), COUNT(NASDelay), SUM(DayofMonth) FROM mytable WHERE DestWac BETWEEN 85 AND 91 AND AirlineID <> 20437 AND ArrDelay BETWEEN 170.0 AND 120.0 GROUP BY ArrTime, OriginWac, UniqueCarrier  ORDER BY ArrTime, OriginWac, UniqueCarrier LIMIT 27"]}
-{"sql":"SELECT DestAirportSeqID, AirTime, OriginStateName FROM mytable WHERE \"Year\" IN (2014) ORDER BY DestWac, OriginAirportID LIMIT 19","hsqls":["SELECT DestAirportSeqID, AirTime, OriginStateName FROM mytable WHERE Year IN (2014) ORDER BY DestWac, OriginAirportID LIMIT 19"]}
+{"sql":"SELECT DestAirportSeqID, AirTime, OriginStateName FROM mytable WHERE \"Year\" IN (2014) ORDER BY DestWac, OriginAirportID LIMIT 19","hsqls":["SELECT DestAirportSeqID, AirTime, OriginStateName FROM mytable WHERE `Year` IN (2014) ORDER BY DestWac, OriginAirportID LIMIT 19"]}
 {"sql":"SELECT OriginStateName FROM mytable WHERE Dest NOT IN ('GJT') AND DayOfWeek IN (2) ORDER BY DepDelay LIMIT 6"}
 {"sql":"SELECT DestStateFips, Origin, ArrivalDelayGroups, MIN(DayofMonth), MAX(ActualElapsedTime) FROM mytable WHERE CRSDepTime NOT IN (1539, 804, 2135) AND TaxiIn IN (49, 127, 44, 11) OR TotalAddGTime BETWEEN 60 AND 26 GROUP BY DestStateFips, Origin, ArrivalDelayGroups  ORDER BY DestStateFips, Origin, ArrivalDelayGroups LIMIT 26","hsqls":["SELECT DestStateFips, Origin, ArrivalDelayGroups, MIN(DayofMonth), MAX(ActualElapsedTime) FROM mytable WHERE CRSDepTime NOT IN (1539, 804, 2135) AND TaxiIn IN (49, 127, 44, 11) OR TotalAddGTime BETWEEN 60 AND 26 GROUP BY DestStateFips, Origin, ArrivalDelayGroups  ORDER BY DestStateFips, Origin, ArrivalDelayGroups LIMIT 26"]}
-{"sql":"SELECT CRSArrTime, DivAirportSeqIDs FROM mytable WHERE DestCityName BETWEEN 'Santa Maria, CA' AND 'Christiansted, VI' AND ArrDel15 BETWEEN 1 AND -9999 OR DepartureDelayGroups <= 11 ORDER BY DivReachedDest, CRSArrTime, DestAirportID LIMIT 23","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DestCityName BETWEEN 'Santa Maria, CA' AND 'Christiansted, VI' AND ArrDel15 BETWEEN 1 AND -9999 OR DepartureDelayGroups <= 11 ORDER BY DivReachedDest, CRSArrTime, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivAirportSeqIDs FROM mytable WHERE DestCityName BETWEEN 'Santa Maria, CA' AND 'Christiansted, VI' AND ArrDel15 BETWEEN 1 AND -9999 OR DepartureDelayGroups <= 11 ORDER BY DivReachedDest, CRSArrTime, DestAirportID LIMIT 23","hsqls":["SELECT CRSArrTime, DivAirportSeqIDs FROM mytable WHERE DestCityName BETWEEN 'Santa Maria, CA' AND 'Christiansted, VI' AND ArrDel15 BETWEEN 1 AND -9999 OR DepartureDelayGroups <= 11 ORDER BY DivReachedDest, CRSArrTime, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT MIN(DivActualElapsedTime), MAX(ArrDelay), AVG(DayOfWeek) FROM mytable LIMIT 17"}
 {"sql":"SELECT CRSArrTime, FlightDate FROM mytable WHERE OriginStateName IN ('Washington') AND OriginAirportID IN (12007, 12888, 12206, 11122, 10693) AND Diverted IN (1, 0) ORDER BY DepDelay, DestAirportSeqID LIMIT 21"}
 {"sql":"SELECT DepDelay, AVG(TotalAddGTime) FROM mytable WHERE OriginState NOT IN ('NM', 'IA', 'NE', 'FL', 'AL') GROUP BY DepDelay  ORDER BY DepDelay LIMIT 11","hsqls":["SELECT DepDelay, AVG(TotalAddGTime) FROM mytable WHERE OriginState NOT IN ('NM', 'IA', 'NE', 'FL', 'AL') GROUP BY DepDelay  ORDER BY DepDelay LIMIT 11"]}
 {"sql":"SELECT Carrier, TotalAddGTime, WheelsOn FROM mytable WHERE DepDel15 = 1 OR DepDelayMinutes BETWEEN 259.0 AND 5.0 LIMIT 21"}
-{"sql":"SELECT DivLongestGTimes, DivAirports, FlightNum FROM mytable WHERE ActualElapsedTime BETWEEN 132 AND 282 AND LateAircraftDelay BETWEEN 134 AND 194 ORDER BY TailNum, DestAirportID LIMIT 9","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, FlightNum FROM mytable WHERE ActualElapsedTime BETWEEN 132 AND 282 AND LateAircraftDelay BETWEEN 134 AND 194 ORDER BY TailNum, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivAirports, FlightNum FROM mytable WHERE ActualElapsedTime BETWEEN 132 AND 282 AND LateAircraftDelay BETWEEN 134 AND 194 ORDER BY TailNum, DestAirportID LIMIT 9","hsqls":["SELECT DivLongestGTimes, DivAirports, FlightNum FROM mytable WHERE ActualElapsedTime BETWEEN 132 AND 282 AND LateAircraftDelay BETWEEN 134 AND 194 ORDER BY TailNum, DestAirportID LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DestWac FROM mytable WHERE OriginState < 'WA' ORDER BY ArrivalDelayGroups LIMIT 3","hsqls":["SELECT Year, DestWac FROM mytable WHERE OriginState < 'WA' ORDER BY ArrivalDelayGroups LIMIT 3"]}
-{"sql":"SELECT \"Year\", AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName NOT IN ('Minnesota', 'Puerto Rico', 'Maryland', 'New York', 'Oregon') AND OriginCityMarketID BETWEEN 31895 AND 33195 AND ArrTimeBlk BETWEEN '1000-1059' AND '0001-0559' GROUP BY \"Year\" LIMIT 11","hsqls":["SELECT Year, AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName NOT IN ('Minnesota', 'Puerto Rico', 'Maryland', 'New York', 'Oregon') AND OriginCityMarketID BETWEEN 31895 AND 33195 AND ArrTimeBlk BETWEEN '1000-1059' AND '0001-0559' GROUP BY Year LIMIT 11"]}
+{"sql":"SELECT \"Year\", AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName NOT IN ('Minnesota', 'Puerto Rico', 'Maryland', 'New York', 'Oregon') AND OriginCityMarketID BETWEEN 31895 AND 33195 AND ArrTimeBlk BETWEEN '1000-1059' AND '0001-0559' GROUP BY \"Year\" LIMIT 11","hsqls":["SELECT Year, AVG(DivActualElapsedTime) FROM mytable WHERE OriginStateName NOT IN ('Minnesota', 'Puerto Rico', 'Maryland', 'New York', 'Oregon') AND OriginCityMarketID BETWEEN 31895 AND 33195 AND ArrTimeBlk BETWEEN '1000-1059' AND '0001-0559' GROUP BY `Year` LIMIT 11"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginAirportID = 12391 OR Cancelled BETWEEN 0 AND 0 LIMIT 12"}
 {"sql":"SELECT DistanceGroup, DestState, OriginCityMarketID FROM mytable WHERE FirstDepTime NOT IN (1745, 944, 1621) AND FlightDate IN ('2014-01-09', '2014-01-17', '2014-01-01', '2014-01-08') OR OriginStateFips BETWEEN 45 AND 9 ORDER BY DivDistance, CarrierDelay LIMIT 17"}
 {"sql":"SELECT COUNT(OriginWac) FROM mytable WHERE OriginAirportSeqID NOT IN (1150303, 1294503, 1219102, 1330303, 1393003) LIMIT 10"}
 {"sql":"SELECT OriginStateFips, WheelsOn FROM mytable WHERE TaxiIn NOT IN (2, 16, 13, 27, 37) ORDER BY TotalAddGTime, OriginWac, AirTime LIMIT 4"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled NOT IN (0) LIMIT 9"}
-{"sql":"SELECT MIN(DestWac), SUM(ArrivalDelayGroups), SUM(CRSArrTime) FROM mytable WHERE DivAirportIDs > 10713 LIMIT 20","hsqls":["SELECT MIN(DestWac), SUM(ArrivalDelayGroups), SUM(CRSArrTime)  FROM mytable WHERE (DivAirportIDs__MV0 > 10713 OR DivAirportIDs__MV1 > 10713 OR DivAirportIDs__MV2 > 10713 OR DivAirportIDs__MV3 > 10713 OR DivAirportIDs__MV4 > 10713) LIMIT 10000"]}
+{"sql":"SELECT MIN(DestWac), SUM(ArrivalDelayGroups), SUM(CRSArrTime) FROM mytable WHERE DivAirportIDs > 10713 LIMIT 20","hsqls":["SELECT MIN(DestWac), SUM(ArrivalDelayGroups), SUM(CRSArrTime)  FROM mytable WHERE (DivAirportIDs[1] > 10713 OR DivAirportIDs[2] > 10713 OR DivAirportIDs[3] > 10713 OR DivAirportIDs[4] > 10713 OR DivAirportIDs[5] > 10713) LIMIT 10000"]}
 {"sql":"SELECT Dest, AirlineID, DaysSinceEpoch FROM mytable WHERE OriginWac BETWEEN 13 AND 74 OR FirstDepTime < 640 ORDER BY DestAirportSeqID, DestStateName, DestAirportID LIMIT 10"}
 {"sql":"SELECT CarrierDelay, DestAirportID FROM mytable WHERE Origin BETWEEN 'PNS' AND 'PSE' ORDER BY \"Year\", DestWac LIMIT 24","hsqls":["SELECT CarrierDelay, DestAirportID FROM mytable WHERE Origin BETWEEN 'PNS' AND 'PSE' ORDER BY Year, DestWac LIMIT 24"]}
 {"sql":"SELECT OriginCityMarketID, DaysSinceEpoch FROM mytable ORDER BY DepDel15 LIMIT 4"}
@@ -9135,16 +9135,16 @@
 {"sql":"SELECT TaxiOut, ArrDel15, DepTimeBlk FROM mytable WHERE UniqueCarrier <= 'F9' OR DaysSinceEpoch IN (16080, 16084, 16073, 16075, 16088) ORDER BY DepDelay, OriginStateFips, DayOfWeek LIMIT 11"}
 {"sql":"SELECT LongestAddGTime, Flights, OriginAirportID, SUM(FlightNum) FROM mytable GROUP BY LongestAddGTime, Flights, OriginAirportID  ORDER BY LongestAddGTime, Flights, OriginAirportID LIMIT 28","hsqls":["SELECT LongestAddGTime, Flights, OriginAirportID, SUM(FlightNum) FROM mytable GROUP BY LongestAddGTime, Flights, OriginAirportID  ORDER BY LongestAddGTime, Flights, OriginAirportID LIMIT 28"]}
 {"sql":"SELECT DistanceGroup, DepDelayMinutes, AVG(WeatherDelay), COUNT(DepartureDelayGroups) FROM mytable WHERE DestAirportSeqID BETWEEN 1484202 AND 1457002 OR TailNum BETWEEN 'N710EV' AND 'N759EV' OR DestCityMarketID NOT IN (33792, 30562, 31977) GROUP BY DistanceGroup, DepDelayMinutes  ORDER BY DistanceGroup, DepDelayMinutes LIMIT 21","hsqls":["SELECT DistanceGroup, DepDelayMinutes, AVG(WeatherDelay), COUNT(DepartureDelayGroups) FROM mytable WHERE DestAirportSeqID BETWEEN 1484202 AND 1457002 OR TailNum BETWEEN 'N710EV' AND 'N759EV' OR DestCityMarketID NOT IN (33792, 30562, 31977) GROUP BY DistanceGroup, DepDelayMinutes  ORDER BY DistanceGroup, DepDelayMinutes LIMIT 21"]}
-{"sql":"SELECT DivWheelsOns, DivAirports FROM mytable WHERE FlightNum NOT IN (1764, 2002, 2042, 1928, 4579) LIMIT 16","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE FlightNum NOT IN (1764, 2002, 2042, 1928, 4579) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivAirports FROM mytable WHERE FlightNum NOT IN (1764, 2002, 2042, 1928, 4579) LIMIT 16","hsqls":["SELECT DivWheelsOns, DivAirports FROM mytable WHERE FlightNum NOT IN (1764, 2002, 2042, 1928, 4579) LIMIT 10000"]}
 {"sql":"SELECT DivAirportLandings FROM mytable WHERE ArrTimeBlk IN ('2200-2259', '1100-1159', '1400-1459') OR OriginAirportID IN (13184, 14986, 14814, 10739, 11721) ORDER BY TaxiOut, Cancelled LIMIT 29"}
-{"sql":"SELECT OriginState, MAX(CarrierDelay), COUNT(DepartureDelayGroups), AVG(Quarter) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND ArrTimeBlk BETWEEN '1700-1759' AND '1800-1859' AND NASDelay NOT IN (18) GROUP BY OriginState LIMIT 26","hsqls":["SELECT OriginState, MAX(CarrierDelay), COUNT(DepartureDelayGroups), AVG(Quarter) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND ArrTimeBlk BETWEEN '1700-1759' AND '1800-1859' AND NASDelay NOT IN (18) GROUP BY OriginState LIMIT 26"]}
-{"sql":"SELECT DestState, DepDelayMinutes, Distance, SUM(OriginWac), SUM(Quarter), MAX(DivAirportLandings) FROM mytable WHERE DivWheelsOns BETWEEN 2254 AND 1417 AND DaysSinceEpoch <> 16088 GROUP BY DestState, DepDelayMinutes, Distance LIMIT 16","hsqls":["SELECT DestState, DepDelayMinutes, Distance, SUM(OriginWac), SUM(Quarter), MAX(DivAirportLandings) FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 2254 AND 1417 OR DivWheelsOns__MV1 BETWEEN 2254 AND 1417 OR DivWheelsOns__MV2 BETWEEN 2254 AND 1417 OR DivWheelsOns__MV3 BETWEEN 2254 AND 1417 OR DivWheelsOns__MV4 BETWEEN 2254 AND 1417) AND DaysSinceEpoch <> 16088 GROUP BY DestState, DepDelayMinutes, Distance LIMIT 10000"]}
-{"sql":"SELECT DivAirports, OriginCityName FROM mytable WHERE DestStateFips > 25 OR FlightDate = '2014-01-22' ORDER BY OriginStateFips, DivDistance LIMIT 7","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityName FROM mytable WHERE DestStateFips > 25 OR FlightDate = '2014-01-22' ORDER BY OriginStateFips, DivDistance LIMIT 10000"]}
-{"sql":"SELECT Carrier, DivDistance FROM mytable WHERE DivLongestGTimes >= 22.0 AND ActualElapsedTime < 460 LIMIT 5","hsqls":["SELECT Carrier, DivDistance FROM mytable WHERE (DivLongestGTimes__MV0 >= 22.0 OR DivLongestGTimes__MV1 >= 22.0 OR DivLongestGTimes__MV2 >= 22.0 OR DivLongestGTimes__MV3 >= 22.0 OR DivLongestGTimes__MV4 >= 22.0) AND ActualElapsedTime < 460 LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes, UniqueCarrier, DivTotalGTimes FROM mytable WHERE CRSDepTime IN (1412, 1118) AND Carrier BETWEEN 'HA' AND 'F9' ORDER BY FirstDepTime, Dest, DestCityMarketID LIMIT 4","hsqls":["SELECT ArrDelayMinutes, UniqueCarrier, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE CRSDepTime IN (1412, 1118) AND Carrier BETWEEN 'HA' AND 'F9' ORDER BY FirstDepTime, Dest, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT OriginState, MAX(CarrierDelay), COUNT(DepartureDelayGroups), AVG(Quarter) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND ArrTimeBlk BETWEEN '1700-1759' AND '1800-1859' AND NASDelay NOT IN (18) GROUP BY OriginState LIMIT 26","hsqls":["SELECT OriginState, MAX(CarrierDelay), COUNT(DepartureDelayGroups), AVG(Quarter) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND ArrTimeBlk BETWEEN '1700-1759' AND '1800-1859' AND NASDelay NOT IN (18) GROUP BY OriginState LIMIT 26"]}
+{"sql":"SELECT DestState, DepDelayMinutes, Distance, SUM(OriginWac), SUM(Quarter), MAX(DivAirportLandings) FROM mytable WHERE DivWheelsOns BETWEEN 2254 AND 1417 AND DaysSinceEpoch <> 16088 GROUP BY DestState, DepDelayMinutes, Distance LIMIT 16","hsqls":["SELECT DestState, DepDelayMinutes, Distance, SUM(OriginWac), SUM(Quarter), MAX(DivAirportLandings) FROM mytable WHERE (DivWheelsOns[1] BETWEEN 2254 AND 1417 OR DivWheelsOns[2] BETWEEN 2254 AND 1417 OR DivWheelsOns[3] BETWEEN 2254 AND 1417 OR DivWheelsOns[4] BETWEEN 2254 AND 1417 OR DivWheelsOns[5] BETWEEN 2254 AND 1417) AND DaysSinceEpoch <> 16088 GROUP BY DestState, DepDelayMinutes, Distance LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityName FROM mytable WHERE DestStateFips > 25 OR FlightDate = '2014-01-22' ORDER BY OriginStateFips, DivDistance LIMIT 7","hsqls":["SELECT DivAirports, OriginCityName FROM mytable WHERE DestStateFips > 25 OR FlightDate = '2014-01-22' ORDER BY OriginStateFips, DivDistance LIMIT 10000"]}
+{"sql":"SELECT Carrier, DivDistance FROM mytable WHERE DivLongestGTimes >= 22.0 AND ActualElapsedTime < 460 LIMIT 5","hsqls":["SELECT Carrier, DivDistance FROM mytable WHERE (DivLongestGTimes[1] >= 22.0 OR DivLongestGTimes[2] >= 22.0 OR DivLongestGTimes[3] >= 22.0 OR DivLongestGTimes[4] >= 22.0 OR DivLongestGTimes[5] >= 22.0) AND ActualElapsedTime < 460 LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, UniqueCarrier, DivTotalGTimes FROM mytable WHERE CRSDepTime IN (1412, 1118) AND Carrier BETWEEN 'HA' AND 'F9' ORDER BY FirstDepTime, Dest, DestCityMarketID LIMIT 4","hsqls":["SELECT ArrDelayMinutes, UniqueCarrier, DivTotalGTimes FROM mytable WHERE CRSDepTime IN (1412, 1118) AND Carrier BETWEEN 'HA' AND 'F9' ORDER BY FirstDepTime, Dest, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT FlightNum, WheelsOn FROM mytable ORDER BY DestCityName LIMIT 18"}
-{"sql":"SELECT DistanceGroup, AirTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE OriginCityMarketID >= 33158 AND TaxiOut < 75 AND DivLongestGTimes IN (96.0, 26.0, 29.0) GROUP BY DistanceGroup, AirTime, DivActualElapsedTime LIMIT 21","hsqls":["SELECT DistanceGroup, AirTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE OriginCityMarketID >= 33158 AND TaxiOut < 75 AND (DivLongestGTimes__MV0 IN (96.0, 26.0, 29.0) OR DivLongestGTimes__MV1 IN (96.0, 26.0, 29.0) OR DivLongestGTimes__MV2 IN (96.0, 26.0, 29.0) OR DivLongestGTimes__MV3 IN (96.0, 26.0, 29.0) OR DivLongestGTimes__MV4 IN (96.0, 26.0, 29.0)) GROUP BY DistanceGroup, AirTime, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT MIN(CarrierDelay), SUM(DivActualElapsedTime) FROM mytable WHERE DivArrDelay = 72 AND DivTotalGTimes IN (116) LIMIT 24","hsqls":["SELECT MIN(CarrierDelay), SUM(DivActualElapsedTime)  FROM mytable WHERE DivArrDelay = 72 AND (DivTotalGTimes__MV0 IN (116) OR DivTotalGTimes__MV1 IN (116) OR DivTotalGTimes__MV2 IN (116) OR DivTotalGTimes__MV3 IN (116) OR DivTotalGTimes__MV4 IN (116)) LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, AirTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE OriginCityMarketID >= 33158 AND TaxiOut < 75 AND DivLongestGTimes IN (96.0, 26.0, 29.0) GROUP BY DistanceGroup, AirTime, DivActualElapsedTime LIMIT 21","hsqls":["SELECT DistanceGroup, AirTime, DivActualElapsedTime, COUNT(*) FROM mytable WHERE OriginCityMarketID >= 33158 AND TaxiOut < 75 AND (DivLongestGTimes[1] IN (96.0, 26.0, 29.0) OR DivLongestGTimes[2] IN (96.0, 26.0, 29.0) OR DivLongestGTimes[3] IN (96.0, 26.0, 29.0) OR DivLongestGTimes[4] IN (96.0, 26.0, 29.0) OR DivLongestGTimes[5] IN (96.0, 26.0, 29.0)) GROUP BY DistanceGroup, AirTime, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT MIN(CarrierDelay), SUM(DivActualElapsedTime) FROM mytable WHERE DivArrDelay = 72 AND DivTotalGTimes IN (116) LIMIT 24","hsqls":["SELECT MIN(CarrierDelay), SUM(DivActualElapsedTime)  FROM mytable WHERE DivArrDelay = 72 AND (DivTotalGTimes[1] IN (116) OR DivTotalGTimes[2] IN (116) OR DivTotalGTimes[3] IN (116) OR DivTotalGTimes[4] IN (116) OR DivTotalGTimes[5] IN (116)) LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, Flights FROM mytable WHERE DepDelayMinutes IN (75.0) ORDER BY WheelsOff LIMIT 23"}
 {"sql":"SELECT SecurityDelay, TotalAddGTime FROM mytable WHERE WheelsOn BETWEEN 953 AND 819 OR FirstDepTime NOT IN (908, 1153, 710, 1018, 1449) LIMIT 18"}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE ArrivalDelayGroups BETWEEN 2 AND 10 OR TotalAddGTime BETWEEN 25 AND 60 LIMIT 7"}
@@ -9153,20 +9153,20 @@
 {"sql":"SELECT TaxiOut, Origin FROM mytable WHERE CRSDepTime BETWEEN 1424 AND 954 LIMIT 29"}
 {"sql":"SELECT DepTimeBlk, UniqueCarrier, DayOfWeek, MAX(Distance) FROM mytable GROUP BY DepTimeBlk, UniqueCarrier, DayOfWeek  ORDER BY DepTimeBlk, UniqueCarrier, DayOfWeek LIMIT 20","hsqls":["SELECT DepTimeBlk, UniqueCarrier, DayOfWeek, MAX(Distance) FROM mytable GROUP BY DepTimeBlk, UniqueCarrier, DayOfWeek  ORDER BY DepTimeBlk, UniqueCarrier, DayOfWeek LIMIT 20"]}
 {"sql":"SELECT DestStateFips FROM mytable LIMIT 7"}
-{"sql":"SELECT UniqueCarrier, MAX(\"Year\"), COUNT(OriginState), AVG(OriginAirportID) FROM mytable GROUP BY UniqueCarrier LIMIT 16","hsqls":["SELECT UniqueCarrier, MAX(Year), COUNT(OriginState), AVG(OriginAirportID) FROM mytable GROUP BY UniqueCarrier LIMIT 16"]}
+{"sql":"SELECT UniqueCarrier, MAX(\"Year\"), COUNT(OriginState), AVG(OriginAirportID) FROM mytable GROUP BY UniqueCarrier LIMIT 16","hsqls":["SELECT UniqueCarrier, MAX(`Year`), COUNT(OriginState), AVG(OriginAirportID) FROM mytable GROUP BY UniqueCarrier LIMIT 16"]}
 {"sql":"SELECT DestAirportSeqID, NASDelay, COUNT(OriginCityMarketID) FROM mytable WHERE AirlineID IN (20409) GROUP BY DestAirportSeqID, NASDelay  ORDER BY DestAirportSeqID, NASDelay LIMIT 21","hsqls":["SELECT DestAirportSeqID, NASDelay, COUNT(OriginCityMarketID) FROM mytable WHERE AirlineID IN (20409) GROUP BY DestAirportSeqID, NASDelay  ORDER BY DestAirportSeqID, NASDelay LIMIT 21"]}
 {"sql":"SELECT DestCityMarketID, DivAirportLandings, CRSDepTime FROM mytable WHERE DepDelayMinutes NOT IN (121.0) AND DestStateFips NOT IN (2) OR NASDelay BETWEEN 38 AND 100 ORDER BY FlightDate LIMIT 6"}
-{"sql":"SELECT DivReachedDest, Diverted, DepTimeBlk, MAX(WheelsOn), MIN(AirlineID) FROM mytable WHERE DivAirportSeqIDs IN (1509602) AND DivAirportLandings IN (2, 1) GROUP BY DivReachedDest, Diverted, DepTimeBlk LIMIT 10","hsqls":["SELECT DivReachedDest, Diverted, DepTimeBlk, MAX(WheelsOn), MIN(AirlineID) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1509602) OR DivAirportSeqIDs__MV1 IN (1509602) OR DivAirportSeqIDs__MV2 IN (1509602) OR DivAirportSeqIDs__MV3 IN (1509602) OR DivAirportSeqIDs__MV4 IN (1509602)) AND DivAirportLandings IN (2, 1) GROUP BY DivReachedDest, Diverted, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT TailNum, CancellationCode, DivAirportLandings FROM mytable WHERE DivTailNums IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR OriginStateFips IN (44, 19, 32, 35, 38) ORDER BY Diverted, OriginWac, UniqueCarrier LIMIT 10","hsqls":["SELECT TailNum, CancellationCode, DivAirportLandings FROM mytable WHERE (DivTailNums__MV0 IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums__MV1 IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums__MV2 IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums__MV3 IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums__MV4 IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB')) OR OriginStateFips IN (44, 19, 32, 35, 38) ORDER BY Diverted, OriginWac, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest, Diverted, DepTimeBlk, MAX(WheelsOn), MIN(AirlineID) FROM mytable WHERE DivAirportSeqIDs IN (1509602) AND DivAirportLandings IN (2, 1) GROUP BY DivReachedDest, Diverted, DepTimeBlk LIMIT 10","hsqls":["SELECT DivReachedDest, Diverted, DepTimeBlk, MAX(WheelsOn), MIN(AirlineID) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1509602) OR DivAirportSeqIDs[2] IN (1509602) OR DivAirportSeqIDs[3] IN (1509602) OR DivAirportSeqIDs[4] IN (1509602) OR DivAirportSeqIDs[5] IN (1509602)) AND DivAirportLandings IN (2, 1) GROUP BY DivReachedDest, Diverted, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TailNum, CancellationCode, DivAirportLandings FROM mytable WHERE DivTailNums IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR OriginStateFips IN (44, 19, 32, 35, 38) ORDER BY Diverted, OriginWac, UniqueCarrier LIMIT 10","hsqls":["SELECT TailNum, CancellationCode, DivAirportLandings FROM mytable WHERE (DivTailNums[1] IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums[2] IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums[3] IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums[4] IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB') OR DivTailNums[5] IN ('N4WJAA', 'N3CGAA', 'N677MQ', 'N339JB', 'N712JB')) OR OriginStateFips IN (44, 19, 32, 35, 38) ORDER BY Diverted, OriginWac, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT Dest, COUNT(*) FROM mytable WHERE DaysSinceEpoch NOT IN (16084, 16083, 16079) GROUP BY Dest  ORDER BY Dest LIMIT 4","hsqls":["SELECT Dest, COUNT(*) FROM mytable WHERE DaysSinceEpoch NOT IN (16084, 16083, 16079) GROUP BY Dest  ORDER BY Dest LIMIT 4"]}
 {"sql":"SELECT \"Year\", TaxiIn FROM mytable ORDER BY WeatherDelay LIMIT 27","hsqls":["SELECT Year, TaxiIn FROM mytable ORDER BY WeatherDelay LIMIT 27"]}
-{"sql":"SELECT COUNT(Quarter), COUNT(ArrivalDelayGroups), AVG(FlightNum) FROM mytable WHERE DivTotalGTimes BETWEEN 25 AND 116 LIMIT 19","hsqls":["SELECT COUNT(Quarter), COUNT(ArrivalDelayGroups), AVG(FlightNum)  FROM mytable WHERE (DivTotalGTimes__MV0 BETWEEN 25 AND 116 OR DivTotalGTimes__MV1 BETWEEN 25 AND 116 OR DivTotalGTimes__MV2 BETWEEN 25 AND 116 OR DivTotalGTimes__MV3 BETWEEN 25 AND 116 OR DivTotalGTimes__MV4 BETWEEN 25 AND 116) LIMIT 10000"]}
-{"sql":"SELECT DepartureDelayGroups, DivAirportSeqIDs, ArrDelay FROM mytable WHERE DivAirportSeqIDs IN (1393003, 1323002) AND DivAirportIDs IN (12478) ORDER BY OriginCityName, NASDelay, DestAirportID LIMIT 4","hsqls":["SELECT DepartureDelayGroups, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrDelay FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1393003, 1323002) OR DivAirportSeqIDs__MV1 IN (1393003, 1323002) OR DivAirportSeqIDs__MV2 IN (1393003, 1323002) OR DivAirportSeqIDs__MV3 IN (1393003, 1323002) OR DivAirportSeqIDs__MV4 IN (1393003, 1323002)) AND (DivAirportIDs__MV0 IN (12478) OR DivAirportIDs__MV1 IN (12478) OR DivAirportIDs__MV2 IN (12478) OR DivAirportIDs__MV3 IN (12478) OR DivAirportIDs__MV4 IN (12478)) ORDER BY OriginCityName, NASDelay, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT Carrier, ArrDelayMinutes, DivAirportLandings, AVG(\"Month\"), MAX(WheelsOn), MIN(Quarter) FROM mytable GROUP BY Carrier, ArrDelayMinutes, DivAirportLandings LIMIT 29","hsqls":["SELECT Carrier, ArrDelayMinutes, DivAirportLandings, AVG(Month), MAX(WheelsOn), MIN(Quarter) FROM mytable GROUP BY Carrier, ArrDelayMinutes, DivAirportLandings LIMIT 29"]}
+{"sql":"SELECT COUNT(Quarter), COUNT(ArrivalDelayGroups), AVG(FlightNum) FROM mytable WHERE DivTotalGTimes BETWEEN 25 AND 116 LIMIT 19","hsqls":["SELECT COUNT(Quarter), COUNT(ArrivalDelayGroups), AVG(FlightNum)  FROM mytable WHERE (DivTotalGTimes[1] BETWEEN 25 AND 116 OR DivTotalGTimes[2] BETWEEN 25 AND 116 OR DivTotalGTimes[3] BETWEEN 25 AND 116 OR DivTotalGTimes[4] BETWEEN 25 AND 116 OR DivTotalGTimes[5] BETWEEN 25 AND 116) LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirportSeqIDs, ArrDelay FROM mytable WHERE DivAirportSeqIDs IN (1393003, 1323002) AND DivAirportIDs IN (12478) ORDER BY OriginCityName, NASDelay, DestAirportID LIMIT 4","hsqls":["SELECT DepartureDelayGroups, DivAirportSeqIDs, ArrDelay FROM mytable WHERE (DivAirportSeqIDs[1] IN (1393003, 1323002) OR DivAirportSeqIDs[2] IN (1393003, 1323002) OR DivAirportSeqIDs[3] IN (1393003, 1323002) OR DivAirportSeqIDs[4] IN (1393003, 1323002) OR DivAirportSeqIDs[5] IN (1393003, 1323002)) AND (DivAirportIDs[1] IN (12478) OR DivAirportIDs[2] IN (12478) OR DivAirportIDs[3] IN (12478) OR DivAirportIDs[4] IN (12478) OR DivAirportIDs[5] IN (12478)) ORDER BY OriginCityName, NASDelay, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT Carrier, ArrDelayMinutes, DivAirportLandings, AVG(\"Month\"), MAX(WheelsOn), MIN(Quarter) FROM mytable GROUP BY Carrier, ArrDelayMinutes, DivAirportLandings LIMIT 29","hsqls":["SELECT Carrier, ArrDelayMinutes, DivAirportLandings, AVG(`Month`), MAX(WheelsOn), MIN(Quarter) FROM mytable GROUP BY Carrier, ArrDelayMinutes, DivAirportLandings LIMIT 29"]}
 {"sql":"SELECT Diverted, OriginState, AirlineID, COUNT(FlightNum) FROM mytable GROUP BY Diverted, OriginState, AirlineID  ORDER BY Diverted, OriginState, AirlineID LIMIT 1","hsqls":["SELECT Diverted, OriginState, AirlineID, COUNT(FlightNum) FROM mytable GROUP BY Diverted, OriginState, AirlineID  ORDER BY Diverted, OriginState, AirlineID LIMIT 1"]}
-{"sql":"SELECT OriginWac FROM mytable WHERE DivLongestGTimes BETWEEN 85.0 AND 128.0 ORDER BY ArrTime, WheelsOn, CRSElapsedTime LIMIT 14","hsqls":["SELECT OriginWac FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 85.0 AND 128.0 OR DivLongestGTimes__MV1 BETWEEN 85.0 AND 128.0 OR DivLongestGTimes__MV2 BETWEEN 85.0 AND 128.0 OR DivLongestGTimes__MV3 BETWEEN 85.0 AND 128.0 OR DivLongestGTimes__MV4 BETWEEN 85.0 AND 128.0) ORDER BY ArrTime, WheelsOn, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginWac FROM mytable WHERE DivLongestGTimes BETWEEN 85.0 AND 128.0 ORDER BY ArrTime, WheelsOn, CRSElapsedTime LIMIT 14","hsqls":["SELECT OriginWac FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 85.0 AND 128.0 OR DivLongestGTimes[2] BETWEEN 85.0 AND 128.0 OR DivLongestGTimes[3] BETWEEN 85.0 AND 128.0 OR DivLongestGTimes[4] BETWEEN 85.0 AND 128.0 OR DivLongestGTimes[5] BETWEEN 85.0 AND 128.0) ORDER BY ArrTime, WheelsOn, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DepDelayMinutes, DivActualElapsedTime, COUNT(CRSDepTime) FROM mytable WHERE DestAirportID BETWEEN 10721 AND 15841 OR CRSArrTime >= 918 AND DistanceGroup NOT IN (10, 7, 6, 5) GROUP BY OriginAirportSeqID, DepDelayMinutes, DivActualElapsedTime  ORDER BY OriginAirportSeqID, DepDelayMinutes, DivActualElapsedTime LIMIT 29","hsqls":["SELECT OriginAirportSeqID, DepDelayMinutes, DivActualElapsedTime, COUNT(CRSDepTime) FROM mytable WHERE DestAirportID BETWEEN 10721 AND 15841 OR CRSArrTime >= 918 AND DistanceGroup NOT IN (10, 7, 6, 5) GROUP BY OriginAirportSeqID, DepDelayMinutes, DivActualElapsedTime  ORDER BY OriginAirportSeqID, DepDelayMinutes, DivActualElapsedTime LIMIT 29"]}
-{"sql":"SELECT MAX(FirstDepTime), COUNT(OriginWac) FROM mytable WHERE TaxiIn BETWEEN 59 AND 6 AND DivWheelsOns <= 1225 AND Origin >= 'BIS' LIMIT 8","hsqls":["SELECT MAX(FirstDepTime), COUNT(OriginWac)  FROM mytable WHERE TaxiIn BETWEEN 59 AND 6 AND (DivWheelsOns__MV0 <= 1225 OR DivWheelsOns__MV1 <= 1225 OR DivWheelsOns__MV2 <= 1225 OR DivWheelsOns__MV3 <= 1225 OR DivWheelsOns__MV4 <= 1225) AND Origin >= 'BIS' LIMIT 10000"]}
+{"sql":"SELECT MAX(FirstDepTime), COUNT(OriginWac) FROM mytable WHERE TaxiIn BETWEEN 59 AND 6 AND DivWheelsOns <= 1225 AND Origin >= 'BIS' LIMIT 8","hsqls":["SELECT MAX(FirstDepTime), COUNT(OriginWac)  FROM mytable WHERE TaxiIn BETWEEN 59 AND 6 AND (DivWheelsOns[1] <= 1225 OR DivWheelsOns[2] <= 1225 OR DivWheelsOns[3] <= 1225 OR DivWheelsOns[4] <= 1225 OR DivWheelsOns[5] <= 1225) AND Origin >= 'BIS' LIMIT 10000"]}
 {"sql":"SELECT MIN(OriginAirportID) FROM mytable LIMIT 27"}
 {"sql":"SELECT DestWac, DestCityName, UniqueCarrier, COUNT(*) FROM mytable WHERE LateAircraftDelay BETWEEN 15 AND 133 OR WheelsOff BETWEEN 2134 AND 1036 OR DivDistance <= 2556 GROUP BY DestWac, DestCityName, UniqueCarrier  ORDER BY DestWac, DestCityName, UniqueCarrier LIMIT 1","hsqls":["SELECT DestWac, DestCityName, UniqueCarrier, COUNT(*) FROM mytable WHERE LateAircraftDelay BETWEEN 15 AND 133 OR WheelsOff BETWEEN 2134 AND 1036 OR DivDistance <= 2556 GROUP BY DestWac, DestCityName, UniqueCarrier  ORDER BY DestWac, DestCityName, UniqueCarrier LIMIT 1"]}
 {"sql":"SELECT OriginStateFips, CarrierDelay, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivAirportLandings = 2 GROUP BY OriginStateFips, CarrierDelay, ArrivalDelayGroups  ORDER BY OriginStateFips, CarrierDelay, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT OriginStateFips, CarrierDelay, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DivAirportLandings = 2 GROUP BY OriginStateFips, CarrierDelay, ArrivalDelayGroups  ORDER BY OriginStateFips, CarrierDelay, ArrivalDelayGroups LIMIT 8"]}
@@ -9180,54 +9180,54 @@
 {"sql":"SELECT Flights FROM mytable ORDER BY LongestAddGTime, TaxiIn, TailNum LIMIT 16"}
 {"sql":"SELECT DistanceGroup FROM mytable WHERE WeatherDelay >= 0 OR ArrDelayMinutes IN (151.0) ORDER BY DepDelayMinutes, LongestAddGTime, OriginAirportID LIMIT 4"}
 {"sql":"SELECT \"Year\", TaxiIn, DestStateName FROM mytable ORDER BY TailNum","hsqls":["SELECT Year, TaxiIn, DestStateName FROM mytable ORDER BY TailNum"]}
-{"sql":"SELECT Cancelled FROM mytable WHERE DestWac <= 14 AND ArrTime IN (2329, 1417) OR DivTotalGTimes = 84 ORDER BY OriginCityMarketID, ActualElapsedTime, Origin LIMIT 21","hsqls":["SELECT Cancelled FROM mytable WHERE DestWac <= 14 AND ArrTime IN (2329, 1417) OR (DivTotalGTimes__MV0 = 84 OR DivTotalGTimes__MV1 = 84 OR DivTotalGTimes__MV2 = 84 OR DivTotalGTimes__MV3 = 84 OR DivTotalGTimes__MV4 = 84) ORDER BY OriginCityMarketID, ActualElapsedTime, Origin LIMIT 10000"]}
+{"sql":"SELECT Cancelled FROM mytable WHERE DestWac <= 14 AND ArrTime IN (2329, 1417) OR DivTotalGTimes = 84 ORDER BY OriginCityMarketID, ActualElapsedTime, Origin LIMIT 21","hsqls":["SELECT Cancelled FROM mytable WHERE DestWac <= 14 AND ArrTime IN (2329, 1417) OR (DivTotalGTimes[1] = 84 OR DivTotalGTimes[2] = 84 OR DivTotalGTimes[3] = 84 OR DivTotalGTimes[4] = 84 OR DivTotalGTimes[5] = 84) ORDER BY OriginCityMarketID, ActualElapsedTime, Origin LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DivActualElapsedTime, MAX(LateAircraftDelay) FROM mytable WHERE CarrierDelay IN (3, 117, 59, 102, 11) OR Carrier >= 'DL' GROUP BY WeatherDelay, DivActualElapsedTime  ORDER BY WeatherDelay, DivActualElapsedTime LIMIT 11","hsqls":["SELECT WeatherDelay, DivActualElapsedTime, MAX(LateAircraftDelay) FROM mytable WHERE CarrierDelay IN (3, 117, 59, 102, 11) OR Carrier >= 'DL' GROUP BY WeatherDelay, DivActualElapsedTime  ORDER BY WeatherDelay, DivActualElapsedTime LIMIT 11"]}
 {"sql":"SELECT Carrier, DestAirportSeqID, WheelsOn FROM mytable WHERE AirTime BETWEEN 132 AND 26 ORDER BY Flights, ArrTime, Dest LIMIT 3"}
 {"sql":"SELECT Carrier FROM mytable WHERE ArrDelayMinutes >= 327.0 OR WheelsOff >= 2106 ORDER BY AirTime LIMIT 26"}
 {"sql":"SELECT DestWac, COUNT(*) FROM mytable GROUP BY DestWac","hsqls":["SELECT DestWac, COUNT(*) FROM mytable GROUP BY DestWac"]}
-{"sql":"SELECT \"Year\", DepTime, DivTotalGTimes FROM mytable WHERE ArrDelay IN (246.0, 176.0) OR Distance < 740 ORDER BY \"Year\", OriginState, DestCityName LIMIT 29","hsqls":["SELECT Year, DepTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE ArrDelay IN (246.0, 176.0) OR Distance < 740 ORDER BY Year, OriginState, DestCityName LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DepTime, DivTotalGTimes FROM mytable WHERE ArrDelay IN (246.0, 176.0) OR Distance < 740 ORDER BY \"Year\", OriginState, DestCityName LIMIT 29","hsqls":["SELECT Year, DepTime, DivTotalGTimes FROM mytable WHERE ArrDelay IN (246.0, 176.0) OR Distance < 740 ORDER BY Year, OriginState, DestCityName LIMIT 10000"]}
 {"sql":"SELECT CRSDepTime, COUNT(*) FROM mytable WHERE Origin NOT IN ('SNA') OR OriginAirportID <> 10868 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 16","hsqls":["SELECT CRSDepTime, COUNT(*) FROM mytable WHERE Origin NOT IN ('SNA') OR OriginAirportID <> 10868 GROUP BY CRSDepTime  ORDER BY CRSDepTime LIMIT 16"]}
 {"sql":"SELECT FlightNum, ArrDelayMinutes, DayOfWeek FROM mytable WHERE DestCityName = 'Gillette, WY' AND OriginStateFips <> 16 OR DepTimeBlk IN ('1200-1259', '1400-1459') ORDER BY Diverted LIMIT 5"}
 {"sql":"SELECT FlightDate, CancellationCode, OriginAirportID, MAX(DepTime), MIN(DivDistance) FROM mytable GROUP BY FlightDate, CancellationCode, OriginAirportID  ORDER BY FlightDate, CancellationCode, OriginAirportID LIMIT 10","hsqls":["SELECT FlightDate, CancellationCode, OriginAirportID, MAX(DepTime), MIN(DivDistance) FROM mytable GROUP BY FlightDate, CancellationCode, OriginAirportID  ORDER BY FlightDate, CancellationCode, OriginAirportID LIMIT 10"]}
-{"sql":"SELECT Diverted FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 18","hsqls":["SELECT Diverted FROM mytable WHERE Year BETWEEN 2014 AND 2014 LIMIT 18"]}
+{"sql":"SELECT Diverted FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 LIMIT 18","hsqls":["SELECT Diverted FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 LIMIT 18"]}
 {"sql":"SELECT LateAircraftDelay, Origin FROM mytable WHERE Quarter NOT IN (1) LIMIT 11"}
-{"sql":"SELECT DepartureDelayGroups, Diverted, CRSArrTime FROM mytable WHERE \"Year\" < 2014 ORDER BY ArrDelayMinutes LIMIT 4","hsqls":["SELECT DepartureDelayGroups, Diverted, CRSArrTime FROM mytable WHERE Year < 2014 ORDER BY ArrDelayMinutes LIMIT 4"]}
-{"sql":"SELECT DivWheelsOffs, Origin FROM mytable WHERE DivTailNums IN ('N413SW', 'N248WN', 'N983DL') OR ArrDelay BETWEEN 28.0 AND 184.0 ORDER BY DestStateFips, ArrTime LIMIT 11","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, Origin FROM mytable WHERE (DivTailNums__MV0 IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums__MV1 IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums__MV2 IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums__MV3 IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums__MV4 IN ('N413SW', 'N248WN', 'N983DL')) OR ArrDelay BETWEEN 28.0 AND 184.0 ORDER BY DestStateFips, ArrTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, Diverted, CRSArrTime FROM mytable WHERE \"Year\" < 2014 ORDER BY ArrDelayMinutes LIMIT 4","hsqls":["SELECT DepartureDelayGroups, Diverted, CRSArrTime FROM mytable WHERE `Year` < 2014 ORDER BY ArrDelayMinutes LIMIT 4"]}
+{"sql":"SELECT DivWheelsOffs, Origin FROM mytable WHERE DivTailNums IN ('N413SW', 'N248WN', 'N983DL') OR ArrDelay BETWEEN 28.0 AND 184.0 ORDER BY DestStateFips, ArrTime LIMIT 11","hsqls":["SELECT DivWheelsOffs, Origin FROM mytable WHERE (DivTailNums[1] IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums[2] IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums[3] IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums[4] IN ('N413SW', 'N248WN', 'N983DL') OR DivTailNums[5] IN ('N413SW', 'N248WN', 'N983DL')) OR ArrDelay BETWEEN 28.0 AND 184.0 ORDER BY DestStateFips, ArrTime LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, ArrDel15, UniqueCarrier FROM mytable WHERE DayOfWeek NOT IN (3, 2, 1, 6) AND OriginWac < 34 AND DepDelayMinutes BETWEEN 155.0 AND 310.0 ORDER BY Dest, DestCityName, DivAirportLandings LIMIT 12"}
 {"sql":"SELECT DivReachedDest, DistanceGroup, LongestAddGTime FROM mytable WHERE DestStateFips IN (20, 17, 51, 8, 39) AND WheelsOff <> 923 ORDER BY DepartureDelayGroups, FirstDepTime, DivAirportLandings"}
 {"sql":"SELECT DestState FROM mytable WHERE Dest <= 'CLL' AND ActualElapsedTime IN (278, 218, 103, 60, 360) AND DivActualElapsedTime BETWEEN 383 AND 291 ORDER BY CRSArrTime, ArrTime LIMIT 16"}
 {"sql":"SELECT Carrier, WeatherDelay, SUM(CRSElapsedTime) FROM mytable WHERE DayOfWeek <> 3 GROUP BY Carrier, WeatherDelay  ORDER BY Carrier, WeatherDelay LIMIT 19","hsqls":["SELECT Carrier, WeatherDelay, SUM(CRSElapsedTime) FROM mytable WHERE DayOfWeek <> 3 GROUP BY Carrier, WeatherDelay  ORDER BY Carrier, WeatherDelay LIMIT 19"]}
 {"sql":"SELECT DepartureDelayGroups, ArrivalDelayGroups, CRSElapsedTime, COUNT(AirlineID), MAX(DepDelay) FROM mytable WHERE Carrier IN ('WN', 'AA', 'VX') GROUP BY DepartureDelayGroups, ArrivalDelayGroups, CRSElapsedTime  ORDER BY DepartureDelayGroups, ArrivalDelayGroups, CRSElapsedTime LIMIT 4","hsqls":["SELECT DepartureDelayGroups, ArrivalDelayGroups, CRSElapsedTime, COUNT(AirlineID), MAX(DepDelay) FROM mytable WHERE Carrier IN ('WN', 'AA', 'VX') GROUP BY DepartureDelayGroups, ArrivalDelayGroups, CRSElapsedTime  ORDER BY DepartureDelayGroups, ArrivalDelayGroups, CRSElapsedTime LIMIT 4"]}
-{"sql":"SELECT FlightDate, SUM(DepTime), AVG(ArrDelay) FROM mytable WHERE DivAirportIDs < 15096 OR OriginCityMarketID IN (35323, 30073, 30781, 30739) AND DestCityMarketID = 31481 GROUP BY FlightDate LIMIT 21","hsqls":["SELECT FlightDate, SUM(DepTime), AVG(ArrDelay) FROM mytable WHERE (DivAirportIDs__MV0 < 15096 OR DivAirportIDs__MV1 < 15096 OR DivAirportIDs__MV2 < 15096 OR DivAirportIDs__MV3 < 15096 OR DivAirportIDs__MV4 < 15096) OR OriginCityMarketID IN (35323, 30073, 30781, 30739) AND DestCityMarketID = 31481 GROUP BY FlightDate LIMIT 10000"]}
-{"sql":"SELECT DestState, MAX(\"Year\"), SUM(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE CancellationCode = 'B' OR OriginWac >= 73 AND TailNum NOT IN ('N564UW', 'N822AW', 'N839AS', 'N962SW', 'N3EWAA') GROUP BY DestState LIMIT 26","hsqls":["SELECT DestState, MAX(Year), SUM(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE CancellationCode = 'B' OR OriginWac >= 73 AND TailNum NOT IN ('N564UW', 'N822AW', 'N839AS', 'N962SW', 'N3EWAA') GROUP BY DestState LIMIT 26"]}
-{"sql":"SELECT DivWheelsOns, LongestAddGTime, ArrTimeBlk FROM mytable LIMIT 16","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LongestAddGTime, ArrTimeBlk FROM mytable LIMIT 10000"]}
-{"sql":"SELECT \"Year\", MAX(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay IN (278, 31) OR NASDelay > 106 GROUP BY \"Year\" LIMIT 5","hsqls":["SELECT Year, MAX(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay IN (278, 31) OR NASDelay > 106 GROUP BY Year LIMIT 5"]}
-{"sql":"SELECT FlightDate, DivAirportSeqIDs, ArrDelayMinutes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'WN' ORDER BY WheelsOff, OriginCityName, AirlineID LIMIT 23","hsqls":["SELECT FlightDate, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrDelayMinutes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'WN' ORDER BY WheelsOff, OriginCityName, AirlineID LIMIT 10000"]}
+{"sql":"SELECT FlightDate, SUM(DepTime), AVG(ArrDelay) FROM mytable WHERE DivAirportIDs < 15096 OR OriginCityMarketID IN (35323, 30073, 30781, 30739) AND DestCityMarketID = 31481 GROUP BY FlightDate LIMIT 21","hsqls":["SELECT FlightDate, SUM(DepTime), AVG(ArrDelay) FROM mytable WHERE (DivAirportIDs[1] < 15096 OR DivAirportIDs[2] < 15096 OR DivAirportIDs[3] < 15096 OR DivAirportIDs[4] < 15096 OR DivAirportIDs[5] < 15096) OR OriginCityMarketID IN (35323, 30073, 30781, 30739) AND DestCityMarketID = 31481 GROUP BY FlightDate LIMIT 10000"]}
+{"sql":"SELECT DestState, MAX(\"Year\"), SUM(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE CancellationCode = 'B' OR OriginWac >= 73 AND TailNum NOT IN ('N564UW', 'N822AW', 'N839AS', 'N962SW', 'N3EWAA') GROUP BY DestState LIMIT 26","hsqls":["SELECT DestState, MAX(`Year`), SUM(DivReachedDest), MAX(TaxiOut) FROM mytable WHERE CancellationCode = 'B' OR OriginWac >= 73 AND TailNum NOT IN ('N564UW', 'N822AW', 'N839AS', 'N962SW', 'N3EWAA') GROUP BY DestState LIMIT 26"]}
+{"sql":"SELECT DivWheelsOns, LongestAddGTime, ArrTimeBlk FROM mytable LIMIT 16","hsqls":["SELECT DivWheelsOns, LongestAddGTime, ArrTimeBlk FROM mytable LIMIT 10000"]}
+{"sql":"SELECT \"Year\", MAX(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay IN (278, 31) OR NASDelay > 106 GROUP BY \"Year\" LIMIT 5","hsqls":["SELECT Year, MAX(DivActualElapsedTime) FROM mytable WHERE LateAircraftDelay IN (278, 31) OR NASDelay > 106 GROUP BY `Year` LIMIT 5"]}
+{"sql":"SELECT FlightDate, DivAirportSeqIDs, ArrDelayMinutes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'WN' ORDER BY WheelsOff, OriginCityName, AirlineID LIMIT 23","hsqls":["SELECT FlightDate, DivAirportSeqIDs, ArrDelayMinutes FROM mytable WHERE UniqueCarrier BETWEEN 'VX' AND 'WN' ORDER BY WheelsOff, OriginCityName, AirlineID LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10781 AND 13433 OR Distance NOT IN (1205, 1855, 1660, 247) LIMIT 25"}
-{"sql":"SELECT SUM(\"Year\"), AVG(OriginStateFips) FROM mytable LIMIT 24","hsqls":["SELECT SUM(Year), AVG(OriginStateFips) FROM mytable LIMIT 24"]}
+{"sql":"SELECT SUM(\"Year\"), AVG(OriginStateFips) FROM mytable LIMIT 24","hsqls":["SELECT SUM(`Year`), AVG(OriginStateFips) FROM mytable LIMIT 24"]}
 {"sql":"SELECT WheelsOff, CancellationCode, CRSDepTime, SUM(DaysSinceEpoch), MAX(DepDelay) FROM mytable WHERE OriginCityMarketID BETWEEN 31504 AND 33933 AND FlightNum < 6326 GROUP BY WheelsOff, CancellationCode, CRSDepTime  ORDER BY WheelsOff, CancellationCode, CRSDepTime LIMIT 28","hsqls":["SELECT WheelsOff, CancellationCode, CRSDepTime, SUM(DaysSinceEpoch), MAX(DepDelay) FROM mytable WHERE OriginCityMarketID BETWEEN 31504 AND 33933 AND FlightNum < 6326 GROUP BY WheelsOff, CancellationCode, CRSDepTime  ORDER BY WheelsOff, CancellationCode, CRSDepTime LIMIT 28"]}
 {"sql":"SELECT Flights, TailNum, OriginWac FROM mytable LIMIT 9"}
 {"sql":"SELECT MIN(ArrTime), SUM(OriginStateFips) FROM mytable WHERE FirstDepTime NOT IN (2009, 1957, 550) AND DayofMonth <> 2 AND OriginState NOT IN ('IA', 'NY', 'RI', 'MD') LIMIT 11"}
 {"sql":"SELECT DestStateFips, DestAirportID FROM mytable WHERE DivAirportLandings NOT IN (1) ORDER BY CRSArrTime, ArrDelayMinutes LIMIT 16"}
 {"sql":"SELECT DivReachedDest, ArrivalDelayGroups, MAX(TaxiIn), AVG(OriginStateFips) FROM mytable GROUP BY DivReachedDest, ArrivalDelayGroups  ORDER BY DivReachedDest, ArrivalDelayGroups LIMIT 15","hsqls":["SELECT DivReachedDest, ArrivalDelayGroups, MAX(TaxiIn), AVG(OriginStateFips) FROM mytable GROUP BY DivReachedDest, ArrivalDelayGroups  ORDER BY DivReachedDest, ArrivalDelayGroups LIMIT 15"]}
 {"sql":"SELECT DestCityName, DayOfWeek FROM mytable WHERE OriginAirportID BETWEEN 14696 AND 14633 AND UniqueCarrier = 'VX' ORDER BY DepTime, OriginAirportID LIMIT 6"}
-{"sql":"SELECT DivWheelsOns, DivAirportLandings, DivActualElapsedTime FROM mytable WHERE TailNum IN ('N551AA', 'N3HNAA', 'N376SW') ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 8","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DivAirportLandings, DivActualElapsedTime FROM mytable WHERE TailNum IN ('N551AA', 'N3HNAA', 'N376SW') ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DivAirportLandings, DivActualElapsedTime FROM mytable WHERE TailNum IN ('N551AA', 'N3HNAA', 'N376SW') ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 8","hsqls":["SELECT DivWheelsOns, DivAirportLandings, DivActualElapsedTime FROM mytable WHERE TailNum IN ('N551AA', 'N3HNAA', 'N376SW') ORDER BY SecurityDelay, ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT MIN(ArrTime), SUM(OriginStateFips) FROM mytable LIMIT 21"}
-{"sql":"SELECT DepTimeBlk, Origin, DestAirportID, AVG(\"Month\"), MAX(DestStateFips) FROM mytable WHERE ArrDelayMinutes > 364.0 GROUP BY DepTimeBlk, Origin, DestAirportID","hsqls":["SELECT DepTimeBlk, Origin, DestAirportID, AVG(Month), MAX(DestStateFips) FROM mytable WHERE ArrDelayMinutes > 364.0 GROUP BY DepTimeBlk, Origin, DestAirportID"]}
-{"sql":"SELECT DistanceGroup, Flights, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (328, 266) OR FlightNum BETWEEN 5108 AND 3041 OR DivAirportIDs IN (14122) GROUP BY DistanceGroup, Flights LIMIT 11","hsqls":["SELECT DistanceGroup, Flights, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (328, 266) OR FlightNum BETWEEN 5108 AND 3041 OR (DivAirportIDs__MV0 IN (14122) OR DivAirportIDs__MV1 IN (14122) OR DivAirportIDs__MV2 IN (14122) OR DivAirportIDs__MV3 IN (14122) OR DivAirportIDs__MV4 IN (14122)) GROUP BY DistanceGroup, Flights LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk, Origin, DestAirportID, AVG(\"Month\"), MAX(DestStateFips) FROM mytable WHERE ArrDelayMinutes > 364.0 GROUP BY DepTimeBlk, Origin, DestAirportID","hsqls":["SELECT DepTimeBlk, Origin, DestAirportID, AVG(`Month`), MAX(DestStateFips) FROM mytable WHERE ArrDelayMinutes > 364.0 GROUP BY DepTimeBlk, Origin, DestAirportID"]}
+{"sql":"SELECT DistanceGroup, Flights, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (328, 266) OR FlightNum BETWEEN 5108 AND 3041 OR DivAirportIDs IN (14122) GROUP BY DistanceGroup, Flights LIMIT 11","hsqls":["SELECT DistanceGroup, Flights, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (328, 266) OR FlightNum BETWEEN 5108 AND 3041 OR (DivAirportIDs[1] IN (14122) OR DivAirportIDs[2] IN (14122) OR DivAirportIDs[3] IN (14122) OR DivAirportIDs[4] IN (14122) OR DivAirportIDs[5] IN (14122)) GROUP BY DistanceGroup, Flights LIMIT 10000"]}
 {"sql":"SELECT OriginState, DestAirportID FROM mytable ORDER BY SecurityDelay LIMIT 25"}
 {"sql":"SELECT ArrTime, MIN(DepDelayMinutes), COUNT(OriginAirportSeqID), MAX(DivReachedDest) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 7","hsqls":["SELECT ArrTime, MIN(DepDelayMinutes), COUNT(OriginAirportSeqID), MAX(DivReachedDest) FROM mytable GROUP BY ArrTime  ORDER BY ArrTime LIMIT 7"]}
 {"sql":"SELECT DistanceGroup, CancellationCode FROM mytable WHERE DivReachedDest NOT IN (-9999) AND OriginAirportSeqID IN (1342402, 1449202, 1329002) ORDER BY DivDistance, Distance LIMIT 17"}
-{"sql":"SELECT DivWheelsOns, SecurityDelay FROM mytable WHERE TotalAddGTime > 55 OR DepDel15 IN (1, 0, -9999) ORDER BY LongestAddGTime LIMIT 14","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, SecurityDelay FROM mytable WHERE TotalAddGTime > 55 OR DepDel15 IN (1, 0, -9999) ORDER BY LongestAddGTime LIMIT 10000"]}
-{"sql":"SELECT MIN(DepDelay), MAX(\"Month\") FROM mytable WHERE DivWheelsOffs BETWEEN 1434 AND 1059 AND OriginAirportSeqID NOT IN (1244805, 1079204, 1295302) AND LateAircraftDelay < 114 LIMIT 22","hsqls":["SELECT MIN(DepDelay), MAX(Month)  FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1434 AND 1059 OR DivWheelsOffs__MV1 BETWEEN 1434 AND 1059 OR DivWheelsOffs__MV2 BETWEEN 1434 AND 1059 OR DivWheelsOffs__MV3 BETWEEN 1434 AND 1059 OR DivWheelsOffs__MV4 BETWEEN 1434 AND 1059) AND OriginAirportSeqID NOT IN (1244805, 1079204, 1295302) AND LateAircraftDelay < 114 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, SecurityDelay FROM mytable WHERE TotalAddGTime > 55 OR DepDel15 IN (1, 0, -9999) ORDER BY LongestAddGTime LIMIT 14","hsqls":["SELECT DivWheelsOns, SecurityDelay FROM mytable WHERE TotalAddGTime > 55 OR DepDel15 IN (1, 0, -9999) ORDER BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT MIN(DepDelay), MAX(\"Month\") FROM mytable WHERE DivWheelsOffs BETWEEN 1434 AND 1059 AND OriginAirportSeqID NOT IN (1244805, 1079204, 1295302) AND LateAircraftDelay < 114 LIMIT 22","hsqls":["SELECT MIN(DepDelay), MAX(`Month`)  FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1434 AND 1059 OR DivWheelsOffs[2] BETWEEN 1434 AND 1059 OR DivWheelsOffs[3] BETWEEN 1434 AND 1059 OR DivWheelsOffs[4] BETWEEN 1434 AND 1059 OR DivWheelsOffs[5] BETWEEN 1434 AND 1059) AND OriginAirportSeqID NOT IN (1244805, 1079204, 1295302) AND LateAircraftDelay < 114 LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, ArrDelayMinutes FROM mytable LIMIT 16"}
-{"sql":"SELECT DivAirports, Origin, AirlineID FROM mytable WHERE AirTime NOT IN (180, 127, 62, 190, 274) AND DivReachedDest < 1 LIMIT 2","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, Origin, AirlineID FROM mytable WHERE AirTime NOT IN (180, 127, 62, 190, 274) AND DivReachedDest < 1 LIMIT 10000"]}
+{"sql":"SELECT DivAirports, Origin, AirlineID FROM mytable WHERE AirTime NOT IN (180, 127, 62, 190, 274) AND DivReachedDest < 1 LIMIT 2","hsqls":["SELECT DivAirports, Origin, AirlineID FROM mytable WHERE AirTime NOT IN (180, 127, 62, 190, 274) AND DivReachedDest < 1 LIMIT 10000"]}
 {"sql":"SELECT DestCityName, Origin FROM mytable ORDER BY FlightDate, AirlineID, UniqueCarrier LIMIT 9"}
-{"sql":"SELECT DepartureDelayGroups, \"Year\", AVG(DivReachedDest), MIN(SecurityDelay), MIN(Cancelled) FROM mytable WHERE TaxiOut <> 43 GROUP BY DepartureDelayGroups, \"Year\" LIMIT 26","hsqls":["SELECT DepartureDelayGroups, Year, AVG(DivReachedDest), MIN(SecurityDelay), MIN(Cancelled) FROM mytable WHERE TaxiOut <> 43 GROUP BY DepartureDelayGroups, Year LIMIT 26"]}
+{"sql":"SELECT DepartureDelayGroups, \"Year\", AVG(DivReachedDest), MIN(SecurityDelay), MIN(Cancelled) FROM mytable WHERE TaxiOut <> 43 GROUP BY DepartureDelayGroups, \"Year\" LIMIT 26","hsqls":["SELECT DepartureDelayGroups, Year, AVG(DivReachedDest), MIN(SecurityDelay), MIN(Cancelled) FROM mytable WHERE TaxiOut <> 43 GROUP BY DepartureDelayGroups, `Year` LIMIT 26"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE SecurityDelay BETWEEN 4 AND -9999 AND DivAirportLandings <> 1 OR AirTime BETWEEN 196 AND 69 ORDER BY ArrDel15 LIMIT 2"}
-{"sql":"SELECT CRSElapsedTime, SUM(ArrivalDelayGroups) FROM mytable WHERE DivWheelsOffs IN (1831, 1337, 1816) OR CarrierDelay = 235 GROUP BY CRSElapsedTime LIMIT 13","hsqls":["SELECT CRSElapsedTime, SUM(ArrivalDelayGroups) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1831, 1337, 1816) OR DivWheelsOffs__MV1 IN (1831, 1337, 1816) OR DivWheelsOffs__MV2 IN (1831, 1337, 1816) OR DivWheelsOffs__MV3 IN (1831, 1337, 1816) OR DivWheelsOffs__MV4 IN (1831, 1337, 1816)) OR CarrierDelay = 235 GROUP BY CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT CRSElapsedTime, SUM(ArrivalDelayGroups) FROM mytable WHERE DivWheelsOffs IN (1831, 1337, 1816) OR CarrierDelay = 235 GROUP BY CRSElapsedTime LIMIT 13","hsqls":["SELECT CRSElapsedTime, SUM(ArrivalDelayGroups) FROM mytable WHERE (DivWheelsOffs[1] IN (1831, 1337, 1816) OR DivWheelsOffs[2] IN (1831, 1337, 1816) OR DivWheelsOffs[3] IN (1831, 1337, 1816) OR DivWheelsOffs[4] IN (1831, 1337, 1816) OR DivWheelsOffs[5] IN (1831, 1337, 1816)) OR CarrierDelay = 235 GROUP BY CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT Diverted, OriginStateFips, DestStateFips FROM mytable ORDER BY DestStateName LIMIT 16"}
-{"sql":"SELECT OriginState, ArrDel15, SUM(CRSArrTime), MAX(AirTime) FROM mytable WHERE \"Month\" IN (1) OR DivAirportLandings IN (1, 0, 9) GROUP BY OriginState, ArrDel15 LIMIT 20","hsqls":["SELECT OriginState, ArrDel15, SUM(CRSArrTime), MAX(AirTime) FROM mytable WHERE Month IN (1) OR DivAirportLandings IN (1, 0, 9) GROUP BY OriginState, ArrDel15 LIMIT 20"]}
+{"sql":"SELECT OriginState, ArrDel15, SUM(CRSArrTime), MAX(AirTime) FROM mytable WHERE \"Month\" IN (1) OR DivAirportLandings IN (1, 0, 9) GROUP BY OriginState, ArrDel15 LIMIT 20","hsqls":["SELECT OriginState, ArrDel15, SUM(CRSArrTime), MAX(AirTime) FROM mytable WHERE `Month` IN (1) OR DivAirportLandings IN (1, 0, 9) GROUP BY OriginState, ArrDel15 LIMIT 20"]}
 {"sql":"SELECT Distance, OriginCityName, DivArrDelay, SUM(DaysSinceEpoch) FROM mytable GROUP BY Distance, OriginCityName, DivArrDelay  ORDER BY Distance, OriginCityName, DivArrDelay LIMIT 16","hsqls":["SELECT Distance, OriginCityName, DivArrDelay, SUM(DaysSinceEpoch) FROM mytable GROUP BY Distance, OriginCityName, DivArrDelay  ORDER BY Distance, OriginCityName, DivArrDelay LIMIT 16"]}
 {"sql":"SELECT TotalAddGTime, AirTime, MIN(LateAircraftDelay), AVG(DayOfWeek), AVG(OriginAirportID) FROM mytable WHERE DestAirportID BETWEEN 10257 AND 12343 OR DepartureDelayGroups BETWEEN 7 AND 9 AND CRSDepTime NOT IN (625) GROUP BY TotalAddGTime, AirTime  ORDER BY TotalAddGTime, AirTime LIMIT 5","hsqls":["SELECT TotalAddGTime, AirTime, MIN(LateAircraftDelay), AVG(DayOfWeek), AVG(OriginAirportID) FROM mytable WHERE DestAirportID BETWEEN 10257 AND 12343 OR DepartureDelayGroups BETWEEN 7 AND 9 AND CRSDepTime NOT IN (625) GROUP BY TotalAddGTime, AirTime  ORDER BY TotalAddGTime, AirTime LIMIT 5"]}
 {"sql":"SELECT WheelsOff FROM mytable WHERE TaxiIn > 44 ORDER BY DepDelay, DestAirportSeqID LIMIT 25"}
@@ -9235,72 +9235,72 @@
 {"sql":"SELECT DayofMonth, COUNT(DivDistance), AVG(DistanceGroup) FROM mytable WHERE CarrierDelay > 113 OR OriginAirportSeqID >= 1072804 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 29","hsqls":["SELECT DayofMonth, COUNT(DivDistance), AVG(DistanceGroup) FROM mytable WHERE CarrierDelay > 113 OR OriginAirportSeqID >= 1072804 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 29"]}
 {"sql":"SELECT DestWac, OriginWac, WheelsOn FROM mytable WHERE DivActualElapsedTime BETWEEN 318 AND 280 ORDER BY OriginState, OriginStateFips LIMIT 5"}
 {"sql":"SELECT DestAirportSeqID, ArrDel15, COUNT(*) FROM mytable WHERE ActualElapsedTime <= 332 OR DivActualElapsedTime BETWEEN 407 AND 641 GROUP BY DestAirportSeqID, ArrDel15  ORDER BY DestAirportSeqID, ArrDel15 LIMIT 16","hsqls":["SELECT DestAirportSeqID, ArrDel15, COUNT(*) FROM mytable WHERE ActualElapsedTime <= 332 OR DivActualElapsedTime BETWEEN 407 AND 641 GROUP BY DestAirportSeqID, ArrDel15  ORDER BY DestAirportSeqID, ArrDel15 LIMIT 16"]}
-{"sql":"SELECT MIN(\"Year\"), MIN(CarrierDelay) FROM mytable WHERE DestAirportID < 13256 LIMIT 18","hsqls":["SELECT MIN(Year), MIN(CarrierDelay) FROM mytable WHERE DestAirportID < 13256 LIMIT 18"]}
-{"sql":"SELECT DivWheelsOns, ArrTimeBlk, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (178, 194, 209, 237) ORDER BY Diverted, DaysSinceEpoch LIMIT 13","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, ArrTimeBlk, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (178, 194, 209, 237) ORDER BY Diverted, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT MIN(\"Year\"), MIN(CarrierDelay) FROM mytable WHERE DestAirportID < 13256 LIMIT 18","hsqls":["SELECT MIN(`Year`), MIN(CarrierDelay) FROM mytable WHERE DestAirportID < 13256 LIMIT 18"]}
+{"sql":"SELECT DivWheelsOns, ArrTimeBlk, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (178, 194, 209, 237) ORDER BY Diverted, DaysSinceEpoch LIMIT 13","hsqls":["SELECT DivWheelsOns, ArrTimeBlk, DaysSinceEpoch FROM mytable WHERE CRSElapsedTime NOT IN (178, 194, 209, 237) ORDER BY Diverted, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT OriginStateName FROM mytable ORDER BY TaxiIn, DivArrDelay LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 26"}
-{"sql":"SELECT DivAirports, DaysSinceEpoch FROM mytable WHERE DivWheelsOns BETWEEN 1645 AND 2152 ORDER BY FlightNum, TailNum, DivActualElapsedTime LIMIT 4","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DaysSinceEpoch FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 1645 AND 2152 OR DivWheelsOns__MV1 BETWEEN 1645 AND 2152 OR DivWheelsOns__MV2 BETWEEN 1645 AND 2152 OR DivWheelsOns__MV3 BETWEEN 1645 AND 2152 OR DivWheelsOns__MV4 BETWEEN 1645 AND 2152) ORDER BY FlightNum, TailNum, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DaysSinceEpoch FROM mytable WHERE DivWheelsOns BETWEEN 1645 AND 2152 ORDER BY FlightNum, TailNum, DivActualElapsedTime LIMIT 4","hsqls":["SELECT DivAirports, DaysSinceEpoch FROM mytable WHERE (DivWheelsOns[1] BETWEEN 1645 AND 2152 OR DivWheelsOns[2] BETWEEN 1645 AND 2152 OR DivWheelsOns[3] BETWEEN 1645 AND 2152 OR DivWheelsOns[4] BETWEEN 1645 AND 2152 OR DivWheelsOns[5] BETWEEN 1645 AND 2152) ORDER BY FlightNum, TailNum, DivActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips FROM mytable ORDER BY DivReachedDest, OriginWac, DivArrDelay LIMIT 10"}
 {"sql":"SELECT LateAircraftDelay, DestState, ArrivalDelayGroups, MAX(DepDelayMinutes), SUM(AirlineID), SUM(TaxiIn) FROM mytable WHERE DepDelay BETWEEN 135.0 AND 536.0 AND WheelsOff NOT IN (117, 1244, 814, 1139, 1744) GROUP BY LateAircraftDelay, DestState, ArrivalDelayGroups  ORDER BY LateAircraftDelay, DestState, ArrivalDelayGroups LIMIT 16","hsqls":["SELECT LateAircraftDelay, DestState, ArrivalDelayGroups, MAX(DepDelayMinutes), SUM(AirlineID), SUM(TaxiIn) FROM mytable WHERE DepDelay BETWEEN 135.0 AND 536.0 AND WheelsOff NOT IN (117, 1244, 814, 1139, 1744) GROUP BY LateAircraftDelay, DestState, ArrivalDelayGroups  ORDER BY LateAircraftDelay, DestState, ArrivalDelayGroups LIMIT 16"]}
 {"sql":"SELECT OriginStateFips, TaxiIn, SUM(DivAirportLandings), SUM(ArrivalDelayGroups), AVG(DivArrDelay) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND DestStateFips <> 16 GROUP BY OriginStateFips, TaxiIn","hsqls":["SELECT OriginStateFips, TaxiIn, SUM(DivAirportLandings), SUM(ArrivalDelayGroups), AVG(DivArrDelay) FROM mytable WHERE DepDel15 BETWEEN -9999 AND 0 AND DestStateFips <> 16 GROUP BY OriginStateFips, TaxiIn"]}
-{"sql":"SELECT COUNT(\"Month\") FROM mytable WHERE DivAirports >= 'CID' AND TaxiIn = 116 OR DestState <= 'MS' LIMIT 25","hsqls":["SELECT COUNT(Month) FROM mytable WHERE (DivAirports__MV0 >= 'CID' OR DivAirports__MV1 >= 'CID' OR DivAirports__MV2 >= 'CID' OR DivAirports__MV3 >= 'CID' OR DivAirports__MV4 >= 'CID') AND TaxiIn = 116 OR DestState <= 'MS' LIMIT 10000"]}
-{"sql":"SELECT COUNT(DestCityName), MIN(\"Month\") FROM mytable LIMIT 20","hsqls":["SELECT COUNT(DestCityName), MIN(Month) FROM mytable LIMIT 20"]}
-{"sql":"SELECT DivWheelsOns, LateAircraftDelay, AirlineID FROM mytable WHERE DistanceGroup > 6 OR DepDelayMinutes BETWEEN 196.0 AND 144.0 OR WheelsOff IN (2016, 858, 912) ORDER BY DestWac, CarrierDelay, CRSElapsedTime LIMIT 28","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LateAircraftDelay, AirlineID FROM mytable WHERE DistanceGroup > 6 OR DepDelayMinutes BETWEEN 196.0 AND 144.0 OR WheelsOff IN (2016, 858, 912) ORDER BY DestWac, CarrierDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT OriginStateName FROM mytable ORDER BY LateAircraftDelay, DivAirportLandings, \"Month\" LIMIT 28","hsqls":["SELECT OriginStateName FROM mytable ORDER BY LateAircraftDelay, DivAirportLandings, Month LIMIT 28"]}
+{"sql":"SELECT COUNT(\"Month\") FROM mytable WHERE DivAirports >= 'CID' AND TaxiIn = 116 OR DestState <= 'MS' LIMIT 25","hsqls":["SELECT COUNT(`Month`) FROM mytable WHERE (DivAirports[1] >= 'CID' OR DivAirports[2] >= 'CID' OR DivAirports[3] >= 'CID' OR DivAirports[4] >= 'CID' OR DivAirports[5] >= 'CID') AND TaxiIn = 116 OR DestState <= 'MS' LIMIT 10000"]}
+{"sql":"SELECT COUNT(DestCityName), MIN(\"Month\") FROM mytable LIMIT 20","hsqls":["SELECT COUNT(DestCityName), MIN(`Month`) FROM mytable LIMIT 20"]}
+{"sql":"SELECT DivWheelsOns, LateAircraftDelay, AirlineID FROM mytable WHERE DistanceGroup > 6 OR DepDelayMinutes BETWEEN 196.0 AND 144.0 OR WheelsOff IN (2016, 858, 912) ORDER BY DestWac, CarrierDelay, CRSElapsedTime LIMIT 28","hsqls":["SELECT DivWheelsOns, LateAircraftDelay, AirlineID FROM mytable WHERE DistanceGroup > 6 OR DepDelayMinutes BETWEEN 196.0 AND 144.0 OR WheelsOff IN (2016, 858, 912) ORDER BY DestWac, CarrierDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT OriginStateName FROM mytable ORDER BY LateAircraftDelay, DivAirportLandings, \"Month\" LIMIT 28","hsqls":["SELECT OriginStateName FROM mytable ORDER BY LateAircraftDelay, DivAirportLandings, `Month` LIMIT 28"]}
 {"sql":"SELECT ArrDelay, AVG(AirlineID) FROM mytable WHERE CRSElapsedTime IN (599) OR TotalAddGTime IN (111, 26) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 3","hsqls":["SELECT ArrDelay, AVG(AirlineID) FROM mytable WHERE CRSElapsedTime IN (599) OR TotalAddGTime IN (111, 26) GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 3"]}
-{"sql":"SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 ORDER BY LateAircraftDelay LIMIT 13","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, CRSElapsedTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 ORDER BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 ORDER BY LateAircraftDelay LIMIT 13","hsqls":["SELECT DivAirportIDs, CRSElapsedTime FROM mytable WHERE Cancelled BETWEEN 0 AND 1 ORDER BY LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, MAX(DestAirportID), COUNT(FirstDepTime), COUNT(TaxiOut) FROM mytable WHERE OriginWac IN (34) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 1","hsqls":["SELECT DistanceGroup, MAX(DestAirportID), COUNT(FirstDepTime), COUNT(TaxiOut) FROM mytable WHERE OriginWac IN (34) GROUP BY DistanceGroup  ORDER BY DistanceGroup LIMIT 1"]}
 {"sql":"SELECT SUM(WheelsOff), AVG(TaxiIn) FROM mytable WHERE TotalAddGTime BETWEEN 28 AND 31 OR SecurityDelay <> 0 OR ArrDelayMinutes = 176.0 LIMIT 10"}
 {"sql":"SELECT DistanceGroup, FlightNum FROM mytable WHERE OriginStateName NOT IN ('Pennsylvania', 'Missouri', 'Hawaii', 'Connecticut', 'Washington') AND LongestAddGTime IN (97, 51, 54, 63, 25) OR DestAirportID NOT IN (14574, 10170, 14262, 11540, 13232) ORDER BY WeatherDelay, Dest, ArrDelay LIMIT 26"}
 {"sql":"SELECT DivReachedDest, DaysSinceEpoch, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FlightNum <= 4600 OR DivAirportLandings < 2 GROUP BY DivReachedDest, DaysSinceEpoch  ORDER BY DivReachedDest, DaysSinceEpoch LIMIT 12","hsqls":["SELECT DivReachedDest, DaysSinceEpoch, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 OR FlightNum <= 4600 OR DivAirportLandings < 2 GROUP BY DivReachedDest, DaysSinceEpoch  ORDER BY DivReachedDest, DaysSinceEpoch LIMIT 12"]}
-{"sql":"SELECT DestAirportID, COUNT(Quarter), SUM(DivDistance) FROM mytable WHERE SecurityDelay IN (1, 10, 27) OR CRSElapsedTime >= 173 OR DivTotalGTimes <= 32 GROUP BY DestAirportID LIMIT 28","hsqls":["SELECT DestAirportID, COUNT(Quarter), SUM(DivDistance) FROM mytable WHERE SecurityDelay IN (1, 10, 27) OR CRSElapsedTime >= 173 OR (DivTotalGTimes__MV0 <= 32 OR DivTotalGTimes__MV1 <= 32 OR DivTotalGTimes__MV2 <= 32 OR DivTotalGTimes__MV3 <= 32 OR DivTotalGTimes__MV4 <= 32) GROUP BY DestAirportID LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, COUNT(Quarter), SUM(DivDistance) FROM mytable WHERE SecurityDelay IN (1, 10, 27) OR CRSElapsedTime >= 173 OR DivTotalGTimes <= 32 GROUP BY DestAirportID LIMIT 28","hsqls":["SELECT DestAirportID, COUNT(Quarter), SUM(DivDistance) FROM mytable WHERE SecurityDelay IN (1, 10, 27) OR CRSElapsedTime >= 173 OR (DivTotalGTimes[1] <= 32 OR DivTotalGTimes[2] <= 32 OR DivTotalGTimes[3] <= 32 OR DivTotalGTimes[4] <= 32 OR DivTotalGTimes[5] <= 32) GROUP BY DestAirportID LIMIT 10000"]}
 {"sql":"SELECT AirlineID, OriginAirportID, MIN(LateAircraftDelay) FROM mytable GROUP BY AirlineID, OriginAirportID  ORDER BY AirlineID, OriginAirportID LIMIT 21","hsqls":["SELECT AirlineID, OriginAirportID, MIN(LateAircraftDelay) FROM mytable GROUP BY AirlineID, OriginAirportID  ORDER BY AirlineID, OriginAirportID LIMIT 21"]}
 {"sql":"SELECT DistanceGroup, WeatherDelay FROM mytable ORDER BY ActualElapsedTime, OriginAirportID LIMIT 28"}
 {"sql":"SELECT CRSDepTime, DivActualElapsedTime FROM mytable LIMIT 24"}
 {"sql":"SELECT DepDelay, OriginCityMarketID, DaysSinceEpoch FROM mytable WHERE NASDelay BETWEEN 47 AND 24 OR OriginState BETWEEN 'FL' AND 'SD' LIMIT 22"}
-{"sql":"SELECT FlightNum, AirlineID, COUNT(*) FROM mytable WHERE DivAirportSeqIDs <= 1336703 OR CRSArrTime BETWEEN 1940 AND 533 OR DayofMonth IN (2, 10, 9, 14) GROUP BY FlightNum, AirlineID LIMIT 1","hsqls":["SELECT FlightNum, AirlineID, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 <= 1336703 OR DivAirportSeqIDs__MV1 <= 1336703 OR DivAirportSeqIDs__MV2 <= 1336703 OR DivAirportSeqIDs__MV3 <= 1336703 OR DivAirportSeqIDs__MV4 <= 1336703) OR CRSArrTime BETWEEN 1940 AND 533 OR DayofMonth IN (2, 10, 9, 14) GROUP BY FlightNum, AirlineID LIMIT 10000"]}
+{"sql":"SELECT FlightNum, AirlineID, COUNT(*) FROM mytable WHERE DivAirportSeqIDs <= 1336703 OR CRSArrTime BETWEEN 1940 AND 533 OR DayofMonth IN (2, 10, 9, 14) GROUP BY FlightNum, AirlineID LIMIT 1","hsqls":["SELECT FlightNum, AirlineID, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] <= 1336703 OR DivAirportSeqIDs[2] <= 1336703 OR DivAirportSeqIDs[3] <= 1336703 OR DivAirportSeqIDs[4] <= 1336703 OR DivAirportSeqIDs[5] <= 1336703) OR CRSArrTime BETWEEN 1940 AND 533 OR DayofMonth IN (2, 10, 9, 14) GROUP BY FlightNum, AirlineID LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CRSElapsedTime BETWEEN 271 AND 440 OR DepTime IN (1013) LIMIT 15"}
 {"sql":"SELECT \"Year\", OriginCityName FROM mytable WHERE SecurityDelay BETWEEN 4 AND 0 AND DestCityMarketID NOT IN (33158, 31205, 32474, 30424, 33256) OR Distance IN (444, 2330) LIMIT 4","hsqls":["SELECT Year, OriginCityName FROM mytable WHERE SecurityDelay BETWEEN 4 AND 0 AND DestCityMarketID NOT IN (33158, 31205, 32474, 30424, 33256) OR Distance IN (444, 2330) LIMIT 4"]}
 {"sql":"SELECT SUM(LateAircraftDelay), AVG(AirlineID) FROM mytable LIMIT 5"}
 {"sql":"SELECT OriginCityMarketID, LongestAddGTime, MAX(DepDelayMinutes), MIN(DivDistance) FROM mytable GROUP BY OriginCityMarketID, LongestAddGTime  ORDER BY OriginCityMarketID, LongestAddGTime LIMIT 6","hsqls":["SELECT OriginCityMarketID, LongestAddGTime, MAX(DepDelayMinutes), MIN(DivDistance) FROM mytable GROUP BY OriginCityMarketID, LongestAddGTime  ORDER BY OriginCityMarketID, LongestAddGTime LIMIT 6"]}
 {"sql":"SELECT DepartureDelayGroups, DepDel15 FROM mytable LIMIT 25"}
-{"sql":"SELECT TaxiOut, DayOfWeek FROM mytable WHERE TaxiOut NOT IN (55, 65, 33, 12) AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY OriginAirportSeqID, DestCityName, \"Month\" LIMIT 10","hsqls":["SELECT TaxiOut, DayOfWeek FROM mytable WHERE TaxiOut NOT IN (55, 65, 33, 12) AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY OriginAirportSeqID, DestCityName, Month LIMIT 10"]}
-{"sql":"SELECT \"Month\" FROM mytable ORDER BY WheelsOff LIMIT 7","hsqls":["SELECT Month FROM mytable ORDER BY WheelsOff LIMIT 7"]}
+{"sql":"SELECT TaxiOut, DayOfWeek FROM mytable WHERE TaxiOut NOT IN (55, 65, 33, 12) AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY OriginAirportSeqID, DestCityName, \"Month\" LIMIT 10","hsqls":["SELECT TaxiOut, DayOfWeek FROM mytable WHERE TaxiOut NOT IN (55, 65, 33, 12) AND CancellationCode IN ('A', 'B', 'C', 'noodles') ORDER BY OriginAirportSeqID, DestCityName, `Month` LIMIT 10"]}
+{"sql":"SELECT \"Month\" FROM mytable ORDER BY WheelsOff LIMIT 7","hsqls":["SELECT `Month` FROM mytable ORDER BY WheelsOff LIMIT 7"]}
 {"sql":"SELECT WeatherDelay, DepDel15, CRSDepTime FROM mytable WHERE Flights NOT IN (1) OR UniqueCarrier NOT IN ('B6') OR UniqueCarrier IN ('OO', 'UA', 'MQ') ORDER BY Quarter, CRSArrTime LIMIT 8"}
 {"sql":"SELECT DestWac, SUM(Flights), COUNT(ActualElapsedTime), SUM(FlightNum) FROM mytable GROUP BY DestWac","hsqls":["SELECT DestWac, SUM(Flights), COUNT(ActualElapsedTime), SUM(FlightNum) FROM mytable GROUP BY DestWac"]}
 {"sql":"SELECT DivAirportLandings, OriginWac, COUNT(*) FROM mytable GROUP BY DivAirportLandings, OriginWac  ORDER BY DivAirportLandings, OriginWac LIMIT 15","hsqls":["SELECT DivAirportLandings, OriginWac, COUNT(*) FROM mytable GROUP BY DivAirportLandings, OriginWac  ORDER BY DivAirportLandings, OriginWac LIMIT 15"]}
-{"sql":"SELECT DivDistance, CarrierDelay FROM mytable WHERE DistanceGroup > 1 AND DivTailNums <= 'N7742B' OR OriginWac < 63 ORDER BY ArrTime, NASDelay, CRSElapsedTime LIMIT 12","hsqls":["SELECT DivDistance, CarrierDelay FROM mytable WHERE DistanceGroup > 1 AND (DivTailNums__MV0 <= 'N7742B' OR DivTailNums__MV1 <= 'N7742B' OR DivTailNums__MV2 <= 'N7742B' OR DivTailNums__MV3 <= 'N7742B' OR DivTailNums__MV4 <= 'N7742B') OR OriginWac < 63 ORDER BY ArrTime, NASDelay, CRSElapsedTime LIMIT 10000"]}
-{"sql":"SELECT WheelsOff, DivLongestGTimes FROM mytable WHERE DivWheelsOffs > 2310 OR ArrTimeBlk NOT IN ('0700-0759', '2100-2159', '1200-1259', '1500-1559') ORDER BY TailNum LIMIT 25","hsqls":["SELECT WheelsOff, DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE (DivWheelsOffs__MV0 > 2310 OR DivWheelsOffs__MV1 > 2310 OR DivWheelsOffs__MV2 > 2310 OR DivWheelsOffs__MV3 > 2310 OR DivWheelsOffs__MV4 > 2310) OR ArrTimeBlk NOT IN ('0700-0759', '2100-2159', '1200-1259', '1500-1559') ORDER BY TailNum LIMIT 10000"]}
-{"sql":"SELECT DivAirports, ArrivalDelayGroups, OriginStateName FROM mytable WHERE DivAirportSeqIDs = 1323002 OR DayOfWeek IN (4) ORDER BY OriginStateFips, DepDel15, CRSDepTime LIMIT 28","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrivalDelayGroups, OriginStateName FROM mytable WHERE (DivAirportSeqIDs__MV0 = 1323002 OR DivAirportSeqIDs__MV1 = 1323002 OR DivAirportSeqIDs__MV2 = 1323002 OR DivAirportSeqIDs__MV3 = 1323002 OR DivAirportSeqIDs__MV4 = 1323002) OR DayOfWeek IN (4) ORDER BY OriginStateFips, DepDel15, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivDistance, CarrierDelay FROM mytable WHERE DistanceGroup > 1 AND DivTailNums <= 'N7742B' OR OriginWac < 63 ORDER BY ArrTime, NASDelay, CRSElapsedTime LIMIT 12","hsqls":["SELECT DivDistance, CarrierDelay FROM mytable WHERE DistanceGroup > 1 AND (DivTailNums[1] <= 'N7742B' OR DivTailNums[2] <= 'N7742B' OR DivTailNums[3] <= 'N7742B' OR DivTailNums[4] <= 'N7742B' OR DivTailNums[5] <= 'N7742B') OR OriginWac < 63 ORDER BY ArrTime, NASDelay, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT WheelsOff, DivLongestGTimes FROM mytable WHERE DivWheelsOffs > 2310 OR ArrTimeBlk NOT IN ('0700-0759', '2100-2159', '1200-1259', '1500-1559') ORDER BY TailNum LIMIT 25","hsqls":["SELECT WheelsOff, DivLongestGTimes FROM mytable WHERE (DivWheelsOffs[1] > 2310 OR DivWheelsOffs[2] > 2310 OR DivWheelsOffs[3] > 2310 OR DivWheelsOffs[4] > 2310 OR DivWheelsOffs[5] > 2310) OR ArrTimeBlk NOT IN ('0700-0759', '2100-2159', '1200-1259', '1500-1559') ORDER BY TailNum LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ArrivalDelayGroups, OriginStateName FROM mytable WHERE DivAirportSeqIDs = 1323002 OR DayOfWeek IN (4) ORDER BY OriginStateFips, DepDel15, CRSDepTime LIMIT 28","hsqls":["SELECT DivAirports, ArrivalDelayGroups, OriginStateName FROM mytable WHERE (DivAirportSeqIDs[1] = 1323002 OR DivAirportSeqIDs[2] = 1323002 OR DivAirportSeqIDs[3] = 1323002 OR DivAirportSeqIDs[4] = 1323002 OR DivAirportSeqIDs[5] = 1323002) OR DayOfWeek IN (4) ORDER BY OriginStateFips, DepDel15, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT MIN(DestWac), AVG(OriginWac), MAX(FlightNum) FROM mytable WHERE OriginState >= 'ID' OR Diverted IN (0) LIMIT 17"}
-{"sql":"SELECT ActualElapsedTime, DestAirportID, MAX(FirstDepTime), MIN(CRSArrTime) FROM mytable WHERE DivAirportIDs BETWEEN 11298 AND 11603 AND OriginWac NOT IN (65, 83, 62, 14, 88) OR OriginAirportID BETWEEN 11905 AND 11150 GROUP BY ActualElapsedTime, DestAirportID LIMIT 3","hsqls":["SELECT ActualElapsedTime, DestAirportID, MAX(FirstDepTime), MIN(CRSArrTime) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 11298 AND 11603 OR DivAirportIDs__MV1 BETWEEN 11298 AND 11603 OR DivAirportIDs__MV2 BETWEEN 11298 AND 11603 OR DivAirportIDs__MV3 BETWEEN 11298 AND 11603 OR DivAirportIDs__MV4 BETWEEN 11298 AND 11603) AND OriginWac NOT IN (65, 83, 62, 14, 88) OR OriginAirportID BETWEEN 11905 AND 11150 GROUP BY ActualElapsedTime, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, TotalAddGTime, DepDel15, AVG(WeatherDelay), MAX(OriginWac) FROM mytable WHERE DivTotalGTimes >= -9999 GROUP BY WeatherDelay, TotalAddGTime, DepDel15 LIMIT 10","hsqls":["SELECT WeatherDelay, TotalAddGTime, DepDel15, AVG(WeatherDelay), MAX(OriginWac) FROM mytable WHERE (DivTotalGTimes__MV0 >= -9999 OR DivTotalGTimes__MV1 >= -9999 OR DivTotalGTimes__MV2 >= -9999 OR DivTotalGTimes__MV3 >= -9999 OR DivTotalGTimes__MV4 >= -9999) GROUP BY WeatherDelay, TotalAddGTime, DepDel15 LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DestAirportID, MAX(FirstDepTime), MIN(CRSArrTime) FROM mytable WHERE DivAirportIDs BETWEEN 11298 AND 11603 AND OriginWac NOT IN (65, 83, 62, 14, 88) OR OriginAirportID BETWEEN 11905 AND 11150 GROUP BY ActualElapsedTime, DestAirportID LIMIT 3","hsqls":["SELECT ActualElapsedTime, DestAirportID, MAX(FirstDepTime), MIN(CRSArrTime) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 11298 AND 11603 OR DivAirportIDs[2] BETWEEN 11298 AND 11603 OR DivAirportIDs[3] BETWEEN 11298 AND 11603 OR DivAirportIDs[4] BETWEEN 11298 AND 11603 OR DivAirportIDs[5] BETWEEN 11298 AND 11603) AND OriginWac NOT IN (65, 83, 62, 14, 88) OR OriginAirportID BETWEEN 11905 AND 11150 GROUP BY ActualElapsedTime, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, TotalAddGTime, DepDel15, AVG(WeatherDelay), MAX(OriginWac) FROM mytable WHERE DivTotalGTimes >= -9999 GROUP BY WeatherDelay, TotalAddGTime, DepDel15 LIMIT 10","hsqls":["SELECT WeatherDelay, TotalAddGTime, DepDel15, AVG(WeatherDelay), MAX(OriginWac) FROM mytable WHERE (DivTotalGTimes[1] >= -9999 OR DivTotalGTimes[2] >= -9999 OR DivTotalGTimes[3] >= -9999 OR DivTotalGTimes[4] >= -9999 OR DivTotalGTimes[5] >= -9999) GROUP BY WeatherDelay, TotalAddGTime, DepDel15 LIMIT 10000"]}
 {"sql":"SELECT FlightNum, MAX(DaysSinceEpoch), MIN(ArrDelayMinutes), AVG(OriginStateFips) FROM mytable WHERE OriginCityName < 'Charlotte, NC' GROUP BY FlightNum  ORDER BY FlightNum LIMIT 26","hsqls":["SELECT FlightNum, MAX(DaysSinceEpoch), MIN(ArrDelayMinutes), AVG(OriginStateFips) FROM mytable WHERE OriginCityName < 'Charlotte, NC' GROUP BY FlightNum  ORDER BY FlightNum LIMIT 26"]}
-{"sql":"SELECT LongestAddGTime, OriginCityName, DaysSinceEpoch FROM mytable WHERE Diverted NOT IN (1, 0) AND DivWheelsOffs < 833 LIMIT 19","hsqls":["SELECT LongestAddGTime, OriginCityName, DaysSinceEpoch FROM mytable WHERE Diverted NOT IN (1, 0) AND (DivWheelsOffs__MV0 < 833 OR DivWheelsOffs__MV1 < 833 OR DivWheelsOffs__MV2 < 833 OR DivWheelsOffs__MV3 < 833 OR DivWheelsOffs__MV4 < 833) LIMIT 10000"]}
+{"sql":"SELECT LongestAddGTime, OriginCityName, DaysSinceEpoch FROM mytable WHERE Diverted NOT IN (1, 0) AND DivWheelsOffs < 833 LIMIT 19","hsqls":["SELECT LongestAddGTime, OriginCityName, DaysSinceEpoch FROM mytable WHERE Diverted NOT IN (1, 0) AND (DivWheelsOffs[1] < 833 OR DivWheelsOffs[2] < 833 OR DivWheelsOffs[3] < 833 OR DivWheelsOffs[4] < 833 OR DivWheelsOffs[5] < 833) LIMIT 10000"]}
 {"sql":"SELECT Diverted, FlightDate, DepTimeBlk, MAX(DivDistance), MIN(DestCityMarketID), SUM(DivActualElapsedTime) FROM mytable WHERE DivReachedDest >= 1 GROUP BY Diverted, FlightDate, DepTimeBlk  ORDER BY Diverted, FlightDate, DepTimeBlk LIMIT 19","hsqls":["SELECT Diverted, FlightDate, DepTimeBlk, MAX(DivDistance), MIN(DestCityMarketID), SUM(DivActualElapsedTime) FROM mytable WHERE DivReachedDest >= 1 GROUP BY Diverted, FlightDate, DepTimeBlk  ORDER BY Diverted, FlightDate, DepTimeBlk LIMIT 19"]}
 {"sql":"SELECT Quarter, DivActualElapsedTime, SUM(DepartureDelayGroups) FROM mytable WHERE DivArrDelay IN (287, 81, 84) GROUP BY Quarter, DivActualElapsedTime  ORDER BY Quarter, DivActualElapsedTime LIMIT 14","hsqls":["SELECT Quarter, DivActualElapsedTime, SUM(DepartureDelayGroups) FROM mytable WHERE DivArrDelay IN (287, 81, 84) GROUP BY Quarter, DivActualElapsedTime  ORDER BY Quarter, DivActualElapsedTime LIMIT 14"]}
 {"sql":"SELECT DestState, CRSDepTime, WheelsOn, MIN(CRSArrTime) FROM mytable WHERE DestStateFips NOT IN (45, 55) AND DivDistance IN (133, 328, 480, 233) GROUP BY DestState, CRSDepTime, WheelsOn  ORDER BY DestState, CRSDepTime, WheelsOn LIMIT 10","hsqls":["SELECT DestState, CRSDepTime, WheelsOn, MIN(CRSArrTime) FROM mytable WHERE DestStateFips NOT IN (45, 55) AND DivDistance IN (133, 328, 480, 233) GROUP BY DestState, CRSDepTime, WheelsOn  ORDER BY DestState, CRSDepTime, WheelsOn LIMIT 10"]}
 {"sql":"SELECT DayOfWeek FROM mytable ORDER BY DestAirportID LIMIT 4"}
 {"sql":"SELECT WeatherDelay, ArrDelay, OriginAirportID, AVG(CRSDepTime), AVG(AirTime) FROM mytable WHERE FirstDepTime >= 1136 OR TotalAddGTime NOT IN (27) GROUP BY WeatherDelay, ArrDelay, OriginAirportID  ORDER BY WeatherDelay, ArrDelay, OriginAirportID LIMIT 17","hsqls":["SELECT WeatherDelay, ArrDelay, OriginAirportID, AVG(CRSDepTime), AVG(AirTime) FROM mytable WHERE FirstDepTime >= 1136 OR TotalAddGTime NOT IN (27) GROUP BY WeatherDelay, ArrDelay, OriginAirportID  ORDER BY WeatherDelay, ArrDelay, OriginAirportID LIMIT 17"]}
-{"sql":"SELECT FirstDepTime, TaxiIn, MAX(OriginAirportSeqID), SUM(DivReachedDest), MIN(WheelsOff) FROM mytable WHERE DivTailNums BETWEEN 'N5CSAA' AND 'N834JB' AND CRSElapsedTime = 250 OR DayofMonth NOT IN (22, 17, 23, 15, 11) GROUP BY FirstDepTime, TaxiIn LIMIT 25","hsqls":["SELECT FirstDepTime, TaxiIn, MAX(OriginAirportSeqID), SUM(DivReachedDest), MIN(WheelsOff) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums__MV1 BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums__MV2 BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums__MV3 BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums__MV4 BETWEEN 'N5CSAA' AND 'N834JB') AND CRSElapsedTime = 250 OR DayofMonth NOT IN (22, 17, 23, 15, 11) GROUP BY FirstDepTime, TaxiIn LIMIT 10000"]}
-{"sql":"SELECT DivDistance, CRSArrTime, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime BETWEEN 808 AND 2248 AND DivLongestGTimes > 68.0 AND DaysSinceEpoch BETWEEN 16083 AND 16080 GROUP BY DivDistance, CRSArrTime, CRSElapsedTime LIMIT 16","hsqls":["SELECT DivDistance, CRSArrTime, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime BETWEEN 808 AND 2248 AND (DivLongestGTimes__MV0 > 68.0 OR DivLongestGTimes__MV1 > 68.0 OR DivLongestGTimes__MV2 > 68.0 OR DivLongestGTimes__MV3 > 68.0 OR DivLongestGTimes__MV4 > 68.0) AND DaysSinceEpoch BETWEEN 16083 AND 16080 GROUP BY DivDistance, CRSArrTime, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, TaxiIn, MAX(OriginAirportSeqID), SUM(DivReachedDest), MIN(WheelsOff) FROM mytable WHERE DivTailNums BETWEEN 'N5CSAA' AND 'N834JB' AND CRSElapsedTime = 250 OR DayofMonth NOT IN (22, 17, 23, 15, 11) GROUP BY FirstDepTime, TaxiIn LIMIT 25","hsqls":["SELECT FirstDepTime, TaxiIn, MAX(OriginAirportSeqID), SUM(DivReachedDest), MIN(WheelsOff) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums[2] BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums[3] BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums[4] BETWEEN 'N5CSAA' AND 'N834JB' OR DivTailNums[5] BETWEEN 'N5CSAA' AND 'N834JB') AND CRSElapsedTime = 250 OR DayofMonth NOT IN (22, 17, 23, 15, 11) GROUP BY FirstDepTime, TaxiIn LIMIT 10000"]}
+{"sql":"SELECT DivDistance, CRSArrTime, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime BETWEEN 808 AND 2248 AND DivLongestGTimes > 68.0 AND DaysSinceEpoch BETWEEN 16083 AND 16080 GROUP BY DivDistance, CRSArrTime, CRSElapsedTime LIMIT 16","hsqls":["SELECT DivDistance, CRSArrTime, CRSElapsedTime, COUNT(*) FROM mytable WHERE DepTime BETWEEN 808 AND 2248 AND (DivLongestGTimes[1] > 68.0 OR DivLongestGTimes[2] > 68.0 OR DivLongestGTimes[3] > 68.0 OR DivLongestGTimes[4] > 68.0 OR DivLongestGTimes[5] > 68.0) AND DaysSinceEpoch BETWEEN 16083 AND 16080 GROUP BY DivDistance, CRSArrTime, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT MIN(DayOfWeek), COUNT(AirlineID) FROM mytable LIMIT 2"}
 {"sql":"SELECT \"Year\", CRSArrTime, Origin, COUNT(CRSDepTime) FROM mytable WHERE TaxiIn IN (29) OR DepDelay NOT IN (304.0) AND OriginStateName NOT IN ('North Dakota', 'Texas', 'Arkansas', 'Illinois', 'Kansas') GROUP BY \"Year\", CRSArrTime, Origin LIMIT 22","hsqls":["SELECT Year, CRSArrTime, Origin, COUNT(CRSDepTime) FROM mytable WHERE TaxiIn IN (29) OR DepDelay NOT IN (304.0) AND OriginStateName NOT IN ('North Dakota', 'Texas', 'Arkansas', 'Illinois', 'Kansas') GROUP BY Year, CRSArrTime, Origin LIMIT 22"]}
 {"sql":"SELECT TaxiIn FROM mytable WHERE DestAirportSeqID BETWEEN 1468502 AND 1448702 OR DestState BETWEEN 'NC' AND 'PA' OR CarrierDelay IN (113, 64, 51, 290, 73) ORDER BY CarrierDelay, OriginAirportID LIMIT 7"}
 {"sql":"SELECT OriginCityName FROM mytable WHERE ArrDel15 <= 1 ORDER BY TotalAddGTime, ArrTimeBlk, DivActualElapsedTime LIMIT 13"}
-{"sql":"SELECT \"Year\", DivActualElapsedTime FROM mytable WHERE DivAirports >= 'DTW' OR DestCityMarketID <> 32070 LIMIT 4","hsqls":["SELECT Year, DivActualElapsedTime FROM mytable WHERE (DivAirports__MV0 >= 'DTW' OR DivAirports__MV1 >= 'DTW' OR DivAirports__MV2 >= 'DTW' OR DivAirports__MV3 >= 'DTW' OR DivAirports__MV4 >= 'DTW') OR DestCityMarketID <> 32070 LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivActualElapsedTime FROM mytable WHERE DivAirports >= 'DTW' OR DestCityMarketID <> 32070 LIMIT 4","hsqls":["SELECT Year, DivActualElapsedTime FROM mytable WHERE (DivAirports[1] >= 'DTW' OR DivAirports[2] >= 'DTW' OR DivAirports[3] >= 'DTW' OR DivAirports[4] >= 'DTW' OR DivAirports[5] >= 'DTW') OR DestCityMarketID <> 32070 LIMIT 10000"]}
 {"sql":"SELECT OriginState, DestStateFips, UniqueCarrier FROM mytable WHERE LongestAddGTime > 128 AND DaysSinceEpoch < 16096 ORDER BY DivDistance, CRSArrTime LIMIT 17"}
 {"sql":"SELECT DestCityName, OriginAirportID, COUNT(*) FROM mytable GROUP BY DestCityName, OriginAirportID  ORDER BY DestCityName, OriginAirportID LIMIT 11","hsqls":["SELECT DestCityName, OriginAirportID, COUNT(*) FROM mytable GROUP BY DestCityName, OriginAirportID  ORDER BY DestCityName, OriginAirportID LIMIT 11"]}
-{"sql":"SELECT TailNum, AVG(\"Year\"), MIN(DestCityMarketID) FROM mytable GROUP BY TailNum LIMIT 24","hsqls":["SELECT TailNum, AVG(Year), MIN(DestCityMarketID) FROM mytable GROUP BY TailNum LIMIT 24"]}
+{"sql":"SELECT TailNum, AVG(\"Year\"), MIN(DestCityMarketID) FROM mytable GROUP BY TailNum LIMIT 24","hsqls":["SELECT TailNum, AVG(`Year`), MIN(DestCityMarketID) FROM mytable GROUP BY TailNum LIMIT 24"]}
 {"sql":"SELECT OriginStateFips, DestCityName FROM mytable WHERE LongestAddGTime NOT IN (45, 34) ORDER BY DestState, DivAirportLandings, AirlineID LIMIT 12"}
 {"sql":"SELECT CRSArrTime, DestCityName, CRSDepTime, MAX(DayofMonth), MIN(DayofMonth), MAX(ArrTime) FROM mytable WHERE FlightNum IN (1580, 4527, 5071) AND SecurityDelay NOT IN (0, 4, 18, 8, 14) AND ArrDel15 BETWEEN -9999 AND -9999 GROUP BY CRSArrTime, DestCityName, CRSDepTime  ORDER BY CRSArrTime, DestCityName, CRSDepTime LIMIT 4","hsqls":["SELECT CRSArrTime, DestCityName, CRSDepTime, MAX(DayofMonth), MIN(DayofMonth), MAX(ArrTime) FROM mytable WHERE FlightNum IN (1580, 4527, 5071) AND SecurityDelay NOT IN (0, 4, 18, 8, 14) AND ArrDel15 BETWEEN -9999 AND -9999 GROUP BY CRSArrTime, DestCityName, CRSDepTime  ORDER BY CRSArrTime, DestCityName, CRSDepTime LIMIT 4"]}
 {"sql":"SELECT OriginCityName, WheelsOn, MIN(DaysSinceEpoch), AVG(AirlineID) FROM mytable WHERE Flights IN (1) AND TailNum IN ('N632VA', 'N201FR', 'N646SW') GROUP BY OriginCityName, WheelsOn  ORDER BY OriginCityName, WheelsOn LIMIT 4","hsqls":["SELECT OriginCityName, WheelsOn, MIN(DaysSinceEpoch), AVG(AirlineID) FROM mytable WHERE Flights IN (1) AND TailNum IN ('N632VA', 'N201FR', 'N646SW') GROUP BY OriginCityName, WheelsOn  ORDER BY OriginCityName, WheelsOn LIMIT 4"]}
-{"sql":"SELECT OriginState, LateAircraftDelay, DepTimeBlk FROM mytable WHERE \"Year\" <> 2014 ORDER BY DestStateFips, DayOfWeek LIMIT 16","hsqls":["SELECT OriginState, LateAircraftDelay, DepTimeBlk FROM mytable WHERE Year <> 2014 ORDER BY DestStateFips, DayOfWeek LIMIT 16"]}
-{"sql":"SELECT DestState, CRSArrTime, SUM(\"Month\"), COUNT(ArrDelay) FROM mytable WHERE DayofMonth BETWEEN 27 AND 13 AND \"Month\" BETWEEN 1 AND 1 GROUP BY DestState, CRSArrTime LIMIT 23","hsqls":["SELECT DestState, CRSArrTime, SUM(Month), COUNT(ArrDelay) FROM mytable WHERE DayofMonth BETWEEN 27 AND 13 AND Month BETWEEN 1 AND 1 GROUP BY DestState, CRSArrTime LIMIT 23"]}
-{"sql":"SELECT DivLongestGTimes, DepTimeBlk FROM mytable ORDER BY Distance, DestCityName, DestCityMarketID LIMIT 11","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DepTimeBlk FROM mytable ORDER BY Distance, DestCityName, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT DestState, DayOfWeek FROM mytable WHERE CRSElapsedTime BETWEEN 187 AND 47 AND WheelsOn IN (1052, 1930) AND DivWheelsOffs BETWEEN 57 AND 1638 ORDER BY LongestAddGTime LIMIT 12","hsqls":["SELECT DestState, DayOfWeek FROM mytable WHERE CRSElapsedTime BETWEEN 187 AND 47 AND WheelsOn IN (1052, 1930) AND (DivWheelsOffs__MV0 BETWEEN 57 AND 1638 OR DivWheelsOffs__MV1 BETWEEN 57 AND 1638 OR DivWheelsOffs__MV2 BETWEEN 57 AND 1638 OR DivWheelsOffs__MV3 BETWEEN 57 AND 1638 OR DivWheelsOffs__MV4 BETWEEN 57 AND 1638) ORDER BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT OriginState, LateAircraftDelay, DepTimeBlk FROM mytable WHERE \"Year\" <> 2014 ORDER BY DestStateFips, DayOfWeek LIMIT 16","hsqls":["SELECT OriginState, LateAircraftDelay, DepTimeBlk FROM mytable WHERE `Year` <> 2014 ORDER BY DestStateFips, DayOfWeek LIMIT 16"]}
+{"sql":"SELECT DestState, CRSArrTime, SUM(\"Month\"), COUNT(ArrDelay) FROM mytable WHERE DayofMonth BETWEEN 27 AND 13 AND \"Month\" BETWEEN 1 AND 1 GROUP BY DestState, CRSArrTime LIMIT 23","hsqls":["SELECT DestState, CRSArrTime, SUM(`Month`), COUNT(ArrDelay) FROM mytable WHERE DayofMonth BETWEEN 27 AND 13 AND `Month` BETWEEN 1 AND 1 GROUP BY DestState, CRSArrTime LIMIT 23"]}
+{"sql":"SELECT DivLongestGTimes, DepTimeBlk FROM mytable ORDER BY Distance, DestCityName, DestCityMarketID LIMIT 11","hsqls":["SELECT DivLongestGTimes, DepTimeBlk FROM mytable ORDER BY Distance, DestCityName, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestState, DayOfWeek FROM mytable WHERE CRSElapsedTime BETWEEN 187 AND 47 AND WheelsOn IN (1052, 1930) AND DivWheelsOffs BETWEEN 57 AND 1638 ORDER BY LongestAddGTime LIMIT 12","hsqls":["SELECT DestState, DayOfWeek FROM mytable WHERE CRSElapsedTime BETWEEN 187 AND 47 AND WheelsOn IN (1052, 1930) AND (DivWheelsOffs[1] BETWEEN 57 AND 1638 OR DivWheelsOffs[2] BETWEEN 57 AND 1638 OR DivWheelsOffs[3] BETWEEN 57 AND 1638 OR DivWheelsOffs[4] BETWEEN 57 AND 1638 OR DivWheelsOffs[5] BETWEEN 57 AND 1638) ORDER BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DestAirportID, MAX(DivReachedDest) FROM mytable WHERE WheelsOff IN (1936, 1410, 1947, 1010) GROUP BY LongestAddGTime, DestAirportID  ORDER BY LongestAddGTime, DestAirportID LIMIT 5","hsqls":["SELECT LongestAddGTime, DestAirportID, MAX(DivReachedDest) FROM mytable WHERE WheelsOff IN (1936, 1410, 1947, 1010) GROUP BY LongestAddGTime, DestAirportID  ORDER BY LongestAddGTime, DestAirportID LIMIT 5"]}
-{"sql":"SELECT TotalAddGTime, MIN(LongestAddGTime) FROM mytable WHERE DivAirportIDs BETWEEN 13873 AND 14696 GROUP BY TotalAddGTime LIMIT 15","hsqls":["SELECT TotalAddGTime, MIN(LongestAddGTime) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 13873 AND 14696 OR DivAirportIDs__MV1 BETWEEN 13873 AND 14696 OR DivAirportIDs__MV2 BETWEEN 13873 AND 14696 OR DivAirportIDs__MV3 BETWEEN 13873 AND 14696 OR DivAirportIDs__MV4 BETWEEN 13873 AND 14696) GROUP BY TotalAddGTime LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, MIN(LongestAddGTime) FROM mytable WHERE DivAirportIDs BETWEEN 13873 AND 14696 GROUP BY TotalAddGTime LIMIT 15","hsqls":["SELECT TotalAddGTime, MIN(LongestAddGTime) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 13873 AND 14696 OR DivAirportIDs[2] BETWEEN 13873 AND 14696 OR DivAirportIDs[3] BETWEEN 13873 AND 14696 OR DivAirportIDs[4] BETWEEN 13873 AND 14696 OR DivAirportIDs[5] BETWEEN 13873 AND 14696) GROUP BY TotalAddGTime LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, MAX(AirlineID), SUM(CRSArrTime), SUM(DivArrDelay) FROM mytable WHERE FirstDepTime BETWEEN 12 AND 617 OR LongestAddGTime <> 55 OR CRSArrTime <> 846 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 28","hsqls":["SELECT LongestAddGTime, MAX(AirlineID), SUM(CRSArrTime), SUM(DivArrDelay) FROM mytable WHERE FirstDepTime BETWEEN 12 AND 617 OR LongestAddGTime <> 55 OR CRSArrTime <> 846 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 28"]}
 {"sql":"SELECT DepartureDelayGroups, COUNT(*) FROM mytable WHERE DistanceGroup >= 7 AND Origin <> 'ORF' GROUP BY DepartureDelayGroups","hsqls":["SELECT DepartureDelayGroups, COUNT(*) FROM mytable WHERE DistanceGroup >= 7 AND Origin <> 'ORF' GROUP BY DepartureDelayGroups"]}
 {"sql":"SELECT DestWac FROM mytable WHERE DepTimeBlk <> '2100-2159' AND TaxiIn >= 109 AND ArrDel15 NOT IN (0, -9999) LIMIT 21"}
@@ -9308,102 +9308,102 @@
 {"sql":"SELECT CancellationCode FROM mytable WHERE DestCityName BETWEEN 'Dallas/Fort Worth, TX' AND 'Greer, SC' ORDER BY Dest, ArrDelay, OriginWac LIMIT 25"}
 {"sql":"SELECT DepartureDelayGroups, ArrTime, CRSDepTime, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) GROUP BY DepartureDelayGroups, ArrTime, CRSDepTime  ORDER BY DepartureDelayGroups, ArrTime, CRSDepTime LIMIT 13","hsqls":["SELECT DepartureDelayGroups, ArrTime, CRSDepTime, COUNT(*) FROM mytable WHERE Diverted IN (1, 0) GROUP BY DepartureDelayGroups, ArrTime, CRSDepTime  ORDER BY DepartureDelayGroups, ArrTime, CRSDepTime LIMIT 13"]}
 {"sql":"SELECT CarrierDelay, OriginWac, WheelsOn FROM mytable WHERE ArrDelay NOT IN (72.0) ORDER BY DivArrDelay LIMIT 2"}
-{"sql":"SELECT LateAircraftDelay, DestCityMarketID, DivArrDelay FROM mytable WHERE DestWac BETWEEN 36 AND 61 OR TaxiIn > 196 OR DivTotalGTimes BETWEEN 57 AND 107 ORDER BY DivReachedDest, OriginStateFips, DestAirportSeqID LIMIT 28","hsqls":["SELECT LateAircraftDelay, DestCityMarketID, DivArrDelay FROM mytable WHERE DestWac BETWEEN 36 AND 61 OR TaxiIn > 196 OR (DivTotalGTimes__MV0 BETWEEN 57 AND 107 OR DivTotalGTimes__MV1 BETWEEN 57 AND 107 OR DivTotalGTimes__MV2 BETWEEN 57 AND 107 OR DivTotalGTimes__MV3 BETWEEN 57 AND 107 OR DivTotalGTimes__MV4 BETWEEN 57 AND 107) ORDER BY DivReachedDest, OriginStateFips, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, DestCityMarketID, DivArrDelay FROM mytable WHERE DestWac BETWEEN 36 AND 61 OR TaxiIn > 196 OR DivTotalGTimes BETWEEN 57 AND 107 ORDER BY DivReachedDest, OriginStateFips, DestAirportSeqID LIMIT 28","hsqls":["SELECT LateAircraftDelay, DestCityMarketID, DivArrDelay FROM mytable WHERE DestWac BETWEEN 36 AND 61 OR TaxiIn > 196 OR (DivTotalGTimes[1] BETWEEN 57 AND 107 OR DivTotalGTimes[2] BETWEEN 57 AND 107 OR DivTotalGTimes[3] BETWEEN 57 AND 107 OR DivTotalGTimes[4] BETWEEN 57 AND 107 OR DivTotalGTimes[5] BETWEEN 57 AND 107) ORDER BY DivReachedDest, OriginStateFips, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, DestCityMarketID, COUNT(*) FROM mytable GROUP BY WheelsOff, DestCityMarketID  ORDER BY WheelsOff, DestCityMarketID LIMIT 12","hsqls":["SELECT WheelsOff, DestCityMarketID, COUNT(*) FROM mytable GROUP BY WheelsOff, DestCityMarketID  ORDER BY WheelsOff, DestCityMarketID LIMIT 12"]}
-{"sql":"SELECT DestCityName, DivTotalGTimes FROM mytable WHERE Origin = 'EUG' AND UniqueCarrier NOT IN ('HA', 'AS', 'AA') OR DestWac NOT IN (51, 54, 37) ORDER BY FlightNum, DestCityName, DestAirportID LIMIT 24","hsqls":["SELECT DestCityName, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Origin = 'EUG' AND UniqueCarrier NOT IN ('HA', 'AS', 'AA') OR DestWac NOT IN (51, 54, 37) ORDER BY FlightNum, DestCityName, DestAirportID LIMIT 10000"]}
-{"sql":"SELECT AVG(AirTime), SUM(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N8315C' AND 'N130DL' OR DivAirports IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 5","hsqls":["SELECT AVG(AirTime), SUM(OriginStateFips)  FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV1 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV2 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV3 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV4 BETWEEN 'N8315C' AND 'N130DL') OR (DivAirports__MV0 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV1 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV2 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV3 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV4 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT')) AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 10000"]}
+{"sql":"SELECT DestCityName, DivTotalGTimes FROM mytable WHERE Origin = 'EUG' AND UniqueCarrier NOT IN ('HA', 'AS', 'AA') OR DestWac NOT IN (51, 54, 37) ORDER BY FlightNum, DestCityName, DestAirportID LIMIT 24","hsqls":["SELECT DestCityName, DivTotalGTimes FROM mytable WHERE Origin = 'EUG' AND UniqueCarrier NOT IN ('HA', 'AS', 'AA') OR DestWac NOT IN (51, 54, 37) ORDER BY FlightNum, DestCityName, DestAirportID LIMIT 10000"]}
+{"sql":"SELECT AVG(AirTime), SUM(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N8315C' AND 'N130DL' OR DivAirports IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 5","hsqls":["SELECT AVG(AirTime), SUM(OriginStateFips)  FROM mytable WHERE (DivTailNums[1] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[2] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[3] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[4] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[5] BETWEEN 'N8315C' AND 'N130DL') OR (DivAirports[1] IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports[2] IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports[3] IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports[4] IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports[5] IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT')) AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 10000"]}
 {"sql":"SELECT DepDelay, \"Month\", WheelsOn FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY DestAirportSeqID LIMIT 3","hsqls":["SELECT DepDelay, Month, WheelsOn FROM mytable WHERE DivReachedDest IN (1, 0, -9999) ORDER BY DestAirportSeqID LIMIT 3"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE DepTimeBlk <> '2000-2059' AND DivTotalGTimes IN (79, 2, 48, 72) AND FlightNum BETWEEN 6010 AND 3688 LIMIT 22","hsqls":["SELECT COUNT(*) FROM mytable WHERE DepTimeBlk <> '2000-2059' AND (DivTotalGTimes__MV0 IN (79, 2, 48, 72) OR DivTotalGTimes__MV1 IN (79, 2, 48, 72) OR DivTotalGTimes__MV2 IN (79, 2, 48, 72) OR DivTotalGTimes__MV3 IN (79, 2, 48, 72) OR DivTotalGTimes__MV4 IN (79, 2, 48, 72)) AND FlightNum BETWEEN 6010 AND 3688 LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE DepTimeBlk <> '2000-2059' AND DivTotalGTimes IN (79, 2, 48, 72) AND FlightNum BETWEEN 6010 AND 3688 LIMIT 22","hsqls":["SELECT COUNT(*) FROM mytable WHERE DepTimeBlk <> '2000-2059' AND (DivTotalGTimes[1] IN (79, 2, 48, 72) OR DivTotalGTimes[2] IN (79, 2, 48, 72) OR DivTotalGTimes[3] IN (79, 2, 48, 72) OR DivTotalGTimes[4] IN (79, 2, 48, 72) OR DivTotalGTimes[5] IN (79, 2, 48, 72)) AND FlightNum BETWEEN 6010 AND 3688 LIMIT 10000"]}
 {"sql":"SELECT Quarter, ArrDel15, ArrDelay FROM mytable WHERE OriginStateFips >= 4 OR SecurityDelay < 10 OR OriginAirportSeqID = 1473003 ORDER BY DayOfWeek LIMIT 25"}
 {"sql":"SELECT TotalAddGTime, Origin, OriginAirportID FROM mytable WHERE TaxiOut BETWEEN 85 AND 15 LIMIT 29"}
 {"sql":"SELECT OriginCityMarketID, OriginCityName, MAX(DivActualElapsedTime) FROM mytable WHERE WheelsOff BETWEEN 1916 AND 913 GROUP BY OriginCityMarketID, OriginCityName  ORDER BY OriginCityMarketID, OriginCityName LIMIT 8","hsqls":["SELECT OriginCityMarketID, OriginCityName, MAX(DivActualElapsedTime) FROM mytable WHERE WheelsOff BETWEEN 1916 AND 913 GROUP BY OriginCityMarketID, OriginCityName  ORDER BY OriginCityMarketID, OriginCityName LIMIT 8"]}
 {"sql":"SELECT DivDistance, Cancelled, CancellationCode FROM mytable ORDER BY CRSArrTime, ArrTime, Dest LIMIT 24"}
-{"sql":"SELECT Diverted, DivAirportIDs FROM mytable WHERE OriginStateFips BETWEEN 54 AND 33 LIMIT 12","hsqls":["SELECT Diverted, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginStateFips BETWEEN 54 AND 33 LIMIT 10000"]}
-{"sql":"SELECT MIN(\"Year\") FROM mytable LIMIT 18","hsqls":["SELECT MIN(Year) FROM mytable LIMIT 18"]}
-{"sql":"SELECT ArrDelayMinutes, AirTime, \"Month\" FROM mytable WHERE LongestAddGTime IN (63) OR OriginAirportSeqID > 1029904 OR Dest = 'SAV' ORDER BY DestStateFips, WheelsOn LIMIT 13","hsqls":["SELECT ArrDelayMinutes, AirTime, Month FROM mytable WHERE LongestAddGTime IN (63) OR OriginAirportSeqID > 1029904 OR Dest = 'SAV' ORDER BY DestStateFips, WheelsOn LIMIT 13"]}
-{"sql":"SELECT MAX(\"Year\"), MAX(ArrivalDelayGroups), MIN(DivDistance) FROM mytable WHERE AirTime IN (289, 124) LIMIT 4","hsqls":["SELECT MAX(Year), MAX(ArrivalDelayGroups), MIN(DivDistance) FROM mytable WHERE AirTime IN (289, 124) LIMIT 4"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY OriginCityMarketID LIMIT 16","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT Diverted, DivAirportIDs FROM mytable WHERE OriginStateFips BETWEEN 54 AND 33 LIMIT 12","hsqls":["SELECT Diverted, DivAirportIDs FROM mytable WHERE OriginStateFips BETWEEN 54 AND 33 LIMIT 10000"]}
+{"sql":"SELECT MIN(\"Year\") FROM mytable LIMIT 18","hsqls":["SELECT MIN(`Year`) FROM mytable LIMIT 18"]}
+{"sql":"SELECT ArrDelayMinutes, AirTime, \"Month\" FROM mytable WHERE LongestAddGTime IN (63) OR OriginAirportSeqID > 1029904 OR Dest = 'SAV' ORDER BY DestStateFips, WheelsOn LIMIT 13","hsqls":["SELECT ArrDelayMinutes, AirTime, `Month` FROM mytable WHERE LongestAddGTime IN (63) OR OriginAirportSeqID > 1029904 OR Dest = 'SAV' ORDER BY DestStateFips, WheelsOn LIMIT 13"]}
+{"sql":"SELECT MAX(\"Year\"), MAX(ArrivalDelayGroups), MIN(DivDistance) FROM mytable WHERE AirTime IN (289, 124) LIMIT 4","hsqls":["SELECT MAX(`Year`), MAX(ArrivalDelayGroups), MIN(DivDistance) FROM mytable WHERE AirTime IN (289, 124) LIMIT 4"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY OriginCityMarketID LIMIT 16","hsqls":["SELECT DivTotalGTimes FROM mytable ORDER BY OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DestWac, COUNT(*) FROM mytable GROUP BY DestWac  ORDER BY DestWac LIMIT 18","hsqls":["SELECT DestWac, COUNT(*) FROM mytable GROUP BY DestWac  ORDER BY DestWac LIMIT 18"]}
-{"sql":"SELECT CarrierDelay FROM mytable WHERE WeatherDelay BETWEEN 58 AND 98 OR OriginWac <> 54 AND DivTailNums = 'N937WN' ORDER BY Diverted LIMIT 6","hsqls":["SELECT CarrierDelay FROM mytable WHERE WeatherDelay BETWEEN 58 AND 98 OR OriginWac <> 54 AND (DivTailNums__MV0 = 'N937WN' OR DivTailNums__MV1 = 'N937WN' OR DivTailNums__MV2 = 'N937WN' OR DivTailNums__MV3 = 'N937WN' OR DivTailNums__MV4 = 'N937WN') ORDER BY Diverted LIMIT 10000"]}
-{"sql":"SELECT Quarter, WeatherDelay, DestStateName FROM mytable WHERE \"Month\" <> 1 ORDER BY Distance, TotalAddGTime, ArrDelayMinutes LIMIT 29","hsqls":["SELECT Quarter, WeatherDelay, DestStateName FROM mytable WHERE Month <> 1 ORDER BY Distance, TotalAddGTime, ArrDelayMinutes LIMIT 29"]}
+{"sql":"SELECT CarrierDelay FROM mytable WHERE WeatherDelay BETWEEN 58 AND 98 OR OriginWac <> 54 AND DivTailNums = 'N937WN' ORDER BY Diverted LIMIT 6","hsqls":["SELECT CarrierDelay FROM mytable WHERE WeatherDelay BETWEEN 58 AND 98 OR OriginWac <> 54 AND (DivTailNums[1] = 'N937WN' OR DivTailNums[2] = 'N937WN' OR DivTailNums[3] = 'N937WN' OR DivTailNums[4] = 'N937WN' OR DivTailNums[5] = 'N937WN') ORDER BY Diverted LIMIT 10000"]}
+{"sql":"SELECT Quarter, WeatherDelay, DestStateName FROM mytable WHERE \"Month\" <> 1 ORDER BY Distance, TotalAddGTime, ArrDelayMinutes LIMIT 29","hsqls":["SELECT Quarter, WeatherDelay, DestStateName FROM mytable WHERE `Month` <> 1 ORDER BY Distance, TotalAddGTime, ArrDelayMinutes LIMIT 29"]}
 {"sql":"SELECT WeatherDelay FROM mytable WHERE DepTime IN (2200) OR DestAirportID BETWEEN 12441 AND 14576 ORDER BY CRSArrTime, OriginWac, DestCityMarketID LIMIT 12"}
 {"sql":"SELECT MIN(LateAircraftDelay), MAX(LongestAddGTime), AVG(AirlineID) FROM mytable WHERE DestStateFips = 53 AND Distance <> 2345 AND DayofMonth BETWEEN 10 AND 21 LIMIT 3"}
 {"sql":"SELECT ArrivalDelayGroups, AVG(DayOfWeek), AVG(ArrDel15), COUNT(ArrDel15) FROM mytable WHERE CRSDepTime BETWEEN 1535 AND 2029 OR ArrivalDelayGroups IN (-1) GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 7","hsqls":["SELECT ArrivalDelayGroups, AVG(DayOfWeek), AVG(ArrDel15), COUNT(ArrDel15) FROM mytable WHERE CRSDepTime BETWEEN 1535 AND 2029 OR ArrivalDelayGroups IN (-1) GROUP BY ArrivalDelayGroups  ORDER BY ArrivalDelayGroups LIMIT 7"]}
-{"sql":"SELECT OriginCityMarketID, MAX(WheelsOff), AVG(DestCityMarketID), SUM(DivDistance) FROM mytable WHERE ArrDelay < 128.0 OR Origin > 'TWF' OR \"Year\" NOT IN (2014) GROUP BY OriginCityMarketID LIMIT 15","hsqls":["SELECT OriginCityMarketID, MAX(WheelsOff), AVG(DestCityMarketID), SUM(DivDistance) FROM mytable WHERE ArrDelay < 128.0 OR Origin > 'TWF' OR Year NOT IN (2014) GROUP BY OriginCityMarketID LIMIT 15"]}
+{"sql":"SELECT OriginCityMarketID, MAX(WheelsOff), AVG(DestCityMarketID), SUM(DivDistance) FROM mytable WHERE ArrDelay < 128.0 OR Origin > 'TWF' OR \"Year\" NOT IN (2014) GROUP BY OriginCityMarketID LIMIT 15","hsqls":["SELECT OriginCityMarketID, MAX(WheelsOff), AVG(DestCityMarketID), SUM(DivDistance) FROM mytable WHERE ArrDelay < 128.0 OR Origin > 'TWF' OR `Year` NOT IN (2014) GROUP BY OriginCityMarketID LIMIT 15"]}
 {"sql":"SELECT OriginCityMarketID FROM mytable WHERE DivAirportLandings < 1 OR DivActualElapsedTime BETWEEN 404 AND 546 ORDER BY Quarter, DepTimeBlk, AirTime LIMIT 15"}
 {"sql":"SELECT TaxiOut, DepTimeBlk, OriginStateName, COUNT(DepDel15), AVG(DestStateFips), AVG(ArrDelay) FROM mytable WHERE UniqueCarrier > 'US' AND WheelsOn NOT IN (941) AND ArrDel15 <= -9999 GROUP BY TaxiOut, DepTimeBlk, OriginStateName  ORDER BY TaxiOut, DepTimeBlk, OriginStateName LIMIT 25","hsqls":["SELECT TaxiOut, DepTimeBlk, OriginStateName, COUNT(DepDel15), AVG(DestStateFips), AVG(ArrDelay) FROM mytable WHERE UniqueCarrier > 'US' AND WheelsOn NOT IN (941) AND ArrDel15 <= -9999 GROUP BY TaxiOut, DepTimeBlk, OriginStateName  ORDER BY TaxiOut, DepTimeBlk, OriginStateName LIMIT 25"]}
-{"sql":"SELECT OriginState FROM mytable WHERE OriginAirportID IN (14747, 11203, 10155, 10918, 12819) OR DestState BETWEEN 'MN' AND 'OH' AND DivAirports IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') ORDER BY DestWac, DestAirportSeqID, DepTimeBlk LIMIT 26","hsqls":["SELECT OriginState FROM mytable WHERE OriginAirportID IN (14747, 11203, 10155, 10918, 12819) OR DestState BETWEEN 'MN' AND 'OH' AND (DivAirports__MV0 IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports__MV1 IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports__MV2 IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports__MV3 IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports__MV4 IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME')) ORDER BY DestWac, DestAirportSeqID, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT Cancelled, DivWheelsOffs FROM mytable WHERE ArrDelayMinutes BETWEEN 211.0 AND 95.0 AND AirlineID BETWEEN 19805 AND 20437 ORDER BY SecurityDelay, Cancelled LIMIT 20","hsqls":["SELECT Cancelled, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE ArrDelayMinutes BETWEEN 211.0 AND 95.0 AND AirlineID BETWEEN 19805 AND 20437 ORDER BY SecurityDelay, Cancelled LIMIT 10000"]}
+{"sql":"SELECT OriginState FROM mytable WHERE OriginAirportID IN (14747, 11203, 10155, 10918, 12819) OR DestState BETWEEN 'MN' AND 'OH' AND DivAirports IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') ORDER BY DestWac, DestAirportSeqID, DepTimeBlk LIMIT 26","hsqls":["SELECT OriginState FROM mytable WHERE OriginAirportID IN (14747, 11203, 10155, 10918, 12819) OR DestState BETWEEN 'MN' AND 'OH' AND (DivAirports[1] IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports[2] IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports[3] IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports[4] IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME') OR DivAirports[5] IN ('ATL', 'AEX', 'LBB', 'BTV', 'OME')) ORDER BY DestWac, DestAirportSeqID, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT Cancelled, DivWheelsOffs FROM mytable WHERE ArrDelayMinutes BETWEEN 211.0 AND 95.0 AND AirlineID BETWEEN 19805 AND 20437 ORDER BY SecurityDelay, Cancelled LIMIT 20","hsqls":["SELECT Cancelled, DivWheelsOffs FROM mytable WHERE ArrDelayMinutes BETWEEN 211.0 AND 95.0 AND AirlineID BETWEEN 19805 AND 20437 ORDER BY SecurityDelay, Cancelled LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DistanceGroup, LongestAddGTime FROM mytable WHERE Flights <= 1 ORDER BY LateAircraftDelay, FlightNum LIMIT 10"}
 {"sql":"SELECT DepartureDelayGroups, Distance FROM mytable WHERE AirTime NOT IN (45) ORDER BY DepDelay, DestAirportSeqID, DestAirportID LIMIT 7"}
 {"sql":"SELECT TaxiOut, Diverted, WheelsOn, SUM(NASDelay), AVG(NASDelay), AVG(DayOfWeek) FROM mytable GROUP BY TaxiOut, Diverted, WheelsOn  ORDER BY TaxiOut, Diverted, WheelsOn LIMIT 21","hsqls":["SELECT TaxiOut, Diverted, WheelsOn, SUM(NASDelay), AVG(NASDelay), AVG(DayOfWeek) FROM mytable GROUP BY TaxiOut, Diverted, WheelsOn  ORDER BY TaxiOut, Diverted, WheelsOn LIMIT 21"]}
 {"sql":"SELECT Diverted, DestCityName FROM mytable WHERE DestState NOT IN ('NM', 'AK', 'KY') AND Diverted = 0 ORDER BY WheelsOff, DestState LIMIT 2"}
 {"sql":"SELECT OriginState FROM mytable ORDER BY DestState, DivDistance, DayOfWeek LIMIT 25"}
-{"sql":"SELECT SUM(\"Month\") FROM mytable WHERE Distance NOT IN (840, 188) LIMIT 8","hsqls":["SELECT SUM(Month) FROM mytable WHERE Distance NOT IN (840, 188) LIMIT 8"]}
+{"sql":"SELECT SUM(\"Month\") FROM mytable WHERE Distance NOT IN (840, 188) LIMIT 8","hsqls":["SELECT SUM(`Month`) FROM mytable WHERE Distance NOT IN (840, 188) LIMIT 8"]}
 {"sql":"SELECT ArrTime, MAX(DestStateFips) FROM mytable WHERE DayofMonth NOT IN (30, 4, 31, 22, 25) GROUP BY ArrTime  ORDER BY ArrTime LIMIT 25","hsqls":["SELECT ArrTime, MAX(DestStateFips) FROM mytable WHERE DayofMonth NOT IN (30, 4, 31, 22, 25) GROUP BY ArrTime  ORDER BY ArrTime LIMIT 25"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable LIMIT 22","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable LIMIT 22","hsqls":["SELECT DivLongestGTimes FROM mytable LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, CRSDepTime FROM mytable WHERE DivReachedDest > 1 OR DestStateFips BETWEEN 2 AND 32 ORDER BY OriginStateFips, Origin LIMIT 23"}
 {"sql":"SELECT ArrTimeBlk, OriginStateName, AVG(WeatherDelay), SUM(CarrierDelay), SUM(CRSElapsedTime) FROM mytable GROUP BY ArrTimeBlk, OriginStateName  ORDER BY ArrTimeBlk, OriginStateName LIMIT 15","hsqls":["SELECT ArrTimeBlk, OriginStateName, AVG(WeatherDelay), SUM(CarrierDelay), SUM(CRSElapsedTime) FROM mytable GROUP BY ArrTimeBlk, OriginStateName  ORDER BY ArrTimeBlk, OriginStateName LIMIT 15"]}
-{"sql":"SELECT Carrier, Origin, WheelsOn FROM mytable WHERE DivWheelsOffs BETWEEN 2243 AND 1912 AND ArrivalDelayGroups NOT IN (12) OR Diverted BETWEEN 0 AND 0 LIMIT 24","hsqls":["SELECT Carrier, Origin, WheelsOn FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 2243 AND 1912 OR DivWheelsOffs__MV1 BETWEEN 2243 AND 1912 OR DivWheelsOffs__MV2 BETWEEN 2243 AND 1912 OR DivWheelsOffs__MV3 BETWEEN 2243 AND 1912 OR DivWheelsOffs__MV4 BETWEEN 2243 AND 1912) AND ArrivalDelayGroups NOT IN (12) OR Diverted BETWEEN 0 AND 0 LIMIT 10000"]}
+{"sql":"SELECT Carrier, Origin, WheelsOn FROM mytable WHERE DivWheelsOffs BETWEEN 2243 AND 1912 AND ArrivalDelayGroups NOT IN (12) OR Diverted BETWEEN 0 AND 0 LIMIT 24","hsqls":["SELECT Carrier, Origin, WheelsOn FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 2243 AND 1912 OR DivWheelsOffs[2] BETWEEN 2243 AND 1912 OR DivWheelsOffs[3] BETWEEN 2243 AND 1912 OR DivWheelsOffs[4] BETWEEN 2243 AND 1912 OR DivWheelsOffs[5] BETWEEN 2243 AND 1912) AND ArrivalDelayGroups NOT IN (12) OR Diverted BETWEEN 0 AND 0 LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, MAX(CarrierDelay), SUM(CRSArrTime), SUM(DayOfWeek) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 26","hsqls":["SELECT OriginStateFips, MAX(CarrierDelay), SUM(CRSArrTime), SUM(DayOfWeek) FROM mytable GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 26"]}
 {"sql":"SELECT Diverted, DestStateName, Origin FROM mytable WHERE TaxiOut >= 91 OR FlightNum BETWEEN 2007 AND 1010 AND AirlineID > 19977 ORDER BY Dest, DayofMonth, DivArrDelay"}
 {"sql":"SELECT FirstDepTime, DivArrDelay FROM mytable WHERE DepDelay IN (179.0, 456.0) AND OriginState NOT IN ('IL', 'VT', 'MA', 'AL') OR AirTime BETWEEN 65 AND 289 LIMIT 12"}
-{"sql":"SELECT DivTailNums FROM mytable WHERE DestStateFips <= 25 OR TaxiIn IN (56, 24, 37) ORDER BY Diverted, OriginWac, CancellationCode LIMIT 19","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DestStateFips <= 25 OR TaxiIn IN (56, 24, 37) ORDER BY Diverted, OriginWac, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT DivTailNums FROM mytable WHERE DestStateFips <= 25 OR TaxiIn IN (56, 24, 37) ORDER BY Diverted, OriginWac, CancellationCode LIMIT 19","hsqls":["SELECT DivTailNums FROM mytable WHERE DestStateFips <= 25 OR TaxiIn IN (56, 24, 37) ORDER BY Diverted, OriginWac, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DestStateName, OriginAirportID, AVG(DepTime) FROM mytable WHERE TaxiIn IN (59, 19) GROUP BY DestStateName, OriginAirportID  ORDER BY DestStateName, OriginAirportID LIMIT 11","hsqls":["SELECT DestStateName, OriginAirportID, AVG(DepTime) FROM mytable WHERE TaxiIn IN (59, 19) GROUP BY DestStateName, OriginAirportID  ORDER BY DestStateName, OriginAirportID LIMIT 11"]}
-{"sql":"SELECT OriginCityMarketID, ActualElapsedTime, DivArrDelay, SUM(DepTime) FROM mytable WHERE DivTailNums BETWEEN 'N655WN' AND 'N614QX' GROUP BY OriginCityMarketID, ActualElapsedTime, DivArrDelay LIMIT 2","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, DivArrDelay, SUM(DepTime) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums__MV1 BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums__MV2 BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums__MV3 BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums__MV4 BETWEEN 'N655WN' AND 'N614QX') GROUP BY OriginCityMarketID, ActualElapsedTime, DivArrDelay LIMIT 10000"]}
-{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivTotalGTimes IN (30, 139, 51, 61) ORDER BY OriginAirportID LIMIT 14","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE (DivTotalGTimes__MV0 IN (30, 139, 51, 61) OR DivTotalGTimes__MV1 IN (30, 139, 51, 61) OR DivTotalGTimes__MV2 IN (30, 139, 51, 61) OR DivTotalGTimes__MV3 IN (30, 139, 51, 61) OR DivTotalGTimes__MV4 IN (30, 139, 51, 61)) ORDER BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT OriginCityMarketID, ActualElapsedTime, DivArrDelay, SUM(DepTime) FROM mytable WHERE DivTailNums BETWEEN 'N655WN' AND 'N614QX' GROUP BY OriginCityMarketID, ActualElapsedTime, DivArrDelay LIMIT 2","hsqls":["SELECT OriginCityMarketID, ActualElapsedTime, DivArrDelay, SUM(DepTime) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums[2] BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums[3] BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums[4] BETWEEN 'N655WN' AND 'N614QX' OR DivTailNums[5] BETWEEN 'N655WN' AND 'N614QX') GROUP BY OriginCityMarketID, ActualElapsedTime, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT ArrTimeBlk FROM mytable WHERE DivTotalGTimes IN (30, 139, 51, 61) ORDER BY OriginAirportID LIMIT 14","hsqls":["SELECT ArrTimeBlk FROM mytable WHERE (DivTotalGTimes[1] IN (30, 139, 51, 61) OR DivTotalGTimes[2] IN (30, 139, 51, 61) OR DivTotalGTimes[3] IN (30, 139, 51, 61) OR DivTotalGTimes[4] IN (30, 139, 51, 61) OR DivTotalGTimes[5] IN (30, 139, 51, 61)) ORDER BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, DestStateName, AirlineID, COUNT(DepDelay), AVG(FlightNum), SUM(DepartureDelayGroups) FROM mytable WHERE DestAirportID BETWEEN 12884 AND 15370 GROUP BY LongestAddGTime, DestStateName, AirlineID  ORDER BY LongestAddGTime, DestStateName, AirlineID LIMIT 21","hsqls":["SELECT LongestAddGTime, DestStateName, AirlineID, COUNT(DepDelay), AVG(FlightNum), SUM(DepartureDelayGroups) FROM mytable WHERE DestAirportID BETWEEN 12884 AND 15370 GROUP BY LongestAddGTime, DestStateName, AirlineID  ORDER BY LongestAddGTime, DestStateName, AirlineID LIMIT 21"]}
 {"sql":"SELECT ArrDelayMinutes FROM mytable WHERE ArrDel15 <> 1 OR WeatherDelay BETWEEN 24 AND 105 OR DayofMonth <> 24 ORDER BY CarrierDelay LIMIT 10"}
-{"sql":"SELECT \"Month\" FROM mytable ORDER BY \"Year\" LIMIT 27","hsqls":["SELECT Month FROM mytable ORDER BY Year LIMIT 27"]}
+{"sql":"SELECT \"Month\" FROM mytable ORDER BY \"Year\" LIMIT 27","hsqls":["SELECT `Month` FROM mytable ORDER BY `Year` LIMIT 27"]}
 {"sql":"SELECT DivActualElapsedTime FROM mytable WHERE Diverted IN (1, 0) AND TaxiIn NOT IN (95, 72, 14, 28) ORDER BY DestWac, Dest LIMIT 8"}
 {"sql":"SELECT CancellationCode FROM mytable WHERE WeatherDelay NOT IN (205) AND DestState IN ('MT', 'PR') ORDER BY WeatherDelay, Distance, CRSDepTime LIMIT 19"}
-{"sql":"SELECT FlightNum, CRSArrTime, CarrierDelay, COUNT(DivDistance) FROM mytable WHERE TotalAddGTime IN (19, 5) OR DivWheelsOffs IN (851, 2314) AND DivAirportSeqIDs IN (1393102, 1025702, 1348502, 1382902) GROUP BY FlightNum, CRSArrTime, CarrierDelay LIMIT 12","hsqls":["SELECT FlightNum, CRSArrTime, CarrierDelay, COUNT(DivDistance) FROM mytable WHERE TotalAddGTime IN (19, 5) OR (DivWheelsOffs__MV0 IN (851, 2314) OR DivWheelsOffs__MV1 IN (851, 2314) OR DivWheelsOffs__MV2 IN (851, 2314) OR DivWheelsOffs__MV3 IN (851, 2314) OR DivWheelsOffs__MV4 IN (851, 2314)) AND (DivAirportSeqIDs__MV0 IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs__MV1 IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs__MV2 IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs__MV3 IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs__MV4 IN (1393102, 1025702, 1348502, 1382902)) GROUP BY FlightNum, CRSArrTime, CarrierDelay LIMIT 10000"]}
+{"sql":"SELECT FlightNum, CRSArrTime, CarrierDelay, COUNT(DivDistance) FROM mytable WHERE TotalAddGTime IN (19, 5) OR DivWheelsOffs IN (851, 2314) AND DivAirportSeqIDs IN (1393102, 1025702, 1348502, 1382902) GROUP BY FlightNum, CRSArrTime, CarrierDelay LIMIT 12","hsqls":["SELECT FlightNum, CRSArrTime, CarrierDelay, COUNT(DivDistance) FROM mytable WHERE TotalAddGTime IN (19, 5) OR (DivWheelsOffs[1] IN (851, 2314) OR DivWheelsOffs[2] IN (851, 2314) OR DivWheelsOffs[3] IN (851, 2314) OR DivWheelsOffs[4] IN (851, 2314) OR DivWheelsOffs[5] IN (851, 2314)) AND (DivAirportSeqIDs[1] IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs[2] IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs[3] IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs[4] IN (1393102, 1025702, 1348502, 1382902) OR DivAirportSeqIDs[5] IN (1393102, 1025702, 1348502, 1382902)) GROUP BY FlightNum, CRSArrTime, CarrierDelay LIMIT 10000"]}
 {"sql":"SELECT FlightNum, DestStateFips, DestCityMarketID FROM mytable WHERE DestStateName BETWEEN 'Tennessee' AND 'New Mexico' ORDER BY OriginAirportSeqID LIMIT 26"}
-{"sql":"SELECT FirstDepTime, DepTime, DivAirportSeqIDs FROM mytable WHERE TaxiOut BETWEEN 73 AND 8 OR ActualElapsedTime > 237 AND DepDelay <= 306.0 ORDER BY Distance, DivAirportLandings, DestCityMarketID LIMIT 1","hsqls":["SELECT FirstDepTime, DepTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE TaxiOut BETWEEN 73 AND 8 OR ActualElapsedTime > 237 AND DepDelay <= 306.0 ORDER BY Distance, DivAirportLandings, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT AVG(DestAirportSeqID), AVG(SecurityDelay), MIN(CRSArrTime) FROM mytable WHERE DivTailNums IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') AND DestState BETWEEN 'WV' AND 'NJ' AND WheelsOff BETWEEN 1449 AND 1810 LIMIT 17","hsqls":["SELECT AVG(DestAirportSeqID), AVG(SecurityDelay), MIN(CRSArrTime)  FROM mytable WHERE (DivTailNums__MV0 IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums__MV1 IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums__MV2 IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums__MV3 IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums__MV4 IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW')) AND DestState BETWEEN 'WV' AND 'NJ' AND WheelsOff BETWEEN 1449 AND 1810 LIMIT 10000"]}
-{"sql":"SELECT DestWac, ArrivalDelayGroups, COUNT(Carrier), SUM(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE FirstDepTime BETWEEN 617 AND 710 OR DivAirports IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') GROUP BY DestWac, ArrivalDelayGroups LIMIT 21","hsqls":["SELECT DestWac, ArrivalDelayGroups, COUNT(Carrier), SUM(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE FirstDepTime BETWEEN 617 AND 710 OR (DivAirports__MV0 IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports__MV1 IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports__MV2 IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports__MV3 IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports__MV4 IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO')) GROUP BY DestWac, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DivAirportSeqIDs, Dest FROM mytable ORDER BY DestState LIMIT 11","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, Dest FROM mytable ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, DepTime, DivAirportSeqIDs FROM mytable WHERE TaxiOut BETWEEN 73 AND 8 OR ActualElapsedTime > 237 AND DepDelay <= 306.0 ORDER BY Distance, DivAirportLandings, DestCityMarketID LIMIT 1","hsqls":["SELECT FirstDepTime, DepTime, DivAirportSeqIDs FROM mytable WHERE TaxiOut BETWEEN 73 AND 8 OR ActualElapsedTime > 237 AND DepDelay <= 306.0 ORDER BY Distance, DivAirportLandings, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT AVG(DestAirportSeqID), AVG(SecurityDelay), MIN(CRSArrTime) FROM mytable WHERE DivTailNums IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') AND DestState BETWEEN 'WV' AND 'NJ' AND WheelsOff BETWEEN 1449 AND 1810 LIMIT 17","hsqls":["SELECT AVG(DestAirportSeqID), AVG(SecurityDelay), MIN(CRSArrTime)  FROM mytable WHERE (DivTailNums[1] IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums[2] IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums[3] IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums[4] IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW') OR DivTailNums[5] IN ('N16911', 'N304DQ', 'N839AS', 'N278WN', 'N337NW')) AND DestState BETWEEN 'WV' AND 'NJ' AND WheelsOff BETWEEN 1449 AND 1810 LIMIT 10000"]}
+{"sql":"SELECT DestWac, ArrivalDelayGroups, COUNT(Carrier), SUM(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE FirstDepTime BETWEEN 617 AND 710 OR DivAirports IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') GROUP BY DestWac, ArrivalDelayGroups LIMIT 21","hsqls":["SELECT DestWac, ArrivalDelayGroups, COUNT(Carrier), SUM(CRSElapsedTime), SUM(OriginCityMarketID) FROM mytable WHERE FirstDepTime BETWEEN 617 AND 710 OR (DivAirports[1] IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports[2] IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports[3] IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports[4] IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO') OR DivAirports[5] IN ('BDA', 'PHF', 'TPA', 'YAK', 'MSO')) GROUP BY DestWac, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, Dest FROM mytable ORDER BY DestState LIMIT 11","hsqls":["SELECT DivAirportSeqIDs, Dest FROM mytable ORDER BY DestState LIMIT 10000"]}
 {"sql":"SELECT Carrier, \"Month\", DayOfWeek, SUM(CarrierDelay), SUM(LongestAddGTime), SUM(DayOfWeek) FROM mytable GROUP BY Carrier, \"Month\", DayOfWeek LIMIT 20","hsqls":["SELECT Carrier, Month, DayOfWeek, SUM(CarrierDelay), SUM(LongestAddGTime), SUM(DayOfWeek) FROM mytable GROUP BY Carrier, Month, DayOfWeek LIMIT 20"]}
 {"sql":"SELECT \"Year\", ActualElapsedTime, Origin, AVG(FlightNum) FROM mytable WHERE DivDistance > 1138 AND ArrTime NOT IN (1200, 314, 2038, 1515) AND DestState NOT IN ('HI') GROUP BY \"Year\", ActualElapsedTime, Origin LIMIT 1","hsqls":["SELECT Year, ActualElapsedTime, Origin, AVG(FlightNum) FROM mytable WHERE DivDistance > 1138 AND ArrTime NOT IN (1200, 314, 2038, 1515) AND DestState NOT IN ('HI') GROUP BY Year, ActualElapsedTime, Origin LIMIT 1"]}
 {"sql":"SELECT AirlineID, DaysSinceEpoch, COUNT(ArrDelayMinutes) FROM mytable WHERE OriginCityMarketID <= 32335 OR OriginWac >= 62 GROUP BY AirlineID, DaysSinceEpoch  ORDER BY AirlineID, DaysSinceEpoch LIMIT 7","hsqls":["SELECT AirlineID, DaysSinceEpoch, COUNT(ArrDelayMinutes) FROM mytable WHERE OriginCityMarketID <= 32335 OR OriginWac >= 62 GROUP BY AirlineID, DaysSinceEpoch  ORDER BY AirlineID, DaysSinceEpoch LIMIT 7"]}
-{"sql":"SELECT WeatherDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE AirlineID <> 19690 AND DepDel15 BETWEEN -9999 AND -9999 AND DivTotalGTimes <= 15 GROUP BY WeatherDelay, UniqueCarrier LIMIT 7","hsqls":["SELECT WeatherDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE AirlineID <> 19690 AND DepDel15 BETWEEN -9999 AND -9999 AND (DivTotalGTimes__MV0 <= 15 OR DivTotalGTimes__MV1 <= 15 OR DivTotalGTimes__MV2 <= 15 OR DivTotalGTimes__MV3 <= 15 OR DivTotalGTimes__MV4 <= 15) GROUP BY WeatherDelay, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT MAX(ArrivalDelayGroups), MIN(NASDelay) FROM mytable WHERE Carrier BETWEEN 'AA' AND 'OO' AND DivTotalGTimes > 25 LIMIT 16","hsqls":["SELECT MAX(ArrivalDelayGroups), MIN(NASDelay)  FROM mytable WHERE Carrier BETWEEN 'AA' AND 'OO' AND (DivTotalGTimes__MV0 > 25 OR DivTotalGTimes__MV1 > 25 OR DivTotalGTimes__MV2 > 25 OR DivTotalGTimes__MV3 > 25 OR DivTotalGTimes__MV4 > 25) LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE AirlineID <> 19690 AND DepDel15 BETWEEN -9999 AND -9999 AND DivTotalGTimes <= 15 GROUP BY WeatherDelay, UniqueCarrier LIMIT 7","hsqls":["SELECT WeatherDelay, UniqueCarrier, COUNT(*) FROM mytable WHERE AirlineID <> 19690 AND DepDel15 BETWEEN -9999 AND -9999 AND (DivTotalGTimes[1] <= 15 OR DivTotalGTimes[2] <= 15 OR DivTotalGTimes[3] <= 15 OR DivTotalGTimes[4] <= 15 OR DivTotalGTimes[5] <= 15) GROUP BY WeatherDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT MAX(ArrivalDelayGroups), MIN(NASDelay) FROM mytable WHERE Carrier BETWEEN 'AA' AND 'OO' AND DivTotalGTimes > 25 LIMIT 16","hsqls":["SELECT MAX(ArrivalDelayGroups), MIN(NASDelay)  FROM mytable WHERE Carrier BETWEEN 'AA' AND 'OO' AND (DivTotalGTimes[1] > 25 OR DivTotalGTimes[2] > 25 OR DivTotalGTimes[3] > 25 OR DivTotalGTimes[4] > 25 OR DivTotalGTimes[5] > 25) LIMIT 10000"]}
 {"sql":"SELECT FlightNum, Distance, COUNT(CRSArrTime) FROM mytable WHERE TaxiOut <= 41 GROUP BY FlightNum, Distance  ORDER BY FlightNum, Distance LIMIT 25","hsqls":["SELECT FlightNum, Distance, COUNT(CRSArrTime) FROM mytable WHERE TaxiOut <= 41 GROUP BY FlightNum, Distance  ORDER BY FlightNum, Distance LIMIT 25"]}
 {"sql":"SELECT CarrierDelay, ArrDelay, COUNT(DestCityMarketID), MAX(DepDelay) FROM mytable WHERE DivActualElapsedTime >= 1121 OR Dest = 'EWN' OR CarrierDelay >= 82 GROUP BY CarrierDelay, ArrDelay  ORDER BY CarrierDelay, ArrDelay LIMIT 2","hsqls":["SELECT CarrierDelay, ArrDelay, COUNT(DestCityMarketID), MAX(DepDelay) FROM mytable WHERE DivActualElapsedTime >= 1121 OR Dest = 'EWN' OR CarrierDelay >= 82 GROUP BY CarrierDelay, ArrDelay  ORDER BY CarrierDelay, ArrDelay LIMIT 2"]}
 {"sql":"SELECT TaxiOut, TailNum, OriginAirportID FROM mytable WHERE Distance IN (475) OR OriginAirportSeqID < 1161802 ORDER BY ArrDel15 LIMIT 18"}
 {"sql":"SELECT DivDistance, WeatherDelay, CRSElapsedTime FROM mytable WHERE DivActualElapsedTime = 529 AND OriginAirportID BETWEEN 13476 AND 12402 LIMIT 20"}
-{"sql":"SELECT DestWac, FlightDate, Dest FROM mytable WHERE DivAirportSeqIDs BETWEEN 1299204 AND 1281902 OR LateAircraftDelay IN (66, 106, 39) ORDER BY OriginAirportID LIMIT 14","hsqls":["SELECT DestWac, FlightDate, Dest FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs__MV1 BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs__MV2 BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs__MV3 BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs__MV4 BETWEEN 1299204 AND 1281902) OR LateAircraftDelay IN (66, 106, 39) ORDER BY OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DestWac, FlightDate, Dest FROM mytable WHERE DivAirportSeqIDs BETWEEN 1299204 AND 1281902 OR LateAircraftDelay IN (66, 106, 39) ORDER BY OriginAirportID LIMIT 14","hsqls":["SELECT DestWac, FlightDate, Dest FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs[2] BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs[3] BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs[4] BETWEEN 1299204 AND 1281902 OR DivAirportSeqIDs[5] BETWEEN 1299204 AND 1281902) OR LateAircraftDelay IN (66, 106, 39) ORDER BY OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT Distance, Dest, AVG(CRSDepTime), SUM(DepDelayMinutes), AVG(ArrDelay) FROM mytable WHERE ArrivalDelayGroups NOT IN (1, -2, 5, 8, 11) OR Distance BETWEEN 799 AND 898 GROUP BY Distance, Dest  ORDER BY Distance, Dest LIMIT 12","hsqls":["SELECT Distance, Dest, AVG(CRSDepTime), SUM(DepDelayMinutes), AVG(ArrDelay) FROM mytable WHERE ArrivalDelayGroups NOT IN (1, -2, 5, 8, 11) OR Distance BETWEEN 799 AND 898 GROUP BY Distance, Dest  ORDER BY Distance, Dest LIMIT 12"]}
 {"sql":"SELECT TaxiIn, SUM(Quarter) FROM mytable WHERE TaxiOut NOT IN (112, 17, 13) GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 6","hsqls":["SELECT TaxiIn, SUM(Quarter) FROM mytable WHERE TaxiOut NOT IN (112, 17, 13) GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 6"]}
 {"sql":"SELECT DistanceGroup, DestAirportSeqID, COUNT(*) FROM mytable WHERE TailNum IN ('N681DA', 'N243WN', 'N683DA', 'N710EV') GROUP BY DistanceGroup, DestAirportSeqID  ORDER BY DistanceGroup, DestAirportSeqID LIMIT 27","hsqls":["SELECT DistanceGroup, DestAirportSeqID, COUNT(*) FROM mytable WHERE TailNum IN ('N681DA', 'N243WN', 'N683DA', 'N710EV') GROUP BY DistanceGroup, DestAirportSeqID  ORDER BY DistanceGroup, DestAirportSeqID LIMIT 27"]}
-{"sql":"SELECT TaxiIn, \"Month\", COUNT(*) FROM mytable WHERE WeatherDelay IN (21, 52, 39, 271) OR DivReachedDest BETWEEN 1 AND -9999 AND OriginAirportSeqID >= 1591902 GROUP BY TaxiIn, \"Month\" LIMIT 21","hsqls":["SELECT TaxiIn, Month, COUNT(*) FROM mytable WHERE WeatherDelay IN (21, 52, 39, 271) OR DivReachedDest BETWEEN 1 AND -9999 AND OriginAirportSeqID >= 1591902 GROUP BY TaxiIn, Month LIMIT 21"]}
-{"sql":"SELECT MAX(CRSElapsedTime), SUM(DestCityMarketID) FROM mytable WHERE \"Year\" NOT IN (2014) LIMIT 5","hsqls":["SELECT MAX(CRSElapsedTime), SUM(DestCityMarketID) FROM mytable WHERE Year NOT IN (2014) LIMIT 5"]}
+{"sql":"SELECT TaxiIn, \"Month\", COUNT(*) FROM mytable WHERE WeatherDelay IN (21, 52, 39, 271) OR DivReachedDest BETWEEN 1 AND -9999 AND OriginAirportSeqID >= 1591902 GROUP BY TaxiIn, \"Month\" LIMIT 21","hsqls":["SELECT TaxiIn, Month, COUNT(*) FROM mytable WHERE WeatherDelay IN (21, 52, 39, 271) OR DivReachedDest BETWEEN 1 AND -9999 AND OriginAirportSeqID >= 1591902 GROUP BY TaxiIn, `Month` LIMIT 21"]}
+{"sql":"SELECT MAX(CRSElapsedTime), SUM(DestCityMarketID) FROM mytable WHERE \"Year\" NOT IN (2014) LIMIT 5","hsqls":["SELECT MAX(CRSElapsedTime), SUM(DestCityMarketID) FROM mytable WHERE `Year` NOT IN (2014) LIMIT 5"]}
 {"sql":"SELECT DestAirportSeqID, MIN(LateAircraftDelay), SUM(OriginStateFips) FROM mytable WHERE Carrier <= 'DL' AND DestAirportID BETWEEN 11066 AND 14193 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 16","hsqls":["SELECT DestAirportSeqID, MIN(LateAircraftDelay), SUM(OriginStateFips) FROM mytable WHERE Carrier <= 'DL' AND DestAirportID BETWEEN 11066 AND 14193 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 16"]}
 {"sql":"SELECT WheelsOff, DivActualElapsedTime FROM mytable ORDER BY Origin, DivActualElapsedTime LIMIT 4"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 2"}
-{"sql":"SELECT DivAirports, ActualElapsedTime FROM mytable WHERE DayofMonth <= 29 LIMIT 14","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ActualElapsedTime FROM mytable WHERE DayofMonth <= 29 LIMIT 10000"]}
-{"sql":"SELECT ArrDelayMinutes, MIN(LateAircraftDelay), MIN(\"Year\"), COUNT(DistanceGroup) FROM mytable WHERE ArrTime BETWEEN 702 AND 1501 OR DestWac NOT IN (66, 65) GROUP BY ArrDelayMinutes LIMIT 22","hsqls":["SELECT ArrDelayMinutes, MIN(LateAircraftDelay), MIN(Year), COUNT(DistanceGroup) FROM mytable WHERE ArrTime BETWEEN 702 AND 1501 OR DestWac NOT IN (66, 65) GROUP BY ArrDelayMinutes LIMIT 22"]}
+{"sql":"SELECT DivAirports, ActualElapsedTime FROM mytable WHERE DayofMonth <= 29 LIMIT 14","hsqls":["SELECT DivAirports, ActualElapsedTime FROM mytable WHERE DayofMonth <= 29 LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, MIN(LateAircraftDelay), MIN(\"Year\"), COUNT(DistanceGroup) FROM mytable WHERE ArrTime BETWEEN 702 AND 1501 OR DestWac NOT IN (66, 65) GROUP BY ArrDelayMinutes LIMIT 22","hsqls":["SELECT ArrDelayMinutes, MIN(LateAircraftDelay), MIN(`Year`), COUNT(DistanceGroup) FROM mytable WHERE ArrTime BETWEEN 702 AND 1501 OR DestWac NOT IN (66, 65) GROUP BY ArrDelayMinutes LIMIT 22"]}
 {"sql":"SELECT Diverted, SUM(ActualElapsedTime), MIN(DepTime) FROM mytable WHERE DivDistance <> 825 GROUP BY Diverted","hsqls":["SELECT Diverted, SUM(ActualElapsedTime), MIN(DepTime) FROM mytable WHERE DivDistance <> 825 GROUP BY Diverted"]}
-{"sql":"SELECT Diverted, DivArrDelay FROM mytable WHERE Dest <> 'PDX' OR DivLongestGTimes IN (43.0) AND \"Month\" IN (1) LIMIT 11","hsqls":["SELECT Diverted, DivArrDelay FROM mytable WHERE Dest <> 'PDX' OR (DivLongestGTimes__MV0 IN (43.0) OR DivLongestGTimes__MV1 IN (43.0) OR DivLongestGTimes__MV2 IN (43.0) OR DivLongestGTimes__MV3 IN (43.0) OR DivLongestGTimes__MV4 IN (43.0)) AND Month IN (1) LIMIT 10000"]}
+{"sql":"SELECT Diverted, DivArrDelay FROM mytable WHERE Dest <> 'PDX' OR DivLongestGTimes IN (43.0) AND \"Month\" IN (1) LIMIT 11","hsqls":["SELECT Diverted, DivArrDelay FROM mytable WHERE Dest <> 'PDX' OR (DivLongestGTimes[1] IN (43.0) OR DivLongestGTimes[2] IN (43.0) OR DivLongestGTimes[3] IN (43.0) OR DivLongestGTimes[4] IN (43.0) OR DivLongestGTimes[5] IN (43.0)) AND `Month` IN (1) LIMIT 10000"]}
 {"sql":"SELECT WheelsOn, CRSDepTime, AVG(Distance) FROM mytable WHERE CRSArrTime BETWEEN 1803 AND 1513 AND LateAircraftDelay BETWEEN 118 AND 33 GROUP BY WheelsOn, CRSDepTime  ORDER BY WheelsOn, CRSDepTime LIMIT 21","hsqls":["SELECT WheelsOn, CRSDepTime, AVG(Distance) FROM mytable WHERE CRSArrTime BETWEEN 1803 AND 1513 AND LateAircraftDelay BETWEEN 118 AND 33 GROUP BY WheelsOn, CRSDepTime  ORDER BY WheelsOn, CRSDepTime LIMIT 21"]}
-{"sql":"SELECT \"Year\", DivTailNums, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR DivReachedDest NOT IN (0, -9999) OR DivWheelsOns IN (1810, 928, 1646, 1312) ORDER BY FlightDate, DestAirportSeqID, DepTimeBlk LIMIT 16","hsqls":["SELECT Year, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR DivReachedDest NOT IN (0, -9999) OR (DivWheelsOns__MV0 IN (1810, 928, 1646, 1312) OR DivWheelsOns__MV1 IN (1810, 928, 1646, 1312) OR DivWheelsOns__MV2 IN (1810, 928, 1646, 1312) OR DivWheelsOns__MV3 IN (1810, 928, 1646, 1312) OR DivWheelsOns__MV4 IN (1810, 928, 1646, 1312)) ORDER BY FlightDate, DestAirportSeqID, DepTimeBlk LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, Diverted, DayOfWeek FROM mytable WHERE DivActualElapsedTime IN (374, 801, 305, 218) OR DestCityMarketID BETWEEN 34100 AND 32523 ORDER BY OriginAirportSeqID LIMIT 1","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, Diverted, DayOfWeek FROM mytable WHERE DivActualElapsedTime IN (374, 801, 305, 218) OR DestCityMarketID BETWEEN 34100 AND 32523 ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivTailNums, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR DivReachedDest NOT IN (0, -9999) OR DivWheelsOns IN (1810, 928, 1646, 1312) ORDER BY FlightDate, DestAirportSeqID, DepTimeBlk LIMIT 16","hsqls":["SELECT Year, DivTailNums, Dest FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR DivReachedDest NOT IN (0, -9999) OR (DivWheelsOns[1] IN (1810, 928, 1646, 1312) OR DivWheelsOns[2] IN (1810, 928, 1646, 1312) OR DivWheelsOns[3] IN (1810, 928, 1646, 1312) OR DivWheelsOns[4] IN (1810, 928, 1646, 1312) OR DivWheelsOns[5] IN (1810, 928, 1646, 1312)) ORDER BY FlightDate, DestAirportSeqID, DepTimeBlk LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, Diverted, DayOfWeek FROM mytable WHERE DivActualElapsedTime IN (374, 801, 305, 218) OR DestCityMarketID BETWEEN 34100 AND 32523 ORDER BY OriginAirportSeqID LIMIT 1","hsqls":["SELECT DivWheelsOns, Diverted, DayOfWeek FROM mytable WHERE DivActualElapsedTime IN (374, 801, 305, 218) OR DestCityMarketID BETWEEN 34100 AND 32523 ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, AirTime, AVG(ArrTime), COUNT(FlightNum), MAX(AirTime) FROM mytable WHERE DepTime = 1138 AND CarrierDelay IN (67, 69, 94, 72, 450) GROUP BY DistanceGroup, AirTime  ORDER BY DistanceGroup, AirTime LIMIT 17","hsqls":["SELECT DistanceGroup, AirTime, AVG(ArrTime), COUNT(FlightNum), MAX(AirTime) FROM mytable WHERE DepTime = 1138 AND CarrierDelay IN (67, 69, 94, 72, 450) GROUP BY DistanceGroup, AirTime  ORDER BY DistanceGroup, AirTime LIMIT 17"]}
-{"sql":"SELECT DestWac, TotalAddGTime FROM mytable WHERE DivWheelsOns < 2334 ORDER BY DestState, Quarter, DestAirportSeqID LIMIT 19","hsqls":["SELECT DestWac, TotalAddGTime FROM mytable WHERE (DivWheelsOns__MV0 < 2334 OR DivWheelsOns__MV1 < 2334 OR DivWheelsOns__MV2 < 2334 OR DivWheelsOns__MV3 < 2334 OR DivWheelsOns__MV4 < 2334) ORDER BY DestState, Quarter, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DestWac, TotalAddGTime FROM mytable WHERE DivWheelsOns < 2334 ORDER BY DestState, Quarter, DestAirportSeqID LIMIT 19","hsqls":["SELECT DestWac, TotalAddGTime FROM mytable WHERE (DivWheelsOns[1] < 2334 OR DivWheelsOns[2] < 2334 OR DivWheelsOns[3] < 2334 OR DivWheelsOns[4] < 2334 OR DivWheelsOns[5] < 2334) ORDER BY DestState, Quarter, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT Distance, Dest, OriginStateName, COUNT(*) FROM mytable WHERE DestWac IN (74, 85) OR ArrTimeBlk < '1700-1759' GROUP BY Distance, Dest, OriginStateName  ORDER BY Distance, Dest, OriginStateName LIMIT 5","hsqls":["SELECT Distance, Dest, OriginStateName, COUNT(*) FROM mytable WHERE DestWac IN (74, 85) OR ArrTimeBlk < '1700-1759' GROUP BY Distance, Dest, OriginStateName  ORDER BY Distance, Dest, OriginStateName LIMIT 5"]}
 {"sql":"SELECT \"Year\", NASDelay, WheelsOn FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepTimeBlk, DayofMonth LIMIT 29","hsqls":["SELECT Year, NASDelay, WheelsOn FROM mytable WHERE CancellationCode NOT IN ('A', 'B', 'C', 'noodles') ORDER BY DepTimeBlk, DayofMonth LIMIT 29"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE TaxiOut < 138 LIMIT 28"}
 {"sql":"SELECT SecurityDelay, ArrivalDelayGroups FROM mytable WHERE DestAirportID BETWEEN 11003 AND 11292 AND DestAirportID BETWEEN 13891 AND 13422 ORDER BY ActualElapsedTime, DestCityMarketID, OriginAirportID LIMIT 19"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestAirportSeqID = 1481402 AND ArrivalDelayGroups NOT IN (1, -2, 5, 8, 11) OR DestWac >= 88 LIMIT 22"}
-{"sql":"SELECT TaxiOut, DivReachedDest, DestCityName FROM mytable WHERE DayofMonth NOT IN (10, 5, 24, 11) AND \"Year\" BETWEEN 2014 AND 2014 OR DivAirportSeqIDs IN (1232303, 1014002, 1402702, 1161802) ORDER BY ArrDelayMinutes LIMIT 14","hsqls":["SELECT TaxiOut, DivReachedDest, DestCityName FROM mytable WHERE DayofMonth NOT IN (10, 5, 24, 11) AND Year BETWEEN 2014 AND 2014 OR (DivAirportSeqIDs__MV0 IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs__MV1 IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs__MV2 IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs__MV3 IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs__MV4 IN (1232303, 1014002, 1402702, 1161802)) ORDER BY ArrDelayMinutes LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, \"Month\", COUNT(*) FROM mytable WHERE Distance BETWEEN 2165 AND 1090 OR AirTime BETWEEN 161 AND 198 AND OriginAirportSeqID BETWEEN 1079204 AND 1409803 GROUP BY OriginStateFips, \"Month\" LIMIT 17","hsqls":["SELECT OriginStateFips, Month, COUNT(*) FROM mytable WHERE Distance BETWEEN 2165 AND 1090 OR AirTime BETWEEN 161 AND 198 AND OriginAirportSeqID BETWEEN 1079204 AND 1409803 GROUP BY OriginStateFips, Month LIMIT 17"]}
+{"sql":"SELECT TaxiOut, DivReachedDest, DestCityName FROM mytable WHERE DayofMonth NOT IN (10, 5, 24, 11) AND \"Year\" BETWEEN 2014 AND 2014 OR DivAirportSeqIDs IN (1232303, 1014002, 1402702, 1161802) ORDER BY ArrDelayMinutes LIMIT 14","hsqls":["SELECT TaxiOut, DivReachedDest, DestCityName FROM mytable WHERE DayofMonth NOT IN (10, 5, 24, 11) AND `Year` BETWEEN 2014 AND 2014 OR (DivAirportSeqIDs[1] IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs[2] IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs[3] IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs[4] IN (1232303, 1014002, 1402702, 1161802) OR DivAirportSeqIDs[5] IN (1232303, 1014002, 1402702, 1161802)) ORDER BY ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, \"Month\", COUNT(*) FROM mytable WHERE Distance BETWEEN 2165 AND 1090 OR AirTime BETWEEN 161 AND 198 AND OriginAirportSeqID BETWEEN 1079204 AND 1409803 GROUP BY OriginStateFips, \"Month\" LIMIT 17","hsqls":["SELECT OriginStateFips, Month, COUNT(*) FROM mytable WHERE Distance BETWEEN 2165 AND 1090 OR AirTime BETWEEN 161 AND 198 AND OriginAirportSeqID BETWEEN 1079204 AND 1409803 GROUP BY OriginStateFips, `Month` LIMIT 17"]}
 {"sql":"SELECT TotalAddGTime, ArrTimeBlk, MIN(TotalAddGTime), MIN(ArrivalDelayGroups) FROM mytable WHERE OriginStateName BETWEEN 'Idaho' AND 'Iowa' GROUP BY TotalAddGTime, ArrTimeBlk  ORDER BY TotalAddGTime, ArrTimeBlk LIMIT 11","hsqls":["SELECT TotalAddGTime, ArrTimeBlk, MIN(TotalAddGTime), MIN(ArrivalDelayGroups) FROM mytable WHERE OriginStateName BETWEEN 'Idaho' AND 'Iowa' GROUP BY TotalAddGTime, ArrTimeBlk  ORDER BY TotalAddGTime, ArrTimeBlk LIMIT 11"]}
-{"sql":"SELECT AVG(DayOfWeek) FROM mytable WHERE DivTailNums IN ('N915DE', 'N8612K') LIMIT 3","hsqls":["SELECT AVG(CAST(DayOfWeek AS DOUBLE)) FROM mytable WHERE (DivTailNums__MV0 IN ('N915DE', 'N8612K') OR DivTailNums__MV1 IN ('N915DE', 'N8612K') OR DivTailNums__MV2 IN ('N915DE', 'N8612K') OR DivTailNums__MV3 IN ('N915DE', 'N8612K') OR DivTailNums__MV4 IN ('N915DE', 'N8612K')) LIMIT 10000"]}
-{"sql":"SELECT MAX(WheelsOff), COUNT(CancellationCode) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DivLongestGTimes < 57.0 OR DepDelay NOT IN (342.0, 48.0) LIMIT 25","hsqls":["SELECT MAX(WheelsOff), COUNT(CancellationCode)  FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR (DivLongestGTimes__MV0 < 57.0 OR DivLongestGTimes__MV1 < 57.0 OR DivLongestGTimes__MV2 < 57.0 OR DivLongestGTimes__MV3 < 57.0 OR DivLongestGTimes__MV4 < 57.0) OR DepDelay NOT IN (342.0, 48.0) LIMIT 10000"]}
-{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivWheelsOns IN (1431, 2108) AND DepartureDelayGroups NOT IN (10, -1) ORDER BY ArrDelay LIMIT 21","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE (DivWheelsOns__MV0 IN (1431, 2108) OR DivWheelsOns__MV1 IN (1431, 2108) OR DivWheelsOns__MV2 IN (1431, 2108) OR DivWheelsOns__MV3 IN (1431, 2108) OR DivWheelsOns__MV4 IN (1431, 2108)) AND DepartureDelayGroups NOT IN (10, -1) ORDER BY ArrDelay LIMIT 10000"]}
+{"sql":"SELECT AVG(DayOfWeek) FROM mytable WHERE DivTailNums IN ('N915DE', 'N8612K') LIMIT 3","hsqls":["SELECT AVG(CAST(DayOfWeek AS DOUBLE)) FROM mytable WHERE (DivTailNums[1] IN ('N915DE', 'N8612K') OR DivTailNums[2] IN ('N915DE', 'N8612K') OR DivTailNums[3] IN ('N915DE', 'N8612K') OR DivTailNums[4] IN ('N915DE', 'N8612K') OR DivTailNums[5] IN ('N915DE', 'N8612K')) LIMIT 10000"]}
+{"sql":"SELECT MAX(WheelsOff), COUNT(CancellationCode) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DivLongestGTimes < 57.0 OR DepDelay NOT IN (342.0, 48.0) LIMIT 25","hsqls":["SELECT MAX(WheelsOff), COUNT(CancellationCode)  FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR (DivLongestGTimes[1] < 57.0 OR DivLongestGTimes[2] < 57.0 OR DivLongestGTimes[3] < 57.0 OR DivLongestGTimes[4] < 57.0 OR DivLongestGTimes[5] < 57.0) OR DepDelay NOT IN (342.0, 48.0) LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable WHERE DivWheelsOns IN (1431, 2108) AND DepartureDelayGroups NOT IN (10, -1) ORDER BY ArrDelay LIMIT 21","hsqls":["SELECT DivTotalGTimes FROM mytable WHERE (DivWheelsOns[1] IN (1431, 2108) OR DivWheelsOns[2] IN (1431, 2108) OR DivWheelsOns[3] IN (1431, 2108) OR DivWheelsOns[4] IN (1431, 2108) OR DivWheelsOns[5] IN (1431, 2108)) AND DepartureDelayGroups NOT IN (10, -1) ORDER BY ArrDelay LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, Distance, COUNT(*) FROM mytable WHERE ArrivalDelayGroups = 6 AND DestWac BETWEEN 15 AND 1 OR Carrier BETWEEN 'B6' AND 'EV' GROUP BY OriginStateFips, Distance  ORDER BY OriginStateFips, Distance LIMIT 17","hsqls":["SELECT OriginStateFips, Distance, COUNT(*) FROM mytable WHERE ArrivalDelayGroups = 6 AND DestWac BETWEEN 15 AND 1 OR Carrier BETWEEN 'B6' AND 'EV' GROUP BY OriginStateFips, Distance  ORDER BY OriginStateFips, Distance LIMIT 17"]}
-{"sql":"SELECT ArrDel15 FROM mytable WHERE Distance NOT IN (1426, 3302) OR FlightDate NOT IN ('2014-01-06', '2014-01-09', '2014-01-18', '2014-01-30') AND DivWheelsOns BETWEEN 731 AND 1532 LIMIT 12","hsqls":["SELECT ArrDel15 FROM mytable WHERE Distance NOT IN (1426, 3302) OR FlightDate NOT IN ('2014-01-06', '2014-01-09', '2014-01-18', '2014-01-30') AND (DivWheelsOns__MV0 BETWEEN 731 AND 1532 OR DivWheelsOns__MV1 BETWEEN 731 AND 1532 OR DivWheelsOns__MV2 BETWEEN 731 AND 1532 OR DivWheelsOns__MV3 BETWEEN 731 AND 1532 OR DivWheelsOns__MV4 BETWEEN 731 AND 1532) LIMIT 10000"]}
-{"sql":"SELECT DivDistance, SecurityDelay, DivTailNums FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'A' AND LongestAddGTime <> 24 AND CarrierDelay BETWEEN 47 AND 123 ORDER BY DivDistance, AirTime LIMIT 1","hsqls":["SELECT DivDistance, SecurityDelay, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'A' AND LongestAddGTime <> 24 AND CarrierDelay BETWEEN 47 AND 123 ORDER BY DivDistance, AirTime LIMIT 10000"]}
+{"sql":"SELECT ArrDel15 FROM mytable WHERE Distance NOT IN (1426, 3302) OR FlightDate NOT IN ('2014-01-06', '2014-01-09', '2014-01-18', '2014-01-30') AND DivWheelsOns BETWEEN 731 AND 1532 LIMIT 12","hsqls":["SELECT ArrDel15 FROM mytable WHERE Distance NOT IN (1426, 3302) OR FlightDate NOT IN ('2014-01-06', '2014-01-09', '2014-01-18', '2014-01-30') AND (DivWheelsOns[1] BETWEEN 731 AND 1532 OR DivWheelsOns[2] BETWEEN 731 AND 1532 OR DivWheelsOns[3] BETWEEN 731 AND 1532 OR DivWheelsOns[4] BETWEEN 731 AND 1532 OR DivWheelsOns[5] BETWEEN 731 AND 1532) LIMIT 10000"]}
+{"sql":"SELECT DivDistance, SecurityDelay, DivTailNums FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'A' AND LongestAddGTime <> 24 AND CarrierDelay BETWEEN 47 AND 123 ORDER BY DivDistance, AirTime LIMIT 1","hsqls":["SELECT DivDistance, SecurityDelay, DivTailNums FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'A' AND LongestAddGTime <> 24 AND CarrierDelay BETWEEN 47 AND 123 ORDER BY DivDistance, AirTime LIMIT 10000"]}
 {"sql":"SELECT Diverted, CRSArrTime, CancellationCode, MAX(DaysSinceEpoch), SUM(DayOfWeek), AVG(DivAirportLandings) FROM mytable WHERE ArrTimeBlk < '2300-2359' GROUP BY Diverted, CRSArrTime, CancellationCode  ORDER BY Diverted, CRSArrTime, CancellationCode LIMIT 20","hsqls":["SELECT Diverted, CRSArrTime, CancellationCode, MAX(DaysSinceEpoch), SUM(DayOfWeek), AVG(DivAirportLandings) FROM mytable WHERE ArrTimeBlk < '2300-2359' GROUP BY Diverted, CRSArrTime, CancellationCode  ORDER BY Diverted, CRSArrTime, CancellationCode LIMIT 20"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE ActualElapsedTime IN (164, 327, 35) ORDER BY CancellationCode LIMIT 23"}
 {"sql":"SELECT DestStateName FROM mytable WHERE OriginAirportSeqID BETWEEN 1275803 AND 1129803 OR ArrDel15 BETWEEN -9999 AND 0 OR ArrDel15 >= -9999 ORDER BY Quarter, FlightNum, DestAirportSeqID LIMIT 23"}
@@ -9411,43 +9411,43 @@
 {"sql":"SELECT FlightNum, OriginWac, COUNT(TailNum) FROM mytable WHERE DepTimeBlk NOT IN ('1700-1759', '1100-1159', '1800-1859') OR DestCityName IN ('Dubuque, IA') OR Quarter >= 1 GROUP BY FlightNum, OriginWac  ORDER BY FlightNum, OriginWac LIMIT 5","hsqls":["SELECT FlightNum, OriginWac, COUNT(TailNum) FROM mytable WHERE DepTimeBlk NOT IN ('1700-1759', '1100-1159', '1800-1859') OR DestCityName IN ('Dubuque, IA') OR Quarter >= 1 GROUP BY FlightNum, OriginWac  ORDER BY FlightNum, OriginWac LIMIT 5"]}
 {"sql":"SELECT ArrDelayMinutes, WheelsOn, MIN(DestAirportID) FROM mytable WHERE TaxiIn < 49 GROUP BY ArrDelayMinutes, WheelsOn  ORDER BY ArrDelayMinutes, WheelsOn LIMIT 8","hsqls":["SELECT ArrDelayMinutes, WheelsOn, MIN(DestAirportID) FROM mytable WHERE TaxiIn < 49 GROUP BY ArrDelayMinutes, WheelsOn  ORDER BY ArrDelayMinutes, WheelsOn LIMIT 8"]}
 {"sql":"SELECT Cancelled, MIN(DepartureDelayGroups), MIN(DepDel15), MIN(ArrivalDelayGroups) FROM mytable WHERE OriginCityMarketID >= 30408 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 14","hsqls":["SELECT Cancelled, MIN(DepartureDelayGroups), MIN(DepDel15), MIN(ArrivalDelayGroups) FROM mytable WHERE OriginCityMarketID >= 30408 GROUP BY Cancelled  ORDER BY Cancelled LIMIT 14"]}
-{"sql":"SELECT DistanceGroup, LateAircraftDelay FROM mytable WHERE DivTailNums IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') AND ArrDelayMinutes >= 38.0 OR DivTailNums BETWEEN 'N223AG' AND 'N8611F' ORDER BY DaysSinceEpoch LIMIT 14","hsqls":["SELECT DistanceGroup, LateAircraftDelay FROM mytable WHERE (DivTailNums__MV0 IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums__MV1 IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums__MV2 IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums__MV3 IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums__MV4 IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441')) AND ArrDelayMinutes >= 38.0 OR (DivTailNums__MV0 BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums__MV1 BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums__MV2 BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums__MV3 BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums__MV4 BETWEEN 'N223AG' AND 'N8611F') ORDER BY DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, LateAircraftDelay FROM mytable WHERE DivTailNums IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') AND ArrDelayMinutes >= 38.0 OR DivTailNums BETWEEN 'N223AG' AND 'N8611F' ORDER BY DaysSinceEpoch LIMIT 14","hsqls":["SELECT DistanceGroup, LateAircraftDelay FROM mytable WHERE (DivTailNums[1] IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums[2] IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums[3] IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums[4] IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441') OR DivTailNums[5] IN ('N554WN', 'N803SK', 'N834JB', 'N508JB', 'N53441')) AND ArrDelayMinutes >= 38.0 OR (DivTailNums[1] BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums[2] BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums[3] BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums[4] BETWEEN 'N223AG' AND 'N8611F' OR DivTailNums[5] BETWEEN 'N223AG' AND 'N8611F') ORDER BY DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, Origin, AVG(Cancelled), MAX(DestCityMarketID), COUNT(LateAircraftDelay) FROM mytable GROUP BY DepDelayMinutes, Origin  ORDER BY DepDelayMinutes, Origin LIMIT 1","hsqls":["SELECT DepDelayMinutes, Origin, AVG(Cancelled), MAX(DestCityMarketID), COUNT(LateAircraftDelay) FROM mytable GROUP BY DepDelayMinutes, Origin  ORDER BY DepDelayMinutes, Origin LIMIT 1"]}
-{"sql":"SELECT DestState, LateAircraftDelay, DivAirportIDs FROM mytable ORDER BY NASDelay LIMIT 26","hsqls":["SELECT DestState, LateAircraftDelay, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT DestState, LateAircraftDelay, DivAirportIDs FROM mytable ORDER BY NASDelay LIMIT 26","hsqls":["SELECT DestState, LateAircraftDelay, DivAirportIDs FROM mytable ORDER BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, AirTime, DestAirportID, COUNT(Dest), MAX(DepDelayMinutes), MIN(DepartureDelayGroups) FROM mytable WHERE OriginStateFips BETWEEN 36 AND 12 OR Diverted IN (1) OR DepartureDelayGroups BETWEEN -1 AND 7 GROUP BY CarrierDelay, AirTime, DestAirportID  ORDER BY CarrierDelay, AirTime, DestAirportID LIMIT 11","hsqls":["SELECT CarrierDelay, AirTime, DestAirportID, COUNT(Dest), MAX(DepDelayMinutes), MIN(DepartureDelayGroups) FROM mytable WHERE OriginStateFips BETWEEN 36 AND 12 OR Diverted IN (1) OR DepartureDelayGroups BETWEEN -1 AND 7 GROUP BY CarrierDelay, AirTime, DestAirportID  ORDER BY CarrierDelay, AirTime, DestAirportID LIMIT 11"]}
-{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginStateName > 'North Carolina' AND DivAirportSeqIDs IN (1467903, 1086803, 1177502) GROUP BY OriginStateName LIMIT 9","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginStateName > 'North Carolina' AND (DivAirportSeqIDs__MV0 IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs__MV1 IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs__MV2 IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs__MV3 IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs__MV4 IN (1467903, 1086803, 1177502)) GROUP BY OriginStateName LIMIT 10000"]}
+{"sql":"SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginStateName > 'North Carolina' AND DivAirportSeqIDs IN (1467903, 1086803, 1177502) GROUP BY OriginStateName LIMIT 9","hsqls":["SELECT OriginStateName, COUNT(*) FROM mytable WHERE OriginStateName > 'North Carolina' AND (DivAirportSeqIDs[1] IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs[2] IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs[3] IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs[4] IN (1467903, 1086803, 1177502) OR DivAirportSeqIDs[5] IN (1467903, 1086803, 1177502)) GROUP BY OriginStateName LIMIT 10000"]}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 10","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 10"]}
-{"sql":"SELECT NASDelay FROM mytable WHERE DestState BETWEEN 'OR' AND 'OK' AND \"Month\" NOT IN (1) ORDER BY \"Year\", FlightDate, ArrTimeBlk LIMIT 12","hsqls":["SELECT NASDelay FROM mytable WHERE DestState BETWEEN 'OR' AND 'OK' AND Month NOT IN (1) ORDER BY Year, FlightDate, ArrTimeBlk LIMIT 12"]}
+{"sql":"SELECT NASDelay FROM mytable WHERE DestState BETWEEN 'OR' AND 'OK' AND \"Month\" NOT IN (1) ORDER BY \"Year\", FlightDate, ArrTimeBlk LIMIT 12","hsqls":["SELECT NASDelay FROM mytable WHERE DestState BETWEEN 'OR' AND 'OK' AND `Month` NOT IN (1) ORDER BY Year, FlightDate, ArrTimeBlk LIMIT 12"]}
 {"sql":"SELECT DestWac, OriginCityName, ActualElapsedTime FROM mytable WHERE CRSElapsedTime IN (121, 273) OR Cancelled > 0 AND LongestAddGTime >= 4 ORDER BY NASDelay LIMIT 15"}
 {"sql":"SELECT \"Year\", Cancelled, ArrTimeBlk FROM mytable WHERE FirstDepTime IN (1859, 1653, 731, 1039, 947) ORDER BY ActualElapsedTime, DepTimeBlk, CRSDepTime LIMIT 16","hsqls":["SELECT Year, Cancelled, ArrTimeBlk FROM mytable WHERE FirstDepTime IN (1859, 1653, 731, 1039, 947) ORDER BY ActualElapsedTime, DepTimeBlk, CRSDepTime LIMIT 16"]}
 {"sql":"SELECT Flights FROM mytable LIMIT 20"}
 {"sql":"SELECT Flights, MAX(CarrierDelay), MIN(ArrTime) FROM mytable WHERE DestAirportSeqID BETWEEN 1320402 AND 1163002 GROUP BY Flights  ORDER BY Flights LIMIT 19","hsqls":["SELECT Flights, MAX(CarrierDelay), MIN(ArrTime) FROM mytable WHERE DestAirportSeqID BETWEEN 1320402 AND 1163002 GROUP BY Flights  ORDER BY Flights LIMIT 19"]}
 {"sql":"SELECT OriginAirportSeqID, DepTime, CRSElapsedTime, AVG(WheelsOn) FROM mytable GROUP BY OriginAirportSeqID, DepTime, CRSElapsedTime  ORDER BY OriginAirportSeqID, DepTime, CRSElapsedTime LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DepTime, CRSElapsedTime, AVG(WheelsOn) FROM mytable GROUP BY OriginAirportSeqID, DepTime, CRSElapsedTime  ORDER BY OriginAirportSeqID, DepTime, CRSElapsedTime LIMIT 8"]}
-{"sql":"SELECT DivWheelsOffs, DivAirportLandings, CRSElapsedTime FROM mytable ORDER BY DestState, FirstDepTime LIMIT 4","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DivAirportLandings, CRSElapsedTime FROM mytable ORDER BY DestState, FirstDepTime LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DivDistance, LongestAddGTime FROM mytable WHERE Origin NOT IN ('CPR') AND DivActualElapsedTime BETWEEN 388 AND 360 OR CarrierDelay >= 65 ORDER BY OriginAirportSeqID, UniqueCarrier LIMIT 25","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivDistance, LongestAddGTime FROM mytable WHERE Origin NOT IN ('CPR') AND DivActualElapsedTime BETWEEN 388 AND 360 OR CarrierDelay >= 65 ORDER BY OriginAirportSeqID, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DivAirportLandings, CRSElapsedTime FROM mytable ORDER BY DestState, FirstDepTime LIMIT 4","hsqls":["SELECT DivWheelsOffs, DivAirportLandings, CRSElapsedTime FROM mytable ORDER BY DestState, FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivDistance, LongestAddGTime FROM mytable WHERE Origin NOT IN ('CPR') AND DivActualElapsedTime BETWEEN 388 AND 360 OR CarrierDelay >= 65 ORDER BY OriginAirportSeqID, UniqueCarrier LIMIT 25","hsqls":["SELECT DivLongestGTimes, DivDistance, LongestAddGTime FROM mytable WHERE Origin NOT IN ('CPR') AND DivActualElapsedTime BETWEEN 388 AND 360 OR CarrierDelay >= 65 ORDER BY OriginAirportSeqID, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT ArrDelay FROM mytable LIMIT 1"}
-{"sql":"SELECT DivWheelsOns, FlightDate, Cancelled FROM mytable ORDER BY WheelsOn, ArrivalDelayGroups LIMIT 17","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, FlightDate, Cancelled FROM mytable ORDER BY WheelsOn, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, FlightDate, Cancelled FROM mytable ORDER BY WheelsOn, ArrivalDelayGroups LIMIT 17","hsqls":["SELECT DivWheelsOns, FlightDate, Cancelled FROM mytable ORDER BY WheelsOn, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT FlightDate, ArrTime, UniqueCarrier, MAX(WeatherDelay) FROM mytable WHERE ActualElapsedTime = 93 GROUP BY FlightDate, ArrTime, UniqueCarrier  ORDER BY FlightDate, ArrTime, UniqueCarrier LIMIT 19","hsqls":["SELECT FlightDate, ArrTime, UniqueCarrier, MAX(WeatherDelay) FROM mytable WHERE ActualElapsedTime = 93 GROUP BY FlightDate, ArrTime, UniqueCarrier  ORDER BY FlightDate, ArrTime, UniqueCarrier LIMIT 19"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Cancelled >= 1 AND DepTime >= 1023 AND TaxiOut IN (97, 102) LIMIT 13"}
 {"sql":"SELECT TaxiOut, Carrier, DivAirportLandings, COUNT(*) FROM mytable GROUP BY TaxiOut, Carrier, DivAirportLandings  ORDER BY TaxiOut, Carrier, DivAirportLandings LIMIT 7","hsqls":["SELECT TaxiOut, Carrier, DivAirportLandings, COUNT(*) FROM mytable GROUP BY TaxiOut, Carrier, DivAirportLandings  ORDER BY TaxiOut, Carrier, DivAirportLandings LIMIT 7"]}
-{"sql":"SELECT TaxiOut, \"Year\", DepTime FROM mytable WHERE DivTailNums IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTotalGTimes <= 136 OR DivTailNums < 'N3DJAA' ORDER BY Cancelled LIMIT 7","hsqls":["SELECT TaxiOut, Year, DepTime FROM mytable WHERE (DivTailNums__MV0 IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums__MV1 IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums__MV2 IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums__MV3 IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums__MV4 IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA')) OR (DivTotalGTimes__MV0 <= 136 OR DivTotalGTimes__MV1 <= 136 OR DivTotalGTimes__MV2 <= 136 OR DivTotalGTimes__MV3 <= 136 OR DivTotalGTimes__MV4 <= 136) OR (DivTailNums__MV0 < 'N3DJAA' OR DivTailNums__MV1 < 'N3DJAA' OR DivTailNums__MV2 < 'N3DJAA' OR DivTailNums__MV3 < 'N3DJAA' OR DivTailNums__MV4 < 'N3DJAA') ORDER BY Cancelled LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, \"Year\", DepTime FROM mytable WHERE DivTailNums IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTotalGTimes <= 136 OR DivTailNums < 'N3DJAA' ORDER BY Cancelled LIMIT 7","hsqls":["SELECT TaxiOut, Year, DepTime FROM mytable WHERE (DivTailNums[1] IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums[2] IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums[3] IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums[4] IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA') OR DivTailNums[5] IN ('N661JB', 'N33264', 'N13995', 'N640JB', 'N841VA')) OR (DivTotalGTimes[1] <= 136 OR DivTotalGTimes[2] <= 136 OR DivTotalGTimes[3] <= 136 OR DivTotalGTimes[4] <= 136 OR DivTotalGTimes[5] <= 136) OR (DivTailNums[1] < 'N3DJAA' OR DivTailNums[2] < 'N3DJAA' OR DivTailNums[3] < 'N3DJAA' OR DivTailNums[4] < 'N3DJAA' OR DivTailNums[5] < 'N3DJAA') ORDER BY Cancelled LIMIT 10000"]}
 {"sql":"SELECT \"Year\", ArrTime, DivArrDelay FROM mytable WHERE FirstDepTime BETWEEN 2356 AND 1940 AND OriginAirportSeqID NOT IN (1233502, 1409803, 1486903) ORDER BY WheelsOff, LongestAddGTime LIMIT 10","hsqls":["SELECT Year, ArrTime, DivArrDelay FROM mytable WHERE FirstDepTime BETWEEN 2356 AND 1940 AND OriginAirportSeqID NOT IN (1233502, 1409803, 1486903) ORDER BY WheelsOff, LongestAddGTime LIMIT 10"]}
 {"sql":"SELECT COUNT(DestStateFips), SUM(OriginAirportID) FROM mytable LIMIT 29"}
-{"sql":"SELECT OriginCityName, MAX(\"Year\"), COUNT(DayOfWeek), SUM(DivActualElapsedTime) FROM mytable WHERE OriginStateFips NOT IN (40) GROUP BY OriginCityName LIMIT 2","hsqls":["SELECT OriginCityName, MAX(Year), COUNT(DayOfWeek), SUM(DivActualElapsedTime) FROM mytable WHERE OriginStateFips NOT IN (40) GROUP BY OriginCityName LIMIT 2"]}
-{"sql":"SELECT DivAirports, WeatherDelay, FlightDate FROM mytable WHERE FlightDate IN ('2014-01-29', '2014-01-14', '2014-01-30', '2014-01-02', '2014-01-10') AND DivActualElapsedTime IN (587) ORDER BY TailNum, UniqueCarrier LIMIT 25","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, WeatherDelay, FlightDate FROM mytable WHERE FlightDate IN ('2014-01-29', '2014-01-14', '2014-01-30', '2014-01-02', '2014-01-10') AND DivActualElapsedTime IN (587) ORDER BY TailNum, UniqueCarrier LIMIT 10000"]}
-{"sql":"SELECT DivDistance, COUNT(DayOfWeek) FROM mytable WHERE DestState IN ('UT', 'NY') AND DivWheelsOffs = 1838 GROUP BY DivDistance LIMIT 24","hsqls":["SELECT DivDistance, COUNT(DayOfWeek) FROM mytable WHERE DestState IN ('UT', 'NY') AND (DivWheelsOffs__MV0 = 1838 OR DivWheelsOffs__MV1 = 1838 OR DivWheelsOffs__MV2 = 1838 OR DivWheelsOffs__MV3 = 1838 OR DivWheelsOffs__MV4 = 1838) GROUP BY DivDistance LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, MAX(\"Year\"), COUNT(DayOfWeek), SUM(DivActualElapsedTime) FROM mytable WHERE OriginStateFips NOT IN (40) GROUP BY OriginCityName LIMIT 2","hsqls":["SELECT OriginCityName, MAX(`Year`), COUNT(DayOfWeek), SUM(DivActualElapsedTime) FROM mytable WHERE OriginStateFips NOT IN (40) GROUP BY OriginCityName LIMIT 2"]}
+{"sql":"SELECT DivAirports, WeatherDelay, FlightDate FROM mytable WHERE FlightDate IN ('2014-01-29', '2014-01-14', '2014-01-30', '2014-01-02', '2014-01-10') AND DivActualElapsedTime IN (587) ORDER BY TailNum, UniqueCarrier LIMIT 25","hsqls":["SELECT DivAirports, WeatherDelay, FlightDate FROM mytable WHERE FlightDate IN ('2014-01-29', '2014-01-14', '2014-01-30', '2014-01-02', '2014-01-10') AND DivActualElapsedTime IN (587) ORDER BY TailNum, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DivDistance, COUNT(DayOfWeek) FROM mytable WHERE DestState IN ('UT', 'NY') AND DivWheelsOffs = 1838 GROUP BY DivDistance LIMIT 24","hsqls":["SELECT DivDistance, COUNT(DayOfWeek) FROM mytable WHERE DestState IN ('UT', 'NY') AND (DivWheelsOffs[1] = 1838 OR DivWheelsOffs[2] = 1838 OR DivWheelsOffs[3] = 1838 OR DivWheelsOffs[4] = 1838 OR DivWheelsOffs[5] = 1838) GROUP BY DivDistance LIMIT 10000"]}
 {"sql":"SELECT DayOfWeek, AVG(TaxiOut), AVG(DepartureDelayGroups), MAX(DivAirportLandings) FROM mytable GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 9","hsqls":["SELECT DayOfWeek, AVG(TaxiOut), AVG(DepartureDelayGroups), MAX(DivAirportLandings) FROM mytable GROUP BY DayOfWeek  ORDER BY DayOfWeek LIMIT 9"]}
-{"sql":"SELECT DivDistance, CRSDepTime, COUNT(*) FROM mytable WHERE DivWheelsOffs IN (1010) GROUP BY DivDistance, CRSDepTime","hsqls":["SELECT DivDistance, CRSDepTime, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 IN (1010) OR DivWheelsOffs__MV1 IN (1010) OR DivWheelsOffs__MV2 IN (1010) OR DivWheelsOffs__MV3 IN (1010) OR DivWheelsOffs__MV4 IN (1010)) GROUP BY DivDistance, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DivDistance, CRSDepTime, COUNT(*) FROM mytable WHERE DivWheelsOffs IN (1010) GROUP BY DivDistance, CRSDepTime","hsqls":["SELECT DivDistance, CRSDepTime, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] IN (1010) OR DivWheelsOffs[2] IN (1010) OR DivWheelsOffs[3] IN (1010) OR DivWheelsOffs[4] IN (1010) OR DivWheelsOffs[5] IN (1010)) GROUP BY DivDistance, CRSDepTime LIMIT 10000"]}
 {"sql":"SELECT \"Year\", ArrDelayMinutes, SUM(CRSDepTime), MAX(DepartureDelayGroups), MIN(ArrivalDelayGroups) FROM mytable WHERE DepDelay = 109.0 AND DivArrDelay < 85 GROUP BY \"Year\", ArrDelayMinutes LIMIT 17","hsqls":["SELECT Year, ArrDelayMinutes, SUM(CRSDepTime), MAX(DepartureDelayGroups), MIN(ArrivalDelayGroups) FROM mytable WHERE DepDelay = 109.0 AND DivArrDelay < 85 GROUP BY Year, ArrDelayMinutes LIMIT 17"]}
 {"sql":"SELECT Quarter, CarrierDelay, TailNum FROM mytable ORDER BY DistanceGroup, DepDel15, ArrivalDelayGroups LIMIT 12"}
 {"sql":"SELECT OriginAirportSeqID, CarrierDelay, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, CarrierDelay  ORDER BY OriginAirportSeqID, CarrierDelay LIMIT 22","hsqls":["SELECT OriginAirportSeqID, CarrierDelay, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, CarrierDelay  ORDER BY OriginAirportSeqID, CarrierDelay LIMIT 22"]}
-{"sql":"SELECT DivWheelsOns, DestState, ArrTime FROM mytable WHERE OriginState BETWEEN 'CO' AND 'MA' OR OriginAirportID > 13873 AND CancellationCode <= 'B' LIMIT 5","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestState, ArrTime FROM mytable WHERE OriginState BETWEEN 'CO' AND 'MA' OR OriginAirportID > 13873 AND CancellationCode <= 'B' LIMIT 10000"]}
-{"sql":"SELECT ArrTime, DepTimeBlk, DaysSinceEpoch, MIN(SecurityDelay), MAX(ActualElapsedTime) FROM mytable WHERE OriginAirportID BETWEEN 11995 AND 12197 OR DivTotalGTimes BETWEEN 92 AND 69 AND DestCityName NOT IN ('Springfield, MO') GROUP BY ArrTime, DepTimeBlk, DaysSinceEpoch LIMIT 10","hsqls":["SELECT ArrTime, DepTimeBlk, DaysSinceEpoch, MIN(SecurityDelay), MAX(ActualElapsedTime) FROM mytable WHERE OriginAirportID BETWEEN 11995 AND 12197 OR (DivTotalGTimes__MV0 BETWEEN 92 AND 69 OR DivTotalGTimes__MV1 BETWEEN 92 AND 69 OR DivTotalGTimes__MV2 BETWEEN 92 AND 69 OR DivTotalGTimes__MV3 BETWEEN 92 AND 69 OR DivTotalGTimes__MV4 BETWEEN 92 AND 69) AND DestCityName NOT IN ('Springfield, MO') GROUP BY ArrTime, DepTimeBlk, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DestState, ArrTime FROM mytable WHERE OriginState BETWEEN 'CO' AND 'MA' OR OriginAirportID > 13873 AND CancellationCode <= 'B' LIMIT 5","hsqls":["SELECT DivWheelsOns, DestState, ArrTime FROM mytable WHERE OriginState BETWEEN 'CO' AND 'MA' OR OriginAirportID > 13873 AND CancellationCode <= 'B' LIMIT 10000"]}
+{"sql":"SELECT ArrTime, DepTimeBlk, DaysSinceEpoch, MIN(SecurityDelay), MAX(ActualElapsedTime) FROM mytable WHERE OriginAirportID BETWEEN 11995 AND 12197 OR DivTotalGTimes BETWEEN 92 AND 69 AND DestCityName NOT IN ('Springfield, MO') GROUP BY ArrTime, DepTimeBlk, DaysSinceEpoch LIMIT 10","hsqls":["SELECT ArrTime, DepTimeBlk, DaysSinceEpoch, MIN(SecurityDelay), MAX(ActualElapsedTime) FROM mytable WHERE OriginAirportID BETWEEN 11995 AND 12197 OR (DivTotalGTimes[1] BETWEEN 92 AND 69 OR DivTotalGTimes[2] BETWEEN 92 AND 69 OR DivTotalGTimes[3] BETWEEN 92 AND 69 OR DivTotalGTimes[4] BETWEEN 92 AND 69 OR DivTotalGTimes[5] BETWEEN 92 AND 69) AND DestCityName NOT IN ('Springfield, MO') GROUP BY ArrTime, DepTimeBlk, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT SUM(NASDelay) FROM mytable WHERE CarrierDelay >= 140 AND OriginStateFips BETWEEN 18 AND 12 LIMIT 27"}
 {"sql":"SELECT DistanceGroup, ArrDelay, MIN(DepDelay) FROM mytable WHERE DestStateName IN ('Mississippi', 'Texas', 'Oregon') AND OriginState <= 'AR' GROUP BY DistanceGroup, ArrDelay  ORDER BY DistanceGroup, ArrDelay LIMIT 19","hsqls":["SELECT DistanceGroup, ArrDelay, MIN(DepDelay) FROM mytable WHERE DestStateName IN ('Mississippi', 'Texas', 'Oregon') AND OriginState <= 'AR' GROUP BY DistanceGroup, ArrDelay  ORDER BY DistanceGroup, ArrDelay LIMIT 19"]}
 {"sql":"SELECT FlightNum, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 270.0 AND 200.0 AND DaysSinceEpoch IN (16072) OR DivReachedDest BETWEEN -9999 AND 1 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 28","hsqls":["SELECT FlightNum, COUNT(*) FROM mytable WHERE DepDelayMinutes BETWEEN 270.0 AND 200.0 AND DaysSinceEpoch IN (16072) OR DivReachedDest BETWEEN -9999 AND 1 GROUP BY FlightNum  ORDER BY FlightNum LIMIT 28"]}
-{"sql":"SELECT DestState, AVG(LongestAddGTime), MAX(FirstDepTime), MAX(\"Month\") FROM mytable WHERE DepTime IN (2320, 523, 1339, 2116, 602) OR DepDelayMinutes BETWEEN 176.0 AND 230.0 GROUP BY DestState LIMIT 20","hsqls":["SELECT DestState, AVG(LongestAddGTime), MAX(FirstDepTime), MAX(Month) FROM mytable WHERE DepTime IN (2320, 523, 1339, 2116, 602) OR DepDelayMinutes BETWEEN 176.0 AND 230.0 GROUP BY DestState LIMIT 20"]}
-{"sql":"SELECT DivWheelsOns, DestCityName, Dest FROM mytable WHERE DepDelayMinutes > 233.0 OR FlightNum IN (1433, 6205, 3944, 320, 3575) ORDER BY DestWac, OriginState, OriginCityMarketID LIMIT 28","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestCityName, Dest FROM mytable WHERE DepDelayMinutes > 233.0 OR FlightNum IN (1433, 6205, 3944, 320, 3575) ORDER BY DestWac, OriginState, OriginCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestState, AVG(LongestAddGTime), MAX(FirstDepTime), MAX(\"Month\") FROM mytable WHERE DepTime IN (2320, 523, 1339, 2116, 602) OR DepDelayMinutes BETWEEN 176.0 AND 230.0 GROUP BY DestState LIMIT 20","hsqls":["SELECT DestState, AVG(LongestAddGTime), MAX(FirstDepTime), MAX(`Month`) FROM mytable WHERE DepTime IN (2320, 523, 1339, 2116, 602) OR DepDelayMinutes BETWEEN 176.0 AND 230.0 GROUP BY DestState LIMIT 20"]}
+{"sql":"SELECT DivWheelsOns, DestCityName, Dest FROM mytable WHERE DepDelayMinutes > 233.0 OR FlightNum IN (1433, 6205, 3944, 320, 3575) ORDER BY DestWac, OriginState, OriginCityMarketID LIMIT 28","hsqls":["SELECT DivWheelsOns, DestCityName, Dest FROM mytable WHERE DepDelayMinutes > 233.0 OR FlightNum IN (1433, 6205, 3944, 320, 3575) ORDER BY DestWac, OriginState, OriginCityMarketID LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, MAX(OriginAirportSeqID), MIN(ActualElapsedTime), AVG(DepTime) FROM mytable WHERE DestCityName > 'Manchester, NH' OR DaysSinceEpoch <= 16092 OR CRSDepTime < 935 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 21","hsqls":["SELECT LongestAddGTime, MAX(OriginAirportSeqID), MIN(ActualElapsedTime), AVG(DepTime) FROM mytable WHERE DestCityName > 'Manchester, NH' OR DaysSinceEpoch <= 16092 OR CRSDepTime < 935 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 21"]}
 {"sql":"SELECT DestState, TaxiIn, DepDel15, MIN(DivActualElapsedTime), AVG(ActualElapsedTime), MAX(Cancelled) FROM mytable WHERE DaysSinceEpoch IN (16088) OR DayOfWeek IN (3, 2, 1, 6, 5) GROUP BY DestState, TaxiIn, DepDel15  ORDER BY DestState, TaxiIn, DepDel15 LIMIT 16","hsqls":["SELECT DestState, TaxiIn, DepDel15, MIN(DivActualElapsedTime), AVG(ActualElapsedTime), MAX(Cancelled) FROM mytable WHERE DaysSinceEpoch IN (16088) OR DayOfWeek IN (3, 2, 1, 6, 5) GROUP BY DestState, TaxiIn, DepDel15  ORDER BY DestState, TaxiIn, DepDel15 LIMIT 16"]}
 {"sql":"SELECT TaxiIn, MIN(FlightNum), AVG(NASDelay), AVG(LateAircraftDelay) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 29","hsqls":["SELECT TaxiIn, MIN(FlightNum), AVG(NASDelay), AVG(LateAircraftDelay) FROM mytable GROUP BY TaxiIn  ORDER BY TaxiIn LIMIT 29"]}
@@ -9460,126 +9460,126 @@
 {"sql":"SELECT OriginAirportSeqID, DestStateName FROM mytable WHERE TaxiOut BETWEEN 93 AND 90 OR AirTime IN (107) AND ActualElapsedTime IN (349, 117, 361) ORDER BY Quarter LIMIT 21"}
 {"sql":"SELECT SUM(TotalAddGTime) FROM mytable WHERE DestState IN ('SC') OR DivArrDelay BETWEEN 322 AND 81 AND DivAirportLandings BETWEEN 0 AND 1 LIMIT 5"}
 {"sql":"SELECT MAX(OriginAirportSeqID), AVG(Cancelled), COUNT(Cancelled) FROM mytable LIMIT 17"}
-{"sql":"SELECT DivAirportIDs, AirTime FROM mytable WHERE DestWac NOT IN (33) OR AirlineID NOT IN (20304, 19790, 20366, 21171) AND TotalAddGTime IN (2, 78, 73, 27, -9999) LIMIT 7","hsqls":["SELECT DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, AirTime FROM mytable WHERE DestWac NOT IN (33) OR AirlineID NOT IN (20304, 19790, 20366, 21171) AND TotalAddGTime IN (2, 78, 73, 27, -9999) LIMIT 10000"]}
-{"sql":"SELECT DestStateFips, SUM(DivAirportLandings), MAX(DestStateFips), SUM(FlightNum) FROM mytable WHERE DestCityMarketID IN (31537, 31624, 32206) AND DivTailNums = 'N590UA' AND OriginAirportSeqID BETWEEN 1131502 AND 1043403 GROUP BY DestStateFips LIMIT 12","hsqls":["SELECT DestStateFips, SUM(DivAirportLandings), MAX(DestStateFips), SUM(FlightNum) FROM mytable WHERE DestCityMarketID IN (31537, 31624, 32206) AND (DivTailNums__MV0 = 'N590UA' OR DivTailNums__MV1 = 'N590UA' OR DivTailNums__MV2 = 'N590UA' OR DivTailNums__MV3 = 'N590UA' OR DivTailNums__MV4 = 'N590UA') AND OriginAirportSeqID BETWEEN 1131502 AND 1043403 GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT DivAirportIDs, AirTime FROM mytable WHERE DestWac NOT IN (33) OR AirlineID NOT IN (20304, 19790, 20366, 21171) AND TotalAddGTime IN (2, 78, 73, 27, -9999) LIMIT 7","hsqls":["SELECT DivAirportIDs, AirTime FROM mytable WHERE DestWac NOT IN (33) OR AirlineID NOT IN (20304, 19790, 20366, 21171) AND TotalAddGTime IN (2, 78, 73, 27, -9999) LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, SUM(DivAirportLandings), MAX(DestStateFips), SUM(FlightNum) FROM mytable WHERE DestCityMarketID IN (31537, 31624, 32206) AND DivTailNums = 'N590UA' AND OriginAirportSeqID BETWEEN 1131502 AND 1043403 GROUP BY DestStateFips LIMIT 12","hsqls":["SELECT DestStateFips, SUM(DivAirportLandings), MAX(DestStateFips), SUM(FlightNum) FROM mytable WHERE DestCityMarketID IN (31537, 31624, 32206) AND (DivTailNums[1] = 'N590UA' OR DivTailNums[2] = 'N590UA' OR DivTailNums[3] = 'N590UA' OR DivTailNums[4] = 'N590UA' OR DivTailNums[5] = 'N590UA') AND OriginAirportSeqID BETWEEN 1131502 AND 1043403 GROUP BY DestStateFips LIMIT 10000"]}
 {"sql":"SELECT OriginWac, DayOfWeek, AVG(FlightNum) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DestCityMarketID IN (31315, 33192, 30189, 34236, 31823) GROUP BY OriginWac, DayOfWeek  ORDER BY OriginWac, DayOfWeek LIMIT 4","hsqls":["SELECT OriginWac, DayOfWeek, AVG(FlightNum) FROM mytable WHERE Cancelled BETWEEN 1 AND 0 OR DestCityMarketID IN (31315, 33192, 30189, 34236, 31823) GROUP BY OriginWac, DayOfWeek  ORDER BY OriginWac, DayOfWeek LIMIT 4"]}
-{"sql":"SELECT DivWheelsOffs, DayofMonth, CRSElapsedTime FROM mytable WHERE DestStateFips BETWEEN 2 AND 53 AND FlightNum BETWEEN 1317 AND 1924 LIMIT 26","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, DayofMonth, CRSElapsedTime FROM mytable WHERE DestStateFips BETWEEN 2 AND 53 AND FlightNum BETWEEN 1317 AND 1924 LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, DayofMonth, CRSElapsedTime FROM mytable WHERE DestStateFips BETWEEN 2 AND 53 AND FlightNum BETWEEN 1317 AND 1924 LIMIT 26","hsqls":["SELECT DivWheelsOffs, DayofMonth, CRSElapsedTime FROM mytable WHERE DestStateFips BETWEEN 2 AND 53 AND FlightNum BETWEEN 1317 AND 1924 LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable ORDER BY OriginState, CRSDepTime LIMIT 11"}
 {"sql":"SELECT Cancelled, AirlineID FROM mytable WHERE AirTime = 119 AND CRSDepTime NOT IN (729, 1844, 816, 1744, 902) ORDER BY FirstDepTime, Flights, DepDelayMinutes LIMIT 2"}
 {"sql":"SELECT Carrier FROM mytable WHERE UniqueCarrier IN ('EV', 'B6', 'AS', 'AA') AND FirstDepTime > 907 ORDER BY DepDelayMinutes, Origin LIMIT 1"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DestState <> 'TX' LIMIT 20"}
 {"sql":"SELECT DestState FROM mytable WHERE DivActualElapsedTime >= 196 ORDER BY ArrDel15, DepDel15, DestCityMarketID LIMIT 28"}
 {"sql":"SELECT TotalAddGTime FROM mytable WHERE CRSDepTime NOT IN (1917, 2108, 938) LIMIT 22"}
-{"sql":"SELECT DivWheelsOffs, CancellationCode, OriginStateName FROM mytable WHERE DivAirports >= 'WRG' OR TaxiOut >= 48 ORDER BY DepDelay LIMIT 27","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, CancellationCode, OriginStateName FROM mytable WHERE (DivAirports__MV0 >= 'WRG' OR DivAirports__MV1 >= 'WRG' OR DivAirports__MV2 >= 'WRG' OR DivAirports__MV3 >= 'WRG' OR DivAirports__MV4 >= 'WRG') OR TaxiOut >= 48 ORDER BY DepDelay LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs, CancellationCode, OriginStateName FROM mytable WHERE DivAirports >= 'WRG' OR TaxiOut >= 48 ORDER BY DepDelay LIMIT 27","hsqls":["SELECT DivWheelsOffs, CancellationCode, OriginStateName FROM mytable WHERE (DivAirports[1] >= 'WRG' OR DivAirports[2] >= 'WRG' OR DivAirports[3] >= 'WRG' OR DivAirports[4] >= 'WRG' OR DivAirports[5] >= 'WRG') OR TaxiOut >= 48 ORDER BY DepDelay LIMIT 10000"]}
 {"sql":"SELECT CRSElapsedTime FROM mytable WHERE DestStateName NOT IN ('Missouri') OR CRSArrTime <> 812 ORDER BY OriginState LIMIT 16"}
-{"sql":"SELECT LateAircraftDelay, DestAirportSeqID FROM mytable WHERE CRSDepTime NOT IN (1001, 1708, 1301, 607) OR DestStateFips BETWEEN 35 AND 30 AND DivAirportSeqIDs IN (1232303, 1469605) ORDER BY TaxiOut, DepTime LIMIT 23","hsqls":["SELECT LateAircraftDelay, DestAirportSeqID FROM mytable WHERE CRSDepTime NOT IN (1001, 1708, 1301, 607) OR DestStateFips BETWEEN 35 AND 30 AND (DivAirportSeqIDs__MV0 IN (1232303, 1469605) OR DivAirportSeqIDs__MV1 IN (1232303, 1469605) OR DivAirportSeqIDs__MV2 IN (1232303, 1469605) OR DivAirportSeqIDs__MV3 IN (1232303, 1469605) OR DivAirportSeqIDs__MV4 IN (1232303, 1469605)) ORDER BY TaxiOut, DepTime LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, DestAirportSeqID FROM mytable WHERE CRSDepTime NOT IN (1001, 1708, 1301, 607) OR DestStateFips BETWEEN 35 AND 30 AND DivAirportSeqIDs IN (1232303, 1469605) ORDER BY TaxiOut, DepTime LIMIT 23","hsqls":["SELECT LateAircraftDelay, DestAirportSeqID FROM mytable WHERE CRSDepTime NOT IN (1001, 1708, 1301, 607) OR DestStateFips BETWEEN 35 AND 30 AND (DivAirportSeqIDs[1] IN (1232303, 1469605) OR DivAirportSeqIDs[2] IN (1232303, 1469605) OR DivAirportSeqIDs[3] IN (1232303, 1469605) OR DivAirportSeqIDs[4] IN (1232303, 1469605) OR DivAirportSeqIDs[5] IN (1232303, 1469605)) ORDER BY TaxiOut, DepTime LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, COUNT(*) FROM mytable GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 11","hsqls":["SELECT WeatherDelay, COUNT(*) FROM mytable GROUP BY WeatherDelay  ORDER BY WeatherDelay LIMIT 11"]}
 {"sql":"SELECT DepartureDelayGroups, SUM(Quarter) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 10","hsqls":["SELECT DepartureDelayGroups, SUM(Quarter) FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 10"]}
-{"sql":"SELECT DepTime, DivAirportIDs, OriginStateName FROM mytable WHERE OriginState NOT IN ('OK', 'UT') AND DestState BETWEEN 'MN' AND 'HI' OR FlightDate BETWEEN '2014-01-05' AND '2014-01-31' LIMIT 13","hsqls":["SELECT DepTime, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4, OriginStateName FROM mytable WHERE OriginState NOT IN ('OK', 'UT') AND DestState BETWEEN 'MN' AND 'HI' OR FlightDate BETWEEN '2014-01-05' AND '2014-01-31' LIMIT 10000"]}
+{"sql":"SELECT DepTime, DivAirportIDs, OriginStateName FROM mytable WHERE OriginState NOT IN ('OK', 'UT') AND DestState BETWEEN 'MN' AND 'HI' OR FlightDate BETWEEN '2014-01-05' AND '2014-01-31' LIMIT 13","hsqls":["SELECT DepTime, DivAirportIDs, OriginStateName FROM mytable WHERE OriginState NOT IN ('OK', 'UT') AND DestState BETWEEN 'MN' AND 'HI' OR FlightDate BETWEEN '2014-01-05' AND '2014-01-31' LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, MIN(ActualElapsedTime), AVG(OriginStateFips) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 16","hsqls":["SELECT LongestAddGTime, MIN(ActualElapsedTime), AVG(OriginStateFips) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 16"]}
-{"sql":"SELECT FlightNum, DivAirportSeqIDs FROM mytable WHERE LateAircraftDelay BETWEEN 117 AND 17 AND DivTotalGTimes BETWEEN 136 AND 22 OR DestAirportSeqID IN (1486903, 1131502, 1099402, 1326403, 1198002) ORDER BY ArrTimeBlk, ArrivalDelayGroups LIMIT 24","hsqls":["SELECT FlightNum, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE LateAircraftDelay BETWEEN 117 AND 17 AND (DivTotalGTimes__MV0 BETWEEN 136 AND 22 OR DivTotalGTimes__MV1 BETWEEN 136 AND 22 OR DivTotalGTimes__MV2 BETWEEN 136 AND 22 OR DivTotalGTimes__MV3 BETWEEN 136 AND 22 OR DivTotalGTimes__MV4 BETWEEN 136 AND 22) OR DestAirportSeqID IN (1486903, 1131502, 1099402, 1326403, 1198002) ORDER BY ArrTimeBlk, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT FlightNum, DivAirportSeqIDs FROM mytable WHERE LateAircraftDelay BETWEEN 117 AND 17 AND DivTotalGTimes BETWEEN 136 AND 22 OR DestAirportSeqID IN (1486903, 1131502, 1099402, 1326403, 1198002) ORDER BY ArrTimeBlk, ArrivalDelayGroups LIMIT 24","hsqls":["SELECT FlightNum, DivAirportSeqIDs FROM mytable WHERE LateAircraftDelay BETWEEN 117 AND 17 AND (DivTotalGTimes[1] BETWEEN 136 AND 22 OR DivTotalGTimes[2] BETWEEN 136 AND 22 OR DivTotalGTimes[3] BETWEEN 136 AND 22 OR DivTotalGTimes[4] BETWEEN 136 AND 22 OR DivTotalGTimes[5] BETWEEN 136 AND 22) OR DestAirportSeqID IN (1486903, 1131502, 1099402, 1326403, 1198002) ORDER BY ArrTimeBlk, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT OriginStateFips, DivAirportLandings, MAX(ArrivalDelayGroups), MAX(CRSElapsedTime) FROM mytable GROUP BY OriginStateFips, DivAirportLandings  ORDER BY OriginStateFips, DivAirportLandings LIMIT 10","hsqls":["SELECT OriginStateFips, DivAirportLandings, MAX(ArrivalDelayGroups), MAX(CRSElapsedTime) FROM mytable GROUP BY OriginStateFips, DivAirportLandings  ORDER BY OriginStateFips, DivAirportLandings LIMIT 10"]}
 {"sql":"SELECT DestWac, UniqueCarrier FROM mytable WHERE DivActualElapsedTime <= 508 ORDER BY DepartureDelayGroups, DestWac, NASDelay LIMIT 15"}
-{"sql":"SELECT CarrierDelay, DestStateFips, ActualElapsedTime FROM mytable WHERE \"Year\" NOT IN (2014) OR OriginAirportSeqID IN (1541202) OR DestWac NOT IN (51) ORDER BY TaxiIn, DaysSinceEpoch LIMIT 6","hsqls":["SELECT CarrierDelay, DestStateFips, ActualElapsedTime FROM mytable WHERE Year NOT IN (2014) OR OriginAirportSeqID IN (1541202) OR DestWac NOT IN (51) ORDER BY TaxiIn, DaysSinceEpoch LIMIT 6"]}
+{"sql":"SELECT CarrierDelay, DestStateFips, ActualElapsedTime FROM mytable WHERE \"Year\" NOT IN (2014) OR OriginAirportSeqID IN (1541202) OR DestWac NOT IN (51) ORDER BY TaxiIn, DaysSinceEpoch LIMIT 6","hsqls":["SELECT CarrierDelay, DestStateFips, ActualElapsedTime FROM mytable WHERE `Year` NOT IN (2014) OR OriginAirportSeqID IN (1541202) OR DestWac NOT IN (51) ORDER BY TaxiIn, DaysSinceEpoch LIMIT 6"]}
 {"sql":"SELECT OriginAirportSeqID, Dest FROM mytable WHERE CancellationCode BETWEEN 'B' AND 'noodles' ORDER BY DivAirportLandings LIMIT 16"}
 {"sql":"SELECT WeatherDelay, DepTime, AirTime FROM mytable WHERE DivDistance IN (31, 51, 945, 439, 74) AND DestAirportID BETWEEN 14321 AND 11315 ORDER BY FirstDepTime, CancellationCode, DivAirportLandings LIMIT 5"}
 {"sql":"SELECT DestState, CancellationCode, AirlineID FROM mytable WHERE DestAirportID BETWEEN 13502 AND 11122 OR DaysSinceEpoch IN (16091) LIMIT 25"}
 {"sql":"SELECT COUNT(OriginCityMarketID), COUNT(DistanceGroup), SUM(OriginCityMarketID) FROM mytable WHERE DestAirportID >= 11638 LIMIT 9"}
 {"sql":"SELECT SUM(Cancelled), MAX(DestStateFips), MAX(DepartureDelayGroups) FROM mytable WHERE DivReachedDest > 1 AND OriginAirportID NOT IN (15411, 14730, 12982, 14698, 10713) LIMIT 5"}
-{"sql":"SELECT TotalAddGTime, DestAirportSeqID, ArrTimeBlk, AVG(DepDelay) FROM mytable WHERE DivAirportIDs BETWEEN 14831 AND 10620 AND OriginAirportSeqID IN (1043102) AND UniqueCarrier NOT IN ('F9', 'WN', 'US', 'MQ', 'AA') GROUP BY TotalAddGTime, DestAirportSeqID, ArrTimeBlk LIMIT 28","hsqls":["SELECT TotalAddGTime, DestAirportSeqID, ArrTimeBlk, AVG(CAST(DepDelay AS DOUBLE)) FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14831 AND 10620 OR DivAirportIDs__MV1 BETWEEN 14831 AND 10620 OR DivAirportIDs__MV2 BETWEEN 14831 AND 10620 OR DivAirportIDs__MV3 BETWEEN 14831 AND 10620 OR DivAirportIDs__MV4 BETWEEN 14831 AND 10620) AND OriginAirportSeqID IN (1043102) AND UniqueCarrier NOT IN ('F9', 'WN', 'US', 'MQ', 'AA') GROUP BY TotalAddGTime, DestAirportSeqID, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime, DestAirportSeqID, ArrTimeBlk, AVG(DepDelay) FROM mytable WHERE DivAirportIDs BETWEEN 14831 AND 10620 AND OriginAirportSeqID IN (1043102) AND UniqueCarrier NOT IN ('F9', 'WN', 'US', 'MQ', 'AA') GROUP BY TotalAddGTime, DestAirportSeqID, ArrTimeBlk LIMIT 28","hsqls":["SELECT TotalAddGTime, DestAirportSeqID, ArrTimeBlk, AVG(CAST(DepDelay AS DOUBLE)) FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14831 AND 10620 OR DivAirportIDs[2] BETWEEN 14831 AND 10620 OR DivAirportIDs[3] BETWEEN 14831 AND 10620 OR DivAirportIDs[4] BETWEEN 14831 AND 10620 OR DivAirportIDs[5] BETWEEN 14831 AND 10620) AND OriginAirportSeqID IN (1043102) AND UniqueCarrier NOT IN ('F9', 'WN', 'US', 'MQ', 'AA') GROUP BY TotalAddGTime, DestAirportSeqID, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT ArrivalDelayGroups FROM mytable ORDER BY DestStateFips, Origin, DivAirportLandings LIMIT 20"}
 {"sql":"SELECT CRSDepTime FROM mytable ORDER BY DistanceGroup, LongestAddGTime, ArrTime LIMIT 23"}
 {"sql":"SELECT MAX(Flights), MAX(CRSArrTime) FROM mytable LIMIT 3"}
-{"sql":"SELECT CancellationCode, CRSElapsedTime, DivActualElapsedTime FROM mytable WHERE ActualElapsedTime = 26 AND DivWheelsOns IN (1221, 1125, 2010, 1253, 923) LIMIT 22","hsqls":["SELECT CancellationCode, CRSElapsedTime, DivActualElapsedTime FROM mytable WHERE ActualElapsedTime = 26 AND (DivWheelsOns__MV0 IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns__MV1 IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns__MV2 IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns__MV3 IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns__MV4 IN (1221, 1125, 2010, 1253, 923)) LIMIT 10000"]}
-{"sql":"SELECT WeatherDelay, CancellationCode, \"Month\" FROM mytable WHERE DestAirportSeqID NOT IN (1467402, 1018502, 1289203) ORDER BY \"Year\", TailNum LIMIT 26","hsqls":["SELECT WeatherDelay, CancellationCode, Month FROM mytable WHERE DestAirportSeqID NOT IN (1467402, 1018502, 1289203) ORDER BY Year, TailNum LIMIT 26"]}
+{"sql":"SELECT CancellationCode, CRSElapsedTime, DivActualElapsedTime FROM mytable WHERE ActualElapsedTime = 26 AND DivWheelsOns IN (1221, 1125, 2010, 1253, 923) LIMIT 22","hsqls":["SELECT CancellationCode, CRSElapsedTime, DivActualElapsedTime FROM mytable WHERE ActualElapsedTime = 26 AND (DivWheelsOns[1] IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns[2] IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns[3] IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns[4] IN (1221, 1125, 2010, 1253, 923) OR DivWheelsOns[5] IN (1221, 1125, 2010, 1253, 923)) LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, CancellationCode, \"Month\" FROM mytable WHERE DestAirportSeqID NOT IN (1467402, 1018502, 1289203) ORDER BY \"Year\", TailNum LIMIT 26","hsqls":["SELECT WeatherDelay, CancellationCode, `Month` FROM mytable WHERE DestAirportSeqID NOT IN (1467402, 1018502, 1289203) ORDER BY Year, TailNum LIMIT 26"]}
 {"sql":"SELECT DivDistance FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'B' OR DivActualElapsedTime BETWEEN 310 AND 364 AND Diverted >= 1 LIMIT 10"}
 {"sql":"SELECT DivReachedDest, DepDelay, CRSDepTime FROM mytable WHERE DivActualElapsedTime BETWEEN 121 AND 495 ORDER BY ArrTimeBlk, DepDel15, DaysSinceEpoch LIMIT 15"}
-{"sql":"SELECT Carrier FROM mytable WHERE DivLongestGTimes BETWEEN 50.0 AND 116.0 OR ArrTimeBlk BETWEEN '0001-0559' AND '1900-1959' LIMIT 10","hsqls":["SELECT Carrier FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 50.0 AND 116.0 OR DivLongestGTimes__MV1 BETWEEN 50.0 AND 116.0 OR DivLongestGTimes__MV2 BETWEEN 50.0 AND 116.0 OR DivLongestGTimes__MV3 BETWEEN 50.0 AND 116.0 OR DivLongestGTimes__MV4 BETWEEN 50.0 AND 116.0) OR ArrTimeBlk BETWEEN '0001-0559' AND '1900-1959' LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes, DivWheelsOffs, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' AND DistanceGroup BETWEEN 4 AND 8 ORDER BY AirTime LIMIT 24","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' AND DistanceGroup BETWEEN 4 AND 8 ORDER BY AirTime LIMIT 10000"]}
+{"sql":"SELECT Carrier FROM mytable WHERE DivLongestGTimes BETWEEN 50.0 AND 116.0 OR ArrTimeBlk BETWEEN '0001-0559' AND '1900-1959' LIMIT 10","hsqls":["SELECT Carrier FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 50.0 AND 116.0 OR DivLongestGTimes[2] BETWEEN 50.0 AND 116.0 OR DivLongestGTimes[3] BETWEEN 50.0 AND 116.0 OR DivLongestGTimes[4] BETWEEN 50.0 AND 116.0 OR DivLongestGTimes[5] BETWEEN 50.0 AND 116.0) OR ArrTimeBlk BETWEEN '0001-0559' AND '1900-1959' LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivWheelsOffs, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' AND DistanceGroup BETWEEN 4 AND 8 ORDER BY AirTime LIMIT 24","hsqls":["SELECT DivLongestGTimes, DivWheelsOffs, WheelsOn FROM mytable WHERE CancellationCode BETWEEN 'noodles' AND 'C' AND DistanceGroup BETWEEN 4 AND 8 ORDER BY AirTime LIMIT 10000"]}
 {"sql":"SELECT DepTime, UniqueCarrier, AVG(DestStateFips), AVG(DivDistance) FROM mytable GROUP BY DepTime, UniqueCarrier  ORDER BY DepTime, UniqueCarrier LIMIT 1","hsqls":["SELECT DepTime, UniqueCarrier, AVG(DestStateFips), AVG(DivDistance) FROM mytable GROUP BY DepTime, UniqueCarrier  ORDER BY DepTime, UniqueCarrier LIMIT 1"]}
 {"sql":"SELECT FirstDepTime, CRSElapsedTime, SUM(ArrDel15), MIN(DivDistance) FROM mytable GROUP BY FirstDepTime, CRSElapsedTime  ORDER BY FirstDepTime, CRSElapsedTime LIMIT 28","hsqls":["SELECT FirstDepTime, CRSElapsedTime, SUM(ArrDel15), MIN(DivDistance) FROM mytable GROUP BY FirstDepTime, CRSElapsedTime  ORDER BY FirstDepTime, CRSElapsedTime LIMIT 28"]}
 {"sql":"SELECT LongestAddGTime, COUNT(TaxiIn), AVG(FlightNum), MAX(TaxiOut) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 19","hsqls":["SELECT LongestAddGTime, COUNT(TaxiIn), AVG(FlightNum), MAX(TaxiOut) FROM mytable GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 19"]}
-{"sql":"SELECT AirlineID, DivTotalGTimes FROM mytable WHERE OriginAirportID NOT IN (13198, 11150) OR DivArrDelay > 219 ORDER BY OriginAirportSeqID LIMIT 26","hsqls":["SELECT AirlineID, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginAirportID NOT IN (13198, 11150) OR DivArrDelay > 219 ORDER BY OriginAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT AirlineID, DivTotalGTimes FROM mytable WHERE OriginAirportID NOT IN (13198, 11150) OR DivArrDelay > 219 ORDER BY OriginAirportSeqID LIMIT 26","hsqls":["SELECT AirlineID, DivTotalGTimes FROM mytable WHERE OriginAirportID NOT IN (13198, 11150) OR DivArrDelay > 219 ORDER BY OriginAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT ArrTime FROM mytable WHERE DepDelayMinutes IN (248.0, 110.0, 304.0, 14.0) OR DestCityName BETWEEN 'Brunswick, GA' AND 'Tulsa, OK' ORDER BY OriginAirportSeqID, TailNum, DayofMonth LIMIT 28"}
 {"sql":"SELECT DestState, CRSDepTime FROM mytable WHERE DestWac <> 21 OR DestAirportID BETWEEN 13422 AND 11413 ORDER BY DestState, CRSArrTime, UniqueCarrier LIMIT 10"}
-{"sql":"SELECT FlightNum, TailNum, Origin FROM mytable WHERE DivAirportSeqIDs IN (1342402, 1410702, 1330303) LIMIT 15","hsqls":["SELECT FlightNum, TailNum, Origin FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs__MV1 IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs__MV2 IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs__MV3 IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs__MV4 IN (1342402, 1410702, 1330303)) LIMIT 10000"]}
+{"sql":"SELECT FlightNum, TailNum, Origin FROM mytable WHERE DivAirportSeqIDs IN (1342402, 1410702, 1330303) LIMIT 15","hsqls":["SELECT FlightNum, TailNum, Origin FROM mytable WHERE (DivAirportSeqIDs[1] IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs[2] IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs[3] IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs[4] IN (1342402, 1410702, 1330303) OR DivAirportSeqIDs[5] IN (1342402, 1410702, 1330303)) LIMIT 10000"]}
 {"sql":"SELECT ArrTimeBlk, TailNum, COUNT(*) FROM mytable GROUP BY ArrTimeBlk, TailNum  ORDER BY ArrTimeBlk, TailNum LIMIT 10","hsqls":["SELECT ArrTimeBlk, TailNum, COUNT(*) FROM mytable GROUP BY ArrTimeBlk, TailNum  ORDER BY ArrTimeBlk, TailNum LIMIT 10"]}
 {"sql":"SELECT COUNT(TaxiOut), COUNT(DivReachedDest) FROM mytable LIMIT 6"}
 {"sql":"SELECT DaysSinceEpoch FROM mytable ORDER BY CRSArrTime LIMIT 5"}
 {"sql":"SELECT Cancelled, DestAirportID FROM mytable WHERE FlightNum BETWEEN 1355 AND 7420 OR DistanceGroup <> 6 OR Quarter BETWEEN 1 AND 1 ORDER BY DepTimeBlk LIMIT 25"}
-{"sql":"SELECT DepartureDelayGroups, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY DivReachedDest, SecurityDelay, ActualElapsedTime LIMIT 13","hsqls":["SELECT DepartureDelayGroups, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrivalDelayGroups FROM mytable ORDER BY DivReachedDest, SecurityDelay, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY DivReachedDest, SecurityDelay, ActualElapsedTime LIMIT 13","hsqls":["SELECT DepartureDelayGroups, DivAirportSeqIDs, ArrivalDelayGroups FROM mytable ORDER BY DivReachedDest, SecurityDelay, ActualElapsedTime LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier, MIN(DivReachedDest), SUM(TaxiIn), MIN(DayofMonth) FROM mytable WHERE DestAirportSeqID >= 1199502 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 13","hsqls":["SELECT UniqueCarrier, MIN(DivReachedDest), SUM(TaxiIn), MIN(DayofMonth) FROM mytable WHERE DestAirportSeqID >= 1199502 GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 13"]}
 {"sql":"SELECT DestState, COUNT(OriginState) FROM mytable WHERE DivArrDelay BETWEEN 427 AND 322 OR TailNum IN ('N729JB', 'N470UA') GROUP BY DestState  ORDER BY DestState LIMIT 4","hsqls":["SELECT DestState, COUNT(OriginState) FROM mytable WHERE DivArrDelay BETWEEN 427 AND 322 OR TailNum IN ('N729JB', 'N470UA') GROUP BY DestState  ORDER BY DestState LIMIT 4"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 2"}
 {"sql":"SELECT Flights, DestCityName, DivArrDelay, AVG(WeatherDelay), AVG(DestStateFips) FROM mytable WHERE DivDistance IN (483, 395, 40) GROUP BY Flights, DestCityName, DivArrDelay  ORDER BY Flights, DestCityName, DivArrDelay LIMIT 4","hsqls":["SELECT Flights, DestCityName, DivArrDelay, AVG(WeatherDelay), AVG(DestStateFips) FROM mytable WHERE DivDistance IN (483, 395, 40) GROUP BY Flights, DestCityName, DivArrDelay  ORDER BY Flights, DestCityName, DivArrDelay LIMIT 4"]}
-{"sql":"SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DivWheelsOffs BETWEEN 2043 AND 2133 AND FlightNum NOT IN (3228) LIMIT 11","hsqls":["SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR (DivWheelsOffs__MV0 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV1 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV2 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV3 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV4 BETWEEN 2043 AND 2133) AND FlightNum NOT IN (3228) LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, \"Year\", FirstDepTime, SUM(CRSDepTime), MAX(ArrTime) FROM mytable WHERE Carrier < 'B6' AND DivWheelsOns BETWEEN 1436 AND 1504 GROUP BY OriginAirportSeqID, \"Year\", FirstDepTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Year, FirstDepTime, SUM(CRSDepTime), MAX(ArrTime) FROM mytable WHERE Carrier < 'B6' AND (DivWheelsOns__MV0 BETWEEN 1436 AND 1504 OR DivWheelsOns__MV1 BETWEEN 1436 AND 1504 OR DivWheelsOns__MV2 BETWEEN 1436 AND 1504 OR DivWheelsOns__MV3 BETWEEN 1436 AND 1504 OR DivWheelsOns__MV4 BETWEEN 1436 AND 1504) GROUP BY OriginAirportSeqID, Year, FirstDepTime LIMIT 10000"]}
-{"sql":"SELECT CarrierDelay, TotalAddGTime, \"Month\" FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 ORDER BY Origin LIMIT 13","hsqls":["SELECT CarrierDelay, TotalAddGTime, Month FROM mytable WHERE Month BETWEEN 1 AND 1 ORDER BY Origin LIMIT 13"]}
-{"sql":"SELECT DepTime FROM mytable WHERE Origin <> 'BIS' OR CRSDepTime BETWEEN 756 AND 1642 OR DivAirportIDs = 15070 LIMIT 10","hsqls":["SELECT DepTime FROM mytable WHERE Origin <> 'BIS' OR CRSDepTime BETWEEN 756 AND 1642 OR (DivAirportIDs__MV0 = 15070 OR DivAirportIDs__MV1 = 15070 OR DivAirportIDs__MV2 = 15070 OR DivAirportIDs__MV3 = 15070 OR DivAirportIDs__MV4 = 15070) LIMIT 10000"]}
+{"sql":"SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DivWheelsOffs BETWEEN 2043 AND 2133 AND FlightNum NOT IN (3228) LIMIT 11","hsqls":["SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR (DivWheelsOffs[1] BETWEEN 2043 AND 2133 OR DivWheelsOffs[2] BETWEEN 2043 AND 2133 OR DivWheelsOffs[3] BETWEEN 2043 AND 2133 OR DivWheelsOffs[4] BETWEEN 2043 AND 2133 OR DivWheelsOffs[5] BETWEEN 2043 AND 2133) AND FlightNum NOT IN (3228) LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, \"Year\", FirstDepTime, SUM(CRSDepTime), MAX(ArrTime) FROM mytable WHERE Carrier < 'B6' AND DivWheelsOns BETWEEN 1436 AND 1504 GROUP BY OriginAirportSeqID, \"Year\", FirstDepTime LIMIT 11","hsqls":["SELECT OriginAirportSeqID, Year, FirstDepTime, SUM(CRSDepTime), MAX(ArrTime) FROM mytable WHERE Carrier < 'B6' AND (DivWheelsOns[1] BETWEEN 1436 AND 1504 OR DivWheelsOns[2] BETWEEN 1436 AND 1504 OR DivWheelsOns[3] BETWEEN 1436 AND 1504 OR DivWheelsOns[4] BETWEEN 1436 AND 1504 OR DivWheelsOns[5] BETWEEN 1436 AND 1504) GROUP BY OriginAirportSeqID, Year, FirstDepTime LIMIT 10000"]}
+{"sql":"SELECT CarrierDelay, TotalAddGTime, \"Month\" FROM mytable WHERE \"Month\" BETWEEN 1 AND 1 ORDER BY Origin LIMIT 13","hsqls":["SELECT CarrierDelay, TotalAddGTime, `Month` FROM mytable WHERE `Month` BETWEEN 1 AND 1 ORDER BY Origin LIMIT 13"]}
+{"sql":"SELECT DepTime FROM mytable WHERE Origin <> 'BIS' OR CRSDepTime BETWEEN 756 AND 1642 OR DivAirportIDs = 15070 LIMIT 10","hsqls":["SELECT DepTime FROM mytable WHERE Origin <> 'BIS' OR CRSDepTime BETWEEN 756 AND 1642 OR (DivAirportIDs[1] = 15070 OR DivAirportIDs[2] = 15070 OR DivAirportIDs[3] = 15070 OR DivAirportIDs[4] = 15070 OR DivAirportIDs[5] = 15070) LIMIT 10000"]}
 {"sql":"SELECT DestAirportID, CRSDepTime, OriginAirportID, AVG(AirTime), SUM(OriginCityMarketID) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND -9999 OR DestStateName IN ('Utah', 'Idaho', 'Virginia', 'Arizona', 'Indiana') GROUP BY DestAirportID, CRSDepTime, OriginAirportID  ORDER BY DestAirportID, CRSDepTime, OriginAirportID LIMIT 25","hsqls":["SELECT DestAirportID, CRSDepTime, OriginAirportID, AVG(AirTime), SUM(OriginCityMarketID) FROM mytable WHERE ArrDel15 BETWEEN -9999 AND -9999 OR DestStateName IN ('Utah', 'Idaho', 'Virginia', 'Arizona', 'Indiana') GROUP BY DestAirportID, CRSDepTime, OriginAirportID  ORDER BY DestAirportID, CRSDepTime, OriginAirportID LIMIT 25"]}
 {"sql":"SELECT Diverted, FirstDepTime, ArrDel15, AVG(OriginAirportID) FROM mytable GROUP BY Diverted, FirstDepTime, ArrDel15  ORDER BY Diverted, FirstDepTime, ArrDel15 LIMIT 14","hsqls":["SELECT Diverted, FirstDepTime, ArrDel15, AVG(OriginAirportID) FROM mytable GROUP BY Diverted, FirstDepTime, ArrDel15  ORDER BY Diverted, FirstDepTime, ArrDel15 LIMIT 14"]}
-{"sql":"SELECT DivAirports, DivTotalGTimes FROM mytable LIMIT 8","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable LIMIT 10000"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND DistanceGroup NOT IN (1, 11) ORDER BY OriginState LIMIT 5","hsqls":["SELECT Month FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND DistanceGroup NOT IN (1, 11) ORDER BY OriginState LIMIT 5"]}
+{"sql":"SELECT DivAirports, DivTotalGTimes FROM mytable LIMIT 8","hsqls":["SELECT DivAirports, DivTotalGTimes FROM mytable LIMIT 10000"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND DistanceGroup NOT IN (1, 11) ORDER BY OriginState LIMIT 5","hsqls":["SELECT `Month` FROM mytable WHERE CancellationCode IN ('A', 'B', 'C', 'noodles') AND DistanceGroup NOT IN (1, 11) ORDER BY OriginState LIMIT 5"]}
 {"sql":"SELECT DivDistance, LongestAddGTime, DayofMonth, COUNT(*) FROM mytable WHERE LongestAddGTime BETWEEN 34 AND 60 AND DepDelay = 414.0 OR Dest >= 'MCO' GROUP BY DivDistance, LongestAddGTime, DayofMonth  ORDER BY DivDistance, LongestAddGTime, DayofMonth LIMIT 29","hsqls":["SELECT DivDistance, LongestAddGTime, DayofMonth, COUNT(*) FROM mytable WHERE LongestAddGTime BETWEEN 34 AND 60 AND DepDelay = 414.0 OR Dest >= 'MCO' GROUP BY DivDistance, LongestAddGTime, DayofMonth  ORDER BY DivDistance, LongestAddGTime, DayofMonth LIMIT 29"]}
 {"sql":"SELECT OriginWac, OriginAirportID, AVG(ArrTime), MAX(DestAirportID) FROM mytable GROUP BY OriginWac, OriginAirportID  ORDER BY OriginWac, OriginAirportID LIMIT 13","hsqls":["SELECT OriginWac, OriginAirportID, AVG(ArrTime), MAX(DestAirportID) FROM mytable GROUP BY OriginWac, OriginAirportID  ORDER BY OriginWac, OriginAirportID LIMIT 13"]}
-{"sql":"SELECT DepDelay, TaxiIn, DivAirportLandings, COUNT(*) FROM mytable WHERE DestStateName IN ('New Jersey', 'Georgia', 'Wisconsin', 'Nevada', 'Rhode Island') AND ActualElapsedTime IN (226, 53, 283) AND DivTailNums < 'N16981' GROUP BY DepDelay, TaxiIn, DivAirportLandings LIMIT 13","hsqls":["SELECT DepDelay, TaxiIn, DivAirportLandings, COUNT(*) FROM mytable WHERE DestStateName IN ('New Jersey', 'Georgia', 'Wisconsin', 'Nevada', 'Rhode Island') AND ActualElapsedTime IN (226, 53, 283) AND (DivTailNums__MV0 < 'N16981' OR DivTailNums__MV1 < 'N16981' OR DivTailNums__MV2 < 'N16981' OR DivTailNums__MV3 < 'N16981' OR DivTailNums__MV4 < 'N16981') GROUP BY DepDelay, TaxiIn, DivAirportLandings LIMIT 10000"]}
-{"sql":"SELECT DivDistance, TailNum, DestAirportID FROM mytable WHERE TaxiIn BETWEEN 44 AND 49 AND OriginCityMarketID BETWEEN 30781 AND 33290 OR DivAirportSeqIDs IN (1099402, 1147103) ORDER BY DivActualElapsedTime, DaysSinceEpoch LIMIT 26","hsqls":["SELECT DivDistance, TailNum, DestAirportID FROM mytable WHERE TaxiIn BETWEEN 44 AND 49 AND OriginCityMarketID BETWEEN 30781 AND 33290 OR (DivAirportSeqIDs__MV0 IN (1099402, 1147103) OR DivAirportSeqIDs__MV1 IN (1099402, 1147103) OR DivAirportSeqIDs__MV2 IN (1099402, 1147103) OR DivAirportSeqIDs__MV3 IN (1099402, 1147103) OR DivAirportSeqIDs__MV4 IN (1099402, 1147103)) ORDER BY DivActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepDelay, TaxiIn, DivAirportLandings, COUNT(*) FROM mytable WHERE DestStateName IN ('New Jersey', 'Georgia', 'Wisconsin', 'Nevada', 'Rhode Island') AND ActualElapsedTime IN (226, 53, 283) AND DivTailNums < 'N16981' GROUP BY DepDelay, TaxiIn, DivAirportLandings LIMIT 13","hsqls":["SELECT DepDelay, TaxiIn, DivAirportLandings, COUNT(*) FROM mytable WHERE DestStateName IN ('New Jersey', 'Georgia', 'Wisconsin', 'Nevada', 'Rhode Island') AND ActualElapsedTime IN (226, 53, 283) AND (DivTailNums[1] < 'N16981' OR DivTailNums[2] < 'N16981' OR DivTailNums[3] < 'N16981' OR DivTailNums[4] < 'N16981' OR DivTailNums[5] < 'N16981') GROUP BY DepDelay, TaxiIn, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DivDistance, TailNum, DestAirportID FROM mytable WHERE TaxiIn BETWEEN 44 AND 49 AND OriginCityMarketID BETWEEN 30781 AND 33290 OR DivAirportSeqIDs IN (1099402, 1147103) ORDER BY DivActualElapsedTime, DaysSinceEpoch LIMIT 26","hsqls":["SELECT DivDistance, TailNum, DestAirportID FROM mytable WHERE TaxiIn BETWEEN 44 AND 49 AND OriginCityMarketID BETWEEN 30781 AND 33290 OR (DivAirportSeqIDs[1] IN (1099402, 1147103) OR DivAirportSeqIDs[2] IN (1099402, 1147103) OR DivAirportSeqIDs[3] IN (1099402, 1147103) OR DivAirportSeqIDs[4] IN (1099402, 1147103) OR DivAirportSeqIDs[5] IN (1099402, 1147103)) ORDER BY DivActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime, DestAirportSeqID, AVG(DivArrDelay) FROM mytable GROUP BY CRSArrTime, DestAirportSeqID  ORDER BY CRSArrTime, DestAirportSeqID LIMIT 8","hsqls":["SELECT CRSArrTime, DestAirportSeqID, AVG(DivArrDelay) FROM mytable GROUP BY CRSArrTime, DestAirportSeqID  ORDER BY CRSArrTime, DestAirportSeqID LIMIT 8"]}
-{"sql":"SELECT DepartureDelayGroups, CRSArrTime, NASDelay FROM mytable WHERE DivTailNums IN ('N203UW', 'N844UA') AND OriginWac BETWEEN 42 AND 11 ORDER BY OriginStateFips, FlightDate LIMIT 16","hsqls":["SELECT DepartureDelayGroups, CRSArrTime, NASDelay FROM mytable WHERE (DivTailNums__MV0 IN ('N203UW', 'N844UA') OR DivTailNums__MV1 IN ('N203UW', 'N844UA') OR DivTailNums__MV2 IN ('N203UW', 'N844UA') OR DivTailNums__MV3 IN ('N203UW', 'N844UA') OR DivTailNums__MV4 IN ('N203UW', 'N844UA')) AND OriginWac BETWEEN 42 AND 11 ORDER BY OriginStateFips, FlightDate LIMIT 10000"]}
-{"sql":"SELECT Distance, DivTotalGTimes FROM mytable WHERE ArrTimeBlk IN ('2000-2059') ORDER BY CancellationCode, DestCityMarketID LIMIT 1","hsqls":["SELECT Distance, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE ArrTimeBlk IN ('2000-2059') ORDER BY CancellationCode, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DepartureDelayGroups, CRSArrTime, NASDelay FROM mytable WHERE DivTailNums IN ('N203UW', 'N844UA') AND OriginWac BETWEEN 42 AND 11 ORDER BY OriginStateFips, FlightDate LIMIT 16","hsqls":["SELECT DepartureDelayGroups, CRSArrTime, NASDelay FROM mytable WHERE (DivTailNums[1] IN ('N203UW', 'N844UA') OR DivTailNums[2] IN ('N203UW', 'N844UA') OR DivTailNums[3] IN ('N203UW', 'N844UA') OR DivTailNums[4] IN ('N203UW', 'N844UA') OR DivTailNums[5] IN ('N203UW', 'N844UA')) AND OriginWac BETWEEN 42 AND 11 ORDER BY OriginStateFips, FlightDate LIMIT 10000"]}
+{"sql":"SELECT Distance, DivTotalGTimes FROM mytable WHERE ArrTimeBlk IN ('2000-2059') ORDER BY CancellationCode, DestCityMarketID LIMIT 1","hsqls":["SELECT Distance, DivTotalGTimes FROM mytable WHERE ArrTimeBlk IN ('2000-2059') ORDER BY CancellationCode, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DestStateFips, CRSDepTime FROM mytable WHERE ArrivalDelayGroups NOT IN (10, -2, 7, 6) AND UniqueCarrier >= 'FL' ORDER BY DepDelayMinutes LIMIT 23"}
 {"sql":"SELECT OriginStateFips, TotalAddGTime, DivArrDelay, COUNT(DestAirportSeqID), SUM(WheelsOff) FROM mytable WHERE FlightNum BETWEEN 1857 AND 2448 OR DestStateName BETWEEN 'Washington' AND 'Rhode Island' GROUP BY OriginStateFips, TotalAddGTime, DivArrDelay  ORDER BY OriginStateFips, TotalAddGTime, DivArrDelay LIMIT 19","hsqls":["SELECT OriginStateFips, TotalAddGTime, DivArrDelay, COUNT(DestAirportSeqID), SUM(WheelsOff) FROM mytable WHERE FlightNum BETWEEN 1857 AND 2448 OR DestStateName BETWEEN 'Washington' AND 'Rhode Island' GROUP BY OriginStateFips, TotalAddGTime, DivArrDelay  ORDER BY OriginStateFips, TotalAddGTime, DivArrDelay LIMIT 19"]}
 {"sql":"SELECT Carrier, FirstDepTime FROM mytable ORDER BY Distance, UniqueCarrier LIMIT 21"}
 {"sql":"SELECT FirstDepTime, DestCityName, MIN(SecurityDelay), AVG(CRSDepTime), SUM(SecurityDelay) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR DepartureDelayGroups IN (7, 6, 4, 9, 8) OR SecurityDelay NOT IN (-9999) GROUP BY FirstDepTime, DestCityName  ORDER BY FirstDepTime, DestCityName LIMIT 21","hsqls":["SELECT FirstDepTime, DestCityName, MIN(SecurityDelay), AVG(CRSDepTime), SUM(SecurityDelay) FROM mytable WHERE Cancelled BETWEEN 1 AND 1 OR DepartureDelayGroups IN (7, 6, 4, 9, 8) OR SecurityDelay NOT IN (-9999) GROUP BY FirstDepTime, DestCityName  ORDER BY FirstDepTime, DestCityName LIMIT 21"]}
-{"sql":"SELECT DivWheelsOns, OriginCityName, DestCityName FROM mytable WHERE FlightDate BETWEEN '2014-01-05' AND '2014-01-10' OR DestState NOT IN ('DE', 'AK', 'SC') OR DestState NOT IN ('MS', 'CT') ORDER BY OriginStateFips LIMIT 8","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, OriginCityName, DestCityName FROM mytable WHERE FlightDate BETWEEN '2014-01-05' AND '2014-01-10' OR DestState NOT IN ('DE', 'AK', 'SC') OR DestState NOT IN ('MS', 'CT') ORDER BY OriginStateFips LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, \"Month\", UniqueCarrier, MAX(\"Year\"), MIN(ActualElapsedTime) FROM mytable WHERE OriginState IN ('TT', 'TX', 'NV', 'IN', 'KS') AND DestCityName BETWEEN 'Mammoth Lakes, CA' AND 'Nashville, TN' AND WeatherDelay <> 234 GROUP BY TaxiIn, \"Month\", UniqueCarrier LIMIT 13","hsqls":["SELECT TaxiIn, Month, UniqueCarrier, MAX(Year), MIN(ActualElapsedTime) FROM mytable WHERE OriginState IN ('TT', 'TX', 'NV', 'IN', 'KS') AND DestCityName BETWEEN 'Mammoth Lakes, CA' AND 'Nashville, TN' AND WeatherDelay <> 234 GROUP BY TaxiIn, Month, UniqueCarrier LIMIT 13"]}
+{"sql":"SELECT DivWheelsOns, OriginCityName, DestCityName FROM mytable WHERE FlightDate BETWEEN '2014-01-05' AND '2014-01-10' OR DestState NOT IN ('DE', 'AK', 'SC') OR DestState NOT IN ('MS', 'CT') ORDER BY OriginStateFips LIMIT 8","hsqls":["SELECT DivWheelsOns, OriginCityName, DestCityName FROM mytable WHERE FlightDate BETWEEN '2014-01-05' AND '2014-01-10' OR DestState NOT IN ('DE', 'AK', 'SC') OR DestState NOT IN ('MS', 'CT') ORDER BY OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, \"Month\", UniqueCarrier, MAX(\"Year\"), MIN(ActualElapsedTime) FROM mytable WHERE OriginState IN ('TT', 'TX', 'NV', 'IN', 'KS') AND DestCityName BETWEEN 'Mammoth Lakes, CA' AND 'Nashville, TN' AND WeatherDelay <> 234 GROUP BY TaxiIn, \"Month\", UniqueCarrier LIMIT 13","hsqls":["SELECT TaxiIn, Month, UniqueCarrier, MAX(`Year`), MIN(ActualElapsedTime) FROM mytable WHERE OriginState IN ('TT', 'TX', 'NV', 'IN', 'KS') AND DestCityName BETWEEN 'Mammoth Lakes, CA' AND 'Nashville, TN' AND WeatherDelay <> 234 GROUP BY TaxiIn, Month, UniqueCarrier LIMIT 13"]}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY FlightDate, TailNum LIMIT 1"}
-{"sql":"SELECT ArrDelayMinutes, DivAirportIDs FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Hawaii' OR FlightDate BETWEEN '2014-01-11' AND '2014-01-14' AND ArrTime NOT IN (728, 2253, 2059, 1229, 1641) ORDER BY WheelsOn LIMIT 12","hsqls":["SELECT ArrDelayMinutes, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Hawaii' OR FlightDate BETWEEN '2014-01-11' AND '2014-01-14' AND ArrTime NOT IN (728, 2253, 2059, 1229, 1641) ORDER BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, DivAirportIDs FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Hawaii' OR FlightDate BETWEEN '2014-01-11' AND '2014-01-14' AND ArrTime NOT IN (728, 2253, 2059, 1229, 1641) ORDER BY WheelsOn LIMIT 12","hsqls":["SELECT ArrDelayMinutes, DivAirportIDs FROM mytable WHERE OriginStateName BETWEEN 'Rhode Island' AND 'Hawaii' OR FlightDate BETWEEN '2014-01-11' AND '2014-01-14' AND ArrTime NOT IN (728, 2253, 2059, 1229, 1641) ORDER BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT DayofMonth, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 3 AND DistanceGroup > 6 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 4","hsqls":["SELECT DayofMonth, COUNT(*) FROM mytable WHERE DayOfWeek BETWEEN 1 AND 3 AND DistanceGroup > 6 GROUP BY DayofMonth  ORDER BY DayofMonth LIMIT 4"]}
-{"sql":"SELECT TotalAddGTime FROM mytable WHERE FlightDate BETWEEN '2014-01-29' AND '2014-01-21' AND DestAirportSeqID <> 1426202 AND DivAirportSeqIDs <= 1078102 ORDER BY SecurityDelay, DestCityMarketID LIMIT 1","hsqls":["SELECT TotalAddGTime FROM mytable WHERE FlightDate BETWEEN '2014-01-29' AND '2014-01-21' AND DestAirportSeqID <> 1426202 AND (DivAirportSeqIDs__MV0 <= 1078102 OR DivAirportSeqIDs__MV1 <= 1078102 OR DivAirportSeqIDs__MV2 <= 1078102 OR DivAirportSeqIDs__MV3 <= 1078102 OR DivAirportSeqIDs__MV4 <= 1078102) ORDER BY SecurityDelay, DestCityMarketID LIMIT 10000"]}
-{"sql":"SELECT OriginCityName, Origin, AVG(DestAirportSeqID), AVG(TaxiIn), COUNT(CRSElapsedTime) FROM mytable WHERE DivAirports BETWEEN 'RDM' AND 'BWI' GROUP BY OriginCityName, Origin LIMIT 21","hsqls":["SELECT OriginCityName, Origin, AVG(DestAirportSeqID), AVG(TaxiIn), COUNT(CRSElapsedTime) FROM mytable WHERE (DivAirports__MV0 BETWEEN 'RDM' AND 'BWI' OR DivAirports__MV1 BETWEEN 'RDM' AND 'BWI' OR DivAirports__MV2 BETWEEN 'RDM' AND 'BWI' OR DivAirports__MV3 BETWEEN 'RDM' AND 'BWI' OR DivAirports__MV4 BETWEEN 'RDM' AND 'BWI') GROUP BY OriginCityName, Origin LIMIT 10000"]}
+{"sql":"SELECT TotalAddGTime FROM mytable WHERE FlightDate BETWEEN '2014-01-29' AND '2014-01-21' AND DestAirportSeqID <> 1426202 AND DivAirportSeqIDs <= 1078102 ORDER BY SecurityDelay, DestCityMarketID LIMIT 1","hsqls":["SELECT TotalAddGTime FROM mytable WHERE FlightDate BETWEEN '2014-01-29' AND '2014-01-21' AND DestAirportSeqID <> 1426202 AND (DivAirportSeqIDs[1] <= 1078102 OR DivAirportSeqIDs[2] <= 1078102 OR DivAirportSeqIDs[3] <= 1078102 OR DivAirportSeqIDs[4] <= 1078102 OR DivAirportSeqIDs[5] <= 1078102) ORDER BY SecurityDelay, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, Origin, AVG(DestAirportSeqID), AVG(TaxiIn), COUNT(CRSElapsedTime) FROM mytable WHERE DivAirports BETWEEN 'RDM' AND 'BWI' GROUP BY OriginCityName, Origin LIMIT 21","hsqls":["SELECT OriginCityName, Origin, AVG(DestAirportSeqID), AVG(TaxiIn), COUNT(CRSElapsedTime) FROM mytable WHERE (DivAirports[1] BETWEEN 'RDM' AND 'BWI' OR DivAirports[2] BETWEEN 'RDM' AND 'BWI' OR DivAirports[3] BETWEEN 'RDM' AND 'BWI' OR DivAirports[4] BETWEEN 'RDM' AND 'BWI' OR DivAirports[5] BETWEEN 'RDM' AND 'BWI') GROUP BY OriginCityName, Origin LIMIT 10000"]}
 {"sql":"SELECT AVG(OriginWac), SUM(LateAircraftDelay), SUM(TaxiIn) FROM mytable WHERE ArrTimeBlk BETWEEN '0600-0659' AND '0900-0959' AND DestCityName <> 'Fort Lauderdale, FL' LIMIT 22"}
 {"sql":"SELECT DestWac, CarrierDelay, SecurityDelay, COUNT(*) FROM mytable WHERE OriginWac IN (52, 62, 81, 37, 12) OR DestState <> 'AK' GROUP BY DestWac, CarrierDelay, SecurityDelay  ORDER BY DestWac, CarrierDelay, SecurityDelay LIMIT 17","hsqls":["SELECT DestWac, CarrierDelay, SecurityDelay, COUNT(*) FROM mytable WHERE OriginWac IN (52, 62, 81, 37, 12) OR DestState <> 'AK' GROUP BY DestWac, CarrierDelay, SecurityDelay  ORDER BY DestWac, CarrierDelay, SecurityDelay LIMIT 17"]}
-{"sql":"SELECT DestCityName FROM mytable WHERE FlightNum NOT IN (4769, 6327, 1291, 3849, 2385) OR DivWheelsOns BETWEEN 2320 AND 2008 ORDER BY TotalAddGTime, ArrDelayMinutes, NASDelay","hsqls":["SELECT DestCityName FROM mytable WHERE FlightNum NOT IN (4769, 6327, 1291, 3849, 2385) OR (DivWheelsOns__MV0 BETWEEN 2320 AND 2008 OR DivWheelsOns__MV1 BETWEEN 2320 AND 2008 OR DivWheelsOns__MV2 BETWEEN 2320 AND 2008 OR DivWheelsOns__MV3 BETWEEN 2320 AND 2008 OR DivWheelsOns__MV4 BETWEEN 2320 AND 2008) ORDER BY TotalAddGTime, ArrDelayMinutes, NASDelay LIMIT 10000"]}
+{"sql":"SELECT DestCityName FROM mytable WHERE FlightNum NOT IN (4769, 6327, 1291, 3849, 2385) OR DivWheelsOns BETWEEN 2320 AND 2008 ORDER BY TotalAddGTime, ArrDelayMinutes, NASDelay","hsqls":["SELECT DestCityName FROM mytable WHERE FlightNum NOT IN (4769, 6327, 1291, 3849, 2385) OR (DivWheelsOns[1] BETWEEN 2320 AND 2008 OR DivWheelsOns[2] BETWEEN 2320 AND 2008 OR DivWheelsOns[3] BETWEEN 2320 AND 2008 OR DivWheelsOns[4] BETWEEN 2320 AND 2008 OR DivWheelsOns[5] BETWEEN 2320 AND 2008) ORDER BY TotalAddGTime, ArrDelayMinutes, NASDelay LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, DestAirportID, MIN(DepTime) FROM mytable GROUP BY WeatherDelay, DestAirportID  ORDER BY WeatherDelay, DestAirportID LIMIT 25","hsqls":["SELECT WeatherDelay, DestAirportID, MIN(DepTime) FROM mytable GROUP BY WeatherDelay, DestAirportID  ORDER BY WeatherDelay, DestAirportID LIMIT 25"]}
-{"sql":"SELECT AVG(SecurityDelay), MAX(LateAircraftDelay) FROM mytable WHERE ArrivalDelayGroups BETWEEN 0 AND 3 OR DivAirportIDs IN (14314) LIMIT 23","hsqls":["SELECT AVG(SecurityDelay), MAX(LateAircraftDelay)  FROM mytable WHERE ArrivalDelayGroups BETWEEN 0 AND 3 OR (DivAirportIDs__MV0 IN (14314) OR DivAirportIDs__MV1 IN (14314) OR DivAirportIDs__MV2 IN (14314) OR DivAirportIDs__MV3 IN (14314) OR DivAirportIDs__MV4 IN (14314)) LIMIT 10000"]}
-{"sql":"SELECT DivAirports, ArrDel15 FROM mytable WHERE OriginWac BETWEEN 86 AND 65 OR Cancelled BETWEEN 1 AND 0 ORDER BY OriginCityName, DayOfWeek LIMIT 3","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, ArrDel15 FROM mytable WHERE OriginWac BETWEEN 86 AND 65 OR Cancelled BETWEEN 1 AND 0 ORDER BY OriginCityName, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT OriginStateFips, DepTime, AirlineID FROM mytable WHERE DivWheelsOns < 1355 ORDER BY DestState, ArrTimeBlk, DayOfWeek LIMIT 10","hsqls":["SELECT OriginStateFips, DepTime, AirlineID FROM mytable WHERE (DivWheelsOns__MV0 < 1355 OR DivWheelsOns__MV1 < 1355 OR DivWheelsOns__MV2 < 1355 OR DivWheelsOns__MV3 < 1355 OR DivWheelsOns__MV4 < 1355) ORDER BY DestState, ArrTimeBlk, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT TaxiIn, DivWheelsOffs FROM mytable WHERE Dest BETWEEN 'GNV' AND 'SPS' AND DepartureDelayGroups BETWEEN 11 AND 10 ORDER BY DepartureDelayGroups, DivAirportLandings LIMIT 10","hsqls":["SELECT TaxiIn, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE Dest BETWEEN 'GNV' AND 'SPS' AND DepartureDelayGroups BETWEEN 11 AND 10 ORDER BY DepartureDelayGroups, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT AVG(SecurityDelay), MAX(LateAircraftDelay) FROM mytable WHERE ArrivalDelayGroups BETWEEN 0 AND 3 OR DivAirportIDs IN (14314) LIMIT 23","hsqls":["SELECT AVG(SecurityDelay), MAX(LateAircraftDelay)  FROM mytable WHERE ArrivalDelayGroups BETWEEN 0 AND 3 OR (DivAirportIDs[1] IN (14314) OR DivAirportIDs[2] IN (14314) OR DivAirportIDs[3] IN (14314) OR DivAirportIDs[4] IN (14314) OR DivAirportIDs[5] IN (14314)) LIMIT 10000"]}
+{"sql":"SELECT DivAirports, ArrDel15 FROM mytable WHERE OriginWac BETWEEN 86 AND 65 OR Cancelled BETWEEN 1 AND 0 ORDER BY OriginCityName, DayOfWeek LIMIT 3","hsqls":["SELECT DivAirports, ArrDel15 FROM mytable WHERE OriginWac BETWEEN 86 AND 65 OR Cancelled BETWEEN 1 AND 0 ORDER BY OriginCityName, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DepTime, AirlineID FROM mytable WHERE DivWheelsOns < 1355 ORDER BY DestState, ArrTimeBlk, DayOfWeek LIMIT 10","hsqls":["SELECT OriginStateFips, DepTime, AirlineID FROM mytable WHERE (DivWheelsOns[1] < 1355 OR DivWheelsOns[2] < 1355 OR DivWheelsOns[3] < 1355 OR DivWheelsOns[4] < 1355 OR DivWheelsOns[5] < 1355) ORDER BY DestState, ArrTimeBlk, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT TaxiIn, DivWheelsOffs FROM mytable WHERE Dest BETWEEN 'GNV' AND 'SPS' AND DepartureDelayGroups BETWEEN 11 AND 10 ORDER BY DepartureDelayGroups, DivAirportLandings LIMIT 10","hsqls":["SELECT TaxiIn, DivWheelsOffs FROM mytable WHERE Dest BETWEEN 'GNV' AND 'SPS' AND DepartureDelayGroups BETWEEN 11 AND 10 ORDER BY DepartureDelayGroups, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup, DestStateName, OriginAirportID FROM mytable ORDER BY DepDelayMinutes, CancellationCode LIMIT 10"}
-{"sql":"SELECT Dest, DestCityName, \"Month\", SUM(DayofMonth) FROM mytable GROUP BY Dest, DestCityName, \"Month\" LIMIT 8","hsqls":["SELECT Dest, DestCityName, Month, SUM(DayofMonth) FROM mytable GROUP BY Dest, DestCityName, Month LIMIT 8"]}
+{"sql":"SELECT Dest, DestCityName, \"Month\", SUM(DayofMonth) FROM mytable GROUP BY Dest, DestCityName, \"Month\" LIMIT 8","hsqls":["SELECT Dest, DestCityName, Month, SUM(DayofMonth) FROM mytable GROUP BY Dest, DestCityName, `Month` LIMIT 8"]}
 {"sql":"SELECT AVG(LateAircraftDelay) FROM mytable WHERE NASDelay = 229 LIMIT 18"}
 {"sql":"SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE DestAirportSeqID >= 1469605 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 10","hsqls":["SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE DestAirportSeqID >= 1469605 GROUP BY DestAirportSeqID  ORDER BY DestAirportSeqID LIMIT 10"]}
 {"sql":"SELECT DestWac, DestState, ArrTimeBlk FROM mytable WHERE OriginState IN ('TN', 'ND', 'NC', 'NV', 'NY') OR DivActualElapsedTime IN (276, 847, 667) ORDER BY OriginCityName, DepTimeBlk LIMIT 19"}
 {"sql":"SELECT OriginAirportID, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N560SW', 'N833AW') AND DestCityName = 'Dubuque, IA' GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 20","hsqls":["SELECT OriginAirportID, COUNT(*) FROM mytable WHERE TailNum NOT IN ('N560SW', 'N833AW') AND DestCityName = 'Dubuque, IA' GROUP BY OriginAirportID  ORDER BY OriginAirportID LIMIT 20"]}
-{"sql":"SELECT Diverted FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 OR DivAirportSeqIDs BETWEEN 1143302 AND 1169703 ORDER BY DepTime, DayofMonth LIMIT 8","hsqls":["SELECT Diverted FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 OR (DivAirportSeqIDs__MV0 BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs__MV1 BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs__MV2 BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs__MV3 BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs__MV4 BETWEEN 1143302 AND 1169703) ORDER BY DepTime, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Diverted FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 OR DivAirportSeqIDs BETWEEN 1143302 AND 1169703 ORDER BY DepTime, DayofMonth LIMIT 8","hsqls":["SELECT Diverted FROM mytable WHERE DivReachedDest BETWEEN -9999 AND 1 OR (DivAirportSeqIDs[1] BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs[2] BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs[3] BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs[4] BETWEEN 1143302 AND 1169703 OR DivAirportSeqIDs[5] BETWEEN 1143302 AND 1169703) ORDER BY DepTime, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT OriginWac, AirlineID, OriginStateName FROM mytable ORDER BY ArrDelayMinutes, DayofMonth LIMIT 7"}
 {"sql":"SELECT DestCityName FROM mytable WHERE OriginAirportSeqID > 1251102 ORDER BY OriginState, DestStateFips, OriginStateName LIMIT 15"}
 {"sql":"SELECT DepDelay FROM mytable ORDER BY TaxiOut LIMIT 10"}
-{"sql":"SELECT FlightNum FROM mytable WHERE \"Year\" IN (2014) AND Cancelled NOT IN (1) AND DivArrDelay IN (864, 343, 207) LIMIT 19","hsqls":["SELECT FlightNum FROM mytable WHERE Year IN (2014) AND Cancelled NOT IN (1) AND DivArrDelay IN (864, 343, 207) LIMIT 19"]}
+{"sql":"SELECT FlightNum FROM mytable WHERE \"Year\" IN (2014) AND Cancelled NOT IN (1) AND DivArrDelay IN (864, 343, 207) LIMIT 19","hsqls":["SELECT FlightNum FROM mytable WHERE `Year` IN (2014) AND Cancelled NOT IN (1) AND DivArrDelay IN (864, 343, 207) LIMIT 19"]}
 {"sql":"SELECT \"Year\", CRSArrTime, DepTimeBlk, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (0, 9) GROUP BY \"Year\", CRSArrTime, DepTimeBlk LIMIT 27","hsqls":["SELECT Year, CRSArrTime, DepTimeBlk, COUNT(*) FROM mytable WHERE DivAirportLandings NOT IN (0, 9) GROUP BY Year, CRSArrTime, DepTimeBlk LIMIT 27"]}
 {"sql":"SELECT ArrDelayMinutes, Dest, AirlineID, MAX(DepTime), SUM(DistanceGroup) FROM mytable GROUP BY ArrDelayMinutes, Dest, AirlineID  ORDER BY ArrDelayMinutes, Dest, AirlineID LIMIT 13","hsqls":["SELECT ArrDelayMinutes, Dest, AirlineID, MAX(DepTime), SUM(DistanceGroup) FROM mytable GROUP BY ArrDelayMinutes, Dest, AirlineID  ORDER BY ArrDelayMinutes, Dest, AirlineID LIMIT 13"]}
-{"sql":"SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DivTotalGTimes > 18 AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 22","hsqls":["SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime)  FROM mytable WHERE (DivTotalGTimes__MV0 > 18 OR DivTotalGTimes__MV1 > 18 OR DivTotalGTimes__MV2 > 18 OR DivTotalGTimes__MV3 > 18 OR DivTotalGTimes__MV4 > 18) AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 10000"]}
+{"sql":"SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DivTotalGTimes > 18 AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 22","hsqls":["SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime)  FROM mytable WHERE (DivTotalGTimes[1] > 18 OR DivTotalGTimes[2] > 18 OR DivTotalGTimes[3] > 18 OR DivTotalGTimes[4] > 18 OR DivTotalGTimes[5] > 18) AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, AirTime, DivArrDelay, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, AirTime, DivArrDelay  ORDER BY OriginAirportSeqID, AirTime, DivArrDelay LIMIT 29","hsqls":["SELECT OriginAirportSeqID, AirTime, DivArrDelay, COUNT(*) FROM mytable GROUP BY OriginAirportSeqID, AirTime, DivArrDelay  ORDER BY OriginAirportSeqID, AirTime, DivArrDelay LIMIT 29"]}
-{"sql":"SELECT ArrDelayMinutes, DayofMonth FROM mytable ORDER BY DivDistance, DestAirportSeqID, \"Month\" LIMIT 27","hsqls":["SELECT ArrDelayMinutes, DayofMonth FROM mytable ORDER BY DivDistance, DestAirportSeqID, Month LIMIT 27"]}
+{"sql":"SELECT ArrDelayMinutes, DayofMonth FROM mytable ORDER BY DivDistance, DestAirportSeqID, \"Month\" LIMIT 27","hsqls":["SELECT ArrDelayMinutes, DayofMonth FROM mytable ORDER BY DivDistance, DestAirportSeqID, `Month` LIMIT 27"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) OR DivReachedDest BETWEEN 1 AND 0 ORDER BY TaxiOut LIMIT 21"}
-{"sql":"SELECT OriginCityName, ArrDel15 FROM mytable WHERE FirstDepTime < 1039 OR DivTotalGTimes = 31 LIMIT 17","hsqls":["SELECT OriginCityName, ArrDel15 FROM mytable WHERE FirstDepTime < 1039 OR (DivTotalGTimes__MV0 = 31 OR DivTotalGTimes__MV1 = 31 OR DivTotalGTimes__MV2 = 31 OR DivTotalGTimes__MV3 = 31 OR DivTotalGTimes__MV4 = 31) LIMIT 10000"]}
-{"sql":"SELECT Cancelled, MIN(OriginStateFips), MAX(ArrDelayMinutes) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR DivWheelsOffs IN (1233, 1339, 1200, 2122, 1611) GROUP BY Cancelled LIMIT 18","hsqls":["SELECT Cancelled, MIN(OriginStateFips), MAX(ArrDelayMinutes) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR (DivWheelsOffs__MV0 IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs__MV1 IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs__MV2 IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs__MV3 IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs__MV4 IN (1233, 1339, 1200, 2122, 1611)) GROUP BY Cancelled LIMIT 10000"]}
+{"sql":"SELECT OriginCityName, ArrDel15 FROM mytable WHERE FirstDepTime < 1039 OR DivTotalGTimes = 31 LIMIT 17","hsqls":["SELECT OriginCityName, ArrDel15 FROM mytable WHERE FirstDepTime < 1039 OR (DivTotalGTimes[1] = 31 OR DivTotalGTimes[2] = 31 OR DivTotalGTimes[3] = 31 OR DivTotalGTimes[4] = 31 OR DivTotalGTimes[5] = 31) LIMIT 10000"]}
+{"sql":"SELECT Cancelled, MIN(OriginStateFips), MAX(ArrDelayMinutes) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR DivWheelsOffs IN (1233, 1339, 1200, 2122, 1611) GROUP BY Cancelled LIMIT 18","hsqls":["SELECT Cancelled, MIN(OriginStateFips), MAX(ArrDelayMinutes) FROM mytable WHERE DaysSinceEpoch BETWEEN 16074 AND 16094 OR (DivWheelsOffs[1] IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs[2] IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs[3] IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs[4] IN (1233, 1339, 1200, 2122, 1611) OR DivWheelsOffs[5] IN (1233, 1339, 1200, 2122, 1611)) GROUP BY Cancelled LIMIT 10000"]}
 {"sql":"SELECT TaxiOut, DaysSinceEpoch FROM mytable LIMIT 12"}
 {"sql":"SELECT FirstDepTime FROM mytable ORDER BY Carrier, DestStateFips, DepTimeBlk LIMIT 15"}
 {"sql":"SELECT DivReachedDest, ArrTime, TaxiIn, SUM(CRSElapsedTime), SUM(Distance), AVG(OriginAirportID) FROM mytable GROUP BY DivReachedDest, ArrTime, TaxiIn  ORDER BY DivReachedDest, ArrTime, TaxiIn LIMIT 19","hsqls":["SELECT DivReachedDest, ArrTime, TaxiIn, SUM(CRSElapsedTime), SUM(Distance), AVG(OriginAirportID) FROM mytable GROUP BY DivReachedDest, ArrTime, TaxiIn  ORDER BY DivReachedDest, ArrTime, TaxiIn LIMIT 19"]}
 {"sql":"SELECT LongestAddGTime, COUNT(Carrier), AVG(DepDelay) FROM mytable WHERE DestCityName = 'Atlanta, GA' AND FirstDepTime >= 1016 OR DestWac <= 4 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 2","hsqls":["SELECT LongestAddGTime, COUNT(Carrier), AVG(DepDelay) FROM mytable WHERE DestCityName = 'Atlanta, GA' AND FirstDepTime >= 1016 OR DestWac <= 4 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 2"]}
 {"sql":"SELECT ArrDelay, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10170 AND 12448 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 4","hsqls":["SELECT ArrDelay, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10170 AND 12448 GROUP BY ArrDelay  ORDER BY ArrDelay LIMIT 4"]}
-{"sql":"SELECT DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE DivWheelsOffs IN (2207, 901) GROUP BY DepDelayMinutes LIMIT 26","hsqls":["SELECT DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE (DivWheelsOffs__MV0 IN (2207, 901) OR DivWheelsOffs__MV1 IN (2207, 901) OR DivWheelsOffs__MV2 IN (2207, 901) OR DivWheelsOffs__MV3 IN (2207, 901) OR DivWheelsOffs__MV4 IN (2207, 901)) GROUP BY DepDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE DivWheelsOffs IN (2207, 901) GROUP BY DepDelayMinutes LIMIT 26","hsqls":["SELECT DepDelayMinutes, SUM(TotalAddGTime) FROM mytable WHERE (DivWheelsOffs[1] IN (2207, 901) OR DivWheelsOffs[2] IN (2207, 901) OR DivWheelsOffs[3] IN (2207, 901) OR DivWheelsOffs[4] IN (2207, 901) OR DivWheelsOffs[5] IN (2207, 901)) GROUP BY DepDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 10"}
 {"sql":"SELECT SUM(ArrivalDelayGroups), AVG(Flights) FROM mytable LIMIT 13"}
 {"sql":"SELECT ActualElapsedTime, SUM(TaxiOut) FROM mytable WHERE DestAirportID NOT IN (13964, 13487, 15070, 11637, 10754) AND WheelsOn NOT IN (1844, 2103, 1526) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 28","hsqls":["SELECT ActualElapsedTime, SUM(TaxiOut) FROM mytable WHERE DestAirportID NOT IN (13964, 13487, 15070, 11637, 10754) AND WheelsOn NOT IN (1844, 2103, 1526) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 28"]}
-{"sql":"SELECT DivAirportLandings, UniqueCarrier, \"Month\" FROM mytable WHERE DestCityName BETWEEN 'Ontario, CA' AND 'Deadhorse, AK' AND LongestAddGTime BETWEEN 55 AND 14 ORDER BY Dest, DestAirportID, UniqueCarrier LIMIT 1","hsqls":["SELECT DivAirportLandings, UniqueCarrier, Month FROM mytable WHERE DestCityName BETWEEN 'Ontario, CA' AND 'Deadhorse, AK' AND LongestAddGTime BETWEEN 55 AND 14 ORDER BY Dest, DestAirportID, UniqueCarrier LIMIT 1"]}
+{"sql":"SELECT DivAirportLandings, UniqueCarrier, \"Month\" FROM mytable WHERE DestCityName BETWEEN 'Ontario, CA' AND 'Deadhorse, AK' AND LongestAddGTime BETWEEN 55 AND 14 ORDER BY Dest, DestAirportID, UniqueCarrier LIMIT 1","hsqls":["SELECT DivAirportLandings, UniqueCarrier, `Month` FROM mytable WHERE DestCityName BETWEEN 'Ontario, CA' AND 'Deadhorse, AK' AND LongestAddGTime BETWEEN 55 AND 14 ORDER BY Dest, DestAirportID, UniqueCarrier LIMIT 1"]}
 {"sql":"SELECT Distance FROM mytable WHERE TaxiIn < 127 OR ArrivalDelayGroups = 5 OR TotalAddGTime IN (40, 55, 8) LIMIT 2"}
-{"sql":"SELECT MAX(\"Year\"), AVG(ActualElapsedTime), COUNT(CancellationCode) FROM mytable WHERE OriginStateName BETWEEN 'Alabama' AND 'Idaho' AND ArrDelay BETWEEN 21.0 AND 6.0 LIMIT 20","hsqls":["SELECT MAX(Year), AVG(ActualElapsedTime), COUNT(CancellationCode) FROM mytable WHERE OriginStateName BETWEEN 'Alabama' AND 'Idaho' AND ArrDelay BETWEEN 21.0 AND 6.0 LIMIT 20"]}
+{"sql":"SELECT MAX(\"Year\"), AVG(ActualElapsedTime), COUNT(CancellationCode) FROM mytable WHERE OriginStateName BETWEEN 'Alabama' AND 'Idaho' AND ArrDelay BETWEEN 21.0 AND 6.0 LIMIT 20","hsqls":["SELECT MAX(`Year`), AVG(ActualElapsedTime), COUNT(CancellationCode) FROM mytable WHERE OriginStateName BETWEEN 'Alabama' AND 'Idaho' AND ArrDelay BETWEEN 21.0 AND 6.0 LIMIT 20"]}
 {"sql":"SELECT DepartureDelayGroups, DepTimeBlk FROM mytable WHERE OriginCityName IN ('Mission/McAllen/Edinburg, TX', 'Boise, ID', 'Buffalo, NY') LIMIT 13"}
 {"sql":"SELECT ArrDelayMinutes, MAX(ArrDel15), AVG(ActualElapsedTime) FROM mytable WHERE DivAirportLandings <= 0 AND DestState BETWEEN 'ID' AND 'MD' GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 23","hsqls":["SELECT ArrDelayMinutes, MAX(ArrDel15), AVG(ActualElapsedTime) FROM mytable WHERE DivAirportLandings <= 0 AND DestState BETWEEN 'ID' AND 'MD' GROUP BY ArrDelayMinutes  ORDER BY ArrDelayMinutes LIMIT 23"]}
-{"sql":"SELECT DivWheelsOns, AirlineID FROM mytable WHERE DayofMonth BETWEEN 15 AND 19 ORDER BY \"Year\", DestStateName LIMIT 28","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, AirlineID FROM mytable WHERE DayofMonth BETWEEN 15 AND 19 ORDER BY Year, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, AirlineID FROM mytable WHERE DayofMonth BETWEEN 15 AND 19 ORDER BY \"Year\", DestStateName LIMIT 28","hsqls":["SELECT DivWheelsOns, AirlineID FROM mytable WHERE DayofMonth BETWEEN 15 AND 19 ORDER BY Year, DestStateName LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, Cancelled, Dest FROM mytable WHERE AirTime <= 329 OR AirlineID < 20366 OR AirlineID BETWEEN 20304 AND 19805 ORDER BY OriginAirportID LIMIT 22"}
 {"sql":"SELECT DepTimeBlk, COUNT(FirstDepTime), COUNT(ArrTimeBlk), COUNT(OriginCityName) FROM mytable WHERE FirstDepTime NOT IN (639, 736, 849, 944, 1534) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 24","hsqls":["SELECT DepTimeBlk, COUNT(FirstDepTime), COUNT(ArrTimeBlk), COUNT(OriginCityName) FROM mytable WHERE FirstDepTime NOT IN (639, 736, 849, 944, 1534) GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 24"]}
 {"sql":"SELECT DestState, MAX(ArrivalDelayGroups), MIN(NASDelay) FROM mytable WHERE ArrDel15 > 1 OR CRSElapsedTime IN (152, 139, 241, 71) OR DivReachedDest BETWEEN -9999 AND -9999 GROUP BY DestState  ORDER BY DestState LIMIT 22","hsqls":["SELECT DestState, MAX(ArrivalDelayGroups), MIN(NASDelay) FROM mytable WHERE ArrDel15 > 1 OR CRSElapsedTime IN (152, 139, 241, 71) OR DivReachedDest BETWEEN -9999 AND -9999 GROUP BY DestState  ORDER BY DestState LIMIT 22"]}
@@ -9587,113 +9587,113 @@
 {"sql":"SELECT DestState, TaxiIn, COUNT(*) FROM mytable WHERE FirstDepTime < 631 GROUP BY DestState, TaxiIn  ORDER BY DestState, TaxiIn LIMIT 11","hsqls":["SELECT DestState, TaxiIn, COUNT(*) FROM mytable WHERE FirstDepTime < 631 GROUP BY DestState, TaxiIn  ORDER BY DestState, TaxiIn LIMIT 11"]}
 {"sql":"SELECT FlightDate, AirlineID, CRSDepTime, AVG(CRSDepTime), SUM(TaxiOut) FROM mytable GROUP BY FlightDate, AirlineID, CRSDepTime  ORDER BY FlightDate, AirlineID, CRSDepTime LIMIT 4","hsqls":["SELECT FlightDate, AirlineID, CRSDepTime, AVG(CRSDepTime), SUM(TaxiOut) FROM mytable GROUP BY FlightDate, AirlineID, CRSDepTime  ORDER BY FlightDate, AirlineID, CRSDepTime LIMIT 4"]}
 {"sql":"SELECT ArrDelay FROM mytable WHERE DepDelay NOT IN (241.0, 268.0, 108.0, 54.0) AND DivAirportLandings BETWEEN 9 AND 1 LIMIT 25"}
-{"sql":"SELECT FirstDepTime, WheelsOn, SUM(OriginStateFips) FROM mytable WHERE Cancelled = 0 AND WheelsOff BETWEEN 1203 AND 1851 OR DivWheelsOffs IN (1021, 1030, 1223, 1544, 1150) GROUP BY FirstDepTime, WheelsOn LIMIT 4","hsqls":["SELECT FirstDepTime, WheelsOn, SUM(OriginStateFips) FROM mytable WHERE Cancelled = 0 AND WheelsOff BETWEEN 1203 AND 1851 OR (DivWheelsOffs__MV0 IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs__MV1 IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs__MV2 IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs__MV3 IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs__MV4 IN (1021, 1030, 1223, 1544, 1150)) GROUP BY FirstDepTime, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT FirstDepTime, WheelsOn, SUM(OriginStateFips) FROM mytable WHERE Cancelled = 0 AND WheelsOff BETWEEN 1203 AND 1851 OR DivWheelsOffs IN (1021, 1030, 1223, 1544, 1150) GROUP BY FirstDepTime, WheelsOn LIMIT 4","hsqls":["SELECT FirstDepTime, WheelsOn, SUM(OriginStateFips) FROM mytable WHERE Cancelled = 0 AND WheelsOff BETWEEN 1203 AND 1851 OR (DivWheelsOffs[1] IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs[2] IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs[3] IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs[4] IN (1021, 1030, 1223, 1544, 1150) OR DivWheelsOffs[5] IN (1021, 1030, 1223, 1544, 1150)) GROUP BY FirstDepTime, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, Flights, MIN(DistanceGroup), MAX(CRSArrTime) FROM mytable WHERE TotalAddGTime >= 45 GROUP BY CarrierDelay, Flights  ORDER BY CarrierDelay, Flights LIMIT 4","hsqls":["SELECT CarrierDelay, Flights, MIN(DistanceGroup), MAX(CRSArrTime) FROM mytable WHERE TotalAddGTime >= 45 GROUP BY CarrierDelay, Flights  ORDER BY CarrierDelay, Flights LIMIT 4"]}
 {"sql":"SELECT DestCityMarketID, ArrDelay, COUNT(DestAirportSeqID), SUM(OriginCityMarketID), MAX(DepDelay) FROM mytable WHERE DestAirportID BETWEEN 12278 AND 10135 AND DaysSinceEpoch < 16093 GROUP BY DestCityMarketID, ArrDelay  ORDER BY DestCityMarketID, ArrDelay LIMIT 2","hsqls":["SELECT DestCityMarketID, ArrDelay, COUNT(DestAirportSeqID), SUM(OriginCityMarketID), MAX(DepDelay) FROM mytable WHERE DestAirportID BETWEEN 12278 AND 10135 AND DaysSinceEpoch < 16093 GROUP BY DestCityMarketID, ArrDelay  ORDER BY DestCityMarketID, ArrDelay LIMIT 2"]}
 {"sql":"SELECT DepTime, AirlineID FROM mytable WHERE Origin IN ('FWA') OR Quarter >= 1 LIMIT 19"}
 {"sql":"SELECT FlightNum, DaysSinceEpoch FROM mytable WHERE OriginStateFips NOT IN (36, 15, 26, 27, 75) ORDER BY DestStateFips, ArrDelayMinutes LIMIT 9"}
-{"sql":"SELECT Origin, DayOfWeek, COUNT(\"Year\"), COUNT(DivActualElapsedTime), MAX(ArrDelayMinutes) FROM mytable WHERE DepTime NOT IN (1050, 1458, 851, 2123, 2057) OR OriginAirportSeqID <> 1347603 AND DivTailNums BETWEEN 'N14960' AND 'N388SW' GROUP BY Origin, DayOfWeek LIMIT 21","hsqls":["SELECT Origin, DayOfWeek, COUNT(Year), COUNT(DivActualElapsedTime), MAX(ArrDelayMinutes) FROM mytable WHERE DepTime NOT IN (1050, 1458, 851, 2123, 2057) OR OriginAirportSeqID <> 1347603 AND (DivTailNums__MV0 BETWEEN 'N14960' AND 'N388SW' OR DivTailNums__MV1 BETWEEN 'N14960' AND 'N388SW' OR DivTailNums__MV2 BETWEEN 'N14960' AND 'N388SW' OR DivTailNums__MV3 BETWEEN 'N14960' AND 'N388SW' OR DivTailNums__MV4 BETWEEN 'N14960' AND 'N388SW') GROUP BY Origin, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT Origin, DayOfWeek, COUNT(\"Year\"), COUNT(DivActualElapsedTime), MAX(ArrDelayMinutes) FROM mytable WHERE DepTime NOT IN (1050, 1458, 851, 2123, 2057) OR OriginAirportSeqID <> 1347603 AND DivTailNums BETWEEN 'N14960' AND 'N388SW' GROUP BY Origin, DayOfWeek LIMIT 21","hsqls":["SELECT Origin, DayOfWeek, COUNT(`Year`), COUNT(DivActualElapsedTime), MAX(ArrDelayMinutes) FROM mytable WHERE DepTime NOT IN (1050, 1458, 851, 2123, 2057) OR OriginAirportSeqID <> 1347603 AND (DivTailNums[1] BETWEEN 'N14960' AND 'N388SW' OR DivTailNums[2] BETWEEN 'N14960' AND 'N388SW' OR DivTailNums[3] BETWEEN 'N14960' AND 'N388SW' OR DivTailNums[4] BETWEEN 'N14960' AND 'N388SW' OR DivTailNums[5] BETWEEN 'N14960' AND 'N388SW') GROUP BY Origin, DayOfWeek LIMIT 10000"]}
 {"sql":"SELECT COUNT(Dest), MIN(OriginCityMarketID) FROM mytable WHERE DivActualElapsedTime NOT IN (436, 1308, 266, 155) OR DestStateFips > 45 OR TaxiIn BETWEEN 73 AND 140 LIMIT 6"}
-{"sql":"SELECT DivAirports, DestAirportSeqID, ArrTimeBlk FROM mytable WHERE TailNum < 'N29717' AND Distance NOT IN (134, 967, 633, 1036, 191) OR Diverted BETWEEN 1 AND 1 ORDER BY TotalAddGTime, ActualElapsedTime LIMIT 14","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestAirportSeqID, ArrTimeBlk FROM mytable WHERE TailNum < 'N29717' AND Distance NOT IN (134, 967, 633, 1036, 191) OR Diverted BETWEEN 1 AND 1 ORDER BY TotalAddGTime, ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT SUM(WheelsOff) FROM mytable WHERE DivAirportIDs IN (11292, 11986, 12819, 13424, 16271) OR FlightNum BETWEEN 4294 AND 5280 LIMIT 27","hsqls":["SELECT SUM(WheelsOff) FROM mytable WHERE (DivAirportIDs__MV0 IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs__MV1 IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs__MV2 IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs__MV3 IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs__MV4 IN (11292, 11986, 12819, 13424, 16271)) OR FlightNum BETWEEN 4294 AND 5280 LIMIT 10000"]}
-{"sql":"SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1600-1659' AND '1900-1959' OR DivTailNums BETWEEN 'N8606C' AND 'N957DN' AND FlightNum BETWEEN 4250 AND 1349 GROUP BY DestAirportSeqID LIMIT 16","hsqls":["SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1600-1659' AND '1900-1959' OR (DivTailNums__MV0 BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums__MV1 BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums__MV2 BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums__MV3 BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums__MV4 BETWEEN 'N8606C' AND 'N957DN') AND FlightNum BETWEEN 4250 AND 1349 GROUP BY DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestAirportSeqID, ArrTimeBlk FROM mytable WHERE TailNum < 'N29717' AND Distance NOT IN (134, 967, 633, 1036, 191) OR Diverted BETWEEN 1 AND 1 ORDER BY TotalAddGTime, ActualElapsedTime LIMIT 14","hsqls":["SELECT DivAirports, DestAirportSeqID, ArrTimeBlk FROM mytable WHERE TailNum < 'N29717' AND Distance NOT IN (134, 967, 633, 1036, 191) OR Diverted BETWEEN 1 AND 1 ORDER BY TotalAddGTime, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT SUM(WheelsOff) FROM mytable WHERE DivAirportIDs IN (11292, 11986, 12819, 13424, 16271) OR FlightNum BETWEEN 4294 AND 5280 LIMIT 27","hsqls":["SELECT SUM(WheelsOff) FROM mytable WHERE (DivAirportIDs[1] IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs[2] IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs[3] IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs[4] IN (11292, 11986, 12819, 13424, 16271) OR DivAirportIDs[5] IN (11292, 11986, 12819, 13424, 16271)) OR FlightNum BETWEEN 4294 AND 5280 LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1600-1659' AND '1900-1959' OR DivTailNums BETWEEN 'N8606C' AND 'N957DN' AND FlightNum BETWEEN 4250 AND 1349 GROUP BY DestAirportSeqID LIMIT 16","hsqls":["SELECT DestAirportSeqID, COUNT(*) FROM mytable WHERE ArrTimeBlk BETWEEN '1600-1659' AND '1900-1959' OR (DivTailNums[1] BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums[2] BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums[3] BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums[4] BETWEEN 'N8606C' AND 'N957DN' OR DivTailNums[5] BETWEEN 'N8606C' AND 'N957DN') AND FlightNum BETWEEN 4250 AND 1349 GROUP BY DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DepDelayMinutes, DestStateFips, TaxiIn FROM mytable WHERE ArrivalDelayGroups = -2 OR DivArrDelay <= 69 ORDER BY Diverted, DivActualElapsedTime LIMIT 18"}
-{"sql":"SELECT DestStateFips, Dest FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 OR DivAirportSeqIDs IN (1199603, 1425603) OR DestStateFips <= 34 ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 17","hsqls":["SELECT DestStateFips, Dest FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 OR (DivAirportSeqIDs__MV0 IN (1199603, 1425603) OR DivAirportSeqIDs__MV1 IN (1199603, 1425603) OR DivAirportSeqIDs__MV2 IN (1199603, 1425603) OR DivAirportSeqIDs__MV3 IN (1199603, 1425603) OR DivAirportSeqIDs__MV4 IN (1199603, 1425603)) OR DestStateFips <= 34 ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, Dest FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 OR DivAirportSeqIDs IN (1199603, 1425603) OR DestStateFips <= 34 ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 17","hsqls":["SELECT DestStateFips, Dest FROM mytable WHERE DepDel15 BETWEEN 1 AND 0 OR (DivAirportSeqIDs[1] IN (1199603, 1425603) OR DivAirportSeqIDs[2] IN (1199603, 1425603) OR DivAirportSeqIDs[3] IN (1199603, 1425603) OR DivAirportSeqIDs[4] IN (1199603, 1425603) OR DivAirportSeqIDs[5] IN (1199603, 1425603)) OR DestStateFips <= 34 ORDER BY DepartureDelayGroups, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, FlightNum, ActualElapsedTime FROM mytable LIMIT 10"}
-{"sql":"SELECT DivAirports, DestCityName, OriginWac FROM mytable WHERE DepDel15 NOT IN (1, 0) AND CRSDepTime >= 1100 LIMIT 24","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DestCityName, OriginWac FROM mytable WHERE DepDel15 NOT IN (1, 0) AND CRSDepTime >= 1100 LIMIT 10000"]}
-{"sql":"SELECT DivTailNums, Origin FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Ohio' ORDER BY ActualElapsedTime, DivAirportLandings, DivArrDelay LIMIT 26","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Origin FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Ohio' ORDER BY ActualElapsedTime, DivAirportLandings, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DivAirports, DestCityName, OriginWac FROM mytable WHERE DepDel15 NOT IN (1, 0) AND CRSDepTime >= 1100 LIMIT 24","hsqls":["SELECT DivAirports, DestCityName, OriginWac FROM mytable WHERE DepDel15 NOT IN (1, 0) AND CRSDepTime >= 1100 LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, Origin FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Ohio' ORDER BY ActualElapsedTime, DivAirportLandings, DivArrDelay LIMIT 26","hsqls":["SELECT DivTailNums, Origin FROM mytable WHERE DestStateName BETWEEN 'Oregon' AND 'Ohio' ORDER BY ActualElapsedTime, DivAirportLandings, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT UniqueCarrier, DivArrDelay, OriginAirportID, COUNT(*) FROM mytable WHERE WheelsOn = 127 OR OriginWac BETWEEN 14 AND 11 OR OriginAirportID < 10990 GROUP BY UniqueCarrier, DivArrDelay, OriginAirportID  ORDER BY UniqueCarrier, DivArrDelay, OriginAirportID LIMIT 19","hsqls":["SELECT UniqueCarrier, DivArrDelay, OriginAirportID, COUNT(*) FROM mytable WHERE WheelsOn = 127 OR OriginWac BETWEEN 14 AND 11 OR OriginAirportID < 10990 GROUP BY UniqueCarrier, DivArrDelay, OriginAirportID  ORDER BY UniqueCarrier, DivArrDelay, OriginAirportID LIMIT 19"]}
-{"sql":"SELECT DivLongestGTimes, SecurityDelay, AirlineID FROM mytable WHERE AirlineID BETWEEN 19977 AND 20437 OR DivLongestGTimes BETWEEN 8.0 AND 96.0 ORDER BY Cancelled, \"Month\" LIMIT 18","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, SecurityDelay, AirlineID FROM mytable WHERE AirlineID BETWEEN 19977 AND 20437 OR (DivLongestGTimes__MV0 BETWEEN 8.0 AND 96.0 OR DivLongestGTimes__MV1 BETWEEN 8.0 AND 96.0 OR DivLongestGTimes__MV2 BETWEEN 8.0 AND 96.0 OR DivLongestGTimes__MV3 BETWEEN 8.0 AND 96.0 OR DivLongestGTimes__MV4 BETWEEN 8.0 AND 96.0) ORDER BY Cancelled, Month LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, SecurityDelay, AirlineID FROM mytable WHERE AirlineID BETWEEN 19977 AND 20437 OR DivLongestGTimes BETWEEN 8.0 AND 96.0 ORDER BY Cancelled, \"Month\" LIMIT 18","hsqls":["SELECT DivLongestGTimes, SecurityDelay, AirlineID FROM mytable WHERE AirlineID BETWEEN 19977 AND 20437 OR (DivLongestGTimes[1] BETWEEN 8.0 AND 96.0 OR DivLongestGTimes[2] BETWEEN 8.0 AND 96.0 OR DivLongestGTimes[3] BETWEEN 8.0 AND 96.0 OR DivLongestGTimes[4] BETWEEN 8.0 AND 96.0 OR DivLongestGTimes[5] BETWEEN 8.0 AND 96.0) ORDER BY Cancelled, `Month` LIMIT 10000"]}
 {"sql":"SELECT Carrier, Quarter, Dest FROM mytable WHERE DivArrDelay = 144 ORDER BY TaxiOut, DepDelay, Distance LIMIT 15"}
-{"sql":"SELECT AVG(DepDelay), AVG(Diverted), SUM(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID >= 31123 OR OriginWac >= 43 OR DivAirportIDs BETWEEN 12323 AND 13487 LIMIT 1","hsqls":["SELECT AVG(DepDelay), AVG(Diverted), SUM(DestAirportSeqID)  FROM mytable WHERE OriginCityMarketID >= 31123 OR OriginWac >= 43 OR (DivAirportIDs__MV0 BETWEEN 12323 AND 13487 OR DivAirportIDs__MV1 BETWEEN 12323 AND 13487 OR DivAirportIDs__MV2 BETWEEN 12323 AND 13487 OR DivAirportIDs__MV3 BETWEEN 12323 AND 13487 OR DivAirportIDs__MV4 BETWEEN 12323 AND 13487) LIMIT 10000"]}
-{"sql":"SELECT AirlineID, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1154003 AND 1025702 OR DepDelay NOT IN (359.0) OR ArrDel15 BETWEEN 0 AND 1 GROUP BY AirlineID LIMIT 28","hsqls":["SELECT AirlineID, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs__MV1 BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs__MV2 BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs__MV3 BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs__MV4 BETWEEN 1154003 AND 1025702) OR DepDelay NOT IN (359.0) OR ArrDel15 BETWEEN 0 AND 1 GROUP BY AirlineID LIMIT 10000"]}
+{"sql":"SELECT AVG(DepDelay), AVG(Diverted), SUM(DestAirportSeqID) FROM mytable WHERE OriginCityMarketID >= 31123 OR OriginWac >= 43 OR DivAirportIDs BETWEEN 12323 AND 13487 LIMIT 1","hsqls":["SELECT AVG(DepDelay), AVG(Diverted), SUM(DestAirportSeqID)  FROM mytable WHERE OriginCityMarketID >= 31123 OR OriginWac >= 43 OR (DivAirportIDs[1] BETWEEN 12323 AND 13487 OR DivAirportIDs[2] BETWEEN 12323 AND 13487 OR DivAirportIDs[3] BETWEEN 12323 AND 13487 OR DivAirportIDs[4] BETWEEN 12323 AND 13487 OR DivAirportIDs[5] BETWEEN 12323 AND 13487) LIMIT 10000"]}
+{"sql":"SELECT AirlineID, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1154003 AND 1025702 OR DepDelay NOT IN (359.0) OR ArrDel15 BETWEEN 0 AND 1 GROUP BY AirlineID LIMIT 28","hsqls":["SELECT AirlineID, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs[2] BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs[3] BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs[4] BETWEEN 1154003 AND 1025702 OR DivAirportSeqIDs[5] BETWEEN 1154003 AND 1025702) OR DepDelay NOT IN (359.0) OR ArrDel15 BETWEEN 0 AND 1 GROUP BY AirlineID LIMIT 10000"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE ArrivalDelayGroups NOT IN (7, -2, 5, 4) OR TotalAddGTime = 31 AND DestStateFips NOT IN (26) ORDER BY DepTime LIMIT 14"}
 {"sql":"SELECT LateAircraftDelay, CarrierDelay FROM mytable WHERE DepartureDelayGroups IN (-1) ORDER BY DepDelayMinutes, UniqueCarrier LIMIT 7"}
 {"sql":"SELECT DivActualElapsedTime, COUNT(FirstDepTime), SUM(DivDistance), COUNT(DivAirportLandings) FROM mytable WHERE DivReachedDest < -9999 AND DepartureDelayGroups NOT IN (1, 0, -1, 8) AND ArrDelay NOT IN (144.0) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 1","hsqls":["SELECT DivActualElapsedTime, COUNT(FirstDepTime), SUM(DivDistance), COUNT(DivAirportLandings) FROM mytable WHERE DivReachedDest < -9999 AND DepartureDelayGroups NOT IN (1, 0, -1, 8) AND ArrDelay NOT IN (144.0) GROUP BY DivActualElapsedTime  ORDER BY DivActualElapsedTime LIMIT 1"]}
 {"sql":"SELECT MIN(DaysSinceEpoch), MIN(CRSArrTime) FROM mytable WHERE DepartureDelayGroups NOT IN (2) OR DepDelayMinutes NOT IN (320.0, 251.0, 62.0) AND Cancelled BETWEEN 1 AND 1 LIMIT 19"}
 {"sql":"SELECT DistanceGroup, Flights, COUNT(*) FROM mytable WHERE NASDelay >= 33 OR OriginStateFips NOT IN (48, 20, 5, 51, 39) GROUP BY DistanceGroup, Flights  ORDER BY DistanceGroup, Flights LIMIT 10","hsqls":["SELECT DistanceGroup, Flights, COUNT(*) FROM mytable WHERE NASDelay >= 33 OR OriginStateFips NOT IN (48, 20, 5, 51, 39) GROUP BY DistanceGroup, Flights  ORDER BY DistanceGroup, Flights LIMIT 10"]}
-{"sql":"SELECT DepDel15 FROM mytable WHERE DivLongestGTimes BETWEEN 112.0 AND 73.0 ORDER BY TaxiOut, DepDelayMinutes, LongestAddGTime LIMIT 10","hsqls":["SELECT DepDel15 FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 112.0 AND 73.0 OR DivLongestGTimes__MV1 BETWEEN 112.0 AND 73.0 OR DivLongestGTimes__MV2 BETWEEN 112.0 AND 73.0 OR DivLongestGTimes__MV3 BETWEEN 112.0 AND 73.0 OR DivLongestGTimes__MV4 BETWEEN 112.0 AND 73.0) ORDER BY TaxiOut, DepDelayMinutes, LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT DepDel15 FROM mytable WHERE DivLongestGTimes BETWEEN 112.0 AND 73.0 ORDER BY TaxiOut, DepDelayMinutes, LongestAddGTime LIMIT 10","hsqls":["SELECT DepDel15 FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 112.0 AND 73.0 OR DivLongestGTimes[2] BETWEEN 112.0 AND 73.0 OR DivLongestGTimes[3] BETWEEN 112.0 AND 73.0 OR DivLongestGTimes[4] BETWEEN 112.0 AND 73.0 OR DivLongestGTimes[5] BETWEEN 112.0 AND 73.0) ORDER BY TaxiOut, DepDelayMinutes, LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT TotalAddGTime, DivActualElapsedTime FROM mytable ORDER BY Carrier, CarrierDelay, DestCityName LIMIT 28"}
 {"sql":"SELECT FirstDepTime, TotalAddGTime, MAX(DivArrDelay), AVG(DivAirportLandings) FROM mytable WHERE DestStateFips NOT IN (50) GROUP BY FirstDepTime, TotalAddGTime  ORDER BY FirstDepTime, TotalAddGTime LIMIT 28","hsqls":["SELECT FirstDepTime, TotalAddGTime, MAX(DivArrDelay), AVG(DivAirportLandings) FROM mytable WHERE DestStateFips NOT IN (50) GROUP BY FirstDepTime, TotalAddGTime  ORDER BY FirstDepTime, TotalAddGTime LIMIT 28"]}
 {"sql":"SELECT SecurityDelay, DestCityMarketID, DestAirportID FROM mytable WHERE CRSDepTime BETWEEN 1139 AND 1551 ORDER BY Flights, DepDelayMinutes, ArrDel15 LIMIT 20"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 10"}
 {"sql":"SELECT COUNT(DestCityName), COUNT(DestAirportID), AVG(TaxiIn) FROM mytable LIMIT 26"}
-{"sql":"SELECT DivLongestGTimes, Flights, OriginStateName FROM mytable WHERE ArrivalDelayGroups IN (3, -1, 4, 11) AND DivWheelsOns IN (1033, 1716, 703, 1930) LIMIT 14","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Flights, OriginStateName FROM mytable WHERE ArrivalDelayGroups IN (3, -1, 4, 11) AND (DivWheelsOns__MV0 IN (1033, 1716, 703, 1930) OR DivWheelsOns__MV1 IN (1033, 1716, 703, 1930) OR DivWheelsOns__MV2 IN (1033, 1716, 703, 1930) OR DivWheelsOns__MV3 IN (1033, 1716, 703, 1930) OR DivWheelsOns__MV4 IN (1033, 1716, 703, 1930)) LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Flights, OriginStateName FROM mytable WHERE ArrivalDelayGroups IN (3, -1, 4, 11) AND DivWheelsOns IN (1033, 1716, 703, 1930) LIMIT 14","hsqls":["SELECT DivLongestGTimes, Flights, OriginStateName FROM mytable WHERE ArrivalDelayGroups IN (3, -1, 4, 11) AND (DivWheelsOns[1] IN (1033, 1716, 703, 1930) OR DivWheelsOns[2] IN (1033, 1716, 703, 1930) OR DivWheelsOns[3] IN (1033, 1716, 703, 1930) OR DivWheelsOns[4] IN (1033, 1716, 703, 1930) OR DivWheelsOns[5] IN (1033, 1716, 703, 1930)) LIMIT 10000"]}
 {"sql":"SELECT AVG(DestCityMarketID), COUNT(DepTime) FROM mytable WHERE DayofMonth IN (2, 6, 19, 24) LIMIT 25"}
-{"sql":"SELECT DestAirportSeqID, ActualElapsedTime FROM mytable WHERE DivAirportLandings >= 9 AND DivWheelsOffs = 1728 ORDER BY DepTime, AirlineID, CRSDepTime LIMIT 21","hsqls":["SELECT DestAirportSeqID, ActualElapsedTime FROM mytable WHERE DivAirportLandings >= 9 AND (DivWheelsOffs__MV0 = 1728 OR DivWheelsOffs__MV1 = 1728 OR DivWheelsOffs__MV2 = 1728 OR DivWheelsOffs__MV3 = 1728 OR DivWheelsOffs__MV4 = 1728) ORDER BY DepTime, AirlineID, CRSDepTime LIMIT 10000"]}
-{"sql":"SELECT DepDelayMinutes, ActualElapsedTime, DestCityMarketID FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DivAirportIDs >= 14843 AND DivTotalGTimes BETWEEN 2 AND 76 ORDER BY \"Year\", DivAirportLandings, CRSElapsedTime LIMIT 23","hsqls":["SELECT DepDelayMinutes, ActualElapsedTime, DestCityMarketID FROM mytable WHERE Flights BETWEEN 1 AND 1 AND (DivAirportIDs__MV0 >= 14843 OR DivAirportIDs__MV1 >= 14843 OR DivAirportIDs__MV2 >= 14843 OR DivAirportIDs__MV3 >= 14843 OR DivAirportIDs__MV4 >= 14843) AND (DivTotalGTimes__MV0 BETWEEN 2 AND 76 OR DivTotalGTimes__MV1 BETWEEN 2 AND 76 OR DivTotalGTimes__MV2 BETWEEN 2 AND 76 OR DivTotalGTimes__MV3 BETWEEN 2 AND 76 OR DivTotalGTimes__MV4 BETWEEN 2 AND 76) ORDER BY Year, DivAirportLandings, CRSElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DestAirportSeqID, ActualElapsedTime FROM mytable WHERE DivAirportLandings >= 9 AND DivWheelsOffs = 1728 ORDER BY DepTime, AirlineID, CRSDepTime LIMIT 21","hsqls":["SELECT DestAirportSeqID, ActualElapsedTime FROM mytable WHERE DivAirportLandings >= 9 AND (DivWheelsOffs[1] = 1728 OR DivWheelsOffs[2] = 1728 OR DivWheelsOffs[3] = 1728 OR DivWheelsOffs[4] = 1728 OR DivWheelsOffs[5] = 1728) ORDER BY DepTime, AirlineID, CRSDepTime LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, ActualElapsedTime, DestCityMarketID FROM mytable WHERE Flights BETWEEN 1 AND 1 AND DivAirportIDs >= 14843 AND DivTotalGTimes BETWEEN 2 AND 76 ORDER BY \"Year\", DivAirportLandings, CRSElapsedTime LIMIT 23","hsqls":["SELECT DepDelayMinutes, ActualElapsedTime, DestCityMarketID FROM mytable WHERE Flights BETWEEN 1 AND 1 AND (DivAirportIDs[1] >= 14843 OR DivAirportIDs[2] >= 14843 OR DivAirportIDs[3] >= 14843 OR DivAirportIDs[4] >= 14843 OR DivAirportIDs[5] >= 14843) AND (DivTotalGTimes[1] BETWEEN 2 AND 76 OR DivTotalGTimes[2] BETWEEN 2 AND 76 OR DivTotalGTimes[3] BETWEEN 2 AND 76 OR DivTotalGTimes[4] BETWEEN 2 AND 76 OR DivTotalGTimes[5] BETWEEN 2 AND 76) ORDER BY Year, DivAirportLandings, CRSElapsedTime LIMIT 10000"]}
 {"sql":"SELECT FlightDate, WheelsOn, MAX(DestAirportID), MAX(DestCityMarketID) FROM mytable WHERE WeatherDelay IN (30, 35, 22, 61, 27) OR DepDelayMinutes BETWEEN 13.0 AND 62.0 GROUP BY FlightDate, WheelsOn  ORDER BY FlightDate, WheelsOn LIMIT 14","hsqls":["SELECT FlightDate, WheelsOn, MAX(DestAirportID), MAX(DestCityMarketID) FROM mytable WHERE WeatherDelay IN (30, 35, 22, 61, 27) OR DepDelayMinutes BETWEEN 13.0 AND 62.0 GROUP BY FlightDate, WheelsOn  ORDER BY FlightDate, WheelsOn LIMIT 14"]}
 {"sql":"SELECT LateAircraftDelay, FirstDepTime, DivDistance, AVG(FlightNum), MIN(OriginWac), MIN(CRSElapsedTime) FROM mytable GROUP BY LateAircraftDelay, FirstDepTime, DivDistance  ORDER BY LateAircraftDelay, FirstDepTime, DivDistance LIMIT 8","hsqls":["SELECT LateAircraftDelay, FirstDepTime, DivDistance, AVG(FlightNum), MIN(OriginWac), MIN(CRSElapsedTime) FROM mytable GROUP BY LateAircraftDelay, FirstDepTime, DivDistance  ORDER BY LateAircraftDelay, FirstDepTime, DivDistance LIMIT 8"]}
 {"sql":"SELECT DivReachedDest, DestWac, AirlineID, AVG(DivDistance) FROM mytable GROUP BY DivReachedDest, DestWac, AirlineID  ORDER BY DivReachedDest, DestWac, AirlineID LIMIT 2","hsqls":["SELECT DivReachedDest, DestWac, AirlineID, AVG(DivDistance) FROM mytable GROUP BY DivReachedDest, DestWac, AirlineID  ORDER BY DivReachedDest, DestWac, AirlineID LIMIT 2"]}
-{"sql":"SELECT DivAirports FROM mytable WHERE OriginCityName BETWEEN 'Saginaw/Bay City/Midland, MI' AND 'Richmond, VA' OR LateAircraftDelay = 39 ORDER BY DestStateName","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable WHERE OriginCityName BETWEEN 'Saginaw/Bay City/Midland, MI' AND 'Richmond, VA' OR LateAircraftDelay = 39 ORDER BY DestStateName LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivAirportSeqIDs BETWEEN 1412202 AND 1289605 LIMIT 14","hsqls":["SELECT DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs__MV1 BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs__MV2 BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs__MV3 BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs__MV4 BETWEEN 1412202 AND 1289605) LIMIT 10000"]}
-{"sql":"SELECT DivWheelsOns, CarrierDelay, LongestAddGTime FROM mytable WHERE AirTime IN (58) OR OriginCityName <> 'Newark, NJ' AND DestAirportSeqID = 1457002 LIMIT 8","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, CarrierDelay, LongestAddGTime FROM mytable WHERE AirTime IN (58) OR OriginCityName <> 'Newark, NJ' AND DestAirportSeqID = 1457002 LIMIT 10000"]}
+{"sql":"SELECT DivAirports FROM mytable WHERE OriginCityName BETWEEN 'Saginaw/Bay City/Midland, MI' AND 'Richmond, VA' OR LateAircraftDelay = 39 ORDER BY DestStateName","hsqls":["SELECT DivAirports FROM mytable WHERE OriginCityName BETWEEN 'Saginaw/Bay City/Midland, MI' AND 'Richmond, VA' OR LateAircraftDelay = 39 ORDER BY DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOffs FROM mytable WHERE DivAirportSeqIDs BETWEEN 1412202 AND 1289605 LIMIT 14","hsqls":["SELECT DivWheelsOffs FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs[2] BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs[3] BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs[4] BETWEEN 1412202 AND 1289605 OR DivAirportSeqIDs[5] BETWEEN 1412202 AND 1289605) LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, CarrierDelay, LongestAddGTime FROM mytable WHERE AirTime IN (58) OR OriginCityName <> 'Newark, NJ' AND DestAirportSeqID = 1457002 LIMIT 8","hsqls":["SELECT DivWheelsOns, CarrierDelay, LongestAddGTime FROM mytable WHERE AirTime IN (58) OR OriginCityName <> 'Newark, NJ' AND DestAirportSeqID = 1457002 LIMIT 10000"]}
 {"sql":"SELECT COUNT(Quarter) FROM mytable WHERE DivReachedDest < -9999 LIMIT 10"}
 {"sql":"SELECT DepDelay, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10980 AND 11867 OR Diverted NOT IN (1, 0) GROUP BY DepDelay","hsqls":["SELECT DepDelay, COUNT(*) FROM mytable WHERE DestAirportID BETWEEN 10980 AND 11867 OR Diverted NOT IN (1, 0) GROUP BY DepDelay"]}
-{"sql":"SELECT MIN(ArrTime), MAX(\"Month\"), MAX(Distance) FROM mytable WHERE FlightDate IN ('2014-01-01') OR \"Month\" IN (1) LIMIT 22","hsqls":["SELECT MIN(ArrTime), MAX(Month), MAX(Distance) FROM mytable WHERE FlightDate IN ('2014-01-01') OR Month IN (1) LIMIT 22"]}
+{"sql":"SELECT MIN(ArrTime), MAX(\"Month\"), MAX(Distance) FROM mytable WHERE FlightDate IN ('2014-01-01') OR \"Month\" IN (1) LIMIT 22","hsqls":["SELECT MIN(ArrTime), MAX(`Month`), MAX(Distance) FROM mytable WHERE FlightDate IN ('2014-01-01') OR `Month` IN (1) LIMIT 22"]}
 {"sql":"SELECT DistanceGroup, DestAirportID, CRSDepTime FROM mytable LIMIT 10"}
-{"sql":"SELECT OriginStateFips, DivAirportIDs FROM mytable WHERE Quarter >= 1 AND DivReachedDest BETWEEN 0 AND 1 ORDER BY Quarter, ArrTime, Cancelled LIMIT 19","hsqls":["SELECT OriginStateFips, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE Quarter >= 1 AND DivReachedDest BETWEEN 0 AND 1 ORDER BY Quarter, ArrTime, Cancelled LIMIT 10000"]}
+{"sql":"SELECT OriginStateFips, DivAirportIDs FROM mytable WHERE Quarter >= 1 AND DivReachedDest BETWEEN 0 AND 1 ORDER BY Quarter, ArrTime, Cancelled LIMIT 19","hsqls":["SELECT OriginStateFips, DivAirportIDs FROM mytable WHERE Quarter >= 1 AND DivReachedDest BETWEEN 0 AND 1 ORDER BY Quarter, ArrTime, Cancelled LIMIT 10000"]}
 {"sql":"SELECT ArrTime, DestAirportSeqID, AVG(ArrDel15) FROM mytable WHERE DivArrDelay = 88 GROUP BY ArrTime, DestAirportSeqID  ORDER BY ArrTime, DestAirportSeqID LIMIT 19","hsqls":["SELECT ArrTime, DestAirportSeqID, AVG(ArrDel15) FROM mytable WHERE DivArrDelay = 88 GROUP BY ArrTime, DestAirportSeqID  ORDER BY ArrTime, DestAirportSeqID LIMIT 19"]}
-{"sql":"SELECT SecurityDelay, DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE ArrDelay < 312.0 OR DestCityMarketID NOT IN (33964) OR DivDistance NOT IN (997, 187, 24) ORDER BY ActualElapsedTime, ArrivalDelayGroups LIMIT 19","hsqls":["SELECT SecurityDelay, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE ArrDelay < 312.0 OR DestCityMarketID NOT IN (33964) OR DivDistance NOT IN (997, 187, 24) ORDER BY ActualElapsedTime, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE ArrDelay < 312.0 OR DestCityMarketID NOT IN (33964) OR DivDistance NOT IN (997, 187, 24) ORDER BY ActualElapsedTime, ArrivalDelayGroups LIMIT 19","hsqls":["SELECT SecurityDelay, DivAirportSeqIDs, DivAirportIDs FROM mytable WHERE ArrDelay < 312.0 OR DestCityMarketID NOT IN (33964) OR DivDistance NOT IN (997, 187, 24) ORDER BY ActualElapsedTime, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime, DepTimeBlk, DestCityMarketID FROM mytable WHERE SecurityDelay BETWEEN 8 AND 4 AND WeatherDelay >= 12 ORDER BY Cancelled LIMIT 26"}
-{"sql":"SELECT OriginCityMarketID, ArrTime FROM mytable WHERE \"Year\" < 2014 AND OriginState NOT IN ('PA', 'VI', 'IA', 'VA', 'RI') LIMIT 14","hsqls":["SELECT OriginCityMarketID, ArrTime FROM mytable WHERE Year < 2014 AND OriginState NOT IN ('PA', 'VI', 'IA', 'VA', 'RI') LIMIT 14"]}
-{"sql":"SELECT AVG(DestStateFips), MIN(\"Year\"), MAX(DayofMonth) FROM mytable WHERE DistanceGroup <= 1 LIMIT 19","hsqls":["SELECT AVG(DestStateFips), MIN(Year), MAX(DayofMonth) FROM mytable WHERE DistanceGroup <= 1 LIMIT 19"]}
+{"sql":"SELECT OriginCityMarketID, ArrTime FROM mytable WHERE \"Year\" < 2014 AND OriginState NOT IN ('PA', 'VI', 'IA', 'VA', 'RI') LIMIT 14","hsqls":["SELECT OriginCityMarketID, ArrTime FROM mytable WHERE `Year` < 2014 AND OriginState NOT IN ('PA', 'VI', 'IA', 'VA', 'RI') LIMIT 14"]}
+{"sql":"SELECT AVG(DestStateFips), MIN(\"Year\"), MAX(DayofMonth) FROM mytable WHERE DistanceGroup <= 1 LIMIT 19","hsqls":["SELECT AVG(DestStateFips), MIN(`Year`), MAX(DayofMonth) FROM mytable WHERE DistanceGroup <= 1 LIMIT 19"]}
 {"sql":"SELECT DepDelayMinutes, Origin, AVG(DivReachedDest), MIN(SecurityDelay), AVG(DaysSinceEpoch) FROM mytable WHERE Distance NOT IN (205) GROUP BY DepDelayMinutes, Origin  ORDER BY DepDelayMinutes, Origin LIMIT 29","hsqls":["SELECT DepDelayMinutes, Origin, AVG(DivReachedDest), MIN(SecurityDelay), AVG(DaysSinceEpoch) FROM mytable WHERE Distance NOT IN (205) GROUP BY DepDelayMinutes, Origin  ORDER BY DepDelayMinutes, Origin LIMIT 29"]}
 {"sql":"SELECT OriginStateFips, COUNT(DepTimeBlk), AVG(FirstDepTime), AVG(DistanceGroup) FROM mytable WHERE OriginStateFips = 13 OR Flights > 1 AND DayofMonth BETWEEN 19 AND 25 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 4","hsqls":["SELECT OriginStateFips, COUNT(DepTimeBlk), AVG(FirstDepTime), AVG(DistanceGroup) FROM mytable WHERE OriginStateFips = 13 OR Flights > 1 AND DayofMonth BETWEEN 19 AND 25 GROUP BY OriginStateFips  ORDER BY OriginStateFips LIMIT 4"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable WHERE DepDelayMinutes = 98.0 AND CarrierDelay BETWEEN 12 AND 24 ORDER BY ActualElapsedTime, DestAirportSeqID LIMIT 20"}
 {"sql":"SELECT WheelsOff, Dest, OriginWac FROM mytable ORDER BY Diverted, TailNum, UniqueCarrier LIMIT 2"}
-{"sql":"SELECT AVG(\"Month\") FROM mytable WHERE DivWheelsOffs BETWEEN 1943 AND 919 LIMIT 19","hsqls":["SELECT AVG(CAST(Month AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1943 AND 919 OR DivWheelsOffs__MV1 BETWEEN 1943 AND 919 OR DivWheelsOffs__MV2 BETWEEN 1943 AND 919 OR DivWheelsOffs__MV3 BETWEEN 1943 AND 919 OR DivWheelsOffs__MV4 BETWEEN 1943 AND 919) LIMIT 10000"]}
-{"sql":"SELECT NASDelay, DestCityMarketID FROM mytable ORDER BY DestAirportSeqID, \"Month\" LIMIT 21","hsqls":["SELECT NASDelay, DestCityMarketID FROM mytable ORDER BY DestAirportSeqID, Month LIMIT 21"]}
-{"sql":"SELECT DestWac, FirstDepTime, AirlineID, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1419303 AND 1129803 OR DepDelayMinutes = 36.0 OR ArrDelayMinutes BETWEEN 34.0 AND 228.0 GROUP BY DestWac, FirstDepTime, AirlineID LIMIT 26","hsqls":["SELECT DestWac, FirstDepTime, AirlineID, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs__MV0 BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs__MV1 BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs__MV2 BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs__MV3 BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs__MV4 BETWEEN 1419303 AND 1129803) OR DepDelayMinutes = 36.0 OR ArrDelayMinutes BETWEEN 34.0 AND 228.0 GROUP BY DestWac, FirstDepTime, AirlineID LIMIT 10000"]}
-{"sql":"SELECT LateAircraftDelay, ArrTime, DestAirportSeqID, COUNT(LongestAddGTime), SUM(ArrTime) FROM mytable WHERE DivTailNums BETWEEN 'N14188' AND 'N8623F' AND DestCityName NOT IN ('Mission/McAllen/Edinburg, TX', 'Missoula, MT', 'Jacksonville/Camp Lejeune, NC', 'Bloomington/Normal, IL', 'North Bend/Coos Bay, OR') GROUP BY LateAircraftDelay, ArrTime, DestAirportSeqID","hsqls":["SELECT LateAircraftDelay, ArrTime, DestAirportSeqID, COUNT(LongestAddGTime), SUM(ArrTime) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N14188' AND 'N8623F' OR DivTailNums__MV1 BETWEEN 'N14188' AND 'N8623F' OR DivTailNums__MV2 BETWEEN 'N14188' AND 'N8623F' OR DivTailNums__MV3 BETWEEN 'N14188' AND 'N8623F' OR DivTailNums__MV4 BETWEEN 'N14188' AND 'N8623F') AND DestCityName NOT IN ('Mission/McAllen/Edinburg, TX', 'Missoula, MT', 'Jacksonville/Camp Lejeune, NC', 'Bloomington/Normal, IL', 'North Bend/Coos Bay, OR') GROUP BY LateAircraftDelay, ArrTime, DestAirportSeqID LIMIT 10000"]}
+{"sql":"SELECT AVG(\"Month\") FROM mytable WHERE DivWheelsOffs BETWEEN 1943 AND 919 LIMIT 19","hsqls":["SELECT AVG(CAST(Month AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1943 AND 919 OR DivWheelsOffs[2] BETWEEN 1943 AND 919 OR DivWheelsOffs[3] BETWEEN 1943 AND 919 OR DivWheelsOffs[4] BETWEEN 1943 AND 919 OR DivWheelsOffs[5] BETWEEN 1943 AND 919) LIMIT 10000"]}
+{"sql":"SELECT NASDelay, DestCityMarketID FROM mytable ORDER BY DestAirportSeqID, \"Month\" LIMIT 21","hsqls":["SELECT NASDelay, DestCityMarketID FROM mytable ORDER BY DestAirportSeqID, `Month` LIMIT 21"]}
+{"sql":"SELECT DestWac, FirstDepTime, AirlineID, COUNT(*) FROM mytable WHERE DivAirportSeqIDs BETWEEN 1419303 AND 1129803 OR DepDelayMinutes = 36.0 OR ArrDelayMinutes BETWEEN 34.0 AND 228.0 GROUP BY DestWac, FirstDepTime, AirlineID LIMIT 26","hsqls":["SELECT DestWac, FirstDepTime, AirlineID, COUNT(*) FROM mytable WHERE (DivAirportSeqIDs[1] BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs[2] BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs[3] BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs[4] BETWEEN 1419303 AND 1129803 OR DivAirportSeqIDs[5] BETWEEN 1419303 AND 1129803) OR DepDelayMinutes = 36.0 OR ArrDelayMinutes BETWEEN 34.0 AND 228.0 GROUP BY DestWac, FirstDepTime, AirlineID LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, ArrTime, DestAirportSeqID, COUNT(LongestAddGTime), SUM(ArrTime) FROM mytable WHERE DivTailNums BETWEEN 'N14188' AND 'N8623F' AND DestCityName NOT IN ('Mission/McAllen/Edinburg, TX', 'Missoula, MT', 'Jacksonville/Camp Lejeune, NC', 'Bloomington/Normal, IL', 'North Bend/Coos Bay, OR') GROUP BY LateAircraftDelay, ArrTime, DestAirportSeqID","hsqls":["SELECT LateAircraftDelay, ArrTime, DestAirportSeqID, COUNT(LongestAddGTime), SUM(ArrTime) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N14188' AND 'N8623F' OR DivTailNums[2] BETWEEN 'N14188' AND 'N8623F' OR DivTailNums[3] BETWEEN 'N14188' AND 'N8623F' OR DivTailNums[4] BETWEEN 'N14188' AND 'N8623F' OR DivTailNums[5] BETWEEN 'N14188' AND 'N8623F') AND DestCityName NOT IN ('Mission/McAllen/Edinburg, TX', 'Missoula, MT', 'Jacksonville/Camp Lejeune, NC', 'Bloomington/Normal, IL', 'North Bend/Coos Bay, OR') GROUP BY LateAircraftDelay, ArrTime, DestAirportSeqID LIMIT 10000"]}
 {"sql":"SELECT ArrDelay FROM mytable LIMIT 19"}
 {"sql":"SELECT FirstDepTime, ArrDel15, MAX(AirlineID) FROM mytable GROUP BY FirstDepTime, ArrDel15  ORDER BY FirstDepTime, ArrDel15 LIMIT 18","hsqls":["SELECT FirstDepTime, ArrDel15, MAX(AirlineID) FROM mytable GROUP BY FirstDepTime, ArrDel15  ORDER BY FirstDepTime, ArrDel15 LIMIT 18"]}
 {"sql":"SELECT Distance FROM mytable WHERE NASDelay IN (98, 29, 12) AND DivDistance >= 239 ORDER BY Carrier, LateAircraftDelay LIMIT 21"}
-{"sql":"SELECT DestAirportSeqID, DestStateName FROM mytable WHERE ArrTimeBlk <= '1500-1559' AND \"Month\" BETWEEN 1 AND 1 ORDER BY \"Year\", DepDel15, CancellationCode LIMIT 6","hsqls":["SELECT DestAirportSeqID, DestStateName FROM mytable WHERE ArrTimeBlk <= '1500-1559' AND Month BETWEEN 1 AND 1 ORDER BY Year, DepDel15, CancellationCode LIMIT 6"]}
+{"sql":"SELECT DestAirportSeqID, DestStateName FROM mytable WHERE ArrTimeBlk <= '1500-1559' AND \"Month\" BETWEEN 1 AND 1 ORDER BY \"Year\", DepDel15, CancellationCode LIMIT 6","hsqls":["SELECT DestAirportSeqID, DestStateName FROM mytable WHERE ArrTimeBlk <= '1500-1559' AND `Month` BETWEEN 1 AND 1 ORDER BY Year, DepDel15, CancellationCode LIMIT 6"]}
 {"sql":"SELECT DayofMonth, CRSDepTime FROM mytable WHERE DestCityName IN ('Fairbanks, AK', 'Worcester, MA', 'Austin, TX') ORDER BY DistanceGroup, DestState LIMIT 21"}
 {"sql":"SELECT SUM(TaxiOut), SUM(ActualElapsedTime), SUM(DepDelay) FROM mytable WHERE DestWac BETWEEN 2 AND 85 LIMIT 25"}
-{"sql":"SELECT DestWac, DestState, DivAirportLandings, COUNT(TaxiOut) FROM mytable WHERE DivDistance IN (91, 270) AND WeatherDelay > 237 OR DivLongestGTimes IN (17.0) GROUP BY DestWac, DestState, DivAirportLandings LIMIT 10","hsqls":["SELECT DestWac, DestState, DivAirportLandings, COUNT(TaxiOut) FROM mytable WHERE DivDistance IN (91, 270) AND WeatherDelay > 237 OR (DivLongestGTimes__MV0 IN (17.0) OR DivLongestGTimes__MV1 IN (17.0) OR DivLongestGTimes__MV2 IN (17.0) OR DivLongestGTimes__MV3 IN (17.0) OR DivLongestGTimes__MV4 IN (17.0)) GROUP BY DestWac, DestState, DivAirportLandings LIMIT 10000"]}
+{"sql":"SELECT DestWac, DestState, DivAirportLandings, COUNT(TaxiOut) FROM mytable WHERE DivDistance IN (91, 270) AND WeatherDelay > 237 OR DivLongestGTimes IN (17.0) GROUP BY DestWac, DestState, DivAirportLandings LIMIT 10","hsqls":["SELECT DestWac, DestState, DivAirportLandings, COUNT(TaxiOut) FROM mytable WHERE DivDistance IN (91, 270) AND WeatherDelay > 237 OR (DivLongestGTimes[1] IN (17.0) OR DivLongestGTimes[2] IN (17.0) OR DivLongestGTimes[3] IN (17.0) OR DivLongestGTimes[4] IN (17.0) OR DivLongestGTimes[5] IN (17.0)) GROUP BY DestWac, DestState, DivAirportLandings LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, OriginAirportSeqID FROM mytable ORDER BY ArrTimeBlk"}
 {"sql":"SELECT DepDel15 FROM mytable ORDER BY Diverted, SecurityDelay, DepDel15 LIMIT 12"}
 {"sql":"SELECT LateAircraftDelay, AVG(DivDistance), MAX(DepartureDelayGroups) FROM mytable WHERE DivAirportLandings >= 0 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 7","hsqls":["SELECT LateAircraftDelay, AVG(DivDistance), MAX(DepartureDelayGroups) FROM mytable WHERE DivAirportLandings >= 0 GROUP BY LateAircraftDelay  ORDER BY LateAircraftDelay LIMIT 7"]}
 {"sql":"SELECT DivArrDelay FROM mytable WHERE DivDistance IN (829, 882) OR OriginState BETWEEN 'KY' AND 'RI' AND CRSArrTime BETWEEN 1104 AND 1732 ORDER BY LongestAddGTime LIMIT 26"}
-{"sql":"SELECT MAX(\"Year\"), COUNT(Diverted) FROM mytable WHERE DepDelayMinutes NOT IN (292.0) LIMIT 24","hsqls":["SELECT MAX(Year), COUNT(Diverted) FROM mytable WHERE DepDelayMinutes NOT IN (292.0) LIMIT 24"]}
+{"sql":"SELECT MAX(\"Year\"), COUNT(Diverted) FROM mytable WHERE DepDelayMinutes NOT IN (292.0) LIMIT 24","hsqls":["SELECT MAX(`Year`), COUNT(Diverted) FROM mytable WHERE DepDelayMinutes NOT IN (292.0) LIMIT 24"]}
 {"sql":"SELECT DepartureDelayGroups, ActualElapsedTime, COUNT(*) FROM mytable WHERE ArrivalDelayGroups = 2 AND ActualElapsedTime = 444 GROUP BY DepartureDelayGroups, ActualElapsedTime  ORDER BY DepartureDelayGroups, ActualElapsedTime LIMIT 3","hsqls":["SELECT DepartureDelayGroups, ActualElapsedTime, COUNT(*) FROM mytable WHERE ArrivalDelayGroups = 2 AND ActualElapsedTime = 444 GROUP BY DepartureDelayGroups, ActualElapsedTime  ORDER BY DepartureDelayGroups, ActualElapsedTime LIMIT 3"]}
 {"sql":"SELECT TaxiIn, DivActualElapsedTime, DaysSinceEpoch FROM mytable WHERE ArrDelayMinutes < 71.0 OR CRSDepTime <> 929 AND DayofMonth >= 11 ORDER BY OriginStateFips, OriginCityName, DivArrDelay LIMIT 20"}
 {"sql":"SELECT ActualElapsedTime, ArrivalDelayGroups FROM mytable WHERE FlightDate <= '2014-01-30' OR CancellationCode BETWEEN 'A' AND 'C' ORDER BY FlightDate, OriginStateName LIMIT 28"}
 {"sql":"SELECT TaxiOut, DivReachedDest, DepDelayMinutes, AVG(Quarter) FROM mytable GROUP BY TaxiOut, DivReachedDest, DepDelayMinutes  ORDER BY TaxiOut, DivReachedDest, DepDelayMinutes LIMIT 21","hsqls":["SELECT TaxiOut, DivReachedDest, DepDelayMinutes, AVG(Quarter) FROM mytable GROUP BY TaxiOut, DivReachedDest, DepDelayMinutes  ORDER BY TaxiOut, DivReachedDest, DepDelayMinutes LIMIT 21"]}
 {"sql":"SELECT UniqueCarrier, COUNT(CRSArrTime) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 13","hsqls":["SELECT UniqueCarrier, COUNT(CRSArrTime) FROM mytable GROUP BY UniqueCarrier  ORDER BY UniqueCarrier LIMIT 13"]}
-{"sql":"SELECT DivLongestGTimes, DivTotalGTimes FROM mytable WHERE DestState < 'ID' AND TotalAddGTime <= 24 OR DestAirportSeqID NOT IN (1471102) ORDER BY TotalAddGTime, DayOfWeek LIMIT 25","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE DestState < 'ID' AND TotalAddGTime <= 24 OR DestAirportSeqID NOT IN (1471102) ORDER BY TotalAddGTime, DayOfWeek LIMIT 10000"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE DepartureDelayGroups NOT IN (9) OR DivAirportSeqIDs IN (1086803) OR DestCityName BETWEEN 'Yuma, AZ' AND 'Deadhorse, AK' ORDER BY LongestAddGTime, Dest, ArrivalDelayGroups LIMIT 26","hsqls":["SELECT Year FROM mytable WHERE DepartureDelayGroups NOT IN (9) OR (DivAirportSeqIDs__MV0 IN (1086803) OR DivAirportSeqIDs__MV1 IN (1086803) OR DivAirportSeqIDs__MV2 IN (1086803) OR DivAirportSeqIDs__MV3 IN (1086803) OR DivAirportSeqIDs__MV4 IN (1086803)) OR DestCityName BETWEEN 'Yuma, AZ' AND 'Deadhorse, AK' ORDER BY LongestAddGTime, Dest, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, DivTotalGTimes FROM mytable WHERE DestState < 'ID' AND TotalAddGTime <= 24 OR DestAirportSeqID NOT IN (1471102) ORDER BY TotalAddGTime, DayOfWeek LIMIT 25","hsqls":["SELECT DivLongestGTimes, DivTotalGTimes FROM mytable WHERE DestState < 'ID' AND TotalAddGTime <= 24 OR DestAirportSeqID NOT IN (1471102) ORDER BY TotalAddGTime, DayOfWeek LIMIT 10000"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE DepartureDelayGroups NOT IN (9) OR DivAirportSeqIDs IN (1086803) OR DestCityName BETWEEN 'Yuma, AZ' AND 'Deadhorse, AK' ORDER BY LongestAddGTime, Dest, ArrivalDelayGroups LIMIT 26","hsqls":["SELECT `Year` FROM mytable WHERE DepartureDelayGroups NOT IN (9) OR (DivAirportSeqIDs[1] IN (1086803) OR DivAirportSeqIDs[2] IN (1086803) OR DivAirportSeqIDs[3] IN (1086803) OR DivAirportSeqIDs[4] IN (1086803) OR DivAirportSeqIDs[5] IN (1086803)) OR DestCityName BETWEEN 'Yuma, AZ' AND 'Deadhorse, AK' ORDER BY LongestAddGTime, Dest, ArrivalDelayGroups LIMIT 10000"]}
 {"sql":"SELECT DestWac FROM mytable WHERE WheelsOn IN (1748, 1036) AND AirTime IN (277, 42, 377, 24, 330) OR TotalAddGTime <> 31 ORDER BY CRSArrTime LIMIT 16"}
 {"sql":"SELECT SUM(CRSDepTime) FROM mytable WHERE NASDelay IN (56, 185, 99) OR DivArrDelay BETWEEN 217 AND 135 LIMIT 13"}
 {"sql":"SELECT CRSArrTime, COUNT(OriginAirportSeqID), MIN(AirTime) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 27","hsqls":["SELECT CRSArrTime, COUNT(OriginAirportSeqID), MIN(AirTime) FROM mytable GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 27"]}
-{"sql":"SELECT ArrDelayMinutes, COUNT(DayofMonth) FROM mytable WHERE DivTailNums IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR Carrier <= 'AS' OR Distance > 1530 GROUP BY ArrDelayMinutes LIMIT 15","hsqls":["SELECT ArrDelayMinutes, COUNT(DayofMonth) FROM mytable WHERE (DivTailNums__MV0 IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums__MV1 IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums__MV2 IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums__MV3 IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums__MV4 IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441')) OR Carrier <= 'AS' OR Distance > 1530 GROUP BY ArrDelayMinutes LIMIT 10000"]}
+{"sql":"SELECT ArrDelayMinutes, COUNT(DayofMonth) FROM mytable WHERE DivTailNums IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR Carrier <= 'AS' OR Distance > 1530 GROUP BY ArrDelayMinutes LIMIT 15","hsqls":["SELECT ArrDelayMinutes, COUNT(DayofMonth) FROM mytable WHERE (DivTailNums[1] IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums[2] IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums[3] IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums[4] IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441') OR DivTailNums[5] IN ('N3773D', 'N594AA', 'N3EVAA', 'N14174', 'N53441')) OR Carrier <= 'AS' OR Distance > 1530 GROUP BY ArrDelayMinutes LIMIT 10000"]}
 {"sql":"SELECT CRSArrTime FROM mytable ORDER BY OriginAirportSeqID, ArrTime, OriginAirportID LIMIT 15"}
-{"sql":"SELECT TaxiOut, DivAirports FROM mytable ORDER BY ArrTime, DivAirportLandings, OriginStateName LIMIT 20","hsqls":["SELECT TaxiOut, DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4 FROM mytable ORDER BY ArrTime, DivAirportLandings, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, DivAirports FROM mytable ORDER BY ArrTime, DivAirportLandings, OriginStateName LIMIT 20","hsqls":["SELECT TaxiOut, DivAirports FROM mytable ORDER BY ArrTime, DivAirportLandings, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT Distance FROM mytable WHERE DayofMonth NOT IN (7, 4, 17) LIMIT 26"}
 {"sql":"SELECT CarrierDelay, DestAirportID FROM mytable ORDER BY FlightNum LIMIT 7"}
 {"sql":"SELECT FlightNum, SecurityDelay, COUNT(*) FROM mytable WHERE FlightDate >= '2014-01-01' GROUP BY FlightNum, SecurityDelay  ORDER BY FlightNum, SecurityDelay LIMIT 4","hsqls":["SELECT FlightNum, SecurityDelay, COUNT(*) FROM mytable WHERE FlightDate >= '2014-01-01' GROUP BY FlightNum, SecurityDelay  ORDER BY FlightNum, SecurityDelay LIMIT 4"]}
 {"sql":"SELECT DestStateFips, ArrDelayMinutes, OriginWac FROM mytable WHERE NASDelay BETWEEN 41 AND 31 ORDER BY CRSElapsedTime"}
 {"sql":"SELECT Cancelled FROM mytable WHERE DivActualElapsedTime IN (396) OR Distance < 552 OR ArrivalDelayGroups <= 6 ORDER BY Quarter, DivAirportLandings, CRSElapsedTime LIMIT 17"}
-{"sql":"SELECT DivWheelsOns, DestWac, AirTime FROM mytable WHERE WeatherDelay > 15 LIMIT 19","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, DestWac, AirTime FROM mytable WHERE WeatherDelay > 15 LIMIT 10000"]}
-{"sql":"SELECT Dest, CancellationCode FROM mytable WHERE TailNum < 'N21154' OR DivTailNums >= 'N728SW' LIMIT 10","hsqls":["SELECT Dest, CancellationCode FROM mytable WHERE TailNum < 'N21154' OR (DivTailNums__MV0 >= 'N728SW' OR DivTailNums__MV1 >= 'N728SW' OR DivTailNums__MV2 >= 'N728SW' OR DivTailNums__MV3 >= 'N728SW' OR DivTailNums__MV4 >= 'N728SW') LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, DestWac, AirTime FROM mytable WHERE WeatherDelay > 15 LIMIT 19","hsqls":["SELECT DivWheelsOns, DestWac, AirTime FROM mytable WHERE WeatherDelay > 15 LIMIT 10000"]}
+{"sql":"SELECT Dest, CancellationCode FROM mytable WHERE TailNum < 'N21154' OR DivTailNums >= 'N728SW' LIMIT 10","hsqls":["SELECT Dest, CancellationCode FROM mytable WHERE TailNum < 'N21154' OR (DivTailNums[1] >= 'N728SW' OR DivTailNums[2] >= 'N728SW' OR DivTailNums[3] >= 'N728SW' OR DivTailNums[4] >= 'N728SW' OR DivTailNums[5] >= 'N728SW') LIMIT 10000"]}
 {"sql":"SELECT WheelsOff, ArrDel15, DayOfWeek, AVG(OriginWac), SUM(AirTime) FROM mytable WHERE CRSDepTime <> 1717 GROUP BY WheelsOff, ArrDel15, DayOfWeek  ORDER BY WheelsOff, ArrDel15, DayOfWeek LIMIT 15","hsqls":["SELECT WheelsOff, ArrDel15, DayOfWeek, AVG(OriginWac), SUM(AirTime) FROM mytable WHERE CRSDepTime <> 1717 GROUP BY WheelsOff, ArrDel15, DayOfWeek  ORDER BY WheelsOff, ArrDel15, DayOfWeek LIMIT 15"]}
 {"sql":"SELECT FlightDate FROM mytable WHERE Quarter IN (1) LIMIT 7"}
 {"sql":"SELECT LongestAddGTime, Distance FROM mytable WHERE ArrDel15 BETWEEN -9999 AND 0 ORDER BY FlightNum, CRSArrTime LIMIT 17"}
-{"sql":"SELECT DivWheelsOns, LateAircraftDelay FROM mytable WHERE ArrTime <> 518 AND TailNum BETWEEN 'N694DL' AND 'N403UA' AND Diverted <= 1 ORDER BY Diverted, OriginAirportID LIMIT 10","hsqls":["SELECT DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, LateAircraftDelay FROM mytable WHERE ArrTime <> 518 AND TailNum BETWEEN 'N694DL' AND 'N403UA' AND Diverted <= 1 ORDER BY Diverted, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivWheelsOns, LateAircraftDelay FROM mytable WHERE ArrTime <> 518 AND TailNum BETWEEN 'N694DL' AND 'N403UA' AND Diverted <= 1 ORDER BY Diverted, OriginAirportID LIMIT 10","hsqls":["SELECT DivWheelsOns, LateAircraftDelay FROM mytable WHERE ArrTime <> 518 AND TailNum BETWEEN 'N694DL' AND 'N403UA' AND Diverted <= 1 ORDER BY Diverted, OriginAirportID LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DestStateName, MAX(SecurityDelay), MIN(DivReachedDest) FROM mytable WHERE CRSElapsedTime IN (505, 354, 387, 155, 321) OR DepTimeBlk BETWEEN '0600-0659' AND '2000-2059' GROUP BY CarrierDelay, DestStateName  ORDER BY CarrierDelay, DestStateName LIMIT 27","hsqls":["SELECT CarrierDelay, DestStateName, MAX(SecurityDelay), MIN(DivReachedDest) FROM mytable WHERE CRSElapsedTime IN (505, 354, 387, 155, 321) OR DepTimeBlk BETWEEN '0600-0659' AND '2000-2059' GROUP BY CarrierDelay, DestStateName  ORDER BY CarrierDelay, DestStateName LIMIT 27"]}
 {"sql":"SELECT DivDistance, CarrierDelay, COUNT(TaxiIn) FROM mytable GROUP BY DivDistance, CarrierDelay  ORDER BY DivDistance, CarrierDelay LIMIT 20","hsqls":["SELECT DivDistance, CarrierDelay, COUNT(TaxiIn) FROM mytable GROUP BY DivDistance, CarrierDelay  ORDER BY DivDistance, CarrierDelay LIMIT 20"]}
-{"sql":"SELECT FirstDepTime, DivAirportSeqIDs, ArrDelay FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 334.0 ORDER BY DepartureDelayGroups, DepDelay, ArrDel15 LIMIT 16","hsqls":["SELECT FirstDepTime, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, ArrDelay FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 334.0 ORDER BY DepartureDelayGroups, DepDelay, ArrDel15 LIMIT 10000"]}
-{"sql":"SELECT COUNT(DestWac), MAX(\"Month\") FROM mytable WHERE TailNum BETWEEN 'N218WN' AND 'N209WN' AND UniqueCarrier = 'F9' LIMIT 18","hsqls":["SELECT COUNT(DestWac), MAX(Month) FROM mytable WHERE TailNum BETWEEN 'N218WN' AND 'N209WN' AND UniqueCarrier = 'F9' LIMIT 18"]}
+{"sql":"SELECT FirstDepTime, DivAirportSeqIDs, ArrDelay FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 334.0 ORDER BY DepartureDelayGroups, DepDelay, ArrDel15 LIMIT 16","hsqls":["SELECT FirstDepTime, DivAirportSeqIDs, ArrDelay FROM mytable WHERE DepDelayMinutes BETWEEN 146.0 AND 334.0 ORDER BY DepartureDelayGroups, DepDelay, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT COUNT(DestWac), MAX(\"Month\") FROM mytable WHERE TailNum BETWEEN 'N218WN' AND 'N209WN' AND UniqueCarrier = 'F9' LIMIT 18","hsqls":["SELECT COUNT(DestWac), MAX(`Month`) FROM mytable WHERE TailNum BETWEEN 'N218WN' AND 'N209WN' AND UniqueCarrier = 'F9' LIMIT 18"]}
 {"sql":"SELECT CancellationCode, OriginAirportID, MIN(ArrDelayMinutes), SUM(DepDel15), SUM(DistanceGroup) FROM mytable WHERE CRSDepTime BETWEEN 1407 AND 1522 OR OriginCityMarketID NOT IN (30732, 34457, 31122) AND Flights BETWEEN 1 AND 1 GROUP BY CancellationCode, OriginAirportID  ORDER BY CancellationCode, OriginAirportID LIMIT 23","hsqls":["SELECT CancellationCode, OriginAirportID, MIN(ArrDelayMinutes), SUM(DepDel15), SUM(DistanceGroup) FROM mytable WHERE CRSDepTime BETWEEN 1407 AND 1522 OR OriginCityMarketID NOT IN (30732, 34457, 31122) AND Flights BETWEEN 1 AND 1 GROUP BY CancellationCode, OriginAirportID  ORDER BY CancellationCode, OriginAirportID LIMIT 23"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE WheelsOff >= 1841 AND DivTotalGTimes BETWEEN 21 AND 11 LIMIT 24","hsqls":["SELECT COUNT(*) FROM mytable WHERE WheelsOff >= 1841 AND (DivTotalGTimes__MV0 BETWEEN 21 AND 11 OR DivTotalGTimes__MV1 BETWEEN 21 AND 11 OR DivTotalGTimes__MV2 BETWEEN 21 AND 11 OR DivTotalGTimes__MV3 BETWEEN 21 AND 11 OR DivTotalGTimes__MV4 BETWEEN 21 AND 11) LIMIT 10000"]}
-{"sql":"SELECT ArrTime, ActualElapsedTime, ArrTimeBlk, SUM(FirstDepTime), MIN(DestAirportID), COUNT(ArrDelay) FROM mytable WHERE DivAirportSeqIDs IN (1079204, 1425202, 1289605, 1190502) OR DepDelayMinutes < 340.0 OR Carrier IN ('DL', 'B6', 'US', 'OO', 'AA') GROUP BY ArrTime, ActualElapsedTime, ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrTime, ActualElapsedTime, ArrTimeBlk, SUM(FirstDepTime), MIN(DestAirportID), COUNT(ArrDelay) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs__MV1 IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs__MV2 IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs__MV3 IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs__MV4 IN (1079204, 1425202, 1289605, 1190502)) OR DepDelayMinutes < 340.0 OR Carrier IN ('DL', 'B6', 'US', 'OO', 'AA') GROUP BY ArrTime, ActualElapsedTime, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE WheelsOff >= 1841 AND DivTotalGTimes BETWEEN 21 AND 11 LIMIT 24","hsqls":["SELECT COUNT(*) FROM mytable WHERE WheelsOff >= 1841 AND (DivTotalGTimes[1] BETWEEN 21 AND 11 OR DivTotalGTimes[2] BETWEEN 21 AND 11 OR DivTotalGTimes[3] BETWEEN 21 AND 11 OR DivTotalGTimes[4] BETWEEN 21 AND 11 OR DivTotalGTimes[5] BETWEEN 21 AND 11) LIMIT 10000"]}
+{"sql":"SELECT ArrTime, ActualElapsedTime, ArrTimeBlk, SUM(FirstDepTime), MIN(DestAirportID), COUNT(ArrDelay) FROM mytable WHERE DivAirportSeqIDs IN (1079204, 1425202, 1289605, 1190502) OR DepDelayMinutes < 340.0 OR Carrier IN ('DL', 'B6', 'US', 'OO', 'AA') GROUP BY ArrTime, ActualElapsedTime, ArrTimeBlk LIMIT 10","hsqls":["SELECT ArrTime, ActualElapsedTime, ArrTimeBlk, SUM(FirstDepTime), MIN(DestAirportID), COUNT(ArrDelay) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs[2] IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs[3] IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs[4] IN (1079204, 1425202, 1289605, 1190502) OR DivAirportSeqIDs[5] IN (1079204, 1425202, 1289605, 1190502)) OR DepDelayMinutes < 340.0 OR Carrier IN ('DL', 'B6', 'US', 'OO', 'AA') GROUP BY ArrTime, ActualElapsedTime, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest FROM mytable LIMIT 3"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE OriginState BETWEEN 'SD' AND 'MS' AND DivAirportLandings BETWEEN 1 AND 9 AND Quarter < 1 ORDER BY OriginState, ArrDel15 LIMIT 2"}
 {"sql":"SELECT DepTime, ArrTimeBlk, ArrivalDelayGroups FROM mytable WHERE ArrDel15 <> 1 ORDER BY Dest LIMIT 22"}
 {"sql":"SELECT COUNT(Quarter), SUM(ArrDelayMinutes), SUM(DestAirportSeqID) FROM mytable LIMIT 29"}
-{"sql":"SELECT ArrDelay, OriginStateName, AVG(Diverted), MAX(FlightNum) FROM mytable WHERE ArrivalDelayGroups <= 8 OR DivAirportSeqIDs BETWEEN 1382902 AND 1161802 GROUP BY ArrDelay, OriginStateName LIMIT 15","hsqls":["SELECT ArrDelay, OriginStateName, AVG(Diverted), MAX(FlightNum) FROM mytable WHERE ArrivalDelayGroups <= 8 OR (DivAirportSeqIDs__MV0 BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs__MV1 BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs__MV2 BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs__MV3 BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs__MV4 BETWEEN 1382902 AND 1161802) GROUP BY ArrDelay, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT ArrDelay, OriginStateName, AVG(Diverted), MAX(FlightNum) FROM mytable WHERE ArrivalDelayGroups <= 8 OR DivAirportSeqIDs BETWEEN 1382902 AND 1161802 GROUP BY ArrDelay, OriginStateName LIMIT 15","hsqls":["SELECT ArrDelay, OriginStateName, AVG(Diverted), MAX(FlightNum) FROM mytable WHERE ArrivalDelayGroups <= 8 OR (DivAirportSeqIDs[1] BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs[2] BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs[3] BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs[4] BETWEEN 1382902 AND 1161802 OR DivAirportSeqIDs[5] BETWEEN 1382902 AND 1161802) GROUP BY ArrDelay, OriginStateName LIMIT 10000"]}
 {"sql":"SELECT OriginAirportSeqID, DepDelayMinutes, CRSElapsedTime FROM mytable WHERE OriginCityName BETWEEN 'Miami, FL' AND 'Mammoth Lakes, CA' AND AirlineID BETWEEN 20409 AND 20409 ORDER BY OriginCityMarketID LIMIT 27"}
 {"sql":"SELECT CarrierDelay, DivAirportLandings FROM mytable LIMIT 15"}
 {"sql":"SELECT MIN(CRSArrTime) FROM mytable"}
@@ -9707,51 +9707,51 @@
 {"sql":"SELECT TaxiOut, AirTime, OriginAirportID FROM mytable WHERE DestStateName = 'South Carolina' ORDER BY LateAircraftDelay LIMIT 4"}
 {"sql":"SELECT Cancelled, ArrDelay, DivActualElapsedTime FROM mytable WHERE Diverted BETWEEN 0 AND 1 OR Diverted = 1 ORDER BY DistanceGroup, DestWac, OriginCityMarketID LIMIT 27"}
 {"sql":"SELECT OriginAirportSeqID, DepTimeBlk FROM mytable ORDER BY FirstDepTime LIMIT 9"}
-{"sql":"SELECT ActualElapsedTime, DaysSinceEpoch, COUNT(ArrivalDelayGroups), SUM(WheelsOff) FROM mytable WHERE DepTimeBlk BETWEEN '1700-1759' AND '0700-0759' AND WheelsOn NOT IN (826) AND DivTotalGTimes IN (21, 68, 109) GROUP BY ActualElapsedTime, DaysSinceEpoch LIMIT 2","hsqls":["SELECT ActualElapsedTime, DaysSinceEpoch, COUNT(ArrivalDelayGroups), SUM(WheelsOff) FROM mytable WHERE DepTimeBlk BETWEEN '1700-1759' AND '0700-0759' AND WheelsOn NOT IN (826) AND (DivTotalGTimes__MV0 IN (21, 68, 109) OR DivTotalGTimes__MV1 IN (21, 68, 109) OR DivTotalGTimes__MV2 IN (21, 68, 109) OR DivTotalGTimes__MV3 IN (21, 68, 109) OR DivTotalGTimes__MV4 IN (21, 68, 109)) GROUP BY ActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, DaysSinceEpoch, COUNT(ArrivalDelayGroups), SUM(WheelsOff) FROM mytable WHERE DepTimeBlk BETWEEN '1700-1759' AND '0700-0759' AND WheelsOn NOT IN (826) AND DivTotalGTimes IN (21, 68, 109) GROUP BY ActualElapsedTime, DaysSinceEpoch LIMIT 2","hsqls":["SELECT ActualElapsedTime, DaysSinceEpoch, COUNT(ArrivalDelayGroups), SUM(WheelsOff) FROM mytable WHERE DepTimeBlk BETWEEN '1700-1759' AND '0700-0759' AND WheelsOn NOT IN (826) AND (DivTotalGTimes[1] IN (21, 68, 109) OR DivTotalGTimes[2] IN (21, 68, 109) OR DivTotalGTimes[3] IN (21, 68, 109) OR DivTotalGTimes[4] IN (21, 68, 109) OR DivTotalGTimes[5] IN (21, 68, 109)) GROUP BY ActualElapsedTime, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT Quarter, Flights, DivArrDelay FROM mytable WHERE DepDelay >= 95.0 OR WheelsOff NOT IN (1532, 1338, 2100, 708, 1739) ORDER BY Flights LIMIT 10"}
 {"sql":"SELECT ArrTime FROM mytable ORDER BY DestWac, Distance LIMIT 20"}
 {"sql":"SELECT ArrTimeBlk, ArrivalDelayGroups FROM mytable ORDER BY TaxiOut, DestStateName LIMIT 10"}
 {"sql":"SELECT Flights FROM mytable WHERE ArrivalDelayGroups BETWEEN 8 AND 8 AND UniqueCarrier BETWEEN 'EV' AND 'UA' OR LateAircraftDelay IN (145, 105, 70, 50) LIMIT 23"}
-{"sql":"SELECT DivReachedDest, \"Year\", MAX(SecurityDelay), MIN(DivDistance), SUM(SecurityDelay) FROM mytable WHERE Quarter IN (1) AND ArrTimeBlk <= '2300-2359' OR \"Year\" < 2014 GROUP BY DivReachedDest, \"Year\" LIMIT 25","hsqls":["SELECT DivReachedDest, Year, MAX(SecurityDelay), MIN(DivDistance), SUM(SecurityDelay) FROM mytable WHERE Quarter IN (1) AND ArrTimeBlk <= '2300-2359' OR Year < 2014 GROUP BY DivReachedDest, Year LIMIT 25"]}
+{"sql":"SELECT DivReachedDest, \"Year\", MAX(SecurityDelay), MIN(DivDistance), SUM(SecurityDelay) FROM mytable WHERE Quarter IN (1) AND ArrTimeBlk <= '2300-2359' OR \"Year\" < 2014 GROUP BY DivReachedDest, \"Year\" LIMIT 25","hsqls":["SELECT DivReachedDest, Year, MAX(SecurityDelay), MIN(DivDistance), SUM(SecurityDelay) FROM mytable WHERE Quarter IN (1) AND ArrTimeBlk <= '2300-2359' OR `Year` < 2014 GROUP BY DivReachedDest, `Year` LIMIT 25"]}
 {"sql":"SELECT AVG(Diverted), AVG(DepDelay) FROM mytable WHERE OriginAirportID IN (12896, 10918, 13232) AND Quarter <> 1 LIMIT 18"}
 {"sql":"SELECT DepDelayMinutes, SUM(DivAirportLandings), MIN(OriginAirportID), COUNT(AirlineID) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 4","hsqls":["SELECT DepDelayMinutes, SUM(DivAirportLandings), MIN(OriginAirportID), COUNT(AirlineID) FROM mytable GROUP BY DepDelayMinutes  ORDER BY DepDelayMinutes LIMIT 4"]}
 {"sql":"SELECT OriginCityMarketID, ArrDelayMinutes, DestAirportID, COUNT(*) FROM mytable WHERE DayOfWeek > 3 GROUP BY OriginCityMarketID, ArrDelayMinutes, DestAirportID  ORDER BY OriginCityMarketID, ArrDelayMinutes, DestAirportID LIMIT 7","hsqls":["SELECT OriginCityMarketID, ArrDelayMinutes, DestAirportID, COUNT(*) FROM mytable WHERE DayOfWeek > 3 GROUP BY OriginCityMarketID, ArrDelayMinutes, DestAirportID  ORDER BY OriginCityMarketID, ArrDelayMinutes, DestAirportID LIMIT 7"]}
 {"sql":"SELECT OriginAirportSeqID, TailNum, COUNT(TaxiIn), SUM(DepDelayMinutes), COUNT(FlightDate) FROM mytable WHERE LongestAddGTime = 54 GROUP BY OriginAirportSeqID, TailNum  ORDER BY OriginAirportSeqID, TailNum LIMIT 4","hsqls":["SELECT OriginAirportSeqID, TailNum, COUNT(TaxiIn), SUM(DepDelayMinutes), COUNT(FlightDate) FROM mytable WHERE LongestAddGTime = 54 GROUP BY OriginAirportSeqID, TailNum  ORDER BY OriginAirportSeqID, TailNum LIMIT 4"]}
 {"sql":"SELECT OriginStateFips, DepTimeBlk FROM mytable ORDER BY Dest LIMIT 1"}
 {"sql":"SELECT DestAirportSeqID, UniqueCarrier FROM mytable WHERE Diverted BETWEEN 1 AND 0 OR DepTime <= 420 ORDER BY DestWac, Distance LIMIT 24"}
-{"sql":"SELECT DestStateFips, DestCityMarketID, AVG(DestAirportSeqID), AVG(LongestAddGTime), MAX(TaxiOut) FROM mytable WHERE DepDelay >= 45.0 AND DivAirportIDs IN (12448, 12892, 12278, 10693, 16271) GROUP BY DestStateFips, DestCityMarketID LIMIT 19","hsqls":["SELECT DestStateFips, DestCityMarketID, AVG(DestAirportSeqID), AVG(LongestAddGTime), MAX(TaxiOut) FROM mytable WHERE DepDelay >= 45.0 AND (DivAirportIDs__MV0 IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs__MV1 IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs__MV2 IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs__MV3 IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs__MV4 IN (12448, 12892, 12278, 10693, 16271)) GROUP BY DestStateFips, DestCityMarketID LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, DestCityMarketID, AVG(DestAirportSeqID), AVG(LongestAddGTime), MAX(TaxiOut) FROM mytable WHERE DepDelay >= 45.0 AND DivAirportIDs IN (12448, 12892, 12278, 10693, 16271) GROUP BY DestStateFips, DestCityMarketID LIMIT 19","hsqls":["SELECT DestStateFips, DestCityMarketID, AVG(DestAirportSeqID), AVG(LongestAddGTime), MAX(TaxiOut) FROM mytable WHERE DepDelay >= 45.0 AND (DivAirportIDs[1] IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs[2] IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs[3] IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs[4] IN (12448, 12892, 12278, 10693, 16271) OR DivAirportIDs[5] IN (12448, 12892, 12278, 10693, 16271)) GROUP BY DestStateFips, DestCityMarketID LIMIT 10000"]}
 {"sql":"SELECT DepartureDelayGroups, FlightNum, DestStateName FROM mytable LIMIT 1"}
-{"sql":"SELECT DestStateFips, AVG(OriginWac) FROM mytable WHERE DivTailNums BETWEEN 'N937EV' AND 'N336AA' OR FlightDate IN ('2014-01-23', '2014-01-15', '2014-01-11', '2014-01-25') GROUP BY DestStateFips LIMIT 2","hsqls":["SELECT DestStateFips, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums__MV1 BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums__MV2 BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums__MV3 BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums__MV4 BETWEEN 'N937EV' AND 'N336AA') OR FlightDate IN ('2014-01-23', '2014-01-15', '2014-01-11', '2014-01-25') GROUP BY DestStateFips LIMIT 10000"]}
-{"sql":"SELECT MIN(OriginWac) FROM mytable WHERE DivAirportIDs <= 12335 LIMIT 20","hsqls":["SELECT MIN(OriginWac) FROM mytable WHERE (DivAirportIDs__MV0 <= 12335 OR DivAirportIDs__MV1 <= 12335 OR DivAirportIDs__MV2 <= 12335 OR DivAirportIDs__MV3 <= 12335 OR DivAirportIDs__MV4 <= 12335) LIMIT 10000"]}
-{"sql":"SELECT Diverted, AirlineID FROM mytable WHERE DivTailNums >= 'N14180' AND DestCityName IN ('Providence, RI') ORDER BY Distance, DepTimeBlk, DivArrDelay LIMIT 4","hsqls":["SELECT Diverted, AirlineID FROM mytable WHERE (DivTailNums__MV0 >= 'N14180' OR DivTailNums__MV1 >= 'N14180' OR DivTailNums__MV2 >= 'N14180' OR DivTailNums__MV3 >= 'N14180' OR DivTailNums__MV4 >= 'N14180') AND DestCityName IN ('Providence, RI') ORDER BY Distance, DepTimeBlk, DivArrDelay LIMIT 10000"]}
+{"sql":"SELECT DestStateFips, AVG(OriginWac) FROM mytable WHERE DivTailNums BETWEEN 'N937EV' AND 'N336AA' OR FlightDate IN ('2014-01-23', '2014-01-15', '2014-01-11', '2014-01-25') GROUP BY DestStateFips LIMIT 2","hsqls":["SELECT DestStateFips, AVG(CAST(OriginWac AS DOUBLE)) FROM mytable WHERE (DivTailNums[1] BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums[2] BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums[3] BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums[4] BETWEEN 'N937EV' AND 'N336AA' OR DivTailNums[5] BETWEEN 'N937EV' AND 'N336AA') OR FlightDate IN ('2014-01-23', '2014-01-15', '2014-01-11', '2014-01-25') GROUP BY DestStateFips LIMIT 10000"]}
+{"sql":"SELECT MIN(OriginWac) FROM mytable WHERE DivAirportIDs <= 12335 LIMIT 20","hsqls":["SELECT MIN(OriginWac) FROM mytable WHERE (DivAirportIDs[1] <= 12335 OR DivAirportIDs[2] <= 12335 OR DivAirportIDs[3] <= 12335 OR DivAirportIDs[4] <= 12335 OR DivAirportIDs[5] <= 12335) LIMIT 10000"]}
+{"sql":"SELECT Diverted, AirlineID FROM mytable WHERE DivTailNums >= 'N14180' AND DestCityName IN ('Providence, RI') ORDER BY Distance, DepTimeBlk, DivArrDelay LIMIT 4","hsqls":["SELECT Diverted, AirlineID FROM mytable WHERE (DivTailNums[1] >= 'N14180' OR DivTailNums[2] >= 'N14180' OR DivTailNums[3] >= 'N14180' OR DivTailNums[4] >= 'N14180' OR DivTailNums[5] >= 'N14180') AND DestCityName IN ('Providence, RI') ORDER BY Distance, DepTimeBlk, DivArrDelay LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, TotalAddGTime, CRSDepTime FROM mytable ORDER BY Carrier, FlightNum, FlightDate LIMIT 18"}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE DayOfWeek NOT IN (1, 4) AND TaxiOut IN (57, 73) ORDER BY WheelsOff, UniqueCarrier, DayOfWeek LIMIT 2"}
 {"sql":"SELECT TotalAddGTime FROM mytable LIMIT 25"}
-{"sql":"SELECT COUNT(DepartureDelayGroups), COUNT(LateAircraftDelay), MIN(FirstDepTime) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 2 OR DivTotalGTimes BETWEEN 121 AND 92 LIMIT 4","hsqls":["SELECT COUNT(DepartureDelayGroups), COUNT(LateAircraftDelay), MIN(FirstDepTime)  FROM mytable WHERE DistanceGroup BETWEEN 3 AND 2 OR (DivTotalGTimes__MV0 BETWEEN 121 AND 92 OR DivTotalGTimes__MV1 BETWEEN 121 AND 92 OR DivTotalGTimes__MV2 BETWEEN 121 AND 92 OR DivTotalGTimes__MV3 BETWEEN 121 AND 92 OR DivTotalGTimes__MV4 BETWEEN 121 AND 92) LIMIT 10000"]}
+{"sql":"SELECT COUNT(DepartureDelayGroups), COUNT(LateAircraftDelay), MIN(FirstDepTime) FROM mytable WHERE DistanceGroup BETWEEN 3 AND 2 OR DivTotalGTimes BETWEEN 121 AND 92 LIMIT 4","hsqls":["SELECT COUNT(DepartureDelayGroups), COUNT(LateAircraftDelay), MIN(FirstDepTime)  FROM mytable WHERE DistanceGroup BETWEEN 3 AND 2 OR (DivTotalGTimes[1] BETWEEN 121 AND 92 OR DivTotalGTimes[2] BETWEEN 121 AND 92 OR DivTotalGTimes[3] BETWEEN 121 AND 92 OR DivTotalGTimes[4] BETWEEN 121 AND 92 OR DivTotalGTimes[5] BETWEEN 121 AND 92) LIMIT 10000"]}
 {"sql":"SELECT DestStateName, COUNT(*) FROM mytable GROUP BY DestStateName","hsqls":["SELECT DestStateName, COUNT(*) FROM mytable GROUP BY DestStateName"]}
-{"sql":"SELECT DistanceGroup, DepTimeBlk, WheelsOn, SUM(NASDelay), SUM(\"Month\"), MAX(DivActualElapsedTime) FROM mytable WHERE DivAirportIDs < 10627 GROUP BY DistanceGroup, DepTimeBlk, WheelsOn LIMIT 8","hsqls":["SELECT DistanceGroup, DepTimeBlk, WheelsOn, SUM(NASDelay), SUM(Month), MAX(DivActualElapsedTime) FROM mytable WHERE (DivAirportIDs__MV0 < 10627 OR DivAirportIDs__MV1 < 10627 OR DivAirportIDs__MV2 < 10627 OR DivAirportIDs__MV3 < 10627 OR DivAirportIDs__MV4 < 10627) GROUP BY DistanceGroup, DepTimeBlk, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, DepTimeBlk, WheelsOn, SUM(NASDelay), SUM(\"Month\"), MAX(DivActualElapsedTime) FROM mytable WHERE DivAirportIDs < 10627 GROUP BY DistanceGroup, DepTimeBlk, WheelsOn LIMIT 8","hsqls":["SELECT DistanceGroup, DepTimeBlk, WheelsOn, SUM(NASDelay), SUM(`Month`), MAX(DivActualElapsedTime) FROM mytable WHERE (DivAirportIDs[1] < 10627 OR DivAirportIDs[2] < 10627 OR DivAirportIDs[3] < 10627 OR DivAirportIDs[4] < 10627 OR DivAirportIDs[5] < 10627) GROUP BY DistanceGroup, DepTimeBlk, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginStateFips = 4 OR TotalAddGTime BETWEEN 32 AND 40 OR OriginWac BETWEEN 64 AND 21 LIMIT 5"}
 {"sql":"SELECT WeatherDelay, ArrTimeBlk, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivArrDelay <= 118 AND CRSArrTime BETWEEN 1937 AND 1838 AND AirlineID NOT IN (20436, 20366) GROUP BY WeatherDelay, ArrTimeBlk, DaysSinceEpoch  ORDER BY WeatherDelay, ArrTimeBlk, DaysSinceEpoch LIMIT 17","hsqls":["SELECT WeatherDelay, ArrTimeBlk, DaysSinceEpoch, COUNT(*) FROM mytable WHERE DivArrDelay <= 118 AND CRSArrTime BETWEEN 1937 AND 1838 AND AirlineID NOT IN (20436, 20366) GROUP BY WeatherDelay, ArrTimeBlk, DaysSinceEpoch  ORDER BY WeatherDelay, ArrTimeBlk, DaysSinceEpoch LIMIT 17"]}
-{"sql":"SELECT \"Year\", COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-08') AND DivAirportSeqIDs IN (1411302, 1018502, 1584102) GROUP BY \"Year\" LIMIT 10","hsqls":["SELECT Year, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-08') AND (DivAirportSeqIDs__MV0 IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs__MV1 IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs__MV2 IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs__MV3 IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs__MV4 IN (1411302, 1018502, 1584102)) GROUP BY Year LIMIT 10000"]}
+{"sql":"SELECT \"Year\", COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-08') AND DivAirportSeqIDs IN (1411302, 1018502, 1584102) GROUP BY \"Year\" LIMIT 10","hsqls":["SELECT Year, COUNT(*) FROM mytable WHERE FlightDate IN ('2014-01-08') AND (DivAirportSeqIDs[1] IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs[2] IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs[3] IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs[4] IN (1411302, 1018502, 1584102) OR DivAirportSeqIDs[5] IN (1411302, 1018502, 1584102)) GROUP BY `Year` LIMIT 10000"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE OriginState NOT IN ('NC', 'LA', 'DE', 'NY', 'AL') OR OriginCityMarketID <> 32758"}
 {"sql":"SELECT SecurityDelay, DestAirportID FROM mytable WHERE TotalAddGTime IN (41, 31, 39, 29) ORDER BY OriginState, ActualElapsedTime, DepDel15 LIMIT 25"}
-{"sql":"SELECT \"Year\", COUNT(DepDel15), AVG(Distance), MAX(FlightNum) FROM mytable WHERE ArrDelay <> 84.0 OR CRSArrTime NOT IN (1550, 626, 937, 2242) OR ActualElapsedTime = 265 GROUP BY \"Year\" LIMIT 5","hsqls":["SELECT Year, COUNT(DepDel15), AVG(Distance), MAX(FlightNum) FROM mytable WHERE ArrDelay <> 84.0 OR CRSArrTime NOT IN (1550, 626, 937, 2242) OR ActualElapsedTime = 265 GROUP BY Year LIMIT 5"]}
+{"sql":"SELECT \"Year\", COUNT(DepDel15), AVG(Distance), MAX(FlightNum) FROM mytable WHERE ArrDelay <> 84.0 OR CRSArrTime NOT IN (1550, 626, 937, 2242) OR ActualElapsedTime = 265 GROUP BY \"Year\" LIMIT 5","hsqls":["SELECT Year, COUNT(DepDel15), AVG(Distance), MAX(FlightNum) FROM mytable WHERE ArrDelay <> 84.0 OR CRSArrTime NOT IN (1550, 626, 937, 2242) OR ActualElapsedTime = 265 GROUP BY `Year` LIMIT 5"]}
 {"sql":"SELECT TaxiOut, Flights FROM mytable ORDER BY DivAirportLandings, \"Month\", WheelsOn LIMIT 28","hsqls":["SELECT TaxiOut, Flights FROM mytable ORDER BY DivAirportLandings, Month, WheelsOn LIMIT 28"]}
 {"sql":"SELECT DestState, LateAircraftDelay, MIN(WheelsOff) FROM mytable WHERE TaxiOut BETWEEN 10 AND 54 OR DepDelay NOT IN (181.0, -4.0) AND OriginAirportSeqID IN (1075402) GROUP BY DestState, LateAircraftDelay  ORDER BY DestState, LateAircraftDelay LIMIT 12","hsqls":["SELECT DestState, LateAircraftDelay, MIN(WheelsOff) FROM mytable WHERE TaxiOut BETWEEN 10 AND 54 OR DepDelay NOT IN (181.0, -4.0) AND OriginAirportSeqID IN (1075402) GROUP BY DestState, LateAircraftDelay  ORDER BY DestState, LateAircraftDelay LIMIT 12"]}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE DistanceGroup NOT IN (3) AND OriginCityMarketID BETWEEN 31049 AND 33873 ORDER BY LateAircraftDelay LIMIT 12"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 11"}
 {"sql":"SELECT OriginStateFips, ActualElapsedTime, DepTimeBlk, SUM(DepDel15), AVG(ArrivalDelayGroups), MIN(DepDelay) FROM mytable GROUP BY OriginStateFips, ActualElapsedTime, DepTimeBlk  ORDER BY OriginStateFips, ActualElapsedTime, DepTimeBlk LIMIT 10","hsqls":["SELECT OriginStateFips, ActualElapsedTime, DepTimeBlk, SUM(DepDel15), AVG(ArrivalDelayGroups), MIN(DepDelay) FROM mytable GROUP BY OriginStateFips, ActualElapsedTime, DepTimeBlk  ORDER BY OriginStateFips, ActualElapsedTime, DepTimeBlk LIMIT 10"]}
-{"sql":"SELECT \"Year\" FROM mytable WHERE TaxiIn NOT IN (6, 33, 25) OR DivArrDelay NOT IN (604, 155, 844, 835) OR LongestAddGTime = 5 LIMIT 25","hsqls":["SELECT Year FROM mytable WHERE TaxiIn NOT IN (6, 33, 25) OR DivArrDelay NOT IN (604, 155, 844, 835) OR LongestAddGTime = 5 LIMIT 25"]}
+{"sql":"SELECT \"Year\" FROM mytable WHERE TaxiIn NOT IN (6, 33, 25) OR DivArrDelay NOT IN (604, 155, 844, 835) OR LongestAddGTime = 5 LIMIT 25","hsqls":["SELECT `Year` FROM mytable WHERE TaxiIn NOT IN (6, 33, 25) OR DivArrDelay NOT IN (604, 155, 844, 835) OR LongestAddGTime = 5 LIMIT 25"]}
 {"sql":"SELECT DestStateFips, DestCityName, COUNT(*) FROM mytable WHERE Cancelled >= 1 GROUP BY DestStateFips, DestCityName  ORDER BY DestStateFips, DestCityName LIMIT 6","hsqls":["SELECT DestStateFips, DestCityName, COUNT(*) FROM mytable WHERE Cancelled >= 1 GROUP BY DestStateFips, DestCityName  ORDER BY DestStateFips, DestCityName LIMIT 6"]}
 {"sql":"SELECT ArrTimeBlk, DepDel15, DivActualElapsedTime FROM mytable WHERE LongestAddGTime BETWEEN 128 AND 55 OR CRSArrTime BETWEEN 1229 AND 1611 ORDER BY OriginCityMarketID LIMIT 29"}
 {"sql":"SELECT TaxiOut, OriginWac, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DayofMonth < 4 AND DestStateFips IN (21, 51, 35, 36, 72) AND TaxiIn < 15 GROUP BY TaxiOut, OriginWac, ArrivalDelayGroups  ORDER BY TaxiOut, OriginWac, ArrivalDelayGroups LIMIT 22","hsqls":["SELECT TaxiOut, OriginWac, ArrivalDelayGroups, COUNT(*) FROM mytable WHERE DayofMonth < 4 AND DestStateFips IN (21, 51, 35, 36, 72) AND TaxiIn < 15 GROUP BY TaxiOut, OriginWac, ArrivalDelayGroups  ORDER BY TaxiOut, OriginWac, ArrivalDelayGroups LIMIT 22"]}
 {"sql":"SELECT TailNum FROM mytable ORDER BY TaxiIn LIMIT 27"}
 {"sql":"SELECT WeatherDelay, DestAirportSeqID FROM mytable WHERE DepTimeBlk BETWEEN '1200-1259' AND '1500-1559' ORDER BY \"Year\", OriginWac LIMIT 14","hsqls":["SELECT WeatherDelay, DestAirportSeqID FROM mytable WHERE DepTimeBlk BETWEEN '1200-1259' AND '1500-1559' ORDER BY Year, OriginWac LIMIT 14"]}
-{"sql":"SELECT \"Year\", ArrTime, DivTotalGTimes FROM mytable WHERE Distance BETWEEN 2218 AND 237 AND ArrDelayMinutes <= 234.0 ORDER BY WheelsOn LIMIT 5","hsqls":["SELECT Year, ArrTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE Distance BETWEEN 2218 AND 237 AND ArrDelayMinutes <= 234.0 ORDER BY WheelsOn LIMIT 10000"]}
+{"sql":"SELECT \"Year\", ArrTime, DivTotalGTimes FROM mytable WHERE Distance BETWEEN 2218 AND 237 AND ArrDelayMinutes <= 234.0 ORDER BY WheelsOn LIMIT 5","hsqls":["SELECT Year, ArrTime, DivTotalGTimes FROM mytable WHERE Distance BETWEEN 2218 AND 237 AND ArrDelayMinutes <= 234.0 ORDER BY WheelsOn LIMIT 10000"]}
 {"sql":"SELECT COUNT(CRSDepTime) FROM mytable WHERE DestCityName NOT IN ('Cordova, AK', 'North Bend/Coos Bay, OR') LIMIT 19"}
 {"sql":"SELECT ArrDelayMinutes, Dest FROM mytable WHERE CarrierDelay > 414 OR ArrDel15 > -9999 ORDER BY DestCityName, AirlineID"}
 {"sql":"SELECT NASDelay, ArrDel15 FROM mytable WHERE DivReachedDest NOT IN (1, 0) OR DestCityName BETWEEN 'Knoxville, TN' AND 'Hartford, CT' OR Quarter BETWEEN 1 AND 1 LIMIT 18"}
-{"sql":"SELECT SUM(CRSDepTime), COUNT(DistanceGroup), SUM(\"Year\") FROM mytable WHERE ArrDelayMinutes NOT IN (123.0) AND AirlineID NOT IN (19690, 20436, 20355) AND DivWheelsOffs > 1804 LIMIT 21","hsqls":["SELECT SUM(CRSDepTime), COUNT(DistanceGroup), SUM(Year)  FROM mytable WHERE ArrDelayMinutes NOT IN (123.0) AND AirlineID NOT IN (19690, 20436, 20355) AND (DivWheelsOffs__MV0 > 1804 OR DivWheelsOffs__MV1 > 1804 OR DivWheelsOffs__MV2 > 1804 OR DivWheelsOffs__MV3 > 1804 OR DivWheelsOffs__MV4 > 1804) LIMIT 10000"]}
+{"sql":"SELECT SUM(CRSDepTime), COUNT(DistanceGroup), SUM(\"Year\") FROM mytable WHERE ArrDelayMinutes NOT IN (123.0) AND AirlineID NOT IN (19690, 20436, 20355) AND DivWheelsOffs > 1804 LIMIT 21","hsqls":["SELECT SUM(CRSDepTime), COUNT(DistanceGroup), SUM(`Year`)  FROM mytable WHERE ArrDelayMinutes NOT IN (123.0) AND AirlineID NOT IN (19690, 20436, 20355) AND (DivWheelsOffs[1] > 1804 OR DivWheelsOffs[2] > 1804 OR DivWheelsOffs[3] > 1804 OR DivWheelsOffs[4] > 1804 OR DivWheelsOffs[5] > 1804) LIMIT 10000"]}
 {"sql":"SELECT DepTimeBlk, SUM(TaxiOut), SUM(DivDistance) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 25","hsqls":["SELECT DepTimeBlk, SUM(TaxiOut), SUM(DivDistance) FROM mytable GROUP BY DepTimeBlk  ORDER BY DepTimeBlk LIMIT 25"]}
 {"sql":"SELECT DaysSinceEpoch, COUNT(DestCityName), MAX(OriginAirportID) FROM mytable WHERE ArrTime NOT IN (601, 1211) AND CRSElapsedTime BETWEEN 46 AND 312 AND SecurityDelay >= 27 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 12","hsqls":["SELECT DaysSinceEpoch, COUNT(DestCityName), MAX(OriginAirportID) FROM mytable WHERE ArrTime NOT IN (601, 1211) AND CRSElapsedTime BETWEEN 46 AND 312 AND SecurityDelay >= 27 GROUP BY DaysSinceEpoch  ORDER BY DaysSinceEpoch LIMIT 12"]}
 {"sql":"SELECT OriginCityMarketID, DestAirportSeqID, ArrTimeBlk, AVG(DepDelay) FROM mytable WHERE LateAircraftDelay BETWEEN 92 AND 117 GROUP BY OriginCityMarketID, DestAirportSeqID, ArrTimeBlk  ORDER BY OriginCityMarketID, DestAirportSeqID, ArrTimeBlk LIMIT 10","hsqls":["SELECT OriginCityMarketID, DestAirportSeqID, ArrTimeBlk, AVG(DepDelay) FROM mytable WHERE LateAircraftDelay BETWEEN 92 AND 117 GROUP BY OriginCityMarketID, DestAirportSeqID, ArrTimeBlk  ORDER BY OriginCityMarketID, DestAirportSeqID, ArrTimeBlk LIMIT 10"]}
@@ -9763,33 +9763,33 @@
 {"sql":"SELECT CRSArrTime, ArrivalDelayGroups FROM mytable WHERE Diverted > 0 ORDER BY DivAirportLandings LIMIT 28"}
 {"sql":"SELECT SecurityDelay, ArrTimeBlk FROM mytable ORDER BY TaxiOut, \"Year\", NASDelay LIMIT 20","hsqls":["SELECT SecurityDelay, ArrTimeBlk FROM mytable ORDER BY TaxiOut, Year, NASDelay LIMIT 20"]}
 {"sql":"SELECT TaxiOut, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY TaxiOut, CRSElapsedTime  ORDER BY TaxiOut, CRSElapsedTime LIMIT 12","hsqls":["SELECT TaxiOut, CRSElapsedTime, COUNT(*) FROM mytable GROUP BY TaxiOut, CRSElapsedTime  ORDER BY TaxiOut, CRSElapsedTime LIMIT 12"]}
-{"sql":"SELECT DivAirportSeqIDs, DestCityName, DepTimeBlk FROM mytable ORDER BY CarrierDelay, OriginAirportID LIMIT 23","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, DestCityName, DepTimeBlk FROM mytable ORDER BY CarrierDelay, OriginAirportID LIMIT 10000"]}
-{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DivLongestGTimes >= 28.0 OR FirstDepTime BETWEEN 727 AND 631 LIMIT 26","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4 FROM mytable WHERE (DivLongestGTimes__MV0 >= 28.0 OR DivLongestGTimes__MV1 >= 28.0 OR DivLongestGTimes__MV2 >= 28.0 OR DivLongestGTimes__MV3 >= 28.0 OR DivLongestGTimes__MV4 >= 28.0) OR FirstDepTime BETWEEN 727 AND 631 LIMIT 10000"]}
-{"sql":"SELECT DistanceGroup, MAX(Quarter) FROM mytable WHERE AirlineID NOT IN (19790) AND \"Month\" IN (1) GROUP BY DistanceGroup LIMIT 25","hsqls":["SELECT DistanceGroup, MAX(Quarter) FROM mytable WHERE AirlineID NOT IN (19790) AND Month IN (1) GROUP BY DistanceGroup LIMIT 25"]}
-{"sql":"SELECT DivTailNums, DestCityMarketID FROM mytable ORDER BY DepartureDelayGroups, DestWac LIMIT 23","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, DestCityMarketID FROM mytable ORDER BY DepartureDelayGroups, DestWac LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, DestCityName, DepTimeBlk FROM mytable ORDER BY CarrierDelay, OriginAirportID LIMIT 23","hsqls":["SELECT DivAirportSeqIDs, DestCityName, DepTimeBlk FROM mytable ORDER BY CarrierDelay, OriginAirportID LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes FROM mytable WHERE DivLongestGTimes >= 28.0 OR FirstDepTime BETWEEN 727 AND 631 LIMIT 26","hsqls":["SELECT DivLongestGTimes FROM mytable WHERE (DivLongestGTimes[1] >= 28.0 OR DivLongestGTimes[2] >= 28.0 OR DivLongestGTimes[3] >= 28.0 OR DivLongestGTimes[4] >= 28.0 OR DivLongestGTimes[5] >= 28.0) OR FirstDepTime BETWEEN 727 AND 631 LIMIT 10000"]}
+{"sql":"SELECT DistanceGroup, MAX(Quarter) FROM mytable WHERE AirlineID NOT IN (19790) AND \"Month\" IN (1) GROUP BY DistanceGroup LIMIT 25","hsqls":["SELECT DistanceGroup, MAX(Quarter) FROM mytable WHERE AirlineID NOT IN (19790) AND `Month` IN (1) GROUP BY DistanceGroup LIMIT 25"]}
+{"sql":"SELECT DivTailNums, DestCityMarketID FROM mytable ORDER BY DepartureDelayGroups, DestWac LIMIT 23","hsqls":["SELECT DivTailNums, DestCityMarketID FROM mytable ORDER BY DepartureDelayGroups, DestWac LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, OriginCityMarketID, SUM(DivArrDelay), COUNT(ArrDelay) FROM mytable WHERE OriginState NOT IN ('TT', 'DE', 'MO') AND Quarter BETWEEN 1 AND 1 GROUP BY CarrierDelay, OriginCityMarketID  ORDER BY CarrierDelay, OriginCityMarketID LIMIT 12","hsqls":["SELECT CarrierDelay, OriginCityMarketID, SUM(DivArrDelay), COUNT(ArrDelay) FROM mytable WHERE OriginState NOT IN ('TT', 'DE', 'MO') AND Quarter BETWEEN 1 AND 1 GROUP BY CarrierDelay, OriginCityMarketID  ORDER BY CarrierDelay, OriginCityMarketID LIMIT 12"]}
-{"sql":"SELECT ArrDel15, Origin, MAX(OriginStateFips) FROM mytable WHERE UniqueCarrier NOT IN ('HA', 'OO', 'AA') OR DepTime BETWEEN 1403 AND 1253 AND \"Year\" < 2014 GROUP BY ArrDel15, Origin LIMIT 6","hsqls":["SELECT ArrDel15, Origin, MAX(OriginStateFips) FROM mytable WHERE UniqueCarrier NOT IN ('HA', 'OO', 'AA') OR DepTime BETWEEN 1403 AND 1253 AND Year < 2014 GROUP BY ArrDel15, Origin LIMIT 6"]}
-{"sql":"SELECT DestStateFips, AirlineID FROM mytable WHERE \"Year\" IN (2014) AND NASDelay BETWEEN 15 AND 94 LIMIT 26","hsqls":["SELECT DestStateFips, AirlineID FROM mytable WHERE Year IN (2014) AND NASDelay BETWEEN 15 AND 94 LIMIT 26"]}
+{"sql":"SELECT ArrDel15, Origin, MAX(OriginStateFips) FROM mytable WHERE UniqueCarrier NOT IN ('HA', 'OO', 'AA') OR DepTime BETWEEN 1403 AND 1253 AND \"Year\" < 2014 GROUP BY ArrDel15, Origin LIMIT 6","hsqls":["SELECT ArrDel15, Origin, MAX(OriginStateFips) FROM mytable WHERE UniqueCarrier NOT IN ('HA', 'OO', 'AA') OR DepTime BETWEEN 1403 AND 1253 AND `Year` < 2014 GROUP BY ArrDel15, Origin LIMIT 6"]}
+{"sql":"SELECT DestStateFips, AirlineID FROM mytable WHERE \"Year\" IN (2014) AND NASDelay BETWEEN 15 AND 94 LIMIT 26","hsqls":["SELECT DestStateFips, AirlineID FROM mytable WHERE `Year` IN (2014) AND NASDelay BETWEEN 15 AND 94 LIMIT 26"]}
 {"sql":"SELECT WeatherDelay, DivAirportLandings FROM mytable WHERE SecurityDelay BETWEEN 4 AND 4 OR TailNum NOT IN ('N941UW', 'N949AT', 'N955SW', 'N111US') ORDER BY WeatherDelay, OriginWac, DayOfWeek LIMIT 29"}
 {"sql":"SELECT TaxiOut, DestState FROM mytable WHERE NASDelay > 100 AND DayOfWeek = 5 ORDER BY DepDelayMinutes LIMIT 26"}
-{"sql":"SELECT SUM(ArrDelay), MIN(\"Month\") FROM mytable WHERE DayOfWeek IN (5, 4) LIMIT 27","hsqls":["SELECT SUM(ArrDelay), MIN(Month) FROM mytable WHERE DayOfWeek IN (5, 4) LIMIT 27"]}
-{"sql":"SELECT ArrDelayMinutes, DivTailNums FROM mytable WHERE DepTime <> 803 ORDER BY LongestAddGTime, DestStateName LIMIT 22","hsqls":["SELECT ArrDelayMinutes, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DepTime <> 803 ORDER BY LongestAddGTime, DestStateName LIMIT 10000"]}
+{"sql":"SELECT SUM(ArrDelay), MIN(\"Month\") FROM mytable WHERE DayOfWeek IN (5, 4) LIMIT 27","hsqls":["SELECT SUM(ArrDelay), MIN(`Month`) FROM mytable WHERE DayOfWeek IN (5, 4) LIMIT 27"]}
+{"sql":"SELECT ArrDelayMinutes, DivTailNums FROM mytable WHERE DepTime <> 803 ORDER BY LongestAddGTime, DestStateName LIMIT 22","hsqls":["SELECT ArrDelayMinutes, DivTailNums FROM mytable WHERE DepTime <> 803 ORDER BY LongestAddGTime, DestStateName LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, TotalAddGTime, ArrTime FROM mytable WHERE DestCityName BETWEEN 'Brunswick, GA' AND 'Bangor, ME' OR ArrivalDelayGroups < -1 AND DistanceGroup IN (3, 7, 4, 8, 11) ORDER BY DestStateName LIMIT 21"}
 {"sql":"SELECT OriginCityName, COUNT(*) FROM mytable WHERE FirstDepTime < 900 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 28","hsqls":["SELECT OriginCityName, COUNT(*) FROM mytable WHERE FirstDepTime < 900 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 28"]}
 {"sql":"SELECT ArrTimeBlk, DivArrDelay, OriginAirportID, AVG(ArrDelayMinutes), COUNT(DepartureDelayGroups) FROM mytable WHERE FlightNum <= 1458 OR AirlineID BETWEEN 19805 AND 21171 OR DivActualElapsedTime <> 1195 GROUP BY ArrTimeBlk, DivArrDelay, OriginAirportID  ORDER BY ArrTimeBlk, DivArrDelay, OriginAirportID LIMIT 23","hsqls":["SELECT ArrTimeBlk, DivArrDelay, OriginAirportID, AVG(ArrDelayMinutes), COUNT(DepartureDelayGroups) FROM mytable WHERE FlightNum <= 1458 OR AirlineID BETWEEN 19805 AND 21171 OR DivActualElapsedTime <> 1195 GROUP BY ArrTimeBlk, DivArrDelay, OriginAirportID  ORDER BY ArrTimeBlk, DivArrDelay, OriginAirportID LIMIT 23"]}
 {"sql":"SELECT Distance, SecurityDelay, Dest, COUNT(*) FROM mytable GROUP BY Distance, SecurityDelay, Dest  ORDER BY Distance, SecurityDelay, Dest LIMIT 23","hsqls":["SELECT Distance, SecurityDelay, Dest, COUNT(*) FROM mytable GROUP BY Distance, SecurityDelay, Dest  ORDER BY Distance, SecurityDelay, Dest LIMIT 23"]}
 {"sql":"SELECT OriginAirportSeqID, TotalAddGTime FROM mytable WHERE DestAirportSeqID > 1419303 AND AirlineID BETWEEN 20398 AND 20355 ORDER BY WheelsOff, ActualElapsedTime, ArrDelayMinutes LIMIT 18"}
-{"sql":"SELECT DepTimeBlk, COUNT(*) FROM mytable WHERE ArrivalDelayGroups <> 5 OR WheelsOn BETWEEN 1738 AND 2354 OR \"Year\" > 2014 GROUP BY DepTimeBlk LIMIT 9","hsqls":["SELECT DepTimeBlk, COUNT(*) FROM mytable WHERE ArrivalDelayGroups <> 5 OR WheelsOn BETWEEN 1738 AND 2354 OR Year > 2014 GROUP BY DepTimeBlk LIMIT 9"]}
+{"sql":"SELECT DepTimeBlk, COUNT(*) FROM mytable WHERE ArrivalDelayGroups <> 5 OR WheelsOn BETWEEN 1738 AND 2354 OR \"Year\" > 2014 GROUP BY DepTimeBlk LIMIT 9","hsqls":["SELECT DepTimeBlk, COUNT(*) FROM mytable WHERE ArrivalDelayGroups <> 5 OR WheelsOn BETWEEN 1738 AND 2354 OR `Year` > 2014 GROUP BY DepTimeBlk LIMIT 9"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE FlightDate > '2014-01-05' OR ArrDelayMinutes BETWEEN 199.0 AND 232.0 AND WheelsOn <= 820 LIMIT 23"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Distance >= 2419 LIMIT 18"}
 {"sql":"SELECT OriginCityName, NASDelay, CancellationCode FROM mytable WHERE DestStateFips NOT IN (49, 48, 32, 46, 13) ORDER BY DepDelay, Carrier, DepDelayMinutes LIMIT 14"}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY ActualElapsedTime LIMIT 24"}
 {"sql":"SELECT DistanceGroup, DivActualElapsedTime, SUM(ArrDelay) FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 37 GROUP BY DistanceGroup, DivActualElapsedTime  ORDER BY DistanceGroup, DivActualElapsedTime LIMIT 10","hsqls":["SELECT DistanceGroup, DivActualElapsedTime, SUM(ArrDelay) FROM mytable WHERE TotalAddGTime BETWEEN 27 AND 37 GROUP BY DistanceGroup, DivActualElapsedTime  ORDER BY DistanceGroup, DivActualElapsedTime LIMIT 10"]}
 {"sql":"SELECT OriginAirportSeqID, DestAirportID, AVG(Cancelled), AVG(DestAirportID), SUM(DivActualElapsedTime) FROM mytable WHERE DestStateFips <> 72 OR DestStateFips IN (46) AND FirstDepTime = 726 GROUP BY OriginAirportSeqID, DestAirportID  ORDER BY OriginAirportSeqID, DestAirportID LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DestAirportID, AVG(Cancelled), AVG(DestAirportID), SUM(DivActualElapsedTime) FROM mytable WHERE DestStateFips <> 72 OR DestStateFips IN (46) AND FirstDepTime = 726 GROUP BY OriginAirportSeqID, DestAirportID  ORDER BY OriginAirportSeqID, DestAirportID LIMIT 8"]}
-{"sql":"SELECT MAX(DestStateFips), AVG(LongestAddGTime), AVG(DepDelay) FROM mytable WHERE DivTailNums > 'N687SW' LIMIT 11","hsqls":["SELECT MAX(DestStateFips), AVG(LongestAddGTime), AVG(DepDelay)  FROM mytable WHERE (DivTailNums__MV0 > 'N687SW' OR DivTailNums__MV1 > 'N687SW' OR DivTailNums__MV2 > 'N687SW' OR DivTailNums__MV3 > 'N687SW' OR DivTailNums__MV4 > 'N687SW') LIMIT 10000"]}
+{"sql":"SELECT MAX(DestStateFips), AVG(LongestAddGTime), AVG(DepDelay) FROM mytable WHERE DivTailNums > 'N687SW' LIMIT 11","hsqls":["SELECT MAX(DestStateFips), AVG(LongestAddGTime), AVG(DepDelay)  FROM mytable WHERE (DivTailNums[1] > 'N687SW' OR DivTailNums[2] > 'N687SW' OR DivTailNums[3] > 'N687SW' OR DivTailNums[4] > 'N687SW' OR DivTailNums[5] > 'N687SW') LIMIT 10000"]}
 {"sql":"SELECT ArrDelayMinutes, DestCityMarketID FROM mytable WHERE FlightNum >= 1973 LIMIT 28"}
 {"sql":"SELECT TaxiIn, ArrDelayMinutes, COUNT(*) FROM mytable WHERE WheelsOff < 1055 OR DayofMonth NOT IN (1, 31, 24, 8, 28) GROUP BY TaxiIn, ArrDelayMinutes  ORDER BY TaxiIn, ArrDelayMinutes LIMIT 23","hsqls":["SELECT TaxiIn, ArrDelayMinutes, COUNT(*) FROM mytable WHERE WheelsOff < 1055 OR DayofMonth NOT IN (1, 31, 24, 8, 28) GROUP BY TaxiIn, ArrDelayMinutes  ORDER BY TaxiIn, ArrDelayMinutes LIMIT 23"]}
-{"sql":"SELECT CRSArrTime, DivTotalGTimes FROM mytable WHERE OriginWac = 71 ORDER BY Carrier, OriginCityName, ArrDel15 LIMIT 2","hsqls":["SELECT CRSArrTime, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE OriginWac = 71 ORDER BY Carrier, OriginCityName, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT CRSArrTime, DivTotalGTimes FROM mytable WHERE OriginWac = 71 ORDER BY Carrier, OriginCityName, ArrDel15 LIMIT 2","hsqls":["SELECT CRSArrTime, DivTotalGTimes FROM mytable WHERE OriginWac = 71 ORDER BY Carrier, OriginCityName, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DestStateFips FROM mytable WHERE LongestAddGTime BETWEEN 97 AND 8 ORDER BY Quarter, Cancelled LIMIT 9","hsqls":["SELECT Year, DestStateFips FROM mytable WHERE LongestAddGTime BETWEEN 97 AND 8 ORDER BY Quarter, Cancelled LIMIT 9"]}
 {"sql":"SELECT DistanceGroup, DepTimeBlk, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 1214 AND 1047 GROUP BY DistanceGroup, DepTimeBlk  ORDER BY DistanceGroup, DepTimeBlk LIMIT 29","hsqls":["SELECT DistanceGroup, DepTimeBlk, COUNT(*) FROM mytable WHERE ArrTime BETWEEN 1214 AND 1047 GROUP BY DistanceGroup, DepTimeBlk  ORDER BY DistanceGroup, DepTimeBlk LIMIT 29"]}
 {"sql":"SELECT ArrTime, DepTimeBlk FROM mytable WHERE DivAirportLandings NOT IN (2, 1, 0, 9) AND CRSElapsedTime > 381 ORDER BY DestStateFips, ArrDel15 LIMIT 23"}
@@ -9798,22 +9798,22 @@
 {"sql":"SELECT DepDelayMinutes, DestAirportSeqID, MIN(Diverted), COUNT(Origin) FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 GROUP BY DepDelayMinutes, DestAirportSeqID  ORDER BY DepDelayMinutes, DestAirportSeqID LIMIT 10","hsqls":["SELECT DepDelayMinutes, DestAirportSeqID, MIN(Diverted), COUNT(Origin) FROM mytable WHERE ArrDel15 BETWEEN 0 AND 1 GROUP BY DepDelayMinutes, DestAirportSeqID  ORDER BY DepDelayMinutes, DestAirportSeqID LIMIT 10"]}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY ActualElapsedTime, DestAirportID, OriginStateName LIMIT 13"}
 {"sql":"SELECT CRSArrTime FROM mytable WHERE AirlineID BETWEEN 19930 AND 19393 OR WeatherDelay <= 166 LIMIT 16"}
-{"sql":"SELECT DivLongestGTimes, Carrier, LateAircraftDelay FROM mytable WHERE OriginState >= 'NH' OR TaxiIn BETWEEN 9 AND 37 AND OriginCityMarketID BETWEEN 32888 AND 34457 ORDER BY AirTime LIMIT 24","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, Carrier, LateAircraftDelay FROM mytable WHERE OriginState >= 'NH' OR TaxiIn BETWEEN 9 AND 37 AND OriginCityMarketID BETWEEN 32888 AND 34457 ORDER BY AirTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, Carrier, LateAircraftDelay FROM mytable WHERE OriginState >= 'NH' OR TaxiIn BETWEEN 9 AND 37 AND OriginCityMarketID BETWEEN 32888 AND 34457 ORDER BY AirTime LIMIT 24","hsqls":["SELECT DivLongestGTimes, Carrier, LateAircraftDelay FROM mytable WHERE OriginState >= 'NH' OR TaxiIn BETWEEN 9 AND 37 AND OriginCityMarketID BETWEEN 32888 AND 34457 ORDER BY AirTime LIMIT 10000"]}
 {"sql":"SELECT Carrier FROM mytable WHERE TaxiOut NOT IN (30, 40, 16) AND DepTime = 1741 ORDER BY DepDel15 LIMIT 17"}
-{"sql":"SELECT ActualElapsedTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 288 AND 395 AND DivTotalGTimes BETWEEN 99 AND 10 GROUP BY ActualElapsedTime, ArrTimeBlk LIMIT 19","hsqls":["SELECT ActualElapsedTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 288 AND 395 AND (DivTotalGTimes__MV0 BETWEEN 99 AND 10 OR DivTotalGTimes__MV1 BETWEEN 99 AND 10 OR DivTotalGTimes__MV2 BETWEEN 99 AND 10 OR DivTotalGTimes__MV3 BETWEEN 99 AND 10 OR DivTotalGTimes__MV4 BETWEEN 99 AND 10) GROUP BY ActualElapsedTime, ArrTimeBlk LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 288 AND 395 AND DivTotalGTimes BETWEEN 99 AND 10 GROUP BY ActualElapsedTime, ArrTimeBlk LIMIT 19","hsqls":["SELECT ActualElapsedTime, ArrTimeBlk, COUNT(*) FROM mytable WHERE DivActualElapsedTime BETWEEN 288 AND 395 AND (DivTotalGTimes[1] BETWEEN 99 AND 10 OR DivTotalGTimes[2] BETWEEN 99 AND 10 OR DivTotalGTimes[3] BETWEEN 99 AND 10 OR DivTotalGTimes[4] BETWEEN 99 AND 10 OR DivTotalGTimes[5] BETWEEN 99 AND 10) GROUP BY ActualElapsedTime, ArrTimeBlk LIMIT 10000"]}
 {"sql":"SELECT DestCityName FROM mytable WHERE DayofMonth >= 11 ORDER BY DepDelay LIMIT 28"}
 {"sql":"SELECT OriginState, Dest, DivAirportLandings FROM mytable WHERE CarrierDelay BETWEEN 229 AND 27 AND NASDelay BETWEEN 28 AND 238 LIMIT 25"}
-{"sql":"SELECT ArrivalDelayGroups, MIN(DepartureDelayGroups), SUM(DivArrDelay), MAX(DayofMonth) FROM mytable WHERE AirTime BETWEEN 281 AND 126 OR \"Month\" BETWEEN 1 AND 1 GROUP BY ArrivalDelayGroups LIMIT 2","hsqls":["SELECT ArrivalDelayGroups, MIN(DepartureDelayGroups), SUM(DivArrDelay), MAX(DayofMonth) FROM mytable WHERE AirTime BETWEEN 281 AND 126 OR Month BETWEEN 1 AND 1 GROUP BY ArrivalDelayGroups LIMIT 2"]}
+{"sql":"SELECT ArrivalDelayGroups, MIN(DepartureDelayGroups), SUM(DivArrDelay), MAX(DayofMonth) FROM mytable WHERE AirTime BETWEEN 281 AND 126 OR \"Month\" BETWEEN 1 AND 1 GROUP BY ArrivalDelayGroups LIMIT 2","hsqls":["SELECT ArrivalDelayGroups, MIN(DepartureDelayGroups), SUM(DivArrDelay), MAX(DayofMonth) FROM mytable WHERE AirTime BETWEEN 281 AND 126 OR `Month` BETWEEN 1 AND 1 GROUP BY ArrivalDelayGroups LIMIT 2"]}
 {"sql":"SELECT OriginAirportID FROM mytable WHERE DayOfWeek <> 4 OR Cancelled <= 0 ORDER BY Diverted, ArrTimeBlk, DivAirportLandings LIMIT 28"}
 {"sql":"SELECT DestStateFips FROM mytable ORDER BY WeatherDelay LIMIT 10"}
-{"sql":"SELECT DepDelayMinutes FROM mytable WHERE DivAirportIDs <= 14771 LIMIT 4","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE (DivAirportIDs__MV0 <= 14771 OR DivAirportIDs__MV1 <= 14771 OR DivAirportIDs__MV2 <= 14771 OR DivAirportIDs__MV3 <= 14771 OR DivAirportIDs__MV4 <= 14771) LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes FROM mytable WHERE DivAirportIDs <= 14771 LIMIT 4","hsqls":["SELECT DepDelayMinutes FROM mytable WHERE (DivAirportIDs[1] <= 14771 OR DivAirportIDs[2] <= 14771 OR DivAirportIDs[3] <= 14771 OR DivAirportIDs[4] <= 14771 OR DivAirportIDs[5] <= 14771) LIMIT 10000"]}
 {"sql":"SELECT ArrDel15, DestCityMarketID FROM mytable ORDER BY DestWac LIMIT 24"}
-{"sql":"SELECT DayOfWeek, COUNT(\"Month\"), MIN(DestAirportSeqID) FROM mytable GROUP BY DayOfWeek LIMIT 1","hsqls":["SELECT DayOfWeek, COUNT(Month), MIN(DestAirportSeqID) FROM mytable GROUP BY DayOfWeek LIMIT 1"]}
-{"sql":"SELECT DivLongestGTimes, CRSElapsedTime FROM mytable WHERE ArrTimeBlk NOT IN ('1600-1659', '1700-1759', '0900-0959', '1500-1559') ORDER BY ArrDel15 LIMIT 24","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, CRSElapsedTime FROM mytable WHERE ArrTimeBlk NOT IN ('1600-1659', '1700-1759', '0900-0959', '1500-1559') ORDER BY ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT DayOfWeek, COUNT(\"Month\"), MIN(DestAirportSeqID) FROM mytable GROUP BY DayOfWeek LIMIT 1","hsqls":["SELECT DayOfWeek, COUNT(`Month`), MIN(DestAirportSeqID) FROM mytable GROUP BY DayOfWeek LIMIT 1"]}
+{"sql":"SELECT DivLongestGTimes, CRSElapsedTime FROM mytable WHERE ArrTimeBlk NOT IN ('1600-1659', '1700-1759', '0900-0959', '1500-1559') ORDER BY ArrDel15 LIMIT 24","hsqls":["SELECT DivLongestGTimes, CRSElapsedTime FROM mytable WHERE ArrTimeBlk NOT IN ('1600-1659', '1700-1759', '0900-0959', '1500-1559') ORDER BY ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT DestCityMarketID, DaysSinceEpoch FROM mytable LIMIT 20"}
 {"sql":"SELECT OriginCityMarketID, NASDelay FROM mytable WHERE DestAirportID >= 10620 ORDER BY UniqueCarrier, ArrivalDelayGroups, DayOfWeek LIMIT 13"}
-{"sql":"SELECT Flights, ArrDelayMinutes, ActualElapsedTime, SUM(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE DivTailNums IN ('N7742B', 'N373SW', 'N13566') GROUP BY Flights, ArrDelayMinutes, ActualElapsedTime LIMIT 22","hsqls":["SELECT Flights, ArrDelayMinutes, ActualElapsedTime, SUM(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE (DivTailNums__MV0 IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums__MV1 IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums__MV2 IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums__MV3 IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums__MV4 IN ('N7742B', 'N373SW', 'N13566')) GROUP BY Flights, ArrDelayMinutes, ActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT DaysSinceEpoch, SUM(OriginStateFips) FROM mytable WHERE CRSDepTime BETWEEN 2145 AND 2219 AND \"Month\" IN (1) GROUP BY DaysSinceEpoch LIMIT 15","hsqls":["SELECT DaysSinceEpoch, SUM(OriginStateFips) FROM mytable WHERE CRSDepTime BETWEEN 2145 AND 2219 AND Month IN (1) GROUP BY DaysSinceEpoch LIMIT 15"]}
+{"sql":"SELECT Flights, ArrDelayMinutes, ActualElapsedTime, SUM(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE DivTailNums IN ('N7742B', 'N373SW', 'N13566') GROUP BY Flights, ArrDelayMinutes, ActualElapsedTime LIMIT 22","hsqls":["SELECT Flights, ArrDelayMinutes, ActualElapsedTime, SUM(LateAircraftDelay), COUNT(Distance) FROM mytable WHERE (DivTailNums[1] IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums[2] IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums[3] IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums[4] IN ('N7742B', 'N373SW', 'N13566') OR DivTailNums[5] IN ('N7742B', 'N373SW', 'N13566')) GROUP BY Flights, ArrDelayMinutes, ActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT DaysSinceEpoch, SUM(OriginStateFips) FROM mytable WHERE CRSDepTime BETWEEN 2145 AND 2219 AND \"Month\" IN (1) GROUP BY DaysSinceEpoch LIMIT 15","hsqls":["SELECT DaysSinceEpoch, SUM(OriginStateFips) FROM mytable WHERE CRSDepTime BETWEEN 2145 AND 2219 AND `Month` IN (1) GROUP BY DaysSinceEpoch LIMIT 15"]}
 {"sql":"SELECT DayofMonth, DayOfWeek, MIN(DepDel15), MIN(DestStateFips) FROM mytable WHERE DestCityMarketID IN (32211, 33342, 33192) GROUP BY DayofMonth, DayOfWeek  ORDER BY DayofMonth, DayOfWeek LIMIT 4","hsqls":["SELECT DayofMonth, DayOfWeek, MIN(DepDel15), MIN(DestStateFips) FROM mytable WHERE DestCityMarketID IN (32211, 33342, 33192) GROUP BY DayofMonth, DayOfWeek  ORDER BY DayofMonth, DayOfWeek LIMIT 4"]}
 {"sql":"SELECT ActualElapsedTime, MAX(ArrivalDelayGroups), AVG(WheelsOn) FROM mytable WHERE Distance BETWEEN 224 AND 1506 AND FlightNum <= 862 OR DivReachedDest NOT IN (1, 0, -9999) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 26","hsqls":["SELECT ActualElapsedTime, MAX(ArrivalDelayGroups), AVG(WheelsOn) FROM mytable WHERE Distance BETWEEN 224 AND 1506 AND FlightNum <= 862 OR DivReachedDest NOT IN (1, 0, -9999) GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 26"]}
 {"sql":"SELECT LongestAddGTime, ArrDel15, COUNT(*) FROM mytable GROUP BY LongestAddGTime, ArrDel15  ORDER BY LongestAddGTime, ArrDel15 LIMIT 1","hsqls":["SELECT LongestAddGTime, ArrDel15, COUNT(*) FROM mytable GROUP BY LongestAddGTime, ArrDel15  ORDER BY LongestAddGTime, ArrDel15 LIMIT 1"]}
@@ -9823,24 +9823,24 @@
 {"sql":"SELECT Cancelled, DestStateName, MIN(FlightNum), MAX(LongestAddGTime), AVG(DivArrDelay) FROM mytable WHERE DivArrDelay NOT IN (95, 406, 106, 62, 234) OR OriginStateFips BETWEEN 47 AND 33 AND DestState IN ('MI', 'NH', 'KY', 'NY', 'ME') GROUP BY Cancelled, DestStateName  ORDER BY Cancelled, DestStateName LIMIT 22","hsqls":["SELECT Cancelled, DestStateName, MIN(FlightNum), MAX(LongestAddGTime), AVG(DivArrDelay) FROM mytable WHERE DivArrDelay NOT IN (95, 406, 106, 62, 234) OR OriginStateFips BETWEEN 47 AND 33 AND DestState IN ('MI', 'NH', 'KY', 'NY', 'ME') GROUP BY Cancelled, DestStateName  ORDER BY Cancelled, DestStateName LIMIT 22"]}
 {"sql":"SELECT DestAirportSeqID FROM mytable WHERE FlightDate NOT IN ('2014-01-23', '2014-01-18', '2014-01-15', '2014-01-01', '2014-01-08') AND NASDelay NOT IN (6, 40) AND CancellationCode > 'noodles' ORDER BY FlightDate, Origin, DayOfWeek LIMIT 16"}
 {"sql":"SELECT DivDistance, ActualElapsedTime FROM mytable LIMIT 29"}
-{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY DivDistance, CRSArrTime, OriginCityName LIMIT 10","hsqls":["SELECT DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable ORDER BY DivDistance, CRSArrTime, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT DivTotalGTimes FROM mytable ORDER BY DivDistance, CRSArrTime, OriginCityName LIMIT 10","hsqls":["SELECT DivTotalGTimes FROM mytable ORDER BY DivDistance, CRSArrTime, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT Carrier, WheelsOn FROM mytable ORDER BY TaxiIn, DestCityName, CRSDepTime LIMIT 23"}
-{"sql":"SELECT MIN(\"Year\"), MAX(DivReachedDest), AVG(ArrDelay) FROM mytable WHERE Distance <> 510 LIMIT 28","hsqls":["SELECT MIN(Year), MAX(DivReachedDest), AVG(ArrDelay) FROM mytable WHERE Distance <> 510 LIMIT 28"]}
+{"sql":"SELECT MIN(\"Year\"), MAX(DivReachedDest), AVG(ArrDelay) FROM mytable WHERE Distance <> 510 LIMIT 28","hsqls":["SELECT MIN(`Year`), MAX(DivReachedDest), AVG(ArrDelay) FROM mytable WHERE Distance <> 510 LIMIT 28"]}
 {"sql":"SELECT MIN(DepDelayMinutes), AVG(WeatherDelay), SUM(Cancelled) FROM mytable LIMIT 19"}
 {"sql":"SELECT TotalAddGTime, DayofMonth, SUM(DestAirportID) FROM mytable WHERE DestAirportSeqID BETWEEN 1084903 AND 1498603 GROUP BY TotalAddGTime, DayofMonth  ORDER BY TotalAddGTime, DayofMonth LIMIT 15","hsqls":["SELECT TotalAddGTime, DayofMonth, SUM(DestAirportID) FROM mytable WHERE DestAirportSeqID BETWEEN 1084903 AND 1498603 GROUP BY TotalAddGTime, DayofMonth  ORDER BY TotalAddGTime, DayofMonth LIMIT 15"]}
 {"sql":"SELECT ArrTimeBlk FROM mytable WHERE AirlineID <> 20409 OR LateAircraftDelay <> 105 AND OriginAirportSeqID < 1163703 ORDER BY Flights, DestAirportID, CancellationCode LIMIT 13"}
 {"sql":"SELECT WeatherDelay, Origin, OriginWac, MAX(WheelsOff), MAX(ArrDelayMinutes) FROM mytable GROUP BY WeatherDelay, Origin, OriginWac  ORDER BY WeatherDelay, Origin, OriginWac LIMIT 7","hsqls":["SELECT WeatherDelay, Origin, OriginWac, MAX(WheelsOff), MAX(ArrDelayMinutes) FROM mytable GROUP BY WeatherDelay, Origin, OriginWac  ORDER BY WeatherDelay, Origin, OriginWac LIMIT 7"]}
 {"sql":"SELECT FlightDate, ArrDelay, SUM(Diverted), SUM(FlightNum), MIN(OriginCityMarketID) FROM mytable WHERE OriginState BETWEEN 'NV' AND 'VI' GROUP BY FlightDate, ArrDelay  ORDER BY FlightDate, ArrDelay LIMIT 17","hsqls":["SELECT FlightDate, ArrDelay, SUM(Diverted), SUM(FlightNum), MIN(OriginCityMarketID) FROM mytable WHERE OriginState BETWEEN 'NV' AND 'VI' GROUP BY FlightDate, ArrDelay  ORDER BY FlightDate, ArrDelay LIMIT 17"]}
 {"sql":"SELECT WheelsOff, FirstDepTime FROM mytable WHERE DivDistance < 528 AND DestWac IN (92, 41, 83, 23, 85) AND CRSDepTime IN (1119, 1955, 906, 1915) LIMIT 9"}
-{"sql":"SELECT TaxiOut, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DivTotalGTimes >= 4 OR DivTailNums BETWEEN 'N3GWAA' AND 'N622VA' ORDER BY ArrTimeBlk, ArrDel15 LIMIT 6","hsqls":["SELECT TaxiOut, ArrDelayMinutes, DivAirportIDs__MV0, DivAirportIDs__MV1, DivAirportIDs__MV2, DivAirportIDs__MV3, DivAirportIDs__MV4 FROM mytable WHERE (DivTotalGTimes__MV0 >= 4 OR DivTotalGTimes__MV1 >= 4 OR DivTotalGTimes__MV2 >= 4 OR DivTotalGTimes__MV3 >= 4 OR DivTotalGTimes__MV4 >= 4) OR (DivTailNums__MV0 BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums__MV1 BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums__MV2 BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums__MV3 BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums__MV4 BETWEEN 'N3GWAA' AND 'N622VA') ORDER BY ArrTimeBlk, ArrDel15 LIMIT 10000"]}
+{"sql":"SELECT TaxiOut, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE DivTotalGTimes >= 4 OR DivTailNums BETWEEN 'N3GWAA' AND 'N622VA' ORDER BY ArrTimeBlk, ArrDel15 LIMIT 6","hsqls":["SELECT TaxiOut, ArrDelayMinutes, DivAirportIDs FROM mytable WHERE (DivTotalGTimes[1] >= 4 OR DivTotalGTimes[2] >= 4 OR DivTotalGTimes[3] >= 4 OR DivTotalGTimes[4] >= 4 OR DivTotalGTimes[5] >= 4) OR (DivTailNums[1] BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums[2] BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums[3] BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums[4] BETWEEN 'N3GWAA' AND 'N622VA' OR DivTailNums[5] BETWEEN 'N3GWAA' AND 'N622VA') ORDER BY ArrTimeBlk, ArrDel15 LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay FROM mytable WHERE DayOfWeek NOT IN (7, 4) OR DestAirportID <> 11146 ORDER BY DestStateFips, DivAirportLandings LIMIT 5"}
-{"sql":"SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (260, 278) AND WeatherDelay IN (49, 59) AND DivWheelsOns IN (2145, 1130, 1122, 1322) GROUP BY LateAircraftDelay LIMIT 19","hsqls":["SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (260, 278) AND WeatherDelay IN (49, 59) AND (DivWheelsOns__MV0 IN (2145, 1130, 1122, 1322) OR DivWheelsOns__MV1 IN (2145, 1130, 1122, 1322) OR DivWheelsOns__MV2 IN (2145, 1130, 1122, 1322) OR DivWheelsOns__MV3 IN (2145, 1130, 1122, 1322) OR DivWheelsOns__MV4 IN (2145, 1130, 1122, 1322)) GROUP BY LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (260, 278) AND WeatherDelay IN (49, 59) AND DivWheelsOns IN (2145, 1130, 1122, 1322) GROUP BY LateAircraftDelay LIMIT 19","hsqls":["SELECT LateAircraftDelay, COUNT(*) FROM mytable WHERE CRSElapsedTime NOT IN (260, 278) AND WeatherDelay IN (49, 59) AND (DivWheelsOns[1] IN (2145, 1130, 1122, 1322) OR DivWheelsOns[2] IN (2145, 1130, 1122, 1322) OR DivWheelsOns[3] IN (2145, 1130, 1122, 1322) OR DivWheelsOns[4] IN (2145, 1130, 1122, 1322) OR DivWheelsOns[5] IN (2145, 1130, 1122, 1322)) GROUP BY LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT DestStateName FROM mytable WHERE TaxiOut < 51 AND TotalAddGTime BETWEEN 11 AND 58 OR OriginStateFips BETWEEN 46 AND 36 LIMIT 27"}
 {"sql":"SELECT DestCityName, AirTime FROM mytable WHERE DayOfWeek <> 4 AND OriginAirportID IN (12888, 13495) AND AirTime > 78 ORDER BY OriginStateFips LIMIT 20"}
-{"sql":"SELECT ArrDel15, AVG(DestAirportSeqID), AVG(DistanceGroup), AVG(WheelsOff) FROM mytable WHERE AirlineID > 20409 AND \"Month\" BETWEEN 1 AND 1 GROUP BY ArrDel15 LIMIT 7","hsqls":["SELECT ArrDel15, AVG(DestAirportSeqID), AVG(DistanceGroup), AVG(WheelsOff) FROM mytable WHERE AirlineID > 20409 AND Month BETWEEN 1 AND 1 GROUP BY ArrDel15 LIMIT 7"]}
+{"sql":"SELECT ArrDel15, AVG(DestAirportSeqID), AVG(DistanceGroup), AVG(WheelsOff) FROM mytable WHERE AirlineID > 20409 AND \"Month\" BETWEEN 1 AND 1 GROUP BY ArrDel15 LIMIT 7","hsqls":["SELECT ArrDel15, AVG(DestAirportSeqID), AVG(DistanceGroup), AVG(WheelsOff) FROM mytable WHERE AirlineID > 20409 AND `Month` BETWEEN 1 AND 1 GROUP BY ArrDel15 LIMIT 7"]}
 {"sql":"SELECT WheelsOff, DestWac, WheelsOn FROM mytable WHERE DepDelayMinutes IN (268.0, 126.0, 182.0, 644.0, 73.0) ORDER BY TaxiOut, DestStateFips, DestStateName LIMIT 10"}
 {"sql":"SELECT WheelsOff, DivAirportLandings, COUNT(DepDel15), COUNT(DestAirportSeqID), COUNT(FlightDate) FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059') OR FlightNum <> 2674 OR ActualElapsedTime BETWEEN 143 AND 350 GROUP BY WheelsOff, DivAirportLandings  ORDER BY WheelsOff, DivAirportLandings LIMIT 4","hsqls":["SELECT WheelsOff, DivAirportLandings, COUNT(DepDel15), COUNT(DestAirportSeqID), COUNT(FlightDate) FROM mytable WHERE ArrTimeBlk NOT IN ('2000-2059') OR FlightNum <> 2674 OR ActualElapsedTime BETWEEN 143 AND 350 GROUP BY WheelsOff, DivAirportLandings  ORDER BY WheelsOff, DivAirportLandings LIMIT 4"]}
-{"sql":"SELECT DepDelay, DestAirportSeqID, AVG(\"Month\"), MIN(WheelsOn), AVG(DestAirportID) FROM mytable GROUP BY DepDelay, DestAirportSeqID LIMIT 26","hsqls":["SELECT DepDelay, DestAirportSeqID, AVG(Month), MIN(WheelsOn), AVG(DestAirportID) FROM mytable GROUP BY DepDelay, DestAirportSeqID LIMIT 26"]}
+{"sql":"SELECT DepDelay, DestAirportSeqID, AVG(\"Month\"), MIN(WheelsOn), AVG(DestAirportID) FROM mytable GROUP BY DepDelay, DestAirportSeqID LIMIT 26","hsqls":["SELECT DepDelay, DestAirportSeqID, AVG(`Month`), MIN(WheelsOn), AVG(DestAirportID) FROM mytable GROUP BY DepDelay, DestAirportSeqID LIMIT 26"]}
 {"sql":"SELECT ArrDel15, MAX(DivDistance), SUM(NASDelay), MAX(DepartureDelayGroups) FROM mytable WHERE Diverted IN (1, 0) OR DestCityMarketID BETWEEN 30913 AND 33367 OR Dest BETWEEN 'HDN' AND 'BRO' GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 14","hsqls":["SELECT ArrDel15, MAX(DivDistance), SUM(NASDelay), MAX(DepartureDelayGroups) FROM mytable WHERE Diverted IN (1, 0) OR DestCityMarketID BETWEEN 30913 AND 33367 OR Dest BETWEEN 'HDN' AND 'BRO' GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 14"]}
 {"sql":"SELECT OriginStateFips, DestStateFips, COUNT(*) FROM mytable GROUP BY OriginStateFips, DestStateFips  ORDER BY OriginStateFips, DestStateFips LIMIT 1","hsqls":["SELECT OriginStateFips, DestStateFips, COUNT(*) FROM mytable GROUP BY OriginStateFips, DestStateFips  ORDER BY OriginStateFips, DestStateFips LIMIT 1"]}
 {"sql":"SELECT DivDistance, FlightDate, DepTimeBlk, COUNT(Flights) FROM mytable WHERE DivDistance > 997 OR WheelsOff >= 2041 AND DepTimeBlk NOT IN ('0900-0959') GROUP BY DivDistance, FlightDate, DepTimeBlk  ORDER BY DivDistance, FlightDate, DepTimeBlk LIMIT 29","hsqls":["SELECT DivDistance, FlightDate, DepTimeBlk, COUNT(Flights) FROM mytable WHERE DivDistance > 997 OR WheelsOff >= 2041 AND DepTimeBlk NOT IN ('0900-0959') GROUP BY DivDistance, FlightDate, DepTimeBlk  ORDER BY DivDistance, FlightDate, DepTimeBlk LIMIT 29"]}
@@ -9849,14 +9849,14 @@
 {"sql":"SELECT LongestAddGTime, TailNum, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestStateFips NOT IN (10, 56, 22, 34, 50) GROUP BY LongestAddGTime, TailNum  ORDER BY LongestAddGTime, TailNum LIMIT 10","hsqls":["SELECT LongestAddGTime, TailNum, COUNT(*) FROM mytable WHERE Quarter BETWEEN 1 AND 1 AND DestStateFips NOT IN (10, 56, 22, 34, 50) GROUP BY LongestAddGTime, TailNum  ORDER BY LongestAddGTime, TailNum LIMIT 10"]}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY Carrier, DayofMonth LIMIT 12"}
 {"sql":"SELECT Dest, ArrivalDelayGroups, COUNT(OriginCityMarketID), SUM(ArrDelay), AVG(CRSArrTime) FROM mytable GROUP BY Dest, ArrivalDelayGroups  ORDER BY Dest, ArrivalDelayGroups LIMIT 8","hsqls":["SELECT Dest, ArrivalDelayGroups, COUNT(OriginCityMarketID), SUM(ArrDelay), AVG(CRSArrTime) FROM mytable GROUP BY Dest, ArrivalDelayGroups  ORDER BY Dest, ArrivalDelayGroups LIMIT 8"]}
-{"sql":"SELECT OriginAirportSeqID, DivWheelsOns FROM mytable WHERE FlightNum < 104 OR LongestAddGTime NOT IN (78, 111, 28) LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4 FROM mytable WHERE FlightNum < 104 OR LongestAddGTime NOT IN (78, 111, 28) LIMIT 10000"]}
-{"sql":"SELECT Cancelled, DestCityMarketID, OriginStateName, SUM(DivAirportLandings), MIN(CRSElapsedTime), MIN(FirstDepTime) FROM mytable WHERE \"Year\" NOT IN (2014) AND OriginStateName = 'North Dakota' AND ArrDelayMinutes <> 141.0 GROUP BY Cancelled, DestCityMarketID, OriginStateName LIMIT 5","hsqls":["SELECT Cancelled, DestCityMarketID, OriginStateName, SUM(DivAirportLandings), MIN(CRSElapsedTime), MIN(FirstDepTime) FROM mytable WHERE Year NOT IN (2014) AND OriginStateName = 'North Dakota' AND ArrDelayMinutes <> 141.0 GROUP BY Cancelled, DestCityMarketID, OriginStateName LIMIT 5"]}
+{"sql":"SELECT OriginAirportSeqID, DivWheelsOns FROM mytable WHERE FlightNum < 104 OR LongestAddGTime NOT IN (78, 111, 28) LIMIT 8","hsqls":["SELECT OriginAirportSeqID, DivWheelsOns FROM mytable WHERE FlightNum < 104 OR LongestAddGTime NOT IN (78, 111, 28) LIMIT 10000"]}
+{"sql":"SELECT Cancelled, DestCityMarketID, OriginStateName, SUM(DivAirportLandings), MIN(CRSElapsedTime), MIN(FirstDepTime) FROM mytable WHERE \"Year\" NOT IN (2014) AND OriginStateName = 'North Dakota' AND ArrDelayMinutes <> 141.0 GROUP BY Cancelled, DestCityMarketID, OriginStateName LIMIT 5","hsqls":["SELECT Cancelled, DestCityMarketID, OriginStateName, SUM(DivAirportLandings), MIN(CRSElapsedTime), MIN(FirstDepTime) FROM mytable WHERE `Year` NOT IN (2014) AND OriginStateName = 'North Dakota' AND ArrDelayMinutes <> 141.0 GROUP BY Cancelled, DestCityMarketID, OriginStateName LIMIT 5"]}
 {"sql":"SELECT ArrDel15, AVG(DivDistance), MIN(FirstDepTime) FROM mytable WHERE TaxiOut BETWEEN 14 AND 83 AND LongestAddGTime < 4 OR OriginAirportSeqID IN (1288903, 1540103) GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 21","hsqls":["SELECT ArrDel15, AVG(DivDistance), MIN(FirstDepTime) FROM mytable WHERE TaxiOut BETWEEN 14 AND 83 AND LongestAddGTime < 4 OR OriginAirportSeqID IN (1288903, 1540103) GROUP BY ArrDel15  ORDER BY ArrDel15 LIMIT 21"]}
 {"sql":"SELECT Diverted, COUNT(*) FROM mytable WHERE OriginCityMarketID < 31481 OR DepDelayMinutes IN (11.0) GROUP BY Diverted  ORDER BY Diverted LIMIT 10","hsqls":["SELECT Diverted, COUNT(*) FROM mytable WHERE OriginCityMarketID < 31481 OR DepDelayMinutes IN (11.0) GROUP BY Diverted  ORDER BY Diverted LIMIT 10"]}
-{"sql":"SELECT DivTailNums, \"Month\", OriginAirportID FROM mytable WHERE Dest NOT IN ('RNO', 'COS', 'TPA', 'MSO') OR DivWheelsOns BETWEEN 551 AND 2002 ORDER BY NASDelay LIMIT 5","hsqls":["SELECT DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Month, OriginAirportID FROM mytable WHERE Dest NOT IN ('RNO', 'COS', 'TPA', 'MSO') OR (DivWheelsOns__MV0 BETWEEN 551 AND 2002 OR DivWheelsOns__MV1 BETWEEN 551 AND 2002 OR DivWheelsOns__MV2 BETWEEN 551 AND 2002 OR DivWheelsOns__MV3 BETWEEN 551 AND 2002 OR DivWheelsOns__MV4 BETWEEN 551 AND 2002) ORDER BY NASDelay LIMIT 10000"]}
+{"sql":"SELECT DivTailNums, \"Month\", OriginAirportID FROM mytable WHERE Dest NOT IN ('RNO', 'COS', 'TPA', 'MSO') OR DivWheelsOns BETWEEN 551 AND 2002 ORDER BY NASDelay LIMIT 5","hsqls":["SELECT DivTailNums, Month, OriginAirportID FROM mytable WHERE Dest NOT IN ('RNO', 'COS', 'TPA', 'MSO') OR (DivWheelsOns[1] BETWEEN 551 AND 2002 OR DivWheelsOns[2] BETWEEN 551 AND 2002 OR DivWheelsOns[3] BETWEEN 551 AND 2002 OR DivWheelsOns[4] BETWEEN 551 AND 2002 OR DivWheelsOns[5] BETWEEN 551 AND 2002) ORDER BY NASDelay LIMIT 10000"]}
 {"sql":"SELECT WeatherDelay, ArrTime, CRSElapsedTime, SUM(DistanceGroup) FROM mytable WHERE DepDelay > 219.0 AND SecurityDelay <= 10 GROUP BY WeatherDelay, ArrTime, CRSElapsedTime  ORDER BY WeatherDelay, ArrTime, CRSElapsedTime LIMIT 6","hsqls":["SELECT WeatherDelay, ArrTime, CRSElapsedTime, SUM(DistanceGroup) FROM mytable WHERE DepDelay > 219.0 AND SecurityDelay <= 10 GROUP BY WeatherDelay, ArrTime, CRSElapsedTime  ORDER BY WeatherDelay, ArrTime, CRSElapsedTime LIMIT 6"]}
 {"sql":"SELECT DepDelay, OriginAirportID FROM mytable ORDER BY LateAircraftDelay LIMIT 22"}
-{"sql":"SELECT MAX(\"Month\") FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11","hsqls":["SELECT MAX(Month) FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11"]}
+{"sql":"SELECT MAX(\"Month\") FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11","hsqls":["SELECT MAX(`Month`) FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11"]}
 {"sql":"SELECT DepTime FROM mytable WHERE DestCityName NOT IN ('Richmond, VA', 'Valparaiso, FL', 'Portland, OR') ORDER BY Cancelled LIMIT 3"}
 {"sql":"SELECT OriginCityMarketID, TailNum, OriginStateName, MIN(ArrDel15), MIN(DistanceGroup), MAX(DivReachedDest) FROM mytable WHERE WheelsOff IN (1831, 1511) AND OriginCityMarketID BETWEEN 31641 AND 30615 AND ArrDelay NOT IN (-40.0, 185.0, -24.0, 315.0, 52.0) GROUP BY OriginCityMarketID, TailNum, OriginStateName  ORDER BY OriginCityMarketID, TailNum, OriginStateName LIMIT 22","hsqls":["SELECT OriginCityMarketID, TailNum, OriginStateName, MIN(ArrDel15), MIN(DistanceGroup), MAX(DivReachedDest) FROM mytable WHERE WheelsOff IN (1831, 1511) AND OriginCityMarketID BETWEEN 31641 AND 30615 AND ArrDelay NOT IN (-40.0, 185.0, -24.0, 315.0, 52.0) GROUP BY OriginCityMarketID, TailNum, OriginStateName  ORDER BY OriginCityMarketID, TailNum, OriginStateName LIMIT 22"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1223 LIMIT 12"}
@@ -9864,41 +9864,41 @@
 {"sql":"SELECT DivDistance, WeatherDelay, COUNT(*) FROM mytable WHERE ArrDel15 IN (0) AND CRSArrTime BETWEEN 655 AND 920 AND DepDelayMinutes > 67.0 GROUP BY DivDistance, WeatherDelay  ORDER BY DivDistance, WeatherDelay LIMIT 17","hsqls":["SELECT DivDistance, WeatherDelay, COUNT(*) FROM mytable WHERE ArrDel15 IN (0) AND CRSArrTime BETWEEN 655 AND 920 AND DepDelayMinutes > 67.0 GROUP BY DivDistance, WeatherDelay  ORDER BY DivDistance, WeatherDelay LIMIT 17"]}
 {"sql":"SELECT SUM(LongestAddGTime), MIN(TaxiIn), AVG(LateAircraftDelay) FROM mytable LIMIT 2"}
 {"sql":"SELECT TaxiOut, OriginStateFips, AirlineID, MIN(OriginAirportID), MIN(TaxiIn) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND ArrTimeBlk BETWEEN '1900-1959' AND '0900-0959' GROUP BY TaxiOut, OriginStateFips, AirlineID  ORDER BY TaxiOut, OriginStateFips, AirlineID LIMIT 14","hsqls":["SELECT TaxiOut, OriginStateFips, AirlineID, MIN(OriginAirportID), MIN(TaxiIn) FROM mytable WHERE ArrDel15 NOT IN (1, 0, -9999) AND ArrTimeBlk BETWEEN '1900-1959' AND '0900-0959' GROUP BY TaxiOut, OriginStateFips, AirlineID  ORDER BY TaxiOut, OriginStateFips, AirlineID LIMIT 14"]}
-{"sql":"SELECT LongestAddGTime, DestCityName, MAX(Quarter) FROM mytable WHERE ArrTime NOT IN (1302, 756) OR DayOfWeek > 1 AND \"Year\" BETWEEN 2014 AND 2014 GROUP BY LongestAddGTime, DestCityName LIMIT 1","hsqls":["SELECT LongestAddGTime, DestCityName, MAX(Quarter) FROM mytable WHERE ArrTime NOT IN (1302, 756) OR DayOfWeek > 1 AND Year BETWEEN 2014 AND 2014 GROUP BY LongestAddGTime, DestCityName LIMIT 1"]}
+{"sql":"SELECT LongestAddGTime, DestCityName, MAX(Quarter) FROM mytable WHERE ArrTime NOT IN (1302, 756) OR DayOfWeek > 1 AND \"Year\" BETWEEN 2014 AND 2014 GROUP BY LongestAddGTime, DestCityName LIMIT 1","hsqls":["SELECT LongestAddGTime, DestCityName, MAX(Quarter) FROM mytable WHERE ArrTime NOT IN (1302, 756) OR DayOfWeek > 1 AND `Year` BETWEEN 2014 AND 2014 GROUP BY LongestAddGTime, DestCityName LIMIT 1"]}
 {"sql":"SELECT OriginAirportSeqID FROM mytable ORDER BY LateAircraftDelay LIMIT 19"}
 {"sql":"SELECT DestCityName, ArrDelay, DivArrDelay, COUNT(*) FROM mytable WHERE OriginAirportSeqID BETWEEN 1087402 AND 1082103 GROUP BY DestCityName, ArrDelay, DivArrDelay  ORDER BY DestCityName, ArrDelay, DivArrDelay LIMIT 19","hsqls":["SELECT DestCityName, ArrDelay, DivArrDelay, COUNT(*) FROM mytable WHERE OriginAirportSeqID BETWEEN 1087402 AND 1082103 GROUP BY DestCityName, ArrDelay, DivArrDelay  ORDER BY DestCityName, ArrDelay, DivArrDelay LIMIT 19"]}
-{"sql":"SELECT OriginAirportID, MIN(\"Year\"), COUNT(CarrierDelay), MIN(Distance) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1600-1659' OR CRSDepTime = 2310 OR DepartureDelayGroups > 12 GROUP BY OriginAirportID LIMIT 12","hsqls":["SELECT OriginAirportID, MIN(Year), COUNT(CarrierDelay), MIN(Distance) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1600-1659' OR CRSDepTime = 2310 OR DepartureDelayGroups > 12 GROUP BY OriginAirportID LIMIT 12"]}
-{"sql":"SELECT \"Month\" FROM mytable WHERE DayofMonth BETWEEN 22 AND 12 LIMIT 11","hsqls":["SELECT Month FROM mytable WHERE DayofMonth BETWEEN 22 AND 12 LIMIT 11"]}
+{"sql":"SELECT OriginAirportID, MIN(\"Year\"), COUNT(CarrierDelay), MIN(Distance) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1600-1659' OR CRSDepTime = 2310 OR DepartureDelayGroups > 12 GROUP BY OriginAirportID LIMIT 12","hsqls":["SELECT OriginAirportID, MIN(`Year`), COUNT(CarrierDelay), MIN(Distance) FROM mytable WHERE ArrTimeBlk BETWEEN '2200-2259' AND '1600-1659' OR CRSDepTime = 2310 OR DepartureDelayGroups > 12 GROUP BY OriginAirportID LIMIT 12"]}
+{"sql":"SELECT \"Month\" FROM mytable WHERE DayofMonth BETWEEN 22 AND 12 LIMIT 11","hsqls":["SELECT `Month` FROM mytable WHERE DayofMonth BETWEEN 22 AND 12 LIMIT 11"]}
 {"sql":"SELECT DepDelayMinutes, ArrDel15, DivActualElapsedTime, MAX(DestCityMarketID) FROM mytable WHERE DivReachedDest >= 1 GROUP BY DepDelayMinutes, ArrDel15, DivActualElapsedTime  ORDER BY DepDelayMinutes, ArrDel15, DivActualElapsedTime LIMIT 15","hsqls":["SELECT DepDelayMinutes, ArrDel15, DivActualElapsedTime, MAX(DestCityMarketID) FROM mytable WHERE DivReachedDest >= 1 GROUP BY DepDelayMinutes, ArrDel15, DivActualElapsedTime  ORDER BY DepDelayMinutes, ArrDel15, DivActualElapsedTime LIMIT 15"]}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE TotalAddGTime NOT IN (30, 47, 41, 111, 103) OR DayOfWeek <= 6 OR CarrierDelay BETWEEN 7 AND 229 LIMIT 12"}
 {"sql":"SELECT CRSArrTime, COUNT(*) FROM mytable WHERE CarrierDelay >= 19 GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 8","hsqls":["SELECT CRSArrTime, COUNT(*) FROM mytable WHERE CarrierDelay >= 19 GROUP BY CRSArrTime  ORDER BY CRSArrTime LIMIT 8"]}
 {"sql":"SELECT DestState, ArrDelay, DaysSinceEpoch FROM mytable WHERE OriginState BETWEEN 'NE' AND 'NY' OR ArrDel15 BETWEEN -9999 AND 1 LIMIT 29"}
-{"sql":"SELECT DivAirports, OriginCityMarketID FROM mytable WHERE DestAirportSeqID BETWEEN 1209402 AND 1342202 ORDER BY OriginStateFips, DepTime, DestStateName LIMIT 8","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, OriginCityMarketID FROM mytable WHERE DestAirportSeqID BETWEEN 1209402 AND 1342202 ORDER BY OriginStateFips, DepTime, DestStateName LIMIT 10000"]}
+{"sql":"SELECT DivAirports, OriginCityMarketID FROM mytable WHERE DestAirportSeqID BETWEEN 1209402 AND 1342202 ORDER BY OriginStateFips, DepTime, DestStateName LIMIT 8","hsqls":["SELECT DivAirports, OriginCityMarketID FROM mytable WHERE DestAirportSeqID BETWEEN 1209402 AND 1342202 ORDER BY OriginStateFips, DepTime, DestStateName LIMIT 10000"]}
 {"sql":"SELECT DestStateName, NASDelay FROM mytable WHERE OriginCityName BETWEEN 'Roanoke, VA' AND 'Lewiston, ID' AND Quarter NOT IN (1) AND Carrier > 'FL' ORDER BY DivReachedDest, ArrivalDelayGroups LIMIT 23"}
-{"sql":"SELECT DayOfWeek FROM mytable WHERE WheelsOn IN (1935, 1657, 2339) AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 29","hsqls":["SELECT DayOfWeek FROM mytable WHERE WheelsOn IN (1935, 1657, 2339) AND Year BETWEEN 2014 AND 2014 LIMIT 29"]}
+{"sql":"SELECT DayOfWeek FROM mytable WHERE WheelsOn IN (1935, 1657, 2339) AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 29","hsqls":["SELECT DayOfWeek FROM mytable WHERE WheelsOn IN (1935, 1657, 2339) AND `Year` BETWEEN 2014 AND 2014 LIMIT 29"]}
 {"sql":"SELECT DepTime, TailNum, MIN(Flights), MAX(OriginAirportID) FROM mytable GROUP BY DepTime, TailNum  ORDER BY DepTime, TailNum LIMIT 16","hsqls":["SELECT DepTime, TailNum, MIN(Flights), MAX(OriginAirportID) FROM mytable GROUP BY DepTime, TailNum  ORDER BY DepTime, TailNum LIMIT 16"]}
 {"sql":"SELECT AVG(LongestAddGTime), SUM(DepDel15), SUM(DayOfWeek) FROM mytable LIMIT 1"}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE TotalAddGTime IN (128, 148, 4, 34) LIMIT 8"}
 {"sql":"SELECT DivDistance FROM mytable ORDER BY Cancelled, AirlineID LIMIT 19"}
 {"sql":"SELECT MIN(DivActualElapsedTime) FROM mytable WHERE ArrTime IN (512, 2223, 818, 1025) AND LongestAddGTime IN (55, 73) OR Flights NOT IN (1) LIMIT 4"}
-{"sql":"SELECT DivLongestGTimes, TotalAddGTime FROM mytable WHERE DivActualElapsedTime IN (247) OR NASDelay BETWEEN 157 AND 93 AND DivAirportSeqIDs < 1078102 ORDER BY LongestAddGTime LIMIT 22","hsqls":["SELECT DivLongestGTimes__MV0, DivLongestGTimes__MV1, DivLongestGTimes__MV2, DivLongestGTimes__MV3, DivLongestGTimes__MV4, TotalAddGTime FROM mytable WHERE DivActualElapsedTime IN (247) OR NASDelay BETWEEN 157 AND 93 AND (DivAirportSeqIDs__MV0 < 1078102 OR DivAirportSeqIDs__MV1 < 1078102 OR DivAirportSeqIDs__MV2 < 1078102 OR DivAirportSeqIDs__MV3 < 1078102 OR DivAirportSeqIDs__MV4 < 1078102) ORDER BY LongestAddGTime LIMIT 10000"]}
+{"sql":"SELECT DivLongestGTimes, TotalAddGTime FROM mytable WHERE DivActualElapsedTime IN (247) OR NASDelay BETWEEN 157 AND 93 AND DivAirportSeqIDs < 1078102 ORDER BY LongestAddGTime LIMIT 22","hsqls":["SELECT DivLongestGTimes, TotalAddGTime FROM mytable WHERE DivActualElapsedTime IN (247) OR NASDelay BETWEEN 157 AND 93 AND (DivAirportSeqIDs[1] < 1078102 OR DivAirportSeqIDs[2] < 1078102 OR DivAirportSeqIDs[3] < 1078102 OR DivAirportSeqIDs[4] < 1078102 OR DivAirportSeqIDs[5] < 1078102) ORDER BY LongestAddGTime LIMIT 10000"]}
 {"sql":"SELECT DayOfWeek FROM mytable WHERE DestAirportSeqID <= 1163703 AND TaxiOut BETWEEN 138 AND 90 ORDER BY ArrDelay, WheelsOn LIMIT 8"}
 {"sql":"SELECT AirTime, COUNT(*) FROM mytable WHERE FirstDepTime > 1018 GROUP BY AirTime  ORDER BY AirTime LIMIT 7","hsqls":["SELECT AirTime, COUNT(*) FROM mytable WHERE FirstDepTime > 1018 GROUP BY AirTime  ORDER BY AirTime LIMIT 7"]}
 {"sql":"SELECT AirTime, COUNT(DestAirportID) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 8","hsqls":["SELECT AirTime, COUNT(DestAirportID) FROM mytable GROUP BY AirTime  ORDER BY AirTime LIMIT 8"]}
-{"sql":"SELECT DestAirportID, DayofMonth, ArrivalDelayGroups, COUNT(\"Year\"), MIN(DestCityMarketID), MIN(DistanceGroup) FROM mytable WHERE Origin BETWEEN 'GJT' AND 'CLD' AND WheelsOn BETWEEN 1643 AND 818 OR OriginStateName BETWEEN 'Idaho' AND 'Maryland' GROUP BY DestAirportID, DayofMonth, ArrivalDelayGroups LIMIT 2","hsqls":["SELECT DestAirportID, DayofMonth, ArrivalDelayGroups, COUNT(Year), MIN(DestCityMarketID), MIN(DistanceGroup) FROM mytable WHERE Origin BETWEEN 'GJT' AND 'CLD' AND WheelsOn BETWEEN 1643 AND 818 OR OriginStateName BETWEEN 'Idaho' AND 'Maryland' GROUP BY DestAirportID, DayofMonth, ArrivalDelayGroups LIMIT 2"]}
-{"sql":"SELECT DivAirports, DepDel15 FROM mytable WHERE ActualElapsedTime BETWEEN 284 AND 36 OR DepDelayMinutes BETWEEN 54.0 AND 159.0 OR OriginStateName BETWEEN 'Louisiana' AND 'Iowa' ORDER BY CRSArrTime, Distance, OriginWac LIMIT 3","hsqls":["SELECT DivAirports__MV0, DivAirports__MV1, DivAirports__MV2, DivAirports__MV3, DivAirports__MV4, DepDel15 FROM mytable WHERE ActualElapsedTime BETWEEN 284 AND 36 OR DepDelayMinutes BETWEEN 54.0 AND 159.0 OR OriginStateName BETWEEN 'Louisiana' AND 'Iowa' ORDER BY CRSArrTime, Distance, OriginWac LIMIT 10000"]}
+{"sql":"SELECT DestAirportID, DayofMonth, ArrivalDelayGroups, COUNT(\"Year\"), MIN(DestCityMarketID), MIN(DistanceGroup) FROM mytable WHERE Origin BETWEEN 'GJT' AND 'CLD' AND WheelsOn BETWEEN 1643 AND 818 OR OriginStateName BETWEEN 'Idaho' AND 'Maryland' GROUP BY DestAirportID, DayofMonth, ArrivalDelayGroups LIMIT 2","hsqls":["SELECT DestAirportID, DayofMonth, ArrivalDelayGroups, COUNT(`Year`), MIN(DestCityMarketID), MIN(DistanceGroup) FROM mytable WHERE Origin BETWEEN 'GJT' AND 'CLD' AND WheelsOn BETWEEN 1643 AND 818 OR OriginStateName BETWEEN 'Idaho' AND 'Maryland' GROUP BY DestAirportID, DayofMonth, ArrivalDelayGroups LIMIT 2"]}
+{"sql":"SELECT DivAirports, DepDel15 FROM mytable WHERE ActualElapsedTime BETWEEN 284 AND 36 OR DepDelayMinutes BETWEEN 54.0 AND 159.0 OR OriginStateName BETWEEN 'Louisiana' AND 'Iowa' ORDER BY CRSArrTime, Distance, OriginWac LIMIT 3","hsqls":["SELECT DivAirports, DepDel15 FROM mytable WHERE ActualElapsedTime BETWEEN 284 AND 36 OR DepDelayMinutes BETWEEN 54.0 AND 159.0 OR OriginStateName BETWEEN 'Louisiana' AND 'Iowa' ORDER BY CRSArrTime, Distance, OriginWac LIMIT 10000"]}
 {"sql":"SELECT DistanceGroup FROM mytable ORDER BY TaxiOut, LongestAddGTime LIMIT 29"}
 {"sql":"SELECT SUM(OriginAirportID), COUNT(AirTime), MIN(FirstDepTime) FROM mytable WHERE FirstDepTime BETWEEN 612 AND 624 OR ArrDelayMinutes BETWEEN 321.0 AND 996.0 AND Flights IN (1) LIMIT 12"}
-{"sql":"SELECT DepDelayMinutes, Cancelled, \"Month\" FROM mytable WHERE DistanceGroup BETWEEN 1 AND 9 OR DivAirportIDs BETWEEN 12478 AND 15841 OR ArrTime IN (2238, 942, 2043, 538) ORDER BY DestState LIMIT 14","hsqls":["SELECT DepDelayMinutes, Cancelled, Month FROM mytable WHERE DistanceGroup BETWEEN 1 AND 9 OR (DivAirportIDs__MV0 BETWEEN 12478 AND 15841 OR DivAirportIDs__MV1 BETWEEN 12478 AND 15841 OR DivAirportIDs__MV2 BETWEEN 12478 AND 15841 OR DivAirportIDs__MV3 BETWEEN 12478 AND 15841 OR DivAirportIDs__MV4 BETWEEN 12478 AND 15841) OR ArrTime IN (2238, 942, 2043, 538) ORDER BY DestState LIMIT 10000"]}
+{"sql":"SELECT DepDelayMinutes, Cancelled, \"Month\" FROM mytable WHERE DistanceGroup BETWEEN 1 AND 9 OR DivAirportIDs BETWEEN 12478 AND 15841 OR ArrTime IN (2238, 942, 2043, 538) ORDER BY DestState LIMIT 14","hsqls":["SELECT DepDelayMinutes, Cancelled, `Month` FROM mytable WHERE DistanceGroup BETWEEN 1 AND 9 OR (DivAirportIDs[1] BETWEEN 12478 AND 15841 OR DivAirportIDs[2] BETWEEN 12478 AND 15841 OR DivAirportIDs[3] BETWEEN 12478 AND 15841 OR DivAirportIDs[4] BETWEEN 12478 AND 15841 OR DivAirportIDs[5] BETWEEN 12478 AND 15841) OR ArrTime IN (2238, 942, 2043, 538) ORDER BY DestState LIMIT 10000"]}
 {"sql":"SELECT OriginAirportID FROM mytable ORDER BY DivReachedDest, DepDel15 LIMIT 26"}
 {"sql":"SELECT DestStateName, MIN(DivActualElapsedTime), MAX(ArrTime) FROM mytable WHERE OriginAirportSeqID > 1350202 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 7","hsqls":["SELECT DestStateName, MIN(DivActualElapsedTime), MAX(ArrTime) FROM mytable WHERE OriginAirportSeqID > 1350202 GROUP BY DestStateName  ORDER BY DestStateName LIMIT 7"]}
 {"sql":"SELECT TotalAddGTime, SUM(ArrDelay) FROM mytable WHERE ArrDelayMinutes > 246.0 AND DayOfWeek < 6 AND AirlineID IN (20398, 19805, 21171, 19977) GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 4","hsqls":["SELECT TotalAddGTime, SUM(ArrDelay) FROM mytable WHERE ArrDelayMinutes > 246.0 AND DayOfWeek < 6 AND AirlineID IN (20398, 19805, 21171, 19977) GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 4"]}
-{"sql":"SELECT DivReachedDest FROM mytable WHERE ArrDelay <= 54.0 OR CRSArrTime = 701 OR DivTailNums IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') LIMIT 15","hsqls":["SELECT DivReachedDest FROM mytable WHERE ArrDelay <= 54.0 OR CRSArrTime = 701 OR (DivTailNums__MV0 IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums__MV1 IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums__MV2 IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums__MV3 IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums__MV4 IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA')) LIMIT 10000"]}
+{"sql":"SELECT DivReachedDest FROM mytable WHERE ArrDelay <= 54.0 OR CRSArrTime = 701 OR DivTailNums IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') LIMIT 15","hsqls":["SELECT DivReachedDest FROM mytable WHERE ArrDelay <= 54.0 OR CRSArrTime = 701 OR (DivTailNums[1] IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums[2] IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums[3] IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums[4] IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA') OR DivTailNums[5] IN ('N983DL', 'N393HA', 'N622AW', 'N458WN', 'N202AA')) LIMIT 10000"]}
 {"sql":"SELECT DestStateName, DestAirportID, SUM(DivAirportLandings), MAX(Quarter), COUNT(DivReachedDest) FROM mytable WHERE DaysSinceEpoch NOT IN (16084, 16072, 16075, 16078, 16089) GROUP BY DestStateName, DestAirportID  ORDER BY DestStateName, DestAirportID LIMIT 29","hsqls":["SELECT DestStateName, DestAirportID, SUM(DivAirportLandings), MAX(Quarter), COUNT(DivReachedDest) FROM mytable WHERE DaysSinceEpoch NOT IN (16084, 16072, 16075, 16078, 16089) GROUP BY DestStateName, DestAirportID  ORDER BY DestStateName, DestAirportID LIMIT 29"]}
 {"sql":"SELECT Origin, DivAirportLandings, MAX(DivReachedDest), SUM(DestStateFips), MAX(DestWac) FROM mytable WHERE DivDistance IN (176, 589) OR FlightDate NOT IN ('2014-01-13', '2014-01-22', '2014-01-16', '2014-01-08') GROUP BY Origin, DivAirportLandings  ORDER BY Origin, DivAirportLandings LIMIT 10","hsqls":["SELECT Origin, DivAirportLandings, MAX(DivReachedDest), SUM(DestStateFips), MAX(DestWac) FROM mytable WHERE DivDistance IN (176, 589) OR FlightDate NOT IN ('2014-01-13', '2014-01-22', '2014-01-16', '2014-01-08') GROUP BY Origin, DivAirportLandings  ORDER BY Origin, DivAirportLandings LIMIT 10"]}
 {"sql":"SELECT DepartureDelayGroups, AVG(DivReachedDest), MAX(ArrTime) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 19","hsqls":["SELECT DepartureDelayGroups, AVG(DivReachedDest), MAX(ArrTime) FROM mytable GROUP BY DepartureDelayGroups  ORDER BY DepartureDelayGroups LIMIT 19"]}
-{"sql":"SELECT DepTime, ArrivalDelayGroups, SUM(ArrDel15) FROM mytable WHERE DivAirportSeqIDs IN (1349503, 1098002, 1425202, 1448702, 1299204) OR ArrDelayMinutes BETWEEN 6.0 AND 203.0 AND DestStateFips <= 75 GROUP BY DepTime, ArrivalDelayGroups LIMIT 9","hsqls":["SELECT DepTime, ArrivalDelayGroups, SUM(ArrDel15) FROM mytable WHERE (DivAirportSeqIDs__MV0 IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs__MV1 IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs__MV2 IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs__MV3 IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs__MV4 IN (1349503, 1098002, 1425202, 1448702, 1299204)) OR ArrDelayMinutes BETWEEN 6.0 AND 203.0 AND DestStateFips <= 75 GROUP BY DepTime, ArrivalDelayGroups LIMIT 10000"]}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivTailNums BETWEEN 'N952WN' AND 'N747SA' ORDER BY ArrTimeBlk, DaysSinceEpoch LIMIT 6","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums__MV1 BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums__MV2 BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums__MV3 BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums__MV4 BETWEEN 'N952WN' AND 'N747SA') ORDER BY ArrTimeBlk, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT DepTime, ArrivalDelayGroups, SUM(ArrDel15) FROM mytable WHERE DivAirportSeqIDs IN (1349503, 1098002, 1425202, 1448702, 1299204) OR ArrDelayMinutes BETWEEN 6.0 AND 203.0 AND DestStateFips <= 75 GROUP BY DepTime, ArrivalDelayGroups LIMIT 9","hsqls":["SELECT DepTime, ArrivalDelayGroups, SUM(ArrDel15) FROM mytable WHERE (DivAirportSeqIDs[1] IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs[2] IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs[3] IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs[4] IN (1349503, 1098002, 1425202, 1448702, 1299204) OR DivAirportSeqIDs[5] IN (1349503, 1098002, 1425202, 1448702, 1299204)) OR ArrDelayMinutes BETWEEN 6.0 AND 203.0 AND DestStateFips <= 75 GROUP BY DepTime, ArrivalDelayGroups LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivTailNums BETWEEN 'N952WN' AND 'N747SA' ORDER BY ArrTimeBlk, DaysSinceEpoch LIMIT 6","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivTailNums[1] BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums[2] BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums[3] BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums[4] BETWEEN 'N952WN' AND 'N747SA' OR DivTailNums[5] BETWEEN 'N952WN' AND 'N747SA') ORDER BY ArrTimeBlk, DaysSinceEpoch LIMIT 10000"]}
 {"sql":"SELECT DepDelay, FlightNum FROM mytable ORDER BY OriginState, DivArrDelay, OriginStateName LIMIT 19"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE WheelsOff BETWEEN 1132 AND 1523 LIMIT 5"}
 {"sql":"SELECT Dest, DivActualElapsedTime FROM mytable WHERE LongestAddGTime BETWEEN 8 AND 103 OR CarrierDelay <= 13 AND UniqueCarrier IN ('DL', 'F9', 'WN', 'FL') ORDER BY DaysSinceEpoch LIMIT 13"}
@@ -9908,39 +9908,39 @@
 {"sql":"SELECT DestStateFips FROM mytable WHERE OriginWac BETWEEN 62 AND 11 OR WheelsOff < 1948 ORDER BY WheelsOff, Cancelled LIMIT 3"}
 {"sql":"SELECT LongestAddGTime, COUNT(OriginWac), SUM(DayofMonth) FROM mytable WHERE DestAirportSeqID > 1445702 AND Distance BETWEEN 750 AND 1005 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 1","hsqls":["SELECT LongestAddGTime, COUNT(OriginWac), SUM(DayofMonth) FROM mytable WHERE DestAirportSeqID > 1445702 AND Distance BETWEEN 750 AND 1005 GROUP BY LongestAddGTime  ORDER BY LongestAddGTime LIMIT 1"]}
 {"sql":"SELECT DepartureDelayGroups, DivReachedDest, DivAirportLandings FROM mytable WHERE WeatherDelay BETWEEN 103 AND 170 AND DistanceGroup BETWEEN 1 AND 3 OR DayOfWeek BETWEEN 7 AND 1 ORDER BY Origin LIMIT 27"}
-{"sql":"SELECT OriginCityName FROM mytable WHERE DivLongestGTimes BETWEEN 85.0 AND 21.0 OR TailNum BETWEEN 'N28478' AND 'N26210' OR DistanceGroup IN (7, 8) ORDER BY DestWac, NASDelay LIMIT 12","hsqls":["SELECT OriginCityName FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 85.0 AND 21.0 OR DivLongestGTimes__MV1 BETWEEN 85.0 AND 21.0 OR DivLongestGTimes__MV2 BETWEEN 85.0 AND 21.0 OR DivLongestGTimes__MV3 BETWEEN 85.0 AND 21.0 OR DivLongestGTimes__MV4 BETWEEN 85.0 AND 21.0) OR TailNum BETWEEN 'N28478' AND 'N26210' OR DistanceGroup IN (7, 8) ORDER BY DestWac, NASDelay LIMIT 10000"]}
+{"sql":"SELECT OriginCityName FROM mytable WHERE DivLongestGTimes BETWEEN 85.0 AND 21.0 OR TailNum BETWEEN 'N28478' AND 'N26210' OR DistanceGroup IN (7, 8) ORDER BY DestWac, NASDelay LIMIT 12","hsqls":["SELECT OriginCityName FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 85.0 AND 21.0 OR DivLongestGTimes[2] BETWEEN 85.0 AND 21.0 OR DivLongestGTimes[3] BETWEEN 85.0 AND 21.0 OR DivLongestGTimes[4] BETWEEN 85.0 AND 21.0 OR DivLongestGTimes[5] BETWEEN 85.0 AND 21.0) OR TailNum BETWEEN 'N28478' AND 'N26210' OR DistanceGroup IN (7, 8) ORDER BY DestWac, NASDelay LIMIT 10000"]}
 {"sql":"SELECT \"Year\", DepTime, DivActualElapsedTime FROM mytable ORDER BY DepartureDelayGroups, FlightDate LIMIT 5","hsqls":["SELECT Year, DepTime, DivActualElapsedTime FROM mytable ORDER BY DepartureDelayGroups, FlightDate LIMIT 5"]}
 {"sql":"SELECT DepDelay, ArrDelay, UniqueCarrier, COUNT(*) FROM mytable GROUP BY DepDelay, ArrDelay, UniqueCarrier  ORDER BY DepDelay, ArrDelay, UniqueCarrier LIMIT 25","hsqls":["SELECT DepDelay, ArrDelay, UniqueCarrier, COUNT(*) FROM mytable GROUP BY DepDelay, ArrDelay, UniqueCarrier  ORDER BY DepDelay, ArrDelay, UniqueCarrier LIMIT 25"]}
-{"sql":"SELECT WeatherDelay, OriginCityName, DivTailNums FROM mytable WHERE DepDel15 < 1 AND ArrDelayMinutes = 68.0 LIMIT 27","hsqls":["SELECT WeatherDelay, OriginCityName, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE DepDel15 < 1 AND ArrDelayMinutes = 68.0 LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, OriginCityName, DivTailNums FROM mytable WHERE DepDel15 < 1 AND ArrDelayMinutes = 68.0 LIMIT 27","hsqls":["SELECT WeatherDelay, OriginCityName, DivTailNums FROM mytable WHERE DepDel15 < 1 AND ArrDelayMinutes = 68.0 LIMIT 10000"]}
 {"sql":"SELECT LongestAddGTime, ArrTime FROM mytable WHERE AirTime BETWEEN 16 AND 158 AND Distance IN (227) AND DayofMonth NOT IN (21, 18, 9) ORDER BY LateAircraftDelay LIMIT 2"}
-{"sql":"SELECT Dest, UniqueCarrier FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 AND DivTailNums BETWEEN 'N430SW' AND 'N960SW' ORDER BY NASDelay, AirTime LIMIT 17","hsqls":["SELECT Dest, UniqueCarrier FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 AND (DivTailNums__MV0 BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums__MV1 BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums__MV2 BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums__MV3 BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums__MV4 BETWEEN 'N430SW' AND 'N960SW') ORDER BY NASDelay, AirTime LIMIT 10000"]}
-{"sql":"SELECT DayOfWeek FROM mytable WHERE DivWheelsOffs IN (58, 123, 1649, 1829) ORDER BY DepDelay, DivDistance, CancellationCode LIMIT 8","hsqls":["SELECT DayOfWeek FROM mytable WHERE (DivWheelsOffs__MV0 IN (58, 123, 1649, 1829) OR DivWheelsOffs__MV1 IN (58, 123, 1649, 1829) OR DivWheelsOffs__MV2 IN (58, 123, 1649, 1829) OR DivWheelsOffs__MV3 IN (58, 123, 1649, 1829) OR DivWheelsOffs__MV4 IN (58, 123, 1649, 1829)) ORDER BY DepDelay, DivDistance, CancellationCode LIMIT 10000"]}
+{"sql":"SELECT Dest, UniqueCarrier FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 AND DivTailNums BETWEEN 'N430SW' AND 'N960SW' ORDER BY NASDelay, AirTime LIMIT 17","hsqls":["SELECT Dest, UniqueCarrier FROM mytable WHERE DivAirportLandings BETWEEN 9 AND 2 AND (DivTailNums[1] BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums[2] BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums[3] BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums[4] BETWEEN 'N430SW' AND 'N960SW' OR DivTailNums[5] BETWEEN 'N430SW' AND 'N960SW') ORDER BY NASDelay, AirTime LIMIT 10000"]}
+{"sql":"SELECT DayOfWeek FROM mytable WHERE DivWheelsOffs IN (58, 123, 1649, 1829) ORDER BY DepDelay, DivDistance, CancellationCode LIMIT 8","hsqls":["SELECT DayOfWeek FROM mytable WHERE (DivWheelsOffs[1] IN (58, 123, 1649, 1829) OR DivWheelsOffs[2] IN (58, 123, 1649, 1829) OR DivWheelsOffs[3] IN (58, 123, 1649, 1829) OR DivWheelsOffs[4] IN (58, 123, 1649, 1829) OR DivWheelsOffs[5] IN (58, 123, 1649, 1829)) ORDER BY DepDelay, DivDistance, CancellationCode LIMIT 10000"]}
 {"sql":"SELECT DestState, CarrierDelay FROM mytable WHERE DestCityName = 'Grand Rapids, MI' AND WeatherDelay NOT IN (59, 138, 72, 271) AND ArrTimeBlk BETWEEN '2300-2359' AND '1300-1359' ORDER BY DepDelayMinutes, CRSElapsedTime LIMIT 10"}
 {"sql":"SELECT TotalAddGTime, AVG(ArrDelayMinutes), MIN(ActualElapsedTime), MAX(DayofMonth) FROM mytable WHERE DepDelay IN (225.0, 12.0, 290.0, 175.0) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 24","hsqls":["SELECT TotalAddGTime, AVG(ArrDelayMinutes), MIN(ActualElapsedTime), MAX(DayofMonth) FROM mytable WHERE DepDelay IN (225.0, 12.0, 290.0, 175.0) AND CancellationCode NOT IN ('A', 'B', 'C', 'noodles') GROUP BY TotalAddGTime  ORDER BY TotalAddGTime LIMIT 24"]}
 {"sql":"SELECT DivDistance, DepTime FROM mytable WHERE NASDelay IN (45, 55, 31, 9) LIMIT 26"}
 {"sql":"SELECT FirstDepTime, AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay BETWEEN 179.0 AND 57.0 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 4","hsqls":["SELECT FirstDepTime, AVG(DivActualElapsedTime) FROM mytable WHERE DepDelay BETWEEN 179.0 AND 57.0 GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 4"]}
-{"sql":"SELECT DivAirportSeqIDs, OriginWac FROM mytable WHERE DivAirportIDs BETWEEN 14113 AND 13424 ORDER BY DayofMonth LIMIT 1","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4, OriginWac FROM mytable WHERE (DivAirportIDs__MV0 BETWEEN 14113 AND 13424 OR DivAirportIDs__MV1 BETWEEN 14113 AND 13424 OR DivAirportIDs__MV2 BETWEEN 14113 AND 13424 OR DivAirportIDs__MV3 BETWEEN 14113 AND 13424 OR DivAirportIDs__MV4 BETWEEN 14113 AND 13424) ORDER BY DayofMonth LIMIT 10000"]}
-{"sql":"SELECT SUM(DayOfWeek) FROM mytable WHERE DivAirportIDs = 11298 OR Flights <= 1 LIMIT 2","hsqls":["SELECT SUM(DayOfWeek) FROM mytable WHERE (DivAirportIDs__MV0 = 11298 OR DivAirportIDs__MV1 = 11298 OR DivAirportIDs__MV2 = 11298 OR DivAirportIDs__MV3 = 11298 OR DivAirportIDs__MV4 = 11298) OR Flights <= 1 LIMIT 10000"]}
-{"sql":"SELECT SUM(Flights), AVG(WheelsOn) FROM mytable WHERE DivAirportIDs > 10257 OR DepDel15 BETWEEN 1 AND -9999 OR ArrDel15 BETWEEN -9999 AND 0 LIMIT 23","hsqls":["SELECT SUM(Flights), AVG(WheelsOn)  FROM mytable WHERE (DivAirportIDs__MV0 > 10257 OR DivAirportIDs__MV1 > 10257 OR DivAirportIDs__MV2 > 10257 OR DivAirportIDs__MV3 > 10257 OR DivAirportIDs__MV4 > 10257) OR DepDel15 BETWEEN 1 AND -9999 OR ArrDel15 BETWEEN -9999 AND 0 LIMIT 10000"]}
+{"sql":"SELECT DivAirportSeqIDs, OriginWac FROM mytable WHERE DivAirportIDs BETWEEN 14113 AND 13424 ORDER BY DayofMonth LIMIT 1","hsqls":["SELECT DivAirportSeqIDs, OriginWac FROM mytable WHERE (DivAirportIDs[1] BETWEEN 14113 AND 13424 OR DivAirportIDs[2] BETWEEN 14113 AND 13424 OR DivAirportIDs[3] BETWEEN 14113 AND 13424 OR DivAirportIDs[4] BETWEEN 14113 AND 13424 OR DivAirportIDs[5] BETWEEN 14113 AND 13424) ORDER BY DayofMonth LIMIT 10000"]}
+{"sql":"SELECT SUM(DayOfWeek) FROM mytable WHERE DivAirportIDs = 11298 OR Flights <= 1 LIMIT 2","hsqls":["SELECT SUM(DayOfWeek) FROM mytable WHERE (DivAirportIDs[1] = 11298 OR DivAirportIDs[2] = 11298 OR DivAirportIDs[3] = 11298 OR DivAirportIDs[4] = 11298 OR DivAirportIDs[5] = 11298) OR Flights <= 1 LIMIT 10000"]}
+{"sql":"SELECT SUM(Flights), AVG(WheelsOn) FROM mytable WHERE DivAirportIDs > 10257 OR DepDel15 BETWEEN 1 AND -9999 OR ArrDel15 BETWEEN -9999 AND 0 LIMIT 23","hsqls":["SELECT SUM(Flights), AVG(WheelsOn)  FROM mytable WHERE (DivAirportIDs[1] > 10257 OR DivAirportIDs[2] > 10257 OR DivAirportIDs[3] > 10257 OR DivAirportIDs[4] > 10257 OR DivAirportIDs[5] > 10257) OR DepDel15 BETWEEN 1 AND -9999 OR ArrDel15 BETWEEN -9999 AND 0 LIMIT 10000"]}
 {"sql":"SELECT Diverted, DestCityName, TailNum, COUNT(OriginStateFips), SUM(DepDelay), COUNT(TailNum) FROM mytable WHERE Carrier BETWEEN 'UA' AND 'HA' AND WheelsOff IN (1707, 1838, 1336, 744) GROUP BY Diverted, DestCityName, TailNum  ORDER BY Diverted, DestCityName, TailNum LIMIT 26","hsqls":["SELECT Diverted, DestCityName, TailNum, COUNT(OriginStateFips), SUM(DepDelay), COUNT(TailNum) FROM mytable WHERE Carrier BETWEEN 'UA' AND 'HA' AND WheelsOff IN (1707, 1838, 1336, 744) GROUP BY Diverted, DestCityName, TailNum  ORDER BY Diverted, DestCityName, TailNum LIMIT 26"]}
 {"sql":"SELECT DepDelay FROM mytable WHERE DepDelayMinutes BETWEEN 292.0 AND 237.0 AND DestState IN ('DE', 'AZ') LIMIT 18"}
-{"sql":"SELECT Carrier, DivTailNums, \"Month\" FROM mytable WHERE Flights NOT IN (1) OR DayOfWeek > 4 OR Quarter BETWEEN 1 AND 1 ORDER BY WeatherDelay, OriginCityName LIMIT 7","hsqls":["SELECT Carrier, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4, Month FROM mytable WHERE Flights NOT IN (1) OR DayOfWeek > 4 OR Quarter BETWEEN 1 AND 1 ORDER BY WeatherDelay, OriginCityName LIMIT 10000"]}
+{"sql":"SELECT Carrier, DivTailNums, \"Month\" FROM mytable WHERE Flights NOT IN (1) OR DayOfWeek > 4 OR Quarter BETWEEN 1 AND 1 ORDER BY WeatherDelay, OriginCityName LIMIT 7","hsqls":["SELECT Carrier, DivTailNums, `Month` FROM mytable WHERE Flights NOT IN (1) OR DayOfWeek > 4 OR Quarter BETWEEN 1 AND 1 ORDER BY WeatherDelay, OriginCityName LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay, ArrTime, DivArrDelay FROM mytable LIMIT 26"}
 {"sql":"SELECT OriginStateName FROM mytable WHERE Distance NOT IN (1927, 307, 309, 2173) OR ArrDel15 >= -9999 LIMIT 2"}
-{"sql":"SELECT WeatherDelay, SUM(DayofMonth) FROM mytable WHERE DivTailNums < 'N379DA' AND FlightNum BETWEEN 5524 AND 3576 OR LongestAddGTime IN (7) GROUP BY WeatherDelay LIMIT 26","hsqls":["SELECT WeatherDelay, SUM(DayofMonth) FROM mytable WHERE (DivTailNums__MV0 < 'N379DA' OR DivTailNums__MV1 < 'N379DA' OR DivTailNums__MV2 < 'N379DA' OR DivTailNums__MV3 < 'N379DA' OR DivTailNums__MV4 < 'N379DA') AND FlightNum BETWEEN 5524 AND 3576 OR LongestAddGTime IN (7) GROUP BY WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT WeatherDelay, SUM(DayofMonth) FROM mytable WHERE DivTailNums < 'N379DA' AND FlightNum BETWEEN 5524 AND 3576 OR LongestAddGTime IN (7) GROUP BY WeatherDelay LIMIT 26","hsqls":["SELECT WeatherDelay, SUM(DayofMonth) FROM mytable WHERE (DivTailNums[1] < 'N379DA' OR DivTailNums[2] < 'N379DA' OR DivTailNums[3] < 'N379DA' OR DivTailNums[4] < 'N379DA' OR DivTailNums[5] < 'N379DA') AND FlightNum BETWEEN 5524 AND 3576 OR LongestAddGTime IN (7) GROUP BY WeatherDelay LIMIT 10000"]}
 {"sql":"SELECT DestStateFips FROM mytable LIMIT 27"}
 {"sql":"SELECT TotalAddGTime, Dest, DestCityName, SUM(Flights), AVG(AirTime) FROM mytable WHERE TailNum BETWEEN 'N16170' AND 'N429WN' AND DaysSinceEpoch IN (16098, 16082, 16087) AND UniqueCarrier > 'EV' GROUP BY TotalAddGTime, Dest, DestCityName  ORDER BY TotalAddGTime, Dest, DestCityName LIMIT 22","hsqls":["SELECT TotalAddGTime, Dest, DestCityName, SUM(Flights), AVG(AirTime) FROM mytable WHERE TailNum BETWEEN 'N16170' AND 'N429WN' AND DaysSinceEpoch IN (16098, 16082, 16087) AND UniqueCarrier > 'EV' GROUP BY TotalAddGTime, Dest, DestCityName  ORDER BY TotalAddGTime, Dest, DestCityName LIMIT 22"]}
 {"sql":"SELECT Cancelled FROM mytable WHERE AirTime <> 30 AND TailNum NOT IN ('N5ELAA', 'N5FDAA', 'N556WN', 'N568AS') OR CRSDepTime BETWEEN 618 AND 1320 ORDER BY DestCityMarketID LIMIT 6"}
 {"sql":"SELECT DepDelayMinutes FROM mytable WHERE Flights BETWEEN 1 AND 1 OR UniqueCarrier BETWEEN 'UA' AND 'WN' OR OriginAirportSeqID BETWEEN 1477101 AND 1100303 LIMIT 28"}
 {"sql":"SELECT LongestAddGTime, OriginStateName, OriginAirportID FROM mytable ORDER BY DestStateFips LIMIT 20"}
-{"sql":"SELECT DepDelay, Cancelled, DivWheelsOffs FROM mytable WHERE DivLongestGTimes BETWEEN 43.0 AND 56.0 ORDER BY DistanceGroup, WeatherDelay LIMIT 26","hsqls":["SELECT DepDelay, Cancelled, DivWheelsOffs__MV0, DivWheelsOffs__MV1, DivWheelsOffs__MV2, DivWheelsOffs__MV3, DivWheelsOffs__MV4 FROM mytable WHERE (DivLongestGTimes__MV0 BETWEEN 43.0 AND 56.0 OR DivLongestGTimes__MV1 BETWEEN 43.0 AND 56.0 OR DivLongestGTimes__MV2 BETWEEN 43.0 AND 56.0 OR DivLongestGTimes__MV3 BETWEEN 43.0 AND 56.0 OR DivLongestGTimes__MV4 BETWEEN 43.0 AND 56.0) ORDER BY DistanceGroup, WeatherDelay LIMIT 10000"]}
-{"sql":"SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' AND DivAirportSeqIDs >= 1302402 AND OriginStateName BETWEEN 'Oklahoma' AND 'Minnesota' ORDER BY DepDelayMinutes, AirlineID, UniqueCarrier LIMIT 7","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' AND (DivAirportSeqIDs__MV0 >= 1302402 OR DivAirportSeqIDs__MV1 >= 1302402 OR DivAirportSeqIDs__MV2 >= 1302402 OR DivAirportSeqIDs__MV3 >= 1302402 OR DivAirportSeqIDs__MV4 >= 1302402) AND OriginStateName BETWEEN 'Oklahoma' AND 'Minnesota' ORDER BY DepDelayMinutes, AirlineID, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT DepDelay, Cancelled, DivWheelsOffs FROM mytable WHERE DivLongestGTimes BETWEEN 43.0 AND 56.0 ORDER BY DistanceGroup, WeatherDelay LIMIT 26","hsqls":["SELECT DepDelay, Cancelled, DivWheelsOffs FROM mytable WHERE (DivLongestGTimes[1] BETWEEN 43.0 AND 56.0 OR DivLongestGTimes[2] BETWEEN 43.0 AND 56.0 OR DivLongestGTimes[3] BETWEEN 43.0 AND 56.0 OR DivLongestGTimes[4] BETWEEN 43.0 AND 56.0 OR DivLongestGTimes[5] BETWEEN 43.0 AND 56.0) ORDER BY DistanceGroup, WeatherDelay LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' AND DivAirportSeqIDs >= 1302402 AND OriginStateName BETWEEN 'Oklahoma' AND 'Minnesota' ORDER BY DepDelayMinutes, AirlineID, UniqueCarrier LIMIT 7","hsqls":["SELECT OriginAirportSeqID, DestAirportSeqID FROM mytable WHERE CancellationCode BETWEEN 'C' AND 'B' AND (DivAirportSeqIDs[1] >= 1302402 OR DivAirportSeqIDs[2] >= 1302402 OR DivAirportSeqIDs[3] >= 1302402 OR DivAirportSeqIDs[4] >= 1302402 OR DivAirportSeqIDs[5] >= 1302402) AND OriginStateName BETWEEN 'Oklahoma' AND 'Minnesota' ORDER BY DepDelayMinutes, AirlineID, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT DivReachedDest, COUNT(DayofMonth), MAX(AirTime) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 7","hsqls":["SELECT DivReachedDest, COUNT(DayofMonth), MAX(AirTime) FROM mytable GROUP BY DivReachedDest  ORDER BY DivReachedDest LIMIT 7"]}
 {"sql":"SELECT DivDistance, DestState, OriginCityMarketID FROM mytable ORDER BY DayOfWeek LIMIT 10"}
 {"sql":"SELECT COUNT(*) FROM mytable LIMIT 26"}
-{"sql":"SELECT DivReachedDest, COUNT(\"Month\"), SUM(WheelsOn), AVG(Flights) FROM mytable WHERE DestAirportSeqID BETWEEN 1348702 AND 1541103 AND DestAirportSeqID IN (1233502, 1160302, 1325602, 1306104) AND DayofMonth <= 2 GROUP BY DivReachedDest LIMIT 14","hsqls":["SELECT DivReachedDest, COUNT(Month), SUM(WheelsOn), AVG(Flights) FROM mytable WHERE DestAirportSeqID BETWEEN 1348702 AND 1541103 AND DestAirportSeqID IN (1233502, 1160302, 1325602, 1306104) AND DayofMonth <= 2 GROUP BY DivReachedDest LIMIT 14"]}
+{"sql":"SELECT DivReachedDest, COUNT(\"Month\"), SUM(WheelsOn), AVG(Flights) FROM mytable WHERE DestAirportSeqID BETWEEN 1348702 AND 1541103 AND DestAirportSeqID IN (1233502, 1160302, 1325602, 1306104) AND DayofMonth <= 2 GROUP BY DivReachedDest LIMIT 14","hsqls":["SELECT DivReachedDest, COUNT(`Month`), SUM(WheelsOn), AVG(Flights) FROM mytable WHERE DestAirportSeqID BETWEEN 1348702 AND 1541103 AND DestAirportSeqID IN (1233502, 1160302, 1325602, 1306104) AND DayofMonth <= 2 GROUP BY DivReachedDest LIMIT 14"]}
 {"sql":"SELECT Carrier, MAX(OriginAirportSeqID), MAX(DepTime), AVG(FirstDepTime) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '1400-1459', '1500-1559') GROUP BY Carrier  ORDER BY Carrier LIMIT 4","hsqls":["SELECT Carrier, MAX(OriginAirportSeqID), MAX(DepTime), AVG(FirstDepTime) FROM mytable WHERE ArrTimeBlk IN ('1700-1759', '1300-1359', '1400-1459', '1500-1559') GROUP BY Carrier  ORDER BY Carrier LIMIT 4"]}
-{"sql":"SELECT SecurityDelay, Cancelled FROM mytable WHERE DivTailNums IN ('N515MQ', 'N284JB') AND Diverted < 1 AND Flights BETWEEN 1 AND 1 ORDER BY CRSArrTime, ArrTimeBlk, DayofMonth LIMIT 20","hsqls":["SELECT SecurityDelay, Cancelled FROM mytable WHERE (DivTailNums__MV0 IN ('N515MQ', 'N284JB') OR DivTailNums__MV1 IN ('N515MQ', 'N284JB') OR DivTailNums__MV2 IN ('N515MQ', 'N284JB') OR DivTailNums__MV3 IN ('N515MQ', 'N284JB') OR DivTailNums__MV4 IN ('N515MQ', 'N284JB')) AND Diverted < 1 AND Flights BETWEEN 1 AND 1 ORDER BY CRSArrTime, ArrTimeBlk, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, Cancelled FROM mytable WHERE DivTailNums IN ('N515MQ', 'N284JB') AND Diverted < 1 AND Flights BETWEEN 1 AND 1 ORDER BY CRSArrTime, ArrTimeBlk, DayofMonth LIMIT 20","hsqls":["SELECT SecurityDelay, Cancelled FROM mytable WHERE (DivTailNums[1] IN ('N515MQ', 'N284JB') OR DivTailNums[2] IN ('N515MQ', 'N284JB') OR DivTailNums[3] IN ('N515MQ', 'N284JB') OR DivTailNums[4] IN ('N515MQ', 'N284JB') OR DivTailNums[5] IN ('N515MQ', 'N284JB')) AND Diverted < 1 AND Flights BETWEEN 1 AND 1 ORDER BY CRSArrTime, ArrTimeBlk, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT DayofMonth FROM mytable WHERE ArrTimeBlk IN ('2200-2259', '0700-0759', '1500-1559') ORDER BY Quarter, FlightDate, ArrDel15 LIMIT 5"}
 {"sql":"SELECT OriginCityMarketID, DivActualElapsedTime FROM mytable LIMIT 12"}
 {"sql":"SELECT FirstDepTime, WeatherDelay, AVG(DestAirportSeqID), AVG(Diverted) FROM mytable GROUP BY FirstDepTime, WeatherDelay  ORDER BY FirstDepTime, WeatherDelay LIMIT 21","hsqls":["SELECT FirstDepTime, WeatherDelay, AVG(DestAirportSeqID), AVG(Diverted) FROM mytable GROUP BY FirstDepTime, WeatherDelay  ORDER BY FirstDepTime, WeatherDelay LIMIT 21"]}
@@ -9950,68 +9950,68 @@
 {"sql":"SELECT TailNum FROM mytable WHERE AirTime BETWEEN 50 AND 117 OR DivActualElapsedTime NOT IN (391, 480, 422) OR Diverted BETWEEN 0 AND 0 ORDER BY ArrTimeBlk LIMIT 26"}
 {"sql":"SELECT COUNT(Dest), MAX(DestWac) FROM mytable LIMIT 9"}
 {"sql":"SELECT COUNT(DivDistance) FROM mytable LIMIT 1"}
-{"sql":"SELECT AVG(TaxiIn) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DivReachedDest BETWEEN -9999 AND 1 LIMIT 11","hsqls":["SELECT AVG(TaxiIn) FROM mytable WHERE Year BETWEEN 2014 AND 2014 AND DivReachedDest BETWEEN -9999 AND 1 LIMIT 11"]}
+{"sql":"SELECT AVG(TaxiIn) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 AND DivReachedDest BETWEEN -9999 AND 1 LIMIT 11","hsqls":["SELECT AVG(TaxiIn) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 AND DivReachedDest BETWEEN -9999 AND 1 LIMIT 11"]}
 {"sql":"SELECT DestCityMarketID FROM mytable ORDER BY DestState LIMIT 5"}
-{"sql":"SELECT DestWac, Flights, DestCityName, COUNT(*) FROM mytable WHERE DivWheelsOffs IN (807, 57, 1724, 2122) OR Dest IN ('TPA', 'TYR', 'AGS', 'TUL', 'MEM') GROUP BY DestWac, Flights, DestCityName LIMIT 3","hsqls":["SELECT DestWac, Flights, DestCityName, COUNT(*) FROM mytable WHERE (DivWheelsOffs__MV0 IN (807, 57, 1724, 2122) OR DivWheelsOffs__MV1 IN (807, 57, 1724, 2122) OR DivWheelsOffs__MV2 IN (807, 57, 1724, 2122) OR DivWheelsOffs__MV3 IN (807, 57, 1724, 2122) OR DivWheelsOffs__MV4 IN (807, 57, 1724, 2122)) OR Dest IN ('TPA', 'TYR', 'AGS', 'TUL', 'MEM') GROUP BY DestWac, Flights, DestCityName LIMIT 10000"]}
+{"sql":"SELECT DestWac, Flights, DestCityName, COUNT(*) FROM mytable WHERE DivWheelsOffs IN (807, 57, 1724, 2122) OR Dest IN ('TPA', 'TYR', 'AGS', 'TUL', 'MEM') GROUP BY DestWac, Flights, DestCityName LIMIT 3","hsqls":["SELECT DestWac, Flights, DestCityName, COUNT(*) FROM mytable WHERE (DivWheelsOffs[1] IN (807, 57, 1724, 2122) OR DivWheelsOffs[2] IN (807, 57, 1724, 2122) OR DivWheelsOffs[3] IN (807, 57, 1724, 2122) OR DivWheelsOffs[4] IN (807, 57, 1724, 2122) OR DivWheelsOffs[5] IN (807, 57, 1724, 2122)) OR Dest IN ('TPA', 'TYR', 'AGS', 'TUL', 'MEM') GROUP BY DestWac, Flights, DestCityName LIMIT 10000"]}
 {"sql":"SELECT DepDelay, DestStateFips FROM mytable ORDER BY Distance LIMIT 15"}
 {"sql":"SELECT OriginState, LongestAddGTime, ActualElapsedTime, MIN(Distance) FROM mytable WHERE LateAircraftDelay IN (98, 95, 64, 70, 140) GROUP BY OriginState, LongestAddGTime, ActualElapsedTime  ORDER BY OriginState, LongestAddGTime, ActualElapsedTime LIMIT 26","hsqls":["SELECT OriginState, LongestAddGTime, ActualElapsedTime, MIN(Distance) FROM mytable WHERE LateAircraftDelay IN (98, 95, 64, 70, 140) GROUP BY OriginState, LongestAddGTime, ActualElapsedTime  ORDER BY OriginState, LongestAddGTime, ActualElapsedTime LIMIT 26"]}
 {"sql":"SELECT TaxiOut, OriginCityName FROM mytable WHERE ArrDelayMinutes <> 136.0 AND ArrDelay NOT IN (288.0, 222.0, 7.0) ORDER BY DestState, TotalAddGTime LIMIT 18"}
 {"sql":"SELECT OriginCityName FROM mytable WHERE FlightDate BETWEEN '2014-01-20' AND '2014-01-26' LIMIT 3"}
 {"sql":"SELECT Dest FROM mytable LIMIT 20"}
-{"sql":"SELECT \"Year\", MIN(OriginAirportID), MAX(DestWac) FROM mytable WHERE ArrTime = 1936 OR DivWheelsOns IN (1708, 724, 1838, 2137) GROUP BY \"Year\" LIMIT 1","hsqls":["SELECT Year, MIN(OriginAirportID), MAX(DestWac) FROM mytable WHERE ArrTime = 1936 OR (DivWheelsOns__MV0 IN (1708, 724, 1838, 2137) OR DivWheelsOns__MV1 IN (1708, 724, 1838, 2137) OR DivWheelsOns__MV2 IN (1708, 724, 1838, 2137) OR DivWheelsOns__MV3 IN (1708, 724, 1838, 2137) OR DivWheelsOns__MV4 IN (1708, 724, 1838, 2137)) GROUP BY Year LIMIT 10000"]}
+{"sql":"SELECT \"Year\", MIN(OriginAirportID), MAX(DestWac) FROM mytable WHERE ArrTime = 1936 OR DivWheelsOns IN (1708, 724, 1838, 2137) GROUP BY \"Year\" LIMIT 1","hsqls":["SELECT Year, MIN(OriginAirportID), MAX(DestWac) FROM mytable WHERE ArrTime = 1936 OR (DivWheelsOns[1] IN (1708, 724, 1838, 2137) OR DivWheelsOns[2] IN (1708, 724, 1838, 2137) OR DivWheelsOns[3] IN (1708, 724, 1838, 2137) OR DivWheelsOns[4] IN (1708, 724, 1838, 2137) OR DivWheelsOns[5] IN (1708, 724, 1838, 2137)) GROUP BY `Year` LIMIT 10000"]}
 {"sql":"SELECT DivDistance, DestCityMarketID, COUNT(Carrier), COUNT(DestStateFips), AVG(SecurityDelay) FROM mytable WHERE OriginStateFips NOT IN (2, 31, 53) GROUP BY DivDistance, DestCityMarketID  ORDER BY DivDistance, DestCityMarketID LIMIT 18","hsqls":["SELECT DivDistance, DestCityMarketID, COUNT(Carrier), COUNT(DestStateFips), AVG(SecurityDelay) FROM mytable WHERE OriginStateFips NOT IN (2, 31, 53) GROUP BY DivDistance, DestCityMarketID  ORDER BY DivDistance, DestCityMarketID LIMIT 18"]}
 {"sql":"SELECT DepDelayMinutes, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, ArrTimeBlk  ORDER BY DepDelayMinutes, ArrTimeBlk LIMIT 1","hsqls":["SELECT DepDelayMinutes, ArrTimeBlk, COUNT(*) FROM mytable GROUP BY DepDelayMinutes, ArrTimeBlk  ORDER BY DepDelayMinutes, ArrTimeBlk LIMIT 1"]}
-{"sql":"SELECT ArrTime, DestAirportID FROM mytable WHERE DivWheelsOffs BETWEEN 908 AND 1401 LIMIT 26","hsqls":["SELECT ArrTime, DestAirportID FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 908 AND 1401 OR DivWheelsOffs__MV1 BETWEEN 908 AND 1401 OR DivWheelsOffs__MV2 BETWEEN 908 AND 1401 OR DivWheelsOffs__MV3 BETWEEN 908 AND 1401 OR DivWheelsOffs__MV4 BETWEEN 908 AND 1401) LIMIT 10000"]}
-{"sql":"SELECT ActualElapsedTime, AVG(\"Month\"), SUM(ActualElapsedTime), MIN(ArrDel15) FROM mytable WHERE FlightDate NOT IN ('2014-01-11') GROUP BY ActualElapsedTime LIMIT 19","hsqls":["SELECT ActualElapsedTime, AVG(Month), SUM(ActualElapsedTime), MIN(ArrDel15) FROM mytable WHERE FlightDate NOT IN ('2014-01-11') GROUP BY ActualElapsedTime LIMIT 19"]}
+{"sql":"SELECT ArrTime, DestAirportID FROM mytable WHERE DivWheelsOffs BETWEEN 908 AND 1401 LIMIT 26","hsqls":["SELECT ArrTime, DestAirportID FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 908 AND 1401 OR DivWheelsOffs[2] BETWEEN 908 AND 1401 OR DivWheelsOffs[3] BETWEEN 908 AND 1401 OR DivWheelsOffs[4] BETWEEN 908 AND 1401 OR DivWheelsOffs[5] BETWEEN 908 AND 1401) LIMIT 10000"]}
+{"sql":"SELECT ActualElapsedTime, AVG(\"Month\"), SUM(ActualElapsedTime), MIN(ArrDel15) FROM mytable WHERE FlightDate NOT IN ('2014-01-11') GROUP BY ActualElapsedTime LIMIT 19","hsqls":["SELECT ActualElapsedTime, AVG(`Month`), SUM(ActualElapsedTime), MIN(ArrDel15) FROM mytable WHERE FlightDate NOT IN ('2014-01-11') GROUP BY ActualElapsedTime LIMIT 19"]}
 {"sql":"SELECT TaxiOut FROM mytable WHERE OriginCityMarketID IN (34614, 30599) AND WheelsOn BETWEEN 2307 AND 921 LIMIT 24"}
-{"sql":"SELECT WheelsOn FROM mytable WHERE DivAirportIDs <= 12448 AND DepartureDelayGroups BETWEEN 1 AND 4 AND FlightDate > '2014-01-24' ORDER BY DayofMonth, DayOfWeek, OriginStateName LIMIT 29","hsqls":["SELECT WheelsOn FROM mytable WHERE (DivAirportIDs__MV0 <= 12448 OR DivAirportIDs__MV1 <= 12448 OR DivAirportIDs__MV2 <= 12448 OR DivAirportIDs__MV3 <= 12448 OR DivAirportIDs__MV4 <= 12448) AND DepartureDelayGroups BETWEEN 1 AND 4 AND FlightDate > '2014-01-24' ORDER BY DayofMonth, DayOfWeek, OriginStateName LIMIT 10000"]}
-{"sql":"SELECT Carrier, DivAirportSeqIDs FROM mytable WHERE ArrDelayMinutes NOT IN (226.0, 106.0, 414.0, 148.0, 47.0) ORDER BY LateAircraftDelay, UniqueCarrier LIMIT 7","hsqls":["SELECT Carrier, DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE ArrDelayMinutes NOT IN (226.0, 106.0, 414.0, 148.0, 47.0) ORDER BY LateAircraftDelay, UniqueCarrier LIMIT 10000"]}
+{"sql":"SELECT WheelsOn FROM mytable WHERE DivAirportIDs <= 12448 AND DepartureDelayGroups BETWEEN 1 AND 4 AND FlightDate > '2014-01-24' ORDER BY DayofMonth, DayOfWeek, OriginStateName LIMIT 29","hsqls":["SELECT WheelsOn FROM mytable WHERE (DivAirportIDs[1] <= 12448 OR DivAirportIDs[2] <= 12448 OR DivAirportIDs[3] <= 12448 OR DivAirportIDs[4] <= 12448 OR DivAirportIDs[5] <= 12448) AND DepartureDelayGroups BETWEEN 1 AND 4 AND FlightDate > '2014-01-24' ORDER BY DayofMonth, DayOfWeek, OriginStateName LIMIT 10000"]}
+{"sql":"SELECT Carrier, DivAirportSeqIDs FROM mytable WHERE ArrDelayMinutes NOT IN (226.0, 106.0, 414.0, 148.0, 47.0) ORDER BY LateAircraftDelay, UniqueCarrier LIMIT 7","hsqls":["SELECT Carrier, DivAirportSeqIDs FROM mytable WHERE ArrDelayMinutes NOT IN (226.0, 106.0, 414.0, 148.0, 47.0) ORDER BY LateAircraftDelay, UniqueCarrier LIMIT 10000"]}
 {"sql":"SELECT FlightNum FROM mytable ORDER BY OriginStateFips, NASDelay, WheelsOn LIMIT 26"}
 {"sql":"SELECT COUNT(DestCityName) FROM mytable WHERE DestAirportSeqID <> 1457002 LIMIT 22"}
-{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DayofMonth NOT IN (4, 18, 14) OR \"Year\" < 2014 AND DepTimeBlk >= '1000-1059' ORDER BY OriginAirportSeqID, DivActualElapsedTime LIMIT 19","hsqls":["SELECT DivAirportSeqIDs__MV0, DivAirportSeqIDs__MV1, DivAirportSeqIDs__MV2, DivAirportSeqIDs__MV3, DivAirportSeqIDs__MV4 FROM mytable WHERE DayofMonth NOT IN (4, 18, 14) OR Year < 2014 AND DepTimeBlk >= '1000-1059' ORDER BY OriginAirportSeqID, DivActualElapsedTime LIMIT 10000"]}
-{"sql":"SELECT MAX(ArrDelay), AVG(\"Month\"), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14","hsqls":["SELECT MAX(ArrDelay), AVG(Month), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14"]}
-{"sql":"SELECT AVG(\"Year\"), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable LIMIT 22","hsqls":["SELECT AVG(Year), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable LIMIT 22"]}
+{"sql":"SELECT DivAirportSeqIDs FROM mytable WHERE DayofMonth NOT IN (4, 18, 14) OR \"Year\" < 2014 AND DepTimeBlk >= '1000-1059' ORDER BY OriginAirportSeqID, DivActualElapsedTime LIMIT 19","hsqls":["SELECT DivAirportSeqIDs FROM mytable WHERE DayofMonth NOT IN (4, 18, 14) OR `Year` < 2014 AND DepTimeBlk >= '1000-1059' ORDER BY OriginAirportSeqID, DivActualElapsedTime LIMIT 10000"]}
+{"sql":"SELECT MAX(ArrDelay), AVG(\"Month\"), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14","hsqls":["SELECT MAX(ArrDelay), AVG(`Month`), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14"]}
+{"sql":"SELECT AVG(\"Year\"), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable LIMIT 22","hsqls":["SELECT AVG(`Year`), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable LIMIT 22"]}
 {"sql":"SELECT FlightDate, SUM(OriginAirportID), SUM(CRSArrTime) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR DivActualElapsedTime <= 338 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 18","hsqls":["SELECT FlightDate, SUM(OriginAirportID), SUM(CRSArrTime) FROM mytable WHERE DepDel15 IN (1, 0, -9999) OR DivActualElapsedTime <= 338 GROUP BY FlightDate  ORDER BY FlightDate LIMIT 18"]}
-{"sql":"SELECT \"Year\", DivWheelsOns, AirTime FROM mytable LIMIT 24","hsqls":["SELECT Year, DivWheelsOns__MV0, DivWheelsOns__MV1, DivWheelsOns__MV2, DivWheelsOns__MV3, DivWheelsOns__MV4, AirTime FROM mytable LIMIT 10000"]}
+{"sql":"SELECT \"Year\", DivWheelsOns, AirTime FROM mytable LIMIT 24","hsqls":["SELECT Year, DivWheelsOns, AirTime FROM mytable LIMIT 10000"]}
 {"sql":"SELECT CarrierDelay, DayofMonth, DivArrDelay FROM mytable WHERE DepTimeBlk <> '0600-0659' ORDER BY DivArrDelay LIMIT 7"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE Origin <> 'AVL' OR Diverted = 0 LIMIT 7"}
-{"sql":"SELECT Dest, UniqueCarrier FROM mytable WHERE DivWheelsOffs > 1157 AND OriginWac BETWEEN 45 AND 31 OR Carrier BETWEEN 'B6' AND 'VX' ORDER BY DepTime, AirTime, ArrDelay LIMIT 2","hsqls":["SELECT Dest, UniqueCarrier FROM mytable WHERE (DivWheelsOffs__MV0 > 1157 OR DivWheelsOffs__MV1 > 1157 OR DivWheelsOffs__MV2 > 1157 OR DivWheelsOffs__MV3 > 1157 OR DivWheelsOffs__MV4 > 1157) AND OriginWac BETWEEN 45 AND 31 OR Carrier BETWEEN 'B6' AND 'VX' ORDER BY DepTime, AirTime, ArrDelay LIMIT 10000"]}
+{"sql":"SELECT Dest, UniqueCarrier FROM mytable WHERE DivWheelsOffs > 1157 AND OriginWac BETWEEN 45 AND 31 OR Carrier BETWEEN 'B6' AND 'VX' ORDER BY DepTime, AirTime, ArrDelay LIMIT 2","hsqls":["SELECT Dest, UniqueCarrier FROM mytable WHERE (DivWheelsOffs[1] > 1157 OR DivWheelsOffs[2] > 1157 OR DivWheelsOffs[3] > 1157 OR DivWheelsOffs[4] > 1157 OR DivWheelsOffs[5] > 1157) AND OriginWac BETWEEN 45 AND 31 OR Carrier BETWEEN 'B6' AND 'VX' ORDER BY DepTime, AirTime, ArrDelay LIMIT 10000"]}
 {"sql":"SELECT ActualElapsedTime FROM mytable WHERE UniqueCarrier NOT IN ('US', 'AS', 'VX') AND DayofMonth <= 24 ORDER BY ActualElapsedTime, NASDelay LIMIT 9"}
 {"sql":"SELECT CRSArrTime, AirlineID, CRSElapsedTime FROM mytable WHERE NASDelay IN (67, 20, 1, 68) LIMIT 1"}
 {"sql":"SELECT LateAircraftDelay FROM mytable ORDER BY DepTime, DestCityName, OriginStateName LIMIT 6"}
-{"sql":"SELECT FirstDepTime, TaxiIn, ArrTime, MAX(WheelsOff) FROM mytable WHERE CRSDepTime BETWEEN 2241 AND 1217 OR \"Year\" BETWEEN 2014 AND 2014 GROUP BY FirstDepTime, TaxiIn, ArrTime LIMIT 16","hsqls":["SELECT FirstDepTime, TaxiIn, ArrTime, MAX(WheelsOff) FROM mytable WHERE CRSDepTime BETWEEN 2241 AND 1217 OR Year BETWEEN 2014 AND 2014 GROUP BY FirstDepTime, TaxiIn, ArrTime LIMIT 16"]}
+{"sql":"SELECT FirstDepTime, TaxiIn, ArrTime, MAX(WheelsOff) FROM mytable WHERE CRSDepTime BETWEEN 2241 AND 1217 OR \"Year\" BETWEEN 2014 AND 2014 GROUP BY FirstDepTime, TaxiIn, ArrTime LIMIT 16","hsqls":["SELECT FirstDepTime, TaxiIn, ArrTime, MAX(WheelsOff) FROM mytable WHERE CRSDepTime BETWEEN 2241 AND 1217 OR `Year` BETWEEN 2014 AND 2014 GROUP BY FirstDepTime, TaxiIn, ArrTime LIMIT 16"]}
 {"sql":"SELECT OriginCityMarketID, ArrDelay, OriginStateName FROM mytable WHERE CancellationCode >= 'A' OR OriginCityMarketID BETWEEN 30631 AND 34457 OR WheelsOn BETWEEN 824 AND 953 LIMIT 9"}
-{"sql":"SELECT Dest, DayofMonth, MIN(ArrDelay) FROM mytable WHERE DivWheelsOns = 2010 AND LongestAddGTime IN (41, 4, 34) OR DepTime <> 2133 GROUP BY Dest, DayofMonth LIMIT 9","hsqls":["SELECT Dest, DayofMonth, MIN(ArrDelay) FROM mytable WHERE (DivWheelsOns__MV0 = 2010 OR DivWheelsOns__MV1 = 2010 OR DivWheelsOns__MV2 = 2010 OR DivWheelsOns__MV3 = 2010 OR DivWheelsOns__MV4 = 2010) AND LongestAddGTime IN (41, 4, 34) OR DepTime <> 2133 GROUP BY Dest, DayofMonth LIMIT 10000"]}
+{"sql":"SELECT Dest, DayofMonth, MIN(ArrDelay) FROM mytable WHERE DivWheelsOns = 2010 AND LongestAddGTime IN (41, 4, 34) OR DepTime <> 2133 GROUP BY Dest, DayofMonth LIMIT 9","hsqls":["SELECT Dest, DayofMonth, MIN(ArrDelay) FROM mytable WHERE (DivWheelsOns[1] = 2010 OR DivWheelsOns[2] = 2010 OR DivWheelsOns[3] = 2010 OR DivWheelsOns[4] = 2010 OR DivWheelsOns[5] = 2010) AND LongestAddGTime IN (41, 4, 34) OR DepTime <> 2133 GROUP BY Dest, DayofMonth LIMIT 10000"]}
 {"sql":"SELECT SecurityDelay FROM mytable WHERE DivDistance BETWEEN 187 AND 157 ORDER BY DestCityName, AirlineID, OriginStateName LIMIT 16"}
 {"sql":"SELECT \"Year\", OriginStateName, COUNT(*) FROM mytable WHERE CRSDepTime = 917 AND Carrier BETWEEN 'AA' AND 'UA' OR OriginWac BETWEEN 14 AND 51 GROUP BY \"Year\", OriginStateName LIMIT 1","hsqls":["SELECT Year, OriginStateName, COUNT(*) FROM mytable WHERE CRSDepTime = 917 AND Carrier BETWEEN 'AA' AND 'UA' OR OriginWac BETWEEN 14 AND 51 GROUP BY Year, OriginStateName LIMIT 1"]}
-{"sql":"SELECT OriginAirportSeqID, OriginStateFips, SUM(CarrierDelay), COUNT(Flights) FROM mytable WHERE DivAirportIDs < 11140 AND CRSArrTime IN (1821, 1318, 909, 759) AND AirlineID BETWEEN 20409 AND 20355 GROUP BY OriginAirportSeqID, OriginStateFips LIMIT 24","hsqls":["SELECT OriginAirportSeqID, OriginStateFips, SUM(CarrierDelay), COUNT(Flights) FROM mytable WHERE (DivAirportIDs__MV0 < 11140 OR DivAirportIDs__MV1 < 11140 OR DivAirportIDs__MV2 < 11140 OR DivAirportIDs__MV3 < 11140 OR DivAirportIDs__MV4 < 11140) AND CRSArrTime IN (1821, 1318, 909, 759) AND AirlineID BETWEEN 20409 AND 20355 GROUP BY OriginAirportSeqID, OriginStateFips LIMIT 10000"]}
+{"sql":"SELECT OriginAirportSeqID, OriginStateFips, SUM(CarrierDelay), COUNT(Flights) FROM mytable WHERE DivAirportIDs < 11140 AND CRSArrTime IN (1821, 1318, 909, 759) AND AirlineID BETWEEN 20409 AND 20355 GROUP BY OriginAirportSeqID, OriginStateFips LIMIT 24","hsqls":["SELECT OriginAirportSeqID, OriginStateFips, SUM(CarrierDelay), COUNT(Flights) FROM mytable WHERE (DivAirportIDs[1] < 11140 OR DivAirportIDs[2] < 11140 OR DivAirportIDs[3] < 11140 OR DivAirportIDs[4] < 11140 OR DivAirportIDs[5] < 11140) AND CRSArrTime IN (1821, 1318, 909, 759) AND AirlineID BETWEEN 20409 AND 20355 GROUP BY OriginAirportSeqID, OriginStateFips LIMIT 10000"]}
 {"sql":"SELECT AirlineID, DivArrDelay FROM mytable ORDER BY DistanceGroup, ActualElapsedTime, ArrDelay LIMIT 7"}
 {"sql":"SELECT COUNT(*) FROM mytable WHERE DistanceGroup = 3 OR FirstDepTime NOT IN (900) LIMIT 28"}
 {"sql":"SELECT DestState FROM mytable ORDER BY TaxiOut, DepDel15, OriginWac LIMIT 5"}
-{"sql":"SELECT CancellationCode, DivTotalGTimes FROM mytable WHERE WheelsOn = 1957 ORDER BY ArrTimeBlk, ArrivalDelayGroups, DaysSinceEpoch LIMIT 14","hsqls":["SELECT CancellationCode, DivTotalGTimes__MV0, DivTotalGTimes__MV1, DivTotalGTimes__MV2, DivTotalGTimes__MV3, DivTotalGTimes__MV4 FROM mytable WHERE WheelsOn = 1957 ORDER BY ArrTimeBlk, ArrivalDelayGroups, DaysSinceEpoch LIMIT 10000"]}
-{"sql":"SELECT CRSDepTime FROM mytable WHERE ArrTimeBlk >= '1900-1959' AND Quarter BETWEEN 1 AND 1 AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 10","hsqls":["SELECT CRSDepTime FROM mytable WHERE ArrTimeBlk >= '1900-1959' AND Quarter BETWEEN 1 AND 1 AND Year BETWEEN 2014 AND 2014 LIMIT 10"]}
+{"sql":"SELECT CancellationCode, DivTotalGTimes FROM mytable WHERE WheelsOn = 1957 ORDER BY ArrTimeBlk, ArrivalDelayGroups, DaysSinceEpoch LIMIT 14","hsqls":["SELECT CancellationCode, DivTotalGTimes FROM mytable WHERE WheelsOn = 1957 ORDER BY ArrTimeBlk, ArrivalDelayGroups, DaysSinceEpoch LIMIT 10000"]}
+{"sql":"SELECT CRSDepTime FROM mytable WHERE ArrTimeBlk >= '1900-1959' AND Quarter BETWEEN 1 AND 1 AND \"Year\" BETWEEN 2014 AND 2014 LIMIT 10","hsqls":["SELECT CRSDepTime FROM mytable WHERE ArrTimeBlk >= '1900-1959' AND Quarter BETWEEN 1 AND 1 AND `Year` BETWEEN 2014 AND 2014 LIMIT 10"]}
 {"sql":"SELECT DestWac, LongestAddGTime, DepDel15, AVG(TotalAddGTime), SUM(DepDelayMinutes), MAX(Distance) FROM mytable WHERE DestAirportID NOT IN (11109, 14492, 10785, 13377) OR OriginCityName BETWEEN 'Cedar City, UT' AND 'Atlanta, GA' OR DayOfWeek BETWEEN 3 AND 2 GROUP BY DestWac, LongestAddGTime, DepDel15  ORDER BY DestWac, LongestAddGTime, DepDel15 LIMIT 28","hsqls":["SELECT DestWac, LongestAddGTime, DepDel15, AVG(TotalAddGTime), SUM(DepDelayMinutes), MAX(Distance) FROM mytable WHERE DestAirportID NOT IN (11109, 14492, 10785, 13377) OR OriginCityName BETWEEN 'Cedar City, UT' AND 'Atlanta, GA' OR DayOfWeek BETWEEN 3 AND 2 GROUP BY DestWac, LongestAddGTime, DepDel15  ORDER BY DestWac, LongestAddGTime, DepDel15 LIMIT 28"]}
 {"sql":"SELECT AirlineID FROM mytable WHERE CRSArrTime <> 1833 AND DistanceGroup NOT IN (4, 8, 11) ORDER BY DestState, CarrierDelay LIMIT 6"}
 {"sql":"SELECT SecurityDelay FROM mytable ORDER BY CRSDepTime LIMIT 9"}
 {"sql":"SELECT \"Year\", DestCityMarketID FROM mytable WHERE ActualElapsedTime >= 166 ORDER BY TaxiIn, DivAirportLandings, CRSDepTime LIMIT 12","hsqls":["SELECT Year, DestCityMarketID FROM mytable WHERE ActualElapsedTime >= 166 ORDER BY TaxiIn, DivAirportLandings, CRSDepTime LIMIT 12"]}
 {"sql":"SELECT ArrDel15, ArrDelay, DivAirportLandings FROM mytable ORDER BY ArrDelayMinutes, DivActualElapsedTime LIMIT 3"}
 {"sql":"SELECT DepDelayMinutes, UniqueCarrier FROM mytable WHERE DestCityName < 'Indianapolis, IN' OR OriginStateName BETWEEN 'Texas' AND 'Wisconsin' LIMIT 26"}
-{"sql":"SELECT DestWac, OriginStateFips, DivTailNums FROM mytable WHERE AirlineID NOT IN (20436, 20366, 20409) AND DivLongestGTimes IN (3.0, 85.0, 38.0, 75.0) AND \"Year\" <> 2014 ORDER BY \"Month\" LIMIT 10","hsqls":["SELECT DestWac, OriginStateFips, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE AirlineID NOT IN (20436, 20366, 20409) AND (DivLongestGTimes__MV0 IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes__MV1 IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes__MV2 IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes__MV3 IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes__MV4 IN (3.0, 85.0, 38.0, 75.0)) AND Year <> 2014 ORDER BY Month LIMIT 10000"]}
-{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivWheelsOns BETWEEN 815 AND 1015 AND DivActualElapsedTime IN (161, 225, 497) ORDER BY TotalAddGTime, WheelsOn LIMIT 4","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 815 AND 1015 OR DivWheelsOns__MV1 BETWEEN 815 AND 1015 OR DivWheelsOns__MV2 BETWEEN 815 AND 1015 OR DivWheelsOns__MV3 BETWEEN 815 AND 1015 OR DivWheelsOns__MV4 BETWEEN 815 AND 1015) AND DivActualElapsedTime IN (161, 225, 497) ORDER BY TotalAddGTime, WheelsOn LIMIT 10000"]}
+{"sql":"SELECT DestWac, OriginStateFips, DivTailNums FROM mytable WHERE AirlineID NOT IN (20436, 20366, 20409) AND DivLongestGTimes IN (3.0, 85.0, 38.0, 75.0) AND \"Year\" <> 2014 ORDER BY \"Month\" LIMIT 10","hsqls":["SELECT DestWac, OriginStateFips, DivTailNums FROM mytable WHERE AirlineID NOT IN (20436, 20366, 20409) AND (DivLongestGTimes[1] IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes[2] IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes[3] IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes[4] IN (3.0, 85.0, 38.0, 75.0) OR DivLongestGTimes[5] IN (3.0, 85.0, 38.0, 75.0)) AND `Year` <> 2014 ORDER BY `Month` LIMIT 10000"]}
+{"sql":"SELECT DepTimeBlk FROM mytable WHERE DivWheelsOns BETWEEN 815 AND 1015 AND DivActualElapsedTime IN (161, 225, 497) ORDER BY TotalAddGTime, WheelsOn LIMIT 4","hsqls":["SELECT DepTimeBlk FROM mytable WHERE (DivWheelsOns[1] BETWEEN 815 AND 1015 OR DivWheelsOns[2] BETWEEN 815 AND 1015 OR DivWheelsOns[3] BETWEEN 815 AND 1015 OR DivWheelsOns[4] BETWEEN 815 AND 1015 OR DivWheelsOns[5] BETWEEN 815 AND 1015) AND DivActualElapsedTime IN (161, 225, 497) ORDER BY TotalAddGTime, WheelsOn LIMIT 10000"]}
 {"sql":"SELECT Carrier, FlightNum, Dest, MIN(OriginStateFips), AVG(DaysSinceEpoch), MIN(WheelsOff) FROM mytable WHERE OriginCityMarketID > 31252 GROUP BY Carrier, FlightNum, Dest  ORDER BY Carrier, FlightNum, Dest LIMIT 5","hsqls":["SELECT Carrier, FlightNum, Dest, MIN(OriginStateFips), AVG(DaysSinceEpoch), MIN(WheelsOff) FROM mytable WHERE OriginCityMarketID > 31252 GROUP BY Carrier, FlightNum, Dest  ORDER BY Carrier, FlightNum, Dest LIMIT 5"]}
 {"sql":"SELECT DepDel15, DayOfWeek FROM mytable WHERE DivArrDelay = 219 AND DepartureDelayGroups NOT IN (7, 9, 8, 11, 12) ORDER BY DistanceGroup, FirstDepTime, Quarter LIMIT 10"}
 {"sql":"SELECT Distance, NASDelay, TailNum, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 12954 AND 11042 OR DivActualElapsedTime BETWEEN 480 AND 289 GROUP BY Distance, NASDelay, TailNum  ORDER BY Distance, NASDelay, TailNum LIMIT 22","hsqls":["SELECT Distance, NASDelay, TailNum, COUNT(*) FROM mytable WHERE OriginAirportID BETWEEN 12954 AND 11042 OR DivActualElapsedTime BETWEEN 480 AND 289 GROUP BY Distance, NASDelay, TailNum  ORDER BY Distance, NASDelay, TailNum LIMIT 22"]}
-{"sql":"SELECT CancellationCode, UniqueCarrier, ArrivalDelayGroups FROM mytable WHERE \"Year\" = 2014 AND \"Month\" BETWEEN 1 AND 1 AND CRSElapsedTime IN (144, 225, 73, 208, 335) ORDER BY Diverted LIMIT 8","hsqls":["SELECT CancellationCode, UniqueCarrier, ArrivalDelayGroups FROM mytable WHERE Year = 2014 AND Month BETWEEN 1 AND 1 AND CRSElapsedTime IN (144, 225, 73, 208, 335) ORDER BY Diverted LIMIT 8"]}
+{"sql":"SELECT CancellationCode, UniqueCarrier, ArrivalDelayGroups FROM mytable WHERE \"Year\" = 2014 AND \"Month\" BETWEEN 1 AND 1 AND CRSElapsedTime IN (144, 225, 73, 208, 335) ORDER BY Diverted LIMIT 8","hsqls":["SELECT CancellationCode, UniqueCarrier, ArrivalDelayGroups FROM mytable WHERE `Year` = 2014 AND `Month` BETWEEN 1 AND 1 AND CRSElapsedTime IN (144, 225, 73, 208, 335) ORDER BY Diverted LIMIT 8"]}
 {"sql":"SELECT Flights, ArrDel15, OriginStateName, COUNT(*) FROM mytable WHERE Origin BETWEEN 'BLI' AND 'ILM' GROUP BY Flights, ArrDel15, OriginStateName  ORDER BY Flights, ArrDel15, OriginStateName LIMIT 8","hsqls":["SELECT Flights, ArrDel15, OriginStateName, COUNT(*) FROM mytable WHERE Origin BETWEEN 'BLI' AND 'ILM' GROUP BY Flights, ArrDel15, OriginStateName  ORDER BY Flights, ArrDel15, OriginStateName LIMIT 8"]}
 {"sql":"SELECT COUNT(WheelsOn), MIN(DivReachedDest), MIN(DivAirportLandings) FROM mytable WHERE Flights = 1 OR OriginAirportSeqID IN (1188402, 1294503, 1275803, 1383002, 1177502) LIMIT 29"}
 {"sql":"SELECT Carrier, ArrDel15, ArrDelay, MAX(DivArrDelay), COUNT(FlightDate) FROM mytable GROUP BY Carrier, ArrDel15, ArrDelay  ORDER BY Carrier, ArrDel15, ArrDelay LIMIT 12","hsqls":["SELECT Carrier, ArrDel15, ArrDelay, MAX(DivArrDelay), COUNT(FlightDate) FROM mytable GROUP BY Carrier, ArrDel15, ArrDelay  ORDER BY Carrier, ArrDel15, ArrDelay LIMIT 12"]}
 {"sql":"SELECT WheelsOn, MIN(OriginAirportSeqID), SUM(DepDelay), SUM(DepartureDelayGroups) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 6","hsqls":["SELECT WheelsOn, MIN(OriginAirportSeqID), SUM(DepDelay), SUM(DepartureDelayGroups) FROM mytable GROUP BY WheelsOn  ORDER BY WheelsOn LIMIT 6"]}
 {"sql":"SELECT OriginCityName, AVG(NASDelay), AVG(Cancelled), AVG(DepTime) FROM mytable WHERE DepTimeBlk BETWEEN '0001-0559' AND '1500-1559' AND OriginStateFips BETWEEN 44 AND 56 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 9","hsqls":["SELECT OriginCityName, AVG(NASDelay), AVG(Cancelled), AVG(DepTime) FROM mytable WHERE DepTimeBlk BETWEEN '0001-0559' AND '1500-1559' AND OriginStateFips BETWEEN 44 AND 56 GROUP BY OriginCityName  ORDER BY OriginCityName LIMIT 9"]}
 {"sql":"SELECT FirstDepTime, SUM(AirTime), MIN(CRSElapsedTime) FROM mytable WHERE DaysSinceEpoch BETWEEN 16072 AND 16089 AND Cancelled IN (1, 0) AND UniqueCarrier NOT IN ('WN') GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 7","hsqls":["SELECT FirstDepTime, SUM(AirTime), MIN(CRSElapsedTime) FROM mytable WHERE DaysSinceEpoch BETWEEN 16072 AND 16089 AND Cancelled IN (1, 0) AND UniqueCarrier NOT IN ('WN') GROUP BY FirstDepTime  ORDER BY FirstDepTime LIMIT 7"]}
-{"sql":"SELECT SecurityDelay, DestAirportSeqID, DivTailNums FROM mytable WHERE UniqueCarrier <= 'DL' ORDER BY Diverted, LateAircraftDelay LIMIT 4","hsqls":["SELECT SecurityDelay, DestAirportSeqID, DivTailNums__MV0, DivTailNums__MV1, DivTailNums__MV2, DivTailNums__MV3, DivTailNums__MV4 FROM mytable WHERE UniqueCarrier <= 'DL' ORDER BY Diverted, LateAircraftDelay LIMIT 10000"]}
+{"sql":"SELECT SecurityDelay, DestAirportSeqID, DivTailNums FROM mytable WHERE UniqueCarrier <= 'DL' ORDER BY Diverted, LateAircraftDelay LIMIT 4","hsqls":["SELECT SecurityDelay, DestAirportSeqID, DivTailNums FROM mytable WHERE UniqueCarrier <= 'DL' ORDER BY Diverted, LateAircraftDelay LIMIT 10000"]}
 {"sql":"SELECT DestState, CancellationCode FROM mytable WHERE DayofMonth > 31 ORDER BY DestCityName, DivArrDelay, CRSDepTime LIMIT 20"}
 {"sql":"SELECT SecurityDelay, DepTimeBlk, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY SecurityDelay, DepTimeBlk, ArrivalDelayGroups  ORDER BY SecurityDelay, DepTimeBlk, ArrivalDelayGroups LIMIT 28","hsqls":["SELECT SecurityDelay, DepTimeBlk, ArrivalDelayGroups, COUNT(*) FROM mytable GROUP BY SecurityDelay, DepTimeBlk, ArrivalDelayGroups  ORDER BY SecurityDelay, DepTimeBlk, ArrivalDelayGroups LIMIT 28"]}
-{"sql":"SELECT AVG(NASDelay), COUNT(DestAirportSeqID), MAX(\"Month\") FROM mytable WHERE Quarter <> 1 OR Carrier > 'OO' LIMIT 14","hsqls":["SELECT AVG(NASDelay), COUNT(DestAirportSeqID), MAX(Month) FROM mytable WHERE Quarter <> 1 OR Carrier > 'OO' LIMIT 14"]}
+{"sql":"SELECT AVG(NASDelay), COUNT(DestAirportSeqID), MAX(\"Month\") FROM mytable WHERE Quarter <> 1 OR Carrier > 'OO' LIMIT 14","hsqls":["SELECT AVG(NASDelay), COUNT(DestAirportSeqID), MAX(`Month`) FROM mytable WHERE Quarter <> 1 OR Carrier > 'OO' LIMIT 14"]}
 {"sql":"SELECT UniqueCarrier FROM mytable ORDER BY OriginStateName LIMIT 21"}
 {"sql":"SELECT COUNT(WeatherDelay) FROM mytable WHERE DestCityMarketID BETWEEN 33158 AND 30930 LIMIT 26"}
 {"sql":"SELECT COUNT(OriginCityName), AVG(SecurityDelay) FROM mytable WHERE DivAirportLandings BETWEEN 0 AND 9 OR OriginCityName <= 'Melbourne, FL' LIMIT 28"}
diff --git a/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_200.sql b/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_200.sql
index 25f396d19af..52cfe6df324 100644
--- a/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_200.sql
+++ b/pinot-integration-tests/src/test/resources/On_Time_On_Time_Performance_2014_100k_subset.test_queries_200.sql
@@ -26,33 +26,33 @@
 {"sql":"SELECT AVG(DayOfWeek), AVG(DestAirportID), AVG(DepTime) FROM mytable"}
 {"sql":"SELECT AVG(DepDel15), MAX(LateAircraftDelay) FROM mytable"}
 {"sql":"SELECT AVG(DestAirportSeqID), SUM(DestCityMarketID) FROM mytable"}
-{"sql":"SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(\"Month\") FROM mytable","hsqls":["SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(Month) FROM mytable"]}
+{"sql":"SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(\"Month\") FROM mytable","hsqls":["SELECT AVG(LateAircraftDelay), SUM(DaysSinceEpoch), MAX(`Month`) FROM mytable"]}
 {"sql":"SELECT AVG(Quarter), MIN(DayOfWeek), SUM(TaxiIn) FROM mytable"}
 {"sql":"SELECT AVG(TotalAddGTime), COUNT(DivAirportLandings) FROM mytable"}
-{"sql":"SELECT AVG(\"Month\"), AVG(LateAircraftDelay), MAX(\"Month\") FROM mytable LIMIT 4","hsqls":["SELECT AVG(Month), AVG(LateAircraftDelay), MAX(Month) FROM mytable"]}
-{"sql":"SELECT AVG(\"Month\"), MIN(DepartureDelayGroups) FROM mytable LIMIT 16","hsqls":["SELECT AVG(Month), MIN(DepartureDelayGroups) FROM mytable"]}
-{"sql":"SELECT AVG(\"Year\"), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable LIMIT 22","hsqls":["SELECT AVG(Year), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable"]}
+{"sql":"SELECT AVG(\"Month\"), AVG(LateAircraftDelay), MAX(\"Month\") FROM mytable LIMIT 4","hsqls":["SELECT AVG(`Month`), AVG(LateAircraftDelay), MAX(`Month`) FROM mytable"]}
+{"sql":"SELECT AVG(\"Month\"), MIN(DepartureDelayGroups) FROM mytable LIMIT 16","hsqls":["SELECT AVG(`Month`), MIN(DepartureDelayGroups) FROM mytable"]}
+{"sql":"SELECT AVG(\"Year\"), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable LIMIT 22","hsqls":["SELECT AVG(`Year`), AVG(DivReachedDest), MIN(ArrDel15) FROM mytable"]}
 {"sql":"SELECT COUNT(*) FROM mytable"}
 {"sql":"SELECT COUNT(ArrDelayMinutes), MAX(ArrDelayMinutes), SUM(TaxiIn) FROM mytable"}
 {"sql":"SELECT COUNT(Carrier), AVG(DivDistance), SUM(DistanceGroup) FROM mytable"}
 {"sql":"SELECT COUNT(CarrierDelay), SUM(DepartureDelayGroups) FROM mytable"}
 {"sql":"SELECT COUNT(DepDel15), COUNT(DepDelay), SUM(DepartureDelayGroups) FROM mytable LIMIT 13"}
-{"sql":"SELECT COUNT(DestCityName), MIN(\"Month\") FROM mytable LIMIT 20","hsqls":["SELECT COUNT(DestCityName), MIN(Month) FROM mytable"]}
+{"sql":"SELECT COUNT(DestCityName), MIN(\"Month\") FROM mytable LIMIT 20","hsqls":["SELECT COUNT(DestCityName), MIN(`Month`) FROM mytable"]}
 {"sql":"SELECT COUNT(Origin), MIN(ArrDel15), MIN(ArrivalDelayGroups) FROM mytable"}
 {"sql":"SELECT COUNT(OriginCityMarketID), MIN(SecurityDelay), MAX(DepTime) FROM mytable"}
 {"sql":"SELECT MAX(DestAirportID), AVG(CRSElapsedTime), MAX(DivActualElapsedTime) FROM mytable"}
 {"sql":"SELECT MAX(DestAirportID), MAX(DestStateFips), MIN(DestAirportID) FROM mytable"}
 {"sql":"SELECT MAX(WheelsOff), MIN(LateAircraftDelay), COUNT(FlightDate) FROM mytable"}
-{"sql":"SELECT MAX(\"Year\"), MIN(Distance) FROM mytable","hsqls":["SELECT MAX(Year), MIN(Distance) FROM mytable"]}
-{"sql":"SELECT MAX(\"Year\"), SUM(OriginAirportSeqID) FROM mytable","hsqls":["SELECT MAX(Year), SUM(OriginAirportSeqID) FROM mytable"]}
+{"sql":"SELECT MAX(\"Year\"), MIN(Distance) FROM mytable","hsqls":["SELECT MAX(`Year`), MIN(Distance) FROM mytable"]}
+{"sql":"SELECT MAX(\"Year\"), SUM(OriginAirportSeqID) FROM mytable","hsqls":["SELECT MAX(`Year`), SUM(OriginAirportSeqID) FROM mytable"]}
 {"sql":"SELECT MIN(SecurityDelay), MIN(DivArrDelay), MIN(DestAirportSeqID) FROM mytable"}
 {"sql":"SELECT MIN(WheelsOn), MIN(ActualElapsedTime), AVG(OriginAirportID) FROM mytable"}
-{"sql":"SELECT MIN(\"Year\") FROM mytable","hsqls":["SELECT MIN(Year) FROM mytable"]}
+{"sql":"SELECT MIN(\"Year\") FROM mytable","hsqls":["SELECT MIN(`Year`) FROM mytable"]}
 {"sql":"SELECT SUM(CarrierDelay), SUM(DivActualElapsedTime), AVG(DepDelayMinutes) FROM mytable"}
 {"sql":"SELECT SUM(DepDelayMinutes), COUNT(OriginCityName), COUNT(DivAirportLandings) FROM mytable"}
-{"sql":"SELECT SUM(DestAirportSeqID), MIN(\"Month\"), MAX(DayOfWeek) FROM mytable","hsqls":["SELECT SUM(DestAirportSeqID), MIN(Month), MAX(DayOfWeek) FROM mytable"]}
-{"sql":"SELECT SUM(\"Year\"), AVG(OriginStateFips) FROM mytable","hsqls":["SELECT SUM(Year), AVG(OriginStateFips) FROM mytable"]}
-{"sql":"SELECT SUM(\"Year\"), MIN(OriginCityMarketID) FROM mytable","hsqls":["SELECT SUM(Year), MIN(OriginCityMarketID) FROM mytable"]}
+{"sql":"SELECT SUM(DestAirportSeqID), MIN(\"Month\"), MAX(DayOfWeek) FROM mytable","hsqls":["SELECT SUM(DestAirportSeqID), MIN(`Month`), MAX(DayOfWeek) FROM mytable"]}
+{"sql":"SELECT SUM(\"Year\"), AVG(OriginStateFips) FROM mytable","hsqls":["SELECT SUM(`Year`), AVG(OriginStateFips) FROM mytable"]}
+{"sql":"SELECT SUM(\"Year\"), MIN(OriginCityMarketID) FROM mytable","hsqls":["SELECT SUM(`Year`), MIN(OriginCityMarketID) FROM mytable"]}
 
 # Grouping on Aggregation
 {"sql":"SELECT ActualElapsedTime, COUNT(DayofMonth), AVG(Cancelled), MIN(OriginCityMarketID) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 22","hsqls":["SELECT ActualElapsedTime, COUNT(DayofMonth), AVG(Cancelled), MIN(OriginCityMarketID) FROM mytable GROUP BY ActualElapsedTime  ORDER BY ActualElapsedTime LIMIT 22"]}
@@ -117,54 +117,54 @@
 {"sql":"SELECT WheelsOn, OriginStateName, AVG(DepDel15) FROM mytable GROUP BY WheelsOn, OriginStateName  ORDER BY WheelsOn, OriginStateName LIMIT 18","hsqls":["SELECT WheelsOn, OriginStateName, AVG(DepDel15) FROM mytable GROUP BY WheelsOn, OriginStateName  ORDER BY WheelsOn, OriginStateName LIMIT 18"]}
 
 # Filtering on Aggregation
-{"sql":"SELECT AVG(AirTime), SUM(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N8315C' AND 'N130DL' OR DivAirports IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 5","hsqls":["SELECT AVG(AirTime), SUM(OriginStateFips)  FROM mytable WHERE (DivTailNums__MV0 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV1 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV2 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV3 BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums__MV4 BETWEEN 'N8315C' AND 'N130DL') OR (DivAirports__MV0 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV1 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV2 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV3 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') OR DivAirports__MV4 IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT')) AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 10000"]}
-{"sql":"SELECT AVG(ArrDel15) FROM mytable WHERE DivWheelsOffs >= 1610 LIMIT 13","hsqls":["SELECT AVG(CAST(ArrDel15 AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs__MV0 >= 1610 OR DivWheelsOffs__MV1 >= 1610 OR DivWheelsOffs__MV2 >= 1610 OR DivWheelsOffs__MV3 >= 1610 OR DivWheelsOffs__MV4 >= 1610) LIMIT 10000"]}
-{"sql":"SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE \"Year\" = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22","hsqls":["SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE Year = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22"]}
-{"sql":"SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14","hsqls":["SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14"]}
-{"sql":"SELECT AVG(DayOfWeek) FROM mytable WHERE DivTailNums IN ('N915DE', 'N8612K') LIMIT 3","hsqls":["SELECT AVG(CAST(DayOfWeek AS DOUBLE)) FROM mytable WHERE (DivTailNums__MV0 IN ('N915DE', 'N8612K') OR DivTailNums__MV1 IN ('N915DE', 'N8612K') OR DivTailNums__MV2 IN ('N915DE', 'N8612K') OR DivTailNums__MV3 IN ('N915DE', 'N8612K') OR DivTailNums__MV4 IN ('N915DE', 'N8612K')) LIMIT 10000"]}
-{"sql":"SELECT AVG(DayOfWeek), MAX(Diverted) FROM mytable WHERE DivAirportSeqIDs >= 1281902 OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 18","hsqls":["SELECT AVG(DayOfWeek), MAX(Diverted)  FROM mytable WHERE (DivAirportSeqIDs__MV0 >= 1281902 OR DivAirportSeqIDs__MV1 >= 1281902 OR DivAirportSeqIDs__MV2 >= 1281902 OR DivAirportSeqIDs__MV3 >= 1281902 OR DivAirportSeqIDs__MV4 >= 1281902) OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 10000"]}
-{"sql":"SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR \"Year\" IN (2014) LIMIT 14","hsqls":["SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR Year IN (2014) LIMIT 14"]}
-{"sql":"SELECT AVG(DaysSinceEpoch) FROM mytable WHERE DivAirportIDs > 14027 AND DivLongestGTimes >= 61.0 AND Cancelled BETWEEN 0 AND 1 LIMIT 3","hsqls":["SELECT AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE (DivAirportIDs__MV0 > 14027 OR DivAirportIDs__MV1 > 14027 OR DivAirportIDs__MV2 > 14027 OR DivAirportIDs__MV3 > 14027 OR DivAirportIDs__MV4 > 14027) AND (DivLongestGTimes__MV0 >= 61.0 OR DivLongestGTimes__MV1 >= 61.0 OR DivLongestGTimes__MV2 >= 61.0 OR DivLongestGTimes__MV3 >= 61.0 OR DivLongestGTimes__MV4 >= 61.0) AND Cancelled BETWEEN 0 AND 1 LIMIT 10000"]}
-{"sql":"SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE \"Year\" NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15","hsqls":["SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE Year NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15"]}
-{"sql":"SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay) FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR DivWheelsOffs BETWEEN 1719 AND 1720 LIMIT 16","hsqls":["SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay)  FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR (DivWheelsOffs__MV0 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV1 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV2 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV3 BETWEEN 1719 AND 1720 OR DivWheelsOffs__MV4 BETWEEN 1719 AND 1720) LIMIT 10000"]}
-{"sql":"SELECT AVG(WeatherDelay), MIN(ArrTime) FROM mytable WHERE TaxiIn < 162 OR DivAirports >= 'SIT' OR OriginWac BETWEEN 1 AND 71 LIMIT 21","hsqls":["SELECT AVG(WeatherDelay), MIN(ArrTime)  FROM mytable WHERE TaxiIn < 162 OR (DivAirports__MV0 >= 'SIT' OR DivAirports__MV1 >= 'SIT' OR DivAirports__MV2 >= 'SIT' OR DivAirports__MV3 >= 'SIT' OR DivAirports__MV4 >= 'SIT') OR OriginWac BETWEEN 1 AND 71 LIMIT 10000"]}
-{"sql":"SELECT AVG(\"Year\"), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups) FROM mytable WHERE DivWheelsOffs IN (1702, 2226, 749, 2328, 844) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 2","hsqls":["SELECT AVG(Year), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups)  FROM mytable WHERE (DivWheelsOffs__MV0 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV1 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV2 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV3 IN (1702, 2226, 749, 2328, 844) OR DivWheelsOffs__MV4 IN (1702, 2226, 749, 2328, 844)) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND DivAirportSeqIDs BETWEEN 1252302 AND 1232303 LIMIT 4","hsqls":["SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND (DivAirportSeqIDs__MV0 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV1 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV2 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV3 BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs__MV4 BETWEEN 1252302 AND 1232303) LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR DivTailNums > 'N854AS' AND DayOfWeek NOT IN (3, 1, 6) LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR (DivTailNums__MV0 > 'N854AS' OR DivTailNums__MV1 > 'N854AS' OR DivTailNums__MV2 > 'N854AS' OR DivTailNums__MV3 > 'N854AS' OR DivTailNums__MV4 > 'N854AS') AND DayOfWeek NOT IN (3, 1, 6) LIMIT 10000"]}
-{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE Year BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8"]}
-{"sql":"SELECT COUNT(ActualElapsedTime), AVG(DestWac) FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR DivTotalGTimes IN (62) LIMIT 18","hsqls":["SELECT COUNT(ActualElapsedTime), AVG(DestWac)  FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR (DivTotalGTimes__MV0 IN (62) OR DivTotalGTimes__MV1 IN (62) OR DivTotalGTimes__MV2 IN (62) OR DivTotalGTimes__MV3 IN (62) OR DivTotalGTimes__MV4 IN (62)) LIMIT 10000"]}
-{"sql":"SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DivWheelsOffs BETWEEN 2043 AND 2133 AND FlightNum NOT IN (3228) LIMIT 11","hsqls":["SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR (DivWheelsOffs__MV0 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV1 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV2 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV3 BETWEEN 2043 AND 2133 OR DivWheelsOffs__MV4 BETWEEN 2043 AND 2133) AND FlightNum NOT IN (3228) LIMIT 10000"]}
-{"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1257 AND 325 AND DestState IN ('LA', 'MS') AND \"Month\" BETWEEN 1 AND 1 LIMIT 6","hsqls":["SELECT COUNT(CRSElapsedTime) FROM mytable WHERE (DivWheelsOffs__MV0 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV1 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV2 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV3 BETWEEN 1257 AND 325 OR DivWheelsOffs__MV4 BETWEEN 1257 AND 325) AND DestState IN ('LA', 'MS') AND Month BETWEEN 1 AND 1 LIMIT 10000"]}
-{"sql":"SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes) FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR DivTotalGTimes BETWEEN 57 AND 76","hsqls":["SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes)  FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR (DivTotalGTimes__MV0 BETWEEN 57 AND 76 OR DivTotalGTimes__MV1 BETWEEN 57 AND 76 OR DivTotalGTimes__MV2 BETWEEN 57 AND 76 OR DivTotalGTimes__MV3 BETWEEN 57 AND 76 OR DivTotalGTimes__MV4 BETWEEN 57 AND 76) LIMIT 10000"]}
-{"sql":"SELECT COUNT(CarrierDelay), SUM(DestAirportID) FROM mytable WHERE DaysSinceEpoch <= 16073 AND DivAirportIDs IN (12278, 12451, 11973, 13424) LIMIT 15","hsqls":["SELECT COUNT(CarrierDelay), SUM(DestAirportID)  FROM mytable WHERE DaysSinceEpoch <= 16073 AND (DivAirportIDs__MV0 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV1 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV2 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV3 IN (12278, 12451, 11973, 13424) OR DivAirportIDs__MV4 IN (12278, 12451, 11973, 13424)) LIMIT 10000"]}
-{"sql":"SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups) FROM mytable WHERE DivAirportSeqIDs < 1234302 LIMIT 26","hsqls":["SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups)  FROM mytable WHERE (DivAirportSeqIDs__MV0 < 1234302 OR DivAirportSeqIDs__MV1 < 1234302 OR DivAirportSeqIDs__MV2 < 1234302 OR DivAirportSeqIDs__MV3 < 1234302 OR DivAirportSeqIDs__MV4 < 1234302) LIMIT 10000"]}
-{"sql":"SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID) FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND DivAirportIDs <= 14006 LIMIT 22","hsqls":["SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID)  FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND (DivAirportIDs__MV0 <= 14006 OR DivAirportIDs__MV1 <= 14006 OR DivAirportIDs__MV2 <= 14006 OR DivAirportIDs__MV3 <= 14006 OR DivAirportIDs__MV4 <= 14006) LIMIT 10000"]}
-{"sql":"SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivTailNums BETWEEN 'N397DA' AND 'N940DN' LIMIT 5","hsqls":["SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND (DivTailNums__MV0 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV1 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV2 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV3 BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums__MV4 BETWEEN 'N397DA' AND 'N940DN') LIMIT 10000"]}
-{"sql":"SELECT COUNT(\"Month\"), SUM(OriginAirportSeqID), MIN(AirlineID) FROM mytable WHERE DivTailNums <= 'N530MQ' AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 2","hsqls":["SELECT COUNT(Month), SUM(OriginAirportSeqID), MIN(AirlineID)  FROM mytable WHERE (DivTailNums__MV0 <= 'N530MQ' OR DivTailNums__MV1 <= 'N530MQ' OR DivTailNums__MV2 <= 'N530MQ' OR DivTailNums__MV3 <= 'N530MQ' OR DivTailNums__MV4 <= 'N530MQ') AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 10000"]}
-{"sql":"SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR DivTailNums IN ('N713SK') AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10","hsqls":["SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR (DivTailNums__MV0 IN ('N713SK') OR DivTailNums__MV1 IN ('N713SK') OR DivTailNums__MV2 IN ('N713SK') OR DivTailNums__MV3 IN ('N713SK') OR DivTailNums__MV4 IN ('N713SK')) AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10000"]}
-{"sql":"SELECT MAX(ArrDelay), AVG(\"Month\"), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14","hsqls":["SELECT MAX(ArrDelay), AVG(Month), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14"]}
-{"sql":"SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac) FROM mytable WHERE NASDelay IN (49, 145, 45) AND DivWheelsOffs < 917 AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 27","hsqls":["SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac)  FROM mytable WHERE NASDelay IN (49, 145, 45) AND (DivWheelsOffs__MV0 < 917 OR DivWheelsOffs__MV1 < 917 OR DivWheelsOffs__MV2 < 917 OR DivWheelsOffs__MV3 < 917 OR DivWheelsOffs__MV4 < 917) AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 10000"]}
-{"sql":"SELECT MAX(DivActualElapsedTime), MIN(\"Month\"), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27","hsqls":["SELECT MAX(DivActualElapsedTime), MIN(Month), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27"]}
-{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR DivWheelsOns = 1317 LIMIT 11","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR (DivWheelsOns__MV0 = 1317 OR DivWheelsOns__MV1 = 1317 OR DivWheelsOns__MV2 = 1317 OR DivWheelsOns__MV3 = 1317 OR DivWheelsOns__MV4 = 1317) LIMIT 10000"]}
-{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR DivTotalGTimes > 76 LIMIT 1","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR (DivTotalGTimes__MV0 > 76 OR DivTotalGTimes__MV1 > 76 OR DivTotalGTimes__MV2 > 76 OR DivTotalGTimes__MV3 > 76 OR DivTotalGTimes__MV4 > 76) LIMIT 10000"]}
-{"sql":"SELECT MAX(WheelsOff), COUNT(CancellationCode) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DivLongestGTimes < 57.0 OR DepDelay NOT IN (342.0, 48.0) LIMIT 25","hsqls":["SELECT MAX(WheelsOff), COUNT(CancellationCode)  FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR (DivLongestGTimes__MV0 < 57.0 OR DivLongestGTimes__MV1 < 57.0 OR DivLongestGTimes__MV2 < 57.0 OR DivLongestGTimes__MV3 < 57.0 OR DivLongestGTimes__MV4 < 57.0) OR DepDelay NOT IN (342.0, 48.0) LIMIT 10000"]}
-{"sql":"SELECT MAX(\"Month\") FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11","hsqls":["SELECT MAX(Month) FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11"]}
-{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE DivWheelsOns >= 2058 OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 20","hsqls":["SELECT MAX(Year) FROM mytable WHERE (DivWheelsOns__MV0 >= 2058 OR DivWheelsOns__MV1 >= 2058 OR DivWheelsOns__MV2 >= 2058 OR DivWheelsOns__MV3 >= 2058 OR DivWheelsOns__MV4 >= 2058) OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 10000"]}
-{"sql":"SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek) FROM mytable WHERE DivWheelsOffs >= 2009 AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 29","hsqls":["SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek)  FROM mytable WHERE (DivWheelsOffs__MV0 >= 2009 OR DivWheelsOffs__MV1 >= 2009 OR DivWheelsOffs__MV2 >= 2009 OR DivWheelsOffs__MV3 >= 2009 OR DivWheelsOffs__MV4 >= 2009) AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 10000"]}
-{"sql":"SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay) FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR DivTailNums IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') LIMIT 29","hsqls":["SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay)  FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR (DivTailNums__MV0 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV1 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV2 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV3 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') OR DivTailNums__MV4 IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951')) LIMIT 10000"]}
-{"sql":"SELECT MIN(DaysSinceEpoch), AVG(FlightNum) FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR DivAirportIDs IN (14730, 14262, 10868) LIMIT 6","hsqls":["SELECT MIN(DaysSinceEpoch), AVG(FlightNum)  FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR (DivAirportIDs__MV0 IN (14730, 14262, 10868) OR DivAirportIDs__MV1 IN (14730, 14262, 10868) OR DivAirportIDs__MV2 IN (14730, 14262, 10868) OR DivAirportIDs__MV3 IN (14730, 14262, 10868) OR DivAirportIDs__MV4 IN (14730, 14262, 10868)) LIMIT 10000"]}
-{"sql":"SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime) FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND DivWheelsOns IN (1717, 102, 1835) LIMIT 24","hsqls":["SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime)  FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND (DivWheelsOns__MV0 IN (1717, 102, 1835) OR DivWheelsOns__MV1 IN (1717, 102, 1835) OR DivWheelsOns__MV2 IN (1717, 102, 1835) OR DivWheelsOns__MV3 IN (1717, 102, 1835) OR DivWheelsOns__MV4 IN (1717, 102, 1835)) LIMIT 10000"]}
-{"sql":"SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND \"Year\" < 2014 OR CRSElapsedTime >= 337 LIMIT 29","hsqls":["SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND Year < 2014 OR CRSElapsedTime >= 337 LIMIT 29"]}
-{"sql":"SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR \"Month\" <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5","hsqls":["SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR Month <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5"]}
-{"sql":"SELECT MIN(Flights), SUM(CRSArrTime) FROM mytable WHERE FlightNum NOT IN (4484) AND DivAirportSeqIDs >= 1323202 AND DayOfWeek NOT IN (2, 1) LIMIT 14","hsqls":["SELECT MIN(Flights), SUM(CRSArrTime)  FROM mytable WHERE FlightNum NOT IN (4484) AND (DivAirportSeqIDs__MV0 >= 1323202 OR DivAirportSeqIDs__MV1 >= 1323202 OR DivAirportSeqIDs__MV2 >= 1323202 OR DivAirportSeqIDs__MV3 >= 1323202 OR DivAirportSeqIDs__MV4 >= 1323202) AND DayOfWeek NOT IN (2, 1) LIMIT 10000"]}
-{"sql":"SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE DivTailNums IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') LIMIT 7","hsqls":["SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE (DivTailNums__MV0 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV1 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV2 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV3 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') OR DivTailNums__MV4 IN ('N3751B', 'N296WN', 'N416SW', 'N472WN')) LIMIT 10000"]}
-{"sql":"SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DivTotalGTimes > 18 AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 22","hsqls":["SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime)  FROM mytable WHERE (DivTotalGTimes__MV0 > 18 OR DivTotalGTimes__MV1 > 18 OR DivTotalGTimes__MV2 > 18 OR DivTotalGTimes__MV3 > 18 OR DivTotalGTimes__MV4 > 18) AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 10000"]}
-{"sql":"SELECT SUM(DivActualElapsedTime), MAX(\"Month\") FROM mytable WHERE Distance <> 788 AND DivWheelsOffs > 1851 LIMIT 5","hsqls":["SELECT SUM(DivActualElapsedTime), MAX(Month)  FROM mytable WHERE Distance <> 788 AND (DivWheelsOffs__MV0 > 1851 OR DivWheelsOffs__MV1 > 1851 OR DivWheelsOffs__MV2 > 1851 OR DivWheelsOffs__MV3 > 1851 OR DivWheelsOffs__MV4 > 1851) LIMIT 10000"]}
-{"sql":"SELECT SUM(DivArrDelay), SUM(DestStateFips) FROM mytable WHERE DivTailNums IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 20","hsqls":["SELECT SUM(DivArrDelay), SUM(DestStateFips)  FROM mytable WHERE (DivTailNums__MV0 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV1 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV2 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV3 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') OR DivTailNums__MV4 IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA')) AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 10000"]}
-{"sql":"SELECT SUM(DivReachedDest), AVG(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 728 AND 1804 LIMIT 13","hsqls":["SELECT SUM(DivReachedDest), AVG(DestWac)  FROM mytable WHERE (DivWheelsOns__MV0 BETWEEN 728 AND 1804 OR DivWheelsOns__MV1 BETWEEN 728 AND 1804 OR DivWheelsOns__MV2 BETWEEN 728 AND 1804 OR DivWheelsOns__MV3 BETWEEN 728 AND 1804 OR DivWheelsOns__MV4 BETWEEN 728 AND 1804) LIMIT 10000"]}
-{"sql":"SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState) FROM mytable WHERE DivAirports IN ('RFD') AND TaxiIn BETWEEN -9999 AND 94 LIMIT 29","hsqls":["SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState)  FROM mytable WHERE (DivAirports__MV0 IN ('RFD') OR DivAirports__MV1 IN ('RFD') OR DivAirports__MV2 IN ('RFD') OR DivAirports__MV3 IN ('RFD') OR DivAirports__MV4 IN ('RFD')) AND TaxiIn BETWEEN -9999 AND 94 LIMIT 10000"]}
-{"sql":"SELECT SUM(\"Month\") FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23","hsqls":["SELECT SUM(Month) FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23"]}
-{"sql":"SELECT SUM(\"Year\"), MAX(DayofMonth), AVG(CRSArrTime) FROM mytable WHERE WheelsOff > 1737 AND DivTotalGTimes IN (30, 113, 102, 37) LIMIT 10","hsqls":["SELECT SUM(Year), MAX(DayofMonth), AVG(CRSArrTime)  FROM mytable WHERE WheelsOff > 1737 AND (DivTotalGTimes__MV0 IN (30, 113, 102, 37) OR DivTotalGTimes__MV1 IN (30, 113, 102, 37) OR DivTotalGTimes__MV2 IN (30, 113, 102, 37) OR DivTotalGTimes__MV3 IN (30, 113, 102, 37) OR DivTotalGTimes__MV4 IN (30, 113, 102, 37)) LIMIT 10000"]}
+{"sql":"SELECT AVG(AirTime), SUM(OriginStateFips) FROM mytable WHERE DivTailNums BETWEEN 'N8315C' AND 'N130DL' OR DivAirports IN ('PIH', 'DLH', 'MTJ', 'SEA', 'LIT') AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 5","hsqls":["SELECT AVG(AirTime), SUM(OriginStateFips)  FROM mytable WHERE (DivTailNums[1] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[2] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[3] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[4] BETWEEN 'N8315C' AND 'N130DL' OR DivTailNums[5] BETWEEN 'N8315C' AND 'N130DL') OR (ARRAY_CONTAINS(DivAirports, 'PIH') OR ARRAY_CONTAINS(DivAirports, 'DLH') OR ARRAY_CONTAINS(DivAirports, 'MTJ') OR ARRAY_CONTAINS(DivAirports, 'SEA') OR ARRAY_CONTAINS(DivAirports, 'LIT')) AND TaxiOut NOT IN (59, 112, 57, 72) LIMIT 10000"]}
+{"sql":"SELECT AVG(ArrDel15) FROM mytable WHERE DivWheelsOffs >= 1610 LIMIT 13","hsqls":["SELECT AVG(CAST(ArrDel15 AS DOUBLE)) FROM mytable WHERE (DivWheelsOffs[1] >= 1610 OR DivWheelsOffs[2] >= 1610 OR DivWheelsOffs[3] >= 1610 OR DivWheelsOffs[4] >= 1610 OR DivWheelsOffs[5] >= 1610) LIMIT 10000"]}
+{"sql":"SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE \"Year\" = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22","hsqls":["SELECT AVG(CRSDepTime), MIN(DivReachedDest) FROM mytable WHERE `Year` = 2014 OR Origin BETWEEN 'MLU' AND 'BDL' OR DestStateFips > 18 LIMIT 22"]}
+{"sql":"SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14","hsqls":["SELECT AVG(CarrierDelay), AVG(OriginCityMarketID), MAX(ArrTime) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR AirlineID <= 20398 LIMIT 14"]}
+{"sql":"SELECT AVG(DayOfWeek) FROM mytable WHERE DivTailNums IN ('N915DE', 'N8612K') LIMIT 3","hsqls":["SELECT AVG(CAST(DayOfWeek AS DOUBLE)) FROM mytable WHERE ARRAY_CONTAINS(DivTailNums, 'N915DE') OR ARRAY_CONTAINS(DivTailNums, 'N8612K') LIMIT 10000"]}
+{"sql":"SELECT AVG(DayOfWeek), MAX(Diverted) FROM mytable WHERE DivAirportSeqIDs >= 1281902 OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 18","hsqls":["SELECT AVG(DayOfWeek), MAX(Diverted)  FROM mytable WHERE (DivAirportSeqIDs[1] >= 1281902 OR DivAirportSeqIDs[2] >= 1281902 OR DivAirportSeqIDs[3] >= 1281902 OR DivAirportSeqIDs[4] >= 1281902 OR DivAirportSeqIDs[5] >= 1281902) OR DestAirportSeqID NOT IN (1463502, 1530402, 1068502) AND DepDelayMinutes BETWEEN 48.0 AND 94.0 LIMIT 10000"]}
+{"sql":"SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR \"Year\" IN (2014) LIMIT 14","hsqls":["SELECT AVG(DayofMonth), COUNT(CRSElapsedTime) FROM mytable WHERE LateAircraftDelay BETWEEN 151 AND 72 OR `Year` IN (2014) LIMIT 14"]}
+{"sql":"SELECT AVG(DaysSinceEpoch) FROM mytable WHERE DivAirportIDs > 14027 AND DivLongestGTimes >= 61.0 AND Cancelled BETWEEN 0 AND 1 LIMIT 3","hsqls":["SELECT AVG(CAST(DaysSinceEpoch AS DOUBLE)) FROM mytable WHERE (DivAirportIDs[1] > 14027 OR DivAirportIDs[2] > 14027 OR DivAirportIDs[3] > 14027 OR DivAirportIDs[4] > 14027 OR DivAirportIDs[5] > 14027) AND (DivLongestGTimes[1] >= 61.0 OR DivLongestGTimes[2] >= 61.0 OR DivLongestGTimes[3] >= 61.0 OR DivLongestGTimes[4] >= 61.0 OR DivLongestGTimes[5] >= 61.0) AND Cancelled BETWEEN 0 AND 1 LIMIT 10000"]}
+{"sql":"SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE \"Year\" NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15","hsqls":["SELECT AVG(TotalAddGTime), MAX(OriginStateFips) FROM mytable WHERE `Year` NOT IN (2014) OR ArrDelay BETWEEN -30.0 AND 31.0 AND DayOfWeek NOT IN (6, 5) LIMIT 15"]}
+{"sql":"SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay) FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR DivWheelsOffs BETWEEN 1719 AND 1720 LIMIT 16","hsqls":["SELECT AVG(TotalAddGTime), SUM(ArrivalDelayGroups), SUM(SecurityDelay)  FROM mytable WHERE UniqueCarrier = 'AA' OR Cancelled IN (1, 0) OR (DivWheelsOffs[1] BETWEEN 1719 AND 1720 OR DivWheelsOffs[2] BETWEEN 1719 AND 1720 OR DivWheelsOffs[3] BETWEEN 1719 AND 1720 OR DivWheelsOffs[4] BETWEEN 1719 AND 1720 OR DivWheelsOffs[5] BETWEEN 1719 AND 1720) LIMIT 10000"]}
+{"sql":"SELECT AVG(WeatherDelay), MIN(ArrTime) FROM mytable WHERE TaxiIn < 162 OR DivAirports >= 'SIT' OR OriginWac BETWEEN 1 AND 71 LIMIT 21","hsqls":["SELECT AVG(WeatherDelay), MIN(ArrTime)  FROM mytable WHERE TaxiIn < 162 OR (DivAirports[1] >= 'SIT' OR DivAirports[2] >= 'SIT' OR DivAirports[3] >= 'SIT' OR DivAirports[4] >= 'SIT' OR DivAirports[5] >= 'SIT') OR OriginWac BETWEEN 1 AND 71 LIMIT 10000"]}
+{"sql":"SELECT AVG(\"Year\"), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups) FROM mytable WHERE DivWheelsOffs IN (1702, 2226, 749, 2328, 844) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 2","hsqls":["SELECT AVG(`Year`), SUM(ArrivalDelayGroups), MAX(DepartureDelayGroups)  FROM mytable WHERE (ARRAY_CONTAINS(DivWheelsOffs, 1702) OR ARRAY_CONTAINS(DivWheelsOffs, 2226) OR ARRAY_CONTAINS(DivWheelsOffs, 749) OR ARRAY_CONTAINS(DivWheelsOffs, 2328) OR ARRAY_CONTAINS(DivWheelsOffs, 844)) OR ArrDelay NOT IN (25.0, 58.0, -19.0, 281.0, 418.0) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND DivAirportSeqIDs BETWEEN 1252302 AND 1232303 LIMIT 4","hsqls":["SELECT COUNT(*) FROM mytable WHERE ActualElapsedTime NOT IN (90, 178, 247, 118, 119) OR DistanceGroup BETWEEN 10 AND 4 AND (DivAirportSeqIDs[1] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[2] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[3] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[4] BETWEEN 1252302 AND 1232303 OR DivAirportSeqIDs[5] BETWEEN 1252302 AND 1232303) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR DivTailNums > 'N854AS' AND DayOfWeek NOT IN (3, 1, 6) LIMIT 15","hsqls":["SELECT COUNT(*) FROM mytable WHERE CRSArrTime <> 1940 OR (DivTailNums[1] > 'N854AS' OR DivTailNums[2] > 'N854AS' OR DivTailNums[3] > 'N854AS' OR DivTailNums[4] > 'N854AS' OR DivTailNums[5] > 'N854AS') AND DayOfWeek NOT IN (3, 1, 6) LIMIT 10000"]}
+{"sql":"SELECT COUNT(*) FROM mytable WHERE \"Year\" BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8","hsqls":["SELECT COUNT(*) FROM mytable WHERE `Year` BETWEEN 2014 AND 2014 OR DepTimeBlk BETWEEN '1400-1459' AND '1300-1359' LIMIT 8"]}
+{"sql":"SELECT COUNT(ActualElapsedTime), AVG(DestWac) FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR DivTotalGTimes IN (62) LIMIT 18","hsqls":["SELECT COUNT(ActualElapsedTime), AVG(DestWac)  FROM mytable WHERE DayOfWeek NOT IN (3, 1, 6, 4) OR ARRAY_CONTAINS(DivTotalGTimes, 62) LIMIT 10000"]}
+{"sql":"SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR DivWheelsOffs BETWEEN 2043 AND 2133 AND FlightNum NOT IN (3228) LIMIT 11","hsqls":["SELECT COUNT(AirTime) FROM mytable WHERE Cancelled BETWEEN 0 AND 0 OR (DivWheelsOffs[1] BETWEEN 2043 AND 2133 OR DivWheelsOffs[2] BETWEEN 2043 AND 2133 OR DivWheelsOffs[3] BETWEEN 2043 AND 2133 OR DivWheelsOffs[4] BETWEEN 2043 AND 2133 OR DivWheelsOffs[5] BETWEEN 2043 AND 2133) AND FlightNum NOT IN (3228) LIMIT 10000"]}
+{"sql":"SELECT COUNT(CRSElapsedTime) FROM mytable WHERE DivWheelsOffs BETWEEN 1257 AND 325 AND DestState IN ('LA', 'MS') AND \"Month\" BETWEEN 1 AND 1 LIMIT 6","hsqls":["SELECT COUNT(CRSElapsedTime) FROM mytable WHERE (DivWheelsOffs[1] BETWEEN 1257 AND 325 OR DivWheelsOffs[2] BETWEEN 1257 AND 325 OR DivWheelsOffs[3] BETWEEN 1257 AND 325 OR DivWheelsOffs[4] BETWEEN 1257 AND 325 OR DivWheelsOffs[5] BETWEEN 1257 AND 325) AND DestState IN ('LA', 'MS') AND `Month` BETWEEN 1 AND 1 LIMIT 10000"]}
+{"sql":"SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes) FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR DivTotalGTimes BETWEEN 57 AND 76","hsqls":["SELECT COUNT(Carrier), MIN(DivActualElapsedTime), MAX(DepDelayMinutes)  FROM mytable WHERE DestCityMarketID NOT IN (31423) OR TaxiOut BETWEEN 24 AND 60 OR (DivTotalGTimes[1] BETWEEN 57 AND 76 OR DivTotalGTimes[2] BETWEEN 57 AND 76 OR DivTotalGTimes[3] BETWEEN 57 AND 76 OR DivTotalGTimes[4] BETWEEN 57 AND 76 OR DivTotalGTimes[5] BETWEEN 57 AND 76) LIMIT 10000"]}
+{"sql":"SELECT COUNT(CarrierDelay), SUM(DestAirportID) FROM mytable WHERE DaysSinceEpoch <= 16073 AND DivAirportIDs IN (12278, 12451, 11973, 13424) LIMIT 15","hsqls":["SELECT COUNT(CarrierDelay), SUM(DestAirportID)  FROM mytable WHERE DaysSinceEpoch <= 16073 AND (ARRAY_CONTAINS(DivAirportIDs, 12278) OR ARRAY_CONTAINS(DivAirportIDs, 12451) OR ARRAY_CONTAINS(DivAirportIDs, 11973) OR ARRAY_CONTAINS(DivAirportIDs, 13424)) LIMIT 10000"]}
+{"sql":"SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups) FROM mytable WHERE DivAirportSeqIDs < 1234302 LIMIT 26","hsqls":["SELECT COUNT(DestStateName), SUM(ArrDelay), SUM(DepartureDelayGroups)  FROM mytable WHERE (DivAirportSeqIDs[1] < 1234302 OR DivAirportSeqIDs[2] < 1234302 OR DivAirportSeqIDs[3] < 1234302 OR DivAirportSeqIDs[4] < 1234302 OR DivAirportSeqIDs[5] < 1234302) LIMIT 10000"]}
+{"sql":"SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID) FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND DivAirportIDs <= 14006 LIMIT 22","hsqls":["SELECT COUNT(OriginCityMarketID), MAX(DestCityMarketID)  FROM mytable WHERE Quarter NOT IN (1) OR Distance BETWEEN 1454 AND 196 AND (DivAirportIDs[1] <= 14006 OR DivAirportIDs[2] <= 14006 OR DivAirportIDs[3] <= 14006 OR DivAirportIDs[4] <= 14006 OR DivAirportIDs[5] <= 14006) LIMIT 10000"]}
+{"sql":"SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND DivTailNums BETWEEN 'N397DA' AND 'N940DN' LIMIT 5","hsqls":["SELECT COUNT(OriginWac) FROM mytable WHERE CancellationCode BETWEEN 'A' AND 'A' AND (DivTailNums[1] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[2] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[3] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[4] BETWEEN 'N397DA' AND 'N940DN' OR DivTailNums[5] BETWEEN 'N397DA' AND 'N940DN') LIMIT 10000"]}
+{"sql":"SELECT COUNT(\"Month\"), SUM(OriginAirportSeqID), MIN(AirlineID) FROM mytable WHERE DivTailNums <= 'N530MQ' AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 2","hsqls":["SELECT COUNT(`Month`), SUM(OriginAirportSeqID), MIN(AirlineID)  FROM mytable WHERE (DivTailNums[1] <= 'N530MQ' OR DivTailNums[2] <= 'N530MQ' OR DivTailNums[3] <= 'N530MQ' OR DivTailNums[4] <= 'N530MQ' OR DivTailNums[5] <= 'N530MQ') AND AirTime NOT IN (122, 158, 73, 142) OR DestAirportID NOT IN (10423, 13303, 10581, 10747) LIMIT 10000"]}
+{"sql":"SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR DivTailNums IN ('N713SK') AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10","hsqls":["SELECT MAX(AirTime) FROM mytable WHERE DaysSinceEpoch <> 16071 OR ARRAY_CONTAINS(DivTailNums, 'N713SK') AND DivActualElapsedTime BETWEEN 153 AND 1043 LIMIT 10000"]}
+{"sql":"SELECT MAX(ArrDelay), AVG(\"Month\"), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14","hsqls":["SELECT MAX(ArrDelay), AVG(`Month`), MAX(ActualElapsedTime) FROM mytable WHERE DepTimeBlk IN ('2000-2059', '1300-1359', '1100-1159', '0600-0659', '0800-0859') LIMIT 14"]}
+{"sql":"SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac) FROM mytable WHERE NASDelay IN (49, 145, 45) AND DivWheelsOffs < 917 AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 27","hsqls":["SELECT MAX(DistanceGroup), AVG(SecurityDelay), SUM(DestWac)  FROM mytable WHERE NASDelay IN (49, 145, 45) AND (DivWheelsOffs[1] < 917 OR DivWheelsOffs[2] < 917 OR DivWheelsOffs[3] < 917 OR DivWheelsOffs[4] < 917 OR DivWheelsOffs[5] < 917) AND UniqueCarrier NOT IN ('F9', 'WN', 'OO', 'MQ', 'VX') LIMIT 10000"]}
+{"sql":"SELECT MAX(DivActualElapsedTime), MIN(\"Month\"), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27","hsqls":["SELECT MAX(DivActualElapsedTime), MIN(`Month`), AVG(WheelsOff) FROM mytable WHERE Diverted NOT IN (1, 0) OR Diverted BETWEEN 0 AND 1 AND DestCityMarketID = 31136 LIMIT 27"]}
+{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR DivWheelsOns = 1317 LIMIT 11","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE DestStateName NOT IN ('New Hampshire', 'Massachusetts', 'California', 'Nevada') OR DaysSinceEpoch IN (16071, 16088, 16074, 16078, 16091) OR (DivWheelsOns[1] = 1317 OR DivWheelsOns[2] = 1317 OR DivWheelsOns[3] = 1317 OR DivWheelsOns[4] = 1317 OR DivWheelsOns[5] = 1317) LIMIT 10000"]}
+{"sql":"SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR DivTotalGTimes > 76 LIMIT 1","hsqls":["SELECT MAX(LongestAddGTime) FROM mytable WHERE WheelsOn NOT IN (1659, 936) OR (DivTotalGTimes[1] > 76 OR DivTotalGTimes[2] > 76 OR DivTotalGTimes[3] > 76 OR DivTotalGTimes[4] > 76 OR DivTotalGTimes[5] > 76) LIMIT 10000"]}
+{"sql":"SELECT MAX(WheelsOff), COUNT(CancellationCode) FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR DivLongestGTimes < 57.0 OR DepDelay NOT IN (342.0, 48.0) LIMIT 25","hsqls":["SELECT MAX(WheelsOff), COUNT(CancellationCode)  FROM mytable WHERE ArrDel15 IN (1, 0, -9999) OR (DivLongestGTimes[1] < 57.0 OR DivLongestGTimes[2] < 57.0 OR DivLongestGTimes[3] < 57.0 OR DivLongestGTimes[4] < 57.0 OR DivLongestGTimes[5] < 57.0) OR DepDelay NOT IN (342.0, 48.0) LIMIT 10000"]}
+{"sql":"SELECT MAX(\"Month\") FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11","hsqls":["SELECT MAX(`Month`) FROM mytable WHERE CRSDepTime IN (1534, 2213) OR DestCityName BETWEEN 'Sacramento, CA' AND 'Nome, AK' OR ArrDelay > -7.0 LIMIT 11"]}
+{"sql":"SELECT MAX(\"Year\") FROM mytable WHERE DivWheelsOns >= 2058 OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 20","hsqls":["SELECT MAX(`Year`) FROM mytable WHERE (DivWheelsOns[1] >= 2058 OR DivWheelsOns[2] >= 2058 OR DivWheelsOns[3] >= 2058 OR DivWheelsOns[4] >= 2058 OR DivWheelsOns[5] >= 2058) OR UniqueCarrier BETWEEN 'VX' AND 'US' OR CRSElapsedTime > 290 LIMIT 10000"]}
+{"sql":"SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek) FROM mytable WHERE DivWheelsOffs >= 2009 AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 29","hsqls":["SELECT MIN(ArrDelay), COUNT(CRSDepTime), SUM(DayOfWeek)  FROM mytable WHERE (DivWheelsOffs[1] >= 2009 OR DivWheelsOffs[2] >= 2009 OR DivWheelsOffs[3] >= 2009 OR DivWheelsOffs[4] >= 2009 OR DivWheelsOffs[5] >= 2009) AND Diverted >= 1 OR OriginCityMarketID >= 34783 LIMIT 10000"]}
+{"sql":"SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay) FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR DivTailNums IN ('N314US', 'N3751B', 'N925DL', 'N393HA', 'N16951') LIMIT 29","hsqls":["SELECT MIN(ArrTime), AVG(AirlineID), COUNT(WeatherDelay)  FROM mytable WHERE OriginCityName NOT IN ('Columbus, GA', 'Raleigh/Durham, NC') OR (ARRAY_CONTAINS(DivTailNums,'N314US') OR ARRAY_CONTAINS(DivTailNums, 'N3751B') OR ARRAY_CONTAINS(DivTailNums, 'N925DL') OR ARRAY_CONTAINS(DivTailNums, 'N393HA') OR ARRAY_CONTAINS(DivTailNums, 'N16951')) LIMIT 10000"]}
+{"sql":"SELECT MIN(DaysSinceEpoch), AVG(FlightNum) FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR DivAirportIDs IN (14730, 14262, 10868) LIMIT 6","hsqls":["SELECT MIN(DaysSinceEpoch), AVG(FlightNum)  FROM mytable WHERE DepDel15 IN (1, 0, -9999) AND AirlineID BETWEEN 20366 AND 19393 OR (ARRAY_CONTAINS(DivAirportIDs, 14730) OR ARRAY_CONTAINS(DivAirportIDs, 14262) OR ARRAY_CONTAINS(DivAirportIDs, 10868)) LIMIT 10000"]}
+{"sql":"SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime) FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND DivWheelsOns IN (1717, 102, 1835) LIMIT 24","hsqls":["SELECT MIN(DaysSinceEpoch), COUNT(CRSElapsedTime)  FROM mytable WHERE UniqueCarrier IN ('EV', 'F9', 'MQ', 'UA') AND (ARRAY_CONTAINS(DivWheelsOns, 1717) OR ARRAY_CONTAINS(DivWheelsOns, 102) OR ARRAY_CONTAINS(DivWheelsOns, 1835)) LIMIT 10000"]}
+{"sql":"SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND \"Year\" < 2014 OR CRSElapsedTime >= 337 LIMIT 29","hsqls":["SELECT MIN(DivReachedDest), AVG(AirTime) FROM mytable WHERE DivReachedDest BETWEEN -9999 AND -9999 AND `Year` < 2014 OR CRSElapsedTime >= 337 LIMIT 29"]}
+{"sql":"SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR \"Month\" <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5","hsqls":["SELECT MIN(FlightNum), MAX(CRSDepTime), COUNT(DestState) FROM mytable WHERE Flights BETWEEN 1 AND 1 OR `Month` <> 1 AND DivReachedDest BETWEEN 0 AND 0 LIMIT 5"]}
+{"sql":"SELECT MIN(Flights), SUM(CRSArrTime) FROM mytable WHERE FlightNum NOT IN (4484) AND DivAirportSeqIDs >= 1323202 AND DayOfWeek NOT IN (2, 1) LIMIT 14","hsqls":["SELECT MIN(Flights), SUM(CRSArrTime)  FROM mytable WHERE FlightNum NOT IN (4484) AND (DivAirportSeqIDs[1] >= 1323202 OR DivAirportSeqIDs[2] >= 1323202 OR DivAirportSeqIDs[3] >= 1323202 OR DivAirportSeqIDs[4] >= 1323202 OR DivAirportSeqIDs[5] >= 1323202) AND DayOfWeek NOT IN (2, 1) LIMIT 10000"]}
+{"sql":"SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE DivTailNums IN ('N3751B', 'N296WN', 'N416SW', 'N472WN') LIMIT 7","hsqls":["SELECT SUM(DepDel15), COUNT(AirTime) FROM mytable WHERE ARRAY_CONTAINS(DivTailNums, 'N3751B') OR ARRAY_CONTAINS(DivTailNums, 'N296WN') OR ARRAY_CONTAINS(DivTailNums, 'N416SW') OR ARRAY_CONTAINS(DivTailNums, 'N472WN') LIMIT 10000"]}
+{"sql":"SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime) FROM mytable WHERE DivTotalGTimes > 18 AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 22","hsqls":["SELECT SUM(DivActualElapsedTime), COUNT(LateAircraftDelay), AVG(DivActualElapsedTime)  FROM mytable WHERE (DivTotalGTimes[1] > 18 OR DivTotalGTimes[2] > 18 OR DivTotalGTimes[3] > 18 OR DivTotalGTimes[4] > 18 OR DivTotalGTimes[5] > 18) AND OriginCityMarketID IN (30721, 32389, 30781, 31076) OR DepDel15 BETWEEN -9999 AND 1 LIMIT 10000"]}
+{"sql":"SELECT SUM(DivActualElapsedTime), MAX(\"Month\") FROM mytable WHERE Distance <> 788 AND DivWheelsOffs > 1851 LIMIT 5","hsqls":["SELECT SUM(DivActualElapsedTime), MAX(`Month`)  FROM mytable WHERE Distance <> 788 AND (DivWheelsOffs[1] > 1851 OR DivWheelsOffs[2] > 1851 OR DivWheelsOffs[3] > 1851 OR DivWheelsOffs[4] > 1851 OR DivWheelsOffs[5] > 1851) LIMIT 10000"]}
+{"sql":"SELECT SUM(DivArrDelay), SUM(DestStateFips) FROM mytable WHERE DivTailNums IN ('N3768', 'N438SW', 'N786SK', 'N636MQ', 'N3KXAA') AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 20","hsqls":["SELECT SUM(DivArrDelay), SUM(DestStateFips)  FROM mytable WHERE (ARRAY_CONTAINS(DivTailNums, 'N3768') OR ARRAY_CONTAINS(DivTailNums, 'N438SW') OR ARRAY_CONTAINS(DivTailNums, 'N786SK') OR ARRAY_CONTAINS(DivTailNums, 'N636MQ') OR ARRAY_CONTAINS(DivTailNums, 'N3KXAA')) AND DestAirportID < 11867 OR Carrier NOT IN ('DL', 'WN') LIMIT 10000"]}
+{"sql":"SELECT SUM(DivReachedDest), AVG(DestWac) FROM mytable WHERE DivWheelsOns BETWEEN 728 AND 1804 LIMIT 13","hsqls":["SELECT SUM(DivReachedDest), AVG(DestWac)  FROM mytable WHERE (DivWheelsOns[1] BETWEEN 728 AND 1804 OR DivWheelsOns[2] BETWEEN 728 AND 1804 OR DivWheelsOns[3] BETWEEN 728 AND 1804 OR DivWheelsOns[4] BETWEEN 728 AND 1804 OR DivWheelsOns[5] BETWEEN 728 AND 1804) LIMIT 10000"]}
+{"sql":"SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState) FROM mytable WHERE DivAirports IN ('RFD') AND TaxiIn BETWEEN -9999 AND 94 LIMIT 29","hsqls":["SELECT SUM(WheelsOn), SUM(DivArrDelay), COUNT(DestState)  FROM mytable WHERE ARRAY_CONTAINS(DivAirports, 'RFD') AND TaxiIn BETWEEN -9999 AND 94 LIMIT 10000"]}
+{"sql":"SELECT SUM(\"Month\") FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23","hsqls":["SELECT SUM(`Month`) FROM mytable WHERE FirstDepTime <> 1742 AND DestStateName BETWEEN 'Maine' AND 'South Dakota' OR Carrier <= 'UA' LIMIT 23"]}
+{"sql":"SELECT SUM(\"Year\"), MAX(DayofMonth), AVG(CRSArrTime) FROM mytable WHERE WheelsOff > 1737 AND DivTotalGTimes IN (30, 113, 102, 37) LIMIT 10","hsqls":["SELECT SUM(`Year`), MAX(DayofMonth), AVG(CRSArrTime)  FROM mytable WHERE WheelsOff > 1737 AND (ARRAY_CONTAINS(DivTotalGTimes, 30) OR ARRAY_CONTAINS(DivTotalGTimes, 113) OR ARRAY_CONTAINS(DivTotalGTimes, 102) OR ARRAY_CONTAINS(DivTotalGTimes, 37)) LIMIT 10000"]}
 
 # Filtering & Grouping on Aggregation
 {"sql":"SELECT ActualElapsedTime, AirTime, MIN(DistanceGroup), SUM(OriginAirportSeqID) FROM mytable WHERE ArrTime BETWEEN 2017 AND 2216 GROUP BY ActualElapsedTime, AirTime  ORDER BY ActualElapsedTime, AirTime LIMIT 14","hsqls":["SELECT ActualElapsedTime, AirTime, MIN(DistanceGroup), SUM(OriginAirportSeqID) FROM mytable WHERE ArrTime BETWEEN 2017 AND 2216 GROUP BY ActualElapsedTime, AirTime  ORDER BY ActualElapsedTime, AirTime LIMIT 14"]}
@@ -200,26 +200,26 @@
 
 # Selection & Order by
 {"sql":"SELECT ActualElapsedTime, ActualElapsedTime, DestCityName FROM mytable ORDER BY ActualElapsedTime, DestCityName LIMIT 25"}
-{"sql":"SELECT ActualElapsedTime, TaxiOut, SecurityDelay, DestCityMarketID FROM mytable WHERE \"Month\" IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11","hsqls":["SELECT ActualElapsedTime, TaxiOut, SecurityDelay, DestCityMarketID FROM mytable WHERE Month IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11"]}
+{"sql":"SELECT ActualElapsedTime, TaxiOut, SecurityDelay, DestCityMarketID FROM mytable WHERE \"Month\" IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11","hsqls":["SELECT ActualElapsedTime, TaxiOut, SecurityDelay, DestCityMarketID FROM mytable WHERE `Month` IN (1) OR OriginStateName BETWEEN 'Connecticut' AND 'Pennsylvania' OR ArrTime < 2123 ORDER BY TaxiOut, SecurityDelay, DestCityMarketID LIMIT 11"]}
 {"sql":"SELECT AirTime, OriginWac, CRSElapsedTime FROM mytable WHERE TotalAddGTime <= 21 ORDER BY OriginWac, CRSElapsedTime LIMIT 16"}
 {"sql":"SELECT AirlineID, OriginAirportSeqID, FlightDate FROM mytable WHERE WeatherDelay BETWEEN 234 AND 1 AND ArrDel15 BETWEEN -9999 AND 1 OR ArrivalDelayGroups > 7 ORDER BY OriginAirportSeqID, FlightDate LIMIT 28"}
 {"sql":"SELECT ArrDelayMinutes, OriginStateFips, DayOfWeek FROM mytable WHERE AirlineID NOT IN (19393, 20437, 20409) AND FlightNum BETWEEN 5601 AND 6260 OR Diverted IN (1, 0) ORDER BY OriginStateFips, DayOfWeek LIMIT 22"}
-{"sql":"SELECT CRSElapsedTime, DaysSinceEpoch, \"Year\", LateAircraftDelay FROM mytable WHERE DepartureDelayGroups IN (2, 5) ORDER BY \"Year\", LateAircraftDelay LIMIT 11","hsqls":["SELECT CRSElapsedTime, DaysSinceEpoch, Year, LateAircraftDelay FROM mytable WHERE DepartureDelayGroups IN (2, 5) ORDER BY Year, LateAircraftDelay LIMIT 11"]}
-{"sql":"SELECT CarrierDelay, \"Year\", DestState, DaysSinceEpoch FROM mytable ORDER BY \"Year\", DestState, DaysSinceEpoch LIMIT 16","hsqls":["SELECT CarrierDelay, Year, DestState, DaysSinceEpoch FROM mytable ORDER BY Year, DestState, DaysSinceEpoch LIMIT 16"]}
+{"sql":"SELECT CRSElapsedTime, DaysSinceEpoch, \"Year\", LateAircraftDelay FROM mytable WHERE DepartureDelayGroups IN (2, 5) ORDER BY \"Year\", LateAircraftDelay LIMIT 11","hsqls":["SELECT CRSElapsedTime, DaysSinceEpoch, `Year`, LateAircraftDelay FROM mytable WHERE DepartureDelayGroups IN (2, 5) ORDER BY `Year`, LateAircraftDelay LIMIT 11"]}
+{"sql":"SELECT CarrierDelay, \"Year\", DestState, DaysSinceEpoch FROM mytable ORDER BY \"Year\", DestState, DaysSinceEpoch LIMIT 16","hsqls":["SELECT CarrierDelay, `Year`, DestState, DaysSinceEpoch FROM mytable ORDER BY `Year`, DestState, DaysSinceEpoch LIMIT 16"]}
 {"sql":"SELECT DayOfWeek, DepartureDelayGroups, CRSArrTime FROM mytable WHERE Cancelled < 1 OR Origin = 'COD' AND OriginCityName NOT IN ('Dallas, TX') ORDER BY DepartureDelayGroups, CRSArrTime LIMIT 19"}
 {"sql":"SELECT DaysSinceEpoch, Quarter FROM mytable WHERE Distance BETWEEN 919 AND 1623 OR OriginCityMarketID NOT IN (33851, 30713, 32511) OR CRSArrTime = 1000 ORDER BY Quarter LIMIT 7"}
 {"sql":"SELECT DepDelay, TaxiIn, ArrivalDelayGroups FROM mytable WHERE ArrTimeBlk BETWEEN '1700-1759' AND '1800-1859' AND DestCityName BETWEEN 'Grand Rapids, MI' AND 'State College, PA' ORDER BY ArrivalDelayGroups LIMIT 4"}
-{"sql":"SELECT DestWac, OriginCityName, ArrDel15, DepDel15, \"Month\" FROM mytable ORDER BY DestWac, DepDel15, \"Month\" LIMIT 14","hsqls":["SELECT DestWac, OriginCityName, ArrDel15, DepDel15, Month FROM mytable ORDER BY DestWac, DepDel15, Month LIMIT 14"]}
+{"sql":"SELECT DestWac, OriginCityName, ArrDel15, DepDel15, \"Month\" FROM mytable ORDER BY DestWac, DepDel15, \"Month\" LIMIT 14","hsqls":["SELECT DestWac, OriginCityName, ArrDel15, DepDel15, `Month` FROM mytable ORDER BY DestWac, DepDel15, `Month` LIMIT 14"]}
 {"sql":"SELECT LateAircraftDelay, OriginStateFips, DayOfWeek, CRSArrTime, AirTime, DayofMonth FROM mytable WHERE DivDistance IN (68, 577) AND DestAirportID NOT IN (14100, 10792, 13487) ORDER BY CRSArrTime, AirTime, DayofMonth LIMIT 25"}
 {"sql":"SELECT LongestAddGTime, DestCityMarketID FROM mytable WHERE TailNum IN ('N732US', 'N4YBAA', 'N349NW') AND DivActualElapsedTime NOT IN (368, 219, 218, 350) AND TaxiOut IN (93, 81) ORDER BY DestCityMarketID LIMIT 9"}
-{"sql":"SELECT OriginAirportSeqID, \"Year\", Distance, ActualElapsedTime FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2","hsqls":["SELECT OriginAirportSeqID, Year, Distance, ActualElapsedTime FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2"]}
+{"sql":"SELECT OriginAirportSeqID, \"Year\", Distance, ActualElapsedTime FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2","hsqls":["SELECT OriginAirportSeqID, `Year`, Distance, ActualElapsedTime FROM mytable WHERE ArrDelayMinutes IN (122.0) ORDER BY Distance, ActualElapsedTime LIMIT 2"]}
 {"sql":"SELECT Quarter, DepDelayMinutes, DistanceGroup FROM mytable WHERE DepDelayMinutes < 26.0 OR TailNum < 'N439US' AND CancellationCode BETWEEN 'C' AND 'A' ORDER BY DistanceGroup LIMIT 15"}
 {"sql":"SELECT TailNum, OriginCityName, Dest FROM mytable WHERE ActualElapsedTime BETWEEN 125 AND 299 AND OriginCityMarketID NOT IN (31884, 35991, 30073, 32335, 33264) AND DepDelayMinutes BETWEEN 338.0 AND 186.0 ORDER BY OriginCityName, Dest LIMIT 18"}
 {"sql":"SELECT TaxiOut, Flights, OriginCityMarketID FROM mytable WHERE CRSDepTime NOT IN (2210, 716, 1510, 1153, 1517) AND ArrTimeBlk BETWEEN '1900-1959' AND '0700-0759' ORDER BY Flights, OriginCityMarketID LIMIT 25"}
 {"sql":"SELECT TotalAddGTime, Flights FROM mytable WHERE DestStateFips NOT IN (48, 35, 22, 36, 39) AND CRSElapsedTime > 146 AND DivArrDelay BETWEEN 353 AND 328 ORDER BY Flights LIMIT 11"}
 {"sql":"SELECT WeatherDelay, Cancelled, Dest, OriginAirportID FROM mytable WHERE AirTime <= 329 OR AirlineID < 20366 OR AirlineID BETWEEN 20304 AND 19805 ORDER BY OriginAirportID LIMIT 22"}
-{"sql":"SELECT WheelsOff, TotalAddGTime, \"Month\", OriginState FROM mytable ORDER BY OriginState LIMIT 24","hsqls":["SELECT WheelsOff, TotalAddGTime, Month, OriginState FROM mytable ORDER BY OriginState LIMIT 24"]}
-{"sql":"SELECT \"Year\", DepTime FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3","hsqls":["SELECT Year, DepTime FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3"]}
+{"sql":"SELECT WheelsOff, TotalAddGTime, \"Month\", OriginState FROM mytable ORDER BY OriginState LIMIT 24","hsqls":["SELECT WheelsOff, TotalAddGTime, `Month`, OriginState FROM mytable ORDER BY OriginState LIMIT 24"]}
+{"sql":"SELECT \"Year\", DepTime FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3","hsqls":["SELECT `Year`, DepTime FROM mytable WHERE CRSArrTime BETWEEN 1237 AND 1534 AND Cancelled BETWEEN 0 AND 1 ORDER BY DepTime LIMIT 3"]}
 
 # Selection
 {"sql":"SELECT DivDistance, ActualElapsedTime FROM mytable LIMIT 29"}
diff --git a/pinot-integration-tests/src/test/resources/examples/batch/tpch b/pinot-integration-tests/src/test/resources/examples/batch/tpch
new file mode 120000
index 00000000000..4b077392b73
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/examples/batch/tpch
@@ -0,0 +1 @@
+../../../../../../pinot-tools/src/main/resources/examples/batch/tpch
\ No newline at end of file
diff --git a/pinot-integration-tests/src/test/resources/gameScores_csv.tar.gz b/pinot-integration-tests/src/test/resources/gameScores_csv.tar.gz
new file mode 100644
index 00000000000..48dc5163c68
Binary files /dev/null and b/pinot-integration-tests/src/test/resources/gameScores_csv.tar.gz differ
diff --git a/pinot-integration-tests/src/test/resources/gameScores_partial_upsert_csv.tar.gz b/pinot-integration-tests/src/test/resources/gameScores_partial_upsert_csv.tar.gz
new file mode 100644
index 00000000000..a6fd014e964
Binary files /dev/null and b/pinot-integration-tests/src/test/resources/gameScores_partial_upsert_csv.tar.gz differ
diff --git a/pinot-integration-tests/src/test/resources/partial_upsert_table_test.schema b/pinot-integration-tests/src/test/resources/partial_upsert_table_test.schema
new file mode 100644
index 00000000000..ceb2f2d287d
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/partial_upsert_table_test.schema
@@ -0,0 +1,35 @@
+{
+  "schemaName": "playerScoresPartialUpsert",
+  "dimensionFieldSpecs": [
+    {
+      "name": "playerId",
+      "dataType": "INT"
+    },
+    {
+      "name": "name",
+      "dataType": "STRING"
+    },
+    {
+      "name": "game",
+      "dataType": "STRING",
+      "singleValueField": "false"
+    },
+    {
+      "name": "deleted",
+      "dataType": "BOOLEAN"
+    }
+  ],
+  "metricFieldSpecs": [
+    {
+      "name": "score",
+      "dataType": "FLOAT"
+    }
+  ],
+  "dateTimeFieldSpecs": [{
+    "name": "timestampInEpoch",
+    "dataType": "LONG",
+    "format" : "1:MILLISECONDS:EPOCH",
+    "granularity": "1:MILLISECONDS"
+  }],
+  "primaryKeyColumns": [ "playerId" ]
+}
diff --git a/pinot-integration-tests/src/test/resources/tpch/1.sql b/pinot-integration-tests/src/test/resources/tpch/1.sql
new file mode 100644
index 00000000000..c43e3122c8e
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/1.sql
@@ -0,0 +1,25 @@
+select
+  l_returnflag,
+  l_linestatus,
+  sum(l_quantity) as sum_qty,
+  sum(l_extendedprice) as sum_base_price,
+  sum(
+    l_extendedprice * (1 - l_discount)
+  ) as sum_disc_price,
+  sum(
+    l_extendedprice * (1 - l_discount) * (1 + l_tax)
+  ) as sum_charge,
+  avg(l_quantity) as avg_qty,
+  avg(l_extendedprice) as avg_price,
+  avg(l_discount) as avg_disc,
+  count(*) as count_order
+from
+  lineitem
+where
+  l_shipdate <= 904694400
+group by
+  l_returnflag,
+  l_linestatus
+order by
+  l_returnflag,
+  l_linestatus;
diff --git a/pinot-integration-tests/src/test/resources/tpch/10.sql b/pinot-integration-tests/src/test/resources/tpch/10.sql
new file mode 100644
index 00000000000..847d7a67dff
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/10.sql
@@ -0,0 +1,33 @@
+select
+  c_custkey,
+  c_name,
+  sum(
+    l_extendedprice * (1 - l_discount)
+  ) as revenue,
+  c_acctbal,
+  n_name,
+  c_address,
+  c_phone,
+  c_comment
+from
+  customer,
+  orders,
+  lineitem,
+  nation
+where
+  c_custkey = o_custkey
+  and l_orderkey = o_orderkey
+  and o_orderdate >= 749413800
+  and o_orderdate < 757362600
+  and l_returnflag = 'R'
+  and c_nationkey = n_nationkey
+group by
+  c_custkey,
+  c_name,
+  c_acctbal,
+  c_phone,
+  n_name,
+  c_address,
+  c_comment
+order by
+  revenue desc;
diff --git a/pinot-integration-tests/src/test/resources/tpch/11.sql b/pinot-integration-tests/src/test/resources/tpch/11.sql
new file mode 100644
index 00000000000..ed0d037b7b8
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/11.sql
@@ -0,0 +1,28 @@
+select
+  ps_partkey,
+  sum(ps_supplycost * ps_availqty) as value
+from
+  partsupp,
+  supplier,
+  nation
+where
+  ps_suppkey = s_suppkey
+  and s_nationkey = n_nationkey
+  and n_name = 'GERMANY'
+group by
+  ps_partkey
+having
+  sum(ps_supplycost * ps_availqty) > (
+    select
+      sum(ps_supplycost * ps_availqty) * 0.0001000000
+    from
+      partsupp,
+      supplier,
+      nation
+    where
+      ps_suppkey = s_suppkey
+      and s_nationkey = n_nationkey
+      and n_name = 'GERMANY'
+  )
+order by
+  value desc;
diff --git a/pinot-integration-tests/src/test/resources/tpch/12.sql b/pinot-integration-tests/src/test/resources/tpch/12.sql
new file mode 100644
index 00000000000..4f18a9fb510
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/12.sql
@@ -0,0 +1,24 @@
+select
+  l_shipmode,
+  sum(
+    case when o_orderpriority = '1-URGENT'
+    or o_orderpriority = '2-HIGH' then 1 else 0 end
+  ) as high_line_count,
+  sum(
+    case when o_orderpriority <> '1-URGENT'
+    and o_orderpriority <> '2-HIGH' then 1 else 0 end
+  ) as low_line_count
+from
+  orders,
+  lineitem
+where
+  o_orderkey = l_orderkey
+  and l_shipmode in ('MAIL', 'SHIP')
+  and l_commitdate < l_receiptdate
+  and l_shipdate < l_commitdate
+  and l_receiptdate >= 757362600
+  and l_receiptdate < 788898600
+group by
+  l_shipmode
+order by
+  l_shipmode;
diff --git a/pinot-integration-tests/src/test/resources/tpch/13.sql b/pinot-integration-tests/src/test/resources/tpch/13.sql
new file mode 100644
index 00000000000..9f448352019
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/13.sql
@@ -0,0 +1,20 @@
+select
+  c_count,
+  count(*) as custdist
+from
+  (
+    select
+      c_custkey,
+      count(o_orderkey)
+    from
+      customer
+      left outer join orders on c_custkey = o_custkey
+      and o_comment not like '%special%requests%'
+    group by
+      c_custkey
+  ) as c_orders (c_custkey, c_count)
+group by
+  c_count
+order by
+  custdist desc,
+  c_count desc;
diff --git a/pinot-integration-tests/src/test/resources/tpch/14.sql b/pinot-integration-tests/src/test/resources/tpch/14.sql
new file mode 100644
index 00000000000..96cc20eed75
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/14.sql
@@ -0,0 +1,13 @@
+select
+  100.00 * sum(
+    case when p_type like 'PROMO%' then l_extendedprice * (1 - l_discount) else 0 end
+  ) / sum(
+    l_extendedprice * (1 - l_discount)
+  ) as promo_revenue
+from
+  lineitem,
+  part
+where
+  l_partkey = p_partkey
+  and l_shipdate >= 809893800
+  and l_shipdate < 812485800;
diff --git a/pinot-integration-tests/src/test/resources/tpch/15.sql b/pinot-integration-tests/src/test/resources/tpch/15.sql
new file mode 100644
index 00000000000..33b7ab34ebb
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/15.sql
@@ -0,0 +1,13 @@
+create view revenue0 (supplier_no, total_revenue) as
+select
+  l_suppkey,
+  sum(
+    l_extendedprice * (1 - l_discount)
+  )
+from
+  lineitem
+where
+  l_shipdate >= 820434600
+  and l_shipdate < 828297000
+group by
+  l_suppkey;
diff --git a/pinot-integration-tests/src/test/resources/tpch/16.sql b/pinot-integration-tests/src/test/resources/tpch/16.sql
new file mode 100644
index 00000000000..96163b6a065
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/16.sql
@@ -0,0 +1,19 @@
+select
+  s_suppkey,
+  s_name,
+  s_address,
+  s_phone,
+  total_revenue
+from
+  supplier,
+  revenue0
+where
+  s_suppkey = supplier_no
+  and total_revenue = (
+    select
+      max(total_revenue)
+    from
+      revenue0
+  )
+order by
+  s_suppkey;
diff --git a/pinot-integration-tests/src/test/resources/tpch/17.sql b/pinot-integration-tests/src/test/resources/tpch/17.sql
new file mode 100644
index 00000000000..317e885f9cd
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/17.sql
@@ -0,0 +1 @@
+drop view revenue0;
\ No newline at end of file
diff --git a/pinot-integration-tests/src/test/resources/tpch/18.sql b/pinot-integration-tests/src/test/resources/tpch/18.sql
new file mode 100644
index 00000000000..acc737035c9
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/18.sql
@@ -0,0 +1,30 @@
+select
+  p_brand,
+  p_type,
+  p_size,
+  count(distinct ps_suppkey) as supplier_cnt
+from
+  partsupp,
+  part
+where
+  p_partkey = ps_partkey
+  and p_brand <> 'Brand#45'
+  and p_type not like 'MEDIUM POLISHED%'
+  and p_size in (49, 14, 23, 45, 19, 3, 36, 9)
+  and ps_suppkey not in (
+    select
+      s_suppkey
+    from
+      supplier
+    where
+      s_comment like '%Customer%Complaints%'
+  )
+group by
+  p_brand,
+  p_type,
+  p_size
+order by
+  supplier_cnt desc,
+  p_brand,
+  p_type,
+  p_size;
diff --git a/pinot-integration-tests/src/test/resources/tpch/19.sql b/pinot-integration-tests/src/test/resources/tpch/19.sql
new file mode 100644
index 00000000000..9d6322d3872
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/19.sql
@@ -0,0 +1,17 @@
+select
+  sum(l_extendedprice) / 7.0 as avg_yearly
+from
+  lineitem,
+  part
+where
+  p_partkey = l_partkey
+  and p_brand = 'Brand#23'
+  and p_container = 'MED BOX'
+  and l_quantity < (
+    select
+      0.2 * avg(l_quantity)
+    from
+      lineitem
+    where
+      l_partkey = p_partkey
+  );
diff --git a/pinot-integration-tests/src/test/resources/tpch/2.sql b/pinot-integration-tests/src/test/resources/tpch/2.sql
new file mode 100644
index 00000000000..9695cbe0adf
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/2.sql
@@ -0,0 +1,43 @@
+select
+  s_acctbal,
+  s_name,
+  n_name,
+  p_partkey,
+  p_mfgr,
+  s_address,
+  s_phone,
+  s_comment
+from
+  part,
+  supplier,
+  partsupp,
+  nation,
+  region
+where
+  p_partkey = ps_partkey
+  and s_suppkey = ps_suppkey
+  and p_size = 15
+  and p_type like '%BRASS'
+  and s_nationkey = n_nationkey
+  and n_regionkey = r_regionkey
+  and r_name = 'EUROPE'
+  and ps_supplycost = (
+    select
+      min(ps_supplycost)
+    from
+      partsupp,
+      supplier,
+      nation,
+      region
+    where
+      p_partkey = ps_partkey
+      and s_suppkey = ps_suppkey
+      and s_nationkey = n_nationkey
+      and n_regionkey = r_regionkey
+      and r_name = 'EUROPE'
+  )
+order by
+  s_acctbal desc,
+  n_name,
+  s_name,
+  p_partkey;
diff --git a/pinot-integration-tests/src/test/resources/tpch/20.sql b/pinot-integration-tests/src/test/resources/tpch/20.sql
new file mode 100644
index 00000000000..da59efd52e2
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/20.sql
@@ -0,0 +1,33 @@
+select
+  c_name,
+  c_custkey,
+  o_orderkey,
+  o_orderdate,
+  o_totalprice,
+  sum(l_quantity)
+from
+  customer,
+  orders,
+  lineitem
+where
+  o_orderkey in (
+    select
+      l_orderkey
+    from
+      lineitem
+    group by
+      l_orderkey
+    having
+      sum(l_quantity) > 300
+  )
+  and c_custkey = o_custkey
+  and o_orderkey = l_orderkey
+group by
+  c_name,
+  c_custkey,
+  o_orderkey,
+  o_orderdate,
+  o_totalprice
+order by
+  o_totalprice desc,
+  o_orderdate;
diff --git a/pinot-integration-tests/src/test/resources/tpch/21.sql b/pinot-integration-tests/src/test/resources/tpch/21.sql
new file mode 100644
index 00000000000..c697f43b34e
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/21.sql
@@ -0,0 +1,47 @@
+select
+  sum(
+    l_extendedprice * (1 - l_discount)
+  ) as revenue
+from
+  lineitem,
+  part
+where
+  (
+    p_partkey = l_partkey
+    and p_brand = 'Brand#12'
+    and p_container in (
+      'SM CASE', 'SM BOX', 'SM PACK', 'SM PKG'
+    )
+    and l_quantity >= 1
+    and l_quantity <= 1 + 10
+    and p_size between 1
+    and 5
+    and l_shipmode in ('AIR', 'AIR REG')
+    and l_shipinstruct = 'DELIVER IN PERSON'
+  )
+  or (
+    p_partkey = l_partkey
+    and p_brand = 'Brand#23'
+    and p_container in (
+      'MED BAG', 'MED BOX', 'MED PKG', 'MED PACK'
+    )
+    and l_quantity >= 10
+    and l_quantity <= 10 + 10
+    and p_size between 1
+    and 10
+    and l_shipmode in ('AIR', 'AIR REG')
+    and l_shipinstruct = 'DELIVER IN PERSON'
+  )
+  or (
+    p_partkey = l_partkey
+    and p_brand = 'Brand#34'
+    and p_container in (
+      'LG CASE', 'LG BOX', 'LG PACK', 'LG PKG'
+    )
+    and l_quantity >= 20
+    and l_quantity <= 20 + 10
+    and p_size between 1
+    and 15
+    and l_shipmode in ('AIR', 'AIR REG')
+    and l_shipinstruct = 'DELIVER IN PERSON'
+  );
diff --git a/pinot-integration-tests/src/test/resources/tpch/22.sql b/pinot-integration-tests/src/test/resources/tpch/22.sql
new file mode 100644
index 00000000000..31663daad43
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/22.sql
@@ -0,0 +1,37 @@
+select
+  s_name,
+  s_address
+from
+  supplier,
+  nation
+where
+  s_suppkey in (
+    select
+      ps_suppkey
+    from
+      partsupp
+    where
+      ps_partkey in (
+        select
+          p_partkey
+        from
+          part
+        where
+          p_name like 'forest%'
+      )
+      and ps_availqty > (
+        select
+          0.5 * sum(l_quantity)
+        from
+          lineitem
+        where
+          l_partkey = ps_partkey
+          and l_suppkey = ps_suppkey
+          and l_shipdate >= 757362600
+          and l_shipdate < 788898600
+      )
+  )
+  and s_nationkey = n_nationkey
+  and n_name = 'CANADA'
+order by
+  s_name;
diff --git a/pinot-integration-tests/src/test/resources/tpch/23.sql b/pinot-integration-tests/src/test/resources/tpch/23.sql
new file mode 100644
index 00000000000..bfaec5f04a4
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/23.sql
@@ -0,0 +1,39 @@
+select
+  s_name,
+  count(*) as numwait
+from
+  supplier,
+  lineitem l1,
+  orders,
+  nation
+where
+  s_suppkey = l1.l_suppkey
+  and o_orderkey = l1.l_orderkey
+  and o_orderstatus = 'F'
+  and l1.l_receiptdate > l1.l_commitdate
+  and exists (
+    select
+      *
+    from
+      lineitem l2
+    where
+      l2.l_orderkey = l1.l_orderkey
+      and l2.l_suppkey <> l1.l_suppkey
+  )
+  and not exists (
+    select
+      *
+    from
+      lineitem l3
+    where
+      l3.l_orderkey = l1.l_orderkey
+      and l3.l_suppkey <> l1.l_suppkey
+      and l3.l_receiptdate > l3.l_commitdate
+  )
+  and s_nationkey = n_nationkey
+  and n_name = 'SAUDI ARABIA'
+group by
+  s_name
+order by
+  numwait desc,
+  s_name;
diff --git a/pinot-integration-tests/src/test/resources/tpch/24.sql b/pinot-integration-tests/src/test/resources/tpch/24.sql
new file mode 100644
index 00000000000..dc95d6dd579
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/24.sql
@@ -0,0 +1,51 @@
+select
+  cntrycode,
+  count(*) as numcust,
+  sum(c_acctbal) as totacctbal
+from
+  (
+    select
+      substring(
+        c_phone
+        from
+          1 for 2
+      ) as cntrycode,
+      c_acctbal
+    from
+      customer
+    where
+      substring(
+        c_phone
+        from
+          1 for 2
+      ) in (
+        '13', '31', '23', '29', '30', '18', '17'
+      )
+      and c_acctbal > (
+        select
+          avg(c_acctbal)
+        from
+          customer
+        where
+          c_acctbal > 0.00
+          and substring(
+            c_phone
+            from
+              1 for 2
+          ) in (
+            '13', '31', '23', '29', '30', '18', '17'
+          )
+      )
+      and not exists (
+        select
+          *
+        from
+          orders
+        where
+          o_custkey = c_custkey
+      )
+  ) as custsale
+group by
+  cntrycode
+order by
+  cntrycode;
diff --git a/pinot-integration-tests/src/test/resources/tpch/3.sql b/pinot-integration-tests/src/test/resources/tpch/3.sql
new file mode 100644
index 00000000000..f702c55dc50
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/3.sql
@@ -0,0 +1,24 @@
+select
+  l_orderkey,
+  sum(
+    l_extendedprice * (1 - l_discount)
+  ) as revenue,
+  o_orderdate,
+  o_shippriority
+from
+  customer,
+  orders,
+  lineitem
+where
+  c_mktsegment = 'BUILDING'
+  and c_custkey = o_custkey
+  and l_orderkey = o_orderkey
+  and o_orderdate < 795225600
+  and l_shipdate > 795225600
+group by
+  l_orderkey,
+  o_orderdate,
+  o_shippriority
+order by
+  revenue desc,
+  o_orderdate;
diff --git a/pinot-integration-tests/src/test/resources/tpch/4.sql b/pinot-integration-tests/src/test/resources/tpch/4.sql
new file mode 100644
index 00000000000..8c5572cc298
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/4.sql
@@ -0,0 +1,21 @@
+select
+  o_orderpriority,
+  count(*) as order_count
+from
+  orders
+where
+  o_orderdate >= 741484800
+  and o_orderdate < 749433600
+  and exists (
+    select
+      *
+    from
+      lineitem
+    where
+      l_orderkey = o_orderkey
+      and l_commitdate < l_receiptdate
+  )
+group by
+  o_orderpriority
+order by
+  o_orderpriority;
diff --git a/pinot-integration-tests/src/test/resources/tpch/5.sql b/pinot-integration-tests/src/test/resources/tpch/5.sql
new file mode 100644
index 00000000000..3dbc2144313
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/5.sql
@@ -0,0 +1,26 @@
+select
+  n_name,
+  sum(
+    l_extendedprice * (1 - l_discount)
+  ) as revenue
+from
+  customer,
+  orders,
+  lineitem,
+  supplier,
+  nation,
+  region
+where
+  c_custkey = o_custkey
+  and l_orderkey = o_orderkey
+  and l_suppkey = s_suppkey
+  and c_nationkey = s_nationkey
+  and s_nationkey = n_nationkey
+  and n_regionkey = r_regionkey
+  and r_name = 'ASIA'
+  and o_orderdate >= 757382400
+  and o_orderdate < 788918400
+group by
+  n_name
+order by
+  revenue desc;
diff --git a/pinot-integration-tests/src/test/resources/tpch/6.sql b/pinot-integration-tests/src/test/resources/tpch/6.sql
new file mode 100644
index 00000000000..e29fa408c82
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/6.sql
@@ -0,0 +1,10 @@
+select
+  sum(l_extendedprice * l_discount) as revenue
+from
+  lineitem
+where
+  l_shipdate >= 757382400
+  and l_shipdate < 788918400
+  and l_discount between.06 - 0.01
+  and.06 + 0.01
+  and l_quantity < 24;
diff --git a/pinot-integration-tests/src/test/resources/tpch/7.sql b/pinot-integration-tests/src/test/resources/tpch/7.sql
new file mode 100644
index 00000000000..852d61f8380
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/7.sql
@@ -0,0 +1,46 @@
+select
+  supp_nation,
+  cust_nation,
+  l_year,
+  sum(volume) as revenue
+from
+  (
+    select
+      n1.n_name as supp_nation,
+      n2.n_name as cust_nation,
+      ToDateTime(l_shipdate * 1000, 'yyyy') as l_year,
+      l_extendedprice * (1 - l_discount) as volume
+    from
+      supplier,
+      lineitem,
+      orders,
+      customer,
+      nation n1,
+      nation n2
+    where
+      s_suppkey = l_suppkey
+      and o_orderkey = l_orderkey
+      and c_custkey = o_custkey
+      and s_nationkey = n1.n_nationkey
+      and c_nationkey = n2.n_nationkey
+      and (
+        (
+          n1.n_name = 'FRANCE'
+          and n2.n_name = 'GERMANY'
+        )
+        or (
+          n1.n_name = 'GERMANY'
+          and n2.n_name = 'FRANCE'
+        )
+      )
+      and l_shipdate between 788898600
+      and 851970600
+  ) as shipping
+group by
+  supp_nation,
+  cust_nation,
+  l_year
+order by
+  supp_nation,
+  cust_nation,
+  l_year;
diff --git a/pinot-integration-tests/src/test/resources/tpch/8.sql b/pinot-integration-tests/src/test/resources/tpch/8.sql
new file mode 100644
index 00000000000..8416732df6b
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/8.sql
@@ -0,0 +1,37 @@
+select
+  o_year,
+  sum(
+    case when nation = 'BRAZIL' then volume else 0 end
+  ) / sum(volume) as mkt_share
+from
+  (
+    select
+      ToDateTime(o_orderdate * 1000, 'yyyy') as o_year,
+      l_extendedprice * (1 - l_discount) as volume,
+      n2.n_name as nation
+    from
+      part,
+      supplier,
+      lineitem,
+      orders,
+      customer,
+      nation n1,
+      nation n2,
+      region
+    where
+      p_partkey = l_partkey
+      and s_suppkey = l_suppkey
+      and l_orderkey = o_orderkey
+      and o_custkey = c_custkey
+      and c_nationkey = n1.n_nationkey
+      and n1.n_regionkey = r_regionkey
+      and r_name = 'AMERICA'
+      and s_nationkey = n2.n_nationkey
+      and o_orderdate between 788898600
+      and 851970600
+      and p_type = 'ECONOMY ANODIZED STEEL'
+  ) as all_nations
+group by
+  o_year
+order by
+  o_year;
diff --git a/pinot-integration-tests/src/test/resources/tpch/9.sql b/pinot-integration-tests/src/test/resources/tpch/9.sql
new file mode 100644
index 00000000000..84ca85dcdcf
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/tpch/9.sql
@@ -0,0 +1,32 @@
+select
+  nation,
+  o_year,
+  sum(amount) as sum_profit
+from
+  (
+    select
+      n_name as nation,
+      ToDateTime(o_orderdate * 1000, 'yyyy') as o_year,
+      l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity as amount
+    from
+      part,
+      supplier,
+      lineitem,
+      partsupp,
+      orders,
+      nation
+    where
+      s_suppkey = l_suppkey
+      and ps_suppkey = l_suppkey
+      and ps_partkey = l_partkey
+      and p_partkey = l_partkey
+      and o_orderkey = l_orderkey
+      and s_nationkey = n_nationkey
+      and p_name like '%green%'
+  ) as profit
+group by
+  nation,
+  o_year
+order by
+  nation,
+  o_year desc;
diff --git a/pinot-integration-tests/src/test/resources/upsert_compaction_test.tar.gz b/pinot-integration-tests/src/test/resources/upsert_compaction_test.tar.gz
new file mode 100644
index 00000000000..76b0a50126d
Binary files /dev/null and b/pinot-integration-tests/src/test/resources/upsert_compaction_test.tar.gz differ
diff --git a/pinot-integration-tests/src/test/resources/upsert_table_test.schema b/pinot-integration-tests/src/test/resources/upsert_table_test.schema
index 3f656f7936a..c0bcebfaae9 100644
--- a/pinot-integration-tests/src/test/resources/upsert_table_test.schema
+++ b/pinot-integration-tests/src/test/resources/upsert_table_test.schema
@@ -1,33 +1,34 @@
 {
+  "schemaName": "playerScores",
   "dimensionFieldSpecs": [
     {
-      "dataType": "INT",
-      "singleValueField": true,
-      "name": "clientId"
+      "name": "playerId",
+      "dataType": "INT"
     },
     {
-      "dataType": "STRING",
-      "singleValueField": true,
-      "name": "city"
+      "name": "name",
+      "dataType": "STRING"
     },
     {
-      "dataType": "STRING",
-      "singleValueField": true,
-      "name": "description"
+      "name": "game",
+      "dataType": "STRING"
     },
     {
-      "dataType": "INT",
-      "singleValueField": true,
-      "name": "salary"
+      "name": "deleted",
+      "dataType": "BOOLEAN"
     }
   ],
-  "timeFieldSpec": {
-    "incomingGranularitySpec": {
-      "timeType": "DAYS",
-      "dataType": "INT",
-      "name": "DaysSinceEpoch"
+  "metricFieldSpecs": [
+    {
+      "name": "score",
+      "dataType": "FLOAT"
     }
-  },
-  "primaryKeyColumns": ["clientId"],
-  "schemaName": "upsertSchema"
+  ],
+  "dateTimeFieldSpecs": [{
+    "name": "timestampInEpoch",
+    "dataType": "LONG",
+    "format" : "1:MILLISECONDS:EPOCH",
+    "granularity": "1:MILLISECONDS"
+  }],
+  "primaryKeyColumns": [ "playerId" ]
 }
diff --git a/pinot-integration-tests/src/test/resources/upsert_upload_segment_test.schema b/pinot-integration-tests/src/test/resources/upsert_upload_segment_test.schema
new file mode 100644
index 00000000000..3f656f7936a
--- /dev/null
+++ b/pinot-integration-tests/src/test/resources/upsert_upload_segment_test.schema
@@ -0,0 +1,33 @@
+{
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "singleValueField": true,
+      "name": "clientId"
+    },
+    {
+      "dataType": "STRING",
+      "singleValueField": true,
+      "name": "city"
+    },
+    {
+      "dataType": "STRING",
+      "singleValueField": true,
+      "name": "description"
+    },
+    {
+      "dataType": "INT",
+      "singleValueField": true,
+      "name": "salary"
+    }
+  ],
+  "timeFieldSpec": {
+    "incomingGranularitySpec": {
+      "timeType": "DAYS",
+      "dataType": "INT",
+      "name": "DaysSinceEpoch"
+    }
+  },
+  "primaryKeyColumns": ["clientId"],
+  "schemaName": "upsertSchema"
+}
diff --git a/pinot-integration-tests/src/test/resources/upsert_test.tar.gz b/pinot-integration-tests/src/test/resources/upsert_upload_segment_test.tar.gz
similarity index 100%
rename from pinot-integration-tests/src/test/resources/upsert_test.tar.gz
rename to pinot-integration-tests/src/test/resources/upsert_upload_segment_test.tar.gz
diff --git a/pinot-minion/pom.xml b/pinot-minion/pom.xml
index e4a770ef2ce..3b027548992 100644
--- a/pinot-minion/pom.xml
+++ b/pinot-minion/pom.xml
@@ -65,12 +65,6 @@
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java b/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
index 2448af71c9e..3d3bfcbe0b5 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
@@ -42,6 +42,7 @@
 import org.apache.pinot.common.metrics.MinionMeter;
 import org.apache.pinot.common.metrics.MinionMetrics;
 import org.apache.pinot.common.utils.ClientSSLContextGenerator;
+import org.apache.pinot.common.utils.PinotAppConfigs;
 import org.apache.pinot.common.utils.ServiceStartableUtils;
 import org.apache.pinot.common.utils.ServiceStatus;
 import org.apache.pinot.common.utils.TlsUtils;
@@ -123,8 +124,8 @@ private void setupHelixSystemProperties() {
     // NOTE: Helix will disconnect the manager and disable the instance if it detects flapping (too frequent disconnect
     // from ZooKeeper). Setting flapping time window to a small value can avoid this from happening. Helix ignores the
     // non-positive value, so set the default value as 1.
-    System.setProperty(SystemPropertyKeys.FLAPPING_TIME_WINDOW, _config
-        .getProperty(CommonConstants.Helix.CONFIG_OF_MINION_FLAPPING_TIME_WINDOW_MS,
+    System.setProperty(SystemPropertyKeys.FLAPPING_TIME_WINDOW,
+        _config.getProperty(CommonConstants.Helix.CONFIG_OF_MINION_FLAPPING_TIME_WINDOW_MS,
             CommonConstants.Helix.DEFAULT_FLAPPING_TIME_WINDOW_MS));
   }
 
@@ -167,13 +168,14 @@ public PinotConfiguration getConfig() {
   public void start()
       throws Exception {
     LOGGER.info("Starting Pinot minion: {} (Version: {})", _instanceId, PinotVersion.VERSION);
+    LOGGER.info("Minion configs: {}", new PinotAppConfigs(getConfig()).toJSONString());
     Utils.logVersions();
     MinionContext minionContext = MinionContext.getInstance();
 
     // Initialize data directory
     LOGGER.info("Initializing data directory");
-    File dataDir = new File(_config
-        .getProperty(CommonConstants.Helix.Instance.DATA_DIR_KEY, CommonConstants.Minion.DEFAULT_INSTANCE_DATA_DIR));
+    File dataDir = new File(_config.getProperty(CommonConstants.Helix.Instance.DATA_DIR_KEY,
+        CommonConstants.Minion.DEFAULT_INSTANCE_DATA_DIR));
     if (dataDir.exists()) {
       FileUtils.cleanDirectory(dataDir);
     } else {
@@ -193,8 +195,8 @@ public void start()
 
     // Install default SSL context if necessary (even if not force-enabled everywhere)
     TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(_config, CommonConstants.Minion.MINION_TLS_PREFIX);
-    if (StringUtils.isNotBlank(tlsDefaults.getKeyStorePath()) || StringUtils
-        .isNotBlank(tlsDefaults.getTrustStorePath())) {
+    if (StringUtils.isNotBlank(tlsDefaults.getKeyStorePath()) || StringUtils.isNotBlank(
+        tlsDefaults.getTrustStorePath())) {
       LOGGER.info("Installing default SSL context for any client requests");
       TlsUtils.installDefaultSSLSocketFactory(tlsDefaults);
     }
@@ -235,8 +237,7 @@ public void start()
     PinotConfiguration segmentUploaderConfig =
         _config.subset(CommonConstants.Minion.PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER);
     if (segmentUploaderConfig.isEmpty()) {
-      segmentUploaderConfig =
-          _config.subset(CommonConstants.Minion.DEPRECATED_PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER);
+      segmentUploaderConfig = _config.subset(CommonConstants.Minion.DEPRECATED_PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER);
     }
     PinotConfiguration httpsConfig = segmentUploaderConfig.subset(CommonConstants.HTTPS_PROTOCOL);
     if (httpsConfig.getProperty(HTTPS_ENABLED, false)) {
@@ -252,7 +253,7 @@ public void start()
     _helixManager.connect();
     updateInstanceConfigIfNeeded();
     minionContext.setHelixPropertyStore(_helixManager.getHelixPropertyStore());
-
+    minionContext.setHelixManager(_helixManager);
     LOGGER.info("Starting minion admin application on: {}", ListenerConfigUtil.toString(_listenerConfigs));
     _minionAdminApplication = new MinionAdminApiApplication(_instanceId, _config);
     _minionAdminApplication.start(_listenerConfigs);
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
index 317f9f1ce51..1ff12b3c169 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
@@ -107,7 +107,7 @@ private void setupSwagger() {
     _httpServer.getServerConfiguration().addHttpHandler(httpHandler, "/api/", "/help/");
 
     URL swaggerDistLocation =
-        MinionAdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
+        MinionAdminApiApplication.class.getClassLoader().getResource(CommonConstants.CONFIG_OF_SWAGGER_RESOURCES_PATH);
     CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new URLClassLoader(new URL[]{swaggerDistLocation}));
     _httpServer.getServerConfiguration().addHttpHandler(swaggerDist, "/swaggerui-dist/");
   }
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java
index 6ccd3646777..8b6e0dc4c96 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import javax.net.ssl.SSLContext;
+import org.apache.helix.HelixManager;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.metrics.MinionMetrics;
@@ -43,6 +44,7 @@ public static MinionContext getInstance() {
   private File _dataDir;
   private MinionMetrics _minionMetrics;
   private ZkHelixPropertyStore<ZNRecord> _helixPropertyStore;
+  private HelixManager _helixManager;
 
   // For segment upload
   private SSLContext _sslContext;
@@ -107,4 +109,12 @@ public AuthProvider getTaskAuthProvider() {
   public void setTaskAuthProvider(AuthProvider taskAuthProvider) {
     _taskAuthProvider = taskAuthProvider;
   }
+
+  public void setHelixManager(HelixManager helixManager) {
+    _helixManager = helixManager;
+  }
+
+  public HelixManager getHelixManager() {
+    return _helixManager;
+  }
 }
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResource.java b/pinot-minion/src/main/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResource.java
index c2260bec8ec..c53a0323e68 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResource.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResource.java
@@ -27,8 +27,12 @@
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.SecurityDefinition;
 import io.swagger.annotations.SwaggerDefinition;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -37,9 +41,10 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.minion.event.MinionEventObserver;
 import org.apache.pinot.minion.event.MinionEventObservers;
+import org.apache.pinot.minion.event.MinionTaskState;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.slf4j.Logger;
@@ -84,4 +89,57 @@ public String getSubtaskProgress(
           .build());
     }
   }
+
+  @GET
+  @Path("/tasks/subtask/state/progress")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation("Get finer grained task progress tracked in memory for given subtasks or given state")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"), @ApiResponse(code = 500, message = "Internal server error")
+  })
+  public String getSubtaskProgress(
+      @ApiParam(value = "Sub task names separated by comma") @QueryParam("subtaskNames") @Nullable String subtaskNames,
+      @ApiParam(value = "Subtask state", required = true) @QueryParam("subTaskState") @Nullable String subTaskState) {
+    try {
+      Map<String, MinionEventObserver> progress = new HashMap<>();
+      if (StringUtils.isEmpty(subtaskNames) && StringUtils.isEmpty(subTaskState)) {
+        LOGGER.debug("Getting progress of all subtasks");
+        progress.putAll(MinionEventObservers.getInstance().getMinionEventObservers());
+      } else if (!StringUtils.isEmpty(subtaskNames) && !StringUtils.isEmpty(subTaskState)) {
+        throw new Exception("Subtask names and state should not be specified at the same time");
+      } else if (!StringUtils.isEmpty(subTaskState)) {
+        MinionTaskState minionTaskState = MinionTaskState.IN_PROGRESS;
+        try {
+          minionTaskState = MinionTaskState.valueOf(subTaskState.toUpperCase());
+        } catch (IllegalArgumentException e) {
+          LOGGER.warn("{} is not a valid subtask state, defaulting to IN_PROGRESS", subTaskState);
+          subTaskState = MinionTaskState.IN_PROGRESS.toString();
+        }
+        LOGGER.debug("Getting progress for subtasks with state {}", subTaskState);
+        progress.putAll(MinionEventObservers.getInstance().getMinionEventObserverWithGivenState(minionTaskState));
+      } else {
+        // !StringUtils.isEmpty(subtaskNames) is true
+        LOGGER.debug("Getting progress for subtasks: {}", subtaskNames);
+        List<String> subTaskNames =
+            Arrays.stream(StringUtils.split(subtaskNames, CommonConstants.Minion.TASK_LIST_SEPARATOR))
+                .map(String::trim)
+                .collect(Collectors.toList());
+        for (String subtaskName : subTaskNames) {
+          MinionEventObserver observer = MinionEventObservers.getInstance().getMinionEventObserver(subtaskName);
+          if (observer != null) {
+            progress.put(subtaskName, observer);
+          }
+        }
+      }
+      LOGGER.debug("Got subtasks progress: {}", progress);
+      return JsonUtils.objectToString(progress);
+    } catch (Exception e) {
+      throw new WebApplicationException(Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
+              String.format("Failed to get task progress for subtasks %s with state %s due to error: %s",
+                  StringUtils.isEmpty(subtaskNames) ? "NOT_SPECIFIED" : subtaskNames,
+                  StringUtils.isEmpty(subTaskState) ? "NOT_SPECIFIED" : subTaskState,
+                  e.getMessage()))
+          .build());
+    }
+  }
 }
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObserver.java b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObserver.java
index 510406d2972..e113a0d8628 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObserver.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObserver.java
@@ -70,4 +70,20 @@ default Object getProgress() {
    * @param exception Exception encountered during execution
    */
   void notifyTaskError(PinotTaskConfig pinotTaskConfig, Exception exception);
+
+  /**
+   * Gets the minion task state
+   * @return a {@link MinionTaskState}
+   */
+  default MinionTaskState getTaskState() {
+    return MinionTaskState.UNKNOWN;
+  }
+
+  /**
+   * Gets the minion task start timestamp
+   * @return the minion task start timestamp
+   */
+  default long getStartTs() {
+    return -1;
+  }
 }
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObservers.java b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObservers.java
index 46befe39a89..471d659ba40 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObservers.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionEventObservers.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 import org.apache.pinot.minion.MinionConf;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
@@ -111,6 +112,25 @@ public MinionEventObserver getMinionEventObserver(String taskId) {
     return _taskEventObservers.get(taskId);
   }
 
+  /**
+   * Gets all {@link MinionEventObserver}s
+   * @return a map of subtask ID to {@link MinionEventObserver}
+   */
+  public Map<String, MinionEventObserver> getMinionEventObservers() {
+    return _taskEventObservers;
+  }
+
+  /**
+   * Gets all {@link MinionEventObserver}s with the given {@link MinionTaskState}
+   * @param taskState the {@link MinionTaskState} to match
+   * @return a map of subtask ID to {@link MinionEventObserver}
+   */
+  public Map<String, MinionEventObserver> getMinionEventObserverWithGivenState(MinionTaskState taskState) {
+    return _taskEventObservers.entrySet().stream()
+        .filter(e -> e.getValue().getTaskState() == taskState)
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
   public void addMinionEventObserver(String taskId, MinionEventObserver eventObserver) {
     LOGGER.debug("Keep track of event observer for task: {}", taskId);
     _taskEventObservers.put(taskId, eventObserver);
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionProgressObserver.java b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionProgressObserver.java
index 1cc03eec639..6f18814c787 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionProgressObserver.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionProgressObserver.java
@@ -41,6 +41,7 @@ public class MinionProgressObserver extends DefaultMinionEventObserver {
 
   private final int _maxNumStatusToTrack;
   private final Deque<StatusEntry> _lastStatus = new LinkedList<>();
+  private MinionTaskState _taskState;
   private long _startTs;
 
   public MinionProgressObserver() {
@@ -49,12 +50,13 @@ public MinionProgressObserver() {
 
   public MinionProgressObserver(int maxNumStatusToTrack) {
     _maxNumStatusToTrack = maxNumStatusToTrack;
+    _taskState = MinionTaskState.UNKNOWN;
   }
 
   @Override
   public synchronized void notifyTaskStart(PinotTaskConfig pinotTaskConfig) {
     _startTs = System.currentTimeMillis();
-    addStatus(_startTs, "Task started");
+    addStatus(_startTs, "Task started", MinionTaskState.IN_PROGRESS);
     super.notifyTaskStart(pinotTaskConfig);
   }
 
@@ -64,14 +66,16 @@ public synchronized void notifyTaskStart(PinotTaskConfig pinotTaskConfig) {
    * @param pinotTaskConfig Pinot task config
    * @param progress progress status and its toString() returns sth meaningful.
    */
+  @Override
   public synchronized void notifyProgress(PinotTaskConfig pinotTaskConfig, @Nullable Object progress) {
     if (LOGGER.isDebugEnabled()) {
       LOGGER.debug("Update progress: {} for task: {}", progress, pinotTaskConfig.getTaskId());
     }
-    addStatus(System.currentTimeMillis(), (progress == null) ? "" : progress.toString());
+    addStatus(System.currentTimeMillis(), (progress == null) ? "" : progress.toString(), MinionTaskState.IN_PROGRESS);
     super.notifyProgress(pinotTaskConfig, progress);
   }
 
+  @Override
   @Nullable
   public synchronized List<StatusEntry> getProgress() {
     return new ArrayList<>(_lastStatus);
@@ -80,25 +84,37 @@ public synchronized List<StatusEntry> getProgress() {
   @Override
   public synchronized void notifyTaskSuccess(PinotTaskConfig pinotTaskConfig, @Nullable Object executionResult) {
     long endTs = System.currentTimeMillis();
-    addStatus(endTs, "Task succeeded in " + (endTs - _startTs) + "ms");
+    addStatus(endTs, "Task succeeded in " + (endTs - _startTs) + "ms", MinionTaskState.SUCCEEDED);
     super.notifyTaskSuccess(pinotTaskConfig, executionResult);
   }
 
   @Override
   public synchronized void notifyTaskCancelled(PinotTaskConfig pinotTaskConfig) {
     long endTs = System.currentTimeMillis();
-    addStatus(endTs, "Task got cancelled after " + (endTs - _startTs) + "ms");
+    addStatus(endTs, "Task got cancelled after " + (endTs - _startTs) + "ms", MinionTaskState.CANCELLED);
     super.notifyTaskCancelled(pinotTaskConfig);
   }
 
   @Override
   public synchronized void notifyTaskError(PinotTaskConfig pinotTaskConfig, Exception e) {
     long endTs = System.currentTimeMillis();
-    addStatus(endTs, "Task failed in " + (endTs - _startTs) + "ms with error: " + ExceptionUtils.getStackTrace(e));
+    addStatus(endTs, "Task failed in " + (endTs - _startTs) + "ms with error: " + ExceptionUtils.getStackTrace(e),
+        MinionTaskState.ERROR);
     super.notifyTaskError(pinotTaskConfig, e);
   }
 
-  private void addStatus(long ts, String progress) {
+  @Override
+  public MinionTaskState getTaskState() {
+    return _taskState;
+  }
+
+  @Override
+  public long getStartTs() {
+    return _startTs;
+  }
+
+  private void addStatus(long ts, String progress, MinionTaskState taskState) {
+    _taskState = taskState;
     _lastStatus.addLast(new StatusEntry(ts, progress));
     if (_lastStatus.size() > _maxNumStatusToTrack) {
       _lastStatus.pollFirst();
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreatorProvider.java b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionTaskState.java
similarity index 66%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreatorProvider.java
rename to pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionTaskState.java
index 4dd1a023708..2498c1a11b4 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreatorProvider.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/event/MinionTaskState.java
@@ -16,13 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.creator;
+package org.apache.pinot.minion.event;
 
 /**
- * Plugin interface to abstract index creation.
+ * MinionTaskState represent a minion task state
  */
-public interface IndexCreatorProvider
-    extends ForwardIndexCreatorProvider, InvertedIndexCreatorProvider, JsonIndexCreatorProvider,
-            TextIndexCreatorProvider, GeoSpatialIndexCreatorProvider, RangeIndexCreatorProvider,
-            BloomFilterCreatorProvider {
+public enum MinionTaskState {
+  /**
+   * No state is reported / unknown
+   */
+  UNKNOWN,
+  /**
+   * The minion task is in progress
+   */
+  IN_PROGRESS,
+  /**
+   * The minion task succeeded
+   */
+  SUCCEEDED,
+  /**
+   * The minion task is cancelled
+   */
+  CANCELLED,
+  /**
+   * The minion task encounters error
+   */
+  ERROR
 }
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java b/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java
index 0604ab4027a..6faf1683238 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java
@@ -58,6 +58,18 @@
  */
 public class TaskFactoryRegistry {
   private static final Logger LOGGER = LoggerFactory.getLogger(TaskFactoryRegistry.class);
+  // we use 1000 as the limit for the following reasons:
+  // 1. Task results reported (inlcudeing info messages) here will be saved into znode
+  //    (<pinot cluster name>/PROPERTYSTORE/TaskRebalancer/<Helix job name>), which has a default limit of 1M.
+  //    Since tasks belonging to the same helix job will be saved in the same znode, info messages cannot be too long,
+  //    Otherwise, the znode may be too large, causing communication issue between zookeeper clients and zookeeper,
+  //    which results in instance crash and znode not updatable.
+  // 2. Info messages stored in znode are fetched by minion task APIs (/tasks/{taskType}/debug, /tasks/{taskType}/debug,
+  //    /tasks/task/{taskName}/debug) for debugging purpose, so the info must contain enough info.
+  // 1000 is a reasonable choice, because with this length, the info message will contain relatively rich info for
+  // debugging. At the same time, with znode compressed, the helix job znode can hold ~1000 helix tasks (1M/1000=1000),
+  // which is enough in most use cases.
+  private static final int MAX_TASK_RESULT_INFO_LEN = 1000;
 
   private final Map<String, TaskFactory> _taskFactoryRegistry = new HashMap<>();
 
@@ -94,22 +106,26 @@ public TaskResult run() {
                 PinotTaskConfig pinotTaskConfig = PinotTaskConfig.fromHelixTaskConfig(_taskConfig);
                 tableName = pinotTaskConfig.getTableName();
                 _minionMetrics.addValueToGlobalGauge(MinionGauge.NUMBER_OF_TASKS, 1L);
+                _minionMetrics.addMeteredValue(taskType, MinionMeter.NUMBER_TASKS, 1L);
                 if (tableName != null) {
                   _minionMetrics
                       .addTimedTableValue(tableName, taskType, MinionTimer.TASK_QUEUEING,
                           jobDequeueTimeMs - jobInQueueTimeMs, TimeUnit.MILLISECONDS);
                   _minionMetrics.addValueToTableGauge(tableName, MinionGauge.NUMBER_OF_TASKS, 1L);
+                  _minionMetrics.addMeteredTableValue(tableName, taskType, MinionMeter.NUMBER_TASKS, 1L);
                 }
                 MinionEventObservers.getInstance().addMinionEventObserver(_taskConfig.getId(), _eventObserver);
                 return runInternal(pinotTaskConfig);
               } finally {
                 MinionEventObservers.getInstance().removeMinionEventObserver(_taskConfig.getId());
                 _minionMetrics.addValueToGlobalGauge(MinionGauge.NUMBER_OF_TASKS, -1L);
+                _minionMetrics.addMeteredValue(taskType, MinionMeter.NUMBER_TASKS, -1L);
                 long executionTimeMs = System.currentTimeMillis() - jobDequeueTimeMs;
                 _minionMetrics
                     .addTimedValue(taskType, MinionTimer.TASK_EXECUTION, executionTimeMs, TimeUnit.MILLISECONDS);
                 if (tableName != null) {
                   _minionMetrics.addValueToTableGauge(tableName, MinionGauge.NUMBER_OF_TASKS, -1L);
+                  _minionMetrics.addMeteredTableValue(tableName, taskType, MinionMeter.NUMBER_TASKS, -1L);
                   _minionMetrics
                       .addTimedTableValue(tableName, taskType, MinionTimer.TASK_EXECUTION,
                           executionTimeMs, TimeUnit.MILLISECONDS);
@@ -155,7 +171,7 @@ private TaskResult runInternal(PinotTaskConfig pinotTaskConfig) {
                       MinionMeter.NUMBER_TASKS_CANCELLED, 1L);
                 }
                 LOGGER.info("Task: {} got cancelled", _taskConfig.getId(), e);
-                return new TaskResult(TaskResult.Status.CANCELED, ExceptionUtils.getStackTrace(e));
+                return new TaskResult(TaskResult.Status.CANCELED, extractAndTrimRootCauseMessage(e));
               } catch (FatalException e) {
                 _eventObserver.notifyTaskError(pinotTaskConfig, e);
                 _minionMetrics.addMeteredValue(taskType, MinionMeter.NUMBER_TASKS_FATAL_FAILED, 1L);
@@ -164,7 +180,7 @@ private TaskResult runInternal(PinotTaskConfig pinotTaskConfig) {
                       MinionMeter.NUMBER_TASKS_FATAL_FAILED, 1L);
                 }
                 LOGGER.error("Caught fatal exception while executing task: {}", _taskConfig.getId(), e);
-                return new TaskResult(TaskResult.Status.FATAL_FAILED, ExceptionUtils.getStackTrace(e));
+                return new TaskResult(TaskResult.Status.FATAL_FAILED, extractAndTrimRootCauseMessage(e));
               } catch (Exception e) {
                 _eventObserver.notifyTaskError(pinotTaskConfig, e);
                 _minionMetrics.addMeteredValue(taskType, MinionMeter.NUMBER_TASKS_FAILED, 1L);
@@ -173,7 +189,7 @@ private TaskResult runInternal(PinotTaskConfig pinotTaskConfig) {
                       MinionMeter.NUMBER_TASKS_FAILED, 1L);
                 }
                 LOGGER.error("Caught exception while executing task: {}", _taskConfig.getId(), e);
-                return new TaskResult(TaskResult.Status.FAILED, ExceptionUtils.getStackTrace(e));
+                return new TaskResult(TaskResult.Status.FAILED, extractAndTrimRootCauseMessage(e));
               }
             }
 
@@ -191,6 +207,14 @@ public void cancel() {
     }
   }
 
+  private static String extractAndTrimRootCauseMessage(Throwable th) {
+    String rootCauseMessage = ExceptionUtils.getStackTrace(th);
+    if (rootCauseMessage != null && rootCauseMessage.length() > MAX_TASK_RESULT_INFO_LEN) {
+      return rootCauseMessage.substring(0, MAX_TASK_RESULT_INFO_LEN);
+    }
+    return rootCauseMessage;
+  }
+
   /**
    * Returns the task factory registry.
    */
diff --git a/pinot-minion/src/test/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResourceTest.java b/pinot-minion/src/test/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResourceTest.java
new file mode 100644
index 00000000000..b8e288f906c
--- /dev/null
+++ b/pinot-minion/src/test/java/org/apache/pinot/minion/api/resources/PinotTaskProgressResourceTest.java
@@ -0,0 +1,105 @@
+/**
+ * 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.pinot.minion.api.resources;
+
+import java.io.IOException;
+import java.util.Map;
+import javax.ws.rs.WebApplicationException;
+import org.apache.pinot.minion.event.MinionEventObserver;
+import org.apache.pinot.minion.event.MinionEventObservers;
+import org.apache.pinot.minion.event.MinionProgressObserver;
+import org.apache.pinot.minion.event.MinionTaskState;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+
+public class PinotTaskProgressResourceTest {
+
+  @Test
+  public void testGetGivenSubtaskOrStateProgress()
+      throws IOException {
+    MinionEventObserver observer1 = new MinionProgressObserver();
+    observer1.notifyTaskStart(null);
+    MinionEventObservers.getInstance().addMinionEventObserver("t01", observer1);
+
+    MinionEventObserver observer2 = new MinionProgressObserver();
+    observer2.notifyProgress(null, "");
+    MinionEventObservers.getInstance().addMinionEventObserver("t02", observer2);
+
+    MinionEventObserver observer3 = new MinionProgressObserver();
+    observer3.notifyTaskSuccess(null, "");
+    MinionEventObservers.getInstance().addMinionEventObserver("t03", observer3);
+
+    PinotTaskProgressResource pinotTaskProgressResource = new PinotTaskProgressResource();
+
+    // get all sub task progress
+    String allSubTaskProgress = pinotTaskProgressResource.getSubtaskProgress(null, null);
+    Map<String, Object> subtaskProgressMap = JsonUtils.stringToObject(allSubTaskProgress, Map.class);
+    assertEquals(subtaskProgressMap.size(), 3);
+
+    // get subtasks with given state
+    String subtaskWithInProgressState =
+        pinotTaskProgressResource.getSubtaskProgress(null, MinionTaskState.IN_PROGRESS.toString());
+    assertInProgressSubtasks(subtaskWithInProgressState);
+
+    String subtaskWithUndefinedState =
+        pinotTaskProgressResource.getSubtaskProgress(null, "Undefined");
+    assertInProgressSubtasks(subtaskWithUndefinedState);
+
+    String subtaskWithSucceededState =
+        pinotTaskProgressResource.getSubtaskProgress(null, MinionTaskState.SUCCEEDED.toString());
+    subtaskProgressMap = JsonUtils.stringToObject(subtaskWithSucceededState, Map.class);
+    assertEquals(subtaskProgressMap.size(), 1);
+
+    String subtaskWithUnknownState =
+        pinotTaskProgressResource.getSubtaskProgress(null, MinionTaskState.UNKNOWN.toString());
+    assertNoSubtaskWithTheGivenState(subtaskWithUnknownState);
+
+    String subtaskWithCancelledState =
+        pinotTaskProgressResource.getSubtaskProgress(null, MinionTaskState.CANCELLED.toString());
+    assertNoSubtaskWithTheGivenState(subtaskWithCancelledState);
+
+    String subtaskWithErrorState =
+        pinotTaskProgressResource.getSubtaskProgress(null, MinionTaskState.ERROR.toString());
+    assertNoSubtaskWithTheGivenState(subtaskWithErrorState);
+
+    // get subtasks with given name
+    String subTasksWithGivenNamesProgress = pinotTaskProgressResource.getSubtaskProgress(" t01 , t02 ", null);
+    assertInProgressSubtasks(subTasksWithGivenNamesProgress);
+
+    // get subtasks with given names and state
+    assertThrows(WebApplicationException.class,
+        () -> pinotTaskProgressResource.getSubtaskProgress(" t01 , t02 ", MinionTaskState.IN_PROGRESS.toString()));
+  }
+
+  private void assertInProgressSubtasks(String subtaskWithInProgressState)
+      throws IOException {
+    Map<String, Object> subtaskProgressMap = JsonUtils.stringToObject(subtaskWithInProgressState, Map.class);
+    assertEquals(subtaskProgressMap.size(), 2);
+  }
+
+  private void assertNoSubtaskWithTheGivenState(String subtaskWithTheGivenState)
+      throws IOException {
+    Map<String, Object> subtaskProgressMap = JsonUtils.stringToObject(subtaskWithTheGivenState, Map.class);
+    assertEquals(subtaskProgressMap.size(), 0);
+  }
+}
diff --git a/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionEventObserversTest.java b/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionEventObserversTest.java
index c6dbf3e9cfc..e7395e36180 100644
--- a/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionEventObserversTest.java
+++ b/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionEventObserversTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.minion.event;
 
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.apache.pinot.minion.MinionConf;
@@ -25,6 +26,7 @@
 import org.apache.pinot.util.TestUtils;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
@@ -64,4 +66,25 @@ public void testCleanupWithDelay() {
               "Failed to clean up observer");
     }
   }
+
+  @Test
+  public void testGetMinionEventObserverWithGivenState() {
+    MinionEventObserver observer1 = new MinionProgressObserver();
+    observer1.notifyTaskStart(null);
+    MinionEventObservers.getInstance().addMinionEventObserver("t01", observer1);
+
+    MinionEventObserver observer2 = new MinionProgressObserver();
+    observer2.notifyProgress(null, "");
+    MinionEventObservers.getInstance().addMinionEventObserver("t02", observer2);
+
+    MinionEventObserver observer3 = new MinionProgressObserver();
+    observer3.notifyTaskSuccess(null, "");
+    MinionEventObservers.getInstance().addMinionEventObserver("t03", observer3);
+
+    Map<String, MinionEventObserver> minionEventObserverWithGivenState =
+        MinionEventObservers.getInstance().getMinionEventObserverWithGivenState(MinionTaskState.IN_PROGRESS);
+    assertEquals(minionEventObserverWithGivenState.size(), 2);
+    assertSame(minionEventObserverWithGivenState.get("t01"), observer1);
+    assertSame(minionEventObserverWithGivenState.get("t02"), observer2);
+  }
 }
diff --git a/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionProgressObserverTest.java b/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionProgressObserverTest.java
index 897f19423e0..6ef9104fb43 100644
--- a/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionProgressObserverTest.java
+++ b/pinot-minion/src/test/java/org/apache/pinot/minion/event/MinionProgressObserverTest.java
@@ -49,4 +49,31 @@ public void testNotifyProgressStatus() {
     entry = progress.get(2);
     assertTrue(entry.getStatus().contains("bad bug"), entry.getStatus());
   }
+
+  @Test
+  public void testGetStartTs() {
+    MinionProgressObserver observer = new MinionProgressObserver(3);
+    long ts1 = System.currentTimeMillis();
+    observer.notifyTaskStart(null);
+    long ts = observer.getStartTs();
+    long ts2 = System.currentTimeMillis();
+    assertTrue(ts1 <= ts);
+    assertTrue(ts2 >= ts);
+  }
+
+  @Test
+  public void testUpdateAndGetTaskState() {
+    MinionProgressObserver observer = new MinionProgressObserver(3);
+    assertEquals(observer.getTaskState(), MinionTaskState.UNKNOWN);
+    observer.notifyTaskStart(null);
+    assertEquals(observer.getTaskState(), MinionTaskState.IN_PROGRESS);
+    observer.notifyProgress(null, "");
+    assertEquals(observer.getTaskState(), MinionTaskState.IN_PROGRESS);
+    observer.notifyTaskSuccess(null, "");
+    assertEquals(observer.getTaskState(), MinionTaskState.SUCCEEDED);
+    observer.notifyTaskCancelled(null);
+    assertEquals(observer.getTaskState(), MinionTaskState.CANCELLED);
+    observer.notifyTaskError(null, new Exception());
+    assertEquals(observer.getTaskState(), MinionTaskState.ERROR);
+  }
 }
diff --git a/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkOfflineIndexReader.java b/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkOfflineIndexReader.java
index 232e1e0bd59..7d0962538c6 100644
--- a/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkOfflineIndexReader.java
+++ b/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkOfflineIndexReader.java
@@ -42,11 +42,11 @@
 import org.apache.pinot.segment.local.segment.index.readers.sorted.SortedIndexReaderImpl;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.ReadMode;
@@ -130,29 +130,31 @@ public void setUp()
     // Forward index
     _numDocs = segmentMetadata.getTotalDocs();
     _fixedBitSingleValueReader = new FixedBitSVForwardIndexReader(
-        segmentReader.getIndexFor(SV_UNSORTED_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX), _numDocs,
+        segmentReader.getIndexFor(SV_UNSORTED_COLUMN_NAME, StandardIndexes.forward()), _numDocs,
         segmentMetadata.getColumnMetadataFor(SV_UNSORTED_COLUMN_NAME).getBitsPerElement());
     _sortedForwardIndexReader =
-        new SortedIndexReaderImpl(segmentReader.getIndexFor(SV_SORTED_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX),
+        new SortedIndexReaderImpl(segmentReader.getIndexFor(SV_SORTED_COLUMN_NAME, StandardIndexes.forward()),
             segmentMetadata.getColumnMetadataFor(SV_SORTED_COLUMN_NAME).getCardinality());
     ColumnMetadata mvColumnMetadata = segmentMetadata.getColumnMetadataFor(MV_COLUMN_NAME);
     _fixedBitMultiValueReader =
-        new FixedBitMVForwardIndexReader(segmentReader.getIndexFor(MV_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX),
+        new FixedBitMVForwardIndexReader(segmentReader.getIndexFor(MV_COLUMN_NAME, StandardIndexes.forward()),
             _numDocs, mvColumnMetadata.getTotalNumberOfEntries(), mvColumnMetadata.getBitsPerElement());
     _buffer = new int[mvColumnMetadata.getMaxNumberOfMultiValues()];
 
     // Dictionary
-    _intDictionary = new IntDictionary(segmentReader.getIndexFor(INT_COLUMN_NAME, ColumnIndexType.DICTIONARY),
+    _intDictionary = new IntDictionary(segmentReader.getIndexFor(INT_COLUMN_NAME, StandardIndexes.dictionary()),
         segmentMetadata.getColumnMetadataFor(INT_COLUMN_NAME).getCardinality());
-    _longDictionary = new LongDictionary(segmentReader.getIndexFor(LONG_COLUMN_NAME, ColumnIndexType.DICTIONARY),
+    _longDictionary = new LongDictionary(segmentReader.getIndexFor(LONG_COLUMN_NAME, StandardIndexes.dictionary()),
         segmentMetadata.getColumnMetadataFor(LONG_COLUMN_NAME).getCardinality());
-    _floatDictionary = new FloatDictionary(segmentReader.getIndexFor(FLOAT_COLUMN_NAME, ColumnIndexType.DICTIONARY),
+    _floatDictionary = new FloatDictionary(segmentReader.getIndexFor(FLOAT_COLUMN_NAME, StandardIndexes.dictionary()),
         segmentMetadata.getColumnMetadataFor(FLOAT_COLUMN_NAME).getCardinality());
-    _doubleDictionary = new DoubleDictionary(segmentReader.getIndexFor(DOUBLE_COLUMN_NAME, ColumnIndexType.DICTIONARY),
-        segmentMetadata.getColumnMetadataFor(DOUBLE_COLUMN_NAME).getCardinality());
+    _doubleDictionary =
+        new DoubleDictionary(segmentReader.getIndexFor(DOUBLE_COLUMN_NAME, StandardIndexes.dictionary()),
+            segmentMetadata.getColumnMetadataFor(DOUBLE_COLUMN_NAME).getCardinality());
     ColumnMetadata stringColumnMetadata = segmentMetadata.getColumnMetadataFor(STRING_COLUMN_NAME);
-    _stringDictionary = new StringDictionary(segmentReader.getIndexFor(STRING_COLUMN_NAME, ColumnIndexType.DICTIONARY),
-        stringColumnMetadata.getCardinality(), stringColumnMetadata.getColumnMaxLength());
+    _stringDictionary =
+        new StringDictionary(segmentReader.getIndexFor(STRING_COLUMN_NAME, StandardIndexes.dictionary()),
+            stringColumnMetadata.getCardinality(), stringColumnMetadata.getColumnMaxLength());
   }
 
   @Benchmark
diff --git a/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkPinotDataBuffer.java b/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkPinotDataBuffer.java
index 54319545a06..bc05f64b6d4 100644
--- a/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkPinotDataBuffer.java
+++ b/pinot-perf/src/main/java/org/apache/pinot/perf/BenchmarkPinotDataBuffer.java
@@ -22,113 +22,136 @@
 import java.nio.ByteOrder;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
+import org.apache.pinot.segment.spi.memory.ByteBufferPinotBufferFactory;
+import org.apache.pinot.segment.spi.memory.LArrayPinotBufferFactory;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.memory.SmallWithFallbackPinotBufferFactory;
+import org.apache.pinot.segment.spi.memory.unsafe.UnsafePinotBufferFactory;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 
 @BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Warmup(iterations = 3, time = 3)
-@Measurement(iterations = 5, time = 3)
-@Fork(1)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(value = 1, jvmArgsPrepend = {
+    "--add-opens=java.base/java.nio=ALL-UNNAMED",
+    "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
+})
 @State(Scope.Benchmark)
 public class BenchmarkPinotDataBuffer {
   private static final Random RANDOM = new Random();
-  private static final int NUM_ROUNDS = 1_000_000;
+  private static final int BUFFER_SIZE = 1_000_000;
 
-  @Param({"1", "2", "4", "8", "16", "32", "64", "128", "256", "512", "1024"})
+  @Param({"1", "32", "1024"})
   private int _valueLength;
+  @Param({"bytebuffer", "larray", "unsafe", "wrapper+unsafe"})
+  private String _bufferLibrary;
+  private byte[] _bytes;
+  private PinotDataBuffer _buffer;
+
+  @Setup(Level.Iteration)
+  public void onIterationStart() {
+    _bytes = new byte[_valueLength];
+    RANDOM.nextBytes(_bytes);
+
+    _buffer = PinotDataBuffer.allocateDirect(BUFFER_SIZE, ByteOrder.nativeOrder(), null);
+    int i = 0;
+    while (i < BUFFER_SIZE - 8) {
+      _buffer.putLong(i, RANDOM.nextLong());
+      i += 8;
+    }
+    while (i < BUFFER_SIZE) {
+      _buffer.putByte(i, (byte) (RANDOM.nextInt() & 0xFF));
+      i++;
+    }
+  }
 
-  @Benchmark
-  public int batchRead()
+  @TearDown(Level.Iteration)
+  public void onIterationFinish()
       throws IOException {
-    byte[] value = new byte[_valueLength];
-    RANDOM.nextBytes(value);
-
-    int sum = 0;
-    try (
-        PinotDataBuffer pinotDataBuffer = PinotDataBuffer.allocateDirect(_valueLength, ByteOrder.nativeOrder(), null)) {
-      pinotDataBuffer.readFrom(0, value);
-      byte[] buffer = new byte[_valueLength];
-      for (int i = 0; i < NUM_ROUNDS; i++) {
-        pinotDataBuffer.copyTo(0, buffer);
-        sum += buffer[0];
-      }
-    }
+    _buffer.close();
+  }
 
-    return sum;
+  @Setup
+  public void setupBufferLibrary() {
+
+    switch (_bufferLibrary) {
+      case "bytebuffer":
+        PinotDataBuffer.useFactory(new ByteBufferPinotBufferFactory());
+        break;
+      case "larray":
+        PinotDataBuffer.useFactory(new LArrayPinotBufferFactory());
+        break;
+      case "unsafe":
+        PinotDataBuffer.useFactory(new UnsafePinotBufferFactory());
+        break;
+      case "wrapper+larray":
+        PinotDataBuffer.useFactory(new SmallWithFallbackPinotBufferFactory(
+            new ByteBufferPinotBufferFactory(), new LArrayPinotBufferFactory()));
+        break;
+      case "wrapper+unsafe":
+        PinotDataBuffer.useFactory(new SmallWithFallbackPinotBufferFactory(
+            new ByteBufferPinotBufferFactory(), new UnsafePinotBufferFactory()));
+        break;
+      default:
+        throw new IllegalArgumentException("Unrecognized buffer library \"" + _bufferLibrary + "\"");
+    }
   }
 
   @Benchmark
-  public int nonBatchRead()
+  public void allocate(Blackhole bh)
       throws IOException {
-    byte[] value = new byte[_valueLength];
-    RANDOM.nextBytes(value);
-
-    int sum = 0;
-    try (
-        PinotDataBuffer pinotDataBuffer = PinotDataBuffer.allocateDirect(_valueLength, ByteOrder.nativeOrder(), null)) {
-      pinotDataBuffer.readFrom(0, value);
-      byte[] buffer = new byte[_valueLength];
-      for (int i = 0; i < NUM_ROUNDS; i++) {
-        for (int j = 0; j < _valueLength; j++) {
-          buffer[j] = pinotDataBuffer.getByte(j);
-        }
-        sum += buffer[0];
-      }
+    ByteOrder byteOrder = ByteOrder.nativeOrder();
+    try (PinotDataBuffer pinotDataBuffer = PinotDataBuffer.allocateDirect(_valueLength, byteOrder, null)) {
+      bh.consume(pinotDataBuffer);
     }
+  }
 
-    return sum;
+  @Benchmark
+  public void batchRead() {
+    long index = RANDOM.nextInt(BUFFER_SIZE - _valueLength);
+    _buffer.copyTo(index, _bytes);
   }
 
   @Benchmark
-  public int batchWrite()
-      throws IOException {
-    byte[] value = new byte[_valueLength];
-    RANDOM.nextBytes(value);
-
-    int sum = 0;
-    try (
-        PinotDataBuffer pinotDataBuffer = PinotDataBuffer.allocateDirect(_valueLength, ByteOrder.nativeOrder(), null)) {
-      for (int i = 0; i < NUM_ROUNDS; i++) {
-        pinotDataBuffer.readFrom(0, value);
-        sum += pinotDataBuffer.getByte(0);
-      }
+  public void nonBatchRead() {
+    int index = RANDOM.nextInt(BUFFER_SIZE - _valueLength);
+    for (int j = 0; j < _valueLength; j++) {
+      _bytes[j] = _buffer.getByte(j + index);
     }
+  }
+
+  @Benchmark
+  public void batchWrite() {
+    int index = RANDOM.nextInt(BUFFER_SIZE - _valueLength);
 
-    return sum;
+    _buffer.readFrom(index, _bytes);
   }
 
   @Benchmark
-  public int nonBatchWrite()
-      throws IOException {
-    byte[] value = new byte[_valueLength];
-    RANDOM.nextBytes(value);
-
-    int sum = 0;
-    try (
-        PinotDataBuffer pinotDataBuffer = PinotDataBuffer.allocateDirect(_valueLength, ByteOrder.nativeOrder(), null)) {
-      for (int i = 0; i < NUM_ROUNDS; i++) {
-        for (int j = 0; j < _valueLength; j++) {
-          pinotDataBuffer.putByte(j, value[j]);
-        }
-        sum += pinotDataBuffer.getByte(0);
-      }
-    }
+  public void nonBatchWrite() {
+    int index = RANDOM.nextInt(BUFFER_SIZE - _valueLength);
 
-    return sum;
+    for (int j = 0; j < _valueLength; j++) {
+      _buffer.putByte(j + index, _bytes[j]);
+    }
   }
 
   public static void main(String[] args)
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/BaseSegmentPushJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/BaseSegmentPushJobRunner.java
index e855e2ba392..821e42d2568 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/BaseSegmentPushJobRunner.java
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/BaseSegmentPushJobRunner.java
@@ -65,12 +65,11 @@ public void init(SegmentGenerationJobSpec spec) {
     }
 
     // Read Table config
-    if (_spec.getTableSpec().getTableConfigURI() == null) {
-      throw new RuntimeException("Missing property 'tableConfigURI' in 'tableSpec'");
+    if (_spec.getTableSpec().getTableConfigURI() != null) {
+      _tableConfig =
+          SegmentGenerationUtils.getTableConfig(_spec.getTableSpec().getTableConfigURI(), spec.getAuthToken());
+      _consistentPushEnabled = ConsistentDataPushUtils.consistentDataPushEnabled(_tableConfig);
     }
-
-    _tableConfig = SegmentGenerationUtils.getTableConfig(_spec.getTableSpec().getTableConfigURI(), spec.getAuthToken());
-    _consistentPushEnabled = ConsistentDataPushUtils.consistentDataPushEnabled(_tableConfig);
   }
 
   /**
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/src/main/java/org/apache/pinot/plugin/ingestion/batch/hadoop/HadoopSegmentGenerationJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/src/main/java/org/apache/pinot/plugin/ingestion/batch/hadoop/HadoopSegmentGenerationJobRunner.java
index 0ea86376ec9..df9883622d7 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/src/main/java/org/apache/pinot/plugin/ingestion/batch/hadoop/HadoopSegmentGenerationJobRunner.java
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/src/main/java/org/apache/pinot/plugin/ingestion/batch/hadoop/HadoopSegmentGenerationJobRunner.java
@@ -257,7 +257,7 @@ public void run()
       }
 
       _spec.setOutputDirURI(stagingSegmentTarUri.toUri().toString());
-      jobConf.set(SEGMENT_GENERATION_JOB_SPEC, new Yaml().dump(_spec));
+      jobConf.set(SEGMENT_GENERATION_JOB_SPEC, new Yaml().dumpAsMap(_spec));
       _spec.setOutputDirURI(outputDirURI.toString());
 
       job.setMapperClass(getMapperClass());
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
index 13a5fa2cb4b..485d76e0fc3 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
@@ -37,7 +37,7 @@
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
     <scala.major.version>2.11</scala.major.version>
-    <spark.version>2.4.0</spark.version>
+    <spark.version>2.4.6</spark.version>
     <scala.minor.version>2.11.11</scala.minor.version>
   </properties>
 
@@ -93,10 +93,6 @@
           <groupId>jakarta.ws.rs</groupId>
           <artifactId>jakarta.ws.rs-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentTarPushJobRunner.java b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentTarPushJobRunner.java
index fa549d100b1..7bec7635ede 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentTarPushJobRunner.java
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/src/main/java/org/apache/pinot/plugin/ingestion/batch/standalone/SegmentTarPushJobRunner.java
@@ -20,7 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.Map;
+import org.apache.pinot.common.segment.generation.SegmentGenerationUtils;
 import org.apache.pinot.plugin.ingestion.batch.common.BaseSegmentPushJobRunner;
+import org.apache.pinot.segment.local.utils.ConsistentDataPushUtils;
 import org.apache.pinot.segment.local.utils.SegmentPushUtils;
 import org.apache.pinot.spi.ingestion.batch.spec.SegmentGenerationJobSpec;
 import org.apache.pinot.spi.utils.retry.AttemptsExceededException;
@@ -35,6 +37,28 @@ public SegmentTarPushJobRunner(SegmentGenerationJobSpec spec) {
     init(spec);
   }
 
+  /**
+   * Initialize SegmentTarPushJobRunner with SegmentGenerationJobSpec
+   * Checks for required parameters in the spec and enablement of consistent data push.
+   * This overrides the init method in BaseSegmentPushJobRunner as the push job spec is required in the base class.
+   */
+  @Override
+  public void init(SegmentGenerationJobSpec spec) {
+    _spec = spec;
+
+    // Read Table spec
+    if (_spec.getTableSpec() == null) {
+      throw new RuntimeException("Missing tableSpec");
+    }
+
+    // Read Table config
+    if (_spec.getTableSpec().getTableConfigURI() != null) {
+      _tableConfig =
+          SegmentGenerationUtils.getTableConfig(_spec.getTableSpec().getTableConfigURI(), spec.getAuthToken());
+      _consistentPushEnabled = ConsistentDataPushUtils.consistentDataPushEnabled(_tableConfig);
+    }
+  }
+
   public void uploadSegments(Map<String, String> segmentsUriToTarPathMap)
       throws AttemptsExceededException, RetriableOperationException {
     SegmentPushUtils.pushSegments(_spec, _outputDirFS, new ArrayList<>(segmentsUriToTarPathMap.values()));
diff --git a/pinot-plugins/pinot-batch-ingestion/pom.xml b/pinot-plugins/pinot-batch-ingestion/pom.xml
index f7ed3b1f2ff..a2f78f5e4c6 100644
--- a/pinot-plugins/pinot-batch-ingestion/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pom.xml
@@ -45,7 +45,6 @@
 
     <module>pinot-batch-ingestion-hadoop</module>
     <module>pinot-batch-ingestion-standalone</module>
-    <module>v0_deprecated</module>
   </modules>
 
   <dependencies>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/README.md b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/README.md
deleted file mode 100644
index ebe9d169f2f..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-# Pinot Hadoop
-
-Pinot supports data segment generation from Hadoop.
-
-Please refer to this [Creating Pinot segments using Hadoop](https://pinot.readthedocs.io/en/latest/pinot_hadoop.html#creating-segments-using-hadoop) document for more details.
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml
deleted file mode 100644
index be9de1f7f8a..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>v0_deprecated</artifactId>
-    <groupId>org.apache.pinot</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>pinot-hadoop</artifactId>
-  <name>Pinot Hadoop</name>
-  <url>https://pinot.apache.org/</url>
-  <properties>
-    <pinot.root>${basedir}/../../../..</pinot.root>
-    <phase.prop>package</phase.prop>
-  </properties>
-  <profiles>
-    <profile>
-      <id>build-shaded-jar</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <!--
-                  Usually in hadoop environment, there are multiple jars with different versions.
-                  Most of the NoSuchMethodExceptions are caused by class loading conflicts.
-                  Class relocation ensures the reference of certain packages/classes in Pinot code to
-                  shaded libs, e.g. jackson or guava.
-                  Ref: https://maven.apache.org/plugins/maven-shade-plugin/examples/class-relocation.html
-                  -->
-                  <relocations>
-                    <relocation>
-                      <pattern>com.google.common.base</pattern>
-                      <shadedPattern>${shade.prefix}.com.google.common.base</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.common.cache</pattern>
-                      <shadedPattern>${shade.prefix}.com.google.common.cache</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.fasterxml.jackson</pattern>
-                      <shadedPattern>${shade.prefix}.com.fasterxml.jackson</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>org.apache.http</pattern>
-                      <shadedPattern>${shade.prefix}.org.apache.http</shadedPattern>
-                    </relocation>
-                  </relocations>
-                  <transformers>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                      <mainClass>org.apache.pinot.hadoop.PinotHadoopJobLauncher</mainClass>
-                    </transformer>
-                  </transformers>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-ingestion-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-common</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-parquet</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-orc</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-hdfs</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-thrift</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-csv</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-json</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-protobuf</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.protobuf</groupId>
-          <artifactId>protobuf-java</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP-java7</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math3</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avro</groupId>
-      <artifactId>avro-mapred</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.orc</groupId>
-      <artifactId>orc-mapreduce</artifactId>
-    </dependency>
-
-    <!--Test-->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <forceCreation>true</forceCreation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java
deleted file mode 100644
index e45e67c157c..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/PinotHadoopJobLauncher.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop;
-
-import java.io.FileInputStream;
-import java.util.Arrays;
-import java.util.Properties;
-import org.apache.pinot.hadoop.job.HadoopSegmentCreationJob;
-import org.apache.pinot.hadoop.job.HadoopSegmentPreprocessingJob;
-import org.apache.pinot.ingestion.common.PinotIngestionJobType;
-import org.apache.pinot.ingestion.jobs.SegmentTarPushJob;
-import org.apache.pinot.ingestion.jobs.SegmentUriPushJob;
-
-
-public class PinotHadoopJobLauncher {
-  private PinotHadoopJobLauncher() {
-  }
-
-  private static final String USAGE = "usage: [job_type] [job.properties]";
-  private static final String SUPPORT_JOB_TYPES =
-      "\tsupport job types: " + Arrays.toString(PinotIngestionJobType.values());
-
-  private static void usage() {
-    System.err.println(USAGE);
-    System.err.println(SUPPORT_JOB_TYPES);
-  }
-
-  private static void kickOffPinotHadoopJob(PinotIngestionJobType jobType, Properties jobConf)
-      throws Exception {
-    switch (jobType) {
-      case SegmentCreation:
-        new HadoopSegmentCreationJob(jobConf).run();
-        break;
-      case SegmentTarPush:
-        new SegmentTarPushJob(jobConf).run();
-        break;
-      case SegmentUriPush:
-        new SegmentUriPushJob(jobConf).run();
-        break;
-      case SegmentCreationAndTarPush:
-        new HadoopSegmentCreationJob(jobConf).run();
-        new SegmentTarPushJob(jobConf).run();
-        break;
-      case SegmentCreationAndUriPush:
-        new HadoopSegmentCreationJob(jobConf).run();
-        new SegmentUriPushJob(jobConf).run();
-        break;
-      case SegmentPreprocessing:
-        new HadoopSegmentPreprocessingJob(jobConf).run();
-        break;
-      default:
-        throw new RuntimeException("Not a valid jobType - " + jobType);
-    }
-  }
-
-  public static void main(String[] args)
-      throws Exception {
-    if (args.length != 2) {
-      usage();
-      System.exit(1);
-    }
-    PinotIngestionJobType jobType = null;
-    Properties jobConf = null;
-    try {
-      jobType = PinotIngestionJobType.valueOf(args[0]);
-      jobConf = new Properties();
-      jobConf.load(new FileInputStream(args[1]));
-    } catch (Exception e) {
-      usage();
-      System.exit(1);
-    }
-    kickOffPinotHadoopJob(jobType, jobConf);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java
deleted file mode 100644
index a36f8dbfc77..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/CombineAvroKeyInputFormat.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import java.io.IOException;
-import org.apache.avro.mapred.AvroKey;
-import org.apache.avro.mapreduce.AvroKeyInputFormat;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.InputSplit;
-import org.apache.hadoop.mapreduce.RecordReader;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.input.CombineFileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.CombineFileRecordReader;
-import org.apache.hadoop.mapreduce.lib.input.CombineFileRecordReaderWrapper;
-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
-
-
-/**
- * Create Hadoop splits across files.
- * By default, hadoop cannot create splits across files. As a result, if the input has lots of small avro files,
- * the job will end up having lots of short running mappers, which is inefficient.
- * This class allows creating splits across avro files so we can have larger splits and fewer long running mappers,
- * which improves the performance of the Hadoop job.
- */
-public class CombineAvroKeyInputFormat<T> extends CombineFileInputFormat<AvroKey<T>, NullWritable> {
-  @Override
-  public RecordReader<AvroKey<T>, NullWritable> createRecordReader(InputSplit split, TaskAttemptContext context)
-      throws IOException {
-    Class cls = AvroKeyRecordReaderWrapper.class;
-
-    return new CombineFileRecordReader<>((CombineFileSplit) split, context,
-        (Class<? extends RecordReader<AvroKey<T>, NullWritable>>) cls);
-  }
-
-  public static class AvroKeyRecordReaderWrapper<T> extends CombineFileRecordReaderWrapper<AvroKey<T>, NullWritable> {
-    public AvroKeyRecordReaderWrapper(CombineFileSplit split, TaskAttemptContext context, Integer index)
-        throws IOException, InterruptedException {
-      super(new AvroKeyInputFormat<>(), split, context, index);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java
deleted file mode 100644
index c5e55b81503..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/FileHandler.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-
-public class FileHandler {
-
-  private MeteredStream _meter;
-  private final File _logFile;
-  private String _baseDir;
-  private final String _fileName;
-  private int _fileCount = 0;
-  private final String _extension;
-  private final Long _maxSize;
-
-  public FileHandler(String baseDir, String fileName, String extension, long maxSize) {
-    _baseDir = baseDir;
-    createBaseDir(baseDir);
-    _fileName = fileName;
-    _extension = extension;
-    _logFile = newLogFile();
-    _maxSize = maxSize;
-  }
-
-  /**
-   * A metered stream is a subclass of OutputStream that <ul> <li>forwards all its output to a
-   * target stream</li> <li>keeps track of how many bytes have been written copied from {@link
-   * java.util.logging.FileHandler}</li> </ul>
-   */
-  private static class MeteredStream extends OutputStream {
-    final OutputStream _out;
-    long _written;
-
-    MeteredStream(OutputStream out, long written) {
-      _out = out;
-      _written = written;
-    }
-
-    @Override
-    public void write(int b)
-        throws IOException {
-      _out.write(b);
-      _written++;
-    }
-
-    @Override
-    public void write(byte[] buff)
-        throws IOException {
-      _out.write(buff);
-      _written += buff.length;
-    }
-
-    @Override
-    public void write(byte[] buff, int off, int len)
-        throws IOException {
-      _out.write(buff, off, len);
-      _written += len;
-    }
-
-    @Override
-    public void flush()
-        throws IOException {
-      _out.flush();
-    }
-
-    @Override
-    public void close()
-        throws IOException {
-      _out.close();
-    }
-
-    public long getSize() {
-      return _written;
-    }
-  }
-
-  public void open(boolean append)
-      throws IOException {
-    long len = 0;
-    if (append) {
-      len = _logFile.length();
-    }
-    FileOutputStream fout = new FileOutputStream(_logFile.toString(), append);
-    BufferedOutputStream bout = new BufferedOutputStream(fout);
-    _meter = new MeteredStream(bout, len);
-  }
-
-  public void write(byte[] b)
-      throws IOException {
-    if (getSize() >= _maxSize) {
-      rotate();
-    }
-    _meter.write(b);
-  }
-
-  public void close()
-      throws IOException {
-    rotate(false);
-  }
-
-  public void rotate()
-      throws IOException {
-    rotate(true);
-  }
-
-  public long getSize() {
-    return _meter.getSize();
-  }
-
-  /**
-   * Rotate the set of output files
-   */
-  private synchronized void rotate(boolean isNew)
-      throws IOException {
-    _meter.flush();
-    _meter.close();
-    File rotateFile = newRotateFile();
-    if (_logFile.exists()) {
-      if (rotateFile.exists()) {
-        rotateFile.delete();
-      }
-      _logFile.renameTo(rotateFile);
-    }
-    if (isNew) {
-      open(true);
-    }
-    _fileCount++;
-  }
-
-  private File newRotateFile() {
-    return initFile(String.format("%s/%s_%s.%s", _baseDir, _fileName, _fileCount, _extension));
-  }
-
-  private File newLogFile() {
-    return initFile(String.format("%s/%s.%s", _baseDir, _fileName, _extension));
-  }
-
-  private File initFile(String file) {
-    File f = new File(file);
-    if (f.exists()) {
-      f.delete();
-    }
-    return f;
-  }
-
-  private void createBaseDir(String baseDir) {
-    File f = new File(baseDir);
-    f.mkdirs();
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonBasedFieldExtractor.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonBasedFieldExtractor.java
deleted file mode 100644
index a204cc994e3..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/JsonBasedFieldExtractor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.pinot.common.utils.HashUtil;
-import org.apache.pinot.spi.utils.JsonUtils;
-
-
-/**
- * Json-based FieldExtractor converts record into {@link JsonNode} and extracts fields from it.
- */
-public class JsonBasedFieldExtractor implements FieldExtractor<Object> {
-  private Set<String> _fields;
-  private Map<String, Object> _reuse = new HashMap<>();
-
-  @Override
-  public void init(Configuration conf, Set<String> fields) {
-    _fields = fields;
-    _reuse = new HashMap<>(HashUtil.getHashMapCapacity(fields.size()));
-  }
-
-  @Override
-  public Map<String, Object> extractFields(Object record) {
-    _reuse.clear();
-    JsonNode jsonNode = JsonUtils.objectToJsonNode(record);
-    for (String field : _fields) {
-      _reuse.put(field, jsonNode.get(field));
-    }
-    return _reuse;
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java
deleted file mode 100644
index 91da8b1d0b6..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotOutputFormat.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import java.io.IOException;
-import java.util.Set;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.JobContext;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.apache.pinot.segment.local.utils.IngestionUtils;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.FileFormat;
-import org.apache.pinot.spi.utils.JsonUtils;
-
-
-/**
- * Generic Pinot Output Format implementation.
- */
-public class PinotOutputFormat<T> extends FileOutputFormat<NullWritable, T> {
-
-  // Temp directory to create segment
-  public static final String TEMP_SEGMENT_DIR = "pinot.temp.segment.dir";
-
-  // Serialized table config
-  public static final String TABLE_CONFIG = "pinot.table.config";
-
-  // Serialized schema
-  public static final String SCHEMA = "pinot.schema";
-
-  // Class for the field extractor
-  public static final String FIELD_EXTRACTOR_CLASS = "pinot.field.extractor.class";
-
-  public static void setTempSegmentDir(Job job, String segmentDir) {
-    job.getConfiguration().set(PinotOutputFormat.TEMP_SEGMENT_DIR, segmentDir);
-  }
-
-  public static String getTempSegmentDir(JobContext job) {
-    return job.getConfiguration().get(PinotOutputFormat.TEMP_SEGMENT_DIR);
-  }
-
-  public static void setTableConfig(Job job, TableConfig tableConfig) {
-    job.getConfiguration().set(PinotOutputFormat.TABLE_CONFIG, tableConfig.toJsonString());
-  }
-
-  public static TableConfig getTableConfig(JobContext job)
-      throws IOException {
-    return JsonUtils.stringToObject(job.getConfiguration().get(PinotOutputFormat.TABLE_CONFIG), TableConfig.class);
-  }
-
-  public static void setSchema(Job job, Schema schema) {
-    job.getConfiguration().set(PinotOutputFormat.SCHEMA, schema.toSingleLineJsonString());
-  }
-
-  public static Schema getSchema(JobContext job)
-      throws IOException {
-    return JsonUtils.stringToObject(job.getConfiguration().get(PinotOutputFormat.SCHEMA), Schema.class);
-  }
-
-  public static SegmentGeneratorConfig getSegmentGeneratorConfig(JobContext job)
-      throws IOException {
-    TableConfig tableConfig = getTableConfig(job);
-    Schema schema = getSchema(job);
-    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(tableConfig, schema);
-    segmentGeneratorConfig.setOutDir(getTempSegmentDir(job) + "/segmentDir");
-    segmentGeneratorConfig.setTableName(tableConfig.getTableName());
-    segmentGeneratorConfig.setFormat(FileFormat.JSON);
-    return segmentGeneratorConfig;
-  }
-
-  public static void setFieldExtractorClass(Job job, Class<? extends FieldExtractor> fieldExtractorClass) {
-    job.getConfiguration().set(PinotOutputFormat.FIELD_EXTRACTOR_CLASS, fieldExtractorClass.getName());
-  }
-
-  public static <T> FieldExtractor<T> getFieldExtractor(JobContext job) {
-    Configuration conf = job.getConfiguration();
-    try {
-      //noinspection unchecked
-      return (FieldExtractor<T>) conf.getClassByName(conf.get(PinotOutputFormat.FIELD_EXTRACTOR_CLASS)).newInstance();
-    } catch (Exception e) {
-      throw new IllegalStateException(
-          "Caught exception while creating instance of field extractor configured with key: " + FIELD_EXTRACTOR_CLASS);
-    }
-  }
-
-  public static <T> PinotRecordWriter<T> getPinotRecordWriter(TaskAttemptContext job)
-      throws IOException {
-    SegmentGeneratorConfig segmentGeneratorConfig = getSegmentGeneratorConfig(job);
-    FieldExtractor<T> fieldExtractor = getFieldExtractor(job);
-    Set<String> fieldsToRead = IngestionUtils
-        .getFieldsForRecordExtractor(segmentGeneratorConfig.getTableConfig().getIngestionConfig(),
-            segmentGeneratorConfig.getSchema());
-    fieldExtractor.init(job.getConfiguration(), fieldsToRead);
-    return new PinotRecordWriter<>(job, segmentGeneratorConfig, fieldExtractor);
-  }
-
-  @Override
-  public PinotRecordWriter<T> getRecordWriter(TaskAttemptContext job)
-      throws IOException {
-    return getPinotRecordWriter(job);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java
deleted file mode 100644
index 3c145acac61..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/io/PinotRecordWriter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.RecordWriter;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.apache.pinot.common.utils.TarGzCompressionUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
-import org.apache.pinot.spi.utils.JsonUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Basic Single Threaded {@link RecordWriter}
- */
-public class PinotRecordWriter<T> extends RecordWriter<NullWritable, T> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(PinotRecordWriter.class);
-  private static final long MAX_FILE_SIZE = 64 * 1000000L;
-
-  private final SegmentGeneratorConfig _segmentGeneratorConfig;
-  private final FieldExtractor<T> _fieldExtractor;
-  private final File _tempSegmentDir;
-  private final File _dataFileDir;
-  private final File _segmentTarDir;
-  private final FileHandler _handler;
-  private final FileSystem _fileSystem;
-  private final Path _outputDir;
-
-  public PinotRecordWriter(TaskAttemptContext job, SegmentGeneratorConfig segmentGeneratorConfig,
-      FieldExtractor<T> fieldExtractor)
-      throws IOException {
-    _segmentGeneratorConfig = segmentGeneratorConfig;
-    _fieldExtractor = fieldExtractor;
-
-    _tempSegmentDir = new File(PinotOutputFormat.getTempSegmentDir(job));
-    if (_tempSegmentDir.exists()) {
-      FileUtils.cleanDirectory(_tempSegmentDir);
-    }
-    _dataFileDir = new File(_tempSegmentDir, "dataFile");
-    FileUtils.forceMkdir(_dataFileDir);
-    _segmentTarDir = new File(_tempSegmentDir, "segmentTar");
-    FileUtils.forceMkdir(_segmentTarDir);
-
-    _handler = new FileHandler(_dataFileDir.getPath(), "data", ".json", MAX_FILE_SIZE);
-    _handler.open(true);
-
-    _fileSystem = FileSystem.get(job.getConfiguration());
-    _outputDir = FileOutputFormat.getOutputPath(job);
-  }
-
-  @Override
-  public void write(NullWritable key, T value)
-      throws IOException {
-    _handler.write(JsonUtils.objectToBytes(_fieldExtractor.extractFields(value)));
-  }
-
-  @Override
-  public void close(TaskAttemptContext context)
-      throws IOException {
-    _handler.close();
-
-    File[] dataFiles = _dataFileDir.listFiles();
-    assert dataFiles != null;
-    int numDataFiles = dataFiles.length;
-    for (int i = 0; i < numDataFiles; i++) {
-      createSegment(dataFiles[i], i);
-    }
-
-    FileUtils.deleteDirectory(_tempSegmentDir);
-  }
-
-  private void createSegment(File dataFile, int sequenceId)
-      throws IOException {
-    LOGGER.info("Creating segment from data file: {} of sequence id: {}", dataFile, sequenceId);
-    _segmentGeneratorConfig.setInputFilePath(dataFile.getPath());
-    _segmentGeneratorConfig.setSequenceId(sequenceId);
-    SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
-    try {
-      driver.init(_segmentGeneratorConfig);
-      driver.build();
-    } catch (Exception e) {
-      throw new IllegalStateException("Caught exception while creating segment from data file: " + dataFile);
-    }
-    String segmentName = driver.getSegmentName();
-    File indexDir = driver.getOutputDirectory();
-    LOGGER.info("Created segment: {} from data file: {} into directory: {}", segmentName, dataFile, indexDir);
-
-    File segmentTarFile = new File(_segmentTarDir, segmentName + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION);
-    LOGGER.info("Tarring segment: {} from directory: {} to: {}", segmentName, indexDir, segmentTarFile);
-    TarGzCompressionUtils.createTarGzFile(indexDir, segmentTarFile);
-
-    Path hdfsSegmentTarPath = new Path(_outputDir, segmentTarFile.getName());
-    LOGGER.info("Copying segment tar file from local: {} to HDFS: {}", segmentTarFile, hdfsSegmentTarPath);
-    _fileSystem.copyFromLocalFile(true, new Path(segmentTarFile.getPath()), hdfsSegmentTarPath);
-
-    LOGGER
-        .info("Finish creating segment: {} from data file: {} of sequence id: {} into HDFS: {}", segmentName, dataFile,
-            sequenceId, hdfsSegmentTarPath);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java
deleted file mode 100644
index f8123cad10a..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentCreationJob.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job;
-
-import com.google.common.base.Preconditions;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.JobContext;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
-import org.apache.pinot.hadoop.job.mappers.SegmentCreationMapper;
-import org.apache.pinot.hadoop.utils.PinotHadoopJobPreparationHelper;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentCreationJob;
-import org.apache.pinot.ingestion.utils.JobPreparationHelper;
-import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.utils.IngestionConfigUtils;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-
-public class HadoopSegmentCreationJob extends SegmentCreationJob {
-  // Output Directory FileSystem
-  protected FileSystem _outputDirFileSystem;
-
-  public HadoopSegmentCreationJob(Properties properties) {
-    super(properties);
-    getConf().set("mapreduce.job.user.classpath.first", "true");
-  }
-
-  public void run()
-      throws Exception {
-    _logger.info("Starting {}", getClass().getSimpleName());
-
-    // Initialize all directories
-    _outputDirFileSystem = FileSystem.get(new Path(_outputDir).toUri(), getConf());
-    JobPreparationHelper.mkdirs(_outputDirFileSystem, new Path(_outputDir), _defaultPermissionsMask);
-    JobPreparationHelper.mkdirs(_outputDirFileSystem, new Path(_stagingDir), _defaultPermissionsMask);
-    Path stagingInputDir = new Path(_stagingDir, "input");
-    JobPreparationHelper.mkdirs(_outputDirFileSystem, stagingInputDir, _defaultPermissionsMask);
-
-    // Gather all data files
-    List<Path> dataFilePaths = getDataFilePaths(_inputPattern);
-    int numDataFiles = dataFilePaths.size();
-    if (numDataFiles == 0) {
-      String errorMessage = "No data file founded with pattern: " + _inputPattern;
-      _logger.error(errorMessage);
-      throw new RuntimeException(errorMessage);
-    } else {
-      _logger.info("Creating segments with data files: {}", dataFilePaths);
-      for (int i = 0; i < numDataFiles; i++) {
-        Path dataFilePath = dataFilePaths.get(i);
-        try (DataOutputStream dataOutputStream = _outputDirFileSystem
-            .create(new Path(stagingInputDir, Integer.toString(i)))) {
-          dataOutputStream.write((dataFilePath.toString() + " " + i).getBytes(UTF_8));
-          dataOutputStream.flush();
-        }
-      }
-    }
-
-    // Set up the job
-    Job job = Job.getInstance(getConf());
-    job.setJarByClass(getClass());
-    job.setJobName(getClass().getName());
-
-    Configuration jobConf = job.getConfiguration();
-    String hadoopTokenFileLocation = System.getenv("HADOOP_TOKEN_FILE_LOCATION");
-    if (hadoopTokenFileLocation != null) {
-      jobConf.set("mapreduce.job.credentials.binary", hadoopTokenFileLocation);
-    }
-    jobConf.setInt(JobContext.NUM_MAPS, numDataFiles);
-
-    // Set table config and schema
-    TableConfig tableConfig = getTableConfig();
-    if (tableConfig != null) {
-      validateTableConfig(tableConfig);
-      jobConf.set(JobConfigConstants.TABLE_CONFIG, tableConfig.toJsonString());
-    }
-    jobConf.set(JobConfigConstants.SCHEMA, getSchema().toSingleLineJsonString());
-
-    // Set additional configurations
-    for (Map.Entry<Object, Object> entry : _properties.entrySet()) {
-      jobConf.set(entry.getKey().toString(), entry.getValue().toString());
-    }
-
-    job.setMapperClass(getMapperClass());
-    job.setNumReduceTasks(0);
-
-    job.setInputFormatClass(TextInputFormat.class);
-    job.setOutputFormatClass(TextOutputFormat.class);
-
-    job.setMapOutputKeyClass(LongWritable.class);
-    job.setMapOutputValueClass(Text.class);
-
-    FileInputFormat.addInputPath(job, stagingInputDir);
-    FileOutputFormat.setOutputPath(job, new Path(_stagingDir, "output"));
-
-    addDepsJarToDistributedCache(job);
-    addAdditionalJobProperties(job);
-
-    // Submit the job
-    job.waitForCompletion(true);
-    if (!job.isSuccessful()) {
-      throw new RuntimeException("Job failed: " + job);
-    }
-
-    moveSegmentsToOutputDir(numDataFiles);
-
-    cleanup(job);
-  }
-
-  protected void validateTableConfig(TableConfig tableConfig) {
-    SegmentsValidationAndRetentionConfig validationConfig = tableConfig.getValidationConfig();
-
-    // For APPEND use case, timeColumnName and timeType must be set
-    if (APPEND.equalsIgnoreCase(IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig))) {
-      Preconditions.checkState(validationConfig.getTimeColumnName() != null && validationConfig.getTimeType() != null,
-          "For APPEND use case, time column and type must be set");
-    }
-  }
-
-  /**
-   * Can be overridden to plug in custom mapper.
-   */
-  protected Class<? extends Mapper<LongWritable, Text, LongWritable, Text>> getMapperClass() {
-    return SegmentCreationMapper.class;
-  }
-
-  protected void addDepsJarToDistributedCache(Job job)
-      throws IOException {
-    if (_depsJarDir != null) {
-      PinotHadoopJobPreparationHelper
-          .addDepsJarToDistributedCacheHelper(FileSystem.get(new Path(_depsJarDir).toUri(), getConf()), job,
-              new Path(_depsJarDir));
-    }
-  }
-
-  /**
-   * Can be overridden to set additional job properties.
-   */
-  @SuppressWarnings("unused")
-  protected void addAdditionalJobProperties(Job job) {
-  }
-
-  protected void moveSegmentsToOutputDir(int numberOfDataFiles)
-      throws IOException {
-    Path segmentTarDir = new Path(new Path(_stagingDir, "output"), JobConfigConstants.SEGMENT_TAR_DIR);
-
-    // Validate whether the number of input files match with the number of output files,
-    // as there is 1:1 mapping between the input and output files.
-    int numberOfOutputFiles = _outputDirFileSystem.listStatus(segmentTarDir).length;
-    if (numberOfDataFiles != numberOfOutputFiles) {
-      throw new RuntimeException(
-          String.format("The number of input files doesn't match with the number of output files."
-              + " Number of input files: %d. Number of output files: %d", numberOfDataFiles, numberOfOutputFiles));
-    }
-    movePath(_outputDirFileSystem, segmentTarDir.toString(), _outputDir, true);
-  }
-
-  /**
-   * Cleans up after the job completes.
-   */
-  protected void cleanup(Job job)
-      throws Exception {
-    // Delete the staging directory
-    _logger.info("Deleting the staging directory: {}", _stagingDir);
-    _outputDirFileSystem.delete(new Path(_stagingDir), true);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java
deleted file mode 100644
index a6363142af7..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/HadoopSegmentPreprocessingJob.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.pinot.hadoop.job.preprocess.DataPreprocessingHelper;
-import org.apache.pinot.hadoop.job.preprocess.DataPreprocessingHelperFactory;
-import org.apache.pinot.hadoop.utils.PinotHadoopJobPreparationHelper;
-import org.apache.pinot.hadoop.utils.preprocess.DataPreprocessingUtils;
-import org.apache.pinot.hadoop.utils.preprocess.HadoopUtils;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentPreprocessingJob;
-import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
-import org.apache.pinot.spi.config.table.FieldConfig;
-import org.apache.pinot.spi.config.table.IndexingConfig;
-import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableCustomConfig;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * A Hadoop job which provides partitioning, sorting, and resizing against the input files, which is raw data in
- * either Avro or Orc format.
- * Thus, the output files are partitioned, sorted, resized after this job.
- * In order to run this job, the following configs need to be specified in job properties:
- * * enable.preprocessing: false by default. Enables preprocessing job.
- */
-public class HadoopSegmentPreprocessingJob extends SegmentPreprocessingJob {
-  private static final Logger LOGGER = LoggerFactory.getLogger(HadoopSegmentPreprocessingJob.class);
-
-  private String _partitionColumn;
-  private int _numPartitions;
-  private String _partitionFunction;
-  private String _partitionColumnDefaultNullValue;
-
-  private String _sortingColumn;
-  private FieldSpec.DataType _sortingColumnType;
-  private String _sortingColumnDefaultNullValue;
-
-  private int _numOutputFiles;
-  private int _maxNumRecordsPerFile;
-
-  private TableConfig _tableConfig;
-  private org.apache.pinot.spi.data.Schema _pinotTableSchema;
-
-  private Set<DataPreprocessingUtils.Operation> _preprocessingOperations;
-
-  public HadoopSegmentPreprocessingJob(final Properties properties) {
-    super(properties);
-  }
-
-  public void run()
-      throws Exception {
-    if (!_enablePreprocessing) {
-      LOGGER.info("Pre-processing job is disabled.");
-      return;
-    } else {
-      LOGGER.info("Starting {}", getClass().getSimpleName());
-    }
-
-    setTableConfigAndSchema();
-    fetchPreProcessingOperations();
-    fetchPartitioningConfig();
-    fetchSortingConfig();
-    fetchResizingConfig();
-
-    // Cleans up preprocessed output dir if exists
-    cleanUpPreprocessedOutputs(_preprocessedOutputDir);
-
-    DataPreprocessingHelper dataPreprocessingHelper =
-        DataPreprocessingHelperFactory.generateDataPreprocessingHelper(_inputSegmentDir, _preprocessedOutputDir);
-    dataPreprocessingHelper
-        .registerConfigs(_tableConfig, _pinotTableSchema, _partitionColumn, _numPartitions, _partitionFunction,
-            _partitionColumnDefaultNullValue, _sortingColumn, _sortingColumnType, _sortingColumnDefaultNullValue,
-            _numOutputFiles, _maxNumRecordsPerFile);
-
-    Job job = dataPreprocessingHelper.setUpJob();
-
-    // Since we aren't extending AbstractHadoopJob, we need to add the jars for the job to
-    // distributed cache ourselves. Take a look at how the addFilesToDistributedCache is
-    // implemented so that you know what it does.
-    LOGGER.info("HDFS class path: " + _pathToDependencyJar);
-    if (_pathToDependencyJar != null) {
-      LOGGER.info("Copying jars locally.");
-      PinotHadoopJobPreparationHelper
-          .addDepsJarToDistributedCacheHelper(HadoopUtils.DEFAULT_FILE_SYSTEM, job, _pathToDependencyJar);
-    } else {
-      LOGGER.info("Property '{}' not specified.", JobConfigConstants.PATH_TO_DEPS_JAR);
-    }
-
-    long startTime = System.currentTimeMillis();
-    // Submit the job for execution.
-    job.waitForCompletion(true);
-    if (!job.isSuccessful()) {
-      throw new RuntimeException("Job failed : " + job);
-    }
-
-    LOGGER.info("Finished pre-processing job in {}ms", (System.currentTimeMillis() - startTime));
-  }
-
-  private void fetchPreProcessingOperations() {
-    _preprocessingOperations = new HashSet<>();
-    TableCustomConfig customConfig = _tableConfig.getCustomConfig();
-    if (customConfig != null) {
-      Map<String, String> customConfigMap = customConfig.getCustomConfigs();
-      if (customConfigMap != null && !customConfigMap.isEmpty()) {
-        String preprocessingOperationsString =
-            customConfigMap.getOrDefault(InternalConfigConstants.PREPROCESS_OPERATIONS, "");
-        DataPreprocessingUtils.getOperations(_preprocessingOperations, preprocessingOperationsString);
-      }
-    }
-  }
-
-  private void fetchPartitioningConfig() {
-    // Fetch partition info from table config.
-    if (!_preprocessingOperations.contains(DataPreprocessingUtils.Operation.PARTITION)) {
-      LOGGER.info("Partitioning is disabled.");
-      return;
-    }
-    SegmentPartitionConfig segmentPartitionConfig = _tableConfig.getIndexingConfig().getSegmentPartitionConfig();
-    if (segmentPartitionConfig != null) {
-      Map<String, ColumnPartitionConfig> columnPartitionMap = segmentPartitionConfig.getColumnPartitionMap();
-      Preconditions
-          .checkArgument(columnPartitionMap.size() <= 1, "There should be at most 1 partition setting in the table.");
-      if (columnPartitionMap.size() == 1) {
-        _partitionColumn = columnPartitionMap.keySet().iterator().next();
-        _numPartitions = segmentPartitionConfig.getNumPartitions(_partitionColumn);
-        _partitionFunction = segmentPartitionConfig.getFunctionName(_partitionColumn);
-        _partitionColumnDefaultNullValue =
-            _pinotTableSchema.getFieldSpecFor(_partitionColumn).getDefaultNullValueString();
-      }
-    } else {
-      LOGGER.info("Segment partition config is null for table: {}", _tableConfig.getTableName());
-    }
-  }
-
-  private void fetchSortingConfig() {
-    if (!_preprocessingOperations.contains(DataPreprocessingUtils.Operation.SORT)) {
-      LOGGER.info("Sorting is disabled.");
-      return;
-    }
-    // Fetch sorting info from table config first.
-    List<String> sortingColumns = new ArrayList<>();
-    List<FieldConfig> fieldConfigs = _tableConfig.getFieldConfigList();
-    if (fieldConfigs != null && !fieldConfigs.isEmpty()) {
-      for (FieldConfig fieldConfig : fieldConfigs) {
-        if (fieldConfig.getIndexType() == FieldConfig.IndexType.SORTED) {
-          sortingColumns.add(fieldConfig.getName());
-        }
-      }
-    }
-    if (!sortingColumns.isEmpty()) {
-      Preconditions.checkArgument(sortingColumns.size() == 1, "There should be at most 1 sorted column in the table.");
-      _sortingColumn = sortingColumns.get(0);
-      return;
-    }
-
-    // There is no sorted column specified in field configs, try to find sorted column from indexing config.
-    IndexingConfig indexingConfig = _tableConfig.getIndexingConfig();
-    List<String> sortedColumns = indexingConfig.getSortedColumn();
-    if (sortedColumns != null) {
-      Preconditions.checkArgument(sortedColumns.size() <= 1, "There should be at most 1 sorted column in the table.");
-      if (sortedColumns.size() == 1) {
-        _sortingColumn = sortedColumns.get(0);
-        FieldSpec fieldSpec = _pinotTableSchema.getFieldSpecFor(_sortingColumn);
-        Preconditions.checkState(fieldSpec != null, "Failed to find sorting column: {} in the schema", _sortingColumn);
-        Preconditions
-            .checkState(fieldSpec.isSingleValueField(), "Cannot sort on multi-value column: %s", _sortingColumn);
-        _sortingColumnType = fieldSpec.getDataType();
-        Preconditions
-            .checkState(_sortingColumnType.canBeASortedColumn(), "Cannot sort on %s column: %s", _sortingColumnType,
-                _sortingColumn);
-        LOGGER.info("Sorting the data with column: {} of type: {}", _sortingColumn, _sortingColumnType);
-      }
-    }
-    if (_sortingColumn != null) {
-      _sortingColumnDefaultNullValue = _pinotTableSchema.getFieldSpecFor(_sortingColumn).getDefaultNullValueString();
-    }
-  }
-
-  private void fetchResizingConfig() {
-    if (!_preprocessingOperations.contains(DataPreprocessingUtils.Operation.RESIZE)) {
-      LOGGER.info("Resizing is disabled.");
-      return;
-    }
-    TableCustomConfig tableCustomConfig = _tableConfig.getCustomConfig();
-    if (tableCustomConfig == null) {
-      _numOutputFiles = 0;
-      return;
-    }
-    Map<String, String> customConfigsMap = tableCustomConfig.getCustomConfigs();
-    if (customConfigsMap != null && customConfigsMap.containsKey(InternalConfigConstants.PREPROCESSING_NUM_REDUCERS)) {
-      _numOutputFiles = Integer.parseInt(customConfigsMap.get(InternalConfigConstants.PREPROCESSING_NUM_REDUCERS));
-      Preconditions.checkState(_numOutputFiles > 0,
-          String.format("The value of %s should be positive! Current value: %s",
-              InternalConfigConstants.PREPROCESSING_NUM_REDUCERS, _numOutputFiles));
-    } else {
-      _numOutputFiles = 0;
-    }
-
-    if (customConfigsMap != null) {
-      int maxNumRecords;
-      if (customConfigsMap.containsKey(InternalConfigConstants.PARTITION_MAX_RECORDS_PER_FILE)) {
-        LOGGER.warn("The config: {} from custom config is deprecated. Use {} instead.",
-            InternalConfigConstants.PARTITION_MAX_RECORDS_PER_FILE,
-            InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE);
-        maxNumRecords = Integer.parseInt(customConfigsMap.get(InternalConfigConstants.PARTITION_MAX_RECORDS_PER_FILE));
-      } else if (customConfigsMap.containsKey(InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE)) {
-        maxNumRecords =
-            Integer.parseInt(customConfigsMap.get(InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE));
-      } else {
-        return;
-      }
-      // TODO: add a in-built maximum value for this config to avoid having too many small files.
-      // E.g. if the config is set to 1 which is smaller than this in-built value, the job should be abort from
-      // generating too many small files.
-      Preconditions.checkArgument(maxNumRecords > 0,
-          "The value of " + InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE
-              + " should be positive. Current value: " + maxNumRecords);
-      LOGGER.info("Setting {} to {}", InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE, maxNumRecords);
-      _maxNumRecordsPerFile = maxNumRecords;
-    }
-  }
-
-  @Override
-  protected Schema getSchema()
-      throws IOException {
-    try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-      if (controllerRestApi != null) {
-        return controllerRestApi.getSchema();
-      } else {
-        try (InputStream inputStream = FileSystem.get(_schemaFile.toUri(), getConf()).open(_schemaFile)) {
-          return org.apache.pinot.spi.data.Schema.fromInputStream(inputStream);
-        }
-      }
-    }
-  }
-
-  /**
-   * Can be overridden to set additional job properties.
-   */
-  @SuppressWarnings("unused")
-  protected void addAdditionalJobProperties(Job job) {
-  }
-
-  private void setTableConfigAndSchema()
-      throws IOException {
-    _tableConfig = getTableConfig();
-    _pinotTableSchema = getSchema();
-
-    Preconditions.checkState(_tableConfig != null, "Table config cannot be null.");
-    Preconditions.checkState(_pinotTableSchema != null, "Schema cannot be null");
-  }
-
-  /**
-   * Cleans up outputs in preprocessed output directory.
-   */
-  public static void cleanUpPreprocessedOutputs(Path preprocessedOutputDir)
-      throws IOException {
-    if (HadoopUtils.DEFAULT_FILE_SYSTEM.exists(preprocessedOutputDir)) {
-      LOGGER.warn("Found output folder {}, deleting", preprocessedOutputDir);
-      HadoopUtils.DEFAULT_FILE_SYSTEM.delete(preprocessedOutputDir, true);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java
deleted file mode 100644
index b26fc388a44..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/InternalConfigConstants.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job;
-
-/**
- * Internal-only constants for Hadoop MapReduce jobs. These constants are propagated across different segment creation
- * jobs. They are not meant to be set externally.
- */
-public class InternalConfigConstants {
-  private InternalConfigConstants() {
-  }
-
-  public static final String TIME_COLUMN_CONFIG = "time.column";
-  public static final String TIME_COLUMN_VALUE = "time.column.value";
-  public static final String IS_APPEND = "is.append";
-  public static final String SEGMENT_PUSH_FREQUENCY = "segment.push.frequency";
-  public static final String SEGMENT_TIME_TYPE = "segment.time.type";
-  public static final String SEGMENT_TIME_FORMAT = "segment.time.format";
-  public static final String SEGMENT_TIME_SDF_PATTERN = "segment.time.sdf.pattern";
-
-  // The operations of preprocessing that is enabled.
-  public static final String PREPROCESS_OPERATIONS = "preprocessing.operations";
-
-  // Partitioning configs
-  public static final String PARTITION_COLUMN_CONFIG = "partition.column";
-  public static final String NUM_PARTITIONS_CONFIG = "num.partitions";
-  public static final String PARTITION_FUNCTION_CONFIG = "partition.function";
-  public static final String PARTITION_COLUMN_DEFAULT_NULL_VALUE = "partition.default.null.value";
-
-  public static final String SORTING_COLUMN_CONFIG = "sorting.column";
-  public static final String SORTING_COLUMN_TYPE = "sorting.type";
-  public static final String SORTING_COLUMN_DEFAULT_NULL_VALUE = "sorting.default.null.value";
-  public static final String ENABLE_PARTITIONING = "enable.partitioning";
-
-  @Deprecated
-  // Use PREPROCESSING_MAX_NUM_RECORDS_PER_FILE.
-  public static final String PARTITION_MAX_RECORDS_PER_FILE = "partition.max.records.per.file";
-  // max records per file in each partition. No effect otherwise.
-  public static final String PREPROCESSING_MAX_NUM_RECORDS_PER_FILE = "preprocessing.max.num.records.per.file";
-
-  // Number of segments we want generated.
-  public static final String PREPROCESSING_NUM_REDUCERS = "preprocessing.num.reducers";
-
-  public static final String FAIL_ON_SCHEMA_MISMATCH = "fail.on.schema.mismatch";
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/AvroDataPreprocessingMapper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/AvroDataPreprocessingMapper.java
deleted file mode 100644
index d9f17accfcb..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/AvroDataPreprocessingMapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.mappers;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.mapred.AvroKey;
-import org.apache.avro.mapred.AvroValue;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.hadoop.utils.preprocess.DataPreprocessingUtils;
-import org.apache.pinot.plugin.inputformat.avro.AvroRecordExtractor;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AvroDataPreprocessingMapper
-    extends Mapper<AvroKey<GenericRecord>, NullWritable, WritableComparable, AvroValue<GenericRecord>> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(AvroDataPreprocessingMapper.class);
-
-  private String _sortingColumn = null;
-  private FieldSpec.DataType _sortingColumnType = null;
-  private String _sortingColumnDefaultNullValue = null;
-  private AvroRecordExtractor _avroRecordExtractor;
-
-  @Override
-  public void setup(Context context) {
-    Configuration configuration = context.getConfiguration();
-    _avroRecordExtractor = new AvroRecordExtractor();
-    String sortingColumnConfig = configuration.get(InternalConfigConstants.SORTING_COLUMN_CONFIG);
-    if (sortingColumnConfig != null) {
-      _sortingColumn = sortingColumnConfig;
-      _sortingColumnType = FieldSpec.DataType.valueOf(configuration.get(InternalConfigConstants.SORTING_COLUMN_TYPE));
-      _sortingColumnDefaultNullValue = configuration.get(InternalConfigConstants.SORTING_COLUMN_DEFAULT_NULL_VALUE);
-      LOGGER.info("Initialized AvroDataPreprocessingMapper with sortingColumn: {} of type: {}, default null value: {}",
-          _sortingColumn, _sortingColumnType, _sortingColumnDefaultNullValue);
-    } else {
-      LOGGER.info("Initialized AvroDataPreprocessingMapper without sorting column");
-    }
-  }
-
-  @Override
-  public void map(AvroKey<GenericRecord> key, NullWritable value, Context context)
-      throws IOException, InterruptedException {
-    GenericRecord record = key.datum();
-    if (_sortingColumn != null) {
-      Object object = record.get(_sortingColumn);
-      Object valueToConvert = object != null ? _avroRecordExtractor.convert(object) : _sortingColumnDefaultNullValue;
-      Preconditions.checkState(valueToConvert != null, "Invalid value: %s for sorting column: %s in record: %s", object,
-          _sortingColumn, record);
-
-      WritableComparable outputKey;
-      try {
-        outputKey = DataPreprocessingUtils.convertToWritableComparable(valueToConvert, _sortingColumnType);
-      } catch (Exception e) {
-        throw new IllegalStateException(
-            String
-                .format("Caught exception while processing sorting column: %s in record: %s", _sortingColumn, record),
-            e);
-      }
-      context.write(outputKey, new AvroValue<>(record));
-    } else {
-      context.write(NullWritable.get(), new AvroValue<>(record));
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/OrcDataPreprocessingMapper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/OrcDataPreprocessingMapper.java
deleted file mode 100644
index 8ad9d84a9fc..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/OrcDataPreprocessingMapper.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.mappers;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.List;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.orc.mapred.OrcStruct;
-import org.apache.orc.mapred.OrcValue;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.hadoop.utils.preprocess.DataPreprocessingUtils;
-import org.apache.pinot.hadoop.utils.preprocess.OrcUtils;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class OrcDataPreprocessingMapper extends Mapper<NullWritable, OrcStruct, WritableComparable, OrcValue> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OrcDataPreprocessingMapper.class);
-
-  private final OrcValue _valueWrapper = new OrcValue();
-  private String _sortingColumn = null;
-  private FieldSpec.DataType _sortingColumnType = null;
-  private String _sortingColumnDefaultNullValue = null;
-  private int _sortingColumnId = -1;
-
-  @Override
-  public void setup(Context context) {
-    Configuration configuration = context.getConfiguration();
-    String sortingColumnConfig = configuration.get(InternalConfigConstants.SORTING_COLUMN_CONFIG);
-    if (sortingColumnConfig != null) {
-      _sortingColumn = sortingColumnConfig;
-      _sortingColumnType = FieldSpec.DataType.valueOf(configuration.get(InternalConfigConstants.SORTING_COLUMN_TYPE));
-      _sortingColumnDefaultNullValue = configuration.get(InternalConfigConstants.SORTING_COLUMN_DEFAULT_NULL_VALUE);
-      LOGGER.info("Initialized OrcDataPreprocessingMapper with sortingColumn: {} of type: {}, default null value: {}",
-          _sortingColumn, _sortingColumnType, _sortingColumnDefaultNullValue);
-    } else {
-      LOGGER.info("Initialized OrcDataPreprocessingMapper without sorting column");
-    }
-  }
-
-  @Override
-  public void map(NullWritable key, OrcStruct value, Context context)
-      throws IOException, InterruptedException {
-    _valueWrapper.value = value;
-    if (_sortingColumn != null) {
-      if (_sortingColumnId == -1) {
-        List<String> fieldNames = value.getSchema().getFieldNames();
-        _sortingColumnId = fieldNames.indexOf(_sortingColumn);
-        Preconditions.checkState(_sortingColumnId != -1, "Failed to find sorting column: %s in the ORC fields: %s",
-            _sortingColumn, fieldNames);
-        LOGGER.info("Field id for sorting column: {} is: {}", _sortingColumn, _sortingColumnId);
-      }
-      WritableComparable sortingColumnValue = value.getFieldValue(_sortingColumnId);
-      WritableComparable outputKey;
-      try {
-        Object valueToConvert =
-            sortingColumnValue != null ? OrcUtils.convert(sortingColumnValue) : _sortingColumnDefaultNullValue;
-        outputKey = DataPreprocessingUtils.convertToWritableComparable(valueToConvert, _sortingColumnType);
-      } catch (Exception e) {
-        throw new IllegalStateException(String
-            .format("Caught exception while processing sorting column: %s, id: %d in ORC struct: %s", _sortingColumn,
-                _sortingColumnId, value), e);
-      }
-      context.write(outputKey, _valueWrapper);
-    } else {
-      context.write(NullWritable.get(), _valueWrapper);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java
deleted file mode 100644
index 5f5d510bbbe..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationMapper.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.mappers;
-
-import com.google.common.base.Preconditions;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Map;
-import javax.annotation.Nullable;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.apache.pinot.common.utils.TarGzCompressionUtils;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentCreationJob;
-import org.apache.pinot.plugin.inputformat.csv.CSVRecordReaderConfig;
-import org.apache.pinot.plugin.inputformat.protobuf.ProtoBufRecordReaderConfig;
-import org.apache.pinot.plugin.inputformat.thrift.ThriftRecordReaderConfig;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
-import org.apache.pinot.segment.spi.creator.name.NormalizedDateSegmentNameGenerator;
-import org.apache.pinot.segment.spi.creator.name.SegmentNameGenerator;
-import org.apache.pinot.segment.spi.creator.name.SimpleSegmentNameGenerator;
-import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableCustomConfig;
-import org.apache.pinot.spi.data.DateTimeFieldSpec;
-import org.apache.pinot.spi.data.DateTimeFormatSpec;
-import org.apache.pinot.spi.data.IngestionSchemaValidator;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.FileFormat;
-import org.apache.pinot.spi.data.readers.RecordReaderConfig;
-import org.apache.pinot.spi.utils.DataSizeUtils;
-import org.apache.pinot.spi.utils.IngestionConfigUtils;
-import org.apache.pinot.spi.utils.JsonUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SegmentCreationMapper extends Mapper<LongWritable, Text, LongWritable, Text> {
-  protected static final String LOCAL_TEMP_DIR = "pinot_hadoop_tmp";
-  protected static final String PROGRESS_REPORTER_THREAD_NAME = "pinot-hadoop-progress-reporter";
-  protected static final long PROGRESS_REPORTER_JOIN_WAIT_TIME_MS = 5_000L;
-
-  protected final Logger _logger = LoggerFactory.getLogger(getClass());
-
-  protected Configuration _jobConf;
-  protected String _rawTableName;
-  protected Schema _schema;
-  protected SegmentNameGenerator _segmentNameGenerator;
-  protected boolean _useRelativePath = false;
-  protected boolean _failIfSchemaMismatch = false;
-
-  // Optional
-  protected TableConfig _tableConfig;
-  protected String _recordReaderPath;
-  protected Path _readerConfigFile;
-
-  // HDFS segment tar directory
-  protected Path _hdfsSegmentTarDir;
-
-  // Temporary local directories
-  protected File _localStagingDir;
-  protected File _localInputDir;
-  protected File _localSegmentDir;
-  protected File _localSegmentTarDir;
-
-  // Counter for detecting schema mismatch
-  private int _dataTypeMismatch = 0;
-  private int _singleValueMultiValueFieldMismatch = 0;
-  private int _multiValueStructureMismatch = 0;
-  private int _missingPinotColumn = 0;
-
-  /**
-   * Generate a relative output directory path when `useRelativePath` flag is on.
-   * This method will compute the relative path based on `inputFile` and `baseInputDir`,
-   * then apply only the directory part of relative path to `outputDir`.
-   * E.g.
-   *    baseInputDir = "/path/to/input"
-   *    inputFile = "/path/to/input/a/b/c/d.avro"
-   *    outputDir = "/path/to/output"
-   *    getRelativeOutputPath(baseInputDir, inputFile, outputDir) = /path/to/output/a/b/c
-   */
-  protected static Path getRelativeOutputPath(URI baseInputDir, URI inputFile, Path outputDir) {
-    URI relativePath = baseInputDir.relativize(inputFile);
-    Preconditions.checkState(relativePath.getPath().length() > 0 && !relativePath.equals(inputFile),
-        "Unable to extract out the relative path based on base input path: " + baseInputDir);
-    return new Path(outputDir, relativePath.getPath()).getParent();
-  }
-
-  @Override
-  public void setup(Context context)
-      throws IOException, InterruptedException {
-    _jobConf = context.getConfiguration();
-    logConfigurations();
-
-    _useRelativePath = _jobConf.getBoolean(JobConfigConstants.USE_RELATIVE_PATH, false);
-    _rawTableName = _jobConf.get(JobConfigConstants.SEGMENT_TABLE_NAME);
-    _schema = Schema.fromString(_jobConf.get(JobConfigConstants.SCHEMA));
-
-    // Optional.
-    // Once we move to dateTimeFieldSpec, check that table config (w/ valid timeColumnName) is provided if multiple
-    // dateTimeFieldSpecs are configured
-    String tableConfigString = _jobConf.get(JobConfigConstants.TABLE_CONFIG);
-    if (tableConfigString != null) {
-      _tableConfig = JsonUtils.stringToObject(tableConfigString, TableConfig.class);
-    }
-    String readerConfigFile = _jobConf.get(JobConfigConstants.PATH_TO_READER_CONFIG);
-    if (readerConfigFile != null) {
-      _readerConfigFile = new Path(readerConfigFile);
-    }
-    _recordReaderPath = _jobConf.get(JobConfigConstants.RECORD_READER_PATH);
-    Preconditions.checkNotNull(_tableConfig);
-
-    setFlagForSchemaMismatch();
-
-    // Set up segment name generator
-    String segmentNameGeneratorType =
-        _jobConf.get(JobConfigConstants.SEGMENT_NAME_GENERATOR_TYPE, JobConfigConstants.DEFAULT_SEGMENT_NAME_GENERATOR);
-    switch (segmentNameGeneratorType) {
-      case JobConfigConstants.SIMPLE_SEGMENT_NAME_GENERATOR:
-        _segmentNameGenerator =
-            new SimpleSegmentNameGenerator(_rawTableName, _jobConf.get(JobConfigConstants.SEGMENT_NAME_POSTFIX));
-        break;
-      case JobConfigConstants.NORMALIZED_DATE_SEGMENT_NAME_GENERATOR:
-        Preconditions.checkState(_tableConfig != null,
-            "In order to use NormalizedDateSegmentNameGenerator, table config must be provided");
-        SegmentsValidationAndRetentionConfig validationConfig = _tableConfig.getValidationConfig();
-        DateTimeFormatSpec dateTimeFormatSpec = null;
-        String timeColumnName = _tableConfig.getValidationConfig().getTimeColumnName();
-
-        if (timeColumnName != null) {
-          DateTimeFieldSpec dateTimeFieldSpec = _schema.getSpecForTimeColumn(timeColumnName);
-          if (dateTimeFieldSpec != null) {
-            dateTimeFormatSpec = dateTimeFieldSpec.getFormatSpec();
-          }
-        }
-        _segmentNameGenerator =
-            new NormalizedDateSegmentNameGenerator(_rawTableName, _jobConf.get(JobConfigConstants.SEGMENT_NAME_PREFIX),
-                _jobConf.getBoolean(JobConfigConstants.EXCLUDE_SEQUENCE_ID, false),
-                IngestionConfigUtils.getBatchSegmentIngestionType(_tableConfig),
-                IngestionConfigUtils.getBatchSegmentIngestionFrequency(_tableConfig), dateTimeFormatSpec,
-                _jobConf.get(JobConfigConstants.SEGMENT_NAME_POSTFIX));
-        break;
-      default:
-        throw new UnsupportedOperationException("Unsupported segment name generator type: " + segmentNameGeneratorType);
-    }
-
-    // Working directories
-    _hdfsSegmentTarDir = new Path(FileOutputFormat.getWorkOutputPath(context), JobConfigConstants.SEGMENT_TAR_DIR);
-    _localStagingDir = new File(LOCAL_TEMP_DIR);
-    _localInputDir = new File(_localStagingDir, "inputData");
-    _localSegmentDir = new File(_localStagingDir, "segments");
-    _localSegmentTarDir = new File(_localStagingDir, JobConfigConstants.SEGMENT_TAR_DIR);
-
-    if (_localStagingDir.exists()) {
-      _logger.warn("Deleting existing file: {}", _localStagingDir);
-      FileUtils.forceDelete(_localStagingDir);
-    }
-    _logger
-        .info("Making local temporary directories: {}, {}, {}", _localStagingDir, _localInputDir, _localSegmentTarDir);
-    Preconditions.checkState(_localStagingDir.mkdirs());
-    Preconditions.checkState(_localInputDir.mkdir());
-    Preconditions.checkState(_localSegmentDir.mkdir());
-    Preconditions.checkState(_localSegmentTarDir.mkdir());
-
-    _logger.info("*********************************************************************");
-    _logger.info("Raw Table Name: {}", _rawTableName);
-    _logger.info("Schema: {}", _schema);
-    _logger.info("Segment Name Generator: {}", _segmentNameGenerator);
-    _logger.info("Table Config: {}", _tableConfig);
-    _logger.info("Reader Config File: {}", _readerConfigFile);
-    _logger.info("*********************************************************************");
-    _logger.info("HDFS Segment Tar Directory: {}", _hdfsSegmentTarDir);
-    _logger.info("Local Staging Directory: {}", _localStagingDir);
-    _logger.info("Local Input Directory: {}", _localInputDir);
-    _logger.info("Local Segment Tar Directory: {}", _localSegmentTarDir);
-    _logger.info("*********************************************************************");
-  }
-
-  protected void logConfigurations() {
-    StringBuilder stringBuilder = new StringBuilder();
-    stringBuilder.append('{');
-    boolean firstEntry = true;
-    for (Map.Entry<String, String> entry : _jobConf) {
-      if (!firstEntry) {
-        stringBuilder.append(", ");
-      } else {
-        firstEntry = false;
-      }
-
-      stringBuilder.append(entry.getKey());
-      stringBuilder.append('=');
-      stringBuilder.append(entry.getValue());
-    }
-    stringBuilder.append('}');
-
-    _logger.info("*********************************************************************");
-    _logger.info("Job Configurations: {}", stringBuilder.toString());
-    _logger.info("*********************************************************************");
-  }
-
-  @Override
-  protected void map(LongWritable key, Text value, Context context)
-      throws IOException, InterruptedException {
-    String[] splits = StringUtils.split(value.toString(), ' ');
-    Preconditions.checkState(splits.length == 2, "Illegal input value: {}", value);
-
-    Path hdfsInputFile = new Path(splits[0]);
-    int sequenceId = Integer.parseInt(splits[1]);
-    _logger.info("Generating segment with HDFS input file: {}, sequence id: {}", hdfsInputFile, sequenceId);
-
-    String inputFileName = hdfsInputFile.getName();
-    File localInputFile = new File(_localInputDir, inputFileName);
-    _logger.info("Copying input file from: {} to: {}", hdfsInputFile, localInputFile);
-    FileSystem.get(hdfsInputFile.toUri(), _jobConf)
-        .copyToLocalFile(hdfsInputFile, new Path(localInputFile.getAbsolutePath()));
-
-    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(_tableConfig, _schema);
-    segmentGeneratorConfig.setTableName(_rawTableName);
-    segmentGeneratorConfig.setInputFilePath(localInputFile.getPath());
-    segmentGeneratorConfig.setOutDir(_localSegmentDir.getPath());
-    segmentGeneratorConfig.setSegmentNameGenerator(_segmentNameGenerator);
-    segmentGeneratorConfig.setSequenceId(sequenceId);
-    if (_recordReaderPath != null) {
-      segmentGeneratorConfig.setRecordReaderPath(_recordReaderPath);
-      segmentGeneratorConfig.setFormat(FileFormat.OTHER);
-    } else {
-      FileFormat fileFormat = getFileFormat(inputFileName);
-      segmentGeneratorConfig.setFormat(fileFormat);
-      segmentGeneratorConfig.setReaderConfig(getReaderConfig(fileFormat));
-    }
-    segmentGeneratorConfig.setOnHeap(true);
-    // Enable failing the job when meeting empty record to early detect potential issue from upstream.
-    // This is useful since releasing the constraint in offline job could allow unexpected issues appear without
-    // people's notice.
-    segmentGeneratorConfig.setFailOnEmptySegment(true);
-
-    addAdditionalSegmentGeneratorConfigs(segmentGeneratorConfig, hdfsInputFile, sequenceId);
-
-    _logger.info("Start creating segment with sequence id: {}", sequenceId);
-    SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
-
-    // Start a thread that reports progress every minute during segment generation to prevent job getting killed
-    Thread progressReporterThread = new Thread(getProgressReporter(context));
-    progressReporterThread.setName(PROGRESS_REPORTER_THREAD_NAME);
-    progressReporterThread.start();
-    try {
-      driver.init(segmentGeneratorConfig);
-      validateSchema(driver.getIngestionSchemaValidator());
-      driver.build();
-      String segmentName = driver.getSegmentName();
-      _logger.info("Finish creating segment: {} with sequence id: {}", segmentName, sequenceId);
-
-      File localSegmentDir = new File(_localSegmentDir, segmentName);
-      String segmentTarFileName = segmentName + JobConfigConstants.TAR_GZ_FILE_EXT;
-      File localSegmentTarFile = new File(_localSegmentTarDir, segmentTarFileName);
-      _logger.info("Tarring segment from: {} to: {}", localSegmentDir, localSegmentTarFile);
-      TarGzCompressionUtils.createTarGzFile(localSegmentDir, localSegmentTarFile);
-
-      long uncompressedSegmentSize = FileUtils.sizeOf(localSegmentDir);
-      long compressedSegmentSize = FileUtils.sizeOf(localSegmentTarFile);
-      _logger.info("Size for segment: {}, uncompressed: {}, compressed: {}", segmentName,
-          DataSizeUtils.fromBytes(uncompressedSegmentSize), DataSizeUtils.fromBytes(compressedSegmentSize));
-
-      Path hdfsSegmentTarFile = new Path(_hdfsSegmentTarDir, segmentTarFileName);
-      if (_useRelativePath) {
-        Path relativeOutputPath =
-            getRelativeOutputPath(new Path(_jobConf.get(JobConfigConstants.PATH_TO_INPUT)).toUri(),
-                hdfsInputFile.toUri(), _hdfsSegmentTarDir);
-        hdfsSegmentTarFile = new Path(relativeOutputPath, segmentTarFileName);
-      }
-      _logger.info("Copying segment tar file from: {} to: {}", localSegmentTarFile, hdfsSegmentTarFile);
-      FileSystem.get(hdfsSegmentTarFile.toUri(), _jobConf)
-          .copyFromLocalFile(true, true, new Path(localSegmentTarFile.getAbsolutePath()), hdfsSegmentTarFile);
-
-      context.write(new LongWritable(sequenceId), new Text(segmentTarFileName));
-      _logger
-          .info("Finish generating segment: {} with HDFS input file: {}, sequence id: {}", segmentName, hdfsInputFile,
-              sequenceId);
-    } catch (Exception e) {
-      _logger.error("Caught exception while creating segment with HDFS input file: {}, sequence id: {}", hdfsInputFile,
-          sequenceId, e);
-      throw new RuntimeException(e);
-    } finally {
-      progressReporterThread.interrupt();
-      progressReporterThread.join(PROGRESS_REPORTER_JOIN_WAIT_TIME_MS);
-      if (progressReporterThread.isAlive()) {
-        _logger.error("Failed to interrupt progress reporter thread: {}", progressReporterThread);
-      }
-    }
-  }
-
-  protected FileFormat getFileFormat(String fileName) {
-    if (fileName.endsWith(".avro")) {
-      return FileFormat.AVRO;
-    }
-    if (fileName.endsWith(".csv")) {
-      return FileFormat.CSV;
-    }
-    if (fileName.endsWith(".json")) {
-      return FileFormat.JSON;
-    }
-    if (fileName.endsWith(".thrift")) {
-      return FileFormat.THRIFT;
-    }
-    throw new IllegalArgumentException("Unsupported file format: {}" + fileName);
-  }
-
-  @Nullable
-  protected RecordReaderConfig getReaderConfig(FileFormat fileFormat)
-      throws IOException {
-    if (_readerConfigFile != null) {
-      if (fileFormat == FileFormat.CSV) {
-        try (InputStream inputStream = FileSystem.get(_readerConfigFile.toUri(), _jobConf).open(_readerConfigFile)) {
-          CSVRecordReaderConfig readerConfig = JsonUtils.inputStreamToObject(inputStream, CSVRecordReaderConfig.class);
-          _logger.info("Using CSV record reader config: {}", readerConfig);
-          return readerConfig;
-        }
-      }
-      if (fileFormat == FileFormat.THRIFT) {
-        try (InputStream inputStream = FileSystem.get(_readerConfigFile.toUri(), _jobConf).open(_readerConfigFile)) {
-          ThriftRecordReaderConfig readerConfig =
-              JsonUtils.inputStreamToObject(inputStream, ThriftRecordReaderConfig.class);
-          _logger.info("Using Thrift record reader config: {}", readerConfig);
-          return readerConfig;
-        }
-      }
-
-      if (fileFormat == FileFormat.PROTO) {
-        try (InputStream inputStream = FileSystem.get(_readerConfigFile.toUri(), _jobConf).open(_readerConfigFile)) {
-          ProtoBufRecordReaderConfig readerConfig =
-              JsonUtils.inputStreamToObject(inputStream, ProtoBufRecordReaderConfig.class);
-          _logger.info("Using Protocol Buffer record reader config: {}", readerConfig);
-          return readerConfig;
-        }
-      }
-    }
-    return null;
-  }
-
-  protected Runnable getProgressReporter(Context context) {
-    return new ProgressReporter(context);
-  }
-
-  /**
-   * Can be overridden to set additional segment generator configs.
-   */
-  @SuppressWarnings("unused")
-  protected void addAdditionalSegmentGeneratorConfigs(SegmentGeneratorConfig segmentGeneratorConfig, Path hdfsInputFile,
-      int sequenceId) {
-  }
-
-  private void setFlagForSchemaMismatch() {
-    String failJobMsg = "Set to fail the job if schemas mismatch.";
-    String notFailJobMsg = "Set NOT to fail the job if schemas mismatch.";
-    TableCustomConfig tableCustomConfig = _tableConfig.getCustomConfig();
-    if (tableCustomConfig == null) {
-      _logger.info(notFailJobMsg);
-      return;
-    }
-    Map<String, String> customConfigsMap = tableCustomConfig.getCustomConfigs();
-    if (customConfigsMap != null && customConfigsMap.containsKey(InternalConfigConstants.FAIL_ON_SCHEMA_MISMATCH)) {
-      _failIfSchemaMismatch =
-          Boolean.parseBoolean(customConfigsMap.get(InternalConfigConstants.FAIL_ON_SCHEMA_MISMATCH));
-    }
-    _logger.info(_failIfSchemaMismatch ? failJobMsg : notFailJobMsg);
-  }
-
-  private void validateSchema(IngestionSchemaValidator ingestionSchemaValidator) {
-    if (ingestionSchemaValidator == null) {
-      return;
-    }
-    if (ingestionSchemaValidator.getDataTypeMismatchResult().isMismatchDetected()) {
-      _dataTypeMismatch++;
-      _logger.warn(ingestionSchemaValidator.getDataTypeMismatchResult().getMismatchReason());
-    }
-    if (ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().isMismatchDetected()) {
-      _singleValueMultiValueFieldMismatch++;
-      ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().getMismatchReason();
-    }
-    if (ingestionSchemaValidator.getMultiValueStructureMismatchResult().isMismatchDetected()) {
-      _multiValueStructureMismatch++;
-      ingestionSchemaValidator.getMultiValueStructureMismatchResult().getMismatchReason();
-    }
-    if (ingestionSchemaValidator.getMissingPinotColumnResult().isMismatchDetected()) {
-      _missingPinotColumn++;
-      ingestionSchemaValidator.getMissingPinotColumnResult().getMismatchReason();
-    }
-
-    if (isSchemaMismatch() && _failIfSchemaMismatch) {
-      throw new RuntimeException(
-          "Schema mismatch detected. Forcing to fail the job. Please checking log message above.");
-    }
-  }
-
-  private boolean isSchemaMismatch() {
-    return _dataTypeMismatch + _singleValueMultiValueFieldMismatch + _multiValueStructureMismatch + _missingPinotColumn
-        != 0;
-  }
-
-  @Override
-  public void cleanup(Context context) {
-    context.getCounter(SegmentCreationJob.SchemaMisMatchCounter.DATA_TYPE_MISMATCH).increment(_dataTypeMismatch);
-    context.getCounter(SegmentCreationJob.SchemaMisMatchCounter.SINGLE_VALUE_MULTI_VALUE_FIELD_MISMATCH)
-        .increment(_singleValueMultiValueFieldMismatch);
-    context.getCounter(SegmentCreationJob.SchemaMisMatchCounter.MULTI_VALUE_FIELD_STRUCTURE_MISMATCH)
-        .increment(_multiValueStructureMismatch);
-    context.getCounter(SegmentCreationJob.SchemaMisMatchCounter.MISSING_PINOT_COLUMN).increment(_missingPinotColumn);
-    _logger.info("Deleting local temporary directory: {}", _localStagingDir);
-    FileUtils.deleteQuietly(_localStagingDir);
-  }
-
-  private static class ProgressReporter implements Runnable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProgressReporter.class);
-    private static final long PROGRESS_REPORTER_INTERVAL_MS = 60_000L;
-
-    private final Context _context;
-
-    ProgressReporter(Context context) {
-      _context = context;
-    }
-
-    @Override
-    public void run() {
-      LOGGER.info("Starting progress reporter thread: {}", Thread.currentThread());
-      while (true) {
-        try {
-          Thread.sleep(PROGRESS_REPORTER_INTERVAL_MS);
-          LOGGER.info("============== Reporting progress ==============");
-          _context.progress();
-        } catch (InterruptedException e) {
-          LOGGER.info("Progress reporter thread: {} interrupted", Thread.currentThread());
-          return;
-        }
-      }
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java
deleted file mode 100644
index 408081eb88d..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/mappers/SegmentPreprocessingMapper.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.mappers;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.Map;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.mapred.AvroKey;
-import org.apache.avro.mapred.AvroValue;
-import org.apache.avro.mapreduce.AvroJob;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.segment.spi.creator.name.NormalizedDateSegmentNameGenerator;
-import org.apache.pinot.spi.data.DateTimeFieldSpec;
-import org.apache.pinot.spi.data.DateTimeFormatSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SegmentPreprocessingMapper
-    extends Mapper<AvroKey<GenericRecord>, NullWritable, AvroKey<GenericRecord>, AvroValue<GenericRecord>> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(SegmentPreprocessingMapper.class);
-  private Configuration _jobConf;
-  private String _sortedColumn = null;
-  private String _timeColumn = null;
-  private Schema _outputKeySchema;
-  private Schema _outputSchema;
-  private boolean _enablePartitioning;
-  private boolean _isAppend = false;
-  private NormalizedDateSegmentNameGenerator _normalizedDateSegmentNameGenerator;
-  private String _sampleNormalizedTimeColumnValue;
-  private boolean _firstInstanceOfMismatchedTime = true;
-
-  @Override
-  public void setup(final Context context) {
-    _jobConf = context.getConfiguration();
-    logConfigurations();
-    String tableName = _jobConf.get(JobConfigConstants.SEGMENT_TABLE_NAME);
-
-    _isAppend = "true".equalsIgnoreCase(_jobConf.get(InternalConfigConstants.IS_APPEND));
-    if (_isAppend) {
-      // Get time column name
-      _timeColumn = _jobConf.get(InternalConfigConstants.TIME_COLUMN_CONFIG);
-
-      // Get sample time column value
-      String timeColumnValue = _jobConf.get(InternalConfigConstants.TIME_COLUMN_VALUE);
-      String pushFrequency = _jobConf.get(InternalConfigConstants.SEGMENT_PUSH_FREQUENCY);
-
-      String timeFormatStr = _jobConf.get(InternalConfigConstants.SEGMENT_TIME_FORMAT);
-      DateTimeFieldSpec.TimeFormat timeFormat;
-      try {
-        timeFormat = DateTimeFieldSpec.TimeFormat.valueOf(timeFormatStr);
-      } catch (Exception e) {
-        throw new IllegalArgumentException("Invalid time format: " + timeFormatStr);
-      }
-      DateTimeFormatSpec dateTimeFormatSpec;
-      switch (timeFormat) {
-        case EPOCH:
-          String timeTypeStr = _jobConf.get(InternalConfigConstants.SEGMENT_TIME_TYPE);
-          try {
-            dateTimeFormatSpec = DateTimeFormatSpec.forEpoch(timeTypeStr);
-          } catch (Exception e) {
-            throw new IllegalArgumentException("Invalid time type: " + timeTypeStr, e);
-          }
-          break;
-        case TIMESTAMP:
-          dateTimeFormatSpec = DateTimeFormatSpec.forTimestamp();
-          break;
-        case SIMPLE_DATE_FORMAT:
-          String sdfPattern = _jobConf.get(InternalConfigConstants.SEGMENT_TIME_SDF_PATTERN);
-          try {
-            dateTimeFormatSpec = DateTimeFormatSpec.forSimpleDateFormat(sdfPattern);
-          } catch (Exception e) {
-            throw new IllegalArgumentException("Invalid SDF pattern: " + sdfPattern, e);
-          }
-          break;
-        default:
-          throw new IllegalStateException("Unsupported time format: " + timeFormat);
-      }
-      _normalizedDateSegmentNameGenerator =
-          new NormalizedDateSegmentNameGenerator(tableName, null, false, "APPEND", pushFrequency, dateTimeFormatSpec,
-              null);
-      _sampleNormalizedTimeColumnValue = _normalizedDateSegmentNameGenerator.getNormalizedDate(timeColumnValue);
-    }
-
-    String sortedColumn = _jobConf.get(InternalConfigConstants.SORTING_COLUMN_CONFIG);
-    // Logging the configs for the mapper
-    LOGGER.info("Sorted Column: " + sortedColumn);
-    if (sortedColumn != null) {
-      _sortedColumn = sortedColumn;
-    }
-    _outputKeySchema = AvroJob.getMapOutputKeySchema(_jobConf);
-    _outputSchema = AvroJob.getMapOutputValueSchema(_jobConf);
-    _enablePartitioning = Boolean.parseBoolean(_jobConf.get(InternalConfigConstants.ENABLE_PARTITIONING, "false"));
-  }
-
-  @Override
-  public void map(AvroKey<GenericRecord> record, NullWritable value, final Context context)
-      throws IOException, InterruptedException {
-
-    if (_isAppend) {
-      // Normalize time column value and check against sample value
-      String timeColumnValue = record.datum().get(_timeColumn).toString();
-      String normalizedTimeColumnValue = _normalizedDateSegmentNameGenerator.getNormalizedDate(timeColumnValue);
-
-      if (!normalizedTimeColumnValue.equals(_sampleNormalizedTimeColumnValue) && _firstInstanceOfMismatchedTime) {
-        _firstInstanceOfMismatchedTime = false;
-        // TODO: Create a custom exception and gracefully catch this exception outside, changing what the path to input
-        // into segment creation should be
-        LOGGER.warn("This segment contains multiple time units. Sample is {}, current is {}",
-            _sampleNormalizedTimeColumnValue, normalizedTimeColumnValue);
-      }
-    }
-
-    final GenericRecord inputRecord = record.datum();
-    final Schema schema = inputRecord.getSchema();
-    Preconditions.checkArgument(_outputSchema.equals(schema), "The schema of all avro files should be the same!");
-
-    GenericRecord outputKey = new GenericData.Record(_outputKeySchema);
-    if (_sortedColumn == null) {
-      outputKey.put("hashcode", inputRecord.hashCode());
-    } else if (_enablePartitioning) {
-      outputKey.put(_sortedColumn, inputRecord.get(_sortedColumn));
-    } else {
-      outputKey.put(_sortedColumn, inputRecord.get(_sortedColumn));
-      outputKey.put("hashcode", inputRecord.hashCode());
-    }
-
-    try {
-      context.write(new AvroKey<>(outputKey), new AvroValue<>(inputRecord));
-    } catch (Exception e) {
-      LOGGER.error("Exception when writing context on mapper!");
-      throw e;
-    }
-  }
-
-  protected void logConfigurations() {
-    StringBuilder stringBuilder = new StringBuilder();
-    stringBuilder.append('{');
-    boolean firstEntry = true;
-    for (Map.Entry<String, String> entry : _jobConf) {
-      if (!firstEntry) {
-        stringBuilder.append(", \n");
-      } else {
-        firstEntry = false;
-      }
-
-      stringBuilder.append(entry.getKey());
-      stringBuilder.append('=');
-      stringBuilder.append(entry.getValue());
-    }
-    stringBuilder.append('}');
-
-    LOGGER.info("*********************************************************************");
-    LOGGER.info("Job Configurations: {}", stringBuilder.toString());
-    LOGGER.info("*********************************************************************");
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/AvroDataPreprocessingPartitioner.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/AvroDataPreprocessingPartitioner.java
deleted file mode 100644
index 5f2ae4d3794..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/AvroDataPreprocessingPartitioner.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.partitioners;
-
-import com.google.common.base.Preconditions;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.mapred.AvroValue;
-import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.plugin.inputformat.avro.AvroRecordExtractor;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AvroDataPreprocessingPartitioner extends Partitioner<WritableComparable, AvroValue<GenericRecord>>
-    implements Configurable {
-  private static final Logger LOGGER = LoggerFactory.getLogger(AvroDataPreprocessingPartitioner.class);
-
-  private Configuration _conf;
-  private String _partitionColumn;
-  private PartitionFunction _partitionFunction;
-  private String _partitionColumnDefaultNullValue;
-  private AvroRecordExtractor _avroRecordExtractor;
-  private int _numReducers = -1;
-
-  private final AtomicInteger _counter = new AtomicInteger(0);
-
-  @Override
-  public void setConf(Configuration conf) {
-    _conf = conf;
-    _avroRecordExtractor = new AvroRecordExtractor();
-    _partitionColumn = conf.get(InternalConfigConstants.PARTITION_COLUMN_CONFIG);
-    String partitionFunctionName = conf.get(InternalConfigConstants.PARTITION_FUNCTION_CONFIG);
-    String numPartitionsString = conf.get(InternalConfigConstants.NUM_PARTITIONS_CONFIG);
-    int numPartitions = -1;
-    if (_partitionColumn != null) {
-      numPartitions = Integer.parseInt(numPartitionsString);
-      _partitionFunction = PartitionFunctionFactory.getPartitionFunction(partitionFunctionName, numPartitions);
-    } else {
-      _numReducers = Integer.parseInt(conf.get(MRJobConfig.NUM_REDUCES));
-    }
-    _partitionColumnDefaultNullValue = conf.get(InternalConfigConstants.PARTITION_COLUMN_DEFAULT_NULL_VALUE);
-    LOGGER.info(
-        "Initialized AvroDataPreprocessingPartitioner with partitionColumn: {}, partitionFunction: {}, numPartitions:"
-            + " {}, default null value: {}",
-        _partitionColumn, partitionFunctionName, numPartitions, _partitionColumnDefaultNullValue);
-  }
-
-  @Override
-  public Configuration getConf() {
-    return _conf;
-  }
-
-  @Override
-  public int getPartition(WritableComparable key, AvroValue<GenericRecord> value, int numPartitions) {
-    if (_partitionColumn == null) {
-      return Math.abs(_counter.getAndIncrement()) % _numReducers;
-    } else {
-      GenericRecord record = value.datum();
-      Object object = record.get(_partitionColumn);
-      String convertedValueString;
-      if (object == null) {
-        convertedValueString = _partitionColumnDefaultNullValue;
-      } else {
-        Object convertedValue = _avroRecordExtractor.convert(object);
-        Preconditions
-            .checkState(convertedValue != null, "Invalid value: %s for partition column: %s in record: %s", object,
-                _partitionColumn, record);
-        Preconditions.checkState(convertedValue instanceof Number || convertedValue instanceof String,
-            "Value for partition column: %s must be either a Number or a String, found: %s in record: %s",
-            _partitionColumn, convertedValue.getClass(), record);
-        convertedValueString = convertedValue.toString();
-      }
-      // NOTE: Always partition with String type value because Broker uses String type value to prune segments
-      return _partitionFunction.getPartition(convertedValueString);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java
deleted file mode 100644
index 118d3106b06..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/GenericPartitioner.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.partitioners;
-
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.mapred.AvroValue;
-import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class GenericPartitioner<T> extends Partitioner<T, AvroValue<GenericRecord>> implements Configurable {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(GenericPartitioner.class);
-  private Configuration _configuration;
-  private String _partitionColumn;
-  private int _numPartitions;
-  private PartitionFunction _partitionFunction;
-
-  @Override
-  public void setConf(Configuration conf) {
-    _configuration = conf;
-    _partitionColumn = _configuration.get(InternalConfigConstants.PARTITION_COLUMN_CONFIG);
-    _numPartitions = Integer.parseInt(_configuration.get(InternalConfigConstants.NUM_PARTITIONS_CONFIG));
-    _partitionFunction = PartitionFunctionFactory.getPartitionFunction(
-        _configuration.get(InternalConfigConstants.PARTITION_FUNCTION_CONFIG, null), _numPartitions);
-
-    LOGGER.info("The partition function is: " + _partitionFunction.getClass().getName());
-    LOGGER.info("The partition column is: " + _partitionColumn);
-    LOGGER.info("Total number of partitions is: " + _numPartitions);
-  }
-
-  @Override
-  public Configuration getConf() {
-    return _configuration;
-  }
-
-  @Override
-  public int getPartition(T genericRecordAvroKey, AvroValue<GenericRecord> genericRecordAvroValue, int numPartitions) {
-    final GenericRecord inputRecord = genericRecordAvroValue.datum();
-    final Object partitionColumnValue = inputRecord.get(_partitionColumn);
-    return _partitionFunction.getPartition(partitionColumnValue);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/OrcDataPreprocessingPartitioner.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/OrcDataPreprocessingPartitioner.java
deleted file mode 100644
index 853502c0f4d..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/OrcDataPreprocessingPartitioner.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.partitioners;
-
-import com.google.common.base.Preconditions;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.orc.mapred.OrcStruct;
-import org.apache.orc.mapred.OrcValue;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.hadoop.utils.preprocess.OrcUtils;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class OrcDataPreprocessingPartitioner extends Partitioner<WritableComparable, OrcValue> implements Configurable {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OrcDataPreprocessingPartitioner.class);
-
-  private Configuration _conf;
-  private String _partitionColumn;
-  private PartitionFunction _partitionFunction;
-  private String _partitionColumnDefaultNullValue;
-  private int _partitionColumnId = -1;
-  private int _numReducers = -1;
-
-  private final AtomicInteger _counter = new AtomicInteger(0);
-
-  @Override
-  public void setConf(Configuration conf) {
-    _conf = conf;
-    _partitionColumn = conf.get(InternalConfigConstants.PARTITION_COLUMN_CONFIG);
-    String partitionFunctionName = conf.get(InternalConfigConstants.PARTITION_FUNCTION_CONFIG);
-    String numPartitionsString = conf.get(InternalConfigConstants.NUM_PARTITIONS_CONFIG);
-    int numPartitions = -1;
-    if (_partitionColumn != null) {
-      numPartitions = Integer.parseInt(numPartitionsString);
-      _partitionFunction = PartitionFunctionFactory.getPartitionFunction(partitionFunctionName, numPartitions);
-    } else {
-      _numReducers = Integer.parseInt(conf.get(MRJobConfig.NUM_REDUCES));
-    }
-    _partitionColumnDefaultNullValue = conf.get(InternalConfigConstants.PARTITION_COLUMN_DEFAULT_NULL_VALUE);
-    LOGGER.info(
-        "Initialized OrcDataPreprocessingPartitioner with partitionColumn: {}, partitionFunction: {}, numPartitions: "
-            + "{}, default null value: {}",
-        _partitionColumn, partitionFunctionName, numPartitions, _partitionColumnDefaultNullValue);
-  }
-
-  @Override
-  public Configuration getConf() {
-    return _conf;
-  }
-
-  @Override
-  public int getPartition(WritableComparable key, OrcValue value, int numPartitions) {
-    if (_partitionColumn == null) {
-      return Math.abs(_counter.getAndIncrement()) % _numReducers;
-    } else {
-      OrcStruct orcStruct = (OrcStruct) value.value;
-      if (_partitionColumnId == -1) {
-        List<String> fieldNames = orcStruct.getSchema().getFieldNames();
-        _partitionColumnId = fieldNames.indexOf(_partitionColumn);
-        Preconditions.checkState(_partitionColumnId != -1, "Failed to find partition column: %s in the ORC fields: %s",
-            _partitionColumn, fieldNames);
-        LOGGER.info("Field id for partition column: {} is: {}", _partitionColumn, _partitionColumnId);
-      }
-      WritableComparable partitionColumnValue = orcStruct.getFieldValue(_partitionColumnId);
-      String convertedValueString;
-      if (partitionColumnValue == null) {
-        convertedValueString = _partitionColumnDefaultNullValue;
-      } else {
-        try {
-          Object convertedValue = OrcUtils.convert(partitionColumnValue);
-          convertedValueString = convertedValue.toString();
-        } catch (Exception e) {
-          throw new IllegalStateException(String
-              .format("Caught exception while processing partition column: %s, id: %d in ORC struct: %s",
-                  _partitionColumn, _partitionColumnId, orcStruct), e);
-        }
-      }
-      // NOTE: Always partition with String type value because Broker uses String type value to prune segments
-      return _partitionFunction.getPartition(convertedValueString);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java
deleted file mode 100644
index 0ba57dba77b..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/partitioners/PartitionFunctionFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.partitioners;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.pinot.segment.spi.partition.ByteArrayPartitionFunction;
-import org.apache.pinot.segment.spi.partition.HashCodePartitionFunction;
-import org.apache.pinot.segment.spi.partition.ModuloPartitionFunction;
-import org.apache.pinot.segment.spi.partition.MurmurPartitionFunction;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-
-
-public class PartitionFunctionFactory {
-
-  private PartitionFunctionFactory() {
-  }
-
-  public enum PartitionFunctionType {
-    Modulo, Murmur, HashCode, ByteArray;
-    // Add more functions here.
-
-    private static final Map<String, PartitionFunctionType> VALUE_MAP = new HashMap<>();
-
-    static {
-      for (PartitionFunctionType functionType : PartitionFunctionType.values()) {
-        VALUE_MAP.put(functionType.name().toLowerCase(), functionType);
-      }
-    }
-
-    public static PartitionFunctionType fromString(String name) {
-      PartitionFunctionType functionType = VALUE_MAP.get(name.toLowerCase());
-
-      if (functionType == null) {
-        throw new IllegalArgumentException("No enum constant for: " + name);
-      }
-      return functionType;
-    }
-  }
-
-  /**
-   * This method generates and returns a partition function based on the provided string.
-   *
-   * @param functionName Name of partition function
-   * @return Partition function
-   */
-  public static PartitionFunction getPartitionFunction(String functionName, int numPartitions) {
-
-    // Return default partition function if there is no configuration given.
-    if (functionName == null) {
-      return new MurmurPartitionFunction(numPartitions);
-    }
-
-    PartitionFunctionType functionType;
-    try {
-      functionType = PartitionFunctionType.fromString(functionName);
-    } catch (IllegalArgumentException e) {
-      // By default, we use murmur
-      functionType = PartitionFunctionType.Murmur;
-    }
-
-    switch (functionType) {
-      case Modulo:
-        return new ModuloPartitionFunction(numPartitions);
-
-      case Murmur:
-        return new MurmurPartitionFunction(numPartitions);
-
-      case HashCode:
-        return new HashCodePartitionFunction(numPartitions);
-
-      case ByteArray:
-        return new ByteArrayPartitionFunction(numPartitions);
-
-      default:
-        return new MurmurPartitionFunction(numPartitions);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/AvroDataPreprocessingHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/AvroDataPreprocessingHelper.java
deleted file mode 100644
index 9e5f5f20d8a..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/AvroDataPreprocessingHelper.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.preprocess;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.List;
-import java.util.zip.GZIPInputStream;
-import org.apache.avro.Schema;
-import org.apache.avro.file.DataFileStream;
-import org.apache.avro.generic.GenericDatumReader;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.mapred.AvroKey;
-import org.apache.avro.mapreduce.AvroJob;
-import org.apache.avro.mapreduce.AvroKeyInputFormat;
-import org.apache.avro.mapreduce.AvroKeyOutputFormat;
-import org.apache.avro.mapreduce.AvroMultipleOutputs;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.hadoop.mapreduce.lib.output.LazyOutputFormat;
-import org.apache.pinot.hadoop.job.mappers.AvroDataPreprocessingMapper;
-import org.apache.pinot.hadoop.job.partitioners.AvroDataPreprocessingPartitioner;
-import org.apache.pinot.hadoop.job.reducers.AvroDataPreprocessingReducer;
-import org.apache.pinot.hadoop.utils.preprocess.HadoopUtils;
-import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AvroDataPreprocessingHelper extends DataPreprocessingHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(AvroDataPreprocessingHelper.class);
-
-  public AvroDataPreprocessingHelper(List<Path> inputDataPaths, Path outputPath) {
-    super(inputDataPaths, outputPath);
-  }
-
-  @Override
-  public Class<? extends Partitioner> getPartitioner() {
-    return AvroDataPreprocessingPartitioner.class;
-  }
-
-  @Override
-  public void setUpMapperReducerConfigs(Job job)
-      throws IOException {
-    Schema avroSchema = getAvroSchema(_sampleRawDataPath);
-    LOGGER.info("Avro schema is: {}", avroSchema.toString(true));
-    validateConfigsAgainstSchema(avroSchema);
-
-    job.setInputFormatClass(AvroKeyInputFormat.class);
-    job.setMapperClass(AvroDataPreprocessingMapper.class);
-
-    job.setReducerClass(AvroDataPreprocessingReducer.class);
-    AvroMultipleOutputs.addNamedOutput(job, "avro", AvroKeyOutputFormat.class, avroSchema);
-    AvroMultipleOutputs.setCountersEnabled(job, true);
-    // Use LazyOutputFormat to avoid creating empty files.
-    LazyOutputFormat.setOutputFormatClass(job, AvroKeyOutputFormat.class);
-    job.setOutputKeyClass(AvroKey.class);
-    job.setOutputValueClass(NullWritable.class);
-
-    AvroJob.setInputKeySchema(job, avroSchema);
-    AvroJob.setMapOutputValueSchema(job, avroSchema);
-    AvroJob.setOutputKeySchema(job, avroSchema);
-  }
-
-  @Override
-  String getSampleTimeColumnValue(String timeColumnName)
-      throws IOException {
-    String sampleTimeColumnValue;
-    try (DataFileStream<GenericRecord> dataStreamReader = getAvroReader(_sampleRawDataPath)) {
-      sampleTimeColumnValue = dataStreamReader.next().get(timeColumnName).toString();
-    }
-    return sampleTimeColumnValue;
-  }
-
-  /**
-   * Finds the avro file in the input folder, and returns its avro schema
-   * @param inputPathDir Path to input directory
-   * @return Input schema
-   * @throws IOException exception when accessing to IO
-   */
-  private Schema getAvroSchema(Path inputPathDir)
-      throws IOException {
-    Schema avroSchema = null;
-    for (FileStatus fileStatus : HadoopUtils.DEFAULT_FILE_SYSTEM.listStatus(inputPathDir)) {
-      if (fileStatus.isFile() && fileStatus.getPath().getName().endsWith(".avro")) {
-        LOGGER.info("Extracting schema from " + fileStatus.getPath());
-        try (DataFileStream<GenericRecord> dataStreamReader = getAvroReader(inputPathDir)) {
-          avroSchema = dataStreamReader.getSchema();
-        }
-        break;
-      }
-    }
-    return avroSchema;
-  }
-
-  /**
-   * Helper method that returns avro reader for the given avro file.
-   * If file name ends in 'gz' then returns the GZIP version, otherwise gives the regular reader.
-   *
-   * @param avroFile File to read
-   * @return Avro reader for the file.
-   * @throws IOException exception when accessing to IO
-   */
-  private DataFileStream<GenericRecord> getAvroReader(Path avroFile)
-      throws IOException {
-    FileSystem fs = FileSystem.get(new Configuration());
-    if (avroFile.getName().endsWith("gz")) {
-      return new DataFileStream<>(new GZIPInputStream(fs.open(avroFile)), new GenericDatumReader<>());
-    } else {
-      return new DataFileStream<>(fs.open(avroFile), new GenericDatumReader<>());
-    }
-  }
-
-  private void validateConfigsAgainstSchema(Schema schema) {
-    if (_partitionColumn != null) {
-      Preconditions.checkArgument(schema.getField(_partitionColumn) != null,
-          String.format("Partition column: %s is not found from the schema of input files.", _partitionColumn));
-      Preconditions.checkArgument(_numPartitions > 0,
-          String.format("Number of partitions should be positive. Current value: %s", _numPartitions));
-      Preconditions.checkArgument(_partitionFunction != null, "Partition function should not be null!");
-      try {
-        PartitionFunctionFactory.PartitionFunctionType.fromString(_partitionFunction);
-      } catch (IllegalArgumentException e) {
-        LOGGER.error("Partition function needs to be one of Modulo, Murmur, ByteArray, HashCode, it is currently {}",
-            _partitionColumn);
-        throw new IllegalArgumentException(e);
-      }
-    }
-    if (_sortingColumn != null) {
-      Preconditions.checkArgument(schema.getField(_sortingColumn) != null,
-          String.format("Sorted column: %s is not found from the schema of input files.", _sortingColumn));
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelper.java
deleted file mode 100644
index a9a0db40d67..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelper.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.preprocess;
-
-import java.io.IOException;
-import java.util.List;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.io.FloatWritable;
-import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.JobContext;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.pinot.hadoop.job.HadoopSegmentPreprocessingJob;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.hadoop.job.partitioners.GenericPartitioner;
-import org.apache.pinot.hadoop.utils.preprocess.HadoopUtils;
-import org.apache.pinot.hadoop.utils.preprocess.TextComparator;
-import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.DateTimeFieldSpec;
-import org.apache.pinot.spi.data.DateTimeFormatSpec;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.utils.IngestionConfigUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public abstract class DataPreprocessingHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DataPreprocessingHelper.class);
-
-  String _partitionColumn;
-  int _numPartitions;
-  String _partitionFunction;
-  String _partitionColumnDefaultNullValue;
-
-  String _sortingColumn;
-  private FieldSpec.DataType _sortingColumnType;
-  String _sortingColumnDefaultNullValue;
-
-  private int _numOutputFiles;
-  private int _maxNumRecordsPerFile;
-
-  private TableConfig _tableConfig;
-  private Schema _pinotTableSchema;
-
-  List<Path> _inputDataPaths;
-  Path _sampleRawDataPath;
-  Path _outputPath;
-
-  public DataPreprocessingHelper(List<Path> inputDataPaths, Path outputPath) {
-    _inputDataPaths = inputDataPaths;
-    _sampleRawDataPath = inputDataPaths.get(0);
-    _outputPath = outputPath;
-  }
-
-  public void registerConfigs(TableConfig tableConfig, Schema tableSchema, String partitionColumn, int numPartitions,
-      String partitionFunction, String partitionColumnDefaultNullValue, String sortingColumn,
-      FieldSpec.DataType sortingColumnType, String sortingColumnDefaultNullValue, int numOutputFiles,
-      int maxNumRecordsPerFile) {
-    _tableConfig = tableConfig;
-    _pinotTableSchema = tableSchema;
-    _partitionColumn = partitionColumn;
-    _numPartitions = numPartitions;
-    _partitionFunction = partitionFunction;
-    _partitionColumnDefaultNullValue = partitionColumnDefaultNullValue;
-
-    _sortingColumn = sortingColumn;
-    _sortingColumnType = sortingColumnType;
-    _sortingColumnDefaultNullValue = sortingColumnDefaultNullValue;
-
-    _numOutputFiles = numOutputFiles;
-    _maxNumRecordsPerFile = maxNumRecordsPerFile;
-  }
-
-  public Job setUpJob()
-      throws IOException {
-    LOGGER.info("Initializing a pre-processing job");
-    Job job = Job.getInstance(HadoopUtils.DEFAULT_CONFIGURATION);
-    Configuration jobConf = job.getConfiguration();
-    // Input and output paths.
-    int numInputPaths = _inputDataPaths.size();
-    jobConf.setInt(JobContext.NUM_MAPS, numInputPaths);
-    setValidationConfigs(job, _sampleRawDataPath);
-    for (Path inputFile : _inputDataPaths) {
-      FileInputFormat.addInputPath(job, inputFile);
-    }
-    setHadoopJobConfigs(job);
-
-    // Sorting column
-    if (_sortingColumn != null) {
-      LOGGER.info("Adding sorting column: {} to job config", _sortingColumn);
-      jobConf.set(InternalConfigConstants.SORTING_COLUMN_CONFIG, _sortingColumn);
-      jobConf.set(InternalConfigConstants.SORTING_COLUMN_TYPE, _sortingColumnType.name());
-      jobConf.set(InternalConfigConstants.SORTING_COLUMN_DEFAULT_NULL_VALUE, _sortingColumnDefaultNullValue);
-
-      switch (_sortingColumnType) {
-        case INT:
-          job.setMapOutputKeyClass(IntWritable.class);
-          break;
-        case LONG:
-          job.setMapOutputKeyClass(LongWritable.class);
-          break;
-        case FLOAT:
-          job.setMapOutputKeyClass(FloatWritable.class);
-          break;
-        case DOUBLE:
-          job.setMapOutputKeyClass(DoubleWritable.class);
-          break;
-        case STRING:
-          job.setMapOutputKeyClass(Text.class);
-          job.setSortComparatorClass(TextComparator.class);
-          break;
-        default:
-          throw new IllegalStateException();
-      }
-    } else {
-      job.setMapOutputKeyClass(NullWritable.class);
-    }
-
-    // Partition column
-    int numReduceTasks = 0;
-    if (_partitionColumn != null) {
-      numReduceTasks = _numPartitions;
-      jobConf.set(InternalConfigConstants.ENABLE_PARTITIONING, "true");
-      job.setPartitionerClass(GenericPartitioner.class);
-      jobConf.set(InternalConfigConstants.PARTITION_COLUMN_CONFIG, _partitionColumn);
-      if (_partitionFunction != null) {
-        jobConf.set(InternalConfigConstants.PARTITION_FUNCTION_CONFIG, _partitionFunction);
-      }
-      jobConf.set(InternalConfigConstants.PARTITION_COLUMN_DEFAULT_NULL_VALUE, _partitionColumnDefaultNullValue);
-      jobConf.setInt(InternalConfigConstants.NUM_PARTITIONS_CONFIG, numReduceTasks);
-    } else {
-      if (_numOutputFiles > 0) {
-        numReduceTasks = _numOutputFiles;
-      } else {
-        // default number of input paths
-        numReduceTasks = _inputDataPaths.size();
-      }
-    }
-    job.setPartitionerClass(getPartitioner());
-    // Maximum number of records per output file
-    jobConf
-        .set(InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE, Integer.toString(_maxNumRecordsPerFile));
-    // Number of reducers
-    LOGGER.info("Number of reduce tasks for pre-processing job: {}", numReduceTasks);
-    job.setNumReduceTasks(numReduceTasks);
-
-    setUpMapperReducerConfigs(job);
-
-    return job;
-  }
-
-  abstract Class<? extends Partitioner> getPartitioner();
-
-  abstract void setUpMapperReducerConfigs(Job job)
-      throws IOException;
-
-  abstract String getSampleTimeColumnValue(String timeColumnName)
-      throws IOException;
-
-  private void setValidationConfigs(Job job, Path path)
-      throws IOException {
-    SegmentsValidationAndRetentionConfig validationConfig = _tableConfig.getValidationConfig();
-
-    // TODO: Serialize and deserialize validation config by creating toJson and fromJson
-    // If the use case is an append use case, check that one time unit is contained in one file. If there is more
-    // than one,
-    // the job should be disabled, as we should not resize for these use cases. Therefore, setting the time column name
-    // and value
-    if (IngestionConfigUtils.getBatchSegmentIngestionType(_tableConfig).equalsIgnoreCase("APPEND")) {
-      job.getConfiguration().set(InternalConfigConstants.IS_APPEND, "true");
-      String timeColumnName = validationConfig.getTimeColumnName();
-      job.getConfiguration().set(InternalConfigConstants.TIME_COLUMN_CONFIG, timeColumnName);
-      if (timeColumnName != null) {
-        DateTimeFieldSpec dateTimeFieldSpec = _pinotTableSchema.getSpecForTimeColumn(timeColumnName);
-        if (dateTimeFieldSpec != null) {
-          DateTimeFormatSpec formatSpec = dateTimeFieldSpec.getFormatSpec();
-          job.getConfiguration().set(InternalConfigConstants.SEGMENT_TIME_TYPE, formatSpec.getColumnUnit().toString());
-          job.getConfiguration()
-              .set(InternalConfigConstants.SEGMENT_TIME_FORMAT, formatSpec.getTimeFormat().toString());
-          String sdfPattern = formatSpec.getSDFPattern();
-          if (sdfPattern != null) {
-            job.getConfiguration().set(InternalConfigConstants.SEGMENT_TIME_SDF_PATTERN, formatSpec.getSDFPattern());
-          }
-        }
-      }
-      job.getConfiguration().set(InternalConfigConstants.SEGMENT_PUSH_FREQUENCY,
-          IngestionConfigUtils.getBatchSegmentIngestionFrequency(_tableConfig));
-
-      String sampleTimeColumnValue = getSampleTimeColumnValue(timeColumnName);
-      if (sampleTimeColumnValue != null) {
-        job.getConfiguration().set(InternalConfigConstants.TIME_COLUMN_VALUE, sampleTimeColumnValue);
-      }
-    }
-  }
-
-  private void setHadoopJobConfigs(Job job) {
-    job.setJarByClass(HadoopSegmentPreprocessingJob.class);
-    job.setJobName(getClass().getName());
-    FileOutputFormat.setOutputPath(job, _outputPath);
-    job.getConfiguration().set(JobContext.JOB_NAME, this.getClass().getName());
-    // Turn this on to always firstly use class paths that user specifies.
-    job.getConfiguration().set(MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST, "true");
-    // Turn this off since we don't need an empty file in the output directory
-    job.getConfiguration().set(FileOutputCommitter.SUCCESSFUL_JOB_OUTPUT_DIR_MARKER, "false");
-
-    String hadoopTokenFileLocation = System.getenv(UserGroupInformation.HADOOP_TOKEN_FILE_LOCATION);
-    if (hadoopTokenFileLocation != null) {
-      job.getConfiguration().set(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY, hadoopTokenFileLocation);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelperFactory.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelperFactory.java
deleted file mode 100644
index 43ee97b7571..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelperFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.preprocess;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.List;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.hadoop.utils.preprocess.DataFileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class DataPreprocessingHelperFactory {
-  private DataPreprocessingHelperFactory() {
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(DataPreprocessingHelperFactory.class);
-
-  public static DataPreprocessingHelper generateDataPreprocessingHelper(Path inputPaths, Path outputPath)
-      throws IOException {
-    final List<Path> avroFiles = DataFileUtils.getDataFiles(inputPaths, DataFileUtils.AVRO_FILE_EXTENSION);
-    final List<Path> orcFiles = DataFileUtils.getDataFiles(inputPaths, DataFileUtils.ORC_FILE_EXTENSION);
-
-    int numAvroFiles = avroFiles.size();
-    int numOrcFiles = orcFiles.size();
-    Preconditions
-        .checkState(numAvroFiles == 0 || numOrcFiles == 0,
-            "Cannot preprocess mixed AVRO files: %s and ORC files: %s in directories: %s", avroFiles, orcFiles,
-            inputPaths);
-    Preconditions
-        .checkState(numAvroFiles > 0 || numOrcFiles > 0, "Failed to find any AVRO or ORC file in directories: %s",
-            inputPaths);
-
-    if (numAvroFiles > 0) {
-      LOGGER.info("Found AVRO files: {} in directories: {}", avroFiles, inputPaths);
-      return new AvroDataPreprocessingHelper(avroFiles, outputPath);
-    } else {
-      LOGGER.info("Found ORC files: {} in directories: {}", orcFiles, inputPaths);
-      return new OrcDataPreprocessingHelper(orcFiles, outputPath);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/OrcDataPreprocessingHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/OrcDataPreprocessingHelper.java
deleted file mode 100644
index 24c0473fe7d..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/preprocess/OrcDataPreprocessingHelper.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.preprocess;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.hadoop.mapreduce.lib.output.LazyOutputFormat;
-import org.apache.orc.OrcConf;
-import org.apache.orc.OrcFile;
-import org.apache.orc.Reader;
-import org.apache.orc.RecordReader;
-import org.apache.orc.TypeDescription;
-import org.apache.orc.mapred.OrcStruct;
-import org.apache.orc.mapred.OrcValue;
-import org.apache.orc.mapreduce.OrcInputFormat;
-import org.apache.orc.mapreduce.OrcOutputFormat;
-import org.apache.pinot.hadoop.job.mappers.OrcDataPreprocessingMapper;
-import org.apache.pinot.hadoop.job.partitioners.OrcDataPreprocessingPartitioner;
-import org.apache.pinot.hadoop.job.reducers.OrcDataPreprocessingReducer;
-import org.apache.pinot.hadoop.utils.preprocess.HadoopUtils;
-import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-
-public class OrcDataPreprocessingHelper extends DataPreprocessingHelper {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OrcDataPreprocessingHelper.class);
-
-  public OrcDataPreprocessingHelper(List<Path> inputDataPaths, Path outputPath) {
-    super(inputDataPaths, outputPath);
-  }
-
-  @Override
-  Class<? extends Partitioner> getPartitioner() {
-    return OrcDataPreprocessingPartitioner.class;
-  }
-
-  @Override
-  void setUpMapperReducerConfigs(Job job) {
-    TypeDescription orcSchema = getOrcSchema(_sampleRawDataPath);
-    String orcSchemaString = orcSchema.toString();
-    LOGGER.info("Orc schema is: {}", orcSchemaString);
-    validateConfigsAgainstSchema(orcSchema);
-
-    job.setInputFormatClass(OrcInputFormat.class);
-    job.setMapperClass(OrcDataPreprocessingMapper.class);
-    job.setMapOutputValueClass(OrcValue.class);
-    Configuration jobConf = job.getConfiguration();
-    OrcConf.MAPRED_SHUFFLE_VALUE_SCHEMA.setString(jobConf, orcSchemaString);
-
-    job.setReducerClass(OrcDataPreprocessingReducer.class);
-    // Use LazyOutputFormat to avoid creating empty files.
-    LazyOutputFormat.setOutputFormatClass(job, OrcOutputFormat.class);
-    job.setOutputKeyClass(NullWritable.class);
-    job.setOutputValueClass(OrcStruct.class);
-    OrcConf.MAPRED_OUTPUT_SCHEMA.setString(jobConf, orcSchemaString);
-  }
-
-  @Override
-  String getSampleTimeColumnValue(String timeColumnName)
-      throws IOException {
-    try (Reader reader = OrcFile
-        .createReader(_sampleRawDataPath, OrcFile.readerOptions(HadoopUtils.DEFAULT_CONFIGURATION))) {
-      Reader.Options options = new Reader.Options();
-      options.range(0, 1);
-      RecordReader records = reader.rows(options);
-      TypeDescription orcSchema = reader.getSchema();
-      VectorizedRowBatch vectorizedRowBatch = orcSchema.createRowBatch();
-
-      if (records.nextBatch(vectorizedRowBatch)) {
-        List<String> orcFields = orcSchema.getFieldNames();
-        int numFields = orcFields.size();
-        for (int i = 0; i < numFields; i++) {
-          String fieldName = orcFields.get(i);
-          if (timeColumnName.equals(fieldName)) {
-            ColumnVector columnVector = vectorizedRowBatch.cols[i];
-            TypeDescription fieldType = orcSchema.getChildren().get(i);
-            TypeDescription.Category category = fieldType.getCategory();
-            return getValue(fieldName, columnVector, category);
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  private String getValue(String field, ColumnVector columnVector, TypeDescription.Category category) {
-    switch (category) {
-      case BOOLEAN:
-        LongColumnVector longColumnVector = (LongColumnVector) columnVector;
-        if (longColumnVector.noNulls || !longColumnVector.isNull[0]) {
-          return Boolean.toString(longColumnVector.vector[0] == 1);
-        } else {
-          return null;
-        }
-      case BYTE:
-      case SHORT:
-      case INT:
-        // Extract to Integer
-        longColumnVector = (LongColumnVector) columnVector;
-        if (longColumnVector.noNulls || !longColumnVector.isNull[0]) {
-          return Integer.toString((int) longColumnVector.vector[0]);
-        } else {
-          return null;
-        }
-      case LONG:
-      case DATE:
-        // Extract to Long
-        longColumnVector = (LongColumnVector) columnVector;
-        if (longColumnVector.noNulls || !longColumnVector.isNull[0]) {
-          return Long.toString(longColumnVector.vector[0]);
-        } else {
-          return null;
-        }
-      case TIMESTAMP:
-        // Extract to Long
-        TimestampColumnVector timestampColumnVector = (TimestampColumnVector) columnVector;
-        if (timestampColumnVector.noNulls || !timestampColumnVector.isNull[0]) {
-          return Long.toString(timestampColumnVector.time[0]);
-        } else {
-          return null;
-        }
-      case FLOAT:
-        // Extract to Float
-        DoubleColumnVector doubleColumnVector = (DoubleColumnVector) columnVector;
-        if (doubleColumnVector.noNulls || !doubleColumnVector.isNull[0]) {
-          return Float.toString((float) doubleColumnVector.vector[0]);
-        } else {
-          return null;
-        }
-      case DOUBLE:
-        // Extract to Double
-        doubleColumnVector = (DoubleColumnVector) columnVector;
-        if (doubleColumnVector.noNulls || !doubleColumnVector.isNull[0]) {
-          return Double.toString(doubleColumnVector.vector[0]);
-        } else {
-          return null;
-        }
-      case STRING:
-      case VARCHAR:
-      case CHAR:
-        // Extract to String
-        BytesColumnVector bytesColumnVector = (BytesColumnVector) columnVector;
-        if (bytesColumnVector.noNulls || !bytesColumnVector.isNull[0]) {
-          int length = bytesColumnVector.length[0];
-          return new String(bytesColumnVector.vector[0], bytesColumnVector.start[0], length, UTF_8);
-        } else {
-          return null;
-        }
-      case BINARY:
-        // Extract to byte[]
-        bytesColumnVector = (BytesColumnVector) columnVector;
-        if (bytesColumnVector.noNulls || !bytesColumnVector.isNull[0]) {
-          int length = bytesColumnVector.length[0];
-          byte[] bytes = new byte[length];
-          System.arraycopy(bytesColumnVector.vector[0], bytesColumnVector.start[0], bytes, 0, length);
-          return new String(bytes, StandardCharsets.UTF_8);
-        } else {
-          return null;
-        }
-      default:
-        // Unsupported types
-        throw new IllegalStateException("Unsupported field type: " + category + " for field: " + field);
-    }
-  }
-
-  /**
-   * Finds the orc file and return its orc schema.
-   */
-  private TypeDescription getOrcSchema(Path orcFile) {
-    TypeDescription orcSchema;
-    try (Reader reader = OrcFile.createReader(orcFile, OrcFile.readerOptions(HadoopUtils.DEFAULT_CONFIGURATION))) {
-      orcSchema = reader.getSchema();
-    } catch (Exception e) {
-      throw new IllegalStateException("Caught exception while extracting ORC schema from file: " + orcFile, e);
-    }
-    return orcSchema;
-  }
-
-  private void validateConfigsAgainstSchema(TypeDescription schema) {
-    List<String> fieldNames = schema.getFieldNames();
-    if (_partitionColumn != null) {
-      Preconditions.checkArgument(fieldNames.contains(_partitionColumn),
-          String.format("Partition column: %s is not found from the schema of input files.", _partitionColumn));
-      Preconditions.checkArgument(_numPartitions > 0,
-          String.format("Number of partitions should be positive. Current value: %s", _numPartitions));
-      Preconditions.checkArgument(_partitionFunction != null, "Partition function should not be null!");
-      try {
-        PartitionFunctionFactory.PartitionFunctionType.fromString(_partitionFunction);
-      } catch (IllegalArgumentException e) {
-        LOGGER.error("Partition function needs to be one of Modulo, Murmur, ByteArray, HashCode, it is currently {}",
-            _partitionColumn);
-        throw new IllegalArgumentException(e);
-      }
-    }
-    if (_sortingColumn != null) {
-      Preconditions
-          .checkArgument(fieldNames.contains(_sortingColumn),
-              String.format("Sorted column: %s is not found from the schema of input files.", _sortingColumn));
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/AvroDataPreprocessingReducer.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/AvroDataPreprocessingReducer.java
deleted file mode 100644
index 62ed4a3a73b..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/AvroDataPreprocessingReducer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.reducers;
-
-import java.io.IOException;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.mapred.AvroKey;
-import org.apache.avro.mapred.AvroValue;
-import org.apache.avro.mapreduce.AvroMultipleOutputs;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AvroDataPreprocessingReducer<T>
-    extends Reducer<T, AvroValue<GenericRecord>, AvroKey<GenericRecord>, NullWritable> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(AvroDataPreprocessingReducer.class);
-
-  private AvroMultipleOutputs _multipleOutputs;
-  private long _numRecords;
-  private int _maxNumRecordsPerFile;
-  private String _filePrefix;
-
-  @Override
-  public void setup(Context context) {
-    Configuration configuration = context.getConfiguration();
-    // If it's 0, the output file won't be split into multiple files.
-    // If not, output file will be split when the number of records reaches this number.
-    _maxNumRecordsPerFile = configuration.getInt(InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE, 0);
-    if (_maxNumRecordsPerFile > 0) {
-      LOGGER.info("Using multiple outputs strategy.");
-      _multipleOutputs = new AvroMultipleOutputs(context);
-      _numRecords = 0L;
-      _filePrefix = RandomStringUtils.randomAlphanumeric(4);
-      LOGGER.info("Initialized AvroDataPreprocessingReducer with maxNumRecordsPerFile: {}", _maxNumRecordsPerFile);
-    } else {
-      LOGGER.info("Initialized AvroDataPreprocessingReducer without limit on maxNumRecordsPerFile");
-    }
-  }
-
-  @Override
-  public void reduce(final T inputRecord, final Iterable<AvroValue<GenericRecord>> values, final Context context)
-      throws IOException, InterruptedException {
-    if (_maxNumRecordsPerFile > 0) {
-      for (final AvroValue<GenericRecord> value : values) {
-        String fileName = _filePrefix + (_numRecords++ / _maxNumRecordsPerFile);
-        _multipleOutputs.write(new AvroKey<>(value.datum()), NullWritable.get(), fileName);
-      }
-    } else {
-      for (final AvroValue<GenericRecord> value : values) {
-        context.write(new AvroKey<>(value.datum()), NullWritable.get());
-      }
-    }
-  }
-
-  @Override
-  public void cleanup(Context context)
-      throws IOException, InterruptedException {
-    LOGGER.info("Clean up reducer.");
-    if (_multipleOutputs != null) {
-      _multipleOutputs.close();
-      _multipleOutputs = null;
-    }
-    LOGGER.info("Finished cleaning up reducer.");
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/OrcDataPreprocessingReducer.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/OrcDataPreprocessingReducer.java
deleted file mode 100644
index a3387a2e974..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/job/reducers/OrcDataPreprocessingReducer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.reducers;
-
-import java.io.IOException;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.hadoop.mapreduce.lib.output.MultipleOutputs;
-import org.apache.orc.mapred.OrcStruct;
-import org.apache.orc.mapred.OrcValue;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class OrcDataPreprocessingReducer extends Reducer<WritableComparable, OrcValue, NullWritable, OrcStruct> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(OrcDataPreprocessingReducer.class);
-
-  private int _maxNumRecordsPerFile;
-  private MultipleOutputs<NullWritable, OrcStruct> _multipleOutputs;
-  private long _numRecords;
-  private String _filePrefix;
-
-  @Override
-  public void setup(Context context) {
-    Configuration configuration = context.getConfiguration();
-    // If it's 0, the output file won't be split into multiple files.
-    // If not, output file will be split when the number of records reaches this number.
-    _maxNumRecordsPerFile = configuration.getInt(InternalConfigConstants.PREPROCESSING_MAX_NUM_RECORDS_PER_FILE, 0);
-    if (_maxNumRecordsPerFile > 0) {
-      LOGGER.info("Using multiple outputs strategy.");
-      _multipleOutputs = new MultipleOutputs<>(context);
-      _numRecords = 0L;
-      _filePrefix = RandomStringUtils.randomAlphanumeric(4);
-      LOGGER.info("Initialized OrcDataPreprocessingReducer with maxNumRecordsPerFile: {}", _maxNumRecordsPerFile);
-    } else {
-      LOGGER.info("Initialized OrcDataPreprocessingReducer without limit on maxNumRecordsPerFile");
-    }
-  }
-
-  @Override
-  public void reduce(WritableComparable key, Iterable<OrcValue> values, Context context)
-      throws IOException, InterruptedException {
-    if (_maxNumRecordsPerFile > 0) {
-      for (final OrcValue value : values) {
-        String fileName = _filePrefix + (_numRecords++ / _maxNumRecordsPerFile);
-        _multipleOutputs.write(NullWritable.get(), (OrcStruct) value.value, fileName);
-      }
-    } else {
-      for (final OrcValue value : values) {
-        context.write(NullWritable.get(), (OrcStruct) value.value);
-      }
-    }
-  }
-
-  @Override
-  public void cleanup(Context context)
-      throws IOException, InterruptedException {
-    LOGGER.info("Clean up reducer.");
-    if (_multipleOutputs != null) {
-      _multipleOutputs.close();
-      _multipleOutputs = null;
-    }
-    LOGGER.info("Finished cleaning up reducer.");
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java
deleted file mode 100644
index b8a47363ed7..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/PinotHadoopJobPreparationHelper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.utils;
-
-import java.io.IOException;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.Job;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class PinotHadoopJobPreparationHelper {
-  private PinotHadoopJobPreparationHelper() {
-  }
-
-  private static final Logger _logger = LoggerFactory.getLogger(PinotHadoopJobPreparationHelper.class);
-
-  public static void addDepsJarToDistributedCacheHelper(FileSystem fileSystem, Job job, Path depsJarDir)
-      throws IOException {
-    FileStatus[] fileStatuses = fileSystem.listStatus(depsJarDir);
-    for (FileStatus fileStatus : fileStatuses) {
-      if (fileStatus.isDirectory()) {
-        addDepsJarToDistributedCacheHelper(fileSystem, job, fileStatus.getPath());
-      } else {
-        Path depJarPath = fileStatus.getPath();
-        if (depJarPath.getName().endsWith(".jar")) {
-          _logger.info("Adding deps jar: {} to distributed cache", depJarPath);
-          job.addCacheArchive(depJarPath.toUri());
-        }
-      }
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/DataFileUtils.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/DataFileUtils.java
deleted file mode 100644
index 58e1c1d70cc..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/DataFileUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.utils.preprocess;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.Path;
-
-
-public class DataFileUtils {
-  private DataFileUtils() {
-  }
-
-  public static final String AVRO_FILE_EXTENSION = ".avro";
-  public static final String ORC_FILE_EXTENSION = ".orc";
-
-  /**
-   * Returns the data files under the input directory with the given file extension.
-   */
-  public static List<Path> getDataFiles(Path inputDir, String dataFileExtension)
-      throws IOException {
-    FileStatus fileStatus = HadoopUtils.DEFAULT_FILE_SYSTEM.getFileStatus(inputDir);
-    Preconditions.checkState(fileStatus.isDirectory(), "Path: %s is not a directory", inputDir);
-    List<Path> dataFiles = new ArrayList<>();
-    getDataFilesHelper(HadoopUtils.DEFAULT_FILE_SYSTEM.listStatus(inputDir), dataFileExtension, dataFiles);
-    return dataFiles;
-  }
-
-  private static void getDataFilesHelper(FileStatus[] fileStatuses, String dataFileExtension, List<Path> dataFiles)
-      throws IOException {
-    for (FileStatus fileStatus : fileStatuses) {
-      Path path = fileStatus.getPath();
-      if (fileStatus.isDirectory()) {
-        getDataFilesHelper(HadoopUtils.DEFAULT_FILE_SYSTEM.listStatus(path), dataFileExtension, dataFiles);
-      } else {
-        Preconditions.checkState(fileStatus.isFile(), "Path: %s is neither a directory nor a file", path);
-        if (path.getName().endsWith(dataFileExtension)) {
-          dataFiles.add(path);
-        }
-      }
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/DataPreprocessingUtils.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/DataPreprocessingUtils.java
deleted file mode 100644
index 1998399f3d9..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/DataPreprocessingUtils.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.utils.preprocess;
-
-import java.util.Set;
-import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.io.FloatWritable;
-import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.pinot.spi.data.FieldSpec;
-
-
-public class DataPreprocessingUtils {
-  private DataPreprocessingUtils() {
-  }
-
-  /**
-   * Converts a value into {@link WritableComparable} based on the given data type.
-   * <p>NOTE: The passed in value must be either a Number or a String.
-   */
-  public static WritableComparable convertToWritableComparable(Object value, FieldSpec.DataType dataType) {
-    if (value instanceof Number) {
-      Number numberValue = (Number) value;
-      switch (dataType) {
-        case INT:
-          return new IntWritable(numberValue.intValue());
-        case LONG:
-          return new LongWritable(numberValue.longValue());
-        case FLOAT:
-          return new FloatWritable(numberValue.floatValue());
-        case DOUBLE:
-          return new DoubleWritable(numberValue.doubleValue());
-        case STRING:
-          return new Text(numberValue.toString());
-        default:
-          throw new IllegalArgumentException("Unsupported data type: " + dataType);
-      }
-    } else if (value instanceof String) {
-      String stringValue = (String) value;
-      switch (dataType) {
-        case INT:
-          return new IntWritable(Integer.parseInt(stringValue));
-        case LONG:
-          return new LongWritable(Long.parseLong(stringValue));
-        case FLOAT:
-          return new FloatWritable(Float.parseFloat(stringValue));
-        case DOUBLE:
-          return new DoubleWritable(Double.parseDouble(stringValue));
-        case STRING:
-          return new Text(stringValue);
-        default:
-          throw new IllegalArgumentException("Unsupported data type: " + dataType);
-      }
-    } else {
-      throw new IllegalArgumentException(
-          String.format("Value: %s must be either a Number or a String, found: %s", value, value.getClass()));
-    }
-  }
-
-  public static void getOperations(Set<Operation> operationSet, String preprocessingOperationsString) {
-    String[] preprocessingOpsArray = preprocessingOperationsString.split(",");
-    for (String preprocessingOps : preprocessingOpsArray) {
-      String trimmedOps = preprocessingOps.trim().toUpperCase();
-      if (!trimmedOps.isEmpty()) {
-        operationSet.add(Operation.getOperation(trimmedOps));
-      }
-    }
-  }
-
-  public enum Operation {
-    PARTITION, SORT, RESIZE;
-
-    public static Operation getOperation(String operationString) {
-      for (Operation operation : Operation.values()) {
-        if (operation.name().equals(operationString)) {
-          return operation;
-        }
-      }
-      throw new IllegalArgumentException("Unsupported data preprocessing operation: " + operationString);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/OrcUtils.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/OrcUtils.java
deleted file mode 100644
index dcfc3b5e5ae..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/OrcUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.utils.preprocess;
-
-import org.apache.hadoop.hive.serde2.io.DateWritable;
-import org.apache.hadoop.io.BooleanWritable;
-import org.apache.hadoop.io.ByteWritable;
-import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.io.FloatWritable;
-import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.ShortWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.orc.mapred.OrcTimestamp;
-
-
-public class OrcUtils {
-  private OrcUtils() {
-  }
-
-  /**
-   * Converts the ORC value into Number or String.
-   * <p>The following ORC types are supported:
-   * <ul>
-   *   <li>IntWritable -> Integer</li>
-   *   <li>LongWritable -> Long</li>
-   *   <li>FloatWritable -> Float</li>
-   *   <li>DoubleWritable -> Double</li>
-   *   <li>Text -> String</li>
-   *   <li>BooleanWritable -> String</li>
-   *   <li>ByteWritable -> Byte</li>
-   *   <li>ShortWritable -> Short</li>
-   *   <li>DateWritable -> Long</li>
-   *   <li>OrcTimestamp -> Long</li>
-   * </ul>
-   */
-  public static Object convert(WritableComparable orcValue) {
-    if (orcValue instanceof IntWritable) {
-      return ((IntWritable) orcValue).get();
-    }
-    if (orcValue instanceof LongWritable) {
-      return ((LongWritable) orcValue).get();
-    }
-    if (orcValue instanceof FloatWritable) {
-      return ((FloatWritable) orcValue).get();
-    }
-    if (orcValue instanceof DoubleWritable) {
-      return ((DoubleWritable) orcValue).get();
-    }
-    if (orcValue instanceof Text) {
-      return orcValue.toString();
-    }
-    if (orcValue instanceof BooleanWritable) {
-      return Boolean.toString(((BooleanWritable) orcValue).get());
-    }
-    if (orcValue instanceof ByteWritable) {
-      return ((ByteWritable) orcValue).get();
-    }
-    if (orcValue instanceof ShortWritable) {
-      return ((ShortWritable) orcValue).get();
-    }
-    if (orcValue instanceof DateWritable) {
-      return ((DateWritable) orcValue).get().getTime();
-    }
-    if (orcValue instanceof OrcTimestamp) {
-      return ((OrcTimestamp) orcValue).getTime();
-    }
-    throw new IllegalArgumentException(
-        String.format("Illegal ORC value: %s, class: %s", orcValue, orcValue.getClass()));
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/data/IngestionSchemaValidatorTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/data/IngestionSchemaValidatorTest.java
deleted file mode 100644
index 06832d0b3fa..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/data/IngestionSchemaValidatorTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.data;
-
-import com.google.common.base.Preconditions;
-import java.io.File;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.IngestionSchemaValidator;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.SchemaValidatorFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class IngestionSchemaValidatorTest {
-
-  @Test
-  public void testAvroIngestionSchemaValidatorForSingleValueColumns()
-      throws Exception {
-    String inputFilePath =
-        new File(Preconditions
-            .checkNotNull(IngestionSchemaValidatorTest.class.getClassLoader().getResource("data/test_sample_data.avro"))
-            .getFile())
-            .toString();
-    String recordReaderClassName = "org.apache.pinot.plugin.inputformat.avro.AvroRecordReader";
-
-    Schema pinotSchema =
-        new Schema.SchemaBuilder().addSingleValueDimension("column1", FieldSpec.DataType.LONG)
-            .addSingleValueDimension("column2", FieldSpec.DataType.INT)
-            .addSingleValueDimension("column3", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("column7", FieldSpec.DataType.STRING)
-            .addMetric("met_impressionCount", FieldSpec.DataType.LONG).build();
-
-    IngestionSchemaValidator ingestionSchemaValidator =
-        SchemaValidatorFactory.getSchemaValidator(pinotSchema, recordReaderClassName, inputFilePath);
-    Assert.assertNotNull(ingestionSchemaValidator);
-    Assert.assertFalse(ingestionSchemaValidator.getDataTypeMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getMultiValueStructureMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getMissingPinotColumnResult().isMismatchDetected());
-
-    // Adding one extra column
-    pinotSchema =
-        new Schema.SchemaBuilder().addSingleValueDimension("column1", FieldSpec.DataType.LONG)
-            .addSingleValueDimension("column2", FieldSpec.DataType.INT)
-            .addSingleValueDimension("column3", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("extra_column", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("column7", FieldSpec.DataType.STRING)
-            .addMetric("met_impressionCount", FieldSpec.DataType.LONG).build();
-
-    ingestionSchemaValidator =
-        SchemaValidatorFactory.getSchemaValidator(pinotSchema, recordReaderClassName, inputFilePath);
-    Assert.assertNotNull(ingestionSchemaValidator);
-    Assert.assertFalse(ingestionSchemaValidator.getDataTypeMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getMultiValueStructureMismatchResult().isMismatchDetected());
-    Assert.assertTrue(ingestionSchemaValidator.getMissingPinotColumnResult().isMismatchDetected());
-    Assert.assertNotNull(ingestionSchemaValidator.getMissingPinotColumnResult().getMismatchReason());
-
-    // Change the data type of column1 from LONG to STRING
-    pinotSchema =
-        new Schema.SchemaBuilder().addSingleValueDimension("column1", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("column2", FieldSpec.DataType.INT)
-            .addSingleValueDimension("column3", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("column7", FieldSpec.DataType.STRING)
-            .addMetric("met_impressionCount", FieldSpec.DataType.LONG).build();
-    ingestionSchemaValidator =
-        SchemaValidatorFactory.getSchemaValidator(pinotSchema, recordReaderClassName, inputFilePath);
-    Assert.assertNotNull(ingestionSchemaValidator);
-    Assert.assertTrue(ingestionSchemaValidator.getDataTypeMismatchResult().isMismatchDetected());
-    Assert.assertNotNull(ingestionSchemaValidator.getDataTypeMismatchResult().getMismatchReason());
-    Assert.assertFalse(ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getMultiValueStructureMismatchResult().isMismatchDetected());
-    Assert.assertFalse(ingestionSchemaValidator.getMissingPinotColumnResult().isMismatchDetected());
-
-    // Change column2 from single-value column to multi-value column
-    pinotSchema =
-        new Schema.SchemaBuilder().addSingleValueDimension("column1", FieldSpec.DataType.LONG)
-            .addMultiValueDimension("column2", FieldSpec.DataType.INT)
-            .addSingleValueDimension("column3", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("column7", FieldSpec.DataType.STRING)
-            .addMetric("met_impressionCount", FieldSpec.DataType.LONG).build();
-    ingestionSchemaValidator =
-        SchemaValidatorFactory.getSchemaValidator(pinotSchema, recordReaderClassName, inputFilePath);
-    Assert.assertNotNull(ingestionSchemaValidator);
-    Assert.assertFalse(ingestionSchemaValidator.getDataTypeMismatchResult().isMismatchDetected());
-    Assert.assertTrue(ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().isMismatchDetected());
-    Assert.assertNotNull(ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().getMismatchReason());
-    Assert.assertTrue(ingestionSchemaValidator.getMultiValueStructureMismatchResult().isMismatchDetected());
-    Assert.assertNotNull(ingestionSchemaValidator.getMultiValueStructureMismatchResult().getMismatchReason());
-    Assert.assertFalse(ingestionSchemaValidator.getMissingPinotColumnResult().isMismatchDetected());
-  }
-
-  @Test
-  public void testAvroIngestionValidatorForMultiValueColumns()
-      throws Exception {
-    String inputFilePath = new File(
-        Preconditions.checkNotNull(
-            IngestionSchemaValidatorTest.class.getClassLoader().getResource("data/test_sample_data_multi_value.avro"))
-            .getFile())
-        .toString();
-    String recordReaderClassName = "org.apache.pinot.plugin.inputformat.avro.AvroRecordReader";
-
-    // column 2 is of int type in the AVRO.
-    // column3 and column16 are both of array of map structure.
-    // metric_not_found doesn't exist in input AVRO
-    Schema pinotSchema =
-        new Schema.SchemaBuilder().addSingleValueDimension("column1", FieldSpec.DataType.STRING)
-            .addSingleValueDimension("column2", FieldSpec.DataType.LONG)
-            .addSingleValueDimension("column3", FieldSpec.DataType.STRING)
-            .addMultiValueDimension("column16", FieldSpec.DataType.STRING)
-            .addMetric("metric_not_found", FieldSpec.DataType.LONG)
-            .addMetric("metric_nus_impressions", FieldSpec.DataType.LONG).build();
-
-    IngestionSchemaValidator ingestionSchemaValidator =
-        SchemaValidatorFactory.getSchemaValidator(pinotSchema, recordReaderClassName, inputFilePath);
-    Assert.assertNotNull(ingestionSchemaValidator);
-    Assert.assertTrue(ingestionSchemaValidator.getDataTypeMismatchResult().isMismatchDetected());
-    Assert.assertTrue(ingestionSchemaValidator.getSingleValueMultiValueFieldMismatchResult().isMismatchDetected());
-    Assert.assertTrue(ingestionSchemaValidator.getMultiValueStructureMismatchResult().isMismatchDetected());
-    Assert.assertTrue(ingestionSchemaValidator.getMissingPinotColumnResult().isMismatchDetected());
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java
deleted file mode 100644
index 35ae1475fa1..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/DeleteExtraPushedSegmentsTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentTarPushJob;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-/**
- * Tests logic to delete extra segments within the same time unit for APPEND or extra segments during REFRESH cases.
- */
-public class DeleteExtraPushedSegmentsTest {
-  Properties _defaultProperties = new Properties();
-
-  @BeforeClass
-  private void setup() {
-    _defaultProperties.setProperty(JobConfigConstants.PUSH_TO_HOSTS, "sample_host");
-    _defaultProperties.setProperty(JobConfigConstants.PUSH_TO_PORT, "1234");
-    _defaultProperties.setProperty(JobConfigConstants.PATH_TO_OUTPUT, "sample_output_path");
-    _defaultProperties.setProperty(JobConfigConstants.SEGMENT_TABLE_NAME, "myTable");
-  }
-
-  @Test
-  public void checkDelete() {
-    List<String> allSegmentsInCluster = new ArrayList<>();
-    allSegmentsInCluster.add("mytable_2018-09-10_2018-09-10_0");
-    allSegmentsInCluster.add("mytable_2018-09-10_2018-09-10_1");
-    allSegmentsInCluster.add("mytable_2018-09-10_2018-09-10_2");
-
-    List<Path> currentSegments = new ArrayList<>();
-    currentSegments.add(new Path("mytable_2018-09-10_2018-09-10_0"));
-    SegmentTarPushJob segmentTarPushJob = new SegmentTarPushJob(_defaultProperties);
-    List<String> segmentsToDelete = segmentTarPushJob.getSegmentsToDelete(allSegmentsInCluster, currentSegments);
-    Assert.assertEquals(segmentsToDelete.size(), 2);
-    Assert.assertFalse(segmentsToDelete.contains("mytable_2018-09-10_2018-09-10_0"));
-  }
-
-  @Test
-  public void checkDeleteWithRefresh() {
-    List<String> allSegmentsInCluster = new ArrayList<>();
-    allSegmentsInCluster.add("mytable_0");
-    allSegmentsInCluster.add("mytable_1");
-    allSegmentsInCluster.add("mytable_2");
-
-    List<Path> currentSegments = new ArrayList<>();
-    currentSegments.add(new Path("mytable_0"));
-    SegmentTarPushJob segmentTarPushJob = new SegmentTarPushJob(_defaultProperties);
-    List<String> segmentsToDelete = segmentTarPushJob.getSegmentsToDelete(allSegmentsInCluster, currentSegments);
-    Assert.assertEquals(segmentsToDelete.size(), 2);
-    Assert.assertFalse(segmentsToDelete.contains("mytable_0"));
-  }
-
-  @Test
-  public void checkDeleteWithDoubleDigitSequenceIds() {
-    List<String> allSegmentsInCluster = new ArrayList<>();
-    allSegmentsInCluster.add("mytable_02");
-    allSegmentsInCluster.add("mytable_12");
-    allSegmentsInCluster.add("mytable_23");
-
-    List<Path> currentSegments = new ArrayList<>();
-    currentSegments.add(new Path("mytable_02"));
-    SegmentTarPushJob segmentTarPushJob = new SegmentTarPushJob(_defaultProperties);
-    List<String> segmentsToDelete = segmentTarPushJob.getSegmentsToDelete(allSegmentsInCluster, currentSegments);
-    Assert.assertEquals(segmentsToDelete.size(), 2);
-    Assert.assertFalse(segmentsToDelete.contains("mytable_02"));
-  }
-
-  @Test
-  public void checkDeleteWithoutSequenceIds() {
-    List<String> allSegmentsInCluster = new ArrayList<>();
-    allSegmentsInCluster.add("mytable");
-
-    List<Path> currentSegments = new ArrayList<>();
-    currentSegments.add(new Path("mytable"));
-    SegmentTarPushJob segmentTarPushJob = new SegmentTarPushJob(_defaultProperties);
-    List<String> segmentsToDelete = segmentTarPushJob.getSegmentsToDelete(allSegmentsInCluster, currentSegments);
-    Assert.assertEquals(segmentsToDelete.size(), 0);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java
deleted file mode 100644
index 79142b3a2a0..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/io/PinotOutputFormatTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.io;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.pinot.common.utils.TarGzCompressionUtils;
-import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.data.readers.RecordReader;
-import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-
-
-public class PinotOutputFormatTest {
-  private static final File TEMP_DIR = new File(FileUtils.getTempDirectory(), "PinotOutputFormatTest");
-  private static final String RAW_TABLE_NAME = "testTable";
-
-  @BeforeClass
-  public void setUp() {
-    FileUtils.deleteQuietly(TEMP_DIR);
-  }
-
-  @AfterClass
-  public void tearDown()
-      throws IOException {
-    FileUtils.forceDelete(TEMP_DIR);
-  }
-
-  @Test
-  public void testPinotOutputFormat()
-      throws Exception {
-    Job job = Job.getInstance();
-    File outputDir = new File(TEMP_DIR, "output");
-    File tempSegmentDir = new File(TEMP_DIR, "tempSegment");
-    PinotOutputFormat.setOutputPath(job, new Path(outputDir.getAbsolutePath()));
-    PinotOutputFormat.setTempSegmentDir(job, tempSegmentDir.getAbsolutePath());
-    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).build();
-    PinotOutputFormat.setTableConfig(job, tableConfig);
-    Schema schema =
-        new Schema.SchemaBuilder().setSchemaName(RAW_TABLE_NAME).addSingleValueDimension("id", FieldSpec.DataType.INT)
-            .addSingleValueDimension("name", FieldSpec.DataType.STRING).addMetric("salary", FieldSpec.DataType.INT)
-            .build();
-    PinotOutputFormat.setSchema(job, schema);
-    PinotOutputFormat.setFieldExtractorClass(job, JsonBasedFieldExtractor.class);
-
-    TaskAttemptContext taskAttemptContext = mock(TaskAttemptContext.class);
-    when(taskAttemptContext.getConfiguration()).thenReturn(job.getConfiguration());
-    PinotRecordWriter<Employee> pinotRecordWriter = PinotOutputFormat.getPinotRecordWriter(taskAttemptContext);
-    int numRecords = 10;
-    List<Employee> records = new ArrayList<>();
-    for (int i = 0; i < numRecords; i++) {
-      Employee employee = new Employee(i, "name" + i, 1000 * i);
-      pinotRecordWriter.write(null, employee);
-      records.add(employee);
-    }
-    pinotRecordWriter.close(taskAttemptContext);
-
-    String segmentName = RAW_TABLE_NAME + "_0";
-    File segmentDir = new File(TEMP_DIR, "segment");
-    File indexDir = TarGzCompressionUtils
-        .untar(new File(outputDir, segmentName + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION), segmentDir).get(0);
-    RecordReader recordReader = new PinotSegmentRecordReader(indexDir, null, null);
-    for (Employee record : records) {
-      GenericRow row = recordReader.next();
-      assertEquals(row.getValue("id"), record.getId());
-      assertEquals(row.getValue("name"), record.getName());
-      assertEquals(row.getValue("salary"), record.getSalary());
-    }
-    assertFalse(recordReader.hasNext());
-  }
-
-  public static class Employee {
-    private final int _id;
-    private final String _name;
-    private final int _salary;
-
-    private Employee(int id, String name, int salary) {
-      _id = id;
-      _name = name;
-      _salary = salary;
-    }
-
-    public int getId() {
-      return _id;
-    }
-
-    public String getName() {
-      return _name;
-    }
-
-    public int getSalary() {
-      return _salary;
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java
deleted file mode 100644
index 75aa50b4a03..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/mappers/SegmentCreationTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.mappers;
-
-import java.net.URI;
-import org.apache.hadoop.fs.Path;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class SegmentCreationTest {
-
-  @Test
-  public void testBootstrapOutputPath() {
-    URI baseDir = new Path("/path/to/input").toUri();
-    URI inputFile = new Path("/path/to/input/a/b/c/d/e").toUri();
-    Path outputPath = new Path("/path/to/output");
-    Path relativeOutputPath = SegmentCreationMapper.getRelativeOutputPath(baseDir, inputFile, outputPath);
-    Assert.assertEquals(relativeOutputPath.toString(), "/path/to/output/a/b/c/d");
-  }
-
-  @Test
-  public void testBootstrapOutputPath1() {
-    URI baseDir = new Path("/path/to/input/*/*.avro").toUri();
-    URI inputFile = new Path("/path/to/input/a/b.avro").toUri();
-    Path outputPath = new Path("/path/to/output");
-    Assert.assertThrows(() -> SegmentCreationMapper.getRelativeOutputPath(baseDir, inputFile, outputPath));
-  }
-
-  @Test
-  public void testBootstrapOutputPathS3() {
-    URI baseDir = new Path("s3a://sample-s3-bucket/tmp/pinot/input").toUri();
-    URI inputFile = new Path("s3a://sample-s3-bucket/tmp/pinot/input/airlineStats_data.avro").toUri();
-    Path outputPath = new Path("s3a://sample-s3-bucket/tmp/pinot/output");
-    Path relativeOutputPath = SegmentCreationMapper.getRelativeOutputPath(baseDir, inputFile, outputPath);
-    Assert.assertEquals(relativeOutputPath.toString(), "s3a://sample-s3-bucket/tmp/pinot/output");
-
-    baseDir = new Path("s3a://sample-s3-bucket/tmp/pinot/input").toUri();
-    inputFile = new Path("s3a://sample-s3-bucket/tmp/pinot/input/yyyy=2019/mm=10/dd=18/airlineStats_data.avro").toUri();
-    outputPath = new Path("s3a://sample-s3-bucket/tmp/pinot/output");
-    relativeOutputPath = SegmentCreationMapper.getRelativeOutputPath(baseDir, inputFile, outputPath);
-    Assert.assertEquals(relativeOutputPath.toString(), "s3a://sample-s3-bucket/tmp/pinot/output/yyyy=2019/mm=10/dd=18");
-  }
-
-  @Test
-  public void testBootstrapOutputPathHdfs() {
-    URI baseDir = new Path("hdfs://raw-data/tmp/pinot/input").toUri();
-    URI inputFile = new Path("hdfs://raw-data/tmp/pinot/input/airlineStats_data.avro").toUri();
-    Path outputPath = new Path("hdfs://raw-data/tmp/pinot/output");
-    Path relativeOutputPath = SegmentCreationMapper.getRelativeOutputPath(baseDir, inputFile, outputPath);
-    Assert.assertEquals(relativeOutputPath.toString(), "hdfs://raw-data/tmp/pinot/output");
-
-    baseDir = new Path("hdfs://raw-data/tmp/pinot/input").toUri();
-    inputFile = new Path("hdfs://raw-data/tmp/pinot/input/yyyy=2019/mm=10/dd=18/airlineStats_data.avro").toUri();
-    outputPath = new Path("hdfs://raw-data/tmp/pinot/output");
-    relativeOutputPath = SegmentCreationMapper.getRelativeOutputPath(baseDir, inputFile, outputPath);
-    Assert.assertEquals(relativeOutputPath.toString(), "hdfs://raw-data/tmp/pinot/output/yyyy=2019/mm=10/dd=18");
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelperTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelperTest.java
deleted file mode 100644
index db2e811c937..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/java/org/apache/pinot/hadoop/job/preprocess/DataPreprocessingHelperTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.hadoop.job.preprocess;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.pinot.hadoop.job.InternalConfigConstants;
-import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.config.table.ingestion.BatchIngestionConfig;
-import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-
-public class DataPreprocessingHelperTest {
-
-  @Test
-  public void testDataPreprocessingHelper()
-      throws IOException {
-    List<Path> inputPaths = new ArrayList<>();
-    String pathString = Preconditions
-        .checkNotNull(DataPreprocessingHelperTest.class.getClassLoader().getResource("data/test_sample_data.avro"))
-        .getPath();
-    inputPaths.add(new Path(pathString));
-    Path outputPath = new Path("mockOutputPath");
-    DataPreprocessingHelper dataPreprocessingHelper = new AvroDataPreprocessingHelper(inputPaths, outputPath);
-
-    IngestionConfig ingestionConfig = new IngestionConfig();
-    ingestionConfig.setBatchIngestionConfig(new BatchIngestionConfig(null, "APPEND", "DAILY"));
-
-    TableConfig tableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName("testTableName").setIngestionConfig(ingestionConfig)
-            .build();
-    SegmentsValidationAndRetentionConfig segmentsValidationAndRetentionConfig =
-        new SegmentsValidationAndRetentionConfig();
-    segmentsValidationAndRetentionConfig.setTimeColumnName("time_day");
-    segmentsValidationAndRetentionConfig.setTimeType("MILLISECONDS");
-    tableConfig.setValidationConfig(segmentsValidationAndRetentionConfig);
-
-    Schema schema = new Schema.SchemaBuilder()
-        .addDateTime("time_day", FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS").build();
-    dataPreprocessingHelper.registerConfigs(tableConfig, schema, "column2", 1, "Murmur", "0", "column4",
-        FieldSpec.DataType.INT, "0", 0, 0);
-
-    Job job = dataPreprocessingHelper.setUpJob();
-    Configuration conf = job.getConfiguration();
-    assertNotNull(job);
-    assertNull(conf.get(InternalConfigConstants.SEGMENT_TIME_SDF_PATTERN));
-
-    // Validate partitioning configs.
-    assertEquals(conf.get(InternalConfigConstants.PARTITION_COLUMN_CONFIG), "column2");
-    assertEquals(conf.get(InternalConfigConstants.PARTITION_FUNCTION_CONFIG), "Murmur");
-    assertEquals(conf.get(InternalConfigConstants.NUM_PARTITIONS_CONFIG), "1");
-    assertEquals(conf.get(InternalConfigConstants.PARTITION_COLUMN_DEFAULT_NULL_VALUE), "0");
-
-    // Validate sorting configs.
-    assertEquals(conf.get(InternalConfigConstants.SORTING_COLUMN_CONFIG), "column4");
-    assertEquals(conf.get(InternalConfigConstants.SORTING_COLUMN_TYPE), "INT");
-    assertEquals(conf.get(InternalConfigConstants.SORTING_COLUMN_DEFAULT_NULL_VALUE), "0");
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/resources/data/test_sample_data.avro b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/resources/data/test_sample_data.avro
deleted file mode 100644
index 6053058009e..00000000000
Binary files a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/resources/data/test_sample_data.avro and /dev/null differ
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/resources/data/test_sample_data_multi_value.avro b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/resources/data/test_sample_data_multi_value.avro
deleted file mode 100644
index bbbb73a278c..00000000000
Binary files a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/test/resources/data/test_sample_data_multi_value.avro and /dev/null differ
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml
deleted file mode 100644
index e0dfa33adcf..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>v0_deprecated</artifactId>
-    <groupId>org.apache.pinot</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-
-  <artifactId>pinot-ingestion-common</artifactId>
-  <name>Pinot Ingestion Common</name>
-  <url>https://pinot.apache.org/</url>
-  <repositories>
-    <repository>
-      <id>confluent</id>
-      <url>https://packages.confluent.io/maven/</url>
-    </repository>
-  </repositories>
-  <properties>
-    <pinot.root>${basedir}/../../../..</pinot.root>
-    <phase.prop>package</phase.prop>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math3</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-parquet</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.paranamer</groupId>
-          <artifactId>paranamer</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-orc</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-mapreduce-client-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-hdfs</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-thrift</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-csv</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-json</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-protobuf</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.protobuf</groupId>
-          <artifactId>protobuf-java</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java
deleted file mode 100644
index ef75fc20388..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/DefaultControllerRestApi.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.common;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.common.utils.FileUploadDownloadClient;
-import org.apache.pinot.common.utils.SimpleHttpResponse;
-import org.apache.pinot.common.utils.http.HttpClient;
-import org.apache.pinot.ingestion.utils.PushLocation;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.utils.JsonUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Deprecated. Does not support HTTPS or authentication
- */
-@Deprecated
-public class DefaultControllerRestApi implements ControllerRestApi {
-  private static final Logger LOGGER = LoggerFactory.getLogger(DefaultControllerRestApi.class);
-
-  private final List<PushLocation> _pushLocations;
-  private final String _rawTableName;
-  private final FileUploadDownloadClient _fileUploadDownloadClient = new FileUploadDownloadClient();
-  private final int _retry;
-
-  private static final String OFFLINE = "OFFLINE";
-
-  public DefaultControllerRestApi(List<PushLocation> pushLocations, String rawTableName) {
-    this(pushLocations, rawTableName, 0);
-  }
-
-  public DefaultControllerRestApi(List<PushLocation> pushLocations, String rawTableName, int retry) {
-    LOGGER.info("Push locations are: {} for table: {}", pushLocations, rawTableName);
-    _pushLocations = pushLocations;
-    _rawTableName = rawTableName;
-    _retry = retry;
-  }
-
-  @Override
-  public TableConfig getTableConfig() {
-    for (PushLocation pushLocation : _pushLocations) {
-      try {
-        SimpleHttpResponse response = _fileUploadDownloadClient.getHttpClient().sendGetRequest(FileUploadDownloadClient
-            .getRetrieveTableConfigHttpURI(pushLocation.getHost(), pushLocation.getPort(), _rawTableName));
-        JsonNode offlineJsonTableConfig = JsonUtils.stringToJsonNode(response.getResponse()).get(OFFLINE);
-        if (offlineJsonTableConfig != null) {
-          TableConfig offlineTableConfig = JsonUtils.jsonNodeToObject(offlineJsonTableConfig, TableConfig.class);
-          LOGGER.info("Got table config: {}", offlineTableConfig);
-          return offlineTableConfig;
-        }
-      } catch (Exception e) {
-        LOGGER.warn("Caught exception while fetching table config for table: {} from push location: {}", _rawTableName,
-            pushLocation, e);
-      }
-    }
-    String errorMessage = String
-        .format("Failed to get table config from push locations: %s for table: %s", _pushLocations, _rawTableName);
-    LOGGER.error(errorMessage);
-    throw new RuntimeException(errorMessage);
-  }
-
-  @Override
-  public Schema getSchema() {
-    for (PushLocation pushLocation : _pushLocations) {
-      try {
-        SimpleHttpResponse response = _fileUploadDownloadClient.getHttpClient().sendGetRequest(FileUploadDownloadClient
-            .getRetrieveSchemaHttpURI(pushLocation.getHost(), pushLocation.getPort(), _rawTableName));
-        Schema schema = Schema.fromString(response.getResponse());
-        LOGGER.info("Got schema: {}", schema);
-        return schema;
-      } catch (Exception e) {
-        LOGGER.warn("Caught exception while fetching schema for table: {} from push location: {}", _rawTableName,
-            pushLocation, e);
-      }
-    }
-    String errorMessage =
-        String.format("Failed to get schema from push locations: %s for table: %s", _pushLocations, _rawTableName);
-    LOGGER.error(errorMessage);
-    throw new RuntimeException(errorMessage);
-  }
-
-  @Override
-  public void pushSegments(FileSystem fileSystem, List<Path> tarFilePaths) {
-    LOGGER.info("Start pushing segments: {} to locations: {}", tarFilePaths, _pushLocations);
-    for (Path tarFilePath : tarFilePaths) {
-      String fileName = tarFilePath.getName();
-      Preconditions.checkArgument(fileName.endsWith(JobConfigConstants.TAR_GZ_FILE_EXT));
-      String segmentName = fileName.substring(0, fileName.length() - JobConfigConstants.TAR_GZ_FILE_EXT.length());
-      for (PushLocation pushLocation : _pushLocations) {
-        LOGGER.info("Pushing segment: {} to location: {}", segmentName, pushLocation);
-        for (int retry = 0; retry <= _retry; retry++) {
-          try (InputStream inputStream = fileSystem.open(tarFilePath)) {
-            SimpleHttpResponse response = _fileUploadDownloadClient.uploadSegment(
-                FileUploadDownloadClient.getUploadSegmentHttpURI(pushLocation.getHost(), pushLocation.getPort()),
-                segmentName, inputStream, null, FileUploadDownloadClient.makeTableParam(_rawTableName),
-                HttpClient.DEFAULT_SOCKET_TIMEOUT_MS);
-            LOGGER.info("Response {}: {}", response.getStatusCode(), response.getResponse());
-            break;
-          } catch (Exception e) {
-            LOGGER.error("Caught exception while pushing segment: {} to location: {}, retry {}/{}", segmentName,
-                pushLocation, retry, _retry, e);
-            if (retry == _retry) {
-              throw new RuntimeException(
-                  String.format("Failed to push segment %s to %s with %d retries", segmentName, pushLocation, retry),
-                  e);
-            }
-            try {
-              // Exponential back-off, max sleep time is 64 seconds.
-              Thread.sleep(1000 * (int) Math.pow(2, Math.min(retry + 1, 6)));
-            } catch (InterruptedException ex) {
-              // Swallow
-            }
-          }
-        }
-      }
-    }
-  }
-
-  @Override
-  public void sendSegmentUris(List<String> segmentUris) {
-    LOGGER.info("Start sending segment URIs: {} to locations: {}", segmentUris, _pushLocations);
-    for (String segmentUri : segmentUris) {
-      for (PushLocation pushLocation : _pushLocations) {
-        LOGGER.info("Sending segment URI: {} to location: {}", segmentUri, pushLocation);
-        try {
-          SimpleHttpResponse response = _fileUploadDownloadClient.sendSegmentUri(
-              FileUploadDownloadClient.getUploadSegmentHttpURI(pushLocation.getHost(), pushLocation.getPort()),
-              segmentUri, _rawTableName);
-          LOGGER.info("Response {}: {}", response.getStatusCode(), response.getResponse());
-        } catch (Exception e) {
-          LOGGER.error("Caught exception while sending segment URI: {} to location: {}", segmentUri, pushLocation, e);
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  @Override
-  public void deleteSegmentUris(List<String> segmentUris) {
-    LOGGER.info("Start deleting segment URIs: {} to locations: {}", segmentUris, _pushLocations);
-    for (String segmentUri : segmentUris) {
-      for (PushLocation pushLocation : _pushLocations) {
-        LOGGER.info("Sending deleting segment URI: {} to location: {}", segmentUri, pushLocation);
-        try {
-          SimpleHttpResponse response = _fileUploadDownloadClient.getHttpClient().sendDeleteRequest(
-              FileUploadDownloadClient.getDeleteSegmentHttpUri(pushLocation.getHost(), pushLocation.getPort(),
-                  _rawTableName, segmentUri, "OFFLINE"));
-          LOGGER.info("Response {}: {}", response.getStatusCode(), response.getResponse());
-        } catch (Exception e) {
-          LOGGER.error("Caught exception while deleting segment URI: {} to location: {}", segmentUri, pushLocation, e);
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  @Override
-  public List<String> getAllSegments(String tableType) {
-    LOGGER.info("Getting all segments of table {}", _rawTableName);
-    for (PushLocation pushLocation : _pushLocations) {
-      try {
-        SimpleHttpResponse response = _fileUploadDownloadClient.getHttpClient().sendGetRequest(FileUploadDownloadClient
-            .getRetrieveAllSegmentWithTableTypeHttpUri(pushLocation.getHost(), pushLocation.getPort(), _rawTableName,
-                tableType));
-        JsonNode segmentList = getSegmentsFromJsonSegmentAPI(response.getResponse(), tableType);
-        return JsonUtils.jsonNodeToObject(segmentList, ArrayList.class);
-      } catch (Exception e) {
-        LOGGER.warn("Caught exception while getting all {} segments for table: {} from push location: {}", tableType,
-            _rawTableName, pushLocation, e);
-      }
-    }
-    String errorMessage = String
-        .format("Failed to get a list of all segments from push locations: %s for table: %s", _pushLocations,
-            _rawTableName);
-    LOGGER.error(errorMessage);
-    throw new RuntimeException(errorMessage);
-  }
-
-  @Override
-  public void close()
-      throws IOException {
-    _fileUploadDownloadClient.close();
-  }
-
-  private JsonNode getSegmentsFromJsonSegmentAPI(String json, String tableType)
-      throws Exception {
-    return JsonUtils.stringToJsonNode(json).get(0).get(tableType);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java
deleted file mode 100644
index 085bb146337..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/JobConfigConstants.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.common;
-
-public class JobConfigConstants {
-  private JobConfigConstants() {
-  }
-
-  public static final String PATH_TO_INPUT = "path.to.input";
-  public static final String PATH_TO_OUTPUT = "path.to.output";
-  public static final String PREPROCESS_PATH_TO_OUTPUT = "preprocess.path.to.output";
-  public static final String PATH_TO_DEPS_JAR = "path.to.deps.jar";
-  public static final String PATH_TO_READER_CONFIG = "path.to.reader.config";
-  // Leave this for backward compatibility. We prefer to use the schema fetched from the controller.
-  public static final String PATH_TO_SCHEMA = "path.to.schema";
-
-  public static final String SEGMENT_TAR_DIR = "segmentTar";
-  public static final String TAR_GZ_FILE_EXT = ".tar.gz";
-
-  public static final String SEGMENT_TABLE_NAME = "segment.table.name";
-  public static final String TABLE_CONFIG = "table.config";
-  public static final String SCHEMA = "data.schema";
-
-  public static final String SEGMENT_NAME_GENERATOR_TYPE = "segment.name.generator.type";
-  public static final String SIMPLE_SEGMENT_NAME_GENERATOR = "simple";
-  public static final String NORMALIZED_DATE_SEGMENT_NAME_GENERATOR = "normalizedDate";
-  public static final String DEFAULT_SEGMENT_NAME_GENERATOR = SIMPLE_SEGMENT_NAME_GENERATOR;
-
-  // For SimpleSegmentNameGenerator
-  public static final String SEGMENT_NAME_POSTFIX = "segment.name.postfix";
-
-  // For NormalizedDateSegmentNameGenerator
-  public static final String SEGMENT_NAME_PREFIX = "segment.name.prefix";
-  public static final String EXCLUDE_SEQUENCE_ID = "exclude.sequence.id";
-
-  public static final String PUSH_TO_HOSTS = "push.to.hosts";
-  public static final String PUSH_TO_PORT = "push.to.port";
-
-  public static final String DEFAULT_PERMISSIONS_MASK = "fs.permissions.umask-mode";
-
-  // The path to the record reader to be configured
-  public static final String RECORD_READER_PATH = "record.reader.path";
-
-  public static final String ENABLE_PREPROCESSING = "enable.preprocessing";
-
-  // This setting should be used if you will generate less # of segments after
-  // push. In preprocessing, this is likely because we resize segments.
-  public static final String DELETE_EXTRA_SEGMENTS = "delete.extra.segments";
-
-  // This setting is used to match output segments hierarchy along with input file hierarchy.
-  public static final String USE_RELATIVE_PATH = "use.relative.path";
-
-  // This setting enables segment push in parallel.
-  public static final String ENABLE_PARALLEL_PUSH = "enable.parallel.push";
-  public static final String DEFAULT_ENABLE_PARALLEL_PUSH = "false";
-  public static final String PUSH_JOB_PARALLELISM = "push.job.parallelism";
-  public static final String DEFAULT_PUSH_JOB_PARALLELISM = "4";
-  public static final String PUSH_JOB_RETRY = "push.job.retry";
-  public static final String DEFAULT_PUSH_JOB_RETRY = "3";
-
-  // This setting ensures jobs only process files with certain time range
-  public static final String LOOK_BACK_PERIOD_IN_DAYS = "look.back.period.in.days";
-
-  // Assign sequence ids to input files based at each local directory level
-  public static final String LOCAL_DIRECTORY_SEQUENCE_ID = "local.directory.sequence.id";
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java
deleted file mode 100644
index 5ece4c2bec5..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/BaseSegmentJob.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.jobs;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.common.Utils;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.DefaultControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.utils.PushLocation;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.Schema;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public abstract class BaseSegmentJob extends Configured implements Serializable {
-  protected final Logger _logger = LoggerFactory.getLogger(getClass());
-  protected final Properties _properties;
-  protected final List<PushLocation> _pushLocations;
-  protected final String _rawTableName;
-  protected final int _lookBackPeriod;
-
-  protected BaseSegmentJob(Properties properties) {
-    _properties = properties;
-    setConf(new Configuration());
-    Utils.logVersions();
-    logProperties();
-
-    // Optional push location and table parameters. If set, will use the table config and schema from the push hosts.
-    String pushHostsString = _properties.getProperty(JobConfigConstants.PUSH_TO_HOSTS);
-    String pushPortString = _properties.getProperty(JobConfigConstants.PUSH_TO_PORT);
-    if (pushHostsString != null && pushPortString != null) {
-      _pushLocations =
-          PushLocation.getPushLocations(StringUtils.split(pushHostsString, ','), Integer.parseInt(pushPortString));
-    } else {
-      _pushLocations = null;
-    }
-
-    _rawTableName = Preconditions.checkNotNull(_properties.getProperty(JobConfigConstants.SEGMENT_TABLE_NAME));
-
-    // Optional parameter to allow skip files older than given time period.
-    String lookBackPeriodInDays = _properties.getProperty(JobConfigConstants.LOOK_BACK_PERIOD_IN_DAYS);
-    if (lookBackPeriodInDays != null) {
-      _lookBackPeriod = Integer.parseInt(lookBackPeriodInDays);
-    } else {
-      _lookBackPeriod = -1;
-    }
-  }
-
-  @Nullable
-  protected TableConfig getTableConfig()
-      throws IOException {
-    try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-      return controllerRestApi != null ? controllerRestApi.getTableConfig() : null;
-    }
-  }
-
-  /**
-   * This method is currently implemented in SegmentCreationJob and SegmentPreprocessingJob due to a dependency on
-   * the hadoop filesystem, which we can only get once the job begins to run.
-   * We return null here to make it clear that for now, all implementations of this method have to support
-   * reading from a schema file. In the future, we hope to deprecate reading the schema from the schema file in favor
-   * of mandating that a schema is pushed to the controller.
-   */
-  @Nullable
-  protected Schema getSchema()
-      throws IOException {
-    return null;
-  }
-
-  /**
-   * Can be overridden to provide custom controller Rest API.
-   */
-  @Nullable
-  protected ControllerRestApi getControllerRestApi() {
-    return _pushLocations != null ? new DefaultControllerRestApi(_pushLocations, _rawTableName) : null;
-  }
-
-  protected void logProperties() {
-    _logger.info("*********************************************************************");
-    _logger.info("Job Properties: {}", _properties);
-    _logger.info("*********************************************************************");
-  }
-
-  @Nullable
-  protected Path getPathFromProperty(String key) {
-    String value = _properties.getProperty(key);
-    return value != null ? new Path(value) : null;
-  }
-
-  protected List<Path> getDataFilePaths(String pathPattern)
-      throws IOException {
-    return getDataFilePaths(new Path(pathPattern));
-  }
-
-  protected List<Path> getDataFilePaths(Path pathPattern)
-      throws IOException {
-    List<Path> tarFilePaths = new ArrayList<>();
-    FileSystem fileSystem = FileSystem.get(pathPattern.toUri(), getConf());
-    _logger.info("Using filesystem: {}", fileSystem);
-    FileStatus[] fileStatuses = fileSystem.globStatus(pathPattern);
-    if (fileStatuses == null) {
-      _logger.warn("Unable to match file status from file path pattern: {}", pathPattern);
-    } else {
-      getDataFilePathsHelper(fileSystem, fileStatuses, tarFilePaths);
-    }
-    return tarFilePaths;
-  }
-
-  protected void retainRecentFiles(List<Path> filePaths, int lookBackPeriod) {
-    if (lookBackPeriod > 0) {
-      filePaths.removeIf(path -> {
-        try {
-          FileSystem fs = FileSystem.get(path.toUri(), new Configuration());
-          DateTime mtime = new DateTime(fs.getFileStatus(path).getModificationTime());
-          if (mtime.plusDays(lookBackPeriod).isBeforeNow()) {
-            _logger.info("Skip process older than {} days file: {}, last modification time is {}", lookBackPeriod, path,
-                mtime);
-          }
-          return true;
-        } catch (IOException e) {
-          _logger.error("Failed to evaluate last modification time for path " + path, e);
-        }
-        return false;
-      });
-    }
-  }
-
-  protected void getDataFilePathsHelper(FileSystem fileSystem, FileStatus[] fileStatuses, List<Path> tarFilePaths)
-      throws IOException {
-    for (FileStatus fileStatus : fileStatuses) {
-      Path path = fileStatus.getPath();
-      if (fileStatus.isDirectory()) {
-        getDataFilePathsHelper(fileSystem, fileSystem.listStatus(path), tarFilePaths);
-      } else {
-        // Skip temp files generated by computation frameworks like Hadoop/Spark.
-        if (path.getName().startsWith("_") || path.getName().startsWith(".")) {
-          continue;
-        }
-        if (isDataFile(path.getName())) {
-          tarFilePaths.add(path);
-        }
-      }
-    }
-  }
-
-  protected abstract boolean isDataFile(String fileName);
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java
deleted file mode 100644
index 695c182666d..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentCreationJob.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.jobs;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.utils.PushLocation;
-import org.apache.pinot.spi.data.Schema;
-
-
-public abstract class SegmentCreationJob extends BaseSegmentJob {
-  protected static final String APPEND = "APPEND";
-
-  protected final String _inputPattern;
-  protected final String _outputDir;
-  protected final String _stagingDir;
-  protected final String _rawTableName;
-
-  // Optional
-  protected final String _depsJarDir;
-  protected final String _schemaFile;
-  protected final String _defaultPermissionsMask;
-  protected final List<PushLocation> _pushLocations;
-  protected final boolean _localDirectorySequenceId;
-
-  public SegmentCreationJob(Properties properties) {
-    super(properties);
-
-    _inputPattern = Preconditions.checkNotNull(_properties.getProperty(JobConfigConstants.PATH_TO_INPUT),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.PATH_TO_INPUT));
-    _outputDir = Preconditions.checkNotNull(_properties.getProperty(JobConfigConstants.PATH_TO_OUTPUT),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.PATH_TO_OUTPUT));
-    _stagingDir = new Path(_outputDir, UUID.randomUUID().toString()).toString();
-    _rawTableName = Preconditions.checkNotNull(_properties.getProperty(JobConfigConstants.SEGMENT_TABLE_NAME),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.SEGMENT_TABLE_NAME));
-
-    // Optional
-    _depsJarDir = _properties.getProperty(JobConfigConstants.PATH_TO_DEPS_JAR);
-    _schemaFile = _properties.getProperty(JobConfigConstants.PATH_TO_SCHEMA);
-    _defaultPermissionsMask = _properties.getProperty(JobConfigConstants.DEFAULT_PERMISSIONS_MASK);
-    String localDirectorySequenceId = _properties.getProperty(JobConfigConstants.LOCAL_DIRECTORY_SEQUENCE_ID);
-    if (localDirectorySequenceId != null) {
-      _localDirectorySequenceId = Boolean.parseBoolean(localDirectorySequenceId);
-    } else {
-      _localDirectorySequenceId = false;
-    }
-
-    // Optional push location and table parameters. If set, will use the table config and schema from the push hosts.
-    String pushHostsString = _properties.getProperty(JobConfigConstants.PUSH_TO_HOSTS);
-    String pushPortString = _properties.getProperty(JobConfigConstants.PUSH_TO_PORT);
-
-    if (pushHostsString != null && pushPortString != null) {
-      _pushLocations =
-          PushLocation.getPushLocations(StringUtils.split(pushHostsString, ','), Integer.parseInt(pushPortString));
-    } else {
-      _pushLocations = null;
-    }
-
-    _logger.info("*********************************************************************");
-    _logger.info("Input Pattern: {}", _inputPattern);
-    _logger.info("Output Directory: {}", _outputDir);
-    _logger.info("Staging Directory: {}", _stagingDir);
-    _logger.info("Raw Table Name: {}", _rawTableName);
-    _logger.info("Dependencies Directory: {}", _depsJarDir);
-    _logger.info("Schema File: {}", _schemaFile);
-    _logger.info("Default Permissions Mask: {}", _defaultPermissionsMask);
-    _logger.info("Push Locations: {}", _pushLocations);
-    _logger.info("*********************************************************************");
-  }
-
-  /**
-   * Generate a relative output directory path when `useRelativePath` flag is on.
-   * This method will compute the relative path based on `inputFile` and `baseInputDir`,
-   * then apply only the directory part of relative path to `outputDir`.
-   * E.g.
-   *    baseInputDir = "/path/to/input"
-   *    inputFile = "/path/to/input/a/b/c/d.avro"
-   *    outputDir = "/path/to/output"
-   *    getRelativeOutputPath(baseInputDir, inputFile, outputDir) = /path/to/output/a/b/c
-   */
-  public static Path getRelativeOutputPath(URI baseInputDir, URI inputFile, Path outputDir) {
-    URI relativePath = baseInputDir.relativize(inputFile);
-    Preconditions.checkState(relativePath.getPath().length() > 0 && !relativePath.equals(inputFile),
-        "Unable to extract out the relative path based on base input path: " + baseInputDir);
-    return new Path(outputDir, relativePath.getPath()).getParent();
-  }
-
-  @Override
-  protected boolean isDataFile(String fileName) {
-    // For custom record reader, treat all files as data file
-    if (_properties.getProperty(JobConfigConstants.RECORD_READER_PATH) != null) {
-      return true;
-    }
-    return fileName.endsWith(".avro") || fileName.endsWith(".csv") || fileName.endsWith(".json") || fileName
-        .endsWith(".thrift");
-  }
-
-  protected abstract void run()
-      throws Exception;
-
-  @Override
-  protected Schema getSchema()
-      throws IOException {
-    try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-      if (controllerRestApi != null) {
-        return controllerRestApi.getSchema();
-      } else {
-        // Schema file could be stored local or remotely.
-        try (InputStream inputStream = FileSystem.get(new Path(_schemaFile).toUri(), getConf())
-            .open(new Path(_schemaFile))) {
-          return Schema.fromInputStream(inputStream);
-        }
-      }
-    }
-  }
-
-  protected void movePath(FileSystem fileSystem, String source, String destination, boolean override)
-      throws IOException {
-    for (FileStatus sourceFileStatus : fileSystem.listStatus(new Path(source))) {
-      Path srcPath = sourceFileStatus.getPath();
-      Path destPath = new Path(destination, srcPath.getName());
-      if (fileSystem.isFile(srcPath)) {
-        if (fileSystem.exists(destPath)) {
-          if (override) {
-            _logger.warn("The destination path {} already exists, trying to override it.", destPath);
-            fileSystem.delete(destPath, false);
-          } else {
-            _logger.warn("The destination path {} already exists, skip it.", destPath);
-            continue;
-          }
-        }
-        _logger.info("Moving file from: {} to: {}", srcPath, destPath);
-        if (!fileSystem.exists(destPath.getParent())) {
-          fileSystem.mkdirs(destPath.getParent());
-        }
-        fileSystem.rename(srcPath, destPath);
-      } else {
-        movePath(fileSystem, srcPath.toString(), destPath.toString(), override);
-      }
-    }
-  }
-
-  public enum SchemaMisMatchCounter {
-    DATA_TYPE_MISMATCH,
-    SINGLE_VALUE_MULTI_VALUE_FIELD_MISMATCH,
-    MULTI_VALUE_FIELD_STRUCTURE_MISMATCH,
-    MISSING_PINOT_COLUMN
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java
deleted file mode 100644
index d36af12515b..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentPreprocessingJob.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.jobs;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.spi.data.Schema;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * A Hadoop job which provides partitioning, sorting, and resizing against the input files, which is raw data in Avro
- * format.
- * Thus, the output files are partitioned, sorted, resized after this job.
- * In order to run this job, the following configs need to be specified in job properties:
- * * enable.preprocessing: false by default. Enables preprocessing job.
- */
-public abstract class SegmentPreprocessingJob extends BaseSegmentJob {
-  private static final Logger _logger = LoggerFactory.getLogger(SegmentPreprocessingJob.class);
-  protected final Path _schemaFile;
-  protected final Path _inputSegmentDir;
-  protected final Path _preprocessedOutputDir;
-  // Optional.
-  protected final Path _pathToDependencyJar;
-  protected boolean _enablePreprocessing;
-
-  public SegmentPreprocessingJob(final Properties properties) {
-    super(properties);
-
-    _enablePreprocessing = Boolean.parseBoolean(_properties.getProperty(JobConfigConstants.ENABLE_PREPROCESSING));
-
-    // get input/output paths.
-    _inputSegmentDir = Preconditions.checkNotNull(getPathFromProperty(JobConfigConstants.PATH_TO_INPUT));
-    _preprocessedOutputDir = getPathFromProperty(JobConfigConstants.PREPROCESS_PATH_TO_OUTPUT);
-
-    // Optional
-    _pathToDependencyJar = getPathFromProperty(JobConfigConstants.PATH_TO_DEPS_JAR);
-    _schemaFile = getPathFromProperty(JobConfigConstants.PATH_TO_SCHEMA);
-
-    _logger.info("*********************************************************************");
-    _logger.info("enable.preprocessing: {}", _enablePreprocessing);
-    _logger.info("path.to.input: {}", _inputSegmentDir);
-    _logger.info("preprocess.path.to.output: {}", _preprocessedOutputDir);
-    _logger.info("path.to.deps.jar: {}", _pathToDependencyJar);
-    _logger.info("push.locations: {}", _pushLocations);
-    _logger.info("*********************************************************************");
-  }
-
-  protected abstract void run()
-      throws Exception;
-
-  @Override
-  protected Schema getSchema()
-      throws IOException {
-    try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-      if (controllerRestApi != null) {
-        return controllerRestApi.getSchema();
-      } else {
-        try (InputStream inputStream = FileSystem.get(_schemaFile.toUri(), getConf()).open(_schemaFile)) {
-          return org.apache.pinot.spi.data.Schema.fromInputStream(inputStream);
-        }
-      }
-    }
-  }
-
-  @Override
-  protected boolean isDataFile(String fileName) {
-    // TODO: support orc format in the future.
-    return fileName.endsWith(".avro");
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java
deleted file mode 100644
index b0af9ccb724..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentTarPushJob.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.jobs;
-
-import com.google.common.base.Preconditions;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.DefaultControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.utils.PushLocation;
-
-
-public class SegmentTarPushJob extends BaseSegmentJob {
-  protected final String _segmentPattern;
-  protected final List<PushLocation> _pushLocations;
-  protected final String _rawTableName;
-  protected final boolean _deleteExtraSegments;
-
-  public SegmentTarPushJob(Properties properties) {
-    super(properties);
-    _segmentPattern = Preconditions.checkNotNull(properties.getProperty(JobConfigConstants.PATH_TO_OUTPUT),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.PATH_TO_OUTPUT));
-    String[] hosts = StringUtils.split(Preconditions
-        .checkNotNull(properties.getProperty(JobConfigConstants.PUSH_TO_HOSTS),
-            String.format("Config: %s is missing in job property file.", JobConfigConstants.PUSH_TO_HOSTS)), ',');
-    int port = Integer.parseInt(Preconditions.checkNotNull(properties.getProperty(JobConfigConstants.PUSH_TO_PORT),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.PUSH_TO_PORT)));
-    _pushLocations = PushLocation.getPushLocations(hosts, port);
-    _rawTableName = Preconditions.checkNotNull(_properties.getProperty(JobConfigConstants.SEGMENT_TABLE_NAME));
-    _deleteExtraSegments =
-        Boolean.parseBoolean(properties.getProperty(JobConfigConstants.DELETE_EXTRA_SEGMENTS, "false"));
-  }
-
-  @Override
-  protected boolean isDataFile(String fileName) {
-    return fileName.endsWith(JobConfigConstants.TAR_GZ_FILE_EXT);
-  }
-
-  public void run()
-      throws Exception {
-    FileSystem fileSystem = FileSystem.get(new Path(_segmentPattern).toUri(), getConf());
-    List<Path> segmentsToPush = getDataFilePaths(_segmentPattern);
-    try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-      // TODO: Deal with invalid prefixes in the future
-
-      List<String> currentSegments = controllerRestApi.getAllSegments("OFFLINE");
-
-      controllerRestApi.pushSegments(fileSystem, segmentsToPush);
-
-      if (_deleteExtraSegments) {
-        controllerRestApi.deleteSegmentUris(getSegmentsToDelete(currentSegments, segmentsToPush));
-      }
-    }
-  }
-
-  /**
-   * Deletes extra segments after pushing to the controller
-   * @param allSegments all segments on the controller for the table
-   * @param segmentsToPush segments that will be pushed to the controller
-   * @throws IOException
-   */
-  public List<String> getSegmentsToDelete(List<String> allSegments, List<Path> segmentsToPush) {
-    Set<String> uniqueSegmentPrefixes = new HashSet<>();
-
-    // Get all relevant segment prefixes that we are planning on pushing
-    List<String> segmentNamesToPush = segmentsToPush.stream().map(s -> s.getName()).collect(Collectors.toList());
-    for (String segmentName : segmentNamesToPush) {
-      String segmentNamePrefix = removeSequenceId(segmentName);
-      uniqueSegmentPrefixes.add(segmentNamePrefix);
-    }
-
-    List<String> relevantSegments = new ArrayList<>();
-    // Get relevant segments already pushed that we are planning on refreshing
-    for (String segmentName : allSegments) {
-      if (uniqueSegmentPrefixes.contains(removeSequenceId(segmentName))) {
-        relevantSegments.add(segmentName);
-      }
-    }
-
-    relevantSegments.removeAll(segmentNamesToPush);
-    return relevantSegments;
-  }
-
-  /**
-   * Remove trailing sequence id
-   * eg: If segment name is mytable_12, it will return mytable_
-   * If segment name is mytable_20190809_20190809_12, it will return mytable_20190809_20190809_
-   * @param segmentName
-   * @return
-   */
-  private String removeSequenceId(String segmentName) {
-    return segmentName.replaceAll("\\d*$", "");
-  }
-
-  protected ControllerRestApi getControllerRestApi() {
-    return new DefaultControllerRestApi(_pushLocations, _rawTableName);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java
deleted file mode 100644
index 8ac99453866..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/jobs/SegmentUriPushJob.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.jobs;
-
-import com.google.common.base.Preconditions;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.DefaultControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.utils.PushLocation;
-
-
-public class SegmentUriPushJob extends BaseSegmentJob {
-  protected final String _segmentUriPrefix;
-  protected final String _segmentUriSuffix;
-  protected final String _segmentPattern;
-  protected final List<PushLocation> _pushLocations;
-  protected final String _rawTableName;
-
-  public SegmentUriPushJob(Properties properties) {
-    super(properties);
-    _segmentUriPrefix = properties.getProperty("uri.prefix", "");
-    _segmentUriSuffix = properties.getProperty("uri.suffix", "");
-    _segmentPattern = Preconditions.checkNotNull(properties.getProperty(JobConfigConstants.PATH_TO_OUTPUT),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.PATH_TO_OUTPUT));
-    String[] hosts = StringUtils.split(Preconditions
-        .checkNotNull(properties.getProperty(JobConfigConstants.PUSH_TO_HOSTS),
-            String.format("Config: %s is missing in job property file.", JobConfigConstants.PUSH_TO_HOSTS)), ',');
-    int port = Integer.parseInt(Preconditions.checkNotNull(properties.getProperty(JobConfigConstants.PUSH_TO_PORT),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.PUSH_TO_PORT)));
-    _pushLocations = PushLocation.getPushLocations(hosts, port);
-    _rawTableName = Preconditions.checkNotNull(_properties.getProperty(JobConfigConstants.SEGMENT_TABLE_NAME),
-        String.format("Config: %s is missing in job property file.", JobConfigConstants.SEGMENT_TABLE_NAME));
-  }
-
-  @Override
-  protected boolean isDataFile(String fileName) {
-    return fileName.endsWith(JobConfigConstants.TAR_GZ_FILE_EXT);
-  }
-
-  public void run()
-      throws Exception {
-    try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-      List<Path> tarFilePaths = getDataFilePaths(_segmentPattern);
-      retainRecentFiles(tarFilePaths, _lookBackPeriod);
-      List<String> segmentUris = new ArrayList<>(tarFilePaths.size());
-      for (Path tarFilePath : tarFilePaths) {
-        segmentUris.add(_segmentUriPrefix + tarFilePath.toUri().getRawPath() + _segmentUriSuffix);
-      }
-      controllerRestApi.sendSegmentUris(segmentUris);
-    }
-  }
-
-  protected ControllerRestApi getControllerRestApi() {
-    return new DefaultControllerRestApi(_pushLocations, _rawTableName);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java
deleted file mode 100644
index 5e65b20a1a0..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/utils/JobPreparationHelper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.ingestion.utils;
-
-import java.io.IOException;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class JobPreparationHelper {
-  private JobPreparationHelper() {
-  }
-
-  private static final Logger _logger = LoggerFactory.getLogger(JobPreparationHelper.class);
-
-  public static void mkdirs(FileSystem fileSystem, Path dirPath, String defaultPermissionsMask)
-      throws IOException {
-    if (fileSystem.exists(dirPath)) {
-      _logger.warn("Deleting existing file: {}", dirPath);
-      fileSystem.delete(dirPath, true);
-    }
-    _logger.info("Making directory: {}", dirPath);
-    fileSystem.mkdirs(dirPath);
-    JobPreparationHelper.setDirPermission(fileSystem, dirPath, defaultPermissionsMask);
-  }
-
-  public static void setDirPermission(FileSystem fileSystem, Path dirPath, String defaultPermissionsMask)
-      throws IOException {
-    if (defaultPermissionsMask != null) {
-      FsPermission permission = FsPermission.getDirDefault().applyUMask(new FsPermission(defaultPermissionsMask));
-      _logger.info("Setting permission: {} to directory: {}", permission, dirPath);
-      fileSystem.setPermission(dirPath, permission);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/README.md b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/README.md
deleted file mode 100644
index 5885bfde6da..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-# Pinot Spark
-
-Pinot supports data segment generation from Spark.
-
-Please refer to this [Creating Pinot segments using Spark](https://pinot.readthedocs.io/en/latest/pinot_hadoop.html#creating-segments-using-spark) document for more details.
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml
deleted file mode 100644
index bdf80ae419f..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml
+++ /dev/null
@@ -1,477 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>v0_deprecated</artifactId>
-    <groupId>org.apache.pinot</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>pinot-spark</artifactId>
-  <name>Pinot Spark</name>
-  <url>https://pinot.apache.org/</url>
-  <properties>
-    <pinot.root>${basedir}/../../../..</pinot.root>
-    <spark.version>2.4.7</spark.version>
-    <scala.binary.version>2.12</scala.binary.version>
-    <scala.version>2.12.15</scala.version>
-    <hadoop.version>2.10.1</hadoop.version>
-    <phase.prop>package</phase.prop>
-  </properties>
-  <profiles>
-    <profile>
-      <id>build-shaded-jar</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <!--
-                  Usually in hadoop environment, there are multiple jars with different versions.
-                  Most of the NoSuchMethodExceptions are caused by class loading conflicts.
-                  Class relocation ensures the reference of certain packages/classes in Pinot code to
-                  shaded libs, e.g. jackson or guava.
-                  Ref: https://maven.apache.org/plugins/maven-shade-plugin/examples/class-relocation.html
-                  -->
-                  <relocations>
-                    <relocation>
-                      <pattern>com.google.common.base</pattern>
-                      <shadedPattern>${shade.prefix}.com.google.common.base</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.common.cache</pattern>
-                      <shadedPattern>${shade.prefix}.com.google.common.cache</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.fasterxml.jackson</pattern>
-                      <shadedPattern>${shade.prefix}.com.fasterxml.jackson</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>org.apache.http</pattern>
-                      <shadedPattern>${shade.prefix}.org.apache.http</shadedPattern>
-                    </relocation>
-                  </relocations>
-                  <transformers>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                      <mainClass>org.apache.pinot.spark.PinotSparkJobLauncher</mainClass>
-                    </transformer>
-                  </transformers>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-ingestion-common</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-common</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-common</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.paranamer</groupId>
-          <artifactId>paranamer</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-parquet</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.paranamer</groupId>
-          <artifactId>paranamer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-thrift</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-csv</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-orc</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.pinot</groupId>
-          <artifactId>pinot-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-mapreduce-client-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-hdfs</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-protobuf</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.protobuf</groupId>
-          <artifactId>protobuf-java</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math3</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <!--Spark-->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
-      <version>${hadoop.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>net.minidev</groupId>
-          <artifactId>json-smart</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>net.java.dev.jets3t</groupId>
-          <artifactId>jets3t</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!--Test-->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.objenesis</groupId>
-          <artifactId>objenesis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!--Spark Test-->
-    <dependency>
-      <groupId>com.holdenkarau</groupId>
-      <artifactId>spark-testing-base_${scala.binary.version}</artifactId>
-      <version>${spark.version}_1.1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <!-- We have to explicitly exclude spark-yarn, due to a bug in the current
-             version of the maven-enforcer-plugin, where it doesn't handle
-             wildcard exclusions in transitive dependencies. So projects that
-             depend on this project wind up not excluding spark-yarn. -->
-        <exclusion>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-yarn_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>net.minidev</groupId>
-          <artifactId>json-smart</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-tags_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.zookeeper</groupId>
-          <artifactId>zookeeper</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.antlr</groupId>
-          <artifactId>antlr-runtime</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>net.java.dev.jets3t</groupId>
-          <artifactId>jets3t</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang.modules</groupId>
-          <artifactId>scala-xml_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.derby</groupId>
-          <artifactId>derby</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-pool</groupId>
-          <artifactId>commons-pool</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-reflect</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-api</artifactId>
-      <version>${hadoop.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
-      <version>${hadoop.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-server-web-proxy</artifactId>
-      <version>${hadoop.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-client</artifactId>
-      <version>${hadoop.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr-runtime</artifactId>
-      <version>3.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jets3t</groupId>
-      <artifactId>jets3t</artifactId>
-      <version>0.9.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang.modules</groupId>
-      <artifactId>scala-xml_${scala.binary.version}</artifactId>
-      <version>1.0.6</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-reflect</artifactId>
-      <version>${scala.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.curator</groupId>
-          <artifactId>curator-recipes</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.spark</groupId>
-      <artifactId>spark-sql_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.parquet</groupId>
-          <artifactId>parquet-column</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-tags_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.orc</groupId>
-          <artifactId>orc-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-reflect</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.spark</groupId>
-      <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-tags_${scala.binary.version}</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.objenesis</groupId>
-          <artifactId>objenesis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-reflect</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.12.1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.spark</groupId>
-      <artifactId>spark-avro_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java
deleted file mode 100644
index 06fef2211c5..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/PinotSparkJobLauncher.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark;
-
-import java.io.FileInputStream;
-import java.util.Arrays;
-import java.util.Properties;
-import org.apache.pinot.ingestion.common.PinotIngestionJobType;
-import org.apache.pinot.spark.jobs.SparkSegmentCreationJob;
-import org.apache.pinot.spark.jobs.SparkSegmentTarPushJob;
-import org.apache.pinot.spark.jobs.SparkSegmentUriPushJob;
-
-
-public class PinotSparkJobLauncher {
-  private PinotSparkJobLauncher() {
-  }
-
-  private static final String USAGE = "usage: [job_type] [job.properties]";
-  private static final String SUPPORT_JOB_TYPES =
-      "\tsupport job types: " + Arrays.toString(PinotIngestionJobType.values());
-
-  private static void usage() {
-    System.err.println(USAGE);
-    System.err.println(SUPPORT_JOB_TYPES);
-  }
-
-  private static void kickOffPinotSparkJob(PinotIngestionJobType jobType, Properties jobConf)
-      throws Exception {
-    switch (jobType) {
-      case SegmentCreation:
-        new SparkSegmentCreationJob(jobConf).run();
-        break;
-      case SegmentTarPush:
-        new SparkSegmentTarPushJob(jobConf).run();
-        break;
-      case SegmentUriPush:
-        new SparkSegmentUriPushJob(jobConf).run();
-        break;
-      case SegmentCreationAndTarPush:
-        new SparkSegmentCreationJob(jobConf).run();
-        new SparkSegmentTarPushJob(jobConf).run();
-        break;
-      case SegmentCreationAndUriPush:
-        new SparkSegmentCreationJob(jobConf).run();
-        new SparkSegmentUriPushJob(jobConf).run();
-        break;
-      default:
-        throw new RuntimeException("Not a valid jobType - " + jobType);
-    }
-  }
-
-  public static void main(String[] args)
-      throws Exception {
-    if (args.length != 2) {
-      usage();
-      System.exit(1);
-    }
-    PinotIngestionJobType jobType = null;
-    Properties jobConf = null;
-    try {
-      jobType = PinotIngestionJobType.valueOf(args[0]);
-      jobConf = new Properties();
-      jobConf.load(new FileInputStream(args[1]));
-    } catch (Exception e) {
-      usage();
-      System.exit(1);
-    }
-    kickOffPinotSparkJob(jobType, jobConf);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java
deleted file mode 100644
index 0a1791e4dfb..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationFunction.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark.jobs;
-
-import com.google.common.base.Preconditions;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-import javax.annotation.Nullable;
-import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.common.utils.TarGzCompressionUtils;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentCreationJob;
-import org.apache.pinot.plugin.inputformat.csv.CSVRecordReaderConfig;
-import org.apache.pinot.plugin.inputformat.protobuf.ProtoBufRecordReaderConfig;
-import org.apache.pinot.plugin.inputformat.thrift.ThriftRecordReaderConfig;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
-import org.apache.pinot.segment.spi.creator.name.NormalizedDateSegmentNameGenerator;
-import org.apache.pinot.segment.spi.creator.name.SegmentNameGenerator;
-import org.apache.pinot.segment.spi.creator.name.SimpleSegmentNameGenerator;
-import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.DateTimeFieldSpec;
-import org.apache.pinot.spi.data.DateTimeFormatSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.FileFormat;
-import org.apache.pinot.spi.data.readers.RecordReaderConfig;
-import org.apache.pinot.spi.utils.DataSizeUtils;
-import org.apache.pinot.spi.utils.IngestionConfigUtils;
-import org.apache.pinot.spi.utils.JsonUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SparkSegmentCreationFunction implements Serializable {
-  protected static final String LOCAL_TEMP_DIR = "pinot_spark_tmp";
-
-  protected final Logger _logger = LoggerFactory.getLogger(getClass());
-
-  protected Configuration _jobConf;
-  protected String _rawTableName;
-  protected Schema _schema;
-  protected SegmentNameGenerator _segmentNameGenerator;
-  protected boolean _useRelativePath;
-
-  // Optional
-  protected TableConfig _tableConfig;
-  protected String _recordReaderPath;
-  protected Path _readerConfigFile;
-
-  // HDFS segment tar directory
-  protected Path _hdfsSegmentTarDir;
-
-  // Temporary local directories
-  protected File _localStagingDir;
-  protected File _localInputDir;
-  protected File _localSegmentDir;
-  protected File _localSegmentTarDir;
-
-  public SparkSegmentCreationFunction(Properties properties, String workerOutputPath)
-      throws IOException {
-    _jobConf = new Configuration();
-    for (Map.Entry<Object, Object> entry : properties.entrySet()) {
-      _jobConf.set(entry.getKey().toString(), entry.getValue().toString());
-    }
-
-    logConfigurations();
-
-    _useRelativePath = _jobConf.getBoolean(JobConfigConstants.USE_RELATIVE_PATH, false);
-    _rawTableName = _jobConf.get(JobConfigConstants.SEGMENT_TABLE_NAME);
-    _schema = Schema.fromString(_jobConf.get(JobConfigConstants.SCHEMA));
-
-    // Optional
-    // Once we move to dateTimeFieldSpec, check that table config (w/ valid timeColumnName) is provided if multiple
-    // dateTimeFieldSpecs are configured
-    String tableConfigString = _jobConf.get(JobConfigConstants.TABLE_CONFIG);
-    if (tableConfigString != null) {
-      _tableConfig = JsonUtils.stringToObject(tableConfigString, TableConfig.class);
-    }
-    String readerConfigFile = _jobConf.get(JobConfigConstants.PATH_TO_READER_CONFIG);
-    if (readerConfigFile != null) {
-      _readerConfigFile = new Path(readerConfigFile);
-    }
-    _recordReaderPath = _jobConf.get(JobConfigConstants.RECORD_READER_PATH);
-
-    // Set up segment name generator
-    String segmentNameGeneratorType =
-        _jobConf.get(JobConfigConstants.SEGMENT_NAME_GENERATOR_TYPE, JobConfigConstants.DEFAULT_SEGMENT_NAME_GENERATOR);
-    switch (segmentNameGeneratorType) {
-      case JobConfigConstants.SIMPLE_SEGMENT_NAME_GENERATOR:
-        _segmentNameGenerator =
-            new SimpleSegmentNameGenerator(_rawTableName, _jobConf.get(JobConfigConstants.SEGMENT_NAME_POSTFIX));
-        break;
-      case JobConfigConstants.NORMALIZED_DATE_SEGMENT_NAME_GENERATOR:
-        Preconditions.checkState(_tableConfig != null,
-            "In order to use NormalizedDateSegmentNameGenerator, table config must be provided");
-        SegmentsValidationAndRetentionConfig validationConfig = _tableConfig.getValidationConfig();
-        DateTimeFormatSpec dateTimeFormatSpec = null;
-        String timeColumnName = _tableConfig.getValidationConfig().getTimeColumnName();
-        if (timeColumnName != null) {
-          DateTimeFieldSpec dateTimeFieldSpec = _schema.getSpecForTimeColumn(timeColumnName);
-          if (dateTimeFieldSpec != null) {
-            dateTimeFormatSpec = dateTimeFieldSpec.getFormatSpec();
-          }
-        }
-        _segmentNameGenerator =
-            new NormalizedDateSegmentNameGenerator(_rawTableName, _jobConf.get(JobConfigConstants.SEGMENT_NAME_PREFIX),
-                _jobConf.getBoolean(JobConfigConstants.EXCLUDE_SEQUENCE_ID, false),
-                IngestionConfigUtils.getBatchSegmentIngestionType(_tableConfig),
-                IngestionConfigUtils.getBatchSegmentIngestionFrequency(_tableConfig), dateTimeFormatSpec,
-                _jobConf.get(JobConfigConstants.SEGMENT_NAME_POSTFIX));
-        break;
-      default:
-        throw new UnsupportedOperationException("Unsupported segment name generator type: " + segmentNameGeneratorType);
-    }
-
-    // Working directories
-    _hdfsSegmentTarDir = new Path(workerOutputPath, JobConfigConstants.SEGMENT_TAR_DIR);
-    _localStagingDir = new File(String.format("%s_%s", LOCAL_TEMP_DIR, UUID.randomUUID().toString()));
-    _localInputDir = new File(_localStagingDir, "inputData");
-    _localSegmentDir = new File(_localStagingDir, "segments");
-    _localSegmentTarDir = new File(_localStagingDir, JobConfigConstants.SEGMENT_TAR_DIR);
-
-    if (_localStagingDir.exists()) {
-      _logger.warn("Deleting existing file: {}", _localStagingDir);
-      FileUtils.forceDelete(_localStagingDir);
-    }
-    _logger.info("Making local temporary directories: {}, {}, {}", _localStagingDir, _localInputDir,
-        _localSegmentTarDir);
-    Preconditions.checkState(_localStagingDir.mkdirs());
-    Preconditions.checkState(_localInputDir.mkdir());
-    Preconditions.checkState(_localSegmentDir.mkdir());
-    Preconditions.checkState(_localSegmentTarDir.mkdir());
-
-    _logger.info("*********************************************************************");
-    _logger.info("Raw Table Name: {}", _rawTableName);
-    _logger.info("Schema: {}", _schema);
-    _logger.info("Segment Name Generator: {}", _segmentNameGenerator);
-    _logger.info("Table Config: {}", _tableConfig);
-    _logger.info("Reader Config File: {}", _readerConfigFile);
-    _logger.info("*********************************************************************");
-    _logger.info("HDFS Segment Tar Directory: {}", _hdfsSegmentTarDir);
-    _logger.info("Local Staging Directory: {}", _localStagingDir);
-    _logger.info("Local Input Directory: {}", _localInputDir);
-    _logger.info("Local Segment Tar Directory: {}", _localSegmentTarDir);
-    _logger.info("*********************************************************************");
-  }
-
-  protected void logConfigurations() {
-    StringBuilder stringBuilder = new StringBuilder();
-    stringBuilder.append('{');
-    boolean firstEntry = true;
-    for (Map.Entry<String, String> entry : _jobConf) {
-      if (!firstEntry) {
-        stringBuilder.append(", ");
-      } else {
-        firstEntry = false;
-      }
-
-      stringBuilder.append(entry.getKey());
-      stringBuilder.append('=');
-      stringBuilder.append(entry.getValue());
-    }
-    stringBuilder.append('}');
-
-    _logger.info("*********************************************************************");
-    _logger.info("Job Configurations: {}", stringBuilder.toString());
-    _logger.info("*********************************************************************");
-  }
-
-  protected void run(String hdfsInputFileString, Long seqId)
-      throws IOException, InterruptedException {
-    Path hdfsInputFile = new Path(hdfsInputFileString);
-    int sequenceId = seqId.intValue();
-    _logger.info("Generating segment with HDFS input file: {}, sequence id: {}", hdfsInputFile, sequenceId);
-
-    String inputFileName = hdfsInputFile.getName();
-    File localInputFile = new File(_localInputDir, inputFileName);
-    _logger.info("Copying input file from: {} to: {}", hdfsInputFile, localInputFile);
-    FileSystem.get(hdfsInputFile.toUri(), _jobConf)
-        .copyToLocalFile(hdfsInputFile, new Path(localInputFile.getAbsolutePath()));
-
-    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(_tableConfig, _schema);
-    segmentGeneratorConfig.setTableName(_rawTableName);
-    segmentGeneratorConfig.setInputFilePath(localInputFile.getPath());
-    segmentGeneratorConfig.setOutDir(_localSegmentDir.getPath());
-    segmentGeneratorConfig.setSegmentNameGenerator(_segmentNameGenerator);
-    segmentGeneratorConfig.setSequenceId(sequenceId);
-    if (_recordReaderPath != null) {
-      segmentGeneratorConfig.setRecordReaderPath(_recordReaderPath);
-      segmentGeneratorConfig.setFormat(FileFormat.OTHER);
-    } else {
-      FileFormat fileFormat = getFileFormat(inputFileName);
-      segmentGeneratorConfig.setFormat(fileFormat);
-      segmentGeneratorConfig.setReaderConfig(getReaderConfig(fileFormat));
-    }
-    segmentGeneratorConfig.setOnHeap(true);
-
-    addAdditionalSegmentGeneratorConfigs(segmentGeneratorConfig, hdfsInputFile, sequenceId);
-
-    _logger.info("Start creating segment with sequence id: {}", sequenceId);
-    SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
-
-    try {
-      driver.init(segmentGeneratorConfig);
-      driver.build();
-    } catch (Exception e) {
-      _logger.error("Caught exception while creating segment with HDFS input file: {}, sequence id: {}", hdfsInputFile,
-          sequenceId, e);
-      throw new RuntimeException(e);
-    }
-    String segmentName = driver.getSegmentName();
-    _logger.info("Finish creating segment: {} with sequence id: {}", segmentName, sequenceId);
-
-    File localSegmentDir = new File(_localSegmentDir, segmentName);
-    String segmentTarFileName = segmentName + JobConfigConstants.TAR_GZ_FILE_EXT;
-    File localSegmentTarFile = new File(_localSegmentTarDir, segmentTarFileName);
-    _logger.info("Tarring segment from: {} to: {}", localSegmentDir, localSegmentTarFile);
-    TarGzCompressionUtils.createTarGzFile(localSegmentDir, localSegmentTarFile);
-
-    long uncompressedSegmentSize = FileUtils.sizeOf(localSegmentDir);
-    long compressedSegmentSize = FileUtils.sizeOf(localSegmentTarFile);
-    _logger.info("Size for segment: {}, uncompressed: {}, compressed: {}", segmentName,
-        DataSizeUtils.fromBytes(uncompressedSegmentSize), DataSizeUtils.fromBytes(compressedSegmentSize));
-
-    Path hdfsSegmentTarFile = new Path(_hdfsSegmentTarDir, segmentTarFileName);
-    if (_useRelativePath) {
-      Path relativeOutputPath =
-          SegmentCreationJob.getRelativeOutputPath(new Path(_jobConf.get(JobConfigConstants.PATH_TO_INPUT)).toUri(),
-              hdfsInputFile.toUri(), _hdfsSegmentTarDir);
-      hdfsSegmentTarFile = new Path(relativeOutputPath, segmentTarFileName);
-    }
-    _logger.info("Copying segment tar file from: {} to: {}", localSegmentTarFile, hdfsSegmentTarFile);
-    FileSystem.get(hdfsSegmentTarFile.toUri(), _jobConf)
-        .copyFromLocalFile(true, true, new Path(localSegmentTarFile.getAbsolutePath()), hdfsSegmentTarFile);
-
-    _logger.info("Finish generating segment: {} with HDFS input file: {}, sequence id: {}", segmentName, hdfsInputFile,
-        sequenceId);
-  }
-
-  protected FileFormat getFileFormat(String fileName) {
-    if (fileName.endsWith(".avro")) {
-      return FileFormat.AVRO;
-    }
-    if (fileName.endsWith(".csv")) {
-      return FileFormat.CSV;
-    }
-    if (fileName.endsWith(".json")) {
-      return FileFormat.JSON;
-    }
-    if (fileName.endsWith(".thrift")) {
-      return FileFormat.THRIFT;
-    }
-    throw new IllegalArgumentException("Unsupported file format: {}" + fileName);
-  }
-
-  @Nullable
-  protected RecordReaderConfig getReaderConfig(FileFormat fileFormat)
-      throws IOException {
-    if (_readerConfigFile != null) {
-      if (fileFormat == FileFormat.CSV) {
-        try (InputStream inputStream = FileSystem.get(_readerConfigFile.toUri(), _jobConf).open(_readerConfigFile)) {
-          CSVRecordReaderConfig readerConfig = JsonUtils.inputStreamToObject(inputStream, CSVRecordReaderConfig.class);
-          _logger.info("Using CSV record reader config: {}", readerConfig);
-          return readerConfig;
-        }
-      }
-      if (fileFormat == FileFormat.THRIFT) {
-        try (InputStream inputStream = FileSystem.get(_readerConfigFile.toUri(), _jobConf).open(_readerConfigFile)) {
-          ThriftRecordReaderConfig readerConfig =
-              JsonUtils.inputStreamToObject(inputStream, ThriftRecordReaderConfig.class);
-          _logger.info("Using Thrift record reader config: {}", readerConfig);
-          return readerConfig;
-        }
-      }
-
-      if (fileFormat == FileFormat.PROTO) {
-        try (InputStream inputStream = FileSystem.get(_readerConfigFile.toUri(), _jobConf).open(_readerConfigFile)) {
-          ProtoBufRecordReaderConfig readerConfig =
-              JsonUtils.inputStreamToObject(inputStream, ProtoBufRecordReaderConfig.class);
-          _logger.info("Using Protocol Buffer record reader config: {}", readerConfig);
-          return readerConfig;
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Can be overridden to set additional segment generator configs.
-   */
-  @SuppressWarnings("unused")
-  protected void addAdditionalSegmentGeneratorConfigs(SegmentGeneratorConfig segmentGeneratorConfig, Path hdfsInputFile,
-      int sequenceId) {
-  }
-
-  public void cleanup() {
-    _logger.info("Deleting local temporary directory: {}", _localStagingDir);
-    FileUtils.deleteQuietly(_localStagingDir);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java
deleted file mode 100644
index 1048dbbe2c1..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentCreationJob.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark.jobs;
-
-import com.google.common.base.Preconditions;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentCreationJob;
-import org.apache.pinot.ingestion.utils.JobPreparationHelper;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.spark.utils.PinotSparkJobPreparationHelper;
-import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.utils.IngestionConfigUtils;
-import org.apache.spark.SparkContext;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-
-public class SparkSegmentCreationJob extends SegmentCreationJob {
-  private static final Logger _logger = LoggerFactory.getLogger(SparkSegmentCreationJob.class);
-
-  public SparkSegmentCreationJob(Properties properties) {
-    super(properties);
-  }
-
-  /**
-   * Can be overridden to set additional segment generator configs.
-   */
-  @SuppressWarnings("unused")
-  protected static void addAdditionalSegmentGeneratorConfigs(SegmentGeneratorConfig segmentGeneratorConfig,
-      Path hdfsInputFile, int sequenceId) {
-  }
-
-  public void run()
-      throws Exception {
-    _logger.info("Starting {}", getClass().getSimpleName());
-
-    Path inputPattern = new Path(_inputPattern);
-    Path outputDir = new Path(_stagingDir);
-    Path stagingDir = new Path(_stagingDir);
-
-    // Initialize all directories
-    FileSystem outputDirFileSystem = FileSystem.get(outputDir.toUri(), new Configuration());
-    JobPreparationHelper.mkdirs(outputDirFileSystem, outputDir, _defaultPermissionsMask);
-    JobPreparationHelper.mkdirs(outputDirFileSystem, stagingDir, _defaultPermissionsMask);
-    Path stagingInputDir = new Path(stagingDir, "input");
-    JobPreparationHelper.mkdirs(outputDirFileSystem, stagingInputDir, _defaultPermissionsMask);
-
-    // Gather all data files
-    List<Path> dataFilePaths = getDataFilePaths(inputPattern);
-    int originalNumDataFiles = dataFilePaths.size();
-    retainRecentFiles(dataFilePaths, _lookBackPeriod);
-    int numDataFiles = dataFilePaths.size();
-    if (numDataFiles == 0) {
-      if (originalNumDataFiles > 0) {
-        _logger.info("No input files within {} days to be processed.", _lookBackPeriod);
-        return;
-      }
-      String errorMessage = "No data file founded with pattern: " + inputPattern;
-      _logger.error(errorMessage);
-      throw new RuntimeException(errorMessage);
-    } else {
-      _logger.info("Creating segments with data files: {}", dataFilePaths);
-      for (int i = 0; i < numDataFiles; i++) {
-        Path dataFilePath = dataFilePaths.get(i);
-        try (DataOutputStream dataOutputStream = outputDirFileSystem
-            .create(new Path(stagingInputDir, Integer.toString(i)))) {
-          dataOutputStream.write((dataFilePath.toString() + " " + i).getBytes(UTF_8));
-          dataOutputStream.flush();
-        }
-      }
-    }
-
-    // Set up the job
-    List<String> dataFilePathStrs = new ArrayList<>();
-    for (Path dataFilePath : dataFilePaths) {
-      dataFilePathStrs.add(dataFilePath.toString());
-    }
-
-    // Set table config and schema
-    TableConfig tableConfig = getTableConfig();
-    if (tableConfig != null) {
-      validateTableConfig(tableConfig);
-      _properties.put(JobConfigConstants.TABLE_CONFIG, tableConfig.toJsonString());
-    }
-    _properties.put(JobConfigConstants.SCHEMA, getSchema().toSingleLineJsonString());
-
-    JavaSparkContext sparkContext = JavaSparkContext.fromSparkContext(SparkContext.getOrCreate());
-    addDepsJarToDistributedCache(sparkContext);
-    JavaRDD<String> pathRDD = sparkContext.parallelize(dataFilePathStrs, numDataFiles);
-    if (_localDirectorySequenceId) {
-      Map<String, List<String>> localDirIndex = new HashMap<>();
-      for (Path dataFilePath : dataFilePaths) {
-        Path parentPath = dataFilePath.getParent();
-        if (!localDirIndex.containsKey(parentPath.toString())) {
-          localDirIndex.put(parentPath.toString(), new ArrayList<>());
-        }
-        localDirIndex.get(parentPath.toString()).add(dataFilePath.toString());
-      }
-      pathRDD.foreach(path -> {
-        SparkSegmentCreationFunction sparkSegmentCreationFunction =
-            new SparkSegmentCreationFunction(_properties, new Path(_stagingDir, "output").toString());
-        sparkSegmentCreationFunction.run(path, getLocalDirIndex(localDirIndex, path));
-        sparkSegmentCreationFunction.cleanup();
-      });
-    } else {
-      pathRDD.zipWithIndex().foreach(tuple2 -> {
-        SparkSegmentCreationFunction sparkSegmentCreationFunction =
-            new SparkSegmentCreationFunction(_properties, new Path(_stagingDir, "output").toString());
-        sparkSegmentCreationFunction.run(tuple2._1, tuple2._2);
-        sparkSegmentCreationFunction.cleanup();
-      });
-    }
-
-    moveSegmentsToOutputDir(outputDirFileSystem, _stagingDir, _outputDir);
-
-    // Delete the staging directory
-    _logger.info("Deleting the staging directory: {}", stagingDir);
-    outputDirFileSystem.delete(stagingDir, true);
-  }
-
-  private Long getLocalDirIndex(Map<String, List<String>> localDirIndex, String pathStr) {
-    return new Long(localDirIndex.get(new Path(pathStr).getParent().toString()).indexOf(pathStr));
-  }
-
-  protected void validateTableConfig(TableConfig tableConfig) {
-    SegmentsValidationAndRetentionConfig validationConfig = tableConfig.getValidationConfig();
-
-    // For APPEND use case, timeColumnName and timeType must be set
-    if (APPEND.equalsIgnoreCase(IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig))) {
-      Preconditions.checkState(validationConfig.getTimeColumnName() != null && validationConfig.getTimeType() != null,
-          "For APPEND use case, time column and type must be set");
-    }
-  }
-
-  protected void addDepsJarToDistributedCache(JavaSparkContext sparkContext)
-      throws IOException {
-    if (_depsJarDir != null) {
-      Path depsJarPath = new Path(_depsJarDir);
-      PinotSparkJobPreparationHelper
-          .addDepsJarToDistributedCacheHelper(FileSystem.get(depsJarPath.toUri(), new Configuration()), sparkContext,
-              depsJarPath);
-    }
-  }
-
-  protected void moveSegmentsToOutputDir(FileSystem outputDirFileSystem, String stagingDir, String outputDir)
-      throws IOException {
-    Path segmentTarDir = new Path(new Path(stagingDir, "output"), JobConfigConstants.SEGMENT_TAR_DIR);
-    _logger.info("Moving all segment tar files from: {} to: {}", stagingDir, outputDir);
-    movePath(outputDirFileSystem, segmentTarDir.toString(), outputDir, true);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java
deleted file mode 100644
index 22bae878126..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentTarPushJob.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark.jobs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.DefaultControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentTarPushJob;
-import org.apache.spark.SparkContext;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-
-
-public class SparkSegmentTarPushJob extends SegmentTarPushJob {
-  private final boolean _enableParallelPush;
-  private int _pushJobParallelism;
-  private int _pushJobRetry;
-
-  public SparkSegmentTarPushJob(Properties properties) {
-    super(properties);
-    _enableParallelPush = Boolean.parseBoolean(properties
-        .getProperty(JobConfigConstants.ENABLE_PARALLEL_PUSH, JobConfigConstants.DEFAULT_ENABLE_PARALLEL_PUSH));
-    _pushJobParallelism = Integer.parseInt(properties
-        .getProperty(JobConfigConstants.PUSH_JOB_PARALLELISM, JobConfigConstants.DEFAULT_PUSH_JOB_PARALLELISM));
-    _pushJobRetry = Integer
-        .parseInt(properties.getProperty(JobConfigConstants.PUSH_JOB_RETRY, JobConfigConstants.DEFAULT_PUSH_JOB_RETRY));
-  }
-
-  @Override
-  public void run()
-      throws Exception {
-    if (!_enableParallelPush) {
-      super.run();
-    } else {
-      List<Path> segmentPathsToPush = getDataFilePaths(_segmentPattern);
-      retainRecentFiles(segmentPathsToPush, _lookBackPeriod);
-      List<String> segmentsToPush = new ArrayList<>();
-      segmentPathsToPush.forEach(path -> {
-        segmentsToPush.add(path.toString());
-      });
-      JavaSparkContext sparkContext = JavaSparkContext.fromSparkContext(SparkContext.getOrCreate());
-      if (_pushJobParallelism == -1) {
-        _pushJobParallelism = segmentsToPush.size();
-      }
-      JavaRDD<String> pathRDD = sparkContext.parallelize(segmentsToPush, _pushJobParallelism);
-      pathRDD.foreach(segmentTarPath -> {
-        try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-          FileSystem fileSystem = FileSystem.get(new Path(segmentTarPath).toUri(), new Configuration());
-          // TODO: Deal with invalid prefixes in the future
-          List<String> currentSegments = controllerRestApi.getAllSegments("OFFLINE");
-          controllerRestApi.pushSegments(fileSystem, Arrays.asList(new Path(segmentTarPath)));
-          if (_deleteExtraSegments) {
-            controllerRestApi
-                .deleteSegmentUris(getSegmentsToDelete(currentSegments, Arrays.asList(new Path(segmentTarPath))));
-          }
-        }
-      });
-    }
-  }
-
-  protected ControllerRestApi getControllerRestApi() {
-    return new DefaultControllerRestApi(_pushLocations, _rawTableName, _pushJobRetry);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java
deleted file mode 100644
index 02c5834d285..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/jobs/SparkSegmentUriPushJob.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark.jobs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import org.apache.hadoop.fs.Path;
-import org.apache.pinot.ingestion.common.ControllerRestApi;
-import org.apache.pinot.ingestion.common.JobConfigConstants;
-import org.apache.pinot.ingestion.jobs.SegmentUriPushJob;
-import org.apache.spark.SparkContext;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-
-
-public class SparkSegmentUriPushJob extends SegmentUriPushJob {
-  private final boolean _enableParallelPush;
-  private int _pushJobParallelism;
-
-  public SparkSegmentUriPushJob(Properties properties) {
-    super(properties);
-    _enableParallelPush = Boolean.parseBoolean(properties
-        .getProperty(JobConfigConstants.ENABLE_PARALLEL_PUSH, JobConfigConstants.DEFAULT_ENABLE_PARALLEL_PUSH));
-    _pushJobParallelism = Integer.parseInt(properties
-        .getProperty(JobConfigConstants.PUSH_JOB_PARALLELISM, JobConfigConstants.DEFAULT_PUSH_JOB_PARALLELISM));
-  }
-
-  @Override
-  public void run()
-      throws Exception {
-    if (!_enableParallelPush) {
-      super.run();
-    } else {
-      List<Path> tarFilePaths = getDataFilePaths(_segmentPattern);
-      retainRecentFiles(tarFilePaths, _lookBackPeriod);
-      List<String> segmentUris = new ArrayList<>(tarFilePaths.size());
-      for (Path tarFilePath : tarFilePaths) {
-        segmentUris.add(_segmentUriPrefix + tarFilePath.toUri().getRawPath() + _segmentUriSuffix);
-      }
-      JavaSparkContext sparkContext = JavaSparkContext.fromSparkContext(SparkContext.getOrCreate());
-      if (_pushJobParallelism == -1) {
-        _pushJobParallelism = segmentUris.size();
-      }
-      JavaRDD<String> pathRDD = sparkContext.parallelize(segmentUris, _pushJobParallelism);
-      pathRDD.foreach(segmentUri -> {
-        try (ControllerRestApi controllerRestApi = getControllerRestApi()) {
-          controllerRestApi.sendSegmentUris(Arrays.asList(segmentUri));
-        }
-      });
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java
deleted file mode 100644
index d2d2958a930..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/main/java/org/apache/pinot/spark/utils/PinotSparkJobPreparationHelper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark.utils;
-
-import java.io.IOException;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class PinotSparkJobPreparationHelper {
-  private PinotSparkJobPreparationHelper() {
-  }
-
-  private static final Logger _logger = LoggerFactory.getLogger(PinotSparkJobPreparationHelper.class);
-
-  public static void addDepsJarToDistributedCacheHelper(FileSystem fileSystem, JavaSparkContext sparkContext,
-      Path depsJarDir)
-      throws IOException {
-    FileStatus[] fileStatuses = fileSystem.listStatus(depsJarDir);
-    for (FileStatus fileStatus : fileStatuses) {
-      if (fileStatus.isDirectory()) {
-        addDepsJarToDistributedCacheHelper(fileSystem, sparkContext, fileStatus.getPath());
-      } else {
-        Path depJarPath = fileStatus.getPath();
-        if (depJarPath.getName().endsWith(".jar")) {
-          _logger.info("Adding deps jar: {} to distributed cache", depJarPath);
-          sparkContext.addJar(depJarPath.toUri().getPath());
-        }
-      }
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/test/java/org/apache/pinot/spark/SegmentCreationSparkTest.java b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/test/java/org/apache/pinot/spark/SegmentCreationSparkTest.java
deleted file mode 100644
index da8aed734fc..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/test/java/org/apache/pinot/spark/SegmentCreationSparkTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spark;
-
-import com.google.common.base.Preconditions;
-import com.holdenkarau.spark.testing.SharedJavaSparkContext;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.data.readers.RecordReader;
-import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
-import org.apache.spark.SparkConf;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.api.java.function.Function;
-import org.apache.spark.api.java.function.VoidFunction;
-import org.apache.spark.sql.Dataset;
-import org.apache.spark.sql.Row;
-import org.apache.spark.sql.SQLContext;
-import org.apache.spark.sql.types.StructType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-
-public class SegmentCreationSparkTest extends SharedJavaSparkContext implements Serializable {
-  private static final String SAMPLE_DATA_PATH =
-      Preconditions.checkNotNull(SegmentCreationSparkTest.class.getClassLoader().getResource("test_sample_data.csv"))
-          .getPath();
-  private static final File TEMP_DIR = new File(FileUtils.getTempDirectory(), "SegmentCreationSparkTest");
-
-  @BeforeClass
-  public void setUp()
-      throws IOException {
-    FileUtils.deleteQuietly(TEMP_DIR);
-  }
-
-  @Test
-  public void testSegmentCreationInSpark() {
-    String tableName = "testTableName";
-    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(tableName).build();
-    Schema tableSchema = new Schema.SchemaBuilder().setSchemaName(tableName).build();
-
-    SparkConf conf = new SparkConf().setMaster("local").setAppName("test").set("spark.driver.host", "localhost")
-        .set("spark.ui.enabled", "false");
-    JavaSparkContext jsc = new JavaSparkContext(conf);
-    SQLContext sqlContext = new SQLContext(jsc);
-
-    Dataset<Row> df = sqlContext.read().format("csv").load("file://" + SAMPLE_DATA_PATH);
-    StructType dfSchema = df.schema();
-    JavaRDD<GenericRow> transformedRDD = df.javaRDD().map((Function<Row, GenericRow>) row -> {
-      GenericRow genericRow = new GenericRow();
-      String[] fieldNames = dfSchema.fieldNames();
-      int size = row.size();
-      for (int i = 0; i < size; i++) {
-        genericRow.putValue(fieldNames[i], row.get(i));
-      }
-      return genericRow;
-    });
-
-    final List<String> expectedSegmentNames = new ArrayList<>();
-    int numPartitions = transformedRDD.getNumPartitions();
-    for (int i = 0; i < numPartitions; i++) {
-      expectedSegmentNames.add("testSegment_" + i);
-    }
-
-    AtomicReference<Integer> count = new AtomicReference<>(0);
-    transformedRDD.foreachPartition((VoidFunction<Iterator<GenericRow>>) genericRowIterator -> {
-      List<GenericRow> genericRowList = new ArrayList<>();
-      while (genericRowIterator.hasNext()) {
-        genericRowList.add(genericRowIterator.next());
-      }
-
-      SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(tableConfig, tableSchema);
-      segmentGeneratorConfig.setOutDir(TEMP_DIR.getPath());
-      segmentGeneratorConfig.setOnHeap(true);
-
-      // Set segment name
-      String segmentName = "testSegment_" + count.getAndUpdate(v -> v + 1);
-      segmentGeneratorConfig.setSegmentName(segmentName);
-
-      RecordReader recordReader = new GenericRowRecordReader(genericRowList);
-      SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
-      driver.init(segmentGeneratorConfig, recordReader);
-      driver.build();
-    });
-
-    String[] segments = TEMP_DIR.list();
-    assertNotNull(segments);
-    assertEquals(segments.length, expectedSegmentNames.size());
-    assertTrue(expectedSegmentNames.containsAll(Arrays.asList(segments)));
-  }
-
-  @AfterClass
-  public void tearDown()
-      throws IOException {
-    FileUtils.deleteDirectory(TEMP_DIR);
-  }
-}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/test/resources/test_sample_data.csv b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/test/resources/test_sample_data.csv
deleted file mode 100644
index 4c2a3fe20f6..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/src/test/resources/test_sample_data.csv
+++ /dev/null
@@ -1,10002 +0,0 @@
-column1,column2,column3,column4,column5,time_day,column7,column8,column9,column10,column11,column12,column13,column14,column15,met_impressionCount
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,jgn,na,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,lVH,LHS,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,kWZ,kWZ,fU,Om,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,pm,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,vJwx,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,kB,RSST,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,BQ,NdS,l,FN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,YO,HaU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RI,jmef,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RI,iADy,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,na,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mR,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,aW,tCo,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,ai,LHdO,hk,sdCB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,aE,DME,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,aE,yC,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,yH,oh,hk,Dq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,FL,khbX,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,gI,Cj,hk,mrYK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,jF,ev,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sD,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sD,xa,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,FvO,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,qVs,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,FN,XLQ,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Nc,Kuz,oA,bpC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mO,IamB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mO,GxE,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,OpTS,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,IouE,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,nt,zz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,nT,jHBL,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,yC,FvO,oA,bpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ri,xxmj,l,jgtB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ri,DME,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sa,mwY,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,fr,aUhF,T,mEr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,fr,YO,lR,ZXtM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Bu,bfM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,JI,ev,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,os,gxdH,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,os,pf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,qh,TBUv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,u,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,u,SC,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,G,pgG,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,k,gOZx,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,k,dYPI,L,G,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,k,xa,L,G,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,n,fX,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,O,EPcs,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,,FqO,oA,RvPJH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,,pgd,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,,sp,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oen,aiR,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Cme,xa,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,qVs,pf,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,kWZ,Vvh,fU,Om,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,bf,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,bf,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,aW,wtY,oA,bpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,aW,dYq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,aW,YO,,,5327653760319593481
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,mO,xa,,,8257798663846186539
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RC,aRnz,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RC,cRzS,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RC,VwET,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RC,pf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,zj,YO,oA,ZKX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,zj,na,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oh,IamB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,yC,RSST,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,zW,qyCG,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sp,ZNN,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sp,pgd,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,EY,Ri,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,SC,KCWa,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,n,gRTo,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FmorqlR,VONBE,,i,RI,LHS,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,uXLmlQL,dtobc,yH,D,Kg,Os,lR,ZUA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mhyOpMP,wkBHp,QMl,D,hyz,IamB,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FajpCqL,mNgaz,QMl,i,k,ber,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,TuukVMb,EWrtg,,i,TGR,RSST,l,FN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,BgoNbKd,pgAZa,zZe,i,sp,SC,T,Aleo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,emDWTNz,,Vj,i,FL,ev,lR,Jmq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mKNTlfY,mfFVk,,i,os,y,T,mEr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,hRMziEv,oQByA,gpyD,i,Kg,Kg,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,XzkqjoY,,LDk,D,ai,GCL,hk,AlRx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EGURJWI,EmcES,CqC,i,n,na,lR,kuCD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rRxpIIT,JYxTL,bVnY,i,mO,Nc,hk,pf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,WIzdGfI,ERiHU,ez,D,vk,xa,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,GPVjFo,MzmlP,Vj,D,aW,Bkt,hk,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,HaWAgM,FVyoD,,D,SC,lQU,ri,pk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,IcvTMV,yXPia,QMl,i,ai,Ouf,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,tKkNnu,VwkYy,opm,i,iL,ZFX,lR,nLuQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,UrKkbu,srScQ,QMl,i,RV,MAI,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,VRcTNW,FPgQL,LDk,i,aW,Rwjb,i,iXrH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,AUrVyc,zSbLi,zZe,i,FN,aPt,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,obVyWP,KgLFo,rNcu,i,Lz,CdC,fU,DoN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,KQfvop,WGaOF,EXYv,i,RV,Cj,hk,ZGZZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZnwIbm,cbkAW,QMl,i,RC,Cj,lR,VodN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,PlLndT,,CqC,i,IT,KMAv,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mfYKPG,UcrWb,ez,i,GF,KCWa,lR,NuQz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,GWqQjN,lLQxd,LDk,i,aW,qyCG,i,WoMac,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,TckzeJ,ponOy,,i,os,gI,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,Jdxhjl,,LDk,i,iL,HwD,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ygRfdW,buQGw,jb,i,kB,etS,l,zemM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dwmjPZ,hZPDA,,i,u,Cj,T,fx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,tBzNZg,QUpDF,bVnY,i,THd,pgd,i,wll,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,MbJchs,VONBE,Pcb,i,RC,YO,lR,WIJK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,QxITxV,Dwamc,bVnY,i,RC,bfM,l,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rcFUfh,,zZe,i,zz,iGu,i,jrJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,iMYOu,sTwxB,zZe,i,GF,Ri,l,SGYS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,CjgyM,UpZhy,,i,u,sp,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,tkApi,NWHpW,,i,kdc,SC,T,mEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mwVZX,,CqC,i,jgn,FvO,hk,dQD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,oglVP,ZSNHC,ZQa,i,xk,zI,lR,qWvqw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,QpIBq,zmspf,,i,GF,Zvq,hk,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,JMzKv,puepy,yhq,i,GF,aRnz,lR,iSdbn,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dqqaA,sKhEy,,D,yC,HSL,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,zsgAQ,,zZe,i,xa,Wjnt,i,hI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,AUUoU,uJusT,Pcb,i,Lz,zlG,l,aSRa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,OybFA,dvfBD,VsKz,i,Kg,DQc,hk,yggsT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EXxWQ,NTaLY,LDk,D,iL,HaU,lR,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wTxMu,OqPXk,ez,i,iL,zW,hk,jVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,tWxJk,,QMl,i,cZ,uGF,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dPIPo,gUDiL,bVnY,i,SC,y,lR,Ikqq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,QahYV,iFIWb,Pcb,i,pk,SC,lR,kjFzc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,vjVnY,,xDLG,i,EY,gOZx,i,MyWW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,UtlxO,zLfaS,ez,i,uP,sp,lR,UZAPh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,IxNhu,DrkVz,yhq,U,GF,uECy,l,kVsn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,uVUw,WRyHn,opm,i,Cj,yH,i,CWq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,hnRw,yPBim,VsKz,i,GF,nT,fU,slu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,NuwB,,iV,i,xk,y,lR,NFu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,LQrW,,OYMU,i,GF,IamB,fU,wgha,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,llOr,YoxHS,CqC,i,FL,ev,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wDIY,eSjKX,iV,i,iHi,SC,lR,ASxF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,VHWL,AqUSW,EXYv,i,oh,Cj,i,SKuV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,gNBZ,IPrKk,gpyD,i,os,Cj,lR,usOd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,eKQv,NgyUp,KsKZ,i,os,WNP,L,gNv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,pGtq,rGzDb,ez,i,iL,jF,hk,WEd,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SCLB,pLoSq,yhq,i,n,Cj,lR,BIg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,WqZQ,ViguX,CqC,i,GF,eQE,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,JLtb,,,i,sa,QhZm,lR,RyV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wBFv,ERiHU,,i,Kg,Bkt,oA,bpC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,iTQU,pcpoK,,i,mO,kgW,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wiVe,RrTeS,,i,FL,sp,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,xBST,vZyhX,yhq,i,gI,RV,i,eBAm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,UVZb,RdRxf,zZe,D,OS,XLQ,lR,mxSL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,eBab,xZsRI,CqC,i,G,gI,l,BLEs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,gOXsw,yH,i,mO,Wu,lR,KR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,IgZNL,,i,ai,HSL,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,cqJdC,QMl,i,na,kck,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,FbvHy,mNh,D,hSE,gmi,T,rEy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qPmqU,mNh,D,xk,RV,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,fGjUu,QMl,i,mO,pf,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,gCAcv,,i,mR,XLQ,fU,Om,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,LiFpo,gpyD,i,os,pf,lR,yOqZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,SgWNS,QMl,i,n,ev,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zLfaS,,i,OS,rmJ,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,TdMRE,gpyD,D,hyz,YO,lR,VeN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,EwHnk,ez,i,BAR,gci,lR,epE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ywvpt,QMl,i,n,PF,T,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,GwJNJ,Pcb,i,TFX,uGF,fU,rRm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,SZDsW,,i,FMt,gI,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,AMEDi,,i,SC,Cj,L,G,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,xkeAA,Gac,D,FW,Cj,l,pdxSx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,CQVvq,,i,GF,DME,L,G,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,NHNrT,QMl,i,sa,juI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,lGmoe,QMl,i,JnB,Zsbp,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,hFYeU,,i,RV,NdS,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,RTQUJ,LDk,i,Cj,PnY,i,zz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zqBwb,rNcu,i,RC,jBP,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,hQGku,,i,RC,gI,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,cdmXU,QMl,i,jF,yC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zbaAA,ez,i,vk,pgG,hk,FZj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,teKMc,,i,Zi,HSL,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YJtol,Pcb,i,qh,HSL,lR,hPqa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,lASnD,,i,BAR,XOk,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UriEN,,i,ZW,mEr,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,CoHoq,yhq,i,Zi,y,lR,n,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,jgndS,KsKZ,i,u,y,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,QJuki,,i,fr,Kg,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ydRMd,QMl,i,Zi,gI,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,Fbzqh,,D,xk,aZ,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,LXcTm,,D,n,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,diaAm,bVnY,i,Bu,jaD,i,GF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UmBSN,,i,Zi,y,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,JFMRC,QMl,i,os,LHS,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,LJytA,zZe,D,RI,na,hk,CyOu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,rXnhf,CqC,i,GF,gI,lR,BBsg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,SklNG,QMl,i,zOi,gI,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zLIpF,,i,Zi,zz,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,RUGgg,,i,FL,Kg,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,yZyjK,,i,n,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,dUgkb,QMl,i,iL,,T,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,rGzDb,Pcb,i,u,rbp,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,hAjyU,,i,pqp,AGz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,VbvIi,zZe,U,WI,gOZx,hk,AGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,SMkvw,QMl,U,xk,,L,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,cEpGn,,i,RI,Cj,fU,oMY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,KOJjz,KsKZ,i,FL,RSST,l,fX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UcrWb,,i,iHi,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,yFAAH,,i,n,TAUy,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,MMnif,gpyD,i,IT,uECy,lR,XEY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,VsKz,U,Ld,JLm,hk,OnpZD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,VsKz,i,KR,sTpa,i,gXWk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,LjAS,D,os,aRnz,hk,aE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,U,Zi,Yxhj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,yf,cmmA,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,D,G,hmKv,T,rjWV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,Gac,D,kWZ,pPN,T,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,yH,D,RC,jF,lR,Ljdi,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,ez,D,BAR,IouE,hk,FZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,iV,i,G,sp,i,xKSj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,Vj,U,RI,Cj,hk,UjeQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,FN,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,Pj,kokY,hk,rdsY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wKrLBit,,,i,Zi,uECy,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PaBknji,wnVGZ,xDLG,D,RI,fX,lR,MZHOk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oAZASeI,tOKzC,VsKz,D,u,lQU,hk,ZcH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gsCarZU,DCyLX,,i,GF,gOZx,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RoVuYBu,sUPaq,zZe,i,Ri,xa,l,Fdjr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,enwJcNY,miwCS,jb,i,RV,hmKv,l,sLxzZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VWvRpRs,JWQHp,KsKZ,i,dQD,TxcW,hk,Hyle,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AiOtzMF,troYa,xDLG,D,GF,SC,lR,Qhv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IrLEjye,xxpLa,,i,Zi,Kg,fU,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CLgPoXa,Dwamc,bVnY,i,xk,EF,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hivNuhT,,ez,i,mR,Mcs,lR,ySq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eMbDSWn,Aclqz,zZe,i,sa,hmKv,lR,Peh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tExvTwQ,Ujcdv,KsKZ,D,ZJA,nT,l,fX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mYdEjZM,VLgQz,EXYv,i,KR,aFx,l,iUxL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TiFKkJf,fQNSn,,i,u,jaP,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OIdgdcH,DzgFa,iV,i,oen,RSST,lR,Myl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IKwYLOY,hrmwJ,Vj,D,RI,y,l,TGR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fMluxRC,uoXfm,ez,i,BAR,tCwq,lR,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eIPKArq,,Vj,D,ZJA,,lR,ZRb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UBULPzK,AXhVB,EXYv,D,vk,SC,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uOTMfvr,,zZe,i,Bu,VyBk,lR,wTHj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZsYbQNj,fEcDb,zZe,D,SC,WNP,L,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CItOIdB,jrPjI,zZe,i,Lq,DQc,i,hI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XfTBsru,,ez,D,ZKX,gOZx,lR,FeM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JVnDfLC,NtAva,mNh,i,pm,pPN,fU,YSZQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RPqWatx,xMwkY,QMl,i,pm,IamB,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JjpcUyV,gqTIk,,U,ai,YO,l,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xkmlJKf,QbFYx,QMl,D,GF,PnY,T,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vVBGqkt,mDfiz,QMl,i,RI,xa,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,agHeWuE,aGAzh,EXYv,i,Kdq,hmKv,lR,THd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hGOGZRu,ARWie,iV,i,FN,HSL,L,ai,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xgJvPIL,,VsKz,i,aW,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eAFMpWX,CgiNm,EXYv,i,Nc,gI,hk,uSqB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uGPvWab,QImNH,jb,i,k,hmKv,lR,iWk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TLXLgwi,Lbfjw,EXYv,i,RI,SC,lR,WNP,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WXEfBIR,DXrtg,QMl,i,k,rbp,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nyiCMXT,eKOcq,QMl,i,KR,Cj,T,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PDtQAoo,ponOy,,i,RC,pPN,hk,db,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kBUuaTt,CfjhB,xDLG,i,wGj,KCWa,l,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JmOozbn,RdvaT,QMl,i,FN,aRnz,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DkmNWLG,gyPef,,i,FN,ypXm,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xBDZhdg,sKsmi,OYMU,i,Om,wIy,hk,tnmdE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aPOWpBp,fLSep,zZe,i,THd,Zsbp,l,fx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JPirWEv,ZnMDV,VsKz,D,IaL,gOZx,i,nTcS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AjoIZDk,,rNcu,D,mR,tCwq,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XPzIvWA,,LjAS,D,YO,,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wserUSG,ZMLHC,,i,oLI,Cj,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fVhjgUY,,,i,n,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xkqZoPM,XVSxY,yhq,i,SC,WEd,i,HcUob,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OmqsazP,EwHnk,,i,kWZ,eQE,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dcUowRM,NMwlg,mNh,D,Ep,hmKv,lR,wxG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IKkDlbD,yDaUW,bVnY,i,n,Wsd,lR,Pcxp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zdwXbvQ,pziuA,rNcu,i,Kdq,Cj,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,swqHrEo,QUjYe,xDLG,D,FW,buw,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qIIwRYV,oBwBc,zZe,D,RI,kPj,l,WRvL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YijZvPR,OJkEB,KsKZ,i,Zi,zlG,l,vczI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DyrZKFy,yQnHf,ez,i,Cme,RV,lR,UzUx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gyWzLbm,eUwwX,ez,i,uP,Vvh,lR,tSOb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EbksOOf,uYWpN,Pcb,U,Ot,pf,lR,MAI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jGGIXIg,VGgQZ,CqC,i,GF,LKKI,L,cBU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XlHovHj,iNEkm,,i,GF,mwY,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uidArFt,XsLDX,aN,i,n,TxcW,hk,vML,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wYPegDk,tGvIu,opm,D,hyz,,lR,PUk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HZrPGcG,zOpXm,VsKz,i,GF,sp,l,UbHK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mmJvrhj,jJOWz,bVnY,D,Kg,yH,lR,NwXb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TkwEnpm,SEtRV,,i,ai,gI,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pjvlKcj,OCsfh,,i,u,pPN,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kBPHOye,tGvIu,QMl,i,Ri,TNuV,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gRJWDO,RdvaT,yH,i,xa,bf,i,sp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jDxYhV,xHbeQ,QMl,i,k,xa,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XtxSOI,,yH,i,Zi,yyik,i,nhdC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ldbZVO,pzLPd,mNh,i,Cme,,l,xVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jDrVTF,,QMl,i,GF,,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dueOhB,,mNh,D,hSE,uECy,T,yC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JlSIKs,VGgQZ,yhq,i,Zi,LKKI,lR,NLE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XEWFza,Tnbgj,mNh,i,RI,YO,L,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zUXnpY,UriEN,zZe,i,yC,aRnz,l,aiR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sGVsbI,VdCfJ,Pcb,i,qh,y,fU,rRm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iAItWA,ZZWNX,rNcu,i,RC,ev,fU,AEzV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QKXRWv,CcpoJ,,D,RI,,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ufOFWZ,jxlBy,jb,i,jgn,yH,l,zOi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hUAnlj,NWHpW,,i,RI,SC,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fztWGv,LySkr,jb,i,GF,rcz,lR,yLks,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVsEBn,EnYIx,gpyD,i,YO,y,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cqZBuJ,QUpDF,gpyD,i,KR,nT,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NCUeEm,dheCD,VsKz,U,ZW,uECy,lR,YzoH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xZzDtr,QDnFE,bVnY,i,RI,ev,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YpPFHH,jvpnP,Gac,D,nj,ysh,l,tUTg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZSGcWG,iqCJk,bVnY,i,zlG,FqO,lR,UClR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HBFfDB,BCbXo,rNcu,i,Lq,HSL,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nmuHEr,BQMij,Pcb,i,u,Kg,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PzUpip,cXMdb,bVnY,i,GF,Ri,l,hSw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HjmtwX,uQkno,,i,EF,zz,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UXUPRE,Aibzq,rNcu,i,eG,KtFl,l,cfU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RGWsIc,qWMEz,iV,i,SC,DDPD,lR,HuE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jeaeKL,aPBma,EXYv,i,Bu,y,i,qy,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yrdERy,vTspx,rNcu,i,RC,xa,l,jXGnP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dWknXz,IfTcW,rNcu,i,aZ,y,L,iL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UePjNA,AMEDi,,i,RC,Cj,l,THd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wFTnQR,DzgFa,,i,sD,zNvM,l,FN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XpzWVh,JjjZb,xDLG,D,boZ,aRnz,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OEjLoy,uYWpN,rNcu,i,n,ev,L,rUhM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uyjuTQ,SVLxE,ez,D,os,pBlc,lR,lAUK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ybysoj,ssmlR,mNh,i,GF,XOk,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aAtHMc,,mNh,U,iL,uECy,lR,frg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TqISsY,OTmTL,bVnY,i,pk,xa,i,zpY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ykSNCu,DBqUl,QMl,i,zW,Wsd,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jPmTxv,jIXPf,QMl,i,k,VkB,T,KDNj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pkmFUv,HXSgR,QMl,D,RC,pf,fU,Lna,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IulVrv,laGio,LDk,D,kWZ,WHBi,hk,pxPe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PEKdCA,xJzGg,rNcu,i,mR,dYPI,lR,gMelz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VuBdHP,FRUYV,zZe,i,FN,WMz,l,bHqM,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yBJfxT,YLzYF,CqC,i,ZW,YO,lR,ots,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RShuhl,jCPPl,ez,i,SC,aPt,hk,hDk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tsqhjJ,pcpoK,QMl,i,FL,mwY,T,DoN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vNckBz,SefEe,mNh,D,JnB,hmKv,L,PTXQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QzJHid,ZQGrY,OYMU,i,FN,qyCG,lR,aNX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WAujFF,KEohZ,KsKZ,i,Cme,dYPI,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dLvvPq,auWsL,Pcb,i,zlG,Kg,lR,OeB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gsluGU,qZzCL,EXYv,i,n,hmKv,fU,nsR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YWhLuR,oWoZd,bVnY,i,GF,hmKv,fU,pqp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qdHsgx,QUpDF,opm,U,hyz,Cj,lR,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yAZmcq,QjAFk,bVnY,i,GF,JoXv,i,QcT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eEFnjI,,CqC,i,n,IThq,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VZRkIf,aAtHD,EXYv,D,Cme,YO,l,RQLjI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UnMBmJ,erQTG,mNh,i,Ot,dYPI,fU,MmY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rEzzEc,vrlAM,Vj,D,ZJA,hmKv,lR,RKFUM,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JXVZIj,ZQGrY,bVnY,U,k,qyCG,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QgOeSE,ivYgu,QMl,i,GF,Zi,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lnuwTF,eGUBA,LjAS,i,Ot,YO,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yyHXcj,GCXEW,QMl,i,zlG,xa,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JYgpbl,Pwwsw,QMl,i,n,WSIq,fU,nT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FMlSbF,hQOsJ,,i,RC,Cj,fU,PF,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qNNyPr,,Vj,i,k,Cj,hk,UjeQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UxvwUH,gOXsw,LDk,i,iL,lxg,i,CWq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BPCHld,pNMtG,xDLG,i,Nc,y,fU,oLI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FOIjbH,KgLFo,iV,i,ZW,rbp,hk,HcsKT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aMxjGq,jJOWz,EXYv,i,GF,,l,eQE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rvrguc,SiLfq,VsKz,i,zj,WMz,lR,nUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JyzmGz,,,i,cZ,Yxhj,l,MpP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bJBDBx,xZsRI,jb,i,FL,gI,fU,ZnZf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BOaYEY,YEATg,,D,BfM,,ri,Buag,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lJeLMx,RdvaT,mNh,i,H,pf,lR,kB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QfBwlV,ZSNHC,yH,i,mO,zI,lR,aiFIS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TgXitT,AXhVB,QMl,i,y,PF,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ahkmIj,qkqKB,VsKz,i,os,hmKv,fU,yPsg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TRMZDQ,MWxHT,ez,i,uP,WNP,hk,pJu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVyaka,cNLnu,bVnY,i,Kg,ev,lR,os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,klEPbU,tbnKY,CqC,i,G,zNvM,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jMNNNx,ePyBk,iV,U,ZJA,uECy,lR,facO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FRTxWi,POfGg,VsKz,i,Lq,HSL,hk,nUw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YmaHve,wNpHN,gpyD,i,RI,na,lR,cekoS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TGnjcf,kemle,EXYv,i,nT,yGet,hk,MBL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MryDnh,vpaSZ,QMl,i,n,YO,fU,nGz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IcYPef,ZvTyL,,i,GF,DDPD,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eCyrqV,zktNk,VsKz,i,ZJA,,lR,whJi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dVEYNr,KOJjz,CqC,D,GF,hmKv,lR,KPGx,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RszVaQ,JMwtw,LjAS,D,G,dbdK,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eXESVh,VONBE,rNcu,i,sp,zz,fU,tClQc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fIOGiN,XctNb,yhq,i,os,bf,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SltlNC,DzgFa,VsKz,i,n,TAUy,lR,EoNf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,koACbX,,jb,D,Pj,ZDQc,fU,DME,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nrKRri,YJtol,Pcb,D,u,HSL,hk,fzn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mdHlMZ,ZTmRc,,D,RI,ZNN,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ecrpLg,FVyoD,ez,D,Pe,Qhv,l,rOw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lVMiHU,,zZe,i,zz,DDPD,i,EHI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QpCQNK,PQodN,gpyD,D,ZJA,dYPI,lR,hFLt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,liejvu,dGrfN,rNcu,i,RV,ev,fU,EGVC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lWJfnG,eSjKX,VsKz,D,SC,lVH,hk,RyC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gvnuTi,vrlAM,QMl,D,GF,hmKv,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DqLrPS,rmSkc,,i,RI,zz,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EcazWI,LLBPX,CqC,i,Cme,sp,lR,ots,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZXudbO,fFPdL,ez,D,bf,Cj,lR,NxI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oMaBdo,zLIpF,jb,i,k,zz,L,uPqM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dMElzW,gMbWu,VsKz,i,Cj,uECy,i,LELDE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gAKupv,kGWYq,jb,i,mO,Cj,l,zmB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Gdvhfm,SklNG,LDk,i,iL,bvX,i,CWq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,evXQPV,cPETG,CqC,i,ev,pf,hk,u,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,htBpBd,HLYZq,xDLG,i,iL,cmmA,lR,Oxt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,clduxE,kSXVa,CqC,i,GF,RqID,hk,zj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rxlQoj,,KsKZ,i,Ri,Cj,i,OUn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ABxuqm,QUpDF,xDLG,D,os,,l,RBBc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vUwFeC,SklNG,yhq,i,EY,uGF,lR,ev,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rsavfe,AMEDi,jb,i,nt,cbZ,l,zHvP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eyDIZq,ZnMDV,LDk,i,aW,YO,lR,DuQM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ClTPsv,LQsok,LDk,D,iL,YO,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uquPzm,nkrFs,opm,i,iL,buw,hk,Inq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uquPzm,nkrFs,Vj,i,iL,buw,lR,SOmf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GFyZVL,,OYMU,i,RC,Cj,l,cpi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XIVvyX,PQFio,opm,D,GF,xa,lR,fkTVa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tfeava,iaoio,Vj,i,O,ev,lR,rvHa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HZlMGL,zLIpF,yhq,D,mR,pf,i,eG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xtzgol,,mNh,i,Cme,TBUv,lR,Ybk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hdQGbe,yXGhi,gpyD,D,FL,pf,lR,Rfp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,comlke,aEQZY,EXYv,D,RC,sWhI,lR,mVP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CCKOid,teKMc,LDk,D,iL,HSL,lR,hyz,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nqwyVE,LySkr,rNcu,i,GF,yH,lR,QFU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,deGmqJ,JpXCs,zZe,i,iL,db,i,qVs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WAXYUT,eSjKX,ez,i,bf,YO,l,eYIo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GDkbVd,nMlTX,mNh,D,iL,MpP,lR,lsC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sOwsmU,GVQal,jb,i,YO,dYPI,i,Kg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,omMQcp,QhWhI,yhq,i,zj,eQE,lR,GEp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hKuFne,,ez,i,iL,uWTD,l,rOw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NZsJOv,,jb,i,GF,y,lR,vk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oVFsAL,,zZe,i,xk,Cj,i,jBP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HwmHPz,oGiPf,LDk,i,iL,kPj,lR,hyz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tjMFmA,KowCL,,U,u,XOk,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fTyAhb,nOmkK,aN,i,KR,ZDwU,i,wIy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,llCGrt,BnOoc,,i,FL,RSST,lR,XhU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xiTqBe,lTyLf,mNh,D,Cme,aRnz,lR,uVrB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gHbBMr,trxic,VsKz,D,iL,y,l,uftgd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,buLKln,QHvzH,bVnY,i,GF,XLQ,lR,yf,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cvrrZF,aGAzh,gpyD,i,GF,hmKv,lR,rBfz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XZoRQW,TttFj,yhq,U,iL,ESA,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JfxFBE,VdCfJ,LjAS,i,OS,ev,l,IbuH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qAZkXF,esPGq,mNh,i,pm,dYPI,lR,ss,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yxTidc,XmDvh,xDLG,D,iL,HaU,hk,rdku,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YwgmtO,KOgbb,LDk,D,aW,xa,lR,MTE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QnFEIb,sTwxB,KsKZ,i,iL,Ri,l,fX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cfzvuQ,MMnif,CqC,i,n,uWTD,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JpPMsn,moFdE,,i,FN,Cj,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nwRVwW,tEJnc,KsKZ,D,k,VIM,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AEbbux,CfjhB,iV,i,n,IamB,lR,ORtT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EZrHOB,Aclqz,mNh,i,GF,zNvM,lR,Ybk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VZxsHi,QbFYx,bVnY,D,ePq,RV,lR,UDrC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sUTpsa,,jb,i,bf,cmmA,i,Kg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lBQTOO,KgLFo,Vj,i,ZJA,SC,lR,FtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QUSagg,wubWu,iV,i,FL,Kg,i,nVuO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TWLvqP,,LjAS,i,jgn,WNP,fU,rpfuZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SdLjwz,bLUGl,ez,i,RI,lGa,fU,hZLC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FXJFXr,,iV,D,u,Kg,lR,rSju,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SIjZqc,UgQaa,bVnY,i,zlG,Bkt,lR,Pek,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FSfEuB,gUsbv,rNcu,i,zj,y,lR,kRyy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XYlxez,,bVnY,i,yC,gxdH,l,tHC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QClvuT,OCBNS,OYMU,i,xVO,jBP,lR,Qnoe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IteSnP,pOcRm,KsKZ,D,nt,gmi,i,FDsv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tdjzsk,DnTGD,QMl,i,Cme,xa,T,Oase,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RtXNgW,Lsxds,KsKZ,i,qh,dYPI,hk,PcJFm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cNrNRN,LQsok,iV,i,Pek,YO,l,QMod,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EDGIPt,HGnGo,bVnY,i,RI,y,l,MQBC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xeXPZy,zpINo,VsKz,D,aW,pgd,lR,gMwDd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rYAVTN,uSgnS,aN,i,JnB,YO,T,ptKg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZoguhX,mGUGe,ez,D,bf,dYPI,i,KZJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aKjhdK,OCsfh,VsKz,i,vk,gI,lR,OsJm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RzsKNF,LyGdu,bVnY,i,bf,IamB,lR,boZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HWmCH,pcpoK,gpyD,i,FL,zz,lR,EzDR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZDRVm,qwbvG,,i,GF,FvO,hk,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RnovJ,,VsKz,i,qy,yGet,l,iocJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wOYbG,wAOwe,Vj,U,RC,,lR,SlnT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nYhgs,kfqKW,,i,Nc,Cj,fU,VhXh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iFJTZ,,jb,i,RI,,lR,ZGyi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eTUcH,pLYXJ,KsKZ,i,RC,rbp,lR,Xjg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pBglJ,uVdCT,LjAS,i,n,TAUy,lR,TQWk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IMESg,IcVDs,,i,u,kwK,T,EQj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eUmqq,iMSaA,ez,i,aW,pf,l,gpANn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UAHUv,Fbzqh,Gac,D,Lq,aZ,hk,CNjpX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JcGLI,CgiNm,bVnY,i,db,yC,l,hSw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ONrrn,KKSVd,CqC,i,Cme,IamB,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CSWyG,mONwL,rNcu,i,RNB,Ri,fU,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aoZgG,DFOIz,EXYv,i,Zi,aRnz,i,DOVg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OeZqq,srekm,rNcu,i,O,y,L,iL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JVvoB,wLpmB,mNh,i,sa,y,hk,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cwLVZ,eOvKA,iV,D,GF,YO,hk,ahkG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZEdZc,POrHL,ez,D,vk,uECy,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zKpPn,VzUtA,aN,i,GF,SC,lR,uAuT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nXpId,KSiMG,QMl,i,xk,YO,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ouejA,hQOsJ,,i,kdc,dYPI,T,mEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YkVKi,UpZhy,rNcu,U,RC,IamB,lR,SgaZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XcTqS,VAVml,bVnY,i,YO,ev,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pbHwE,CiZAV,opm,D,JI,Zvq,hk,zcdds,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sHdNV,EWrtg,CqC,i,FL,,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RLTIa,dEvnd,,i,db,dYPI,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XsAXI,qygIq,LDk,D,mO,Mcs,l,kSEN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MuCBO,mtJJa,EXYv,i,k,Zsbp,l,iUxL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AEffW,EmcES,EXYv,D,Ep,na,l,VcZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DiuII,LyGdu,KsKZ,i,FL,RSST,lR,IaFA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xuAuN,XctNb,yhq,i,sD,na,lR,n,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VLpBs,jWpps,Pcb,D,u,LHdO,lR,ywB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,syOVv,lUfTH,CqC,i,ePq,Lel,lR,ufVD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wYMRk,mDfiz,xDLG,D,iL,sp,hk,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aOUxY,YTckD,Vj,D,zz,hmKv,fU,JEPJr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NRDHh,PkDWB,,i,vk,pf,fU,FL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oUYUu,bWJlU,VsKz,i,ZW,y,l,HxSR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KVGOf,pLYXJ,,i,RC,WNP,fU,tOk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MNobh,,,i,iL,rSZ,lR,Rse,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OslYs,yUWuX,opm,i,RyV,RqID,lR,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Kvyvl,,,D,ai,Mcs,L,SLvde,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Sstml,,ez,i,bf,fNfp,lR,qYvw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LFEua,KTGnq,yH,i,xk,Cj,l,rujf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lVmec,rDbnu,xDLG,D,iL,SC,lR,dEtSH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kzuvX,UZDWv,rNcu,i,Nc,y,i,eag,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DhgVE,,gpyD,i,KR,Wsd,lR,AECJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,byIvR,TyuVv,CqC,i,GF,y,lR,fsxtZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mAqto,usBub,bVnY,i,Lz,qVs,lR,yf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VPFit,HXSgR,bVnY,D,H,y,lR,zYPf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rClql,CiZAV,iV,i,Kg,Cj,hk,gNZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KzBpZ,,mNh,i,GF,pf,lR,wxG,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NHjyt,BFkyu,ez,i,iL,DoN,hk,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nqYKf,DXeTv,VsKz,i,n,yC,i,CWs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JYfxN,DnTGD,,i,GF,aRnz,fU,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HUSBS,YMzrT,VsKz,U,hyz,y,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jtUxn,xZsRI,iV,i,n,kWZ,l,UVe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GFhrd,CiZAV,ez,i,n,y,lR,ZjS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sNCXo,FPgQL,CqC,D,bf,FvO,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,brlYR,brRis,jb,i,RC,SC,l,zOi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LZrSU,tImXj,EXYv,D,RI,dYPI,lR,mVP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DxiZc,,ez,i,iL,xa,i,zz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UXjMo,DOhAH,Gac,D,iL,Kuz,lR,RsQX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SoXDF,iqtAI,QMl,i,aW,gI,T,HCNJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TDYJk,CiZAV,bVnY,D,RI,YO,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,veUUh,VhcXu,QMl,D,n,Cj,T,AwyW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GOKuT,,zZe,i,FL,ZFX,hk,xgTI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DCaFA,,jb,i,H,pf,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CTjNT,FbvHy,Gac,D,iL,fHv,hk,ROOA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Lopfz,LdemN,,i,u,gI,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QNZvj,RdvaT,,D,k,pf,lR,EY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BckJS,cQxSc,,D,TGR,pf,hk,mO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SlpWe,FidKR,ez,i,kWZ,,lR,ZSsRm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HUbpB,jHsOR,LDk,D,iL,y,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vywmB,AXhVB,VsKz,i,n,RV,hk,CuqZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ttGSx,hiusI,jb,D,iL,HSL,ri,LWXR,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FNpXl,kEKkc,Vj,D,Nc,y,fU,wzF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CQVvq,kSXVa,EXYv,D,n,y,i,gxcx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kBvrH,qkqKB,,D,fr,kzbx,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oGiPf,oRdwp,yhq,i,TGR,hmKv,lR,Wu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IZWQc,,mNh,i,iga,Bkt,lR,rEy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Apfex,gMbWu,gpyD,i,GF,KtFl,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JmTPv,,zZe,D,iL,Vvh,hk,MJFS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LxgMb,uUaoE,LDk,i,u,na,lR,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RaRPt,hqpMg,EXYv,i,Kg,y,l,eQE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JNscM,fbGJX,anf,i,mR,sp,l,JzmY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wxXKG,GCXEW,gpyD,D,mR,aRnz,lR,bf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LuEiJ,fQNSn,CqC,i,Nc,Cj,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hPLMf,txpZT,Vj,D,GF,ev,lR,JeO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eAZON,iQfVy,bVnY,i,Pek,YO,i,DSA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bJMbn,soKhL,LDk,i,iL,HMXY,lR,OElC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ETTEe,csdNC,iV,i,Cme,khbX,lR,Njo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QgQEM,,aN,i,nt,LHdO,lR,Ttu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qTTdl,dheCD,LjAS,i,GF,DDPD,hk,Uoch,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RMXvd,MMnif,rNcu,i,GF,QJC,i,eag,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xdICB,KEohZ,rNcu,i,Pj,WOsU,i,WI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XgUzd,oJXSu,VsKz,i,n,qVs,hk,NYd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iDsZf,HaPRU,Pcb,D,kB,rbp,lR,gI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,knJNR,OiEPu,ez,i,nt,YO,i,KZJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UOPBi,hXczE,LjAS,D,SC,SC,L,iXlb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mrcQB,fGTzs,OYMU,D,O,pgd,lR,ZGOL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iTXgF,Zwope,xDLG,U,iL,yGet,hk,fRt,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aqsat,LOtcu,VsKz,i,RC,Cj,hk,FFk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aqsat,zTnre,,i,RC,dYPI,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qZtYv,Yofzn,ez,i,Cme,FhvY,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mNszM,vfKUn,CqC,i,n,mwY,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hjTYd,rGzDb,VsKz,i,Bu,GWD,l,HNzVX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vGLIS,,bVnY,D,sp,EuC,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pEaiT,yawhC,gpyD,i,jF,uECy,lR,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tUFSW,TZFeB,iV,i,n,nT,hk,Ld,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JThVy,,VsKz,i,ZKX,,hk,iUas,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rzFPK,eKOcq,EXYv,i,bf,Cj,l,CVe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rzFPK,OcAPt,ez,D,bf,YO,l,MpI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uila,VONBE,mNh,D,iL,hvW,i,yONr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fahB,xUKVK,,i,jgn,SC,fU,iHi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZOSI,UriEN,xDLG,D,iL,Zvq,lR,ctNxt,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KWvq,NjzEZ,Pcb,i,OS,Cj,l,QGji,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EuHw,uGIFb,,D,db,mwY,hk,uqIB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NOPq,NOfKN,zZe,D,n,lQU,l,fIMGh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wDnA,pziuA,OYMU,i,GF,sp,fU,qego,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VfdX,,QMl,D,sa,xaH,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YfTt,OiEPu,iV,i,iL,bf,hk,kWZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CZNk,CiZAV,CqC,i,cfU,Cj,hk,EfB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kqtm,ESevc,CqC,i,Cme,ojoW,i,JCup,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DIUb,hXiko,KsKZ,i,TGR,rbp,i,OUn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UiJH,hzynn,gpyD,i,ZJA,,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ESCZ,rYFYY,ez,i,vk,dYPI,i,BwSkS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wjJY,QImNH,xDLG,i,G,Zsbp,lR,Njo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EWSd,pBRVS,LDk,i,iL,qyCG,i,CWq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lxMN,UkymH,rNcu,D,mR,SC,lR,pqCy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RKJm,,xDLG,i,mR,ev,i,LNO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LgTc,NpWJw,CqC,i,FL,gANm,lR,OEccr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xJqf,uLFqs,,i,RI,zI,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rBsb,ClwEM,iV,i,sa,eQE,lR,vxdZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BXOa,mZcIF,,i,Kg,HaU,hk,QBF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TgBd,dQgun,LDk,i,aW,y,hk,FuBj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,puXh,VONBE,CqC,i,RI,nT,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Nxwd,fAaMe,KsKZ,D,H,lQU,lR,vlCu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DvYA,fyozH,EXYv,i,G,zI,i,uwra,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Qyll,lHjLY,xDLG,i,os,pf,hk,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AvTf,evrsZ,iV,i,uP,pf,lR,LWN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nqdu,wXuaS,CqC,i,G,YO,lR,kck,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CUAG,OalFZ,gpyD,i,os,xa,lR,Wu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZeGI,,jb,i,jgn,dYPI,l,EfTF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,svlX,JWQHp,VsKz,i,GF,gANm,fU,GTzJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BcOI,JjjZb,Pcb,D,Lz,aRnz,hk,ZsMT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mKBE,gGoDV,OYMU,i,y,PF,lR,svpP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rwvH,SklNG,bVnY,i,n,gI,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FpWc,,xDLG,i,iL,juI,hk,fuN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rjTe,fgrwR,,D,vk,Cj,T,fx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YKkX,KLarH,EXYv,i,pk,zI,i,qy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kPFm,eSjKX,LDk,D,iL,XJb,lR,vNu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Qmxr,qizlO,CqC,i,G,xa,lR,HCh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TzOi,oJXSu,zZe,i,nU,Kg,lR,iMC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ObrV,tGuMt,EXYv,U,Yx,zWve,i,qy,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EuKH,cXMdb,yhq,i,mR,pf,i,eG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wCsQ,vZyhX,LDk,i,iL,pf,i,zz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aUhF,UpZhy,EXYv,D,nU,sp,hk,PdZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,euzb,UbJjv,bVnY,i,GF,TGXq,hk,FGuqh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RqID,uLFqs,yhq,D,aW,ZKX,lR,aW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bDwU,aGAzh,EXYv,i,nt,hmKv,lR,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zaPH,urAgA,opm,U,iL,IamB,lR,moLJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ARen,,,i,FL,KnZo,hk,mO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IAFe,eNMxO,VsKz,i,RC,ev,hk,nbOQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ywiW,UZasF,yhq,D,GF,TAUy,i,LSqBA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,irAs,SklNG,CqC,i,G,gI,lR,Alw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ocEc,Emiva,VsKz,i,G,Cj,i,jfBW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eJDM,XsOtC,,i,jF,YO,lR,cJRU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,agvT,glbDc,,i,RC,pf,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JhfA,gafGU,iV,i,Lz,uECy,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nHkJ,bXpUE,jb,i,fx,ev,l,gJss,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fdrn,pfJkN,LDk,i,iL,soR,i,fNfp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,czGE,JWQHp,gpyD,U,db,cRzS,lR,UsS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uPqM,DWRev,bVnY,i,n,RV,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ISuH,CIFhS,CqC,i,gI,pqp,lR,Ep,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JLsF,pfJkN,LDk,i,iL,dYPI,lR,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VxeN,CIrEY,EXYv,D,ss,pf,l,KPGx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tufE,wwFAY,ez,D,bf,SC,lR,NFxsb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FLff,zPWJZ,opm,i,n,Wsd,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ChXC,hYHAZ,VsKz,i,nt,Wsd,hk,gnq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oEzf,MlKuk,zZe,i,y,qVs,i,cBU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BMbb,lmLfO,iV,i,RC,DME,lR,FzMf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mzWw,lXZjU,Pcb,i,GF,CdC,lR,cjN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WMDE,RTQUJ,LDk,i,iL,hmKv,lR,QGYOm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WMDE,miwCS,iV,i,iL,hmKv,lR,zvFx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CZmj,zbaAA,xDLG,i,FL,rmJ,hk,ZW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FFiI,atSAJ,iV,D,zj,gOZx,hk,gNZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FFiI,LdGeV,rNcu,D,zj,gOZx,lR,KOOo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uCsk,vdUHx,zZe,U,u,pf,fU,EzxW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MkZI,gMbWu,bVnY,i,ZJA,,l,CqWC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pXQx,PHCFJ,mNh,i,y,Cj,lR,Ybk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZQwR,SQfuG,Vj,i,n,zI,lR,FtN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WqZQ,tuGlk,bVnY,i,GF,kWZ,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MVEr,YbWfE,iV,i,Dq,Ktd,lR,yyEeK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yiJt,yHmTk,opm,D,iL,ev,lR,ygpk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eDqR,hlcVp,CqC,i,pk,Cj,i,BToc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yxeI,XctNb,yhq,D,iL,jF,hk,AJXa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RqrK,doIEg,EXYv,i,RC,HSL,fU,TNo,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RqrK,Nqkmi,rNcu,i,RC,XLQ,hk,UQPZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,apjv,ivYgu,yhq,U,GF,XLQ,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ABTJ,gQCaa,iV,i,RC,DDPD,lR,RpxJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VFJo,mgoTc,LDk,D,iL,bf,hk,ObIW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fpTZ,aYgiH,EXYv,i,G,hmKv,i,hevk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JyOk,xoCGL,CqC,i,GF,HSL,hk,Eloq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jnpR,,gpyD,i,zj,gI,lR,ILXi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZDet,HKFIL,jb,i,Kg,xa,l,ZEcP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,euVq,yQenm,jb,U,RC,hmKv,lR,nyQZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,euVq,,KsKZ,i,RC,SC,fU,eHh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PzFP,,,i,GF,TNuV,i,BQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zNns,vfKUn,EXYv,i,RI,Zsbp,i,lmR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BvDt,baHIi,jb,D,Ri,xa,fU,edmfZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jJKy,cbkAW,rNcu,i,RC,Cj,hk,Ywm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tllY,ZhLBh,bVnY,i,zj,gOZx,i,oXKs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zGXN,ClwEM,,i,Kg,Ri,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fTwy,qwbvG,QMl,i,Kg,aRnz,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wBFv,QImNH,iV,i,Kg,eQE,lR,WdnI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CBXL,PXTnz,VsKz,i,mO,hmKv,hk,sHzs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hBHe,ERiHU,mNh,i,oLI,Cj,lR,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iTQU,,yH,D,mO,kSz,lR,KR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ykQb,yDaUW,,D,GF,eFx,lR,VSL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MzBw,VbvIi,bVnY,U,WLK,IamB,hk,OLi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FAge,CgiNm,,i,nt,gI,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vZrJ,Gjomx,,i,G,TBUv,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yLks,nOmkK,mNh,i,G,Yxhj,l,dssL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jPrd,QUpDF,ez,i,RI,nT,lR,QhEp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xFML,LQsok,zZe,i,OS,YO,i,LADD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VLKL,KoskF,OYMU,i,Ri,Cj,l,Rij,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IKYJ,nPIxJ,yhq,i,H,uWTD,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LZcv,HqZYe,rNcu,i,GF,ev,l,urZL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XcWC,gwGKb,yhq,D,GF,hmKv,lR,aW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ODQP,yMOwe,gpyD,i,RC,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XkNZ,cCOsx,ez,i,nt,Cj,i,Rk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rYAz,KyEGN,yhq,i,Nc,hmKv,lR,DbYO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jyzK,mHDez,,i,zj,Cj,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VZvl,hlcVp,xDLG,i,OS,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FDsv,xxJSy,iV,D,Kg,,hk,QoIi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KuXW,LiFpo,Vj,i,YO,Cj,l,mNov,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KuXW,rGzDb,VsKz,i,YO,xa,l,XOk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Cvrp,Aibzq,gpyD,i,GF,pBlc,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,srgU,,zZe,i,LL,SC,hk,NhYJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JblB,NOfKN,VsKz,i,OS,lQU,lR,HnAv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,crNB,XeDef,xDLG,i,iL,y,lR,jF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gYfF,ruKdN,mNh,i,G,uECy,hk,sa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QIfF,aPzRl,bVnY,i,G,sp,hk,ePq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QIfF,DnPCF,Vj,i,G,LfH,lR,GKlv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mKJM,ytgnG,iV,i,GF,WMz,lR,BKEG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JPds,XzUma,Vj,D,OS,SC,lR,ruNRu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xTvk,,iV,i,Ld,cRzS,hk,HOytR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,trSd,qPmqU,ez,D,k,RV,lR,NxI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QwCY,LQsok,aN,i,n,YO,lR,qvkFl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QwCY,DTjrH,QMl,i,GF,gOZx,T,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QwCY,DzgFa,VsKz,i,n,TAUy,i,oQJmZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wrpC,vdUHx,mNh,U,iL,nT,lR,kB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QgCL,MZzvk,gpyD,i,IaL,jaP,lR,jJPJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dJQk,lyjNx,Pcb,U,k,YO,lR,iGu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dJQk,WwQgo,,i,k,SC,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Thpg,PHCFJ,ez,i,GF,Cj,hk,MBL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Thpg,lTyLf,iV,i,GF,VwET,hk,nnFz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BjwF,,LjAS,i,OS,QhZm,hk,oh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uDuf,RnZxv,zZe,i,FL,,lR,iUNH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ezFf,loInS,bVnY,i,GF,DcjM,i,VxeN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PiFN,qTQVz,gpyD,i,os,hmKv,lR,cBC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Oyzi,,bVnY,i,GF,hmKv,l,yFoU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LioW,HsZBB,EXYv,i,jgn,jBP,l,DZV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sIOm,QLnpc,gpyD,D,GF,AqjP,hk,Prq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KnRz,BFzcY,zZe,i,RC,Kg,i,hI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QoIi,YyDGC,bVnY,i,Ri,WOHK,i,pVqh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZJTX,pLYXJ,,i,FL,Kg,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wfYS,,iV,i,FL,LzlK,i,QWEMx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,CmGAY,rNcu,i,RC,aRnz,fU,AIkh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,FbvHy,CqC,i,RC,yH,lR,kck,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,rGrAE,gpyD,i,RC,jBP,lR,iLrNg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,Adwwv,jb,i,RC,na,fU,WaAu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,LQsok,iV,i,RC,YO,fU,oCWN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,,yhq,i,RC,Ri,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YKaB,,CqC,i,n,uECy,lR,bvl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zmQB,mYWNU,opm,i,SC,aRnz,L,DoN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XUlI,zpINo,opm,D,Ld,kgW,lR,xYFU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kawG,VWsSK,opm,i,Bu,hmKv,lR,pIaI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NTtC,LiFpo,CqC,i,qh,y,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zMqu,uGIFb,zZe,D,zj,jBP,fU,TUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zMqu,gxzDj,rNcu,i,zj,SC,fU,wgha,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zMqu,gwGKb,anf,i,zj,sp,lR,xAaR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nGOx,UriEN,KsKZ,i,GF,pf,lR,tTD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nGOx,JjjZb,CqC,D,GF,hfB,hk,db,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BryE,rGrAE,bVnY,i,GF,zI,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BryE,LIJrf,EXYv,i,GF,pPN,hk,HZzm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,dgVKx,zZe,D,s,y,hk,U,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,YbWfE,bVnY,D,s,NHX,lR,sGXYC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,hQGku,zZe,i,s,YO,i,SlnT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,Uoaco,CqC,i,s,gI,lR,VkB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,OiEPu,zZe,i,s,YO,i,SlnT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eBab,TttFj,yhq,D,G,gI,lR,ABBIy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eBab,VzUtA,,i,G,SC,lR,YnMl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZnZf,bLoPy,,i,FN,Cj,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuQz,tRZrN,CqC,i,n,RV,hk,iPEG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuQz,mgoTc,Vj,i,n,RV,lR,iZWrD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,ivYgu,gpyD,D,GF,jBP,lR,IgEe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,zEPSu,OYMU,D,GF,yC,l,cpi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,ARWie,ez,i,GF,HSL,lR,lGa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,hrmwJ,bVnY,i,GF,y,lR,PXI,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qEey,qkqKB,CqC,i,GF,VyBk,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AJXa,nMlTX,rNcu,i,RC,yC,fU,HAAQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rdsY,umGoo,VsKz,D,SC,Zi,hk,RyC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,erQTG,yhq,i,GF,flWz,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,kFmnB,yhq,i,GF,gOZx,i,xxmj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vYJEK,QMl,i,vk,HSL,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hLjqz,,i,Ri,nT,i,BQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FuKml,,i,H,kgW,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TCzHC,opm,i,hyz,Cj,lR,xvb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SaBMW,ez,i,cZ,gI,hk,pDMo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mvRuV,VsKz,D,nU,DME,lR,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,lNnVR,QMl,i,ZKX,Jbg,T,rjWV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RGzrA,EXYv,D,yC,pPN,l,JWS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qVloc,gpyD,i,Kg,nT,lR,lRiB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Ismpx,bVnY,i,Bu,ysh,i,GF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hPFVC,QMl,i,GF,lQU,T,BAR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dorgg,jb,i,TFX,Zsbp,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KhuMW,bVnY,i,KR,aFx,hk,pf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Yofzn,,D,GF,Zi,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PdiGr,CqC,U,kWZ,,hk,ZKX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PdiGr,CqC,i,jgn,IamB,hk,Uhb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,iHDlb,,D,BAR,na,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pktBl,,i,GF,Xua,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,tlQoc,mNh,U,hSE,YO,fU,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,LpQcN,EXYv,i,aW,ev,lR,VcZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rRbDE,QMl,i,oh,zNvM,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rRbDE,yH,D,Zi,hmKv,lR,Dzzp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NgFxn,LDk,D,aW,zI,hk,aKMP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vRwhI,QMl,i,oh,y,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,IYSpC,mNh,i,JnB,xa,T,xVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KowCL,QMl,D,hyz,ZUA,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TDUrZ,,i,ePq,IamB,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uQkno,mNh,D,yC,IJq,T,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uCVkt,rNcu,i,RC,Cj,L,qSJY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,iMSaA,QMl,D,RI,juI,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wVacr,,i,bf,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,xeHYp,Pcb,i,qh,SC,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,doIEg,ez,D,BAR,Zsbp,hk,zYm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FeFND,zZe,i,Dq,na,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YZLUv,,D,os,RV,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TxLDg,QMl,i,IaL,JVF,T,QmK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hpWGu,,D,pqp,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zcjHS,rNcu,D,RC,XLQ,lR,aSMCO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mZcIF,CqC,D,BAR,na,hk,ZJGI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RdRxf,,U,G,pf,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jkdjQ,ez,i,uP,WNP,i,tLued,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UpZhy,QMl,D,RI,fX,T,Ctir,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UpZhy,yH,D,oh,sp,lR,pkKW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,WeDCg,opm,i,JI,gI,hk,eRRSf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TttFj,bVnY,i,jgn,sD,hk,ePq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TttFj,KsKZ,i,FN,zlG,lR,tTD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uYWpN,ez,i,ZKX,fAb,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SgWNS,rNcu,D,Kg,ev,lR,gwxV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SXZFT,,i,k,gI,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PesGh,rNcu,i,RC,Cj,lR,nwcN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PesGh,,i,RNB,jF,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QFBNH,Pcb,i,u,na,lR,ino,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zLfaS,,i,kWZ,pgd,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ziMUf,gpyD,i,KWZ,Cj,lR,bf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ClwEM,CqC,i,pm,zI,l,FMfNY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TdMRE,,i,n,eQE,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TdMRE,,D,GF,Ri,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JRxbD,gpyD,i,na,juI,lR,WjTv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AMEDi,QMl,i,RC,Cj,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AMEDi,,i,kdc,y,T,mEr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ouvnZ,QMl,U,FN,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ouvnZ,,i,Ri,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uUaoE,,i,u,Cj,hk,fr,5609211849415401069
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NHNrT,EXYv,i,Lq,Cj,l,eQE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PHCFJ,yhq,U,Ot,Cj,l,HwK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PFepD,iV,i,GF,Kg,i,xPyq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rrdcH,iV,i,iga,aRnz,lR,emgk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QmLzY,QMl,i,Zi,sp,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QmLzY,,D,nt,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HCLtA,ez,i,Zi,Cj,lR,pf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yDaUW,QMl,i,oen,eFx,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hQGku,rNcu,i,Nc,pPN,lR,YWMQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hQGku,QMl,i,k,ZUA,T,BAR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fWinc,QMl,D,GF,BQ,lR,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QdYiD,,i,u,Cj,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EOhNc,EXYv,D,RI,HSL,lR,Fpo,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TjJiS,jb,i,sa,zI,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TjJiS,,D,BQ,HSL,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cuDfA,,i,zz,yH,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RZfCx,,i,Pek,HSL,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VONBE,KsKZ,i,ZW,xa,hk,oHWt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CoHoq,aN,U,mR,gOZx,lR,WFiR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dCdpV,ez,i,nt,xa,l,xqPw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VdCfJ,,D,u,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YIXfM,Pcb,i,u,y,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,quVqD,jb,i,FL,Kg,i,IQtj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Pqnwf,,U,aW,Cj,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VLgQz,jb,i,zz,aFx,i,Kg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,iFIWb,opm,D,SC,buw,hk,WtZrG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JWxme,,i,FN,LfH,T,fx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,agcio,,D,kWZ,SC,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GAsNk,zZe,D,Ds,RV,hk,DJZx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,aPzRl,yhq,i,sD,mwY,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,aPzRl,iV,i,GF,MpP,hk,enXJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wUEJc,mNh,U,Kdq,gI,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SklNG,QMl,i,k,gI,T,tmM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RUGgg,ez,i,k,DME,lR,hZbT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VoSgd,opm,U,hyz,zz,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FHKAj,QMl,U,os,aRnz,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nndpW,xDLG,i,qh,yC,lR,cjN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zYNao,,i,RC,yC,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nMlTX,rNcu,i,RC,WNP,lR,uyut,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nMlTX,,D,TFX,rbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MNqGT,QMl,i,k,YO,T,nT,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dzSyh,QMl,i,bf,Vvh,lR,FtyE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ERiHU,QMl,i,mO,RV,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jCPPl,QMl,i,yC,xa,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mgoTc,,i,k,YO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PnMzG,yH,i,mO,bf,lR,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wzUcv,,i,GF,PnY,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QbFYx,rNcu,i,Kg,bf,lR,HTr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QbFYx,mNh,D,aW,Cj,T,zjtN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MWxHT,opm,i,hyz,Xua,hk,aJem,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MWxHT,,i,sD,xa,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hAjyU,mNh,i,pqp,Bkt,hk,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hAjyU,,D,SC,Mcs,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,daXRL,KsKZ,i,FN,WMz,lR,Njy,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,LyFOT,,D,SC,gRTo,lR,HwD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,WmNjq,mNh,U,hSE,gI,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FliLg,,i,O,bhM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zTnre,iV,i,GF,gOZx,hk,ORJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,asEGJ,gpyD,i,qh,hmKv,lR,WLK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KKZOn,yhq,D,y,eKfc,i,qHhT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RvKFZ,yhq,i,GF,YO,lR,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,OalFZ,,i,RC,gOZx,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YmnKO,QMl,i,xk,IamB,T,nT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ynBaL,,i,Cj,Yxhj,l,s,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FjRPe,QMl,i,JnB,dYPI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gJjvo,,D,kWZ,Cj,T,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,XsLDX,LDk,U,aW,Yxhj,hk,FuBj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Gjomx,ez,i,nt,dYPI,lR,DUHG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,BSAII,,i,GF,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,BSAII,,i,Zi,dYPI,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PwNjw,,i,n,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rYFYY,QMl,D,JnB,cmmA,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qizlO,LjAS,D,ai,Usgd,hk,CDCg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,soKhL,,i,FMt,DcjM,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,aEQZY,,i,Bu,ceEe,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nOmkK,,i,GF,ojoW,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SVLxE,,i,G,fNfp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,omRBe,,i,zOi,IamB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fmSQo,ez,D,qVs,pBlc,hk,ANcE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qTPHo,xDLG,i,ZW,Mgil,hk,TFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mtJJa,mNh,D,sD,Zsbp,lR,eNSZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qZzCL,Pcb,D,u,zz,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qZzCL,,i,RC,Zsbp,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cEpGn,ez,i,vk,hmKv,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,miwCS,,D,Ds,,fU,Bu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KOJjz,Vj,i,kB,qyCG,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DzgFa,LDk,i,iL,TAUy,lR,dtUP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uVdCT,QMl,i,RI,TAUy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uoXfm,Gac,D,hI,tCwq,hk,Qhv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yFAAH,,i,pf,zNvM,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GqeZx,opm,D,hyz,KnZo,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GqeZx,QMl,i,n,yGet,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CfjhB,iV,U,GF,IamB,hk,kWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ujyjw,rNcu,i,yC,KCWa,l,cfU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EWrtg,,i,mO,LKKI,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,loceY,EXYv,i,RI,uWTD,lR,eTKB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EfCkA,mNh,D,BAR,uWTD,hk,fflq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,oImqv,xDLG,i,zz,Mgil,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MMnif,zZe,D,kWZ,gOZx,i,Ri,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CcpoJ,,D,qh,uWTD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dheCD,OYMU,U,Lq,uECy,i,FvV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dheCD,opm,D,SC,uECy,l,SpWn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UvMmX,,D,Cj,DDPD,hk,Odm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vVRLE,rNcu,i,RC,tuuM,lR,yOqZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KjwLz,Vj,i,oh,qyCG,i,Xmz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,VsKz,i,GF,KCWa,hk,FMW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,bVnY,D,RC,UpSB,lR,gcWu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,rNcu,i,RC,gRTo,lR,bHWX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,gpyD,D,k,hmKv,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,LjAS,D,xa,tCwq,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,KsKZ,D,BQ,fX,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,zZe,U,zlG,RqID,i,yozra,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,zZe,D,yC,rbp,lR,iTt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,opm,D,Cj,OxU,hk,NSaP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,iHi,qWFT,hk,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,D,BAR,Xua,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,D,BQ,Blj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,CqC,i,sD,cbZ,lR,ss,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,LDk,D,aW,y,lR,jmnu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,mNh,i,cfU,,lR,MGSs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,mNh,i,pm,Mgil,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,ez,i,GF,eQE,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,ez,i,YO,,i,HFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,iV,D,GF,xa,hk,EnE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,U,zj,gOZx,fU,BnI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,boZ,y,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,GF,SC,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,YO,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Dq,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,pk,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Zi,Usgd,lR,NymNP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,zj,TAUy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Pj,bqRO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Yx,y,oA,ZKX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,G,Wsd,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,aZ,edWw,lR,AydM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,Cj,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,aW,pBlc,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,nt,tCwq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,G,IamB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GyhQvkC,QmZat,QMl,i,GF,Bkt,lR,cQut,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aIODCQR,gFPOL,CqC,i,sD,Pmiv,lR,ss,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vqdHqQr,UHjYh,QMl,U,RI,IamB,T,BAR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fsVDIMQ,gJjvo,EXYv,D,zz,YO,hk,vZrJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AGYyPRb,vZyhX,LjAS,D,G,pf,hk,aE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oAZASeI,TrrrN,,i,u,,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RdCCYiq,aGAzh,EXYv,D,ZJA,hmKv,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nnnqDse,kemle,yH,i,KR,yGet,hk,YkPl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EEYOmlX,vdUHx,QMl,i,ZW,dYPI,T,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XWwQoXw,CiZAV,,i,GF,Cj,lR,RyV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aOSICxF,qyqVu,iV,D,k,YO,lR,DME,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IXsmNGX,pBRVS,VsKz,D,kWZ,KCWa,lR,VOYe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CqrQggA,qQMoM,jb,D,sp,TAUy,l,mItL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kehmRDD,qvyUv,Pcb,i,u,tCwq,hk,CGuB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DaIYREV,lASnD,iV,D,oMY,Bkt,hk,Ld,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IQrucCL,knwwm,QMl,i,iga,,T,Lwfi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kdrkMsV,opZrF,bVnY,i,n,hmKv,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lKgkJSp,wDkOU,mNh,D,hSE,y,hk,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qPwWddN,miwCS,CqC,i,GF,zNvM,i,hLJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dQOcttH,DzgFa,ez,D,Ri,TAUy,i,vbOF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TlfwOIT,EWrtg,,i,Ds,LKKI,lR,WOsU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DQSOfIV,tAFFO,QMl,i,qh,aRnz,T,nGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tfmTKyG,zqBwb,gpyD,i,os,pf,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hIMQIkh,fIVqL,,i,u,Bkt,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mKsqDhn,dzSyh,VsKz,i,GF,xa,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CzwImke,lvKFp,QMl,i,k,xa,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cfzjsNl,wLpmB,Vj,D,zj,y,lR,lzQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xzVjhDb,Gjomx,QMl,i,n,HMXY,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,muopcNU,BWYOS,bVnY,i,jgn,aUhF,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZqPlykI,unoLA,KsKZ,i,os,,lR,ApOq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RelSVTd,KKRFI,EXYv,i,hSE,Cj,hk,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QvxoJau,QtwOl,mNh,i,Ri,RV,hk,Hrde,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fmLDvgr,Svdoh,zZe,i,FL,hmKv,l,Ktd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pOQWGmW,,mNh,i,hSE,ZHiH,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MJwuEuP,gJjvo,LjAS,D,vk,y,lR,HYTa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fWLboAD,UmBSN,EXYv,D,KWZ,SC,T,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EkXyaSk,QQxvR,CqC,i,n,KnZo,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nzKFrMR,Gjomx,,i,aW,TBUv,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tavzaAf,Tnqdc,QMl,i,k,dYPI,T,BAR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DSToSwd,iMZXr,iV,i,O,Ri,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CqCpqgS,lHjLY,EXYv,D,BQ,YO,hk,TEhO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ErcXtHk,vdUHx,jb,i,xk,rbp,lR,ZGyi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YkifMcG,yQnHf,ez,i,Nc,dYPI,lR,ySq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jJBWcwC,gJjvo,LDk,i,nj,SC,hk,IrOe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rbEuiLY,eKOcq,EXYv,D,yf,y,i,qy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FvBEIWB,opZrF,VsKz,i,GF,qyCG,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eRyUAxc,wxHDm,ez,D,bf,yC,lR,Srkn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hFvOrnL,fZMjp,xDLG,i,Pek,pf,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xzsKaNX,EfCkA,EXYv,i,iHi,gOZx,i,qy,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SMqBzVS,,ez,D,k,DME,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GuGXFrV,HsZBB,jb,i,KR,jBP,lR,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dBslqCw,NHNrT,rNcu,D,kWZ,y,i,WI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FmeEzRS,wkGAf,mNh,i,GF,hvW,lR,MWdJe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YivLQIq,SAbkD,KsKZ,D,RC,mwY,i,OUn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cSnncqF,pziuA,rNcu,i,RC,y,lR,muw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lMxYnKe,rIGNa,iV,i,GF,gOZx,hk,BjwF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NwGytDp,ruKdN,ez,D,vk,gOZx,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nnSXJsz,eSjKX,ez,i,k,lQU,lR,TVjH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MSefpyu,PLpGm,,i,n,SC,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QnjKXWP,hpCAn,QMl,U,n,,T,BAR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jjKgqga,zfzpe,jb,i,RC,Cj,l,vWHm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ruYYzBA,DsQwS,mNh,i,pm,VwET,lR,Ybk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zbWiMmm,KyEGN,rNcu,i,xk,hmKv,hk,fFFL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tVFofXS,SefEe,jb,i,Lq,qyCG,i,RiXtG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FIzfodK,kSXVa,Vj,U,xk,LKKI,hk,na,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZPSgJwu,loInS,gpyD,i,os,Yxhj,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SbOyxSg,hpCAn,yhq,i,kB,RSST,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GArTsGB,rWGPS,CqC,i,n,YO,lR,trSd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WKvsLMz,VzUtA,mNh,i,uP,SC,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uyYNioQ,Smrjj,KsKZ,i,sp,bfM,lR,qRwPs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CfLqFWM,rWXFR,mNh,D,GF,sp,lR,ZPvZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jTqtqdQ,QImNH,CqC,i,RI,hmKv,lR,MzjP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pbWNHCl,izZbI,zZe,i,RV,nT,i,rmJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ivyaQnX,kFmnB,jb,i,pf,dYPI,lR,CDMo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,thMgOUt,,CqC,i,oh,Pmiv,hk,gEgWk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hCCciVG,qwfyf,QMl,U,G,na,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CKAhTcC,,iV,D,os,Cj,l,CVe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AkkaylF,CiZAV,ez,D,Ri,xa,i,fSCf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ODdFcpo,XROQh,,i,u,oen,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WCCUQpJ,,EXYv,i,Nc,dYPI,i,qy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kRKegIK,EfCkA,bVnY,D,nt,gOZx,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jinjjFg,CSXEU,LjAS,D,iL,y,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FKqlnsj,,mNh,D,pqp,KCWa,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rwulDAF,pBRVS,QMl,i,sD,KCWa,T,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,txoxqkI,OcAPt,ez,i,RC,hmKv,lR,FeM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sMVVNKD,fGTzs,LjAS,D,Nc,fX,lR,ZEqZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aLDlBlE,TDUrZ,,D,SC,IamB,hk,YwYj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SwGWySm,XzUma,jb,i,n,Ri,i,Kg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JhCVCuF,vfKUn,bVnY,i,RI,Cj,lR,boZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tPfOxOe,IsgfE,CqC,i,FL,rmJ,hk,RoZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SYPSaqU,ZGziF,LDk,i,aW,zI,hk,MgDv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rpuwSyN,QdloN,ez,i,uP,qyCG,i,KZJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HJNXitg,yZyjK,iV,i,n,y,hk,IilN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nATJSZY,mxPzj,,i,kWZ,Ri,lR,vNu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DRpLTrR,QImNH,CqC,D,Ri,Cj,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gvoSAjD,qHvtI,,i,FN,Blj,fU,YeavC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CFyxscO,CgiNm,CqC,i,n,Om,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MpQeHkX,FusKs,QMl,D,eG,na,T,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tnjFnMM,ePyBk,,i,db,Cj,lR,vNu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YTOkxgj,hAjyU,,i,RI,Bkt,lR,EY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fGnJZeA,Jgzfx,yhq,U,kWZ,,hk,ICbH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iqqPnrI,FRCeS,iV,i,RC,hmKv,hk,VKRm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eqbIWTl,dQgun,Gac,D,iga,na,i,cQoj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ldeiGSj,qHvtI,zZe,i,Lz,DQc,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZKWEmDb,RZfCx,CqC,U,KR,nT,hk,mBq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KCtUyTC,nMlTX,Pcb,i,u,yC,lR,cNDz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iyYKgXz,CfjhB,KsKZ,i,FN,IamB,hk,Ds,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yradpDX,,LDk,D,ai,GCL,hk,rxDzu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KBctuAg,CuWvK,ez,i,ZKX,dYPI,lR,lWdy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JzlZueH,KyEGN,VsKz,D,oLI,hmKv,hk,jxiwy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rZOvscG,,CqC,i,RI,xxmj,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,btnaYKs,ZvTyL,mNh,i,pqp,gOZx,hk,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Wjkxoij,pYJLq,ez,D,kWZ,Wsd,ri,buqd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,anOeZKB,IeoJw,mNh,i,mR,irkq,lR,kJJm,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JXTjdcS,jlQut,Vj,i,eG,Cj,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dmzLuCc,ESevc,mNh,i,oen,iADy,hk,KBp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IhFRZf,,CqC,i,GF,uWTD,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BZuUmW,DWRev,,i,k,aRnz,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HnKASB,rRywf,iV,i,k,LhLc,lR,ZTyl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AcYSzi,pzLPd,LDk,D,iL,uECy,L,ss,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dsaKpc,,QMl,i,s,rSZ,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JfvAse,,QMl,i,GF,WNP,T,UOy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zuXTmq,Gjomx,xDLG,i,Cj,,hk,eJNu,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WgHRaC,huHrv,VsKz,U,RI,hmKv,lR,uUl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uMNMhB,UpZhy,mNh,i,JnB,fX,l,IfTcW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XAECDJ,CiZAV,zZe,U,mO,Cj,L,TUw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yOpVZe,pEeov,iV,i,FL,CEVg,lR,HBfC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IBjfVJ,,bVnY,i,YO,bfM,i,SC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MlwGbS,LKLHu,Pcb,D,u,RV,lR,zTLl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TfnvFE,EWrtg,xDLG,i,FL,qyCG,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vyWDbJ,Gjomx,xDLG,i,sp,dYPI,i,YxgE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AmbLsI,xZsRI,CqC,i,Pek,kWZ,hk,zW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wgwoGh,vCNMH,CqC,D,zz,vJwx,hk,QSbon,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SLLnRJ,xZsRI,CqC,i,oh,GxE,hk,kbSF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vZsfTo,DPzsX,LjAS,i,qVs,UEFl,hk,CRl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zsXvWp,,xDLG,i,zz,IamB,lR,PLsk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LCwDox,eSjKX,yhq,D,ZJA,Ri,hk,kdc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SGwOki,RAawl,rNcu,i,Kuz,rbp,hk,lwik,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wzwTFS,oRdwp,xDLG,i,aW,hmKv,hk,Os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xqsqyo,FPgQL,yH,i,mO,Cj,lR,xiQz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OrPVJE,efoXf,rNcu,D,FL,Cj,hk,abYh,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qiHVaN,YTckD,Pcb,D,u,pf,hk,fzn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iMHRkt,yCTcT,bVnY,i,FL,EogM,hk,uxNM,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lPBkju,oWoZd,EXYv,D,k,YO,hk,KPvc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LrCiCm,,mNh,i,RI,Zsbp,lR,xa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pNTGEO,hpCAn,xDLG,i,iL,RSST,lR,zYzZT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FnqXDe,faMaB,gpyD,i,ZJA,BWVA,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BttgzO,mWKTs,ez,i,aW,Xua,T,pqRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JRdmho,MiuKF,mNh,i,RI,hmKv,l,Ot,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZfLcnl,uvXwY,bVnY,i,oh,jF,hk,QVKR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mdNDzn,tWWFx,EXYv,D,eG,Wsd,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PWauIB,ZhLBh,mNh,D,nj,gOZx,hk,RziD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kiqRst,CfjhB,CqC,i,FL,RSST,hk,GIbn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eCFEqw,jBtmc,yhq,D,yf,SC,hk,sliB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aYeElI,tCwnd,mNh,D,GF,wnVT,hk,sa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,apbUrN,RXcxM,iV,i,GF,uECy,lR,sGP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IlcaaX,TVeAq,mNh,i,k,hmKv,hk,ABZq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GsAoLc,UZDWv,gpyD,i,THd,y,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bwSMKh,eitat,Gac,i,FW,BQ,lR,YLAd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cmfbkR,,bVnY,i,Lz,HSL,hk,pf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,npZKzL,Aibzq,,i,ZJA,dYPI,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rAJUPo,RTQUJ,VsKz,i,qh,y,l,OsJm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ttfsZC,wNpHN,jb,i,oh,na,hk,ePq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cBQPez,rSjvT,iV,i,Pek,,lR,RpxJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tDptwI,Edbfv,Pcb,D,u,Kg,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uWjSpp,,Vj,D,xk,zvgI,lR,oVtdD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ywrDal,LnlmR,zZe,i,kWZ,mwY,lR,nqdu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rVHUiA,oQByA,KsKZ,i,SC,gI,hk,GiJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lGQcIk,,yhq,i,RI,rbp,lR,ArAB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dwdcLv,GzWeI,bVnY,i,FN,aRnz,hk,Yx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZeOwJR,mWKTs,xDLG,i,ZKX,WNP,l,WxFJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WWTaOY,XctNb,QMl,U,WI,xa,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hbcgFh,,iV,i,KR,nT,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WxXlQG,qZzCL,yhq,D,zlG,gOZx,i,cdzQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eGqmdg,ZSjJg,Gac,D,Yx,y,lR,cQoj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JZPyfR,zLfaS,zZe,D,NHX,fX,lR,cVJop,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UAmuJB,GfRLe,CqC,i,GF,eKfc,lR,lTMp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XStfLU,Rkjyt,iV,i,Zi,Zsbp,lR,OASp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AcwPcH,pzLPd,Pcb,i,qh,uECy,lR,IaL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VNWVSQ,diapp,,i,EF,y,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,itNsMk,uvXwY,CqC,i,O,Jbg,hk,Knk,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QUeAIz,CrkQM,anf,i,ev,eQE,lR,MdA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wjIKRp,KyEGN,ez,i,FN,hmKv,hk,enp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fETWyk,tGvIu,,i,RI,dYPI,lR,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sedsOQ,EnYIx,bVnY,U,RC,Bkt,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mHLnZm,yeqDC,aN,D,nU,TAUy,i,ztHJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FBAqHR,TDUrZ,iV,i,mR,IamB,i,Gf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BSYOiy,hqpMg,LjAS,U,yC,y,hk,OayN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WvHINn,ojeZB,yhq,D,os,pf,hk,kdc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zwYCsx,xZsRI,LDk,i,RC,gI,L,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zAjyZd,sGrXl,VsKz,D,G,,L,fwqp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aYzcyW,QImNH,CqC,i,sD,,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CEbfSF,PHCFJ,bVnY,i,EF,Cj,fU,TEMTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KHOugB,yCTcT,EXYv,D,aW,TBUv,lR,Dgv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jLkGIt,hFYeU,,i,RC,Cj,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QGZPIc,hiywj,Pcb,i,Zi,DME,lR,OeB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VZIudJ,DXeTv,bVnY,i,zj,Wsd,hk,zpY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GDFVev,fGTzs,gpyD,i,GF,sp,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YpsGYr,UriEN,bVnY,i,ZJA,pf,l,turM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lQFtQm,awxMP,Pcb,D,Ri,HSL,hk,pfwH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HMCaeO,XigoJ,ez,i,RI,dYPI,l,WlPNP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cFtTVw,LyGdu,xDLG,U,Kg,YO,lR,Hvj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GPteHD,CoHoq,,U,n,y,fU,PF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QOSJhG,AXhVB,ez,i,nt,Cj,i,Rk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hpKnkc,qZzCL,CqC,U,gI,Zsbp,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ucFSwb,ujyjw,ez,D,bf,IamB,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YXcdSw,diapp,xDLG,i,os,y,lR,oLI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ADJlHq,Vahhp,EXYv,D,RI,xa,lR,YBjD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZqGIMv,FRUYV,,U,vk,FXZ,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PyNvRM,BPdLH,bVnY,i,ZJA,Kg,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sgItqp,CiZAV,rNcu,i,sp,Cj,lR,PuhQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ALnjGW,cvqeD,mNh,D,JnB,xa,hk,TNJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vZuMbt,,VsKz,i,SC,gOZx,hk,GugK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hMgdZn,dzSyh,xDLG,D,RC,xa,lR,IzFMK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dhHuwF,uYWpN,CqC,i,n,FvO,hk,pwFg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vQLwrT,pYJLq,Vj,D,Cj,Wsd,i,EF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dGQuFu,dheCD,Vj,D,GF,eKfc,i,Xmz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rXdbcR,ZhLBh,,i,EF,gOZx,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KUFegA,zsRkh,CqC,i,jgn,Mcs,hk,ePq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZDLXwO,OsHEy,mNh,U,cfU,bfM,L,RDsJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WkJTTF,unoLA,gpyD,D,os,dYPI,lR,qhE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XSqAgm,RUGgg,,i,sD,Pif,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mYkhYv,YNGaN,LjAS,D,Zi,Bkt,hk,JXg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,suDiAJ,hpCAn,CqC,i,pm,RSST,hk,zhus,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cSZwdM,jvHgd,iV,i,Kg,Cj,i,AJBp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qSnXiP,hpCAn,aN,i,RC,RSST,i,Kbu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rdxhIa,pLYXJ,ez,i,RI,soR,l,dmcW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WeXODv,gCAQU,mNh,D,iL,fX,ri,wMS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qFPnwr,jxlBy,EXYv,i,eG,Mcs,l,XUdd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EcJDXI,rSjvT,yhq,D,vk,dYPI,lR,TEtG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QOOvny,RGitv,CqC,i,nU,Ri,hk,aXhw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vumjxt,wfILC,EXYv,i,Lz,uECy,i,MGys,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OlIrTu,daAPB,ez,i,iL,Cj,lR,dWRE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kAgrrX,,,i,PF,,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jRGVFa,csdNC,CqC,i,GF,IamB,hk,Dbm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MCPleF,NrqKu,,i,Ri,Cj,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pDJOLw,uYWpN,ez,D,oLI,aRnz,hk,NTj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hPlQBx,FbvHy,,i,xk,yH,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZtQoIy,pgAZa,Vj,i,ZJA,jHBL,lR,fVpeX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IMOvwM,WeDCg,yhq,i,FMt,gGz,fU,fZXHU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SiXlBq,USlLw,bVnY,i,iHi,rbp,hk,sp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aLkrZN,yGzmn,EXYv,D,bf,Cj,lR,QFlu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LBpiqv,dJezt,ez,D,RI,Cj,lR,QhEp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qZtKQz,XzUma,mNh,D,RI,Ri,i,pRO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JuPOfh,DmPDX,jb,i,RI,iga,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jIPIPp,oRdwp,iV,i,FL,hmKv,lR,Myl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SNTGXO,yPBim,opm,D,hyz,nT,lR,Mcs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RnnsDu,miwCS,,D,SC,hmKv,hk,jaD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cCRroe,jJOWz,xDLG,D,YO,,lR,QpLE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nIdjPP,UpZhy,mNh,i,n,fX,lR,Ybk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fTlfOe,rvTLp,CqC,i,FMt,kwK,lR,aDA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iaLdIx,TDTQo,xDLG,i,Ot,bvX,l,xtA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TvjAxV,ZSjJg,,i,IaL,y,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jzQpyQ,NgyUp,LjAS,D,Ri,xa,fU,WbJy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xKgFLX,EfCkA,yhq,i,RI,dYPI,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aTcMph,MMnif,,i,RI,gOZx,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KrRCFg,TDUrZ,CqC,D,Cme,,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OobWNT,FHKAj,ez,D,oLI,gI,lR,ipOKW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EyLFHP,QjDdo,jb,i,GF,,i,Kg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jwRWDl,jkdjQ,xDLG,i,n,WNP,i,YGV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WPXhpS,CiZAV,EXYv,i,k,Cj,lR,KVgC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,crIVeZ,ClwEM,bVnY,D,RI,Cj,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DJelur,uYWpN,VsKz,i,FL,FvO,lR,lUt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DJelur,rrdcH,CqC,i,FL,FvO,lR,dheCD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GRggzx,,CqC,i,n,na,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ejmXRh,mHDez,CqC,i,FL,Pmiv,hk,zj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TVbiWg,tCwnd,iV,i,iL,wnVT,hk,fHv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nKnGbY,QImNH,LDk,i,iL,zNvM,lR,hyz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nKnGbY,QImNH,,D,iL,hmKv,ri,wep,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zaMTgf,YRJHb,Vj,D,iL,uWTD,lR,LXbkA,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wWXJBu,zktNk,,D,Cj,sWhI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kwuDmO,mXMfT,,D,iL,sD,hk,LfM,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VVEJlP,pYJLq,xDLG,i,iL,jBP,hk,Os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Sqmyvy,zoCon,mNh,D,Cme,y,hk,XkuJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pidmcC,,Gac,D,nt,Cj,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TtEofh,DnTGD,jb,i,SC,ev,lR,oGCR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sKBNud,cInLV,rNcu,U,Kg,Cj,lR,RI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZusDQH,ujyjw,opm,D,iL,IamB,lR,TqjM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,THrkBU,jHsOR,LjAS,i,u,SC,hk,WsqQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eyDIZq,qwbvG,zZe,i,aW,YO,i,WYXT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vVwQxj,ILLOJ,EXYv,i,pf,dYPI,l,YIdC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WenSOg,LJytA,LDk,D,iL,Cj,lR,hyz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lDrgWL,CcpoJ,xDLG,i,iL,uWTD,hk,VKgR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vsbHrR,jHsOR,Pcb,i,vk,Ri,lR,xav,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OYRyAP,iMSaA,bVnY,D,bf,Cj,lR,vIvA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bGMWfY,rGzDb,gpyD,i,GF,uECy,lR,EBv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ByvCdP,xxNrq,bVnY,D,RI,gI,fU,KkVi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EdUOWk,gwGKb,iV,i,G,hhhl,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhhoqp,yZyjK,ez,D,eG,Cj,hk,ffL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cwMDpr,UcrWb,zZe,D,xk,hmKv,lR,FzbE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mcjJFy,xZsRI,gpyD,i,u,gI,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cPbTKV,hQGku,Pcb,i,u,Wsd,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Nkimka,xJzGg,VsKz,D,nt,Usgd,lR,eQnMM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jaORsp,gUlWM,yhq,i,GF,yC,lR,jVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fKoUjK,IqilD,,i,TFX,aRnz,lR,Lel,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fzJsew,yQnHf,jb,i,RI,dYPI,i,oYnb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WKVmoT,BNnUs,rNcu,i,zj,SC,fU,BWfn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iqjdLK,yZyjK,iV,i,GF,Cj,lR,OfYI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LOAuvl,gCAcv,bVnY,D,iHi,Wsd,hk,GYdA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kjsxnB,PTqwP,jb,i,mR,LKKI,lR,XqlF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kjsxnB,EWrtg,xDLG,U,mR,LKKI,hk,nZS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AGMnua,kEKkc,rNcu,i,Kg,Cj,lR,HTr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,levmSX,AMEDi,,i,RC,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,levmSX,afrgA,,D,RC,Cj,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sSauzQ,UpZhy,CqC,i,G,fX,i,hLJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tPqwEf,RcNxf,CqC,i,hyz,YjrO,i,aNX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qYDisO,TzJAt,mNh,D,vk,Mgil,T,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VuWDOX,uVdCT,Vj,D,zz,qyCG,hk,na,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WjgOWQ,hFYeU,iV,i,GF,Cj,l,TPBt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xNjjSU,RZfCx,xDLG,D,bf,nT,lR,SKUMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Yibsgz,BFkyu,mNh,i,JnB,sp,lR,mzzs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AnzJDa,zLfaS,CqC,i,FL,HwD,hk,eFx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MCWtKp,VUfHR,,D,qh,Kg,hk,fr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FQFeLj,yPBim,VsKz,D,n,zlG,i,Oemz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NPIdyP,AqUSW,,i,RC,Cj,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hfTfea,,LjAS,D,OS,rbp,lR,okxM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xnTOga,xZrvA,xDLG,D,n,xa,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yxTidc,BHYuI,iV,D,iL,HaU,lR,zwKpn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DNQxBm,,Vj,D,kWZ,aRnz,L,dBp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OalRiH,GqeZx,,D,KR,yGet,ri,Frn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vPiNlz,DJjeH,CqC,i,GF,SC,lR,Alw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IKZdaA,pBRVS,LDk,D,Pj,KCWa,lR,zVYxj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IWtuQG,raiaC,Pcb,i,u,JZM,hk,fzn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TLTBda,xkeAA,bVnY,D,RI,y,lR,yf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YieTRc,BesNn,mNh,i,RC,pBlc,hk,zmro,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pNVYAa,TSHJn,ZQa,D,RI,Cj,hk,zPoQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qfgWST,zHbzr,bVnY,i,Kg,na,lR,yf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZPmdpn,TdMRE,rNcu,i,RC,eQE,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OaXTVA,qSMjB,EXYv,i,s,qVs,i,YFsM,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RVmDEo,KsmVk,CqC,i,sD,y,hk,wNrn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LSINRs,doIEg,EXYv,i,db,yH,i,DOVg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UjxNyf,FPgQL,zZe,i,SC,FvO,l,qsYhE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZAlFFJ,dHuvK,QMl,i,xk,,T,bfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GrEMAy,,ez,i,O,dYPI,l,tEq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yeApCf,eEpQL,CqC,i,k,yC,l,pbS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MYIDNp,ruKdN,bVnY,i,RI,uECy,lR,os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yOIYwh,QZyBk,EXYv,i,Lz,ev,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bjWuPL,ujyjw,Vj,D,ZJA,IamB,hk,hrkb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,onWMjr,SbGey,xDLG,D,pf,dYPI,i,qpO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vwcSSz,PXTnz,zZe,i,BfM,RSST,i,hI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pNFrVS,OJkEB,jb,i,RI,pf,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pPHpxO,hpCAn,Vj,i,ZJA,RSST,hk,RV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OjChaR,XNYmw,CqC,i,k,dYPI,lR,ajVx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WzCgig,IaFdH,gpyD,i,RC,dYPI,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ysrfLo,ERiHU,yhq,i,Zi,xa,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aXqKtz,tOKzC,xDLG,i,GF,SC,i,jQkv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LVuIFo,oEeyL,jb,i,RI,gI,lR,ESA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CWOyXr,BilOn,ez,D,kWZ,ZUA,l,rOw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,paRbtX,,xDLG,D,ZJA,dYPI,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wawiB,pLuie,QMl,i,vk,dYPI,T,BAR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AMbad,lmuIq,VsKz,i,JnB,SC,hk,zI,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uNnzM,otxsK,xDLG,i,RC,dYPI,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hRLhP,pwjVo,iV,i,GF,nT,hk,dDZH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WskUp,UriEN,anf,D,Pek,RV,lR,kiH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TKKTi,PAAWz,mNh,D,nt,YTC,hk,UGL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rLsBN,nMlTX,rNcu,i,RC,yC,fU,ZLep,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qzpnW,nMlTX,QMl,i,na,yC,lR,kwK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SSfzl,,bVnY,U,vk,,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gERAA,CSXEU,LDk,D,ai,y,L,hEQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bLesi,,Vj,D,Cme,qgNx,lR,tEq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FzJSe,Xzozi,VsKz,i,GF,hmKv,lR,Pe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pOyKb,gwGKb,CqC,i,n,dYPI,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GhOcL,eSjKX,LjAS,D,nj,lQU,L,ByoZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FiouF,ERiHU,EXYv,i,Cme,xa,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PyMPc,wZRHl,Vj,i,k,dYPI,lR,ekbX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oolhZ,mtJJa,EXYv,i,RI,,lR,KDzjp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uvCZN,rYFYY,CqC,D,pm,y,hk,KPjD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KTOXf,ZvTyL,VsKz,i,G,gOZx,i,UVN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EDYET,ERiHU,KsKZ,i,FN,xa,lR,jLqZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hMnfI,FbvHy,ez,D,iL,Ri,hk,cQRE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ErMuC,TVeAq,mNh,i,n,hmKv,L,xVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JzIiM,,Vj,D,ZW,IamB,hk,dBp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bHhsT,csdNC,mNh,i,aW,bqRO,hk,JANKe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lozJj,,,i,FL,kgW,lR,qSIi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dXpAz,jfQnw,iV,D,FL,qsr,lR,mwY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QjBTY,HqZYe,,i,mO,Cj,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EQIkd,qSpYs,bVnY,D,RI,LHS,lR,os,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Eqfif,rWGPS,ez,D,oLI,Cj,lR,FeM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OQzwa,gUDiL,yhq,i,pf,YO,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Widro,zaJDf,,i,RI,Cj,i,qENd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pSFGE,CUyKx,LDk,i,iL,YaU,l,StZeV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KFNsa,SklNG,,i,iL,gI,ri,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Beifm,vTSnp,bVnY,i,RI,HSL,hk,Mcs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bJQMT,lLQxd,CqC,i,n,buw,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xbrPO,UvBeZ,Vj,i,ZJA,dYPI,lR,ZRb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DzFHT,FJteQ,VsKz,D,cfU,Zsbp,lR,Mdru,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,asUAB,JFMRC,xDLG,D,Kg,Qhv,lR,dQInP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RfGHk,zxhwJ,VsKz,i,n,RV,hk,gnq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AyWVZ,MNqGT,LjAS,i,mO,xa,hk,Pj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JKAjz,WKKHt,bVnY,i,xa,yC,lR,bAO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JgNHW,,iV,i,GF,wnVT,hk,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZQLlw,jPrKo,gpyD,i,os,uECy,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NwWzv,SKGNX,bVnY,i,RI,,l,SAoA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LAfnr,,iV,i,IT,,lR,tUkpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cCpao,,mNh,D,sa,lQU,hk,sa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iImBC,,Gac,i,iL,buw,hk,zmQB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FNxUl,DnPCF,aN,i,n,yC,i,nOYkD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lVmec,NLAAP,mNh,U,iL,SC,lR,zjtN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,euBpC,DsqUE,bVnY,i,GF,y,lR,os,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HtwUp,JpXCs,EXYv,i,ZUA,gI,hk,jjmu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PSWHQ,zPWJZ,ez,D,nt,Cj,i,rXwP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZRJAH,UpZhy,iV,i,OmE,fX,lR,iga,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mvuuh,XeDef,xDLG,i,Nc,GES,lR,qhfz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IXKJn,qgWye,mNh,i,sD,Cj,hk,sa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SwpXV,NymNP,iV,D,iL,HSL,i,GsUD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hupfZ,Vahhp,mNh,i,GF,aHa,lR,qTCqD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jBSqN,hQGku,xDLG,i,n,Cj,lR,pTyu,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ClTsf,yPBim,mNh,D,Ri,SC,lR,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ImlcA,,rNcu,i,GF,MpP,L,EIza,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TQTIq,uVdCT,yhq,D,dQD,TAUy,hk,wlp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bPIjZ,TlWKY,VsKz,i,bf,pf,i,nTcS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uSBjk,YEATg,EXYv,i,O,VyBk,lR,JDK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uOQMn,dJezt,ez,i,GF,zz,hk,SCGA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uOQMn,pNMtG,xDLG,i,RI,y,lR,Kuz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QIedB,ClwEM,QMl,i,Cme,SC,T,qh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xNidU,TdMRE,LjAS,D,u,SC,hk,qVz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HLLCw,lFzoj,Gac,i,Kg,hmKv,lR,DsFP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EintP,NBYLm,LDk,D,iga,QIe,hk,PkpPN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vHQct,ZVMFT,gpyD,i,os,Cj,lR,Wu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZjVKj,aqDbd,ez,D,bf,y,lR,fCHGe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,huXsT,loInS,CqC,i,n,ZDwU,lR,ZBq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WFgqb,ZEsoU,KsKZ,D,xk,Ri,hk,GEx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cnZoA,XigoJ,Gac,i,u,xxmj,lR,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,htwWl,vdUHx,xDLG,i,RC,Cj,lR,qhfz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iQEtI,aPzRl,Pcb,i,u,HSL,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xQcvt,USlLw,,D,Cme,xa,l,aiR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dzvnT,CmGAY,rNcu,i,mR,Wsd,lR,HGAAg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SFQeY,ESRiE,EXYv,i,Ri,,lR,ZKqSX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jvuSK,WOouO,LDk,i,iL,rcz,lR,okIe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lVEqw,ivYgu,bVnY,i,eG,Wsd,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JTDur,aGAzh,rNcu,i,xk,hmKv,lR,DLWwp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mlohD,,mNh,D,pm,hmKv,lR,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NiVZE,QbFYx,ez,i,n,YO,lR,iKG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fbcmi,MMDPh,bVnY,D,FZj,pf,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ASqEG,qPmqU,mNh,i,pm,RV,ri,fx,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LWHmt,YoxHS,zZe,i,eG,ev,hk,nmp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uRUnf,uvXwY,opm,i,iL,Bkt,lR,DsK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vpMca,uVdCT,mNh,i,iL,TAUy,lR,lUAn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TNzyQ,,rNcu,D,pm,QhZm,i,FTFiE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LHYwk,,bVnY,i,n,pBlc,hk,ZUnj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EXxWQ,kDczl,,D,iL,HaU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fUMyT,kZYGG,bVnY,i,SC,Cj,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TxLDg,UriEN,,i,EF,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CXOTH,QImNH,QMl,i,Ri,IamB,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oNDWB,gJjvo,Gac,D,iL,iADy,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KTthd,ytgnG,Pcb,i,hyz,WNP,i,ExI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jHsOR,fJJQh,CqC,i,G,gOZx,hk,nhxp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IWNMt,xTKHz,EXYv,D,Zi,Cj,lR,Dgv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PnMzG,mZlTX,Vj,D,iL,jBP,lR,FtN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nyaKC,rQRBa,QMl,i,jgn,LKKI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZeUCY,ZKXqc,,D,GF,pf,i,BQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jzYis,jBtmc,EXYv,D,iL,buw,hk,nHGO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ctPIA,doIEg,CqC,i,GF,SC,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZQAgm,AMEDi,bVnY,i,RI,Cj,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZQAgm,vfKUn,ez,D,RI,SC,lR,QhEp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cQBZU,vfKUn,CqC,i,sD,nT,hk,WCvni,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aoauU,AMEDi,,i,RC,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JPrms,UvBeZ,xDLG,D,nt,hmKv,lR,dWDQ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iLGQh,ytgnG,CqC,i,sa,WNP,lR,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qsYhE,RYvzR,,i,zj,,i,RJS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,suknr,Vuxsd,,i,iL,y,ri,wep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lLwFO,pBRVS,ZQa,i,mR,IamB,lR,ZJA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bRzEF,gUDiL,xDLG,D,ZW,y,hk,TFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hBBSt,qgHRF,rNcu,i,u,fX,lR,REoT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xWQpV,Tnqdc,yhq,i,iL,dYPI,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fnVCn,hAjyU,VsKz,i,qh,Bkt,hk,dKSqh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pGeal,nMlTX,Pcb,i,u,YO,hk,fzn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yAjbv,EfCkA,xDLG,i,wGj,gOZx,lR,DmSa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LdlBC,TVeAq,Vj,i,iL,hmKv,lR,LL,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,AMEDi,rNcu,i,RC,Cj,l,XkNZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,LvDJh,Pcb,D,RC,Cj,fU,YaH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,SOcKk,rNcu,i,RC,dYPI,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PNHLV,vjTCE,opm,i,bf,DUHG,lR,gRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QVznc,UqBew,bVnY,D,FW,pf,l,jqw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dOmet,TUtqo,CqC,i,Cme,ev,hk,kszS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,foLHV,btSdP,VsKz,i,iL,NTj,i,RCBRO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GfRLe,bvupa,EXYv,D,GF,Kg,hk,MmW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XEXRG,rrGCj,CqC,i,jF,mwY,hk,zW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lfPmV,ujyjw,bVnY,i,n,,lR,MfTO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aJaH,ygneZ,Vj,D,mR,zz,hk,RxF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xEmK,,iV,i,GF,pf,hk,Lz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BNhM,hZPDA,Pcb,i,u,pf,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VmlG,txpZT,xDLG,i,RC,xa,lR,oLI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EuHw,vfKUn,ez,i,db,mwY,hk,rRLrt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,msxh,Tfkuc,opm,i,hyz,HSL,lR,tCJK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LOkA,pNMtG,,i,u,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EEtY,SAbkD,,i,iL,mwY,ri,Rsl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CxmZ,jJOWz,LDk,D,iL,fX,hk,hZSf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hnRw,yQnHf,CqC,i,GF,coyt,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gWGS,NWHpW,,i,RC,SC,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pqZL,yMOwe,,i,RC,Cj,lR,Qjf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZFRi,RdaZU,CqC,D,GF,Mgil,hk,zW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,znYf,alhGC,,i,SC,y,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LccU,tuGlk,,i,RI,ZUA,l,FvO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,azMj,ESRiE,EXYv,D,sa,,lR,SZrO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZeSn,,zZe,D,THd,Pif,lR,cAoy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuwB,gUDiL,Vj,D,xk,y,i,mnSd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DKWA,UICXp,xDLG,D,iL,SC,lR,Njo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DZYX,vZyhX,LDk,i,iL,,hk,SQnM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NYHQ,JYbNh,Vj,i,xa,lVH,lR,NrYd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nOXi,jlTWR,aN,D,k,y,lR,Ttu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nVpI,UEegx,Pcb,i,Kg,RV,lR,IUGJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kqtm,Svdoh,mNh,i,Cme,ZDwU,hk,uuoby,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GaJA,aGAzh,Vj,D,FL,RSST,hk,hrkb,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xrmP,oVTOT,CqC,i,k,,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kJRM,TjJiS,xDLG,i,iL,WNP,lR,qxk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Bbks,GwJNJ,xDLG,D,mR,pf,lR,lSYpK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FGLr,eSjKX,bVnY,i,s,DME,hk,ePq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,unoZ,iMVgZ,CqC,i,SC,iGu,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PBpK,zzRCP,xDLG,i,SC,xa,lR,Lxk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FLwe,opZrF,,i,zz,hmKv,hk,YrQO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Xlbq,tuGlk,xDLG,i,iL,FXZ,hk,Os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Vwhg,VUfHR,,i,u,y,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KwKk,xZsRI,opm,i,iL,Pe,lR,fdIU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mlEv,IBgxE,VsKz,i,GF,WNP,hk,YjrO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vxdZ,SpkNy,VsKz,i,n,hmKv,hk,MTtU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XOpE,Aibzq,VsKz,i,iL,DcjM,hk,TzcN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jCvQ,xTKHz,EXYv,D,bf,Cj,hk,LpKJM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mdfR,DnTGD,OYMU,U,Ri,xa,i,NdS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BYOM,ytgnG,xDLG,i,iL,LKKI,hk,xEm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,asOI,TdMRE,xDLG,i,iL,EuC,hk,YKr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dUtX,jrPjI,iV,i,RC,yC,l,UVe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QxSF,ERiHU,Gac,D,SC,Cj,hk,whE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UWwo,PIXnO,iV,i,RI,gI,hk,kWZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CisM,yZyjK,rNcu,i,iL,Cj,i,AMM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CQMs,MTddS,CqC,i,KR,WNP,hk,dQD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HFcJ,IUXap,xDLG,i,iL,yf,ri,mZhA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gEBs,XeDef,,i,u,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xxCo,CrCYV,gpyD,D,n,sp,lR,ieO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZBFl,uCfJW,rNcu,i,Nc,gI,lR,QFU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wiEw,dheCD,,D,iL,uECy,ri,WQGx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pDMo,hQGku,,i,u,ev,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CrcK,ruKdN,QMl,i,hyz,uECy,lR,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IRLB,nGRDB,,i,os,yC,l,s,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tDfU,JFMRC,,D,IaL,lQU,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rKKq,JRxbD,mNh,D,hSE,Cj,hk,rEy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JDli,ziMUf,aN,i,GF,eQE,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Shoh,IfTcW,xDLG,i,iL,y,hk,DIYw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ySyP,yPBim,bVnY,i,RC,SC,i,zpY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fNjX,dGrfN,rNcu,i,RC,RV,lR,eSa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yLSQ,qSMjB,,i,bf,zhkk,lR,VSL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cuyW,UZDWv,EXYv,i,sa,HaU,lR,wrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fKPi,cXMdb,LjAS,i,n,ev,hk,xk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XNFf,ivYgu,xDLG,i,pk,FvO,lR,euVq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yYUk,HGnGo,VsKz,D,RC,ev,lR,Mdru,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TVzw,HsZBB,iV,D,iL,Wsd,i,Gf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qoRe,GQqvx,mNh,U,nT,IamB,hk,ddk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zKcD,AMEDi,iV,i,RC,Cj,hk,qCrQD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nvEd,aHyMy,bVnY,i,RC,SC,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KtFl,vZyhX,Pcb,D,Rk,xa,ri,Zfxn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wCsQ,vZyhX,LDk,i,iL,pf,l,Kfuz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YQxg,ouvfu,Pcb,i,BfM,DME,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XThn,UdkMj,,i,ss,sp,l,rpbp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RqID,uLFqs,xDLG,i,iL,ZKX,ri,unIQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mBkN,pLuie,CqC,i,y,,lR,TSAE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,taXK,QImNH,CqC,i,xk,YO,hk,lLCD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zaPH,CfjhB,xDLG,D,iL,IamB,hk,fRt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fjdV,eKOcq,,i,vk,buw,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BfqE,ERiHU,CqC,i,Bu,xa,hk,DRN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aOPS,Kpqqn,,i,iL,Cj,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wFtD,RUGgg,rNcu,i,RC,DME,lR,pFH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QHwo,xTKHz,Gac,D,Cj,dYPI,oA,wGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QHwo,zktNk,,i,Cj,dYPI,hk,Odm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iRiQ,VnSVs,EXYv,i,k,SC,lR,aqXcx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bjUm,AXhVB,zZe,D,cfU,xa,hk,UZP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Lwfi,JpXCs,,D,iL,Cj,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VxeN,jxlBy,VsKz,i,sp,nT,ri,CTZP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iEZh,CiZAV,mNh,D,nt,Cj,hk,Jchx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GriK,ojeZB,CqC,U,iL,gI,hk,u,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ujOF,mxpyX,yhq,i,exS,yC,lR,yBwP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Hfee,hlcVp,iV,i,Kg,Cj,lR,RHTS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TbjS,eOvKA,CqC,i,y,YO,hk,uywMV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rHKt,tyXjf,,i,RI,dYPI,i,Dkyf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UKSK,GCXEW,xDLG,U,iL,Wsd,ri,Ycx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lUTR,xUKVK,aN,i,KR,nT,lR,wsJS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hWRn,,zZe,i,mR,yH,hk,mZUD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WMDE,wXrEE,mNh,D,aW,hmKv,L,GYLG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WMDE,oRdwp,rNcu,i,iL,hmKv,l,cfU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MOrF,uYWpN,,i,iL,fAb,ri,PSeH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XMxu,dNpUk,zZe,i,n,pf,i,Ktd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EzDR,pehkw,iV,D,uP,SC,i,UEGeb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,evCP,vdUHx,,i,vk,SC,fU,JBZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,evCP,KOgbb,ez,i,vk,Cj,lR,lcAf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YLNH,aBMem,EXYv,D,RI,y,lR,Vqi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UbxD,NHNrT,Vj,i,RC,Cj,lR,NMCp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MfTO,URKnG,xDLG,D,Cj,rbp,ri,unIQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SZMC,dVRlx,LDk,i,iL,rbp,lR,ZHzl,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eiEJ,jETqX,ez,i,JnB,Cj,hk,Glye,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XvKn,MOwcE,CqC,i,ePq,Zsbp,lR,HYt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WqZQ,TDdEE,zZe,i,GF,uGF,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yiJt,dlGGI,ez,i,iL,eQE,lR,ySq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mhRt,oRdwp,rNcu,D,zj,hmKv,l,tHC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kmdR,jXToa,,D,iL,xa,ri,PSeH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mXYE,ZnMDV,CqC,D,y,YO,lR,HCh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lZSR,GmokZ,CqC,i,n,y,hk,kAII,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Gisz,GuqeH,,D,JnB,Cj,ri,DPrp,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Oiyg,FQqvL,CqC,i,bf,hvW,lR,bvl,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KeOb,expEc,VsKz,i,exS,pf,hk,BfM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aICH,KOJjz,yhq,i,JnB,hmKv,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NRKX,pLYXJ,VsKz,i,n,yC,lR,KLtU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SRyZ,yUcaD,,D,SC,y,hk,jaD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UmaG,pBRVS,EXYv,i,n,IamB,i,ppFA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,SefEe,rNcu,i,zj,qyCG,lR,pYD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CZVD,zfiWB,iV,i,Pj,RV,lR,EoNf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sUIx,YoxHS,VsKz,D,xk,gI,hk,BfM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WSNr,qgHRF,zZe,i,jF,YO,lR,nqdu,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Xwdx,,opm,U,xk,y,hk,wvHx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NscT,RUGgg,xDLG,i,Lq,Alg,hk,ZW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NscT,LdGeV,CqC,i,Lq,blEU,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,unXD,WoFPI,QMl,U,Kdq,dYPI,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ikoa,mWKTs,ZQa,D,sa,LL,lR,AiH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kAII,qwblm,mNh,i,Cme,Zsbp,hk,sa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kAII,fgmAy,LjAS,i,Cme,Zsbp,hk,zI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kAII,tCwnd,CqC,i,Cme,Zsbp,hk,EIqxP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kAII,miwCS,mNh,i,Cme,hmKv,hk,Oase,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TKzU,InZpO,xDLG,i,na,nT,ri,Ycx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VLUE,jIXPf,ez,i,bf,ev,lR,Srkn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dzlc,rmSkc,CqC,i,RI,Cj,lR,ZNN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VBEr,UcrWb,xDLG,D,mR,hmKv,lR,kNK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fTwy,eSjKX,,i,Kg,hmKv,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XUBk,bvupa,,i,nU,Kg,lR,gpi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nuYV,yUWuX,,i,GF,hOgV,lR,gpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CBXL,oWoZd,EXYv,D,mO,zNvM,lR,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hhIq,,LDk,i,ai,pPN,hk,LWmE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iDwp,gJjvo,EXYv,D,sa,dYPI,lR,wrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YvmN,qWMEz,Vj,i,FL,DDPD,lR,RpxJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DsCi,asEGJ,iV,i,BfM,hhhl,hk,ai,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MDUR,mgoTc,EXYv,i,GF,YO,i,gxcx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sdpV,fFPdL,xDLG,i,nt,pf,i,qpO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Dbus,KgLFo,CqC,i,H,buw,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Dbus,DLtpg,xDLG,i,H,ber,lR,CVT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SlnT,CBYqn,ez,i,nt,gI,lR,qYvw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WkAC,,,i,zj,FhvY,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Evhp,GmokZ,,i,gI,pf,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QSwR,KyEGN,VsKz,i,H,hmKv,lR,rcz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xlVs,PCjHu,VsKz,i,xk,eFx,hk,Bpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SeNa,SRFic,ez,i,GF,Zvq,hk,iYc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nGZX,LyGdu,mNh,U,FMt,UpSB,lR,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TyCx,RCBRO,xDLG,i,Bu,diMf,lR,FZmZb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HtUT,AMEDi,EXYv,D,Ri,Cj,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhus,oRdwp,,i,EF,hmKv,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rgnl,DrkVz,iV,i,iL,YO,ri,DZYfi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BdzJ,kfqKW,,i,os,,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kBnd,zfiWB,aN,i,GF,wOZo,lR,oEIF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TnHp,zktNk,VsKz,i,Kg,GxNZ,L,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bxXJ,mMkdu,rNcu,i,GF,nT,lR,QFU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bxXJ,CbfyD,VsKz,i,GF,OxU,i,ZvrvE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Cvrp,kSXVa,,i,GF,RjQr,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JzdM,bWJlU,EXYv,D,RI,Cj,lR,BuBj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oCzE,CQsJP,xDLG,i,SC,y,lR,zHew,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TxDw,HGnGo,ez,i,iL,y,lR,sYGj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TxDw,VzUtA,xDLG,i,iL,y,hk,QpLE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EBxS,uLFqs,opm,D,Bu,YO,lR,dxjTY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gYfF,ZIxJx,Vj,i,G,uECy,lR,ZRb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mKJM,IqilD,xDLG,i,GF,mEr,lR,IgjC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wXQS,LyGdu,iV,i,ev,yGet,hk,AZDHL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gGyJ,DzgFa,VsKz,D,kB,,hk,qLkl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JvFc,,rNcu,i,mR,TAUy,lR,oQPZB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UKYX,okXKW,,i,kB,gI,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SyNu,eSjKX,CqC,i,xk,HSL,hk,qh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cNDz,RUGgg,CqC,i,y,y,lR,iFk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cNDz,XsOtC,CqC,i,y,rbp,hk,dQD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nuIa,bAbXl,VsKz,D,G,,lR,Jjn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,turM,UvMmX,,i,OS,gOZx,lR,OtVM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zCgb,hAjyU,CqC,i,k,YO,hk,qh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QwCY,pLYXJ,bVnY,D,n,soR,lR,KPvc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OOXa,qEcTl,VsKz,D,GF,gI,hk,LBFT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,RXFwk,bVnY,D,k,Cj,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,rGrAE,bVnY,D,k,nT,lR,boZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,PHCFJ,,i,k,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,pBRVS,OYMU,U,k,RV,i,NdS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,THfE,jFAln,iV,i,RC,dYPI,i,Gf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Thpg,SefEe,rNcu,U,GF,hmKv,lR,JWKQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XUdd,,VsKz,i,GF,ev,lR,xBMQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EMLx,yyEeK,VsKz,i,THd,XThn,lR,HnAv,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Oyzi,lvdHr,iV,i,GF,hmKv,hk,ai,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LioW,NEMaM,VsKz,i,jgn,Cj,i,aGXm,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IoYI,uSmwv,EXYv,U,k,y,lR,ZyXKq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lsSr,UZDWv,bVnY,i,zj,dYPI,fU,WeEn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lsSr,mAdjk,rNcu,U,zj,Cj,fU,wgha,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QhEp,NHNrT,rNcu,i,RC,Cj,i,WI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gMZR,MPhCr,VsKz,i,GF,oDHw,hk,UZP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gMZR,,rNcu,i,EF,TNuV,lR,ILws,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JWQu,xoEpJ,iV,D,k,pf,lR,bfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JWQu,NgyUp,OYMU,i,k,pf,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MkpI,teKMc,xDLG,U,sa,Cj,lR,KHpBY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hmlu,cDQxd,rNcu,i,RC,WNP,lR,pFH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hmlu,jCPPl,zZe,i,RC,jF,i,jrJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hmlu,,CqC,i,RC,YO,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lzVy,WOouO,CqC,D,Ld,gJq,hk,Uhb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AWgT,quVqD,rNcu,i,RC,Cj,ri,yIwDN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nxUa,KOJjz,rNcu,i,EF,,lR,qcGd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jBCu,XeDef,,D,RC,y,lR,cZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jBCu,AlHhR,,i,RC,dYPI,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lqnh,YMzrT,zZe,i,GF,dYPI,i,SlnT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ouJI,GluXQ,EXYv,i,sa,,lR,wrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,THDW,TaQcC,VsKz,i,FN,pf,hk,guWC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,twkC,lHjLY,rNcu,D,FN,SC,hk,bLBs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,EOhNc,aN,i,FN,HSL,i,AmjR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fwdx,zOpXm,VsKz,D,RC,sp,hk,lUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rEIi,kFOuu,VsKz,i,RC,gOZx,fU,DbCLG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oZUs,lbonV,iV,i,s,sp,hk,oalY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pChe,rYFYY,gpyD,i,G,VyBk,lR,JnB,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bqJy,pLYXJ,rNcu,i,y,na,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,qoeYm,gpyD,i,FN,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,krYIg,KsKZ,i,FN,,hk,dYJY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,KyEGN,,D,FN,hmKv,lR,Kuz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NsOx,mNgaz,gpyD,i,os,gI,lR,Wu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NsOx,vZyhX,gpyD,i,os,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,XmDvh,bVnY,D,n,RV,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,VzUtA,CqC,D,n,RV,hk,aQF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,asEGJ,CqC,i,n,hhhl,hk,aQF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,NpWJw,CqC,i,n,RV,hk,aQF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,YEATg,yhq,D,n,dYPI,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHyG,ILDSV,CqC,i,GF,,hk,srekm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHyG,GluXQ,bVnY,D,GF,,lR,OnL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEey,NwyCn,gpyD,i,GF,,lR,mLhW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEey,LZkcj,,D,GF,YjrO,lR,Lel,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEey,BWYOS,aN,i,GF,,lR,IMHY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhJP,eBwwX,iV,i,Lz,hhhl,lR,JXrJp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhJP,,CqC,i,Lz,VXkl,hk,gANm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,MqSAD,gpyD,D,GF,DME,lR,zvAOV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,ZQGrY,ez,D,GF,qyCG,hk,hDk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,rEMyu,iV,D,GF,,hk,Ejb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,VzUtA,aN,i,GF,y,hk,KYYyH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,nZVbd,gpyD,i,GF,zNvM,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,pzLPd,xDLG,i,GF,uECy,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UxdQG,,i,k,zI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BMhwm,,D,SC,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CuzmF,anf,i,Ld,gJq,i,mO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cDSib,mNh,D,oen,IamB,lR,KBp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,WeZTY,CqC,i,GF,na,hk,aXhw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jZYuu,,i,xk,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jZYuu,,D,pf,xa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QdloN,QMl,i,oen,hmKv,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HplMy,QMl,i,Zi,bnz,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OMHVy,,i,pm,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AjTUE,iV,i,s,qyCG,hk,Rpg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZNLhJ,ez,i,ZKX,IamB,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,expEc,,i,os,pf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZvTyL,,D,xk,gOZx,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zGsPH,,D,Zi,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xyxAO,,i,G,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ckbck,,i,kWZ,Zi,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rJRhE,,i,ZKX,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZJIhw,mNh,i,oen,na,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VGgQZ,opm,i,yf,KnZo,lR,AMfSM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cdSwJ,rNcu,i,sa,qyCG,i,ZgZg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pivbv,,i,u,lQU,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SdvqP,mNh,i,ZKX,RV,hk,SREr,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GQqvx,,i,Ri,IamB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,TVeAq,xDLG,D,nt,hmKv,hk,NsVd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,TVeAq,opm,D,SC,hmKv,i,yZNG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Sosye,,i,u,LHS,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,TeinF,Gac,D,vk,XOk,hk,llkA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rRbDE,,i,nt,hmKv,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NgFxn,EXYv,D,Kdq,nT,l,WiCV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VazYM,,D,u,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UqBew,xDLG,i,wGj,pf,lR,kwK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,PVTeP,,i,mO,y,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AXhVB,rNcu,i,OmE,,lR,Pif,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AXhVB,,D,kWZ,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,doIEg,yhq,i,FMt,Nc,lR,hCuK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CXOTH,Pcb,i,u,yC,hk,fzn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GejbO,,i,SC,ntQ,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BilOn,ez,D,RI,ZUA,hk,UZP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,uAKaC,ez,i,kWZ,y,l,akQrV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,trxic,iV,i,Pek,ZUA,lR,Vja,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Nqkmi,,D,GF,XLQ,oA,bpC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cCOsx,ez,i,uP,mEr,hk,NHX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RdvaT,,U,RI,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jmQLT,CqC,i,ePq,pf,hk,GWD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jmQLT,iV,D,exS,XLQ,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pLYXJ,,i,Zi,XLQ,ri,JI,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mDfiz,zZe,i,FW,Kg,hk,UZP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pcpoK,yhq,i,FL,Kg,lR,nQcqq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YTckD,,D,iL,sp,ri,jZDw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qgWye,QMl,i,RNB,Kg,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MAWHg,,i,RC,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aEyaA,,D,exS,cbZ,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,iMVgZ,QMl,i,yC,iGu,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hzafF,xDLG,U,qh,Cj,lR,zTLl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DUZqB,KsKZ,i,oMY,FvO,hk,IyUGQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,eNMxO,,i,zW,ev,i,U,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VAVml,,i,GF,IJq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gqTIk,LDk,D,,y,lR,LRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LhbfD,,i,BQ,na,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wNpHN,ez,i,ZKX,na,hk,vbP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,lUfTH,,i,GF,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hKYJZ,Pcb,D,u,rmJ,hk,Dnq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fQNSn,Pcb,D,mR,y,hk,zpzfh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DWRev,QMl,i,k,jBP,T,nT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zPIaP,xDLG,i,mO,Cj,lR,hzIS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CiZAV,zZe,i,JnB,Cj,i,WYXT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CiZAV,zZe,D,oh,Cj,hk,IUE,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Exftg,Pcb,i,mO,Cj,l,aSRa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MZzvk,QMl,i,xk,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AaQmZ,iV,i,xk,Cj,hk,Okp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UwAJg,Pcb,D,qh,Cj,ri,Etl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZKlRN,,i,u,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AqUSW,VsKz,i,ZW,kck,l,Zi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jNsAq,mNh,i,pm,Cj,hk,lmcY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DNkZz,,i,RI,Kuz,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BKxlg,Pcb,i,u,xa,lR,ETZD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JdEOh,VsKz,D,dQD,ev,lR,XEC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hlcVp,,D,OS,Cj,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,brRis,,i,eG,ebk,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OCBNS,,D,sD,jBP,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ivYgu,xDLG,i,FMt,Wsd,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ivYgu,CqC,i,n,Wsd,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hQGku,,i,ZJA,iGu,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DEdsD,xDLG,D,G,gOZx,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Nrney,,i,u,oeg,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jSnaY,QMl,U,Kdq,iGu,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KoskF,Pcb,D,u,buw,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SAbkD,KsKZ,i,FN,mwY,lR,EQj,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JKLEL,bVnY,U,RI,,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BTqwo,EXYv,D,kWZ,mwY,hk,Cwi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ARWie,,D,kB,HSL,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XSIPJ,,i,RI,HSL,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,POfGg,CqC,i,GF,DME,hk,RoZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZIelK,,D,iga,nT,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ntMiQ,,i,EF,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oVTOT,mNh,i,pm,rcz,hk,zlG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VONBE,,i,yf,Mhu,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yPBim,LDk,D,aW,Zvq,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,IqilD,anf,i,Ld,GWD,i,UqKl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UriEN,ez,D,RC,Cj,lR,CVT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aBMem,Pcb,i,u,rbp,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CQsJP,,D,qh,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gUDiL,,i,ZW,y,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ncmot,QMl,i,hSE,Vvh,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fFPdL,gpyD,U,k,y,lR,XRYA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HGnGo,,i,u,y,hk,bXj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qyqVu,EXYv,i,xa,buw,l,yH,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YkAvm,LjAS,i,u,OxU,hk,qVz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KgLFo,rNcu,i,mR,OxU,lR,xhco,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ddpTB,Gac,i,NHX,buw,l,KQFA,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vfKUn,,D,BAR,eHh,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LnlmR,rNcu,i,Kg,jaD,hk,jaP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GDIAH,zZe,i,eG,Vqi,ri,gOGR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GDIAH,Pcb,i,u,SC,lR,ino,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pziuA,,i,qh,xa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pziuA,,D,iL,lQU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UVEOH,KsKZ,i,FN,SC,hk,GEx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UVEOH,QMl,i,RC,SC,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,lHjLY,ez,i,zOi,gI,lR,lAUK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wwFAY,LjAS,U,Os,pf,hk,SLvZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XVSxY,,U,SC,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jBtmc,,i,Cme,rbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GbtuI,,D,RI,Pif,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QRxdd,gpyD,D,boZ,gI,lR,ZDet,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xxNrq,,i,eG,Cj,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zgcis,LDk,i,aW,Mcs,lR,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oGiPf,rNcu,D,RC,Cj,lR,TmXDG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RUGgg,ez,i,Ri,xa,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HVqQZ,,D,u,wlp,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YrRlk,Pcb,D,u,zz,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ygneZ,,i,MTE,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,dQgun,,i,iL,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xKZuK,opm,D,pqp,Cj,lR,JZM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yZyjK,xDLG,i,oh,Cj,lR,bBMv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nMlTX,QMl,U,mO,jF,T,pOHw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rWGPS,yhq,i,oMY,YO,i,eG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rWGPS,,D,db,rbp,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ERiHU,yhq,D,RI,xa,i,cdzQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ERiHU,ez,D,wGj,y,l,fBIL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ERiHU,,i,oen,y,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ERiHU,,D,xk,jF,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jCPPl,VsKz,D,RI,xa,hk,RIMOq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nJvcN,,D,RI,YO,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,baHIi,jb,i,Ri,xa,lR,ESA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LQsok,Pcb,i,qh,YO,lR,cjN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,llHEg,OYMU,i,ZW,rbp,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OiEPu,QMl,D,oLI,bf,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OTmTL,Vj,D,RC,xa,hk,tlVw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,knGHh,zZe,i,RV,YO,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,knGHh,CqC,i,yf,YO,hk,ZYW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MWNmr,Pcb,i,u,,hk,fzn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EnYIx,ez,i,Ri,xa,lR,ZhX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fyozH,zZe,i,zW,ZNN,fU,jFI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xZsRI,QMl,D,pm,pPN,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xZsRI,,D,lVH,GxE,hk,mO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,iOqTw,iV,i,GF,uWTD,l,KJZZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,TRTRm,gpyD,i,G,DDPD,lR,NXBi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OJghc,,i,RI,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qaAzm,,i,oLI,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aFnos,,i,THd,RSST,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KtAUU,,i,G,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,lrWjq,,D,n,ZDwU,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Lsxds,CqC,i,FMt,TAnX,hk,WLA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qkqKB,zZe,i,sD,,lR,nwcN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RlMtO,opm,D,hyz,dYPI,lR,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HLYZq,ez,i,uP,,hk,PoKt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gJjvo,,i,oLI,dYPI,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Svdoh,,D,Kdq,gI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xFQLL,Pcb,U,qh,cRzS,lR,ywB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xFQLL,,i,RI,dYPI,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xdICB,,U,EF,zhkk,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Gjomx,LjAS,D,u,YO,hk,qVz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RYvzR,opm,i,OS,,hk,ZUD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UbJjv,,D,yC,pBlc,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jPrKo,KsKZ,D,os,dYPI,hk,Ds,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Tnqdc,gpyD,i,Zi,,lR,RZc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fUzeb,yH,i,jF,,lR,YOiM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YEATg,bVnY,D,vk,dYPI,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZrEbS,yhq,i,zj,uWTD,lR,mdiu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vNCUb,,D,y,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gMpJR,,U,Cme,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LyGdu,opm,D,JI,zNvM,l,dpFve,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rHwUv,QMl,D,oLI,edWw,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tCwnd,,U,Cj,wnVT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tCwnd,,D,iL,wnVT,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aGAzh,bVnY,i,ePq,hmKv,hk,Lxse,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aGAzh,ez,D,uP,hmKv,hk,NHX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aGAzh,,D,Cj,hmKv,hk,LfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SefEe,opm,i,NHX,hmKv,hk,zhJP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QImNH,QMl,i,RI,hmKv,T,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QImNH,,i,kWZ,,fU,Om,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aRXZa,LDk,D,Ds,hmKv,lR,LRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oRdwp,QMl,i,RV,hmKv,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yQenm,mNh,D,nj,qyCG,l,zjtN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,miwCS,EXYv,D,sa,hmKv,lR,wrl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UcrWb,QMl,i,sa,hmKv,T,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UcrWb,CqC,i,sa,zNvM,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DzgFa,ez,D,vk,tCwq,lR,aUhY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,opZrF,rNcu,i,RC,UpSB,lR,UgXo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,TEZvY,,D,xk,tCwq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yFAAH,,i,vk,WHBi,lR,fDgK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mDidC,,i,Cme,IamB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EWrtg,,D,,tCwq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hpCAn,mNh,D,iL,,T,YhbN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hpCAn,,i,RI,RSST,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gwJUb,jb,U,RI,,lR,tmUK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DzLhz,,i,u,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oImqv,ez,D,BAR,Mgil,lR,aUhY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MMnif,,i,RC,gOZx,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XNCkz,,i,iL,svmO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YMYMT,ez,D,BAR,DDPD,hk,FZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,dheCD,gpyD,D,FN,uWTD,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XOZQm,gpyD,i,qh,uWTD,lR,uIEwR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UvMmX,,i,FN,DDPD,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aPLzR,Pcb,i,u,uWTD,l,MpKt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,EXYv,i,Kg,Rse,hk,mDtt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,EXYv,D,RI,uWTD,lR,Fpo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,xDLG,i,OS,Cj,hk,OldBm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,zZe,i,kB,Tmcy,hk,opWY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,i,ZKX,gOZx,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,Gac,D,mO,SC,i,cQoj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,U,pqp,XThn,hk,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,i,hSE,,l,Ot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,i,pm,WLA,L,CZTB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,i,Ri,na,hk,mzzs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,wGj,TAUy,L,DoN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,EF,pBlc,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,kWZ,IamB,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,Ri,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,xk,ysh,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,Yx,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,SC,juI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RivvNMK,VINkJ,EXYv,D,THd,ev,lR,QNV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TGphOhT,yyEeK,EXYv,D,xa,dYPI,hk,Cj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oiHJQrU,izZbI,rNcu,i,FL,eFx,hk,RI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,iOCaPkn,MNqGT,EXYv,i,GF,YO,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WsoZzjz,JjjZb,EXYv,D,RI,Cj,hk,TtEb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bHgHrEV,loInS,ez,D,db,vrEy,i,KZJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ycxvMWj,CfjhB,yH,i,mO,IamB,lR,DRraX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zRNRVnG,XeDef,EXYv,D,MTE,HaU,ri,TlBdZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gTgDynZ,RTQUJ,,i,eG,Cj,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wYurulW,utPhx,jb,D,RI,xa,i,rvOa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZYEqxVB,qPmqU,aN,i,ZJA,na,hk,wWlGo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GDdToNs,PXTnz,EXYv,D,Kdq,hmKv,hk,GBb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qfFrcPG,baHIi,xDLG,i,k,YO,ri,DmQW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kdWRjzc,Pwwsw,LDk,i,eG,bqRO,lR,LJju,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IsUMmyx,jWpps,ez,D,KR,ZDwU,hk,FqEk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VOOUYqy,FPgQL,VsKz,D,Zi,FvO,hk,zIPm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ngOhUrS,qwbvG,VsKz,D,kWZ,FvO,hk,DKbvr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kWXfmyJ,uYWpN,aN,i,GF,fAb,hk,qJaBY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YkQdagD,QImNH,,i,zW,zNvM,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DEEFEON,LQsok,QMl,D,Yx,YO,L,LiiMd,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gohpNCJ,TABDI,mNh,i,Ri,RV,hk,XkuJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JNwYyKX,qgaLp,QMl,i,bf,rmJ,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,woNKmIj,zAPsp,iV,D,GF,IamB,lR,Myl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JlzKcbH,rmSkc,mNh,D,RI,Cj,lR,Ybk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HMxGcFb,KOgbb,EXYv,D,nt,xa,ri,APs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RqmhvHo,auWsL,opm,i,hyz,fX,lR,JZM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hlKwAqa,RdvaT,ez,i,oLI,pf,hk,gRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VllIlHK,fFPdL,ez,i,Ri,y,hk,gRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zZNZaNS,LETzR,QMl,D,ZKX,ZBq,ri,bnsy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wGeLltR,,xDLG,U,Cj,YO,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JvnnuEv,WoFPI,ez,i,RI,fNfp,lR,cEub,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sacedLy,gCAcv,,D,k,pf,ri,JI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XQdqqbb,KyEGN,,i,sp,hmKv,hk,ebk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GkqhSpH,WdRFP,bVnY,U,RI,hmKv,ri,bTHC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nfnILrk,OsHEy,,D,sa,bfM,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XChbzzR,NXugp,bVnY,D,RI,qyCG,lR,os,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LwapveL,aEQZY,rNcu,i,Lz,qgNx,l,qKoOc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FIaXwVe,qZkcz,zZe,i,ZJA,uECy,i,ivUDY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fzYruZA,,EXYv,D,k,Cj,ri,APs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AxaBQDY,qZzCL,KsKZ,U,RC,Zsbp,ri,APs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TGNrNnc,lLQxd,CqC,i,sa,buw,hk,EfB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mJnRzvm,dtobc,bVnY,i,OS,Cj,lR,FSG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fiOYyRx,,,U,G,Cj,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IpgzxbA,KyEGN,xDLG,D,oh,hmKv,lR,cQut,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JZxSYem,QNNmG,EXYv,i,k,Cj,lR,Fpo,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vrBMsji,jPrKo,mNh,i,ZKX,ceEe,l,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZZQRFmV,MNqGT,xDLG,i,kWZ,YO,hk,jOvN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MoiOmKl,aPzRl,VsKz,i,Kg,y,lR,NHmv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,rLxIzku,ZanZO,QMl,U,k,pf,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sQhTekF,FJteQ,mNh,i,JnB,Zsbp,lR,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,iTLigfV,hAjyU,QMl,i,pm,Bkt,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TXiFICo,yUWuX,Vj,U,xk,xxmj,hk,qVyP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gvoSAjD,qHvtI,KsKZ,i,FN,pFH,lR,gNv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YGinnET,GtpuN,,i,wGj,pf,l,wnOH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zIGJEcL,VONBE,,i,iL,XJb,fU,FL,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vzfrYQO,OxiqL,LDk,D,iL,y,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QILqkqn,UgQaa,gpyD,i,FL,uECy,fU,NmJk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cpprnuP,UcrWb,ZQa,D,zz,hmKv,lR,dnTOH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ejqaWdw,,ez,i,k,Zsbp,lR,vNY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mUfaStZ,RUGgg,,D,oLI,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HwGQXaQ,MMnif,VsKz,D,eG,gOZx,hk,BfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,afRORuB,JFMRC,rNcu,i,fr,SC,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wDWZaU,NMwlg,mNh,D,RI,hmKv,hk,zlG,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UqXDiL,,yhq,i,Zi,gI,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cRrgvQ,KWjqE,VsKz,D,hyz,HSL,hk,pm,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KAtgIP,NHmIx,zZe,i,Nc,xa,lR,qCw,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WmPkhv,,mNh,D,aW,tCwq,hk,YlIz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SWwvZg,rYFYY,iV,i,FL,Pmiv,lR,HuE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zFhYyt,XTtja,Vj,i,GF,Cj,lR,pNbr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LBNMaF,OCsfh,bVnY,i,eG,cbZ,i,WcvCb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hVagzY,SNYME,EXYv,i,kWZ,uECy,hk,WLK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EQLmbX,CfjhB,EXYv,i,bf,IamB,lR,YjH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GEUNtE,MNqGT,OYMU,i,k,ify,lR,cxRD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BYNfAh,TVeAq,mNh,i,pm,hmKv,hk,XkuJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MqiTNE,Kqpap,zZe,i,sp,sp,l,GrIB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nHeRfY,uYWpN,,i,sp,FvO,hk,ebk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XkfyNl,KyEGN,rNcu,i,Nc,,lR,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sbPjfO,MMnif,EXYv,D,mO,pf,l,qoWS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SgMnTj,FHReq,VsKz,i,GF,YjrO,lR,NFu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pRlaJQ,QDnFE,ez,i,k,Cj,hk,zYm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cXHZiT,rSjvT,bVnY,D,vk,dYPI,hk,hcne,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BIWRSn,VKwcO,VsKz,D,FL,gANm,lR,JQpU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fDwqqq,HuAUO,QMl,D,pqp,HaU,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pZEbmx,CKSAk,iV,D,GF,tNd,hk,Lz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kFWGOB,yXPia,yH,D,mO,DME,lR,kdzt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MBKeVp,HrlvU,QMl,i,pk,qyCG,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SgpWpa,vosox,opm,D,SC,sp,hk,Jbg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KWEGBQ,uLFqs,,i,kWZ,IJq,ri,JI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,escnNH,,Gac,D,aW,Cj,hk,Hroly,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QmHOWp,mSeJH,mNh,i,EY,uGF,hk,uuFo,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EReOiK,hQGku,,i,RI,zI,ri,FcTm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MXLhPz,jBtmc,opm,i,RV,SC,lR,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JfkEBf,koaVY,xDLG,D,qh,Cj,lR,zdV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JttnNr,woFEW,,i,MTE,HaU,hk,SCGA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fFLRIL,gXbuE,EXYv,D,RI,dYPI,lR,JDK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ziiHNt,jpTVr,jb,i,Lz,y,hk,OmgL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OOktMI,DCemK,ez,U,WLK,RSST,lR,bfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yOynCd,pcpoK,mNh,i,RI,Kg,hk,sa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jLkGIt,zPIaP,rNcu,i,RC,Cj,lR,YYfO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tWhWlI,KPKhg,ez,D,bf,YO,hk,jdiG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WWUzqK,kJFIQ,QMl,D,RC,ESA,T,lvCoT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bPDQZF,UpZhy,ez,D,vk,fX,hk,jxiwy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KiUFav,,Vj,D,GF,aRnz,hk,MhRM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,omcyNX,,EXYv,D,eG,GCL,hk,Cj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hadeAD,LDAJI,rNcu,D,Kg,dYPI,lR,HTr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NPrSjF,hAjyU,mNh,D,RI,Bkt,ri,AZtrt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pBJuie,wgsnG,LjAS,i,zj,YO,hk,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Zezemt,CiZAV,LDk,i,na,Cj,lR,UVZb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LQndSh,kEKkc,,i,RC,Cj,hk,THv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BPjVTc,YEATg,jb,i,GF,TNuV,i,Kg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YaRDwv,rGrAE,iV,i,THd,Ri,hk,XcWC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oWfmZg,LyGdu,xDLG,D,zz,edWw,lR,TOhwY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xnebDB,dheCD,yhq,i,mR,eKfc,hk,eIg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,crJtKS,,LjAS,D,iL,qyCG,hk,MwW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DCSziD,DzgFa,bVnY,D,xk,TAUy,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pKgYig,PFepD,xDLG,U,JI,Cj,lR,qarK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AtJPuO,otxsK,,i,aW,uIjX,ri,PSeH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,raNEup,GQqvx,mNh,i,oen,IamB,hk,lpiH,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oTFOhX,uYWpN,xDLG,i,YO,Cj,lR,cQut,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HMwxod,loceY,aN,i,fr,KnZo,i,Kbu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dTnjpb,XNYmw,mNh,i,k,,lR,zmQB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YBQCZJ,CiZAV,,i,GF,Cj,lR,EY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XQObQD,vtYeB,mNh,D,cfU,pf,hk,pwngH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yCShEq,,Vj,i,GF,TNuV,hk,Yx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dassOQ,RUGgg,mNh,D,JnB,qsr,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qJxjZv,oxvWf,ez,i,eG,rSZ,fU,pJu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CnzNDc,,,D,iL,UpSB,ri,lzQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pidmcC,,ez,i,ZKX,gOZx,lR,MGSs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xrLrln,dtobc,OYMU,D,SC,y,hk,GriK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DAYvMB,aqDbd,iV,D,oLI,y,fU,uPqM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ftmvBP,oEeyL,KsKZ,i,n,gI,hk,oHWt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XAeDnT,eYjgF,QMl,i,Zi,WNP,lR,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aaNXEc,MMnif,CqC,i,Bu,gOZx,hk,RFDBA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kaewOP,alMCl,mNh,i,cfU,xa,hk,ddk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UMOJmW,EnYIx,ez,D,ZKX,AGz,lR,CKue,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XICXPV,MZzvk,CqC,i,RC,Cj,lR,MzjP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wxRclo,vZyhX,,i,Cj,y,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KqmhZY,aBMem,KsKZ,i,GF,Vvh,hk,gagk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SVQnyw,zWvHI,VsKz,i,GF,aRnz,hk,MSh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SVQnyw,YLfgi,opm,D,SC,aRnz,hk,ByoZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,rooyjk,JMwtw,bVnY,U,Yx,dYPI,hk,TnZPc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GDkbVd,aPzRl,LjAS,i,iL,MpP,hk,hYu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DsMdvX,,VsKz,D,SC,Cj,hk,SjX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qZwFKP,cPETG,,i,iL,tCwq,ri,jZDw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YsMkYD,NLGgZ,,i,zW,SC,T,fx,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PMReDK,gUDiL,CqC,i,jF,y,hk,WLA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OgWLQi,UZDWv,KsKZ,i,RC,y,lR,JRzt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AFZsEE,KwVUN,VsKz,i,sa,LHS,hk,fsSz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YCGbaf,ZSNHC,zZe,i,iL,zI,hk,Zvq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RQigdc,,LjAS,U,Kuz,Cj,hk,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LMigmP,Aclqz,EXYv,i,n,zNvM,hk,USCk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nIkmeL,yQenm,xDLG,i,k,qyCG,hk,LHHZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jhVAgr,,VsKz,i,k,SC,hk,xOX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PcChKn,wxvqY,,D,Kg,y,lR,Stwq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qGQuaY,hpCAn,CqC,i,n,RSST,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fEyMCY,TVeAq,QMl,i,Yx,hmKv,T,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qeErs,hlcVp,iV,D,oLI,Cj,lR,ASxF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QWuLZ,mWKTs,LjAS,D,aW,SC,hk,oFSw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nlkFo,GQDFd,LjAS,D,FN,Ri,hk,yC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AeOEj,AzPRY,EXYv,D,mO,SC,hk,teps,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dJCXt,QUpDF,ez,D,nt,nT,ri,fBIL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mMWXH,ERiHU,bVnY,i,n,xa,hk,sp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,rPgBp,miwCS,iV,i,SC,hmKv,hk,qNG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RpuLT,DnPCF,EXYv,i,KWZ,yC,hk,KHaQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WOTwW,KKRFI,ez,D,nt,y,lR,JhXA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gogrP,SOcKk,bVnY,D,k,dYPI,lR,os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jWgNH,OCsfh,EXYv,i,sD,pPN,ri,Cwi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VpiuB,frgYp,LjAS,i,GF,SC,hk,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RnUkH,hDwuu,xDLG,i,bf,dYPI,lR,AHFM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,clBsL,Edody,Vj,i,SC,ESA,hk,UEkVa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,anLYz,IQIHp,mNh,i,n,aRnz,ri,lpiH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qGeve,uGIFb,,i,nj,aQj,ri,JI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VCPxm,HTitb,mNh,i,iga,xa,hk,OqI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FCzYe,aBMem,KsKZ,i,FN,y,hk,GEx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZCenQ,,EXYv,D,RI,Cj,hk,fuPPa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EzMsU,pLYXJ,yhq,i,mO,soR,lR,fKPi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tUegC,ODyHh,LDk,i,iL,Njo,lR,mQkU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QOobG,aRalA,opm,i,hyz,hmKv,lR,JZM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eNlyu,gqTIk,CqC,D,sD,FvO,hk,QVghr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TJIjP,nJvcN,EXYv,D,iga,YO,hk,qsFe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XSaAv,vfKUn,Vj,i,ZJA,mwY,i,Xmz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CsUfa,tWWFx,,D,kWZ,,hk,Ffp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WtKCS,Ujcdv,bVnY,i,Ri,jF,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NTUjh,iiHKZ,LjAS,i,iL,Wsd,hk,ltjd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KkXWa,CiZAV,rNcu,i,aW,Cj,lR,muw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wgBMJ,GDIAH,bVnY,D,RI,pPN,hk,LXL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XOyWw,pLYXJ,Vj,D,eG,xa,ri,gAPJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QGDwp,daXRL,,i,iL,WMz,hk,Kgh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bFDJk,DmPDX,rNcu,i,n,Ri,hk,HItn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FQqpq,oxvWf,ez,i,eG,DME,hk,tJXA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EwHnk,unoLA,ez,i,iL,ZUA,fU,hZLC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GwJNJ,nPIxJ,,D,iL,eKfc,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DEdsD,mWKTs,zZe,i,Ld,bf,hk,EHI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CgiNm,HCLtA,iV,i,aW,Cj,lR,KHvq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oAvXY,qygIq,mNh,D,ZUA,bfM,hk,vbP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fkKmD,,Vj,D,SC,gJq,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QEPWe,erQTG,xDLG,i,mR,gRTo,hk,aaEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KyvSb,mWVJA,bVnY,i,RI,pf,hk,LXL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ABBIy,,EXYv,D,kWZ,pf,hk,aloU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,znzVq,yyEeK,,U,iL,TGXq,ri,pk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AgLky,rWGPS,ez,i,n,YO,lR,oLvr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OdsoJ,,xDLG,D,OS,y,hk,TFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,faeBa,,iV,i,iL,edWw,hk,oSDO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tMWWR,ueJRE,Pcb,i,u,Cj,hk,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XnYRS,,mNh,i,pqp,gOZx,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gpWCX,CgiNm,ez,i,zW,sD,lR,bfM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gpWCX,,EXYv,D,zW,FvO,ri,wGj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mTSky,ERiHU,,i,SC,YO,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,upvlD,MOwcE,CqC,i,k,Zsbp,hk,hOxWo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WGotI,TdMRE,rNcu,D,Dq,eQE,lR,UBCHJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dmtlN,QNNmG,EXYv,D,Yx,Cj,hk,pf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XEXRG,pLYXJ,yhq,i,jF,soR,hk,VTna,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FhXF,RdvaT,LjAS,i,iL,pf,ri,beBt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oQBl,xTIfN,Vj,D,sa,xa,hk,Cxwz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hTez,yMDSu,bVnY,i,GF,pf,lR,oFmx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UpDY,DzLhz,xDLG,i,os,gOZx,lR,oLI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dSlb,rWGPS,ez,i,Cme,YO,lR,gudI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EVqn,jZYuu,LjAS,i,Ri,xa,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vGPo,MgsXH,rNcu,i,fr,HSL,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Xlbq,tSmLS,xDLG,U,iL,gI,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EFBD,Smrjj,opm,D,SC,nT,i,UuSD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wLrS,hqpMg,,i,iL,y,ri,Rsl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,lqpr,Gxvvo,rNcu,i,RC,SC,lR,qcGd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mVTC,,,i,iL,SC,ri,zRrf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jOvN,hTzze,QMl,i,GF,fX,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qLRo,MMnif,yhq,D,SC,Cj,hk,Inq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HOCO,mtJJa,,U,RI,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Zwix,mWKTs,CqC,i,GF,Xua,hk,ulS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XQhn,JWQHp,ez,D,xk,QhZm,hk,vbP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AoyO,qjNZF,jb,i,RC,jBP,fU,OsSV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QGFS,ZMLHC,xDLG,D,nU,pf,hk,GacY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AEzV,qZzCL,Pcb,i,iL,gYmy,fU,UXK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jiBD,FZrSq,,i,iL,Xua,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XThn,XOZQm,LjAS,D,ss,pf,hk,NLE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RqID,uYWpN,,i,iL,ZKX,hk,LfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,foVe,KKRFI,LDk,U,iL,SC,T,CKue,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qfsg,ONGeK,LjAS,i,iL,YO,ri,wrl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jEKN,hpCAn,CqC,i,IT,RSST,hk,exHh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gYDT,BnYSc,,i,vk,xa,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UgRb,vdUHx,opm,i,SC,mEr,hk,Jbg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eJDM,eYjgF,zZe,i,Uw,soR,lR,TUXz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fDrC,RUGgg,QMl,i,iL,Pif,lR,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aOPS,BmXFy,mNh,i,iL,Cj,hk,cflD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZBQt,ZnMDV,EXYv,D,xk,YO,lR,fTwy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cHfQ,,xDLG,D,iL,Mcs,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fdrn,pLYXJ,LjAS,i,iL,soR,hk,aQj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Wxvr,qZzCL,,D,os,RSST,hk,YvNnL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,waJv,hQGku,ez,U,mR,pf,l,rOw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,waJv,VGUgj,Gac,D,mR,Cj,hk,NLE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,akiD,ojeZB,LDk,D,GF,gI,ri,jCu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FLff,XsOtC,aN,D,n,rbp,ri,GJxS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ITMV,GmokZ,CqC,D,GF,y,hk,VkB,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Gxrq,GOjIh,LjAS,i,n,hvW,hk,JXg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DnvS,MMnif,LDk,i,iL,gOZx,lR,CGLb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MOrF,uYWpN,xDLG,U,iL,ev,hk,bzPS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jdnH,bYETe,yhq,i,xk,SC,hk,oen,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZDlT,nndpW,VsKz,D,Cj,y,hk,nmyk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KOOo,HXSgR,,i,os,y,lR,EY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ElFW,FPgQL,rNcu,i,qh,FvO,lR,zRrf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hHpR,eMFPU,Gac,i,Os,,hk,kgn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SIzG,UriEN,CqC,D,jgn,fX,hk,aXhw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WqZQ,JiKdD,bVnY,i,GF,hmKv,lR,pMu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZIfo,,xDLG,i,iL,SC,lR,jF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NpKZ,teKMc,,U,iL,HSL,i,xChY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yiJt,ZnMDV,,i,iL,eQE,hk,LfM,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fLOp,DXeTv,,i,RC,pf,hk,syQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mhRt,aRalA,iV,i,zj,hmKv,lR,KHru,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mhRt,hpCAn,VsKz,D,zj,RSST,hk,wGj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Gisz,puepy,bVnY,i,JnB,Cj,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pVqh,,,U,xk,hmKv,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uZgF,mWKTs,VsKz,i,RC,LHS,lR,GsUD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aICH,RdvaT,EXYv,D,JnB,pf,hk,VINkJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zhNH,NUlQD,anf,i,ev,,i,gps,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fBXl,kBvrH,xDLG,i,SC,y,hk,Os,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RlxT,QImNH,rNcu,i,zj,hmKv,lR,LNVN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RlxT,oRdwp,xDLG,i,zj,hmKv,lR,fOd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eNNx,ZrkWF,Pcb,i,gI,wnVT,lR,cVl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DvEd,PHCFJ,,i,iL,Cj,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NscT,JFMRC,xDLG,i,Lq,MAI,lR,mhPN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wDsR,XsOtC,zZe,D,s,YO,hk,AdIi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ATIO,ERiHU,VsKz,D,Cj,xa,hk,GYYru,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JvZl,QImNH,rNcu,i,os,zNvM,hk,QYrZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CBXL,ssKpq,rNcu,U,mO,,lR,mmpg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zNtu,SyFMb,,U,xk,ev,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hhIq,UvBeZ,VsKz,U,GF,zhkk,hk,buw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gMCg,CIFhS,Vj,i,pf,pqp,hk,gomi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MDUR,jCPPl,CqC,i,GF,YO,hk,Eloq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xlVs,eOvKA,VsKz,i,FN,YO,lR,YTC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xlVs,aPBma,ez,i,JnB,y,i,Rk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pkJJ,DRRNF,xDLG,i,RI,yH,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AQPm,aqDbd,zZe,D,nt,Cj,hk,MWxs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HtUT,AqUSW,ez,D,Ri,Cj,ri,KgPLW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BmyG,KwVUN,zZe,D,ZJA,LHS,hk,fIpl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Etcv,XsOtC,xDLG,D,SC,y,ri,JyOk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QIfF,ygneZ,rNcu,D,G,zz,hk,uCSJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ANxM,zHbzr,,i,SC,na,ri,Rsl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PZOo,kkrCJ,bVnY,i,xk,rbp,hk,Yx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UKYX,dtobc,Pcb,i,kB,pf,hk,vedL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wrpC,CKgVb,mNh,i,KR,nT,hk,coyt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JqtP,pLYXJ,bVnY,i,GF,soR,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dJQk,VzUtA,CqC,U,k,oen,ri,OlHN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DTjs,GDIAH,gpyD,i,os,pf,lR,Wu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Thpg,gXbuE,gpyD,i,GF,gOZx,lR,sQe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Thpg,XigoJ,yhq,D,GF,dYPI,lR,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Thpg,,bVnY,i,GF,Cj,hk,pf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VPnH,QdYiD,zZe,D,Ld,Pif,lR,pxPc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QoIi,cBMeY,VsKz,i,xk,Nc,hk,Ipmh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MVdL,,iV,D,GF,YjrO,hk,atXsm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XUlI,BcjOW,ez,i,Ld,PnY,lR,FMt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,twkC,uCfJW,iV,i,FN,gI,ri,tfDj,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QCRl,QGDwp,KsKZ,i,FN,ESA,hk,DXwJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QCRl,kXOim,KsKZ,D,FN,BcOI,lR,NiAS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fwdx,ZvISh,aN,i,RC,eQE,hk,lTC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,rEIi,wwFAY,iV,U,RC,SC,lR,mwY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pChe,SefEe,aN,U,G,Zsbp,hk,STfV,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,vdUHx,KsKZ,D,FN,Cj,hk,dYJY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,Tnycz,,i,FN,gI,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,RUGgg,,i,FN,zz,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nTcS,yMDSu,iV,i,os,pf,lR,vQMX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nTcS,fnnlN,gpyD,i,os,dYPI,lR,Wu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NsOx,pzLPd,xDLG,D,os,uECy,lR,oLI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NuQz,qTQVz,CqC,i,n,RV,hk,aQF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fflq,diapp,xDLG,i,os,aRnz,lR,salF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fflq,Gjomx,Vj,D,zj,dYPI,lR,QHki,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AJXa,tWWFx,rNcu,D,RC,Wsd,ri,ixZLe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cflD,,ez,D,GF,gOZx,lR,nGw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dMyb,WJPze,gpyD,i,GF,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CBUCa,,D,RC,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UxAHz,mNh,D,Yx,xa,hk,UGL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qeFZl,,D,,pf,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XoaNi,,D,FMt,SC,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nnuQG,ez,D,BAR,gI,lR,epE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,HtSNA,,D,s,jaP,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,AfFcP,,i,KR,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aYHBl,,i,WLK,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aYHBl,,D,jgn,bf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MqSLt,,i,,zlG,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cDSib,mNh,D,hyz,IamB,hk,Pj,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TPrhq,QMl,U,RC,xa,lR,REu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZtlYH,QMl,i,bf,dYPI,fU,pgd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZeUgg,,i,Ri,qyCG,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NnTgY,gpyD,i,Uw,y,lR,hzO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YTOcY,iV,D,sa,ESA,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uvXwY,Gac,D,nj,Ouf,oA,wGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mqZQF,,i,FN,,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZvTyL,zZe,D,oLI,Mgil,hk,aeij,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZvTyL,QMl,i,xk,uECy,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Whdwc,,i,RI,sp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FuLoz,,U,,nT,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,EyOxE,,D,hyz,XJb,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,HRQxw,yH,i,xk,LfH,hk,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dSzZF,,i,Yx,pf,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VGgQZ,opm,U,mO,edWw,lR,oUt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QDnFE,,D,iL,aRnz,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,lvKFp,mNh,i,JnB,xa,T,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rmSkc,,U,pm,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,StZeV,opm,i,eG,YVT,lR,aEem,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GQqvx,,i,nt,IamB,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GQqvx,,D,iL,IamB,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pnejQ,,D,sD,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qoWGW,,i,EF,oKN,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NgFxn,xDLG,D,iL,nT,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MiuKF,,i,RI,zNvM,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eYjgF,Gac,i,qVs,soR,hk,ySTK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VCfFf,,D,RI,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,AXhVB,Pcb,i,Rk,Cj,ri,nMxp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,AXhVB,,i,ai,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DXeTv,,i,GF,bvX,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DXeTv,,i,Ri,xa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vdUHx,,D,xvb,MWL,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mZcIF,Pcb,i,u,XLQ,hk,Dnq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gdobm,,i,aW,Zvq,ri,EPqN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MTddS,bVnY,i,xk,WNP,i,qqvb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vRnVr,,i,FL,Kg,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,kEKkc,,i,FMt,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QZyBk,LjAS,D,RI,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uYWpN,xDLG,i,BAR,fAb,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uYWpN,,i,ai,ev,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TUtqo,KsKZ,D,fr,ev,hk,Ds,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zfzpe,,i,Cj,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SXZFT,,i,oen,Dnq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jkNiR,,i,nT,Cj,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,wNpHN,,D,sD,hfB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GRify,,D,oh,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GOjIh,,D,iL,eQE,ri,pk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YzwDz,LDk,U,kWZ,Ri,hk,EZR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ClwEM,xDLG,i,FMt,eQE,hk,LjOt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rGrAE,zZe,i,os,pPN,lR,acq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fbGJX,,U,vk,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JRxbD,,i,SC,juI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jHsOR,,U,SC,Kuz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zcypH,Gac,i,Nc,Cj,hk,DIJqn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zPIaP,mNh,i,RC,Cj,hk,VFJo,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CiZAV,EXYv,i,pm,Cj,ri,oEeyL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MZzvk,,i,sD,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZKlRN,,i,Cj,aRnz,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,AqUSW,,U,FN,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NHNrT,,i,,GF,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,PHCFJ,,D,BAR,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Gaife,,D,RC,FvO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JdEOh,rNcu,i,NHX,Dgv,hk,EwUI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,hlcVp,yhq,D,kWZ,ev,hk,kdc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qLcjc,,D,fr,Zi,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tvQoU,Gac,U,aW,eFx,lR,ObrV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tWWFx,ez,D,bf,Wsd,hk,Bgb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ivYgu,,i,gI,Wsd,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GzWeI,xDLG,i,Zi,ShH,lR,YTC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GzWeI,,i,mR,ShH,lR,UuA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gYJKT,,i,qh,Wsd,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZUTno,,i,ZW,Wsd,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DEdsD,EXYv,i,OmE,Jbg,hk,Xair,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,teKMc,,i,oh,HSL,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QUpDF,mNh,i,oLI,YO,T,zjtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TZFeB,iV,i,GF,Mcs,hk,tpbr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VONBE,,D,ZW,XJb,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jpTVr,,i,os,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jpTVr,,D,iL,y,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,diapp,Gac,D,oLI,pf,lR,wGj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,diapp,,U,,Pif,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KKRFI,LjAS,D,aW,y,hk,Pj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DAQZp,,D,RC,y,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gUDiL,,D,SC,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KPtjK,EXYv,i,pm,HaU,hk,YjH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fFPdL,,D,kWZ,y,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cuTxO,,D,xk,OxU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,lFmPR,,D,RC,GCL,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JFMRC,,i,jF,lQU,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cLImw,,U,RI,gJq,ri,OYcm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eSjKX,bVnY,i,Yx,Cj,ri,hmIx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eSjKX,,i,RI,lQU,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DxVnv,,i,pk,hvW,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,frgYp,xDLG,D,Cj,Cj,hk,SzVP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NLAAP,,D,hI,SC,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LJytA,bVnY,D,GF,SC,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aPzRl,CqC,i,jF,YVT,hk,wIw,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,wleoI,LDk,U,WLK,aPt,hk,RXzLC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,BFkyu,mNh,i,Ri,Cj,hk,fEKc,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GbtuI,,i,Nc,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Tnycz,,i,oen,aPt,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,xTKHz,,i,iL,ev,L,QwIV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FHKAj,yhq,D,vk,Cj,hk,Inq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yZyjK,EXYv,D,iL,Cj,ri,GYLG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZanZO,,D,RC,sp,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jXToa,,i,mO,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LQsok,,U,OS,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,HaPRU,LjAS,i,u,rbp,hk,qVz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZnMDV,,D,,YO,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mgoTc,Vj,D,Kg,YO,hk,Njcw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VTbsV,QMl,i,qh,xa,T,nT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,HfANR,xDLG,i,aW,pf,hk,Os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,OTmTL,,i,FN,xa,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MWxHT,zZe,i,Ld,Xua,L,tDbH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vsXyT,Gac,D,aW,SC,hk,lBIs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,hAjyU,,U,hyz,Bkt,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fyozH,,i,jF,QJC,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,efjwD,,i,pm,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vmBfp,,D,BAR,lpED,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Aibzq,,U,,DcjM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FjRPe,yH,i,Zi,WSIq,lR,EbrO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,xFQLL,,i,JnB,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XsLDX,Gac,i,hyz,dYPI,hk,mqbQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yJaHj,,U,nt,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SmWKf,mNh,U,pm,Yxhj,lR,SUFr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mGUGe,,D,os,tOJv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SOcKk,,D,Kdq,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,etVtj,,i,,zvgI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Toicl,,i,GF,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Olwkk,,i,n,UPkh,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,soKhL,,i,,TXLD,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SraSg,,D,Os,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SKGNX,yH,i,Zi,khbX,lR,YOiM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dEvnd,,i,FMt,WcDS,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Tnqdc,,i,nT,dYPI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,csdNC,LDk,i,eG,uWTD,l,XMeWk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JMwtw,,D,Os,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tCwnd,yhq,D,zz,wnVT,ri,UNnr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SefEe,,i,os,qyCG,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SefEe,,D,BAR,hmKv,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QImNH,yhq,i,kWZ,hmKv,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QImNH,,U,EF,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QImNH,,i,xk,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nZVbd,rNcu,i,EF,hmKv,lR,EjEh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nZVbd,,U,RC,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nZVbd,,i,FN,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oRdwp,,D,FMt,hmKv,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KyEGN,,D,Yx,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KOJjz,,i,jF,gOZx,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VGCHd,ez,D,ZKX,WHBi,hk,bCU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yFAAH,bVnY,i,KR,WHBi,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,RVOBZ,,D,kWZ,WHBi,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QhQVq,,i,GF,KCWa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ujyjw,,D,RI,IamB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mDidC,,D,,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,loceY,yhq,D,Ds,RSST,hk,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,hpCAn,,i,JnB,RSST,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ruKdN,,i,,uECy,,,5327653760319593481
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YMYMT,LjAS,D,RI,DDPD,hk,TxDY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YMYMT,,i,GF,DDPD,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dheCD,ez,i,nT,uECy,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dheCD,,U,FN,uECy,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,OirYD,,i,ZKX,Tmcy,ri,pk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,VsKz,i,zz,DDPD,hk,EOdj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,gpyD,i,Yx,IamB,lR,WHDwP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,LjAS,D,kWZ,fX,lR,RC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,zZe,D,sp,Mgil,hk,erpNK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,anf,i,WLK,Om,hk,RGK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,QMl,i,TGR,KtFl,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,CqC,i,RC,YjrO,hk,eOq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,i,oen,KCWa,hk,UGL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,i,pm,HSL,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,i,RI,ev,hk,rEy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,U,,edWw,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,cfU,LKKI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,pm,LKKI,hk,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,GF,xtfK,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,RI,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,OS,Mcs,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,s,hmKv,hk,AGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,GF,Vnr,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,pk,NRRL,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pWIWdaw,,,D,RI,hmKv,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cdRzYsL,,VsKz,i,GF,HebM,hk,Xot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XLvRzVI,,VsKz,i,n,siXg,lR,MLFY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hiynoES,,QMl,i,FN,Tmcy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cmyXNyK,,yhq,i,nt,ZDwU,l,reBn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ViwLtoc,TdMRE,jb,D,Kuz,Cj,l,jSwW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SEgNqJQ,,zZe,i,TGR,dYPI,i,Ri,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aBCVTmN,,Pcb,D,u,,lR,ywB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,keRqOHR,jfQnw,,i,k,zz,hk,db,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fePNzDr,,mNh,i,RI,gOZx,l,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IXozANJ,vsXyT,xDLG,i,kWZ,HSL,fU,bIow,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VeeUrPH,NinGj,yhq,U,mR,xa,hk,Inq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JzFPYgU,,,i,os,jF,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yWCKZav,,yH,i,aW,edWw,lR,qyjW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KhUpdFg,,xDLG,i,zj,kSz,hk,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HRUHWnY,,,U,hyz,IamB,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CmDgcAO,SklNG,CqC,i,ePq,gI,hk,WLA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FmvGeJr,,mNh,i,oen,oka,T,xVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FjfeLgK,JcHat,,D,mR,ZKX,i,rwl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lHjALKn,,opm,D,hyz,IThq,hk,sQzAg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uqAhPrT,,iV,i,vk,Vja,hk,Ld,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JQkOKVO,,KsKZ,i,u,eFx,lR,woE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,phQgKLG,,,i,GF,Cj,oA,bpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CfHajsr,Aclqz,VsKz,i,iL,zNvM,l,mFFI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PzEYDmh,,rNcu,i,RC,tOJv,lR,HTr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vvfHwZe,,CqC,i,ePq,y,hk,qh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PxFGGqO,xKZuK,,i,mO,Cj,T,mEr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YzalqEI,,mNh,U,Zi,YO,l,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JGDDScq,,,D,vk,pf,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ffITnLS,,LDk,i,vk,Zvq,hk,OS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rjWTXYQ,pcpoK,Vj,D,ePq,Kg,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YWwHHNC,,ez,i,oLI,Cj,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WqzuKtR,,QMl,i,n,YO,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jMfYuAk,,,D,FN,FlFf,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HCejqHh,,mNh,D,hSE,pPN,hk,rEy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DksijHX,,,D,kWZ,UpSB,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lRmLvmS,KgLFo,Gac,i,GF,pf,lR,RNB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CnIGgEA,,mNh,i,Cme,YO,hk,YeavC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AkHbcpF,,EXYv,U,Ri,hmKv,lR,QFlu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fujpnhc,,QMl,i,mO,uWTD,L,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nplOxXg,,VsKz,i,RI,bvl,hk,WkAC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZgSDrBW,FHKAj,zZe,i,vk,pf,i,LTUxt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vmFahZM,MZzvk,mNh,i,RI,jBP,l,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dfTNFdL,,QMl,i,pf,dYPI,fU,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VFgzJoE,,LDk,i,os,gOZx,lR,DvEd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LwIkfdU,,bVnY,i,fr,xa,l,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AYisXWS,,opm,D,JI,Cj,hk,LrJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sTGwOYN,,,i,ZJA,bfM,T,mEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dkLjktQ,,,i,RC,,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hChYBYC,,iV,i,JI,gmi,i,Gf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jKljVbO,cdSwJ,bVnY,i,mO,,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nAjuDGN,,KsKZ,i,Zi,Rfp,i,OUn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wYymmNZ,CiZAV,LjAS,i,Yx,Pif,lR,xKSj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YfOquZF,KyEGN,Vj,D,sp,hmKv,l,TGR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UYYbYbq,,gpyD,D,os,tOJv,lR,XEY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,orGsCgu,,jb,i,bf,sp,i,Kg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uzVNZdr,,Vj,i,nt,Cj,lR,jF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OaeVLPS,,,i,Pj,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gDGrSYZ,,,i,Zi,DDPD,i,aaDx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SnphHXL,GqeZx,xDLG,i,Nc,KCWa,l,qpO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LYZpqux,RGitv,iV,i,iga,gI,i,hvEAu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wgJVQAs,oRdwp,,D,mR,hmKv,lR,QBF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yaiTaTz,,,D,RI,gOZx,l,WaRt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qvXMVKL,,QMl,i,mO,sp,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BNouErH,DzgFa,QMl,D,xk,TAUy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iqqPnrI,,,D,RC,fX,hk,Dq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JackSgE,,zZe,i,GF,dYPI,l,uP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mTfVVID,prCpG,ez,D,Kg,Cj,l,akQrV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uxDNEmA,,Pcb,i,qh,,lR,xWws,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nnMRwBY,,LDk,D,aW,qyCG,lR,MTE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BqzPMvD,,zZe,D,Lq,RqID,l,rIKSi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,azpvmmA,,iV,i,RI,,hk,kWZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KVQFteh,BWYOS,,D,PF,cmmA,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AEMpTPc,,QMl,i,Zi,ZDwU,fU,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EdCMCEu,,gpyD,i,RC,soR,lR,WFD,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BvDjCvB,,CqC,i,FL,RV,hk,acft,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KcXxeLQ,,yhq,D,n,aRnz,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JoHWdpu,,LjAS,i,iL,aPt,lR,OElC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MrgXYr,aRalA,EXYv,i,RI,hmKv,hk,yUsg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xpbLSl,,VsKz,D,RyV,yf,lR,cLshG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QOqBzG,tcmZw,jb,i,jgn,gOZx,i,Kg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IRWaWV,,bVnY,D,Yx,Cj,i,pfq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EtjZAu,qPmqU,,i,GF,IamB,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wfZbOj,,mNh,i,RI,Pmiv,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PxrVei,,bVnY,i,kB,cRzS,lR,os,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uuddTD,,,i,lVH,XJb,fU,Om,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GQYcLS,XsOtC,EXYv,i,bf,rbp,hk,gGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dJMDcY,Pjqcv,jb,D,KWZ,TxcW,i,Kg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,etoEvz,,LDk,D,aW,cZ,hk,bPsm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JNIwsK,,zZe,i,RNB,TXLD,i,VVsj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NpFYzQ,izZbI,,i,Ot,pf,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tGxGqA,yVwRn,,i,IaL,ZNN,L,kDlex,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DjkfZu,UjnIE,QMl,i,Zi,XOk,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ifkDbj,,Gac,i,iL,ev,hk,vTwSH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CNkjFd,QImNH,mNh,D,nT,hmKv,lR,jF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XbLzEm,lTyLf,rNcu,i,RC,dYPI,lR,wTHj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CHqRwA,,ez,i,k,Zsbp,hk,iYc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zVCzco,vTSnp,ez,D,kWZ,Cj,l,rOw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hlMawF,,rNcu,i,RV,WNP,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rITRza,zlxbS,KsKZ,i,FL,hmKv,l,fX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rbvOUi,,bVnY,i,ZJA,,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yyIxlG,,,i,WLK,fNfp,l,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iMHiMv,,LjAS,D,xvb,sWhI,hk,CRl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QeLzRP,,yhq,i,ZKX,dYPI,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hCeEEh,,zZe,D,SC,Mcs,i,jrJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZoqtcY,EfCkA,jb,D,Ri,Cj,fU,MuoU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oTDfFB,,iV,i,IaL,,i,pigy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iwaPGU,eHUjU,ez,D,RI,na,i,dJJJc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AlbPpR,,,i,FN,sWhI,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UztsXc,,yhq,i,dQD,khbX,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ecpAUZ,,iV,i,n,Cj,hk,zI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sneFxM,QJuki,mNh,i,RI,ZcH,l,xVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pDOrPA,,,U,IaL,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vWXWjj,dNpUk,ez,i,jgn,Mgil,lR,hfB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eTeWGe,,zZe,i,zj,TGXq,hk,Kdq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yrFcTz,XEXRG,aN,i,RC,uWTD,lR,WLK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AkZrYc,,EXYv,i,iL,Tmcy,hk,wJwu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tQmAfA,,bVnY,i,RI,sp,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ewvTmC,,yH,i,mO,iGu,fU,uEsd,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zxmoPa,lCmNN,mNh,i,BAR,dYPI,lR,ZhX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QIUlan,,yH,i,kB,rbp,i,TrjBe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QLekdH,SefEe,Vj,i,KR,nT,fU,Vnr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JJqUch,,VsKz,i,Lq,Kg,hk,ObUn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sesunG,xTKHz,Vj,D,JnB,Cj,lR,rOHv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gwiYiw,,bVnY,i,KR,hmKv,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JzofbT,,zZe,i,kB,wCsQ,lR,iMC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QxjGms,,iV,i,RC,yH,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WTXldA,HXSgR,CqC,i,n,YO,T,pkJJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ULByCR,,gpyD,U,RC,Yxhj,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hSVUhs,,bVnY,i,k,uECy,i,zpY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,guxQgB,,bVnY,i,os,dYPI,l,tHC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rDxLkc,,zZe,i,sa,Blj,hk,iIFj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FAQqTv,VFLUU,EXYv,D,SC,hYu,lR,jigqS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DwpZGL,EWrtg,,i,n,LKKI,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uMkLZq,,Vj,i,ZJA,,i,zAPsp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QZOnIb,,,U,TFX,hmKv,hk,db,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iFdAre,,QMl,i,Zi,Mhu,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DemGIr,,iV,i,G,gOZx,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hyzsCG,,bVnY,i,cZ,hmKv,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XtUOiy,,,i,Nc,IamB,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CyxgEE,jrPjI,bVnY,D,GF,mwY,l,hSw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MnDCxE,JRxbD,QMl,i,RI,juI,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dhfACY,,zZe,i,n,kzbx,i,Ri,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nAYWZz,HGnGo,OYMU,i,RI,y,fU,gKbc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TWrQrL,,xDLG,i,SC,WNP,lR,AsNQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aClxJI,,zZe,i,GF,YO,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lUHBDS,,xDLG,D,Kg,HSL,lR,qCw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wbnnTY,teKMc,EXYv,D,pk,oen,hk,LzYJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fHehAU,,,D,RV,aRnz,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DNwcAt,,yH,D,mO,pf,lR,KR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gntPsC,,iV,i,k,dYPI,hk,xvkX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OZztnR,aRalA,yhq,i,iL,hmKv,lR,aYOk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jlHuOI,,LDk,D,iL,,lR,mR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QcXqkf,JpSzL,rNcu,i,mR,pf,i,eag,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MywXzp,DzLhz,yhq,D,iL,gOZx,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IfYbid,ZvmNi,LDk,i,iL,eHh,lR,joSt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IfYbid,,LjAS,i,iL,eHh,hk,Qhv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ADvFda,uYWpN,VsKz,i,sa,Rfp,i,UVN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Daiwzr,,,i,RC,hmKv,hk,LVfYP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kGUgGZ,ZZWll,EXYv,D,RI,SC,lR,PQFio,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uquPzm,,LDk,i,iL,YO,hk,LvXKe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kGfcdG,DzLhz,iV,i,Kg,gOZx,hk,nnFz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DKwWLL,KowCL,zZe,i,ZJA,ev,i,hI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lLDZHL,,gpyD,i,os,dYPI,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oSrLmG,ePyBk,CqC,U,Bu,db,lR,ZBq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xtzgol,,mNh,U,Cme,TBUv,l,Ot,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZhnTIi,,,i,SC,XOk,hk,Kgh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YeeBSQ,gwGKb,gpyD,i,YO,nT,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yGZwDP,hAjyU,bVnY,i,RC,pPN,hk,CjDs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sOwsmU,,opm,i,YO,dYPI,lR,cfU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kjsxnB,,,i,mR,LKKI,i,sD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HjtAPO,JpFxP,yhq,D,bf,VwET,lR,n,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OBEUlz,lHjLY,yhq,i,xk,SC,lR,HTYH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LluJDF,,jb,i,THd,,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AnzJDa,,zZe,U,FL,LVh,hk,qtR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yqiiUV,YWcGE,xDLG,D,ZW,YjrO,lR,vGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FBnXQw,teKMc,ZQa,i,H,HSL,lR,tOgML,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yOccXx,,anf,D,Kg,RV,hk,vJwx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nHXOYV,,yH,i,zj,Kg,hk,zNby,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KzsmeM,TttFj,yhq,U,H,pf,hk,wVTH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gjKANu,sTwxB,rNcu,i,G,zz,L,iL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YukWnU,,bVnY,i,bf,mEr,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RovfPm,,CqC,i,n,hmKv,lR,vWIM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iBIzfA,,LjAS,D,sD,YO,hk,KWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oryEvz,DnTGD,OYMU,i,n,YO,i,xk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RFGEEj,ZTmRc,bVnY,i,n,ZNN,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iZfhLw,,aN,i,GF,hmKv,i,Kbu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mPgXDW,,iV,i,OmE,RSST,lR,Ld,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uQhplg,,LjAS,D,NHX,pf,hk,Pj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZegEXL,,QMl,i,TFX,sp,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NiTqbD,lUfTH,EXYv,D,sD,na,hk,prhOO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LgFpio,ERiHU,rNcu,D,RC,xa,lR,PJm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iqVCa,sksHQ,bVnY,D,GF,RxF,hk,Yx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CMVwZ,,mNh,i,uP,jHBL,hk,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AnZiV,,VsKz,D,SC,qVs,lR,Mdru,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FJgvK,,ez,D,uP,XOk,hk,zafuF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jtKAp,CfjhB,VsKz,D,YO,IamB,hk,xOX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WVShL,GAsNk,bVnY,D,RC,SC,lR,KvKP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qnxbn,,jb,D,RI,,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OtbkE,CiZAV,ez,D,RI,Cj,i,jgJy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WrWPj,,VsKz,i,kWZ,SC,hk,xBST,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KXjyx,bWJlU,gpyD,i,mO,ev,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ktOUj,,VsKz,i,n,TAUy,l,QqDq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qAlXt,,jb,i,s,gOZx,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AjfET,,anf,D,kWZ,pf,hk,vFla,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eqBxg,,bVnY,i,RI,dYPI,lR,OmE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,klopT,loInS,,D,GF,,i,BQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KvTFM,,ez,D,Ep,Cj,l,bCy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MzkxQ,,Pcb,D,u,Mcs,hk,Dnq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AvNTD,,bVnY,D,RI,dYPI,l,Ckh,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bZKqm,,,i,kWZ,pf,fU,Om,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iRKTh,nkrFs,EXYv,U,k,iga,lR,XqdO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zeqYT,SbOoU,iV,i,LL,xa,i,Gf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PPEjB,MOwcE,CqC,i,G,Zsbp,hk,exHh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mAFQY,vfKUn,LDk,i,iL,Vja,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qSbwN,,LDk,i,G,WNP,lR,DZYX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,acMky,,bVnY,i,RI,SC,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yiToW,fxErQ,LjAS,i,n,hmKv,hk,OBQj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kiaLy,,zZe,i,kWZ,khbX,hk,bvX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kIDTT,,LDk,D,aW,bf,lR,WPtI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oQbYP,,KsKZ,U,kB,RSST,l,fX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FzeXA,zAxYg,bVnY,i,GF,kgW,lR,yf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,roLuH,vtYeB,Vj,i,GF,y,lR,rvHa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uFHaH,OCsfh,EXYv,i,bf,pPN,l,aiR,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tfJkU,VONBE,bVnY,i,GF,nT,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YBhVZ,,iV,i,Lz,vrEy,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fPLUl,,CqC,i,KR,nT,hk,lwWM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jeHFz,gCAcv,,i,RI,gI,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PzfQt,,iV,i,exS,PnY,lR,khJV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Zpzql,,zZe,i,xVO,hmKv,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wfvoD,,VsKz,i,zz,hmKv,hk,Rwj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oxNgk,nZVbd,zZe,i,nt,hmKv,i,Ri,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nfYtR,,ZQa,D,KR,VkB,lR,UKW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PUtlE,,EXYv,D,Ri,WnD,l,uuuk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yrJEQ,IsgfE,CqC,i,H,Vja,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WcUCo,aHyMy,Vj,i,ZJA,SC,hk,zKO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Yjqgv,,LDk,D,iL,Vvh,lR,hyz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gHEkf,WOouO,EXYv,i,aW,Bkt,lR,aiR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,prYGT,AXhVB,bVnY,i,eG,SC,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ylxnp,,zZe,D,sD,Cj,L,TUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GlQkL,,zZe,D,zW,pf,lR,MRv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MwVTQ,,VsKz,i,H,ber,hk,YiOG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vDfEp,qEcTl,LDk,D,iL,oka,hk,tENh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kWJHa,,zZe,i,k,gRTo,i,Ri,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tkrzv,DOjAq,,U,u,dYPI,i,cfgy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xTNVd,,KsKZ,i,zj,xa,hk,Ds,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yutZz,hpCAn,yhq,i,GF,YO,lR,TVqo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Elzbw,,QMl,i,RI,oKN,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AnRUi,,ez,i,nt,,l,bnhY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wxlFp,,Pcb,D,u,ev,hk,Dnq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WDJTi,,CqC,i,Lz,SC,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Oynye,,mNh,D,n,tCwq,i,yvfCP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eNDeB,CfjhB,zZe,i,iHi,TAUy,i,Ri,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AjrUu,gUDiL,EXYv,i,RC,y,fU,Asok,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DWHhZ,,KsKZ,D,GF,dYPI,hk,Pdz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gBBIK,,bVnY,i,fr,vtyj,lR,FSG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GsnKe,,iV,i,db,Zsbp,hk,EnE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XBtgv,,opm,i,SC,qNG,hk,Bdee,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pcPyj,,zZe,i,mR,kPj,i,EHI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XMfQN,umGoo,bVnY,D,xk,lQU,hk,XGUG,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YUxoW,rEMyu,LDk,D,Cj,Cj,hk,uQdD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,brlYR,,rNcu,i,RC,SC,lR,Pif,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sorUh,,gpyD,i,sp,,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qBXBn,,,i,RC,xa,i,RJS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aUMIO,piZyE,mNh,D,iL,aQj,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bzMUr,,iV,i,ZJA,bnz,hk,KzQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MPWup,,bVnY,i,G,HMXY,hk,rjTe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jVKWS,,gpyD,U,GF,MbYh,lR,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kKLgg,,LjAS,D,eG,kgW,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EnyMI,RqRZJ,VsKz,U,n,YO,lR,CsIc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wxvqY,,LDk,D,iL,Kuz,lR,mR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rlIdj,,LjAS,D,RI,zI,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BQMij,vdUHx,ez,i,RI,nT,lR,prlIH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XbmTP,sksHQ,iV,i,iL,Cj,hk,Xot,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,toAyq,,yhq,i,FL,KnZo,lR,n,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TVTNm,,CqC,i,Kg,y,lR,XgIpi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RnbvQ,,LDk,i,iL,oka,i,xbAzh,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JKiDp,jCPPl,LjAS,D,iL,pf,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GASSD,,CqC,D,nt,,hk,zj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XLsWU,aGAzh,VsKz,D,iL,,hk,QmzE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TRCqD,,aN,i,Zi,nHdH,lR,DNxmr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,znzVq,,LDk,i,iL,dYPI,lR,Wbj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jmowh,,bVnY,i,GF,DQc,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tnmdE,,LDk,U,iL,sWhI,i,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DpysR,,CqC,i,n,y,i,hLJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TFmoN,,CqC,i,Pek,ZHiH,i,rQgy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Yllcu,,CqC,i,Cj,Cj,hk,RoZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xUxTo,TDUrZ,iV,i,mO,IamB,hk,IOyt,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bPUpq,,iV,i,mR,Cj,lR,crNB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OLeyi,,CqC,i,Pek,,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bxRcd,,rNcu,i,u,pf,hk,EwUI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HPaAN,CDTkR,zZe,i,exS,HSL,lR,qwhs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qyZNK,,yH,D,Zi,QhZm,l,hVHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SwUdo,,,i,ev,Cj,oA,bpC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KxUne,,zZe,D,mR,Zsbp,i,jrJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BsaRJ,,bVnY,U,RI,tOJv,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JVtx,,,i,H,y,L,QwIV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kvKf,,Pcb,i,u,SC,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MMyl,,xDLG,D,iL,TGXq,lR,Oxt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xVBQ,,rNcu,i,Kg,aRnz,lR,OPUZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NOPq,,bVnY,i,n,gOZx,lR,COTzW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LOkA,,,i,u,Cj,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,brIB,,,i,mR,RSST,lR,hkf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hnRw,,iV,i,GF,iADy,lR,jdwz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hnRw,,iV,i,GF,,hk,DlDRI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nqzH,TYArW,ez,i,Cj,Cj,lR,MGSs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SLTN,PgcxI,,D,kWZ,kWZ,i,RJS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,srWJ,,,i,sa,hmKv,T,FKgPq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dNJD,,,D,k,WNP,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mnFl,,EXYv,D,FL,TAUy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BzMD,,yhq,i,RNB,rSZ,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OjyU,,iV,D,xk,XOk,hk,ai,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JlYu,mSoea,Gac,D,kWZ,sp,l,podG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hILk,,,D,xk,ShH,i,U,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RIpA,lHjLY,xDLG,D,k,SC,lR,kwK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wzPx,ndNIA,bVnY,i,Lq,zmB,hk,AWrv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mZhA,,KsKZ,i,RC,hmKv,l,klee,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ziHu,yLHLD,CqC,i,G,IamB,lR,trSd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RSZZ,,,i,FL,Kg,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TywV,,Vj,D,kB,hmKv,l,TGR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JSvx,dWsDb,Pcb,i,iL,Kuz,lR,IUGJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,asOI,,LjAS,D,iL,EuC,hk,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xqVf,,VsKz,i,G,Cj,lR,gvYD,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wCaz,GAsNk,Vj,i,Kuz,jF,hk,GYnb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CCsC,,ez,D,k,rbp,lR,xa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KINv,,iV,i,EY,SC,lR,FzMf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KwJe,,,i,sD,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XpMY,,xDLG,i,bf,,lR,oLI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nyJX,,aN,i,n,YO,lR,auP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WWUU,,zZe,i,kWZ,uECy,l,IKL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MRjo,,,D,THd,ZHiH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MaqZ,,ez,i,iL,etS,hk,bIJo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PcGs,,,i,n,VyBk,lR,tmM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RKRE,IBgxE,VsKz,D,RI,WNP,T,McJu,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cuyW,,,i,sa,xa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fnMx,,LjAS,i,xk,pPN,hk,aQj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aexy,KgLFo,bVnY,D,exS,OxU,lR,eHUMQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TVzw,JpXCs,LDk,i,iL,Wsd,i,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qAub,CiZAV,gpyD,D,OS,Cj,lR,TQk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pGfV,jHsOR,LjAS,i,Ri,Cj,hk,yC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gcWu,,yhq,i,FW,WNP,i,ZNr,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,grXI,,CqC,i,s,y,lR,igKU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JhXA,MlKuk,ez,i,GF,RV,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gYDT,,LjAS,D,vk,,hk,CRl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zaPH,CfjhB,mNh,U,iL,IamB,hk,EeJY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FFFL,,,i,GF,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TQWk,,Vj,i,KR,GES,fU,bTLn,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Wxvr,,mNh,U,os,sp,l,Ot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uzLA,tvXed,xDLG,i,bf,y,fU,JyH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qWPt,,KsKZ,U,mR,zz,i,aGXm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GriK,jrPjI,Gac,D,iL,gI,fU,mGUGe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fKUe,,ez,D,oLI,y,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lUTR,iHJUs,CqC,i,KR,nT,l,uoJX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CZmj,,CqC,U,FL,RSST,lR,Uw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SDWn,xZsRI,xDLG,i,Cj,gI,lR,nXNJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zwAt,ZKlRN,CqC,i,n,y,lR,Ep,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JYDW,EfCkA,gpyD,i,GF,gOZx,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fIUd,diapp,xDLG,i,iL,aRnz,hk,aPt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fIUd,,,i,iL,aRnz,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fwnR,UbirU,,i,GF,hhhl,lR,kJJm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,REoT,,LjAS,U,fr,,lR,Vexhu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jtnX,UwtNF,,i,ZJA,DgcM,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hHpR,,xDLG,U,Os,pf,lR,kNK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iXrH,tniSf,KsKZ,D,iL,jF,lR,WI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bKJT,,LjAS,D,iL,lQU,l,fsSz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BQHS,NGfnx,LjAS,D,Kg,HSL,lR,xXNF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BQHS,PhJda,bVnY,i,Kg,nT,lR,IXD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ckNQ,,VsKz,D,GF,qgNx,lR,HuhRm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KeOb,qytCC,xDLG,i,exS,y,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uZgF,,bVnY,i,RC,CAP,hk,sp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oedy,,EXYv,D,RI,dYPI,hk,TtEb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ckYj,DfECa,ez,D,ePq,YaU,hk,XSpX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jKAH,hYPxv,,i,ZW,YO,lR,gpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jKAH,,bVnY,D,ZW,YO,i,oaAJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fpTZ,QImNH,zZe,i,G,,i,lbOO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RlxT,,iV,i,zj,UpSB,lR,GOERD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BRAy,,zZe,i,sa,gOZx,lR,IeoJw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nxSV,,gpyD,i,Kg,bnz,lR,sQe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oNnp,cNLnu,bVnY,i,G,Cj,lR,Asc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hVHi,,zZe,i,zW,Oja,hk,GBb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DvEd,UriEN,,i,iL,Cj,oA,ZKX,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kAII,,mNh,i,Cme,Zsbp,hk,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dBTJ,XctNb,ez,D,RC,YO,hk,NHX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dBTJ,,rNcu,i,RC,Cj,lR,LNVN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dzlc,,CqC,i,RI,SC,lR,Ep,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YkKM,KukuJ,aN,D,G,YO,hk,STfV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CBXL,oxvWf,yH,D,mO,Ri,hk,ahaC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cqfS,,zZe,i,FMt,qEA,hk,szQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wiVe,,CqC,i,FL,Kg,hk,MkpI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YvmN,,xDLG,i,FL,Kg,hk,TfK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gMCg,,OYMU,i,xk,,i,OvBF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UKEO,WiUgl,gpyD,i,GF,xa,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rBGW,,CqC,i,y,YO,hk,aXhw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cMbg,,LjAS,D,SC,LHdO,hk,oh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Ohcv,fQNSn,opm,D,SC,YO,i,gXbuE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VLKL,,Vj,D,Ri,dYPI,hk,jbc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YBaO,hlcVp,gpyD,i,GF,Cj,lR,ILXi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XcWC,,CqC,i,GF,,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HtUT,,EXYv,i,Ri,Cj,l,SuaX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zIPm,,rNcu,D,Kg,,lR,jdmV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VZvl,,opm,i,OS,Cj,hk,QQZP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kBnd,zTnre,rNcu,i,GF,hmKv,i,PDBb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kBnd,Ssajj,CqC,i,GF,ev,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HvGN,MgsXH,opm,i,SC,HSL,lR,UVe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,svmH,yZyjK,xDLG,i,pf,Cj,l,xtA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NjWA,,Vj,U,ZKX,ev,lR,xlVs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bxXJ,FXoPg,iV,i,GF,YprL,hk,HWfB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JblB,,xDLG,i,OS,lQU,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EBxS,TZFeB,xDLG,i,Bu,HSL,lR,XQHV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,trSd,XmDvh,zZe,i,k,RV,hk,ejeV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ANxM,,LDk,i,iL,na,ri,NnFr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PZOo,,VsKz,D,xk,uGF,i,ntQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aZlc,,EXYv,i,G,hmKv,hk,lsC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fmsD,mmXdD,bVnY,D,THd,Om,hk,DqlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,turM,,zZe,D,OS,Cj,hk,UXK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mEAV,qSpYs,iV,i,KR,nT,hk,Cme,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wrpC,,,D,KR,nT,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JNSq,qZzCL,CqC,i,FL,RSST,hk,wKnu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QgCL,,Vj,i,IaL,Cj,l,hvW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xwMl,ujyjw,CqC,i,Cme,IamB,hk,u,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,THfE,,,i,RC,,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CiBe,VzUtA,iV,i,H,mwY,hk,iga,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Thpg,,iV,i,GF,,lR,BIg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BjwF,,CqC,i,OS,IouE,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xBST,,,i,gI,RV,oA,bpC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ezFf,,aN,i,GF,,hk,vML,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qyGN,,gpyD,U,GF,hmKv,lR,RZc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Oyzi,PbEdT,,i,GF,uECy,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Slwe,ZTmRc,Vj,i,H,sp,lR,Xkzcg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QhEp,,,D,RC,Cj,i,sD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AWgT,,,i,RC,Cj,lR,RyV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UVZb,,xDLG,i,OS,y,lR,vGJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lqnh,gUDiL,VsKz,i,GF,y,lR,NcAY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nGOx,DXeTv,CqC,i,GF,pf,lR,bvl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nGOx,,CqC,i,GF,SC,hk,zW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ouJI,,CqC,i,sa,VyBk,lR,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YJLM,,VsKz,i,G,Wsd,lR,sNikU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YJLM,,bVnY,i,G,ev,hk,ePq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,twkC,,KsKZ,i,FN,Cj,lR,vZye,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,twkC,,KsKZ,D,FN,SC,ri,Thtx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QCRl,eGUBA,,i,FN,YO,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fwdx,SZDsW,,D,RC,Cj,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fwdx,,,D,RC,Bkt,lR,cZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rEIi,,,i,RC,EbEv,fU,Om,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pChe,RvKFZ,CqC,i,G,VyBk,hk,qh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pChe,,aN,D,G,Zsbp,hk,XekG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eBab,UriEN,yhq,i,G,ev,lR,Wpow,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eBab,jfQnw,bVnY,i,G,,lR,QcRb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NsOx,vtYeB,,i,os,y,lR,qyGN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NuQz,YZLUv,EXYv,i,n,RV,i,lmR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,miwCS,Pcb,i,os,Cj,l,MpKt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHyG,ogMgS,rNcu,D,GF,Cj,l,QyCo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHyG,SklNG,gpyD,i,GF,gI,lR,IgEe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHyG,,CqC,i,GF,EogM,lR,lTMp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHyG,,,U,GF,,hk,iyf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qEey,gOZzt,bVnY,i,GF,y,i,Ppr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qEey,LdGeV,Vj,D,GF,y,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qEey,,CqC,i,GF,,hk,elM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,,iV,i,GF,YO,lR,kawG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,,jb,i,GF,gOZx,lR,iWk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,,,i,GF,Cj,hk,Kgh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dMyb,yQIhI,yhq,D,GF,Wsd,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,SWHer,,i,GF,Cj,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,HtSNA,,U,EF,jaP,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,QFiGV,,i,GF,OxU,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,gOXsw,KsKZ,i,FN,aZ,lR,oWS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CBYqn,QMl,D,xk,gI,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CKgVb,mNh,i,RI,nT,hk,rAOl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,vRwhI,,i,RC,gI,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,puepy,mNh,i,k,YO,l,zFIi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,pLYXJ,QMl,D,Ri,xa,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,pLYXJ,,i,Lq,Ouf,fU,Bu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,pcpoK,,D,Cj,Kg,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,UpZhy,rNcu,i,Kg,fX,lR,smlr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,GzVaO,,i,Nc,buw,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,UimzX,yH,i,RC,pPN,lR,WYmo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ponOy,xDLG,i,RC,pPN,lR,dQInP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CSXEU,,i,,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,hzafF,gpyD,i,Kdq,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,DnTGD,,i,Lq,ev,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,DmPDX,bVnY,i,nt,Ri,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,jHsOR,mNh,D,Ri,xa,i,Rk,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,vnUks,yH,i,mO,Cj,i,QVznc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,PkDWB,EXYv,D,fx,Cj,i,qy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,SZDsW,VsKz,i,Zi,Cj,hk,qiy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ouvnZ,CqC,i,nt,Cj,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZKlRN,,i,hSE,lQU,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,xBBpi,Gac,D,JI,Cj,lR,idb,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,cNLnu,Vj,i,ZJA,Cj,lR,AIjR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,SyFMb,opm,i,Uw,Cj,T,PHB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CuzTB,,D,mO,jF,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ONKJD,,D,G,gI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,naDwL,,D,Ri,mwY,L,jnnx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,UriEN,,i,kWZ,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,dtobc,,D,k,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,HGnGo,rNcu,i,zj,YO,hk,oen,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,FQqvL,,i,iL,Pe,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,VzUtA,,i,RC,SC,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,lHjLY,,i,RC,SC,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,aHyMy,QMl,i,oh,yH,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,UICXp,mNh,i,pm,Mcs,lR,kDgxu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,NLAAP,EXYv,D,Kdq,SC,lR,CRn,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ojeZB,rNcu,D,Kg,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oBwBc,,D,YO,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,yZyjK,,D,na,rSZ,hk,LfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ERiHU,iV,i,k,xa,lR,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,llHEg,LjAS,D,mR,rbp,hk,zhJP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,llHEg,QMl,i,hyz,rbp,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,HNLHQ,,i,FW,Vja,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,OWBqX,,i,zlG,YO,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,urAgA,,i,iHi,gI,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,AyuIo,,D,RC,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,yCTcT,VsKz,D,SC,EogM,lR,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,SmWKf,yhq,D,GF,Yxhj,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,otbME,QMl,D,qh,,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,soKhL,QMl,D,IaL,dYPI,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,nBZoA,,i,GF,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,gFPOL,mNh,i,hSE,dYPI,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,mLfWE,CqC,i,GF,Tmcy,lR,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,rHwUv,,i,GF,edWw,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,FJteQ,,U,SC,Zsbp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,KWvNC,,D,iL,Zsbp,hk,mO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qZzCL,QMl,D,ZJA,hmKv,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qZzCL,LDk,D,aW,Zsbp,lR,rXD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qZzCL,mNh,D,JnB,hmKv,i,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qZzCL,,i,Ri,hmKv,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,cEpGn,,i,OS,Zsbp,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oWoZd,gpyD,i,qy,zNvM,lR,QAxhP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oRdwp,gpyD,D,GF,tCwq,lR,gxbCc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,KyEGN,Vj,D,THd,hmKv,hk,xlVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qvyUv,,i,sD,tCwq,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,GqeZx,,D,Lz,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CfjhB,gpyD,D,FN,IamB,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CfjhB,yhq,i,Zi,IamB,lR,n,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,loceY,,i,nt,KnZo,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,YMYMT,xDLG,D,BAR,fnMx,lR,exS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,i,FL,Lmvq,hk,MBhk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,i,FL,pMmL,hk,YCwg,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,D,iHi,fNfp,lR,hKxo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,D,sp,xa,i,eQuT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,U,exS,NuYc,hk,Qgjx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,U,hyz,hfB,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,U,Yx,Cj,fU,pqp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,FL,LKKI,lR,HsMH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,FN,dYPI,lR,sguT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,xk,ev,i,XXFK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,H,bfM,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,D,cZ,pBlc,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,OYMU,i,ZW,YO,i,viK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,OYMU,D,jgn,na,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,Lq,Ri,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,zj,sp,fU,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,Ri,Ktd,hk,Cwi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,Yx,hmKv,lR,JDK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,D,Ri,IamB,lR,RyV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,aW,Cj,l,FQLy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,Zi,rbp,hk,tCo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,Zi,WNP,i,WmWx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,D,kWZ,Bkt,l,aWw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,D,RC,RSST,lR,pFH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,D,RC,hmKv,hk,BWIm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,D,RC,pBlc,lR,bHWX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,i,GF,,lR,JnB,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,i,n,aRnz,lR,UsS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,U,JI,gOZx,lR,waT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,sp,cmmA,hk,IVql,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,qy,,hk,oh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,SC,xa,hk,JDEJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,qh,y,hk,muW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,RI,GxNZ,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,mR,uWTD,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,Zi,RSST,hk,CRl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,mO,ZHiH,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,i,FMt,IamB,hk,YKaB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,i,zj,WNP,hk,zI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,i,n,WOsU,hk,kzU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,D,RC,dYPI,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,RI,WLA,l,CcTC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,aW,ZBq,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,Lz,iPIT,i,XYGr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,Zi,ciA,lR,OxU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,D,Zi,KCWa,hk,wlp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,TFX,iGu,l,uP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,FMt,sp,i,LvN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,dQD,,hk,CcqFY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,dQD,,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,THd,IamB,lR,jTaZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,BAR,woE,hk,jRBu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,BAR,,i,vbC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,ev,gOZx,i,hlrt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,mR,pf,l,PsKYq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,KR,cRzS,hk,QdZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,yC,buw,hk,lmAx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,xk,hmKv,fU,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,xk,qVs,l,Yokz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,D,Zi,,hk,HaU,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,anf,i,Uw,ev,i,XqjYB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,U,JI,tZSB,hk,INNAW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,RyV,HSL,hk,SjdL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,RyV,xa,hk,aJem,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,hyz,,lR,JNSq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,JI,,lR,avLv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,hyz,HMXY,T,gpLj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,hyz,VIM,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,PF,LKKI,lR,Rse,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,aPt,hk,LrJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,Bkt,hk,cVwD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,Cj,hk,dFGI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,JI,Cj,hk,LrJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,nmp,hmKv,lR,rgnl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,FN,YO,lR,MAI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,u,pgG,lR,ino,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,U,mO,SC,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,TUw,hmKv,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,zlG,Mgil,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,kdc,YO,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,GF,,T,H,8257798663846186539
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,kB,KMAv,T,NqKL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,LL,Kg,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,oh,gI,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,uP,IJq,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,RI,Os,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,yH,Tmcy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,yH,Rk,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Zi,gI,T,H,1048718684474966157
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Zi,SC,T,H,5327653760319593481
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,mO,kB,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,zj,YO,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,sp,dYPI,T,GxE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,sp,,T,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,xk,gGz,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,xk,RV,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,sa,ZNN,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,hyz,gmi,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,RV,bfM,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,Om,KnZo,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,yC,zz,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,qh,xa,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,u,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,n,bf,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,U,jgn,hhhl,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,jgn,xa,hk,eFx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,TGR,KCWa,lR,kzU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,GF,Cj,hk,qh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,GF,gI,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,GF,,lR,bvl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,sD,RV,lR,ss,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,Zi,RV,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,s,aRnz,hk,ulS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,i,aW,Zsbp,l,sSgI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,i,iL,oen,i,wCwL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,D,aW,PF,lR,rdMe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,D,aW,,lR,ICSt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,U,oMY,Wsd,hk,zVT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,Kdq,Alg,lR,KsXL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,FW,Zvq,lR,Nvt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,ai,hmKv,oA,wGj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,D,hI,,lR,JgAft,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,D,os,uGF,i,cQoj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,U,oen,Zsbp,L,Pe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,U,JnB,dYPI,i,TmvN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,U,JnB,fX,i,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,U,Yx,gI,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,oen,gOZx,i,THd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,JnB,dYPI,hk,vNY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,hSE,mwY,T,rEy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,hSE,,l,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,pm,xxmj,hk,BQr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,pm,cRzS,lR,Ybk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,GF,gOZx,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,oh,KCWa,hk,qTkQk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,oen,Mhu,hk,sSgvJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,pqp,Pmiv,hk,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,pm,Ri,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,Ri,KnZo,hk,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,U,mO,hmKv,lR,KR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,Kuz,DME,i,MaC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,D,mO,pf,lR,qeOb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,aN,i,FL,KnZo,lR,YMYMT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,aN,i,n,XOk,hk,RKH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,U,Kg,KnZo,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,Ri,Zsbp,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,Ri,zI,hk,hNmN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,D,BAR,rSZ,hk,zYm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,U,O,,hk,FMW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,FMt,rSZ,i,Gf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,GF,uWTD,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,GF,RSST,lR,NFu,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,Kg,,lR,POYoQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,n,TAUy,lR,sGP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,n,bfM,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,H,ify,hk,Lz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Vj,i,hyz,qyCG,lR,dCv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Vj,i,hyz,ZDQc,i,ekbX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Vj,i,TGR,pf,lR,kNMr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,jb,U,zz,ev,fU,PvS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,jb,i,sp,xa,hk,etS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,KWZ,TAnX,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,ZKX,Cj,,,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,Cme,hmKv,L,G,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,Cme,sp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,GF,Mgil,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,aW,hmKv,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,NHX,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,zlG,iGnp,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,TFX,IUE,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,oen,DUHG,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,exS,jaP,L,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,OmE,RSST,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Kuz,gI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,cfU,qyCG,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,hyz,ZHiH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,hyz,,oA,bpC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,WLK,laAR,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Cme,KCWa,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,wGj,RV,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,kdc,yH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,TGR,nT,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,kWZ,lQU,fU,Om,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,pm,rZXX,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,FvO,L,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,gJq,,,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,kB,TAUy,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,FW,ysh,l,jjcR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,LL,zI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,cZ,Cj,hk,dJnAJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,bf,ber,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RI,gGz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RI,RV,,,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mR,Kut,hk,AGz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,aW,edWw,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,iL,rbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,yH,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,gI,GWD,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sD,gOZx,l,s,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,xa,wlp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,DSA,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,uGF,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,sp,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,FN,YO,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mO,ber,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mO,pqp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,iADy,l,ODQP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,eQE,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,qVs,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Kg,pPN,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Kg,RV,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,oh,KCWa,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,yC,Lmvq,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,eG,gmi,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ri,Om,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,xk,bfM,hk,WLK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,xk,Cj,,,5918422169101743516
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sa,gI,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sa,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,fr,uECy,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,PF,TAUy,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,os,gI,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,os,SC,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,u,MpP,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,n,QHHB,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,,iGnp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,,bnz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,KWZ,,oA,ZKX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,exS,yH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,pqp,Pmiv,oA,bpC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,ZKX,uWTD,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,BfM,euzb,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,THd,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,JnB,Mgil,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,JnB,YO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,TGR,Mgil,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,kWZ,zlG,hk,mO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,pm,Rfp,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,pf,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,GF,Kg,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,kB,gOZx,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RV,JVF,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RI,qyCG,L,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RI,TGXq,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,mR,eQE,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,ai,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,FL,,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Lq,uECy,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,pk,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sD,dYPI,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sD,YO,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,mO,IamB,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,EY,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Ri,ZUA,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Ri,sp,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,xk,Wsd,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Yx,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Yx,SC,,,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,fx,WNP,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,SC,TGXq,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,SC,mwY,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,JI,XLQ,hk,Dq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,JI,lQU,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,ZW,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,os,ify,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,os,zz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,qh,Ri,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,G,hyz,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,s,Zvq,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,,hmKv,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,THd,ev,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZPkSAGL,tuGlk,,i,FN,gI,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,DRDtuLT,cPETG,bVnY,i,FN,KCWa,lR,Yvv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,KmsDpan,llHEg,KsKZ,i,Zi,rbp,l,fX,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EbDvcLj,ZSNHC,zZe,i,zW,zI,fU,RUGgg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,Ibhxwwb,eKOcq,xDLG,D,aW,Cj,L,GLvL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,pXxJFgY,nkrFs,bVnY,U,cZ,buw,hk,RpZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,thqpnNY,eCWoC,KsKZ,i,G,tCwq,lR,lBY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,lTNCexY,CfjhB,QMl,i,qh,IamB,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cazafwJ,Ujcdv,gpyD,i,Kg,YO,L,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,VpMVvhe,mONwL,EXYv,i,sp,NFu,hk,zInu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,hOUEAiR,uYWpN,Vj,i,GF,Dnq,lR,iftK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,PriVHeV,,,D,pm,oka,oA,bpC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,oZBlZGo,fFPdL,mNh,i,ai,Vvh,hk,sQZg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ikqaZXU,ckaGK,bVnY,i,RI,HSL,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,oYuwrNK,YIXfM,,i,u,y,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,IXYSPZi,yyelp,LDk,D,GF,ev,lR,MTE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,WvdcALf,UqBew,,i,G,jBP,lR,QIe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,iyYKgXz,KOJjz,KsKZ,i,FN,hmKv,T,XuAI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,DyfddY,,bVnY,i,zz,ahaC,fU,zYPf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EhcaxD,TDUrZ,Gac,i,bf,IamB,lR,myVif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,WUhVce,EpSLs,LDk,i,aW,,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,HojXAt,rGzDb,LDk,i,kWZ,YO,lR,CUp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,DebWzX,,gpyD,i,iHi,gOZx,lR,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,GISoPs,OVwsU,QMl,i,os,nT,T,nT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,MmssXy,cPETG,ez,i,bf,Cj,l,UVZb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,pqePob,pziuA,,i,u,GES,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,UHIgUB,Pwwsw,aN,i,Zi,dYPI,i,Hzi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EBYbYB,pziuA,gpyD,i,os,yH,lR,vhPI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,kHQVbi,GogaQ,Vj,i,SC,aRnz,lR,Rtor,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SIQeyv,jCPPl,EXYv,i,RI,jF,T,WNP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,uOzjNp,zsRkh,iV,i,iL,Mhu,hk,iga,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,RrhnHm,,bVnY,i,Kg,ev,i,nU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wIWELi,diapp,CqC,i,H,y,i,ghlK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,xAHWon,zlxbS,,i,GF,ITBX,lR,HwD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,HYlukQ,VAVml,bVnY,i,xa,yC,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,AgFGs,uLFqs,CqC,i,GF,sp,i,WMz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,QrCdX,ZVMFT,,i,os,YO,L,DoN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ieVGj,zAnrp,EXYv,D,iL,Cj,l,QmQF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,nfYtR,hlcVp,,i,KR,Cj,T,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,TyvjQ,uCfJW,LDk,i,GF,sD,i,ujwQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wxlFp,iLTFH,,i,u,ev,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,NcHYh,MZzvk,,i,Kdq,sp,fU,CIDQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,qkzij,,mNh,U,pqp,bqP,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rSeGz,Xzozi,Vj,i,KR,Bkt,hk,LFq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,RlGDt,MWxHT,jb,i,mO,Xua,l,RrjP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dzvnT,,LjAS,i,mR,pf,lR,EzxW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,YqFjj,LKLHu,LDk,i,iL,nT,i,wCwL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,sCedP,qvyUv,LDk,D,iL,PQBq,i,zz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FFBeU,jrPjI,ez,i,RI,,lR,iKG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,WNfZd,,LDk,i,aW,bf,hk,gGhrj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,KTQBm,ZIelK,LDk,i,iL,zI,i,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ACstO,FmJTH,LDk,i,iL,ZBq,lR,mR,8329910147078832936
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,yJtIs,,CqC,i,y,Wsd,hk,qh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SxWlW,xZsRI,,D,hyz,gI,lR,Nc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,VCIri,hpCAn,xDLG,i,O,RSST,lR,JRYN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,uVPE,CqNhk,mNh,D,iL,Cj,lR,KGxT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FsZw,,yH,i,Kuz,Vja,hk,PMH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,NYlX,InZpO,yH,i,mO,HSL,i,rHKt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,hvsh,rrdcH,VsKz,i,BfM,Bkt,hk,BfM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dSlH,gqTIk,CqC,i,GF,sp,lR,HCh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZzET,cdmXU,LDk,D,iL,zI,hk,cZfRU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dLTd,xwDjL,aN,i,O,y,i,pcpoK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,OYek,HKFIL,iV,i,RC,Ri,lR,raHEo,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,XvKn,CQsJP,CqC,i,ePq,y,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,QIcn,KOJjz,CqC,i,G,YO,lR,Alw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ngDy,zktNk,bVnY,i,cZ,y,l,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dEiZ,,rNcu,D,Pj,pBlc,l,CXbsb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,vqcM,hoyPK,ZQa,i,G,IamB,lR,aDA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SeNa,lFmPR,anf,i,GF,mwY,lR,ltsZm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,RoZA,qygIq,Vj,i,yC,gI,l,TGR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mKJM,vdUHx,yhq,i,GF,mEr,i,eG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mEAV,hQGku,EXYv,i,KR,y,hk,qsCg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,xBST,pLYXJ,OYMU,i,gI,Bkt,i,pSTbg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,WwAX,hlcVp,CqC,i,H,ev,hk,zW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ouJI,gLpCC,CqC,i,sa,zI,hk,kezc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,qEey,,bVnY,i,GF,Qhv,hk,Ooaq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cflD,vdUHx,CqC,U,GF,Wsd,hk,kNbM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cflD,HXSgR,zZe,i,GF,y,i,zeDvD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cflD,,bVnY,i,GF,KMAv,lR,jwcL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pjwEv,,i,sa,ESA,fU,Bu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,KaYAY,opm,D,SC,SC,lR,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,VKwcO,jb,i,RC,DcjM,lR,ESA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,NMwlg,QMl,i,oen,hmKv,T,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,mNgaz,QMl,i,nT,gI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,rRbDE,LDk,i,KR,hmKv,hk,hpph,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,AcOfv,,i,ZUA,XLQ,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,DXeTv,,i,FW,Njo,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,mZcIF,QMl,i,bf,HSL,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pLYXJ,rNcu,i,GF,soR,fU,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,uLFqs,,i,Zi,ZNN,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zpINo,QMl,i,FN,bhM,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,yQUjD,QMl,i,FN,aQj,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,HqZYe,,i,sa,Cj,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zLfaS,,i,OS,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,DmPDX,ez,D,TGR,iga,lR,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,oxvWf,,i,nt,JxA,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,bVPgN,,i,k,Cj,T,mEr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,lGmoe,QMl,D,FN,NdS,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,bwXei,QMl,i,vk,ev,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,hlcVp,,i,os,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,izZbI,,D,iL,Wsd,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,KoskF,QMl,i,sD,gOZx,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,QUpDF,,D,xk,GES,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,wLpmB,QMl,i,JnB,y,T,UVZb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YjQpG,QMl,D,kWZ,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pNMtG,,D,IaL,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YhbKG,,D,pm,ulS,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pziuA,ez,i,BAR,WMz,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pziuA,,i,Cj,lVH,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zMiPC,LDk,D,aW,SC,hk,OS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,Vwcvz,yH,i,SC,nT,hk,YkPl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,Adwwv,,i,RC,mwY,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,TDeGS,yH,i,Kg,wlp,hk,tEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,RUGgg,QMl,i,bf,xaH,T,THd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,XctNb,,i,RC,ev,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qgHRF,KsKZ,D,pm,xa,i,CbOE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,xZsRI,,i,hyz,kWZ,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,wKezk,KsKZ,D,Zi,hmKv,hk,IcT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,wcZUq,,i,xk,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,JWQHp,,i,OS,dbdK,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,soKhL,zZe,i,k,UPkh,L,ZyJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,DzgFa,ez,i,TGR,qyCG,L,HCNJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,DzLhz,,i,Lz,gOZx,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,POrHL,,i,GF,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,VsKz,i,Zi,hmKv,i,hSE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,yhq,i,Pe,auP,l,CcTC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,xVO,uECy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,KR,MpP,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,Zi,vtyj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,D,hyz,WOsU,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,D,RV,hmKv,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,ez,D,BAR,pgd,lR,epE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,iV,i,SC,uWTD,hk,iga,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,jb,i,GF,gRTo,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,hSE,Tmcy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,kWZ,SC,fU,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,GF,bfM,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,oh,xa,lR,Nc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,KR,LL,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,Kg,EPcs,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,eG,iADy,lR,uid,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,D,Zi,ev,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DdDPZeK,qvkFl,ez,D,BAR,Pmiv,lR,XSpX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qnqMtuw,StZeV,,i,k,OxU,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SycslNE,tZmRz,zZe,D,RI,gI,i,vpvt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rBPRzVF,LOtcu,QMl,i,GF,rSZ,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TebShJG,teKMc,,i,G,HSL,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cvfndKw,aqDbd,QMl,i,ZJA,y,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bUxEIZF,rBXlN,CqC,i,Lz,wCsQ,lR,ilW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KnMBmni,LQsok,,i,vk,jF,l,FvO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VugxhCE,pOcRm,mNh,i,JnB,YO,T,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TgPQfzZ,LJytA,,U,GF,pf,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gYxyvAB,VzUtA,yH,i,Kg,SC,T,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JfnwrAP,GeAiI,CqC,i,os,kgW,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rIjWNjW,lLQxd,QMl,i,GF,Mcs,T,nT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,brQdDZo,RUGgg,,D,pf,WLA,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ayaeBwd,,OYMU,i,pk,ZHiH,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DZBAgjS,uYuuM,yhq,i,sD,Kg,i,Gf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TNdgQfz,UcrWb,EXYv,i,OS,hmKv,l,ViwE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sHyFlvb,,gpyD,i,G,LKKI,lR,ngDy,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JGENWAQ,,,D,RI,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZeQRdAe,,mNh,i,RI,VyBk,hk,ygXdp,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wjIMNmU,doIEg,mNh,i,iga,uGF,lR,zjtN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pogtbkJ,uYWpN,ez,i,ZKX,ev,L,tEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UoIHrhT,,gpyD,i,qh,GxNZ,lR,sHE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rQamHWa,,gpyD,i,jgn,dbdK,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dFedHGD,KyEGN,mNh,i,Yx,IamB,hk,SnzDi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fTpTVXu,iMVgZ,CqC,i,H,dYq,hk,NeG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,auhtIsd,oJhqB,Pcb,i,u,Qhv,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pHkjNgR,XSIPJ,opm,D,aZ,HSL,hk,PIvr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eQumwzd,awxMP,,D,k,HSL,lR,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iyvcPLp,CgiNm,LjAS,D,kWZ,gI,l,auii,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BqjfYjX,EPcAB,CqC,D,vk,Cj,l,CbZvA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ytpzbpo,wwFAY,zZe,i,NHX,,fU,ZFX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Ghopdzx,rmSkc,,D,Yx,Cj,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uBXfAzu,VxHVF,rNcu,i,Nc,nT,i,uqJQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PAslDnB,ZKlRN,mNh,D,Ep,Cj,hk,frg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IDKdoya,nDsLz,,i,ZW,y,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FwnyLis,YkAvm,QMl,i,Kg,cbZ,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WYbqFtb,yFAAH,CqC,i,kB,qyCG,lR,ufVD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XJgtyFV,nHVgM,,i,sp,Kg,fU,Bu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VLEAZbw,pxtqQ,bVnY,i,Zi,qsr,i,SC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hYAzoPX,yQenm,,D,aW,hmKv,i,nj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MskZOwB,,CqC,i,ZW,YO,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hEaJYIg,vAuYo,,i,Ld,,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yuKPRgh,,rNcu,U,Kdq,ZHiH,l,UhL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qfzBDNh,BWYOS,bVnY,i,FL,cmmA,i,SC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Hdnuzya,NTvmH,VsKz,i,sp,hmKv,hk,gnq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HxXmNxF,ZZrqs,yH,i,mO,buw,l,JNncB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AMCPkLh,NLAAP,VsKz,D,GF,SC,i,hSE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OLrNzwf,zbaAA,QMl,i,vk,wlp,L,vk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AAHxUMx,ojeZB,,i,Kuz,yC,fU,oMY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,acGeUuK,eqDYz,,i,oh,gOZx,lR,bGfD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pYraCGS,CnXtt,Gac,i,kWZ,oKN,hk,TDwVL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hoNaSZZ,koaVY,zZe,i,mO,pf,L,ZyJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HBYpXEL,UpZhy,rNcu,i,KR,Kg,fU,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PqAnGdZ,VzUtA,CqC,i,kB,SC,hk,jhw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KgsVceN,jrfmw,xDLG,i,mR,aRnz,hk,nZS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NUdQvNx,SVLxE,QMl,i,Zi,dYPI,fU,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kDAhIbu,ncTpP,EXYv,D,SC,zlG,l,nhfI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,abRekzi,jxlBy,EXYv,D,xk,SC,l,eQE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,weeJBsJ,HNhMr,CqC,i,GF,hmKv,lR,mlk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AxeqLJo,TzJAt,,D,u,Mgil,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cTDNNZa,wbvJL,CqC,U,GF,,lR,hpph,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eVRpAAD,soKhL,EXYv,i,Ri,sWhI,l,xcNI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LmowGWb,hoyPK,aN,D,n,zNvM,lR,rZf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kLooKtw,uVdCT,KsKZ,D,RI,qyCG,l,pTII,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UfDYzUU,umGoo,Gac,i,BAR,ev,lR,ATIx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JMGHexI,rXnhf,zZe,D,hyz,gI,fU,jFI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cgSdaRo,HCLtA,LDk,i,eG,Cj,lR,LRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TRQwmuj,NLAAP,iV,i,kWZ,SC,l,UVe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hUPRGzp,WJNmg,opm,i,iL,aRnz,l,inHT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CeCKlpJ,aHyMy,yhq,i,G,SC,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tTLHKjo,CiZAV,QMl,i,oLI,LfH,T,nT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HVUqJeJ,FPgQL,rNcu,i,zj,xk,fU,EGVC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VaYnhMV,icFCk,bVnY,i,vk,xdc,lR,xAF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,avZAKPE,hymXz,QMl,i,MTE,yC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QSNDOCp,,Vj,i,kWZ,RSST,T,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qobFeLc,GwJNJ,bVnY,i,RI,kWZ,fU,yCXw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kIduDJB,zYNao,CqC,U,Bu,yC,lR,fpip,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,URedhYv,GuqeH,QMl,i,RC,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RmXwVQq,pzLPd,CqC,i,GF,uECy,lR,ss,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MiMAHRG,,VsKz,i,uP,sp,hk,SIzG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DiUxjLd,DmPDX,zZe,i,zlG,Ri,hk,fuV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bhPTLsp,,QMl,i,oen,WNP,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PpwCqm,jHsOR,Vj,i,GF,Cj,lR,FtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VGBWWZ,,QMl,i,G,vtyj,fU,nT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SJUtFG,mwMxp,xDLG,i,xa,Rfp,l,loG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,reVJAs,DzgFa,xDLG,i,GF,qyCG,lR,jF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,poZwjp,KeFQu,ez,D,vk,lQU,l,rOw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NMNCCo,,VsKz,U,RV,Wsd,l,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EIOdxv,xoCGL,gpyD,D,vk,HSL,lR,PUk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oCysSG,qZzCL,,i,u,hmKv,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CWwkVq,Dwamc,EXYv,D,RI,ShH,lR,cKsUu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QUxwiV,wupua,EXYv,i,sa,rSZ,i,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LEyjsN,,QMl,i,bf,,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wngLGR,VTbsV,QMl,i,qh,YO,T,PnY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FQSawo,nHVgM,CqC,i,sD,Bkt,lR,ots,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XHLbKL,kyLsL,rNcu,i,SC,hmKv,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iatJLG,yUWuX,ez,i,Ri,dYPI,lR,epE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uCJwbO,hQOsJ,ez,U,kdc,,fU,LEfi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hJwvvO,,,i,IaL,,lR,yuFX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DsNqXv,LnlmR,QMl,i,GF,Cj,T,O,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QUqLaU,GwSmH,jb,i,SC,UpSB,fU,ccO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ORqkeX,oJXSu,yhq,i,H,FXZ,l,HwK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mCSCgq,,iV,i,Lz,fX,i,Gf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zUskJH,rEMyu,iV,i,n,RV,lR,Myl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SKwanR,ZIelK,QMl,i,hSE,nT,T,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NfPkAi,DWRev,,i,ZJA,juI,T,mEr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zPvlMS,hqpMg,rNcu,i,ZJA,XOk,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cITKww,VGYoQ,opm,D,hyz,Cj,l,WUcte,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,snlcwi,vdUHx,rNcu,i,Kuz,XLQ,fU,iL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hwcVqN,IaFdH,xDLG,D,pqp,Pmiv,lR,lXdD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oxdNNX,DXeTv,rNcu,i,Zi,bvX,lR,Oeeg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NREkim,MiuKF,zZe,i,KR,hmKv,lR,WKX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GsAoLc,efoXf,zZe,i,THd,y,lR,TEaG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IeNJsH,,ez,i,nt,xa,l,JGvgc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mecpAG,ILLOJ,yhq,i,THd,DcjM,lR,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WxXRYI,sGrXl,,i,RC,tCwq,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PkCopN,,yhq,i,Zi,WRvL,lR,ZHst,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YyQddy,DXeTv,QMl,D,sD,pf,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zCimts,JFMRC,yhq,i,Zi,hvW,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lFzbiO,InZpO,yhq,i,kWZ,Wsd,l,HwK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GKHSYy,KOImY,QMl,i,Kdq,Cj,T,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IQYgFH,yQnHf,VsKz,i,n,WcDS,lR,fDJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rCQNsN,qZkcz,xDLG,i,oh,uECy,lR,VyUz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XStfLU,Pexdg,CqC,i,Zi,hmKv,hk,EeEaU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IyXCQj,,bVnY,i,WLK,gOZx,lR,RNB,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BvxOZa,jHsOR,EXYv,i,kB,WNP,lR,Fpo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sFuKHz,,bVnY,i,qy,Alg,hk,sp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aYzcyW,SefEe,KsKZ,i,sD,zNvM,lR,Mlblj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cgsMzg,lHjLY,bVnY,D,RC,SC,hk,PfBh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IxVWnD,HLYZq,,i,u,Pmiv,T,fx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jLkGIt,XXwCA,gpyD,i,RC,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jLkGIt,Gjomx,,D,RC,dYPI,fU,Om,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wpkEFT,aEQZY,,i,os,HMXY,lR,vNu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WQCxMb,KyEGN,EXYv,i,ZKX,hmKv,l,bpAT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JlfNYB,,VsKz,i,FL,EWTi,lR,Lq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hsvDdz,unoLA,ez,D,Os,gOZx,lR,EedFn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LVqypW,,iV,i,xa,VwET,i,Gf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kVeDjH,AMEDi,iV,i,SC,Cj,l,UVe,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GqXdit,rRbDE,EXYv,i,nt,hmKv,l,IMzf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XOAVJW,ZSNHC,EXYv,i,kWZ,zI,l,yH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FhZABk,ZnMDV,yH,i,mO,bf,fU,Ljdi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nVTHZk,axTLC,iV,i,n,pf,i,xKSj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ApYZNe,XmDvh,ez,U,iL,RV,lR,CUp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XJGVIU,vdUHx,,i,n,pf,L,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EvzBra,CcpoJ,,D,SC,uWTD,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nwTIUR,PhJda,EXYv,i,xk,nT,l,IhAX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuhUlz,fyozH,QMl,i,ZKX,iGu,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SpPElD,kfBab,Pcb,i,OS,gOZx,lR,fFKEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ftAZoS,rHwUv,ez,D,os,edWw,lR,odpy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nTbGvE,xZsRI,CqC,i,SC,kWZ,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tLbeak,,iV,i,SC,,lR,ZRkm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pogUom,vAuYo,yhq,i,EF,,l,hXG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MEnVkg,NvjuA,gpyD,D,Om,aElE,lR,XEY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nTTDhI,YEATg,ZQa,i,mR,OpTS,i,EmlTM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dVEYNr,opZrF,bVnY,i,GF,TAUy,lR,jwcL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nBdhWS,wKKEM,rNcu,i,KWZ,YO,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RHmtIh,RdvaT,,U,SC,ev,lR,RyV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aUjRwR,ponOy,xDLG,i,JnB,pPN,hk,aZlc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sRTdzT,AcOfv,rNcu,i,zj,SC,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nGynfc,oeuza,EXYv,i,sa,UPkh,lR,wrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pDJOLw,OTmTL,VsKz,D,GF,yC,lR,zYm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,btxgVN,,bVnY,i,n,kgW,i,DSA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wOtzGx,CoHoq,,i,oh,y,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BoPdOj,pNMtG,Vj,D,Cj,y,i,SRfh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,loGykE,OcAPt,jb,i,eG,TAUy,fU,pGxKm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VulNnR,cVJop,VsKz,U,GF,hmKv,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VulNnR,,iV,i,G,hmKv,lR,RIqe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WKwxHL,,jb,i,GF,VyBk,lR,POwhN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NdoynZ,,EXYv,U,kWZ,VyBk,hk,dpaj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jXRwfl,vnUks,,i,os,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gRmMSe,yPBim,CqC,i,GF,nT,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hEnwRq,MWxHT,bVnY,D,k,Xua,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BgtPpl,zTnre,,i,GF,RV,lR,nt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vjtSZQ,VzUtA,yhq,D,zj,y,lR,n,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yLCNLO,eNMxO,bVnY,D,RI,ev,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tIKwwU,SklNG,CqC,D,k,XLQ,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EeTXYY,JGooX,,i,Zi,nT,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FkNzPm,eKOcq,EXYv,i,oLI,Cj,lR,mfJt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OfvBNd,,zZe,i,iHi,ev,i,WKX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jLZMhD,rsmVM,Gac,i,iL,ev,hk,fjPn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nKnGbY,rGzDb,LDk,i,iL,zNvM,lR,hyz,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wWXJBu,diapp,LDk,D,Cj,sWhI,lR,IT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lXVnpt,AXhVB,LDk,i,iL,RSST,i,tIdiU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AuPFaI,LOtcu,bVnY,i,Kg,rSZ,lR,BYGX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fJovfW,NnTgY,anf,D,iL,y,lR,BgJK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sGhRYJ,ujyjw,,D,RC,KCWa,hk,Dq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sgvRzL,nJvcN,EXYv,D,u,buw,L,WNP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OSYsYG,pEaiT,zZe,i,zj,uECy,lR,TRit,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wvNyMw,xKZuK,EXYv,D,Kg,rSZ,lR,fTaiu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuGabR,xZsRI,bVnY,i,n,gI,lR,RNB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zCEWct,FusKs,QMl,i,aW,rmJ,fU,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hdQGbe,,CqC,i,GF,Bkt,lR,Lbgr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OVjFyV,TyuVv,gpyD,i,RC,YO,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UPgARG,IgZNL,QMl,i,aW,HSL,fU,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aHVbvh,wjnmh,mNh,U,y,jF,i,gSeTa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vEuAFB,ykMfj,CqC,i,G,VyBk,lR,aDA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OvfMYV,wwFAY,yhq,i,bf,Cj,fU,UOJuo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DqjfEc,UlGTL,xDLG,i,iL,,lR,gMCg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zhhoqp,nMlTX,EXYv,D,eG,Cj,l,gOoH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WAXYUT,mXMfT,CqC,i,bf,Cj,lR,mlk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,irfydY,pvURJ,Vj,i,GF,Cj,fU,rvHa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qhlsdJ,jwPoJ,bVnY,i,GF,DQc,fU,pqp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xzNhft,wwFAY,,i,vk,SC,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VyynLm,Yofzn,bVnY,i,Bu,HSL,l,dqrz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eQnKqi,BGytn,iV,i,G,YO,l,KVsrF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fTyAhb,erQTG,CqC,i,KR,Vqi,hk,eFx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bzFsWV,QImNH,,i,RI,,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QxITxV,SgWNS,rNcu,D,RC,ev,l,IJyc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eVYncr,xWQpV,LDk,i,GF,Zsbp,lR,qhE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nQJPhf,mXMfT,QMl,i,kWZ,pgd,T,QIqcc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QjpdFY,frgYp,,i,mR,SC,lR,tcLz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AWfyfG,,zZe,i,FL,iGnp,hk,HSL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AnzJDa,vRnVr,zZe,i,FL,Kg,fU,drjf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DpcjyD,,mNh,i,Cme,LKKI,l,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fiIMSV,IeoJw,yhq,D,nU,IWtD,lR,ev,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,inFNXZ,EWrtg,VsKz,i,FL,RSST,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,btLEdX,kEKkc,ez,i,RI,y,l,zDkl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OSrGrW,jXToa,rNcu,i,Lz,xa,lR,Pif,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yxTidc,rWGPS,LDk,i,iL,HaU,i,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BOzSmf,,CqC,i,kB,,hk,Uw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gAwBeG,gxzDj,KsKZ,i,zlG,,l,s,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eTgVNM,FPgQL,rNcu,D,GF,Cj,l,RjeA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eTgVNM,NTaLY,,i,GF,Cj,l,FN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DNQxBm,oVrFI,VsKz,D,kWZ,qEA,hk,AfIx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KzsmeM,ISwYj,LDk,i,H,hvW,l,VvGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TMTmXS,Aibzq,,i,O,VyBk,lR,gpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,puimUs,,bVnY,D,Pek,TBUv,lR,Pek,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZyRrLs,rGrAE,,i,FN,zI,lR,Kuz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XPDpSd,zSbLi,rNcu,i,ZJA,SC,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LbkZIG,xTKHz,VsKz,i,RV,ev,hk,tVlrD,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CNLzAx,UcrWb,xDLG,i,n,hmKv,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dsRWNC,oVrFI,zZe,i,os,Kuz,lR,sHOb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BBnvhF,TyuVv,yhq,i,OS,gOZx,hk,GiJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vYcoey,zTnre,Vj,D,GF,Cj,hk,UjeQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ueBTvP,LQsok,CqC,i,GF,YO,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cevmLG,nqJmJ,,i,Zi,ev,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UxRHjN,zaJDf,QMl,i,LL,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gKUEEl,JYxTL,ez,D,bf,yH,i,KZJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yKSgFR,abjVt,bVnY,D,mO,HaU,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VxEzFa,DnTGD,bVnY,i,RI,ev,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Tsyxpf,uLFqs,EXYv,i,FL,Kg,fU,TNo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jthMtI,,zZe,i,RI,sp,L,ZyJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OLEal,TmrsG,ZQa,D,gI,Ri,lR,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Vdpwk,SVLxE,zZe,i,GF,TBUv,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TrjcI,,VsKz,i,GF,rSZ,fU,UfrO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QNrkk,cWPuB,iV,i,Kg,HSL,fU,rks,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pIoxG,doIEg,KsKZ,i,zz,yH,lR,onIv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UhGmV,ePyBk,VsKz,i,n,fX,lR,ydpm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zkYtV,GmokZ,QMl,i,ZKX,y,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gNTNv,,mNh,i,pqp,pf,lR,zlG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jzkUw,GukTq,gpyD,i,GF,Zsbp,lR,WFD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ijZwF,,LjAS,D,oLI,Cj,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fBbzi,pNMtG,KsKZ,i,ZJA,rSZ,l,yGet,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qAhWM,yPBim,Pcb,D,mR,pf,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LzejX,oJXSu,anf,i,Ld,aiR,lR,ify,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IWzPW,ojeZB,Pcb,i,ZKX,Cj,lR,gI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EBZXh,rGzDb,yhq,i,bf,pf,lR,nZVbd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FwdiV,miwCS,VsKz,i,n,hmKv,l,XOk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UPlwr,yhCUU,KsKZ,D,u,gI,hk,ikaG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Gmdki,rXnhf,yH,D,mO,Cj,hk,ubP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JQGlL,,zZe,D,RI,xa,i,qVs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WVCNE,nqJmJ,,D,u,eFx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PqpaH,woFEW,,i,sp,y,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KPxsb,ruKdN,mNh,i,RI,uECy,l,Ot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hXMhF,CXOTH,EXYv,i,RI,xa,fU,ccO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kTPqi,gJjvo,jb,i,pf,dYPI,l,ULYq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UdqQt,DnTGD,KsKZ,i,FN,ev,lR,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YtYfM,,CqC,i,Lz,KnZo,i,XGLQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KvIPI,ZKlRN,ez,i,kWZ,pf,fU,muJv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eXmmB,XNYmw,,i,ZJA,gOZx,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jnznj,amoEQ,ez,D,ZW,YO,l,dqEvK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zZaAF,XLQHG,gpyD,U,n,zNvM,lR,UsS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iQxzT,XNYmw,CqC,i,k,TGXq,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZzZQQ,BEKcQ,,i,n,cbZ,i,RJS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MKQmw,VzUtA,yhq,i,oh,xUk,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mnQKA,kFmnB,VsKz,i,GF,gOZx,i,CWs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yzDvx,tEJnc,QMl,i,mO,y,fU,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Kvyvl,cBMeY,mNh,D,ai,Nc,hk,xCBR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GQfxc,DLtpg,CqC,i,GF,pf,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HjYNt,rYFYY,,i,ZW,YO,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LVcKX,SAbkD,iV,i,xk,mwY,hk,iga,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MURjH,UEigV,jb,i,mR,gI,l,mtxO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CmOLa,zAPsp,CqC,i,n,IamB,hk,ivV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,myijF,zAPsp,EXYv,i,n,IamB,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RAyGl,NHNrT,mNh,D,sD,Cj,hk,sa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dACll,ViguX,opm,i,xk,Ri,hk,ZUD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vAWiS,UriEN,rNcu,D,oh,aRnz,hk,BHRiz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uqiAp,KwVUN,LjAS,D,xk,LHS,lR,PTmX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EzMsU,rGzDb,yhq,i,mO,YO,lR,ChXC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Crojb,SgWNS,Vj,i,ZJA,ev,lR,CPa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sTdNU,UimzX,,i,RI,jBP,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CTeTm,JFMRC,ez,D,bf,oka,lR,xa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RCDyh,,VsKz,D,mR,,hk,Wm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iAvId,ZanZO,yhq,i,jgn,QIe,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iFNDl,oQByA,,i,iL,Alg,l,hvW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CGhUM,zWvHI,VsKz,i,O,jBP,hk,gqn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zpWsJ,zccHB,CqC,i,KWZ,VyBk,lR,aDA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FoqOk,KyEGN,,D,TGR,hmKv,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WVYJj,alpkt,VsKz,i,Ri,hmKv,i,HJAse,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MxzOm,GfRLe,OYMU,i,GF,eKfc,fU,rEzo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SLWZr,tWWFx,mNh,D,nt,Wsd,l,xVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xQNMe,MfFnJ,EXYv,D,xk,Cj,lR,eTKB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tNdDQ,qSpYs,ez,D,kWZ,XJb,hk,WEd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iiGWB,,bVnY,D,exS,y,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UCetv,uVdCT,LDk,D,aW,TAUy,hk,Zubh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BJtVl,uLFqs,ez,D,kWZ,Kg,lR,OtVM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LAyKQ,mONwL,zZe,i,G,SC,l,FwtV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JWGcO,,,i,iL,Wsd,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wABHK,,CqC,i,zOi,hmKv,lR,ZBq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hqYmK,UcrWb,CqC,i,KR,hmKv,hk,hGQG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qtSeb,cdSwJ,VsKz,D,RC,UpSB,lR,DWzu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gcNLT,ZKlRN,EXYv,i,RI,Rfp,l,oKLzD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZPDXy,,EXYv,D,BAR,y,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BecSV,,VsKz,i,Pek,VyBk,lR,eKOcq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zecFE,TeinF,gpyD,i,n,pf,lR,NGkL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mfNfW,wKKEM,LDk,i,Uw,pgG,lR,RyV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mQiNI,pfJkN,,i,k,YO,L,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TNzyQ,,ez,D,pm,dYPI,lR,kAe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IhTPU,rXnhf,bVnY,i,n,gI,l,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iLTFH,VxHVF,LDk,i,iL,nT,lR,DjYn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bLUGl,jBtmc,,i,sa,SC,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XfJkS,ImIdP,,i,OS,pf,fU,FL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lUfdN,vdUHx,CqC,i,mR,xa,hk,qh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SywhM,DnTGD,yhq,i,iL,Rfp,lR,YUbK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bvupa,,,D,Ep,y,hk,jaD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,owINH,VzUtA,jb,i,RI,SC,fU,umaM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CCGsI,dgVKx,LDk,D,aW,y,hk,YEdp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,alhGC,VGiQX,Vj,i,GF,SC,i,dXnh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UWtZY,MBsTd,LDk,D,aW,yC,L,OaVX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RhJpP,VzUtA,CqC,i,y,SC,lR,ITMV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ScHWV,QYnSY,LDk,i,aW,XOk,hk,UJhbM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qEcTl,ntogG,,i,n,YO,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UcgYL,UpZhy,Vj,D,Ep,YO,lR,XGd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ONAtO,loFIF,CqC,i,n,juI,lR,ZNN,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FAnju,llHEg,QMl,i,kWZ,bf,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IMAmW,taxvD,gpyD,i,Kg,mwY,lR,kwEP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oHOgr,hymXz,KsKZ,i,uP,yC,fU,cryp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SaMuF,szatV,xDLG,i,mR,HSL,lR,vjXI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CtzbB,oImqv,gpyD,D,zz,Mgil,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ccxxW,hoyPK,jb,i,G,Lmvq,l,zOi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VZEgF,ERiHU,,i,RC,xa,l,zmB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JpgyX,yOhXn,Pcb,i,u,Cj,lR,gI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qvcVX,CYyHw,Gac,D,iL,ber,hk,UXK,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yozra,pNMtG,Vj,D,Bu,y,i,PdiGr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EhPqZ,HTitb,iV,D,SC,sp,lR,Pegj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ACstO,XctNb,LDk,i,iL,ZBq,i,LqHDr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,loHRz,AeLlQ,QMl,i,zW,Pif,L,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bOhld,zScGL,jb,U,k,hmKv,l,tohr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KEAuM,rRbDE,,i,iL,hmKv,hk,Jij,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AyTWQ,oWoZd,,i,iL,zNvM,lR,zvf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LDSzP,MWNmr,Pcb,i,u,Bkt,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xvzcI,exGnq,LDk,i,iL,pPN,i,ymjWm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AEUDA,yUWuX,xDLG,i,Nc,dYPI,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DRAzr,ClwEM,CqC,i,iL,nT,T,Sgmz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aFHsL,wKKEM,yhq,i,Bu,HSL,i,eG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DfHcP,unoLA,,D,os,sp,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iyZTY,asEGJ,yhq,i,GF,hmKv,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hvgvh,,EXYv,D,iL,LHdO,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JWQHp,rGrAE,iV,i,SC,y,hk,kWZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qIuOf,vpaSZ,jb,i,k,uIjX,i,rWAq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GiiYL,qgWye,LjAS,i,iL,buw,lR,jVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rpfuZ,,xDLG,i,nj,dYPI,hk,WGotI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jeyeV,Tnqdc,opm,i,OS,Pmiv,lR,RyV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aqsat,AMEDi,,i,RC,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rBbqk,BGytn,xDLG,i,iL,iGu,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wXrEE,fIVqL,yhq,D,aW,etS,i,eG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TrdBe,CKxFS,ZQa,U,Lz,aQj,fU,FL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LCQcn,nHVgM,bVnY,i,sp,WNP,i,irEx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NZJOz,pcEak,OYMU,i,GF,FvO,i,uKFZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RrlYb,,aN,i,Lz,fX,i,ZNsQV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vCNMH,uJvkP,Pcb,D,xk,ev,fU,Xnrz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BYVb,VdCfJ,LjAS,i,kdc,Cj,L,TDnM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hbOC,USlLw,LjAS,i,GF,jF,lR,GEp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ehHH,MWxHT,xDLG,D,iL,Cj,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OLgj,,,i,H,pf,lR,nt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zVCL,JFMRC,CqC,i,G,ev,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vzXt,vyzNx,Gac,i,cZ,juI,hk,USFO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Dgyp,DnPCF,CqC,i,YO,yC,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XVLC,oBwBc,Vj,i,xk,WMz,lR,Ehhb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jCLV,aRalA,yhq,i,FL,RSST,i,eG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Iksb,vRwhI,LDk,D,iL,Cj,l,DjYn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,frDK,aEQZY,LDk,D,iL,LHdO,i,THd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KPga,eqCpQ,xDLG,D,iL,vtyj,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FCDa,,iV,i,iL,kgW,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UTLg,zfzpe,EXYv,i,bf,DME,l,kbJw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dxaH,IqilD,xDLG,i,sp,DME,i,aNX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SFqU,hoyPK,opm,D,OS,TAUy,lR,YxJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QhYl,VGgQZ,iV,i,FL,LKKI,i,kXlV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mJAj,vZyhX,CqC,i,H,Bkt,lR,uxvy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fvJT,GbtuI,CqC,D,kB,gI,lR,cUCE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GzYL,ATojp,bVnY,i,Lz,Kg,lR,xxdT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GPbJ,xxpLa,,D,aW,gI,lR,vNu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oVBv,,LjAS,i,kB,Pif,lR,Luzd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uQdD,FJteQ,mNh,i,k,,l,xVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AvNX,uUaoE,iV,U,u,Cj,hk,PXI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,buOb,MiuKF,ez,D,uP,hmKv,l,KZJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UgBl,qgHRF,ez,i,s,jF,lR,cBEE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Nxwd,MgsXH,iV,D,OS,HSL,i,OeQYb,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MvjM,RUGgg,rNcu,i,Zi,bfM,fU,fsSz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tnZR,qDzZa,CqC,i,xk,yH,lR,UrOT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZUTU,qSMjB,LDk,i,Cj,Pmiv,lR,IT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kEtE,WzBAB,LjAS,i,Pj,gI,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IRLB,uYWpN,,i,os,ev,fU,VhXh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jIDW,,jb,i,RC,nHdH,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pMUk,hWkVv,ez,i,mR,FvO,lR,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WZAC,rrdcH,xDLG,D,H,yf,lR,WcxQX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gktY,ZanZO,iV,i,mR,ev,i,Gf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RWhE,AMEDi,LDk,i,iL,,i,zz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uUZy,,iV,D,Cj,vrEy,hk,oiji,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iUSq,eKNig,ez,i,n,y,lR,lWdy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aHmd,BGytn,iV,i,RC,YO,lR,ovm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cuyW,KKRFI,xDLG,i,sa,HaU,l,zmB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ITBX,yZyjK,iV,i,iL,y,lR,VRsBd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AEzV,OcAPt,opm,i,iL,,L,xAF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UqBr,kLGcV,Vj,i,Bu,iGu,hk,YO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gcWu,eYjgF,VsKz,i,FW,WNP,lR,rcz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WSIq,JYxTL,Vj,i,KR,yH,lR,ZKdq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RqID,wnVGZ,LDk,i,pf,ZKX,lR,WTfgy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,foVe,wwFAY,LDk,i,iL,Vvh,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SweK,uVdCT,bVnY,i,n,,lR,RNB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,enXc,Gjomx,QMl,i,GF,wCsQ,T,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VTmz,Wqvxn,Pcb,i,Kg,gI,lR,OWRJg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,laVw,tbnKY,,i,n,gI,l,zmB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zaPH,hQGku,LDk,D,iL,IamB,lR,hyz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wbhL,Hsafg,VsKz,i,zj,kWZ,fU,OsSV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VckB,wwFAY,iV,i,ZKX,Cj,lR,ovGg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SCLB,xZsRI,KsKZ,i,n,gI,L,vdic,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IYwy,WEZQr,bVnY,i,xk,qyCG,hk,QzxD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TmvN,WiUgl,aN,i,G,y,hk,brP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nHkJ,rWGPS,EXYv,D,fx,Cj,lR,tbrL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bYYU,KEohZ,VsKz,i,ZKX,iADy,fU,McJu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uZtv,cyxIv,EXYv,i,sa,oKN,i,AbbqJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VxeN,LQsok,Pcb,i,ss,pf,hk,Utut,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mFvL,Ydbin,CqC,i,ZJA,cZ,hk,GKjVm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mFvL,,,i,ZJA,Kg,hk,YO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UJLI,ZKlRN,ez,D,Nc,Cj,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fpYe,nMlTX,xDLG,i,iL,yC,lR,gWqs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oEzf,mWKTs,yhq,U,y,bf,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MOrF,SKihC,Vj,D,iL,,hk,fRt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vdpf,OTmTL,LjAS,D,nt,rSZ,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,phMr,aqDbd,mNh,i,iL,GF,lR,frg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fuaf,ewzba,,U,db,zzWY,lR,hcd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Udwo,,VsKz,i,sa,ZHiH,i,abR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MUqB,GOjIh,gpyD,i,n,pPN,lR,iywR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VgNn,uYWpN,LDk,i,n,DQc,fU,YXW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qnun,fFPdL,CqC,i,G,fX,lR,HCh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZlzG,wwFAY,iV,D,zj,Ri,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MVEr,CgiNm,,i,Dq,gI,hk,iyf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YjUO,yQnHf,mNh,D,iL,Cj,lR,aYOk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mhRt,OalFZ,gpyD,i,GF,,lR,BIg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Gisz,,mNh,D,JnB,gI,i,aotI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IGTD,QvGNg,QMl,i,GF,Cj,T,mhPN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YsjD,gQCaa,EXYv,U,G,gI,l,qJEZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oedy,Nqkmi,EXYv,U,Kdq,SC,lR,JlfK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CZPI,mGUGe,CqC,i,n,easN,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QIcn,GAsNk,VsKz,D,G,SC,lR,Njat,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RlxT,QImNH,,i,zj,hmKv,lR,VSL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DPrp,,VsKz,i,kB,wnVT,hk,Wm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eNNx,UcrWb,rNcu,i,gI,hmKv,lR,nlLe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CIXg,,yhq,i,GF,KtFl,lR,ev,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pvOP,tjnHd,LDk,i,iL,oen,lR,joSt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gNWp,tZmRz,rNcu,U,nt,aQj,l,qYXU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kAII,zAPsp,mNh,i,Cme,Zsbp,hk,TTi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kAII,,VsKz,i,Cme,Zsbp,hk,Bpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GRny,DRRNF,bVnY,i,exS,HSL,lR,lrVj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dBTJ,uYWpN,Pcb,i,RC,Cj,i,HJJT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eXws,LiFpo,bVnY,i,RC,rSZ,lR,ZSLaZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FAQs,oVTOT,yhq,i,sp,pf,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FAQs,gmyhV,VsKz,U,sp,pf,fU,zhL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bTDI,uAKaC,jb,D,ZJA,nT,l,zmB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YIdC,CXuWy,VsKz,D,Kg,Cj,lR,eykVU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YIdC,lHjLY,rNcu,i,Kg,zz,hk,EBRd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YqVc,YgPxP,EXYv,D,mO,yC,lR,kwEP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gaSS,ZQfYS,anf,i,pk,ev,lR,eag,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FBvy,,yhq,i,GF,kPj,lR,GEp,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zDkl,vZyhX,yhq,i,GF,pf,i,WvLm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZHzl,fQNSn,LDk,D,aW,MpP,lR,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UKEO,JwrBZ,,i,ZW,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EzxW,gCAcv,,i,Ld,rbp,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vZrJ,UriEN,CqC,D,G,YO,lR,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VLKL,zPIaP,jb,i,Ri,Cj,fU,yCXw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VLKL,UriEN,Pcb,i,Ri,Cj,fU,HwJa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nGZX,AXhVB,rNcu,i,FMt,HSL,hk,RI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ODQP,NpWJw,iV,i,RC,rSZ,fU,Lyce,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jqok,GDIAH,VsKz,i,Kg,SC,lR,ooYi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XkNZ,vTSnp,ez,i,nt,pf,hk,MBL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uCSJ,PXTnz,rNcu,i,Nc,hmKv,lR,IApUF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zhus,mtJJa,KsKZ,i,EF,Cj,i,AusC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kBnd,UpZhy,gpyD,i,GF,qVs,lR,MpWqu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TPXx,,VsKz,i,jgn,pBlc,lR,fDJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AlCB,rScUy,gpyD,D,GF,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NjWA,asEGJ,CqC,D,G,ev,lR,zJfSZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bxXJ,UriEN,iV,i,GF,kPj,fU,Lna,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Etcv,KKRFI,LDk,D,SC,y,lR,zFLEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EBxS,TlWKY,,i,Bu,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QIfF,DFOIz,,D,G,yC,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bIJo,OcAPt,xDLG,D,mR,TAUy,lR,bYyZL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aaDx,,aN,i,mR,hmKv,lR,AFrH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dMdU,qWCxm,xDLG,i,cZ,juI,hk,EAfH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SyNu,teKMc,QMl,i,GF,HSL,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SyNu,DJjeH,iV,D,xk,HSL,i,oCWN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Auqu,,CqC,i,zj,dbdK,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nuIa,QJuki,mNh,i,G,sp,lR,TvDn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nuIa,UMDpL,aN,i,G,,hk,GXQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nuIa,hpCAn,bVnY,i,G,IamB,hk,ePq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mEAV,jqINa,CqC,i,KR,nT,hk,MkpI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QwCY,LJytA,xDLG,i,n,YO,lR,RgEv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QwCY,ZnMDV,ez,i,n,xa,lR,MFP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JqtP,Nqkmi,Vj,i,GF,y,lR,FtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uzqf,IeoJw,rNcu,i,RC,sWhI,i,fAb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PXEs,xTKHz,yhq,i,zj,ev,i,elM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,THfE,,CqC,U,RC,Cj,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sbhN,FbvHy,zZe,i,RC,HSL,i,xzih,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Thpg,teKMc,iV,i,GF,HSL,i,XEC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AOuT,Aeewi,CqC,i,y,sp,lR,WyhQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AOuT,,EXYv,U,y,aTaS,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TteF,HXSgR,,D,EF,Cj,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ezFf,LdGeV,CqC,D,GF,Wsd,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Oyzi,zTnre,,i,GF,DME,lR,hcd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bfeu,TttFj,rNcu,i,RC,ESA,fU,EGVC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LioW,kdChU,mNh,i,jgn,bfM,lR,ZPvZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MarA,jrPjI,VsKz,i,TGR,DQc,lR,vOxw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,luAo,,VsKz,i,Ld,pf,hk,TzcN,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YhAb,uLFqs,xDLG,i,Cj,pf,hk,YKr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EPqN,fFPdL,gpyD,D,RC,y,lR,zaU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QoIi,EwHnk,EXYv,D,Ri,bfM,l,XUdd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZJTX,TlWKY,zZe,i,FL,Kg,hk,Ld,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MvJZ,fFPdL,OYMU,i,db,rbp,i,QcT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MkpI,bAbXl,rNcu,i,sa,,i,WI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MLcQ,OtsrC,rNcu,i,RC,HSL,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,DQYjU,Pcb,i,RC,jBP,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XUlI,LXcTm,Gac,i,Ld,CdC,lR,VLKL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVZb,JpSzL,CqC,i,GF,Cj,lR,qh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVZb,UupwP,opm,i,OS,Cj,l,NMG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVZb,IcpiC,xDLG,i,OS,y,lR,lSkB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jBCu,NrqKu,rNcu,i,RC,jBP,lR,zYPf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zMqu,mSoea,LjAS,D,zj,sp,hk,Pj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zMqu,pLYXJ,rNcu,i,zj,xa,lR,yWWD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nGOx,gCAcv,gpyD,i,GF,gI,lR,qhE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nGOx,QmLzY,gpyD,i,GF,Cj,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ouJI,rGrAE,xDLG,U,sa,zI,lR,kbKz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jwcL,rXnhf,VsKz,D,GF,gI,i,mwra,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,twkC,nryOR,KsKZ,i,FN,Cj,l,UaHDD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QCRl,GVQal,xDLG,D,FN,pBlc,lR,oLI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,RTQUJ,jb,i,s,dYPI,l,JWS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,bwQpq,ez,i,s,YO,lR,tEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,qvkFl,CqC,i,s,Pmiv,lR,aDA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pChe,UgQaa,OYMU,i,G,hmKv,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pChe,LdGeV,CqC,i,G,LoeB,hk,UpK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuQz,dgVKx,CqC,i,n,RV,L,UOy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fflq,TrvXy,,U,os,YjrO,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fflq,oenhf,iV,i,os,,hk,zI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fflq,,CqC,i,os,uECy,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,CKbmm,iV,i,GF,YO,lR,HoLUv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,JvjXk,CqC,D,GF,YO,lR,BFl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,NpWJw,CqC,i,GF,YO,lR,IWHQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,SOcKk,,i,GF,pBlc,hk,jQT,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,,gpyD,U,GF,YjrO,lR,XEY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qEey,qOZwe,iV,i,GF,HSL,l,mZez,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qEey,fyozH,bVnY,i,GF,WMz,l,ksaX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dKUM,EOhNc,EXYv,i,jgn,HSL,lR,iHi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,KVolp,iV,D,GF,pf,lR,EBv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,ePyBk,yhq,i,GF,NuYc,lR,PRKNO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,SNYME,VsKz,i,GF,uECy,hk,Bpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,,gpyD,D,GF,,lR,hiS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KBzlV,LjAS,D,kWZ,xOX,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TPrhq,QMl,i,FMt,Mcs,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,atHVS,gpyD,i,Kdq,juI,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gOXsw,,i,ZW,Wsd,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YMsPN,,D,qh,ev,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,INNaP,QMl,D,Yx,GWD,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NmBAC,,i,G,rbp,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YgPxP,QMl,D,aZ,yC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NXugp,mNh,i,pm,TAUy,T,xVO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,alpkt,ez,D,JnB,qyCG,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pYJLq,VsKz,D,kB,Wsd,lR,vCu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZNXQP,,i,RI,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YDTxj,VsKz,D,Kg,Ri,hk,tllY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eCWoC,,i,zW,RSST,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,kFJLh,,D,YO,bfM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nNkdM,,i,Zi,sp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,tlQoc,QMl,i,pm,wlp,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,tlQoc,mNh,D,pm,zlG,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rmSkc,EXYv,D,RI,Cj,lR,hFMv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,StZeV,EXYv,i,ePq,mwY,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TVeAq,,D,sp,hmKv,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NePPU,yH,D,mO,,T,PMH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TeinF,rNcu,i,Nc,Cj,fU,QyCo,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PsXzz,QMl,i,n,cbZ,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yHmTk,,D,BAR,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MiuKF,,U,os,qyCG,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MiuKF,,D,RI,hmKv,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CmGAY,,i,KR,zI,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VCfFf,opm,D,hyz,zz,lR,zWhD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AXhVB,EXYv,i,Ri,na,lR,Ymvr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AXhVB,QMl,i,sp,ZBq,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AXhVB,,i,Ri,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,BilOn,Pcb,i,u,ZUA,lR,MAI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Nqkmi,VsKz,D,Zi,XLQ,fU,WI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,Pcb,i,u,na,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,QMl,i,yf,jF,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,aN,i,n,soR,hk,auP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pcpoK,LjAS,i,mR,xFh,hk,Zica,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UpZhy,,i,u,Kg,T,fx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jJOWz,QMl,i,jgn,fX,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YTckD,,D,RI,kgW,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uLFqs,,i,pm,ZKX,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TWnoU,,i,,kgW,l,FN,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JmTkj,QMl,i,u,sp,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,OCsfh,QMl,D,oen,cbZ,T,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,OCsfh,,i,sa,cbZ,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gCAcv,QMl,D,zW,aQj,T,FMt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TttFj,QMl,i,sD,MWL,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hzafF,QMl,i,u,ev,lR,GZAi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uYWpN,anf,i,GF,ev,lR,qFVN,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uYWpN,Pcb,i,u,Rfp,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CbutI,ez,D,Ri,Cj,l,lQt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,tMLbO,ez,i,nt,IJq,lR,Qacf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,iEDSq,,i,hyz,jBP,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DnTGD,rNcu,i,iHi,y,L,iL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,tvJzI,EXYv,U,zW,jBP,hk,rtO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zLfaS,EXYv,D,nt,HwD,l,JJms,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ClwEM,EXYv,i,pk,Wsd,fU,SMmm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TdMRE,QMl,i,u,eQE,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rGrAE,yhq,i,NHX,SC,i,eG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EwHnk,zZe,D,aW,Ri,l,eJDM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EwHnk,,D,OS,EogM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CrkQM,,i,GF,hvW,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,oxvWf,QMl,D,yC,YO,T,GxE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cwZAB,,i,Lz,y,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qcEhj,gpyD,i,O,Cj,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jHsOR,EXYv,i,RI,GWD,i,qy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jHsOR,QMl,D,pqp,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qytCC,LjAS,D,boZ,Kuz,hk,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qytCC,ez,D,oLI,xUk,hk,XSpX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fQNSn,,i,jF,ebk,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eKOcq,Gac,D,hI,PF,hk,Qhv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,alMCl,mNh,i,pm,ZUA,l,Ot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DOhAH,LjAS,D,qh,OxU,hk,bEU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yOhXn,QMl,i,u,pf,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,xdUqp,opm,i,hyz,UpSB,hk,SjdL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uUaoE,QMl,i,u,Cj,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jNsAq,QMl,D,pqp,Cj,T,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DNkZz,VsKz,i,RC,juI,l,XOk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QmLzY,QMl,i,eG,Cj,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,bwXei,ZQa,D,sa,Cj,l,RoQkZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hlcVp,CqC,U,G,pf,lR,ZBq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,IcVDs,,i,qh,HSL,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yDaUW,LDk,i,hyz,Wsd,lR,mR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ivYgu,yhq,i,xk,jBP,lR,APS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HsZBB,,D,u,XLQ,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Uoaco,CqC,i,jF,ZNN,lR,FW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CrCYV,,i,RI,xa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pRZeB,zZe,D,zj,na,fU,jFI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZIelK,,i,GF,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,QUpDF,,i,Zi,oKN,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VONBE,,i,FMt,nT,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,aQrgh,CqC,i,KR,SC,hk,RoZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,lASnD,,D,jF,XOk,l,FN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UriEN,Vj,i,Cj,Cj,l,Cqff,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JjjZb,,i,IaL,aRnz,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HrkuK,rNcu,i,H,qNG,L,iL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KKRFI,,i,yC,Vvh,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HXSgR,yhq,i,os,zz,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fgNol,,D,SC,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NDihW,iV,i,mR,y,lR,wIE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HGnGo,,i,Nc,y,T,mEr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qyqVu,,i,Bu,ZNN,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLtxP,,D,TGR,eHh,T,nGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JFMRC,,i,Zi,ESA,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TrrrN,Pcb,i,u,SC,lR,OeB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NWHpW,EXYv,i,oLI,xa,hk,abYh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZZrqs,LjAS,i,k,buw,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wwFAY,Pcb,i,u,SC,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rAjZw,QMl,i,hyz,LHS,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FTbpE,QMl,i,Kg,Alg,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MlKuk,CqC,i,FMt,Ouf,lR,ots,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,buQGw,mNh,D,hyz,DQc,hk,rRm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,IzCjJ,,i,IaL,zz,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zZmFm,,i,mR,sD,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rrGCj,aN,i,RC,ZNN,l,xjNa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rrGCj,,i,FMt,dYq,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TDeGS,,i,SC,gI,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,raiaC,,i,mO,,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,xTKHz,QMl,i,oh,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,xKZuK,Pcb,D,u,rSZ,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,LQsok,mNh,U,pm,y,lR,Wjgr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HaPRU,,i,Kuz,rbp,lR,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mgoTc,mNh,i,pm,xa,l,UbyZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,llHEg,EXYv,i,eG,Bkt,i,FpQN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,WZBuB,xDLG,i,FL,Kg,hk,TfK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HDZfm,QMl,i,u,Bkt,T,H,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MWxHT,LDk,D,aW,Xua,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hAjyU,QMl,i,KWZ,jF,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hAjyU,yH,i,mO,NdS,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jvpnP,QMl,D,hyz,ysh,L,tzS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,xZsRI,CqC,i,sD,pPN,lR,ss,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZqfRS,bVnY,U,G,IamB,hk,xkDOd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Joufe,,i,sD,zz,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TpwcU,,D,n,BcOI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,sYYvD,mNh,i,ZKX,hmKv,lR,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,loInS,EXYv,i,nU,dYPI,l,Rccl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yQnHf,Vj,i,ZJA,sWhI,lR,ZRb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JWQHp,,i,aW,IouE,l,aiR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,BSAII,QMl,i,ZJA,tOJv,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PwNjw,QMl,i,n,qWFT,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gXbuE,mNh,i,pm,WPrX,hk,sa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qvkFl,,i,gI,gOZx,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,XigoJ,xDLG,i,FL,iADy,lR,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fnnlN,,i,G,gOZx,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zErTL,,i,GF,Zsbp,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zAnNK,,i,GF,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vNCUb,QMl,i,pf,gOZx,fU,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YhxaV,QMl,i,G,SC,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FAXsi,VsKz,D,pm,Cj,hk,lUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zakWV,,i,Zi,zz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FJteQ,xDLG,i,OS,Zsbp,hk,kAo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mtJJa,,D,G,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qZzCL,EXYv,i,RI,hmKv,hk,vSMA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qZzCL,ez,i,nT,hmKv,i,Rk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cEpGn,bVnY,i,db,hmKv,fU,pqp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cEpGn,CqC,i,n,Zsbp,lR,ajVx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,aGAzh,mNh,D,Ri,hmKv,hk,exS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,oRdwp,iV,i,GF,IamB,hk,zmro,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,oRdwp,,D,xk,qyCG,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KyEGN,mNh,D,pqp,hmKv,hk,exS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KOJjz,rNcu,i,Kg,hmKv,hk,HjUCB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UcrWb,,i,os,zNvM,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UcrWb,,D,GF,hmKv,lR,XqSU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zlxbS,zZe,i,Ds,,l,uP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zlxbS,ez,i,nt,hmKv,lR,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,sGrXl,QMl,i,Ds,qyCG,fU,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cPETG,gpyD,i,RI,tCwq,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GqeZx,,i,G,JVF,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pBRVS,QMl,i,JI,KCWa,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CfjhB,,i,os,KCWa,L,QMjJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mDidC,EXYv,D,vk,IamB,lR,GPmo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EWrtg,KsKZ,i,zlG,LKKI,lR,IaFA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EWrtg,xDLG,i,FL,RSST,hk,TfK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hpCAn,,D,IaL,RSST,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,kfBab,EXYv,i,RI,gOZx,lR,wXQS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nPIxJ,CqC,i,n,uECy,lR,bvl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SNYME,gpyD,D,IaL,uECy,lR,XEY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CcpoJ,,i,GF,gOZx,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dheCD,CqC,i,Bu,uECy,hk,GWD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,VsKz,D,boZ,WHBi,hk,pm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,bVnY,i,cZ,buw,l,BqOO,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,bVnY,i,xk,yC,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,EXYv,i,RI,HSL,hk,MmW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,rNcu,i,RC,gI,hk,xQIh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,rNcu,D,kWZ,y,l,GslFg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,rNcu,D,RC,hmKv,lR,tUFY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,xDLG,i,Cj,y,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,yhq,i,WLK,sTpa,lR,sHBol,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,yhq,i,Zi,GxNZ,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,zZe,i,Kdq,iADy,lR,acq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,opm,i,Uw,Ri,i,XqjYB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,hyz,gOZx,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,Lz,zI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,pk,DQc,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,db,UPkh,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,CqC,i,O,yC,lR,Vlan,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,ez,D,oLI,,hk,XSpX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,U,iHi,QqBI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,nU,WOsU,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Wm,DDPD,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Zi,ITBX,i,YcYiC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,Ri,Cj,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,SC,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,,Pif,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,oLI,aiR,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,ai,ubP,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,Pj,bGOW,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,xk,mEr,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,G,uGF,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gqHtKBH,oBwBc,,i,nt,jaP,fU,RNBB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SkjXuvd,,iV,i,RI,nHdH,lR,aNX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WfpocYj,Dxgrx,jb,i,RNB,Pmiv,lR,iWk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SiIGmjr,jtIuo,LDk,i,yH,,hk,Rsl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FJkNSSn,BSAII,,i,RC,dYPI,fU,PF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mWrOsRP,GlGAH,yhq,D,RI,HSL,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KUOLvRm,,bVnY,i,jgn,WPrX,i,SC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OuhbqSD,mDfiz,zZe,D,FL,sp,l,qHay,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OEafFty,kaQGg,Vj,D,ZW,y,lR,AIjR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SLbStca,AyuIo,gpyD,i,GF,uECy,lR,ldTp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VyscHhJ,jrfmw,EXYv,i,n,HwD,hk,mrDb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SlzXrht,aHyMy,iV,i,KR,SC,hk,TwhvK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SwkzPyr,jWpps,bVnY,i,ZJA,HMXY,lR,Pek,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AkZXmys,zcjHS,,D,iL,mEr,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JzJSknJ,troYa,QMl,i,FN,SC,T,gNv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qGYUtxh,qkqKB,CqC,i,Cme,dYPI,hk,zmDM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XDzpvbO,,bVnY,i,hyz,ev,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SDhyBwf,,mNh,i,k,XOk,hk,NKMB,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vqPzUHc,xTKHz,ez,D,Zi,ev,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IRPIbOE,RnZxv,bVnY,i,mO,dYPI,lR,MPJv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zCUnEfw,OlvsS,yhq,D,RC,kWZ,hk,kdc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WaAPjcU,EnYIx,bVnY,i,O,Xua,hk,rMn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vWCYAkb,uLFqs,yhq,i,RI,fX,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wqgDBMS,,yH,i,FL,RSST,lR,vk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,StkkpmZ,LOUok,CqC,D,oh,Cj,hk,zW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RwWdBEY,pzLPd,gpyD,D,TFX,uECy,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RhcXIyV,NEMaM,yH,i,mO,ev,i,ubP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QSzJchl,LQsok,QMl,i,qh,YO,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,omtwWFA,EwiEs,,D,k,gANm,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fOowaNF,qZkcz,EXYv,D,oMY,uECy,lR,bpdH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sEFMaFh,FjRPe,xDLG,U,iga,WSIq,lR,eNyU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LDjGhqq,CcpoJ,CqC,i,GF,uWTD,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UDTmqMB,ZQGrY,bVnY,i,xk,qyCG,i,ABTJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UDTmqMB,qizlO,,i,xk,IamB,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OnijxFe,,Vj,i,ZJA,gOZx,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DkJGiIG,rGrAE,Vj,D,kWZ,SC,l,rOHv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BhcHjap,ZpqOF,bVnY,i,GF,Kg,lR,OJHG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uBNbatT,PqoAU,jb,i,xk,coyt,lR,vk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cvYcYsK,JFMRC,,i,Kg,lQU,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dvzYeNQ,Toicl,mNh,i,pm,khbX,hk,UGL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fupkZUe,gwGKb,aN,D,hyz,Pif,hk,JjE,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uaOENAO,cIHiV,VsKz,i,dQD,ev,hk,MSh,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rkqssJd,mgoTc,EXYv,D,bf,YO,l,AVMf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SKutQWr,RUGgg,mNh,D,ai,DME,l,GKIQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,okFGipx,jCPPl,,i,FL,xa,hk,mO,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zbyYtRR,sqgrx,iV,D,fr,IamB,hk,gyke,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,funjsAh,teKMc,QMl,i,ZJA,HSL,T,vGLIS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kTcmiWB,ZlpOK,EXYv,i,pm,Pif,l,IMzf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pOJmGjh,CiZAV,,i,JnB,Cj,hk,jgn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iveFibe,,mNh,D,yC,qyCG,hk,hnDNL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PtyLODb,iNRYL,CqC,i,kB,iKG,lR,hCuK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zgxfhkF,OVLEl,CqC,i,Lq,xUk,hk,WLA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QTWeclq,GVQal,CqC,i,GF,,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JJnQDIX,IBgxE,QMl,D,RI,uGF,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qcyidXd,gwGKb,CqC,D,O,IamB,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hjuDCSu,gMbWu,QMl,U,RI,cRzS,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JoNBAYB,Lzxmq,mNh,D,Lq,jBP,hk,YveJJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OikUpuA,Qsayn,mNh,D,sD,hmKv,hk,RDsJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bGmjspF,GwSmH,gpyD,i,Nc,iADy,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hCfnyAj,ZGziF,VsKz,D,JnB,Ri,lR,PBSU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cLZOVsx,wnVGZ,bVnY,D,RI,Kg,lR,RNB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hfBWIRk,cPETG,yH,i,FL,RSST,lR,ZUA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aefItjk,,iV,D,n,TAUy,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,csSdCCi,XctNb,Pcb,D,u,xa,lR,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gGvgRaf,eCWoC,jb,i,mO,edWw,l,BGMV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xxoZJku,RdvaT,yH,U,mO,pf,L,KR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dwAmuWz,laGio,ez,i,BAR,XThn,lR,eFcJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gKJzYvv,UMWCH,mNh,D,iga,yC,lR,zYm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CGXBYra,,xDLG,i,n,Zsbp,hk,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vTDbHtH,nMlTX,,i,FL,jF,lR,EY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EDrMKQM,qSMjB,ez,D,BQ,y,hk,MuXO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yrfrQXW,TZFeB,bVnY,i,xVO,XJb,hk,PrUo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pIxAWVW,,rNcu,i,OmE,Cj,hk,GXfB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,klNLxEs,llHEg,yH,i,IaL,rbp,lR,ESA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iBWHIDL,,LjAS,i,mO,NTj,hk,Lz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ovjHfMa,xwDjL,gpyD,i,hSE,y,lR,O,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dlJrPpn,jPrKo,aN,i,JnB,dYPI,lR,vNY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,goxkbfv,vZyhX,Vj,i,ZJA,pf,hk,AxOz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vDFtOOK,MqSAD,zZe,D,hyz,pf,i,mDzi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SvABjlp,loInS,LDk,i,kdc,dYPI,lR,tNd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CuKcrkQ,gxzDj,QMl,i,GF,SC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HcFlUTZ,gqTIk,CqC,U,n,xa,lR,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IyVCbbX,gFPOL,bVnY,i,Yx,Pmiv,hk,fVe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BbXitdP,XmDvh,LjAS,i,nt,Cj,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DdSsWuS,uVdCT,LjAS,i,sD,,hk,JXg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PwZdibJ,eYjgF,,i,RI,soR,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wCTgjKg,CfjhB,xDLG,i,zz,IamB,i,TfK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fOijsRX,cEpGn,VsKz,i,mO,hmKv,hk,LBR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TuYYnfv,QImNH,Vj,D,JI,hmKv,hk,PCQO,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JQqkFXa,,bVnY,i,KWZ,Mgil,i,TcNq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oUYcEWG,xJzGg,rNcu,i,dQD,dYPI,i,LIa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ADokeWH,dheCD,xDLG,D,pf,uECy,lR,vsLX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DqOBmIl,cdmXU,,D,ZJA,buw,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KaVHiFQ,rAjZw,opm,D,SC,SC,lR,nnlXJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iqqPnrI,gUDiL,ez,i,RC,Cj,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AlYbXNY,,bVnY,D,JI,,hk,Mcs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zZBBNQU,fGTzs,bVnY,i,sa,fX,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eiTfHDA,oJXSu,Gac,i,aW,WNP,hk,Qhv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GzfDQoB,TWnoU,KsKZ,i,FL,,hk,DtLIw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YohkTik,RlMtO,QMl,D,pqp,dYPI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CxXvPKt,knGHh,zZe,i,nt,xa,hk,NLE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eJNdmpr,TDUrZ,mNh,i,Ri,IamB,hk,ddk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lVnNqdE,JjjZb,VsKz,i,ZW,aRnz,lR,LVner,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WhIDNb,gXbuE,mNh,i,k,dYPI,hk,sa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KpDsAP,rSjvT,yhq,i,RI,dYPI,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gNaBnS,RdvaT,LjAS,D,FW,pf,hk,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HaYSaL,,xDLG,i,KR,gANm,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CalBWq,dWsDb,Pcb,i,qh,Kuz,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tmJJNg,CfjhB,,i,zz,,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rHUEiV,nneNb,bVnY,D,xk,RV,hk,pf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CMjmFn,EpSLs,iV,i,RC,dYPI,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gCbGIl,iYqAF,,D,aW,gOZx,lR,EY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HTsukY,XSIPJ,mNh,D,iHi,HSL,hk,sa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xEEiTj,RUGgg,bVnY,i,mO,DME,hk,oKN,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eUzmLP,meLMb,QMl,i,k,ObUn,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ChNsGA,mvxRP,,i,ZJA,Cj,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RAwUqV,kSXVa,CqC,D,Bu,y,lR,lMpJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kssOEl,nDsLz,aN,D,xk,gJq,lR,bsx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OqzQtu,yyEeK,EXYv,U,kWZ,,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zvASjH,CSXEU,bVnY,i,RNB,HaU,hk,TpZX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BfXHos,,aN,U,iga,,i,xApJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nfnhvA,,aN,i,GF,hmKv,lR,QxIG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FQPnXj,rlIdj,zZe,i,pm,RV,lR,SonK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lspCox,,yH,i,na,buw,lR,zcDe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mbXDDp,YhbKG,CqC,i,jF,Kbt,hk,wIw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SGwOki,HGnGo,,i,Kuz,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,blqLfS,TVeAq,mNh,D,n,IamB,hk,XkuJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xuxTKL,,bVnY,D,aE,ZHiH,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DlIJin,qkqKB,Vj,D,ZJA,TGXq,hk,uzLA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HbLhwV,,xDLG,U,mR,uECy,hk,eJNu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UbnkJB,ctSaQ,EXYv,D,sa,Zsbp,hk,jyZs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cGAWgc,,mNh,i,Cme,xa,hk,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VHCihw,DmPDX,yhq,D,oMY,SC,lR,IYVe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,anQGAB,NTvmH,rNcu,i,mO,hmKv,lR,Oeeg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QSWNss,SNYME,,D,mR,uECy,hk,IitEp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kQKdIU,OCsfh,,i,ZW,RV,lR,hcd,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TdXqpb,MMnif,zZe,i,G,gOZx,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FMkNXD,Pwwsw,KsKZ,i,ZJA,,lR,foLHV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PmSzjo,HPfZX,,i,u,HaU,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Raenmk,TttFj,EXYv,i,k,jBP,l,kbJw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jifIls,LvDJh,rNcu,i,kdc,Cj,hk,BLLx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fGTirS,eGUBA,,i,db,YO,hk,desC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YLklhN,nOmkK,VsKz,i,n,,hk,GNSx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xhtWTB,ojeZB,zZe,i,iL,y,lR,tJE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SkDrve,,VsKz,i,yC,Cj,hk,nMgI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QiCIso,hAjyU,VsKz,U,Bu,pf,hk,SIGh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rITRza,nOmkK,bVnY,i,FL,,i,QcT,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xkAfKS,JRxbD,,i,iL,Cj,ri,pk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DZBYhy,GluXQ,ez,D,RI,dYPI,hk,Jcf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ttmkLO,ruKdN,ez,i,mR,uECy,lR,aUhY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XStfLU,DPmbQ,iV,D,Zi,Kg,lR,CAP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZThfqW,soKhL,LjAS,i,oh,KMAv,hk,jtxR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IiZzoe,wKKEM,bVnY,i,qVs,HSL,lR,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AoxhhS,EWegU,bVnY,i,GF,SC,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oxyDAf,qygIq,VsKz,i,u,DME,hk,Blj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gAktRy,EfCkA,QMl,i,GF,gOZx,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ORPdIL,zktNk,bVnY,D,Zi,sWhI,i,cAq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pnFbVz,Pwwsw,VsKz,i,zj,jHBL,hk,Wm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,flqUMD,zxful,mNh,i,RI,QIe,lR,wxG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,emtfZz,DzLhz,bVnY,i,RI,gOZx,i,SC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AJlZQl,FjRPe,QMl,i,pm,khbX,T,ovm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jLkGIt,HGnGo,jb,D,RC,Cj,fU,mCO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jLkGIt,,rNcu,i,RC,aRnz,lR,kNAH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pwaNYz,JjjZb,bVnY,i,Pek,aRnz,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FwWVdR,dGrfN,bVnY,D,Kg,db,lR,os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HaeegH,KowCL,ez,i,Kg,SC,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BrpuYu,MqSAD,zZe,i,OS,buw,i,HWoIz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Yvpvaa,,Vj,D,iL,fAb,lR,joSt,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bhEqsk,KSiMG,VsKz,i,os,pf,hk,vOxw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CMXiEd,fFPdL,mNh,i,iL,y,lR,ytuh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rnnYIN,WEPcu,VsKz,D,FL,Kg,hk,KHP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BPaiUf,uLFqs,zZe,i,FZj,sp,fU,jFI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yiFKSg,LQsok,rNcu,D,mO,YO,l,muUJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BqfAkG,OCBNS,gpyD,i,GF,pf,lR,xFML,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xNQvsF,,mNh,i,k,dYPI,hk,sa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oWwvZw,RWcLO,bVnY,i,zOi,SC,lR,SZMC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,icIkpa,nygpw,,i,zlG,WcDS,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QpwDjO,pxtqQ,iV,i,Bu,Pif,l,TPBt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hqqfNF,EfCkA,iV,i,xk,gOZx,hk,s,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gtoPxW,LnlmR,yhq,i,iga,mwY,lR,ISuH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HwQtOI,bkfcS,VsKz,i,Kg,Wsd,lR,GUUWx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fnglZN,CfjhB,rNcu,i,zz,IamB,l,UhL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eShpPM,,iV,D,k,KGKO,hk,FMW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nYCHiV,ZhLBh,iV,i,u,gOZx,lR,PXI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PqAtPJ,eSjKX,bVnY,i,k,SC,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rJIPfl,nGRDB,rNcu,i,RC,yC,hk,bpCW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ozVvxC,hAjyU,bVnY,i,RI,Bkt,lR,jrqTt,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eIQLch,KORyZ,KsKZ,i,fx,Cj,i,Jvre,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nSnpBc,MOwcE,CqC,i,RC,TAUy,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mxKTLE,jHsOR,VsKz,D,qh,,hk,nWoQf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oFsENC,UcrWb,yhq,D,oen,hmKv,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UmDQpw,APOyk,xDLG,D,mR,tCwq,hk,MbfM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PtQkHN,lvdHr,bVnY,D,xk,IamB,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gSBLFp,tzfdR,CqC,D,oLI,dYPI,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WnSOFR,XNYmw,VsKz,i,SC,ypXm,hk,Blj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uOHdeD,jFAln,xDLG,D,Cj,KtFl,lR,vGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EQXvAH,,QMl,i,k,wnVT,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,djJqHg,qWCxm,bVnY,D,bf,juI,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kzYXCF,NpWJw,gpyD,i,KR,ZDwU,lR,RZc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IoRZbL,XkrIG,zZe,i,iL,dYPI,ri,AmRZd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SRBAKI,Emiva,EXYv,i,JnB,ev,lR,ZhX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jruGJQ,cEpGn,CqC,D,nU,Zsbp,lR,ai,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FfqNHc,tvJzI,QMl,i,GF,db,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Eoiecv,POrHL,CqC,i,n,uECy,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MCPleF,vTSnp,QMl,i,ZKX,ev,T,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LiVJlK,,QMl,i,OS,y,T,pnsRL,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QDqPvX,bqqBR,yhq,D,qVs,uIjX,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uUJtPg,yMDSu,yhq,D,RI,pf,lR,tzuK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Noemzs,vfKUn,iV,i,RC,na,hk,EOKL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,loGykE,SefEe,yH,i,eG,,lR,iWk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cvjVpe,EyKoV,,D,GF,,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Zuyauq,sYTtD,ZQa,D,FL,Kg,lR,ZJA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VulNnR,UcrWb,jb,i,G,hmKv,lR,mDdX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bJIGCY,aHyMy,OYMU,i,iga,SC,hk,JAx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wZxTqy,xUKVK,CqC,i,THd,nT,lR,bwfa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QDxKOZ,kemle,EXYv,D,FN,yGet,hk,gGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yvofWa,TSHJn,zZe,i,vk,lQU,L,TUw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lXytOV,KOJjz,xDLG,i,iL,UpSB,hk,fRt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QcVkSH,UgQaa,CqC,i,os,RV,hk,eOq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uNcRIY,tuGlk,Gac,i,oLI,xa,lR,bfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WIElBG,hYPxv,yhq,i,GF,hhhl,lR,aW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bicVQH,TjJiS,EXYv,D,nt,HSL,hk,rSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gvnuTi,DrkVz,xDLG,i,G,YjrO,lR,YKr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RGtuBd,RVOBZ,EXYv,i,jgn,dYPI,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nOoljR,DXeTv,mNh,i,Zi,pf,hk,QSsiN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DkLlJl,MNqGT,CqC,i,H,xa,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gGFhTQ,hqpMg,Vj,D,GF,y,l,Vomg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sGceIh,pcEak,mNh,D,k,HSL,hk,QPm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cCSkeK,gXbuE,CqC,i,Ri,DcjM,lR,ots,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JgeEkr,DWRev,iV,U,k,DDPD,hk,kWZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wVXBxa,WpMjV,zZe,D,xk,Cj,i,jBP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Xqdnmo,dCdpV,,i,k,xa,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eKZsuN,KKRFI,ez,i,Ri,Cj,i,Rk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,plsySr,GfRLe,Pcb,i,u,pPN,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,igGaZi,SklNG,xDLG,i,xvb,pPN,lR,mhPN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,igGaZi,SMkvw,xDLG,U,iL,cbZ,hk,iED,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kwuDmO,rrGCj,LDk,i,iL,sD,hk,JXPF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TElKtF,mONwL,ez,i,n,zz,hk,PuAr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Dckgwk,XctNb,,i,RC,xa,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RnIkyV,YoxHS,,i,uP,pf,i,rwl,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UwLhSt,tpiKL,yhq,i,aW,Cj,lR,ev,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yrwExV,eRRSf,xDLG,D,iL,y,hk,MbfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LCxDVG,DzgFa,VsKz,i,GF,hmKv,hk,pxPd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FGVTqP,SwPFA,QMl,i,hyz,HSL,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xAgpJx,,LjAS,D,iL,TAUy,hk,WHQgn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HdCMSB,,VsKz,i,KR,ESA,lR,nhCd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NNWyQd,pLuie,,i,dQD,gANm,hk,Jij,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WJiYDI,lTyLf,ez,D,RI,Cj,hk,Jcf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ljWagn,AMRbH,ez,D,bf,Cj,lR,VCji,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XzjpQV,eSjKX,CqC,i,n,lQU,hk,u,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oQquMy,yHmTk,ez,i,bf,Cj,lR,xa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DqjfEc,UcrWb,ez,D,iL,hmKv,hk,jCu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Xpxhec,TrrrN,,i,u,SC,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Keobxn,rGrAE,bVnY,i,RI,SC,lR,ixkK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LekXYk,Aclqz,VsKz,i,fr,zNvM,lR,xqVx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dgRfEl,qgHRF,rNcu,i,iL,xa,lR,vcNu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PzNCur,FPgQL,jb,i,Lq,FvO,lR,dsAu,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dCtYZU,rREKg,iV,i,RC,Mgil,lR,CIWav,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wjvhvZ,SyFMb,LDk,D,aW,Cj,l,sJyy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,veMhCI,FbvHy,CqC,i,sD,HSL,ri,uPSV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tclqti,EfCkA,Pcb,i,u,gOZx,lR,IaL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fxbpKs,UpZhy,EXYv,i,RI,fX,lR,CRn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tAJRnA,pLYXJ,mNh,D,RI,soR,ri,nT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WbcyAs,flLet,gpyD,i,n,,lR,Wu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jQMOMR,pcpoK,VsKz,i,FL,Kg,hk,ZwAa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gxVxVm,KhbOq,Vj,D,GF,pf,lR,XGd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qTamIi,vdUHx,EXYv,D,wGj,pf,l,Xua,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hNKLdw,fFPdL,,i,RC,Cj,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iDqSWu,HrlvU,bVnY,D,LL,hmKv,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tUjljo,fFPdL,yH,i,mO,y,i,MaC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YLGKAU,SXZFT,mNh,D,cZ,buw,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,inFNXZ,UcrWb,bVnY,i,FL,hmKv,lR,EBxS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DCCEsL,yUWuX,KsKZ,i,RI,dYPI,lR,tTD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vFwgGI,tuGlk,aN,i,RI,soR,hk,ibBJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MsmpuL,nJvcN,ez,D,kWZ,YO,i,UQUUE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KydMLf,HrkuK,ez,i,Nc,aRnz,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xLuWLL,RTQUJ,xDLG,i,iL,Cj,lR,qQaD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jqLxZQ,,gpyD,i,GF,rLFy,lR,fbUO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MxVPbU,zSCPS,bVnY,D,G,gI,lR,yf,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gAwBeG,xTKHz,EXYv,i,zlG,ev,lR,ZChYQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eTgVNM,otbME,iV,i,GF,sivO,hk,MvSW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KzsmeM,rrGCj,zZe,D,H,Dgv,hk,FMt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vPiNlz,MNqGT,KsKZ,i,GF,rbp,i,VLUE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JuUrca,RxrUr,,i,mO,DQc,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JZFPsE,nEnLM,ez,D,EF,dYPI,hk,SCSG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OKSIgi,mqZQF,gpyD,i,G,pMmL,lR,O,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LMigmP,UcrWb,jb,i,n,zNvM,lR,vk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,puimUs,Svdoh,EXYv,D,Pek,TBUv,lR,VJxDL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dZlEbs,HaPRU,QMl,i,u,xa,lR,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ocrJMh,JvjXk,KsKZ,D,FN,YO,i,ZkAl,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sUTpsa,yJaHj,ez,i,bf,cmmA,lR,ZRzE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oZgpil,NTvmH,rNcu,U,Zi,hmKv,hk,NLE,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aVjKDj,VIHIi,yhq,D,FMt,oka,lR,FDHHZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QeMqGg,LpQcN,VsKz,D,RI,bnz,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AjbHoV,AXhVB,Pcb,i,u,HSL,hk,fzn,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gbTTPW,,iV,i,RI,FvO,l,CVe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rZdiYd,OPLTY,,i,RC,SC,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ozVXzQ,KWjqE,KsKZ,i,FN,lQU,lR,ynJa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yoeRin,JjCjf,bVnY,i,Ri,gOZx,hk,rSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wBoMFy,ZrkWF,CqC,i,Kg,TAUy,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ojgznB,yMOwe,CqC,i,n,Cj,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nRYyqT,EwHnk,bVnY,i,IaL,Ri,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MWkkrR,zcypH,ez,i,Ri,Cj,ri,bnsy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JoaKrk,teKMc,zZe,i,sa,HSL,l,vuLpZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LnEaIk,gJjvo,xDLG,i,RC,dYPI,lR,YWMQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BKqzwL,olCSu,ez,i,RI,dYPI,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XCPHaf,lHjLY,Vj,i,GF,SC,lR,FtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HTShjC,miwCS,rNcu,i,Nc,Zsbp,lR,muw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pwWUjF,bWJlU,zZe,D,oh,ev,hk,vqRx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QSUtNt,KKRFI,KsKZ,i,Nc,y,lR,jvtu,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AWPIU,teKMc,bVnY,D,RI,HSL,hk,Mcs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ooElW,EWrtg,zZe,i,RI,KCWa,i,rmJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CHQCK,mDidC,VsKz,i,sp,IamB,hk,pTnD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,faCcc,UHjYh,ez,D,RC,SC,lR,iMVhD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UrtEm,XctNb,opm,i,hyz,ZBq,lR,fUN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uIRFL,KoskF,Pcb,i,u,buw,lR,gI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gNTNv,MZzvk,mNh,U,bf,Cj,lR,OqI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BbrDE,UbJjv,Gac,i,ZJA,,i,EXYX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IIEcY,uYWpN,CqC,i,zlG,y,hk,ulS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oEIXW,VINkJ,yhq,D,Kg,ev,lR,AONq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,juhny,uLFqs,ez,D,oLI,sp,lR,wTxMu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Zokrc,oImqv,iV,i,GF,Mgil,i,wKIn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ibXvP,LQsok,CqC,D,sD,YO,hk,DBIy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xwETZ,SxBql,Pcb,D,u,HSL,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DmELK,vCNMH,bVnY,i,eG,uECy,lR,bpdH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jgJTg,hYPxv,gpyD,i,OS,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ylnkq,pRZeB,VsKz,D,RI,HSL,hk,pm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tYRvH,MRVYe,mNh,i,RI,kWZ,lR,Cgwch,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DxoKT,YTckD,Pcb,D,u,sp,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YnvAP,AMEDi,rNcu,i,aW,Cj,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EnylO,KUjsf,Gac,D,k,uWTD,lR,JoJr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZGXUw,miwCS,KsKZ,U,mO,hmKv,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YYpld,lHjLY,VsKz,i,Ep,uECy,hk,yfdI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pDPpi,vTspx,mNh,i,RI,RV,lR,lsSr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OrKLj,jlTWR,bVnY,D,Yx,y,hk,FjjE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EucUv,DnTGD,VsKz,i,jgn,ev,hk,dzfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IKFzh,cdmXU,iV,D,OS,buw,hk,kItM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hQUXW,YEATg,bVnY,i,O,dYPI,hk,aPER,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TFlaP,zWUFs,bVnY,i,ZJA,y,lR,os,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,raXTb,,,i,n,TAUy,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yFvTk,VgLuA,EXYv,i,xk,gOZx,lR,pUYT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JFWuj,SZDsW,rNcu,i,Nc,Cj,lR,qarK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uFHaH,CiZAV,EXYv,D,ZKX,Cj,hk,yH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ymcJt,hKYJZ,zZe,i,Zi,HSL,i,fpTZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uXtul,NHNrT,opm,i,SC,Cj,lR,oLI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Eqfif,CiZAV,ez,i,oLI,Cj,lR,MGSs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Eqfif,pziuA,mNh,D,oLI,xa,lR,cQoj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HWuen,YpuyI,QMl,i,THd,buw,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BoCDL,mvxRP,zZe,i,jF,GWD,i,vbC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WLPKx,vfKUn,bVnY,i,fr,zlG,hk,wjj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JDFPb,HrkuK,,i,Yx,Cj,lR,EY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iBjwA,CgiNm,yH,i,mO,gI,lR,mQk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CjUgM,yFAAH,xDLG,i,n,Zsbp,lR,cozaT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dGdMN,,iV,i,RV,pPN,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pmnZl,IaFdH,xDLG,i,n,YO,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OSbll,LLBPX,iV,i,SC,WMz,hk,Cme,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BNNhV,TDTQo,gpyD,i,os,pf,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LKWjT,tWWFx,yhq,D,mO,jBP,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KbDcO,uEBcZ,CqC,i,exS,DQc,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NCEJe,qkqKB,gpyD,i,ZJA,,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oAUIz,pcEak,EXYv,i,SC,HSL,i,wgPm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qFLiB,czsTS,mNh,i,WLK,yC,hk,QPm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KoIpa,BegRr,,i,RC,Cj,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LZhsw,arWti,bVnY,i,zz,Alg,lR,os,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EDefS,VAVml,mNh,i,RI,Cj,l,lVE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lVBvM,BZlOx,xDLG,i,iL,y,ri,hlPS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CEJRW,qoWGW,bVnY,D,RC,Mcs,lR,zYPf,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,urdcQ,,aN,i,n,xxmj,lR,zUEHL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MZNMv,pziuA,,i,u,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZrevZ,UcrWb,rNcu,i,GF,hmKv,hk,XnA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CmOLa,cPETG,CqC,i,n,IamB,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MtjJA,,VsKz,D,mR,,lR,Mdru,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KQzSi,UbJjv,zZe,D,iL,,hk,Kdq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VzJQB,gujOw,opm,D,SC,YO,lR,pvIEb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lMNCP,VGgQZ,iV,i,zj,LKKI,lR,IMHY,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,efTeH,BPdLH,CqC,i,G,hmKv,lR,aDA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WwyEg,,EXYv,i,pf,nT,lR,jFjcL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lBIUJ,tuGlk,mNh,D,hyz,Bkt,lR,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TYlOA,Omcdr,LjAS,i,iL,Cj,hk,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Oaiif,RdRxf,xDLG,U,kWZ,pf,lR,tBaS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JbqpV,bWEVu,ez,i,bf,Cj,i,Rk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NmEan,jXToa,bVnY,D,sp,rbp,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FlnIh,xTKHz,xDLG,i,zlG,cbZ,lR,tBaS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FFrBY,ZMLHC,,D,nj,SC,hk,mO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OkbXN,gUDiL,QMl,U,GF,y,T,NFu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kKyLA,tuGlk,Pcb,U,u,ZNN,hk,fzn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tCiCN,lHjLY,LDk,i,iL,SC,lR,ino,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cYdmr,LQsok,,i,Nc,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tEgIk,hQGku,,D,ZUA,pf,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gMKTs,gCAcv,gpyD,i,aW,yC,ri,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nwRak,rSlec,yhq,i,mR,ZNN,lR,VTna,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GOSDG,SefEe,bVnY,i,eG,DME,hk,FjLHj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mBZkt,UpZhy,Gac,i,YO,pf,hk,fxOxB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BGfom,DJSDE,,U,u,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bNeXR,DEdsD,CqC,i,xvb,rSZ,hk,RoZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YhVpv,nOmkK,VsKz,D,n,,l,BnI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zfOqF,QImNH,CqC,D,n,,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,diZUs,rWGPS,jb,U,vk,bf,l,ydJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yHGpV,pKgAU,CqC,i,KR,,hk,ZYW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aKLYa,jkNiR,LDk,i,iL,db,lR,UVe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BicZL,,Pcb,i,u,IamB,lR,IaL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wGeLG,mDfiz,xDLG,i,ZW,xa,i,WQGx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZcCsF,yQnHf,xDLG,U,GF,,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oAJYT,soKhL,Gac,i,RI,KMAv,hk,rmISQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kczyQ,UcrWb,mNh,i,Cme,IamB,lR,XNFf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Cgwch,vdUHx,iV,i,GF,SC,hk,LihB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,znfpf,rmISQ,Vj,D,KR,Ri,lR,nSjc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EXram,Smrjj,bVnY,i,FMt,LHS,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fhDFk,yJaHj,yhq,D,iL,kXlV,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CxfKZ,ClwEM,bVnY,i,eG,SC,hk,mZHEo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XOyWw,QbFYx,EXYv,i,eG,xa,hk,NYEL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bYdQE,ivYgu,bVnY,U,vk,Cj,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rFXYR,WeZTY,yhq,D,IaL,hmKv,lR,GMrV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cpWGI,iNrsg,gpyD,i,FN,uWTD,lR,VSL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UlsTA,uYWpN,OYMU,i,ZKX,SC,hk,Yx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ozuud,,gpyD,i,RC,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MTdYm,cLImw,VsKz,i,RI,gJq,lR,xa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oiaNx,NBYLm,LDk,i,iL,HSL,lR,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mvxRP,UriEN,LjAS,i,ZJA,pf,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ecokc,VONBE,yhq,i,oh,uGF,lR,ev,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QUjYe,ujyjw,VsKz,i,RI,IamB,lR,ygqOS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vOwgq,mtJJa,rNcu,i,xk,Zsbp,l,Svsx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YLfgi,czfPl,LDk,i,eG,YO,lR,RNB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wwFAY,ZIxJx,LDk,i,iL,vJwx,lR,QGYOm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AWvuE,kemle,bVnY,U,RI,RSST,lR,os,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,baHIi,ZtlYH,Pcb,i,u,sWhI,lR,ywB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KrXCx,LETzR,LjAS,i,Kg,ZBq,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QjopT,unSeK,xDLG,i,ZW,rbp,lR,Jaosn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tofrx,NkWvB,VsKz,i,iL,WKX,hk,SjX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sMTXB,oQByA,zZe,i,k,Kuz,lR,jqBw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KqUMD,,EXYv,D,eG,,lR,wJKs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HQblg,,mNh,i,cfU,,lR,lPyn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TQCIz,VONBE,iV,i,n,XJb,hk,rZsma,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CuRMu,DzgFa,yH,D,u,hmKv,lR,ueD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cLXuh,qgWye,rNcu,i,Lz,Kg,lR,NLE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rTdWX,yQnHf,xDLG,i,iL,aUhF,lR,UIZX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PDUZQ,eCskn,,D,jF,LKKI,lR,Rse,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PDUZQ,ExzYp,CqC,i,jF,oDHw,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DZvaN,fQNSn,bVnY,i,G,Bkt,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wxXKG,MTdYm,Pcb,D,mR,pf,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,onUHL,mGUGe,jb,D,qh,,i,LWek,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SDHxi,qkqKB,gpyD,i,GF,dYPI,hk,Prq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rDFFA,UpZhy,bVnY,i,k,fX,lR,Yx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LXChq,EOhNc,zZe,i,fr,HSL,i,XBS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BFPNL,wuIBI,zZe,i,db,YO,lR,qCw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eYOOp,MMnif,mNh,D,RI,gOZx,lR,xXyQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WMrFi,UriEN,Gac,D,iL,y,l,zhNe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xgzCD,jHsOR,EXYv,i,k,Cj,hk,yyik,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HRSub,lCcsW,mNh,D,RI,Zsbp,l,hpov,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EJfjH,eqCpQ,,i,iL,ZDwU,ri,FnBQq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yhBSH,FoiOQ,Pcb,i,nt,aRnz,lR,OeB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HiTxT,eYjgF,mNh,i,Cme,jF,lR,xSAQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EwiEs,bWEVu,bVnY,i,cZ,Cj,lR,Yvv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iSgkr,KoskF,Pcb,D,iL,HwD,hk,BimO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WUUUY,MMnif,gpyD,i,os,gOZx,lR,VeN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gzkZW,kGWYq,,D,iL,Cj,hk,LfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eCSmJ,UriEN,zZe,i,zW,pf,ri,tPYaj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Hrgeb,wXtSg,VsKz,i,u,Cj,hk,nbOQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bxdkE,GYSvM,zZe,i,RC,fX,hk,sqm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,MdVSr,rNcu,i,RC,,lR,TuOE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xiUpu,QZyBk,KsKZ,i,RI,ev,i,OpTS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sqgrx,AXhVB,Gac,D,wGj,Mcs,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ycGlF,eIJDE,LjAS,i,k,YO,hk,JXg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HuhRm,kSXVa,CqC,U,jgn,RV,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XPxVp,lXZjU,xDLG,i,iL,RxF,hk,Os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lxNau,Uoaco,iV,i,iL,FXZ,hk,inX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MMnif,YoxHS,,D,FZj,YO,i,RJS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rREKg,bvupa,rNcu,D,zj,Kg,fU,PPaD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CtqGL,GwSmH,LDk,D,Ds,IamB,ri,LRN,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DJBu,JGooX,Gac,i,iL,nT,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CRBs,MjBim,EXYv,D,u,gOZx,hk,Cwi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wtRh,IreqV,LDk,i,ai,Kg,hk,OS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,anIP,uoWAj,Vj,i,k,YO,L,SxRt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jVhY,yHmTk,ez,D,uP,dYPI,hk,Lq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qJOY,aHyMy,VsKz,i,n,SC,lR,mVP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mAJw,vfKUn,CqC,i,Pek,gI,lR,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hTez,jJOWz,bVnY,i,GF,fX,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SOVl,wzUcv,ZQa,i,zz,yC,lR,ZJA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hYOl,qcEhj,,D,u,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UpDY,pzLPd,xDLG,U,os,uECy,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sSLt,MBsTd,VsKz,D,xVO,y,lR,UVN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,srWJ,oRdwp,EXYv,D,sa,hmKv,lR,OeB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ezzo,yDaUW,ez,D,nt,Cj,lR,FeM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uExF,yOhXn,,i,u,pf,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aPMI,TDUrZ,,i,iL,KCWa,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Laxg,zpINo,VsKz,i,u,Kg,hk,PFGZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ekdP,oBwBc,bVnY,D,k,Cj,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kJrZ,pfJkN,,D,u,SC,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kqtm,,mNh,D,Cme,HMXY,lR,yRNM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qNQa,CbutI,iV,i,xk,FvO,lR,iaMC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Dgyp,nDsLz,bVnY,D,YO,SC,hk,dvQI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZcbG,OirYD,EXYv,D,iL,gOZx,hk,SBLF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xgTI,PsXzz,CqC,i,n,SC,hk,MWL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sXtp,mZcIF,,D,aW,y,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YZwJ,ecdAc,bVnY,i,pf,zI,lR,RNB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Oqan,qPmqU,bVnY,D,GF,Kbt,lR,RNB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lPfR,DNkZz,zZe,D,OS,zz,lR,sqm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CbhT,gUDiL,iV,D,G,y,hk,YyAEx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gaLR,SEtRV,xDLG,i,Ld,mEr,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zSsD,cEpGn,rNcu,i,RC,Zsbp,lR,DTMbh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GmRn,JpXCs,Pcb,i,kdc,pf,fU,MAI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nCHZ,VONBE,bVnY,i,RI,nT,hk,vIvA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gCfg,MiuKF,ez,U,RI,hmKv,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gCfg,GzWeI,mNh,i,RI,Wsd,hk,wYtr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qMpk,BFkyu,mNh,D,iL,aPt,hk,OvN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hSSZ,OcAPt,,i,iL,TAUy,ri,wep,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hSSZ,,LDk,i,iL,TAUy,lR,mO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xvDO,XeDef,xDLG,U,ZUA,HaU,ri,zlb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aWFs,NOfKN,Pcb,D,NHX,lQU,hk,nWoQf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Gmns,,zZe,i,nT,xxmj,hk,OvdA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KlTK,JjjZb,EXYv,D,oh,aRnz,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mJAj,UriEN,CqC,i,H,pf,hk,WLA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IGol,YEATg,jb,D,FL,dYPI,i,RVFP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QxSF,oBwBc,iV,i,SC,Cj,hk,jNro,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QMqE,nHVgM,VsKz,i,zj,WNP,hk,lUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fFiA,,iV,i,iL,gOZx,lR,XcWC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,elei,mONwL,mNh,D,Yx,Mcs,hk,lxg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bHfV,QZyBk,Vj,D,ZJA,ev,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,foeF,ZOSBD,,i,iL,OxU,ri,WQGx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rCiI,ruKdN,LjAS,D,iL,uECy,lR,wfYS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SqXq,RUGgg,OYMU,i,oLI,zz,i,nxSV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZUTU,Jgzfx,xDLG,D,Cj,Pmiv,hk,KuEM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pbdI,dheCD,iV,U,iL,uECy,lR,JVF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tHQI,oWoZd,EXYv,i,kWZ,hmKv,lR,ved,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aaUh,VTbsV,Pcb,i,qh,xa,lR,ETZD,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KzAi,doIEg,,i,RC,SC,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mOHj,frgYp,gpyD,i,os,YO,lR,O,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ismn,gUDiL,xDLG,D,iL,y,hk,Os,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MaqZ,TJiHX,xDLG,i,iL,etS,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XKeB,teKMc,opm,D,OS,etS,hk,rXnhf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wPrq,teKMc,mNh,i,nT,xa,hk,jiwaL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,njif,ujyjw,iV,i,n,IamB,hk,kWZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xvny,cIjgf,rNcu,D,RI,gI,lR,QFU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dMqe,rrdcH,,i,u,xa,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fnMx,tZmRz,,D,xk,gI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PdVA,vdUHx,zZe,i,n,YO,hk,JtIjG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,awBT,KWvNC,gpyD,i,G,Zsbp,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iQWm,fYjsV,xDLG,i,RC,Pmiv,hk,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RNRY,DnPCF,xDLG,U,mR,LfH,hk,nZS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YxVA,jQwom,CqC,i,nT,dYPI,hk,wKAqU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jiBD,Ityeg,xDLG,i,iL,Xua,lR,rdku,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qjvj,aEyaA,iV,i,zOi,cbZ,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kPFm,ivYgu,xDLG,U,iL,XJb,lR,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nMxp,ponOy,VsKz,D,iL,pPN,hk,Mhu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XThn,dgVKx,ez,i,ss,pf,hk,DzgFa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gVmE,Gjomx,xDLG,i,Cj,TBUv,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JiQK,PwNjw,ez,i,bf,dYPI,lR,CDGXO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,foVe,ESRiE,xDLG,i,iL,Vvh,hk,xEm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QDrY,MBsTd,EXYv,D,bf,Cj,i,lmR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,alkP,NHNrT,,U,Cj,iADy,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,grXI,GmokZ,CqC,i,s,y,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GMty,bsDLo,,i,EF,Cj,lR,cZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pGtq,jCPPl,xDLG,i,iL,jF,hk,YKr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BodV,AraPt,EXYv,D,RC,MpP,lR,YXCdm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gYDT,AXhVB,,D,vk,SC,i,kAe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fjdV,UcrWb,gpyD,D,vk,IamB,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnIZ,alpkt,iV,i,RC,qyCG,hk,OBmh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IAFe,ZSjJg,VsKz,D,RC,y,i,aEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Fzmo,oYBqD,EXYv,i,iL,Bkt,hk,Cwi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eJDM,diapp,CqC,D,jF,pf,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pchp,IxNhu,gpyD,D,vk,hmKv,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wbhL,jBtmc,rNcu,i,zj,SC,i,eag,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Kedk,UHjYh,LDk,D,aW,xa,lR,CUp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OYek,HqZYe,jb,i,RC,SC,lR,vk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xWws,dGrfN,VsKz,i,pk,db,lR,hiS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZBQt,nMlTX,mNh,D,xk,YO,hk,dcu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vExd,QImNH,CqC,i,KR,,hk,xIV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bjUm,,LjAS,i,cfU,YO,hk,ROzu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hnGF,aEQZY,bVnY,i,Kuz,sWhI,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pzri,MMDPh,ZQa,i,RC,jBP,i,NcAY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bYYU,rRywf,yhq,i,yH,oYAx,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,moLJ,QtwOl,rNcu,D,os,ev,lR,VLfa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fXzA,puepy,aN,i,G,aRnz,hk,MTP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hevZ,oBwBc,zZe,i,mR,kPj,hk,Kdq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VcKi,erQTG,xDLG,i,BfM,dYPI,i,qpO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VxeN,gOXsw,ez,D,ss,pf,l,rOw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eFnb,pVwfb,jb,i,nt,YO,lR,vk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jCEm,cEpGn,CqC,i,k,Zsbp,lR,ajVx,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FLff,FZrSq,gpyD,i,n,SC,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mIPn,fFPdL,xDLG,i,iL,MAI,hk,iED,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UKSK,ojRHc,,i,iL,Wsd,ri,wep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RAiK,zpINo,EXYv,D,xk,sp,hk,pVjzS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mzWw,mWKTs,yhq,i,GF,pf,i,eG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MOrF,uYWpN,ez,D,iL,fAb,hk,iYc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MOrF,,Vj,D,iL,fAb,T,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vUDV,mQRQX,aN,i,KR,sEF,hk,lssv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hKxo,CQVvq,,D,zj,Cj,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fIUd,pziuA,xDLG,i,iL,aRnz,hk,rdku,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VuiT,uLFqs,LjAS,i,iL,ZKX,ri,beBt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,phMr,fYjsV,xDLG,i,iL,GF,ri,Ycx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mLpI,kEFeM,iV,i,n,YjrO,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ElFW,qwbvG,Gac,i,iL,FvO,lR,cBFp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hHpR,,LjAS,D,Os,pf,lR,WOrB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wrcr,LdGeV,gpyD,i,dQD,Kuz,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YLNH,woFEW,ZQa,D,RI,Cj,lR,ZJA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UbxD,OTmTL,LjAS,i,RC,Cj,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SZMC,RqRZJ,opm,D,iL,rbp,lR,jVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iXrH,hQGku,LDk,i,iL,Wsd,lR,VToF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ftkp,eSjKX,iV,D,iL,lVH,i,XEC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lmAx,PwNjw,rNcu,i,xk,vrEy,lR,NJgAv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LyYw,kFmnB,VsKz,i,n,gOZx,i,toBK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bwzZ,auWsL,Vj,D,os,pf,l,OsBO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZIfo,wwFAY,ez,D,iL,SC,ri,eVfK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EZhL,kfqKW,,i,iL,SC,ri,UzUx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NpKZ,teKMc,,U,iL,HSL,ri,Ndmc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GGQe,rZIlM,,U,Kuz,,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yiJt,ClwEM,,i,iL,eQE,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jmnu,ojeZB,opm,i,hyz,ev,T,kAWH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HCsg,bWJlU,rNcu,i,iL,ev,l,hqFZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GOki,bLoPy,xDLG,i,iL,fX,hk,iED,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GOki,BFkyu,ez,i,iL,fX,hk,cuQZf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sYkX,ERiHU,zZe,i,iL,Cj,hk,db,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pBoC,OldBm,xDLG,i,iL,FvO,ri,Ycx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mhRt,hpCAn,QMl,i,zj,hmKv,T,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aXhw,DzLhz,OYMU,i,pk,gOZx,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yxeI,ERiHU,xDLG,D,iL,xa,hk,zYm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kmdR,YoxHS,yhq,i,iL,xa,lR,KUVt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,drjf,ClwEM,yhq,i,pf,SC,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FtxE,BSAII,,i,RI,dYPI,lR,Stwq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oedy,Zfmak,ez,i,RI,SC,hk,cUiu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oedy,jHsOR,ez,i,RI,gI,hk,Jcf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oedy,yJaHj,ez,i,RI,dYPI,hk,Jcf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tAhW,NrqKu,LDk,i,aW,Cj,hk,EZR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BtcT,qSpYs,bVnY,i,ZJA,rbp,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fpTZ,hpCAn,CqC,i,G,zNvM,hk,zj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,rRbDE,VsKz,D,zj,hmKv,lR,zoUR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,QImNH,iV,i,zj,hmKv,hk,kOhcZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GiBD,VIHIi,CqC,i,n,oka,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NscT,DrkVz,CqC,i,Lq,blEU,hk,iMoe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GHPI,ogMgS,aN,i,GF,NuYc,lR,wjcz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZHst,aRalA,rNcu,i,RC,zNvM,lR,pYD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TuxH,hQGku,xDLG,D,iL,RV,ri,fRt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hHJi,LQsok,iV,i,iL,YO,L,rEzo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GRny,MqBVD,CqC,i,exS,Cj,lR,hzNl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dBTJ,PkDWB,bVnY,U,RC,Cj,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eXws,ZtEgU,bVnY,i,RC,y,lR,sbQR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FAQs,vZyhX,EXYv,D,sp,pf,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pGYB,MiuKF,LjAS,D,mR,hmKv,lR,NLE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XZQs,aRalA,VsKz,i,iL,qyCG,hk,lMBxo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zRrf,vdUHx,EXYv,i,fr,SC,lR,RFBt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YIdC,NDihW,CqC,i,Kg,y,hk,NwKeO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jnbh,rGrAE,aN,D,GF,zI,lR,kZdV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SlnT,rXnhf,xDLG,D,nt,gI,lR,jF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VOYe,,mNh,D,RC,MbYh,hk,cIgt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gEWS,TDUrZ,bVnY,i,RC,IamB,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vZrJ,OTmTL,CqC,i,G,rbp,hk,qh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vZrJ,DJjeH,CqC,i,G,rbp,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Evhp,frgYp,,i,gI,pf,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RsFU,hAjyU,CqC,i,H,Bkt,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qOFh,vdUHx,yhq,i,H,zlG,lR,qMBg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VLKL,wxHDm,zZe,i,Ri,Cj,lR,qsr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rEcM,EOhNc,Vj,i,n,na,hk,xdc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TyCx,BCbXo,VsKz,i,Bu,HSL,hk,OfxbV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhus,xTKHz,rNcu,i,EF,Cj,fU,nBBc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhus,wDZsl,,i,EF,hmKv,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zhus,aGAzh,iV,U,EF,hmKv,lR,DLtpg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cPRI,,EXYv,i,nt,dYPI,lR,RNB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,egYm,YEATg,ez,D,nt,dYPI,lR,gudI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FDsv,hlcVp,zZe,D,Kg,Cj,i,SlnT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vIvA,yHmTk,ez,D,bf,Cj,lR,ahRz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UdXx,olCSu,yhq,U,zj,dYPI,lR,yaEX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UdXx,rYFYY,VsKz,U,zj,cmmA,hk,PpIy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Cvrp,hAjyU,gpyD,i,GF,Bkt,lR,YMmlq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Cvrp,zTnre,gpyD,i,GF,Nc,lR,XEY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nUHA,RafCL,,D,RI,Cj,lR,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JblB,ZtEgU,opm,i,OS,y,lR,smlr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gYfF,MMnif,zZe,i,G,gOZx,hk,UXK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gYfF,pzLPd,yhq,U,G,uECy,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QIfF,MWxHT,iV,i,G,xa,lR,Vja,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QIfF,gnAmj,,i,G,yC,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QIfF,LdGeV,CqC,i,G,yC,lR,ZBq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QJMa,qizlO,zZe,i,H,euzb,hk,IUE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,trSd,AlBOA,xDLG,D,k,uIjX,lR,DME,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,trSd,pfJkN,Pcb,i,k,RV,fU,Xnrz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,trSd,JpXCs,rNcu,U,k,RV,lR,QFU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UuSD,,VsKz,i,G,hmKv,lR,VnG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SyNu,DnPCF,zZe,D,xk,WNP,lR,RgLz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,turM,GASSD,xDLG,D,OS,huQM,lR,KHpBY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wrpC,ZIelK,CqC,i,KR,nT,lR,bwfa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Bmfa,DJjeH,CqC,i,FL,iADy,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MiAG,tSFml,gpyD,i,IaL,hhhl,lR,BIg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xwMl,PwNjw,ez,i,Cme,IamB,i,kjeO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xwMl,gXbuE,mNh,i,Cme,pBlc,T,wDZT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,AMEDi,EXYv,D,k,Cj,lR,UcPt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,AMEDi,zZe,i,k,Cj,i,htzX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uzqf,Rkjyt,rNcu,i,RC,dYPI,lR,qcGd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uzqf,,VsKz,D,RC,gRTo,lR,hKxo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,THfE,oGiPf,rNcu,i,RC,Cj,fU,xjHD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IFlE,,LjAS,D,GF,gI,hk,aE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YlIz,GCXEW,CqC,i,H,aRnz,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DTjs,fFPdL,gpyD,U,os,pf,lR,nagT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Thpg,nGRDB,VsKz,i,GF,yC,lR,HnAv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Thpg,eNaFI,VsKz,i,GF,,hk,QnaSk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Thpg,gJjvo,KsKZ,i,GF,dYPI,hk,REu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AOuT,jCPPl,,D,y,YO,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Oyzi,,iV,i,GF,blEU,hk,VNWj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bfeu,,,i,RC,Cj,l,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LioW,teKMc,CqC,i,jgn,HSL,hk,vUjm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WwAX,xBXwQ,jb,i,H,sp,lR,tmUK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sIOm,rIGNa,aN,D,GF,dYPI,lR,ihe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sIOm,iVxig,,i,GF,uECy,hk,jQT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lsSr,LuqXV,,i,zj,Cj,lR,cZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lsSr,hQOsJ,,i,zj,Cj,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lsSr,vgBfw,,U,zj,dYPI,hk,bXj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JWQu,kEKkc,EXYv,D,k,Cj,i,mFvL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hmlu,MSYpZ,bVnY,i,RC,DME,i,zpY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IVql,nXlTa,QMl,i,mO,pgG,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XUlI,VONBE,anf,i,Ld,nT,ri,SaMuF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nxUa,hpCAn,,D,EF,RSST,lR,RyV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UVZb,dgPQa,xDLG,i,OS,buw,lR,tHQI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JRbO,tGvIu,Vj,i,G,dYPI,i,zpQJx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LWMt,LQsok,jb,i,qh,YO,lR,wcBv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vbOF,JcwFP,bVnY,i,n,IamB,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vbOF,gUDiL,aN,i,n,y,hk,WDnb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DEOq,GGQdy,bVnY,D,G,dYPI,lR,fhXLt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BryE,yawhC,zZe,i,GF,,lR,vtyj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jUJj,QlLCW,CqC,D,Bu,,lR,Ep,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xZlc,eBwwX,CqC,i,y,YjrO,lR,dQD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,twkC,lCTjw,KsKZ,i,FN,zI,hk,OEJz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,gUDiL,iV,i,FN,Cj,hk,fHv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,GDIAH,KsKZ,D,FN,pf,lR,tTD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,LQsok,rNcu,D,FN,Cj,lR,YyNo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,LyFOT,,i,FN,dYPI,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,iNrsg,gpyD,i,FN,uWTD,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fwdx,zPWJZ,rNcu,i,RC,Cj,hk,FqO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fwdx,UZasF,CqC,D,RC,cmmA,hk,eOq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rEIi,gqTIk,,i,RC,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lSkB,hYPxv,CqC,i,G,SC,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pChe,rDrRw,CqC,D,G,qPkd,hk,UpK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pChe,lFzoj,CqC,i,G,sp,hk,DRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lmdj,cEpGn,LDk,i,iL,Zsbp,hk,jCu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zsqJ,ntMiQ,,U,os,nT,lR,Kuz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,FusKs,,i,FN,y,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,NTxZW,,i,FN,,lR,Kuz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nTcS,GwSmH,,D,os,hmKv,l,dssL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,DSmqH,Vj,D,n,VyBk,hk,PnGv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,vZyhX,CqC,i,os,Cj,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,rBXlN,aN,i,os,pBlc,lR,felL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,mtJJa,gpyD,i,os,Zsbp,lR,cBC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHyG,ESRiE,VsKz,i,GF,,hk,RyC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHyG,TrvhI,yhq,i,GF,yH,lR,vBXjT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHyG,,rNcu,i,GF,tOJv,lR,hQYc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHyG,,,i,GF,,ri,Rsl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEey,zmNmK,gpyD,i,GF,kKdn,hk,tDr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEey,,gpyD,U,GF,,lR,knL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,pRZeB,zZe,i,GF,MBL,i,lkmA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,shJZw,CqC,i,GF,toNi,hk,fVxzj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,iJbpT,EXYv,U,GF,,hk,fRqr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,lTyLf,gpyD,i,GF,gOZx,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NGtfc,,D,SC,GES,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vBYVt,,D,n,eFx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LSBHo,xDLG,i,SC,sD,hk,aPt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wgrJM,,i,RI,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CLIsW,Gac,i,SC,rbp,lR,BRNh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QFJwa,,i,FMt,xa,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gOXsw,Pcb,i,wGj,aZ,hk,CRpA,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wFCfO,,D,pqp,IamB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nTqHm,mNh,i,sD,RV,hk,Pe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nTqHm,,i,n,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gtyRC,mNh,D,pm,SC,hk,DgqBM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EpSLs,,i,oLI,gOZx,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HplMy,rNcu,i,Kg,NeG,hk,Jrba,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YgPxP,mNh,i,pqp,xa,hk,HKALL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZNLhJ,QMl,D,iga,IamB,T,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yeZks,bVnY,D,FMt,Bkt,i,kZJE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,bYdQE,yH,i,FL,yC,lR,dJCoY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VGgQZ,,i,n,LKKI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JMFQN,,i,kWZ,Rfp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,iLTFH,,i,u,aRnz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pnejQ,EXYv,D,RI,zNvM,hk,Knk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hoyPK,,i,FMt,Lmvq,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Aclqz,QMl,i,GF,zNvM,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rRbDE,opm,i,hyz,hmKv,hk,CSg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,eOvKA,,i,n,YO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MiuKF,VsKz,D,vk,hmKv,lR,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GwSmH,xDLG,i,RC,hmKv,hk,ZW,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,unoLA,opm,D,RyV,tOJv,hk,uirX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nhbOK,jb,D,vk,jmef,lR,ESA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AXhVB,bVnY,i,exS,yH,i,pfq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XmDvh,mNh,D,ZKX,RV,l,XkuJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YZLUv,opm,D,PF,RV,i,ZSyD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DXeTv,mNh,i,pm,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vdUHx,gpyD,i,Lz,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yMDSu,,i,FN,pf,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RdvaT,xDLG,i,mR,pf,lR,kNK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,dshrz,EXYv,i,GF,pPN,lR,Hpaz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zOpXm,CqC,i,y,sp,lR,iFk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,uLFqs,bVnY,D,vk,sp,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GzVaO,,i,FN,fX,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Jbwep,Gac,D,wGj,buw,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Jbwep,,D,vk,SC,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ponOy,ez,i,ZKX,mwY,hk,dzfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LiFpo,KsKZ,i,FN,HaU,l,fX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,woFEW,gpyD,D,k,HaU,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jIXPf,,D,hyz,ev,l,JWS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FPgQL,iV,D,zj,ev,L,GJQU,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,uYWpN,CqC,i,GF,pf,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zfzpe,,i,TFX,pf,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tvJzI,,i,Cj,ev,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zLfaS,,U,sD,Cj,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hKYJZ,,i,RC,sp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ClwEM,LDk,D,BQ,hvW,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,eUwwX,mNh,i,Ri,y,hk,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EwHnk,,D,pm,eQE,L,k,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mxPzj,VsKz,i,FL,aRnz,hk,Wm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oxvWf,,i,OS,GES,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cInLV,gpyD,U,os,Kuz,lR,cBC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jHsOR,yhq,i,Zi,xa,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jHsOR,zZe,i,Ri,Cj,hk,UZP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,alMCl,,U,cfU,sp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,bWEVu,LjAS,D,Kdq,ev,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,bWEVu,ez,i,k,Cj,hk,NHX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,PHCFJ,,D,uP,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DNkZz,,D,Ri,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JdEOh,iV,i,aW,sp,lR,TCmm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NEMaM,Vj,D,IaL,Cj,lR,cCg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jrPjI,LjAS,D,u,pf,hk,qVz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OCBNS,zZe,i,THd,mwY,hk,yTqEG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tWWFx,yhq,i,wGj,pf,lR,fvC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tWWFx,,D,hyz,XLQ,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ivYgu,,i,n,zz,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,kZLDZ,rNcu,i,RV,sEF,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hQGku,,i,RC,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HsZBB,,D,,Wsd,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ilzOu,zZe,i,Zi,mwY,fU,jFI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,teKMc,xDLG,D,mR,Kg,lR,kNK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CDTkR,QMl,i,Kg,HSL,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DJSDE,Pcb,D,u,WMz,lR,zTLl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JGooX,Gac,D,SC,nT,hk,WXhaW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UriEN,iV,i,ZW,aRnz,lR,zvFx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,diapp,,D,Cj,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,asWka,xDLG,D,ZW,aRnz,hk,qZaU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aBMem,ez,D,eG,y,i,gGyJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,dtobc,EXYv,D,nj,Cj,lR,CRn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,kBvrH,rNcu,i,wGj,pf,hk,VYK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HGnGo,Gac,i,aW,y,hk,FPAy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VwkYy,yH,i,FL,Kbt,lR,jKWj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Fbzqh,opm,i,hyz,ZcH,T,SjdL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YWEVU,Pcb,i,u,OxU,lR,zTLl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VLgQz,yhq,D,mR,Wsd,i,qNG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JFMRC,LjAS,i,wGj,MAI,lR,RC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FVyoD,,i,sD,xa,hk,fr,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aHyMy,Vj,D,xk,SC,i,EF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NLAAP,,i,Lq,SC,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pehkw,,i,KR,kzU,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pehkw,,i,Ep,Cj,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LzlHg,KsKZ,D,RI,hmKv,lR,dzQs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LJytA,,i,u,SC,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,buQGw,iV,D,YO,pqp,hk,xKSG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LETzR,bVnY,i,FMt,rbp,lR,IXD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,IzCjJ,VsKz,i,Ld,Pif,hk,dshrz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RGitv,,i,sD,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BFkyu,LjAS,D,mR,aQj,hk,wIc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BFkyu,,D,nT,aPt,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oEeyL,gpyD,D,n,aPt,lR,WFD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Tnycz,mNh,i,Yx,gI,hk,sa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SklNG,zZe,i,nt,kWZ,hk,NLE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xxNrq,EXYv,U,xk,Cj,lR,wrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zLIpF,mNh,D,Yx,xa,hk,Qzxl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ygneZ,LjAS,D,u,rSZ,ri,jFciZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ygneZ,,i,FMt,zz,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jfQnw,zZe,D,xk,zz,i,SlnT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vZyhX,,i,vk,Cj,l,aiR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,INdJw,EXYv,i,RI,Cj,lR,Fpo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,eKNig,Gac,i,hI,ev,ri,RavHe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HRIhN,Pcb,D,qh,rSZ,lR,mqFZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RLNYl,Pcb,i,u,yC,lR,iyfc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nMlTX,QMl,D,oh,SC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XctNb,CqC,U,sD,xa,lR,mO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yklOt,LjAS,U,oh,rbp,l,muW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ERiHU,,i,iL,aRnz,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nJvcN,,i,zlG,bf,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,baHIi,ez,i,bf,xa,i,jXQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LQsok,xDLG,D,exS,rbp,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LQsok,,U,pm,Kg,hk,XmSj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rGzDb,,D,GF,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rGzDb,,D,iL,y,ri,wep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mgoTc,bVnY,i,k,y,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OWAxl,QMl,U,RI,Kg,T,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QbFYx,ez,D,bf,YO,lR,Srkn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,knGHh,rNcu,i,eG,YO,l,aWw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mWKTs,iV,i,kWZ,SC,l,UVe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fIVqL,yhq,i,FZj,,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fIVqL,,i,GF,Bkt,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fIVqL,,D,RI,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xZsRI,QMl,i,KWZ,kWZ,T,QmK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mGlPu,yhq,D,Kdq,dYPI,hk,ANcE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VgLuA,,i,Ri,gOZx,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Znqlh,ez,i,ZKX,DgcM,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zrCXG,,i,jF,DDPD,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zTnre,KsKZ,D,SC,YO,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KKSVd,iV,i,k,,hk,jLkW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RlMtO,mNh,i,cfU,uIjX,hk,aKlA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xFQLL,,D,n,ojoW,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yCTcT,opm,U,hyz,nHdH,hk,ZUD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tGvIu,,i,uP,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SOcKk,,i,u,WcDS,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pLuie,,D,ZW,qgNx,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Toicl,ez,U,oh,,i,QKIT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qSMjB,,D,PF,hmKv,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SAndf,xDLG,D,nj,,lR,mKDi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Pjqcv,bVnY,i,mO,,lR,MPJv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wZRHl,VsKz,D,YO,fNfp,hk,tTTp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jPrKo,,D,RI,cRzS,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xJzGg,,i,n,dYPI,i,msr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XigoJ,mNh,i,RI,QhZm,lR,cgPn,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ESevc,,U,O,dYPI,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gFPOL,mNh,D,pm,tCwq,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nOmkK,,D,KR,dbdK,ri,Frn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GzDaR,mNh,i,JnB,Cj,i,gXll,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FfYGz,OYMU,U,Cj,tCwq,lR,eUiF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vflvs,yhq,D,TGR,Zsbp,lR,gUP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vflvs,,i,n,Zsbp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aGAzh,,D,BQ,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oWoZd,bVnY,i,uP,zNvM,hk,RpZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oWoZd,QMl,i,RI,hmKv,T,BAR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SefEe,rNcu,i,FN,qyCG,l,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SefEe,Gac,D,YO,hmKv,oA,wGj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QImNH,,i,FN,zNvM,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,OcAPt,VsKz,i,vk,TAUy,lR,xvb,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,miwCS,VsKz,D,FL,UpSB,hk,BfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,miwCS,zZe,D,kWZ,,lR,MABT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KyEGN,,i,ZKX,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KOJjz,VsKz,D,hSE,,hk,Ipmh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UcrWb,,i,Nc,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DzgFa,,i,,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,opZrF,ez,i,Cme,NeG,hk,zYm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yFAAH,,i,Zi,qyCG,fU,Bu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wAOwe,mNh,i,oen,yGet,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QhQVq,mNh,D,oen,KCWa,lR,wxG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CfjhB,QMl,i,Ri,IamB,T,BAR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CfjhB,,i,mO,IamB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EWrtg,ez,D,bf,hmKv,lR,tSOb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xyFsP,iV,U,THd,uWTD,hk,kWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qZkcz,jb,i,RC,uECy,i,Kg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,kFmnB,bVnY,i,Cj,gOZx,hk,AkqH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JbXwv,iV,D,GF,,lR,NFu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pzLPd,,D,BAR,uECy,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,iNrsg,Pcb,D,u,uWTD,lR,cUChd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SNYME,zZe,i,Zi,uECy,i,vbC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YMYMT,,i,os,DDPD,fU,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XOZQm,QMl,i,bf,DkwF,hk,tzS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,POrHL,LjAS,i,xk,uECy,hk,oh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,POrHL,,i,Os,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,bVnY,i,KR,yH,hk,Yx,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,yhq,i,GF,DDPD,hk,guiDx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,yhq,i,jF,ZNr,lR,ev,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,zZe,i,FN,TGXq,i,vjVnY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,i,RV,,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,i,RI,qyCG,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,D,hSE,ZBNA,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,D,FN,,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,LDk,D,Ds,Rfp,lR,ymmc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,i,oen,Cj,l,lVE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,i,Ds,YO,T,wDZT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,i,nT,eFx,hk,wrwK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,D,oLI,KCWa,lR,KPDn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,iV,i,oLI,uECy,hk,fx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,Vj,i,mR,ojoW,hk,CkRz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,U,Yx,uECy,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,eG,zvgI,hk,syQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,sp,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,u,WNP,T,mEr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,s,hfB,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,s,aiR,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,TFX,gOZx,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,aW,Alg,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,ai,Kg,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,FN,ZDwU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,SC,gI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,onvOtGb,pzLPd,QMl,D,Kdq,uECy,T,s,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SoypciD,jWpps,iV,i,RC,laAR,hk,Rpg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OMwiRBg,UbJjv,EXYv,D,sp,VyBk,lR,JDK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DabYnze,UXfVS,EXYv,i,k,jF,L,WNP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wNSSCkC,zmspf,QMl,i,k,Cj,T,ZyJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,daMnwnE,zqBwb,,i,GF,Wsd,lR,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YMXTaVJ,NLAAP,yhq,D,eG,SC,i,eG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pGIzJsE,SmWKf,ez,U,vk,euzb,ri,Tpx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vGdhtFg,ZhLBh,rNcu,U,cZ,gOZx,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zvxIlyD,qZzCL,EXYv,D,hyz,Zsbp,hk,SzVP,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ijIcNCS,nDsLz,EXYv,D,RI,y,lR,CRn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LBotFOu,DzgFa,EXYv,D,GF,TAUy,lR,PHCFJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bJdXYio,PpAUP,ez,i,RNB,bnz,ri,nXopx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RlwRMyt,,xDLG,U,aW,sp,ri,zlb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CaePwNt,KOJjz,,U,iL,zNvM,lR,Nc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mXNXkPG,bLoPy,yhq,i,oh,YO,hk,wVTH,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mBLNzsv,DBAXP,EXYv,i,n,jF,hk,KHaQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zabJcmz,MWxHT,mNh,i,sD,Xua,lR,JpGH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qXAmdsu,LQsok,OYMU,i,k,YO,lR,bQbR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jfPqsrA,zfzpe,rNcu,i,EF,pf,hk,nxUa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UBULPzK,VzUtA,,i,GF,SC,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EbDvcLj,ZGziF,,i,zW,zI,hk,AOox,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eZWRJhl,KyEGN,mNh,D,sD,hmKv,hk,WYtG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JPRuWho,YJtol,,D,u,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,lVhKsdn,MiuKF,mNh,i,ZKX,hmKv,lR,MGSs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mNPFqwC,hFYeU,,i,FL,Cj,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VjkKABX,XigoJ,EXYv,i,bf,tOJv,l,TXRY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zkLEIOO,qSMjB,,D,kdc,hmKv,ri,Syq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TsDstEh,qkqKB,CqC,i,Cme,jHBL,hk,u,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WEJGUPY,vflvs,LDk,i,os,Zsbp,lR,sUnb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AAHxUMx,hlcVp,yH,i,Kuz,Cj,lR,qcGd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ejjuNOX,aRalA,aN,i,H,hmKv,hk,auP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZKiNqfm,,,U,oen,dYPI,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dafTPUQ,wFCfO,mNh,D,RI,IamB,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pzZEQxh,NLAAP,CqC,i,Cme,SC,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uEsHMmo,VONBE,mNh,D,Ri,nT,hk,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aefItjk,DzgFa,xDLG,i,n,TAUy,lR,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kBqpXTe,pNMtG,bVnY,D,Lz,y,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EfkdFLf,oBwBc,Gac,i,eG,zz,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BeyfMEM,PCjHu,ez,i,nt,eFx,i,miqt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AHJsZpo,GQqvx,mNh,i,Cme,IamB,hk,Oase,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ySjcMzN,aRalA,,i,RI,hmKv,ri,JI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wKakyiI,JmTkj,,i,YO,sp,lR,Kuz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gbsHevT,ClwEM,ez,U,xk,eQE,hk,VWSh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nKEiXUF,pNMtG,ez,D,uP,ITBX,fU,KZJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gfNxcla,oWoZd,xDLG,i,EF,hmKv,fU,HMlv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HuBoyya,NLAAP,yhq,i,Ot,SC,hk,Inq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vRLCvG,AXhVB,,i,mO,Mcs,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MxfSFr,,LjAS,i,FW,jF,hk,hYu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SvppiN,,,i,RC,zNvM,hk,db,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,suUchM,mDfiz,Pcb,i,RC,sp,lR,ymJbf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pFrFyn,mDfiz,yH,D,mO,sp,lR,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KbhjkT,eKNig,yH,i,mO,Cj,hk,BBxZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ajahpd,,VsKz,i,nU,Rk,i,Wm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BhPNgN,KqYsY,jb,D,Pj,LKKI,i,Kg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kVfEvb,XigoJ,yH,i,Zi,wCsQ,hk,DhXhS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EtiLaL,ilzOu,EXYv,i,RI,DQc,lR,Fpo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QTynYp,hpCAn,yH,i,RC,IamB,lR,pYD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tNvVZp,Smrjj,bVnY,i,qy,LHS,i,MQw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,buMGnn,VnSVs,EXYv,D,RI,XLQ,lR,pxtqQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WfxKzd,,EXYv,D,JnB,hmKv,hk,fflq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,euSVZA,iMSaA,,i,kdc,y,ri,JI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bnkSqE,,EXYv,D,zj,gOZx,hk,gGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XVdAqf,rmSkc,mNh,D,pm,Cj,hk,sa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oJtTPm,LdKpA,mNh,i,Kg,KCWa,hk,HjB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UrCbbQ,,LjAS,D,oh,hmKv,hk,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UHJgRt,ivYgu,VsKz,i,yf,xa,hk,waor,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Ktgypv,,LDk,D,iL,na,ri,YFcC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mKhhnd,CgiNm,Pcb,i,qh,sD,hk,Dnq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cnGofx,,Gac,i,JnB,XLQ,lR,wGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SfEaID,VzUtA,EXYv,i,SC,SC,ri,APs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sJlWJh,OirYD,iV,i,RI,gOZx,lR,DME,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QFyLDs,AXhVB,CqC,i,GF,HSL,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,iwasyi,BZYCM,mNh,i,pm,Ri,hk,dRaC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Smkopb,owINH,gpyD,i,RI,dYPI,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BmIhNj,QUpDF,Vj,i,IaL,nT,hk,ZUQw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dSGhEr,,,D,aW,Cj,ri,cvNg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ePqbsO,KyEGN,LjAS,i,SC,hmKv,L,xIPJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RxffFC,qytCC,CqC,i,ePq,juI,hk,ZdFA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jLkGIt,yZyjK,xDLG,i,RC,Cj,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KUImci,zSbLi,yhq,D,hcd,GWD,hk,wVTH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FmhvLI,rWGPS,jb,i,kB,Cj,lR,SViX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qhfqcf,knGHh,Gac,i,mR,jF,ri,ReumA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MspPKo,aPzRl,,i,mR,MpP,ri,Rsl,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WCGkgs,FGrsA,ez,D,Ri,tCwq,hk,dZrk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OBsLRy,rOYfq,EXYv,i,db,WNP,hk,BWObQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DblsNs,UriEN,gpyD,i,qh,pf,lR,wVjyk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VsPiWq,egmda,ez,i,uP,pf,lR,ZhX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dLSHhO,UbJjv,jb,i,RI,Yxhj,lR,vk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cQEpDs,KoskF,,U,RI,buw,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eENvBZ,,LDk,i,aW,bfM,l,VNgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GkuCfS,RVOBZ,LjAS,D,oMY,WHBi,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YZVXOn,fQNSn,QMl,i,n,Kuz,T,HFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kqNcXK,SlTau,yH,i,mO,Ri,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sFVloF,HXSgR,xDLG,D,os,SC,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hvOPlM,HphBC,zZe,D,fr,SC,hk,UZP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yQzYWY,JMwtw,Gac,D,Ot,dYPI,hk,QntX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vjKDpj,wxHDm,yhq,i,oLI,yC,lR,n,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sVPCFa,rKtlR,Vj,D,mR,PF,lR,BWul,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sRTdzT,tuGlk,iV,i,zj,kWZ,lR,Bmfa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WlIPAW,GCxFI,ez,i,oLI,rbp,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yoAGHP,CJwLr,EXYv,D,Ri,TGXq,hk,hcbQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bxrHHK,RTQUJ,,i,sa,YO,i,kAe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,iDCowC,CgiNm,EXYv,D,vk,gI,hk,FhEh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cVAWVS,ivYgu,bVnY,D,vk,Wsd,lR,yf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zMVBSw,yJaHj,CqC,i,n,qWFT,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qPfKEW,MmKox,Vj,i,GF,SC,i,EF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nsdpdc,cNLnu,CqC,D,H,ev,ri,nrqFW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vwgJJU,eYjgF,QMl,i,RC,WNP,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VlDwLr,pziuA,LjAS,i,u,yH,hk,qVz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ExWxIB,,LjAS,i,nT,Zsbp,lR,RC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,keZcEb,XmDvh,ez,i,RI,RV,lR,sFnU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qJxjZv,Smrjj,ez,D,eG,rSZ,hk,GOF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FDbjBs,,bVnY,i,RI,Cj,hk,LXL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OZztnR,iWLlW,xDLG,i,iL,hmKv,lR,UcqrJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OZztnR,,VsKz,i,iL,hmKv,L,McJu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CnzNDc,miwCS,VsKz,i,iL,qyCG,hk,KWZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uclyqj,hPEWT,,i,iL,mwY,ri,pk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RWZCXq,POrHL,jb,i,IaL,uECy,lR,Kg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Daiwzr,rRbDE,VsKz,U,RC,hmKv,hk,SjX,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LCxDVG,jpAGV,rNcu,i,GF,hmKv,lR,fFFL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZusDQH,ujyjw,LjAS,i,iL,IamB,lR,MwW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FissOk,KyEGN,CqC,i,iL,hmKv,hk,Uhb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dJQgpv,buQGw,yH,i,Nc,MpP,i,WRmc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PGNFjb,,LjAS,D,FL,Mgil,hk,hGj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wxRclo,gqTIk,ez,D,Cj,pf,ri,bnsy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TaNdeP,cEpGn,xDLG,i,zj,Zsbp,lR,oLI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DqjfEc,UcrWb,LDk,D,iL,hmKv,hk,vMT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aTuvrL,qkqKB,VsKz,i,bf,tOJv,hk,GugK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KPYFTQ,QImNH,ez,i,n,zNvM,hk,MfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YfARHl,unoLA,xDLG,i,WLK,dYPI,hk,EMuh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eVYncr,cEpGn,,D,iL,Zsbp,hk,db,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,guAdym,vFYlu,mNh,i,RI,hmKv,hk,BQr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kojLlO,,EXYv,i,O,IouE,hk,YjH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZqkrAb,snGgT,iV,i,n,NFu,lR,IeEh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xUoJQl,UvBeZ,VsKz,U,pf,cRzS,lR,cIOx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xUoJQl,,mNh,D,db,YO,ri,uvhA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yFfNyo,XeDef,,i,os,y,lR,EY,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fjXKBU,donlN,,D,kWZ,pf,i,aFo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eOEvap,ClwEM,,D,aW,Cj,hk,vTzj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DNQxBm,vZyhX,xDLG,i,kWZ,pf,lR,qVz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SFYVWZ,XmDvh,anf,D,u,RV,lR,vJwx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,knLrdP,uYWpN,CqC,i,xa,Rfp,hk,xIV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ifRGet,JWQHp,,U,G,gANm,lR,TpQX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bbtAdC,KxLPW,LjAS,D,iL,na,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cqFQwf,qBCaO,VsKz,U,aW,TAUy,fU,Pmiv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WtKdPM,loFIF,LjAS,D,RI,GWD,hk,KWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NWKJKB,tuGlk,,D,kB,pf,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Bjvyrl,,xDLG,D,JnB,dYPI,lR,KGxT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PsSMZ,dSzZF,CqC,i,GF,Wsd,hk,zj,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,exHHy,alpkt,EXYv,D,vk,qyCG,hk,FhEh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hqDQP,ujyjw,LjAS,i,Ds,IamB,lR,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qcVvD,DzbdG,CqC,i,jF,,hk,mkgt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kBfrI,CfjhB,bVnY,i,Yx,IamB,hk,sp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GvuUB,pehkw,EXYv,D,RI,SC,lR,PMlXJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HOzTx,UcrWb,CqC,U,FL,,hk,RoZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fANly,lAeLg,LjAS,D,iL,XJb,ri,iHi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hMnfI,OEccr,ez,i,iL,eQE,hk,yYW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,elsgt,trxic,VsKz,i,ZW,ZUA,hk,Iaqy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kSJfl,NTvmH,LDk,D,Ot,hmKv,lR,YhY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cyWTh,lHjLY,CqC,i,sD,SC,hk,wIw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wIYML,ygneZ,zZe,i,zW,zz,hk,jaUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tyzLJ,pLuie,QMl,i,n,,T,PXI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ECZqP,XctNb,bVnY,D,k,,lR,os,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uUHsW,SozVv,xDLG,i,RC,Cj,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OIyAe,MiuKF,mNh,i,ZJA,hmKv,hk,zmro,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ntanp,lUfTH,mNh,D,RC,Lel,hk,iUo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jqTDZ,MiuKF,mNh,i,KR,hmKv,hk,mEER,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OIbLq,rGrAE,mNh,D,aW,Cj,hk,uozmT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qyEEq,KKRFI,jb,D,pf,y,lR,MqP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xuZPK,TVeAq,mNh,D,Yx,hmKv,hk,Pe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MHyNW,YMMAE,CqC,i,GF,,hk,HMch,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vUEck,,ez,D,RI,hmKv,hk,Jcf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vAlyJ,InZpO,LDk,U,kWZ,yH,lR,jaFwn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fepiD,GeAiI,xDLG,D,iL,ZKX,hk,iED,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bItJV,uYWpN,Gac,D,kWZ,ev,hk,hVPMz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,rzYBI,TEMTE,yH,D,kWZ,YO,hk,BCre,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DLFMN,hlcVp,ez,i,bf,Cj,hk,MBL,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pxLpV,gJjvo,ez,D,Kg,dYPI,hk,Jcf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XPOhB,eSjKX,jb,D,os,SC,hk,ydJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LVDLq,cqJdC,Vj,D,nj,gI,lR,DNP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JeiHo,jSJFr,CqC,i,GF,jmef,hk,mUBq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HLLCw,KOJjz,ez,D,Kg,hmKv,lR,Tgbpj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uwGKg,aEQZY,CqC,i,sD,ceEe,hk,UKSK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gMxcl,RUGgg,EXYv,D,mO,zz,hk,gGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JMitr,vfKUn,ez,D,uP,eHh,lR,qYvw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VJDzD,Sosye,xDLG,i,iL,RV,hk,Os,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xndFf,gXbuE,zZe,i,iL,DcjM,ri,FHlgS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xndFf,gXbuE,,i,iL,DcjM,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yBEGL,wwFAY,bVnY,D,BAR,Cj,hk,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ppGYC,PHCFJ,CqC,i,k,Cj,hk,EPuv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bxZxB,,,i,zj,y,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mteWW,HBWfw,VsKz,D,k,hmKv,hk,gqn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZgjWY,loceY,anf,D,iL,KnZo,fU,WXYq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZgjWY,loceY,,i,iL,,ri,uvhA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ShqtM,jkNiR,opm,D,iL,db,ri,OWkM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OHBDn,RUGgg,rNcu,i,RC,qsr,hk,Ywm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pGMVR,dzSyh,opm,D,SC,jF,hk,yuHW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,krzPi,oBwBc,bVnY,D,RI,kPj,hk,LXL,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gWniv,YoxHS,LjAS,D,RI,ev,hk,KWZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qqOTE,,iV,i,iL,Vvh,lR,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jsWji,KyEGN,,i,mR,hmKv,lR,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ldmlW,,bVnY,D,zOi,y,i,pfq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SywhM,KowCL,xDLG,D,iL,Wsd,ri,zaCn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aYgiE,CmGAY,rNcu,i,iL,pf,L,xAF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yyelp,wnVGZ,,i,RI,ZKX,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vBQJF,ZpqOF,iV,i,n,y,lR,CAP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oBwBc,nZRvw,Vj,D,iL,LHS,ri,KQNf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uIrGR,Tnycz,xDLG,i,iL,gI,lR,zdV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LQEaK,pziuA,CqC,D,yf,Mcs,hk,dQD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sfzNo,uCfJW,bVnY,i,xk,gI,hk,oaHW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xwZMj,yZyjK,bVnY,D,RI,Cj,hk,fVe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oAzDc,rGrAE,zZe,i,THd,zI,lR,bKXgn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tLubL,eNMxO,,i,iL,ev,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IFWjH,,iV,i,FN,HSL,hk,EnE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,faeBa,LyGdu,xDLG,i,iL,edWw,hk,Os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zRMgk,OqPXk,LDk,D,iL,DQc,lR,vqTx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Pfzfo,FAmec,VsKz,D,Yx,yH,lR,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DTMbh,kophc,,i,THd,sp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DQDzD,NLAAP,iV,i,THd,SC,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MKZYm,mGUGe,xDLG,i,Nc,zhkk,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XgUzd,MNqGT,bVnY,i,n,rbp,lR,KPiv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aqsat,cdmXU,Vj,i,RC,buw,L,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ycGlF,FPgQL,Vj,i,k,YO,hk,fjZH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gwZSB,mDfiz,EXYv,i,JnB,sp,lR,Cj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Movx,BSAII,zZe,U,iL,VyBk,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ASzF,FeFND,aN,i,Kg,RV,hk,nLf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sQiV,CmGAY,Pcb,i,vk,pf,hk,vedL,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,osNv,JjjZb,aN,D,zW,pf,hk,GXQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZiiD,kBvrH,ZQa,D,xk,Cj,hk,dSqA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qJOY,AXhVB,EXYv,D,n,Mcs,hk,gGz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hnRw,gafGU,CqC,U,GF,Mgil,hk,KxxJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Wbcf,kEKkc,CqC,i,jgn,ev,hk,gJbW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sFnU,cdSwJ,CqC,i,GF,UpSB,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VPUO,pLuie,,i,Cj,,ri,TxgN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TGtO,xTKHz,EXYv,D,na,pf,lR,sten,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yuPn,,xDLG,i,iL,pBlc,lR,dYq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ecfp,USlLw,Vj,i,iL,rbp,hk,tBsA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JwjG,cWPuB,bVnY,i,BfM,Cj,lR,U,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yTss,uoXfm,bVnY,U,vk,hmKv,hk,Mcs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,khfd,cEpGn,QMl,D,BAR,Zsbp,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mKcJ,VONBE,opm,i,SC,yH,hk,HuKZN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XPYa,DuMGv,,U,iL,ShH,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WuPr,vfKUn,EXYv,i,RI,sp,lR,wrl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jCLV,EWrtg,Pcb,i,FL,,lR,iGu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,urvf,EfIjr,,i,nt,RV,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mZhA,,xDLG,i,RC,dYPI,i,gYfF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZCJx,cdmXU,VsKz,i,oLI,cBU,hk,bWwk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,viqx,XFveY,anf,i,H,XLQ,lR,dPMj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EQim,LQsok,,D,xk,YO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ejaw,xxpLa,,i,iL,ZNN,ri,pk,5609211849415401069
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TVGK,toVXF,EXYv,D,TGR,sp,hk,gGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,smBZ,fFPdL,ez,D,oLI,y,hk,YhQg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RvGY,KOImY,rNcu,i,RC,yC,hk,diGS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fFiA,MMnif,mNh,i,iL,gOZx,ri,EMva,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PrTs,pLYXJ,Vj,i,xk,sp,hk,KdYT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BLic,eKOcq,,i,n,Cj,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pbdI,pzLPd,Gac,i,FMt,uECy,lR,EMva,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,luoo,pehkw,LjAS,D,aW,SC,lR,FeM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Shoh,HGnGo,LjAS,i,iL,xa,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RrcL,mGUGe,EXYv,U,bf,dYPI,hk,oiji,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fnMx,wNpHN,xDLG,i,xk,na,hk,dEupD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IHkb,SklNG,gpyD,i,os,gI,lR,QYrZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kPFm,bFakE,LDk,i,iL,XJb,lR,JxA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EuKH,diapp,xDLG,D,vk,aRnz,lR,hoQK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HGwq,diapp,opm,i,mR,yf,hk,LrJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PXeu,ivYgu,Vj,D,IaL,Wsd,hk,RV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VaIq,,,U,iL,yf,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,daci,DzgFa,ez,D,nt,hmKv,lR,FeM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zaPH,CfjhB,xDLG,i,iL,IamB,hk,Gaxy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RCmN,PkDWB,zZe,i,iL,Cj,hk,pYeF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fpay,vdUHx,opm,i,iL,,lR,fdIU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fDrC,YqeXG,aN,D,iL,qsr,ri,GJxS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aOPS,hlcVp,,i,iL,Cj,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fdrn,pLYXJ,ez,U,iL,soR,hk,lQU,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Wxvr,iNrsg,CqC,i,os,uWTD,hk,elM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mIPn,JFMRC,,i,iL,MAI,hk,AGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mhoS,JFMRC,CqC,i,Lq,yH,ri,hGxr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WgGe,cDSib,EXYv,D,iL,IamB,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mzWw,BCMBQ,zZe,i,GF,pf,lR,TUXz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MOrF,uYWpN,LjAS,D,iL,fAb,hk,hOpHk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kdKd,SklNG,LjAS,i,iL,gI,ri,vhp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kdKd,QjopT,,D,iL,xa,lR,qxk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SDWn,SklNG,xDLG,i,Cj,gI,hk,Os,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SKIE,fFPdL,LjAS,D,iL,y,hk,TVzw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,evCP,XmDvh,xDLG,i,vk,RV,lR,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Xair,zsRkh,zZe,i,iL,LHS,hk,jaUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Njcw,JGooX,xDLG,D,RI,nT,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Njcw,INdJw,QMl,i,RI,Cj,T,dcu,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,iXrH,izZbI,xDLG,i,iL,Wsd,oA,aWfBd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AaCl,,opm,i,SC,Wsd,hk,oh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GOki,UpZhy,,i,iL,fX,ri,maKM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pBoC,gqTIk,xDLG,i,iL,,hk,bzPS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mhRt,VGgQZ,VsKz,D,zj,LKKI,hk,BfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RqrK,cbkAW,rNcu,i,RC,y,hk,JEli,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oPKd,RTQUJ,ez,i,n,OxU,lR,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Hpvq,lTyLf,bVnY,i,nU,xxmj,lR,gxww,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SRyZ,yZyjK,xDLG,D,iL,aHa,lR,jF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zJYW,MMnif,iV,U,RC,gOZx,lR,KHru,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BRAy,czsTS,VsKz,i,sa,Cj,hk,Wm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wTGo,QbFYx,LjAS,D,iL,YO,fU,iTQU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jjix,HfANR,LjAS,i,ss,xa,lR,WOrB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RgUm,XcJvM,CqC,i,hyz,ev,hk,YAyv,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jJKy,kEKkc,rNcu,i,RC,FvO,hk,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jJKy,wwFAY,rNcu,i,RC,SC,hk,Ywm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jJKy,rpCEC,rNcu,i,RC,Cj,hk,Ywm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XUBk,JFMRC,rNcu,i,nU,SC,lR,gxrge,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zNtu,YoxHS,,U,xk,ev,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hhIq,uYWpN,zZe,i,xk,ev,hk,vfh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qRLX,ScmeP,VsKz,i,s,y,hk,qiy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gMCg,pxtqQ,zZe,i,xk,Pif,hk,NGeK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TqjM,HDWmq,CqC,D,nU,sp,hk,zj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wNrn,ytgnG,iV,i,mO,WNP,hk,pChe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,rBGW,aAskl,CqC,i,y,,hk,RoZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Ctir,rGzDb,CqC,i,H,YO,hk,qh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KuEM,buQGw,gpyD,i,GF,HSL,lR,DhKF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UdXx,TCzyP,rNcu,i,zj,,lR,RTvo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KuXW,cEpGn,VsKz,i,YO,Zsbp,hk,VOYe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jJAP,dtobc,xDLG,D,SC,y,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TxDw,GuqeH,VsKz,i,iL,y,ri,AkHh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TxDw,,Vj,i,iL,y,lR,frg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,trSd,bWJlU,CqC,D,k,Kg,hk,OlHN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FoBI,qQMoM,ez,i,Ld,TAUy,hk,CjjX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xwMl,VaNlw,xDLG,i,Cme,xa,lR,QEdS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dJQk,CiZAV,EXYv,U,k,Cj,lR,qy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FGPw,qgWye,xDLG,D,RC,XLQ,lR,iOIO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OElC,oJXSu,xDLG,i,NHX,pf,ri,zlb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nGOx,DXeTv,Vj,i,GF,pf,lR,ldRt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QCRl,XEFKc,xDLG,D,FN,,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QCRl,dEvnd,xDLG,i,FN,jHBL,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QCRl,oRdwp,xDLG,i,FN,hmKv,hk,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fwdx,hnVcp,rNcu,D,RC,pgG,lR,pFH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,dUnzn,rNcu,D,FN,pf,lR,FvrJX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,aBMem,KsKZ,D,FN,y,ri,uCQHs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cHyG,USlLw,jb,D,GF,YO,lR,LWMQT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cHyG,eMFPU,bVnY,i,GF,YO,hk,ZUnj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qEey,EOoyH,iV,i,GF,,hk,oScR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qEey,,aN,D,GF,YjrO,hk,brP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cflD,VCIri,,U,GF,dhzh,hk,iyf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,IHrrt,mNh,i,oen,qVs,hk,RtFV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pgdrq,LjAS,D,Bu,auP,lR,RC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,WjsAJ,opm,D,SC,xa,hk,jAYb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JbEKD,LjAS,D,xk,HSL,hk,HpHY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,lblhY,,i,n,bfM,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Uafjc,ez,i,zW,RV,ri,nXopx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,IwSPE,,U,JI,Frn,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,msdsR,,D,,Vnr,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nfcFV,,D,,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qYpuI,,D,,NTj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YUjEV,zZe,D,yC,Mcs,i,cLQG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rvTLp,,D,GF,HSL,oA,ZKX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VKwcO,ez,i,ZKX,pBlc,hk,VWSh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,bKQXZ,,D,JI,jF,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LhzxC,ez,i,mO,Cj,lR,mKDi,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,kkrCJ,mNh,i,RI,rbp,T,dYq,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gZyYP,,i,OS,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NMwlg,mNh,D,oen,hmKv,hk,XekG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fNjZI,,U,JnB,YO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,iMVhD,,U,yC,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cdSwJ,EXYv,D,oen,UpSB,T,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cdSwJ,,D,ZKX,qyCG,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZQGrY,,i,GF,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DGPSH,,i,qh,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tlQoc,,i,cfU,kck,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XHKBn,LjAS,i,k,iga,hk,mQxQ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,quPPW,VsKz,i,GF,sp,hk,hAve,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cFxvg,LjAS,D,SC,SC,hk,Pj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NePPU,Gac,D,JnB,yC,oA,wGj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nDsLz,,i,RI,y,lR,Nc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nDsLz,,i,,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eYjgF,EXYv,i,xk,soR,hk,yRAy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,prCpG,yhq,D,THd,IamB,lR,rFiO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fxErQ,,i,RI,,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,wVacr,LjAS,i,,Vvh,hk,LiiMd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eavtW,gpyD,i,IaL,ahaC,i,JAu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FeFND,,U,Ep,oh,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,kaQGg,,i,kdc,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Nqkmi,,U,ZW,XLQ,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Nqkmi,,i,pk,XLQ,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Nqkmi,,D,ZW,pf,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qjNZF,QMl,i,RC,WNP,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qjNZF,,D,ai,AGz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mDfiz,ez,i,ZKX,Kg,lR,xa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pcpoK,xDLG,i,FL,Kg,hk,RSSWl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UpZhy,LjAS,D,kdc,fX,ri,APs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uLFqs,,U,n,,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UimzX,,D,hyz,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NKoEu,zZe,i,GF,pPN,ri,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,woFEW,mNh,D,zW,GWD,lR,qCJk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FPgQL,CqC,i,Zi,FvO,hk,Uw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FPgQL,,i,RI,FvO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YoxHS,,i,oMY,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eNMxO,,i,iL,ev,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qwbvG,VsKz,D,kWZ,FvO,hk,qiy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gqTIk,,i,sD,FvO,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gqTIk,,i,ZW,FvO,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,hMnFO,,i,,YO,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TrdtM,,D,BAR,hfB,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZGziF,zZe,i,zW,Ri,hk,vdxEr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZXYvK,,i,Nc,Cj,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jHsOR,,i,FL,y,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JjLio,,i,vk,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,PkDWB,Vj,D,RV,Cj,hk,wIh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yMOwe,,D,iL,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CiZAV,yhq,i,kWZ,Cj,i,eG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CiZAV,,i,oLI,fNlL,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NHNrT,mNh,i,Ri,y,hk,frg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NHNrT,,D,,GF,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SyFMb,,i,,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YbWfE,,i,RI,yH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tWWFx,xDLG,i,sD,Wsd,ri,iED,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,furBM,LjAS,i,eG,Wsd,lR,RC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dgPQa,,i,THd,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nkrFs,bVnY,i,RV,buw,hk,fVe,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,teKMc,EXYv,D,Yx,HSL,hk,gGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,teKMc,xDLG,D,Lz,pf,lR,CAP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CnXtt,,i,oh,SC,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jjoJS,,i,oh,nT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DJSDE,,i,qh,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QUpDF,xDLG,i,,nT,hk,Os,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QUpDF,,i,gI,nT,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jqINa,,i,,nT,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zsRkh,zZe,i,Zi,LHS,i,mMaMP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UriEN,,i,FN,pf,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UriEN,,D,na,aRnz,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UriEN,,D,na,pf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CQsJP,,D,xk,Os,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GuqeH,,i,,kzbx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dCdpV,,i,Ri,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YJArO,,U,JI,y,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fFPdL,zZe,i,yC,ZNN,hk,etS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fFPdL,Gac,i,IaL,y,hk,ySTK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,WzBAB,bVnY,i,sa,zlG,hk,sp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,WOouO,,D,os,gJq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GDIAH,,i,RI,Vqi,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,bXVUB,LjAS,i,qh,aPt,hk,qVz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tjnHd,,i,FN,zI,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VzUtA,,i,iL,SC,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aHyMy,,i,ZW,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,BNnUs,,i,THd,SC,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aPzRl,bVnY,i,yH,Mcs,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aPzRl,bVnY,i,eG,MpP,hk,Yx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,wrYOu,LDk,D,BQ,wIy,lR,MTE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rXnhf,EXYv,U,pqp,gI,hk,AGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SklNG,,i,n,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,snGgT,,i,RI,NdS,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,jfQnw,CqC,i,jF,jaP,hk,zlNX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XctNb,,U,nT,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XctNb,,i,n,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eGUBA,,D,,YO,ri,JI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rWGPS,,D,OS,Bkt,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LQsok,LjAS,D,kWZ,YO,ri,HUQjs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LQsok,,D,Yx,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,OTmTL,,D,FN,xa,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qgHRF,,U,FN,xa,hk,VsPH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,amZvm,QMl,i,pm,,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aLnQy,,U,zj,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,miVwa,,U,qh,MnWD,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rBXlN,,i,RI,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,iMcaL,,D,zj,LHdO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Aeewi,,U,fr,LHdO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JWQHp,EXYv,i,mO,vrEy,hk,qsFe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UWIfW,,i,oen,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pLuie,,i,,VyBk,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,BSAII,,i,RI,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,etVtj,,D,,zvgI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qizlO,LDk,i,xk,gRTo,hk,VnG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gMbWu,,i,n,laAR,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dEvnd,,i,pm,pMmL,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dEvnd,,i,Zi,dbdK,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nOmkK,,i,pm,dYPI,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,lSCtw,,U,s,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yUWuX,,D,ZKX,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YEATg,,i,s,fNfp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SVLxE,VsKz,U,GF,okIe,hk,lUt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,otxsK,QMl,i,Bu,YO,fU,PvS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,BbHaV,,D,jF,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qZzCL,,i,EY,Zsbp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qZzCL,,D,Kdq,Zsbp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cEpGn,,i,FMt,Zsbp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aGAzh,LjAS,D,eG,hmKv,lR,xa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aGAzh,,D,GF,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oWoZd,,i,JnB,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oWoZd,,D,vk,zNvM,hk,Jij,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SefEe,,U,,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QImNH,,i,O,qyCG,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vrlAM,,U,FN,hmKv,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,kyLsL,ez,i,Yx,hmKv,hk,TNJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oRdwp,,i,RI,hmKv,lR,cvKF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oRdwp,,i,Cj,hmKv,oA,ZKX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aRalA,zZe,i,zW,hmKv,hk,lmAx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,miwCS,,D,Kdq,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KyEGN,,i,sp,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uVdCT,bVnY,D,xk,TAUy,hk,lcy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CfjhB,xDLG,D,iL,IamB,ri,zlb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DXOcu,,i,G,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,EfCkA,,i,RI,gOZx,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JbXwv,yH,i,zz,DkwF,lR,Nyf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pzLPd,rNcu,i,Zi,uECy,hk,tCo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pzLPd,,i,iL,uECy,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,iNrsg,EXYv,i,fx,gOZx,fU,AmGY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SNYME,,i,oen,uECy,,,1048718684474966157
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ruKdN,,D,,uECy,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dheCD,opm,U,OS,uECy,hk,ZUD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dheCD,,U,OS,uECy,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dheCD,,U,SC,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZhLBh,QMl,i,RC,gOZx,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XOZQm,,i,cfU,IamB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XOZQm,,i,Ot,uWTD,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,POrHL,,i,ePq,uECy,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UvMmX,zZe,U,yC,DDPD,hk,etS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UvMmX,Vj,D,sp,DDPD,hk,na,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,PTRpg,EXYv,i,yC,ZUA,lR,HgjG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,bVnY,D,hSE,Bkt,hk,qdpXk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,xDLG,D,RC,Wsd,ri,Oxt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,zZe,i,WI,rbp,lR,vxnR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,opm,D,Cj,sp,lR,ekdP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,U,Cme,SC,hk,Hrde,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,i,pm,IzJP,hk,QPm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,i,sD,hmKv,ri,uPSV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,i,Zi,HSL,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,D,hSE,LHS,T,rEy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,D,Cme,okIe,hk,SOrL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,mNh,D,Cme,gRTo,lR,bIeE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,U,,DME,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,KWZ,xa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,Pek,fvC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,jgn,KCWa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,Cme,WOsU,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,KR,jBP,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,Zi,hfB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,qh,Zsbp,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,,LcK,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,IaL,DDPD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,RI,gxdH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,Cj,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,iL,ojoW,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,xk,,lR,Nc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FqvJHSQ,,zZe,i,mO,dYPI,hk,VHXfj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kMuvUPw,,Vj,D,ZJA,WcDS,hk,nkrP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QAdqePs,,mNh,D,RI,sWhI,lR,ayGOf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mOsePwd,eCWoC,xDLG,i,Lz,RSST,lR,fDgK,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YiFBFWa,,QMl,i,WLK,sp,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yqVMJfL,,bVnY,i,cZ,eQE,hk,sXtp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QBxFpQQ,,,i,KR,,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DQgvoKY,UriEN,yH,D,Kuz,,l,Ezpvp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sLzvocz,,,D,hSE,Zi,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ALFKaVJ,,,i,bf,WPrX,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,teXETNA,hQGku,EXYv,D,nj,Wsd,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vgNhJCj,,zZe,i,kB,Blj,hk,QdZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yXKwsik,,ez,D,RI,pf,lR,kFrs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zoVbigp,,iV,i,nt,xa,lR,AUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LSNGDnj,,rNcu,D,RC,yC,lR,xrcvu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WPhKfVj,PHCFJ,ez,i,bf,Cj,lR,ZhX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jnYUfCk,,VsKz,i,gI,jHBL,lR,aW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KUGDqMy,,bVnY,i,Zi,kgW,hk,gJq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,APdyzmS,UUirl,LDk,U,TGR,RV,lR,mR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oEpNpzp,iWmFf,,D,GF,VyBk,hk,mO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZkqfMcu,,QMl,i,Ri,gOZx,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EbpBSAR,,zZe,D,Kg,Bkt,i,YXte,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kDsorTn,,EXYv,i,wGj,sp,lR,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,exxCCjd,,EXYv,i,KR,iADy,i,hhIq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ABVxrBC,,,D,yC,bqP,hk,ebk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,coHEiXJ,,yhq,D,RI,gOZx,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IKwYLOY,,,i,xk,SC,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oVELFzq,,yhq,i,Yx,ojoW,lR,gUuW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mwJxPGT,,,D,mR,uECy,hk,mO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,upfOOYU,,ez,i,G,y,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hnFnvaY,,Vj,i,Kg,buw,i,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GCRDgrA,wNpHN,ez,D,kWZ,na,i,KZJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XRQwYhw,,bVnY,D,xVO,rmJ,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GksvUeD,,gpyD,i,FZj,Mcs,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BmjnjLq,,,D,zW,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GwEVHMA,YkAvm,rNcu,i,zj,zI,fU,CbpyZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MwfUvOb,,EXYv,D,Bu,jBP,hk,YjH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kkWqCph,,CqC,i,pm,gOZx,hk,fJQkf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Rskwzqe,,LjAS,D,FL,RSST,lR,ckYj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ADgLdEB,jkdjQ,,D,sD,RV,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tJpKfjq,,ez,D,oLI,pf,lR,yDxo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BQovnTn,rGzDb,xDLG,i,k,YO,lR,YeHgQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QDVAtrW,,bVnY,i,nU,LHdO,lR,RfJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BPAGjMc,pNMtG,QMl,U,aW,,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IbvAOWs,,LDk,D,aW,qyCG,lR,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KmhWXhz,,,D,oMY,okIe,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AWpYVrB,,mNh,D,aW,dYPI,lR,hcd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rRYKMys,,Pcb,i,u,pf,lR,cNDz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jmgLbtV,,zZe,i,IT,dYPI,lR,GoVK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,okZhvWq,CfjhB,yH,i,RC,KCWa,lR,Ljdi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,udXGAJe,,gpyD,U,GF,,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CJmxtTG,OcAPt,LjAS,D,kWZ,hmKv,hk,Mfnu,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OzMLail,mONwL,CqC,i,Lq,zI,hk,Hlua,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rBlqNHe,,QMl,D,pf,Ouf,T,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,icDIVZl,GqeZx,Vj,D,kWZ,yGet,i,EF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IkGiHmL,,ez,U,aW,SC,l,rOw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QZaBzEq,mxPzj,,i,mO,aRnz,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MoiOmKl,,LjAS,D,Kg,y,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BeUonIx,vnUks,yhq,D,aW,Cj,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nNIBnNH,,Gac,i,kWZ,jBP,lR,idb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zBrBxXa,,CqC,i,FL,LKKI,i,KDO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ofjbUaj,hAjyU,,i,RC,Bkt,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ArBQYul,,mNh,D,Om,hmKv,hk,LNQP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KhUVYkP,,CqC,i,FL,OCf,i,QrDIs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aUFCRxz,gMbWu,iV,U,GF,gOZx,lR,RHTS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vAbxCKJ,,opm,D,SC,Kg,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AAkQZrR,,,i,ZKX,ojoW,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,juMOMtE,,ZQa,i,bf,Kuz,hk,AiH,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hqJUGOa,ZhLBh,ez,D,bf,gOZx,lR,CDGXO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FZvqEzQ,zSmSI,,i,Kg,bhM,hk,mO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NzrtRBs,,,D,SC,ber,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fMoaLwT,,KsKZ,i,Pj,gOZx,hk,TNt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ogGPfdt,,zZe,i,jgn,Cj,hk,qtR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vfNrHLP,,bVnY,D,THd,gI,lR,RNB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,legbAo,MiuKF,QMl,i,sa,hmKv,T,FMt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kVnaWo,,mNh,i,Cme,TBUv,hk,sa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BsTLnO,pzLPd,Gac,D,aW,uECy,hk,wGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dqIXXv,,CqC,i,qh,PF,lR,ss,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WMsADW,,Pcb,i,u,vbP,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QpTobw,,zZe,D,mO,XLQ,i,qfwt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kQzTwZ,efoXf,EXYv,i,GF,y,fU,nsR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sopLSR,UpZhy,EXYv,i,y,sp,i,rtO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UEtgeM,Aeewi,yH,i,mO,sWhI,lR,JLm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LYGVkD,,,D,k,TAUy,lR,nt,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gYZQQH,,,i,db,ev,hk,Dq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qjnQPJ,MZzvk,iV,i,H,Cj,fU,Lna,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EXQnWV,vTamu,yH,D,mO,RV,lR,hFCS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WvCitt,fprRo,rNcu,D,RC,DME,lR,wNjQS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zxdxPr,,bVnY,i,xa,FvO,hk,XbLc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,axcxDn,,LjAS,D,ai,auP,hk,aZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zmWswk,mvxRP,zZe,D,KR,Kuz,i,kkSGe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JLxBJK,,Pcb,D,u,Cj,hk,Dnq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qZfAlq,teKMc,yH,i,mO,pf,lR,KR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HWoXGe,,iV,i,Nc,,l,CVe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mFYtOR,,EXYv,D,GF,xa,hk,Cj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,URtoMP,uYWpN,iV,i,Kuz,ev,l,mHiT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EVpZmK,cdSwJ,zZe,i,Ri,hmKv,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vyalyk,,LDk,i,H,VyBk,lR,Wbj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Ygjcdw,,EXYv,i,Kg,jHBL,l,iUxL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NvIhuy,,,D,k,Cj,ri,JI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dRQPwp,,LjAS,D,Uw,zI,hk,CJqku,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YNmxKL,,ez,i,bf,RSST,i,jXQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BgxJaB,,yH,i,mO,IuC,lR,KR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WXpwki,,VsKz,i,KR,wIy,lR,osrE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DRbTWM,,iV,i,RC,gOZx,lR,Pegj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SpOQul,eSjKX,EXYv,i,ZJA,DME,l,UVtc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WAujFF,,VsKz,i,Cme,dYPI,hk,LIra,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TJCCBN,yeZks,VsKz,i,Kdq,na,lR,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YWhLuR,uVdCT,,i,GF,hmKv,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XStfLU,,gpyD,D,Zi,IamB,lR,bf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Hitfov,,KsKZ,i,Pek,hhhl,lR,eBvFv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aBfNpT,,EXYv,D,nj,pf,i,rxZc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PhPRck,,zZe,i,sp,KnZo,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jLkGIt,ewzba,gpyD,i,RC,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KdAwuO,,,i,k,na,lR,WLK,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XyDGhH,rzTVb,zZe,D,u,HwD,l,qZF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uIhWJU,qZzCL,gpyD,D,nT,xa,lR,pzUK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,baCxQq,qVloc,mNh,i,n,aiR,lR,ss,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CsilJc,,QMl,i,Kg,FtAx,lR,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ItbHRT,eqdIr,mNh,D,Ri,aTaS,i,tPiy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cfbRBY,PHCFJ,yhq,D,SC,Cj,lR,alkP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qWZAAR,,zZe,i,Zi,gI,i,Ri,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LqNLNZ,,opm,D,SC,rSZ,lR,bImZN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IGakWv,,bVnY,D,mO,na,l,rxNPh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mVPvsO,INdJw,LjAS,D,Lz,pf,lR,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,onUylX,,,i,IaL,jF,hk,syQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WCGkgs,rRbDE,yhq,i,Ri,hmKv,l,Ikhqo,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YUJbuR,TDUrZ,iV,i,kB,KCWa,lR,CAP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YVjuUf,FPgQL,bVnY,D,Wm,FvO,i,rBRV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nTsMzJ,,LDk,i,aW,pBlc,lR,Nc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,doLRPB,,,i,u,NdS,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OztlTn,,CqC,i,GF,gJq,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EKSufE,fEqIX,CqC,i,Kg,afgl,hk,gnMm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zQQIMe,pFxre,yH,D,mO,pf,hk,YfbZY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,spsVkA,,QMl,U,k,WNP,T,jNmm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aqCPxf,DWRev,mNh,i,RI,juI,lR,tDr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UktJnB,,LjAS,U,mR,aQj,hk,AeT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YfDriG,,anf,i,Ld,zz,i,LfH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kMAYKh,RGitv,bVnY,i,WI,Om,hk,Yx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nOzjlR,,LDk,i,GF,IKL,hk,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ANBrob,,rNcu,U,mR,gI,hk,hhhl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YnouKm,,jb,i,exS,gOZx,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fGzZrI,BFITp,zZe,i,Bu,Qhv,i,LvN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IRteTK,fFPdL,bVnY,i,ZKX,y,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yCjCZw,,bVnY,D,nt,sp,i,nU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IgCfah,UriEN,gpyD,i,IaL,jaP,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HSAgxU,,EXYv,D,Bu,SC,hk,NYEL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QgTVgl,,iV,i,zOi,rbp,hk,uPOE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VIDaWF,uUaoE,Pcb,i,OS,Cj,l,XZLWT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lmlSRT,,iV,i,GF,Wsd,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CDwbSA,,QMl,i,Zi,DME,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hFmTgu,GuqeH,jb,D,qVs,Cj,lR,zebaz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xacTPa,,bVnY,D,xk,gOZx,hk,QKWwg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YgBABa,,,D,sD,NdS,oA,bpC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wKPevp,,CqC,i,zlG,yH,i,WMz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CVIdgC,,iV,i,kB,zI,fU,TsSN,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zTReJe,,gpyD,i,GF,Pif,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zQVxjC,,xDLG,i,WLK,pPN,i,Zwa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Zuyauq,,yhq,i,FL,,lR,qMBg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BaNXNJ,WvRdS,QMl,i,zj,WNP,lR,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lVMiHU,SKGNX,CqC,i,zz,DDPD,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WnGKfW,,opm,D,oMY,YO,lR,epE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uaQbEw,,KsKZ,D,sp,SC,hk,cbYc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iAXJqM,ZZrqs,jb,i,n,y,lR,vk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KsZKmF,,VsKz,i,YO,ev,hk,bJwN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OobWNT,,ez,i,oLI,RV,hk,NHX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oSXkIU,,Vj,i,ZJA,Yxhj,fU,nGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TvwdpK,PHCFJ,bVnY,D,k,YO,lR,RpZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eLydAS,,LDk,D,iL,buw,i,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Qxiypo,,jb,i,Pek,RV,lR,nXNJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pLfoLh,lUfTH,LDk,i,iL,JVF,i,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Jdxhjl,,xDLG,i,iL,rmJ,lR,jF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Heuxjs,,,D,os,pPN,i,sD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OSYsYG,,rNcu,i,zj,gOZx,lR,Faz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HxrLXz,,VsKz,D,y,Cj,lR,KPvc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AlfMTn,,EXYv,i,Cme,dYPI,i,AQgC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yflknZ,,LDk,D,iL,juI,i,CWq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NrIGbv,,iV,D,RC,nT,lR,CAP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kaewOP,oPsDH,mNh,i,cfU,xa,l,xVO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KAlHsQ,,VsKz,i,Lz,Cj,i,pRt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ekUwch,hqpMg,CqC,i,n,y,lR,ZNN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tfeava,,bVnY,i,O,Zsbp,i,GF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,haTneK,drMaK,,D,Kg,fX,hk,iyf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DqjfEc,FPgQL,iV,i,iL,zNvM,hk,tqk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LekXYk,oWoZd,Vj,D,fr,zNvM,lR,dCN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LekXYk,,jb,i,fr,,lR,vk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cwMDpr,pcpoK,CqC,i,xk,hmKv,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aEZvsh,,aN,i,Nc,yC,lR,DFIN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Nkimka,,ez,i,nt,KMAv,hk,FZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uQeBll,,zZe,U,Wu,mwY,hk,qCJk,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DROVbc,,bVnY,i,n,sWhI,i,iMMG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,llCGrt,hpCAn,Vj,D,aW,RSST,L,LFq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OLcsVW,fxErQ,Vj,D,IaL,qyCG,hk,kbEl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RbcwWS,olCSu,ez,D,iL,dYPI,hk,xtJj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oWVlRJ,NwyCn,iV,i,RC,,hk,Cme,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JMaFNb,,,i,n,Cj,i,Alg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DpcjyD,,iV,i,Cme,Zsbp,hk,Zglg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MirazD,rGzDb,,i,kdc,y,hk,fr,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UxcqRb,,LjAS,U,kB,ev,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KdiCBE,,Gac,D,wGj,bf,hk,YTC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QgYBCy,,rNcu,i,RI,ZDQc,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HDeTTN,,iV,i,WLK,yC,lR,NFu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KydMLf,,Vj,D,Nc,aRnz,hk,LFq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rrBpqv,sNikU,Pcb,i,Rk,Cj,hk,EWTi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eTgVNM,,gpyD,i,GF,xa,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HDnKPX,,yhq,i,G,RV,i,kVsn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JJgtYJ,,iV,i,SC,wlp,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GVDchA,,VsKz,i,zz,GES,hk,gNZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,irkdaC,,bVnY,D,GF,y,lR,Pek,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yIBzvK,,QMl,i,JnB,ev,lR,HwSN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SCpxbG,,Pcb,i,u,kB,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EdfLZg,,,i,GF,gOZx,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ypLrBF,,rNcu,D,zj,YO,fU,RSNGU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rYJjxw,,iV,U,mR,kWZ,hk,ORJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RKhBiB,,KsKZ,i,RC,qWFT,hk,Ds,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yQaIGy,,mNh,D,cfU,mwY,hk,ddk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TYteVL,,iV,i,n,Zsbp,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zAQDkK,gUDiL,Vj,D,ZJA,y,hk,wCrxd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FCGnBB,,KsKZ,i,kB,FSG,l,fX,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uEbtfV,,Vj,D,SC,pf,l,AFo,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CQSvOP,LnlmR,iV,i,OS,mwY,i,Gf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KcggBT,POrHL,iV,D,zz,uWTD,hk,sWXos,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gZroXN,JjjZb,EXYv,D,eG,pf,l,yH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rVjdkf,,bVnY,i,GF,XLQ,hk,JxA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VFFUWj,,CqC,i,fr,khbX,lR,mlk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Rbfgr,gwGKb,gpyD,D,GF,fX,lR,NcqNq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sTUYu,,bVnY,i,RI,RV,lR,sp,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MLeHP,,,D,RI,y,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UDyLl,,mNh,D,pqp,TGXq,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zVlRl,,iV,i,u,FvO,hk,mpy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RynsH,Gaife,zZe,U,pk,y,fU,LvN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vEuOE,,zZe,i,Lq,xa,i,jBP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ejdpn,,,U,KR,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ijZwF,eBwwX,gpyD,D,oLI,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LWXHZ,,zZe,D,k,rSZ,L,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QsFSX,HBWfw,zZe,i,GF,TAUy,i,jBP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GzjET,,bVnY,i,xk,Cj,hk,pf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Hnohq,,ZQa,D,GF,buw,fU,EWYK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OXzfD,,Gac,D,kWZ,zz,i,caiIb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SZrqP,,yhq,i,zz,,l,mso,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,odfwQ,,,i,zj,TAUy,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nhfmS,,,i,Nc,,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yYypG,IgZNL,opm,D,GF,yC,i,KnQQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fyupZ,EwHnk,mNh,i,RI,Cj,l,Ot,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WtYXk,,bVnY,D,Kg,mwY,lR,iCs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NtzSj,ClwEM,QMl,i,GF,jF,L,UOy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Xektr,,zZe,i,Zi,XLQ,i,QIfF,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xJvGR,rXnhf,Vj,i,GF,gI,hk,ltjd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aGVaX,EOhNc,CqC,i,n,HSL,lR,bwfa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TLTGK,NKoEu,mNh,D,Ot,pPN,lR,QIe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dwGIC,,LjAS,i,mR,Yxhj,hk,tRoX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,npvHt,,CqC,U,G,TAUy,lR,mlk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tpBGS,,LjAS,D,u,nT,hk,bEU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uKqDA,,,i,Lz,DSA,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,psQqJ,izZbI,,i,RC,Cj,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vJSMd,,,D,Zi,RV,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XHPet,,LDk,D,iL,ESA,lR,SOmf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fAjrE,,iV,D,FN,hmKv,i,cBEE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,krchk,,,i,JnB,Cj,fU,FL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BqTdw,RUGgg,xDLG,D,mR,Pif,lR,YDJD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,doWmQ,,mNh,i,RI,,l,xVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rslsj,,xDLG,i,SC,SC,hk,ZW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WPcab,,VsKz,D,nj,dYPI,hk,jHcO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WoAEP,,iV,i,RI,ZDwU,hk,ejeV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lQTMi,,LDk,D,iL,pgd,i,sCA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tiwnd,,VsKz,i,zj,TAUy,i,aEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LAfnr,,CqC,i,IT,,i,WMz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GPbap,qvyUv,LDk,i,aW,Wsd,L,GjWgq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dkOMU,,bVnY,i,cZ,HSL,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BUBRx,,,U,ai,SC,oA,bpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ySwMU,SyFMb,zZe,i,xk,hmKv,hk,qEA,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bHAUD,,LjAS,D,Kdq,gI,lR,RC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OPgWj,,,i,sp,dYPI,i,nj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BWZnX,,,i,Cme,EuKH,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZSXnn,OWAxl,iV,i,nU,rbp,lR,eIrau,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sqTmc,,xDLG,i,iL,juI,lR,giFw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IAkNp,BOLOO,gpyD,D,iL,rcz,lR,ieO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PiUKS,,bVnY,i,G,Cj,hk,ePq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DnnVR,,bVnY,D,n,gI,i,ymEs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RrTrl,,bVnY,D,RI,Cj,l,TzSh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hGlam,dzSyh,bVnY,U,EF,YO,lR,RNB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KypSL,,LjAS,D,kWZ,hmKv,lR,Mkeh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iXrQi,,rNcu,i,Kg,Cj,lR,gwxV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TmfsD,nndpW,zZe,D,RC,Cj,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vqNuB,,QMl,D,oLI,Cj,lR,hzO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uRbkB,,mNh,i,iga,pf,lR,cDsY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AUgXg,,KsKZ,D,mR,IamB,hk,vTnB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DeLyN,,QMl,i,pf,bfM,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,chDBX,,gpyD,i,GF,hmKv,lR,JnB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gqJaw,,bVnY,i,RI,,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WXpJH,,gpyD,i,GF,dYPI,lR,JnB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VCBos,,,D,GF,,hk,ogPD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BlyeA,,LDk,i,iL,Os,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,anAln,,zZe,i,GF,YO,i,oCy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NwtZR,KTthd,,D,qh,ev,fU,BGMV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dceZJ,LETzR,EXYv,D,kWZ,Wsd,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yauSJ,vTSnp,zZe,i,mO,Cj,l,EMH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BYKRb,ERiHU,ez,D,oLI,Cj,lR,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kczyQ,GQqvx,mNh,i,Cme,IamB,hk,AAFPx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cxCzo,,iV,i,RI,xa,l,cyXz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,usBub,MWxHT,Vj,i,pf,YO,l,EMgg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sVDkc,,bVnY,i,EF,DQc,fU,pqp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ykIND,JWxme,LjAS,i,GF,SC,lR,EnE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TOhwY,,gpyD,i,y,yC,lR,WFD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dxkiW,mONwL,ez,D,wGj,SC,l,HTUE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,toAyq,,CqC,i,FL,RSST,lR,sSfIB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CgiNm,KgLFo,LDk,D,aW,zI,l,BKAi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,npiXs,,,i,KR,LHS,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FUAxP,,xDLG,D,Kg,WHBi,lR,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hqESf,,bVnY,i,n,YO,lR,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sTttQ,,iV,i,bf,Cj,hk,kWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qCrQD,,bVnY,i,G,rbp,hk,nkrP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fPQHm,,xDLG,i,OS,PF,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CtzbB,gwGKb,iV,i,zz,YO,lR,TrrrN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uTvxx,,LDk,i,iL,,lR,buOb,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bpXXY,Tnycz,bVnY,U,G,yC,lR,Ikqq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LUXqg,,Pcb,D,u,SC,hk,fzn,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,STDjU,herJX,xDLG,i,jgn,JVF,lR,WQYX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qvcVX,DLtpg,xDLG,D,iL,ber,lR,jEkW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vWVVW,,zZe,i,iL,auP,i,fpTZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uFCRu,,CqC,D,GF,,lR,JGLs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BlQIc,,EXYv,D,k,YO,lR,PSZG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FtVxW,,bVnY,i,db,sp,lR,boZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eqCpQ,Dxgrx,CqC,D,FL,Kg,hk,oUBe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OzRIZ,ojeZB,Pcb,D,xa,gI,lR,MAI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,omRBe,,LjAS,D,aW,jaP,hk,KWZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xydSR,,yhq,i,n,Cj,fU,NaYC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SfKMU,lASnD,zZe,i,sp,gI,fU,jFI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dEYEm,,opm,U,SC,Pif,hk,oh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NHmIx,,gpyD,i,RC,YO,lR,TQk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sWuuW,,zZe,i,iL,QhZm,hk,Kdq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NEAWu,ytgnG,ez,D,os,WNP,lR,odpy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vlFdZ,,LDk,D,iL,fX,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Jabrr,,CqC,i,Bu,Zvq,hk,schix,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RVOBZ,,VsKz,D,H,aRnz,i,mFxC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,usyre,,,i,YO,pf,i,TpNW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ubDqJ,,KsKZ,i,Nc,dYPI,l,fX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NZJOz,,aN,U,GF,FvO,hk,gtwH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lxNau,,LDk,i,iL,FXZ,lR,IT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bmuhO,OTmTL,ZQa,i,xk,xa,hk,dSqA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AZDHL,,xDLG,D,Ld,,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ruKdN,,iV,i,GF,rmJ,lR,iaMC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UrOT,,VsKz,i,oLI,gOZx,i,aEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yhnj,DnPCF,,i,Zi,yC,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YAWE,YTckD,EXYv,D,pk,sp,i,uwra,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EuHw,RdvaT,CqC,i,db,mwY,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tHtI,,yhq,i,GF,ESA,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oBWJ,kyLsL,ez,D,FL,RSST,fU,CVT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SLTN,,,D,kWZ,Kg,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VPUO,,,i,Cj,sWhI,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KPga,,,i,iL,vtyj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Vwhg,VdCfJ,,i,u,y,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qMpk,BFkyu,,D,iL,lQU,hk,ORyJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UTLg,CiZAV,jb,i,bf,Cj,fU,fPyF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZPiM,csdNC,xDLG,i,zj,JoXv,lR,Hvj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kogp,,zZe,i,FL,sp,i,EHI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QoCX,puepy,LjAS,D,iL,FvO,lR,oWSg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UftT,,QMl,D,hyz,xa,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,btcn,UkymH,iV,i,iL,SC,lR,NFu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RvGY,,iV,i,RC,Nc,hk,UCAs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TGte,,,i,iL,rbp,hk,mO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Eloq,,anf,D,H,QDT,hk,ncoO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pbdI,,opm,i,iL,uECy,lR,lVH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WZAC,,CqC,i,H,ZjS,lR,iga,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EdKS,,CqC,i,s,pf,lR,HCh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uIjX,rGrAE,zZe,D,Kuz,pf,hk,WLK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ULTo,,,D,xk,RV,,,5745443378641966420
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TAUy,,EXYv,i,Zi,DME,l,Asj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GKSX,gOZzt,Vj,D,kB,Vvh,i,kBnd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bGOW,,rNcu,i,Kg,Mcs,hk,wIqNY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nMxp,iMVgZ,LDk,i,iL,pPN,lR,mR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZDwU,,CqC,U,ZW,NTj,hk,qh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EeYg,,VsKz,i,FL,DDPD,hk,Wm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,alkP,,LjAS,D,Cj,iADy,hk,oh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sofh,,Pcb,i,u,dYPI,lR,EdeN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FFFL,,CqC,i,GF,YjrO,lR,Ep,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,abkK,,yhq,i,H,eKfc,l,gJss,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nOlS,,anf,i,H,gOZx,l,VSHT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iRiQ,,VsKz,D,k,gI,hk,KEOe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XmSj,gFUKK,VsKz,i,vk,pf,hk,fHv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uPqM,LQsok,ez,D,n,YO,hk,cOcg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rHKt,RGitv,EXYv,i,RI,Cj,hk,qZiQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UKSK,,,U,iL,Wsd,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MkZI,jXcik,gpyD,i,ZJA,LhLc,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZQwR,ClwEM,gpyD,i,n,zI,lR,mEdg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jJmz,zOpXm,CqC,D,GF,sp,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mhKC,,yhq,U,iL,lVH,l,aYOk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DXkL,UcrWb,yhq,i,Bu,hmKv,hk,kdc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lmAx,,bVnY,D,xk,,i,MQw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OFxw,,LjAS,D,GF,,hk,Pj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MFVa,,zZe,i,Bu,WNP,i,LvN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MFVa,,CqC,i,Bu,YO,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yxeI,,xDLG,i,iL,xa,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lZSR,,bVnY,i,n,dYPI,i,SC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mLoc,,yhq,D,bf,y,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aICH,,jb,D,JnB,,lR,VYuQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OLAy,CQdBA,EXYv,i,xa,ev,lR,wNsQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Jglf,jCPPl,mNh,i,RI,gI,lR,lsSr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fpTZ,,CqC,i,G,hmKv,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Wjgr,,VsKz,i,sa,HSL,hk,YZjqw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nGWJ,,zZe,D,yC,gI,hk,FHSlf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RlxT,cEpGn,rNcu,D,zj,Zsbp,i,Avbv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hVHi,,zZe,i,zW,aRnz,lR,uid,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JzWA,,rNcu,i,Kg,Yxhj,i,VjfC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pGYB,alpkt,,i,mR,hmKv,lR,hmlu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nuYV,,iV,U,GF,dYPI,lR,inzs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jnbh,iHDlb,VsKz,i,GF,Ri,lR,GCAN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gtwH,,CqC,i,n,YO,lR,wsJS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gMCg,,zZe,i,xk,Kg,hk,NGeK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qqgy,oBwBc,yH,i,Ri,Cj,lR,qsJc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ahkG,yPBim,,D,Kg,nT,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jqok,,yhq,i,Kg,bvX,lR,sbO,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XkNZ,,ez,i,nt,Cj,lR,FgKx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xtJj,fxErQ,xDLG,i,zj,hmKv,i,Tumz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jyzK,SefEe,Vj,i,zj,hmKv,lR,iGu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FDsv,,rNcu,D,Kg,Cj,lR,cuGpa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kBnd,,aN,i,GF,nZxO,lR,felL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KuXW,HCLtA,,i,YO,xa,hk,UdvE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wSqu,bPArK,OYMU,D,RI,y,l,SzTa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bxXJ,,Vj,U,GF,,lR,UPZy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oCzE,NoEvu,Pcb,i,SC,y,lR,JIlyZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DKoU,,,i,G,Zsbp,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UKYX,,QMl,i,kB,ev,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dMdU,,zZe,i,cZ,vtyj,i,qVs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JNSq,,,i,FL,LVh,hk,mO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Thpg,,iV,i,GF,,fU,xqVf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MmFP,,zZe,i,G,DME,lR,yYLW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uDuf,,CqC,i,FL,Jolg,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uDuf,,,i,FL,gOZx,lR,Nc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ezFf,,yhq,D,GF,VyBk,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Oyzi,LdGeV,,i,GF,blEU,i,kAe,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CUkT,,jb,i,iL,RxF,lR,zz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WwAX,,CqC,i,H,sp,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sIOm,,gpyD,i,GF,gI,lR,NXBi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sIOm,,CqC,i,GF,blEU,lR,bvl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QoIi,,ez,i,Ri,xa,i,kjeO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IoYI,dzSyh,ez,D,k,xa,i,mAJw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MVdL,,iV,i,GF,Cj,lR,zvFx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QhEp,,aN,D,RC,hmKv,hk,lTC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gMZR,vdUHx,,i,EF,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MkpI,,bVnY,i,sa,bqRO,lR,FSG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UVZb,,iV,D,OS,Cj,hk,Cme,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zMqu,,,D,zj,HaU,i,lzQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nGOx,,aN,i,GF,aRnz,hk,RKH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vbOF,HsZBB,bVnY,i,n,jBP,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BryE,,,i,GF,YjrO,lR,fLtv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TVjH,DzgFa,,i,G,TAUy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TVjH,,,D,G,TAUy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QCRl,,,i,FN,,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fwdx,pcpoK,rNcu,D,RC,Kg,fU,icxA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oZUs,unoLA,Vj,i,s,YO,i,UMJG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pChe,ZanZO,zZe,i,G,jaP,lR,nGOx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pChe,,zZe,U,G,,i,XBS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bqJy,DKMuX,CqC,i,y,tyug,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bqJy,,VsKz,i,y,,hk,WZkT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NuQz,kEFeM,CqC,U,n,oDHw,hk,ivV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NuQz,GCxFI,Vj,i,n,RV,hk,zKO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,wwFAY,xDLG,i,os,SC,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,mtJJa,gpyD,i,os,Zsbp,lR,lhKA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,,,D,os,uWTD,lR,EY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHyG,,VsKz,i,GF,Xzsr,hk,vbnfF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qEey,,CqC,i,GF,Kg,hk,kAII,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dKUM,,KsKZ,D,jgn,hvW,l,fX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,hQGku,EXYv,D,GF,y,i,XYhu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,VONBE,gpyD,D,GF,nT,lR,SUFr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,,,i,GF,nT,lR,yIJv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,GnGQh,,i,Zi,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,LhzxC,,i,RC,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,gZyYP,,i,nU,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZjNud,LDk,D,JnB,y,T,Ezzo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,alpkt,mNh,D,cZ,hmKv,hk,lDKL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,sYeDO,bVnY,i,mO,Cj,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,xoEpJ,,i,GF,DME,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,xoEpJ,,i,zj,pf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,fFndS,opm,D,YO,YO,hk,GuBJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,cqJdC,ez,D,BAR,pf,ri,bnsy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,fxErQ,QMl,U,oLI,hmKv,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,eavtW,,i,GF,jmef,L,DoN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,JYxTL,EXYv,U,Om,whE,l,yH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oUmpn,,i,GF,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,mZcIF,,i,GF,Zvq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,jkdjQ,QMl,i,pqp,WNP,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,jkdjQ,iV,i,n,WNP,hk,ghl,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,jkdjQ,Vj,U,ZJA,WNP,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,pLYXJ,Pcb,i,ss,,lR,MAI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,rWXFR,,i,OS,sp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,sYTtD,mNh,U,jF,Kg,hk,ZqIp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qgWye,,i,RC,eQE,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZOSBD,zZe,i,jgn,RpZ,l,yDke,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,WpMjV,LjAS,D,kWZ,Cj,hk,woE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qwbvG,,i,YO,FvO,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,wNpHN,EXYv,U,vk,xa,lR,lUDl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,DmPDX,yH,i,RC,uGF,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,TdMRE,bVnY,D,RI,eQE,fU,ZZh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,QvGNg,,i,k,Cj,lR,tmM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qytCC,,D,RI,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,vnUks,,i,O,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,yOhXn,,D,qh,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CiZAV,,D,BAR,pf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,Exftg,,i,Yx,Cj,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ouvnZ,bVnY,i,nt,y,fU,UPOt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,wXtSg,iV,i,GF,Cj,i,xKSj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ivYgu,mNh,D,hyz,Wsd,T,GBb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,GzWeI,,D,hyz,Wsd,l,s,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,BTqwo,,i,RC,mwY,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,teKMc,,i,iL,Cj,l,pBlc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZIelK,bVnY,i,y,YO,i,xoi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,VxHVF,CqC,i,Ld,VIM,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,lAeLg,EXYv,i,u,jBP,lR,zInu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,RZfCx,ez,D,BAR,YO,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,TZFeB,bVnY,i,pk,SC,i,nU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,VONBE,,i,THd,nT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,lFmPR,iV,i,n,Bkt,hk,osVT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,JFMRC,rNcu,i,OmE,lQU,lR,icUxs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,troYa,yhq,i,Zi,SC,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,lHjLY,mNh,D,oen,SC,hk,Pe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,aPzRl,,i,NHX,pqp,l,MpP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,LETzR,,D,n,WNP,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,DLtpg,,i,THd,y,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,JpXCs,,i,n,y,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,poNAP,,i,JnB,xa,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,nMlTX,,i,GF,xa,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,XctNb,mNh,D,u,xa,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,XctNb,ez,D,uP,DSA,hk,bCU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ERiHU,zZe,D,k,xa,L,TUw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,uKbUs,ez,i,Ri,rbp,l,s,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,MWxHT,gpyD,i,RI,YO,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,hAjyU,QMl,D,hSE,Bkt,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,fSuly,QMl,D,k,flWz,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZqfRS,,D,kWZ,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,LyFOT,,U,FN,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,amZvm,,U,RI,Bkt,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,kSXVa,,i,GF,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,UvBeZ,,U,xk,dYPI,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,hDwuu,,i,RC,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,RnZxv,rNcu,i,mO,dYPI,lR,ROj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,QjAFk,,i,G,vtyj,fU,hkf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,tImXj,ez,i,uP,hmKv,hk,bCU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,wwGFC,,D,GF,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,cPETG,xDLG,U,Cj,hmKv,hk,kAo,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CfjhB,,D,BAR,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,EWrtg,ez,D,mR,LKKI,lR,qBDX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,i,kWZ,qWFT,hk,PFGZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,i,GF,pf,hk,MSh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,i,eG,WHBi,hk,WZkT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,D,iHi,nT,hk,BfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,D,aW,SC,hk,lUt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,D,mO,Mhu,hk,qreD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,D,mO,gI,hk,gnq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,oLI,uECy,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,GF,pBlc,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,RI,Zsbp,hk,lBY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,RI,iL,L,SDLA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,xa,Cj,hk,GYdA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,Zi,Cj,hk,ZUnj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,Zi,gI,hk,Yx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,Ds,bhM,lR,xeL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,Ep,KCWa,i,GF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,qh,Cj,hk,Ezzo,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,G,ZNN,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,U,Pj,ber,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,jgn,Yxhj,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,xk,bfM,hk,KPGx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,yf,GCL,hk,utHs,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,k,,lR,JDK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,D,JnB,dYPI,i,cxNM,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,D,SC,pPN,hk,XZQs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,Zi,uGF,hk,tCo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,Kg,kPj,hk,jlfSL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,D,FMt,y,i,XqSU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,i,GF,HSL,lR,Wu,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,i,Zi,ber,i,JAu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,i,mO,FvO,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,D,TGR,xa,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,exS,Cj,hk,yC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,H,YO,hk,gdJkQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,hyz,fX,lR,GluXQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,FN,Cj,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,xk,KMAv,l,KokH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,SC,yC,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,i,FN,khbX,hk,VmQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,i,RC,,lR,QxcH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,D,FN,EuC,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,i,oh,DME,lR,TfK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,i,Cj,y,hk,jBCu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,D,os,dYPI,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,GF,WcDS,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,boZ,sp,fU,jFI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,aW,GF,lR,WgGe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,zz,wCsQ,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,KR,gOZx,i,QIfF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,yC,uECy,lR,JVzI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,Bu,Cj,lR,vxnR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,,,lR,JZaNn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,D,ZKX,,hk,UZP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,D,aW,RV,i,EHI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,D,yC,jHBL,hk,qCJk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,anf,i,ev,aRnz,hk,Gwz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,SC,uECy,lR,qOkU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,hyz,HSL,hk,lwrj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,na,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,JI,,hk,SJPtu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,SC,ZNN,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,u,gOZx,lR,ywB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,u,na,lR,jGykH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,D,qh,HMXY,lR,IaL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,D,u,soR,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,U,eG,jF,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,pqp,pPN,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,pqp,gGz,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,pqp,RV,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,FMt,zNvM,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,boZ,wnVT,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,hyz,UMQZ,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Pek,WNP,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,oLI,hmKv,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,hSE,zz,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,TGR,bqRO,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,BAR,DME,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,GF,buw,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,kB,gI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,kB,SC,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,pk,gI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,KR,WNP,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,sp,Tmcy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,xk,Ouf,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,yf,mpy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,SC,uECy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,u,Ktd,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,k,jBP,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,n,sp,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,,TAUy,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,RNB,mwY,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,JnB,HaU,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,FZj,GF,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,GF,,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,RV,lQU,T,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,BQ,Cj,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,RI,EPcs,lR,uLxt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,RI,lQU,T,H,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,xk,RV,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,sa,Rk,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,sa,nT,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,k,Xua,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,dQD,iADy,lR,ufVD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,GF,sp,lR,ZBq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,sD,Ouf,lR,ss,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,Ri,Vnr,hk,qh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,D,sD,sp,hk,ZGQn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,U,aW,,lR,IT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,U,iL,xa,i,LZPbB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,i,iL,VyBk,hk,uOFxO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,i,ai,gOZx,hk,jjxF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,oMY,yC,hk,zVT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,yH,hmKv,hk,RbWEP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,Ds,Kg,lR,THd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,D,FW,ZNN,hk,QOcmg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,D,BQ,hmKv,hk,QntX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,D,mR,qyCG,l,WMJFZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,JnB,gOZx,hk,fflq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,pm,rSZ,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,GF,uECy,hk,U,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,Zi,dYPI,hk,lOvv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,Ep,dYPI,L,YlIz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,nT,IamB,hk,frg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,oen,HSL,hk,TqnW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,JnB,uGF,l,VHrL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ZQa,i,zW,YO,lR,OSnoT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,Zi,ZNN,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,mO,DME,lR,rSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,mO,DME,lR,KR,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,mO,zz,T,rJmw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,mO,SC,lR,Dzzp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,D,mO,yf,hk,PMH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,BAR,TAUy,hk,FZj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,BAR,sp,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,GF,pf,lR,eFcJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,nt,tCwq,lR,ZhX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,D,BAR,XLQ,hk,FZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,hyz,gI,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,JnB,QhZm,hk,Okp,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,GF,PQBq,lR,ReWm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,GF,LHS,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,GF,Cj,hk,cLXuh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,s,ZKX,hk,Okp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Vj,D,IaL,zW,hk,JDePj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,boZ,pf,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,JnB,sp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,JnB,,lR,uid,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,BAR,dYPI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,lVH,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,kWZ,ShH,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,GF,wnVT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,na,ev,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,iL,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,FN,uWTD,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,Ri,yGet,l,s,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,exS,buw,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,pqp,Cj,,,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,FMt,Kg,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,boZ,,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,boZ,,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,hcd,TAUy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,ZUA,PF,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,hyz,jaD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,dQD,kgW,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,dQD,Cj,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,xVO,jF,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,THd,Zsbp,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,JnB,gOZx,i,Alg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,JnB,KCWa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,JnB,qWFT,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,oLI,sWhI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,oLI,pPN,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,jgn,RqID,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,hSE,aQj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,hSE,Rk,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,HSL,,,4580924003713965791
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,yC,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,y,oA,bpC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,GF,y,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,kB,sp,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ld,Cj,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,iL,GgOg,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,yH,SC,hk,jsLA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,pk,ubP,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,KR,GCL,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,KR,ShH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,KR,YO,L,G,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,gI,Zvq,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,jF,y,i,Alg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sD,XThn,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,wnVT,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,Alg,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Zi,ZUA,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,FN,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,mO,sp,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,cbZ,fU,y,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RC,jF,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Kg,jBP,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,zj,uIjX,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,zj,,,,5857344069070698923
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ds,sp,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,nt,rbp,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,eG,kgW,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,eG,Cj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,sp,,fU,PF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ri,NTj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Ri,,hk,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,PF,sp,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,OS,ShH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,SC,ify,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,SC,Zvq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,G,ZHiH,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,k,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,k,na,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,n,HSL,lR,tmM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,,Zsbp,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oen,Cj,oA,ZKX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oMY,dYPI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oMY,fAb,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,IaL,TBUv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,hyz,Vupn,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oLI,qyCG,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Kdq,xa,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,kWZ,gOZx,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,kWZ,lQU,fU,Om,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RV,Jjn,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,BQ,jBP,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RI,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Rk,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,aW,DDPD,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,ai,sD,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,yH,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Dq,rcz,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sD,gOZx,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Zi,sp,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Kg,rSZ,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Ds,nT,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,oh,soR,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,nT,,,,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sp,aRnz,hk,ebk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sp,juI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,xk,kgW,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,xk,Cj,,,5327653760319593481
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,fx,Mcs,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,SC,Blj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,qh,rmJ,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,,RqID,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,HbINusD,VzUtA,,i,RI,DQc,l,FN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,bHkKTNI,eKNig,,i,ZW,y,hk,AGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,KQfXHHa,TttFj,zZe,i,Om,ESA,fU,OUjq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FIQeQgh,uYWpN,QMl,i,BAR,jaP,T,nT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,aselJIG,DzgFa,,i,qh,TAUy,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,vWTLZCH,AXhVB,QMl,D,BAR,whE,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,NDKJBnQ,kDbMl,zZe,i,ss,Cj,L,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,UkxRWnf,zcjHS,zZe,i,KR,XLQ,i,CTbJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,LXOmvYr,LQsok,gpyD,i,Cj,bf,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,gOUIcGP,rEMyu,QMl,i,Bu,YO,T,DoN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cYrdeJM,VONBE,,i,gI,jF,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,sIWVLo,ivYgu,yH,i,zlG,gI,fU,vk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,DNYiRg,unoLA,,D,vk,dYPI,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,akwckp,wNpHN,EXYv,i,RI,hfB,lR,uuuk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,RQwMvj,,QMl,i,RI,IamB,T,GZAi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,foYvAu,VONBE,,i,sp,nT,i,Ldh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,DFxnSS,MWxHT,,i,n,jF,fU,U,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,BOKzCg,,mNh,D,hyz,KMAv,lR,VkQO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,eifvtL,pLtxP,,i,aW,mwY,hk,mO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,OCHCIR,Jgzfx,,i,BfM,dYPI,T,mEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,OnmKHW,tuGlk,jb,i,FMt,kWZ,i,Kg,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,TQxzuS,,Vj,D,RI,cmmA,i,ekbX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,efkxDz,ViguX,VsKz,i,kB,FvO,l,xgIyH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZjZFFu,VzUtA,VsKz,D,RC,Pe,l,zmB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,meSEdf,WYASP,mNh,D,aW,Cj,hk,EMva,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,KLxbyX,mgoTc,xDLG,i,qy,LHS,l,xtA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,LIxziO,,ez,i,nt,hfB,hk,mFkw,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,NTMCTP,doIEg,EXYv,i,RI,SC,fU,nsR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FrUMqc,hFYeU,bVnY,i,bf,Cj,lR,hAxOs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,eiaGam,,zZe,i,FL,pPN,i,FznsF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dQOlEY,mONwL,VsKz,D,k,lQU,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rXOUa,LIbau,zZe,i,O,fX,i,Zwa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,CGEcS,qyqVu,Vj,i,mR,bfM,i,JPSK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,fXyEE,llHEg,,i,zj,rbp,fU,FvOQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,XSaAv,hXczE,yhq,i,ZJA,mwY,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,TLzxL,pIHjA,aN,i,THd,WNP,hk,DITTB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,aIAGc,bzidY,Pcb,i,qh,xa,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,Vdujf,MNqGT,rNcu,i,n,YO,L,iL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SuBGa,xZsRI,bVnY,i,jgn,gI,i,GF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,sLxzZ,ESRiE,ez,i,uP,hmKv,lR,gmi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,Dzzp,FXwbX,LDk,i,iL,DDPD,i,zz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FWRd,wNpHN,CqC,i,GF,gI,i,hLJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wiEw,pzLPd,,i,iL,uECy,L,xAF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,CZmj,hKYJZ,ez,i,FL,Kg,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,fBmT,HyxxB,LDk,D,iL,FvO,i,zz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,mhKC,FVyoD,ez,D,iL,lQU,lR,ffL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,oUBe,,iV,i,GF,gI,lR,nJVS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SOAW,FbvHy,ez,i,iL,YO,lR,QhEp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ngDy,Emiva,,i,cZ,bnz,hk,mldVf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,eNNx,dorgg,iV,i,gI,Zsbp,i,Ktd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,euVq,CQVvq,xDLG,D,RC,hmKv,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cqfS,doIEg,CqC,i,FMt,yH,lR,Alw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wiVe,,bVnY,i,FL,,lR,OzyN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wqNK,teKMc,yhq,D,GF,HSL,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,bxXJ,Shfbn,bVnY,i,GF,bfM,fU,GF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,aZlc,TVeAq,iV,i,G,hmKv,lR,RyV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,nGOx,sUpmg,xDLG,i,GF,pf,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,lSkB,LzlHg,CqC,i,G,zz,hk,SCGA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cHyG,rrGCj,CqC,i,GF,yC,lR,ZNN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cflD,dheCD,,i,GF,uECy,oA,bpC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,uePum,,i,kWZ,ZNN,lR,SIMzM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qVloc,,i,RI,nT,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UQUUE,QMl,i,Zi,xa,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,gZyYP,,D,mO,xa,oA,bpC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,NMwlg,QMl,D,eG,hmKv,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ZvTyL,QMl,i,qVs,gOZx,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,vAuYo,mNh,i,nj,qgNx,i,zjtN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,TtcDA,QMl,i,IaL,FvO,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ESruI,QMl,i,kB,Alg,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qvYOL,QMl,D,Yx,jF,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,BesNn,iV,i,n,,L,rEzo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,FbvHy,Gac,i,qh,Mcs,lR,idb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,AXhVB,,i,Cj,oeg,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qPmqU,,i,qh,RV,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,vdUHx,,U,u,Vvh,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,vdUHx,,i,Nc,jBP,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ncTpP,,i,RC,XLQ,T,iQgsY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UpZhy,bVnY,i,zz,uGF,hk,Yx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zpINo,,i,pf,HSL,l,FN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,abjVt,gpyD,i,aW,ev,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UZDWv,QMl,i,Kg,zI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,uYWpN,Vj,i,hyz,flWz,lR,bf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,uYWpN,,i,kB,Rfp,fU,Om,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ClwEM,,i,lVH,Pe,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,EwHnk,,i,u,eQE,T,mEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,jHsOR,EXYv,i,eG,bvl,fU,SQHW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pajrf,QMl,i,jF,ev,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,hQOsJ,QMl,i,u,Cj,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,nHVgM,QMl,i,vk,uGF,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,RTQUJ,xDLG,i,BAR,ev,hk,KmKM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ivYgu,QMl,i,PF,Wsd,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,sKhEy,QMl,D,hSE,BQ,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,sKhEy,,i,Pj,SC,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ARWie,ez,i,uP,HSL,i,KZJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,TjJiS,,i,THd,HSL,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ShUhD,LDk,i,qh,y,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,fFPdL,opm,i,BQ,y,lR,NMG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,HGnGo,ez,D,nt,y,lR,vQjcH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,VzUtA,gpyD,D,RI,fX,lR,jqINa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,lHjLY,Pcb,i,u,NHX,lR,eOKnb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,lHjLY,QMl,i,Kg,SC,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,FmJTH,Vj,i,mR,SC,lR,QoKz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,herJX,LDk,i,ai,RV,hk,hEQ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,LJytA,Pcb,i,qh,wlp,lR,ino,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,CgiNm,,i,pk,Wsd,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,Fpffr,,D,FW,sD,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,dQgun,QMl,i,RI,Cj,T,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,JVCDC,,D,u,pf,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,eIJDE,,i,KWZ,na,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,rSjvT,,i,FN,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pKgAU,yhq,i,gI,VwET,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qZzCL,,i,IaL,RSST,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qZzCL,,i,gI,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,miwCS,,D,Cj,TAUy,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,DzgFa,ez,i,H,TAUy,lR,NtZN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,bVnY,i,Yx,zI,lR,G,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,LjAS,i,Zi,DUHG,hk,NHmIx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,db,khbX,T,GxE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,u,Bkt,T,H,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,D,RV,OxU,T,FMt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,mNh,i,JnB,RSST,hk,VWRZj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,mNh,D,hSE,KnZo,hk,lOvv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,ez,i,H,TAUy,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,ez,D,nt,Zsbp,i,Rk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,hyz,Wjnt,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,D,WLK,eKQv,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,D,RC,,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,D,G,GxNZ,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WyuXwXN,,jb,D,nt,gOZx,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RMTwkkv,rGzDb,LDk,D,ai,YO,hk,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gKttCbP,qvyUv,Vj,i,mR,edWw,l,TGR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WDkJTkP,ytgnG,,i,u,uGF,T,fx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,THdKskm,XsLDX,,i,Lq,iPIT,fU,PF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ljUbEfm,,,i,FL,RSST,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bfxNMjo,ytgnG,EXYv,i,k,WNP,fU,TNo,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lxRsNmM,zLIpF,QMl,i,qh,zz,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FUydefU,DXeTv,CqC,i,sD,rbp,lR,ss,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,guFsesL,MTddS,,i,RI,WNP,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QCDEyyC,,iV,U,BfM,WNP,hk,Lz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xXzCoag,fFPdL,rNcu,i,mO,Cj,fU,HMlv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wspRjCE,WoFPI,mNh,i,pm,dYPI,hk,ddk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FNGkXoR,qZzCL,,D,os,y,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZYEqxVB,JFMRC,Vj,i,ZJA,SC,lR,wHpCL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dsJFdon,jCPPl,,i,n,xa,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Hrdhqfj,,bVnY,i,Zi,,i,cAq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ehstTev,ruKdN,LDk,D,fx,uECy,hk,isdVA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BpKgGLu,bWJlU,,D,kWZ,y,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DjFqRIi,TSHJn,jb,i,Bu,jF,l,zOi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RZTqAva,DWRev,ez,i,ZKX,rSZ,lR,VCji,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,deGNJPf,hQOsJ,Gac,i,FZj,Cj,lR,asmh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XKyWAsT,rRbDE,VsKz,i,oLI,hmKv,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wcgpGwG,xTKHz,iV,i,jF,ev,hk,EnE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LCCSToF,LQsok,,U,GF,pf,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rXUxilW,eSjKX,VsKz,D,oh,ev,hk,tllY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ULUKlcF,pnejQ,EXYv,i,eG,hmKv,lR,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tRHikxM,ynBaL,EXYv,i,ZKX,hmKv,l,XUdd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KBxnuHL,cBrLC,LDk,D,iL,YVT,hk,OaVX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lJxRfFh,wDZsl,bVnY,i,oLI,,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cyEPSlY,qZzCL,mNh,i,Cme,Zsbp,hk,Hrde,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SqJauFm,XxSGv,QMl,i,JI,RV,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cmbGtOV,ClwEM,EXYv,i,k,eQE,l,kbJw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xWdWMYt,wwFAY,bVnY,i,pqp,xa,l,pMmL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bbojKKA,cBMeY,bVnY,i,Kg,Mcs,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MUUcRSS,RFSgV,opm,i,hyz,bGOW,l,TswG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zNFIdQd,rGzDb,xDLG,i,k,vFv,fU,y,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wwLIrpY,rGrAE,Pcb,i,u,YO,lR,MAI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ktKnNYe,QUpDF,CqC,i,gI,hvW,lR,IWHQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nLgkEfk,umGoo,zZe,i,lVH,GES,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cXCqgJU,oGiPf,VsKz,i,yC,DME,l,kGE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ptGpmsD,rRbDE,EXYv,i,RI,hmKv,l,Xua,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PMreIMa,UpZhy,ez,i,ZKX,Kg,hk,iYc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sBXgIex,CiZAV,Vj,i,iL,Cj,T,xvb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vFQDQuI,vRRPf,Pcb,i,hyz,pf,lR,iHi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GLkAgLg,,,i,KR,gRTo,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QDkUDMG,AXhVB,jb,i,RC,pgd,fU,fZXHU,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rdMrnMO,,zZe,i,gI,RSST,lR,WPOA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NphUdum,jrPjI,Vj,D,oMY,DQc,hk,FKtq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RwsHVuR,VONBE,CqC,i,zOi,y,lR,iFk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jUMoneo,dheCD,CqC,i,Zi,uECy,hk,dQD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qVmjQGI,vuJZI,yH,i,RC,ev,lR,hYOl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gBrmDoD,jBtmc,bVnY,D,OS,SC,hk,kRoM,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OBHAJTB,vflvs,QMl,i,KR,hmKv,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cDPqNIE,uLFqs,jb,i,n,sp,l,jSwW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fZlgrmc,PkDWB,bVnY,i,nt,zz,lR,boZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KyfdJQX,,,i,ePq,RSST,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wwymwid,ODyHh,rNcu,i,RC,FvO,fU,hQYc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Dkmricp,,,D,IaL,,hk,Dq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QxtbVBq,aGAzh,LDk,D,aW,hmKv,hk,OS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MjwjHrJ,qcqSM,yhq,i,k,YO,L,eG,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jqNCos,pljnu,,i,RC,QIe,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fGCxIk,,rNcu,i,Kg,TXLD,fU,XJED,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vNqmKh,qvyUv,yhq,i,SC,TAUy,i,ZNr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZbDnwe,oQByA,bVnY,i,sa,HaU,i,GF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oyBqsK,,mNh,i,Cme,hmKv,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GFkigS,VONBE,ez,i,k,y,l,lQt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pLDTRW,vdUHx,QMl,i,Kdq,pf,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jZrQJf,ONjMr,,i,u,ZNN,hk,WLK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YPxERM,CfjhB,QMl,i,Zi,qyCG,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fBARZS,LtyVZ,mNh,i,k,ZNr,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BdihPh,utPhx,Gac,i,SC,yC,lR,VLKL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kdzckX,YkAvm,iV,D,cZ,gJq,lR,Njo,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vkWKRl,JpSzL,,i,G,Cj,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kFawFo,VWsSK,Pcb,D,qh,hmKv,lR,KPGx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jOtVZz,jfpXE,,i,GF,kWZ,fU,Bu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fwRRuS,uYWpN,,D,kWZ,ev,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sKiIWz,iHDlb,QMl,i,RI,SC,T,FMt,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xpxMzO,jPrKo,opm,i,SC,,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZCBEue,JFMRC,CqC,D,jF,Pif,lR,Alw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mELwXz,,Vj,D,OS,gANm,i,OXWG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xZcbOM,wNpHN,QMl,i,vk,auP,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OdnqRV,HBWfw,QMl,D,kWZ,,T,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UfwMSG,ZAoAQ,mNh,i,Zi,hmKv,hk,sa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zrafpJ,loFIF,Pcb,i,GF,juI,L,xAF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OYQmbm,vtYeB,xDLG,i,ZW,rbp,l,MvjM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oMutmZ,IdPfZ,Vj,i,IT,xa,lR,fQFu,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TdOwUw,pBRVS,LjAS,i,THd,RSST,hk,BAnGF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dBoZhQ,CfjhB,,i,n,IamB,fU,GBR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xzZvbq,SomFZ,VsKz,i,Lz,,i,hSE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tXOdda,UriEN,OYMU,i,GF,pf,lR,Hotj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ayZdbq,,zZe,i,hcd,RSST,l,mhKC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,njHMAH,uWgCK,iV,i,gI,oka,lR,hjVy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NKhWra,oImqv,yhq,i,RC,gOZx,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FMpCNI,ponOy,QMl,i,kB,pPN,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JsnByx,,,i,pm,xa,hk,iyf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RgRPig,jrPjI,yH,D,mO,Blj,hk,SUQOE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gUkvus,EOhNc,,i,RC,SC,L,wlIE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iEnfvS,,mNh,D,sD,rSZ,hk,OxY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oOoTYO,ERiHU,EXYv,D,EF,xa,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,azMpWG,MzmlP,yhq,i,mR,FMt,i,eG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GVwuBS,kCwor,xDLG,i,RC,Cj,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pSNSdO,VINkJ,Vj,D,ZJA,ev,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EuZIvr,MBsTd,,D,Cj,bf,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zwtbDh,VONBE,CqC,i,RNB,ev,lR,bnrB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CzbxiJ,jIXPf,,i,GF,,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QozPIU,RUGgg,yhq,i,jF,Pif,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,whuzYq,qaAzm,yhq,i,zz,gOZx,i,HOCO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sCdIpv,CiZAV,zZe,i,Kg,HaU,lR,bZDF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ICBAiB,qZzCL,ez,i,u,hmKv,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UNZVTU,YNGaN,VsKz,i,GF,gI,lR,dsrr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AfpvLE,ltsZm,,i,RC,sp,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZFsCPs,ujyjw,zZe,i,jgn,IamB,i,Ri,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LqJbpm,nSvxx,yhq,i,xk,zz,T,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vUiSvy,vdUHx,iV,i,NHX,aRnz,l,Gjomx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hBrCtq,OCsfh,yhq,i,kWZ,ESA,l,HwK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,anlfTG,iboQm,iV,i,GF,cmmA,lR,mHlGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mNTWFq,oGiPf,rNcu,i,RC,bfM,fU,lloD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JQuOQW,LRfoQ,,i,oh,iga,l,OKdG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WdDhzO,DOhAH,QMl,i,Zi,Bkt,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YnDWBL,ckaGK,EXYv,i,sa,HSL,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KnLian,LyGdu,yhq,i,SC,RSST,lR,kUCq,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PtQkHN,ntMiQ,,i,xk,hmKv,fU,BRE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cTezSR,ZrkWF,xDLG,U,Kg,Zsbp,hk,zI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hoGsyo,tvXed,ez,D,k,Blj,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VTjpES,aPzRl,OYMU,i,yH,MpP,lR,yAmV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VTjpES,aPzRl,iV,i,yH,MpP,lR,NFu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JzGLmi,LJytA,QMl,i,zW,gJq,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gsavEu,qkqKB,Vj,i,ZJA,dYPI,lR,nre,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LPaivA,,LjAS,i,vk,YO,hk,Xdt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dVEYNr,,VsKz,i,GF,hmKv,lR,wilt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rWwDrF,,Vj,D,kWZ,Cj,hk,UdLb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XDnusm,jkdjQ,gpyD,i,NHX,xa,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BsJEyK,cPETG,anf,i,mR,tCwq,l,gps,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kzYXCF,UFinu,QMl,i,KR,ZDwU,T,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RNYenE,,EXYv,D,RI,SC,hk,MmW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MCPleF,mZcIF,EXYv,D,Ri,Cj,fU,vDwaI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cSkOiW,kWuXE,yH,i,mO,IuC,lR,mlAt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SFLlDc,pzLPd,LjAS,D,aW,uECy,lR,wfYS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BFsYAm,YTckD,EXYv,i,TGR,Kg,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NWrjQM,,ez,i,Kdq,Zsbp,hk,XSpX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HuVksk,vZyhX,,D,ZKX,pf,hk,YO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hdsliX,DnPCF,ZQa,i,Lz,Bkt,hk,AiH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lAtHaO,bWJlU,,i,qh,gI,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DWVdnx,frgYp,xDLG,D,Ot,SC,lR,kwK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gRmMSe,UZDWv,Vj,i,GF,y,i,cdwi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GWqQjN,aGAzh,yhq,D,aW,qyCG,hk,eIg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lXytOV,GwSmH,,D,iL,UpSB,lR,EY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ixPetJ,ivYgu,EXYv,D,RI,Wsd,lR,fzlFa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wSOhGP,kfqKW,,i,os,pf,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pOyfaR,JVCDC,VsKz,i,TGR,gI,l,XOk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iVAKsu,jlQut,yhq,D,GF,pf,i,eG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lzAmSC,DsqUE,EXYv,i,k,y,fU,VqeGk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IqzXHM,QImNH,ez,i,GF,WHBi,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gcJqlr,teKMc,iV,i,sa,juI,lR,sOTz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DJelur,rhHRL,,i,FL,FvO,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dMElzW,,Gac,D,Cj,y,lR,XGWF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ctAzXw,CmhcY,LDk,U,iL,sp,i,CWq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,htBpBd,HLYZq,Vj,D,iL,,i,EF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,htBpBd,,LDk,i,iL,,l,ccZUX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UuerIy,mcIIY,xDLG,i,Cj,,lR,jF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dhqrGa,oJXSu,,i,H,Kg,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TElKtF,RUGgg,gpyD,D,n,aZ,lR,RZc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JHPdHL,HXNdV,LjAS,i,iL,kWZ,lR,Lz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RnIkyV,vAuYo,ez,D,uP,pf,l,HTUE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hXFAyu,ROaOS,ez,D,bf,WMz,hk,TVjH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BDtbkL,vZyhX,LDk,D,iL,GWD,lR,SOmf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UWmhgO,uLFqs,CqC,i,FL,Kg,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RTUHKz,HXSgR,xDLG,D,Cj,aRnz,lR,KmKM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LCxDVG,LyFOT,iV,U,GF,hmKv,lR,GLyNO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OjNxzI,wzMIU,OYMU,i,n,RSST,i,NdS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FissOk,aGAzh,xDLG,D,iL,hmKv,lR,EHyY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GshVpI,CfjhB,iV,i,Cme,IamB,hk,zI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WenSOg,nndpW,ez,i,iL,Cj,fU,ZiAQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UjbrKg,PQodN,bVnY,i,GF,IWtD,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EdUOWk,,xDLG,i,G,,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RfDwnX,LQsok,xDLG,i,OS,YO,lR,gWqs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VBymyx,woFEW,Gac,i,mR,y,hk,Qhv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XLSfLa,YMYMT,xDLG,i,iL,DDPD,lR,wyXds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tCHYFR,GluXQ,zZe,i,G,,hk,YGZMr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cMzcXb,bWJlU,bVnY,D,RI,Cj,l,MQBC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UbmOWC,pcEak,mNh,i,exS,Vnr,lR,Pe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cPbTKV,jrmiQ,Pcb,i,u,yC,lR,ino,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PzNCur,,CqC,i,Lq,Wsd,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZzumcD,pEgGK,CqC,i,s,xa,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jOQbAn,GluXQ,xDLG,i,iL,,lR,QRPv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eGniNn,TVeAq,VsKz,i,s,,l,fsSz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NJpTkt,uYWpN,OYMU,i,vk,SC,fU,qego,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fsQcmF,bvupa,mNh,i,Lz,Kg,l,Ot,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QiVeAl,DFOIz,bVnY,i,GF,yC,hk,iPEG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SYkNhC,JjjZb,gpyD,i,GF,jaP,lR,ldTp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iJmvnH,hymXz,mNh,D,ai,yC,L,Jchx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iDFBMa,ZZrqs,,i,u,mwY,T,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CrNRLp,cWPuB,VsKz,i,n,HSL,lR,YxJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AFZsEE,Smrjj,LjAS,D,sa,LHS,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,smAHlV,FuLoz,VsKz,i,BfM,Oja,hk,BfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YwgmtO,sUPaq,LDk,D,aW,xa,hk,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QnFEIb,HKFIL,EXYv,D,iL,Ri,lR,RyV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ILLlKb,,jb,i,zj,HSL,fU,ccO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ARpQqO,HqZYe,Vj,i,os,gI,lR,MTE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gAwBeG,uYWpN,ZQa,i,zlG,ev,hk,ORKX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KzsmeM,CKSAk,zZe,i,H,lGa,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HQuMpJ,AzPRY,Vj,D,FMt,SC,l,TGR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MlCzCB,rHwUv,mNh,U,nT,IamB,lR,pYGT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VavVlh,FPgQL,VsKz,i,FN,ev,hk,ZcH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SmRzUS,oxvWf,Vj,D,ZJA,Ri,lR,AIjR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ugHMcB,eSjKX,,i,n,ev,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gXYZLw,PhJda,opm,D,SC,bqP,lR,oWS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YPBetc,UcrWb,mNh,i,RI,,l,xVO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hcbRLB,MAWHg,opm,i,SC,cbZ,lR,jJPJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AWigKk,RYvzR,rNcu,i,Lz,,lR,LIa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JMvcBn,auWsL,,i,u,fX,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ulGbeu,rrdcH,,i,k,uGF,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VmgGIB,XNYmw,,i,G,TBUv,l,hvW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wvLWWQ,FPgQL,Vj,i,ZJA,jBP,i,XSq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SjKuwi,hbKgs,ez,i,Ep,ev,lR,oRqL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IKmLjH,SKihC,gpyD,i,RI,aRnz,lR,FpWc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YdMVvR,ZbQqC,zZe,D,SC,FqO,i,OOXjW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EMMXOz,bYETe,,i,RC,SC,fU,PF,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fgZoUp,VnSVs,,i,Bu,jaP,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hYlAAJ,,gpyD,i,n,Rfp,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TpgspY,XUOMv,rNcu,i,FN,pPN,fU,mCO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wbThAS,,VsKz,D,xVO,hmKv,lR,REoT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xEZUiX,pRZeB,CqC,U,H,y,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QAMRFy,hqpMg,QMl,i,n,YO,lR,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MdmEVE,rYFYY,Pcb,i,u,cmmA,lR,xav,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LWtmg,uLFqs,QMl,i,H,aRnz,hk,Oeac,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MrwOh,,VsKz,i,k,hmKv,l,lcyd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vrlOS,pLYXJ,VsKz,i,pf,RV,fU,pVoF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UUepF,xKZuK,mNh,D,Ri,Cj,hk,jbc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XfYrc,wmMTa,mNh,D,aW,kzbx,lR,gaOx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uMeFe,QbFYx,KsKZ,i,zW,rbp,l,yGet,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rtmTS,FeFND,VsKz,i,n,RV,i,mFxC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Qulkr,sUpmg,,i,os,pf,lR,HFpg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VXiVn,bWJlU,Pcb,D,hyz,ev,lR,GJLqD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CLBaQ,frgYp,rNcu,i,RC,SC,lR,Pif,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zqfat,OqPXk,,i,THd,GCL,i,BQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nFRBj,DXeTv,CqC,i,n,bvX,l,pbS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YzstL,Tnycz,bVnY,i,cZ,gI,lR,Pek,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QbzAR,ZLcrj,,i,aW,Mcs,L,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rPgBp,QImNH,,i,SC,hmKv,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UBDEQ,ClwEM,mNh,i,sD,eQE,l,cHT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SWbVz,RZfCx,CqC,i,KR,rbp,hk,MkpI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XGyNv,zcypH,mNh,i,Ri,Cj,hk,Pe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HNHki,xTKHz,zZe,i,sp,zlG,lR,sivO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xXJfn,RUGgg,CqC,D,jF,Pif,hk,Uw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WEfTO,GlGAH,zZe,D,pf,SC,i,Asj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jzCrH,WEZQr,xDLG,i,FL,RSST,hk,TfK,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IEEaB,TsYlI,VsKz,i,mO,rSZ,lR,uYxY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oIpmz,HGnGo,QMl,D,RC,y,L,CVT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wjlwS,vdUHx,EXYv,i,sp,RV,lR,SXsB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BrWXI,ESevc,,i,KR,gOZx,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rlwhg,oBwBc,QMl,i,k,bfM,T,nT,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qtKyp,pehkw,ez,i,nT,SC,lR,eFcJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NhCNj,DXeTv,,i,GF,pf,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lIsVe,,rNcu,i,RC,DkwF,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mmNvw,,jb,i,GF,yyik,lR,vk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EnnYy,XeDef,Pcb,i,qh,ev,lR,zTLl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TKuhb,,CqC,i,dQD,sWhI,hk,ecCj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DeFag,NHNrT,,i,Kg,PF,hk,jgn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NsNNL,fQNSn,LDk,D,iL,auP,hk,rTPn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JQIQU,Edbfv,ez,i,vk,DME,fU,hZLC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fYWDD,LQsok,CqC,i,db,YO,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PGXWb,pLYXJ,OYMU,i,n,WNP,i,xk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qWSLt,DFOIz,xDLG,i,Ep,bqP,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FopFt,vdUHx,yhq,i,pm,Wsd,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LvAfa,kBvrH,,i,u,Cj,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BQuTI,zTnre,jb,D,n,yC,l,zOi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FFMYc,zYNao,CqC,i,FMt,yC,hk,qh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LkIyI,UTdlk,,i,Bu,huQM,ri,CdC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HmyJZ,,xDLG,D,RI,SC,lR,zI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OwbBR,ZSNHC,VsKz,i,SC,zI,lR,nyoQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iiJpu,DJSDE,,i,u,y,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HuEIa,sksHQ,mNh,i,Yx,Cj,l,cHT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PSxbU,hZPDA,,D,mR,Cj,l,mund,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sWbHM,,LDk,i,iL,DME,i,zz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,erGEo,uGnqn,,i,zW,,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ElbYU,,VsKz,U,Kdq,eQE,hk,JttR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Dlgrt,unoLA,rNcu,U,mR,Wsd,lR,MbLf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IwdGD,,LjAS,D,nt,uWTD,hk,WtzF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FpUQT,JGooX,LDk,D,iL,nT,lR,IT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZHeuc,hWlJY,xDLG,i,iL,Zvq,hk,TFX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jtUxn,lmLfO,gpyD,i,n,gI,lR,EBv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tCiCN,VONBE,LDk,i,iL,SC,lR,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Yuqzt,SKGNX,,i,pf,LzlK,l,FvO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BIMcL,,VsKz,i,Pe,rbp,hk,bjUm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nnUJd,ViguX,CqC,D,FL,zI,lR,MaADr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rMyQQ,eOvKA,LjAS,i,iL,hYu,hk,Qltjz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GYUEd,,,i,zj,aRnz,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GYxep,jHsOR,LDk,i,iL,GWD,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kZOFF,JMFQN,Vj,i,iL,db,hk,Kdq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SwPFA,bebfN,,i,RI,SC,lR,kB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yvhWU,baHIi,,D,RC,dYPI,fU,Om,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lvCoT,xZsRI,ez,i,uP,kWZ,hk,PeQtO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LWHmt,GwTdg,VsKz,i,Zi,ev,hk,CIWH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rqYwI,aRalA,zZe,i,zj,qyCG,i,hI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CxfKZ,cdmXU,iV,i,eG,SC,lR,Utc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dSzZF,,iV,i,KR,ESA,i,Gf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Wmjbc,brRis,ez,D,iL,HSL,hk,rXJD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JKLEL,jfpXE,KsKZ,D,iL,Cj,l,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AraPt,ClwEM,ez,i,bf,hvW,hk,GOF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hZPDA,ytgnG,,i,iL,WNP,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KSLGg,Rkjyt,,U,kB,IamB,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,twfsj,NLAAP,Vj,i,GF,SC,l,AFo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dCSed,zwxgR,LDk,i,iL,Qhv,i,ZsrT,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GKriH,VAVml,OYMU,i,Kg,db,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OvUTW,lFzoj,gpyD,i,n,VyBk,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YTDdb,XctNb,Gac,D,vk,ev,hk,qpRQA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WwWvW,iWmFf,iV,i,RC,uECy,i,jQkv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HLNPD,ERiHU,xDLG,i,Cj,YO,lR,gWqs,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SCzzc,,yhq,i,G,qyCG,i,kVsn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jpmZQ,fFPdL,CqC,i,bf,y,i,qh,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LqEaI,PgcxI,iV,i,SC,Zvq,lR,rPWTz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TgOAv,INdJw,jb,i,n,y,i,sYv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OXSJC,GmQEj,gpyD,i,OS,y,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PcJFm,tVanJ,,i,u,pf,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,poGCJ,JFMRC,ZQa,D,iL,SC,hk,uYxY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oQeqd,pivbv,yhq,i,n,jaP,lR,aDA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eQnMM,ClwEM,LDk,D,kWZ,eQE,hk,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SejYa,kCwor,KsKZ,i,pk,Cj,i,AqlX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nOoss,iMSaA,jb,i,Nc,y,l,XtRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmvLW,GNCKu,aN,i,GF,ev,i,xApJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DsQwS,tvQoU,QMl,i,xk,jBP,L,Hfc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IHtTr,LnlmR,ez,i,k,mwY,hk,Jcf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GpjSB,xTKHz,zZe,i,FL,Kg,lR,uZVFV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zZhfd,,LDk,i,Yx,Cj,fU,TGJiT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rjGTu,UriEN,Gac,i,ZUA,pf,hk,aWkGV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CIJSg,cEpGn,VsKz,i,G,Zsbp,hk,lUt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dgoOu,kaQGg,bVnY,D,KR,ZUA,lR,zSsD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aqsat,gXbuE,ZQa,D,RC,dYPI,fU,ZJaw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aqsat,tdVQA,rNcu,i,RC,zz,lR,mNAO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,axJhC,pNMtG,rNcu,i,n,y,lR,QFU,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LXbkA,JmTkj,Pcb,i,hyz,bhM,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BSOtU,CiZAV,LjAS,D,oMY,pf,L,TUw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sLxzZ,DzgFa,bVnY,i,uP,IamB,lR,FSG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RrlYb,uLFqs,,i,Lz,fX,hk,Dq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WxFOK,QImNH,VsKz,i,n,Zsbp,l,gKpiq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RXjow,mDfiz,ez,i,RI,sp,lR,QhEp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,plIZf,VzUtA,LDk,i,iL,Dgv,i,CWq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rTTVN,uYWpN,xDLG,i,OS,Cj,lR,gWqs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xrTU,SEtRV,,i,nt,zz,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KZkB,yMOwe,gpyD,i,n,Cj,lR,Lkdo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ULYq,mSXPN,iV,D,RC,y,i,PjtO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KWvq,,Vj,D,OS,Cj,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Apce,gUsbv,KsKZ,i,iL,xa,lR,Jij,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YIRJ,bzidY,,i,u,rbp,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pXIN,pivbv,rNcu,i,Kg,y,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Gotl,cbkAW,rNcu,D,RC,Cj,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bWwk,TWnoU,EXYv,i,oLI,fX,hk,KPGx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NJxc,tpiKL,iV,i,EY,gOZx,lR,LWN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GGuS,lTyLf,yH,i,IT,,lR,LoeB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EIza,hAjyU,yH,i,mO,,lR,KR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GaJA,AZETv,yhq,i,FL,RSST,l,JYVZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zYnp,ClwEM,iV,i,GF,eQE,lR,Vja,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gaLR,ceXIv,xDLG,i,Ld,aRnz,lR,OrJu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FLwe,qwbvG,ZQa,i,zz,FvO,lR,UKW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RWIb,LJytA,bVnY,i,RI,SC,l,SAoA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wBfP,SzRiV,yhq,i,n,y,l,EfTF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iwdw,Pwwsw,mNh,i,jF,uECy,i,XUlI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Rhnc,DzgFa,CqC,i,G,TAUy,hk,WHKU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vLuO,,rNcu,i,u,Yxhj,hk,VQEc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wuKE,IWNMt,KsKZ,D,u,DME,lR,ynNI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aItu,SAndf,CqC,i,y,Pmiv,lR,aXta,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nlmP,Exftg,,i,u,Cj,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QhYl,hpCAn,yhq,i,GF,RSST,lR,fkxQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LgTc,kSXVa,,i,FL,Kg,l,hvW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NPgB,UpZhy,Gac,D,iL,sp,l,RORY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Bfea,Aibzq,,i,u,,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,REBx,gLpCC,yhq,D,Cj,zI,lR,ev,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WQgc,zktNk,LDk,D,iL,,lR,LHUva,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gYwD,,QMl,i,y,hmKv,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PoAF,Gjomx,,i,u,pf,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YyNo,ONGeK,opm,D,Kg,JVF,lR,RC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BLic,TVeAq,yhq,D,n,hmKv,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aaUh,hzafF,,i,qh,Cj,lR,Kuz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lLGU,gOXsw,CqC,i,iL,pf,l,XAFA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,goAh,,KsKZ,D,mR,gI,hk,bcbsm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PrUo,hpCAn,KsKZ,i,G,,l,yXbRL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uIjX,aHyMy,,i,Kuz,SC,l,FN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wPrq,,mNh,D,nT,,hk,DcIH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CSBs,KbCOn,zZe,i,OS,Cj,i,uggk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,abJg,vfKUn,aN,D,G,mwY,lR,Qege,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dnNj,kDbMl,,i,RV,Cj,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aEZk,yJaHj,CqC,i,G,,lR,aETI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iQWm,zaJDf,,i,RC,Cj,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SFjx,,iV,i,pk,HSL,lR,ivjW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ojFV,dSzZF,zZe,D,OS,jBP,i,HeZs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KgUT,,zZe,i,THd,iADy,lR,CTcxs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jGoO,SoINs,LjAS,D,OS,y,hk,Xdt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jlko,nZMmY,zZe,i,Ld,ysh,lR,acnF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ENWB,mgoTc,mNh,D,pqp,xa,lR,mKDi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BodV,asEGJ,gpyD,i,RC,MpP,lR,nagT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zaPH,QhQVq,,D,iL,IamB,hk,mO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oUAs,NjzEZ,VsKz,i,os,xa,lR,bHff,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WBhZ,qvkFl,bVnY,D,Zi,Pmiv,l,fLiTg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wFtD,gqTIk,rNcu,i,RC,gI,fU,HMlv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OYek,pziuA,jb,i,RC,FvO,lR,wcBv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xWws,VINkJ,iV,i,pk,db,l,MwKU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IYwy,RGitv,VsKz,i,xk,qsr,hk,SIGh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHfQ,MugFo,iV,i,iL,Mcs,i,Gf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bjUm,hQGku,mNh,i,cfU,xa,hk,BrxL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TmvN,rSjvT,gpyD,i,G,dYPI,lR,NGkL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Wxvr,uYWpN,CqC,D,os,Cj,hk,Uw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qxDL,,ez,i,Kdq,Cj,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uNok,LdGeV,CqC,i,RI,sp,lR,Ep,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YZzg,MWxHT,,D,iL,yC,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wrwK,vCNMH,yhq,i,mR,EPcs,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oxGY,CJBZl,opm,D,SC,pPN,fU,ERiUP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VkQO,HXSgR,CqC,i,O,YO,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bTWS,mWKTs,VsKz,i,Pj,WNP,i,jBiw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,puVI,otxsK,rNcu,i,EF,dYPI,lR,bUfPx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Udwo,AhAhc,zZe,D,sa,cbZ,lR,qoLK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bnEQ,JRxbD,iV,i,Dq,gI,i,xKSj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QsjK,yawhC,bVnY,D,nt,pf,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Ftkp,mgoTc,iV,i,iL,lVH,hk,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SRZB,GmokZ,CqC,i,n,y,lR,IWHQ,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WbkG,VWQbt,LjAS,D,jgn,buw,hk,wgwv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WbkG,uLFqs,bVnY,i,jgn,ev,i,wll,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HCsg,tpiKL,opm,i,iL,ev,hk,jOWSd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MFVa,zPWJZ,Pcb,i,Bu,Cj,lR,xMCu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dvlp,,VsKz,i,ZJA,whE,hk,UqPez,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ptPo,JlDVQ,Pcb,i,RC,Cj,fU,y,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Hpvq,dEvnd,gpyD,D,nU,,lR,wtsU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fpTZ,aRalA,jb,i,G,zNvM,lR,FtyE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Wjgr,,aN,D,sa,HSL,hk,lTC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rdET,xoEpJ,VsKz,i,zj,XLQ,i,DQhS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RlxT,uYWpN,iV,i,GF,ev,i,kaW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BRAy,,VsKz,i,sa,,lR,rnblr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NscT,,,i,Lq,Alg,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mlFd,ERiHU,EXYv,i,y,xa,hk,XZQs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JzWA,gMbWu,iV,i,Kg,Edxj,lR,tHK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jJKy,jHsOR,rNcu,i,RC,DME,lR,Qyll,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tllY,qZkcz,gpyD,D,zj,uECy,lR,zaU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dtvr,JpSzL,gpyD,i,IaL,gI,l,XMVL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GHbY,iWLlW,ZQa,D,mR,hmKv,hk,AiH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rlPE,,zZe,i,RC,eQE,i,zzRCP,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hBHe,JjjZb,bVnY,D,oLI,pf,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hhIq,wNpHN,EXYv,i,xk,RV,fU,vItx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cqfS,NFpdX,zZe,i,FMt,GWD,i,BeNQD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cqfS,JFMRC,CqC,i,FMt,nT,fU,Ykznr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DsCi,ZSNHC,iV,i,BfM,zI,i,HWGg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JcZY,TVeAq,VsKz,i,ZJA,hmKv,i,aEq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zUlv,qygIq,VsKz,i,GF,bfM,lR,dsrr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zUlv,zTnre,bVnY,i,GF,cRzS,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FAge,wwFAY,CqC,i,nt,gI,lR,mlk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuOe,ntogG,iV,i,RC,,L,XcWC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,stTe,vZyhX,QMl,i,Nc,pf,T,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wqFr,gqTIk,xDLG,i,RI,Cj,fU,zUlv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vZrJ,DrkVz,CqC,D,G,YO,lR,ots,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Evhp,cpxmF,yhq,i,H,xa,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lAUK,CfjhB,Vj,D,n,y,lR,Lel,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CEtN,DXeTv,CqC,i,H,pf,lR,HYt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Ohcv,zLIpF,bVnY,i,SC,Kuz,i,wll,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IKYJ,rYFYY,CqC,i,H,cmmA,lR,svwX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PSeH,HrkuK,iV,i,GF,yC,hk,Cme,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XcWC,pfOqs,,i,GF,HSL,lR,cZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uCSJ,qZzCL,rNcu,i,Nc,Zsbp,fU,HMlv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FDsv,Pqnwf,xDLG,i,Kg,Kg,lR,Njo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kBnd,ZGziF,iV,i,GF,Cj,lR,sGP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QIfF,rGrAE,,i,G,juI,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mKJM,INdJw,CqC,i,GF,aRnz,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JPds,mPohi,Pcb,i,OS,VyBk,l,QGji,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PZOo,hQGku,Pcb,D,xk,gI,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PZOo,,iV,i,xk,hmKv,lR,LOtcu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dMdU,pBRVS,yhq,i,cZ,IamB,lR,VwET,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SyNu,yLxra,ZQa,i,xk,hmKv,lR,ZJA,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LzYJ,ESevc,zZe,i,fr,hmKv,lR,BTaq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cNDz,pcpoK,CqC,i,y,fX,lR,iFk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zzfC,xkeAA,gpyD,i,n,HSL,lR,BIg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dJQk,JFMRC,CqC,i,k,YO,hk,zhOaQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dJQk,mgoTc,Vj,D,aW,bf,lR,SYjP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jLAV,,jb,i,RC,iPIT,i,RVFP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IFlE,qZzCL,QMl,i,GF,Zsbp,L,nT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tSIH,SaGBL,xDLG,D,OS,Cj,lR,vGJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Thpg,rWXFR,rNcu,i,GF,buw,lR,fAb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BjwF,atSAJ,,D,OS,,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ezFf,kjNhK,CqC,D,GF,sp,lR,zIhb,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bfeu,dgPQa,rNcu,i,RC,Kuz,fU,EGVC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bfeu,cbkAW,jb,i,RC,Cj,lR,YkQz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LioW,VPSAb,aN,i,jgn,DgcM,lR,MCVV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sIOm,BesNn,EXYv,i,GF,TxcW,T,KPGx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sIOm,,VsKz,i,GF,dYPI,lR,pGfV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KnRz,uSCkC,rNcu,i,RC,Cj,lR,rrhu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QoIi,,Pcb,i,Ri,,l,VPTOq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IoYI,MNqGT,zZe,D,k,YO,i,TOlsJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lsSr,LKLHu,,i,zj,dYPI,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zjtN,NHNrT,,i,GF,ev,l,BnI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zjtN,,ez,D,GF,lQU,hk,lGa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QhEp,uapED,Vj,D,RC,jaP,lR,CtUN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QhEp,,rNcu,U,RC,,lR,CDEBn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QHki,wXuaS,gpyD,i,Ri,xa,lR,WFD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MkpI,XctNb,OYMU,D,sa,mwY,lR,qSIi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,pLYXJ,rNcu,i,RC,qVs,fU,nUFCZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,diaAm,,i,RC,mwY,fU,FL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hmlu,JpXCs,,D,RC,jBP,fU,FL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zmQB,teKMc,CqC,i,mR,Ouf,hk,wIw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVZb,uYWpN,iV,i,OS,ev,l,WWUU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UVZb,xKZuK,ZQa,i,OS,aHa,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JRbO,GVQal,yhq,i,G,euzb,i,eG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wJwu,CuWvK,bVnY,i,G,dYPI,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zMqu,JmTkj,VsKz,i,zj,sp,fU,cZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ouJI,,xDLG,i,sa,hOgV,lR,kbKz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vbOF,kKVyB,rNcu,D,n,hmKv,lR,LCK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vbOF,uYWpN,EXYv,i,n,ev,l,gaaUB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vbOF,YoxHS,zZe,i,n,ev,l,uYxY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BryE,PAAWz,Vj,i,GF,fX,lR,UjeQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BryE,,yhq,i,GF,Yxhj,lR,DxUot,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,THDW,kSXVa,gpyD,D,FN,dYPI,lR,qWFT,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QCRl,yOhXn,VsKz,i,FN,,hk,zLkJ,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fwdx,ZZWNX,rNcu,D,RC,Ri,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fwdx,RdvaT,QMl,D,RC,ev,fU,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fwdx,nJvcN,mNh,D,RC,Cj,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fwdx,kSXVa,iV,D,RC,sp,lR,ReWm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lSkB,zfzpe,VsKz,D,G,ev,i,PEYG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lSkB,VzUtA,CqC,i,G,SC,lR,IWHQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,MMDPh,rNcu,i,s,jBP,i,WI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,NUOdS,CqC,i,s,wlp,hk,zW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,qaAzm,jb,i,s,xxmj,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZUs,zScGL,,U,s,TAUy,lR,Lel,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wvHx,DXeTv,yhq,i,GF,pf,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pChe,suknr,bVnY,D,G,Oohm,lR,MQw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bqJy,FjRPe,CqC,i,y,YO,lR,ss,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eBab,troYa,CqC,i,G,buw,lR,zfEM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZnZf,RXFwk,,i,FN,eQE,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZnZf,iYzBF,,i,FN,,i,sD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuQz,jpmZQ,CqC,i,n,RV,lR,ZxWI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NuQz,kLFxV,bVnY,i,n,gI,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fflq,wyCaY,rNcu,i,os,SC,lR,ILws,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,ruNRu,gpyD,i,GF,,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cHyG,lFzoj,aN,i,GF,YO,l,zsqJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qEey,rRbDE,rNcu,i,GF,hmKv,i,eag,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dKUM,UriEN,CqC,i,jgn,bvX,hk,elM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,TttFj,VsKz,i,GF,jF,hk,Bpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,uYWpN,CqC,i,GF,Cj,lR,TrLa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,CgiNm,Vj,i,GF,gI,l,BnI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,SuBGa,bVnY,i,GF,DgcM,lR,msZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,uNjff,VsKz,i,GF,,lR,VOYe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,erQTG,Vj,i,GF,gRTo,hk,dBp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,yawhC,zZe,i,GF,gRTo,i,Ktd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cflD,RVOBZ,CqC,i,GF,WHBi,hk,HMch,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dMyb,jJOWz,CqC,i,GF,Kg,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hdNml,opm,D,SC,cBU,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,WeZTY,bVnY,i,s,FvO,lR,jnbh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gOXsw,LjAS,D,mR,pf,hk,OvoS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wFCfO,mNh,D,cZ,IamB,i,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VKwcO,EXYv,i,bf,xxmj,i,IKYJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,bKQXZ,,i,BAR,jF,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PFmNW,,i,s,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KxodO,,D,NHX,kXlV,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SOuzm,,i,WLK,TAUy,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cpxmF,mNh,i,jF,bfM,lR,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nneNb,,D,n,RV,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VGgQZ,VsKz,i,s,LKKI,hk,Kusj,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZQGrY,EXYv,D,zz,qyCG,i,qy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rmSkc,mNh,D,oen,Cj,T,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DLWwp,yhq,U,hcd,y,i,eG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Juwsu,,i,aW,Qhv,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hpBop,zZe,i,PF,ShH,L,TUw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rRbDE,bVnY,i,Lz,Zsbp,i,GF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NTvmH,mNh,D,oen,hmKv,hk,Pe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eYjgF,,D,jgn,WNP,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,iMSaA,yhq,D,aW,y,lR,lMSQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AXhVB,CqC,i,Lq,SC,fU,ZFX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vTspx,,i,sa,gI,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Nqkmi,,i,oen,pf,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vdUHx,,i,EF,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mZcIF,Gac,D,kWZ,db,lR,Nvt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ncTpP,,D,Ep,HSL,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ytgnG,bVnY,i,Bu,WNP,fU,pqp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,VsKz,i,RV,soR,i,BeDe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,EXYv,i,sp,YO,l,eQE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,yhq,i,sa,WNP,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,Pcb,i,u,Ouf,lR,gI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,ez,D,Ri,xa,fU,YQxg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLYXJ,,i,RV,yC,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mDfiz,ez,i,BAR,ZjS,hk,FZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mDfiz,,D,JnB,sp,L,jnnx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UpZhy,bVnY,i,FL,Kg,l,Zi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,drMaK,,D,hI,fX,lR,vNu,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Jbwep,QMl,i,zW,zz,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,WFpqg,Pcb,i,u,Kg,lR,gI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,bzidY,QMl,i,u,ysh,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jZhSB,QMl,i,FL,IKO,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gCAcv,,i,jF,zlG,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gCAcv,,i,xk,ESA,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FusKs,,i,RC,cbZ,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,TttFj,LDk,D,iL,ESA,lR,mR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,YoxHS,zZe,i,oMY,ev,lR,gBBgQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DUZqB,ez,D,eG,NFu,i,NTj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KSiMG,,i,GF,pf,l,ozomd,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,bXpUE,gpyD,D,ZW,db,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uuWGz,CqC,i,Lz,Ktd,hk,pTxQE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gqTIk,opm,i,mR,zz,lR,fdIU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gqTIk,CqC,i,n,FvO,lR,syW,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hGQmt,,i,FZj,Bkt,fU,Om,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wNpHN,,D,SC,na,ri,aIIcj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zLfaS,QMl,i,Ri,gI,T,nGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jrfmw,EXYv,i,RI,Wsd,l,eQE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VnSVs,KsKZ,i,kB,Cj,l,fX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mONwL,xDLG,U,Cj,pf,lR,vGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DmPDX,QMl,D,TGR,Ri,T,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mxPzj,,i,u,gI,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mAdjk,QMl,i,RC,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jHsOR,,D,hI,y,l,s,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qLmHD,KsKZ,D,Zi,GF,i,OUn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zcypH,QMl,D,GF,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eKOcq,LDk,i,IaL,Cj,hk,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SZDsW,,i,Nc,Cj,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vtYeB,CqC,U,s,PF,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jxRoY,,i,n,Cj,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AMEDi,iV,D,OS,Cj,lR,dcot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Hpedi,jb,i,RI,jF,i,EmyOw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zmspf,QMl,i,ZKX,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,LvDJh,EXYv,i,qh,Cj,lR,wJwu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rrdcH,rNcu,i,RC,YO,lR,KRgFL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,JdEOh,,i,TGR,Bkt,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RTQUJ,QMl,i,wGj,Cj,T,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ivYgu,OYMU,i,Om,eFx,i,xk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ivYgu,,i,qy,eFx,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eNuCi,,i,xa,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Uoaco,,i,sD,NFu,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ilzOu,EXYv,i,sa,mwY,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pRZeB,gpyD,i,na,Bkt,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,teKMc,,i,Bu,buw,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RZfCx,xDLG,i,Cj,nT,hk,Os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VONBE,,i,mO,Ri,fU,jgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Zdjas,Pcb,D,u,nT,lR,OPVnz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HrkuK,,D,zj,aiR,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KKRFI,ez,i,ZKX,Vvh,i,MaDIi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HXSgR,xDLG,D,Cj,y,l,YGks,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,kBvrH,,D,FW,hmKv,fU,Om,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fFPdL,QMl,D,hyz,y,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,fFPdL,,D,ai,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pNMtG,,D,ZW,y,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KgLFo,QMl,i,sD,OxU,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gLpCC,,i,SC,zI,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cuTxO,,i,Os,kgW,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vfKUn,,i,eG,jaD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pLHiN,QMl,D,oLI,GCL,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VLgQz,ez,i,Uw,aFx,i,YnjT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VLgQz,,i,G,sp,lR,xvb,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eSjKX,LjAS,D,aW,lQU,hk,qkg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eSjKX,QMl,i,ZKX,XLQ,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,eSjKX,Gac,D,hI,Oja,hk,PRbP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FVyoD,ez,i,BAR,lQU,hk,zYm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,lHjLY,QMl,i,sD,SC,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NWHpW,,i,EF,Cj,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,iFIWb,,i,FL,hmKv,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FmJTH,,i,os,SC,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AzPRY,jb,i,n,SC,l,zOi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,pQfVX,Pcb,i,u,SC,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GAsNk,zZe,i,Zi,DME,i,vbC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GAsNk,,D,u,SC,l,FN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,LzZBG,Pcb,i,Zi,WNP,fU,rRm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,cBrLC,yhq,i,Zi,pqp,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,tZmRz,Gac,i,FW,eQE,lR,Nvt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,SklNG,yhq,i,sD,YO,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,PIXnO,ez,i,bf,gI,l,ZJTX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rrGCj,zZe,i,kB,DME,hk,JLuL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rrGCj,zZe,i,zW,zz,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RUGgg,,i,RI,bfM,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,oBwBc,Pcb,i,u,Pif,lR,iyfc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MXWOX,,i,mO,DME,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jfQnw,opm,i,hyz,zz,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,NHVCr,QMl,i,sD,DME,T,Ctir,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,vZyhX,yhq,i,H,bfM,lR,fqVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,FHKAj,rNcu,i,RC,Cj,lR,qsly,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,VGUgj,,i,gI,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,wxHDm,bVnY,i,aW,yC,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mRIWA,mNh,i,gI,jF,hk,QPm,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nMlTX,LDk,D,ai,Cj,hk,wzaTN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nMlTX,yH,D,mO,yC,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nMlTX,,i,gI,soR,T,nGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hymXz,QMl,D,RV,PF,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DnPCF,bVnY,i,xa,yC,lR,YxJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DnPCF,QMl,D,iga,gI,T,pOHw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,XctNb,QMl,D,Yx,YO,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rWGPS,ez,U,BAR,HSL,lR,epE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dzSyh,,i,yC,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,IZWQc,,i,vk,ev,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,IZWQc,,i,EF,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ERiHU,LjAS,D,bf,RV,hk,NLE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,nJvcN,,i,ZW,oka,fU,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rGzDb,xDLG,D,RC,dYPI,lR,tyug,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rGzDb,,i,u,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,OcLXC,,i,SC,xa,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uoWAj,VsKz,i,sp,uGF,lR,CsIc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,mgoTc,zZe,i,TFX,xa,i,Zvq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZoaJA,,i,qh,xa,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ySOeY,QMl,i,SC,xa,fU,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qnMLh,QMl,i,zlG,YO,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,OiEPu,xDLG,i,oh,bf,lR,EiFK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MWxHT,yH,i,mO,jF,lR,ZUA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,HNLHQ,CqC,U,GF,uGF,lR,UVe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EnYIx,QMl,i,y,yC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,EnYIx,mNh,i,sD,YaU,lR,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hAjyU,bVnY,i,RI,SC,lR,UyQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GEQmg,iV,i,oh,dYPI,hk,ZpUE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZHFHA,,U,xa,,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,hciMG,EXYv,D,vk,kgW,lR,Fpo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,XkrIG,aN,D,n,YO,lR,TCzyP,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,asEGJ,,i,n,nT,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,msvFD,,i,KR,qyCG,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GluXQ,CqC,i,O,GxNZ,lR,ibf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,uZVdK,Gac,i,oMY,,lR,gCFSX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,erQTG,yhq,i,GF,Pmiv,lR,Huk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,lTyLf,,i,FL,,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,gyPef,KsKZ,i,FN,dYPI,lR,Ds,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,yJaHj,mNh,D,mO,,hk,exS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,Gjomx,gpyD,D,os,YO,lR,PUk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,RnZxv,jb,i,jgn,uECy,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,rZIlM,,i,n,pBlc,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,xJzGg,QMl,i,FN,dYPI,T,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,XigoJ,QMl,i,u,hOgV,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qcEtc,iV,i,FZj,dYPI,lR,zlG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,AJobE,ez,i,KWZ,YO,l,ieFL,7407340993376597773
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,jEuir,,U,GF,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,MUiDl,iV,U,sa,gOZx,hk,BQHS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qBCaO,CqC,i,G,hmKv,lR,NtWTu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZrkWF,,i,n,wnVT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qZzCL,gpyD,i,GF,JVF,lR,lyzOs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,qZzCL,QMl,i,Zi,TAUy,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,aGAzh,gpyD,i,TGR,,fU,TPzZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,oWoZd,,i,Nc,hmKv,L,xIPJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,miwCS,ez,D,SC,UpSB,l,Xshp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KyEGN,CqC,i,GF,hmKv,lR,wHw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,KOJjz,QMl,D,qy,yGet,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,UcrWb,mNh,i,oLI,KCWa,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,zlxbS,gpyD,D,kWZ,hmKv,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DzgFa,bVnY,i,mO,,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DzgFa,,i,BAR,TAUy,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,opZrF,,D,FN,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,DzLhz,ez,i,RC,Cj,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,GfRLe,,i,kWZ,eKfc,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,CcpoJ,gpyD,i,u,uWTD,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,dheCD,yhq,i,mR,uECy,lR,n,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,ZhLBh,,D,GF,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,VsKz,i,Lq,LfH,hk,FNcU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,bVnY,i,xa,BHeC,L,QcT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,bVnY,i,sa,dYPI,i,pfq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,EXYv,i,RI,Cj,lR,VsPH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,rNcu,i,iHi,soR,L,iL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,rNcu,i,Kg,rSZ,lR,oteU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,gpyD,i,os,EWTi,lR,AOGF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,KsKZ,i,FN,uECy,lR,oWS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,KsKZ,i,FN,cRzS,hk,Ds,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,yhq,i,pm,Ri,hk,kdc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,yhq,i,Zi,gOZx,lR,ev,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,zZe,i,oh,HSL,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,zZe,i,fr,,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,zZe,D,Ds,xFh,i,OBze,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,anf,i,EY,vFv,hk,RGK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,U,ZW,hmKv,hk,tzS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,FMt,bfM,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,i,kB,xa,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,QMl,D,cZ,na,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,CqC,i,n,uECy,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,LDk,D,hyz,gOZx,hk,Ngma,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,Gac,i,ai,,lR,idb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,Gac,D,oMY,Qhv,lR,LVh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,mNh,D,pm,bfM,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,ez,i,RI,ZHiH,hk,oen,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,ez,D,k,yC,hk,ANcE,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,U,SC,Mgil,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,dQD,nHdH,fU,PF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,dQD,zI,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,GF,mwY,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,i,u,KCWa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,TGR,WNP,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,kWZ,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,kWZ,Os,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,,,,D,,,,,1048718684474966157
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vNHVFkP,GqeZx,,i,Cme,yGet,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lHWAdia,XOZQm,Vj,D,TGR,DDPD,lR,awZC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fmPPnbK,QImNH,QMl,i,n,zNvM,T,MQw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,plpcbov,xZsRI,,i,FN,Frn,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MqhAQlp,ViFeB,EXYv,D,ZKX,gI,lR,OaWJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AEPWazi,vfKUn,VsKz,i,kWZ,GCL,lR,lUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cTZDxyG,XTWTz,,i,GF,yH,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wmpAaDR,SKGNX,EXYv,i,Kdq,khbX,hk,ZDJPQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wNHNlBF,DzgFa,iV,i,RI,hmKv,l,TPBt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TlHPTMM,EfCkA,gpyD,i,GF,gOZx,lR,tmM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oAZASeI,,CqC,i,u,HSL,hk,FGPw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LGcOafb,KWgOC,CqC,i,RI,XOk,hk,iqXhu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bsUCWbf,rGzDb,Gac,i,k,YO,i,cQoj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wSLOfUd,ygneZ,CqC,i,zz,Cj,lR,XKeB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fcTUqXv,lhZyj,,i,ZJA,Cj,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YlLHgVv,VWsSK,CqC,U,RI,SC,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mDASuKi,kFmnB,CqC,i,n,gOZx,hk,KHpL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IUvDJir,,xDLG,i,oh,ev,lR,BFMX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tHgXaLo,aEQZY,QMl,D,GF,dYPI,fU,TUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WrytfDE,alpkt,bVnY,D,db,,hk,rSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ykKvPrF,rWXFR,Gac,D,Zi,ZNN,lR,kbgj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CXzcXtU,zfzpe,aN,D,OS,ev,hk,nLf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MpdPoko,VnSVs,Pcb,i,u,,lR,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wjhINBL,RLdLf,bVnY,i,RC,na,hk,sp,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JMEMkqy,tGvIu,CqC,i,sD,wCsQ,hk,UKSK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iSudLmB,laGio,aN,i,Cme,dYPI,lR,vsTd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XZFdCwu,gUDiL,CqC,i,RI,y,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HLxrKdj,,zZe,i,Cme,,L,TUw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QqNoryV,uKZok,LjAS,D,Ri,Pmiv,hk,hGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JIKgoSf,DxUot,LjAS,D,mO,qVs,lR,RC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FjDdqxO,yHIpw,KsKZ,i,fr,HSL,lR,tTD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,roLgjkX,KyEGN,EXYv,i,aW,hmKv,hk,vZrJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oEqBJDX,BFITp,ez,i,SC,JxA,lR,vk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HfAavfj,AzPRY,,D,k,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WMFvyet,hTzze,zZe,D,Nc,Cj,i,WSW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pjkKctS,CcpoJ,EXYv,i,bf,uECy,lR,TNJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bVBhSoa,tWWFx,LDk,i,ai,ZNN,l,OCRfw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oRvfsXg,,iV,i,FMt,eOq,lR,Vja,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mmuWUlQ,VLOkC,LDk,D,Ds,Bkt,hk,Ngma,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dkicECI,LETzR,xDLG,U,RC,Cj,lR,qhfz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TroONZb,WbxQy,iV,i,oen,vtyj,hk,kWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UhwDqXu,qrfjj,mNh,i,sD,dYPI,hk,vZSwO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hBkUSNo,WeZTY,CqC,i,G,RSST,lR,DRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MwFUmKL,ACvFf,yhq,i,wGj,Rfp,lR,CcTC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kvbjzty,fxErQ,mNh,i,mO,hmKv,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EfmCiiY,cdSwJ,EXYv,D,k,UpSB,lR,LOaZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GmMZHAT,yyEeK,bVnY,i,FL,KnZo,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GtsJLfe,uYWpN,Pcb,D,u,ev,hk,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nrCstAq,hoyPK,zZe,i,mR,Lmvq,hk,zlNX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AqdMBnn,GmokZ,QMl,i,GF,y,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TqpxyXJ,gUDiL,,i,kB,y,fU,Bu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CQfNTlm,LDNWk,Pcb,D,qh,YO,hk,byIAw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AazxHBy,QmLzY,yhq,i,Zi,Cj,lR,wiEw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,adMNGWb,XgUzd,CqC,D,GF,khbX,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fYUpZQq,oBwBc,opm,i,SC,jaP,lR,sGDL,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WyzTaSK,,EXYv,D,zz,kSz,hk,KPvc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RZtcXgC,aHyMy,LDk,i,aW,SC,lR,HxuC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yVGnvii,dGrfN,ez,D,Kg,yC,L,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EMtoQgm,aRalA,EXYv,i,ZW,zNvM,lR,pkJJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rhRAeMF,gQCaa,Vj,U,sp,,hk,putaF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pbgrOmy,XmDvh,yhq,i,sD,RV,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QWIDZsL,CiZAV,mNh,i,Cme,Cj,T,Oase,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XhdBzCM,gyPef,,i,sD,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sKpgvTa,TVeAq,iV,D,n,hmKv,hk,kWZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JZLgeuF,,EXYv,i,kWZ,pf,lR,kbgj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WFVfqpU,rGrAE,,i,EF,SC,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YXURNPi,RQnAC,KsKZ,i,FN,,lR,vZye,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jrJzjIy,gqTIk,,i,hyz,pf,lR,Nc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZeoUplu,fFPdL,rNcu,i,Kuz,y,lR,HTr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cyEPSlY,ZrkWF,mNh,U,Cme,Zsbp,hk,Hrde,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cyEPSlY,,mNh,i,Cme,Zsbp,lR,pYGT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IQKJNbl,YtfvE,jb,D,n,gJq,lR,vk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,COPNChw,dtobc,ez,D,k,Cj,lR,kRap,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cVKrVto,eMFPU,VsKz,i,RI,xa,hk,UskG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JPNIaUa,PHCFJ,mNh,D,iL,rbp,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CHjfRKO,rRbDE,mNh,i,RI,hmKv,l,Ot,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JvvBOLv,yAXdK,bVnY,U,fr,jF,lR,Yx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KzqiOOc,,LjAS,i,vk,Zsbp,hk,MwW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xxDEeWl,pLYXJ,Pcb,i,u,Bkt,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vDBiohc,uVdCT,iV,i,GF,TAUy,hk,VNWj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UojukZA,UHHyy,,i,GF,WOsU,fU,Bu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sPjMYTV,gVpLa,QMl,i,G,cAq,T,nT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,snZrWoj,puepy,bVnY,i,eG,bvX,L,QwIV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SHjYfbR,pKgAU,CqC,i,FMt,HMXY,hk,vyoQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VWhmAKt,ruKdN,QMl,i,RI,uECy,fU,pqp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gYUEbjj,jSnaY,mNh,U,Zi,sp,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AffinRV,,zZe,i,zW,hmKv,lR,cfOe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MmxNkdj,EWrtg,EXYv,D,pm,IamB,T,Bjda,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MHXFGLo,QTYGc,,i,cZ,mwY,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PcCGwva,Uuvhr,mNh,i,kB,uWTD,lR,XUlI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gKJzYvv,NePPU,ez,i,iga,yC,lR,oLvr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NfRQYzr,XeDef,xDLG,i,Cj,oka,lR,Hvj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UEPBRrD,JFMRC,LDk,D,aW,,hk,dtrKL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CpZxaQs,uLFqs,,i,THd,sp,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FHifdvN,GQqvx,ez,D,cfU,IamB,hk,vbP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tbVDKsG,,LjAS,D,GF,WNP,hk,aE,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cMLYYCE,vZyhX,LjAS,D,NHX,pf,hk,zhJP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zKDXPkh,OtsrC,ez,D,WLK,HSL,lR,ogWS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MzwoDeL,,iV,i,SC,YO,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VcesLWN,GluXQ,zZe,i,xk,QhZm,lR,FzbE,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,agnYobu,aHyMy,QMl,D,aW,SC,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IKqzZkR,hymXz,LjAS,D,SC,Nc,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zitWszG,DBqUl,Pcb,D,u,NHX,l,tUEd,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mEfjhUI,MWxHT,opm,D,iL,Xua,ri,qnZTO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,orPOoMD,opZrF,Gac,D,wGj,UpSB,hk,VbNho,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ChyagVy,VbNho,CqC,i,GF,,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,okHJcpA,uGIFb,mNh,i,oen,eOq,hk,Pe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dLxkfud,pBRVS,LjAS,i,mR,KCWa,L,TDnM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ovVXDUh,uvXwY,,i,NHX,Ouf,hk,bHSnH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vhwcAlV,ANzaF,Vj,D,ZJA,Cj,lR,crGp,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEhouvu,llHEg,ez,i,bf,xa,fU,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xgzPulC,vdUHx,mNh,i,k,Cj,T,rRm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mLPWmNb,YMYMT,KsKZ,i,kB,DDPD,hk,fpQZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MNAucnD,,jb,i,sp,jHBL,i,Kg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,esTmvzI,oBwBc,xDLG,i,iL,kPj,ri,Kyvv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qpnMGkl,,,i,k,Zsbp,l,hvW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cfDZDkS,LQsok,iV,i,lVH,dYPI,hk,raps,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qrQyigk,dCdpV,CqC,i,k,xa,hk,qh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FIzGZMa,uAKaC,,i,kdc,dYPI,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qmrSAWH,,EXYv,D,Zi,ypXm,hk,gGz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lVnNqdE,AZETv,jb,i,ZW,DDPD,lR,kcFJI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NheRHWe,JdEOh,EXYv,i,Pj,mEr,i,AQbJC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MogpQDO,,QMl,i,GF,DQc,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cjvFbu,,zZe,i,zW,Cj,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lKMBpD,zLfaS,EXYv,D,iL,HwD,hk,zhJP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tWyJla,oBwBc,EXYv,D,zW,kPj,i,ZAhZx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Gilxpy,dEvnd,rNcu,i,os,VyBk,lR,ILws,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AXpiEe,auWsL,Vj,D,qh,xa,hk,GvWdw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GcSvis,gPBuC,ez,i,Kdq,na,hk,RNCmw,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qmKiKE,vflvs,xDLG,i,iL,Zsbp,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VgUhVx,jlQut,mNh,i,RI,Cj,lR,FFFL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PaYwNx,cNLnu,CqC,i,jF,ev,hk,Uw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BEZTkP,Tbozy,ez,D,kB,Yxhj,hk,XQTJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RAwUqV,mgoTc,CqC,i,Bu,YO,lR,FoVUN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UEGpjw,xkeAA,,D,RC,Cj,hk,fr,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sEbild,DsQwS,mNh,i,cfU,,lR,XNFf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rBlIjT,uLFqs,xDLG,i,FL,Kg,hk,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TnYacA,rREKg,aN,i,RC,Mgil,lR,mVWS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pUBFAr,OJkEB,zZe,i,ZKX,SC,L,TUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bNJNTn,ponOy,mNh,i,JnB,pPN,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DjoKal,MOwcE,iV,i,Cj,Zsbp,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ENqKOb,qoWGW,bVnY,i,k,dYPI,lR,Cbzk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,blqLfS,pBRVS,mNh,i,n,IamB,lR,HMOPH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gJpfFC,CoHoq,Vj,i,os,y,l,pUumo,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LolKYQ,LOtcu,xDLG,D,Cj,y,hk,MbfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IZzZpA,,rNcu,i,Zi,Pmiv,hk,GHFQF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YWeccZ,pKgAU,VsKz,i,iL,TNuV,i,tLYW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RmaxHO,UriEN,bVnY,i,mR,pf,hk,fWrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Ilpsuf,YoxHS,QMl,D,nt,ev,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FOyKUq,zcypH,rNcu,i,RC,Cj,lR,pFH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,osMxpj,ESevc,xDLG,D,nt,dYPI,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yZqEwX,CcpoJ,yH,i,YO,uWTD,lR,YOiM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PdlQrW,AqUSW,ez,i,ss,Cj,l,rOw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rZjRKe,SdvqP,zZe,i,Ri,RV,i,oDciE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OQzuVw,ruKdN,yhq,i,SC,uECy,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rsRFfl,LpTYy,,i,os,hmKv,lR,RyV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DSJQdH,VINkJ,rNcu,i,RC,iGu,lR,ylcD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DSJQdH,vdUHx,yH,i,RC,jBP,lR,BdzJ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UZvJMt,yOhXn,LjAS,i,NHX,Cj,l,WOrB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TdXqpb,DzLhz,ez,i,G,gOZx,lR,HuZk,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OmSSwa,VJxDL,xDLG,i,mR,pf,lR,tBaS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FPvhHS,yFAAH,iV,i,SC,WHBi,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EgGmTg,GIxYc,yhq,D,RI,PnY,i,XvIhD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mrqsTS,mHDez,EXYv,D,mO,DME,hk,gGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BZHzDL,mGUGe,CqC,U,FL,gOZx,hk,THDW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iBMPKw,OCsfh,,i,u,iGu,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AiEFuG,rGrAE,rNcu,i,Kg,zI,lR,XrP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,knTJFN,oWdZF,Pcb,i,u,ZNN,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nEDnHh,opZrF,VsKz,i,kWZ,qyCG,i,hSE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rrBfHN,QImNH,Vj,D,TGR,zNvM,lR,BWul,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iACozJ,ZBRzn,mNh,i,sD,Bkt,hk,mWLy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KHvPBW,ctSaQ,iV,i,n,zlG,lR,GWKu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gTcrxI,rGrAE,iV,i,OmE,SC,hk,ORJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WWnLFc,DzgFa,VsKz,i,mR,zNvM,hk,lUt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oWiuru,rpCEC,EXYv,i,RI,Cj,i,jLtLQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OuLJmd,lSCtw,ez,i,ZKX,dYPI,hk,RoHj,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HSbvfq,rEMyu,rNcu,i,RC,y,L,iL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XnAVyq,ClwEM,mNh,D,hSE,eQE,ri,wMS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dnymjd,QjAFk,LjAS,i,eG,LHdO,hk,yC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XStfLU,KOJjz,CqC,i,Zi,hmKv,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uMOPet,qytCC,yH,i,mR,Kuz,l,ibhb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QIFtkY,SWMKA,iV,i,BfM,,hk,iga,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rWMxeN,NUlQD,Vj,i,SC,juI,i,XSq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZNFpZa,oJXSu,iV,U,GF,SC,l,kkmxh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vluVuG,VgLuA,zZe,D,ZKX,gOZx,i,WKX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jLkGIt,Xcpyi,,U,RC,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jLkGIt,XjkwL,Pcb,i,RC,fNlL,ri,yXKaY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SVbQNZ,GzWeI,EXYv,D,mO,ShH,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PdTfWD,SOcKk,EXYv,i,RI,xa,i,szYR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uHeyST,iMSaA,,i,k,Cj,hk,WLK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LgEtyu,rGrAE,iV,i,GF,yC,l,CVe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dgeEXv,dCdpV,,i,mO,y,hk,jgn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CZYfui,UriEN,LjAS,D,RC,pf,fU,jpAGV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wuzmfi,unoLA,,i,ss,TAUy,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eTeWGe,pLuie,rNcu,i,zj,,lR,ygbK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mlrWzq,SklNG,ez,i,RI,Cj,i,wbEP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pUygsC,ZIelK,iV,i,GF,hmKv,hk,OWJwg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OBsLRy,eYjgF,EXYv,i,db,soR,lR,RNB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pWkMlT,jkdjQ,Vj,D,k,WNP,T,RV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aYnJFD,GqeZx,bVnY,i,RI,hmKv,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zwajsx,uVdCT,jb,i,k,Zsbp,i,Kg,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UdLLoq,PHCFJ,rNcu,i,OmE,Cj,lR,EjEh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FHpkno,uYWpN,rNcu,i,Nc,Cj,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zDJLqo,,,i,Ri,IamB,lR,hcd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tDQprA,,iV,i,iga,WHBi,hk,kSDf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CzPiFu,ayGOf,CqC,i,iga,dYPI,hk,jGwaY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aKnezd,,bVnY,i,k,MBL,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KoliNt,jNsAq,,D,iL,Cj,ri,wep,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YIpUwq,mvJAl,,i,iL,hmKv,lR,UuA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,liWNEX,UcrWb,aN,i,FL,hmKv,hk,TSrxt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,izBTgg,,,i,pm,oh,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zrWROZ,ruKdN,Gac,D,kWZ,uECy,hk,whE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JwjuyS,zccHB,KsKZ,i,FN,Yxhj,i,kyn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QVmcsi,zAPsp,jb,i,mR,IamB,lR,msAJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YGkAQH,NMwlg,mNh,D,iHi,hmKv,hk,UKYX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rpsiOj,MOwcE,LDk,i,vk,Zsbp,L,jnnx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SpNnpn,pnVVl,rNcu,i,RC,pf,lR,uDQie,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KWPHWy,,CqC,i,FL,DDPD,lR,bvl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UjCnjS,mGUGe,gpyD,D,GF,dYPI,lR,SMnP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WlIPAW,zpINo,EXYv,i,oLI,xa,hk,taOT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xnebDB,,ez,D,mR,eKfc,lR,QPWX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqKMpr,qkqKB,,D,MTE,jHBL,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HMICPX,NYGvz,xDLG,i,ZW,rbp,hk,TFX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pNOVFQ,MMnif,,i,u,gOZx,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eYWdHs,jNsAq,EXYv,i,RC,Cj,lR,kCtY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LOirzR,,,D,pf,dYPI,lR,xvb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VtWNRs,CNdsH,ez,i,aW,rbp,lR,zYm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vuAlOI,XctNb,CqC,U,k,YO,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,waXEtb,LJytA,LDk,i,yf,MpP,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VulNnR,AjTUE,ez,i,G,qyCG,lR,bfM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VulNnR,,yhq,i,G,hmKv,L,UXK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VCBOch,,VsKz,i,GF,uECy,lR,UpAm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eyElOL,bFakE,Vj,D,FL,sp,fU,Vnr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IEvMUa,gFAvO,xDLG,i,mR,pPN,lR,KPGx,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EjTsYV,,Vj,i,bf,dYPI,ri,gAPJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ySqmvw,BFkyu,mNh,D,sD,gI,hk,OxY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gDgbPf,OCBNS,iV,i,GF,jBP,hk,kWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cgYsmR,jkdjQ,CqC,D,n,bf,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZqGBxT,jWpps,mNh,i,GF,uIjX,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TjSFxp,ujyjw,mNh,D,vk,IamB,lR,xfJv,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SMbyHb,uSCkC,bVnY,D,GF,Cj,lR,RfJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SlJIuc,jJOWz,rNcu,i,xk,WNP,lR,HWUgy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nRwECY,ZrkWF,xDLG,i,hyz,wnVT,l,loG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tGfgvc,PwNjw,EXYv,i,RC,cRzS,i,ooYi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SpBbpu,iHDlb,mNh,i,GF,eQE,hk,SOrL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GptXpU,zILSP,xDLG,i,RC,Cj,hk,KGJl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UYEflm,RTQUJ,iV,D,Nc,y,hk,PXI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UGHdFW,izZbI,yH,i,iL,eFx,lR,iED,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CnzNDc,zTnre,xDLG,i,iL,UpSB,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CnzNDc,miwCS,xDLG,D,GF,UpSB,hk,RTvo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nKnGbY,UcrWb,LDk,U,iL,zNvM,lR,zYzZT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QiCGAQ,EfCkA,mNh,i,iL,gOZx,lR,IT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zaMTgf,iNrsg,jb,i,iL,uWTD,lR,OElC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QukXpP,GDIAH,jb,i,iL,Vqi,lR,EbDk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kwuDmO,CgiNm,xDLG,D,iL,sD,ri,KmKM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dhqrGa,pbseJ,VsKz,i,H,ber,lR,rtn,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MyDThR,uLFqs,KsKZ,i,uP,sp,lR,mkbM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BDtbkL,jHsOR,xDLG,i,iL,GWD,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BDtbkL,qQMoM,LDk,i,iL,GWD,lR,hyz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rmtqEu,,bVnY,i,n,cRzS,hk,vBIq,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tucygF,knGHh,CqC,D,Zi,jF,hk,Uw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WZkfFk,,xDLG,i,mR,HSL,lR,kwK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DLFGKQ,AvaRC,zZe,D,Bu,RV,hk,foSe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VogjCW,NHNrT,CqC,i,sD,Cj,lR,TKzU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LGgdrc,WEZQr,bVnY,i,G,,hk,syKP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ClTPsv,ifosx,,i,iL,YO,ri,flVn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vyDjCB,,Vj,U,ZJA,DDPD,lR,ZRb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LuumVw,fyozH,LDk,i,iL,xa,lR,kQXfp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OYRyAP,mwMxp,ez,i,bf,WFD,lR,epE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xtqypm,yMDSu,VsKz,i,ZKX,pf,hk,OLi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GLIrCb,UpZhy,VsKz,i,jgn,OxU,lR,MTP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SPRspc,cpxmF,Pcb,i,iL,Wsd,ri,ckrq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dSXNDb,BXMay,ez,i,iL,RSST,lR,aUhY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CTpnXP,rYFYY,,i,RC,dYPI,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,puMLwt,mHDez,CqC,i,Lz,yGet,hk,fyUwC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eWLMeS,aqDbd,,i,zj,Kuz,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eTlTWZ,hbFlj,iV,i,RI,dYPI,hk,ejeV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gXtvcb,QUpDF,aN,D,Cme,YO,hk,auP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jBJolx,mgoTc,CqC,i,y,YO,hk,eHdZU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rooyjk,WKKHt,EXYv,i,Yx,xa,l,heHfl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qnbPyg,oJXSu,xDLG,D,nU,Cj,lR,Pnbv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jaORsp,IVMiU,LDk,i,iL,nT,l,kgW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nOOBfE,AeLlQ,opm,D,SC,WNP,L,ppZTK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UBtxMH,,gpyD,D,GF,hhhl,lR,LzxSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,llazcl,DnTGD,gpyD,i,GF,ev,lR,ldTp,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BStloV,gUDiL,gpyD,i,Bu,Cj,lR,Dtizk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RQukvv,VIHIi,xDLG,U,hyz,pPN,lR,luAo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jacSbo,VzUtA,CqC,i,pm,jBP,lR,fQxB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AaoZri,teKMc,ez,D,iL,HSL,hk,eYIo,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iqjdLK,pivbv,KsKZ,i,RC,Cj,hk,hSvE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LVDTGx,dTzMC,KsKZ,i,GF,SC,i,jUaYN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PUmBYI,,CqC,i,FL,Kg,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FCWZss,lAeLg,yH,i,mO,Ri,hk,sAZg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sHICQB,tCwnd,EXYv,i,Cme,Zsbp,l,YIdC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LIxziO,AeLlQ,EXYv,i,nt,gI,l,KLon,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VccIKs,JmTkj,KsKZ,i,zz,sp,i,CbOE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SCFSGk,usrbK,mNh,i,Cme,,lR,Ybk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LluJDF,tvJzI,jb,i,THd,ev,lR,vk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hpzoNu,,Vj,D,SC,dYPI,lR,na,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OgWLQi,,VsKz,i,RC,gOZx,fU,zYbl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eFCCuF,zpINo,xDLG,D,Cj,Kg,hk,EAfH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xUoJQl,OiEPu,ez,D,db,bf,lR,ffL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DOclqu,ZuKMZ,VsKz,D,BfM,,hk,Bpi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QnFEIb,mxPzj,,i,iL,Ri,ri,pk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kvTXjD,QUpDF,ez,D,RI,SC,l,PojZw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qhQtMX,kSXVa,CqC,i,G,Cj,hk,HYVB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KzsmeM,DnPCF,anf,i,H,hvW,hk,wIw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UgtXWy,Nqkmi,opm,i,BAR,pf,hk,wwrs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AfDobM,pzLPd,CqC,i,iL,uECy,hk,Dbm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GFWidD,nHVgM,mNh,D,BAR,uGF,lR,yNuly,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pNVYAa,ockMe,ez,D,RI,Cj,lR,ZPlsh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pKUazS,MZzvk,rNcu,D,WLK,Cj,fU,hfAT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rGDPNh,teKMc,mNh,D,oh,HSL,hk,sa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dyidOt,pNMtG,KsKZ,i,Ri,Cj,lR,IEEO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dyidOt,,mNh,i,k,bfM,hk,rSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GSPTyn,SNYME,VsKz,D,GF,uECy,i,nTcS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZOlwOR,KyEGN,EXYv,i,iga,hmKv,lR,jxiwy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gifBtU,RUGgg,gpyD,i,ZJA,aZ,lR,dMg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ezBmvt,kemle,mNh,i,k,yGet,l,Ot,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cgCSMw,wHQSy,zZe,i,jgn,ber,hk,IUE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HwGUTq,OcAPt,iV,i,k,TAUy,hk,Xihlw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JxDvWs,AraPt,ez,i,nt,pPN,l,lQt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,APyDPP,JYxTL,CqC,i,sa,Mcs,lR,NFu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ffeEGE,pLYXJ,bVnY,i,G,lQU,lR,FSG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,shvSVo,MSYpZ,KsKZ,i,u,,lR,IcT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YhyZFZ,PwNjw,gpyD,D,ZJA,sWhI,i,JAu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DRFgfN,oEeyL,LjAS,D,mO,zlG,hk,Pj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,byPrBf,qSMjB,,D,oh,YO,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nvarRD,aGAzh,bVnY,D,vk,hmKv,hk,Mcs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NkZcfI,CNdsH,zZe,i,jgn,Wsd,l,uP,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BHXZeD,NjzEZ,KsKZ,i,FN,Cj,i,BbTrl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QnZXdM,KKZOn,bVnY,U,jgn,eQE,lR,YyNo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MjkPmY,nJvcN,EXYv,D,nt,bf,hk,mrDb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yCAjnB,zSIXU,yhq,D,oLI,nT,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tRouiM,YbWfE,CqC,i,nU,Ktd,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bDuVmr,UZasF,aN,i,k,cmmA,i,kyz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eDKpm,yXPia,CqC,i,Lz,gI,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OFlXo,LETzR,EXYv,D,Yx,xa,hk,LzYJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xeAuL,hlcVp,VsKz,i,RI,Cj,l,XOk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oBeVc,OSEBU,CqC,i,n,ESA,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oSdzb,wUEJc,LjAS,i,dQD,gI,hk,wXat,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bBKBH,SklNG,Pcb,D,RC,YO,L,HyVj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rmKpV,aBMem,,i,Ri,Cj,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jKaBG,wFCfO,mNh,D,RI,IamB,l,Ot,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LhlQT,oWoZd,bVnY,i,RC,hmKv,fU,asWka,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ilNZO,CiZAV,bVnY,U,s,Cj,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gIGPX,UtgMB,,i,u,y,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,drVeV,mONwL,,i,Ep,Pif,l,FN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vNoFH,qbdSk,iV,i,mR,pqp,i,Ijbp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eZYtj,zccHB,rNcu,i,GF,SC,fU,fuaf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ffQTq,mWKTs,,i,ZJA,Cj,fU,y,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BvnlA,gwGKb,CqC,i,GF,nT,lR,aDA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iYvml,MTddS,Pcb,i,RC,HSL,i,YaH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NCEBH,TVeAq,mNh,i,Ri,hmKv,hk,bdps,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KeYTx,,bVnY,i,RC,sp,l,Zi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JfpxM,MWxHT,Vj,i,SC,sp,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jcEGZ,cdmXU,bVnY,i,FMt,rbp,hk,ePq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aMpQe,eKNig,bVnY,D,xvb,y,hk,ECxIf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lmUFr,VONBE,iV,i,RI,SC,hk,kWZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kXMCq,pBRVS,jb,D,n,Zsbp,i,Kg,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jzCrH,lTyLf,xDLG,i,jF,,lR,gFPOL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cEqGM,rBXlN,Vj,i,mR,pBlc,lR,reLW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KvjBb,ZvTyL,mNh,D,RI,dYPI,hk,ZIzD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NZfHu,YIpfc,,U,u,SC,hk,fr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JbNEo,yPBim,,D,SC,nT,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dXpAz,RUGgg,aN,U,FL,qsr,lR,rZf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zPyIe,ytgnG,CqC,i,O,WNP,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sBigF,gCAcv,Pcb,i,qh,zlG,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XWnjt,vdUHx,zZe,i,H,pf,i,jSjqY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tETPw,eJvzh,KsKZ,D,Ri,hmKv,lR,tTD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MVAPb,,VsKz,D,RI,HSL,lR,HnAv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PyIbN,pLYXJ,,U,mO,xa,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LKEzW,ULSkJ,zZe,i,wGj,,lR,trQTp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xCImM,aTZZR,iV,i,iL,qyCG,hk,NLwR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LjlFT,TVeAq,mNh,D,cfU,hmKv,hk,yAXdK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DcBGh,rvijs,mNh,D,Om,SC,hk,rRm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YKbeq,pcpoK,EXYv,U,GF,Kg,i,qy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QBWeD,ujyjw,CqC,i,ZW,IamB,lR,VpXiR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iLzUU,hPEWT,gpyD,D,GF,ev,lR,bf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Taudd,dgPQa,EXYv,i,yH,buw,i,qy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rGFJe,hZPDA,xDLG,i,u,pf,lR,zdV,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oxNgk,oWoZd,aN,i,nt,hmKv,lR,WpEq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KHlke,QWEMx,KsKZ,i,jgn,TAUy,hk,Udwo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,clgno,ViguX,KsKZ,i,IaL,GES,hk,BwoX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DTAFF,nGRDB,iV,i,RC,yC,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wjkwe,ClwEM,ez,D,RI,Ri,hk,fnMQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HkRxg,doIEg,bVnY,i,RI,SC,hk,Mcs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PkeJI,MWxHT,zZe,i,sp,Bkt,hk,GBb,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gwrqQ,wwFAY,yhq,i,Zi,SC,lR,fvC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hOZNG,wxvqY,LjAS,D,os,y,hk,KWZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uFqPu,qLmHD,ez,i,kWZ,Cj,hk,NhLo,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tSLIz,qLcjc,,U,iL,pf,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qMWRy,VONBE,Gac,U,SC,XJb,oA,wGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QtWVh,hzynn,Vj,D,ZJA,gRTo,hk,PXI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DeLKH,gqTIk,QMl,i,GF,SC,lR,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aBnvf,GfRLe,iV,i,GF,eKfc,l,FUMG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TOKit,LQsok,bVnY,D,Pek,xa,i,SC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QNcJg,CnXtt,VsKz,D,jgn,SC,hk,izc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Jaypc,TnLps,Pcb,i,u,Ri,lR,WLK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rjKPY,AOANM,CqC,i,GF,,hk,zj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uNkcA,yMDSu,EXYv,D,kWZ,Cj,L,WNP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eAsvr,teKMc,bVnY,D,vk,SC,hk,LXL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LckbR,ntMiQ,,D,kWZ,Rse,l,nYbA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MqvCv,fxErQ,mNh,U,n,hmKv,hk,ABZq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wALaZ,ShlxV,rNcu,D,kWZ,Cj,i,eag,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MVbvP,ROaOS,bVnY,i,sp,fX,lR,RNB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WGKzj,,CqC,i,GF,QIe,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lZJbt,ESevc,,i,kWZ,dYPI,lR,rFiO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,twCPr,eSjKX,,i,ZW,lQU,lR,MkZI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gRCcP,XctNb,Vj,D,kWZ,eQE,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tkatr,hlcVp,VsKz,D,G,,lR,wCqb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Jngux,ncmot,VsKz,i,BAR,y,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Zjgxx,zTnre,LDk,i,RyV,etS,hk,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CQUTC,DnTGD,,i,RC,Cj,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sIXDF,AMRbH,LDk,i,iL,PF,lR,CUp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MeAxt,jrPjI,ez,D,Zi,mwY,l,Jmq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mTEum,dUnzn,,i,u,pf,hk,fr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dWnvB,gJjvo,,D,wGj,dYPI,L,xAF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yyVrr,zbaAA,gpyD,i,GF,pf,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UJVXy,txpZT,bVnY,i,Nc,ev,l,PfBh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vtBZm,ERiHU,Vj,D,aW,SC,l,cBFp,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LUTcT,CbfyD,iV,i,Bu,zI,hk,gAez,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eeFzx,oRdwp,mNh,i,pf,hmKv,T,KnRz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fqCvA,yXGhi,bVnY,i,Ri,dYPI,i,mjSxb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jnkdZ,CiZAV,ez,U,RI,WNP,lR,zIFs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oYIHk,BtJsn,ez,D,nT,YO,hk,mItg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iDWxT,gUsbv,EXYv,D,fx,xa,lR,HMhyn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AVreS,bYETe,Pcb,i,u,yH,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,myfpX,QlJOX,LjAS,i,uP,Cj,hk,yC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RjCBr,dvfBD,KsKZ,D,mR,DQc,hk,Ds,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Wvcrv,Pwwsw,bVnY,i,Pj,VyBk,i,JgAR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GwPkt,Tnycz,gpyD,i,GF,uGF,lR,AgStr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WTVEe,vdUHx,CqC,i,iL,y,lR,oNnp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,djnKE,UriEN,ez,i,kWZ,pf,lR,MoMJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aYHBl,aPzRl,rNcu,i,Zi,SC,hk,tCo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gfsZm,EWrtg,anf,i,Uw,KnZo,hk,PHB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rFFrd,kGWYq,mNh,i,Ep,Cj,i,zjtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GMUZh,CiZAV,EXYv,D,xk,SC,lR,mSxUE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pWsUt,woFEW,rNcu,D,Kg,y,lR,HTr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Tyebt,msdsR,bVnY,D,RI,yH,hk,FtTXg,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EpwjM,zcypH,mNh,i,iL,aRnz,lR,Ipwkb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fhDFk,lTyLf,yhq,i,iL,kXlV,lR,VbvIi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UZlUO,,QMl,i,FN,IamB,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AZJks,XgUzd,zZe,i,mO,KMAv,i,UiJH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SOuzm,yQenm,LjAS,D,iL,qyCG,hk,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mlUzv,UZDWv,bVnY,i,kB,y,hk,JxA,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NNZdi,DzLhz,Pcb,i,u,hmKv,lR,IaL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zZxUG,jHsOR,,D,kdc,RV,lR,EY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Edbfv,uGIFb,LDk,i,iL,jBP,lR,OElC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dGrfN,sGrXl,Vj,i,qh,tCwq,lR,DNP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CQVvq,zfzpe,aN,D,n,ev,lR,kZdV,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MgsXH,,mNh,i,k,buw,hk,QPm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KgLFo,AhAhc,LjAS,D,SC,XOk,lR,wMm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZyXKq,oRdwp,iV,i,mR,hmKv,hk,kWZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bBQRs,prCpG,xDLG,D,mR,kck,hk,nZS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ImVwy,hoyPK,xDLG,i,iL,Lmvq,hk,KPvc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ImVwy,yQenm,xDLG,D,iL,Lmvq,lR,tqZRo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BQvAf,XigoJ,bVnY,i,RC,VyBk,i,cAq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SsgeS,,EXYv,i,xk,HMXY,i,qy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KoTqe,KyEGN,ez,D,bf,hmKv,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dmoqs,jHsOR,ez,D,oLI,Cj,hk,pJu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bwONL,iMVgZ,yhq,D,iL,ZUA,ri,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GIHeq,IYSpC,xDLG,i,RNB,qNG,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bHdgB,zqBwb,KsKZ,i,os,Wsd,i,OUn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wIqNY,AbbqJ,CqC,i,zj,IamB,hk,zW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Bnwgz,PwNjw,CqC,i,G,DcjM,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Eypit,Smrjj,rNcu,i,Yx,LHS,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AyTWQ,cdSwJ,LDk,D,iL,zNvM,hk,BdSS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AyTWQ,oWoZd,LDk,i,iL,zNvM,hk,hZSf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AyTWQ,oWoZd,,D,iL,zNvM,ri,WQGx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tnmdE,soKhL,EXYv,i,iL,,ri,APs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SlpZB,KSiMG,xDLG,i,Kdq,pf,lR,vzSP,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wKgUQ,loceY,,i,FL,RSST,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JEPGX,aRalA,mNh,D,iL,hmKv,hk,Jij,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NiCiW,gCAcv,bVnY,i,ZW,YO,lR,Slg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ePyBk,vJJIO,VsKz,D,GF,uWTD,lR,AydM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ejciD,cPETG,Vj,D,ZJA,TAUy,i,Xmz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EJfjH,bsDLo,VsKz,i,iL,dYPI,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DQDzD,lEvAo,,i,THd,XJb,lR,VSL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iyZTY,KyEGN,iV,i,GF,hmKv,lR,tHK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pvpyU,,EXYv,D,kWZ,Cj,lR,eIWc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,piYmP,eKNig,ez,D,bf,Cj,lR,qYvw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Aalzc,KKRFI,OYMU,i,n,y,i,xk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mIzUl,ygneZ,Pcb,i,RC,Cj,lR,IQaHQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hmvLW,YoxHS,xDLG,i,GF,ev,lR,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NWAWg,ePyBk,,D,iL,zmB,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DiQOX,zPWJZ,iV,i,k,Cj,hk,VlynL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DCDQF,mgoTc,CqC,i,G,zNvM,hk,u,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fzlFa,uGIFb,bVnY,i,G,jBP,lR,yf,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TZWvF,PdiGr,VsKz,i,bf,,hk,zNtu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iTXgF,kemle,ez,i,iL,yGet,hk,WEd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jeGeR,jHsOR,CqC,i,n,Cj,hk,zj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UjJBG,eSjKX,Vj,i,GF,Cj,lR,BAP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Vsymg,,Vj,i,GF,RSST,hk,YJLM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,ZvTyL,iV,i,RC,uECy,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,NTvmH,xDLG,i,RC,hmKv,lR,cZ,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aqsat,JMwtw,Vj,D,RC,,lR,ESA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oVDuk,ivYgu,yhq,D,kWZ,Cj,hk,XSz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,legyD,DzgFa,xDLG,U,FL,RSST,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rBbqk,FRUYV,,D,iL,iGu,hk,Odm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fKrXt,pxtqQ,rNcu,i,zj,Pif,hk,QJC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zrsQP,ZQGrY,opm,D,u,qyCG,hk,qVz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HztvC,fFndS,VsKz,D,iL,YO,hk,oeqe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yCole,FFTxV,,i,u,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AbNNX,bYETe,KsKZ,i,FN,Mcs,fU,mCO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BiDsV,txpZT,rNcu,i,Kg,Cj,lR,HTr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oiji,YoxHS,mNh,i,ZKX,xa,hk,rXwP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MJPp,ponOy,LjAS,i,SC,pPN,hk,EuKH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oplj,pfJkN,,i,u,sp,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XtRN,vCNMH,xDLG,i,iL,gOZx,hk,TFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QfHK,iWmFf,VsKz,i,GF,DcjM,lR,Oemz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,duWF,zaJDf,EXYv,i,RI,Cj,lR,ved,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,enXJ,,mNh,i,nT,dYPI,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YAWE,eYjgF,EXYv,D,pk,sp,lR,gGz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ppDR,Smrjj,VsKz,i,SC,LHS,lR,qNG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mYUY,WGaOF,Vj,i,Yx,xa,hk,RV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hnRw,gMbWu,iV,i,GF,HMXY,hk,GCCZy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bAQE,dheCD,Pcb,i,u,uECy,lR,ywB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dOUR,zTziC,EXYv,i,uP,Cj,lR,uiLg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WybQ,nkrFs,xDLG,i,SC,SC,lR,aGSg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,znYf,GuqeH,,i,hcd,fX,lR,gpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gXqX,UZDWv,rNcu,i,Nc,y,hk,OxHKG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TUyR,oxvWf,,i,iL,GES,lR,vNu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LVNp,qwbvG,mNh,i,RI,IamB,lR,Ybk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,txKF,ivYgu,xDLG,D,Bu,Wsd,hk,kzU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nOXi,NHNrT,VsKz,i,k,y,i,nyQZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KMel,zktNk,xDLG,i,iL,,lR,ydJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tQdJ,vrlAM,bVnY,i,OS,hmKv,lR,QNZkj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EwUF,XkrIG,aN,i,G,NuYc,hk,WDnb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,llOr,AoADd,zZe,i,FL,ev,hk,pPtYi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gaLR,uYWpN,CqC,i,Ld,Cj,hk,RKsG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Xlbq,tuGlk,rNcu,i,iL,FXZ,lR,DiaLw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pXaU,MNqGT,KsKZ,i,s,YO,lR,qRwPs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Feux,ONGeK,bVnY,i,jgn,hYu,lR,kPj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pLEk,JjLio,CqC,i,GF,VIM,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HAzL,DWRev,jb,i,RI,SC,lR,ESA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NNYt,iJbpT,ZQa,U,n,zNvM,hk,qnwK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,EWSd,GwJNJ,,D,iL,qyCG,hk,Odm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ogMf,EHVJk,EXYv,i,bf,dYPI,hk,rgjc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zuyU,OMHVy,EXYv,D,u,SC,hk,NYEL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KlTK,BQNWJ,KsKZ,D,iL,Wsd,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LgTc,CcpoJ,gpyD,i,FL,uWTD,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SNRn,rGrAE,rNcu,D,KR,nT,lR,QFU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JSvx,qLmHD,iV,i,iL,Kuz,lR,sOTz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IcXx,cdmXU,EXYv,D,bf,mwY,hk,UZP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VUZH,KOJjz,xDLG,i,YO,gOZx,lR,wwqr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bMkj,wKKEM,aN,i,zOi,HSL,hk,brP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mkAe,rXnhf,CqC,U,GF,gI,hk,u,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HiGp,yZyjK,Vj,D,ZJA,Cj,lR,lRZR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,btsO,eGUBA,xDLG,D,iL,YO,lR,sEF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pzTM,,zZe,i,xk,sp,i,XmYc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,caky,JFMRC,Vj,D,u,SC,hk,SRfh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,PzPG,yZyjK,LjAS,D,Nc,Cj,hk,rrhu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pnjc,,EXYv,D,Kg,XLQ,hk,Ezpy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wrjh,kEFeM,iV,U,GF,YjrO,lR,CUp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KnwF,rRbDE,mNh,D,cfU,hmKv,hk,aKlA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ztoH,UVCVf,CqC,U,GF,Mgil,hk,iga,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XQhn,YoxHS,Gac,i,xk,ev,hk,kgn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WqFS,qSHNK,iV,i,G,,hk,zYr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dqqI,vZyhX,KsKZ,D,os,xxmj,lR,zTvV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,WoCY,,iV,D,Pj,dYPI,lR,ktJL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ABnR,uYWpN,ez,i,iL,ev,hk,iYc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ySyP,AXhVB,iV,i,RC,SC,lR,CAP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aHmd,,CqC,i,RC,hmKv,lR,vEZR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gOZx,,xDLG,D,kB,,lR,wHDw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kubP,XNYmw,yhq,i,Cme,Zsbp,lR,ev,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TVzw,bkfcS,yhq,D,iL,Wsd,hk,wVTH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hniC,TttFj,CqC,i,Lq,jBP,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xYFU,ujRdM,rNcu,i,sa,mwY,i,WI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iQWm,kEKkc,anf,i,RC,Cj,lR,gps,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pGfV,yHmTk,ez,D,Ri,Cj,lR,FeM,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YxVA,kGWYq,gpyD,i,nT,Cj,lR,NLEqP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nYKi,UtgMB,VsKz,i,RC,y,lR,guWC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ojFV,hlcVp,opm,i,OS,Cj,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qPSx,izZbI,xDLG,i,EF,XLQ,hk,OlYXl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RqID,vosox,LDk,i,iL,ZKX,lR,hyz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,alkP,uePum,,i,Cj,Cj,ri,wep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YMKP,KOJjz,zZe,i,kB,hmKv,i,pRt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jGoO,kSXVa,xDLG,i,OS,gANm,lR,Xnlc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fjfZ,tpiKL,CqC,i,FL,LHdO,hk,Uhb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zaPH,CfjhB,opm,D,iL,IamB,hk,tfp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eJDM,jkdjQ,zZe,i,jF,Bkt,lR,nqdu,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eJDM,SAbkD,CqC,i,jF,mwY,hk,Uhb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eJDM,teKMc,EXYv,D,jF,yC,lR,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fDrC,RUGgg,iV,i,iL,,hk,Ld,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Pegj,PbEdT,,i,gI,Zsbp,ri,DmZz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Kedk,aDVfZ,LDk,D,aW,xa,lR,SoVWt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QLBC,fFPdL,gpyD,i,RC,y,fU,jpAGV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,OYek,bYETe,rNcu,D,RC,SC,fU,nBBc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cHfQ,NNvru,xDLG,D,iL,Mcs,hk,Odm,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aaiP,RdvaT,xDLG,i,iL,Cj,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hnGF,tvQoU,yhq,i,Kuz,jBP,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fXzA,qZzCL,CqC,U,G,TAUy,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iUXn,AzPRY,zZe,i,RC,SC,lR,QISmt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Evdz,FtRlP,rNcu,i,nU,Bkt,lR,QFU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UKSK,nLyQo,xDLG,D,iL,Wsd,hk,iED,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gNZM,UgQaa,,i,iL,hmKv,ri,PSeH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Jrba,,bVnY,i,O,VyBk,lR,Jxpr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vUDV,Toicl,yhq,i,KR,LRap,lR,svpP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jdnH,FVyoD,,i,xk,zI,lR,Nc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jdnH,JpXCs,EXYv,i,xk,SC,hk,gNZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fuaf,MOOYU,OYMU,U,db,zWve,lR,lmdj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yPMA,NVLns,yhq,i,ZJA,uIjX,lR,gChDL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ElFW,FPgQL,xDLG,U,iL,FvO,lR,eOp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ElFW,aPzRl,LDk,i,iL,FvO,lR,hyz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JDKK,vnUks,ez,i,RI,Cj,lR,DME,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YLNH,jCPPl,EXYv,U,RI,xa,i,MDaEq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jeQb,ESevc,EXYv,D,xk,YO,ri,pf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iXrH,hQGku,LDk,D,iL,Wsd,ri,EPqN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qMzS,gMbWu,mNh,i,nt,dYPI,hk,fEKc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,eTNq,uLFqs,,i,Zi,Kg,hk,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZlzG,NSRwQ,,i,zj,zI,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SRZB,ouvnZ,ez,i,n,y,lR,xa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HTUE,VjfpO,aN,i,y,Cj,hk,lssv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZIfo,wwFAY,,i,iL,SC,hk,LfM,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,yiJt,RdRxf,yhq,D,iL,eQE,hk,eIg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HCsg,bWJlU,,D,iL,ev,hk,Odm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YjUO,CiZAV,LjAS,i,aW,Cj,lR,ikRWz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aCsr,vnUks,CqC,i,Cj,Cj,hk,qh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,mXYE,QImNH,OYMU,i,y,YO,i,QGqIt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aARq,rYFYY,aN,i,GF,pBlc,lR,iCEQa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,KeOb,IpWvs,EXYv,D,exS,y,i,EHQj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tUbU,qygIq,yhq,i,RI,SC,i,ZNr,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,YsjD,gwGKb,CqC,i,G,YjrO,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,FMAq,auWsL,Pcb,D,ss,fX,lR,JWQHp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Yfoo,DSmqH,bVnY,D,cZ,gRTo,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zOkt,XmDvh,bVnY,D,RI,RV,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jKAH,,bVnY,D,ZW,rbp,lR,qyGN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,zemM,XNCkz,VsKz,i,RC,uECy,lR,GugK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fpTZ,QImNH,mNh,D,G,zNvM,hk,ZIzD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,gAez,hPEWT,,i,xk,ev,lR,EY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BTCd,PXgtD,,i,GF,dYPI,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,AMEDi,,i,zj,Cj,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,aGAzh,Vj,U,zj,hmKv,lR,UgOR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,QImNH,CqC,i,zj,hmKv,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RlxT,,iV,i,zj,Zsbp,lR,LLqY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QTxq,TVeAq,bVnY,i,Pj,hmKv,i,bsx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oTej,xZsRI,LjAS,D,GF,pPN,hk,XvKn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JWKQ,lNEch,KsKZ,D,nU,sp,hk,Ds,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DvEd,CiZAV,EXYv,i,iL,Cj,lR,XUdd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DvEd,KKRFI,gpyD,i,iL,Cj,lR,WFD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,euVq,fQNSn,KsKZ,i,RC,hmKv,i,eHh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TuxH,kfYCP,xDLG,U,iL,Cj,lR,Hvj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jJWP,kGWYq,QMl,i,RI,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,kAII,,mNh,i,Cme,Zsbp,hk,Oase,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hHJi,GpclB,xDLG,U,iL,YO,ri,wfyyO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dtUP,ojRHc,ez,D,iL,nT,hk,WEd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,GRny,mMkdu,rNcu,i,exS,nT,i,WI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZGyi,,CqC,i,ePq,XWbp,hk,RoZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dzlc,jHsOR,ez,i,RI,Cj,lR,QhEp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tllY,dheCD,VsKz,i,zj,uECy,i,xAi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tllY,dheCD,KsKZ,i,zj,uECy,lR,pPN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tllY,OirYD,bVnY,i,zj,uECy,lR,godvT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dtvr,jdDwV,yhq,i,IaL,wOZo,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CWSp,aRalA,LDk,D,iL,hmKv,l,ARFK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,reBn,huHrv,OYMU,i,KR,wOZo,lR,viK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nZcE,qizlO,Vj,i,ZJA,gOZx,lR,ZRb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,wBFv,WvRdS,yH,i,mO,WNP,lR,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cqfS,uYWpN,aN,i,FMt,qNG,hk,brP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZNzr,mONwL,gpyD,U,os,Cj,lR,cBC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,vZrJ,OCBNS,CqC,D,G,Wsd,lR,Alw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XwVT,,CqC,i,y,YyNo,hk,RoZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lAUK,TjJiS,CqC,i,n,HSL,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lAUK,qWMEz,EXYv,i,n,y,lR,rKBEz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lMpJ,xwDjL,Vj,i,ZJA,y,lR,DbtX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,CEtN,ZanZO,iV,i,H,yC,i,aNX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nmyk,qygIq,EXYv,i,H,DME,hk,vZrJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IKYJ,fbGJX,VsKz,i,H,pf,hk,YiOG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IKYJ,RxrUr,xDLG,i,H,pf,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,auwc,kQXfp,ez,D,k,Zsbp,lR,AQCt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TyCx,dLloQ,,U,Bu,diMf,hk,Dq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jqok,DnPCF,QMl,i,Kg,yC,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,SjdL,nMlTX,bVnY,D,nt,SC,lR,JYZb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HtUT,PHCFJ,xDLG,i,Ri,Cj,hk,cbw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rgnl,mgoTc,xDLG,i,iL,YO,lR,cAoy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,VZvl,AMEDi,EXYv,D,OS,Cj,lR,wrl,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,egYm,aEQZY,iV,D,vk,sWhI,fU,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,egYm,tcmZw,ez,i,nt,dYPI,hk,fdrn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UdXx,IaFdH,VsKz,D,zj,dYPI,i,LCK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,RtFV,NLAAP,iV,i,BfM,SC,lR,MkMu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Cvrp,clsFj,jb,i,GF,gOZx,i,sYv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,hZLC,RTQUJ,,i,Nc,y,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UCAs,mWKTs,,i,KR,sp,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JPds,DXeTv,xDLG,i,OS,SC,lR,uPhE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JPds,ntMiQ,KsKZ,D,OS,SC,lR,yWVmT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JPds,GAsNk,EXYv,i,OS,SC,lR,YzoH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,JPds,RKQWZ,bVnY,U,OS,SC,hk,fFFL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xTvk,pKgAU,opm,i,Ld,iADy,hk,pZgN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,trSd,VENRX,yhq,D,k,,hk,YTC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,trSd,HLYZq,CqC,i,k,,hk,aQF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,iywR,vflvs,ez,i,Os,TAUy,lR,AXcr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uwra,OcAPt,xDLG,U,mR,TAUy,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,uwra,,iV,i,mR,TAUy,hk,kWZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nhCe,OcAPt,xDLG,U,mR,TAUy,hk,nZS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,aZlc,UcrWb,xDLG,U,G,,lR,MUqB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cNDz,SefEe,CqC,i,y,hmKv,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cNDz,,gpyD,i,GF,kgW,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,turM,ydfsP,xDLG,i,OS,ev,lR,wHDw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QgCL,Yzxdh,,i,IaL,xa,i,RJS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dJQk,zktNk,,D,k,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jLAV,PQodN,iV,U,RC,,hk,buw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IFlE,szNRH,,i,GF,RjQr,hk,NVtV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IFlE,QItMv,gpyD,i,GF,,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,IFlE,,xDLG,i,GF,Zsbp,hk,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,tSIH,SZDsW,,D,OS,Cj,lR,vNu,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DTjs,tWWFx,gpyD,i,os,pf,lR,Wu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DTjs,ONKJD,,i,os,pf,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,DTjs,MMnif,gpyD,i,os,pf,lR,Wu,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Thpg,JMwtw,ez,i,GF,dYPI,hk,qsFe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MmFP,wubWu,,U,G,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lBJy,mWKTs,CqC,i,gI,zlG,lR,jSrcD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,TteF,gUDiL,xDLG,i,EF,Cj,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,Oyzi,lFzoj,iV,i,GF,NEFB,hk,fHv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,bfeu,doIEg,rNcu,i,RC,yH,lR,pFH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,LioW,DrkVz,CqC,U,jgn,xa,hk,RoZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HVwU,NHNrT,Vj,D,k,YO,lR,qCw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HVwU,hAjyU,mNh,i,JnB,YO,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,sIOm,Vjhjk,CqC,U,GF,YjrO,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZNcI,SwkWt,CqC,i,cfU,xa,hk,mZez,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,MVdL,sszoN,yhq,i,GF,Cj,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QhEp,XeDef,EXYv,D,RC,Cj,i,lmR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,XUlI,vAuYo,,i,Ld,y,ri,wep,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,AWgT,fIVqL,rNcu,i,RC,SC,lR,pFH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,UVZb,WxFOK,EXYv,U,OS,dhzh,i,nUHA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,jBCu,QUpDF,KsKZ,D,RC,yC,lR,GMty,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lqnh,amOOk,gpyD,i,GF,zhkk,lR,HZGJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ouJI,KgLFo,xDLG,D,sa,zI,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ouJI,yAkvd,CqC,i,sa,MEQJ,i,uoJX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ouJI,APmni,yhq,D,sa,UEOb,lR,HFpg,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BryE,XmDvh,iV,i,GF,sp,hk,Oytx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,BryE,hKYJZ,gpyD,i,GF,HwD,lR,ebk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,twkC,wwFAY,KsKZ,D,FN,RV,lR,vZye,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,twkC,yZyjK,LjAS,i,FN,Cj,lR,XvKn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,twkC,UvMmX,gpyD,D,FN,DDPD,lR,Rfp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,hccgb,,U,FN,gOZx,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,AZETv,gpyD,i,FN,sp,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,kfqKW,KsKZ,i,FN,SC,lR,jYQOS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,XEFKc,gpyD,i,FN,LiWc,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,zktNk,KsKZ,i,FN,DUHG,lR,gNv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,DzLhz,KsKZ,D,FN,gOZx,lR,agvT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,QCRl,,KsKZ,D,FN,SC,lR,Eyi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,HlsR,ePyBk,CqC,i,G,pBlc,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rEIi,rmISQ,rNcu,i,RC,eQE,fU,HMlv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oZUs,ONGeK,iV,D,s,YO,hk,dad,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,oZUs,Lzxmq,yhq,i,s,Wsd,i,eG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pChe,fYWgz,CqC,i,G,,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,pChe,KzFWz,CqC,U,G,Zsbp,hk,UpK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,lmdj,ILDSV,CqC,i,G,,hk,zhus,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,qZRbr,,D,FN,gOZx,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,bYETe,KsKZ,i,FN,mwY,lR,JRnwg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,DnTGD,,i,FN,ev,lR,Kuz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,nndpW,EXYv,D,FN,Cj,lR,KguF,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,ZnZf,,zZe,i,FN,hmKv,lR,Kuz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,nTcS,QUpDF,,i,os,ev,i,sD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NsOx,,KsKZ,D,os,IamB,lR,Bownf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,RZfCx,aN,U,n,RV,lR,saSsP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,NuQz,LdGeV,CqC,i,n,RV,hk,zhOaQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,hcMuS,gpyD,i,os,fNlL,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,ZffyD,iV,i,os,uWTD,lR,UNpa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,zTnre,gpyD,U,os,uECy,lR,nZcE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,WExnq,xDLG,i,os,RSST,lR,MQce,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,fflq,pzLPd,iV,i,os,uECy,hk,zI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,xiLG,GDSnP,xDLG,U,GF,Cj,lR,jF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,qEey,bAbXl,EXYv,D,GF,,lR,SSf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,rdsY,nMlTX,aN,U,SC,yH,lR,bwfa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,dKUM,ZhLBh,rNcu,i,jgn,gOZx,hk,RI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,qcEhj,CqC,i,GF,Cj,lR,OinT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,cflD,EOhNc,rNcu,i,GF,MBL,lR,bWEh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,IExVG,,D,sa,pgG,oA,bpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EFuWC,Gac,i,xk,mwY,oA,wGj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NNWaU,mNh,D,oen,iKG,i,IGTD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VJxDL,yhq,i,kWZ,pf,hk,Inq,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zWvHI,,i,GF,DME,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nSvxx,Pcb,D,YO,Cj,hk,Utut,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FtsZs,,i,GF,ZDwU,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JvcHb,,D,os,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LhzxC,QMl,i,k,Cj,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,dorgg,xDLG,i,BAR,Zsbp,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AsEfd,zZe,i,RI,mwY,i,vIos,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,iybde,,i,JI,ify,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zWUFs,VsKz,i,hyz,y,i,FHlgS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,EIaPn,opm,D,JI,gmi,hk,MjWqk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hoyPK,,i,xk,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UMWCH,LDk,i,THd,na,hk,MJPp,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CYinj,EXYv,i,yf,Bkt,lR,ppCe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rRbDE,EXYv,i,kWZ,hmKv,i,ENPvb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,InZpO,iV,i,GF,RV,lR,ovm,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KEohZ,LjAS,D,GF,,hk,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NTvmH,mNh,D,pm,hmKv,hk,Pe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NTvmH,,D,jF,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MiuKF,EXYv,i,k,hmKv,l,IMzf,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CmGAY,ez,i,Ri,xa,hk,jtWHw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,txkxq,LjAS,i,JnB,dYPI,hk,myx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GwSmH,yhq,U,zlG,,l,mso,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fxErQ,,i,aW,hmKv,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MzmlP,CqC,D,jF,pFH,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JYxTL,,i,,Mcs,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FbvHy,LjAS,D,JnB,yH,ri,yC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AXhVB,EXYv,D,Ri,xa,hk,Cj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tRZrN,QMl,i,RI,RV,T,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YZLUv,,D,oh,RV,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Nqkmi,,i,RI,ZBq,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vdUHx,VsKz,D,sa,sD,hk,BfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vdUHx,KsKZ,D,FMt,XLQ,hk,cbYc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pLYXJ,Gac,i,kWZ,uGF,lR,HvZg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pLYXJ,mNh,i,pm,Cj,lR,Wjgr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pcpoK,LjAS,D,Kg,Kg,hk,wXat,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qgWye,,i,ZW,Kg,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UimzX,LDk,D,ai,Kg,hk,OS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,iMVgZ,,i,iL,iGu,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ponOy,ez,D,JnB,pPN,hk,UQvOV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,uGIFb,EXYv,D,RI,ESA,hk,YjH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,woFEW,zZe,D,oh,ev,hk,UZP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,bWJlU,,i,u,ev,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,uYWpN,VsKz,D,hyz,IJq,L,mVP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,uYWpN,xDLG,i,mO,ev,lR,oLI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,eNMxO,bVnY,i,boZ,ev,hk,Yx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SXZFT,,D,cfU,Ri,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FdViQ,,i,GF,db,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wNpHN,aN,i,k,xa,hk,ZlnSY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,wNpHN,,D,n,hfB,fU,Om,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gPBuC,,D,aW,na,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zLfaS,bVnY,U,ZKX,sp,hk,sp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ViguX,,i,n,Ri,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rGrAE,,D,RI,SC,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CrkQM,,i,k,zI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mxPzj,mNh,D,Yx,Cj,T,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oxvWf,QMl,i,mO,Ri,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jHsOR,ez,i,mR,pf,l,rOw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,PkDWB,LjAS,U,xk,Cj,hk,HFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FoVeb,LDk,i,iL,VIM,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AMEDi,zZe,i,kB,Cj,L,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CiZAV,xDLG,D,wGj,Cj,hk,kItM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CiZAV,Pcb,D,u,na,lR,gI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AaQmZ,opm,D,SC,Cj,hk,dCv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,PHCFJ,,i,OmE,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jNsAq,,D,vk,Cj,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hqpMg,LjAS,D,Ot,y,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,izZbI,zZe,i,Zi,ev,i,Ri,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tWWFx,,U,JnB,ESA,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ivYgu,mNh,i,oen,Cj,T,xVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ivYgu,,i,jgn,Wsd,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hQGku,,i,KR,gI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KoskF,zZe,D,kWZ,eQE,hk,ebk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,KoskF,,i,u,ev,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tdgQS,Pcb,i,u,HSL,lR,gI,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,szatV,,D,Bu,HSL,i,BQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SxBql,Pcb,i,u,XBS,hk,fzn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,WsIbR,zZe,i,EY,HSL,hk,GBb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,IZQYv,Pcb,i,Rk,LHS,lR,gI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VONBE,CqC,i,jF,na,hk,ixN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VONBE,,i,u,nT,hk,fr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,lASnD,xDLG,i,ZW,XOk,hk,fuN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UriEN,Pcb,D,u,pf,lR,STJd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,HGnGo,,i,Ri,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,AZeeg,QMl,i,pqp,ZNN,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YWEVU,Pcb,i,u,lxg,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qfynN,,D,hyz,NFu,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JGBHX,Pcb,i,u,bqP,lR,IaL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LnlmR,EXYv,i,RI,HSL,i,cLQG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,LnlmR,KsKZ,i,Lq,jaD,i,OUn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FQqvL,QMl,U,FN,lQU,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,eSjKX,Pcb,D,qh,lVH,hk,eoJAA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mNmrQ,,D,FW,eQE,lR,nt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,VzUtA,ZQa,i,RC,SC,hk,AiH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,lHjLY,,D,sD,aRnz,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,frgYp,,i,Nc,SC,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,GAsNk,opm,i,RyV,SC,lR,nnlXJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,pehkw,QMl,i,kWZ,SC,L,ZhX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DxUot,VsKz,i,GF,qVs,hk,xiNv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DxUot,xDLG,U,ZW,qVs,lR,jF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Tnycz,CqC,i,jF,aPt,L,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ojeZB,,i,kdc,Cj,l,FN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ojeZB,,D,u,SC,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zLIpF,QMl,i,GF,SC,T,nT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RUGgg,,D,mO,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,NgyUp,,i,Zi,aiR,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ygneZ,KsKZ,D,nU,Cj,hk,Ds,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vZyhX,yhq,D,kWZ,Cj,i,ZNr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vZyhX,,i,Cj,pf,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,YRljV,,U,vk,TAUy,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FDHHZ,,i,Uw,pf,T,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FFTxV,,i,ss,pf,hk,DWtl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SozVv,,D,u,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yZyjK,QMl,D,yH,rSZ,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,izcWb,LDk,i,aW,Cj,hk,KrGI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,nMlTX,,i,u,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RhJpP,,D,RI,yC,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XctNb,xDLG,i,kdc,xa,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XctNb,ez,i,nT,xa,hk,gRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rWGPS,CqC,i,oh,yC,hk,Uw,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ERiHU,Pcb,U,u,xa,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QGdSL,KsKZ,i,FN,jF,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,rGzDb,jb,U,Nc,Cj,lR,ESA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mgoTc,CqC,U,NHX,RSST,hk,zj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,haDYz,,D,sD,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qRxRn,,i,zlG,YO,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QbFYx,mNh,D,Cme,rbp,hk,tAIw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,mWKTs,,i,GF,ByE,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hAjyU,ez,D,vk,Bkt,lR,iKG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SiLfq,Pcb,i,u,mwY,hk,fzn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,xZsRI,LDk,i,aW,ysh,hk,OS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,MBLsY,yhq,D,qy,,l,lzQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,XThig,,D,qh,YO,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZqfRS,,i,IaL,RSST,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DCemK,gpyD,i,GF,,lR,xFML,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,fZKvC,QMl,U,nT,,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gcvwB,,U,THd,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,zTnre,bVnY,i,Lz,uECy,i,aNX,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JYbNh,,i,pk,uWTD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cNlHz,iV,i,GF,na,hk,BjwF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,jFAln,mNh,D,GF,HMXY,hk,SOrL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qkqKB,mNh,D,pm,dYPI,hk,lmcY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,BWYOS,,D,JnB,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Aeewi,,i,zlG,TXLD,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yyEeK,EXYv,D,JnB,dYPI,hk,bwzZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yyEeK,,U,zj,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,moBes,,i,Ep,sWhI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,tGvIu,ez,D,bf,TGXq,lR,NxI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qSMjB,xDLG,i,RC,dYPI,hk,VnXx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qSMjB,QMl,i,Kdq,VyBk,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,RYvzR,bVnY,i,oLI,,l,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UbJjv,EXYv,D,oh,,lR,QFlu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,Tnqdc,LjAS,U,RC,dYPI,lR,RsFU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,JMwtw,,U,PF,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,SVLxE,OYMU,i,Kg,ypXm,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DVotu,gpyD,D,mO,dYPI,lR,vhPI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,FJteQ,aN,i,fr,Zsbp,hk,JjE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qZzCL,LjAS,D,mR,,lR,JACf,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qZzCL,,U,SC,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cEpGn,,i,Cj,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,oWoZd,VsKz,D,hI,KnZo,i,hSE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QImNH,VsKz,D,JnB,zNvM,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,QImNH,OYMU,i,GF,hmKv,i,xk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,vrlAM,,D,EF,pf,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,yQenm,QMl,i,u,TAUy,T,nT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,miwCS,zZe,i,BfM,zNvM,hk,JLuL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UcrWb,,i,zlG,hmKv,fU,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DzgFa,ez,D,Ri,hmKv,i,PWJE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,DzgFa,,i,sD,,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,opZrF,ez,D,ZKX,hmKv,i,ICtlX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,opZrF,,i,Ri,qyCG,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,cPETG,QMl,i,GF,tCwq,lR,JnB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,APOyk,bVnY,i,GF,IamB,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CfjhB,ez,D,nT,IamB,hk,ITXw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hpCAn,EXYv,i,bf,,lR,vpPf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,hpCAn,,U,FL,RSST,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,qZkcz,,i,iHi,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,kFmnB,mNh,i,pm,gOZx,hk,UGL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ZIxJx,mNh,i,pm,na,hk,TTi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,ruKdN,QMl,i,RI,uECy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,CcpoJ,mNh,i,oen,uWTD,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,gQCaa,EXYv,i,Pek,pBlc,lR,wrl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,UvMmX,mNh,D,Cme,DDPD,hk,mO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,aiYKj,,i,pm,IamB,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,VsKz,i,GF,,hk,gqn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,bVnY,D,yC,,lR,dzcZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,rNcu,i,zj,ZDQc,i,LCK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,KsKZ,i,FN,kgW,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,KsKZ,D,FL,LKKI,lR,jBxy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,i,JnB,,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,i,k,lGa,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,QMl,D,pqp,qyCG,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,CqC,i,KR,,lR,ibf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,U,FL,,hk,wdDl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,mNh,D,pm,EuKH,lR,Ybk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,yH,D,Kuz,Nc,lR,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,ez,i,Ri,yH,lR,jTxPU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,lVH,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,mR,uWTD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,aW,ypXm,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,i,G,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,exS,zI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,IaL,pgd,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,pm,JVF,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,I,,,,D,,Cj,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xjpIZGj,nMlTX,OYMU,i,YO,yC,fU,wgha,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,piuYsGe,rGzDb,iV,i,n,YO,hk,mDzP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jMKHgvZ,,opm,i,hyz,gOZx,lR,aEem,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tNyHMlE,HsZBB,EXYv,i,ePq,jBP,hk,KPGx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PIkdQaB,EwHnk,zZe,i,RV,Ri,fU,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VsnrqkQ,QHvzH,,D,RI,pf,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nIZRnbF,usrbK,iV,i,n,nMxp,hk,zI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KGAARsY,FPgQL,xDLG,i,Nc,Cj,ri,zlb,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bfJolUx,eSjKX,LjAS,D,hyz,lVH,fU,uUrP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OyTvplS,GfRLe,gpyD,D,qh,dYPI,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TfuPsUy,IeoJw,opm,i,iL,,ri,sGDL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dgjsWqr,OYEDQ,EXYv,D,RI,sp,hk,ehLs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zIRoBKI,BesNn,LjAS,i,BAR,flWz,hk,FqEk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BjGYvSH,hAjyU,CqC,i,sD,SC,lR,ss,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XlJkGgG,jGWDw,yhq,i,G,kWZ,lR,n,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MnrBFOk,pLYXJ,LjAS,D,iL,WNP,lR,BLic,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jylCPAN,dtobc,EXYv,i,zlG,y,lR,osu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YZgdJBh,gNOgt,Pcb,D,u,sp,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xdOFhKA,ZSjJg,zZe,i,OS,y,i,CrVaW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wrcfBOA,SKihC,LjAS,D,Ep,Zvq,hk,yC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GxhkyGH,AQUeL,zZe,D,Ri,xa,i,qVs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VllIlHK,fFPdL,gpyD,i,FMt,y,lR,uDuf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MSICzfE,XxfpD,yhq,i,kWZ,SC,hk,Inq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NXFgGVM,,LDk,i,Cme,HSL,hk,sCA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qqmkuGW,CYinj,VsKz,i,iga,eQE,hk,pXCJd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ekuECgB,zbaAA,xDLG,i,Nc,mwY,lR,KcEF,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YKzthnI,,LjAS,i,bf,Cj,hk,yC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yEEJeZi,XmDvh,xDLG,i,k,RV,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ULIeZiO,LQsok,CqC,i,sD,YO,ri,uPSV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qjUOeyi,MMnif,ez,D,bf,gOZx,hk,Jcf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wlORIeA,rmSkc,mNh,D,na,Cj,ri,qkg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QnjKXWP,QImNH,CqC,i,n,IamB,hk,u,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mCmwjhJ,FbvHy,CqC,i,nj,SC,hk,JpGH,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WTOlcus,EfCkA,mNh,D,aW,gOZx,lR,HjB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SqlNsHl,QImNH,yhq,i,GF,tCwq,lR,AWgT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SqncjzQ,DQYjU,yhq,i,lVH,gI,hk,Inq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gYhUoJI,QUjYe,mNh,i,uP,buw,ri,GtBI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NLdSgjU,QImNH,Vj,D,SC,hmKv,lR,tSUb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QQXLlVo,CcpoJ,ez,i,Cme,uWTD,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uqFhJxA,UpZhy,CqC,U,GF,Kg,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HrNSqeX,pBRVS,aN,i,yC,RSST,hk,GPey,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fuRvHGJ,elfXE,CqC,U,sD,,lR,ss,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VVVLTMG,,,i,Yx,YO,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JtORbYA,RZfCx,zZe,D,KR,nT,hk,oCzE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AHYkssb,eGUBA,bVnY,i,GF,YO,i,SC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NUrbuSA,,LjAS,i,iL,y,ri,EPqN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NgRiaoE,DzLhz,bVnY,D,RI,gOZx,hk,rSZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tFLdyMk,SLOGj,ez,D,ZKX,eHh,lR,mKDi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mLBbpPd,zPWJZ,KsKZ,U,GF,Cj,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YijZvPR,yMDSu,LjAS,i,Zi,pf,hk,Cj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SRoNfcv,MYRRr,xDLG,D,RC,dYPI,hk,Os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zbyWFXF,nZVbd,rNcu,i,zz,,hk,LSHMF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EDSXYJX,UcrWb,LjAS,D,RV,hmKv,hk,ATLg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QiKRvPd,KyEGN,ez,D,ZKX,hmKv,lR,PZWFo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zIvZJZE,QImNH,CqC,i,pm,hmKv,hk,NeG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sHGwSy,TVpUe,mNh,i,Cme,FvO,hk,VVXp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YKeHSL,,bVnY,i,bf,Pif,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NTHYVV,CfjhB,LDk,D,aW,IamB,lR,ejmJU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,flCXff,RtwoM,Gac,i,mR,zz,lR,YKXcf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WdTYCK,TDdEE,LjAS,D,Zi,SC,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SFxPpU,aPzRl,ez,i,Kg,mwY,lR,bf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SLKaWd,Lsxds,iV,D,yC,IamB,lR,yIFpu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wOMREU,pzLPd,LDk,i,iL,uECy,hk,qh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ELspaL,oRdwp,xDLG,i,SC,hmKv,fU,IUE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qYsrNk,,QMl,i,ZKX,YO,T,gps,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LxefMb,POrHL,Gac,D,u,uECy,hk,QntX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VAzTbA,dQgun,xDLG,D,aW,pf,fU,Zi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YaqhSG,DzgFa,LjAS,D,hyz,qyCG,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EWqWhf,TjJiS,ez,D,ZKX,HSL,lR,vIuMi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yRVhPP,ivYgu,QMl,i,zW,Wsd,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,quINpO,eYjgF,VsKz,i,k,soR,hk,Mwlzb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kOnjWX,izcWb,mNh,D,hSE,Cj,hk,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xCjKCD,,jb,U,THd,ZDwU,i,Kg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nRlNhM,xFfcE,rNcu,D,kB,mwY,hk,kbd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vPrekf,,VsKz,i,GF,TAUy,hk,bRGv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eOPQlz,LQsok,xDLG,i,os,YO,hk,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,lUsDCs,tEJnc,VsKz,i,oMY,y,ri,mlhtW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CDBJYO,qkqKB,ez,i,GF,jHBL,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yyCNqX,oBwBc,bVnY,D,vk,pf,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,agFNIq,JpSzL,ez,i,FW,Cj,lR,Wna,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zAjyZd,,bVnY,i,G,tCwq,hk,enXc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ygGRej,OcAPt,,i,Cj,TAUy,hk,SVhc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jLkGIt,ntMiQ,rNcu,i,RC,Cj,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jLkGIt,HrkuK,xDLG,i,RC,aRnz,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eOVsGc,FQqvL,LjAS,D,oh,gJq,hk,RROr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QNlRHY,ARdWn,xDLG,D,iL,KCWa,hk,vMT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WHkeBM,cdSwJ,QMl,i,aW,UpSB,L,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,owgdjl,,VsKz,i,xk,jF,hk,pm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZWscoY,CXOTH,CqC,i,zlG,RV,ri,pzFw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QhsLKu,mZcIF,LjAS,i,RC,mEr,hk,RGQd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Unacwj,VONBE,mNh,D,qy,y,hk,sa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FZqOni,MMnif,zZe,i,yC,gOZx,hk,jaUt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GhKTPm,,mNh,i,GF,Zvq,hk,RDsJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FjNMJh,JWQHp,Pcb,U,qh,xxmj,lR,ywB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CGOsSu,CcpoJ,Vj,D,SC,uWTD,lR,dCN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mvZEuS,SKGNX,Vj,i,eG,khbX,lR,UEkVa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vCQWsv,ZNLhJ,,D,pm,hmKv,lR,nt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZVpqfi,,VsKz,U,nT,gOZx,hk,zee,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qCBisJ,KWjqE,gpyD,i,os,SC,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BtZTGf,gUDiL,ez,i,RI,y,hk,KgYh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,oqKUnw,ClwEM,,i,SC,YO,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KrvSLY,oxvWf,Vj,i,n,gI,hk,MmW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,lNeyvQ,vdUHx,bVnY,i,RI,YO,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pueMJz,YoxHS,bVnY,i,RI,ev,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pDJOLw,MNqGT,mNh,i,oLI,jF,ri,eXaQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pDJOLw,,QMl,U,oLI,Pif,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zMuVuL,vRwhI,rNcu,i,zj,ev,hk,MDmy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RDrHWA,TttFj,,D,iL,ESA,ri,Rsl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kUhWRx,SAbkD,mNh,i,jF,mwY,hk,gMZR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,eqxRFF,UHHyy,EXYv,D,k,iADy,lR,hTfq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VulNnR,OuIIg,EXYv,D,G,hmKv,i,Wjnt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IGqcLY,XsLDX,EXYv,i,eG,dYPI,lR,Xvjq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YPrsqa,CfjhB,QMl,i,GF,IamB,T,zTvV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,raNEup,,mNh,i,oen,hmKv,l,Ot,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BfwVfj,hQGku,zZe,i,sp,jF,hk,UIuP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ESJEkA,wNpHN,mNh,i,RI,na,hk,cIgt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NPAUYn,GCXEW,xDLG,i,qh,aRnz,ri,tfDj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DtIORx,FeFND,bVnY,i,k,xa,lR,Pek,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qJxjZv,ClwEM,ez,i,eG,Ri,hk,TNJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qJxjZv,eKOcq,Vj,i,ZKX,Cj,lR,TNJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CnzNDc,UcrWb,Gac,D,iL,UpSB,i,DpNYd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,nKnGbY,KKZOn,,i,iL,zNvM,ri,wep,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ctAzXw,bXKsJ,,D,iL,sp,ri,uvhA,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QukXpP,GDIAH,,i,iL,SC,hk,eVfK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kwuDmO,rlkQO,LjAS,U,iL,gI,hk,mO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DAYvMB,LiFpo,Vj,i,oLI,y,lR,YskV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kqqnll,CKgVb,mNh,D,yf,nT,hk,lxg,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RUPVLM,,VsKz,D,iL,Cj,lR,JyZr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FissOk,KDQwK,LDk,D,iL,,hk,hZSf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yflknZ,mxPzj,xDLG,i,iL,y,lR,JyH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wBEsDz,rBXlN,CqC,i,nT,dYPI,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DqjfEc,UcrWb,,i,iL,hmKv,hk,Odm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UOUREC,PHCFJ,ez,D,bf,Cj,hk,desC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,wzRrcB,mfNfW,CqC,i,xk,SC,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bnqDIE,hYPxv,,D,iL,blEU,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cvrrZF,OcAPt,bVnY,i,GF,hmKv,lR,MfTO,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hwbFUC,CDTkR,,D,RI,HSL,ri,JI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HcucXQ,lWrXN,rNcu,D,xk,hmKv,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,iDqSWu,TDUrZ,zZe,i,LL,IamB,hk,mZUD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OgWLQi,DnTGD,ez,i,RC,ev,lR,CVT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZkRHRj,AXhVB,xDLG,i,os,Cj,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sAlqUJ,BXsVR,ez,D,RI,pf,i,zRrf,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LMigmP,oWoZd,ez,i,n,zNvM,hk,UWwo,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,csWTyP,,mNh,i,Cme,IamB,hk,rEy,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fRLPcP,gOZzt,opm,i,eG,rSZ,hk,kbd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pVmfHc,RdvaT,mNh,D,k,pf,hk,Pe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DGKXk,LvDJh,KsKZ,D,hcd,Cj,hk,YrQO,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tLFJe,,,U,SC,gI,ri,hcd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DueCg,JpSzL,VsKz,i,zlG,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QKycD,PdrPu,VsKz,i,pm,IamB,i,qrqX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dMbzn,,Vj,i,Bu,yC,lR,iCs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jEBBG,Jbwep,CqC,i,n,sp,hk,zj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XvNla,KoskF,mNh,i,RI,xa,hk,vGBa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,yrAmm,zPWJZ,mNh,U,xk,Cj,lR,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NwPAC,TNzyQ,mNh,D,nj,wlp,ri,hidTg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UODgY,nkzPd,,U,aW,OCf,ri,ebk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bQhvA,iMSaA,,i,bf,y,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gnrKa,iWLlW,,D,vk,hmKv,hk,mO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Sonsc,vdUHx,rNcu,D,EF,pf,hk,LURYe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BHRop,fFPdL,LjAS,D,ZJA,pf,hk,svmH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IhEGi,Qssaj,Gac,D,kWZ,ev,hk,mO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xuZPK,,VsKz,U,Yx,hmKv,ri,APs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SJumU,WvRdS,bVnY,D,n,WNP,hk,tEuF,1048718684474966157
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UPnyy,ZtlYH,Pcb,i,u,WSIq,hk,pgd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PHglG,RYvzR,ez,i,kWZ,pf,hk,yYW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TwyqA,umGoo,,D,Wu,XLQ,hk,UOQr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IDZCI,OtsrC,LDk,D,iL,kwK,lR,mQkU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TYZKa,DBAXP,VsKz,i,k,y,lR,fDJ,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BRYET,TnLps,Pcb,i,zz,FvO,lR,foYUg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zhypV,QvGNg,ez,i,nt,Cj,hk,gRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WPUBy,LzlHg,bVnY,i,n,SC,lR,yf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MlFkC,,zZe,i,G,dYPI,hk,WXu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EmoMY,GuqeH,,U,aW,y,l,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hXNnL,hpCAn,xDLG,i,EF,RSST,hk,KGJl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bJpcv,yPBim,bVnY,i,eG,aiR,lR,oFmx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zUMGA,uoXfm,QMl,i,GF,,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IEmNT,jvHgd,LDk,D,iL,Cj,lR,mQkU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KcMZX,ivYgu,zZe,D,EF,Wsd,ri,UIuP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JDgaq,,VsKz,D,xa,uWTD,hk,PpIy,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,kRXwI,iLTFH,EXYv,D,ZJA,Cj,hk,lsC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RUhnm,xFQLL,bVnY,i,GF,iADy,lR,YYEXm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dfzMO,GQDFd,gpyD,D,SC,aFx,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OLVLW,XgUzd,Vj,i,ZJA,sWhI,lR,dBp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,OdYEJ,vtYeB,jb,i,oLI,Cj,ri,ACLn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hqYmK,QImNH,CqC,i,KR,zNvM,hk,eFx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MKPhv,yUWuX,mNh,i,sD,dYPI,hk,TTi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pqFij,zcypH,Gac,U,vk,Cj,ri,BnOoc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fzyhS,mDfiz,anf,i,FL,sp,lR,jLAV,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jsWji,aRalA,,D,mR,qyCG,hk,bQiK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hddmx,jmQLT,gpyD,i,iL,Zvq,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EJkyV,XzUma,LjAS,i,iL,Ri,hk,pf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aYgiE,CcpoJ,VsKz,i,iL,mpy,hk,PXI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bWEVu,wAOwe,bVnY,i,RI,yGet,hk,ZUnj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NJDMJ,PHCFJ,,i,GF,Cj,lR,EY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bRSpI,HGnGo,CqC,i,n,y,hk,Oytx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WGaOF,ockMe,zZe,i,RC,Cj,hk,qZiQ,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,xZsRI,woFEW,jb,i,zlG,y,hk,OmgL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QAFow,aPzRl,ez,D,iL,yC,ri,ktLIP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XoktR,XcJvM,EXYv,D,pm,ev,ri,APs,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,JkrMt,kWuXE,jb,i,RI,Cj,ri,iruO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,obqMx,hpCAn,ez,i,RI,hmKv,lR,ZPlsh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pPCoR,opZrF,EXYv,D,iL,qyCG,L,mItg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Shdan,uYWpN,EXYv,D,n,Cj,hk,uSqB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Uehyg,VzUtA,EXYv,D,RI,oen,ri,WFzH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AFRLN,dSzZF,EXYv,i,k,jBP,hk,YQxg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IMSni,WJNmg,opm,U,SC,aRnz,hk,Jbg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,lUtVg,dAxAE,jb,U,n,,i,Kg,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ULEoG,HXSgR,xDLG,D,iL,y,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XgUzd,MNqGT,bVnY,i,n,ify,lR,KPiv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jeGeR,JWQHp,iV,U,n,dYPI,hk,vQon,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mxYuZ,qwbvG,LDk,D,iL,FvO,hk,zRrf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,jnmti,soKhL,yhq,U,n,hmKv,hk,Inq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dylfV,KoskF,gpyD,i,GF,Cj,lR,NGkL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MjoWS,nKzzd,jb,D,n,,lR,vk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,sUuh,dEvnd,VsKz,D,iL,hOgV,hk,dHSrw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Crtq,Aclqz,Vj,D,EY,zNvM,hk,LHS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bpCW,,zZe,D,xk,RSST,i,jBP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hnRw,bFakE,VsKz,i,GF,,hk,izc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GdIa,unoLA,xDLG,i,iL,VyBk,hk,Os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WJNm,KOJjz,VsKz,U,xk,qyCG,hk,CddS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gCfg,nMlTX,ez,i,bf,yC,hk,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aJem,hZPDA,Pcb,D,qh,pf,ri,Etl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hSSZ,OcAPt,LjAS,D,iL,TAUy,ri,WOrB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,EWSd,KOJjz,LDk,D,iL,,hk,jCu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CdjE,ygneZ,xDLG,i,iL,zz,ri,Ycx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QoCX,VmtNI,,i,iL,FvO,lR,zvf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZzET,pivbv,,i,iL,zI,hk,LfM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bHWX,VGgQZ,CqC,i,FL,LKKI,lR,SlSn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,PBZt,OsHEy,,U,JnB,bfM,L,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Jxpr,AqUSW,EXYv,D,nt,Cj,hk,KDph,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Mrpd,,xDLG,D,pk,y,lR,BgVs,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hkAX,uYWpN,zZe,U,H,fAb,hk,qZF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pbdI,pzLPd,xDLG,i,iL,uECy,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GRwp,SuBGa,xDLG,D,os,SC,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BGOH,NePPU,anf,i,WLK,yC,hk,RGK,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MaqZ,rDbnu,xDLG,i,iL,etS,hk,iED,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TAnX,AykBp,xDLG,i,Lq,gYwD,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ULTo,jFSEB,VsKz,D,xk,na,hk,pm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IIOv,jCPPl,opm,i,SC,jF,hk,xwS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,qfsg,,,D,iL,Ri,ri,pk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,taXK,ZSjJg,VsKz,D,xk,y,lR,NEFB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zaPH,CfjhB,iV,D,iL,IamB,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,BfqE,OVLEl,VsKz,i,Bu,urr,hk,Rwj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fDrC,hQGku,xDLG,i,iL,qsr,hk,fuN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fDrC,,,i,iL,Frn,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gJjo,bHSnH,,i,FL,gNBZ,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,IYwy,gWniv,zZe,i,xk,ev,hk,BRAy,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fdrn,pLYXJ,LDk,D,iL,WNP,ri,LRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VxeN,vdUHx,LjAS,i,ss,pf,hk,aQj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,mIPn,JFMRC,xDLG,i,iL,Vqi,ri,bzPS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gITj,ZNLhJ,,i,iL,KCWa,ri,pk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Fesb,,zZe,i,GF,mwY,lR,LaPa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WMDE,oRdwp,EXYv,D,iL,hmKv,lR,mVP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,MOrF,,,U,iL,fAb,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uUkk,,VsKz,i,ZJA,,hk,YMAL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,VkQO,FjYzh,CqC,D,O,YO,hk,u,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,lgBs,RhYbY,xDLG,D,Cj,Rfp,hk,jBCu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ElFW,FPgQL,xDLG,U,iL,FvO,ri,MqP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NrMK,kEKkc,EXYv,D,bf,ev,ri,tHvc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,whvs,GDIAH,,i,bf,Cj,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,tols,bWJlU,VsKz,i,OS,ev,ri,IMjIk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,YsjD,,CqC,D,G,,hk,ShbP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,SRyZ,SZDsW,opm,U,SC,y,hk,eRRSf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gAez,NBYLm,EXYv,i,xk,TAUy,hk,gGz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,gAez,oBwBc,zZe,D,yC,DME,lR,UdXx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RlxT,cdSwJ,iV,i,zj,UpSB,hk,CPda,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DPrp,gHvQp,rNcu,D,kB,ZUA,hk,RI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ScJi,KyEGN,VsKz,i,RC,hmKv,hk,Bpi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Kfuz,gUDiL,KsKZ,i,iL,y,fU,wucqR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,LPzr,utPhx,Vj,i,Lz,xa,ri,kqtHs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,pxPc,vdUHx,,D,iL,Cj,ri,PSeH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,DvEd,uJvkP,,D,iL,Cj,i,aFo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,WBrF,ViguX,bVnY,i,jgn,hvW,hk,rEIi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RgUm,HRIhN,Pcb,i,hyz,,ri,Etl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,CBXL,uLFqs,rNcu,D,mO,Kg,hk,bPcNF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zNtu,LvDJh,yhq,D,xk,Cj,lR,erPD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hhIq,KyEGN,LDk,i,FN,qyCG,lR,BBbWc,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,cqfS,nCwhI,ez,i,FMt,ahaC,lR,jlN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,GuBJ,vdUHx,,i,GF,pf,ri,dbLpt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,vqcM,UcrWb,xDLG,i,G,hmKv,lR,MLcQ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,TyCx,UimzX,opm,i,Bu,pPN,hk,xwS,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,HtUT,UimzX,Vj,D,Ri,Cj,hk,xdc,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FeUc,KowCL,rNcu,D,RC,y,hk,RqrK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,FDsv,JRxbD,jb,i,Kg,Cj,lR,WqGe,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,UdXx,soKhL,LjAS,i,zj,sWhI,hk,oh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,RtFV,ZZrqs,zZe,D,BfM,SC,hk,ai,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,KuXW,NHNrT,VsKz,i,yf,Cj,lR,HnAv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ANxM,jXToa,rNcu,i,SC,jF,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,aZlc,wcZUq,,i,G,hmKv,lR,EY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,dJQk,JpXCs,CqC,i,k,Cj,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,uzqf,,mNh,i,RC,TNuV,lR,db,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Thpg,ARWie,VsKz,i,GF,HSL,hk,tfDj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Thpg,Gjomx,VsKz,i,GF,,hk,lUt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bfeu,eYjgF,rNcu,i,RC,WNP,lR,cFiE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,NtZN,mONwL,Vj,U,aW,zI,lR,iHi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,hmlu,PCjHu,zZe,i,RC,jBP,hk,onLyt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XUlI,czsTS,ez,i,Ld,Xua,hk,WEd,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,XUlI,cCOsx,anf,U,Ld,aRnz,i,UqKl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,AWgT,AqUSW,,U,RC,Cj,ri,JI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,zMqu,ZXYvK,rNcu,i,zj,Cj,hk,iUo,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,QCRl,wVacr,VsKz,i,FN,Cj,hk,bLBs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,bqJy,QImNH,CqC,D,y,zNvM,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,rlkQO,rNcu,i,FN,Cj,hk,qNFno,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,dheCD,gpyD,i,FN,uECy,lR,O,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,ZnZf,,KsKZ,i,FN,,i,jLqZ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,fflq,,CqC,D,os,YjrO,hk,ber,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,Xvjq,HLYZq,jb,i,n,cmmA,lR,Mkcs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,AHISe,,i,pm,pPN,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,mZnht,,i,oen,VkB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qpOCF,,D,fr,Ri,i,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,agIML,,D,oen,VIM,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ofksJ,mNh,i,cfU,na,hk,ddk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pnVVl,,i,Nc,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,OCZnq,,D,oen,ev,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,owuEr,,i,kWZ,WKX,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,skELi,,D,Ri,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aTZZR,EXYv,i,RI,qyCG,lR,Fpo,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uvXwY,,i,SC,Ouf,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tyXjf,,D,vk,Wjnt,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,hPEWT,Gac,D,ai,ev,lR,ySTK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VGgQZ,rNcu,D,RC,KCWa,i,WI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VGgQZ,,i,ePq,LKKI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,eCWoC,ez,i,vk,RSST,lR,aOrP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cdSwJ,,i,THd,UpSB,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,htrGg,,i,,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nKzzd,,D,iL,yC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TVeAq,,i,Ri,hmKv,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TVeAq,,D,vk,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,kjNhK,,D,GF,aRnz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uNLtB,bVnY,i,eG,kPj,lR,RNB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NTvmH,zZe,i,yC,hmKv,lR,iTt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MiuKF,mNh,U,pm,hmKv,hk,zmro,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MiuKF,ez,i,ZKX,hmKv,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MiuKF,,i,n,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fxErQ,,i,n,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yXGhi,QMl,U,u,OdMe,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NldsR,LDk,D,kWZ,OxU,i,shdi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XmDvh,jb,i,ZW,RV,ri,zjdC,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,BilOn,,i,nT,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Nqkmi,VsKz,U,LL,pf,hk,guWC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vdUHx,Pcb,i,u,Cj,ri,Etl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vdUHx,,D,FZj,pf,L,xAF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,umGoo,QMl,i,JnB,sp,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zZxUG,yhq,D,BAR,mEr,l,HwK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qjNZF,VsKz,i,GF,pf,hk,nbOQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TsYlI,Pcb,i,u,WNP,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,pLYXJ,xDLG,D,xk,FXZ,hk,ATTL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rWXFR,,i,jgn,sp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rWXFR,,D,zj,sp,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UpZhy,,i,RI,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zOpXm,yhq,i,qVs,fX,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KvAaA,,i,GF,pf,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JmTkj,,i,,Cj,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UimzX,QMl,i,na,pPN,L,aaiP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gCAcv,,i,eG,aQj,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FusKs,LjAS,i,ss,pf,lR,HAUdI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,kWuXE,LjAS,i,JI,zlG,lR,YaH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XeDef,LDk,D,ai,Cj,lR,okIe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uYWpN,,i,FMt,ev,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qwbvG,EXYv,D,JI,FvO,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gqTIk,,i,wGj,Cj,ri,YAyv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gPBuC,EXYv,D,Ot,na,hk,Cwi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,WVjBA,mNh,D,nj,Cj,hk,cppZ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ywvpt,rNcu,i,RC,auP,hk,JI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ywvpt,xDLG,D,ZW,FvO,lR,jF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vbcKh,Gac,D,oh,PF,oA,wGj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fQNSn,,i,JI,Kuz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DWRev,,D,sp,juI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CiZAV,,i,Nc,Cj,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,bWEVu,,i,RI,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NHNrT,,i,n,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vTSnp,,D,u,juI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zmspf,,U,Ri,Cj,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Dfrhm,,i,,aHa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rrdcH,ez,D,nt,pgd,i,kLaV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,bwXei,,U,vk,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,bwXei,,i,SC,Cj,hk,LfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JpSzL,,U,jF,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LKLHu,,i,Cj,y,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,izZbI,,D,,y,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tWWFx,,D,hyz,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ONKJD,,i,GF,eFx,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,nqJmJ,QMl,i,eG,Cj,T,LJju,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dgPQa,,i,Nc,buw,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,lmuIq,,i,RC,oen,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,teKMc,,U,eG,HSL,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,teKMc,,i,,HSL,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,awxMP,mNh,i,uP,HSL,hk,TqnW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Ebmez,rNcu,i,zj,SC,lR,TmbP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZIelK,xDLG,i,mR,nT,ri,Oxt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QUpDF,yhq,i,oLI,nT,lR,n,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zsRkh,gpyD,i,GF,SC,lR,WFD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,yPBim,,D,RC,nT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UriEN,yH,D,qh,Cj,lR,acvf,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GCXEW,,D,SC,pf,,,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,diapp,,i,jF,zz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SKihC,EXYv,D,nj,eFx,hk,zjtN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GmokZ,,i,GF,HSL,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CQsJP,,i,RC,y,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,bPArK,,U,Yx,y,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DAQZp,Gac,U,oMY,y,ri,CdjE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uSmwv,,i,FN,Cj,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,lruaM,,D,oh,y,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gUDiL,,i,n,y,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fFPdL,mNh,D,RI,xa,hk,xOcm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VwkYy,QMl,i,eG,ZFX,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ONjMr,,i,na,aZ,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rSlec,zZe,i,zW,aZ,i,wAaJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,cuTxO,,i,WLK,zz,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,vfKUn,ez,D,BAR,eHh,ri,rsmVM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,OVLEl,,i,,oen,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,JFMRC,,i,aW,YO,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,heJzc,VsKz,i,JI,Vqi,hk,ruKdN,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FVyoD,,i,IaL,kyz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VzUtA,VsKz,D,Ds,oen,hk,hJgQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,szcEn,mNh,i,BAR,SC,hk,HjB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aPzRl,,i,qh,SC,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KeFQu,,i,RI,YVT,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,IzCjJ,rNcu,i,RC,kPj,lR,pFH,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CgiNm,,i,Cj,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,CgiNm,,D,iL,sD,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zLIpF,,i,,zz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qygIq,VsKz,i,Cme,bfM,hk,JyZr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,NgyUp,,i,RI,kPj,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DLtpg,xDLG,D,ZW,aRnz,lR,zvFx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FDHHZ,,D,na,pf,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,poNAP,ez,i,JnB,Cj,hk,dzfM,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XctNb,LjAS,D,hI,xa,ri,vhp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ERiHU,CqC,i,n,xa,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ERiHU,,i,Cj,YO,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rjqMf,,D,u,bf,hk,fr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LQsok,LjAS,D,JI,YO,hk,svmH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,LQsok,ez,D,BAR,YO,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oZpan,zZe,i,Kdq,lQU,hk,ZRhw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,gUsbv,,i,jgn,xa,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qgHRF,,i,u,YO,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,iieBd,,i,Ri,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,MWxHT,,D,Yx,rbp,ri,JI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,GoyxS,LjAS,D,u,GxE,hk,tnZR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,VgLuA,,D,oen,DDPD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,zTnre,,U,FMt,Wsd,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DrkVz,,i,Pek,hhhl,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ePyBk,,i,,joYB,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UvBeZ,CqC,U,n,dYPI,hk,yKgP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DsQwS,xDLG,i,FN,dYPI,lR,UcnVM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,FjRPe,,i,,uUHC,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,BWYOS,,i,Pj,cmmA,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rSjvT,,i,Cj,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,xdICB,,D,IaL,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tGvIu,mNh,U,Cme,wCsQ,hk,zlG,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tGvIu,,i,oh,TGXq,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,hbFlj,,i,,ZHiH,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SOcKk,,i,FMt,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QjAFk,,i,n,ojoW,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,tcmZw,,D,Yx,dYPI,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,rZIlM,,D,n,dYPI,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Tnqdc,,i,BAR,dYPI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,fUzeb,mNh,i,jgn,TXLD,hk,eoFq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,Dxgrx,EXYv,D,Kdq,rZXX,hk,Cwi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UZasF,ez,i,BAR,,lR,zlG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SVLxE,,D,nt,TBUv,hk,zlG,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uRvWL,,D,,HaU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qZzCL,,i,TFX,hmKv,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qZzCL,,i,OmE,Zsbp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qZzCL,,i,BAR,hmKv,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aGAzh,opm,D,hyz,KCWa,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aGAzh,,i,u,hmKv,hk,ltjd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oWoZd,,i,k,hmKv,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,QImNH,bVnY,U,xk,zNvM,hk,pf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aRXZa,gpyD,U,O,hmKv,lR,nhCe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oRdwp,,D,,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,OcAPt,,U,SC,TAUy,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,aRalA,EXYv,D,oLI,hmKv,hk,xgVQN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XsDCL,KsKZ,i,FN,UpSB,i,OUn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,KOJjz,EXYv,i,RC,hmKv,hk,MmW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,UcrWb,,D,pm,qyCG,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DzbdG,,i,jgn,hmKv,hk,Jij,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,DzgFa,,D,pm,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uVdCT,zZe,i,n,TAUy,i,SlnT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,uVdCT,QMl,i,k,qyCG,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,TEZvY,,i,vk,tCwq,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,qvyUv,zZe,i,pk,PQBq,hk,fuV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,AbbqJ,,i,n,KCWa,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,loceY,KsKZ,i,FL,RSST,lR,FObu,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,oImqv,,D,vk,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,SNYME,mNh,D,vk,uECy,hk,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,XEXRG,,i,,gOZx,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YMYMT,LDk,i,n,DDPD,lR,LRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,YMYMT,,i,ZKX,DDPD,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,dheCD,mNh,i,pm,uECy,hk,bIjK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,ZhLBh,KsKZ,D,exS,gOZx,lR,BDbVw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,VsKz,i,xk,ESA,hk,xDuJ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,bVnY,D,xk,HSL,lR,Pek,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,EXYv,D,vk,pf,L,Cwi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,zZe,D,RC,uWTD,hk,Kdq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,ez,i,JnB,y,lR,xa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,ez,i,db,uECy,lR,oZUs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,U,ZKX,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,U,pm,oDHw,lR,kB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,U,FN,,,,614819680033322476
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,U,,oen,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,kWZ,,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,pm,Zsbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,GF,XJb,hk,Knk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,GF,RV,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,nT,hmKv,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,yC,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,i,SC,y,L,G,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,BQ,nT,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,RI,ev,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,iL,eKQv,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,oh,XLQ,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,n,AqjP,ri,lUxY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,k,,,,D,,kck,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,emMyeed,INdJw,jb,i,H,pf,fU,PvS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rdlrYDJ,,CqC,i,FMt,DDPD,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Edpexbi,hlcVp,EXYv,D,oLI,Cj,lR,sbO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uFyBeaK,,,i,,,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pvBnoXy,,CqC,i,GF,,lR,ZBq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FRJmmep,,QMl,D,RC,zI,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UjlQraY,,bVnY,U,Kg,DME,lR,NwXb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LGFmVSN,,zZe,i,mR,qyCG,i,cLImw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hzOaBTr,Xzozi,Gac,D,ZW,hmKv,lR,WhhCA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TAODwTv,amZvm,bVnY,D,RI,,lR,os,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zlsNOwd,,ZQa,D,SC,Cj,lR,ZJA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UckQuRd,,opm,i,SC,dYPI,hk,zyeO,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RyqyGsS,NXugp,jb,i,xa,qyCG,i,Kg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ROvjMUB,,ez,i,Ri,dYPI,l,zDkl,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mTmyfWy,,jb,i,KR,,lR,brVd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YEexBAr,,zZe,i,mR,Mkdh,i,hOOW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sEheXCL,,QMl,i,RV,DME,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,duuXkoZ,wKKEM,opm,i,JI,SC,ri,ZUD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pqOcIeN,,VsKz,i,RI,xa,fU,mBOD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fJnnawJ,,yH,D,mO,vFv,lR,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oCDgnFs,,bVnY,D,RV,uWTD,i,DQc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GhoWaqi,,,i,ZKX,,l,mO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zJQtQJr,CmGAY,yH,D,mO,eQE,lR,KR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zVMxuqX,,ez,i,RI,xa,i,Rk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ucskTXS,,zZe,i,Uw,y,lR,lvPLR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HofpUcm,,zZe,D,FL,LrJ,hk,lUGy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LlvSxhO,,LDk,i,GF,Wsd,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JvnnuEv,gXbuE,mNh,i,RI,,hk,eNyU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DNVPLdf,,QMl,i,G,wlp,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,unNgVfR,,,i,u,DME,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wqkiqCp,ZKqSX,LjAS,U,kWZ,IamB,hk,tfp,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vKukMik,,zZe,i,n,rbp,L,ZyJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LUHeVVX,,ez,U,BAR,dYPI,hk,ZDlT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HCejqHh,fnnlN,QMl,U,hSE,,hk,tzS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,olaIJOl,,,i,RI,mwY,oA,bpC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PzeESfX,ZuNdz,CqC,i,EF,hmKv,lR,iaMC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,agKXaiS,,ez,i,BAR,KCWa,hk,gRw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EDdnxns,,LjAS,D,aW,iADy,hk,mNYhN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QLwzuDh,hrmwJ,QMl,D,fr,aRnz,T,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lMcSFhX,,gpyD,i,RC,IWtD,hk,Prq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DjEdfCo,,zZe,i,KR,Yxhj,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MqIRczj,,Vj,D,ZJA,hmKv,T,syQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BRTSAoP,,,i,sa,uECy,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PcIkkkF,qCIWB,iV,i,FN,PF,i,Gf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QPPfpDx,,,D,NHX,uWTD,hk,db,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LDwiRuO,,mNh,D,RI,uIjX,hk,BQr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RtVHeIq,,LDk,D,aW,,hk,OS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AZqWYet,,,D,Cj,uWTD,oA,ZKX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JBMOTdD,aYgiH,QMl,i,IT,Kg,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gRSXnOw,,opm,D,iL,iKG,lR,JyH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HJfMWZp,,Vj,D,SC,wlp,hk,jwEip,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FPXEpoJ,,rNcu,i,RC,SC,lR,pYD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UYdmrdL,rbuwW,QMl,D,TGR,xa,L,riA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RPItWCD,,LjAS,D,Kuz,tCwq,lR,rkZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,adFGPuP,,iV,i,RC,BHeC,i,xUk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nAIxVAb,XctNb,ez,i,ZKX,na,hk,AeiNP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PbqewhN,,QMl,i,WLK,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ucUKlmo,XctNb,zZe,i,GF,xa,fU,TUw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eHSwJbx,LQsok,Pcb,D,dQD,YO,lR,xav,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mGQnyRo,,mNh,i,RI,,hk,BQr,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZkHWsiS,MMnif,gpyD,i,qh,gOZx,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tGSyEMY,,Pcb,D,kWZ,Cj,lR,xav,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QxtbVBq,,LDk,U,aW,qyCG,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ImjywgP,,LDk,i,pm,Vvh,hk,LNXGW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KBUkpjT,,bVnY,i,n,Yxhj,lR,Pek,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lvbphUW,,QMl,i,cZ,dYPI,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GIBJXYL,,CqC,i,TUw,GES,hk,eOq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tyrXPij,,VsKz,i,vk,,L,ueD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rHReNGw,,jb,D,TGR,qgNx,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bpDfojg,,mNh,D,RI,hmKv,lR,hAFl,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wvXpbj,,gpyD,i,ZJA,sWhI,lR,wMzgf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JyQiQo,ERiHU,CqC,D,k,xa,lR,FW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YnzjrD,,KsKZ,i,oh,RSST,lR,tbwXN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xEdLxS,,,i,os,SC,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bUiEDe,,LDk,D,aW,hmKv,hk,lJfYt,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fGqDBy,,CqC,i,SC,bfM,fU,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GQYcLS,XctNb,EXYv,i,bf,xa,i,qy,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yoNEWi,,QMl,i,Zi,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JWzBmZ,,,i,Cme,iGu,lR,gpi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Gspyil,,,i,RC,Cj,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sEVTZd,,,i,Cj,FvO,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rwnPjK,,,i,kdc,,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vkyRDa,,anf,i,nt,qyCG,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ChBLxv,,KsKZ,D,FN,PF,hk,nXPU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,suGSqf,MMnif,CqC,i,ePq,gOZx,hk,ZdFA,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dmoLUs,,iV,i,mO,Ri,i,Gf,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IAzjcd,,LDk,D,vk,qEA,lR,hyz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZqZrzw,jmQLT,,i,jgn,Zvq,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QvgdHJ,WVjBA,Vj,D,hyz,YO,hk,RV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QMkDqB,,ez,i,ZKX,mwY,lR,NxI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OBaWjk,,Pcb,D,u,ZNN,hk,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vuNJVY,,,U,kWZ,Vvh,hk,lJzc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qPAOOs,,bVnY,i,G,IamB,i,lzQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RtbpKm,,,D,Uw,DDPD,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yPQiJQ,,EXYv,D,kWZ,ev,l,VcZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dkyFQi,,bVnY,i,RI,kSz,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dSKNam,,iV,i,GF,zmB,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kUtgbe,VGgQZ,gpyD,i,FL,RSST,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DZBYhy,yCTcT,mNh,i,RI,dYPI,l,xVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NCOUhf,,KsKZ,i,zOi,rmJ,hk,YKaB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GEgtEQ,JbXwv,ez,i,RI,uECy,i,aOrP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cuREHa,unoLA,gpyD,i,Nc,jHBL,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xuZzNG,ajVwR,iV,i,xk,HwD,lR,veiFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HVYtXM,kWuXE,VsKz,D,GF,pPN,hk,Knk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XhNFTw,,jb,i,THd,Cj,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,odcoPl,XmDvh,,i,mO,RV,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uwccHC,,QMl,i,eG,mRRA,hk,tzS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jLkGIt,ERiHU,rNcu,i,RC,xa,lR,HTr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VleMZc,,LjAS,i,RC,yC,hk,hHHP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,awflIL,MTddS,gpyD,i,cZ,WNP,lR,sQe,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hMwzkS,,zZe,i,nU,sp,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xYUHdm,,,i,mR,Zsbp,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,URcTZx,BXMay,mNh,i,RI,RSST,l,FN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rWEOBB,SefEe,Vj,D,GF,RSST,lR,FtN,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xOwYKA,,bVnY,i,SC,pgd,lR,IXD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NPrSjF,,zZe,U,RI,Cj,lR,QhH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zRbqhv,,iV,i,RC,jF,l,HwDJs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mQwHLU,rGzDb,,i,RC,Cj,L,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EiiQWt,,QMl,D,iga,ZDQc,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bnGFxd,,VsKz,D,RI,Xua,hk,pJzx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qwlMzJ,,opm,U,SC,eQE,hk,Bdee,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yRdYWx,,LDk,D,aW,DME,hk,OaVX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lgNrUJ,,jb,i,Zi,yGet,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bMINBJ,YkAvm,bVnY,i,G,pPN,lR,BAwko,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aZBzUF,,VsKz,i,hyz,KtFl,i,CWs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WSbYQt,JFMRC,gpyD,i,GF,Vqi,lR,kwEP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dyZPYE,,QMl,i,sa,KtFl,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zwZFEP,AzPRY,EXYv,D,sp,SC,l,FfgC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xAtxgT,tGvIu,mNh,i,hSE,,T,rEy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AOqMPA,pLYXJ,iV,i,GF,soR,hk,Ld,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rOBFJK,oRdwp,QMl,i,k,hmKv,lR,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tCxiuO,kGWYq,mNh,D,pm,Cj,lR,IyXZB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nimrGJ,,KsKZ,i,zz,uWTD,hk,CiBe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vSLSRJ,,iV,i,RI,IuC,hk,kWZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YqBtQg,,LjAS,U,mO,Jbg,i,TzOi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LfzvNo,,,D,iL,,ri,flVn,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ImvEjb,,gpyD,i,ZJA,TNuV,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xyEvDM,,VsKz,D,GF,WNP,i,NTtC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LNPpfp,,iV,i,jF,FtAx,lR,Jeqi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VAZFYz,iapRB,xDLG,i,os,pf,hk,ZW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ohDgFe,,aN,D,G,qgNx,lR,gTZLW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RabfYY,,bVnY,i,iHi,sp,i,nU,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EQMgdo,,zZe,i,zOi,PQBq,lR,QsCXu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fKONxe,,yhq,i,Zi,gI,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WxSLML,YkAvm,Vj,D,IaL,Wsd,lR,dCN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uipixH,,yhq,D,Kg,HaU,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MSiltg,uYWpN,yH,D,mO,fAb,lR,KR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHXPaM,,,i,nt,yf,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KZkgww,,bVnY,i,RI,dYPI,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pumbqI,ZVMFT,,i,Bu,aRnz,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RCRuyI,,,i,sD,Wu,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WVAbca,rRbDE,,D,ZJA,hmKv,fU,PF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fNWLoq,,EXYv,i,kdc,uECy,i,rtO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TZrulU,,zZe,i,cZ,HSL,i,Woh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yjpftn,JGooX,iV,i,RI,nT,hk,FMW,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vHkjiu,FbvHy,VsKz,D,n,yH,i,Usgd,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,igGaZi,,Gac,D,iL,pPN,lR,RrcL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AuPFaI,,bVnY,D,Kg,HSL,lR,nOoss,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dhqrGa,oJXSu,CqC,i,H,ber,hk,fyUwC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UwLhSt,mWKTs,zZe,D,iga,SC,l,nU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zhuren,ZIelK,zZe,D,mR,XJb,i,Woh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BFCEZb,MBsTd,ez,D,iL,rbp,lR,jVO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aaNXEc,,Vj,D,Bu,gOZx,i,UMJG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ebfAIP,,yhq,i,fr,kzbx,lR,ovm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xkzaCH,,rNcu,D,RC,xa,hk,Ywm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zRKavB,nndpW,ez,D,nt,y,hk,IAoe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ulllHf,,Pcb,i,sp,Cj,hk,Hemv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CTpnXP,,,i,RC,SC,fU,VhXh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FIZKCT,EnYIx,opm,i,OS,Bkt,hk,xwS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VsZIxX,hwxKL,opm,D,hyz,WNP,hk,CSg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FxkPdL,zPWJZ,Vj,i,n,Cj,i,UjeQ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ePOwfe,,mNh,D,RI,zI,lR,Crtq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WAXYUT,WeZTY,VsKz,i,bf,hmKv,hk,rhPZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nOOBfE,MTddS,CqC,i,SC,WNP,lR,Ep,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QgAxWA,,LDk,D,ai,gI,hk,hEQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kjsxnB,,ez,D,mR,LKKI,lR,sYGj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FdaxXl,wDkOU,,i,ZJA,HwD,fU,uSVPc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cPYNAA,hAjyU,mNh,i,pf,SC,l,rRm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ENXBNJ,mXMfT,VsKz,U,n,Mcs,hk,Rwj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jOQbAn,kkqMD,EXYv,i,iL,,i,Eopdu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,guAdym,,,i,RI,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Unxuik,,EXYv,D,n,MbYh,i,qy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SvMkHE,,Vj,D,pk,,hk,RV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZIHLUl,,xDLG,i,ZJA,hmKv,i,Gaxy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zsasQE,,bVnY,i,WLK,uECy,i,SVts,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LTLuEy,,LDk,i,aW,sp,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ysEqpd,,aN,i,jgn,xa,hk,brP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JGMugq,,aN,D,Bu,y,hk,HUQy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aRYhDm,,mNh,i,Cme,Zsbp,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eTgVNM,,gpyD,i,GF,RjQr,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DNQxBm,,EXYv,i,kWZ,Ri,hk,dpaj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qhQtMX,,aN,i,G,sp,l,zmB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ibYWEC,,QMl,i,n,uECy,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hCHVww,,bVnY,D,THd,Cj,lR,RNB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uFIhUh,,zZe,i,FL,cmmA,lR,nqEuh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DZtTWL,,mNh,i,cZ,rcz,hk,fLfg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nSDMKC,hlcVp,xDLG,D,ZJA,Cj,lR,kwK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,uUWkLp,,,i,kdc,nT,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WnVXKr,,yhq,i,GF,,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gXPcie,bWJlU,,D,RC,ev,fU,PF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fVmAjL,,zZe,U,jgn,hmKv,i,hfB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fdvmPn,,LjAS,i,kWZ,qyCG,hk,yC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tSEfPD,,KsKZ,D,oLI,xa,hk,WiJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XxMBbX,,VsKz,D,kWZ,Kuz,hk,jNqF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tWOMCL,,CqC,i,GF,dYPI,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,emcUwP,,CqC,i,jF,soR,hk,pzri,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EKsffK,,zZe,i,ePq,Ri,hk,HpHY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XbTxKj,zTnre,rNcu,D,RC,hmKv,lR,Pif,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,PCwUU,hPEWT,bVnY,i,n,ev,l,Zi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mvErH,chCfb,,i,sD,dYPI,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XFsQs,,Vj,i,Zi,bnz,hk,LFq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UDrJu,,EXYv,i,qh,,hk,XkWe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iaOEQ,,VsKz,U,zz,DDPD,hk,WfoK,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hGUqx,,LDk,i,mR,Lel,lR,MTE,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RyERr,,VsKz,i,Lq,lQU,lR,dtwpw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CpjVB,VazYM,Pcb,i,u,rbp,lR,QYjJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rgzJA,uVdCT,EXYv,D,n,SC,lR,CRn,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vdlFI,,Gac,i,oLI,hmKv,l,sEF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pDPpi,,,i,RI,Cj,fU,PF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rEYuk,,iV,i,ai,MWL,lR,Ufzk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wSWQF,,KsKZ,D,RNB,Cj,hk,YKaB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hNxrK,HCLtA,VsKz,D,pf,ev,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EoUoS,,CqC,i,eG,jBP,hk,dQD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ctYPk,,,i,GF,VyBk,i,Dkyf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TunRn,,,i,KWZ,KCWa,lR,Nc,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DmtpO,rXnhf,Vj,D,FL,gI,lR,FtN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zlOaX,,CqC,i,KR,nT,hk,xXNW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kcOsZ,,VsKz,i,G,y,i,hSE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KjEdG,,,D,iga,y,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hpuPp,uCfJW,bVnY,i,RI,sD,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TQHvJ,mgoTc,KsKZ,i,O,YO,l,MDbq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lZFti,,,i,GF,uECy,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cMEAN,,xDLG,i,Lq,gI,hk,zI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GePtv,,xDLG,i,pf,auP,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QlPGx,uVdCT,zZe,D,Zi,TAUy,hk,nHdH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QWRUS,MCeJi,,i,IaL,XOk,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nhqFG,,Gac,i,hI,xa,l,Qhv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KZmVo,,Gac,i,hI,HSL,hk,Qhv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yfRET,,bVnY,D,qy,y,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DmKXL,,CqC,i,MTE,xa,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bGhZt,,Pcb,i,nt,bfM,lR,cjN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,orDwY,,OYMU,i,n,pPN,hk,ShH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iAvId,,zZe,i,jgn,buw,hk,uFfGT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yaCOc,JpSzL,CqC,i,s,sp,hk,u,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HnSiJ,,Pcb,i,RC,Cj,l,wTRv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DXOWB,VzUtA,zZe,i,qh,SC,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aNULA,JRxbD,zZe,i,RC,pf,i,CXnyB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MYejA,,LDk,i,Cj,yf,L,DoN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gqJaw,VINkJ,bVnY,i,RI,ev,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,DMKeL,CiZAV,EXYv,i,Kg,Cj,lR,SbHiS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nwRak,,LjAS,U,mR,ZNN,hk,fzdJA,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZVtge,,LjAS,D,kWZ,ZNr,hk,cCSJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NOFmC,,ZQa,i,mR,,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EpWTU,,,i,iL,ESA,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BfDdM,,,i,GF,Bkt,fU,y,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vUmLM,gafGU,,i,SC,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qzGEP,,,D,k,Cj,hk,desC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EMMuc,,rNcu,i,Nc,UMQZ,lR,tgJY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hsQsr,,ez,U,FZj,Cj,lR,HuZk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FjLHj,,iV,i,FN,YO,hk,ORJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tmRTQ,,zZe,i,iL,bvX,hk,GcjY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BDixV,,LjAS,D,iL,pf,lR,EzxW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NKjhh,,zZe,i,FL,GWD,l,uP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jYrDy,,EXYv,D,Pj,dYPI,lR,bIqhb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sWtPJ,,,D,GF,nT,lR,EY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eSDgF,HVqQZ,Vj,D,zW,Rfp,fU,iHi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AcOfv,JjLio,zZe,i,Ri,Cj,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jRZDG,,mNh,i,RI,,l,lVE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HPfZX,,LDk,D,aW,ZBq,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mAcpd,,mNh,i,Cme,YO,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fQNSn,,yhq,i,G,y,hk,kdc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qcqSM,,xDLG,i,G,pf,lR,oLI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,YIpfc,,Pcb,D,u,,hk,Dnq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CoknA,,,i,iL,JoXv,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tQiFI,,zZe,i,yf,rbp,i,GSCRN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rxZiT,uVdCT,CqC,i,y,TAUy,lR,BFl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wJHir,RTQUJ,Vj,D,ZJA,ev,lR,BAP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WoMac,,rNcu,D,zj,sp,hk,UKEO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BUNOI,,,U,iL,wnVT,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dHbBu,ClwEM,,i,GF,eQE,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jwxzj,,LjAS,D,iL,SC,hk,oh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LoZfv,XcJvM,bVnY,i,RI,XOk,fU,yCXw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IZUmh,umGoo,mNh,i,uP,bvX,lR,kErz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AyTWQ,,,D,iL,zNvM,ri,pk,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VVFqY,pLYXJ,,i,Cme,RV,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QtCwn,,jb,i,GF,fX,lR,viK,5745443378641966420
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lUmrW,,zZe,i,jF,DDPD,i,vbC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HUull,zfzpe,LDk,i,iL,GF,i,YkHSb,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CRgMn,,aN,D,iL,y,hk,NpCRB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AOANM,,aN,i,y,ZDQc,hk,Xwdx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OMrhH,,,D,iL,uECy,ri,pk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nhKkU,,rNcu,D,zj,ZBq,T,Yx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mxYuZ,,,i,iL,FvO,hk,Odm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WnAOa,NLAAP,,i,aW,SC,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lptqf,xwDjL,aN,i,H,y,hk,brP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VwebF,,LDk,D,iL,aFx,lR,dedL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XoHJ,,xDLG,i,Kg,oeg,lR,Njo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fqRY,,VsKz,i,Lz,kzU,lR,KklB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ULYq,NoEvu,zZe,D,RC,y,l,uP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HJVx,,mNh,i,Bu,Cj,hk,Ot,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,wvGg,,LjAS,D,aW,uGF,hk,sp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hnRw,,iV,i,GF,fNlL,hk,HWV,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hnRw,,,D,GF,uECy,lR,EY,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bQiK,fHKWV,yH,i,Kg,SC,lR,Dq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,txKF,,Vj,D,Bu,Wsd,i,SRfh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,gomi,,bVnY,U,xk,dYPI,hk,itlh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RBTZ,ZhLBh,ZQa,i,RI,gOZx,l,oyfVa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RBTZ,,LjAS,D,RI,Cj,hk,aE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JwjG,,bVnY,i,BfM,WNP,hk,Rrkx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jFKJ,rGGZd,,i,G,gI,i,sD,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,CKDs,,,i,Nc,Cj,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XqlF,,xDLG,i,Cj,TAUy,lR,jF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qreD,,CqC,i,Bu,HSL,hk,u,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,vIDc,,rNcu,i,RC,IamB,lR,aoqm,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GnsP,,EXYv,i,iL,yH,l,gVqos,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hSSZ,,LjAS,D,iL,qyCG,lR,Luzd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,EWDB,,opm,i,SC,,hk,Jbg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WwwM,,mNh,i,nT,dYPI,lR,vTKNs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ogMf,,bVnY,i,bf,euzb,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bSRz,,rNcu,i,Kg,Cj,i,sWhB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BhwI,stxxp,yhq,D,zj,hmKv,lR,AONq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tuGx,,CqC,i,SC,sp,hk,AdOJp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sski,FHfEb,jb,D,Ri,YO,i,TdXY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,acvf,,Pcb,i,u,dYPI,lR,ywB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HYBG,,,i,u,SC,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AONq,,bVnY,i,xk,yC,hk,NNal,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bjBQ,,LjAS,U,mR,pf,hk,tfp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,HZYN,,ez,i,iL,ZBq,hk,MuXO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KwJe,vfKUn,rNcu,i,sD,,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,LiWc,SklNG,VsKz,U,MTE,gI,hk,SIGh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tnZR,xwDjL,bVnY,i,xk,y,fU,IXD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tnZR,,VsKz,D,xk,SC,i,ntQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pYBs,,opm,D,SC,Cj,hk,oh,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GdxI,,ez,U,Os,,hk,HFX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,GsXF,,VsKz,i,iga,WHBi,hk,gqn,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WqFS,,CqC,i,G,DQc,hk,u,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nyJX,,CqC,i,n,IouE,l,pwFg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eNyU,,yhq,i,GF,SC,lR,U,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ABnR,,LDk,U,iL,ev,hk,ncTpP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jyaO,,zZe,D,kB,SC,hk,NRRL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rwvH,DfECa,OYMU,i,n,fX,i,NdS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dwwX,,aN,i,nU,qyCG,l,wIy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,kPFm,,LDk,D,iL,XJb,i,CWq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,daci,,ez,U,nt,hmKv,i,aOrP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZSuC,rGzDb,xDLG,D,pf,YO,lR,JJFQ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jgsn,,gpyD,D,GF,rSZ,lR,sHE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QmAa,,,i,zj,Yxhj,l,MpP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZBQt,,EXYv,D,xk,YO,hk,MNAR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fdrn,pLYXJ,VsKz,i,iL,soR,lR,dad,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Wxvr,,yhq,i,os,Kg,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Wxvr,,zZe,i,os,LzlK,l,uP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mzkG,,Pcb,i,u,YO,lR,ino,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VcKi,pgAZa,iV,i,BfM,gRTo,lR,vbcKh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Evdz,,zZe,i,nU,Bkt,lR,ApMf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rHKt,,ez,i,RI,SC,hk,bvX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lmcY,sMELl,CqC,i,GF,gANm,lR,iaMC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,OLgq,,rNcu,i,RC,RSST,lR,pFH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NZvS,,LDk,D,iL,aRnz,i,CWq,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ulvu,,iV,i,GF,dhzh,lR,ZUwv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,phMr,,xDLG,U,iL,GF,hk,TFX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UbxD,RdvaT,zZe,i,RC,xa,i,hI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iXrH,,LjAS,D,iL,Wsd,hk,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ZIfo,zMiPC,Vj,D,iL,SC,hk,kiEx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WWNb,,,i,Os,pf,hk,QjopT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SuaX,FRUYV,rNcu,D,Kg,OCf,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aCsr,,VsKz,D,Cj,xUk,hk,VSHT,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,tTTj,uEBcZ,LDk,i,iL,Om,lR,mR,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IGTD,WGaOF,yhq,D,sp,Cj,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UGFC,,QMl,D,mR,ev,hk,tzS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hDuY,,bVnY,D,fx,Ri,lR,tKHSC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fpTZ,pxIod,CqC,i,G,,lR,Ep,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,UmaG,bCTNf,OYMU,i,n,gI,hk,ShH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RlxT,,EXYv,i,zj,ev,fU,ucLH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nxSV,,rNcu,U,Kg,GWD,i,VjfC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,pvOP,,xDLG,D,iL,SC,ri,Ycx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RvMo,,gpyD,i,GF,SC,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,mAUG,rEMyu,xDLG,D,SC,Cj,hk,ueLQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eOvq,,LjAS,D,fx,Cj,hk,oh,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,euVq,,iV,i,RC,hmKv,lR,wXDe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dBTJ,UcrWb,ez,i,RC,hmKv,lR,xa,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JvZl,unoLA,gpyD,i,os,dYPI,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,htBk,qvYOL,,D,sp,jF,fU,Bu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XUBk,uNjff,,U,nU,mwY,hk,db,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,WTZI,,EXYv,U,sp,ZNN,lR,CRn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hjVy,mgoTc,gpyD,i,GF,YO,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Mfiw,,VsKz,U,nU,OCf,hk,auwc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Mfiw,,VsKz,i,nU,YO,hk,auwc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hhIq,BGytn,iV,i,xk,RV,lR,ejJi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cqfS,,anf,i,FMt,EWTi,i,IJq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,RzbR,KOJjz,xDLG,i,OS,wnVT,lR,jPlQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,iTQU,,yH,U,mO,gI,lR,KR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,jnbh,PoYEj,bVnY,i,GF,hvW,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IZjj,,,i,sp,ber,l,Nkrx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,QSwR,,gpyD,i,H,flWz,lR,IWHQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SeNa,,CqC,i,GF,pf,lR,ORcu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Ohcv,,CqC,i,SC,gI,hk,u,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,VLKL,UpZhy,mNh,i,JnB,fX,ri,exS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,IKYJ,loFIF,yhq,i,H,pf,i,eG,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Lghy,pcpoK,iV,i,RC,fX,lR,AwyW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ODQP,,gpyD,i,RC,Cj,l,LqpC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,egYm,,,i,nt,dYPI,lR,Lel,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,KuXW,CYyHw,,i,YO,DME,l,MpP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,muxy,,LjAS,i,LL,Cj,hk,wXat,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,Pmuc,,xDLG,D,G,yC,lR,wHDw,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,JPds,,VsKz,i,Bu,xa,hk,kzU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,msAJ,,iV,i,mR,,hk,xKSG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,rOxS,tCwnd,ez,i,mR,wnVT,lR,bXFk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ANxM,,LjAS,D,SC,YO,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aZlc,NTvmH,,i,G,hmKv,i,U,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,aZlc,,gpyD,i,G,hmKv,lR,HZGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SRfh,,yhq,i,H,pf,l,HwK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,ttDK,,EXYv,i,RC,gOZx,fU,PF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xwMl,zOpXm,yhq,i,Cme,fX,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,dJQk,mgoTc,bVnY,D,k,YO,lR,YBgtv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,FGPw,DXeTv,Vj,i,RC,XLQ,lR,eXRM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,xBST,GqeZx,ez,i,gI,yGet,hk,WEd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,TteF,,bVnY,U,EF,dYPI,hk,Yx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,sGDL,,VsKz,i,n,rFYR,lR,mFFI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bfeu,yZyjK,zZe,i,RC,rSZ,i,hI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,bfeu,,rNcu,i,RC,Cj,i,lwik,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,MVdL,,yhq,i,GF,RV,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zjtN,rOYfq,VsKz,i,GF,WNP,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,yEYa,ayCzB,yhq,i,GF,aUhF,i,eG,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hmlu,ZFDog,Pcb,i,RC,MpP,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hmlu,GuqeH,rNcu,D,RC,YO,i,zpY,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,hmlu,,CqC,U,RC,YO,lR,kck,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,lzVy,hfpOS,LjAS,D,Ld,sp,hk,Pj,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XUlI,,EXYv,i,Ld,mwY,hk,wDnA,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,XUlI,,zZe,i,Ld,,l,gHp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,AWgT,AzPRY,,i,EF,SC,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,SlnT,,bVnY,i,Bu,buw,lR,os,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zMqu,efoXf,KsKZ,D,zj,jF,fU,GlhG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,zMqu,,yhq,i,zj,sp,fU,ovm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,nGOx,,zZe,i,GF,rbp,lR,qCw,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BryE,EOhNc,Vj,D,GF,fX,lR,rvHa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,BryE,,CqC,D,GF,YO,lR,Lgxd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fwdx,,rNcu,U,RC,dYPI,hk,VXeY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oZUs,TyuVv,aN,D,s,YO,hk,u,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oZUs,,zZe,D,s,gOZx,i,tZMJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,oZUs,,CqC,i,s,iGu,hk,zW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,eBab,sTwxB,LDk,D,G,Ri,lR,MTE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NsOx,pNMtG,KsKZ,i,os,y,hk,OEJz,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,NsOx,ujyjw,aN,D,os,,lR,qAub,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,gqTIk,xDLG,i,os,FvO,lR,salF,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,dmbIK,xDLG,i,os,DXRY,hk,ZW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,,yhq,D,os,dYPI,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,,iV,i,os,,lR,Njo,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,fflq,,,D,os,,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cHyG,BmXFy,gpyD,i,GF,Cj,lR,kcba,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,qEey,diaAm,jb,i,GF,pgd,fU,Xgae,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,cflD,,CqC,U,GF,sp,lR,pmjix,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZZWll,ez,i,nt,sp,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,drQyl,xDLG,i,RC,xa,lR,ZW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,bKQXZ,VsKz,i,RV,jF,lR,Rwj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,toRSD,,i,kB,jF,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,BZYCM,,i,boZ,Cj,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,uvXwY,yhq,i,Zi,Ouf,lR,tCo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,TcRvy,QMl,i,ZKX,xa,T,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,cFxvg,,D,ZJA,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,lZunN,QMl,i,RyV,pMmL,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,unoLA,,i,Nc,gI,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,XmDvh,CqC,i,n,RV,lR,Ep,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,vdUHx,,D,mO,Cj,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ytgnG,,i,,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,pcpoK,,i,FL,Kg,,,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,bzidY,,D,qh,gI,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,OCsfh,yhq,D,,iGu,hk,Inq,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,uGnqn,mNh,i,oen,Nc,l,Ot,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,XeDef,,i,os,sp,L,k,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,YRoxS,,i,Nc,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,koaVY,QMl,i,mO,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,qufhQ,LjAS,D,JI,Cj,lR,RC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CCGsI,EXYv,D,RC,mwY,lR,oImqv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,SAbkD,,i,OS,buw,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,nkrFs,yhq,i,sD,buw,lR,GEp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,DFNJb,,D,ZJA,HSL,T,fx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,szatV,,D,SC,HSL,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,QUpDF,gpyD,i,RC,Cj,lR,O,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,UjnIE,QMl,i,RI,XOk,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,lASnD,,i,jF,ev,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,HGnGo,,i,Pek,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,pziuA,,i,vk,Kut,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,TSHJn,,i,zOi,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,JFMRC,QMl,i,O,pPN,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,VzUtA,QMl,i,JnB,Cj,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oYBqD,QMl,D,oLI,,L,xAF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,LJytA,,D,,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,iHJUs,QMl,D,hyz,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,ZanZO,LjAS,D,mO,zz,hk,xmR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,btSdP,zZe,i,na,pf,hk,NLE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,IZWQc,,i,Nc,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,LQsok,QMl,i,eG,jF,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,LQsok,mNh,D,ZKX,YO,fU,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,rGzDb,QMl,i,mO,sp,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,KOgbb,rNcu,i,RC,zW,lR,pFH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,CktgD,,i,qh,soR,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,gUsbv,xDLG,i,jF,YO,lR,gFPOL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,gUsbv,,i,JnB,xa,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,hAjyU,,i,Kg,Bkt,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,Vjhjk,,D,jF,rbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,tdJFC,,i,wGj,y,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,DsQwS,,i,Cme,ZDwU,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,rBXlN,yhq,i,ZKX,pBlc,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,RnZxv,xDLG,i,oh,,lR,VyUz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oRdwp,,U,RI,hmKv,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,oRdwp,,i,eG,,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,aRalA,zZe,i,eG,TAUy,fU,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,aRalA,,D,BAR,zNvM,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,KyEGN,gpyD,i,xk,hmKv,lR,JnB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,KyEGN,,i,kWZ,hmKv,fU,iHi,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,yFAAH,,i,GF,WHBi,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,zAPsp,ez,D,os,uGF,i,jXQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,hpCAn,EXYv,D,BAR,RSST,fU,xaGI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,U,kWZ,hmKv,lR,ZVFx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,VsKz,i,nU,,hk,cjrH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,kB,tCwq,hk,Yx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,mO,DDPD,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,eG,hmKv,i,SC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,db,SC,lR,yf,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,bVnY,i,n,,hk,qOFh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,xa,Cj,l,yH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,sp,hmKv,fU,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,i,Ri,uGF,hk,Cj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,D,hyz,RV,hk,ehLs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,EXYv,D,Kdq,,hk,Cwi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,U,Zi,jaD,hk,tCo,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,FL,Kg,l,ZdgHU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,RC,Cj,lR,GES,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,rNcu,i,zj,hmKv,hk,dYj,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,i,GF,pf,lR,O,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,gpyD,D,IaL,ojoW,lR,O,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,i,ev,dYq,hk,yC,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,zlG,GCL,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,kWZ,IamB,hk,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,FW,VkB,hk,Pj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,mR,oka,hk,cCSJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,Pj,zI,ri,GIS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LjAS,D,os,kPj,lR,RC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,i,GF,Cj,hk,Ds,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,i,FN,zI,hk,CiBe,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,D,vk,,hk,Pdz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,D,Zi,cbZ,hk,Pdz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,KsKZ,D,Zi,yC,hk,Pdz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,i,jF,db,hk,LdemN,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,xDLG,D,SC,Kuz,lR,AsNQ,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,ZKX,xa,lR,aW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,na,IamB,lR,ykCL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,zz,ZDwU,lR,qcya,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,Zi,LKKI,hk,kdc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yhq,i,nt,nT,lR,OIyn,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,NHX,pf,hk,oHDH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,boZ,LKKI,lR,Shoh,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,GF,ceEe,lR,iMC,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,kB,iGu,hk,nmp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,LL,dYPI,hk,NhYJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,xa,NeG,l,uP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,Zi,LKKI,lR,nxB,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,oh,,hk,uUrP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,eG,jBP,hk,QdZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,sp,cRzS,hk,vgOK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,Ri,SC,l,uP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,sa,Cj,i,OBze,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,sa,SC,hk,nmp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,OS,tOJv,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,zZe,i,G,HMXY,i,Ri,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,anf,i,Uw,XLQ,i,ify,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,anf,i,mR,Pe,lR,MdA,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,U,hyz,qyCG,lR,xav,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,oMY,qyCG,lR,gmd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,i,JI,LKKI,lR,lVH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,hyz,TXLD,hk,yEb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,KCWa,hk,MEzg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,rmJ,lR,MEzg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,vFv,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,cBU,hk,MEzg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,YO,hk,KUVt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,Cj,hk,fQbS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,SC,nT,lR,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,opm,D,JI,Cj,lR,aFx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,i,mR,Cj,hk,uJQN,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Pcb,D,u,yC,hk,Dnq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,ZKX,gANm,T,nT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,ZKX,GgOg,T,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,BAR,uECy,T,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,vk,YO,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,GF,dYPI,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,kB,iL,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,oh,zvgI,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,RI,kWZ,T,H,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Zi,jaP,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,mO,nHdH,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Kg,kWZ,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,nt,ev,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,nT,dYPI,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,nT,xa,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,yC,pf,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Ri,EWTi,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Ri,qxk,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,xk,xUk,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,Bu,IKL,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,u,aQj,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,s,bfM,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,,gI,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,i,,SC,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,pm,IamB,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,GF,VyBk,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,QMl,D,GF,kSz,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,U,G,,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,FMt,uECy,hk,Uw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,boZ,tCwq,hk,WEPcu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,FL,ZNN,hk,Xeyv,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,KR,zvgI,lR,FW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,jF,zNvM,hk,JaDs,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,CqC,i,n,IamB,hk,u,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,i,aW,xa,hk,rydj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,i,ai,KCWa,hk,OS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,LDk,D,ai,y,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,i,FW,ev,hk,uyez,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,Gac,D,mR,Cj,l,vUwk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,hSE,uWTD,l,jgYv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,hSE,,hk,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,pm,hYu,hk,sa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,RI,oeg,lR,Ybk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,i,Yx,Zsbp,hk,cAI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,sD,y,hk,luoo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,mNh,D,JI,Dgv,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,i,mO,gI,L,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,D,mO,JVF,lR,lguh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,yH,D,mO,rSZ,l,Iqqc,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,aN,D,G,VyBk,lR,myMM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,U,BAR,GF,hk,FZj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,U,na,uGF,lR,sNjP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,U,aW,DQc,hk,tTTj,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,ZKX,yGet,lR,xa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,JnB,lQU,hk,vNY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,BAR,mwY,hk,NHX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,bf,pf,lR,epE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,oh,xa,hk,pBnO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,ez,i,Ri,jF,lR,eFcJ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,GF,jaP,hk,Ld,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,Ld,pgd,hk,yYLW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,i,FL,KnZo,hk,Ld,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,iV,D,k,DcjM,hk,FMW,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,jb,i,qh,yGet,i,avTK,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,pqp,Mgil,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,hSE,xa,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,nU,uGF,i,Alg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,BQ,,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,aZ,Mcs,lR,xvb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,FN,wtY,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,mO,KMAv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,oh,uECy,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,nT,fX,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,fr,gANm,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,U,n,WNP,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,RNB,cmmA,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,zlG,kzbx,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,Kuz,fX,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,ZKX,KMAv,L,G,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,i,ZKX,Zi,l,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,BQ,Kg,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,bf,TGXq,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RI,QIe,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,RI,YO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Lz,,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sD,nT,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Zi,pgG,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,FN,uECy,,,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,FN,yC,,,3703896352903212240
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Nc,gOZx,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,mO,mwY,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,mO,fX,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Kg,YO,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,zj,zz,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,yC,WHBi,i,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,yC,lGa,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,sp,IuC,i,U,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Ri,gGz,,,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,Ri,RV,,,5335641216673039236
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,xk,yH,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,zI,Pif,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,SC,XLQ,,,7995222244977387887
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,JI,LHdO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,JI,pFH,hk,syQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,ZW,gRTo,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,s,YjrO,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,,,,,D,,XOk,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rfXDxOH,oWoZd,mNh,i,JnB,hmKv,hk,BWIm,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,trrlDzK,iHJUs,mNh,i,oh,Cj,i,tBWH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,YHPNSsw,xZsRI,Pcb,i,qh,GxE,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,kppyVmR,ViguX,rNcu,i,sa,Bkt,hk,Jrba,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,SPuavxB,JFMRC,CqC,i,Lz,gci,hk,QHZD,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rQvduIJ,cdSwJ,VsKz,i,iL,UpSB,hk,iHi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dYHjCbF,hrmwJ,zZe,i,RC,Cj,l,EMH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,PTWRbmB,xTKHz,jb,i,lVH,kyz,fU,QGDwp,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,XwasuLv,EOhNc,CqC,i,GF,HSL,lR,iHi,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,tPrwbpz,QUpDF,QMl,D,Ot,gI,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,tbWpMsL,PVTeP,CqC,i,Zi,Kg,lR,Ep,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZGSCKNx,zHbzr,LDk,i,GF,,hk,EZR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FhVuiH,WJNmg,zZe,i,eG,buw,fU,oMY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,jJlGPX,RTQUJ,,i,FN,y,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,Gsxplb,QlLCW,bVnY,i,RC,jaP,fU,iMQg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,cpHgIQ,KgLFo,zZe,i,BfM,ESA,fU,jFI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,wHQceq,cqJdC,,i,u,ev,T,fx,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,nsZCld,rrdcH,,i,zlG,Ri,fU,FL,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,niNFiZ,HKFIL,CqC,i,zz,FvO,lR,CBqA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,jHdfbb,gJjvo,EXYv,D,Ot,uUHC,hk,YScl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZXkvtq,nOmkK,yhq,i,nU,DUHG,i,eG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,VulNnR,,,i,G,hmKv,lR,EY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,jlLMLs,,,i,FL,tOJv,i,ArE,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EOvTnh,kEKkc,,i,G,ev,L,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,jtAuSB,UriEN,iV,i,GF,aRnz,lR,jGeyv,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,nasYqv,YhbKG,bVnY,i,THd,Kg,hk,sp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,DivxLY,,CqC,i,G,xxmj,hk,vEZR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,bskMEP,QUpDF,zZe,i,Nc,DME,L,TUw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,sNCGGO,VGgQZ,,i,RC,IamB,lR,Kuz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,RtYSnZ,,Gac,D,ai,y,hk,Qhv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,BKmMWR,VdCfJ,,i,n,Cj,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,vDMhxX,frgYp,QMl,i,H,SC,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,GsFWX,miwCS,gpyD,i,G,TAUy,lR,UsS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,jlgYY,qgHRF,CqC,i,G,jF,lR,ots,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,azAOb,oaDFO,yhq,i,RC,Cj,L,iHi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,fEoEJ,hlcVp,Pcb,i,u,xa,lR,MAI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,FBsFG,jkNiR,,i,iL,mEr,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,ZGrhK,gUDiL,Pcb,D,u,y,hk,hiS,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,XnLFw,uLFqs,,i,mO,sp,fU,y,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,CJYuK,QMUcp,Pcb,i,u,Cj,T,XDfXO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,BwVsy,,LjAS,D,u,HSL,hk,bEU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rScUy,vAuYo,,i,u,eQE,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dRdYC,aHyMy,bVnY,D,fr,,lR,UyQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,hkBt,yFAAH,gpyD,i,iL,WHBi,lR,QQB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,bnrB,tGvIu,ez,i,GF,EogM,hk,hDk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,Xlbq,gJjvo,LDk,i,iL,FXZ,i,iXrH,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,rAOl,DBqUl,KsKZ,i,pk,OxU,l,mLpI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,dwwX,,,i,nU,Zsbp,lR,VSL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,EogM,QJuki,iV,i,O,YO,lR,Wna,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,OOae,qgHRF,VsKz,i,H,,lR,xjiX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,KGAU,QImNH,bVnY,U,OS,UpSB,hk,bpC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ZFDog,,i,qy,tTD,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,MHmjU,gpyD,i,IT,Pif,lR,O,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,cdSwJ,ez,D,Ri,UpSB,i,Rk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,TtcDA,,i,G,pf,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,rRbDE,,i,O,hmKv,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,hQHrJ,gpyD,D,sD,gOZx,lR,Wu,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,RdvaT,QMl,D,ai,y,lR,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ytgnG,xDLG,D,oh,WNP,L,k,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pLYXJ,,D,Kdq,pgG,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,mDfiz,,i,mO,sp,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,Jbwep,QMl,D,fX,woE,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,bvupa,,i,sa,Kg,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ysECB,QMl,i,u,cbZ,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,gCAcv,Pcb,i,qh,Cj,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YoxHS,EXYv,D,u,Cj,l,mcvp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YoxHS,,i,pk,ev,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,mONwL,,i,kB,zI,L,k,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,aHfsL,LDk,i,TGR,SC,lR,ykQb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,JpSzL,,i,kB,Kg,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,KbCOn,,U,OS,Cj,,,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,NEMaM,QMl,D,bf,ev,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,jrPjI,,i,sD,Blj,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YOltA,bVnY,D,iga,,lR,yf,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,Gilcs,mNh,D,pqp,Wsd,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,fWinc,LDk,i,aW,Jbg,hk,YEdp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,QUpDF,,i,FN,Cj,i,kAe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,fprRo,ez,i,bf,nT,i,jXQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,lASnD,,D,Dq,XOk,L,k,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UriEN,Vj,D,kWZ,pf,lR,Cmmv,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,UriEN,,i,n,rbp,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YLfgi,LDk,U,aW,sEF,hk,OS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YjQpG,QMl,i,oen,qyCG,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,YJArO,QMl,D,JI,ev,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,fFPdL,mNh,i,RI,YO,l,xVO,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,pziuA,Pcb,i,u,sp,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,OVLEl,QMl,i,n,gGz,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,aHyMy,,i,jgn,SC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,xTKHz,bVnY,i,hyz,jF,lR,NwXb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,nMlTX,QMl,D,hSE,yC,T,rEy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,ERiHU,,i,sp,zz,,,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,nJvcN,opm,D,Kg,y,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,OiEPu,anf,i,IT,YO,i,LfH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,qgHRF,KsKZ,i,mO,jF,l,fX,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,uWgCK,,i,OS,pf,fU,Om,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,amZvm,gpyD,D,xk,,lR,AOGF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,zhGRk,aN,i,Zi,,hk,MOrF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,FXwbX,QMl,i,os,gOZx,T,nT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,DteWK,CqC,U,zlG,hmKv,hk,qh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,rSjvT,,i,FN,TxcW,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,otbME,,i,GF,BHeC,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,dEvnd,gpyD,i,GF,WOsU,lR,UcelF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,dEvnd,zZe,i,WLK,ZBNA,lR,lbOO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,gpyD,i,TGR,aIlc,lR,XEY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,LjAS,U,kWZ,gI,hk,aE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,zZe,i,jF,Zsbp,i,teWT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,zZe,D,RI,KCWa,i,qVs,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,opm,D,SC,ZjS,hk,oh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,i,Yx,Mgil,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,QMl,D,pm,BWVA,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,mNh,i,cfU,Xua,hk,tqk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,Nc,UMQZ,,,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,i,sa,wOZo,,,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,l,,,,D,vk,y,,,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aDtOjXT,MTdYm,QMl,i,u,XLQ,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZtaoCun,ujyjw,QMl,i,FMt,IamB,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iCzrQkT,xdICB,rNcu,D,FMt,KtFl,l,cfU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qicNngM,yeZks,CqC,i,Bu,RV,lR,ibf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rQxSPoV,ruKdN,QMl,i,k,uECy,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,McBbleg,JFMRC,opm,i,aW,sD,lR,LbkLj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RiJJYWv,yklOt,Gac,D,FW,YO,lR,kfpQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DBVSDhm,kfqKW,OYMU,U,GF,YO,fU,wgha,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TTbulqC,DpysR,yhq,i,GF,pf,lR,aAtHD,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CxlSKIi,,CqC,i,n,Zsbp,lR,AvNX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QYZwEgA,OlvsS,bVnY,i,n,mwY,lR,Emev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iYPSoyz,XctNb,CqC,U,n,YO,lR,rEcY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nAqiOjG,rrdcH,LDk,i,aW,yf,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TYVvUju,zGsPH,Pcb,i,qh,Cj,hk,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lIxBpbh,gUDiL,Vj,D,BQ,y,l,BPJd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sfFBTwS,,rNcu,i,FN,Usgd,lR,Xeosy,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lrIymeD,qSMjB,xDLG,i,RC,Pmiv,T,H,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DWoqmJB,mHDez,CqC,i,FL,pMmL,i,cBU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YBNfPer,,yhq,i,os,uWTD,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YlqbWyh,AraPt,LDk,i,ai,SC,hk,OS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aesVmRB,cBrLC,,i,FN,MpP,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JzXLAvE,kaQGg,ez,i,ZKX,ZUA,lR,uDuf,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YqpQWeO,CgiNm,,i,hyz,iGu,i,hfB,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GAZhUTs,FPgQL,EXYv,i,Lz,sp,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DjbpXkQ,JGooX,,i,ZJA,nT,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wEMsoKo,,Vj,i,SC,,lR,DNP,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IlvdiDW,yQenm,QMl,D,aW,hmKv,fU,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WDMnRYY,lKirz,,D,kWZ,rmJ,L,G,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ggyeHjy,,ez,i,ZKX,aQj,lR,wKcD,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XVSGhFY,PVTeP,bVnY,D,bf,y,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oZNPvIi,DafuW,EXYv,i,iga,YO,T,IyXZB,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GUQGjGc,nryOR,Vj,U,mR,AGz,i,UMJG,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WaRbTyg,yOhXn,QMl,i,EF,Cj,T,QmK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QMicMQy,oxvWf,mNh,i,hyz,eQE,hk,Pe,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fUlvoKm,AKYoc,,i,Ri,,L,G,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ojiGcPr,,ez,D,oLI,qgNx,lR,xa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UGDQoQg,FmfYd,xDLG,D,iL,IamB,lR,JyH,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vuTqolP,AXhVB,QMl,i,oLI,HSL,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GvbBWQv,MiuKF,EXYv,i,xk,hmKv,l,IhAX,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GAxAWzI,AXhVB,yH,i,mO,YO,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iKrhNjh,ZzySo,anf,i,Uw,gI,lR,O,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,psARziJ,uUaoE,gpyD,i,na,pf,fU,y,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mhpiyIX,gPBuC,Vj,D,iHi,na,lR,BgJK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jiCaOOq,TzJAt,xDLG,i,jF,Mgil,lR,BFMX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yxdrWYo,UcrWb,OYMU,i,oh,hmKv,i,IiCt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hfGuTmF,DWRev,VsKz,i,G,juI,hk,lUt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kMllTJO,RUGgg,,i,RI,Pif,T,nGz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UYarlFP,nMlTX,zZe,i,TGR,SC,fU,jFI,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LYgHMnf,,rNcu,i,RC,WNP,lR,FQfh,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YkWDtXo,OiEPu,QMl,D,FN,bf,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fxByXvw,AcOfv,,i,mO,sp,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BgEbKSD,DnPCF,QMl,i,Zi,YO,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SOgJcOf,qSMjB,,i,G,,lR,Lel,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ONowjBj,,,i,Zi,uWTD,l,U,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CyBvnsU,ecdAc,KsKZ,i,FN,zI,i,RsCV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EPXBDMd,gUlWM,QMl,i,n,Mcs,T,nT,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qXCSiGr,yEmPk,EXYv,i,Nc,SC,fU,CVT,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nKlpPcD,MAWHg,rNcu,i,SC,SC,hk,RI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NzSTYrS,Fbzqh,Pcb,D,qh,ZcH,hk,pgd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GPRLPWa,loInS,CqC,i,Nc,iADy,L,UOy,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aFTUOVp,,ez,i,nT,IamB,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pwGnBwQ,HLYZq,zZe,i,Zi,Ujsc,fU,WSW,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lQtoLwX,MNwJU,QMl,i,sa,HSL,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RlORNAK,vZyhX,zZe,i,qVs,rbp,fU,OUjq,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DqYBJLB,soKhL,,i,dQD,ZHiH,lR,xvb,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QRQCYXJ,,iV,i,G,LHdO,hk,dad,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SpAUrQf,CbutI,QMl,i,GF,Wsd,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VrkTwTz,LQsok,xDLG,D,ZW,bf,lR,iooY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FxVzmjg,,EXYv,i,k,wnVT,lR,zlG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dRKSHKf,TrrrN,Pcb,i,u,SC,lR,gI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,viYxlwK,ZLapr,Gac,i,mR,Rk,hk,UpJS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zxqKvtn,ClwEM,jb,i,Nc,eQE,l,zOi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PgGboKP,VzUtA,opm,i,uP,hfB,hk,NHX,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DelobKu,rSjvT,xDLG,i,hyz,,lR,fPgh,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VrvPuYW,QUpDF,QMl,i,n,nT,T,vJKL,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YQvBbfl,EWrtg,mNh,i,Ep,hmKv,T,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,eyWwupt,jPrKo,,i,Cme,dYPI,l,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,smvNapu,CuWvK,QMl,i,KR,IWtD,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ohRQYDR,opZrF,,i,OmE,hmKv,L,G,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hKiJUqF,hoyPK,QMl,i,RI,DME,T,QmK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QEolaBI,lZunN,CqC,i,RI,DDPD,lR,bvl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GHZoNSK,lNnVR,zZe,i,xk,HSL,i,jBP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AnCOjWA,qSMjB,jb,i,FMt,yGet,lR,ydJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mXNyDqr,fGTzs,CqC,i,FL,ZKX,hk,gANm,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FZvqEzQ,zlFZL,,i,Kg,SC,i,nj,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MysAdnH,ShlxV,gpyD,i,Os,sp,lR,O,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AxQhqql,SdvqP,yH,D,mO,RV,lR,MpP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WMRHpGr,aPzRl,iV,i,NHX,DQc,hk,Rpg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uKrWWos,YTckD,xDLG,i,Nc,sp,lR,oLI,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IUoDajk,UZDWv,EXYv,i,Bu,y,l,yH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sFXJkWK,,QMl,i,ZKX,Mgil,T,lrMg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UTOiIcj,qOZwe,,i,oh,jmef,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ngqwWNo,uLFqs,gpyD,D,k,fX,fU,wgha,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NoHyBoW,vnUks,LjAS,D,O,juI,hk,Bvzyv,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rxSQuC,CfjhB,CqC,i,RI,,hk,zj,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lPDGAM,GfRLe,bVnY,i,GF,eKfc,l,pecI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ICDTEp,,VsKz,i,GF,LKKI,hk,LBR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QAmpoo,,jb,i,sa,DcjM,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,atyBaV,ZGziF,aN,i,pf,zI,fU,umaM,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yAFano,FVyoD,ez,i,KR,jBP,l,rOw,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XDVWnj,,rNcu,i,RC,nT,lR,hOZk,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jmkQor,jvpnP,Gac,D,FW,gI,lR,s,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lQkIsO,IsgfE,Vj,i,THd,mwY,i,EF,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UuiioV,trQTp,opm,i,Cj,buw,lR,XsfJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KefNuO,VTGhD,,i,Kg,yC,T,mEr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GMzlcl,mgoTc,QMl,D,Pj,Cj,lR,xa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HDKqQf,xZsRI,QMl,i,xa,kWZ,T,H,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kNIjCT,CiZAV,ez,i,kWZ,Cj,lR,ftnSU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PJauDc,Emiva,ez,i,mO,pf,fU,ZiAQ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lPktWT,BGytn,gpyD,i,GF,sp,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NCUeEm,zlxbS,OYMU,i,ZW,hmKv,i,AQdB,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kDTAOS,,Vj,D,Lq,IamB,hk,HQDt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uFTsKV,utPhx,,i,Kuz,xa,T,mEr,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XWOcGS,vrlAM,,i,ZJA,hmKv,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IvPsLW,tuGlk,bVnY,i,GF,pPN,i,ymEs,5722249854709229541
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,jLgVsd,OCsfh,CqC,i,sD,pPN,fU,wIw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sgcNqH,UcrWb,LDk,D,aW,hmKv,hk,OS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kiqRst,,zZe,i,FL,IamB,lR,NLE,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dPYvEK,CDTkR,bVnY,i,ePq,Kuz,hk,ePq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ABLUtq,WOouO,iV,i,Lz,gJq,hk,raps,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vxjYom,RdvaT,mNh,i,GF,pf,lR,wxG,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WKemcm,MMnif,aN,i,G,TAnX,hk,ulS,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UAeQji,VXoOo,Gac,D,pf,Nc,lR,zYm,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PsLYyI,rHwUv,mNh,U,cfU,hmKv,lR,vTKNs,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TSntkt,DnTGD,iV,i,GF,ev,fU,hZlRG,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZvtDGz,HGnGo,QMl,i,KWZ,Cj,T,k,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uZoBUD,KOJjz,yH,D,GF,hmKv,fU,y,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rxNeYA,dCBBw,xDLG,U,pk,Ri,lR,lGVi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,agbLSk,LJyce,yhq,D,iL,ShH,hk,Inq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mBMEqi,pKgAU,zZe,i,k,TBUv,l,uP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yMookf,hpCAn,CqC,i,FL,RSST,hk,ZdFA,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,WEydDz,JWQHp,xDLG,D,oLI,gANm,hk,ZW,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nbrZvG,TVeAq,EXYv,D,hyz,qyCG,L,HuZk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TRoKOO,tOHCV,yH,D,mO,ZNN,lR,KR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZgDngd,,bVnY,i,k,hmKv,lR,os,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xQkjut,uLFqs,bVnY,i,iHi,ZKX,hk,ZzxU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nNCxRg,WEZQr,yhq,i,FL,RSST,lR,GEp,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bJiOrR,DxUot,rNcu,i,mO,WNP,L,iL,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,feVZpn,CSXEU,yhq,i,sD,y,lR,n,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IuSAIY,yDaUW,VsKz,i,GF,Wsd,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CrDNWZ,YMYMT,LDk,i,iL,DDPD,lR,Wbj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ANLRwQ,tLSUR,xDLG,U,mR,Zsbp,hk,fRt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YbwGMq,SNYME,,U,GF,uECy,i,aaDx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,japQAU,GwSmH,,i,EF,hmKv,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lMFNGP,rYFYY,yH,i,iL,dYPI,lR,OdBWb,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qYkxtl,oJhqB,Pcb,i,qh,XLQ,lR,gI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yCFIVg,DXeTv,jb,i,dQD,Cj,fU,PvS,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ItbHRT,gZyYP,Vj,i,Ri,xa,lR,DbtX,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hadeAD,ATojp,ZQa,D,Kg,,fU,tOk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rMRAFv,pcpoK,VsKz,i,n,Kg,fU,pNZj,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QIasGg,AXhVB,rNcu,i,sa,yH,L,iL,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hjkCDO,MiuKF,VsKz,D,mR,hmKv,lR,Mdru,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kYwsDb,LQsok,rNcu,i,aW,YO,fU,fFbU,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mEhAYR,lXZjU,VsKz,i,FL,jF,fU,icRU,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tfNhaR,puepy,yhq,i,oh,kgW,l,GaXz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mXOxPh,yDaUW,LDk,i,iL,jBP,l,AlYwB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Wyhjpl,LySkr,zZe,i,ZJA,yH,l,uP,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QMPJkO,yPBim,gpyD,D,GF,Mhu,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,hsSOUf,FPgQL,rNcu,i,Kg,XJb,l,HAEN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tGFYRn,pLYXJ,OYMU,U,gI,soR,l,cpi,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QeTdxy,Aeewi,ez,D,iL,,fU,cEv,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MTcqSd,yDaUW,,i,FN,eFx,T,fx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CfXVqL,oxvWf,bVnY,i,zj,aRnz,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NCnocI,,,D,n,lQU,lR,VSL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YzXEZV,hpCAn,,D,oh,qyCG,l,gVggt,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YIESOB,BZlOx,xDLG,i,FL,Kg,lR,Lxk,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zLkHnu,cGlgW,rNcu,i,kWZ,yC,l,Svsx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wjncSX,rXnhf,ez,i,nt,gI,lR,xa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,keQUKf,xTKHz,jb,D,THd,Cj,l,Pyba,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZodxLj,dheCD,CqC,D,n,uECy,hk,zj,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JDnpFd,dheCD,iV,i,zz,Mgil,lR,VTmz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sJbHhy,ShUhD,Pcb,i,u,SC,lR,gI,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kzYXCF,,yhq,i,KR,ZDwU,lR,bwfa,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,koACbX,nOmkK,iV,U,Pj,ZDQc,lR,FusKs,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,syZajK,QImNH,,i,n,hmKv,fU,oMY,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pDJOLw,DBqUl,ez,i,exS,CAP,hk,xjm,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CVeDLU,MWxHT,,i,Kuz,Xua,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xTOvmK,otQpo,CqC,i,FL,JpGG,lR,s,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PlQAhu,aRalA,QMl,i,Cj,zNvM,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SVzUlu,jCPPl,zZe,i,n,YO,fU,Jlob,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,TeWAYH,uYWpN,iV,i,YO,uWTD,lR,ndmLF,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fXvwkk,efoXf,EXYv,i,vk,y,ri,APs,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GeDQMU,HLYZq,LDk,D,mR,Pmiv,hk,PdEaL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZifjVt,rWGPS,,i,n,Zsbp,L,G,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EAohwp,exGnq,QMl,i,SC,MpP,T,H,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lgVzLm,oZpan,Gac,i,pm,RV,hk,Qhv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yxKzlg,CfjhB,VsKz,i,pm,IamB,lR,BfM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ctKwHa,FoiOQ,EXYv,i,RI,aRnz,lR,eTKB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PJEPsV,PbPze,iV,i,RC,xa,fU,yLOW,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MWfOMN,xZsRI,Vj,i,Dq,Nc,l,TGR,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iSNpRN,tWWFx,LjAS,i,Nc,Cj,hk,aE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yuuDQl,uVdCT,bVnY,D,Kg,TAUy,lR,aaaGl,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qCjMvF,VzUtA,bVnY,i,n,SC,hk,ePq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lztbFl,YMzrT,EXYv,i,ZJA,gOZx,l,IMzf,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,HjKvbP,herJX,rNcu,D,IT,YO,lR,s,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AtcwVt,ClwEM,yhq,i,GF,YO,lR,GEp,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gCqzxP,mONwL,EXYv,i,Cme,pf,l,XUdd,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MWcyac,YyDGC,EXYv,i,bf,YO,fU,TNo,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qJxjZv,rGzDb,QMl,i,nt,YO,T,H,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CnzNDc,JFMRC,LDk,U,iL,UpSB,lR,hyz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ABxuqm,frgYp,mNh,D,os,aRnz,hk,sa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,boRRer,GGQdy,xDLG,D,GF,RSST,lR,BmyG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sDjnwL,brRis,,i,n,y,l,sEF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aPoaaz,,bVnY,i,GF,VyBk,l,Ckh,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kqqnll,mtJJa,rNcu,i,yf,Zsbp,l,Svsx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ahLVWY,HrlvU,zZe,i,Pj,KCWa,i,kSz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VgahHf,DzLhz,iV,i,GF,gOZx,hk,HWV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZsYwGk,uUaoE,,i,iL,Cj,l,FN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MhiQjk,,,i,aW,,fU,PF,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NLhPlQ,teKMc,zZe,i,RC,HSL,lR,ArEwV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dwmjPZ,UtgMB,,i,u,y,hk,fr,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,wBEsDz,,mNh,i,nT,dYPI,lR,XvSNO,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lYRqnM,,LjAS,D,u,SC,hk,bEU,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SqhAlx,ecdAc,yhq,D,Yx,zI,l,dBuWK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KrYdTm,ojeZB,zZe,i,GF,gI,l,qJEZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dNMSrh,Uoaco,QMl,i,sp,pPN,T,H,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mVQgOw,xZsRI,LDk,i,aW,XLQ,hk,nlOE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iMUQhm,vRwhI,bVnY,D,mO,pf,l,MQBC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QgAxWA,Dwamc,zZe,i,ai,gI,fU,CuFB,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xZHDVN,,gpyD,i,GF,tOJv,lR,Wu,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uTeVGU,FRUYV,iV,i,dQD,HSL,lR,VKHri,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EEvwoU,,CqC,i,GF,okIe,lR,LepH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DHrtnp,AcOfv,Pcb,i,Lz,ZNN,lR,odCV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nQacix,Zwope,xDLG,i,Cj,Tmcy,lR,vGJ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GGXXYH,WiUgl,CqC,i,RC,nT,lR,SNRn,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,XZoRQW,TttFj,CqC,i,iL,ESA,hk,u,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cLXbhl,QImNH,VsKz,i,mR,hmKv,lR,rcz,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rHWtpd,bvupa,Gac,i,mR,Kg,hk,nlgF,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fLXcUv,TttFj,Pcb,U,G,gI,lR,HwJa,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DDzCws,Ujcdv,xDLG,i,EY,uGF,l,mHiT,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZkRHRj,bWJlU,rNcu,i,os,pf,l,Jvecw,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LcpPEz,nJvcN,,i,n,YO,l,MpP,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kEkkHB,PnQhR,bVnY,i,jgn,y,lR,yf,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ByJDPs,VONBE,CqC,i,GF,HSL,lR,Ep,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gAwBeG,lmLfO,LDk,D,zlG,Wsd,hk,VIHIi,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qhQtMX,piZyE,mNh,i,G,gI,lR,xXyQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AVLNsB,MHnxr,xDLG,i,ZW,fX,lR,hjQ,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CFfhTm,dEvnd,opm,i,OS,,l,LpPY,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aPfDEr,DJrBx,,i,u,Cj,hk,fr,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dRDEko,,,i,GF,WOsU,l,s,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ETdHmK,AMsZh,QMl,i,oMY,Cj,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UuEsGC,SywhM,yhq,i,GF,pf,i,eG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UvnVcI,ZNLhJ,VsKz,D,SC,,lR,NCkP,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EnJigF,jwPoJ,VsKz,i,GF,IKO,fU,sWM,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QmSZvS,ZQfYS,yH,D,mO,XLQ,T,H,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,GVSSFi,rZIlM,bVnY,i,pm,dYPI,lR,boZ,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qmGExs,TEMTE,iV,i,xk,YO,lR,aHxpz,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,EAySZS,vdUHx,QMl,i,ZJA,fX,T,QmK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,arJNTM,fGTzs,CqC,i,y,JVF,hk,NsOx,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,bVSHfZ,kfqKW,jb,i,H,pf,fU,ccO,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,adJyLc,hlcVp,mNh,i,cfU,Cj,T,xVO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,nlYvl,,Vj,D,jF,y,l,TGR,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,CSfPb,GYSvM,zZe,i,GF,fX,hk,HpHY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oQSGS,kBvrH,Vj,i,Dq,Cj,l,TGR,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KeuhK,DUZqB,yH,i,RI,ev,lR,DMvt,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,LrIRZ,wuIBI,Pcb,D,u,YO,lR,GRER,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lywEf,LQsok,jb,D,k,yC,fU,XRMZ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,rnIWW,ZKlRN,yhq,i,n,Cj,l,mZez,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,zoWCe,yUWuX,mNh,i,ZKX,dYPI,i,pthi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Ksqjr,wcZUq,yhq,i,n,sp,lR,ev,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,IJGUE,OmvCx,,i,FN,IamB,fU,y,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,dqrpC,uYWpN,LDk,i,aW,nT,fU,U,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,poobG,xxGbe,CqC,i,pm,RV,L,k,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,cbpsz,tcmZw,EXYv,i,RI,dYPI,lR,rTSq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qHQdS,pktBl,yhq,D,iL,y,hk,qbED,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kZopO,,iV,i,y,fX,i,GXH,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pnHwd,avqeH,VsKz,D,bf,pf,lR,DmSa,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AAajw,uYWpN,yhq,i,jF,IJq,lR,n,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PqpaH,oBwBc,rNcu,i,sp,y,fU,mCO,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,gnopo,vtYeB,gpyD,i,os,hmKv,lR,XEY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,veLmI,BSAII,Pcb,i,Nc,,i,HJJT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yuGcD,uAKaC,ez,i,oLI,aRnz,lR,XKFMr,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JGpxx,QQxvR,yhq,i,FL,KnZo,lR,n,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BpWCR,MNqGT,iV,i,O,YO,l,UVe,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PzGEv,nMlTX,rNcu,i,FL,Kg,lR,AZEKP,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,FkQgv,uCfJW,OYMU,D,n,gI,i,xk,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PxINM,rSjvT,aN,i,n,ceEe,lR,mVWS,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ICPlR,CDTkR,CqC,i,SC,HSL,hk,iPEG,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qeKwV,FRUYV,jb,U,RI,Kg,lR,vk,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,MxOqx,OJkEB,xDLG,i,GF,Rfp,lR,Njo,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,ZGGpl,rRbDE,bVnY,i,GF,RSST,hk,Hdhd,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,QfBxk,EnYIx,zZe,D,jgn,y,i,Ri,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tAepo,ZQfYS,rNcu,i,RC,XLQ,L,eSa,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OSJKU,brRis,,i,wGj,pf,l,Jmq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aajpb,,CqC,i,O,SC,lR,kuCD,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kFIXC,JpXCs,,i,kdc,y,l,FN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iOUWU,KoskF,ez,D,vk,Cj,lR,pJu,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,NNWOw,,ez,D,ZUA,dYPI,lR,mKDi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,mABOJ,zAXgR,,D,jgn,tTD,lR,EY,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YXtqy,GDSnP,yhq,i,Nc,Cj,lR,n,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UFKmU,nOmkK,zZe,i,FL,ojoW,l,rIKSi,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iFhaN,iLTbW,LDk,i,aW,sp,hk,EZR,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tZTdk,,bVnY,i,Zi,VyBk,i,cAq,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qlLeK,SbGey,,i,os,DDPD,l,FN,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,aJpnI,jCPPl,jb,D,kWZ,sp,l,fuv,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OfETB,,,i,RI,okIe,hk,db,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,iryGn,qwbvG,iV,D,Kg,pf,lR,RyV,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,globT,wwFAY,LDk,i,aW,SC,l,sSgI,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,BvYpQ,CoHoq,yhq,U,mR,y,hk,eIg,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,DHokM,fyozH,Vj,i,SC,pPN,l,iHLx,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Ochma,jHsOR,bVnY,i,Bu,XLQ,hk,yklI,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,lUKvm,cdmXU,KsKZ,i,iL,cBU,l,MDbq,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,kXTEP,EWrtg,CqC,i,FL,KnZo,lR,bvl,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,qHqjj,EVHxB,iV,i,nU,HSL,hk,Lz,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uULdp,CuWhI,LDk,i,aW,RV,lR,fweX,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sumJd,,gpyD,i,k,uWTD,lR,qhE,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,fmkRG,zzOQo,CqC,i,oLI,GCL,lR,ss,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,tarOc,rXnhf,ez,D,G,dYPI,lR,iKG,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uOQMn,KbcgU,yhq,i,RI,y,i,vTtH,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xNidU,pziuA,,i,u,SC,T,fx,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,pjCWO,rXnhf,Gac,i,JnB,gI,l,vTLz,5460188840717485774
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,OTTuy,cNLnu,QMl,i,vk,ev,T,DoN,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,uoFdf,TjJiS,VsKz,D,Bu,gI,hk,lTC,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,yeWsz,stxxp,CqC,i,Bu,,hk,lxg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,KiMXv,JpXCs,,i,hcd,YO,T,fx,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,PjNZA,aPLzR,iV,i,mO,gOZx,lR,pnmsT,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,Kndkf,GfRLe,bVnY,D,ZJA,eKfc,lR,boZ,6994898124486825607
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RAHHN,yQnHf,,i,OS,gANm,l,s,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,otiKu,qufhQ,VsKz,i,eG,Cj,lR,qoiL,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,AEGfE,zfzpe,,i,GF,ev,fU,FL,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,YThSn,IHtTr,iV,U,n,Zsbp,hk,Lz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,udjnl,zLfaS,rNcu,D,u,buw,hk,SBsy,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VWHVh,TUtqo,VsKz,i,zj,bnz,lR,rcz,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JFCzp,wKKEM,CqC,i,jgn,HSL,lR,ITMV,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,vjnkq,MWxHT,Vj,i,aW,fX,lR,oFhc,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,RXPPy,AtWKX,LDk,i,iL,Ri,lR,KlEQ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,UsIfM,MeihD,,i,zW,y,lR,TzJAt,4955241829510629137
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VtodW,teKMc,LDk,i,iL,HSL,l,Ld,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,xYgTK,QUpDF,ez,i,RI,buw,lR,NtZN,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,JKFSM,troYa,jb,i,iL,Dnq,l,QGln,8310347835142446717
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,oQIxH,rSjvT,jb,i,iL,HMXY,i,zbXJ,8637957270245933828
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,sydqD,NHNrT,LDk,i,iL,ev,lR,JDK,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SVfNY,SZDsW,jb,i,KWZ,Cj,i,Kg,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,VTGhD,DQYjU,xDLG,i,Kg,YO,lR,BHeC,6240989492723764727
-1840748525967736008,231355578,CezOib,301950577,1524412909,1072889503,L,SXZFT,Aclqz,VsKz,i,Kg,hmKv,hk,ZcH,8637957270245933828
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pom.xml
deleted file mode 100644
index a77ead87dd0..00000000000
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>pinot-batch-ingestion</artifactId>
-    <groupId>org.apache.pinot</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-
-  <artifactId>v0_deprecated</artifactId>
-  <packaging>pom</packaging>
-  <name>Pinot Batch Ingestion</name>
-  <url>https://pinot.apache.org/</url>
-  <properties>
-    <pinot.root>${basedir}/../../..</pinot.root>
-  </properties>
-
-  <modules>
-    <module>pinot-ingestion-common</module>
-    <module>pinot-hadoop</module>
-    <module>pinot-spark</module>
-  </modules>
-
-</project>
diff --git a/pinot-plugins/pinot-file-system/pinot-adls/README.md b/pinot-plugins/pinot-file-system/pinot-adls/README.md
deleted file mode 100644
index 0d5b3c54950..00000000000
--- a/pinot-plugins/pinot-file-system/pinot-adls/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-## ADLS plugin configuration
-
-To run with the ADLS plugin, please download the [azure-identity jar](https://mvnrepository.com/artifact/com.azure/azure-identity/1.2.2) and put add it to the classpath of your Pinot binary.
\ No newline at end of file
diff --git a/pinot-plugins/pinot-file-system/pinot-adls/pom.xml b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
index d1f13552068..0348a643347 100644
--- a/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
@@ -44,37 +44,41 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-file-datalake</artifactId>
-      <version>12.8.0</version>
+      <version>12.16.0</version>
       <exclusions>
         <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-unix-common</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
+          <groupId>com.fasterxml.woodstox</groupId>
+          <artifactId>woodstox-core</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.4.6</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>1.8.1</version>
     </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>stax2-api</artifactId>
-        <version>4.0.0</version>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-core-http-netty</artifactId>
+        <version>1.13.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-core</artifactId>
+        <version>1.37.0</version>
+      </dependency>
+      <dependency>
+        <groupId>io.projectreactor</groupId>
+        <artifactId>reactor-core</artifactId>
+        <version>3.4.27</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.woodstox</groupId>
+        <artifactId>woodstox-core</artifactId>
+        <version>6.4.0</version>
       </dependency>
       <dependency>
         <groupId>net.java.dev.jna</groupId>
@@ -89,12 +93,7 @@
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>msal4j</artifactId>
-        <version>1.8.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.nimbusds</groupId>
-        <artifactId>oauth2-oidc-sdk</artifactId>
-        <version>7.4</version>
+        <version>1.13.5</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java b/pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java
index ceed39af670..15977a0dd15 100644
--- a/pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java
+++ b/pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java
@@ -630,8 +630,22 @@ private boolean copyInputStreamToDst(InputStream inputStream, URI dstUri, byte[]
     int bytesRead;
     long totalBytesRead = 0;
     byte[] buffer = new byte[BUFFER_SIZE];
-    DataLakeFileClient fileClient =
-        _fileSystemClient.createFile(AzurePinotFSUtil.convertUriToUrlEncodedAzureStylePath(dstUri));
+    // TODO: the newer client now has the API 'uploadFromFile' that directly takes the file as an input. We can replace
+    // this upload logic with the 'uploadFromFile'/
+    DataLakeFileClient fileClient;
+    try {
+      fileClient = _fileSystemClient.createFile(AzurePinotFSUtil.convertUriToUrlEncodedAzureStylePath(dstUri));
+    } catch (DataLakeStorageException e) {
+      // If the path already exists, doing nothing and return true
+      if (e.getStatusCode() == ALREADY_EXISTS_STATUS_CODE && e.getErrorCode().equals(PATH_ALREADY_EXISTS_ERROR_CODE)) {
+        LOGGER.info("The destination path already exists and we are overwriting the file (dstUri={})", dstUri);
+        fileClient = _fileSystemClient.createFile(AzurePinotFSUtil.convertUriToUrlEncodedAzureStylePath(dstUri), true);
+      } else {
+        LOGGER.error("Exception thrown while calling copy stream to destination (dstUri={}, errorStatus ={})", dstUri,
+            e.getStatusCode(), e);
+        throw new IOException(e);
+      }
+    }
 
     // Update MD5 metadata
     if (contentMd5 != null) {
@@ -657,7 +671,7 @@ private boolean copyInputStreamToDst(InputStream inputStream, URI dstUri, byte[]
         totalBytesRead += bytesRead;
       }
       // Call flush on ADLS Gen 2
-      fileClient.flush(totalBytesRead);
+      fileClient.flush(totalBytesRead, true);
 
       return true;
     } catch (DataLakeStorageException | NoSuchAlgorithmException e) {
diff --git a/pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/plugin/filesystem/test/ADLSGen2PinotFSTest.java b/pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/plugin/filesystem/test/ADLSGen2PinotFSTest.java
index 71208d69c96..a191162a0ad 100644
--- a/pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/plugin/filesystem/test/ADLSGen2PinotFSTest.java
+++ b/pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/plugin/filesystem/test/ADLSGen2PinotFSTest.java
@@ -232,7 +232,7 @@ public void testLastModified()
     when(_mockFileSystemClient.getDirectoryClient(any())).thenReturn(_mockDirectoryClient);
     when(_mockDirectoryClient.getProperties()).thenReturn(_mockPathProperties);
     Instant now = Instant.now();
-    OffsetDateTime mtime = Instant.now().atOffset(ZoneOffset.UTC);
+    OffsetDateTime mtime = now.atOffset(ZoneOffset.UTC);
     when(_mockPathProperties.getLastModified()).thenReturn(mtime);
 
     long actual = _adlsGen2PinotFsUnderTest.lastModified(_mockURI);
diff --git a/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
index d439f40306e..88a5abdcda4 100644
--- a/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
@@ -56,6 +56,10 @@
           <groupId>com.google.protobuf</groupId>
           <artifactId>protobuf-java</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.j2objc</groupId>
+          <artifactId>j2objc-annotations</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -71,6 +75,12 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
       <version>1.36.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.j2objc</groupId>
+          <artifactId>j2objc-annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- Due to dependency convergence issues with google cloud storage: https://github.com/googleapis/google-cloud-java/issues/4175 -->
     <dependency>
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/pom.xml b/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
index be464d99601..2a2d941e250 100644
--- a/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
@@ -35,26 +35,13 @@
   <url>https://pinot.apache.org</url>
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
-    <aws.sdk.version>2.14.28</aws.sdk.version>
     <http.client.version>4.5.13</http.client.version>
     <http.core.version>4.4.13</http.core.version>
-    <s3mock.version>2.1.19</s3mock.version>
+    <s3mock.version>2.12.2</s3mock.version>
     <javax.version>3.1.0</javax.version>
     <phase.prop>package</phase.prop>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>bom</artifactId>
-        <version>${aws.sdk.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>commons-configuration</groupId>
@@ -68,28 +55,11 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>s3</artifactId>
-      <version>${aws.sdk.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-to-slf4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-buffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-common</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpcore</artifactId>
@@ -104,28 +74,11 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sts</artifactId>
-      <version>${aws.sdk.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-to-slf4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-buffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-common</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpcore</artifactId>
@@ -136,6 +89,10 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>apache-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -178,27 +135,9 @@
     </dependency>
     <dependency>
       <groupId>com.adobe.testing</groupId>
-      <artifactId>s3mock-testng</artifactId>
+      <artifactId>s3mock-testcontainers</artifactId>
       <version>${s3mock.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-to-slf4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3Config.java b/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3Config.java
index b9b6c1ca352..3870485f03f 100644
--- a/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3Config.java
+++ b/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3Config.java
@@ -18,18 +18,30 @@
  */
 package org.apache.pinot.plugin.filesystem;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
+import java.time.Duration;
 import java.util.UUID;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.DataSizeUtils;
+import org.apache.pinot.spi.utils.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
 
 
 /**
  * S3 related config
  */
 public class S3Config {
+  private static final Logger LOGGER = LoggerFactory.getLogger(S3Config.class);
 
   private static final boolean DEFAULT_DISABLE_ACL = true;
+  // From https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html, the part number must be an integer
+  // between 1 and 10000, inclusive; and the min part size allowed is 5MiB, except the last one.
+  private static final long MULTI_PART_UPLOAD_MIN_PART_SIZE = 5 * 1024 * 1024;
+  public static final int MULTI_PART_UPLOAD_MAX_PART_NUM = 10000;
 
   public static final String ACCESS_KEY = "accessKey";
   public static final String SECRET_KEY = "secretKey";
@@ -49,10 +61,18 @@ public class S3Config {
   public static final String EXTERNAL_ID = "externalId";
   public static final String SESSION_DURATION_SECONDS = "sessionDurationSeconds";
   public static final String ASYNC_SESSION_UPDATED_ENABLED = "asyncSessionUpdateEnabled";
+  public static final String MIN_OBJECT_SIZE_FOR_MULTI_PART_UPLOAD = "minObjectSizeForMultiPartUpload";
+  public static final String MULTI_PART_UPLOAD_PART_SIZE = "multiPartUploadPartSize";
+  private static final String DEFAULT_MULTI_PART_UPLOAD_PART_SIZE = "128MB";
   public static final String DEFAULT_IAM_ROLE_BASED_ACCESS_ENABLED = "false";
   public static final String DEFAULT_SESSION_DURATION_SECONDS = "900";
   public static final String DEFAULT_ASYNC_SESSION_UPDATED_ENABLED = "true";
-
+  public static final String HTTP_CLIENT_CONFIG_PREFIX = "httpclient";
+  public static final String HTTP_CLIENT_CONFIG_MAX_CONNECTIONS = "maxConnections";
+  private static final String HTTP_CLIENT_CONFIG_SOCKET_TIMEOUT = "socketTimeout";
+  private static final String HTTP_CLIENT_CONFIG_CONNECTION_TIMEOUT = "connectionTimeout";
+  private static final String HTTP_CLIENT_CONFIG_CONNECTION_TIME_TO_LIVE = "connectionTimeToLive";
+  private static final String HTTP_CLIENT_CONFIG_CONNECTION_ACQUISITION_TIMEOUT = "connectionAcquisitionTimeout";
   private final String _accessKey;
   private final String _secretKey;
   private final String _region;
@@ -69,6 +89,9 @@ public class S3Config {
   private String _externalId;
   private int _sessionDurationSeconds;
   private boolean _asyncSessionUpdateEnabled;
+  private final long _minObjectSizeForMultiPartUpload;
+  private final long _multiPartUploadPartSize;
+  private final ApacheHttpClient.Builder _httpClientBuilder;
 
   public S3Config(PinotConfiguration pinotConfig) {
     _disableAcl = pinotConfig.getProperty(DISABLE_ACL_CONFIG_KEY, DEFAULT_DISABLE_ACL);
@@ -91,10 +114,70 @@ public S3Config(PinotConfiguration pinotConfig) {
         Integer.parseInt(pinotConfig.getProperty(SESSION_DURATION_SECONDS, DEFAULT_SESSION_DURATION_SECONDS));
     _asyncSessionUpdateEnabled = Boolean.parseBoolean(
         pinotConfig.getProperty(ASYNC_SESSION_UPDATED_ENABLED, DEFAULT_ASYNC_SESSION_UPDATED_ENABLED));
-
+    // Objects uploaded via putObject are limited at 5G. Setting this to 5G by default, so that smaller objects
+    // continue to be uploaded by putObject methods just as before, while the larger ones are uploaded in multi parts.
+    _minObjectSizeForMultiPartUpload =
+        DataSizeUtils.toBytes(pinotConfig.getProperty(MIN_OBJECT_SIZE_FOR_MULTI_PART_UPLOAD, "5G"));
+    _multiPartUploadPartSize = DataSizeUtils.toBytes(
+        pinotConfig.getProperty(MULTI_PART_UPLOAD_PART_SIZE, DEFAULT_MULTI_PART_UPLOAD_PART_SIZE));
+    Preconditions.checkArgument(_multiPartUploadPartSize > MULTI_PART_UPLOAD_MIN_PART_SIZE,
+        "The part size for multipart upload must be larger than 5MB");
     if (_iamRoleBasedAccess) {
       Preconditions.checkNotNull(_roleArn, "Must provide 'roleArn' if iamRoleBasedAccess is enabled");
     }
+    PinotConfiguration httpConfig = pinotConfig.subset(HTTP_CLIENT_CONFIG_PREFIX);
+    _httpClientBuilder = httpConfig.isEmpty() ? null : createHttpClientBuilder(httpConfig);
+  }
+
+  private static ApacheHttpClient.Builder createHttpClientBuilder(PinotConfiguration config) {
+    ApacheHttpClient.Builder httpClientBuilder = ApacheHttpClient.builder();
+    String value = config.getProperty(HTTP_CLIENT_CONFIG_MAX_CONNECTIONS);
+    if (value != null) {
+      int pv = Integer.parseInt(value);
+      LOGGER.debug("Set maxConnections to {} for http client builder", pv);
+      httpClientBuilder.maxConnections(pv);
+    }
+    value = config.getProperty(HTTP_CLIENT_CONFIG_SOCKET_TIMEOUT);
+    if (value != null) {
+      Duration pv = parseDuration(value);
+      httpClientBuilder.socketTimeout(pv);
+      LOGGER.debug("Set socketTimeout to {}ms for http client builder", pv.toMillis());
+    }
+    value = config.getProperty(HTTP_CLIENT_CONFIG_CONNECTION_TIMEOUT);
+    if (value != null) {
+      Duration pv = parseDuration(value);
+      httpClientBuilder.connectionTimeout(pv);
+      LOGGER.debug("Set connectionTimeout to {}ms for http client builder", pv.toMillis());
+    }
+    value = config.getProperty(HTTP_CLIENT_CONFIG_CONNECTION_TIME_TO_LIVE);
+    if (value != null) {
+      Duration pv = parseDuration(value);
+      httpClientBuilder.connectionTimeToLive(pv);
+      LOGGER.debug("Set connectionTimeToLive to {}ms for http client builder", pv.toMillis());
+    }
+    value = config.getProperty(HTTP_CLIENT_CONFIG_CONNECTION_ACQUISITION_TIMEOUT);
+    if (value != null) {
+      Duration pv = parseDuration(value);
+      httpClientBuilder.connectionAcquisitionTimeout(pv);
+      LOGGER.debug("Set connectionAcquisitionTimeout to {}ms for http client builder", pv.toMillis());
+    }
+    return httpClientBuilder;
+  }
+
+  @VisibleForTesting
+  static Duration parseDuration(String durStr) {
+    try {
+      // try format like '1hr20s'
+      return Duration.ofMillis(TimeUtils.convertPeriodToMillis(durStr));
+    } catch (Exception ignore) {
+    }
+    try {
+      // try format like 'PT1H20S'
+      return Duration.parse(durStr);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          String.format("Invalid time duration '%s', for examples '1hr20s' or 'PT1H20S'", durStr), e);
+    }
   }
 
   public String getAccessKey() {
@@ -152,4 +235,16 @@ public int getSessionDurationSeconds() {
   public boolean isAsyncSessionUpdateEnabled() {
     return _asyncSessionUpdateEnabled;
   }
+
+  public long getMinObjectSizeForMultiPartUpload() {
+    return _minObjectSizeForMultiPartUpload;
+  }
+
+  public long getMultiPartUploadPartSize() {
+    return _multiPartUploadPartSize;
+  }
+
+  public ApacheHttpClient.Builder getHttpClientBuilder() {
+    return _httpClientBuilder;
+  }
 }
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3PinotFS.java b/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3PinotFS.java
index ca2a938ef0f..04c4df2ea98 100644
--- a/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3PinotFS.java
+++ b/pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3PinotFS.java
@@ -18,10 +18,12 @@
  */
 package org.apache.pinot.plugin.filesystem;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -31,6 +33,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -52,8 +55,14 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
+import software.amazon.awssdk.services.s3.model.CompletedPart;
 import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
 import software.amazon.awssdk.services.s3.model.CopyObjectResponse;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
 import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
 import software.amazon.awssdk.services.s3.model.DeleteObjectResponse;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
@@ -69,6 +78,8 @@
 import software.amazon.awssdk.services.s3.model.S3Exception;
 import software.amazon.awssdk.services.s3.model.S3Object;
 import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
 import software.amazon.awssdk.services.sts.StsClient;
 import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
 import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
@@ -87,6 +98,8 @@ public class S3PinotFS extends BasePinotFS {
   private ServerSideEncryption _serverSideEncryption = null;
   private String _ssekmsKeyId;
   private String _ssekmsEncryptionContext;
+  private long _minObjectSizeToUploadInParts;
+  private long _multiPartUploadPartSize;
 
   @Override
   public void init(PinotConfiguration config) {
@@ -134,7 +147,11 @@ public void init(PinotConfiguration config) {
           throw new RuntimeException(e);
         }
       }
+      if (s3Config.getHttpClientBuilder() != null) {
+        s3ClientBuilder.httpClientBuilder(s3Config.getHttpClientBuilder());
+      }
       _s3Client = s3ClientBuilder.build();
+      setMultiPartUploadConfigs(s3Config);
     } catch (S3Exception e) {
       throw new RuntimeException("Could not initialize S3PinotFS", e);
     }
@@ -147,6 +164,7 @@ public void init(PinotConfiguration config) {
    */
   public void init(S3Client s3Client) {
     _s3Client = s3Client;
+    setMultiPartUploadConfigs(-1, -1);
   }
 
   /**
@@ -157,7 +175,10 @@ public void init(S3Client s3Client) {
    */
   public void init(S3Client s3Client, String serverSideEncryption, PinotConfiguration serverSideEncryptionConfig) {
     _s3Client = s3Client;
-    setServerSideEncryption(serverSideEncryption, new S3Config(serverSideEncryptionConfig));
+    S3Config s3Config = new S3Config(serverSideEncryptionConfig);
+    setServerSideEncryption(serverSideEncryption, s3Config);
+    setMultiPartUploadConfigs(s3Config);
+    setDisableAcl(s3Config);
   }
 
   private void setServerSideEncryption(@Nullable String serverSideEncryption, S3Config s3Config) {
@@ -551,11 +572,76 @@ public void copyToLocalFile(URI srcUri, File dstFile)
   @Override
   public void copyFromLocalFile(File srcFile, URI dstUri)
       throws Exception {
-    LOGGER.info("Copy {} from local to {}", srcFile.getAbsolutePath(), dstUri);
-    URI base = getBase(dstUri);
-    String prefix = sanitizePath(base.relativize(dstUri).getPath());
-    PutObjectRequest putObjectRequest = generatePutObjectRequest(dstUri, prefix);
-    _s3Client.putObject(putObjectRequest, srcFile.toPath());
+    if (_minObjectSizeToUploadInParts > 0 && srcFile.length() > _minObjectSizeToUploadInParts) {
+      LOGGER.info("Copy {} from local to {} in parts", srcFile.getAbsolutePath(), dstUri);
+      uploadFileInParts(srcFile, dstUri);
+    } else {
+      LOGGER.info("Copy {} from local to {}", srcFile.getAbsolutePath(), dstUri);
+      String prefix = sanitizePath(getBase(dstUri).relativize(dstUri).getPath());
+      PutObjectRequest putObjectRequest = generatePutObjectRequest(dstUri, prefix);
+      _s3Client.putObject(putObjectRequest, srcFile.toPath());
+    }
+  }
+
+  private void uploadFileInParts(File srcFile, URI dstUri)
+      throws Exception {
+    String bucket = dstUri.getHost();
+    String prefix = sanitizePath(getBase(dstUri).relativize(dstUri).getPath());
+    CreateMultipartUploadResponse multipartUpload =
+        _s3Client.createMultipartUpload(CreateMultipartUploadRequest.builder().bucket(bucket).key(prefix).build());
+    String uploadId = multipartUpload.uploadId();
+    // Upload parts sequentially to overcome the 5GB limit of a single PutObject call.
+    // TODO: parts can be uploaded in parallel for higher throughput, given a thread pool.
+    try (FileInputStream inputStream = FileUtils.openInputStream(srcFile)) {
+      long totalUploaded = 0;
+      long fileSize = srcFile.length();
+      // The part number must start from 1 and no more than the max part num allowed, 10000 by default.
+      // The default configs can upload a single file of 1TB, so the if-branch should rarely happen.
+      int partNum = 1;
+      long partSizeToUse = _multiPartUploadPartSize;
+      if (partSizeToUse * S3Config.MULTI_PART_UPLOAD_MAX_PART_NUM < fileSize) {
+        partSizeToUse =
+            (fileSize + S3Config.MULTI_PART_UPLOAD_MAX_PART_NUM - 1) / S3Config.MULTI_PART_UPLOAD_MAX_PART_NUM;
+        LOGGER.info("Increased part size from {} to {} for large file size {} due to max allowed uploads {}",
+            _multiPartUploadPartSize, partSizeToUse, fileSize, S3Config.MULTI_PART_UPLOAD_MAX_PART_NUM);
+      }
+      List<CompletedPart> parts = new ArrayList<>();
+      while (totalUploaded < srcFile.length()) {
+        long nextPartSize = Math.min(partSizeToUse, fileSize - totalUploaded);
+        UploadPartResponse uploadPartResponse = _s3Client.uploadPart(
+            UploadPartRequest.builder().bucket(bucket).key(prefix).uploadId(uploadId).partNumber(partNum).build(),
+            RequestBody.fromInputStream(inputStream, nextPartSize));
+        parts.add(CompletedPart.builder().partNumber(partNum).eTag(uploadPartResponse.eTag()).build());
+        totalUploaded += nextPartSize;
+        LOGGER.debug("Uploaded part {} of size {}, with total uploaded {} and file size {}", partNum, nextPartSize,
+            totalUploaded, fileSize);
+        // set counters to upload the next part.
+        partNum++;
+      }
+      // complete the multipart upload
+      _s3Client.completeMultipartUpload(
+          CompleteMultipartUploadRequest.builder().uploadId(uploadId).bucket(bucket).key(prefix)
+              .multipartUpload(CompletedMultipartUpload.builder().parts(parts).build()).build());
+    } catch (Exception e) {
+      LOGGER.error("Failed to upload file {} to {} in parts. Abort upload request: {}", srcFile, dstUri, uploadId, e);
+      _s3Client.abortMultipartUpload(
+          AbortMultipartUploadRequest.builder().uploadId(uploadId).bucket(bucket).key(prefix).build());
+      throw e;
+    }
+  }
+
+  private void setMultiPartUploadConfigs(S3Config s3Config) {
+    setMultiPartUploadConfigs(s3Config.getMinObjectSizeForMultiPartUpload(), s3Config.getMultiPartUploadPartSize());
+  }
+
+  private void setDisableAcl(S3Config s3Config) {
+    _disableAcl = s3Config.getDisableAcl();
+  }
+
+  @VisibleForTesting
+  void setMultiPartUploadConfigs(long minObjectSizeToUploadInParts, long multiPartUploadPartSize) {
+    _minObjectSizeToUploadInParts = minObjectSizeToUploadInParts;
+    _multiPartUploadPartSize = multiPartUploadPartSize;
   }
 
   @Override
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3ConfigTest.java b/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3ConfigTest.java
new file mode 100644
index 00000000000..2df60baa9f6
--- /dev/null
+++ b/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3ConfigTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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.pinot.plugin.filesystem;
+
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class S3ConfigTest {
+  @Test
+  public void testGetHttpClientBuilder() {
+    PinotConfiguration pinotConfig = new PinotConfiguration();
+    S3Config cfg = new S3Config(pinotConfig);
+    Assert.assertNull(cfg.getHttpClientBuilder());
+
+    pinotConfig.setProperty("httpclient.maxConnections", 100);
+    pinotConfig.setProperty("httpclient.socketTimeout", "PT1M10S");
+    pinotConfig.setProperty("httpclient.connectionTimeout", "PT2M20S");
+    pinotConfig.setProperty("httpclient.connectionTimeToLive", "3m30s");
+    pinotConfig.setProperty("httpclient.connectionAcquisitionTimeout", "4m40s");
+    cfg = new S3Config(pinotConfig);
+    Assert.assertNotNull(cfg.getHttpClientBuilder());
+  }
+
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  public void testParseDuration() {
+    Assert.assertEquals(S3Config.parseDuration("P1DT2H30S"), S3Config.parseDuration("1d2h30s"));
+    S3Config.parseDuration("10");
+  }
+}
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3PinotFSTest.java b/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3PinotFSTest.java
index b877c29e919..339155643ae 100644
--- a/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3PinotFSTest.java
+++ b/pinot-plugins/pinot-file-system/pinot-s3/src/test/java/org/apache/pinot/plugin/filesystem/S3PinotFSTest.java
@@ -18,8 +18,10 @@
  */
 package org.apache.pinot.plugin.filesystem;
 
-import com.adobe.testing.s3mock.testng.S3Mock;
+import com.adobe.testing.s3mock.testcontainers.S3MockContainer;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -28,15 +30,19 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.pinot.spi.filesystem.FileMetadata;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3Configuration;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
@@ -44,21 +50,25 @@
 
 
 @Test
-@Listeners(com.adobe.testing.s3mock.testng.S3MockListener.class)
 public class S3PinotFSTest {
+  private static final String S3MOCK_VERSION = System.getProperty("s3mock.version", "2.12.2");
+  private static final File TEMP_FILE = new File(FileUtils.getTempDirectory(), "S3PinotFSTest");
   private static final String DELIMITER = "/";
   private static final String BUCKET = "test-bucket";
   private static final String SCHEME = "s3";
   private static final String FILE_FORMAT = "%s://%s/%s";
   private static final String DIR_FORMAT = "%s://%s";
 
+  private S3MockContainer _s3MockContainer;
   private S3PinotFS _s3PinotFS;
   private S3Client _s3Client;
 
   @BeforeClass
   public void setUp() {
-    S3Mock s3Mock = S3Mock.getInstance();
-    _s3Client = s3Mock.createS3ClientV2();
+    _s3MockContainer = new S3MockContainer(S3MOCK_VERSION);
+    _s3MockContainer.start();
+    String endpoint = _s3MockContainer.getHttpEndpoint();
+    _s3Client = createS3ClientV2(endpoint);
     _s3PinotFS = new S3PinotFS();
     _s3PinotFS.init(_s3Client);
     _s3Client.createBucket(CreateBucketRequest.builder().bucket(BUCKET).build());
@@ -69,12 +79,14 @@ public void tearDown()
       throws IOException {
     _s3PinotFS.close();
     _s3Client.close();
+    _s3MockContainer.stop();
+    FileUtils.deleteQuietly(TEMP_FILE);
   }
 
   private void createEmptyFile(String folderName, String fileName) {
-    String fileNameWithFolder = folderName + DELIMITER + fileName;
-    _s3Client
-        .putObject(S3TestUtils.getPutObjectRequest(BUCKET, fileNameWithFolder), RequestBody.fromBytes(new byte[0]));
+    String fileNameWithFolder = folderName.length() == 0 ? fileName : folderName + DELIMITER + fileName;
+    _s3Client.putObject(S3TestUtils.getPutObjectRequest(BUCKET, fileNameWithFolder),
+        RequestBody.fromBytes(new byte[0]));
   }
 
   @Test
@@ -249,7 +261,7 @@ public void testDeleteFile()
     ListObjectsV2Response listObjectsV2Response =
         _s3Client.listObjectsV2(S3TestUtils.getListObjectRequest(BUCKET, "", true));
     String[] actualResponse =
-        listObjectsV2Response.contents().stream().map(x -> x.key().substring(1)).filter(x -> x.contains("delete"))
+        listObjectsV2Response.contents().stream().map(S3Object::key).filter(x -> x.contains("delete"))
             .toArray(String[]::new);
 
     Assert.assertEquals(actualResponse.length, 2);
@@ -290,8 +302,8 @@ public void testIsDirectory()
 
     boolean isBucketDir = _s3PinotFS.isDirectory(URI.create(String.format(DIR_FORMAT, SCHEME, BUCKET)));
     boolean isDir = _s3PinotFS.isDirectory(URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, folder)));
-    boolean isDirChild = _s3PinotFS
-        .isDirectory(URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, folder + DELIMITER + childFolder)));
+    boolean isDirChild = _s3PinotFS.isDirectory(
+        URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, folder + DELIMITER + childFolder)));
     boolean notIsDir = _s3PinotFS.isDirectory(URI.create(
         String.format(FILE_FORMAT, SCHEME, BUCKET, folder + DELIMITER + childFolder + DELIMITER + "a-delete.txt")));
 
@@ -333,20 +345,46 @@ public void testExists()
   public void testCopyFromAndToLocal()
       throws Exception {
     String fileName = "copyFile.txt";
+    File fileToCopy = new File(TEMP_FILE, fileName);
+    File fileToDownload = new File(TEMP_FILE, "copyFile_download.txt").getAbsoluteFile();
+    try {
+      createDummyFile(fileToCopy, 1024);
+      _s3PinotFS.copyFromLocalFile(fileToCopy, URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, fileName)));
+      HeadObjectResponse headObjectResponse = _s3Client.headObject(S3TestUtils.getHeadObjectRequest(BUCKET, fileName));
+      Assert.assertEquals(headObjectResponse.contentLength(), (Long) fileToCopy.length());
+      _s3PinotFS.copyToLocalFile(URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, fileName)), fileToDownload);
+      Assert.assertEquals(fileToCopy.length(), fileToDownload.length());
+    } finally {
+      FileUtils.deleteQuietly(fileToCopy);
+      FileUtils.deleteQuietly(fileToDownload);
+    }
+  }
 
-    File fileToCopy = new File(getClass().getClassLoader().getResource(fileName).getFile());
-
-    _s3PinotFS.copyFromLocalFile(fileToCopy, URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, fileName)));
-
-    HeadObjectResponse headObjectResponse = _s3Client.headObject(S3TestUtils.getHeadObjectRequest(BUCKET, fileName));
-
-    Assert.assertEquals(headObjectResponse.contentLength(), (Long) fileToCopy.length());
-
-    File fileToDownload = new File("copyFile_download.txt").getAbsoluteFile();
-    _s3PinotFS.copyToLocalFile(URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, fileName)), fileToDownload);
-    Assert.assertEquals(fileToCopy.length(), fileToDownload.length());
-
-    fileToDownload.deleteOnExit();
+  @Test
+  public void testMultiPartUpload()
+      throws Exception {
+    String fileName = "copyFile_for_multipart.txt";
+    File fileToCopy = new File(TEMP_FILE, fileName);
+    File fileToDownload = new File(TEMP_FILE, "copyFile_download_multipart.txt").getAbsoluteFile();
+    try {
+      // Make a file of 11MB to upload in parts, whose min required size is 5MB.
+      createDummyFile(fileToCopy, 11 * 1024 * 1024);
+      System.out.println("fileToCopy.length:" + fileToCopy.length());
+      _s3PinotFS.setMultiPartUploadConfigs(1, 5 * 1024 * 1024);
+      try {
+        _s3PinotFS.copyFromLocalFile(fileToCopy, URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, fileName)));
+      } finally {
+        // disable multipart upload again for the other UT cases.
+        _s3PinotFS.setMultiPartUploadConfigs(-1, 128 * 1024 * 1024);
+      }
+      HeadObjectResponse headObjectResponse = _s3Client.headObject(S3TestUtils.getHeadObjectRequest(BUCKET, fileName));
+      Assert.assertEquals(headObjectResponse.contentLength(), (Long) fileToCopy.length());
+      _s3PinotFS.copyToLocalFile(URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, fileName)), fileToDownload);
+      Assert.assertEquals(fileToCopy.length(), fileToDownload.length());
+    } finally {
+      FileUtils.deleteQuietly(fileToCopy);
+      FileUtils.deleteQuietly(fileToDownload);
+    }
   }
 
   @Test
@@ -369,7 +407,26 @@ public void testMkdir()
 
     _s3PinotFS.mkdir(URI.create(String.format(FILE_FORMAT, SCHEME, BUCKET, folderName)));
 
-    HeadObjectResponse headObjectResponse = _s3Client.headObject(S3TestUtils.getHeadObjectRequest(BUCKET, folderName));
+    HeadObjectResponse headObjectResponse =
+        _s3Client.headObject(S3TestUtils.getHeadObjectRequest(BUCKET, folderName + "/"));
     Assert.assertTrue(headObjectResponse.sdkHttpResponse().isSuccessful());
   }
+
+  private static void createDummyFile(File file, int size)
+      throws IOException {
+    FileUtils.deleteQuietly(file);
+    FileUtils.touch(file);
+    try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file))) {
+      for (int i = 0; i < size; i++) {
+        out.write((byte) i);
+      }
+    }
+  }
+
+  private static S3Client createS3ClientV2(String endpoint) {
+    return S3Client.builder().region(Region.of("us-east-1"))
+        .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("foo", "bar")))
+        .serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build())
+        .endpointOverride(URI.create(endpoint)).build();
+  }
 }
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/src/test/resources/copyFile.txt b/pinot-plugins/pinot-file-system/pinot-s3/src/test/resources/copyFile.txt
deleted file mode 100644
index 0b669b66eda..00000000000
--- a/pinot-plugins/pinot-file-system/pinot-s3/src/test/resources/copyFile.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
\ No newline at end of file
diff --git a/pinot-plugins/pinot-input-format/pinot-avro-base/src/main/java/org/apache/pinot/plugin/inputformat/avro/AvroIngestionSchemaValidator.java b/pinot-plugins/pinot-input-format/pinot-avro-base/src/main/java/org/apache/pinot/plugin/inputformat/avro/AvroIngestionSchemaValidator.java
index c9c8a6c6f03..1ec33656460 100644
--- a/pinot-plugins/pinot-input-format/pinot-avro-base/src/main/java/org/apache/pinot/plugin/inputformat/avro/AvroIngestionSchemaValidator.java
+++ b/pinot-plugins/pinot-input-format/pinot-avro-base/src/main/java/org/apache/pinot/plugin/inputformat/avro/AvroIngestionSchemaValidator.java
@@ -88,8 +88,11 @@ private org.apache.avro.Schema extractAvroSchemaFromFile(String inputPath) {
   }
 
   private void validateSchemas() {
-    for (String columnName : _pinotSchema.getPhysicalColumnNames()) {
-      FieldSpec fieldSpec = _pinotSchema.getFieldSpecFor(columnName);
+    for (FieldSpec fieldSpec : _pinotSchema.getAllFieldSpecs()) {
+      if (fieldSpec.isVirtualColumn()) {
+        continue;
+      }
+      String columnName = fieldSpec.getName();
       org.apache.avro.Schema.Field avroColumnField = _avroSchema.getField(columnName);
       if (avroColumnField == null) {
         _missingPinotColumn.addMismatchReason(String
diff --git a/pinot-plugins/pinot-input-format/pinot-clp-log/pom.xml b/pinot-plugins/pinot-input-format/pinot-clp-log/pom.xml
index f4b63f9bab9..afbd7f19528 100644
--- a/pinot-plugins/pinot-input-format/pinot-clp-log/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-clp-log/pom.xml
@@ -41,7 +41,10 @@
     <dependency>
       <groupId>com.yscope.clp</groupId>
       <artifactId>clp-ffi</artifactId>
-      <version>0.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-common</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/pinot-plugins/pinot-input-format/pinot-clp-log/src/main/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractor.java b/pinot-plugins/pinot-input-format/pinot-clp-log/src/main/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractor.java
index 3781aa0cdde..19cc24b9a5a 100644
--- a/pinot-plugins/pinot-input-format/pinot-clp-log/src/main/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractor.java
+++ b/pinot-plugins/pinot-input-format/pinot-clp-log/src/main/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractor.java
@@ -30,6 +30,7 @@
 import org.apache.pinot.spi.data.readers.BaseRecordExtractor;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordExtractorConfig;
+import org.apache.pinot.sql.parsers.rewriter.CLPDecodeRewriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,10 +63,6 @@
  * This class' implementation is based on {@link org.apache.pinot.plugin.inputformat.json.JSONRecordExtractor}.
  */
 public class CLPLogRecordExtractor extends BaseRecordExtractor<Map<String, Object>> {
-  public static final String LOGTYPE_COLUMN_SUFFIX = "_logtype";
-  public static final String DICTIONARY_VARS_COLUMN_SUFFIX = "_dictionaryVars";
-  public static final String ENCODED_VARS_COLUMN_SUFFIX = "_encodedVars";
-
   private static final Logger LOGGER = LoggerFactory.getLogger(CLPLogRecordExtractor.class);
 
   private Set<String> _fields;
@@ -162,8 +159,8 @@ private void encodeFieldWithClp(String key, Object value, GenericRow to) {
       }
     }
 
-    to.putValue(key + LOGTYPE_COLUMN_SUFFIX, logtype);
-    to.putValue(key + DICTIONARY_VARS_COLUMN_SUFFIX, dictVars);
-    to.putValue(key + ENCODED_VARS_COLUMN_SUFFIX, encodedVars);
+    to.putValue(key + CLPDecodeRewriter.LOGTYPE_COLUMN_SUFFIX, logtype);
+    to.putValue(key + CLPDecodeRewriter.DICTIONARY_VARS_COLUMN_SUFFIX, dictVars);
+    to.putValue(key + CLPDecodeRewriter.ENCODED_VARS_COLUMN_SUFFIX, encodedVars);
   }
 }
diff --git a/pinot-plugins/pinot-input-format/pinot-clp-log/src/test/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractorTest.java b/pinot-plugins/pinot-input-format/pinot-clp-log/src/test/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractorTest.java
index e3c3042066a..5008b5af432 100644
--- a/pinot-plugins/pinot-input-format/pinot-clp-log/src/test/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractorTest.java
+++ b/pinot-plugins/pinot-input-format/pinot-clp-log/src/test/java/org/apache/pinot/plugin/inputformat/clplog/CLPLogRecordExtractorTest.java
@@ -27,11 +27,9 @@
 import java.util.Map;
 import java.util.Set;
 import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.sql.parsers.rewriter.CLPDecodeRewriter;
 import org.testng.annotations.Test;
 
-import static org.apache.pinot.plugin.inputformat.clplog.CLPLogRecordExtractor.DICTIONARY_VARS_COLUMN_SUFFIX;
-import static org.apache.pinot.plugin.inputformat.clplog.CLPLogRecordExtractor.ENCODED_VARS_COLUMN_SUFFIX;
-import static org.apache.pinot.plugin.inputformat.clplog.CLPLogRecordExtractor.LOGTYPE_COLUMN_SUFFIX;
 import static org.apache.pinot.plugin.inputformat.clplog.CLPLogRecordExtractorConfig.FIELDS_FOR_CLP_ENCODING_CONFIG_KEY;
 import static org.apache.pinot.plugin.inputformat.clplog.CLPLogRecordExtractorConfig.FIELDS_FOR_CLP_ENCODING_SEPARATOR;
 import static org.testng.Assert.assertEquals;
@@ -138,9 +136,9 @@ public void testEmptyCLPEncodingConfig() {
   }
 
   private void addCLPEncodedField(String fieldName, Set<String> fields) {
-    fields.add(fieldName + LOGTYPE_COLUMN_SUFFIX);
-    fields.add(fieldName + DICTIONARY_VARS_COLUMN_SUFFIX);
-    fields.add(fieldName + ENCODED_VARS_COLUMN_SUFFIX);
+    fields.add(fieldName + CLPDecodeRewriter.LOGTYPE_COLUMN_SUFFIX);
+    fields.add(fieldName + CLPDecodeRewriter.DICTIONARY_VARS_COLUMN_SUFFIX);
+    fields.add(fieldName + CLPDecodeRewriter.ENCODED_VARS_COLUMN_SUFFIX);
   }
 
   private GenericRow extract(Map<String, String> props, Set<String> fieldsToRead) {
@@ -165,12 +163,12 @@ private void validateClpEncodedField(GenericRow row, String fieldName, String ex
     try {
       // Decode and validate field
       assertNull(row.getValue(fieldName));
-      String logtype = (String) row.getValue(fieldName + LOGTYPE_COLUMN_SUFFIX);
+      String logtype = (String) row.getValue(fieldName + CLPDecodeRewriter.LOGTYPE_COLUMN_SUFFIX);
       assertNotEquals(logtype, null);
       String[] dictionaryVars =
-          (String[]) row.getValue(fieldName + DICTIONARY_VARS_COLUMN_SUFFIX);
+          (String[]) row.getValue(fieldName + CLPDecodeRewriter.DICTIONARY_VARS_COLUMN_SUFFIX);
       assertNotEquals(dictionaryVars, null);
-      Long[] encodedVars = (Long[]) row.getValue(fieldName + ENCODED_VARS_COLUMN_SUFFIX);
+      Long[] encodedVars = (Long[]) row.getValue(fieldName + CLPDecodeRewriter.ENCODED_VARS_COLUMN_SUFFIX);
       assertNotEquals(encodedVars, null);
       long[] encodedVarsAsPrimitives = Arrays.stream(encodedVars).mapToLong(Long::longValue).toArray();
 
diff --git a/pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReader.java b/pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReader.java
index 92cd8b9f55c..400125067f8 100644
--- a/pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReader.java
+++ b/pinot-plugins/pinot-input-format/pinot-csv/src/main/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReader.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.commons.csv.CSVFormat;
@@ -150,6 +151,19 @@ private void init()
     _iterator = _parser.iterator();
   }
 
+  /**
+   * Returns a copy of the header map that iterates in column order.
+   * <p>
+   * The map keys are column names. The map values are 0-based indices.
+   * </p>
+   * @return a copy of the header map that iterates in column order.
+   */
+  public Map<String, Integer> getCSVHeaderMap() {
+    // if header row is not configured and input file doesn't contain a valid header record, the returned map would
+    // contain values from the first row in the input file.
+    return _parser.getHeaderMap();
+  }
+
   @Override
   public boolean hasNext() {
     return _iterator.hasNext();
diff --git a/pinot-plugins/pinot-input-format/pinot-csv/src/test/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReaderTest.java b/pinot-plugins/pinot-input-format/pinot-csv/src/test/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReaderTest.java
index 0bbbcef26c1..14542bc4964 100644
--- a/pinot-plugins/pinot-input-format/pinot-csv/src/test/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReaderTest.java
+++ b/pinot-plugins/pinot-input-format/pinot-csv/src/test/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordReaderTest.java
@@ -136,6 +136,8 @@ public void testValidDelimiterInHeader()
     //read all fields
     //execute and assert
     csvRecordReader.init(_dataFile, null, csvRecordReaderConfig);
+    Assert.assertEquals(10, csvRecordReader.getCSVHeaderMap().size());
+    Assert.assertTrue(csvRecordReader.getCSVHeaderMap().containsKey("col1"));
     Assert.assertTrue(csvRecordReader.hasNext());
   }
 
diff --git a/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
index 4d7b11c104e..ba2a796d074 100644
--- a/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
@@ -61,8 +61,20 @@
           <artifactId>jaxb-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-core-asl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-jaxrs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-xc</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
index abc74acafda..ff126026415 100644
--- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
@@ -160,7 +160,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.11.4:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
           <protoTestSourceRoot>${basedir}/src/test/resources</protoTestSourceRoot>
         </configuration>
         <executions>
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseMultipleSegmentsConversionExecutor.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseMultipleSegmentsConversionExecutor.java
index c5b5f2b27a8..99b1341f6db 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseMultipleSegmentsConversionExecutor.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseMultipleSegmentsConversionExecutor.java
@@ -25,10 +25,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
@@ -104,14 +107,31 @@ protected abstract List<SegmentConversionResult> convert(PinotTaskConfig pinotTa
 
   /**
    * Pre processing operations to be done at the beginning of task execution
+   *
+   * The default implementation checks whether all segments to process exist in the table, if not, terminate early to
+   * avoid wasting computing resources.
    */
-  protected void preProcess(PinotTaskConfig pinotTaskConfig) {
+  protected void preProcess(PinotTaskConfig pinotTaskConfig) throws Exception {
+    Map<String, String> configs = pinotTaskConfig.getConfigs();
+    String tableNameWithType = configs.get(MinionConstants.TABLE_NAME_KEY);
+    String inputSegmentNames = configs.get(MinionConstants.SEGMENT_NAME_KEY);
+    String uploadURL = configs.get(MinionConstants.UPLOAD_URL_KEY);
+    AuthProvider authProvider = AuthProviderUtils.makeAuthProvider(configs.get(MinionConstants.AUTH_TOKEN));
+    Set<String> segmentNamesForTable = SegmentConversionUtils.getSegmentNamesForTable(tableNameWithType,
+        FileUploadDownloadClient.extractBaseURI(new URI(uploadURL)), authProvider);
+    Set<String> nonExistingSegmentNames =
+        new HashSet<>(Arrays.asList(inputSegmentNames.split(MinionConstants.SEGMENT_NAME_SEPARATOR)));
+    nonExistingSegmentNames.removeAll(segmentNamesForTable);
+    if (!CollectionUtils.isEmpty(nonExistingSegmentNames)) {
+      throw new RuntimeException(String.format("table: %s does have the following segments to process: %s",
+          tableNameWithType, nonExistingSegmentNames));
+    }
   }
 
   /**
    * Post processing operations to be done before exiting a successful task execution
    */
-  protected void postProcess(PinotTaskConfig pinotTaskConfig) {
+  protected void postProcess(PinotTaskConfig pinotTaskConfig) throws Exception {
   }
 
   protected void preUploadSegments(SegmentUploadContext context)
@@ -140,8 +160,8 @@ protected void postUploadSegments(SegmentUploadContext context)
         "Finishing uploading segments: " + context.getSegmentConversionResults().size());
     if (context.isReplaceSegmentsEnabled()) {
       String lineageEntryId = (String) context.getCustomContext(CUSTOM_SEGMENT_UPLOAD_CONTEXT_LINEAGE_ENTRY_ID);
-      SegmentConversionUtils.endSegmentReplace(context.getTableNameWithType(), context.getUploadURL(), lineageEntryId,
-          _minionConf.getEndReplaceSegmentsTimeoutMs(), context.getAuthProvider());
+      SegmentConversionUtils.endSegmentReplace(context.getTableNameWithType(), context.getUploadURL(),
+          lineageEntryId, _minionConf.getEndReplaceSegmentsTimeoutMs(), context.getAuthProvider());
     }
   }
 
@@ -161,18 +181,15 @@ public List<SegmentConversionResult> executeTask(PinotTaskConfig pinotTaskConfig
     Map<String, String> configs = pinotTaskConfig.getConfigs();
     String tableNameWithType = configs.get(MinionConstants.TABLE_NAME_KEY);
     String inputSegmentNames = configs.get(MinionConstants.SEGMENT_NAME_KEY);
+    String uploadURL = configs.get(MinionConstants.UPLOAD_URL_KEY);
     String downloadURLString = configs.get(MinionConstants.DOWNLOAD_URL_KEY);
     String[] downloadURLs = downloadURLString.split(MinionConstants.URL_SEPARATOR);
-    String uploadURL = configs.get(MinionConstants.UPLOAD_URL_KEY);
     AuthProvider authProvider = AuthProviderUtils.makeAuthProvider(configs.get(MinionConstants.AUTH_TOKEN));
-
     LOGGER.info("Start executing {} on table: {}, input segments: {} with downloadURLs: {}, uploadURL: {}", taskType,
         tableNameWithType, inputSegmentNames, downloadURLString, uploadURL);
-
     File tempDataDir = new File(new File(MINION_CONTEXT.getDataDir(), taskType), "tmp-" + UUID.randomUUID());
     Preconditions.checkState(tempDataDir.mkdirs());
     String crypterName = getTableConfig(tableNameWithType).getValidationConfig().getCrypterClassName();
-
     try {
       List<File> inputSegmentDirs = new ArrayList<>();
       for (int i = 0; i < downloadURLs.length; i++) {
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseSingleSegmentConversionExecutor.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseSingleSegmentConversionExecutor.java
index bc440e0c5e4..001ce26d46f 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseSingleSegmentConversionExecutor.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/BaseSingleSegmentConversionExecutor.java
@@ -32,13 +32,17 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
+import org.apache.pinot.common.Utils;
 import org.apache.pinot.common.auth.AuthProviderUtils;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadataCustomMapModifier;
+import org.apache.pinot.common.metrics.MinionMeter;
+import org.apache.pinot.common.metrics.MinionMetrics;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
 import org.apache.pinot.common.utils.TarGzCompressionUtils;
 import org.apache.pinot.common.utils.fetcher.SegmentFetcherFactory;
 import org.apache.pinot.core.common.MinionConstants;
 import org.apache.pinot.core.minion.PinotTaskConfig;
+import org.apache.pinot.minion.MinionContext;
 import org.apache.pinot.minion.event.MinionEventObserver;
 import org.apache.pinot.minion.event.MinionEventObservers;
 import org.apache.pinot.minion.exception.TaskCancelledException;
@@ -60,6 +64,7 @@ public abstract class BaseSingleSegmentConversionExecutor extends BaseTaskExecut
   // Tracking finer grained progress status.
   protected PinotTaskConfig _pinotTaskConfig;
   protected MinionEventObserver _eventObserver;
+  protected final MinionMetrics _minionMetrics = MinionContext.getInstance().getMinionMetrics();
 
   /**
    * Converts the segment based on the given task config and returns the conversion result.
@@ -101,7 +106,14 @@ public SegmentConversionResult executeTask(PinotTaskConfig pinotTaskConfig)
       _eventObserver.notifyProgress(_pinotTaskConfig, "Downloading segment from: " + downloadURL);
       File tarredSegmentFile = new File(tempDataDir, "tarredSegment");
       LOGGER.info("Downloading segment from {} to {}", downloadURL, tarredSegmentFile.getAbsolutePath());
-      SegmentFetcherFactory.fetchAndDecryptSegmentToLocal(downloadURL, tarredSegmentFile, crypterName);
+      try {
+        SegmentFetcherFactory.fetchAndDecryptSegmentToLocal(downloadURL, tarredSegmentFile, crypterName);
+      } catch (Exception e) {
+        _minionMetrics.addMeteredTableValue(tableNameWithType, MinionMeter.SEGMENT_DOWNLOAD_FAIL_COUNT, 1L);
+        LOGGER.error("Segment download failed for {}, crypter:{}", downloadURL, crypterName, e);
+        _eventObserver.notifyTaskError(_pinotTaskConfig, e);
+        Utils.rethrowException(e);
+      }
 
       // Un-tar the segment file
       _eventObserver.notifyProgress(_pinotTaskConfig, "Decompressing segment from: " + downloadURL);
@@ -119,9 +131,12 @@ public SegmentConversionResult executeTask(PinotTaskConfig pinotTaskConfig)
           "Converted segment name: %s does not match original segment name: %s",
           segmentConversionResult.getSegmentName(), segmentName);
 
+      File convertedSegmentDir = segmentConversionResult.getFile();
+      if (convertedSegmentDir == null) {
+        return segmentConversionResult;
+      }
       // Tar the converted segment
       _eventObserver.notifyProgress(_pinotTaskConfig, "Compressing segment: " + segmentName);
-      File convertedSegmentDir = segmentConversionResult.getFile();
       File convertedTarredSegmentFile =
           new File(tempDataDir, segmentName + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION);
       TarGzCompressionUtils.createTarGzFile(convertedSegmentDir, convertedTarredSegmentFile);
@@ -172,18 +187,29 @@ public SegmentConversionResult executeTask(PinotTaskConfig pinotTaskConfig)
           TableNameBuilder.extractRawTableName(tableNameWithType));
       NameValuePair tableTypeParameter = new BasicNameValuePair(FileUploadDownloadClient.QueryParameters.TABLE_TYPE,
           TableNameBuilder.getTableTypeFromTableName(tableNameWithType).toString());
-      List<NameValuePair> parameters = Arrays.asList(enableParallelPushProtectionParameter, tableNameParameter,
-          tableTypeParameter);
+      List<NameValuePair> parameters =
+          Arrays.asList(enableParallelPushProtectionParameter, tableNameParameter, tableTypeParameter);
 
       // Upload the tarred segment
       _eventObserver.notifyProgress(_pinotTaskConfig, "Uploading segment: " + segmentName);
-      SegmentConversionUtils.uploadSegment(configs, httpHeaders, parameters, tableNameWithType, segmentName, uploadURL,
-          convertedTarredSegmentFile);
+      boolean uploadSuccessful = true;
+      try {
+        SegmentConversionUtils.uploadSegment(configs, httpHeaders, parameters, tableNameWithType, segmentName,
+            uploadURL, convertedTarredSegmentFile);
+      } catch (Exception e) {
+        uploadSuccessful = false;
+        _minionMetrics.addMeteredTableValue(tableNameWithType, MinionMeter.SEGMENT_UPLOAD_FAIL_COUNT, 1L);
+        LOGGER.error("Segment upload failed for segment {}, table {}", segmentName, tableNameWithType, e);
+        _eventObserver.notifyTaskError(_pinotTaskConfig, e);
+      }
       if (!FileUtils.deleteQuietly(convertedTarredSegmentFile)) {
         LOGGER.warn("Failed to delete tarred converted segment: {}", convertedTarredSegmentFile.getAbsolutePath());
       }
 
-      LOGGER.info("Done executing {} on table: {}, segment: {}", taskType, tableNameWithType, segmentName);
+      if (uploadSuccessful) {
+        LOGGER.info("Done executing {} on table: {}, segment: {}", taskType, tableNameWithType, segmentName);
+      }
+
       return segmentConversionResult;
     } finally {
       FileUtils.deleteQuietly(tempDataDir);
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtils.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtils.java
index ad2199bb609..7bd2e434c4d 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtils.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtils.java
@@ -21,16 +21,21 @@
 import com.google.common.net.InetAddresses;
 import java.io.File;
 import java.net.URI;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicHeader;
 import org.apache.pinot.common.exception.HttpErrorStatusException;
+import org.apache.pinot.common.restlet.resources.EndReplaceSegmentsRequest;
 import org.apache.pinot.common.restlet.resources.StartReplaceSegmentsRequest;
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
 import org.apache.pinot.common.utils.RoundRobinURIProvider;
@@ -61,6 +66,52 @@ public class SegmentConversionUtils {
   private SegmentConversionUtils() {
   }
 
+  /**
+   * Gets segment names for the given table
+   * @param tableNameWithType a table name with type
+   * @param startTimestamp start timestamp in ms (inclusive)
+   * @param endTimestamp end timestamp in ms (exclusive)
+   * @param excludeOverlapping whether to exclude the segments overlapping with the timestamps, false by default
+   * @param controllerBaseURI the controller base URI
+   * @param authProvider a {@link AuthProvider}
+   * @return a set of segment names
+   * @throws Exception when there are exceptions getting segment names for the given table
+   */
+  public static Set<String> getSegmentNamesForTable(String tableNameWithType, long startTimestamp, long endTimestamp,
+      boolean excludeOverlapping, URI controllerBaseURI, @Nullable AuthProvider authProvider)
+      throws Exception {
+    String rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
+    TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType);
+    SSLContext sslContext = MinionContext.getInstance().getSSLContext();
+    try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient(sslContext)) {
+      Map<String, List<String>> tableTypeToSegmentNames =
+          fileUploadDownloadClient.getSegments(controllerBaseURI, rawTableName, tableType, true, startTimestamp,
+              endTimestamp, excludeOverlapping, authProvider);
+      if (tableTypeToSegmentNames != null && !tableTypeToSegmentNames.isEmpty()) {
+        List<String> allSegmentNameList = tableTypeToSegmentNames.get(tableType.toString());
+        if (!CollectionUtils.isEmpty(allSegmentNameList)) {
+          return new HashSet<>(allSegmentNameList);
+        }
+      }
+      return Collections.emptySet();
+    }
+  }
+
+  /**
+   * Gets segment names for the given table
+   * @param tableNameWithType a table name with type
+   * @param controllerBaseURI the controller base URI
+   * @param authProvider a {@link AuthProvider}
+   * @return a set of segment names
+   * @throws Exception when there are exceptions getting segment names for the given table
+   */
+  public static Set<String> getSegmentNamesForTable(String tableNameWithType, URI controllerBaseURI,
+      @Nullable AuthProvider authProvider)
+      throws Exception {
+    return getSegmentNamesForTable(tableNameWithType, Long.MIN_VALUE, Long.MAX_VALUE, false, controllerBaseURI,
+        authProvider);
+  }
+
   public static void uploadSegment(Map<String, String> configs, List<Header> httpHeaders,
       List<NameValuePair> parameters, String tableNameWithType, String segmentName, String uploadURL, File fileToUpload)
       throws Exception {
@@ -151,7 +202,14 @@ public static String startSegmentReplace(String tableNameWithType, String upload
   }
 
   public static void endSegmentReplace(String tableNameWithType, String uploadURL, String segmentLineageEntryId,
-      int socketTimeoutMs, @Nullable AuthProvider authProvider)
+      int socketTimeoutMs, @Nullable AuthProvider authProvider) throws Exception {
+    endSegmentReplace(tableNameWithType, uploadURL, null, segmentLineageEntryId,
+        socketTimeoutMs, authProvider);
+  }
+
+  public static void endSegmentReplace(String tableNameWithType, String uploadURL,
+      @Nullable EndReplaceSegmentsRequest endReplaceSegmentsRequest, String segmentLineageEntryId, int socketTimeoutMs,
+      @Nullable AuthProvider authProvider)
       throws Exception {
     String rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType);
@@ -159,9 +217,11 @@ public static void endSegmentReplace(String tableNameWithType, String uploadURL,
     try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient(sslContext)) {
       URI uri = FileUploadDownloadClient
           .getEndReplaceSegmentsURI(new URI(uploadURL), rawTableName, tableType.name(), segmentLineageEntryId);
-      SimpleHttpResponse response = fileUploadDownloadClient.endReplaceSegments(uri, socketTimeoutMs, authProvider);
-      LOGGER.info("Got response {}: {} while sending end replace segment request for table: {}, uploadURL: {}",
-          response.getStatusCode(), response.getResponse(), tableNameWithType, uploadURL);
+      SimpleHttpResponse response = fileUploadDownloadClient.endReplaceSegments(uri, socketTimeoutMs,
+          endReplaceSegmentsRequest, authProvider);
+      LOGGER.info("Got response {}: {} while sending end replace segment request for table: {}, uploadURL: {}, request:"
+              + " {}", response.getStatusCode(), response.getResponse(), tableNameWithType, uploadURL,
+          endReplaceSegmentsRequest);
     }
   }
 }
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java
index 9da496348f0..7d87abc96d4 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java
@@ -49,6 +49,7 @@
 import org.apache.pinot.core.minion.PinotTaskConfig;
 import org.apache.pinot.plugin.minion.tasks.MergeTaskUtils;
 import org.apache.pinot.plugin.minion.tasks.MinionTaskUtils;
+import org.apache.pinot.plugin.minion.tasks.mergerollup.segmentgroupmananger.MergeRollupTaskSegmentGroupManagerProvider;
 import org.apache.pinot.spi.annotations.minion.TaskGenerator;
 import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
 import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
@@ -130,10 +131,14 @@ public class MergeRollupTaskGenerator extends BaseTaskGenerator {
   // delay. Setting the alert on 7 time buckets of delay would be a good starting point.
   private static final String MERGE_ROLLUP_TASK_DELAY_IN_NUM_BUCKETS = "mergeRollupTaskDelayInNumBuckets";
 
+  private static final String MERGE_ROLLUP_TASK_NUM_BUCKETS_TO_PROCESS = "mergeRollupTaskNumBucketsToProcess";
+
   // tableNameWithType -> mergeLevel -> watermarkMs
   private final Map<String, Map<String, Long>> _mergeRollupWatermarks = new HashMap<>();
   // tableNameWithType -> lowestLevelMaxValidBucketEndTime
   private final Map<String, Long> _tableLowestLevelMaxValidBucketEndTimeMs = new HashMap<>();
+  // tableNameWithType -> mergeLevel -> numberBucketsToProcess
+  private final Map<String, Map<String, Long>> _tableNumberBucketsToProcess = new HashMap<>();
 
   @Override
   public String getTaskType() {
@@ -211,6 +216,10 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
         }
       }
 
+      // Get scheduling mode which is "processFromWatermark" by default. If "processAll" mode is enabled, there will be
+      // no watermark, and each round we pick the buckets in chronological order which have unmerged segments.
+      boolean processAll = MergeTask.PROCESS_ALL_MODE.equalsIgnoreCase(taskConfigs.get(MergeTask.MODE));
+
       ZNRecord mergeRollupTaskZNRecord = _clusterInfoAccessor
           .getMinionTaskMetadataZNRecord(MinionConstants.MergeRollupTask.TASK_TYPE, tableNameWithType);
       int expectedVersion = mergeRollupTaskZNRecord != null ? mergeRollupTaskZNRecord.getVersion() : -1;
@@ -257,12 +266,18 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
           continue;
         }
 
-        // Get watermark from MergeRollupTaskMetadata ZNode
-        // bucketStartMs = watermarkMs
-        // bucketEndMs = bucketStartMs + bucketMs
-        long watermarkMs =
-            getWatermarkMs(preSelectedSegments.get(0).getStartTimeMs(), bucketMs, mergeLevel, mergeRollupTaskMetadata);
-        long bucketStartMs = watermarkMs;
+        // Get bucket start/end time
+        long preSelectedSegStartTimeMs = preSelectedSegments.get(0).getStartTimeMs();
+        long bucketStartMs = preSelectedSegStartTimeMs / bucketMs * bucketMs;
+        long watermarkMs = 0;
+        if (!processAll) {
+          // Get watermark from MergeRollupTaskMetadata ZNode
+          // bucketStartMs = watermarkMs
+          // bucketEndMs = bucketStartMs + bucketMs
+          watermarkMs = getWatermarkMs(preSelectedSegStartTimeMs, bucketMs, mergeLevel,
+              mergeRollupTaskMetadata);
+          bucketStartMs = watermarkMs;
+        }
         long bucketEndMs = bucketStartMs + bucketMs;
         if (lowerMergeLevel == null) {
           long lowestLevelMaxValidBucketEndTimeMs = Long.MIN_VALUE;
@@ -275,12 +290,21 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
           }
           _tableLowestLevelMaxValidBucketEndTimeMs.put(tableNameWithType, lowestLevelMaxValidBucketEndTimeMs);
         }
-        // Create delay metrics even if there's no task scheduled, this helps the case that the controller is restarted
+        // Create metrics even if there's no task scheduled, this helps the case that the controller is restarted
         // but the metrics are not available until the controller schedules a valid task
-        createOrUpdateDelayMetrics(tableNameWithType, mergeLevel, null, watermarkMs, bufferMs, bucketMs);
-        if (!isValidBucketEndTime(bucketEndMs, bufferMs, lowerMergeLevel, mergeRollupTaskMetadata)) {
-          LOGGER.info("Bucket with start: {} and end: {} (table : {}, mergeLevel : {}) cannot be merged yet",
-              bucketStartMs, bucketEndMs, tableNameWithType, mergeLevel);
+        List<String> sortedMergeLevels =
+            sortedMergeLevelConfigs.stream().map(e -> e.getKey()).collect(Collectors.toList());
+        if (processAll) {
+          createOrUpdateNumBucketsToProcessMetrics(tableNameWithType, mergeLevel, lowerMergeLevel, bufferMs, bucketMs,
+              preSelectedSegments, sortedMergeLevels);
+        } else {
+          createOrUpdateDelayMetrics(tableNameWithType, mergeLevel, null, watermarkMs, bufferMs, bucketMs);
+        }
+
+        if (!isValidBucketEndTime(bucketEndMs, bufferMs, lowerMergeLevel, mergeRollupTaskMetadata, processAll)) {
+          LOGGER.info("Bucket with start: {} and end: {} (table : {}, mergeLevel : {}, mode : {}) cannot be merged yet",
+              bucketStartMs, bucketEndMs, tableNameWithType, mergeLevel, processAll ? MergeTask.PROCESS_ALL_MODE
+                  : MergeTask.PROCESS_FROM_WATERMARK_MODE);
           continue;
         }
 
@@ -289,6 +313,7 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
         List<SegmentZKMetadata> selectedSegmentsForBucket = new ArrayList<>();
         boolean hasUnmergedSegments = false;
         boolean hasSpilledOverData = false;
+        boolean areAllSegmentsReadyToMerge = true;
 
         // The for loop terminates in following cases:
         // 1. Found buckets with unmerged segments:
@@ -305,9 +330,12 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
             long endTimeMs = preSelectedSegment.getEndTimeMs();
             if (endTimeMs >= bucketStartMs) {
               // For segments overlapping with current bucket, add to the result list
-              if (!isMergedSegment(preSelectedSegment, mergeLevel)) {
+              if (!isMergedSegment(preSelectedSegment, mergeLevel, sortedMergeLevels)) {
                 hasUnmergedSegments = true;
               }
+              if (!isMergedSegment(preSelectedSegment, lowerMergeLevel, sortedMergeLevels)) {
+                areAllSegmentsReadyToMerge = false;
+              }
               if (hasSpilledOverData(preSelectedSegment, bucketMs)) {
                 hasSpilledOverData = true;
               }
@@ -317,7 +345,7 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
             // Haven't find the first overlapping segment, continue to the next segment
           } else {
             // Has gone through all overlapping segments for current bucket
-            if (hasUnmergedSegments) {
+            if (hasUnmergedSegments && areAllSegmentsReadyToMerge) {
               // Add the bucket if there are unmerged segments
               selectedSegmentsForAllBuckets.add(selectedSegmentsForBucket);
             }
@@ -330,14 +358,18 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
               // TODO: If there are many small merged segments, we should merge them again
               selectedSegmentsForBucket = new ArrayList<>();
               hasUnmergedSegments = false;
+              areAllSegmentsReadyToMerge = true;
               bucketStartMs = (startTimeMs / bucketMs) * bucketMs;
               bucketEndMs = bucketStartMs + bucketMs;
-              if (!isValidBucketEndTime(bucketEndMs, bufferMs, lowerMergeLevel, mergeRollupTaskMetadata)) {
+              if (!isValidBucketEndTime(bucketEndMs, bufferMs, lowerMergeLevel, mergeRollupTaskMetadata, processAll)) {
                 break;
               }
-              if (!isMergedSegment(preSelectedSegment, mergeLevel)) {
+              if (!isMergedSegment(preSelectedSegment, mergeLevel, sortedMergeLevels)) {
                 hasUnmergedSegments = true;
               }
+              if (!isMergedSegment(preSelectedSegment, lowerMergeLevel, sortedMergeLevels)) {
+                areAllSegmentsReadyToMerge = false;
+              }
               if (hasSpilledOverData(preSelectedSegment, bucketMs)) {
                 hasSpilledOverData = true;
               }
@@ -347,7 +379,7 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
         }
 
         // Add the last bucket if it contains unmerged segments and is not added before
-        if (hasUnmergedSegments && (selectedSegmentsForAllBuckets.isEmpty() || (
+        if (hasUnmergedSegments && areAllSegmentsReadyToMerge && (selectedSegmentsForAllBuckets.isEmpty() || (
             selectedSegmentsForAllBuckets.get(selectedSegmentsForAllBuckets.size() - 1)
                 != selectedSegmentsForBucket))) {
           selectedSegmentsForAllBuckets.add(selectedSegmentsForBucket);
@@ -365,7 +397,10 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
             watermarkMs, newWatermarkMs);
 
         // Update the delay metrics
-        createOrUpdateDelayMetrics(tableNameWithType, mergeLevel, lowerMergeLevel, newWatermarkMs, bufferMs, bucketMs);
+        if (!processAll) {
+          createOrUpdateDelayMetrics(tableNameWithType, mergeLevel, lowerMergeLevel, newWatermarkMs, bufferMs,
+              bucketMs);
+        }
 
         // Create task configs
         int maxNumRecordsPerTask =
@@ -375,7 +410,7 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
         if (segmentPartitionConfig == null) {
           for (List<SegmentZKMetadata> selectedSegmentsPerBucket : selectedSegmentsForAllBuckets) {
             pinotTaskConfigsForTable.addAll(
-                createPinotTaskConfigs(selectedSegmentsPerBucket, tableNameWithType, maxNumRecordsPerTask, mergeLevel,
+                createPinotTaskConfigs(selectedSegmentsPerBucket, tableConfig, maxNumRecordsPerTask, mergeLevel,
                     null, mergeConfigs, taskConfigs));
           }
         } else {
@@ -414,13 +449,13 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
               List<Integer> partition = entry.getKey();
               List<SegmentZKMetadata> partitionedSegments = entry.getValue();
               pinotTaskConfigsForTable.addAll(
-                  createPinotTaskConfigs(partitionedSegments, tableNameWithType, maxNumRecordsPerTask, mergeLevel,
+                  createPinotTaskConfigs(partitionedSegments, tableConfig, maxNumRecordsPerTask, mergeLevel,
                       partition, mergeConfigs, taskConfigs));
             }
 
             if (!outlierSegments.isEmpty()) {
               pinotTaskConfigsForTable.addAll(
-                  createPinotTaskConfigs(outlierSegments, tableNameWithType, maxNumRecordsPerTask, mergeLevel,
+                  createPinotTaskConfigs(outlierSegments, tableConfig, maxNumRecordsPerTask, mergeLevel,
                       null, mergeConfigs, taskConfigs));
             }
           }
@@ -428,14 +463,17 @@ public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
       }
 
       // Write updated watermark map to zookeeper
-      try {
-        _clusterInfoAccessor
-            .setMinionTaskMetadata(mergeRollupTaskMetadata, MinionConstants.MergeRollupTask.TASK_TYPE, expectedVersion);
-      } catch (ZkException e) {
-        LOGGER.error(
-            "Version changed while updating merge/rollup task metadata for table: {}, skip scheduling. There are "
-                + "multiple task schedulers for the same table, need to investigate!", tableNameWithType);
-        continue;
+      if (!processAll) {
+        try {
+          _clusterInfoAccessor
+              .setMinionTaskMetadata(mergeRollupTaskMetadata, MinionConstants.MergeRollupTask.TASK_TYPE,
+                  expectedVersion);
+        } catch (ZkException e) {
+          LOGGER.error(
+              "Version changed while updating merge/rollup task metadata for table: {}, skip scheduling. There are "
+                  + "multiple task schedulers for the same table, need to investigate!", tableNameWithType);
+          continue;
+        }
       }
       pinotTaskConfigs.addAll(pinotTaskConfigsForTable);
       LOGGER.info("Finished generating task configs for table: {} for task: {}, numTasks: {}", tableNameWithType,
@@ -481,9 +519,9 @@ static List<SegmentZKMetadata> filterSegmentsBasedOnStatus(TableType tableType,
       }
       final long finalEarliestStartTimeMsOfInProgressSegments = earliestStartTimeMsOfInProgressSegments;
       return allSegments.stream()
-              .filter(segmentZKMetadata -> segmentZKMetadata.getStatus().isCompleted()
-                  && segmentZKMetadata.getStartTimeMs() < finalEarliestStartTimeMsOfInProgressSegments)
-              .collect(Collectors.toList());
+          .filter(segmentZKMetadata -> segmentZKMetadata.getStatus().isCompleted()
+              && segmentZKMetadata.getStartTimeMs() < finalEarliestStartTimeMsOfInProgressSegments)
+          .collect(Collectors.toList());
     } else {
       return allSegments;
     }
@@ -545,25 +583,46 @@ private boolean hasSpilledOverData(SegmentZKMetadata segmentZKMetadata, long buc
   }
 
   /**
-   * Check if the segment is merged for give merge level
+   * Check if the segment is merged for given and higher merge levels
+   *
+   * @param segmentZKMetadata segment zk metadata
+   * @param baseMergeLevel base merge level
+   * @param sortedMergeLevels sorted merge levels based on buffer time period
+   * @return true if the segment is merged for the base merge level or any level higher than the base merge level
    */
-  private boolean isMergedSegment(SegmentZKMetadata segmentZKMetadata, String mergeLevel) {
+  private boolean isMergedSegment(SegmentZKMetadata segmentZKMetadata, String baseMergeLevel,
+      List<String> sortedMergeLevels) {
     Map<String, String> customMap = segmentZKMetadata.getCustomMap();
-    return customMap != null && mergeLevel.equalsIgnoreCase(
-        customMap.get(MergeRollupTask.SEGMENT_ZK_METADATA_MERGE_LEVEL_KEY));
+    if (baseMergeLevel == null) {
+      return true;
+    }
+    if (customMap == null || customMap.get(MergeRollupTask.SEGMENT_ZK_METADATA_MERGE_LEVEL_KEY) == null) {
+      return false;
+    }
+    String mergeLevel = customMap.get(MergeRollupTask.SEGMENT_ZK_METADATA_MERGE_LEVEL_KEY);
+    boolean isCurLevelLowerThanBase = true;
+    for (String currentMergeLevel : sortedMergeLevels) {
+      if (currentMergeLevel.equalsIgnoreCase(baseMergeLevel)) {
+        isCurLevelLowerThanBase = false;
+      }
+      if (!isCurLevelLowerThanBase && currentMergeLevel.equalsIgnoreCase(mergeLevel)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   /**
    * Check if the bucket end time is valid
    */
   private boolean isValidBucketEndTime(long bucketEndMs, long bufferMs, @Nullable String lowerMergeLevel,
-      MergeRollupTaskMetadata mergeRollupTaskMetadata) {
+      MergeRollupTaskMetadata mergeRollupTaskMetadata, boolean processAll) {
     // Check that bucketEndMs <= now - bufferMs
     if (bucketEndMs > System.currentTimeMillis() - bufferMs) {
       return false;
     }
     // Check that bucketEndMs <= waterMark of the lower mergeLevel
-    if (lowerMergeLevel != null) {
+    if (lowerMergeLevel != null && !processAll) {
       Long lowerMergeLevelWatermarkMs = mergeRollupTaskMetadata.getWatermarkMap().get(lowerMergeLevel);
       return lowerMergeLevelWatermarkMs != null && bucketEndMs <= lowerMergeLevelWatermarkMs;
     }
@@ -593,72 +652,77 @@ private long getWatermarkMs(long minStartTimeMs, long bucketMs, String mergeLeve
    * Create pinot task configs with selected segments and configs
    */
   private List<PinotTaskConfig> createPinotTaskConfigs(List<SegmentZKMetadata> selectedSegments,
-      String tableNameWithType, int maxNumRecordsPerTask, String mergeLevel, List<Integer> partition,
+      TableConfig tableConfig, int maxNumRecordsPerTask, String mergeLevel, List<Integer> partition,
       Map<String, String> mergeConfigs, Map<String, String> taskConfigs) {
-    int numRecordsPerTask = 0;
-    List<List<String>> segmentNamesList = new ArrayList<>();
-    List<List<String>> downloadURLsList = new ArrayList<>();
-    List<String> segmentNames = new ArrayList<>();
-    List<String> downloadURLs = new ArrayList<>();
-
-    for (int i = 0; i < selectedSegments.size(); i++) {
-      SegmentZKMetadata targetSegment = selectedSegments.get(i);
-      segmentNames.add(targetSegment.getSegmentName());
-      downloadURLs.add(targetSegment.getDownloadUrl());
-      numRecordsPerTask += targetSegment.getTotalDocs();
-      if (numRecordsPerTask >= maxNumRecordsPerTask || i == selectedSegments.size() - 1) {
-        segmentNamesList.add(segmentNames);
-        downloadURLsList.add(downloadURLs);
-        numRecordsPerTask = 0;
-        segmentNames = new ArrayList<>();
-        downloadURLs = new ArrayList<>();
-      }
-    }
-
+    String tableNameWithType = tableConfig.getTableName();
+    List<List<SegmentZKMetadata>> segmentGroups = MergeRollupTaskSegmentGroupManagerProvider.create(taskConfigs)
+        .getSegmentGroups(tableConfig, _clusterInfoAccessor, selectedSegments);
     List<PinotTaskConfig> pinotTaskConfigs = new ArrayList<>();
 
-    StringBuilder partitionSuffixBuilder = new StringBuilder();
-    if (partition != null && !partition.isEmpty()) {
-      for (int columnPartition : partition) {
-        partitionSuffixBuilder.append(DELIMITER_IN_SEGMENT_NAME).append(columnPartition);
+    for (List<SegmentZKMetadata> segments : segmentGroups) {
+      int numRecordsPerTask = 0;
+      List<List<String>> segmentNamesList = new ArrayList<>();
+      List<List<String>> downloadURLsList = new ArrayList<>();
+      List<String> segmentNames = new ArrayList<>();
+      List<String> downloadURLs = new ArrayList<>();
+
+      for (int i = 0; i < segments.size(); i++) {
+        SegmentZKMetadata targetSegment = segments.get(i);
+        segmentNames.add(targetSegment.getSegmentName());
+        downloadURLs.add(targetSegment.getDownloadUrl());
+        numRecordsPerTask += targetSegment.getTotalDocs();
+        if (numRecordsPerTask >= maxNumRecordsPerTask || i == segments.size() - 1) {
+          segmentNamesList.add(segmentNames);
+          downloadURLsList.add(downloadURLs);
+          numRecordsPerTask = 0;
+          segmentNames = new ArrayList<>();
+          downloadURLs = new ArrayList<>();
+        }
       }
-    }
-    String partitionSuffix = partitionSuffixBuilder.toString();
-
-    for (int i = 0; i < segmentNamesList.size(); i++) {
-      String downloadURL = StringUtils.join(downloadURLsList.get(i), MinionConstants.URL_SEPARATOR);
-      Map<String, String> configs = MinionTaskUtils.getPushTaskConfig(tableNameWithType, taskConfigs,
-          _clusterInfoAccessor);
-      configs.put(MinionConstants.TABLE_NAME_KEY, tableNameWithType);
-      configs.put(MinionConstants.SEGMENT_NAME_KEY,
-          StringUtils.join(segmentNamesList.get(i), MinionConstants.SEGMENT_NAME_SEPARATOR));
-      configs.put(MinionConstants.DOWNLOAD_URL_KEY, downloadURL);
-      configs.put(MinionConstants.UPLOAD_URL_KEY, _clusterInfoAccessor.getVipUrl() + "/segments");
-      configs.put(MinionConstants.ENABLE_REPLACE_SEGMENTS_KEY, "true");
-
-      for (Map.Entry<String, String> taskConfig : taskConfigs.entrySet()) {
-        if (taskConfig.getKey().endsWith(MinionConstants.MergeRollupTask.AGGREGATION_TYPE_KEY_SUFFIX)) {
-          configs.put(taskConfig.getKey(), taskConfig.getValue());
+
+      StringBuilder partitionSuffixBuilder = new StringBuilder();
+      if (partition != null && !partition.isEmpty()) {
+        for (int columnPartition : partition) {
+          partitionSuffixBuilder.append(DELIMITER_IN_SEGMENT_NAME).append(columnPartition);
         }
       }
+      String partitionSuffix = partitionSuffixBuilder.toString();
+
+      for (int i = 0; i < segmentNamesList.size(); i++) {
+        String downloadURL = StringUtils.join(downloadURLsList.get(i), MinionConstants.URL_SEPARATOR);
+        Map<String, String> configs = MinionTaskUtils.getPushTaskConfig(tableNameWithType, taskConfigs,
+            _clusterInfoAccessor);
+        configs.put(MinionConstants.TABLE_NAME_KEY, tableNameWithType);
+        configs.put(MinionConstants.SEGMENT_NAME_KEY,
+            StringUtils.join(segmentNamesList.get(i), MinionConstants.SEGMENT_NAME_SEPARATOR));
+        configs.put(MinionConstants.DOWNLOAD_URL_KEY, downloadURL);
+        configs.put(MinionConstants.UPLOAD_URL_KEY, _clusterInfoAccessor.getVipUrl() + "/segments");
+        configs.put(MinionConstants.ENABLE_REPLACE_SEGMENTS_KEY, "true");
+
+        for (Map.Entry<String, String> taskConfig : taskConfigs.entrySet()) {
+          if (taskConfig.getKey().endsWith(MinionConstants.MergeRollupTask.AGGREGATION_TYPE_KEY_SUFFIX)) {
+            configs.put(taskConfig.getKey(), taskConfig.getValue());
+          }
+        }
 
-      configs.put(BatchConfigProperties.OVERWRITE_OUTPUT,
-          taskConfigs.getOrDefault(BatchConfigProperties.OVERWRITE_OUTPUT, "false"));
-      configs.put(MergeRollupTask.MERGE_TYPE_KEY, mergeConfigs.get(MergeTask.MERGE_TYPE_KEY));
-      configs.put(MergeRollupTask.MERGE_LEVEL_KEY, mergeLevel);
-      configs.put(MergeTask.PARTITION_BUCKET_TIME_PERIOD_KEY, mergeConfigs.get(MergeTask.BUCKET_TIME_PERIOD_KEY));
-      configs.put(MergeTask.ROUND_BUCKET_TIME_PERIOD_KEY, mergeConfigs.get(MergeTask.ROUND_BUCKET_TIME_PERIOD_KEY));
-      configs.put(MergeTask.MAX_NUM_RECORDS_PER_SEGMENT_KEY,
-          mergeConfigs.get(MergeTask.MAX_NUM_RECORDS_PER_SEGMENT_KEY));
-
-      // Segment name conflict happens when the current method "createPinotTaskConfigs" is invoked more than once within
-      // the same epoch millisecond, which may happen when there are multiple partitions.
-      // To prevent such name conflict, we include a partitionSeqSuffix to the segment name.
-      configs.put(MergeRollupTask.SEGMENT_NAME_PREFIX_KEY,
-          MergeRollupTask.MERGED_SEGMENT_NAME_PREFIX + mergeLevel + DELIMITER_IN_SEGMENT_NAME
-              + System.currentTimeMillis() + partitionSuffix + DELIMITER_IN_SEGMENT_NAME + i
-              + DELIMITER_IN_SEGMENT_NAME + TableNameBuilder.extractRawTableName(tableNameWithType));
-      pinotTaskConfigs.add(new PinotTaskConfig(MergeRollupTask.TASK_TYPE, configs));
+        configs.put(BatchConfigProperties.OVERWRITE_OUTPUT,
+            taskConfigs.getOrDefault(BatchConfigProperties.OVERWRITE_OUTPUT, "false"));
+        configs.put(MergeRollupTask.MERGE_TYPE_KEY, mergeConfigs.get(MergeTask.MERGE_TYPE_KEY));
+        configs.put(MergeRollupTask.MERGE_LEVEL_KEY, mergeLevel);
+        configs.put(MergeTask.PARTITION_BUCKET_TIME_PERIOD_KEY, mergeConfigs.get(MergeTask.BUCKET_TIME_PERIOD_KEY));
+        configs.put(MergeTask.ROUND_BUCKET_TIME_PERIOD_KEY, mergeConfigs.get(MergeTask.ROUND_BUCKET_TIME_PERIOD_KEY));
+        configs.put(MergeTask.MAX_NUM_RECORDS_PER_SEGMENT_KEY,
+            mergeConfigs.get(MergeTask.MAX_NUM_RECORDS_PER_SEGMENT_KEY));
+
+        // Segment name conflict happens when the current method "createPinotTaskConfigs" is invoked more than once
+        // within the same epoch millisecond, which may happen when there are multiple partitions.
+        // To prevent such name conflict, we include a partitionSeqSuffix to the segment name.
+        configs.put(MergeRollupTask.SEGMENT_NAME_PREFIX_KEY,
+            MergeRollupTask.MERGED_SEGMENT_NAME_PREFIX + mergeLevel + DELIMITER_IN_SEGMENT_NAME
+                + System.currentTimeMillis() + partitionSuffix + DELIMITER_IN_SEGMENT_NAME + i
+                + DELIMITER_IN_SEGMENT_NAME + TableNameBuilder.extractRawTableName(tableNameWithType));
+        pinotTaskConfigs.add(new PinotTaskConfig(MergeRollupTask.TASK_TYPE, configs));
+      }
     }
 
     return pinotTaskConfigs;
@@ -712,6 +776,98 @@ private void createOrUpdateDelayMetrics(String tableNameWithType, String mergeLe
     });
   }
 
+  /**
+   * Update the number buckets to process for the given table and merge level. We create the new gauge metric if
+   * the metric is not available.
+   * @param tableNameWithType table name with type
+   * @param mergeLevel merge level
+   * @param lowerMergeLevel lower merge level
+   * @param bufferTimeMs buffer time
+   * @param bucketTimeMs bucket time
+   * @param sortedSegments sorted segment list
+   * @param sortedMergeLevels sorted merge level list
+   */
+  private void createOrUpdateNumBucketsToProcessMetrics(String tableNameWithType, String mergeLevel,
+      String lowerMergeLevel, long bufferTimeMs, long bucketTimeMs,
+      List<SegmentZKMetadata> sortedSegments, List<String> sortedMergeLevels) {
+    ControllerMetrics controllerMetrics = _clusterInfoAccessor.getControllerMetrics();
+    if (controllerMetrics == null) {
+      return;
+    }
+
+    // Find all buckets and segments that are ready to merge
+    List<List<SegmentZKMetadata>> selectedSegmentsForAllBuckets = new ArrayList<>();
+    List<SegmentZKMetadata> selectedSegmentsForBucket = new ArrayList<>();
+    long bucketStartMs = sortedSegments.get(0).getStartTimeMs() / bucketTimeMs * bucketTimeMs;
+    long bucketEndMs = bucketStartMs + bucketTimeMs;
+    boolean hasUnmergedSegments = false;
+    boolean isAllSegmentsReadyToMerge = true;
+
+    for (SegmentZKMetadata segment : sortedSegments) {
+      long startTimeMs = segment.getStartTimeMs();
+      if (startTimeMs < bucketEndMs) {
+        long endTimeMs = segment.getEndTimeMs();
+        if (endTimeMs >= bucketStartMs) {
+          // For segments overlapping with current bucket, add to the result list
+          if (!isMergedSegment(segment, mergeLevel, sortedMergeLevels)) {
+            hasUnmergedSegments = true;
+          }
+          if (!isMergedSegment(segment, lowerMergeLevel, sortedMergeLevels)) {
+            isAllSegmentsReadyToMerge = false;
+          }
+          selectedSegmentsForBucket.add(segment);
+        }
+        // endTimeMs < bucketStartMs
+        // Haven't find the first overlapping segment, continue to the next segment
+      } else {
+        // Has gone through all overlapping segments for current bucket
+        if (hasUnmergedSegments && isAllSegmentsReadyToMerge) {
+          // Add the bucket if there are unmerged segments
+          selectedSegmentsForAllBuckets.add(selectedSegmentsForBucket);
+        }
+
+        // Start with a new bucket
+        selectedSegmentsForBucket = new ArrayList<>();
+        hasUnmergedSegments = false;
+        isAllSegmentsReadyToMerge = true;
+        bucketStartMs = (startTimeMs / bucketTimeMs) * bucketTimeMs;
+        bucketEndMs = bucketStartMs + bucketTimeMs;
+        if (bucketEndMs > System.currentTimeMillis() - bufferTimeMs) {
+          break;
+        }
+        if (!isMergedSegment(segment, mergeLevel, sortedMergeLevels)) {
+          hasUnmergedSegments = true;
+        }
+        if (!isMergedSegment(segment, lowerMergeLevel, sortedMergeLevels)) {
+          isAllSegmentsReadyToMerge = false;
+        }
+        selectedSegmentsForBucket.add(segment);
+      }
+    }
+
+    // Add the last bucket if it contains unmerged segments and is not added before
+    if (hasUnmergedSegments && isAllSegmentsReadyToMerge && (selectedSegmentsForAllBuckets.isEmpty() || (
+        selectedSegmentsForAllBuckets.get(selectedSegmentsForAllBuckets.size() - 1)
+            != selectedSegmentsForBucket))) {
+      selectedSegmentsForAllBuckets.add(selectedSegmentsForBucket);
+    }
+
+    Map<String, Long> numBucketsToProcessForTable =
+        _tableNumberBucketsToProcess.computeIfAbsent(tableNameWithType, k -> new ConcurrentHashMap<>());
+    long finalCount = selectedSegmentsForAllBuckets.size();
+    numBucketsToProcessForTable.compute(mergeLevel, (k, v) -> {
+      if (v == null) {
+        LOGGER.info(
+            "Creating the gauge metric for tracking the merge/roll-up number buckets to process for table: {} "
+                + "and mergeLevel: {}.(bufferTimeMs={}, bucketTimeMs={}, numTimeBucketsToProcess={})"
+                + tableNameWithType, mergeLevel, bufferTimeMs, bucketTimeMs, finalCount);
+        controllerMetrics.setOrUpdateGauge(getMetricNameForNumBucketsToProcess(tableNameWithType, mergeLevel),
+            () -> _tableNumberBucketsToProcess.get(tableNameWithType).getOrDefault(mergeLevel, finalCount));
+      }
+      return finalCount;
+    });
+  }
+
   /**
    * Reset the delay metrics for the given table name.
    *
@@ -730,6 +886,13 @@ private void resetDelayMetrics(String tableNameWithType) {
         controllerMetrics.removeGauge(getMetricNameForTaskDelay(tableNameWithType, mergeLevel));
       }
     }
+
+    Map<String, Long> numBucketsToProcessForTable = _tableNumberBucketsToProcess.remove(tableNameWithType);
+    if (numBucketsToProcessForTable != null) {
+      for (String mergeLevel : numBucketsToProcessForTable.keySet()) {
+        controllerMetrics.removeGauge(getMetricNameForNumBucketsToProcess(tableNameWithType, mergeLevel));
+      }
+    }
   }
 
   /**
@@ -751,6 +914,13 @@ private void resetDelayMetrics(String tableNameWithType, String mergeLevel) {
         controllerMetrics.removeGauge(getMetricNameForTaskDelay(tableNameWithType, mergeLevel));
       }
     }
+
+    Map<String, Long> numBucketsToProcessForTable = _tableNumberBucketsToProcess.remove(tableNameWithType);
+    if (numBucketsToProcessForTable != null) {
+      if (numBucketsToProcessForTable.remove(mergeLevel) != null) {
+        controllerMetrics.removeGauge(getMetricNameForNumBucketsToProcess(tableNameWithType, mergeLevel));
+      }
+    }
   }
 
   /**
@@ -774,7 +944,10 @@ private void cleanUpDelayMetrics(List<TableConfig> tableConfigs) {
       tableConfigMap.put(tableConfig.getTableName(), tableConfig);
     }
 
-    for (String tableNameWithType : new ArrayList<>(_mergeRollupWatermarks.keySet())) {
+    Set<String> tables = new HashSet<>(_mergeRollupWatermarks.keySet());
+    tables.addAll(_tableNumberBucketsToProcess.keySet());
+
+    for (String tableNameWithType : tables) {
       TableConfig currentTableConfig = tableConfigMap.get(tableNameWithType);
       // Table does not exist in the cluster or merge task config is removed
       if (currentTableConfig == null) {
@@ -792,9 +965,20 @@ private void cleanUpDelayMetrics(List<TableConfig> tableConfigs) {
       Map<String, String> taskConfigs = currentTableConfig.getTaskConfig().getConfigsForTaskType(getTaskType());
       Map<String, Map<String, String>> mergeLevelToConfigs = MergeRollupTaskUtils.getLevelToConfigMap(taskConfigs);
       Map<String, Long> tableToWatermark = _mergeRollupWatermarks.get(tableNameWithType);
-      for (String mergeLevel : tableToWatermark.keySet()) {
-        if (!mergeLevelToConfigs.containsKey(mergeLevel)) {
-          resetDelayMetrics(tableNameWithType, mergeLevel);
+      if (tableToWatermark != null) {
+        for (String mergeLevel : tableToWatermark.keySet()) {
+          if (!mergeLevelToConfigs.containsKey(mergeLevel)) {
+            resetDelayMetrics(tableNameWithType, mergeLevel);
+          }
+        }
+      }
+
+      Map<String, Long> tableToNumBucketsToProcess = _tableNumberBucketsToProcess.get(tableNameWithType);
+      if (tableToNumBucketsToProcess != null) {
+        for (String mergeLevel : tableToNumBucketsToProcess.keySet()) {
+          if (!mergeLevelToConfigs.containsKey(mergeLevel)) {
+            resetDelayMetrics(tableNameWithType, mergeLevel);
+          }
         }
       }
     }
@@ -804,4 +988,8 @@ private String getMetricNameForTaskDelay(String tableNameWithType, String mergeL
     // e.g. mergeRollupTaskDelayInNumBuckets.myTable_OFFLINE.daily
     return MERGE_ROLLUP_TASK_DELAY_IN_NUM_BUCKETS + "." + tableNameWithType + "." + mergeLevel;
   }
+
+  private String getMetricNameForNumBucketsToProcess(String tableNameWithType, String mergeLevel) {
+    return MERGE_ROLLUP_TASK_NUM_BUCKETS_TO_PROCESS + "." + tableNameWithType + "." + mergeLevel;
+  }
 }
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/DefaultMergeRollupTaskSegmentGroupManager.java
similarity index 60%
rename from pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java
rename to pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/DefaultMergeRollupTaskSegmentGroupManager.java
index e2a20eae2bb..9aca72ac35f 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/src/main/java/org/apache/pinot/ingestion/common/ControllerRestApi.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/DefaultMergeRollupTaskSegmentGroupManager.java
@@ -16,27 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.ingestion.common;
+package org.apache.pinot.plugin.minion.tasks.mergerollup.segmentgroupmananger;
 
-import java.io.Closeable;
+import java.util.Collections;
 import java.util.List;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.controller.helix.core.minion.ClusterInfoAccessor;
 import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.Schema;
 
 
-public interface ControllerRestApi extends Closeable {
+public class DefaultMergeRollupTaskSegmentGroupManager implements MergeRollupTaskSegmentGroupManager {
 
-  TableConfig getTableConfig();
-
-  Schema getSchema();
-
-  void pushSegments(FileSystem fileSystem, List<Path> tarFilePaths);
-
-  void sendSegmentUris(List<String> segmentUris);
-
-  void deleteSegmentUris(List<String> segmentUris);
-
-  List<String> getAllSegments(String tableType);
+  @Override
+  public List<List<SegmentZKMetadata>> getSegmentGroups(TableConfig tableConfig,
+      ClusterInfoAccessor clusterInfoAccessor, List<SegmentZKMetadata> segments) {
+    return Collections.singletonList(segments);
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxIdentifier.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/MergeRollupTaskSegmentGroupManager.java
similarity index 54%
rename from pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxIdentifier.java
rename to pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/MergeRollupTaskSegmentGroupManager.java
index 77647d3db22..1bf74140ce6 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxIdentifier.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/MergeRollupTaskSegmentGroupManager.java
@@ -16,35 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.mailbox;
+package org.apache.pinot.plugin.minion.tasks.mergerollup.segmentgroupmananger;
 
-/**
- * {@link MailboxIdentifier} uniquely identify the mailbox that pairs a sender and a receiver.
- *
- * <p>It consists of the job_id and the partition key. as well as the component for a channelID.
- */
-public interface MailboxIdentifier {
+import java.util.List;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.controller.helix.core.minion.ClusterInfoAccessor;
+import org.apache.pinot.spi.config.table.TableConfig;
 
-  /**
-   * get the job identifier.
-   * @return job identifier.
-   */
-  String getJobId();
-
-  /**
-   * @return the sender address
-   */
-  ServerAddress getFromHost();
-
-  /**
-   * @return the destination address
-   */
-  ServerAddress getToHost();
 
+/**
+ * The interface <code>PinotTaskSegmentGroupManager</code> defines the APIs to group segments for task generation.
+ */
+public interface MergeRollupTaskSegmentGroupManager {
   /**
-   * Checks whether sender and receiver are in the same JVM.
-   *
-   * @return true if sender and receiver are in the same JVM.
+   * Returns a list of segment groups which are scheduled in separate tasks
    */
-  boolean isLocal();
+  List<List<SegmentZKMetadata>> getSegmentGroups(TableConfig tableConfig, ClusterInfoAccessor clusterInfoAccessor,
+      List<SegmentZKMetadata> segments);
 }
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/MergeRollupTaskSegmentGroupManagerProvider.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/MergeRollupTaskSegmentGroupManagerProvider.java
new file mode 100644
index 00000000000..3f3defb44c9
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/segmentgroupmananger/MergeRollupTaskSegmentGroupManagerProvider.java
@@ -0,0 +1,51 @@
+/**
+ * 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.pinot.plugin.minion.tasks.mergerollup.segmentgroupmananger;
+
+import java.util.Map;
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.spi.plugin.PluginManager;
+
+
+/**
+ * Provider class for {@link MergeRollupTaskSegmentGroupManager}
+ */
+public abstract class MergeRollupTaskSegmentGroupManagerProvider {
+
+  private static String _defaultMergeRollupTaskSegmentGroupManagerClassName =
+      DefaultMergeRollupTaskSegmentGroupManager.class.getName();
+
+  public static void setDefaultMergeRollupTaskSegmentGroupManagerClassName(String className) {
+    _defaultMergeRollupTaskSegmentGroupManagerClassName = className;
+  }
+
+  /**
+   * Constructs the {@link MergeRollupTaskSegmentGroupManager} using MergeRollup task configs
+   */
+  public static MergeRollupTaskSegmentGroupManager create(Map<String, String> taskConfigs) {
+    String segmentGroupManagerClassName =
+        taskConfigs.getOrDefault(MinionConstants.MergeRollupTask.SEGMENT_GROUP_MANAGER_CLASS_NAME_KEY,
+            _defaultMergeRollupTaskSegmentGroupManagerClassName);
+    try {
+      return PluginManager.get().createInstance(segmentGroupManagerClassName);
+    } catch (Exception e) {
+      throw new RuntimeException("Fail to create segment group manager", e);
+    }
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutor.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutor.java
index 542bbde7da8..bbc9af3b544 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutor.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutor.java
@@ -28,6 +28,7 @@
 import org.apache.pinot.plugin.minion.tasks.BaseSingleSegmentConversionExecutor;
 import org.apache.pinot.plugin.minion.tasks.SegmentConversionResult;
 import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 
 
@@ -44,16 +45,18 @@ protected SegmentConversionResult convert(PinotTaskConfig pinotTaskConfig, File
     String tableNameWithType = configs.get(MinionConstants.TABLE_NAME_KEY);
     String rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
 
-    TableConfig tableConfig = getTableConfig(tableNameWithType);
     SegmentPurger.RecordPurgerFactory recordPurgerFactory = MINION_CONTEXT.getRecordPurgerFactory();
+    TableConfig tableConfig = getTableConfig(tableNameWithType);
+    Schema schema = getSchema(tableNameWithType);
     SegmentPurger.RecordPurger recordPurger =
-        recordPurgerFactory != null ? recordPurgerFactory.getRecordPurger(rawTableName) : null;
+        recordPurgerFactory != null ? recordPurgerFactory.getRecordPurger(pinotTaskConfig, tableConfig, schema) : null;
     SegmentPurger.RecordModifierFactory recordModifierFactory = MINION_CONTEXT.getRecordModifierFactory();
     SegmentPurger.RecordModifier recordModifier =
         recordModifierFactory != null ? recordModifierFactory.getRecordModifier(rawTableName) : null;
 
     _eventObserver.notifyProgress(pinotTaskConfig, "Purging segment: " + indexDir);
-    SegmentPurger segmentPurger = new SegmentPurger(indexDir, workingDir, tableConfig, recordPurger, recordModifier);
+    SegmentPurger segmentPurger =
+        new SegmentPurger(indexDir, workingDir, tableConfig, schema, recordPurger, recordModifier);
     File purgedSegmentFile = segmentPurger.purgeSegment();
     if (purgedSegmentFile == null) {
       purgedSegmentFile = indexDir;
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
index 6475d6f895a..af49c6e2f13 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
@@ -321,6 +321,8 @@ protected SegmentGenerationTaskSpec generateTaskSpec(Map<String, String> taskCon
       segmentNameGeneratorSpec.setType(taskConfigs.get(BatchConfigProperties.SEGMENT_NAME_GENERATOR_TYPE));
       segmentNameGeneratorSpec.setConfigs(IngestionConfigUtils.getConfigMapWithPrefix(taskConfigs,
           BatchConfigProperties.SEGMENT_NAME_GENERATOR_PROP_PREFIX));
+      segmentNameGeneratorSpec.addConfig(SegmentGenerationTaskRunner.APPEND_UUID_TO_SEGMENT_NAME,
+          taskConfigs.getOrDefault(BatchConfigProperties.APPEND_UUID_TO_SEGMENT_NAME, Boolean.toString(false)));
       taskSpec.setSegmentNameGeneratorSpec(segmentNameGeneratorSpec);
       taskSpec.setCustomProperty(BatchConfigProperties.INPUT_DATA_FILE_URI_KEY, inputFileURI.toString());
 
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskGenerator.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskGenerator.java
index e1bdd97cac1..268f84456ac 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskGenerator.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskGenerator.java
@@ -300,6 +300,14 @@ private Map<String, String> getSingleFileGenerationTaskConfig(String offlineTabl
             segmentName);
       }
     }
+    // The SEQUENCE_ID used to identify each segment is only unique to each round of task generation. Across multiple
+    // rounds of task generation, the SEQUENCE_ID can be the same.
+    // This may lead to segment name collision, and existing segments will be overridden. Since old segments are
+    // overridden, corresponding files become un-ingested, the generator will generate new tasks, which generates
+    // segments with same names, and override existing segments again... It becomes an endless loop
+    // We add uuid to segment name to avoid segment collision across multiple rounds of task generation to solve the
+    // problem.
+    singleFileGenerationTaskConfig.put(BatchConfigProperties.APPEND_UUID_TO_SEGMENT_NAME, Boolean.toString(true));
     if ((outputDirURI == null) || (pushMode == null)) {
       singleFileGenerationTaskConfig.put(BatchConfigProperties.PUSH_MODE, DEFAULT_SEGMENT_PUSH_TYPE.toString());
     } else {
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutor.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutor.java
new file mode 100644
index 00000000000..aa37ac871a1
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutor.java
@@ -0,0 +1,248 @@
+/**
+ * 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.pinot.plugin.minion.tasks.upsertcompaction;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+import org.apache.commons.io.FileUtils;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadataCustomMapModifier;
+import org.apache.pinot.common.utils.config.InstanceUtils;
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.core.minion.PinotTaskConfig;
+import org.apache.pinot.plugin.minion.tasks.BaseSingleSegmentConversionExecutor;
+import org.apache.pinot.plugin.minion.tasks.SegmentConversionResult;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
+import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.data.readers.RecordReader;
+import org.apache.pinot.spi.data.readers.RecordReaderConfig;
+import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
+import org.roaringbitmap.PeekableIntIterator;
+import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class UpsertCompactionTaskExecutor extends BaseSingleSegmentConversionExecutor {
+  private static final Logger LOGGER = LoggerFactory.getLogger(UpsertCompactionTaskExecutor.class);
+  private static HelixManager _helixManager = MINION_CONTEXT.getHelixManager();
+  private static HelixAdmin _clusterManagementTool = _helixManager.getClusterManagmentTool();
+  private static String _clusterName = _helixManager.getClusterName();
+
+  private class CompactedRecordReader implements RecordReader {
+    private final PinotSegmentRecordReader _pinotSegmentRecordReader;
+    private final PeekableIntIterator _validDocIdsIterator;
+    // Reusable generic row to store the next row to return
+    GenericRow _nextRow = new GenericRow();
+    // Flag to mark whether we need to fetch another row
+    boolean _nextRowReturned = true;
+
+    CompactedRecordReader(File indexDir, ImmutableRoaringBitmap validDocIds) {
+      _pinotSegmentRecordReader = new PinotSegmentRecordReader();
+      _pinotSegmentRecordReader.init(indexDir, null, null);
+      _validDocIdsIterator = validDocIds.getIntIterator();
+    }
+
+    @Override
+    public void init(File dataFile, Set<String> fieldsToRead, @Nullable RecordReaderConfig recordReaderConfig) {
+    }
+
+    @Override
+    public boolean hasNext() {
+      if (!_validDocIdsIterator.hasNext() && _nextRowReturned) {
+        return false;
+      }
+
+      // If next row has not been returned, return true
+      if (!_nextRowReturned) {
+        return true;
+      }
+
+      // Try to get the next row to return
+      if (_validDocIdsIterator.hasNext()) {
+        int docId = _validDocIdsIterator.next();
+        _nextRow.clear();
+        _pinotSegmentRecordReader.getRecord(docId, _nextRow);
+        _nextRowReturned = false;
+        return true;
+      }
+
+      // Cannot find next row to return, return false
+      return false;
+    }
+
+    @Override
+    public GenericRow next() {
+      return next(new GenericRow());
+    }
+
+    @Override
+    public GenericRow next(GenericRow reuse) {
+      Preconditions.checkState(!_nextRowReturned);
+      reuse.init(_nextRow);
+      _nextRowReturned = true;
+      return reuse;
+    }
+
+    @Override
+    public void rewind() {
+      _pinotSegmentRecordReader.rewind();
+      _nextRowReturned = true;
+    }
+
+    @Override
+    public void close()
+        throws IOException {
+      _pinotSegmentRecordReader.close();
+    }
+  }
+
+  @Override
+  protected SegmentConversionResult convert(PinotTaskConfig pinotTaskConfig, File indexDir, File workingDir)
+      throws Exception {
+    _eventObserver.notifyProgress(pinotTaskConfig, "Compacting segment: " + indexDir);
+    Map<String, String> configs = pinotTaskConfig.getConfigs();
+    String segmentName = configs.get(MinionConstants.SEGMENT_NAME_KEY);
+    String taskType = pinotTaskConfig.getTaskType();
+    LOGGER.info("Starting task: {} with configs: {}", taskType, configs);
+    long startMillis = System.currentTimeMillis();
+
+    String tableNameWithType = configs.get(MinionConstants.TABLE_NAME_KEY);
+    TableConfig tableConfig = getTableConfig(tableNameWithType);
+    ImmutableRoaringBitmap validDocIds = getValidDocIds(tableNameWithType, configs);
+
+    if (validDocIds.isEmpty()) {
+      // prevents empty segment generation
+      LOGGER.info("validDocIds is empty, skip the task. Table: {}, segment: {}", tableNameWithType, segmentName);
+      if (indexDir.exists() && !FileUtils.deleteQuietly(indexDir)) {
+        LOGGER.warn("Failed to delete input segment: {}", indexDir.getAbsolutePath());
+      }
+      if (!FileUtils.deleteQuietly(workingDir)) {
+        LOGGER.warn("Failed to delete working directory: {}", workingDir.getAbsolutePath());
+      }
+      return new SegmentConversionResult.Builder().setTableNameWithType(tableNameWithType).setSegmentName(segmentName)
+          .build();
+    }
+
+    SegmentMetadataImpl segmentMetadata = new SegmentMetadataImpl(indexDir);
+    try (CompactedRecordReader compactedRecordReader = new CompactedRecordReader(indexDir, validDocIds)) {
+      SegmentGeneratorConfig config = getSegmentGeneratorConfig(workingDir, tableConfig, segmentMetadata, segmentName);
+      SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
+      driver.init(config, compactedRecordReader);
+      driver.build();
+    }
+
+    File compactedSegmentFile = new File(workingDir, segmentName);
+    SegmentConversionResult result =
+        new SegmentConversionResult.Builder().setFile(compactedSegmentFile).setTableNameWithType(tableNameWithType)
+            .setSegmentName(segmentName).build();
+
+    long endMillis = System.currentTimeMillis();
+    LOGGER.info("Finished task: {} with configs: {}. Total time: {}ms", taskType, configs, (endMillis - startMillis));
+
+    return result;
+  }
+
+  private static SegmentGeneratorConfig getSegmentGeneratorConfig(File workingDir, TableConfig tableConfig,
+      SegmentMetadataImpl segmentMetadata, String segmentName) {
+    SegmentGeneratorConfig config = new SegmentGeneratorConfig(tableConfig, segmentMetadata.getSchema());
+    config.setOutDir(workingDir.getPath());
+    config.setSegmentName(segmentName);
+    // Keep index creation time the same as original segment because both segments use the same raw data.
+    // This way, for REFRESH case, when new segment gets pushed to controller, we can use index creation time to
+    // identify if the new pushed segment has newer data than the existing one.
+    config.setCreationTime(String.valueOf(segmentMetadata.getIndexCreationTime()));
+
+    // The time column type info is not stored in the segment metadata.
+    // Keep segment start/end time to properly handle time column type other than EPOCH (e.g.SIMPLE_FORMAT).
+    if (segmentMetadata.getTimeInterval() != null) {
+      config.setTimeColumnName(tableConfig.getValidationConfig().getTimeColumnName());
+      config.setStartTime(Long.toString(segmentMetadata.getStartTime()));
+      config.setEndTime(Long.toString(segmentMetadata.getEndTime()));
+      config.setSegmentTimeUnit(segmentMetadata.getTimeUnit());
+    }
+    return config;
+  }
+
+  // TODO: Consider moving this method to a more appropriate class (eg ServerSegmentMetadataReader)
+  private static ImmutableRoaringBitmap getValidDocIds(String tableNameWithType, Map<String, String> configs)
+      throws URISyntaxException {
+    String segmentName = configs.get(MinionConstants.SEGMENT_NAME_KEY);
+    String server = getServer(segmentName, tableNameWithType);
+
+    // get the url for the validDocIds for the server
+    InstanceConfig instanceConfig = _clusterManagementTool.getInstanceConfig(_clusterName, server);
+    String endpoint = InstanceUtils.getServerAdminEndpoint(instanceConfig);
+    String url =
+        new URIBuilder(endpoint).setPath(String.format("/segments/%s/%s/validDocIds", tableNameWithType, segmentName))
+            .toString();
+
+    // get the validDocIds from that server
+    Response response = ClientBuilder.newClient().target(url).request().get(Response.class);
+    Preconditions.checkState(response.getStatus() == Response.Status.OK.getStatusCode(),
+        "Unable to retrieve validDocIds from %s", url);
+    byte[] snapshot = response.readEntity(byte[].class);
+    ImmutableRoaringBitmap validDocIds = new ImmutableRoaringBitmap(ByteBuffer.wrap(snapshot));
+    return validDocIds;
+  }
+
+  @VisibleForTesting
+  public static String getServer(String segmentName, String tableNameWithType) {
+    ExternalView externalView = _clusterManagementTool.getResourceExternalView(_clusterName, tableNameWithType);
+    if (externalView == null) {
+      throw new IllegalStateException("External view does not exist for table: " + tableNameWithType);
+    }
+    Map<String, String> instanceStateMap = externalView.getStateMap(segmentName);
+    if (instanceStateMap == null) {
+      throw new IllegalStateException("Failed to find segment: " + segmentName);
+    }
+    for (Map.Entry<String, String> entry : instanceStateMap.entrySet()) {
+      if (entry.getValue().equals(SegmentStateModel.ONLINE)) {
+        return entry.getKey();
+      }
+    }
+    throw new IllegalStateException("Failed to find ONLINE server for segment: " + segmentName);
+  }
+
+  @Override
+  protected SegmentZKMetadataCustomMapModifier getSegmentZKMetadataCustomMapModifier(PinotTaskConfig pinotTaskConfig,
+      SegmentConversionResult segmentConversionResult) {
+    return new SegmentZKMetadataCustomMapModifier(SegmentZKMetadataCustomMapModifier.ModifyMode.UPDATE,
+        Collections.singletonMap(MinionConstants.UpsertCompactionTask.TASK_TYPE + MinionConstants.TASK_TIME_SUFFIX,
+            String.valueOf(System.currentTimeMillis())));
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutorFactory.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutorFactory.java
new file mode 100644
index 00000000000..8989892f77a
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutorFactory.java
@@ -0,0 +1,49 @@
+/**
+ * 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.pinot.plugin.minion.tasks.upsertcompaction;
+
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.minion.MinionConf;
+import org.apache.pinot.minion.executor.MinionTaskZkMetadataManager;
+import org.apache.pinot.minion.executor.PinotTaskExecutor;
+import org.apache.pinot.minion.executor.PinotTaskExecutorFactory;
+import org.apache.pinot.spi.annotations.minion.TaskExecutorFactory;
+
+
+@TaskExecutorFactory
+public class UpsertCompactionTaskExecutorFactory implements PinotTaskExecutorFactory {
+
+  @Override
+  public void init(MinionTaskZkMetadataManager zkMetadataManager) {
+  }
+
+  @Override
+  public void init(MinionTaskZkMetadataManager zkMetadataManager, MinionConf minionConf) {
+  }
+
+  @Override
+  public String getTaskType() {
+    return MinionConstants.UpsertCompactionTask.TASK_TYPE;
+  }
+
+  @Override
+  public PinotTaskExecutor create() {
+    return new UpsertCompactionTaskExecutor();
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskGenerator.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskGenerator.java
new file mode 100644
index 00000000000..aa84ffefa56
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskGenerator.java
@@ -0,0 +1,276 @@
+/**
+ * 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.pinot.plugin.minion.tasks.upsertcompaction;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.BiMap;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.pinot.common.exception.InvalidConfigException;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
+import org.apache.pinot.controller.helix.core.minion.generator.BaseTaskGenerator;
+import org.apache.pinot.controller.util.CompletionServiceHelper;
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.core.common.MinionConstants.UpsertCompactionTask;
+import org.apache.pinot.core.minion.PinotTaskConfig;
+import org.apache.pinot.spi.annotations.minion.TaskGenerator;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.apache.pinot.spi.utils.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+@TaskGenerator
+public class UpsertCompactionTaskGenerator extends BaseTaskGenerator {
+  private static final Logger LOGGER = LoggerFactory.getLogger(UpsertCompactionTaskGenerator.class);
+  private static final String DEFAULT_BUFFER_PERIOD = "7d";
+  private static final double DEFAULT_INVALID_RECORDS_THRESHOLD_PERCENT = 0.0;
+  private static final long DEFAULT_INVALID_RECORDS_THRESHOLD_COUNT = 0;
+
+  public static class SegmentSelectionResult {
+
+    private List<SegmentZKMetadata> _segmentsForCompaction;
+
+    private List<String> _segmentsForDeletion;
+
+    SegmentSelectionResult(List<SegmentZKMetadata> segmentsForCompaction, List<String> segmentsForDeletion) {
+      _segmentsForCompaction = segmentsForCompaction;
+      _segmentsForDeletion = segmentsForDeletion;
+    }
+
+    public List<SegmentZKMetadata> getSegmentsForCompaction() {
+      return _segmentsForCompaction;
+    }
+
+    public List<String> getSegmentsForDeletion() {
+      return _segmentsForDeletion;
+    }
+  }
+
+  @Override
+  public String getTaskType() {
+    return MinionConstants.UpsertCompactionTask.TASK_TYPE;
+  }
+
+  @Override
+  public List<PinotTaskConfig> generateTasks(List<TableConfig> tableConfigs) {
+    String taskType = MinionConstants.UpsertCompactionTask.TASK_TYPE;
+    List<PinotTaskConfig> pinotTaskConfigs = new ArrayList<>();
+    for (TableConfig tableConfig : tableConfigs) {
+      if (!validate(tableConfig)) {
+        continue;
+      }
+
+      String tableNameWithType = tableConfig.getTableName();
+      LOGGER.info("Start generating task configs for table: {}", tableNameWithType);
+
+      Map<String, String> taskConfigs = tableConfig.getTaskConfig().getConfigsForTaskType(taskType);
+      List<SegmentZKMetadata> completedSegments = getCompletedSegments(tableNameWithType, taskConfigs);
+
+      if (completedSegments.isEmpty()) {
+        LOGGER.info("No completed segments were eligible for compaction for table: {}", tableNameWithType);
+        continue;
+      }
+
+      // get server to segment mappings
+      PinotHelixResourceManager pinotHelixResourceManager = _clusterInfoAccessor.getPinotHelixResourceManager();
+      Map<String, List<String>> serverToSegments = pinotHelixResourceManager.getServerToSegmentsMap(tableNameWithType);
+      BiMap<String, String> serverToEndpoints;
+      try {
+        serverToEndpoints = pinotHelixResourceManager.getDataInstanceAdminEndpoints(serverToSegments.keySet());
+      } catch (InvalidConfigException e) {
+        throw new RuntimeException(e);
+      }
+
+      Map<String, SegmentZKMetadata> completedSegmentsMap =
+          completedSegments.stream().collect(Collectors.toMap(SegmentZKMetadata::getSegmentName, Function.identity()));
+
+      List<String> validDocIdUrls;
+      try {
+        validDocIdUrls = getValidDocIdMetadataUrls(serverToSegments, serverToEndpoints, tableNameWithType,
+            completedSegmentsMap.keySet());
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+
+      // request the urls from the servers
+      CompletionServiceHelper completionServiceHelper =
+          new CompletionServiceHelper(_clusterInfoAccessor.getExecutor(), _clusterInfoAccessor.getConnectionManager(),
+              serverToEndpoints.inverse());
+
+      CompletionServiceHelper.CompletionServiceResponse serviceResponse =
+          completionServiceHelper.doMultiGetRequest(validDocIdUrls, tableNameWithType, false, 3000);
+
+      SegmentSelectionResult segmentSelectionResult =
+          processValidDocIdMetadata(taskConfigs, completedSegmentsMap, serviceResponse._httpResponses.entrySet());
+
+      if (!segmentSelectionResult.getSegmentsForDeletion().isEmpty()) {
+        pinotHelixResourceManager.deleteSegments(tableNameWithType, segmentSelectionResult.getSegmentsForDeletion(),
+            "0d");
+        LOGGER.info("Deleted segments containing only invalid records for table: {}", tableNameWithType);
+      }
+
+      int numTasks = 0;
+      int maxTasks = getMaxTasks(taskType, tableNameWithType, taskConfigs);
+      for (SegmentZKMetadata segment : segmentSelectionResult.getSegmentsForCompaction()) {
+        if (numTasks == maxTasks) {
+          break;
+        }
+        Map<String, String> configs = new HashMap<>();
+        configs.put(MinionConstants.TABLE_NAME_KEY, tableNameWithType);
+        configs.put(MinionConstants.SEGMENT_NAME_KEY, segment.getSegmentName());
+        configs.put(MinionConstants.DOWNLOAD_URL_KEY, segment.getDownloadUrl());
+        configs.put(MinionConstants.UPLOAD_URL_KEY, _clusterInfoAccessor.getVipUrl() + "/segments");
+        configs.put(MinionConstants.ORIGINAL_SEGMENT_CRC_KEY, String.valueOf(segment.getCrc()));
+        pinotTaskConfigs.add(new PinotTaskConfig(UpsertCompactionTask.TASK_TYPE, configs));
+        numTasks++;
+      }
+      LOGGER.info("Finished generating {} tasks configs for table: {}", numTasks, tableNameWithType);
+    }
+    return pinotTaskConfigs;
+  }
+
+  @VisibleForTesting
+  public static SegmentSelectionResult processValidDocIdMetadata(Map<String, String> taskConfigs,
+      Map<String, SegmentZKMetadata> completedSegmentsMap, Set<Map.Entry<String, String>> responseSet) {
+    double invalidRecordsThresholdPercent = Double.parseDouble(
+        taskConfigs.getOrDefault(UpsertCompactionTask.INVALID_RECORDS_THRESHOLD_PERCENT,
+            String.valueOf(DEFAULT_INVALID_RECORDS_THRESHOLD_PERCENT)));
+    long invalidRecordsThresholdCount = Long.parseLong(
+        taskConfigs.getOrDefault(UpsertCompactionTask.INVALID_RECORDS_THRESHOLD_COUNT,
+            String.valueOf(DEFAULT_INVALID_RECORDS_THRESHOLD_COUNT)));
+    List<SegmentZKMetadata> segmentsForCompaction = new ArrayList<>();
+    List<String> segmentsForDeletion = new ArrayList<>();
+    for (Map.Entry<String, String> streamResponse : responseSet) {
+      JsonNode allValidDocIdMetadata;
+      try {
+        allValidDocIdMetadata = JsonUtils.stringToJsonNode(streamResponse.getValue());
+      } catch (IOException e) {
+        LOGGER.error("Unable to parse validDocIdMetadata response for: {}", streamResponse.getKey());
+        continue;
+      }
+      Iterator<JsonNode> iterator = allValidDocIdMetadata.elements();
+      while (iterator.hasNext()) {
+        JsonNode validDocIdMetadata = iterator.next();
+        long totalInvalidDocs = validDocIdMetadata.get("totalInvalidDocs").asLong();
+        String segmentName = validDocIdMetadata.get("segmentName").asText();
+        SegmentZKMetadata segment = completedSegmentsMap.get(segmentName);
+        long totalDocs = validDocIdMetadata.get("totalDocs").asLong();
+        double invalidRecordPercent = ((double) totalInvalidDocs / totalDocs) * 100;
+        if (totalInvalidDocs == totalDocs) {
+          segmentsForDeletion.add(segment.getSegmentName());
+        } else if (invalidRecordPercent > invalidRecordsThresholdPercent
+            && totalInvalidDocs > invalidRecordsThresholdCount) {
+          segmentsForCompaction.add(segment);
+        }
+      }
+    }
+    return new SegmentSelectionResult(segmentsForCompaction, segmentsForDeletion);
+  }
+
+  @VisibleForTesting
+  public static List<String> getValidDocIdMetadataUrls(Map<String, List<String>> serverToSegments,
+      BiMap<String, String> serverToEndpoints, String tableNameWithType, Set<String> completedSegments)
+      throws URISyntaxException {
+    Set<String> remainingSegments = new HashSet<>(completedSegments);
+    List<String> urls = new ArrayList<>();
+    for (Map.Entry<String, List<String>> entry : serverToSegments.entrySet()) {
+      if (remainingSegments.isEmpty()) {
+        break;
+      }
+      String server = entry.getKey();
+      List<String> segmentNames = entry.getValue();
+      URIBuilder uriBuilder = new URIBuilder(serverToEndpoints.get(server)).setPath(
+          String.format("/tables/%s/validDocIdMetadata", tableNameWithType));
+      int completedSegmentCountPerServer = 0;
+      for (String segmentName : segmentNames) {
+        if (remainingSegments.remove(segmentName)) {
+          completedSegmentCountPerServer++;
+          uriBuilder.addParameter("segmentNames", segmentName);
+        }
+      }
+      if (completedSegmentCountPerServer > 0) {
+        // only add to the list if the server has completed segments
+        urls.add(uriBuilder.toString());
+      }
+    }
+    return urls;
+  }
+
+  private List<SegmentZKMetadata> getCompletedSegments(String tableNameWithType, Map<String, String> taskConfigs) {
+    List<SegmentZKMetadata> completedSegments = new ArrayList<>();
+    String bufferPeriod = taskConfigs.getOrDefault(UpsertCompactionTask.BUFFER_TIME_PERIOD_KEY, DEFAULT_BUFFER_PERIOD);
+    long bufferMs = TimeUtils.convertPeriodToMillis(bufferPeriod);
+    List<SegmentZKMetadata> allSegments = _clusterInfoAccessor.getSegmentsZKMetadata(tableNameWithType);
+    for (SegmentZKMetadata segment : allSegments) {
+      CommonConstants.Segment.Realtime.Status status = segment.getStatus();
+      // initial segments selection based on status and age
+      if (status.isCompleted() && (segment.getEndTimeMs() <= (System.currentTimeMillis() - bufferMs))) {
+        completedSegments.add(segment);
+      }
+    }
+    return completedSegments;
+  }
+
+  @VisibleForTesting
+  public static int getMaxTasks(String taskType, String tableNameWithType, Map<String, String> taskConfigs) {
+    int maxTasks = Integer.MAX_VALUE;
+    String tableMaxNumTasksConfig = taskConfigs.get(MinionConstants.TABLE_MAX_NUM_TASKS_KEY);
+    if (tableMaxNumTasksConfig != null) {
+      try {
+        maxTasks = Integer.parseInt(tableMaxNumTasksConfig);
+      } catch (Exception e) {
+        LOGGER.warn("MaxNumTasks have been wrongly set for table : {}, and task {}", tableNameWithType, taskType);
+      }
+    }
+    return maxTasks;
+  }
+
+  @VisibleForTesting
+  static boolean validate(TableConfig tableConfig) {
+    String taskType = MinionConstants.UpsertCompactionTask.TASK_TYPE;
+    String tableNameWithType = tableConfig.getTableName();
+    if (tableConfig.getTableType() == TableType.OFFLINE) {
+      LOGGER.warn("Skip generation task: {} for table: {}, offline table is not supported", taskType,
+          tableNameWithType);
+      return false;
+    }
+    if (!tableConfig.isUpsertEnabled()) {
+      LOGGER.warn("Skip generation task: {} for table: {}, table without upsert enabled is not supported", taskType,
+          tableNameWithType);
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskProgressObserverFactory.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskProgressObserverFactory.java
new file mode 100644
index 00000000000..591a21b8ff1
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskProgressObserverFactory.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.plugin.minion.tasks.upsertcompaction;
+
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.minion.event.BaseMinionProgressObserverFactory;
+import org.apache.pinot.spi.annotations.minion.EventObserverFactory;
+
+
+@EventObserverFactory
+public class UpsertCompactionTaskProgressObserverFactory extends BaseMinionProgressObserverFactory {
+
+  @Override
+  public String getTaskType() {
+    return MinionConstants.UpsertCompactionTask.TASK_TYPE;
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtilsTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtilsTest.java
new file mode 100644
index 00000000000..bac8486e0c0
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/SegmentConversionUtilsTest.java
@@ -0,0 +1,80 @@
+/**
+ * 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.pinot.plugin.minion.tasks;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.sun.net.httpserver.HttpServer;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.util.Random;
+import org.apache.http.HttpStatus;
+import org.apache.pinot.common.utils.FileUploadDownloadClient;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+public class SegmentConversionUtilsTest {
+  private static final String TEST_TABLE_WITHOUT_TYPE = "myTable";
+  private static final String TEST_TABLE_TYPE = "REALTIME";
+
+  private static final String TEST_TABLE_SEGMENT_1 = "myTable_REALTIME_segment_1";
+
+  private static final String TEST_TABLE_SEGMENT_2 = "myTable_REALTIME_segment_2";
+  private static final String TEST_TABLE_SEGMENT_3 = "myTable_REALTIME_segment_3";
+  private static final String TEST_SCHEME = "http";
+  private static final String TEST_HOST = "localhost";
+  private static final int TEST_PORT = new Random().nextInt(10000) + 10000;
+  private HttpServer _testServer;
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    _testServer = HttpServer.create(new InetSocketAddress(TEST_PORT), 0);
+    _testServer.createContext("/segments/myTable", exchange -> {
+      String response = JsonUtils.objectToString(
+          ImmutableList.of(
+              ImmutableMap.of(TEST_TABLE_TYPE, ImmutableList.of(TEST_TABLE_SEGMENT_1, TEST_TABLE_SEGMENT_2))));
+      exchange.sendResponseHeaders(HttpStatus.SC_OK, response.length());
+      OutputStream os = exchange.getResponseBody();
+      os.write(response.getBytes());
+      os.close();
+    });
+    _testServer.setExecutor(null); // creates a default executor
+    _testServer.start();
+  }
+
+  @Test
+  public void testNonExistentSegments()
+      throws Exception {
+    Assert.assertEquals(
+        SegmentConversionUtils.getSegmentNamesForTable(TEST_TABLE_WITHOUT_TYPE + "_" + TEST_TABLE_TYPE,
+        FileUploadDownloadClient.getURI(TEST_SCHEME, TEST_HOST, TEST_PORT), null),
+        ImmutableSet.of(TEST_TABLE_SEGMENT_1, TEST_TABLE_SEGMENT_2));
+  }
+
+  @AfterClass
+  public void shutDown() {
+    _testServer.stop(0);
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java
index d8f955be8a4..29a2cdd25aa 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/purge/PurgeTaskExecutorTest.java
@@ -26,6 +26,7 @@
 import org.apache.helix.AccessOption;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.utils.SchemaUtils;
 import org.apache.pinot.common.utils.config.TableConfigUtils;
 import org.apache.pinot.core.common.MinionConstants;
 import org.apache.pinot.core.minion.PinotTaskConfig;
@@ -95,6 +96,8 @@ public void setUp()
     ZkHelixPropertyStore<ZNRecord> helixPropertyStore = Mockito.mock(ZkHelixPropertyStore.class);
     Mockito.when(helixPropertyStore.get("/CONFIGS/TABLE/testTable_OFFLINE", null, AccessOption.PERSISTENT))
         .thenReturn(TableConfigUtils.toZNRecord(tableConfig));
+    Mockito.when(helixPropertyStore.get("/SCHEMAS/testTable", null, AccessOption.PERSISTENT))
+        .thenReturn(SchemaUtils.toZNRecord(schema));
     minionContext.setHelixPropertyStore(helixPropertyStore);
     minionContext.setRecordPurgerFactory(rawTableName -> {
       if (rawTableName.equals(TABLE_NAME)) {
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutorTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutorTest.java
new file mode 100644
index 00000000000..604c58f6d03
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskExecutorTest.java
@@ -0,0 +1,63 @@
+/**
+ * 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.pinot.plugin.minion.tasks.upsertcompaction;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.ExternalView;
+import org.apache.pinot.minion.MinionContext;
+import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class UpsertCompactionTaskExecutorTest {
+  private static final String REALTIME_TABLE_NAME = "testTable_REALTIME";
+  private static final String SEGMENT_NAME = "testSegment";
+  private static final String CLUSTER_NAME = "testCluster";
+
+  @Test
+  public void testGetServer() {
+    ExternalView externalView = new ExternalView(REALTIME_TABLE_NAME);
+    Map<String, Map<String, String>> externalViewSegmentAssignment = externalView.getRecord().getMapFields();
+    Map<String, String> map = new HashMap<>();
+    map.put("server1", SegmentStateModel.ONLINE);
+    externalViewSegmentAssignment.put(SEGMENT_NAME, map);
+    HelixAdmin clusterManagementTool = Mockito.mock(HelixAdmin.class);
+    MinionContext minionContext = MinionContext.getInstance();
+    Mockito.when(clusterManagementTool.getResourceExternalView(CLUSTER_NAME, REALTIME_TABLE_NAME))
+        .thenReturn(externalView);
+    HelixManager helixManager = Mockito.mock(HelixManager.class);
+    Mockito.when(helixManager.getClusterName()).thenReturn(CLUSTER_NAME);
+    Mockito.when(helixManager.getClusterManagmentTool()).thenReturn(clusterManagementTool);
+    minionContext.setHelixManager(helixManager);
+
+    String server = UpsertCompactionTaskExecutor.getServer(SEGMENT_NAME, REALTIME_TABLE_NAME);
+
+    Assert.assertEquals(server, "server1");
+
+    // verify exception thrown with OFFLINE server
+    map.put("server1", SegmentStateModel.OFFLINE);
+    Assert.assertThrows(IllegalStateException.class,
+        () -> UpsertCompactionTaskExecutor.getServer(SEGMENT_NAME, REALTIME_TABLE_NAME));
+  }
+}
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskGeneratorTest.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskGeneratorTest.java
new file mode 100644
index 00000000000..9c93979d9f3
--- /dev/null
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/test/java/org/apache/pinot/plugin/minion/tasks/upsertcompaction/UpsertCompactionTaskGeneratorTest.java
@@ -0,0 +1,273 @@
+/**
+ * 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.pinot.plugin.minion.tasks.upsertcompaction;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import java.net.URISyntaxException;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.controller.helix.core.minion.ClusterInfoAccessor;
+import org.apache.pinot.core.common.MinionConstants;
+import org.apache.pinot.core.common.MinionConstants.UpsertCompactionTask;
+import org.apache.pinot.core.minion.PinotTaskConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableTaskConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.config.table.UpsertConfig;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.TimeUtils;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+public class UpsertCompactionTaskGeneratorTest {
+  private static final String RAW_TABLE_NAME = "testTable";
+  private static final String REALTIME_TABLE_NAME = "testTable_REALTIME";
+  private static final String TIME_COLUMN_NAME = "millisSinceEpoch";
+  private UpsertCompactionTaskGenerator _taskGenerator;
+  private TableConfig _tableConfig;
+  private ClusterInfoAccessor _mockClusterInfoAccessor;
+  private SegmentZKMetadata _completedSegment;
+  private SegmentZKMetadata _completedSegment2;
+  private Map<String, SegmentZKMetadata> _completedSegmentsMap;
+
+  @BeforeClass
+  public void setUp() {
+    _taskGenerator = new UpsertCompactionTaskGenerator();
+    Map<String, Map<String, String>> tableTaskConfigs = new HashMap<>();
+    Map<String, String> compactionConfigs = new HashMap<>();
+    tableTaskConfigs.put(UpsertCompactionTask.TASK_TYPE, compactionConfigs);
+    _tableConfig =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(RAW_TABLE_NAME).setTimeColumnName(TIME_COLUMN_NAME)
+            .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL))
+            .setTaskConfig(new TableTaskConfig(tableTaskConfigs)).build();
+    _mockClusterInfoAccessor = mock(ClusterInfoAccessor.class);
+
+    _completedSegment = new SegmentZKMetadata("testTable__0");
+    _completedSegment.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
+    _completedSegment.setStartTime(System.currentTimeMillis() - TimeUtils.convertPeriodToMillis("2d"));
+    _completedSegment.setEndTime(System.currentTimeMillis() - TimeUtils.convertPeriodToMillis("1d"));
+    _completedSegment.setTimeUnit(TimeUnit.MILLISECONDS);
+    _completedSegment.setTotalDocs(100L);
+
+    _completedSegment2 = new SegmentZKMetadata("testTable__1");
+    _completedSegment2.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
+    _completedSegment2.setStartTime(System.currentTimeMillis() - TimeUtils.convertPeriodToMillis("1d"));
+    _completedSegment2.setEndTime(System.currentTimeMillis());
+    _completedSegment2.setTimeUnit(TimeUnit.MILLISECONDS);
+    _completedSegment2.setTotalDocs(10L);
+
+    _completedSegmentsMap = new HashMap<>();
+    _completedSegmentsMap.put(_completedSegment.getSegmentName(), _completedSegment);
+    _completedSegmentsMap.put(_completedSegment2.getSegmentName(), _completedSegment2);
+  }
+
+  @Test
+  public void testValidate() {
+    TableConfig tableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setTimeColumnName(TIME_COLUMN_NAME)
+            .build();
+    assertFalse(UpsertCompactionTaskGenerator.validate(tableConfig));
+
+    TableConfigBuilder tableConfigBuilder =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(RAW_TABLE_NAME).setTimeColumnName(TIME_COLUMN_NAME);
+    assertFalse(UpsertCompactionTaskGenerator.validate(tableConfigBuilder.build()));
+
+    tableConfigBuilder = tableConfigBuilder.setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL));
+    assertTrue(UpsertCompactionTaskGenerator.validate(tableConfigBuilder.build()));
+  }
+
+  @Test
+  public void testGenerateTasksValidatesTableConfigs() {
+    UpsertCompactionTaskGenerator taskGenerator = new UpsertCompactionTaskGenerator();
+    TableConfig offlineTableConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME).setTimeColumnName(TIME_COLUMN_NAME)
+            .build();
+    List<PinotTaskConfig> pinotTaskConfigs = taskGenerator.generateTasks(Lists.newArrayList(offlineTableConfig));
+    assertTrue(pinotTaskConfigs.isEmpty());
+
+    TableConfig realtimeTableConfig =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(RAW_TABLE_NAME).setTimeColumnName(TIME_COLUMN_NAME)
+            .build();
+    pinotTaskConfigs = taskGenerator.generateTasks(Lists.newArrayList(realtimeTableConfig));
+    assertTrue(pinotTaskConfigs.isEmpty());
+  }
+
+  @Test
+  public void testGenerateTasksWithNoSegments() {
+    when(_mockClusterInfoAccessor.getSegmentsZKMetadata(REALTIME_TABLE_NAME)).thenReturn(
+        Lists.newArrayList(Collections.emptyList()));
+    _taskGenerator.init(_mockClusterInfoAccessor);
+
+    List<PinotTaskConfig> pinotTaskConfigs = _taskGenerator.generateTasks(Lists.newArrayList(_tableConfig));
+
+    assertEquals(pinotTaskConfigs.size(), 0);
+  }
+
+  @Test
+  public void testGenerateTasksWithConsumingSegment() {
+    SegmentZKMetadata consumingSegment = new SegmentZKMetadata("testTable__0");
+    consumingSegment.setStatus(CommonConstants.Segment.Realtime.Status.IN_PROGRESS);
+    when(_mockClusterInfoAccessor.getSegmentsZKMetadata(REALTIME_TABLE_NAME)).thenReturn(
+        Lists.newArrayList(consumingSegment));
+    _taskGenerator.init(_mockClusterInfoAccessor);
+
+    List<PinotTaskConfig> pinotTaskConfigs = _taskGenerator.generateTasks(Lists.newArrayList(_tableConfig));
+
+    assertEquals(pinotTaskConfigs.size(), 0);
+  }
+
+  @Test
+  public void testGenerateTasksWithNewlyCompletedSegment() {
+    when(_mockClusterInfoAccessor.getSegmentsZKMetadata(REALTIME_TABLE_NAME)).thenReturn(
+        Lists.newArrayList(_completedSegment));
+    _taskGenerator.init(_mockClusterInfoAccessor);
+
+    List<PinotTaskConfig> pinotTaskConfigs = _taskGenerator.generateTasks(Lists.newArrayList(_tableConfig));
+
+    assertEquals(pinotTaskConfigs.size(), 0);
+  }
+
+  @Test
+  public void testGetValidDocIdMetadataUrls()
+      throws URISyntaxException {
+    Map<String, List<String>> serverToSegments = new HashMap<>();
+    serverToSegments.put("server1",
+        Lists.newArrayList(_completedSegment.getSegmentName(), _completedSegment2.getSegmentName()));
+    serverToSegments.put("server2", Lists.newArrayList("consumingSegment"));
+    BiMap<String, String> serverToEndpoints = HashBiMap.create(1);
+    serverToEndpoints.put("server1", "http://endpoint1");
+    serverToEndpoints.put("server2", "http://endpoint2");
+    Set<String> completedSegments = new HashSet<>();
+    completedSegments.add(_completedSegment.getSegmentName());
+    completedSegments.add(_completedSegment2.getSegmentName());
+
+    List<String> validDocIdUrls =
+        UpsertCompactionTaskGenerator.getValidDocIdMetadataUrls(serverToSegments, serverToEndpoints,
+            REALTIME_TABLE_NAME, completedSegments);
+
+    String expectedUrl =
+        String.format("%s/tables/%s/validDocIdMetadata?segmentNames=%s&segmentNames=%s", "http://endpoint1",
+            REALTIME_TABLE_NAME, _completedSegment.getSegmentName(), _completedSegment2.getSegmentName());
+    assertEquals(validDocIdUrls.get(0), expectedUrl);
+    assertEquals(validDocIdUrls.size(), 1);
+  }
+
+  @Test
+  public void testGetValidDocIdMetadataUrlsWithReplicatedSegments()
+      throws URISyntaxException {
+    Map<String, List<String>> serverToSegments = new LinkedHashMap<>();
+    serverToSegments.put("server1",
+        Lists.newArrayList(_completedSegment.getSegmentName(), _completedSegment2.getSegmentName()));
+    serverToSegments.put("server2",
+        Lists.newArrayList(_completedSegment.getSegmentName(), _completedSegment2.getSegmentName()));
+    BiMap<String, String> serverToEndpoints = HashBiMap.create(1);
+    serverToEndpoints.put("server1", "http://endpoint1");
+    serverToEndpoints.put("server2", "http://endpoint2");
+    Set<String> completedSegments = new HashSet<>();
+    completedSegments.add(_completedSegment.getSegmentName());
+    completedSegments.add(_completedSegment2.getSegmentName());
+
+    List<String> validDocIdUrls =
+        UpsertCompactionTaskGenerator.getValidDocIdMetadataUrls(serverToSegments, serverToEndpoints,
+            REALTIME_TABLE_NAME, completedSegments);
+
+    String expectedUrl =
+        String.format("%s/tables/%s/validDocIdMetadata?segmentNames=%s&segmentNames=%s", "http://endpoint1",
+            REALTIME_TABLE_NAME, _completedSegment.getSegmentName(), _completedSegment2.getSegmentName());
+    assertEquals(validDocIdUrls.get(0), expectedUrl);
+    assertEquals(validDocIdUrls.size(), 1);
+  }
+
+  @Test
+  public void testGetMaxTasks() {
+    Map<String, String> taskConfigs = new HashMap<>();
+    taskConfigs.put(MinionConstants.TABLE_MAX_NUM_TASKS_KEY, "10");
+
+    int maxTasks =
+        UpsertCompactionTaskGenerator.getMaxTasks(UpsertCompactionTask.TASK_TYPE, REALTIME_TABLE_NAME, taskConfigs);
+
+    assertEquals(maxTasks, 10);
+  }
+
+  @Test
+  public void testProcessValidDocIdMetadata() {
+    Map<String, String> compactionConfigs = getCompactionConfigs("1", "10");
+    Set<Map.Entry<String, String>> responseSet = new HashSet<>();
+    String json = "[{" + "\"totalValidDocs\" : 50," + "\"totalInvalidDocs\" : 50," + "\"segmentName\" : \""
+        + _completedSegment.getSegmentName() + "\"," + "\"totalDocs\" : 100" + "}," + "{" + "\"totalValidDocs\" : 0,"
+        + "\"totalInvalidDocs\" : 10," + "\"segmentName\" : \"" + _completedSegment2.getSegmentName() + "\","
+        + "\"totalDocs\" : 10" + "}]";
+    responseSet.add(new AbstractMap.SimpleEntry<>("", json));
+    UpsertCompactionTaskGenerator.SegmentSelectionResult segmentSelectionResult =
+        UpsertCompactionTaskGenerator.processValidDocIdMetadata(compactionConfigs, _completedSegmentsMap, responseSet);
+    assertEquals(segmentSelectionResult.getSegmentsForCompaction().get(0).getSegmentName(),
+        _completedSegment.getSegmentName());
+    assertEquals(segmentSelectionResult.getSegmentsForDeletion().get(0), _completedSegment2.getSegmentName());
+
+    // test with a higher invalidRecordsThresholdPercent
+    compactionConfigs = getCompactionConfigs("60", "10");
+    segmentSelectionResult =
+        UpsertCompactionTaskGenerator.processValidDocIdMetadata(compactionConfigs, _completedSegmentsMap, responseSet);
+    assertTrue(segmentSelectionResult.getSegmentsForCompaction().isEmpty());
+
+    // test without an invalidRecordsThresholdPercent
+    compactionConfigs = getCompactionConfigs("0", "10");
+    segmentSelectionResult =
+        UpsertCompactionTaskGenerator.processValidDocIdMetadata(compactionConfigs, _completedSegmentsMap, responseSet);
+    assertEquals(segmentSelectionResult.getSegmentsForCompaction().get(0).getSegmentName(),
+        _completedSegment.getSegmentName());
+
+    // test without a invalidRecordsThresholdCount
+    compactionConfigs = getCompactionConfigs("30", "0");
+    segmentSelectionResult =
+        UpsertCompactionTaskGenerator.processValidDocIdMetadata(compactionConfigs, _completedSegmentsMap, responseSet);
+    assertEquals(segmentSelectionResult.getSegmentsForCompaction().get(0).getSegmentName(),
+        _completedSegment.getSegmentName());
+  }
+
+  private Map<String, String> getCompactionConfigs(String invalidRecordsThresholdPercent,
+      String invalidRecordsThresholdCount) {
+    Map<String, String> compactionConfigs = new HashMap<>();
+    if (!invalidRecordsThresholdPercent.equals("0")) {
+      compactionConfigs.put(UpsertCompactionTask.INVALID_RECORDS_THRESHOLD_PERCENT, invalidRecordsThresholdPercent);
+    }
+    if (!invalidRecordsThresholdCount.equals("0")) {
+      compactionConfigs.put(UpsertCompactionTask.INVALID_RECORDS_THRESHOLD_COUNT, invalidRecordsThresholdCount);
+    }
+    return compactionConfigs;
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/README.md b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/README.md
deleted file mode 100644
index dcb54069fdd..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-# Pinot connector for kafka 0.9.x
-
-This is an implementation of the kafka stream for kafka versions 0.9.x. The version used in this implementation is kafka 0.9.0.1. This module compiles with version 0.9.0.0 as well, however we have not tested if it runs with the older versions.
-A stream plugin for another version of kafka, or another stream, can be added in a similar fashion. Refer to documentation on (Pluggable Streams)[https://docs.pinot.apache.org/developers-and-contributors/extending-pinot/pluggable-streams] for the specfic interfaces to implement.
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml
deleted file mode 100644
index 72ea723269a..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>pinot-stream-ingestion</artifactId>
-    <groupId>org.apache.pinot</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-
-  <artifactId>pinot-kafka-0.9</artifactId>
-  <name>Pinot Kafka 0.9</name>
-  <url>https://pinot.apache.org/</url>
-  <properties>
-    <pinot.root>${basedir}/../../..</pinot.root>
-    <kafka.lib.version>0.9.0.1</kafka.lib.version>
-    <kafka.scala.version>2.10</kafka.scala.version>
-    <phase.prop>package</phase.prop>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-kafka-base</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <!-- Kafka  -->
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka_2.10</artifactId>
-      <version>${kafka.lib.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>net.sf.jopt-simple</groupId>
-          <artifactId>jopt-simple</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>2.10.5</version>
-    </dependency>
-  </dependencies>
-  <profiles>
-    <profile>
-      <id>build-shaded-jar</id>
-      <activation>
-        <property>
-          <name>skipShade</name>
-          <value>!true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-              <execution>
-                <phase>${phase.prop}</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <transformers>
-                    <transformer
-                        implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-                  </transformers>
-                  <!--
-                  Usually in hadoop environment, there are multiple jars with different versions.
-                  Most of the NoSuchMethodExceptions are caused by class loading conflicts.
-                  Class relocation ensures the reference of certain packages/classes in Pinot code to
-                  shaded libs, e.g. jackson or guava.
-                  Ref: https://maven.apache.org/plugins/maven-shade-plugin/examples/class-relocation.html
-                  -->
-                  <relocations>
-                    <relocation>
-                      <pattern>com.google.common</pattern>
-                      <shadedPattern>${shade.prefix}.com.google.common</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.fasterxml.jackson</pattern>
-                      <shadedPattern>${shade.prefix}.com.fasterxml.jackson</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>org.apache.http</pattern>
-                      <shadedPattern>${shade.prefix}.org.apache.http</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>software.amazon</pattern>
-                      <shadedPattern>${shade.prefix}.software.amazon</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>org.reflections</pattern>
-                      <shadedPattern>${shade.prefix}.org.reflections</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>io.netty</pattern>
-                      <shadedPattern>${shade.prefix}.io.netty</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>org.apache.parquet</pattern>
-                      <shadedPattern>${shade.prefix}.org.apache.parquet</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>org.apache.kafka</pattern>
-                      <shadedPattern>${shade.prefix}.kafka09.org.apache.kafka</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>kafka</pattern>
-                      <shadedPattern>${shade.prefix}.kafka09.kafka</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>scala</pattern>
-                      <shadedPattern>${shade.prefix}.scala_2_10</shadedPattern>
-                    </relocation>
-                  </relocations>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/ConsumerAndIterator.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/ConsumerAndIterator.java
deleted file mode 100644
index 5d79dfd28f5..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/ConsumerAndIterator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import java.util.concurrent.atomic.AtomicLong;
-import kafka.consumer.ConsumerIterator;
-import kafka.javaapi.consumer.ConsumerConnector;
-
-
-/**
- * Immutable tuple object for a Kafka consumer and stream iterator.
- */
-public class ConsumerAndIterator {
-  private static final AtomicLong ID_GENERATOR = new AtomicLong(0L);
-
-  private final ConsumerConnector _consumer;
-  private final ConsumerIterator<byte[], byte[]> _iterator;
-  private final long _id;
-
-  ConsumerAndIterator(final ConsumerConnector consumer, final ConsumerIterator<byte[], byte[]> iterator) {
-    _consumer = consumer;
-    _iterator = iterator;
-    _id = ID_GENERATOR.getAndIncrement();
-  }
-
-  public ConsumerConnector getConsumer() {
-    return _consumer;
-  }
-
-  public ConsumerIterator<byte[], byte[]> getIterator() {
-    return _iterator;
-  }
-
-  public long getId() {
-    return _id;
-  }
-
-  @Override
-  public String toString() {
-    return "ConsumerAndIterator{" + "_consumer=" + _consumer + ", _iterator=" + _iterator + ", _id=" + _id + '}';
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaBrokerWrapper.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaBrokerWrapper.java
deleted file mode 100644
index 2f796a1d0ea..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaBrokerWrapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import java.lang.reflect.Method;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * This is a work around for kafka 8 and 9.
- *
- * In order to consume data from kafka using simple consumer, we need to know the leader kafka
- * broker for each kafka partition from {@link kafka.javaapi.PartitionMetadata}. But
- * {@link kafka.javaapi.PartitionMetadata} will give two different type of objects in kafka8 and kafka9.
- *
- * In kafka8, it will give {@link kafka.cluster.Broker}.
- * In kafka9, it will give {@link kafka.cluster.BrokerEndPoint}.
- *
- * In Pinot, we need to get host and port from this leader broker object, so this wrapper is made
- * to treat {@link kafka.cluster.Broker} and {@link kafka.cluster.BrokerEndPoint} as object, and
- * underlying use java reflection to provide the method access to host() method for
- * {@link kafka.cluster.Broker#host()} and {@link kafka.cluster.BrokerEndPoint#host()},
- * as long as port method: {@link kafka.cluster.Broker#port()} and {@link kafka.cluster.BrokerEndPoint#port()}.
- *
- */
-public class KafkaBrokerWrapper {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaBrokerWrapper.class);
-
-  private final Object _kafkaBroker;
-
-  public KafkaBrokerWrapper(Object kafkaBroker) {
-    _kafkaBroker = kafkaBroker;
-  }
-
-  public String host() {
-    if (_kafkaBroker != null) {
-      try {
-        Method method = _kafkaBroker.getClass().getMethod("host", new Class<?>[0]);
-        return (String) method.invoke(_kafkaBroker);
-      } catch (Exception e) {
-        LOGGER.error("Failed to get host() method from KafkaBroker Object: {}", _kafkaBroker, e);
-      }
-    }
-    return "";
-  }
-
-  public int port() {
-    if (_kafkaBroker != null) {
-      try {
-        Method method = _kafkaBroker.getClass().getMethod("port", new Class<?>[0]);
-        return (int) method.invoke(_kafkaBroker);
-      } catch (Exception e) {
-        LOGGER.error("Failed to get port() method from KafkaBroker Object: {}", _kafkaBroker, e);
-      }
-    }
-    return 0;
-  }
-
-  @Override
-  public String toString() {
-    return host() + ":" + port();
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConnectionHandler.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConnectionHandler.java
deleted file mode 100644
index 5ac9886a9b9..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConnectionHandler.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Uninterruptibles;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import kafka.javaapi.PartitionMetadata;
-import kafka.javaapi.TopicMetadataRequest;
-import kafka.javaapi.TopicMetadataResponse;
-import kafka.javaapi.consumer.SimpleConsumer;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.kafka.common.protocol.Errors;
-import org.apache.pinot.spi.stream.PermanentConsumerException;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.stream.TransientConsumerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Provides the kafka connection after ensuring that we're connected to the appropriate broker for consumption.
- */
-public class KafkaConnectionHandler {
-  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaConnectionHandler.class);
-
-  enum ConsumerState {
-    CONNECTING_TO_BOOTSTRAP_NODE,
-    CONNECTED_TO_BOOTSTRAP_NODE,
-    FETCHING_LEADER_INFORMATION,
-    CONNECTING_TO_PARTITION_LEADER,
-    CONNECTED_TO_PARTITION_LEADER
-  }
-
-  State _currentState;
-
-  final String _clientId;
-  final String _topic;
-  final int _partition;
-  final long _connectTimeoutMillis;
-
-  String[] _bootstrapHosts;
-  int[] _bootstrapPorts;
-  KafkaBrokerWrapper _leader;
-  String _currentHost;
-  int _currentPort;
-  int _bufferSize;
-  int _socketTimeout;
-
-  final KafkaSimpleConsumerFactory _simpleConsumerFactory;
-  SimpleConsumer _simpleConsumer;
-
-  final Random _random = new Random();
-
-  boolean _isPartitionProvided;
-
-  private final KafkaLowLevelStreamConfig _kafkaLowLevelStreamConfig;
-
-  @VisibleForTesting
-  public SimpleConsumer getSimpleConsumer() {
-    return _simpleConsumer;
-  }
-
-  /**
-   * A Kafka protocol error that indicates a situation that is not likely to clear up by retrying the request (for
-   * example, no such topic).
-   */
-  private class KafkaPermanentConsumerException extends RuntimeException {
-    public KafkaPermanentConsumerException(Errors error) {
-      super(error.exception());
-    }
-  }
-
-  /**
-   * A Kafka protocol error that indicates a situation that is likely to be transient (for example, network error or
-   * broker not available).
-   */
-  private class KafkaTransientConsumerException extends RuntimeException {
-    public KafkaTransientConsumerException(Errors error) {
-      super(error.exception());
-    }
-  }
-
-  /**
-   * Creates a kafka connection given the stream metadata
-   * @param streamConfig
-   * @param simpleConsumerFactory
-   */
-  public KafkaConnectionHandler(String clientId, StreamConfig streamConfig,
-      KafkaSimpleConsumerFactory simpleConsumerFactory) {
-    _kafkaLowLevelStreamConfig = new KafkaLowLevelStreamConfig(streamConfig);
-    _simpleConsumerFactory = simpleConsumerFactory;
-    _clientId = clientId;
-    _topic = _kafkaLowLevelStreamConfig.getKafkaTopicName();
-    _connectTimeoutMillis = streamConfig.getConnectionTimeoutMillis();
-    _simpleConsumer = null;
-
-    _isPartitionProvided = false;
-    _partition = Integer.MIN_VALUE;
-
-    _bufferSize = _kafkaLowLevelStreamConfig.getKafkaBufferSize();
-    _socketTimeout = _kafkaLowLevelStreamConfig.getKafkaSocketTimeout();
-    initializeBootstrapNodeList(_kafkaLowLevelStreamConfig.getBootstrapHosts());
-    setCurrentState(new ConnectingToBootstrapNode());
-  }
-
-  /**
-   * Creates a kafka connection given the stream metadata and partition
-   * @param streamConfig
-   * @param partition
-   * @param simpleConsumerFactory
-   */
-  public KafkaConnectionHandler(String clientId, StreamConfig streamConfig, int partition,
-      KafkaSimpleConsumerFactory simpleConsumerFactory) {
-
-    _kafkaLowLevelStreamConfig = new KafkaLowLevelStreamConfig(streamConfig);
-    _simpleConsumerFactory = simpleConsumerFactory;
-    _clientId = clientId;
-    _topic = _kafkaLowLevelStreamConfig.getKafkaTopicName();
-    _connectTimeoutMillis = streamConfig.getConnectionTimeoutMillis();
-    _simpleConsumer = null;
-
-    _isPartitionProvided = true;
-    _partition = partition;
-
-    _bufferSize = _kafkaLowLevelStreamConfig.getKafkaBufferSize();
-    _socketTimeout = _kafkaLowLevelStreamConfig.getKafkaSocketTimeout();
-    initializeBootstrapNodeList(_kafkaLowLevelStreamConfig.getBootstrapHosts());
-    setCurrentState(new ConnectingToBootstrapNode());
-  }
-
-  void initializeBootstrapNodeList(String bootstrapNodes) {
-
-    if (StringUtils.isBlank(bootstrapNodes)) {
-      throw new IllegalArgumentException("Need at least one bootstrap host");
-    }
-
-    ArrayList<String> hostsAndPorts =
-        Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(bootstrapNodes));
-    final int bootstrapHostCount = hostsAndPorts.size();
-    _bootstrapHosts = new String[bootstrapHostCount];
-    _bootstrapPorts = new int[bootstrapHostCount];
-
-    for (int i = 0; i < bootstrapHostCount; i++) {
-      String hostAndPort = hostsAndPorts.get(i);
-      String[] splitHostAndPort = hostAndPort.split(":");
-      if (splitHostAndPort.length != 2) {
-        throw new IllegalArgumentException("Unable to parse host:port combination for " + hostAndPort);
-      }
-
-      _bootstrapHosts[i] = splitHostAndPort[0];
-
-      try {
-        _bootstrapPorts[i] = Integer.parseInt(splitHostAndPort[1]);
-      } catch (NumberFormatException e) {
-        throw new IllegalArgumentException(
-            "Could not parse port number " + splitHostAndPort[1] + " for host:port combination " + hostAndPort);
-      }
-    }
-  }
-
-  protected KafkaLowLevelStreamConfig getkafkaLowLevelStreamConfig() {
-    return _kafkaLowLevelStreamConfig;
-  }
-
-  abstract class State {
-    private ConsumerState _stateValue;
-
-    protected State(ConsumerState stateValue) {
-      _stateValue = stateValue;
-    }
-
-    abstract void process();
-
-    abstract boolean isConnectedToKafkaBroker();
-
-    void handleConsumerException(Exception e) {
-      // By default, just log the exception and switch back to CONNECTING_TO_BOOTSTRAP_NODE (which will take care of
-      // closing the connection if it exists)
-      LOGGER.warn("Caught Kafka consumer exception while in state {}, disconnecting and trying again for topic {}",
-          _currentState.getStateValue(), _topic, e);
-
-      Uninterruptibles.sleepUninterruptibly(250, TimeUnit.MILLISECONDS);
-
-      setCurrentState(new ConnectingToBootstrapNode());
-    }
-
-    ConsumerState getStateValue() {
-      return _stateValue;
-    }
-  }
-
-  private class ConnectingToBootstrapNode extends State {
-    public ConnectingToBootstrapNode() {
-      super(ConsumerState.CONNECTING_TO_BOOTSTRAP_NODE);
-    }
-
-    @Override
-    public void process() {
-      // Connect to a random bootstrap node
-      if (_simpleConsumer != null) {
-        try {
-          _simpleConsumer.close();
-        } catch (Exception e) {
-          LOGGER.warn("Caught exception while closing consumer for topic {}, ignoring", _topic, e);
-        }
-      }
-
-      int randomHostIndex = _random.nextInt(_bootstrapHosts.length);
-      _currentHost = _bootstrapHosts[randomHostIndex];
-      _currentPort = _bootstrapPorts[randomHostIndex];
-
-      try {
-        LOGGER.info("Connecting to bootstrap host {}:{} for topic {}", _currentHost, _currentPort, _topic);
-        _simpleConsumer = _simpleConsumerFactory
-            .buildSimpleConsumer(_currentHost, _currentPort, _socketTimeout, _bufferSize, _clientId);
-        setCurrentState(new ConnectedToBootstrapNode());
-      } catch (Exception e) {
-        handleConsumerException(e);
-      }
-    }
-
-    @Override
-    boolean isConnectedToKafkaBroker() {
-      return false;
-    }
-  }
-
-  private class ConnectedToBootstrapNode extends State {
-    protected ConnectedToBootstrapNode() {
-      super(ConsumerState.CONNECTED_TO_BOOTSTRAP_NODE);
-    }
-
-    @Override
-    void process() {
-      if (_isPartitionProvided) {
-        // If we're consuming from a partition, we need to find the leader so that we can consume from it. By design,
-        // Kafka only allows consumption from the leader and not one of the in-sync replicas.
-        setCurrentState(new FetchingLeaderInformation());
-      }
-    }
-
-    @Override
-    boolean isConnectedToKafkaBroker() {
-      return true;
-    }
-  }
-
-  private class FetchingLeaderInformation extends State {
-    public FetchingLeaderInformation() {
-      super(ConsumerState.FETCHING_LEADER_INFORMATION);
-    }
-
-    @Override
-    void process() {
-      // Fetch leader information
-      try {
-        TopicMetadataResponse response =
-            _simpleConsumer.send(new TopicMetadataRequest(Collections.singletonList(_topic)));
-        try {
-          _leader = null;
-          List<PartitionMetadata> pMetaList = response.topicsMetadata().get(0).partitionsMetadata();
-          for (PartitionMetadata pMeta : pMetaList) {
-            if (pMeta.partitionId() == _partition) {
-              _leader = new KafkaBrokerWrapper(pMeta.leader());
-              break;
-            }
-          }
-
-          // If we've located a broker
-          if (_leader != null) {
-            LOGGER.info("Located leader broker {} for topic {}, connecting to it.", _leader, _topic);
-            setCurrentState(new ConnectingToPartitionLeader());
-          } else {
-            // Failed to get the leader broker. There could be a leader election at the moment, so retry after a little
-            // bit.
-            LOGGER.warn("Leader broker is null for topic {}, retrying leader fetch in 100ms", _topic);
-            Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-          }
-        } catch (Exception e) {
-          // Failed to get the leader broker. There could be a leader election at the moment, so retry after a little
-          // bit.
-          LOGGER.warn("Failed to get the leader broker for topic {} due to exception, retrying in 100ms", _topic, e);
-          Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-        }
-      } catch (Exception e) {
-        handleConsumerException(e);
-      }
-    }
-
-    @Override
-    boolean isConnectedToKafkaBroker() {
-      return true;
-    }
-  }
-
-  private class ConnectingToPartitionLeader extends State {
-    public ConnectingToPartitionLeader() {
-      super(ConsumerState.CONNECTING_TO_PARTITION_LEADER);
-    }
-
-    @Override
-    void process() {
-      // If we're already connected to the leader broker, don't disconnect and reconnect
-      LOGGER.info("Trying to fetch leader host and port: {}:{} for topic {}", _leader.host(), _leader.port(), _topic);
-      if (_leader.host().equals(_currentHost) && _leader.port() == _currentPort) {
-        setCurrentState(new ConnectedToPartitionLeader());
-        return;
-      }
-
-      // Disconnect from current broker
-      if (_simpleConsumer != null) {
-        try {
-          _simpleConsumer.close();
-          _simpleConsumer = null;
-        } catch (Exception e) {
-          handleConsumerException(e);
-          return;
-        }
-      }
-
-      // Connect to the partition leader
-      try {
-        _simpleConsumer = _simpleConsumerFactory
-            .buildSimpleConsumer(_leader.host(), _leader.port(), _socketTimeout, _bufferSize, _clientId);
-
-        setCurrentState(new ConnectedToPartitionLeader());
-      } catch (Exception e) {
-        handleConsumerException(e);
-      }
-    }
-
-    @Override
-    boolean isConnectedToKafkaBroker() {
-      return false;
-    }
-  }
-
-  private class ConnectedToPartitionLeader extends State {
-    public ConnectedToPartitionLeader() {
-      super(ConsumerState.CONNECTED_TO_PARTITION_LEADER);
-    }
-
-    @Override
-    void process() {
-      // Nothing to do
-    }
-
-    @Override
-    boolean isConnectedToKafkaBroker() {
-      return true;
-    }
-  }
-
-  private void setCurrentState(State newState) {
-    if (_currentState != null) {
-      LOGGER.info("Switching from state {} to state {} for topic {}", _currentState.getStateValue(),
-          newState.getStateValue(), _topic);
-    }
-
-    _currentState = newState;
-  }
-
-  RuntimeException exceptionForKafkaErrorCode(short kafkaErrorCode) {
-    final Errors kafkaError = Errors.forCode(kafkaErrorCode);
-    switch (kafkaError) {
-      case UNKNOWN:
-      case CORRUPT_MESSAGE:
-      case MESSAGE_TOO_LARGE:
-      case OFFSET_METADATA_TOO_LARGE:
-      case INVALID_TOPIC_EXCEPTION:
-      case RECORD_LIST_TOO_LARGE:
-      case INVALID_REQUIRED_ACKS:
-      case ILLEGAL_GENERATION:
-      case INCONSISTENT_GROUP_PROTOCOL:
-      case INVALID_GROUP_ID:
-      case UNKNOWN_MEMBER_ID:
-      case INVALID_SESSION_TIMEOUT:
-      case INVALID_COMMIT_OFFSET_SIZE:
-        return new PermanentConsumerException(new KafkaPermanentConsumerException(kafkaError));
-      case OFFSET_OUT_OF_RANGE:
-      case UNKNOWN_TOPIC_OR_PARTITION:
-      case LEADER_NOT_AVAILABLE:
-      case NOT_LEADER_FOR_PARTITION:
-      case REQUEST_TIMED_OUT:
-      case BROKER_NOT_AVAILABLE:
-      case REPLICA_NOT_AVAILABLE:
-      case STALE_CONTROLLER_EPOCH:
-      case NETWORK_EXCEPTION:
-      case GROUP_LOAD_IN_PROGRESS:
-      case GROUP_COORDINATOR_NOT_AVAILABLE:
-      case NOT_COORDINATOR_FOR_GROUP:
-      case NOT_ENOUGH_REPLICAS:
-      case NOT_ENOUGH_REPLICAS_AFTER_APPEND:
-      case REBALANCE_IN_PROGRESS:
-      case TOPIC_AUTHORIZATION_FAILED:
-      case GROUP_AUTHORIZATION_FAILED:
-      case CLUSTER_AUTHORIZATION_FAILED:
-        return new TransientConsumerException(new KafkaTransientConsumerException(kafkaError));
-      case NONE:
-      default:
-        return new RuntimeException("Unhandled error " + kafkaError);
-    }
-  }
-
-  void close()
-      throws IOException {
-    boolean needToCloseConsumer = _currentState.isConnectedToKafkaBroker() && _simpleConsumer != null;
-
-    // Reset the state machine
-    setCurrentState(new ConnectingToBootstrapNode());
-
-    // Close the consumer if needed
-    if (needToCloseConsumer) {
-      _simpleConsumer.close();
-      _simpleConsumer = null;
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConsumerFactory.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConsumerFactory.java
deleted file mode 100644
index 615e354eb42..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConsumerFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import java.util.Set;
-import org.apache.pinot.spi.stream.PartitionLevelConsumer;
-import org.apache.pinot.spi.stream.StreamConsumerFactory;
-import org.apache.pinot.spi.stream.StreamLevelConsumer;
-import org.apache.pinot.spi.stream.StreamMetadataProvider;
-
-
-/**
- * A {@link StreamConsumerFactory} implementation for consuming a kafka stream using kafka consumers
- */
-public class KafkaConsumerFactory extends StreamConsumerFactory {
-
-  @Override
-  public PartitionLevelConsumer createPartitionLevelConsumer(String clientId, int partition) {
-    return new KafkaPartitionLevelConsumer(clientId, _streamConfig, partition);
-  }
-
-  @Override
-  public StreamLevelConsumer createStreamLevelConsumer(String clientId, String tableName, Set<String> fieldsToRead,
-      String groupId) {
-    return new KafkaStreamLevelConsumer(clientId, tableName, _streamConfig, fieldsToRead, groupId);
-  }
-
-  @Override
-  public StreamMetadataProvider createPartitionMetadataProvider(String clientId, int partition) {
-    return new KafkaStreamMetadataProvider(clientId, _streamConfig, partition);
-  }
-
-  @Override
-  public StreamMetadataProvider createStreamMetadataProvider(String clientId) {
-    return new KafkaStreamMetadataProvider(clientId, _streamConfig);
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConsumerManager.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConsumerManager.java
deleted file mode 100644
index e40b9b42641..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaConsumerManager.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.util.concurrent.Uninterruptibles;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import kafka.consumer.ConsumerIterator;
-import kafka.javaapi.consumer.ConsumerConnector;
-import org.apache.commons.lang3.tuple.ImmutableTriple;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Manager for Kafka consumers that reuses consumers and delays their shutdown.
- *
- * This is a workaround for the current realtime design flaw where any issue while flushing/committing offsets causes
- * duplicate or dropped events. Kafka consumption is driven by the controller, which assigns a realtime segment to the
- * servers; when a server is assigned a new realtime segment, it creates a Kafka consumer, consumes until it reaches a
- * threshold then flushes to disk, writes metadata to helix indicating the segment is completed, commits Kafka offsets
- * to ZK and then shuts down the consumer. The controller notices the metadata write and reassigns a segment to the
- * server, so that it can keep on consuming.
- *
- * This logic is flawed if committing Kafka offsets fails, at which time the committed state is unknown. The proper fix
- * would be to just keep on using that consumer and try committing our offsets later, but we recreate a new Kafka
- * consumer whenever we get a new segment and also keep the old consumer around, leading to half the events being
- * assigned, due to Kafka rebalancing the partitions between the two consumers (one of which is not actually reading
- * anything anymore). Because that logic is stateless and driven by Helix, there's no real clean way to keep the
- * consumer alive and pass it to the next segment.
- *
- * This class and long comment is to work around this issue by keeping the consumer alive for a little bit instead of
- * shutting it down immediately, so that the next segment assignment can pick up the same consumer. This way, even if
- * committing the offsets fails, we can still pick up the same consumer the next time we get a segment assigned to us
- * by the controller and hopefully commit our offsets the next time we flush to disk.
- *
- * This temporary code should be completely removed by the time we redesign the consumption to use the lower level
- * Kafka APIs.
- */
-public class KafkaConsumerManager {
-  private KafkaConsumerManager() {
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaConsumerManager.class);
-  private static final Long IN_USE = -1L;
-  private static final long CONSUMER_SHUTDOWN_DELAY_MILLIS = TimeUnit.SECONDS.toMillis(60); // One minute
-  private static final Map<ImmutableTriple<String, String, String>, ConsumerAndIterator>
-      CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY = new HashMap<>();
-  private static final IdentityHashMap<ConsumerAndIterator, Long> CONSUMER_RELEASE_TIME = new IdentityHashMap<>();
-
-  public static ConsumerAndIterator acquireConsumerAndIteratorForConfig(
-      KafkaHighLevelStreamConfig kafkaHighLevelStreamConfig) {
-    final ImmutableTriple<String, String, String> configKey =
-        new ImmutableTriple<>(kafkaHighLevelStreamConfig.getKafkaTopicName(), kafkaHighLevelStreamConfig.getGroupId(),
-            kafkaHighLevelStreamConfig.getZkBrokerUrl());
-
-    synchronized (KafkaConsumerManager.class) {
-      // If we have the consumer and it's not already acquired, return it, otherwise error out if it's already acquired
-      if (CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY.containsKey(configKey)) {
-        ConsumerAndIterator consumerAndIterator = CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY.get(configKey);
-        if (CONSUMER_RELEASE_TIME.get(consumerAndIterator).equals(IN_USE)) {
-          throw new RuntimeException("Consumer/iterator " + consumerAndIterator.getId() + " already in use!");
-        } else {
-          LOGGER.info("Reusing kafka consumer/iterator with id {}", consumerAndIterator.getId());
-          CONSUMER_RELEASE_TIME.put(consumerAndIterator, IN_USE);
-          return consumerAndIterator;
-        }
-      }
-
-      LOGGER.info("Creating new kafka consumer and iterator for topic {}",
-          kafkaHighLevelStreamConfig.getKafkaTopicName());
-
-      // Create the consumer
-      ConsumerConnector consumer =
-          kafka.consumer.Consumer.createJavaConsumerConnector(kafkaHighLevelStreamConfig.getKafkaConsumerConfig());
-
-      // Create the iterator (can only be done once per consumer)
-      ConsumerIterator<byte[], byte[]> iterator =
-          consumer.createMessageStreams(kafkaHighLevelStreamConfig.getTopicMap(1)).
-              get(kafkaHighLevelStreamConfig.getKafkaTopicName()).get(0).iterator();
-
-      // Mark both the consumer and iterator as acquired
-      ConsumerAndIterator consumerAndIterator = new ConsumerAndIterator(consumer, iterator);
-      CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY.put(configKey, consumerAndIterator);
-      CONSUMER_RELEASE_TIME.put(consumerAndIterator, IN_USE);
-
-      LOGGER.info("Created consumer/iterator with id {} for topic {}", consumerAndIterator.getId(),
-          kafkaHighLevelStreamConfig.getKafkaTopicName());
-
-      return consumerAndIterator;
-    }
-  }
-
-  public static void releaseConsumerAndIterator(final ConsumerAndIterator consumerAndIterator) {
-    synchronized (KafkaConsumerManager.class) {
-      // Release the consumer, mark it for shutdown in the future
-      final long releaseTime = System.currentTimeMillis() + CONSUMER_SHUTDOWN_DELAY_MILLIS;
-      CONSUMER_RELEASE_TIME.put(consumerAndIterator, releaseTime);
-
-      LOGGER.info("Marking consumer/iterator with id {} for release at {}", consumerAndIterator.getId(), releaseTime);
-
-      // Schedule the shutdown of the consumer
-      new Thread() {
-        @Override
-        public void run() {
-          try {
-            // Await the shutdown time
-            Uninterruptibles.sleepUninterruptibly(CONSUMER_SHUTDOWN_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-
-            // Shutdown all consumers that have not been re-acquired
-            synchronized (KafkaConsumerManager.class) {
-              LOGGER.info("Executing release check for consumer/iterator {} at {}, scheduled at ",
-                  consumerAndIterator.getId(), System.currentTimeMillis(), releaseTime);
-
-              Iterator<Map.Entry<ImmutableTriple<String, String, String>, ConsumerAndIterator>> configIterator =
-                  CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY.entrySet().iterator();
-
-              while (configIterator.hasNext()) {
-                Map.Entry<ImmutableTriple<String, String, String>, ConsumerAndIterator> entry = configIterator.next();
-                ConsumerAndIterator consumerAndIterator = entry.getValue();
-
-                final Long releaseTime = CONSUMER_RELEASE_TIME.get(consumerAndIterator);
-                if (!releaseTime.equals(IN_USE) && releaseTime < System.currentTimeMillis()) {
-                  LOGGER.info("Releasing consumer/iterator {}", consumerAndIterator.getId());
-
-                  try {
-                    consumerAndIterator.getConsumer().shutdown();
-                  } catch (Exception e) {
-                    LOGGER.warn("Caught exception while shutting down Kafka consumer with id {}",
-                        consumerAndIterator.getId(), e);
-                  }
-
-                  configIterator.remove();
-                  CONSUMER_RELEASE_TIME.remove(consumerAndIterator);
-                } else {
-                  LOGGER
-                      .info("Not releasing consumer/iterator {}, it has been reacquired", consumerAndIterator.getId());
-                }
-              }
-            }
-          } catch (Exception e) {
-            LOGGER.warn("Caught exception in release of consumer/iterator {}", e, consumerAndIterator);
-          }
-        }
-      }.start();
-    }
-  }
-
-  public static void closeAllConsumers() {
-    try {
-      // Shutdown all consumers
-      synchronized (KafkaConsumerManager.class) {
-        LOGGER.info("Trying to shutdown all the kafka consumers");
-        Iterator<ConsumerAndIterator> consumerIterator = CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY.values().iterator();
-
-        while (consumerIterator.hasNext()) {
-          ConsumerAndIterator consumerAndIterator = consumerIterator.next();
-          LOGGER.info("Trying to shutdown consumer/iterator {}", consumerAndIterator.getId());
-          try {
-            consumerAndIterator.getConsumer().shutdown();
-          } catch (Exception e) {
-            LOGGER
-                .warn("Caught exception while shutting down Kafka consumer with id {}", consumerAndIterator.getId(), e);
-          }
-          consumerIterator.remove();
-        }
-        CONSUMER_AND_ITERATOR_FOR_CONFIG_KEY.clear();
-        CONSUMER_RELEASE_TIME.clear();
-      }
-    } catch (Exception e) {
-      LOGGER.warn("Caught exception during shutting down all kafka consumers", e);
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaHighLevelStreamConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaHighLevelStreamConfig.java
deleted file mode 100644
index 8a1f5855502..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaHighLevelStreamConfig.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.base.Preconditions;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import kafka.consumer.ConsumerConfig;
-import org.apache.pinot.plugin.stream.kafka.KafkaStreamConfigProperties;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.stream.StreamConfigProperties;
-import org.apache.pinot.spi.utils.EqualityUtils;
-
-
-/**
- * Wrapper around {@link StreamConfig} for use in the {@link KafkaStreamLevelConsumer}
- */
-public class KafkaHighLevelStreamConfig {
-  private static final String DEFAULT_ZK_SESSION_TIMEOUT_MS = "30000";
-  private static final String DEFAULT_ZK_CONNECTION_TIMEOUT_MS = "10000";
-  private static final String DEFAULT_ZK_SYNC_TIME = "2000";
-  private static final String DEFAULT_REBALANCE_MAX_RETRIES = "30";
-  private static final String DEFAULT_REBALANCE_BACKOFF_MS = "2000";
-  private static final String DEFAULT_AUTO_COMMIT_ENABLE = "false";
-
-  private static final Map<String, String> DEFAULT_PROPS;
-
-  static {
-    DEFAULT_PROPS = new HashMap<>();
-    DEFAULT_PROPS
-        .put(KafkaStreamConfigProperties.HighLevelConsumer.ZK_SESSION_TIMEOUT_MS, DEFAULT_ZK_SESSION_TIMEOUT_MS);
-    DEFAULT_PROPS
-        .put(KafkaStreamConfigProperties.HighLevelConsumer.ZK_CONNECTION_TIMEOUT_MS, DEFAULT_ZK_CONNECTION_TIMEOUT_MS);
-    DEFAULT_PROPS.put(KafkaStreamConfigProperties.HighLevelConsumer.ZK_SYNC_TIME_MS, DEFAULT_ZK_SYNC_TIME);
-    // Rebalance retries will take up to 1 mins to fail.
-    DEFAULT_PROPS
-        .put(KafkaStreamConfigProperties.HighLevelConsumer.REBALANCE_MAX_RETRIES, DEFAULT_REBALANCE_MAX_RETRIES);
-    DEFAULT_PROPS.put(KafkaStreamConfigProperties.HighLevelConsumer.REBALANCE_BACKOFF_MS, DEFAULT_REBALANCE_BACKOFF_MS);
-    DEFAULT_PROPS.put(KafkaStreamConfigProperties.HighLevelConsumer.AUTO_COMMIT_ENABLE, DEFAULT_AUTO_COMMIT_ENABLE);
-  }
-
-  private String _kafkaTopicName;
-  private String _groupId;
-  private String _zkBrokerUrl;
-  private Map<String, String> _kafkaConsumerProperties;
-
-  /**
-   * Builds a wrapper around {@link StreamConfig} to fetch kafka stream level consumer specific configs
-   * @param streamConfig
-   * @param tableName
-   * @param groupId
-   */
-  public KafkaHighLevelStreamConfig(StreamConfig streamConfig, String tableName,
-      String groupId) {
-    Map<String, String> streamConfigMap = streamConfig.getStreamConfigsMap();
-
-    _kafkaTopicName = streamConfig.getTopicName();
-
-    String hlcZkBrokerUrlKey = KafkaStreamConfigProperties
-        .constructStreamProperty(KafkaStreamConfigProperties.HighLevelConsumer.KAFKA_HLC_ZK_CONNECTION_STRING);
-    _zkBrokerUrl = streamConfigMap.get(hlcZkBrokerUrlKey);
-    Preconditions.checkNotNull(_zkBrokerUrl,
-        "Must specify zk broker connect string " + hlcZkBrokerUrlKey + " in high level kafka consumer");
-    _groupId = groupId;
-
-    _kafkaConsumerProperties = new HashMap<>();
-    String kafkaConsumerPropertyPrefix =
-        KafkaStreamConfigProperties.constructStreamProperty(KafkaStreamConfigProperties.KAFKA_CONSUMER_PROP_PREFIX);
-    for (String key : streamConfigMap.keySet()) {
-      if (key.startsWith(kafkaConsumerPropertyPrefix)) {
-        _kafkaConsumerProperties
-            .put(StreamConfigProperties.getPropertySuffix(key, kafkaConsumerPropertyPrefix), streamConfigMap.get(key));
-      }
-    }
-  }
-
-  public String getKafkaTopicName() {
-    return _kafkaTopicName;
-  }
-
-  public Map<String, Integer> getTopicMap(int numThreads) {
-    Map<String, Integer> topicCountMap = new HashMap<>();
-    topicCountMap.put(_kafkaTopicName, numThreads);
-    return topicCountMap;
-  }
-
-  public String getGroupId() {
-    return _groupId;
-  }
-
-  public String getZkBrokerUrl() {
-    return _zkBrokerUrl;
-  }
-
-  public Map<String, String> getKafkaConsumerProperties() {
-    return _kafkaConsumerProperties;
-  }
-
-  public ConsumerConfig getKafkaConsumerConfig() {
-    Properties props = new Properties();
-    for (String key : DEFAULT_PROPS.keySet()) {
-      props.put(key, DEFAULT_PROPS.get(key));
-    }
-    for (String key : _kafkaConsumerProperties.keySet()) {
-      props.put(key, _kafkaConsumerProperties.get(key));
-    }
-    props.put("group.id", _groupId);
-    props.put("zookeeper.connect", _zkBrokerUrl);
-    return new ConsumerConfig(props);
-  }
-
-  @Override
-  public String toString() {
-    return "KafkaHighLevelStreamConfig{" + "_kafkaTopicName='" + _kafkaTopicName + '\'' + ", _groupId='" + _groupId
-        + '\'' + ", _zkBrokerUrl='" + _zkBrokerUrl + '\'' + ", _kafkaConsumerProperties=" + _kafkaConsumerProperties
-        + '}';
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (EqualityUtils.isSameReference(this, o)) {
-      return true;
-    }
-
-    if (EqualityUtils.isNullOrNotSameClass(this, o)) {
-      return false;
-    }
-
-    KafkaHighLevelStreamConfig that = (KafkaHighLevelStreamConfig) o;
-
-    return EqualityUtils.isEqual(_kafkaTopicName, that._kafkaTopicName) && EqualityUtils
-        .isEqual(_groupId, that._groupId) && EqualityUtils.isEqual(_zkBrokerUrl, that._zkBrokerUrl) && EqualityUtils
-        .isEqual(_kafkaConsumerProperties, that._kafkaConsumerProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = EqualityUtils.hashCodeOf(_kafkaTopicName);
-    result = EqualityUtils.hashCodeOf(result, _groupId);
-    result = EqualityUtils.hashCodeOf(result, _zkBrokerUrl);
-    result = EqualityUtils.hashCodeOf(result, _kafkaConsumerProperties);
-    return result;
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaLowLevelStreamConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaLowLevelStreamConfig.java
deleted file mode 100644
index 595c7b4f5c9..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaLowLevelStreamConfig.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.base.Preconditions;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.pinot.plugin.stream.kafka.KafkaStreamConfigProperties;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.utils.EqualityUtils;
-
-
-/**
- * Wrapper around {@link StreamConfig} for use in {@link KafkaPartitionLevelConsumer}
- */
-public class KafkaLowLevelStreamConfig {
-
-  private final String _kafkaTopicName;
-  private final String _bootstrapHosts;
-  private final int _kafkaBufferSize;
-  private final int _kafkaSocketTimeout;
-  private final int _kafkaFetcherSizeBytes;
-  private final int _kafkaFetcherMinBytes;
-
-  /**
-   * Builds a wrapper around {@link StreamConfig} to fetch kafka partition level consumer related configs
-   * @param streamConfig
-   */
-  public KafkaLowLevelStreamConfig(StreamConfig streamConfig) {
-    Map<String, String> streamConfigMap = streamConfig.getStreamConfigsMap();
-
-    _kafkaTopicName = streamConfig.getTopicName();
-
-    String llcBrokerListKey = KafkaStreamConfigProperties
-        .constructStreamProperty(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BROKER_LIST);
-    String llcBufferKey = KafkaStreamConfigProperties
-        .constructStreamProperty(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE);
-    String llcTimeoutKey = KafkaStreamConfigProperties
-        .constructStreamProperty(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_SOCKET_TIMEOUT);
-    String fetcherSizeKey = KafkaStreamConfigProperties
-        .constructStreamProperty(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_FETCHER_SIZE_BYTES);
-    String fetcherMinBytesKey = KafkaStreamConfigProperties
-        .constructStreamProperty(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_FETCHER_MIN_BYTES);
-    _bootstrapHosts = streamConfigMap.get(llcBrokerListKey);
-    _kafkaBufferSize = getIntConfigWithDefault(streamConfigMap, llcBufferKey,
-        KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE_DEFAULT);
-    _kafkaSocketTimeout = getIntConfigWithDefault(streamConfigMap, llcTimeoutKey,
-        KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_SOCKET_TIMEOUT_DEFAULT);
-    _kafkaFetcherSizeBytes = getIntConfigWithDefault(streamConfigMap, fetcherSizeKey, _kafkaBufferSize);
-    _kafkaFetcherMinBytes = getIntConfigWithDefault(streamConfigMap, fetcherMinBytesKey,
-        KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_FETCHER_MIN_BYTES_DEFAULT);
-    Preconditions.checkNotNull(_bootstrapHosts,
-        "Must specify kafka brokers list " + llcBrokerListKey + " in case of low level kafka consumer");
-  }
-
-  public String getKafkaTopicName() {
-    return _kafkaTopicName;
-  }
-
-  public String getBootstrapHosts() {
-    return _bootstrapHosts;
-  }
-
-  public int getKafkaBufferSize() {
-    return _kafkaBufferSize;
-  }
-
-  public int getKafkaSocketTimeout() {
-    return _kafkaSocketTimeout;
-  }
-
-  public int getKafkaFetcherSizeBytes() {
-    return _kafkaFetcherSizeBytes;
-  }
-
-  public int getKafkaFetcherMinBytes() {
-    return _kafkaFetcherMinBytes;
-  }
-
-  private int getIntConfigWithDefault(Map<String, String> configMap, String key, int defaultValue) {
-    String stringValue = configMap.get(key);
-    try {
-      if (StringUtils.isNotEmpty(stringValue)) {
-        return Integer.parseInt(stringValue);
-      }
-      return defaultValue;
-    } catch (NumberFormatException ex) {
-      return defaultValue;
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "KafkaLowLevelStreamConfig{" + "_kafkaTopicName='" + _kafkaTopicName + '\'' + ", _bootstrapHosts='"
-        + _bootstrapHosts + '\'' + ", _kafkaBufferSize='" + _kafkaBufferSize + '\'' + ", _kafkaSocketTimeout='"
-        + _kafkaSocketTimeout + '\'' + ", _kafkaFetcherSizeBytes='" + _kafkaFetcherSizeBytes + '\''
-        + ", _kafkaFetcherMinBytes='" + _kafkaFetcherMinBytes + '\'' + '}';
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (EqualityUtils.isSameReference(this, o)) {
-      return true;
-    }
-
-    if (EqualityUtils.isNullOrNotSameClass(this, o)) {
-      return false;
-    }
-
-    KafkaLowLevelStreamConfig that = (KafkaLowLevelStreamConfig) o;
-
-    return EqualityUtils.isEqual(_kafkaTopicName, that._kafkaTopicName) && EqualityUtils
-        .isEqual(_bootstrapHosts, that._bootstrapHosts) && EqualityUtils
-        .isEqual(_kafkaBufferSize, that._kafkaBufferSize) && EqualityUtils
-        .isEqual(_kafkaSocketTimeout, that._kafkaSocketTimeout) && EqualityUtils
-        .isEqual(_kafkaFetcherSizeBytes, that._kafkaFetcherSizeBytes) && EqualityUtils
-        .isEqual(_kafkaFetcherMinBytes, that._kafkaFetcherMinBytes);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = EqualityUtils.hashCodeOf(_kafkaTopicName);
-    result = EqualityUtils.hashCodeOf(result, _bootstrapHosts);
-    result = EqualityUtils.hashCodeOf(result, _kafkaBufferSize);
-    result = EqualityUtils.hashCodeOf(result, _kafkaSocketTimeout);
-    result = EqualityUtils.hashCodeOf(result, _kafkaFetcherSizeBytes);
-    result = EqualityUtils.hashCodeOf(result, _kafkaFetcherMinBytes);
-    return result;
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaPartitionLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaPartitionLevelConsumer.java
deleted file mode 100644
index 46c8db903c6..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaPartitionLevelConsumer.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Iterables;
-import java.io.IOException;
-import kafka.api.FetchRequestBuilder;
-import kafka.javaapi.FetchResponse;
-import kafka.javaapi.message.ByteBufferMessageSet;
-import kafka.message.MessageAndOffset;
-import org.apache.pinot.spi.stream.LongMsgOffset;
-import org.apache.pinot.spi.stream.MessageBatch;
-import org.apache.pinot.spi.stream.PartitionLevelConsumer;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Implementation of PartitionLevelConsumer using Kafka's SimpleConsumer which ensures that we're connected to the
- * appropriate broker for consumption.
- */
-public class KafkaPartitionLevelConsumer extends KafkaConnectionHandler implements PartitionLevelConsumer {
-  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaPartitionLevelConsumer.class);
-
-  private final int _fetchRequestMinBytes;
-  private final int _fetchRequestSizeBytes;
-
-  public KafkaPartitionLevelConsumer(String clientId, StreamConfig streamConfig, int partition) {
-    super(clientId, streamConfig, partition, new KafkaSimpleConsumerFactoryImpl());
-    _fetchRequestSizeBytes = getkafkaLowLevelStreamConfig().getKafkaFetcherSizeBytes();
-    _fetchRequestMinBytes = getkafkaLowLevelStreamConfig().getKafkaFetcherMinBytes();
-  }
-
-  @VisibleForTesting
-  public KafkaPartitionLevelConsumer(String clientId, StreamConfig streamConfig, int partition,
-      KafkaSimpleConsumerFactory kafkaSimpleConsumerFactory) {
-    super(clientId, streamConfig, partition, kafkaSimpleConsumerFactory);
-    _fetchRequestSizeBytes = getkafkaLowLevelStreamConfig().getKafkaFetcherSizeBytes();
-    _fetchRequestMinBytes = getkafkaLowLevelStreamConfig().getKafkaFetcherMinBytes();
-  }
-
-  @Override
-  public synchronized MessageBatch fetchMessages(StreamPartitionMsgOffset startMsgOffset,
-      StreamPartitionMsgOffset endMsgOffset, int timeoutMillis)
-      throws java.util.concurrent.TimeoutException {
-    final long startOffset = ((LongMsgOffset) startMsgOffset).getOffset();
-    final long endOffset = (endMsgOffset == null) ? Long.MAX_VALUE : ((LongMsgOffset) endMsgOffset).getOffset();
-    return fetchMessages(startOffset, endOffset, timeoutMillis);
-  }
-
-  /**
-   * Fetch messages and the per-partition high watermark from Kafka between the specified offsets.
-   *
-   * @param startOffset The offset of the first message desired, inclusive
-   * @param endOffset The offset of the last message desired, exclusive, or {@link Long#MAX_VALUE} for no end offset.
-   * @param timeoutMillis Timeout in milliseconds
-   * @throws java.util.concurrent.TimeoutException If the operation could not be completed within {@code timeoutMillis}
-   * milliseconds
-   * @return An iterable containing messages fetched from Kafka and their offsets, as well as the high watermark for
-   * this partition.
-   */
-  public synchronized MessageBatch fetchMessages(long startOffset, long endOffset, int timeoutMillis)
-      throws java.util.concurrent.TimeoutException {
-    // TODO Improve error handling
-
-    final long connectEndTime = System.currentTimeMillis() + _connectTimeoutMillis;
-    while (_currentState.getStateValue() != KafkaConnectionHandler.ConsumerState.CONNECTED_TO_PARTITION_LEADER
-        && System.currentTimeMillis() < connectEndTime) {
-      _currentState.process();
-    }
-    if (_currentState.getStateValue() != KafkaConnectionHandler.ConsumerState.CONNECTED_TO_PARTITION_LEADER
-        && connectEndTime <= System.currentTimeMillis()) {
-      throw new java.util.concurrent.TimeoutException();
-    }
-
-    FetchResponse fetchResponse = _simpleConsumer.fetch(
-        new FetchRequestBuilder().minBytes(_fetchRequestMinBytes).maxWait(timeoutMillis)
-            .addFetch(_topic, _partition, startOffset, _fetchRequestSizeBytes).build());
-
-    if (!fetchResponse.hasError()) {
-      final Iterable<MessageAndOffset> messageAndOffsetIterable =
-          buildOffsetFilteringIterable(fetchResponse.messageSet(_topic, _partition), startOffset, endOffset);
-
-      // TODO: Instantiate with factory
-      return new SimpleConsumerMessageBatch(messageAndOffsetIterable);
-    } else {
-      throw exceptionForKafkaErrorCode(fetchResponse.errorCode(_topic, _partition));
-    }
-  }
-
-  private Iterable<MessageAndOffset> buildOffsetFilteringIterable(final ByteBufferMessageSet messageAndOffsets,
-      final long startOffset, final long endOffset) {
-    return Iterables.filter(messageAndOffsets, input -> {
-      // Filter messages that are either null or have an offset ∉ [startOffset; endOffset[
-      if (input == null || input.offset() < startOffset || (endOffset <= input.offset() && endOffset != -1)) {
-        return false;
-      }
-
-      // Check the message's checksum
-      // TODO We might want to have better handling of this situation, maybe try to fetch the message again?
-      if (!input.message().isValid()) {
-        LOGGER.warn("Discarded message with invalid checksum in partition {} of topic {}", _partition, _topic);
-        return false;
-      }
-
-      return true;
-    });
-  }
-
-  @VisibleForTesting
-  public int getFetchRequestSize() {
-    return _fetchRequestSizeBytes;
-  }
-
-  @VisibleForTesting
-  public int getFetchRequestMinBytes() {
-    return _fetchRequestMinBytes;
-  }
-
-  @Override
-  /**
-   * Closes this consumer.
-   */ public void close()
-      throws IOException {
-    super.close();
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaStreamLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaStreamLevelConsumer.java
deleted file mode 100644
index 84ba9760f8e..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaStreamLevelConsumer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import java.util.Set;
-import kafka.consumer.ConsumerIterator;
-import kafka.javaapi.consumer.ConsumerConnector;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.stream.StreamDecoderProvider;
-import org.apache.pinot.spi.stream.StreamLevelConsumer;
-import org.apache.pinot.spi.stream.StreamMessageDecoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * An implementation of a {@link StreamLevelConsumer} which consumes from the kafka stream
- */
-public class KafkaStreamLevelConsumer implements StreamLevelConsumer {
-
-  private StreamMessageDecoder _messageDecoder;
-  private Logger _instanceLogger;
-
-  private String _clientId;
-  private String _tableAndStreamName;
-
-  private StreamConfig _streamConfig;
-  private KafkaHighLevelStreamConfig _kafkaHighLevelStreamConfig;
-
-  private ConsumerConnector _consumer;
-  private ConsumerIterator<byte[], byte[]> _kafkaIterator;
-  private ConsumerAndIterator _consumerAndIterator;
-  private long _lastLogTime = 0;
-  private long _lastCount = 0;
-  private long _currentCount = 0L;
-
-  public KafkaStreamLevelConsumer(String clientId, String tableName, StreamConfig streamConfig,
-      Set<String> fieldsToRead, String groupId) {
-    _clientId = clientId;
-    _streamConfig = streamConfig;
-    _kafkaHighLevelStreamConfig = new KafkaHighLevelStreamConfig(streamConfig, tableName, groupId);
-
-    _messageDecoder = StreamDecoderProvider.create(streamConfig, fieldsToRead);
-
-    _tableAndStreamName = tableName + "-" + streamConfig.getTopicName();
-    _instanceLogger = LoggerFactory
-        .getLogger(KafkaStreamLevelConsumer.class.getName() + "_" + tableName + "_" + streamConfig.getTopicName());
-  }
-
-  @Override
-  public void start()
-      throws Exception {
-    _consumerAndIterator = KafkaConsumerManager.acquireConsumerAndIteratorForConfig(_kafkaHighLevelStreamConfig);
-    _kafkaIterator = _consumerAndIterator.getIterator();
-    _consumer = _consumerAndIterator.getConsumer();
-  }
-
-  @Override
-  public GenericRow next(GenericRow destination) {
-
-    if (_kafkaIterator.hasNext()) {
-      try {
-        destination = _messageDecoder.decode(_kafkaIterator.next().message(), destination);
-        _currentCount++;
-
-        final long now = System.currentTimeMillis();
-        // Log every minute or 100k events
-        if (now - _lastLogTime > 60000 || _currentCount - _lastCount >= 100000) {
-          if (_lastCount == 0) {
-            _instanceLogger
-                .info("Consumed {} events from kafka stream {}", _currentCount, _streamConfig.getTopicName());
-          } else {
-            _instanceLogger.info("Consumed {} events from kafka stream {} (rate:{}/s)", _currentCount - _lastCount,
-                _streamConfig.getTopicName(), (float) (_currentCount - _lastCount) * 1000 / (now - _lastLogTime));
-          }
-          _lastCount = _currentCount;
-          _lastLogTime = now;
-        }
-        return destination;
-      } catch (Exception e) {
-        _instanceLogger.warn("Caught exception while consuming events", e);
-        throw e;
-      }
-    }
-    return null;
-  }
-
-  @Override
-  public void commit() {
-    _consumer.commitOffsets();
-  }
-
-  @Override
-  public void shutdown()
-      throws Exception {
-    if (_consumerAndIterator != null) {
-      _kafkaIterator = null;
-      _consumer = null;
-
-      KafkaConsumerManager.releaseConsumerAndIterator(_consumerAndIterator);
-      _consumerAndIterator = null;
-    }
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaStreamMetadataProvider.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaStreamMetadataProvider.java
deleted file mode 100644
index 2ce97c1c32b..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaStreamMetadataProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Uninterruptibles;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
-import kafka.api.PartitionOffsetRequestInfo;
-import kafka.common.TopicAndPartition;
-import kafka.javaapi.OffsetRequest;
-import kafka.javaapi.OffsetResponse;
-import kafka.javaapi.TopicMetadata;
-import kafka.javaapi.TopicMetadataRequest;
-import kafka.javaapi.TopicMetadataResponse;
-import org.apache.kafka.common.errors.TimeoutException;
-import org.apache.kafka.common.protocol.Errors;
-import org.apache.pinot.spi.stream.LongMsgOffset;
-import org.apache.pinot.spi.stream.OffsetCriteria;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.stream.StreamMetadataProvider;
-import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Implementation of a stream metadata provider for a kafka stream using kafka'a simple consumer
- */
-public class KafkaStreamMetadataProvider extends KafkaConnectionHandler implements StreamMetadataProvider {
-  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaStreamMetadataProvider.class);
-
-  /**
-   * Create a partition specific metadata provider
-   * @param streamConfig
-   * @param partition
-   */
-  public KafkaStreamMetadataProvider(String clientId, StreamConfig streamConfig, int partition) {
-    super(clientId, streamConfig, partition, new KafkaSimpleConsumerFactoryImpl());
-  }
-
-  /**
-   * Create a stream specific metadata provider
-   * @param streamConfig
-   */
-  public KafkaStreamMetadataProvider(String clientId, StreamConfig streamConfig) {
-    super(clientId, streamConfig, new KafkaSimpleConsumerFactoryImpl());
-  }
-
-  @VisibleForTesting
-  public KafkaStreamMetadataProvider(String clientId, StreamConfig streamConfig, int partition,
-      KafkaSimpleConsumerFactory kafkaSimpleConsumerFactory) {
-    super(clientId, streamConfig, partition, kafkaSimpleConsumerFactory);
-  }
-
-  @VisibleForTesting
-  public KafkaStreamMetadataProvider(String clientId, StreamConfig streamConfig,
-      KafkaSimpleConsumerFactory kafkaSimpleConsumerFactory) {
-    super(clientId, streamConfig, kafkaSimpleConsumerFactory);
-  }
-
-  /**
-   * Fetches the number of partitions for this kafka stream
-   * @param timeoutMillis
-   * @return
-   */
-  @Override
-  public synchronized int fetchPartitionCount(long timeoutMillis) {
-    int unknownTopicReplyCount = 0;
-    final int maxUnknownTopicReplyCount = 10;
-    int kafkaErrorCount = 0;
-    final int maxKafkaErrorCount = 10;
-
-    final long endTime = System.currentTimeMillis() + timeoutMillis;
-
-    while (System.currentTimeMillis() < endTime) {
-      // Try to get into a state where we're connected to Kafka
-      while (!_currentState.isConnectedToKafkaBroker() && System.currentTimeMillis() < endTime) {
-        _currentState.process();
-      }
-
-      if (endTime <= System.currentTimeMillis() && !_currentState.isConnectedToKafkaBroker()) {
-        throw new TimeoutException(
-            "Failed to get the partition count for topic " + _topic + " within " + timeoutMillis + " ms");
-      }
-
-      // Send the metadata request to Kafka
-      TopicMetadataResponse topicMetadataResponse = null;
-      try {
-        topicMetadataResponse = _simpleConsumer.send(new TopicMetadataRequest(Collections.singletonList(_topic)));
-      } catch (Exception e) {
-        _currentState.handleConsumerException(e);
-        continue;
-      }
-
-      final TopicMetadata topicMetadata = topicMetadataResponse.topicsMetadata().get(0);
-      final short errorCode = topicMetadata.errorCode();
-
-      if (errorCode == Errors.NONE.code()) {
-        return topicMetadata.partitionsMetadata().size();
-      } else if (errorCode == Errors.LEADER_NOT_AVAILABLE.code()) {
-        // If there is no leader, it'll take some time for a new leader to be elected, wait 100 ms before retrying
-        Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-      } else if (errorCode == Errors.INVALID_TOPIC_EXCEPTION.code()) {
-        throw new RuntimeException("Invalid topic name " + _topic);
-      } else if (errorCode == Errors.UNKNOWN_TOPIC_OR_PARTITION.code()) {
-        if (maxUnknownTopicReplyCount < unknownTopicReplyCount) {
-          throw new RuntimeException("Topic " + _topic + " does not exist");
-        } else {
-          // Kafka topic creation can sometimes take some time, so we'll retry after a little bit
-          unknownTopicReplyCount++;
-          Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-        }
-      } else {
-        // Retry after a short delay
-        kafkaErrorCount++;
-
-        if (maxKafkaErrorCount < kafkaErrorCount) {
-          throw exceptionForKafkaErrorCode(errorCode);
-        }
-
-        Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-      }
-    }
-
-    throw new TimeoutException();
-  }
-
-  /**
-   * Fetches the numeric Kafka offset for this partition for a symbolic name ("largest" or "smallest").
-   *
-   * @param offsetCriteria
-   * @param timeoutMillis Timeout in milliseconds
-   * @throws java.util.concurrent.TimeoutException If the operation could not be completed within {@code timeoutMillis}
-   * milliseconds
-   * @return An offset
-   */
-  @Override
-  public synchronized StreamPartitionMsgOffset fetchStreamPartitionOffset(OffsetCriteria offsetCriteria,
-      long timeoutMillis) {
-    Preconditions.checkState(_isPartitionProvided,
-        "Cannot fetch partition offset. StreamMetadataProvider created without partition information");
-    Preconditions.checkNotNull(offsetCriteria);
-
-    final long offsetRequestTime;
-    if (offsetCriteria.isLargest()) {
-      offsetRequestTime = kafka.api.OffsetRequest.LatestTime();
-    } else if (offsetCriteria.isSmallest()) {
-      offsetRequestTime = kafka.api.OffsetRequest.EarliestTime();
-    } else {
-      throw new IllegalArgumentException("Unknown initial offset value " + offsetCriteria.toString());
-    }
-
-    int kafkaErrorCount = 0;
-    final int maxKafkaErrorCount = 10;
-
-    final long endTime = System.currentTimeMillis() + timeoutMillis;
-
-    while (System.currentTimeMillis() < endTime) {
-      // Try to get into a state where we're connected to Kafka
-      while (_currentState.getStateValue() != KafkaConnectionHandler.ConsumerState.CONNECTED_TO_PARTITION_LEADER
-          && System.currentTimeMillis() < endTime) {
-        _currentState.process();
-      }
-
-      if (_currentState.getStateValue() != KafkaConnectionHandler.ConsumerState.CONNECTED_TO_PARTITION_LEADER
-          && endTime <= System.currentTimeMillis()) {
-        throw new TimeoutException();
-      }
-
-      // Send the offset request to Kafka
-      OffsetRequest request = new OffsetRequest(Collections.singletonMap(new TopicAndPartition(_topic, _partition),
-          new PartitionOffsetRequestInfo(offsetRequestTime, 1)), kafka.api.OffsetRequest.CurrentVersion(), _clientId);
-      OffsetResponse offsetResponse;
-      try {
-        offsetResponse = _simpleConsumer.getOffsetsBefore(request);
-      } catch (Exception e) {
-        _currentState.handleConsumerException(e);
-        continue;
-      }
-
-      final short errorCode = offsetResponse.errorCode(_topic, _partition);
-
-      if (errorCode == Errors.NONE.code()) {
-        long offset = offsetResponse.offsets(_topic, _partition)[0];
-        if (offset == 0L) {
-          LOGGER.warn("Fetched offset of 0 for topic {} and partition {}, is this a newly created topic?", _topic,
-              _partition);
-        }
-        return new LongMsgOffset(offset);
-      } else if (errorCode == Errors.LEADER_NOT_AVAILABLE.code()) {
-        // If there is no leader, it'll take some time for a new leader to be elected, wait 100 ms before retrying
-        Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-      } else {
-        // Retry after a short delay
-        kafkaErrorCount++;
-
-        if (maxKafkaErrorCount < kafkaErrorCount) {
-          throw exceptionForKafkaErrorCode(errorCode);
-        }
-
-        Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-      }
-    }
-
-    throw new TimeoutException();
-  }
-
-  @Override
-  public void close()
-      throws IOException {
-    super.close();
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/SimpleConsumerMessageBatch.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/SimpleConsumerMessageBatch.java
deleted file mode 100644
index 5e36a22d092..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/SimpleConsumerMessageBatch.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import java.util.ArrayList;
-import kafka.message.MessageAndOffset;
-import org.apache.pinot.spi.stream.LongMsgOffset;
-import org.apache.pinot.spi.stream.MessageBatch;
-import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
-
-
-public class SimpleConsumerMessageBatch implements MessageBatch<byte[]> {
-
-  private ArrayList<MessageAndOffset> _messageList = new ArrayList<>();
-
-  public SimpleConsumerMessageBatch(Iterable<MessageAndOffset> messageAndOffsetIterable) {
-    for (MessageAndOffset messageAndOffset : messageAndOffsetIterable) {
-      _messageList.add(messageAndOffset);
-    }
-  }
-
-  @Override
-  public int getMessageCount() {
-    return _messageList.size();
-  }
-
-  @Override
-  public byte[] getMessageAtIndex(int index) {
-    return _messageList.get(index).message().payload().array();
-  }
-
-  @Override
-  public int getMessageOffsetAtIndex(int index) {
-    return _messageList.get(index).message().payload().arrayOffset();
-  }
-
-  @Override
-  public int getMessageLengthAtIndex(int index) {
-    return _messageList.get(index).message().payloadSize();
-  }
-
-  @Override
-  public long getNextStreamMessageOffsetAtIndex(int index) {
-    throw new UnsupportedOperationException("This method is deprecated");
-  }
-
-  @Override
-  public StreamPartitionMsgOffset getNextStreamPartitionMsgOffsetAtIndex(int index) {
-    return new LongMsgOffset(_messageList.get(index).nextOffset());
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/server/KafkaDataProducer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/server/KafkaDataProducer.java
deleted file mode 100644
index a1e48af9053..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/server/KafkaDataProducer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09.server;
-
-import java.util.Properties;
-import kafka.javaapi.producer.Producer;
-import kafka.producer.KeyedMessage;
-import kafka.producer.ProducerConfig;
-import org.apache.pinot.spi.stream.StreamDataProducer;
-
-
-public class KafkaDataProducer implements StreamDataProducer {
-  private Producer<byte[], byte[]> _producer;
-
-  @Override
-  public void init(Properties props) {
-    ProducerConfig producerConfig = new ProducerConfig(props);
-    _producer = new Producer(producerConfig);
-  }
-
-  @Override
-  public void produce(String topic, byte[] payload) {
-    KeyedMessage<byte[], byte[]> data = new KeyedMessage<>(topic, payload);
-    this.produce(data);
-  }
-
-  @Override
-  public void produce(String topic, byte[] key, byte[] payload) {
-    KeyedMessage<byte[], byte[]> data = new KeyedMessage<>(topic, key, payload);
-    this.produce(data);
-  }
-
-  public void produce(KeyedMessage message) {
-    _producer.send(message);
-  }
-
-  @Override
-  public void close() {
-    _producer.close();
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/server/KafkaDataServerStartable.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/server/KafkaDataServerStartable.java
deleted file mode 100644
index d58c32961f6..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/server/KafkaDataServerStartable.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09.server;
-
-import java.io.File;
-import java.security.Permission;
-import java.util.Properties;
-import kafka.admin.TopicCommand;
-import kafka.server.KafkaConfig;
-import kafka.server.KafkaServerStartable;
-import org.I0Itec.zkclient.ZkClient;
-import org.apache.commons.io.FileUtils;
-import org.apache.pinot.spi.stream.StreamDataServerStartable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class KafkaDataServerStartable implements StreamDataServerStartable {
-  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaDataServerStartable.class);
-
-  private static final String ZOOKEEPER_CONNECT = "zookeeper.connect";
-  private static final String LOG_DIRS = "log.dirs";
-
-  private KafkaServerStartable _serverStartable;
-  private String _zkStr;
-  private String _logDirPath;
-  private int _port;
-
-  private static void invokeTopicCommand(String[] args) {
-    // jfim: Use Java security to trap System.exit in Kafka 0.9's TopicCommand
-    System.setSecurityManager(new SecurityManager() {
-      @Override
-      public void checkPermission(Permission perm) {
-        if (perm.getName().startsWith("exitVM")) {
-          throw new SecurityException("System.exit is disabled");
-        }
-      }
-
-      @Override
-      public void checkPermission(Permission perm, Object context) {
-        checkPermission(perm);
-      }
-    });
-
-    try {
-      TopicCommand.main(args);
-    } catch (SecurityException ex) {
-      // Do nothing, this is caused by our security manager that disables System.exit
-    }
-
-    System.setSecurityManager(null);
-  }
-
-  public void init(Properties props) {
-    _zkStr = props.getProperty(ZOOKEEPER_CONNECT);
-    _logDirPath = props.getProperty(LOG_DIRS);
-
-    // Create the ZK nodes for Kafka, if needed
-    int indexOfFirstSlash = _zkStr.indexOf('/');
-    if (indexOfFirstSlash != -1) {
-      String bareZkUrl = _zkStr.substring(0, indexOfFirstSlash);
-      String zkNodePath = _zkStr.substring(indexOfFirstSlash);
-      ZkClient client = new ZkClient(bareZkUrl);
-      client.createPersistent(zkNodePath, true);
-      client.close();
-    }
-
-    File logDir = new File(_logDirPath);
-    logDir.mkdirs();
-
-    props.put("zookeeper.session.timeout.ms", "60000");
-    KafkaConfig config = new KafkaConfig(props);
-
-    _port = config.port();
-    _serverStartable = new KafkaServerStartable(config);
-  }
-
-  @Override
-  public void start() {
-    _serverStartable.startup();
-  }
-
-  @Override
-  public void stop() {
-    _serverStartable.shutdown();
-    FileUtils.deleteQuietly(new File(_serverStartable.serverConfig().logDirs().apply(0)));
-  }
-
-  @Override
-  public void createTopic(String topic, Properties props) {
-    invokeTopicCommand(
-        new String[]{
-            "--create", "--zookeeper", _zkStr, "--replication-factor", "1", "--partitions", Integer.toString(
-            (Integer) props.get("partition")), "--topic", topic
-        });
-  }
-
-  @Override
-  public int getPort() {
-    return _port;
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/plugin/stream/kafka09/KafkaLowLevelStreamConfigTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/plugin/stream/kafka09/KafkaLowLevelStreamConfigTest.java
deleted file mode 100644
index a635646a469..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/plugin/stream/kafka09/KafkaLowLevelStreamConfigTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.pinot.plugin.stream.kafka.KafkaStreamConfigProperties;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.apache.pinot.spi.stream.StreamConfigProperties;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class KafkaLowLevelStreamConfigTest {
-  private static final String KAFKA_DECODER_CLASS_NAME =
-      "org.apache.pinot.plugin.inputformat.avro.KafkaAvroMessageDecoder";
-
-  private KafkaLowLevelStreamConfig getStreamConfig(String topic, String bootstrapHosts, String buffer,
-      String socketTimeout) {
-    return getStreamConfig(topic, bootstrapHosts, buffer, socketTimeout, null, null);
-  }
-
-  private KafkaLowLevelStreamConfig getStreamConfig(String topic, String bootstrapHosts, String buffer,
-      String socketTimeout, String fetcherSize, String fetcherMinBytes) {
-    Map<String, String> streamConfigMap = new HashMap<>();
-    String streamType = "kafka";
-    String consumerType = StreamConfig.ConsumerType.LOWLEVEL.toString();
-    String consumerFactoryClassName = KafkaConsumerFactory.class.getName();
-    streamConfigMap.put(StreamConfigProperties.STREAM_TYPE, streamType);
-    streamConfigMap
-        .put(StreamConfigProperties.constructStreamProperty(streamType, StreamConfigProperties.STREAM_TOPIC_NAME),
-            topic);
-    streamConfigMap
-        .put(StreamConfigProperties.constructStreamProperty(streamType, StreamConfigProperties.STREAM_CONSUMER_TYPES),
-            consumerType);
-    streamConfigMap.put(StreamConfigProperties
-            .constructStreamProperty(streamType, StreamConfigProperties.STREAM_CONSUMER_FACTORY_CLASS),
-        consumerFactoryClassName);
-    streamConfigMap
-        .put(StreamConfigProperties.constructStreamProperty(streamType, StreamConfigProperties.STREAM_DECODER_CLASS),
-            KAFKA_DECODER_CLASS_NAME);
-    streamConfigMap.put("stream.kafka.broker.list", bootstrapHosts);
-    if (buffer != null) {
-      streamConfigMap.put("stream.kafka.buffer.size", buffer);
-    }
-    if (socketTimeout != null) {
-      streamConfigMap.put("stream.kafka.socket.timeout", socketTimeout);
-    }
-    if (fetcherSize != null) {
-      streamConfigMap.put("stream.kafka.fetcher.size", fetcherSize);
-    }
-    if (fetcherMinBytes != null) {
-      streamConfigMap.put("stream.kafka.fetcher.minBytes", fetcherMinBytes);
-    }
-    return new KafkaLowLevelStreamConfig(new StreamConfig("fakeTable_REALTIME", streamConfigMap));
-  }
-
-  @Test
-  public void testGetKafkaTopicName() {
-    KafkaLowLevelStreamConfig config = getStreamConfig("topic", "", "", "");
-    Assert.assertEquals("topic", config.getKafkaTopicName());
-  }
-
-  @Test
-  public void testGetBootstrapHosts() {
-    KafkaLowLevelStreamConfig config = getStreamConfig("topic", "host1", "", "");
-    Assert.assertEquals("host1", config.getBootstrapHosts());
-  }
-
-  @Test
-  public void testGetKafkaBufferSize() {
-    // test default
-    KafkaLowLevelStreamConfig config = getStreamConfig("topic", "host1", null, "");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE_DEFAULT,
-        config.getKafkaBufferSize());
-
-    config = getStreamConfig("topic", "host1", "", "");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE_DEFAULT,
-        config.getKafkaBufferSize());
-
-    config = getStreamConfig("topic", "host1", "bad value", "");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE_DEFAULT,
-        config.getKafkaBufferSize());
-
-    // correct config
-    config = getStreamConfig("topic", "host1", "100", "");
-    Assert.assertEquals(100, config.getKafkaBufferSize());
-  }
-
-  @Test
-  public void testGetKafkaSocketTimeout() {
-    // test default
-    KafkaLowLevelStreamConfig config = getStreamConfig("topic", "host1", "", null);
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_SOCKET_TIMEOUT_DEFAULT,
-        config.getKafkaSocketTimeout());
-
-    config = getStreamConfig("topic", "host1", "", "");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_SOCKET_TIMEOUT_DEFAULT,
-        config.getKafkaSocketTimeout());
-
-    config = getStreamConfig("topic", "host1", "", "bad value");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_SOCKET_TIMEOUT_DEFAULT,
-        config.getKafkaSocketTimeout());
-
-    // correct config
-    config = getStreamConfig("topic", "host1", "", "100");
-    Assert.assertEquals(100, config.getKafkaSocketTimeout());
-  }
-
-  @Test
-  public void testGetFetcherSize() {
-    // test default
-    KafkaLowLevelStreamConfig config = getStreamConfig("topic", "host1", "", "", "", null);
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE_DEFAULT,
-        config.getKafkaFetcherSizeBytes());
-
-    config = getStreamConfig("topic", "host1", "100", "", "", null);
-    Assert.assertEquals(100, config.getKafkaFetcherSizeBytes());
-
-    config = getStreamConfig("topic", "host1", "100", "", "bad value", null);
-    Assert.assertEquals(100, config.getKafkaFetcherSizeBytes());
-
-    // correct config
-    config = getStreamConfig("topic", "host1", "100", "", "200", null);
-    Assert.assertEquals(200, config.getKafkaFetcherSizeBytes());
-  }
-
-  @Test
-  public void testGetFetcherMinBytes() {
-    // test default
-    KafkaLowLevelStreamConfig config = getStreamConfig("topic", "host1", "", "", "", null);
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_FETCHER_MIN_BYTES_DEFAULT,
-        config.getKafkaFetcherMinBytes());
-
-    config = getStreamConfig("topic", "host1", "", "", "", "");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_FETCHER_MIN_BYTES_DEFAULT,
-        config.getKafkaFetcherMinBytes());
-
-    config = getStreamConfig("topic", "host1", "", "", "", "bad value");
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_FETCHER_MIN_BYTES_DEFAULT,
-        config.getKafkaFetcherMinBytes());
-
-    // correct config
-    config = getStreamConfig("topic", "host1", "", "", "", "100");
-    Assert.assertEquals(100, config.getKafkaFetcherMinBytes());
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/plugin/stream/kafka09/KafkaPartitionLevelConsumerTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/plugin/stream/kafka09/KafkaPartitionLevelConsumerTest.java
deleted file mode 100644
index e71d475731d..00000000000
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/test/java/org/apache/pinot/plugin/stream/kafka09/KafkaPartitionLevelConsumerTest.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.plugin.stream.kafka09;
-
-import com.google.common.base.Preconditions;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import kafka.api.FetchRequest;
-import kafka.api.PartitionFetchInfo;
-import kafka.api.PartitionMetadata;
-import kafka.api.TopicMetadata;
-import kafka.cluster.BrokerEndPoint;
-import kafka.common.TopicAndPartition;
-import kafka.javaapi.FetchResponse;
-import kafka.javaapi.OffsetRequest;
-import kafka.javaapi.OffsetResponse;
-import kafka.javaapi.TopicMetadataRequest;
-import kafka.javaapi.TopicMetadataResponse;
-import kafka.javaapi.consumer.SimpleConsumer;
-import kafka.javaapi.message.ByteBufferMessageSet;
-import kafka.message.Message;
-import org.apache.kafka.common.protocol.Errors;
-import org.apache.pinot.plugin.stream.kafka.KafkaStreamConfigProperties;
-import org.apache.pinot.spi.stream.LongMsgOffset;
-import org.apache.pinot.spi.stream.OffsetCriteria;
-import org.apache.pinot.spi.stream.StreamConfig;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-import scala.Some;
-import scala.Tuple2;
-import scala.collection.JavaConversions;
-import scala.collection.Seq;
-import scala.collection.immutable.List;
-
-
-/**
- * Tests for the KafkaPartitionLevelConsumer.
- */
-public class KafkaPartitionLevelConsumerTest {
-  public class MockKafkaSimpleConsumerFactory implements KafkaSimpleConsumerFactory {
-
-    private String[] _hosts;
-    private int[] _ports;
-    private int[] _partitionLeaderIndices;
-    private int _brokerCount;
-    private int _partitionCount;
-    private String _topicName;
-    private BrokerEndPoint[] _brokerArray;
-
-    public MockKafkaSimpleConsumerFactory(String[] hosts, int[] ports, long[] partitionStartOffsets,
-        long[] partitionEndOffsets, int[] partitionLeaderIndices, String topicName) {
-      Preconditions.checkArgument(hosts.length == ports.length);
-      _hosts = hosts;
-      _ports = ports;
-      _brokerCount = hosts.length;
-
-      _brokerArray = new BrokerEndPoint[_brokerCount];
-      for (int i = 0; i < _brokerCount; i++) {
-        _brokerArray[i] = new BrokerEndPoint(i, hosts[i], ports[i]);
-      }
-
-      Preconditions.checkArgument(partitionStartOffsets.length == partitionEndOffsets.length);
-      Preconditions.checkArgument(partitionStartOffsets.length == partitionLeaderIndices.length);
-      _partitionLeaderIndices = partitionLeaderIndices;
-      _partitionCount = partitionStartOffsets.length;
-
-      _topicName = topicName;
-    }
-
-    private class MockFetchResponse extends FetchResponse {
-      java.util.Map<TopicAndPartition, Short> _errorMap;
-
-      public MockFetchResponse(java.util.Map<TopicAndPartition, Short> errorMap) {
-        super(null);
-        _errorMap = errorMap;
-      }
-
-      @Override
-      public ByteBufferMessageSet messageSet(String topic, int partition) {
-        if (_errorMap.containsKey(new TopicAndPartition(topic, partition))) {
-          throw new IllegalArgumentException();
-        } else {
-          // TODO Maybe generate dummy messages here?
-          return new ByteBufferMessageSet(Collections.<Message>emptyList());
-        }
-      }
-
-      @Override
-      public short errorCode(String topic, int partition) {
-        TopicAndPartition key = new TopicAndPartition(topic, partition);
-        if (_errorMap.containsKey(key)) {
-          return _errorMap.get(key);
-        } else {
-          return Errors.NONE.code();
-        }
-      }
-
-      @Override
-      public long highWatermark(String topic, int partition) {
-        return 0L;
-      }
-
-      public boolean hasError() {
-        return !_errorMap.isEmpty();
-      }
-    }
-
-    private class MockSimpleConsumer extends SimpleConsumer {
-      private int _index;
-
-      public MockSimpleConsumer(String host, int port, int soTimeout, int bufferSize, String clientId, int index) {
-        super(host, port, soTimeout, bufferSize, clientId);
-        _index = index;
-      }
-
-      @Override
-      public FetchResponse fetch(FetchRequest request) {
-        scala.collection.Traversable<Tuple2<TopicAndPartition, PartitionFetchInfo>> requestInfo = request.requestInfo();
-        java.util.Map<TopicAndPartition, Short> errorMap = new HashMap<>();
-
-        while (requestInfo.headOption().isDefined()) {
-          // jfim: IntelliJ erroneously thinks the following line is an incompatible type error, but it's only because
-          // it doesn't understand scala covariance when called from Java (ie. it thinks head() is of type A even though
-          // it's really of type Tuple2[TopicAndPartition, PartitionFetchInfo])
-          Tuple2<TopicAndPartition, PartitionFetchInfo> t2 = requestInfo.head();
-          TopicAndPartition topicAndPartition = t2._1();
-          PartitionFetchInfo partitionFetchInfo = t2._2();
-
-          if (!topicAndPartition.topic().equals(_topicName)) {
-            errorMap.put(topicAndPartition, Errors.UNKNOWN_TOPIC_OR_PARTITION.code());
-          } else if (_partitionLeaderIndices.length < topicAndPartition.partition()) {
-            errorMap.put(topicAndPartition, Errors.UNKNOWN_TOPIC_OR_PARTITION.code());
-          } else if (_partitionLeaderIndices[topicAndPartition.partition()] != _index) {
-            errorMap.put(topicAndPartition, Errors.NOT_LEADER_FOR_PARTITION.code());
-          } else {
-            // Do nothing, we'll generate a fake message
-          }
-
-          requestInfo = requestInfo.tail();
-        }
-
-        return new MockFetchResponse(errorMap);
-      }
-
-      @Override
-      public FetchResponse fetch(kafka.javaapi.FetchRequest request) {
-        throw new RuntimeException("Unimplemented");
-      }
-
-      @Override
-      public OffsetResponse getOffsetsBefore(OffsetRequest request) {
-        throw new RuntimeException("Unimplemented!");
-      }
-
-      @Override
-      public TopicMetadataResponse send(TopicMetadataRequest request) {
-        java.util.List<String> topics = request.topics();
-        TopicMetadata[] topicMetadataArray = new TopicMetadata[topics.size()];
-
-        for (int i = 0; i < topicMetadataArray.length; i++) {
-          String topic = topics.get(i);
-          if (!topic.equals(_topicName)) {
-            topicMetadataArray[i] = new TopicMetadata(topic, null, Errors.UNKNOWN_TOPIC_OR_PARTITION.code());
-          } else {
-            PartitionMetadata[] partitionMetadataArray = new PartitionMetadata[_partitionCount];
-            for (int j = 0; j < _partitionCount; j++) {
-              java.util.List<BrokerEndPoint> emptyJavaList = Collections.emptyList();
-              List<BrokerEndPoint> emptyScalaList = JavaConversions.asScalaBuffer(emptyJavaList).toList();
-              partitionMetadataArray[j] =
-                  new PartitionMetadata(j, Some.apply(_brokerArray[_partitionLeaderIndices[j]]), emptyScalaList,
-                      emptyScalaList, Errors.NONE.code());
-            }
-
-            Seq<PartitionMetadata> partitionsMetadata = List.fromArray(partitionMetadataArray);
-            topicMetadataArray[i] = new TopicMetadata(topic, partitionsMetadata, Errors.NONE.code());
-          }
-        }
-
-        Seq<BrokerEndPoint> brokers = List.fromArray(_brokerArray);
-        Seq<TopicMetadata> topicsMetadata = List.fromArray(topicMetadataArray);
-
-        return new TopicMetadataResponse(new kafka.api.TopicMetadataResponse(brokers, topicsMetadata, -1));
-      }
-    }
-
-    @Override
-    public SimpleConsumer buildSimpleConsumer(String host, int port, int soTimeout, int bufferSize, String clientId) {
-      for (int i = 0; i < _brokerCount; i++) {
-        if (_hosts[i].equalsIgnoreCase(host) && _ports[i] == port) {
-          return new MockSimpleConsumer(host, port, soTimeout, bufferSize, clientId, i);
-        }
-      }
-
-      throw new RuntimeException("No such host/port");
-    }
-  }
-
-  @Test
-  public void testBuildConsumer()
-      throws Exception {
-    String streamType = "kafka";
-    String streamKafkaTopicName = "theTopic";
-    String streamKafkaBrokerList = "abcd:1234,bcde:2345";
-    String streamKafkaConsumerType = "simple";
-    String clientId = "clientId";
-    String tableNameWithType = "table_REALTIME";
-
-    MockKafkaSimpleConsumerFactory mockKafkaSimpleConsumerFactory =
-        new MockKafkaSimpleConsumerFactory(new String[]{"abcd", "bcde"}, new int[]{1234, 2345},
-            new long[]{12345L, 23456L}, new long[]{23456L, 34567L}, new int[]{0, 1}, streamKafkaTopicName);
-
-    Map<String, String> streamConfigMap = new HashMap<>();
-    streamConfigMap.put("streamType", streamType);
-    streamConfigMap.put("stream.kafka.topic.name", streamKafkaTopicName);
-    streamConfigMap.put("stream.kafka.broker.list", streamKafkaBrokerList);
-    streamConfigMap.put("stream.kafka.consumer.type", streamKafkaConsumerType);
-    streamConfigMap
-        .put("stream.kafka.consumer.factory.class.name", mockKafkaSimpleConsumerFactory.getClass().getName());
-    streamConfigMap.put("stream.kafka.decoder.class.name", "decoderClass");
-    streamConfigMap.put("stream.kafka.fetcher.size", "10000");
-    streamConfigMap.put("stream.kafka.fetcher.minBytes", "20000");
-    StreamConfig streamConfig = new StreamConfig(tableNameWithType, streamConfigMap);
-
-    KafkaStreamMetadataProvider streamMetadataProvider =
-        new KafkaStreamMetadataProvider(clientId, streamConfig, mockKafkaSimpleConsumerFactory);
-
-    // test default value
-    KafkaPartitionLevelConsumer kafkaSimpleStreamConsumer =
-        new KafkaPartitionLevelConsumer(clientId, streamConfig, 0, mockKafkaSimpleConsumerFactory);
-    kafkaSimpleStreamConsumer.fetchMessages(new LongMsgOffset(12345L), new LongMsgOffset(23456L), 10000);
-
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_BUFFER_SIZE_DEFAULT,
-        kafkaSimpleStreamConsumer.getSimpleConsumer().bufferSize());
-    Assert.assertEquals(KafkaStreamConfigProperties.LowLevelConsumer.KAFKA_SOCKET_TIMEOUT_DEFAULT,
-        kafkaSimpleStreamConsumer.getSimpleConsumer().soTimeout());
-
-    // test parsing values
-    Assert.assertEquals(10000, kafkaSimpleStreamConsumer.getFetchRequestSize());
-    Assert.assertEquals(20000, kafkaSimpleStreamConsumer.getFetchRequestMinBytes());
-
-    // test user defined values
-    streamConfigMap.put("stream.kafka.buffer.size", "100");
-    streamConfigMap.put("stream.kafka.socket.timeout", "1000");
-    streamConfig = new StreamConfig(tableNameWithType, streamConfigMap);
-    kafkaSimpleStreamConsumer =
-        new KafkaPartitionLevelConsumer(clientId, streamConfig, 0, mockKafkaSimpleConsumerFactory);
-    kafkaSimpleStreamConsumer.fetchMessages(new LongMsgOffset(12345L), new LongMsgOffset(23456L), 10000);
-    Assert.assertEquals(100, kafkaSimpleStreamConsumer.getSimpleConsumer().bufferSize());
-    Assert.assertEquals(1000, kafkaSimpleStreamConsumer.getSimpleConsumer().soTimeout());
-  }
-
-  @Test
-  public void testGetPartitionCount() {
-    String streamType = "kafka";
-    String streamKafkaTopicName = "theTopic";
-    String streamKafkaBrokerList = "abcd:1234,bcde:2345";
-    String streamKafkaConsumerType = "simple";
-    String clientId = "clientId";
-    String tableNameWithType = "table_REALTIME";
-
-    MockKafkaSimpleConsumerFactory mockKafkaSimpleConsumerFactory =
-        new MockKafkaSimpleConsumerFactory(new String[]{"abcd", "bcde"}, new int[]{1234, 2345},
-            new long[]{12345L, 23456L}, new long[]{23456L, 34567L}, new int[]{0, 1}, streamKafkaTopicName);
-
-    Map<String, String> streamConfigMap = new HashMap<>();
-    streamConfigMap.put("streamType", streamType);
-    streamConfigMap.put("stream.kafka.topic.name", streamKafkaTopicName);
-    streamConfigMap.put("stream.kafka.broker.list", streamKafkaBrokerList);
-    streamConfigMap.put("stream.kafka.consumer.type", streamKafkaConsumerType);
-    streamConfigMap
-        .put("stream.kafka.consumer.factory.class.name", mockKafkaSimpleConsumerFactory.getClass().getName());
-    streamConfigMap.put("stream.kafka.decoder.class.name", "decoderClass");
-    StreamConfig streamConfig = new StreamConfig(tableNameWithType, streamConfigMap);
-
-    KafkaStreamMetadataProvider streamMetadataProvider =
-        new KafkaStreamMetadataProvider(clientId, streamConfig, mockKafkaSimpleConsumerFactory);
-    Assert.assertEquals(streamMetadataProvider.fetchPartitionCount(10000L), 2);
-  }
-
-  @Test
-  public void testFetchMessages()
-      throws Exception {
-    String streamType = "kafka";
-    String streamKafkaTopicName = "theTopic";
-    String streamKafkaBrokerList = "abcd:1234,bcde:2345";
-    String streamKafkaConsumerType = "simple";
-    String clientId = "clientId";
-    String tableNameWithType = "table_REALTIME";
-
-    MockKafkaSimpleConsumerFactory mockKafkaSimpleConsumerFactory =
-        new MockKafkaSimpleConsumerFactory(new String[]{"abcd", "bcde"}, new int[]{1234, 2345},
-            new long[]{12345L, 23456L}, new long[]{23456L, 34567L}, new int[]{0, 1}, streamKafkaTopicName);
-
-    Map<String, String> streamConfigMap = new HashMap<>();
-    streamConfigMap.put("streamType", streamType);
-    streamConfigMap.put("stream.kafka.topic.name", streamKafkaTopicName);
-    streamConfigMap.put("stream.kafka.broker.list", streamKafkaBrokerList);
-    streamConfigMap.put("stream.kafka.consumer.type", streamKafkaConsumerType);
-    streamConfigMap
-        .put("stream.kafka.consumer.factory.class.name", mockKafkaSimpleConsumerFactory.getClass().getName());
-    streamConfigMap.put("stream.kafka.decoder.class.name", "decoderClass");
-    StreamConfig streamConfig = new StreamConfig(tableNameWithType, streamConfigMap);
-
-    int partition = 0;
-    KafkaPartitionLevelConsumer kafkaSimpleStreamConsumer =
-        new KafkaPartitionLevelConsumer(clientId, streamConfig, partition, mockKafkaSimpleConsumerFactory);
-    kafkaSimpleStreamConsumer.fetchMessages(new LongMsgOffset(12345L), new LongMsgOffset(23456L), 10000);
-  }
-
-  @Test(enabled = false)
-  public void testFetchOffsets()
-      throws Exception {
-    String streamType = "kafka";
-    String streamKafkaTopicName = "theTopic";
-    String streamKafkaBrokerList = "abcd:1234,bcde:2345";
-    String streamKafkaConsumerType = "simple";
-    String clientId = "clientId";
-    String tableNameWithType = "table_REALTIME";
-
-    MockKafkaSimpleConsumerFactory mockKafkaSimpleConsumerFactory =
-        new MockKafkaSimpleConsumerFactory(new String[]{"abcd", "bcde"}, new int[]{1234, 2345},
-            new long[]{12345L, 23456L}, new long[]{23456L, 34567L}, new int[]{0, 1}, streamKafkaTopicName);
-
-    Map<String, String> streamConfigMap = new HashMap<>();
-    streamConfigMap.put("streamType", streamType);
-    streamConfigMap.put("stream.kafka.topic.name", streamKafkaTopicName);
-    streamConfigMap.put("stream.kafka.broker.list", streamKafkaBrokerList);
-    streamConfigMap.put("stream.kafka.consumer.type", streamKafkaConsumerType);
-    streamConfigMap
-        .put("stream.kafka.consumer.factory.class.name", mockKafkaSimpleConsumerFactory.getClass().getName());
-    streamConfigMap.put("stream.kafka.decoder.class.name", "decoderClass");
-    StreamConfig streamConfig = new StreamConfig(tableNameWithType, streamConfigMap);
-
-    int partition = 0;
-    KafkaStreamMetadataProvider kafkaStreamMetadataProvider =
-        new KafkaStreamMetadataProvider(clientId, streamConfig, partition, mockKafkaSimpleConsumerFactory);
-    kafkaStreamMetadataProvider
-        .fetchStreamPartitionOffset(new OffsetCriteria.OffsetCriteriaBuilder().withOffsetSmallest(), 10000);
-  }
-}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMessageBatch.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMessageBatch.java
index 1852c8bdc8e..dbc3e8d2a69 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMessageBatch.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMessageBatch.java
@@ -24,6 +24,7 @@
 import org.apache.pinot.spi.stream.MessageBatch;
 import org.apache.pinot.spi.stream.RowMetadata;
 import org.apache.pinot.spi.stream.StreamMessage;
+import org.apache.pinot.spi.stream.StreamMessageMetadata;
 import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
 
 
@@ -31,16 +32,29 @@ public class KafkaMessageBatch implements MessageBatch<StreamMessage<byte[]>> {
   private final List<StreamMessage<byte[]>> _messageList;
   private final int _unfilteredMessageCount;
   private final long _lastOffset;
+  private final StreamMessageMetadata _lastMessageMetadata;
 
   /**
    * @param unfilteredMessageCount how many messages were received from the topic before being filtered
    * @param lastOffset the offset of the last message in the batch
    * @param batch the messages, which may be smaller than {@see unfilteredMessageCount}
+   * @param lastMessageMetadata metadata for last filtered message in the batch, useful for estimating ingestion delay
+   *                            when a batch has all messages filtered.
    */
-  public KafkaMessageBatch(int unfilteredMessageCount, long lastOffset, List<StreamMessage<byte[]>> batch) {
+  public KafkaMessageBatch(int unfilteredMessageCount, long lastOffset, List<StreamMessage<byte[]>> batch,
+      StreamMessageMetadata lastMessageMetadata) {
     _messageList = batch;
     _lastOffset = lastOffset;
     _unfilteredMessageCount = unfilteredMessageCount;
+    _lastMessageMetadata = lastMessageMetadata;
+  }
+
+  @Override
+  /**
+   * Returns the metadata for the last filtered message if any, null otherwise.
+   */
+  public StreamMessageMetadata getLastMessageMetadata() {
+    return _lastMessageMetadata;
   }
 
   @Override
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMetadataExtractor.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMetadataExtractor.java
index 922e1653019..86708ae715a 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMetadataExtractor.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaMetadataExtractor.java
@@ -31,11 +31,12 @@
 public interface KafkaMetadataExtractor {
   static KafkaMetadataExtractor build(boolean populateMetadata) {
     return record -> {
+      long recordTimestamp = record.timestamp();
+      Map<String, String> metadataMap = new HashMap<>();
+      metadataMap.put(KafkaStreamMessageMetadata.METADATA_OFFSET_KEY, String.valueOf(record.offset()));
+      metadataMap.put(KafkaStreamMessageMetadata.RECORD_TIMESTAMP_KEY, String.valueOf(recordTimestamp));
+
       if (!populateMetadata) {
-        long recordTimestamp = record.timestamp();
-        Map<String, String> metadataMap = new HashMap<>();
-        metadataMap.put(KafkaStreamMessageMetadata.METADATA_OFFSET_KEY, String.valueOf(record.offset()));
-        metadataMap.put(KafkaStreamMessageMetadata.RECORD_TIMESTAMP_KEY, String.valueOf(recordTimestamp));
         return new KafkaStreamMessageMetadata(recordTimestamp, RowMetadata.EMPTY_ROW, metadataMap);
       }
       GenericRow headerGenericRow = new GenericRow();
@@ -46,10 +47,7 @@ static KafkaMetadataExtractor build(boolean populateMetadata) {
           headerGenericRow.putValue(header.key(), header.value());
         }
       }
-      Map<String, String> metadata = new HashMap<>();
-      metadata.put(KafkaStreamMessageMetadata.METADATA_OFFSET_KEY, String.valueOf(record.offset()));
-      metadata.put(KafkaStreamMessageMetadata.RECORD_TIMESTAMP_KEY, String.valueOf(record.timestamp()));
-      return new KafkaStreamMessageMetadata(record.timestamp(), headerGenericRow, metadata);
+      return new KafkaStreamMessageMetadata(record.timestamp(), headerGenericRow, metadataMap);
     };
   }
 
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConnectionHandler.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConnectionHandler.java
index ca6290d59ac..00371acaba6 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConnectionHandler.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConnectionHandler.java
@@ -19,17 +19,22 @@
 package org.apache.pinot.plugin.stream.kafka20;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.util.concurrent.Uninterruptibles;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.KafkaException;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.serialization.BytesDeserializer;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.utils.Bytes;
 import org.apache.pinot.spi.stream.StreamConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -39,6 +44,7 @@
  */
 public abstract class KafkaPartitionLevelConnectionHandler {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(KafkaPartitionLevelConnectionHandler.class);
   protected final KafkaPartitionLevelStreamConfig _config;
   protected final String _clientId;
   protected final int _partition;
@@ -61,12 +67,36 @@ public KafkaPartitionLevelConnectionHandler(String clientId, StreamConfig stream
       consumerProp.put(ConsumerConfig.ISOLATION_LEVEL_CONFIG, _config.getKafkaIsolationLevel());
     }
     consumerProp.put(ConsumerConfig.CLIENT_ID_CONFIG, _clientId);
-    _consumer = new KafkaConsumer<>(consumerProp);
+    _consumer = createConsumer(consumerProp);
     _topicPartition = new TopicPartition(_topic, _partition);
     _consumer.assign(Collections.singletonList(_topicPartition));
     _kafkaMetadataExtractor = KafkaMetadataExtractor.build(_config.isPopulateMetadata());
   }
 
+  private Consumer<String, Bytes> createConsumer(Properties consumerProp) {
+    // Creation of the KafkaConsumer can fail for multiple reasons including DNS issues.
+    // We arbitrarily chose 5 retries with 2 seconds sleep in between retries. 10 seconds total felt
+    // like a good balance of not waiting too long for a retry, but also not retrying too many times.
+    int maxTries = 5;
+    int tries = 0;
+    while (true) {
+      try {
+        return new KafkaConsumer<>(consumerProp);
+      } catch (KafkaException e) {
+        tries++;
+        if (tries >= maxTries) {
+          LOGGER.error("Caught exception while creating Kafka consumer, giving up", e);
+          throw e;
+        }
+        LOGGER.warn("Caught exception while creating Kafka consumer, retrying {}/{}", tries, maxTries, e);
+        // We are choosing to sleepUniterruptibly here because other parts of the Kafka consumer code do this
+        // as well. We don't want random interrupts to cause us to fail to create the consumer and have the table
+        // stuck in ERROR state.
+        Uninterruptibles.sleepUninterruptibly(2, TimeUnit.SECONDS);
+      }
+    }
+  }
+
   public void close()
       throws IOException {
     _consumer.close();
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumer.java
index 46504bbc0d4..ff90f4b1a3f 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumer.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumer.java
@@ -70,15 +70,16 @@ public synchronized MessageBatch<StreamMessage<byte[]>> fetchMessages(long start
     List<ConsumerRecord<String, Bytes>> messageAndOffsets = consumerRecords.records(_topicPartition);
     List<StreamMessage<byte[]>> filtered = new ArrayList<>(messageAndOffsets.size());
     long lastOffset = startOffset;
+    StreamMessageMetadata rowMetadata = null;
     for (ConsumerRecord<String, Bytes> messageAndOffset : messageAndOffsets) {
       long offset = messageAndOffset.offset();
       _lastFetchedOffset = offset;
       if (offset >= startOffset && (endOffset > offset || endOffset < 0)) {
         Bytes message = messageAndOffset.value();
+        rowMetadata = (StreamMessageMetadata) _kafkaMetadataExtractor.extract(messageAndOffset);
         if (message != null) {
           String key = messageAndOffset.key();
           byte[] keyBytes = key != null ? key.getBytes(StandardCharsets.UTF_8) : null;
-          StreamMessageMetadata rowMetadata = (StreamMessageMetadata) _kafkaMetadataExtractor.extract(messageAndOffset);
           filtered.add(new KafkaStreamMessage(keyBytes, message.get(), rowMetadata));
         } else if (LOGGER.isDebugEnabled()) {
           LOGGER.debug("Tombstone message at offset: {}", offset);
@@ -89,6 +90,6 @@ public synchronized MessageBatch<StreamMessage<byte[]>> fetchMessages(long start
             endOffset);
       }
     }
-    return new KafkaMessageBatch(messageAndOffsets.size(), lastOffset, filtered);
+    return new KafkaMessageBatch(messageAndOffsets.size(), lastOffset, filtered, rowMetadata);
   }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaStreamMessage.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaStreamMessage.java
index f67dcf3f7df..a2bc3122d25 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaStreamMessage.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/main/java/org/apache/pinot/plugin/stream/kafka20/KafkaStreamMessage.java
@@ -23,7 +23,7 @@
 import org.apache.pinot.spi.stream.StreamMessageMetadata;
 
 
-public class KafkaStreamMessage extends StreamMessage {
+public class KafkaStreamMessage extends StreamMessage<byte[]> {
   public KafkaStreamMessage(@Nullable byte[] key, byte[] value, @Nullable StreamMessageMetadata metadata) {
     super(key, value, metadata, value.length);
   }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumerTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumerTest.java
index 6c85f913f5c..e783e091ae9 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumerTest.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/src/test/java/org/apache/pinot/plugin/stream/kafka20/KafkaPartitionLevelConsumerTest.java
@@ -37,6 +37,7 @@
 import org.apache.pinot.spi.stream.StreamConfig;
 import org.apache.pinot.spi.stream.StreamConsumerFactory;
 import org.apache.pinot.spi.stream.StreamConsumerFactoryProvider;
+import org.apache.pinot.spi.stream.StreamMessage;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -281,7 +282,9 @@ private void testConsumer(String topic)
           consumer.fetchMessages(new LongMsgOffset(0), new LongMsgOffset(NUM_MSG_PRODUCED_PER_PARTITION), 10000);
       Assert.assertEquals(batch1.getMessageCount(), 500);
       for (int i = 0; i < batch1.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) batch1.getStreamMessage(i).getValue();
+        StreamMessage streamMessage = batch1.getStreamMessage(i);
+        Assert.assertNotNull(streamMessage.getMetadata());
+        final byte[] msg = (byte[]) streamMessage.getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + i);
         Assert.assertNotNull(batch1.getMetadataAtIndex(i));
       }
@@ -290,7 +293,9 @@ private void testConsumer(String topic)
           consumer.fetchMessages(new LongMsgOffset(500), new LongMsgOffset(NUM_MSG_PRODUCED_PER_PARTITION), 10000);
       Assert.assertEquals(batch2.getMessageCount(), 500);
       for (int i = 0; i < batch2.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) batch2.getStreamMessage(i).getValue();
+        StreamMessage streamMessage = batch2.getStreamMessage(i);
+        Assert.assertNotNull(streamMessage.getMetadata());
+        final byte[] msg = (byte[]) streamMessage.getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + (500 + i));
         Assert.assertNotNull(batch1.getMetadataAtIndex(i));
       }
@@ -298,7 +303,9 @@ private void testConsumer(String topic)
       final MessageBatch batch3 = consumer.fetchMessages(new LongMsgOffset(10), new LongMsgOffset(35), 10000);
       Assert.assertEquals(batch3.getMessageCount(), 25);
       for (int i = 0; i < batch3.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) batch3.getStreamMessage(i).getValue();
+        StreamMessage streamMessage = batch3.getStreamMessage(i);
+        Assert.assertNotNull(streamMessage.getMetadata());
+        final byte[] msg = (byte[]) streamMessage.getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + (10 + i));
         Assert.assertNotNull(batch1.getMetadataAtIndex(i));
       }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
index 969d2e26840..c04ddbd8036 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
@@ -36,7 +36,6 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
-    <aws.version>2.14.28</aws.version>
     <easymock.version>4.2</easymock.version>
     <reactive.version>1.0.2</reactive.version>
     <localstack-utils.version>0.2.19</localstack-utils.version>
@@ -47,7 +46,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>bom</artifactId>
-        <version>${aws.version}</version>
+        <version>${aws.sdk.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -58,54 +57,16 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sdk-core</artifactId>
-      <version>${aws.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-buffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-common</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>kinesis</artifactId>
-      <version>${aws.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-buffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-common</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>apache-client</artifactId>
-      <version>${aws.version}</version>
+      <version>${aws.sdk.version}</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
     <dependency>
@@ -120,25 +81,6 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sts</artifactId>
-      <version>${aws.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-buffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-common</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -190,20 +132,6 @@
       <groupId>cloud.localstack</groupId>
       <artifactId>localstack-utils</artifactId>
       <version>${localstack-utils.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <!-- We have to explicitly exclude kinesis, due to a bug in the current
-             version of the maven-enforcer-plugin, where it doesn't handle
-             wildcard exclusions in transitive dependencies. So projects that
-             depend on this project wind up not excluding kinesis. -->
-        <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>kinesis</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConfig.java
index 47adf78c204..40a2ece1935 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConfig.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConfig.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.UUID;
 import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.stream.StreamConfigProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
@@ -79,6 +80,7 @@ public class KinesisConfig {
   private final String _accessKey;
   private final String _secretKey;
   private final String _endpoint;
+  private boolean _populateMetadata;
 
   // IAM Role values
   private boolean _iamRoleBasedAccess;
@@ -126,6 +128,8 @@ public KinesisConfig(StreamConfig streamConfig) {
           "Must provide 'roleArn' in stream config for table %s if iamRoleBasedAccess is enabled",
           streamConfig.getTableNameWithType());
     }
+    _populateMetadata = Boolean.parseBoolean(streamConfig.getStreamConfigsMap().getOrDefault(
+        StreamConfigProperties.METADATA_POPULATE, "false"));
   }
 
   public String getStreamTopicName() {
@@ -183,4 +187,8 @@ public int getSessionDurationSeconds() {
   public boolean isAsyncSessionUpdateEnabled() {
     return _asyncSessionUpdateEnabled;
   }
+
+  public boolean isPopulateMetadata() {
+    return _populateMetadata;
+  }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConnectionHandler.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConnectionHandler.java
index 7fbd0e28c22..3fdc1d8080e 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConnectionHandler.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConnectionHandler.java
@@ -50,6 +50,7 @@ public class KinesisConnectionHandler {
   private final String _secretKey;
   private final String _endpoint;
   private final KinesisConfig _kinesisConfig;
+  protected final KinesisMetadataExtractor _kinesisMetadataExtractor;
 
   public KinesisConnectionHandler(KinesisConfig kinesisConfig) {
     _stream = kinesisConfig.getStreamTopicName();
@@ -58,6 +59,7 @@ public KinesisConnectionHandler(KinesisConfig kinesisConfig) {
     _secretKey = kinesisConfig.getSecretKey();
     _endpoint = kinesisConfig.getEndpoint();
     _kinesisConfig = kinesisConfig;
+    _kinesisMetadataExtractor = KinesisMetadataExtractor.build(kinesisConfig.isPopulateMetadata());
     createConnection();
   }
 
@@ -69,6 +71,7 @@ public KinesisConnectionHandler(KinesisConfig kinesisConfig, KinesisClient kines
     _secretKey = kinesisConfig.getSecretKey();
     _endpoint = kinesisConfig.getEndpoint();
     _kinesisConfig = kinesisConfig;
+    _kinesisMetadataExtractor = KinesisMetadataExtractor.build(kinesisConfig.isPopulateMetadata());
     _kinesisClient = kinesisClient;
   }
 
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumer.java
index 3ded54ec8f0..53d0fdde2c8 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumer.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumer.java
@@ -20,6 +20,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,7 +43,6 @@
 import software.amazon.awssdk.services.kinesis.model.InvalidArgumentException;
 import software.amazon.awssdk.services.kinesis.model.KinesisException;
 import software.amazon.awssdk.services.kinesis.model.ProvisionedThroughputExceededException;
-import software.amazon.awssdk.services.kinesis.model.Record;
 import software.amazon.awssdk.services.kinesis.model.ResourceNotFoundException;
 import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
 
@@ -85,7 +85,7 @@ public KinesisConsumer(KinesisConfig kinesisConfig, KinesisClient kinesisClient)
   @Override
   public KinesisRecordsBatch fetchMessages(StreamPartitionMsgOffset startCheckpoint,
       StreamPartitionMsgOffset endCheckpoint, int timeoutMs) {
-    List<Record> recordList = new ArrayList<>();
+    List<KinesisStreamMessage> recordList = new ArrayList<>();
     Future<KinesisRecordsBatch> kinesisFetchResultFuture =
         _executorService.submit(() -> getResult(startCheckpoint, endCheckpoint, recordList));
 
@@ -100,7 +100,7 @@ public KinesisRecordsBatch fetchMessages(StreamPartitionMsgOffset startCheckpoin
   }
 
   private KinesisRecordsBatch getResult(StreamPartitionMsgOffset startOffset, StreamPartitionMsgOffset endOffset,
-      List<Record> recordList) {
+      List<KinesisStreamMessage> recordList) {
     KinesisPartitionGroupOffset kinesisStartCheckpoint = (KinesisPartitionGroupOffset) startOffset;
 
     try {
@@ -138,7 +138,13 @@ private KinesisRecordsBatch getResult(StreamPartitionMsgOffset startOffset, Stre
         GetRecordsResponse getRecordsResponse = _kinesisClient.getRecords(getRecordsRequest);
 
         if (!getRecordsResponse.records().isEmpty()) {
-          recordList.addAll(getRecordsResponse.records());
+          getRecordsResponse.records().forEach(record -> {
+            recordList.add(
+            new KinesisStreamMessage(record.partitionKey().getBytes(StandardCharsets.UTF_8),
+                record.data().asByteArray(), record.sequenceNumber(),
+                (KinesisStreamMessageMetadata) _kinesisMetadataExtractor.extract(record),
+                record.data().asByteArray().length));
+          });
           nextStartSequenceNumber = recordList.get(recordList.size() - 1).sequenceNumber();
 
           if (kinesisEndSequenceNumber != null && kinesisEndSequenceNumber.compareTo(nextStartSequenceNumber) <= 0) {
@@ -173,7 +179,12 @@ private KinesisRecordsBatch getResult(StreamPartitionMsgOffset startOffset, Stre
         }
 
         if (currentWindowRequests >= _rpsLimit) {
-          Thread.sleep(SLEEP_TIME_BETWEEN_REQUESTS);
+          try {
+            Thread.sleep(SLEEP_TIME_BETWEEN_REQUESTS);
+          } catch (InterruptedException e) {
+            LOGGER.debug("Sleep interrupted while rate limiting Kinesis requests", e);
+            break;
+          }
         }
       }
 
@@ -214,7 +225,8 @@ private void debugOrLogWarning(String message, Throwable throwable) {
     }
   }
 
-  private KinesisRecordsBatch handleException(KinesisPartitionGroupOffset start, List<Record> recordList) {
+  private KinesisRecordsBatch handleException(KinesisPartitionGroupOffset start,
+      List<KinesisStreamMessage> recordList) {
     String shardId = start.getShardToStartSequenceMap().entrySet().iterator().next().getKey();
 
     if (!recordList.isEmpty()) {
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerPartitionLag.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerPartitionLag.java
new file mode 100644
index 00000000000..e14737a8d0a
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerPartitionLag.java
@@ -0,0 +1,35 @@
+/**
+ * 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.pinot.plugin.stream.kinesis;
+
+import org.apache.pinot.spi.stream.PartitionLagState;
+
+
+public class KinesisConsumerPartitionLag extends PartitionLagState {
+  private final String _availabilityLagMs;
+
+  public KinesisConsumerPartitionLag(String availabilityLagMs) {
+    _availabilityLagMs = availabilityLagMs;
+  }
+
+  @Override
+  public String getAvailabilityLagMs() {
+    return _availabilityLagMs;
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisMetadataExtractor.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisMetadataExtractor.java
new file mode 100644
index 00000000000..963ff8f689e
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisMetadataExtractor.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.plugin.stream.kinesis;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pinot.spi.stream.RowMetadata;
+import software.amazon.awssdk.services.kinesis.model.Record;
+
+// TODO: Make this an interface/api in the stream spis st StreamMessageMetadata extract(T streamTypeRecord)
+
+public interface KinesisMetadataExtractor {
+  static KinesisMetadataExtractor build(boolean populateMetadata) {
+    return record -> {
+      long recordTimestamp = record.approximateArrivalTimestamp().toEpochMilli();
+
+      if (!populateMetadata) {
+        return new KinesisStreamMessageMetadata(recordTimestamp, null, Collections.emptyMap());
+      }
+      String seqNumber = record.sequenceNumber();
+      Map<String, String> metadataMap = new HashMap<>();
+      metadataMap.put(KinesisStreamMessageMetadata.APPRX_ARRIVAL_TIMESTAMP_KEY, String.valueOf(recordTimestamp));
+      metadataMap.put(KinesisStreamMessageMetadata.SEQUENCE_NUMBER_KEY, seqNumber);
+      return new KinesisStreamMessageMetadata(recordTimestamp, null, metadataMap);
+    };
+  }
+  RowMetadata extract(Record record);
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatch.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatch.java
index 112e2d26b45..beb8d351d09 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatch.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatch.java
@@ -23,19 +23,19 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.spi.stream.MessageBatch;
+import org.apache.pinot.spi.stream.RowMetadata;
 import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
-import software.amazon.awssdk.services.kinesis.model.Record;
 
 
 /**
  * A {@link MessageBatch} for collecting records from the Kinesis stream
  */
-public class KinesisRecordsBatch implements MessageBatch<byte[]> {
-  private final List<Record> _recordList;
+public class KinesisRecordsBatch implements MessageBatch<KinesisStreamMessage> {
+  private final List<KinesisStreamMessage> _recordList;
   private final String _shardId;
   private final boolean _endOfShard;
 
-  public KinesisRecordsBatch(List<Record> recordList, String shardId, boolean endOfShard) {
+  public KinesisRecordsBatch(List<KinesisStreamMessage> recordList, String shardId, boolean endOfShard) {
     _recordList = recordList;
     _shardId = shardId;
     _endOfShard = endOfShard;
@@ -47,18 +47,23 @@ public int getMessageCount() {
   }
 
   @Override
-  public byte[] getMessageAtIndex(int index) {
-    return _recordList.get(index).data().asByteArray();
+  public KinesisStreamMessage getMessageAtIndex(int index) {
+    return _recordList.get(index);
+  }
+
+  @Override
+  public byte[] getMessageBytesAtIndex(int index) {
+    return _recordList.get(index).getValue();
   }
 
   @Override
   public int getMessageOffsetAtIndex(int index) {
-    return ByteBuffer.wrap(_recordList.get(index).data().asByteArray()).arrayOffset();
+    return ByteBuffer.wrap(_recordList.get(index).getValue()).arrayOffset();
   }
 
   @Override
   public int getMessageLengthAtIndex(int index) {
-    return _recordList.get(index).data().asByteArray().length;
+    return _recordList.get(index).getValue().length;
   }
 
   @Override
@@ -77,4 +82,9 @@ public long getNextStreamMessageOffsetAtIndex(int index) {
   public boolean isEndOfPartitionGroup() {
     return _endOfShard;
   }
+
+  @Override
+  public RowMetadata getMetadataAtIndex(int index) {
+    return _recordList.get(index).getMetadata();
+  }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMessage.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMessage.java
new file mode 100644
index 00000000000..1f4f7e999d2
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMessage.java
@@ -0,0 +1,37 @@
+/**
+ * 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.pinot.plugin.stream.kinesis;
+
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.stream.StreamMessage;
+
+
+public class KinesisStreamMessage extends StreamMessage<byte[]> {
+  private final String _sequenceNumber;
+
+  public KinesisStreamMessage(@Nullable byte[] key, byte[] value, String sequenceNumber,
+      @Nullable KinesisStreamMessageMetadata metadata, int length) {
+    super(key, value, metadata, length);
+    _sequenceNumber = sequenceNumber;
+  }
+
+  public String sequenceNumber() {
+    return _sequenceNumber;
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMessageMetadata.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMessageMetadata.java
new file mode 100644
index 00000000000..61c55efe625
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMessageMetadata.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.plugin.stream.kinesis;
+
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.stream.StreamMessageMetadata;
+
+
+public class KinesisStreamMessageMetadata extends StreamMessageMetadata {
+  public static final String APPRX_ARRIVAL_TIMESTAMP_KEY = "apprxArrivalTimestamp";
+  public static final String SEQUENCE_NUMBER_KEY = "sequenceNumber";
+
+  public KinesisStreamMessageMetadata(long recordIngestionTimeMs,
+      @Nullable GenericRow headers) {
+    super(recordIngestionTimeMs, headers);
+  }
+
+  public KinesisStreamMessageMetadata(long recordIngestionTimeMs, @Nullable GenericRow headers,
+      Map<String, String> metadata) {
+    super(recordIngestionTimeMs, headers, metadata);
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMetadataProvider.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMetadataProvider.java
index 2b8b6f22c99..96bc0502c6b 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMetadataProvider.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/main/java/org/apache/pinot/plugin/stream/kinesis/KinesisStreamMetadataProvider.java
@@ -28,11 +28,14 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.spi.stream.ConsumerPartitionState;
 import org.apache.pinot.spi.stream.MessageBatch;
 import org.apache.pinot.spi.stream.OffsetCriteria;
 import org.apache.pinot.spi.stream.PartitionGroupConsumer;
 import org.apache.pinot.spi.stream.PartitionGroupConsumptionStatus;
 import org.apache.pinot.spi.stream.PartitionGroupMetadata;
+import org.apache.pinot.spi.stream.PartitionLagState;
+import org.apache.pinot.spi.stream.RowMetadata;
 import org.apache.pinot.spi.stream.StreamConfig;
 import org.apache.pinot.spi.stream.StreamConsumerFactory;
 import org.apache.pinot.spi.stream.StreamConsumerFactoryProvider;
@@ -189,6 +192,24 @@ private boolean consumedEndOfShard(StreamPartitionMsgOffset startCheckpoint,
   }
 
   @Override
-  public void close() {
+  public Map<String, PartitionLagState> getCurrentPartitionLagState(
+      Map<String, ConsumerPartitionState> currentPartitionStateMap) {
+    Map<String, PartitionLagState> perPartitionLag = new HashMap<>();
+    for (Map.Entry<String, ConsumerPartitionState> entry: currentPartitionStateMap.entrySet()) {
+      ConsumerPartitionState partitionState = entry.getValue();
+      // Compute record-availability
+      String recordAvailabilityLag = "UNKNOWN";
+      RowMetadata lastProcessedMessageMetadata = partitionState.getLastProcessedRowMetadata();
+      if (lastProcessedMessageMetadata != null && partitionState.getLastProcessedTimeMs() > 0) {
+        long availabilityLag = partitionState.getLastProcessedTimeMs()
+            - lastProcessedMessageMetadata.getRecordIngestionTimeMs();
+        recordAvailabilityLag = String.valueOf(availabilityLag);
+      }
+      perPartitionLag.put(entry.getKey(), new KinesisConsumerPartitionLag(recordAvailabilityLag));
+    }
+    return perPartitionLag;
   }
+
+  @Override
+  public void close() { }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerTest.java
index c006e1ae04d..b09820530e1 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerTest.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisConsumerTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.plugin.stream.kinesis;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -91,6 +92,7 @@ public void setupTest() {
     for (int i = 0; i < NUM_RECORDS; i++) {
       Record record =
           Record.builder().data(SdkBytes.fromUtf8String(DUMMY_RECORD_PREFIX + i)).partitionKey(PARTITION_KEY_PREFIX + i)
+              .approximateArrivalTimestamp(Instant.now())
               .sequenceNumber(String.valueOf(i + 1)).build();
       _recordList.add(record);
     }
@@ -122,7 +124,7 @@ public void testBasicConsumer() {
     Assert.assertEquals(kinesisRecordsBatch.getMessageCount(), NUM_RECORDS);
 
     for (int i = 0; i < NUM_RECORDS; i++) {
-      Assert.assertEquals(baToString(kinesisRecordsBatch.getMessageAtIndex(i)), DUMMY_RECORD_PREFIX + i);
+      Assert.assertEquals(baToString(kinesisRecordsBatch.getMessageAtIndex(i).getValue()), DUMMY_RECORD_PREFIX + i);
     }
 
     Assert.assertFalse(kinesisRecordsBatch.isEndOfPartitionGroup());
@@ -155,7 +157,7 @@ public void testBasicConsumerWithMaxRecordsLimit() {
     Assert.assertEquals(kinesisRecordsBatch.getMessageCount(), MAX_RECORDS_TO_FETCH);
 
     for (int i = 0; i < NUM_RECORDS; i++) {
-      Assert.assertEquals(baToString(kinesisRecordsBatch.getMessageAtIndex(i)), DUMMY_RECORD_PREFIX + i);
+      Assert.assertEquals(baToString(kinesisRecordsBatch.getMessageAtIndex(i).getValue()), DUMMY_RECORD_PREFIX + i);
     }
   }
 
@@ -191,7 +193,7 @@ public void testBasicConsumerWithChildShard() {
     Assert.assertEquals(kinesisRecordsBatch.getMessageCount(), NUM_RECORDS);
 
     for (int i = 0; i < NUM_RECORDS; i++) {
-      Assert.assertEquals(baToString(kinesisRecordsBatch.getMessageAtIndex(i)), DUMMY_RECORD_PREFIX + i);
+      Assert.assertEquals(baToString(kinesisRecordsBatch.getMessageAtIndex(i).getValue()), DUMMY_RECORD_PREFIX + i);
     }
   }
 
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatchTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatchTest.java
new file mode 100644
index 00000000000..83d7ded36e1
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/src/test/java/org/apache/pinot/plugin/stream/kinesis/KinesisRecordsBatchTest.java
@@ -0,0 +1,85 @@
+/**
+ * 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.pinot.plugin.stream.kinesis;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class KinesisRecordsBatchTest {
+  private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
+  @Test
+  public void testMessageBatchAPIs() {
+    int msgCount = 5;
+    long baseTimeMs = System.currentTimeMillis();
+    List<KinesisStreamMessage> msgList = new ArrayList<>(msgCount);
+
+
+    for (int i = 0; i < msgCount; i++) {
+      msgList.add(createStreamMessage(i, "key-" + i, "value-" + i, baseTimeMs + i));
+    }
+    KinesisRecordsBatch batch = new KinesisRecordsBatch(msgList, "shard-0000000000", false);
+
+    for (int i = 0; i < msgCount; i++) {
+      Assert.assertEquals(batch.getMessageLengthAtIndex(i), 7); // length of characters in "value-$i"
+      Assert.assertEquals(batch.getMessageOffsetAtIndex(i), 0);
+
+      KinesisPartitionGroupOffset kinesisPartitionGroupOffset =
+          (KinesisPartitionGroupOffset) batch.getNextStreamPartitionMsgOffsetAtIndex(i);
+      Assert.assertNotNull(kinesisPartitionGroupOffset);
+      Assert.assertNotNull(kinesisPartitionGroupOffset.getShardToStartSequenceMap().get("shard-0000000000"),
+          String.valueOf(i)); // why is "next" stream partition msg offset return the exact offset at index i ?
+
+      KinesisStreamMessageMetadata metadata = (KinesisStreamMessageMetadata) batch.getMetadataAtIndex(i);
+      Assert.assertNotNull(metadata);
+      Assert.assertEquals(metadata.getRecordIngestionTimeMs(), baseTimeMs + i);
+      Assert.assertEquals(batch.getMessageBytesAtIndex(i), ("value-" + i).getBytes(StandardCharsets.UTF_8));
+    }
+
+    // Batch level operations
+    Assert.assertEquals(batch.getMessageCount(), msgCount);
+    Assert.assertFalse(batch.isEndOfPartitionGroup());
+
+    KinesisPartitionGroupOffset nextBatchOffset = (KinesisPartitionGroupOffset) batch.getOffsetOfNextBatch();
+    Assert.assertNotNull(nextBatchOffset);
+    Assert.assertNotNull(nextBatchOffset.getShardToStartSequenceMap().get("shard-0000000000"),
+        String.valueOf(msgCount - 1));  // default implementation doesn't make sense ??
+    Assert.assertEquals(batch.getUnfilteredMessageCount(), msgCount); // always size of the batch for Kinesis
+
+    // unsupported operations for kinesis batch
+    Assert.assertThrows(UnsupportedOperationException.class, () -> {
+      batch.getNextStreamMessageOffsetAtIndex(0);
+    });
+
+    // batch.getMessageAtIndex(i); // deprecated
+  }
+
+  private static KinesisStreamMessage createStreamMessage(int sequenceNumber, String key, String value,
+      long recordIngestionTimeMs) {
+    KinesisStreamMessageMetadata metadata = new KinesisStreamMessageMetadata(recordIngestionTimeMs, null);
+    byte[] valueArray = value != null ? value.getBytes(StandardCharsets.UTF_8) : EMPTY_BYTE_ARRAY;
+    return new KinesisStreamMessage(
+        key != null ? key.getBytes(StandardCharsets.UTF_8) : EMPTY_BYTE_ARRAY, valueArray,
+        String.valueOf(sequenceNumber), metadata, valueArray.length);
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index 83d41828d8e..4f246248bd4 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -37,16 +37,15 @@
   <properties>
     <phase.prop>package</phase.prop>
     <pinot.root>${basedir}/../../..</pinot.root>
-    <pulsar.version>2.7.2</pulsar.version>
-    <jetty-server.version>9.4.45.v20220203</jetty-server.version>
+    <pulsar.version>2.11.0</pulsar.version>
+    <jetty-server.version>9.4.51.v20230217</jetty-server.version>
     <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
     <javax.ws.rs-api.version>2.1</javax.ws.rs-api.version>
-    <jersey-container-grizzly2-http.version>2.35</jersey-container-grizzly2-http.version>
+    <jersey-container-grizzly2-http.version>2.39</jersey-container-grizzly2-http.version>
     <simpleclient_common.version>0.8.1</simpleclient_common.version>
     <grpc-proto.version>1.12.0</grpc-proto.version>
     <grpc-context.version>1.14.0</grpc-context.version>
-    <bouncycastle.version>1.68</bouncycastle.version>
-    <commons-codec.version>1.11</commons-codec.version>
+    <bouncycastle.version>1.75</bouncycastle.version>
     <caffeine.version>2.6.2</caffeine.version>
     <codehaus-annotations.version>1.17</codehaus-annotations.version>
     <javax.annotation-api.version>1.2</javax.annotation-api.version>
@@ -78,14 +77,6 @@
       <artifactId>pulsar-client-original</artifactId>
       <version>${pulsar.version}</version>
       <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-unix-common</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-resolver</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>javax.ws.rs</groupId>
           <artifactId>javax.ws.rs-api</artifactId>
@@ -160,7 +151,6 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfig.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfig.java
index 73ea2eca4b5..8abd7ce0d3f 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfig.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfig.java
@@ -19,7 +19,13 @@
 package org.apache.pinot.plugin.stream.pulsar;
 
 import com.google.common.base.Preconditions;
+import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.spi.stream.OffsetCriteria;
 import org.apache.pinot.spi.stream.StreamConfig;
 import org.apache.pinot.spi.stream.StreamConfigProperties;
@@ -37,6 +43,7 @@ public class PulsarConfig {
   public static final String AUTHENTICATION_TOKEN = "authenticationToken";
   public static final String TLS_TRUST_CERTS_FILE_PATH = "tlsTrustCertsFilePath";
   public static final String ENABLE_KEY_VALUE_STITCH = "enableKeyValueStitch";
+  public static final String METADATA_FIELDS = "metadataFields"; //list of the metadata fields comma separated
 
   private final String _pulsarTopicName;
   private final String _subscriberId;
@@ -45,8 +52,11 @@ public class PulsarConfig {
   private final SubscriptionInitialPosition _subscriptionInitialPosition;
   private final String _authenticationToken;
   private final String _tlsTrustCertsFilePath;
+  // Deprecated since pulsar supports record key extraction
+  @Deprecated
   private final boolean _enableKeyValueStitch;
-
+  private final boolean _populateMetadata;
+  private final Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> _metadataFields;
   public PulsarConfig(StreamConfig streamConfig, String subscriberId) {
     Map<String, String> streamConfigMap = streamConfig.getStreamConfigsMap();
     _pulsarTopicName = streamConfig.getTopicName();
@@ -71,8 +81,32 @@ public PulsarConfig(StreamConfig streamConfig, String subscriberId) {
 
     _subscriptionInitialPosition = PulsarUtils.offsetCriteriaToSubscription(offsetCriteria);
     _initialMessageId = PulsarUtils.offsetCriteriaToMessageId(offsetCriteria);
+    _populateMetadata = Boolean.parseBoolean(streamConfig.getStreamConfigsMap().getOrDefault(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, StreamConfigProperties.METADATA_POPULATE),
+        "false"));
+    String metadataFieldsToExtractCSV = streamConfig.getStreamConfigsMap().getOrDefault(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, METADATA_FIELDS), "");
+    if (StringUtils.isBlank(metadataFieldsToExtractCSV) || !_populateMetadata) {
+      _metadataFields = Collections.emptySet();
+    } else {
+      _metadataFields = parseConfigStringToEnumSet(metadataFieldsToExtractCSV);
+    }
   }
 
+  private Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> parseConfigStringToEnumSet(
+      String listOfMetadataFields) {
+    try {
+      String[] metadataFieldsArr = listOfMetadataFields.split(",");
+      return Stream.of(metadataFieldsArr)
+          .map(String::trim)
+          .filter(StringUtils::isNotBlank)
+          .map(PulsarStreamMessageMetadata.PulsarMessageMetadataValue::findByKey)
+          .filter(Objects::nonNull)
+          .collect(Collectors.toSet());
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Invalid metadata fields list: " + listOfMetadataFields, e);
+    }
+  }
   public String getPulsarTopicName() {
     return _pulsarTopicName;
   }
@@ -100,8 +134,14 @@ public String getAuthenticationToken() {
   public String getTlsTrustCertsFilePath() {
     return _tlsTrustCertsFilePath;
   }
-
   public boolean getEnableKeyValueStitch() {
     return _enableKeyValueStitch;
   }
+  public boolean isPopulateMetadata() {
+    return _populateMetadata;
+  }
+
+  public Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> getMetadataFields() {
+    return _metadataFields;
+  }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatch.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatch.java
index 96559907216..912e8bef23c 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatch.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatch.java
@@ -21,32 +21,25 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.pinot.spi.stream.MessageBatch;
 import org.apache.pinot.spi.stream.StreamPartitionMsgOffset;
-import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.impl.BatchMessageIdImpl;
 import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.client.internal.DefaultImplementation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
  * A {@link MessageBatch} for collecting messages from pulsar topic
- *
  * When 'enableKeyValueStitch' flag is enabled, existing {@link org.apache.pinot.spi.stream.StreamMessageDecoder}
  * plugins will not work. A custom decoder will be needed to unpack key and value byte arrays and decode
  * them independently.
  */
-public class PulsarMessageBatch implements MessageBatch<byte[]> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(PulsarMessageBatch.class);
-  private List<Message<byte[]>> _messageList = new ArrayList<>();
-  private static ByteBuffer _lengthBuf = ByteBuffer.allocate(4);
+public class PulsarMessageBatch implements MessageBatch<PulsarStreamMessage> {
+  private final List<PulsarStreamMessage> _messageList = new ArrayList<>();
   private final boolean _enableKeyValueStitch;
 
-  public PulsarMessageBatch(Iterable<Message<byte[]>> iterable, boolean enableKeyValueStitch) {
+  public PulsarMessageBatch(Iterable<PulsarStreamMessage> iterable, boolean enableKeyValueStitch) {
     iterable.forEach(_messageList::add);
     _enableKeyValueStitch = enableKeyValueStitch;
   }
@@ -57,26 +50,19 @@ public int getMessageCount() {
   }
 
   @Override
-  public byte[] getMessageAtIndex(int index) {
-    Message<byte[]> msg = _messageList.get(index);
-    if (_enableKeyValueStitch) {
-      return stitchKeyValue(msg.getKeyBytes(), msg.getData());
-    }
-    return msg.getData();
+  public PulsarStreamMessage getMessageAtIndex(int index) {
+    return _messageList.get(index);
   }
 
   @Override
   public int getMessageOffsetAtIndex(int index) {
-    return ByteBuffer.wrap(_messageList.get(index).getData()).arrayOffset();
+    return ByteBuffer.wrap(_messageList.get(index).getValue()).arrayOffset();
   }
 
   @Override
   public int getMessageLengthAtIndex(int index) {
-    if (_enableKeyValueStitch) {
-      Message<byte[]> msg = _messageList.get(index);
-      return 8 + msg.getKeyBytes().length + msg.getData().length;
-    }
-    return _messageList.get(index).getData().length;
+    return _messageList.get(index).getValue().length; //if _enableKeyValueStitch is true,
+    // then they are already stitched in the consumer. If false, then the value is the raw value
   }
 
   /**
@@ -114,7 +100,8 @@ public StreamPartitionMsgOffset getNextStreamPartitionMsgOffsetAtIndex(int index
                 ((BatchMessageIdImpl) currentMessageId).getAcker());
       }
     } else {
-      nextMessageId = DefaultImplementation.newMessageId(currentLedgerId, currentEntryId + 1, currentPartitionIndex);
+      nextMessageId = DefaultImplementation.getDefaultImplementation()
+          .newMessageId(currentLedgerId, currentEntryId + 1, currentPartitionIndex);
     }
     return new MessageIdStreamOffset(nextMessageId);
   }
@@ -123,27 +110,4 @@ public StreamPartitionMsgOffset getNextStreamPartitionMsgOffsetAtIndex(int index
   public long getNextStreamMessageOffsetAtIndex(int index) {
     throw new UnsupportedOperationException("Pulsar does not support long stream offsets");
   }
-
-  /**
-   * Stitch key and value bytes together using a simple format:
-   * 4 bytes for key length + key bytes + 4 bytes for value length + value bytes
-   */
-  private byte[] stitchKeyValue(byte[] keyBytes, byte[] valueBytes) {
-    int keyLen = keyBytes.length;
-    int valueLen = valueBytes.length;
-    int totalByteArrayLength = 8 + keyLen + valueLen;
-    try {
-      ByteArrayOutputStream bos = new ByteArrayOutputStream(totalByteArrayLength);
-      _lengthBuf.clear();
-      bos.write(_lengthBuf.putInt(keyLen).array());
-      bos.write(keyBytes);
-      _lengthBuf.clear();
-      bos.write(_lengthBuf.putInt(valueLen).array());
-      bos.write(valueBytes);
-      return bos.toByteArray();
-    } catch (Exception e) {
-      LOGGER.error("Unable to stitch key and value bytes together", e);
-    }
-    return null;
-  }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMetadataExtractor.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMetadataExtractor.java
new file mode 100644
index 00000000000..6b208af4950
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarMetadataExtractor.java
@@ -0,0 +1,182 @@
+/**
+ * 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.pinot.plugin.stream.pulsar;
+
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.stream.RowMetadata;
+import org.apache.pulsar.client.api.Message;
+
+public interface PulsarMetadataExtractor {
+  static PulsarMetadataExtractor build(boolean populateMetadata,
+      Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> metadataValuesToExtract) {
+    return message -> {
+      long publishTime = message.getPublishTime();
+      long brokerPublishTime = message.getBrokerPublishTime().orElse(0L);
+      long recordTimestamp = brokerPublishTime != 0 ? brokerPublishTime : publishTime;
+
+      Map<String, String> metadataMap = populateMetadataMap(populateMetadata, message, metadataValuesToExtract);
+
+      GenericRow headerGenericRow = populateMetadata ? buildGenericRow(message) : null;
+      return new PulsarStreamMessageMetadata(recordTimestamp, headerGenericRow, metadataMap);
+    };
+  }
+
+  RowMetadata extract(Message<?> record);
+
+  static GenericRow buildGenericRow(Message<?> message) {
+    if (MapUtils.isEmpty(message.getProperties())) {
+      return null;
+    }
+    GenericRow genericRow = new GenericRow();
+    for (Map.Entry<String, String> entry : message.getProperties().entrySet()) {
+      genericRow.putValue(entry.getKey(), entry.getValue());
+    }
+    return genericRow;
+  }
+
+  static Map<String, String> populateMetadataMap(boolean populateAllFields, Message<?> message,
+      Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> metadataValuesToExtract) {
+
+    Map<String, String> metadataMap = new HashMap<>();
+    populateMetadataField(PulsarStreamMessageMetadata.PulsarMessageMetadataValue.EVENT_TIME, message, metadataMap);
+    populateMetadataField(PulsarStreamMessageMetadata.PulsarMessageMetadataValue.PUBLISH_TIME, message, metadataMap);
+    populateMetadataField(PulsarStreamMessageMetadata.PulsarMessageMetadataValue.BROKER_PUBLISH_TIME, message,
+        metadataMap);
+    populateMetadataField(PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_KEY, message, metadataMap);
+
+    // Populate some timestamps for lag calculation even if populateMetadata is false
+
+    if (!populateAllFields) {
+      return metadataMap;
+    }
+
+    for (PulsarStreamMessageMetadata.PulsarMessageMetadataValue metadataValue : metadataValuesToExtract) {
+      populateMetadataField(metadataValue, message, metadataMap);
+    }
+
+    return metadataMap;
+  }
+
+  static void populateMetadataField(PulsarStreamMessageMetadata.PulsarMessageMetadataValue value,
+      Message<?> message, Map<String, String> metadataMap) {
+    switch (value) {
+      case PUBLISH_TIME:
+        long publishTime = message.getPublishTime();
+        if (publishTime > 0) {
+          setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.PUBLISH_TIME,
+              publishTime);
+        }
+        break;
+      case EVENT_TIME:
+        long eventTime = message.getEventTime();
+        if (eventTime > 0) {
+          setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.EVENT_TIME,
+              eventTime);
+        }
+        break;
+      case BROKER_PUBLISH_TIME:
+        message.getBrokerPublishTime()
+            .ifPresent(brokerPublishTime -> setMetadataMapField(metadataMap,
+                PulsarStreamMessageMetadata.PulsarMessageMetadataValue.BROKER_PUBLISH_TIME, brokerPublishTime));
+        break;
+      case MESSAGE_KEY:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_KEY,
+            message.getKey());
+        break;
+      case MESSAGE_ID:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_ID,
+            message.getMessageId().toString());
+        break;
+      case MESSAGE_ID_BYTES_B64:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_ID_BYTES_B64,
+            message.getMessageId().toByteArray());
+        break;
+      case PRODUCER_NAME:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.PRODUCER_NAME,
+            message.getProducerName());
+        break;
+      case SCHEMA_VERSION:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.SCHEMA_VERSION,
+            message.getSchemaVersion());
+        break;
+      case SEQUENCE_ID:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.SEQUENCE_ID,
+            message.getSequenceId());
+        break;
+      case ORDERING_KEY:
+        if (message.hasOrderingKey()) {
+          setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.ORDERING_KEY,
+              message.getOrderingKey());
+        }
+        break;
+      case SIZE:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.SIZE,
+            message.size());
+        break;
+      case TOPIC_NAME:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.TOPIC_NAME,
+            message.getTopicName());
+        break;
+      case INDEX:
+        message.getIndex().ifPresent(index -> setMetadataMapField(metadataMap,
+            PulsarStreamMessageMetadata.PulsarMessageMetadataValue.INDEX, index));
+        break;
+      case REDELIVERY_COUNT:
+        setMetadataMapField(metadataMap, PulsarStreamMessageMetadata.PulsarMessageMetadataValue.REDELIVERY_COUNT,
+            message.getRedeliveryCount());
+        break;
+      default:
+        throw new IllegalArgumentException("Unsupported metadata value: " + value);
+    }
+  }
+
+  static void setMetadataMapField(Map<String, String> metadataMap,
+      PulsarStreamMessageMetadata.PulsarMessageMetadataValue metadataValue,
+      String value) {
+    if (StringUtils.isNotBlank(value)) {
+      metadataMap.put(metadataValue.getKey(), value);
+    }
+  }
+
+  static void setMetadataMapField(Map<String, String> metadataMap,
+      PulsarStreamMessageMetadata.PulsarMessageMetadataValue metadataValue,
+      int value) {
+    setMetadataMapField(metadataMap, metadataValue, String.valueOf(value));
+  }
+
+  static void setMetadataMapField(Map<String, String> metadataMap,
+      PulsarStreamMessageMetadata.PulsarMessageMetadataValue metadataValue,
+      long value) {
+    setMetadataMapField(metadataMap, metadataValue, String.valueOf(value));
+  }
+
+  static void setMetadataMapField(Map<String, String> metadataMap,
+      PulsarStreamMessageMetadata.PulsarMessageMetadataValue metadataValue,
+      byte[] value) {
+    if (value != null && value.length > 0) {
+      setMetadataMapField(metadataMap, metadataValue, Base64.getEncoder().encodeToString(value));
+    }
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConnectionHandler.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConnectionHandler.java
index 3ad57b55bb8..11033ec7165 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConnectionHandler.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConnectionHandler.java
@@ -40,6 +40,7 @@ public class PulsarPartitionLevelConnectionHandler {
   protected final PulsarConfig _config;
   protected final String _clientId;
   protected PulsarClient _pulsarClient = null;
+  protected final PulsarMetadataExtractor _pulsarMetadataExtractor;
 
   /**
    * Creates a new instance of {@link PulsarClient} and {@link Reader}
@@ -47,7 +48,7 @@ public class PulsarPartitionLevelConnectionHandler {
   public PulsarPartitionLevelConnectionHandler(String clientId, StreamConfig streamConfig) {
     _config = new PulsarConfig(streamConfig, clientId);
     _clientId = clientId;
-
+    _pulsarMetadataExtractor = PulsarMetadataExtractor.build(_config.isPopulateMetadata(), _config.getMetadataFields());
     try {
       ClientBuilder pulsarClientBuilder = PulsarClient.builder().serviceUrl(_config.getBootstrapServers());
       if (_config.getTlsTrustCertsFilePath() != null) {
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConsumer.java
index 0e55a07aa3e..d1b80b0360c 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConsumer.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarPartitionLevelConsumer.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.apache.pinot.spi.stream.MessageBatch;
 import org.apache.pinot.spi.stream.PartitionGroupConsumer;
 import org.apache.pinot.spi.stream.PartitionGroupConsumptionStatus;
 import org.apache.pinot.spi.stream.StreamConfig;
@@ -48,15 +47,15 @@ public class PulsarPartitionLevelConsumer extends PulsarPartitionLevelConnection
   private static final Logger LOGGER = LoggerFactory.getLogger(PulsarPartitionLevelConsumer.class);
   private final ExecutorService _executorService;
   private final Reader _reader;
-  private boolean _enableKeyValueStitch = false;
+  private boolean _enableKeyValueStitch;
 
   public PulsarPartitionLevelConsumer(String clientId, StreamConfig streamConfig,
       PartitionGroupConsumptionStatus partitionGroupConsumptionStatus) {
     super(clientId, streamConfig);
     PulsarConfig config = new PulsarConfig(streamConfig, clientId);
-    _reader = createReaderForPartition(config.getPulsarTopicName(),
-        partitionGroupConsumptionStatus.getPartitionGroupId(),
-        config.getInitialMessageId());
+    _reader =
+        createReaderForPartition(config.getPulsarTopicName(), partitionGroupConsumptionStatus.getPartitionGroupId(),
+            config.getInitialMessageId());
     LOGGER.info("Created pulsar reader with id {} for topic {} partition {}", _reader, _config.getPulsarTopicName(),
         partitionGroupConsumptionStatus.getPartitionGroupId());
     _executorService = Executors.newSingleThreadExecutor();
@@ -64,19 +63,19 @@ public PulsarPartitionLevelConsumer(String clientId, StreamConfig streamConfig,
   }
 
   /**
-   * Fetch records from the Pulsar stream between the start and end KinesisCheckpoint
+   * Fetch records from the Pulsar stream between the start and end StreamPartitionMsgOffset
    * Used {@link org.apache.pulsar.client.api.Reader} to read the messaged from pulsar partitioned topic
    * The reader seeks to the startMsgOffset and starts reading records in a loop until endMsgOffset or timeout is
    * reached.
    */
   @Override
-  public MessageBatch fetchMessages(StreamPartitionMsgOffset startMsgOffset, StreamPartitionMsgOffset endMsgOffset,
-      int timeoutMillis) {
+  public PulsarMessageBatch fetchMessages(StreamPartitionMsgOffset startMsgOffset,
+      StreamPartitionMsgOffset endMsgOffset, int timeoutMillis) {
     final MessageId startMessageId = ((MessageIdStreamOffset) startMsgOffset).getMessageId();
     final MessageId endMessageId =
         endMsgOffset == null ? MessageId.latest : ((MessageIdStreamOffset) endMsgOffset).getMessageId();
 
-    List<Message<byte[]>> messagesList = new ArrayList<>();
+    List<PulsarStreamMessage> messagesList = new ArrayList<>();
     Future<PulsarMessageBatch> pulsarResultFuture =
         _executorService.submit(() -> fetchMessages(startMessageId, endMessageId, messagesList));
 
@@ -96,7 +95,7 @@ public MessageBatch fetchMessages(StreamPartitionMsgOffset startMsgOffset, Strea
   }
 
   public PulsarMessageBatch fetchMessages(MessageId startMessageId, MessageId endMessageId,
-      List<Message<byte[]>> messagesList) {
+      List<PulsarStreamMessage> messagesList) {
     try {
       _reader.seek(startMessageId);
 
@@ -108,7 +107,8 @@ public PulsarMessageBatch fetchMessages(MessageId startMessageId, MessageId endM
             break;
           }
         }
-        messagesList.add(nextMessage);
+        messagesList.add(
+            PulsarUtils.buildPulsarStreamMessage(nextMessage, _enableKeyValueStitch, _pulsarMetadataExtractor));
 
         if (Thread.interrupted()) {
           break;
@@ -124,11 +124,11 @@ public PulsarMessageBatch fetchMessages(MessageId startMessageId, MessageId endM
     }
   }
 
-  private Iterable<Message<byte[]>> buildOffsetFilteringIterable(final List<Message<byte[]>> messageAndOffsets,
+  private Iterable<PulsarStreamMessage> buildOffsetFilteringIterable(final List<PulsarStreamMessage> messageAndOffsets,
       final MessageId startOffset, final MessageId endOffset) {
     return Iterables.filter(messageAndOffsets, input -> {
       // Filter messages that are either null or have an offset ∉ [startOffset, endOffset]
-      return input != null && input.getData() != null && (input.getMessageId().compareTo(startOffset) >= 0) && (
+      return input != null && input.getValue() != null && (input.getMessageId().compareTo(startOffset) >= 0) && (
           (endOffset == null) || (input.getMessageId().compareTo(endOffset) < 0));
     });
   }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamLevelConsumer.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamLevelConsumer.java
index 60272c62128..82040f6de3c 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamLevelConsumer.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamLevelConsumer.java
@@ -81,9 +81,9 @@ public GenericRow next(GenericRow destination) {
         // Log every minute or 100k events
         if (now - _lastLogTime > 60000 || _currentCount - _lastCount >= 100000) {
           if (_lastCount == 0) {
-            _logger.info("Consumed {} events from kafka stream {}", _currentCount, _streamConfig.getTopicName());
+            _logger.info("Consumed {} events from pulsar stream {}", _currentCount, _streamConfig.getTopicName());
           } else {
-            _logger.info("Consumed {} events from kafka stream {} (rate:{}/s)", _currentCount - _lastCount,
+            _logger.info("Consumed {} events from pulsar stream {} (rate:{}/s)", _currentCount - _lastCount,
                 _streamConfig.getTopicName(), (float) (_currentCount - _lastCount) * 1000 / (now - _lastLogTime));
           }
           _lastCount = _currentCount;
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMessage.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMessage.java
new file mode 100644
index 00000000000..7e091978579
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMessage.java
@@ -0,0 +1,47 @@
+/**
+ * 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.pinot.plugin.stream.pulsar;
+
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.stream.StreamMessage;
+import org.apache.pulsar.client.api.MessageId;
+
+public class PulsarStreamMessage extends StreamMessage<byte[]> {
+
+    private final MessageId _messageId;
+    public PulsarStreamMessage(@Nullable byte[] key, byte[] value, MessageId messageId,
+                                @Nullable PulsarStreamMessageMetadata metadata, int length) {
+        super(key, value, metadata, length);
+        _messageId = messageId;
+    }
+
+    public MessageId getMessageId() {
+        return _messageId;
+    }
+
+    int getKeyLength() {
+        byte[] key = getKey();
+        return key == null ? 0 : key.length;
+    }
+
+    int getValueLength() {
+        byte[] value = getValue();
+        return value == null ? 0 : value.length;
+    }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMessageMetadata.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMessageMetadata.java
new file mode 100644
index 00000000000..59220138d73
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMessageMetadata.java
@@ -0,0 +1,76 @@
+/**
+ * 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.pinot.plugin.stream.pulsar;
+
+import java.util.EnumSet;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.data.readers.GenericRow;
+import org.apache.pinot.spi.stream.StreamMessageMetadata;
+
+/**
+ * Pulsar specific implementation of {@link StreamMessageMetadata}
+ * Pulsar makes many metadata values available for each message. Please see the pulsar documentation for more details.
+ * @see <a href="https://pulsar.apache.org/docs/en/concepts-messaging/#message-properties">Pulsar Message Properties</a>
+ */
+public class PulsarStreamMessageMetadata extends StreamMessageMetadata {
+
+    public enum PulsarMessageMetadataValue {
+        PUBLISH_TIME("publishTime"),
+        EVENT_TIME("eventTime"),
+        BROKER_PUBLISH_TIME("brokerPublishTime"),
+        MESSAGE_KEY("key"),
+        MESSAGE_ID("messageId"),
+        MESSAGE_ID_BYTES_B64("messageIdBytes"),
+        PRODUCER_NAME("producerName"),
+        SCHEMA_VERSION("schemaVersion"),
+        SEQUENCE_ID("sequenceId"),
+        ORDERING_KEY("orderingKey"),
+        SIZE("size"),
+        TOPIC_NAME("topicName"),
+        INDEX("index"),
+        REDELIVERY_COUNT("redeliveryCount");
+
+        private final String _key;
+
+        PulsarMessageMetadataValue(String key) {
+            _key = key;
+        }
+
+        public String getKey() {
+            return _key;
+        }
+
+        public static PulsarMessageMetadataValue findByKey(final String key) {
+            EnumSet<PulsarMessageMetadataValue> values = EnumSet.allOf(PulsarMessageMetadataValue.class);
+            return values.stream().filter(value -> value.getKey().equals(key)).findFirst().orElse(null);
+        }
+    }
+
+    public PulsarStreamMessageMetadata(long recordIngestionTimeMs,
+                                        @Nullable GenericRow headers) {
+        super(recordIngestionTimeMs, headers);
+    }
+
+    public PulsarStreamMessageMetadata(long recordIngestionTimeMs, @Nullable GenericRow headers,
+                                        Map<String, String> metadata) {
+        super(recordIngestionTimeMs, headers, metadata);
+    }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMetadataProvider.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMetadataProvider.java
index 34d89a98f5e..788e5e5ed36 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMetadataProvider.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarStreamMetadataProvider.java
@@ -84,17 +84,15 @@ public int fetchPartitionCount(long timeoutMillis) {
   public StreamPartitionMsgOffset fetchStreamPartitionOffset(OffsetCriteria offsetCriteria, long timeoutMillis) {
     Preconditions.checkNotNull(offsetCriteria);
     String subscription = "Pinot_" + UUID.randomUUID();
-    MessageId offset = null;
-    try (Consumer consumer =
-        _pulsarClient.newConsumer().topic(_topic)
-            .subscriptionInitialPosition(PulsarUtils.offsetCriteriaToSubscription(offsetCriteria))
-            .subscriptionMode(SubscriptionMode.NonDurable)  // automatically deletes subscription on consumer close
-            .subscriptionName(subscription).subscribe()) {
-
+    MessageId offset;
+    try (Consumer consumer = _pulsarClient.newConsumer().topic(_topic)
+        .subscriptionInitialPosition(PulsarUtils.offsetCriteriaToSubscription(offsetCriteria))
+        .subscriptionMode(SubscriptionMode.NonDurable)  // automatically deletes subscription on consumer close
+        .subscriptionName(subscription).subscribe()) {
       if (offsetCriteria.isLargest()) {
         offset = consumer.getLastMessageId();
       } else if (offsetCriteria.isSmallest()) {
-        offset = consumer.receive().getMessageId();
+        offset = consumer.receive((int) timeoutMillis, TimeUnit.MILLISECONDS).getMessageId();
       } else {
         throw new IllegalArgumentException("Unknown initial offset value " + offsetCriteria);
       }
@@ -131,8 +129,7 @@ public List<PartitionGroupMetadata> computePartitionGroupMetadata(String clientI
         for (int p = newPartitionStartIndex; p < partitionedTopicNameList.size(); p++) {
           try (Consumer consumer = _pulsarClient.newConsumer().topic(partitionedTopicNameList.get(p))
               .subscriptionInitialPosition(_config.getInitialSubscriberPosition())
-              .subscriptionMode(SubscriptionMode.NonDurable)
-              .subscriptionName(subscription).subscribe()) {
+              .subscriptionMode(SubscriptionMode.NonDurable).subscriptionName(subscription).subscribe()) {
 
             Message message = consumer.receive(timeoutMillis, TimeUnit.MILLISECONDS);
             if (message != null) {
@@ -149,8 +146,9 @@ public List<PartitionGroupMetadata> computePartitionGroupMetadata(String clientI
                   new PartitionGroupMetadata(p, new MessageIdStreamOffset(lastMessageId)));
             }
           } catch (PulsarClientException pce) {
-            LOGGER.warn("Error encountered while calculating partition group metadata for topic "
-                + _config.getPulsarTopicName() + " partition " + partitionedTopicNameList.get(p), pce);
+            LOGGER.warn(
+                "Error encountered while calculating partition group metadata for topic " + _config.getPulsarTopicName()
+                    + " partition " + partitionedTopicNameList.get(p), pce);
           }
         }
       }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarUtils.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarUtils.java
index 763b0fc0d42..d22f8b0b5fb 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarUtils.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/PulsarUtils.java
@@ -18,13 +18,22 @@
  */
 package org.apache.pinot.plugin.stream.pulsar;
 
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
 import org.apache.pinot.spi.stream.OffsetCriteria;
+import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class PulsarUtils {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(PulsarUtils.class);
+
+  private static final ByteBuffer LENGTH_BUF = ByteBuffer.allocate(4);
+
   private PulsarUtils() {
   }
 
@@ -51,4 +60,35 @@ public static MessageId offsetCriteriaToMessageId(OffsetCriteria offsetCriteria)
 
     throw new IllegalArgumentException("Unknown initial offset value " + offsetCriteria);
   }
+
+  /**
+   * Stitch key and value bytes together using a simple format:
+   * 4 bytes for key length + key bytes + 4 bytes for value length + value bytes
+   */
+  protected static byte[] stitchKeyValue(byte[] keyBytes, byte[] valueBytes) {
+    int keyLen = keyBytes.length;
+    int valueLen = valueBytes.length;
+    int totalByteArrayLength = 8 + keyLen + valueLen;
+    try (ByteArrayOutputStream bos = new ByteArrayOutputStream(totalByteArrayLength)) {
+      LENGTH_BUF.clear();
+      bos.write(LENGTH_BUF.putInt(keyLen).array());
+      bos.write(keyBytes);
+      LENGTH_BUF.clear();
+      bos.write(LENGTH_BUF.putInt(valueLen).array());
+      bos.write(valueBytes);
+      return bos.toByteArray();
+    } catch (Exception e) {
+      LOGGER.error("Unable to stitch key and value bytes together", e);
+    }
+    return null;
+  }
+
+  protected static PulsarStreamMessage buildPulsarStreamMessage(Message<byte[]> message, boolean enableKeyValueStitch,
+      PulsarMetadataExtractor pulsarMetadataExtractor) {
+    byte[] key = message.getKeyBytes();
+    byte[] data = enableKeyValueStitch ? stitchKeyValue(key, message.getData()) : message.getData();
+    int dataLength = (data != null) ? data.length : 0;
+    return new PulsarStreamMessage(key, data, message.getMessageId(),
+        (PulsarStreamMessageMetadata) pulsarMetadataExtractor.extract(message), dataLength);
+  }
 }
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/server/PulsarDataProducer.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/server/PulsarDataProducer.java
new file mode 100644
index 00000000000..4ef80e638d4
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/main/java/org/apache/pinot/plugin/stream/pulsar/server/PulsarDataProducer.java
@@ -0,0 +1,97 @@
+/**
+ * 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.pinot.plugin.stream.pulsar.server;
+
+import com.google.common.base.Preconditions;
+import java.util.Base64;
+import java.util.Properties;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.spi.stream.StreamDataProducer;
+import org.apache.pulsar.client.api.AuthenticationFactory;
+import org.apache.pulsar.client.api.ClientBuilder;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Pulsar data producer class
+ *
+ * TODO: Improve the current implementation that creates the producer object for each `produce()` call.
+ *
+ */
+public class PulsarDataProducer implements StreamDataProducer {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(PulsarDataProducer.class);
+
+  public static final String BROKER_SERVICE_URL = "brokerServiceUrl";
+  public static final String TOKEN = "token";
+
+  private PulsarClient _pulsarClient;
+
+  public PulsarDataProducer() {
+  }
+
+  @Override
+  public void init(Properties props) {
+    String brokerServiceUrl = props.getProperty(BROKER_SERVICE_URL);
+    Preconditions.checkNotNull(brokerServiceUrl, "broker service url must be configured.");
+    ClientBuilder clientBuilder = PulsarClient.builder().serviceUrl(brokerServiceUrl);
+
+    String token = props.getProperty(TOKEN);
+    if (StringUtils.isNotEmpty(token)) {
+      clientBuilder.authentication(AuthenticationFactory.token(token));
+    }
+
+    try {
+      _pulsarClient = clientBuilder.build();
+    } catch (PulsarClientException e) {
+      throw new IllegalArgumentException("Failed to create pulsar client", e);
+    }
+  }
+
+  @Override
+  public void produce(String topic, byte[] payload) {
+    try (Producer<byte[]> producer = _pulsarClient.newProducer().topic(topic).create()) {
+      producer.send(payload);
+    } catch (PulsarClientException e) {
+      LOGGER.error("Failed to produce message for topic: " + topic, e);
+    }
+  }
+
+  @Override
+  public void produce(String topic, byte[] key, byte[] payload) {
+    try (Producer<byte[]> producer = _pulsarClient.newProducer().topic(topic).create()) {
+      producer.newMessage().key(Base64.getEncoder().encodeToString(key)).value(payload).send();
+    } catch (PulsarClientException e) {
+      LOGGER.error("Failed to produce message for topic: " + topic, e);
+    }
+  }
+
+  @Override
+  public void close() {
+    try {
+      _pulsarClient.close();
+    } catch (PulsarClientException e) {
+      throw new RuntimeException("Failed to close pulsar client.", e);
+    }
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfigTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfigTest.java
new file mode 100644
index 00000000000..ad23c83ce05
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConfigTest.java
@@ -0,0 +1,118 @@
+/**
+ * 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.pinot.plugin.stream.pulsar;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.pinot.spi.stream.StreamConfig;
+import org.apache.pinot.spi.stream.StreamConfigProperties;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class PulsarConfigTest {
+  public static final String TABLE_NAME_WITH_TYPE = "tableName_REALTIME";
+
+  public static final String STREAM_TYPE = "pulsar";
+  public static final String STREAM_PULSAR_BROKER_LIST = "pulsar://localhost:6650";
+  public static final String STREAM_PULSAR_CONSUMER_TYPE = "simple";
+  Map<String, String> getCommonStreamConfigMap() {
+    Map<String, String> streamConfigMap = new HashMap<>();
+    streamConfigMap.put("streamType", STREAM_TYPE);
+    streamConfigMap.put("stream.pulsar.consumer.type", STREAM_PULSAR_CONSUMER_TYPE);
+    streamConfigMap.put("stream.pulsar.topic.name", "test-topic");
+    streamConfigMap.put("stream.pulsar.bootstrap.servers", STREAM_PULSAR_BROKER_LIST);
+    streamConfigMap.put("stream.pulsar.consumer.prop.auto.offset.reset", "smallest");
+    streamConfigMap.put("stream.pulsar.consumer.factory.class.name", PulsarConsumerFactory.class.getName());
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, StreamConfigProperties.STREAM_FETCH_TIMEOUT_MILLIS),
+        "1000");
+    streamConfigMap.put("stream.pulsar.decoder.class.name", "decoderClass");
+    return streamConfigMap;
+  }
+
+  @Test
+  public void testParsingMetadataConfigWithConfiguredFields() throws Exception {
+    Map<String, String> streamConfigMap = getCommonStreamConfigMap();
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, StreamConfigProperties.METADATA_POPULATE),
+        "true");
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, PulsarConfig.METADATA_FIELDS),
+        "messageId,messageIdBytes, publishTime, eventTime, key, topicName, ");
+    StreamConfig streamConfig = new StreamConfig(TABLE_NAME_WITH_TYPE, streamConfigMap);
+    PulsarConfig pulsarConfig = new PulsarConfig(streamConfig, "testId");
+    Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> metadataFieldsToExtract =
+        pulsarConfig.getMetadataFields();
+    Assert.assertEquals(metadataFieldsToExtract.size(), 6);
+    Assert.assertTrue(metadataFieldsToExtract.containsAll(List.of(
+        PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_ID,
+        PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_ID_BYTES_B64,
+        PulsarStreamMessageMetadata.PulsarMessageMetadataValue.PUBLISH_TIME,
+        PulsarStreamMessageMetadata.PulsarMessageMetadataValue.EVENT_TIME,
+        PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_KEY,
+        PulsarStreamMessageMetadata.PulsarMessageMetadataValue.TOPIC_NAME)));
+  }
+
+  @Test
+  public void testParsingMetadataConfigWithoutConfiguredFields() throws Exception {
+    Map<String, String> streamConfigMap = getCommonStreamConfigMap();
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, StreamConfigProperties.METADATA_POPULATE),
+        "true");
+    StreamConfig streamConfig = new StreamConfig(TABLE_NAME_WITH_TYPE, streamConfigMap);
+    PulsarConfig pulsarConfig = new PulsarConfig(streamConfig, "testId");
+    Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> metadataFieldsToExtract =
+        pulsarConfig.getMetadataFields();
+    Assert.assertEquals(metadataFieldsToExtract.size(), 0);
+  }
+
+  @Test
+  public void testParsingNoMetadataConfig() throws Exception {
+    Map<String, String> streamConfigMap = getCommonStreamConfigMap();
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, StreamConfigProperties.METADATA_POPULATE),
+        "false");
+    StreamConfig streamConfig = new StreamConfig(TABLE_NAME_WITH_TYPE, streamConfigMap);
+    PulsarConfig pulsarConfig = new PulsarConfig(streamConfig, "testId");
+    Assert.assertFalse(pulsarConfig.isPopulateMetadata());
+    Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> metadataFieldsToExtract =
+        pulsarConfig.getMetadataFields();
+    Assert.assertEquals(metadataFieldsToExtract.size(), 0);
+  }
+
+  @Test
+  public void testParsingNoMetadataConfigWithConfiguredFields() throws Exception {
+    Map<String, String> streamConfigMap = getCommonStreamConfigMap();
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, StreamConfigProperties.METADATA_POPULATE),
+        "false");
+    streamConfigMap.put(
+        StreamConfigProperties.constructStreamProperty(STREAM_TYPE, PulsarConfig.METADATA_FIELDS),
+        "messageId,messageIdBytes, publishTime, eventTime, key, topicName, ");
+    StreamConfig streamConfig = new StreamConfig(TABLE_NAME_WITH_TYPE, streamConfigMap);
+    PulsarConfig pulsarConfig = new PulsarConfig(streamConfig, "testId");
+    Set<PulsarStreamMessageMetadata.PulsarMessageMetadataValue> metadataFieldsToExtract =
+        pulsarConfig.getMetadataFields();
+    Assert.assertFalse(pulsarConfig.isPopulateMetadata());
+    Assert.assertEquals(metadataFieldsToExtract.size(), 0);
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConsumerTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConsumerTest.java
index b819a83dfa7..9d59f82fcc8 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConsumerTest.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarConsumerTest.java
@@ -142,7 +142,7 @@ public Boolean apply(@Nullable Void aVoid) {
 
   private long getNumberOfEntries(PulsarAdmin admin, String topicName) {
     try {
-      return admin.topics().getPartitionedStats(topicName, false).msgInCounter;
+      return admin.topics().getPartitionedStats(topicName, false).getMsgInCounter();
     } catch (Exception e) {
       e.printStackTrace();
       LOGGER.warn("Could not fetch number of rows in pulsar topic " + topicName, e);
@@ -190,8 +190,8 @@ public void publishRecordsBatch()
       throws Exception {
     for (int p = 0; p < NUM_PARTITION; p++) {
       final int partition = p;
-      try (Producer<String> producer =
-          _pulsarClient.newProducer(Schema.STRING).topic(TEST_TOPIC_BATCH).messageRouter(new MessageRouter() {
+      try (Producer<String> producer = _pulsarClient.newProducer(Schema.STRING).topic(TEST_TOPIC_BATCH)
+          .messageRouter(new MessageRouter() {
             @Override
             public int choosePartition(Message<?> msg, TopicMetadata metadata) {
               return partition;
@@ -230,11 +230,9 @@ private boolean validatePartitionMessageCount(int partition, int expectedMsgCoun
             new PartitionGroupConsumptionStatus(partition, 1, new MessageIdStreamOffset(MessageId.earliest), null,
                 "CONSUMING"));
     try {
-      final MessageBatch messageBatch = consumer.fetchMessages(new MessageIdStreamOffset(MessageId.earliest),
-          null,
-          CONSUMER_FETCH_TIMEOUT_MILLIS);
-      LOGGER.info(
-          "Partition: " + partition + ", Consumed messageBatch count = " + messageBatch.getMessageCount());
+      final MessageBatch messageBatch =
+          consumer.fetchMessages(new MessageIdStreamOffset(MessageId.earliest), null, CONSUMER_FETCH_TIMEOUT_MILLIS);
+      LOGGER.info("Partition: " + partition + ", Consumed messageBatch count = " + messageBatch.getMessageCount());
       return messageBatch.getMessageCount() == expectedMsgCount;
     } catch (TimeoutException e) {
       return false;
@@ -273,9 +271,8 @@ public void testPartitionLevelConsumer()
 
     final StreamConsumerFactory streamConsumerFactory =
         StreamConsumerFactoryProvider.create(getStreamConfig(TEST_TOPIC));
-    int numPartitions =
-        new PulsarStreamMetadataProvider(CLIENT_ID, getStreamConfig(TEST_TOPIC)).fetchPartitionCount(
-            CONSUMER_FETCH_TIMEOUT_MILLIS);
+    int numPartitions = new PulsarStreamMetadataProvider(CLIENT_ID, getStreamConfig(TEST_TOPIC)).fetchPartitionCount(
+        CONSUMER_FETCH_TIMEOUT_MILLIS);
 
     for (int partition = 0; partition < numPartitions; partition++) {
       PartitionGroupConsumptionStatus partitionGroupConsumptionStatus =
@@ -284,35 +281,35 @@ public void testPartitionLevelConsumer()
 
       int totalMessagesReceived = 0;
 
-      final PartitionGroupConsumer consumer =
-          streamConsumerFactory.createPartitionGroupConsumer(CLIENT_ID, partitionGroupConsumptionStatus);
-      final MessageBatch messageBatch1 = consumer.fetchMessages(new MessageIdStreamOffset(MessageId.earliest),
-          new MessageIdStreamOffset(getMessageIdForPartitionAndIndex(partition, 500)),
-          CONSUMER_FETCH_TIMEOUT_MILLIS);
+      final PulsarPartitionLevelConsumer consumer =
+              (PulsarPartitionLevelConsumer) streamConsumerFactory
+                      .createPartitionGroupConsumer(CLIENT_ID, partitionGroupConsumptionStatus);
+      final PulsarMessageBatch messageBatch1 = consumer.fetchMessages(new MessageIdStreamOffset(MessageId.earliest),
+          new MessageIdStreamOffset(getMessageIdForPartitionAndIndex(partition, 500)), CONSUMER_FETCH_TIMEOUT_MILLIS);
       Assert.assertEquals(messageBatch1.getMessageCount(), 500);
       for (int i = 0; i < messageBatch1.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) messageBatch1.getMessageAtIndex(i);
+        final byte[] msg = messageBatch1.getMessageAtIndex(i).getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + i);
         totalMessagesReceived++;
       }
 
-      final MessageBatch messageBatch2 =
+      final PulsarMessageBatch messageBatch2 =
           consumer.fetchMessages(new MessageIdStreamOffset(getMessageIdForPartitionAndIndex(partition, 500)), null,
               CONSUMER_FETCH_TIMEOUT_MILLIS);
       Assert.assertEquals(messageBatch2.getMessageCount(), 500);
       for (int i = 0; i < messageBatch2.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) messageBatch2.getMessageAtIndex(i);
+        final byte[] msg = messageBatch2.getMessageAtIndex(i).getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + (500 + i));
         totalMessagesReceived++;
       }
 
-      final MessageBatch messageBatch3 =
+      final PulsarMessageBatch messageBatch3 =
           consumer.fetchMessages(new MessageIdStreamOffset(getMessageIdForPartitionAndIndex(partition, 10)),
               new MessageIdStreamOffset(getMessageIdForPartitionAndIndex(partition, 35)),
               CONSUMER_FETCH_TIMEOUT_MILLIS);
       Assert.assertEquals(messageBatch3.getMessageCount(), 25);
       for (int i = 0; i < messageBatch3.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) messageBatch3.getMessageAtIndex(i);
+        final byte[] msg = messageBatch3.getMessageAtIndex(i).getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + (10 + i));
       }
 
@@ -327,8 +324,8 @@ public void testPartitionLevelConsumerBatchMessages()
     final StreamConsumerFactory streamConsumerFactory =
         StreamConsumerFactoryProvider.create(getStreamConfig(TEST_TOPIC_BATCH));
     int numPartitions =
-        new PulsarStreamMetadataProvider(CLIENT_ID, getStreamConfig(TEST_TOPIC_BATCH))
-            .fetchPartitionCount(CONSUMER_FETCH_TIMEOUT_MILLIS);
+        new PulsarStreamMetadataProvider(CLIENT_ID, getStreamConfig(TEST_TOPIC_BATCH)).fetchPartitionCount(
+            CONSUMER_FETCH_TIMEOUT_MILLIS);
 
     for (int partition = 0; partition < numPartitions; partition++) {
       PartitionGroupConsumptionStatus partitionGroupConsumptionStatus =
@@ -337,36 +334,37 @@ public void testPartitionLevelConsumerBatchMessages()
 
       int totalMessagesReceived = 0;
 
-      final PartitionGroupConsumer consumer =
-          streamConsumerFactory.createPartitionGroupConsumer(CLIENT_ID, partitionGroupConsumptionStatus);
+      final PulsarPartitionLevelConsumer consumer =
+              (PulsarPartitionLevelConsumer) streamConsumerFactory.createPartitionGroupConsumer(CLIENT_ID,
+                  partitionGroupConsumptionStatus);
       //TODO: This test failed, check it out.
-      final MessageBatch messageBatch1 = consumer.fetchMessages(new MessageIdStreamOffset(MessageId.earliest),
+      final PulsarMessageBatch messageBatch1 = consumer.fetchMessages(new MessageIdStreamOffset(MessageId.earliest),
           new MessageIdStreamOffset(getBatchMessageIdForPartitionAndIndex(partition, 500)),
           CONSUMER_FETCH_TIMEOUT_MILLIS);
       Assert.assertEquals(messageBatch1.getMessageCount(), 500);
       for (int i = 0; i < messageBatch1.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) messageBatch1.getMessageAtIndex(i);
+        final byte[] msg = messageBatch1.getMessageAtIndex(i).getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + i);
         totalMessagesReceived++;
       }
 
-      final MessageBatch messageBatch2 =
+      final PulsarMessageBatch messageBatch2 =
           consumer.fetchMessages(new MessageIdStreamOffset(getBatchMessageIdForPartitionAndIndex(partition, 500)), null,
               CONSUMER_FETCH_TIMEOUT_MILLIS);
       Assert.assertEquals(messageBatch2.getMessageCount(), 500);
       for (int i = 0; i < messageBatch2.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) messageBatch2.getMessageAtIndex(i);
+        final byte[] msg = messageBatch2.getMessageAtIndex(i).getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + (500 + i));
         totalMessagesReceived++;
       }
 
-      final MessageBatch messageBatch3 =
+      final PulsarMessageBatch messageBatch3 =
           consumer.fetchMessages(new MessageIdStreamOffset(getBatchMessageIdForPartitionAndIndex(partition, 10)),
               new MessageIdStreamOffset(getBatchMessageIdForPartitionAndIndex(partition, 35)),
               CONSUMER_FETCH_TIMEOUT_MILLIS);
       Assert.assertEquals(messageBatch3.getMessageCount(), 25);
       for (int i = 0; i < messageBatch3.getMessageCount(); i++) {
-        final byte[] msg = (byte[]) messageBatch3.getMessageAtIndex(i);
+        final byte[] msg = messageBatch3.getMessageAtIndex(i).getValue();
         Assert.assertEquals(new String(msg), "sample_msg_" + (10 + i));
       }
 
@@ -377,7 +375,8 @@ public void testPartitionLevelConsumerBatchMessages()
   private MessageId getMessageIdForPartitionAndIndex(int partitionNum, int index) {
     MessageId startMessageIdRaw = _partitionToFirstMessageIdMap.get(partitionNum);
     MessageIdImpl startMessageId = MessageIdImpl.convertToMessageIdImpl(startMessageIdRaw);
-    return DefaultImplementation.newMessageId(startMessageId.getLedgerId(), index, partitionNum);
+    return DefaultImplementation.getDefaultImplementation()
+        .newMessageId(startMessageId.getLedgerId(), index, partitionNum);
   }
 
   private MessageId getBatchMessageIdForPartitionAndIndex(int partitionNum, int index) {
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatchTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatchTest.java
index 15cef93ee3b..904dd33a046 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatchTest.java
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMessageBatchTest.java
@@ -20,10 +20,13 @@
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
+import java.util.stream.Collectors;
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.common.api.EncryptionContext;
@@ -37,30 +40,33 @@ public class PulsarMessageBatchTest {
   private DummyPulsarMessage _msgWithKeyAndValue;
   private byte[] _expectedValueBytes;
   private byte[] _expectedKeyBytes;
-  private List<Message<byte[]>> _messageList;
+  private List<DummyPulsarMessage> _messageList;
+  private PulsarMetadataExtractor _metadataExtractor;
 
-  class DummyPulsarMessage implements Message<byte[]> {
+  public static class DummyPulsarMessage implements Message<byte[]> {
     private final byte[] _keyData;
     private final byte[] _valueData;
+    private Map<String, String> _properties;
 
     public DummyPulsarMessage(byte[] key, byte[] value) {
       _keyData = key;
       _valueData = value;
+      _properties = new HashMap<>();
     }
 
     @Override
     public Map<String, String> getProperties() {
-      return null;
+      return _properties;
     }
 
     @Override
     public boolean hasProperty(String name) {
-      return false;
+      return _properties.containsKey(name);
     }
 
     @Override
     public String getProperty(String name) {
-      return null;
+      return _properties.get(name);
     }
 
     @Override
@@ -68,6 +74,11 @@ public byte[] getData() {
       return _valueData;
     }
 
+    @Override
+    public int size() {
+      return 0;
+    }
+
     @Override
     public byte[] getValue() {
       return _valueData;
@@ -75,7 +86,7 @@ public byte[] getValue() {
 
     @Override
     public MessageId getMessageId() {
-      return null;
+      return MessageId.earliest;
     }
 
     @Override
@@ -105,7 +116,7 @@ public boolean hasKey() {
 
     @Override
     public String getKey() {
-      return _keyData.toString();
+      return new String(_keyData);
     }
 
     @Override
@@ -157,6 +168,30 @@ public boolean isReplicated() {
     public String getReplicatedFrom() {
       return null;
     }
+
+    @Override
+    public void release() {
+    }
+
+    @Override
+    public boolean hasBrokerPublishTime() {
+      return false;
+    }
+
+    @Override
+    public Optional<Long> getBrokerPublishTime() {
+      return Optional.empty();
+    }
+
+    @Override
+    public boolean hasIndex() {
+      return false;
+    }
+
+    @Override
+    public Optional<Long> getIndex() {
+      return Optional.empty();
+    }
   }
 
   @BeforeClass
@@ -167,20 +202,28 @@ public void setup() {
     _random.nextBytes(_expectedKeyBytes);
     _msgWithKeyAndValue = new DummyPulsarMessage(_expectedKeyBytes, _expectedValueBytes);
     _messageList = new ArrayList<>();
+    _metadataExtractor = PulsarMetadataExtractor.build(true,
+        EnumSet.allOf(PulsarStreamMessageMetadata.PulsarMessageMetadataValue.class));
     _messageList.add(_msgWithKeyAndValue);
   }
 
   @Test
   public void testMessageBatchNoStitching() {
-    PulsarMessageBatch messageBatch = new PulsarMessageBatch(_messageList, false);
-    byte[] valueBytes = messageBatch.getMessageAtIndex(0);
+    List<PulsarStreamMessage> streamMessages = _messageList.stream().map(message ->
+            PulsarUtils.buildPulsarStreamMessage(message, false, _metadataExtractor))
+            .collect(Collectors.toList());
+    PulsarMessageBatch messageBatch = new PulsarMessageBatch(streamMessages, false);
+    byte[] valueBytes = messageBatch.getMessageAtIndex(0).getValue();
     Assert.assertArrayEquals(_expectedValueBytes, valueBytes);
   }
 
   @Test
   public void testMessageBatchWithStitching() {
-    PulsarMessageBatch messageBatch = new PulsarMessageBatch(_messageList, true);
-    byte[] keyValueBytes = messageBatch.getMessageAtIndex(0);
+    List<PulsarStreamMessage> streamMessages = _messageList.stream().map(message ->
+                    PulsarUtils.buildPulsarStreamMessage(message, true, _metadataExtractor))
+            .collect(Collectors.toList());
+    PulsarMessageBatch messageBatch = new PulsarMessageBatch(streamMessages, true);
+    byte[] keyValueBytes = messageBatch.getMessageAtIndex(0).getValue();
     Assert.assertEquals(keyValueBytes.length, 8 + _expectedKeyBytes.length + _expectedValueBytes.length);
     try {
       ByteBuffer byteBuffer = ByteBuffer.wrap(keyValueBytes);
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMetadataExtractorTest.java b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMetadataExtractorTest.java
new file mode 100644
index 00000000000..4c8e28021a0
--- /dev/null
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/src/test/java/org/apache/pinot/plugin/stream/pulsar/PulsarMetadataExtractorTest.java
@@ -0,0 +1,92 @@
+/**
+ * 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.pinot.plugin.stream.pulsar;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Set;
+import org.apache.pulsar.client.api.MessageId;
+import org.bouncycastle.util.encoders.Base64;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.plugin.stream.pulsar.PulsarMessageBatchTest.DummyPulsarMessage;
+import static org.apache.pinot.plugin.stream.pulsar.PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_ID;
+import static org.apache.pinot.plugin.stream.pulsar.PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_ID_BYTES_B64;
+import static org.apache.pinot.plugin.stream.pulsar.PulsarStreamMessageMetadata.PulsarMessageMetadataValue.MESSAGE_KEY;
+import static org.testng.Assert.assertEquals;
+
+
+public class PulsarMetadataExtractorTest {
+
+  private PulsarMetadataExtractor _metadataExtractor;
+
+  @BeforeClass
+  public void setup() {
+    _metadataExtractor = PulsarMetadataExtractor.build(true, Set.of(MESSAGE_ID, MESSAGE_ID_BYTES_B64, MESSAGE_KEY));
+  }
+
+  @Test
+  public void testExtractProperty()
+      throws Exception {
+    DummyPulsarMessage pulsarMessage =
+        new DummyPulsarMessage("key".getBytes(StandardCharsets.UTF_8), "value".getBytes(StandardCharsets.UTF_8));
+    pulsarMessage.getProperties().put("test_key", "test_value");
+    pulsarMessage.getProperties().put("test_key2", "2");
+    PulsarStreamMessageMetadata metadata = (PulsarStreamMessageMetadata) _metadataExtractor.extract(pulsarMessage);
+    assertEquals("test_value", metadata.getHeaders().getValue("test_key"));
+    assertEquals("2", metadata.getHeaders().getValue("test_key2"));
+    assertEquals("key", metadata.getRecordMetadata().get(MESSAGE_KEY.getKey()));
+    String messageIdStr = metadata.getRecordMetadata().get(MESSAGE_ID.getKey());
+    assertEquals(pulsarMessage.getMessageId().toString(), messageIdStr);
+
+    byte[] messageIdBytes = Base64.decode(metadata.getRecordMetadata().get(MESSAGE_ID_BYTES_B64.getKey()));
+    MessageId messageId = MessageId.fromByteArray(messageIdBytes);
+    assertEquals(MessageId.earliest, messageId);
+  }
+
+  @Test
+  public void testPulsarSteamMessageUnstitched() {
+    String key = "key";
+    String value = "value";
+    DummyPulsarMessage dummyPulsarMessage =
+        new DummyPulsarMessage(key.getBytes(StandardCharsets.UTF_8), value.getBytes(StandardCharsets.UTF_8));
+    PulsarStreamMessage streamMessage =
+        PulsarUtils.buildPulsarStreamMessage(dummyPulsarMessage, false, _metadataExtractor);
+    assertEquals(key.getBytes(StandardCharsets.UTF_8), streamMessage.getKey());
+    assertEquals(value.getBytes(StandardCharsets.UTF_8), streamMessage.getValue());
+    assertEquals(key.getBytes(StandardCharsets.UTF_8).length, streamMessage.getKeyLength());
+    assertEquals(value.getBytes(StandardCharsets.UTF_8).length, streamMessage.getValueLength());
+  }
+
+  @Test
+  public void testPulsarSteamMessageStitched() {
+    String key = "key";
+    String value = "value";
+    byte[] stitchedValueBytes =
+        PulsarUtils.stitchKeyValue(key.getBytes(StandardCharsets.UTF_8), value.getBytes(StandardCharsets.UTF_8));
+    DummyPulsarMessage dummyPulsarMessage =
+        new DummyPulsarMessage(key.getBytes(StandardCharsets.UTF_8), value.getBytes(StandardCharsets.UTF_8));
+    PulsarStreamMessage streamMessage =
+        PulsarUtils.buildPulsarStreamMessage(dummyPulsarMessage, true, _metadataExtractor);
+    assertEquals(key.getBytes(StandardCharsets.UTF_8), streamMessage.getKey());
+    assertEquals(stitchedValueBytes, streamMessage.getValue());
+    assertEquals(key.getBytes(StandardCharsets.UTF_8).length, streamMessage.getKeyLength());
+    assertEquals(stitchedValueBytes.length, streamMessage.getValueLength());
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pom.xml b/pinot-plugins/pinot-stream-ingestion/pom.xml
index 885816497f9..8f3ae5c065c 100644
--- a/pinot-plugins/pinot-stream-ingestion/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pom.xml
@@ -40,7 +40,6 @@
 
   <modules>
     <module>pinot-kafka-base</module>
-    <module>pinot-kafka-0.9</module>
     <module>pinot-kafka-2.0</module>
     <module>pinot-kinesis</module>
     <module>pinot-pulsar</module>
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/hint/PinotHintOptions.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/hint/PinotHintOptions.java
new file mode 100644
index 00000000000..1c613074cf3
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/hint/PinotHintOptions.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.calcite.rel.hint;
+
+import org.apache.pinot.query.planner.logical.LiteralHintUtils;
+
+
+/**
+ * {@code PinotHintOptions} specified the supported hint options by Pinot based a particular type of relation node.
+ *
+ * <p>for each {@link org.apache.calcite.rel.RelNode} type we support an option hint name.</p>
+ * <p>for each option hint name there's a corresponding {@link RelHint} that supported only key-value option stored
+ * in {@link RelHint#kvOptions}</p>
+ */
+public class PinotHintOptions {
+  public static final String AGGREGATE_HINT_OPTIONS = "aggOptions";
+  public static final String JOIN_HINT_OPTIONS = "joinOptions";
+  public static final String TABLE_HINT_OPTIONS = "tableOptions";
+
+  /**
+   * Hint to denote that the aggregation node is the final aggregation stage which extracts the final result.
+   */
+  public static final String INTERNAL_AGG_OPTIONS = "aggOptionsInternal";
+
+  private PinotHintOptions() {
+    // do not instantiate.
+  }
+
+  public static class InternalAggregateOptions {
+    public static final String AGG_TYPE = "agg_type";
+    /**
+     * agg call signature is used to store LITERAL inputs to the Aggregate Call. which is not supported in Calcite
+     * here
+     * 1. we store the Map of Pair[aggCallIdx, argListIdx] to RexLiteral to indicate the RexLiteral being passed into
+     *     the aggregateCalls[aggCallIdx].operandList[argListIdx] is supposed to be a RexLiteral.
+     * 2. not all RexLiteral types are supported to be part of the input constant call signature.
+     * 3. RexLiteral are encoded as String and decoded as Pinot Literal objects.
+     *
+     * see: {@link LiteralHintUtils}.
+     * see: https://issues.apache.org/jira/projects/CALCITE/issues/CALCITE-5833
+     */
+    public static final String AGG_CALL_SIGNATURE = "agg_call_signature";
+  }
+
+  public static class AggregateOptions {
+    public static final String IS_PARTITIONED_BY_GROUP_BY_KEYS = "is_partitioned_by_group_by_keys";
+    public static final String SKIP_LEAF_STAGE_GROUP_BY_AGGREGATION = "is_skip_leaf_stage_group_by";
+  }
+
+  public static class JoinHintOptions {
+    public static final String JOIN_STRATEGY = "join_strategy";
+    public static final String IS_COLOCATED_BY_JOIN_KEYS = "is_colocated_by_join_keys";
+  }
+
+  public static class TableHintOptions {
+    public static final String PARTITION_KEY = "partition_key";
+    public static final String PARTITION_SIZE = "partition_size";
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/hint/PinotHintStrategyTable.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/hint/PinotHintStrategyTable.java
new file mode 100644
index 00000000000..c49a4b97540
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/hint/PinotHintStrategyTable.java
@@ -0,0 +1,149 @@
+/**
+ * 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.calcite.rel.hint;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.utils.BooleanUtils;
+
+
+/**
+ * Default hint strategy set for Pinot query.
+ */
+public class PinotHintStrategyTable {
+
+  private PinotHintStrategyTable() {
+    // do not instantiate.
+  }
+
+  public static final HintStrategyTable PINOT_HINT_STRATEGY_TABLE = HintStrategyTable.builder()
+      .hintStrategy(PinotHintOptions.INTERNAL_AGG_OPTIONS, HintPredicates.AGGREGATE)
+      .hintStrategy(PinotHintOptions.AGGREGATE_HINT_OPTIONS, HintPredicates.AGGREGATE)
+      .hintStrategy(PinotHintOptions.JOIN_HINT_OPTIONS, HintPredicates.JOIN)
+      .hintStrategy(PinotHintOptions.TABLE_HINT_OPTIONS, HintPredicates.TABLE_SCAN)
+      .build();
+
+  /**
+   * Check if a hint-able {@link org.apache.calcite.rel.RelNode} contains a specific {@link RelHint} by name.
+   *
+   * @param hintList hint list from the {@link org.apache.calcite.rel.RelNode}.
+   * @param hintName the name of the {@link RelHint} to be matched
+   * @return true if it contains the hint
+   */
+  public static boolean containsHint(List<RelHint> hintList, String hintName) {
+    for (RelHint relHint : hintList) {
+      if (relHint.hintName.equals(hintName)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Check if a hint-able {@link org.apache.calcite.rel.RelNode} contains an option key for a specific hint name of
+   * {@link RelHint}.
+   *
+   * @param hintList hint list from the {@link org.apache.calcite.rel.RelNode}.
+   * @param hintName the name of the {@link RelHint}.
+   * @param optionKey the option key to look for in the {@link RelHint#kvOptions}.
+   * @return true if it contains the hint
+   */
+  public static boolean containsHintOption(List<RelHint> hintList, String hintName, String optionKey) {
+    for (RelHint relHint : hintList) {
+      if (relHint.hintName.equals(hintName)) {
+        return relHint.kvOptions.containsKey(optionKey);
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Check if a hint-able {@link org.apache.calcite.rel.RelNode} contains an option key for a specific hint name of
+   * {@link RelHint}, and the value is true via {@link BooleanUtils#toBoolean(Object)}.
+   *
+   * @param hintList hint list from the {@link org.apache.calcite.rel.RelNode}.
+   * @param hintName the name of the {@link RelHint}.
+   * @param optionKey the option key to look for in the {@link RelHint#kvOptions}.
+   * @return true if it contains the hint
+   */
+  public static boolean isHintOptionTrue(List<RelHint> hintList, String hintName, String optionKey) {
+    for (RelHint relHint : hintList) {
+      if (relHint.hintName.equals(hintName)) {
+        return relHint.kvOptions.containsKey(optionKey) && BooleanUtils.toBoolean(relHint.kvOptions.get(optionKey));
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Retrieve the option value by option key in the {@link RelHint#kvOptions}. the option key is looked up from the
+   * specified hint name for a hint-able {@link org.apache.calcite.rel.RelNode}.
+   *
+   * @param hintList hint list from the {@link org.apache.calcite.rel.RelNode}.
+   * @param hintName the name of the {@link RelHint}.
+   * @param optionKey the option key to look for in the {@link RelHint#kvOptions}.
+   * @return true if it contains the hint
+   */
+  @Nullable
+  public static String getHintOption(List<RelHint> hintList, String hintName, String optionKey) {
+    for (RelHint relHint : hintList) {
+      if (relHint.hintName.equals(hintName)) {
+        return relHint.kvOptions.get(optionKey);
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Replace the option value by option key in the {@link RelHint#kvOptions}. the option key is looked up from the
+   * specified hint name for a hint-able {@link org.apache.calcite.rel.RelNode}.
+   *
+   * <p>Note that Calcite's {@link RelHint} is not designed to be mutable, so replacing a hint option will
+   * result in copy of the entire hint list. This util is built as a work-around of the limitation of Calcite
+   * and Pinot in handling literals around aggregates. Consider the hint cloning overhead when utilizing this method.
+   * </p>
+   *
+   * @param oldHintList hint list from the {@link org.apache.calcite.rel.RelNode}.
+   * @param hintName the name of the {@link RelHint}.
+   * @param optionKey the option key to look for in the {@link RelHint#kvOptions}.
+   * @param optionValue the value to be set into {@link RelHint#kvOptions}.
+   */
+  public static List<RelHint> replaceHintOptions(List<RelHint> oldHintList, String hintName, String optionKey,
+      String optionValue) {
+    boolean replaced = false;
+    List<RelHint> newHintList = new ArrayList<>();
+    for (RelHint oldHint : oldHintList) {
+      if (oldHint.hintName.equals(hintName)) {
+        Map<String, String> newHintKvOptions = new HashMap<>(oldHint.kvOptions);
+        newHintKvOptions.put(optionKey, optionValue);
+        newHintList.add(RelHint.builder(hintName).hintOptions(newHintKvOptions).build());
+        replaced = true;
+      } else {
+        newHintList.add(oldHint);
+      }
+    }
+    if (!replaced) {
+      newHintList.add(RelHint.builder(hintName).hintOption(optionKey, optionValue).build());
+    }
+    return newHintList;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotLogicalExchange.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotLogicalExchange.java
new file mode 100644
index 00000000000..c08b7ae8ade
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotLogicalExchange.java
@@ -0,0 +1,94 @@
+/**
+ * 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.calcite.rel.logical;
+
+import org.apache.calcite.plan.Convention;
+import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelTraitSet;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelDistributionTraitDef;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
+import org.apache.calcite.rel.RelWriter;
+import org.apache.calcite.rel.core.Exchange;
+
+
+/**
+ * Pinot's implementation of {@link Exchange} which needs information about whether to exchange is
+ * done on a streaming or a pipeline-breaking fashion.
+ */
+public class PinotLogicalExchange extends Exchange {
+  private final PinotRelExchangeType _exchangeType;
+
+  private PinotLogicalExchange(RelOptCluster cluster, RelTraitSet traitSet,
+      RelNode input, RelDistribution distribution, PinotRelExchangeType exchangeType) {
+    super(cluster, traitSet, input, distribution);
+    _exchangeType = exchangeType;
+    assert traitSet.containsIfApplicable(Convention.NONE);
+  }
+
+
+  public static PinotLogicalExchange create(RelNode input,
+      RelDistribution distribution) {
+    return create(input, distribution, PinotRelExchangeType.getDefaultExchangeType());
+  }
+
+  /**
+   * Creates a LogicalExchange.
+   *
+   * @param input     Input relational expression
+   * @param distribution Distribution specification
+   * @param exchangeType RelExchangeType specification
+   */
+  public static PinotLogicalExchange create(RelNode input,
+      RelDistribution distribution, PinotRelExchangeType exchangeType) {
+    RelOptCluster cluster = input.getCluster();
+    distribution = RelDistributionTraitDef.INSTANCE.canonize(distribution);
+    RelTraitSet traitSet =
+        input.getTraitSet().replace(Convention.NONE).replace(distribution);
+    return new PinotLogicalExchange(cluster, traitSet, input, distribution, exchangeType);
+  }
+
+  //~ Methods ----------------------------------------------------------------
+
+  @Override
+  public Exchange copy(RelTraitSet traitSet, RelNode newInput,
+      RelDistribution newDistribution) {
+    return new PinotLogicalExchange(getCluster(), traitSet, newInput,
+        newDistribution, _exchangeType);
+  }
+
+  @Override
+  public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
+  @Override
+  public RelWriter explainTerms(RelWriter pw) {
+    RelWriter relWriter = super.explainTerms(pw);
+    if (_exchangeType != PinotRelExchangeType.getDefaultExchangeType()) {
+      relWriter.item("relExchangeType", _exchangeType);
+    }
+    return relWriter;
+  }
+
+  public PinotRelExchangeType getExchangeType() {
+    return _exchangeType;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotLogicalSortExchange.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotLogicalSortExchange.java
new file mode 100644
index 00000000000..ace06a6c43f
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotLogicalSortExchange.java
@@ -0,0 +1,135 @@
+/**
+ * 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.calcite.rel.logical;
+
+import org.apache.calcite.plan.Convention;
+import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelTraitSet;
+import org.apache.calcite.rel.RelCollation;
+import org.apache.calcite.rel.RelCollationTraitDef;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelDistributionTraitDef;
+import org.apache.calcite.rel.RelInput;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelWriter;
+import org.apache.calcite.rel.core.SortExchange;
+
+
+/**
+ * Pinot's implementation of {@code SortExchange} which needs information about whether to sort on the sender
+ * and/or receiver side of the exchange. Every {@code Exchange} is broken into a send and a receive node and the
+ * decision on where to sort is made by the planner and this information has to b passed onto the send and receive
+ * nodes for the correct execution.
+ *
+ * Note: This class does not extend {@code LogicalSortExchange} because its constructor which takes the list of
+ * parameters is private.
+ */
+public class PinotLogicalSortExchange extends SortExchange {
+
+  protected final boolean _isSortOnSender;
+  protected final boolean _isSortOnReceiver;
+  protected final PinotRelExchangeType _exchangeType;
+
+  private PinotLogicalSortExchange(RelOptCluster cluster, RelTraitSet traitSet,
+      RelNode input, RelDistribution distribution, PinotRelExchangeType exchangeType, RelCollation collation,
+      boolean isSortOnSender, boolean isSortOnReceiver) {
+    super(cluster, traitSet, input, distribution, collation);
+    _exchangeType = exchangeType;
+    _isSortOnSender = isSortOnSender;
+    _isSortOnReceiver = isSortOnReceiver;
+  }
+
+  /**
+   * Creates a PinotLogicalSortExchange by parsing serialized output.
+   */
+  public PinotLogicalSortExchange(RelInput input) {
+    super(input);
+    _exchangeType = PinotRelExchangeType.STREAMING;
+    _isSortOnSender = false;
+    _isSortOnReceiver = true;
+  }
+
+  public static PinotLogicalSortExchange create(
+      RelNode input,
+      RelDistribution distribution,
+      RelCollation collation,
+      boolean isSortOnSender,
+      boolean isSortOnReceiver) {
+    return create(input, distribution, PinotRelExchangeType.getDefaultExchangeType(), collation, isSortOnSender,
+        isSortOnReceiver);
+  }
+
+  /**
+   * Creates a PinotLogicalSortExchange.
+   *
+   * @param input     Input relational expression
+   * @param distribution Distribution specification
+   * @param exchangeType Exchange type specification
+   * @param collation array of sort specifications
+   * @param isSortOnSender whether to sort on the sender
+   * @param isSortOnReceiver whether to sort on receiver
+   */
+  public static PinotLogicalSortExchange create(
+      RelNode input,
+      RelDistribution distribution,
+      PinotRelExchangeType exchangeType,
+      RelCollation collation,
+      boolean isSortOnSender,
+      boolean isSortOnReceiver) {
+    RelOptCluster cluster = input.getCluster();
+    collation = RelCollationTraitDef.INSTANCE.canonize(collation);
+    distribution = RelDistributionTraitDef.INSTANCE.canonize(distribution);
+    RelTraitSet traitSet =
+        input.getTraitSet().replace(Convention.NONE).replace(distribution).replace(collation);
+    return new PinotLogicalSortExchange(cluster, traitSet, input, distribution, exchangeType,
+        collation, isSortOnSender, isSortOnReceiver);
+  }
+
+  //~ Methods ----------------------------------------------------------------
+
+  @Override
+  public SortExchange copy(RelTraitSet traitSet, RelNode newInput,
+      RelDistribution newDistribution, RelCollation newCollation) {
+    return new PinotLogicalSortExchange(this.getCluster(), traitSet, newInput,
+        newDistribution, _exchangeType, newCollation, _isSortOnSender, _isSortOnReceiver);
+  }
+
+  @Override
+  public RelWriter explainTerms(RelWriter pw) {
+    RelWriter relWriter = super.explainTerms(pw)
+        .item("isSortOnSender", _isSortOnSender)
+        .item("isSortOnReceiver", _isSortOnReceiver);
+    if (_exchangeType != PinotRelExchangeType.getDefaultExchangeType()) {
+      relWriter.item("relExchangeType", _exchangeType);
+    }
+    return relWriter;
+  }
+
+  public boolean isSortOnSender() {
+    return _isSortOnSender;
+  }
+
+  public boolean isSortOnReceiver() {
+    return _isSortOnReceiver;
+  }
+
+  public PinotRelExchangeType getExchangeType() {
+    return _exchangeType;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotRelExchangeType.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotRelExchangeType.java
new file mode 100644
index 00000000000..4a06e1d0256
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/logical/PinotRelExchangeType.java
@@ -0,0 +1,49 @@
+/**
+ * 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.calcite.rel.logical;
+
+/** Type of exchange. */
+public enum PinotRelExchangeType {
+
+  /**
+   * A streaming exchange is one that data will be sent and received in a streaming fashion.
+   */
+  STREAMING,
+
+  /**
+   * A sub-plan exchange is one that multi-stage query plan will execute the sub-tree below the exchange first; then
+   * treat the result as a {@link org.apache.calcite.rex.RexLiteral}; and put back into the logical plan for further
+   * optimization from the {@link org.apache.calcite.plan.RelOptPlanner}.
+   *
+   * <p>This is useful when plan can be further optimized if a sub plan is executed first from the broker.</p>
+   */
+  SUB_PLAN,
+
+  /**
+   * A pipeline-breaker is one that data will be sent streamingly from sender, but receiver will not start execution
+   * until all data has been received successfully.
+   *
+   * <p>This is useful when logical plan is fixed, but physical plan can be further optimized on the server.</p>
+   */
+  PIPELINE_BREAKER;
+
+  public static PinotRelExchangeType getDefaultExchangeType() {
+    return STREAMING;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateExchangeNodeInsertRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateExchangeNodeInsertRule.java
index 6b826ab04b9..60efa69fdee 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateExchangeNodeInsertRule.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateExchangeNodeInsertRule.java
@@ -18,35 +18,43 @@
  */
 package org.apache.calcite.rel.rules;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.hep.HepRelVertex;
 import org.apache.calcite.rel.RelDistributions;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.Aggregate;
 import org.apache.calcite.rel.core.AggregateCall;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.hint.PinotHintOptions;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
 import org.apache.calcite.rel.hint.RelHint;
 import org.apache.calcite.rel.logical.LogicalAggregate;
-import org.apache.calcite.rel.logical.LogicalExchange;
+import org.apache.calcite.rel.logical.PinotLogicalExchange;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.PinotSqlAggFunction;
 import org.apache.calcite.sql.SqlAggFunction;
 import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.fun.SqlCountAggFunction;
-import org.apache.calcite.sql.fun.SqlSumEmptyIsZeroAggFunction;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.calcite.util.ImmutableIntList;
-import org.apache.pinot.query.planner.hints.PinotRelationalHints;
+import org.apache.calcite.util.Util;
+import org.apache.calcite.util.mapping.Mapping;
+import org.apache.calcite.util.mapping.MappingType;
+import org.apache.calcite.util.mapping.Mappings;
+import org.apache.pinot.query.planner.plannode.AggregateNode.AggType;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
 
 
 /**
@@ -56,21 +64,21 @@
  * Pinot uses special intermediate data representation for partially aggregated results, thus we can't use
  * {@link org.apache.calcite.rel.rules.AggregateReduceFunctionsRule} to reduce complex aggregation.
  *
- * This rule is here to introduces Pinot-special aggregation splits. In-general, all aggregations are split into
- * intermediate-stage AGG; and server-stage AGG with the same naming. E.g.
+ * This rule is here to introduces Pinot-special aggregation splits. In-general there are several options:
+ * <ul>
+ *   <li>`aggName`__DIRECT</li>
+ *   <li>`aggName`__LEAF + `aggName`__FINAL</li>
+ *   <li>`aggName`__LEAF [+ `aggName`__INTERMEDIATE] + `aggName`__FINAL</li>
+ * </ul>
  *
- * COUNT(*) transforms into: COUNT(*)_SERVER --> COUNT(*)_INTERMEDIATE, where
- *   COUNT(*)_SERVER produces TUPLE[ SUM(1), GROUP_BY_KEY ]
- *   COUNT(*)_INTERMEDIATE produces TUPLE[ SUM(COUNT(*)_SERVER), GROUP_BY_KEY ]
- *
- * However, the suffix _SERVER/_INTERMEDIATE is merely a SQL hint to the Aggregate operator and will be translated
- * into correct, actual operator chain during Physical plan.
+ * for example:
+ * - COUNT(*) with a GROUP_BY_KEY transforms into: COUNT(*)__LEAF --> COUNT(*)__FINAL, where
+ *   - COUNT(*)__LEAF produces TUPLE[ SUM(1), GROUP_BY_KEY ]
+ *   - COUNT(*)__FINAL produces TUPLE[ SUM(COUNT(*)__LEAF), GROUP_BY_KEY ]
  */
 public class PinotAggregateExchangeNodeInsertRule extends RelOptRule {
   public static final PinotAggregateExchangeNodeInsertRule INSTANCE =
       new PinotAggregateExchangeNodeInsertRule(PinotRuleUtils.PINOT_REL_FACTORY);
-  private static final Set<SqlKind> SUPPORTED_AGG_KIND = ImmutableSet.of(
-      SqlKind.SUM, SqlKind.SUM0, SqlKind.MIN, SqlKind.MAX, SqlKind.COUNT, SqlKind.OTHER_FUNCTION);
 
   public PinotAggregateExchangeNodeInsertRule(RelBuilderFactory factory) {
     super(operand(LogicalAggregate.class, any()), factory, null);
@@ -83,16 +91,17 @@ public boolean matches(RelOptRuleCall call) {
     }
     if (call.rel(0) instanceof Aggregate) {
       Aggregate agg = call.rel(0);
-      return !agg.getHints().contains(PinotRelationalHints.AGG_LEAF_STAGE)
-          && !agg.getHints().contains(PinotRelationalHints.AGG_INTERMEDIATE_STAGE);
+      ImmutableList<RelHint> hints = agg.getHints();
+      return !PinotHintStrategyTable.containsHintOption(hints, PinotHintOptions.INTERNAL_AGG_OPTIONS,
+          PinotHintOptions.InternalAggregateOptions.AGG_TYPE);
     }
     return false;
   }
 
   /**
-   * Split the AGG into 2 stages, both with the same AGG type,
-   * Pinot internal stage optimization can use the info of the input data type to infer whether it should generate
-   * the "intermediate-stage AGG operator" or a "leaf-stage AGG operator"
+   * Split the AGG into 3 plan fragments, all with the same AGG type (in some cases the final agg name may be different)
+   * Pinot internal plan fragment optimization can use the info of the input data type to infer whether it should
+   * generate the "final-stage AGG operator" or "intermediate-stage AGG operator" or "leaf-stage AGG operator"
    * @see org.apache.pinot.core.query.aggregation.function.AggregationFunction
    *
    * @param call the {@link RelOptRuleCall} on match.
@@ -100,105 +109,232 @@ public boolean matches(RelOptRuleCall call) {
   @Override
   public void onMatch(RelOptRuleCall call) {
     Aggregate oldAggRel = call.rel(0);
-    ImmutableList<RelHint> orgHints = oldAggRel.getHints();
+    ImmutableList<RelHint> oldHints = oldAggRel.getHints();
 
-    // 1. attach leaf agg RelHint to original agg.
-    ImmutableList<RelHint> newLeafAggHints =
-        new ImmutableList.Builder<RelHint>().addAll(orgHints).add(PinotRelationalHints.AGG_LEAF_STAGE).build();
-    Aggregate newLeafAgg =
-        new LogicalAggregate(oldAggRel.getCluster(), oldAggRel.getTraitSet(), newLeafAggHints, oldAggRel.getInput(),
-            oldAggRel.getGroupSet(), oldAggRel.getGroupSets(), oldAggRel.getAggCallList());
+    Aggregate newAgg;
+    if (!oldAggRel.getGroupSet().isEmpty() && PinotHintStrategyTable.isHintOptionTrue(oldHints,
+        PinotHintOptions.AGGREGATE_HINT_OPTIONS, PinotHintOptions.AggregateOptions.IS_PARTITIONED_BY_GROUP_BY_KEYS)) {
+      // ------------------------------------------------------------------------
+      // If the "is_partitioned_by_group_by_keys" aggregate hint option is set, just add additional hints indicating
+      // this is a single stage aggregation.
+      List<RelHint> newHints = PinotHintStrategyTable.replaceHintOptions(oldAggRel.getHints(),
+          PinotHintOptions.INTERNAL_AGG_OPTIONS, PinotHintOptions.InternalAggregateOptions.AGG_TYPE,
+          AggType.DIRECT.name());
+      newAgg =
+          new LogicalAggregate(oldAggRel.getCluster(), oldAggRel.getTraitSet(), newHints, oldAggRel.getInput(),
+              oldAggRel.getGroupSet(), oldAggRel.getGroupSets(), oldAggRel.getAggCallList());
+    } else if (!oldAggRel.getGroupSet().isEmpty() && PinotHintStrategyTable.isHintOptionTrue(oldHints,
+        PinotHintOptions.AGGREGATE_HINT_OPTIONS,
+        PinotHintOptions.AggregateOptions.SKIP_LEAF_STAGE_GROUP_BY_AGGREGATION)) {
+      // ------------------------------------------------------------------------
+      // If "is_skip_leaf_stage_group_by" SQLHint option is passed, the leaf stage aggregation is skipped.
+      newAgg = (Aggregate) createPlanWithExchangeDirectAggregation(call);
+    } else {
+      // ------------------------------------------------------------------------
+      newAgg = (Aggregate) createPlanWithLeafExchangeFinalAggregate(call);
+    }
+    call.transformTo(newAgg);
+  }
 
+  /**
+   * Aggregate node will be split into LEAF + exchange + FINAL.
+   * optionally we can insert INTERMEDIATE to reduce hotspot in the future.
+   */
+  private RelNode createPlanWithLeafExchangeFinalAggregate(RelOptRuleCall call) {
+    // TODO: add optional intermediate stage here when hinted.
+    Aggregate oldAggRel = call.rel(0);
+    // 1. attach leaf agg RelHint to original agg. Perform any aggregation call conversions necessary
+    Aggregate leafAgg = convertAggForLeafInput(oldAggRel);
     // 2. attach exchange.
     List<Integer> groupSetIndices = ImmutableIntList.range(0, oldAggRel.getGroupCount());
-    LogicalExchange exchange = null;
+    PinotLogicalExchange exchange;
     if (groupSetIndices.size() == 0) {
-      exchange = LogicalExchange.create(newLeafAgg, RelDistributions.hash(Collections.emptyList()));
+      exchange = PinotLogicalExchange.create(leafAgg, RelDistributions.hash(Collections.emptyList()));
     } else {
-      exchange = LogicalExchange.create(newLeafAgg, RelDistributions.hash(groupSetIndices));
+      exchange = PinotLogicalExchange.create(leafAgg, RelDistributions.hash(groupSetIndices));
     }
+    // 3. attach final agg stage.
+    return convertAggFromIntermediateInput(call, oldAggRel, exchange, AggType.FINAL);
+  }
 
-    // 3. attach intermediate agg stage.
-    RelNode newAggNode = makeNewIntermediateAgg(call, oldAggRel, exchange);
-    call.transformTo(newAggNode);
+  /**
+   * Use this group by optimization to skip leaf stage aggregation when aggregating at leaf level is not desired.
+   * Many situation could be wasted effort to do group-by on leaf, eg: when cardinality of group by column is very high.
+   */
+  private RelNode createPlanWithExchangeDirectAggregation(RelOptRuleCall call) {
+    Aggregate oldAggRel = call.rel(0);
+    List<RelHint> newHints = PinotHintStrategyTable.replaceHintOptions(oldAggRel.getHints(),
+        PinotHintOptions.INTERNAL_AGG_OPTIONS, PinotHintOptions.InternalAggregateOptions.AGG_TYPE,
+        AggType.DIRECT.name());
+
+    // create project when there's none below the aggregate to reduce exchange overhead
+    RelNode childRel = ((HepRelVertex) oldAggRel.getInput()).getCurrentRel();
+    if (!(childRel instanceof Project)) {
+      return convertAggForExchangeDirectAggregate(call, newHints);
+    } else {
+      // create normal exchange
+      List<Integer> groupSetIndices = new ArrayList<>();
+      oldAggRel.getGroupSet().forEach(groupSetIndices::add);
+      PinotLogicalExchange exchange = PinotLogicalExchange.create(childRel, RelDistributions.hash(groupSetIndices));
+      return new LogicalAggregate(oldAggRel.getCluster(), oldAggRel.getTraitSet(), newHints, exchange,
+          oldAggRel.getGroupSet(), oldAggRel.getGroupSets(), oldAggRel.getAggCallList());
+    }
   }
 
-  private RelNode makeNewIntermediateAgg(RelOptRuleCall ruleCall, Aggregate oldAggRel, LogicalExchange exchange) {
+  /**
+   * The following is copied from {@link AggregateExtractProjectRule#onMatch(RelOptRuleCall)}
+   * with modification to insert an exchange in between the Aggregate and Project
+   */
+  private RelNode convertAggForExchangeDirectAggregate(RelOptRuleCall call, List<RelHint> newHints) {
+    final Aggregate aggregate = call.rel(0);
+    final RelNode input = aggregate.getInput();
+    // Compute which input fields are used.
+    // 1. group fields are always used
+    final ImmutableBitSet.Builder inputFieldsUsed =
+        aggregate.getGroupSet().rebuild();
+    // 2. agg functions
+    for (AggregateCall aggCall : aggregate.getAggCallList()) {
+      for (int i : aggCall.getArgList()) {
+        inputFieldsUsed.set(i);
+      }
+      if (aggCall.filterArg >= 0) {
+        inputFieldsUsed.set(aggCall.filterArg);
+      }
+    }
+    final RelBuilder relBuilder1 = call.builder().push(input);
+    final List<RexNode> projects = new ArrayList<>();
+    final Mapping mapping =
+        Mappings.create(MappingType.INVERSE_SURJECTION,
+            aggregate.getInput().getRowType().getFieldCount(),
+            inputFieldsUsed.cardinality());
+    int j = 0;
+    for (int i : inputFieldsUsed.build()) {
+      projects.add(relBuilder1.field(i));
+      mapping.set(i, j++);
+    }
+    relBuilder1.project(projects);
+    final ImmutableBitSet newGroupSet =
+        Mappings.apply(mapping, aggregate.getGroupSet());
+    Project project = (Project) relBuilder1.build();
+
+    // ------------------------------------------------------------------------
+    PinotLogicalExchange exchange = PinotLogicalExchange.create(project, RelDistributions.hash(newGroupSet.asList()));
+    // ------------------------------------------------------------------------
+
+    final RelBuilder relBuilder2 = call.builder().push(exchange);
+    final List<ImmutableBitSet> newGroupSets =
+        aggregate.getGroupSets().stream()
+            .map(bitSet -> Mappings.apply(mapping, bitSet))
+            .collect(Util.toImmutableList());
+    final List<RelBuilder.AggCall> newAggCallList =
+        aggregate.getAggCallList().stream()
+            .map(aggCall -> relBuilder2.aggregateCall(aggCall, mapping))
+            .collect(Util.toImmutableList());
+    final RelBuilder.GroupKey groupKey =
+        relBuilder2.groupKey(newGroupSet, newGroupSets);
+    relBuilder2.aggregate(groupKey, newAggCallList).hints(newHints);
+    return relBuilder2.build();
+  }
+
+  private Aggregate convertAggForLeafInput(Aggregate oldAggRel) {
+    List<AggregateCall> oldCalls = oldAggRel.getAggCallList();
+    List<AggregateCall> newCalls = new ArrayList<>();
+    for (AggregateCall oldCall : oldCalls) {
+      newCalls.add(buildAggregateCall(oldAggRel.getInput(), oldCall, oldCall.getArgList(), oldAggRel.getGroupCount(),
+          AggType.LEAF));
+    }
+    List<RelHint> newHints = PinotHintStrategyTable.replaceHintOptions(oldAggRel.getHints(),
+        PinotHintOptions.INTERNAL_AGG_OPTIONS, PinotHintOptions.InternalAggregateOptions.AGG_TYPE, AggType.LEAF.name());
+    return new LogicalAggregate(oldAggRel.getCluster(), oldAggRel.getTraitSet(), newHints, oldAggRel.getInput(),
+        oldAggRel.getGroupSet(), oldAggRel.getGroupSets(), newCalls);
+  }
 
+  private RelNode convertAggFromIntermediateInput(RelOptRuleCall ruleCall, Aggregate oldAggRel,
+      PinotLogicalExchange exchange, AggType aggType) {
     // add the exchange as the input node to the relation builder.
     RelBuilder relBuilder = ruleCall.builder();
     relBuilder.push(exchange);
-    List<RexNode> inputExprs = new ArrayList<>(relBuilder.fields());
 
-    // make input ref to the exchange after the leaf aggregate.
+    // make input ref to the exchange after the leaf aggregate, all groups should be at the front
     RexBuilder rexBuilder = exchange.getCluster().getRexBuilder();
     final int nGroups = oldAggRel.getGroupCount();
     for (int i = 0; i < nGroups; i++) {
       rexBuilder.makeInputRef(oldAggRel, i);
     }
 
-    // create new aggregate function calls from exchange input.
-    List<AggregateCall> oldCalls = oldAggRel.getAggCallList();
     List<AggregateCall> newCalls = new ArrayList<>();
     Map<AggregateCall, RexNode> aggCallMapping = new HashMap<>();
 
+    // create new aggregate function calls from exchange input, all aggCalls are followed one by one from exchange
+    // b/c the exchange produces intermediate results, thus the input to the newCall will be indexed at
+    // [nGroup + oldCallIndex]
+    List<AggregateCall> oldCalls = oldAggRel.getAggCallList();
     for (int oldCallIndex = 0; oldCallIndex < oldCalls.size(); oldCallIndex++) {
       AggregateCall oldCall = oldCalls.get(oldCallIndex);
-      convertAggCall(rexBuilder, oldAggRel, oldCallIndex, oldCall, newCalls, aggCallMapping, inputExprs);
+      // intermediate stage input only supports single argument inputs.
+      List<Integer> argList = Collections.singletonList(nGroups + oldCallIndex);
+      AggregateCall newCall = buildAggregateCall(exchange, oldCall, argList, nGroups, aggType);
+      rexBuilder.addAggCall(newCall, nGroups, newCalls, aggCallMapping, oldAggRel.getInput()::fieldIsNullable);
     }
 
     // create new aggregate relation.
     ImmutableList<RelHint> orgHints = oldAggRel.getHints();
-    ImmutableList<RelHint> newIntermediateAggHints =
-        new ImmutableList.Builder<RelHint>().addAll(orgHints).add(PinotRelationalHints.AGG_INTERMEDIATE_STAGE).build();
+    List<RelHint> newAggHint = PinotHintStrategyTable.replaceHintOptions(orgHints,
+        PinotHintOptions.INTERNAL_AGG_OPTIONS, PinotHintOptions.InternalAggregateOptions.AGG_TYPE, aggType.name());
     ImmutableBitSet groupSet = ImmutableBitSet.range(nGroups);
-    relBuilder.aggregate(
-        relBuilder.groupKey(groupSet, ImmutableList.of(groupSet)),
-        newCalls);
-    relBuilder.hints(newIntermediateAggHints);
+    relBuilder.aggregate(relBuilder.groupKey(groupSet, ImmutableList.of(groupSet)), newCalls);
+    relBuilder.hints(newAggHint);
     return relBuilder.build();
   }
 
-  /**
-   * convert aggregate call based on the intermediate stage input.
-   *
-   * <p>Note that the intermediate stage input only supports splittable aggregators such as SUM/MIN/MAX.
-   * All non-splittable aggregator must be converted into splittable aggregator first.
-   *
-   * <p>For COUNT operations, the intermediate stage will be converted to SUM.
-   */
-  private static void convertAggCall(RexBuilder rexBuilder, Aggregate oldAggRel, int oldCallIndex,
-      AggregateCall oldCall, List<AggregateCall> newCalls, Map<AggregateCall, RexNode> aggCallMapping,
-      List<RexNode> inputExprs) {
-    final int nGroups = oldAggRel.getGroupCount();
-    final SqlAggFunction oldAggregation = oldCall.getAggregation();
-    final SqlKind aggKind = oldAggregation.getKind();
-    // Check only the supported AGG functions are provided.
-    Preconditions.checkState(SUPPORTED_AGG_KIND.contains(aggKind), "Unsupported SQL aggregation "
-        + "kind: {}. Only splittable aggregation functions are supported!", aggKind);
-
-    // Special treatment on COUNT
-    AggregateCall newCall;
-    if (oldAggregation instanceof SqlCountAggFunction) {
-      newCall = AggregateCall.create(new SqlSumEmptyIsZeroAggFunction(), oldCall.isDistinct(), oldCall.isApproximate(),
-          oldCall.ignoreNulls(), convertArgList(nGroups + oldCallIndex, Collections.singletonList(oldCallIndex)),
-          oldCall.filterArg, oldCall.distinctKeys, oldCall.collation, oldCall.type, oldCall.getName());
+  private static AggregateCall buildAggregateCall(RelNode inputNode, AggregateCall orgAggCall, List<Integer> argList,
+      int numberGroups, AggType aggType) {
+    final SqlAggFunction oldAggFunction = orgAggCall.getAggregation();
+    final SqlKind aggKind = oldAggFunction.getKind();
+    String functionName = getFunctionNameFromAggregateCall(orgAggCall);
+    AggregationFunctionType functionType = AggregationFunctionType.getAggregationFunctionType(functionName);
+    // create the aggFunction
+    SqlAggFunction sqlAggFunction;
+    if (functionType.getIntermediateReturnTypeInference() != null) {
+      switch (aggType) {
+        case LEAF:
+          sqlAggFunction = new PinotSqlAggFunction(functionName.toUpperCase(Locale.ROOT), null,
+              functionType.getSqlKind(), functionType.getIntermediateReturnTypeInference(), null,
+              functionType.getOperandTypeChecker(), functionType.getSqlFunctionCategory());
+          break;
+        case INTERMEDIATE:
+          sqlAggFunction = new PinotSqlAggFunction(functionName.toUpperCase(Locale.ROOT), null,
+              functionType.getSqlKind(), functionType.getIntermediateReturnTypeInference(), null,
+              OperandTypes.ANY, functionType.getSqlFunctionCategory());
+          break;
+        case FINAL:
+          sqlAggFunction = new PinotSqlAggFunction(functionName.toUpperCase(Locale.ROOT), null,
+              functionType.getSqlKind(), ReturnTypes.explicit(orgAggCall.getType()), null,
+              OperandTypes.ANY, functionType.getSqlFunctionCategory());
+          break;
+        default:
+          throw new UnsupportedOperationException("Unsuppoted aggType: " + aggType + " for " + functionName);
+      }
     } else {
-      newCall = AggregateCall.create(
-          oldCall.getAggregation(), oldCall.isDistinct(), oldCall.isApproximate(), oldCall.ignoreNulls(),
-          convertArgList(nGroups + oldCallIndex, oldCall.getArgList()), oldCall.filterArg, oldCall.distinctKeys,
-          oldCall.collation, oldCall.type, oldCall.getName());
+      sqlAggFunction = oldAggFunction;
     }
-    rexBuilder.addAggCall(newCall,
-        nGroups,
-        newCalls,
-        aggCallMapping,
-        oldAggRel.getInput()::fieldIsNullable);
+
+    return AggregateCall.create(sqlAggFunction,
+        functionName.equals("distinctCount") || orgAggCall.isDistinct(),
+        orgAggCall.isApproximate(),
+        orgAggCall.ignoreNulls(),
+        argList,
+        orgAggCall.filterArg,
+        orgAggCall.distinctKeys,
+        orgAggCall.collation,
+        numberGroups,
+        inputNode,
+        null,
+        null);
   }
 
-  private static List<Integer> convertArgList(int oldCallIndexWithShift, List<Integer> argList) {
-    Preconditions.checkArgument(argList.size() <= 1,
-        "Unable to convert call as the argList contains more than 1 argument");
-    return argList.size() == 1 ? Collections.singletonList(oldCallIndexWithShift) : Collections.emptyList();
+  private static String getFunctionNameFromAggregateCall(AggregateCall aggregateCall) {
+    return aggregateCall.getAggregation().getName().equalsIgnoreCase("COUNT") && aggregateCall.isDistinct()
+        ? "distinctCount" : aggregateCall.getAggregation().getName();
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateLiteralAttachmentRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateLiteralAttachmentRule.java
new file mode 100644
index 00000000000..8f6765d3527
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateLiteralAttachmentRule.java
@@ -0,0 +1,104 @@
+/**
+ * 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.calcite.rel.rules;
+
+import com.google.common.collect.ImmutableList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.rel.core.Aggregate;
+import org.apache.calcite.rel.core.AggregateCall;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.hint.PinotHintOptions;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
+import org.apache.calcite.rel.hint.RelHint;
+import org.apache.calcite.rel.logical.LogicalAggregate;
+import org.apache.calcite.rel.logical.LogicalProject;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.tools.RelBuilderFactory;
+import org.apache.calcite.util.Pair;
+import org.apache.pinot.query.planner.logical.LiteralHintUtils;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+/**
+ * Special rule to attach Literal to Aggregate call.
+ */
+public class PinotAggregateLiteralAttachmentRule extends RelOptRule {
+  public static final PinotAggregateLiteralAttachmentRule INSTANCE =
+      new PinotAggregateLiteralAttachmentRule(PinotRuleUtils.PINOT_REL_FACTORY);
+
+  public PinotAggregateLiteralAttachmentRule(RelBuilderFactory factory) {
+    super(operand(LogicalAggregate.class, some(operand(LogicalProject.class, any()))), factory, null);
+  }
+
+  @Override
+  public boolean matches(RelOptRuleCall call) {
+    if (call.rels.length < 1) {
+      return false;
+    }
+    if (call.rel(0) instanceof Aggregate) {
+      Aggregate agg = call.rel(0);
+      ImmutableList<RelHint> hints = agg.getHints();
+      return !PinotHintStrategyTable.containsHintOption(hints,
+          PinotHintOptions.INTERNAL_AGG_OPTIONS, PinotHintOptions.InternalAggregateOptions.AGG_CALL_SIGNATURE);
+    }
+    return false;
+  }
+
+  @Override
+  public void onMatch(RelOptRuleCall call) {
+    Aggregate aggregate = call.rel(0);
+    Map<Pair<Integer, Integer>, RexExpression.Literal> rexLiterals = extractLiterals(call);
+    List<RelHint> newHints = PinotHintStrategyTable.replaceHintOptions(aggregate.getHints(),
+        PinotHintOptions.INTERNAL_AGG_OPTIONS, PinotHintOptions.InternalAggregateOptions.AGG_CALL_SIGNATURE,
+        LiteralHintUtils.literalMapToHintString(rexLiterals));
+    // TODO: validate against AggregationFunctionType to see if expected literal positions are properly attached
+    call.transformTo(new LogicalAggregate(aggregate.getCluster(), aggregate.getTraitSet(), newHints,
+        aggregate.getInput(), aggregate.getGroupSet(), aggregate.getGroupSets(), aggregate.getAggCallList()));
+  }
+
+  private static Map<Pair<Integer, Integer>, RexExpression.Literal> extractLiterals(RelOptRuleCall call) {
+    Aggregate aggregate = call.rel(0);
+    Project project = call.rel(1);
+    List<RexNode> rexNodes = project.getProjects();
+    List<AggregateCall> aggCallList = aggregate.getAggCallList();
+    final Map<Pair<Integer, Integer>, RexExpression.Literal> rexLiteralMap = new HashMap<>();
+    for (int aggIdx = 0; aggIdx < aggCallList.size(); aggIdx++) {
+      AggregateCall aggCall = aggCallList.get(aggIdx);
+      int argSize = aggCall.getArgList().size();
+      if (argSize > 1) {
+        // use -1 argIdx to indicate size of the agg operands.
+        rexLiteralMap.put(new Pair<>(aggIdx, -1), new RexExpression.Literal(FieldSpec.DataType.INT, argSize));
+        // put the literals in to the map.
+        for (int argIdx = 0; argIdx < argSize; argIdx++) {
+          RexNode field = rexNodes.get(aggCall.getArgList().get(argIdx));
+          if (field instanceof RexLiteral) {
+            rexLiteralMap.put(new Pair<>(aggIdx, argIdx), LiteralHintUtils.rexLiteralToLiteral((RexLiteral) field));
+          }
+        }
+      }
+    }
+    return rexLiteralMap;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateToSemiJoinRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateToSemiJoinRule.java
new file mode 100644
index 00000000000..95267d3595e
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotAggregateToSemiJoinRule.java
@@ -0,0 +1,142 @@
+/**
+ * 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.calcite.rel.rules;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Aggregate;
+import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.core.JoinInfo;
+import org.apache.calcite.rel.logical.LogicalAggregate;
+import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.tools.RelBuilder;
+import org.apache.calcite.tools.RelBuilderFactory;
+import org.apache.calcite.util.ImmutableBitSet;
+import org.apache.calcite.util.ImmutableIntList;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+
+/**
+ * SemiJoinRule that matches an Aggregate on top of a Join with an Aggregate
+ * as its right child.
+ *
+ * @see CoreRules#PROJECT_TO_SEMI_JOIN
+ */
+public class PinotAggregateToSemiJoinRule extends RelOptRule {
+  public static final PinotAggregateToSemiJoinRule INSTANCE =
+      new PinotAggregateToSemiJoinRule(PinotRuleUtils.PINOT_REL_FACTORY);
+
+  public PinotAggregateToSemiJoinRule(RelBuilderFactory factory) {
+    super(operand(LogicalAggregate.class, any()), factory, null);
+  }
+
+  @Override
+  @SuppressWarnings("rawtypes")
+  public boolean matches(RelOptRuleCall call) {
+    final Aggregate topAgg = call.rel(0);
+    if (!PinotRuleUtils.isJoin(topAgg.getInput())) {
+      return false;
+    }
+    final Join join = (Join) PinotRuleUtils.unboxRel(topAgg.getInput());
+    return PinotRuleUtils.isAggregate(join.getInput(1));
+  }
+
+  @Override
+  public void onMatch(RelOptRuleCall call) {
+    final Aggregate topAgg = call.rel(0);
+    final Join join = (Join) PinotRuleUtils.unboxRel(topAgg.getInput());
+    final RelNode left = PinotRuleUtils.unboxRel(join.getInput(0));
+    final Aggregate rightAgg = (Aggregate) PinotRuleUtils.unboxRel(join.getInput(1));
+    perform(call, topAgg, join, left, rightAgg);
+  }
+
+
+  protected void perform(RelOptRuleCall call, @Nullable Aggregate topAgg,
+      Join join, RelNode left, Aggregate rightAgg) {
+    final RelOptCluster cluster = join.getCluster();
+    final RexBuilder rexBuilder = cluster.getRexBuilder();
+    if (topAgg != null) {
+      final ImmutableBitSet aggBits = ImmutableBitSet.of(RelOptUtil.getAllFields(topAgg));
+      final ImmutableBitSet rightBits =
+          ImmutableBitSet.range(left.getRowType().getFieldCount(),
+              join.getRowType().getFieldCount());
+      if (aggBits.intersects(rightBits)) {
+        return;
+      }
+    } else {
+      if (join.getJoinType().projectsRight()
+          && !isEmptyAggregate(rightAgg)) {
+        return;
+      }
+    }
+    final JoinInfo joinInfo = join.analyzeCondition();
+    if (!joinInfo.rightSet().equals(
+        ImmutableBitSet.range(rightAgg.getGroupCount()))) {
+      // Rule requires that aggregate key to be the same as the join key.
+      // By the way, neither a super-set nor a sub-set would work.
+      return;
+    }
+    if (!joinInfo.isEqui()) {
+      return;
+    }
+    final RelBuilder relBuilder = call.builder();
+    relBuilder.push(left);
+    switch (join.getJoinType()) {
+      case SEMI:
+      case INNER:
+        final List<Integer> newRightKeyBuilder = new ArrayList<>();
+        final List<Integer> aggregateKeys = rightAgg.getGroupSet().asList();
+        for (int key : joinInfo.rightKeys) {
+          newRightKeyBuilder.add(aggregateKeys.get(key));
+        }
+        final ImmutableIntList newRightKeys = ImmutableIntList.copyOf(newRightKeyBuilder);
+        relBuilder.push(rightAgg.getInput());
+        final RexNode newCondition =
+            RelOptUtil.createEquiJoinCondition(relBuilder.peek(2, 0),
+                joinInfo.leftKeys, relBuilder.peek(2, 1), newRightKeys,
+                rexBuilder);
+        relBuilder.semiJoin(newCondition).hints(join.getHints());
+        break;
+
+      case LEFT:
+        // The right-hand side produces no more than 1 row (because of the
+        // Aggregate) and no fewer than 1 row (because of LEFT), and therefore
+        // we can eliminate the semi-join.
+        break;
+
+      default:
+        throw new AssertionError(join.getJoinType());
+    }
+    if (topAgg != null) {
+      relBuilder.aggregate(relBuilder.groupKey(topAgg.getGroupSet()), topAgg.getAggCallList());
+    }
+    final RelNode relNode = relBuilder.build();
+    call.transformTo(relNode);
+  }
+
+  private static boolean isEmptyAggregate(Aggregate aggregate) {
+    return aggregate.getRowType().getFieldCount() == 0;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinExchangeNodeInsertRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinExchangeNodeInsertRule.java
index 03e8d842bda..465aa8b12d3 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinExchangeNodeInsertRule.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinExchangeNodeInsertRule.java
@@ -25,8 +25,10 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.Join;
 import org.apache.calcite.rel.core.JoinInfo;
-import org.apache.calcite.rel.logical.LogicalExchange;
+import org.apache.calcite.rel.hint.PinotHintOptions;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
 import org.apache.calcite.rel.logical.LogicalJoin;
+import org.apache.calcite.rel.logical.PinotLogicalExchange;
 import org.apache.calcite.tools.RelBuilderFactory;
 
 
@@ -63,21 +65,27 @@ public void onMatch(RelOptRuleCall call) {
     RelNode rightExchange;
     JoinInfo joinInfo = join.analyzeCondition();
 
-    if (joinInfo.leftKeys.isEmpty()) {
+    boolean isColocatedJoin =
+        PinotHintStrategyTable.isHintOptionTrue(join.getHints(), PinotHintOptions.JOIN_HINT_OPTIONS,
+            PinotHintOptions.JoinHintOptions.IS_COLOCATED_BY_JOIN_KEYS);
+    if (isColocatedJoin) {
+      // join exchange are colocated, we should directly pass through via join key
+      leftExchange = PinotLogicalExchange.create(leftInput, RelDistributions.SINGLETON);
+      rightExchange = PinotLogicalExchange.create(rightInput, RelDistributions.SINGLETON);
+    } else if (joinInfo.leftKeys.isEmpty()) {
       // when there's no JOIN key, use broadcast.
-      leftExchange = LogicalExchange.create(leftInput, RelDistributions.SINGLETON);
-      rightExchange = LogicalExchange.create(rightInput, RelDistributions.BROADCAST_DISTRIBUTED);
+      leftExchange = PinotLogicalExchange.create(leftInput, RelDistributions.RANDOM_DISTRIBUTED);
+      rightExchange = PinotLogicalExchange.create(rightInput, RelDistributions.BROADCAST_DISTRIBUTED);
     } else {
       // when join key exists, use hash distribution.
-      leftExchange = LogicalExchange.create(leftInput, RelDistributions.hash(joinInfo.leftKeys));
-      rightExchange = LogicalExchange.create(rightInput, RelDistributions.hash(joinInfo.rightKeys));
+      leftExchange = PinotLogicalExchange.create(leftInput, RelDistributions.hash(joinInfo.leftKeys));
+      rightExchange = PinotLogicalExchange.create(rightInput, RelDistributions.hash(joinInfo.rightKeys));
     }
 
     RelNode newJoinNode =
-        new LogicalJoin(join.getCluster(), join.getTraitSet(), leftExchange, rightExchange, join.getCondition(),
-            join.getVariablesSet(), join.getJoinType(), join.isSemiJoinDone(),
+        new LogicalJoin(join.getCluster(), join.getTraitSet(), join.getHints(), leftExchange, rightExchange,
+            join.getCondition(), join.getVariablesSet(), join.getJoinType(), join.isSemiJoinDone(),
             ImmutableList.copyOf(join.getSystemFieldList()));
-
     call.transformTo(newJoinNode);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinToDynamicBroadcastRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinToDynamicBroadcastRule.java
new file mode 100644
index 00000000000..b7b2f7f1a6f
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotJoinToDynamicBroadcastRule.java
@@ -0,0 +1,177 @@
+/**
+ * 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.calcite.rel.rules;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.hep.HepRelVertex;
+import org.apache.calcite.rel.RelDistributions;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Exchange;
+import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.core.JoinInfo;
+import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rel.hint.PinotHintOptions;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
+import org.apache.calcite.rel.logical.LogicalJoin;
+import org.apache.calcite.rel.logical.PinotLogicalExchange;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.calcite.tools.RelBuilderFactory;
+import org.apache.zookeeper.common.StringUtils;
+
+
+/**
+ * Special rule for Pinot, this rule transposing an INNER JOIN into dynamic broadcast join for the leaf stage.
+ *
+ * <p>Consider the following INNER JOIN plan
+ *
+ *                  ...                                     ...
+ *                   |                                       |
+ *             [ Transform ]                           [ Transform ]
+ *                   |                                       |
+ *             [ Inner Join ]                     [ Pass-through xChange ]
+ *             /            \                          /
+ *        [xChange]      [xChange]              [Inner Join] <----
+ *           /                \                      /            \
+ *     [ Transform ]     [ Transform ]         [ Transform ]       \
+ *          |                  |                    |               \
+ *     [Proj/Filter]     [Proj/Filter]         [Proj/Filter]  <------\
+ *          |                  |                    |                 \
+ *     [Table Scan ]     [Table Scan ]         [Table Scan ]       [xChange]
+ *                                                                      \
+ *                                                                 [ Transform ]
+ *                                                                       |
+ *                                                                 [Proj/Filter]
+ *                                                                       |
+ *                                                                 [Table Scan ]
+ *
+ * <p> This rule is one part of the overall mechanism and this rule only does the following
+ *
+ *                 ...                                      ...
+ *                  |                                        |
+ *            [ Transform ]                             [ Transform ]
+ *                  |                                       /
+ *            [ Inner Join ]                     [Pass-through xChange]
+ *            /            \                            /
+ *       [xChange]      [xChange]          |----[Dyn. Broadcast]   <-----
+ *          /                \             |           |                 \
+ *    [ Transform ]     [ Transform ]      |----> [ Inner Join ]      [xChange]
+ *         |                  |            |           |                   \
+ *    [Proj/Filter]     [Proj/Filter]      |      [ Transform ]       [ Transform ]
+ *         |                  |            |          |                    |
+ *    [Table Scan ]     [Table Scan ]      |----> [Proj/Filter]       [Proj/Filter]
+ *                                                     |                    |
+ *                                                [Table Scan ]       [Table Scan ]
+ *
+ *
+ *
+ * <p> The next part to extend the Dynamic broadcast into the Proj/Filter operator happens in the runtime.
+ *
+ * <p> This rewrite is only useful if we can ensure that:
+ * <ul>
+ *   <li>new plan can leverage the indexes and fast filtering of the leaf-stage Pinot server processing logic.</li>
+ *   <li>
+ *     data sending over xChange should be relatively small comparing to data would've been selected out if the dynamic
+ *     broadcast is not applied.
+ *   </li>
+ *   <li>
+ *     since leaf-stage operator can only process a typical Pinot V1 engine chain-operator chain. This means the entire
+ *     right-table will be ship over and persist in memory before the dynamic broadcast can occur. memory foot print
+ *     will be high so this rule should be use carefully until we have cost-based optimization.
+ *   </li>
+ *   <li>
+ *     if the dynamic broadcast stage is broadcasting to a left-table that's pre-partitioned with the join key, then the
+ *     right-table will be ship over and persist in memory using hash distribution. memory foot print will be
+ *     relatively low comparing to non-partitioned.
+ *   </li>
+ *   <li>
+ *     if the dynamic broadcast stage operating on a table with the same partition scheme as the left-table, then there
+ *     is not going to be any network shuffling overhead. both memory and latency overhead will be low.
+ *   </li>
+ * </ul>
+ *
+ * TODO #1: Only support SEMI-JOIN, once JOIN operator is supported by leaf-stage we should allow it to match
+ *   @see <a href="https://github.com/apache/pinot/pull/10565/>
+ * TODO #2: Only convert to dynamic broadcast from right-to-left, allow option to specify dynamic broadcast direction.
+ * TODO #3: Only convert to dynamic broadcast if left is leaf stage, allow the option for intermediate stage.
+ * TODO #4: currently adding a pass-through after join, support leaf-stage to chain arbitrary operator(s) next.
+ */
+public class PinotJoinToDynamicBroadcastRule extends RelOptRule {
+  public static final PinotJoinToDynamicBroadcastRule INSTANCE =
+      new PinotJoinToDynamicBroadcastRule(PinotRuleUtils.PINOT_REL_FACTORY);
+  private static final String DYNAMIC_BROADCAST_HINT_OPTION_VALUE = "dynamic_broadcast";
+
+  public PinotJoinToDynamicBroadcastRule(RelBuilderFactory factory) {
+    super(operand(LogicalJoin.class, any()), factory, null);
+  }
+
+  @Override
+  public boolean matches(RelOptRuleCall call) {
+    if (call.rels.length < 1 || !(call.rel(0) instanceof Join)) {
+      return false;
+    }
+    Join join = call.rel(0);
+    String joinStrategyString = PinotHintStrategyTable.getHintOption(join.getHints(),
+        PinotHintOptions.JOIN_HINT_OPTIONS, PinotHintOptions.JoinHintOptions.JOIN_STRATEGY);
+    List<String> joinStrategies = joinStrategyString != null ? StringUtils.split(joinStrategyString, ",")
+        : Collections.emptyList();
+    if (!joinStrategies.contains(DYNAMIC_BROADCAST_HINT_OPTION_VALUE)) {
+      return false;
+    }
+    JoinInfo joinInfo = join.analyzeCondition();
+    RelNode left = join.getLeft() instanceof HepRelVertex ? ((HepRelVertex) join.getLeft()).getCurrentRel()
+        : join.getLeft();
+    RelNode right = join.getRight() instanceof HepRelVertex ? ((HepRelVertex) join.getRight()).getCurrentRel()
+        : join.getRight();
+    return left instanceof Exchange && right instanceof Exchange
+        && PinotRuleUtils.noExchangeInSubtree(left.getInput(0))
+        && (join.getJoinType() == JoinRelType.SEMI && joinInfo.nonEquiConditions.isEmpty());
+  }
+
+  @Override
+  public void onMatch(RelOptRuleCall call) {
+    Join join = call.rel(0);
+    PinotLogicalExchange left = (PinotLogicalExchange) (join.getLeft() instanceof HepRelVertex
+        ? ((HepRelVertex) join.getLeft()).getCurrentRel() : join.getLeft());
+    PinotLogicalExchange right = (PinotLogicalExchange) (join.getRight() instanceof HepRelVertex
+        ? ((HepRelVertex) join.getRight()).getCurrentRel() : join.getRight());
+
+    boolean isColocatedJoin = PinotHintStrategyTable.isHintOptionTrue(join.getHints(),
+        PinotHintOptions.JOIN_HINT_OPTIONS, PinotHintOptions.JoinHintOptions.IS_COLOCATED_BY_JOIN_KEYS);
+    PinotLogicalExchange dynamicBroadcastExchange = isColocatedJoin
+        ? PinotLogicalExchange.create(right.getInput(), RelDistributions.SINGLETON,
+            PinotRelExchangeType.PIPELINE_BREAKER)
+        : PinotLogicalExchange.create(right.getInput(), RelDistributions.BROADCAST_DISTRIBUTED,
+            PinotRelExchangeType.PIPELINE_BREAKER);
+    Join dynamicFilterJoin =
+        new LogicalJoin(join.getCluster(), join.getTraitSet(), left.getInput(), dynamicBroadcastExchange,
+            join.getCondition(), join.getVariablesSet(), join.getJoinType(), join.isSemiJoinDone(),
+            ImmutableList.copyOf(join.getSystemFieldList()));
+    // adding pass-through exchange after join b/c currently leaf-stage doesn't support chaining operator(s) after JOIN
+    // TODO: support pass-through for singleton again when non-colocated.
+    // TODO: this is b/c #10886 alters the singleton exchange and it no longer works if join is not colocated.
+    PinotLogicalExchange passThroughAfterJoinExchange = isColocatedJoin
+        ? PinotLogicalExchange.create(dynamicFilterJoin, RelDistributions.SINGLETON)
+        : PinotLogicalExchange.create(dynamicFilterJoin, RelDistributions.hash(join.analyzeCondition().leftKeys));
+    call.transformTo(passThroughAfterJoinExchange);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotQueryRuleSets.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotQueryRuleSets.java
index 43ec25dfba4..34fe035212d 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotQueryRuleSets.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotQueryRuleSets.java
@@ -18,6 +18,7 @@
  */
 package org.apache.calcite.rel.rules;
 
+import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.Collection;
 import org.apache.calcite.adapter.enumerable.EnumerableRules;
@@ -32,10 +33,10 @@ private PinotQueryRuleSets() {
     // do not instantiate.
   }
 
-  public static final Collection<RelOptRule> LOGICAL_OPT_RULES =
+  public static final Collection<RelOptRule> BASIC_RULES =
       Arrays.asList(EnumerableRules.ENUMERABLE_FILTER_RULE, EnumerableRules.ENUMERABLE_JOIN_RULE,
-          EnumerableRules.ENUMERABLE_PROJECT_RULE, EnumerableRules.ENUMERABLE_SORT_RULE,
-          EnumerableRules.ENUMERABLE_TABLE_SCAN_RULE,
+          EnumerableRules.ENUMERABLE_PROJECT_RULE, EnumerableRules.ENUMERABLE_WINDOW_RULE,
+          EnumerableRules.ENUMERABLE_SORT_RULE, EnumerableRules.ENUMERABLE_TABLE_SCAN_RULE,
 
           // push a filter into a join
           CoreRules.FILTER_INTO_JOIN,
@@ -59,17 +60,18 @@ private PinotQueryRuleSets() {
           CoreRules.PROJECT_MERGE,
           // remove identity project
           CoreRules.PROJECT_REMOVE,
-          // add an extra exchange for sort
-          PinotSortExchangeNodeInsertRule.INSTANCE,
-          // copy exchanges down
-          PinotSortExchangeCopyRule.SORT_EXCHANGE_COPY,
-          // reorder sort and projection
-          CoreRules.SORT_PROJECT_TRANSPOSE,
+
+          // convert OVER aggregate to logical WINDOW
+          CoreRules.PROJECT_TO_LOGICAL_PROJECT_AND_WINDOW,
+          // push project through WINDOW
+          CoreRules.PROJECT_WINDOW_TRANSPOSE,
 
           // TODO: evaluate the SORT_JOIN_TRANSPOSE and SORT_JOIN_COPY rules
 
           // join rules
           CoreRules.JOIN_PUSH_EXPRESSIONS,
+          CoreRules.PROJECT_TO_SEMI_JOIN,
+          PinotAggregateToSemiJoinRule.INSTANCE,
 
           // convert non-all union into all-union + distinct
           CoreRules.UNION_TO_DISTINCT,
@@ -82,20 +84,52 @@ private PinotQueryRuleSets() {
           CoreRules.AGGREGATE_UNION_AGGREGATE,
 
           // reduce aggregate functions like AVG, STDDEV_POP etc.
-          PinotReduceAggregateFunctionsRule.INSTANCE,
-          CoreRules.AGGREGATE_REDUCE_FUNCTIONS,
-
-          // remove unnecessary sort rule
-          CoreRules.SORT_REMOVE,
-
-          // prune empty results rules
-          PruneEmptyRules.AGGREGATE_INSTANCE, PruneEmptyRules.FILTER_INSTANCE, PruneEmptyRules.JOIN_LEFT_INSTANCE,
-          PruneEmptyRules.JOIN_RIGHT_INSTANCE, PruneEmptyRules.PROJECT_INSTANCE, PruneEmptyRules.SORT_INSTANCE,
-          PruneEmptyRules.UNION_INSTANCE,
-
-          // Pinot specific rules
-          PinotFilterExpandSearchRule.INSTANCE,
-          PinotJoinExchangeNodeInsertRule.INSTANCE,
-          PinotAggregateExchangeNodeInsertRule.INSTANCE
-      );
+          CoreRules.AGGREGATE_REDUCE_FUNCTIONS
+          );
+
+  // Filter pushdown rules run using a RuleCollection since we want to push down a filter as much as possible in a
+  // single HepInstruction.
+  public static final Collection<RelOptRule> FILTER_PUSHDOWN_RULES = ImmutableList.of(
+      CoreRules.FILTER_INTO_JOIN,
+      CoreRules.FILTER_AGGREGATE_TRANSPOSE,
+      CoreRules.FILTER_SET_OP_TRANSPOSE,
+      CoreRules.FILTER_PROJECT_TRANSPOSE
+  );
+
+  // The pruner rules run top-down to ensure Calcite restarts from root node after applying a transformation.
+  public static final Collection<RelOptRule> PRUNE_RULES = ImmutableList.of(
+      CoreRules.PROJECT_MERGE,
+      CoreRules.AGGREGATE_REMOVE,
+      CoreRules.SORT_REMOVE,
+      PruneEmptyRules.AGGREGATE_INSTANCE, PruneEmptyRules.FILTER_INSTANCE, PruneEmptyRules.JOIN_LEFT_INSTANCE,
+      PruneEmptyRules.JOIN_RIGHT_INSTANCE, PruneEmptyRules.PROJECT_INSTANCE, PruneEmptyRules.SORT_INSTANCE,
+      PruneEmptyRules.UNION_INSTANCE
+  );
+
+  // Pinot specific rules that should be run BEFORE all other rules
+  public static final Collection<RelOptRule> PINOT_PRE_RULES = ImmutableList.of(
+      PinotAggregateLiteralAttachmentRule.INSTANCE
+  );
+
+
+  // Pinot specific rules that should be run AFTER all other rules
+  public static final Collection<RelOptRule> PINOT_POST_RULES = ImmutableList.of(
+      // Evaluate the Literal filter nodes
+      CoreRules.FILTER_REDUCE_EXPRESSIONS,
+      // Expand all SEARCH nodes to simplified filter nodes. SEARCH nodes get created for queries with range
+      // predicates, in-clauses, etc.
+      PinotFilterExpandSearchRule.INSTANCE,
+      // add an extra exchange for sort
+      PinotSortExchangeNodeInsertRule.INSTANCE,
+      // copy exchanges down, this must be done after SortExchangeNodeInsertRule
+      PinotSortExchangeCopyRule.SORT_EXCHANGE_COPY,
+
+      PinotJoinExchangeNodeInsertRule.INSTANCE,
+      PinotAggregateExchangeNodeInsertRule.INSTANCE,
+      PinotWindowExchangeNodeInsertRule.INSTANCE,
+      PinotSetOpExchangeNodeInsertRule.INSTANCE,
+
+      // apply dynamic broadcast rule after exchange is inserted/
+      PinotJoinToDynamicBroadcastRule.INSTANCE
+  );
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotReduceAggregateFunctionsRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotReduceAggregateFunctionsRule.java
deleted file mode 100644
index 5c6fd18e868..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotReduceAggregateFunctionsRule.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calcite.rel.rules;
-
-import com.google.common.collect.ImmutableSet;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.calcite.plan.RelOptRule;
-import org.apache.calcite.plan.RelOptRuleCall;
-import org.apache.calcite.rel.core.Aggregate;
-import org.apache.calcite.rel.core.AggregateCall;
-import org.apache.calcite.rel.type.RelDataType;
-import org.apache.calcite.rex.RexBuilder;
-import org.apache.calcite.rex.RexNode;
-import org.apache.calcite.sql.fun.PinotFourthMomentAggregateFunction;
-import org.apache.calcite.sql.fun.PinotKurtosisAggregateFunction;
-import org.apache.calcite.sql.fun.PinotOperatorTable;
-import org.apache.calcite.sql.fun.PinotSkewnessAggregateFunction;
-import org.apache.calcite.tools.RelBuilder;
-import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.CompositeList;
-
-
-/**
- * This rule rewrites aggregate functions when necessary for Pinot's
- * multistage engine. For example, SKEWNESS must be rewritten into two
- * parts: a multi-stage FOURTH_MOMENT calculation and then a scalar function
- * that reduces the moment into the skewness at the end. This is to ensure
- * that the aggregation computation can merge partial results from different
- * intermediate nodes before reducing it into the final result.
- *
- * <p>This implementation follows closely with Calcite's
- * {@link AggregateReduceFunctionsRule}.
- */
-public class PinotReduceAggregateFunctionsRule extends RelOptRule {
-
-  public static final PinotReduceAggregateFunctionsRule INSTANCE =
-      new PinotReduceAggregateFunctionsRule(PinotRuleUtils.PINOT_REL_FACTORY);
-
-  private static final Set<String> FUNCTIONS = ImmutableSet.of(
-      PinotSkewnessAggregateFunction.SKEWNESS,
-      PinotKurtosisAggregateFunction.KURTOSIS
-  );
-
-  protected PinotReduceAggregateFunctionsRule(RelBuilderFactory factory) {
-    super(operand(Aggregate.class, any()), factory, null);
-  }
-
-  @Override
-  public boolean matches(RelOptRuleCall call) {
-    if (call.rels.length < 1) {
-      return false;
-    }
-
-    if (call.rel(0) instanceof Aggregate) {
-      Aggregate agg = call.rel(0);
-      for (AggregateCall aggCall : agg.getAggCallList()) {
-        if (canReduce(aggCall)) {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-
-  @Override
-  public void onMatch(RelOptRuleCall call) {
-    Aggregate oldAggRel = call.rel(0);
-    reduceAggs(call, oldAggRel);
-  }
-
-  private void reduceAggs(RelOptRuleCall ruleCall, Aggregate oldAggRel) {
-    RexBuilder rexBuilder = oldAggRel.getCluster().getRexBuilder();
-
-    List<AggregateCall> oldCalls = oldAggRel.getAggCallList();
-    final int groupCount = oldAggRel.getGroupCount();
-
-    final List<AggregateCall> newCalls = new ArrayList<>();
-    final Map<AggregateCall, RexNode> aggCallMapping = new HashMap<>();
-
-    final List<RexNode> projList = new ArrayList<>();
-
-    // pass through group key
-    for (int i = 0; i < groupCount; i++) {
-      projList.add(rexBuilder.makeInputRef(oldAggRel, i));
-    }
-
-    // List of input expressions. If a particular aggregate needs more, it
-    // will add an expression to the end, and we will create an extra project
-    final RelBuilder relBuilder = ruleCall.builder();
-    relBuilder.push(oldAggRel.getInput());
-    final List<RexNode> inputExprs = new ArrayList<>(relBuilder.fields());
-
-    // create new aggregate function calls and rest of project list together
-    for (AggregateCall oldCall : oldCalls) {
-      projList.add(
-          reduceAgg(oldAggRel, oldCall, newCalls, aggCallMapping, inputExprs));
-    }
-
-    final int extraArgCount = inputExprs.size() - relBuilder.peek().getRowType().getFieldCount();
-    if (extraArgCount > 0) {
-      relBuilder.project(inputExprs,
-          CompositeList.of(
-              relBuilder.peek().getRowType().getFieldNames(),
-              Collections.nCopies(extraArgCount, null)));
-    }
-    newAggregateRel(relBuilder, oldAggRel, newCalls);
-    newCalcRel(relBuilder, oldAggRel.getRowType(), projList);
-    ruleCall.transformTo(relBuilder.build());
-  }
-
-  private RexNode reduceAgg(Aggregate oldAggRel, AggregateCall oldCall, List<AggregateCall> newCalls,
-      Map<AggregateCall, RexNode> aggCallMapping, List<RexNode> inputExprs) {
-    if (canReduce(oldCall)) {
-      switch (oldCall.getAggregation().getName()) {
-        case PinotSkewnessAggregateFunction.SKEWNESS:
-          return reduceFourthMoment(oldAggRel, oldCall, newCalls, aggCallMapping, false);
-        case PinotKurtosisAggregateFunction.KURTOSIS:
-          return reduceFourthMoment(oldAggRel, oldCall, newCalls, aggCallMapping, true);
-        default:
-          throw new IllegalStateException("Unexpected aggregation name " + oldCall.getAggregation().getName());
-      }
-    } else {
-      // anything else:  preserve original call
-      RexBuilder rexBuilder = oldAggRel.getCluster().getRexBuilder();
-      final int nGroups = oldAggRel.getGroupCount();
-      return rexBuilder.addAggCall(oldCall,
-          nGroups,
-          newCalls,
-          aggCallMapping,
-          oldAggRel.getInput()::fieldIsNullable);
-    }
-  }
-
-  private RexNode reduceFourthMoment(Aggregate oldAggRel, AggregateCall oldCall, List<AggregateCall> newCalls,
-      Map<AggregateCall, RexNode> aggCallMapping, boolean isKurtosis) {
-    final int nGroups = oldAggRel.getGroupCount();
-    final RexBuilder rexBuilder = oldAggRel.getCluster().getRexBuilder();
-    final AggregateCall fourthMomentCall =
-        AggregateCall.create(PinotFourthMomentAggregateFunction.INSTANCE,
-            oldCall.isDistinct(),
-            oldCall.isApproximate(),
-            oldCall.ignoreNulls(),
-            oldCall.getArgList(),
-            oldCall.filterArg,
-            oldCall.distinctKeys,
-            oldCall.collation,
-            oldAggRel.getGroupCount(),
-            oldAggRel.getInput(),
-            null,
-            null);
-
-    RexNode fmRef = rexBuilder.addAggCall(fourthMomentCall, nGroups, newCalls,
-        aggCallMapping, oldAggRel.getInput()::fieldIsNullable);
-
-    final RexNode skewRef = rexBuilder.makeCall(
-        isKurtosis ? PinotOperatorTable.KURTOSIS_REDUCE : PinotOperatorTable.SKEWNESS_REDUCE,
-        fmRef);
-    return rexBuilder.makeCast(oldCall.getType(), skewRef);
-  }
-
-  private boolean canReduce(AggregateCall call) {
-    return FUNCTIONS.contains(call.getAggregation().getName());
-  }
-
-  protected void newAggregateRel(RelBuilder relBuilder,
-      Aggregate oldAggregate,
-      List<AggregateCall> newCalls) {
-    relBuilder.aggregate(
-        relBuilder.groupKey(oldAggregate.getGroupSet(), oldAggregate.getGroupSets()),
-        newCalls);
-  }
-
-  protected void newCalcRel(RelBuilder relBuilder,
-      RelDataType rowType,
-      List<RexNode> exprs) {
-    relBuilder.project(exprs, rowType.getFieldNames());
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotRuleUtils.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotRuleUtils.java
index d2634018ef8..530704750fa 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotRuleUtils.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotRuleUtils.java
@@ -21,7 +21,10 @@
 import org.apache.calcite.plan.Contexts;
 import org.apache.calcite.plan.hep.HepRelVertex;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Aggregate;
 import org.apache.calcite.rel.core.Exchange;
+import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.core.Project;
 import org.apache.calcite.rel.core.RelFactories;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
@@ -38,11 +41,43 @@ private PinotRuleUtils() {
     // do not instantiate.
   }
 
+  public static RelNode unboxRel(RelNode rel) {
+    if (rel instanceof HepRelVertex) {
+      return ((HepRelVertex) rel).getCurrentRel();
+    } else {
+      return rel;
+    }
+  }
+
   public static boolean isExchange(RelNode rel) {
-    RelNode reference = rel;
-    if (reference instanceof HepRelVertex) {
-      reference = ((HepRelVertex) reference).getCurrentRel();
+    return unboxRel(rel) instanceof Exchange;
+  }
+
+  public static boolean isProject(RelNode rel) {
+    return unboxRel(rel) instanceof Project;
+  }
+
+  public static boolean isJoin(RelNode rel) {
+    return unboxRel(rel) instanceof Join;
+  }
+
+  public static boolean isAggregate(RelNode rel) {
+    return unboxRel(rel) instanceof Aggregate;
+  }
+
+  // TODO: optimize this part out as it is not efficient to scan the entire subtree for exchanges.
+  public static boolean noExchangeInSubtree(RelNode relNode) {
+    if (relNode instanceof HepRelVertex) {
+      relNode = ((HepRelVertex) relNode).getCurrentRel();
+    }
+    if (relNode instanceof Exchange) {
+      return false;
+    }
+    for (RelNode child : relNode.getInputs()) {
+      if (!noExchangeInSubtree(child)) {
+        return false;
+      }
     }
-    return reference instanceof Exchange;
+    return true;
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSetOpExchangeNodeInsertRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSetOpExchangeNodeInsertRule.java
new file mode 100644
index 00000000000..9fe933aa4b3
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSetOpExchangeNodeInsertRule.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.calcite.rel.rules;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.rel.RelDistributions;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.SetOp;
+import org.apache.calcite.rel.logical.LogicalIntersect;
+import org.apache.calcite.rel.logical.LogicalMinus;
+import org.apache.calcite.rel.logical.LogicalUnion;
+import org.apache.calcite.rel.logical.PinotLogicalExchange;
+import org.apache.calcite.tools.RelBuilderFactory;
+
+
+/**
+ * Special rule for Pinot, this rule is fixed to always insert exchange after SetOp node.
+ */
+public class PinotSetOpExchangeNodeInsertRule extends RelOptRule {
+  public static final PinotSetOpExchangeNodeInsertRule INSTANCE =
+      new PinotSetOpExchangeNodeInsertRule(PinotRuleUtils.PINOT_REL_FACTORY);
+
+  public PinotSetOpExchangeNodeInsertRule(RelBuilderFactory factory) {
+    super(operand(SetOp.class, any()), factory, null);
+  }
+
+  @Override
+  public boolean matches(RelOptRuleCall call) {
+    if (call.rels.length < 1) {
+      return false;
+    }
+    if (call.rel(0) instanceof SetOp) {
+      SetOp setOp = call.rel(0);
+      for (RelNode input : setOp.getInputs()) {
+        if (PinotRuleUtils.isExchange(input)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public void onMatch(RelOptRuleCall call) {
+    SetOp setOp = call.rel(0);
+    List<RelNode> newInputs = new ArrayList<>();
+    List<Integer> hashFields =
+        IntStream.range(0, setOp.getRowType().getFieldCount()).boxed().collect(Collectors.toCollection(ArrayList::new));
+    for (RelNode input : setOp.getInputs()) {
+      RelNode exchange = PinotLogicalExchange.create(input, RelDistributions.hash(hashFields));
+      newInputs.add(exchange);
+    }
+    SetOp newSetOpNode;
+    if (setOp instanceof LogicalUnion) {
+      newSetOpNode = new LogicalUnion(setOp.getCluster(), setOp.getTraitSet(), newInputs, setOp.all);
+    } else if (setOp instanceof LogicalIntersect) {
+      newSetOpNode = new LogicalIntersect(setOp.getCluster(), setOp.getTraitSet(), newInputs, setOp.all);
+    } else if (setOp instanceof LogicalMinus) {
+      newSetOpNode = new LogicalMinus(setOp.getCluster(), setOp.getTraitSet(), newInputs, setOp.all);
+    } else {
+      throw new UnsupportedOperationException("Unsupported set op node: " + setOp);
+    }
+    call.transformTo(newSetOpNode);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRule.java
index 7f163ca99b2..4f93f78efd4 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRule.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRule.java
@@ -26,10 +26,11 @@
 import org.apache.calcite.rel.core.Sort;
 import org.apache.calcite.rel.core.SortExchange;
 import org.apache.calcite.rel.logical.LogicalSort;
-import org.apache.calcite.rel.logical.LogicalSortExchange;
+import org.apache.calcite.rel.logical.PinotLogicalSortExchange;
 import org.apache.calcite.rel.metadata.RelMdUtil;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexLiteral;
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.pinot.query.planner.logical.RexExpressionUtils;
@@ -42,6 +43,9 @@ public class PinotSortExchangeCopyRule extends RelRule<RelRule.Config> {
   public static final PinotSortExchangeCopyRule SORT_EXCHANGE_COPY =
       PinotSortExchangeCopyRule.Config.DEFAULT.toRule();
   private static final TypeFactory TYPE_FACTORY = new TypeFactory(new TypeSystem());
+  private static final RexBuilder REX_BUILDER = new RexBuilder(TYPE_FACTORY);
+  private static final RexLiteral REX_ZERO = REX_BUILDER.makeLiteral(0,
+      TYPE_FACTORY.createSqlType(SqlTypeName.INTEGER));
 
   /**
    * Creates a PinotSortExchangeCopyRule.
@@ -80,14 +84,14 @@ public void onMatch(RelOptRuleCall call) {
     } else if (sort.offset == null) {
       fetch = sort.fetch;
     } else {
-      RexBuilder rexBuilder = new RexBuilder(TYPE_FACTORY);
       int total = RexExpressionUtils.getValueAsInt(sort.fetch) + RexExpressionUtils.getValueAsInt(sort.offset);
-      fetch = rexBuilder.makeLiteral(total, TYPE_FACTORY.createSqlType(SqlTypeName.INTEGER));
+      fetch = REX_BUILDER.makeLiteral(total, TYPE_FACTORY.createSqlType(SqlTypeName.INTEGER));
     }
 
     final RelNode newExchangeInput = sort.copy(sort.getTraitSet(), exchange.getInput(), collation, null, fetch);
     final RelNode exchangeCopy = exchange.copy(exchange.getTraitSet(), newExchangeInput, exchange.getDistribution());
-    final RelNode sortCopy = sort.copy(sort.getTraitSet(), exchangeCopy, collation, sort.offset, sort.fetch);
+    final RelNode sortCopy = sort.copy(sort.getTraitSet(), exchangeCopy, collation,
+        sort.offset == null ? REX_ZERO : sort.offset, sort.fetch);
 
     call.transformTo(sortCopy);
   }
@@ -95,7 +99,7 @@ public void onMatch(RelOptRuleCall call) {
   public interface Config extends RelRule.Config {
 
     Config DEFAULT = ImmutableSortExchangeCopyRule.Config.of()
-        .withOperandFor(LogicalSort.class, LogicalSortExchange.class);
+        .withOperandFor(LogicalSort.class, PinotLogicalSortExchange.class);
 
     @Override default PinotSortExchangeCopyRule toRule() {
       return new PinotSortExchangeCopyRule(this);
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeNodeInsertRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeNodeInsertRule.java
index f03b78dc3d7..56d08fd9ed6 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeNodeInsertRule.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotSortExchangeNodeInsertRule.java
@@ -24,7 +24,7 @@
 import org.apache.calcite.rel.RelDistributions;
 import org.apache.calcite.rel.core.Sort;
 import org.apache.calcite.rel.logical.LogicalSort;
-import org.apache.calcite.rel.logical.LogicalSortExchange;
+import org.apache.calcite.rel.logical.PinotLogicalSortExchange;
 import org.apache.calcite.tools.RelBuilderFactory;
 
 
@@ -62,10 +62,15 @@ public boolean matches(RelOptRuleCall call) {
   @Override
   public void onMatch(RelOptRuleCall call) {
     Sort sort = call.rel(0);
-    LogicalSortExchange exchange = LogicalSortExchange.create(
+    // TODO: Assess whether sorting is needed on both sender and receiver side or only receiver side. Potentially add
+    //       SqlHint support to determine this. For now setting sort only on receiver side as sender side sorting is
+    //       not yet implemented.
+    PinotLogicalSortExchange exchange = PinotLogicalSortExchange.create(
         sort.getInput(),
         RelDistributions.hash(Collections.emptyList()),
-        sort.getCollation());
+        sort.getCollation(),
+        false,
+        !sort.getCollation().getKeys().isEmpty());
     call.transformTo(LogicalSort.create(exchange, sort.getCollation(), sort.offset, sort.fetch));
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotWindowExchangeNodeInsertRule.java b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotWindowExchangeNodeInsertRule.java
new file mode 100644
index 00000000000..b3f1176705a
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/rel/rules/PinotWindowExchangeNodeInsertRule.java
@@ -0,0 +1,269 @@
+/**
+ * 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.calcite.rel.rules;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.hep.HepRelVertex;
+import org.apache.calcite.rel.RelDistributions;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.core.Window;
+import org.apache.calcite.rel.logical.LogicalProject;
+import org.apache.calcite.rel.logical.LogicalWindow;
+import org.apache.calcite.rel.logical.PinotLogicalExchange;
+import org.apache.calcite.rel.logical.PinotLogicalSortExchange;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.rel.type.RelDataTypeField;
+import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.tools.RelBuilderFactory;
+
+
+/**
+ * Special rule for Pinot, this rule is fixed to always insert an exchange or sort exchange below the WINDOW node.
+ * TODO:
+ *     1. Add support for more than one window group
+ *     2. Add support for functions other than:
+ *        a. Aggregation functions (AVG, COUNT, MAX, MIN, SUM, BOOL_AND, BOOL_OR)
+ *        b. Ranking functions (ROW_NUMBER, RANK, DENSE_RANK)
+ *     3. Add support for custom frames
+ */
+public class PinotWindowExchangeNodeInsertRule extends RelOptRule {
+  public static final PinotWindowExchangeNodeInsertRule INSTANCE =
+      new PinotWindowExchangeNodeInsertRule(PinotRuleUtils.PINOT_REL_FACTORY);
+
+  // Supported window functions
+  // OTHER_FUNCTION supported are: BOOL_AND, BOOL_OR
+  private static final Set<SqlKind> SUPPORTED_WINDOW_FUNCTION_KIND = ImmutableSet.of(SqlKind.SUM, SqlKind.SUM0,
+      SqlKind.MIN, SqlKind.MAX, SqlKind.COUNT, SqlKind.ROW_NUMBER, SqlKind.RANK, SqlKind.DENSE_RANK,
+      SqlKind.OTHER_FUNCTION);
+
+  public PinotWindowExchangeNodeInsertRule(RelBuilderFactory factory) {
+    super(operand(LogicalWindow.class, any()), factory, null);
+  }
+
+  @Override
+  public boolean matches(RelOptRuleCall call) {
+    if (call.rels.length < 1) {
+      return false;
+    }
+    if (call.rel(0) instanceof Window) {
+      Window window = call.rel(0);
+      // Only run the rule if the input isn't already an exchange node
+      return !PinotRuleUtils.isExchange(window.getInput());
+    }
+    return false;
+  }
+
+  @Override
+  public void onMatch(RelOptRuleCall call) {
+    Window window = call.rel(0);
+    RelNode windowInput = window.getInput();
+
+    // Perform all validations
+    validateWindows(window);
+
+    Window.Group windowGroup = window.groups.get(0);
+    if (windowGroup.keys.isEmpty() && windowGroup.orderKeys.getKeys().isEmpty()) {
+      // Empty OVER()
+      // Add a single Exchange for empty OVER() since no sort is required
+
+      if (PinotRuleUtils.isProject(windowInput)) {
+        // Check for empty LogicalProject below LogicalWindow. If present modify it to be a Literal only project and add
+        // a project above
+        Project project = (Project) ((HepRelVertex) windowInput).getCurrentRel();
+        if (project.getProjects().isEmpty()) {
+          RelNode returnedRelNode = handleEmptyProjectBelowWindow(window, project);
+          call.transformTo(returnedRelNode);
+          return;
+        }
+      }
+
+      PinotLogicalExchange exchange = PinotLogicalExchange.create(windowInput,
+          RelDistributions.hash(Collections.emptyList()));
+      call.transformTo(
+          LogicalWindow.create(window.getTraitSet(), exchange, window.constants, window.getRowType(), window.groups));
+    } else if (windowGroup.keys.isEmpty() && !windowGroup.orderKeys.getKeys().isEmpty()) {
+      // Only ORDER BY
+      // Add a LogicalSortExchange with collation on the order by key(s) and an empty hash partition key
+      // TODO: ORDER BY only type queries need to be sorted on both sender and receiver side for better performance.
+      //       Sorted input data can use a k-way merge instead of a PriorityQueue for sorting. For now support to
+      //       sort on the sender side is not available thus setting this up to only sort on the receiver.
+      PinotLogicalSortExchange sortExchange = PinotLogicalSortExchange.create(windowInput,
+          RelDistributions.hash(Collections.emptyList()), windowGroup.orderKeys, false, true);
+      call.transformTo(LogicalWindow.create(window.getTraitSet(), sortExchange, window.constants, window.getRowType(),
+          window.groups));
+    } else {
+      // All other variants
+      // Assess whether this is a PARTITION BY only query or not (includes queries of the type where PARTITION BY and
+      // ORDER BY key(s) are the same)
+      boolean isPartitionByOnly = isPartitionByOnlyQuery(windowGroup);
+
+      if (isPartitionByOnly) {
+        // Only PARTITION BY or PARTITION BY and ORDER BY on the same key(s)
+        // Add an Exchange hashed on the partition by keys
+        PinotLogicalExchange exchange = PinotLogicalExchange.create(windowInput,
+            RelDistributions.hash(windowGroup.keys.toList()));
+        call.transformTo(LogicalWindow.create(window.getTraitSet(), exchange, window.constants, window.getRowType(),
+            window.groups));
+      } else {
+        // PARTITION BY and ORDER BY on different key(s)
+        // Add a LogicalSortExchange hashed on the partition by keys and collation based on order by keys
+        // TODO: ORDER BY only type queries need to be sorted only on the receiver side unless a hint is set indicating
+        //       that the data is already partitioned and sorting can be done on the sender side instead. This way
+        //       sorting on the receiver side can be a no-op. Add support for this hint and pass it on. Until sender
+        //       side sorting is implemented, setting this hint will throw an error on execution.
+        PinotLogicalSortExchange sortExchange = PinotLogicalSortExchange.create(windowInput,
+            RelDistributions.hash(windowGroup.keys.toList()), windowGroup.orderKeys, false, true);
+        call.transformTo(LogicalWindow.create(window.getTraitSet(), sortExchange, window.constants, window.getRowType(),
+            window.groups));
+      }
+    }
+  }
+
+  private void validateWindows(Window window) {
+    int numGroups = window.groups.size();
+    // For Phase 1 we only handle single window groups
+    Preconditions.checkState(numGroups <= 1,
+        String.format("Currently only 1 window group is supported, query has %d groups", numGroups));
+
+    // Validate that only supported window aggregation functions are present
+    Window.Group windowGroup = window.groups.get(0);
+    validateWindowAggCallsSupported(windowGroup);
+
+    // Validate the frame
+    validateWindowFrames(windowGroup);
+  }
+
+  private void validateWindowAggCallsSupported(Window.Group windowGroup) {
+    for (int i = 0; i < windowGroup.aggCalls.size(); i++) {
+      Window.RexWinAggCall aggCall = windowGroup.aggCalls.get(i);
+      SqlKind aggKind = aggCall.getKind();
+      Preconditions.checkState(SUPPORTED_WINDOW_FUNCTION_KIND.contains(aggKind),
+          String.format("Unsupported Window function kind: %s. Only aggregation functions are supported!", aggKind));
+    }
+  }
+
+  private void validateWindowFrames(Window.Group windowGroup) {
+    // Has ROWS only aggregation call kind (e.g. ROW_NUMBER)?
+    boolean isRowsOnlyTypeAggregateCall = isRowsOnlyAggregationCallType(windowGroup.aggCalls);
+    // For Phase 1 only the default frame is supported
+    Preconditions.checkState(!windowGroup.isRows || isRowsOnlyTypeAggregateCall,
+        "Default frame must be of type RANGE and not ROWS unless this is a ROWS only aggregation function");
+    Preconditions.checkState(windowGroup.lowerBound.isPreceding() && windowGroup.lowerBound.isUnbounded(),
+        String.format("Lower bound must be UNBOUNDED PRECEDING but it is: %s", windowGroup.lowerBound));
+    if (windowGroup.orderKeys.getKeys().isEmpty() && !isRowsOnlyTypeAggregateCall) {
+      Preconditions.checkState(windowGroup.upperBound.isFollowing() && windowGroup.upperBound.isUnbounded(),
+          String.format("Upper bound must be UNBOUNDED FOLLOWING but it is: %s", windowGroup.upperBound));
+    } else {
+      Preconditions.checkState(windowGroup.upperBound.isCurrentRow(),
+          String.format("Upper bound must be CURRENT ROW but it is: %s", windowGroup.upperBound));
+    }
+  }
+
+  private boolean isRowsOnlyAggregationCallType(ImmutableList<Window.RexWinAggCall> aggCalls) {
+    return aggCalls.stream().anyMatch(aggCall -> aggCall.getKind().equals(SqlKind.ROW_NUMBER));
+  }
+
+  private boolean isPartitionByOnlyQuery(Window.Group windowGroup) {
+    boolean isPartitionByOnly = false;
+    if (windowGroup.orderKeys.getKeys().isEmpty()) {
+      return true;
+    }
+
+    if (windowGroup.orderKeys.getKeys().size() == windowGroup.keys.asList().size()) {
+      Set<Integer> partitionByKeyList = new HashSet<>(windowGroup.keys.toList());
+      Set<Integer> orderByKeyList = new HashSet<>(windowGroup.orderKeys.getKeys());
+      isPartitionByOnly = partitionByKeyList.equals(orderByKeyList);
+    }
+    return isPartitionByOnly;
+  }
+
+  /**
+   * Only empty OVER() type queries using window functions that take no columns as arguments can result in a situation
+   * where the LogicalProject below the LogicalWindow is an empty LogicalProject (i.e. no columns are projected).
+   * The 'ProjectWindowTransposeRule' looks at the columns present in the LogicalProject above the LogicalWindow and
+   * LogicalWindow to decide what to add to the lower LogicalProject when it does the transpose and for such queries
+   * if nothing is referenced an empty LogicalProject gets created. Some example queries where this can occur are:
+   *
+   * SELECT COUNT(*) OVER() from tableName
+   * SELECT 42, COUNT(*) OVER() from tableName
+   * SELECT ROW_NUMBER() OVER() from tableName
+   *
+   * This function modifies the empty LogicalProject below the LogicalWindow to add a literal and adds a LogicalProject
+   * above LogicalWindow to remove the additional literal column from being projected any further. This also handles
+   * the addition of the Exchange under the LogicalWindow.
+   *
+   * TODO: Explore an option to handle empty LogicalProject by actually projecting empty rows for each entry. This way
+   *       there will no longer be a need to add a literal to the empty LogicalProject, but just traverse the number of
+   *       rows
+   */
+  private RelNode handleEmptyProjectBelowWindow(Window window, Project project) {
+    RelOptCluster cluster = window.getCluster();
+    RexBuilder rexBuilder = cluster.getRexBuilder();
+
+    // Construct the project that goes below the window (which projects a literal)
+    final List<RexNode> expsForProjectBelowWindow = Collections.singletonList(
+        rexBuilder.makeLiteral(0, cluster.getTypeFactory().createSqlType(SqlTypeName.INTEGER)));
+    final List<String> expsFieldNamesBelowWindow = Collections.singletonList("winLiteral");
+    Project projectBelowWindow = LogicalProject.create(project.getInput(), project.getHints(),
+        expsForProjectBelowWindow, expsFieldNamesBelowWindow);
+
+    // Fix up the inputs to the Window to include the literal column and add an exchange
+    final RelDataTypeFactory.Builder outputBuilder = cluster.getTypeFactory().builder();
+    outputBuilder.addAll(projectBelowWindow.getRowType().getFieldList());
+    outputBuilder.addAll(window.getRowType().getFieldList());
+
+    // This scenario is only possible for empty OVER() which uses functions that have no arguments such as COUNT(*) or
+    // ROW_NUMBER(). Add an Exchange with empty hash distribution list
+    PinotLogicalExchange exchange =
+        PinotLogicalExchange.create(projectBelowWindow, RelDistributions.hash(Collections.emptyList()));
+    Window newWindow = new LogicalWindow(window.getCluster(), window.getTraitSet(), exchange,
+        window.getConstants(), outputBuilder.build(), window.groups);
+
+    // Create the LogicalProject above window to remove the literal column
+    final List<RexNode> expsForProjectAboveWindow = new ArrayList<>();
+    final List<String> expsFieldNamesAboveWindow = new ArrayList<>();
+    final List<RelDataTypeField> rowTypeWindowInput = newWindow.getRowType().getFieldList();
+
+    int count = 0;
+    for (int index = 1; index < rowTypeWindowInput.size(); index++) {
+      // Keep only the non-literal fields. We can start from index = 1 since the first and only column from the lower
+      // project is the literal column added above.
+      final RelDataTypeField relDataTypeField = rowTypeWindowInput.get(index);
+      expsForProjectAboveWindow.add(new RexInputRef(index, relDataTypeField.getType()));
+      expsFieldNamesAboveWindow.add(String.format("$%d", count));
+    }
+
+    return LogicalProject.create(newWindow, project.getHints(), expsForProjectAboveWindow, expsFieldNamesAboveWindow);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/PinotSqlAggFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/PinotSqlAggFunction.java
new file mode 100644
index 00000000000..0d4146f4317
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/sql/PinotSqlAggFunction.java
@@ -0,0 +1,47 @@
+/**
+ * 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.calcite.sql;
+
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlOperandTypeInference;
+import org.apache.calcite.sql.type.SqlReturnTypeInference;
+import org.apache.calcite.util.Optionality;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+
+/**
+ * Pinot SqlAggFunction class to register the Pinot aggregation functions with the Calcite operator table.
+ */
+public class PinotSqlAggFunction extends SqlAggFunction {
+
+  public PinotSqlAggFunction(String name, @Nullable SqlIdentifier sqlIdentifier, SqlKind sqlKind,
+      SqlReturnTypeInference returnTypeInference, @Nullable SqlOperandTypeInference sqlOperandTypeInference,
+      @Nullable SqlOperandTypeChecker operandTypeChecker, SqlFunctionCategory sqlFunctionCategory) {
+    this(name, sqlIdentifier, sqlKind, returnTypeInference, sqlOperandTypeInference, operandTypeChecker,
+        sqlFunctionCategory, false, false, Optionality.FORBIDDEN);
+  }
+
+  public PinotSqlAggFunction(String name, @Nullable SqlIdentifier sqlIdentifier, SqlKind sqlKind,
+      SqlReturnTypeInference returnTypeInference, @Nullable SqlOperandTypeInference sqlOperandTypeInference,
+      @Nullable SqlOperandTypeChecker operandTypeChecker, SqlFunctionCategory sqlFunctionCategory,
+      boolean requiresOrder, boolean requiresOver, Optionality optionality) {
+    super(name, sqlIdentifier, sqlKind, returnTypeInference, sqlOperandTypeInference, operandTypeChecker,
+        sqlFunctionCategory, requiresOrder, requiresOver, optionality);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/PinotSqlTransformFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/PinotSqlTransformFunction.java
new file mode 100644
index 00000000000..827c9f37337
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/sql/PinotSqlTransformFunction.java
@@ -0,0 +1,37 @@
+/**
+ * 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.calcite.sql;
+
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlOperandTypeInference;
+import org.apache.calcite.sql.type.SqlReturnTypeInference;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+
+/**
+ * Pinot SqlAggFunction class to register the Pinot aggregation functions with the Calcite operator table.
+ */
+public class PinotSqlTransformFunction extends SqlFunction {
+
+  public PinotSqlTransformFunction(String name, SqlKind kind, @Nullable SqlReturnTypeInference returnTypeInference,
+      @Nullable SqlOperandTypeInference operandTypeInference, @Nullable SqlOperandTypeChecker operandTypeChecker,
+      SqlFunctionCategory category) {
+    super(name, kind, returnTypeInference, operandTypeInference, operandTypeChecker, category);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotBoolAndAggregateFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotBoolAndAggregateFunction.java
deleted file mode 100644
index 7963fd02e34..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotBoolAndAggregateFunction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calcite.sql.fun;
-
-import org.apache.calcite.sql.SqlAggFunction;
-import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.ReturnTypes;
-import org.apache.calcite.util.Optionality;
-
-
-public class PinotBoolAndAggregateFunction extends SqlAggFunction {
-
-  public static final PinotBoolAndAggregateFunction INSTANCE = new PinotBoolAndAggregateFunction();
-
-  private PinotBoolAndAggregateFunction() {
-    super("BOOL_AND", null, SqlKind.OTHER_FUNCTION, ReturnTypes.BOOLEAN,
-        null, OperandTypes.BOOLEAN, SqlFunctionCategory.USER_DEFINED_FUNCTION,
-        false, false, Optionality.FORBIDDEN);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotBoolOrAggregateFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotBoolOrAggregateFunction.java
deleted file mode 100644
index 547edef8878..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotBoolOrAggregateFunction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calcite.sql.fun;
-
-import org.apache.calcite.sql.SqlAggFunction;
-import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.ReturnTypes;
-import org.apache.calcite.util.Optionality;
-
-
-public class PinotBoolOrAggregateFunction extends SqlAggFunction {
-
-  public static final PinotBoolOrAggregateFunction INSTANCE = new PinotBoolOrAggregateFunction();
-
-  private PinotBoolOrAggregateFunction() {
-    super("BOOL_OR", null, SqlKind.OTHER_FUNCTION, ReturnTypes.BOOLEAN,
-        null, OperandTypes.BOOLEAN, SqlFunctionCategory.USER_DEFINED_FUNCTION,
-        false, false, Optionality.FORBIDDEN);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotFourthMomentAggregateFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotFourthMomentAggregateFunction.java
deleted file mode 100644
index 2d9ca9e3a0c..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotFourthMomentAggregateFunction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calcite.sql.fun;
-
-import org.apache.calcite.sql.SqlAggFunction;
-import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.ReturnTypes;
-import org.apache.calcite.sql.type.SqlTypeName;
-import org.apache.calcite.util.Optionality;
-
-
-public class PinotFourthMomentAggregateFunction extends SqlAggFunction {
-
-  public static final PinotFourthMomentAggregateFunction INSTANCE = new PinotFourthMomentAggregateFunction();
-
-  public PinotFourthMomentAggregateFunction() {
-    super("FOURTHMOMENT", null, SqlKind.OTHER_FUNCTION, ReturnTypes.explicit(SqlTypeName.OTHER),
-        null, OperandTypes.NUMERIC, SqlFunctionCategory.USER_DEFINED_FUNCTION,
-        false, false, Optionality.FORBIDDEN);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotKurtosisAggregateFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotKurtosisAggregateFunction.java
deleted file mode 100644
index f2d76396259..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotKurtosisAggregateFunction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calcite.sql.fun;
-
-import org.apache.calcite.sql.SqlAggFunction;
-import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.ReturnTypes;
-import org.apache.calcite.util.Optionality;
-
-
-public class PinotKurtosisAggregateFunction extends SqlAggFunction {
-
-  public static final String KURTOSIS = "KURTOSIS";
-  public static final PinotKurtosisAggregateFunction INSTANCE = new PinotKurtosisAggregateFunction();
-
-  public PinotKurtosisAggregateFunction() {
-    super(KURTOSIS, null, SqlKind.OTHER_FUNCTION, ReturnTypes.DOUBLE,
-        null, OperandTypes.NUMERIC, SqlFunctionCategory.USER_DEFINED_FUNCTION,
-        false, false, Optionality.FORBIDDEN);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotOperatorTable.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotOperatorTable.java
index 17af5a7d6dc..2ee178419ff 100644
--- a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotOperatorTable.java
+++ b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotOperatorTable.java
@@ -21,15 +21,15 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.calcite.sql.SqlAggFunction;
+import java.util.Locale;
+import org.apache.calcite.sql.PinotSqlAggFunction;
+import org.apache.calcite.sql.PinotSqlTransformFunction;
 import org.apache.calcite.sql.SqlFunction;
-import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlOperator;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.ReturnTypes;
 import org.apache.calcite.sql.validate.SqlNameMatchers;
 import org.apache.calcite.util.Util;
+import org.apache.pinot.common.function.TransformFunctionType;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 
@@ -50,15 +50,6 @@ public class PinotOperatorTable extends SqlStdOperatorTable {
   private static @MonotonicNonNull PinotOperatorTable _instance;
 
   public static final SqlFunction COALESCE = new PinotSqlCoalesceFunction();
-  public static final SqlFunction SKEWNESS_REDUCE = new SqlFunction("SKEWNESS_REDUCE", SqlKind.OTHER_FUNCTION,
-      ReturnTypes.DOUBLE, null, OperandTypes.BINARY, SqlFunctionCategory.USER_DEFINED_FUNCTION);
-  public static final SqlFunction KURTOSIS_REDUCE = new SqlFunction("KURTOSIS_REDUCE", SqlKind.OTHER_FUNCTION,
-      ReturnTypes.DOUBLE, null, OperandTypes.BINARY, SqlFunctionCategory.USER_DEFINED_FUNCTION);
-
-  public static final SqlAggFunction BOOL_AND = PinotBoolAndAggregateFunction.INSTANCE;
-  public static final SqlAggFunction BOOL_OR = PinotBoolOrAggregateFunction.INSTANCE;
-  public static final SqlAggFunction SKEWNESS = PinotSkewnessAggregateFunction.INSTANCE;
-  public static final SqlAggFunction KURTOSIS = PinotKurtosisAggregateFunction.INSTANCE;
 
   // TODO: clean up lazy init by using Suppliers.memorized(this::computeInstance) and make getter wrapped around
   // supplier instance. this should replace all lazy init static objects in the codebase
@@ -79,6 +70,9 @@ public static synchronized PinotOperatorTable instance() {
    *
    * <p>This is a direct copy of the {@link org.apache.calcite.sql.util.ReflectiveSqlOperatorTable} and can be hard to
    * debug, suggest changing to a non-dynamic registration. Dynamic function support should happen via catalog.
+   *
+   * This also registers aggregation functions defined in {@link org.apache.pinot.segment.spi.AggregationFunctionType}
+   * which are multistage enabled.
    */
   public final void initNoDuplicate() {
     // Use reflection to register the expressions stored in public fields.
@@ -100,6 +94,61 @@ public final void initNoDuplicate() {
         throw Util.throwAsRuntime(Util.causeOrSelf(e));
       }
     }
+
+    // Walk through all the Pinot aggregation types and
+    //   1. register those that are supported in multistage in addition to calcite standard opt table.
+    //   2. register special handling that differs from calcite standard.
+    for (AggregationFunctionType aggregationFunctionType : AggregationFunctionType.values()) {
+      if (aggregationFunctionType.getSqlKind() != null) {
+        // 1. Register the aggregation function with Calcite
+        registerAggregateFunction(aggregationFunctionType.getName(), aggregationFunctionType);
+        // 2. Register the aggregation function with Calcite on all alternative names
+        List<String> alternativeFunctionNames = aggregationFunctionType.getAlternativeNames();
+        for (String alternativeFunctionName : alternativeFunctionNames) {
+          registerAggregateFunction(alternativeFunctionName, aggregationFunctionType);
+        }
+      }
+    }
+
+    // Walk through all the Pinot transform types and
+    //   1. register those that are supported in multistage in addition to calcite standard opt table.
+    //   2. register special handling that differs from calcite standard.
+    for (TransformFunctionType transformFunctionType : TransformFunctionType.values()) {
+      if (transformFunctionType.getSqlKind() != null) {
+        // 1. Register the aggregation function with Calcite
+        registerTransformFunction(transformFunctionType.getName(), transformFunctionType);
+        // 2. Register the aggregation function with Calcite on all alternative names
+        List<String> alternativeFunctionNames = transformFunctionType.getAlternativeNames();
+        for (String alternativeFunctionName : alternativeFunctionNames) {
+          registerTransformFunction(alternativeFunctionName, transformFunctionType);
+        }
+      }
+    }
+  }
+
+  private void registerAggregateFunction(String functionName, AggregationFunctionType functionType) {
+    // register function behavior that's different from Calcite
+    if (functionType.getOperandTypeChecker() != null && functionType.getReturnTypeInference() != null) {
+      PinotSqlAggFunction sqlAggFunction = new PinotSqlAggFunction(functionName.toUpperCase(Locale.ROOT), null,
+          functionType.getSqlKind(), functionType.getReturnTypeInference(), null,
+          functionType.getOperandTypeChecker(), functionType.getSqlFunctionCategory());
+      if (notRegistered(sqlAggFunction)) {
+        register(sqlAggFunction);
+      }
+    }
+  }
+
+  private void registerTransformFunction(String functionName, TransformFunctionType functionType) {
+    // register function behavior that's different from Calcite
+    if (functionType.getOperandTypeChecker() != null && functionType.getReturnTypeInference() != null) {
+      PinotSqlTransformFunction sqlTransformFunction =
+          new PinotSqlTransformFunction(functionName.toUpperCase(Locale.ROOT),
+              functionType.getSqlKind(), functionType.getReturnTypeInference(), null,
+              functionType.getOperandTypeChecker(), functionType.getSqlFunctionCategory());
+      if (notRegistered(sqlTransformFunction)) {
+        register(sqlTransformFunction);
+      }
+    }
   }
 
   private boolean notRegistered(SqlFunction op) {
diff --git a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotSkewnessAggregateFunction.java b/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotSkewnessAggregateFunction.java
deleted file mode 100644
index 16857e8568d..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/calcite/sql/fun/PinotSkewnessAggregateFunction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calcite.sql.fun;
-
-import org.apache.calcite.sql.SqlAggFunction;
-import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.ReturnTypes;
-import org.apache.calcite.util.Optionality;
-
-
-public class PinotSkewnessAggregateFunction extends SqlAggFunction {
-
-  public static final String SKEWNESS = "SKEWNESS";
-  public static final PinotSkewnessAggregateFunction INSTANCE = new PinotSkewnessAggregateFunction();
-
-  public PinotSkewnessAggregateFunction() {
-    super(SKEWNESS, null, SqlKind.OTHER_FUNCTION, ReturnTypes.DOUBLE,
-        null, OperandTypes.NUMERIC, SqlFunctionCategory.USER_DEFINED_FUNCTION,
-        false, false, Optionality.FORBIDDEN);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java
index c58cfc59f48..5963ba5f982 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java
@@ -19,15 +19,19 @@
 package org.apache.pinot.query;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.List;
 import java.util.Properties;
+import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.calcite.config.CalciteConnectionConfigImpl;
 import org.apache.calcite.config.CalciteConnectionProperty;
 import org.apache.calcite.jdbc.CalciteSchema;
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.plan.hep.HepMatchOrder;
 import org.apache.calcite.plan.hep.HepProgram;
 import org.apache.calcite.plan.hep.HepProgramBuilder;
 import org.apache.calcite.prepare.PinotCalciteCatalogReader;
@@ -35,6 +39,8 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.RelRoot;
 import org.apache.calcite.rel.hint.HintStrategyTable;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
+import org.apache.calcite.rel.logical.LogicalCorrelate;
 import org.apache.calcite.rel.rules.PinotQueryRuleSets;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rex.RexBuilder;
@@ -46,25 +52,33 @@
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.fun.PinotOperatorTable;
 import org.apache.calcite.sql.util.PinotChainedSqlOperatorTable;
+import org.apache.calcite.sql2rel.RelDecorrelator;
 import org.apache.calcite.sql2rel.SqlToRelConverter;
 import org.apache.calcite.sql2rel.StandardConvertletTable;
 import org.apache.calcite.tools.FrameworkConfig;
 import org.apache.calcite.tools.Frameworks;
+import org.apache.calcite.tools.RelBuilder;
 import org.apache.pinot.common.config.provider.TableCache;
 import org.apache.pinot.query.context.PlannerContext;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.PhysicalExplainPlanVisitor;
 import org.apache.pinot.query.planner.PlannerUtils;
 import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.logical.StagePlanner;
+import org.apache.pinot.query.planner.SubPlan;
+import org.apache.pinot.query.planner.logical.PinotLogicalQueryPlanner;
+import org.apache.pinot.query.planner.logical.RelToPlanNodeConverter;
+import org.apache.pinot.query.planner.physical.PinotDispatchPlanner;
 import org.apache.pinot.query.routing.WorkerManager;
 import org.apache.pinot.query.type.TypeFactory;
 import org.apache.pinot.sql.parsers.CalciteSqlParser;
 import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
+import org.apache.pinot.sql.parsers.parser.SqlPhysicalExplain;
 
 
 /**
  * The {@code QueryEnvironment} contains the main entrypoint for query planning.
  *
- * <p>It provide the higher level entry interface to convert a SQL string into a {@link QueryPlan}.
+ * <p>It provide the higher level entry interface to convert a SQL string into a {@link DispatchableSubPlan}.
  */
 public class QueryEnvironment {
   // Calcite configurations
@@ -78,7 +92,6 @@ public class QueryEnvironment {
   private final HepProgram _hepProgram;
 
   // Pinot extensions
-  private final Collection<RelOptRule> _logicalRuleSet;
   private final WorkerManager _workerManager;
   private final TableCache _tableCache;
 
@@ -102,16 +115,41 @@ public QueryEnvironment(TypeFactory typeFactory, CalciteSchema rootSchema, Worke
         .defaultSchema(_rootSchema.plus())
         .sqlToRelConverterConfig(SqlToRelConverter.config()
             .withHintStrategyTable(getHintStrategyTable())
+            .withTrimUnusedFields(true)
+            // SUB-QUERY Threshold is useless as we are encoding all IN clause in-line anyway
+            .withInSubQueryThreshold(Integer.MAX_VALUE)
             .addRelBuilderConfigTransform(c -> c.withPushJoinCondition(true))
             .addRelBuilderConfigTransform(c -> c.withAggregateUnique(true)))
         .build();
 
-    // optimizer rules
-    _logicalRuleSet = PinotQueryRuleSets.LOGICAL_OPT_RULES;
-
-    // optimizer
     HepProgramBuilder hepProgramBuilder = new HepProgramBuilder();
-    for (RelOptRule relOptRule : _logicalRuleSet) {
+    // Set the match order as DEPTH_FIRST. The default is arbitrary which works the same as DEPTH_FIRST, but it's
+    // best to be explicit.
+    hepProgramBuilder.addMatchOrder(HepMatchOrder.DEPTH_FIRST);
+
+    // ----
+    // Run Pinot specific pre-rules
+    hepProgramBuilder.addRuleCollection(PinotQueryRuleSets.PINOT_PRE_RULES);
+
+    // ----
+    // Run the Calcite CORE rules using 1 HepInstruction per rule. We use 1 HepInstruction per rule for simplicity:
+    // the rules used here can rest assured that they are the only ones evaluated in a dedicated graph-traversal.
+    for (RelOptRule relOptRule : PinotQueryRuleSets.BASIC_RULES) {
+      hepProgramBuilder.addRuleInstance(relOptRule);
+    }
+
+    // ----
+    // Pushdown filters using a single HepInstruction.
+    hepProgramBuilder.addRuleCollection(PinotQueryRuleSets.FILTER_PUSHDOWN_RULES);
+
+    // ----
+    // Prune duplicate/unnecessary nodes using a single HepInstruction.
+    // TODO: We can consider using HepMatchOrder.TOP_DOWN if we find cases where it would help.
+    hepProgramBuilder.addRuleCollection(PinotQueryRuleSets.PRUNE_RULES);
+
+    // ----
+    // Run pinot specific rules that should run after all other rules, using 1 HepInstruction per rule.
+    for (RelOptRule relOptRule : PinotQueryRuleSets.PINOT_POST_RULES) {
       hepProgramBuilder.addRuleInstance(relOptRule);
     }
     _hepProgram = hepProgramBuilder.build();
@@ -127,18 +165,22 @@ public QueryEnvironment(TypeFactory typeFactory, CalciteSchema rootSchema, Worke
    *
    * @param sqlQuery SQL query string.
    * @param sqlNodeAndOptions parsed SQL query.
-   * @return a dispatchable query plan
+   * @return QueryPlannerResult containing the dispatchable query plan and the relRoot.
    */
-  public QueryPlan planQuery(String sqlQuery, SqlNodeAndOptions sqlNodeAndOptions, long requestId) {
+  public QueryPlannerResult planQuery(String sqlQuery, SqlNodeAndOptions sqlNodeAndOptions, long requestId) {
     try (PlannerContext plannerContext = new PlannerContext(_config, _catalogReader, _typeFactory, _hepProgram)) {
       plannerContext.setOptions(sqlNodeAndOptions.getOptions());
       RelRoot relRoot = compileQuery(sqlNodeAndOptions.getSqlNode(), plannerContext);
-      return toDispatchablePlan(relRoot, plannerContext, requestId);
+      // TODO: current code only assume one SubPlan per query, but we should support multiple SubPlans per query.
+      // Each SubPlan should be able to run independently from Broker then set the results into the dependent
+      // SubPlan for further processing.
+      DispatchableSubPlan dispatchableSubPlan = toDispatchableSubPlan(relRoot, plannerContext, requestId);
+      return new QueryPlannerResult(dispatchableSubPlan, null, dispatchableSubPlan.getTableNames());
     } catch (CalciteContextException e) {
       throw new RuntimeException("Error composing query plan for '" + sqlQuery
           + "': " + e.getMessage() + "'", e);
-    } catch (Exception e) {
-      throw new RuntimeException("Error composing query plan for: " + sqlQuery, e);
+    } catch (Throwable t) {
+      throw new RuntimeException("Error composing query plan for: " + sqlQuery, t);
     }
   }
 
@@ -146,35 +188,88 @@ public QueryPlan planQuery(String sqlQuery, SqlNodeAndOptions sqlNodeAndOptions,
    * Explain a SQL query.
    *
    * Similar to {@link QueryEnvironment#planQuery(String, SqlNodeAndOptions, long)}, this API runs the query
-   * compilation. But it doesn't run the distributed {@link QueryPlan} generation, instead it only returns the
+   * compilation. But it doesn't run the distributed {@link DispatchableSubPlan} generation, instead it only
+   * returns the
    * explained logical plan.
    *
    * @param sqlQuery SQL query string.
    * @param sqlNodeAndOptions parsed SQL query.
-   * @return the explained query plan.
+   * @return QueryPlannerResult containing the explained query plan and the relRoot.
    */
-  public String explainQuery(String sqlQuery, SqlNodeAndOptions sqlNodeAndOptions) {
+  public QueryPlannerResult explainQuery(String sqlQuery, SqlNodeAndOptions sqlNodeAndOptions, long requestId) {
     try (PlannerContext plannerContext = new PlannerContext(_config, _catalogReader, _typeFactory, _hepProgram)) {
       SqlExplain explain = (SqlExplain) sqlNodeAndOptions.getSqlNode();
       plannerContext.setOptions(sqlNodeAndOptions.getOptions());
       RelRoot relRoot = compileQuery(explain.getExplicandum(), plannerContext);
-      SqlExplainFormat format = explain.getFormat() == null ? SqlExplainFormat.DOT : explain.getFormat();
-      SqlExplainLevel level =
-          explain.getDetailLevel() == null ? SqlExplainLevel.DIGEST_ATTRIBUTES : explain.getDetailLevel();
-      return PlannerUtils.explainPlan(relRoot.rel, format, level);
+      if (explain instanceof SqlPhysicalExplain) {
+        // get the physical plan for query.
+        DispatchableSubPlan dispatchableSubPlan = toDispatchableSubPlan(relRoot, plannerContext, requestId);
+        return new QueryPlannerResult(null, PhysicalExplainPlanVisitor.explain(dispatchableSubPlan),
+            dispatchableSubPlan.getTableNames());
+      } else {
+        // get the logical plan for query.
+        SqlExplainFormat format = explain.getFormat() == null ? SqlExplainFormat.DOT : explain.getFormat();
+        SqlExplainLevel level =
+            explain.getDetailLevel() == null ? SqlExplainLevel.DIGEST_ATTRIBUTES : explain.getDetailLevel();
+        Set<String> tableNames = RelToPlanNodeConverter.getTableNamesFromRelRoot(relRoot.rel);
+        return new QueryPlannerResult(null, PlannerUtils.explainPlan(relRoot.rel, format, level), tableNames);
+      }
     } catch (Exception e) {
       throw new RuntimeException("Error explain query plan for: " + sqlQuery, e);
     }
   }
 
   @VisibleForTesting
-  public QueryPlan planQuery(String sqlQuery) {
-    return planQuery(sqlQuery, CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery), 0);
+  public DispatchableSubPlan planQuery(String sqlQuery) {
+    return planQuery(sqlQuery, CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery), 0).getQueryPlan();
   }
 
   @VisibleForTesting
-  public String explainQuery(String sqlQuery) {
-    return explainQuery(sqlQuery, CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery));
+  public String explainQuery(String sqlQuery, long requestId) {
+    return explainQuery(sqlQuery, CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery), requestId).getExplainPlan();
+  }
+
+  public List<String> getTableNamesForQuery(String sqlQuery) {
+    try (PlannerContext plannerContext = new PlannerContext(_config, _catalogReader, _typeFactory, _hepProgram)) {
+      SqlNode sqlNode = CalciteSqlParser.compileToSqlNodeAndOptions(sqlQuery).getSqlNode();
+      if (sqlNode.getKind().equals(SqlKind.EXPLAIN)) {
+        sqlNode = ((SqlExplain) sqlNode).getExplicandum();
+      }
+      RelRoot relRoot = compileQuery(sqlNode, plannerContext);
+      Set<String> tableNames = RelToPlanNodeConverter.getTableNamesFromRelRoot(relRoot.rel);
+      return new ArrayList<>(tableNames);
+    } catch (Throwable t) {
+      throw new RuntimeException("Error composing query plan for: " + sqlQuery, t);
+    }
+  }
+
+  /**
+   * Results of planning a query
+   */
+  public static class QueryPlannerResult {
+    private DispatchableSubPlan _dispatchableSubPlan;
+    private String _explainPlan;
+    Set<String> _tableNames;
+
+    QueryPlannerResult(@Nullable DispatchableSubPlan dispatchableSubPlan, @Nullable String explainPlan,
+        Set<String> tableNames) {
+      _dispatchableSubPlan = dispatchableSubPlan;
+      _explainPlan = explainPlan;
+      _tableNames = tableNames;
+    }
+
+    public String getExplainPlan() {
+      return _explainPlan;
+    }
+
+    public DispatchableSubPlan getQueryPlan() {
+      return _dispatchableSubPlan;
+    }
+
+    // Returns all the table names in the query.
+    public Set<String> getTableNames() {
+      return _tableNames;
+    }
   }
 
   // --------------------------------------------------------------------------
@@ -186,10 +281,30 @@ protected RelRoot compileQuery(SqlNode sqlNode, PlannerContext plannerContext)
       throws Exception {
     SqlNode validated = validate(sqlNode, plannerContext);
     RelRoot relation = toRelation(validated, plannerContext);
-    RelNode optimized = optimize(relation, plannerContext);
+    RelRoot decorrelated = decorrelateIfNeeded(relation);
+    RelNode optimized = optimize(decorrelated, plannerContext);
     return relation.withRel(optimized);
   }
 
+  private RelRoot decorrelateIfNeeded(RelRoot relRoot) {
+    if (hasCorrelateNode(relRoot.rel)) {
+      relRoot = relRoot.withRel(RelDecorrelator.decorrelateQuery(relRoot.rel, RelBuilder.create(_config)));
+    }
+    return relRoot;
+  }
+
+  private static boolean hasCorrelateNode(RelNode relNode) {
+    if (relNode instanceof LogicalCorrelate) {
+      return true;
+    }
+    for (RelNode input : relNode.getInputs()) {
+      if (hasCorrelateNode(input)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private SqlNode validate(SqlNode parsed, PlannerContext plannerContext)
       throws Exception {
     // 2. validator to validate.
@@ -208,7 +323,8 @@ private RelRoot toRelation(SqlNode parsed, PlannerContext plannerContext) {
     SqlToRelConverter sqlToRelConverter =
         new SqlToRelConverter(plannerContext.getPlanner(), plannerContext.getValidator(), _catalogReader, cluster,
             StandardConvertletTable.INSTANCE, _config.getSqlToRelConverterConfig());
-    return sqlToRelConverter.convertQuery(parsed, false, true);
+    RelRoot relRoot = sqlToRelConverter.convertQuery(parsed, false, true);
+    return relRoot.withRel(sqlToRelConverter.trimUnusedFields(false, relRoot.rel));
   }
 
   private RelNode optimize(RelRoot relRoot, PlannerContext plannerContext) {
@@ -223,10 +339,20 @@ private RelNode optimize(RelRoot relRoot, PlannerContext plannerContext) {
     }
   }
 
-  private QueryPlan toDispatchablePlan(RelRoot relRoot, PlannerContext plannerContext, long requestId) {
-    // 5. construct a dispatchable query plan.
-    StagePlanner queryStagePlanner = new StagePlanner(plannerContext, _workerManager, requestId, _tableCache);
-    return queryStagePlanner.makePlan(relRoot);
+  private SubPlan toSubPlan(RelRoot relRoot) {
+    // 5. construct a logical query plan.
+    PinotLogicalQueryPlanner pinotLogicalQueryPlanner = new PinotLogicalQueryPlanner();
+    QueryPlan queryPlan = pinotLogicalQueryPlanner.planQuery(relRoot);
+    return pinotLogicalQueryPlanner.makePlan(queryPlan);
+  }
+  private DispatchableSubPlan toDispatchableSubPlan(RelRoot relRoot, PlannerContext plannerContext,
+      long requestId) {
+    SubPlan subPlanRoot = toSubPlan(relRoot);
+
+    PinotDispatchPlanner pinotDispatchPlanner =
+        new PinotDispatchPlanner(plannerContext, _workerManager, requestId, _tableCache);
+    pinotDispatchPlanner.createDispatchableSubPlan(subPlanRoot);
+    return pinotDispatchPlanner.createDispatchableSubPlan(subPlanRoot);
   }
 
   // --------------------------------------------------------------------------
@@ -234,6 +360,6 @@ private QueryPlan toDispatchablePlan(RelRoot relRoot, PlannerContext plannerCont
   // --------------------------------------------------------------------------
 
   private HintStrategyTable getHintStrategyTable() {
-    return HintStrategyTable.builder().build();
+    return PinotHintStrategyTable.PINOT_HINT_STRATEGY_TABLE;
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
index 25a48bec1ae..52b51f89c88 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
@@ -23,7 +23,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.ExpressionType;
@@ -31,6 +32,7 @@
 import org.apache.pinot.common.request.PinotQuery;
 import org.apache.pinot.common.utils.request.RequestUtils;
 import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.plannode.SortNode;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.apache.pinot.sql.FilterKind;
 import org.apache.pinot.sql.parsers.SqlCompilationException;
@@ -99,37 +101,51 @@ private static List<Expression> convertDistinctSelectList(RexExpression.Function
     return selectExpr;
   }
 
-  public static List<Expression> convertOrderByList(List<RexExpression> rexInputRefs,
-      List<RelFieldCollation.Direction> directions, PinotQuery pinotQuery) {
-    List<Expression> orderByExpr = new ArrayList<>();
-
-    for (int i = 0; i < rexInputRefs.size(); i++) {
-      orderByExpr.add(convertOrderBy(rexInputRefs.get(i), directions.get(i), pinotQuery));
+  public static List<Expression> convertOrderByList(SortNode node, PinotQuery pinotQuery) {
+    List<RexExpression> collationKeys = node.getCollationKeys();
+    List<Direction> collationDirections = node.getCollationDirections();
+    List<NullDirection> collationNullDirections = node.getCollationNullDirections();
+    int numKeys = collationKeys.size();
+    List<Expression> orderByExpressions = new ArrayList<>(numKeys);
+    for (int i = 0; i < numKeys; i++) {
+      orderByExpressions.add(
+          convertOrderBy(collationKeys.get(i), collationDirections.get(i), collationNullDirections.get(i), pinotQuery));
     }
-    return orderByExpr;
+    return orderByExpressions;
   }
 
-  private static Expression convertOrderBy(RexExpression rexNode, RelFieldCollation.Direction direction,
+  private static Expression convertOrderBy(RexExpression rexNode, Direction direction, NullDirection nullDirection,
       PinotQuery pinotQuery) {
-    Expression expression;
-    switch (direction) {
-      case DESCENDING:
-        expression = getFunctionExpression("DESC");
-        expression.getFunctionCall().addToOperands(toExpression(rexNode, pinotQuery));
-        break;
-      case ASCENDING:
-      default:
-        expression = getFunctionExpression("ASC");
-        expression.getFunctionCall().addToOperands(toExpression(rexNode, pinotQuery));
-        break;
+    if (direction == Direction.ASCENDING) {
+      Expression expression = getFunctionExpression("asc");
+      expression.getFunctionCall().addToOperands(toExpression(rexNode, pinotQuery));
+      // NOTE: Add explicit NULL direction only if it is not the default behavior (default behavior treats NULL as the
+      //       largest value)
+      if (nullDirection == NullDirection.FIRST) {
+        Expression nullFirstExpression = getFunctionExpression("nullsfirst");
+        nullFirstExpression.getFunctionCall().addToOperands(expression);
+        return nullFirstExpression;
+      } else {
+        return expression;
+      }
+    } else {
+      Expression expression = getFunctionExpression("desc");
+      expression.getFunctionCall().addToOperands(toExpression(rexNode, pinotQuery));
+      // NOTE: Add explicit NULL direction only if it is not the default behavior (default behavior treats NULL as the
+      //       largest value)
+      if (nullDirection == NullDirection.LAST) {
+        Expression nullLastExpression = getFunctionExpression("nullslast");
+        nullLastExpression.getFunctionCall().addToOperands(expression);
+        return nullLastExpression;
+      } else {
+        return expression;
+      }
     }
-    return expression;
   }
 
   private static Expression convertDistinctAndSelectListToFunctionExpression(RexExpression.FunctionCall rexCall,
       PinotQuery pinotQuery) {
-    String functionName = AggregationFunctionType.DISTINCT.getName();
-    Expression functionExpression = getFunctionExpression(functionName);
+    Expression functionExpression = getFunctionExpression("distinct");
     for (RexExpression node : rexCall.getFunctionOperands()) {
       Expression columnExpression = toExpression(node, pinotQuery);
       if (columnExpression.getType() == ExpressionType.IDENTIFIER && columnExpression.getIdentifier().getName()
@@ -188,12 +204,15 @@ private static Expression compileFunctionExpression(RexExpression.FunctionCall r
         functionName = functionKind.name();
         break;
     }
-    // When there is no argument, set an empty list as the operands
     List<RexExpression> childNodes = rexCall.getFunctionOperands();
     List<Expression> operands = new ArrayList<>(childNodes.size());
     for (RexExpression childNode : childNodes) {
       operands.add(toExpression(childNode, pinotQuery));
     }
+    // for COUNT, add a star (*) identifier to operand list b/c V1 doesn't handle empty operand functions.
+    if (functionKind == SqlKind.COUNT && operands.isEmpty()) {
+      operands.add(RequestUtils.getIdentifierExpression("*"));
+    }
     ParserUtils.validateFunction(functionName, operands);
     Expression functionExpression = getFunctionExpression(functionName);
     functionExpression.getFunctionCall().setOperands(operands);
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/DispatchablePlanFragment.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/DispatchablePlanFragment.java
new file mode 100644
index 00000000000..e0bc3f6a45e
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/DispatchablePlanFragment.java
@@ -0,0 +1,114 @@
+/**
+ * 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.pinot.query.planner;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.core.routing.TimeBoundaryInfo;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.WorkerMetadata;
+
+
+public class DispatchablePlanFragment {
+
+  public static final String TABLE_NAME_KEY = "tableName";
+  public static final String TIME_BOUNDARY_COLUMN_KEY = "timeBoundaryInfo.timeColumn";
+  public static final String TIME_BOUNDARY_VALUE_KEY = "timeBoundaryInfo.timeValue";
+  private final PlanFragment _planFragment;
+  private final List<WorkerMetadata> _workerMetadataList;
+
+  // This is used at broker stage - we don't need to ship it to the server.
+  private final Map<QueryServerInstance, List<Integer>> _serverInstanceToWorkerIdMap;
+
+  // used for table scan stage - we use ServerInstance instead of VirtualServer
+  // here because all virtual servers that share a server instance will have the
+  // same segments on them
+  private final Map<Integer, Map<String, List<String>>> _workerIdToSegmentsMap;
+
+  // used for passing custom properties to build StageMetadata on the server.
+  private final Map<String, String> _customProperties;
+
+  public DispatchablePlanFragment(PlanFragment planFragment) {
+    this(planFragment, new ArrayList<>(), new HashMap<>(), new HashMap<>());
+  }
+
+  public DispatchablePlanFragment(PlanFragment planFragment, List<WorkerMetadata> workerMetadataList,
+      Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap, Map<String, String> customPropertyMap) {
+    _planFragment = planFragment;
+    _workerMetadataList = workerMetadataList;
+    _serverInstanceToWorkerIdMap = serverInstanceToWorkerIdMap;
+    _workerIdToSegmentsMap = new HashMap<>();
+    _customProperties = customPropertyMap;
+  }
+
+  public PlanFragment getPlanFragment() {
+    return _planFragment;
+  }
+
+  public List<WorkerMetadata> getWorkerMetadataList() {
+    return _workerMetadataList;
+  }
+
+  public Map<QueryServerInstance, List<Integer>> getServerInstanceToWorkerIdMap() {
+    return _serverInstanceToWorkerIdMap;
+  }
+
+  public Map<String, String> getCustomProperties() {
+    return _customProperties;
+  }
+
+  public String getTableName() {
+    return _customProperties.get(TABLE_NAME_KEY);
+  }
+
+  public String setTableName(String tableName) {
+    return _customProperties.put(TABLE_NAME_KEY, tableName);
+  }
+
+  public TimeBoundaryInfo getTimeBoundary() {
+    return new TimeBoundaryInfo(_customProperties.get(TIME_BOUNDARY_COLUMN_KEY),
+        _customProperties.get(TIME_BOUNDARY_VALUE_KEY));
+  }
+
+  public void setTimeBoundaryInfo(TimeBoundaryInfo timeBoundaryInfo) {
+    _customProperties.put(TIME_BOUNDARY_COLUMN_KEY, timeBoundaryInfo.getTimeColumn());
+    _customProperties.put(TIME_BOUNDARY_VALUE_KEY, timeBoundaryInfo.getTimeValue());
+  }
+
+  public Map<Integer, Map<String, List<String>>> getWorkerIdToSegmentsMap() {
+    return _workerIdToSegmentsMap;
+  }
+
+  public void setWorkerIdToSegmentsMap(Map<Integer, Map<String, List<String>>> workerIdToSegmentsMap) {
+    _workerIdToSegmentsMap.clear();
+    _workerIdToSegmentsMap.putAll(workerIdToSegmentsMap);
+  }
+
+  public void setWorkerMetadataList(List<WorkerMetadata> workerMetadataList) {
+    _workerMetadataList.clear();
+    _workerMetadataList.addAll(workerMetadataList);
+  }
+
+  public void setServerInstanceToWorkerIdMap(Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap) {
+    _serverInstanceToWorkerIdMap.clear();
+    _serverInstanceToWorkerIdMap.putAll(serverInstanceToWorkerIdMap);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/DispatchableSubPlan.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/DispatchableSubPlan.java
new file mode 100644
index 00000000000..734698c1223
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/DispatchableSubPlan.java
@@ -0,0 +1,74 @@
+/**
+ * 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.pinot.query.planner;
+
+import java.util.List;
+import java.util.Set;
+import org.apache.calcite.util.Pair;
+
+
+/**
+ * The {@code DispatchableSubPlan} is the dispatchable query execution plan from the result of
+ * {@link org.apache.pinot.query.planner.logical.LogicalPlanner} and
+ * {@link org.apache.pinot.query.planner.physical.PinotDispatchPlanner}.
+ *
+ * <p>QueryPlan should contain the necessary stage boundary information and the cross exchange information
+ * for:
+ * <ul>
+ *   <li>dispatch individual stages to executor.</li>
+ *   <li>instruction for stage executor to establish connection channels to other stages.</li>
+ *   <li>instruction for encoding data blocks & transferring between stages based on partitioning scheme.</li>
+ * </ul>
+ */
+public class DispatchableSubPlan {
+  private final List<Pair<Integer, String>> _queryResultFields;
+  private final List<DispatchablePlanFragment> _queryStageList;
+  private final Set<String> _tableNames;
+
+  public DispatchableSubPlan(List<Pair<Integer, String>> fields, List<DispatchablePlanFragment> queryStageList,
+      Set<String> tableNames) {
+    _queryResultFields = fields;
+    _queryStageList = queryStageList;
+    _tableNames = tableNames;
+  }
+
+  /**
+   * Get the list of stage plan root node.
+   * @return stage plan map.
+   */
+  public List<DispatchablePlanFragment> getQueryStageList() {
+    return _queryStageList;
+  }
+
+  /**
+   * Get the query result field.
+   * @return query result field.
+   */
+  public List<Pair<Integer, String>> getQueryResultFields() {
+    return _queryResultFields;
+  }
+
+  /**
+   * Get the table names.
+   * @return table names.
+   */
+  public Set<String> getTableNames() {
+    return _tableNames;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/ExplainPlanStageVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/ExplainPlanStageVisitor.java
deleted file mode 100644
index e0345590dc9..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/ExplainPlanStageVisitor.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.StageNodeVisitor;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
-
-
-/**
- * A visitor that converts a {@code QueryPlan} into a human-readable string representation.
- *
- * <p>It is currently not used programmatically and cannot be accessed by the user. Instead,
- * it is intended for use in manual debugging (e.g. setting breakpoints and calling QueryPlan#explain()).
- */
-public class ExplainPlanStageVisitor implements StageNodeVisitor<StringBuilder, ExplainPlanStageVisitor.Context> {
-
-  private final QueryPlan _queryPlan;
-
-  /**
-   * Explains the query plan.
-   *
-   * @see QueryPlan#explain()
-   * @param queryPlan the queryPlan to explain
-   * @return a String representation of the query plan tree
-   */
-  public static String explain(QueryPlan queryPlan) {
-    if (queryPlan.getQueryStageMap().isEmpty()) {
-      return "EMPTY";
-    }
-
-    // the root of a query plan always only has a single node
-    ServerInstance rootServer = queryPlan.getStageMetadataMap().get(0).getServerInstances().get(0);
-    return explainFrom(queryPlan, queryPlan.getQueryStageMap().get(0), rootServer);
-  }
-
-  /**
-   * Explains the query plan from a specific point in the subtree, taking {@code rootServer}
-   * as the node that is executing this sub-tree. This is helpful for debugging what is happening
-   * at a given point in time (for example, printing the tree that will be executed on a
-   * local node right before it is executed).
-   *
-   * @param queryPlan the entire query plan, including non-executed portions
-   * @param node the node to begin traversal
-   * @param rootServer the server instance that is executing this plan (should execute {@code node})
-   *
-   * @return a query plan associated with
-   */
-  public static String explainFrom(QueryPlan queryPlan, StageNode node, ServerInstance rootServer) {
-    final ExplainPlanStageVisitor visitor = new ExplainPlanStageVisitor(queryPlan);
-    return node
-        .visit(visitor, new Context(rootServer, "", "", new StringBuilder()))
-        .toString();
-  }
-
-  private ExplainPlanStageVisitor(QueryPlan queryPlan) {
-    _queryPlan = queryPlan;
-  }
-
-  private StringBuilder appendInfo(StageNode node, Context context) {
-    int stage = node.getStageId();
-    context._builder
-        .append(context._prefix)
-        .append('[')
-        .append(stage)
-        .append("]@")
-        .append(context._host.getHostname())
-        .append(':')
-        .append(context._host.getPort())
-        .append(' ')
-        .append(node.explain());
-    return context._builder;
-  }
-
-  private StringBuilder visitSimpleNode(StageNode node, Context context) {
-    appendInfo(node, context).append('\n');
-    return node.getInputs().get(0).visit(this, context.next(false, context._host));
-  }
-
-  @Override
-  public StringBuilder visitAggregate(AggregateNode node, Context context) {
-    return visitSimpleNode(node, context);
-  }
-
-  @Override
-  public StringBuilder visitFilter(FilterNode node, Context context) {
-    return visitSimpleNode(node, context);
-  }
-
-  @Override
-  public StringBuilder visitJoin(JoinNode node, Context context) {
-    appendInfo(node, context).append('\n');
-    node.getInputs().get(0).visit(this, context.next(true, context._host));
-    node.getInputs().get(1).visit(this, context.next(false, context._host));
-    return context._builder;
-  }
-
-  @Override
-  public StringBuilder visitMailboxReceive(MailboxReceiveNode node, Context context) {
-    appendInfo(node, context).append('\n');
-
-    MailboxSendNode sender = (MailboxSendNode) node.getSender();
-    int senderStageId = node.getSenderStageId();
-    StageMetadata metadata = _queryPlan.getStageMetadataMap().get(senderStageId);
-    Map<ServerInstance, Map<String, List<String>>> segments = metadata.getServerInstanceToSegmentsMap();
-
-    Iterator<ServerInstance> iterator = metadata.getServerInstances().iterator();
-    while (iterator.hasNext()) {
-      ServerInstance serverInstance = iterator.next();
-      if (segments.containsKey(serverInstance)) {
-        // always print out leaf stages
-        sender.visit(this, context.next(iterator.hasNext(), serverInstance));
-      } else {
-        if (!iterator.hasNext()) {
-          // always print out the last one
-          sender.visit(this, context.next(false, serverInstance));
-        } else {
-          // only print short version of the sender node
-          appendMailboxSend(sender, context.next(true, serverInstance))
-              .append(" (Subtree Omitted)")
-              .append('\n');
-        }
-      }
-    }
-    return context._builder;
-  }
-
-  @Override
-  public StringBuilder visitMailboxSend(MailboxSendNode node, Context context) {
-    appendMailboxSend(node, context).append('\n');
-    return node.getInputs().get(0).visit(this, context.next(false, context._host));
-  }
-
-  private StringBuilder appendMailboxSend(MailboxSendNode node, Context context) {
-    appendInfo(node, context);
-
-    int receiverStageId = node.getReceiverStageId();
-    List<ServerInstance> servers = _queryPlan.getStageMetadataMap().get(receiverStageId).getServerInstances();
-    context._builder.append("->");
-    String receivers = servers.stream()
-        .map(s -> s.getHostname() + ':' + s.getPort())
-        .map(s -> "[" + receiverStageId + "]@" + s)
-        .collect(Collectors.joining(",", "{", "}"));
-    return context._builder.append(receivers);
-  }
-
-  @Override
-  public StringBuilder visitProject(ProjectNode node, Context context) {
-    return visitSimpleNode(node, context);
-  }
-
-  @Override
-  public StringBuilder visitSort(SortNode node, Context context) {
-    return visitSimpleNode(node, context);
-  }
-
-  @Override
-  public StringBuilder visitTableScan(TableScanNode node, Context context) {
-    return appendInfo(node, context)
-        .append(' ')
-        .append(_queryPlan.getStageMetadataMap()
-            .get(node.getStageId())
-            .getServerInstanceToSegmentsMap()
-            .get(context._host))
-        .append('\n');
-  }
-
-  @Override
-  public StringBuilder visitValue(ValueNode node, Context context) {
-    return appendInfo(node, context);
-  }
-
-  static class Context {
-    final ServerInstance _host;
-    final String _prefix;
-    final String _childPrefix;
-    final StringBuilder _builder;
-
-    Context(ServerInstance host, String prefix, String childPrefix, StringBuilder builder) {
-      _host = host;
-      _prefix = prefix;
-      _childPrefix = childPrefix;
-      _builder = builder;
-    }
-
-    Context next(boolean hasMoreChildren, ServerInstance host) {
-      return new Context(
-          host,
-          hasMoreChildren ? _childPrefix + "├── " : _childPrefix + "└── ",
-          hasMoreChildren ? _childPrefix + "│   " : _childPrefix + "   ",
-          _builder
-      );
-    }
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PhysicalExplainPlanVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PhysicalExplainPlanVisitor.java
new file mode 100644
index 00000000000..b0b122b1765
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PhysicalExplainPlanVisitor.java
@@ -0,0 +1,262 @@
+/**
+ * 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.pinot.query.planner;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
+
+
+/**
+ * A visitor that converts a {@code QueryPlan} into a human-readable string representation.
+ *
+ * <p>It is getting used for getting the physical plan of the query.</p>
+ */
+public class PhysicalExplainPlanVisitor implements PlanNodeVisitor<StringBuilder, PhysicalExplainPlanVisitor.Context> {
+
+  private final DispatchableSubPlan _dispatchableSubPlan;
+
+  public PhysicalExplainPlanVisitor(DispatchableSubPlan dispatchableSubPlan) {
+    _dispatchableSubPlan = dispatchableSubPlan;
+  }
+
+  /**
+   * Explains the query plan.
+   *
+   * @see DispatchableSubPlan#explain()
+   * @param dispatchableSubPlan the queryPlan to explain
+   * @return a String representation of the query plan tree
+   */
+  public static String explain(DispatchableSubPlan dispatchableSubPlan) {
+    if (dispatchableSubPlan.getQueryStageList().isEmpty()) {
+      return "EMPTY";
+    }
+
+    // the root of a query plan always only has a single node
+    QueryServerInstance rootServer =
+        dispatchableSubPlan.getQueryStageList().get(0).getServerInstanceToWorkerIdMap()
+            .keySet().iterator().next();
+    return explainFrom(dispatchableSubPlan,
+        dispatchableSubPlan.getQueryStageList().get(0).getPlanFragment().getFragmentRoot(), rootServer);
+  }
+
+  /**
+   * Explains the query plan from a specific point in the subtree, taking {@code rootServer}
+   * as the node that is executing this sub-tree. This is helpful for debugging what is happening
+   * at a given point in time (for example, printing the tree that will be executed on a
+   * local node right before it is executed).
+   *
+   * @param dispatchableSubPlan the entire query plan, including non-executed portions
+   * @param node the node to begin traversal
+   * @param rootServer the server instance that is executing this plan (should execute {@code node})
+   *
+   * @return a query plan associated with
+   */
+  public static String explainFrom(DispatchableSubPlan dispatchableSubPlan, PlanNode node,
+      QueryServerInstance rootServer) {
+    final PhysicalExplainPlanVisitor visitor = new PhysicalExplainPlanVisitor(dispatchableSubPlan);
+    return node
+        .visit(visitor, new Context(rootServer, 0, "", "", new StringBuilder()))
+        .toString();
+  }
+
+  private StringBuilder appendInfo(PlanNode node, Context context) {
+    int planFragmentId = node.getPlanFragmentId();
+    context._builder
+        .append(context._prefix)
+        .append('[')
+        .append(planFragmentId)
+        .append("]@")
+        .append(context._host.getHostname())
+        .append(':')
+        .append(context._host.getQueryServicePort())
+        .append(' ')
+        .append(node.explain());
+    return context._builder;
+  }
+
+  private StringBuilder visitSimpleNode(PlanNode node, Context context) {
+    appendInfo(node, context).append('\n');
+    return node.getInputs().get(0).visit(this, context.next(false, context._host, context._workerId));
+  }
+
+  @Override
+  public StringBuilder visitAggregate(AggregateNode node, Context context) {
+    return visitSimpleNode(node, context);
+  }
+
+  @Override
+  public StringBuilder visitWindow(WindowNode node, Context context) {
+    return visitSimpleNode(node, context);
+  }
+
+  @Override
+  public StringBuilder visitSetOp(SetOpNode setOpNode, Context context) {
+    appendInfo(setOpNode, context).append('\n');
+    for (PlanNode input : setOpNode.getInputs()) {
+      input.visit(this, context.next(false, context._host, context._workerId));
+    }
+    return context._builder;
+  }
+
+  @Override
+  public StringBuilder visitExchange(ExchangeNode exchangeNode, Context context) {
+    throw new UnsupportedOperationException("ExchangeNode should not be visited");
+  }
+
+  @Override
+  public StringBuilder visitFilter(FilterNode node, Context context) {
+    return visitSimpleNode(node, context);
+  }
+
+  @Override
+  public StringBuilder visitJoin(JoinNode node, Context context) {
+    appendInfo(node, context).append('\n');
+    node.getInputs().get(0).visit(this, context.next(true, context._host, context._workerId));
+    node.getInputs().get(1).visit(this, context.next(false, context._host, context._workerId));
+    return context._builder;
+  }
+
+  @Override
+  public StringBuilder visitMailboxReceive(MailboxReceiveNode node, Context context) {
+    appendInfo(node, context).append('\n');
+
+    MailboxSendNode sender = (MailboxSendNode) node.getSender();
+    int senderStageId = node.getSenderStageId();
+    DispatchablePlanFragment dispatchablePlanFragment = _dispatchableSubPlan.getQueryStageList().get(senderStageId);
+    Map<Integer, Map<String, List<String>>> segments = dispatchablePlanFragment.getWorkerIdToSegmentsMap();
+
+    Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap =
+        dispatchablePlanFragment.getServerInstanceToWorkerIdMap();
+    Iterator<QueryServerInstance> iterator = serverInstanceToWorkerIdMap.keySet().iterator();
+    while (iterator.hasNext()) {
+      QueryServerInstance queryServerInstance = iterator.next();
+      for (int workerId : serverInstanceToWorkerIdMap.get(queryServerInstance)) {
+        if (segments.containsKey(workerId)) {
+          // always print out leaf stages
+          sender.visit(this, context.next(iterator.hasNext(), queryServerInstance, workerId));
+        } else {
+          if (!iterator.hasNext()) {
+            // always print out the last one
+            sender.visit(this, context.next(false, queryServerInstance, workerId));
+          } else {
+            // only print short version of the sender node
+            appendMailboxSend(sender, context.next(true, queryServerInstance, workerId))
+                .append(" (Subtree Omitted)")
+                .append('\n');
+          }
+        }
+      }
+    }
+    return context._builder;
+  }
+
+  @Override
+  public StringBuilder visitMailboxSend(MailboxSendNode node, Context context) {
+    appendMailboxSend(node, context).append('\n');
+    return node.getInputs().get(0).visit(this, context.next(false, context._host, context._workerId));
+  }
+
+  private StringBuilder appendMailboxSend(MailboxSendNode node, Context context) {
+    appendInfo(node, context);
+
+    int receiverStageId = node.getReceiverStageId();
+    Map<QueryServerInstance, List<Integer>> servers =
+        _dispatchableSubPlan.getQueryStageList().get(receiverStageId)
+            .getServerInstanceToWorkerIdMap();
+    context._builder.append("->");
+    String receivers = servers.entrySet().stream()
+        .map(PhysicalExplainPlanVisitor::stringifyQueryServerInstanceToWorkerIdsEntry)
+        .map(s -> "[" + receiverStageId + "]@" + s)
+        .collect(Collectors.joining(",", "{", "}"));
+    return context._builder.append(receivers);
+  }
+
+  @Override
+  public StringBuilder visitProject(ProjectNode node, Context context) {
+    return visitSimpleNode(node, context);
+  }
+
+  @Override
+  public StringBuilder visitSort(SortNode node, Context context) {
+    return visitSimpleNode(node, context);
+  }
+
+  @Override
+  public StringBuilder visitTableScan(TableScanNode node, Context context) {
+    return appendInfo(node, context)
+        .append(' ')
+        .append(_dispatchableSubPlan.getQueryStageList()
+            .get(node.getPlanFragmentId())
+            .getWorkerIdToSegmentsMap()
+            .get(context._host))
+        .append('\n');
+  }
+
+  @Override
+  public StringBuilder visitValue(ValueNode node, Context context) {
+    return appendInfo(node, context);
+  }
+
+  static class Context {
+    final QueryServerInstance _host;
+    final int _workerId;
+    final String _prefix;
+    final String _childPrefix;
+    final StringBuilder _builder;
+
+    Context(QueryServerInstance host, int workerId, String prefix, String childPrefix, StringBuilder builder) {
+      _host = host;
+      _workerId = workerId;
+      _prefix = prefix;
+      _childPrefix = childPrefix;
+      _builder = builder;
+    }
+
+    Context next(boolean hasMoreChildren, QueryServerInstance host, int workerId) {
+      return new Context(
+          host,
+          workerId,
+          hasMoreChildren ? _childPrefix + "├── " : _childPrefix + "└── ",
+          hasMoreChildren ? _childPrefix + "│   " : _childPrefix + "   ",
+          _builder
+      );
+    }
+  }
+
+  public static String stringifyQueryServerInstanceToWorkerIdsEntry(Map.Entry<QueryServerInstance, List<Integer>> e) {
+    return e.getKey() + "|" + e.getValue();
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlanFragment.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlanFragment.java
new file mode 100644
index 00000000000..ad0f846180e
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlanFragment.java
@@ -0,0 +1,61 @@
+/**
+ * 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.pinot.query.planner;
+
+import java.util.List;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+
+
+/**
+ * The {@code PlanFragment} is the logical sub query plan that should be scheduled together from the result of
+ * {@link org.apache.pinot.query.planner.logical.PlanFragmenter}.
+ *
+ */
+public class PlanFragment {
+
+  private final int _fragmentId;
+  private final PlanNode _fragmentRoot;
+  private final PlanFragmentMetadata _fragmentMetadata;
+
+  private final List<PlanFragment> _children;
+
+  public PlanFragment(int fragmentId, PlanNode fragmentRoot, PlanFragmentMetadata fragmentMetadata,
+      List<PlanFragment> children) {
+    _fragmentId = fragmentId;
+    _fragmentRoot = fragmentRoot;
+    _fragmentMetadata = fragmentMetadata;
+    _children = children;
+  }
+
+  public int getFragmentId() {
+    return _fragmentId;
+  }
+
+  public PlanNode getFragmentRoot() {
+    return _fragmentRoot;
+  }
+
+  public PlanFragmentMetadata getFragmentMetadata() {
+    return _fragmentMetadata;
+  }
+
+  public List<PlanFragment> getChildren() {
+    return _children;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlanFragmentMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlanFragmentMetadata.java
new file mode 100644
index 00000000000..0916a8b34ce
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlanFragmentMetadata.java
@@ -0,0 +1,28 @@
+/**
+ * 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.pinot.query.planner;
+
+/**
+ * Metadata for a plan fragment. This class won't leave the query planner/broker side.
+ */
+public class PlanFragmentMetadata {
+
+  public PlanFragmentMetadata() {
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlannerUtils.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlannerUtils.java
index 8cf8115a083..ad92eab6e89 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlannerUtils.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/PlannerUtils.java
@@ -36,8 +36,12 @@ private PlannerUtils() {
     // do not instantiate.
   }
 
-  public static boolean isRootStage(int stageId) {
-    return stageId == 0;
+  public static boolean isRootPlanFragment(int planFragmentId) {
+    return planFragmentId == 0;
+  }
+
+  public static boolean isFinalPlanFragment(int planFragmentId) {
+    return planFragmentId == 1;
   }
 
   public static String explainPlan(RelNode relRoot, SqlExplainFormat format, SqlExplainLevel explainLevel) {
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlan.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlan.java
index 651d259979f..2b762a26d29 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlan.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlan.java
@@ -18,70 +18,34 @@
  */
 package org.apache.pinot.query.planner;
 
-import java.util.List;
-import java.util.Map;
-import org.apache.calcite.util.Pair;
-import org.apache.pinot.query.planner.logical.LogicalPlanner;
-import org.apache.pinot.query.planner.stage.StageNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
 
 
 /**
- * The {@code QueryPlan} is the dispatchable query execution plan from the result of {@link LogicalPlanner}.
+ * The {@code QueryPlan} is the logical query plan from the result of
+ * {@link org.apache.pinot.query.planner.logical.PinotLogicalQueryPlanner}.
  *
- * <p>QueryPlan should contain the necessary stage boundary information and the cross exchange information
- * for:
- * <ul>
- *   <li>dispatch individual stages to executor.</li>
- *   <li>instruct stage executor to establish connection channels to other stages.</li>
- *   <li>encode data blocks for transfer between stages based on partitioning scheme.</li>
- * </ul>
  */
 public class QueryPlan {
-  private final List<Pair<Integer, String>> _queryResultFields;
-  private final Map<Integer, StageNode> _queryStageMap;
-  private final Map<Integer, StageMetadata> _stageMetadataMap;
+  private final PlanNode _planRoot;
+  private final QueryPlanMetadata _queryPlanMetadata;
 
-  public QueryPlan(List<Pair<Integer, String>> fields, Map<Integer, StageNode> queryStageMap,
-      Map<Integer, StageMetadata> stageMetadataMap) {
-    _queryResultFields = fields;
-    _queryStageMap = queryStageMap;
-    _stageMetadataMap = stageMetadataMap;
+  public QueryPlan(PlanNode queryPlanRoot, QueryPlanMetadata queryPlanMetadata) {
+    _planRoot = queryPlanRoot;
+    _queryPlanMetadata = queryPlanMetadata;
   }
 
   /**
-   * Get the map between stageID and the stage plan root node.
-   * @return stage plan map.
+   * Get the root node of the query plan.
    */
-  public Map<Integer, StageNode> getQueryStageMap() {
-    return _queryStageMap;
+  public PlanNode getPlanRoot() {
+    return _planRoot;
   }
 
   /**
-   * Get the stage metadata information.
-   * @return stage metadata info.
+   * Get the metadata of the query plan.
    */
-  public Map<Integer, StageMetadata> getStageMetadataMap() {
-    return _stageMetadataMap;
-  }
-
-  /**
-   * Get the query result field.
-   * @return query result field.
-   */
-  public List<Pair<Integer, String>> getQueryResultFields() {
-    return _queryResultFields;
-  }
-
-  /**
-   * Explains the {@code QueryPlan}
-   *
-   * @return a human-readable tree explaining the query plan
-   * @see ExplainPlanStageVisitor#explain(QueryPlan)
-   * @apiNote this is <b>NOT</b> identical to the SQL {@code EXPLAIN PLAN FOR} functionality
-   *          and is instead intended to be used by developers debugging during feature
-   *          development
-   */
-  public String explain() {
-    return ExplainPlanStageVisitor.explain(this);
+  public QueryPlanMetadata getPlanMetadata() {
+    return _queryPlanMetadata;
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlanMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlanMetadata.java
new file mode 100644
index 00000000000..9bd6267f228
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/QueryPlanMetadata.java
@@ -0,0 +1,63 @@
+/**
+ * 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.pinot.query.planner;
+
+import com.google.common.collect.ImmutableList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.calcite.util.Pair;
+
+
+/**
+ * QueryPlanMetadata contains the metadata of the {@code QueryPlan}.
+ * It contains the table names and the fields of the query result.
+ */
+public class QueryPlanMetadata {
+  private final Set<String> _tableNames;
+  private final List<Pair<Integer, String>> _fields;
+  private final Map<String, String> _customProperties;
+
+  public QueryPlanMetadata(Set<String> tableNames, ImmutableList<Pair<Integer, String>> fields) {
+    _tableNames = tableNames;
+    _fields = fields;
+    _customProperties = new HashMap<>();
+  }
+
+  public Map<String, String> getCustomProperties() {
+    return _customProperties;
+  }
+
+  /**
+   * Get the table names.
+   * @return table names.
+   */
+  public Set<String> getTableNames() {
+    return _tableNames;
+  }
+
+  /**
+   * Get the query result field.
+   * @return query result field.
+   */
+  public List<Pair<Integer, String>> getFields() {
+    return _fields;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/StageMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/StageMetadata.java
deleted file mode 100644
index 2f21a64c275..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/StageMetadata.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.pinot.core.routing.TimeBoundaryInfo;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-
-
-/**
- * The {@code StageMetadata} info contains the information for dispatching a particular stage.
- *
- * <p>It contains information aboute:
- * <ul>
- *   <li>the tables it is suppose to scan for</li>
- *   <li>the underlying segments a stage requires to execute upon.</li>
- *   <li>the server instances to which this stage should be execute on</li>
- * </ul>
- */
-public class StageMetadata implements Serializable {
-  private List<String> _scannedTables;
-
-  // used for assigning server/worker nodes.
-  private List<ServerInstance> _serverInstances;
-
-  // used for table scan stage.
-  private Map<ServerInstance, Map<String, List<String>>> _serverInstanceToSegmentsMap;
-
-  // time boundary info
-  private TimeBoundaryInfo _timeBoundaryInfo;
-
-
-  public StageMetadata() {
-    _scannedTables = new ArrayList<>();
-    _serverInstances = new ArrayList<>();
-    _serverInstanceToSegmentsMap = new HashMap<>();
-    _timeBoundaryInfo = null;
-  }
-
-  public void attach(StageNode stageNode) {
-    if (stageNode instanceof TableScanNode) {
-      _scannedTables.add(((TableScanNode) stageNode).getTableName());
-    }
-  }
-
-  public List<String> getScannedTables() {
-    return _scannedTables;
-  }
-
-  // -----------------------------------------------
-  // attached physical plan context.
-  // -----------------------------------------------
-
-  public Map<ServerInstance, Map<String, List<String>>> getServerInstanceToSegmentsMap() {
-    return _serverInstanceToSegmentsMap;
-  }
-
-  public void setServerInstanceToSegmentsMap(
-      Map<ServerInstance, Map<String, List<String>>> serverInstanceToSegmentsMap) {
-    _serverInstanceToSegmentsMap = serverInstanceToSegmentsMap;
-  }
-
-  public List<ServerInstance> getServerInstances() {
-    return _serverInstances;
-  }
-
-  public void setServerInstances(List<ServerInstance> serverInstances) {
-    _serverInstances = serverInstances;
-  }
-
-  public TimeBoundaryInfo getTimeBoundaryInfo() {
-    return _timeBoundaryInfo;
-  }
-
-  public void setTimeBoundaryInfo(TimeBoundaryInfo timeBoundaryInfo) {
-    _timeBoundaryInfo = timeBoundaryInfo;
-  }
-
-  @Override
-  public String toString() {
-    return "StageMetadata{" + "_scannedTables=" + _scannedTables + ", _serverInstances=" + _serverInstances
-        + ", _serverInstanceToSegmentsMap=" + _serverInstanceToSegmentsMap + ", _timeBoundaryInfo=" + _timeBoundaryInfo
-        + '}';
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/SubPlan.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/SubPlan.java
new file mode 100644
index 00000000000..f0af6a428d2
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/SubPlan.java
@@ -0,0 +1,60 @@
+/**
+ * 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.pinot.query.planner;
+
+import java.util.List;
+
+
+/**
+ * The {@code SubPlan} is the logical sub query plan that should be scheduled together from the result of
+ * {@link org.apache.pinot.query.planner.logical.SubPlanFragmenter}.
+ *
+ */
+public class SubPlan {
+  /**
+   * The root node of the sub query plan.
+   */
+  private final PlanFragment _subPlanRoot;
+  /**
+   * The metadata of the sub query plan.
+   */
+  private final SubPlanMetadata _subPlanMetadata;
+  /**
+   * The list of children sub query plans.
+   */
+  private final List<SubPlan> _children;
+
+  public SubPlan(PlanFragment subPlanRoot, SubPlanMetadata subPlanMetadata, List<SubPlan> children) {
+    _subPlanRoot = subPlanRoot;
+    _subPlanMetadata = subPlanMetadata;
+    _children = children;
+  }
+
+  public PlanFragment getSubPlanRoot() {
+    return _subPlanRoot;
+  }
+
+  public SubPlanMetadata getSubPlanMetadata() {
+    return _subPlanMetadata;
+  }
+
+  public List<SubPlan> getChildren() {
+    return _children;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/SubPlanMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/SubPlanMetadata.java
new file mode 100644
index 00000000000..ca48949275c
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/SubPlanMetadata.java
@@ -0,0 +1,53 @@
+/**
+ * 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.pinot.query.planner;
+
+import java.util.List;
+import java.util.Set;
+import org.apache.calcite.util.Pair;
+
+
+/**
+ * Metadata for a subplan. This class won't leave the query planner/broker side.
+ */
+public class SubPlanMetadata {
+
+  /**
+   * The set of tables that are scanned in this subplan.
+   */
+  private final Set<String> _tableNames;
+
+  /**
+   * The list of fields that are surfaced by this subplan. Only valid for SubPlan Id 0.
+   */
+  private List<Pair<Integer, String>> _fields;
+
+  public SubPlanMetadata(Set<String> tableNames, List<Pair<Integer, String>> fields) {
+    _tableNames = tableNames;
+    _fields = fields;
+  }
+
+  public List<Pair<Integer, String>> getFields() {
+    return _fields;
+  }
+
+  public Set<String> getTableNames() {
+    return _tableNames;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/LiteralHintUtils.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/LiteralHintUtils.java
new file mode 100644
index 00000000000..21441b6d43f
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/LiteralHintUtils.java
@@ -0,0 +1,111 @@
+/**
+ * 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.pinot.query.planner.logical;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.util.NlsString;
+import org.apache.calcite.util.Pair;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.request.Literal;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class LiteralHintUtils {
+  private LiteralHintUtils() {
+    // do not instantiate.
+  }
+
+  public static String literalMapToHintString(Map<Pair<Integer, Integer>, RexExpression.Literal> literals) {
+    List<String> literalStrings = new ArrayList<>(literals.size());
+    for (Map.Entry<Pair<Integer, Integer>, RexExpression.Literal> e : literals.entrySet()) {
+      // individual literal parts are joined with `|`
+      literalStrings.add(String.format("%d|%d|%s|%s", e.getKey().left, e.getKey().right,
+          e.getValue().getDataType().name(), e.getValue().getValue()));
+    }
+    // semi-colon is used to separate between encoded literals
+    return "{" + StringUtils.join(literalStrings, ";") + "}";
+  }
+
+  public static Map<Integer, Map<Integer, Literal>> hintStringToLiteralMap(String literalString) {
+    Map<Integer, Map<Integer, Literal>> aggCallToLiteralArgsMap = new HashMap<>();
+    if (StringUtils.isNotEmpty(literalString) && !"{}".equals(literalString)) {
+      String[] literalStringArr = literalString.substring(1, literalString.length() - 1).split(";");
+      for (String literalStr : literalStringArr) {
+        String[] literalStrParts = literalStr.split("\\|", 4);
+        int aggIdx = Integer.parseInt(literalStrParts[0]);
+        int argListIdx = Integer.parseInt(literalStrParts[1]);
+        String dataTypeNameStr = literalStrParts[2];
+        String valueStr = literalStrParts[3];
+        Map<Integer, Literal> literalArgs = aggCallToLiteralArgsMap.computeIfAbsent(aggIdx, i -> new HashMap<>());
+        literalArgs.put(argListIdx, stringToLiteral(dataTypeNameStr, valueStr));
+      }
+    }
+    return aggCallToLiteralArgsMap;
+  }
+
+  private static Literal stringToLiteral(String dataTypeStr, String valueStr) {
+    FieldSpec.DataType dataType = FieldSpec.DataType.valueOf(dataTypeStr);
+    switch (dataType) {
+      case FLOAT:
+      case DOUBLE:
+        return Literal.doubleValue(Double.parseDouble(valueStr));
+      case INT:
+        return Literal.intValue(Integer.parseInt(valueStr));
+      case LONG:
+        return Literal.longValue(Long.parseLong(valueStr));
+      case STRING:
+        return Literal.stringValue(valueStr);
+      case BOOLEAN:
+        return Literal.boolValue(BooleanUtils.toBoolean(valueStr));
+      default:
+        throw new UnsupportedOperationException("Unsupported RexLiteral type: " + dataTypeStr);
+    }
+  }
+
+  public static RexExpression.Literal rexLiteralToLiteral(RexLiteral rexLiteral) {
+    SqlTypeName sqlTypeName = rexLiteral.getTypeName();
+    Object value = rexLiteral.getValue();
+    switch (sqlTypeName) {
+      case DECIMAL:
+      case REAL:
+      case DOUBLE:
+        return new RexExpression.Literal(FieldSpec.DataType.DOUBLE, value == null ? null
+            : ((BigDecimal) value).doubleValue());
+      case INTEGER:
+      case BIGINT:
+        return new RexExpression.Literal(FieldSpec.DataType.LONG, value == null ? null
+            : ((BigDecimal) value).longValue());
+      case BOOLEAN:
+        return new RexExpression.Literal(FieldSpec.DataType.BOOLEAN, value);
+      case CHAR:
+      case VARCHAR:
+        return new RexExpression.Literal(FieldSpec.DataType.STRING, value == null ? null
+            : (value instanceof NlsString ? ((NlsString) value).getValue() : value.toString()));
+      default:
+        throw new UnsupportedOperationException("Unsupported RexLiteral type: " + rexLiteral.getTypeName());
+    }
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/LiteralValueNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/LiteralValueNode.java
new file mode 100644
index 00000000000..4239108c4cb
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/LiteralValueNode.java
@@ -0,0 +1,56 @@
+/**
+ * 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.pinot.query.planner.logical;
+
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.plannode.AbstractPlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+
+
+/**
+ * TODO: A placeholder class for literal values coming after SubPlan execution.
+ * Expected to have drastic change in the future.
+ */
+public class LiteralValueNode extends AbstractPlanNode {
+
+  private DataTable _dataTable;
+
+  public LiteralValueNode(DataSchema dataSchema) {
+    super(-1, dataSchema);
+  }
+
+  public void setDataTable(DataTable dataTable) {
+    _dataTable = dataTable;
+  }
+
+  public DataTable getDataTable() {
+    return _dataTable;
+  }
+
+  @Override
+  public String explain() {
+    return "LITERAL_VALUE";
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    throw new UnsupportedOperationException("LiteralValueNode visit is not supported yet");
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/PinotLogicalQueryPlanner.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/PinotLogicalQueryPlanner.java
new file mode 100644
index 00000000000..924a580fa53
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/PinotLogicalQueryPlanner.java
@@ -0,0 +1,145 @@
+/**
+ * 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.pinot.query.planner.logical;
+
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelRoot;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.pinot.query.planner.PlanFragment;
+import org.apache.pinot.query.planner.PlanFragmentMetadata;
+import org.apache.pinot.query.planner.QueryPlan;
+import org.apache.pinot.query.planner.QueryPlanMetadata;
+import org.apache.pinot.query.planner.SubPlan;
+import org.apache.pinot.query.planner.SubPlanMetadata;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+
+
+/**
+ * PinotLogicalQueryPlanner walks top-down from {@link RelRoot} and construct a forest of trees with {@link PlanNode}.
+ *
+ * This class is non-threadsafe. Do not reuse the stage planner for multiple query plans.
+ */
+public class PinotLogicalQueryPlanner {
+
+  /**
+   * planQuery achieves 2 objective:
+   *   1. convert Calcite's {@link RelNode} to Pinot's {@link PlanNode} format from the {@link RelRoot} of Calcite's
+   *   LogicalPlanner result.
+   *   2. while walking Calcite's {@link RelNode} tree, populate {@link QueryPlanMetadata}.
+   *
+   * @param relRoot relational plan root.
+   * @return dispatchable plan.
+   */
+  public QueryPlan planQuery(RelRoot relRoot) {
+    RelNode relRootNode = relRoot.rel;
+    // Walk through RelNode tree and construct a StageNode tree.
+    PlanNode globalRoot = relNodeToStageNode(relRootNode);
+    QueryPlanMetadata queryPlanMetadata =
+        new QueryPlanMetadata(RelToPlanNodeConverter.getTableNamesFromRelRoot(relRootNode), relRoot.fields);
+    return new QueryPlan(globalRoot, queryPlanMetadata);
+  }
+
+  /**
+   * Convert the Pinot plan from {@link PinotLogicalQueryPlanner#planQuery(RelRoot)} into a {@link SubPlan}.
+   *
+   * @param queryPlan relational plan root.
+   * @return dispatchable plan.
+   */
+  public SubPlan makePlan(QueryPlan queryPlan) {
+    PlanNode globalRoot = queryPlan.getPlanRoot();
+
+    // Fragment the stage tree into multiple SubPlans.
+    SubPlanFragmenter.Context subPlanContext = new SubPlanFragmenter.Context();
+    subPlanContext._subPlanIdToRootNodeMap.put(0, globalRoot);
+    subPlanContext._subPlanIdToMetadataMap.put(0,
+        new SubPlanMetadata(queryPlan.getPlanMetadata().getTableNames(), queryPlan.getPlanMetadata().getFields()));
+    globalRoot.visit(SubPlanFragmenter.INSTANCE, subPlanContext);
+
+    Map<Integer, SubPlan> subPlanMap = new HashMap<>();
+    for (Map.Entry<Integer, PlanNode> subPlanEntry : subPlanContext._subPlanIdToRootNodeMap.entrySet()) {
+      int subPlanId = subPlanEntry.getKey();
+      PlanNode subPlanRoot = subPlanEntry.getValue();
+      PlanFragmenter.Context planFragmentContext = new PlanFragmenter.Context();
+      planFragmentContext._planFragmentIdToRootNodeMap.put(1,
+          new PlanFragment(1, subPlanRoot, new PlanFragmentMetadata(), new ArrayList<>()));
+      subPlanRoot = subPlanRoot.visit(PlanFragmenter.INSTANCE, planFragmentContext);
+
+      // Sub plan root needs to send results back to the Broker ROOT, a.k.a. the client response node. the last stage
+      // only has one
+      // receiver so doesn't matter what the exchange type is. setting it to SINGLETON by default.
+      PlanNode subPlanRootSenderNode =
+          new MailboxSendNode(subPlanRoot.getPlanFragmentId(), subPlanRoot.getDataSchema(),
+              0, RelDistribution.Type.RANDOM_DISTRIBUTED, PinotRelExchangeType.getDefaultExchangeType(), null, null,
+              false);
+      subPlanRootSenderNode.addInput(subPlanRoot);
+
+      PlanNode subPlanRootReceiverNode =
+          new MailboxReceiveNode(0, subPlanRoot.getDataSchema(), subPlanRoot.getPlanFragmentId(),
+              RelDistribution.Type.RANDOM_DISTRIBUTED, PinotRelExchangeType.getDefaultExchangeType(), null, null,
+              false, false, subPlanRootSenderNode);
+      subPlanRoot = subPlanRootReceiverNode;
+      PlanFragment planFragment1 = planFragmentContext._planFragmentIdToRootNodeMap.get(1);
+      planFragmentContext._planFragmentIdToRootNodeMap.put(1,
+          new PlanFragment(1, subPlanRootSenderNode, planFragment1.getFragmentMetadata(), planFragment1.getChildren()));
+      PlanFragment rootPlanFragment
+          = new PlanFragment(subPlanRoot.getPlanFragmentId(), subPlanRoot, new PlanFragmentMetadata(),
+          ImmutableList.of(planFragmentContext._planFragmentIdToRootNodeMap.get(1)));
+      planFragmentContext._planFragmentIdToRootNodeMap.put(0, rootPlanFragment);
+      for (Map.Entry<Integer, List<Integer>> planFragmentToChildrenEntry
+          : planFragmentContext._planFragmentIdToChildrenMap.entrySet()) {
+        int planFragmentId = planFragmentToChildrenEntry.getKey();
+        List<Integer> planFragmentChildren = planFragmentToChildrenEntry.getValue();
+        for (int planFragmentChild : planFragmentChildren) {
+          planFragmentContext._planFragmentIdToRootNodeMap.get(planFragmentId).getChildren()
+              .add(planFragmentContext._planFragmentIdToRootNodeMap.get(planFragmentChild));
+        }
+      }
+      SubPlan subPlan = new SubPlan(planFragmentContext._planFragmentIdToRootNodeMap.get(0),
+          subPlanContext._subPlanIdToMetadataMap.get(0), new ArrayList<>());
+      subPlanMap.put(subPlanId, subPlan);
+    }
+    for (Map.Entry<Integer, List<Integer>> subPlanToChildrenEntry : subPlanContext._subPlanIdToChildrenMap.entrySet()) {
+      int subPlanId = subPlanToChildrenEntry.getKey();
+      List<Integer> subPlanChildren = subPlanToChildrenEntry.getValue();
+      for (int subPlanChild : subPlanChildren) {
+        subPlanMap.get(subPlanId).getChildren().add(subPlanMap.get(subPlanChild));
+      }
+    }
+    return subPlanMap.get(0);
+  }
+
+  // non-threadsafe
+  // TODO: add dataSchema (extracted from RelNode schema) to the StageNode.
+  private PlanNode relNodeToStageNode(RelNode node) {
+    PlanNode planNode = RelToPlanNodeConverter.toStageNode(node, -1);
+    List<RelNode> inputs = node.getInputs();
+    for (RelNode input : inputs) {
+      planNode.addInput(relNodeToStageNode(input));
+    }
+    return planNode;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/PlanFragmenter.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/PlanFragmenter.java
new file mode 100644
index 00000000000..8ea16e88281
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/PlanFragmenter.java
@@ -0,0 +1,177 @@
+/**
+ * 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.pinot.query.planner.logical;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.pinot.query.planner.PlanFragment;
+import org.apache.pinot.query.planner.PlanFragmentMetadata;
+import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
+import org.apache.pinot.query.planner.partitioning.KeySelector;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+
+
+/**
+ * PlanFragmenter is an implementation of {@link PlanNodeVisitor} to fragment a
+ * {@link org.apache.pinot.query.planner.SubPlan} into multiple {@link PlanFragment}.
+ *
+ * The fragmenting process is as follows:
+ * 1. Traverse the plan tree in a depth-first manner;
+ * 2. For each node, if it is a PlanFragment splittable ExchangeNode, split it into {@link MailboxReceiveNode} and
+ * {@link MailboxSendNode} pair;
+ * 3. Assign current PlanFragment Id to {@link MailboxReceiveNode};
+ * 4. Increment current PlanFragment Id by one and assign it to the {@link MailboxSendNode}.
+ */
+public class PlanFragmenter implements PlanNodeVisitor<PlanNode, PlanFragmenter.Context> {
+  public static final PlanFragmenter INSTANCE = new PlanFragmenter();
+
+  private PlanNode process(PlanNode node, Context context) {
+    node.setPlanFragmentId(context._currentPlanFragmentId);
+    List<PlanNode> inputs = node.getInputs();
+    for (int i = 0; i < inputs.size(); i++) {
+      context._previousPlanFragmentId = node.getPlanFragmentId();
+      inputs.set(i, inputs.get(i).visit(this, context));
+    }
+    return node;
+  }
+
+  @Override
+  public PlanNode visitAggregate(AggregateNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitFilter(FilterNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitJoin(JoinNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitMailboxReceive(MailboxReceiveNode node, Context context) {
+    throw new UnsupportedOperationException("MailboxReceiveNode should not be visited by PlanNodeFragmenter");
+  }
+
+  @Override
+  public PlanNode visitMailboxSend(MailboxSendNode node, Context context) {
+    throw new UnsupportedOperationException("MailboxSendNode should not be visited by PlanNodeFragmenter");
+  }
+
+  @Override
+  public PlanNode visitProject(ProjectNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitSort(SortNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitTableScan(TableScanNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitValue(ValueNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitWindow(WindowNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitSetOp(SetOpNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitExchange(ExchangeNode node, Context context) {
+    if (!isPlanFragmentSplitter(node)) {
+      return process(node, context);
+    }
+    int currentPlanFragmentId = context._previousPlanFragmentId;
+    int nextPlanFragmentId = ++context._currentPlanFragmentId;
+    PlanNode nextPlanFragmentRoot = node.getInputs().get(0).visit(this, context);
+
+    List<Integer> distributionKeys = node.getDistributionKeys();
+    RelDistribution.Type distributionType = node.getDistributionType();
+    PinotRelExchangeType exchangeType = node.getExchangeType();
+
+    // make an exchange sender and receiver node pair
+    // only HASH_DISTRIBUTED requires a partition key selector; so all other types (SINGLETON and BROADCAST)
+    // of exchange will not carry a partition key selector.
+    KeySelector<Object[], Object[]> keySelector = distributionType == RelDistribution.Type.HASH_DISTRIBUTED
+        ? new FieldSelectionKeySelector(distributionKeys) : null;
+
+    PlanNode mailboxSender =
+        new MailboxSendNode(nextPlanFragmentId, nextPlanFragmentRoot.getDataSchema(),
+            currentPlanFragmentId, distributionType, exchangeType, keySelector, node.getCollations(),
+            node.isSortOnSender());
+    PlanNode mailboxReceiver = new MailboxReceiveNode(currentPlanFragmentId, nextPlanFragmentRoot.getDataSchema(),
+        nextPlanFragmentId, distributionType, exchangeType, keySelector,
+        node.getCollations(), node.isSortOnSender(), node.isSortOnReceiver(), mailboxSender);
+    mailboxSender.addInput(nextPlanFragmentRoot);
+
+    context._planFragmentIdToRootNodeMap.put(nextPlanFragmentId,
+        new PlanFragment(nextPlanFragmentId, mailboxSender, new PlanFragmentMetadata(), new ArrayList<>()));
+    if (!context._planFragmentIdToChildrenMap.containsKey(currentPlanFragmentId)) {
+      context._planFragmentIdToChildrenMap.put(currentPlanFragmentId, new ArrayList<>());
+    }
+    context._planFragmentIdToChildrenMap.get(currentPlanFragmentId).add(nextPlanFragmentId);
+
+    return mailboxReceiver;
+  }
+
+  private boolean isPlanFragmentSplitter(PlanNode node) {
+    return ((ExchangeNode) node).getExchangeType() != PinotRelExchangeType.SUB_PLAN;
+  }
+
+  public static class Context {
+
+    // PlanFragment ID starts with 1, 0 will be reserved for ROOT PlanFragment.
+    Integer _currentPlanFragmentId = 1;
+    Integer _previousPlanFragmentId = 1;
+    Map<Integer, PlanFragment> _planFragmentIdToRootNodeMap = new HashMap<>();
+
+    Map<Integer, List<Integer>> _planFragmentIdToChildrenMap = new HashMap<>();
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RelToStageConverter.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RelToPlanNodeConverter.java
similarity index 51%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RelToStageConverter.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RelToPlanNodeConverter.java
index 80218c64424..20181be6e96 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RelToStageConverter.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RelToPlanNodeConverter.java
@@ -18,11 +18,21 @@
  */
 package org.apache.pinot.query.planner.logical;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
+import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.rel.RelCollation;
+import org.apache.calcite.rel.RelFieldCollation;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Exchange;
 import org.apache.calcite.rel.core.JoinInfo;
 import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rel.core.SetOp;
+import org.apache.calcite.rel.core.SortExchange;
+import org.apache.calcite.rel.hint.PinotHintOptions;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
 import org.apache.calcite.rel.logical.LogicalAggregate;
 import org.apache.calcite.rel.logical.LogicalFilter;
 import org.apache.calcite.rel.logical.LogicalJoin;
@@ -30,29 +40,37 @@
 import org.apache.calcite.rel.logical.LogicalSort;
 import org.apache.calcite.rel.logical.LogicalTableScan;
 import org.apache.calcite.rel.logical.LogicalValues;
+import org.apache.calcite.rel.logical.LogicalWindow;
+import org.apache.calcite.rel.logical.PinotLogicalExchange;
+import org.apache.calcite.rel.logical.PinotLogicalSortExchange;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeField;
 import org.apache.calcite.rel.type.RelRecordType;
+import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.PinotDataType;
 import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
 import org.apache.pinot.spi.data.FieldSpec;
 
 
 /**
- * The {@code StageNodeConverter} converts a logical {@link RelNode} to a {@link StageNode}.
+ * The {@link RelToPlanNodeConverter} converts a logical {@link RelNode} to a {@link PlanNode}.
  */
-public final class RelToStageConverter {
+public final class RelToPlanNodeConverter {
 
-  private RelToStageConverter() {
+  private RelToPlanNodeConverter() {
     // do not instantiate.
   }
 
@@ -64,7 +82,7 @@ private RelToStageConverter() {
    * @param node relational node
    * @return stage node.
    */
-  public static StageNode toStageNode(RelNode node, int currentStageId) {
+  public static PlanNode toStageNode(RelNode node, int currentStageId) {
     if (node instanceof LogicalTableScan) {
       return convertLogicalTableScan((LogicalTableScan) node, currentStageId);
     } else if (node instanceof LogicalJoin) {
@@ -79,52 +97,98 @@ public static StageNode toStageNode(RelNode node, int currentStageId) {
       return convertLogicalSort((LogicalSort) node, currentStageId);
     } else if (node instanceof LogicalValues) {
       return convertLogicalValues((LogicalValues) node, currentStageId);
+    } else if (node instanceof LogicalWindow) {
+      return convertLogicalWindow((LogicalWindow) node, currentStageId);
+    } else if (node instanceof SetOp) {
+      return convertLogicalSetOp((SetOp) node, currentStageId);
+    } else if (node instanceof Exchange) {
+      return convertLogicalExchange((Exchange) node, currentStageId);
     } else {
       throw new UnsupportedOperationException("Unsupported logical plan node: " + node);
     }
   }
 
-  private static StageNode convertLogicalValues(LogicalValues node, int currentStageId) {
+  private static PlanNode convertLogicalExchange(Exchange node, int currentStageId) {
+    RelCollation collation = null;
+    boolean isSortOnSender = false;
+    boolean isSortOnReceiver = false;
+    PinotRelExchangeType exchangeType = PinotRelExchangeType.getDefaultExchangeType();
+    if (node instanceof SortExchange) {
+      collation = ((SortExchange) node).getCollation();
+      if (node instanceof PinotLogicalSortExchange) {
+        // These flags only take meaning if the collation is not null or empty
+        isSortOnSender = ((PinotLogicalSortExchange) node).isSortOnSender();
+        isSortOnReceiver = ((PinotLogicalSortExchange) node).isSortOnReceiver();
+        exchangeType = ((PinotLogicalSortExchange) node).getExchangeType();
+      }
+    } else {
+      if (node instanceof PinotLogicalExchange) {
+        exchangeType = ((PinotLogicalExchange) node).getExchangeType();
+      }
+    }
+    List<RelFieldCollation> fieldCollations = (collation == null) ? null : collation.getFieldCollations();
+
+    // Compute all the tables involved under this exchange node
+    Set<String> tableNames = getTableNamesFromRelRoot(node);
+
+    return new ExchangeNode(currentStageId, toDataSchema(node.getRowType()), exchangeType,
+        tableNames, node.getDistribution(), fieldCollations, isSortOnSender, isSortOnReceiver);
+  }
+
+  private static PlanNode convertLogicalSetOp(SetOp node, int currentStageId) {
+    return new SetOpNode(SetOpNode.SetOpType.fromObject(node), currentStageId, toDataSchema(node.getRowType()),
+        node.all);
+  }
+
+  private static PlanNode convertLogicalValues(LogicalValues node, int currentStageId) {
     return new ValueNode(currentStageId, toDataSchema(node.getRowType()), node.tuples);
   }
 
-  private static StageNode convertLogicalSort(LogicalSort node, int currentStageId) {
+  private static PlanNode convertLogicalWindow(LogicalWindow node, int currentStageId) {
+    return new WindowNode(currentStageId, node.groups, node.constants, toDataSchema(node.getRowType()));
+  }
+
+  private static PlanNode convertLogicalSort(LogicalSort node, int currentStageId) {
     int fetch = RexExpressionUtils.getValueAsInt(node.fetch);
     int offset = RexExpressionUtils.getValueAsInt(node.offset);
     return new SortNode(currentStageId, node.getCollation().getFieldCollations(), fetch, offset,
         toDataSchema(node.getRowType()));
   }
 
-  private static StageNode convertLogicalAggregate(LogicalAggregate node, int currentStageId) {
+  private static PlanNode convertLogicalAggregate(LogicalAggregate node, int currentStageId) {
     return new AggregateNode(currentStageId, toDataSchema(node.getRowType()), node.getAggCallList(),
-        node.getGroupSet());
+        RexExpression.toRexInputRefs(node.getGroupSet()), node.getHints());
   }
 
-  private static StageNode convertLogicalProject(LogicalProject node, int currentStageId) {
+  private static PlanNode convertLogicalProject(LogicalProject node, int currentStageId) {
     return new ProjectNode(currentStageId, toDataSchema(node.getRowType()), node.getProjects());
   }
 
-  private static StageNode convertLogicalFilter(LogicalFilter node, int currentStageId) {
+  private static PlanNode convertLogicalFilter(LogicalFilter node, int currentStageId) {
     return new FilterNode(currentStageId, toDataSchema(node.getRowType()), node.getCondition());
   }
 
-  private static StageNode convertLogicalTableScan(LogicalTableScan node, int currentStageId) {
+  private static PlanNode convertLogicalTableScan(LogicalTableScan node, int currentStageId) {
     String tableName = node.getTable().getQualifiedName().get(0);
     List<String> columnNames =
         node.getRowType().getFieldList().stream().map(RelDataTypeField::getName).collect(Collectors.toList());
-    return new TableScanNode(currentStageId, toDataSchema(node.getRowType()), tableName, columnNames);
+    return new TableScanNode(currentStageId, toDataSchema(node.getRowType()), node.getHints(), tableName, columnNames);
   }
 
-  private static StageNode convertLogicalJoin(LogicalJoin node, int currentStageId) {
+  private static PlanNode convertLogicalJoin(LogicalJoin node, int currentStageId) {
     JoinRelType joinType = node.getJoinType();
 
     // Parse out all equality JOIN conditions
     JoinInfo joinInfo = node.analyzeCondition();
-    FieldSelectionKeySelector leftFieldSelectionKeySelector = new FieldSelectionKeySelector(joinInfo.leftKeys);
-    FieldSelectionKeySelector rightFieldSelectionKeySelector = new FieldSelectionKeySelector(joinInfo.rightKeys);
-    return new JoinNode(currentStageId, toDataSchema(node.getRowType()), joinType,
-        new JoinNode.JoinKeys(leftFieldSelectionKeySelector, rightFieldSelectionKeySelector),
-        joinInfo.nonEquiConditions.stream().map(RexExpression::toRexExpression).collect(Collectors.toList()));
+    JoinNode.JoinKeys joinKeys = new JoinNode.JoinKeys(new FieldSelectionKeySelector(joinInfo.leftKeys),
+        new FieldSelectionKeySelector(joinInfo.rightKeys));
+    List<RexExpression> joinClause =
+        joinInfo.nonEquiConditions.stream().map(RexExpression::toRexExpression).collect(Collectors.toList());
+    boolean isColocatedJoin =
+        PinotHintStrategyTable.isHintOptionTrue(node.getHints(), PinotHintOptions.JOIN_HINT_OPTIONS,
+            PinotHintOptions.JoinHintOptions.IS_COLOCATED_BY_JOIN_KEYS);
+    return new JoinNode(currentStageId, toDataSchema(node.getRowType()), toDataSchema(node.getLeft().getRowType()),
+        toDataSchema(node.getRight().getRowType()), joinType, joinKeys, joinClause, isColocatedJoin);
   }
 
   private static DataSchema toDataSchema(RelDataType rowType) {
@@ -142,34 +206,39 @@ private static DataSchema toDataSchema(RelDataType rowType) {
   }
 
   public static DataSchema.ColumnDataType convertToColumnDataType(RelDataType relDataType) {
-    switch (relDataType.getSqlTypeName()) {
+    SqlTypeName sqlTypeName = relDataType.getSqlTypeName();
+    boolean isArray = sqlTypeName == SqlTypeName.ARRAY;
+    if (isArray) {
+      sqlTypeName = relDataType.getComponentType().getSqlTypeName();
+    }
+    switch (sqlTypeName) {
       case BOOLEAN:
-        return DataSchema.ColumnDataType.BOOLEAN;
+        return isArray ? DataSchema.ColumnDataType.BOOLEAN_ARRAY : DataSchema.ColumnDataType.BOOLEAN;
       case TINYINT:
       case SMALLINT:
       case INTEGER:
-        return DataSchema.ColumnDataType.INT;
+        return isArray ? DataSchema.ColumnDataType.INT_ARRAY : DataSchema.ColumnDataType.INT;
       case BIGINT:
-        return DataSchema.ColumnDataType.LONG;
+        return isArray ? DataSchema.ColumnDataType.LONG_ARRAY : DataSchema.ColumnDataType.LONG;
       case DECIMAL:
         return resolveDecimal(relDataType);
       case FLOAT:
-        return DataSchema.ColumnDataType.FLOAT;
       case REAL:
+        return isArray ? DataSchema.ColumnDataType.FLOAT_ARRAY : DataSchema.ColumnDataType.FLOAT;
       case DOUBLE:
-        return DataSchema.ColumnDataType.DOUBLE;
+        return isArray ? DataSchema.ColumnDataType.DOUBLE_ARRAY : DataSchema.ColumnDataType.DOUBLE;
       case DATE:
       case TIME:
       case TIMESTAMP:
-        return DataSchema.ColumnDataType.TIMESTAMP;
+        return isArray ? DataSchema.ColumnDataType.TIMESTAMP_ARRAY : DataSchema.ColumnDataType.TIMESTAMP;
       case CHAR:
       case VARCHAR:
-        return DataSchema.ColumnDataType.STRING;
+        return isArray ? DataSchema.ColumnDataType.STRING_ARRAY : DataSchema.ColumnDataType.STRING;
       case OTHER:
         return DataSchema.ColumnDataType.OBJECT;
       case BINARY:
       case VARBINARY:
-        return DataSchema.ColumnDataType.BYTES;
+        return isArray ? DataSchema.ColumnDataType.BYTES_ARRAY : DataSchema.ColumnDataType.BYTES;
       default:
         return DataSchema.ColumnDataType.BYTES;
     }
@@ -216,4 +285,16 @@ private static DataSchema.ColumnDataType resolveDecimal(RelDataType relDataType)
       }
     }
   }
+
+  public static Set<String> getTableNamesFromRelRoot(RelNode relRoot) {
+    Set<String> tableNames = new HashSet<>();
+    List<String> qualifiedTableNames = RelOptUtil.findAllTableQualifiedNames(relRoot);
+    for (String qualifiedTableName : qualifiedTableNames) {
+      // Calcite encloses table and schema names in square brackets to properly quote and delimit them in SQL
+      // statements, particularly to handle cases when they contain special characters or reserved keywords.
+      String tableName = qualifiedTableName.replaceAll("^\\[(.*)\\]$", "$1");
+      tableNames.add(tableName);
+    }
+    return tableNames;
+  }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpression.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpression.java
index 7ef42ff7c98..ab78924548c 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpression.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpression.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.query.planner.logical;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.calcite.rel.core.AggregateCall;
@@ -47,7 +48,7 @@ static RexExpression toRexExpression(RexNode rexNode) {
       return new RexExpression.InputRef(((RexInputRef) rexNode).getIndex());
     } else if (rexNode instanceof RexLiteral) {
       RexLiteral rexLiteral = ((RexLiteral) rexNode);
-      FieldSpec.DataType dataType = RelToStageConverter.convertToFieldSpecDataType(rexLiteral.getType());
+      FieldSpec.DataType dataType = RelToPlanNodeConverter.convertToFieldSpecDataType(rexLiteral.getType());
       return new RexExpression.Literal(dataType, toRexValue(dataType, rexLiteral.getValue()));
     } else if (rexNode instanceof RexCall) {
       RexCall rexCall = (RexCall) rexNode;
@@ -69,7 +70,7 @@ static RexExpression toRexExpression(RexCall rexCall) {
         List<RexExpression> operands =
             rexCall.getOperands().stream().map(RexExpression::toRexExpression).collect(Collectors.toList());
         return new RexExpression.FunctionCall(rexCall.getKind(),
-            RelToStageConverter.convertToFieldSpecDataType(rexCall.getType()),
+            RelToPlanNodeConverter.convertToFieldSpecDataType(rexCall.getType()),
             rexCall.getOperator().getName(), operands);
     }
   }
@@ -77,28 +78,40 @@ static RexExpression toRexExpression(RexCall rexCall) {
   static RexExpression toRexExpression(AggregateCall aggCall) {
     List<RexExpression> operands = aggCall.getArgList().stream().map(InputRef::new).collect(Collectors.toList());
     return new RexExpression.FunctionCall(aggCall.getAggregation().getKind(),
-        RelToStageConverter.convertToFieldSpecDataType(aggCall.getType()), aggCall.getAggregation().getName(),
+        RelToPlanNodeConverter.convertToFieldSpecDataType(aggCall.getType()), aggCall.getAggregation().getName(),
         operands);
   }
 
-  static Object toRexValue(FieldSpec.DataType dataType, Comparable value) {
+  @Nullable
+  static Object toRexValue(FieldSpec.DataType dataType, @Nullable Comparable<?> value) {
+    if (value == null) {
+      return null;
+    }
     switch (dataType) {
       case INT:
-        return value == null ? 0 : ((BigDecimal) value).intValue();
+        return ((BigDecimal) value).intValue();
       case LONG:
-        return value == null ? 0L : ((BigDecimal) value).longValue();
+        return ((BigDecimal) value).longValue();
       case FLOAT:
-        return value == null ? 0f : ((BigDecimal) value).floatValue();
-      case BIG_DECIMAL:
+        return ((BigDecimal) value).floatValue();
       case DOUBLE:
-        return value == null ? 0d : ((BigDecimal) value).doubleValue();
+      case BIG_DECIMAL:
+        return ((BigDecimal) value).doubleValue();
       case STRING:
-        return value == null ? "" : ((NlsString) value).getValue();
+        return ((NlsString) value).getValue();
       default:
         return value;
     }
   }
 
+  static List<RexExpression> toRexInputRefs(Iterable<Integer> bitset) {
+    List<RexExpression> rexInputRefList = new ArrayList<>();
+    for (int index : bitset) {
+      rexInputRefList.add(new RexExpression.InputRef(index));
+    }
+    return rexInputRefList;
+  }
+
   class InputRef implements RexExpression {
     @ProtoProperties
     private SqlKind _sqlKind;
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpressionUtils.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpressionUtils.java
index 364da7c164c..242291c280e 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpressionUtils.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/RexExpressionUtils.java
@@ -44,7 +44,7 @@ static RexExpression handleCase(RexCall rexCall) {
     List<RexExpression> operands =
         rexCall.getOperands().stream().map(RexExpression::toRexExpression).collect(Collectors.toList());
     return new RexExpression.FunctionCall(rexCall.getKind(),
-        RelToStageConverter.convertToFieldSpecDataType(rexCall.getType()),
+        RelToPlanNodeConverter.convertToFieldSpecDataType(rexCall.getType()),
         "caseWhen", operands);
   }
 
@@ -56,8 +56,9 @@ static RexExpression handleCast(RexCall rexCall) {
     Preconditions.checkState(operands.size() == 1, "CAST takes exactly 2 arguments");
     RelDataType castType = rexCall.getType();
     operands.add(new RexExpression.Literal(FieldSpec.DataType.STRING,
-        RelToStageConverter.convertToFieldSpecDataType(castType).name()));
-    return new RexExpression.FunctionCall(rexCall.getKind(), RelToStageConverter.convertToFieldSpecDataType(castType),
+        RelToPlanNodeConverter.convertToFieldSpecDataType(castType).name()));
+    return new RexExpression.FunctionCall(rexCall.getKind(),
+        RelToPlanNodeConverter.convertToFieldSpecDataType(castType),
         "CAST", operands);
   }
 
@@ -66,7 +67,7 @@ static RexExpression handleSearch(RexCall rexCall) {
     List<RexNode> operands = rexCall.getOperands();
     RexInputRef rexInputRef = (RexInputRef) operands.get(0);
     RexLiteral rexLiteral = (RexLiteral) operands.get(1);
-    FieldSpec.DataType dataType = RelToStageConverter.convertToFieldSpecDataType(rexLiteral.getType());
+    FieldSpec.DataType dataType = RelToPlanNodeConverter.convertToFieldSpecDataType(rexLiteral.getType());
     Sarg sarg = rexLiteral.getValueAs(Sarg.class);
     if (sarg.isPoints()) {
       return new RexExpression.FunctionCall(SqlKind.IN, dataType, SqlKind.IN.name(), toFunctionOperands(rexInputRef,
@@ -91,7 +92,7 @@ private static List<RexExpression> toFunctionOperands(RexInputRef rexInputRef, S
 
   public static Integer getValueAsInt(RexNode in) {
     if (in == null) {
-      return 0;
+      return -1;
     }
 
     Preconditions.checkArgument(in instanceof RexLiteral, "expected literal, got " + in);
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/ShuffleRewriteVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/ShuffleRewriteVisitor.java
index b881982fe83..ba06f3f405f 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/ShuffleRewriteVisitor.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/ShuffleRewriteVisitor.java
@@ -26,17 +26,20 @@
 import org.apache.calcite.rel.RelDistribution;
 import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.StageNodeVisitor;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
 
 
 /**
@@ -45,10 +48,10 @@
  * a single host. It gathers the information recursively by checking which partitioned
  * data is selected by each node in the tree.
  *
- * <p>The only method that should be used externally is {@link #optimizeShuffles(StageNode)},
- * other public methods are used only by {@link StageNode#visit(StageNodeVisitor, Object)}.
+ * <p>The only method that should be used externally is {@link #optimizeShuffles(PlanNode)},
+ * other public methods are used only by {@link PlanNode#visit(PlanNodeVisitor, Object)}.
  */
-public class ShuffleRewriteVisitor implements StageNodeVisitor<Set<Integer>, Void> {
+public class ShuffleRewriteVisitor implements PlanNodeVisitor<Set<Integer>, Void> {
 
   /**
    * This method rewrites {@code root} <b>in place</b>, removing any unnecessary shuffles
@@ -56,12 +59,12 @@ public class ShuffleRewriteVisitor implements StageNodeVisitor<Set<Integer>, Voi
    *
    * @param root the root node of the tree to rewrite
    */
-  public static void optimizeShuffles(StageNode root) {
+  public static void optimizeShuffles(PlanNode root) {
     root.visit(new ShuffleRewriteVisitor(), null);
   }
 
   /**
-   * Access to this class should only be used via {@link #optimizeShuffles(StageNode)}
+   * Access to this class should only be used via {@link #optimizeShuffles(PlanNode)}
    */
   private ShuffleRewriteVisitor() {
   }
@@ -73,6 +76,23 @@ public Set<Integer> visitAggregate(AggregateNode node, Void context) {
     return deriveNewPartitionKeysFromRexExpressions(groupSet, oldPartitionKeys);
   }
 
+  @Override
+  public Set<Integer> visitWindow(WindowNode node, Void context) {
+    throw new UnsupportedOperationException("Window not yet supported!");
+  }
+
+  @Override
+  public Set<Integer> visitSetOp(SetOpNode setOpNode, Void context) {
+    Set<Integer> newPartitionKeys = new HashSet<>();
+    setOpNode.getInputs().forEach(input -> newPartitionKeys.addAll(input.visit(this, context)));
+    return newPartitionKeys;
+  }
+
+  @Override
+  public Set<Integer> visitExchange(ExchangeNode exchangeNode, Void context) {
+    throw new UnsupportedOperationException("Exchange not yet supported!");
+  }
+
   @Override
   public Set<Integer> visitFilter(FilterNode node, Void context) {
     // filters don't change partition keys
@@ -116,7 +136,7 @@ public Set<Integer> visitMailboxReceive(MailboxReceiveNode node, Void context) {
     KeySelector<Object[], Object[]> selector = node.getPartitionKeySelector();
 
     if (canSkipShuffle(oldPartitionKeys, selector)) {
-      node.setExchangeType(RelDistribution.Type.SINGLETON);
+      node.setDistributionType(RelDistribution.Type.SINGLETON);
       return oldPartitionKeys;
     } else if (selector == null) {
       return new HashSet<>();
@@ -131,7 +151,7 @@ public Set<Integer> visitMailboxSend(MailboxSendNode node, Void context) {
     KeySelector<Object[], Object[]> selector = node.getPartitionKeySelector();
 
     if (canSkipShuffle(oldPartitionKeys, selector)) {
-      node.setExchangeType(RelDistribution.Type.SINGLETON);
+      node.setDistributionType(RelDistribution.Type.SINGLETON);
       return oldPartitionKeys;
     } else {
       // reset the context partitionKeys since we've determined that
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/StageMetadataVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/StageMetadataVisitor.java
deleted file mode 100644
index cf76134c8a8..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/StageMetadataVisitor.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner.logical;
-
-import java.util.HashMap;
-import java.util.List;
-import org.apache.calcite.util.Pair;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.StageNodeVisitor;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
-
-
-/**
- * {@code StageMetadataVisitor} computes the {@link StageMetadata} for a {@link StageNode}
- * tree and attaches it in the form of a {@link QueryPlan}.
- */
-public class StageMetadataVisitor implements StageNodeVisitor<Void, QueryPlan> {
-
-  public static QueryPlan attachMetadata(List<Pair<Integer, String>> fields, StageNode root) {
-    QueryPlan queryPlan = new QueryPlan(fields, new HashMap<>(), new HashMap<>());
-    root.visit(new StageMetadataVisitor(), queryPlan);
-    return queryPlan;
-  }
-
-  /**
-   * Usage of this class should only come through {@link #attachMetadata(List, StageNode)}.
-   */
-  private StageMetadataVisitor() {
-  }
-
-  private void visit(StageNode node, QueryPlan queryPlan) {
-    queryPlan
-        .getStageMetadataMap()
-        .computeIfAbsent(node.getStageId(), (id) -> new StageMetadata())
-        .attach(node);
-  }
-
-  @Override
-  public Void visitAggregate(AggregateNode node, QueryPlan context) {
-    node.getInputs().get(0).visit(this, context);
-    visit(node, context);
-    return null;
-  }
-
-  @Override
-  public Void visitFilter(FilterNode node, QueryPlan context) {
-    node.getInputs().get(0).visit(this, context);
-    visit(node, context);
-    return null;
-  }
-
-  @Override
-  public Void visitJoin(JoinNode node, QueryPlan context) {
-    node.getInputs().forEach(join -> join.visit(this, context));
-    visit(node, context);
-    return null;
-  }
-
-  @Override
-  public Void visitMailboxReceive(MailboxReceiveNode node, QueryPlan context) {
-    node.getSender().visit(this, context);
-    visit(node, context);
-
-    // special case for the global mailbox receive node
-    if (node.getStageId() == 0) {
-      context.getQueryStageMap().put(0, node);
-    }
-
-    return null;
-  }
-
-  @Override
-  public Void visitMailboxSend(MailboxSendNode node, QueryPlan context) {
-    node.getInputs().get(0).visit(this, context);
-    visit(node, context);
-
-    context.getQueryStageMap().put(node.getStageId(), node);
-    return null;
-  }
-
-  @Override
-  public Void visitProject(ProjectNode node, QueryPlan context) {
-    node.getInputs().get(0).visit(this, context);
-    visit(node, context);
-    return null;
-  }
-
-  @Override
-  public Void visitSort(SortNode node, QueryPlan context) {
-    node.getInputs().get(0).visit(this, context);
-    visit(node, context);
-    return null;
-  }
-
-  @Override
-  public Void visitTableScan(TableScanNode node, QueryPlan context) {
-    visit(node, context);
-    return null;
-  }
-
-  @Override
-  public Void visitValue(ValueNode node, QueryPlan context) {
-    visit(node, context);
-    return null;
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/StagePlanner.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/StagePlanner.java
deleted file mode 100644
index 0af5497ee2e..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/StagePlanner.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner.logical;
-
-import java.util.List;
-import java.util.Map;
-import org.apache.calcite.rel.RelDistribution;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.RelRoot;
-import org.apache.calcite.rel.core.Exchange;
-import org.apache.pinot.common.config.provider.TableCache;
-import org.apache.pinot.query.context.PlannerContext;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
-import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.planner.physical.colocated.GreedyShuffleRewriteVisitor;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.routing.WorkerManager;
-
-
-/**
- * QueryPlanMaker walks top-down from {@link RelRoot} and construct a forest of trees with {@link StageNode}.
- *
- * This class is non-threadsafe. Do not reuse the stage planner for multiple query plans.
- */
-public class StagePlanner {
-  private final PlannerContext _plannerContext;   // DO NOT REMOVE.
-  private final WorkerManager _workerManager;
-  private final TableCache _tableCache;
-  private int _stageIdCounter;
-  private long _requestId;
-
-  public StagePlanner(PlannerContext plannerContext, WorkerManager workerManager, long requestId,
-      TableCache tableCache) {
-    _plannerContext = plannerContext;
-    _workerManager = workerManager;
-    _requestId = requestId;
-    _tableCache = tableCache;
-  }
-
-  /**
-   * Construct the dispatchable plan from relational logical plan.
-   *
-   * @param relRoot relational plan root.
-   * @return dispatchable plan.
-   */
-  public QueryPlan makePlan(RelRoot relRoot) {
-    RelNode relRootNode = relRoot.rel;
-    // Stage ID starts with 1, 0 will be reserved for ROOT stage.
-    _stageIdCounter = 1;
-
-    // walk the plan and create stages.
-    StageNode globalStageRoot = walkRelPlan(relRootNode, getNewStageId());
-
-    // global root needs to send results back to the ROOT, a.k.a. the client response node. the last stage only has one
-    // receiver so doesn't matter what the exchange type is. setting it to SINGLETON by default.
-    StageNode globalSenderNode = new MailboxSendNode(globalStageRoot.getStageId(), globalStageRoot.getDataSchema(),
-        0, RelDistribution.Type.RANDOM_DISTRIBUTED, null);
-    globalSenderNode.addInput(globalStageRoot);
-
-    StageNode globalReceiverNode =
-        new MailboxReceiveNode(0, globalStageRoot.getDataSchema(), globalStageRoot.getStageId(),
-            RelDistribution.Type.RANDOM_DISTRIBUTED, null, globalSenderNode);
-
-    QueryPlan queryPlan = StageMetadataVisitor.attachMetadata(relRoot.fields, globalReceiverNode);
-
-    // assign workers to each stage.
-    for (Map.Entry<Integer, StageMetadata> e : queryPlan.getStageMetadataMap().entrySet()) {
-      _workerManager.assignWorkerToStage(e.getKey(), e.getValue(), _requestId);
-    }
-
-    // Run physical optimizations
-    runPhysicalOptimizers(queryPlan);
-
-    return queryPlan;
-  }
-
-  // non-threadsafe
-  // TODO: add dataSchema (extracted from RelNode schema) to the StageNode.
-  private StageNode walkRelPlan(RelNode node, int currentStageId) {
-    if (isExchangeNode(node)) {
-      StageNode nextStageRoot = walkRelPlan(node.getInput(0), getNewStageId());
-      RelDistribution distribution = ((Exchange) node).getDistribution();
-      return createSendReceivePair(nextStageRoot, distribution, currentStageId);
-    } else {
-      StageNode stageNode = RelToStageConverter.toStageNode(node, currentStageId);
-      List<RelNode> inputs = node.getInputs();
-      for (RelNode input : inputs) {
-        stageNode.addInput(walkRelPlan(input, currentStageId));
-      }
-      return stageNode;
-    }
-  }
-
-  // TODO: Switch to Worker SPI to avoid multiple-places where workers are assigned.
-  private void runPhysicalOptimizers(QueryPlan queryPlan) {
-    if (_plannerContext.getOptions().getOrDefault("useColocatedJoin", "false").equals("true")) {
-      GreedyShuffleRewriteVisitor.optimizeShuffles(queryPlan, _tableCache);
-    }
-  }
-
-  private StageNode createSendReceivePair(StageNode nextStageRoot, RelDistribution distribution, int currentStageId) {
-    List<Integer> distributionKeys = distribution.getKeys();
-    RelDistribution.Type exchangeType = distribution.getType();
-
-    // make an exchange sender and receiver node pair
-    // only HASH_DISTRIBUTED requires a partition key selector; so all other types (SINGLETON and BROADCAST)
-    // of exchange will not carry a partition key selector.
-    KeySelector<Object[], Object[]> keySelector = exchangeType == RelDistribution.Type.HASH_DISTRIBUTED
-        ? new FieldSelectionKeySelector(distributionKeys) : null;
-
-    StageNode mailboxSender = new MailboxSendNode(nextStageRoot.getStageId(), nextStageRoot.getDataSchema(),
-        currentStageId, exchangeType, keySelector);
-    StageNode mailboxReceiver = new MailboxReceiveNode(currentStageId, nextStageRoot.getDataSchema(),
-        nextStageRoot.getStageId(), exchangeType, keySelector, mailboxSender);
-    mailboxSender.addInput(nextStageRoot);
-
-    return mailboxReceiver;
-  }
-
-  private boolean isExchangeNode(RelNode node) {
-    return (node instanceof Exchange);
-  }
-
-  private int getNewStageId() {
-    return _stageIdCounter++;
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/SubPlanFragmenter.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/SubPlanFragmenter.java
new file mode 100644
index 00000000000..938920ea574
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/logical/SubPlanFragmenter.java
@@ -0,0 +1,155 @@
+/**
+ * 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.pinot.query.planner.logical;
+
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.pinot.query.planner.SubPlanMetadata;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+
+
+/**
+ * SubPlanFragmenter is an implementation of {@link PlanNodeVisitor} to fragment a
+ * {@link org.apache.pinot.query.planner.QueryPlan} into multiple {@link org.apache.pinot.query.planner.SubPlan}.
+ *
+ * The fragmenting process is as follows:
+ * 1. Traverse the plan tree in a depth-first manner;
+ * 2. For each node, if it is a SubPlan splittable ExchangeNode, switch it to a {@link LiteralValueNode};
+ * 3. Increment current SubPlan Id by one and keep traverse the tree.
+ */
+public class SubPlanFragmenter implements PlanNodeVisitor<PlanNode, SubPlanFragmenter.Context> {
+  public static final SubPlanFragmenter INSTANCE = new SubPlanFragmenter();
+
+  private PlanNode process(PlanNode node, Context context) {
+    node.setPlanFragmentId(context._currentSubPlanId);
+    List<PlanNode> inputs = node.getInputs();
+    for (int i = 0; i < inputs.size(); i++) {
+      context._previousSubPlanId = node.getPlanFragmentId();
+      inputs.set(i, inputs.get(i).visit(this, context));
+    }
+    return node;
+  }
+
+  @Override
+  public PlanNode visitAggregate(AggregateNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitFilter(FilterNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitJoin(JoinNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitMailboxReceive(MailboxReceiveNode node, Context context) {
+    throw new UnsupportedOperationException("MailboxReceiveNode should not be visited by StageFragmenter");
+  }
+
+  @Override
+  public PlanNode visitMailboxSend(MailboxSendNode node, Context context) {
+    throw new UnsupportedOperationException("MailboxSendNode should not be visited by StageFragmenter");
+  }
+
+  @Override
+  public PlanNode visitProject(ProjectNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitSort(SortNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitTableScan(TableScanNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitValue(ValueNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitWindow(WindowNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitSetOp(SetOpNode node, Context context) {
+    return process(node, context);
+  }
+
+  @Override
+  public PlanNode visitExchange(ExchangeNode node, Context context) {
+    if (!isSubPlanSplitter(node)) {
+      return process(node, context);
+    }
+    int currentStageId = context._previousSubPlanId;
+    int nextSubPlanId = context._currentSubPlanId + 1;
+
+    context._currentSubPlanId = nextSubPlanId;
+    PlanNode nextStageRoot = node.getInputs().get(0).visit(this, context);
+    context._subPlanIdToRootNodeMap.put(nextSubPlanId, nextStageRoot);
+    if (!context._subPlanIdToChildrenMap.containsKey(currentStageId)) {
+      context._subPlanIdToChildrenMap.put(currentStageId, new ArrayList<>());
+    }
+    context._subPlanIdToChildrenMap.get(currentStageId).add(nextSubPlanId);
+    context._subPlanIdToMetadataMap.put(nextSubPlanId, new SubPlanMetadata(node.getTableNames(), ImmutableList.of()));
+    PlanNode literalValueNode = new LiteralValueNode(nextStageRoot.getDataSchema());
+    return literalValueNode;
+  }
+
+  private boolean isSubPlanSplitter(PlanNode node) {
+    return ((ExchangeNode) node).getExchangeType() == PinotRelExchangeType.SUB_PLAN;
+  }
+
+  public static class Context {
+    Map<Integer, PlanNode> _subPlanIdToRootNodeMap = new HashMap<>();
+
+    Map<Integer, List<Integer>> _subPlanIdToChildrenMap = new HashMap<>();
+    Map<Integer, SubPlanMetadata> _subPlanIdToMetadataMap = new HashMap<>();
+
+    // SubPlan ID starts with 0.
+    Integer _currentSubPlanId = 0;
+    Integer _previousSubPlanId = 0;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/partitioning/FieldSelectionKeySelector.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/partitioning/FieldSelectionKeySelector.java
index 8933260695d..b23b34433b3 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/partitioning/FieldSelectionKeySelector.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/partitioning/FieldSelectionKeySelector.java
@@ -85,11 +85,14 @@ public int computeHash(Object[] input) {
     // TODO: consider better hashing algorithms than hashCode sum, such as XOR'ing
     int hashCode = 0;
     for (int columnIndex : _columnIndices) {
-      hashCode += input[columnIndex].hashCode();
+      Object value = input[columnIndex];
+      if (value != null) {
+        hashCode += value.hashCode();
+      }
     }
 
     // return a positive number because this is used directly to modulo-index
-    return Math.abs(hashCode);
+    return hashCode & Integer.MAX_VALUE;
   }
 
   @Override
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanContext.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanContext.java
new file mode 100644
index 00000000000..c0fb98d9a54
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanContext.java
@@ -0,0 +1,140 @@
+/**
+ * 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.pinot.query.planner.physical;
+
+import com.google.common.base.Preconditions;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.calcite.util.Pair;
+import org.apache.pinot.query.context.PlannerContext;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.planner.PlanFragment;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerManager;
+import org.apache.pinot.query.routing.WorkerMetadata;
+
+
+public class DispatchablePlanContext {
+  private final WorkerManager _workerManager;
+
+  private final long _requestId;
+  private final Set<String> _tableNames;
+  private final List<Pair<Integer, String>> _resultFields;
+
+  private final PlannerContext _plannerContext;
+  private final Map<Integer, DispatchablePlanMetadata> _dispatchablePlanMetadataMap;
+  private final Map<Integer, PlanNode> _dispatchablePlanStageRootMap;
+
+  public DispatchablePlanContext(WorkerManager workerManager, long requestId, PlannerContext plannerContext,
+      List<Pair<Integer, String>> resultFields, Set<String> tableNames) {
+    _workerManager = workerManager;
+    _requestId = requestId;
+    _plannerContext = plannerContext;
+    _dispatchablePlanMetadataMap = new HashMap<>();
+    _dispatchablePlanStageRootMap = new HashMap<>();
+    _resultFields = resultFields;
+    _tableNames = tableNames;
+  }
+
+  public WorkerManager getWorkerManager() {
+    return _workerManager;
+  }
+
+  public long getRequestId() {
+    return _requestId;
+  }
+
+  // Returns all the table names.
+  public Set<String> getTableNames() {
+    return _tableNames;
+  }
+
+  public List<Pair<Integer, String>> getResultFields() {
+    return _resultFields;
+  }
+
+  public PlannerContext getPlannerContext() {
+    return _plannerContext;
+  }
+
+  public Map<Integer, DispatchablePlanMetadata> getDispatchablePlanMetadataMap() {
+    return _dispatchablePlanMetadataMap;
+  }
+
+  public Map<Integer, PlanNode> getDispatchablePlanStageRootMap() {
+    return _dispatchablePlanStageRootMap;
+  }
+
+  public List<DispatchablePlanFragment> constructDispatchablePlanFragmentList(PlanFragment subPlanRoot) {
+    DispatchablePlanFragment[] dispatchablePlanFragmentArray =
+        new DispatchablePlanFragment[_dispatchablePlanStageRootMap.size()];
+    createDispatchablePlanFragmentList(dispatchablePlanFragmentArray, subPlanRoot);
+    List<DispatchablePlanFragment> dispatchablePlanFragmentList = Arrays.asList(dispatchablePlanFragmentArray);
+    for (Map.Entry<Integer, DispatchablePlanMetadata> dispatchableEntry : _dispatchablePlanMetadataMap.entrySet()) {
+      DispatchablePlanMetadata dispatchablePlanMetadata = dispatchableEntry.getValue();
+
+      // construct each worker metadata
+      WorkerMetadata[] workerMetadataList = new WorkerMetadata[dispatchablePlanMetadata.getTotalWorkerCount()];
+      for (Map.Entry<QueryServerInstance, List<Integer>> queryServerEntry
+          : dispatchablePlanMetadata.getServerInstanceToWorkerIdMap().entrySet()) {
+        for (int workerId : queryServerEntry.getValue()) {
+          VirtualServerAddress virtualServerAddress = new VirtualServerAddress(queryServerEntry.getKey(), workerId);
+          WorkerMetadata.Builder builder = new WorkerMetadata.Builder();
+          builder.setVirtualServerAddress(virtualServerAddress);
+          if (dispatchablePlanMetadata.getScannedTables().size() == 1) {
+            builder.addTableSegmentsMap(dispatchablePlanMetadata.getWorkerIdToSegmentsMap().get(workerId));
+          }
+          builder.putAllMailBoxInfosMap(dispatchablePlanMetadata.getWorkerIdToMailBoxIdsMap().get(workerId));
+          workerMetadataList[workerId] = builder.build();
+        }
+      }
+
+      // set the stageMetadata
+      int stageId = dispatchableEntry.getKey();
+      dispatchablePlanFragmentList.get(stageId).setWorkerMetadataList(Arrays.asList(workerMetadataList));
+      dispatchablePlanFragmentList.get(stageId)
+          .setWorkerIdToSegmentsMap(dispatchablePlanMetadata.getWorkerIdToSegmentsMap());
+      dispatchablePlanFragmentList.get(stageId)
+          .setServerInstanceToWorkerIdMap(dispatchablePlanMetadata.getServerInstanceToWorkerIdMap());
+      Preconditions.checkState(dispatchablePlanMetadata.getScannedTables().size() <= 1,
+          "More than one table is not supported yet");
+      if (dispatchablePlanMetadata.getScannedTables().size() == 1) {
+        dispatchablePlanFragmentList.get(stageId).setTableName(dispatchablePlanMetadata.getScannedTables().get(0));
+      }
+      if (dispatchablePlanMetadata.getTimeBoundaryInfo() != null) {
+        dispatchablePlanFragmentList.get(stageId)
+            .setTimeBoundaryInfo(dispatchablePlanMetadata.getTimeBoundaryInfo());
+      }
+    }
+    return dispatchablePlanFragmentList;
+  }
+
+  private void createDispatchablePlanFragmentList(DispatchablePlanFragment[] dispatchablePlanFragmentArray,
+      PlanFragment planFragmentRoot) {
+    dispatchablePlanFragmentArray[planFragmentRoot.getFragmentId()] = new DispatchablePlanFragment(planFragmentRoot);
+    for (PlanFragment childPlanFragment : planFragmentRoot.getChildren()) {
+      createDispatchablePlanFragmentList(dispatchablePlanFragmentArray, childPlanFragment);
+    }
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanMetadata.java
new file mode 100644
index 00000000000..36d677d3628
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanMetadata.java
@@ -0,0 +1,147 @@
+/**
+ * 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.pinot.query.planner.physical;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.core.routing.TimeBoundaryInfo;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.QueryServerInstance;
+
+
+/**
+ * The {@code DispatchablePlanMetadata} info contains the information for dispatching a particular plan fragment.
+ *
+ * <p>It contains information aboute:
+ * <ul>
+ *   <li>the tables it is suppose to scan for</li>
+ *   <li>the underlying segments a stage requires to execute upon.</li>
+ *   <li>the server instances to which this stage should be execute on</li>
+ * </ul>
+ */
+public class DispatchablePlanMetadata implements Serializable {
+  private List<String> _scannedTables;
+
+  // used for assigning server/worker nodes.
+  private Map<QueryServerInstance, List<Integer>> _serverInstanceToWorkerIdMap;
+
+  // used for table scan stage - we use ServerInstance instead of VirtualServer
+  // here because all virtual servers that share a server instance will have the
+  // same segments on them
+  private Map<Integer, Map<String, List<String>>> _workerIdToSegmentsMap;
+
+  // used for build mailboxes between workers.
+  // workerId -> {planFragmentId -> mailbox list}
+  private Map<Integer, Map<Integer, MailboxMetadata>> _workerIdToMailboxesMap;
+
+  // time boundary info
+  private TimeBoundaryInfo _timeBoundaryInfo;
+
+  // whether a stage requires singleton instance to execute, e.g. stage contains global reduce (sort/agg) operator.
+  private boolean _requiresSingletonInstance;
+
+  // Total worker count of this stage.
+  private int _totalWorkerCount;
+
+  public DispatchablePlanMetadata() {
+    _scannedTables = new ArrayList<>();
+    _serverInstanceToWorkerIdMap = new HashMap<>();
+    _workerIdToSegmentsMap = new HashMap<>();
+    _workerIdToMailboxesMap = new HashMap<>();
+    _timeBoundaryInfo = null;
+    _requiresSingletonInstance = false;
+  }
+
+  public List<String> getScannedTables() {
+    return _scannedTables;
+  }
+
+  public void addScannedTable(String tableName) {
+    _scannedTables.add(tableName);
+  }
+
+  // -----------------------------------------------
+  // attached physical plan context.
+  // -----------------------------------------------
+
+  public Map<Integer, Map<String, List<String>>> getWorkerIdToSegmentsMap() {
+    return _workerIdToSegmentsMap;
+  }
+
+  public void setWorkerIdToSegmentsMap(
+      Map<Integer, Map<String, List<String>>> workerIdToSegmentsMap) {
+    _workerIdToSegmentsMap = workerIdToSegmentsMap;
+  }
+
+  public Map<Integer, Map<Integer, MailboxMetadata>> getWorkerIdToMailBoxIdsMap() {
+    return _workerIdToMailboxesMap;
+  }
+
+  public void setWorkerIdToMailBoxIdsMap(Map<Integer, Map<Integer, MailboxMetadata>> workerIdToMailboxesMap) {
+    _workerIdToMailboxesMap.putAll(workerIdToMailboxesMap);
+  }
+
+  public void addWorkerIdToMailBoxIdsMap(int planFragmentId,
+      Map<Integer, MailboxMetadata> planFragmentIdToMailboxesMap) {
+    _workerIdToMailboxesMap.put(planFragmentId, planFragmentIdToMailboxesMap);
+  }
+
+  public Map<QueryServerInstance, List<Integer>> getServerInstanceToWorkerIdMap() {
+    return _serverInstanceToWorkerIdMap;
+  }
+
+  public void setServerInstanceToWorkerIdMap(Map<QueryServerInstance, List<Integer>> serverInstances) {
+    _serverInstanceToWorkerIdMap = serverInstances;
+  }
+
+  public TimeBoundaryInfo getTimeBoundaryInfo() {
+    return _timeBoundaryInfo;
+  }
+
+  public void setTimeBoundaryInfo(TimeBoundaryInfo timeBoundaryInfo) {
+    _timeBoundaryInfo = timeBoundaryInfo;
+  }
+
+  public boolean isRequiresSingletonInstance() {
+    return _requiresSingletonInstance;
+  }
+
+  public void setRequireSingleton(boolean newRequireInstance) {
+    _requiresSingletonInstance = _requiresSingletonInstance || newRequireInstance;
+  }
+
+  public int getTotalWorkerCount() {
+    return _totalWorkerCount;
+  }
+
+  public void setTotalWorkerCount(int totalWorkerCount) {
+    _totalWorkerCount = totalWorkerCount;
+  }
+
+  @Override
+  public String toString() {
+    return "DispatchablePlanMetadata{" + "_scannedTables=" + _scannedTables + ", _serverInstanceToWorkerIdMap="
+        + _serverInstanceToWorkerIdMap + ", _workerIdToSegmentsMap=" + _workerIdToSegmentsMap
+        + ", _workerIdToMailboxesMap=" + _workerIdToMailboxesMap
+        + ", _timeBoundaryInfo=" + _timeBoundaryInfo + '}';
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanVisitor.java
new file mode 100644
index 00000000000..ccb4622b8b3
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/DispatchablePlanVisitor.java
@@ -0,0 +1,138 @@
+/**
+ * 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.pinot.query.planner.physical;
+
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+
+
+public class DispatchablePlanVisitor implements PlanNodeVisitor<Void, DispatchablePlanContext> {
+  public static final DispatchablePlanVisitor INSTANCE = new DispatchablePlanVisitor();
+
+  private DispatchablePlanVisitor() {
+  }
+
+  private static DispatchablePlanMetadata getOrCreateDispatchablePlanMetadata(PlanNode node,
+      DispatchablePlanContext context) {
+    return context.getDispatchablePlanMetadataMap().computeIfAbsent(node.getPlanFragmentId(),
+        (id) -> new DispatchablePlanMetadata());
+  }
+
+  @Override
+  public Void visitAggregate(AggregateNode node, DispatchablePlanContext context) {
+    node.getInputs().get(0).visit(this, context);
+    DispatchablePlanMetadata dispatchablePlanMetadata = getOrCreateDispatchablePlanMetadata(node, context);
+    dispatchablePlanMetadata.setRequireSingleton(node.getGroupSet().size() == 0
+        && node.getAggType().equals(AggregateNode.AggType.FINAL));
+    return null;
+  }
+
+  @Override
+  public Void visitWindow(WindowNode node, DispatchablePlanContext context) {
+    node.getInputs().get(0).visit(this, context);
+    DispatchablePlanMetadata dispatchablePlanMetadata = getOrCreateDispatchablePlanMetadata(node, context);
+    // TODO: Figure out a way to parallelize Empty OVER() and OVER(ORDER BY) so the computation can be done across
+    //       multiple nodes.
+    // Empty OVER() and OVER(ORDER BY) need to be processed on a singleton node. OVER() with PARTITION BY can be
+    // distributed as no global ordering is required across partitions.
+    dispatchablePlanMetadata.setRequireSingleton(node.getGroupSet().size() == 0);
+    return null;
+  }
+
+  @Override
+  public Void visitSetOp(SetOpNode setOpNode, DispatchablePlanContext context) {
+    setOpNode.getInputs().forEach(input -> input.visit(this, context));
+    getOrCreateDispatchablePlanMetadata(setOpNode, context);
+    return null;
+  }
+
+  @Override
+  public Void visitExchange(ExchangeNode exchangeNode, DispatchablePlanContext context) {
+    throw new UnsupportedOperationException("ExchangeNode should not be visited by DispatchablePlanVisitor");
+  }
+
+  @Override
+  public Void visitFilter(FilterNode node, DispatchablePlanContext context) {
+    node.getInputs().get(0).visit(this, context);
+    getOrCreateDispatchablePlanMetadata(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitJoin(JoinNode node, DispatchablePlanContext context) {
+    node.getInputs().forEach(join -> join.visit(this, context));
+    getOrCreateDispatchablePlanMetadata(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitMailboxReceive(MailboxReceiveNode node, DispatchablePlanContext context) {
+    node.getSender().visit(this, context);
+    getOrCreateDispatchablePlanMetadata(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitMailboxSend(MailboxSendNode node, DispatchablePlanContext context) {
+    node.getInputs().get(0).visit(this, context);
+    getOrCreateDispatchablePlanMetadata(node, context);
+    context.getDispatchablePlanStageRootMap().put(node.getPlanFragmentId(), node);
+    return null;
+  }
+
+  @Override
+  public Void visitProject(ProjectNode node, DispatchablePlanContext context) {
+    node.getInputs().get(0).visit(this, context);
+    getOrCreateDispatchablePlanMetadata(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitSort(SortNode node, DispatchablePlanContext context) {
+    node.getInputs().get(0).visit(this, context);
+    DispatchablePlanMetadata dispatchablePlanMetadata = getOrCreateDispatchablePlanMetadata(node, context);
+    dispatchablePlanMetadata.setRequireSingleton(node.getCollationKeys().size() > 0 && node.getOffset() != -1);
+    return null;
+  }
+
+  @Override
+  public Void visitTableScan(TableScanNode node, DispatchablePlanContext context) {
+    DispatchablePlanMetadata dispatchablePlanMetadata = getOrCreateDispatchablePlanMetadata(node, context);
+    dispatchablePlanMetadata.addScannedTable(node.getTableName());
+    return null;
+  }
+
+  @Override
+  public Void visitValue(ValueNode node, DispatchablePlanContext context) {
+    getOrCreateDispatchablePlanMetadata(node, context);
+    return null;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/MailboxAssignmentVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/MailboxAssignmentVisitor.java
new file mode 100644
index 00000000000..180f5a413a2
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/MailboxAssignmentVisitor.java
@@ -0,0 +1,93 @@
+/**
+ * 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.pinot.query.planner.physical;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.pinot.query.planner.plannode.DefaultPostOrderTraversalVisitor;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+
+
+public class MailboxAssignmentVisitor extends DefaultPostOrderTraversalVisitor<Void, DispatchablePlanContext> {
+  public static final MailboxAssignmentVisitor INSTANCE = new MailboxAssignmentVisitor();
+
+  @Override
+  public Void process(PlanNode node, DispatchablePlanContext context) {
+    if (node instanceof MailboxSendNode) {
+      MailboxSendNode sendNode = (MailboxSendNode) node;
+      int senderFragmentId = sendNode.getPlanFragmentId();
+      int receiverFragmentId = sendNode.getReceiverStageId();
+      Map<Integer, DispatchablePlanMetadata> metadataMap = context.getDispatchablePlanMetadataMap();
+      DispatchablePlanMetadata senderMetadata = metadataMap.get(senderFragmentId);
+      DispatchablePlanMetadata receiverMetadata = metadataMap.get(receiverFragmentId);
+      Map<QueryServerInstance, List<Integer>> senderWorkerIdsMap = senderMetadata.getServerInstanceToWorkerIdMap();
+      Map<QueryServerInstance, List<Integer>> receiverWorkerIdsMap = receiverMetadata.getServerInstanceToWorkerIdMap();
+      Map<Integer, Map<Integer, MailboxMetadata>> senderMailboxesMap = senderMetadata.getWorkerIdToMailBoxIdsMap();
+      Map<Integer, Map<Integer, MailboxMetadata>> receiverMailboxesMap = receiverMetadata.getWorkerIdToMailBoxIdsMap();
+
+      if (sendNode.getDistributionType() == RelDistribution.Type.SINGLETON) {
+        // For SINGLETON exchange type, send the data to the same instance (same worker id)
+        senderWorkerIdsMap.forEach((serverInstance, workerIds) -> {
+          for (int workerId : workerIds) {
+            MailboxMetadata mailboxMetadata = new MailboxMetadata(Collections.singletonList(
+                MailboxIdUtils.toPlanMailboxId(senderFragmentId, workerId, receiverFragmentId, workerId)),
+                Collections.singletonList(new VirtualServerAddress(serverInstance, workerId)), Collections.emptyMap());
+            senderMailboxesMap.computeIfAbsent(workerId, k -> new HashMap<>()).put(receiverFragmentId, mailboxMetadata);
+            receiverMailboxesMap.computeIfAbsent(workerId, k -> new HashMap<>()).put(senderFragmentId, mailboxMetadata);
+          }
+        });
+      } else {
+        // For other exchange types, send the data to all the instances in the receiver fragment
+        // TODO: Add support for more exchange types
+        senderWorkerIdsMap.forEach((senderServerInstance, senderWorkerIds) -> {
+          for (int senderWorkerId : senderWorkerIds) {
+            Map<Integer, MailboxMetadata> senderMailboxMetadataMap =
+                senderMailboxesMap.computeIfAbsent(senderWorkerId, k -> new HashMap<>());
+            receiverWorkerIdsMap.forEach((receiverServerInstance, receiverWorkerIds) -> {
+              for (int receiverWorkerId : receiverWorkerIds) {
+                Map<Integer, MailboxMetadata> receiverMailboxMetadataMap =
+                    receiverMailboxesMap.computeIfAbsent(receiverWorkerId, k -> new HashMap<>());
+                String mailboxId = MailboxIdUtils.toPlanMailboxId(senderFragmentId, senderWorkerId, receiverFragmentId,
+                    receiverWorkerId);
+                MailboxMetadata senderMailboxMetadata =
+                    senderMailboxMetadataMap.computeIfAbsent(receiverFragmentId, k -> new MailboxMetadata());
+                senderMailboxMetadata.getMailBoxIdList().add(mailboxId);
+                senderMailboxMetadata.getVirtualAddressList()
+                    .add(new VirtualServerAddress(receiverServerInstance, receiverWorkerId));
+                MailboxMetadata receiverMailboxMetadata =
+                    receiverMailboxMetadataMap.computeIfAbsent(senderFragmentId, k -> new MailboxMetadata());
+                receiverMailboxMetadata.getMailBoxIdList().add(mailboxId);
+                receiverMailboxMetadata.getVirtualAddressList()
+                    .add(new VirtualServerAddress(senderServerInstance, senderWorkerId));
+              }
+            });
+          }
+        });
+      }
+    }
+    return null;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/MailboxIdUtils.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/MailboxIdUtils.java
new file mode 100644
index 00000000000..c949c6598fa
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/MailboxIdUtils.java
@@ -0,0 +1,32 @@
+/**
+ * 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.pinot.query.planner.physical;
+
+public class MailboxIdUtils {
+  private MailboxIdUtils() {
+  }
+
+  private static final char SEPARATOR = '|';
+
+  public static String toPlanMailboxId(int senderStageId, int senderWorkerId, int receiverStageId,
+      int receiverWorkerId) {
+    return Integer.toString(senderStageId) + SEPARATOR + senderWorkerId + SEPARATOR
+        + receiverStageId + SEPARATOR + receiverWorkerId;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/PinotDispatchPlanner.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/PinotDispatchPlanner.java
new file mode 100644
index 00000000000..521a99f39c7
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/PinotDispatchPlanner.java
@@ -0,0 +1,89 @@
+/**
+ * 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.pinot.query.planner.physical;
+
+import org.apache.pinot.common.config.provider.TableCache;
+import org.apache.pinot.query.context.PlannerContext;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.PlanFragment;
+import org.apache.pinot.query.planner.SubPlan;
+import org.apache.pinot.query.planner.physical.colocated.GreedyShuffleRewriteVisitor;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.routing.WorkerManager;
+
+
+public class PinotDispatchPlanner {
+
+  private final WorkerManager _workerManager;
+  private final long _requestId;
+  private final PlannerContext _plannerContext;
+
+  private final TableCache _tableCache;
+
+  public PinotDispatchPlanner(PlannerContext plannerContext, WorkerManager workerManager, long requestId,
+      TableCache tableCache) {
+    _plannerContext = plannerContext;
+    _workerManager = workerManager;
+    _requestId = requestId;
+    _tableCache = tableCache;
+  }
+
+  /**
+   * Entry point for attaching dispatch metadata to a {@link SubPlan}.
+   * @param subPlan the entrypoint of the sub plan.
+   */
+  public DispatchableSubPlan createDispatchableSubPlan(SubPlan subPlan) {
+    // perform physical plan conversion and assign workers to each stage.
+    DispatchablePlanContext context = new DispatchablePlanContext(_workerManager, _requestId, _plannerContext,
+        subPlan.getSubPlanMetadata().getFields(), subPlan.getSubPlanMetadata().getTableNames());
+    PlanFragment rootFragment = subPlan.getSubPlanRoot();
+    PlanNode rootNode = rootFragment.getFragmentRoot();
+    // 1. start by visiting the sub plan fragment root.
+    rootNode.visit(DispatchablePlanVisitor.INSTANCE, context);
+    // 2. add a special stage for the global mailbox receive, this runs on the dispatcher.
+    context.getDispatchablePlanStageRootMap().put(0, rootNode);
+    // 3. add worker assignment after the dispatchable plan context is fulfilled after the visit.
+    context.getWorkerManager().assignWorkers(rootFragment, context);
+    // 4. compute the mailbox assignment for each stage.
+    // TODO: refactor this to be a pluggable interface.
+    rootNode.visit(MailboxAssignmentVisitor.INSTANCE, context);
+    // 5. Run physical optimizations
+    runPhysicalOptimizers(rootNode, context, _tableCache);
+    // 6. convert it into query plan.
+    // TODO: refactor this to be a pluggable interface.
+    return finalizeDispatchableSubPlan(rootFragment, context);
+  }
+
+  // TODO: Switch to Worker SPI to avoid multiple-places where workers are assigned.
+  private void runPhysicalOptimizers(PlanNode subPlanRoot, DispatchablePlanContext dispatchablePlanContext,
+      TableCache tableCache) {
+    if (dispatchablePlanContext.getPlannerContext().getOptions().getOrDefault("useColocatedJoin", "false")
+        .equals("true")) {
+      GreedyShuffleRewriteVisitor.optimizeShuffles(subPlanRoot,
+          dispatchablePlanContext.getDispatchablePlanMetadataMap(), tableCache);
+    }
+  }
+
+  private static DispatchableSubPlan finalizeDispatchableSubPlan(PlanFragment subPlanRoot,
+      DispatchablePlanContext dispatchablePlanContext) {
+    return new DispatchableSubPlan(dispatchablePlanContext.getResultFields(),
+        dispatchablePlanContext.constructDispatchablePlanFragmentList(subPlanRoot),
+        dispatchablePlanContext.getTableNames());
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteContext.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteContext.java
index befcf958cb5..d8c6283335e 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteContext.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteContext.java
@@ -24,19 +24,21 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.StageNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
 
 
 /**
  * Context used for running the {@link GreedyShuffleRewriteVisitor}.
  */
 class GreedyShuffleRewriteContext {
-  private final Map<Integer, StageNode> _rootStageNode;
-  private final Map<Integer, List<StageNode>> _leafNodes;
+  private final Map<Integer, PlanNode> _rootStageNode;
+  private final Map<Integer, List<PlanNode>> _leafNodes;
   private final Set<Integer> _joinStages;
+  private final Set<Integer> _setOpStages;
+
   /**
-   * A map to track the partition keys for the input to the MailboxSendNode of a given stageId. This is needed
+   * A map to track the partition keys for the input to the MailboxSendNode of a given planFragmentId. This is needed
    * because the {@link GreedyShuffleRewriteVisitor} doesn't determine the distribution of the sender if the receiver
    * is a join-stage.
    */
@@ -46,63 +48,80 @@ class GreedyShuffleRewriteContext {
     _rootStageNode = new HashMap<>();
     _leafNodes = new HashMap<>();
     _joinStages = new HashSet<>();
+    _setOpStages = new HashSet<>();
     _senderInputColocationKeys = new HashMap<>();
   }
 
   /**
-   * Returns the root StageNode for a given stageId.
+   * Returns the root StageNode for a given planFragmentId.
+   */
+  PlanNode getRootStageNode(Integer planFragmentId) {
+    return _rootStageNode.get(planFragmentId);
+  }
+
+  /**
+   * Sets the root StageNode for a given planFragmentId.
+   */
+  void setRootStageNode(Integer planFragmentId, PlanNode planNode) {
+    _rootStageNode.put(planFragmentId, planNode);
+  }
+
+  /**
+   * Returns all the leaf StageNode for a given planFragmentId.
    */
-  StageNode getRootStageNode(Integer stageId) {
-    return _rootStageNode.get(stageId);
+  List<PlanNode> getLeafNodes(Integer planFragmentId) {
+    return _leafNodes.get(planFragmentId);
   }
 
   /**
-   * Sets the root StageNode for a given stageId.
+   * Adds a leaf PlanNode for a given planFragmentId.
    */
-  void setRootStageNode(Integer stageId, StageNode stageNode) {
-    _rootStageNode.put(stageId, stageNode);
+  void addLeafNode(Integer planFragmentId, PlanNode planNode) {
+    _leafNodes.computeIfAbsent(planFragmentId, (x) -> new ArrayList<>()).add(planNode);
   }
 
   /**
-   * Returns all the leaf StageNode for a given stageId.
+   * {@link GreedyShuffleRewriteContext} allows checking whether a given planFragmentId has a JoinNode or not. During
+   * pre-computation, this method may be used to mark that the given planFragmentId has a JoinNode.
    */
-  List<StageNode> getLeafNodes(Integer stageId) {
-    return _leafNodes.get(stageId);
+  void markJoinStage(Integer planFragmentId) {
+    _joinStages.add(planFragmentId);
   }
 
   /**
-   * Adds a leaf StageNode for a given stageId.
+   * Returns true if the given planFragmentId has a JoinNode.
    */
-  void addLeafNode(Integer stageId, StageNode stageNode) {
-    _leafNodes.computeIfAbsent(stageId, (x) -> new ArrayList<>()).add(stageNode);
+  boolean isJoinStage(Integer planFragmentId) {
+    return _joinStages.contains(planFragmentId);
   }
 
   /**
-   * {@link GreedyShuffleRewriteContext} allows checking whether a given stageId has a JoinNode or not. During
-   * pre-computation, this method may be used to mark that the given stageId has a JoinNode.
+   * {@link GreedyShuffleRewriteContext} allows checking whether a given planFragmentId has a SetOpNode or not. During
+   * pre-computation, this method may be used to mark that the given planFragmentId has a SetOpNode.
    */
-  void markJoinStage(Integer stageId) {
-    _joinStages.add(stageId);
+  void markSetOpStage(Integer planFragmentId) {
+    _setOpStages.add(planFragmentId);
   }
 
   /**
-   * Returns true if the given stageId has a JoinNode.
+   * Returns true if the given planFragmentId has a SetOpNode.
    */
-  boolean isJoinStage(Integer stageId) {
-    return _joinStages.contains(stageId);
+  boolean isSetOpStage(Integer planFragmentId) {
+    return _setOpStages.contains(planFragmentId);
   }
 
   /**
-   * This returns the {@link Set<ColocationKey>} for the input to the {@link MailboxSendNode} of the given stageId.
+   * This returns the {@link Set<ColocationKey>} for the input to the {@link MailboxSendNode} of the given
+   * planFragmentId.
    */
-  Set<ColocationKey> getColocationKeys(Integer stageId) {
-    return _senderInputColocationKeys.get(stageId);
+  Set<ColocationKey> getColocationKeys(Integer planFragmentId) {
+    return _senderInputColocationKeys.get(planFragmentId);
   }
 
   /**
-   * This sets the {@link Set<ColocationKey>} for the input to the {@link MailboxSendNode} of the given stageId.
+   * This sets the {@link Set<ColocationKey>} for the input to the {@link MailboxSendNode} of the given planFragmentId.
    */
-  void setColocationKeys(Integer stageId, Set<ColocationKey> colocationKeys) {
-    _senderInputColocationKeys.put(stageId, colocationKeys);
+  void setColocationKeys(Integer planFragmentId, Set<ColocationKey> colocationKeys) {
+    _senderInputColocationKeys.put(planFragmentId, colocationKeys);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewritePreComputeVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewritePreComputeVisitor.java
index d8e67bb598a..f8d7e308429 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewritePreComputeVisitor.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewritePreComputeVisitor.java
@@ -18,11 +18,12 @@
  */
 package org.apache.pinot.query.planner.physical.colocated;
 
-import org.apache.pinot.query.planner.stage.DefaultPostOrderTraversalVisitor;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.TableScanNode;
+import org.apache.pinot.query.planner.plannode.DefaultPostOrderTraversalVisitor;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
 
 
 /**
@@ -31,37 +32,44 @@
 class GreedyShuffleRewritePreComputeVisitor
     extends DefaultPostOrderTraversalVisitor<Integer, GreedyShuffleRewriteContext> {
 
-  static GreedyShuffleRewriteContext preComputeContext(StageNode rootStageNode) {
+  static GreedyShuffleRewriteContext preComputeContext(PlanNode rootPlanNode) {
     GreedyShuffleRewriteContext context = new GreedyShuffleRewriteContext();
-    rootStageNode.visit(new GreedyShuffleRewritePreComputeVisitor(), context);
+    rootPlanNode.visit(new GreedyShuffleRewritePreComputeVisitor(), context);
     return context;
   }
 
   @Override
-  public Integer process(StageNode stageNode, GreedyShuffleRewriteContext context) {
-    int currentStageId = stageNode.getStageId();
-    context.setRootStageNode(currentStageId, stageNode);
+  public Integer process(PlanNode planNode, GreedyShuffleRewriteContext context) {
+    int currentStageId = planNode.getPlanFragmentId();
+    context.setRootStageNode(currentStageId, planNode);
     return 0;
   }
 
   @Override
   public Integer visitJoin(JoinNode joinNode, GreedyShuffleRewriteContext context) {
     super.visitJoin(joinNode, context);
-    context.markJoinStage(joinNode.getStageId());
+    context.markJoinStage(joinNode.getPlanFragmentId());
     return 0;
   }
 
   @Override
-  public Integer visitMailboxReceive(MailboxReceiveNode stageNode, GreedyShuffleRewriteContext context) {
-    super.visitMailboxReceive(stageNode, context);
-    context.addLeafNode(stageNode.getStageId(), stageNode);
+  public Integer visitMailboxReceive(MailboxReceiveNode planNode, GreedyShuffleRewriteContext context) {
+    super.visitMailboxReceive(planNode, context);
+    context.addLeafNode(planNode.getPlanFragmentId(), planNode);
     return 0;
   }
 
   @Override
-  public Integer visitTableScan(TableScanNode stageNode, GreedyShuffleRewriteContext context) {
-    super.visitTableScan(stageNode, context);
-    context.addLeafNode(stageNode.getStageId(), stageNode);
+  public Integer visitTableScan(TableScanNode planNode, GreedyShuffleRewriteContext context) {
+    super.visitTableScan(planNode, context);
+    context.addLeafNode(planNode.getPlanFragmentId(), planNode);
+    return 0;
+  }
+
+  @Override
+  public Integer visitSetOp(SetOpNode setOpNode, GreedyShuffleRewriteContext context) {
+    super.visitSetOp(setOpNode, context);
+    context.markSetOpStage(setOpNode.getPlanFragmentId());
     return 0;
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteVisitor.java
index 95eff8ac914..50f78e64bf3 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteVisitor.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/physical/colocated/GreedyShuffleRewriteVisitor.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.query.planner.physical.colocated;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,23 +29,25 @@
 import java.util.stream.Collectors;
 import org.apache.calcite.rel.RelDistribution;
 import org.apache.pinot.common.config.provider.TableCache;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.StageMetadata;
 import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.StageNodeVisitor;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
+import org.apache.pinot.query.planner.physical.DispatchablePlanMetadata;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
 import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
 import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -63,29 +66,28 @@
  *
  * Also see: {@link ColocationKey} for its definition.
  */
-public class GreedyShuffleRewriteVisitor
-    implements StageNodeVisitor<Set<ColocationKey>, GreedyShuffleRewriteContext> {
+public class GreedyShuffleRewriteVisitor implements PlanNodeVisitor<Set<ColocationKey>, GreedyShuffleRewriteContext> {
   private static final Logger LOGGER = LoggerFactory.getLogger(GreedyShuffleRewriteVisitor.class);
 
   private final TableCache _tableCache;
-  private final Map<Integer, StageMetadata> _stageMetadataMap;
+  private final Map<Integer, DispatchablePlanMetadata> _dispatchablePlanMetadataMap;
   private boolean _canSkipShuffleForJoin;
 
-  public static void optimizeShuffles(QueryPlan queryPlan, TableCache tableCache) {
-    StageNode rootStageNode = queryPlan.getQueryStageMap().get(0);
-    Map<Integer, StageMetadata> stageMetadataMap = queryPlan.getStageMetadataMap();
-    GreedyShuffleRewriteContext context = GreedyShuffleRewritePreComputeVisitor.preComputeContext(rootStageNode);
-    // This assumes that if stageId(S1) > stageId(S2), then S1 is not an ancestor of S2.
+  public static void optimizeShuffles(PlanNode rootPlanNode,
+      Map<Integer, DispatchablePlanMetadata> dispatchablePlanMetadataMap, TableCache tableCache) {
+    GreedyShuffleRewriteContext context = GreedyShuffleRewritePreComputeVisitor.preComputeContext(rootPlanNode);
+    // This assumes that if planFragmentId(S1) > planFragmentId(S2), then S1 is not an ancestor of S2.
     // TODO: If this assumption is wrong, we can compute the reverse topological ordering explicitly.
-    for (int stageId = stageMetadataMap.size() - 1; stageId >= 0; stageId--) {
-      StageNode stageNode = context.getRootStageNode(stageId);
-      stageNode.visit(new GreedyShuffleRewriteVisitor(tableCache, stageMetadataMap), context);
+    for (int planFragmentId = dispatchablePlanMetadataMap.size() - 1; planFragmentId >= 0; planFragmentId--) {
+      PlanNode planNode = context.getRootStageNode(planFragmentId);
+      planNode.visit(new GreedyShuffleRewriteVisitor(tableCache, dispatchablePlanMetadataMap), context);
     }
   }
 
-  private GreedyShuffleRewriteVisitor(TableCache tableCache, Map<Integer, StageMetadata> stageMetadataMap) {
+  private GreedyShuffleRewriteVisitor(TableCache tableCache,
+      Map<Integer, DispatchablePlanMetadata> dispatchablePlanMetadataMap) {
     _tableCache = tableCache;
-    _stageMetadataMap = stageMetadataMap;
+    _dispatchablePlanMetadataMap = dispatchablePlanMetadataMap;
     _canSkipShuffleForJoin = false;
   }
 
@@ -113,8 +115,9 @@ public Set<ColocationKey> visitFilter(FilterNode node, GreedyShuffleRewriteConte
 
   @Override
   public Set<ColocationKey> visitJoin(JoinNode node, GreedyShuffleRewriteContext context) {
-    List<MailboxReceiveNode> innerLeafNodes = context.getLeafNodes(node.getStageId()).stream()
-        .map(x -> (MailboxReceiveNode) x).collect(Collectors.toList());
+    List<MailboxReceiveNode> innerLeafNodes =
+        context.getLeafNodes(node.getPlanFragmentId()).stream().map(x -> (MailboxReceiveNode) x)
+            .collect(Collectors.toList());
     Preconditions.checkState(innerLeafNodes.size() == 2);
 
     // Multiple checks need to be made to ensure that shuffle can be skipped for a join.
@@ -122,8 +125,10 @@ public Set<ColocationKey> visitJoin(JoinNode node, GreedyShuffleRewriteContext c
     boolean canColocate = canJoinBeColocated(node);
     // Step-2: Only if the servers assigned to both left and right nodes are equal and the servers assigned to the join
     //         stage are a superset of those servers, can we skip shuffles.
-    canColocate = canColocate && canServerAssignmentAllowShuffleSkip(node.getStageId(),
-        innerLeafNodes.get(0).getSenderStageId(), innerLeafNodes.get(1).getSenderStageId());
+    canColocate =
+        canColocate && canServerAssignmentAllowShuffleSkip(node.getPlanFragmentId(),
+            innerLeafNodes.get(0).getSenderStageId(),
+            innerLeafNodes.get(1).getSenderStageId());
     // Step-3: For both left/right MailboxReceiveNode/MailboxSendNode pairs, check whether the key partitioning can
     //         allow shuffle skip.
     canColocate = canColocate && partitionKeyConditionForJoin(innerLeafNodes.get(0),
@@ -135,8 +140,8 @@ public Set<ColocationKey> visitJoin(JoinNode node, GreedyShuffleRewriteContext c
     canColocate = canColocate && checkPartitionScheme(innerLeafNodes.get(0), innerLeafNodes.get(1), context);
     if (canColocate) {
       // If shuffle can be skipped, reassign servers.
-      _stageMetadataMap.get(node.getStageId()).setServerInstances(
-          _stageMetadataMap.get(innerLeafNodes.get(0).getSenderStageId()).getServerInstances());
+      _dispatchablePlanMetadataMap.get(node.getPlanFragmentId()).setServerInstanceToWorkerIdMap(
+          _dispatchablePlanMetadataMap.get(innerLeafNodes.get(0).getSenderStageId()).getServerInstanceToWorkerIdMap());
       _canSkipShuffleForJoin = true;
     }
 
@@ -147,8 +152,8 @@ public Set<ColocationKey> visitJoin(JoinNode node, GreedyShuffleRewriteContext c
     Set<ColocationKey> colocationKeys = new HashSet<>(leftPKs);
 
     for (ColocationKey rightColocationKey : rightPks) {
-      ColocationKey newColocationKey = new ColocationKey(rightColocationKey.getNumPartitions(),
-          rightColocationKey.getHashAlgorithm());
+      ColocationKey newColocationKey =
+          new ColocationKey(rightColocationKey.getNumPartitions(), rightColocationKey.getHashAlgorithm());
       for (Integer index : rightColocationKey.getIndices()) {
         newColocationKey.addIndex(leftDataSchemaSize + index);
       }
@@ -163,38 +168,38 @@ public Set<ColocationKey> visitMailboxReceive(MailboxReceiveNode node, GreedyShu
     KeySelector<Object[], Object[]> selector = node.getPartitionKeySelector();
     Set<ColocationKey> oldColocationKeys = context.getColocationKeys(node.getSenderStageId());
     // If the current stage is not a join-stage, then we already know sender's distribution
-    if (!context.isJoinStage(node.getStageId())) {
+    if (!context.isJoinStage(node.getPlanFragmentId())) {
       if (selector == null) {
         return new HashSet<>();
-      } else if (colocationKeyCondition(oldColocationKeys, selector)
-          && areServersSuperset(node.getStageId(), node.getSenderStageId())) {
-        node.setExchangeType(RelDistribution.Type.SINGLETON);
-        _stageMetadataMap.get(node.getStageId()).setServerInstances(
-            _stageMetadataMap.get(node.getSenderStageId()).getServerInstances());
+      } else if (colocationKeyCondition(oldColocationKeys, selector) && areServersSuperset(node.getPlanFragmentId(),
+          node.getSenderStageId())) {
+        node.setDistributionType(RelDistribution.Type.SINGLETON);
+        _dispatchablePlanMetadataMap.get(node.getPlanFragmentId()).setServerInstanceToWorkerIdMap(
+            _dispatchablePlanMetadataMap.get(node.getSenderStageId()).getServerInstanceToWorkerIdMap());
         return oldColocationKeys;
       }
       // This means we can't skip shuffle and there's a partitioning enforced by receiver.
-      int numPartitions = _stageMetadataMap.get(node.getStageId()).getServerInstances().size();
-      List<ColocationKey> colocationKeys =
-          ((FieldSelectionKeySelector) selector).getColumnIndices().stream()
-              .map(x -> new ColocationKey(x, numPartitions, selector.hashAlgorithm())).collect(Collectors.toList());
+      int numPartitions =
+          _dispatchablePlanMetadataMap.get(node.getPlanFragmentId()).getServerInstanceToWorkerIdMap().size();
+      List<ColocationKey> colocationKeys = ((FieldSelectionKeySelector) selector).getColumnIndices().stream()
+          .map(x -> new ColocationKey(x, numPartitions, selector.hashAlgorithm())).collect(Collectors.toList());
       return new HashSet<>(colocationKeys);
     }
     // If the current stage is a join-stage then we already know whether shuffle can be skipped.
     if (_canSkipShuffleForJoin) {
-      node.setExchangeType(RelDistribution.Type.SINGLETON);
+      node.setDistributionType(RelDistribution.Type.SINGLETON);
       // For the join-case, servers are already re-assigned in visitJoin. Moreover, we haven't yet changed sender's
       // distribution.
-      ((MailboxSendNode) node.getSender()).setExchangeType(RelDistribution.Type.SINGLETON);
+      ((MailboxSendNode) node.getSender()).setDistributionType(RelDistribution.Type.SINGLETON);
       return oldColocationKeys;
     } else if (selector == null) {
       return new HashSet<>();
     }
     // This means we can't skip shuffle and there's a partitioning enforced by receiver.
-    int numPartitions = _stageMetadataMap.get(node.getStageId()).getServerInstances().size();
-    List<ColocationKey> colocationKeys =
-        ((FieldSelectionKeySelector) selector).getColumnIndices().stream()
-            .map(x -> new ColocationKey(x, numPartitions, selector.hashAlgorithm())).collect(Collectors.toList());
+    int numPartitions =
+        _dispatchablePlanMetadataMap.get(node.getPlanFragmentId()).getServerInstanceToWorkerIdMap().size();
+    List<ColocationKey> colocationKeys = ((FieldSelectionKeySelector) selector).getColumnIndices().stream()
+        .map(x -> new ColocationKey(x, numPartitions, selector.hashAlgorithm())).collect(Collectors.toList());
     return new HashSet<>(colocationKeys);
   }
 
@@ -207,19 +212,19 @@ public Set<ColocationKey> visitMailboxSend(MailboxSendNode node, GreedyShuffleRe
     // If receiver is not a join-stage, then we can determine distribution type now.
     if (!context.isJoinStage(node.getReceiverStageId())) {
       Set<ColocationKey> colocationKeys;
-      if (canSkipShuffleBasic && areServersSuperset(node.getReceiverStageId(), node.getStageId())) {
+      if (canSkipShuffleBasic && areServersSuperset(node.getReceiverStageId(), node.getPlanFragmentId())) {
         // Servers are not re-assigned on sender-side. If needed, they are re-assigned on the receiver side.
-        node.setExchangeType(RelDistribution.Type.SINGLETON);
+        node.setDistributionType(RelDistribution.Type.SINGLETON);
         colocationKeys = oldColocationKeys;
       } else {
         colocationKeys = new HashSet<>();
       }
-      context.setColocationKeys(node.getStageId(), colocationKeys);
+      context.setColocationKeys(node.getPlanFragmentId(), colocationKeys);
       return colocationKeys;
     }
     // If receiver is a join-stage, remember partition-keys of the child node of MailboxSendNode.
     Set<ColocationKey> mailboxSendColocationKeys = canSkipShuffleBasic ? oldColocationKeys : new HashSet<>();
-    context.setColocationKeys(node.getStageId(), mailboxSendColocationKeys);
+    context.setColocationKeys(node.getPlanFragmentId(), mailboxSendColocationKeys);
     return mailboxSendColocationKeys;
   }
 
@@ -245,10 +250,24 @@ public Set<ColocationKey> visitSort(SortNode node, GreedyShuffleRewriteContext c
     return node.getInputs().get(0).visit(this, context);
   }
 
+  @Override
+  public Set<ColocationKey> visitWindow(WindowNode node, GreedyShuffleRewriteContext context) {
+    return node.getInputs().get(0).visit(this, context);
+  }
+
+  @Override
+  public Set<ColocationKey> visitSetOp(SetOpNode setOpNode, GreedyShuffleRewriteContext context) {
+    return ImmutableSet.of();
+  }
+
+  @Override
+  public Set<ColocationKey> visitExchange(ExchangeNode exchangeNode, GreedyShuffleRewriteContext context) {
+    throw new UnsupportedOperationException("ExchangeNode should not be visited by this visitor");
+  }
+
   @Override
   public Set<ColocationKey> visitTableScan(TableScanNode node, GreedyShuffleRewriteContext context) {
-    TableConfig tableConfig =
-        _tableCache.getTableConfig(node.getTableName());
+    TableConfig tableConfig = _tableCache.getTableConfig(node.getTableName());
     if (tableConfig == null) {
       LOGGER.warn("Couldn't find tableConfig for {}", node.getTableName());
       return new HashSet<>();
@@ -288,8 +307,8 @@ private boolean canJoinBeColocated(JoinNode joinNode) {
    * Checks if servers assigned to the receiver stage are a super-set of the sender stage.
    */
   private boolean areServersSuperset(int receiverStageId, int senderStageId) {
-    return _stageMetadataMap.get(receiverStageId).getServerInstances().containsAll(
-        _stageMetadataMap.get(senderStageId).getServerInstances());
+    return _dispatchablePlanMetadataMap.get(receiverStageId).getServerInstanceToWorkerIdMap().keySet()
+        .containsAll(_dispatchablePlanMetadataMap.get(senderStageId).getServerInstanceToWorkerIdMap().keySet());
   }
 
   /*
@@ -298,9 +317,12 @@ private boolean areServersSuperset(int receiverStageId, int senderStageId) {
    * 2. Servers assigned to the join-stage are a superset of S.
    */
   private boolean canServerAssignmentAllowShuffleSkip(int currentStageId, int leftStageId, int rightStageId) {
-    Set<ServerInstance> leftServerInstances = new HashSet<>(_stageMetadataMap.get(leftStageId).getServerInstances());
-    List<ServerInstance> rightServerInstances = _stageMetadataMap.get(rightStageId).getServerInstances();
-    List<ServerInstance> currentServerInstances = _stageMetadataMap.get(currentStageId).getServerInstances();
+    Set<QueryServerInstance> leftServerInstances = new HashSet<>(_dispatchablePlanMetadataMap.get(leftStageId)
+        .getServerInstanceToWorkerIdMap().keySet());
+    Set<QueryServerInstance> rightServerInstances = _dispatchablePlanMetadataMap.get(rightStageId)
+        .getServerInstanceToWorkerIdMap().keySet();
+    Set<QueryServerInstance> currentServerInstances = _dispatchablePlanMetadataMap.get(currentStageId)
+        .getServerInstanceToWorkerIdMap().keySet();
     return leftServerInstances.containsAll(rightServerInstances)
         && leftServerInstances.size() == rightServerInstances.size()
         && currentServerInstances.containsAll(leftServerInstances);
@@ -317,9 +339,9 @@ private static Set<ColocationKey> computeNewColocationKeys(Set<ColocationKey> ol
     Set<ColocationKey> colocationKeys = new HashSet<>();
     for (ColocationKey colocationKey : oldColocationKeys) {
       boolean shouldDrop = false;
-      ColocationKey newColocationKey
-          = new ColocationKey(colocationKey.getNumPartitions(), colocationKey.getHashAlgorithm());
-      for (Integer index: colocationKey.getIndices()) {
+      ColocationKey newColocationKey =
+          new ColocationKey(colocationKey.getNumPartitions(), colocationKey.getHashAlgorithm());
+      for (Integer index : colocationKey.getIndices()) {
         if (!oldToNewIndex.containsKey(index)) {
           shouldDrop = true;
           break;
@@ -349,10 +371,9 @@ private static boolean colocationKeyCondition(Set<ColocationKey> colocationKeys,
   }
 
   private static boolean partitionKeyConditionForJoin(MailboxReceiveNode mailboxReceiveNode,
-      MailboxSendNode mailboxSendNode,
-      GreedyShuffleRewriteContext context) {
+      MailboxSendNode mailboxSendNode, GreedyShuffleRewriteContext context) {
     // First check ColocationKeyCondition for the sender <--> sender.getInputs().get(0) pair
-    Set<ColocationKey> oldColocationKeys = context.getColocationKeys(mailboxSendNode.getStageId());
+    Set<ColocationKey> oldColocationKeys = context.getColocationKeys(mailboxSendNode.getPlanFragmentId());
     KeySelector<Object[], Object[]> selector = mailboxSendNode.getPartitionKeySelector();
     if (!colocationKeyCondition(oldColocationKeys, selector)) {
       return false;
@@ -381,10 +402,10 @@ private static boolean checkPartitionScheme(MailboxReceiveNode leftReceiveNode,
       GreedyShuffleRewriteContext context) {
     int leftSender = leftReceiveNode.getSenderStageId();
     int rightSender = rightReceiveNode.getSenderStageId();
-    ColocationKey leftPKey = getEquivalentSenderKey(context.getColocationKeys(leftSender),
-        leftReceiveNode.getPartitionKeySelector());
-    ColocationKey rightPKey = getEquivalentSenderKey(context.getColocationKeys(rightSender),
-        rightReceiveNode.getPartitionKeySelector());
+    ColocationKey leftPKey =
+        getEquivalentSenderKey(context.getColocationKeys(leftSender), leftReceiveNode.getPartitionKeySelector());
+    ColocationKey rightPKey =
+        getEquivalentSenderKey(context.getColocationKeys(rightSender), rightReceiveNode.getPartitionKeySelector());
     if (leftPKey.getNumPartitions() != rightPKey.getNumPartitions()) {
       return false;
     }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/AbstractStageNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/AbstractPlanNode.java
similarity index 58%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/AbstractStageNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/AbstractPlanNode.java
index 46de8731b76..c4349097e45 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/AbstractStageNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/AbstractPlanNode.java
@@ -16,45 +16,54 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rel.hint.RelHint;
 import org.apache.pinot.common.proto.Plan;
 import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
 import org.apache.pinot.query.planner.serde.ProtoSerializable;
 import org.apache.pinot.query.planner.serde.ProtoSerializationUtils;
 
 
-public abstract class AbstractStageNode implements StageNode, ProtoSerializable {
+public abstract class AbstractPlanNode implements PlanNode, ProtoSerializable {
 
-  protected final int _stageId;
-  protected final List<StageNode> _inputs;
+  protected int _planFragmentId;
+  protected final List<PlanNode> _inputs;
   protected DataSchema _dataSchema;
 
-  public AbstractStageNode(int stageId) {
-    this(stageId, null);
+  public AbstractPlanNode(int planFragmentId) {
+    this(planFragmentId, null);
   }
 
-  public AbstractStageNode(int stageId, DataSchema dataSchema) {
-    _stageId = stageId;
+  public AbstractPlanNode(int planFragmentId, DataSchema dataSchema) {
+    _planFragmentId = planFragmentId;
     _dataSchema = dataSchema;
     _inputs = new ArrayList<>();
   }
 
   @Override
-  public int getStageId() {
-    return _stageId;
+  public int getPlanFragmentId() {
+    return _planFragmentId;
   }
 
   @Override
-  public List<StageNode> getInputs() {
+  public void setPlanFragmentId(int planFragmentId) {
+    _planFragmentId = planFragmentId;
+  }
+
+  @Override
+  public List<PlanNode> getInputs() {
     return _inputs;
   }
 
   @Override
-  public void addInput(StageNode stageNode) {
-    _inputs.add(stageNode);
+  public void addInput(PlanNode planNode) {
+    _inputs.add(planNode);
   }
 
   @Override
@@ -76,4 +85,19 @@ public void fromObjectField(Plan.ObjectField objectField) {
   public Plan.ObjectField toObjectField() {
     return ProtoSerializationUtils.convertObjectToObjectField(this);
   }
+
+  public static class NodeHint {
+    @ProtoProperties
+    public Map<String, Map<String, String>> _hintOptions;
+    public NodeHint() {
+    }
+
+    public NodeHint(List<RelHint> relHints) {
+      _hintOptions = new HashMap<>();
+      for (RelHint relHint : relHints) {
+        Map<String, String> kvOptions = new HashMap<>(relHint.kvOptions);
+        _hintOptions.put(relHint.hintName, kvOptions);
+      }
+    }
+  }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/AggregateNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/AggregateNode.java
new file mode 100644
index 00000000000..c465fe93f6d
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/AggregateNode.java
@@ -0,0 +1,118 @@
+/**
+ * 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.pinot.query.planner.plannode;
+
+import com.google.common.base.Preconditions;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.calcite.rel.core.AggregateCall;
+import org.apache.calcite.rel.hint.PinotHintOptions;
+import org.apache.calcite.rel.hint.PinotHintStrategyTable;
+import org.apache.calcite.rel.hint.RelHint;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
+
+
+public class AggregateNode extends AbstractPlanNode {
+  @ProtoProperties
+  private NodeHint _nodeHint;
+  @ProtoProperties
+  private List<RexExpression> _aggCalls;
+  @ProtoProperties
+  private List<RexExpression> _groupSet;
+  @ProtoProperties
+  private AggType _aggType;
+
+  public AggregateNode(int planFragmentId) {
+    super(planFragmentId);
+  }
+
+  public AggregateNode(int planFragmentId, DataSchema dataSchema, List<AggregateCall> aggCalls,
+      List<RexExpression> groupSet, List<RelHint> relHints) {
+    super(planFragmentId, dataSchema);
+    Preconditions.checkState(areHintsValid(relHints), "invalid sql hint for agg node: {}", relHints);
+    _aggCalls = aggCalls.stream().map(RexExpression::toRexExpression).collect(Collectors.toList());
+    _groupSet = groupSet;
+    _nodeHint = new NodeHint(relHints);
+    _aggType = AggType.valueOf(PinotHintStrategyTable.getHintOption(relHints, PinotHintOptions.INTERNAL_AGG_OPTIONS,
+        PinotHintOptions.InternalAggregateOptions.AGG_TYPE));
+  }
+
+  private boolean areHintsValid(List<RelHint> relHints) {
+    return PinotHintStrategyTable.containsHint(relHints, PinotHintOptions.INTERNAL_AGG_OPTIONS);
+  }
+
+  public List<RexExpression> getAggCalls() {
+    return _aggCalls;
+  }
+
+  public List<RexExpression> getGroupSet() {
+    return _groupSet;
+  }
+
+  public NodeHint getNodeHint() {
+    return _nodeHint;
+  }
+
+  public AggType getAggType() {
+    return _aggType;
+  }
+
+  @Override
+  public String explain() {
+    return "AGGREGATE_" + _aggType;
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    return visitor.visitAggregate(this, context);
+  }
+
+  /**
+   * Aggregation Types: Pinot aggregation functions can perform operation on input data which
+   *   (1) directly accumulate from raw input, or
+   *   (2) merging multiple intermediate data format;
+   * in terms of output format, it can also
+   *   (1) produce a mergeable intermediate data format, or
+   *   (2) extract result as final result format.
+   */
+  public enum AggType {
+    DIRECT(false, false),
+    LEAF(false, true),
+    INTERMEDIATE(true, true),
+    FINAL(true, false);
+
+    private final boolean _isInputIntermediateFormat;
+    private final boolean _isOutputIntermediateFormat;
+
+    AggType(boolean isInputIntermediateFormat, boolean isOutputIntermediateFormat) {
+      _isInputIntermediateFormat = isInputIntermediateFormat;
+      _isOutputIntermediateFormat = isOutputIntermediateFormat;
+    }
+
+    public boolean isInputIntermediateFormat() {
+      return _isInputIntermediateFormat;
+    }
+
+    public boolean isOutputIntermediateFormat() {
+      return _isOutputIntermediateFormat;
+    }
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/DefaultPostOrderTraversalVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/DefaultPostOrderTraversalVisitor.java
similarity index 80%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/DefaultPostOrderTraversalVisitor.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/DefaultPostOrderTraversalVisitor.java
index f6e6156b179..e1ca593b025 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/DefaultPostOrderTraversalVisitor.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/DefaultPostOrderTraversalVisitor.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 /**
  * A base implementation of a visitor pattern where the children of a given node are visited first and after that the
  * node is processed (post-order traversal).
  */
-public abstract class DefaultPostOrderTraversalVisitor<T, C> implements StageNodeVisitor<T, C> {
+public abstract class DefaultPostOrderTraversalVisitor<T, C> implements PlanNodeVisitor<T, C> {
 
-  public abstract T process(StageNode stageNode, C context);
+  public abstract T process(PlanNode planNode, C context);
 
   @Override
   public T visitAggregate(AggregateNode node, C context) {
@@ -76,7 +76,24 @@ public T visitTableScan(TableScanNode node, C context) {
 
   @Override
   public T visitValue(ValueNode node, C context) {
+    return process(node, context);
+  }
+
+  @Override
+  public T visitWindow(WindowNode node, C context) {
     node.getInputs().get(0).visit(this, context);
     return process(node, context);
   }
+
+  @Override
+  public T visitSetOp(SetOpNode node, C context) {
+    node.getInputs().forEach(input -> input.visit(this, context));
+    return process(node, context);
+  }
+
+  @Override
+  public T visitExchange(ExchangeNode node, C context) {
+    node.getInputs().forEach(input -> input.visit(this, context));
+    return process(node, context);
+  }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ExchangeNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ExchangeNode.java
new file mode 100644
index 00000000000..1d136efb20a
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ExchangeNode.java
@@ -0,0 +1,114 @@
+/**
+ * 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.pinot.query.planner.plannode;
+
+import java.util.List;
+import java.util.Set;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
+
+
+/**
+ * ExchangeNode represents the exchange stage in the query plan.
+ * It is used to exchange the data between the instances.
+ */
+public class ExchangeNode extends AbstractPlanNode {
+
+  @ProtoProperties
+  private PinotRelExchangeType _exchangeType;
+
+  @ProtoProperties
+  private RelDistribution.Type _distributionType;
+
+  @ProtoProperties
+  private List<Integer> _keys;
+
+  @ProtoProperties
+  private boolean _isSortOnSender = false;
+
+  @ProtoProperties
+  private boolean _isSortOnReceiver = false;
+
+  @ProtoProperties
+  private List<RelFieldCollation> _collations;
+
+  /**
+   * The set of tables that are scanned in this planFragment.
+   */
+  @ProtoProperties
+  private Set<String> _tableNames;
+
+  public ExchangeNode(int planFragmentId) {
+    super(planFragmentId);
+  }
+
+  public ExchangeNode(int currentStageId, DataSchema dataSchema, PinotRelExchangeType exchangeType,
+      Set<String> tableNames, RelDistribution distribution, List<RelFieldCollation> collations, boolean isSortOnSender,
+      boolean isSortOnReceiver) {
+    super(currentStageId, dataSchema);
+    _exchangeType = exchangeType;
+    _keys = distribution.getKeys();
+    _distributionType = distribution.getType();
+    _isSortOnSender = isSortOnSender;
+    _isSortOnReceiver = isSortOnReceiver;
+    _collations = collations;
+    _tableNames = tableNames;
+  }
+
+  @Override
+  public String explain() {
+    return "EXCHANGE";
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    return visitor.visitExchange(this, context);
+  }
+
+  public PinotRelExchangeType getExchangeType() {
+    return _exchangeType;
+  }
+
+  public RelDistribution.Type getDistributionType() {
+    return _distributionType;
+  }
+
+  public List<Integer> getDistributionKeys() {
+    return _keys;
+  }
+
+  public boolean isSortOnSender() {
+    return _isSortOnSender;
+  }
+
+  public boolean isSortOnReceiver() {
+    return _isSortOnReceiver;
+  }
+
+  public List<RelFieldCollation> getCollations() {
+    return _collations;
+  }
+
+  public Set<String> getTableNames() {
+    return _tableNames;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/FilterNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/FilterNode.java
similarity index 86%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/FilterNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/FilterNode.java
index 52ed004da16..15d4ff15c87 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/FilterNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/FilterNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import org.apache.calcite.rex.RexNode;
 import org.apache.pinot.common.utils.DataSchema;
@@ -24,12 +24,12 @@
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 
 
-public class FilterNode extends AbstractStageNode {
+public class FilterNode extends AbstractPlanNode {
   @ProtoProperties
   private RexExpression _condition;
 
-  public FilterNode(int stageId) {
-    super(stageId);
+  public FilterNode(int planFragmentId) {
+    super(planFragmentId);
   }
 
   public FilterNode(int currentStageId, DataSchema dataSchema, RexNode condition) {
@@ -47,7 +47,7 @@ public String explain() {
   }
 
   @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
     return visitor.visitFilter(this, context);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/JoinNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/JoinNode.java
similarity index 69%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/JoinNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/JoinNode.java
index af9b4e03ed1..b0f576258c5 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/JoinNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/JoinNode.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
+import java.util.Arrays;
 import java.util.List;
 import org.apache.calcite.rel.core.JoinRelType;
 import org.apache.pinot.common.utils.DataSchema;
@@ -27,24 +28,33 @@
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 
 
-public class JoinNode extends AbstractStageNode {
+public class JoinNode extends AbstractPlanNode {
   @ProtoProperties
   private JoinRelType _joinRelType;
   @ProtoProperties
   private JoinKeys _joinKeys;
   @ProtoProperties
   private List<RexExpression> _joinClause;
+  @ProtoProperties
+  private boolean _isColocatedJoin;
+  @ProtoProperties
+  private List<String> _leftColumnNames;
+  @ProtoProperties
+  private List<String> _rightColumnNames;
 
-  public JoinNode(int stageId) {
-    super(stageId);
+  public JoinNode(int planFragmentId) {
+    super(planFragmentId);
   }
 
-  public JoinNode(int stageId, DataSchema dataSchema, JoinRelType joinRelType, JoinKeys joinKeys,
-      List<RexExpression> joinClause) {
-    super(stageId, dataSchema);
+  public JoinNode(int planFragmentId, DataSchema dataSchema, DataSchema leftSchema, DataSchema rightSchema,
+      JoinRelType joinRelType, JoinKeys joinKeys, List<RexExpression> joinClause, boolean isColocatedJoin) {
+    super(planFragmentId, dataSchema);
+    _leftColumnNames = Arrays.asList(leftSchema.getColumnNames());
+    _rightColumnNames = Arrays.asList(rightSchema.getColumnNames());
     _joinRelType = joinRelType;
     _joinKeys = joinKeys;
     _joinClause = joinClause;
+    _isColocatedJoin = isColocatedJoin;
   }
 
   public JoinRelType getJoinRelType() {
@@ -59,13 +69,25 @@ public List<RexExpression> getJoinClauses() {
     return _joinClause;
   }
 
+  public boolean isColocatedJoin() {
+    return _isColocatedJoin;
+  }
+
+  public List<String> getLeftColumnNames() {
+    return _leftColumnNames;
+  }
+
+  public List<String> getRightColumnNames() {
+    return _rightColumnNames;
+  }
+
   @Override
   public String explain() {
     return "JOIN";
   }
 
   @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
     return visitor.visitJoin(this, context);
   }
 
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/MailboxReceiveNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/MailboxReceiveNode.java
new file mode 100644
index 00000000000..c2515edbb6a
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/MailboxReceiveNode.java
@@ -0,0 +1,165 @@
+/**
+ * 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.pinot.query.planner.plannode;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.partitioning.KeySelector;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
+
+
+public class MailboxReceiveNode extends AbstractPlanNode {
+  @ProtoProperties
+  private int _senderStageId;
+  @ProtoProperties
+  private RelDistribution.Type _distributionType;
+  @ProtoProperties
+  private PinotRelExchangeType _exchangeType;
+  @ProtoProperties
+  private KeySelector<Object[], Object[]> _partitionKeySelector;
+  @ProtoProperties
+  private List<RexExpression> _collationKeys;
+  @ProtoProperties
+  private List<Direction> _collationDirections;
+  @ProtoProperties
+  private List<NullDirection> _collationNullDirections;
+  @ProtoProperties
+  private boolean _isSortOnSender;
+  @ProtoProperties
+  private boolean _isSortOnReceiver;
+
+  // this is only available during planning and should not be relied
+  // on in any post-serialization code
+  private transient PlanNode _sender;
+
+  public MailboxReceiveNode(int planFragmentId) {
+    super(planFragmentId);
+  }
+
+  public MailboxReceiveNode(int planFragmentId, DataSchema dataSchema, int senderStageId,
+      RelDistribution.Type distributionType, PinotRelExchangeType exchangeType,
+      @Nullable KeySelector<Object[], Object[]> partitionKeySelector,
+      @Nullable List<RelFieldCollation> fieldCollations, boolean isSortOnSender, boolean isSortOnReceiver,
+      PlanNode sender) {
+    super(planFragmentId, dataSchema);
+    _senderStageId = senderStageId;
+    _distributionType = distributionType;
+    _exchangeType = exchangeType;
+    _partitionKeySelector = partitionKeySelector;
+    if (!CollectionUtils.isEmpty(fieldCollations)) {
+      int numCollations = fieldCollations.size();
+      _collationKeys = new ArrayList<>(numCollations);
+      _collationDirections = new ArrayList<>(numCollations);
+      _collationNullDirections = new ArrayList<>(numCollations);
+      for (RelFieldCollation fieldCollation : fieldCollations) {
+        _collationKeys.add(new RexExpression.InputRef(fieldCollation.getFieldIndex()));
+        Direction direction = fieldCollation.getDirection();
+        Preconditions.checkArgument(direction == Direction.ASCENDING || direction == Direction.DESCENDING,
+            "Unsupported ORDER-BY direction: %s", direction);
+        _collationDirections.add(direction);
+        NullDirection nullDirection = fieldCollation.nullDirection;
+        if (nullDirection == NullDirection.UNSPECIFIED) {
+          nullDirection = direction == Direction.ASCENDING ? NullDirection.LAST : NullDirection.FIRST;
+        }
+        _collationNullDirections.add(nullDirection);
+      }
+    } else {
+      _collationKeys = Collections.emptyList();
+      _collationDirections = Collections.emptyList();
+      _collationNullDirections = Collections.emptyList();
+    }
+    _isSortOnSender = isSortOnSender;
+    Preconditions.checkState(!isSortOnSender, "Input shouldn't be sorted as ordering on send is not yet implemented!");
+    _isSortOnReceiver = isSortOnReceiver;
+    _sender = sender;
+  }
+
+  public void setSenderStageId(Integer senderStageId) {
+    _senderStageId = senderStageId;
+  }
+
+  public int getSenderStageId() {
+    return _senderStageId;
+  }
+
+  public void setDistributionType(RelDistribution.Type distributionType) {
+    _distributionType = distributionType;
+  }
+
+  public RelDistribution.Type getDistributionType() {
+    return _distributionType;
+  }
+
+  public void setExchangeType(PinotRelExchangeType exchangeType) {
+    _exchangeType = exchangeType;
+  }
+
+  public PinotRelExchangeType getExchangeType() {
+    return _exchangeType;
+  }
+
+  public KeySelector<Object[], Object[]> getPartitionKeySelector() {
+    return _partitionKeySelector;
+  }
+
+  public List<RexExpression> getCollationKeys() {
+    return _collationKeys;
+  }
+
+  public List<Direction> getCollationDirections() {
+    return _collationDirections;
+  }
+
+  public List<NullDirection> getCollationNullDirections() {
+    return _collationNullDirections;
+  }
+
+  public boolean isSortOnSender() {
+    return _isSortOnSender;
+  }
+
+  public boolean isSortOnReceiver() {
+    return _isSortOnReceiver;
+  }
+
+  public PlanNode getSender() {
+    return _sender;
+  }
+
+  @Override
+  public String explain() {
+    return "MAIL_RECEIVE(" + _distributionType + ")";
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    return visitor.visitMailboxReceive(this, context);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/MailboxSendNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/MailboxSendNode.java
new file mode 100644
index 00000000000..1edf2902df4
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/MailboxSendNode.java
@@ -0,0 +1,130 @@
+/**
+ * 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.pinot.query.planner.plannode;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.partitioning.KeySelector;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
+
+
+public class MailboxSendNode extends AbstractPlanNode {
+  @ProtoProperties
+  private int _receiverStageId;
+  @ProtoProperties
+  private RelDistribution.Type _distributionType;
+  @ProtoProperties
+  private PinotRelExchangeType _exchangeType;
+  @ProtoProperties
+  private KeySelector<Object[], Object[]> _partitionKeySelector;
+  @ProtoProperties
+  private List<RexExpression> _collationKeys;
+  @ProtoProperties
+  private List<RelFieldCollation.Direction> _collationDirections;
+  @ProtoProperties
+  private boolean _isSortOnSender;
+
+  public MailboxSendNode(int planFragmentId) {
+    super(planFragmentId);
+  }
+
+  public MailboxSendNode(int planFragmentId, DataSchema dataSchema, int receiverStageId,
+      RelDistribution.Type distributionType, PinotRelExchangeType exchangeType,
+      @Nullable KeySelector<Object[], Object[]> partitionKeySelector,
+      @Nullable List<RelFieldCollation> fieldCollations, boolean isSortOnSender) {
+    super(planFragmentId, dataSchema);
+    _receiverStageId = receiverStageId;
+    _distributionType = distributionType;
+    _exchangeType = exchangeType;
+    _partitionKeySelector = partitionKeySelector;
+    // TODO: Support ordering here if the 'fieldCollations' aren't empty and 'sortOnSender' is true
+    Preconditions.checkState(!isSortOnSender, "Ordering is not yet supported on Mailbox Send");
+    if (!CollectionUtils.isEmpty(fieldCollations) && isSortOnSender) {
+      _collationKeys = new ArrayList<>(fieldCollations.size());
+      _collationDirections = new ArrayList<>(fieldCollations.size());
+      for (RelFieldCollation fieldCollation : fieldCollations) {
+        _collationDirections.add(fieldCollation.getDirection());
+        _collationKeys.add(new RexExpression.InputRef(fieldCollation.getFieldIndex()));
+      }
+    } else {
+      _collationKeys = Collections.emptyList();
+      _collationDirections = Collections.emptyList();
+    }
+    _isSortOnSender = isSortOnSender;
+  }
+
+  public int getReceiverStageId() {
+    return _receiverStageId;
+  }
+
+  public void setReceiverStageId(int receiverStageId) {
+    _receiverStageId = receiverStageId;
+  }
+
+  public void setDistributionType(RelDistribution.Type distributionType) {
+    _distributionType = distributionType;
+  }
+
+  public RelDistribution.Type getDistributionType() {
+    return _distributionType;
+  }
+
+  public void setExchangeType(PinotRelExchangeType exchangeType) {
+    _exchangeType = exchangeType;
+  }
+
+  public PinotRelExchangeType getExchangeType() {
+    return _exchangeType;
+  }
+
+  public KeySelector<Object[], Object[]> getPartitionKeySelector() {
+    return _partitionKeySelector;
+  }
+
+  public List<RexExpression> getCollationKeys() {
+    return _collationKeys;
+  }
+
+  public List<RelFieldCollation.Direction> getCollationDirections() {
+    return _collationDirections;
+  }
+
+  public boolean isSortOnSender() {
+    return _isSortOnSender;
+  }
+
+  @Override
+  public String explain() {
+    return "MAIL_SEND(" + _distributionType + ")";
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    return visitor.visitMailboxSend(this, context);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/PlanNode.java
similarity index 71%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/PlanNode.java
index 7e3278cfe87..1e6aa32d0ed 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/PlanNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import java.io.Serializable;
 import java.util.List;
@@ -24,20 +24,22 @@
 
 
 /**
- * Stage Node is a serializable version of the {@link org.apache.calcite.rel.RelNode}.
+ * PlanNode is a serializable version of the {@link org.apache.calcite.rel.RelNode}.
  *
- * TODO: stage node currently uses java.io.Serializable as its serialization format.
+ * TODO: PlanNode currently uses java.io.Serializable as its serialization format.
  * We should experiment with other type of serialization format for better performance.
  * Essentially what we need is a way to exclude the planner context from the RelNode but only keeps the
- * constructed relational content because we will no longer revisit the planner after stage is created.
+ * constructed relational content because we will no longer revisit the planner after PlanFragment is created.
  */
-public interface StageNode extends Serializable {
+public interface PlanNode extends Serializable {
 
-  int getStageId();
+  int getPlanFragmentId();
 
-  List<StageNode> getInputs();
+  void setPlanFragmentId(int planFragmentId);
 
-  void addInput(StageNode stageNode);
+  List<PlanNode> getInputs();
+
+  void addInput(PlanNode planNode);
 
   DataSchema getDataSchema();
 
@@ -45,5 +47,5 @@ public interface StageNode extends Serializable {
 
   String explain();
 
-  <T, C> T visit(StageNodeVisitor<T, C> visitor, C context);
+  <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context);
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNodeVisitor.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/PlanNodeVisitor.java
similarity index 70%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNodeVisitor.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/PlanNodeVisitor.java
index 614dbb877ad..f2da4731e97 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNodeVisitor.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/PlanNodeVisitor.java
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
-import org.apache.pinot.query.planner.QueryPlan;
+import org.apache.pinot.query.planner.PhysicalExplainPlanVisitor;
 
 
 /**
- * {@code StageNodeVisitor} is a skeleton class that allows for implementations of {@code StageNode}
- * tree traversals using the {@link StageNode#visit(StageNodeVisitor, Object)} method. There is no
+ * {@code PlanNodeVisitor} is a skeleton class that allows for implementations of {@code PlanNode}
+ * tree traversals using the {@link PlanNode#visit(PlanNodeVisitor, Object)} method. There is no
  * enforced traversal order, and should be implemented by subclasses.
  *
  * <p>It is recommended that implementors use private constructors and static methods to access main
- * functionality (see {@link org.apache.pinot.query.planner.ExplainPlanStageVisitor#explain(QueryPlan)}
+ * functionality (see {@link PhysicalExplainPlanVisitor#explain(org.apache.pinot.query.planner.DispatchableSubPlan)}
  * as an example of a usage of this pattern.
  *
- * @param <T> the return type for all visits
- * @param <C> a Context that will be passed as the second parameter to {@code StageNode#visit},
+ * @param <T> the return type for all visitsPlanNodeVisitor
+ * @param <C> a Context that will be passed as the second parameter to {@code PlanNode#visit},
  *            implementors can decide how they want to use this context (e.g. whether or not
  *            it can be modified in place or whether it's an immutable context)
  */
-public interface StageNodeVisitor<T, C> {
+public interface PlanNodeVisitor<T, C> {
 
   T visitAggregate(AggregateNode node, C context);
 
@@ -54,4 +54,10 @@ public interface StageNodeVisitor<T, C> {
   T visitTableScan(TableScanNode node, C context);
 
   T visitValue(ValueNode node, C context);
+
+  T visitWindow(WindowNode node, C context);
+
+  T visitSetOp(SetOpNode setOpNode, C context);
+
+  T visitExchange(ExchangeNode exchangeNode, C context);
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/ProjectNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ProjectNode.java
similarity index 86%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/ProjectNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ProjectNode.java
index 8371dda609f..9333e89893f 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/ProjectNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ProjectNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -26,12 +26,12 @@
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 
 
-public class ProjectNode extends AbstractStageNode {
+public class ProjectNode extends AbstractPlanNode {
   @ProtoProperties
   private List<RexExpression> _projects;
 
-  public ProjectNode(int stageId) {
-    super(stageId);
+  public ProjectNode(int planFragmentId) {
+    super(planFragmentId);
   }
   public ProjectNode(int currentStageId, DataSchema dataSchema, List<RexNode> projects) {
     super(currentStageId, dataSchema);
@@ -48,7 +48,7 @@ public String explain() {
   }
 
   @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
     return visitor.visitProject(this, context);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/SetOpNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/SetOpNode.java
new file mode 100644
index 00000000000..1eefcb93de2
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/SetOpNode.java
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.query.planner.plannode;
+
+import org.apache.calcite.rel.core.SetOp;
+import org.apache.calcite.rel.logical.LogicalIntersect;
+import org.apache.calcite.rel.logical.LogicalMinus;
+import org.apache.calcite.rel.logical.LogicalUnion;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
+
+
+/**
+ * Set operation node is used to represent UNION, INTERSECT, EXCEPT.
+ */
+public class SetOpNode extends AbstractPlanNode {
+
+  @ProtoProperties
+  private SetOpType _setOpType;
+
+  @ProtoProperties
+  private boolean _all;
+
+  public SetOpNode(int planFragmentId) {
+    super(planFragmentId);
+  }
+
+  public SetOpNode(SetOpType setOpType, int planFragmentId, DataSchema dataSchema, boolean all) {
+    super(planFragmentId, dataSchema);
+    _setOpType = setOpType;
+    _all = all;
+  }
+
+  public SetOpType getSetOpType() {
+    return _setOpType;
+  }
+
+  public boolean isAll() {
+    return _all;
+  }
+
+  @Override
+  public String explain() {
+    return _setOpType.toString();
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    return visitor.visitSetOp(this, context);
+  }
+
+  public enum SetOpType {
+    UNION, INTERSECT, MINUS;
+
+    public static SetOpType fromObject(SetOp setOp) {
+      if (setOp instanceof LogicalUnion) {
+        return UNION;
+      }
+      if (setOp instanceof LogicalIntersect) {
+        return INTERSECT;
+      }
+      if (setOp instanceof LogicalMinus) {
+        return MINUS;
+      }
+      throw new IllegalArgumentException("Unsupported set operation: " + setOp.getClass());
+    }
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/SortNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/SortNode.java
similarity index 50%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/SortNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/SortNode.java
index 4ffe901b209..293a8f9edae 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/SortNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/SortNode.java
@@ -16,50 +16,70 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
+import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 
 
-public class SortNode extends AbstractStageNode {
+public class SortNode extends AbstractPlanNode {
   @ProtoProperties
   private List<RexExpression> _collationKeys;
   @ProtoProperties
-  private List<RelFieldCollation.Direction> _collationDirections;
+  private List<Direction> _collationDirections;
+  @ProtoProperties
+  private List<NullDirection> _collationNullDirections;
   @ProtoProperties
   private int _fetch;
   @ProtoProperties
   private int _offset;
 
-  public SortNode(int stageId) {
-    super(stageId);
+  public SortNode(int planFragmentId) {
+    super(planFragmentId);
   }
 
-  public SortNode(int stageId, List<RelFieldCollation> fieldCollations, int fetch, int offset, DataSchema dataSchema) {
-    super(stageId, dataSchema);
-    _collationDirections = new ArrayList<>(fieldCollations.size());
-    _collationKeys = new ArrayList<>(fieldCollations.size());
-    _fetch = fetch;
-    _offset = offset;
+  public SortNode(int planFragmentId, List<RelFieldCollation> fieldCollations, int fetch, int offset,
+      DataSchema dataSchema) {
+    super(planFragmentId, dataSchema);
+    int numCollations = fieldCollations.size();
+    _collationKeys = new ArrayList<>(numCollations);
+    _collationDirections = new ArrayList<>(numCollations);
+    _collationNullDirections = new ArrayList<>(numCollations);
     for (RelFieldCollation fieldCollation : fieldCollations) {
-      _collationDirections.add(fieldCollation.getDirection());
       _collationKeys.add(new RexExpression.InputRef(fieldCollation.getFieldIndex()));
+      Direction direction = fieldCollation.getDirection();
+      Preconditions.checkArgument(direction == Direction.ASCENDING || direction == Direction.DESCENDING,
+          "Unsupported ORDER-BY direction: %s", direction);
+      _collationDirections.add(direction);
+      NullDirection nullDirection = fieldCollation.nullDirection;
+      if (nullDirection == NullDirection.UNSPECIFIED) {
+        nullDirection = direction == Direction.ASCENDING ? NullDirection.LAST : NullDirection.FIRST;
+      }
+      _collationNullDirections.add(nullDirection);
     }
+    _fetch = fetch;
+    _offset = offset;
   }
 
   public List<RexExpression> getCollationKeys() {
     return _collationKeys;
   }
 
-  public List<RelFieldCollation.Direction> getCollationDirections() {
+  public List<Direction> getCollationDirections() {
     return _collationDirections;
   }
 
+  public List<NullDirection> getCollationNullDirections() {
+    return _collationNullDirections;
+  }
+
   public int getFetch() {
     return _fetch;
   }
@@ -70,13 +90,11 @@ public int getOffset() {
 
   @Override
   public String explain() {
-    return String.format("SORT%s%s",
-        (_fetch > 0) ? " LIMIT " + _fetch : "",
-        (_offset > 0) ? " OFFSET " + _offset : "");
+    return String.format("SORT%s%s", (_fetch > 0) ? " LIMIT " + _fetch : "", (_offset > 0) ? " OFFSET " + _offset : "");
   }
 
   @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
     return visitor.visitSort(this, context);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNodeSerDeUtils.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/StageNodeSerDeUtils.java
similarity index 58%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNodeSerDeUtils.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/StageNodeSerDeUtils.java
index 69de8bcba68..e803d4beee0 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/StageNodeSerDeUtils.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/StageNodeSerDeUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import org.apache.pinot.common.proto.Plan;
 import org.apache.pinot.common.utils.DataSchema;
@@ -27,28 +27,28 @@ private StageNodeSerDeUtils() {
     // do not instantiate.
   }
 
-  public static AbstractStageNode deserializeStageNode(Plan.StageNode protoNode) {
-    AbstractStageNode stageNode = newNodeInstance(protoNode.getNodeName(), protoNode.getStageId());
-    stageNode.setDataSchema(extractDataSchema(protoNode));
-    stageNode.fromObjectField(protoNode.getObjectField());
+  public static AbstractPlanNode deserializeStageNode(Plan.StageNode protoNode) {
+    AbstractPlanNode planNode = newNodeInstance(protoNode.getNodeName(), protoNode.getStageId());
+    planNode.setDataSchema(extractDataSchema(protoNode));
+    planNode.fromObjectField(protoNode.getObjectField());
     for (Plan.StageNode protoChild : protoNode.getInputsList()) {
-      stageNode.addInput(deserializeStageNode(protoChild));
+      planNode.addInput(deserializeStageNode(protoChild));
     }
-    return stageNode;
+    return planNode;
   }
 
-  public static Plan.StageNode serializeStageNode(AbstractStageNode stageNode) {
+  public static Plan.StageNode serializeStageNode(AbstractPlanNode planNode) {
     Plan.StageNode.Builder builder = Plan.StageNode.newBuilder()
-        .setStageId(stageNode.getStageId())
-        .setNodeName(stageNode.getClass().getSimpleName())
-        .setObjectField(stageNode.toObjectField());
-    DataSchema dataSchema = stageNode.getDataSchema();
+        .setStageId(planNode.getPlanFragmentId())
+        .setNodeName(planNode.getClass().getSimpleName())
+        .setObjectField(planNode.toObjectField());
+    DataSchema dataSchema = planNode.getDataSchema();
     for (int i = 0; i < dataSchema.getColumnNames().length; i++) {
       builder.addColumnNames(dataSchema.getColumnName(i));
       builder.addColumnDataTypes(dataSchema.getColumnDataType(i).name());
     }
-    for (StageNode childNode : stageNode.getInputs()) {
-      builder.addInputs(serializeStageNode((AbstractStageNode) childNode));
+    for (PlanNode childNode : planNode.getInputs()) {
+      builder.addInputs(serializeStageNode((AbstractPlanNode) childNode));
     }
     return builder.build();
   }
@@ -63,26 +63,33 @@ private static DataSchema extractDataSchema(Plan.StageNode protoNode) {
     return new DataSchema(columnNames, columnDataTypes);
   }
 
-  private static AbstractStageNode newNodeInstance(String nodeName, int stageId) {
+  private static AbstractPlanNode newNodeInstance(String nodeName, int planFragmentId) {
     switch (nodeName) {
       case "TableScanNode":
-        return new TableScanNode(stageId);
+        return new TableScanNode(planFragmentId);
       case "JoinNode":
-        return new JoinNode(stageId);
+        return new JoinNode(planFragmentId);
       case "ProjectNode":
-        return new ProjectNode(stageId);
+        return new ProjectNode(planFragmentId);
       case "FilterNode":
-        return new FilterNode(stageId);
+        return new FilterNode(planFragmentId);
       case "AggregateNode":
-        return new AggregateNode(stageId);
+        return new AggregateNode(planFragmentId);
       case "SortNode":
-        return new SortNode(stageId);
+        return new SortNode(planFragmentId);
       case "MailboxSendNode":
-        return new MailboxSendNode(stageId);
+        return new MailboxSendNode(planFragmentId);
       case "MailboxReceiveNode":
-        return new MailboxReceiveNode(stageId);
+        return new MailboxReceiveNode(planFragmentId);
       case "ValueNode":
-        return new ValueNode(stageId);
+        return new ValueNode(planFragmentId);
+      case "WindowNode":
+        return new WindowNode(planFragmentId);
+      case "SetOpNode":
+        return new SetOpNode(planFragmentId);
+      case "ExchangeNode":
+        throw new IllegalArgumentException(
+            "ExchangeNode should be already split into MailboxSendNode and MailboxReceiveNode");
       default:
         throw new IllegalArgumentException("Unknown node name: " + nodeName);
     }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/TableScanNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/TableScanNode.java
similarity index 69%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/TableScanNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/TableScanNode.java
index 7711dd62350..070e09d2090 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/TableScanNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/TableScanNode.java
@@ -16,26 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import java.util.List;
+import org.apache.calcite.rel.hint.RelHint;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 
 
-public class TableScanNode extends AbstractStageNode {
+public class TableScanNode extends AbstractPlanNode {
+  @ProtoProperties
+  private NodeHint _nodeHint;
   @ProtoProperties
   private String _tableName;
   @ProtoProperties
   private List<String> _tableScanColumns;
 
-  public TableScanNode(int stageId) {
-    super(stageId);
+  public TableScanNode(int planFragmentId) {
+    super(planFragmentId);
   }
 
-  public TableScanNode(int stageId, DataSchema dataSchema, String tableName, List<String> tableScanColumns) {
-    super(stageId, dataSchema);
+  public TableScanNode(int planFragmentId, DataSchema dataSchema, List<RelHint> relHints, String tableName,
+      List<String> tableScanColumns) {
+    super(planFragmentId, dataSchema);
     _tableName = tableName;
+    _nodeHint = new NodeHint(relHints);
     _tableScanColumns = tableScanColumns;
   }
 
@@ -47,13 +52,17 @@ public List<String> getTableScanColumns() {
     return _tableScanColumns;
   }
 
+  public NodeHint getNodeHint() {
+    return _nodeHint;
+  }
+
   @Override
   public String explain() {
     return "TABLE SCAN (" + _tableName + ")";
   }
 
   @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
     return visitor.visitTableScan(this, context);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/ValueNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ValueNode.java
similarity index 88%
rename from pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/ValueNode.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ValueNode.java
index b3ad0d40f61..248af5d8a27 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/ValueNode.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/ValueNode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
@@ -27,12 +27,12 @@
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 
 
-public class ValueNode extends AbstractStageNode {
+public class ValueNode extends AbstractPlanNode {
   @ProtoProperties
   private List<List<RexExpression>> _literalRows;
 
-  public ValueNode(int stageId) {
-    super(stageId);
+  public ValueNode(int planFragmentId) {
+    super(planFragmentId);
   }
 
   public ValueNode(int currentStageId, DataSchema dataSchema,
@@ -58,7 +58,7 @@ public String explain() {
   }
 
   @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
     return visitor.visitValue(this, context);
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/WindowNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/WindowNode.java
new file mode 100644
index 00000000000..d51da18d8d3
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/plannode/WindowNode.java
@@ -0,0 +1,153 @@
+/**
+ * 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.pinot.query.planner.plannode;
+
+import com.clearspring.analytics.util.Preconditions;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.core.Window;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.serde.ProtoProperties;
+
+
+public class WindowNode extends AbstractPlanNode {
+  @ProtoProperties
+  private List<RexExpression> _groupSet;
+  @ProtoProperties
+  private List<RexExpression> _orderSet;
+  @ProtoProperties
+  private List<RelFieldCollation.Direction> _orderSetDirection;
+  @ProtoProperties
+  private List<RelFieldCollation.NullDirection> _orderSetNullDirection;
+  @ProtoProperties
+  private List<RexExpression> _aggCalls;
+  @ProtoProperties
+  private int _lowerBound;
+  @ProtoProperties
+  private int _upperBound;
+  @ProtoProperties
+  private List<RexExpression> _constants;
+  @ProtoProperties
+  private WindowFrameType _windowFrameType;
+
+  /**
+   * Enum to denote the type of window frame
+   * ROWS - ROWS type window frame
+   * RANGE - RANGE type window frame
+   */
+  public enum WindowFrameType {
+    ROWS,
+    RANGE
+  }
+
+  public WindowNode(int planFragmentId) {
+    super(planFragmentId);
+  }
+
+  public WindowNode(int planFragmentId, List<Window.Group> windowGroups, List<RexLiteral> constants,
+      DataSchema dataSchema) {
+    super(planFragmentId, dataSchema);
+    // Only a single Window Group should exist per WindowNode.
+    Preconditions.checkState(windowGroups.size() == 1,
+        String.format("Only a single window group is allowed! Number of window groups: %d", windowGroups.size()));
+    Window.Group windowGroup = windowGroups.get(0);
+
+    _groupSet = windowGroup.keys == null ? Collections.emptyList() : RexExpression.toRexInputRefs(windowGroup.keys);
+    List<RelFieldCollation> relFieldCollations = windowGroup.orderKeys == null ? new ArrayList<>()
+        : windowGroup.orderKeys.getFieldCollations();
+    _orderSet = new ArrayList<>(relFieldCollations.size());
+    _orderSetDirection = new ArrayList<>(relFieldCollations.size());
+    _orderSetNullDirection = new ArrayList<>(relFieldCollations.size());
+    for (RelFieldCollation relFieldCollation : relFieldCollations) {
+      _orderSet.add(new RexExpression.InputRef(relFieldCollation.getFieldIndex()));
+      _orderSetDirection.add(relFieldCollation.direction);
+      _orderSetNullDirection.add(relFieldCollation.nullDirection);
+    }
+    _aggCalls = windowGroup.aggCalls.stream().map(RexExpression::toRexExpression).collect(Collectors.toList());
+
+    // TODO: For now only the default frame is supported. Add support for custom frames including rows support.
+    //       Frame literals come in the constants from the LogicalWindow and the bound.getOffset() stores the
+    //       InputRef to the constants array offset by the input array length. These need to be extracted here and
+    //       set to the bounds.
+
+    // Lower bound can only be unbounded preceding for now, set to Integer.MIN_VALUE
+    _lowerBound = Integer.MIN_VALUE;
+    // Upper bound can only be unbounded following or current row for now
+    _upperBound = windowGroup.upperBound.isUnbounded() ? Integer.MAX_VALUE : 0;
+    _windowFrameType = windowGroup.isRows ? WindowFrameType.ROWS : WindowFrameType.RANGE;
+
+    // TODO: Constants are used to store constants needed such as the frame literals. For now just save this, need to
+    //       extract the constant values into bounds as a part of frame support.
+    _constants = new ArrayList<>();
+    for (RexLiteral constant : constants) {
+      _constants.add(RexExpression.toRexExpression(constant));
+    }
+  }
+
+  @Override
+  public String explain() {
+    return "WINDOW";
+  }
+
+  @Override
+  public <T, C> T visit(PlanNodeVisitor<T, C> visitor, C context) {
+    return visitor.visitWindow(this, context);
+  }
+
+  public List<RexExpression> getGroupSet() {
+    return _groupSet;
+  }
+
+  public List<RexExpression> getOrderSet() {
+    return _orderSet;
+  }
+
+  public List<RelFieldCollation.Direction> getOrderSetDirection() {
+    return _orderSetDirection;
+  }
+
+  public List<RelFieldCollation.NullDirection> getOrderSetNullDirection() {
+    return _orderSetNullDirection;
+  }
+
+  public List<RexExpression> getAggCalls() {
+    return _aggCalls;
+  }
+
+  public int getLowerBound() {
+    return _lowerBound;
+  }
+
+  public int getUpperBound() {
+    return _upperBound;
+  }
+
+  public WindowFrameType getWindowFrameType() {
+    return _windowFrameType;
+  }
+
+  public List<RexExpression> getConstants() {
+    return _constants;
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/serde/ProtoProperties.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/serde/ProtoProperties.java
index 5a10b91941f..b3057db532a 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/serde/ProtoProperties.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/serde/ProtoProperties.java
@@ -28,11 +28,12 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.apache.pinot.query.planner.plannode.PlanNode;
 
 
 /**
  * Annotation {@code ProtoProperties} indicates whether a field defined in a
- * {@link org.apache.pinot.query.planner.stage.StageNode} should be serialized.
+ * {@link PlanNode} should be serialized.
  */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/AggregateNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/AggregateNode.java
deleted file mode 100644
index ea8dc2c1c10..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/AggregateNode.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner.stage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.apache.calcite.rel.core.AggregateCall;
-import org.apache.calcite.util.ImmutableBitSet;
-import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.query.planner.logical.RexExpression;
-import org.apache.pinot.query.planner.serde.ProtoProperties;
-
-
-public class AggregateNode extends AbstractStageNode {
-  @ProtoProperties
-  private List<RexExpression> _aggCalls;
-  @ProtoProperties
-  private List<RexExpression> _groupSet;
-
-  public AggregateNode(int stageId) {
-    super(stageId);
-  }
-
-  public AggregateNode(int stageId, DataSchema dataSchema, List<AggregateCall> aggCalls, ImmutableBitSet groupSet) {
-    super(stageId, dataSchema);
-    _aggCalls = aggCalls.stream().map(RexExpression::toRexExpression).collect(Collectors.toList());
-    _groupSet = new ArrayList<>(groupSet.cardinality());
-    for (Integer integer : groupSet) {
-      _groupSet.add(new RexExpression.InputRef(integer));
-    }
-  }
-
-  public List<RexExpression> getAggCalls() {
-    return _aggCalls;
-  }
-
-  public List<RexExpression> getGroupSet() {
-    return _groupSet;
-  }
-
-  @Override
-  public String explain() {
-    return "AGGREGATE";
-  }
-
-  @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
-    return visitor.visitAggregate(this, context);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/MailboxReceiveNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/MailboxReceiveNode.java
deleted file mode 100644
index cf90a0005cf..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/MailboxReceiveNode.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner.stage;
-
-import javax.annotation.Nullable;
-import org.apache.calcite.rel.RelDistribution;
-import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.planner.serde.ProtoProperties;
-
-
-public class MailboxReceiveNode extends AbstractStageNode {
-  @ProtoProperties
-  private int _senderStageId;
-  @ProtoProperties
-  private RelDistribution.Type _exchangeType;
-  @ProtoProperties
-  private KeySelector<Object[], Object[]> _partitionKeySelector;
-
-  // this is only available during planning and should not be relied
-  // on in any post-serialization code
-  private transient StageNode _sender;
-
-  public MailboxReceiveNode(int stageId) {
-    super(stageId);
-  }
-
-  public MailboxReceiveNode(int stageId, DataSchema dataSchema, int senderStageId,
-      RelDistribution.Type exchangeType, @Nullable KeySelector<Object[], Object[]> partitionKeySelector,
-      StageNode sender) {
-    super(stageId, dataSchema);
-    _senderStageId = senderStageId;
-    _exchangeType = exchangeType;
-    _partitionKeySelector = partitionKeySelector;
-    _sender = sender;
-  }
-
-  public int getSenderStageId() {
-    return _senderStageId;
-  }
-
-  public void setExchangeType(RelDistribution.Type exchangeType) {
-    _exchangeType = exchangeType;
-  }
-
-  public RelDistribution.Type getExchangeType() {
-    return _exchangeType;
-  }
-
-  public KeySelector<Object[], Object[]> getPartitionKeySelector() {
-    return _partitionKeySelector;
-  }
-
-  public StageNode getSender() {
-    return _sender;
-  }
-
-  @Override
-  public String explain() {
-    return "MAIL_RECEIVE(" + _exchangeType + ")";
-  }
-
-  @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
-    return visitor.visitMailboxReceive(this, context);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/MailboxSendNode.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/MailboxSendNode.java
deleted file mode 100644
index 4219590100a..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/planner/stage/MailboxSendNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.planner.stage;
-
-import javax.annotation.Nullable;
-import org.apache.calcite.rel.RelDistribution;
-import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.planner.serde.ProtoProperties;
-
-
-public class MailboxSendNode extends AbstractStageNode {
-  @ProtoProperties
-  private int _receiverStageId;
-  @ProtoProperties
-  private RelDistribution.Type _exchangeType;
-  @ProtoProperties
-  private KeySelector<Object[], Object[]> _partitionKeySelector;
-
-  public MailboxSendNode(int stageId) {
-    super(stageId);
-  }
-
-  public MailboxSendNode(int stageId, DataSchema dataSchema, int receiverStageId,
-      RelDistribution.Type exchangeType, @Nullable KeySelector<Object[], Object[]> partitionKeySelector) {
-    super(stageId, dataSchema);
-    _receiverStageId = receiverStageId;
-    _exchangeType = exchangeType;
-    _partitionKeySelector = partitionKeySelector;
-  }
-
-  public int getReceiverStageId() {
-    return _receiverStageId;
-  }
-
-  public void setExchangeType(RelDistribution.Type exchangeType) {
-    _exchangeType = exchangeType;
-  }
-
-  public RelDistribution.Type getExchangeType() {
-    return _exchangeType;
-  }
-
-  public KeySelector<Object[], Object[]> getPartitionKeySelector() {
-    return _partitionKeySelector;
-  }
-
-  @Override
-  public String explain() {
-    return "MAIL_SEND(" + _exchangeType + ")";
-  }
-
-  @Override
-  public <T, C> T visit(StageNodeVisitor<T, C> visitor, C context) {
-    return visitor.visitMailboxSend(this, context);
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/MailboxMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/MailboxMetadata.java
new file mode 100644
index 00000000000..dcc46c8271d
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/MailboxMetadata.java
@@ -0,0 +1,98 @@
+/**
+ * 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.pinot.query.routing;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+
+/**
+ * {@code MailboxMetadata} wraps around a list of mailboxes information from/to one connected stage.
+ *  It contains the following information:
+ *  <ul>
+ *    <li>MailboxId: the unique id of the mailbox</li>
+ *    <li>VirtualAddress: the virtual address of the mailbox</li>
+ *    <li>CustomProperties: the custom properties of the mailbox</li>
+ *  </ul>
+ */
+public class MailboxMetadata {
+  private final List<String> _mailBoxIdList;
+  private final List<VirtualServerAddress> _virtualAddressList;
+  private final Map<String, String> _customProperties;
+
+  public MailboxMetadata() {
+    _mailBoxIdList = new ArrayList<>();
+    _virtualAddressList = new ArrayList<>();
+    _customProperties = new HashMap<>();
+  }
+
+  public MailboxMetadata(List<String> mailBoxIdList, List<VirtualServerAddress> virtualAddressList,
+      Map<String, String> customProperties) {
+    _mailBoxIdList = mailBoxIdList;
+    _virtualAddressList = virtualAddressList;
+    _customProperties = customProperties;
+  }
+
+  public List<String> getMailBoxIdList() {
+    return _mailBoxIdList;
+  }
+
+  public String getMailBoxId(int index) {
+    return _mailBoxIdList.get(index);
+  }
+
+  public List<VirtualServerAddress> getVirtualAddressList() {
+    return _virtualAddressList;
+  }
+
+  public VirtualServerAddress getVirtualAddress(int index) {
+    return _virtualAddressList.get(index);
+  }
+
+  public Map<String, String> getCustomProperties() {
+    return _customProperties;
+  }
+
+  @Override
+  public String toString() {
+    return _mailBoxIdList + "@" + _virtualAddressList.toString() + "#" + _customProperties.toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_mailBoxIdList, _virtualAddressList, _customProperties);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MailboxMetadata that = (MailboxMetadata) o;
+    return Objects.equals(_mailBoxIdList, that._mailBoxIdList)
+        && Objects.equals(_virtualAddressList, that._virtualAddressList)
+        && _customProperties.equals(that._customProperties);
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/QueryServerInstance.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/QueryServerInstance.java
new file mode 100644
index 00000000000..b9442b728cf
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/QueryServerInstance.java
@@ -0,0 +1,81 @@
+/**
+ * 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.pinot.query.routing;
+
+import java.util.Objects;
+import org.apache.pinot.core.transport.ServerInstance;
+
+
+/**
+ * {@code QueryServerInstance} is representation used during query dispatch to indicate the
+ * physical location of a query server.
+ *
+ * <p>Note that {@code QueryServerInstance} should only be used during dispatch.</p>
+ */
+public class QueryServerInstance {
+  private final String _hostname;
+  private final int _queryServicePort;
+  private final int _queryMailboxPort;
+
+  public QueryServerInstance(ServerInstance server) {
+    this(server.getHostname(), server.getQueryServicePort(), server.getQueryMailboxPort());
+  }
+
+  public QueryServerInstance(String hostName, int servicePort, int mailboxPort) {
+    _hostname = hostName;
+    _queryServicePort = servicePort;
+    _queryMailboxPort = mailboxPort;
+  }
+
+  public String getHostname() {
+    return _hostname;
+  }
+
+  public int getQueryMailboxPort() {
+    return _queryMailboxPort;
+  }
+
+  public int getQueryServicePort() {
+    return _queryServicePort;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    QueryServerInstance that = (QueryServerInstance) o;
+    return _hostname.equals(that._hostname) && _queryServicePort == that._queryServicePort
+        && _queryMailboxPort == that._queryMailboxPort;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_hostname, _queryServicePort, _queryMailboxPort);
+  }
+
+  @Override
+  public String toString() {
+    return _hostname + "@{" + _queryServicePort + "," + _queryMailboxPort + "}";
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ServerAddress.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/VirtualServerAddress.java
similarity index 58%
rename from pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ServerAddress.java
rename to pinot-query-planner/src/main/java/org/apache/pinot/query/routing/VirtualServerAddress.java
index cda2b332fef..5b2f3b012d7 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ServerAddress.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/VirtualServerAddress.java
@@ -17,19 +17,29 @@
  * under the License.
  */
 
-package org.apache.pinot.query.mailbox;
+package org.apache.pinot.query.routing;
 
 import java.util.Objects;
 
 
-public class ServerAddress {
+/**
+ * Represents the address of a {@link QueryServerInstance} containing both the ID of the specific worker and the
+ * physical host/port info from {@link QueryServerInstance}.
+ */
+public class VirtualServerAddress {
 
   private final String _hostname;
   private final int _port;
+  private final int _workerId;
 
-  public ServerAddress(String hostname, int port) {
+  public VirtualServerAddress(String hostname, int port, int workerId) {
     _hostname = hostname;
     _port = port;
+    _workerId = workerId;
+  }
+
+  public VirtualServerAddress(QueryServerInstance server, int workerId) {
+    this(server.getHostname(), server.getQueryMailboxPort(), workerId);
   }
 
   /**
@@ -39,9 +49,10 @@ public ServerAddress(String hostname, int port) {
    * @param address the serialized string
    * @return the deserialized form
    */
-  public static ServerAddress parse(String address) {
-    String[] split = address.split(":");
-    return new ServerAddress(split[0], Integer.parseInt(split[1]));
+  public static VirtualServerAddress parse(String address) {
+    String[] split = address.split("@");
+    String[] hostSplit = split[1].split(":");
+    return new VirtualServerAddress(hostSplit[0], Integer.parseInt(hostSplit[1]), Integer.parseInt(split[0]));
   }
 
   /**
@@ -58,6 +69,10 @@ public int port() {
     return _port;
   }
 
+  public int workerId() {
+    return _workerId;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -66,17 +81,19 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    ServerAddress that = (ServerAddress) o;
-    return _port == that._port && Objects.equals(_hostname, that._hostname);
+    VirtualServerAddress that = (VirtualServerAddress) o;
+    return _port == that._port
+        && _workerId == that._workerId
+        && Objects.equals(_hostname, that._hostname);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(_hostname, _port);
+    return Objects.hash(_hostname, _port, _workerId);
   }
 
   @Override
   public String toString() {
-    return _hostname + ":" + _port;
+    return _workerId + "@" + _hostname + ":" + _port;
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerInstance.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerInstance.java
deleted file mode 100644
index f635b99885a..00000000000
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerInstance.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.routing;
-
-import java.util.Map;
-import org.apache.helix.model.InstanceConfig;
-import org.apache.helix.zookeeper.datamodel.ZNRecord;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.spi.utils.CommonConstants;
-
-
-/**
- * WorkerInstance is a wrapper around {@link ServerInstance}.
- *
- * <p>This can be considered as a simplified version which directly enable host-port initialization.
- */
-public class WorkerInstance extends ServerInstance {
-
-  public WorkerInstance(InstanceConfig instanceConfig) {
-    super(instanceConfig);
-  }
-
-  public WorkerInstance(String hostname, int nettyPort, int grpcPort, int servicePort, int mailboxPort) {
-    super(toInstanceConfig(hostname, nettyPort, grpcPort, servicePort, mailboxPort));
-  }
-
-  private static InstanceConfig toInstanceConfig(String hostname, int nettyPort, int grpcPort, int servicePort,
-      int mailboxPort) {
-    String server = String.format("%s%s_%d", CommonConstants.Helix.PREFIX_OF_SERVER_INSTANCE, hostname, nettyPort);
-    InstanceConfig instanceConfig = InstanceConfig.toInstanceConfig(server);
-    ZNRecord znRecord = instanceConfig.getRecord();
-    Map<String, String> simpleFields = znRecord.getSimpleFields();
-    simpleFields.put(CommonConstants.Helix.Instance.GRPC_PORT_KEY, String.valueOf(grpcPort));
-    simpleFields.put(CommonConstants.Helix.Instance.MULTI_STAGE_QUERY_ENGINE_SERVICE_PORT_KEY,
-        String.valueOf(servicePort));
-    simpleFields.put(CommonConstants.Helix.Instance.MULTI_STAGE_QUERY_ENGINE_MAILBOX_PORT_KEY,
-        String.valueOf(mailboxPort));
-    return instanceConfig;
-  }
-}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
index 36c0f2bd813..76e596a1102 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerManager.java
@@ -19,22 +19,33 @@
 package org.apache.pinot.query.routing;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.pinot.core.routing.RoutingManager;
 import org.apache.pinot.core.routing.RoutingTable;
+import org.apache.pinot.core.routing.TablePartitionInfo;
+import org.apache.pinot.core.routing.TablePartitionInfo.PartitionInfo;
 import org.apache.pinot.core.routing.TimeBoundaryInfo;
 import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.PlannerUtils;
-import org.apache.pinot.query.planner.StageMetadata;
+import org.apache.pinot.query.planner.PlanFragment;
+import org.apache.pinot.query.planner.physical.DispatchablePlanContext;
+import org.apache.pinot.query.planner.physical.DispatchablePlanMetadata;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
 import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.sql.parsers.CalciteSqlCompiler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -42,11 +53,10 @@
  *
  * <p>It contains the logic to assign worker to a particular stages. If it is a leaf stage the logic fallback to
  * how Pinot server assigned server and server-segment mapping.
- *
- * TODO: Currently it is implemented by wrapping routing manager from Pinot Broker. however we can abstract out
- * the worker manager later when we split out the query-spi layer.
  */
 public class WorkerManager {
+  private static final Logger LOGGER = LoggerFactory.getLogger(WorkerManager.class);
+  private static final Random RANDOM = new Random();
 
   private final String _hostName;
   private final int _port;
@@ -58,68 +68,89 @@ public WorkerManager(String hostName, int port, RoutingManager routingManager) {
     _routingManager = routingManager;
   }
 
-  public void assignWorkerToStage(int stageId, StageMetadata stageMetadata, long requestId) {
-    List<String> scannedTables = stageMetadata.getScannedTables();
-    if (scannedTables.size() == 1) {
-      // table scan stage, need to attach server as well as segment info for each physical table type.
-      String logicalTableName = scannedTables.get(0);
-      Map<String, RoutingTable> routingTableMap = getRoutingTable(logicalTableName, requestId);
-      if (routingTableMap.size() == 0) {
-        throw new IllegalArgumentException("Unable to find routing entries for table: " + logicalTableName);
-      }
-      // acquire time boundary info if it is a hybrid table.
-      if (routingTableMap.size() > 1) {
-        TimeBoundaryInfo timeBoundaryInfo = _routingManager.getTimeBoundaryInfo(TableNameBuilder
-            .forType(TableType.OFFLINE).tableNameWithType(TableNameBuilder.extractRawTableName(logicalTableName)));
-        if (timeBoundaryInfo != null) {
-          stageMetadata.setTimeBoundaryInfo(timeBoundaryInfo);
-        } else {
-          // remove offline table routing if no time boundary info is acquired.
-          routingTableMap.remove(TableType.OFFLINE.name());
-        }
-      }
+  public void assignWorkers(PlanFragment rootFragment, DispatchablePlanContext context) {
+    // ROOT stage doesn't have a QueryServer as it is strictly only reducing results, so here we simply assign the
+    // worker instance with identical server/mailbox port number.
+    DispatchablePlanMetadata metadata = context.getDispatchablePlanMetadataMap().get(0);
+    metadata.setServerInstanceToWorkerIdMap(
+        Collections.singletonMap(new QueryServerInstance(_hostName, _port, _port), Collections.singletonList(0)));
+    metadata.setTotalWorkerCount(1);
+    for (PlanFragment child : rootFragment.getChildren()) {
+      assignWorkersToNonRootFragment(child, context);
+    }
+  }
 
-      // extract all the instances associated to each table type
-      Map<ServerInstance, Map<String, List<String>>> serverInstanceToSegmentsMap = new HashMap<>();
-      for (Map.Entry<String, RoutingTable> routingEntry : routingTableMap.entrySet()) {
-        String tableType = routingEntry.getKey();
-        RoutingTable routingTable = routingEntry.getValue();
-        // for each server instance, attach all table types and their associated segment list.
-        for (Map.Entry<ServerInstance, List<String>> serverEntry
-            : routingTable.getServerInstanceToSegmentsMap().entrySet()) {
-          serverInstanceToSegmentsMap.putIfAbsent(serverEntry.getKey(), new HashMap<>());
-          Map<String, List<String>> tableTypeToSegmentListMap = serverInstanceToSegmentsMap.get(serverEntry.getKey());
-          Preconditions.checkState(tableTypeToSegmentListMap.put(tableType, serverEntry.getValue()) == null,
-              "Entry for server {} and table type: {} already exist!", serverEntry.getKey(), tableType);
-        }
-      }
-      stageMetadata.setServerInstances(new ArrayList<>(serverInstanceToSegmentsMap.keySet()));
-      stageMetadata.setServerInstanceToSegmentsMap(serverInstanceToSegmentsMap);
-    } else if (PlannerUtils.isRootStage(stageId)) {
-      // ROOT stage doesn't have a QueryServer as it is strictly only reducing results.
-      // here we simply assign the worker instance with identical server/mailbox port number.
-      stageMetadata.setServerInstances(Lists.newArrayList(new WorkerInstance(_hostName, _port, _port, _port, _port)));
+  private void assignWorkersToNonRootFragment(PlanFragment fragment, DispatchablePlanContext context) {
+    if (isLeafPlan(context.getDispatchablePlanMetadataMap().get(fragment.getFragmentId()))) {
+      assignWorkersToLeafFragment(fragment, context);
     } else {
-      stageMetadata.setServerInstances(filterServers(_routingManager.getEnabledServerInstanceMap().values()));
+      assignWorkersToIntermediateFragment(fragment, context);
     }
   }
 
-  private static List<ServerInstance> filterServers(Collection<ServerInstance> servers) {
-    List<ServerInstance> serverInstances = new ArrayList<>();
-    for (ServerInstance server : servers) {
-      String hostname = server.getHostname();
-      if (server.getQueryServicePort() > 0 && server.getQueryMailboxPort() > 0
-          && !hostname.startsWith(CommonConstants.Helix.PREFIX_OF_BROKER_INSTANCE)
-          && !hostname.startsWith(CommonConstants.Helix.PREFIX_OF_CONTROLLER_INSTANCE)
-          && !hostname.startsWith(CommonConstants.Helix.PREFIX_OF_MINION_INSTANCE)) {
-        serverInstances.add(server);
+  // TODO: Find a better way to determine whether a stage is leaf stage or intermediary. We could have query plans that
+  //       process table data even in intermediary stages.
+  private static boolean isLeafPlan(DispatchablePlanMetadata metadata) {
+    return metadata.getScannedTables().size() == 1;
+  }
+
+  private void assignWorkersToLeafFragment(PlanFragment fragment, DispatchablePlanContext context) {
+    DispatchablePlanMetadata metadata = context.getDispatchablePlanMetadataMap().get(fragment.getFragmentId());
+    // table scan stage, need to attach server as well as segment info for each physical table type.
+    List<String> scannedTables = metadata.getScannedTables();
+    String logicalTableName = scannedTables.get(0);
+    Map<String, RoutingTable> routingTableMap = getRoutingTable(logicalTableName, context.getRequestId());
+    if (routingTableMap.size() == 0) {
+      throw new IllegalArgumentException("Unable to find routing entries for table: " + logicalTableName);
+    }
+    // acquire time boundary info if it is a hybrid table.
+    if (routingTableMap.size() > 1) {
+      TimeBoundaryInfo timeBoundaryInfo = _routingManager.getTimeBoundaryInfo(
+          TableNameBuilder.forType(TableType.OFFLINE)
+              .tableNameWithType(TableNameBuilder.extractRawTableName(logicalTableName)));
+      if (timeBoundaryInfo != null) {
+        metadata.setTimeBoundaryInfo(timeBoundaryInfo);
+      } else {
+        // remove offline table routing if no time boundary info is acquired.
+        routingTableMap.remove(TableType.OFFLINE.name());
+      }
+    }
+
+    // extract all the instances associated to each table type
+    Map<ServerInstance, Map<String, List<String>>> serverInstanceToSegmentsMap = new HashMap<>();
+    for (Map.Entry<String, RoutingTable> routingEntry : routingTableMap.entrySet()) {
+      String tableType = routingEntry.getKey();
+      RoutingTable routingTable = routingEntry.getValue();
+      // for each server instance, attach all table types and their associated segment list.
+      for (Map.Entry<ServerInstance, List<String>> serverEntry : routingTable.getServerInstanceToSegmentsMap()
+          .entrySet()) {
+        serverInstanceToSegmentsMap.putIfAbsent(serverEntry.getKey(), new HashMap<>());
+        Map<String, List<String>> tableTypeToSegmentListMap = serverInstanceToSegmentsMap.get(serverEntry.getKey());
+        Preconditions.checkState(tableTypeToSegmentListMap.put(tableType, serverEntry.getValue()) == null,
+            "Entry for server {} and table type: {} already exist!", serverEntry.getKey(), tableType);
       }
     }
-    return serverInstances;
+    int globalIdx = 0;
+    Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap = new HashMap<>();
+    Map<Integer, Map<String, List<String>>> workerIdToSegmentsMap = new HashMap<>();
+    for (Map.Entry<ServerInstance, Map<String, List<String>>> entry : serverInstanceToSegmentsMap.entrySet()) {
+      QueryServerInstance queryServerInstance = new QueryServerInstance(entry.getKey());
+      serverInstanceToWorkerIdMap.put(queryServerInstance, Collections.singletonList(globalIdx));
+      workerIdToSegmentsMap.put(globalIdx, entry.getValue());
+      globalIdx++;
+    }
+    metadata.setServerInstanceToWorkerIdMap(serverInstanceToWorkerIdMap);
+    metadata.setWorkerIdToSegmentsMap(workerIdToSegmentsMap);
+    metadata.setTotalWorkerCount(globalIdx);
+
+    // NOTE: For pipeline breaker, leaf fragment can also have children
+    for (PlanFragment child : fragment.getChildren()) {
+      assignWorkersToNonRootFragment(child, context);
+    }
   }
 
   /**
-   * Acquire routing table for items listed in {@link org.apache.pinot.query.planner.stage.TableScanNode}.
+   * Acquire routing table for items listed in {@link org.apache.pinot.query.planner.plannode.TableScanNode}.
    *
    * @param logicalTableName it can either be a hybrid table name or a physical table name with table type.
    * @return keyed-map from table type(s) to routing table(s).
@@ -148,9 +179,321 @@ private Map<String, RoutingTable> getRoutingTable(String logicalTableName, long
   }
 
   private RoutingTable getRoutingTable(String tableName, TableType tableType, long requestId) {
-    String tableNameWithType = TableNameBuilder.forType(tableType).tableNameWithType(
-        TableNameBuilder.extractRawTableName(tableName));
+    String tableNameWithType =
+        TableNameBuilder.forType(tableType).tableNameWithType(TableNameBuilder.extractRawTableName(tableName));
     return _routingManager.getRoutingTable(
         CalciteSqlCompiler.compileToBrokerRequest("SELECT * FROM " + tableNameWithType), requestId);
   }
+
+  private void assignWorkersToIntermediateFragment(PlanFragment fragment, DispatchablePlanContext context) {
+    if (isColocatedJoin(fragment.getFragmentRoot())) {
+      // TODO: Make it more general so that it can be used for other partitioned cases (e.g. group-by, window function)
+      try {
+        assignWorkersForColocatedJoin(fragment, context);
+        return;
+      } catch (Exception e) {
+        LOGGER.warn("[RequestId: {}] Caught exception while assigning workers for colocated join, "
+            + "falling back to regular worker assignment", context.getRequestId(), e);
+      }
+    }
+
+    // If the query has more than one table, it is possible that the tables could be hosted on different tenants.
+    // The intermediate stage will be processed on servers randomly picked from the tenants belonging to either or
+    // all of the tables in the query.
+    // TODO: actually make assignment strategy decisions for intermediate stages
+    List<ServerInstance> serverInstances;
+    Set<String> tableNames = context.getTableNames();
+    if (tableNames.size() == 0) {
+      // TODO: Short circuit it when no table needs to be scanned
+      // This could be the case from queries that don't actually fetch values from the tables. In such cases the
+      // routing need not be tenant aware.
+      // Eg: SELECT 1 AS one FROM select_having_expression_test_test_having HAVING 1 > 2;
+      serverInstances = new ArrayList<>(_routingManager.getEnabledServerInstanceMap().values());
+    } else {
+      serverInstances = fetchServersForIntermediateStage(tableNames);
+    }
+    DispatchablePlanMetadata metadata = context.getDispatchablePlanMetadataMap().get(fragment.getFragmentId());
+    Map<String, String> options = context.getPlannerContext().getOptions();
+    int stageParallelism = Integer.parseInt(options.getOrDefault(QueryOptionKey.STAGE_PARALLELISM, "1"));
+    if (metadata.isRequiresSingletonInstance()) {
+      // require singleton should return a single global worker ID with 0;
+      ServerInstance serverInstance = serverInstances.get(RANDOM.nextInt(serverInstances.size()));
+      metadata.setServerInstanceToWorkerIdMap(
+          Collections.singletonMap(new QueryServerInstance(serverInstance), Collections.singletonList(0)));
+      metadata.setTotalWorkerCount(1);
+    } else {
+      Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap = new HashMap<>();
+      int nextWorkerId = 0;
+      for (ServerInstance serverInstance : serverInstances) {
+        List<Integer> workerIds = new ArrayList<>();
+        for (int i = 0; i < stageParallelism; i++) {
+          workerIds.add(nextWorkerId++);
+        }
+        serverInstanceToWorkerIdMap.put(new QueryServerInstance(serverInstance), workerIds);
+      }
+      metadata.setServerInstanceToWorkerIdMap(serverInstanceToWorkerIdMap);
+      metadata.setTotalWorkerCount(nextWorkerId);
+    }
+
+    for (PlanFragment child : fragment.getChildren()) {
+      assignWorkersToNonRootFragment(child, context);
+    }
+  }
+
+  private boolean isColocatedJoin(PlanNode planNode) {
+    if (planNode instanceof JoinNode) {
+      return ((JoinNode) planNode).isColocatedJoin();
+    }
+    for (PlanNode child : planNode.getInputs()) {
+      if (isColocatedJoin(child)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private void assignWorkersForColocatedJoin(PlanFragment fragment, DispatchablePlanContext context) {
+    List<PlanFragment> children = fragment.getChildren();
+    Preconditions.checkArgument(children.size() == 2, "Expecting 2 children, find: %s", children.size());
+    PlanFragment leftFragment = children.get(0);
+    PlanFragment rightFragment = children.get(1);
+    Map<Integer, DispatchablePlanMetadata> metadataMap = context.getDispatchablePlanMetadataMap();
+    // TODO: Support multi-level colocated join (more than 2 tables colocated)
+    DispatchablePlanMetadata leftMetadata = metadataMap.get(leftFragment.getFragmentId());
+    Preconditions.checkArgument(isLeafPlan(leftMetadata), "Left side is not leaf");
+    DispatchablePlanMetadata rightMetadata = metadataMap.get(rightFragment.getFragmentId());
+    Preconditions.checkArgument(isLeafPlan(rightMetadata), "Right side is not leaf");
+
+    String leftTable = leftMetadata.getScannedTables().get(0);
+    String rightTable = rightMetadata.getScannedTables().get(0);
+    ColocatedTableInfo leftColocatedTableInfo = getColocatedTableInfo(leftTable);
+    ColocatedTableInfo rightColocatedTableInfo = getColocatedTableInfo(rightTable);
+    ColocatedPartitionInfo[] leftPartitionInfoMap = leftColocatedTableInfo._partitionInfoMap;
+    ColocatedPartitionInfo[] rightPartitionInfoMap = rightColocatedTableInfo._partitionInfoMap;
+    // TODO: Support colocated join when both side have different number of partitions (e.g. left: 8, right: 16)
+    int numPartitions = leftPartitionInfoMap.length;
+    Preconditions.checkState(numPartitions == rightPartitionInfoMap.length,
+        "Got different number of partitions in left table: %s (%s) and right table: %s (%s)", leftTable, numPartitions,
+        rightTable, rightPartitionInfoMap.length);
+
+    // Pick one server per partition
+    int nextWorkerId = 0;
+    Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap = new HashMap<>();
+    Map<Integer, Map<String, List<String>>> leftWorkerIdToSegmentsMap = new HashMap<>();
+    Map<Integer, Map<String, List<String>>> rightWorkerIdToSegmentsMap = new HashMap<>();
+    Map<String, ServerInstance> enabledServerInstanceMap = _routingManager.getEnabledServerInstanceMap();
+    for (int i = 0; i < numPartitions; i++) {
+      ColocatedPartitionInfo leftPartitionInfo = leftPartitionInfoMap[i];
+      ColocatedPartitionInfo rightPartitionInfo = rightPartitionInfoMap[i];
+      if (leftPartitionInfo == null && rightPartitionInfo == null) {
+        continue;
+      }
+      // TODO: Currently we don't support the case when for a partition only one side has segments. The reason is that
+      //       the leaf stage won't be able to directly return empty response.
+      Preconditions.checkState(leftPartitionInfo != null && rightPartitionInfo != null,
+          "One side doesn't have any segment for partition: %s", i);
+      Set<String> candidates = new HashSet<>(leftPartitionInfo._fullyReplicatedServers);
+      candidates.retainAll(rightPartitionInfo._fullyReplicatedServers);
+      ServerInstance serverInstance = pickRandomEnabledServer(candidates, enabledServerInstanceMap);
+      Preconditions.checkState(serverInstance != null,
+          "Failed to find enabled fully replicated server for partition: %s in table: %s and %s", i, leftTable,
+          rightTable);
+      QueryServerInstance queryServerInstance = new QueryServerInstance(serverInstance);
+      int workerId = nextWorkerId++;
+      serverInstanceToWorkerIdMap.computeIfAbsent(queryServerInstance, k -> new ArrayList<>()).add(workerId);
+      leftWorkerIdToSegmentsMap.put(workerId, getSegmentsMap(leftPartitionInfo));
+      rightWorkerIdToSegmentsMap.put(workerId, getSegmentsMap(rightPartitionInfo));
+    }
+
+    DispatchablePlanMetadata joinMetadata = metadataMap.get(fragment.getFragmentId());
+    joinMetadata.setServerInstanceToWorkerIdMap(serverInstanceToWorkerIdMap);
+    joinMetadata.setTotalWorkerCount(nextWorkerId);
+
+    leftMetadata.setServerInstanceToWorkerIdMap(serverInstanceToWorkerIdMap);
+    leftMetadata.setWorkerIdToSegmentsMap(leftWorkerIdToSegmentsMap);
+    leftMetadata.setTotalWorkerCount(nextWorkerId);
+    leftMetadata.setTimeBoundaryInfo(leftColocatedTableInfo._timeBoundaryInfo);
+
+    rightMetadata.setServerInstanceToWorkerIdMap(serverInstanceToWorkerIdMap);
+    rightMetadata.setWorkerIdToSegmentsMap(rightWorkerIdToSegmentsMap);
+    rightMetadata.setTotalWorkerCount(nextWorkerId);
+    rightMetadata.setTimeBoundaryInfo(rightColocatedTableInfo._timeBoundaryInfo);
+
+    // NOTE: For pipeline breaker, leaf fragment can also have children
+    for (PlanFragment child : leftFragment.getChildren()) {
+      assignWorkersToNonRootFragment(child, context);
+    }
+    for (PlanFragment child : rightFragment.getChildren()) {
+      assignWorkersToNonRootFragment(child, context);
+    }
+  }
+
+  private ColocatedTableInfo getColocatedTableInfo(String tableName) {
+    TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
+    if (tableType == null) {
+      String offlineTableName = TableNameBuilder.OFFLINE.tableNameWithType(tableName);
+      String realtimeTableName = TableNameBuilder.REALTIME.tableNameWithType(tableName);
+      boolean offlineRoutingExists = _routingManager.routingExists(offlineTableName);
+      boolean realtimeRoutingExists = _routingManager.routingExists(realtimeTableName);
+      Preconditions.checkState(offlineRoutingExists || realtimeRoutingExists, "Routing doesn't exist for table: %s",
+          tableName);
+      if (offlineRoutingExists && realtimeRoutingExists) {
+        // For hybrid table, find the common servers for each partition
+        TimeBoundaryInfo timeBoundaryInfo = _routingManager.getTimeBoundaryInfo(offlineTableName);
+        // Ignore OFFLINE side when time boundary info is unavailable
+        if (timeBoundaryInfo == null) {
+          return getRealtimeColocatedTableInfo(realtimeTableName);
+        }
+        PartitionInfo[] offlinePartitionInfoMap = getTablePartitionInfo(offlineTableName).getPartitionInfoMap();
+        PartitionInfo[] realtimePartitionInfoMap = getTablePartitionInfo(realtimeTableName).getPartitionInfoMap();
+        int numPartitions = offlinePartitionInfoMap.length;
+        Preconditions.checkState(numPartitions == realtimePartitionInfoMap.length,
+            "Got different number of partitions in OFFLINE side: %s and REALTIME side: %s of table: %s", numPartitions,
+            realtimePartitionInfoMap.length, tableName);
+        ColocatedPartitionInfo[] colocatedPartitionInfoMap = new ColocatedPartitionInfo[numPartitions];
+        for (int i = 0; i < numPartitions; i++) {
+          PartitionInfo offlinePartitionInfo = offlinePartitionInfoMap[i];
+          PartitionInfo realtimePartitionInfo = realtimePartitionInfoMap[i];
+          if (offlinePartitionInfo == null && realtimePartitionInfo == null) {
+            continue;
+          }
+          if (offlinePartitionInfo == null) {
+            colocatedPartitionInfoMap[i] =
+                new ColocatedPartitionInfo(realtimePartitionInfo._fullyReplicatedServers, null,
+                    realtimePartitionInfo._segments);
+            continue;
+          }
+          if (realtimePartitionInfo == null) {
+            colocatedPartitionInfoMap[i] =
+                new ColocatedPartitionInfo(offlinePartitionInfo._fullyReplicatedServers, offlinePartitionInfo._segments,
+                    null);
+            continue;
+          }
+          Set<String> fullyReplicatedServers = new HashSet<>(offlinePartitionInfo._fullyReplicatedServers);
+          fullyReplicatedServers.retainAll(realtimePartitionInfo._fullyReplicatedServers);
+          Preconditions.checkState(!fullyReplicatedServers.isEmpty(),
+              "Failed to find fully replicated server for partition: %s in hybrid table: %s", i, tableName);
+          colocatedPartitionInfoMap[i] =
+              new ColocatedPartitionInfo(fullyReplicatedServers, offlinePartitionInfo._segments,
+                  realtimePartitionInfo._segments);
+        }
+        return new ColocatedTableInfo(colocatedPartitionInfoMap, timeBoundaryInfo);
+      } else if (offlineRoutingExists) {
+        return getOfflineColocatedTableInfo(offlineTableName);
+      } else {
+        return getRealtimeColocatedTableInfo(realtimeTableName);
+      }
+    } else {
+      if (tableType == TableType.OFFLINE) {
+        return getOfflineColocatedTableInfo(tableName);
+      } else {
+        return getRealtimeColocatedTableInfo(tableName);
+      }
+    }
+  }
+
+  private TablePartitionInfo getTablePartitionInfo(String tableNameWithType) {
+    TablePartitionInfo tablePartitionInfo = _routingManager.getTablePartitionInfo(tableNameWithType);
+    Preconditions.checkState(tablePartitionInfo != null, "Failed to find table partition info for table: %s",
+        tableNameWithType);
+    Preconditions.checkState(tablePartitionInfo.getSegmentsWithInvalidPartition().isEmpty(),
+        "Find %s segments with invalid partition for table: %s",
+        tablePartitionInfo.getSegmentsWithInvalidPartition().size(), tableNameWithType);
+    return tablePartitionInfo;
+  }
+
+  private ColocatedTableInfo getOfflineColocatedTableInfo(String offlineTableName) {
+    PartitionInfo[] partitionInfoMap = getTablePartitionInfo(offlineTableName).getPartitionInfoMap();
+    int numPartitions = partitionInfoMap.length;
+    ColocatedPartitionInfo[] colocatedPartitionInfoMap = new ColocatedPartitionInfo[numPartitions];
+    for (int i = 0; i < numPartitions; i++) {
+      PartitionInfo partitionInfo = partitionInfoMap[i];
+      if (partitionInfo != null) {
+        colocatedPartitionInfoMap[i] =
+            new ColocatedPartitionInfo(partitionInfo._fullyReplicatedServers, partitionInfo._segments, null);
+      }
+    }
+    return new ColocatedTableInfo(colocatedPartitionInfoMap, null);
+  }
+
+  private ColocatedTableInfo getRealtimeColocatedTableInfo(String realtimeTableName) {
+    PartitionInfo[] partitionInfoMap = getTablePartitionInfo(realtimeTableName).getPartitionInfoMap();
+    int numPartitions = partitionInfoMap.length;
+    ColocatedPartitionInfo[] colocatedPartitionInfoMap = new ColocatedPartitionInfo[numPartitions];
+    for (int i = 0; i < numPartitions; i++) {
+      PartitionInfo partitionInfo = partitionInfoMap[i];
+      if (partitionInfo != null) {
+        colocatedPartitionInfoMap[i] =
+            new ColocatedPartitionInfo(partitionInfo._fullyReplicatedServers, null, partitionInfo._segments);
+      }
+    }
+    return new ColocatedTableInfo(colocatedPartitionInfoMap, null);
+  }
+
+  private static class ColocatedTableInfo {
+    final ColocatedPartitionInfo[] _partitionInfoMap;
+    final TimeBoundaryInfo _timeBoundaryInfo;
+
+    ColocatedTableInfo(ColocatedPartitionInfo[] partitionInfoMap, @Nullable TimeBoundaryInfo timeBoundaryInfo) {
+      _partitionInfoMap = partitionInfoMap;
+      _timeBoundaryInfo = timeBoundaryInfo;
+    }
+  }
+
+  private static class ColocatedPartitionInfo {
+    final Set<String> _fullyReplicatedServers;
+    final List<String> _offlineSegments;
+    final List<String> _realtimeSegments;
+
+    public ColocatedPartitionInfo(Set<String> fullyReplicatedServers, @Nullable List<String> offlineSegments,
+        @Nullable List<String> realtimeSegments) {
+      _fullyReplicatedServers = fullyReplicatedServers;
+      _offlineSegments = offlineSegments;
+      _realtimeSegments = realtimeSegments;
+    }
+  }
+
+  @Nullable
+  private static ServerInstance pickRandomEnabledServer(Set<String> candidates,
+      Map<String, ServerInstance> enabledServerInstanceMap) {
+    if (candidates.isEmpty()) {
+      return null;
+    }
+    String[] servers = candidates.toArray(new String[0]);
+    ArrayUtils.shuffle(servers, RANDOM);
+    for (String server : servers) {
+      ServerInstance serverInstance = enabledServerInstanceMap.get(server);
+      if (serverInstance != null) {
+        return serverInstance;
+      }
+    }
+    return null;
+  }
+
+  private static Map<String, List<String>> getSegmentsMap(ColocatedPartitionInfo partitionInfo) {
+    Map<String, List<String>> segmentsMap = new HashMap<>();
+    if (partitionInfo._offlineSegments != null) {
+      segmentsMap.put(TableType.OFFLINE.name(), partitionInfo._offlineSegments);
+    }
+    if (partitionInfo._realtimeSegments != null) {
+      segmentsMap.put(TableType.REALTIME.name(), partitionInfo._realtimeSegments);
+    }
+    return segmentsMap;
+  }
+
+  private List<ServerInstance> fetchServersForIntermediateStage(Set<String> tableNames) {
+    Set<ServerInstance> serverInstances = new HashSet<>();
+    for (String tableName : tableNames) {
+      TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
+      if (tableType == null) {
+        String offlineTableName = TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(tableName);
+        serverInstances.addAll(_routingManager.getEnabledServersForTableTenant(offlineTableName).values());
+        String realtimeTableName = TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(tableName);
+        serverInstances.addAll(_routingManager.getEnabledServersForTableTenant(realtimeTableName).values());
+      } else {
+        serverInstances.addAll(_routingManager.getEnabledServersForTableTenant(tableName).values());
+      }
+    }
+    return new ArrayList<>(serverInstances);
+  }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerMetadata.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerMetadata.java
new file mode 100644
index 00000000000..9d92bfb6979
--- /dev/null
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/routing/WorkerMetadata.java
@@ -0,0 +1,125 @@
+/**
+ * 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.pinot.query.routing;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.spi.utils.JsonUtils;
+
+
+/**
+ * {@code WorkerMetadata} is used to send worker-level info about how to execute a stage on a particular worker.
+ *
+ * <p>It contains information specific to a single worker within a stage, such as:</p>
+ * <ul>
+ *   <li>the underlying segments this particular worker needs to execute.</li>
+ *   <li>the mailbox info required to construct data transfer linkages.</li>
+ *   <li>the partition mechanism of the data being execute on this worker.</li>
+ * </ul>
+ *
+ * TODO: WorkerMetadata now doesn't have info directly about how to construct the mailboxes. instead it rely on
+ * MailboxSendNode and MailboxReceiveNode to derive the info during runtime. this should changed to plan time soon.
+ */
+public class WorkerMetadata {
+  private final VirtualServerAddress _virtualServerAddress;
+  private final Map<Integer, MailboxMetadata> _mailBoxInfosMap;
+  private final Map<String, String> _customProperties;
+
+  private WorkerMetadata(VirtualServerAddress virtualServerAddress, Map<Integer, MailboxMetadata> mailBoxInfosMap,
+      Map<String, String> customProperties) {
+    _virtualServerAddress = virtualServerAddress;
+    _mailBoxInfosMap = mailBoxInfosMap;
+    _customProperties = customProperties;
+  }
+
+  public VirtualServerAddress getVirtualServerAddress() {
+    return _virtualServerAddress;
+  }
+
+  public Map<Integer, MailboxMetadata> getMailBoxInfosMap() {
+    return _mailBoxInfosMap;
+  }
+
+  public Map<String, String> getCustomProperties() {
+    return _customProperties;
+  }
+
+  public static class Builder {
+    public static final String TABLE_SEGMENTS_MAP_KEY = "tableSegmentsMap";
+    private VirtualServerAddress _virtualServerAddress;
+    private Map<Integer, MailboxMetadata> _mailBoxInfosMap;
+    private Map<String, String> _customProperties;
+
+    public Builder() {
+      _mailBoxInfosMap = new HashMap<>();
+      _customProperties = new HashMap<>();
+    }
+
+    public Builder setVirtualServerAddress(VirtualServerAddress virtualServerAddress) {
+      _virtualServerAddress = virtualServerAddress;
+      return this;
+    }
+
+    public Builder putAllMailBoxInfosMap(Map<Integer, MailboxMetadata> mailBoxInfosMap) {
+      _mailBoxInfosMap.putAll(mailBoxInfosMap);
+      return this;
+    }
+
+    public Builder addMailBoxInfoMap(Integer planFragmentId, MailboxMetadata mailBoxMetadata) {
+      _mailBoxInfosMap.put(planFragmentId, mailBoxMetadata);
+      return this;
+    }
+
+    public Builder addTableSegmentsMap(Map<String, List<String>> tableSegmentsMap) {
+      try {
+        String tableSegmentsMapStr = JsonUtils.objectToString(tableSegmentsMap);
+        _customProperties.put(TABLE_SEGMENTS_MAP_KEY, tableSegmentsMapStr);
+      } catch (JsonProcessingException e) {
+        throw new RuntimeException("Unable to serialize table segments map", e);
+      }
+      return this;
+    }
+
+    public WorkerMetadata build() {
+      return new WorkerMetadata(_virtualServerAddress, _mailBoxInfosMap, _customProperties);
+    }
+
+    public void putAllCustomProperties(Map<String, String> customPropertyMap) {
+      _customProperties.putAll(customPropertyMap);
+    }
+  }
+
+  public static Map<String, List<String>> getTableSegmentsMap(WorkerMetadata workerMetadata) {
+    String tableSegmentKeyStr = workerMetadata.getCustomProperties().get(Builder.TABLE_SEGMENTS_MAP_KEY);
+    if (tableSegmentKeyStr != null) {
+      try {
+        return JsonUtils.stringToObject(tableSegmentKeyStr, new TypeReference<Map<String, List<String>>>() {
+        });
+      } catch (IOException e) {
+        throw new RuntimeException("Unable to deserialize table segments map", e);
+      }
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeFactory.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeFactory.java
index 0e1814e8c96..3d6475ce036 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeFactory.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeFactory.java
@@ -54,32 +54,41 @@ public RelDataType createRelDataTypeFromSchema(Schema schema) {
   private RelDataType toRelDataType(FieldSpec fieldSpec) {
     switch (fieldSpec.getDataType()) {
       case INT:
-        return createSqlType(SqlTypeName.INTEGER);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.INTEGER)
+            : createArrayType(createSqlType(SqlTypeName.INTEGER), -1);
       case LONG:
-        return createSqlType(SqlTypeName.BIGINT);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.BIGINT)
+            : createArrayType(createSqlType(SqlTypeName.BIGINT), -1);
       case FLOAT:
-        return createSqlType(SqlTypeName.FLOAT);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.REAL)
+            : createArrayType(createSqlType(SqlTypeName.REAL), -1);
       case DOUBLE:
-        return createSqlType(SqlTypeName.DOUBLE);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.DOUBLE)
+            : createArrayType(createSqlType(SqlTypeName.DOUBLE), -1);
       case BOOLEAN:
-        return createSqlType(SqlTypeName.BOOLEAN);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.BOOLEAN)
+            : createArrayType(createSqlType(SqlTypeName.BOOLEAN), -1);
       case TIMESTAMP:
-        return createSqlType(SqlTypeName.TIMESTAMP);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.TIMESTAMP)
+            : createArrayType(createSqlType(SqlTypeName.TIMESTAMP), -1);
       case STRING:
-        return createSqlType(SqlTypeName.VARCHAR);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.VARCHAR)
+            : createArrayType(createSqlType(SqlTypeName.VARCHAR), -1);
       case BYTES:
-        return createSqlType(SqlTypeName.VARBINARY);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.VARBINARY)
+            : createArrayType(createSqlType(SqlTypeName.VARBINARY), -1);
       case BIG_DECIMAL:
-        return createSqlType(SqlTypeName.DECIMAL);
+        return fieldSpec.isSingleValueField() ? createSqlType(SqlTypeName.DECIMAL)
+            : createArrayType(createSqlType(SqlTypeName.DECIMAL), -1);
       case JSON:
-        // TODO: support JSON, JSON should be supported using a special RelDataType as it is not a simple String,
-        // nor can it be easily parsed as a STRUCT.
+        return createSqlType(SqlTypeName.VARCHAR);
       case LIST:
         // TODO: support LIST, MV column should go fall into this category.
       case STRUCT:
       case MAP:
       default:
-        throw new UnsupportedOperationException("unsupported!");
+        String message = String.format("Unsupported type: %s ", fieldSpec.getDataType().toString());
+        throw new UnsupportedOperationException(message);
     }
   }
 }
diff --git a/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeSystem.java b/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeSystem.java
index 5476c8ad23e..cb00334f633 100644
--- a/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeSystem.java
+++ b/pinot-query-planner/src/main/java/org/apache/pinot/query/type/TypeSystem.java
@@ -18,7 +18,11 @@
  */
 package org.apache.pinot.query.type;
 
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rel.type.RelDataTypeSystemImpl;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.sql.type.SqlTypeUtil;
 
 
 /**
@@ -50,4 +54,20 @@ public int getMaxNumericScale() {
   public int getMaxNumericPrecision() {
     return MAX_DECIMAL_PRECISION_DIGIT;
   }
+
+  @Override
+  public RelDataType deriveAvgAggType(RelDataTypeFactory typeFactory,
+      RelDataType argumentType) {
+    assert SqlTypeUtil.isNumeric(argumentType);
+
+    switch (argumentType.getSqlTypeName()) {
+      case DECIMAL: {
+        // For BIG_DECIMAL, set the return type to BIG_DECIMAL. Check OSS issue #10318 for more details.
+        return argumentType;
+      }
+      default: {
+        return typeFactory.createTypeWithNullability(typeFactory.createSqlType(SqlTypeName.DOUBLE), false);
+      }
+    }
+  }
 }
diff --git a/pinot-query-planner/src/test/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRuleTest.java b/pinot-query-planner/src/test/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRuleTest.java
index b92fd793527..0b9501c7cc5 100644
--- a/pinot-query-planner/src/test/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRuleTest.java
+++ b/pinot-query-planner/src/test/java/org/apache/calcite/rel/rules/PinotSortExchangeCopyRuleTest.java
@@ -29,7 +29,7 @@
 import org.apache.calcite.rel.core.Sort;
 import org.apache.calcite.rel.core.SortExchange;
 import org.apache.calcite.rel.logical.LogicalSort;
-import org.apache.calcite.rel.logical.LogicalSortExchange;
+import org.apache.calcite.rel.logical.PinotLogicalSortExchange;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.rex.RexNode;
@@ -81,7 +81,8 @@ public void tearDown()
   @Test
   public void shouldMatchLimitNoOffsetNoSort() {
     // Given:
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, RelCollations.EMPTY);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, RelCollations.EMPTY,
+        false, false);
     Sort sort = LogicalSort.create(exchange, RelCollations.EMPTY, null, literal(1));
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
@@ -91,11 +92,11 @@ public void shouldMatchLimitNoOffsetNoSort() {
 
     // Then:
     ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
-    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture(), Mockito.anyMap());
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
 
     RelNode sortCopy = sortCopyCapture.getValue();
     Assert.assertTrue(sortCopy instanceof LogicalSort);
-    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof LogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
     Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
 
     LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
@@ -104,11 +105,68 @@ public void shouldMatchLimitNoOffsetNoSort() {
     Assert.assertEquals((innerSort).fetch, literal(1));
   }
 
+  @Test
+  public void shouldMatchLimitNoOffsetYesSortNoSortEnabled() {
+    // Given:
+    RelCollation collation = RelCollations.of(1);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation,
+        false, false);
+    Sort sort = LogicalSort.create(exchange, collation, null, literal(1));
+    Mockito.when(_call.rel(0)).thenReturn(sort);
+    Mockito.when(_call.rel(1)).thenReturn(exchange);
+
+    // When:
+    PinotSortExchangeCopyRule.SORT_EXCHANGE_COPY.onMatch(_call);
+
+    // Then:
+    ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
+
+    RelNode sortCopy = sortCopyCapture.getValue();
+    Assert.assertTrue(sortCopy instanceof LogicalSort);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
+
+    LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
+    Assert.assertEquals(innerSort.getCollation().getKeys().size(), 1);
+    Assert.assertNull((innerSort).offset);
+    Assert.assertEquals((innerSort).fetch, literal(1));
+  }
+
+  @Test
+  public void shouldMatchLimitNoOffsetYesSortOnSender() {
+    // Given:
+    RelCollation collation = RelCollations.of(1);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation,
+        true, false);
+    Sort sort = LogicalSort.create(exchange, collation, null, literal(1));
+    Mockito.when(_call.rel(0)).thenReturn(sort);
+    Mockito.when(_call.rel(1)).thenReturn(exchange);
+
+    // When:
+    PinotSortExchangeCopyRule.SORT_EXCHANGE_COPY.onMatch(_call);
+
+    // Then:
+    ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
+
+    RelNode sortCopy = sortCopyCapture.getValue();
+    Assert.assertTrue(sortCopy instanceof LogicalSort);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
+
+    LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
+    Assert.assertEquals(innerSort.getCollation().getKeys().size(), 1);
+    Assert.assertNull((innerSort).offset);
+    Assert.assertEquals((innerSort).fetch, literal(1));
+  }
+
   @Test
   public void shouldMatchLimitNoOffsetYesSort() {
     // Given:
     RelCollation collation = RelCollations.of(1);
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation, false,
+        true);
     Sort sort = LogicalSort.create(exchange, collation, null, literal(1));
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
@@ -118,11 +176,11 @@ public void shouldMatchLimitNoOffsetYesSort() {
 
     // Then:
     ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
-    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture(), Mockito.anyMap());
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
 
     RelNode sortCopy = sortCopyCapture.getValue();
     Assert.assertTrue(sortCopy instanceof LogicalSort);
-    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof LogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
     Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
 
     LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
@@ -134,7 +192,8 @@ public void shouldMatchLimitNoOffsetYesSort() {
   @Test
   public void shouldMatchNoSortAndPushDownLimitPlusOffset() {
     // Given:
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, RelCollations.EMPTY);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, RelCollations.EMPTY,
+        false, true);
     Sort sort = LogicalSort.create(exchange, RelCollations.EMPTY, literal(2), literal(1));
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
@@ -144,11 +203,11 @@ public void shouldMatchNoSortAndPushDownLimitPlusOffset() {
 
     // Then:
     ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
-    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture(), Mockito.anyMap());
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
 
     RelNode sortCopy = sortCopyCapture.getValue();
     Assert.assertTrue(sortCopy instanceof LogicalSort);
-    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof LogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
     Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
 
     LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
@@ -161,7 +220,8 @@ public void shouldMatchNoSortAndPushDownLimitPlusOffset() {
   public void shouldMatchSortOnly() {
     // Given:
     RelCollation collation = RelCollations.of(1);
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation, false,
+        true);
     Sort sort = LogicalSort.create(exchange, collation, null, null);
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
@@ -171,11 +231,11 @@ public void shouldMatchSortOnly() {
 
     // Then:
     ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
-    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture(), Mockito.anyMap());
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
 
     RelNode sortCopy = sortCopyCapture.getValue();
     Assert.assertTrue(sortCopy instanceof LogicalSort);
-    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof LogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
     Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
 
     LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
@@ -188,7 +248,8 @@ public void shouldMatchSortOnly() {
   public void shouldMatchLimitOffsetAndSort() {
     // Given:
     RelCollation collation = RelCollations.of(1);
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation, false,
+        true);
     Sort sort = LogicalSort.create(exchange, collation, literal(1), literal(2));
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
@@ -198,11 +259,11 @@ public void shouldMatchLimitOffsetAndSort() {
 
     // Then:
     ArgumentCaptor<RelNode> sortCopyCapture = ArgumentCaptor.forClass(LogicalSort.class);
-    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture(), Mockito.anyMap());
+    Mockito.verify(_call, Mockito.times(1)).transformTo(sortCopyCapture.capture());
 
     RelNode sortCopy = sortCopyCapture.getValue();
     Assert.assertTrue(sortCopy instanceof LogicalSort);
-    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof LogicalSortExchange);
+    Assert.assertTrue(((LogicalSort) sortCopy).getInput() instanceof PinotLogicalSortExchange);
     Assert.assertTrue(((LogicalSort) sortCopy).getInput().getInput(0) instanceof LogicalSort);
 
     LogicalSort innerSort = (LogicalSort) ((LogicalSort) sortCopy).getInput().getInput(0);
@@ -215,7 +276,8 @@ public void shouldMatchLimitOffsetAndSort() {
   public void shouldNotMatchOnlySortAlreadySorted() {
     // Given:
     RelCollation collation = RelCollations.of(1);
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, collation, false,
+        true);
     Sort sort = LogicalSort.create(exchange, collation, null, null);
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
@@ -231,7 +293,8 @@ public void shouldNotMatchOnlySortAlreadySorted() {
   @Test
   public void shouldNotMatchOffsetNoLimitNoSort() {
     // Given:
-    SortExchange exchange = LogicalSortExchange.create(_input, RelDistributions.SINGLETON, RelCollations.EMPTY);
+    SortExchange exchange = PinotLogicalSortExchange.create(_input, RelDistributions.SINGLETON, RelCollations.EMPTY,
+        false, true);
     Sort sort = LogicalSort.create(exchange, RelCollations.EMPTY, literal(1), null);
     Mockito.when(_call.rel(0)).thenReturn(sort);
     Mockito.when(_call.rel(1)).thenReturn(exchange);
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryCompilationTest.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryCompilationTest.java
index 845533485a3..c10a32eafea 100644
--- a/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryCompilationTest.java
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryCompilationTest.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,17 +29,17 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import org.apache.calcite.rel.RelDistribution;
-import org.apache.pinot.core.transport.ServerInstance;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.PhysicalExplainPlanVisitor;
 import org.apache.pinot.query.planner.PlannerUtils;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.AbstractStageNode;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.StageNode;
+import org.apache.pinot.query.planner.plannode.AbstractPlanNode;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -46,11 +47,22 @@
 
 public class QueryCompilationTest extends QueryEnvironmentTestBase {
 
-  @Test(dataProvider = "testQueryPlanDataProvider")
-  public void testQueryPlanExplain(String query, String digest)
+  @Test(dataProvider = "testQueryLogicalPlanDataProvider")
+  public void testQueryPlanExplainLogical(String query, String digest)
       throws Exception {
+    testQueryPlanExplain(query, digest);
+  }
+
+  @Test(dataProvider = "testQueryPhysicalPlanDataProvider")
+  public void testQueryPlanExplainPhysical(String query, String digest)
+      throws Exception {
+    testQueryPlanExplain(query, digest);
+  }
+
+  private void testQueryPlanExplain(String query, String digest) {
     try {
-      String explainedPlan = _queryEnvironment.explainQuery(query);
+      long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+      String explainedPlan = _queryEnvironment.explainQuery(query, requestId);
       Assert.assertEquals(explainedPlan, digest);
     } catch (RuntimeException e) {
       Assert.fail("failed to explain query: " + query, e);
@@ -61,8 +73,8 @@ public void testQueryPlanExplain(String query, String digest)
   public void testQueryPlanWithoutException(String query)
       throws Exception {
     try {
-      QueryPlan queryPlan = _queryEnvironment.planQuery(query);
-      Assert.assertNotNull(queryPlan);
+      DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
+      Assert.assertNotNull(dispatchableSubPlan);
     } catch (RuntimeException e) {
       Assert.fail("failed to plan query: " + query, e);
     }
@@ -78,26 +90,28 @@ public void testQueryWithException(String query, String exceptionSnippet) {
     }
   }
 
-  private static void assertGroupBySingletonAfterJoin(QueryPlan queryPlan, boolean shouldRewrite) throws Exception {
-    for (Map.Entry<Integer, StageMetadata> e : queryPlan.getStageMetadataMap().entrySet()) {
-      if (e.getValue().getScannedTables().size() == 0 && !PlannerUtils.isRootStage(e.getKey())) {
-        StageNode node = queryPlan.getQueryStageMap().get(e.getKey());
+  private static void assertGroupBySingletonAfterJoin(DispatchableSubPlan dispatchableSubPlan, boolean shouldRewrite)
+      throws Exception {
+
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      if (dispatchableSubPlan.getTableNames().size() == 0 && !PlannerUtils.isRootPlanFragment(stageId)) {
+        PlanNode node = dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment().getFragmentRoot();
         while (node != null) {
           if (node instanceof JoinNode) {
             // JOIN is exchanged with hash distribution (data shuffle)
             MailboxReceiveNode left = (MailboxReceiveNode) node.getInputs().get(0);
             MailboxReceiveNode right = (MailboxReceiveNode) node.getInputs().get(1);
-            Assert.assertEquals(left.getExchangeType(), RelDistribution.Type.HASH_DISTRIBUTED);
-            Assert.assertEquals(right.getExchangeType(), RelDistribution.Type.HASH_DISTRIBUTED);
+            Assert.assertEquals(left.getDistributionType(), RelDistribution.Type.HASH_DISTRIBUTED);
+            Assert.assertEquals(right.getDistributionType(), RelDistribution.Type.HASH_DISTRIBUTED);
             break;
           }
           if (node instanceof AggregateNode && node.getInputs().get(0) instanceof MailboxReceiveNode) {
             // AGG is exchanged with singleton since it has already been distributed by JOIN.
             MailboxReceiveNode input = (MailboxReceiveNode) node.getInputs().get(0);
             if (shouldRewrite) {
-              Assert.assertEquals(input.getExchangeType(), RelDistribution.Type.SINGLETON);
+              Assert.assertEquals(input.getDistributionType(), RelDistribution.Type.SINGLETON);
             } else {
-              Assert.assertNotEquals(input.getExchangeType(), RelDistribution.Type.SINGLETON);
+              Assert.assertNotEquals(input.getDistributionType(), RelDistribution.Type.SINGLETON);
             }
             break;
           }
@@ -111,27 +125,31 @@ private static void assertGroupBySingletonAfterJoin(QueryPlan queryPlan, boolean
   public void testQueryAndAssertStageContentForJoin()
       throws Exception {
     String query = "SELECT * FROM a JOIN b ON a.col1 = b.col2";
-    QueryPlan queryPlan = _queryEnvironment.planQuery(query);
-    Assert.assertEquals(queryPlan.getQueryStageMap().size(), 4);
-    Assert.assertEquals(queryPlan.getStageMetadataMap().size(), 4);
-    for (Map.Entry<Integer, StageMetadata> e : queryPlan.getStageMetadataMap().entrySet()) {
-      List<String> tables = e.getValue().getScannedTables();
-      if (tables.size() == 1) {
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    Assert.assertEquals(dispatchableSubPlan.getQueryStageList().size(), 4);
+
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      DispatchablePlanFragment dispatchablePlanFragment = dispatchableSubPlan.getQueryStageList().get(stageId);
+      String tableName = dispatchablePlanFragment.getTableName();
+      if (tableName != null) {
         // table scan stages; for tableA it should have 2 hosts, for tableB it should have only 1
-        Assert.assertEquals(
-            e.getValue().getServerInstances().stream().map(ServerInstance::toString).collect(Collectors.toList()),
-            tables.get(0).equals("a") ? ImmutableList.of("Server_localhost_2", "Server_localhost_1")
-                : ImmutableList.of("Server_localhost_1"));
-      } else if (!PlannerUtils.isRootStage(e.getKey())) {
+        Assert.assertEquals(dispatchablePlanFragment.getServerInstanceToWorkerIdMap().entrySet().stream()
+                .map(PhysicalExplainPlanVisitor::stringifyQueryServerInstanceToWorkerIdsEntry)
+                .collect(Collectors.toSet()),
+            tableName.equals("a") ? ImmutableList.of("localhost@{1,1}|[1]", "localhost@{2,2}|[0]")
+                : ImmutableList.of("localhost@{1,1}|[0]"));
+      } else if (!PlannerUtils.isRootPlanFragment(stageId)) {
         // join stage should have both servers used.
-        Assert.assertEquals(
-            e.getValue().getServerInstances().stream().map(ServerInstance::toString).collect(Collectors.toSet()),
-            ImmutableSet.of("Server_localhost_1", "Server_localhost_2"));
+        Assert.assertEquals(dispatchablePlanFragment.getServerInstanceToWorkerIdMap().entrySet().stream()
+                .map(PhysicalExplainPlanVisitor::stringifyQueryServerInstanceToWorkerIdsEntry)
+                .collect(Collectors.toSet()),
+            ImmutableSet.of("localhost@{1,1}|[1]", "localhost@{2,2}|[0]"));
       } else {
         // reduce stage should have the reducer instance.
-        Assert.assertEquals(
-            e.getValue().getServerInstances().stream().map(ServerInstance::toString).collect(Collectors.toSet()),
-            ImmutableSet.of("Server_localhost_3"));
+        Assert.assertEquals(dispatchablePlanFragment.getServerInstanceToWorkerIdMap().entrySet().stream()
+                .map(PhysicalExplainPlanVisitor::stringifyQueryServerInstanceToWorkerIdsEntry)
+                .collect(Collectors.toSet()),
+            ImmutableSet.of("localhost@{3,3}|[0]"));
       }
     }
   }
@@ -140,12 +158,13 @@ public void testQueryAndAssertStageContentForJoin()
   public void testQueryProjectFilterPushDownForJoin() {
     String query = "SELECT a.col1, a.ts, b.col2, b.col3 FROM a JOIN b ON a.col1 = b.col2 "
         + "WHERE a.col3 >= 0 AND a.col2 IN ('b') AND b.col3 < 0";
-    QueryPlan queryPlan = _queryEnvironment.planQuery(query);
-    List<StageNode> intermediateStageRoots =
-        queryPlan.getStageMetadataMap().entrySet().stream().filter(e -> e.getValue().getScannedTables().size() == 0)
-            .map(e -> queryPlan.getQueryStageMap().get(e.getKey())).collect(Collectors.toList());
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    List<DispatchablePlanFragment> intermediateStages =
+        dispatchableSubPlan.getQueryStageList().stream().filter(q -> q.getTableName() == null)
+            .collect(Collectors.toList());
     // Assert that no project of filter node for any intermediate stage because all should've been pushed down.
-    for (StageNode roots : intermediateStageRoots) {
+    for (DispatchablePlanFragment dispatchablePlanFragment : intermediateStages) {
+      PlanNode roots = dispatchablePlanFragment.getPlanFragment().getFragmentRoot();
       assertNodeTypeNotIn(roots, ImmutableList.of(ProjectNode.class, FilterNode.class));
     }
   }
@@ -153,52 +172,51 @@ public void testQueryProjectFilterPushDownForJoin() {
   @Test
   public void testQueryRoutingManagerCompilation() {
     String query = "SELECT * FROM d_OFFLINE";
-    QueryPlan queryPlan = _queryEnvironment.planQuery(query);
-    List<StageMetadata> tableScanMetadataList = queryPlan.getStageMetadataMap().values().stream()
-        .filter(stageMetadata -> stageMetadata.getScannedTables().size() != 0).collect(Collectors.toList());
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    List<DispatchablePlanFragment> tableScanMetadataList = dispatchableSubPlan.getQueryStageList().stream()
+        .filter(stageMetadata -> stageMetadata.getTableName() != null).collect(Collectors.toList());
     Assert.assertEquals(tableScanMetadataList.size(), 1);
-    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstances().size(), 2);
+    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstanceToWorkerIdMap().size(), 2);
 
     query = "SELECT * FROM d_REALTIME";
-    queryPlan = _queryEnvironment.planQuery(query);
-    tableScanMetadataList = queryPlan.getStageMetadataMap().values().stream()
-        .filter(stageMetadata -> stageMetadata.getScannedTables().size() != 0).collect(Collectors.toList());
+    dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    tableScanMetadataList = dispatchableSubPlan.getQueryStageList().stream()
+        .filter(stageMetadata -> stageMetadata.getTableName() != null).collect(Collectors.toList());
     Assert.assertEquals(tableScanMetadataList.size(), 1);
-    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstances().size(), 1);
-    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstances().get(0).toString(), "Server_localhost_2");
+    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstanceToWorkerIdMap().size(), 1);
 
     query = "SELECT * FROM d";
-    queryPlan = _queryEnvironment.planQuery(query);
-    tableScanMetadataList = queryPlan.getStageMetadataMap().values().stream()
-        .filter(stageMetadata -> stageMetadata.getScannedTables().size() != 0).collect(Collectors.toList());
+    dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    tableScanMetadataList = dispatchableSubPlan.getQueryStageList().stream()
+        .filter(stageMetadata -> stageMetadata.getTableName() != null).collect(Collectors.toList());
     Assert.assertEquals(tableScanMetadataList.size(), 1);
-    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstances().size(), 2);
+    Assert.assertEquals(tableScanMetadataList.get(0).getServerInstanceToWorkerIdMap().size(), 2);
   }
 
   // Test that plan query can be run as multi-thread.
   @Test
   public void testPlanQueryMultiThread()
       throws Exception {
-    Map<String, ArrayList<QueryPlan>> queryPlans = new HashMap<>();
+    Map<String, ArrayList<DispatchableSubPlan>> queryPlans = new HashMap<>();
     Lock lock = new ReentrantLock();
     Runnable joinQuery = () -> {
       String query = "SELECT a.col1, a.ts, b.col2, b.col3 FROM a JOIN b ON a.col1 = b.col2";
-      QueryPlan queryPlan = _queryEnvironment.planQuery(query);
+      DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
       lock.lock();
-      if (!queryPlans.containsKey(queryPlan)) {
+      if (!queryPlans.containsKey(dispatchableSubPlan)) {
         queryPlans.put(query, new ArrayList<>());
       }
-      queryPlans.get(query).add(queryPlan);
+      queryPlans.get(query).add(dispatchableSubPlan);
       lock.unlock();
     };
     Runnable selectQuery = () -> {
       String query = "SELECT * FROM a";
-      QueryPlan queryPlan = _queryEnvironment.planQuery(query);
+      DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
       lock.lock();
-      if (!queryPlans.containsKey(queryPlan)) {
+      if (!queryPlans.containsKey(dispatchableSubPlan)) {
         queryPlans.put(query, new ArrayList<>());
       }
-      queryPlans.get(query).add(queryPlan);
+      queryPlans.get(query).add(dispatchableSubPlan);
       lock.unlock();
     };
     ArrayList<Thread> threads = new ArrayList<>();
@@ -218,27 +236,159 @@ public void testPlanQueryMultiThread()
     for (Thread t : threads) {
       t.join();
     }
-    for (ArrayList<QueryPlan> plans : queryPlans.values()) {
-      for (QueryPlan plan : plans) {
+    for (ArrayList<DispatchableSubPlan> plans : queryPlans.values()) {
+      for (DispatchableSubPlan plan : plans) {
         Assert.assertTrue(plan.equals(plans.get(0)));
       }
     }
   }
 
+  @Test
+  public void testQueryWithHint()
+      throws Exception {
+    // Hinting the query to use final stage aggregation makes server directly return final result
+    // This is useful when data is already partitioned by col1
+    String query = "SELECT /*+ aggOptionsInternal(agg_type='DIRECT') */ col1, COUNT(*) FROM b GROUP BY col1";
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    Assert.assertEquals(dispatchableSubPlan.getQueryStageList().size(), 2);
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      DispatchablePlanFragment dispatchablePlanFragment = dispatchableSubPlan.getQueryStageList().get(stageId);
+      String tableName = dispatchablePlanFragment.getTableName();
+      if (tableName != null) {
+        // table scan stages; for tableB it should have only 1
+        Assert.assertEquals(dispatchablePlanFragment.getServerInstanceToWorkerIdMap().entrySet().stream()
+                .map(PhysicalExplainPlanVisitor::stringifyQueryServerInstanceToWorkerIdsEntry)
+                .collect(Collectors.toSet()),
+            ImmutableList.of("localhost@{1,1}|[0]"));
+      } else if (!PlannerUtils.isRootPlanFragment(stageId)) {
+        // join stage should have both servers used.
+        Assert.assertEquals(dispatchablePlanFragment.getServerInstanceToWorkerIdMap().entrySet().stream()
+                .map(PhysicalExplainPlanVisitor::stringifyQueryServerInstanceToWorkerIdsEntry)
+                .collect(Collectors.toSet()),
+            ImmutableList.of("localhost@{1,1}|[1]", "localhost@{2,2}|[0]"));
+      }
+    }
+  }
+
+  @Test
+  public void testGetTableNamesForQuery() {
+    // A simple filter query with one table
+    String query = "Select * from a where col1 = 'a'";
+    List<String> tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 1);
+    Assert.assertEquals(tableNames.get(0), "a");
+
+    // query with IN / NOT IN clause
+    query = "SELECT COUNT(*) FROM a WHERE col1 IN (SELECT col1 FROM b) "
+        + "and col1 NOT IN (SELECT col1 from c)";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 3);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+    Assert.assertEquals(tableNames.get(2), "c");
+
+    // query with JOIN clause
+    query = "SELECT a.col1, b.col2 FROM a JOIN b ON a.col3 = b.col3 WHERE a.col1 = 'a'";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 2);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+
+    // query with WHERE clause JOIN
+    query = "SELECT a.col1, b.col2 FROM a, b WHERE a.col3 = b.col3 AND a.col1 = 'a'";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 2);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+
+    // query with JOIN clause and table alias
+    query = "SELECT A.col1, B.col2 FROM a AS A JOIN b AS B ON A.col3 = B.col3 WHERE A.col1 = 'a'";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 2);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+
+    // query with UNION clause
+    query = "SELECT * FROM a UNION ALL SELECT * FROM b UNION ALL SELECT * FROM c";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 3);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+    Assert.assertEquals(tableNames.get(2), "c");
+
+    // query with UNION clause and table alias
+    query = "SELECT * FROM (SELECT * FROM a) AS t1 UNION SELECT * FROM ( SELECT * FROM b) AS t2";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 2);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+
+    // query with UNION clause and table alias using WITH clause
+    query = "WITH tmp1 AS (SELECT * FROM a), \n"
+        + "tmp2 AS (SELECT * FROM b) \n"
+        + "SELECT * FROM tmp1 UNION ALL SELECT * FROM tmp2";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 2);
+    Collections.sort(tableNames);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+
+    // query with aliases, JOIN, IN/NOT-IN, group-by
+    query = "with tmp as (select col1, sum(col3) as col3, count(*) from a where col1 = 'a' group by col1), "
+        + "tmp2 as (select A.col1, B.col3 from b as A JOIN c AS B on A.col1 = B.col1) "
+        + "select sum(col3) from tmp where col1 in (select col1 from tmp2) and col1 not in (select col1 from d)";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 4);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+    Assert.assertEquals(tableNames.get(2), "c");
+    Assert.assertEquals(tableNames.get(3), "d");
+
+    // query with aliases, JOIN, IN/NOT-IN, group-by and explain
+    query = "explain plan for with tmp as (select col1, sum(col3) as col3, count(*) from a where col1 = 'a' "
+        + "group by col1), tmp2 as (select A.col1, B.col3 from b as A JOIN c AS B on A.col1 = B.col1) "
+        + "select sum(col3) from tmp where col1 in (select col1 from tmp2) and col1 not in (select col1 from d)";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 4);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+    Assert.assertEquals(tableNames.get(2), "c");
+    Assert.assertEquals(tableNames.get(3), "d");
+
+    // lateral join query
+    query = "EXPLAIN PLAN FOR SELECT a.col1, newb.sum_col3 FROM a JOIN LATERAL "
+        + "(SELECT SUM(col3) as sum_col3 FROM b WHERE col2 = a.col2) AS newb ON TRUE";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 2);
+    Assert.assertEquals(tableNames.get(0), "a");
+    Assert.assertEquals(tableNames.get(1), "b");
+
+    // test for self join queries
+    query = "SELECT a.col1 FROM a JOIN(SELECT col2 FROM a) as self ON a.col1=self.col2 ";
+    tableNames = _queryEnvironment.getTableNamesForQuery(query);
+    Assert.assertEquals(tableNames.size(), 1);
+    Assert.assertEquals(tableNames.get(0), "a");
+  }
+
   // --------------------------------------------------------------------------
   // Test Utils.
   // --------------------------------------------------------------------------
 
-  private static void assertNodeTypeNotIn(StageNode node, List<Class<? extends AbstractStageNode>> bannedNodeType) {
+  private static void assertNodeTypeNotIn(PlanNode node, List<Class<? extends AbstractPlanNode>> bannedNodeType) {
     Assert.assertFalse(isOneOf(bannedNodeType, node));
-    for (StageNode child : node.getInputs()) {
+    for (PlanNode child : node.getInputs()) {
       assertNodeTypeNotIn(child, bannedNodeType);
     }
   }
 
-  private static boolean isOneOf(List<Class<? extends AbstractStageNode>> allowedNodeTypes,
-      StageNode node) {
-    for (Class<? extends AbstractStageNode> allowedNodeType : allowedNodeTypes) {
+  private static boolean isOneOf(List<Class<? extends AbstractPlanNode>> allowedNodeTypes, PlanNode node) {
+    for (Class<? extends AbstractPlanNode> allowedNodeType : allowedNodeTypes) {
       if (node.getClass() == allowedNodeType) {
         return true;
       }
@@ -248,7 +398,7 @@ private static boolean isOneOf(List<Class<? extends AbstractStageNode>> allowedN
 
   @DataProvider(name = "testQueryExceptionDataProvider")
   private Object[][] provideQueriesWithException() {
-    return new Object[][] {
+    return new Object[][]{
         // wrong table is being used after JOIN
         new Object[]{"SELECT b.col1 - a.col3 FROM a JOIN c ON a.col1 = c.col3", "Table 'b' not found"},
         // non-agg column not being grouped
@@ -258,31 +408,113 @@ private Object[][] provideQueriesWithException() {
         // AT TIME ZONE should fail
         new Object[]{"SELECT a.col1 AT TIME ZONE 'PST' FROM a", "No match found for function signature AT_TIME_ZONE"},
         // CASE WHEN with non-consolidated result type at compile time.
-        new Object[]{"SELECT SUM(CASE WHEN col3 > 10 THEN 1 WHEN col3 > 20 THEN 2 WHEN col3 > 30 THEN 3 "
-            + "WHEN col3 > 40 THEN 4 WHEN col3 > 50 THEN '5' ELSE 0 END) FROM a", "while converting CASE WHEN"},
+        new Object[]{
+            "SELECT SUM(CASE WHEN col3 > 10 THEN 1 WHEN col3 > 20 THEN 2 WHEN col3 > 30 THEN 3 "
+                + "WHEN col3 > 40 THEN 4 WHEN col3 > 50 THEN '5' ELSE 0 END) FROM a", "while converting CASE WHEN"
+        },
     };
   }
 
-  @DataProvider(name = "testQueryPlanDataProvider")
-  private Object[][] provideQueriesWithExplainedPlan() {
+  @DataProvider(name = "testQueryLogicalPlanDataProvider")
+  private Object[][] provideQueriesWithExplainedLogicalPlan() {
+    //@formatter:off
     return new Object[][] {
-        new Object[]{"EXPLAIN PLAN INCLUDING ALL ATTRIBUTES AS JSON FOR SELECT col1, col3 FROM a", "{\n"
-            + "  \"rels\": [\n" + "    {\n" + "      \"id\": \"0\",\n" + "      \"relOp\": \"LogicalTableScan\",\n"
-            + "      \"table\": [\n" + "        \"a\"\n" + "      ],\n" + "      \"inputs\": []\n" + "    },\n"
-            + "    {\n" + "      \"id\": \"1\",\n" + "      \"relOp\": \"LogicalProject\",\n" + "      \"fields\": [\n"
-            + "        \"col1\",\n" + "        \"col3\"\n" + "      ],\n" + "      \"exprs\": [\n" + "        {\n"
-            + "          \"input\": 2,\n" + "          \"name\": \"$2\"\n" + "        },\n" + "        {\n"
-            + "          \"input\": 1,\n" + "          \"name\": \"$1\"\n" + "        }\n" + "      ]\n" + "    }\n"
-            + "  ]\n" + "}"},
+        new Object[]{"EXPLAIN PLAN INCLUDING ALL ATTRIBUTES AS JSON FOR SELECT col1, col3 FROM a",
+              "{\n"
+            + "  \"rels\": [\n"
+            + "    {\n"
+            + "      \"id\": \"0\",\n"
+            + "      \"relOp\": \"LogicalTableScan\",\n"
+            + "      \"table\": [\n"
+            + "        \"a\"\n"
+            + "      ],\n"
+            + "      \"inputs\": []\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"id\": \"1\",\n"
+            + "      \"relOp\": \"LogicalProject\",\n"
+            + "      \"fields\": [\n"
+            + "        \"col1\",\n"
+            + "        \"col3\"\n"
+            + "      ],\n"
+            + "      \"exprs\": [\n"
+            + "        {\n"
+            + "          \"input\": 0,\n"
+            + "          \"name\": \"$0\"\n"
+            + "        },\n"
+            + "        {\n"
+            + "          \"input\": 2,\n"
+            + "          \"name\": \"$2\"\n"
+            + "        }\n"
+            + "      ]\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}"},
         new Object[]{"EXPLAIN PLAN EXCLUDING ATTRIBUTES AS DOT FOR SELECT col1, COUNT(*) FROM a GROUP BY col1",
-            "Execution Plan\n" + "digraph {\n" + "\"LogicalExchange\\n\" -> \"LogicalAggregate\\n\" [label=\"0\"]\n"
-                + "\"LogicalAggregate\\n\" -> \"LogicalExchange\\n\" [label=\"0\"]\n"
-                + "\"LogicalTableScan\\n\" -> \"LogicalAggregate\\n\" [label=\"0\"]\n" + "}\n"},
-        new Object[]{"EXPLAIN PLAN FOR SELECT a.col1, b.col3 FROM a JOIN b ON a.col1 = b.col1", "Execution Plan\n"
-            + "LogicalProject(col1=[$0], col3=[$1])\n" + "  LogicalJoin(condition=[=($0, $2)], joinType=[inner])\n"
-            + "    LogicalExchange(distribution=[hash[0]])\n" + "      LogicalProject(col1=[$2])\n"
-            + "        LogicalTableScan(table=[[a]])\n" + "    LogicalExchange(distribution=[hash[1]])\n"
-            + "      LogicalProject(col3=[$1], col1=[$2])\n" + "        LogicalTableScan(table=[[b]])\n"},
+              "Execution Plan\n"
+            + "digraph {\n"
+            + "\"PinotLogicalExchange\\n\" -> \"LogicalAggregate\\n\" [label=\"0\"]\n"
+            + "\"LogicalAggregate\\n\" -> \"PinotLogicalExchange\\n\" [label=\"0\"]\n"
+            + "\"LogicalTableScan\\n\" -> \"LogicalAggregate\\n\" [label=\"0\"]\n"
+            + "}\n"},
+        new Object[]{"EXPLAIN PLAN FOR SELECT a.col1, b.col3 FROM a JOIN b ON a.col1 = b.col1",
+              "Execution Plan\n"
+            + "LogicalProject(col1=[$0], col3=[$2])\n"
+            + "  LogicalJoin(condition=[=($0, $1)], joinType=[inner])\n"
+            + "    PinotLogicalExchange(distribution=[hash[0]])\n"
+            + "      LogicalProject(col1=[$0])\n"
+            + "        LogicalTableScan(table=[[a]])\n"
+            + "    PinotLogicalExchange(distribution=[hash[0]])\n"
+            + "      LogicalProject(col1=[$0], col3=[$2])\n"
+            + "        LogicalTableScan(table=[[b]])\n"
+        },
+    };
+    //@formatter:on
+  }
+
+  @DataProvider(name = "testQueryPhysicalPlanDataProvider")
+  private Object[][] provideQueriesWithExplainedPhysicalPlan() {
+    //@formatter:off
+    return new Object[][] {
+new Object[]{"EXPLAIN IMPLEMENTATION PLAN INCLUDING ALL ATTRIBUTES AS JSON FOR SELECT col1, col3 FROM a",
+  "[0]@localhost:3 MAIL_RECEIVE(RANDOM_DISTRIBUTED)\n"
+  + "├── [1]@localhost:2 MAIL_SEND(RANDOM_DISTRIBUTED)->{[0]@localhost@{3,3}|[0]}\n"
+  + "│   └── [1]@localhost:2 PROJECT\n"
+  + "│      └── [1]@localhost:2 TABLE SCAN (a) null\n"
+  + "└── [1]@localhost:1 MAIL_SEND(RANDOM_DISTRIBUTED)->{[0]@localhost@{3,3}|[0]}\n"
+  + "   └── [1]@localhost:1 PROJECT\n"
+  + "      └── [1]@localhost:1 TABLE SCAN (a) null\n"},
+new Object[]{"EXPLAIN IMPLEMENTATION PLAN EXCLUDING ATTRIBUTES AS DOT FOR "
+    + "SELECT col1, COUNT(*) FROM a GROUP BY col1",
+  "[0]@localhost:3 MAIL_RECEIVE(RANDOM_DISTRIBUTED)\n"
+  + "├── [1]@localhost:2 MAIL_SEND(RANDOM_DISTRIBUTED)->{[0]@localhost@{3,3}|[0]} (Subtree Omitted)\n"
+  + "└── [1]@localhost:1 MAIL_SEND(RANDOM_DISTRIBUTED)->{[0]@localhost@{3,3}|[0]}\n"
+  + "   └── [1]@localhost:1 AGGREGATE_FINAL\n"
+  + "      └── [1]@localhost:1 MAIL_RECEIVE(HASH_DISTRIBUTED)\n"
+  + "         ├── [2]@localhost:2 MAIL_SEND(HASH_DISTRIBUTED)->{[1]@localhost@{2,2}|[0],[1]@localhost@{1,1}|[1]}\n"
+  + "         │   └── [2]@localhost:2 AGGREGATE_LEAF\n"
+  + "         │      └── [2]@localhost:2 TABLE SCAN (a) null\n"
+  + "         └── [2]@localhost:1 MAIL_SEND(HASH_DISTRIBUTED)->{[1]@localhost@{2,2}|[0],[1]@localhost@{1,1}|[1]}\n"
+  + "            └── [2]@localhost:1 AGGREGATE_LEAF\n"
+  + "               └── [2]@localhost:1 TABLE SCAN (a) null\n"},
+new Object[]{"EXPLAIN IMPLEMENTATION PLAN FOR SELECT a.col1, b.col3 FROM a JOIN b ON a.col1 = b.col1",
+  "[0]@localhost:3 MAIL_RECEIVE(RANDOM_DISTRIBUTED)\n"
+  + "├── [1]@localhost:2 MAIL_SEND(RANDOM_DISTRIBUTED)->{[0]@localhost@{3,3}|[0]} (Subtree Omitted)\n"
+  + "└── [1]@localhost:1 MAIL_SEND(RANDOM_DISTRIBUTED)->{[0]@localhost@{3,3}|[0]}\n"
+  + "   └── [1]@localhost:1 PROJECT\n"
+  + "      └── [1]@localhost:1 JOIN\n"
+  + "         ├── [1]@localhost:1 MAIL_RECEIVE(HASH_DISTRIBUTED)\n"
+  + "         │   ├── [2]@localhost:2 MAIL_SEND(HASH_DISTRIBUTED)->{[1]@localhost@{2,2}|[0],[1]@localhost@{1,1}|[1]}\n"
+  + "         │   │   └── [2]@localhost:2 PROJECT\n"
+  + "         │   │      └── [2]@localhost:2 TABLE SCAN (a) null\n"
+  + "         │   └── [2]@localhost:1 MAIL_SEND(HASH_DISTRIBUTED)->{[1]@localhost@{2,2}|[0],[1]@localhost@{1,1}|[1]}\n"
+  + "         │      └── [2]@localhost:1 PROJECT\n"
+  + "         │         └── [2]@localhost:1 TABLE SCAN (a) null\n"
+  + "         └── [1]@localhost:1 MAIL_RECEIVE(HASH_DISTRIBUTED)\n"
+  + "            └── [3]@localhost:1 MAIL_SEND(HASH_DISTRIBUTED)->{[1]@localhost@{2,2}|[0],[1]@localhost@{1,1}|[1]}\n"
+  + "               └── [3]@localhost:1 PROJECT\n"
+  + "                  └── [3]@localhost:1 TABLE SCAN (b) null\n"}
     };
+    //@formatter:on
   }
 }
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTestBase.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTestBase.java
index 7d761bac4fc..c6308d08544 100644
--- a/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTestBase.java
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/QueryEnvironmentTestBase.java
@@ -18,11 +18,14 @@
  */
 package org.apache.pinot.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import org.apache.calcite.jdbc.CalciteSchemaBuilder;
 import org.apache.pinot.common.config.provider.TableCache;
 import org.apache.pinot.core.routing.RoutingManager;
@@ -38,6 +41,8 @@
 
 
 public class QueryEnvironmentTestBase {
+
+  protected static final Random RANDOM_REQUEST_ID_GEN = new Random();
   public static final Map<String, List<String>> SERVER1_SEGMENTS =
       ImmutableMap.of("a_REALTIME", ImmutableList.of("a1", "a2"), "b_REALTIME", ImmutableList.of("b1"), "c_OFFLINE",
           ImmutableList.of("c1"), "d_OFFLINE", ImmutableList.of("d1"));
@@ -50,8 +55,11 @@ public class QueryEnvironmentTestBase {
     SCHEMA_BUILDER = new Schema.SchemaBuilder()
         .addSingleValueDimension("col1", FieldSpec.DataType.STRING, "")
         .addSingleValueDimension("col2", FieldSpec.DataType.STRING, "")
+        .addSingleValueDimension("col5", FieldSpec.DataType.BOOLEAN, false)
         .addDateTime("ts", FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:HOURS")
         .addMetric("col3", FieldSpec.DataType.INT, 0)
+        .addMetric("col4", FieldSpec.DataType.BIG_DECIMAL, 0)
+        .addMetric("col6", FieldSpec.DataType.INT, 0)
         .setSchemaName("defaultSchemaName");
     TABLE_SCHEMAS.put("a_REALTIME", SCHEMA_BUILDER.setSchemaName("a").build());
     TABLE_SCHEMAS.put("b_REALTIME", SCHEMA_BUILDER.setSchemaName("b").build());
@@ -70,6 +78,11 @@ public void setUp() {
   @DataProvider(name = "testQueryDataProvider")
   protected Object[][] provideQueries() {
     return new Object[][] {
+        new Object[]{"SELECT * FROM a UNION SELECT * FROM b"},
+        new Object[]{"SELECT * FROM a UNION ALL SELECT * FROM b"},
+        new Object[]{"SELECT * FROM a INTERSECT SELECT * FROM b"},
+        new Object[]{"SELECT * FROM a EXCEPT SELECT * FROM b"},
+        new Object[]{"SELECT * FROM a MINUS SELECT * FROM b"},
         new Object[]{"SELECT * FROM a ORDER BY col1 LIMIT 10"},
         new Object[]{"SELECT * FROM b ORDER BY col1, col2 DESC LIMIT 10"},
         new Object[]{"SELECT * FROM d"},
@@ -81,6 +94,18 @@ protected Object[][] provideQueries() {
             + " WHERE a.col3 >= 0 AND a.col2 = 'a' AND b.col3 < 0"},
         new Object[]{"SELECT a.col1, a.col3 + a.ts FROM a WHERE a.col3 >= 0 AND a.col2 = 'a'"},
         new Object[]{"SELECT SUM(a.col3), COUNT(*) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a'"},
+        new Object[]{"SELECT AVG(a.col3), SUM(a.col3), COUNT(a.col3) FROM a"},
+        new Object[]{"SELECT a.col1, AVG(a.col3), SUM(a.col3), COUNT(a.col3) FROM a GROUP BY a.col1"},
+        // TODO: support BOOL_AND and BOOL_OR as MIN/MAX
+//        new Object[]{"SELECT BOOL_AND(a.col5), BOOL_OR(a.col5) FROM a"},
+//        new Object[]{"SELECT a.col3, BOOL_AND(a.col5), BOOL_OR(a.col5) FROM a GROUP BY a.col3"},
+        new Object[]{"SELECT KURTOSIS(a.col2), COUNT(DISTINCT a.col3), SKEWNESS(a.col3) FROM a"},
+        new Object[]{"SELECT a.col1, KURTOSIS(a.col2), SKEWNESS(a.col3) FROM a GROUP BY a.col1"},
+        new Object[]{"SELECT COUNT(a.col3), AVG(a.col3), SUM(a.col3), MIN(a.col3), MAX(a.col3) FROM a"},
+        new Object[]{"SELECT DISTINCTCOUNT(a.col3), COUNT(a.col4), COUNT(*), COUNT(DISTINCT a.col1) FROM a"},
+        new Object[]{"SELECT a.col2, DISTINCTCOUNT(a.col3), COUNT(a.col4), COUNT(*), COUNT(DISTINCT a.col1) FROM a "
+            + "GROUP BY a.col2 ORDER BY a.col2"},
+        new Object[]{"SELECT a.col1, SKEWNESS(a.col3), KURTOSIS(a.col3), DISTINCTCOUNT(a.col1) FROM a GROUP BY a.col1"},
         new Object[]{"SELECT a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1"},
         new Object[]{"SELECT a.col1, COUNT(*) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1"},
         new Object[]{"SELECT a.col2, a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col1 = 'a' "
@@ -96,6 +121,46 @@ protected Object[][] provideQueries() {
             + " WHERE a.col3 >= 0 GROUP BY a.col2, a.col3"},
         new Object[]{"SELECT a.col1, b.col2 FROM a JOIN b ON a.col1 = b.col1 WHERE a.col2 IN ('foo', 'bar') AND"
             + " b.col2 NOT IN ('alice', 'charlie')"},
+        new Object[]{"SELECT COUNT(*) OVER() FROM a"},
+        new Object[]{"SELECT 42, COUNT(*) OVER() FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER () FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER (PARTITION BY a.col2) FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER (PARTITION BY a.col2 ORDER BY a.col2) FROM a"},
+        new Object[]{"SELECT a.col1, AVG(a.col3) OVER (), SUM(a.col3) OVER () FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER () FROM a WHERE a.col3 >= 0"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER (PARTITION BY a.col2), MIN(a.col3) OVER (PARTITION BY a.col2) "
+            + "FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER (PARTITION BY a.col2, a.col1) FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER (ORDER BY a.col2, a.col1), MIN(a.col3) OVER (ORDER BY a.col2, "
+            + "a.col1) FROM a"},
+        new Object[]{"SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col3) FROM a"},
+        new Object[]{"SELECT RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a"},
+        new Object[]{"SELECT col1, total, rank FROM (SELECT a.col1 as col1, count(*) as total, "
+            + "RANK() OVER(ORDER BY count(*) DESC) AS rank FROM a GROUP BY a.col1) WHERE rank < 5"},
+        new Object[]{"SELECT RANK() OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a"},
+        new Object[]{"SELECT DENSE_RANK() OVER(ORDER BY a.col1) FROM a"},
+        new Object[]{"SELECT a.col1, SUM(a.col3) OVER (ORDER BY a.col2), MIN(a.col3) OVER (ORDER BY a.col2) FROM a"},
+        new Object[]{"SELECT /*+ joinOptions(is_colocated_by_join_keys='true'), "
+            + "aggOptions(is_partitioned_by_group_by_keys='true') */ a.col3, a.col1, SUM(b.col3) FROM a JOIN b "
+            + "ON a.col3 = b.col3 GROUP BY a.col3, a.col1"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, COUNT(*), SUM(a.col3), "
+            + "SUM(a.col1) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col2 HAVING COUNT(*) > 10 "
+            + "AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3) FROM a "
+            + "WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, COUNT(*) FROM a "
+            + "WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, a.col1, SUM(a.col3) FROM a "
+            + "WHERE a.col3 >= 0 AND a.col1 = 'a'  GROUP BY a.col1, a.col2"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, AVG(b.col3) FROM a JOIN b "
+            + "ON a.col1 = b.col2  WHERE a.col3 >= 0 AND a.col2 = 'a' AND b.col3 < 0 GROUP BY a.col1"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1 as v1, a.col1 as v2, "
+            + "AVG(a.col3) FROM a GROUP BY v1, v2"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, COUNT(*), SUM(a.col3), "
+            + "SUM(a.col1) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col2 HAVING COUNT(*) > 10 "
+            + "AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5"},
+        new Object[]{"SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, a.col3 FROM a JOIN b "
+            + "ON a.col1 = b.col1  WHERE a.col3 >= 0 GROUP BY a.col2, a.col3"},
     };
   }
 
@@ -121,4 +186,43 @@ public static QueryEnvironment getQueryEnvironment(int reducerPort, int port1, i
         CalciteSchemaBuilder.asRootSchema(new PinotCatalog(tableCache)),
         new WorkerManager("localhost", reducerPort, routingManager), tableCache);
   }
+
+  /**
+   * JSON test case definition for query planner test cases. Tables and schemas will come from those already defined
+   * and part of the {@code QueryEnvironment} in this base and are not part of the JSON definition for now.
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  public static class QueryPlanTestCase {
+    // ignores the entire query test case
+    @JsonProperty("ignored")
+    public boolean _ignored;
+    @JsonProperty("queries")
+    public List<Query> _queries;
+
+    @Override
+    public String toString() {
+      return "QueryPlanTestCase{" + "_ignored=" + _ignored + ", _queries=" + _queries + '}';
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Query {
+      // ignores just a single query test from the test case
+      @JsonProperty("ignored")
+      public boolean _ignored;
+      @JsonProperty("sql")
+      public String _sql;
+      @JsonProperty("description")
+      public String _description;
+      @JsonProperty("output")
+      public List<String> _output = null;
+      @JsonProperty("expectedException")
+      public String _expectedException;
+
+      @Override
+      public String toString() {
+        return "Query{" + "_ignored=" + _ignored + ", _sql='" + _sql + '\'' + ", _description='" + _description + '\''
+            + ", _outputs=" + _output + ", _expectedException='" + _expectedException + '\'' + '}';
+      }
+    }
+  }
 }
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/RelToPlanNodeConverterTest.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/RelToPlanNodeConverterTest.java
new file mode 100644
index 00000000000..427829c71d5
--- /dev/null
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/logical/RelToPlanNodeConverterTest.java
@@ -0,0 +1,133 @@
+/**
+ * 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.pinot.query.planner.logical;
+
+import org.apache.calcite.rel.type.RelDataTypeSystem;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.type.ArraySqlType;
+import org.apache.calcite.sql.type.BasicSqlType;
+import org.apache.calcite.sql.type.ObjectSqlType;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.pinot.common.utils.DataSchema;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class RelToPlanNodeConverterTest {
+
+  @Test
+  public void testConvertToColumnDataTypeForObjectTypes() {
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.BOOLEAN, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.BOOLEAN);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.TINYINT, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.INT);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.SMALLINT, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.INT);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.INTEGER, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.INT);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.BIGINT, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.LONG);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.FLOAT, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.FLOAT);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.DOUBLE, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.DOUBLE);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.TIMESTAMP, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.TIMESTAMP);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.CHAR, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.STRING);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.VARCHAR, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.STRING);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.VARBINARY, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.BYTES);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ObjectSqlType(SqlTypeName.OTHER, SqlIdentifier.STAR, true, null, null)),
+        DataSchema.ColumnDataType.OBJECT);
+  }
+
+  @Test
+  public void testBigDecimal() {
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new BasicSqlType(RelDataTypeSystem.DEFAULT, SqlTypeName.DECIMAL, 10)),
+        DataSchema.ColumnDataType.INT);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new BasicSqlType(RelDataTypeSystem.DEFAULT, SqlTypeName.DECIMAL, 38)),
+        DataSchema.ColumnDataType.LONG);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new BasicSqlType(RelDataTypeSystem.DEFAULT, SqlTypeName.DECIMAL, 39)),
+        DataSchema.ColumnDataType.BIG_DECIMAL);
+
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new BasicSqlType(RelDataTypeSystem.DEFAULT, SqlTypeName.DECIMAL, 14, 10)),
+        DataSchema.ColumnDataType.FLOAT);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new BasicSqlType(RelDataTypeSystem.DEFAULT, SqlTypeName.DECIMAL, 30, 10)),
+        DataSchema.ColumnDataType.DOUBLE);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new BasicSqlType(RelDataTypeSystem.DEFAULT, SqlTypeName.DECIMAL, 31, 10)),
+        DataSchema.ColumnDataType.BIG_DECIMAL);
+  }
+
+  @Test
+  public void testConvertToColumnDataTypeForArray() {
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.BOOLEAN, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.BOOLEAN_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.TINYINT, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.INT_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.SMALLINT, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.INT_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.INTEGER, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.INT_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.BIGINT, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.LONG_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.FLOAT, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.FLOAT_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.DOUBLE, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.DOUBLE_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.TIMESTAMP, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.TIMESTAMP_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.CHAR, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.STRING_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.VARCHAR, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.STRING_ARRAY);
+    Assert.assertEquals(RelToPlanNodeConverter.convertToColumnDataType(
+            new ArraySqlType(new ObjectSqlType(SqlTypeName.VARBINARY, SqlIdentifier.STAR, true, null, null), true)),
+        DataSchema.ColumnDataType.BYTES_ARRAY);
+  }
+}
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/stage/SerDeUtilsTest.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/plannode/SerDeUtilsTest.java
similarity index 81%
rename from pinot-query-planner/src/test/java/org/apache/pinot/query/planner/stage/SerDeUtilsTest.java
rename to pinot-query-planner/src/test/java/org/apache/pinot/query/planner/plannode/SerDeUtilsTest.java
index 7bd9fcb6ada..59132601b09 100644
--- a/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/stage/SerDeUtilsTest.java
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/planner/plannode/SerDeUtilsTest.java
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.planner.stage;
+package org.apache.pinot.query.planner.plannode;
 
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.common.proto.Plan;
 import org.apache.pinot.query.QueryEnvironmentTestBase;
-import org.apache.pinot.query.planner.QueryPlan;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
 import org.apache.pinot.query.planner.serde.ProtoProperties;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -34,12 +35,14 @@ public class SerDeUtilsTest extends QueryEnvironmentTestBase {
   @Test(dataProvider = "testQueryDataProvider")
   public void testQueryStagePlanSerDe(String query)
       throws Exception {
-    QueryPlan queryPlan = _queryEnvironment.planQuery(query);
-    for (StageNode stageNode : queryPlan.getQueryStageMap().values()) {
-      Plan.StageNode serializedStageNode = StageNodeSerDeUtils.serializeStageNode((AbstractStageNode) stageNode);
-      StageNode deserializedStageNode = StageNodeSerDeUtils.deserializeStageNode(serializedStageNode);
+
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(query);
+    for (DispatchablePlanFragment dispatchablePlanFragment : dispatchableSubPlan.getQueryStageList()) {
+      PlanNode stageNode = dispatchablePlanFragment.getPlanFragment().getFragmentRoot();
+      Plan.StageNode serializedStageNode = StageNodeSerDeUtils.serializeStageNode((AbstractPlanNode) stageNode);
+      PlanNode deserializedStageNode = StageNodeSerDeUtils.deserializeStageNode(serializedStageNode);
       Assert.assertTrue(isObjectEqual(stageNode, deserializedStageNode));
-      Assert.assertEquals(deserializedStageNode.getStageId(), stageNode.getStageId());
+      Assert.assertEquals(deserializedStageNode.getPlanFragmentId(), stageNode.getPlanFragmentId());
       Assert.assertEquals(deserializedStageNode.getDataSchema(), stageNode.getDataSchema());
       Assert.assertEquals(deserializedStageNode.getInputs().size(), stageNode.getInputs().size());
     }
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/queries/ResourceBasedQueryPlansTest.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/queries/ResourceBasedQueryPlansTest.java
new file mode 100644
index 00000000000..3da8ce8edf1
--- /dev/null
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/queries/ResourceBasedQueryPlansTest.java
@@ -0,0 +1,181 @@
+/**
+ * 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.pinot.query.queries;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.query.QueryEnvironmentTestBase;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+
+public class ResourceBasedQueryPlansTest extends QueryEnvironmentTestBase {
+  private static final ObjectMapper MAPPER = new ObjectMapper();
+  private static final String QUERY_TEST_RESOURCE_FOLDER = "queries";
+  private static final String FILE_FILTER_PROPERTY = "pinot.fileFilter";
+
+  @Test(dataProvider = "testResourceQueryPlannerTestCaseProviderHappyPath")
+  public void testQueryExplainPlansAndQueryPlanConversion(String testCaseName, String query, String output) {
+    try {
+      long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+      String explainedPlan = _queryEnvironment.explainQuery(query, requestId);
+      Assert.assertEquals(explainedPlan, output,
+          String.format("Test case %s for query %s doesn't match expected output: %s", testCaseName, query, output));
+      String queryWithoutExplainPlan = query.replace("EXPLAIN PLAN FOR ", "");
+      DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(queryWithoutExplainPlan);
+      Assert.assertNotNull(dispatchableSubPlan,
+          String.format("Test case %s for query %s should not have a null QueryPlan",
+              testCaseName, queryWithoutExplainPlan));
+    } catch (Exception e) {
+      Assert.fail("Test case: " + testCaseName + " failed to explain query: " + query, e);
+    }
+  }
+
+  @Test(dataProvider = "testResourceQueryPlannerTestCaseProviderExceptions")
+  public void testQueryExplainPlansWithExceptions(String testCaseName, String query, String expectedException) {
+    try {
+      long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+      _queryEnvironment.explainQuery(query, requestId);
+      Assert.fail("Query compilation should have failed with exception message pattern: " + expectedException);
+    } catch (Exception e) {
+      if (expectedException == null) {
+        throw e;
+      } else {
+        Pattern pattern = Pattern.compile(expectedException);
+        Assert.assertTrue(pattern.matcher(e.getMessage()).matches(),
+            String.format("Caught exception '%s' for test case '%s', but it did not match the expected pattern '%s'.",
+                e.getMessage(), testCaseName, expectedException));
+      }
+    }
+  }
+
+  @DataProvider
+  private static Object[][] testResourceQueryPlannerTestCaseProviderHappyPath()
+      throws Exception {
+    Map<String, QueryPlanTestCase> testCaseMap = getTestCases();
+    List<Object[]> providerContent = new ArrayList<>();
+    for (Map.Entry<String, QueryPlanTestCase> testCaseEntry : testCaseMap.entrySet()) {
+      String testCaseName = testCaseEntry.getKey();
+      if (testCaseEntry.getValue()._ignored) {
+        continue;
+      }
+
+      List<QueryPlanTestCase.Query> queryCases = testCaseEntry.getValue()._queries;
+      for (QueryPlanTestCase.Query queryCase : queryCases) {
+        if (queryCase._ignored || queryCase._expectedException != null) {
+          continue;
+        }
+
+        if (queryCase._output != null) {
+          String sql = queryCase._sql;
+          List<String> orgOutput = queryCase._output;
+          String concatenatedOutput = StringUtils.join(orgOutput, "");
+          Object[] testEntry = new Object[]{testCaseName, sql, concatenatedOutput};
+          providerContent.add(testEntry);
+        }
+      }
+    }
+    return providerContent.toArray(new Object[][]{});
+  }
+
+  @DataProvider
+  private static Object[][] testResourceQueryPlannerTestCaseProviderExceptions()
+      throws Exception {
+    Map<String, QueryPlanTestCase> testCaseMap = getTestCases();
+    List<Object[]> providerContent = new ArrayList<>();
+    for (Map.Entry<String, QueryPlanTestCase> testCaseEntry : testCaseMap.entrySet()) {
+      String testCaseName = testCaseEntry.getKey();
+      if (testCaseEntry.getValue()._ignored) {
+        continue;
+      }
+
+      List<QueryPlanTestCase.Query> queryCases = testCaseEntry.getValue()._queries;
+      for (QueryPlanTestCase.Query queryCase : queryCases) {
+        if (queryCase._ignored) {
+          continue;
+        }
+
+        if (queryCase._expectedException != null) {
+          String sql = queryCase._sql;
+          String exceptionString = queryCase._expectedException;
+          Object[] testEntry = new Object[]{testCaseName, sql, exceptionString};
+          providerContent.add(testEntry);
+        }
+      }
+    }
+    return providerContent.toArray(new Object[][]{});
+  }
+
+  private static Map<String, QueryPlanTestCase> getTestCases()
+      throws Exception {
+    Map<String, QueryPlanTestCase> testCaseMap = new HashMap<>();
+    ClassLoader classLoader = ResourceBasedQueryPlansTest.class.getClassLoader();
+    // Get all test files.
+    List<String> testFilenames = new ArrayList<>();
+    try (InputStream in = classLoader.getResourceAsStream(QUERY_TEST_RESOURCE_FOLDER);
+        BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+      String resource;
+      while ((resource = br.readLine()) != null) {
+        testFilenames.add(resource);
+      }
+    }
+
+    // get filter if set
+    String property = System.getProperty(FILE_FILTER_PROPERTY);
+
+    // Load each test file.
+    for (String testCaseName : testFilenames) {
+      if (property != null && !testCaseName.toLowerCase().contains(property.toLowerCase())) {
+        continue;
+      }
+
+      String testCaseFile = QUERY_TEST_RESOURCE_FOLDER + File.separator + testCaseName;
+      URL testFileUrl = classLoader.getResource(testCaseFile);
+      // This test only supports local resource loading (e.g. must be a file), not support JAR test loading.
+      if (testFileUrl != null && new File(testFileUrl.getFile()).exists()) {
+        Map<String, QueryPlanTestCase> testCases = MAPPER.readValue(new File(testFileUrl.getFile()),
+            new TypeReference<Map<String, QueryPlanTestCase>>() {
+            });
+        {
+          HashSet<String> hashSet = new HashSet<>(testCaseMap.keySet());
+          hashSet.retainAll(testCases.keySet());
+          if (!hashSet.isEmpty()) {
+            throw new IllegalArgumentException("testCase already exist for the following names: " + hashSet);
+          }
+        }
+        testCaseMap.putAll(testCases);
+      }
+    }
+    return testCaseMap;
+  }
+}
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/testutils/MockRoutingManagerFactory.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/testutils/MockRoutingManagerFactory.java
index 5e75de04558..58db9c7f413 100644
--- a/pinot-query-planner/src/test/java/org/apache/pinot/query/testutils/MockRoutingManagerFactory.java
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/testutils/MockRoutingManagerFactory.java
@@ -24,15 +24,19 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.config.provider.TableCache;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.core.routing.RoutingManager;
 import org.apache.pinot.core.routing.RoutingTable;
+import org.apache.pinot.core.routing.TablePartitionInfo;
 import org.apache.pinot.core.routing.TimeBoundaryInfo;
 import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.routing.WorkerInstance;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 
 import static org.mockito.ArgumentMatchers.anyString;
@@ -65,7 +69,7 @@ public MockRoutingManagerFactory(int... ports) {
 
     _tableServerSegmentMap = new HashMap<>();
     for (int port : ports) {
-      _serverInstances.put(toHostname(port), new WorkerInstance(HOST_NAME, port, port, port, port));
+      _serverInstances.put(toHostname(port), getServerInstance(HOST_NAME, port, port, port, port));
     }
   }
 
@@ -119,6 +123,20 @@ private static String toHostname(int port) {
     return String.format("%s_%d", HOST_NAME, port);
   }
 
+  private static ServerInstance getServerInstance(String hostname, int nettyPort, int grpcPort, int servicePort,
+      int mailboxPort) {
+    String server = String.format("%s%s_%d", CommonConstants.Helix.PREFIX_OF_SERVER_INSTANCE, hostname, nettyPort);
+    InstanceConfig instanceConfig = InstanceConfig.toInstanceConfig(server);
+    ZNRecord znRecord = instanceConfig.getRecord();
+    Map<String, String> simpleFields = znRecord.getSimpleFields();
+    simpleFields.put(CommonConstants.Helix.Instance.GRPC_PORT_KEY, String.valueOf(grpcPort));
+    simpleFields.put(CommonConstants.Helix.Instance.MULTI_STAGE_QUERY_ENGINE_SERVICE_PORT_KEY,
+        String.valueOf(servicePort));
+    simpleFields.put(CommonConstants.Helix.Instance.MULTI_STAGE_QUERY_ENGINE_MAILBOX_PORT_KEY,
+        String.valueOf(mailboxPort));
+    return new ServerInstance(instanceConfig);
+  }
+
   private void registerTableNameWithType(Schema schema, String tableNameWithType) {
     String rawTableName = TableNameBuilder.extractRawTableName(tableNameWithType);
     _tableNameMap.put(tableNameWithType, rawTableName);
@@ -161,5 +179,16 @@ public TimeBoundaryInfo getTimeBoundaryInfo(String tableName) {
       return _hybridTables.contains(rawTableName) ? new TimeBoundaryInfo(TIME_BOUNDARY_COLUMN,
           String.valueOf(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))) : null;
     }
+
+    @Nullable
+    @Override
+    public TablePartitionInfo getTablePartitionInfo(String tableNameWithType) {
+      return null;
+    }
+
+    @Override
+    public Map<String, ServerInstance> getEnabledServersForTableTenant(String tableNameWithType) {
+      return _serverInstances;
+    }
   }
 }
diff --git a/pinot-query-planner/src/test/java/org/apache/pinot/query/type/TypeFactoryTest.java b/pinot-query-planner/src/test/java/org/apache/pinot/query/type/TypeFactoryTest.java
new file mode 100644
index 00000000000..b674a1fe586
--- /dev/null
+++ b/pinot-query-planner/src/test/java/org/apache/pinot/query/type/TypeFactoryTest.java
@@ -0,0 +1,121 @@
+/**
+ * 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.pinot.query.type;
+
+import java.util.List;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeField;
+import org.apache.calcite.sql.type.ArraySqlType;
+import org.apache.calcite.sql.type.BasicSqlType;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class TypeFactoryTest {
+  private static final TypeSystem TYPE_SYSTEM = new TypeSystem() {
+  };
+
+  @Test
+  public void testRelDataTypeConversion() {
+    TypeFactory typeFactory = new TypeFactory(TYPE_SYSTEM);
+    Schema testSchema = new Schema.SchemaBuilder().addSingleValueDimension("INT_COL", FieldSpec.DataType.INT)
+        .addSingleValueDimension("LONG_COL", FieldSpec.DataType.LONG)
+        .addSingleValueDimension("FLOAT_COL", FieldSpec.DataType.FLOAT)
+        .addSingleValueDimension("DOUBLE_COL", FieldSpec.DataType.DOUBLE)
+        .addSingleValueDimension("STRING_COL", FieldSpec.DataType.STRING)
+        .addSingleValueDimension("BYTES_COL", FieldSpec.DataType.BYTES)
+        .addSingleValueDimension("JSON_COL", FieldSpec.DataType.JSON)
+        .addMultiValueDimension("INT_ARRAY_COL", FieldSpec.DataType.INT)
+        .addMultiValueDimension("LONG_ARRAY_COL", FieldSpec.DataType.LONG)
+        .addMultiValueDimension("FLOAT_ARRAY_COL", FieldSpec.DataType.FLOAT)
+        .addMultiValueDimension("DOUBLE_ARRAY_COL", FieldSpec.DataType.DOUBLE)
+        .addMultiValueDimension("STRING_ARRAY_COL", FieldSpec.DataType.STRING)
+        .addMultiValueDimension("BYTES_ARRAY_COL", FieldSpec.DataType.BYTES)
+        .build();
+    RelDataType relDataTypeFromSchema = typeFactory.createRelDataTypeFromSchema(testSchema);
+    List<RelDataTypeField> fieldList = relDataTypeFromSchema.getFieldList();
+    for (RelDataTypeField field : fieldList) {
+      switch (field.getName()) {
+        case "INT_COL":
+          BasicSqlType intBasicSqlType = new BasicSqlType(TYPE_SYSTEM, SqlTypeName.INTEGER);
+          Assert.assertEquals(field.getType(), intBasicSqlType);
+          checkPrecisionScale(field, intBasicSqlType);
+          break;
+        case "LONG_COL":
+          BasicSqlType bigIntBasicSqlType = new BasicSqlType(TYPE_SYSTEM, SqlTypeName.BIGINT);
+          Assert.assertEquals(field.getType(), bigIntBasicSqlType);
+          checkPrecisionScale(field, bigIntBasicSqlType);
+          break;
+        case "FLOAT_COL":
+          BasicSqlType floatBasicSqlType = new BasicSqlType(TYPE_SYSTEM, SqlTypeName.REAL);
+          Assert.assertEquals(field.getType(), floatBasicSqlType);
+          checkPrecisionScale(field, floatBasicSqlType);
+          break;
+        case "DOUBLE_COL":
+          BasicSqlType doubleBasicSqlType = new BasicSqlType(TYPE_SYSTEM, SqlTypeName.DOUBLE);
+          Assert.assertEquals(field.getType(), doubleBasicSqlType);
+          checkPrecisionScale(field, doubleBasicSqlType);
+          break;
+        case "STRING_COL":
+        case "JSON_COL":
+          Assert.assertEquals(field.getType(), new BasicSqlType(TYPE_SYSTEM, SqlTypeName.VARCHAR));
+          break;
+        case "BYTES_COL":
+          Assert.assertEquals(field.getType(), new BasicSqlType(TYPE_SYSTEM, SqlTypeName.VARBINARY));
+          break;
+        case "INT_ARRAY_COL":
+          Assert.assertEquals(field.getType(),
+              new ArraySqlType(new BasicSqlType(TYPE_SYSTEM, SqlTypeName.INTEGER), false));
+          break;
+        case "LONG_ARRAY_COL":
+          Assert.assertEquals(field.getType(),
+              new ArraySqlType(new BasicSqlType(TYPE_SYSTEM, SqlTypeName.BIGINT), false));
+          break;
+        case "FLOAT_ARRAY_COL":
+          Assert.assertEquals(field.getType(),
+              new ArraySqlType(new BasicSqlType(TYPE_SYSTEM, SqlTypeName.REAL), false));
+          break;
+        case "DOUBLE_ARRAY_COL":
+          Assert.assertEquals(field.getType(),
+              new ArraySqlType(new BasicSqlType(TYPE_SYSTEM, SqlTypeName.DOUBLE), false));
+          break;
+        case "STRING_ARRAY_COL":
+          Assert.assertEquals(field.getType(),
+              new ArraySqlType(new BasicSqlType(TYPE_SYSTEM, SqlTypeName.VARCHAR), false));
+          break;
+        case "BYTES_ARRAY_COL":
+          Assert.assertEquals(field.getType(),
+              new ArraySqlType(new BasicSqlType(TYPE_SYSTEM, SqlTypeName.VARBINARY), false));
+          break;
+        default:
+          Assert.fail("Unexpected column name: " + field.getName());
+          break;
+      }
+    }
+  }
+
+  //tests precision and scale for numeric data type
+  private void checkPrecisionScale(RelDataTypeField field, BasicSqlType basicSqlType) {
+    Assert.assertEquals(field.getValue().getPrecision(), basicSqlType.getPrecision());
+    Assert.assertEquals(field.getValue().getScale(), basicSqlType.getScale());
+  }
+}
diff --git a/pinot-query-planner/src/test/resources/queries/AggregatePlans.json b/pinot-query-planner/src/test/resources/queries/AggregatePlans.json
new file mode 100644
index 00000000000..102fb8681ce
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/AggregatePlans.json
@@ -0,0 +1,124 @@
+{
+  "aggregates_planning_tests": {
+    "queries": [
+      {
+        "description": "Select AVG aggregation for a BIG_DECIMAL column",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col4) as avg FROM a WHERE a.col3 >= 0 AND a.col2 = 'pink floyd'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(avg=[/(CASE(=($1, 0), null:DECIMAL(1000, 0), $0), $1)])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n        LogicalProject(col2=[$1], col3=[$2], col4=[$3])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'pink floyd'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select many aggregations for a BIG_DECIMAL column",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col4) as avg, SUM(a.col4) as sum, MAX(a.col4) as max FROM a WHERE a.col3 >= 0 AND a.col2 = 'pink floyd'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(avg=[/(CASE(=($1, 0), null:DECIMAL(1000, 0), $0), $1)], sum=[CASE(=($1, 0), null:DECIMAL(1000, 0), $0)], max=[$2])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)], agg#2=[MAX($2)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($2)], agg#1=[COUNT()], agg#2=[MAX($2)])",
+          "\n        LogicalProject(col2=[$1], col3=[$2], col4=[$3])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'pink floyd'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select aggregates with filters and select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) as avg, COUNT(*) as count FROM a WHERE a.col3 >= 0 AND a.col2 = 'pink floyd'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(avg=[/(CAST(CASE(=($1, 0), null:INTEGER, $0)):DOUBLE, $1)], count=[$1])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($1)], agg#1=[COUNT()])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'pink floyd'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select aggregates",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), COUNT(a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[CASE(=($1, 0), null:INTEGER, $0)], EXPR$1=[$1])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select aggregates with filters",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), COUNT(*) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[CASE(=($1, 0), null:INTEGER, $0)], EXPR$1=[$1])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($1)], agg#1=[COUNT()])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select aggregates with filters and select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) as sum, COUNT(*) as count FROM a WHERE a.col3 >= 0 AND a.col2 = 'pink floyd'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(sum=[CASE(=($1, 0), null:INTEGER, $0)], count=[$1])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($1)], agg#1=[COUNT()])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'pink floyd'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select aggregates with filters and select alias. The group by aggregate hint should be a no-op.",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ AVG(a.col3) as avg, COUNT(*) as count FROM a WHERE a.col3 >= 0 AND a.col2 = 'pink floyd'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(avg=[/(CAST(CASE(=($1, 0), null:INTEGER, $0)):DOUBLE, $1)], count=[$1])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($1)], agg#1=[COUNT()])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'pink floyd'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select aggregates with filters and select alias. The group by aggregate hint should be a no-op.",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ SUM(a.col3) as sum, COUNT(*) as count FROM a WHERE a.col3 >= 0 AND a.col2 = 'pink floyd'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(sum=[CASE(=($1, 0), null:INTEGER, $0)], count=[$1])",
+          "\n  LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{}], agg#0=[$SUM0($1)], agg#1=[COUNT()])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'pink floyd'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-planner/src/test/resources/queries/BasicQueryPlans.json b/pinot-query-planner/src/test/resources/queries/BasicQueryPlans.json
new file mode 100644
index 00000000000..ec7b105cb96
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/BasicQueryPlans.json
@@ -0,0 +1,63 @@
+{
+  "basic_query_planning_tests": {
+    "queries": [
+      {
+        "description": "Select *",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM d",
+        "output": [
+          "Execution Plan",
+          "\nLogicalTableScan(table=[[d]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select with filters",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, a.col3 + a.ts FROM a WHERE a.col3 >= 0 AND a.col2 = 'a'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[+($2, $6)])",
+          "\n  LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select with filters and select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, a.col3 + a.ts AS colsum FROM a WHERE a.col3 >= 0 AND a.col2 = 'a'",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], colsum=[+($2, $6)])",
+          "\n  LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select with transform",
+        "sql": "EXPLAIN PLAN FOR SELECT dateTrunc('DAY', ts) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(EXPR$0=[DATETRUNC('DAY', $6)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select with transform and select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT dateTrunc('DAY', ts) AS day FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(day=[DATETRUNC('DAY', $6)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-planner/src/test/resources/queries/GroupByPlans.json b/pinot-query-planner/src/test/resources/queries/GroupByPlans.json
new file mode 100644
index 00000000000..0b19599217b
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/GroupByPlans.json
@@ -0,0 +1,244 @@
+{
+  "group_by_planning_tests": {
+    "queries": [
+      {
+        "description": "Group by with select and aggregate column",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) FROM a GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with select and multiple aggregations one 1 column",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3), AVG(a.col3), MAX(a.col3), MIN(a.col3) FROM a GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$1], EXPR$2=[/(CAST($1):DOUBLE NOT NULL, $2)], EXPR$3=[$3], EXPR$4=[$4])",
+          "\n  LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)], agg#2=[MAX($3)], agg#3=[MIN($4)])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[COUNT()], agg#2=[MAX($2)], agg#3=[MIN($2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Group by with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Group by count(*) with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, COUNT(*) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1",
+        "notes": "TODO: Needs follow up. Project should only keep a.col1 since the other columns are pushed to the filter, but it currently keeps them all",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], agg#0=[COUNT($1)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalAggregate(group=[{0}], agg#0=[COUNT()])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Group by on 2 columns with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col1 = 'a'  GROUP BY a.col1, a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$1], col1=[$0], EXPR$2=[$2])",
+          "\n  LogicalAggregate(group=[{0, 1}], agg#0=[$SUM0($2)])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalAggregate(group=[{0, 1}], agg#0=[$SUM0($2)])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($0, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Group by with having clause",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, COUNT(*), SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1 HAVING COUNT(*) > 10 AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$1], EXPR$2=[$2])",
+          "\n  LogicalFilter(condition=[AND(>($1, 10), >=($3, 0), <($4, 20), <=($2, 10), =(/(CAST($2):DOUBLE NOT NULL, $1), 5))])",
+          "\n    LogicalAggregate(group=[{0}], agg#0=[COUNT($1)], agg#1=[$SUM0($2)], agg#2=[MAX($3)], agg#3=[MIN($4)])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[COUNT()], agg#1=[$SUM0($2)], agg#2=[MAX($2)], agg#3=[MIN($2)])",
+          "\n          LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n            LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Group by with having clause and select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 as value1, COUNT(*) AS count, SUM(a.col3) as SUM FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1 HAVING COUNT(*) > 10 AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], count=[$1], SUM=[$2])",
+          "\n  LogicalFilter(condition=[AND(>($1, 10), >=($3, 0), <($4, 20), <=($2, 10), =(/(CAST($2):DOUBLE NOT NULL, $1), 5))])",
+          "\n    LogicalAggregate(group=[{0}], agg#0=[COUNT($1)], agg#1=[$SUM0($2)], agg#2=[MAX($3)], agg#3=[MIN($4)])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[COUNT()], agg#1=[$SUM0($2)], agg#2=[MAX($2)], agg#3=[MIN($2)])",
+          "\n          LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n            LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with select and aggregate column",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3) FROM a GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0], col3=[$2])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with select and AVG aggregation",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, AVG(a.col3) FROM a GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n  LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT()])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with select and multiple aggregations one 1 column",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3), AVG(a.col3), MAX(a.col3), MIN(a.col3) FROM a GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$1], EXPR$2=[/(CAST($1):DOUBLE NOT NULL, $2)], EXPR$3=[$3], EXPR$4=[$4])",
+          "\n  LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)], agg#1=[COUNT()], EXPR$3=[MAX($1)], EXPR$4=[MIN($1)])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n      LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3), MAX(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)], EXPR$2=[MAX($2)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n      LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization count(*) with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, COUNT(*) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1",
+        "notes": "TODO: Needs follow up. Project should only keep a.col1 since the other columns are pushed to the filter, but it currently keeps them all",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], EXPR$1=[COUNT()])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n      LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization on 2 columns with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col1 = 'a'  GROUP BY a.col1, a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$1], col1=[$0], EXPR$2=[$2])",
+          "\n  LogicalAggregate(group=[{0, 1}], EXPR$2=[$SUM0($2)])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>=($2, 0), =($0, 'a'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with having clause",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, COUNT(*), SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1 HAVING COUNT(*) > 10 AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$1], EXPR$2=[$2])",
+          "\n  LogicalFilter(condition=[AND(>($1, 10), >=($3, 0), <($4, 20), <=($2, 10), =(/(CAST($2):DOUBLE NOT NULL, $1), 5))])",
+          "\n    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[$SUM0($2)], agg#2=[MAX($2)], agg#3=[MIN($2)])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with having clause but no count",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1 HAVING MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$1])",
+          "\n  LogicalFilter(condition=[AND(>=($2, 0), <($3, 20), <=($1, 10), =(/(CAST($1):DOUBLE NOT NULL, $4), 5))])",
+          "\n    LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)], agg#1=[MAX($2)], agg#2=[MIN($2)], agg#3=[COUNT()])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SQL hint based group by optimization with having clause and select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1 as value1, COUNT(*) AS count, SUM(a.col3) as SUM FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col1 HAVING COUNT(*) > 10 AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], count=[$1], SUM=[$2])",
+          "\n  LogicalFilter(condition=[AND(>($1, 10), >=($3, 0), <($4, 20), <=($2, 10), =(/(CAST($2):DOUBLE NOT NULL, $1), 5))])",
+          "\n    LogicalAggregate(group=[{0}], count=[COUNT()], SUM=[$SUM0($2)], agg#2=[MAX($2)], agg#3=[MIN($2)])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-planner/src/test/resources/queries/JoinPlans.json b/pinot-query-planner/src/test/resources/queries/JoinPlans.json
new file mode 100644
index 00000000000..37e141d58ec
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/JoinPlans.json
@@ -0,0 +1,361 @@
+{
+  "join_planning_tests": {
+    "queries": [
+      {
+        "description": "Inner join with order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, a.ts, b.col3 FROM a JOIN b ON a.col1 = b.col2 ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], ts=[$1], col3=[$3])",
+          "\n        LogicalJoin(condition=[=($0, $2)], joinType=[inner])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], ts=[$6])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with order by and select column with alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, a.ts AS ts1, b.col3 FROM a JOIN b ON a.col1 = b.col2 ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(value1=[$0], ts1=[$1], col3=[$3])",
+          "\n        LogicalJoin(condition=[=($0, $2)], joinType=[inner])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], ts=[$6])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SELECT * inner join",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM a JOIN b ON a.col1 = b.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalJoin(condition=[=($0, $8)], joinType=[inner])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[hash[1]])",
+          "\n    LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SELECT * inner join with filter on one table",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM a JOIN b ON a.col1 = b.col2 WHERE a.col3 >= 0",
+        "output": [
+          "Execution Plan",
+          "\nLogicalJoin(condition=[=($0, $8)], joinType=[inner])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalFilter(condition=[>=($2, 0)])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[hash[1]])",
+          "\n    LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SELECT * inner join with filter",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM a JOIN b ON a.col1 = b.col2 WHERE a.col3 >= 0 AND a.col3 > b.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalJoin(condition=[AND(=($0, $8), >($2, $9))], joinType=[inner])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalFilter(condition=[>=($2, 0)])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[hash[1]])",
+          "\n    LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "SELECT * inner join on 2 columns equality",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM a JOIN b on a.col1 = b.col1 AND a.col2 = b.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalJoin(condition=[AND(=($0, $7), =($1, $8))], joinType=[inner])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with filter on both tables",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, a.ts, b.col3 FROM a JOIN b ON a.col1 = b.col2  WHERE a.col3 >= 0 AND a.col2 = 'a' AND b.col3 < 0",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], ts=[$1], col3=[$3])",
+          "\n  LogicalJoin(condition=[=($0, $2)], joinType=[inner])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], ts=[$6])",
+          "\n        LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[<($2, 0)])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(b.col3) FROM a JOIN b ON a.col1 = b.col2  WHERE a.col3 >= 0 AND a.col2 = 'a' AND b.col3 < 0 GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n  LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n        LogicalJoin(condition=[=($0, $1)], joinType=[inner])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0])",
+          "\n              LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n                LogicalTableScan(table=[[a]])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col2=[$1], col3=[$2])",
+          "\n              LogicalFilter(condition=[<($2, 0)])",
+          "\n                LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with datetrunc transform",
+        "sql": "EXPLAIN PLAN FOR SELECT dateTrunc('DAY', a.ts + b.ts) FROM a JOIN b on a.col1 = b.col1 AND a.col2 = b.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[DATETRUNC('DAY', +($2, $5))])",
+          "\n  LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], ts=[$6])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], ts=[$6])",
+          "\n        LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with group by on 2 columns",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, a.col3 FROM a JOIN b ON a.col1 = b.col1 WHERE a.col3 >= 0 GROUP BY a.col2, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0, 1}])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalAggregate(group=[{1, 2}])",
+          "\n      LogicalJoin(condition=[=($0, $3)], joinType=[inner])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n            LogicalFilter(condition=[>=($2, 0)])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalProject(col1=[$0])",
+          "\n            LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with group by on 2 columns with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, a.col3 as value3 FROM a JOIN b ON a.col1 = b.col1 WHERE a.col3 >= 0 GROUP BY a.col2, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0, 1}])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalAggregate(group=[{1, 2}])",
+          "\n      LogicalJoin(condition=[=($0, $3)], joinType=[inner])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n            LogicalFilter(condition=[>=($2, 0)])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalProject(col1=[$0])",
+          "\n            LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with filters using IN clause",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, b.col2 FROM a JOIN b ON a.col1 = b.col1 WHERE a.col2 IN ('foo', 'bar') AND b.col2 NOT IN ('alice', 'charlie')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], col2=[$2])",
+          "\n  LogicalJoin(condition=[=($0, $1)], joinType=[inner])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0])",
+          "\n        LogicalFilter(condition=[OR(=($1, 'bar'), =($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'alice':VARCHAR(7)), <>($1, 'charlie':VARCHAR(7)))])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with filters using IN clause with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, b.col2 as bvalue2 FROM a JOIN b ON a.col1 = b.col1 WHERE a.col2 IN ('foo', 'bar') AND b.col2 NOT IN ('alice', 'charlie')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], bvalue2=[$2])",
+          "\n  LogicalJoin(condition=[=($0, $1)], joinType=[inner])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0])",
+          "\n        LogicalFilter(condition=[OR(=($1, 'bar'), =($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'alice':VARCHAR(7)), <>($1, 'charlie':VARCHAR(7)))])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Semi join with IN clause",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a WHERE col3 IN (SELECT col3 FROM b)",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], col2=[$1])",
+          "\n  LogicalJoin(condition=[=($2, $5)], joinType=[semi])",
+          "\n    PinotLogicalExchange(distribution=[hash[2]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[2]])",
+          "\n      LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Semi join with multiple IN clause",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a WHERE col2 = 'test' AND col3 IN (SELECT col3 FROM b WHERE col1='foo') AND col3 IN (SELECT col3 FROM b WHERE col1='bar') AND col3 IN (SELECT col3 FROM b WHERE col1='foobar')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], col2=[$1])",
+          "\n  LogicalJoin(condition=[=($2, $4)], joinType=[semi])",
+          "\n    PinotLogicalExchange(distribution=[hash[2]])",
+          "\n      LogicalJoin(condition=[=($2, $4)], joinType=[semi])",
+          "\n        PinotLogicalExchange(distribution=[hash[2]])",
+          "\n          LogicalJoin(condition=[=($2, $4)], joinType=[semi])",
+          "\n            PinotLogicalExchange(distribution=[hash[2]])",
+          "\n              LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n                LogicalFilter(condition=[=($1, 'test')])",
+          "\n                  LogicalTableScan(table=[[a]])",
+          "\n            PinotLogicalExchange(distribution=[hash[1]])",
+          "\n              LogicalProject(col1=[$0], col3=[$2])",
+          "\n                LogicalFilter(condition=[=($0, 'foo')])",
+          "\n                  LogicalTableScan(table=[[b]])",
+          "\n        PinotLogicalExchange(distribution=[hash[1]])",
+          "\n          LogicalProject(col1=[$0], col3=[$2])",
+          "\n            LogicalFilter(condition=[=($0, 'bar')])",
+          "\n              LogicalTableScan(table=[[b]])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalFilter(condition=[=($0, 'foobar')])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Semi join with multiple NOT IN clause",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a WHERE col2 = 'test' AND col3 NOT IN (SELECT col3 FROM b WHERE col1='foo') AND col3 NOT IN (SELECT col3 FROM b WHERE col1='bar') AND col3 NOT IN (SELECT col3 FROM b WHERE col1='foobar')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], col2=[$1])",
+          "\n  LogicalFilter(condition=[IS NOT TRUE($8)])",
+          "\n    LogicalJoin(condition=[=($6, $7)], joinType=[left])",
+          "\n      PinotLogicalExchange(distribution=[hash[6]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col30=[$3], $f1=[$4], col32=[$5], $f10=[$7], col34=[$2])",
+          "\n          LogicalFilter(condition=[IS NOT TRUE($7)])",
+          "\n            LogicalJoin(condition=[=($5, $6)], joinType=[left])",
+          "\n              PinotLogicalExchange(distribution=[hash[5]])",
+          "\n                LogicalProject(col1=[$0], col2=[$1], col3=[$2], col30=[$3], $f1=[$5], col32=[$2])",
+          "\n                  LogicalFilter(condition=[IS NOT TRUE($5)])",
+          "\n                    LogicalJoin(condition=[=($3, $4)], joinType=[left])",
+          "\n                      PinotLogicalExchange(distribution=[hash[3]])",
+          "\n                        LogicalProject(col1=[$0], col2=[$1], col3=[$2], col30=[$2])",
+          "\n                          LogicalFilter(condition=[=($1, 'test')])",
+          "\n                            LogicalTableScan(table=[[a]])",
+          "\n                      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])",
+          "\n                          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                            LogicalAggregate(group=[{0}], agg#0=[MIN($1)])",
+          "\n                              LogicalProject(col3=[$2], $f1=[true])",
+          "\n                                LogicalFilter(condition=[=($0, 'foo')])",
+          "\n                                  LogicalTableScan(table=[[b]])",
+          "\n              PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                LogicalAggregate(group=[{0}], agg#0=[MIN($1)])",
+          "\n                  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])",
+          "\n                      LogicalProject(col3=[$2], $f1=[true])",
+          "\n                        LogicalFilter(condition=[=($0, 'bar')])",
+          "\n                          LogicalTableScan(table=[[b]])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalAggregate(group=[{0}], agg#0=[MIN($1)])",
+          "\n              LogicalProject(col3=[$2], $f1=[true])",
+          "\n                LogicalFilter(condition=[=($0, 'foobar')])",
+          "\n                  LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Correlated join",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 FROM a WHERE a.col4 > (SELECT 0.5 * SUM(b.col3) FROM b WHERE b.col2 = a.col2 AND b.col1 = a.col1)",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0])",
+          "\n  LogicalJoin(condition=[AND(=($0, $7), =($1, $8), >($3, $12))], joinType=[inner])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col10=[CAST($0):VARCHAR], col20=[CAST($1):VARCHAR], $f2=[CAST($2):INTEGER], EXPR$3=[*(0.5:DECIMAL(2, 1), $2)])",
+          "\n        LogicalAggregate(group=[{0, 1}], agg#0=[$SUM0($2)])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalAggregate(group=[{0, 1}], agg#0=[$SUM0($2)])",
+          "\n              LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Lateral join",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, newb.sum_col3 FROM a JOIN LATERAL (SELECT SUM(col3) as sum_col3 FROM b WHERE col2 = a.col2) AS newb ON TRUE;\n",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], sum_col3=[$3])",
+          "\n  LogicalJoin(condition=[=($1, $2)], joinType=[inner])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{1}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      }
+    ]
+  },
+  "exception_throwing_join_planning_tests": {
+    "queries": [
+      {
+        "description": "Incorrect table",
+        "sql": "EXPLAIN PLAN FOR SELECT b.col1 - a.col3 FROM a JOIN c ON a.col1 = c.col3",
+        "expectedException": "Error explain query plan for.*"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-planner/src/test/resources/queries/OrderByPlans.json b/pinot-query-planner/src/test/resources/queries/OrderByPlans.json
new file mode 100644
index 00000000000..6c53556c6eb
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/OrderByPlans.json
@@ -0,0 +1,116 @@
+{
+  "order_by_planning_tests": {
+    "queries": [
+      {
+        "description": "Simple Order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Simple Order by with alias on select column",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1 FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(value1=[$0])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select * order by",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM a ORDER BY col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Select * order by on 2 columns with descending",
+        "sql": "EXPLAIN PLAN FOR SELECT * FROM b ORDER BY col1, col2 DESC LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[DESC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0, 1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[DESC], fetch=[10])",
+          "\n      LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Order by and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) FROM a GROUP BY a.col1 ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Order by and group by with hint",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1, SUM(a.col3) FROM a GROUP BY a.col1 ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalProject(col1=[$0], col3=[$2])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Order by and group by with alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, SUM(a.col3) AS sum FROM a GROUP BY a.col1 ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Order by and group by with alias with SqlHint",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col1 AS value1, SUM(a.col3) AS sum FROM a GROUP BY a.col1 ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalAggregate(group=[{0}], sum=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalProject(col1=[$0], col3=[$2])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-planner/src/test/resources/queries/PinotHintablePlans.json b/pinot-query-planner/src/test/resources/queries/PinotHintablePlans.json
new file mode 100644
index 00000000000..f5ba9d31824
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/PinotHintablePlans.json
@@ -0,0 +1,176 @@
+{
+  "pinot_hint_option_tests": {
+    "queries": [
+      {
+        "description": "SELECT * inner join with filter on one table",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(is_colocated_by_join_keys='true') */ * FROM a JOIN b ON a.col1 = b.col2 WHERE a.col3 >= 0",
+        "output": [
+          "Execution Plan",
+          "\nLogicalJoin(condition=[=($0, $8)], joinType=[inner])",
+          "\n  PinotLogicalExchange(distribution=[single])",
+          "\n    LogicalFilter(condition=[>=($2, 0)])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[single])",
+          "\n    LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Inner join with group by",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(is_colocated_by_join_keys='true'), aggOptions(is_partitioned_by_group_by_keys='true') */a.col1, AVG(b.col3) FROM a JOIN b ON a.col1 = b.col2  WHERE a.col3 >= 0 AND a.col2 = 'a' AND b.col3 < 0 GROUP BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n  LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n    LogicalJoin(condition=[=($0, $1)], joinType=[inner])",
+          "\n      PinotLogicalExchange(distribution=[single])",
+          "\n        LogicalProject(col1=[$0])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n      PinotLogicalExchange(distribution=[single])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[<($2, 0)])",
+          "\n            LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "semi-join with dynamic_broadcast join strategy",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(join_strategy='dynamic_broadcast',is_colocated_by_join_keys='false') */ a.col1, a.col2 FROM a WHERE a.col1 IN (SELECT col2 FROM b WHERE b.col3 > 0)",
+        "output": [
+          "Execution Plan",
+          "\nPinotLogicalExchange(distribution=[hash[0]])",
+          "\n  LogicalJoin(condition=[=($0, $2)], joinType=[semi])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[broadcast], relExchangeType=[PIPELINE_BREAKER])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[>($2, 0)])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "semi-join with colocated join key",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(is_colocated_by_join_keys) */ * FROM a WHERE a.col1 IN (SELECT col2 FROM b WHERE b.col3 > 0)",
+        "output": [
+          "Execution Plan",
+          "\nLogicalJoin(condition=[=($0, $7)], joinType=[semi])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col2=[$1], col3=[$2])",
+          "\n      LogicalFilter(condition=[>($2, 0)])",
+          "\n        LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "semi-join with colocated join key and dynamic_broadcast join strategy",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(join_strategy='dynamic_broadcast', is_colocated_by_join_keys='true') */ a.col1, a.col2 FROM a WHERE a.col1 IN (SELECT col2 FROM b WHERE b.col3 > 0)",
+        "output": [
+          "Execution Plan",
+          "\nPinotLogicalExchange(distribution=[single])",
+          "\n  LogicalJoin(condition=[=($0, $2)], joinType=[semi])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n    PinotLogicalExchange(distribution=[single], relExchangeType=[PIPELINE_BREAKER])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[>($2, 0)])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "semi-join with dynamic_broadcast join strategy then group-by on same key",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(join_strategy='dynamic_broadcast'), aggOptionsInternal(agg_type='DIRECT') */ a.col1, SUM(a.col3) FROM a WHERE a.col1 IN (SELECT col2 FROM b WHERE b.col3 > 0) GROUP BY 1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalJoin(condition=[=($0, $2)], joinType=[semi])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n      PinotLogicalExchange(distribution=[broadcast], relExchangeType=[PIPELINE_BREAKER])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalFilter(condition=[>($2, 0)])",
+          "\n            LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "semi-join with dynamic_broadcast join strategy then group-by on different key",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ joinOptions(join_strategy='dynamic_broadcast') */ a.col2, SUM(a.col3) FROM a WHERE a.col1 IN (SELECT col2 FROM b WHERE b.col3 > 0) GROUP BY 1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalAggregate(group=[{1}], agg#0=[$SUM0($2)])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalJoin(condition=[=($0, $3)], joinType=[semi])",
+          "\n          LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n          PinotLogicalExchange(distribution=[broadcast], relExchangeType=[PIPELINE_BREAKER])",
+          "\n            LogicalProject(col2=[$1], col3=[$2])",
+          "\n              LogicalFilter(condition=[>($2, 0)])",
+          "\n                LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "aggregate with skip leaf stage hint, group by aggregate",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, a.col1, SUM(a.col3) FROM a WHERE a.col3 >= 0 AND a.col1 = 'a' GROUP BY a.col1, a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$1], col1=[$0], EXPR$2=[$2])",
+          "\n  LogicalAggregate(group=[{0, 1}], EXPR$2=[$SUM0($2)])",
+          "\n    PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>=($2, 0), =($0, 'a'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "aggregate with skip leaf stage hint, group by aggregate with having clause",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ a.col2, COUNT(*), SUM(a.col3), SUM(a.col1) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col2 HAVING COUNT(*) > 10 AND MAX(a.col3) >= 0 AND MIN(a.col3) < 20 AND SUM(a.col3) <= 10 AND AVG(a.col3) = 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$0], EXPR$1=[$1], EXPR$2=[$2], EXPR$3=[$3])",
+          "\n  LogicalFilter(condition=[AND(>($1, 10), >=($4, 0), <($5, 20), <=($2, 10), =(/(CAST($2):DOUBLE NOT NULL, $1), 5))])",
+          "\n    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[$SUM0($1)], EXPR$3=[$SUM0($2)], agg#3=[MAX($1)], agg#4=[MIN($1)])",
+          "\n      PinotLogicalExchange(distribution=[hash[0]])",
+          "\n        LogicalProject(col2=[$1], col3=[$2], $f2=[CAST($0):DECIMAL(1000, 500) NOT NULL])",
+          "\n          LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "aggregate with skip intermediate stage hint (via hinting the leaf stage group by as final stage_",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptionsInternal(agg_type='DIRECT') */ a.col2, COUNT(*), SUM(a.col3), SUM(a.col1) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col2 HAVING COUNT(*) > 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalFilter(condition=[>($1, 10)])",
+          "\n  LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[$SUM0($1)], EXPR$3=[$SUM0($2)])",
+          "\n    LogicalProject(col2=[$1], col3=[$2], $f2=[CAST($0):DECIMAL(1000, 500) NOT NULL])",
+          "\n      LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "aggregate with skip leaf stage hint (via hint option is_partitioned_by_group_by_keys",
+        "sql": "EXPLAIN PLAN FOR SELECT /*+ aggOptions(is_partitioned_by_group_by_keys='true') */ a.col2, COUNT(*), SUM(a.col3), SUM(a.col1) FROM a WHERE a.col3 >= 0 AND a.col2 = 'a' GROUP BY a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[$SUM0($1)], EXPR$3=[$SUM0($2)])",
+          "\n  LogicalProject(col2=[$1], col3=[$2], $f2=[CAST($0):DECIMAL(1000, 500) NOT NULL])",
+          "\n    LogicalFilter(condition=[AND(>=($2, 0), =($1, 'a'))])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      }
+    ]
+  }
+}
diff --git a/pinot-query-planner/src/test/resources/queries/SetOpPlans.json b/pinot-query-planner/src/test/resources/queries/SetOpPlans.json
new file mode 100644
index 00000000000..1e0991e96a9
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/SetOpPlans.json
@@ -0,0 +1,113 @@
+{
+  "set_op_tests": {
+    "queries": [
+      {
+        "description": "UNION ALL from two tables",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a UNION ALL SELECT col1, col2 FROM b",
+        "output": [
+          "Execution Plan",
+          "\nLogicalUnion(all=[true])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "UNION ALL from three tables",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a UNION ALL SELECT col1, col2 FROM b UNION ALL SELECT col1, col2 FROM c",
+        "output": [
+          "Execution Plan",
+          "\nLogicalUnion(all=[true])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalUnion(all=[true])",
+          "\n      PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n      PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[c]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "UNION from three tables",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a UNION SELECT col1, col2 FROM b UNION SELECT col1, col2 FROM c",
+        "output": [
+          "Execution Plan",
+          "\nLogicalAggregate(group=[{0, 1}])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalAggregate(group=[{0, 1}])",
+          "\n      LogicalUnion(all=[true])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalUnion(all=[true])",
+          "\n            PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n              LogicalProject(col1=[$0], col2=[$1])",
+          "\n                LogicalTableScan(table=[[a]])",
+          "\n            PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n              LogicalProject(col1=[$0], col2=[$1])",
+          "\n                LogicalTableScan(table=[[b]])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalProject(col1=[$0], col2=[$1])",
+          "\n            LogicalTableScan(table=[[c]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "INTERSECT from three tables",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a INTERSECT SELECT col1, col2 FROM b INTERSECT SELECT col1, col2 FROM c",
+        "output": [
+          "Execution Plan",
+          "\nLogicalIntersect(all=[false])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalIntersect(all=[false])",
+          "\n      PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n      PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[c]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "EXCEPT from three tables",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col2 FROM a EXCEPT SELECT col1, col2 FROM b EXCEPT SELECT col1, col2 FROM c",
+        "output": [
+          "Execution Plan",
+          "\nLogicalMinus(all=[false])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalMinus(all=[false])",
+          "\n      PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n      PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n        LogicalProject(col1=[$0], col2=[$1])",
+          "\n          LogicalTableScan(table=[[b]])",
+          "\n  PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n    LogicalProject(col1=[$0], col2=[$1])",
+          "\n      LogicalTableScan(table=[[c]])",
+          "\n"
+        ]
+      }
+    ]
+  },
+  "exception_throwing_set_planning_tests": {
+    "queries": [
+      {
+        "description": "Incorrect selection list ",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, col3 FROM a UNION ALL SELECT col1 FROM b",
+        "expectedException": "Error explain query plan for.*"
+      }
+    ]
+  }
+}
diff --git a/pinot-query-planner/src/test/resources/queries/WindowFunctionPlans.json b/pinot-query-planner/src/test/resources/queries/WindowFunctionPlans.json
new file mode 100644
index 00000000000..262a73b52b8
--- /dev/null
+++ b/pinot-query-planner/src/test/resources/queries/WindowFunctionPlans.json
@@ -0,0 +1,3710 @@
+{
+  "window_function_planning_tests": {
+    "queries": [
+      {
+        "description": "single empty OVER() only",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() count(*) only",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(*) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(aggs [COUNT()])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(winLiteral=[0])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() literal, count(*) only",
+        "sql": "EXPLAIN PLAN FOR SELECT 42, COUNT(*) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[42], EXPR$1=[$0])",
+          "\n  LogicalProject($0=[$1])",
+          "\n    LogicalWindow(window#0=[window(aggs [COUNT()])])",
+          "\n      PinotLogicalExchange(distribution=[hash])",
+          "\n        LogicalProject(winLiteral=[0])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() only row_number",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window( rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(winLiteral=[0])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() row_number and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window( rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n  PinotLogicalExchange(distribution=[hash])",
+          "\n    LogicalProject(col1=[$0])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, SUM(a.col3) OVER() AS sum FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with default frame",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "notes": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER() FROM a ORDER BY a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() row_number and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER() FROM a ORDER BY a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$2], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window( rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER() FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($1)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER() FROM a ORDER BY a.col2 LIMIT 20",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[20])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[20])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), SUM(a.col3) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER() FROM a WHERE a.col3 > 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalFilter(condition=[>($2, 10)])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() row_number select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER() FROM a WHERE a.col3 > 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window( rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n  PinotLogicalExchange(distribution=[hash])",
+          "\n    LogicalProject(col1=[$0])",
+          "\n      LogicalFilter(condition=[>($2, 10)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), MIN(a.col3) OVER() FROM a where a.col1 IN ('foo', 'bar')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(=($0, 'bar'), =($0, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with group by",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER() FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{0}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with select col and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, MIN(a.col3) OVER() FROM a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{0, 1}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with aggregate and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), MIN(a.col3) OVER() FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with aggregate avg and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER() FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with aggregate avg and group by and order by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER() FROM a GROUP BY a.col3 ORDER BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], col3=[$0])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($0), COUNT($0)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n              LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n                PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                  LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n                    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() row_number with aggregate avg and group by and order by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), ROW_NUMBER() OVER() FROM a GROUP BY a.col3 ORDER BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(EXPR$0=[$1], EXPR$1=[$2], col3=[$0])",
+          "\n        LogicalWindow(window#0=[window( rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n              LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n                PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                  LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n                    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s only",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(), COUNT(a.col2) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(), COUNT(a.col2) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($2), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, SUM(a.col3) OVER() AS sum, COUNT(a.col2) OVER() AS count FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($2), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s with default frame on one but not the other",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), MIN(a.col3) OVER() FROM a",
+        "notes": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0), MIN($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(), COUNT(a.col2) OVER() FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($2), COUNT($1)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(), COUNT(a.col2) OVER() FROM a LIMIT 100",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[100])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[100])",
+          "\n      LogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($2), COUNT($1)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(), COUNT(a.col2) OVER() FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($2), COUNT($1)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), SUM(a.col3) OVER(), MAX(a.col3) OVER() FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0), MAX($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(), COUNT(a.col1) OVER() FROM a WHERE a.col3 > 100",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalFilter(condition=[>($2, 100)])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT LENGTH(CONCAT(a.col1, ' ', a.col2)), MIN(a.col3) OVER(), MAX(a.col3) OVER() FROM a where a.col1 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($0), MAX($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$2], $1=[LENGTH(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($0, 'bar'), <>($0, 'baz'), <>($0, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s row_number with select transform and filter",
+        "notes": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "sql": "EXPLAIN PLAN FOR SELECT LENGTH(CONCAT(a.col1, ' ', a.col2)), ROW_NUMBER() OVER(), ROW_NUMBER() OVER() FROM a where a.col1 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$0], EXPR$1=[$1], EXPR$2=[$1])",
+          "\n  LogicalWindow(window#0=[window( rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject($0=[LENGTH(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($0, 'bar'), <>($0, 'baz'), <>($0, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s with group by",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(), SUM(a.col3) OVER() FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($0), SUM($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{0}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s with select col and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, MIN(a.col3) OVER(), COUNT(a.col1) OVER() FROM a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{0, 1}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s with aggregate and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), MIN(a.col3) OVER(), MAX(a.col3) OVER() FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(aggs [MIN($0), MAX($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple empty OVER()s with aggregate avg and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER(), SUM(a.col3) OVER() FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$2])",
+          "\n  LogicalWindow(window#0=[window(aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash])",
+          "\n      LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single empty OVER() with aggregate avg and group by and order by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER(), SUM(a.col3) OVER() FROM a GROUP BY a.col3 ORDER BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], dir0=[ASC])",
+          "\n      LogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$2], col3=[$0])",
+          "\n        LogicalWindow(window#0=[window(aggs [SUM($0), COUNT($0)])])",
+          "\n          PinotLogicalExchange(distribution=[hash])",
+          "\n            LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n              LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n                PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                  LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n                    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) only",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) row_number only",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) only with alias",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(PARTITION BY a.col2) AS sum FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(PARTITION BY a.col2) AS avg FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) row_number and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, ROW_NUMBER() OVER(PARTITION BY a.col2) AS row_num FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with default frame",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "notes": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(PARTITION BY a.col1) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} aggs [MIN($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(partition {1} aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(PARTITION BY a.col1) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} aggs [MIN($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) row_number and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, ROW_NUMBER() OVER(PARTITION BY a.col1) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT SUBSTR(a.col1, 0, 2), COUNT(a.col2) OVER(PARTITION BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {1} aggs [COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[SUBSTR($0, 0, 2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) row_number and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT SUBSTR(a.col1, 0, 2), ROW_NUMBER() OVER(PARTITION BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col3=[$2], $1=[SUBSTR($0, 0, 2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, AVG(a.col3) OVER(PARTITION BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), AVG(a.col3) OVER(PARTITION BY a.col2) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$2], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) row_number with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject($0=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with group by",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with select col and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, MIN(a.col3) OVER(PARTITION BY a.col1) FROM a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0, 1}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) row_number with select col and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col1) FROM a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(partition {0} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0])",
+          "\n      LogicalAggregate(group=[{0, 1}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with aggregate and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), MIN(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with aggregate avg and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY) with aggregate avg and group by and order by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3 ORDER BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], col3=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} aggs [SUM($0), COUNT($0)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n              LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n                PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                  LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n                    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key only",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1), COUNT(a.col2) OVER(PARTITION BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key only with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1) AS max, COUNT(a.col2) OVER(PARTITION BY a.col1) AS count FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1), MIN(a.col3) OVER(PARTITION BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(PARTITION BY a.col1) AS avg, MIN(a.col3) OVER(PARTITION BY a.col1) AS min FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($2):DOUBLE NOT NULL, $3)], min=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key with default frame for one and not the other",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(PARTITION BY a.col2 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), MIN(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "notes": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col with global order by on select column (non-avg agg)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1), MAX(a.col3) OVER(PARTITION BY a.col2, a.col1) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} aggs [SUM($2), MAX($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1), MIN(a.col3) OVER(PARTITION BY a.col1) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n        LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col with global order by on select column (non-avg agg) with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1), MAX(a.col3) OVER(PARTITION BY a.col2, a.col1) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} aggs [SUM($2), MAX($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key but in reverse order and select col with global order by (non-avg agg)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1), MAX(a.col3) OVER(PARTITION BY a.col1, a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} aggs [SUM($2), MAX($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col with global order by on select column (avg agg)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1), AVG(a.col3) OVER(PARTITION BY a.col2, a.col1) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s row_number on the same key but in reverse order and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col2, a.col1), ROW_NUMBER() OVER(PARTITION BY a.col1, a.col2) FROM a ORDER BY a.col1",
+        "notes": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], $1=[$2], $2=[$3])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER(), ROW_NUMBER()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key but in reverse order and select col with global order by (avg agg)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1), AVG(a.col3) OVER(PARTITION BY a.col1, a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($4):DOUBLE NOT NULL, $5)])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} aggs [SUM($2), SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and select col with global order by on non-select column",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1), AVG(a.col3) OVER(PARTITION BY a.col2, a.col1) FROM a ORDER BY a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(a.col1), SUM(a.col3) OVER(PARTITION BY a.col2), MAX(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[REVERSE($0)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1), COUNT(a.col1) OVER(PARTITION BY a.col1) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s on the same key with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), MIN(a.col3) OVER(PARTITION BY a.col1), MAX(a.col3) OVER(PARTITION BY a.col1) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($1), MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2))), COUNT(a.col1) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2))) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$1=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {2} aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[2]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s with group by",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(PARTITION BY a.col3), COUNT(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($0), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY) with select col and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, MIN(a.col3) OVER(PARTITION BY a.col1), AVG(a.col3) OVER(PARTITION BY a.col1) FROM a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$2], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($1), SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0, 1}])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s with aggregate and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), MIN(a.col3) OVER(PARTITION BY a.col3), SUM(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [MIN($0), SUM($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s with aggregate avg and group by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER(PARTITION BY a.col3), MAX(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($0), COUNT($0), MAX($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n        LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY)s with aggregate avg and group by and order by",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3), AVG(a.col3) OVER(PARTITION BY a.col3), MAX(a.col3) OVER(PARTITION BY a.col3) FROM a GROUP BY a.col3 ORDER BY a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], dir0=[ASC])",
+          "\n      LogicalProject(EXPR$0=[$1], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4], col3=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} aggs [SUM($0), COUNT($0), MAX($0)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col3=[$0], EXPR$0=[/(CAST($1):DOUBLE NOT NULL, $2)])",
+          "\n              LogicalAggregate(group=[{0}], agg#0=[$SUM0($1)], agg#1=[COUNT($2)])",
+          "\n                PinotLogicalExchange(distribution=[hash[0]])",
+          "\n                  LogicalAggregate(group=[{2}], agg#0=[$SUM0($2)], agg#1=[COUNT()])",
+          "\n                    LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) only",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) only rank",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) only with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ORDER BY a.col2) AS sum FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and select col dense_rank",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(ORDER BY a.col2 DESC) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [1 DESC] aggs [DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number and select col with global order by on different column as inside over",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(ORDER BY a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) rank and select col with global order by on different column as inside over",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(ORDER BY a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] aggs [RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number and select col with global order by on same column as inside over",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(ORDER BY a.col2) FROM a ORDER BY a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$2], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) dense_rank and select col with global order by on same column as inside over",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(ORDER BY a.col2) FROM a ORDER BY a.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$2], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(order by [1] aggs [DENSE_RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number and select col with order by on row number",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(ORDER BY a.col2) as row_number FROM a ORDER BY row_number DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$1], dir0=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$1], dir0=[DESC])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) RANK and select col with order by on row number",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(ORDER BY a.col2) as rank FROM a ORDER BY rank DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$1], dir0=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$1], dir0=[DESC])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] aggs [RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) dense_rank and select col with order by on row number",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(ORDER BY a.col2) as dense_rank FROM a ORDER BY dense_rank DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$1], dir0=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$1], dir0=[DESC])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] aggs [DENSE_RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(ORDER BY a.col2) AS avg FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, ROW_NUMBER() OVER(ORDER BY a.col2) AS row_number FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) rank and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, RANK() OVER(ORDER BY a.col2) AS rank FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [1] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) with default frame",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(ORDER BY a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [MAX($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(ORDER BY a.col1 DESC) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(order by [0 DESC] aggs [MIN($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(ORDER BY a.col2) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(ORDER BY a.col2) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) rank and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(ORDER BY a.col2) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], $1=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [1] aggs [RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(ORDER BY a.col1 DESC) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(order by [0 DESC] aggs [MIN($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) dense_rank and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, DENSE_RANK() OVER(ORDER BY a.col1 DESC) FROM a ORDER BY a.col3 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col3=[$2])",
+          "\n        LogicalWindow(window#0=[window(order by [0 DESC] aggs [DENSE_RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT SUBSTR(a.col1, 0, 2), COUNT(a.col2) OVER(ORDER BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [1] aggs [COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[SUBSTR($0, 0, 2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) rank and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT SUBSTR(a.col1, 0, 2), RANK() OVER(ORDER BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col3=[$2], $1=[SUBSTR($0, 0, 2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, AVG(a.col3) OVER(ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) dense_rank select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, DENSE_RANK() OVER(ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(order by [0] aggs [DENSE_RANK()])])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalProject(col2=[$1])",
+          "\n      LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), AVG(a.col3) OVER(ORDER BY a.col2) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$2], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), ROW_NUMBER() OVER(ORDER BY a.col2) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) rank with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), RANK() OVER(ORDER BY a.col2) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) with transform on order by key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(order by [1] aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) row_number with transform on order by key",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject($0=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(ORDER BY) dense_rank with transform on order by key",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject($0=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key only",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(ORDER BY a.col1), COUNT(a.col2) OVER(ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key only - rank functions",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(ORDER BY a.col1), DENSE_RANK() OVER(ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [RANK(), DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key only with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(ORDER BY a.col1) AS max, COUNT(a.col2) OVER(ORDER BY a.col1) AS count FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(ORDER BY a.col1), MIN(a.col3) OVER(ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col3, DENSE_RANK() OVER(ORDER BY a.col1), RANK() OVER(ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col3=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [DENSE_RANK(), RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(ORDER BY a.col1) AS avg, MIN(a.col3) OVER(ORDER BY a.col1) AS min FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($2):DOUBLE NOT NULL, $3)], min=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with select alias, one ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, DENSE_RANK() OVER(ORDER BY a.col1) AS dense_rank, MIN(a.col3) OVER(ORDER BY a.col1) AS min FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [DENSE_RANK(), MIN($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key with default frame for one and not the other",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), MIN(a.col3) OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key with default frame for one and not the other - one ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), RANK() OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [COUNT($1), RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(ORDER BY a.col2, a.col1 DESC), AVG(a.col3) OVER(ORDER BY a.col2, a.col1 DESC) FROM a ORDER BY a.col1 DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[DESC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(order by [1, 0 DESC] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with global order by ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(ORDER BY a.col2, a.col1 DESC), AVG(a.col3) OVER(ORDER BY a.col2, a.col1 DESC) FROM a ORDER BY a.col1 DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[DESC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($4):DOUBLE NOT NULL, $5)])",
+          "\n        LogicalWindow(window#0=[window(order by [1, 0 DESC] aggs [RANK(), SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(ORDER BY a.col1), MIN(a.col3) OVER(ORDER BY a.col1) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n        LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(ORDER BY a.col2, a.col1 DESC), AVG(a.col3) OVER(ORDER BY a.col2, a.col1 DESC) FROM a ORDER BY a.col1 DESC LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$0], dir0=[DESC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$0], dir0=[DESC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(order by [1, 0 DESC] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and select col with global order by with LIMIT - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(ORDER BY a.col2, a.col1 DESC), RANK() OVER(ORDER BY a.col2, a.col1 DESC) FROM a ORDER BY a.col2, a.col1 DESC LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$2], EXPR$2=[$3], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(order by [1, 0 DESC] aggs [DENSE_RANK(), RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash], collation=[[1, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(a.col1), SUM(a.col3) OVER(ORDER BY a.col2), MAX(a.col3) OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), MAX($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[REVERSE($0)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s row_number on the same key and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(a.col1), ROW_NUMBER() OVER(ORDER BY a.col2), ROW_NUMBER() OVER(ORDER BY a.col2) FROM a",
+        "notes": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], EXPR$1=[$2], EXPR$2=[$2])",
+          "\n  LogicalWindow(window#0=[window(order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], $1=[REVERSE($0)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s ranking functinos on the same key and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(a.col1), DENSE_RANK() OVER(ORDER BY a.col2), RANK() OVER(ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [DENSE_RANK(), RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col2=[$1], $1=[REVERSE($0)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(ORDER BY a.col1), COUNT(a.col1) OVER(ORDER BY a.col1) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), MIN(a.col3) OVER(ORDER BY a.col1), MAX(a.col3) OVER(ORDER BY a.col1) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [MIN($1), MAX($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY)s on the same key with select transform and filter - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), RANK() OVER(ORDER BY a.col1), DENSE_RANK() OVER(ORDER BY a.col1) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [0] aggs [RANK(), DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], $1=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY) with transform on order by key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))), COUNT(a.col1) OVER(ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$1=[$5])",
+          "\n  LogicalWindow(window#0=[window(order by [2] aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(ORDER BY) with transform on order by key - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))), COUNT(a.col1) OVER(ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(order by [1] aggs [DENSE_RANK(), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], $1=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) only",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) only",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) only with alias",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) AS sum FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) row_number only with alias",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col2) AS row_number FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) row_number and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) dense_rank and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] aggs [DENSE_RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) AS avg FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and select col with select alias - ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) AS rank FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] aggs [RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) with default frame",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [0] aggs [MIN($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) dense_rank and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [0] aggs [DENSE_RANK()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(partition {1} order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [0] aggs [MIN($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) row_number and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, ROW_NUMBER() OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) rank and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [0] aggs [RANK()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT SUBSTR(a.col1, 0, 2), COUNT(a.col2) OVER(PARTITION BY a.col3 ORDER BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] aggs [COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[SUBSTR($0, 0, 2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) row_number select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(partition {0} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col2=[$1])",
+          "\n      LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) dense_rank select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, DENSE_RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(partition {0} order by [0] aggs [DENSE_RANK()])])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col2=[$1])",
+          "\n      LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$2], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) rank with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY CONCAT(a.col1, '-', a.col2) ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($2):DOUBLE NOT NULL, $3)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1] aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(PARTITION BY CONCAT(a.col1, '-', a.col2) ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [DENSE_RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject($0=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) but order by has different direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2 DESC) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1 DESC] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) row_number but order by has different direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col2 DESC) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1 DESC] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) but order by has different null direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2 NULLS FIRST) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1 ASC-nulls-first] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k1) but order by different direction and null direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2 DESC NULLS LAST) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [1 DESC-nulls-last] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[1]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key only",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1), COUNT(a.col2) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key only - ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1), COUNT(a.col2) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [DENSE_RANK(), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key only with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) AS max, COUNT(a.col2) OVER(PARTITION BY a.col1 ORDER BY a.col1) AS count FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col - ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(partition {0} order by [0] aggs [RANK(), DENSE_RANK()])])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0])",
+          "\n      LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) AS avg, MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) AS min FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($2):DOUBLE NOT NULL, $3)], min=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key with default frame for one and not the other",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), MIN(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key with default frame for one and not the other ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), DENSE_RANK() OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [COUNT($1), DENSE_RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1), AVG(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1) FROM a ORDER BY a.col2, a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [1, 0] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col with global order by ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1), RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1) FROM a ORDER BY a.col2, a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$2], EXPR$2=[$3], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [1, 0] aggs [DENSE_RANK(), RANK()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1), AVG(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1) FROM a ORDER BY a.col2, a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [1, 0] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1), DENSE_RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col2, a.col1) FROM a ORDER BY a.col2, a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$2], EXPR$2=[$3], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [1, 0] aggs [RANK(), DENSE_RANK()])])",
+          "\n          PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(a.col1), SUM(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2), MAX(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col2=[$1], col3=[$2], $2=[REVERSE($0)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1), COUNT(a.col1) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key select col and filter ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(partition {0} order by [0] aggs [RANK(), DENSE_RANK()])])",
+          "\n  PinotLogicalExchange(distribution=[hash[0]])",
+          "\n    LogicalProject(col1=[$0])",
+          "\n      LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1), MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [MIN($1), MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key with select transform and filter ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col1), MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [DENSE_RANK(), MAX($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1) with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))), COUNT(a.col1) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$1=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {2} order by [2] aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[2]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1) row_number with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))), ROW_NUMBER() OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))) FROM a",
+        "notes": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$1], EXPR$1=[$1])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject($0=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1) ranking functions with transform on partition key",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))), DENSE_RANK() OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY REVERSE(CONCAT(a.col1, '-', a.col2))) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [RANK(), DENSE_RANK()])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject($0=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key but order by has different direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 DESC), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 DESC) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0 DESC] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key but order by has different null direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 NULLS FIRST), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 NULLS FIRST) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0 ASC-nulls-first] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k1)s on the same key but order by has different direction and null direction and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 DESC NULLS LAST), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col1 DESC NULLS LAST) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($2):DOUBLE NOT NULL, $3)], EXPR$2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [0 DESC-nulls-last] aggs [SUM($1), COUNT($1), MIN($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) only",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) ranking function only",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) only with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) AS avg FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(avg=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) row_number only with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col1) AS row_number FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) row_number and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) dense_rank and select col",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) and select col with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) AS avg FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) with default frame",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [MAX($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [1] aggs [MIN($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) row_number and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, ROW_NUMBER() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) rank and select col with global order by",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a ORDER BY a.col1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [1] aggs [RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) and select col with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n        LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$3], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [1] aggs [MIN($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) dense_rank and select col with global order by with LIMIT",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a ORDER BY a.col1 LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$2], dir0=[ASC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])",
+          "\n      LogicalProject(col2=[$1], EXPR$1=[$2], col1=[$0])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [1] aggs [DENSE_RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) and transform col",
+        "sql": "EXPLAIN PLAN FOR SELECT SUBSTR(a.col1, 0, 2), COUNT(a.col2) OVER(PARTITION BY a.col3 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {2} order by [0] aggs [COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[2]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2], $3=[SUBSTR($0, 0, 2)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$1], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) rank select col and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col2, RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a WHERE a.col3 > 10 AND a.col3 <= 500",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col2=[$1], $1=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalFilter(condition=[AND(>($2, 10), <=($2, 500))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), AVG(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[$3], EXPR$1=[/(CAST($4):DOUBLE NOT NULL, $5)])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), COUNT($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2], $3=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) row_number with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], $2=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) rank with select transform and filter",
+        "sql": "EXPLAIN PLAN FOR SELECT CONCAT(a.col1, '-', a.col2), RANK() OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a where a.col1 NOT IN ('foo', 'bar') OR a.col3 >= 42",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], $2=[CONCAT($0, '-', $1)])",
+          "\n        LogicalFilter(condition=[OR(AND(<>($0, 'bar'), <>($0, 'foo')), >=($2, 42))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) with transform on partition key and order key",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY CONCAT(a.col1, '-', a.col2) ORDER BY REVERSE(a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(partition {2} order by [1] aggs [SUM($0), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[2]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col3=[$2], $1=[REVERSE($1)], $2=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) row_number with transform on partition key and order key",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY CONCAT(a.col1, '-', a.col2) ORDER BY REVERSE(a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject($0=[REVERSE($1)], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "single OVER(PARTITION BY k1 ORDER BY k2) dense_rank with transform on partition key and order key",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(PARTITION BY CONCAT(a.col1, '-', a.col2) ORDER BY REVERSE(a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject($0=[REVERSE($1)], $1=[CONCAT($0, '-', $1)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key only (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col3), COUNT(a.col2) OVER(PARTITION BY a.col1 ORDER BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [2] aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key only (single window group) - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col3), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col3) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [MAX($1), DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key only (single window group) with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col3) AS max, COUNT(a.col2) OVER(PARTITION BY a.col1 ORDER BY a.col3) AS count FROM a",
+        "notes": "TODO: Look into why aliases are getting ignored in the final plan",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [2] aggs [MAX($2), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$2=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [SUM($2), COUNT($2), MIN($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col (single window group) - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2), RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [DENSE_RANK(), RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col (single window group) with select alias",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1 AS value1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) AS avg, MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) AS min FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(value1=[$0], avg=[/(CAST($3):DOUBLE NOT NULL, $4)], min=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [SUM($2), COUNT($2), MIN($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key with default frame for one and not the other (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [COUNT($2), MIN($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key with default frame for one and not the other (single window group) - ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [COUNT($2), DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col with global order by (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1), AVG(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1) FROM a ORDER BY a.col2, a.col1 DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [2, 0] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0, 1]], collation=[[2, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col with global order by (single window group) - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1), DENSE_RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1) FROM a ORDER BY a.col2, a.col1 DESC",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], offset=[0])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[$4], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [2, 0] aggs [RANK(), DENSE_RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0, 1]], collation=[[2, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col with LIMIT (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[]], isSortOnSender=[false], isSortOnReceiver=[false])",
+          "\n    LogicalSort(fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$2=[$5])",
+          "\n        LogicalWindow(window#0=[window(partition {0} order by [1] aggs [SUM($2), COUNT($2), MIN($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col with global order by with LIMIT (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, SUM(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1), AVG(a.col3) OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1) FROM a ORDER BY a.col2, a.col1 DESC LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [2, 0] aggs [SUM($2), COUNT($2)])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0, 1]], collation=[[2, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and select col with global order by with LIMIT (single window group) - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, DENSE_RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1), RANK() OVER(PARTITION BY a.col2, a.col1 ORDER BY a.col3, a.col1) FROM a ORDER BY a.col2, a.col1 DESC LIMIT 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], offset=[0], fetch=[10])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[3, 0 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[DESC], fetch=[10])",
+          "\n      LogicalProject(col1=[$0], EXPR$1=[$3], EXPR$2=[$4], col2=[$1])",
+          "\n        LogicalWindow(window#0=[window(partition {0, 1} order by [2, 0] aggs [DENSE_RANK(), RANK()])])",
+          "\n          PinotLogicalSortExchange(distribution=[hash[0, 1]], collation=[[2, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n            LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key and transform col (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(a.col1), SUM(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1), MAX(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col1) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4], $2=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), MAX($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[1]], collation=[[0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2], $3=[REVERSE($0)])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key select col and filter (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2), COUNT(a.col1) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$2=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [SUM($2), COUNT($2), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n        LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s row_number on the same key select col and filter (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col1 ORDER BY a.col2), ROW_NUMBER() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$2], EXPR$2=[$2])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key select col and filter (single window group) - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a WHERE a.col3 > 42 AND a.col1 IN ('vader', 'chewbacca', 'yoda')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [RANK(), DENSE_RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1])",
+          "\n        LogicalFilter(condition=[AND(>($2, 42), OR(=($0, 'chewbacca':VARCHAR(9)), =($0, 'vader':VARCHAR(9)), =($0, 'yoda':VARCHAR(9))))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key with select transform and filter (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), MIN(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2), MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$3], $1=[$4], $2=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [MIN($2), MAX($2)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], col3=[$2], $3=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2)s on the same key with select transform and filter (single window group) - ranking function",
+        "sql": "EXPLAIN PLAN FOR SELECT REVERSE(CONCAT(a.col1, ' ', a.col2)), DENSE_RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2), RANK() OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a where a.col2 NOT IN ('foo', 'bar', 'baz')",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject($0=[$2], $1=[$3], $2=[$4])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [1] aggs [DENSE_RANK(), RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col2=[$1], $2=[REVERSE(CONCAT($0, ' ', $1))])",
+          "\n        LogicalFilter(condition=[AND(<>($1, 'bar'), <>($1, 'baz'), <>($1, 'foo'))])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2) with transform on partition key (single window group)",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY CONCAT(a.col1, '-', a.col2)), COUNT(a.col1) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($4):DOUBLE NOT NULL, $5)], EXPR$1=[$6])",
+          "\n  LogicalWindow(window#0=[window(partition {3} order by [2] aggs [SUM($1), COUNT($1), COUNT($0)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[3]], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col1=[$0], col3=[$2], $2=[CONCAT($0, '-', $1)], $3=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "multiple OVER(PARTITION BY k1 ORDER BY k2) with transform on partition key (single window group) - ranking functions",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY CONCAT(a.col1, '-', a.col2)), RANK() OVER(PARTITION BY REVERSE(CONCAT(a.col1, '-', a.col2)) ORDER BY CONCAT(a.col1, '-', a.col2)) FROM a",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(EXPR$0=[/(CAST($3):DOUBLE NOT NULL, $4)], EXPR$1=[$5])",
+          "\n  LogicalWindow(window#0=[window(partition {2} order by [1] aggs [SUM($0), COUNT($0), RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[2]], collation=[[1]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalProject(col3=[$2], $1=[CONCAT($0, '-', $1)], $2=[REVERSE(CONCAT($0, '-', $1))])",
+          "\n        LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function with JOIN example",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, b.col1, SUM(a.col3) OVER (PARTITION BY a.col1) FROM a JOIN b ON a.col1 = b.col2",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], col10=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1)])])",
+          "\n    PinotLogicalExchange(distribution=[hash[0]])",
+          "\n      LogicalProject(col1=[$0], col3=[$1], col10=[$2])",
+          "\n        LogicalJoin(condition=[=($0, $3)], joinType=[inner])",
+          "\n          PinotLogicalExchange(distribution=[hash[0]])",
+          "\n            LogicalProject(col1=[$0], col3=[$2])",
+          "\n              LogicalTableScan(table=[[a]])",
+          "\n          PinotLogicalExchange(distribution=[hash[1]])",
+          "\n            LogicalProject(col1=[$0], col2=[$1])",
+          "\n              LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function with GROUP BY example with aggregation used within ORDER BY clause in OVER",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, COUNT(*), AVG(a.col3) OVER(ORDER BY COUNT(*) desc, a.col1 asc) from a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$2], EXPR$2=[/(CAST($3):DOUBLE NOT NULL, $4)])",
+          "\n  LogicalWindow(window#0=[window(order by [2 DESC, 0] aggs [SUM($1), COUNT($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[2 DESC, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalAggregate(group=[{0, 1}], agg#0=[COUNT($2)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}], agg#0=[COUNT()])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function using row_number with GROUP BY example with aggregation used within ORDER BY clause in OVER",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, COUNT(*), ROW_NUMBER() OVER(ORDER BY COUNT(*) desc, a.col1 asc) from a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(order by [1 DESC, 0] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalProject(col1=[$0], EXPR$1=[$2])",
+          "\n      LogicalAggregate(group=[{0, 1}], agg#0=[COUNT($2)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}], agg#0=[COUNT()])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function using ranking function with GROUP BY example with aggregation used within ORDER BY clause in OVER",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, COUNT(*), DENSE_RANK() OVER(ORDER BY COUNT(*) desc, a.col1 asc), RANK() OVER(ORDER BY COUNT(*) desc, a.col1 asc) from a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalWindow(window#0=[window(order by [1 DESC, 0] aggs [DENSE_RANK(), RANK()])])",
+          "\n  PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n    LogicalProject(col1=[$0], EXPR$1=[$2])",
+          "\n      LogicalAggregate(group=[{0, 1}], agg#0=[COUNT($2)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}], agg#0=[COUNT()])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function with GROUP BY example with aggregation used within ORDER BY clause in OVER with PARTITION BY",
+        "sql": "EXPLAIN PLAN FOR SELECT a.col1, COUNT(*), MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY COUNT(*) desc, a.col1 asc) from a GROUP BY a.col1, a.col3",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], EXPR$1=[$2], $2=[$3])",
+          "\n  LogicalWindow(window#0=[window(partition {0} order by [2 DESC, 0] aggs [MAX($1)])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash[0]], collation=[[2 DESC, 0]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalAggregate(group=[{0, 1}], agg#0=[COUNT($2)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0, 1]])",
+          "\n          LogicalAggregate(group=[{0, 2}], agg#0=[COUNT()])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function CTE: row_number WITH statement having OVER with PARTITION BY ORDER BY",
+        "sql": "EXPLAIN PLAN FOR WITH windowfunc AS (SELECT a.col1, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col3) as rownum from a) SELECT a.col1, a.rownum FROM windowfunc AS a where a.rownum < 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$3])",
+          "\n  LogicalFilter(condition=[<($3, 5)])",
+          "\n    LogicalWindow(window#0=[window(partition {1} order by [2] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n      PinotLogicalSortExchange(distribution=[hash[1]], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function CTE: rank/dense_rank WITH statement having OVER with PARTITION BY ORDER BY",
+        "sql": "EXPLAIN PLAN FOR WITH windowfunc AS (SELECT a.col1, RANK() OVER(PARTITION BY a.col2 ORDER BY a.col3) as rank, DENSE_RANK() OVER(PARTITION BY a.col2 ORDER BY a.col3) as dense_rank from a) SELECT a.col1, a.rank, a.dense_rank FROM windowfunc AS a where a.dense_rank < 5",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(col1=[$0], $1=[$3], $2=[$4])",
+          "\n  LogicalFilter(condition=[<($4, 5)])",
+          "\n    LogicalWindow(window#0=[window(partition {1} order by [2] aggs [RANK(), DENSE_RANK()])])",
+          "\n      PinotLogicalSortExchange(distribution=[hash[1]], collation=[[2]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n        LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function subquery: row_number having OVER with PARTITION BY ORDER BY",
+        "sql": "EXPLAIN PLAN FOR SELECT row_number, col2, col3 FROM (SELECT ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col3 DESC) as row_number, a.col2, a.col3 FROM a) WHERE row_number <= 10",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(row_number=[$2], col2=[$0], col3=[$1])",
+          "\n  LogicalFilter(condition=[<=($2, 10)])",
+          "\n    LogicalWindow(window#0=[window(partition {0} order by [1 DESC] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n      PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function subquery: rank having OVER with PARTITION BY ORDER BY and a GROUP BY",
+        "sql": "EXPLAIN PLAN FOR SELECT col1, total, rank FROM (SELECT a.col1 as col1, count(*) as total, RANK() OVER(ORDER BY count(*) DESC) AS rank FROM a GROUP BY a.col1) WHERE rank = 1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalFilter(condition=[=($2, 1)])",
+          "\n  LogicalWindow(window#0=[window(order by [1 DESC] aggs [RANK()])])",
+          "\n    PinotLogicalSortExchange(distribution=[hash], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n      LogicalAggregate(group=[{0}], agg#0=[COUNT($1)])",
+          "\n        PinotLogicalExchange(distribution=[hash[0]])",
+          "\n          LogicalAggregate(group=[{0}], agg#0=[COUNT()])",
+          "\n            LogicalTableScan(table=[[a]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function subquery with join using row_number",
+        "sql": "EXPLAIN PLAN FOR SELECT row_number, col2, col3 FROM (SELECT a.col2 as col2, a.col3 as col3, ROW_NUMBER() OVER(PARTITION BY a.col2 ORDER BY a.col3 DESC) as row_number FROM a INNER JOIN b ON a.col1 = b.col2 WHERE a.col3 > 100 AND b.col1 IN ('douglas adams', 'brandon sanderson')) where row_number = 1",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(row_number=[$2], col2=[$0], col3=[$1])",
+          "\n  LogicalFilter(condition=[=($2, 1)])",
+          "\n    LogicalWindow(window#0=[window(partition {0} order by [1 DESC] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])",
+          "\n      PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalJoin(condition=[=($0, $3)], joinType=[inner])",
+          "\n            PinotLogicalExchange(distribution=[hash[0]])",
+          "\n              LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n                LogicalFilter(condition=[>($2, 100)])",
+          "\n                  LogicalTableScan(table=[[a]])",
+          "\n            PinotLogicalExchange(distribution=[hash[0]])",
+          "\n              LogicalProject(col2=[$1])",
+          "\n                LogicalFilter(condition=[OR(=($0, 'brandon sanderson':VARCHAR(17)), =($0, 'douglas adams':VARCHAR(17)))])",
+          "\n                  LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      },
+      {
+        "description": "Window function subquery with join using dense_rank",
+        "sql": "EXPLAIN PLAN FOR SELECT dense_rank, col2, col3 FROM (SELECT a.col2 as col2, a.col3 as col3, DENSE_RANK() OVER(PARTITION BY a.col2 ORDER BY a.col3 DESC) as dense_rank FROM a INNER JOIN b ON a.col1 = b.col2 WHERE a.col3 > 100 AND b.col1 IN ('douglas adams', 'brandon sanderson')) where dense_rank > 15",
+        "output": [
+          "Execution Plan",
+          "\nLogicalProject(dense_rank=[$2], col2=[$0], col3=[$1])",
+          "\n  LogicalFilter(condition=[>($2, 15)])",
+          "\n    LogicalWindow(window#0=[window(partition {0} order by [1 DESC] aggs [DENSE_RANK()])])",
+          "\n      PinotLogicalSortExchange(distribution=[hash[0]], collation=[[1 DESC]], isSortOnSender=[false], isSortOnReceiver=[true])",
+          "\n        LogicalProject(col2=[$1], col3=[$2])",
+          "\n          LogicalJoin(condition=[=($0, $3)], joinType=[inner])",
+          "\n            PinotLogicalExchange(distribution=[hash[0]])",
+          "\n              LogicalProject(col1=[$0], col2=[$1], col3=[$2])",
+          "\n                LogicalFilter(condition=[>($2, 100)])",
+          "\n                  LogicalTableScan(table=[[a]])",
+          "\n            PinotLogicalExchange(distribution=[hash[0]])",
+          "\n              LogicalProject(col2=[$1])",
+          "\n                LogicalFilter(condition=[OR(=($0, 'brandon sanderson':VARCHAR(17)), =($0, 'douglas adams':VARCHAR(17)))])",
+          "\n                  LogicalTableScan(table=[[b]])",
+          "\n"
+        ]
+      }
+    ]
+  },
+  "exception_throwing_window_function_planning_tests": {
+    "queries": [
+      {
+        "description": "unsupported window functions such as NTILE()",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT NTILE(5) OVER(PARTITION BY a.col1 ORDER BY a.col3) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "unsupported window functions such as LAG()",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT LAG(a.col2) OVER(PARTITION BY a.col1 ORDER BY a.col3) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "unsupported custom frames",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col3 ROWS BETWEEN 5 PRECEDING AND 10 FOLLOWING) FROM a WHERE a.col3 >= 0",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "unsupported custom frames",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(ORDER BY a.col3 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "unsupported custom frames - ORDER BY with two columns and RANGE",
+        "notes": "Apache Calcite throws error: RANGE clause cannot be used with compound ORDER BY clause, even though not specifying the frame results in RANGE itself",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(ORDER BY a.col3, a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "unsupported custom frames - PARTITION BY and ORDER BY with two columns and RANGE",
+        "notes": "Apache Calcite throws error: RANGE clause cannot be used with compound ORDER BY clause, even though not specifying the frame results in RANGE itself",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col3, a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "unsupported custom frames - ORDER BY with two columns and ROWS",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(ORDER BY a.col3, a.col1 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Multiple window groups",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col3), MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col3) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Multiple window groups",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col3) OVER(PARTITION BY a.col2), SUM(a.col3) OVER(PARTITION BY a.col2 ORDER BY a.col3) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Multiple window groups",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT AVG(a.col3) OVER(), MAX(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Multiple window groups",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ORDER BY a.col2), MIN(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Multiple window groups",
+        "notes": "not yet supported",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ORDER BY a.col2, a.col1), MIN(a.col3) OVER(ORDER BY a.col1, a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Using aggregation inside ORDER BY within OVER",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3) OVER(ORDER BY MAX(a.col3)) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Using aggregation inside PARTITION BY within OVER",
+        "sql": "EXPLAIN PLAN FOR SELECT COUNT(a.col1) OVER(PARTITION BY AVG(a.col3)) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Select an aggregate along with OVER()",
+        "sql": "EXPLAIN PLAN FOR SELECT SUM(a.col3), COUNT(a.col1) OVER() FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "External group by clause",
+        "sql": "EXPLAIN PLAN FOR SELECT MIN(a.col3) OVER(PARTITION BY a.col2) FROM a GROUP BY a.col2",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Global order by aggregate",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(a.col3) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a ORDER BY SUM(a.col3)",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Wrong table",
+        "sql": "EXPLAIN PLAN FOR SELECT MAX(b.col3) OVER(PARTITION BY b.col1 ORDER BY b.col2) FROM a ORDER BY SUM(b.col3)",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with ROW_NUMBER() window functions - even default frame cannot be specified",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col1 ORDER BY a.col2 ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with ROW_NUMBER() window functions - default frame for ROW_NUMBER is different from aggregation window functions, resulting in multiple window groups",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col1 ORDER BY a.col2), SUM(a.col1) OVER(PARTITION BY a.col1 ORDER BY a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with ROW_NUMBER() window functions - custom frames not allowed",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with ROW_NUMBER() window functions - custom frames not allowed",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER() OVER(PARTITION BY a.col1 ROWS 2 PRECEDING) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with ROW_NUMBER() window functions - passing argument to ROW_NUMBER() should fail",
+        "sql": "EXPLAIN PLAN FOR SELECT ROW_NUMBER(a.col3) OVER(PARTITION BY a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with RANK() window functions - needs ORDER BY",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(PARTITION BY a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with RANK() window functions - needs ORDER BY",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER() FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with DENSE_RANK() window functions - needs ORDER BY",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(PARTITION BY a.col2) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with DENSE_RANK() window functions - needs ORDER BY",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER() FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with DENSE_RANK() window functions - passing argument to RANK() should fail",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK(a.col3) OVER(ORDER BY a.col1) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with DENSE_RANK() window functions - passing argument to DENSE_RANK() should fail",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK(a.col3) OVER(ORDER BY a.col1) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with RANK() window functions - cannot take default frame specification, even though same as actual frame if no frame specified",
+        "sql": "EXPLAIN PLAN FOR SELECT RANK() OVER(ORDER BY a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      },
+      {
+        "description": "Apache Calcite failures with DENSE_RANK() window functions - cannot take default frame specification, even though same as actual frame if no frame specified",
+        "sql": "EXPLAIN PLAN FOR SELECT DENSE_RANK() OVER(ORDER BY a.col1 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM a",
+        "expectedException": "Error explain query plan for.*"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcMailboxService.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcMailboxService.java
deleted file mode 100644
index 280210f22f6..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcMailboxService.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import io.grpc.ManagedChannel;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
-import org.apache.pinot.query.mailbox.channel.ChannelManager;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.spi.env.PinotConfiguration;
-
-
-/**
- * GRPC-based implementation of {@link MailboxService}.
- *
- * <p>It maintains a collection of connected mailbox servers and clients to remote hosts. All indexed by the
- * mailboxID in the format of: <code>"jobId:partitionKey:senderHost:senderPort:receiverHost:receiverPort"</code>
- *
- * <p>Connections are established/initiated from the sender side and only tier-down from the sender side as well.
- * In the event of exception or timed out, the connection is cloased based on a mutually agreed upon timeout period
- * after the last successful message sent/received.
- *
- * <p>Noted that:
- * <ul>
- *   <li>the latter part of the mailboxID consist of the channelID.</li>
- *   <li>the job_id should be uniquely identifying a send/receving pair, for example if one bundle job requires
- *   to open 2 mailboxes, they should use {job_id}_1 and {job_id}_2 to distinguish the 2 different mailbox.</li>
- * </ul>
- */
-public class GrpcMailboxService implements MailboxService<TransferableBlock> {
-  // channel manager
-  private final ChannelManager _channelManager;
-  private final String _hostname;
-  private final int _mailboxPort;
-
-  // maintaining a list of registered mailboxes.
-  private final ConcurrentHashMap<String, ReceivingMailbox<TransferableBlock>> _receivingMailboxMap =
-      new ConcurrentHashMap<>();
-  private final ConcurrentHashMap<String, SendingMailbox<TransferableBlock>> _sendingMailboxMap =
-      new ConcurrentHashMap<>();
-  private final Consumer<MailboxIdentifier> _gotMailCallback;
-
-  public GrpcMailboxService(String hostname, int mailboxPort, PinotConfiguration extraConfig,
-      Consumer<MailboxIdentifier> gotMailCallback) {
-    _hostname = hostname;
-    _mailboxPort = mailboxPort;
-    _channelManager = new ChannelManager(this, extraConfig);
-    _gotMailCallback = gotMailCallback;
-  }
-
-  @Override
-  public void start() {
-    _channelManager.init();
-  }
-
-  @Override
-  public void shutdown() {
-    _channelManager.shutdown();
-  }
-
-  @Override
-  public String getHostname() {
-    return _hostname;
-  }
-
-  @Override
-  public int getMailboxPort() {
-    return _mailboxPort;
-  }
-
-  /**
-   * Register a mailbox, mailbox needs to be registered before use.
-   * @param mailboxId the id of the mailbox.
-   */
-  public SendingMailbox<TransferableBlock> getSendingMailbox(MailboxIdentifier mailboxId) {
-    return _sendingMailboxMap.computeIfAbsent(mailboxId.toString(), (mId) -> new GrpcSendingMailbox(mId, this));
-  }
-
-  /**
-   * Register a mailbox, mailbox needs to be registered before use.
-   * @param mailboxId the id of the mailbox.
-   */
-  public ReceivingMailbox<TransferableBlock> getReceivingMailbox(MailboxIdentifier mailboxId) {
-    return _receivingMailboxMap.computeIfAbsent(
-        mailboxId.toString(), (mId) -> new GrpcReceivingMailbox(mId, this, _gotMailCallback));
-  }
-
-  public ManagedChannel getChannel(String mailboxId) {
-    return _channelManager.getChannel(Utils.constructChannelId(mailboxId));
-  }
-
-  @Override
-  public String toString() {
-    return "GrpcMailboxService{" + "_hostname='" + _hostname + '\'' + ", _mailboxPort=" + _mailboxPort + '}';
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcReceivingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcReceivingMailbox.java
deleted file mode 100644
index ce0152f1e67..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcReceivingMailbox.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import javax.annotation.Nullable;
-import org.apache.pinot.common.datablock.DataBlock;
-import org.apache.pinot.common.datablock.DataBlockUtils;
-import org.apache.pinot.common.datablock.MetadataBlock;
-import org.apache.pinot.common.proto.Mailbox.MailboxContent;
-import org.apache.pinot.query.mailbox.channel.ChannelUtils;
-import org.apache.pinot.query.mailbox.channel.MailboxContentStreamObserver;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
-
-
-/**
- * GRPC implementation of the {@link ReceivingMailbox}.
- */
-public class GrpcReceivingMailbox implements ReceivingMailbox<TransferableBlock> {
-  private static final long DEFAULT_MAILBOX_INIT_TIMEOUT = 100L;
-  private final GrpcMailboxService _mailboxService;
-  private final String _mailboxId;
-  private Consumer<MailboxIdentifier> _gotMailCallback;
-  private final CountDownLatch _initializationLatch;
-  private final AtomicInteger _totalMsgReceived = new AtomicInteger(0);
-
-  private MailboxContentStreamObserver _contentStreamObserver;
-
-  public GrpcReceivingMailbox(String mailboxId, GrpcMailboxService mailboxService,
-      Consumer<MailboxIdentifier> gotMailCallback) {
-    _mailboxService = mailboxService;
-    _mailboxId = mailboxId;
-    _gotMailCallback = gotMailCallback;
-    _initializationLatch = new CountDownLatch(1);
-  }
-
-  public Consumer<MailboxIdentifier> init(MailboxContentStreamObserver streamObserver) {
-    if (_initializationLatch.getCount() > 0) {
-      _contentStreamObserver = streamObserver;
-      _initializationLatch.countDown();
-    }
-    return _gotMailCallback;
-  }
-
-  /**
-   * Polls the underlying channel and converts the received data into a TransferableBlock. This may return null in the
-   * following cases:
-   *
-   * <p>
-   *  1. If the mailbox hasn't initialized yet. This means we haven't received any data yet.
-   *  2. If the received block from the sender is a data-block with 0 rows.
-   * </p>
-   */
-  @Override
-  public TransferableBlock receive()
-      throws Exception {
-    if (!waitForInitialize()) {
-      return null;
-    }
-    MailboxContent mailboxContent = _contentStreamObserver.poll();
-    _totalMsgReceived.incrementAndGet();
-    return mailboxContent == null ? null : fromMailboxContent(mailboxContent);
-  }
-
-  @Override
-  public boolean isInitialized() {
-    return _initializationLatch.getCount() <= 0;
-  }
-
-  @Override
-  public boolean isClosed() {
-    return isInitialized() && _contentStreamObserver.isCompleted();
-  }
-
-  private boolean waitForInitialize()
-      throws Exception {
-    if (_initializationLatch.getCount() > 0) {
-      return _initializationLatch.await(DEFAULT_MAILBOX_INIT_TIMEOUT, TimeUnit.MILLISECONDS);
-    } else {
-      return true;
-    }
-  }
-
-  @Override
-  public String getMailboxId() {
-    return _mailboxId;
-  }
-
-  /**
-   * Converts the data sent by a {@link GrpcSendingMailbox} to a {@link TransferableBlock}.
-   *
-   * @param mailboxContent data sent by a GrpcSendingMailbox.
-   * @return null if the received MailboxContent is a data-block with 0 rows.
-   * @throws IOException if the MailboxContent cannot be converted to a TransferableBlock.
-   */
-  @Nullable
-  private TransferableBlock fromMailboxContent(MailboxContent mailboxContent)
-      throws IOException {
-    ByteBuffer byteBuffer = mailboxContent.getPayload().asReadOnlyByteBuffer();
-    if (byteBuffer.hasRemaining()) {
-      DataBlock dataBlock = DataBlockUtils.getDataBlock(byteBuffer);
-      if (dataBlock instanceof MetadataBlock && !dataBlock.getExceptions().isEmpty()) {
-        return TransferableBlockUtils.getErrorTransferableBlock(dataBlock.getExceptions());
-      }
-      if (dataBlock.getNumberOfRows() > 0) {
-        return new TransferableBlock(dataBlock);
-      }
-    }
-
-    if (mailboxContent.getMetadataOrDefault(ChannelUtils.MAILBOX_METADATA_END_OF_STREAM_KEY, "false").equals("true")) {
-      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
-    }
-
-    return null;
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcSendingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcSendingMailbox.java
index ca8e72cef80..25cc337bf85 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcSendingMailbox.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/GrpcSendingMailbox.java
@@ -18,84 +18,91 @@
  */
 package org.apache.pinot.query.mailbox;
 
+import com.google.common.base.Preconditions;
 import com.google.protobuf.ByteString;
-import io.grpc.ManagedChannel;
+import com.google.protobuf.UnsafeByteOperations;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.TimeUnit;
 import org.apache.pinot.common.datablock.DataBlock;
-import org.apache.pinot.common.datablock.MetadataBlock;
-import org.apache.pinot.common.proto.Mailbox;
 import org.apache.pinot.common.proto.Mailbox.MailboxContent;
 import org.apache.pinot.common.proto.PinotMailboxGrpc;
-import org.apache.pinot.query.mailbox.channel.ChannelUtils;
-import org.apache.pinot.query.mailbox.channel.MailboxStatusStreamObserver;
+import org.apache.pinot.query.mailbox.channel.ChannelManager;
+import org.apache.pinot.query.mailbox.channel.MailboxStatusObserver;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
- * GRPC implementation of the {@link SendingMailbox}.
+ * gRPC implementation of the {@link SendingMailbox}. The gRPC stream is created on the first call to {@link #send}.
  */
-public class GrpcSendingMailbox implements SendingMailbox<TransferableBlock> {
-  private final GrpcMailboxService _mailboxService;
-  private final String _mailboxId;
-  private final AtomicBoolean _initialized = new AtomicBoolean(false);
-  private final AtomicInteger _totalMsgSent = new AtomicInteger(0);
+public class GrpcSendingMailbox implements SendingMailbox {
+  private static final Logger LOGGER = LoggerFactory.getLogger(GrpcSendingMailbox.class);
 
-  private MailboxStatusStreamObserver _statusStreamObserver;
+  private final String _id;
+  private final ChannelManager _channelManager;
+  private final String _hostname;
+  private final int _port;
+  private final long _deadlineMs;
+  private final MailboxStatusObserver _statusObserver = new MailboxStatusObserver();
 
-  public GrpcSendingMailbox(String mailboxId, GrpcMailboxService mailboxService) {
-    _mailboxService = mailboxService;
-    _mailboxId = mailboxId;
-    _initialized.set(false);
-  }
+  private StreamObserver<MailboxContent> _contentObserver;
 
-  public void init()
-      throws UnsupportedOperationException {
-    ManagedChannel channel = _mailboxService.getChannel(_mailboxId);
-    PinotMailboxGrpc.PinotMailboxStub stub = PinotMailboxGrpc.newStub(channel);
-    _statusStreamObserver = new MailboxStatusStreamObserver();
-    _statusStreamObserver.init(stub.open(_statusStreamObserver));
-    // send a begin-of-stream message.
-    _statusStreamObserver.send(MailboxContent.newBuilder()
-        .setMailboxId(_mailboxId)
-        .putMetadata(ChannelUtils.MAILBOX_METADATA_BEGIN_OF_STREAM_KEY, "true")
-        .build());
-    _initialized.set(true);
+  public GrpcSendingMailbox(String id, ChannelManager channelManager, String hostname, int port, long deadlineMs) {
+    _id = id;
+    _channelManager = channelManager;
+    _hostname = hostname;
+    _port = port;
+    _deadlineMs = deadlineMs;
   }
 
   @Override
   public void send(TransferableBlock block)
-      throws UnsupportedOperationException {
-    if (!_initialized.get()) {
-      // initialization is special
-      init();
+      throws IOException {
+    if (_contentObserver == null) {
+      _contentObserver = getContentObserver();
     }
-    MailboxContent data = toMailboxContent(block.getDataBlock());
-    _statusStreamObserver.send(data);
-    _totalMsgSent.incrementAndGet();
+    Preconditions.checkState(!_statusObserver.isFinished(), "Mailbox: %s is already closed", _id);
+    _contentObserver.onNext(toMailboxContent(block));
   }
 
   @Override
   public void complete() {
-    _statusStreamObserver.complete();
+    _contentObserver.onCompleted();
   }
 
   @Override
-  public String getMailboxId() {
-    return _mailboxId;
-  }
-
-  private MailboxContent toMailboxContent(DataBlock dataBlock) {
-    try {
-      Mailbox.MailboxContent.Builder builder = Mailbox.MailboxContent.newBuilder().setMailboxId(_mailboxId)
-          .setPayload(ByteString.copyFrom(dataBlock.toBytes()));
-      if (dataBlock instanceof MetadataBlock) {
-        builder.putMetadata(ChannelUtils.MAILBOX_METADATA_END_OF_STREAM_KEY, "true");
+  public void cancel(Throwable t) {
+    if (!_statusObserver.isFinished()) {
+      LOGGER.debug("Cancelling mailbox: {}", _id);
+      if (_contentObserver == null) {
+        _contentObserver = getContentObserver();
+      }
+      try {
+        // NOTE: DO NOT use onError() because it will terminate the stream, and receiver might not get the callback
+        _contentObserver.onNext(toMailboxContent(TransferableBlockUtils.getErrorTransferableBlock(
+            new RuntimeException("Cancelled by sender with exception: " + t.getMessage(), t))));
+        _contentObserver.onCompleted();
+      } catch (Exception e) {
+        // Exception can be thrown if the stream is already closed, so we simply ignore it
+        LOGGER.debug("Caught exception cancelling mailbox: {}", _id, e);
       }
-      return builder.build();
-    } catch (IOException e) {
-      throw new RuntimeException("Error converting to mailbox content", e);
     }
   }
+
+  private StreamObserver<MailboxContent> getContentObserver() {
+    return PinotMailboxGrpc.newStub(_channelManager.getChannel(_hostname, _port))
+        .withDeadlineAfter(_deadlineMs - System.currentTimeMillis(), TimeUnit.MILLISECONDS).open(_statusObserver);
+  }
+
+  private MailboxContent toMailboxContent(TransferableBlock block)
+      throws IOException {
+    DataBlock dataBlock = block.getDataBlock();
+    byte[] bytes = dataBlock.toBytes();
+    ByteString byteString = UnsafeByteOperations.unsafeWrap(bytes);
+    return MailboxContent.newBuilder().setMailboxId(_id).setPayload(byteString)
+        .build();
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemoryMailboxService.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemoryMailboxService.java
deleted file mode 100644
index 6a6b0bb875b..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemoryMailboxService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import com.google.common.base.Preconditions;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.function.Consumer;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-
-
-public class InMemoryMailboxService implements MailboxService<TransferableBlock> {
-  // channel manager
-  private final String _hostname;
-  private final int _mailboxPort;
-  private final Consumer<MailboxIdentifier> _receivedMailContentCallback;
-
-  private final ConcurrentHashMap<String, InMemoryMailboxState> _mailboxStateMap = new ConcurrentHashMap<>();
-
-  public InMemoryMailboxService(String hostname, int mailboxPort,
-      Consumer<MailboxIdentifier> receivedMailContentCallback) {
-    _hostname = hostname;
-    _mailboxPort = mailboxPort;
-    _receivedMailContentCallback = receivedMailContentCallback;
-  }
-
-  @Override
-  public void start() {
-  }
-
-  @Override
-  public void shutdown() {
-  }
-
-  @Override
-  public String getHostname() {
-    return _hostname;
-  }
-
-  @Override
-  public int getMailboxPort() {
-    return _mailboxPort;
-  }
-
-  public SendingMailbox<TransferableBlock> getSendingMailbox(MailboxIdentifier mailboxId) {
-    Preconditions.checkState(mailboxId.isLocal(), "Cannot use in-memory mailbox service for non-local transport");
-    String mId = mailboxId.toString();
-    return _mailboxStateMap.computeIfAbsent(mId, this::newMailboxState)._sendingMailbox;
-  }
-
-  public ReceivingMailbox<TransferableBlock> getReceivingMailbox(MailboxIdentifier mailboxId) {
-    Preconditions.checkState(mailboxId.isLocal(), "Cannot use in-memory mailbox service for non-local transport");
-    String mId = mailboxId.toString();
-    return _mailboxStateMap.computeIfAbsent(mId, this::newMailboxState)._receivingMailbox;
-  }
-
-  InMemoryMailboxState newMailboxState(String mailboxId) {
-    BlockingQueue<TransferableBlock> queue = createDefaultChannel();
-    return new InMemoryMailboxState(
-        new InMemorySendingMailbox(mailboxId, queue, _receivedMailContentCallback),
-        new InMemoryReceivingMailbox(mailboxId, queue),
-        queue);
-  }
-
-  private BlockingQueue<TransferableBlock> createDefaultChannel() {
-    // for now, we use an unbounded blocking queue as the means of communication between
-    // in memory mailboxes - the reason for this is that unless we implement flow control,
-    // blocks will sit in memory either way (blocking the sender from sending doesn't prevent
-    // more blocks from being generated from upstream). on the other hand, having a capacity
-    // for the queue causes the sending thread to occupy a task pool thread and prevents other
-    // threads (most importantly, the receiving thread) from running - which can cause unnecessary
-    // failure situations
-    // TODO: when we implement flow control, we should swap this out with a bounded abstraction
-    return new LinkedBlockingQueue<>();
-  }
-
-  static class InMemoryMailboxState {
-    ReceivingMailbox<TransferableBlock> _receivingMailbox;
-    SendingMailbox<TransferableBlock> _sendingMailbox;
-    BlockingQueue<TransferableBlock> _queue;
-
-    InMemoryMailboxState(SendingMailbox<TransferableBlock> sendingMailbox,
-        ReceivingMailbox<TransferableBlock> receivingMailbox, BlockingQueue<TransferableBlock> queue) {
-      _receivingMailbox = receivingMailbox;
-      _sendingMailbox = sendingMailbox;
-      _queue = queue;
-    }
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemoryReceivingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemoryReceivingMailbox.java
deleted file mode 100644
index ac75c399930..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemoryReceivingMailbox.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import java.util.concurrent.BlockingQueue;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-
-
-public class InMemoryReceivingMailbox implements ReceivingMailbox<TransferableBlock> {
-  private final String _mailboxId;
-  private final BlockingQueue<TransferableBlock> _queue;
-  private volatile boolean _closed;
-
-  public InMemoryReceivingMailbox(String mailboxId, BlockingQueue<TransferableBlock> queue) {
-    _mailboxId = mailboxId;
-    _queue = queue;
-    _closed = false;
-  }
-
-  @Override
-  public String getMailboxId() {
-    return _mailboxId;
-  }
-
-  @Override
-  public TransferableBlock receive()
-      throws Exception {
-    TransferableBlock block = _queue.poll();
-
-    if (block == null) {
-      return null;
-    }
-
-    if (block.isEndOfStreamBlock()) {
-      _closed = true;
-    }
-
-    return block;
-  }
-
-  @Override
-  public boolean isInitialized() {
-    return true;
-  }
-
-  @Override
-  public boolean isClosed() {
-    return _closed && _queue.size() == 0;
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemorySendingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemorySendingMailbox.java
index ebde5b9c415..fb96d620438 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemorySendingMailbox.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/InMemorySendingMailbox.java
@@ -18,41 +18,49 @@
  */
 package org.apache.pinot.query.mailbox;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.function.Consumer;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
-public class InMemorySendingMailbox implements SendingMailbox<TransferableBlock> {
-  private final BlockingQueue<TransferableBlock> _queue;
-  private final Consumer<MailboxIdentifier> _gotMailCallback;
-  private final String _mailboxId;
+public class InMemorySendingMailbox implements SendingMailbox {
+  private static final Logger LOGGER = LoggerFactory.getLogger(GrpcSendingMailbox.class);
 
-  public InMemorySendingMailbox(String mailboxId, BlockingQueue<TransferableBlock> queue,
-      Consumer<MailboxIdentifier> gotMailCallback) {
-    _mailboxId = mailboxId;
-    _queue = queue;
-    _gotMailCallback = gotMailCallback;
-  }
+  private final String _id;
+  private final MailboxService _mailboxService;
+  private final long _deadlineMs;
 
-  @Override
-  public String getMailboxId() {
-    return _mailboxId;
+  private ReceivingMailbox _receivingMailbox;
+
+  public InMemorySendingMailbox(String id, MailboxService mailboxService, long deadlineMs) {
+    _id = id;
+    _mailboxService = mailboxService;
+    _deadlineMs = deadlineMs;
   }
 
   @Override
-  public void send(TransferableBlock data)
-      throws UnsupportedOperationException {
-    if (!_queue.offer(data)) {
-      // this should never happen, since we use a LinkedBlockingQueue
-      // which does not have capacity bounds
-      throw new IllegalStateException("Failed to insert into in-memory mailbox "
-          + _mailboxId);
+  public void send(TransferableBlock block) {
+    if (_receivingMailbox == null) {
+      _receivingMailbox = _mailboxService.getReceivingMailbox(_id);
+    }
+    long timeoutMs = _deadlineMs - System.currentTimeMillis();
+    if (!_receivingMailbox.offer(block, timeoutMs)) {
+      throw new RuntimeException(String.format("Failed to offer block into mailbox: %s within: %dms", _id, timeoutMs));
     }
-    _gotMailCallback.accept(JsonMailboxIdentifier.parse(_mailboxId));
   }
 
   @Override
   public void complete() {
   }
+
+  @Override
+  public void cancel(Throwable t) {
+    LOGGER.debug("Cancelling mailbox: {}", _id);
+    if (_receivingMailbox == null) {
+      _receivingMailbox = _mailboxService.getReceivingMailbox(_id);
+    }
+    _receivingMailbox.setErrorBlock(TransferableBlockUtils.getErrorTransferableBlock(
+        new RuntimeException("Cancelled by sender with exception: " + t.getMessage(), t)));
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/JsonMailboxIdentifier.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/JsonMailboxIdentifier.java
deleted file mode 100644
index 7068b06ab69..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/JsonMailboxIdentifier.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.Objects;
-
-
-public class JsonMailboxIdentifier implements MailboxIdentifier {
-
-  private static final ObjectMapper MAPPER = new ObjectMapper();
-
-  private final String _jobId;
-  private final String _from;
-  private final String _to;
-
-  private final ServerAddress _fromAddress;
-  private final ServerAddress _toAddress;
-
-  @JsonCreator
-  public JsonMailboxIdentifier(
-      @JsonProperty(value = "jobId") String jobId,
-      @JsonProperty(value = "from") String from,
-      @JsonProperty(value = "to") String to
-  ) {
-    _jobId = jobId;
-    _from = from;
-    _to = to;
-    _fromAddress = ServerAddress.parse(_from);
-    _toAddress = ServerAddress.parse(_to);
-  }
-
-  public JsonMailboxIdentifier(
-      String jobId,
-      ServerAddress from,
-      ServerAddress to
-  ) {
-    _jobId = jobId;
-    _from = from.toString();
-    _to = to.toString();
-    _fromAddress = from;
-    _toAddress = to;
-  }
-
-  public static JsonMailboxIdentifier parse(final String mailboxId) {
-    try {
-      return MAPPER.readValue(mailboxId, JsonMailboxIdentifier.class);
-    } catch (JsonProcessingException e) {
-      throw new IllegalArgumentException("Invalid mailboxID: '" + mailboxId + "'. If you see this exception it may "
-          + "be because you are doing a rolling upgrade from an old version of Pinot that is not backwards "
-          + "compatible with the current V2 engine.", e);
-    }
-  }
-
-  @Override
-  public String getJobId() {
-    return _jobId;
-  }
-
-  public String getFrom() {
-    return _from;
-  }
-
-  @JsonIgnore
-  @Override
-  public ServerAddress getFromHost() {
-    return _fromAddress;
-  }
-
-  public String getTo() {
-    return _to;
-  }
-
-  @JsonIgnore
-  @Override
-  public ServerAddress getToHost() {
-    return _toAddress;
-  }
-
-  @JsonIgnore
-  @Override
-  public boolean isLocal() {
-    return _fromAddress.equals(_toAddress);
-  }
-
-  @Override
-  public String toString() {
-    try {
-      return MAPPER.writeValueAsString(this);
-    } catch (JsonProcessingException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    JsonMailboxIdentifier that = (JsonMailboxIdentifier) o;
-    return Objects.equals(_jobId, that._jobId) && Objects.equals(_from, that._from) && Objects.equals(_to, that._to)
-        && Objects.equals(_fromAddress, that._fromAddress) && Objects.equals(_toAddress, that._toAddress);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_jobId, _from, _to, _fromAddress, _toAddress);
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxIdUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxIdUtils.java
new file mode 100644
index 00000000000..02944c665a2
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxIdUtils.java
@@ -0,0 +1,57 @@
+/**
+ * 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.pinot.query.mailbox;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+
+
+// TODO: De-couple mailbox id from query information
+public class MailboxIdUtils {
+  private MailboxIdUtils() {
+  }
+
+  private static final char SEPARATOR = '|';
+
+  @VisibleForTesting
+  public static String toMailboxId(long requestId, int senderStageId, int senderWorkerId, int receiverStageId,
+      int receiverWorkerId) {
+    return Long.toString(requestId) + SEPARATOR + senderStageId + SEPARATOR + senderWorkerId + SEPARATOR
+        + receiverStageId + SEPARATOR + receiverWorkerId;
+  }
+
+  public static OpChainId toOpChainId(String mailboxId) {
+    String[] parts = StringUtils.split(mailboxId, SEPARATOR);
+    return new OpChainId(Long.parseLong(parts[0]), Integer.parseInt(parts[4]), Integer.parseInt(parts[3]));
+  }
+
+  public static List<String> toMailboxIds(long requestId, MailboxMetadata senderMailBoxMetadata) {
+    return toMailboxIds(requestId, senderMailBoxMetadata.getMailBoxIdList());
+  }
+
+  public static List<String> toMailboxIds(long requestId, List<String> mailboxMetadataIdList) {
+    return mailboxMetadataIdList.stream()
+        .map(mailboxIdFromBroker -> Long.toString(requestId) + SEPARATOR + mailboxIdFromBroker)
+        .collect(Collectors.toList());
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java
index 234dd78e98d..24e3b3b23d3 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java
@@ -18,53 +18,176 @@
  */
 package org.apache.pinot.query.mailbox;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalListener;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import org.apache.pinot.query.mailbox.channel.ChannelManager;
+import org.apache.pinot.query.mailbox.channel.GrpcMailboxServer;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.apache.pinot.query.runtime.operator.exchange.BlockExchange;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
 /**
- * Mailbox service that handles transfer for mailbox contents.
- *
- * @param <T> type of content supported by this mailbox service.
+ * Mailbox service that handles data transfer.
  */
-public interface MailboxService<T> {
+public class MailboxService {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxService.class);
+  private static final int DANGLING_RECEIVING_MAILBOX_EXPIRY_SECONDS = 300;
+  private static final int DANGLING_EXCHANGE_EXPIRY_SECONDS = 300;
+
+  /**
+   * Cached receiving mailboxes that contains the received blocks queue.
+   *
+   * We use a cache to ensure the receiving mailbox are not leaked in the cases where the corresponding OpChain is
+   * either never registered or died before the sender finished sending data.
+   */
+  private final Cache<String, ReceivingMailbox> _receivingMailboxCache =
+      CacheBuilder.newBuilder().expireAfterAccess(DANGLING_RECEIVING_MAILBOX_EXPIRY_SECONDS, TimeUnit.SECONDS)
+          .removalListener((RemovalListener<String, ReceivingMailbox>) notification -> {
+            if (notification.wasEvicted()) {
+              int numPendingBlocks = notification.getValue().getNumPendingBlocks();
+              if (numPendingBlocks > 0) {
+                LOGGER.warn("Evicting dangling receiving mailbox: {} with {} pending blocks", notification.getKey(),
+                    numPendingBlocks);
+              }
+            }
+          }).build();
+  /**
+   * Cached the executing thread that send blocks from {@link BlockExchange}.
+   *
+   * There's the  executor service used to run the actual underlying connection and data transfer on a separate thread
+   * so that the query stage execution can properly decoupled with the data transfer mechanism.
+   */
+  private final Cache<OpChainId, Future<?>> _submittedExchangeCache =
+      CacheBuilder.newBuilder().expireAfterAccess(DANGLING_EXCHANGE_EXPIRY_SECONDS, TimeUnit.SECONDS)
+          .removalListener((RemovalListener<OpChainId, Future<?>>) notification -> {
+            if (notification.wasEvicted()) {
+              Future<?> future = notification.getValue();
+              if (!future.isDone()) {
+                LOGGER.warn("Evicting dangling exchange request for {}}", notification.getKey());
+                future.cancel(true);
+              }
+            }
+          }).build();
+
+  private final String _hostname;
+  private final int _port;
+  private final PinotConfiguration _config;
+  private final Consumer<OpChainId> _unblockOpChainCallback;
+  private final ExecutorService _exchangeExecutor;
+  private final ChannelManager _channelManager = new ChannelManager();
+
+  private GrpcMailboxServer _grpcMailboxServer;
+
+  public MailboxService(String hostname, int port, PinotConfiguration config,
+      Consumer<OpChainId> unblockOpChainCallback) {
+    _hostname = hostname;
+    _port = port;
+    _config = config;
+    _unblockOpChainCallback = unblockOpChainCallback;
+    _exchangeExecutor = Executors.newCachedThreadPool();
+    LOGGER.info("Initialized MailboxService with hostname: {}, port: {}", hostname, port);
+  }
 
   /**
-   * Starting the mailbox service.
+   * Starts the mailbox service.
    */
-  void start();
+  public void start() {
+    LOGGER.info("Starting GrpcMailboxServer");
+    _grpcMailboxServer = new GrpcMailboxServer(this, _config);
+    _grpcMailboxServer.start();
+  }
 
   /**
-   * Shutting down the mailbox service.s
+   * Shuts down the mailbox service.
    */
-  void shutdown();
+  public void shutdown() {
+    LOGGER.info("Shutting down GrpcMailboxServer");
+    _grpcMailboxServer.shutdown();
+  }
+
+  public String getHostname() {
+    return _hostname;
+  }
+
+  public int getPort() {
+    return _port;
+  }
+
+  public Consumer<OpChainId> getCallback() {
+    return _unblockOpChainCallback;
+  }
 
   /**
-   * Get the host name on which this mailbox service is runnning on.
-   *
-   * @return the host.
+   * Returns a sending mailbox for the given mailbox id. The returned sending mailbox is uninitialized, i.e. it will
+   * not open the underlying channel or acquire any additional resources. Instead, it will initialize lazily when the
+   * data is sent for the first time.
    */
-  String getHostname();
+  @VisibleForTesting
+  public SendingMailbox getSendingMailbox(String hostname, int port, String mailboxId, long deadlineMs) {
+    if (_hostname.equals(hostname) && _port == port) {
+      return new InMemorySendingMailbox(mailboxId, this, deadlineMs);
+    } else {
+      return new GrpcSendingMailbox(mailboxId, _channelManager, hostname, port, deadlineMs);
+    }
+  }
 
   /**
-   * Get the host port that receives inbound mailbox message.
-   *
-   * @return the port.
+   * Returns the receiving mailbox for the given mailbox id.
    */
-  int getMailboxPort();
+  public ReceivingMailbox getReceivingMailbox(String mailboxId) {
+    try {
+      return _receivingMailboxCache.get(mailboxId, () -> new ReceivingMailbox(mailboxId, _unblockOpChainCallback));
+    } catch (ExecutionException e) {
+      throw new RuntimeException(e);
+    }
+  }
 
   /**
-   * Look up a receiving mailbox by {@link MailboxIdentifier}.
+   * Releases the receiving mailbox from the cache.
    *
-   * <p>the acquired {@link ReceivingMailbox} will be constructed if not exist already, but it might not have been
-   * initialized.
+   * The receiving mailbox for a given OpChain may be created before the OpChain is even registered. Reason being that
+   * the sender starts sending data, and the receiver starts receiving the same without waiting for the OpChain to be
+   * registered. The ownership for the ReceivingMailbox hence lies with the MailboxService and not the OpChain.
    *
-   * @param mailboxId mailbox identifier.
-   * @return a receiving mailbox.
+   * We can safely release a receiving mailbox when all the data are received and processed by the OpChain. If there
+   * might be data not received yet, we should not release the receiving mailbox to prevent a new receiving mailbox
+   * being created.
    */
-  ReceivingMailbox<T> getReceivingMailbox(MailboxIdentifier mailboxId);
+  public void releaseReceivingMailbox(ReceivingMailbox mailbox) {
+    _receivingMailboxCache.invalidate(mailbox.getId());
+  }
 
   /**
-   * Look up a sending mailbox by {@link MailboxIdentifier}.
+   * submit a block exchange to sending service for a single OpChain.
    *
-   * @param mailboxId mailbox identifier.
-   * @return a sending mailbox.
+   * Notice that the logic inside the {@link BlockExchange#send()} should guarantee the submitted Runnable object
+   *     to be terminated successfully or after opChain timeout.
+   *
+   * @param blockExchange the exchange object of the OpChain with all the pending data to be sent.
    */
-  SendingMailbox<T> getSendingMailbox(MailboxIdentifier mailboxId);
+  public void submitExchangeRequest(OpChainId opChainId, BlockExchange blockExchange) {
+    _submittedExchangeCache.put(opChainId, _exchangeExecutor.submit(() -> {
+      TransferableBlock block = blockExchange.send();
+      while (!TransferableBlockUtils.isEndOfStream(block)) {
+        block = blockExchange.send();
+      }
+    }));
+  }
+
+  public void cancelExchangeRequest(OpChainId opChainId, Throwable t) {
+    _submittedExchangeCache.invalidate(opChainId);
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MultiplexingMailboxService.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MultiplexingMailboxService.java
deleted file mode 100644
index e80a65ce71f..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MultiplexingMailboxService.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import com.google.common.base.Preconditions;
-import java.util.function.Consumer;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.spi.env.PinotConfiguration;
-
-
-/**
- * A wrapper over {@link GrpcMailboxService} and {@link InMemoryMailboxService} that can delegate the data-transfer
- * to the in-memory mailbox service whenever possible.
- */
-public class MultiplexingMailboxService implements MailboxService<TransferableBlock> {
-  private final GrpcMailboxService _grpcMailboxService;
-  // TODO: Add config to disable in memory mailbox.
-  private final InMemoryMailboxService _inMemoryMailboxService;
-
-  MultiplexingMailboxService(GrpcMailboxService grpcMailboxService,
-      InMemoryMailboxService inMemoryReceivingMailbox) {
-    Preconditions.checkState(grpcMailboxService.getHostname().equals(inMemoryReceivingMailbox.getHostname()));
-    Preconditions.checkState(grpcMailboxService.getMailboxPort() == inMemoryReceivingMailbox.getMailboxPort());
-    _grpcMailboxService = grpcMailboxService;
-    _inMemoryMailboxService = inMemoryReceivingMailbox;
-  }
-
-  @Override
-  public void start() {
-    _grpcMailboxService.start();
-    _inMemoryMailboxService.start();
-  }
-
-  @Override
-  public void shutdown() {
-    _grpcMailboxService.shutdown();
-    _inMemoryMailboxService.shutdown();
-  }
-
-  @Override
-  public String getHostname() {
-    return _grpcMailboxService.getHostname();
-  }
-
-  @Override
-  public int getMailboxPort() {
-    return _grpcMailboxService.getMailboxPort();
-  }
-
-  @Override
-  public ReceivingMailbox<TransferableBlock> getReceivingMailbox(MailboxIdentifier mailboxId) {
-    if (mailboxId.isLocal()) {
-      return _inMemoryMailboxService.getReceivingMailbox(mailboxId);
-    }
-    return _grpcMailboxService.getReceivingMailbox(mailboxId);
-  }
-
-  @Override
-  public SendingMailbox<TransferableBlock> getSendingMailbox(MailboxIdentifier mailboxId) {
-    if (mailboxId.isLocal()) {
-      return _inMemoryMailboxService.getSendingMailbox(mailboxId);
-    }
-    return _grpcMailboxService.getSendingMailbox(mailboxId);
-  }
-
-  public static MultiplexingMailboxService newInstance(String hostname, int port,
-      PinotConfiguration pinotConfiguration, Consumer<MailboxIdentifier> gotMailCallback) {
-    return new MultiplexingMailboxService(new GrpcMailboxService(hostname, port, pinotConfiguration, gotMailCallback),
-        new InMemoryMailboxService(hostname, port, gotMailCallback));
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ReceivingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ReceivingMailbox.java
index ea999807d0a..fcba7c0a3d6 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ReceivingMailbox.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/ReceivingMailbox.java
@@ -18,40 +18,119 @@
  */
 package org.apache.pinot.query.mailbox;
 
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import javax.annotation.Nullable;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
 /**
- * Mailbox is used to send and receive data.
- *
- * Mailbox should be instantiated on both side of MailboxServer.
- *
- * @param <T> type of data carried over the mailbox.
+ * Mailbox that's used to receive data. Ownership of the ReceivingMailbox is with the MailboxService, which is unlike
+ * the {@link SendingMailbox} whose ownership lies with the send operator. This is because the ReceivingMailbox can be
+ * initialized even before the corresponding OpChain is registered on the receiver, whereas the SendingMailbox is
+ * initialized when the send operator is running.
  */
-public interface ReceivingMailbox<T> {
+public class ReceivingMailbox {
+  public static final int DEFAULT_MAX_PENDING_BLOCKS = 5;
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ReceivingMailbox.class);
+  private static final TransferableBlock CANCELLED_ERROR_BLOCK =
+      TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException("Cancelled by receiver"));
+
+  private final String _id;
+  private final Consumer<OpChainId> _receiveMailCallback;
+  // TODO: Make the queue size configurable
+  // TODO: Revisit if this is the correct way to apply back pressure
+  private final BlockingQueue<TransferableBlock> _blocks = new ArrayBlockingQueue<>(DEFAULT_MAX_PENDING_BLOCKS);
+  private final AtomicReference<TransferableBlock> _errorBlock = new AtomicReference<>();
+
+  public ReceivingMailbox(String id, Consumer<OpChainId> receiveMailCallback) {
+    _id = id;
+    _receiveMailCallback = receiveMailCallback;
+  }
+
+  public String getId() {
+    return _id;
+  }
 
   /**
-   * Get the unique identifier for the mailbox.
-   *
-   * @return Mailbox ID.
+   * Offers a non-error block into the mailbox within the timeout specified, returns whether the block is successfully
+   * added. If the block is not added, an error block is added to the mailbox.
    */
-  String getMailboxId();
+  public boolean offer(TransferableBlock block, long timeoutMs) {
+    if (_errorBlock.get() != null) {
+      LOGGER.debug("Mailbox: {} is already cancelled or errored out, ignoring the late block", _id);
+      return false;
+    }
+    if (timeoutMs < 0) {
+      LOGGER.debug("Mailbox: {} is already timed out", _id);
+      setErrorBlock(TransferableBlockUtils.getErrorTransferableBlock(
+          new TimeoutException("Timed out while offering data to mailbox: " + _id)));
+      return false;
+    }
+    try {
+      if (_blocks.offer(block, timeoutMs, TimeUnit.MILLISECONDS)) {
+        if (_errorBlock.get() == null) {
+          _receiveMailCallback.accept(MailboxIdUtils.toOpChainId(_id));
+          return true;
+        } else {
+          LOGGER.debug("Mailbox: {} is already cancelled or errored out, ignoring the late block", _id);
+          _blocks.clear();
+          return false;
+        }
+      } else {
+        LOGGER.debug("Failed to offer block into mailbox: {} within: {}ms", _id, timeoutMs);
+        setErrorBlock(TransferableBlockUtils.getErrorTransferableBlock(
+            new TimeoutException("Timed out while waiting for receive operator to consume data from mailbox: " + _id)));
+        return false;
+      }
+    } catch (InterruptedException e) {
+      LOGGER.error("Interrupted while offering block into mailbox: {}", _id);
+      setErrorBlock(TransferableBlockUtils.getErrorTransferableBlock(e));
+      return false;
+    }
+  }
 
   /**
-   * Receive a data packet from the mailbox. Depending on the implementation, this may return null. The caller should
-   * use {@link ReceivingMailbox#isClosed()} to determine if the sender is done sending and the channel is closed.
-   * @return data packet.
-   * @throws Exception
+   * Sets an error block into the mailbox. No more blocks are accepted after calling this method.
    */
-  T receive()
-      throws Exception;
+  public void setErrorBlock(TransferableBlock errorBlock) {
+    if (_errorBlock.compareAndSet(null, errorBlock)) {
+      _blocks.clear();
+      _receiveMailCallback.accept(MailboxIdUtils.toOpChainId(_id));
+    }
+  }
 
   /**
-   * Check if receiving mailbox is initialized.
-   * @return
+   * Returns the first block from the mailbox, or {@code null} if there is no block received yet. Error block is
+   * returned if exists.
    */
-  boolean isInitialized();
+  @Nullable
+  public TransferableBlock poll() {
+    TransferableBlock errorBlock = _errorBlock.get();
+    return errorBlock != null ? errorBlock : _blocks.poll();
+  }
 
   /**
-   * Check if mailbox is closed.
-   * @return
+   * Cancels the mailbox. No more blocks are accepted after calling this method. Should only be called by the receive
+   * operator to clean up the remaining blocks.
    */
-  boolean isClosed();
+  public void cancel() {
+    LOGGER.debug("Cancelling mailbox: {}", _id);
+    if (_errorBlock.compareAndSet(null, CANCELLED_ERROR_BLOCK)) {
+      _blocks.clear();
+    }
+  }
+
+  public int getNumPendingBlocks() {
+    return _blocks.size();
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/SendingMailbox.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/SendingMailbox.java
index 11cee29f0ac..3a794260b74 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/SendingMailbox.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/SendingMailbox.java
@@ -18,32 +18,41 @@
  */
 package org.apache.pinot.query.mailbox;
 
+import java.io.IOException;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.exchange.BlockExchange;
+
+
 /**
- * Mailbox is used to send and receive data.
- *
- * Mailbox should be instantiated on both side of MailboxServer.
- *
- * @param <T> type of data carried over the mailbox.
+ * Mailbox that's used to send data.
  */
-public interface SendingMailbox<T> {
+public interface SendingMailbox {
 
   /**
-   * get the unique identifier for the mailbox.
-   *
-   * @return Mailbox ID.
+   * Sends a block to the receiver. Note that SendingMailbox are required to acquire resources lazily in this call, and
+   * they should <b>not</b> acquire any resources when they are created. This method should throw if there was an error
+   * sending the data, since that would allow {@link BlockExchange} to exit early.
    */
-  String getMailboxId();
+  void send(TransferableBlock block)
+      throws IOException;
 
   /**
-   * send a data packet through the mailbox.
-   * @param data
-   * @throws UnsupportedOperationException
+   * Called when there is no more data to be sent by the {@link BlockExchange}. This is also a signal for the
+   * SendingMailbox that the sender is done sending data from its end. Note that this doesn't mean that the receiver
+   * has received all the data.
+   *
+   * <p>
+   * <b>Note:</b> While this is similar to a close() method that's usually provided with objects that hold releasable
+   * resources, the key difference is that a SendingMailbox cannot completely release the resources on its end
+   * gracefully, since it would be waiting for the receiver to ack that it has received all the data. See
+   * {@link #cancel} which can allow callers to force release the underlying resources.
+   * </p>
    */
-  void send(T data)
-      throws UnsupportedOperationException;
+  void complete();
 
   /**
-   * Complete delivery of the current mailbox.
+   * Cancels the mailbox and notifies the receiver of the cancellation so that it can release the underlying resources.
+   * No more blocks can be sent after calling this method.
    */
-  void complete();
+  void cancel(Throwable t);
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelManager.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelManager.java
index 5616b02d7fc..890c04a9d92 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelManager.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelManager.java
@@ -21,9 +21,8 @@
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import java.util.concurrent.ConcurrentHashMap;
-import org.apache.pinot.query.mailbox.GrpcMailboxService;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.spi.env.PinotConfiguration;
 
 
 /**
@@ -31,40 +30,14 @@
  *
  * <p>Grpc channels are managed centralized per Pinot component. Channels should be reused across different
  * query/job/stages.
- *
- * <p>the channelId should be in the format of: <code>"senderHost:senderPort:receiverHost:receiverPort"</code>
  */
 public class ChannelManager {
+  private final ConcurrentHashMap<Pair<String, Integer>, ManagedChannel> _channelMap = new ConcurrentHashMap<>();
 
-  private final GrpcMailboxService _mailboxService;
-  private final GrpcMailboxServer _grpcMailboxServer;
-
-  private final ConcurrentHashMap<String, ManagedChannel> _channelMap = new ConcurrentHashMap<>();
-
-  public ChannelManager(GrpcMailboxService mailboxService, PinotConfiguration extraConfig) {
-    _mailboxService = mailboxService;
-    _grpcMailboxServer = new GrpcMailboxServer(
-        _mailboxService, _mailboxService.getMailboxPort(), extraConfig);
-  }
-
-  public void init() {
-    _grpcMailboxServer.start();
-  }
-
-  public void shutdown() {
-    _grpcMailboxServer.shutdown();
-  }
-
-  public ManagedChannel getChannel(String channelId) {
-    return _channelMap.computeIfAbsent(channelId,
-        (id) -> constructChannel(id.split(":")));
-  }
-
-  private static ManagedChannel constructChannel(String[] channelParts) {
-    ManagedChannelBuilder<?> managedChannelBuilder = ManagedChannelBuilder
-        .forAddress(channelParts[0], Integer.parseInt(channelParts[1]))
-        .maxInboundMessageSize(QueryConfig.DEFAULT_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES)
-        .usePlaintext();
-    return managedChannelBuilder.build();
+  public ManagedChannel getChannel(String hostname, int port) {
+    // TODO: Revisit parameters
+    return _channelMap.computeIfAbsent(Pair.of(hostname, port),
+        (k) -> ManagedChannelBuilder.forAddress(k.getLeft(), k.getRight())
+            .maxInboundMessageSize(QueryConfig.DEFAULT_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES).usePlaintext().build());
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelUtils.java
index c9ecade8835..ef43fe79a3e 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelUtils.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/ChannelUtils.java
@@ -19,12 +19,9 @@
 package org.apache.pinot.query.mailbox.channel;
 
 public class ChannelUtils {
+  private ChannelUtils() {
+  }
 
   public static final String MAILBOX_METADATA_BUFFER_SIZE_KEY = "buffer.size";
   public static final String MAILBOX_METADATA_BEGIN_OF_STREAM_KEY = "begin.of.stream";
-  public static final String MAILBOX_METADATA_END_OF_STREAM_KEY = "end.of.stream";
-
-  private ChannelUtils() {
-    // do not instantiate.
-  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/GrpcMailboxServer.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/GrpcMailboxServer.java
index 106e50501e3..ae5df404172 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/GrpcMailboxServer.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/GrpcMailboxServer.java
@@ -25,11 +25,9 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.pinot.common.proto.Mailbox;
 import org.apache.pinot.common.proto.PinotMailboxGrpc;
-import org.apache.pinot.query.mailbox.GrpcMailboxService;
+import org.apache.pinot.query.mailbox.MailboxService;
 import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -39,20 +37,17 @@
  * send by the sender of the sender/receiver pair.
  */
 public class GrpcMailboxServer extends PinotMailboxGrpc.PinotMailboxImplBase {
-  private static final Logger LOGGER = LoggerFactory.getLogger(GrpcMailboxServer.class);
-  private static final long DEFAULT_GRPC_MAILBOX_SERVER_TIMEOUT = 10000L;
+  private static final long DEFAULT_SHUTDOWN_TIMEOUT_MS = 10_000L;
 
-  private final GrpcMailboxService _mailboxService;
+  private final MailboxService _mailboxService;
   private final Server _server;
 
-  public GrpcMailboxServer(GrpcMailboxService mailboxService, int port, PinotConfiguration extraConfig) {
+  public GrpcMailboxServer(MailboxService mailboxService, PinotConfiguration config) {
     _mailboxService = mailboxService;
-    _server = ServerBuilder.forPort(port)
-        .addService(this)
-        .maxInboundMessageSize(extraConfig.getProperty(QueryConfig.KEY_OF_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES,
-            QueryConfig.DEFAULT_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES))
-        .build();
-    LOGGER.info("Initialized GrpcMailboxServer on port: {}", port);
+    int port = mailboxService.getPort();
+    _server = ServerBuilder.forPort(port).addService(this).maxInboundMessageSize(
+        config.getProperty(QueryConfig.KEY_OF_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES,
+            QueryConfig.DEFAULT_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES)).build();
   }
 
   public void start() {
@@ -65,7 +60,7 @@ public void start() {
 
   public void shutdown() {
     try {
-      _server.shutdown().awaitTermination(DEFAULT_GRPC_MAILBOX_SERVER_TIMEOUT, TimeUnit.MILLISECONDS);
+      _server.shutdown().awaitTermination(DEFAULT_SHUTDOWN_TIMEOUT_MS, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }
@@ -73,6 +68,6 @@ public void shutdown() {
 
   @Override
   public StreamObserver<Mailbox.MailboxContent> open(StreamObserver<Mailbox.MailboxStatus> responseObserver) {
-    return new MailboxContentStreamObserver(_mailboxService, responseObserver);
+    return new MailboxContentObserver(_mailboxService, responseObserver);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxContentObserver.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxContentObserver.java
new file mode 100644
index 00000000000..d9509d57669
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxContentObserver.java
@@ -0,0 +1,127 @@
+/**
+ * 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.pinot.query.mailbox.channel;
+
+import io.grpc.Context;
+import io.grpc.stub.StreamObserver;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.datablock.DataBlockUtils;
+import org.apache.pinot.common.datablock.MetadataBlock;
+import org.apache.pinot.common.proto.Mailbox.MailboxContent;
+import org.apache.pinot.common.proto.Mailbox.MailboxStatus;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.mailbox.ReceivingMailbox;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * {@code MailboxContentObserver} is the content streaming observer used to receive mailbox content.
+ *
+ * <p>When the observer onNext() is called (e.g. when data packet has arrived at the receiving end), it puts the
+ * mailbox content to the receiving mailbox buffer; response with the remaining buffer size of the receiving mailbox
+ * to the sender side.
+ */
+public class MailboxContentObserver implements StreamObserver<MailboxContent> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxContentObserver.class);
+
+  private final MailboxService _mailboxService;
+  private final StreamObserver<MailboxStatus> _responseObserver;
+
+  private transient ReceivingMailbox _mailbox;
+
+  public MailboxContentObserver(MailboxService mailboxService, StreamObserver<MailboxStatus> responseObserver) {
+    _mailboxService = mailboxService;
+    _responseObserver = responseObserver;
+  }
+
+  @Override
+  public void onNext(MailboxContent mailboxContent) {
+    String mailboxId = mailboxContent.getMailboxId();
+    if (_mailbox == null) {
+      _mailbox = _mailboxService.getReceivingMailbox(mailboxId);
+    }
+    try {
+      TransferableBlock block;
+      DataBlock dataBlock = DataBlockUtils.getDataBlock(mailboxContent.getPayload().asReadOnlyByteBuffer());
+      if (dataBlock instanceof MetadataBlock) {
+        Map<Integer, String> exceptions = dataBlock.getExceptions();
+        if (exceptions.isEmpty()) {
+          block = TransferableBlockUtils.getEndOfStreamTransferableBlock(((MetadataBlock) dataBlock).getStats());
+        } else {
+          _mailbox.setErrorBlock(TransferableBlockUtils.getErrorTransferableBlock(exceptions));
+          return;
+        }
+      } else {
+        block = new TransferableBlock(dataBlock);
+      }
+
+      long timeoutMs = Context.current().getDeadline().timeRemaining(TimeUnit.MILLISECONDS);
+      if (_mailbox.offer(block, timeoutMs)) {
+        _responseObserver.onNext(MailboxStatus.newBuilder().setMailboxId(mailboxId)
+            .putMetadata(ChannelUtils.MAILBOX_METADATA_BUFFER_SIZE_KEY,
+                Integer.toString(_mailbox.getNumPendingBlocks())).build());
+      } else {
+        LOGGER.warn("Failed to add block into mailbox: {} within timeout: {}ms", mailboxId, timeoutMs);
+        cancelStream();
+      }
+    } catch (Exception e) {
+      String errorMessage = "Caught exception while processing blocks for mailbox: " + mailboxId;
+      LOGGER.error(errorMessage, e);
+      _mailbox.setErrorBlock(TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException(errorMessage, e)));
+      cancelStream();
+    }
+  }
+
+  private void cancelStream() {
+    try {
+      // NOTE: DO NOT use onError() because it will terminate the stream, and sender might not get the callback
+      _responseObserver.onCompleted();
+    } catch (Exception e) {
+      // Exception can be thrown if the stream is already closed, so we simply ignore it
+      LOGGER.debug("Caught exception cancelling mailbox: {}", _mailbox != null ? _mailbox.getId() : "unknown", e);
+    }
+  }
+
+  @Override
+  public void onError(Throwable t) {
+    LOGGER.warn("Error on receiver side", t);
+    if (_mailbox != null) {
+      _mailbox.setErrorBlock(
+          TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException("Cancelled by sender", t)));
+    } else {
+      LOGGER.error("Got error before mailbox is set up", t);
+    }
+  }
+
+  @Override
+  public void onCompleted() {
+    try {
+      _responseObserver.onCompleted();
+    } catch (Exception e) {
+      // Exception can be thrown if the stream is already closed, so we simply ignore it
+      LOGGER.debug("Caught exception sending complete to mailbox: {}", _mailbox != null ? _mailbox.getId() : "unknown",
+          e);
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxContentStreamObserver.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxContentStreamObserver.java
deleted file mode 100644
index 4a35c8d6607..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxContentStreamObserver.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox.channel;
-
-import com.google.protobuf.ByteString;
-import io.grpc.stub.StreamObserver;
-import java.io.IOException;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.function.Consumer;
-import javax.annotation.concurrent.GuardedBy;
-import org.apache.pinot.common.proto.Mailbox;
-import org.apache.pinot.query.mailbox.GrpcMailboxService;
-import org.apache.pinot.query.mailbox.GrpcReceivingMailbox;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static java.lang.Math.max;
-
-
-/**
- * {@code MailboxContentStreamObserver} is the content streaming observer used to receive mailbox content.
- *
- * <p>When the observer onNext() is called (e.g. when data packet has arrived at the receiving end), it puts the
- * mailbox content to the receiving mailbox buffer; response with the remaining buffer size of the receiving mailbox
- * to the sender side.
- */
-public class MailboxContentStreamObserver implements StreamObserver<Mailbox.MailboxContent> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxContentStreamObserver.class);
-
-  private static Mailbox.MailboxContent createErrorContent(Throwable e)
-      throws IOException {
-    return Mailbox.MailboxContent.newBuilder().setPayload(ByteString.copyFrom(
-            TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException(e)).getDataBlock().toBytes()))
-        .putMetadata(ChannelUtils.MAILBOX_METADATA_END_OF_STREAM_KEY, "true").build();
-  }
-
-  private static final int DEFAULT_MAILBOX_QUEUE_CAPACITY = 5;
-  private final GrpcMailboxService _mailboxService;
-  private final StreamObserver<Mailbox.MailboxStatus> _responseObserver;
-  private final boolean _isEnabledFeedback;
-
-  private final AtomicBoolean _isCompleted = new AtomicBoolean(false);
-  private final BlockingQueue<Mailbox.MailboxContent> _receivingBuffer;
-
-  private ReadWriteLock _bufferSizeLock = new ReentrantReadWriteLock();
-  @GuardedBy("bufferSizeLock")
-  private int _maxBufferSize = 0;
-  private ReadWriteLock _errorLock = new ReentrantReadWriteLock();
-  @GuardedBy("_errorLock")
-  private Mailbox.MailboxContent _errorContent = null;
-  private JsonMailboxIdentifier _mailboxId;
-  private Consumer<MailboxIdentifier> _gotMailCallback;
-
-  private void updateMaxBufferSize() {
-    _bufferSizeLock.writeLock().lock();
-    _maxBufferSize = max(_maxBufferSize, _receivingBuffer.size());
-    _bufferSizeLock.writeLock().unlock();
-  }
-
-  private int getMaxBufferSize() {
-    try {
-      _bufferSizeLock.readLock().lock();
-      return _maxBufferSize;
-    } finally {
-      _bufferSizeLock.readLock().unlock();
-    }
-  }
-
-  public MailboxContentStreamObserver(GrpcMailboxService mailboxService,
-      StreamObserver<Mailbox.MailboxStatus> responseObserver) {
-    this(mailboxService, responseObserver, false);
-  }
-
-  public MailboxContentStreamObserver(GrpcMailboxService mailboxService,
-      StreamObserver<Mailbox.MailboxStatus> responseObserver, boolean isEnabledFeedback) {
-    _mailboxService = mailboxService;
-    _responseObserver = responseObserver;
-    // TODO: Replace unbounded queue with bounded queue when we have backpressure in place.
-    // It is possible this will create high memory pressure since we have memory leak issues.
-    _receivingBuffer = new LinkedBlockingQueue();
-    _isEnabledFeedback = isEnabledFeedback;
-  }
-
-  /**
-   * This method will return {@code null} if there has not been any data since the
-   * last poll. Callers should be careful not to call this in a tight loop, and
-   * instead use the {@code gotMailCallback} passed into this observer's constructor
-   * to indicate when to call this method.
-   */
-  public Mailbox.MailboxContent poll() {
-    try {
-      _errorLock.readLock().lock();
-      if (_errorContent != null) {
-        return _errorContent;
-      }
-    } finally {
-      _errorLock.readLock().unlock();
-    }
-    if (isCompleted()) {
-      return null;
-    }
-
-    return _receivingBuffer.poll();
-  }
-
-  public boolean isCompleted() {
-    return _isCompleted.get() && _receivingBuffer.isEmpty();
-  }
-
-  @Override
-  public void onNext(Mailbox.MailboxContent mailboxContent) {
-    _mailboxId = JsonMailboxIdentifier.parse(mailboxContent.getMailboxId());
-
-    GrpcReceivingMailbox receivingMailbox = (GrpcReceivingMailbox) _mailboxService.getReceivingMailbox(_mailboxId);
-    _gotMailCallback = receivingMailbox.init(this);
-
-    if (!mailboxContent.getMetadataMap().containsKey(ChannelUtils.MAILBOX_METADATA_BEGIN_OF_STREAM_KEY)) {
-      // when the receiving end receives a message put it in the mailbox queue.
-      // TODO: pass a timeout to _receivingBuffer.
-      if (!_receivingBuffer.offer(mailboxContent)) {
-        // TODO: close the stream.
-        RuntimeException e = new RuntimeException("Mailbox receivingBuffer is full:" + _mailboxId);
-        LOGGER.error(e.getMessage());
-        try {
-          _errorLock.writeLock().lock();
-          _errorContent = createErrorContent(e);
-        } catch (IOException ioe) {
-          e = new RuntimeException("Unable to encode exception for cascade reporting: " + e, ioe);
-          LOGGER.error("MaxBufferSize:", getMaxBufferSize(), " for mailbox:", _mailboxId);
-          LOGGER.error(e.getMessage());
-          throw e;
-        } finally {
-          _errorLock.writeLock().unlock();
-        }
-      }
-      _gotMailCallback.accept(_mailboxId);
-
-      updateMaxBufferSize();
-
-      if (_isEnabledFeedback) {
-        // TODO: this has race conditions with onCompleted() because sender blindly closes connection channels once
-        // it has finished sending all the data packets.
-        int remainingCapacity = _receivingBuffer.remainingCapacity() - 1;
-        Mailbox.MailboxStatus.Builder builder =
-            Mailbox.MailboxStatus.newBuilder().setMailboxId(mailboxContent.getMailboxId())
-                .putMetadata(ChannelUtils.MAILBOX_METADATA_BUFFER_SIZE_KEY, String.valueOf(remainingCapacity));
-        if (mailboxContent.getMetadataMap().get(ChannelUtils.MAILBOX_METADATA_END_OF_STREAM_KEY) != null) {
-          builder.putMetadata(ChannelUtils.MAILBOX_METADATA_END_OF_STREAM_KEY, "true");
-        }
-        Mailbox.MailboxStatus status = builder.build();
-        // returns the buffer available size to sender for rate controller / throttling.
-        _responseObserver.onNext(status);
-      }
-    }
-  }
-
-  @Override
-  public void onError(Throwable e) {
-    try {
-      _errorLock.writeLock().lock();
-      _errorContent = createErrorContent(e);
-      _gotMailCallback.accept(_mailboxId);
-      // TODO: close the stream.
-      throw new RuntimeException(e);
-    } catch (IOException ioe) {
-      throw new RuntimeException("Unable to encode exception for cascade reporting: " + e, ioe);
-    } finally {
-      _errorLock.writeLock().unlock();
-      LOGGER.error("MaxBufferSize:", getMaxBufferSize(), " for mailbox:", _mailboxId);
-    }
-  }
-
-  @Override
-  public void onCompleted() {
-    _isCompleted.set(true);
-    _responseObserver.onCompleted();
-    LOGGER.debug("MaxBufferSize:", getMaxBufferSize(), " for mailbox:", _mailboxId);
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxStatusStreamObserver.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxStatusObserver.java
similarity index 52%
rename from pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxStatusStreamObserver.java
rename to pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxStatusObserver.java
index b758f0793d0..9f1c488d180 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxStatusStreamObserver.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/channel/MailboxStatusObserver.java
@@ -21,68 +21,50 @@
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.pinot.common.proto.Mailbox;
+import org.apache.pinot.common.proto.Mailbox.MailboxStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 /**
- * {@code MailboxStatusStreamObserver} is used by the SendingMailbox to send data over the wire.
- *
- * <p>Once {@link org.apache.pinot.query.mailbox.GrpcSendingMailbox#init()} is called, one instances of this class is
- * created based on the opened GRPC connection returned {@link StreamObserver}. From this point, the sending mailbox
- * can use the {@link MailboxStatusStreamObserver#send(Mailbox.MailboxContent)} API to send data packet to the receiving
- * end.
+ * {@code MailboxStatusStreamObserver} is the status streaming observer used to track the status by the sender.
  */
-public class MailboxStatusStreamObserver implements StreamObserver<Mailbox.MailboxStatus> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxStatusStreamObserver.class);
+public class MailboxStatusObserver implements StreamObserver<MailboxStatus> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxStatusObserver.class);
   private static final int DEFAULT_MAILBOX_QUEUE_CAPACITY = 5;
-  private final AtomicInteger _bufferSize = new AtomicInteger(5);
-  private final AtomicBoolean _isCompleted = new AtomicBoolean(false);
-
-  private StreamObserver<Mailbox.MailboxContent> _mailboxContentStreamObserver;
-
-  public MailboxStatusStreamObserver() {
-  }
 
-  public void init(StreamObserver<Mailbox.MailboxContent> mailboxContentStreamObserver) {
-    _mailboxContentStreamObserver = mailboxContentStreamObserver;
-  }
-
-  public void send(Mailbox.MailboxContent mailboxContent) {
-    _mailboxContentStreamObserver.onNext(mailboxContent);
-  }
-
-  public void complete() {
-    _mailboxContentStreamObserver.onCompleted();
-  }
+  private final AtomicInteger _bufferSize = new AtomicInteger(DEFAULT_MAILBOX_QUEUE_CAPACITY);
+  private final AtomicBoolean _finished = new AtomicBoolean();
 
   @Override
-  public void onNext(Mailbox.MailboxStatus mailboxStatus) {
+  public void onNext(MailboxStatus mailboxStatus) {
     // when received a mailbox status from the receiving end, sending end update the known buffer size available
     // so we can make better throughput send judgement. here is a simple example.
     // TODO: this feedback info is not used to throttle the send speed. it is currently being discarded.
     if (mailboxStatus.getMetadataMap().containsKey(ChannelUtils.MAILBOX_METADATA_BUFFER_SIZE_KEY)) {
-      _bufferSize.set(Integer.parseInt(
-          mailboxStatus.getMetadataMap().get(ChannelUtils.MAILBOX_METADATA_BUFFER_SIZE_KEY)));
+      _bufferSize.set(
+          Integer.parseInt(mailboxStatus.getMetadataMap().get(ChannelUtils.MAILBOX_METADATA_BUFFER_SIZE_KEY)));
     } else {
       _bufferSize.set(DEFAULT_MAILBOX_QUEUE_CAPACITY); // DEFAULT_AVAILABILITY;
     }
   }
 
-  @Override
-  public void onError(Throwable e) {
-    _isCompleted.set(true);
-    shutdown();
-    throw new RuntimeException(e);
+  public int getBufferSize() {
+    return _bufferSize.get();
   }
 
-  private void shutdown() {
+  @Override
+  public void onError(Throwable t) {
+    LOGGER.warn("Error on sender side", t);
+    _finished.set(true);
   }
 
   @Override
   public void onCompleted() {
-    _isCompleted.set(true);
-    shutdown();
+    _finished.set(true);
+  }
+
+  public boolean isFinished() {
+    return _finished.get();
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java
index ad0d138bb4a..196df534d89 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/QueryRunner.java
@@ -18,8 +18,9 @@
  */
 package org.apache.pinot.query.runtime;
 
-import com.google.common.base.Preconditions;
+import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -30,7 +31,6 @@
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
 import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.metadata.ZKMetadataProvider;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.utils.NamedThreadFactory;
 import org.apache.pinot.core.data.manager.InstanceDataManager;
@@ -38,32 +38,27 @@
 import org.apache.pinot.core.query.executor.ServerQueryExecutorV1Impl;
 import org.apache.pinot.core.query.request.ServerQueryRequest;
 import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
-import org.apache.pinot.core.transport.ServerInstance;
 import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.mailbox.MultiplexingMailboxService;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
 import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
 import org.apache.pinot.query.runtime.executor.RoundRobinScheduler;
 import org.apache.pinot.query.runtime.operator.LeafStageTransferableBlockOperator;
 import org.apache.pinot.query.runtime.operator.MailboxSendOperator;
+import org.apache.pinot.query.runtime.operator.MultiStageOperator;
 import org.apache.pinot.query.runtime.operator.OpChain;
 import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.PhysicalPlanContext;
 import org.apache.pinot.query.runtime.plan.PhysicalPlanVisitor;
-import org.apache.pinot.query.runtime.plan.PlanRequestContext;
-import org.apache.pinot.query.runtime.plan.ServerRequestPlanVisitor;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerExecutor;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerResult;
 import org.apache.pinot.query.runtime.plan.server.ServerPlanRequestContext;
+import org.apache.pinot.query.runtime.plan.server.ServerPlanRequestUtils;
 import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.metrics.PinotMetricUtils;
 import org.apache.pinot.spi.utils.CommonConstants;
-import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,9 +74,13 @@ public class QueryRunner {
   private ServerQueryExecutorV1Impl _serverExecutor;
   private HelixManager _helixManager;
   private ZkHelixPropertyStore<ZNRecord> _helixPropertyStore;
-  private MailboxService<TransferableBlock> _mailboxService;
+  private MailboxService _mailboxService;
   private String _hostname;
   private int _port;
+
+  private ExecutorService _queryWorkerIntermExecutorService;
+  private ExecutorService _queryWorkerLeafExecutorService;
+
   private OpChainSchedulerService _scheduler;
 
   /**
@@ -98,11 +97,13 @@ public void init(PinotConfiguration config, InstanceDataManager instanceDataMana
     try {
       long releaseMs = config.getProperty(QueryConfig.KEY_OF_SCHEDULER_RELEASE_TIMEOUT_MS,
           QueryConfig.DEFAULT_SCHEDULER_RELEASE_TIMEOUT_MS);
-
+      _queryWorkerIntermExecutorService = Executors.newCachedThreadPool(
+          new NamedThreadFactory("query_intermediate_worker_on_" + _port + "_port"));
+      _queryWorkerLeafExecutorService = Executors.newFixedThreadPool(ResourceManager.DEFAULT_QUERY_WORKER_THREADS,
+          new NamedThreadFactory("query_leaf_worker_on_" + _port + "_port"));
       _scheduler = new OpChainSchedulerService(new RoundRobinScheduler(releaseMs),
-          Executors.newFixedThreadPool(ResourceManager.DEFAULT_QUERY_WORKER_THREADS,
-              new NamedThreadFactory("query_worker_on_" + _port + "_port")), releaseMs);
-      _mailboxService = MultiplexingMailboxService.newInstance(_hostname, _port, config, _scheduler::onDataAvailable);
+          getQueryWorkerIntermExecutorService());
+      _mailboxService = new MailboxService(_hostname, _port, config, _scheduler::onDataAvailable);
       _serverExecutor = new ServerQueryExecutorV1Impl();
       _serverExecutor.init(config.subset(PINOT_V1_SERVER_QUERY_CONFIG_PREFIX), instanceDataManager, serverMetrics);
     } catch (Exception e) {
@@ -125,103 +126,106 @@ public void shutDown()
     _scheduler.stopAsync().awaitTerminated(30, TimeUnit.SECONDS);
   }
 
+  /**
+   * Execute a {@link DistributedStagePlan}.
+   *
+   * <p>This execution entry point should be asynchronously called by the request handler and caller should not wait
+   * for results/exceptions.</p>
+   */
   public void processQuery(DistributedStagePlan distributedStagePlan, Map<String, String> requestMetadataMap) {
     long requestId = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID));
-    if (isLeafStage(distributedStagePlan)) {
-      // TODO: make server query request return via mailbox, this is a hack to gather the non-streaming data table
-      // and package it here for return. But we should really use a MailboxSendOperator directly put into the
-      // server executor.
-      long leafStageStartMillis = System.currentTimeMillis();
-      List<ServerPlanRequestContext> serverQueryRequests =
-          constructServerQueryRequests(distributedStagePlan, requestMetadataMap, _helixPropertyStore, _mailboxService);
-
-      // send the data table via mailbox in one-off fashion (e.g. no block-level split, one data table/partition key)
-      List<InstanceResponseBlock> serverQueryResults = new ArrayList<>(serverQueryRequests.size());
-      for (ServerPlanRequestContext requestContext : serverQueryRequests) {
-        ServerQueryRequest request = new ServerQueryRequest(requestContext.getInstanceRequest(),
-            new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), System.currentTimeMillis());
-        serverQueryResults.add(processServerQuery(request, _scheduler.getWorkerPool()));
-      }
-      LOGGER.debug(
-          "RequestId:" + requestId + " StageId:" + distributedStagePlan.getStageId() + " Leaf stage v1 processing time:"
-              + (System.currentTimeMillis() - leafStageStartMillis) + " ms");
-      MailboxSendNode sendNode = (MailboxSendNode) distributedStagePlan.getStageRoot();
-      StageMetadata receivingStageMetadata = distributedStagePlan.getMetadataMap().get(sendNode.getReceiverStageId());
-      MailboxSendOperator mailboxSendOperator = new MailboxSendOperator(_mailboxService,
-          new LeafStageTransferableBlockOperator(serverQueryResults, sendNode.getDataSchema(), requestId,
-              sendNode.getStageId()), receivingStageMetadata.getServerInstances(), sendNode.getExchangeType(),
-          sendNode.getPartitionKeySelector(), _hostname, _port, serverQueryRequests.get(0).getRequestId(),
-          sendNode.getStageId());
-      int blockCounter = 0;
-      while (!TransferableBlockUtils.isEndOfStream(mailboxSendOperator.nextBlock())) {
-        LOGGER.debug("Acquired transferable block: {}", blockCounter++);
+    long timeoutMs = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS));
+    boolean isTraceEnabled =
+        Boolean.parseBoolean(requestMetadataMap.getOrDefault(CommonConstants.Broker.Request.TRACE, "false"));
+    long deadlineMs = System.currentTimeMillis() + timeoutMs;
+
+    // run pre-stage execution for all pipeline breakers
+    PipelineBreakerResult pipelineBreakerResult = PipelineBreakerExecutor.executePipelineBreakers(_scheduler,
+        _mailboxService, distributedStagePlan, deadlineMs, requestId, isTraceEnabled);
+
+    // run OpChain
+    if (DistributedStagePlan.isLeafStage(distributedStagePlan)) {
+      try {
+        OpChain rootOperator = compileLeafStage(requestId, distributedStagePlan, requestMetadataMap,
+            pipelineBreakerResult, deadlineMs, isTraceEnabled);
+        _scheduler.register(rootOperator);
+      } catch (Exception e) {
+        LOGGER.error("Error executing leaf stage for: {}:{}", requestId, distributedStagePlan.getStageId(), e);
+        _scheduler.cancel(requestId);
+        throw e;
       }
-      mailboxSendOperator.toExplainString();
     } else {
-      long timeoutMs = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS));
-      StageNode stageRoot = distributedStagePlan.getStageRoot();
-      OpChain rootOperator = PhysicalPlanVisitor.build(stageRoot,
-          new PlanRequestContext(_mailboxService, requestId, stageRoot.getStageId(), timeoutMs, _hostname, _port,
-              distributedStagePlan.getMetadataMap()));
-      _scheduler.register(rootOperator);
+      try {
+        OpChain rootOperator = compileIntermediateStage(requestId, distributedStagePlan, requestMetadataMap,
+            pipelineBreakerResult, deadlineMs, isTraceEnabled);
+        _scheduler.register(rootOperator);
+      } catch (Exception e) {
+        LOGGER.error("Error executing intermediate stage for: {}:{}", requestId, distributedStagePlan.getStageId(), e);
+        _scheduler.cancel(requestId);
+        throw e;
+      }
     }
   }
 
-  private static List<ServerPlanRequestContext> constructServerQueryRequests(DistributedStagePlan distributedStagePlan,
-      Map<String, String> requestMetadataMap, ZkHelixPropertyStore<ZNRecord> helixPropertyStore,
-      MailboxService<TransferableBlock> mailboxService) {
-    StageMetadata stageMetadata = distributedStagePlan.getMetadataMap().get(distributedStagePlan.getStageId());
-    Preconditions.checkState(stageMetadata.getScannedTables().size() == 1,
-        "Server request for V2 engine should only have 1 scan table per request.");
-    String rawTableName = stageMetadata.getScannedTables().get(0);
-    Map<String, List<String>> tableToSegmentListMap =
-        stageMetadata.getServerInstanceToSegmentsMap().get(distributedStagePlan.getServerInstance());
-    List<ServerPlanRequestContext> requests = new ArrayList<>();
-    for (Map.Entry<String, List<String>> tableEntry : tableToSegmentListMap.entrySet()) {
-      String tableType = tableEntry.getKey();
-      // ZkHelixPropertyStore extends from ZkCacheBaseDataAccessor so it should not cause too much out-of-the-box
-      // network traffic. but there's chance to improve this:
-      // TODO: use TableDataManager: it is already getting tableConfig and Schema when processing segments.
-      if (TableType.OFFLINE.name().equals(tableType)) {
-        TableConfig tableConfig = ZKMetadataProvider.getTableConfig(helixPropertyStore,
-            TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(rawTableName));
-        Schema schema = ZKMetadataProvider.getTableSchema(helixPropertyStore,
-            TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(rawTableName));
-        requests.add(
-            ServerRequestPlanVisitor.build(mailboxService, distributedStagePlan, requestMetadataMap, tableConfig,
-                schema, stageMetadata.getTimeBoundaryInfo(), TableType.OFFLINE, tableEntry.getValue()));
-      } else if (TableType.REALTIME.name().equals(tableType)) {
-        TableConfig tableConfig = ZKMetadataProvider.getTableConfig(helixPropertyStore,
-            TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(rawTableName));
-        Schema schema = ZKMetadataProvider.getTableSchema(helixPropertyStore,
-            TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(rawTableName));
-        requests.add(
-            ServerRequestPlanVisitor.build(mailboxService, distributedStagePlan, requestMetadataMap, tableConfig,
-                schema, stageMetadata.getTimeBoundaryInfo(), TableType.REALTIME, tableEntry.getValue()));
-      } else {
-        throw new IllegalArgumentException("Unsupported table type key: " + tableType);
-      }
+  public void cancel(long requestId) {
+    _scheduler.cancel(requestId);
+  }
+
+  @VisibleForTesting
+  public ExecutorService getQueryWorkerLeafExecutorService() {
+    return _queryWorkerLeafExecutorService;
+  }
+
+  @VisibleForTesting
+  public ExecutorService getQueryWorkerIntermExecutorService() {
+    return _queryWorkerIntermExecutorService;
+  }
+
+  private OpChain compileIntermediateStage(long requestId, DistributedStagePlan distributedStagePlan,
+      Map<String, String> requestMetadataMap, PipelineBreakerResult pipelineBreakerResult, long deadlineMs,
+      boolean isTraceEnabled) {
+    PlanNode stageRoot = distributedStagePlan.getStageRoot();
+    return PhysicalPlanVisitor.walkPlanNode(stageRoot,
+        new PhysicalPlanContext(_mailboxService, requestId, stageRoot.getPlanFragmentId(), deadlineMs,
+            distributedStagePlan.getServer(), distributedStagePlan.getStageMetadata(), pipelineBreakerResult,
+            isTraceEnabled));
+  }
+
+  private OpChain compileLeafStage(long requestId, DistributedStagePlan distributedStagePlan,
+      Map<String, String> requestMetadataMap, PipelineBreakerResult pipelineBreakerResult, long deadlineMs,
+      boolean isTraceEnabled) {
+    PhysicalPlanContext planContext = new PhysicalPlanContext(_mailboxService, requestId,
+        distributedStagePlan.getStageId(), deadlineMs, distributedStagePlan.getServer(),
+        distributedStagePlan.getStageMetadata(), pipelineBreakerResult, isTraceEnabled);
+    List<ServerPlanRequestContext> serverPlanRequestContexts = ServerPlanRequestUtils.constructServerQueryRequests(
+        planContext, distributedStagePlan, requestMetadataMap, _helixPropertyStore);
+    List<ServerQueryRequest> serverQueryRequests = new ArrayList<>(serverPlanRequestContexts.size());
+    for (ServerPlanRequestContext requestContext : serverPlanRequestContexts) {
+      serverQueryRequests.add(new ServerQueryRequest(requestContext.getInstanceRequest(),
+          new ServerMetrics(PinotMetricUtils.getPinotMetricsRegistry()), System.currentTimeMillis()));
     }
-    return requests;
+    MailboxSendNode sendNode = (MailboxSendNode) distributedStagePlan.getStageRoot();
+    OpChainExecutionContext opChainExecutionContext = new OpChainExecutionContext(planContext);
+    MultiStageOperator leafStageOperator =
+        new LeafStageTransferableBlockOperator(opChainExecutionContext, this::processServerQueryRequest,
+            serverQueryRequests, sendNode.getDataSchema());
+    MailboxSendOperator mailboxSendOperator =
+        new MailboxSendOperator(opChainExecutionContext, leafStageOperator, sendNode.getDistributionType(),
+            sendNode.getPartitionKeySelector(), sendNode.getCollationKeys(), sendNode.getCollationDirections(),
+            sendNode.isSortOnSender(), sendNode.getReceiverStageId());
+    return new OpChain(opChainExecutionContext, mailboxSendOperator, Collections.emptyList());
   }
 
-  private InstanceResponseBlock processServerQuery(ServerQueryRequest serverQueryRequest,
-      ExecutorService executorService) {
+  private InstanceResponseBlock processServerQueryRequest(ServerQueryRequest request) {
+    InstanceResponseBlock result;
     try {
-      return _serverExecutor.execute(serverQueryRequest, executorService);
+      result = _serverExecutor.execute(request, getQueryWorkerLeafExecutorService());
     } catch (Exception e) {
       InstanceResponseBlock errorResponse = new InstanceResponseBlock();
-      errorResponse.getExceptions()
-          .put(QueryException.QUERY_EXECUTION_ERROR_CODE, e.getMessage() + QueryException.getTruncatedStackTrace(e));
-      return errorResponse;
+      errorResponse.getExceptions().put(QueryException.QUERY_EXECUTION_ERROR_CODE,
+          e.getMessage() + QueryException.getTruncatedStackTrace(e));
+      result = errorResponse;
     }
-  }
-
-  private boolean isLeafStage(DistributedStagePlan distributedStagePlan) {
-    int stageId = distributedStagePlan.getStageId();
-    ServerInstance serverInstance = distributedStagePlan.getServerInstance();
-    StageMetadata stageMetadata = distributedStagePlan.getMetadataMap().get(stageId);
-    Map<String, List<String>> segments = stageMetadata.getServerInstanceToSegmentsMap().get(serverInstance);
-    return segments != null && segments.size() > 0;
+    return result;
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlock.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlock.java
index cad627b9253..64e4dc31ae4 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlock.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlock.java
@@ -19,7 +19,9 @@
 package org.apache.pinot.query.runtime.blocks;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.apache.pinot.common.datablock.ColumnarDataBlock;
 import org.apache.pinot.common.datablock.DataBlock;
 import org.apache.pinot.common.datablock.DataBlockUtils;
@@ -27,20 +29,16 @@
 import org.apache.pinot.common.datablock.RowDataBlock;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.common.Block;
-import org.apache.pinot.core.common.BlockDocIdSet;
-import org.apache.pinot.core.common.BlockDocIdValueSet;
-import org.apache.pinot.core.common.BlockMetadata;
-import org.apache.pinot.core.common.BlockValSet;
 import org.apache.pinot.core.common.ObjectSerDeUtils;
 import org.apache.pinot.core.common.datablock.DataBlockBuilder;
-
+import org.apache.pinot.query.runtime.operator.OperatorStats;
+import org.apache.pinot.query.runtime.operator.utils.OperatorUtils;
 
 /**
  * A {@code TransferableBlock} is a wrapper around {@link DataBlock} for transferring data using
  * {@link org.apache.pinot.common.proto.Mailbox}.
  */
 public class TransferableBlock implements Block {
-
   private final DataBlock.Type _type;
   private final DataSchema _dataSchema;
   private final int _numRows;
@@ -69,6 +67,13 @@ public TransferableBlock(DataBlock dataBlock) {
     _numRows = _dataBlock.getNumberOfRows();
   }
 
+  public Map<String, OperatorStats> getResultMetadata() {
+    if (isSuccessfulEndOfStreamBlock()) {
+      return OperatorUtils.getOperatorStatsFromMetadata((MetadataBlock) _dataBlock);
+    }
+    return new HashMap<>();
+  }
+
   public int getNumRows() {
     return _numRows;
   }
@@ -183,24 +188,4 @@ private boolean isType(MetadataBlock.MetadataBlockType type) {
     MetadataBlock metadata = (MetadataBlock) _dataBlock;
     return metadata.getType() == type;
   }
-
-  @Override
-  public BlockValSet getBlockValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdValueSet getBlockDocIdValueSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockDocIdSet getBlockDocIdSet() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BlockMetadata getMetadata() {
-    throw new UnsupportedOperationException();
-  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlockUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlockUtils.java
index 720f34e9068..787d71b834d 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlockUtils.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/blocks/TransferableBlockUtils.java
@@ -39,6 +39,10 @@ public static TransferableBlock getEndOfStreamTransferableBlock() {
     return new TransferableBlock(DataBlockUtils.getEndOfStreamDataBlock());
   }
 
+  public static TransferableBlock getEndOfStreamTransferableBlock(Map<String, String> statsMap) {
+    return new TransferableBlock(DataBlockUtils.getEndOfStreamDataBlock(statsMap));
+  }
+
   public static TransferableBlock getNoOpTransferableBlock() {
     return new TransferableBlock(DataBlockUtils.getNoOpBlock());
   }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainScheduler.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainScheduler.java
index 635e5aacfb3..b19ea88263f 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainScheduler.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainScheduler.java
@@ -18,52 +18,69 @@
  */
 package org.apache.pinot.query.runtime.executor;
 
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
 import org.apache.pinot.query.runtime.operator.OpChain;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 
 
 /**
- * An interface that defines different scheduling strategies to work with the
- * {@link OpChainSchedulerService}. All methods are thread safe and can be guaranteed
- * to never be called concurrently - therefore all implementations may use data
- * structures that are not concurrent.
+ * An interface that defines different scheduling strategies to work with the {@link OpChainSchedulerService}.
  */
+@ThreadSafe
 public interface OpChainScheduler {
-
   /**
+   * Registers a new OpChain with the scheduler.
    * @param operatorChain the operator chain to register
-   * @param isNew         whether or not this is the first time the operator is scheduled
    */
-  void register(OpChain operatorChain, boolean isNew);
+  void register(OpChain operatorChain);
 
   /**
-   * This method is called whenever {@code mailbox} has new data available to consume,
-   * this can be useful for advanced scheduling algorithms
-   *
-   * @param mailbox the mailbox ID
+   * When the OpChain is finished, error or otherwise, deregister is called for it so the scheduler can do any required
+   * cleanup. After an OpChain is de-registered, the scheduler service will never call any other method for it.
+   * However, the {@link #onDataAvailable} callback may be called even after an OpChain is de-registered, and the
+   * scheduler should handle that scenario.
+   * @param operatorChain an operator chain that is finished (error or otherwise).
    */
-  void onDataAvailable(MailboxIdentifier mailbox);
+  void deregister(OpChain operatorChain);
 
   /**
-   * This method is called when scheduler is terminating. It should clean up all of the resources if there are any.
-   * register() and onDataAvailable() shouldn't be called anymore after shutDown is called.
+   * Used by {@link OpChainSchedulerService} to indicate that a given OpChain can be suspended until it receives some
+   * data. Note that this method is only used by the scheduler service to "indicate" that an OpChain can be suspended.
+   * The decision on whether to actually suspend or not can be taken by the scheduler.
    */
-  void shutDown();
+  void yield(OpChain opChain);
 
   /**
-   * @return whether or not there is any work for the scheduler to do
+   * A callback called whenever data is received for the given opChain. This can be used by the scheduler
+   * implementations to re-scheduled suspended OpChains. This method may be called for an OpChain that has not yet
+   * been scheduled, or an OpChain that has already been de-registered.
+   * @param opChainId the {@link OpChain} ID
    */
-  boolean hasNext();
+  void onDataAvailable(OpChainId opChainId);
 
   /**
-   * @return the next operator chain to process
-   * @throws java.util.NoSuchElementException if {@link #hasNext()} returns false
-   *         prior to this call
+   * Returns an OpChain that is ready to be run by {@link OpChainSchedulerService}, waiting for the given time if
+   * there are no such OpChains ready yet. Will return null if there's no ready OpChains even after the specified time.
+   *
+   * @param time non-negative value that determines the time the scheduler will wait for new OpChains to be ready.
+   * @param timeUnit TimeUnit for the await time.
+   * @return a non-null OpChain that's ready to be run, or null if there's no OpChain ready even after waiting for the
+   *         given time.
+   * @throws InterruptedException if the wait for a ready OpChain was interrupted.
    */
-  OpChain next();
+  @Nullable
+  OpChain next(long time, TimeUnit timeUnit)
+      throws InterruptedException;
 
   /**
-   * @return the number of operator chains that are awaiting execution
+   * @return the number of operator chains registered with the scheduler
    */
   int size();
+
+  /**
+   * TODO: Figure out shutdown flow in context of graceful shutdown.
+   */
+  void shutdownNow();
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerService.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerService.java
index 6c463eeeeda..b4e55796b7f 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerService.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerService.java
@@ -18,15 +18,15 @@
  */
 package org.apache.pinot.query.runtime.executor;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
-import com.google.common.util.concurrent.Monitor;
-import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import org.apache.pinot.core.util.trace.TraceRunnable;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.operator.OpChain;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,115 +35,93 @@
  * This class provides the implementation for scheduling multistage queries on a single node based
  * on the {@link OpChainScheduler} logic that is passed in. Multistage queries support partial execution
  * and will return a NOOP metadata block as a "yield" signal, indicating that the next operator
- * chain ({@link OpChainScheduler#next()} will be requested.
- *
- * <p>Note that a yielded operator chain will be re-registered with the underlying scheduler.
+ * chain ({@link OpChainScheduler#next} will be requested.
  */
 @SuppressWarnings("UnstableApiUsage")
 public class OpChainSchedulerService extends AbstractExecutionThreadService {
-
   private static final Logger LOGGER = LoggerFactory.getLogger(OpChainSchedulerService.class);
-
-  private static final int TERMINATION_TIMEOUT_SEC = 60;
+  /**
+   * Default time scheduler is allowed to wait for a runnable OpChain to be available.
+   */
+  private static final long DEFAULT_SCHEDULER_NEXT_WAIT_MS = 100;
+  /**
+   * Default cancel signal retention, this should be set to several times larger than
+   * {@link org.apache.pinot.query.service.QueryConfig#DEFAULT_SCHEDULER_RELEASE_TIMEOUT_MS}.
+   */
+  private static final long SCHEDULER_CANCELLATION_SIGNAL_RETENTION_MS = 60_000L;
 
   private final OpChainScheduler _scheduler;
   private final ExecutorService _workerPool;
-  private final long _pollIntervalMs;
-
-  // anything that is guarded by this monitor should be non-blocking
-  private final Monitor _monitor = new Monitor();
-  private final Monitor.Guard _hasNextOrClosing = new Monitor.Guard(_monitor) {
-    @Override
-    public boolean isSatisfied() {
-      return _scheduler.hasNext() || !isRunning();
-    }
-  };
+  private final Cache<Long, Long> _cancelledRequests = CacheBuilder.newBuilder()
+      .expireAfterWrite(SCHEDULER_CANCELLATION_SIGNAL_RETENTION_MS, TimeUnit.MILLISECONDS).build();
 
-  // Note that workerPool is shut down in this class.
   public OpChainSchedulerService(OpChainScheduler scheduler, ExecutorService workerPool) {
-    this(scheduler, workerPool, -1);
-  }
-
-  public OpChainSchedulerService(OpChainScheduler scheduler, ExecutorService workerPool, long pollIntervalMs) {
     _scheduler = scheduler;
     _workerPool = workerPool;
-    _pollIntervalMs = pollIntervalMs;
   }
 
   @Override
   protected void triggerShutdown() {
+    // TODO: Figure out shutdown lifecycle with graceful shutdown in mind.
     LOGGER.info("Triggered shutdown on OpChainScheduler...");
-    // this will just notify all waiters that the scheduler is shutting down
-    _monitor.enter();
-    _monitor.leave();
-    if (!MoreExecutors.shutdownAndAwaitTermination(_workerPool, TERMINATION_TIMEOUT_SEC, TimeUnit.SECONDS)) {
-      LOGGER.error("Failed to shut down and terminate OpChainScheduler.");
-    }
-    _scheduler.shutDown();
   }
 
   @Override
   protected void run()
       throws Exception {
     while (isRunning()) {
-      if (enterMonitor()) {
-        try {
-          if (!isRunning()) {
-            return;
-          }
-
-          OpChain operatorChain = _scheduler.next();
-          LOGGER.trace("({}): Scheduling", operatorChain);
-          _workerPool.submit(new TraceRunnable() {
-            @Override
-            public void runJob() {
-              try {
-                LOGGER.trace("({}): Executing", operatorChain);
-                operatorChain.getStats().executing();
-
-                // so long as there's work to be done, keep getting the next block
-                // when the operator chain returns a NOOP block, then yield the execution
-                // of this to another worker
-                TransferableBlock result = operatorChain.getRoot().nextBlock();
-                while (!result.isNoOpBlock() && !result.isEndOfStreamBlock()) {
-                  result = operatorChain.getRoot().nextBlock();
-                }
+      OpChain operatorChain = _scheduler.next(DEFAULT_SCHEDULER_NEXT_WAIT_MS, TimeUnit.MILLISECONDS);
+      if (operatorChain == null) {
+        continue;
+      }
+      LOGGER.trace("({}): Scheduling", operatorChain);
+      _workerPool.submit(new TraceRunnable() {
+        @Override
+        public void runJob() {
+          boolean isFinished = false;
+          boolean returnedErrorBlock = false;
+          Throwable thrown = null;
+          try {
+            LOGGER.trace("({}): Executing", operatorChain);
+            // throw if the operatorChain is cancelled.
+            if (_cancelledRequests.asMap().containsKey(operatorChain.getId().getRequestId())) {
+              throw new InterruptedException("Query was cancelled!");
+            }
+            operatorChain.getStats().executing();
+            // so long as there's work to be done, keep getting the next block
+            // when the operator chain returns a NOOP block, then yield the execution
+            // of this to another worker
+            TransferableBlock result = operatorChain.getRoot().nextBlock();
+            while (!result.isNoOpBlock() && !result.isEndOfStreamBlock()) {
+              result = operatorChain.getRoot().nextBlock();
+            }
 
-                if (!result.isEndOfStreamBlock()) {
-                  // not complete, needs to re-register for scheduling
-                  register(operatorChain, false);
-                } else {
-                  if (result.isErrorBlock()) {
-                    operatorChain.getRoot().toExplainString();
-                    LOGGER.error("({}): Completed erroneously {} {}", operatorChain, operatorChain.getStats(),
-                        result.getDataBlock().getExceptions());
-                  } else {
-                    operatorChain.getRoot().toExplainString();
-                    LOGGER.debug("({}): Completed {}", operatorChain, operatorChain.getStats());
-                  }
-                  operatorChain.close();
-                }
-              } catch (Exception e) {
-                operatorChain.close();
-                operatorChain.getRoot().toExplainString();
-                LOGGER.error("({}): Failed to execute operator chain! {}", operatorChain, operatorChain.getStats(), e);
+            if (result.isNoOpBlock()) {
+              // TODO: There should be a waiting-for-data state in OpChainStats.
+              operatorChain.getStats().queued();
+              _scheduler.yield(operatorChain);
+            } else {
+              isFinished = true;
+              if (result.isErrorBlock()) {
+                returnedErrorBlock = true;
+                LOGGER.error("({}): Completed erroneously {} {}", operatorChain, operatorChain.getStats(),
+                    result.getDataBlock().getExceptions());
+              } else {
+                LOGGER.debug("({}): Completed {}", operatorChain, operatorChain.getStats());
               }
             }
-          });
-        } finally {
-          _monitor.leave();
+          } catch (Exception e) {
+            LOGGER.error("({}): Failed to execute operator chain! {}", operatorChain, operatorChain.getStats(), e);
+            thrown = e;
+          } finally {
+            if (returnedErrorBlock || thrown != null) {
+              cancelOpChain(operatorChain, thrown);
+            } else if (isFinished) {
+              closeOpChain(operatorChain);
+            }
+          }
         }
-      }
-    }
-  }
-
-  private boolean enterMonitor()
-      throws InterruptedException {
-    if (_pollIntervalMs >= 0) {
-      return _monitor.enterWhen(_hasNextOrClosing, _pollIntervalMs, TimeUnit.MILLISECONDS);
-    } else {
-      _monitor.enterWhen(_hasNextOrClosing);
-      return true;
+      });
     }
   }
 
@@ -153,43 +131,51 @@ private boolean enterMonitor()
    * @param operatorChain the chain to register
    */
   public final void register(OpChain operatorChain) {
-    register(operatorChain, true);
+    operatorChain.getStats().queued();
+    _scheduler.register(operatorChain);
     LOGGER.debug("({}): Scheduler is now handling operator chain listening to mailboxes {}. "
-            + "There are a total of {} chains awaiting execution.", operatorChain, operatorChain.getReceivingMailbox(),
+            + "There are a total of {} chains awaiting execution.", operatorChain,
+        operatorChain.getReceivingMailboxIds(),
         _scheduler.size());
   }
 
-  public final void register(OpChain operatorChain, boolean isNew) {
-    _monitor.enter();
-    try {
-      LOGGER.trace("({}): Registered operator chain (new: {}). Total: {}", operatorChain, isNew, _scheduler.size());
-
-      _scheduler.register(operatorChain, isNew);
-    } finally {
-      operatorChain.getStats().queued();
-      _monitor.leave();
-    }
+  /**
+   * Async cancel a request. Request will not be fully cancelled until the next time opChain is being polled.
+   *
+   * @param requestId requestId to be cancelled.
+   */
+  public final void cancel(long requestId) {
+    _cancelledRequests.put(requestId, requestId);
   }
 
   /**
-   * This method should be called whenever data is available in a given mailbox.
-   * Implementations of this method should be idempotent, it may be called in the
-   * scenario that no mail is available.
+   * This method should be called whenever data is available for an {@link OpChain} to consume.
+   * Implementations of this method should be idempotent, it may be called in the scenario that no data is available.
    *
-   * @param mailbox the identifier of the mailbox that now has data
+   * @param opChainId the identifier of the operator chain
    */
-  public final void onDataAvailable(MailboxIdentifier mailbox) {
-    _monitor.enter();
-    try {
-      LOGGER.trace("Notified onDataAvailable for mailbox {}", mailbox);
-      _scheduler.onDataAvailable(mailbox);
-    } finally {
-      _monitor.leave();
-    }
+  public final void onDataAvailable(OpChainId opChainId) {
+    _scheduler.onDataAvailable(opChainId);
   }
 
   // TODO: remove this method after we pipe down the proper executor pool to the v1 engine
   public ExecutorService getWorkerPool() {
     return _workerPool;
   }
+
+  private void closeOpChain(OpChain opChain) {
+    try {
+      opChain.close();
+    } finally {
+      _scheduler.deregister(opChain);
+    }
+  }
+
+  private void cancelOpChain(OpChain opChain, Throwable e) {
+    try {
+      opChain.cancel(e);
+    } finally {
+      _scheduler.deregister(opChain);
+    }
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/RoundRobinScheduler.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/RoundRobinScheduler.java
index c7b77f85e7d..65764d2a0c6 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/RoundRobinScheduler.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/executor/RoundRobinScheduler.java
@@ -19,188 +19,245 @@
 package org.apache.pinot.query.runtime.executor;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Queue;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
-import javax.annotation.concurrent.NotThreadSafe;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
+import javax.annotation.concurrent.ThreadSafe;
 import org.apache.pinot.query.runtime.operator.OpChain;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 /**
- * This is a scheduler that schedules operator chains in round robin fashion,
- * but will only schedule them when there is work to be done. The availability
- * of work is signaled using the {@link #onDataAvailable(MailboxIdentifier)}
- * callback.
+ * This is a scheduler that schedules operator chains in round-robin fashion, but will only schedule them when there is
+ * work to be done. The availability of work is signaled using the {@link #onDataAvailable} callback.
+ * <p>
+ *   Design: There are 3 states for a OpChain:
+ *
+ *   1. Ready: This state means that an OpChain is ready to be run. If an OpChain is in this state, then it would be in
+ *             the _ready queue. The _ready queue is polled on every call to {@link #next}.
+ *   2. Available/Yielded: This is when the OpChain was run and it returned a no-op block, indicating that it has no
+ *                         new data to process. The {@link OpChainId} for these OpChains are stored in the _available
+ *                         map, where the value of the map is the release-timeout.
+ *   3. Running: When the OpChain is returned by the {@link #next} method, it is considered to be in the Running state.
+ *
+ *   The following state transitions are possible:
+ *   1. Ready ==> Running: This happens when the OpChain is returned by the {@link #next} method.
+ *   2. Running ==> Available/Yielded: This happens when a running OpChain returns a No-op block, following which a
+ *                                     yield is called and there's no entry for the OpChain in _seenMail.
+ *   3. Available/Yielded ==> Ready: This can happen in two cases: (1) When yield is called but _seenMail has an
+ *                                   entry for the corresponding OpChainId, which means there was some data received
+ *                                   by MailboxReceiveOperator after the last poll. (2) When a sender has died or hasn't
+ *                                   sent any data in the last _releaseTimeoutMs milliseconds.
+ *
+ *                      |--------------( #yield() )---------|
+ *                      |                                   |
+ *                     \/                                   |
+ *   [ START ] --> [ READY ] -----------( #next() )--> [ RUNNING ]
+ *                     /\                                   |
+ *                     |                                    |
+ *         ( #seenMail() or #periodic())                    |
+ *                     |                                    |
+ *                [ AVAILABLE ] <------( #yield() )---------|
+ *                                                          |
+ *                                                          |
+ *   [ EXIT ] <-----------------( #deregistered() )---------|
+ *
+ *   The OpChain is considered "alive" from the time it is registered until it is de-registered. Any reference to the
+ *   OpChain or its related metadata is kept only while the OpChain is alive. The {@link #onDataAvailable} callback
+ *   can be called before an OpChain was ever registered. In that case, this scheduler will simply ignore the callback,
+ *   since once the OpChain gets registered it will anyways be put into the _ready queue immediately. In case the
+ *   OpChain never gets registered (e.g. if the broker couldn't dispatch it), as long as the sender cleans up all
+ *   resources that it has acquired, there will be no leak, since the scheduler doesn't hold any references for
+ *   non-alive OpChains.
+ * </p>
  */
-@NotThreadSafe
+@ThreadSafe
 public class RoundRobinScheduler implements OpChainScheduler {
   private static final Logger LOGGER = LoggerFactory.getLogger(RoundRobinScheduler.class);
-  private static final long DEFAULT_RELEASE_TIMEOUT = TimeUnit.MINUTES.toMillis(1);
+  private static final String AVAILABLE_RELEASE_THREAD_NAME = "round-robin-scheduler-release-thread";
 
-  private final long _releaseTimeout;
+  private final long _releaseTimeoutMs;
   private final Supplier<Long> _ticker;
 
-  // the _available queue contains operator chains that are available
-  // to this scheduler but do not have any data available to schedule
-  // while the _ready queue contains the operator chains that are ready
-  // to be scheduled (have data, or are first-time scheduled)
-  private final Queue<AvailableEntry> _available = new LinkedList<>();
-  private final Queue<OpChain> _ready = new LinkedList<>();
-
-  private boolean _isShutDown = false;
-
-  // using a Set here is acceptable because calling hasNext() and
-  // onDataAvailable() cannot occur concurrently - that means that
-  // anytime we schedule a new operator based on the presence of
-  // mail we can be certain that it will consume all of the mail
-  // form that mailbox, even if there are multiple items in it. If,
-  // during execution of that operator, more mail appears, then the
-  // operator will be rescheduled immediately potentially resulting
-  // in a false-positive schedule
-  @VisibleForTesting
-  final Set<MailboxIdentifier> _seenMail = new HashSet<>();
+  private final Map<OpChainId, OpChain> _aliveChains = new ConcurrentHashMap<>();
+  private final Set<OpChainId> _seenMail = Sets.newConcurrentHashSet();
+  private final Map<OpChainId, Long> _available = new ConcurrentHashMap<>();
 
-  public RoundRobinScheduler() {
-    this(DEFAULT_RELEASE_TIMEOUT);
-  }
+  private final BlockingQueue<OpChain> _ready = new LinkedBlockingQueue<>();
+
+  private final Lock _lock = new ReentrantLock();
+  private final ScheduledExecutorService _availableOpChainReleaseService;
 
-  public RoundRobinScheduler(long releaseTimeout) {
-    this(releaseTimeout, System::currentTimeMillis);
+  public RoundRobinScheduler(long releaseTimeoutMs) {
+    this(releaseTimeoutMs, System::currentTimeMillis);
   }
 
-  public RoundRobinScheduler(long releaseTimeoutMs, Supplier<Long> ticker) {
-    _releaseTimeout = releaseTimeoutMs;
+  RoundRobinScheduler(long releaseTimeoutMs, Supplier<Long> ticker) {
+    Preconditions.checkArgument(releaseTimeoutMs > 0, "Release timeout for round-robin scheduler should be > 0ms");
+    _releaseTimeoutMs = releaseTimeoutMs;
     _ticker = ticker;
+    _availableOpChainReleaseService = Executors.newSingleThreadScheduledExecutor(r -> {
+      Thread t = new Thread(r);
+      t.setName(AVAILABLE_RELEASE_THREAD_NAME);
+      t.setDaemon(true);
+      return t;
+    });
+    _availableOpChainReleaseService.scheduleAtFixedRate(() -> {
+      List<OpChainId> timedOutWaiting = new ArrayList<>();
+      for (Map.Entry<OpChainId, Long> entry : _available.entrySet()) {
+        if (Thread.interrupted()) {
+          LOGGER.warn("Thread={} interrupted. Scheduler may be shutting down.", AVAILABLE_RELEASE_THREAD_NAME);
+          break;
+        }
+        if (_ticker.get() > entry.getValue()) {
+          timedOutWaiting.add(entry.getKey());
+        }
+      }
+      for (OpChainId opChainId : timedOutWaiting) {
+        _lock.lock();
+        try {
+          if (_available.containsKey(opChainId)) {
+            _available.remove(opChainId);
+            _ready.offer(_aliveChains.get(opChainId));
+          }
+        } finally {
+          _lock.unlock();
+        }
+      }
+    }, _releaseTimeoutMs, _releaseTimeoutMs, TimeUnit.MILLISECONDS);
   }
 
   @Override
-  public void register(OpChain operatorChain, boolean isNew) {
-    if (_isShutDown) {
-      return;
-    }
-    // the first time an operator chain is scheduled, it should
-    // immediately be considered ready in case it does not need
-    // read from any mailbox (e.g. with a LiteralValueOperator)
-    if (isNew) {
-      _ready.add(operatorChain);
-    } else {
-      long releaseTs = _releaseTimeout < 0 ? Long.MAX_VALUE : _ticker.get() + _releaseTimeout;
-      _available.add(new AvailableEntry(operatorChain, releaseTs));
+  public void register(OpChain operatorChain) {
+    Preconditions.checkState(!_aliveChains.containsKey(operatorChain.getId()),
+        String.format("Tried to re-register op-chain: %s", operatorChain.getId()));
+    _lock.lock();
+    try {
+      _aliveChains.put(operatorChain.getId(), operatorChain);
+      _ready.offer(operatorChain);
+    } finally {
+      _lock.unlock();
     }
     trace("registered " + operatorChain);
   }
 
   @Override
-  public void onDataAvailable(MailboxIdentifier mailbox) {
-    // it may be possible to receive this callback when there's no corresponding
-    // operator chain registered to the mailbox - this can happen when either
-    // (1) we get the callback before the first register is called or (2) we get
-    // the callback while the operator chain is executing. to account for this,
-    // we just store it in a set of seen mail and only check for it when hasNext
-    // is called.
-    //
-    // note that scenario (2) may cause a false-positive schedule where an operator
-    // chain gets scheduled for mail that it had already processed, in which case
-    // the operator chain will simply do nothing and get put back onto the queue.
-    // scenario (2) may additionally cause a memory leak - if onDataAvailable is
-    // called with an EOS block _while_ the operator chain is executing, the chain
-    // will consume the EOS block and computeReady() will never remove the mailbox
-    // from the _seenMail set.
-    //
-    // TODO: fix the memory leak by adding a close(opChain) callback
-    _seenMail.add(mailbox);
-    trace("got mail for " + mailbox);
+  public void deregister(OpChain operatorChain) {
+    Preconditions.checkState(_aliveChains.containsKey(operatorChain.getId()),
+        "Tried to de-register an un-registered op-chain");
+    _lock.lock();
+    try {
+      OpChainId chainId = operatorChain.getId();
+      _aliveChains.remove(chainId);
+      // it could be that the onDataAvailable callback was called when the OpChain was executing, in which case there
+      // could be a dangling entry in _seenMail.
+      _seenMail.remove(chainId);
+    } finally {
+      _lock.unlock();
+    }
+    // invoke opChain deregister callback
+    operatorChain.getOpChainFinishCallback().accept(operatorChain.getId());
   }
 
   @Override
-  public boolean hasNext() {
-    if (!_ready.isEmpty()) {
-      return true;
+  public void yield(OpChain operatorChain) {
+    long releaseTs = _ticker.get() + _releaseTimeoutMs;
+    _lock.lock();
+    try {
+      // It could be that this OpChain received data before it could be yielded completely. In that case, mark it ready
+      // to get it scheduled asap.
+      if (_seenMail.contains(operatorChain.getId())) {
+        _seenMail.remove(operatorChain.getId());
+        _ready.add(operatorChain);
+        return;
+      }
+      _available.put(operatorChain.getId(), releaseTs);
+    } finally {
+      _lock.unlock();
     }
-    computeReady();
-    return !_ready.isEmpty();
   }
 
   @Override
-  public OpChain next() {
-    OpChain op = _ready.poll();
-    trace("Polled " + op);
-    return op;
+  public void onDataAvailable(OpChainId opChainId) {
+    // If this chain isn't alive as per the scheduler, don't do anything. If the OpChain is registered after this, it
+    // will anyways be scheduled to run since new OpChains are run immediately.
+    if (!_aliveChains.containsKey(opChainId)) {
+      trace("woken up but the OpChain is not registered so ignoring the event: " + opChainId);
+      return;
+    }
+    _lock.lock();
+    try {
+      if (!_aliveChains.containsKey(opChainId)) {
+        return;
+      }
+      if (_available.containsKey(opChainId)) {
+        _available.remove(opChainId);
+        _ready.offer(_aliveChains.get(opChainId));
+      } else {
+        // There are two cases here:
+        // 1. OpChain is in the _ready queue: the next time it gets polled, we'll remove the _seenMail entry.
+        // 2. OpChain is running: the next time yield is called for it, we'll check against _seenMail and put it back
+        //    in the _ready queue again.
+        _seenMail.add(opChainId);
+      }
+    } finally {
+      _lock.unlock();
+    }
+    trace("got data for " + opChainId);
   }
 
   @Override
-  public int size() {
-    return _ready.size() + _available.size();
+  public OpChain next(long time, TimeUnit timeUnit)
+      throws InterruptedException {
+    return _ready.poll(time, timeUnit);
   }
 
   @Override
-  public void shutDown() {
-    if (_isShutDown) {
-      return;
-    }
-    while (!_ready.isEmpty()) {
-      _ready.poll().close();
-    }
-    while (!_available.isEmpty()) {
-      _available.poll()._opChain.close();
-    }
-    _isShutDown = true;
+  public int size() {
+    return _aliveChains.size();
   }
 
-  private void computeReady() {
-    Iterator<AvailableEntry> availableChains = _available.iterator();
-
-    // the algorithm here iterates through all available chains and checks
-    // to see whether or not any of the available chains have seen mail for
-    // at least one of the mailboxes they receive from - if they do, then
-    // we should make that chain available and remove any mail from the
-    // mailboxes that it would consume from (after it is scheduled, all
-    // mail available to it will have been consumed).
-    while (availableChains.hasNext()) {
-      AvailableEntry chain = availableChains.next();
-      Sets.SetView<MailboxIdentifier> intersect = Sets.intersection(chain._opChain.getReceivingMailbox(), _seenMail);
-
-      if (!intersect.isEmpty()) {
-        // use an immutable copy because set views use the underlying sets
-        // directly, which would cause a concurrent modification exception
-        // when removing data from _seenMail
-        _seenMail.removeAll(intersect.immutableCopy());
-        _ready.add(chain._opChain);
-        availableChains.remove();
-      } else if (_ticker.get() > chain._releaseTs) {
-        LOGGER.warn("({}) Scheduling operator chain reading from {} after timeout. Ready: {}, Available: {}, Mail: {}.",
-            chain._opChain, chain._opChain.getReceivingMailbox(), _ready, _available, _seenMail);
-        _ready.add(chain._opChain);
-        availableChains.remove();
-      }
-    }
+  @Override
+  public void shutdownNow() {
+    // TODO: Figure out shutdown flow in context of graceful shutdown.
+    _availableOpChainReleaseService.shutdownNow();
   }
 
-  private void trace(String operation) {
-    LOGGER.trace("({}) Ready: {}, Available: {}, Mail: {}", operation, _ready, _available, _seenMail);
+  @VisibleForTesting
+  int readySize() {
+    return _ready.size();
   }
 
-  private static class AvailableEntry {
+  @VisibleForTesting
+  int availableSize() {
+    return _available.size();
+  }
 
-    final OpChain _opChain;
-    final long _releaseTs;
+  @VisibleForTesting
+  int seenMailSize() {
+    return _seenMail.size();
+  }
 
-    private AvailableEntry(OpChain opChain, long releaseTs) {
-      _opChain = opChain;
-      _releaseTs = releaseTs;
-    }
+  @VisibleForTesting
+  int aliveChainsSize() {
+    return _aliveChains.size();
+  }
 
-    @Override
-    public String toString() {
-      return _opChain.toString();
-    }
+  private void trace(String operation) {
+    LOGGER.trace("({}) Ready: {}, Available: {}, Mail: {}", operation, _ready, _available, _seenMail);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/AggregateOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/AggregateOperator.java
index 199d8c8b96a..494ad1d7372 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/AggregateOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/AggregateOperator.java
@@ -21,97 +21,128 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
+import org.apache.calcite.rel.hint.PinotHintOptions;
 import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.request.Literal;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.FunctionContext;
 import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.core.data.table.Key;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.common.IntermediateStageBlockValSet;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunctionFactory;
+import org.apache.pinot.query.planner.logical.LiteralHintUtils;
 import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.plannode.AbstractPlanNode;
+import org.apache.pinot.query.planner.plannode.AggregateNode.AggType;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
-import org.apache.pinot.segment.local.customobject.PinotFourthMoment;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 
 
 /**
  *
  * AggregateOperator is used to aggregate values over a set of group by keys.
  * Output data will be in the format of [group by key, aggregate result1, ... aggregate resultN]
- * Currently, we only support SUM/COUNT/MIN/MAX aggregation.
+ * Currently, we only support the following aggregation functions:
+ * 1. SUM
+ * 2. COUNT
+ * 3. MIN
+ * 4. MAX
+ * 5. DistinctCount and Count(Distinct)
+ * 6. AVG
+ * 7. FourthMoment
+ * 8. BoolAnd and BoolOr
  *
  * When the list of aggregation calls is empty, this class is used to calculate distinct result based on group by keys.
  * In this case, the input can be any type.
  *
  * If the list of aggregation calls is not empty, the input of aggregation has to be a number.
- *
  * Note: This class performs aggregation over the double value of input.
  * If the input is single value, the output type will be input type. Otherwise, the output type will be double.
  */
+// TODO(Sonam): Rename to AggregateOperator when merging Planner support.
 public class AggregateOperator extends MultiStageOperator {
   private static final String EXPLAIN_NAME = "AGGREGATE_OPERATOR";
-  private static final Logger LOGGER = LoggerFactory.getLogger(AggregateOperator.class);
 
   private final MultiStageOperator _inputOperator;
+  private final DataSchema _resultSchema;
+  private final DataSchema _inputSchema;
+  private final AggType _aggType;
 
-  // TODO: Deal with the case where _aggCalls is empty but we have groupSet setup, which means this is a Distinct call.
-  private final List<RexExpression.FunctionCall> _aggCalls;
-  private final List<RexExpression> _groupSet;
+  // Map that maintains the mapping between columnName and the column ordinal index. It is used to fetch the required
+  // column value from row-based container and fetch the input datatype for the column.
+  private final Map<String, Integer> _colNameToIndexMap;
+  private final Map<Integer, Map<Integer, Literal>> _aggCallSignatureMap;
 
-  private final DataSchema _resultSchema;
-  private final Accumulator[] _accumulators;
-  private final Map<Key, Object[]> _groupByKeyHolder;
   private TransferableBlock _upstreamErrorBlock;
-
   private boolean _readyToConstruct;
   private boolean _hasReturnedAggregateBlock;
 
-  // TODO: Move to OperatorContext class.
-  private OperatorStats _operatorStats;
+  private final boolean _isGroupByAggregation;
+  private MultistageAggregationExecutor _aggregationExecutor;
+  private MultistageGroupByExecutor _groupByExecutor;
 
   // TODO: refactor Pinot Reducer code to support the intermediate stage agg operator.
   // aggCalls has to be a list of FunctionCall and cannot be null
   // groupSet has to be a list of InputRef and cannot be null
   // TODO: Add these two checks when we confirm we can handle error in upstream ctor call.
-  public AggregateOperator(MultiStageOperator inputOperator, DataSchema dataSchema, List<RexExpression> aggCalls,
-      List<RexExpression> groupSet, DataSchema inputSchema, long requestId, int stageId) {
-    this(inputOperator, dataSchema, aggCalls, groupSet, inputSchema, AggregateOperator.Accumulator.MERGERS, requestId,
-        stageId);
+  public AggregateOperator(OpChainExecutionContext context, MultiStageOperator inputOperator,
+      DataSchema resultSchema, DataSchema inputSchema, List<RexExpression> aggCalls, List<RexExpression> groupSet,
+      AggType aggType) {
+    this(context, inputOperator, resultSchema, inputSchema, aggCalls, groupSet, aggType,
+        new AbstractPlanNode.NodeHint());
   }
 
   @VisibleForTesting
-  AggregateOperator(MultiStageOperator inputOperator, DataSchema dataSchema, List<RexExpression> aggCalls,
-      List<RexExpression> groupSet, DataSchema inputSchema,
-      Map<String, Function<DataSchema.ColumnDataType, Merger>> mergers, long requestId, int stageId) {
+  public AggregateOperator(OpChainExecutionContext context, MultiStageOperator inputOperator,
+      DataSchema resultSchema, DataSchema inputSchema, List<RexExpression> aggCalls, List<RexExpression> groupSet,
+      AggType aggType, AbstractPlanNode.NodeHint nodeHint) {
+    super(context);
     _inputOperator = inputOperator;
-    _groupSet = groupSet;
+    _resultSchema = resultSchema;
+    _inputSchema = inputSchema;
+    _aggType = aggType;
+    if (nodeHint != null && nodeHint._hintOptions != null
+        && nodeHint._hintOptions.get(PinotHintOptions.INTERNAL_AGG_OPTIONS) != null) {
+      _aggCallSignatureMap = LiteralHintUtils.hintStringToLiteralMap(nodeHint._hintOptions
+          .get(PinotHintOptions.INTERNAL_AGG_OPTIONS)
+          .get(PinotHintOptions.InternalAggregateOptions.AGG_CALL_SIGNATURE));
+    } else {
+      _aggCallSignatureMap = Collections.emptyMap();
+    }
+
     _upstreamErrorBlock = null;
+    _readyToConstruct = false;
+    _hasReturnedAggregateBlock = false;
+    _colNameToIndexMap = new HashMap<>();
 
-    // we expect all agg calls to be aggregate function calls
-    _aggCalls = aggCalls.stream().map(RexExpression.FunctionCall.class::cast).collect(Collectors.toList());
+    // Convert groupSet to ExpressionContext that our aggregation functions understand.
+    List<ExpressionContext> groupByExpr = getGroupSet(groupSet);
+    List<FunctionContext> functionContexts = getFunctionContexts(aggCalls);
+    AggregationFunction[] aggFunctions = new AggregationFunction[functionContexts.size()];
 
-    _accumulators = new Accumulator[_aggCalls.size()];
-    for (int i = 0; i < _aggCalls.size(); i++) {
-      RexExpression.FunctionCall agg = _aggCalls.get(i);
-      String functionName = agg.getFunctionName();
-      if (!mergers.containsKey(functionName)) {
-        throw new IllegalStateException("Unexpected value: " + functionName);
-      }
-      _accumulators[i] = new Accumulator(agg, mergers, functionName, inputSchema);
+    for (int i = 0; i < functionContexts.size(); i++) {
+      aggFunctions[i] = AggregationFunctionFactory.getAggregationFunction(functionContexts.get(i), true);
     }
 
-    _groupByKeyHolder = new HashMap<>();
-    _resultSchema = dataSchema;
-    _readyToConstruct = false;
-    _hasReturnedAggregateBlock = false;
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
+    // Initialize the appropriate executor.
+    if (!groupSet.isEmpty()) {
+      _isGroupByAggregation = true;
+      _groupByExecutor = new MultistageGroupByExecutor(groupByExpr, aggFunctions, aggType, _colNameToIndexMap,
+          _resultSchema);
+    } else {
+      _isGroupByAggregation = false;
+      _aggregationExecutor = new MultistageAggregationExecutor(aggFunctions, aggType, _colNameToIndexMap,
+          _resultSchema);
+    }
   }
 
   @Override
@@ -122,15 +153,11 @@ public List<MultiStageOperator> getChildOperators() {
   @Nullable
   @Override
   public String toExplainString() {
-    // TODO: move to close call;
-    _inputOperator.toExplainString();
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    _operatorStats.startTimer();
     try {
       if (!_readyToConstruct && !consumeInputBlocks()) {
         return TransferableBlockUtils.getNoOpTransferableBlock();
@@ -148,27 +175,21 @@ protected TransferableBlock getNextBlock() {
       }
     } catch (Exception e) {
       return TransferableBlockUtils.getErrorTransferableBlock(e);
-    } finally {
-      _operatorStats.endTimer();
     }
   }
 
   private TransferableBlock produceAggregatedBlock() {
-    List<Object[]> rows = new ArrayList<>(_groupByKeyHolder.size());
-    for (Map.Entry<Key, Object[]> e : _groupByKeyHolder.entrySet()) {
-      Object[] row = new Object[_aggCalls.size() + _groupSet.size()];
-      Object[] keyElements = e.getValue();
-      System.arraycopy(keyElements, 0, row, 0, keyElements.length);
-      for (int i = 0; i < _accumulators.length; i++) {
-        row[i + _groupSet.size()] = _accumulators[i]._results.get(e.getKey());
-      }
-      rows.add(row);
-    }
+    List<Object[]> rows = _isGroupByAggregation ? _groupByExecutor.getResult() : _aggregationExecutor.getResult();
+
     _hasReturnedAggregateBlock = true;
     if (rows.size() == 0) {
-      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+      if (!_isGroupByAggregation) {
+        Object[] row = _aggregationExecutor.constructEmptyAggResultRow();
+        return new TransferableBlock(Collections.singletonList(row), _resultSchema, DataBlock.Type.ROW);
+      } else {
+        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+      }
     } else {
-      _operatorStats.recordOutput(1, rows.size());
       return new TransferableBlock(rows, _resultSchema, DataBlock.Type.ROW);
     }
   }
@@ -177,9 +198,7 @@ private TransferableBlock produceAggregatedBlock() {
    * @return whether or not the operator is ready to move on (EOS or ERROR)
    */
   private boolean consumeInputBlocks() {
-    _operatorStats.endTimer();
     TransferableBlock block = _inputOperator.nextBlock();
-    _operatorStats.startTimer();
     while (!block.isNoOpBlock()) {
       // setting upstream error block
       if (block.isErrorBlock()) {
@@ -190,167 +209,147 @@ private boolean consumeInputBlocks() {
         return true;
       }
 
-      List<Object[]> container = block.getContainer();
-      for (Object[] row : container) {
-        Key key = extraRowKey(row, _groupSet);
-        _groupByKeyHolder.put(key, key.getValues());
-        for (int i = 0; i < _aggCalls.size(); i++) {
-          _accumulators[i].accumulate(key, row);
-        }
+      if (_isGroupByAggregation) {
+        _groupByExecutor.processBlock(block, _inputSchema);
+      } else {
+        _aggregationExecutor.processBlock(block, _inputSchema);
       }
-      _operatorStats.recordInput(1, container.size());
-      _operatorStats.endTimer();
+
       block = _inputOperator.nextBlock();
-      _operatorStats.startTimer();
     }
     return false;
   }
 
-  private static Key extraRowKey(Object[] row, List<RexExpression> groupSet) {
-    Object[] keyElements = new Object[groupSet.size()];
-    for (int i = 0; i < groupSet.size(); i++) {
-      keyElements[i] = row[((RexExpression.InputRef) groupSet.get(i)).getIndex()];
+  private List<FunctionContext> getFunctionContexts(List<RexExpression> aggCalls) {
+    List<RexExpression.FunctionCall> aggFunctionCalls =
+        aggCalls.stream().map(RexExpression.FunctionCall.class::cast).collect(Collectors.toList());
+    List<FunctionContext> functionContexts = new ArrayList<>();
+    for (int aggIdx = 0; aggIdx < aggFunctionCalls.size(); aggIdx++) {
+      RexExpression.FunctionCall functionCall = aggFunctionCalls.get(aggIdx);
+      FunctionContext funcContext = convertRexExpressionsToFunctionContext(aggIdx, functionCall);
+      functionContexts.add(funcContext);
     }
-    return new Key(keyElements);
-  }
-
-  private static Object mergeSum(Object left, Object right) {
-    return ((Number) left).doubleValue() + ((Number) right).doubleValue();
-  }
-
-  private static Object mergeMin(Object left, Object right) {
-    return Math.min(((Number) left).doubleValue(), ((Number) right).doubleValue());
+    return functionContexts;
   }
 
-  private static Object mergeMax(Object left, Object right) {
-    return Math.max(((Number) left).doubleValue(), ((Number) right).doubleValue());
-  }
+  private FunctionContext convertRexExpressionsToFunctionContext(int aggIdx,
+      RexExpression.FunctionCall aggFunctionCall) {
+    // Extract details from RexExpression aggFunctionCall.
+    String functionName = aggFunctionCall.getFunctionName();
+    List<RexExpression> functionOperands = aggFunctionCall.getFunctionOperands();
+
+    List<ExpressionContext> aggArguments = new ArrayList<>();
+    for (int argIdx = 0; argIdx < functionOperands.size(); argIdx++) {
+      RexExpression operand = functionOperands.get(argIdx);
+      ExpressionContext exprContext = convertRexExpressionToExpressionContext(aggIdx, argIdx, operand);
+      aggArguments.add(exprContext);
+    }
 
-  private static Object mergeCount(Object left, Object ignored) {
-    // TODO: COUNT(*) doesn't need to parse right object until we support NULL
-    return ((Number) left).doubleValue() + 1;
-  }
+    // add additional arguments for aggFunctionCall
+    if (_aggType.isInputIntermediateFormat()) {
+      rewriteAggArgumentForIntermediateInput(aggArguments, aggIdx);
+    }
+    // This can only be true for COUNT aggregation functions on intermediate stage.
+    // The literal value here does not matter. We create a dummy literal here just so that the count aggregation
+    // has some column to process.
+    if (aggArguments.isEmpty()) {
+      aggArguments.add(ExpressionContext.forIdentifier("__PLACEHOLDER__"));
+    }
 
-  private static Boolean mergeBoolAnd(Object left, Object right) {
-    return ((Boolean) left) && ((Boolean) right);
+    return new FunctionContext(FunctionContext.Type.AGGREGATION, functionName, aggArguments);
   }
 
-  private static Boolean mergeBoolOr(Object left, Object right) {
-    return ((Boolean) left) || ((Boolean) right);
+  private void rewriteAggArgumentForIntermediateInput(List<ExpressionContext> aggArguments, int aggIdx) {
+    Map<Integer, Literal> aggCallSignature = _aggCallSignatureMap.get(aggIdx);
+    if (aggCallSignature != null && !aggCallSignature.isEmpty()) {
+      int argListSize = aggCallSignature.get(-1).getIntValue();
+      for (int argIdx = 1; argIdx < argListSize; argIdx++) {
+        Literal aggIdxLiteral = aggCallSignature.get(argIdx);
+        if (aggIdxLiteral != null) {
+          aggArguments.add(ExpressionContext.forLiteralContext(aggIdxLiteral));
+        } else {
+          aggArguments.add(ExpressionContext.forIdentifier("__PLACEHOLDER__"));
+        }
+      }
+    }
   }
 
-  // NOTE: the below two classes are needed depending on where the
-  // fourth moment is being executed - if the leaf stage gets a
-  // fourth moment pushed down to it, it will return a PinotFourthMoment
-  // as the result of the aggregation. If it is not possible (e.g. the
-  // input to the aggregate requires the result of a JOIN - such as
-  // FOURTHMOMENT(t1.a + t2.a)) then the input to the aggregate in the
-  // intermediate stage is a numeric.
-
-  private static class MergeFourthMomentNumeric implements Merger {
-
-    @Override
-    public Object merge(Object left, Object right) {
-      ((PinotFourthMoment) left).increment(((Number) right).doubleValue());
-      return left;
+  private List<ExpressionContext> getGroupSet(List<RexExpression> groupBySetRexExpr) {
+    List<ExpressionContext> groupByExprContext = new ArrayList<>();
+    for (RexExpression groupByRexExpr : groupBySetRexExpr) {
+      ExpressionContext exprContext = convertRexExpressionToExpressionContext(-1, -1, groupByRexExpr);
+      groupByExprContext.add(exprContext);
     }
 
-    @Override
-    public Object initialize(Object other) {
-      PinotFourthMoment moment = new PinotFourthMoment();
-      moment.increment(((Number) other).doubleValue());
-      return moment;
-    }
+    return groupByExprContext;
   }
 
-  private static class MergeFourthMomentObject implements Merger {
-
-    @Override
-    public Object merge(Object left, Object right) {
-      PinotFourthMoment agg = (PinotFourthMoment) left;
-      agg.combine((PinotFourthMoment) right);
-      return agg;
+  private ExpressionContext convertRexExpressionToExpressionContext(int aggIdx, int argIdx, RexExpression rexExpr) {
+    ExpressionContext exprContext;
+    if (_aggCallSignatureMap.get(aggIdx) != null && _aggCallSignatureMap.get(aggIdx).get(argIdx) != null) {
+      return ExpressionContext.forLiteralContext(_aggCallSignatureMap.get(aggIdx).get(argIdx));
     }
-  }
 
-  interface Merger {
-    /**
-     * Initializes the merger based on the first input
-     */
-    default Object initialize(Object other) {
-      return other;
+    // This is used only for aggregation arguments and groupby columns. The rexExpression can never be a function type.
+    switch (rexExpr.getKind()) {
+      case INPUT_REF: {
+        RexExpression.InputRef inputRef = (RexExpression.InputRef) rexExpr;
+        int identifierIndex = inputRef.getIndex();
+        String columnName = _inputSchema.getColumnName(identifierIndex);
+        // Calcite generates unique column names for aggregation functions. For example, select avg(col1), sum(col1)
+        // will generate names $f0 and $f1 for avg and sum respectively. We use a map to store the name -> index
+        // mapping to extract the required column value from row-based container and fetch the input datatype for the
+        // column.
+        _colNameToIndexMap.put(columnName, identifierIndex);
+        exprContext = ExpressionContext.forIdentifier(columnName);
+        break;
+      }
+      case LITERAL: {
+        RexExpression.Literal literalRexExp = (RexExpression.Literal) rexExpr;
+        Object value = literalRexExp.getValue();
+        exprContext = ExpressionContext.forLiteralContext(literalRexExp.getDataType(), value);
+        break;
+      }
+      default:
+        throw new IllegalStateException("Aggregation Function operands or GroupBy columns cannot be a function.");
     }
 
-    /**
-     * Merges the existing aggregate (the result of {@link #initialize(Object)}) with
-     * the new value coming in (which may be an aggregate in and of itself).
-     */
-    Object merge(Object agg, Object value);
+    return exprContext;
   }
 
-  private static class Accumulator {
-    private static final Map<String, Function<DataSchema.ColumnDataType, Merger>> MERGERS =
-        ImmutableMap.<String, Function<DataSchema.ColumnDataType, Merger>>builder()
-            .put("SUM", cdt -> AggregateOperator::mergeSum).put("$SUM", cdt -> AggregateOperator::mergeSum)
-            .put("$SUM0", cdt -> AggregateOperator::mergeSum).put("MIN", cdt -> AggregateOperator::mergeMin)
-            .put("$MIN", cdt -> AggregateOperator::mergeMin).put("$MIN0", cdt -> AggregateOperator::mergeMin)
-            .put("MAX", cdt -> AggregateOperator::mergeMax).put("$MAX", cdt -> AggregateOperator::mergeMax)
-            .put("$MAX0", cdt -> AggregateOperator::mergeMax).put("COUNT", cdt -> AggregateOperator::mergeCount)
-            .put("BOOL_AND", cdt -> AggregateOperator::mergeBoolAnd)
-            .put("$BOOL_AND", cdt -> AggregateOperator::mergeBoolAnd)
-            .put("$BOOL_AND0", cdt -> AggregateOperator::mergeBoolAnd)
-            .put("BOOL_OR", cdt -> AggregateOperator::mergeBoolOr)
-            .put("$BOOL_OR", cdt -> AggregateOperator::mergeBoolOr)
-            .put("$BOOL_OR0", cdt -> AggregateOperator::mergeBoolOr).put("FOURTHMOMENT",
-                cdt -> cdt == DataSchema.ColumnDataType.OBJECT ? new MergeFourthMomentObject()
-                    : new MergeFourthMomentNumeric()).put("$FOURTHMOMENT",
-                cdt -> cdt == DataSchema.ColumnDataType.OBJECT ? new MergeFourthMomentObject()
-                    : new MergeFourthMomentNumeric()).put("$FOURTHMOMENT0",
-                cdt -> cdt == DataSchema.ColumnDataType.OBJECT ? new MergeFourthMomentObject()
-                    : new MergeFourthMomentNumeric()).build();
-
-    final int _inputRef;
-    final Object _literal;
-    final Map<Key, Object> _results = new HashMap<>();
-    final Merger _merger;
-
-    Accumulator(RexExpression.FunctionCall aggCall, Map<String, Function<DataSchema.ColumnDataType, Merger>> merger,
-        String functionName, DataSchema inputSchema) {
-      // agg function operand should either be a InputRef or a Literal
-      DataSchema.ColumnDataType dataType;
-      RexExpression rexExpression = toAggregationFunctionOperand(aggCall);
-      if (rexExpression instanceof RexExpression.InputRef) {
-        _inputRef = ((RexExpression.InputRef) rexExpression).getIndex();
-        _literal = null;
-        dataType = inputSchema.getColumnDataType(_inputRef);
-      } else {
-        _inputRef = -1;
-        _literal = ((RexExpression.Literal) rexExpression).getValue();
-        dataType = DataSchema.ColumnDataType.fromDataType(rexExpression.getDataType(), false);
-      }
-      _merger = merger.get(functionName).apply(dataType);
+  // TODO: If the previous block is not mailbox received, this method is not efficient.  Then getDataBlock() will
+  //  convert the unserialized format to serialized format of BaseDataBlock. Then it will convert it back to column
+  //  value primitive type.
+  static Map<ExpressionContext, BlockValSet> getBlockValSetMap(AggregationFunction aggFunction,
+      TransferableBlock block, DataSchema inputDataSchema, Map<String, Integer> colNameToIndexMap) {
+    List<ExpressionContext> expressions = aggFunction.getInputExpressions();
+    int numExpressions = expressions.size();
+    if (numExpressions == 0) {
+      return Collections.emptyMap();
     }
 
-    void accumulate(Key key, Object[] row) {
-      Map<Key, Object> keys = _results;
-
-      // TODO: fix that single agg result (original type) has different type from multiple agg results (double).
-      Object currentRes = keys.get(key);
-      Object value = _inputRef == -1 ? _literal : row[_inputRef];
-
-      if (currentRes == null) {
-        keys.put(key, _merger.initialize(value));
-      } else {
-        Object mergedResult = _merger.merge(currentRes, value);
-        _results.put(key, mergedResult);
+    Map<ExpressionContext, BlockValSet> blockValSetMap = new HashMap<>();
+    for (ExpressionContext expression : expressions) {
+      if (expression.getType().equals(ExpressionContext.Type.IDENTIFIER)
+          && !"__PLACEHOLDER__".equals(expression.getIdentifier())) {
+        int index = colNameToIndexMap.get(expression.getIdentifier());
+        DataSchema.ColumnDataType dataType = inputDataSchema.getColumnDataType(index);
+        Preconditions.checkState(block.getType().equals(DataBlock.Type.ROW), "Datablock type is not ROW");
+        blockValSetMap.put(expression, new IntermediateStageBlockValSet(dataType, block.getDataBlock(), index));
       }
     }
+    return blockValSetMap;
+  }
 
-    private RexExpression toAggregationFunctionOperand(RexExpression.FunctionCall rexExpression) {
-      List<RexExpression> functionOperands = rexExpression.getFunctionOperands();
-      Preconditions.checkState(functionOperands.size() < 2, "aggregate functions cannot have more than one operand");
-      return functionOperands.size() > 0 ? functionOperands.get(0)
-          : new RexExpression.Literal(FieldSpec.DataType.INT, 1);
+  static Object extractValueFromRow(AggregationFunction aggregationFunction, Object[] row,
+      Map<String, Integer> colNameToIndexMap) {
+    List<ExpressionContext> expressions = aggregationFunction.getInputExpressions();
+    ExpressionContext expr = expressions.get(0);
+    ExpressionContext.Type exprType = expr.getType();
+    if (exprType == ExpressionContext.Type.IDENTIFIER) {
+      return row[colNameToIndexMap.get(expr.getIdentifier())];
     }
+    Preconditions.checkState(exprType == ExpressionContext.Type.LITERAL, "Unsupported expression type: %s", exprType);
+    return expr.getLiteral().getValue();
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/BaseMailboxReceiveOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/BaseMailboxReceiveOperator.java
new file mode 100644
index 00000000000..97ae1a5e802
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/BaseMailboxReceiveOperator.java
@@ -0,0 +1,98 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayDeque;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.pinot.query.mailbox.MailboxIdUtils;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.mailbox.ReceivingMailbox;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+
+
+/**
+ * Base class to be used by the various MailboxReceiveOperators such as the sorted and non-sorted versions. This
+ * class contains the common logic needed for MailboxReceive
+ *
+ * BaseMailboxReceiveOperator receives mailbox from mailboxService from sendingStageInstances.
+ * We use sendingStageInstance to deduce mailboxId and fetch the content from mailboxService.
+ * When exchangeType is Singleton, we find the mapping mailbox for the mailboxService. If not found, use empty list.
+ * When exchangeType is non-Singleton, we pull from each instance in round-robin way to get matched mailbox content.
+ */
+public abstract class BaseMailboxReceiveOperator extends MultiStageOperator {
+  protected final MailboxService _mailboxService;
+  protected final RelDistribution.Type _exchangeType;
+  protected final List<String> _mailboxIds;
+  protected final Deque<ReceivingMailbox> _mailboxes;
+
+  public BaseMailboxReceiveOperator(OpChainExecutionContext context, RelDistribution.Type exchangeType,
+      int senderStageId) {
+    super(context);
+    _mailboxService = context.getMailboxService();
+    Preconditions.checkState(MailboxSendOperator.SUPPORTED_EXCHANGE_TYPES.contains(exchangeType),
+        "Unsupported exchange type: %s", exchangeType);
+    _exchangeType = exchangeType;
+
+    long requestId = context.getRequestId();
+    int workerId = context.getServer().workerId();
+    MailboxMetadata senderMailBoxMetadatas =
+        context.getStageMetadata().getWorkerMetadataList().get(workerId).getMailBoxInfosMap().get(senderStageId);
+    Preconditions.checkState(senderMailBoxMetadatas != null && !senderMailBoxMetadatas.getMailBoxIdList().isEmpty(),
+        "Failed to find mailbox for stage: %s",
+        senderStageId);
+    _mailboxIds = MailboxIdUtils.toMailboxIds(requestId, senderMailBoxMetadatas);
+    _mailboxes = _mailboxIds.stream()
+        .map(mailboxId -> _mailboxService.getReceivingMailbox(mailboxId))
+        .collect(Collectors.toCollection(ArrayDeque::new));
+  }
+
+  public List<String> getMailboxIds() {
+    return _mailboxIds;
+  }
+
+  @Override
+  public List<MultiStageOperator> getChildOperators() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public void close() {
+    super.close();
+    cancelRemainingMailboxes();
+  }
+
+  @Override
+  public void cancel(Throwable t) {
+    super.cancel(t);
+    cancelRemainingMailboxes();
+  }
+
+  protected void cancelRemainingMailboxes() {
+    ReceivingMailbox mailbox;
+    while ((mailbox = _mailboxes.poll()) != null) {
+      mailbox.cancel();
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/FilterOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/FilterOperator.java
index 6f57ece6dfe..d2ec50129d6 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/FilterOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/FilterOperator.java
@@ -28,7 +28,8 @@
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.query.runtime.operator.operands.TransformOperand;
-import org.apache.pinot.query.runtime.operator.utils.FunctionInvokeUtils;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,16 +55,13 @@ public class FilterOperator extends MultiStageOperator {
   private final DataSchema _dataSchema;
   private TransferableBlock _upstreamErrorBlock;
 
-  // TODO: Move to OperatorContext class.
-  private OperatorStats _operatorStats;
-
-  public FilterOperator(MultiStageOperator upstreamOperator, DataSchema dataSchema, RexExpression filter,
-      long requestId, int stageId) {
+  public FilterOperator(OpChainExecutionContext context, MultiStageOperator upstreamOperator, DataSchema dataSchema,
+      RexExpression filter) {
+    super(context);
     _upstreamOperator = upstreamOperator;
     _dataSchema = dataSchema;
     _filterOperand = TransformOperand.toTransformOperand(filter, dataSchema);
     _upstreamErrorBlock = null;
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
   }
 
   @Override
@@ -74,23 +72,16 @@ public List<MultiStageOperator> getChildOperators() {
   @Nullable
   @Override
   public String toExplainString() {
-    _upstreamOperator.toExplainString();
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    _operatorStats.startTimer();
     try {
-      _operatorStats.endTimer();
       TransferableBlock block = _upstreamOperator.nextBlock();
-      _operatorStats.startTimer();
       return transform(block);
     } catch (Exception e) {
       return TransferableBlockUtils.getErrorTransferableBlock(e);
-    } finally {
-      _operatorStats.endTimer();
     }
   }
 
@@ -109,12 +100,10 @@ private TransferableBlock transform(TransferableBlock block)
     List<Object[]> resultRows = new ArrayList<>();
     List<Object[]> container = block.getContainer();
     for (Object[] row : container) {
-      if ((Boolean) FunctionInvokeUtils.convert(_filterOperand.apply(row), DataSchema.ColumnDataType.BOOLEAN)) {
+      if ((Boolean) TypeUtils.convert(_filterOperand.apply(row), DataSchema.ColumnDataType.BOOLEAN)) {
         resultRows.add(row);
       }
     }
-    _operatorStats.recordInput(1, container.size());
-    _operatorStats.recordOutput(1, resultRows.size());
     return new TransferableBlock(resultRows, _dataSchema, DataBlock.Type.ROW);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
index b4e88965cb1..f9ade5a99c2 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/HashJoinOperator.java
@@ -34,11 +34,12 @@
 import org.apache.pinot.core.data.table.Key;
 import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.planner.stage.JoinNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.query.runtime.operator.operands.TransformOperand;
-import org.apache.pinot.query.runtime.operator.utils.FunctionInvokeUtils;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,12 +59,13 @@
 // TODO: Move inequi out of hashjoin. (https://github.com/apache/pinot/issues/9728)
 public class HashJoinOperator extends MultiStageOperator {
   private static final String EXPLAIN_NAME = "HASH_JOIN";
+  private static final int INITIAL_HEURISTIC_SIZE = 16;
   private static final Logger LOGGER = LoggerFactory.getLogger(AggregateOperator.class);
 
-  private static final Set<JoinRelType> SUPPORTED_JOIN_TYPES =
-      ImmutableSet.of(JoinRelType.INNER, JoinRelType.LEFT, JoinRelType.RIGHT, JoinRelType.FULL);
+  private static final Set<JoinRelType> SUPPORTED_JOIN_TYPES = ImmutableSet.of(
+      JoinRelType.INNER, JoinRelType.LEFT, JoinRelType.RIGHT, JoinRelType.FULL, JoinRelType.SEMI, JoinRelType.ANTI);
 
-  private final HashMap<Key, List<Object[]>> _broadcastRightTable;
+  private final HashMap<Key, ArrayList<Object[]>> _broadcastRightTable;
 
   // Used to track matched right rows.
   // Only used for right join and full join to output non-matched right rows.
@@ -74,8 +76,8 @@ public class HashJoinOperator extends MultiStageOperator {
   private final MultiStageOperator _rightTableOperator;
   private final JoinRelType _joinType;
   private final DataSchema _resultSchema;
-  private final int _leftRowSize;
-  private final int _resultRowSize;
+  private final int _leftColumnSize;
+  private final int _resultColumnSize;
   private final List<TransformOperand> _joinClauseEvaluators;
   private boolean _isHashTableBuilt;
 
@@ -87,10 +89,9 @@ public class HashJoinOperator extends MultiStageOperator {
   private KeySelector<Object[], Object[]> _leftKeySelector;
   private KeySelector<Object[], Object[]> _rightKeySelector;
 
-  private OperatorStats _operatorStats;
-
-  public HashJoinOperator(MultiStageOperator leftTableOperator, MultiStageOperator rightTableOperator,
-      DataSchema leftSchema, JoinNode node, long requestId, int stageId) {
+  public HashJoinOperator(OpChainExecutionContext context, MultiStageOperator leftTableOperator,
+      MultiStageOperator rightTableOperator, DataSchema leftSchema, JoinNode node) {
+    super(context);
     Preconditions.checkState(SUPPORTED_JOIN_TYPES.contains(node.getJoinRelType()),
         "Join type: " + node.getJoinRelType() + " is not supported!");
     _joinType = node.getJoinRelType();
@@ -98,12 +99,13 @@ public HashJoinOperator(MultiStageOperator leftTableOperator, MultiStageOperator
     _rightKeySelector = node.getJoinKeys().getRightJoinKeySelector();
     Preconditions.checkState(_leftKeySelector != null, "LeftKeySelector for join cannot be null");
     Preconditions.checkState(_rightKeySelector != null, "RightKeySelector for join cannot be null");
-    _leftRowSize = leftSchema.size();
-    Preconditions.checkState(_leftRowSize > 0, "leftRowSize has to be greater than zero:" + _leftRowSize);
+    _leftColumnSize = leftSchema.size();
+    Preconditions.checkState(_leftColumnSize > 0, "leftColumnSize has to be greater than zero:" + _leftColumnSize);
     _resultSchema = node.getDataSchema();
-    _resultRowSize = _resultSchema.size();
-    Preconditions.checkState(_resultRowSize > _leftRowSize,
-        "Result row size" + _leftRowSize + " has to be greater than left row size:" + _leftRowSize);
+    _resultColumnSize = _resultSchema.size();
+    Preconditions.checkState(_resultColumnSize >= _leftColumnSize,
+        "Result column size" + _leftColumnSize + " has to be greater than or equal to left column size:"
+            + _leftColumnSize);
     _leftTableOperator = leftTableOperator;
     _rightTableOperator = rightTableOperator;
     _joinClauseEvaluators = new ArrayList<>(node.getJoinClauses().size());
@@ -118,7 +120,6 @@ public HashJoinOperator(MultiStageOperator leftTableOperator, MultiStageOperator
       _matchedRightRows = null;
     }
     _upstreamErrorBlock = null;
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
   }
 
   // TODO: Separate left and right table operator.
@@ -130,15 +131,11 @@ public List<MultiStageOperator> getChildOperators() {
   @Nullable
   @Override
   public String toExplainString() {
-    _leftTableOperator.toExplainString();
-    _rightTableOperator.toExplainString();
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    _operatorStats.startTimer();
     try {
       if (_isTerminated) {
         return TransferableBlockUtils.getEndOfStreamTransferableBlock();
@@ -152,22 +149,16 @@ protected TransferableBlock getNextBlock() {
       } else if (!_isHashTableBuilt) {
         return TransferableBlockUtils.getNoOpTransferableBlock();
       }
-      _operatorStats.endTimer();
       TransferableBlock leftBlock = _leftTableOperator.nextBlock();
-      _operatorStats.startTimer();
       // JOIN each left block with the right block.
       return buildJoinedDataBlock(leftBlock);
     } catch (Exception e) {
       return TransferableBlockUtils.getErrorTransferableBlock(e);
-    } finally {
-      _operatorStats.endTimer();
     }
   }
 
   private void buildBroadcastHashTable() {
-    _operatorStats.endTimer();
     TransferableBlock rightBlock = _rightTableOperator.nextBlock();
-    _operatorStats.startTimer();
     while (!rightBlock.isNoOpBlock()) {
       if (rightBlock.isErrorBlock()) {
         _upstreamErrorBlock = rightBlock;
@@ -180,14 +171,15 @@ private void buildBroadcastHashTable() {
       List<Object[]> container = rightBlock.getContainer();
       // put all the rows into corresponding hash collections keyed by the key selector function.
       for (Object[] row : container) {
-        List<Object[]> hashCollection =
-            _broadcastRightTable.computeIfAbsent(new Key(_rightKeySelector.getKey(row)), k -> new ArrayList<>());
+        ArrayList<Object[]> hashCollection = _broadcastRightTable.computeIfAbsent(
+            new Key(_rightKeySelector.getKey(row)), k -> new ArrayList<>(INITIAL_HEURISTIC_SIZE));
+        int size = hashCollection.size();
+        if ((size & size - 1) == 0 && size < Integer.MAX_VALUE / 2) { // is power of 2
+          hashCollection.ensureCapacity(size << 1);
+        }
         hashCollection.add(row);
       }
-      _operatorStats.recordInput(1, container.size());
-      _operatorStats.endTimer();
       rightBlock = _rightTableOperator.nextBlock();
-      _operatorStats.startTimer();
     }
   }
 
@@ -198,13 +190,20 @@ private TransferableBlock buildJoinedDataBlock(TransferableBlock leftBlock)
       return _upstreamErrorBlock;
     }
     if (leftBlock.isNoOpBlock() || (leftBlock.isSuccessfulEndOfStreamBlock() && !needUnmatchedRightRows())) {
+      if (!leftBlock.getResultMetadata().isEmpty()) {
+      }
+
+      if (leftBlock.isSuccessfulEndOfStreamBlock()) {
+        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+      }
+
       return leftBlock;
     }
     // TODO: Moved to a different function.
     if (leftBlock.isSuccessfulEndOfStreamBlock() && needUnmatchedRightRows()) {
       // Return remaining non-matched rows for non-inner join.
       List<Object[]> returnRows = new ArrayList<>();
-      for (Map.Entry<Key, List<Object[]>> entry : _broadcastRightTable.entrySet()) {
+      for (Map.Entry<Key, ArrayList<Object[]>> entry : _broadcastRightTable.entrySet()) {
         Set<Integer> matchedIdx = _matchedRightRows.getOrDefault(entry.getKey(), new HashSet<>());
         List<Object[]> rightRows = entry.getValue();
         if (rightRows.size() == matchedIdx.size()) {
@@ -217,11 +216,49 @@ private TransferableBlock buildJoinedDataBlock(TransferableBlock leftBlock)
         }
       }
       _isTerminated = true;
-      _operatorStats.recordOutput(1, returnRows.size());
       return new TransferableBlock(returnRows, _resultSchema, DataBlock.Type.ROW);
     }
-    List<Object[]> rows = new ArrayList<>();
-    List<Object[]> container = leftBlock.isEndOfStreamBlock() ? new ArrayList<>() : leftBlock.getContainer();
+    List<Object[]> rows;
+    if (leftBlock.isEndOfStreamBlock()) {
+      rows = new ArrayList<>();
+    } else {
+      switch (_joinType) {
+        case SEMI: {
+          rows = buildJoinedDataBlockSemi(leftBlock);
+          break;
+        }
+        case ANTI: {
+          rows = buildJoinedDataBlockAnti(leftBlock);
+          break;
+        }
+        default: { // INNER, LEFT, RIGHT, FULL
+          rows = buildJoinedDataBlockDefault(leftBlock);
+          break;
+        }
+      }
+    }
+    return new TransferableBlock(rows, _resultSchema, DataBlock.Type.ROW);
+  }
+
+  private List<Object[]> buildJoinedDataBlockSemi(TransferableBlock leftBlock) {
+    List<Object[]> container = leftBlock.getContainer();
+    List<Object[]> rows = new ArrayList<>(container.size());
+
+    for (Object[] leftRow : container) {
+      Key key = new Key(_leftKeySelector.getKey(leftRow));
+      // SEMI-JOIN only checks existence of the key
+      if (_broadcastRightTable.containsKey(key)) {
+        rows.add(joinRow(leftRow, null));
+      }
+    }
+
+    return rows;
+  }
+
+  private List<Object[]> buildJoinedDataBlockDefault(TransferableBlock leftBlock) {
+    List<Object[]> container = leftBlock.getContainer();
+    ArrayList<Object[]> rows = new ArrayList<>(container.size());
+
     for (Object[] leftRow : container) {
       Key key = new Key(_leftKeySelector.getKey(leftRow));
       // NOTE: Empty key selector will always give same hash code.
@@ -233,12 +270,13 @@ private TransferableBlock buildJoinedDataBlock(TransferableBlock leftBlock)
         continue;
       }
       boolean hasMatchForLeftRow = false;
+      rows.ensureCapacity(rows.size() + matchedRightRows.size());
       for (int i = 0; i < matchedRightRows.size(); i++) {
         Object[] rightRow = matchedRightRows.get(i);
         // TODO: Optimize this to avoid unnecessary object copy.
         Object[] resultRow = joinRow(leftRow, rightRow);
         if (_joinClauseEvaluators.isEmpty() || _joinClauseEvaluators.stream().allMatch(
-            evaluator -> (Boolean) FunctionInvokeUtils.convert(evaluator.apply(resultRow),
+            evaluator -> (Boolean) TypeUtils.convert(evaluator.apply(resultRow),
                 DataSchema.ColumnDataType.BOOLEAN))) {
           rows.add(resultRow);
           hasMatchForLeftRow = true;
@@ -252,13 +290,26 @@ private TransferableBlock buildJoinedDataBlock(TransferableBlock leftBlock)
         rows.add(joinRow(leftRow, null));
       }
     }
-    _operatorStats.recordInput(1, container.size());
-    _operatorStats.recordOutput(1, rows.size());
-    return new TransferableBlock(rows, _resultSchema, DataBlock.Type.ROW);
+
+    return rows;
+  }
+
+  private List<Object[]> buildJoinedDataBlockAnti(TransferableBlock leftBlock) {
+    List<Object[]> container = leftBlock.getContainer();
+    List<Object[]> rows = new ArrayList<>(container.size());
+
+    for (Object[] leftRow : container) {
+      Key key = new Key(_leftKeySelector.getKey(leftRow));
+      // ANTI-JOIN only checks non-existence of the key
+      if (!_broadcastRightTable.containsKey(key)) {
+        rows.add(joinRow(leftRow, null));
+      }
+    }
+    return rows;
   }
 
   private Object[] joinRow(@Nullable Object[] leftRow, @Nullable Object[] rightRow) {
-    Object[] resultRow = new Object[_resultRowSize];
+    Object[] resultRow = new Object[_resultColumnSize];
     int idx = 0;
     if (leftRow != null) {
       for (Object obj : leftRow) {
@@ -266,7 +317,7 @@ private Object[] joinRow(@Nullable Object[] leftRow, @Nullable Object[] rightRow
       }
     }
     // This is needed since left row can be null and we need to advance the idx to the beginning of right row.
-    idx = _leftRowSize;
+    idx = _leftColumnSize;
     if (rightRow != null) {
       for (Object obj : rightRow) {
         resultRow[idx++] = obj;
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/IntersectOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/IntersectOperator.java
new file mode 100644
index 00000000000..b0ba3c6fa34
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/IntersectOperator.java
@@ -0,0 +1,49 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+
+
+/**
+ * Intersect operator.
+ */
+public class IntersectOperator extends SetOperator {
+  private static final String EXPLAIN_NAME = "INTERSECT";
+
+  public IntersectOperator(OpChainExecutionContext opChainExecutionContext, List<MultiStageOperator> upstreamOperators,
+      DataSchema dataSchema) {
+    super(opChainExecutionContext, upstreamOperators, dataSchema);
+  }
+
+  @Nullable
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+
+  @Override
+  protected boolean handleRowMatched(Object[] row) {
+    return _rightRowSet.remove(new Record(row));
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
index baf7373a072..1f7069ea456 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
@@ -24,8 +24,10 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.PriorityQueue;
+import java.util.function.Function;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.datablock.DataBlock;
 import org.apache.pinot.common.datablock.DataBlockUtils;
@@ -38,8 +40,11 @@
 import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.query.request.ServerQueryRequest;
 import org.apache.pinot.core.query.selection.SelectionOperatorUtils;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,21 +66,19 @@ public class LeafStageTransferableBlockOperator extends MultiStageOperator {
   private static final String EXPLAIN_NAME = "LEAF_STAGE_TRANSFER_OPERATOR";
   private static final Logger LOGGER = LoggerFactory.getLogger(LeafStageTransferableBlockOperator.class);
 
-  private final InstanceResponseBlock _errorBlock;
-  private final List<InstanceResponseBlock> _baseResultBlock;
+  private final LinkedList<ServerQueryRequest> _serverQueryRequestQueue;
   private final DataSchema _desiredDataSchema;
-  private int _currentIndex;
+  private final Function<ServerQueryRequest, InstanceResponseBlock> _processCall;
 
-  // TODO: Move to OperatorContext class.
-  private OperatorStats _operatorStats;
+  private InstanceResponseBlock _errorBlock;
 
-  public LeafStageTransferableBlockOperator(List<InstanceResponseBlock> baseResultBlock, DataSchema dataSchema,
-      long requestId, int stageId) {
-    _baseResultBlock = baseResultBlock;
+  public LeafStageTransferableBlockOperator(OpChainExecutionContext context,
+      Function<ServerQueryRequest, InstanceResponseBlock> processCall,
+      List<ServerQueryRequest> serverQueryRequestList, DataSchema dataSchema) {
+    super(context);
+    _processCall = processCall;
+    _serverQueryRequestQueue = new LinkedList<>(serverQueryRequestList);
     _desiredDataSchema = dataSchema;
-    _errorBlock = baseResultBlock.stream().filter(e -> !e.getExceptions().isEmpty()).findFirst().orElse(null);
-    _currentIndex = 0;
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
   }
 
   @Override
@@ -86,42 +89,53 @@ public List<MultiStageOperator> getChildOperators() {
   @Nullable
   @Override
   public String toExplainString() {
-    LOGGER.debug(_operatorStats.toString());
-    return EXPLAIN_NAME;
+      return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    try {
-      _operatorStats.startTimer();
-      if (_currentIndex < 0) {
-        throw new RuntimeException("Leaf transfer terminated. next block should no longer be called.");
-      }
-      if (_errorBlock != null) {
-        _currentIndex = -1;
-        return new TransferableBlock(DataBlockUtils.getErrorDataBlock(_errorBlock.getExceptions()));
+    if (_errorBlock != null) {
+      throw new RuntimeException("Leaf transfer terminated. next block should no longer be called.");
+    }
+    // runLeafStage
+    InstanceResponseBlock responseBlock = getNextBlockFromLeafStage();
+    if (responseBlock == null) {
+      // finished getting next block from leaf stage. returning EOS
+      return new TransferableBlock(DataBlockUtils.getEndOfStreamDataBlock());
+    } else if (!responseBlock.getExceptions().isEmpty()) {
+      // get error from leaf stage, return ERROR
+      _errorBlock = responseBlock;
+      return new TransferableBlock(DataBlockUtils.getErrorDataBlock(_errorBlock.getExceptions()));
+    } else {
+      // return normal block.
+      OperatorStats operatorStats = _opChainStats.getOperatorStats(_context, getOperatorId());
+      operatorStats.recordExecutionStats(responseBlock.getResponseMetadata());
+      if (responseBlock.getResultsBlock() != null && responseBlock.getResultsBlock().getNumRows() > 0) {
+        return composeTransferableBlock(responseBlock, _desiredDataSchema);
       } else {
-        if (_currentIndex < _baseResultBlock.size()) {
-          InstanceResponseBlock responseBlock = _baseResultBlock.get(_currentIndex++);
-          if (responseBlock.getResultsBlock() != null && responseBlock.getResultsBlock().getNumRows() > 0) {
-            _operatorStats.recordInput(1, responseBlock.getResultsBlock().getNumRows());
-            _operatorStats.recordOutput(1, responseBlock.getResultsBlock().getNumRows());
-            return composeTransferableBlock(responseBlock, _desiredDataSchema);
-          } else {
-            _operatorStats.recordInput(1, responseBlock.getResultsBlock().getNumRows());
-            _operatorStats.recordOutput(1, responseBlock.getResultsBlock().getNumRows());
-            return new TransferableBlock(Collections.emptyList(), _desiredDataSchema, DataBlock.Type.ROW);
-          }
-        } else {
-          _currentIndex = -1;
-          return new TransferableBlock(DataBlockUtils.getEndOfStreamDataBlock());
-        }
+        return new TransferableBlock(Collections.emptyList(), _desiredDataSchema, DataBlock.Type.ROW);
       }
-    } finally {
-      _operatorStats.endTimer();
     }
   }
 
+  private @Nullable InstanceResponseBlock getNextBlockFromLeafStage() {
+    if (!_serverQueryRequestQueue.isEmpty()) {
+      ServerQueryRequest request = _serverQueryRequestQueue.pop();
+      return _processCall.apply(request);
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Leaf stage operators should always collect stats for the tables used in queries
+   * Otherwise the Broker response will just contain zeros for every stat value
+   */
+  @Override
+  protected boolean shouldCollectStats() {
+    return true;
+  }
+
   /**
    * this is data transfer block compose method is here to ensure that V1 results match what the expected projection
    * schema in the calcite logical operator.
@@ -241,12 +255,12 @@ private static TransferableBlock composeColumnIndexedTransferableBlock(InstanceR
     List<Object[]> extractedRows = new ArrayList<>(resultRows.size());
     if (resultRows instanceof List) {
       for (Object[] row : resultRows) {
-        extractedRows.add(canonicalizeRow(row, desiredDataSchema, columnIndices));
+        extractedRows.add(TypeUtils.canonicalizeRow(row, desiredDataSchema, columnIndices));
       }
     } else if (resultRows instanceof PriorityQueue) {
       PriorityQueue<Object[]> priorityQueue = (PriorityQueue<Object[]>) resultRows;
       while (!priorityQueue.isEmpty()) {
-        extractedRows.add(canonicalizeRow(priorityQueue.poll(), desiredDataSchema, columnIndices));
+        extractedRows.add(TypeUtils.canonicalizeRow(priorityQueue.poll(), desiredDataSchema, columnIndices));
       }
     }
     return new TransferableBlock(extractedRows, desiredDataSchema, DataBlock.Type.ROW);
@@ -264,12 +278,12 @@ private static TransferableBlock composeDirectTransferableBlock(InstanceResponse
     List<Object[]> extractedRows = new ArrayList<>(resultRows.size());
     if (resultRows instanceof List) {
       for (Object[] orgRow : resultRows) {
-        extractedRows.add(canonicalizeRow(orgRow, desiredDataSchema));
+        extractedRows.add(TypeUtils.canonicalizeRow(orgRow, desiredDataSchema));
       }
     } else if (resultRows instanceof PriorityQueue) {
       PriorityQueue<Object[]> priorityQueue = (PriorityQueue<Object[]>) resultRows;
       while (!priorityQueue.isEmpty()) {
-        extractedRows.add(canonicalizeRow(priorityQueue.poll(), desiredDataSchema));
+        extractedRows.add(TypeUtils.canonicalizeRow(priorityQueue.poll(), desiredDataSchema));
       }
     } else {
       throw new UnsupportedOperationException("Unsupported collection type: " + resultRows.getClass());
@@ -286,41 +300,6 @@ private static boolean inOrder(int[] columnIndices) {
     return true;
   }
 
-  /**
-   * This util is used to canonicalize row generated from V1 engine, which is stored using
-   * {@link DataSchema#getStoredColumnDataTypes()} format. However, the transferable block ser/de stores data in the
-   * {@link DataSchema#getColumnDataTypes()} format.
-   *
-   * @param row un-canonicalize row.
-   * @param dataSchema data schema desired for the row.
-   * @return canonicalize row.
-   */
-  private static Object[] canonicalizeRow(Object[] row, DataSchema dataSchema) {
-    Object[] resultRow = new Object[row.length];
-    for (int colId = 0; colId < row.length; colId++) {
-      Object value = row[colId];
-      if (value != null) {
-        if (dataSchema.getColumnDataType(colId) == DataSchema.ColumnDataType.OBJECT) {
-          resultRow[colId] = value;
-        } else {
-          resultRow[colId] = dataSchema.getColumnDataType(colId).convert(value);
-        }
-      }
-    }
-    return resultRow;
-  }
-
-  private static Object[] canonicalizeRow(Object[] row, DataSchema dataSchema, int[] columnIndices) {
-    Object[] resultRow = new Object[columnIndices.length];
-    for (int colId = 0; colId < columnIndices.length; colId++) {
-      Object value = row[columnIndices[colId]];
-      if (value != null) {
-        resultRow[colId] = dataSchema.getColumnDataType(colId).convert(value);
-      }
-    }
-    return resultRow;
-  }
-
   private static boolean isDataSchemaColumnTypesCompatible(DataSchema.ColumnDataType[] desiredTypes,
       DataSchema.ColumnDataType[] givenTypes) {
     if (desiredTypes.length != givenTypes.length) {
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LiteralValueOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LiteralValueOperator.java
index 8fc160f2059..029e58e9a2a 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LiteralValueOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LiteralValueOperator.java
@@ -27,6 +27,7 @@
 import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,12 +40,10 @@ public class LiteralValueOperator extends MultiStageOperator {
   private final TransferableBlock _rexLiteralBlock;
   private boolean _isLiteralBlockReturned;
 
-  private OperatorStats _operatorStats;
-
-  public LiteralValueOperator(DataSchema dataSchema, List<List<RexExpression>> rexLiteralRows,
-      long requestId, int stageId) {
+  public LiteralValueOperator(OpChainExecutionContext context, DataSchema dataSchema,
+      List<List<RexExpression>> rexLiteralRows) {
+    super(context);
     _dataSchema = dataSchema;
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
     _rexLiteralBlock = constructBlock(rexLiteralRows);
     _isLiteralBlockReturned = false;
   }
@@ -57,22 +56,16 @@ public List<MultiStageOperator> getChildOperators() {
   @Nullable
   @Override
   public String toExplainString() {
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    try {
-      _operatorStats.startTimer();
-      if (!_isLiteralBlockReturned) {
-        _isLiteralBlockReturned = true;
-        return _rexLiteralBlock;
-      } else {
-        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
-      }
-    } finally {
-      _operatorStats.endTimer();
+    if (!_isLiteralBlockReturned) {
+      _isLiteralBlockReturned = true;
+      return _rexLiteralBlock;
+    } else {
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
     }
   }
 
@@ -85,8 +78,6 @@ private TransferableBlock constructBlock(List<List<RexExpression>> rexLiteralRow
       }
       blockContent.add(row);
     }
-    _operatorStats.recordInput(1, blockContent.size());
-    _operatorStats.recordOutput(1, blockContent.size());
     return new TransferableBlock(blockContent, _dataSchema, DataBlock.Type.ROW);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
index 8fb1d145c1d..549dac4e072 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperator.java
@@ -18,178 +18,69 @@
  */
 package org.apache.pinot.query.runtime.operator;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import javax.annotation.Nullable;
 import org.apache.calcite.rel.RelDistribution;
 import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.core.operator.BaseOperator;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
 import org.apache.pinot.query.mailbox.ReceivingMailbox;
-import org.apache.pinot.query.mailbox.ServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
-import org.apache.pinot.query.service.QueryConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 
 
 /**
  * This {@code MailboxReceiveOperator} receives data from a {@link ReceivingMailbox} and serve it out from the
- * {@link BaseOperator#getNextBlock()} API.
- *
- *  MailboxReceiveOperator receives mailbox from mailboxService from sendingStageInstances.
- *  We use sendingStageInstance to deduce mailboxId and fetch the content from mailboxService.
- *  When exchangeType is Singleton, we find the mapping mailbox for the mailboxService. If not found, use empty list.
- *  When exchangeType is non-Singleton, we pull from each instance in round-robin way to get matched mailbox content.
+ * {@link MultiStageOperator#getNextBlock()}()} API.
  */
-public class MailboxReceiveOperator extends MultiStageOperator {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxReceiveOperator.class);
+public class MailboxReceiveOperator extends BaseMailboxReceiveOperator {
   private static final String EXPLAIN_NAME = "MAILBOX_RECEIVE";
 
-  // TODO: Unify SUPPORTED_EXCHANGE_TYPES with MailboxSendOperator.
-  private static final Set<RelDistribution.Type> SUPPORTED_EXCHANGE_TYPES =
-      ImmutableSet.of(RelDistribution.Type.BROADCAST_DISTRIBUTED, RelDistribution.Type.HASH_DISTRIBUTED,
-          RelDistribution.Type.SINGLETON, RelDistribution.Type.RANDOM_DISTRIBUTED);
-
-  private final MailboxService<TransferableBlock> _mailboxService;
-  private final RelDistribution.Type _exchangeType;
-  private final List<MailboxIdentifier> _sendingMailbox;
-  private final long _deadlineTimestampNano;
-  private int _serverIdx;
-  private TransferableBlock _upstreamErrorBlock;
-  private OperatorStats _operatorStats;
-
-  private static MailboxIdentifier toMailboxId(ServerInstance fromInstance, long jobId, long stageId,
-      String receiveHostName, int receivePort) {
-    return new JsonMailboxIdentifier(
-        String.format("%s_%s", jobId, stageId),
-        new ServerAddress(fromInstance.getHostname(), fromInstance.getQueryMailboxPort()),
-        new ServerAddress(receiveHostName, receivePort));
-  }
-
-  // TODO: Move deadlineInNanoSeconds to OperatorContext.
-  public MailboxReceiveOperator(MailboxService<TransferableBlock> mailboxService,
-      List<ServerInstance> sendingStageInstances, RelDistribution.Type exchangeType, String receiveHostName,
-      int receivePort, long jobId, int stageId, Long timeoutMs) {
-    _mailboxService = mailboxService;
-    Preconditions.checkState(SUPPORTED_EXCHANGE_TYPES.contains(exchangeType),
-        "Exchange/Distribution type: " + exchangeType + " is not supported!");
-    long timeoutNano = (timeoutMs != null ? timeoutMs : QueryConfig.DEFAULT_MAILBOX_TIMEOUT_MS) * 1_000_000L;
-    _deadlineTimestampNano = timeoutNano + System.nanoTime();
-
-    _exchangeType = exchangeType;
-    if (_exchangeType == RelDistribution.Type.SINGLETON) {
-      ServerInstance singletonInstance = null;
-      for (ServerInstance serverInstance : sendingStageInstances) {
-        if (serverInstance.getHostname().equals(_mailboxService.getHostname())
-            && serverInstance.getQueryMailboxPort() == _mailboxService.getMailboxPort()) {
-          Preconditions.checkState(singletonInstance == null, "multiple instance found for singleton exchange type!");
-          singletonInstance = serverInstance;
-        }
-      }
-
-      if (singletonInstance == null) {
-        // TODO: fix WorkerManager assignment, this should not happen if we properly assign workers.
-        // see: https://github.com/apache/pinot/issues/9611
-        _sendingMailbox = Collections.emptyList();
-      } else {
-        _sendingMailbox =
-            Collections.singletonList(toMailboxId(singletonInstance, jobId, stageId, receiveHostName, receivePort));
-      }
-    } else {
-      _sendingMailbox = new ArrayList<>(sendingStageInstances.size());
-      for (ServerInstance instance : sendingStageInstances) {
-        _sendingMailbox.add(toMailboxId(instance, jobId, stageId, receiveHostName, receivePort));
-      }
-    }
-    _upstreamErrorBlock = null;
-    _serverIdx = 0;
-    _operatorStats = new OperatorStats(jobId, stageId, EXPLAIN_NAME);
-  }
-
-  public List<MailboxIdentifier> getSendingMailbox() {
-    return _sendingMailbox;
-  }
+  private TransferableBlock _errorBlock;
 
-  @Override
-  public List<MultiStageOperator> getChildOperators() {
-    return ImmutableList.of();
+  public MailboxReceiveOperator(OpChainExecutionContext context, RelDistribution.Type exchangeType, int senderStageId) {
+    super(context, exchangeType, senderStageId);
   }
 
-  @Nullable
   @Override
   public String toExplainString() {
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    try {
-      _operatorStats.startTimer();
-      if (_upstreamErrorBlock != null) {
-        return _upstreamErrorBlock;
-      } else if (System.nanoTime() >= _deadlineTimestampNano) {
-        return TransferableBlockUtils.getErrorTransferableBlock(QueryException.EXECUTION_TIMEOUT_ERROR);
-      }
+    if (_errorBlock != null) {
+      return _errorBlock;
+    }
+    if (System.currentTimeMillis() > _context.getDeadlineMs()) {
+      _errorBlock = TransferableBlockUtils.getErrorTransferableBlock(QueryException.EXECUTION_TIMEOUT_ERROR);
+      return _errorBlock;
+    }
 
-      int startingIdx = _serverIdx;
-      int openMailboxCount = 0;
-      int eosMailboxCount = 0;
+    // Poll from every mailbox in round-robin fashion:
+    // - Return the first content block
+    // - If no content block found but there are mailboxes not finished, return no-op block
+    // - If all content blocks are already returned, return end-of-stream block
+    int numMailboxes = _mailboxes.size();
+    for (int i = 0; i < numMailboxes; i++) {
+      ReceivingMailbox mailbox = _mailboxes.remove();
+      TransferableBlock block = mailbox.poll();
+
+      // Release the mailbox when the block is end-of-stream
+      if (block != null && block.isSuccessfulEndOfStreamBlock()) {
+        _mailboxService.releaseReceivingMailbox(mailbox);
+        _opChainStats.getOperatorStatsMap().putAll(block.getResultMetadata());
+        continue;
+      }
 
-      // For all non-singleton distribution, we poll from every instance to check mailbox content.
-      // TODO: Fix wasted CPU cycles on waiting for servers that are not supposed to give content.
-      for (int i = 0; i < _sendingMailbox.size(); i++) {
-        // this implements a round-robin mailbox iterator, so we don't starve any mailboxes
-        _serverIdx = (startingIdx + i) % _sendingMailbox.size();
-        MailboxIdentifier mailboxId = _sendingMailbox.get(_serverIdx);
-        try {
-          ReceivingMailbox<TransferableBlock> mailbox = _mailboxService.getReceivingMailbox(mailboxId);
-          if (!mailbox.isClosed()) {
-            openMailboxCount++;
-            TransferableBlock block = mailbox.receive();
-            // Get null block when pulling times out from mailbox.
-            if (block != null) {
-              if (block.isErrorBlock()) {
-                _upstreamErrorBlock =
-                    TransferableBlockUtils.getErrorTransferableBlock(block.getDataBlock().getExceptions());
-                return _upstreamErrorBlock;
-              }
-              if (!block.isEndOfStreamBlock()) {
-                _operatorStats.recordInput(1, block.getNumRows());
-                _operatorStats.recordOutput(1, block.getNumRows());
-                return block;
-              } else {
-                eosMailboxCount++;
-              }
-            }
-          }
-        } catch (Exception e) {
-          return TransferableBlockUtils.getErrorTransferableBlock(
-              new RuntimeException(String.format("Error polling mailbox=%s", mailboxId), e));
+      // Add the mailbox back to the queue if the block is not end-of-stream
+      _mailboxes.add(mailbox);
+      if (block != null) {
+        if (block.isErrorBlock()) {
+          _errorBlock = block;
         }
+        return block;
       }
-
-      // there are two conditions in which we should return EOS: (1) there were
-      // no mailboxes to open (this shouldn't happen because the second condition
-      // should be hit first, but is defensive) (2) every mailbox that was opened
-      // returned an EOS block. in every other scenario, there are mailboxes that
-      // are not yet exhausted and we should wait for more data to be available
-      TransferableBlock block =
-          openMailboxCount > 0 && openMailboxCount > eosMailboxCount ? TransferableBlockUtils.getNoOpTransferableBlock()
-              : TransferableBlockUtils.getEndOfStreamTransferableBlock();
-      return block;
-    } finally {
-      _operatorStats.endTimer();
     }
+
+    return _mailboxes.isEmpty() ? TransferableBlockUtils.getEndOfStreamTransferableBlock()
+        : TransferableBlockUtils.getNoOpTransferableBlock();
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
index 047f5fd5b26..c5e1c71f5f7 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MailboxSendOperator.java
@@ -20,151 +20,165 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.concurrent.TimeoutException;
 import javax.annotation.Nullable;
 import org.apache.calcite.rel.RelDistribution;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.pinot.query.mailbox.MailboxIdUtils;
 import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.mailbox.ServerAddress;
+import org.apache.pinot.query.mailbox.SendingMailbox;
+import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
-import org.apache.pinot.query.runtime.blocks.BlockSplitter;
+import org.apache.pinot.query.routing.MailboxMetadata;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.query.runtime.operator.exchange.BlockExchange;
+import org.apache.pinot.query.runtime.operator.utils.OperatorUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 /**
  * This {@code MailboxSendOperator} is created to send {@link TransferableBlock}s to the receiving end.
+ *
+ * TODO: Add support to sort the data prior to sending if sorting is enabled
  */
 public class MailboxSendOperator extends MultiStageOperator {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxSendOperator.class);
-
-  private static final String EXPLAIN_NAME = "MAILBOX_SEND";
-  private static final Set<RelDistribution.Type> SUPPORTED_EXCHANGE_TYPE =
+  public static final Set<RelDistribution.Type> SUPPORTED_EXCHANGE_TYPES =
       ImmutableSet.of(RelDistribution.Type.SINGLETON, RelDistribution.Type.RANDOM_DISTRIBUTED,
           RelDistribution.Type.BROADCAST_DISTRIBUTED, RelDistribution.Type.HASH_DISTRIBUTED);
 
-  private final MultiStageOperator _dataTableBlockBaseOperator;
+  private static final Logger LOGGER = LoggerFactory.getLogger(MailboxSendOperator.class);
+  private static final String EXPLAIN_NAME = "MAILBOX_SEND";
+
+  private final MultiStageOperator _sourceOperator;
   private final BlockExchange _exchange;
-  private OperatorStats _operatorStats;
+  private final List<RexExpression> _collationKeys;
+  private final List<RelFieldCollation.Direction> _collationDirections;
+  private final boolean _isSortOnSender;
 
-  @VisibleForTesting
-  interface BlockExchangeFactory {
-    BlockExchange build(MailboxService<TransferableBlock> mailboxService, List<MailboxIdentifier> destinations,
-        RelDistribution.Type exchange, KeySelector<Object[], Object[]> selector, BlockSplitter splitter);
+  public MailboxSendOperator(OpChainExecutionContext context, MultiStageOperator sourceOperator,
+      RelDistribution.Type exchangeType, KeySelector<Object[], Object[]> keySelector,
+      @Nullable List<RexExpression> collationKeys, @Nullable List<RelFieldCollation.Direction> collationDirections,
+      boolean isSortOnSender, int receiverStageId) {
+    this(context, sourceOperator, getBlockExchange(context, exchangeType, keySelector, receiverStageId), collationKeys,
+        collationDirections, isSortOnSender);
   }
 
   @VisibleForTesting
-  interface MailboxIdGenerator {
-    MailboxIdentifier generate(ServerInstance server);
-  }
-
-  public MailboxSendOperator(MailboxService<TransferableBlock> mailboxService,
-      MultiStageOperator dataTableBlockBaseOperator, List<ServerInstance> receivingStageInstances,
-      RelDistribution.Type exchangeType, KeySelector<Object[], Object[]> keySelector, String hostName, int port,
-      long jobId, int stageId) {
-    this(mailboxService, dataTableBlockBaseOperator, receivingStageInstances, exchangeType, keySelector,
-        server -> toMailboxId(server, jobId, stageId, hostName, port), BlockExchange::getExchange, jobId, stageId);
+  MailboxSendOperator(OpChainExecutionContext context, MultiStageOperator sourceOperator, BlockExchange exchange,
+      @Nullable List<RexExpression> collationKeys, @Nullable List<RelFieldCollation.Direction> collationDirections,
+      boolean isSortOnSender) {
+    super(context);
+    _sourceOperator = sourceOperator;
+    _exchange = exchange;
+    _collationKeys = collationKeys;
+    _collationDirections = collationDirections;
+    _isSortOnSender = isSortOnSender;
+    _context.getMailboxService().submitExchangeRequest(context.getId(), exchange);
   }
 
-  @VisibleForTesting
-  MailboxSendOperator(MailboxService<TransferableBlock> mailboxService,
-      MultiStageOperator dataTableBlockBaseOperator, List<ServerInstance> receivingStageInstances,
-      RelDistribution.Type exchangeType, KeySelector<Object[], Object[]> keySelector,
-      MailboxIdGenerator mailboxIdGenerator, BlockExchangeFactory blockExchangeFactory, long jobId, int stageId) {
-    _dataTableBlockBaseOperator = dataTableBlockBaseOperator;
-
-    List<MailboxIdentifier> receivingMailboxes;
-    if (exchangeType == RelDistribution.Type.SINGLETON) {
-      // TODO: this logic should be moved into SingletonExchange
-      ServerInstance singletonInstance = null;
-      for (ServerInstance serverInstance : receivingStageInstances) {
-        if (serverInstance.getHostname().equals(mailboxService.getHostname())
-            && serverInstance.getQueryMailboxPort() == mailboxService.getMailboxPort()) {
-          Preconditions.checkState(singletonInstance == null, "multiple instance found for singleton exchange type!");
-          singletonInstance = serverInstance;
-        }
-      }
-      Preconditions.checkNotNull(singletonInstance, "Unable to find receiving instance for singleton exchange");
-      receivingMailboxes = Collections.singletonList(mailboxIdGenerator.generate(singletonInstance));
-    } else {
-      receivingMailboxes = receivingStageInstances
-          .stream()
-          .map(mailboxIdGenerator::generate)
-          .collect(Collectors.toList());
+  private static BlockExchange getBlockExchange(OpChainExecutionContext context, RelDistribution.Type exchangeType,
+      KeySelector<Object[], Object[]> keySelector, int receiverStageId) {
+    Preconditions.checkState(SUPPORTED_EXCHANGE_TYPES.contains(exchangeType), "Unsupported exchange type: %s",
+        exchangeType);
+    MailboxService mailboxService = context.getMailboxService();
+    long requestId = context.getRequestId();
+    long deadlineMs = context.getDeadlineMs();
+
+    int workerId = context.getServer().workerId();
+    MailboxMetadata receiverMailboxMetadatas =
+        context.getStageMetadata().getWorkerMetadataList().get(workerId).getMailBoxInfosMap().get(receiverStageId);
+    List<String> sendingMailboxIds = MailboxIdUtils.toMailboxIds(requestId, receiverMailboxMetadatas);
+    List<SendingMailbox> sendingMailboxes = new ArrayList<>(sendingMailboxIds.size());
+    for (int i = 0; i < receiverMailboxMetadatas.getMailBoxIdList().size(); i++) {
+      sendingMailboxes.add(mailboxService.getSendingMailbox(receiverMailboxMetadatas.getVirtualAddress(i).hostname(),
+          receiverMailboxMetadatas.getVirtualAddress(i).port(), sendingMailboxIds.get(i), deadlineMs));
     }
-
-    BlockSplitter splitter = TransferableBlockUtils::splitBlock;
-    _exchange = blockExchangeFactory.build(mailboxService, receivingMailboxes, exchangeType, keySelector, splitter);
-
-    Preconditions.checkState(SUPPORTED_EXCHANGE_TYPE.contains(exchangeType),
-        String.format("Exchange type '%s' is not supported yet", exchangeType));
-    _operatorStats = new OperatorStats(jobId, stageId, EXPLAIN_NAME);
+    return BlockExchange.getExchange(context.getId(), sendingMailboxes, exchangeType, keySelector,
+        TransferableBlockUtils::splitBlock, context.getCallback(), context.getDeadlineMs());
   }
 
   @Override
   public List<MultiStageOperator> getChildOperators() {
-    return ImmutableList.of();
+    return Collections.singletonList(_sourceOperator);
   }
 
   @Nullable
   @Override
   public String toExplainString() {
-    _dataTableBlockBaseOperator.toExplainString();
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    _operatorStats.startTimer();
+    boolean canContinue = true;
     TransferableBlock transferableBlock;
     try {
-      _operatorStats.endTimer();
-      transferableBlock = _dataTableBlockBaseOperator.nextBlock();
-      _operatorStats.startTimer();
-      while (!transferableBlock.isNoOpBlock()) {
-        _exchange.send(transferableBlock);
-        _operatorStats.recordInput(1, transferableBlock.getNumRows());
-        // The # of output block is not accurate because we may do a split in exchange send.
-        _operatorStats.recordOutput(1, transferableBlock.getNumRows());
-        if (transferableBlock.isEndOfStreamBlock()) {
-          return transferableBlock;
+      transferableBlock = _sourceOperator.nextBlock();
+      if (transferableBlock.isNoOpBlock()) {
+        return transferableBlock;
+      } else if (transferableBlock.isEndOfStreamBlock()) {
+        if (transferableBlock.isSuccessfulEndOfStreamBlock()) {
+          // Stats need to be populated here because the block is being sent to the mailbox
+          // and the receiving opChain will not be able to access the stats from the previous opChain
+          TransferableBlock eosBlockWithStats = TransferableBlockUtils.getEndOfStreamTransferableBlock(
+              OperatorUtils.getMetadataFromOperatorStats(_opChainStats.getOperatorStatsMap()));
+          sendTransferableBlock(eosBlockWithStats);
+        } else {
+          sendTransferableBlock(transferableBlock);
         }
-        _operatorStats.endTimer();
-        transferableBlock = _dataTableBlockBaseOperator.nextBlock();
-        _operatorStats.startTimer();
+      } else { // normal blocks
+        // check whether we should continue depending on exchange queue condition.
+        canContinue = sendTransferableBlock(transferableBlock);
       }
-    } catch (final Exception e) {
-      // ideally, MailboxSendOperator doesn't ever throw an exception because
-      // it will just get swallowed, in this scenario at least we can forward
-      // any upstream exceptions as an error  block
+    } catch (Exception e) {
       transferableBlock = TransferableBlockUtils.getErrorTransferableBlock(e);
       try {
-        _exchange.send(transferableBlock);
+        LOGGER.error("Exception while transferring data on opChain: " + _context.getId(), e);
+        sendTransferableBlock(transferableBlock);
       } catch (Exception e2) {
-        LOGGER.error("Exception while sending block to mailbox.", e2);
+        LOGGER.error("Exception while sending error block.", e2);
       }
-    } finally {
-      _operatorStats.endTimer();
     }
-    return transferableBlock;
+    // yield if we cannot continue to put transferable block into the sending queue
+    return canContinue ? transferableBlock : TransferableBlockUtils.getNoOpTransferableBlock();
+  }
+
+  private boolean sendTransferableBlock(TransferableBlock block)
+      throws Exception {
+    long timeoutMs = _context.getDeadlineMs() - System.currentTimeMillis();
+    if (_exchange.offerBlock(block, timeoutMs)) {
+      return _exchange.getRemainingCapacity() > 0;
+    } else {
+      throw new TimeoutException("Timeout while offering data block into the sending queue.");
+    }
   }
 
-  private static JsonMailboxIdentifier toMailboxId(
-      ServerInstance destination, long jobId, int stageId, String sender, int senderPort) {
-    return new JsonMailboxIdentifier(
-        String.format("%s_%s", jobId, stageId),
-        new ServerAddress(sender, senderPort),
-        new ServerAddress(destination.getHostname(), destination.getQueryMailboxPort()));
+  /**
+   * This method is overridden to return true because this operator is last in the chain and needs to collect
+   * execution time stats
+   */
+  @Override
+  protected boolean shouldCollectStats() {
+    return true;
+  }
+
+  @Override
+  public void close() {
+    super.close();
+    _exchange.close();
+  }
+
+  @Override
+  public void cancel(Throwable t) {
+    super.cancel(t);
+    _exchange.cancel(t);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/FunctionInvokeUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MinusOperator.java
similarity index 53%
rename from pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/FunctionInvokeUtils.java
rename to pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MinusOperator.java
index de26cdfab4b..3415bfb3fc4 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/FunctionInvokeUtils.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MinusOperator.java
@@ -16,30 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.runtime.operator.utils;
+package org.apache.pinot.query.runtime.operator;
 
+import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 
 
-public class FunctionInvokeUtils {
+/**
+ * Minus/Except operator.
+ */
+public class MinusOperator extends SetOperator {
+  private static final String EXPLAIN_NAME = "MINUS";
+
+  public MinusOperator(OpChainExecutionContext opChainExecutionContext, List<MultiStageOperator> upstreamOperators,
+      DataSchema dataSchema) {
+    super(opChainExecutionContext, upstreamOperators, dataSchema);
+  }
 
-  private FunctionInvokeUtils() {
-    // do not instantiate.
+  @Nullable
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
   }
 
-  /**
-   * Convert result to the appropriate column data type according to the desired {@link DataSchema.ColumnDataType}
-   * of the {@link org.apache.pinot.core.common.Operator}.
-   *
-   * @param inputObj input entry
-   * @param columnDataType desired column data type
-   * @return converted entry
-   */
-  public static Object convert(Object inputObj, DataSchema.ColumnDataType columnDataType) {
-    if (columnDataType.isNumber() && columnDataType != DataSchema.ColumnDataType.BIG_DECIMAL) {
-      return inputObj == null ? null : columnDataType.convert(inputObj);
-    } else {
-      return inputObj;
-    }
+  @Override
+  protected boolean handleRowMatched(Object[] row) {
+    return _rightRowSet.add(new Record(row));
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultiStageOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultiStageOperator.java
index 9c82d1cb2a7..84f0f995da9 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultiStageOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultiStageOperator.java
@@ -18,16 +18,63 @@
  */
 package org.apache.pinot.query.runtime.operator;
 
+import com.google.common.base.Joiner;
 import java.util.List;
-import org.apache.pinot.core.operator.BaseOperator;
+import org.apache.pinot.core.common.Operator;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
+import org.apache.pinot.spi.trace.InvocationScope;
+import org.apache.pinot.spi.trace.Tracing;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public abstract class MultiStageOperator extends BaseOperator<TransferableBlock> implements AutoCloseable {
-  private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(MultiStageOperator.class);
+public abstract class MultiStageOperator implements Operator<TransferableBlock>, AutoCloseable {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MultiStageOperator.class);
+
+  protected final OpChainExecutionContext _context;
+  protected final String _operatorId;
+  protected final OpChainStats _opChainStats;
+
+  public MultiStageOperator(OpChainExecutionContext context) {
+    _context = context;
+    _operatorId =
+        Joiner.on("_").join(toExplainString(), _context.getRequestId(), _context.getStageId(), _context.getServer());
+    _opChainStats = _context.getStats();
+  }
+
+  @Override
+  public TransferableBlock nextBlock() {
+    if (Tracing.ThreadAccountantOps.isInterrupted()) {
+      throw new EarlyTerminationException("Interrupted while processing next block");
+    }
+    try (InvocationScope ignored = Tracing.getTracer().createScope(getClass())) {
+      TransferableBlock nextBlock;
+      if (shouldCollectStats()) {
+        OperatorStats operatorStats = _opChainStats.getOperatorStats(_context, _operatorId);
+        operatorStats.startTimer();
+        nextBlock = getNextBlock();
+        operatorStats.recordRow(1, nextBlock.getNumRows());
+        operatorStats.endTimer(nextBlock);
+      } else {
+        nextBlock = getNextBlock();
+      }
+      return nextBlock;
+    }
+  }
+
+  public String getOperatorId() {
+    return _operatorId;
+  }
+
+  // Make it protected because we should always call nextBlock()
+  protected abstract TransferableBlock getNextBlock();
+
+  protected boolean shouldCollectStats() {
+    return _context.isTraceEnabled();
+  }
 
-  // TODO: use the API public List<? extends Operator> getChildOperators() to merge two APIs.
   @Override
   public List<MultiStageOperator> getChildOperators() {
     throw new UnsupportedOperationException();
@@ -41,9 +88,20 @@ public void close() {
       try {
         op.close();
       } catch (Exception e) {
-        LOGGER.error("Failed to close operator:" + op);
+        LOGGER.error("Failed to close operator: " + op + " with exception:" + e);
         // Continue processing because even one operator failed to be close, we should still close the rest.
       }
     }
   }
+
+  public void cancel(Throwable e) {
+    for (MultiStageOperator op : getChildOperators()) {
+      try {
+        op.cancel(e);
+      } catch (Exception e2) {
+        LOGGER.error("Failed to cancel operator:" + op + "with error:" + e + " with exception:" + e2);
+        // Continue processing because even one operator failed to be cancelled, we should still cancel the rest.
+      }
+    }
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultistageAggregationExecutor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultistageAggregationExecutor.java
new file mode 100644
index 00000000000..19e4f66cc65
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultistageAggregationExecutor.java
@@ -0,0 +1,149 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.query.aggregation.AggregationResultHolder;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.query.planner.plannode.AggregateNode.AggType;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
+
+
+/**
+ * Class that executes all aggregation functions (without group-bys) for the multistage AggregateOperator.
+ */
+public class MultistageAggregationExecutor {
+  private final AggType _aggType;
+  // The identifier operands for the aggregation function only store the column name. This map contains mapping
+  // from column name to their index.
+  private final Map<String, Integer> _colNameToIndexMap;
+  private final DataSchema _resultSchema;
+
+  private final AggregationFunction[] _aggFunctions;
+
+  // Result holders for each mode.
+  private final AggregationResultHolder[] _aggregateResultHolder;
+  private final Object[] _mergeResultHolder;
+
+  public MultistageAggregationExecutor(AggregationFunction[] aggFunctions,
+      AggType aggType, Map<String, Integer> colNameToIndexMap, DataSchema resultSchema) {
+    _aggFunctions = aggFunctions;
+    _aggType = aggType;
+    _colNameToIndexMap = colNameToIndexMap;
+    _resultSchema = resultSchema;
+
+    _aggregateResultHolder = new AggregationResultHolder[aggFunctions.length];
+    _mergeResultHolder = new Object[aggFunctions.length];
+
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      _aggregateResultHolder[i] = _aggFunctions[i].createAggregationResultHolder();
+    }
+  }
+
+  /**
+   * Performs aggregation for the data in the block.
+   */
+  public void processBlock(TransferableBlock block, DataSchema inputDataSchema) {
+    if (!_aggType.isInputIntermediateFormat()) {
+      processAggregate(block, inputDataSchema);
+    } else {
+      processMerge(block);
+    }
+  }
+
+  /**
+   * @return an empty agg result block for non-group-by aggregation.
+   */
+  public Object[] constructEmptyAggResultRow() {
+    Object[] row = new Object[_aggFunctions.length];
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      AggregationFunction aggFunction = _aggFunctions[i];
+      row[i] = aggFunction.extractAggregationResult(aggFunction.createAggregationResultHolder());
+    }
+    return row;
+  }
+
+  /**
+   * Fetches the result.
+   */
+  public List<Object[]> getResult() {
+    Object[] row = new Object[_aggFunctions.length];
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      AggregationFunction aggFunction = _aggFunctions[i];
+      Object value;
+      switch (_aggType) {
+        case LEAF:
+          value = aggFunction.extractAggregationResult(_aggregateResultHolder[i]);
+          break;
+        case INTERMEDIATE:
+          value = _mergeResultHolder[i];
+          break;
+        case FINAL:
+          value = aggFunction.extractFinalResult(_mergeResultHolder[i]);
+          break;
+        case DIRECT:
+          Object intermediate = aggFunction.extractAggregationResult(_aggregateResultHolder[i]);
+          value = aggFunction.extractFinalResult(intermediate);
+          break;
+        default:
+          throw new UnsupportedOperationException("Unsupported aggTyp: " + _aggType);
+      }
+      row[i] = value;
+    }
+    return Collections.singletonList(TypeUtils.canonicalizeRow(row, _resultSchema));
+  }
+
+  private void processAggregate(TransferableBlock block, DataSchema inputDataSchema) {
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      AggregationFunction aggregationFunction = _aggFunctions[i];
+      Map<ExpressionContext, BlockValSet> blockValSetMap =
+          AggregateOperator.getBlockValSetMap(aggregationFunction, block, inputDataSchema, _colNameToIndexMap);
+      aggregationFunction.aggregate(block.getNumRows(), _aggregateResultHolder[i], blockValSetMap);
+    }
+  }
+
+  private void processMerge(TransferableBlock block) {
+    List<Object[]> container = block.getContainer();
+
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      for (Object[] row : container) {
+        Object intermediateResultToMerge =
+            AggregateOperator.extractValueFromRow(_aggFunctions[i], row, _colNameToIndexMap);
+
+        // Not all V1 aggregation functions have null-handling logic. Handle null values before calling merge.
+        if (intermediateResultToMerge == null) {
+          continue;
+        }
+        Object mergedIntermediateResult = _mergeResultHolder[i];
+        if (mergedIntermediateResult == null) {
+          _mergeResultHolder[i] = intermediateResultToMerge;
+          continue;
+        }
+
+        _mergeResultHolder[i] = _aggFunctions[i].merge(mergedIntermediateResult, intermediateResultToMerge);
+      }
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultistageGroupByExecutor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultistageGroupByExecutor.java
new file mode 100644
index 00000000000..5eacba025be
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/MultistageGroupByExecutor.java
@@ -0,0 +1,194 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.BlockValSet;
+import org.apache.pinot.core.data.table.Key;
+import org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2;
+import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
+import org.apache.pinot.core.query.aggregation.groupby.GroupByResultHolder;
+import org.apache.pinot.query.planner.plannode.AggregateNode.AggType;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
+
+
+
+/**
+ * Class that executes the group by aggregations for the multistage AggregateOperator.
+ */
+public class MultistageGroupByExecutor {
+  private final AggType _aggType;
+  // The identifier operands for the aggregation function only store the column name. This map contains mapping
+  // between column name to their index which is used in v2 engine.
+  private final Map<String, Integer> _colNameToIndexMap;
+  private final DataSchema _resultSchema;
+
+  private final List<ExpressionContext> _groupSet;
+  private final AggregationFunction[] _aggFunctions;
+
+  // Group By Result holders for each mode
+  private final GroupByResultHolder[] _aggregateResultHolders;
+  private final Map<Integer, Object[]> _mergeResultHolder;
+
+  // Mapping from the row-key to a zero based integer index. This is used when we invoke the v1 aggregation functions
+  // because they use the zero based integer indexes to store results.
+  private final Map<Key, Integer> _groupKeyToIdMap;
+
+  public MultistageGroupByExecutor(List<ExpressionContext> groupByExpr, AggregationFunction[] aggFunctions,
+      AggType aggType, Map<String, Integer> colNameToIndexMap, DataSchema resultSchema) {
+    _aggType = aggType;
+    _colNameToIndexMap = colNameToIndexMap;
+    _groupSet = groupByExpr;
+    _aggFunctions = aggFunctions;
+    _resultSchema = resultSchema;
+
+    _aggregateResultHolders = new GroupByResultHolder[_aggFunctions.length];
+    _mergeResultHolder = new HashMap<>();
+
+    _groupKeyToIdMap = new HashMap<>();
+
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      _aggregateResultHolders[i] =
+          _aggFunctions[i].createGroupByResultHolder(InstancePlanMakerImplV2.DEFAULT_MAX_INITIAL_RESULT_HOLDER_CAPACITY,
+              InstancePlanMakerImplV2.DEFAULT_NUM_GROUPS_LIMIT);
+    }
+  }
+
+  /**
+   * Performs group-by aggregation for the data in the block.
+   */
+  public void processBlock(TransferableBlock block, DataSchema inputDataSchema) {
+    if (!_aggType.isInputIntermediateFormat()) {
+      processAggregate(block, inputDataSchema);
+    } else {
+      processMerge(block);
+    }
+  }
+
+  /**
+   * Fetches the result.
+   */
+  public List<Object[]> getResult() {
+    List<Object[]> rows = new ArrayList<>(_groupKeyToIdMap.size());
+    int numKeys = _groupSet.size();
+    int numFunctions = _aggFunctions.length;
+    int numColumns = numKeys + numFunctions;
+    for (Map.Entry<Key, Integer> entry : _groupKeyToIdMap.entrySet()) {
+      Object[] row = new Object[numColumns];
+      Object[] keyValues = entry.getKey().getValues();
+      System.arraycopy(keyValues, 0, row, 0, numKeys);
+      int groupId = entry.getValue();
+      for (int i = 0; i < numFunctions; i++) {
+        AggregationFunction func = _aggFunctions[i];
+        int index = numKeys + i;
+        Object value;
+        switch (_aggType) {
+          case LEAF:
+            value = func.extractGroupByResult(_aggregateResultHolders[i], groupId);
+            break;
+          case INTERMEDIATE:
+            value = _mergeResultHolder.get(groupId)[i];
+            break;
+          case FINAL:
+            value = func.extractFinalResult(_mergeResultHolder.get(groupId)[i]);
+            break;
+          case DIRECT:
+            Object intermediate = _aggFunctions[i].extractGroupByResult(_aggregateResultHolders[i], groupId);
+            value = func.extractFinalResult(intermediate);
+            break;
+          default:
+            throw new UnsupportedOperationException("Unsupported aggTyp: " + _aggType);
+        }
+        row[index] = value;
+      }
+      rows.add(TypeUtils.canonicalizeRow(row, _resultSchema));
+    }
+    return rows;
+  }
+
+  private void processAggregate(TransferableBlock block, DataSchema inputDataSchema) {
+    int[] intKeys = generateGroupByKeys(block.getContainer());
+
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      AggregationFunction aggregationFunction = _aggFunctions[i];
+      Map<ExpressionContext, BlockValSet> blockValSetMap =
+          AggregateOperator.getBlockValSetMap(aggregationFunction, block, inputDataSchema, _colNameToIndexMap);
+      GroupByResultHolder groupByResultHolder = _aggregateResultHolders[i];
+      groupByResultHolder.ensureCapacity(_groupKeyToIdMap.size());
+      aggregationFunction.aggregateGroupBySV(block.getNumRows(), intKeys, groupByResultHolder, blockValSetMap);
+    }
+  }
+
+  private void processMerge(TransferableBlock block) {
+    List<Object[]> container = block.getContainer();
+    int[] intKeys = generateGroupByKeys(container);
+
+    for (int i = 0; i < _aggFunctions.length; i++) {
+      for (int j = 0; j < container.size(); j++) {
+        Object[] row = container.get(j);
+        int rowKey = intKeys[j];
+        if (!_mergeResultHolder.containsKey(rowKey)) {
+          _mergeResultHolder.put(rowKey, new Object[_aggFunctions.length]);
+        }
+        Object intermediateResultToMerge =
+            AggregateOperator.extractValueFromRow(_aggFunctions[i], row, _colNameToIndexMap);
+
+        // Not all V1 aggregation functions have null-handling. So handle null values and call merge only if necessary.
+        if (intermediateResultToMerge == null) {
+          continue;
+        }
+        Object mergedIntermediateResult = _mergeResultHolder.get(rowKey)[i];
+        if (mergedIntermediateResult == null) {
+          _mergeResultHolder.get(rowKey)[i] = intermediateResultToMerge;
+          continue;
+        }
+
+        _mergeResultHolder.get(rowKey)[i] = _aggFunctions[i].merge(mergedIntermediateResult, intermediateResultToMerge);
+      }
+    }
+  }
+
+  /**
+   * Creates the group by key for each row. Converts the key into a 0-index based int value that can be used by
+   * GroupByAggregationResultHolders used in v1 aggregations.
+   * <p>
+   * Returns the int key for each row.
+   */
+  private int[] generateGroupByKeys(List<Object[]> rows) {
+    int numRows = rows.size();
+    int[] rowIntKeys = new int[numRows];
+    int numKeys = _groupSet.size();
+    for (int i = 0; i < numRows; i++) {
+      Object[] row = rows.get(i);
+      Object[] keyValues = new Object[numKeys];
+      for (int j = 0; j < numKeys; j++) {
+        keyValues[j] = row[_colNameToIndexMap.get(_groupSet.get(j).getIdentifier())];
+      }
+      Key rowKey = new Key(keyValues);
+      rowIntKeys[i] = _groupKeyToIdMap.computeIfAbsent(rowKey, k -> _groupKeyToIdMap.size());
+    }
+    return rowIntKeys;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChain.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChain.java
index ae6bae362f9..65c5d66b981 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChain.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChain.java
@@ -18,12 +18,11 @@
  */
 package org.apache.pinot.query.runtime.operator;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.function.Consumer;
 import org.apache.pinot.core.common.Operator;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 
 
 /**
@@ -31,25 +30,39 @@
  * by send/receive stages.
  */
 public class OpChain implements AutoCloseable {
-
   private final MultiStageOperator _root;
-  private final Set<MailboxIdentifier> _receivingMailbox;
+  private final List<String> _receivingMailboxIds;
+  private final OpChainId _id;
   private final OpChainStats _stats;
-  private final String _id;
+  private final Consumer<OpChainId> _opChainFinishCallback;
+
+  public OpChain(OpChainExecutionContext context, MultiStageOperator root, List<String> receivingMailboxIds) {
+    this(context, root, receivingMailboxIds, (id) -> { });
+  }
 
-  public OpChain(MultiStageOperator root, List<MailboxIdentifier> receivingMailboxes, long requestId, int stageId) {
+  public OpChain(OpChainExecutionContext context, MultiStageOperator root, List<String> receivingMailboxIds,
+      Consumer<OpChainId> opChainFinishCallback) {
     _root = root;
-    _receivingMailbox = new HashSet<>(receivingMailboxes);
-    _id = String.format("%s_%s", requestId, stageId);
-    _stats = new OpChainStats(_id);
+    _receivingMailboxIds = receivingMailboxIds;
+    _id = context.getId();
+    _stats = context.getStats();
+    _opChainFinishCallback = opChainFinishCallback;
   }
 
   public Operator<TransferableBlock> getRoot() {
     return _root;
   }
 
-  public Set<MailboxIdentifier> getReceivingMailbox() {
-    return _receivingMailbox;
+  public List<String> getReceivingMailboxIds() {
+    return _receivingMailboxIds;
+  }
+
+  public Consumer<OpChainId> getOpChainFinishCallback() {
+    return _opChainFinishCallback;
+  }
+
+  public OpChainId getId() {
+    return _id;
   }
 
   // TODO: Move OperatorStats here.
@@ -62,8 +75,19 @@ public String toString() {
     return "OpChain{" + _id + "}";
   }
 
+  /**
+   * close() is called when we finish execution successfully.
+   */
   @Override
   public void close() {
     _root.close();
   }
+
+  /**
+   * cancel() is called when execution runs into error.
+   * @param e
+   */
+  public void cancel(Throwable e) {
+    _root.cancel(e);
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainId.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainId.java
new file mode 100644
index 00000000000..dae9c2f7550
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainId.java
@@ -0,0 +1,65 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import java.util.Objects;
+
+
+public class OpChainId {
+  final long _requestId;
+  final int _virtualServerId;
+  final int _stageId;
+
+  public OpChainId(long requestId, int virtualServerId, int stageId) {
+    _requestId = requestId;
+    _virtualServerId = virtualServerId;
+    _stageId = stageId;
+  }
+
+  public long getRequestId() {
+    return _requestId;
+  }
+
+  public int getVirtualServerId() {
+    return _virtualServerId;
+  }
+
+  @Override
+  public String toString() {
+    return String.format("%s_%s_%s", _requestId, _virtualServerId, _stageId);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OpChainId opChainId = (OpChainId) o;
+    return _requestId == opChainId._requestId && _virtualServerId == opChainId._virtualServerId
+        && _stageId == opChainId._stageId;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_requestId, _virtualServerId, _stageId);
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainStats.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainStats.java
index 07705f8bac7..6c259eaff22 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainStats.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OpChainStats.java
@@ -21,15 +21,20 @@
 
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Suppliers;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
+import javax.annotation.concurrent.NotThreadSafe;
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
 
 
 /**
  * {@code OpChainStats} tracks execution statistics for {@link OpChain}s.
  */
+@NotThreadSafe
 public class OpChainStats {
 
   // use memoized supplier so that the timing doesn't start until the
@@ -46,6 +51,7 @@ public class OpChainStats {
   private final AtomicLong _queuedCount = new AtomicLong();
 
   private final String _id;
+  private final ConcurrentHashMap<String, OperatorStats> _operatorStatsMap = new ConcurrentHashMap<>();
 
   public OpChainStats(String id) {
     _id = id;
@@ -68,7 +74,21 @@ public void queued() {
     }
   }
 
-  public void startExecutionTimer() {
+  public ConcurrentHashMap<String, OperatorStats> getOperatorStatsMap() {
+    return _operatorStatsMap;
+  }
+
+  public OperatorStats getOperatorStats(OpChainExecutionContext context, String operatorId) {
+      return _operatorStatsMap.computeIfAbsent(operatorId, (id) -> {
+        OperatorStats operatorStats = new OperatorStats(context);
+        if (context.isTraceEnabled()) {
+          operatorStats.recordSingleStat(DataTable.MetadataKey.OPERATOR_ID.getName(), operatorId);
+        }
+        return operatorStats;
+      });
+  }
+
+  private void startExecutionTimer() {
     _exTimerStarted = true;
     _exTimer.get();
     if (!_executeStopwatch.isRunning()) {
@@ -76,6 +96,10 @@ public void startExecutionTimer() {
     }
   }
 
+  public long getExecutionTime() {
+    return _executeStopwatch.elapsed(TimeUnit.MILLISECONDS);
+  }
+
   @Override
   public String toString() {
     return String.format("(%s) Queued Count: %s, Executing Time: %sms, Queued Time: %sms", _id, _queuedCount.get(),
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OperatorStats.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OperatorStats.java
index c40b96b3c81..5985e23b13d 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OperatorStats.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/OperatorStats.java
@@ -19,7 +19,14 @@
 package org.apache.pinot.query.runtime.operator;
 
 import com.google.common.base.Stopwatch;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.utils.OperatorUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 
 
 public class OperatorStats {
@@ -29,50 +36,92 @@ public class OperatorStats {
   private final int _stageId;
   private final long _requestId;
 
-  private final String _operatorType;
+  private final VirtualServerAddress _serverAddress;
 
-  private int _numInputBlock = 0;
-  private int _numInputRows = 0;
+  private int _numBlock = 0;
+  private int _numRows = 0;
+  private long _startTimeMs = -1;
+  private long _endTimeMs = -1;
+  private final Map<String, String> _executionStats;
+  private boolean _processingStarted = false;
 
-  private int _numOutputBlock = 0;
-
-  private int _numOutputRows = 0;
+  public OperatorStats(OpChainExecutionContext context) {
+    this(context.getRequestId(), context.getStageId(), context.getServer());
+  }
 
-  public OperatorStats(long requestId, int stageId, String operatorType) {
+  //TODO: remove this constructor after the context constructor can be used in serialization and deserialization
+  public OperatorStats(long requestId, int stageId, VirtualServerAddress serverAddress) {
     _stageId = stageId;
     _requestId = requestId;
-    _operatorType = operatorType;
+    _serverAddress = serverAddress;
+    _executionStats = new HashMap<>();
   }
 
   public void startTimer() {
+    _startTimeMs = _startTimeMs == -1 ? System.currentTimeMillis() : _startTimeMs;
     if (!_executeStopwatch.isRunning()) {
       _executeStopwatch.start();
     }
   }
 
-  public void endTimer() {
+  public void endTimer(TransferableBlock block) {
     if (_executeStopwatch.isRunning()) {
       _executeStopwatch.stop();
+      _endTimeMs = System.currentTimeMillis();
     }
+    if (!_processingStarted && block.isNoOpBlock()) {
+      _startTimeMs = -1;
+      _endTimeMs = -1;
+      _executeStopwatch.reset();
+    } else {
+      _processingStarted = true;
+    }
+  }
+
+  public void recordRow(int numBlock, int numRows) {
+    _numBlock += numBlock;
+    _numRows += numRows;
+  }
+
+  public void recordSingleStat(String key, String stat) {
+    _executionStats.put(key, stat);
+  }
+
+  public void recordExecutionStats(Map<String, String> executionStats) {
+    _executionStats.putAll(executionStats);
+  }
+
+  public Map<String, String> getExecutionStats() {
+    _executionStats.putIfAbsent(DataTable.MetadataKey.NUM_BLOCKS.getName(), String.valueOf(_numBlock));
+    _executionStats.putIfAbsent(DataTable.MetadataKey.NUM_ROWS.getName(), String.valueOf(_numRows));
+    _executionStats.putIfAbsent(DataTable.MetadataKey.OPERATOR_EXECUTION_TIME_MS.getName(),
+        String.valueOf(_executeStopwatch.elapsed(TimeUnit.MILLISECONDS)));
+    // wall time are recorded slightly longer than actual execution but it is OK.
+
+    if (_startTimeMs != -1) {
+      _executionStats.putIfAbsent(DataTable.MetadataKey.OPERATOR_EXEC_START_TIME_MS.getName(),
+          String.valueOf(_startTimeMs));
+      long endTimeMs = _endTimeMs == -1 ? System.currentTimeMillis() : _endTimeMs;
+      _executionStats.putIfAbsent(DataTable.MetadataKey.OPERATOR_EXEC_END_TIME_MS.getName(),
+          String.valueOf(endTimeMs));
+    }
+    return _executionStats;
+  }
+
+  public int getStageId() {
+    return _stageId;
   }
 
-  public void recordInput(int numBlock, int numRows) {
-    _numInputBlock += numBlock;
-    _numInputRows += numRows;
+  public long getRequestId() {
+    return _requestId;
   }
 
-  public void recordOutput(int numBlock, int numRows) {
-    _numOutputBlock += numBlock;
-    _numOutputRows += numRows;
+  public VirtualServerAddress getServerAddress() {
+    return _serverAddress;
   }
 
-  // TODO: Return the string as a JSON string.
   @Override
   public String toString() {
-    return String.format(
-        "OperatorStats[type: %s, requestId: %s, stageId %s] ExecutionWallTime: %sms, InputRows: %s, InputBlock: "
-            + "%s, OutputRows: %s, OutputBlock: %s", _operatorType, _requestId, _stageId,
-        _executeStopwatch.elapsed(TimeUnit.MILLISECONDS), _numInputRows, _numInputBlock, _numOutputRows,
-        _numOutputBlock);
+    return OperatorUtils.operatorStatsToJson(this);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SetOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SetOperator.java
new file mode 100644
index 00000000000..0130234d7d6
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SetOperator.java
@@ -0,0 +1,140 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.ExplainPlanRows;
+import org.apache.pinot.core.data.table.Record;
+import org.apache.pinot.core.operator.ExecutionStatistics;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.segment.spi.IndexSegment;
+
+
+/**
+ * Set operator, which supports UNION, INTERSECT and EXCEPT.
+ * This has two child operators, and the left child operator is the one that is used to construct the result.
+ * The right child operator is used to construct a set of rows that are used to filter the left child operator.
+ * The right child operator is consumed in a blocking manner, and the left child operator is consumed in a non-blocking
+ * UnionOperator: The right child operator is consumed in a blocking manner.
+ */
+public abstract class SetOperator extends MultiStageOperator {
+  protected final Set<Record> _rightRowSet;
+
+  private final List<MultiStageOperator> _upstreamOperators;
+  private final MultiStageOperator _leftChildOperator;
+  private final MultiStageOperator _rightChildOperator;
+
+  private final DataSchema _dataSchema;
+
+  private boolean _isRightSetBuilt;
+  private TransferableBlock _upstreamErrorBlock;
+
+  public SetOperator(OpChainExecutionContext opChainExecutionContext, List<MultiStageOperator> upstreamOperators,
+      DataSchema dataSchema) {
+    super(opChainExecutionContext);
+    _dataSchema = dataSchema;
+    _upstreamOperators = upstreamOperators;
+    _leftChildOperator = getChildOperators().get(0);
+    _rightChildOperator = getChildOperators().get(1);
+    _rightRowSet = new HashSet<>();
+  }
+
+  @Override
+  public List<MultiStageOperator> getChildOperators() {
+    return _upstreamOperators;
+  }
+
+  @Override
+  public void prepareForExplainPlan(ExplainPlanRows explainPlanRows) {
+    super.prepareForExplainPlan(explainPlanRows);
+  }
+
+  @Override
+  public void explainPlan(ExplainPlanRows explainPlanRows, int[] globalId, int parentId) {
+    super.explainPlan(explainPlanRows, globalId, parentId);
+  }
+
+  @Override
+  public IndexSegment getIndexSegment() {
+    return super.getIndexSegment();
+  }
+
+  @Override
+  public ExecutionStatistics getExecutionStatistics() {
+    return super.getExecutionStatistics();
+  }
+
+  @Override
+  protected TransferableBlock getNextBlock() {
+    // A blocking call to construct a set with all the right side rows.
+    if (!_isRightSetBuilt) {
+      constructRightBlockSet();
+    }
+    TransferableBlock leftBlock = _leftChildOperator.nextBlock();
+    return constructResultBlockSet(leftBlock);
+  }
+
+  protected void constructRightBlockSet() {
+    TransferableBlock block = _rightChildOperator.nextBlock();
+    while (!block.isEndOfStreamBlock()) {
+      if (block.getType() != DataBlock.Type.METADATA) {
+        for (Object[] row : block.getContainer()) {
+          _rightRowSet.add(new Record(row));
+        }
+      }
+      block = _rightChildOperator.nextBlock();
+    }
+    _isRightSetBuilt = true;
+  }
+
+  protected TransferableBlock constructResultBlockSet(TransferableBlock leftBlock) {
+    List<Object[]> rows = new ArrayList<>();
+    if (_upstreamErrorBlock != null || leftBlock.isErrorBlock()) {
+      _upstreamErrorBlock = leftBlock;
+      return _upstreamErrorBlock;
+    }
+    if (leftBlock.isNoOpBlock() || leftBlock.isSuccessfulEndOfStreamBlock()) {
+      if (leftBlock.isSuccessfulEndOfStreamBlock()) {
+        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+      }
+      return leftBlock;
+    }
+    for (Object[] row : leftBlock.getContainer()) {
+      if (handleRowMatched(row)) {
+        rows.add(row);
+      }
+    }
+    return new TransferableBlock(rows, _dataSchema, DataBlock.Type.ROW);
+  }
+
+  /**
+   * Returns true if the row is matched.
+   * Also updates the right row set based on the Operator.
+   * @param row
+   * @return true if the row is matched.
+   */
+  protected abstract boolean handleRowMatched(Object[] row);
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortOperator.java
index 13f4306e019..0f3fef5208e 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortOperator.java
@@ -20,7 +20,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import java.util.Comparator;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.PriorityQueue;
@@ -32,49 +32,66 @@
 import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.utils.SortUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 public class SortOperator extends MultiStageOperator {
   private static final String EXPLAIN_NAME = "SORT";
-  private final MultiStageOperator _upstreamOperator;
   private static final Logger LOGGER = LoggerFactory.getLogger(SortOperator.class);
 
+  private final MultiStageOperator _upstreamOperator;
   private final int _fetch;
   private final int _offset;
   private final DataSchema _dataSchema;
-  private final PriorityQueue<Object[]> _rows;
+  private final PriorityQueue<Object[]> _priorityQueue;
+  private final ArrayList<Object[]> _rows;
   private final int _numRowsToKeep;
 
   private boolean _readyToConstruct;
   private boolean _isSortedBlockConstructed;
   private TransferableBlock _upstreamErrorBlock;
-  private OperatorStats _operatorStats;
 
-  public SortOperator(MultiStageOperator upstreamOperator, List<RexExpression> collationKeys,
-      List<RelFieldCollation.Direction> collationDirections, int fetch, int offset, DataSchema dataSchema,
-      long requestId, int stageId) {
-    this(upstreamOperator, collationKeys, collationDirections, fetch, offset, dataSchema,
-        SelectionOperatorUtils.MAX_ROW_HOLDER_INITIAL_CAPACITY, requestId, stageId);
+  public SortOperator(OpChainExecutionContext context, MultiStageOperator upstreamOperator,
+      List<RexExpression> collationKeys, List<RelFieldCollation.Direction> collationDirections,
+      List<RelFieldCollation.NullDirection> collationNullDirections, int fetch, int offset, DataSchema dataSchema,
+      boolean isInputSorted) {
+    this(context, upstreamOperator, collationKeys, collationDirections, collationNullDirections, fetch, offset,
+        dataSchema, isInputSorted, SelectionOperatorUtils.MAX_ROW_HOLDER_INITIAL_CAPACITY,
+        CommonConstants.Broker.DEFAULT_BROKER_QUERY_RESPONSE_LIMIT);
   }
 
   @VisibleForTesting
-  SortOperator(MultiStageOperator upstreamOperator, List<RexExpression> collationKeys,
-      List<RelFieldCollation.Direction> collationDirections, int fetch, int offset, DataSchema dataSchema,
-      int maxHolderCapacity, long requestId, int stageId) {
+  SortOperator(OpChainExecutionContext context, MultiStageOperator upstreamOperator, List<RexExpression> collationKeys,
+      List<RelFieldCollation.Direction> collationDirections,
+      List<RelFieldCollation.NullDirection> collationNullDirections, int fetch, int offset, DataSchema dataSchema,
+      boolean isInputSorted, int defaultHolderCapacity, int defaultResponseLimit) {
+    super(context);
     _upstreamOperator = upstreamOperator;
     _fetch = fetch;
-    _offset = offset;
+    _offset = Math.max(offset, 0);
     _dataSchema = dataSchema;
     _upstreamErrorBlock = null;
     _isSortedBlockConstructed = false;
-    _numRowsToKeep = _fetch > 0
-        ? Math.min(maxHolderCapacity, _fetch + (Math.max(_offset, 0)))
-        : maxHolderCapacity;
-    _rows = new PriorityQueue<>(_numRowsToKeep,
-        new SortComparator(collationKeys, collationDirections, dataSchema, false));
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
+    // Setting numRowsToKeep as default maximum on Broker if limit not set.
+    // TODO: make this default behavior configurable.
+    _numRowsToKeep = _fetch > 0 ? _fetch + _offset : defaultResponseLimit;
+    // Under the following circumstances, the SortOperator is a simple selection with row trim on limit & offset:
+    // - There are no collationKeys
+    // - 'isInputSorted' is set to true indicating that the data was already sorted
+    if (collationKeys.isEmpty() || isInputSorted) {
+      _priorityQueue = null;
+      _rows = new ArrayList<>();
+    } else {
+      // Use the opposite direction as specified by the collation directions since we need the PriorityQueue to decide
+      // which elements to keep and which to remove based on the limits.
+      _priorityQueue = new PriorityQueue<>(Math.min(defaultHolderCapacity, _numRowsToKeep),
+          new SortUtils.SortComparator(collationKeys, collationDirections, collationNullDirections, dataSchema, true));
+      _rows = null;
+    }
   }
 
   @Override
@@ -82,47 +99,53 @@ public List<MultiStageOperator> getChildOperators() {
     return ImmutableList.of(_upstreamOperator);
   }
 
+  @Override
+  public void cancel(Throwable e) {
+  }
+
   @Nullable
   @Override
   public String toExplainString() {
-    _upstreamOperator.toExplainString();
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    _operatorStats.startTimer();
     try {
       consumeInputBlocks();
       return produceSortedBlock();
     } catch (Exception e) {
       return TransferableBlockUtils.getErrorTransferableBlock(e);
-    } finally {
-      _operatorStats.endTimer();
     }
   }
 
   private TransferableBlock produceSortedBlock() {
     if (_upstreamErrorBlock != null) {
-      LOGGER.error("OperatorStats:" + _operatorStats);
       return _upstreamErrorBlock;
     } else if (!_readyToConstruct) {
       return TransferableBlockUtils.getNoOpTransferableBlock();
     }
 
     if (!_isSortedBlockConstructed) {
-      LinkedList<Object[]> rows = new LinkedList<>();
-      while (_rows.size() > _offset) {
-        Object[] row = _rows.poll();
-        rows.addFirst(row);
-      }
-      _operatorStats.recordOutput(1, rows.size());
       _isSortedBlockConstructed = true;
-      if (rows.size() == 0) {
-        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+      if (_priorityQueue == null) {
+        if (_rows.size() > _offset) {
+          List<Object[]> row = _rows.subList(_offset, _rows.size());
+          return new TransferableBlock(row, _dataSchema, DataBlock.Type.ROW);
+        } else {
+          return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+        }
       } else {
-        return new TransferableBlock(rows, _dataSchema, DataBlock.Type.ROW);
+        LinkedList<Object[]> rows = new LinkedList<>();
+        while (_priorityQueue.size() > _offset) {
+          Object[] row = _priorityQueue.poll();
+          rows.addFirst(row);
+        }
+        if (rows.size() == 0) {
+          return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+        } else {
+          return new TransferableBlock(rows, _dataSchema, DataBlock.Type.ROW);
+        }
       }
     } else {
       return TransferableBlockUtils.getEndOfStreamTransferableBlock();
@@ -131,9 +154,7 @@ private TransferableBlock produceSortedBlock() {
 
   private void consumeInputBlocks() {
     if (!_isSortedBlockConstructed) {
-      _operatorStats.endTimer();
       TransferableBlock block = _upstreamOperator.nextBlock();
-      _operatorStats.startTimer();
       while (!block.isNoOpBlock()) {
         // setting upstream error block
         if (block.isErrorBlock()) {
@@ -145,55 +166,22 @@ private void consumeInputBlocks() {
         }
 
         List<Object[]> container = block.getContainer();
-        for (Object[] row : container) {
-          SelectionOperatorUtils.addToPriorityQueue(row, _rows, _numRowsToKeep);
-        }
-        _operatorStats.endTimer();
-        block = _upstreamOperator.nextBlock();
-        _operatorStats.startTimer();
-        _operatorStats.recordInput(1, container.size());
-      }
-    }
-  }
-
-  private static class SortComparator implements Comparator<Object[]> {
-    private final int _size;
-    private final int[] _valueIndices;
-    private final int[] _multipliers;
-    private final boolean[] _useDoubleComparison;
-
-    public SortComparator(List<RexExpression> collationKeys, List<RelFieldCollation.Direction> collationDirections,
-        DataSchema dataSchema, boolean isNullHandlingEnabled) {
-      DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
-      _size = collationKeys.size();
-      _valueIndices = new int[_size];
-      _multipliers = new int[_size];
-      _useDoubleComparison = new boolean[_size];
-      for (int i = 0; i < _size; i++) {
-        _valueIndices[i] = ((RexExpression.InputRef) collationKeys.get(i)).getIndex();
-        _multipliers[i] = collationDirections.get(i).isDescending() ? 1 : -1;
-        _useDoubleComparison[i] = columnDataTypes[_valueIndices[i]].isNumber();
-      }
-    }
-
-    @Override
-    public int compare(Object[] o1, Object[] o2) {
-      for (int i = 0; i < _size; i++) {
-        int index = _valueIndices[i];
-        Object v1 = o1[index];
-        Object v2 = o2[index];
-        int result;
-        if (_useDoubleComparison[i]) {
-          result = Double.compare(((Number) v1).doubleValue(), ((Number) v2).doubleValue());
+        if (_priorityQueue == null) {
+          // TODO: when push-down properly, we shouldn't get more than _numRowsToKeep
+          if (_rows.size() <= _numRowsToKeep) {
+            if (_rows.size() + container.size() <= _numRowsToKeep) {
+              _rows.addAll(container);
+            } else {
+              _rows.addAll(container.subList(0, _numRowsToKeep - _rows.size()));
+            }
+          }
         } else {
-          //noinspection unchecked
-          result = ((Comparable) v1).compareTo(v2);
-        }
-        if (result != 0) {
-          return result * _multipliers[i];
+          for (Object[] row : container) {
+            SelectionOperatorUtils.addToPriorityQueue(row, _priorityQueue, _numRowsToKeep);
+          }
         }
+        block = _upstreamOperator.nextBlock();
       }
-      return 0;
     }
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortedMailboxReceiveOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortedMailboxReceiveOperator.java
new file mode 100644
index 00000000000..f5d4a8c65e6
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/SortedMailboxReceiveOperator.java
@@ -0,0 +1,137 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.mailbox.ReceivingMailbox;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.utils.SortUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+
+
+/**
+ * This {@code SortedMailboxReceiveOperator} receives data from a {@link ReceivingMailbox} and serve it out from the
+ * {@link MultiStageOperator#getNextBlock()}()} API in a sorted manner.
+ *
+ *  TODO: Once sorting on the {@code MailboxSendOperator} is available, modify this to use a k-way merge instead of
+ *        resorting via the PriorityQueue.
+ */
+public class SortedMailboxReceiveOperator extends BaseMailboxReceiveOperator {
+  private static final String EXPLAIN_NAME = "SORTED_MAILBOX_RECEIVE";
+
+  private final DataSchema _dataSchema;
+  private final List<RexExpression> _collationKeys;
+  private final List<Direction> _collationDirections;
+  private final List<NullDirection> _collationNullDirections;
+  private final boolean _isSortOnSender;
+  private final List<Object[]> _rows = new ArrayList<>();
+
+  private TransferableBlock _errorBlock;
+  private boolean _isSortedBlockConstructed;
+
+  public SortedMailboxReceiveOperator(OpChainExecutionContext context, RelDistribution.Type exchangeType,
+      DataSchema dataSchema, List<RexExpression> collationKeys, List<Direction> collationDirections,
+      List<NullDirection> collationNullDirections, boolean isSortOnSender, int senderStageId) {
+    super(context, exchangeType, senderStageId);
+    Preconditions.checkState(!CollectionUtils.isEmpty(collationKeys), "Collation keys must be set");
+    _dataSchema = dataSchema;
+    _collationKeys = collationKeys;
+    _collationDirections = collationDirections;
+    _collationNullDirections = collationNullDirections;
+    _isSortOnSender = isSortOnSender;
+  }
+
+  @Nullable
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+
+  @Override
+  protected TransferableBlock getNextBlock() {
+    if (_errorBlock != null) {
+      return _errorBlock;
+    }
+    if (System.currentTimeMillis() > _context.getDeadlineMs()) {
+      _errorBlock = TransferableBlockUtils.getErrorTransferableBlock(QueryException.EXECUTION_TIMEOUT_ERROR);
+      return _errorBlock;
+    }
+
+    // Since this operator needs to wait for all incoming data before it can send the data to the upstream operators,
+    // this operator will keep polling from all mailboxes until it receives null block or all blocks are collected.
+    // TODO: Use k-way merge when input data is sorted, and return blocks without waiting for all the data.
+    while (!_mailboxes.isEmpty()) {
+      ReceivingMailbox mailbox = _mailboxes.remove();
+      TransferableBlock block = mailbox.poll();
+
+      // Release the mailbox when the block is end-of-stream
+      if (block != null && block.isSuccessfulEndOfStreamBlock()) {
+        _mailboxService.releaseReceivingMailbox(mailbox);
+        _opChainStats.getOperatorStatsMap().putAll(block.getResultMetadata());
+        continue;
+      }
+
+      // Add the mailbox back to the queue if the block is not end-of-stream
+      _mailboxes.add(mailbox);
+      if (block != null) {
+        if (block.isErrorBlock()) {
+          _errorBlock = block;
+          return _errorBlock;
+        }
+        _rows.addAll(block.getContainer());
+      } else {
+        return TransferableBlockUtils.getNoOpTransferableBlock();
+      }
+    }
+
+    if (!_isSortedBlockConstructed && !_rows.isEmpty()) {
+      _rows.sort(
+          new SortUtils.SortComparator(_collationKeys, _collationDirections, _collationNullDirections, _dataSchema,
+              false));
+      _isSortedBlockConstructed = true;
+      return new TransferableBlock(_rows, _dataSchema, DataBlock.Type.ROW);
+    } else {
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    }
+  }
+
+  @Override
+  public void close() {
+    super.close();
+    _rows.clear();
+  }
+
+  @Override
+  public void cancel(Throwable t) {
+    super.cancel(t);
+    _rows.clear();
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/TransformOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/TransformOperator.java
index a75ad6b0178..4aff16138f8 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/TransformOperator.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/TransformOperator.java
@@ -29,7 +29,8 @@
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.query.runtime.operator.operands.TransformOperand;
-import org.apache.pinot.query.runtime.operator.utils.FunctionInvokeUtils;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,10 +54,10 @@ public class TransformOperator extends MultiStageOperator {
   // TODO: Check type matching between resultSchema and the actual result.
   private final DataSchema _resultSchema;
   private TransferableBlock _upstreamErrorBlock;
-  private OperatorStats _operatorStats;
 
-  public TransformOperator(MultiStageOperator upstreamOperator, DataSchema resultSchema,
-      List<RexExpression> transforms, DataSchema upstreamDataSchema, long requestId, int stageId) {
+  public TransformOperator(OpChainExecutionContext context, MultiStageOperator upstreamOperator,
+      DataSchema resultSchema, List<RexExpression> transforms, DataSchema upstreamDataSchema) {
+    super(context);
     Preconditions.checkState(!transforms.isEmpty(), "transform operand should not be empty.");
     Preconditions.checkState(resultSchema.size() == transforms.size(),
         "result schema size:" + resultSchema.size() + " doesn't match transform operand size:" + transforms.size());
@@ -67,7 +68,6 @@ public TransformOperator(MultiStageOperator upstreamOperator, DataSchema resultS
       _transformOperandsList.add(TransformOperand.toTransformOperand(rexExpression, upstreamDataSchema));
     }
     _resultSchema = resultSchema;
-    _operatorStats = new OperatorStats(requestId, stageId, EXPLAIN_NAME);
   }
 
   @Override
@@ -78,23 +78,16 @@ public List<MultiStageOperator> getChildOperators() {
   @Nullable
   @Override
   public String toExplainString() {
-    _upstreamOperator.toExplainString();
-    LOGGER.debug(_operatorStats.toString());
     return EXPLAIN_NAME;
   }
 
   @Override
   protected TransferableBlock getNextBlock() {
-    _operatorStats.startTimer();
     try {
-      _operatorStats.endTimer();
       TransferableBlock block = _upstreamOperator.nextBlock();
-      _operatorStats.startTimer();
       return transform(block);
     } catch (Exception e) {
       return TransferableBlockUtils.getErrorTransferableBlock(e);
-    } finally {
-      _operatorStats.endTimer();
     }
   }
 
@@ -107,22 +100,23 @@ private TransferableBlock transform(TransferableBlock block)
       return _upstreamErrorBlock;
     }
 
-    if (TransferableBlockUtils.isEndOfStream(block) || TransferableBlockUtils.isNoOpBlock(block)) {
+    if (TransferableBlockUtils.isEndOfStream(block)) {
+      return block;
+    }
+
+    if (TransferableBlockUtils.isNoOpBlock(block)) {
       return block;
     }
 
-    List<Object[]> resultRows = new ArrayList<>();
     List<Object[]> container = block.getContainer();
+    List<Object[]> resultRows = new ArrayList<>(container.size());
     for (Object[] row : container) {
       Object[] resultRow = new Object[_resultColumnSize];
       for (int i = 0; i < _resultColumnSize; i++) {
-        resultRow[i] =
-            FunctionInvokeUtils.convert(_transformOperandsList.get(i).apply(row), _resultSchema.getColumnDataType(i));
+        resultRow[i] = TypeUtils.convert(_transformOperandsList.get(i).apply(row), _resultSchema.getColumnDataType(i));
       }
       resultRows.add(resultRow);
     }
-    _operatorStats.recordInput(1, container.size());
-    _operatorStats.recordOutput(1, resultRows.size());
     return new TransferableBlock(resultRows, _resultSchema, DataBlock.Type.ROW);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/UnionOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/UnionOperator.java
new file mode 100644
index 00000000000..4f69b575b18
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/UnionOperator.java
@@ -0,0 +1,61 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+
+
+/**
+ * Union operator for UNION ALL queries.
+ */
+public class UnionOperator extends SetOperator {
+  private static final String EXPLAIN_NAME = "UNION";
+
+  public UnionOperator(OpChainExecutionContext opChainExecutionContext, List<MultiStageOperator> upstreamOperators,
+      DataSchema dataSchema) {
+    super(opChainExecutionContext, upstreamOperators, dataSchema);
+  }
+
+  @Nullable
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+
+  @Override
+  protected TransferableBlock getNextBlock() {
+    for (MultiStageOperator upstreamOperator : getChildOperators()) {
+      TransferableBlock block = upstreamOperator.nextBlock();
+      if (!block.isEndOfStreamBlock()) {
+        return block;
+      }
+    }
+    return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+  }
+
+  @Override
+  protected boolean handleRowMatched(Object[] row) {
+    throw new UnsupportedOperationException("Union operator does not support row matching");
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/WindowAggregateOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/WindowAggregateOperator.java
new file mode 100644
index 00000000000..0bb1433a00c
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/WindowAggregateOperator.java
@@ -0,0 +1,571 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.data.table.Key;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.utils.AggregationUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * The WindowAggregateOperator is used to compute window function aggregations over a set of optional
+ * PARTITION BY keys, ORDER BY keys and a FRAME clause. The output data will include the projected
+ * columns and in addition will add the aggregation columns to the output data.
+ * [input columns, aggregate result1, ... aggregate resultN]
+ *
+ * The window functions supported today are:
+ * Aggregation: SUM/COUNT/MIN/MAX/AVG/BOOL_OR/BOOL_AND aggregations [RANGE window type only]
+ * Ranking: ROW_NUMBER [ROWS window type only], RANK, DENSE_RANK [RANGE window type only] ranking functions
+ * Value: [none]
+ *
+ * Unlike the AggregateOperator which will output one row per group, the WindowAggregateOperator
+ * will output as many rows as input rows.
+ *
+ * For queries using an 'ORDER BY' clause within the 'OVER()', this WindowAggregateOperator expects that the incoming
+ * keys are already ordered based on the 'ORDER BY' keys. No ordering is performed in this operator. The planner
+ * should handle adding a 'SortExchange' to do the ordering prior to pipelining the data to the upstream operators
+ * wherever ordering is required.
+ *
+ * Note: This class performs aggregation over the double value of input.
+ * If the input is single value, the output type will be input type. Otherwise, the output type will be double.
+ *
+ * TODO:
+ *     1. Add support for additional rank window functions
+ *     2. Add support for value window functions
+ *     3. Add support for custom frames (including ROWS support)
+ *     4. Add support for null direction handling (even for PARTITION BY only queries with custom null direction)
+ *     5. Add support for multiple window groups (each WindowAggregateOperator should still work on a single group)
+ */
+public class WindowAggregateOperator extends MultiStageOperator {
+  private static final String EXPLAIN_NAME = "WINDOW";
+  private static final Logger LOGGER = LoggerFactory.getLogger(WindowAggregateOperator.class);
+
+  // List of window functions which can only be applied as ROWS window frame type
+  private static final Set<String> ROWS_ONLY_FUNCTION_NAMES = ImmutableSet.of("ROW_NUMBER");
+  // List of ranking window functions whose output depends on the ordering of input rows and not on the actual values
+  private static final Set<String> RANKING_FUNCTION_NAMES = ImmutableSet.of("RANK", "DENSE_RANK");
+
+  private final MultiStageOperator _inputOperator;
+  private final List<RexExpression> _groupSet;
+  private final OrderSetInfo _orderSetInfo;
+  private final WindowFrame _windowFrame;
+  private final List<RexExpression.FunctionCall> _aggCalls;
+  private final List<RexExpression> _constants;
+  private final DataSchema _resultSchema;
+  private final WindowAggregateAccumulator[] _windowAccumulators;
+  private final Map<Key, List<Object[]>> _partitionRows;
+  private final boolean _isPartitionByOnly;
+
+  private TransferableBlock _upstreamErrorBlock;
+
+  private int _numRows;
+  private boolean _readyToConstruct;
+  private boolean _hasReturnedWindowAggregateBlock;
+
+  public WindowAggregateOperator(OpChainExecutionContext context, MultiStageOperator inputOperator,
+      List<RexExpression> groupSet, List<RexExpression> orderSet, List<RelFieldCollation.Direction> orderSetDirection,
+      List<RelFieldCollation.NullDirection> orderSetNullDirection, List<RexExpression> aggCalls, int lowerBound,
+      int upperBound, WindowNode.WindowFrameType windowFrameType, List<RexExpression> constants,
+      DataSchema resultSchema, DataSchema inputSchema) {
+    this(context, inputOperator, groupSet, orderSet, orderSetDirection, orderSetNullDirection, aggCalls, lowerBound,
+        upperBound, windowFrameType, constants, resultSchema, inputSchema, WindowAggregateAccumulator.WIN_AGG_MERGERS);
+  }
+
+  @VisibleForTesting
+  public WindowAggregateOperator(OpChainExecutionContext context, MultiStageOperator inputOperator,
+      List<RexExpression> groupSet, List<RexExpression> orderSet, List<RelFieldCollation.Direction> orderSetDirection,
+      List<RelFieldCollation.NullDirection> orderSetNullDirection, List<RexExpression> aggCalls, int lowerBound,
+      int upperBound, WindowNode.WindowFrameType windowFrameType, List<RexExpression> constants,
+      DataSchema resultSchema, DataSchema inputSchema,
+      Map<String, Function<DataSchema.ColumnDataType, AggregationUtils.Merger>> mergers) {
+    super(context);
+
+    _inputOperator = inputOperator;
+    _groupSet = groupSet;
+    _isPartitionByOnly = isPartitionByOnlyQuery(groupSet, orderSet);
+    _orderSetInfo = new OrderSetInfo(orderSet, orderSetDirection, orderSetNullDirection, _isPartitionByOnly);
+    _windowFrame = new WindowFrame(lowerBound, upperBound, windowFrameType);
+
+    Preconditions.checkState(_windowFrame.isUnboundedPreceding(),
+        "Only default frame is supported, lowerBound must be UNBOUNDED PRECEDING");
+    Preconditions.checkState(_windowFrame.isUnboundedFollowing() || _windowFrame.isUpperBoundCurrentRow(),
+        "Only default frame is supported, upperBound must be UNBOUNDED FOLLOWING or CURRENT ROW");
+
+    // we expect all agg calls to be aggregate function calls
+    _aggCalls = aggCalls.stream().map(RexExpression.FunctionCall.class::cast).collect(Collectors.toList());
+    _constants = constants;
+    _resultSchema = resultSchema;
+
+    _windowAccumulators = new WindowAggregateAccumulator[_aggCalls.size()];
+    int aggCallsSize = _aggCalls.size();
+    for (int i = 0; i < aggCallsSize; i++) {
+      RexExpression.FunctionCall agg = _aggCalls.get(i);
+      String functionName = agg.getFunctionName();
+      validateAggregationCalls(functionName, mergers);
+      _windowAccumulators[i] = new WindowAggregateAccumulator(agg, mergers, functionName, inputSchema, _orderSetInfo);
+    }
+
+    _partitionRows = new HashMap<>();
+
+    _numRows = 0;
+    _readyToConstruct = false;
+    _hasReturnedWindowAggregateBlock = false;
+  }
+
+  @Override
+  public List<MultiStageOperator> getChildOperators() {
+    return ImmutableList.of(_inputOperator);
+  }
+
+  @Nullable
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+
+  @Override
+  protected TransferableBlock getNextBlock() {
+    try {
+      if (!_readyToConstruct && !consumeInputBlocks()) {
+        return TransferableBlockUtils.getNoOpTransferableBlock();
+      }
+
+      if (_upstreamErrorBlock != null) {
+        return _upstreamErrorBlock;
+      }
+
+      if (!_hasReturnedWindowAggregateBlock) {
+        return produceWindowAggregatedBlock();
+      } else {
+        // TODO: Move to close call.
+        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+      }
+    } catch (Exception e) {
+      LOGGER.error("Caught exception while executing WindowAggregationOperator, returning an error block", e);
+      return TransferableBlockUtils.getErrorTransferableBlock(e);
+    }
+  }
+
+  private void validateAggregationCalls(String functionName,
+      Map<String, Function<DataSchema.ColumnDataType, AggregationUtils.Merger>> mergers) {
+    if (!mergers.containsKey(functionName)) {
+      throw new IllegalStateException("Unexpected aggregation function name: " + functionName);
+    }
+
+    if (ROWS_ONLY_FUNCTION_NAMES.contains(functionName)) {
+      Preconditions.checkState(_windowFrame.getWindowFrameType() == WindowNode.WindowFrameType.ROWS
+              && _windowFrame.isUpperBoundCurrentRow(),
+          String.format("%s must be of ROW frame type and have CURRENT ROW as the upper bound", functionName));
+    } else {
+      Preconditions.checkState(_windowFrame.getWindowFrameType() == WindowNode.WindowFrameType.RANGE,
+          String.format("Only RANGE type frames are supported at present for function: %s", functionName));
+    }
+  }
+
+  private boolean isPartitionByOnlyQuery(List<RexExpression> groupSet, List<RexExpression> orderSet) {
+    if (CollectionUtils.isEmpty(orderSet)) {
+      return true;
+    }
+
+    if (CollectionUtils.isEmpty(groupSet) || (groupSet.size() != orderSet.size())) {
+      return false;
+    }
+
+    Set<Integer> partitionByInputRefIndexes = new HashSet<>();
+    Set<Integer> orderByInputRefIndexes = new HashSet<>();
+    int groupSetSize = groupSet.size();
+    for (int i = 0; i < groupSetSize; i++) {
+      partitionByInputRefIndexes.add(((RexExpression.InputRef) groupSet.get(i)).getIndex());
+      orderByInputRefIndexes.add(((RexExpression.InputRef) orderSet.get(i)).getIndex());
+    }
+
+    return partitionByInputRefIndexes.equals(orderByInputRefIndexes);
+  }
+
+  private TransferableBlock produceWindowAggregatedBlock() {
+    Key emptyOrderKey = AggregationUtils.extractEmptyKey();
+    List<Object[]> rows = new ArrayList<>(_numRows);
+    if (_windowFrame.getWindowFrameType() == WindowNode.WindowFrameType.RANGE) {
+      // All aggregation window functions only support RANGE type today (SUM/AVG/MIN/MAX/COUNT/BOOL_AND/BOOL_OR)
+      // RANK and DENSE_RANK ranking window functions also only support RANGE type today
+      for (Map.Entry<Key, List<Object[]>> e : _partitionRows.entrySet()) {
+        Key partitionKey = e.getKey();
+        List<Object[]> rowList = e.getValue();
+        for (Object[] existingRow : rowList) {
+          Object[] row = new Object[existingRow.length + _aggCalls.size()];
+          Key orderKey = (_isPartitionByOnly && CollectionUtils.isEmpty(_orderSetInfo.getOrderSet())) ? emptyOrderKey
+              : AggregationUtils.extractRowKey(existingRow, _orderSetInfo.getOrderSet());
+          System.arraycopy(existingRow, 0, row, 0, existingRow.length);
+          for (int i = 0; i < _windowAccumulators.length; i++) {
+            row[i + existingRow.length] = _windowAccumulators[i].getRangeResultForKeys(partitionKey, orderKey);
+          }
+          rows.add(row);
+        }
+      }
+    } else {
+      // Only ROW_NUMBER() window function is supported as ROWS type today
+      Key previousPartitionKey = null;
+      Object[] previousRowValues = new Object[_windowAccumulators.length];
+      for (int i = 0; i < _windowAccumulators.length; i++) {
+        previousRowValues[i] = null;
+      }
+
+      for (Map.Entry<Key, List<Object[]>> e : _partitionRows.entrySet()) {
+        Key partitionKey = e.getKey();
+        List<Object[]> rowList = e.getValue();
+        for (Object[] existingRow : rowList) {
+          Object[] row = new Object[existingRow.length + _aggCalls.size()];
+          System.arraycopy(existingRow, 0, row, 0, existingRow.length);
+          for (int i = 0; i < _windowAccumulators.length; i++) {
+            row[i + existingRow.length] = _windowAccumulators[i].computeRowResultForCurrentRow(partitionKey,
+                previousPartitionKey, row, previousRowValues[i]);
+            previousRowValues[i] = row[i + existingRow.length];
+          }
+          previousPartitionKey = partitionKey;
+          rows.add(row);
+        }
+      }
+    }
+    _hasReturnedWindowAggregateBlock = true;
+    if (rows.size() == 0) {
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    } else {
+      return new TransferableBlock(rows, _resultSchema, DataBlock.Type.ROW);
+    }
+  }
+
+  /**
+   * @return whether or not the operator is ready to move on (EOS or ERROR)
+   */
+  private boolean consumeInputBlocks() {
+    Key emptyOrderKey = AggregationUtils.extractEmptyKey();
+    TransferableBlock block = _inputOperator.nextBlock();
+    while (!block.isNoOpBlock()) {
+      // setting upstream error block
+      if (block.isErrorBlock()) {
+        _upstreamErrorBlock = block;
+        return true;
+      } else if (block.isEndOfStreamBlock()) {
+        _readyToConstruct = true;
+        return true;
+      }
+
+      List<Object[]> container = block.getContainer();
+      if (_windowFrame.getWindowFrameType() == WindowNode.WindowFrameType.RANGE) {
+        // Only need to accumulate the aggregate function values for RANGE type. ROW type can be calculated as
+        // we output the rows since the aggregation value depends on the neighboring rows.
+        for (Object[] row : container) {
+          _numRows++;
+          // TODO: Revisit null direction handling for all query types
+          Key key = AggregationUtils.extractRowKey(row, _groupSet);
+          _partitionRows.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
+          // Only need to accumulate the aggregate function values for RANGE type. ROW type can be calculated as
+          // we output the rows since the aggregation value depends on the neighboring rows.
+          Key orderKey = (_isPartitionByOnly && CollectionUtils.isEmpty(_orderSetInfo.getOrderSet())) ? emptyOrderKey
+              : AggregationUtils.extractRowKey(row, _orderSetInfo.getOrderSet());
+          int aggCallsSize = _aggCalls.size();
+          for (int i = 0; i < aggCallsSize; i++) {
+            _windowAccumulators[i].accumulateRangeResults(key, orderKey, row);
+          }
+        }
+      } else {
+        for (Object[] row : container) {
+          _numRows++;
+          // TODO: Revisit null direction handling for all query types
+          Key key = AggregationUtils.extractRowKey(row, _groupSet);
+          _partitionRows.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
+        }
+      }
+      block = _inputOperator.nextBlock();
+    }
+    return false;
+  }
+
+  /**
+   * Contains all the ORDER BY key related information such as the keys, direction, and null direction
+   */
+  private static class OrderSetInfo {
+    // List of order keys
+    final List<RexExpression> _orderSet;
+    // List of order direction for each key
+    final List<RelFieldCollation.Direction> _orderSetDirection;
+    // List of null direction for each key
+    final List<RelFieldCollation.NullDirection> _orderSetNullDirection;
+    // Set to 'true' if this is a partition by only query
+    final boolean _isPartitionByOnly;
+
+    OrderSetInfo(List<RexExpression> orderSet, List<RelFieldCollation.Direction> orderSetDirection,
+        List<RelFieldCollation.NullDirection> orderSetNullDirection, boolean isPartitionByOnly) {
+      _orderSet = orderSet;
+      _orderSetDirection = orderSetDirection;
+      _orderSetNullDirection = orderSetNullDirection;
+      _isPartitionByOnly = isPartitionByOnly;
+    }
+
+    List<RexExpression> getOrderSet() {
+      return _orderSet;
+    }
+
+    List<RelFieldCollation.Direction> getOrderSetDirection() {
+      return _orderSetDirection;
+    }
+
+    List<RelFieldCollation.NullDirection> getOrderSetNullDirection() {
+      return _orderSetNullDirection;
+    }
+
+    boolean isPartitionByOnly() {
+      return _isPartitionByOnly;
+    }
+  }
+
+  /**
+   * Defines the Frame to be used for the window query. The 'lowerBound' and 'upperBound' indicate the frame
+   * boundaries to be used. Whereas, 'isRows' is used to differentiate between RANGE and ROWS type frames.
+   */
+  private static class WindowFrame {
+    // The lower bound of the frame. Set to Integer.MIN_VALUE if UNBOUNDED PRECEDING
+    final int _lowerBound;
+    // The lower bound of the frame. Set to Integer.MAX_VALUE if UNBOUNDED FOLLOWING. Set to 0 if CURRENT ROW
+    final int _upperBound;
+    // Enum to denote the FRAME type, can be either ROW or RANGE types
+    final WindowNode.WindowFrameType _windowFrameType;
+
+    WindowFrame(int lowerBound, int upperBound, WindowNode.WindowFrameType windowFrameType) {
+      _lowerBound = lowerBound;
+      _upperBound = upperBound;
+      _windowFrameType = windowFrameType;
+    }
+
+    boolean isUnboundedPreceding() {
+      return _lowerBound == Integer.MIN_VALUE;
+    }
+
+    boolean isUnboundedFollowing() {
+      return _upperBound == Integer.MAX_VALUE;
+    }
+
+    boolean isUpperBoundCurrentRow() {
+      return _upperBound == 0;
+    }
+
+    WindowNode.WindowFrameType getWindowFrameType() {
+      return _windowFrameType;
+    }
+
+    int getLowerBound() {
+      return _lowerBound;
+    }
+
+    int getUpperBound() {
+      return _upperBound;
+    }
+  }
+
+  private static class MergeRowNumber implements AggregationUtils.Merger {
+
+    @Override
+    public Long init(@Nullable Object value, DataSchema.ColumnDataType dataType) {
+      return 1L;
+    }
+
+    @Override
+    public Long merge(Object agg, @Nullable Object value) {
+      return (long) agg + 1;
+    }
+  }
+
+  private static class MergeRank implements AggregationUtils.Merger {
+
+    @Override
+    public Long init(Object other, DataSchema.ColumnDataType dataType) {
+      return 1L;
+    }
+
+    @Override
+    public Long merge(Object left, Object right) {
+      // RANK always increase by the number of duplicate entries seen for the given ORDER BY key.
+      return ((Number) left).longValue() + ((Number) right).longValue();
+    }
+  }
+
+  private static class MergeDenseRank implements AggregationUtils.Merger {
+
+    @Override
+    public Long init(Object other, DataSchema.ColumnDataType dataType) {
+      return 1L;
+    }
+
+    @Override
+    public Long merge(Object left, Object right) {
+      long rightValueInLong = ((Number) right).longValue();
+      // DENSE_RANK always increase the rank by 1, irrespective of the number of duplicate ORDER BY keys seen
+      return (rightValueInLong == 0L) ? ((Number) left).longValue() : ((Number) left).longValue() + 1L;
+    }
+  }
+
+  private static class WindowAggregateAccumulator extends AggregationUtils.Accumulator {
+    private static final Map<String, Function<DataSchema.ColumnDataType, AggregationUtils.Merger>> WIN_AGG_MERGERS =
+        ImmutableMap.<String, Function<DataSchema.ColumnDataType, AggregationUtils.Merger>>builder()
+            .putAll(AggregationUtils.Accumulator.MERGERS)
+            .put("ROW_NUMBER", cdt -> new MergeRowNumber())
+            .put("RANK", cdt -> new MergeRank())
+            .put("DENSE_RANK", cdt -> new MergeDenseRank())
+            .build();
+
+    private final boolean _isPartitionByOnly;
+    private final boolean _isRankingWindowFunction;
+
+    // Fields needed only for RANGE frame type queries (ORDER BY)
+    private final Map<Key, OrderKeyResult> _orderByResults = new HashMap<>();
+
+    WindowAggregateAccumulator(RexExpression.FunctionCall aggCall, Map<String,
+        Function<DataSchema.ColumnDataType, AggregationUtils.Merger>> merger, String functionName,
+        DataSchema inputSchema, OrderSetInfo orderSetInfo) {
+      super(aggCall, merger, functionName, inputSchema);
+      _isPartitionByOnly = CollectionUtils.isEmpty(orderSetInfo.getOrderSet()) || orderSetInfo.isPartitionByOnly();
+      _isRankingWindowFunction = RANKING_FUNCTION_NAMES.contains(functionName);
+    }
+
+    /**
+     * For ROW type queries the aggregation function value depends on the order of the rows rather than on the actual
+     * keys. For such queries compute the current row value based on the previous row and previous partition key.
+     * This should only be called for ROW type queries.
+     */
+    public Object computeRowResultForCurrentRow(Key currentPartitionKey, Key previousPartitionKey, Object[] row,
+        Object previousRowOutputValue) {
+      Object value = _inputRef == -1 ? _literal : row[_inputRef];
+      if (previousPartitionKey == null || !currentPartitionKey.equals(previousPartitionKey)) {
+        return _merger.init(currentPartitionKey, _dataType);
+      } else {
+        return _merger.merge(previousRowOutputValue, value);
+      }
+    }
+
+    /**
+     * For RANGE type queries, accumulate the function values for each PARTITION BY key and ORDER BY key based on
+     * the current row. Should only be called for RANGE type queries where the aggregation values are tied to the
+     * RANGE key and not to the row ordering. This should only be called for RANGE type queries.
+     */
+    public void accumulateRangeResults(Key key, Key orderKey, Object[] row) {
+      // Ranking functions don't use the row value, thus cannot reuse the AggregationUtils accumulate function for them
+      if (_isPartitionByOnly && !_isRankingWindowFunction) {
+        accumulate(key, row);
+        return;
+      }
+
+      // TODO: fix that single agg result (original type) has different type from multiple agg results (double).
+      Key previousOrderKeyIfPresent = _orderByResults.get(key) == null ? null
+          : _orderByResults.get(key).getPreviousOrderByKey();
+      Object currentRes = previousOrderKeyIfPresent == null ? null
+          : _orderByResults.get(key).getOrderByResults().get(previousOrderKeyIfPresent);
+      Object value = _inputRef == -1 ? _literal : row[_inputRef];
+
+      // The ranking functions do not depend on the actual value of the data, but are calculated based on the
+      // position of the data ordered by the ORDER BY key. Thus they need to be handled differently and require setting
+      // whether the rank has changed or not and if changed then by how much.
+      _orderByResults.putIfAbsent(key, new OrderKeyResult());
+      if (currentRes == null) {
+        value = _isRankingWindowFunction ? 0 : value;
+        _orderByResults.get(key).addOrderByResult(orderKey, _merger.init(value, _dataType));
+      } else {
+        Object mergedResult;
+        if (orderKey.equals(previousOrderKeyIfPresent)) {
+          value = _isRankingWindowFunction ? 0 : value;
+          mergedResult = _merger.merge(currentRes, value);
+        } else {
+          Object previousValue = _orderByResults.get(key).getOrderByResults().get(previousOrderKeyIfPresent);
+          value = _isRankingWindowFunction ? _orderByResults.get(key).getCountOfDuplicateOrderByKeys() : value;
+          mergedResult = _merger.merge(previousValue, value);
+        }
+        _orderByResults.get(key).addOrderByResult(orderKey, mergedResult);
+      }
+    }
+
+    public Object getRangeResultForKeys(Key key, Key orderKey) {
+      if (_isPartitionByOnly && !_isRankingWindowFunction) {
+        return _results.get(key);
+      } else {
+        return _orderByResults.get(key).getOrderByResults().get(orderKey);
+      }
+    }
+
+    public Map<Key, OrderKeyResult> getRangeOrderByResults() {
+      return _orderByResults;
+    }
+
+    static class OrderKeyResult {
+      final Map<Key, Object> _orderByResults;
+      Key _previousOrderByKey;
+      // Store the counts of duplicate ORDER BY keys seen for this PARTITION BY key for calculating RANK/DENSE_RANK
+      long _countOfDuplicateOrderByKeys;
+
+      OrderKeyResult() {
+        _orderByResults = new HashMap<>();
+        _previousOrderByKey = null;
+        _countOfDuplicateOrderByKeys = 0;
+      }
+
+      public void addOrderByResult(Key orderByKey, Object value) {
+        // We expect to get the rows in order based on the ORDER BY key so it is safe to blindly assign the
+        // current key as the previous key
+        _orderByResults.put(orderByKey, value);
+        _countOfDuplicateOrderByKeys = (_previousOrderByKey != null && _previousOrderByKey.equals(orderByKey))
+            ? _countOfDuplicateOrderByKeys + 1 : 1;
+        _previousOrderByKey = orderByKey;
+      }
+
+      public Map<Key, Object> getOrderByResults() {
+        return _orderByResults;
+      }
+
+      public Key getPreviousOrderByKey() {
+        return _previousOrderByKey;
+      }
+
+      public long getCountOfDuplicateOrderByKeys() {
+        return _countOfDuplicateOrderByKeys;
+      }
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchange.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchange.java
index 2309b9dcb1c..e3f4a48ddf8 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchange.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchange.java
@@ -20,41 +20,60 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import org.apache.calcite.rel.RelDistribution;
 import org.apache.pinot.common.datablock.DataBlock;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
 import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
 import org.apache.pinot.query.runtime.blocks.BlockSplitter;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
  * This class contains the shared logic across all different exchange types for
  * exchanging data across different servers.
+ *
+ * {@link BlockExchange} is used by {@link org.apache.pinot.query.runtime.operator.MailboxSendOperator} to
+ * exchange data between underlying {@link org.apache.pinot.query.mailbox.MailboxService} and the query stage execution
+ * engine running the actual {@link org.apache.pinot.query.runtime.operator.OpChain}.
  */
 public abstract class BlockExchange {
+  public static final int DEFAULT_MAX_PENDING_BLOCKS = 5;
+  private static final Logger LOGGER = LoggerFactory.getLogger(BlockExchange.class);
   // TODO: Deduct this value via grpc config maximum byte size; and make it configurable with override.
   // TODO: Max block size is a soft limit. only counts fixedSize datatable byte buffer
   private static final int MAX_MAILBOX_CONTENT_SIZE_BYTES = 4 * 1024 * 1024;
 
-  private final MailboxService<TransferableBlock> _mailbox;
-  private final List<MailboxIdentifier> _destinations;
+  private final OpChainId _opChainId;
+  private final List<SendingMailbox> _sendingMailboxes;
   private final BlockSplitter _splitter;
+  private final Consumer<OpChainId> _callback;
+  private final long _deadlineMs;
+
+  private final BlockingQueue<TransferableBlock> _queue = new ArrayBlockingQueue<>(DEFAULT_MAX_PENDING_BLOCKS);
+  private final AtomicReference<TransferableBlock> _errorBlock = new AtomicReference<>();
 
-  public static BlockExchange getExchange(MailboxService<TransferableBlock> mailboxService,
-      List<MailboxIdentifier> destinations, RelDistribution.Type exchangeType,
-      KeySelector<Object[], Object[]> selector, BlockSplitter splitter) {
+  public static BlockExchange getExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes,
+      RelDistribution.Type exchangeType, KeySelector<Object[], Object[]> selector, BlockSplitter splitter,
+      Consumer<OpChainId> callback, long deadlineMs) {
     switch (exchangeType) {
       case SINGLETON:
-        return new SingletonExchange(mailboxService, destinations, splitter);
+        return new SingletonExchange(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
       case HASH_DISTRIBUTED:
-        return new HashExchange(mailboxService, destinations, selector, splitter);
+        return new HashExchange(opChainId, sendingMailboxes, selector, splitter, callback, deadlineMs);
       case RANDOM_DISTRIBUTED:
-        return new RandomExchange(mailboxService, destinations, splitter);
+        return new RandomExchange(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
       case BROADCAST_DISTRIBUTED:
-        return new BroadcastExchange(mailboxService, destinations, splitter);
+        return new BroadcastExchange(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
       case ROUND_ROBIN_DISTRIBUTED:
       case RANGE_DISTRIBUTED:
       case ANY:
@@ -63,29 +82,58 @@ public static BlockExchange getExchange(MailboxService<TransferableBlock> mailbo
     }
   }
 
-  protected BlockExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-      BlockSplitter splitter) {
-    _mailbox = mailbox;
-    _destinations = destinations;
+  protected BlockExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes, BlockSplitter splitter,
+      Consumer<OpChainId> callback, long deadlineMs) {
+    _opChainId = opChainId;
+    _sendingMailboxes = sendingMailboxes;
     _splitter = splitter;
+    _callback = callback;
+    _deadlineMs = deadlineMs;
   }
 
-  public void send(TransferableBlock block) {
-    if (block.isEndOfStreamBlock()) {
-      _destinations.forEach(destination -> sendBlock(destination, block));
-      return;
-    }
+  public boolean offerBlock(TransferableBlock block, long timeoutMs)
+      throws Exception {
+    return _queue.offer(block, timeoutMs, TimeUnit.MILLISECONDS);
+  }
 
-    Iterator<RoutedBlock> routedBlocks = route(_destinations, block);
-    while (routedBlocks.hasNext()) {
-      RoutedBlock next = routedBlocks.next();
-      sendBlock(next._destination, next._block);
-    }
+  public int getRemainingCapacity() {
+    return _queue.remainingCapacity();
   }
 
-  private void sendBlock(MailboxIdentifier mailboxId, TransferableBlock block) {
-    SendingMailbox<TransferableBlock> sendingMailbox = _mailbox.getSendingMailbox(mailboxId);
+  public TransferableBlock send() {
+    try {
+      TransferableBlock block;
+      long timeoutMs = _deadlineMs - System.currentTimeMillis();
+      if (_errorBlock.get() != null) {
+        LOGGER.debug("Exchange: {} is already cancelled or errored out internally, ignore the late block", _opChainId);
+        return _errorBlock.get();
+      }
+      block = _queue.poll(timeoutMs, TimeUnit.MILLISECONDS);
+      if (block == null) {
+        block = TransferableBlockUtils.getErrorTransferableBlock(
+            new TimeoutException("Timed out on exchange for opChain: " + _opChainId));
+      } else {
+        // Notify that the block exchange can now accept more blocks.
+        _callback.accept(_opChainId);
+        if (block.isEndOfStreamBlock()) {
+          for (SendingMailbox sendingMailbox : _sendingMailboxes) {
+            sendBlock(sendingMailbox, block);
+          }
+        } else {
+          route(_sendingMailboxes, block);
+        }
+      }
+      return block;
+    } catch (Exception e) {
+      TransferableBlock errorBlock = TransferableBlockUtils.getErrorTransferableBlock(
+          new RuntimeException("Exception while sending data via exchange for opChain: " + _opChainId));
+      setErrorBlock(errorBlock);
+      return errorBlock;
+    }
+  }
 
+  protected void sendBlock(SendingMailbox sendingMailbox, TransferableBlock block)
+      throws Exception {
     if (block.isEndOfStreamBlock()) {
       sendingMailbox.send(block);
       sendingMailbox.complete();
@@ -94,21 +142,35 @@ private void sendBlock(MailboxIdentifier mailboxId, TransferableBlock block) {
 
     DataBlock.Type type = block.getType();
     Iterator<TransferableBlock> splits = _splitter.split(block, type, MAX_MAILBOX_CONTENT_SIZE_BYTES);
-
     while (splits.hasNext()) {
       sendingMailbox.send(splits.next());
     }
   }
 
-  protected abstract Iterator<RoutedBlock> route(List<MailboxIdentifier> destinations, TransferableBlock block);
+  private void setErrorBlock(TransferableBlock errorBlock) {
+    if (_errorBlock.compareAndSet(null, errorBlock)) {
+      try {
+        for (SendingMailbox sendingMailbox : _sendingMailboxes) {
+          sendBlock(sendingMailbox, errorBlock);
+        }
+      } catch (Exception e) {
+        LOGGER.error("error while sending exception block via exchange for opChain: " + _opChainId, e);
+      }
+      _queue.clear();
+    }
+  }
+
+  protected abstract void route(List<SendingMailbox> destinations, TransferableBlock block)
+      throws Exception;
 
-  protected static class RoutedBlock {
-    final MailboxIdentifier _destination;
-    final TransferableBlock _block;
+  // Called when the OpChain gracefully returns.
+  // TODO: This is a no-op right now.
+  public void close() {
+  }
 
-    protected RoutedBlock(MailboxIdentifier destination, TransferableBlock block) {
-      _destination = destination;
-      _block = block;
+  public void cancel(Throwable t) {
+    for (SendingMailbox sendingMailbox : _sendingMailboxes) {
+      sendingMailbox.cancel(t);
     }
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchange.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchange.java
index dc1dc2e9ddf..3a95436388b 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchange.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchange.java
@@ -18,12 +18,12 @@
  */
 package org.apache.pinot.query.runtime.operator.exchange;
 
-import java.util.Iterator;
 import java.util.List;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import java.util.function.Consumer;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.BlockSplitter;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 
 
 /**
@@ -31,13 +31,16 @@
  */
 class BroadcastExchange extends BlockExchange {
 
-  protected BroadcastExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-      BlockSplitter splitter) {
-    super(mailbox, destinations, splitter);
+  protected BroadcastExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes, BlockSplitter splitter,
+      Consumer<OpChainId> callback, long deadlineMs) {
+    super(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
   }
 
   @Override
-  protected Iterator<RoutedBlock> route(List<MailboxIdentifier> destinations, TransferableBlock block) {
-    return destinations.stream().map(dest -> new RoutedBlock(dest, block)).iterator();
+  protected void route(List<SendingMailbox> destinations, TransferableBlock block)
+      throws Exception {
+    for (SendingMailbox mailbox : destinations) {
+      sendBlock(mailbox, block);
+    }
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/HashExchange.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/HashExchange.java
index 2371221740b..2f14d1445a2 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/HashExchange.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/HashExchange.java
@@ -18,17 +18,14 @@
  */
 package org.apache.pinot.query.runtime.operator.exchange;
 
-import com.google.common.collect.Iterators;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import java.util.function.Consumer;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
 import org.apache.pinot.query.runtime.blocks.BlockSplitter;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 
 
 /**
@@ -41,25 +38,28 @@ class HashExchange extends BlockExchange {
   // TODO: ensure that server instance list is sorted using same function in sender.
   private final KeySelector<Object[], Object[]> _keySelector;
 
-  HashExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-      KeySelector<Object[], Object[]> selector, BlockSplitter splitter) {
-    super(mailbox, destinations, splitter);
+  HashExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes, KeySelector<Object[], Object[]> selector,
+      BlockSplitter splitter, Consumer<OpChainId> callback, long deadlineMs) {
+    super(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
     _keySelector = selector;
   }
 
   @Override
-  protected Iterator<RoutedBlock> route(List<MailboxIdentifier> destinations, TransferableBlock block) {
-    Map<Integer, List<Object[]>> destIdxToRows = new HashMap<>();
-
-    for (Object[] row : block.getContainer()) {
+  protected void route(List<SendingMailbox> destinations, TransferableBlock block)
+      throws Exception {
+    List<Object[]>[] destIdxToRows = new List[destinations.size()];
+    List<Object[]> container = block.getContainer();
+    for (Object[] row : container) {
       int partition = _keySelector.computeHash(row) % destinations.size();
-      destIdxToRows.computeIfAbsent(partition, k -> new ArrayList<>()).add(row);
+      if (destIdxToRows[partition] == null) {
+        destIdxToRows[partition] = new ArrayList<>(container.size());
+      }
+      destIdxToRows[partition].add(row);
+    }
+    for (int i = 0; i < destinations.size(); i++) {
+      if (destIdxToRows[i] != null) {
+        sendBlock(destinations.get(i), new TransferableBlock(destIdxToRows[i], block.getDataSchema(), block.getType()));
+      }
     }
-
-    return Iterators.transform(
-        destIdxToRows.entrySet().iterator(),
-        partitionAndBlock -> new RoutedBlock(
-            destinations.get(partitionAndBlock.getKey()),
-            new TransferableBlock(partitionAndBlock.getValue(), block.getDataSchema(), block.getType())));
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchange.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchange.java
index d12cc3ae46f..fb21b00a602 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchange.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchange.java
@@ -19,15 +19,14 @@
 package org.apache.pinot.query.runtime.operator.exchange;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Iterators;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+import java.util.function.Consumer;
 import java.util.function.IntFunction;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.BlockSplitter;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 
 
 /**
@@ -39,21 +38,22 @@ class RandomExchange extends BlockExchange {
 
   private final IntFunction<Integer> _rand;
 
-  RandomExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-      BlockSplitter splitter) {
-    this(mailbox, destinations, RANDOM::nextInt, splitter);
+  RandomExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes, BlockSplitter splitter,
+      Consumer<OpChainId> callback, long deadlineMs) {
+    this(opChainId, sendingMailboxes, RANDOM::nextInt, splitter, callback, deadlineMs);
   }
 
   @VisibleForTesting
-  RandomExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-      IntFunction<Integer> rand, BlockSplitter splitter) {
-    super(mailbox, destinations, splitter);
+  RandomExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes, IntFunction<Integer> rand,
+      BlockSplitter splitter, Consumer<OpChainId> callback, long deadlineMs) {
+    super(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
     _rand = rand;
   }
 
   @Override
-  protected Iterator<RoutedBlock> route(List<MailboxIdentifier> destinations, TransferableBlock block) {
+  protected void route(List<SendingMailbox> destinations, TransferableBlock block)
+      throws Exception {
     int destinationIdx = _rand.apply(destinations.size());
-    return Iterators.singletonIterator(new RoutedBlock(destinations.get(destinationIdx), block));
+    sendBlock(destinations.get(destinationIdx), block);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchange.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchange.java
index 94568e57dba..4634eb09f28 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchange.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchange.java
@@ -18,14 +18,14 @@
  */
 package org.apache.pinot.query.runtime.operator.exchange;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import java.util.Iterator;
+import com.google.common.base.Preconditions;
 import java.util.List;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import java.util.function.Consumer;
+import org.apache.pinot.query.mailbox.InMemorySendingMailbox;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.BlockSplitter;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 
 
 /**
@@ -34,13 +34,17 @@
  */
 class SingletonExchange extends BlockExchange {
 
-  SingletonExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-      BlockSplitter splitter) {
-    super(mailbox, destinations, splitter);
+  SingletonExchange(OpChainId opChainId, List<SendingMailbox> sendingMailboxes, BlockSplitter splitter,
+      Consumer<OpChainId> callback, long deadlineMs) {
+    super(opChainId, sendingMailboxes, splitter, callback, deadlineMs);
+    Preconditions.checkArgument(
+        sendingMailboxes.size() == 1 && sendingMailboxes.get(0) instanceof InMemorySendingMailbox,
+        "Expect single InMemorySendingMailbox for SingletonExchange");
   }
 
   @Override
-  protected Iterator<RoutedBlock> route(List<MailboxIdentifier> destinations, TransferableBlock block) {
-    return Iterators.singletonIterator(new RoutedBlock(Iterables.getOnlyElement(destinations), block));
+  protected void route(List<SendingMailbox> sendingMailboxes, TransferableBlock block)
+      throws Exception {
+    sendBlock(sendingMailboxes.get(0), block);
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FilterOperand.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FilterOperand.java
index fbd8f95bd2b..dbe3c179ca9 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FilterOperand.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FilterOperand.java
@@ -18,12 +18,13 @@
  */
 package org.apache.pinot.query.runtime.operator.operands;
 
-
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.IntPredicate;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.runtime.operator.utils.TypeUtils;
 import org.apache.pinot.spi.utils.BooleanUtils;
 
 
@@ -100,15 +101,16 @@ public Boolean apply(Object[] row) {
     }
   }
 
-  public static abstract class Predicate extends FilterOperand {
-    protected final TransformOperand _lhs;
-    protected final TransformOperand _rhs;
-    protected final boolean _requireCasting;
-    protected final DataSchema.ColumnDataType _commonCastType;
+  public static class Predicate extends FilterOperand {
+    private final TransformOperand _lhs;
+    private final TransformOperand _rhs;
+    private final IntPredicate _comparisonResultPredicate;
+    private final boolean _requireCasting;
+    private final DataSchema.ColumnDataType _commonCastType;
 
     /**
      * Predicate constructor also resolve data type,
-     * since we don't have a exhausted list of filter function signatures. we rely on type casting.
+     * since we don't have an exhausted list of filter function signatures. we rely on type casting.
      *
      * <ul>
      *   <li>if both RHS and LHS has null data type, exception occurs.</li>
@@ -116,22 +118,22 @@ public static abstract class Predicate extends FilterOperand {
      *   <li>if either side supertype of the other, we use the super type.</li>
      *   <li>if we can't resolve a common data type, exception occurs.</li>
      * </ul>
-     *
-     *
      */
-    public Predicate(List<RexExpression> functionOperands, DataSchema inputDataSchema) {
+    public Predicate(List<RexExpression> functionOperands, DataSchema inputDataSchema,
+        IntPredicate comparisonResultPredicate) {
       Preconditions.checkState(functionOperands.size() == 2,
           "Expected 2 function ops for Predicate but got:" + functionOperands.size());
       _lhs = TransformOperand.toTransformOperand(functionOperands.get(0), inputDataSchema);
       _rhs = TransformOperand.toTransformOperand(functionOperands.get(1), inputDataSchema);
+      _comparisonResultPredicate = comparisonResultPredicate;
 
       // TODO: Correctly throw exception instead of returning null.
       // Currently exception thrown during constructor is not piped back to query dispatcher, thus in order to
       // avoid silent failure, we deliberately set to null here, make the exception thrown during data processing.
       // TODO: right now all the numeric columns are still doing conversion b/c even if the inputDataSchema asked for
       // one of the number type, it might not contain the exact type in the payload.
-      if (_lhs._resultType == null || _lhs._resultType == DataSchema.ColumnDataType.OBJECT
-          || _rhs._resultType == null || _rhs._resultType == DataSchema.ColumnDataType.OBJECT) {
+      if (_lhs._resultType == null || _lhs._resultType == DataSchema.ColumnDataType.OBJECT || _rhs._resultType == null
+          || _rhs._resultType == DataSchema.ColumnDataType.OBJECT) {
         _requireCasting = false;
         _commonCastType = null;
       } else if (_lhs._resultType.isSuperTypeOf(_rhs._resultType)) {
@@ -145,5 +147,24 @@ public Predicate(List<RexExpression> functionOperands, DataSchema inputDataSchem
         _commonCastType = null;
       }
     }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @Override
+    public Boolean apply(Object[] row) {
+      Comparable v1 = (Comparable) _lhs.apply(row);
+      if (v1 == null) {
+        return false;
+      }
+      Comparable v2 = (Comparable) _rhs.apply(row);
+      if (v2 == null) {
+        return false;
+      }
+      if (_requireCasting) {
+        v1 = (Comparable) TypeUtils.convert(v1, _commonCastType);
+        v2 = (Comparable) TypeUtils.convert(v2, _commonCastType);
+        assert v1 != null && v2 != null;
+      }
+      return _comparisonResultPredicate.test(v1.compareTo(v2));
+    }
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FunctionOperand.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FunctionOperand.java
index b5852bad11b..6d3fdda40ae 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FunctionOperand.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FunctionOperand.java
@@ -50,8 +50,10 @@ public FunctionOperand(RexExpression.FunctionCall functionCall, DataSchema dataS
     Preconditions.checkNotNull(functionInfo, "Cannot find function with Name: " + functionCall.getFunctionName());
     _functionInvoker = new FunctionInvoker(functionInfo);
     _resultName = computeColumnName(functionCall.getFunctionName(), _childOperandList);
-    // TODO: Check type match between functionCall's data type and result type.
     _resultType = FunctionUtils.getColumnDataType(_functionInvoker.getResultClass());
+    if (functionCall.getDataType() != FunctionUtils.getDataType(_functionInvoker.getResultClass())) {
+      _resultType = DataSchema.ColumnDataType.fromDataType(functionCall.getDataType(), true);
+    }
     _reusableOperandHolder = new Object[operandExpressions.size()];
   }
 
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/TransformOperand.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/TransformOperand.java
index 7c34c8e46c8..88eb4f37de9 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/TransformOperand.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/operands/TransformOperand.java
@@ -18,12 +18,11 @@
  */
 package org.apache.pinot.query.runtime.operator.operands;
 
-
 import com.google.common.base.Preconditions;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.query.planner.logical.RexExpression;
-import org.apache.pinot.query.runtime.operator.utils.FunctionInvokeUtils;
 import org.apache.pinot.query.runtime.operator.utils.OperatorUtils;
 
 
@@ -43,7 +42,6 @@ public static TransformOperand toTransformOperand(RexExpression rexExpression, D
     }
   }
 
-  @SuppressWarnings({"ConstantConditions", "rawtypes", "unchecked"})
   private static TransformOperand toTransformOperand(RexExpression.FunctionCall functionCall,
       DataSchema inputDataSchema) {
     final List<RexExpression> functionOperands = functionCall.getFunctionOperands();
@@ -65,77 +63,17 @@ private static TransformOperand toTransformOperand(RexExpression.FunctionCall fu
             "BOOL / IS_TRUE takes one argument, passed in argument size:" + operandSize);
         return new FilterOperand.True(functionOperands.get(0), inputDataSchema);
       case "equals":
-        return new FilterOperand.Predicate(functionOperands, inputDataSchema) {
-          @Override
-          public Boolean apply(Object[] row) {
-            if (_requireCasting) {
-              return ((Comparable) FunctionInvokeUtils.convert(_lhs.apply(row), _commonCastType)).compareTo(
-                  FunctionInvokeUtils.convert(_rhs.apply(row), _commonCastType)) == 0;
-            } else {
-              return ((Comparable) _lhs.apply(row)).compareTo(_rhs.apply(row)) == 0;
-            }
-          }
-        };
+        return new FilterOperand.Predicate(functionOperands, inputDataSchema, v -> v == 0);
       case "notEquals":
-        return new FilterOperand.Predicate(functionOperands, inputDataSchema) {
-          @Override
-          public Boolean apply(Object[] row) {
-            if (_requireCasting) {
-              return ((Comparable) FunctionInvokeUtils.convert(_lhs.apply(row), _commonCastType)).compareTo(
-                  FunctionInvokeUtils.convert(_rhs.apply(row), _commonCastType)) != 0;
-            } else {
-              return ((Comparable) _lhs.apply(row)).compareTo(_rhs.apply(row)) != 0;
-            }
-          }
-        };
+        return new FilterOperand.Predicate(functionOperands, inputDataSchema, v -> v != 0);
       case "greaterThan":
-        return new FilterOperand.Predicate(functionOperands, inputDataSchema) {
-          @Override
-          public Boolean apply(Object[] row) {
-            if (_requireCasting) {
-              return ((Comparable) FunctionInvokeUtils.convert(_lhs.apply(row), _commonCastType)).compareTo(
-                  FunctionInvokeUtils.convert(_rhs.apply(row), _commonCastType)) > 0;
-            } else {
-              return ((Comparable) _lhs.apply(row)).compareTo(_rhs.apply(row)) > 0;
-            }
-          }
-        };
+        return new FilterOperand.Predicate(functionOperands, inputDataSchema, v -> v > 0);
       case "greaterThanOrEqual":
-        return new FilterOperand.Predicate(functionOperands, inputDataSchema) {
-          @Override
-          public Boolean apply(Object[] row) {
-            if (_requireCasting) {
-              return ((Comparable) FunctionInvokeUtils.convert(_lhs.apply(row), _commonCastType)).compareTo(
-                  FunctionInvokeUtils.convert(_rhs.apply(row), _commonCastType)) >= 0;
-            } else {
-              return ((Comparable) _lhs.apply(row)).compareTo(_rhs.apply(row)) >= 0;
-            }
-          }
-        };
+        return new FilterOperand.Predicate(functionOperands, inputDataSchema, v -> v >= 0);
       case "lessThan":
-        return new FilterOperand.Predicate(functionOperands, inputDataSchema) {
-          @Override
-          public Boolean apply(Object[] row) {
-            if (_requireCasting) {
-              return ((Comparable) FunctionInvokeUtils.convert(_lhs.apply(row), _commonCastType)).compareTo(
-                  FunctionInvokeUtils.convert(_rhs.apply(row), _commonCastType)) < 0;
-            } else {
-              return ((Comparable) _lhs.apply(row)).compareTo(_rhs.apply(row)) < 0;
-            }
-          }
-        };
+        return new FilterOperand.Predicate(functionOperands, inputDataSchema, v -> v < 0);
       case "lessThanOrEqual":
-        return new FilterOperand.Predicate(functionOperands, inputDataSchema) {
-          @Override
-          public Boolean apply(Object[] row) {
-            if (_requireCasting) {
-              return ((Comparable) FunctionInvokeUtils.convert(_lhs.apply(row), _commonCastType)).compareTo(
-                  FunctionInvokeUtils.convert(_rhs.apply(row), _commonCastType)) <= 0;
-            } else {
-              return ((Comparable) _lhs.apply(row)).compareTo(_rhs.apply(row)) <= 0;
-            }
-          }
-        };
+        return new FilterOperand.Predicate(functionOperands, inputDataSchema, v -> v <= 0);
       default:
         return new FunctionOperand(functionCall, inputDataSchema);
     }
@@ -149,5 +87,6 @@ public DataSchema.ColumnDataType getResultType() {
     return _resultType;
   }
 
+  @Nullable
   public abstract Object apply(Object[] row);
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/AggregationUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/AggregationUtils.java
new file mode 100644
index 00000000000..e3e466d7d27
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/AggregationUtils.java
@@ -0,0 +1,224 @@
+/**
+ * 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.pinot.query.runtime.operator.utils;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.data.table.Key;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+/**
+ * Utility class to perform accumulation over a collection of rows. It provides utils for the following:
+ * (1) method to deal with aggregation key and
+ * (2) method to merge a row into an existing accumulator
+ *
+ * <p>Accumulation is used by {@code WindowAggregateOperator} and {@code AggregateOperator}.
+ */
+public class AggregationUtils {
+  private AggregationUtils() {
+  }
+
+  public static Key extractRowKey(Object[] row, List<RexExpression> groupSet) {
+    Object[] keyElements = new Object[groupSet.size()];
+    for (int i = 0; i < groupSet.size(); i++) {
+      keyElements[i] = row[((RexExpression.InputRef) groupSet.get(i)).getIndex()];
+    }
+    return new Key(keyElements);
+  }
+
+  public static Key extractEmptyKey() {
+    return new Key(new Object[0]);
+  }
+
+  // TODO: Use the correct type for SUM/MIN/MAX instead of always using double
+
+  @Nullable
+  private static Object mergeSum(@Nullable Object agg, @Nullable Object value) {
+    if (agg == null) {
+      return value;
+    }
+    if (value == null) {
+      return agg;
+    }
+    return ((Number) agg).doubleValue() + ((Number) value).doubleValue();
+  }
+
+  @Nullable
+  private static Object mergeMin(@Nullable Object agg, @Nullable Object value) {
+    if (agg == null) {
+      return value;
+    }
+    if (value == null) {
+      return agg;
+    }
+    return Math.min(((Number) agg).doubleValue(), ((Number) value).doubleValue());
+  }
+
+  @Nullable
+  private static Object mergeMax(@Nullable Object agg, @Nullable Object value) {
+    if (agg == null) {
+      return value;
+    }
+    if (value == null) {
+      return agg;
+    }
+    return Math.max(((Number) agg).doubleValue(), ((Number) value).doubleValue());
+  }
+
+  @Nullable
+  private static Boolean mergeBoolAnd(@Nullable Object agg, @Nullable Object value) {
+    if (agg == null) {
+      return (Boolean) value;
+    }
+    if (value == null) {
+      return (Boolean) agg;
+    }
+    return ((Boolean) agg) & ((Boolean) value);
+  }
+
+  @Nullable
+  private static Boolean mergeBoolOr(@Nullable Object agg, @Nullable Object value) {
+    if (agg == null) {
+      return (Boolean) value;
+    }
+    if (value == null) {
+      return (Boolean) agg;
+    }
+    return ((Boolean) agg) | ((Boolean) value);
+  }
+
+  private static class MergeCounts implements AggregationUtils.Merger {
+
+    @Override
+    public Long init(@Nullable Object value, DataSchema.ColumnDataType dataType) {
+      return value == null ? 0L : 1L;
+    }
+
+    @Override
+    public Long merge(Object agg, @Nullable Object value) {
+      return value == null ? (long) agg : (long) agg + 1;
+    }
+  }
+
+  public interface Merger {
+
+    /**
+     * Initializes the merger based on the column data type and first value.
+     */
+    @Nullable
+    default Object init(@Nullable Object value, DataSchema.ColumnDataType dataType) {
+      return value;
+    }
+
+    /**
+     * Merges the existing aggregate (the result of {@link #init(Object, DataSchema.ColumnDataType)}) with
+     * the new value coming in (which may be an aggregate in and of itself).
+     */
+    @Nullable
+    Object merge(@Nullable Object agg, @Nullable Object value);
+  }
+
+  /**
+   * Accumulator class which accumulates the aggregated results into the group sets if any
+   */
+  public static class Accumulator {
+    public static final Map<String, Function<DataSchema.ColumnDataType, AggregationUtils.Merger>> MERGERS =
+        ImmutableMap.<String, Function<DataSchema.ColumnDataType, AggregationUtils.Merger>>builder()
+            .put("SUM", cdt -> AggregationUtils::mergeSum)
+            .put("$SUM", cdt -> AggregationUtils::mergeSum)
+            .put("$SUM0", cdt -> AggregationUtils::mergeSum)
+            .put("MIN", cdt -> AggregationUtils::mergeMin)
+            .put("$MIN", cdt -> AggregationUtils::mergeMin)
+            .put("$MIN0", cdt -> AggregationUtils::mergeMin)
+            .put("MAX", cdt -> AggregationUtils::mergeMax)
+            .put("$MAX", cdt -> AggregationUtils::mergeMax)
+            .put("$MAX0", cdt -> AggregationUtils::mergeMax)
+            .put("COUNT", cdt -> new AggregationUtils.MergeCounts())
+            .put("BOOL_AND", cdt -> AggregationUtils::mergeBoolAnd)
+            .put("$BOOL_AND", cdt -> AggregationUtils::mergeBoolAnd)
+            .put("$BOOL_AND0", cdt -> AggregationUtils::mergeBoolAnd)
+            .put("BOOL_OR", cdt -> AggregationUtils::mergeBoolOr)
+            .put("$BOOL_OR", cdt -> AggregationUtils::mergeBoolOr)
+            .put("$BOOL_OR0", cdt -> AggregationUtils::mergeBoolOr)
+            .build();
+
+    protected final int _inputRef;
+    protected final Object _literal;
+    protected final Map<Key, Object> _results = new HashMap<>();
+    protected final Merger _merger;
+    protected final DataSchema.ColumnDataType _dataType;
+
+    public Map<Key, Object> getResults() {
+      return _results;
+    }
+
+    public Merger getMerger() {
+      return _merger;
+    }
+
+    public DataSchema.ColumnDataType getDataType() {
+      return _dataType;
+    }
+
+    public Accumulator(RexExpression.FunctionCall aggCall, Map<String,
+        Function<DataSchema.ColumnDataType, AggregationUtils.Merger>> merger, String functionName,
+        DataSchema inputSchema) {
+      // agg function operand should either be a InputRef or a Literal
+      RexExpression rexExpression = toAggregationFunctionOperand(aggCall);
+      if (rexExpression instanceof RexExpression.InputRef) {
+        _inputRef = ((RexExpression.InputRef) rexExpression).getIndex();
+        _literal = null;
+        _dataType = inputSchema.getColumnDataType(_inputRef);
+      } else {
+        _inputRef = -1;
+        _literal = ((RexExpression.Literal) rexExpression).getValue();
+        _dataType = DataSchema.ColumnDataType.fromDataType(rexExpression.getDataType(), true);
+      }
+      _merger = merger.get(functionName).apply(_dataType);
+    }
+
+    public void accumulate(Key key, Object[] row) {
+      // TODO: fix that single agg result (original type) has different type from multiple agg results (double).
+      Object currentRes = _results.get(key);
+      Object value = _inputRef == -1 ? _literal : row[_inputRef];
+
+      if (currentRes == null) {
+        _results.put(key, _merger.init(value, _dataType));
+      } else {
+        Object mergedResult = _merger.merge(currentRes, value);
+        _results.put(key, mergedResult);
+      }
+    }
+
+    private RexExpression toAggregationFunctionOperand(RexExpression.FunctionCall rexExpression) {
+      List<RexExpression> functionOperands = rexExpression.getFunctionOperands();
+      Preconditions.checkState(functionOperands.size() < 2, "aggregate functions cannot have more than one operand");
+      return functionOperands.size() > 0 ? functionOperands.get(0)
+          : new RexExpression.Literal(FieldSpec.DataType.INT, 1);
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/OperatorUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/OperatorUtils.java
index a5042c99bb5..b771165cadf 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/OperatorUtils.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/OperatorUtils.java
@@ -18,13 +18,23 @@
  */
 package org.apache.pinot.query.runtime.operator.utils;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
+import org.apache.pinot.common.datablock.MetadataBlock;
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.operator.OperatorStats;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class OperatorUtils {
-
+  private static final Logger LOGGER = LoggerFactory.getLogger(OperatorUtils.class);
   private static final Map<String, String> OPERATOR_TOKEN_MAPPING = new HashMap<>();
 
   static {
@@ -56,4 +66,70 @@ public static String canonicalizeFunctionName(String functionName) {
     functionName = OPERATOR_TOKEN_MAPPING.getOrDefault(functionName, functionName);
     return functionName;
   }
+
+  public static void recordTableName(OperatorStats operatorStats, DispatchablePlanFragment dispatchablePlanFragment) {
+    String tableName = dispatchablePlanFragment.getTableName();
+    if (tableName != null) {
+      operatorStats.recordSingleStat(DataTable.MetadataKey.TABLE.getName(), tableName);
+    }
+  }
+
+  public static String operatorStatsToJson(OperatorStats operatorStats) {
+    try {
+      Map<String, Object> jsonOut = new HashMap<>();
+      jsonOut.put("requestId", operatorStats.getRequestId());
+      jsonOut.put("stageId", operatorStats.getStageId());
+      jsonOut.put("serverAddress", operatorStats.getServerAddress().toString());
+      jsonOut.put("executionStats", operatorStats.getExecutionStats());
+      return JsonUtils.objectToString(jsonOut);
+    } catch (Exception e) {
+      LOGGER.warn("Error occurred while serializing operatorStats: {}", operatorStats, e);
+    }
+    return null;
+  }
+
+  public static OperatorStats operatorStatsFromJson(String json) {
+    try {
+      JsonNode operatorStatsNode = JsonUtils.stringToJsonNode(json);
+      long requestId = operatorStatsNode.get("requestId").asLong();
+      int stageId = operatorStatsNode.get("stageId").asInt();
+      String serverAddressStr = operatorStatsNode.get("serverAddress").asText();
+      VirtualServerAddress serverAddress = VirtualServerAddress.parse(serverAddressStr);
+
+      OperatorStats operatorStats =
+          new OperatorStats(requestId, stageId, serverAddress);
+      operatorStats.recordExecutionStats(
+          JsonUtils.jsonNodeToObject(operatorStatsNode.get("executionStats"), new TypeReference<Map<String, String>>() {
+          }));
+
+      return operatorStats;
+    } catch (Exception e) {
+      LOGGER.warn("Error occurred while deserializing operatorStats: {}", json, e);
+    }
+    return null;
+  }
+
+  public static Map<String, OperatorStats> getOperatorStatsFromMetadata(MetadataBlock metadataBlock) {
+    Map<String, OperatorStats> operatorStatsMap = new HashMap<>();
+    for (Map.Entry<String, String> entry : metadataBlock.getStats().entrySet()) {
+      try {
+        operatorStatsMap.put(entry.getKey(), operatorStatsFromJson(entry.getValue()));
+      } catch (Exception e) {
+        LOGGER.warn("Error occurred while fetching operator stats from metadata", e);
+      }
+    }
+    return operatorStatsMap;
+  }
+
+  public static Map<String, String> getMetadataFromOperatorStats(Map<String, OperatorStats> operatorStatsMap) {
+    Map<String, String> metadataStats = new HashMap<>();
+    for (Map.Entry<String, OperatorStats> entry : operatorStatsMap.entrySet()) {
+      try {
+        metadataStats.put(entry.getKey(), operatorStatsToJson(entry.getValue()));
+      } catch (Exception e) {
+        LOGGER.warn("Error occurred while fetching metadata from operator stats", e);
+      }
+    }
+    return metadataStats;
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/SortUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/SortUtils.java
new file mode 100644
index 00000000000..7827fcc1c0d
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/SortUtils.java
@@ -0,0 +1,96 @@
+/**
+ * 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.pinot.query.runtime.operator.utils;
+
+import java.util.Comparator;
+import java.util.List;
+import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.logical.RexExpression;
+
+
+public class SortUtils {
+  private SortUtils() {
+  }
+
+  public static class SortComparator implements Comparator<Object[]> {
+    private final int _size;
+    private final int[] _valueIndices;
+    private final int[] _multipliers;
+    private final int[] _nullsMultipliers;
+    private final boolean[] _useDoubleComparison;
+
+    /**
+     * Sort comparator for use with priority queues.
+     *
+     * @param collationKeys collation keys to sort on
+     * @param collationDirections collation direction for each collation key to sort on
+     * @param collationNullDirections collation direction for NULL values in each collation key to sort on
+     * @param dataSchema data schema to use
+     * @param switchDirections 'true' if the opposite sort direction should be used as what is specified
+     */
+    public SortComparator(List<RexExpression> collationKeys, List<Direction> collationDirections,
+        List<NullDirection> collationNullDirections, DataSchema dataSchema, boolean switchDirections) {
+      DataSchema.ColumnDataType[] columnDataTypes = dataSchema.getColumnDataTypes();
+      _size = collationKeys.size();
+      _valueIndices = new int[_size];
+      _multipliers = new int[_size];
+      _nullsMultipliers = new int[_size];
+      _useDoubleComparison = new boolean[_size];
+      for (int i = 0; i < _size; i++) {
+        _valueIndices[i] = ((RexExpression.InputRef) collationKeys.get(i)).getIndex();
+        int multiplier = collationDirections.get(i) == Direction.ASCENDING ? 1 : -1;
+        _multipliers[i] = switchDirections ? -multiplier : multiplier;
+        int nullsMultiplier = collationNullDirections.get(i) == NullDirection.LAST ? 1 : -1;
+        _nullsMultipliers[i] = switchDirections ? -nullsMultiplier : nullsMultiplier;
+        _useDoubleComparison[i] = columnDataTypes[_valueIndices[i]].isNumber();
+      }
+    }
+
+    @Override
+    public int compare(Object[] o1, Object[] o2) {
+      for (int i = 0; i < _size; i++) {
+        int index = _valueIndices[i];
+        Object v1 = o1[index];
+        Object v2 = o2[index];
+        if (v1 == null) {
+          if (v2 == null) {
+            continue;
+          }
+          return _nullsMultipliers[i];
+        }
+        if (v2 == null) {
+          return -_nullsMultipliers[i];
+        }
+        int result;
+        if (_useDoubleComparison[i]) {
+          result = Double.compare(((Number) v1).doubleValue(), ((Number) v2).doubleValue());
+        } else {
+          //noinspection unchecked
+          result = ((Comparable) v1).compareTo(v2);
+        }
+        if (result != 0) {
+          return result * _multipliers[i];
+        }
+      }
+      return 0;
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/TypeUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/TypeUtils.java
new file mode 100644
index 00000000000..d60ad0bdb7c
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/utils/TypeUtils.java
@@ -0,0 +1,88 @@
+/**
+ * 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.pinot.query.runtime.operator.utils;
+
+import javax.annotation.Nullable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.spi.utils.BooleanUtils;
+
+
+public class TypeUtils {
+  private TypeUtils() {
+  }
+
+  /**
+   * Convert result to the appropriate column data type according to the desired {@link DataSchema.ColumnDataType}
+   * of the {@link org.apache.pinot.core.common.Operator}.
+   *
+   * @param inputObj input entry
+   * @param columnDataType desired column data type
+   * @return converted entry
+   */
+  @Nullable
+  public static Object convert(@Nullable Object inputObj, DataSchema.ColumnDataType columnDataType) {
+    if (columnDataType.isNumber() && columnDataType != DataSchema.ColumnDataType.BIG_DECIMAL) {
+      return inputObj == null ? null : columnDataType.convert(inputObj);
+    } else {
+      return inputObj;
+    }
+  }
+
+  /**
+   * This util is used to canonicalize row generated from V1 engine, which is stored using
+   * {@link DataSchema#getStoredColumnDataTypes()} format. However, the transferable block ser/de stores data in the
+   * {@link DataSchema#getColumnDataTypes()} format.
+   *
+   * @param row un-canonicalize row.
+   * @param dataSchema data schema desired for the row.
+   * @return canonicalize row.
+   */
+  public static Object[] canonicalizeRow(Object[] row, DataSchema dataSchema) {
+    Object[] resultRow = new Object[row.length];
+    for (int colId = 0; colId < row.length; colId++) {
+      Object value = row[colId];
+      if (value != null) {
+        if (dataSchema.getColumnDataType(colId) == DataSchema.ColumnDataType.OBJECT) {
+          resultRow[colId] = value;
+        } else if (dataSchema.getColumnDataType(colId) == DataSchema.ColumnDataType.BOOLEAN) {
+          resultRow[colId] = BooleanUtils.toBoolean(value);
+        } else {
+          resultRow[colId] = dataSchema.getColumnDataType(colId).convert(value);
+        }
+      }
+    }
+    return resultRow;
+  }
+
+  /**
+   * Canonicalize rows with column indices not matching calcite order.
+   *
+   * see: {@link TypeUtils#canonicalizeRow(Object[], DataSchema)}
+   */
+  public static Object[] canonicalizeRow(Object[] row, DataSchema dataSchema, int[] columnIndices) {
+    Object[] resultRow = new Object[columnIndices.length];
+    for (int colId = 0; colId < columnIndices.length; colId++) {
+      Object value = row[columnIndices[colId]];
+      if (value != null) {
+        resultRow[colId] = dataSchema.getColumnDataType(colId).convert(value);
+      }
+    }
+    return resultRow;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/DistributedStagePlan.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/DistributedStagePlan.java
index 828a969dd0e..2aa269e6aaf 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/DistributedStagePlan.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/DistributedStagePlan.java
@@ -18,11 +18,11 @@
  */
 package org.apache.pinot.query.runtime.plan;
 
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.StageNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
 
 
 /**
@@ -33,44 +33,57 @@
  */
 public class DistributedStagePlan {
   private int _stageId;
-  private ServerInstance _serverInstance;
-  private StageNode _stageRoot;
-  private Map<Integer, StageMetadata> _metadataMap;
+  private VirtualServerAddress _server;
+  private PlanNode _stageRoot;
+  private StageMetadata _stageMetadata;
 
   public DistributedStagePlan(int stageId) {
     _stageId = stageId;
-    _metadataMap = new HashMap<>();
   }
 
-  public DistributedStagePlan(int stageId, ServerInstance serverInstance, StageNode stageRoot,
-      Map<Integer, StageMetadata> metadataMap) {
+  public DistributedStagePlan(int stageId, VirtualServerAddress server, PlanNode stageRoot,
+      StageMetadata stageMetadata) {
     _stageId = stageId;
-    _serverInstance = serverInstance;
+    _server = server;
     _stageRoot = stageRoot;
-    _metadataMap = metadataMap;
+    _stageMetadata = stageMetadata;
   }
 
   public int getStageId() {
     return _stageId;
   }
 
-  public ServerInstance getServerInstance() {
-    return _serverInstance;
+  public VirtualServerAddress getServer() {
+    return _server;
   }
 
-  public StageNode getStageRoot() {
+  public PlanNode getStageRoot() {
     return _stageRoot;
   }
 
-  public Map<Integer, StageMetadata> getMetadataMap() {
-    return _metadataMap;
+  public StageMetadata getStageMetadata() {
+    return _stageMetadata;
   }
 
-  public void setServerInstance(ServerInstance serverInstance) {
-    _serverInstance = serverInstance;
+  public void setServer(VirtualServerAddress serverAddress) {
+    _server = serverAddress;
   }
 
-  public void setStageRoot(StageNode stageRoot) {
+  public void setStageRoot(PlanNode stageRoot) {
     _stageRoot = stageRoot;
   }
+
+  public void setStageMetadata(StageMetadata stageMetadata) {
+    _stageMetadata = stageMetadata;
+  }
+
+  public WorkerMetadata getCurrentWorkerMetadata() {
+    return _stageMetadata.getWorkerMetadataList().get(_server.workerId());
+  }
+
+  public static boolean isLeafStage(DistributedStagePlan distributedStagePlan) {
+    WorkerMetadata workerMetadata = distributedStagePlan.getCurrentWorkerMetadata();
+    Map<String, List<String>> segments = WorkerMetadata.getTableSegmentsMap(workerMetadata);
+    return segments != null && segments.size() > 0;
+  }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/OpChainExecutionContext.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/OpChainExecutionContext.java
new file mode 100644
index 00000000000..b179900e0ca
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/OpChainExecutionContext.java
@@ -0,0 +1,110 @@
+/**
+ * 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.pinot.query.runtime.plan;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.function.Consumer;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.apache.pinot.query.runtime.operator.OpChainStats;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerResult;
+
+
+/**
+ *  The {@code OpChainExecutionContext} class contains the information derived from the PlanRequestContext.
+ *  Members of this class should not be changed once initialized.
+ *  This information is then used by the OpChain to create the Operators for a query.
+ */
+public class OpChainExecutionContext {
+  private final MailboxService _mailboxService;
+  private final long _requestId;
+  private final int _stageId;
+  private final VirtualServerAddress _server;
+  private final long _deadlineMs;
+  private final StageMetadata _stageMetadata;
+  private final OpChainId _id;
+  private final OpChainStats _stats;
+  private final boolean _traceEnabled;
+
+  @VisibleForTesting
+  public OpChainExecutionContext(MailboxService mailboxService, long requestId, int stageId,
+      VirtualServerAddress server, long deadlineMs, StageMetadata stageMetadata,
+      PipelineBreakerResult pipelineBreakerResult, boolean traceEnabled) {
+    _mailboxService = mailboxService;
+    _requestId = requestId;
+    _stageId = stageId;
+    _server = server;
+    _deadlineMs = deadlineMs;
+    _stageMetadata = stageMetadata;
+    _id = new OpChainId(requestId, server.workerId(), stageId);
+    _stats = new OpChainStats(_id.toString());
+    if (pipelineBreakerResult != null && pipelineBreakerResult.getOpChainStats() != null) {
+      _stats.getOperatorStatsMap().putAll(
+          pipelineBreakerResult.getOpChainStats().getOperatorStatsMap());
+    }
+    _traceEnabled = traceEnabled;
+  }
+
+  public OpChainExecutionContext(PhysicalPlanContext physicalPlanContext) {
+    this(physicalPlanContext.getMailboxService(), physicalPlanContext.getRequestId(), physicalPlanContext.getStageId(),
+        physicalPlanContext.getServer(), physicalPlanContext.getDeadlineMs(), physicalPlanContext.getStageMetadata(),
+        physicalPlanContext.getPipelineBreakerResult(), physicalPlanContext.isTraceEnabled());
+  }
+
+  public MailboxService getMailboxService() {
+    return _mailboxService;
+  }
+
+  public Consumer<OpChainId> getCallback() {
+    return _mailboxService.getCallback();
+  }
+
+  public long getRequestId() {
+    return _requestId;
+  }
+
+  public int getStageId() {
+    return _stageId;
+  }
+
+  public VirtualServerAddress getServer() {
+    return _server;
+  }
+
+  public long getDeadlineMs() {
+    return _deadlineMs;
+  }
+
+  public StageMetadata getStageMetadata() {
+    return _stageMetadata;
+  }
+
+  public OpChainId getId() {
+    return _id;
+  }
+
+  public OpChainStats getStats() {
+    return _stats;
+  }
+
+  public boolean isTraceEnabled() {
+    return _traceEnabled;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanContext.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanContext.java
new file mode 100644
index 00000000000..a2fb6f46435
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanContext.java
@@ -0,0 +1,97 @@
+/**
+ * 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.pinot.query.runtime.plan;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerResult;
+
+
+public class PhysicalPlanContext {
+  protected final MailboxService _mailboxService;
+  protected final long _requestId;
+  protected final int _stageId;
+  private final long _deadlineMs;
+  protected final VirtualServerAddress _server;
+  protected final StageMetadata _stageMetadata;
+  protected final PipelineBreakerResult _pipelineBreakerResult;
+  protected final List<String> _receivingMailboxIds = new ArrayList<>();
+  private final OpChainExecutionContext _opChainExecutionContext;
+  private final boolean _traceEnabled;
+
+  public PhysicalPlanContext(MailboxService mailboxService, long requestId, int stageId, long deadlineMs,
+      VirtualServerAddress server, StageMetadata stageMetadata, PipelineBreakerResult pipelineBreakerResult,
+      boolean traceEnabled) {
+    _mailboxService = mailboxService;
+    _requestId = requestId;
+    _stageId = stageId;
+    _deadlineMs = deadlineMs;
+    _server = server;
+    _stageMetadata = stageMetadata;
+    _pipelineBreakerResult = pipelineBreakerResult;
+    _traceEnabled = traceEnabled;
+    _opChainExecutionContext = new OpChainExecutionContext(this);
+  }
+
+  public long getRequestId() {
+    return _requestId;
+  }
+
+  public int getStageId() {
+    return _stageId;
+  }
+
+  public long getDeadlineMs() {
+    return _deadlineMs;
+  }
+
+  public VirtualServerAddress getServer() {
+    return _server;
+  }
+
+  public StageMetadata getStageMetadata() {
+    return _stageMetadata;
+  }
+
+  public PipelineBreakerResult getPipelineBreakerResult() {
+    return _pipelineBreakerResult;
+  }
+
+  public MailboxService getMailboxService() {
+    return _mailboxService;
+  }
+
+  public void addReceivingMailboxIds(List<String> receivingMailboxIds) {
+    _receivingMailboxIds.addAll(receivingMailboxIds);
+  }
+
+  public List<String> getReceivingMailboxIds() {
+    return _receivingMailboxIds;
+  }
+
+  public OpChainExecutionContext getOpChainExecutionContext() {
+    return _opChainExecutionContext;
+  }
+
+  public boolean isTraceEnabled() {
+    return _traceEnabled;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanVisitor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanVisitor.java
index d675efea626..79f22752747 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanVisitor.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PhysicalPlanVisitor.java
@@ -18,116 +18,170 @@
  */
 package org.apache.pinot.query.runtime.plan;
 
+import java.util.ArrayList;
 import java.util.List;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.StageNodeVisitor;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
 import org.apache.pinot.query.runtime.operator.AggregateOperator;
 import org.apache.pinot.query.runtime.operator.FilterOperator;
 import org.apache.pinot.query.runtime.operator.HashJoinOperator;
+import org.apache.pinot.query.runtime.operator.IntersectOperator;
 import org.apache.pinot.query.runtime.operator.LiteralValueOperator;
 import org.apache.pinot.query.runtime.operator.MailboxReceiveOperator;
 import org.apache.pinot.query.runtime.operator.MailboxSendOperator;
+import org.apache.pinot.query.runtime.operator.MinusOperator;
 import org.apache.pinot.query.runtime.operator.MultiStageOperator;
 import org.apache.pinot.query.runtime.operator.OpChain;
 import org.apache.pinot.query.runtime.operator.SortOperator;
+import org.apache.pinot.query.runtime.operator.SortedMailboxReceiveOperator;
 import org.apache.pinot.query.runtime.operator.TransformOperator;
+import org.apache.pinot.query.runtime.operator.UnionOperator;
+import org.apache.pinot.query.runtime.operator.WindowAggregateOperator;
 
 
 /**
- * This visitor constructs a physical plan of operators from a {@link StageNode} tree. Note that
+ * This visitor constructs a physical plan of operators from a {@link PlanNode} tree. Note that
  * this works only for the intermediate stage nodes, leaf stage nodes are expected to compile into
  * v1 operators at this point in time.
  *
- * <p>This class should be used statically via {@link #build(StageNode, PlanRequestContext)}
+ * <p>This class should be used statically via {@link #walkPlanNode(PlanNode, PhysicalPlanContext)}
  */
-public class PhysicalPlanVisitor implements StageNodeVisitor<MultiStageOperator, PlanRequestContext> {
+public class PhysicalPlanVisitor implements PlanNodeVisitor<MultiStageOperator, PhysicalPlanContext> {
 
   private static final PhysicalPlanVisitor INSTANCE = new PhysicalPlanVisitor();
 
-  public static OpChain build(StageNode node, PlanRequestContext context) {
+  public static OpChain walkPlanNode(PlanNode node, PhysicalPlanContext context) {
     MultiStageOperator root = node.visit(INSTANCE, context);
-    return new OpChain(root, context.getReceivingMailboxes(), context.getRequestId(), context.getStageId());
+    return new OpChain(context.getOpChainExecutionContext(), root, context.getReceivingMailboxIds());
   }
 
   @Override
-  public MultiStageOperator visitMailboxReceive(MailboxReceiveNode node, PlanRequestContext context) {
-    List<ServerInstance> sendingInstances = context.getMetadataMap().get(node.getSenderStageId()).getServerInstances();
-    MailboxReceiveOperator mailboxReceiveOperator =
-        new MailboxReceiveOperator(context.getMailboxService(), sendingInstances,
-            node.getExchangeType(), context.getHostName(), context.getPort(),
-            context.getRequestId(), node.getSenderStageId(), context.getTimeoutMs());
-    context.addReceivingMailboxes(mailboxReceiveOperator.getSendingMailbox());
-    return mailboxReceiveOperator;
+  public MultiStageOperator visitMailboxReceive(MailboxReceiveNode node, PhysicalPlanContext context) {
+    if (node.isSortOnReceiver()) {
+      SortedMailboxReceiveOperator sortedMailboxReceiveOperator =
+          new SortedMailboxReceiveOperator(context.getOpChainExecutionContext(), node.getDistributionType(),
+              node.getDataSchema(), node.getCollationKeys(), node.getCollationDirections(),
+              node.getCollationNullDirections(), node.isSortOnSender(), node.getSenderStageId());
+      context.addReceivingMailboxIds(sortedMailboxReceiveOperator.getMailboxIds());
+      return sortedMailboxReceiveOperator;
+    } else {
+      MailboxReceiveOperator mailboxReceiveOperator =
+          new MailboxReceiveOperator(context.getOpChainExecutionContext(), node.getDistributionType(),
+              node.getSenderStageId());
+      context.addReceivingMailboxIds(mailboxReceiveOperator.getMailboxIds());
+      return mailboxReceiveOperator;
+    }
   }
 
   @Override
-  public MultiStageOperator visitMailboxSend(MailboxSendNode node, PlanRequestContext context) {
+  public MultiStageOperator visitMailboxSend(MailboxSendNode node, PhysicalPlanContext context) {
     MultiStageOperator nextOperator = node.getInputs().get(0).visit(this, context);
-    StageMetadata receivingStageMetadata = context.getMetadataMap().get(node.getReceiverStageId());
-    return new MailboxSendOperator(context.getMailboxService(), nextOperator,
-        receivingStageMetadata.getServerInstances(), node.getExchangeType(), node.getPartitionKeySelector(),
-        context.getHostName(), context.getPort(), context.getRequestId(), node.getStageId());
+    return new MailboxSendOperator(context.getOpChainExecutionContext(), nextOperator, node.getDistributionType(),
+        node.getPartitionKeySelector(), node.getCollationKeys(), node.getCollationDirections(), node.isSortOnSender(),
+        node.getReceiverStageId());
   }
 
   @Override
-  public MultiStageOperator visitAggregate(AggregateNode node, PlanRequestContext context) {
+  public MultiStageOperator visitAggregate(AggregateNode node, PhysicalPlanContext context) {
     MultiStageOperator nextOperator = node.getInputs().get(0).visit(this, context);
-    return new AggregateOperator(nextOperator, node.getDataSchema(), node.getAggCalls(),
-        node.getGroupSet(), node.getInputs().get(0).getDataSchema(), context._requestId, context._stageId);
+    DataSchema inputSchema = node.getInputs().get(0).getDataSchema();
+    DataSchema resultSchema = node.getDataSchema();
+
+    return new AggregateOperator(context.getOpChainExecutionContext(), nextOperator, resultSchema, inputSchema,
+        node.getAggCalls(), node.getGroupSet(), node.getAggType(), node.getNodeHint());
+  }
+
+  @Override
+  public MultiStageOperator visitWindow(WindowNode node, PhysicalPlanContext context) {
+    MultiStageOperator nextOperator = node.getInputs().get(0).visit(this, context);
+    return new WindowAggregateOperator(context.getOpChainExecutionContext(), nextOperator, node.getGroupSet(),
+        node.getOrderSet(), node.getOrderSetDirection(), node.getOrderSetNullDirection(), node.getAggCalls(),
+        node.getLowerBound(), node.getUpperBound(), node.getWindowFrameType(), node.getConstants(),
+        node.getDataSchema(), node.getInputs().get(0).getDataSchema());
+  }
+
+  @Override
+  public MultiStageOperator visitSetOp(SetOpNode setOpNode, PhysicalPlanContext context) {
+    List<MultiStageOperator> inputs = new ArrayList<>();
+    for (PlanNode input : setOpNode.getInputs()) {
+      MultiStageOperator visited = input.visit(this, context);
+      inputs.add(visited);
+    }
+    switch (setOpNode.getSetOpType()) {
+      case UNION:
+        return new UnionOperator(context.getOpChainExecutionContext(), inputs,
+            setOpNode.getInputs().get(0).getDataSchema());
+      case INTERSECT:
+        return new IntersectOperator(context.getOpChainExecutionContext(), inputs,
+            setOpNode.getInputs().get(0).getDataSchema());
+      case MINUS:
+        return new MinusOperator(context.getOpChainExecutionContext(), inputs,
+            setOpNode.getInputs().get(0).getDataSchema());
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  @Override
+  public MultiStageOperator visitExchange(ExchangeNode exchangeNode, PhysicalPlanContext context) {
+    throw new UnsupportedOperationException("ExchangeNode should not be visited");
   }
 
   @Override
-  public MultiStageOperator visitFilter(FilterNode node, PlanRequestContext context) {
+  public MultiStageOperator visitFilter(FilterNode node, PhysicalPlanContext context) {
     MultiStageOperator nextOperator = node.getInputs().get(0).visit(this, context);
-    return new FilterOperator(nextOperator, node.getDataSchema(), node.getCondition(), context.getRequestId(),
-        context.getStageId());
+    return new FilterOperator(context.getOpChainExecutionContext(), nextOperator, node.getDataSchema(),
+        node.getCondition());
   }
 
   @Override
-  public MultiStageOperator visitJoin(JoinNode node, PlanRequestContext context) {
-    StageNode left = node.getInputs().get(0);
-    StageNode right = node.getInputs().get(1);
+  public MultiStageOperator visitJoin(JoinNode node, PhysicalPlanContext context) {
+    PlanNode left = node.getInputs().get(0);
+    PlanNode right = node.getInputs().get(1);
 
     MultiStageOperator leftOperator = left.visit(this, context);
     MultiStageOperator rightOperator = right.visit(this, context);
 
-    return new HashJoinOperator(leftOperator, rightOperator, left.getDataSchema(), node, context.getRequestId(),
-        context.getStageId());
+    return new HashJoinOperator(context.getOpChainExecutionContext(), leftOperator, rightOperator, left.getDataSchema(),
+        node);
   }
 
   @Override
-  public MultiStageOperator visitProject(ProjectNode node, PlanRequestContext context) {
+  public MultiStageOperator visitProject(ProjectNode node, PhysicalPlanContext context) {
     MultiStageOperator nextOperator = node.getInputs().get(0).visit(this, context);
-    return new TransformOperator(nextOperator, node.getDataSchema(), node.getProjects(),
-        node.getInputs().get(0).getDataSchema(), context.getRequestId(), context.getStageId());
+    return new TransformOperator(context.getOpChainExecutionContext(), nextOperator, node.getDataSchema(),
+        node.getProjects(), node.getInputs().get(0).getDataSchema());
   }
 
   @Override
-  public MultiStageOperator visitSort(SortNode node, PlanRequestContext context) {
+  public MultiStageOperator visitSort(SortNode node, PhysicalPlanContext context) {
     MultiStageOperator nextOperator = node.getInputs().get(0).visit(this, context);
-    return new SortOperator(nextOperator, node.getCollationKeys(), node.getCollationDirections(),
-        node.getFetch(), node.getOffset(), node.getDataSchema(), context.getRequestId(), context.getStageId());
+    boolean isInputSorted = nextOperator instanceof SortedMailboxReceiveOperator;
+    return new SortOperator(context.getOpChainExecutionContext(), nextOperator, node.getCollationKeys(),
+        node.getCollationDirections(), node.getCollationNullDirections(), node.getFetch(), node.getOffset(),
+        node.getDataSchema(), isInputSorted);
   }
 
   @Override
-  public MultiStageOperator visitTableScan(TableScanNode node, PlanRequestContext context) {
+  public MultiStageOperator visitTableScan(TableScanNode node, PhysicalPlanContext context) {
     throw new UnsupportedOperationException("Stage node of type TableScanNode is not supported!");
   }
 
   @Override
-  public MultiStageOperator visitValue(ValueNode node, PlanRequestContext context) {
-    return new LiteralValueOperator(node.getDataSchema(), node.getLiteralRows(), context.getRequestId(),
-        context.getStageId());
+  public MultiStageOperator visitValue(ValueNode node, PhysicalPlanContext context) {
+    return new LiteralValueOperator(context.getOpChainExecutionContext(), node.getDataSchema(), node.getLiteralRows());
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PlanRequestContext.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PlanRequestContext.java
deleted file mode 100644
index a52e0fa0be5..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/PlanRequestContext.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.runtime.plan;
-
-import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-
-
-public class PlanRequestContext {
-  protected final MailboxService<TransferableBlock> _mailboxService;
-  protected final long _requestId;
-  protected final int _stageId;
-  private final long _timeoutMs;
-  protected final String _hostName;
-  protected final int _port;
-  protected final Map<Integer, StageMetadata> _metadataMap;
-  protected final List<MailboxIdentifier> _receivingMailboxes = new ArrayList<>();
-
-
-  public PlanRequestContext(MailboxService<TransferableBlock> mailboxService, long requestId, int stageId,
-      long timeoutMs, String hostName, int port, Map<Integer, StageMetadata> metadataMap) {
-    _mailboxService = mailboxService;
-    _requestId = requestId;
-    _stageId = stageId;
-    _timeoutMs = timeoutMs;
-    _hostName = hostName;
-    _port = port;
-    _metadataMap = metadataMap;
-  }
-
-  public long getRequestId() {
-    return _requestId;
-  }
-
-  public int getStageId() {
-    return _stageId;
-  }
-
-  public long getTimeoutMs() {
-    return _timeoutMs;
-  }
-
-  public String getHostName() {
-    return _hostName;
-  }
-
-  public int getPort() {
-    return _port;
-  }
-
-  public Map<Integer, StageMetadata> getMetadataMap() {
-    return _metadataMap;
-  }
-
-  public MailboxService<TransferableBlock> getMailboxService() {
-    return _mailboxService;
-  }
-
-  public void addReceivingMailboxes(List<MailboxIdentifier> ids) {
-    _receivingMailboxes.addAll(ids);
-  }
-
-  public List<MailboxIdentifier> getReceivingMailboxes() {
-    return ImmutableList.copyOf(_receivingMailboxes);
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/ServerRequestPlanVisitor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/ServerRequestPlanVisitor.java
deleted file mode 100644
index 071a9325bd2..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/ServerRequestPlanVisitor.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.runtime.plan;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.apache.pinot.common.request.BrokerRequest;
-import org.apache.pinot.common.request.DataSource;
-import org.apache.pinot.common.request.Expression;
-import org.apache.pinot.common.request.InstanceRequest;
-import org.apache.pinot.common.request.PinotQuery;
-import org.apache.pinot.common.request.QuerySource;
-import org.apache.pinot.common.utils.config.QueryOptionsUtils;
-import org.apache.pinot.common.utils.request.RequestUtils;
-import org.apache.pinot.core.query.optimizer.QueryOptimizer;
-import org.apache.pinot.core.routing.TimeBoundaryInfo;
-import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.parser.CalciteRexExpressionParser;
-import org.apache.pinot.query.planner.stage.AggregateNode;
-import org.apache.pinot.query.planner.stage.FilterNode;
-import org.apache.pinot.query.planner.stage.JoinNode;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.planner.stage.MailboxSendNode;
-import org.apache.pinot.query.planner.stage.ProjectNode;
-import org.apache.pinot.query.planner.stage.SortNode;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.planner.stage.StageNodeVisitor;
-import org.apache.pinot.query.planner.stage.TableScanNode;
-import org.apache.pinot.query.planner.stage.ValueNode;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.runtime.plan.server.ServerPlanRequestContext;
-import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.utils.CommonConstants;
-import org.apache.pinot.spi.utils.builder.TableNameBuilder;
-import org.apache.pinot.sql.FilterKind;
-import org.apache.pinot.sql.parsers.rewriter.NonAggregationGroupByToDistinctQueryRewriter;
-import org.apache.pinot.sql.parsers.rewriter.PredicateComparisonRewriter;
-import org.apache.pinot.sql.parsers.rewriter.QueryRewriter;
-import org.apache.pinot.sql.parsers.rewriter.QueryRewriterFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Plan visitor for direct leaf-stage server request.
- *
- * This should be merged with logics in {@link org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2} in the future
- * to directly produce operator chain.
- *
- * As of now, the reason why we use the plan visitor for server request is for additional support such as dynamic
- * filtering and other auxiliary functionalities.
- */
-public class ServerRequestPlanVisitor implements StageNodeVisitor<Void, ServerPlanRequestContext> {
-  private static final int DEFAULT_LEAF_NODE_LIMIT = 10_000_000;
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServerRequestPlanVisitor.class);
-  private static final List<String> QUERY_REWRITERS_CLASS_NAMES =
-      ImmutableList.of(PredicateComparisonRewriter.class.getName(),
-          NonAggregationGroupByToDistinctQueryRewriter.class.getName());
-  private static final List<QueryRewriter> QUERY_REWRITERS =
-      new ArrayList<>(QueryRewriterFactory.getQueryRewriters(QUERY_REWRITERS_CLASS_NAMES));
-  private static final QueryOptimizer QUERY_OPTIMIZER = new QueryOptimizer();
-
-  private static final ServerRequestPlanVisitor INSTANCE = new ServerRequestPlanVisitor();
-  private static Void _aVoid = null;
-
-  public static ServerPlanRequestContext build(MailboxService<TransferableBlock> mailboxService,
-      DistributedStagePlan stagePlan, Map<String, String> requestMetadataMap, TableConfig tableConfig, Schema schema,
-      TimeBoundaryInfo timeBoundaryInfo, TableType tableType, List<String> segmentList) {
-    // Before-visit: construct the ServerPlanRequestContext baseline
-    long requestId = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID));
-    long timeoutMs = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS));
-    PinotQuery pinotQuery = new PinotQuery();
-    Integer leafNodeLimit = QueryOptionsUtils.getMultiStageLeafLimit(requestMetadataMap);
-    if (leafNodeLimit != null) {
-      pinotQuery.setLimit(leafNodeLimit);
-    } else {
-      pinotQuery.setLimit(DEFAULT_LEAF_NODE_LIMIT);
-    }
-    LOGGER.debug("QueryID" + requestId + " leafNodeLimit:" + leafNodeLimit);
-    pinotQuery.setExplain(false);
-    ServerPlanRequestContext context =
-        new ServerPlanRequestContext(mailboxService, requestId, stagePlan.getStageId(), timeoutMs,
-            stagePlan.getServerInstance().getHostname(), stagePlan.getServerInstance().getPort(),
-            stagePlan.getMetadataMap(), pinotQuery, tableType, timeBoundaryInfo);
-
-    // visit the plan and create query physical plan.
-    ServerRequestPlanVisitor.walkStageNode(stagePlan.getStageRoot(), context);
-
-    // Post-visit: finalize context.
-    // 1. global rewrite/optimize
-    if (timeBoundaryInfo != null) {
-      attachTimeBoundary(pinotQuery, timeBoundaryInfo, tableType == TableType.OFFLINE);
-    }
-    for (QueryRewriter queryRewriter : QUERY_REWRITERS) {
-      pinotQuery = queryRewriter.rewrite(pinotQuery);
-    }
-    QUERY_OPTIMIZER.optimize(pinotQuery, tableConfig, schema);
-
-    // 2. set pinot query options according to requestMetadataMap
-    pinotQuery.setQueryOptions(
-        ImmutableMap.of(CommonConstants.Broker.Request.QueryOptionKey.TIMEOUT_MS, String.valueOf(timeoutMs)));
-
-    // 3. wrapped around in broker request
-    BrokerRequest brokerRequest = new BrokerRequest();
-    brokerRequest.setPinotQuery(pinotQuery);
-    DataSource dataSource = pinotQuery.getDataSource();
-    if (dataSource != null) {
-      QuerySource querySource = new QuerySource();
-      querySource.setTableName(dataSource.getTableName());
-      brokerRequest.setQuerySource(querySource);
-    }
-
-    // 3. create instance request with segmentList
-    InstanceRequest instanceRequest = new InstanceRequest();
-    instanceRequest.setRequestId(requestId);
-    instanceRequest.setBrokerId("unknown");
-    instanceRequest.setEnableTrace(false);
-    instanceRequest.setSearchSegments(segmentList);
-    instanceRequest.setQuery(brokerRequest);
-
-    context.setInstanceRequest(instanceRequest);
-    return context;
-  }
-
-  private static void walkStageNode(StageNode node, ServerPlanRequestContext context) {
-    node.visit(INSTANCE, context);
-  }
-
-  @Override
-  public Void visitAggregate(AggregateNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    // set group-by list
-    context.getPinotQuery()
-        .setGroupByList(CalciteRexExpressionParser.convertGroupByList(node.getGroupSet(), context.getPinotQuery()));
-    // set agg list
-    context.getPinotQuery().setSelectList(
-        CalciteRexExpressionParser.addSelectList(context.getPinotQuery().getGroupByList(), node.getAggCalls(),
-            context.getPinotQuery()));
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitFilter(FilterNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    context.getPinotQuery()
-        .setFilterExpression(CalciteRexExpressionParser.toExpression(node.getCondition(), context.getPinotQuery()));
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitJoin(JoinNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitMailboxReceive(MailboxReceiveNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitMailboxSend(MailboxSendNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitProject(ProjectNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    context.getPinotQuery()
-        .setSelectList(CalciteRexExpressionParser.overwriteSelectList(node.getProjects(), context.getPinotQuery()));
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitSort(SortNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    if (node.getCollationKeys().size() > 0) {
-      context.getPinotQuery().setOrderByList(
-          CalciteRexExpressionParser.convertOrderByList(node.getCollationKeys(), node.getCollationDirections(),
-              context.getPinotQuery()));
-    }
-    if (node.getFetch() > 0) {
-      context.getPinotQuery().setLimit(node.getFetch());
-    }
-    if (node.getOffset() > 0) {
-      context.getPinotQuery().setOffset(node.getOffset());
-    }
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitTableScan(TableScanNode node, ServerPlanRequestContext context) {
-    DataSource dataSource = new DataSource();
-    String tableNameWithType = TableNameBuilder.forType(context.getTableType())
-        .tableNameWithType(TableNameBuilder.extractRawTableName(node.getTableName()));
-    dataSource.setTableName(tableNameWithType);
-    context.getPinotQuery().setDataSource(dataSource);
-    context.getPinotQuery().setSelectList(
-        node.getTableScanColumns().stream().map(RequestUtils::getIdentifierExpression).collect(Collectors.toList()));
-    return _aVoid;
-  }
-
-  @Override
-  public Void visitValue(ValueNode node, ServerPlanRequestContext context) {
-    visitChildren(node, context);
-    return _aVoid;
-  }
-
-  private void visitChildren(StageNode node, ServerPlanRequestContext context) {
-    for (StageNode child : node.getInputs()) {
-      child.visit(this, context);
-    }
-  }
-
-  /**
-   * Helper method to attach the time boundary to the given PinotQuery.
-   */
-  private static void attachTimeBoundary(PinotQuery pinotQuery, TimeBoundaryInfo timeBoundaryInfo,
-      boolean isOfflineRequest) {
-    String timeColumn = timeBoundaryInfo.getTimeColumn();
-    String timeValue = timeBoundaryInfo.getTimeValue();
-    Expression timeFilterExpression = RequestUtils.getFunctionExpression(
-        isOfflineRequest ? FilterKind.LESS_THAN_OR_EQUAL.name() : FilterKind.GREATER_THAN.name());
-    timeFilterExpression.getFunctionCall().setOperands(
-        Arrays.asList(RequestUtils.getIdentifierExpression(timeColumn), RequestUtils.getLiteralExpression(timeValue)));
-
-    Expression filterExpression = pinotQuery.getFilterExpression();
-    if (filterExpression != null) {
-      Expression andFilterExpression = RequestUtils.getFunctionExpression(FilterKind.AND.name());
-      andFilterExpression.getFunctionCall().setOperands(Arrays.asList(filterExpression, timeFilterExpression));
-      pinotQuery.setFilterExpression(andFilterExpression);
-    } else {
-      pinotQuery.setFilterExpression(timeFilterExpression);
-    }
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/StageMetadata.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/StageMetadata.java
new file mode 100644
index 00000000000..2ad9df403d4
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/StageMetadata.java
@@ -0,0 +1,98 @@
+/**
+ * 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.pinot.query.runtime.plan;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.core.routing.TimeBoundaryInfo;
+import org.apache.pinot.query.routing.WorkerMetadata;
+
+
+/**
+ * {@code StageMetadata} is used to send plan fragment-level info about how to execute a stage physically.
+ */
+public class StageMetadata {
+  private final List<WorkerMetadata> _workerMetadataList;
+  private final Map<String, String> _customProperties;
+
+  StageMetadata(List<WorkerMetadata> workerMetadataList, Map<String, String> customProperties) {
+    _workerMetadataList = workerMetadataList;
+    _customProperties = customProperties;
+  }
+
+  public List<WorkerMetadata> getWorkerMetadataList() {
+    return _workerMetadataList;
+  }
+
+  public Map<String, String> getCustomProperties() {
+    return _customProperties;
+  }
+
+  public static class Builder {
+    public static final String TABLE_NAME_KEY = "tableName";
+    public static final String TIME_BOUNDARY_COLUMN_KEY = "timeBoundaryInfo.timeColumn";
+    public static final String TIME_BOUNDARY_VALUE_KEY = "timeBoundaryInfo.timeValue";
+    private List<WorkerMetadata> _workerMetadataList;
+    private Map<String, String> _customProperties;
+
+    public Builder() {
+      _customProperties = new HashMap<>();
+    }
+
+    public Builder setWorkerMetadataList(List<WorkerMetadata> workerMetadataList) {
+      _workerMetadataList = workerMetadataList;
+      return this;
+    }
+
+    public Builder addTableName(String tableName) {
+      _customProperties.put(TABLE_NAME_KEY, tableName);
+      return this;
+    }
+
+    public Builder addTimeBoundaryInfo(TimeBoundaryInfo timeBoundaryInfo) {
+      _customProperties.put(TIME_BOUNDARY_COLUMN_KEY, timeBoundaryInfo.getTimeColumn());
+      _customProperties.put(TIME_BOUNDARY_VALUE_KEY, timeBoundaryInfo.getTimeValue());
+      return this;
+    }
+
+    public Builder addCustomProperties(Map<String, String> customPropertyMap) {
+      _customProperties.putAll(customPropertyMap);
+      return this;
+    }
+
+    public StageMetadata build() {
+      return new StageMetadata(_workerMetadataList, _customProperties);
+    }
+
+    public void putAllCustomProperties(Map<String, String> customPropertyMap) {
+      _customProperties.putAll(customPropertyMap);
+    }
+  }
+
+  public static String getTableName(StageMetadata metadata) {
+    return metadata.getCustomProperties().get(Builder.TABLE_NAME_KEY);
+  }
+
+  public static TimeBoundaryInfo getTimeBoundary(StageMetadata metadata) {
+    String timeColumn = metadata.getCustomProperties().get(Builder.TIME_BOUNDARY_COLUMN_KEY);
+    String timeValue = metadata.getCustomProperties().get(Builder.TIME_BOUNDARY_VALUE_KEY);
+    return timeColumn != null && timeValue != null ? new TimeBoundaryInfo(timeColumn, timeValue) : null;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerContext.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerContext.java
new file mode 100644
index 00000000000..b8b50746aad
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerContext.java
@@ -0,0 +1,54 @@
+/**
+ * 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.pinot.query.runtime.plan.pipeline;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+
+
+/**
+ * This class used by {@link PipelineBreakerVisitor} as context to detect the {@link PlanNode} that needs to be run
+ * before the main opChain starts.
+ */
+class PipelineBreakerContext {
+  private final Map<PlanNode, Integer> _planNodeObjectToIdMap = new HashMap<>();
+  private final Map<Integer, PlanNode> _pipelineBreakerMap = new HashMap<>();
+
+  private int _currentNodeId = 0;
+
+  public void addPipelineBreaker(MailboxReceiveNode mailboxReceiveNode) {
+    int nodeId = _planNodeObjectToIdMap.get(mailboxReceiveNode);
+    _pipelineBreakerMap.put(nodeId, mailboxReceiveNode);
+  }
+
+  public void visitedNewPlanNode(PlanNode planNode) {
+    _planNodeObjectToIdMap.put(planNode, _currentNodeId);
+    _currentNodeId++;
+  }
+
+  public Map<PlanNode, Integer> getNodeIdMap() {
+    return _planNodeObjectToIdMap;
+  }
+
+  public Map<Integer, PlanNode> getPipelineBreakerMap() {
+    return _pipelineBreakerMap;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerExecutor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerExecutor.java
new file mode 100644
index 00000000000..c148b37b0c1
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerExecutor.java
@@ -0,0 +1,133 @@
+/**
+ * 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.pinot.query.runtime.plan.pipeline;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
+import org.apache.pinot.query.runtime.operator.OpChain;
+import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.PhysicalPlanContext;
+import org.apache.pinot.query.runtime.plan.PhysicalPlanVisitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Utility class to run pipeline breaker execution and collects the results.
+ */
+public class PipelineBreakerExecutor {
+  private static final Logger LOGGER = LoggerFactory.getLogger(PipelineBreakerExecutor.class);
+  private PipelineBreakerExecutor() {
+    // do not instantiate.
+  }
+
+  /**
+   * Execute a pipeline breaker and collect the results (synchronously). Currently, pipeline breaker executor can only
+   *    execute mailbox receive pipeline breaker.
+   *
+   * @param scheduler scheduler service to run the pipeline breaker main thread.
+   * @param mailboxService mailbox service to attach the {@link MailboxReceiveNode} against.
+   * @param distributedStagePlan the distributed stage plan to run pipeline breaker on.
+   * @param deadlineMs execution deadline
+   * @param requestId request ID
+   * @param isTraceEnabled whether to enable trace.
+   * @return pipeline breaker result;
+   *   - If exception occurs, exception block will be wrapped in {@link TransferableBlock} and assigned to each PB node.
+   *   - Normal stats will be attached to each PB node and downstream execution should return with stats attached.
+   */
+  public static PipelineBreakerResult executePipelineBreakers(OpChainSchedulerService scheduler,
+      MailboxService mailboxService, DistributedStagePlan distributedStagePlan, long deadlineMs,
+      long requestId, boolean isTraceEnabled) {
+    PipelineBreakerContext pipelineBreakerContext = new PipelineBreakerContext();
+    PipelineBreakerVisitor.visitPlanRoot(distributedStagePlan.getStageRoot(), pipelineBreakerContext);
+    if (pipelineBreakerContext.getPipelineBreakerMap().size() > 0) {
+      try {
+      PlanNode stageRoot = distributedStagePlan.getStageRoot();
+      // TODO: This PlanRequestContext needs to indicate it is a pre-stage opChain and only listens to pre-stage OpChain
+      //     receive-mail callbacks.
+      // see also: MailboxIdUtils TODOs, de-couple mailbox id from query information
+      PhysicalPlanContext physicalPlanContext =
+          new PhysicalPlanContext(mailboxService, requestId, stageRoot.getPlanFragmentId(), deadlineMs,
+              distributedStagePlan.getServer(), distributedStagePlan.getStageMetadata(), null, isTraceEnabled);
+      return PipelineBreakerExecutor.execute(scheduler, pipelineBreakerContext, physicalPlanContext);
+      } catch (Exception e) {
+        LOGGER.error("Unable to create pipeline breaker results for Req: " + requestId + ", Stage: "
+            + distributedStagePlan.getStageId(), e);
+        // Create all error blocks for all pipeline breaker nodes.
+        TransferableBlock errorBlock = TransferableBlockUtils.getErrorTransferableBlock(e);
+        Map<Integer, List<TransferableBlock>> resultMap = new HashMap<>();
+        for (int key : pipelineBreakerContext.getNodeIdMap().values()) {
+          if (pipelineBreakerContext.getPipelineBreakerMap().containsKey(key)) {
+            resultMap.put(key, Collections.singletonList(errorBlock));
+          }
+        }
+        return new PipelineBreakerResult(pipelineBreakerContext.getNodeIdMap(), resultMap, null);
+      }
+    } else {
+      return null;
+    }
+  }
+
+  private static PipelineBreakerResult execute(OpChainSchedulerService scheduler,
+      PipelineBreakerContext context, PhysicalPlanContext physicalPlanContext)
+      throws Exception {
+    Map<Integer, Operator<TransferableBlock>> pipelineWorkerMap = new HashMap<>();
+    for (Map.Entry<Integer, PlanNode> e : context.getPipelineBreakerMap().entrySet()) {
+      int key = e.getKey();
+      PlanNode planNode = e.getValue();
+      if (!(planNode instanceof MailboxReceiveNode)) {
+        throw new UnsupportedOperationException("Only MailboxReceiveNode is supported to run as pipeline breaker now");
+      }
+      OpChain tempOpChain = PhysicalPlanVisitor.walkPlanNode(planNode, physicalPlanContext);
+      pipelineWorkerMap.put(key, tempOpChain.getRoot());
+    }
+    return runMailboxReceivePipelineBreaker(scheduler, context, pipelineWorkerMap, physicalPlanContext);
+  }
+
+  private static PipelineBreakerResult runMailboxReceivePipelineBreaker(OpChainSchedulerService scheduler,
+      PipelineBreakerContext context, Map<Integer, Operator<TransferableBlock>> pipelineWorkerMap,
+      PhysicalPlanContext physicalPlanContext)
+      throws Exception {
+    PipelineBreakerOperator pipelineBreakerOperator = new PipelineBreakerOperator(
+        physicalPlanContext.getOpChainExecutionContext(), pipelineWorkerMap);
+    CountDownLatch latch = new CountDownLatch(1);
+    OpChain pipelineBreakerOpChain = new OpChain(physicalPlanContext.getOpChainExecutionContext(),
+        pipelineBreakerOperator, physicalPlanContext.getReceivingMailboxIds(), (id) -> latch.countDown());
+    scheduler.register(pipelineBreakerOpChain);
+    long timeoutMs = physicalPlanContext.getDeadlineMs() - System.currentTimeMillis();
+    if (latch.await(timeoutMs, TimeUnit.MILLISECONDS)) {
+      return new PipelineBreakerResult(context.getNodeIdMap(), pipelineBreakerOperator.getResultMap(),
+          pipelineBreakerOpChain.getStats());
+    } else {
+      throw new IOException("Exception occur when awaiting breaker results!");
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerOperator.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerOperator.java
new file mode 100644
index 00000000000..fee06d5666d
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerOperator.java
@@ -0,0 +1,120 @@
+/**
+ * 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.pinot.query.runtime.plan.pipeline;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.MultiStageOperator;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+
+
+class PipelineBreakerOperator extends MultiStageOperator {
+  private static final String EXPLAIN_NAME = "PIPELINE_BREAKER";
+  private final Deque<Map.Entry<Integer, Operator<TransferableBlock>>> _workerEntries;
+  private final Map<Integer, List<TransferableBlock>> _resultMap;
+  private final ImmutableSet<Integer> _expectedKeySet;
+  private TransferableBlock _errorBlock;
+
+
+  public PipelineBreakerOperator(OpChainExecutionContext context,
+      Map<Integer, Operator<TransferableBlock>> pipelineWorkerMap) {
+    super(context);
+    _resultMap = new HashMap<>();
+    _expectedKeySet = ImmutableSet.copyOf(pipelineWorkerMap.keySet());
+    _workerEntries = new ArrayDeque<>();
+    _workerEntries.addAll(pipelineWorkerMap.entrySet());
+    for (int workerKey : _expectedKeySet) {
+      _resultMap.put(workerKey, new ArrayList<>());
+    }
+  }
+
+  public Map<Integer, List<TransferableBlock>> getResultMap() {
+    return _resultMap;
+  }
+
+  @Nullable
+  @Override
+  public String toExplainString() {
+    return EXPLAIN_NAME;
+  }
+
+  @Override
+  protected TransferableBlock getNextBlock() {
+    if (System.currentTimeMillis() > _context.getDeadlineMs()) {
+      _errorBlock = TransferableBlockUtils.getErrorTransferableBlock(QueryException.EXECUTION_TIMEOUT_ERROR);
+      constructErrorResponse(_errorBlock);
+      return _errorBlock;
+    }
+
+    // Poll from every mailbox operator in round-robin fashion:
+    // - Return the first content block
+    // - If no content block found but there are mailboxes not finished, return no-op block
+    // - If all content blocks are already returned, return end-of-stream block
+    int numWorkers = _workerEntries.size();
+    for (int i = 0; i < numWorkers; i++) {
+      Map.Entry<Integer, Operator<TransferableBlock>> worker = _workerEntries.remove();
+      TransferableBlock block = worker.getValue().nextBlock();
+
+      // Release the mailbox worker when the block is end-of-stream
+      if (block != null && !block.isNoOpBlock() && block.isSuccessfulEndOfStreamBlock()) {
+        continue;
+      }
+
+      // Add the worker back to the queue if the block is not end-of-stream
+      _workerEntries.add(worker);
+      if (block != null && !block.isNoOpBlock()) {
+        if (block.isErrorBlock()) {
+          _errorBlock = block;
+          constructErrorResponse(block);
+          return _errorBlock;
+        }
+        if (!block.isEndOfStreamBlock()) {
+          _resultMap.get(worker.getKey()).add(block);
+        }
+        return block;
+      }
+    }
+
+    if (_workerEntries.isEmpty()) {
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    } else {
+      return TransferableBlockUtils.getNoOpTransferableBlock();
+    }
+  }
+
+  /**
+   * Setting all result map to error if any of the pipeline breaker returns an ERROR.
+   */
+  private void constructErrorResponse(TransferableBlock errorBlock) {
+    for (int key : _expectedKeySet) {
+      _resultMap.put(key, Collections.singletonList(errorBlock));
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerResult.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerResult.java
new file mode 100644
index 00000000000..fe0f2cba615
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerResult.java
@@ -0,0 +1,56 @@
+/**
+ * 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.pinot.query.runtime.plan.pipeline;
+
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.OpChainStats;
+
+
+/**
+ * execution result encapsulation for {@link PipelineBreakerExecutor}.
+ */
+public class PipelineBreakerResult {
+  private final Map<PlanNode, Integer> _nodeIdMap;
+  private final Map<Integer, List<TransferableBlock>> _resultMap;
+  private final OpChainStats _opChainStats;
+
+  public PipelineBreakerResult(Map<PlanNode, Integer> nodeIdMap, Map<Integer, List<TransferableBlock>> resultMap,
+      OpChainStats opChainStats) {
+    _nodeIdMap = nodeIdMap;
+    _resultMap = resultMap;
+    _opChainStats = opChainStats;
+  }
+
+  public Map<PlanNode, Integer> getNodeIdMap() {
+    return _nodeIdMap;
+  }
+
+  public Map<Integer, List<TransferableBlock>> getResultMap() {
+    return _resultMap;
+  }
+
+  @Nullable
+  public OpChainStats getOpChainStats() {
+    return _opChainStats;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerVisitor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerVisitor.java
new file mode 100644
index 00000000000..efa97d66381
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerVisitor.java
@@ -0,0 +1,49 @@
+/**
+ * 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.pinot.query.runtime.plan.pipeline;
+
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.pinot.query.planner.plannode.DefaultPostOrderTraversalVisitor;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+
+
+class PipelineBreakerVisitor extends DefaultPostOrderTraversalVisitor<Void, PipelineBreakerContext> {
+  private static final PlanNodeVisitor<Void, PipelineBreakerContext> INSTANCE = new PipelineBreakerVisitor();
+
+  public static void visitPlanRoot(PlanNode root, PipelineBreakerContext context) {
+    root.visit(PipelineBreakerVisitor.INSTANCE, context);
+  }
+
+  @Override
+  public Void process(PlanNode planNode, PipelineBreakerContext context) {
+    context.visitedNewPlanNode(planNode);
+    return null;
+  }
+
+  @Override
+  public Void visitMailboxReceive(MailboxReceiveNode node, PipelineBreakerContext context) {
+    process(node, context);
+    if (node.getExchangeType() == PinotRelExchangeType.PIPELINE_BREAKER) {
+      context.addPipelineBreaker(node);
+    }
+    return null;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtils.java
index 776e9f4e22b..cd4c1d6fd78 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtils.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtils.java
@@ -18,123 +18,170 @@
  */
 package org.apache.pinot.query.runtime.plan.serde;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang.StringUtils;
 import org.apache.pinot.common.proto.Worker;
-import org.apache.pinot.core.routing.TimeBoundaryInfo;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.AbstractStageNode;
-import org.apache.pinot.query.planner.stage.StageNodeSerDeUtils;
-import org.apache.pinot.query.routing.WorkerInstance;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.plannode.AbstractPlanNode;
+import org.apache.pinot.query.planner.plannode.StageNodeSerDeUtils;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
 import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
 
 
 /**
  * This utility class serialize/deserialize between {@link Worker.StagePlan} elements to Planner elements.
  */
 public class QueryPlanSerDeUtils {
+  private static final Pattern VIRTUAL_SERVER_PATTERN = Pattern.compile(
+      "(?<virtualid>[0-9]+)@(?<host>[^:]+):(?<port>[0-9]+)");
 
   private QueryPlanSerDeUtils() {
     // do not instantiate.
   }
 
-  public static DistributedStagePlan deserialize(Worker.StagePlan stagePlan) {
-    DistributedStagePlan distributedStagePlan = new DistributedStagePlan(stagePlan.getStageId());
-    distributedStagePlan.setServerInstance(stringToInstance(stagePlan.getInstanceId()));
-    distributedStagePlan.setStageRoot(StageNodeSerDeUtils.deserializeStageNode(stagePlan.getStageRoot()));
-    Map<Integer, Worker.StageMetadata> metadataMap = stagePlan.getStageMetadataMap();
-    distributedStagePlan.getMetadataMap().putAll(protoMapToStageMetadataMap(metadataMap));
-    return distributedStagePlan;
+  public static List<DistributedStagePlan> deserializeStagePlan(Worker.QueryRequest request) {
+    List<DistributedStagePlan> distributedStagePlans = new ArrayList<>();
+    for (Worker.StagePlan stagePlan : request.getStagePlanList()) {
+      distributedStagePlans.addAll(deserializeStagePlan(stagePlan));
+    }
+    return distributedStagePlans;
   }
 
-  public static Worker.StagePlan serialize(DistributedStagePlan distributedStagePlan) {
+  public static Worker.StagePlan serialize(DispatchableSubPlan dispatchableSubPlan, int stageId,
+      QueryServerInstance queryServerInstance, List<Integer> workerIds) {
     return Worker.StagePlan.newBuilder()
-        .setStageId(distributedStagePlan.getStageId())
-        .setInstanceId(instanceToString(distributedStagePlan.getServerInstance()))
-        .setStageRoot(StageNodeSerDeUtils.serializeStageNode((AbstractStageNode) distributedStagePlan.getStageRoot()))
-        .putAllStageMetadata(stageMetadataMapToProtoMap(distributedStagePlan.getMetadataMap())).build();
+        .setStageId(stageId)
+        .setStageRoot(StageNodeSerDeUtils.serializeStageNode(
+            (AbstractPlanNode) dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment()
+                .getFragmentRoot()))
+        .setStageMetadata(
+            toProtoStageMetadata(dispatchableSubPlan.getQueryStageList().get(stageId), queryServerInstance, workerIds))
+        .build();
   }
 
-  public static ServerInstance stringToInstance(String serverInstanceString) {
-    String[] s = StringUtils.split(serverInstanceString, '_');
+  public static VirtualServerAddress protoToAddress(String virtualAddressStr) {
+    Matcher matcher = VIRTUAL_SERVER_PATTERN.matcher(virtualAddressStr);
+    if (!matcher.matches()) {
+      throw new IllegalArgumentException("Unexpected virtualAddressStr '" + virtualAddressStr + "'. This might "
+          + "happen if you are upgrading from an old version of the multistage engine to the current one in a rolling "
+          + "fashion.");
+    }
+
     // Skipped netty and grpc port as they are not used in worker instance.
-    return new WorkerInstance(s[0], Integer.parseInt(s[1]), Integer.parseInt(s[2]), Integer.parseInt(s[3]),
-        Integer.parseInt(s[4]));
+    return new VirtualServerAddress(matcher.group("host"),
+        Integer.parseInt(matcher.group("port")), Integer.parseInt(matcher.group("virtualid")));
   }
 
-  public static String instanceToString(ServerInstance serverInstance) {
-    return StringUtils.join(serverInstance.getHostname(), '_', serverInstance.getPort(), '_',
-        serverInstance.getGrpcPort(), '_', serverInstance.getQueryServicePort(), '_',
-        serverInstance.getQueryMailboxPort());
+  public static String addressToProto(VirtualServerAddress serverAddress) {
+    return String.format("%s@%s:%s", serverAddress.workerId(), serverAddress.hostname(), serverAddress.port());
   }
 
-  public static Map<Integer, StageMetadata> protoMapToStageMetadataMap(Map<Integer, Worker.StageMetadata> protoMap) {
-    Map<Integer, StageMetadata> metadataMap = new HashMap<>();
-    for (Map.Entry<Integer, Worker.StageMetadata> e : protoMap.entrySet()) {
-      metadataMap.put(e.getKey(), fromWorkerStageMetadata(e.getValue()));
+  private static List<DistributedStagePlan> deserializeStagePlan(Worker.StagePlan stagePlan) {
+    List<DistributedStagePlan> distributedStagePlans = new ArrayList<>();
+    String serverAddress = stagePlan.getStageMetadata().getServerAddress();
+    String[] hostPort = StringUtils.split(serverAddress, ':');
+    String hostname = hostPort[0];
+    int port = Integer.parseInt(hostPort[1]);
+    AbstractPlanNode stageRoot = StageNodeSerDeUtils.deserializeStageNode(stagePlan.getStageRoot());
+    StageMetadata stageMetadata = fromProtoStageMetadata(stagePlan.getStageMetadata());
+    for (int workerId : stagePlan.getStageMetadata().getWorkerIdsList()) {
+      DistributedStagePlan distributedStagePlan = new DistributedStagePlan(stagePlan.getStageId());
+      VirtualServerAddress virtualServerAddress = new VirtualServerAddress(hostname, port, workerId);
+      distributedStagePlan.setServer(virtualServerAddress);
+      distributedStagePlan.setStageRoot(stageRoot);
+      distributedStagePlan.setStageMetadata(stageMetadata);
+      distributedStagePlans.add(distributedStagePlan);
     }
-    return metadataMap;
+    return distributedStagePlans;
   }
 
-  private static StageMetadata fromWorkerStageMetadata(Worker.StageMetadata workerStageMetadata) {
-    StageMetadata stageMetadata = new StageMetadata();
-    // scanned table
-    stageMetadata.getScannedTables().addAll(workerStageMetadata.getDataSourcesList());
-    // server instance to table-segments mapping
-    for (String serverInstanceString : workerStageMetadata.getInstancesList()) {
-      stageMetadata.getServerInstances().add(stringToInstance(serverInstanceString));
+  private static StageMetadata fromProtoStageMetadata(Worker.StageMetadata protoStageMetadata) {
+    StageMetadata.Builder builder = new StageMetadata.Builder();
+    List<WorkerMetadata> workerMetadataList = new ArrayList<>();
+    for (Worker.WorkerMetadata protoWorkerMetadata : protoStageMetadata.getWorkerMetadataList()) {
+      workerMetadataList.add(fromProtoWorkerMetadata(protoWorkerMetadata));
     }
-    for (Map.Entry<String, Worker.SegmentMap> instanceEntry
-        : workerStageMetadata.getInstanceToSegmentMapMap().entrySet()) {
-      Map<String, List<String>> tableToSegmentMap = new HashMap<>();
-      for (Map.Entry<String, Worker.SegmentList> tableEntry
-          : instanceEntry.getValue().getTableTypeToSegmentListMap().entrySet()) {
-        tableToSegmentMap.put(tableEntry.getKey(), tableEntry.getValue().getSegmentsList());
-      }
-      stageMetadata.getServerInstanceToSegmentsMap().put(stringToInstance(instanceEntry.getKey()), tableToSegmentMap);
-    }
-    // time boundary info
-    if (!workerStageMetadata.getTimeColumn().isEmpty()) {
-      stageMetadata.setTimeBoundaryInfo(new TimeBoundaryInfo(workerStageMetadata.getTimeColumn(),
-          workerStageMetadata.getTimeValue()));
+    builder.setWorkerMetadataList(workerMetadataList);
+    builder.putAllCustomProperties(protoStageMetadata.getCustomPropertyMap());
+    return builder.build();
+  }
+
+  private static WorkerMetadata fromProtoWorkerMetadata(Worker.WorkerMetadata protoWorkerMetadata) {
+    WorkerMetadata.Builder builder = new WorkerMetadata.Builder();
+    builder.setVirtualServerAddress(protoToAddress(protoWorkerMetadata.getVirtualAddress()));
+    builder.putAllMailBoxInfosMap(fromProtoMailboxMetadataMap(protoWorkerMetadata.getMailboxMetadataMap()));
+    builder.putAllCustomProperties(protoWorkerMetadata.getCustomPropertyMap());
+    return builder.build();
+  }
+
+  private static Map<Integer, MailboxMetadata> fromProtoMailboxMetadataMap(
+      Map<Integer, Worker.MailboxMetadata> mailboxMetadataMap) {
+    Map<Integer, MailboxMetadata> mailboxMap = new HashMap<>();
+    for (Map.Entry<Integer, Worker.MailboxMetadata> entry : mailboxMetadataMap.entrySet()) {
+      mailboxMap.put(entry.getKey(), fromProtoMailbox(entry.getValue()));
     }
-    return stageMetadata;
+    return mailboxMap;
   }
 
-  public static Map<Integer, Worker.StageMetadata> stageMetadataMapToProtoMap(Map<Integer, StageMetadata> metadataMap) {
-    Map<Integer, Worker.StageMetadata> protoMap = new HashMap<>();
-    for (Map.Entry<Integer, StageMetadata> e : metadataMap.entrySet()) {
-      protoMap.put(e.getKey(), toWorkerStageMetadata(e.getValue()));
+  private static MailboxMetadata fromProtoMailbox(Worker.MailboxMetadata protoMailboxMetadata) {
+    List<String> mailboxIds = new ArrayList<>();
+    List<VirtualServerAddress> virtualAddresses = new ArrayList<>();
+    for (int i = 0; i < protoMailboxMetadata.getMailboxIdCount(); i++) {
+      mailboxIds.add(protoMailboxMetadata.getMailboxId(i));
+      virtualAddresses.add(protoToAddress(protoMailboxMetadata.getVirtualAddress(i)));
     }
-    return protoMap;
+    MailboxMetadata mailboxMetadata =
+        new MailboxMetadata(mailboxIds, virtualAddresses, protoMailboxMetadata.getCustomPropertyMap());
+    return mailboxMetadata;
   }
 
-  private static Worker.StageMetadata toWorkerStageMetadata(StageMetadata stageMetadata) {
+  private static Worker.StageMetadata toProtoStageMetadata(DispatchablePlanFragment planFragment,
+      QueryServerInstance queryServerInstance, List<Integer> workerIds) {
     Worker.StageMetadata.Builder builder = Worker.StageMetadata.newBuilder();
-    // scanned table
-    builder.addAllDataSources(stageMetadata.getScannedTables());
-    // server instance to table-segments mapping
-    for (ServerInstance serverInstance : stageMetadata.getServerInstances()) {
-      builder.addInstances(instanceToString(serverInstance));
+    for (WorkerMetadata workerMetadata : planFragment.getWorkerMetadataList()) {
+      builder.addWorkerMetadata(toProtoWorkerMetadata(workerMetadata));
     }
-    for (Map.Entry<ServerInstance, Map<String, List<String>>> instanceEntry
-        : stageMetadata.getServerInstanceToSegmentsMap().entrySet()) {
-      Map<String, Worker.SegmentList> tableToSegmentMap = new HashMap<>();
-      for (Map.Entry<String, List<String>> tableEntry : instanceEntry.getValue().entrySet()) {
-        tableToSegmentMap.put(tableEntry.getKey(),
-            Worker.SegmentList.newBuilder().addAllSegments(tableEntry.getValue()).build());
-      }
-      builder.putInstanceToSegmentMap(instanceToString(instanceEntry.getKey()),
-          Worker.SegmentMap.newBuilder().putAllTableTypeToSegmentList(tableToSegmentMap).build());
+    builder.putAllCustomProperty(planFragment.getCustomProperties());
+    builder.setServerAddress(String.format("%s:%d", queryServerInstance.getHostname(),
+        queryServerInstance.getQueryMailboxPort()));
+    builder.addAllWorkerIds(workerIds);
+    return builder.build();
+  }
+
+  private static Worker.WorkerMetadata toProtoWorkerMetadata(WorkerMetadata workerMetadata) {
+    Worker.WorkerMetadata.Builder builder = Worker.WorkerMetadata.newBuilder();
+    builder.setVirtualAddress(addressToProto(workerMetadata.getVirtualServerAddress()));
+    builder.putAllMailboxMetadata(toProtoMailboxMap(workerMetadata.getMailBoxInfosMap()));
+    builder.putAllCustomProperty(workerMetadata.getCustomProperties());
+    return builder.build();
+  }
+
+  private static Map<Integer, Worker.MailboxMetadata> toProtoMailboxMap(
+      Map<Integer, MailboxMetadata> mailBoxInfosMap) {
+    Map<Integer, Worker.MailboxMetadata> mailboxMetadataMap = new HashMap<>();
+    for (Map.Entry<Integer, MailboxMetadata> entry : mailBoxInfosMap.entrySet()) {
+      mailboxMetadataMap.put(entry.getKey(), toProtoMailbox(entry.getValue()));
     }
-    // time boundary info
-    if (stageMetadata.getTimeBoundaryInfo() != null) {
-      builder.setTimeColumn(stageMetadata.getTimeBoundaryInfo().getTimeColumn());
-      builder.setTimeValue(stageMetadata.getTimeBoundaryInfo().getTimeValue());
+    return mailboxMetadataMap;
+  }
+
+  private static Worker.MailboxMetadata toProtoMailbox(MailboxMetadata mailboxMetadata) {
+    Worker.MailboxMetadata.Builder builder = Worker.MailboxMetadata.newBuilder();
+    for (int i = 0; i < mailboxMetadata.getMailBoxIdList().size(); i++) {
+      builder.addMailboxId(mailboxMetadata.getMailBoxId(i));
+      builder.addVirtualAddress(mailboxMetadata.getVirtualAddress(i).toString());
     }
+    builder.putAllCustomProperty(mailboxMetadata.getCustomProperties());
     return builder.build();
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestContext.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestContext.java
index 3ce5bd35519..fb1c3af0c11 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestContext.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestContext.java
@@ -18,14 +18,9 @@
  */
 package org.apache.pinot.query.runtime.plan.server;
 
-import java.util.Map;
 import org.apache.pinot.common.request.InstanceRequest;
 import org.apache.pinot.common.request.PinotQuery;
-import org.apache.pinot.core.routing.TimeBoundaryInfo;
-import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.runtime.plan.PlanRequestContext;
+import org.apache.pinot.query.runtime.plan.PhysicalPlanContext;
 import org.apache.pinot.spi.config.table.TableType;
 
 
@@ -33,20 +28,21 @@
  * Context class for converting a {@link org.apache.pinot.query.runtime.plan.DistributedStagePlan} into
  * {@link PinotQuery} to execute on server.
  */
-public class ServerPlanRequestContext extends PlanRequestContext {
-  protected TableType _tableType;
-  protected TimeBoundaryInfo _timeBoundaryInfo;
+public class ServerPlanRequestContext {
+  private final PhysicalPlanContext _planContext;
+  private final TableType _tableType;
 
-  protected PinotQuery _pinotQuery;
-  protected InstanceRequest _instanceRequest;
+  private PinotQuery _pinotQuery;
+  private InstanceRequest _instanceRequest;
 
-  public ServerPlanRequestContext(MailboxService<TransferableBlock> mailboxService, long requestId, int stageId,
-      long timeoutMs, String hostName, int port, Map<Integer, StageMetadata> metadataMap, PinotQuery pinotQuery,
-      TableType tableType, TimeBoundaryInfo timeBoundaryInfo) {
-    super(mailboxService, requestId, stageId, timeoutMs, hostName, port, metadataMap);
+  public ServerPlanRequestContext(PhysicalPlanContext planContext, PinotQuery pinotQuery, TableType tableType) {
+    _planContext = planContext;
     _pinotQuery = pinotQuery;
     _tableType = tableType;
-    _timeBoundaryInfo = timeBoundaryInfo;
+  }
+
+  public PhysicalPlanContext getPlanContext() {
+    return _planContext;
   }
 
   public TableType getTableType() {
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestUtils.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestUtils.java
new file mode 100644
index 00000000000..616413f3add
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestUtils.java
@@ -0,0 +1,318 @@
+/**
+ * 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.pinot.query.runtime.plan.server;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.request.DataSource;
+import org.apache.pinot.common.request.Expression;
+import org.apache.pinot.common.request.InstanceRequest;
+import org.apache.pinot.common.request.PinotQuery;
+import org.apache.pinot.common.request.QuerySource;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.config.QueryOptionsUtils;
+import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.core.query.optimizer.QueryOptimizer;
+import org.apache.pinot.core.routing.TimeBoundaryInfo;
+import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.routing.WorkerMetadata;
+import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.PhysicalPlanContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
+import org.apache.pinot.query.service.QueryConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+import org.apache.pinot.sql.FilterKind;
+import org.apache.pinot.sql.parsers.rewriter.NonAggregationGroupByToDistinctQueryRewriter;
+import org.apache.pinot.sql.parsers.rewriter.PredicateComparisonRewriter;
+import org.apache.pinot.sql.parsers.rewriter.QueryRewriter;
+import org.apache.pinot.sql.parsers.rewriter.QueryRewriterFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ServerPlanRequestUtils {
+  private static final int DEFAULT_LEAF_NODE_LIMIT = Integer.MAX_VALUE;
+  private static final Logger LOGGER = LoggerFactory.getLogger(ServerPlanRequestUtils.class);
+  private static final List<String> QUERY_REWRITERS_CLASS_NAMES =
+      ImmutableList.of(PredicateComparisonRewriter.class.getName(),
+          NonAggregationGroupByToDistinctQueryRewriter.class.getName());
+  private static final List<QueryRewriter> QUERY_REWRITERS =
+      new ArrayList<>(QueryRewriterFactory.getQueryRewriters(QUERY_REWRITERS_CLASS_NAMES));
+  private static final QueryOptimizer QUERY_OPTIMIZER = new QueryOptimizer();
+
+  private ServerPlanRequestUtils() {
+    // do not instantiate.
+  }
+
+  /**
+   * Entry point to construct a {@link ServerPlanRequestContext} for executing leaf-stage runner.
+   *
+   * @param planContext physical plan context of the stage.
+   * @param distributedStagePlan distributed stage plan of the stage.
+   * @param requestMetadataMap metadata map
+   * @param helixPropertyStore helix property store used to fetch table config and schema for leaf-stage execution.
+   * @return a list of server plan request context to be run
+   */
+  public static List<ServerPlanRequestContext> constructServerQueryRequests(PhysicalPlanContext planContext,
+      DistributedStagePlan distributedStagePlan, Map<String, String> requestMetadataMap,
+      ZkHelixPropertyStore<ZNRecord> helixPropertyStore) {
+    StageMetadata stageMetadata = distributedStagePlan.getStageMetadata();
+    WorkerMetadata workerMetadata = distributedStagePlan.getCurrentWorkerMetadata();
+    String rawTableName = StageMetadata.getTableName(stageMetadata);
+    Map<String, List<String>> tableToSegmentListMap = WorkerMetadata.getTableSegmentsMap(workerMetadata);
+    List<ServerPlanRequestContext> requests = new ArrayList<>();
+    for (Map.Entry<String, List<String>> tableEntry : tableToSegmentListMap.entrySet()) {
+      String tableType = tableEntry.getKey();
+      // ZkHelixPropertyStore extends from ZkCacheBaseDataAccessor so it should not cause too much out-of-the-box
+      // network traffic. but there's chance to improve this:
+      // TODO: use TableDataManager: it is already getting tableConfig and Schema when processing segments.
+      if (TableType.OFFLINE.name().equals(tableType)) {
+        TableConfig tableConfig = ZKMetadataProvider.getTableConfig(helixPropertyStore,
+            TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(rawTableName));
+        Schema schema = ZKMetadataProvider.getTableSchema(helixPropertyStore,
+            TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(rawTableName));
+        requests.add(ServerPlanRequestUtils.build(planContext, distributedStagePlan, requestMetadataMap, tableConfig,
+            schema, StageMetadata.getTimeBoundary(stageMetadata), TableType.OFFLINE, tableEntry.getValue()));
+      } else if (TableType.REALTIME.name().equals(tableType)) {
+        TableConfig tableConfig = ZKMetadataProvider.getTableConfig(helixPropertyStore,
+            TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(rawTableName));
+        Schema schema = ZKMetadataProvider.getTableSchema(helixPropertyStore,
+            TableNameBuilder.forType(TableType.REALTIME).tableNameWithType(rawTableName));
+        requests.add(ServerPlanRequestUtils.build(planContext, distributedStagePlan, requestMetadataMap, tableConfig,
+            schema, StageMetadata.getTimeBoundary(stageMetadata), TableType.REALTIME, tableEntry.getValue()));
+      } else {
+        throw new IllegalArgumentException("Unsupported table type key: " + tableType);
+      }
+    }
+    return requests;
+  }
+
+  private static ServerPlanRequestContext build(PhysicalPlanContext planContext, DistributedStagePlan stagePlan,
+      Map<String, String> requestMetadataMap, TableConfig tableConfig, Schema schema, TimeBoundaryInfo timeBoundaryInfo,
+      TableType tableType, List<String> segmentList) {
+    // Before-visit: construct the ServerPlanRequestContext baseline
+    // Making a unique requestId for leaf stages otherwise it causes problem on stats/metrics/tracing.
+    long requestId = (Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID)) << 16) + (
+        (long) stagePlan.getStageId() << 8) + (tableType == TableType.REALTIME ? 1 : 0);
+    long timeoutMs = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS));
+    boolean traceEnabled = Boolean.parseBoolean(requestMetadataMap.get(CommonConstants.Broker.Request.TRACE));
+    PinotQuery pinotQuery = new PinotQuery();
+    Integer leafNodeLimit = QueryOptionsUtils.getMultiStageLeafLimit(requestMetadataMap);
+    if (leafNodeLimit != null) {
+      pinotQuery.setLimit(leafNodeLimit);
+    } else {
+      pinotQuery.setLimit(DEFAULT_LEAF_NODE_LIMIT);
+    }
+    LOGGER.debug("QueryID" + requestId + " leafNodeLimit:" + leafNodeLimit);
+    pinotQuery.setExplain(false);
+    ServerPlanRequestContext serverContext = new ServerPlanRequestContext(planContext, pinotQuery, tableType);
+
+    // visit the plan and create query physical plan.
+    ServerPlanRequestVisitor.walkStageNode(stagePlan.getStageRoot(), serverContext);
+
+    // Post-visit: finalize context.
+    // 1. global rewrite/optimize
+    if (timeBoundaryInfo != null) {
+      attachTimeBoundary(pinotQuery, timeBoundaryInfo, tableType == TableType.OFFLINE);
+    }
+    for (QueryRewriter queryRewriter : QUERY_REWRITERS) {
+      pinotQuery = queryRewriter.rewrite(pinotQuery);
+    }
+    QUERY_OPTIMIZER.optimize(pinotQuery, tableConfig, schema);
+
+    // 2. set pinot query options according to requestMetadataMap
+    updateQueryOptions(pinotQuery, requestMetadataMap, timeoutMs, traceEnabled);
+
+    // 3. wrapped around in broker request
+    BrokerRequest brokerRequest = new BrokerRequest();
+    brokerRequest.setPinotQuery(pinotQuery);
+    DataSource dataSource = pinotQuery.getDataSource();
+    if (dataSource != null) {
+      QuerySource querySource = new QuerySource();
+      querySource.setTableName(dataSource.getTableName());
+      brokerRequest.setQuerySource(querySource);
+    }
+
+    // 3. create instance request with segmentList
+    InstanceRequest instanceRequest = new InstanceRequest();
+    instanceRequest.setRequestId(requestId);
+    instanceRequest.setBrokerId("unknown");
+    instanceRequest.setEnableTrace(Boolean.parseBoolean(requestMetadataMap.get(CommonConstants.Broker.Request.TRACE)));
+    instanceRequest.setSearchSegments(segmentList);
+    instanceRequest.setQuery(brokerRequest);
+
+    serverContext.setInstanceRequest(instanceRequest);
+    return serverContext;
+  }
+
+  /**
+   * Helper method to update query options.
+   */
+  private static void updateQueryOptions(PinotQuery pinotQuery, Map<String, String> requestMetadataMap, long timeoutMs,
+      boolean traceEnabled) {
+    Map<String, String> queryOptions = new HashMap<>();
+    // put default timeout and trace options
+    queryOptions.put(CommonConstants.Broker.Request.QueryOptionKey.TIMEOUT_MS, String.valueOf(timeoutMs));
+    if (traceEnabled) {
+      queryOptions.put(CommonConstants.Broker.Request.TRACE, "true");
+    }
+    // overwrite with requestMetadataMap to carry query options from request:
+    queryOptions.putAll(requestMetadataMap);
+    pinotQuery.setQueryOptions(queryOptions);
+  }
+
+  /**
+   * Helper method to attach the time boundary to the given PinotQuery.
+   */
+  private static void attachTimeBoundary(PinotQuery pinotQuery, TimeBoundaryInfo timeBoundaryInfo,
+      boolean isOfflineRequest) {
+    String timeColumn = timeBoundaryInfo.getTimeColumn();
+    String timeValue = timeBoundaryInfo.getTimeValue();
+    Expression timeFilterExpression = RequestUtils.getFunctionExpression(
+        isOfflineRequest ? FilterKind.LESS_THAN_OR_EQUAL.name() : FilterKind.GREATER_THAN.name());
+    timeFilterExpression.getFunctionCall().setOperands(
+        Arrays.asList(RequestUtils.getIdentifierExpression(timeColumn), RequestUtils.getLiteralExpression(timeValue)));
+
+    Expression filterExpression = pinotQuery.getFilterExpression();
+    if (filterExpression != null) {
+      Expression andFilterExpression = RequestUtils.getFunctionExpression(FilterKind.AND.name());
+      andFilterExpression.getFunctionCall().setOperands(Arrays.asList(filterExpression, timeFilterExpression));
+      pinotQuery.setFilterExpression(andFilterExpression);
+    } else {
+      pinotQuery.setFilterExpression(timeFilterExpression);
+    }
+  }
+
+  /**
+   * attach the dynamic filter to the given PinotQuery.
+   */
+  static void attachDynamicFilter(PinotQuery pinotQuery, JoinNode.JoinKeys joinKeys, List<Object[]> dataContainer,
+      DataSchema dataSchema) {
+    FieldSelectionKeySelector leftSelector = (FieldSelectionKeySelector) joinKeys.getLeftJoinKeySelector();
+    FieldSelectionKeySelector rightSelector = (FieldSelectionKeySelector) joinKeys.getRightJoinKeySelector();
+    List<Expression> expressions = new ArrayList<>();
+    for (int i = 0; i < leftSelector.getColumnIndices().size(); i++) {
+      Expression leftExpr = pinotQuery.getSelectList().get(leftSelector.getColumnIndices().get(i));
+      int rightIdx = rightSelector.getColumnIndices().get(i);
+      Expression inFilterExpr = RequestUtils.getFunctionExpression(FilterKind.IN.name());
+      List<Expression> operands = new ArrayList<>(dataContainer.size() + 1);
+      operands.add(leftExpr);
+      operands.addAll(computeInOperands(dataContainer, dataSchema, rightIdx));
+      inFilterExpr.getFunctionCall().setOperands(operands);
+      expressions.add(inFilterExpr);
+    }
+    attachFilterExpression(pinotQuery, FilterKind.AND, expressions);
+  }
+
+  private static List<Expression> computeInOperands(List<Object[]> dataContainer, DataSchema dataSchema, int colIdx) {
+    final DataSchema.ColumnDataType columnDataType = dataSchema.getColumnDataType(colIdx);
+    final FieldSpec.DataType storedType = columnDataType.getStoredType().toDataType();;
+    final int numRows = dataContainer.size();
+    List<Expression> expressions = new ArrayList<>();
+    switch (storedType) {
+      case INT:
+        int[] arrInt = new int[numRows];
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          arrInt[rowIdx] = (int) dataContainer.get(rowIdx)[colIdx];
+        }
+        Arrays.sort(arrInt);
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          expressions.add(RequestUtils.getLiteralExpression(arrInt[rowIdx]));
+        }
+        break;
+      case LONG:
+        long[] arrLong = new long[numRows];
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          arrLong[rowIdx] = (long) dataContainer.get(rowIdx)[colIdx];
+        }
+        Arrays.sort(arrLong);
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          expressions.add(RequestUtils.getLiteralExpression(arrLong[rowIdx]));
+        }
+        break;
+      case FLOAT:
+        float[] arrFloat = new float[numRows];
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          arrFloat[rowIdx] = (float) dataContainer.get(rowIdx)[colIdx];
+        }
+        Arrays.sort(arrFloat);
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          expressions.add(RequestUtils.getLiteralExpression(arrFloat[rowIdx]));
+        }
+        break;
+      case DOUBLE:
+        double[] arrDouble = new double[numRows];
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          arrDouble[rowIdx] = (double) dataContainer.get(rowIdx)[colIdx];
+        }
+        Arrays.sort(arrDouble);
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          expressions.add(RequestUtils.getLiteralExpression(arrDouble[rowIdx]));
+        }
+        break;
+      case STRING:
+        String[] arrString = new String[numRows];
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          arrString[rowIdx] = (String) dataContainer.get(rowIdx)[colIdx];
+        }
+        Arrays.sort(arrString);
+        for (int rowIdx = 0; rowIdx < numRows; rowIdx++) {
+          expressions.add(RequestUtils.getLiteralExpression(arrString[rowIdx]));
+        }
+        break;
+      default:
+        throw new IllegalStateException("Illegal SV data type for ID_SET aggregation function: " + storedType);
+    }
+    return expressions;
+  }
+
+  /**
+   * Attach Filter Expression to existing PinotQuery.
+   */
+  private static void attachFilterExpression(PinotQuery pinotQuery, FilterKind attachKind, List<Expression> exprs) {
+    Preconditions.checkState(attachKind == FilterKind.AND || attachKind == FilterKind.OR);
+    Expression filterExpression = pinotQuery.getFilterExpression();
+    List<Expression> arrayList = new ArrayList<>(exprs);
+    if (filterExpression != null) {
+      arrayList.add(filterExpression);
+    }
+    if (arrayList.size() > 1) {
+      Expression attachFilterExpression = RequestUtils.getFunctionExpression(attachKind.name());
+      attachFilterExpression.getFunctionCall().setOperands(arrayList);
+      pinotQuery.setFilterExpression(attachFilterExpression);
+    } else {
+      pinotQuery.setFilterExpression(arrayList.get(0));
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestVisitor.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestVisitor.java
new file mode 100644
index 00000000000..8fa6df27567
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/plan/server/ServerPlanRequestVisitor.java
@@ -0,0 +1,195 @@
+/**
+ * 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.pinot.query.runtime.plan.server;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.request.DataSource;
+import org.apache.pinot.common.request.PinotQuery;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.query.parser.CalciteRexExpressionParser;
+import org.apache.pinot.query.planner.plannode.AggregateNode;
+import org.apache.pinot.query.planner.plannode.ExchangeNode;
+import org.apache.pinot.query.planner.plannode.FilterNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.planner.plannode.MailboxSendNode;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.planner.plannode.PlanNodeVisitor;
+import org.apache.pinot.query.planner.plannode.ProjectNode;
+import org.apache.pinot.query.planner.plannode.SetOpNode;
+import org.apache.pinot.query.planner.plannode.SortNode;
+import org.apache.pinot.query.planner.plannode.TableScanNode;
+import org.apache.pinot.query.planner.plannode.ValueNode;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerResult;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
+
+
+/**
+ * Plan visitor for direct leaf-stage server request.
+ *
+ * This should be merged with logics in {@link org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2} in the future
+ * to directly produce operator chain.
+ *
+ * As of now, the reason why we use the plan visitor for server request is for additional support such as dynamic
+ * filtering and other auxiliary functionalities.
+ */
+public class ServerPlanRequestVisitor implements PlanNodeVisitor<Void, ServerPlanRequestContext> {
+  private static final ServerPlanRequestVisitor INSTANCE = new ServerPlanRequestVisitor();
+
+  static void walkStageNode(PlanNode node, ServerPlanRequestContext context) {
+    node.visit(INSTANCE, context);
+  }
+
+  @Override
+  public Void visitAggregate(AggregateNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    // set group-by list
+    context.getPinotQuery()
+        .setGroupByList(CalciteRexExpressionParser.convertGroupByList(node.getGroupSet(), context.getPinotQuery()));
+    // set agg list
+    context.getPinotQuery().setSelectList(
+        CalciteRexExpressionParser.addSelectList(context.getPinotQuery().getGroupByList(), node.getAggCalls(),
+            context.getPinotQuery()));
+    return null;
+  }
+
+  @Override
+  public Void visitWindow(WindowNode node, ServerPlanRequestContext context) {
+    throw new UnsupportedOperationException("Window not yet supported!");
+  }
+
+  @Override
+  public Void visitSetOp(SetOpNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitExchange(ExchangeNode exchangeNode, ServerPlanRequestContext context) {
+    throw new UnsupportedOperationException("Exchange not yet supported!");
+  }
+
+  @Override
+  public Void visitFilter(FilterNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    context.getPinotQuery()
+        .setFilterExpression(CalciteRexExpressionParser.toExpression(node.getCondition(), context.getPinotQuery()));
+    return null;
+  }
+
+  @Override
+  public Void visitJoin(JoinNode node, ServerPlanRequestContext context) {
+    // visit only the static side, turn the dynamic side into a lookup from the pipeline breaker resultDataContainer
+    PlanNode staticSide = node.getInputs().get(0);
+    PlanNode dynamicSide = node.getInputs().get(1);
+    if (staticSide instanceof MailboxReceiveNode) {
+      dynamicSide = node.getInputs().get(0);
+      staticSide = node.getInputs().get(1);
+    }
+    staticSide.visit(this, context);
+    PipelineBreakerResult pipelineBreakerResult = context.getPlanContext().getPipelineBreakerResult();
+    int resultMapId = pipelineBreakerResult.getNodeIdMap().get(dynamicSide);
+    List<TransferableBlock> transferableBlocks = pipelineBreakerResult.getResultMap().getOrDefault(
+        resultMapId, Collections.emptyList());
+    List<Object[]> resultDataContainer = new ArrayList<>();
+    DataSchema dataSchema = dynamicSide.getDataSchema();
+    for (TransferableBlock block : transferableBlocks) {
+      if (block.getType() == DataBlock.Type.ROW) {
+        resultDataContainer.addAll(block.getContainer());
+      }
+    }
+
+    if (resultDataContainer.size() > 0) {
+      // rewrite SEMI-JOIN as filter clause.
+      ServerPlanRequestUtils.attachDynamicFilter(context.getPinotQuery(), node.getJoinKeys(), resultDataContainer,
+          dataSchema);
+    } else {
+      // do not pull any data out, this is constant false filter.
+      context.getPinotQuery().setLimit(0);
+    }
+    return null;
+  }
+
+  @Override
+  public Void visitMailboxReceive(MailboxReceiveNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitMailboxSend(MailboxSendNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    return null;
+  }
+
+  @Override
+  public Void visitProject(ProjectNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    context.getPinotQuery()
+        .setSelectList(CalciteRexExpressionParser.overwriteSelectList(node.getProjects(), context.getPinotQuery()));
+    return null;
+  }
+
+  @Override
+  public Void visitSort(SortNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    PinotQuery pinotQuery = context.getPinotQuery();
+    if (node.getCollationKeys().size() > 0) {
+      pinotQuery.setOrderByList(CalciteRexExpressionParser.convertOrderByList(node, pinotQuery));
+    }
+    if (node.getFetch() > 0) {
+      pinotQuery.setLimit(node.getFetch());
+    }
+    if (node.getOffset() > 0) {
+      pinotQuery.setOffset(node.getOffset());
+    }
+    return null;
+  }
+
+  @Override
+  public Void visitTableScan(TableScanNode node, ServerPlanRequestContext context) {
+    DataSource dataSource = new DataSource();
+    String tableNameWithType = TableNameBuilder.forType(context.getTableType())
+        .tableNameWithType(TableNameBuilder.extractRawTableName(node.getTableName()));
+    dataSource.setTableName(tableNameWithType);
+    context.getPinotQuery().setDataSource(dataSource);
+    context.getPinotQuery().setSelectList(
+        node.getTableScanColumns().stream().map(RequestUtils::getIdentifierExpression).collect(Collectors.toList()));
+    return null;
+  }
+
+  @Override
+  public Void visitValue(ValueNode node, ServerPlanRequestContext context) {
+    visitChildren(node, context);
+    return null;
+  }
+
+  private void visitChildren(PlanNode node, ServerPlanRequestContext context) {
+    for (PlanNode child : node.getInputs()) {
+      child.visit(this, context);
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryConfig.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryConfig.java
index d521f0f926a..bc80c96df6c 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryConfig.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryConfig.java
@@ -70,7 +70,7 @@ public class QueryConfig {
    * an operator chain despite any amount of time elapsed.
    */
   public static final String KEY_OF_SCHEDULER_RELEASE_TIMEOUT_MS = "pinot.query.scheduler.release.timeout.ms";
-  public static final long DEFAULT_SCHEDULER_RELEASE_TIMEOUT_MS = -1;
+  public static final long DEFAULT_SCHEDULER_RELEASE_TIMEOUT_MS = 10_000;
 
   private QueryConfig() {
     // do not instantiate.
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryDispatcher.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryDispatcher.java
deleted file mode 100644
index f0eb5643275..00000000000
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryDispatcher.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.service;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.apache.calcite.rel.RelDistribution;
-import org.apache.calcite.util.Pair;
-import org.apache.pinot.common.datablock.DataBlock;
-import org.apache.pinot.common.datablock.DataBlockUtils;
-import org.apache.pinot.common.exception.QueryException;
-import org.apache.pinot.common.proto.PinotQueryWorkerGrpc;
-import org.apache.pinot.common.proto.Worker;
-import org.apache.pinot.common.response.broker.ResultTable;
-import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.core.common.ObjectSerDeUtils;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
-import org.apache.pinot.query.runtime.operator.MailboxReceiveOperator;
-import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
-import org.apache.pinot.query.runtime.plan.serde.QueryPlanSerDeUtils;
-import org.roaringbitmap.RoaringBitmap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * {@code QueryDispatcher} dispatch a query to different workers.
- */
-public class QueryDispatcher {
-  private static final Logger LOGGER = LoggerFactory.getLogger(QueryDispatcher.class);
-
-  private final Map<String, DispatchClient> _dispatchClientMap = new ConcurrentHashMap<>();
-
-  public QueryDispatcher() {
-  }
-
-  public ResultTable submitAndReduce(long requestId, QueryPlan queryPlan,
-      MailboxService<TransferableBlock> mailboxService, long timeoutMs, Map<String, String> queryOptions)
-      throws Exception {
-    // submit all the distributed stages.
-    int reduceStageId = submit(requestId, queryPlan, timeoutMs, queryOptions);
-    // run reduce stage and return result.
-    MailboxReceiveNode reduceNode = (MailboxReceiveNode) queryPlan.getQueryStageMap().get(reduceStageId);
-    MailboxReceiveOperator mailboxReceiveOperator = createReduceStageOperator(mailboxService,
-        queryPlan.getStageMetadataMap().get(reduceNode.getSenderStageId()).getServerInstances(), requestId,
-        reduceNode.getSenderStageId(), reduceNode.getDataSchema(), mailboxService.getHostname(),
-        mailboxService.getMailboxPort(), timeoutMs);
-    List<DataBlock> resultDataBlocks = reduceMailboxReceive(mailboxReceiveOperator, timeoutMs);
-    mailboxReceiveOperator.toExplainString();
-    long toResultTableStartTime = System.currentTimeMillis();
-    ResultTable resultTable = toResultTable(resultDataBlocks, queryPlan.getQueryResultFields(),
-        queryPlan.getQueryStageMap().get(0).getDataSchema());
-    LOGGER.debug(
-        "RequestId:" + requestId + " StageId: 0 Broker toResultTable processing time:" + (System.currentTimeMillis()
-            - toResultTableStartTime) + " ms");
-    return resultTable;
-  }
-
-  public int submit(long requestId, QueryPlan queryPlan, long timeoutMs, Map<String, String> queryOptions)
-      throws Exception {
-    int reduceStageId = -1;
-    for (Map.Entry<Integer, StageMetadata> stage : queryPlan.getStageMetadataMap().entrySet()) {
-      int stageId = stage.getKey();
-      // stage rooting at a mailbox receive node means reduce stage.
-      if (queryPlan.getQueryStageMap().get(stageId) instanceof MailboxReceiveNode) {
-        reduceStageId = stageId;
-      } else {
-        List<ServerInstance> serverInstances = stage.getValue().getServerInstances();
-        for (ServerInstance serverInstance : serverInstances) {
-          String host = serverInstance.getHostname();
-          int servicePort = serverInstance.getQueryServicePort();
-          DispatchClient client = getOrCreateDispatchClient(host, servicePort);
-          Worker.QueryResponse response = client.submit(Worker.QueryRequest.newBuilder().setStagePlan(
-                  QueryPlanSerDeUtils.serialize(constructDistributedStagePlan(queryPlan, stageId, serverInstance)))
-              .putMetadata(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(requestId))
-              .putMetadata(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS, String.valueOf(timeoutMs))
-              .putAllMetadata(queryOptions).build());
-
-          if (response.containsMetadata(QueryConfig.KEY_OF_SERVER_RESPONSE_STATUS_ERROR)) {
-            throw new RuntimeException(
-                String.format("Unable to execute query plan at stage %s on server %s: ERROR: %s", stageId,
-                    serverInstance, response));
-          }
-        }
-      }
-    }
-    return reduceStageId;
-  }
-
-  private DispatchClient getOrCreateDispatchClient(String host, int port) {
-    String key = String.format("%s_%d", host, port);
-    return _dispatchClientMap.computeIfAbsent(key, k -> new DispatchClient(host, port));
-  }
-
-  public static DistributedStagePlan constructDistributedStagePlan(QueryPlan queryPlan, int stageId,
-      ServerInstance serverInstance) {
-    return new DistributedStagePlan(stageId, serverInstance, queryPlan.getQueryStageMap().get(stageId),
-        queryPlan.getStageMetadataMap());
-  }
-
-  public static List<DataBlock> reduceMailboxReceive(MailboxReceiveOperator mailboxReceiveOperator, long timeoutMs) {
-    List<DataBlock> resultDataBlocks = new ArrayList<>();
-    TransferableBlock transferableBlock;
-    long timeoutWatermark = System.nanoTime() + timeoutMs * 1_000_000L;
-    while (System.nanoTime() < timeoutWatermark) {
-      transferableBlock = mailboxReceiveOperator.nextBlock();
-      if (TransferableBlockUtils.isEndOfStream(transferableBlock) && transferableBlock.isErrorBlock()) {
-        // TODO: we only received bubble up error from the execution stage tree.
-        // TODO: query dispatch should also send cancel signal to the rest of the execution stage tree.
-        throw new RuntimeException(
-            "Received error query execution result block: " + transferableBlock.getDataBlock().getExceptions());
-      }
-      if (transferableBlock.isNoOpBlock()) {
-        continue;
-      } else if (transferableBlock.isEndOfStreamBlock()) {
-        return resultDataBlocks;
-      }
-      resultDataBlocks.add(transferableBlock.getDataBlock());
-    }
-    throw new RuntimeException("Timed out while receiving from mailbox: " + QueryException.EXECUTION_TIMEOUT_ERROR);
-  }
-
-  public static ResultTable toResultTable(List<DataBlock> queryResult, List<Pair<Integer, String>> fields,
-      DataSchema sourceSchema) {
-    List<Object[]> resultRows = new ArrayList<>();
-    DataSchema resultSchema = toResultSchema(sourceSchema, fields);
-    for (DataBlock dataBlock : queryResult) {
-      int numColumns = resultSchema.getColumnNames().length;
-      int numRows = dataBlock.getNumberOfRows();
-      List<Object[]> rows = new ArrayList<>(dataBlock.getNumberOfRows());
-      if (numRows > 0) {
-        RoaringBitmap[] nullBitmaps = new RoaringBitmap[numColumns];
-        for (int colId = 0; colId < numColumns; colId++) {
-          nullBitmaps[colId] = dataBlock.getNullRowIds(colId);
-        }
-        List<Object[]> rawRows = DataBlockUtils.extractRows(dataBlock, ObjectSerDeUtils::deserialize);
-        int rowId = 0;
-        for (Object[] rawRow : rawRows) {
-          Object[] row = new Object[numColumns];
-          // Only the masked fields should be selected out.
-          int colId = 0;
-          for (Pair<Integer, String> field : fields) {
-            if (nullBitmaps[colId] != null && nullBitmaps[colId].contains(rowId)) {
-              row[colId++] = null;
-            } else {
-              int colRef = field.left;
-              row[colId++] = rawRow[colRef];
-            }
-          }
-          rows.add(row);
-          rowId++;
-        }
-      }
-      resultRows.addAll(rows);
-    }
-    return new ResultTable(resultSchema, resultRows);
-  }
-
-  private static DataSchema toResultSchema(DataSchema inputSchema, List<Pair<Integer, String>> fields) {
-    String[] colNames = new String[fields.size()];
-    DataSchema.ColumnDataType[] colTypes = new DataSchema.ColumnDataType[fields.size()];
-    for (int i = 0; i < fields.size(); i++) {
-      colNames[i] = fields.get(i).right;
-      colTypes[i] = inputSchema.getColumnDataType(fields.get(i).left);
-    }
-    return new DataSchema(colNames, colTypes);
-  }
-
-  @VisibleForTesting
-  public static MailboxReceiveOperator createReduceStageOperator(MailboxService<TransferableBlock> mailboxService,
-      List<ServerInstance> sendingInstances, long jobId, int stageId, DataSchema dataSchema, String hostname,
-      int port, long timeoutMs) {
-    // timeout is set for reduce stage
-    MailboxReceiveOperator mailboxReceiveOperator =
-        new MailboxReceiveOperator(mailboxService, sendingInstances,
-            RelDistribution.Type.RANDOM_DISTRIBUTED, hostname, port, jobId, stageId, timeoutMs);
-    return mailboxReceiveOperator;
-  }
-
-  public void shutdown() {
-    for (DispatchClient dispatchClient : _dispatchClientMap.values()) {
-      dispatchClient._managedChannel.shutdown();
-    }
-    _dispatchClientMap.clear();
-  }
-
-  public static class DispatchClient {
-    private final PinotQueryWorkerGrpc.PinotQueryWorkerBlockingStub _blockingStub;
-    private final ManagedChannel _managedChannel;
-
-    public DispatchClient(String host, int port) {
-      ManagedChannelBuilder managedChannelBuilder = ManagedChannelBuilder.forAddress(host, port).usePlaintext();
-      _managedChannel = managedChannelBuilder.build();
-      _blockingStub = PinotQueryWorkerGrpc.newBlockingStub(_managedChannel);
-    }
-
-    public Worker.QueryResponse submit(Worker.QueryRequest request) {
-      return _blockingStub.submit(request);
-    }
-  }
-}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryServer.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryServer.java
index 24eaf1bbf56..0475b66c772 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryServer.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/QueryServer.java
@@ -18,21 +18,22 @@
  */
 package org.apache.pinot.query.service;
 
-import io.grpc.Context;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
-import java.io.IOException;
+import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.apache.pinot.common.proto.PinotQueryWorkerGrpc;
 import org.apache.pinot.common.proto.Worker;
-import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.common.utils.NamedThreadFactory;
 import org.apache.pinot.core.transport.grpc.GrpcQueryServer;
 import org.apache.pinot.query.runtime.QueryRunner;
 import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
 import org.apache.pinot.query.runtime.plan.serde.QueryPlanSerDeUtils;
+import org.apache.pinot.query.service.dispatch.QueryDispatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,35 +43,49 @@
  */
 public class QueryServer extends PinotQueryWorkerGrpc.PinotQueryWorkerImplBase {
   private static final Logger LOGGER = LoggerFactory.getLogger(GrpcQueryServer.class);
+  // TODO: Inbound messages can get quite large because we send the entire stage metadata map in each call.
+  // See https://github.com/apache/pinot/issues/10331
+  private static final int MAX_INBOUND_MESSAGE_SIZE = 64 * 1024 * 1024;
 
-  private final Server _server;
+  private final int _port;
   private final QueryRunner _queryRunner;
+  // query submission service is only used for plan submission for now.
+  // TODO: with complex query submission logic we should allow asynchronous query submission return instead of
+  //   directly return from submission response observer.
+  private final ExecutorService _querySubmissionExecutorService;
+
+  private Server _server = null;
 
   public QueryServer(int port, QueryRunner queryRunner) {
-    _server = ServerBuilder.forPort(port).addService(this).build();
+    _port = port;
     _queryRunner = queryRunner;
-
-    LOGGER.info("Initialized QueryWorker on port: {} with numWorkerThreads: {}", port,
-        ResourceManager.DEFAULT_QUERY_WORKER_THREADS);
+    _querySubmissionExecutorService = Executors.newCachedThreadPool(
+        new NamedThreadFactory("query_submission_executor_on_" + _port + "_port"));
   }
 
   public void start() {
-    LOGGER.info("Starting QueryWorker");
+    LOGGER.info("Starting QueryServer");
     try {
+      if (_server == null) {
+        _server = ServerBuilder.forPort(_port).addService(this).maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE).build();
+        LOGGER.info("Initialized QueryServer on port: {}", _port);
+      }
       _queryRunner.start();
       _server.start();
-    } catch (IOException | TimeoutException e) {
+    } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
 
   public void shutdown() {
-    LOGGER.info("Shutting down QueryWorker");
+    LOGGER.info("Shutting down QueryServer");
     try {
       _queryRunner.shutDown();
-      _server.shutdown();
-      _server.awaitTermination();
-    } catch (InterruptedException | TimeoutException e) {
+      if (_server != null) {
+        _server.shutdown();
+        _server.awaitTermination();
+      }
+    } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
@@ -78,36 +93,40 @@ public void shutdown() {
   @Override
   public void submit(Worker.QueryRequest request, StreamObserver<Worker.QueryResponse> responseObserver) {
     // Deserialize the request
-    DistributedStagePlan distributedStagePlan;
+    List<DistributedStagePlan> distributedStagePlans;
     Map<String, String> requestMetadataMap;
+    requestMetadataMap = request.getMetadataMap();
+    long requestId = Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID));
     try {
-      distributedStagePlan = QueryPlanSerDeUtils.deserialize(request.getStagePlan());
-      requestMetadataMap = request.getMetadataMap();
+      distributedStagePlans = QueryPlanSerDeUtils.deserializeStagePlan(request);
     } catch (Exception e) {
-      LOGGER.error("Caught exception while deserializing the request: {}", request, e);
+      LOGGER.error("Caught exception while deserializing the request: {}", requestId, e);
       responseObserver.onError(Status.INVALID_ARGUMENT.withDescription("Bad request").withCause(e).asException());
       return;
     }
-
-    // return dispatch successful.
-    // TODO: return meaningful value here.
+    // TODO: allow thrown exception to return back to broker in asynchronous manner.
+    distributedStagePlans.forEach(distributedStagePlan -> _querySubmissionExecutorService.submit(() -> {
+          try {
+            _queryRunner.processQuery(distributedStagePlan, requestMetadataMap);
+          } catch (Throwable t) {
+            LOGGER.error("Caught exception while compiling opChain for request: {}, stage: {}", requestId,
+                distributedStagePlan.getStageId(), t);
+          }
+        })
+    );
     responseObserver.onNext(Worker.QueryResponse.newBuilder()
         .putMetadata(QueryConfig.KEY_OF_SERVER_RESPONSE_STATUS_OK, "").build());
     responseObserver.onCompleted();
+  }
 
-    // start a new GRPC ctx has all the values as the current context, but won't be cancelled
-    Context ctx = Context.current().fork();
-    // Set ctx as the current context within the Runnable can start asynchronous work here that will not
-    // be cancelled when submit returns
-    ctx.run(() -> {
-      // Process the query
-      try {
-        // TODO: break this into parsing and execution, so that responseObserver can return upon parsing complete.
-        _queryRunner.processQuery(distributedStagePlan, requestMetadataMap);
-      } catch (Exception e) {
-        LOGGER.error("Caught exception while processing request", e);
-        throw new RuntimeException(e);
-      }
-    });
+  @Override
+  public void cancel(Worker.CancelRequest request, StreamObserver<Worker.CancelResponse> responseObserver) {
+    try {
+      _queryRunner.cancel(request.getRequestId());
+    } catch (Throwable t) {
+      LOGGER.error("Caught exception while cancelling opChain for request: {}", request.getRequestId(), t);
+    }
+    // we always return completed even if cancel attempt fails, server will self clean up in this case.
+    responseObserver.onCompleted();
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/AsyncQueryDispatchResponse.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/AsyncQueryDispatchResponse.java
new file mode 100644
index 00000000000..185ba4f607b
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/AsyncQueryDispatchResponse.java
@@ -0,0 +1,62 @@
+/**
+ * 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.pinot.query.service.dispatch;
+
+import io.grpc.stub.StreamObserver;
+import javax.annotation.Nullable;
+import org.apache.pinot.common.proto.Worker;
+import org.apache.pinot.query.routing.QueryServerInstance;
+
+
+/**
+ * Response returned by {@link DispatchClient} asynchronously using a callback. If the {@link StreamObserver#onError}
+ * was called (i.e. the dispatch failed), then the exception is stored in the response and the caller should use
+ * {@link #getThrowable()} to check if it is null.
+ */
+class AsyncQueryDispatchResponse {
+  private final QueryServerInstance _virtualServer;
+  private final int _stageId;
+  private final Worker.QueryResponse _queryResponse;
+  private final Throwable _throwable;
+
+  public AsyncQueryDispatchResponse(QueryServerInstance virtualServer, int stageId, Worker.QueryResponse queryResponse,
+      @Nullable Throwable throwable) {
+    _virtualServer = virtualServer;
+    _stageId = stageId;
+    _queryResponse = queryResponse;
+    _throwable = throwable;
+  }
+
+  public QueryServerInstance getVirtualServer() {
+    return _virtualServer;
+  }
+
+  public int getStageId() {
+    return _stageId;
+  }
+
+  public Worker.QueryResponse getQueryResponse() {
+    return _queryResponse;
+  }
+
+  @Nullable
+  public Throwable getThrowable() {
+    return _throwable;
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaSimpleConsumerFactoryImpl.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/CancelObserver.java
similarity index 65%
rename from pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaSimpleConsumerFactoryImpl.java
rename to pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/CancelObserver.java
index fcf3505cd9f..c9faa4cba4c 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaSimpleConsumerFactoryImpl.java
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/CancelObserver.java
@@ -16,17 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.plugin.stream.kafka09;
+package org.apache.pinot.query.service.dispatch;
 
-import kafka.javaapi.consumer.SimpleConsumer;
+import io.grpc.stub.StreamObserver;
+import org.apache.pinot.common.proto.Worker;
 
 
 /**
- * Implementation of the Kafka SimpleConsumer factory.
+ * A no-op {@link StreamObserver} for cancellation requests.
  */
-public class KafkaSimpleConsumerFactoryImpl implements KafkaSimpleConsumerFactory {
+class CancelObserver implements StreamObserver<Worker.CancelResponse> {
   @Override
-  public SimpleConsumer buildSimpleConsumer(String host, int port, int soTimeout, int bufferSize, String clientId) {
-    return new SimpleConsumer(host, port, soTimeout, bufferSize, clientId);
+  public void onNext(Worker.CancelResponse cancelResponse) {
+  }
+
+  @Override
+  public void onError(Throwable throwable) {
+  }
+
+  @Override
+  public void onCompleted() {
   }
 }
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/DispatchClient.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/DispatchClient.java
new file mode 100644
index 00000000000..03861a436ee
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/DispatchClient.java
@@ -0,0 +1,73 @@
+/**
+ * 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.pinot.query.service.dispatch;
+
+import io.grpc.Deadline;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.stub.StreamObserver;
+import java.util.function.Consumer;
+import org.apache.pinot.common.proto.PinotQueryWorkerGrpc;
+import org.apache.pinot.common.proto.Worker;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Dispatches a query plan to given a {@link QueryServerInstance}. Each {@link DispatchClient} has its own gRPC Channel
+ * and Client Stub.
+ * TODO: It might be neater to implement pooling at the client level. Two options: (1) Pass a channel provider and
+ *       let that take care of pooling. (2) Create a DispatchClient interface and implement pooled/non-pooled versions.
+ */
+class DispatchClient {
+  private static final Logger LOGGER = LoggerFactory.getLogger(DispatchClient.class);
+  private static final StreamObserver<Worker.CancelResponse> NO_OP_CANCEL_STREAM_OBSERVER = new CancelObserver();
+  private final ManagedChannel _channel;
+  private final PinotQueryWorkerGrpc.PinotQueryWorkerStub _dispatchStub;
+
+  public DispatchClient(String host, int port) {
+    _channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext().build();
+    _dispatchStub = PinotQueryWorkerGrpc.newStub(_channel);
+  }
+
+  public ManagedChannel getChannel() {
+    return _channel;
+  }
+
+  public void submit(Worker.QueryRequest request, int stageId, QueryServerInstance virtualServer, Deadline deadline,
+      Consumer<AsyncQueryDispatchResponse> callback) {
+    try {
+      _dispatchStub.withDeadline(deadline).submit(request, new DispatchObserver(stageId, virtualServer, callback));
+    } catch (Exception e) {
+      LOGGER.error("Query Dispatch failed at client-side", e);
+      callback.accept(new AsyncQueryDispatchResponse(
+          virtualServer, stageId, Worker.QueryResponse.getDefaultInstance(), e));
+    }
+  }
+
+  public void cancel(long requestId) {
+    try {
+      Worker.CancelRequest cancelRequest = Worker.CancelRequest.newBuilder().setRequestId(requestId).build();
+      _dispatchStub.cancel(cancelRequest, NO_OP_CANCEL_STREAM_OBSERVER);
+    } catch (Exception e) {
+      LOGGER.error("Query Cancellation failed at client-side", e);
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/DispatchObserver.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/DispatchObserver.java
new file mode 100644
index 00000000000..2a7425dd993
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/DispatchObserver.java
@@ -0,0 +1,59 @@
+/**
+ * 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.pinot.query.service.dispatch;
+
+import io.grpc.stub.StreamObserver;
+import java.util.function.Consumer;
+import org.apache.pinot.common.proto.Worker;
+import org.apache.pinot.query.routing.QueryServerInstance;
+
+
+/**
+ * A {@link StreamObserver} used by {@link DispatchClient} to subscribe to the response of a async Query Dispatch call.
+ */
+class DispatchObserver implements StreamObserver<Worker.QueryResponse> {
+  private int _stageId;
+  private QueryServerInstance _virtualServer;
+  private Consumer<AsyncQueryDispatchResponse> _callback;
+  private Worker.QueryResponse _queryResponse;
+
+  public DispatchObserver(int stageId, QueryServerInstance virtualServer,
+      Consumer<AsyncQueryDispatchResponse> callback) {
+    _stageId = stageId;
+    _virtualServer = virtualServer;
+    _callback = callback;
+  }
+
+  @Override
+  public void onNext(Worker.QueryResponse queryResponse) {
+    _queryResponse = queryResponse;
+  }
+
+  @Override
+  public void onError(Throwable throwable) {
+    _callback.accept(
+        new AsyncQueryDispatchResponse(_virtualServer, _stageId, Worker.QueryResponse.getDefaultInstance(),
+            throwable));
+  }
+
+  @Override
+  public void onCompleted() {
+    _callback.accept(new AsyncQueryDispatchResponse(_virtualServer, _stageId, _queryResponse, null));
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/QueryDispatcher.java b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/QueryDispatcher.java
new file mode 100644
index 00000000000..e5ca95cbbe2
--- /dev/null
+++ b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/QueryDispatcher.java
@@ -0,0 +1,308 @@
+/**
+ * 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.pinot.query.service.dispatch;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.grpc.Deadline;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.calcite.util.Pair;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.datablock.DataBlockUtils;
+import org.apache.pinot.common.proto.Worker;
+import org.apache.pinot.common.response.broker.ResultTable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.common.ObjectSerDeUtils;
+import org.apache.pinot.core.query.reduce.ExecutionStatsAggregator;
+import org.apache.pinot.core.util.trace.TracedThreadFactory;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.PhysicalExplainPlanVisitor;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
+import org.apache.pinot.query.runtime.operator.MailboxReceiveOperator;
+import org.apache.pinot.query.runtime.operator.OpChainStats;
+import org.apache.pinot.query.runtime.operator.OperatorStats;
+import org.apache.pinot.query.runtime.operator.utils.OperatorUtils;
+import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerExecutor;
+import org.apache.pinot.query.runtime.plan.pipeline.PipelineBreakerResult;
+import org.apache.pinot.query.runtime.plan.serde.QueryPlanSerDeUtils;
+import org.apache.pinot.query.service.QueryConfig;
+import org.apache.pinot.spi.utils.ByteArray;
+import org.roaringbitmap.RoaringBitmap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * {@code QueryDispatcher} dispatch a query to different workers.
+ */
+public class QueryDispatcher {
+  private static final Logger LOGGER = LoggerFactory.getLogger(QueryDispatcher.class);
+  private static final long DEFAULT_DISPATCHER_CALLBACK_POLL_TIMEOUT_MS = 100;
+  private static final String PINOT_BROKER_QUERY_DISPATCHER_FORMAT = "multistage-query-dispatch-%d";
+
+  private final Map<String, DispatchClient> _dispatchClientMap = new ConcurrentHashMap<>();
+  private final ExecutorService _executorService;
+
+  public QueryDispatcher() {
+    _executorService = Executors.newFixedThreadPool(2 * Runtime.getRuntime().availableProcessors(),
+        new TracedThreadFactory(Thread.NORM_PRIORITY, false, PINOT_BROKER_QUERY_DISPATCHER_FORMAT));
+  }
+
+  public ResultTable submitAndReduce(long requestId, DispatchableSubPlan dispatchableSubPlan,
+      MailboxService mailboxService, OpChainSchedulerService scheduler, long timeoutMs,
+      Map<String, String> queryOptions, Map<Integer, ExecutionStatsAggregator> executionStatsAggregator,
+      boolean traceEnabled)
+      throws Exception {
+    try {
+      // submit all the distributed stages.
+      int reduceStageId = submit(requestId, dispatchableSubPlan, timeoutMs, queryOptions);
+      // run reduce stage and return result.
+      return runReducer(requestId, dispatchableSubPlan, reduceStageId, timeoutMs, mailboxService, scheduler,
+          executionStatsAggregator,
+          traceEnabled);
+    } catch (Exception e) {
+      cancel(requestId, dispatchableSubPlan);
+      throw new RuntimeException("Error executing query: "
+          + PhysicalExplainPlanVisitor.explain(dispatchableSubPlan), e);
+    }
+  }
+
+  private void cancel(long requestId, DispatchableSubPlan dispatchableSubPlan) {
+    Set<DispatchClient> dispatchClientSet = new HashSet<>();
+
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      // stage rooting at a mailbox receive node means reduce stage.
+      if (!(dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment()
+          .getFragmentRoot() instanceof MailboxReceiveNode)) {
+        Set<QueryServerInstance> serverInstances =
+            dispatchableSubPlan.getQueryStageList().get(stageId).getServerInstanceToWorkerIdMap().keySet();
+        for (QueryServerInstance serverInstance : serverInstances) {
+          String host = serverInstance.getHostname();
+          int servicePort = serverInstance.getQueryServicePort();
+          dispatchClientSet.add(getOrCreateDispatchClient(host, servicePort));
+        }
+      }
+    }
+    for (DispatchClient dispatchClient : dispatchClientSet) {
+      dispatchClient.cancel(requestId);
+    }
+  }
+
+  @VisibleForTesting
+  int submit(long requestId, DispatchableSubPlan dispatchableSubPlan, long timeoutMs,
+      Map<String, String> queryOptions)
+      throws Exception {
+    int reduceStageId = -1;
+    Deadline deadline = Deadline.after(timeoutMs, TimeUnit.MILLISECONDS);
+    BlockingQueue<AsyncQueryDispatchResponse> dispatchCallbacks = new LinkedBlockingQueue<>();
+    int dispatchCalls = 0;
+
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      // stage rooting at a mailbox receive node means reduce stage.
+      if (dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment()
+          .getFragmentRoot() instanceof MailboxReceiveNode) {
+        reduceStageId = stageId;
+      } else {
+        for (Map.Entry<QueryServerInstance, List<Integer>> queryServerEntry
+            : dispatchableSubPlan.getQueryStageList().get(stageId).getServerInstanceToWorkerIdMap().entrySet()) {
+          QueryServerInstance queryServerInstance = queryServerEntry.getKey();
+          Worker.QueryRequest.Builder queryRequestBuilder = Worker.QueryRequest.newBuilder();
+          String host = queryServerInstance.getHostname();
+          int servicePort = queryServerInstance.getQueryServicePort();
+          queryRequestBuilder.addStagePlan(
+              QueryPlanSerDeUtils.serialize(dispatchableSubPlan, stageId, queryServerInstance,
+                  queryServerEntry.getValue()));
+          dispatchCalls++;
+          Worker.QueryRequest queryRequest =
+              queryRequestBuilder.putMetadata(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(requestId))
+                  .putMetadata(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS, String.valueOf(timeoutMs))
+                  .putAllMetadata(queryOptions).build();
+          DispatchClient client = getOrCreateDispatchClient(host, servicePort);
+          int finalStageId = stageId;
+          _executorService.submit(() -> client.submit(queryRequest, finalStageId, queryServerInstance, deadline,
+              dispatchCallbacks::offer));
+        }
+      }
+    }
+    int successfulDispatchCalls = 0;
+    // TODO: Cancel all dispatched requests if one of the dispatch errors out or deadline is breached.
+    while (!deadline.isExpired() && successfulDispatchCalls < dispatchCalls) {
+      AsyncQueryDispatchResponse resp =
+          dispatchCallbacks.poll(DEFAULT_DISPATCHER_CALLBACK_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+      if (resp != null) {
+        if (resp.getThrowable() != null) {
+          throw new RuntimeException(
+              String.format("Error dispatching query to server=%s stage=%s", resp.getVirtualServer(),
+                  resp.getStageId()), resp.getThrowable());
+        } else {
+          Worker.QueryResponse response = resp.getQueryResponse();
+          if (response.containsMetadata(QueryConfig.KEY_OF_SERVER_RESPONSE_STATUS_ERROR)) {
+            throw new RuntimeException(
+                String.format("Unable to execute query plan at stage %s on server %s: ERROR: %s", resp.getStageId(),
+                    resp.getVirtualServer(),
+                    response.getMetadataOrDefault(QueryConfig.KEY_OF_SERVER_RESPONSE_STATUS_ERROR, "null")));
+          }
+          successfulDispatchCalls++;
+        }
+      }
+    }
+    if (deadline.isExpired()) {
+      throw new RuntimeException("Timed out waiting for response of async query-dispatch");
+    }
+    return reduceStageId;
+  }
+
+  @VisibleForTesting
+  public static ResultTable runReducer(long requestId, DispatchableSubPlan dispatchableSubPlan, int reduceStageId,
+      long timeoutMs, MailboxService mailboxService, OpChainSchedulerService scheduler,
+      Map<Integer, ExecutionStatsAggregator> statsAggregatorMap, boolean traceEnabled) {
+    DispatchablePlanFragment reduceStagePlanFragment = dispatchableSubPlan.getQueryStageList().get(reduceStageId);
+    MailboxReceiveNode reduceNode = (MailboxReceiveNode) reduceStagePlanFragment.getPlanFragment().getFragmentRoot();
+    reduceNode.setExchangeType(PinotRelExchangeType.PIPELINE_BREAKER);
+    VirtualServerAddress server = new VirtualServerAddress(mailboxService.getHostname(), mailboxService.getPort(), 0);
+    StageMetadata brokerStageMetadata = new StageMetadata.Builder()
+        .setWorkerMetadataList(reduceStagePlanFragment.getWorkerMetadataList())
+        .addCustomProperties(reduceStagePlanFragment.getCustomProperties())
+        .build();
+    DistributedStagePlan reducerStagePlan = new DistributedStagePlan(0, server, reduceNode, brokerStageMetadata);
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(scheduler, mailboxService, reducerStagePlan,
+            System.currentTimeMillis() + timeoutMs, requestId, traceEnabled);
+    if (pipelineBreakerResult == null) {
+      throw new RuntimeException("Broker reducer error during query execution!");
+    }
+    collectStats(dispatchableSubPlan, pipelineBreakerResult.getOpChainStats(), statsAggregatorMap);
+    List<TransferableBlock> resultDataBlocks = pipelineBreakerResult.getResultMap().get(0);
+    return toResultTable(resultDataBlocks, dispatchableSubPlan.getQueryResultFields(),
+        dispatchableSubPlan.getQueryStageList().get(0).getPlanFragment().getFragmentRoot().getDataSchema());
+  }
+
+  private static void collectStats(DispatchableSubPlan dispatchableSubPlan, @Nullable OpChainStats opChainStats,
+      @Nullable Map<Integer, ExecutionStatsAggregator> executionStatsAggregatorMap) {
+    if (executionStatsAggregatorMap != null && opChainStats != null) {
+      LOGGER.info("Extracting broker query execution stats, Runtime: {}ms", opChainStats.getExecutionTime());
+      for (Map.Entry<String, OperatorStats> entry : opChainStats.getOperatorStatsMap().entrySet()) {
+        OperatorStats operatorStats = entry.getValue();
+        ExecutionStatsAggregator rootStatsAggregator = executionStatsAggregatorMap.get(0);
+        ExecutionStatsAggregator stageStatsAggregator = executionStatsAggregatorMap.get(operatorStats.getStageId());
+        rootStatsAggregator.aggregate(null, entry.getValue().getExecutionStats(), new HashMap<>());
+        if (stageStatsAggregator != null) {
+          if (dispatchableSubPlan != null) {
+            OperatorUtils.recordTableName(operatorStats,
+                dispatchableSubPlan.getQueryStageList().get(operatorStats.getStageId()));
+          }
+          stageStatsAggregator.aggregate(null, entry.getValue().getExecutionStats(), new HashMap<>());
+        }
+      }
+    }
+  }
+
+  private static ResultTable toResultTable(List<TransferableBlock> queryResult, List<Pair<Integer, String>> fields,
+      DataSchema sourceSchema) {
+    List<Object[]> resultRows = new ArrayList<>();
+    DataSchema resultSchema = toResultSchema(sourceSchema, fields);
+    for (TransferableBlock transferableBlock : queryResult) {
+      if (transferableBlock.isErrorBlock()) {
+        throw new RuntimeException(
+            "Received error query execution result block: " + transferableBlock.getDataBlock().getExceptions());
+      }
+      DataBlock dataBlock = transferableBlock.getDataBlock();
+      int numColumns = resultSchema.getColumnNames().length;
+      int numRows = dataBlock.getNumberOfRows();
+      List<Object[]> rows = new ArrayList<>(dataBlock.getNumberOfRows());
+      if (numRows > 0) {
+        RoaringBitmap[] nullBitmaps = new RoaringBitmap[numColumns];
+        for (int colId = 0; colId < numColumns; colId++) {
+          nullBitmaps[colId] = dataBlock.getNullRowIds(colId);
+        }
+        List<Object[]> rawRows = DataBlockUtils.extractRows(dataBlock, ObjectSerDeUtils::deserialize);
+        int rowId = 0;
+        for (Object[] rawRow : rawRows) {
+          Object[] row = new Object[numColumns];
+          // Only the masked fields should be selected out.
+          int colId = 0;
+          for (Pair<Integer, String> field : fields) {
+            if (nullBitmaps[colId] != null && nullBitmaps[colId].contains(rowId)) {
+              row[colId++] = null;
+            } else {
+              int colRef = field.left;
+              if (rawRow[colRef] instanceof ByteArray) {
+                row[colId++] = ((ByteArray) rawRow[colRef]).toHexString();
+              } else {
+                row[colId++] = rawRow[colRef];
+              }
+            }
+          }
+          rows.add(row);
+          rowId++;
+        }
+      }
+      resultRows.addAll(rows);
+    }
+    return new ResultTable(resultSchema, resultRows);
+  }
+
+  private static DataSchema toResultSchema(DataSchema inputSchema, List<Pair<Integer, String>> fields) {
+    String[] colNames = new String[fields.size()];
+    DataSchema.ColumnDataType[] colTypes = new DataSchema.ColumnDataType[fields.size()];
+    for (int i = 0; i < fields.size(); i++) {
+      colNames[i] = fields.get(i).right;
+      colTypes[i] = inputSchema.getColumnDataType(fields.get(i).left);
+    }
+    return new DataSchema(colNames, colTypes);
+  }
+
+  private static MailboxReceiveOperator createReduceStageOperator(OpChainExecutionContext context, int senderStageId) {
+    return new MailboxReceiveOperator(context, RelDistribution.Type.RANDOM_DISTRIBUTED, senderStageId);
+  }
+
+  public void shutdown() {
+    for (DispatchClient dispatchClient : _dispatchClientMap.values()) {
+      dispatchClient.getChannel().shutdown();
+    }
+    _dispatchClientMap.clear();
+  }
+
+  private DispatchClient getOrCreateDispatchClient(String host, int port) {
+    String key = String.format("%s_%d", host, port);
+    return _dispatchClientMap.computeIfAbsent(key, k -> new DispatchClient(host, port));
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryServerEnclosure.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryServerEnclosure.java
index 5185e3bfd12..4ff130954fb 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryServerEnclosure.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryServerEnclosure.java
@@ -20,8 +20,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeoutException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.helix.zookeeper.datamodel.ZNRecord;
@@ -30,8 +30,6 @@
 import org.apache.pinot.common.utils.SchemaUtils;
 import org.apache.pinot.core.data.manager.InstanceDataManager;
 import org.apache.pinot.query.runtime.QueryRunner;
-import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
-import org.apache.pinot.query.runtime.executor.RoundRobinScheduler;
 import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
 import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.query.testutils.MockInstanceDataManagerFactory;
@@ -61,17 +59,18 @@
  * multi-stage query communication.
  */
 public class QueryServerEnclosure {
-  private static final int DEFAULT_EXECUTOR_THREAD_NUM = 5;
   private static final String TABLE_CONFIGS_PREFIX = "/CONFIGS/TABLE/";
   private static final String SCHEMAS_PREFIX = "/SCHEMAS/";
 
-  private final OpChainSchedulerService _scheduler;
   private final int _queryRunnerPort;
   private final Map<String, Object> _runnerConfig = new HashMap<>();
   private final InstanceDataManager _instanceDataManager;
   private final HelixManager _helixManager;
 
-  private QueryRunner _queryRunner;
+  private final QueryRunner _queryRunner;
+  private final ExecutorService _executor = Executors.newCachedThreadPool(
+      new NamedThreadFactory("QueryServerTest_Server"));
+
 
   public QueryServerEnclosure(MockInstanceDataManagerFactory factory) {
     try {
@@ -83,10 +82,6 @@ public QueryServerEnclosure(MockInstanceDataManagerFactory factory) {
           String.format("Server_%s", QueryConfig.DEFAULT_QUERY_RUNNER_HOSTNAME));
       _runnerConfig.put(QueryConfig.KEY_OF_SCHEDULER_RELEASE_TIMEOUT_MS, 100);
       _queryRunner = new QueryRunner();
-      _scheduler = new OpChainSchedulerService(new RoundRobinScheduler(),
-          Executors.newFixedThreadPool(
-              DEFAULT_EXECUTOR_THREAD_NUM,
-              new NamedThreadFactory("test_query_server_enclosure_on_" + _queryRunnerPort + "_port")));
     } catch (Exception e) {
       throw new RuntimeException("Test Failed!", e);
     }
@@ -122,22 +117,25 @@ public int getPort() {
   public void start()
       throws Exception {
     PinotConfiguration configuration = new PinotConfiguration(_runnerConfig);
-    _queryRunner = new QueryRunner();
     _queryRunner.init(configuration, _instanceDataManager, _helixManager, mockServiceMetrics());
     _queryRunner.start();
-    _scheduler.startAsync().awaitRunning();
   }
 
   public void shutDown() {
     try {
       _queryRunner.shutDown();
-      _scheduler.stopAsync().awaitTerminated();
-    } catch (TimeoutException e) {
+    } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
 
   public void processQuery(DistributedStagePlan distributedStagePlan, Map<String, String> requestMetadataMap) {
-    _queryRunner.processQuery(distributedStagePlan, requestMetadataMap);
+    _executor.submit(() -> {
+      try {
+        _queryRunner.processQuery(distributedStagePlan, requestMetadataMap);
+      } catch (Exception e) {
+        throw new RuntimeException("Error executing query!", e);
+      }
+    });
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryTestSet.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryTestSet.java
index d32764c2ce7..9f59aa37d85 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryTestSet.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/QueryTestSet.java
@@ -25,7 +25,7 @@
  * all legacy test query sets.
  *
  * @deprecated do not add to this test set. this class will be broken down and clean up.
- * add your test to appropraite files in {@link org.apache.pinot.query.runtime.queries} instead.
+ * add your test to appropriate files in {@link org.apache.pinot.query.runtime.queries} instead.
  */
 public class QueryTestSet {
 
@@ -210,7 +210,8 @@ public Object[][] provideTestSql() {
 
         // Test optimized constant literal.
         new Object[]{"SELECT col1 FROM a WHERE col3 > 0 AND col3 < -5"},
-        new Object[]{"SELECT COALESCE(SUM(col3), 0) FROM a WHERE col1 = 'foo' AND col1 = 'bar'"},
+        // TODO: fix agg without group by return zero-row instead of default agg results
+        // new Object[]{"SELECT COALESCE(SUM(col3), 0) FROM a WHERE col1 = 'foo' AND col1 = 'bar'"},
         new Object[]{"SELECT SUM(CAST(col3 AS INTEGER)) FROM a HAVING MIN(col3) BETWEEN 1 AND 0"},
         new Object[]{"SELECT col1, COUNT(col3) FROM a GROUP BY col1 HAVING SUM(col3) > 40 AND SUM(col3) < 30"},
         new Object[]{"SELECT col1, COUNT(col3) FROM b GROUP BY col1 HAVING SUM(col3) >= 42.5"},
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/GrpcMailboxServiceTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/GrpcMailboxServiceTest.java
deleted file mode 100644
index 70b7763ca93..00000000000
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/GrpcMailboxServiceTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-import org.apache.pinot.common.datablock.DataBlock;
-import org.apache.pinot.common.datablock.MetadataBlock;
-import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.query.testutils.QueryTestUtils;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.util.TestUtils;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-public class GrpcMailboxServiceTest {
-
-  private static final DataSchema TEST_DATA_SCHEMA = new DataSchema(new String[]{"foo", "bar"},
-      new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING});
-
-  private final AtomicReference<Consumer<MailboxIdentifier>> _mail1GotData = new AtomicReference<>(ignored -> { });
-  private final AtomicReference<Consumer<MailboxIdentifier>> _mail2GotData = new AtomicReference<>(ignored -> { });
-
-  private GrpcMailboxService _mailboxService1;
-  private GrpcMailboxService _mailboxService2;
-
-  @BeforeClass
-  public void setUp()
-      throws Exception {
-    PinotConfiguration extraConfig = new PinotConfiguration(Collections.singletonMap(
-        QueryConfig.KEY_OF_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES, 4_000_000));
-
-    _mailboxService1 = new GrpcMailboxService(
-        "localhost", QueryTestUtils.getAvailablePort(), extraConfig, id -> _mail1GotData.get().accept(id));
-    _mailboxService1.start();
-
-    _mailboxService2 = new GrpcMailboxService(
-        "localhost", QueryTestUtils.getAvailablePort(), extraConfig, id -> _mail2GotData.get().accept(id));
-    _mailboxService2.start();
-  }
-
-  @AfterClass
-  public void tearDown() {
-    _mailboxService1.shutdown();
-    _mailboxService2.shutdown();
-  }
-
-  @Test(timeOut = 10_000L)
-  public void testHappyPath()
-      throws Exception {
-    // Given:
-    JsonMailboxIdentifier mailboxId = new JsonMailboxIdentifier(
-        "happypath",
-        new ServerAddress("localhost", _mailboxService1.getMailboxPort()),
-        new ServerAddress("localhost", _mailboxService2.getMailboxPort()));
-    SendingMailbox<TransferableBlock> sendingMailbox = _mailboxService1.getSendingMailbox(mailboxId);
-    ReceivingMailbox<TransferableBlock> receivingMailbox = _mailboxService2.getReceivingMailbox(mailboxId);
-    CountDownLatch gotData = new CountDownLatch(1);
-    _mail2GotData.set(ignored -> gotData.countDown());
-
-    // When:
-    TransferableBlock testBlock = getTestTransferableBlock();
-    sendingMailbox.send(testBlock);
-    gotData.await();
-    TransferableBlock receivedBlock = receivingMailbox.receive();
-
-    // Then:
-    Assert.assertEquals(receivedBlock.getDataBlock().toBytes(), testBlock.getDataBlock().toBytes());
-    sendingMailbox.complete();
-
-    TestUtils.waitForCondition(aVoid -> {
-      return receivingMailbox.isClosed();
-    }, 5000L, "Receiving mailbox is not closed properly!");
-  }
-
-  /**
-   * Simulates a case where the sender tries to send a very large message. The receiver should receive a
-   * MetadataBlock with an exception to indicate failure.
-   */
-  @Test(timeOut = 10_000L)
-  public void testGrpcException()
-      throws Exception {
-    // Given:
-    JsonMailboxIdentifier mailboxId = new JsonMailboxIdentifier(
-        "exception",
-        new ServerAddress("localhost", _mailboxService1.getMailboxPort()),
-        new ServerAddress("localhost", _mailboxService2.getMailboxPort()));
-    SendingMailbox<TransferableBlock> sendingMailbox = _mailboxService1.getSendingMailbox(mailboxId);
-    ReceivingMailbox<TransferableBlock> receivingMailbox = _mailboxService2.getReceivingMailbox(mailboxId);
-    CountDownLatch gotData = new CountDownLatch(1);
-    _mail2GotData.set(ignored -> gotData.countDown());
-    TransferableBlock testContent = getTooLargeTransferableBlock();
-
-    // When:
-    sendingMailbox.send(testContent);
-    gotData.await();
-    TransferableBlock receivedContent = receivingMailbox.receive();
-
-    // Then:
-    Assert.assertNotNull(receivedContent);
-    DataBlock receivedDataBlock = receivedContent.getDataBlock();
-    Assert.assertTrue(receivedDataBlock instanceof MetadataBlock);
-    Assert.assertFalse(receivedDataBlock.getExceptions().isEmpty());
-  }
-
-  private TransferableBlock getTestTransferableBlock() {
-    List<Object[]> rows = new ArrayList<>();
-    rows.add(createRow(0, "test_string"));
-    return new TransferableBlock(rows, TEST_DATA_SCHEMA, DataBlock.Type.ROW);
-  }
-
-  private TransferableBlock getTooLargeTransferableBlock() {
-    final int size = 1_000_000;
-    List<Object[]> rows = new ArrayList<>(size);
-    for (int i = 0; i < size; i++) {
-      rows.add(createRow(0, "test_string"));
-    }
-    return new TransferableBlock(rows, TEST_DATA_SCHEMA, DataBlock.Type.ROW);
-  }
-
-  private Object[] createRow(int intValue, String stringValue) {
-    Object[] row = new Object[2];
-    row[0] = intValue;
-    row[1] = stringValue;
-    return row;
-  }
-}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/InMemoryMailboxServiceTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/InMemoryMailboxServiceTest.java
deleted file mode 100644
index a1eae8e1ffd..00000000000
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/InMemoryMailboxServiceTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.pinot.common.datablock.DataBlock;
-import org.apache.pinot.common.datablock.DataBlockUtils;
-import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class InMemoryMailboxServiceTest {
-
-  private static final DataSchema TEST_DATA_SCHEMA = new DataSchema(new String[]{"foo", "bar"},
-      new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING});
-  private static final int NUM_ENTRIES = 5;
-
-  @Test
-  public void testHappyPath()
-      throws Exception {
-    InMemoryMailboxService mailboxService = new InMemoryMailboxService("localhost", 0, ignored -> { });
-    final JsonMailboxIdentifier mailboxId = new JsonMailboxIdentifier(
-        "happyPathJob", new ServerAddress("localhost", 0), new ServerAddress("localhost", 0));
-    InMemoryReceivingMailbox receivingMailbox = (InMemoryReceivingMailbox) mailboxService.getReceivingMailbox(
-        mailboxId);
-    InMemorySendingMailbox sendingMailbox = (InMemorySendingMailbox) mailboxService.getSendingMailbox(mailboxId);
-
-    // Sends are non-blocking as long as channel capacity is not breached
-    for (int i = 0; i < NUM_ENTRIES; i++) {
-      sendingMailbox.send(getTestTransferableBlock(i, i + 1 == NUM_ENTRIES));
-    }
-    sendingMailbox.complete();
-
-    // Iterate 1 less time than the loop above
-    for (int i = 0; i + 1 < NUM_ENTRIES; i++) {
-      TransferableBlock receivedBlock = receivingMailbox.receive();
-      List<Object[]> receivedContainer = receivedBlock.getContainer();
-      Assert.assertEquals(receivedContainer.size(), 1);
-      Object[] row = receivedContainer.get(0);
-      Assert.assertEquals(row.length, 2);
-      Assert.assertEquals((int) row[0], i);
-
-      // Receiving mailbox is considered closed if the underlying channel is closed AND the channel is empty, i.e.
-      // all the queued blocks are consumed.
-      Assert.assertFalse(receivingMailbox.isClosed());
-    }
-    // Receive the last block
-    Assert.assertTrue(receivingMailbox.receive().isEndOfStreamBlock());
-    Assert.assertTrue(receivingMailbox.isClosed());
-  }
-
-  /**
-   * Mailbox receiver/sender won't be created if the mailbox-id is not local.
-   */
-  @Test
-  public void testNonLocalMailboxId() {
-    InMemoryMailboxService mailboxService = new InMemoryMailboxService("localhost", 0, ignored -> { });
-    final JsonMailboxIdentifier mailboxId = new JsonMailboxIdentifier(
-        "happyPathJob", new ServerAddress("localhost", 0), new ServerAddress("localhost", 1));
-
-    // Test getReceivingMailbox
-    try {
-      mailboxService.getReceivingMailbox(mailboxId);
-      Assert.fail("Method call above should have failed");
-    } catch (IllegalStateException e) {
-      Assert.assertTrue(e.getMessage().contains("non-local transport"));
-    }
-
-    // Test getSendingMailbox
-    try {
-      mailboxService.getSendingMailbox(mailboxId);
-      Assert.fail("Method call above should have failed");
-    } catch (IllegalStateException e) {
-      Assert.assertTrue(e.getMessage().contains("non-local transport"));
-    }
-  }
-
-  private TransferableBlock getTestTransferableBlock(int index, boolean isEndOfStream) {
-    if (isEndOfStream) {
-      return new TransferableBlock(DataBlockUtils.getEndOfStreamDataBlock());
-    }
-    List<Object[]> rows = new ArrayList<>(index);
-    rows.add(new Object[]{index, "test_data"});
-    return new TransferableBlock(rows, TEST_DATA_SCHEMA, DataBlock.Type.ROW);
-  }
-}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/MailboxServiceTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/MailboxServiceTest.java
new file mode 100644
index 00000000000..0b77996c22d
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/MailboxServiceTest.java
@@ -0,0 +1,568 @@
+/**
+ * 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.pinot.query.mailbox;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.apache.pinot.query.runtime.operator.OperatorTestUtil;
+import org.apache.pinot.query.service.QueryConfig;
+import org.apache.pinot.query.testutils.QueryTestUtils;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class MailboxServiceTest {
+  private static final int SENDER_STAGE_ID = 1;
+  private static final int RECEIVER_STAGE_ID = 0;
+  private static final DataSchema DATA_SCHEMA =
+      new DataSchema(new String[]{"testColumn"}, new ColumnDataType[]{ColumnDataType.INT});
+
+  private final AtomicReference<Consumer<OpChainId>> _receiveMailCallback1 = new AtomicReference<>();
+
+  private MailboxService _mailboxService1;
+  private MailboxService _mailboxService2;
+
+  private long _requestId = 0;
+
+  @BeforeClass
+  public void setUp() {
+    PinotConfiguration config = new PinotConfiguration(
+        Collections.singletonMap(QueryConfig.KEY_OF_MAX_INBOUND_QUERY_DATA_BLOCK_SIZE_BYTES, 4_000_000));
+    _mailboxService1 = new MailboxService("localhost", QueryTestUtils.getAvailablePort(), config,
+        opChainId -> _receiveMailCallback1.get().accept(opChainId));
+    _mailboxService1.start();
+    _mailboxService2 = new MailboxService("localhost", QueryTestUtils.getAvailablePort(), config, mailboxId -> {
+    });
+    _mailboxService2.start();
+  }
+
+  @AfterClass
+  public void tearDown() {
+    _mailboxService1.shutdown();
+    _mailboxService2.shutdown();
+  }
+
+  @Test
+  public void testLocalHappyPathSendFirst()
+      throws IOException {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+
+    // Sends are non-blocking as long as channel capacity is not breached
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{i}));
+    }
+    sendingMailbox.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    sendingMailbox.complete();
+
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS);
+
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      assertEquals(receivingMailbox.getNumPendingBlocks(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - i);
+      TransferableBlock block = receivingMailbox.poll();
+      assertNotNull(block);
+      List<Object[]> rows = block.getContainer();
+      assertEquals(rows.size(), 1);
+      assertEquals(rows.get(0), new Object[]{i});
+    }
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 1);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isSuccessfulEndOfStreamBlock());
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    assertNull(receivingMailbox.poll());
+  }
+
+  @Test
+  public void testLocalHappyPathReceiveFirst()
+      throws IOException {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    assertNull(receivingMailbox.poll());
+
+    // Sends are non-blocking as long as channel capacity is not breached
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{i}));
+    }
+    sendingMailbox.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    sendingMailbox.complete();
+
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS);
+
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      assertEquals(receivingMailbox.getNumPendingBlocks(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - i);
+      TransferableBlock block = receivingMailbox.poll();
+      assertNotNull(block);
+      List<Object[]> rows = block.getContainer();
+      assertEquals(rows.size(), 1);
+      assertEquals(rows.get(0), new Object[]{i});
+    }
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 1);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isSuccessfulEndOfStreamBlock());
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    assertNull(receivingMailbox.poll());
+  }
+
+  @Test
+  public void testLocalCancelledBySender()
+      throws IOException {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+
+    // Send one data block and then cancel
+    sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{0}));
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    assertEquals(numCallbacks.get(), 2);
+
+    // Data blocks will be cleaned up
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 2);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testLocalCancelledBySenderBeforeSend() {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+
+    // Directly cancel
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    assertEquals(numCallbacks.get(), 1);
+
+    // Data blocks will be cleaned up
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 1);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testLocalCancelledByReceiver()
+      throws IOException {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+
+    // Send one data block and then cancel
+    sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{0}));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 1);
+
+    // Data blocks will be cleaned up
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 1);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testLocalTimeOut()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    long deadlineMs = System.currentTimeMillis() + 1000;
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, deadlineMs);
+
+    // Send one data block, sleep until timed out, then send one more block
+    sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{0}));
+    Thread.sleep(deadlineMs - System.currentTimeMillis() + 10);
+    try {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{1}));
+      fail("Expect exception when sending data after timing out");
+    } catch (Exception e) {
+      // Expected
+    }
+    assertEquals(numCallbacks.get(), 2);
+
+    // Data blocks will be cleaned up
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 2);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testLocalBufferFull()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    _receiveMailCallback1.set(mailboxId -> numCallbacks.getAndIncrement());
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService1.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId,
+            System.currentTimeMillis() + 1000);
+
+    // Sends are non-blocking as long as channel capacity is not breached
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS; i++) {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{i}));
+    }
+
+    // Next send will throw exception because buffer is full
+    try {
+      sendingMailbox.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+      fail("Except exception when sending data after buffer is full");
+    } catch (Exception e) {
+      // Expected
+    }
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS + 1);
+
+    // Data blocks will be cleaned up
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS + 1);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testRemoteHappyPathSendFirst()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    assertNull(receivingMailbox.poll());
+
+    // Sends are non-blocking as long as channel capacity is not breached
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{i}));
+    }
+    sendingMailbox.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    sendingMailbox.complete();
+
+    // Wait until all the mails are delivered
+    receiveMailLatch.await();
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS);
+
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      assertEquals(receivingMailbox.getNumPendingBlocks(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - i);
+      TransferableBlock block = receivingMailbox.poll();
+      assertNotNull(block);
+      List<Object[]> rows = block.getContainer();
+      assertEquals(rows.size(), 1);
+      assertEquals(rows.get(0), new Object[]{i});
+    }
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 1);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isSuccessfulEndOfStreamBlock());
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    assertNull(receivingMailbox.poll());
+  }
+
+  @Test
+  public void testRemoteHappyPathReceiveFirst()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+
+    // Sends are non-blocking as long as channel capacity is not breached
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{i}));
+    }
+    sendingMailbox.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    sendingMailbox.complete();
+
+    // Wait until all the mails are delivered
+    receiveMailLatch.await();
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS);
+
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - 1; i++) {
+      assertEquals(receivingMailbox.getNumPendingBlocks(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS - i);
+      TransferableBlock block = receivingMailbox.poll();
+      assertNotNull(block);
+      List<Object[]> rows = block.getContainer();
+      assertEquals(rows.size(), 1);
+      assertEquals(rows.get(0), new Object[]{i});
+    }
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 1);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isSuccessfulEndOfStreamBlock());
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    assertNull(receivingMailbox.poll());
+  }
+
+  @Test
+  public void testRemoteCancelledBySender()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(2);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+
+    // Send one data block and then cancel
+    sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{0}));
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+
+    // Wait until all the mails are delivered
+    receiveMailLatch.await();
+    assertEquals(numCallbacks.get(), 2);
+
+    // Data blocks will be cleaned up
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 2);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testRemoteCancelledBySenderBeforeSend()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(1);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+
+    // Directly cancel
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+
+    // Wait until cancellation is delivered
+    receiveMailLatch.await();
+    assertEquals(numCallbacks.get(), 1);
+
+    // Data blocks will be cleaned up
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 1);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testRemoteCancelledByReceiver()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(1);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, Long.MAX_VALUE);
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+
+    // Send one data block and then cancel
+    sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{0}));
+    receiveMailLatch.await();
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 1);
+
+    // Data blocks will be cleaned up
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 1);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testRemoteTimeOut()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(2);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    long deadlineMs = System.currentTimeMillis() + 1000;
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId, deadlineMs);
+
+    // Send one data block, RPC will timeout after deadline
+    sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{0}));
+    Thread.sleep(deadlineMs - System.currentTimeMillis() + 10);
+    receiveMailLatch.await();
+    assertEquals(numCallbacks.get(), 2);
+    try {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{1}));
+      fail("Expect exception when sending data after timing out");
+    } catch (Exception e) {
+      // Expected
+    }
+    assertEquals(numCallbacks.get(), 2);
+
+    // Data blocks will be cleaned up
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), 2);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+
+  @Test
+  public void testRemoteBufferFull()
+      throws Exception {
+    AtomicInteger numCallbacks = new AtomicInteger();
+    CountDownLatch receiveMailLatch = new CountDownLatch(ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS + 1);
+    _receiveMailCallback1.set(mailboxId -> {
+      numCallbacks.getAndIncrement();
+      receiveMailLatch.countDown();
+    });
+    String mailboxId = MailboxIdUtils.toMailboxId(_requestId++, SENDER_STAGE_ID, 0, RECEIVER_STAGE_ID, 0);
+    SendingMailbox sendingMailbox =
+        _mailboxService2.getSendingMailbox("localhost", _mailboxService1.getPort(), mailboxId,
+            System.currentTimeMillis() + 1000);
+
+    // Sends are non-blocking as long as channel capacity is not breached
+    for (int i = 0; i < ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS; i++) {
+      sendingMailbox.send(OperatorTestUtil.block(DATA_SCHEMA, new Object[]{i}));
+    }
+
+    // Next send will be blocked on the receiver side and cause exception after timeout
+    sendingMailbox.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    receiveMailLatch.await();
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS + 1);
+
+    // Data blocks will be cleaned up
+    ReceivingMailbox receivingMailbox = _mailboxService1.getReceivingMailbox(mailboxId);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+    TransferableBlock block = receivingMailbox.poll();
+    assertNotNull(block);
+    assertTrue(block.isErrorBlock());
+
+    // Cancel is idempotent for both sending and receiving mailbox, so safe to call multiple times
+    sendingMailbox.cancel(new Exception("TEST ERROR"));
+    receivingMailbox.cancel();
+    assertEquals(numCallbacks.get(), ReceivingMailbox.DEFAULT_MAX_PENDING_BLOCKS + 1);
+    assertEquals(receivingMailbox.getNumPendingBlocks(), 0);
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/MultiplexingMailboxServiceTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/MultiplexingMailboxServiceTest.java
deleted file mode 100644
index 110aeb9d740..00000000000
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/mailbox/MultiplexingMailboxServiceTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.mailbox;
-
-import org.mockito.Mockito;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class MultiplexingMailboxServiceTest {
-  private static final JsonMailboxIdentifier LOCAL_MAILBOX_ID = new JsonMailboxIdentifier(
-      "localJobId", new ServerAddress("localhost", 0), new ServerAddress("localhost", 0));
-  private static final JsonMailboxIdentifier NON_LOCAL_MAILBOX_ID = new JsonMailboxIdentifier(
-      "localJobId", new ServerAddress("localhost", 0), new ServerAddress("localhost", 1));
-
-  @Test
-  public void testHappyPath() {
-    // Setup mock Grpc and InMemory mailbox service
-    GrpcMailboxService grpcMailboxService = Mockito.mock(GrpcMailboxService.class);
-    InMemoryMailboxService inMemoryMailboxService = Mockito.mock(InMemoryMailboxService.class);
-    Mockito.doReturn("localhost").when(grpcMailboxService).getHostname();
-    Mockito.doReturn("localhost").when(inMemoryMailboxService).getHostname();
-    Mockito.doReturn(1000).when(grpcMailboxService).getMailboxPort();
-    Mockito.doReturn(1000).when(inMemoryMailboxService).getMailboxPort();
-    Mockito.doReturn(Mockito.mock(InMemorySendingMailbox.class)).when(inMemoryMailboxService).getSendingMailbox(
-        Mockito.any());
-    Mockito.doReturn(Mockito.mock(InMemoryReceivingMailbox.class)).when(inMemoryMailboxService).getReceivingMailbox(
-        Mockito.any());
-    Mockito.doReturn(Mockito.mock(GrpcSendingMailbox.class)).when(grpcMailboxService).getSendingMailbox(
-        Mockito.any());
-    Mockito.doReturn(Mockito.mock(GrpcReceivingMailbox.class)).when(grpcMailboxService).getReceivingMailbox(
-        Mockito.any());
-
-    // Create multiplex service with mocks
-    MultiplexingMailboxService multiplexService = new MultiplexingMailboxService(grpcMailboxService,
-        inMemoryMailboxService);
-
-    // Ensure both underlying services are started
-    multiplexService.start();
-    Mockito.verify(grpcMailboxService, Mockito.times(1)).start();
-    Mockito.verify(inMemoryMailboxService, Mockito.times(1)).start();
-
-    // Ensure hostname and ports are returned accurately
-    Assert.assertEquals("localhost", multiplexService.getHostname());
-    Assert.assertEquals(1000, multiplexService.getMailboxPort());
-
-    Assert.assertTrue(multiplexService.getSendingMailbox(LOCAL_MAILBOX_ID) instanceof InMemorySendingMailbox);
-    Assert.assertTrue(multiplexService.getSendingMailbox(NON_LOCAL_MAILBOX_ID) instanceof GrpcSendingMailbox);
-
-    Assert.assertTrue(multiplexService.getReceivingMailbox(LOCAL_MAILBOX_ID) instanceof InMemoryReceivingMailbox);
-    Assert.assertTrue(multiplexService.getReceivingMailbox(NON_LOCAL_MAILBOX_ID) instanceof GrpcReceivingMailbox);
-
-    multiplexService.shutdown();
-    Mockito.verify(grpcMailboxService, Mockito.times(1)).shutdown();
-    Mockito.verify(inMemoryMailboxService, Mockito.times(1)).shutdown();
-  }
-
-  @Test
-  public void testInConsistentHostPort() {
-    // Make the underlying services return different ports
-    GrpcMailboxService grpcMailboxService = Mockito.mock(GrpcMailboxService.class);
-    InMemoryMailboxService inMemoryMailboxService = Mockito.mock(InMemoryMailboxService.class);
-    Mockito.doReturn("localhost").when(grpcMailboxService).getHostname();
-    Mockito.doReturn("localhost").when(inMemoryMailboxService).getHostname();
-    Mockito.doReturn(1000).when(grpcMailboxService).getMailboxPort();
-    Mockito.doReturn(1001).when(inMemoryMailboxService).getMailboxPort();
-
-    try {
-      new MultiplexingMailboxService(grpcMailboxService, inMemoryMailboxService);
-      Assert.fail("Method call above should have failed");
-    } catch (IllegalStateException ignored) {
-    }
-  }
-}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTest.java
index abb7d65e4db..149fc395879 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTest.java
@@ -26,19 +26,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.apache.pinot.common.datatable.DataTableFactory;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
-import org.apache.pinot.core.transport.ServerInstance;
 import org.apache.pinot.query.QueryEnvironmentTestBase;
 import org.apache.pinot.query.QueryServerEnclosure;
-import org.apache.pinot.query.mailbox.GrpcMailboxService;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.routing.WorkerInstance;
-import org.apache.pinot.query.runtime.operator.MailboxReceiveOperator;
-import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
+import org.apache.pinot.query.runtime.executor.RoundRobinScheduler;
 import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.query.service.QueryDispatcher;
+import org.apache.pinot.query.service.dispatch.QueryDispatcher;
 import org.apache.pinot.query.testutils.MockInstanceDataManagerFactory;
 import org.apache.pinot.query.testutils.QueryTestUtils;
 import org.apache.pinot.spi.config.table.TableType;
@@ -56,10 +54,8 @@
 
 
 /**
- * all legacy tests.
- *
- * @deprecated do not add to this test set. this class will be broken down and clean up.
- * add your test to appropraite files in {@link org.apache.pinot.query.runtime.queries} instead.
+ * all special tests that doesn't fit into {@link org.apache.pinot.query.runtime.queries.ResourceBasedQueriesTest}
+ * pattern goes here.
  */
 public class QueryRunnerTest extends QueryRunnerTestBase {
   public static final Object[][] ROWS = new Object[][]{
@@ -70,6 +66,7 @@ public class QueryRunnerTest extends QueryRunnerTestBase {
       new Object[]{"charlie", "bar", 1},
   };
   public static final Schema.SchemaBuilder SCHEMA_BUILDER;
+
   static {
     SCHEMA_BUILDER = new Schema.SchemaBuilder()
         .addSingleValueDimension("col1", FieldSpec.DataType.STRING, "")
@@ -96,7 +93,6 @@ public static List<GenericRow> buildRows(String tableName) {
   @BeforeClass
   public void setUp()
       throws Exception {
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
     MockInstanceDataManagerFactory factory1 = new MockInstanceDataManagerFactory("server1")
         .registerTable(SCHEMA_BUILDER.setSchemaName("a").build(), "a_REALTIME")
         .registerTable(SCHEMA_BUILDER.setSchemaName("b").build(), "b_REALTIME")
@@ -133,8 +129,10 @@ public void setUp()
     Map<String, Object> reducerConfig = new HashMap<>();
     reducerConfig.put(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, _reducerGrpcPort);
     reducerConfig.put(QueryConfig.KEY_OF_QUERY_RUNNER_HOSTNAME, _reducerHostname);
-    _mailboxService = new GrpcMailboxService(_reducerHostname, _reducerGrpcPort, new PinotConfiguration(reducerConfig),
-        ignored -> { });
+    _reducerScheduler = new OpChainSchedulerService(new RoundRobinScheduler(10_000L), REDUCE_EXECUTOR);
+    _mailboxService = new MailboxService(QueryConfig.DEFAULT_QUERY_RUNNER_HOSTNAME, _reducerGrpcPort,
+        new PinotConfiguration(reducerConfig), _reducerScheduler::onDataAvailable);
+    _reducerScheduler.startAsync();
     _mailboxService.start();
 
     _queryEnvironment = QueryEnvironmentTestBase.getQueryEnvironment(_reducerGrpcPort, server1.getPort(),
@@ -146,8 +144,8 @@ public void setUp()
     // this is only use for test identifier purpose.
     int port1 = server1.getPort();
     int port2 = server2.getPort();
-    _servers.put(new WorkerInstance("localhost", port1, port1, port1, port1), server1);
-    _servers.put(new WorkerInstance("localhost", port2, port2, port2, port2), server2);
+    _servers.put(new QueryServerInstance("localhost", port1, port1), server1);
+    _servers.put(new QueryServerInstance("localhost", port2, port2), server2);
   }
 
   @AfterClass
@@ -157,52 +155,60 @@ public void tearDown() {
       server.shutDown();
     }
     _mailboxService.shutdown();
+    _reducerScheduler.stopAsync();
   }
 
+  /**
+   * Test compares with expected row count only.
+   */
   @Test(dataProvider = "testDataWithSqlToFinalRowCount")
   public void testSqlWithFinalRowCountChecker(String sql, int expectedRows)
       throws Exception {
-    List<Object[]> resultRows = queryRunner(sql);
+    List<Object[]> resultRows = queryRunner(sql, null);
     Assert.assertEquals(resultRows.size(), expectedRows);
   }
 
+  /**
+   * Test automatically compares against H2.
+   *
+   * @deprecated do not add to this test set. this class will be broken down and clean up.
+   *   add your test to the appropriate files in {@link org.apache.pinot.query.runtime.queries} instead.
+   */
   @Test(dataProvider = "testSql")
   public void testSqlWithH2Checker(String sql)
       throws Exception {
-    List<Object[]> resultRows = queryRunner(sql);
+    List<Object[]> resultRows = queryRunner(sql, null);
     // query H2 for data
     List<Object[]> expectedRows = queryH2(sql);
     compareRowEquals(resultRows, expectedRows);
   }
 
+  /**
+   * Test compares against its desired exceptions.
+   */
   @Test(dataProvider = "testDataWithSqlExecutionExceptions")
   public void testSqlWithExceptionMsgChecker(String sql, String exceptionMsg) {
-    QueryPlan queryPlan = _queryEnvironment.planQuery(sql);
+    long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
     Map<String, String> requestMetadataMap =
-        ImmutableMap.of(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(RANDOM_REQUEST_ID_GEN.nextLong()),
+        ImmutableMap.of(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(requestId),
             QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS,
             String.valueOf(CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS));
-    MailboxReceiveOperator mailboxReceiveOperator = null;
-    for (int stageId : queryPlan.getStageMetadataMap().keySet()) {
-      if (queryPlan.getQueryStageMap().get(stageId) instanceof MailboxReceiveNode) {
-        MailboxReceiveNode reduceNode = (MailboxReceiveNode) queryPlan.getQueryStageMap().get(stageId);
-        mailboxReceiveOperator = QueryDispatcher.createReduceStageOperator(_mailboxService,
-            queryPlan.getStageMetadataMap().get(reduceNode.getSenderStageId()).getServerInstances(),
-            Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID)),
-            reduceNode.getSenderStageId(), reduceNode.getDataSchema(), "localhost", _reducerGrpcPort,
-            Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS)));
+    int reducerStageId = -1;
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      if (dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment()
+          .getFragmentRoot() instanceof MailboxReceiveNode) {
+        reducerStageId = stageId;
       } else {
-        for (ServerInstance serverInstance : queryPlan.getStageMetadataMap().get(stageId).getServerInstances()) {
-          DistributedStagePlan distributedStagePlan =
-              QueryDispatcher.constructDistributedStagePlan(queryPlan, stageId, serverInstance);
-          _servers.get(serverInstance).processQuery(distributedStagePlan, requestMetadataMap);
-        }
+        processDistributedStagePlans(dispatchableSubPlan, stageId, requestMetadataMap);
       }
     }
-    Preconditions.checkNotNull(mailboxReceiveOperator);
+    Preconditions.checkState(reducerStageId != -1);
 
     try {
-      QueryDispatcher.reduceMailboxReceive(mailboxReceiveOperator, CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS);
+      QueryDispatcher.runReducer(requestId, dispatchableSubPlan, reducerStageId,
+          Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS)), _mailboxService,
+          _reducerScheduler, null, false);
     } catch (RuntimeException rte) {
       Assert.assertTrue(rte.getMessage().contains("Received error query execution result block"));
       Assert.assertTrue(rte.getMessage().contains(exceptionMsg), "Exception should contain: " + exceptionMsg
@@ -212,7 +218,16 @@ public void testSqlWithExceptionMsgChecker(String sql, String exceptionMsg) {
 
   @DataProvider(name = "testDataWithSqlToFinalRowCount")
   private Object[][] provideTestSqlAndRowCount() {
-    return new Object[][] {
+    return new Object[][]{
+        // special hint test, the table is not actually partitioned by col1, thus this hint gives wrong result. but
+        // b/c in order to test whether this hint produces the proper optimized plan, we are making this assumption
+        new Object[]{"SELECT /*+ aggOptions(is_partitioned_by_group_by_keys='true') */ col1, COUNT(*) FROM a "
+            + " GROUP BY 1 ORDER BY 2", 10},
+
+        // special hint test, we want to try if dynamic broadcast works for just any random table */
+        new Object[]{"SELECT /*+ joinOptions(join_strategy='dynamic_broadcast') */ col1 FROM a "
+            + " WHERE a.col1 IN (SELECT b.col2 FROM b WHERE b.col3 < 10) AND a.col3 > 0", 9},
+
         // using join clause
         new Object[]{"SELECT * FROM a JOIN b USING (col1)", 15},
 
@@ -224,8 +239,10 @@ private Object[][] provideTestSqlAndRowCount() {
         new Object[]{"SELECT dateTrunc('DAY', ts) FROM a LIMIT 10", 10},
         new Object[]{"SELECT dateTrunc('DAY', CAST(col3 AS BIGINT)) FROM a LIMIT 10", 10},
         //   - on intermediate stage
-        new Object[]{"SELECT dateTrunc('DAY', round(a.ts, b.ts)) FROM a JOIN b "
-            + "ON a.col1 = b.col1 AND a.col2 = b.col2", 15},
+        new Object[]{
+            "SELECT dateTrunc('DAY', round(a.ts, b.ts)) FROM a JOIN b "
+                + "ON a.col1 = b.col1 AND a.col2 = b.col2", 15
+        },
         new Object[]{"SELECT dateTrunc('DAY', CAST(MAX(a.col3) AS BIGINT)) FROM a", 1},
 
         // ScalarFunction
@@ -240,19 +257,33 @@ private Object[][] provideTestSqlAndRowCount() {
         new Object[]{"SELECT round_decimal(col3) FROM a", 15},
         new Object[]{"SELECT col1, roundDecimal(COUNT(*)) FROM a GROUP BY col1", 5},
         new Object[]{"SELECT col1, round_decimal(COUNT(*)) FROM a GROUP BY col1", 5},
+
+        // test queries with special query options attached
+        //   - when leaf limit is set, each server returns multiStageLeafLimit number of rows only.
+        new Object[]{"SET multiStageLeafLimit = 1; SELECT * FROM a", 2},
     };
   }
 
   @DataProvider(name = "testDataWithSqlExecutionExceptions")
   private Object[][] provideTestSqlWithExecutionException() {
-    return new Object[][] {
+    return new Object[][]{
+        // query hint with dynamic broadcast pipeline breaker should return error upstream
+        new Object[]{
+            "SELECT /*+ joinOptions(join_strategy='dynamic_broadcast') */ col1 FROM a "
+                + " WHERE a.col1 IN (SELECT b.col2 FROM b WHERE textMatch(col1, 'f')) AND a.col3 > 0",
+            "without text index"
+        },
         // Timeout exception should occur with this option:
-        new Object[]{"SET timeoutMs = 1; SELECT * FROM a JOIN b ON a.col1 = b.col1 JOIN c ON a.col1 = c.col1",
-            "timeout"},
+        new Object[]{
+            "SET timeoutMs = 1; SELECT * FROM a JOIN b ON a.col1 = b.col1 JOIN c ON a.col1 = c.col1",
+            "timeout"
+        },
 
         // Function with incorrect argument signature should throw runtime exception when casting string to numeric
-        new Object[]{"SELECT least(a.col2, b.col3) FROM a JOIN b ON a.col1 = b.col1",
-            "For input string:"},
+        new Object[]{
+            "SELECT least(a.col2, b.col3) FROM a JOIN b ON a.col1 = b.col1",
+            "For input string:"
+        },
 
         // Scalar function that doesn't have a valid use should throw an exception on the leaf stage
         //   - predicate only functions:
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTestBase.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTestBase.java
index 090f4ded6ff..c23e8f29fc4 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTestBase.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/QueryRunnerTestBase.java
@@ -21,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.math.DoubleMath;
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -39,28 +38,43 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
-import org.apache.pinot.core.transport.ServerInstance;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.pinot.common.response.broker.ResultTable;
+import org.apache.pinot.common.utils.NamedThreadFactory;
+import org.apache.pinot.core.query.reduce.ExecutionStatsAggregator;
 import org.apache.pinot.query.QueryEnvironment;
 import org.apache.pinot.query.QueryServerEnclosure;
 import org.apache.pinot.query.QueryTestSet;
-import org.apache.pinot.query.mailbox.GrpcMailboxService;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.stage.MailboxReceiveNode;
-import org.apache.pinot.query.runtime.operator.MailboxReceiveOperator;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
 import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
 import org.apache.pinot.query.service.QueryConfig;
-import org.apache.pinot.query.service.QueryDispatcher;
+import org.apache.pinot.query.service.dispatch.QueryDispatcher;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.utils.ByteArray;
+import org.apache.pinot.spi.utils.BytesUtils;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.StringUtil;
+import org.apache.pinot.sql.parsers.CalciteSqlParser;
+import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
+import org.h2.jdbc.JdbcArray;
 import org.testng.Assert;
 
 
 public abstract class QueryRunnerTestBase extends QueryTestSet {
+  protected static final ExecutorService REDUCE_EXECUTOR = Executors.newCachedThreadPool(
+      new NamedThreadFactory("TEST_REDUCER_SCHEDULER_EXECUTOR"));
   protected static final double DOUBLE_CMP_EPSILON = 0.0001d;
   protected static final String SEGMENT_BREAKER_KEY = "__SEGMENT_BREAKER_KEY__";
   protected static final String SEGMENT_BREAKER_STR = "------";
@@ -69,8 +83,9 @@ public abstract class QueryRunnerTestBase extends QueryTestSet {
   protected QueryEnvironment _queryEnvironment;
   protected String _reducerHostname;
   protected int _reducerGrpcPort;
-  protected Map<ServerInstance, QueryServerEnclosure> _servers = new HashMap<>();
-  protected GrpcMailboxService _mailboxService;
+  protected Map<QueryServerInstance, QueryServerEnclosure> _servers = new HashMap<>();
+  protected MailboxService _mailboxService;
+  protected OpChainSchedulerService _reducerScheduler;
 
   static {
     SEGMENT_BREAKER_ROW.putValue(SEGMENT_BREAKER_KEY, SEGMENT_BREAKER_STR);
@@ -79,37 +94,77 @@ public abstract class QueryRunnerTestBase extends QueryTestSet {
   // --------------------------------------------------------------------------
   // QUERY UTILS
   // --------------------------------------------------------------------------
-  protected List<Object[]> queryRunner(String sql) {
-    QueryPlan queryPlan = _queryEnvironment.planQuery(sql);
-    Map<String, String> requestMetadataMap =
-        ImmutableMap.of(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(RANDOM_REQUEST_ID_GEN.nextLong()),
-            QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS,
-            String.valueOf(CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS));
-    MailboxReceiveOperator mailboxReceiveOperator = null;
-    for (int stageId : queryPlan.getStageMetadataMap().keySet()) {
-      if (queryPlan.getQueryStageMap().get(stageId) instanceof MailboxReceiveNode) {
-        MailboxReceiveNode reduceNode = (MailboxReceiveNode) queryPlan.getQueryStageMap().get(stageId);
-        mailboxReceiveOperator = QueryDispatcher.createReduceStageOperator(_mailboxService,
-            queryPlan.getStageMetadataMap().get(reduceNode.getSenderStageId()).getServerInstances(),
-            Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID)), reduceNode.getSenderStageId(),
-            reduceNode.getDataSchema(), "localhost", _reducerGrpcPort,
-            Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS)));
+
+  /**
+   * Dispatch query to each pinot-server. The logic should mimic QueryDispatcher.submit() but does not actually make
+   * ser/de dispatches.
+   */
+  protected List<Object[]> queryRunner(String sql, Map<Integer, ExecutionStatsAggregator> executionStatsAggregatorMap) {
+    long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+    SqlNodeAndOptions sqlNodeAndOptions = CalciteSqlParser.compileToSqlNodeAndOptions(sql);
+    QueryEnvironment.QueryPlannerResult queryPlannerResult =
+        _queryEnvironment.planQuery(sql, sqlNodeAndOptions, requestId);
+    DispatchableSubPlan dispatchableSubPlan = queryPlannerResult.getQueryPlan();
+    Map<String, String> requestMetadataMap = new HashMap<>();
+    requestMetadataMap.put(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(requestId));
+    requestMetadataMap.put(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS,
+        String.valueOf(CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS));
+    requestMetadataMap.putAll(sqlNodeAndOptions.getOptions());
+
+    // Putting trace testing here as extra options as it doesn't go along with the rest of the items.
+    if (executionStatsAggregatorMap != null) {
+      requestMetadataMap.put(CommonConstants.Broker.Request.TRACE, "true");
+    }
+
+    int reducerStageId = -1;
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
+      if (dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment()
+          .getFragmentRoot() instanceof MailboxReceiveNode) {
+        reducerStageId = stageId;
       } else {
-        for (ServerInstance serverInstance : queryPlan.getStageMetadataMap().get(stageId).getServerInstances()) {
-          DistributedStagePlan distributedStagePlan =
-              QueryDispatcher.constructDistributedStagePlan(queryPlan, stageId, serverInstance);
-          _servers.get(serverInstance).processQuery(distributedStagePlan, requestMetadataMap);
-        }
+        processDistributedStagePlans(dispatchableSubPlan, stageId, requestMetadataMap);
+      }
+      if (executionStatsAggregatorMap != null) {
+        executionStatsAggregatorMap.put(stageId, new ExecutionStatsAggregator(true));
+      }
+    }
+    Preconditions.checkState(reducerStageId != -1);
+    ResultTable resultTable = QueryDispatcher.runReducer(requestId, dispatchableSubPlan, reducerStageId,
+        Long.parseLong(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS)), _mailboxService,
+        _reducerScheduler, executionStatsAggregatorMap, true);
+    return resultTable.getRows();
+  }
+
+  protected void processDistributedStagePlans(DispatchableSubPlan dispatchableSubPlan, int stageId,
+      Map<String, String> requestMetadataMap) {
+    Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap =
+        dispatchableSubPlan.getQueryStageList().get(stageId).getServerInstanceToWorkerIdMap();
+    for (Map.Entry<QueryServerInstance, List<Integer>> entry : serverInstanceToWorkerIdMap.entrySet()) {
+      QueryServerInstance server = entry.getKey();
+      for (int workerId : entry.getValue()) {
+        DistributedStagePlan distributedStagePlan = constructDistributedStagePlan(
+            dispatchableSubPlan, stageId, new VirtualServerAddress(server, workerId));
+        _servers.get(server).processQuery(distributedStagePlan, requestMetadataMap);
       }
     }
-    Preconditions.checkNotNull(mailboxReceiveOperator);
-    return QueryDispatcher.toResultTable(
-        QueryDispatcher.reduceMailboxReceive(mailboxReceiveOperator, CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS),
-        queryPlan.getQueryResultFields(), queryPlan.getQueryStageMap().get(0).getDataSchema()).getRows();
+  }
+
+  protected static DistributedStagePlan constructDistributedStagePlan(DispatchableSubPlan dispatchableSubPlan,
+      int stageId, VirtualServerAddress serverAddress) {
+    return new DistributedStagePlan(stageId, serverAddress,
+        dispatchableSubPlan.getQueryStageList().get(stageId).getPlanFragment().getFragmentRoot(),
+        new StageMetadata.Builder().setWorkerMetadataList(
+                dispatchableSubPlan.getQueryStageList().get(stageId).getWorkerMetadataList())
+            .addCustomProperties(dispatchableSubPlan.getQueryStageList().get(stageId).getCustomProperties()).build());
   }
 
   protected List<Object[]> queryH2(String sql)
       throws Exception {
+    int firstSemi = sql.indexOf(';');
+    if (firstSemi > 0 && firstSemi != sql.length() - 1) {
+      // trim off any SET statements for H2
+      sql = sql.substring(firstSemi + 1);
+    }
     Statement h2statement = _h2Connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
     h2statement.execute(sql);
     ResultSet h2ResultSet = h2statement.getResultSet();
@@ -126,6 +181,11 @@ protected List<Object[]> queryH2(String sql)
   }
 
   protected void compareRowEquals(List<Object[]> resultRows, List<Object[]> expectedRows) {
+    compareRowEquals(resultRows, expectedRows, false);
+  }
+
+  protected void compareRowEquals(List<Object[]> resultRows, List<Object[]> expectedRows,
+      boolean keepOutputRowsInOrder) {
     Assert.assertEquals(resultRows.size(), expectedRows.size(),
         String.format("Mismatched number of results. expected: %s, actual: %s",
             expectedRows.stream().map(Arrays::toString).collect(Collectors.joining(",\n")),
@@ -144,16 +204,31 @@ protected void compareRowEquals(List<Object[]> resultRows, List<Object[]> expect
       } else if (l instanceof Long) {
         return Long.compare((Long) l, ((Number) r).longValue());
       } else if (l instanceof Float) {
-        if (DoubleMath.fuzzyEquals((Float) l, ((Number) r).floatValue(), DOUBLE_CMP_EPSILON)) {
+        float lf = (Float) l;
+        float rf = ((Number) r).floatValue();
+        if (DoubleMath.fuzzyEquals(lf, rf, DOUBLE_CMP_EPSILON)) {
           return 0;
         }
-        return Float.compare((Float) l, ((Number) r).floatValue());
+        float maxf = Math.max(Math.abs(lf), Math.abs(rf));
+        if (DoubleMath.fuzzyEquals(lf / maxf, rf / maxf, DOUBLE_CMP_EPSILON)) {
+          return 0;
+        }
+        return Float.compare(lf, rf);
       } else if (l instanceof Double) {
-        if (DoubleMath.fuzzyEquals((Double) l, ((Number) r).doubleValue(), DOUBLE_CMP_EPSILON)) {
+        double ld = (Double) l;
+        double rd = ((Number) r).doubleValue();
+        if (DoubleMath.fuzzyEquals(ld, rd, DOUBLE_CMP_EPSILON)) {
+          return 0;
+        }
+        double maxd = Math.max(Math.abs(ld), Math.abs(rd));
+        if (DoubleMath.fuzzyEquals(ld / maxd, rd / maxd, DOUBLE_CMP_EPSILON)) {
           return 0;
         }
-        return Double.compare((Double) l, ((Number) r).doubleValue());
+        return Double.compare(ld, rd);
       } else if (l instanceof String) {
+        if (r instanceof byte[]) {
+          return ((String) l).compareTo(BytesUtils.toHexString((byte[]) r));
+        }
         return ((String) l).compareTo((String) r);
       } else if (l instanceof Boolean) {
         return ((Boolean) l).compareTo((Boolean) r);
@@ -163,10 +238,78 @@ protected void compareRowEquals(List<Object[]> resultRows, List<Object[]> expect
         } else {
           return ((BigDecimal) l).compareTo(new BigDecimal((String) r));
         }
+      } else if (l instanceof byte[]) {
+        if (r instanceof byte[]) {
+          return ByteArray.compare((byte[]) l, (byte[]) r);
+        } else {
+          return ByteArray.compare((byte[]) l, ((ByteArray) r).getBytes());
+        }
       } else if (l instanceof ByteArray) {
-        return ((ByteArray) l).compareTo(new ByteArray((byte[]) r));
+        if (r instanceof ByteArray) {
+          return ((ByteArray) l).compareTo((ByteArray) r);
+        } else {
+          return ByteArray.compare(((ByteArray) l).getBytes(), (byte[]) r);
+        }
       } else if (l instanceof Timestamp) {
         return ((Timestamp) l).compareTo((Timestamp) r);
+      } else if (l instanceof int[]) {
+        int[] larray = (int[]) l;
+        try {
+          if (r instanceof JdbcArray) {
+            Object[] rarray = (Object[]) ((JdbcArray) r).getArray();
+            for (int idx = 0; idx < larray.length; idx++) {
+              Number relement = (Number) rarray[idx];
+              if (larray[idx] != relement.intValue()) {
+                return -1;
+              }
+            }
+          } else {
+            int[] rarray = (int[]) r;
+            for (int idx = 0; idx < larray.length; idx++) {
+              if (larray[idx] != rarray[idx]) {
+                return -1;
+              }
+            }
+          }
+        } catch (SQLException e) {
+          throw new RuntimeException(e);
+        }
+        return 0;
+      } else if (l instanceof String[]) {
+        String[] larray = (String[]) l;
+        try {
+          if (r instanceof JdbcArray) {
+            Object[] rarray = (Object[]) ((JdbcArray) r).getArray();
+            for (int idx = 0; idx < larray.length; idx++) {
+              if (!larray[idx].equals(rarray[idx])) {
+                return -1;
+              }
+            }
+          } else {
+            String[] rarray = (r instanceof List) ? ((List<String>) r).toArray(new String[0]) : (String[]) r;
+            for (int idx = 0; idx < larray.length; idx++) {
+              if (!larray[idx].equals(rarray[idx])) {
+                return -1;
+              }
+            }
+          }
+        } catch (SQLException e) {
+          throw new RuntimeException(e);
+        }
+        return 0;
+      } else if (l instanceof JdbcArray) {
+        try {
+          Object[] larray = (Object[]) ((JdbcArray) l).getArray();
+          Object[] rarray = (Object[]) ((JdbcArray) r).getArray();
+          for (int idx = 0; idx < larray.length; idx++) {
+            if (!larray[idx].equals(rarray[idx])) {
+              return -1;
+            }
+          }
+        } catch (SQLException e) {
+          throw new RuntimeException(e);
+        }
+        return 0;
       } else {
         throw new RuntimeException("non supported type " + l.getClass());
       }
@@ -181,8 +324,10 @@ protected void compareRowEquals(List<Object[]> resultRows, List<Object[]> expect
       }
       return 0;
     };
-    resultRows.sort(rowComp);
-    expectedRows.sort(rowComp);
+    if (!keepOutputRowsInOrder) {
+      resultRows.sort(rowComp);
+      expectedRows.sort(rowComp);
+    }
     for (int i = 0; i < resultRows.size(); i++) {
       Object[] resultRow = resultRows.get(i);
       Object[] expectedRow = expectedRows.get(i);
@@ -203,7 +348,11 @@ protected void compareRowEquals(List<Object[]> resultRows, List<Object[]> expect
   protected Schema constructSchema(String schemaName, List<QueryTestCase.ColumnAndType> columnAndTypes) {
     Schema.SchemaBuilder builder = new Schema.SchemaBuilder();
     for (QueryTestCase.ColumnAndType columnAndType : columnAndTypes) {
-      builder.addSingleValueDimension(columnAndType._name, FieldSpec.DataType.valueOf(columnAndType._type));
+      if (columnAndType._isSingleValue) {
+        builder.addSingleValueDimension(columnAndType._name, FieldSpec.DataType.valueOf(columnAndType._type));
+      } else {
+        builder.addMultiValueDimension(columnAndType._name, FieldSpec.DataType.valueOf(columnAndType._type));
+      }
     }
     // TODO: ts is built-in, but we should allow user overwrite
     builder.addDateTime("ts", FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:SECONDS");
@@ -255,7 +404,7 @@ protected void addTableToH2(String tableName, Schema schema)
   }
 
   protected void addDataToH2(String tableName, Schema schema, List<GenericRow> rows)
-      throws SQLException {
+      throws SQLException, DecoderException {
     if (rows != null && rows.size() > 0) {
       // prepare the statement for ingestion
       List<String> h2FieldNamesAndTypes = toH2FieldNamesAndTypes(schema);
@@ -264,14 +413,27 @@ protected void addDataToH2(String tableName, Schema schema, List<GenericRow> row
         params.append(",?");
       }
       PreparedStatement h2Statement =
-          _h2Connection.prepareStatement("INSERT INTO " + tableName + " VALUES (" + params.toString() + ")");
+          _h2Connection.prepareStatement("INSERT INTO " + tableName + " VALUES (" + params + ")");
 
       // insert data into table
       for (GenericRow row : rows) {
         int h2Index = 1;
         for (String fieldName : schema.getColumnNames()) {
           Object value = row.getValue(fieldName);
-          h2Statement.setObject(h2Index++, value);
+          if (value instanceof List) {
+            h2Statement.setArray(h2Index++,
+                _h2Connection.createArrayOf(getH2FieldType(schema.getFieldSpecFor(fieldName).getDataType()),
+                    ((List) value).toArray()));
+          } else {
+            switch (schema.getFieldSpecFor(fieldName).getDataType()) {
+              case BYTES:
+                h2Statement.setBytes(h2Index++, Hex.decodeHex((String) value));
+                break;
+              default:
+                h2Statement.setObject(h2Index++, value);
+                break;
+            }
+          }
         }
         h2Statement.execute();
       }
@@ -282,41 +444,39 @@ private static List<String> toH2FieldNamesAndTypes(org.apache.pinot.spi.data.Sch
     List<String> fieldNamesAndTypes = new ArrayList<>(pinotSchema.size());
     for (String fieldName : pinotSchema.getColumnNames()) {
       FieldSpec.DataType dataType = pinotSchema.getFieldSpecFor(fieldName).getDataType();
-      String fieldType;
-      switch (dataType) {
-        case INT:
-        case LONG:
-          fieldType = "bigint";
-          break;
-        case STRING:
-          fieldType = "varchar(128)";
-          break;
-        case FLOAT:
-          fieldType = "real";
-          break;
-        case DOUBLE:
-          fieldType = "double";
-          break;
-        case BOOLEAN:
-          fieldType = "BOOLEAN";
-          break;
-        case BIG_DECIMAL:
-          fieldType = "NUMERIC";
-          break;
-        case BYTES:
-          fieldType = "BYTEA";
-          break;
-        case TIMESTAMP:
-          fieldType = "TIMESTAMP";
-          break;
-        default:
-          throw new UnsupportedOperationException("Unsupported type conversion to h2 type: " + dataType);
+      String fieldType = getH2FieldType(dataType);
+      if (!pinotSchema.getFieldSpecFor(fieldName).isSingleValueField()) {
+        fieldType += " ARRAY";
       }
       fieldNamesAndTypes.add(fieldName + " " + fieldType);
     }
     return fieldNamesAndTypes;
   }
 
+  private static String getH2FieldType(FieldSpec.DataType dataType) {
+    switch (dataType) {
+      case INT:
+      case LONG:
+        return "bigint";
+      case STRING:
+        return "varchar(128)";
+      case FLOAT:
+        return "real";
+      case DOUBLE:
+        return "double";
+      case BOOLEAN:
+        return "BOOLEAN";
+      case BIG_DECIMAL:
+        return "NUMERIC(1200, 600)";
+      case BYTES:
+        return "BYTEA";
+      case TIMESTAMP:
+        return "TIMESTAMP";
+      default:
+        throw new UnsupportedOperationException("Unsupported type conversion to h2 type: " + dataType);
+    }
+  }
+
   @JsonIgnoreProperties(ignoreUnknown = true)
   public static class QueryTestCase {
     public static final String BLOCK_SIZE_KEY = "blockSize";
@@ -348,12 +508,18 @@ public static class Query {
       public boolean _ignored;
       @JsonProperty("sql")
       public String _sql;
+      @JsonProperty("h2Sql")
+      public String _h2Sql;
       @JsonProperty("description")
       public String _description;
       @JsonProperty("outputs")
       public List<List<Object>> _outputs = null;
       @JsonProperty("expectedException")
       public String _expectedException;
+      @JsonProperty("keepOutputRowOrder")
+      public boolean _keepOutputRowOrder;
+      @JsonProperty("expectedNumSegments")
+      public Integer _expectedNumSegments;
     }
 
     public static class ColumnAndType {
@@ -361,6 +527,8 @@ public static class ColumnAndType {
       String _name;
       @JsonProperty("type")
       String _type;
+      @JsonProperty("isSingleValue")
+      boolean _isSingleValue = true;
     }
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerServiceTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerServiceTest.java
index c38a210e95e..5088decbbe9 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerServiceTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/OpChainSchedulerServiceTest.java
@@ -24,12 +24,14 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.query.runtime.operator.MultiStageOperator;
 import org.apache.pinot.query.runtime.operator.OpChain;
-import org.mockito.Mock;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -44,11 +46,7 @@ public class OpChainSchedulerServiceTest {
   private ExecutorService _executor;
   private AutoCloseable _mocks;
 
-  @Mock
   private MultiStageOperator _operatorA;
-  @Mock
-  private MultiStageOperator _operatorB;
-  @Mock
   private OpChainScheduler _scheduler;
 
   @BeforeClass
@@ -64,9 +62,10 @@ public void afterClass()
 
   @BeforeMethod
   public void beforeMethod() {
+    _operatorA = Mockito.mock(MultiStageOperator.class);
+    _scheduler = Mockito.mock(OpChainScheduler.class);
     clearInvocations(_scheduler);
     clearInvocations(_operatorA);
-    clearInvocations(_operatorB);
   }
 
   private void initExecutor(int numThreads) {
@@ -74,17 +73,18 @@ private void initExecutor(int numThreads) {
   }
 
   private OpChain getChain(MultiStageOperator operator) {
-    return new OpChain(operator, ImmutableList.of(), 123, 1);
+    VirtualServerAddress address = new VirtualServerAddress("localhost", 1234, 1);
+    OpChainExecutionContext context = new OpChainExecutionContext(null, 123L, 1, address, 0, null, null, true);
+    return new OpChain(context, operator, ImmutableList.of());
   }
 
   @Test
   public void shouldScheduleSingleOpChainRegisteredAfterStart()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
-    Mockito.when(_scheduler.hasNext()).thenReturn(true);
-    Mockito.when(_scheduler.next()).thenReturn(getChain(_operatorA));
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenReturn(opChain).thenReturn(null);
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
 
     CountDownLatch latch = new CountDownLatch(1);
     Mockito.when(_operatorA.nextBlock()).thenAnswer(inv -> {
@@ -92,23 +92,20 @@ public void shouldScheduleSingleOpChainRegisteredAfterStart()
       return TransferableBlockUtils.getEndOfStreamTransferableBlock();
     });
 
-    // When:
-    scheduler.startAsync().awaitRunning();
-    scheduler.register(new OpChain(_operatorA, ImmutableList.of(), 123, 1));
+    schedulerService.startAsync().awaitRunning();
+    schedulerService.register(opChain);
 
-    // Then:
     Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
-    scheduler.stopAsync().awaitTerminated();
+    schedulerService.stopAsync().awaitTerminated();
   }
 
   @Test
   public void shouldScheduleSingleOpChainRegisteredBeforeStart()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
-    Mockito.when(_scheduler.hasNext()).thenReturn(true);
-    Mockito.when(_scheduler.next()).thenReturn(getChain(_operatorA));
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenReturn(opChain).thenReturn(null);
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
 
     CountDownLatch latch = new CountDownLatch(1);
     Mockito.when(_operatorA.nextBlock()).thenAnswer(inv -> {
@@ -116,152 +113,174 @@ public void shouldScheduleSingleOpChainRegisteredBeforeStart()
       return TransferableBlockUtils.getEndOfStreamTransferableBlock();
     });
 
-    // When:
-    scheduler.register(new OpChain(_operatorA, ImmutableList.of(), 123, 1));
-    scheduler.startAsync().awaitRunning();
+    schedulerService.register(opChain);
+    schedulerService.startAsync().awaitRunning();
 
-    // Then:
     Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
-    scheduler.stopAsync().awaitTerminated();
+    schedulerService.stopAsync().awaitTerminated();
   }
 
   @Test
-  public void shouldReRegisterOpChainOnNoOpBlock()
+  public void shouldYieldOpChainOnNoOpBlock()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
-    Mockito.when(_scheduler.hasNext()).thenReturn(true);
-    Mockito.when(_scheduler.next()).thenReturn(getChain(_operatorA));
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenReturn(opChain).thenReturn(null);
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
 
     CountDownLatch latch = new CountDownLatch(1);
-    Mockito.when(_operatorA.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock())
-        .thenAnswer(inv -> {
-          latch.countDown();
-          return TransferableBlockUtils.getEndOfStreamTransferableBlock();
-        });
+    Mockito.when(_operatorA.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
+    Mockito.doAnswer(inv -> {
+      latch.countDown();
+      return null;
+    }).when(_scheduler).yield(Mockito.any());
 
-    // When:
-    scheduler.startAsync().awaitRunning();
-    scheduler.register(new OpChain(_operatorA, ImmutableList.of(), 123, 1));
+    schedulerService.startAsync().awaitRunning();
+    schedulerService.register(opChain);
 
-    // Then:
     Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
-    Mockito.verify(_scheduler, Mockito.times(2)).register(Mockito.any(OpChain.class), Mockito.any(boolean.class));
-    scheduler.stopAsync().awaitTerminated();
+    schedulerService.stopAsync().awaitTerminated();
   }
 
   @Test
-  public void shouldYieldOpChainsWhenNoWorkCanBeDone()
+  public void shouldScheduleOpChainEvenIfNoOpChainsInAWhile()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
-    Mockito.when(_scheduler.hasNext()).thenReturn(true);
-    Mockito.when(_scheduler.next()).thenReturn(getChain(_operatorA)).thenReturn(getChain(_operatorB))
-        .thenReturn(getChain(_operatorA));
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
-
-    AtomicBoolean opAReturnedNoOp = new AtomicBoolean(false);
-    AtomicBoolean hasOpBRan = new AtomicBoolean(false);
-
-    CountDownLatch latch = new CountDownLatch(1);
-    Mockito.when(_operatorA.nextBlock()).thenAnswer(inv -> {
-      if (hasOpBRan.get()) {
-        latch.countDown();
-        return TransferableBlockUtils.getEndOfStreamTransferableBlock();
-      } else {
-        opAReturnedNoOp.set(true);
-        return TransferableBlockUtils.getNoOpTransferableBlock();
+    OpChain opChain = getChain(_operatorA);
+    CountDownLatch latch = new CountDownLatch(3);
+    AtomicBoolean returnedOpChain = new AtomicBoolean(false);
+    Mockito.when(_operatorA.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenAnswer(inv -> {
+      latch.countDown();
+      if (latch.getCount() == 0 && returnedOpChain.compareAndSet(false, true)) {
+        return opChain;
       }
+      return null;
     });
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
 
-    Mockito.when(_operatorB.nextBlock()).thenAnswer(inv -> {
-      hasOpBRan.set(true);
-      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
-    });
+    schedulerService.startAsync().awaitRunning();
 
-    // When:
-    scheduler.startAsync().awaitRunning();
-    scheduler.register(new OpChain(_operatorA, ImmutableList.of(), 123, 1));
-    scheduler.register(new OpChain(_operatorB, ImmutableList.of(), 123, 1));
-
-    // Then:
-    Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
-    Assert.assertTrue(opAReturnedNoOp.get(), "expected opA to be scheduled first");
-    scheduler.stopAsync().awaitTerminated();
+    Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected opChain to be scheduled");
+    schedulerService.stopAsync().awaitTerminated();
   }
 
   @Test
-  public void shouldNotCallSchedulerNextWhenHasNextReturnsFalse()
+  public void shouldCallCloseOnOperatorsThatFinishSuccessfully()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenReturn(opChain).thenReturn(null);
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
+
     CountDownLatch latch = new CountDownLatch(1);
-    Mockito.when(_scheduler.hasNext()).thenAnswer(inv -> {
+    Mockito.when(_operatorA.nextBlock()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    Mockito.doAnswer(inv -> {
       latch.countDown();
-      return false;
-    });
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
+      return null;
+    }).when(_operatorA).close();
 
-    // When:
-    scheduler.startAsync().awaitRunning();
+    schedulerService.startAsync().awaitRunning();
+    schedulerService.register(opChain);
 
-    // Then:
-    Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected hasNext to be called");
-    scheduler.stopAsync().awaitTerminated();
-
-    Mockito.verify(_scheduler, Mockito.never()).next();
+    Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
+    schedulerService.stopAsync().awaitTerminated();
   }
 
   @Test
-  public void shouldReevaluateHasNextWhenOnDataAvailableIsCalled()
+  public void shouldCallCancelOnOperatorsThatReturnErrorBlock()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
-    CountDownLatch firstHasNext = new CountDownLatch(1);
-    CountDownLatch secondHasNext = new CountDownLatch(1);
-    Mockito.when(_scheduler.hasNext()).thenAnswer(inv -> {
-      firstHasNext.countDown();
-      return false;
-    }).then(inv -> {
-      secondHasNext.countDown();
-      return false;
-    });
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenReturn(opChain).thenReturn(null);
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
 
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
+    CountDownLatch latch = new CountDownLatch(1);
+    Mockito.when(_operatorA.nextBlock()).thenReturn(
+        TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException("foo")));
+    Mockito.doAnswer(inv -> {
+      latch.countDown();
+      return null;
+    }).when(_operatorA).cancel(Mockito.any());
 
-    // When:
-    scheduler.startAsync().awaitRunning();
-    Assert.assertTrue(firstHasNext.await(10, TimeUnit.SECONDS), "expected hasNext to be called");
-    scheduler.onDataAvailable(null);
+    schedulerService.startAsync().awaitRunning();
+    schedulerService.register(opChain);
 
-    // Then:
-    Assert.assertTrue(secondHasNext.await(10, TimeUnit.SECONDS), "expected hasNext to be called again");
-    scheduler.stopAsync().awaitTerminated();
+    Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
+    schedulerService.stopAsync().awaitTerminated();
   }
 
   @Test
-  public void shouldCallCloseOnOperators()
+  public void shouldCallCancelOnOpChainsWhenItIsCancelledByDispatch()
       throws InterruptedException {
-    // Given:
     initExecutor(1);
-    Mockito.when(_scheduler.hasNext()).thenReturn(true).thenReturn(false);
-    Mockito.when(_scheduler.next()).thenReturn(getChain(_operatorA));
-    OpChainSchedulerService scheduler = new OpChainSchedulerService(_scheduler, _executor);
-
-    CountDownLatch latch = new CountDownLatch(1);
-    Mockito.when(_operatorA.nextBlock()).thenAnswer(inv -> {
-      latch.countDown();
-      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenAnswer((Answer<OpChain>) invocation -> {
+      Thread.sleep(100);
+      return opChain;
     });
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
+
+    Mockito.when(_operatorA.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
+
+    CountDownLatch cancelLatch = new CountDownLatch(1);
+    Mockito.doAnswer(inv -> {
+      cancelLatch.countDown();
+      return null;
+    }).when(_operatorA).cancel(Mockito.any());
+    CountDownLatch deregisterLatch = new CountDownLatch(1);
+    Mockito.doAnswer(inv -> {
+      deregisterLatch.countDown();
+      return null;
+    }).when(_scheduler).deregister(Mockito.same(opChain));
+    CountDownLatch awaitLatch = new CountDownLatch(1);
+    Mockito.doAnswer(inv -> {
+      awaitLatch.countDown();
+      return null;
+    }).when(_scheduler).yield(Mockito.any());
+
+    schedulerService.startAsync().awaitRunning();
+    schedulerService.register(opChain);
+
+    Assert.assertTrue(awaitLatch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
+
+    // now cancel the request.
+    schedulerService.cancel(123);
+
+    Assert.assertTrue(cancelLatch.await(10, TimeUnit.SECONDS), "expected OpChain to be cancelled");
+    Assert.assertTrue(deregisterLatch.await(10, TimeUnit.SECONDS), "expected OpChain to be deregistered");
+    Mockito.verify(_operatorA, Mockito.times(1)).cancel(Mockito.any());
+    Mockito.verify(_scheduler, Mockito.times(1)).deregister(Mockito.any());
+    schedulerService.stopAsync().awaitTerminated();
+  }
 
-    // When:
-    scheduler.startAsync().awaitRunning();
-    scheduler.register(new OpChain(_operatorA, ImmutableList.of(), 123, 1));
-
-    // Then:
-    Assert.assertTrue(latch.await(10, TimeUnit.SECONDS), "expected await to be called in less than 10 seconds");
-    scheduler.stopAsync().awaitTerminated();
-    Mockito.verify(_operatorA, Mockito.times(1)).close();
+  @Test
+  public void shouldCallCancelOnOpChainsThatThrow()
+      throws InterruptedException {
+    initExecutor(1);
+    OpChain opChain = getChain(_operatorA);
+    Mockito.when(_scheduler.next(Mockito.anyLong(), Mockito.any())).thenReturn(opChain).thenReturn(null);
+    OpChainSchedulerService schedulerService = new OpChainSchedulerService(_scheduler, _executor);
+
+    CountDownLatch cancelLatch = new CountDownLatch(1);
+    CountDownLatch deregisterLatch = new CountDownLatch(1);
+    Mockito.when(_operatorA.nextBlock()).thenThrow(new RuntimeException("foo"));
+    Mockito.doAnswer(inv -> {
+      cancelLatch.countDown();
+      return null;
+    }).when(_operatorA).cancel(Mockito.any());
+    Mockito.doAnswer(inv -> {
+      deregisterLatch.countDown();
+      return null;
+    }).when(_scheduler).deregister(Mockito.same(opChain));
+
+    schedulerService.startAsync().awaitRunning();
+    schedulerService.register(opChain);
+
+    Assert.assertTrue(cancelLatch.await(10, TimeUnit.SECONDS), "expected OpChain to be cancelled");
+    Assert.assertTrue(deregisterLatch.await(10, TimeUnit.SECONDS), "expected OpChain to be deregistered");
+    Mockito.verify(_operatorA, Mockito.times(1)).cancel(Mockito.any());
+    Mockito.verify(_scheduler, Mockito.times(1)).deregister(Mockito.any());
+    schedulerService.stopAsync().awaitTerminated();
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/RoundRobinSchedulerTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/RoundRobinSchedulerTest.java
index 0435b50daa0..1c400c6e0f6 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/RoundRobinSchedulerTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/executor/RoundRobinSchedulerTest.java
@@ -19,29 +19,43 @@
 package org.apache.pinot.query.runtime.executor;
 
 import com.google.common.collect.ImmutableList;
-import java.util.concurrent.atomic.AtomicLong;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.query.mailbox.MailboxIdUtils;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.operator.MultiStageOperator;
 import org.apache.pinot.query.runtime.operator.OpChain;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 
 public class RoundRobinSchedulerTest {
-
-  private static final MailboxIdentifier MAILBOX_1 = new JsonMailboxIdentifier("1_1", "foo:2", "bar:3");
-  private static final MailboxIdentifier MAILBOX_2 = new JsonMailboxIdentifier("1_2", "foo:2", "bar:3");
+  private static final int DEFAULT_SENDER_STAGE_ID = 0;
+  private static final int DEFAULT_RECEIVER_STAGE_ID = 1;
+  private static final int DEFAULT_VIRTUAL_SERVER_ID = 1;
+  private static final int DEFAULT_POLL_TIMEOUT_MS = 1;
+  private static final int DEFAULT_RELEASE_TIMEOUT_MS = 10;
+  private static final long DEFAULT_REQUEST_ID = 123;
+
+  private static final String MAILBOX_1 =
+      MailboxIdUtils.toMailboxId(DEFAULT_REQUEST_ID, DEFAULT_SENDER_STAGE_ID, 0, DEFAULT_RECEIVER_STAGE_ID, 1);
+  private static final String MAILBOX_2 =
+      MailboxIdUtils.toMailboxId(DEFAULT_REQUEST_ID, DEFAULT_SENDER_STAGE_ID, 0, DEFAULT_RECEIVER_STAGE_ID, 2);
+  private static final String MAILBOX_3 =
+      MailboxIdUtils.toMailboxId(DEFAULT_REQUEST_ID, DEFAULT_SENDER_STAGE_ID, 0, DEFAULT_RECEIVER_STAGE_ID, 3);
 
   @Mock
   private MultiStageOperator _operator;
 
   private AutoCloseable _mocks;
 
+  private RoundRobinScheduler _scheduler;
+
   @BeforeClass
   public void beforeClass() {
     _mocks = MockitoAnnotations.openMocks(this);
@@ -53,109 +67,119 @@ public void afterClass()
     _mocks.close();
   }
 
-  @Test
-  public void shouldScheduleNewOpChainsImmediately() {
-    // Given:
-    OpChain chain = new OpChain(_operator, ImmutableList.of(MAILBOX_1), 123, 1);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler();
-
-    // When:
-    scheduler.register(chain, true);
-
-    // Then:
-    Assert.assertTrue(scheduler.hasNext());
-    Assert.assertEquals(scheduler.next(), chain);
-  }
-
-  @Test
-  public void shouldNotScheduleRescheduledOpChainsImmediately() {
-    // Given:
-    OpChain chain = new OpChain(_operator, ImmutableList.of(MAILBOX_1), 123, 1);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler();
-
-    // When:
-    scheduler.register(chain, false);
-
-    // Then:
-    Assert.assertFalse(scheduler.hasNext());
-  }
-
-  @Test
-  public void shouldScheduleRescheduledOpChainOnDataAvailable() {
-    // Given:
-    OpChain chain1 = new OpChain(_operator, ImmutableList.of(MAILBOX_1), 123, 1);
-    OpChain chain2 = new OpChain(_operator, ImmutableList.of(MAILBOX_2), 123, 1);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler();
-
-    // When:
-    scheduler.register(chain1, false);
-    scheduler.register(chain2, false);
-    scheduler.onDataAvailable(MAILBOX_1);
-
-    // Then:
-    Assert.assertTrue(scheduler.hasNext());
-    Assert.assertEquals(scheduler.next(), chain1);
-    Assert.assertFalse(scheduler.hasNext());
+  @AfterTest
+  public void afterTest() {
+    _scheduler.shutdownNow();
   }
 
   @Test
-  public void shouldScheduleRescheduledOpChainAfterTimeout() {
-    // Given:
-    OpChain chain1 = new OpChain(_operator, ImmutableList.of(MAILBOX_1), 123, 1);
-    AtomicLong ticker = new AtomicLong(0);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler(100, ticker::get);
-
-    // When:
-    scheduler.register(chain1, false);
-    ticker.set(101);
-
-    // Then:
-    Assert.assertTrue(scheduler.hasNext());
-    Assert.assertEquals(scheduler.next(), chain1);
+  public void testSchedulerHappyPath()
+      throws InterruptedException {
+    OpChain chain = new OpChain(
+        getOpChainExecutionContext(DEFAULT_REQUEST_ID, DEFAULT_RECEIVER_STAGE_ID, DEFAULT_VIRTUAL_SERVER_ID), _operator,
+        ImmutableList.of(MAILBOX_1));
+    _scheduler = new RoundRobinScheduler(DEFAULT_RELEASE_TIMEOUT_MS);
+    _scheduler.register(chain);
+
+    // OpChain is scheduled immediately
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain);
+    // No op-chains ready, so scheduler returns null
+    Assert.assertNull(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+    // When Op-Chain is done executing, yield is called
+    _scheduler.yield(chain);
+    // When data is received, callback is called
+    _scheduler.onDataAvailable(MailboxIdUtils.toOpChainId(MAILBOX_1));
+    // next should return the OpChain immediately after the callback
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain);
+    // Say the OpChain is done, then a de-register will be called
+    _scheduler.deregister(chain);
+
+    // There should be no entries left in the scheduler
+    Assert.assertEquals(0,
+        _scheduler.aliveChainsSize() + _scheduler.readySize() + _scheduler.seenMailSize() + _scheduler.availableSize());
   }
 
   @Test
-  public void shouldScheduleRescheduledOpChainOnDataAvailableBeforeRegister() {
-    // Given:
-    OpChain chain = new OpChain(_operator, ImmutableList.of(MAILBOX_1), 123, 1);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler();
-
-    // When:
-    scheduler.onDataAvailable(MAILBOX_1);
-    scheduler.register(chain, false);
-
-    // Then:
-    Assert.assertTrue(scheduler.hasNext());
-    Assert.assertEquals(scheduler.next(), chain);
+  public void testSchedulerWhenSenderDies()
+      throws InterruptedException {
+    OpChain chain = new OpChain(
+        getOpChainExecutionContext(DEFAULT_REQUEST_ID, DEFAULT_RECEIVER_STAGE_ID, DEFAULT_VIRTUAL_SERVER_ID), _operator,
+        ImmutableList.of(MAILBOX_1));
+    _scheduler = new RoundRobinScheduler(DEFAULT_RELEASE_TIMEOUT_MS);
+    _scheduler.register(chain);
+
+    // OpChain runs immediately after registration
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain);
+    // No more OpChains to run
+    Assert.assertNull(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+    // When op-chain returns a no-op block, suspend it
+    _scheduler.yield(chain);
+
+    // Unless a callback is called, the chain would remain suspended. However, the scheduler will automatically
+    // promote available OpChains to ready every releaseMs.
+    Assert.assertEquals(_scheduler.next(DEFAULT_RELEASE_TIMEOUT_MS + 100, TimeUnit.MILLISECONDS), chain);
+
+    // Assuming the OpChain has timed out, the OpChain will be de-registered
+    _scheduler.deregister(chain);
+
+    // There should be no entries left in the scheduler
+    Assert.assertEquals(0,
+        _scheduler.aliveChainsSize() + _scheduler.readySize() + _scheduler.seenMailSize() + _scheduler.availableSize());
   }
 
   @Test
-  public void shouldNotScheduleRescheduledOpChainOnDataAvailableForDifferentMailbox() {
-    // Given:
-    OpChain chain = new OpChain(_operator, ImmutableList.of(MAILBOX_1), 123, 1);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler();
-
-    // When:
-    scheduler.register(chain, false);
-    scheduler.onDataAvailable(MAILBOX_2);
-
-    // Then:
-    Assert.assertFalse(scheduler.hasNext());
+  public void testSchedulerWhenParallelismGtOne()
+      throws InterruptedException {
+    // When parallelism is > 1, multiple OpChains with the same requestId and stageId would be registered in the same
+    // scheduler. Data received on a given mailbox should wake up exactly 1 OpChain corresponding to the virtual
+    // server-id determined by the Mailbox.
+    OpChain chain1 =
+        new OpChain(getOpChainExecutionContext(DEFAULT_REQUEST_ID, DEFAULT_RECEIVER_STAGE_ID, 1), _operator,
+            ImmutableList.of(MAILBOX_1));
+    OpChain chain2 =
+        new OpChain(getOpChainExecutionContext(DEFAULT_REQUEST_ID, DEFAULT_RECEIVER_STAGE_ID, 2), _operator,
+            ImmutableList.of(MAILBOX_2));
+    OpChain chain3 =
+        new OpChain(getOpChainExecutionContext(DEFAULT_REQUEST_ID, DEFAULT_RECEIVER_STAGE_ID, 3), _operator,
+            ImmutableList.of(MAILBOX_3));
+
+    // Register 3 OpChains. Keep release timeout high to avoid unintended OpChain wake-ups.
+    _scheduler = new RoundRobinScheduler(10_000);
+    _scheduler.register(chain1);
+    _scheduler.register(chain2);
+    _scheduler.register(chain3);
+
+    // OpChains are returned in the order in which they were registered
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain1);
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain2);
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain3);
+    // No op-chains ready, so scheduler returns null
+    Assert.assertNull(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+    // When Op-Chains are done executing, yield is called in any order
+    _scheduler.yield(chain1);
+    _scheduler.yield(chain3);
+    _scheduler.yield(chain2);
+    // Data may be received in arbitrary order
+    _scheduler.onDataAvailable(MailboxIdUtils.toOpChainId(MAILBOX_2));
+    _scheduler.onDataAvailable(MailboxIdUtils.toOpChainId(MAILBOX_3));
+    _scheduler.onDataAvailable(MailboxIdUtils.toOpChainId(MAILBOX_1));
+    // Subsequent polls would be in the order the callback was processed. A callback here is said to be "processed"
+    // if it has successfully returned.
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain2);
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain3);
+    Assert.assertEquals(_scheduler.next(DEFAULT_POLL_TIMEOUT_MS, TimeUnit.MILLISECONDS), chain1);
+    // De-register may be called in any order again
+    _scheduler.deregister(chain3);
+    _scheduler.deregister(chain2);
+    _scheduler.deregister(chain1);
+
+    // There should be no entries left in the scheduler after everything is done
+    Assert.assertEquals(0,
+        _scheduler.aliveChainsSize() + _scheduler.readySize() + _scheduler.seenMailSize() + _scheduler.availableSize());
   }
 
-  @Test
-  public void shouldScheduleRescheduledOpChainOnDataAvailableForAnyMailbox() {
-    // Given:
-    OpChain chain = new OpChain(_operator, ImmutableList.of(MAILBOX_1, MAILBOX_2), 123, 1);
-    RoundRobinScheduler scheduler = new RoundRobinScheduler();
-
-    // When:
-    scheduler.register(chain, false);
-    scheduler.onDataAvailable(MAILBOX_2);
-
-    // Then:
-    Assert.assertTrue(scheduler.hasNext());
-    Assert.assertEquals(scheduler.next(), chain);
-    Assert.assertEquals(scheduler._seenMail.size(), 0);
+  private OpChainExecutionContext getOpChainExecutionContext(long requestId, int stageId, int virtualServerId) {
+    return new OpChainExecutionContext(null, requestId, stageId,
+        new VirtualServerAddress("localhost", 1234, virtualServerId), 0, null, null, true);
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/AggregateOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/AggregateOperatorTest.java
index 6f2212e6b69..8048bad5f49 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/AggregateOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/AggregateOperatorTest.java
@@ -19,16 +19,18 @@
 package org.apache.pinot.query.runtime.operator;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.plannode.AggregateNode.AggType;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.exception.BadQueryRequestException;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -39,9 +41,9 @@
 
 import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.DOUBLE;
 import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.INT;
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.LONG;
 import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.STRING;
 
-
 public class AggregateOperatorTest {
 
   private AutoCloseable _mocks;
@@ -49,9 +51,13 @@ public class AggregateOperatorTest {
   @Mock
   private MultiStageOperator _input;
 
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
   }
 
   @AfterMethod
@@ -69,9 +75,11 @@ public void shouldHandleUpstreamErrorBlocks() {
     Mockito.when(_input.nextBlock())
         .thenReturn(TransferableBlockUtils.getErrorTransferableBlock(new Exception("foo!")));
 
-    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, INT});
-    DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, DOUBLE});
+    DataSchema outSchema = new DataSchema(new String[]{"group", "sum"}, new ColumnDataType[]{INT, DOUBLE});
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.INTERMEDIATE);
 
     // When:
     TransferableBlock block1 = operator.nextBlock(); // build
@@ -90,8 +98,10 @@ public void shouldHandleEndOfStreamBlockWithNoOtherInputs() {
     Mockito.when(_input.nextBlock()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, INT});
-    DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    DataSchema outSchema = new DataSchema(new String[]{"group", "sum"}, new ColumnDataType[]{INT, DOUBLE});
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.LEAF);
 
     // When:
     TransferableBlock block = operator.nextBlock();
@@ -112,8 +122,10 @@ public void shouldHandleUpstreamNoOpBlocksWhileConstructing() {
         .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock())
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
-    DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    DataSchema outSchema = new DataSchema(new String[]{"group", "sum"}, new ColumnDataType[]{INT, DOUBLE});
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.LEAF);
 
     // When:
     TransferableBlock block1 = operator.nextBlock(); // build when reading NoOp block
@@ -131,12 +143,14 @@ public void shouldAggregateSingleInputBlock() {
     List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
     List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
 
-    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, INT});
-    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 1}))
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, DOUBLE});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 1.0}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
-    DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    DataSchema outSchema = new DataSchema(new String[]{"group", "sum"}, new ColumnDataType[]{INT, DOUBLE});
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.INTERMEDIATE);
 
     // When:
     TransferableBlock block1 = operator.nextBlock();
@@ -145,23 +159,25 @@ public void shouldAggregateSingleInputBlock() {
     // Then:
     Mockito.verify(_input, Mockito.times(2)).nextBlock();
     Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
-    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1},
-        "Expected two columns (group by key, agg value)");
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1.0},
+        "Expected two columns (group by key, agg value), agg value is intermediate type");
     Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
   }
 
   @Test
   public void shouldAggregateSingleInputBlockWithLiteralInput() {
     // Given:
-    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.Literal(FieldSpec.DataType.INT, 1)));
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.Literal(FieldSpec.DataType.DOUBLE, 1.0)));
     List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
 
-    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, INT});
-    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 3}))
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, DOUBLE});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 3.0}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
-    DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    DataSchema outSchema = new DataSchema(new String[]{"group", "sum"}, new ColumnDataType[]{INT, LONG});
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.FINAL);
 
     // When:
     TransferableBlock block1 = operator.nextBlock();
@@ -171,64 +187,37 @@ public void shouldAggregateSingleInputBlockWithLiteralInput() {
     Mockito.verify(_input, Mockito.times(2)).nextBlock();
     Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
     // second value is 1 (the literal) instead of 3 (the col val)
-    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1},
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1L},
         "Expected two columns (group by key, agg value)");
     Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
   }
 
-  @Test
-  public void shouldCallMergerWhenAggregatingMultipleRows() {
-    // Given:
-    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
-    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
-
-    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, INT});
-    Mockito.when(_input.nextBlock())
-        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 1}, new Object[]{1, 1}))
-        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 1}))
-        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
-
-    AggregateOperator.Merger merger = Mockito.mock(AggregateOperator.Merger.class);
-    Mockito.when(merger.merge(Mockito.any(), Mockito.any())).thenReturn(12d);
-    Mockito.when(merger.initialize(Mockito.any())).thenReturn(1d);
-    DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator =
-        new AggregateOperator(_input, outSchema, calls, group, inSchema, ImmutableMap.of("SUM", cdt -> merger), 1, 2);
-
-    // When:
-    TransferableBlock resultBlock = operator.nextBlock(); // (output result)
-
-    // Then:
-    // should call merger twice, one from second row in first block and two from the first row
-    // in second block
-    Mockito.verify(merger, Mockito.times(1)).initialize(Mockito.any());
-    Mockito.verify(merger, Mockito.times(2)).merge(Mockito.any(), Mockito.any());
-    Assert.assertEquals(resultBlock.getContainer().get(0), new Object[]{1, 12d},
-        "Expected two columns (group by key, agg value)");
-  }
-
   @Test
   public void testGroupByAggregateWithHashCollision() {
     MultiStageOperator upstreamOperator = OperatorTestUtil.getOperator(OperatorTestUtil.OP_1);
     // Create an aggregation call with sum for first column and group by second column.
     RexExpression.FunctionCall agg = getSum(new RexExpression.InputRef(0));
-    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{INT, INT});
-    AggregateOperator sum0GroupBy1 =
-        new AggregateOperator(upstreamOperator, OperatorTestUtil.getDataSchema(OperatorTestUtil.OP_1),
-            Arrays.asList(agg), Arrays.asList(new RexExpression.InputRef(1)), inSchema, 1, 2);
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new ColumnDataType[]{STRING, INT});
+    DataSchema outSchema = new DataSchema(new String[]{"group", "sum"}, new ColumnDataType[]{STRING, DOUBLE});
+    AggregateOperator sum0GroupBy1 = new AggregateOperator(OperatorTestUtil.getDefaultContext(), upstreamOperator,
+        outSchema, inSchema, Collections.singletonList(agg),
+        Collections.singletonList(new RexExpression.InputRef(1)), AggType.LEAF);
     TransferableBlock result = sum0GroupBy1.getNextBlock();
     while (result.isNoOpBlock()) {
       result = sum0GroupBy1.getNextBlock();
     }
     List<Object[]> resultRows = result.getContainer();
-    List<Object[]> expectedRows = Arrays.asList(new Object[]{"Aa", 1}, new Object[]{"BB", 5.0});
-    Assert.assertEquals(resultRows.size(), expectedRows.size());
-    Assert.assertEquals(resultRows.get(0), expectedRows.get(0));
-    Assert.assertEquals(resultRows.get(1), expectedRows.get(1));
+    Assert.assertEquals(resultRows.size(), 2);
+    if (resultRows.get(0).equals("Aa")) {
+      Assert.assertEquals(resultRows.get(0), new Object[]{"Aa", 1.0});
+      Assert.assertEquals(resultRows.get(1), new Object[]{"BB", 5.0});
+    } else {
+      Assert.assertEquals(resultRows.get(0), new Object[]{"BB", 5.0});
+      Assert.assertEquals(resultRows.get(1), new Object[]{"Aa", 1.0});
+    }
   }
 
-  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*Unexpected value: "
-      + "AVERAGE.*")
+  @Test(expectedExceptions = BadQueryRequestException.class, expectedExceptionsMessageRegExp = ".*average.*")
   public void shouldThrowOnUnknownAggFunction() {
     // Given:
     List<RexExpression> calls = ImmutableList.of(
@@ -238,7 +227,9 @@ public void shouldThrowOnUnknownAggFunction() {
     DataSchema inSchema = new DataSchema(new String[]{"unknown"}, new ColumnDataType[]{DOUBLE});
 
     // When:
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.INTERMEDIATE);
   }
 
   @Test
@@ -255,7 +246,9 @@ public void shouldReturnErrorBlockOnUnexpectedInputType() {
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     DataSchema outSchema = new DataSchema(new String[]{"sum"}, new ColumnDataType[]{DOUBLE});
-    AggregateOperator operator = new AggregateOperator(_input, outSchema, calls, group, inSchema, 1, 2);
+    AggregateOperator operator =
+        new AggregateOperator(OperatorTestUtil.getDefaultContext(), _input, outSchema, inSchema, calls, group,
+            AggType.INTERMEDIATE);
 
     // When:
     TransferableBlock block = operator.nextBlock();
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/FilterOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/FilterOperatorTest.java
index cf5cb80151b..ba02d44fe17 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/FilterOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/FilterOperatorTest.java
@@ -61,7 +61,8 @@ public void shouldPropagateUpstreamErrorBlock() {
     DataSchema inputSchema = new DataSchema(new String[]{"boolCol"}, new DataSchema.ColumnDataType[]{
         DataSchema.ColumnDataType.BOOLEAN
     });
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, booleanLiteral, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, booleanLiteral);
     TransferableBlock errorBlock = op.getNextBlock();
     Assert.assertTrue(errorBlock.isErrorBlock());
     DataBlock error = errorBlock.getDataBlock();
@@ -76,7 +77,8 @@ public void shouldPropagateUpstreamEOS() {
         DataSchema.ColumnDataType.INT
     });
     Mockito.when(_upstreamOperator.nextBlock()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, booleanLiteral, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, booleanLiteral);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertTrue(dataBlock.isEndOfStreamBlock());
   }
@@ -89,7 +91,8 @@ public void shouldPropagateUpstreamNoop() {
         DataSchema.ColumnDataType.INT
     });
     Mockito.when(_upstreamOperator.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, booleanLiteral, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, booleanLiteral);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertTrue(dataBlock.isNoOpBlock());
   }
@@ -104,7 +107,8 @@ public void shouldHandleTrueBooleanLiteralFilter() {
     Mockito.when(_upstreamOperator.nextBlock())
         .thenReturn(OperatorTestUtil.block(inputSchema, new Object[]{0}, new Object[]{1}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, booleanLiteral, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, booleanLiteral);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -122,7 +126,8 @@ public void shouldHandleFalseBooleanLiteralFilter() {
     });
     Mockito.when(_upstreamOperator.nextBlock())
         .thenReturn(OperatorTestUtil.block(inputSchema, new Object[]{1}, new Object[]{2}));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, booleanLiteral, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, booleanLiteral);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -137,7 +142,8 @@ public void shouldThrowOnNonBooleanTypeBooleanLiteral() {
     });
     Mockito.when(_upstreamOperator.nextBlock())
         .thenReturn(OperatorTestUtil.block(inputSchema, new Object[]{1}, new Object[]{2}));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, booleanLiteral, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, booleanLiteral);
     TransferableBlock errorBlock = op.getNextBlock();
     Assert.assertTrue(errorBlock.isErrorBlock());
     DataBlock data = errorBlock.getDataBlock();
@@ -152,7 +158,7 @@ public void shouldThrowOnNonBooleanTypeInputRef() {
     });
     Mockito.when(_upstreamOperator.nextBlock())
         .thenReturn(OperatorTestUtil.block(inputSchema, new Object[]{1}, new Object[]{2}));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, ref0, 1, 2);
+    FilterOperator op = new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, ref0);
     TransferableBlock errorBlock = op.getNextBlock();
     Assert.assertTrue(errorBlock.isErrorBlock());
     DataBlock data = errorBlock.getDataBlock();
@@ -167,7 +173,7 @@ public void shouldHandleBooleanInputRef() {
     });
     Mockito.when(_upstreamOperator.nextBlock())
         .thenReturn(OperatorTestUtil.block(inputSchema, new Object[]{1, true}, new Object[]{2, false}));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, ref1, 1, 2);
+    FilterOperator op = new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, ref1);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -187,7 +193,8 @@ public void shouldHandleAndFilter() {
     RexExpression.FunctionCall andCall = new RexExpression.FunctionCall(SqlKind.AND, FieldSpec.DataType.BOOLEAN, "AND",
         ImmutableList.of(new RexExpression.InputRef(0), new RexExpression.InputRef(1)));
 
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, andCall, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, andCall);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -207,7 +214,8 @@ public void shouldHandleOrFilter() {
     RexExpression.FunctionCall orCall = new RexExpression.FunctionCall(SqlKind.OR, FieldSpec.DataType.BOOLEAN, "OR",
         ImmutableList.of(new RexExpression.InputRef(0), new RexExpression.InputRef(1)));
 
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, orCall, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, orCall);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -229,7 +237,8 @@ public void shouldHandleNotFilter() {
     RexExpression.FunctionCall notCall = new RexExpression.FunctionCall(SqlKind.NOT, FieldSpec.DataType.BOOLEAN, "NOT",
         ImmutableList.of(new RexExpression.InputRef(0)));
 
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, notCall, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, notCall);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -248,7 +257,8 @@ public void shouldHandleGreaterThanFilter() {
     RexExpression.FunctionCall greaterThan =
         new RexExpression.FunctionCall(SqlKind.GREATER_THAN, FieldSpec.DataType.BOOLEAN, "greaterThan",
             ImmutableList.of(new RexExpression.InputRef(0), new RexExpression.InputRef(1)));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, greaterThan, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, greaterThan);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -268,7 +278,8 @@ public void shouldHandleBooleanFunction() {
         new RexExpression.FunctionCall(SqlKind.OTHER, FieldSpec.DataType.BOOLEAN, "startsWith",
             ImmutableList.of(new RexExpression.InputRef(0),
                 new RexExpression.Literal(FieldSpec.DataType.STRING, "star")));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, startsWith, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, startsWith);
     TransferableBlock dataBlock = op.getNextBlock();
     Assert.assertFalse(dataBlock.isErrorBlock());
     List<Object[]> result = dataBlock.getContainer();
@@ -289,6 +300,7 @@ public void shouldThrowOnUnfoundFunction() {
         new RexExpression.FunctionCall(SqlKind.OTHER, FieldSpec.DataType.BOOLEAN, "startsWithError",
             ImmutableList.of(new RexExpression.InputRef(0),
                 new RexExpression.Literal(FieldSpec.DataType.STRING, "star")));
-    FilterOperator op = new FilterOperator(_upstreamOperator, inputSchema, startsWith, 1, 2);
+    FilterOperator op =
+        new FilterOperator(OperatorTestUtil.getDefaultContext(), _upstreamOperator, inputSchema, startsWith);
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/HashJoinOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/HashJoinOperatorTest.java
index 4075237249d..fc78863778f 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/HashJoinOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/HashJoinOperatorTest.java
@@ -29,7 +29,8 @@
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.query.planner.logical.RexExpression;
 import org.apache.pinot.query.planner.partitioning.FieldSelectionKeySelector;
-import org.apache.pinot.query.planner.stage.JoinNode;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -51,9 +52,13 @@ public class HashJoinOperatorTest {
   @Mock
   private MultiStageOperator _rightOperator;
 
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
   }
 
   @AfterMethod
@@ -88,9 +93,10 @@ public void shouldHandleHashJoinKeyCollisionInnerJoin() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses);
-    HashJoinOperator joinOnString = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses, false);
+    HashJoinOperator joinOnString =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = joinOnString.nextBlock();
     while (result.isNoOpBlock()) {
@@ -125,9 +131,10 @@ public void shouldHandleInnerJoinOnInt() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator joinOnInt = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator joinOnInt =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
     TransferableBlock result = joinOnInt.nextBlock();
     while (result.isNoOpBlock()) {
       result = joinOnInt.nextBlock();
@@ -159,9 +166,10 @@ public void shouldHandleJoinOnEmptySelector() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node = new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(new ArrayList<>(), new ArrayList<>()),
-        joinClauses);
-    HashJoinOperator joinOnInt = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(new ArrayList<>(), new ArrayList<>()), joinClauses, false);
+    HashJoinOperator joinOnInt =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
     TransferableBlock result = joinOnInt.nextBlock();
     while (result.isNoOpBlock()) {
       result = joinOnInt.nextBlock();
@@ -200,9 +208,10 @@ public void shouldHandleLeftJoin() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.LEFT, getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.LEFT,
+        getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
@@ -234,9 +243,10 @@ public void shouldPassLeftTableEOS() {
             DataSchema.ColumnDataType.STRING
         });
     List<RexExpression> joinClauses = new ArrayList<>();
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
@@ -265,9 +275,10 @@ public void shouldHandleLeftJoinOneToN() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.LEFT, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.LEFT,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
@@ -299,9 +310,11 @@ public void shouldPassRightTableEOS() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
@@ -337,9 +350,10 @@ public void shouldHandleInequiJoinOnString() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node = new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(new ArrayList<>(), new ArrayList<>()),
-        joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(new ArrayList<>(), new ArrayList<>()), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
       result = join.nextBlock();
@@ -375,9 +389,10 @@ public void shouldHandleInequiJoinOnInt() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node = new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(new ArrayList<>(), new ArrayList<>()),
-        joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(new ArrayList<>(), new ArrayList<>()), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
       result = join.nextBlock();
@@ -409,9 +424,10 @@ public void shouldHandleRightJoin() {
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
         DataSchema.ColumnDataType.STRING
     });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.RIGHT, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator joinOnNum = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.RIGHT,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator joinOnNum =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
     TransferableBlock result = joinOnNum.nextBlock();
     while (result.isNoOpBlock()) {
       result = joinOnNum.nextBlock();
@@ -438,16 +454,16 @@ public void shouldHandleRightJoin() {
     Assert.assertTrue(result.isSuccessfulEndOfStreamBlock());
   }
 
-  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*SEMI is not supported.*")
-  public void shouldThrowOnSemiJoin() {
+  @Test
+  public void shouldHandleSemiJoin() {
     DataSchema leftSchema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
     });
     DataSchema rightSchema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
     });
-    Mockito.when(_leftOperator.nextBlock())
-        .thenReturn(OperatorTestUtil.block(leftSchema, new Object[]{1, "Aa"}, new Object[]{2, "BB"}))
+    Mockito.when(_leftOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(leftSchema, new Object[]{1, "Aa"}, new Object[]{2, "BB"}, new Object[]{4, "CC"}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
     Mockito.when(_rightOperator.nextBlock()).thenReturn(
             OperatorTestUtil.block(rightSchema, new Object[]{2, "Aa"}, new Object[]{2, "BB"}, new Object[]{3, "BB"}))
@@ -458,9 +474,25 @@ public void shouldThrowOnSemiJoin() {
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
         DataSchema.ColumnDataType.STRING
     });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.SEMI, getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.SEMI,
+        getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
+    TransferableBlock result = join.nextBlock();
+    while (result.isNoOpBlock()) {
+      result = join.nextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows =
+        ImmutableList.of(new Object[]{1, "Aa", null, null}, new Object[]{2, "BB", null, null});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    Assert.assertEquals(resultRows.get(0), expectedRows.get(0));
+    Assert.assertEquals(resultRows.get(1), expectedRows.get(1));
+    result = join.nextBlock();
+    while (result.isNoOpBlock()) {
+      result = join.nextBlock();
+    }
+    Assert.assertTrue(result.isSuccessfulEndOfStreamBlock());
   }
 
   @Test
@@ -482,9 +514,10 @@ public void shouldHandleFullJoin() {
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
         DataSchema.ColumnDataType.STRING
     });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.FULL, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.FULL,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
       result = join.nextBlock();
@@ -514,16 +547,16 @@ public void shouldHandleFullJoin() {
     Assert.assertTrue(result.isSuccessfulEndOfStreamBlock());
   }
 
-  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*ANTI is not supported.*")
-  public void shouldThrowOnAntiJoin() {
+  @Test
+  public void shouldHandleAntiJoin() {
     DataSchema leftSchema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
     });
     DataSchema rightSchema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
     });
-    Mockito.when(_leftOperator.nextBlock())
-        .thenReturn(OperatorTestUtil.block(leftSchema, new Object[]{1, "Aa"}, new Object[]{2, "BB"}))
+    Mockito.when(_leftOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(leftSchema, new Object[]{1, "Aa"}, new Object[]{2, "BB"}, new Object[]{4, "CC"}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
     Mockito.when(_rightOperator.nextBlock()).thenReturn(
             OperatorTestUtil.block(rightSchema, new Object[]{2, "Aa"}, new Object[]{2, "BB"}, new Object[]{3, "BB"}))
@@ -534,9 +567,23 @@ public void shouldThrowOnAntiJoin() {
         DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
         DataSchema.ColumnDataType.STRING
     });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.ANTI, getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.ANTI,
+        getJoinKeys(Arrays.asList(1), Arrays.asList(1)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
+    TransferableBlock result = join.nextBlock();
+    while (result.isNoOpBlock()) {
+      result = join.nextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows = ImmutableList.of(new Object[]{4, "CC", null, null});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    Assert.assertEquals(resultRows.get(0), expectedRows.get(0));
+    result = join.nextBlock();
+    while (result.isNoOpBlock()) {
+      result = join.nextBlock();
+    }
+    Assert.assertTrue(result.isSuccessfulEndOfStreamBlock());
   }
 
   @Test
@@ -559,9 +606,10 @@ public void shouldPropagateRightTableError() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
@@ -592,9 +640,10 @@ public void shouldPropagateLeftTableError() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock();
     while (result.isNoOpBlock()) {
@@ -628,9 +677,10 @@ public void shouldHandleNoOpBlock() {
             DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT,
             DataSchema.ColumnDataType.STRING
         });
-    JoinNode node =
-        new JoinNode(1, resultSchema, JoinRelType.INNER, getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses);
-    HashJoinOperator join = new HashJoinOperator(_leftOperator, _rightOperator, leftSchema, node, 1, 2);
+    JoinNode node = new JoinNode(1, resultSchema, leftSchema, rightSchema, JoinRelType.INNER,
+        getJoinKeys(Arrays.asList(0), Arrays.asList(0)), joinClauses, false);
+    HashJoinOperator join =
+        new HashJoinOperator(OperatorTestUtil.getDefaultContext(), _leftOperator, _rightOperator, leftSchema, node);
 
     TransferableBlock result = join.nextBlock(); // first no-op consumes first right data block.
     Assert.assertTrue(result.isNoOpBlock());
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/IntersectOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/IntersectOperatorTest.java
new file mode 100644
index 00000000000..04c14caea1b
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/IntersectOperatorTest.java
@@ -0,0 +1,119 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+public class IntersectOperatorTest {
+  private AutoCloseable _mocks;
+
+  @Mock
+  private MultiStageOperator _leftOperator;
+
+  @Mock
+  private MultiStageOperator _rightOperator;
+
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void testIntersectOperator() {
+    DataSchema schema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
+        DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
+    });
+    Mockito.when(_leftOperator.nextBlock())
+        .thenReturn(OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "CC"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    Mockito.when(_rightOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{4, "DD"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    IntersectOperator intersectOperator =
+        new IntersectOperator(OperatorTestUtil.getDefaultContext(), ImmutableList.of(_leftOperator, _rightOperator),
+            schema);
+
+    TransferableBlock result = intersectOperator.nextBlock();
+    while (result.getType() != DataBlock.Type.ROW) {
+      result = intersectOperator.nextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows = Arrays.asList(new Object[]{1, "AA"}, new Object[]{2, "BB"});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    for (int i = 0; i < resultRows.size(); i++) {
+      Assert.assertEquals(resultRows.get(i), expectedRows.get(i));
+    }
+  }
+
+  @Test
+  public void testDedup() {
+    DataSchema schema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
+        DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
+    });
+    Mockito.when(_leftOperator.nextBlock())
+        .thenReturn(OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "CC"},
+            new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "CC"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    Mockito.when(_rightOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{4, "DD"},
+                new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{4, "DD"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    IntersectOperator intersectOperator =
+        new IntersectOperator(OperatorTestUtil.getDefaultContext(), ImmutableList.of(_leftOperator, _rightOperator),
+            schema);
+
+    TransferableBlock result = intersectOperator.nextBlock();
+    while (result.getType() != DataBlock.Type.ROW) {
+      result = intersectOperator.nextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows = Arrays.asList(new Object[]{1, "AA"}, new Object[]{2, "BB"});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    for (int i = 0; i < resultRows.size(); i++) {
+      Assert.assertEquals(resultRows.get(i), expectedRows.get(i));
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperatorTest.java
index 185a6d5d533..2c3b1704dab 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperatorTest.java
@@ -18,10 +18,13 @@
  */
 package org.apache.pinot.query.runtime.operator;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.core.data.table.Record;
@@ -30,12 +33,18 @@
 import org.apache.pinot.core.operator.blocks.results.DistinctResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.GroupByResultsBlock;
 import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
-import org.apache.pinot.core.query.aggregation.function.DistinctAggregationFunction;
 import org.apache.pinot.core.query.distinct.DistinctTable;
+import org.apache.pinot.core.query.request.ServerQueryRequest;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import static org.mockito.Mockito.mock;
@@ -43,6 +52,22 @@
 
 // TODO: add tests for Agg / GroupBy / Distinct result blocks
 public class LeafStageTransferableBlockOperatorTest {
+  private AutoCloseable _mocks;
+
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
 
   @Test
   public void shouldReturnDataBlockThenMetadataBlock() {
@@ -53,7 +78,8 @@ public void shouldReturnDataBlockThenMetadataBlock() {
     List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(new InstanceResponseBlock(
         new SelectionResultsBlock(schema, Arrays.asList(new Object[]{"foo", 1}, new Object[]{"", 2})), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -79,7 +105,9 @@ public void shouldHandleDesiredDataSchemaConversionCorrectly() {
         new SelectionResultsBlock(resultSchema,
             Arrays.asList(new Object[]{1, 1660000000000L}, new Object[]{0, 1600000000000L})), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, desiredSchema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()),
+            desiredSchema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -101,7 +129,8 @@ public void shouldHandleCanonicalizationCorrectly() {
         new SelectionResultsBlock(schema,
             Arrays.asList(new Object[]{1, 1660000000000L}, new Object[]{0, 1600000000000L})), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -126,7 +155,8 @@ public void shouldReturnMultipleDataBlockThenMetadataBlock() {
             queryContext),
         new InstanceResponseBlock(new SelectionResultsBlock(schema, Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock1 = operator.nextBlock();
@@ -156,12 +186,17 @@ public void shouldGetErrorBlockWhenInstanceResponseContainsError() {
         errorBlock,
         new InstanceResponseBlock(new SelectionResultsBlock(schema, Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
-
     // Then:
+    Assert.assertEquals(resultBlock.getContainer().get(0), new Object[]{"foo", 1});
+    Assert.assertEquals(resultBlock.getContainer().get(1), new Object[]{"", 2});
+
+    // When:
+    resultBlock = operator.nextBlock();
     Assert.assertTrue(resultBlock.isErrorBlock());
   }
 
@@ -174,10 +209,11 @@ public void shouldReorderWhenQueryContextAskForNotInOrderGroupByAsDistinct() {
     DataSchema schema = new DataSchema(new String[]{"intCol", "strCol"},
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING});
     List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(new InstanceResponseBlock(
-        new DistinctResultsBlock(mock(DistinctAggregationFunction.class), new DistinctTable(schema,
+        new DistinctResultsBlock(new DistinctTable(schema,
             Arrays.asList(new Record(new Object[]{1, "foo"}), new Record(new Object[]{2, "bar"})))), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -195,10 +231,11 @@ public void shouldParsedBlocksSuccessfullyWithDistinctQuery() {
     DataSchema schema = new DataSchema(new String[]{"strCol", "intCol"},
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT});
     List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(new InstanceResponseBlock(
-        new DistinctResultsBlock(mock(DistinctAggregationFunction.class), new DistinctTable(schema,
+        new DistinctResultsBlock(new DistinctTable(schema,
             Arrays.asList(new Record(new Object[]{"foo", 1}), new Record(new Object[]{"bar", 2})))), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -222,7 +259,8 @@ public void shouldReorderWhenQueryContextAskForGroupByOutOfOrder() {
     List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(
         new InstanceResponseBlock(new GroupByResultsBlock(schema, Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -245,7 +283,8 @@ public void shouldNotErrorOutWhenQueryContextAskForGroupByOutOfOrderWithHaving()
     List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(
         new InstanceResponseBlock(new GroupByResultsBlock(schema, Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -264,7 +303,8 @@ public void shouldNotErrorOutWhenDealingWithAggregationResults() {
     List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(new InstanceResponseBlock(
         new AggregationResultsBlock(queryContext.getAggregationFunctions(), Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(resultsBlockList, schema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(resultsBlockList), getStaticServerQueryRequests(resultsBlockList.size()), schema);
 
     // When:
     TransferableBlock resultBlock = operator.nextBlock();
@@ -286,7 +326,9 @@ public void shouldNotErrorOutWhenIncorrectDataSchemaProvidedWithEmptyRowsSelecti
     List<InstanceResponseBlock> responseBlockList = Collections.singletonList(
         new InstanceResponseBlock(new SelectionResultsBlock(resultSchema, Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(responseBlockList, desiredSchema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(responseBlockList), getStaticServerQueryRequests(responseBlockList.size()),
+            desiredSchema);
     TransferableBlock resultBlock = operator.nextBlock();
 
     // Then:
@@ -305,11 +347,13 @@ public void shouldNotErrorOutWhenIncorrectDataSchemaProvidedWithEmptyRowsDistinc
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.INT});
 
     // When:
-    List<InstanceResponseBlock> responseBlockList = Collections.singletonList(new InstanceResponseBlock(
-        new DistinctResultsBlock(mock(DistinctAggregationFunction.class),
-            new DistinctTable(resultSchema, Collections.emptyList())), queryContext));
+    List<InstanceResponseBlock> responseBlockList = Collections.singletonList(
+        new InstanceResponseBlock(new DistinctResultsBlock(new DistinctTable(resultSchema, Collections.emptyList())),
+            queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(responseBlockList, desiredSchema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(responseBlockList), getStaticServerQueryRequests(responseBlockList.size()),
+            desiredSchema);
     TransferableBlock resultBlock = operator.nextBlock();
 
     // Then:
@@ -331,11 +375,42 @@ public void shouldNotErrorOutWhenIncorrectDataSchemaProvidedWithEmptyRowsGroupBy
     List<InstanceResponseBlock> responseBlockList = Collections.singletonList(
         new InstanceResponseBlock(new GroupByResultsBlock(resultSchema, Collections.emptyList()), queryContext));
     LeafStageTransferableBlockOperator operator =
-        new LeafStageTransferableBlockOperator(responseBlockList, desiredSchema, 1, 2);
+        new LeafStageTransferableBlockOperator(OperatorTestUtil.getDefaultContext(),
+            getStaticBlockProcessor(responseBlockList), getStaticServerQueryRequests(responseBlockList.size()),
+            desiredSchema);
     TransferableBlock resultBlock = operator.nextBlock();
 
     // Then:
     Assert.assertEquals(resultBlock.getContainer().size(), 0);
     Assert.assertEquals(resultBlock.getDataSchema(), desiredSchema);
   }
+
+  @VisibleForTesting
+  static Function<ServerQueryRequest, InstanceResponseBlock> getStaticBlockProcessor(
+      List<InstanceResponseBlock> resultBlockList) {
+    return new StaticBlockProcessor(resultBlockList)::process;
+  }
+
+  static List<ServerQueryRequest> getStaticServerQueryRequests(int count) {
+    List<ServerQueryRequest> staticMockRequests = new ArrayList<>();
+    while (count > 0) {
+      staticMockRequests.add(mock(ServerQueryRequest.class));
+      count--;
+    }
+    return staticMockRequests;
+  }
+
+  private static class StaticBlockProcessor {
+    private final List<InstanceResponseBlock> _resultBlockList;
+    private int _currentIdx;
+
+    StaticBlockProcessor(List<InstanceResponseBlock> resultBlockList) {
+      _resultBlockList = resultBlockList;
+      _currentIdx = 0;
+    }
+
+    public InstanceResponseBlock process(ServerQueryRequest request) {
+      return _resultBlockList.get(_currentIdx++);
+    }
+  }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LiteralValueOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LiteralValueOperatorTest.java
index 856965cfb4c..83dea7c82db 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LiteralValueOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/LiteralValueOperatorTest.java
@@ -23,10 +23,12 @@
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
 import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
-import org.apache.pinot.query.runtime.plan.PlanRequestContext;
+import org.apache.pinot.query.runtime.plan.PhysicalPlanContext;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -39,11 +41,15 @@ public class LiteralValueOperatorTest {
   private AutoCloseable _mocks;
 
   @Mock
-  private PlanRequestContext _context;
+  private PhysicalPlanContext _context;
+
+  @Mock
+  private VirtualServerAddress _serverAddress;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
   }
 
   @AfterMethod
@@ -58,14 +64,9 @@ public void shouldReturnLiteralBlock() {
     DataSchema schema = new DataSchema(new String[]{"sLiteral", "iLiteral"},
         new ColumnDataType[]{ColumnDataType.STRING, ColumnDataType.INT});
     List<List<RexExpression>> literals = ImmutableList.of(
-        ImmutableList.of(
-            new RexExpression.Literal(DataType.STRING, "foo"),
-            new RexExpression.Literal(DataType.INT, 1)),
-        ImmutableList.of(
-            new RexExpression.Literal(DataType.STRING, ""),
-            new RexExpression.Literal(DataType.INT, 2))
-    );
-    LiteralValueOperator operator = new LiteralValueOperator(schema, literals, 1, 2);
+        ImmutableList.of(new RexExpression.Literal(DataType.STRING, "foo"), new RexExpression.Literal(DataType.INT, 1)),
+        ImmutableList.of(new RexExpression.Literal(DataType.STRING, ""), new RexExpression.Literal(DataType.INT, 2)));
+    LiteralValueOperator operator = new LiteralValueOperator(OperatorTestUtil.getDefaultContext(), schema, literals);
 
     // When:
     TransferableBlock transferableBlock = operator.nextBlock();
@@ -81,7 +82,7 @@ public void shouldHandleEmptyLiteralRows() {
     // Given:
     DataSchema schema = new DataSchema(new String[]{}, new ColumnDataType[]{});
     List<List<RexExpression>> literals = ImmutableList.of(ImmutableList.of());
-    LiteralValueOperator operator = new LiteralValueOperator(schema, literals, 1, 2);
+    LiteralValueOperator operator = new LiteralValueOperator(OperatorTestUtil.getDefaultContext(), schema, literals);
 
     // When:
     TransferableBlock transferableBlock = operator.nextBlock();
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperatorTest.java
index ce6777df147..48ace11a3f7 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxReceiveOperatorTest.java
@@ -19,50 +19,81 @@
 package org.apache.pinot.query.runtime.operator;
 
 import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
+import com.google.common.collect.ImmutableMap;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.calcite.rel.RelDistribution;
 import org.apache.pinot.common.datablock.MetadataBlock;
 import org.apache.pinot.common.exception.QueryException;
 import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
+import org.apache.pinot.query.mailbox.MailboxIdUtils;
 import org.apache.pinot.query.mailbox.MailboxService;
 import org.apache.pinot.query.mailbox.ReceivingMailbox;
-import org.apache.pinot.query.mailbox.ServerAddress;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.INT;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 
 public class MailboxReceiveOperatorTest {
+  private static final VirtualServerAddress RECEIVER_ADDRESS = new VirtualServerAddress("localhost", 123, 0);
+  private static final DataSchema DATA_SCHEMA =
+      new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
+  private static final String MAILBOX_ID_1 = MailboxIdUtils.toMailboxId(0, 1, 0, 0, 0);
+  private static final String MAILBOX_ID_2 = MailboxIdUtils.toMailboxId(0, 1, 1, 0, 0);
 
   private AutoCloseable _mocks;
-
-  @Mock
-  private ReceivingMailbox<TransferableBlock> _mailbox;
-
   @Mock
-  private ReceivingMailbox<TransferableBlock> _mailbox2;
-
-  @Mock
-  private MailboxService<TransferableBlock> _mailboxService;
+  private MailboxService _mailboxService;
   @Mock
-  private ServerInstance _server1;
+  private ReceivingMailbox _mailbox1;
   @Mock
-  private ServerInstance _server2;
+  private ReceivingMailbox _mailbox2;
+  private StageMetadata _stageMetadataBoth;
+  private StageMetadata _stageMetadata1;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    when(_mailboxService.getHostname()).thenReturn("localhost");
+    when(_mailboxService.getPort()).thenReturn(123);
+    VirtualServerAddress server1 = new VirtualServerAddress("localhost", 123, 0);
+    VirtualServerAddress server2 = new VirtualServerAddress("localhost", 123, 1);
+    _stageMetadataBoth = new StageMetadata.Builder().setWorkerMetadataList(Stream.of(server1, server2).map(
+        s -> new WorkerMetadata.Builder().setVirtualServerAddress(s)
+            .addMailBoxInfoMap(0, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0),
+                    org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 1, 0, 0)),
+                ImmutableList.of(server1, server2), ImmutableMap.of()))
+            .addMailBoxInfoMap(1, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0),
+                    org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 1, 0, 0)),
+                ImmutableList.of(server1, server2), ImmutableMap.of()))
+            .build()).collect(Collectors.toList())).build();
+    _stageMetadata1 = new StageMetadata.Builder().setWorkerMetadataList(Stream.of(server1).map(
+        s -> new WorkerMetadata.Builder().setVirtualServerAddress(s)
+            .addMailBoxInfoMap(0, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0)),
+                ImmutableList.of(server1), ImmutableMap.of()))
+            .addMailBoxInfoMap(1, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0)),
+                ImmutableList.of(server1), ImmutableMap.of()))
+            .build()).collect(Collectors.toList())).build();
   }
 
   @AfterMethod
@@ -71,496 +102,175 @@ public void tearDown()
     _mocks.close();
   }
 
-  @Test
-  public void shouldTimeoutOnExtraLongSleep()
-      throws InterruptedException {
-    // shorter timeoutMs should result in error.
-    MailboxReceiveOperator receiveOp =
-        new MailboxReceiveOperator(_mailboxService, new ArrayList<>(), RelDistribution.Type.SINGLETON, "test", 123, 456,
-            789, 10L);
-    Thread.sleep(200L);
-    TransferableBlock mailbox = receiveOp.nextBlock();
-    Assert.assertTrue(mailbox.isErrorBlock());
-    MetadataBlock errorBlock = (MetadataBlock) mailbox.getDataBlock();
-    Assert.assertTrue(errorBlock.getExceptions().containsKey(QueryException.EXECUTION_TIMEOUT_ERROR_CODE));
-
-    // longer timeout or default timeout (10s) doesn't result in error.
-    receiveOp =
-        new MailboxReceiveOperator(_mailboxService, new ArrayList<>(), RelDistribution.Type.SINGLETON, "test", 123, 456,
-            789, 2000L);
-    Thread.sleep(200L);
-    mailbox = receiveOp.nextBlock();
-    Assert.assertFalse(mailbox.isErrorBlock());
-    receiveOp =
-        new MailboxReceiveOperator(_mailboxService, new ArrayList<>(), RelDistribution.Type.SINGLETON, "test", 123, 456,
-            789, null);
-    Thread.sleep(200L);
-    mailbox = receiveOp.nextBlock();
-    Assert.assertFalse(mailbox.isErrorBlock());
-  }
-
-  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*multiple instance "
-      + "found.*")
-  public void shouldThrowReceiveSingletonFromMultiMatchMailboxServer() {
-
-    Mockito.when(_mailboxService.getHostname()).thenReturn("singleton");
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(123);
-
-    Mockito.when(_server1.getHostname()).thenReturn("singleton");
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(123);
-
-    Mockito.when(_server2.getHostname()).thenReturn("singleton");
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(123);
-
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, "test", 123, 456, 789, null);
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "Failed to find mailbox.*")
+  public void shouldThrowSingletonNoMatchMailboxServer() {
+    VirtualServerAddress server1 = new VirtualServerAddress("localhost", 456, 0);
+    VirtualServerAddress server2 = new VirtualServerAddress("localhost", 789, 1);
+    StageMetadata stageMetadata = new StageMetadata.Builder().setWorkerMetadataList(
+        Stream.of(server1, server2).map(s -> new WorkerMetadata.Builder().setVirtualServerAddress(s).build())
+            .collect(Collectors.toList())).build();
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, stageMetadata);
+    //noinspection resource
+    new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1);
   }
 
   @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*RANGE_DISTRIBUTED.*")
   public void shouldThrowRangeDistributionNotSupported() {
-    Mockito.when(_mailboxService.getHostname()).thenReturn("singleton");
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(123);
-
-    Mockito.when(_server1.getHostname()).thenReturn("singleton");
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(123);
-
-    Mockito.when(_server2.getHostname()).thenReturn("singleton");
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(123);
-
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.RANGE_DISTRIBUTED, "test", 123, 456, 789, null);
-  }
-
-  @Test
-  public void shouldReceiveSingletonNoMatchMailboxServer() {
-    String serverHost = "singleton";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    int server2port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2port);
-
-    int mailboxPort = 789;
-    Mockito.when(_mailboxService.getHostname()).thenReturn(serverHost);
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(mailboxPort);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, toHost, toPort, jobId, stageId, null);
-
-    // Receive end of stream block directly when there is no match.
-    Assert.assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, null);
+    //noinspection resource
+    new MailboxReceiveOperator(context, RelDistribution.Type.RANGE_DISTRIBUTED, 1);
   }
 
   @Test
-  public void shouldReceiveSingletonCloseMailbox() {
-    String serverHost = "singleton";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    int server2port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2port);
-
-    int mailboxPort = server2port;
-    Mockito.when(_mailboxService.getHostname()).thenReturn(serverHost);
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(mailboxPort);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(serverHost, server2port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(true);
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, toHost, toPort, jobId, stageId, null);
-    // Receive end of stream block directly when mailbox is close.
-    Assert.assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
-  }
-
-  @Test
-  public void shouldReceiveSingletonNullMailbox()
-      throws Exception {
-    String serverHost = "singleton";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    int server2port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2port);
-
-    int mailboxPort = server2port;
-    Mockito.when(_mailboxService.getHostname()).thenReturn(serverHost);
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(mailboxPort);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(serverHost, server2port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    // Receive null mailbox during timeout.
-    Mockito.when(_mailbox.receive()).thenReturn(null);
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, toHost, toPort, jobId, stageId, null);
-    // Receive NoOpBlock.
-    Assert.assertTrue(receiveOp.nextBlock().isNoOpBlock());
-  }
-
-  @Test
-  public void shouldReceiveEosDirectlyFromSender()
-      throws Exception {
-    String serverHost = "singleton";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    int server2port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2port);
-
-    int mailboxPort = server2port;
-    Mockito.when(_mailboxService.getHostname()).thenReturn(serverHost);
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(mailboxPort);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(serverHost, server2port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox.receive()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, toHost, toPort, jobId, stageId, null);
-    // Receive EosBloc.
-    Assert.assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+  public void shouldTimeoutOnExtraLongSleep()
+      throws InterruptedException {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+
+    // Short timeoutMs should result in timeout
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, System.currentTimeMillis() + 10L,
+            _stageMetadata1);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1)) {
+      Thread.sleep(100L);
+      TransferableBlock mailbox = receiveOp.nextBlock();
+      assertTrue(mailbox.isErrorBlock());
+      MetadataBlock errorBlock = (MetadataBlock) mailbox.getDataBlock();
+      assertTrue(errorBlock.getExceptions().containsKey(QueryException.EXECUTION_TIMEOUT_ERROR_CODE));
+    }
+
+    // Longer timeout or default timeout (10s) doesn't result in timeout
+    context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, System.currentTimeMillis() + 10_000L,
+            _stageMetadata1);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1)) {
+      Thread.sleep(100L);
+      TransferableBlock mailbox = receiveOp.nextBlock();
+      assertFalse(mailbox.isErrorBlock());
+    }
   }
 
   @Test
-  public void shouldReceiveSingletonMailbox()
-      throws Exception {
-    String serverHost = "singleton";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    int server2port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2port);
-
-    int mailboxPort = server2port;
-    Mockito.when(_mailboxService.getHostname()).thenReturn(serverHost);
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(mailboxPort);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(serverHost, server2port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Object[] expRow = new Object[]{1, 1};
-    DataSchema inSchema = new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
-    Mockito.when(_mailbox.receive()).thenReturn(OperatorTestUtil.block(inSchema, expRow));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, toHost, toPort, jobId, stageId, null);
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    List<Object[]> resultRows = receivedBlock.getContainer();
-    Assert.assertEquals(resultRows.size(), 1);
-    Assert.assertEquals(resultRows.get(0), expRow);
+  public void shouldReceiveSingletonNullMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1)) {
+      assertTrue(receiveOp.nextBlock().isNoOpBlock());
+    }
   }
 
   @Test
-  public void shouldReceiveSingletonErrorMailbox()
-      throws Exception {
-    String serverHost = "singleton";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    int server2port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(serverHost);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2port);
-
-    int mailboxPort = server2port;
-    Mockito.when(_mailboxService.getHostname()).thenReturn(serverHost);
-    Mockito.when(_mailboxService.getMailboxPort()).thenReturn(mailboxPort);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(serverHost, server2port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Exception e = new Exception("errorBlock");
-    Mockito.when(_mailbox.receive()).thenReturn(TransferableBlockUtils.getErrorTransferableBlock(e));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.SINGLETON, toHost, toPort, jobId, stageId, null);
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    Assert.assertTrue(receivedBlock.isErrorBlock());
-    MetadataBlock error = (MetadataBlock) receivedBlock.getDataBlock();
-    Assert.assertTrue(error.getExceptions().get(QueryException.UNKNOWN_ERROR_CODE).contains("errorBlock"));
+  public void shouldReceiveEosDirectlyFromSender() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailbox1.poll()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1)) {
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
   }
 
   @Test
-  public void shouldReceiveMailboxFromTwoServersOneClose()
-      throws Exception {
-    String server1Host = "hash1";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(server1Host);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    String server2Host = "hash2";
-    int server2Port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(server2Host);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2Port);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId1 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server1Host, server1Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId1)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(true);
-
-    JsonMailboxIdentifier expectedMailboxId2 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server2Host, server2Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId2)).thenReturn(_mailbox2);
-    Mockito.when(_mailbox2.isClosed()).thenReturn(false);
-    Object[] expRow = new Object[]{1, 1};
-    DataSchema inSchema = new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
-    Mockito.when(_mailbox2.receive()).thenReturn(OperatorTestUtil.block(inSchema, expRow));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.HASH_DISTRIBUTED, toHost, toPort, jobId, stageId, null);
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    List<Object[]> resultRows = receivedBlock.getContainer();
-    Assert.assertEquals(resultRows.size(), 1);
-    Assert.assertEquals(resultRows.get(0), expRow);
+  public void shouldReceiveSingletonMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    Object[] row = new Object[]{1, 1};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1)) {
+      List<Object[]> actualRows = receiveOp.nextBlock().getContainer();
+      assertEquals(actualRows.size(), 1);
+      assertEquals(actualRows.get(0), row);
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
   }
 
   @Test
-  public void shouldReceiveMailboxFromTwoServersOneNull()
-      throws Exception {
-    String server1Host = "hash1";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(server1Host);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    String server2Host = "hash2";
-    int server2Port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(server2Host);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2Port);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    JsonMailboxIdentifier expectedMailboxId1 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server1Host, server1Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId1)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox.receive()).thenReturn(null);
-
-    JsonMailboxIdentifier expectedMailboxId2 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server2Host, server2Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId2)).thenReturn(_mailbox2);
-    Mockito.when(_mailbox2.isClosed()).thenReturn(false);
-    Object[] expRow = new Object[]{1, 1};
-    DataSchema inSchema = new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
-    Mockito.when(_mailbox2.receive()).thenReturn(OperatorTestUtil.block(inSchema, expRow));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.HASH_DISTRIBUTED, toHost, toPort, jobId, stageId, null);
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    List<Object[]> resultRows = receivedBlock.getContainer();
-    Assert.assertEquals(resultRows.size(), 1);
-    Assert.assertEquals(resultRows.get(0), expRow);
+  public void shouldReceiveSingletonErrorMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    String errorMessage = "TEST ERROR";
+    when(_mailbox1.poll()).thenReturn(
+        TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException(errorMessage)));
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, 1)) {
+      TransferableBlock block = receiveOp.nextBlock();
+      assertTrue(block.isErrorBlock());
+      assertTrue(block.getDataBlock().getExceptions().get(QueryException.UNKNOWN_ERROR_CODE).contains(errorMessage));
+    }
   }
 
   @Test
-  public void shouldReceiveMailboxFromTwoServers()
-      throws Exception {
-    String server1Host = "hash1";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(server1Host);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    String server2Host = "hash2";
-    int server2Port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(server2Host);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2Port);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    DataSchema inSchema = new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
-    JsonMailboxIdentifier expectedMailboxId1 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server1Host, server1Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId1)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Object[] expRow1 = new Object[]{1, 1};
-    Object[] expRow2 = new Object[]{2, 2};
-    Mockito.when(_mailbox.receive())
-        .thenReturn(OperatorTestUtil.block(inSchema, expRow1), OperatorTestUtil.block(inSchema, expRow2),
-            TransferableBlockUtils.getEndOfStreamTransferableBlock());
-
-    Object[] expRow3 = new Object[]{3, 3};
-    JsonMailboxIdentifier expectedMailboxId2 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server2Host, server2Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId2)).thenReturn(_mailbox2);
-    Mockito.when(_mailbox2.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox2.receive()).thenReturn(OperatorTestUtil.block(inSchema, expRow3));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.HASH_DISTRIBUTED, toHost, toPort, jobId, stageId, null);
-    // Receive first block from first server.
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    List<Object[]> resultRows = receivedBlock.getContainer();
-    Assert.assertEquals(resultRows.size(), 1);
-    Assert.assertEquals(resultRows.get(0), expRow1);
-    // Receive second block from first server.
-    receivedBlock = receiveOp.nextBlock();
-    resultRows = receivedBlock.getContainer();
-    Assert.assertEquals(resultRows.size(), 1);
-    Assert.assertEquals(resultRows.get(0), expRow2);
-
-    // Receive from second server.
-    receivedBlock = receiveOp.nextBlock();
-    resultRows = receivedBlock.getContainer();
-    Assert.assertEquals(resultRows.size(), 1);
-    Assert.assertEquals(resultRows.get(0), expRow3);
+  public void shouldReceiveMailboxFromTwoServersOneNull() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailbox1.poll()).thenReturn(null, TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row = new Object[]{1, 1};
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.HASH_DISTRIBUTED,
+        1)) {
+      List<Object[]> actualRows = receiveOp.nextBlock().getContainer();
+      assertEquals(actualRows.size(), 1);
+      assertEquals(actualRows.get(0), row);
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
   }
 
   @Test
-  public void shouldGetReceptionReceiveErrorMailbox()
-      throws Exception {
-    String server1Host = "hash1";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(server1Host);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    String server2Host = "hash2";
-    int server2Port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(server2Host);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2Port);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    DataSchema inSchema = new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
-    JsonMailboxIdentifier expectedMailboxId1 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server1Host, server1Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId1)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox.receive())
-        .thenReturn(TransferableBlockUtils.getErrorTransferableBlock(new Exception("mailboxError")));
-
-    Object[] expRow3 = new Object[]{3, 3};
-    JsonMailboxIdentifier expectedMailboxId2 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server2Host, server2Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId2)).thenReturn(_mailbox2);
-    Mockito.when(_mailbox2.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox2.receive()).thenReturn(OperatorTestUtil.block(inSchema, expRow3));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.HASH_DISTRIBUTED, toHost, toPort, jobId, stageId, null);
-    // Receive error block from first server.
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    Assert.assertTrue(receivedBlock.isErrorBlock());
-    MetadataBlock error = (MetadataBlock) receivedBlock.getDataBlock();
-    Assert.assertTrue(error.getExceptions().get(QueryException.UNKNOWN_ERROR_CODE).contains("mailboxError"));
+  public void shouldReceiveMailboxFromTwoServers() {
+    Object[] row1 = new Object[]{1, 1};
+    Object[] row2 = new Object[]{2, 2};
+    Object[] row3 = new Object[]{3, 3};
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        OperatorTestUtil.block(DATA_SCHEMA, row3), TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row2),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.HASH_DISTRIBUTED,
+        1)) {
+      // Receive first block from server1
+      assertEquals(receiveOp.nextBlock().getContainer().get(0), row1);
+      // Receive second block from server2
+      assertEquals(receiveOp.nextBlock().getContainer().get(0), row2);
+      // Receive third block from server1
+      assertEquals(receiveOp.nextBlock().getContainer().get(0), row3);
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
   }
 
   @Test
-  public void shouldThrowReceiveWhenOneServerReceiveThrowException()
-      throws Exception {
-    String server1Host = "hash1";
-    int server1Port = 123;
-    Mockito.when(_server1.getHostname()).thenReturn(server1Host);
-    Mockito.when(_server1.getQueryMailboxPort()).thenReturn(server1Port);
-
-    String server2Host = "hash2";
-    int server2Port = 456;
-    Mockito.when(_server2.getHostname()).thenReturn(server2Host);
-    Mockito.when(_server2.getQueryMailboxPort()).thenReturn(server2Port);
-
-    int jobId = 456;
-    int stageId = 0;
-    int toPort = 8888;
-    String toHost = "toHost";
-
-    DataSchema inSchema = new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
-    JsonMailboxIdentifier expectedMailboxId1 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server1Host, server1Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId1)).thenReturn(_mailbox);
-    Mockito.when(_mailbox.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox.receive()).thenThrow(new Exception("mailboxError"));
-
-    Object[] expRow3 = new Object[]{3, 3};
-    JsonMailboxIdentifier expectedMailboxId2 =
-        new JsonMailboxIdentifier(String.format("%s_%s", jobId, stageId),
-            new ServerAddress(server2Host, server2Port),
-            new ServerAddress(toHost, toPort));
-    Mockito.when(_mailboxService.getReceivingMailbox(expectedMailboxId2)).thenReturn(_mailbox2);
-    Mockito.when(_mailbox2.isClosed()).thenReturn(false);
-    Mockito.when(_mailbox2.receive()).thenReturn(OperatorTestUtil.block(inSchema, expRow3));
-    MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(_mailboxService, ImmutableList.of(_server1, _server2),
-        RelDistribution.Type.HASH_DISTRIBUTED, toHost, toPort, jobId, stageId, null);
-    TransferableBlock receivedBlock = receiveOp.nextBlock();
-    Assert.assertTrue(receivedBlock.isErrorBlock(), "server-1 should have returned an error-block");
+  public void shouldGetReceptionReceiveErrorMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    String errorMessage = "TEST ERROR";
+    when(_mailbox1.poll()).thenReturn(
+        TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException(errorMessage)));
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row = new Object[]{3, 3};
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (MailboxReceiveOperator receiveOp = new MailboxReceiveOperator(context, RelDistribution.Type.HASH_DISTRIBUTED,
+        1)) {
+      TransferableBlock block = receiveOp.nextBlock();
+      assertTrue(block.isErrorBlock());
+      assertTrue(block.getDataBlock().getExceptions().get(QueryException.UNKNOWN_ERROR_CODE).contains(errorMessage));
+    }
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxSendOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxSendOperatorTest.java
index b616efcf912..c35714aa166 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxSendOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MailboxSendOperatorTest.java
@@ -18,49 +18,59 @@
  */
 package org.apache.pinot.query.runtime.operator;
 
-import com.google.common.collect.ImmutableList;
-import java.util.Arrays;
-import org.apache.calcite.rel.RelDistribution;
-import org.apache.pinot.common.datablock.DataBlock;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import org.apache.pinot.common.utils.DataSchema;
-import org.apache.pinot.core.transport.ServerInstance;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
 import org.apache.pinot.query.mailbox.MailboxService;
-import org.apache.pinot.query.planner.partitioning.KeySelector;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.apache.pinot.query.runtime.operator.exchange.BlockExchange;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
+
+
 public class MailboxSendOperatorTest {
+  private static final int SENDER_STAGE_ID = 1;
 
   private AutoCloseable _mocks;
 
   @Mock
-  private MultiStageOperator _input;
-  @Mock
-  private MailboxService<TransferableBlock> _mailboxService;
+  private VirtualServerAddress _server;
   @Mock
-  private ServerInstance _server;
+  private MultiStageOperator _sourceOperator;
   @Mock
-  private KeySelector<Object[], Object[]> _selector;
-  @Mock
-  private MailboxSendOperator.BlockExchangeFactory _exchangeFactory;
+  private MailboxService _mailboxService;
   @Mock
   private BlockExchange _exchange;
 
   @BeforeMethod
-  public void setUp() {
+  public void setUp()
+      throws Exception {
     _mocks = MockitoAnnotations.openMocks(this);
-    Mockito.when(_exchangeFactory.build(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
-        .thenReturn(_exchange);
+    when(_server.hostname()).thenReturn("mock");
+    when(_server.port()).thenReturn(0);
+    when(_server.workerId()).thenReturn(0);
+    when(_exchange.offerBlock(any(), anyLong())).thenReturn(true);
   }
 
   @AfterMethod
@@ -70,98 +80,111 @@ public void tearDown()
   }
 
   @Test
-  public void shouldSwallowNoOpBlockFromUpstream() {
+  public void shouldSwallowNoOpBlockFromUpstream()
+      throws Exception {
     // Given:
-    MailboxSendOperator operator = new MailboxSendOperator(
-        _mailboxService, _input, ImmutableList.of(_server), RelDistribution.Type.HASH_DISTRIBUTED, _selector,
-        server -> new JsonMailboxIdentifier("123", "from:1", "to:2"), _exchangeFactory, 1, 2);
-    Mockito.when(_input.nextBlock())
-        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
+    when(_sourceOperator.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
 
     // When:
-    TransferableBlock block = operator.nextBlock();
+    TransferableBlock block = getMailboxSendOperator().nextBlock();
 
     // Then:
-    Assert.assertTrue(block.isNoOpBlock(), "expected noop block to propagate");
-    Mockito.verify(_exchange, Mockito.never()).send(Mockito.any());
+    assertTrue(block.isNoOpBlock(), "expected noop block to propagate");
+    verify(_exchange, never()).offerBlock(any(), anyLong());
   }
 
   @Test
-  public void shouldSendErrorBlock() {
+  public void shouldSendErrorBlock()
+      throws Exception {
     // Given:
-    MailboxSendOperator operator = new MailboxSendOperator(
-        _mailboxService, _input, ImmutableList.of(_server), RelDistribution.Type.HASH_DISTRIBUTED, _selector,
-        server -> new JsonMailboxIdentifier("123", "from:1", "to:2"), _exchangeFactory, 1, 2);
-    TransferableBlock errorBlock = TransferableBlockUtils.getErrorTransferableBlock(new Exception("foo!"));
-    Mockito.when(_input.nextBlock())
-        .thenReturn(errorBlock);
+    TransferableBlock errorBlock = TransferableBlockUtils.getErrorTransferableBlock(new Exception("TEST ERROR"));
+    when(_sourceOperator.nextBlock()).thenReturn(errorBlock);
 
     // When:
-    TransferableBlock block = operator.nextBlock();
+    TransferableBlock block = getMailboxSendOperator().nextBlock();
 
     // Then:
-    Assert.assertTrue(block.isErrorBlock(), "expected error block to propagate");
-    Mockito.verify(_exchange).send(errorBlock);
+    assertSame(block, errorBlock, "expected error block to propagate");
+    verify(_exchange).offerBlock(eq(errorBlock), anyLong());
   }
 
   @Test
-  public void shouldSendErrorBlockWhenInputThrows() {
+  public void shouldSendErrorBlockWhenInputThrows()
+      throws Exception {
     // Given:
-    MailboxSendOperator operator = new MailboxSendOperator(
-        _mailboxService, _input, ImmutableList.of(_server), RelDistribution.Type.HASH_DISTRIBUTED, _selector,
-        server -> new JsonMailboxIdentifier("123", "from:1", "to:2"), _exchangeFactory, 1, 2);
-    Mockito.when(_input.nextBlock())
-        .thenThrow(new RuntimeException("foo!"));
-    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
+    when(_sourceOperator.nextBlock()).thenThrow(new RuntimeException("TEST ERROR"));
 
     // When:
-    TransferableBlock block = operator.nextBlock();
+    TransferableBlock block = getMailboxSendOperator().nextBlock();
 
     // Then:
-    Assert.assertTrue(block.isErrorBlock(), "expected error block when input throws error");
-    Mockito.verify(_exchange).send(captor.capture());
-    Assert.assertTrue(captor.getValue().isErrorBlock(), "expected to send error block to exchange");
+    assertTrue(block.isErrorBlock(), "expected error block to propagate");
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
+    verify(_exchange).offerBlock(captor.capture(), anyLong());
+    assertTrue(captor.getValue().isErrorBlock(), "expected to send error block to exchange");
   }
 
   @Test
-  public void shouldSendEosBlock() {
+  public void shouldSendEosBlock()
+      throws Exception {
     // Given:
-    MailboxSendOperator operator = new MailboxSendOperator(
-        _mailboxService, _input, ImmutableList.of(_server), RelDistribution.Type.HASH_DISTRIBUTED, _selector,
-        server -> new JsonMailboxIdentifier("123", "from:1", "to:2"), _exchangeFactory, 1, 2);
     TransferableBlock eosBlock = TransferableBlockUtils.getEndOfStreamTransferableBlock();
-    Mockito.when(_input.nextBlock())
-        .thenReturn(eosBlock);
+    when(_sourceOperator.nextBlock()).thenReturn(eosBlock);
 
     // When:
-    TransferableBlock block = operator.nextBlock();
+    TransferableBlock block = getMailboxSendOperator().nextBlock();
 
     // Then:
-    Assert.assertTrue(block.isEndOfStreamBlock(), "expected EOS block to propagate");
-    Mockito.verify(_exchange).send(eosBlock);
+    assertSame(block, eosBlock, "expected EOS block to propagate");
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
+    verify(_exchange).offerBlock(captor.capture(), anyLong());
+    assertTrue(captor.getValue().isSuccessfulEndOfStreamBlock(), "expected to send EOS block to exchange");
   }
 
   @Test
-  public void shouldSendDataBlock() {
+  public void shouldSendDataBlock()
+      throws Exception {
     // Given:
-    MailboxSendOperator operator = new MailboxSendOperator(
-        _mailboxService, _input, ImmutableList.of(_server), RelDistribution.Type.HASH_DISTRIBUTED, _selector,
-        server -> new JsonMailboxIdentifier("123", "from:1", "to:2"), _exchangeFactory, 1, 2);
-    TransferableBlock dataBlock = block(new DataSchema(new String[]{}, new DataSchema.ColumnDataType[]{}));
-    Mockito.when(_input.nextBlock())
-        .thenReturn(dataBlock)
-        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
+    TransferableBlock dataBlock =
+        OperatorTestUtil.block(new DataSchema(new String[]{}, new DataSchema.ColumnDataType[]{}));
+    TransferableBlock eosBlock = TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    when(_sourceOperator.nextBlock()).thenReturn(dataBlock).thenReturn(dataBlock).thenReturn(eosBlock);
+    when(_exchange.getRemainingCapacity()).thenReturn(1).thenReturn(0).thenReturn(0);
 
+    MailboxSendOperator mailboxSendOperator = getMailboxSendOperator();
     // When:
-    operator.nextBlock();
+    TransferableBlock block = mailboxSendOperator.nextBlock();
+    // Then:
+    assertSame(block, dataBlock, "expected data block to propagate first");
 
+    // When:
+    block = mailboxSendOperator.nextBlock();
+    // Then:
+    assertTrue(block.isNoOpBlock(), "expected No-op block to propagate next b/c remaining capacity is 0.");
+
+    // When:
+    block = mailboxSendOperator.nextBlock();
     // Then:
+    assertSame(block, eosBlock, "expected EOS block to propagate next even if capacity is now 0.");
     ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
-    Mockito.verify(_exchange).send(captor.capture());
-    Assert.assertSame(captor.getValue().getType(), DataBlock.Type.ROW, "expected data block to propagate");
+    verify(_exchange, times(3)).offerBlock(captor.capture(), anyLong());
+    List<TransferableBlock> blocks = captor.getAllValues();
+    assertSame(blocks.get(0), dataBlock, "expected to send data block to exchange");
+    assertTrue(blocks.get(2).isSuccessfulEndOfStreamBlock(), "expected to send EOS block to exchange");
+
+    // EOS block should contain statistics
+    Map<String, OperatorStats> resultMetadata = blocks.get(2).getResultMetadata();
+    assertEquals(resultMetadata.size(), 1);
+    assertTrue(resultMetadata.containsKey(mailboxSendOperator.getOperatorId()));
   }
 
-  private static TransferableBlock block(DataSchema schema, Object[]... rows) {
-    return new TransferableBlock(Arrays.asList(rows), schema, DataBlock.Type.ROW);
+  private MailboxSendOperator getMailboxSendOperator() {
+    StageMetadata stageMetadata = new StageMetadata.Builder()
+        .setWorkerMetadataList(Collections.singletonList(
+            new WorkerMetadata.Builder().setVirtualServerAddress(_server).build())).build();
+    OpChainExecutionContext context =
+        new OpChainExecutionContext(_mailboxService, 0, SENDER_STAGE_ID, _server, Long.MAX_VALUE,
+            stageMetadata, null, false);
+    return new MailboxSendOperator(context, _sourceOperator, _exchange, null, null, false);
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MinusOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MinusOperatorTest.java
new file mode 100644
index 00000000000..53e81612ad6
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/MinusOperatorTest.java
@@ -0,0 +1,121 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+public class MinusOperatorTest {
+  private AutoCloseable _mocks;
+
+  @Mock
+  private MultiStageOperator _leftOperator;
+
+  @Mock
+  private MultiStageOperator _rightOperator;
+
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void testExceptOperator() {
+    DataSchema schema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
+        DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
+    });
+    Mockito.when(_leftOperator.nextBlock())
+        .thenReturn(OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "CC"},
+            new Object[]{4, "DD"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    Mockito.when(_rightOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{5, "EE"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    MinusOperator minusOperator =
+        new MinusOperator(OperatorTestUtil.getDefaultContext(), ImmutableList.of(_leftOperator, _rightOperator),
+            schema);
+
+    TransferableBlock result = minusOperator.nextBlock();
+    while (result.getType() != DataBlock.Type.ROW) {
+      result = minusOperator.nextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows = Arrays.asList(new Object[]{3, "CC"}, new Object[]{4, "DD"});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    for (int i = 0; i < resultRows.size(); i++) {
+      Assert.assertEquals(resultRows.get(i), expectedRows.get(i));
+    }
+  }
+
+  @Test
+  public void testDedup() {
+    DataSchema schema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
+        DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
+    });
+    Mockito.when(_leftOperator.nextBlock())
+        .thenReturn(OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "CC"},
+            new Object[]{4, "DD"}, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "CC"},
+            new Object[]{4, "DD"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    Mockito.when(_rightOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{5, "EE"},
+                new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{5, "EE"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    MinusOperator minusOperator =
+        new MinusOperator(OperatorTestUtil.getDefaultContext(), ImmutableList.of(_leftOperator, _rightOperator),
+            schema);
+
+    TransferableBlock result = minusOperator.nextBlock();
+    while (result.getType() != DataBlock.Type.ROW) {
+      result = minusOperator.nextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows = Arrays.asList(new Object[]{3, "CC"}, new Object[]{4, "DD"});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    for (int i = 0; i < resultRows.size(); i++) {
+      Assert.assertEquals(resultRows.get(i), expectedRows.get(i));
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OpChainTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OpChainTest.java
new file mode 100644
index 00000000000..e7fdb70f3b3
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OpChainTest.java
@@ -0,0 +1,362 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.core.operator.blocks.InstanceResponseBlock;
+import org.apache.pinot.core.operator.blocks.results.SelectionResultsBlock;
+import org.apache.pinot.core.query.request.ServerQueryRequest;
+import org.apache.pinot.core.query.request.context.QueryContext;
+import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.mailbox.ReceivingMailbox;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.physical.MailboxIdUtils;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.exchange.BlockExchange;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+
+public class OpChainTest {
+  private static int _numOperatorsInitialized = 0;
+  private final List<TransferableBlock> _blockList = new ArrayList<>();
+
+  private AutoCloseable _mocks;
+  @Mock
+  private MultiStageOperator _sourceOperator;
+  @Mock
+  private MailboxService _mailboxService1;
+  @Mock
+  private ReceivingMailbox _mailbox1;
+  @Mock
+  private MailboxService _mailboxService2;
+  @Mock
+  private ReceivingMailbox _mailbox2;
+  @Mock
+  private BlockExchange _exchange;
+
+  private VirtualServerAddress _serverAddress;
+  private StageMetadata _receivingStageMetadata;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    _serverAddress = new VirtualServerAddress("localhost", 123, 0);
+    _receivingStageMetadata = new StageMetadata.Builder().setWorkerMetadataList(Stream.of(_serverAddress).map(
+        s -> new WorkerMetadata.Builder().setVirtualServerAddress(s).addMailBoxInfoMap(0,
+            new MailboxMetadata(ImmutableList.of(MailboxIdUtils.toPlanMailboxId(0, 0, 0, 0)), ImmutableList.of(s),
+                ImmutableMap.of())).addMailBoxInfoMap(1,
+            new MailboxMetadata(ImmutableList.of(MailboxIdUtils.toPlanMailboxId(0, 0, 0, 0)), ImmutableList.of(s),
+                ImmutableMap.of())).addMailBoxInfoMap(2,
+            new MailboxMetadata(ImmutableList.of(MailboxIdUtils.toPlanMailboxId(0, 0, 0, 0)), ImmutableList.of(s),
+                ImmutableMap.of())).build()).collect(Collectors.toList())).build();
+
+    when(_mailboxService1.getReceivingMailbox(any())).thenReturn(_mailbox1);
+    when(_mailboxService2.getReceivingMailbox(any())).thenReturn(_mailbox2);
+
+    try {
+      doAnswer(invocation -> {
+        TransferableBlock arg = invocation.getArgument(0);
+        _blockList.add(arg);
+        return true;
+      }).when(_exchange).offerBlock(any(TransferableBlock.class), anyLong());
+      when(_exchange.getRemainingCapacity()).thenReturn(1);
+      when(_mailbox2.poll()).then(x -> {
+        if (_blockList.isEmpty()) {
+          return TransferableBlockUtils.getNoOpTransferableBlock();
+        }
+        return _blockList.remove(0);
+      });
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void testExecutionTimerStats() {
+    when(_sourceOperator.nextBlock()).then(x -> {
+      Thread.sleep(100);
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    });
+    OpChain opChain = new OpChain(OperatorTestUtil.getDefaultContext(), _sourceOperator, new ArrayList<>());
+    opChain.getStats().executing();
+    opChain.getRoot().nextBlock();
+    opChain.getStats().queued();
+    assertTrue(opChain.getStats().getExecutionTime() >= 100);
+
+    when(_sourceOperator.nextBlock()).then(x -> {
+      Thread.sleep(20);
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    });
+    opChain = new OpChain(OperatorTestUtil.getDefaultContext(), _sourceOperator, new ArrayList<>());
+    opChain.getStats().executing();
+    opChain.getRoot().nextBlock();
+    opChain.getStats().queued();
+    assertTrue(opChain.getStats().getExecutionTime() >= 20);
+    assertTrue(opChain.getStats().getExecutionTime() < 100);
+  }
+
+  @Test
+  public void testStatsCollectionTracingEnabled() {
+    OpChainExecutionContext context = OperatorTestUtil.getDefaultContext();
+    DummyMultiStageOperator dummyMultiStageOperator = new DummyMultiStageOperator(context);
+
+    OpChain opChain = new OpChain(context, dummyMultiStageOperator, new ArrayList<>());
+    opChain.getStats().executing();
+    opChain.getRoot().nextBlock();
+    opChain.getStats().queued();
+
+    assertTrue(opChain.getStats().getExecutionTime() >= 1000);
+    assertEquals(opChain.getStats().getOperatorStatsMap().size(), 1);
+    assertTrue(opChain.getStats().getOperatorStatsMap().containsKey(dummyMultiStageOperator.getOperatorId()));
+
+    Map<String, String> executionStats =
+        opChain.getStats().getOperatorStatsMap().get(dummyMultiStageOperator.getOperatorId()).getExecutionStats();
+    assertTrue(Long.parseLong(executionStats.get(DataTable.MetadataKey.OPERATOR_EXECUTION_TIME_MS.getName())) >= 1000);
+    assertTrue(Long.parseLong(executionStats.get(DataTable.MetadataKey.OPERATOR_EXECUTION_TIME_MS.getName())) <= 2000);
+  }
+
+  @Test
+  public void testStatsCollectionTracingDisabled() {
+    OpChainExecutionContext context = OperatorTestUtil.getDefaultContextWithTracingDisabled();
+    DummyMultiStageOperator dummyMultiStageOperator = new DummyMultiStageOperator(context);
+
+    OpChain opChain = new OpChain(context, dummyMultiStageOperator, new ArrayList<>());
+    opChain.getStats().executing();
+    opChain.getRoot().nextBlock();
+    opChain.getStats().queued();
+
+    assertTrue(opChain.getStats().getExecutionTime() >= 1000);
+    assertEquals(opChain.getStats().getOperatorStatsMap().size(), 0);
+  }
+
+  @Test
+  public void testStatsCollectionTracingEnabledMultipleOperators() {
+    long dummyOperatorWaitTime = 1000L;
+
+    int receivedStageId = 2;
+    int senderStageId = 1;
+    OpChainExecutionContext context = new OpChainExecutionContext(_mailboxService1, 1, senderStageId, _serverAddress,
+        System.currentTimeMillis() + 1000, _receivingStageMetadata, null, true);
+
+    Stack<MultiStageOperator> operators =
+        getFullOpchain(receivedStageId, senderStageId, context, dummyOperatorWaitTime);
+
+    OpChain opChain = new OpChain(context, operators.peek(), new ArrayList<>());
+    opChain.getStats().executing();
+    while (!opChain.getRoot().nextBlock().isEndOfStreamBlock()) {
+      // Drain the opchain
+    }
+    opChain.getStats().queued();
+
+    OpChainExecutionContext secondStageContext =
+        new OpChainExecutionContext(_mailboxService2, 1, senderStageId + 1, _serverAddress,
+            System.currentTimeMillis() + 1000, _receivingStageMetadata, null, true);
+
+    MailboxReceiveOperator secondStageReceiveOp =
+        new MailboxReceiveOperator(secondStageContext, RelDistribution.Type.BROADCAST_DISTRIBUTED, senderStageId + 1);
+
+    assertTrue(opChain.getStats().getExecutionTime() >= dummyOperatorWaitTime);
+    int numOperators = operators.size();
+    assertEquals(opChain.getStats().getOperatorStatsMap().size(), numOperators);
+    while (!operators.isEmpty()) {
+      assertTrue(opChain.getStats().getOperatorStatsMap().containsKey(operators.pop().getOperatorId()));
+    }
+
+    while (!secondStageReceiveOp.nextBlock().isEndOfStreamBlock()) {
+      // Drain the mailbox
+    }
+    assertEquals(secondStageContext.getStats().getOperatorStatsMap().size(), numOperators + 1);
+  }
+
+  @Test
+  public void testStatsCollectionTracingDisableMultipleOperators() {
+    long dummyOperatorWaitTime = 1000L;
+
+    int receivedStageId = 2;
+    int senderStageId = 1;
+    OpChainExecutionContext context = new OpChainExecutionContext(_mailboxService1, 1, senderStageId, _serverAddress,
+        System.currentTimeMillis() + 1000, _receivingStageMetadata, null, false);
+
+    Stack<MultiStageOperator> operators =
+        getFullOpchain(receivedStageId, senderStageId, context, dummyOperatorWaitTime);
+
+    OpChain opChain = new OpChain(context, operators.peek(), new ArrayList<>());
+    opChain.getStats().executing();
+    opChain.getRoot().nextBlock();
+    opChain.getStats().queued();
+
+    OpChainExecutionContext secondStageContext =
+        new OpChainExecutionContext(_mailboxService2, 1, senderStageId + 1, _serverAddress,
+            System.currentTimeMillis() + 1000, _receivingStageMetadata, null, false);
+    MailboxReceiveOperator secondStageReceiveOp =
+        new MailboxReceiveOperator(secondStageContext, RelDistribution.Type.BROADCAST_DISTRIBUTED, senderStageId);
+
+    assertTrue(opChain.getStats().getExecutionTime() >= dummyOperatorWaitTime);
+    assertEquals(opChain.getStats().getOperatorStatsMap().size(), 2);
+    assertTrue(opChain.getStats().getOperatorStatsMap().containsKey(operators.pop().getOperatorId()));
+
+    while (!secondStageReceiveOp.nextBlock().isEndOfStreamBlock()) {
+      // Drain the mailbox
+    }
+
+    while (!operators.isEmpty()) {
+      MultiStageOperator operator = operators.pop();
+      if (operator.toExplainString().contains("SEND") || operator.toExplainString().contains("LEAF")) {
+        assertTrue(opChain.getStats().getOperatorStatsMap().containsKey(operator.getOperatorId()));
+      }
+    }
+    assertEquals(secondStageContext.getStats().getOperatorStatsMap().size(), 2);
+  }
+
+  private Stack<MultiStageOperator> getFullOpchain(int receivedStageId, int senderStageId,
+      OpChainExecutionContext context, long waitTimeInMillis) {
+    Stack<MultiStageOperator> operators = new Stack<>();
+    DataSchema upStreamSchema =
+        new DataSchema(new String[]{"intCol"}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT});
+    //Mailbox Receive Operator
+    try {
+      when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(upStreamSchema, new Object[]{1}),
+          TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    } catch (Exception e) {
+      fail("Exception while mocking mailbox receive: " + e.getMessage());
+    }
+
+    QueryContext queryContext = QueryContextConverterUtils.getQueryContext("SELECT intCol FROM tbl");
+    List<InstanceResponseBlock> resultsBlockList = Collections.singletonList(new InstanceResponseBlock(
+        new SelectionResultsBlock(upStreamSchema, Arrays.asList(new Object[]{1}, new Object[]{2})), queryContext));
+    LeafStageTransferableBlockOperator leafOp = new LeafStageTransferableBlockOperator(context,
+        LeafStageTransferableBlockOperatorTest.getStaticBlockProcessor(resultsBlockList),
+        Collections.singletonList(mock(ServerQueryRequest.class)), upStreamSchema);
+
+    //Transform operator
+    RexExpression.InputRef ref0 = new RexExpression.InputRef(0);
+    TransformOperator transformOp =
+        new TransformOperator(context, leafOp, upStreamSchema, Collections.singletonList(ref0), upStreamSchema);
+
+    //Filter operator
+    RexExpression booleanLiteral = new RexExpression.Literal(FieldSpec.DataType.BOOLEAN, true);
+    FilterOperator filterOp = new FilterOperator(context, transformOp, upStreamSchema, booleanLiteral);
+
+    // Dummy operator
+    MultiStageOperator dummyWaitOperator = new DummyMultiStageCallableOperator(context, filterOp, waitTimeInMillis);
+
+    //Mailbox Send operator
+    MailboxSendOperator sendOperator =
+        new MailboxSendOperator(context, dummyWaitOperator, _exchange, null, null, false);
+
+    operators.push(leafOp);
+    operators.push(transformOp);
+    operators.push(filterOp);
+    operators.push(dummyWaitOperator);
+    operators.push(sendOperator);
+    return operators;
+  }
+
+  static class DummyMultiStageOperator extends MultiStageOperator {
+
+    public DummyMultiStageOperator(OpChainExecutionContext context) {
+      super(context);
+    }
+
+    @Override
+    protected TransferableBlock getNextBlock() {
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        // IGNORE
+      }
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    }
+
+    @Nullable
+    @Override
+    public String toExplainString() {
+      return "DUMMY";
+    }
+  }
+
+  static class DummyMultiStageCallableOperator extends MultiStageOperator {
+    private final MultiStageOperator _upstream;
+    private final long _sleepTimeInMillis;
+
+    public DummyMultiStageCallableOperator(OpChainExecutionContext context, MultiStageOperator upstream,
+        long sleepTimeInMillis) {
+      super(context);
+      _upstream = upstream;
+      _sleepTimeInMillis = sleepTimeInMillis;
+    }
+
+    @Override
+    protected TransferableBlock getNextBlock() {
+      try {
+        Thread.sleep(_sleepTimeInMillis);
+        _upstream.nextBlock();
+      } catch (InterruptedException e) {
+        // IGNORE
+      }
+      return TransferableBlockUtils.getEndOfStreamTransferableBlock();
+    }
+
+    @Nullable
+    @Override
+    public String toExplainString() {
+      return "DUMMY_" + _numOperatorsInitialized++;
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OperatorTestUtil.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OperatorTestUtil.java
index 39921e324d9..55878658f7c 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OperatorTestUtil.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/OperatorTestUtil.java
@@ -18,19 +18,26 @@
  */
 package org.apache.pinot.query.runtime.operator;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import org.apache.pinot.common.datablock.DataBlock;
 import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.operator.utils.OperatorUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
 import org.apache.pinot.query.testutils.MockDataBlockOperatorFactory;
 
 
 public class OperatorTestUtil {
   // simple key-value collision schema/data test set: "Aa" and "BB" have same hash code in java.
-  private static final List<List<Object[]>> SIMPLE_KV_DATA_ROWS = Arrays.asList(
-      Arrays.asList(new Object[]{1, "Aa"}, new Object[]{2, "BB"}, new Object[]{3, "BB"}),
-      Arrays.asList(new Object[]{1, "AA"}, new Object[]{2, "Aa"}));
+  private static final List<List<Object[]>> SIMPLE_KV_DATA_ROWS =
+      Arrays.asList(Arrays.asList(new Object[]{1, "Aa"}, new Object[]{2, "BB"}, new Object[]{3, "BB"}),
+          Arrays.asList(new Object[]{1, "AA"}, new Object[]{2, "Aa"}));
   private static final MockDataBlockOperatorFactory MOCK_OPERATOR_FACTORY;
 
   public static final DataSchema SIMPLE_KV_DATA_SCHEMA = new DataSchema(new String[]{"foo", "bar"},
@@ -39,11 +46,15 @@ public class OperatorTestUtil {
   public static final String OP_1 = "op1";
   public static final String OP_2 = "op2";
 
+  public static Map<String, String> getDummyStats(long requestId, int stageId, VirtualServerAddress serverAddress) {
+    OperatorStats operatorStats = new OperatorStats(requestId, stageId, serverAddress);
+    String statsId = new OpChainId(requestId, serverAddress.workerId(), stageId).toString();
+    return OperatorUtils.getMetadataFromOperatorStats(ImmutableMap.of(statsId, operatorStats));
+  }
+
   static {
-    MOCK_OPERATOR_FACTORY = new MockDataBlockOperatorFactory()
-        .registerOperator(OP_1, SIMPLE_KV_DATA_SCHEMA)
-        .registerOperator(OP_2, SIMPLE_KV_DATA_SCHEMA)
-        .addRows(OP_1, SIMPLE_KV_DATA_ROWS.get(0))
+    MOCK_OPERATOR_FACTORY = new MockDataBlockOperatorFactory().registerOperator(OP_1, SIMPLE_KV_DATA_SCHEMA)
+        .registerOperator(OP_2, SIMPLE_KV_DATA_SCHEMA).addRows(OP_1, SIMPLE_KV_DATA_ROWS.get(0))
         .addRows(OP_2, SIMPLE_KV_DATA_ROWS.get(1));
   }
 
@@ -61,4 +72,25 @@ public static DataSchema getDataSchema(String operatorName) {
   public static TransferableBlock block(DataSchema schema, Object[]... rows) {
     return new TransferableBlock(Arrays.asList(rows), schema, DataBlock.Type.ROW);
   }
+
+  public static OpChainExecutionContext getOpChainContext(MailboxService mailboxService,
+      VirtualServerAddress receiverAddress, long deadlineMs, StageMetadata stageMetadata) {
+    return new OpChainExecutionContext(mailboxService, 0, 0, receiverAddress, deadlineMs, stageMetadata, null, false);
+  }
+
+  public static OpChainExecutionContext getDefaultContext() {
+    VirtualServerAddress virtualServerAddress = new VirtualServerAddress("mock", 80, 0);
+    return new OpChainExecutionContext(null, 1, 2, virtualServerAddress, Long.MAX_VALUE, null, null, true);
+  }
+
+  public static OpChainExecutionContext getDefaultContextWithTracingDisabled() {
+    VirtualServerAddress virtualServerAddress = new VirtualServerAddress("mock", 80, 0);
+    return new OpChainExecutionContext(null, 1, 2, virtualServerAddress, Long.MAX_VALUE, null, null, false);
+  }
+
+  public static OpChainExecutionContext getContext(long requestId, int stageId,
+      VirtualServerAddress virtualServerAddress) {
+    return new OpChainExecutionContext(null, requestId, stageId, virtualServerAddress, Long.MAX_VALUE, null, null,
+        true);
+  }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortOperatorTest.java
index b11a00245aa..b450d4b481c 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortOperatorTest.java
@@ -23,9 +23,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
 import org.apache.pinot.common.datablock.DataBlock;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.routing.VirtualServerAddress;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
 import org.mockito.Mock;
@@ -47,9 +49,13 @@ public class SortOperatorTest {
   @Mock
   private MultiStageOperator _input;
 
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
   }
 
   @AfterMethod
@@ -63,8 +69,11 @@ public void shouldHandleUpstreamErrorBlock() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
     Mockito.when(_input.nextBlock())
         .thenReturn(TransferableBlockUtils.getErrorTransferableBlock(new Exception("foo!")));
@@ -81,8 +90,11 @@ public void shouldHandleUpstreamNoOpBlock() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
     Mockito.when(_input.nextBlock()).thenReturn(TransferableBlockUtils.getNoOpTransferableBlock());
 
@@ -98,8 +110,11 @@ public void shouldCreateEmptyBlockOnUpstreamEOS() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
     Mockito.when(_input.nextBlock()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
@@ -115,11 +130,13 @@ public void shouldConsumeAndSortInputOneBlockWithTwoRows() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}, new Object[]{1}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -133,16 +150,45 @@ public void shouldConsumeAndSortInputOneBlockWithTwoRows() {
     Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
   }
 
+  @Test
+  public void shouldConsumeAndSkipSortInputOneBlockWithTwoRowsInputSorted() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, true);
+
+    // Purposefully setting input as unsorted order for validation but 'isInputSorted' should only be true if actually
+    // sorted
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 2);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{2});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{1});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
   @Test
   public void shouldConsumeAndSortOnNonZeroIdxCollation() {
     // Given:
     List<RexExpression> collation = collation(1);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"ignored", "sort"}, new DataSchema.ColumnDataType[]{INT, INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{1, 2}, new Object[]{2, 1}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{1, 2}, new Object[]{2, 1}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -161,11 +207,13 @@ public void shouldConsumeAndSortInputOneBlockWithTwoRowsNonNumeric() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{STRING});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{"b"}, new Object[]{"a"}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{"b"}, new Object[]{"a"}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -184,11 +232,13 @@ public void shouldConsumeAndSortDescending() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.DESCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}, new Object[]{1}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -207,11 +257,39 @@ public void shouldOffsetSortInputOneBlockWithThreeRows() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 1, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 1,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 2);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{2});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{3});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
+  @Test
+  public void shouldOffsetSortInputOneBlockWithThreeRowsInputSorted() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 1,
+            schema, true);
+
+    // Set input rows as sorted since input is expected to be sorted
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{1}, new Object[]{2}, new Object[]{3}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -230,11 +308,13 @@ public void shouldOffsetLimitSortInputOneBlockWithThreeRows() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 1, 1, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 1, 1,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -248,15 +328,42 @@ public void shouldOffsetLimitSortInputOneBlockWithThreeRows() {
   }
 
   @Test
-  public void shouldRespectMaxLimit() {
+  public void shouldOffsetLimitSortInputOneBlockWithThreeRowsInputSorted() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 2, 0, schema, 1, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 1, 1,
+            schema, true);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
+    // Set input rows as sorted since input is expected to be sorted
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{1}, new Object[]{2}, new Object[]{3}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 1);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{2});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
+  @Test
+  public void shouldRespectDefaultLimit() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 0, 0,
+            schema, false, 10, 1);
+
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -274,11 +381,13 @@ public void shouldFetchAllWithNegativeFetch() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, -1, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, -1, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{3}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -295,11 +404,13 @@ public void shouldConsumeAndSortTwoInputBlocksWithOneRowEach() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}))
         .thenReturn(block(schema, new Object[]{1}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
@@ -314,13 +425,43 @@ public void shouldConsumeAndSortTwoInputBlocksWithOneRowEach() {
     Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
   }
 
+  @Test
+  public void shouldConsumeAndSortTwoInputBlocksWithOneRowEachInputSorted() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, true);
+
+    // Set input rows as sorted since input is expected to be sorted
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{1}))
+        .thenReturn(block(schema, new Object[]{2}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 2);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{1});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{2});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
   @Test
   public void shouldBreakTiesUsingSecondCollationKey() {
     // Given:
     List<RexExpression> collation = collation(0, 1);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING, Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST, NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"first", "second"}, new DataSchema.ColumnDataType[]{INT, INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
     Mockito.when(_input.nextBlock())
         .thenReturn(block(schema, new Object[]{1, 2}, new Object[]{1, 1}, new Object[]{1, 3}))
@@ -343,8 +484,11 @@ public void shouldBreakTiesUsingSecondCollationKeyWithDifferentDirection() {
     // Given:
     List<RexExpression> collation = collation(0, 1);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING, Direction.DESCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST, NullDirection.FIRST);
     DataSchema schema = new DataSchema(new String[]{"first", "second"}, new DataSchema.ColumnDataType[]{INT, INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
     Mockito.when(_input.nextBlock())
         .thenReturn(block(schema, new Object[]{1, 2}, new Object[]{1, 1}, new Object[]{1, 3}))
@@ -367,13 +511,42 @@ public void shouldHandleNoOpUpstreamBlockWhileConstructing() {
     // Given:
     List<RexExpression> collation = collation(0);
     List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
     DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
-    SortOperator op = new SortOperator(_input, collation, directions, 10, 0, schema, 1, 2);
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
 
-    Mockito.when(_input.nextBlock())
-        .thenReturn(block(schema, new Object[]{2}))
-        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock())
-        .thenReturn(block(schema, new Object[]{1}))
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}))
+        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock()).thenReturn(block(schema, new Object[]{1}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    op.nextBlock(); // consume up until NOOP, create NOOP
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 2);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{1});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{2});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
+  @Test
+  public void shouldHandleNoOpUpstreamBlockWhileConstructingInputSorted() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, true);
+
+    // Set input rows as sorted since input is expected to be sorted
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{1}))
+        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock()).thenReturn(block(schema, new Object[]{2}))
         .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
 
     // When:
@@ -388,6 +561,85 @@ public void shouldHandleNoOpUpstreamBlockWhileConstructing() {
     Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
   }
 
+  @Test
+  public void shouldHaveNullAtLast() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
+
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{null}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 3);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{1});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{2});
+    Assert.assertEquals(block.getContainer().get(2), new Object[]{null});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
+  @Test
+  public void shouldHaveNullAtFirst() {
+    // Given:
+    List<RexExpression> collation = collation(0);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.FIRST);
+    DataSchema schema = new DataSchema(new String[]{"sort"}, new DataSchema.ColumnDataType[]{INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
+
+    Mockito.when(_input.nextBlock()).thenReturn(block(schema, new Object[]{2}, new Object[]{1}, new Object[]{null}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 3);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{null});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{1});
+    Assert.assertEquals(block.getContainer().get(2), new Object[]{2});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
+  @Test
+  public void shouldHandleMultipleCollationKeysWithNulls() {
+    // Given:
+    List<RexExpression> collation = collation(0, 1);
+    List<Direction> directions = ImmutableList.of(Direction.ASCENDING, Direction.DESCENDING);
+    List<NullDirection> nullDirections = ImmutableList.of(NullDirection.FIRST, NullDirection.LAST);
+    DataSchema schema = new DataSchema(new String[]{"first", "second"}, new DataSchema.ColumnDataType[]{INT, INT});
+    SortOperator op =
+        new SortOperator(OperatorTestUtil.getDefaultContext(), _input, collation, directions, nullDirections, 10, 0,
+            schema, false);
+
+    Mockito.when(_input.nextBlock())
+        .thenReturn(block(schema, new Object[]{1, 1}, new Object[]{1, null}, new Object[]{null, 1}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    // When:
+    TransferableBlock block = op.nextBlock(); // construct
+    TransferableBlock block2 = op.nextBlock(); // eos
+
+    // Then:
+    Assert.assertEquals(block.getNumRows(), 3);
+    Assert.assertEquals(block.getContainer().get(0), new Object[]{null, 1});
+    Assert.assertEquals(block.getContainer().get(1), new Object[]{1, 1});
+    Assert.assertEquals(block.getContainer().get(2), new Object[]{1, null});
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "expected EOS block to propagate");
+  }
+
   private static List<RexExpression> collation(int... indexes) {
     return Arrays.stream(indexes).mapToObj(RexExpression.InputRef::new).collect(Collectors.toList());
   }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortedMailboxReceiveOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortedMailboxReceiveOperatorTest.java
new file mode 100644
index 00000000000..80cf7ed1c49
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/SortedMailboxReceiveOperatorTest.java
@@ -0,0 +1,336 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.RelFieldCollation.Direction;
+import org.apache.calcite.rel.RelFieldCollation.NullDirection;
+import org.apache.pinot.common.datablock.MetadataBlock;
+import org.apache.pinot.common.exception.QueryException;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.mailbox.MailboxIdUtils;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.mailbox.ReceivingMailbox;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.plan.OpChainExecutionContext;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.INT;
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.STRING;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+public class SortedMailboxReceiveOperatorTest {
+  private static final VirtualServerAddress RECEIVER_ADDRESS = new VirtualServerAddress("localhost", 123, 0);
+  private static final DataSchema DATA_SCHEMA =
+      new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
+  private static final List<RexExpression> COLLATION_KEYS = Collections.singletonList(new RexExpression.InputRef(0));
+  private static final List<Direction> COLLATION_DIRECTIONS = Collections.singletonList(Direction.ASCENDING);
+  private static final List<NullDirection> COLLATION_NULL_DIRECTIONS = Collections.singletonList(NullDirection.LAST);
+  private static final String MAILBOX_ID_1 = MailboxIdUtils.toMailboxId(0, 1, 0, 0, 0);
+  private static final String MAILBOX_ID_2 = MailboxIdUtils.toMailboxId(0, 1, 1, 0, 0);
+
+  private AutoCloseable _mocks;
+  @Mock
+  private MailboxService _mailboxService;
+  @Mock
+  private ReceivingMailbox _mailbox1;
+  @Mock
+  private ReceivingMailbox _mailbox2;
+
+  private StageMetadata _stageMetadataBoth;
+  private StageMetadata _stageMetadata1;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    when(_mailboxService.getHostname()).thenReturn("localhost");
+    when(_mailboxService.getPort()).thenReturn(123);
+    VirtualServerAddress server1 = new VirtualServerAddress("localhost", 123, 0);
+    VirtualServerAddress server2 = new VirtualServerAddress("localhost", 123, 1);
+    _stageMetadataBoth = new StageMetadata.Builder().setWorkerMetadataList(Stream.of(server1, server2).map(
+        s -> new WorkerMetadata.Builder().setVirtualServerAddress(s)
+            .addMailBoxInfoMap(0, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0),
+                    org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 1, 0, 0)),
+                ImmutableList.of(server1, server2), ImmutableMap.of()))
+            .addMailBoxInfoMap(1, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0),
+                    org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 1, 0, 0)),
+                ImmutableList.of(server1, server2), ImmutableMap.of()))
+            .build()).collect(Collectors.toList())).build();
+    _stageMetadata1 = new StageMetadata.Builder().setWorkerMetadataList(Stream.of(server1).map(
+        s -> new WorkerMetadata.Builder().setVirtualServerAddress(s)
+            .addMailBoxInfoMap(0, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0)),
+                ImmutableList.of(server1), ImmutableMap.of()))
+            .addMailBoxInfoMap(1, new MailboxMetadata(
+                ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0)),
+                ImmutableList.of(server1), ImmutableMap.of()))
+            .build()).collect(Collectors.toList())).build();
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "Failed to find mailbox.*")
+  public void shouldThrowSingletonNoMatchMailboxServer() {
+    VirtualServerAddress server1 = new VirtualServerAddress("localhost", 456, 0);
+    VirtualServerAddress server2 = new VirtualServerAddress("localhost", 789, 1);
+    StageMetadata stageMetadata = new StageMetadata.Builder().setWorkerMetadataList(
+        Stream.of(server1, server2).map(s -> new WorkerMetadata.Builder().setVirtualServerAddress(s).build())
+            .collect(Collectors.toList())).build();
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, stageMetadata);
+    //noinspection resource
+    new SortedMailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS,
+        COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS, false, 1);
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*RANGE_DISTRIBUTED.*")
+  public void shouldThrowRangeDistributionNotSupported() {
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, null);
+    //noinspection resource
+    new SortedMailboxReceiveOperator(context, RelDistribution.Type.RANGE_DISTRIBUTED, DATA_SCHEMA, COLLATION_KEYS,
+        COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS, false, 1);
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "Collation keys.*")
+  public void shouldThrowOnEmptyCollationKey() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, System.currentTimeMillis() + 10L,
+            _stageMetadata1);
+    //noinspection resource
+    new SortedMailboxReceiveOperator(context, RelDistribution.Type.SINGLETON, DATA_SCHEMA, Collections.emptyList(),
+        Collections.emptyList(), Collections.emptyList(), false, 1);
+  }
+
+  @Test
+  public void shouldTimeoutOnExtraLongSleep()
+      throws InterruptedException {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    // Short timeoutMs should result in timeout
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, System.currentTimeMillis() + 10L,
+            _stageMetadata1);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS,
+        false, 1)) {
+      Thread.sleep(100L);
+      TransferableBlock mailbox = receiveOp.nextBlock();
+      assertTrue(mailbox.isErrorBlock());
+      MetadataBlock errorBlock = (MetadataBlock) mailbox.getDataBlock();
+      assertTrue(errorBlock.getExceptions().containsKey(QueryException.EXECUTION_TIMEOUT_ERROR_CODE));
+    }
+
+    // Longer timeout or default timeout (10s) doesn't result in timeout
+    context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, System.currentTimeMillis() + 10_000L,
+            _stageMetadata1);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS,
+        false, 1)) {
+      Thread.sleep(100L);
+      TransferableBlock mailbox = receiveOp.nextBlock();
+      assertFalse(mailbox.isErrorBlock());
+    }
+  }
+
+  @Test
+  public void shouldReceiveSingletonNullMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS,
+        false, 1)) {
+      assertTrue(receiveOp.nextBlock().isNoOpBlock());
+    }
+  }
+
+  @Test
+  public void shouldReceiveEosDirectlyFromSender() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailbox1.poll()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS,
+        false, 1)) {
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
+  }
+
+  @Test
+  public void shouldReceiveSingletonMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    Object[] row = new Object[]{1, 1};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS,
+        false, 1)) {
+      List<Object[]> actualRows = receiveOp.nextBlock().getContainer();
+      assertEquals(actualRows.size(), 1);
+      assertEquals(actualRows.get(0), row);
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
+  }
+
+  @Test
+  public void shouldReceiveSingletonErrorMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    String errorMessage = "TEST ERROR";
+    when(_mailbox1.poll()).thenReturn(
+        TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException(errorMessage)));
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadata1);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.SINGLETON, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS, COLLATION_NULL_DIRECTIONS,
+        false, 1)) {
+      TransferableBlock block = receiveOp.nextBlock();
+      assertTrue(block.isErrorBlock());
+      assertTrue(block.getDataBlock().getExceptions().get(QueryException.UNKNOWN_ERROR_CODE).contains(errorMessage));
+    }
+  }
+
+  @Test
+  public void shouldReceiveMailboxFromTwoServersOneNull() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailbox1.poll()).thenReturn(null, TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row = new Object[]{1, 1};
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.HASH_DISTRIBUTED, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS,
+        COLLATION_NULL_DIRECTIONS, false, 1)) {
+      assertTrue(receiveOp.nextBlock().isNoOpBlock());
+      List<Object[]> actualRows = receiveOp.nextBlock().getContainer();
+      assertEquals(actualRows.size(), 1);
+      assertEquals(actualRows.get(0), row);
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
+  }
+
+  @Test
+  public void shouldGetReceptionReceiveErrorMailbox() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    String errorMessage = "TEST ERROR";
+    when(_mailbox1.poll()).thenReturn(
+        TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException(errorMessage)));
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row = new Object[]{3, 3};
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.HASH_DISTRIBUTED, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS,
+        COLLATION_NULL_DIRECTIONS, false, 1)) {
+      TransferableBlock block = receiveOp.nextBlock();
+      assertTrue(block.isErrorBlock());
+      assertTrue(block.getDataBlock().getExceptions().get(QueryException.UNKNOWN_ERROR_CODE).contains(errorMessage));
+    }
+  }
+
+  @Test
+  public void shouldReceiveMailboxFromTwoServersWithCollationKey() {
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    Object[] row1 = new Object[]{3, 3};
+    Object[] row2 = new Object[]{1, 1};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        OperatorTestUtil.block(DATA_SCHEMA, row2), TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row3 = new Object[]{4, 2};
+    Object[] row4 = new Object[]{2, 4};
+    Object[] row5 = new Object[]{-1, 95};
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row3),
+        OperatorTestUtil.block(DATA_SCHEMA, row4), OperatorTestUtil.block(DATA_SCHEMA, row5),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.HASH_DISTRIBUTED, DATA_SCHEMA, COLLATION_KEYS, COLLATION_DIRECTIONS,
+        COLLATION_NULL_DIRECTIONS, false, 1)) {
+      assertEquals(receiveOp.nextBlock().getContainer(), Arrays.asList(row5, row2, row4, row1, row3));
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
+  }
+
+  @Test
+  public void shouldReceiveMailboxFromTwoServersWithCollationKeyTwoColumns() {
+    DataSchema dataSchema =
+        new DataSchema(new String[]{"col1", "col2", "col3"}, new DataSchema.ColumnDataType[]{INT, INT, STRING});
+    List<RexExpression> collationKeys = Arrays.asList(new RexExpression.InputRef(2), new RexExpression.InputRef(0));
+    List<Direction> collationDirections = Arrays.asList(Direction.DESCENDING, Direction.ASCENDING);
+    List<NullDirection> collationNullDirections = Arrays.asList(NullDirection.FIRST, NullDirection.LAST);
+
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    Object[] row1 = new Object[]{3, 3, "queen"};
+    Object[] row2 = new Object[]{1, 1, "pink floyd"};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(dataSchema, row1),
+        OperatorTestUtil.block(dataSchema, row2), TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row3 = new Object[]{4, 2, "pink floyd"};
+    Object[] row4 = new Object[]{2, 4, "aerosmith"};
+    Object[] row5 = new Object[]{-1, 95, "foo fighters"};
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(dataSchema, row3),
+        OperatorTestUtil.block(dataSchema, row4), OperatorTestUtil.block(dataSchema, row5),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    OpChainExecutionContext context =
+        OperatorTestUtil.getOpChainContext(_mailboxService, RECEIVER_ADDRESS, Long.MAX_VALUE, _stageMetadataBoth);
+    try (SortedMailboxReceiveOperator receiveOp = new SortedMailboxReceiveOperator(context,
+        RelDistribution.Type.HASH_DISTRIBUTED, dataSchema, collationKeys, collationDirections, collationNullDirections,
+        false, 1)) {
+      assertEquals(receiveOp.nextBlock().getContainer(), Arrays.asList(row1, row2, row3, row5, row4));
+      assertTrue(receiveOp.nextBlock().isEndOfStreamBlock());
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/TransformOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/TransformOperatorTest.java
index 52ffff08fb4..46279f03a23 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/TransformOperatorTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/TransformOperatorTest.java
@@ -71,7 +71,8 @@ public void shouldHandleRefTransform() {
     RexExpression.InputRef ref0 = new RexExpression.InputRef(0);
     RexExpression.InputRef ref1 = new RexExpression.InputRef(1);
     TransformOperator op =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(ref0, ref1), upStreamSchema, 1, 2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(),
+            _upstreamOp, resultSchema, ImmutableList.of(ref0, ref1), upStreamSchema);
     TransferableBlock result = op.nextBlock();
 
     Assert.assertTrue(!result.isErrorBlock());
@@ -95,8 +96,8 @@ public void shouldHandleLiteralTransform() {
     RexExpression.Literal boolLiteral = new RexExpression.Literal(FieldSpec.DataType.BOOLEAN, true);
     RexExpression.Literal strLiteral = new RexExpression.Literal(FieldSpec.DataType.STRING, "str");
     TransformOperator op =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(boolLiteral, strLiteral), upStreamSchema, 1,
-            2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(),
+            _upstreamOp, resultSchema, ImmutableList.of(boolLiteral, strLiteral), upStreamSchema);
     TransferableBlock result = op.nextBlock();
     // Literal operands should just output original literals.
     Assert.assertTrue(!result.isErrorBlock());
@@ -126,7 +127,8 @@ public void shouldHandlePlusMinusFuncTransform() {
     DataSchema resultSchema = new DataSchema(new String[]{"plusR", "minusR"},
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE});
     TransformOperator op =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(plus01, minus01), upStreamSchema, 1, 2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(),
+            _upstreamOp, resultSchema, ImmutableList.of(plus01, minus01), upStreamSchema);
     TransferableBlock result = op.nextBlock();
     Assert.assertTrue(!result.isErrorBlock());
     List<Object[]> resultRows = result.getContainer();
@@ -154,7 +156,8 @@ public void shouldThrowOnTypeMismatchFuncTransform() {
     DataSchema resultSchema = new DataSchema(new String[]{"plusR", "minusR"},
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE});
     TransformOperator op =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(plus01, minus01), upStreamSchema, 1, 2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(),
+            _upstreamOp, resultSchema, ImmutableList.of(plus01, minus01), upStreamSchema);
 
     TransferableBlock result = op.nextBlock();
     Assert.assertTrue(result.isErrorBlock());
@@ -174,8 +177,8 @@ public void shouldPropagateUpstreamError() {
     DataSchema resultSchema = new DataSchema(new String[]{"inCol", "strCol"},
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING});
     TransformOperator op =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(boolLiteral, strLiteral), upStreamSchema, 1,
-            2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(),
+            _upstreamOp, resultSchema, ImmutableList.of(boolLiteral, strLiteral), upStreamSchema);
     TransferableBlock result = op.nextBlock();
     Assert.assertTrue(result.isErrorBlock());
     DataBlock data = result.getDataBlock();
@@ -198,8 +201,8 @@ public void testNoopBlock() {
     DataSchema resultSchema = new DataSchema(new String[]{"boolCol", "strCol"},
         new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.BOOLEAN, DataSchema.ColumnDataType.STRING});
     TransformOperator op =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(boolLiteral, strLiteral), upStreamSchema, 1,
-            2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(),
+            _upstreamOp, resultSchema, ImmutableList.of(boolLiteral, strLiteral), upStreamSchema);
     TransferableBlock result = op.nextBlock();
     // First block has two rows
     Assert.assertFalse(result.isErrorBlock());
@@ -231,7 +234,8 @@ public void testWrongNumTransform() {
         DataSchema.ColumnDataType.STRING, DataSchema.ColumnDataType.STRING
     });
     TransformOperator transform =
-        new TransformOperator(_upstreamOp, resultSchema, new ArrayList<>(), upStreamSchema, 1, 2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(), _upstreamOp, resultSchema, new ArrayList<>(),
+            upStreamSchema);
   }
 
   @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*doesn't match "
@@ -244,6 +248,7 @@ public void testMismatchedSchemaOperandSize() {
     });
     RexExpression.InputRef ref0 = new RexExpression.InputRef(0);
     TransformOperator transform =
-        new TransformOperator(_upstreamOp, resultSchema, ImmutableList.of(ref0), upStreamSchema, 1, 2);
+        new TransformOperator(OperatorTestUtil.getDefaultContext(), _upstreamOp, resultSchema, ImmutableList.of(ref0),
+            upStreamSchema);
   }
 };
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/UnionOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/UnionOperatorTest.java
new file mode 100644
index 00000000000..16e8c468748
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/UnionOperatorTest.java
@@ -0,0 +1,91 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+public class UnionOperatorTest {
+  private AutoCloseable _mocks;
+
+  @Mock
+  private MultiStageOperator _leftOperator;
+
+  @Mock
+  private MultiStageOperator _rightOperator;
+
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void testUnionOperator() {
+    DataSchema schema = new DataSchema(new String[]{"int_col", "string_col"}, new DataSchema.ColumnDataType[]{
+        DataSchema.ColumnDataType.INT, DataSchema.ColumnDataType.STRING
+    });
+    Mockito.when(_leftOperator.nextBlock())
+        .thenReturn(OperatorTestUtil.block(schema, new Object[]{1, "AA"}, new Object[]{2, "BB"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    Mockito.when(_rightOperator.nextBlock()).thenReturn(
+            OperatorTestUtil.block(schema, new Object[]{3, "aa"}, new Object[]{4, "bb"}, new Object[]{5, "cc"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    UnionOperator unionOperator =
+        new UnionOperator(OperatorTestUtil.getDefaultContext(), ImmutableList.of(_leftOperator, _rightOperator),
+            schema);
+    List<Object[]> resultRows = new ArrayList<>();
+    TransferableBlock result = unionOperator.nextBlock();
+    while (!result.isEndOfStreamBlock()) {
+      resultRows.addAll(result.getContainer());
+      result = unionOperator.nextBlock();
+    }
+    List<Object[]> expectedRows =
+        Arrays.asList(new Object[]{1, "AA"}, new Object[]{2, "BB"}, new Object[]{3, "aa"}, new Object[]{4, "bb"},
+            new Object[]{5, "cc"});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    for (int i = 0; i < resultRows.size(); i++) {
+      Assert.assertEquals(resultRows.get(i), expectedRows.get(i));
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/WindowAggregateOperatorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/WindowAggregateOperatorTest.java
new file mode 100644
index 00000000000..8d5eff64da7
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/WindowAggregateOperatorTest.java
@@ -0,0 +1,731 @@
+/**
+ * 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.pinot.query.runtime.operator;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.planner.logical.RexExpression;
+import org.apache.pinot.query.planner.plannode.WindowNode;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.utils.AggregationUtils;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.DOUBLE;
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.INT;
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.LONG;
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.STRING;
+
+
+public class WindowAggregateOperatorTest {
+
+  private AutoCloseable _mocks;
+
+  @Mock
+  private MultiStageOperator _input;
+
+  @Mock
+  private VirtualServerAddress _serverAddress;
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_serverAddress.toString()).thenReturn(new VirtualServerAddress("mock", 80, 0).toString());
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void testShouldHandleUpstreamErrorBlocks() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    Mockito.when(_input.nextBlock())
+        .thenReturn(TransferableBlockUtils.getErrorTransferableBlock(new Exception("foo!")));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock(); // build
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(1)).nextBlock();
+    Assert.assertTrue(block1.isErrorBlock(), "Input errors should propagate immediately");
+  }
+
+  @Test
+  public void testShouldHandleEndOfStreamBlockWithNoOtherInputs() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    Mockito.when(_input.nextBlock()).thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block = operator.nextBlock();
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(1)).nextBlock();
+    Assert.assertTrue(block.isEndOfStreamBlock(), "EOS blocks should propagate");
+  }
+
+  @Test
+  public void testShouldHandleUpstreamNoOpBlocksWhileConstructing() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 1}))
+        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock())
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock(); // build when reading NoOp block
+    TransferableBlock block2 = operator.nextBlock(); // return when reading EOS block
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(3)).nextBlock();
+    Assert.assertTrue(block1.isNoOpBlock());
+    Assert.assertEquals(block2.getContainer().size(), 1);
+  }
+
+  @Test
+  public void testShouldHandleUpstreamNoOpBlocksWhileConstructingMultipleRows() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 1}))
+        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock())
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 2}))
+        .thenReturn(TransferableBlockUtils.getNoOpTransferableBlock())
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 2}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock(); // build when reading NoOp block
+    TransferableBlock block2 = operator.nextBlock(); // build when reading NoOp block
+    TransferableBlock block3 = operator.nextBlock(); // return when reading EOS block
+    TransferableBlock block4 = operator.nextBlock(); // EOS block
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(6)).nextBlock();
+    Assert.assertTrue(block1.isNoOpBlock());
+    Assert.assertTrue(block2.isNoOpBlock());
+    Assert.assertEquals(block3.getContainer().size(), 3);
+    Assert.assertEquals(block3.getContainer().get(0), new Object[]{1, 1, 3.0});
+    Assert.assertEquals(block3.getContainer().get(1), new Object[]{1, 2, 3.0});
+    Assert.assertEquals(block3.getContainer().get(2), new Object[]{2, 2, 2});
+    Assert.assertTrue(block4.isEndOfStreamBlock());
+  }
+
+  @Test
+  public void testShouldWindowAggregateOverSingleInputBlock() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 1}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock();
+    TransferableBlock block2 = operator.nextBlock();
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(2)).nextBlock();
+    Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1, 1},
+        "Expected three columns (original two columns, agg value)");
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testShouldWindowAggregateOverSingleInputBlockWithSameOrderByKeys() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+    List<RexExpression> order = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 1}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, order,
+            Arrays.asList(RelFieldCollation.Direction.ASCENDING), Arrays.asList(RelFieldCollation.NullDirection.LAST),
+            calls, Integer.MIN_VALUE, Integer.MAX_VALUE, WindowNode.WindowFrameType.RANGE, Collections.emptyList(),
+            outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock();
+    TransferableBlock block2 = operator.nextBlock();
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(2)).nextBlock();
+    Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1, 1},
+        "Expected three columns (original two columns, agg value)");
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testShouldWindowAggregateOverSingleInputBlockWithoutPartitionByKeys() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 1}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE,
+            Integer.MAX_VALUE, WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock();
+    TransferableBlock block2 = operator.nextBlock();
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(2)).nextBlock();
+    Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 1, 1},
+        "Expected three columns (original two columns, agg value)");
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testShouldWindowAggregateOverSingleInputBlockWithLiteralInput() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.Literal(FieldSpec.DataType.INT, 42)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, 3}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock();
+    TransferableBlock block2 = operator.nextBlock();
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(2)).nextBlock();
+    Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
+    // second value is 1 (the literal) instead of 3 (the col val)
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, 3, 42},
+        "Expected three columns (original two columns, agg literal value)");
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testShouldCallMergerWhenWindowAggregatingMultipleRows() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    Mockito.when(_input.nextBlock())
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 1}, new Object[]{1, 2}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, 3}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    AggregationUtils.Merger merger = Mockito.mock(AggregationUtils.Merger.class);
+    Mockito.when(merger.merge(Mockito.any(), Mockito.any())).thenReturn(12d);
+    Mockito.when(merger.init(Mockito.any(), Mockito.any())).thenReturn(1d);
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema,
+            ImmutableMap.of("SUM", cdt -> merger));
+
+    // When:
+    TransferableBlock resultBlock = operator.nextBlock(); // (output result)
+
+    // Then:
+    // should call merger twice, one from second row in first block and two from the first row
+    // in second block
+    Mockito.verify(merger, Mockito.times(1)).init(Mockito.any(), Mockito.any());
+    Mockito.verify(merger, Mockito.times(2)).merge(Mockito.any(), Mockito.any());
+    Assert.assertEquals(resultBlock.getContainer().get(0), new Object[]{1, 1, 12d},
+        "Expected three columns (original two columns, agg literal value)");
+    Assert.assertEquals(resultBlock.getContainer().get(1), new Object[]{1, 2, 12d},
+        "Expected three columns (original two columns, agg literal value)");
+    Assert.assertEquals(resultBlock.getContainer().get(2), new Object[]{1, 3, 12d},
+        "Expected three columns (original two columns, agg literal value)");
+  }
+
+  @Test
+  public void testPartitionByWindowAggregateWithHashCollision() {
+    MultiStageOperator upstreamOperator = OperatorTestUtil.getOperator(OperatorTestUtil.OP_1);
+    // Create an aggregation call with sum for first column and group by second column.
+    RexExpression.FunctionCall agg = getSum(new RexExpression.InputRef(0));
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, INT});
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, INT, DOUBLE});
+    WindowAggregateOperator sum0PartitionBy1 =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), upstreamOperator,
+            Arrays.asList(new RexExpression.InputRef(1)), Collections.emptyList(), Collections.emptyList(),
+            Collections.emptyList(), Arrays.asList(agg), Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    TransferableBlock result = sum0PartitionBy1.getNextBlock();
+    while (result.isNoOpBlock()) {
+      result = sum0PartitionBy1.getNextBlock();
+    }
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows =
+        Arrays.asList(new Object[]{2, "BB", 5.0}, new Object[]{3, "BB", 5.0}, new Object[]{1, "Aa", 1});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    Assert.assertEquals(resultRows.get(0), expectedRows.get(0));
+    Assert.assertEquals(resultRows.get(1), expectedRows.get(1));
+    Assert.assertEquals(resultRows.get(2), expectedRows.get(2));
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*Unexpected aggregation "
+      + "function name: AVERAGE.*")
+  public void testShouldThrowOnUnknownAggFunction() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(
+        new RexExpression.FunctionCall(SqlKind.AVG, FieldSpec.DataType.INT, "AVERAGE", ImmutableList.of()));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+    DataSchema outSchema = new DataSchema(new String[]{"unknown"}, new DataSchema.ColumnDataType[]{DOUBLE});
+    DataSchema inSchema = new DataSchema(new String[]{"unknown"}, new DataSchema.ColumnDataType[]{DOUBLE});
+
+    // When:
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*Unexpected aggregation "
+      + "function name: NTILE.*")
+  public void testShouldThrowOnUnknownRankAggFunction() {
+    // TODO: Remove this test when support is added for NTILE function
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(
+        new RexExpression.FunctionCall(SqlKind.RANK, FieldSpec.DataType.INT, "NTILE", ImmutableList.of()));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+    DataSchema outSchema = new DataSchema(new String[]{"unknown"}, new DataSchema.ColumnDataType[]{DOUBLE});
+    DataSchema inSchema = new DataSchema(new String[]{"unknown"}, new DataSchema.ColumnDataType[]{DOUBLE});
+
+    // When:
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+  }
+
+  @Test
+  public void testRankDenseRankRankingFunctions() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(
+        new RexExpression.FunctionCall(SqlKind.RANK, FieldSpec.DataType.INT, "RANK", ImmutableList.of()),
+        new RexExpression.FunctionCall(SqlKind.DENSE_RANK, FieldSpec.DataType.INT, "DENSE_RANK", ImmutableList.of()));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+    List<RexExpression> order = ImmutableList.of(new RexExpression.InputRef(1));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    // Input should be in sorted order on the order by key as SortExchange will handle pre-sorting the data
+    Mockito.when(_input.nextBlock())
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{3, "and"}, new Object[]{2, "bar"},
+            new Object[]{2, "foo"}, new Object[]{1, "foo"}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, "foo"}, new Object[]{2, "foo"},
+            new Object[]{1, "numb"}, new Object[]{2, "the"}, new Object[]{3, "true"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema = new DataSchema(new String[]{"group", "arg", "rank", "dense_rank"},
+        new DataSchema.ColumnDataType[]{INT, STRING, LONG, LONG});
+
+    // When:
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, order,
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, 0,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    TransferableBlock result = operator.getNextBlock();
+    while (result.isNoOpBlock()) {
+      result = operator.getNextBlock();
+    }
+    TransferableBlock eosBlock = operator.getNextBlock();
+    List<Object[]> resultRows = result.getContainer();
+    Map<Integer, List<Object[]>> expectedPartitionToRowsMap = new HashMap<>();
+    expectedPartitionToRowsMap.put(1, Arrays.asList(new Object[]{1, "foo", 1L, 1L}, new Object[]{1, "foo", 1L, 1L},
+        new Object[]{1, "numb", 3L, 2L}));
+    expectedPartitionToRowsMap.put(2, Arrays.asList(new Object[]{2, "bar", 1L, 1L}, new Object[]{2, "foo", 2L, 2L},
+        new Object[]{2, "foo", 2L, 2L}, new Object[]{2, "the", 4L, 3L}));
+    expectedPartitionToRowsMap.put(3, Arrays.asList(new Object[]{3, "and", 1L, 1L}, new Object[]{3, "true", 2L, 2L}));
+
+    Integer previousPartitionKey = null;
+    Map<Integer, List<Object[]>> resultsPartitionToRowsMap = new HashMap<>();
+    for (Object[] row : resultRows) {
+      Integer currentPartitionKey = (Integer) row[0];
+      if (!currentPartitionKey.equals(previousPartitionKey)) {
+        Assert.assertFalse(resultsPartitionToRowsMap.containsKey(currentPartitionKey));
+      }
+      resultsPartitionToRowsMap.computeIfAbsent(currentPartitionKey, k -> new ArrayList<>()).add(row);
+      previousPartitionKey = currentPartitionKey;
+    }
+
+    resultsPartitionToRowsMap.forEach((key, value) -> {
+      List<Object[]> expectedRows = expectedPartitionToRowsMap.get(key);
+      Assert.assertEquals(value.size(), expectedRows.size());
+      for (int i = 0; i < value.size(); i++) {
+        Assert.assertEquals(value.get(i), expectedRows.get(i));
+      }
+    });
+    Assert.assertTrue(eosBlock.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testRowNumberRankingFunction() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(
+        new RexExpression.FunctionCall(SqlKind.ROW_NUMBER, FieldSpec.DataType.INT, "ROW_NUMBER", ImmutableList.of()));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+    List<RexExpression> order = ImmutableList.of(new RexExpression.InputRef(1));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    // Input should be in sorted order on the order by key as SortExchange will handle pre-sorting the data
+    Mockito.when(_input.nextBlock())
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{3, "and"}, new Object[]{2, "bar"},
+            new Object[]{2, "foo"}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, "foo"}, new Object[]{2, "foo"},
+            new Object[]{2, "the"}, new Object[]{3, "true"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "row_number"}, new DataSchema.ColumnDataType[]{INT, STRING, LONG});
+
+    // When:
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, order,
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, 0,
+            WindowNode.WindowFrameType.ROWS, Collections.emptyList(), outSchema, inSchema);
+
+    TransferableBlock result = operator.getNextBlock();
+    while (result.isNoOpBlock()) {
+      result = operator.getNextBlock();
+    }
+    TransferableBlock eosBlock = operator.getNextBlock();
+    List<Object[]> resultRows = result.getContainer();
+    Map<Integer, List<Object[]>> expectedPartitionToRowsMap = new HashMap<>();
+    expectedPartitionToRowsMap.put(1, Collections.singletonList(new Object[]{1, "foo", 1L}));
+    expectedPartitionToRowsMap.put(2, Arrays.asList(new Object[]{2, "bar", 1L}, new Object[]{2, "foo", 2L},
+        new Object[]{2, "foo", 3L}, new Object[]{2, "the", 4L}));
+    expectedPartitionToRowsMap.put(3, Arrays.asList(new Object[]{3, "and", 1L}, new Object[]{3, "true", 2L}));
+
+    Integer previousPartitionKey = null;
+    Map<Integer, List<Object[]>> resultsPartitionToRowsMap = new HashMap<>();
+    for (Object[] row : resultRows) {
+      Integer currentPartitionKey = (Integer) row[0];
+      if (!currentPartitionKey.equals(previousPartitionKey)) {
+        Assert.assertFalse(resultsPartitionToRowsMap.containsKey(currentPartitionKey));
+      }
+      resultsPartitionToRowsMap.computeIfAbsent(currentPartitionKey, k -> new ArrayList<>()).add(row);
+      previousPartitionKey = currentPartitionKey;
+    }
+
+    resultsPartitionToRowsMap.forEach((key, value) -> {
+      List<Object[]> expectedRows = expectedPartitionToRowsMap.get(key);
+      Assert.assertEquals(value.size(), expectedRows.size());
+      for (int i = 0; i < value.size(); i++) {
+        Assert.assertEquals(value.get(i), expectedRows.get(i));
+      }
+    });
+    Assert.assertTrue(eosBlock.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testNonEmptyOrderByKeysNotMatchingPartitionByKeys() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(0)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+    List<RexExpression> order = ImmutableList.of(new RexExpression.InputRef(1));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    // Input should be in sorted order on the order by key as SortExchange will handle pre-sorting the data
+    Mockito.when(_input.nextBlock())
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{3, "and"}, new Object[]{2, "bar"},
+            new Object[]{2, "foo"}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{1, "foo"}, new Object[]{2, "foo"},
+            new Object[]{3, "true"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, order,
+            Arrays.asList(RelFieldCollation.Direction.ASCENDING), Arrays.asList(RelFieldCollation.NullDirection.LAST),
+            calls, Integer.MIN_VALUE, Integer.MAX_VALUE, WindowNode.WindowFrameType.RANGE, Collections.emptyList(),
+            outSchema, inSchema);
+
+    TransferableBlock result = operator.getNextBlock();
+    while (result.isNoOpBlock()) {
+      result = operator.getNextBlock();
+    }
+    TransferableBlock eosBlock = operator.getNextBlock();
+    List<Object[]> resultRows = result.getContainer();
+    List<Object[]> expectedRows = Arrays.asList(new Object[]{1, "foo", 1}, new Object[]{2, "bar", 2},
+        new Object[]{2, "foo", 6.0}, new Object[]{2, "foo", 6.0}, new Object[]{3, "and", 3},
+        new Object[]{3, "true", 6.0});
+    Assert.assertEquals(resultRows.size(), expectedRows.size());
+    Assert.assertEquals(resultRows.get(0), expectedRows.get(0));
+    Assert.assertEquals(resultRows.get(1), expectedRows.get(1));
+    Assert.assertEquals(resultRows.get(2), expectedRows.get(2));
+    Assert.assertEquals(resultRows.get(3), expectedRows.get(3));
+    Assert.assertEquals(resultRows.get(4), expectedRows.get(4));
+    Assert.assertEquals(resultRows.get(5), expectedRows.get(5));
+    Assert.assertTrue(eosBlock.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test
+  public void testNonEmptyOrderByKeysMatchingPartitionByKeysWithDifferentDirection() {
+    // Given:
+    // Set ORDER BY key same as PARTITION BY key with custom direction and null direction. Should still be treated
+    // like a PARTITION BY only query (since the final aggregation value won't change).
+    // TODO: Test null direction handling once support for it is available
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(0)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(1));
+    List<RexExpression> order = ImmutableList.of(new RexExpression.InputRef(1));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "foo"}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "bar"}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{3, "foo"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, order,
+            Arrays.asList(RelFieldCollation.Direction.DESCENDING), Arrays.asList(RelFieldCollation.NullDirection.LAST),
+            calls, Integer.MIN_VALUE, Integer.MAX_VALUE, WindowNode.WindowFrameType.RANGE, Collections.emptyList(),
+            outSchema, inSchema);
+
+    // When:
+    TransferableBlock resultBlock = operator.nextBlock(); // (output result)
+
+    // Then:
+    Assert.assertEquals(resultBlock.getContainer().get(0), new Object[]{2, "bar", 2},
+        "Expected three columns (original two columns, agg literal value)");
+    Assert.assertEquals(resultBlock.getContainer().get(1), new Object[]{2, "foo", 5.0},
+        "Expected three columns (original two columns, agg literal value)");
+    Assert.assertEquals(resultBlock.getContainer().get(2), new Object[]{3, "foo", 5.0},
+        "Expected three columns (original two columns, agg literal value)");
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "Only RANGE type frames "
+      + "are supported at present.*")
+  public void testShouldThrowOnCustomFramesRows() {
+    // TODO: Remove this test once custom frame support is added
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "foo"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.ROWS, Collections.emptyList(), outSchema, inSchema);
+  }
+
+  @Test
+  public void testShouldNotThrowCurrentRowPartitionByOrderByOnSameKey() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(0)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(1));
+    List<RexExpression> order = ImmutableList.of(new RexExpression.InputRef(1));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "foo"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, order,
+            Arrays.asList(RelFieldCollation.Direction.ASCENDING), Arrays.asList(RelFieldCollation.NullDirection.LAST),
+            calls, Integer.MIN_VALUE, 0, WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema,
+            inSchema);
+
+    // When:
+    TransferableBlock block1 = operator.nextBlock();
+    TransferableBlock block2 = operator.nextBlock();
+
+    // Then:
+    Mockito.verify(_input, Mockito.times(2)).nextBlock();
+    Assert.assertTrue(block1.getNumRows() > 0, "First block is the result");
+    Assert.assertEquals(block1.getContainer().get(0), new Object[]{2, "foo", 2},
+        "Expected three columns (original two columns, agg value)");
+    Assert.assertTrue(block2.isEndOfStreamBlock(), "Second block is EOS (done processing)");
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "Only default frame is "
+      + "supported, lowerBound must be UNBOUNDED PRECEDING")
+  public void testShouldThrowOnCustomFramesCustomPreceding() {
+    // TODO: Remove this test once custom frame support is added
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "foo"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, 5, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = "Only default frame is "
+      + "supported, upperBound must be UNBOUNDED FOLLOWING or CURRENT ROW")
+  public void testShouldThrowOnCustomFramesCustomFollowing() {
+    // TODO: Remove this test once custom frame support is added
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "foo"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, 5,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+  }
+
+  @Test
+  public void testShouldReturnErrorBlockOnUnexpectedInputType() {
+    // Given:
+    List<RexExpression> calls = ImmutableList.of(getSum(new RexExpression.InputRef(1)));
+    List<RexExpression> group = ImmutableList.of(new RexExpression.InputRef(0));
+
+    DataSchema inSchema = new DataSchema(new String[]{"group", "arg"}, new DataSchema.ColumnDataType[]{INT, STRING});
+    // TODO: it is necessary to produce two values here, the operator only throws on second
+    // (see the comment in WindowAggregate operator)
+    Mockito.when(_input.nextBlock()).thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "metallica"}))
+        .thenReturn(OperatorTestUtil.block(inSchema, new Object[]{2, "pink floyd"}))
+        .thenReturn(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    DataSchema outSchema =
+        new DataSchema(new String[]{"group", "arg", "sum"}, new DataSchema.ColumnDataType[]{INT, STRING, DOUBLE});
+    WindowAggregateOperator operator =
+        new WindowAggregateOperator(OperatorTestUtil.getDefaultContext(), _input, group, Collections.emptyList(),
+            Collections.emptyList(), Collections.emptyList(), calls, Integer.MIN_VALUE, Integer.MAX_VALUE,
+            WindowNode.WindowFrameType.RANGE, Collections.emptyList(), outSchema, inSchema);
+
+    // When:
+    TransferableBlock block = operator.nextBlock();
+
+    // Then:
+    Assert.assertTrue(block.isErrorBlock(), "expected ERROR block from invalid computation");
+    Assert.assertTrue(block.getDataBlock().getExceptions().get(1000).contains("String cannot be cast to class"),
+        "expected it to fail with class cast exception");
+  }
+
+  private static RexExpression.FunctionCall getSum(RexExpression arg) {
+    return new RexExpression.FunctionCall(SqlKind.SUM, FieldSpec.DataType.INT, "SUM", ImmutableList.of(arg));
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchangeTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchangeTest.java
index d2cb71a04cc..ab056c024b3 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchangeTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BlockExchangeTest.java
@@ -20,19 +20,16 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
-import java.util.Iterator;
+import java.io.IOException;
 import java.util.List;
-import java.util.function.BiFunction;
 import org.apache.pinot.common.datablock.DataBlock;
 import org.apache.pinot.common.utils.DataSchema;
 import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
 import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.BlockSplitter;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -44,24 +41,16 @@
 
 
 public class BlockExchangeTest {
-
-  private static final MailboxIdentifier MAILBOX_1 = new JsonMailboxIdentifier("1", "host:1", "host:1");
-  private static final MailboxIdentifier MAILBOX_2 = new JsonMailboxIdentifier("1", "host:1", "host:2");
-
   private AutoCloseable _mocks;
 
   @Mock
-  private MailboxService<TransferableBlock> _mailboxService;
+  private SendingMailbox _mailbox1;
   @Mock
-  private SendingMailbox<TransferableBlock> _mailbox1;
-  @Mock
-  private SendingMailbox<TransferableBlock> _mailbox2;
+  private SendingMailbox _mailbox2;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
-    Mockito.when(_mailboxService.getSendingMailbox(MAILBOX_1)).thenReturn(_mailbox1);
-    Mockito.when(_mailboxService.getSendingMailbox(MAILBOX_2)).thenReturn(_mailbox2);
   }
 
   @AfterMethod
@@ -71,17 +60,14 @@ public void tearDown()
   }
 
   @Test
-  public void shouldSendEosBlockToAllDestinations() {
+  public void shouldSendEosBlockToAllDestinations()
+      throws Exception {
     // Given:
-    List<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1, MAILBOX_2);
-    BlockExchange exchange = new TestBlockExchange(
-        _mailboxService,
-        destinations,
-        (dest, block) -> Iterators.singletonIterator(new BlockExchange.RoutedBlock(MAILBOX_1, block))
-    );
-
+    List<SendingMailbox> destinations = ImmutableList.of(_mailbox1, _mailbox2);
+    BlockExchange exchange = new TestBlockExchange(destinations);
     // When:
-    exchange.send(TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    exchange.offerBlock(TransferableBlockUtils.getEndOfStreamTransferableBlock(), Long.MAX_VALUE);
+    exchange.send();
 
     // Then:
     ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
@@ -96,19 +82,17 @@ public void shouldSendEosBlockToAllDestinations() {
   }
 
   @Test
-  public void shouldSendDataBlocksOnlyToTargetDestination() {
+  public void shouldSendDataBlocksOnlyToTargetDestination()
+      throws Exception {
     // Given:
-    List<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1, MAILBOX_2);
-    BlockExchange exchange = new TestBlockExchange(
-        _mailboxService,
-        destinations,
-        (dest, block) -> Iterators.singletonIterator(new BlockExchange.RoutedBlock(MAILBOX_1, block))
-    );
+    List<SendingMailbox> destinations = ImmutableList.of(_mailbox1);
+    BlockExchange exchange = new TestBlockExchange(destinations);
     TransferableBlock block = new TransferableBlock(ImmutableList.of(new Object[]{"val"}),
         new DataSchema(new String[]{"foo"}, new ColumnDataType[]{ColumnDataType.STRING}), DataBlock.Type.ROW);
 
     // When:
-    exchange.send(block);
+    exchange.offerBlock(block, Long.MAX_VALUE);
+    exchange.send();
 
     // Then:
     ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
@@ -119,30 +103,52 @@ public void shouldSendDataBlocksOnlyToTargetDestination() {
   }
 
   @Test
-  public void shouldSplitBlocks() {
+  public void shouldSendErrorBlockIfExchangeInternalThrowException()
+      throws Exception {
+    // Given:
+    List<SendingMailbox> destinations = ImmutableList.of(_mailbox1, _mailbox2);
+    BlockExchange exchange = new ThrowingBlockExchange(destinations);
+    TransferableBlock block = new TransferableBlock(ImmutableList.of(new Object[]{"val"}),
+        new DataSchema(new String[]{"foo"}, new ColumnDataType[]{ColumnDataType.STRING}), DataBlock.Type.ROW);
+
+    // When:
+    exchange.offerBlock(block, Long.MAX_VALUE);
+    exchange.send();
+
+    // Then:
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
+    Mockito.verify(_mailbox1).complete();
+    Mockito.verify(_mailbox1, Mockito.times(1)).send(captor.capture());
+    Assert.assertTrue(captor.getValue().isErrorBlock());
+
+    Mockito.verify(_mailbox2).complete();
+    Mockito.verify(_mailbox2, Mockito.times(1)).send(captor.capture());
+    Assert.assertTrue(captor.getValue().isErrorBlock());
+  }
+
+  @Test
+  public void shouldSplitBlocks()
+      throws Exception {
     // Given:
-    List<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1, MAILBOX_2);
+    List<SendingMailbox> destinations = ImmutableList.of(_mailbox1);
 
     DataSchema schema = new DataSchema(new String[]{"foo"}, new ColumnDataType[]{ColumnDataType.STRING});
 
-    TransferableBlock inBlock = new TransferableBlock(
-        ImmutableList.of(new Object[]{"one"}, new Object[]{"two"}), schema, DataBlock.Type.ROW);
+    TransferableBlock inBlock =
+        new TransferableBlock(ImmutableList.of(new Object[]{"one"}, new Object[]{"two"}), schema, DataBlock.Type.ROW);
 
-    TransferableBlock outBlockOne = new TransferableBlock(
-        ImmutableList.of(new Object[]{"one"}), schema, DataBlock.Type.ROW);
+    TransferableBlock outBlockOne =
+        new TransferableBlock(ImmutableList.of(new Object[]{"one"}), schema, DataBlock.Type.ROW);
 
-    TransferableBlock outBlockTwo = new TransferableBlock(
-        ImmutableList.of(new Object[]{"two"}), schema, DataBlock.Type.ROW);
+    TransferableBlock outBlockTwo =
+        new TransferableBlock(ImmutableList.of(new Object[]{"two"}), schema, DataBlock.Type.ROW);
 
-    BlockExchange exchange = new TestBlockExchange(
-        _mailboxService,
-        destinations,
-        (dest, block) -> Iterators.singletonIterator(new BlockExchange.RoutedBlock(MAILBOX_1, block)),
-        (block, type, maxSize) -> ImmutableList.of(outBlockOne, outBlockTwo).iterator()
-    );
+    BlockExchange exchange = new TestBlockExchange(destinations,
+        (block, type, maxSize) -> ImmutableList.of(outBlockOne, outBlockTwo).iterator());
 
     // When:
-    exchange.send(inBlock);
+    exchange.offerBlock(inBlock, Long.MAX_VALUE);
+    exchange.send();
 
     // Then:
     ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
@@ -155,23 +161,36 @@ public void shouldSplitBlocks() {
   }
 
   private static class TestBlockExchange extends BlockExchange {
+    protected TestBlockExchange(List<SendingMailbox> destinations) {
+      this(destinations, (block, type, size) -> Iterators.singletonIterator(block));
+    }
+
+    protected TestBlockExchange(List<SendingMailbox> destinations, BlockSplitter splitter) {
+      super(new OpChainId(1, 2, 3), destinations, splitter, (opChainId) -> { }, Long.MAX_VALUE);
+    }
 
-    private final BiFunction<List<MailboxIdentifier>, TransferableBlock, Iterator<RoutedBlock>> _router;
+    @Override
+    protected void route(List<SendingMailbox> destinations, TransferableBlock block)
+        throws Exception {
+      for (SendingMailbox mailbox : destinations) {
+        sendBlock(mailbox, block);
+      }
+    }
+  }
 
-    protected TestBlockExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-        BiFunction<List<MailboxIdentifier>, TransferableBlock, Iterator<RoutedBlock>> router) {
-      this(mailbox, destinations, router, (block, type, size) -> Iterators.singletonIterator(block));
+  private static class ThrowingBlockExchange extends BlockExchange {
+    protected ThrowingBlockExchange(List<SendingMailbox> destinations) {
+      this(destinations, (block, type, size) -> Iterators.singletonIterator(block));
     }
 
-    protected TestBlockExchange(MailboxService<TransferableBlock> mailbox, List<MailboxIdentifier> destinations,
-        BiFunction<List<MailboxIdentifier>, TransferableBlock, Iterator<RoutedBlock>> router, BlockSplitter splitter) {
-      super(mailbox, destinations, splitter);
-      _router = router;
+    protected ThrowingBlockExchange(List<SendingMailbox> destinations, BlockSplitter splitter) {
+      super(new OpChainId(1, 2, 3), destinations, splitter, (opChainId) -> { }, Long.MAX_VALUE);
     }
 
     @Override
-    protected Iterator<RoutedBlock> route(List<MailboxIdentifier> destinations, TransferableBlock block) {
-      return _router.apply(destinations, block);
+    protected void route(List<SendingMailbox> destinations, TransferableBlock block)
+        throws Exception {
+      throw new IOException("Deliberate I/O Exception routing");
     }
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchangeTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchangeTest.java
index c99ea643c6b..3e93eb902c7 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchangeTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/BroadcastExchangeTest.java
@@ -19,13 +19,14 @@
 package org.apache.pinot.query.runtime.operator.exchange;
 
 import com.google.common.collect.ImmutableList;
-import java.util.Iterator;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -34,19 +35,19 @@
 
 
 public class BroadcastExchangeTest {
-  private static final MailboxIdentifier MAILBOX_1 = new JsonMailboxIdentifier("1", "host:1", "host:1");
-  private static final MailboxIdentifier MAILBOX_2 = new JsonMailboxIdentifier("1", "host:1", "host:2");
-
   private AutoCloseable _mocks;
 
   @Mock
-  TransferableBlock _block;
+  private SendingMailbox _mailbox1;
+  @Mock
+  private SendingMailbox _mailbox2;
   @Mock
-  MailboxService<TransferableBlock> _mailboxService;
+  TransferableBlock _block;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_block.getType()).thenReturn(DataBlock.Type.METADATA);
   }
 
   @AfterMethod
@@ -56,24 +57,21 @@ public void tearDown()
   }
 
   @Test
-  public void shouldBroadcast() {
+  public void shouldBroadcast()
+      throws Exception {
     // Given:
-    ImmutableList<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1, MAILBOX_2);
+    ImmutableList<SendingMailbox> destinations = ImmutableList.of(_mailbox1, _mailbox2);
 
     // When:
-    Iterator<BlockExchange.RoutedBlock> route =
-        new BroadcastExchange(_mailboxService, destinations, TransferableBlockUtils::splitBlock)
-            .route(destinations, _block);
+    new BroadcastExchange(new OpChainId(1, 2, 3), destinations, TransferableBlockUtils::splitBlock,
+        (opChainId) -> { }, System.currentTimeMillis() + 10_000L).route(destinations, _block);
 
-    // Then:
-    BlockExchange.RoutedBlock routedBlock = route.next();
-    Assert.assertEquals(routedBlock._destination, MAILBOX_1);
-    Assert.assertEquals(routedBlock._block, _block);
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
 
-    routedBlock = route.next();
-    Assert.assertEquals(routedBlock._destination, MAILBOX_2);
-    Assert.assertEquals(routedBlock._block, _block);
+    Mockito.verify(_mailbox1, Mockito.times(1)).send(captor.capture());
+    Assert.assertEquals(captor.getValue(), _block);
 
-    Assert.assertFalse(route.hasNext(), "should be done with routing");
+    Mockito.verify(_mailbox2, Mockito.times(1)).send(captor.capture());
+    Assert.assertEquals(captor.getValue(), _block);
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/HashExchangeTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/HashExchangeTest.java
index 4cd1d71075c..7e42b5fd0dc 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/HashExchangeTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/HashExchangeTest.java
@@ -21,12 +21,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import java.util.Iterator;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.planner.partitioning.KeySelector;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -37,20 +39,21 @@
 
 
 public class HashExchangeTest {
-
-  private static final MailboxIdentifier MAILBOX_1 = new JsonMailboxIdentifier("1", "host:1", "host:1");
-  private static final MailboxIdentifier MAILBOX_2 = new JsonMailboxIdentifier("1", "host:1", "host:2");
-
   private AutoCloseable _mocks;
 
   @Mock
-  TransferableBlock _block;
+  private SendingMailbox _mailbox1;
   @Mock
-  MailboxService<TransferableBlock> _mailboxService;
+  private SendingMailbox _mailbox2;
+  @Mock
+  TransferableBlock _block;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_block.getType()).thenReturn(DataBlock.Type.ROW);
+    Mockito.when(_block.getDataSchema()).thenReturn(
+        new DataSchema(new String[]{"col1"}, new DataSchema.ColumnDataType[]{DataSchema.ColumnDataType.INT}));
   }
 
   @AfterMethod
@@ -60,32 +63,26 @@ public void tearDown()
   }
 
   @Test
-  public void shouldSplitAndRouteBlocksBasedOnPartitionKey() {
+  public void shouldSplitAndRouteBlocksBasedOnPartitionKey()
+      throws Exception {
     // Given:
     TestSelector selector = new TestSelector(Iterators.forArray(2, 0, 1));
-    Mockito.when(_block.getContainer()).thenReturn(ImmutableList.of(
-        new Object[]{0},
-        new Object[]{1},
-        new Object[]{2}
-    ));
-    ImmutableList<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1, MAILBOX_2);
+    Mockito.when(_block.getContainer()).thenReturn(ImmutableList.of(new Object[]{0}, new Object[]{1}, new Object[]{2}));
+    ImmutableList<SendingMailbox> destinations = ImmutableList.of(_mailbox1, _mailbox2);
 
     // When:
-    Iterator<BlockExchange.RoutedBlock> route =
-        new HashExchange(_mailboxService, destinations, selector, TransferableBlockUtils::splitBlock)
-            .route(destinations, _block);
+    new HashExchange(new OpChainId(1, 2, 3), destinations, selector, TransferableBlockUtils::splitBlock,
+        (opChainId) -> { }, System.currentTimeMillis() + 10_000L).route(destinations, _block);
 
     // Then:
-    BlockExchange.RoutedBlock block1 = route.next();
-    Assert.assertEquals(block1._destination, MAILBOX_1);
-    Assert.assertEquals(block1._block.getContainer().get(0), new Object[]{0});
-    Assert.assertEquals(block1._block.getContainer().get(1), new Object[]{1});
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
 
-    BlockExchange.RoutedBlock block2 = route.next();
-    Assert.assertEquals(block2._destination, MAILBOX_2);
-    Assert.assertEquals(block2._block.getContainer().get(0), new Object[]{2});
+    Mockito.verify(_mailbox1, Mockito.times(1)).send(captor.capture());
+    Assert.assertEquals(captor.getValue().getContainer().get(0), new Object[]{0});
+    Assert.assertEquals(captor.getValue().getContainer().get(1), new Object[]{1});
 
-    Assert.assertFalse(route.hasNext());
+    Mockito.verify(_mailbox2, Mockito.times(1)).send(captor.capture());
+    Assert.assertEquals(captor.getValue().getContainer().get(0), new Object[]{2});
   }
 
   private static class TestSelector implements KeySelector<Object[], Object[]> {
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchangeTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchangeTest.java
index 19e3db17114..5517d2e85a8 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchangeTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/RandomExchangeTest.java
@@ -19,33 +19,35 @@
 package org.apache.pinot.query.runtime.operator.exchange;
 
 import com.google.common.collect.ImmutableList;
-import java.util.Iterator;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-public class RandomExchangeTest {
-  private static final MailboxIdentifier MAILBOX_1 = new JsonMailboxIdentifier("1", "host:1", "host:1");
-  private static final MailboxIdentifier MAILBOX_2 = new JsonMailboxIdentifier("1", "host:1", "host:2");
 
+public class RandomExchangeTest {
   private AutoCloseable _mocks;
 
   @Mock
-  TransferableBlock _block;
+  private SendingMailbox _mailbox1;
   @Mock
-  MailboxService<TransferableBlock> _mailboxService;
+  private SendingMailbox _mailbox2;
+  @Mock
+  TransferableBlock _block;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_block.getType()).thenReturn(DataBlock.Type.METADATA);
   }
 
   @AfterMethod
@@ -55,19 +57,18 @@ public void tearDown()
   }
 
   @Test
-  public void shouldRouteRandomly() {
+  public void shouldRouteRandomly()
+      throws Exception {
     // Given:
-    ImmutableList<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1, MAILBOX_2);
+    ImmutableList<SendingMailbox> destinations = ImmutableList.of(_mailbox1, _mailbox2);
 
     // When:
-    Iterator<BlockExchange.RoutedBlock> route =
-        new RandomExchange(_mailboxService, destinations, size -> 1, TransferableBlockUtils::splitBlock)
-            .route(destinations, _block);
+    new RandomExchange(new OpChainId(1, 2, 3), destinations, size -> 1, TransferableBlockUtils::splitBlock,
+        (opChainId) -> { }, System.currentTimeMillis() + 10_000L).route(destinations, _block);
 
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
     // Then:
-    BlockExchange.RoutedBlock routedBlock = route.next();
-    Assert.assertEquals(routedBlock._destination, MAILBOX_2);
-    Assert.assertEquals(routedBlock._block, _block);
-    Assert.assertFalse(route.hasNext(), "should be done with routing");
+    Mockito.verify(_mailbox2, Mockito.times(1)).send(captor.capture());
+    Assert.assertEquals(captor.getValue(), _block);
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchangeTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchangeTest.java
index e38e533a9a2..42638e4b8ca 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchangeTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/operator/exchange/SingletonExchangeTest.java
@@ -19,13 +19,16 @@
 package org.apache.pinot.query.runtime.operator.exchange;
 
 import com.google.common.collect.ImmutableList;
-import java.util.Iterator;
-import org.apache.pinot.query.mailbox.JsonMailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxIdentifier;
-import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.common.datablock.DataBlock;
+import org.apache.pinot.query.mailbox.GrpcSendingMailbox;
+import org.apache.pinot.query.mailbox.InMemorySendingMailbox;
+import org.apache.pinot.query.mailbox.SendingMailbox;
 import org.apache.pinot.query.runtime.blocks.TransferableBlock;
 import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.operator.OpChainId;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -34,18 +37,21 @@
 
 
 public class SingletonExchangeTest {
-  private static final MailboxIdentifier MAILBOX_1 = new JsonMailboxIdentifier("1", "host:1", "host:1");
-
   private AutoCloseable _mocks;
 
   @Mock
-  TransferableBlock _block;
+  private InMemorySendingMailbox _mailbox1;
+  @Mock
+  private GrpcSendingMailbox _mailbox2;
   @Mock
-  MailboxService<TransferableBlock> _mailboxService;
+  private InMemorySendingMailbox _mailbox3;
+  @Mock
+  TransferableBlock _block;
 
   @BeforeMethod
   public void setUp() {
     _mocks = MockitoAnnotations.openMocks(this);
+    Mockito.when(_block.getType()).thenReturn(DataBlock.Type.METADATA);
   }
 
   @AfterMethod
@@ -55,19 +61,41 @@ public void tearDown()
   }
 
   @Test
-  public void shouldRouteSingleton() {
+  public void shouldRouteSingleton()
+      throws Exception {
     // Given:
-    ImmutableList<MailboxIdentifier> destinations = ImmutableList.of(MAILBOX_1);
+    ImmutableList<SendingMailbox> destinations = ImmutableList.of(_mailbox1);
 
     // When:
-    Iterator<BlockExchange.RoutedBlock> route =
-        new SingletonExchange(_mailboxService, destinations, TransferableBlockUtils::splitBlock)
-            .route(destinations, _block);
+    new SingletonExchange(new OpChainId(1, 2, 3), destinations, TransferableBlockUtils::splitBlock, (opChainId) -> {
+    }, System.currentTimeMillis() + 10_000L).route(destinations, _block);
 
     // Then:
-    BlockExchange.RoutedBlock routedBlock = route.next();
-    Assert.assertEquals(routedBlock._destination, MAILBOX_1);
-    Assert.assertEquals(routedBlock._block, _block);
-    Assert.assertFalse(route.hasNext(), "should be done with routing");
+    ArgumentCaptor<TransferableBlock> captor = ArgumentCaptor.forClass(TransferableBlock.class);
+    // Then:
+    Mockito.verify(_mailbox1, Mockito.times(1)).send(captor.capture());
+    Assert.assertEquals(captor.getValue(), _block);
+  }
+
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  public void shouldThrowWhenSingletonWithNonLocalMailbox()
+      throws Exception {
+    // Given:
+    ImmutableList<SendingMailbox> destinations = ImmutableList.of(_mailbox2);
+
+    // When:
+    new SingletonExchange(new OpChainId(1, 2, 3), destinations, TransferableBlockUtils::splitBlock, (opChainId) -> {
+    }, System.currentTimeMillis() + 10_000L).route(destinations, _block);
+  }
+
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  public void shouldThrowWhenSingletonWithMultipleMailboxes()
+      throws Exception {
+    // Given:
+    ImmutableList<SendingMailbox> destinations = ImmutableList.of(_mailbox1, _mailbox3);
+
+    // When:
+    new SingletonExchange(new OpChainId(1, 2, 3), destinations, TransferableBlockUtils::splitBlock, (opChainId) -> {
+    }, System.currentTimeMillis() + 10_000L).route(destinations, _block);
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerExecutorTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerExecutorTest.java
new file mode 100644
index 00000000000..6680b56942e
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/plan/pipeline/PipelineBreakerExecutorTest.java
@@ -0,0 +1,324 @@
+/**
+ * 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.pinot.query.runtime.plan.pipeline;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.calcite.rel.RelDistribution;
+import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rel.logical.PinotRelExchangeType;
+import org.apache.pinot.common.utils.DataSchema;
+import org.apache.pinot.query.mailbox.MailboxIdUtils;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.mailbox.ReceivingMailbox;
+import org.apache.pinot.query.planner.plannode.JoinNode;
+import org.apache.pinot.query.planner.plannode.MailboxReceiveNode;
+import org.apache.pinot.query.routing.MailboxMetadata;
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.apache.pinot.query.routing.WorkerMetadata;
+import org.apache.pinot.query.runtime.blocks.TransferableBlock;
+import org.apache.pinot.query.runtime.blocks.TransferableBlockUtils;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
+import org.apache.pinot.query.runtime.executor.RoundRobinScheduler;
+import org.apache.pinot.query.runtime.operator.OperatorTestUtil;
+import org.apache.pinot.query.runtime.plan.DistributedStagePlan;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.common.utils.DataSchema.ColumnDataType.INT;
+import static org.mockito.Mockito.when;
+
+
+public class PipelineBreakerExecutorTest {
+  private static final VirtualServerAddress RECEIVER_ADDRESS = new VirtualServerAddress("localhost", 123, 0);
+  private static final DataSchema DATA_SCHEMA =
+      new DataSchema(new String[]{"col1", "col2"}, new DataSchema.ColumnDataType[]{INT, INT});
+  private static final String MAILBOX_ID_1 = MailboxIdUtils.toMailboxId(0, 1, 0, 0, 0);
+  private static final String MAILBOX_ID_2 = MailboxIdUtils.toMailboxId(0, 2, 0, 0, 0);
+
+  private AutoCloseable _mocks;
+  @Mock
+  private MailboxService _mailboxService;
+  @Mock
+  private ReceivingMailbox _mailbox1;
+  @Mock
+  private ReceivingMailbox _mailbox2;
+
+  private VirtualServerAddress _server = new VirtualServerAddress("localhost", 123, 0);
+  private OpChainSchedulerService _scheduler = new OpChainSchedulerService(new RoundRobinScheduler(10_000L),
+      Executors.newCachedThreadPool());
+  private StageMetadata _stageMetadata1 = new StageMetadata.Builder().setWorkerMetadataList(Stream.of(_server).map(
+      s -> new WorkerMetadata.Builder().setVirtualServerAddress(s)
+          .addMailBoxInfoMap(0, new MailboxMetadata(
+              ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0),
+                  org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(2, 0, 0, 0)),
+              ImmutableList.of(_server), ImmutableMap.of()))
+          .addMailBoxInfoMap(1, new MailboxMetadata(
+              ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(1, 0, 0, 0)),
+              ImmutableList.of(_server), ImmutableMap.of()))
+          .addMailBoxInfoMap(2, new MailboxMetadata(
+              ImmutableList.of(org.apache.pinot.query.planner.physical.MailboxIdUtils.toPlanMailboxId(2, 0, 0, 0)),
+              ImmutableList.of(_server), ImmutableMap.of()))
+          .build()).collect(Collectors.toList())).build();
+
+  @BeforeClass
+  public void setUpClass() {
+    _scheduler.startAsync();
+  }
+
+  @AfterClass
+  public void tearDownClass() {
+    _scheduler.stopAsync();
+  }
+
+  @BeforeMethod
+  public void setUp() {
+    _mocks = MockitoAnnotations.openMocks(this);
+    when(_mailboxService.getHostname()).thenReturn("localhost");
+    when(_mailboxService.getPort()).thenReturn(123);
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws Exception {
+    _mocks.close();
+  }
+
+  @Test
+  public void shouldReturnBlocksUponNormalOperation() {
+    MailboxReceiveNode mailboxReceiveNode =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 1, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    DistributedStagePlan distributedStagePlan =
+        new DistributedStagePlan(0, RECEIVER_ADDRESS, mailboxReceiveNode, _stageMetadata1);
+
+    // when
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    Object[] row1 = new Object[]{1, 1};
+    Object[] row2 = new Object[]{2, 3};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        OperatorTestUtil.block(DATA_SCHEMA, row2),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock(OperatorTestUtil.getDummyStats(0, 1, _server)));
+
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(_scheduler, _mailboxService, distributedStagePlan,
+            System.currentTimeMillis() + 10_000L, 0, false);
+
+    // then
+    // should have single PB result, receive 2 data blocks, EOS block shouldn't be included
+    Assert.assertNotNull(pipelineBreakerResult);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().size(), 1);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().values().iterator().next().size(), 2);
+
+    // should collect stats from previous stage here
+    Assert.assertNotNull(pipelineBreakerResult.getOpChainStats());
+    Assert.assertEquals(pipelineBreakerResult.getOpChainStats().getOperatorStatsMap().size(), 1);
+  }
+
+  @Test
+  public void shouldWorkWithMultiplePBNodeUponNormalOperation() {
+    MailboxReceiveNode mailboxReceiveNode1 =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 1, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    MailboxReceiveNode mailboxReceiveNode2 =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 2, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    JoinNode joinNode = new JoinNode(0, DATA_SCHEMA, DATA_SCHEMA, DATA_SCHEMA, JoinRelType.INNER, null, null, false);
+    joinNode.addInput(mailboxReceiveNode1);
+    joinNode.addInput(mailboxReceiveNode2);
+    DistributedStagePlan distributedStagePlan =
+        new DistributedStagePlan(0, RECEIVER_ADDRESS, joinNode, _stageMetadata1);
+
+    // when
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row1 = new Object[]{1, 1};
+    Object[] row2 = new Object[]{2, 3};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock(OperatorTestUtil.getDummyStats(0, 1, _server)));
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row2),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock(OperatorTestUtil.getDummyStats(0, 2, _server)));
+
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(_scheduler, _mailboxService, distributedStagePlan,
+            System.currentTimeMillis() + 10_000L, 0, false);
+
+    // then
+    // should have two PB result, receive 2 data blocks, one each, EOS block shouldn't be included
+    Assert.assertNotNull(pipelineBreakerResult);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().size(), 2);
+    Iterator<List<TransferableBlock>> it = pipelineBreakerResult.getResultMap().values().iterator();
+    Assert.assertEquals(it.next().size(), 1);
+    Assert.assertEquals(it.next().size(), 1);
+    Assert.assertFalse(it.hasNext());
+
+    // should collect stats from previous stage here
+    Assert.assertNotNull(pipelineBreakerResult.getOpChainStats());
+    Assert.assertEquals(pipelineBreakerResult.getOpChainStats().getOperatorStatsMap().size(), 2);
+  }
+
+  @Test
+  public void shouldReturnErrorBlocksFailureWhenPBExecute() {
+    MailboxReceiveNode incorrectlyConfiguredMailboxNode =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 3, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    DistributedStagePlan distributedStagePlan =
+        new DistributedStagePlan(0, RECEIVER_ADDRESS, incorrectlyConfiguredMailboxNode, _stageMetadata1);
+
+    // when
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(_scheduler, _mailboxService, distributedStagePlan,
+            System.currentTimeMillis() + 10_000L, 0, false);
+
+    // then
+    // should contain only failure error blocks
+    Assert.assertNotNull(pipelineBreakerResult);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().size(), 1);
+    List<TransferableBlock> resultBlocks = pipelineBreakerResult.getResultMap().values().iterator().next();
+    Assert.assertEquals(resultBlocks.size(), 1);
+    Assert.assertTrue(resultBlocks.get(0).isEndOfStreamBlock());
+    Assert.assertFalse(resultBlocks.get(0).isSuccessfulEndOfStreamBlock());
+
+    // should have null stats from previous stage here
+    Assert.assertNull(pipelineBreakerResult.getOpChainStats());
+  }
+
+  @Test
+  public void shouldReturnErrorBlocksFailureWhenPBTimeout() {
+    MailboxReceiveNode incorrectlyConfiguredMailboxNode =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 1, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    DistributedStagePlan distributedStagePlan =
+        new DistributedStagePlan(0, RECEIVER_ADDRESS, incorrectlyConfiguredMailboxNode, _stageMetadata1);
+
+    // when
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    Object[] row1 = new Object[]{1, 1};
+    Object[] row2 = new Object[]{2, 3};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        OperatorTestUtil.block(DATA_SCHEMA, row2),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(_scheduler, _mailboxService, distributedStagePlan,
+            System.currentTimeMillis() - 10_000L, 0, false);
+
+    // then
+    // should contain only failure error blocks
+    Assert.assertNotNull(pipelineBreakerResult);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().size(), 1);
+    List<TransferableBlock> resultBlocks = pipelineBreakerResult.getResultMap().values().iterator().next();
+    Assert.assertEquals(resultBlocks.size(), 1);
+    Assert.assertTrue(resultBlocks.get(0).isEndOfStreamBlock());
+    Assert.assertFalse(resultBlocks.get(0).isSuccessfulEndOfStreamBlock());
+  }
+
+  @Test
+  public void shouldReturnErrorBlocksWhenAnyPBFailure() {
+    MailboxReceiveNode mailboxReceiveNode1 =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 1, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    MailboxReceiveNode incorrectlyConfiguredMailboxNode =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 3, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    JoinNode joinNode = new JoinNode(0, DATA_SCHEMA, DATA_SCHEMA, DATA_SCHEMA, JoinRelType.INNER, null, null, false);
+    joinNode.addInput(mailboxReceiveNode1);
+    joinNode.addInput(incorrectlyConfiguredMailboxNode);
+    DistributedStagePlan distributedStagePlan =
+        new DistributedStagePlan(0, RECEIVER_ADDRESS, joinNode, _stageMetadata1);
+
+    // when
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row1 = new Object[]{1, 1};
+    Object[] row2 = new Object[]{2, 3};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row2),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(_scheduler, _mailboxService, distributedStagePlan,
+            System.currentTimeMillis() + 10_000L, 0, false);
+
+    // then
+    // should fail even if one of the 2 PB returns correct results.
+    Assert.assertNotNull(pipelineBreakerResult);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().size(), 2);
+    for (List<TransferableBlock> resultBlocks : pipelineBreakerResult.getResultMap().values()) {
+      Assert.assertEquals(resultBlocks.size(), 1);
+      Assert.assertTrue(resultBlocks.get(0).isEndOfStreamBlock());
+      Assert.assertFalse(resultBlocks.get(0).isSuccessfulEndOfStreamBlock());
+    }
+
+    // should have null stats from previous stage here
+    Assert.assertNull(pipelineBreakerResult.getOpChainStats());
+  }
+
+  @Test
+  public void shouldReturnErrorBlocksWhenReceivedErrorFromSender() {
+    MailboxReceiveNode mailboxReceiveNode1 =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 1, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    MailboxReceiveNode incorrectlyConfiguredMailboxNode =
+        new MailboxReceiveNode(0, DATA_SCHEMA, 2, RelDistribution.Type.SINGLETON, PinotRelExchangeType.PIPELINE_BREAKER,
+            null, null, false, false, null);
+    JoinNode joinNode = new JoinNode(0, DATA_SCHEMA, DATA_SCHEMA, DATA_SCHEMA, JoinRelType.INNER, null, null, false);
+    joinNode.addInput(mailboxReceiveNode1);
+    joinNode.addInput(incorrectlyConfiguredMailboxNode);
+    DistributedStagePlan distributedStagePlan =
+        new DistributedStagePlan(0, RECEIVER_ADDRESS, joinNode, _stageMetadata1);
+
+    // when
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_1)).thenReturn(_mailbox1);
+    when(_mailboxService.getReceivingMailbox(MAILBOX_ID_2)).thenReturn(_mailbox2);
+    Object[] row1 = new Object[]{1, 1};
+    Object[] row2 = new Object[]{2, 3};
+    when(_mailbox1.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row1),
+        TransferableBlockUtils.getErrorTransferableBlock(new RuntimeException("ERROR ON 1")));
+    when(_mailbox2.poll()).thenReturn(OperatorTestUtil.block(DATA_SCHEMA, row2),
+        TransferableBlockUtils.getEndOfStreamTransferableBlock());
+
+    PipelineBreakerResult pipelineBreakerResult =
+        PipelineBreakerExecutor.executePipelineBreakers(_scheduler, _mailboxService, distributedStagePlan,
+            System.currentTimeMillis() + 10_000L, 0, false);
+
+    // then
+    // should fail even if one of the 2 PB doesn't contain error block from sender.
+    Assert.assertNotNull(pipelineBreakerResult);
+    Assert.assertEquals(pipelineBreakerResult.getResultMap().size(), 2);
+    for (List<TransferableBlock> resultBlocks : pipelineBreakerResult.getResultMap().values()) {
+      Assert.assertEquals(resultBlocks.size(), 1);
+      Assert.assertTrue(resultBlocks.get(0).isEndOfStreamBlock());
+      Assert.assertFalse(resultBlocks.get(0).isSuccessfulEndOfStreamBlock());
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtilsTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtilsTest.java
new file mode 100644
index 00000000000..9ca24ebf484
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/plan/serde/QueryPlanSerDeUtilsTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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.pinot.query.runtime.plan.serde;
+
+import org.apache.pinot.query.routing.VirtualServerAddress;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class QueryPlanSerDeUtilsTest {
+
+  @Test
+  public void shouldSerializeServer() {
+    // Given:
+    VirtualServerAddress server = Mockito.mock(VirtualServerAddress.class);
+    Mockito.when(server.workerId()).thenReturn(1);
+    Mockito.when(server.hostname()).thenReturn("Server_192.987.1.123");
+    Mockito.when(server.port()).thenReturn(80);
+
+    // When:
+    String serialized = QueryPlanSerDeUtils.addressToProto(server);
+
+    // Then:
+    Assert.assertEquals(serialized, "1@Server_192.987.1.123:80");
+  }
+
+  @Test
+  public void shouldDeserializeServerString() {
+    // Given:
+    String serverString = "1@Server_192.987.1.123:80";
+
+    // When:
+    VirtualServerAddress server = QueryPlanSerDeUtils.protoToAddress(serverString);
+
+    // Then:
+    Assert.assertEquals(server.workerId(), 1);
+    Assert.assertEquals(server.hostname(), "Server_192.987.1.123");
+    Assert.assertEquals(server.port(), 80);
+  }
+}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/ResourceBasedQueriesTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/ResourceBasedQueriesTest.java
index b0a09f3f71d..7db0386c155 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/ResourceBasedQueriesTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/runtime/queries/ResourceBasedQueriesTest.java
@@ -33,16 +33,22 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import org.apache.pinot.common.datatable.DataTableFactory;
+import org.apache.pinot.common.datatable.DataTable;
+import org.apache.pinot.common.response.broker.BrokerResponseNativeV2;
+import org.apache.pinot.common.response.broker.BrokerResponseStats;
 import org.apache.pinot.core.common.datatable.DataTableBuilderFactory;
+import org.apache.pinot.core.query.reduce.ExecutionStatsAggregator;
 import org.apache.pinot.query.QueryEnvironmentTestBase;
 import org.apache.pinot.query.QueryServerEnclosure;
-import org.apache.pinot.query.mailbox.GrpcMailboxService;
-import org.apache.pinot.query.routing.WorkerInstance;
+import org.apache.pinot.query.mailbox.MailboxService;
+import org.apache.pinot.query.routing.QueryServerInstance;
 import org.apache.pinot.query.runtime.QueryRunnerTestBase;
+import org.apache.pinot.query.runtime.executor.OpChainSchedulerService;
+import org.apache.pinot.query.runtime.executor.RoundRobinScheduler;
 import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.query.testutils.MockInstanceDataManagerFactory;
 import org.apache.pinot.query.testutils.QueryTestUtils;
@@ -50,6 +56,7 @@
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -65,11 +72,11 @@ public class ResourceBasedQueriesTest extends QueryRunnerTestBase {
   private static final Random RANDOM = new Random(42);
   private static final String FILE_FILTER_PROPERTY = "pinot.fileFilter";
 
+  private final Map<String, Set<String>> _tableToSegmentMap = new HashMap<>();
+
   @BeforeClass
   public void setUp()
       throws Exception {
-    DataTableBuilderFactory.setDataTableVersion(DataTableFactory.VERSION_4);
-
     // Setting up mock server factories.
     // All test data are loaded upfront b/c the mock server and brokers needs to be in sync.
     MockInstanceDataManagerFactory factory1 = new MockInstanceDataManagerFactory("server1");
@@ -88,6 +95,7 @@ public void setUp()
       // table will be registered on both servers.
       Map<String, Schema> schemaMap = new HashMap<>();
       for (Map.Entry<String, QueryTestCase.Table> tableEntry : testCase._tables.entrySet()) {
+        boolean allowEmptySegment = !BooleanUtils.toBoolean(extractExtraProps(testCase._extraProps, "noEmptySegment"));
         String tableName = testCaseName + "_" + tableEntry.getKey();
         // Testing only OFFLINE table b/c Hybrid table test is a special case to test separately.
         String tableNameWithType = TableNameBuilder.forType(TableType.OFFLINE).tableNameWithType(tableName);
@@ -106,17 +114,21 @@ public void setUp()
 
         for (GenericRow row : genericRows) {
           if (row == SEGMENT_BREAKER_ROW) {
-            factory1.addSegment(tableNameWithType, rows1);
-            factory2.addSegment(tableNameWithType, rows2);
-            rows1 = new ArrayList<>();
-            rows2 = new ArrayList<>();
+            if (allowEmptySegment || rows1.size() > 0) {
+              factory1.addSegment(tableNameWithType, rows1);
+              rows1 = new ArrayList<>();
+            }
+            if (allowEmptySegment || rows2.size() > 0) {
+              factory2.addSegment(tableNameWithType, rows2);
+              rows2 = new ArrayList<>();
+            }
           } else {
             long partition = 0;
             if (partitionColumns == null) {
               partition = RANDOM.nextInt(2);
             } else {
               for (String field : partitionColumns) {
-                partition = (partition + ((GenericRow) row).getValue(field).hashCode()) % 42;
+                partition = (partition + row.getValue(field).hashCode()) % 42;
               }
             }
             if (partition % 2 == 0) {
@@ -126,8 +138,12 @@ public void setUp()
             }
           }
         }
-        factory1.addSegment(tableNameWithType, rows1);
-        factory2.addSegment(tableNameWithType, rows2);
+        if (allowEmptySegment || rows1.size() > 0) {
+          factory1.addSegment(tableNameWithType, rows1);
+        }
+        if (allowEmptySegment || rows2.size() > 0) {
+          factory2.addSegment(tableNameWithType, rows2);
+        }
       }
 
       boolean anyHaveOutput = testCase._queries.stream().anyMatch(q -> q._outputs != null);
@@ -158,10 +174,27 @@ public void setUp()
     Map<String, Object> reducerConfig = new HashMap<>();
     reducerConfig.put(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, _reducerGrpcPort);
     reducerConfig.put(QueryConfig.KEY_OF_QUERY_RUNNER_HOSTNAME, _reducerHostname);
-    _mailboxService = new GrpcMailboxService(_reducerHostname, _reducerGrpcPort, new PinotConfiguration(reducerConfig),
-        ignored -> { });
+    _reducerScheduler = new OpChainSchedulerService(new RoundRobinScheduler(10_000L), REDUCE_EXECUTOR);
+    _mailboxService = new MailboxService(QueryConfig.DEFAULT_QUERY_RUNNER_HOSTNAME, _reducerGrpcPort,
+        new PinotConfiguration(reducerConfig), _reducerScheduler::onDataAvailable);
+    _reducerScheduler.startAsync();
     _mailboxService.start();
 
+    Map<String, List<String>> tableToSegmentMap1 = factory1.buildTableSegmentNameMap();
+    Map<String, List<String>> tableToSegmentMap2 = factory2.buildTableSegmentNameMap();
+
+    for (Map.Entry<String, List<String>> entry : tableToSegmentMap1.entrySet()) {
+      _tableToSegmentMap.put(entry.getKey(), new HashSet<>(entry.getValue()));
+    }
+
+    for (Map.Entry<String, List<String>> entry : tableToSegmentMap2.entrySet()) {
+      if (_tableToSegmentMap.containsKey(entry.getKey())) {
+        _tableToSegmentMap.get(entry.getKey()).addAll(entry.getValue());
+      } else {
+        _tableToSegmentMap.put(entry.getKey(), new HashSet<>(entry.getValue()));
+      }
+    }
+
     _queryEnvironment =
         QueryEnvironmentTestBase.getQueryEnvironment(_reducerGrpcPort, server1.getPort(), server2.getPort(),
             factory1.buildSchemaMap(), factory1.buildTableSegmentNameMap(), factory2.buildTableSegmentNameMap());
@@ -171,8 +204,8 @@ public void setUp()
     // this is only use for test identifier purpose.
     int port1 = server1.getPort();
     int port2 = server2.getPort();
-    _servers.put(new WorkerInstance("localhost", port1, port1, port1, port1), server1);
-    _servers.put(new WorkerInstance("localhost", port2, port2, port2, port2), server2);
+    _servers.put(new QueryServerInstance("localhost", port1, port1), server1);
+    _servers.put(new QueryServerInstance("localhost", port2, port2), server2);
   }
 
   @AfterClass
@@ -182,16 +215,18 @@ public void tearDown() {
       server.shutDown();
     }
     _mailboxService.shutdown();
+    _reducerScheduler.stopAsync();
   }
 
   // TODO: name the test using testCaseName for testng reports
   @Test(dataProvider = "testResourceQueryTestCaseProviderInputOnly")
-  public void testQueryTestCasesWithH2(String testCaseName, String sql, String expect)
+  public void testQueryTestCasesWithH2(String testCaseName, String sql, String h2Sql, String expect,
+      boolean keepOutputRowOrder)
       throws Exception {
     // query pinot
-    runQuery(sql, expect).ifPresent(rows -> {
+    runQuery(sql, expect, null).ifPresent(rows -> {
       try {
-        compareRowEquals(rows, queryH2(sql));
+        compareRowEquals(rows, queryH2(h2Sql), keepOutputRowOrder);
       } catch (Exception e) {
         Assert.fail(e.getMessage(), e);
       }
@@ -199,15 +234,72 @@ public void testQueryTestCasesWithH2(String testCaseName, String sql, String exp
   }
 
   @Test(dataProvider = "testResourceQueryTestCaseProviderBoth")
-  public void testQueryTestCasesWithOutput(String testCaseName, String sql, List<Object[]> expectedRows, String expect)
+  public void testQueryTestCasesWithOutput(String testCaseName, String sql, String h2Sql, List<Object[]> expectedRows,
+      String expect, boolean keepOutputRowOrder)
       throws Exception {
-    runQuery(sql, expect).ifPresent(rows -> compareRowEquals(rows, expectedRows));
+    runQuery(sql, expect, null).ifPresent(rows -> compareRowEquals(rows, expectedRows, keepOutputRowOrder));
+  }
+
+  @Test(dataProvider = "testResourceQueryTestCaseProviderWithMetadata")
+  public void testQueryTestCasesWithMetadata(String testCaseName, String sql, String h2Sql, String expect,
+      int numSegments)
+      throws Exception {
+    Map<Integer, ExecutionStatsAggregator> executionStatsAggregatorMap = new HashMap<>();
+    runQuery(sql, expect, executionStatsAggregatorMap).ifPresent(rows -> {
+      BrokerResponseNativeV2 brokerResponseNative = new BrokerResponseNativeV2();
+      executionStatsAggregatorMap.get(0).setStats(brokerResponseNative);
+      Assert.assertFalse(executionStatsAggregatorMap.isEmpty());
+      for (Integer stageId : executionStatsAggregatorMap.keySet()) {
+        if (stageId > 0) {
+          BrokerResponseStats brokerResponseStats = new BrokerResponseStats();
+          executionStatsAggregatorMap.get(stageId).setStageLevelStats(null, brokerResponseStats, null);
+          brokerResponseNative.addStageStat(stageId, brokerResponseStats);
+        }
+      }
+
+      Assert.assertEquals(brokerResponseNative.getNumSegmentsQueried(), numSegments);
+
+      Map<Integer, BrokerResponseStats> stageIdStats = brokerResponseNative.getStageIdStats();
+      int numTables = 0;
+      for (Integer stageId : stageIdStats.keySet()) {
+        // check stats only for leaf stage
+        BrokerResponseStats brokerResponseStats = stageIdStats.get(stageId);
+
+        if (brokerResponseStats.getTableNames().isEmpty()) {
+          continue;
+        }
+
+        String tableName = brokerResponseStats.getTableNames().get(0);
+        Assert.assertEquals(brokerResponseStats.getTableNames().size(), 1);
+        numTables++;
+        TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableName);
+        if (tableType == null) {
+          tableName = TableNameBuilder.OFFLINE.tableNameWithType(tableName);
+        }
+
+        Assert.assertNotNull(_tableToSegmentMap.get(tableName));
+        Assert.assertEquals(brokerResponseStats.getNumSegmentsQueried(), _tableToSegmentMap.get(tableName).size());
+
+        Assert.assertFalse(brokerResponseStats.getOperatorStats().isEmpty());
+        Map<String, Map<String, String>> operatorStats = brokerResponseStats.getOperatorStats();
+        for (Map.Entry<String, Map<String, String>> entry : operatorStats.entrySet()) {
+          if (entry.getKey().contains("LEAF_STAGE")) {
+            Assert.assertNotNull(entry.getValue().get(DataTable.MetadataKey.NUM_SEGMENTS_QUERIED.getName()));
+          } else {
+            Assert.assertNotNull(entry.getValue().get(DataTable.MetadataKey.NUM_BLOCKS.getName()));
+          }
+        }
+      }
+
+      Assert.assertTrue(numTables > 0);
+    });
   }
 
-  private Optional<List<Object[]>> runQuery(String sql, final String except) {
+  private Optional<List<Object[]>> runQuery(String sql, final String except,
+      Map<Integer, ExecutionStatsAggregator> executionStatsAggregatorMap) {
     try {
       // query pinot
-      List<Object[]> resultRows = queryRunner(sql);
+      List<Object[]> resultRows = queryRunner(sql, executionStatsAggregatorMap);
 
       Assert.assertNull(except,
           "Expected error with message '" + except + "'. But instead rows were returned: " + resultRows.stream()
@@ -229,7 +321,7 @@ private Optional<List<Object[]>> runQuery(String sql, final String except) {
   }
 
   @DataProvider
-  private static Object[][] testResourceQueryTestCaseProviderBoth()
+  private Object[][] testResourceQueryTestCaseProviderBoth()
       throws Exception {
     Map<String, QueryTestCase> testCaseMap = getTestCases();
     List<Object[]> providerContent = new ArrayList<>();
@@ -247,12 +339,16 @@ private static Object[][] testResourceQueryTestCaseProviderBoth()
 
         if (queryCase._outputs != null) {
           String sql = replaceTableName(testCaseName, queryCase._sql);
+          String h2Sql = queryCase._h2Sql != null ? replaceTableName(testCaseName, queryCase._h2Sql)
+              : replaceTableName(testCaseName, queryCase._sql);
           List<List<Object>> orgRows = queryCase._outputs;
           List<Object[]> expectedRows = new ArrayList<>(orgRows.size());
           for (List<Object> objs : orgRows) {
             expectedRows.add(objs.toArray());
           }
-          Object[] testEntry = new Object[]{testCaseName, sql, expectedRows, queryCase._expectedException};
+          Object[] testEntry = new Object[]{
+              testCaseName, sql, h2Sql, expectedRows, queryCase._expectedException, queryCase._keepOutputRowOrder
+          };
           providerContent.add(testEntry);
         }
       }
@@ -261,7 +357,52 @@ private static Object[][] testResourceQueryTestCaseProviderBoth()
   }
 
   @DataProvider
-  private static Object[][] testResourceQueryTestCaseProviderInputOnly()
+  private Object[][] testResourceQueryTestCaseProviderWithMetadata()
+      throws Exception {
+    Map<String, QueryTestCase> testCaseMap = getTestCases();
+    List<Object[]> providerContent = new ArrayList<>();
+    Set<String> validTestCases = new HashSet<>();
+    validTestCases.add("metadata_test");
+
+    for (Map.Entry<String, QueryTestCase> testCaseEntry : testCaseMap.entrySet()) {
+      String testCaseName = testCaseEntry.getKey();
+      if (!validTestCases.contains(testCaseName)) {
+        continue;
+      }
+
+      if (testCaseEntry.getValue()._ignored) {
+        continue;
+      }
+
+      List<QueryTestCase.Query> queryCases = testCaseEntry.getValue()._queries;
+      for (QueryTestCase.Query queryCase : queryCases) {
+
+        if (queryCase._ignored) {
+          continue;
+        }
+
+        if (queryCase._outputs == null) {
+          String sql = replaceTableName(testCaseName, queryCase._sql);
+          String h2Sql = queryCase._h2Sql != null ? replaceTableName(testCaseName, queryCase._h2Sql)
+              : replaceTableName(testCaseName, queryCase._sql);
+
+          int segmentCount = 0;
+          if (queryCase._expectedNumSegments != null) {
+            segmentCount = queryCase._expectedNumSegments;
+          } else {
+            throw new RuntimeException("Unable to test metadata without expected num segments configuration!");
+          }
+
+          Object[] testEntry = new Object[]{testCaseName, sql, h2Sql, queryCase._expectedException, segmentCount};
+          providerContent.add(testEntry);
+        }
+      }
+    }
+    return providerContent.toArray(new Object[][]{});
+  }
+
+  @DataProvider
+  private Object[][] testResourceQueryTestCaseProviderInputOnly()
       throws Exception {
     Map<String, QueryTestCase> testCaseMap = getTestCases();
     List<Object[]> providerContent = new ArrayList<>();
@@ -278,7 +419,10 @@ private static Object[][] testResourceQueryTestCaseProviderInputOnly()
         }
         if (queryCase._outputs == null) {
           String sql = replaceTableName(testCaseName, queryCase._sql);
-          Object[] testEntry = new Object[]{testCaseName, sql, queryCase._expectedException};
+          String h2Sql = queryCase._h2Sql != null ? replaceTableName(testCaseName, queryCase._h2Sql)
+              : replaceTableName(testCaseName, queryCase._sql);
+          Object[] testEntry =
+              new Object[]{testCaseName, sql, h2Sql, queryCase._expectedException, queryCase._keepOutputRowOrder};
           providerContent.add(testEntry);
         }
       }
@@ -292,7 +436,7 @@ private static String replaceTableName(String testCaseName, String sql) {
   }
 
   // TODO: cache this test case generator
-  private static Map<String, QueryTestCase> getTestCases()
+  private Map<String, QueryTestCase> getTestCases()
       throws Exception {
     Map<String, QueryTestCase> testCaseMap = new HashMap<>();
     ClassLoader classLoader = ResourceBasedQueriesTest.class.getClassLoader();
@@ -319,11 +463,13 @@ private static Map<String, QueryTestCase> getTestCases()
       URL testFileUrl = classLoader.getResource(testCaseFile);
       // This test only supports local resource loading (e.g. must be a file), not support JAR test loading.
       if (testFileUrl != null && new File(testFileUrl.getFile()).exists()) {
-        Map<String, QueryTestCase> testCases = MAPPER.readValue(new File(testFileUrl.getFile()),
-            new TypeReference<Map<String, QueryTestCase>>() { });
+        Map<String, QueryTestCase> testCases =
+            MAPPER.readValue(new File(testFileUrl.getFile()), new TypeReference<Map<String, QueryTestCase>>() {
+            });
         {
           HashSet<String> hashSet = new HashSet<>(testCaseMap.keySet());
           hashSet.retainAll(testCases.keySet());
+
           if (!hashSet.isEmpty()) {
             throw new IllegalArgumentException("testCase already exist for the following names: " + hashSet);
           }
@@ -333,4 +479,11 @@ private static Map<String, QueryTestCase> getTestCases()
     }
     return testCaseMap;
   }
+
+  private static Object extractExtraProps(Map<String, Object> extraProps, String propKey) {
+    if (extraProps == null) {
+      return null;
+    }
+    return extraProps.getOrDefault(propKey, null);
+  }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryDispatcherTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryDispatcherTest.java
deleted file mode 100644
index b0f2dc0a5e1..00000000000
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryDispatcherTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.query.service;
-
-import com.google.common.collect.Lists;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import org.apache.pinot.query.QueryEnvironment;
-import org.apache.pinot.query.QueryEnvironmentTestBase;
-import org.apache.pinot.query.QueryTestSet;
-import org.apache.pinot.query.planner.PlannerUtils;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.runtime.QueryRunner;
-import org.apache.pinot.query.testutils.QueryTestUtils;
-import org.mockito.Mockito;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-public class QueryDispatcherTest extends QueryTestSet {
-  private static final Random RANDOM_REQUEST_ID_GEN = new Random();
-  private static final int QUERY_SERVER_COUNT = 2;
-  private final Map<Integer, QueryServer> _queryServerMap = new HashMap<>();
-  private final Map<Integer, QueryRunner> _queryRunnerMap = new HashMap<>();
-
-  private QueryEnvironment _queryEnvironment;
-
-  @BeforeClass
-  public void setUp()
-      throws Exception {
-
-    for (int i = 0; i < QUERY_SERVER_COUNT; i++) {
-      int availablePort = QueryTestUtils.getAvailablePort();
-      QueryRunner queryRunner = Mockito.mock(QueryRunner.class);
-      QueryServer queryServer = new QueryServer(availablePort, queryRunner);
-      queryServer.start();
-      _queryServerMap.put(availablePort, queryServer);
-      _queryRunnerMap.put(availablePort, queryRunner);
-    }
-
-    List<Integer> portList = Lists.newArrayList(_queryServerMap.keySet());
-
-    // reducer port doesn't matter, we are testing the worker instance not GRPC.
-    _queryEnvironment = QueryEnvironmentTestBase.getQueryEnvironment(1, portList.get(0), portList.get(1),
-        QueryEnvironmentTestBase.TABLE_SCHEMAS, QueryEnvironmentTestBase.SERVER1_SEGMENTS,
-        QueryEnvironmentTestBase.SERVER2_SEGMENTS);
-  }
-
-  @AfterClass
-  public void tearDown() {
-    for (QueryServer worker : _queryServerMap.values()) {
-      worker.shutdown();
-    }
-  }
-
-  @Test(dataProvider = "testSql")
-  public void testQueryDispatcherCanSendCorrectPayload(String sql)
-      throws Exception {
-    QueryPlan queryPlan = _queryEnvironment.planQuery(sql);
-    QueryDispatcher dispatcher = new QueryDispatcher();
-    int reducerStageId = dispatcher.submit(RANDOM_REQUEST_ID_GEN.nextLong(), queryPlan, 10_000L, new HashMap<>());
-    Assert.assertTrue(PlannerUtils.isRootStage(reducerStageId));
-    dispatcher.shutdown();
-  }
-}
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryServerTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryServerTest.java
index f7c7f06f0f0..6c4d8bbb02d 100644
--- a/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryServerTest.java
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/QueryServerTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.query.service;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -26,20 +27,27 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.apache.pinot.common.proto.PinotQueryWorkerGrpc;
 import org.apache.pinot.common.proto.Worker;
-import org.apache.pinot.core.transport.ServerInstance;
+import org.apache.pinot.common.utils.NamedThreadFactory;
+import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.core.routing.TimeBoundaryInfo;
 import org.apache.pinot.query.QueryEnvironment;
 import org.apache.pinot.query.QueryEnvironmentTestBase;
 import org.apache.pinot.query.QueryTestSet;
-import org.apache.pinot.query.planner.QueryPlan;
-import org.apache.pinot.query.planner.StageMetadata;
-import org.apache.pinot.query.planner.stage.StageNode;
-import org.apache.pinot.query.routing.WorkerInstance;
+import org.apache.pinot.query.planner.DispatchablePlanFragment;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.plannode.PlanNode;
+import org.apache.pinot.query.routing.QueryServerInstance;
+import org.apache.pinot.query.routing.WorkerMetadata;
 import org.apache.pinot.query.runtime.QueryRunner;
+import org.apache.pinot.query.runtime.plan.StageMetadata;
 import org.apache.pinot.query.runtime.plan.serde.QueryPlanSerDeUtils;
 import org.apache.pinot.query.testutils.QueryTestUtils;
 import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.EqualityUtils;
 import org.apache.pinot.util.TestUtils;
 import org.mockito.Mockito;
 import org.testng.Assert;
@@ -53,9 +61,13 @@ public class QueryServerTest extends QueryTestSet {
   private static final int QUERY_SERVER_COUNT = 2;
   private static final String KEY_OF_SERVER_INSTANCE_HOST = "pinot.query.runner.server.hostname";
   private static final String KEY_OF_SERVER_INSTANCE_PORT = "pinot.query.runner.server.port";
+  private static final ExecutorService LEAF_WORKER_EXECUTOR_SERVICE =
+      Executors.newFixedThreadPool(ResourceManager.DEFAULT_QUERY_WORKER_THREADS,
+          new NamedThreadFactory("QueryDispatcherTest_LeafWorker"));
+  private static final ExecutorService INTERM_WORKER_EXECUTOR_SERVICE =
+      Executors.newCachedThreadPool(new NamedThreadFactory("QueryDispatcherTest_IntermWorker"));
 
   private final Map<Integer, QueryServer> _queryServerMap = new HashMap<>();
-  private final Map<Integer, ServerInstance> _queryServerInstanceMap = new HashMap<>();
   private final Map<Integer, QueryRunner> _queryRunnerMap = new HashMap<>();
 
   private QueryEnvironment _queryEnvironment;
@@ -67,14 +79,12 @@ public void setUp()
     for (int i = 0; i < QUERY_SERVER_COUNT; i++) {
       int availablePort = QueryTestUtils.getAvailablePort();
       QueryRunner queryRunner = Mockito.mock(QueryRunner.class);
+      Mockito.when(queryRunner.getQueryWorkerLeafExecutorService()).thenReturn(LEAF_WORKER_EXECUTOR_SERVICE);
+      Mockito.when(queryRunner.getQueryWorkerIntermExecutorService()).thenReturn(INTERM_WORKER_EXECUTOR_SERVICE);
       QueryServer queryServer = new QueryServer(availablePort, queryRunner);
       queryServer.start();
       _queryServerMap.put(availablePort, queryServer);
       _queryRunnerMap.put(availablePort, queryRunner);
-      // this only test the QueryServer functionality so the server port can be the same as the mailbox port.
-      // this is only use for test identifier purpose.
-      _queryServerInstanceMap.put(availablePort, new WorkerInstance("localhost", availablePort, availablePort,
-          availablePort, availablePort));
     }
 
     List<Integer> portList = Lists.newArrayList(_queryServerMap.keySet());
@@ -96,56 +106,99 @@ public void tearDown() {
   @Test(dataProvider = "testSql")
   public void testWorkerAcceptsWorkerRequestCorrect(String sql)
       throws Exception {
-    QueryPlan queryPlan = _queryEnvironment.planQuery(sql);
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
 
-    for (int stageId : queryPlan.getStageMetadataMap().keySet()) {
+    for (int stageId = 0; stageId < dispatchableSubPlan.getQueryStageList().size(); stageId++) {
       if (stageId > 0) { // we do not test reduce stage.
         // only get one worker request out.
-        Worker.QueryRequest queryRequest = getQueryRequest(queryPlan, stageId);
+        Worker.QueryRequest queryRequest = getQueryRequest(dispatchableSubPlan, stageId);
 
         // submit the request for testing.
         submitRequest(queryRequest);
 
-        StageMetadata stageMetadata = queryPlan.getStageMetadataMap().get(stageId);
+        DispatchablePlanFragment dispatchablePlanFragment = dispatchableSubPlan.getQueryStageList().get(stageId);
+
+        StageMetadata stageMetadata = new StageMetadata.Builder()
+            .setWorkerMetadataList(dispatchablePlanFragment.getWorkerMetadataList())
+            .addCustomProperties(dispatchablePlanFragment.getCustomProperties()).build();
 
         // ensure mock query runner received correctly deserialized payload.
-        QueryRunner mockRunner = _queryRunnerMap.get(
-            Integer.parseInt(queryRequest.getMetadataOrThrow(KEY_OF_SERVER_INSTANCE_PORT)));
+        QueryRunner mockRunner =
+            _queryRunnerMap.get(Integer.parseInt(queryRequest.getMetadataOrThrow(KEY_OF_SERVER_INSTANCE_PORT)));
         String requestIdStr = queryRequest.getMetadataOrThrow(QueryConfig.KEY_OF_BROKER_REQUEST_ID);
 
         // since submitRequest is async, we need to wait for the mockRunner to receive the query payload.
+        int finalStageId = stageId;
         TestUtils.waitForCondition(aVoid -> {
           try {
             Mockito.verify(mockRunner).processQuery(Mockito.argThat(distributedStagePlan -> {
-              StageNode stageNode = queryPlan.getQueryStageMap().get(stageId);
-              return isStageNodesEqual(stageNode, distributedStagePlan.getStageRoot())
-                  && isMetadataMapsEqual(stageMetadata, distributedStagePlan.getMetadataMap().get(stageId));
-            }), Mockito.argThat(requestMetadataMap ->
-                requestIdStr.equals(requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID))));
+              PlanNode planNode =
+                  dispatchableSubPlan.getQueryStageList().get(finalStageId).getPlanFragment().getFragmentRoot();
+              return isStageNodesEqual(planNode, distributedStagePlan.getStageRoot()) && isStageMetadataEqual(
+                  stageMetadata, distributedStagePlan.getStageMetadata());
+            }), Mockito.argThat(requestMetadataMap -> requestIdStr.equals(
+                requestMetadataMap.get(QueryConfig.KEY_OF_BROKER_REQUEST_ID))));
             return true;
           } catch (Throwable t) {
             return false;
           }
         }, 10000L, "Error verifying mock QueryRunner intercepted query payload!");
+
+        // reset the mock runner.
+        Mockito.reset(mockRunner);
+      }
+    }
+  }
+
+  private boolean isStageMetadataEqual(StageMetadata expected, StageMetadata actual) {
+    if (!EqualityUtils.isEqual(StageMetadata.getTableName(expected),
+        StageMetadata.getTableName(actual))) {
+      return false;
+    }
+    TimeBoundaryInfo expectedTimeBoundaryInfo = StageMetadata.getTimeBoundary(expected);
+    TimeBoundaryInfo actualTimeBoundaryInfo = StageMetadata.getTimeBoundary(actual);
+    if (expectedTimeBoundaryInfo == null && actualTimeBoundaryInfo != null
+        || expectedTimeBoundaryInfo != null && actualTimeBoundaryInfo == null) {
+      return false;
+    }
+    if (expectedTimeBoundaryInfo != null && actualTimeBoundaryInfo != null && (
+        !EqualityUtils.isEqual(expectedTimeBoundaryInfo.getTimeColumn(), actualTimeBoundaryInfo.getTimeColumn())
+            || !EqualityUtils.isEqual(expectedTimeBoundaryInfo.getTimeValue(),
+            actualTimeBoundaryInfo.getTimeValue()))) {
+      return false;
+    }
+    List<WorkerMetadata> expectedWorkerMetadataList = expected.getWorkerMetadataList();
+    List<WorkerMetadata> actualWorkerMetadataList = actual.getWorkerMetadataList();
+    if (expectedWorkerMetadataList.size() != actualWorkerMetadataList.size()) {
+      return false;
+    }
+    for (int i = 0; i < expectedWorkerMetadataList.size(); i++) {
+      if (!isWorkerMetadataEqual(expectedWorkerMetadataList.get(i), actualWorkerMetadataList.get(i))) {
+        return false;
       }
     }
+    return true;
   }
 
-  private static boolean isMetadataMapsEqual(StageMetadata left, StageMetadata right) {
-    return left.getServerInstances().equals(right.getServerInstances())
-        && left.getServerInstanceToSegmentsMap().equals(right.getServerInstanceToSegmentsMap())
-        && left.getScannedTables().equals(right.getScannedTables());
+  private static boolean isWorkerMetadataEqual(WorkerMetadata expected, WorkerMetadata actual) {
+    if (!expected.getVirtualServerAddress().hostname().equals(actual.getVirtualServerAddress().hostname())
+        || expected.getVirtualServerAddress().port() != actual.getVirtualServerAddress().port()
+        || expected.getVirtualServerAddress().workerId() != actual.getVirtualServerAddress().workerId()) {
+      return false;
+    }
+    return EqualityUtils.isEqual(WorkerMetadata.getTableSegmentsMap(expected),
+        WorkerMetadata.getTableSegmentsMap(actual));
   }
 
-  private static boolean isStageNodesEqual(StageNode left, StageNode right) {
+  private static boolean isStageNodesEqual(PlanNode left, PlanNode right) {
     // This only checks the stage tree structure is correct. because the input/stageId fields are not
     // part of the generic proto ser/de; which is tested in query planner.
-    if (left.getStageId() != right.getStageId() || left.getClass() != right.getClass()
+    if (left.getPlanFragmentId() != right.getPlanFragmentId() || left.getClass() != right.getClass()
         || left.getInputs().size() != right.getInputs().size()) {
       return false;
     }
-    left.getInputs().sort(Comparator.comparingInt(StageNode::getStageId));
-    right.getInputs().sort(Comparator.comparingInt(StageNode::getStageId));
+    left.getInputs().sort(Comparator.comparingInt(PlanNode::getPlanFragmentId));
+    right.getInputs().sort(Comparator.comparingInt(PlanNode::getPlanFragmentId));
     for (int i = 0; i < left.getInputs().size(); i++) {
       if (!isStageNodesEqual(left.getInputs().get(i), right.getInputs().get(i))) {
         return false;
@@ -165,17 +218,22 @@ private void submitRequest(Worker.QueryRequest queryRequest) {
     channel.shutdown();
   }
 
-  private Worker.QueryRequest getQueryRequest(QueryPlan queryPlan, int stageId) {
-    ServerInstance serverInstance = queryPlan.getStageMetadataMap().get(stageId).getServerInstances().get(0);
+  private Worker.QueryRequest getQueryRequest(DispatchableSubPlan dispatchableSubPlan, int stageId) {
+    Map<QueryServerInstance, List<Integer>> serverInstanceToWorkerIdMap =
+        dispatchableSubPlan.getQueryStageList().get(stageId).getServerInstanceToWorkerIdMap();
+    // this particular test set requires the request to have a single QueryServerInstance to dispatch to
+    // as it is not testing the multi-tenancy dispatch (which is in the QueryDispatcherTest)
+    QueryServerInstance serverInstance = serverInstanceToWorkerIdMap.keySet().iterator().next();
+    int workerId = serverInstanceToWorkerIdMap.get(serverInstance).get(0);
 
-    return Worker.QueryRequest.newBuilder().setStagePlan(QueryPlanSerDeUtils.serialize(
-            QueryDispatcher.constructDistributedStagePlan(queryPlan, stageId, serverInstance)))
+    return Worker.QueryRequest.newBuilder().addStagePlan(
+            QueryPlanSerDeUtils.serialize(dispatchableSubPlan, stageId, serverInstance, ImmutableList.of(workerId)))
         // the default configurations that must exist.
         .putMetadata(QueryConfig.KEY_OF_BROKER_REQUEST_ID, String.valueOf(RANDOM_REQUEST_ID_GEN.nextLong()))
         .putMetadata(QueryConfig.KEY_OF_BROKER_REQUEST_TIMEOUT_MS,
             String.valueOf(CommonConstants.Broker.DEFAULT_BROKER_TIMEOUT_MS))
         // extra configurations we want to test also parsed out correctly.
         .putMetadata(KEY_OF_SERVER_INSTANCE_HOST, serverInstance.getHostname())
-        .putMetadata(KEY_OF_SERVER_INSTANCE_PORT, String.valueOf(serverInstance.getPort())).build();
+        .putMetadata(KEY_OF_SERVER_INSTANCE_PORT, String.valueOf(serverInstance.getQueryServicePort())).build();
   }
 }
diff --git a/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/dispatch/QueryDispatcherTest.java b/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/dispatch/QueryDispatcherTest.java
new file mode 100644
index 00000000000..3cd3c839fba
--- /dev/null
+++ b/pinot-query-runtime/src/test/java/org/apache/pinot/query/service/dispatch/QueryDispatcherTest.java
@@ -0,0 +1,246 @@
+/**
+ * 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.pinot.query.service.dispatch;
+
+import io.grpc.stub.StreamObserver;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import org.apache.pinot.common.proto.Worker;
+import org.apache.pinot.common.utils.NamedThreadFactory;
+import org.apache.pinot.core.query.scheduler.resources.ResourceManager;
+import org.apache.pinot.query.QueryEnvironment;
+import org.apache.pinot.query.QueryEnvironmentTestBase;
+import org.apache.pinot.query.QueryTestSet;
+import org.apache.pinot.query.planner.DispatchableSubPlan;
+import org.apache.pinot.query.planner.PlannerUtils;
+import org.apache.pinot.query.runtime.QueryRunner;
+import org.apache.pinot.query.service.QueryServer;
+import org.apache.pinot.query.testutils.QueryTestUtils;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+
+public class QueryDispatcherTest extends QueryTestSet {
+  private static final Random RANDOM_REQUEST_ID_GEN = new Random();
+  private static final int QUERY_SERVER_COUNT = 2;
+  private static final ExecutorService LEAF_WORKER_EXECUTOR_SERVICE = Executors.newFixedThreadPool(
+      ResourceManager.DEFAULT_QUERY_WORKER_THREADS, new NamedThreadFactory("QueryDispatcherTest_LeafWorker"));
+  private static final ExecutorService INTERM_WORKER_EXECUTOR_SERVICE = Executors.newCachedThreadPool(
+      new NamedThreadFactory("QueryDispatcherTest_IntermWorker"));
+
+  private final Map<Integer, QueryServer> _queryServerMap = new HashMap<>();
+  private final Map<Integer, QueryRunner> _queryRunnerMap = new HashMap<>();
+
+  private QueryEnvironment _queryEnvironment;
+  private DispatchClient _dispatchClient;
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+
+    for (int i = 0; i < QUERY_SERVER_COUNT; i++) {
+      int availablePort = QueryTestUtils.getAvailablePort();
+      QueryRunner queryRunner = Mockito.mock(QueryRunner.class);
+      Mockito.when(queryRunner.getQueryWorkerLeafExecutorService()).thenReturn(LEAF_WORKER_EXECUTOR_SERVICE);
+      Mockito.when(queryRunner.getQueryWorkerIntermExecutorService()).thenReturn(INTERM_WORKER_EXECUTOR_SERVICE);
+      QueryServer queryServer = new QueryServer(availablePort, queryRunner);
+      queryServer = Mockito.spy(queryServer);
+      queryServer.start();
+      _queryServerMap.put(availablePort, queryServer);
+      _queryRunnerMap.put(availablePort, queryRunner);
+    }
+
+    List<Integer> portList = Lists.newArrayList(_queryServerMap.keySet());
+
+    // reducer port doesn't matter, we are testing the worker instance not GRPC.
+    _queryEnvironment = QueryEnvironmentTestBase.getQueryEnvironment(1, portList.get(0), portList.get(1),
+        QueryEnvironmentTestBase.TABLE_SCHEMAS, QueryEnvironmentTestBase.SERVER1_SEGMENTS,
+        QueryEnvironmentTestBase.SERVER2_SEGMENTS);
+  }
+
+  @AfterClass
+  public void tearDown() {
+    for (QueryServer worker : _queryServerMap.values()) {
+      worker.shutdown();
+    }
+  }
+
+  @Test(dataProvider = "testSql")
+  public void testQueryDispatcherCanSendCorrectPayload(String sql)
+      throws Exception {
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    int reducerStageId =
+        dispatcher.submit(RANDOM_REQUEST_ID_GEN.nextLong(), dispatchableSubPlan, 10_000L, new HashMap<>());
+    Assert.assertTrue(PlannerUtils.isRootPlanFragment(reducerStageId));
+    dispatcher.shutdown();
+  }
+
+  @Test
+  public void testQueryDispatcherThrowsWhenQueryServerThrows()
+      throws Exception {
+    String sql = "SELECT * FROM a WHERE col1 = 'foo'";
+    QueryServer failingQueryServer = _queryServerMap.values().iterator().next();
+    Mockito.doThrow(new RuntimeException("foo")).when(failingQueryServer).submit(Mockito.any(), Mockito.any());
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    try {
+      dispatcher.submit(RANDOM_REQUEST_ID_GEN.nextLong(), dispatchableSubPlan, 10_000L, new HashMap<>());
+      Assert.fail("Method call above should have failed");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Error dispatching query"));
+    }
+    dispatcher.shutdown();
+  }
+
+  @Test
+  public void testQueryDispatcherCancelWhenQueryServerCallsOnError()
+      throws Exception {
+    String sql = "SELECT * FROM a WHERE col1 = 'foo'";
+    QueryServer failingQueryServer = _queryServerMap.values().iterator().next();
+    Mockito.doAnswer(new Answer() {
+      @Override
+      public Object answer(InvocationOnMock invocationOnMock)
+          throws Throwable {
+        StreamObserver<Worker.QueryResponse> observer = invocationOnMock.getArgument(1);
+        observer.onError(new RuntimeException("foo"));
+        return null;
+      }
+    }).when(failingQueryServer).submit(Mockito.any(), Mockito.any());
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+    try {
+      dispatcher.submitAndReduce(requestId, dispatchableSubPlan, null, null, 10_000L, new HashMap<>(), null, false);
+      Assert.fail("Method call above should have failed");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Error executing query"));
+    }
+    // wait just a little, until the cancel is being called.
+    Thread.sleep(50);
+    for (QueryServer queryServer : _queryServerMap.values()) {
+      Mockito.verify(queryServer, Mockito.times(1)).cancel(Mockito.argThat(a -> a.getRequestId() == requestId),
+          Mockito.any());
+    }
+    dispatcher.shutdown();
+  }
+
+  @Test
+  public void testQueryDispatcherCancelWhenQueryReducerThrowsError()
+      throws Exception {
+    String sql = "SELECT * FROM a";
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    long requestId = RANDOM_REQUEST_ID_GEN.nextLong();
+    try {
+      // will throw b/c mailboxService is null
+      dispatcher.submitAndReduce(requestId, dispatchableSubPlan, null, null, 10_000L, new HashMap<>(), null, false);
+      Assert.fail("Method call above should have failed");
+    } catch (Exception e) {
+      System.out.println("e = " + e);
+      Assert.assertTrue(e.getMessage().contains("Error executing query"));
+    }
+    // wait just a little, until the cancel is being called.
+    Thread.sleep(50);
+    for (QueryServer queryServer : _queryServerMap.values()) {
+      Mockito.verify(queryServer, Mockito.times(1)).cancel(Mockito.argThat(a -> a.getRequestId() == requestId),
+          Mockito.any());
+    }
+    dispatcher.shutdown();
+  }
+
+  @Test
+  public void testQueryDispatcherThrowsWhenQueryServerCallsOnError()
+      throws Exception {
+    String sql = "SELECT * FROM a WHERE col1 = 'foo'";
+    QueryServer failingQueryServer = _queryServerMap.values().iterator().next();
+    Mockito.doAnswer(new Answer() {
+      @Override
+      public Object answer(InvocationOnMock invocationOnMock)
+          throws Throwable {
+        StreamObserver<Worker.QueryResponse> observer = invocationOnMock.getArgument(1);
+        observer.onError(new RuntimeException("foo"));
+        return null;
+      }
+    }).when(failingQueryServer).submit(Mockito.any(), Mockito.any());
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    try {
+      dispatcher.submit(RANDOM_REQUEST_ID_GEN.nextLong(), dispatchableSubPlan, 10_000L, new HashMap<>());
+      Assert.fail("Method call above should have failed");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Error dispatching query"));
+    }
+    dispatcher.shutdown();
+  }
+
+  @Test
+  public void testQueryDispatcherThrowsWhenQueryServerTimesOut() {
+    String sql = "SELECT * FROM a WHERE col1 = 'foo'";
+    QueryServer failingQueryServer = _queryServerMap.values().iterator().next();
+    CountDownLatch neverClosingLatch = new CountDownLatch(1);
+    Mockito.doAnswer(new Answer() {
+      @Override
+      public Object answer(InvocationOnMock invocationOnMock)
+          throws Throwable {
+        neverClosingLatch.await(5, TimeUnit.SECONDS);
+        StreamObserver<Worker.QueryResponse> observer = invocationOnMock.getArgument(1);
+        observer.onCompleted();
+        return null;
+      }
+    }).when(failingQueryServer).submit(Mockito.any(), Mockito.any());
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    try {
+      dispatcher.submit(RANDOM_REQUEST_ID_GEN.nextLong(), dispatchableSubPlan, 1_000, new HashMap<>());
+      Assert.fail("Method call above should have failed");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Timed out waiting for response")
+          || e.getMessage().contains("Error dispatching query"));
+    }
+    neverClosingLatch.countDown();
+    dispatcher.shutdown();
+  }
+
+  @Test
+  public void testQueryDispatcherThrowsWhenDeadlinePreExpiredAndAsyncResponseNotPolled() {
+    String sql = "SELECT * FROM a WHERE col1 = 'foo'";
+    DispatchableSubPlan dispatchableSubPlan = _queryEnvironment.planQuery(sql);
+    QueryDispatcher dispatcher = new QueryDispatcher();
+    try {
+      dispatcher.submit(RANDOM_REQUEST_ID_GEN.nextLong(), dispatchableSubPlan, -10_000, new HashMap<>());
+      Assert.fail("Method call above should have failed");
+    } catch (Exception e) {
+      Assert.assertTrue(e.getMessage().contains("Timed out waiting"));
+    }
+    dispatcher.shutdown();
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/Aggregates.json b/pinot-query-runtime/src/test/resources/queries/Aggregates.json
index 7e2f7e4e9c9..9f14015514d 100644
--- a/pinot-query-runtime/src/test/resources/queries/Aggregates.json
+++ b/pinot-query-runtime/src/test/resources/queries/Aggregates.json
@@ -1,5 +1,5 @@
 {
-  "general_aggregate": {
+  "general_aggregate_no_filter": {
     "tables": {
       "tbl": {
         "schema": [
@@ -21,62 +21,627 @@
     },
     "queries": [
       {
+        "psql": "4.2.7",
+        "description": "count * aggregation",
+        "sql": "SELECT count(*) FROM {tbl}"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column",
+        "sql": "SELECT min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl}"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl}"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column",
+        "sql": "SELECT bool_and(bool_col), bool_or(bool_col), count(bool_col), count(distinct(bool_col)), count(*) FROM {tbl}"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on string column",
+        "sql": "SELECT count(string_col), count(distinct(string_col)), count(*) FROM {tbl}"
+      }
+    ]
+  },
+  "general_aggregate_with_filter": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "psql": "4.2.7",
+        "description": "count aggregation with filters",
+        "sql": "SELECT count(*) FROM {tbl} WHERE string_col='b'"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column with string filters",
+        "sql": "SELECT min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE string_col='b'"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column with int filters",
+        "sql": "SELECT min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE int_col > 100"
+      },
+      {
+        "psql": "4.2.7",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code because existing code returns INT 0. But H2 returns a double.",
+        "description": "aggregate int column and filter by int column",
+        "sql": "SELECT sum(1 / int_col) FROM {tbl} WHERE int_col > 0",
+        "h2Sql": "SELECT sum(1.0 / int_col) FROM {tbl} WHERE int_col > 0"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregate double column and filter by double column",
+        "sql": "SELECT sum(1 / double_col) FROM {tbl} WHERE double_col < 2"
+      },
+      {
+        "psql": "4.2.7",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch",
+        "description": "aggregations on double column with filters",
+        "sql": "SELECT min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE string_col='b'"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE string_col='b'"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column with filters",
+        "sql": "SELECT bool_and(bool_col), bool_or(bool_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE string_col='b'"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column with filters",
+        "sql": "SELECT bool_and(bool_col), bool_or(bool_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column with filters",
+        "sql": "SELECT bool_and(bool_col), bool_or(bool_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on string column with filters",
+        "sql": "SELECT count(string_col), count(distinct(string_col)), count(*) FROM {tbl} WHERE string_col='b'"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on string column with filters",
+        "sql": "SELECT count(string_col), count(distinct(string_col)), count(*) FROM {tbl} WHERE int_col > 100"
+      },
+      {
+        "psql": "4.2.7",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch.",
+        "description": "aggregations on string column with filters",
+        "sql": "SELECT count(string_col), count(distinct(string_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75"
+      }
+    ]
+  },
+  "general_group_by_aggregate_no_filter": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "psql": "4.2.7",
+        "description": "group by with count",
+        "sql": "SELECT int_col, count(*) FROM {tbl} GROUP BY int_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregation on double column",
+        "sql": "SELECT int_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} GROUP BY int_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregation on double column and order by",
+        "sql": "SELECT int_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} GROUP BY int_col ORDER BY int_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregations on int column",
+        "sql": "SELECT double_col, min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} GROUP BY double_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregations on int column and order by",
+        "sql": "SELECT double_col, min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} GROUP BY double_col ORDER BY double_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregations on bool column",
+        "sql": "SELECT string_col, bool_and(bool_col), bool_or(bool_col), count(bool_col), count(distinct(bool_col)), count(*) FROM {tbl} GROUP BY string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregations on bool column and order by",
+        "sql": "SELECT string_col, bool_and(bool_col), bool_or(bool_col), count(bool_col), count(distinct(bool_col)), count(*) FROM {tbl} GROUP BY string_col ORDER BY string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregations on string column",
+        "sql": "SELECT bool_col, count(string_col), count(distinct(string_col)), count(*) FROM {tbl} GROUP BY bool_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by with aggregations on string column and order by",
+        "sql": "SELECT bool_col, count(string_col), count(distinct(string_col)), count(*) FROM {tbl} GROUP BY bool_col ORDER BY bool_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by on multiple columns with aggregation on double column",
+        "sql": "SELECT int_col, string_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} GROUP BY int_col, string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by multiple columns with aggregations on int column",
+        "sql": "SELECT double_col, string_col, bool_col, min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} GROUP BY double_col, string_col, bool_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by and order by on multiple columns with aggregation on double column",
+        "sql": "SELECT int_col, string_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} GROUP BY int_col, string_col ORDER BY int_col, string_col"
+      }
+    ]
+  },
+  "general_group_by_aggregate_with_filter": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column with filters",
+        "sql": "SELECT string_col, count(*) FROM {tbl} WHERE string_col='b' GROUP BY string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column with filters",
+        "sql": "SELECT int_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE string_col='b' GROUP BY int_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column with filters",
+        "sql": "SELECT int_col, string_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE int_col > 100 GROUP BY int_col, string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on double column with filters",
+        "sql": "SELECT int_col, string_col, bool_col, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75 GROUP BY int_col, string_col, bool_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT bool_col, min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE string_col='b' GROUP BY bool_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT bool_col, double_col, min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 GROUP BY bool_col, double_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on int column with filters",
+        "sql": "SELECT bool_col, double_col, string_col, min(int_col), max(int_col), avg(int_col), sum(int_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75 GROUP BY bool_col, double_col, string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column with filters",
+        "sql": "SELECT string_col, bool_and(bool_col), bool_or(bool_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE string_col='b' GROUP BY string_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column with filters",
+        "sql": "SELECT string_col, double_col, bool_and(bool_col), bool_or(bool_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 GROUP BY string_col, double_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on bool column with filters",
+        "sql": "SELECT string_col, double_col, int_col, bool_and(bool_col), bool_or(bool_col), count(int_col), count(distinct(int_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75GROUP BY string_col, double_col, int_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on string column with filters",
+        "sql": "SELECT double_col, count(string_col), count(distinct(string_col)), count(*) FROM {tbl} WHERE string_col='b' GROUP BY double_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on string column with filters",
+        "sql": "SELECT double_col, int_col, count(string_col), count(distinct(string_col)), count(*) FROM {tbl} WHERE int_col > 100 GROUP BY double_col, int_col"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregations on string column with filters",
+        "sql": "SELECT double_col, int_col, bool_col, count(string_col), count(distinct(string_col)), count(*) FROM {tbl} WHERE int_col > 100 and double_col = 1.75 GROUP BY double_col, int_col, bool_col"
+      }
+    ]
+  },
+  "aggregations_with_transform": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "psql": "4.2.7",
+        "description": "transform in groupby column with filter",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-') as c1, min(double_col), max(double_col), avg(double_col), sum(double_col), count(double_col), count(distinct(double_col)), count(*) FROM {tbl} WHERE string_col='b' GROUP BY c1",
+        "outputs": [
+          ["b-false", 1.0, 100.0, 50.5, 101.0, 2, 2, 2]
+        ]
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregation with transform column with filter",
+        "sql": "SELECT count(CONCAT(string_col, bool_col, '-')), count(distinct(CONCAT(string_col, bool_col, '-'))), count(*) FROM {tbl}",
+        "outputs": [
+          [7, 4, 7]
+        ]
+      },
+      {
+        "psql": "4.2.7",
+        "description": "group by and aggregation with transform column with filter",
+        "sql": "SELECT int_col, count(CONCAT(string_col, bool_col, '-')), count(distinct(CONCAT(string_col, bool_col, '-'))), count(*) FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [2, 2, 1, 2],
+          [3, 1, 1, 1],
+          [100, 1, 1, 1],
+          [101, 1, 1, 1],
+          [150, 1, 1, 1],
+          [175, 1, 1, 1]
+        ]
+      }
+    ]
+  },
+  "aggregation_with_complex_sql": {
+    "tables": {
+      "tbl1": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      },
+      "tbl2": {
+        "schema":[
+          {"name": "int_col2", "type": "INT"},
+          {"name": "string_col2", "type": "STRING"},
+          {"name":  "double_col2", "type":  "DOUBLE"}
+        ],
+        "inputs": [
+          [1, "apple", 1000.0],
+          [2, "a", 1.323],
+          [3, "b", 1212.12],
+          [3, "c", 341],
+          [4, "orange", 1212.121]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "psql": "9.21.0",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch",
+        "description": "JOIN with simple aggregations on int and double columns",
+        "sql": "SELECT min(double_col), min(int_col), min(double_col2), min(int_col2), max(double_col), max(int_col), max(double_col2), max(int_col2), avg(int_col), avg(double_col), avg(double_col2), avg(int_col2), sum(int_col), sum(double_col), sum(double_col2), sum(int_col2), count(*), count(distinct int_col), count(distinct double_col), count(distinct int_col2), count(distinct double_col2) from {tbl1} JOIN {tbl2} ON string_col = string_col2"
+      },
+      {
+        "psql": "9.21.0",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch",
+        "description": "JOIN with simple aggregations on boolean columns",
+        "sql": "SELECT count(bool_col), count(distinct bool_col), bool_and(bool_col), bool_or(bool_col) from {tbl1} JOIN {tbl2} ON string_col = string_col2"
+      },
+      {
+        "psql": "9.21.0",
+        "description": "JOIN with simple aggregations on string columns",
+        "sql": "SELECT count(string_col), count(string_col2), count(distinct string_col), count(distinct string_col2) from {tbl1} JOIN {tbl2} ON int_col = int_col2"
+      },
+      {
+        "psql": "9.21.0",
         "ignored": true,
-        "psql": "4.2.7",
-        "comments": "result error:average doesn't work because we round up but h2 round down for integer",
-        "description": "average int",
-        "sql": "SELECT avg(int_col) FROM {tbl}"
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch",
+        "description": "JOIN with simple aggregations on int and double columns and group by on bool_col",
+        "sql": "SELECT bool_col, min(double_col), min(int_col), min(double_col2), min(int_col2), max(double_col), max(int_col), max(double_col2), max(int_col2), avg(int_col), avg(double_col), avg(double_col2), avg(int_col2), sum(int_col), sum(double_col), sum(double_col2), sum(int_col2), count(*), count(distinct int_col), count(distinct double_col), count(distinct int_col2), count(distinct double_col2) from {tbl1} JOIN {tbl2} ON string_col = string_col2 GROUP BY bool_col"
       },
       {
-        "psql": "4.2.7",
-        "description": "average double",
-        "sql": "SELECT avg(double_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch",
+        "description": "JOIN with aggregations on int and double columns and group by on bool_col and string_col",
+        "sql": "SELECT bool_col, string_col, min(double_col), min(int_col), min(double_col2), min(int_col2), max(double_col), max(int_col), max(double_col2), max(int_col2), avg(int_col), avg(double_col), avg(double_col2), avg(int_col2), sum(int_col), sum(double_col), sum(double_col2), sum(int_col2), count(*), count(distinct int_col), count(distinct double_col), count(distinct int_col2), count(distinct double_col2) from {tbl1} JOIN {tbl2} ON string_col = string_col2 GROUP BY bool_col, string_col"
       },
       {
-        "psql": "4.2.7",
-        "description": "average double with filter",
-        "sql": "SELECT avg(double_col) FROM {tbl} WHERE double_col >= 100"
+        "psql": "9.21.0",
+        "description": "JOIN with  aggregations on boolean columns and group by on string",
+        "sql": "SELECT string_col, count(bool_col), count(distinct bool_col), bool_and(bool_col), bool_or(bool_col) from {tbl1} JOIN {tbl2} ON string_col = string_col2 GROUP BY string_col"
       },
       {
-        "psql": "4.2.7",
-        "description": "sum double",
-        "sql": "SELECT sum(double_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code but is fixed with this patch",
+        "description": "JOIN with  aggregations on boolean columns and group by on string and int",
+        "sql": "SELECT string_col, int_col, count(bool_col), count(distinct bool_col), bool_and(bool_col), bool_or(bool_col) from {tbl1} JOIN {tbl2} ON string_col = string_col2 GROUP BY string_col, int_col"
       },
       {
-        "psql": "4.2.7",
-        "description": "sum int",
-        "sql": "SELECT sum(int_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "description": "JOIN with  aggregations on string columns and group by on double",
+        "sql": "SELECT double_col, count(string_col), count(string_col2), count(distinct string_col), count(distinct string_col2) from {tbl1} JOIN {tbl2} ON int_col = int_col2 GROUP BY double_col"
       },
       {
-        "psql": "4.2.7",
-        "description": "max double",
-        "sql": "SELECT max(double_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "description": "JOIN with  aggregations on string columns and group by on double, bool and int",
+        "sql": "SELECT double_col, bool_col, int_col, count(string_col), count(string_col2), count(distinct string_col), count(distinct string_col2) from {tbl1} JOIN {tbl2} ON int_col = int_col2 GROUP BY double_col, bool_col, int_col"
       },
       {
-        "psql": "4.2.7",
-        "description": "max int",
-        "sql": "SELECT max(int_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "description": "Aggregation on semi join with multiple not in",
+        "sql": "SELECT bool_col, int_col, count(string_col), count(distinct string_col), min(double_col), max(double_col), avg(double_col), count(double_col) from {tbl1} WHERE string_col = 'c' AND int_col NOT IN (SELECT int_col2 FROM {tbl2} WHERE string_col2='a') AND int_col NOT IN (SELECT int_col2 FROM {tbl2} WHERE string_col2='bar') AND int_col NOT IN (SELECT int_col2 FROM {tbl2} WHERE string_col2='orange') GROUP BY bool_col, int_col"
+      }
+    ]
+  },
+  "aggregations_not_supported_by_h2": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [3, 3213, "a", true],
+          [11, 545.12, "a", true],
+          [12, 543.12, "a", true],
+          [13, 765.4, "a", true],
+          [13, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [30, 10120, "b", false],
+          [100, 23121, "b", false],
+          [3, 43, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true],
+          [152, 1.25, "c", false],
+          [177, 1.095, "c", true]
+        ]
       },
+      "tbl2": {
+        "schema":[
+          {"name": "int_col2", "type": "INT"},
+          {"name": "string_col2", "type": "STRING"},
+          {"name":  "double_col2", "type":  "DOUBLE"}
+        ],
+        "inputs": [
+          [1, "apple", 1000.0],
+          [2, "a", 1.323],
+          [3, "b", 1212.12],
+          [4, "orange", 1212.121]
+        ]
+      }
+    },
+    "queries": [
       {
-        "psql": "4.2.7",
-        "description": "count int",
-        "sql": "SELECT count(int_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "description": "distinct count on all columns",
+        "sql": "SELECT distinctcount(int_col), distinctcount(double_col), distinctcount(bool_col), distinctcount(string_col) FROM {tbl}",
+        "outputs": [
+          [12, 16, 2, 3]
+        ]
       },
       {
-        "psql": "4.2.7",
-        "description": "count double",
-        "sql": "SELECT count(double_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "description": "distinct count with filter",
+        "sql": "SELECT distinctcount(int_col), distinctcount(double_col), distinctcount(bool_col), distinctcount(string_col) FROM {tbl} where string_col='c'",
+        "outputs": [
+          [5, 5, 2, 1]
+        ]
       },
       {
-        "psql": "4.2.7",
-        "description": "count, sum group by order by",
-        "sql": "select string_col, count(int_col), sum(double_col) from {tbl} group by string_col order by string_col;"
+        "psql": "9.21.0",
+        "description": "distintcount with group by",
+        "sql": "SELECT string_col, distinctcount(int_col), distinctcount(double_col), distinctcount(bool_col) FROM {tbl} group by string_col",
+        "outputs": [
+          ["a", 5, 6, 1],
+          ["b", 3, 5, 1],
+          ["c", 5, 5, 2]
+        ]
       },
       {
-        "psql": "4.2.7",
-        "description": "min, max",
-        "sql": "SELECT min(int_col), max(int_col) FROM {tbl}"
+        "psql": "9.21.0",
+        "description": "distinctcount with multiple group by columns",
+        "sql": "SELECT string_col, bool_col, distinctcount(int_col), distinctcount(double_col) FROM {tbl} group by string_col, bool_col",
+        "outputs": [
+          ["a", true, 5, 6],
+          ["b", false, 3, 5],
+          ["c", true, 2, 2],
+          ["c", false, 3, 3]
+        ]
+      },
+      {
+        "psql": "9.21.0",
+        "description": "JOIN with distinct count on columns",
+        "sql": "SELECT distinctcount(double_col), distinctcount(int_col), distinctcount(double_col2), distinctcount(int_col2), distinctcount(bool_col), distinctcount(string_col), distinctcount(string_col2) from {tbl} JOIN {tbl2} ON string_col = string_col2",
+        "outputs": [
+          [11, 7, 2, 2, 2, 2, 2]
+        ]
+      },
+      {
+        "psql": "9.21.0",
+        "description": "JOIN with distinct count and group by on columns",
+        "sql": "SELECT string_col, distinctcount(double_col), distinctcount(int_col), distinctcount(double_col2), distinctcount(int_col2), distinctcount(bool_col) from {tbl} JOIN {tbl2} ON string_col = string_col2 GROUP BY string_col",
+        "outputs": [
+          ["a", 6, 5, 1, 1, 1],
+          ["b", 5, 3, 1, 1, 1]
+        ]
+      },
+      {
+        "psql": "9.21.0",
+        "description": "skewness and kurtosis and int and double cols",
+        "sql": "SELECT skewness(double_col), skewness(int_col), kurtosis(double_col), kurtosis(int_col) FROM {tbl}",
+        "outputs": [
+          [3.1103657693253997, 0.5794666900768517, 9.965595397275615, -1.4550234124062964]
+        ]
+      },
+      {
+        "psql": "9.21.0",
+        "description": "skewness and kurtosis and int and double cols with group by",
+        "sql": "SELECT string_col, skewness(double_col), skewness(int_col), kurtosis(double_col), kurtosis(int_col) FROM {tbl} group by string_col",
+        "outputs": [
+          ["a", 2.3416450161609847, -0.8960998790160103, 5.582974376555998, -1.791124260355027],
+          ["b", 1.4293497662867718, 0.40194821599933056, 1.220463765626068, -3.1341049510321075],
+          ["c", 0.6353100324008337, -1.3564793650180287, -1.1100427274943443, 1.989350375759732]
+        ]
+      },
+      {
+        "psql": "9.21.0",
+        "description": "JOIN with skewness on columns",
+        "sql": "SELECT skewness(double_col), skewness(int_col), kurtosis(double_col2), kurtosis(int_col2) from {tbl} JOIN {tbl2} ON string_col = string_col2",
+        "outputs": [
+          [2.5196193851884536, 1.7344829395977062, -2.444444444444445, -2.444444444444444]
+        ]
       },
+      {
+        "psql": "9.21.0",
+        "description": "JOIN with distinct count and group by on columns",
+        "sql": "SELECT string_col, skewness(double_col), skewness(int_col), kurtosis(double_col2), kurtosis(int_col2) from {tbl} JOIN {tbl2} ON string_col = string_col2 GROUP BY string_col",
+        "outputs": [
+          ["a", 2.3416450161609847, -0.8960998790160102, 0.0, 0.0],
+          ["b", 1.4293497662867716, 0.4019482159993307, 0.0, 0.0]
+        ]
+      }
+    ]
+  },
+  "unsupported_aggregates": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      }
+    },
+    "queries": [
       {
         "psql": "4.2.7",
         "comments": "plan error:Unsupported SQL aggregation kind: {}. Only splittable aggregation functions are supported! [SINGLE_VALUE]",
@@ -113,21 +678,9 @@
       },
       {
         "psql": "4.2.7",
-        "ignored": true,
-        "comments": "class java.lang.Double cannot be cast to class java.lang.Boolean",
         "description": "aggregate boolean column",
         "sql": "SELECT min(bool_col) FROM {tbl}"
       },
-      {
-        "psql": "9.21.0",
-        "description": "aggregate boolean column",
-        "sql": "SELECT bool_and(bool_col), bool_or(bool_col) FROM {tbl} GROUP BY string_col"
-      },
-      {
-        "psql": "9.21.0",
-        "description": "aggregate boolean column no group by",
-        "sql": "SELECT bool_and(bool_col), bool_or(bool_col) FROM {tbl}"
-      },
       {
         "ignored": true,
         "comment": "issue with converting data types:  Unexpected RelDataTypeField: ANY for column: EXPR$0",
@@ -140,10 +693,31 @@
         "comment": "issue with converting data types:  Unexpected RelDataTypeField: ANY for column: EXPR$0",
         "description": "sum with inner function",
         "sql": "SELECT sum(pow(int_col, 2)) FROM {tbl}"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "aggregate boolean column and filter by string column",
+        "ignored": true,
+        "comments": "Cannot apply 'SUM' to arguments of type 'SUM(<BOOLEAN>)",
+        "sql": "SELECT sum(bool_col) FROM {tbl} WHERE string_col > 'a'"
+      },
+      {
+        "psql": "4.2.7",
+        "comments": "parse error:Encountered HAVING",
+        "ignored": true,
+        "description": "aggregate query with having clause",
+        "sql": "select string_col, count(int_col) from {tbl} a group by string_col order by string_col having exists(select 1 from {tbl} b where count(int_col) = b.int_col);"
+      },
+      {
+        "psql": "4.2.7",
+        "comments": "parse error:Encountered HAVING",
+        "ignored": true,
+        "description": "aggregate query with having clause",
+        "sql": "select string_col, count(int_col) from {tbl} a group by string_col order by string_col having (select count(*) from {tbl} b where count(int_col) = b.int_col) > 0;"
       }
     ]
   },
-  "aggregate_filter": {
+  "empty_return_type_test_h2": {
     "tables": {
       "tbl": {
         "schema": [
@@ -153,62 +727,207 @@
           {"name": "bool_col", "type": "BOOLEAN"}
         ],
         "inputs": [
-          [2, 300, "a", false],
+          [2, 300, "a", true],
           [2, 400, "a", true],
-          [3, 100, "b", true],
-          [0.001, 1, "b", false],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
           [101, 1.01, "c", false],
-          [150, 1.5, "c", true],
-          [175, 1.75, "c", true],
-          [-10000, 1.75, "c", false],
-          [-2, 0.5, "c", false]
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
         ]
       }
     },
     "queries": [
       {
-        "psql": "4.2.7",
-        "description": "aggregate int column and filter by int column",
-        "sql": "SELECT min(int_col) FROM {tbl} WHERE int_col < 100"
+        "ignored": true,
+        "comment": "sum empty returns [0] instead of [null] at the moment when leaf aggregation is performed by v1 engine.",
+        "description": "Return empty for sum",
+        "sql": "SELECT sum(int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "description": "Return empty for sum with subquery",
+        "sql": "SELECT sum(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
       },
       {
-        "psql": "4.2.7",
         "ignored": true,
-        "description": "aggregate int column and filter by int column",
-        "comments": "rounding error",
-        "sql": "SELECT sum(1 /int_col) FROM {tbl} WHERE int_col > 0"
+        "comment": "min empty returns [infinity] instead of [null] at the moment when leaf aggregation is performed by v1 engine.",
+        "description": "Return empty for min",
+        "sql": "SELECT min(int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
       },
       {
-        "psql": "4.2.7",
-        "description": "aggregate double column and filter by double column",
-        "comments": "rounding error",
-        "sql": "SELECT sum(1 /double_col) FROM {tbl} WHERE double_col < 1"
+        "description": "Return empty for min with subquery",
+        "sql": "SELECT min(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
       },
       {
-        "psql": "4.2.7",
-        "description": "aggregate double column and filter by string column",
-        "sql": "SELECT sum(double_col) FROM {tbl} WHERE string_col > 'a'"
+        "ignored": true,
+        "comment": "max empty returns [-infinity] instead of [null] at the moment when leaf aggregation is performed by v1 engine.",
+        "description": "Return empty for max",
+        "sql": "SELECT max(int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "description": "Return empty for min with subquery",
+        "sql": "SELECT max(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "comment": "avg empty returns [NaN] instead of [null] at the moment when leaf aggregation is performed by v1 engine.",
+        "description": "Return empty for avg",
+        "sql": "SELECT avg(int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "description": "Return empty for avg with subquery",
+        "sql": "SELECT avg(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "description": "Return empty for count",
+        "sql": "SELECT count(int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "description": "Return empty for count with subquery",
+        "sql": "SELECT count(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "description": "Return empty for count(*)",
+        "sql": "SELECT count(*) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "description": "Return empty for count * with subquery",
+        "sql": "SELECT count(*) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
       },
       {
-        "psql": "4.2.7",
-        "description": "aggregate boolean column and filter by string column",
         "ignored": true,
-        "comments": "Cannot apply 'SUM' to arguments of type 'SUM(<BOOLEAN>)",
-        "sql": "SELECT sum(bool_col) FROM {tbl} WHERE string_col > 'a'"
+        "comment": "bool_and empty returns [true] instead of [null] at the moment when leaf aggregation is performed by v1 engine.",
+        "description": "Return empty for bool_and",
+        "sql": "SELECT bool_and(bool_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
       },
       {
-        "psql": "4.2.7",
-        "comments": "parse error:Encountered HAVING",
         "ignored": true,
-        "description": "aggregate query with having clause",
-        "sql": "select string_col, count(int_col) from {tbl} a group by string_col order by string_col having exists(select 1 from {tbl} b where count(int_col) = b.int_col);"
+        "comment": "bool_and empty returns [0 which gets converted to false] instead of [null] when leaf aggregation is performed by Intermediate Stage",
+        "description": "Return empty for bool_and with subquery",
+        "sql": "SELECT bool_and(bool_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "ignored": true,
+        "comment": "bool_or empty returns [false] instead of [null] at the moment when leaf aggregation is performed by v1 engine.",
+        "description": "Return empty for bool_or",
+        "sql": "SELECT bool_or(bool_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "ignored": true,
+        "comment": "bool_or empty returns [false] instead of [null] at the moment when leaf aggregation is performed by Intermediate Stage",
+        "description": "Return empty for bool_or with subquery",
+        "sql": "SELECT bool_or(bool_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "description": "Return empty for count distinct",
+        "sql": "SELECT count(distinct int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "ignored": true,
+        "comments": "TODO(Sonam): Remove ignore check. Test fails with existing code because H2 expects 0. But we return null",
+        "description": "Return empty for count distinct with subquery",
+        "sql": "SELECT count(distinct int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "ignored": true,
+        "comment": "DistinctCount agg function doesn't support null handling",
+        "description": "Return empty for distinctcount",
+        "sql": "SELECT distinctcount(int_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "ignored": true,
+        "comment": "DistinctCount agg function doesn't support null handling",
+        "description": "Return empty for distinctcount with subquery",
+        "sql": "SELECT distinctcount(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "ignored": true,
+        "comment": "FourthMoment agg function doesn't support null handling",
+        "description": "Return empty for skewness",
+        "sql": "SELECT skewness(double_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "ignored": true,
+        "comment": "FourthMoment agg function doesn't support null handling",
+        "description": "Return empty for skewness with subquery",
+        "sql": "SELECT skewness(double_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "ignored": true,
+        "comment": "FourthMoment agg function doesn't support null handling",
+        "description": "Return empty for kurtosis",
+        "sql": "SELECT kurtosis(double_col) FROM {tbl} WHERE string_col IN ('foo', 'bar')"
+      },
+      {
+        "ignored": true,
+        "comment": "FourthMoment agg function doesn't support null handling",
+        "description": "Return empty for kurtosis with subquery",
+        "sql": "SELECT kurtosis(double_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      }
+    ]
+  },
+  "aggregate_with_hints": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [100, 1, "b", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [175, 1.75, "c", true]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "psql": "4.2.7",
+        "description": "aggregation without groupby. hint is a no-op.",
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ avg(double_col) FROM {tbl}"
       },
       {
         "psql": "4.2.7",
-        "comments": "parse error:Encountered HAVING",
-        "description": "aggregate query with having clause",
+        "description": "count, sum group by order by",
+        "sql": "select /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ string_col, count(int_col), sum(double_col) from {tbl} group by string_col order by string_col;"
+      },
+      {
+        "psql": "4.2.7",
+        "description": "count, sum group by order by. Multiple aggregations on single column.",
+        "sql": "select /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ string_col, max(int_col), min(double_col), count(int_col), sum(double_col) from {tbl} group by string_col order by string_col;"
+      },
+      {
+        "psql": "9.21.0",
+        "description": "aggregate boolean column",
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ bool_and(bool_col), bool_or(bool_col) FROM {tbl} GROUP BY string_col"
+      },
+      {
+        "psql": "9.21.0",
+        "description": "aggregate boolean column no group by",
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ bool_and(bool_col), bool_or(bool_col) FROM {tbl}"
+      },
+      {
         "ignored": true,
-        "sql": "select string_col, count(int_col) from {tbl} a group by string_col order by string_col having (select count(*) from {tbl} b where count(int_col) = b.int_col) > 0;"
+        "comment": "sum empty returns [0] instead of [null] at the moment",
+        "description": "sum empty input after filter with subquery",
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ sum(int_col) FROM {tbl} WHERE string_col IN ( SELECT string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "description": "count empty input after filter with sub-query",
+        "sql": "SELECT count(*) FROM {tbl} WHERE string_col IN ( SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "description": "count empty input after filter with sub-query",
+        "sql": "SELECT count(int_col) FROM {tbl} WHERE string_col IN ( SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ string_col FROM {tbl} WHERE int_col BETWEEN 1 AND 0 GROUP BY string_col )"
+      },
+      {
+        "description": "group by optimization with filter",
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ double_col, sum(int_col) FROM {tbl} WHERE int_col > 3 AND double_col > 1.0 GROUP BY double_col"
       }
     ]
   },
diff --git a/pinot-query-runtime/src/test/resources/queries/BasicQuery.json b/pinot-query-runtime/src/test/resources/queries/BasicQuery.json
index 41fb23aa62c..3348a7a8561 100644
--- a/pinot-query-runtime/src/test/resources/queries/BasicQuery.json
+++ b/pinot-query-runtime/src/test/resources/queries/BasicQuery.json
@@ -57,6 +57,15 @@
       {
         "description": "bla bla",
         "sql": "SELECT {tbl1}.col1, {tbl1}.col2, COUNT(*) FROM {tbl1} JOIN {tbl2} ON {tbl1}.col1 = {tbl2}.col1 GROUP BY {tbl1}.col1, {tbl1}.col2"
+      },
+      {
+        "description": "Correlated subquery test",
+        "sql": "SELECT {tbl1}.col1 FROM {tbl1} WHERE {tbl1}.col2 > (SELECT 0.5 * SUM({tbl2}.col3) FROM {tbl2} WHERE {tbl1}.col2 = {tbl1}.col2 AND {tbl1}.col1 = {tbl2}.col1)"
+      },
+      {
+        "description": "Lateral join query test",
+        "sql": "SELECT {tbl1}.col1, newb.sum_col3 FROM {tbl1} JOIN LATERAL (SELECT SUM(col3) as sum_col3 FROM {tbl2} WHERE col2 = {tbl1}.col2) AS newb ON TRUE",
+        "h2Sql": "SELECT {tbl1}.col1, newb.sum_col3 FROM {tbl1} JOIN (SELECT {tbl2}.col2, SUM({tbl2}.col3) AS sum_col3 FROM {tbl2} GROUP BY {tbl2}.col2) AS newb ON newb.col2 = {tbl1}.col2"
       }
     ],
     "extraProps": {
diff --git a/pinot-query-runtime/src/test/resources/queries/BooleanLogic.json b/pinot-query-runtime/src/test/resources/queries/BooleanLogic.json
index dd475856756..4473c4704a3 100644
--- a/pinot-query-runtime/src/test/resources/queries/BooleanLogic.json
+++ b/pinot-query-runtime/src/test/resources/queries/BooleanLogic.json
@@ -55,13 +55,18 @@
     },
     "queries": [
       {
-        "note": "to be postgres compatible, this should throw an exception - but various other systems (like H2 and MySQL) support this",
+        "ignored": true,
+        "note": "H2 doesn't support this",
         "description": "check implicit cast between boolean and int",
-        "sql": "select b = i FROM {tbl}"
+        "sql": "select b = i FROM {tbl}",
+        "expectedException": "Values of types .* and .*  are not comparable"
       },
       {
+        "ignored": true,
+        "comment": "H2 doesn't support this",
         "description": "check implicit cast between boolean and double",
-        "sql": "select b = d FROM {tbl}"
+        "sql": "select b = d FROM {tbl}",
+        "expectedException": "Values of types .* and .*  are not comparable"
       },
       {
         "ignored": true,
@@ -70,8 +75,11 @@
         "sql": "select b = s FROM {tbl}"
       },
       {
+        "ignored": true,
+        "comment": "H2 doesn't support this",
         "description": "check implicit cast between boolean and numeric",
-        "sql": "select b = n FROM {tbl}"
+        "sql": "select b = n FROM {tbl}",
+        "expectedException": "Values of types .* and .*  are not comparable"
       },
       {
         "description": "implicit cast should fail between boolean and timestamp",
diff --git a/pinot-query-runtime/src/test/resources/queries/Case.json b/pinot-query-runtime/src/test/resources/queries/Case.json
index 449f602f71d..eac0c1f222d 100644
--- a/pinot-query-runtime/src/test/resources/queries/Case.json
+++ b/pinot-query-runtime/src/test/resources/queries/Case.json
@@ -7,13 +7,14 @@
           {"name": "boolCol", "type": "BOOLEAN"},
           {"name": "floatCol", "type": "FLOAT"},
           {"name": "doubleCol", "type": "DOUBLE"},
+          {"name": "longCol", "type": "LONG"},
           {"name": "strCol", "type": "STRING"}
         ],
         "inputs": [
-          [1, true, 2.0, 3.0, "one"],
-          [2, false, 4.0, 6.0, "two"],
-          [3, true, 6.0, 9.0, "three"],
-          [4, false, 8.0, 12.0, "four"]
+          [1, true, 2.0, 3.0, 10, "one"],
+          [2, false, 4.0, 6.0, 20, "two"],
+          [3, true, 6.0, 9.0, 5, "three"],
+          [4, false, 8.0, 12.0, 2, "four"]
         ]
       }
     },
@@ -29,7 +30,23 @@
       { "sql": "SELECT intCol, CASE WHEN intCol % 2 = 0 THEN intCol ELSE intCol * 2 END AS intVal, strCol FROM {tbl1}"},
       { "sql": "SELECT intCol, CASE WHEN floatCol > 4.0 THEN floatCol ELSE floatCol / 2.0 END AS floatVal, strCol FROM {tbl1}"},
       { "sql": "SELECT intCol, CASE WHEN doubleCol > 6.0 THEN doubleCol ELSE doubleCol / 2.0 END AS doubleVal, strCol FROM {tbl1}"},
-      { "sql": "SELECT intCol, CASE WHEN (SELECT SUM(floatCol) FROM {tbl1}) > 16.0 THEN 'Large sum' ELSE 'Small sum' END AS aggVal, strCol FROM {tbl1}"}
+      { "sql": "SELECT intCol, CASE WHEN floatCol < 10 THEN floatCol ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN floatCol < 10 THEN doubleCol ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN floatCol < 10 THEN floatCol * 4 ELSE doubleCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN doubleCol < 10 THEN floatCol * 4 ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN doubleCol < 10 THEN doubleCol * 4 ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN doubleCol < 1.3 THEN doubleCol ELSE doubleCol / 2.0 END AS doubleVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN longCol * 4 ELSE longCol * 2 END AS longVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN longCol * 4 ELSE intCol * 2 END AS longVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN intCol > 10 THEN longCol * 4 ELSE intCol * 2 END AS longVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN intCol * 4 ELSE longCol * 2 END AS longVal, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN longCol * 4 ELSE longCol * 2 END AS longVal, strCol FROM {tbl1} WHERE longCol < 10 and doubleCol < 1.3 and floatCol < 10"},
+      {
+        "comment": "See https://github.com/apache/pinot/issues/10415 for more details",
+        "sql": "SELECT intCol, CASE WHEN (SELECT SUM(floatCol) FROM {tbl1}) > 16.0 THEN 'Large sum' ELSE 'Small sum' END AS aggVal, strCol FROM {tbl1}"
+      },
+      { "sql": "SELECT intCol, CASE WHEN (SELECT SUM(floatCol) FROM {tbl1} WHERE longCol < 10 and doubleCol < 1.3 and floatCol < 10 ) > 16.0 THEN 'Large sum' ELSE 'Small sum' END AS aggVal, strCol FROM {tbl1}"},
+      { "sql": "with tmp as (select sum(floatCol) as float_sum from {tbl1} group by floatCol) select * from tmp where float_sum < 10" }
     ]
   },
   "nested_case_when_test": {
diff --git a/pinot-query-runtime/src/test/resources/queries/Comparisons.json b/pinot-query-runtime/src/test/resources/queries/Comparisons.json
index 05368cf0142..566dec81267 100644
--- a/pinot-query-runtime/src/test/resources/queries/Comparisons.json
+++ b/pinot-query-runtime/src/test/resources/queries/Comparisons.json
@@ -110,6 +110,15 @@
         "inputs": [
           ["1.1", "1.2"], ["1.01", "1.1"], ["1.1", "1.1"], ["-1.1", "-1.2"], ["0.0", "0.0"], ["1E-307", "1E+307"]
         ]
+      },
+      "tbl1": {
+        "schema": [
+          {"name": "i1", "type": "BIG_DECIMAL"},
+          {"name": "i3", "type": "BIG_DECIMAL"}
+        ],
+        "inputs": [
+          ["1.1", "1.4"], ["1.1", "1.3"], ["1E-307", "1E+307"], ["-1.2", "-1.4"], ["-1.1", "-1.01"]
+        ]
       }
     },
     "queries": [
@@ -121,11 +130,13 @@
       { "sql": "SELECT i1 <> i2, i2 <> i1 FROM {tbl}" },
       { "sql": "SELECT i1 = i2, i2 = i1 FROM {tbl}" },
       { "sql": "SELECT i1 IS DISTINCT FROM i2, i2 IS DISTINCT FROM i1 FROM {tbl}" },
-      {
-        "ignored": true,
-        "comment": "fails with IllegalStateException... not sure why!",
-        "sql": "SELECT * FROM {tbl} WHERE i1 >= i2"
-      }
+      { "sql": "SELECT * FROM {tbl} WHERE i1 >= i2" },
+      { "sql": "SELECT * FROM {tbl} WHERE i1 <= i2" },
+      { "sql": "SELECT * FROM {tbl} WHERE i1 <> i2 and i2 <> i1" },
+      { "sql": "SELECT * FROM {tbl} WHERE i1 <> i2 and i2 <> i1 and (i1 != i2 or i2 != i1)" },
+      { "sql": "SELECT * FROM {tbl} JOIN {tbl1} ON {tbl}.i1 = {tbl1}.i1 WHERE {tbl}.i2 >= {tbl1}.i3" },
+      { "sql": "SELECT {tbl}.i1, {tbl}.i2, {tbl1}.i3 FROM {tbl} JOIN {tbl1} ON {tbl}.i1 = {tbl1}.i1 WHERE {tbl}.i2 >= {tbl1}.i3" },
+      { "sql": "SELECT {tbl}.i1 = {tbl}.i2 FROM {tbl} JOIN {tbl1} ON {tbl}.i1 = {tbl1}.i1 WHERE {tbl}.i2 >= {tbl1}.i3"}
     ]
   },
   "strings_comp": {
@@ -331,21 +342,17 @@
       { "sql": "SELECT i1 > i2, i2 > i1 FROM {tbl}" },
       { "sql": "SELECT i1 >= i2, i2 >= i1 FROM {tbl}" },
       { "sql": "SELECT i1 IS DISTINCT FROM i2, i2 IS DISTINCT FROM i1 FROM {tbl}" },
-      {
-        "ignored": true,
-        "comment": "we don't handle equality checks correctly for float/double",
-        "sql": "SELECT i1 != i2, i2 != i1 FROM {tbl}"
-      },
-      {
-        "ignored": true,
-        "comment": "we don't handle equality checks correctly for float/double",
-        "sql": "SELECT i1 <> i2, i2 <> i1 FROM {tbl}"
-      },
-      {
-        "ignored": true,
-        "comment": "we don't handle equality checks correctly for float/double",
-        "sql": "SELECT i1 = i2, i2 = i1 FROM {tbl}"
-      }
+      { "sql": "SELECT i1 != i2, i2 != i1 FROM {tbl}" },
+      { "sql": "SELECT i1 <> i2, i2 <> i1 FROM {tbl}" },
+      { "sql": "SELECT i1 = i2, i2 = i1 FROM {tbl}" },
+      { "sql": "SELECT i1 = i1, i2 = i2, i1 != i1, i2 != i2, i1 <> i1, i2 <> i2 FROM {tbl}" },
+      { "sql": "SELECT * FROM (SELECT i1 = i2, i2 = i1, i1 != i2, i2 != i1 FROM {tbl})" },
+      { "sql": "SELECT CASE WHEN i1 = i2 THEN 'Yes' ELSE 'No' END, CASE WHEN i2 = i1 THEN 'Yes' ELSE 'No' END FROM {tbl}"},
+      { "sql": "SELECT CASE WHEN i1 != i2 THEN 'Yes' ELSE 'No' END, CASE WHEN i2 != i1 THEN 'Yes' ELSE 'No' END FROM {tbl}"},
+      { "sql": "SELECT CASE WHEN i1 <> i2 THEN 'Yes' ELSE 'No' END, CASE WHEN i2 <> i1 THEN 'Yes' ELSE 'No' END FROM {tbl}"},
+      { "sql": "SELECT * FROM {tbl} WHERE i1 != i2 and i2 != i1" },
+      { "sql": "SELECT * FROM {tbl} WHERE (i1 = i2 or i2 = i1) and i2 > i1" },
+      { "sql": "SELECT * FROM {tbl} WHERE (i1 <> i2 or i2 <> i1) and i2 > 0" }
     ]
   },
   "float_x_numeric_comp": {
diff --git a/pinot-query-runtime/src/test/resources/queries/CountDistinct.json b/pinot-query-runtime/src/test/resources/queries/CountDistinct.json
new file mode 100644
index 00000000000..f7f8ecd5d40
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/CountDistinct.json
@@ -0,0 +1,149 @@
+{
+  "countDistinct": {
+    "tables": {
+      "tbl1": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "val", "type": "STRING"}
+        ],
+        "inputs": [
+          ["a", "foo"],
+          ["a", "foo"],
+          ["a", "bar"],
+          ["a", "bar"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "baz"],
+          ["b", "baz"],
+          ["b", "baz"]
+        ]
+      },
+      "tbl2": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "val", "type": "STRING"}
+        ],
+        "inputs": [
+          ["a", "foo"],
+          ["a", "foo"],
+          ["a", "bar"],
+          ["a", "bingo"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "baz"],
+          ["b", "baz"],
+          ["b", "ringo"]
+        ]
+      }
+    },
+    "queries": [
+      {"sql": "SELECT COUNT(DISTINCT val) FROM {tbl1}"},
+      {"sql": "SELECT groupingCol, COUNT(DISTINCT val) FROM {tbl1} GROUP BY groupingCol"},
+      {"sql": "SELECT l.groupingCol, COUNT(DISTINCT l.val), COUNT(DISTINCT r.val) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol"},
+      {"sql": "SELECT l.groupingCol, COUNT(DISTINCT CONCAT(l.val, r.val)) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol"},
+      {"sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ groupingCol, COUNT(DISTINCT val) FROM {tbl1} GROUP BY groupingCol"},
+      {"sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ l.groupingCol, COUNT(DISTINCT l.val), COUNT(DISTINCT r.val) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol"},
+      {"sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ l.groupingCol, COUNT(DISTINCT CONCAT(l.val, r.val)) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol"}
+    ]
+  },
+  "countDistinct_non_h2": {
+    "tables": {
+      "tbl1": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "val", "type": "STRING"}
+        ],
+        "inputs": [
+          ["a", "foo"],
+          ["a", "foo"],
+          ["a", "bar"],
+          ["a", "bar"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "baz"],
+          ["b", "baz"],
+          ["b", "baz"]
+        ]
+      },
+      "tbl2": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "val", "type": "STRING"}
+        ],
+        "inputs": [
+          ["a", "foo"],
+          ["a", "foo"],
+          ["a", "bar"],
+          ["a", "bingo"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "foo"],
+          ["b", "baz"],
+          ["b", "baz"],
+          ["b", "ringo"]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "sql": "SELECT DISTINCTCOUNT(val) FROM {tbl1}",
+        "outputs": [[3]]
+      },
+      {
+        "sql": "SELECT groupingCol, DISTINCTCOUNT(val) FROM {tbl1} GROUP BY groupingCol",
+        "outputs": [["b", 2], ["a", 2]]
+      },
+      {
+        "sql": "SELECT l.groupingCol, DISTINCTCOUNT(l.val), DISTINCTCOUNT(r.val) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 2, 3], ["a", 2, 3]]
+      },
+      {
+        "sql": "SELECT l.groupingCol, DISTINCTCOUNT(CONCAT(l.val, r.val)) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 6], ["a", 6]]
+      },
+      {
+        "sql": "SELECT DISTINCTCOUNTHLL(val) FROM {tbl1}",
+        "outputs": [[3]]
+      },
+      {
+        "sql": "SELECT groupingCol, DISTINCTCOUNTHLL(val) FROM {tbl1} GROUP BY groupingCol",
+        "outputs": [["b", 2], ["a", 2]]
+      },
+      {
+        "sql": "SELECT l.groupingCol, DISTINCTCOUNTHLL(l.val), DISTINCTCOUNTHLL(r.val) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 2, 3], ["a", 2, 3]]
+      },
+      {
+        "sql": "SELECT l.groupingCol, DISTINCTCOUNTHLL(CONCAT(l.val, r.val)) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 6], ["a", 6]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ groupingCol, DISTINCTCOUNT(val) FROM {tbl1} GROUP BY groupingCol",
+        "outputs": [["b", 2], ["a", 2]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ l.groupingCol, DISTINCTCOUNT(l.val), DISTINCTCOUNT(r.val) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 2, 3], ["a", 2, 3]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ l.groupingCol, DISTINCTCOUNT(CONCAT(l.val, r.val)) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 6], ["a", 6]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ groupingCol, DISTINCTCOUNTHLL(val) FROM {tbl1} GROUP BY groupingCol",
+        "outputs": [["b", 2], ["a", 2]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ l.groupingCol, DISTINCTCOUNTHLL(l.val), DISTINCTCOUNTHLL(r.val) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 2, 3], ["a", 2, 3]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ l.groupingCol, DISTINCTCOUNTHLL(CONCAT(l.val, r.val)) FROM {tbl1} l JOIN {tbl2} r ON l.groupingCol = r.groupingCol GROUP BY l.groupingCol",
+        "outputs": [["b", 6], ["a", 6]]
+      }
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/FromExpressions.json b/pinot-query-runtime/src/test/resources/queries/FromExpressions.json
index 70375ec8a4a..40a0962d68f 100644
--- a/pinot-query-runtime/src/test/resources/queries/FromExpressions.json
+++ b/pinot-query-runtime/src/test/resources/queries/FromExpressions.json
@@ -26,7 +26,7 @@
       "tbl2" : {
         "schema": [
           {"name": "num", "type": "INT"},
-          {"name": "value", "type": "STRING"}
+          {"name": "val", "type": "STRING"}
         ],
         "inputs": [
           [1, "xxx"],
@@ -68,17 +68,17 @@
       {
         "psql": "7.2.1.1",
         "description": "LEFT OUTER JOIN with non-join related clause",
-        "sql": "SELECT * FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num AND {tbl2}.value = 'xxx'"
+        "sql": "SELECT * FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num AND {tbl2}.val = 'xxx'"
       },
       {
         "psql": "7.2.1.1",
         "description": "LEFT OUTER JOIN with inequality condition",
-        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.value FROM {tbl2} LEFT OUTER JOIN {tbl1} ON {tbl1}.num = {tbl2}.num AND {tbl1}.name != {tbl2}.value"
+        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.val FROM {tbl2} LEFT OUTER JOIN {tbl1} ON {tbl1}.num = {tbl2}.num AND {tbl1}.name != {tbl2}.val"
       },
       {
         "psql": "7.2.1.1",
         "description": "LEFT OUTER JOIN with inequality condition",
-        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.value FROM {tbl2} LEFT OUTER JOIN {tbl1} ON {tbl1}.name = {tbl2}.value AND {tbl1}.num > {tbl2}.num + 1"
+        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.val FROM {tbl2} LEFT OUTER JOIN {tbl1} ON {tbl1}.name = {tbl2}.val AND {tbl1}.num > {tbl2}.num + 1"
       },
       {
         "psql": "7.2.1.1",
@@ -89,27 +89,27 @@
         "psql": "7.2.1.1",
         "comments": "select all doesn't work because h2 output the rows in different order from Pinot and test framework doesn't consider the column order for rows and blindly assume they are in the same order",
         "description": "RIGHT OUTER JOIN",
-        "sql": "SELECT {tbl1}.num, {tbl1}.name, {tbl2}.num, {tbl2}.value FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
+        "sql": "SELECT {tbl1}.num, {tbl1}.name, {tbl2}.num, {tbl2}.val FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
       },
       {
         "psql": "7.2.1.1",
         "description": "RIGHT OUTER JOIN output rows in different order than join order",
-        "sql": "SELECT {tbl2}.num, {tbl2}.value, {tbl1}.num, {tbl1}.name FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
+        "sql": "SELECT {tbl2}.num, {tbl2}.val, {tbl1}.num, {tbl1}.name FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
       },
       {
         "psql": "7.2.1.1",
         "description": "RIGHT OUTER JOIN output rows in mixed table order",
-        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.value FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
+        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.val FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
       },
       {
         "psql": "7.2.1.1",
         "description": "RIGHT OUTER JOIN with inequality condition",
-        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.value FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num AND {tbl1}.name != {tbl2}.value"
+        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.val FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num AND {tbl1}.name != {tbl2}.val"
       },
       {
         "psql": "7.2.1.1",
         "description": "RIGHT OUTER JOIN with inequality condition",
-        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.value FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.name = {tbl2}.value AND {tbl1}.num > {tbl2}.num + 1"
+        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.val FROM {tbl1} RIGHT OUTER JOIN {tbl2} ON {tbl1}.name = {tbl2}.val AND {tbl1}.num > {tbl2}.num + 1"
       },
       {
         "psql": "7.2.1.1",
@@ -138,7 +138,32 @@
       },
       {
         "psql": "7.2.1.3",
-        "description": "sub-query to semi-join syntax with star results, using single value predicate clause",
+        "description": "sub-query to multiple anti semi-join queries with star results, using NOT IN clause",
+        "sql": "SELECT * FROM {tbl1} WHERE (num > -10 and num < 10) AND (name NOT IN (SELECT val FROM {tbl2} WHERE num = 3)) AND (name NOT IN (SELECT val from {tbl2} WHERE num = 4))"
+      },
+      {
+        "psql": "7.2.1.3",
+        "description": "sub-query with range predicates",
+        "sql": "SELECT * FROM {tbl1} WHERE (num > -10 and num < 10) AND (name NOT IN (SELECT val FROM {tbl2} WHERE num > -100 and num < 5))"
+      },
+      {
+        "psql": "7.2.1.3",
+        "description": "join with range predicates on both sides of the join",
+        "sql": "SELECT * FROM {tbl1} AS A, {tbl2} AS B WHERE (A.num > 10 AND B.num < 20)"
+      },
+      {
+        "psql": "7.2.1.3",
+        "description": "join with range predicate disjunction",
+        "sql": "SELECT * FROM {tbl1} AS A, {tbl2} AS B WHERE A.num > 10 OR B.num < 20"
+      },
+      {
+        "psql": "7.2.1.3",
+        "description": "join query with mix of range predicate disjunction/conjunction",
+        "sql": "SELECT * FROM {tbl1} AS A, {tbl2} AS B WHERE (A.num > 10 AND B.num < 20) OR (A.num < 10 AND B.num < 10)"
+      },
+      {
+        "psql": "7.2.1.3",
+        "description": "sub-query to semi-join syntax with star results, using single val predicate clause",
         "sql": "SELECT * FROM {tbl1} WHERE num < (SELECT SUM(num) FROM {tbl2})"
       },
       {
@@ -171,7 +196,7 @@
       "tbl2" : {
         "schema": [
           {"name": "num", "type": "INT"},
-          {"name": "value", "type": "STRING"}
+          {"name": "val", "type": "STRING"}
         ],
         "inputs": [
           [1, "xxx"],
@@ -205,7 +230,7 @@
       {
         "psql": "7.2.1.1",
         "description": "FULL OUTER JOIN",
-        "sql": "SELECT {tbl1}.num, {tbl1}.name, {tbl2}.num, {tbl2}.value FROM {tbl1} FULL JOIN {tbl2} ON {tbl1}.num = {tbl2}.num",
+        "sql": "SELECT {tbl1}.num, {tbl1}.name, {tbl2}.num, {tbl2}.val FROM {tbl1} FULL JOIN {tbl2} ON {tbl1}.num = {tbl2}.num",
         "outputs": [
           [1, "a", 1, "xxx"],
           [1, "a", 1, "xxx"],
@@ -226,7 +251,7 @@
       {
         "psql": "7.2.1.1",
         "description": "FULL OUTER JOIN with left table empty",
-        "sql": "SELECT {tbl_empty}.strCol1, {tbl_empty}.intCol1, {tbl_empty}.strCol2, {tbl2}.num, {tbl2}.value FROM {tbl_empty} FULL JOIN {tbl2} ON {tbl_empty}.intCol1 = {tbl2}.num",
+        "sql": "SELECT {tbl_empty}.strCol1, {tbl_empty}.intCol1, {tbl_empty}.strCol2, {tbl2}.num, {tbl2}.val FROM {tbl_empty} FULL JOIN {tbl2} ON {tbl_empty}.intCol1 = {tbl2}.num",
         "outputs": [
           [null, null, null, 1, "xxx"],
           [null, null, null, 1, "xxx"],
@@ -241,7 +266,7 @@
       {
         "psql": "7.2.1.1",
         "description": "FULL OUTER JOIN with right table empty",
-        "sql": "SELECT {tbl_empty}.strCol1, {tbl_empty}.intCol1, {tbl_empty}.strCol2, {tbl2}.num, {tbl2}.value FROM {tbl2} FULL JOIN {tbl_empty} ON {tbl_empty}.intCol1 = {tbl2}.num",
+        "sql": "SELECT {tbl_empty}.strCol1, {tbl_empty}.intCol1, {tbl_empty}.strCol2, {tbl2}.num, {tbl2}.val FROM {tbl2} FULL JOIN {tbl_empty} ON {tbl_empty}.intCol1 = {tbl2}.num",
         "outputs": [
           [null, null, null, 1, "xxx"],
           [null, null, null, 1, "xxx"],
@@ -256,7 +281,7 @@
       {
         "psql": "7.2.1.1",
         "description": "FULL OUTER JOIN with inequality condition",
-        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.value FROM {tbl1} FULL OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num AND {tbl1}.name != {tbl2}.value",
+        "sql": "SELECT {tbl1}.num, {tbl2}.num, {tbl1}.name, {tbl2}.val FROM {tbl1} FULL OUTER JOIN {tbl2} ON {tbl1}.num = {tbl2}.num AND {tbl1}.name != {tbl2}.val",
         "outputs": [
           [1,  1, "a", "xxx"],
           [1,  1, "a", "xxx"],
diff --git a/pinot-query-runtime/src/test/resources/queries/JsonType.json b/pinot-query-runtime/src/test/resources/queries/JsonType.json
new file mode 100644
index 00000000000..5de9739414f
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/JsonType.json
@@ -0,0 +1,111 @@
+{
+  "json_data": {
+    "tables": {
+      "jsonTbl": {
+        "schema": [
+          {"name": "jsonCol", "type": "JSON"},
+          {"name": "stringCol", "type": "STRING"}
+        ],
+        "inputs": [
+          ["{\"key1\":\"val1\",\"key2\":\"val2\"}", "str1"],
+          ["{\"key11\":\"val11\",\"key22\":\"val22\"}", "str22"],
+          ["{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}", "str33"],
+          ["{\"key1111\":22.23,\"key2222\":\"val2222\"}", "str44"]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "sql": "SELECT jsonCol FROM {jsonTbl}",
+        "outputs": [
+          ["{\"key1\":\"val1\",\"key2\":\"val2\"}"],
+          ["{\"key11\":\"val11\",\"key22\":\"val22\"}"],
+          ["{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}"],
+          ["{\"key1111\":22.23,\"key2222\":\"val2222\"}"]
+        ]
+      },
+      {
+        "sql": "SELECT jsonCol, stringCol FROM {jsonTbl}",
+        "outputs": [
+          ["{\"key1\":\"val1\",\"key2\":\"val2\"}", "str1"],
+          ["{\"key11\":\"val11\",\"key22\":\"val22\"}", "str22"],
+          ["{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}", "str33"],
+          ["{\"key1111\":22.23,\"key2222\":\"val2222\"}", "str44"]
+        ]
+      },
+      {
+        "sql": "SELECT jsonCol, stringCol FROM {jsonTbl} where stringCol='str33'",
+        "outputs": [
+          ["{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}", "str33"]
+        ]
+      },
+      {
+        "sql": "SELECT stringCol FROM {jsonTbl} where jsonCol='{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}'",
+        "outputs": [
+          ["str33"]
+        ]
+      },
+      {
+        "description": "Like clause checking specific key.",
+        "sql": "SELECT jsonCol, stringCol FROM {jsonTbl} where jsonCol like '%key111%' OR jsonCol like '%val22%'",
+        "outputs": [
+          ["{\"key11\":\"val11\",\"key22\":\"val22\"}", "str22"],
+          ["{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}", "str33"],
+          ["{\"key1111\":22.23,\"key2222\":\"val2222\"}", "str44"]
+        ]
+      },
+      {
+        "description": "Like clause is very general, should return all rows.",
+        "sql": "SELECT jsonCol, stringCol FROM {jsonTbl} where jsonCol like '%key%' ",
+        "outputs": [
+          ["{\"key1\":\"val1\",\"key2\":\"val2\"}", "str1"],
+          ["{\"key11\":\"val11\",\"key22\":\"val22\"}", "str22"],
+          ["{\"key111\":\"val111\",\"key222\":{\"key222_a\":\"val222_a\"}}", "str33"],
+          ["{\"key1111\":22.23,\"key2222\":\"val2222\"}", "str44"]
+        ]
+      },
+      {
+        "sql": "SELECT JSONEXTRACTKEY(jsonCol,'$.*') AS keys FROM {jsonTbl} where stringCol='str33'",
+        "outputs": [
+          [["$['key111']","$['key222']"]]
+        ]
+      },
+      {
+        "sql": "SELECT JSONEXTRACTKEY(jsonCol,'$.*') AS keys FROM {jsonTbl} where stringCol='str1'",
+        "outputs": [
+          [["$['key1']","$['key2']"]]
+        ]
+      },
+      {
+        "sql": "SELECT cardinality(JSONEXTRACTKEY(jsonCol,'$.*')) AS key_card FROM {jsonTbl} where stringCol='str1'",
+        "outputs": [
+          [2]
+        ]
+      },
+      {
+        "sql": "SELECT jsonextractscalar(jsonCol,'$.key222.key222_a', 'STRING') AS keys FROM {jsonTbl} where stringCol='str33'",
+        "outputs": [
+          ["val222_a"]
+        ]
+      },
+      {
+        "sql": "SELECT jsonextractscalar(jsonCol,'$.key1', 'STRING') AS keys FROM {jsonTbl} where stringCol='str1'",
+        "outputs": [
+          ["val1"]
+        ]
+      },
+      {
+        "sql": "SELECT jsonextractscalar(jsonCol,'$.key22', 'STRING', 'dummy') AS keys FROM {jsonTbl} where stringCol='str1'",
+        "outputs": [
+          ["dummy"]
+        ]
+      },
+      {
+        "sql": "SELECT jsonextractscalar(jsonCol,'$.key1111', 'FLOAT') AS keys FROM {jsonTbl} where stringCol='str44'",
+        "outputs": [
+          [22.23]
+        ]
+      }
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/MathFuncs.json b/pinot-query-runtime/src/test/resources/queries/MathFuncs.json
index 2a84c4b1d7e..6e586f2dc2d 100644
--- a/pinot-query-runtime/src/test/resources/queries/MathFuncs.json
+++ b/pinot-query-runtime/src/test/resources/queries/MathFuncs.json
@@ -200,14 +200,10 @@
     },
     "queries": [
       {
-        "ignored": true,
-        "comment": "should round on the integer but we return a floating point",
         "description": "test divide on integer columns",
         "sql": "SELECT intCol / longCol FROM {numTbl}"
       },
       {
-        "ignored": true,
-        "comment": "should round on the integer but we return a floating point",
         "description": "test divide on int literal with columns",
         "sql": "SELECT intCol / 10 FROM {numTbl}"
       },
@@ -216,8 +212,6 @@
         "sql": "SELECT intCol / 1.2 FROM {numTbl}"
       },
       {
-        "ignored": true,
-        "comment": "should round on the integer but we return a floating point",
         "description": "test divide on literals",
         "sql": "SELECT 3 / 5 FROM {numTbl}"
       },
@@ -244,9 +238,7 @@
         "sql": "SELECT intCol / doubleCol FROM {numTbl}"
       },
       {
-        "ignored": true,
         "description": "test divide on overflow",
-        "comment": "somehow there is value diff",
         "sql": "SELECT floatCol / 1e-15 FROM {numTbl}"
       }
     ]
@@ -270,8 +262,6 @@
     },
     "queries": [
       {
-        "ignored": true,
-        "comment": "we are returning -0.0 for some reason",
         "description": "test mod on integer columns",
         "sql": "SELECT intCol % longCol FROM {numTbl}"
       },
@@ -469,8 +459,6 @@
         "sql": "SELECT doubleCol + 1e250 FROM {numTbl}"
       },
       {
-        "ignored": true,
-        "comments": "Pinot hoist type to double but H2 doesn't",
         "description": "test addition on floatCol plus large decimal to convert to double",
         "sql": "SELECT floatCol + 1e50 FROM {numTbl}"
       },
@@ -487,8 +475,6 @@
         "sql": "SELECT doubleCol - 1e250 FROM {numTbl}"
       },
       {
-        "ignored": true,
-        "comments": "Pinot hoist type to double but H2 doesn't",
         "description": "test on floatCol plus large decimal to convert to double",
         "sql": "SELECT floatCol - 1e50 FROM {numTbl}"
       },
@@ -505,8 +491,6 @@
         "sql": "SELECT doubleCol * 1e50 FROM {numTbl}"
       },
       {
-        "ignored": true,
-        "comments": "Pinot hoist type to double but H2 doesn't",
         "description": "test on floatCol plus large decimal to convert to double",
         "sql": "SELECT floatCol * 1e50 FROM {numTbl}"
       },
diff --git a/pinot-query-runtime/src/test/resources/queries/MetadataTestQuery.json b/pinot-query-runtime/src/test/resources/queries/MetadataTestQuery.json
new file mode 100644
index 00000000000..fdccd9cee8b
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/MetadataTestQuery.json
@@ -0,0 +1,66 @@
+{
+  "metadata_test": {
+    "comments": "metadata_test is used to test Tracing and Stats metadata returns",
+    "limitation": "due to current limitation, metadata test requires all data to be located on a single partition, see: https://github.com/apache/pinot/issues/10399",
+    "tables": {
+      "tbl1" : {
+        "schema": [
+          {"name": "col1", "type": "STRING"},
+          {"name": "col2", "type": "INT"}
+        ],
+        "inputs": [
+          ["foo", 1],
+          ["bar", 2]
+        ],
+        "partitionColumns": [ ]
+      },
+      "tbl2" : {
+        "schema": [
+          {"name": "col1", "type": "STRING"},
+          {"name": "col2", "type": "INT"},
+          {"name": "col3", "type": "DOUBLE"},
+          {"name": "partitionCol1", "type": "INT"},
+          {"name": "partitionCol2", "type": "STRING"}
+        ],
+        "inputs": [
+          ["foo", 1, 3.1416, 1, "charlie"],
+          ["foo", 3, 3.1416, 1, "charlie"],
+          ["bar", 2, 2.7183, 1, "charlie"],
+          ["------"],
+          ["bar", 4, 2.7183, 1, "charlie"]
+        ],
+        "partitionColumns": [
+          "partitionCol1", "partitionCol2"
+        ]
+      }
+    },
+    "queries": [
+      {
+        "sql": "SELECT * FROM {tbl1}",
+        "comment": "only 1 segment for tbl1",
+        "expectedNumSegments": 1
+      },
+      {
+        "sql": "SELECT col1, COUNT(*) FROM {tbl2} GROUP BY col1",
+        "comment": "2 segments for tbl2",
+        "expectedNumSegments": 2
+      },
+      {
+        "sql": "SELECT {tbl1}.col1, {tbl1}.col2, {tbl2}.col3 FROM {tbl1} JOIN {tbl2} ON {tbl1}.col1 = {tbl2}.col1",
+        "expectedNumSegments": 3
+      },
+      {
+        "sql": "SELECT {tbl1}.col1, {tbl1}.col2, COUNT(*) FROM {tbl1} JOIN {tbl2} ON {tbl1}.col1 = {tbl2}.col1 GROUP BY {tbl1}.col1, {tbl1}.col2",
+        "expectedNumSegments": 3
+      },
+      {
+        "sql": "SELECT {tbl1}.col1 FROM {tbl1} WHERE {tbl1}.col2 > (SELECT 0.5 * SUM({tbl2}.col3) FROM {tbl2} WHERE {tbl1}.col2 = {tbl1}.col2 AND {tbl1}.col1 = {tbl2}.col1)",
+        "comment": "This correlated subquery test is decorrelated to 2 JOINs, so one table is scanned twice, hence expected to scan 8 segments",
+        "expectedNumSegments": 4
+      }
+    ],
+    "extraProps": {
+      "noEmptySegment": "true"
+    }
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/NullHandling.json b/pinot-query-runtime/src/test/resources/queries/NullHandling.json
new file mode 100644
index 00000000000..3c5a6a7add6
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/NullHandling.json
@@ -0,0 +1,62 @@
+{
+  "null_on_intermediate": {
+    "tables": {
+      "tbl1" : {
+        "schema": [
+          {"name": "strCol1", "type": "STRING"},
+          {"name": "intCol1", "type": "INT"},
+          {"name": "strCol2", "type": "STRING"}
+        ],
+        "inputs": [
+          ["foo", 1, "foo"],
+          ["bar", 2, "alice"]
+        ]
+      },
+      "tbl2" : {
+        "schema": [
+          {"name": "strCol1", "type": "STRING"},
+          {"name": "strCol2", "type": "STRING"},
+          {"name": "intCol1", "type": "INT"},
+          {"name": "doubleCol1", "type": "DOUBLE"},
+          {"name": "boolCol1", "type":  "BOOLEAN"}
+        ],
+        "inputs": [
+          ["foo", "bob", 3, 3.1416, true],
+          ["alice", "alice", 4, 2.7183, false]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "description": "LEFT JOIN and FILTER",
+        "sql": "SELECT {tbl1}.strCol2, {tbl2}.doubleCol1 IS NULL OR {tbl1}.intCol1 > 3 AS boolFlag FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1"
+      },
+      {
+        "description": "LEFT JOIN and TRANSFORM",
+        "sql": "SELECT {tbl1}.strCol2, {tbl1}.intCol1 * {tbl2}.doubleCol1 + {tbl2}.intCol1 FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1"
+      },
+      {
+        "description": "LEFT JOIN and AGGREGATE",
+        "sql": "SELECT COUNT({tbl2}.intCol1), MIN({tbl2}.intCol1), MAX({tbl2}.doubleCol1), SUM({tbl2}.doubleCol1), AVG({tbl2}.doubleCol1), BOOL_AND({tbl2}.boolCol1), BOOL_OR({tbl2}.boolCol1) FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1"
+      },
+      {
+        "description": "LEFT JOIN and GROUP BY",
+        "sql": "SELECT {tbl1}.strCol2, {tbl2}.intCol1, COUNT(*) FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1 GROUP BY {tbl1}.strCol2, {tbl2}.intCol1"
+      },
+      {
+        "description": "LEFT JOIN and GROUP BY with AGGREGATE",
+        "sql": "SELECT {tbl1}.strCol2, COUNT({tbl2}.intCol1), MIN({tbl2}.intCol1), MAX({tbl2}.doubleCol1), SUM({tbl2}.doubleCol1), AVG({tbl2}.doubleCol1) FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1 GROUP BY {tbl1}.strCol2"
+      },
+      {
+        "description": "LEFT JOIN and SORT (by default, H2 treats null as the smallest value, which is different from Postgres, thus we don't test the default ordering)",
+        "sql": "SELECT {tbl2}.doubleCol1 AS col FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1 ORDER BY col NULLS FIRST",
+        "keepOutputRowOrder": true
+      },
+      {
+        "description": "LEFT JOIN and GROUP BY with AGGREGATE AND SORT",
+        "sql": "SELECT {tbl1}.strCol2, COUNT({tbl2}.intCol1), MIN({tbl2}.intCol1) AS minCol, MAX({tbl2}.doubleCol1) AS maxCol, SUM({tbl2}.doubleCol1) FROM {tbl1} LEFT OUTER JOIN {tbl2} ON {tbl1}.strCol1 = {tbl2}.strCol1 GROUP BY {tbl1}.strCol2 ORDER BY minCol DESC NULLS LAST, maxCol ASC NULLS LAST",
+        "keepOutputRowOrder": true
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-runtime/src/test/resources/queries/OrderBy.json b/pinot-query-runtime/src/test/resources/queries/OrderBy.json
index 2c7708743c0..61921a736b9 100644
--- a/pinot-query-runtime/src/test/resources/queries/OrderBy.json
+++ b/pinot-query-runtime/src/test/resources/queries/OrderBy.json
@@ -18,28 +18,94 @@
       }
     },
     "queries": [
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col0 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col2 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col2 LIMIT 2 OFFSET 0"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col2, col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1, col2 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 LIMIT 2"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 LIMIT 100"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 OFFSET 100"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 DESC"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 DESC LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 ASC"},
-      {"sql": "SELECT * FROM {basic} ORDER BY col1 ASC LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} ORDER BY power(col1, 2)"},
-      {"sql": "SELECT * FROM {basic} WHERE col1 > 3 ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} WHERE col0 > 3 ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {basic} WHERE col1 > 3 AND col1 < 5 ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT col1 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT col2 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT col1, col2 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT col1, col0, col2 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1"},
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col0 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col2 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col2 LIMIT 2 OFFSET 0",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col2, col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1, col2 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 LIMIT 2",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 LIMIT 100",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 OFFSET 100",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 DESC",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 DESC LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 ASC",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY col1 ASC LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} ORDER BY power(col1, 2)",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} WHERE col1 > 3 ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} WHERE col0 > 3 ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {basic} WHERE col1 > 3 AND col1 < 5 ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT col1 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT col2 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT col1, col2 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT col1, col0, col2 FROM {basic} ORDER BY col1 LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
       {
         "ignored": true,
         "comment": "we don't support ALL statement",
@@ -69,19 +135,37 @@
       }
     },
     "queries": [
-      {"sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY sum"},
-      {"sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY sum LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g HAVING SUM(val) > 3 ORDER BY sum LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY g"},
-      {"sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY SUM(val)"},
-      {"sql": "SELECT SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY g"}
+      {
+        "sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY sum",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY sum LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g HAVING SUM(val) > 3 ORDER BY sum LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY g",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT g, SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY SUM(val)",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT SUM(val) AS sum FROM {agg} GROUP BY g ORDER BY g",
+        "keepOutputRowOrder": true
+      }
     ]
   },
   "order_by_join": {
     "tables": {
       "l": {
         "schema": [
-          {"name": "key", "type": "STRING"},
+          {"name": "lkey", "type": "STRING"},
           {"name": "lval", "type": "INT"}
         ],
         "inputs": [
@@ -95,7 +179,7 @@
       },
       "r": {
         "schema": [
-          {"name": "key", "type": "STRING"},
+          {"name": "rkey", "type": "STRING"},
           {"name": "rval", "type": "INT"}
         ],
         "inputs": [
@@ -109,11 +193,28 @@
       }
     },
     "queries": [
-      {"sql": "SELECT * FROM {l} JOIN {r} ON {l}.key = {r}.key ORDER BY lval, rval LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT lval FROM {l} JOIN {r} ON {l}.key = {r}.key ORDER BY lval, rval LIMIT 2 OFFSET 1"},
-      {"sql": "SELECT * FROM {l} JOIN {r} ON {l}.key = {r}.key ORDER BY {l}.key"},
-      {"sql": "SELECT * FROM {l} JOIN {r} ON {l}.key = {r}.key ORDER BY {r}.key"},
-      {"sql": "SELECT {l}.key, SUM(lval), SUM(rval) FROM {l} JOIN {r} ON {l}.key = {r}.key GROUP BY {l}.key ORDER BY {l}.key"}
+      {
+        "sql": "SELECT * FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey ORDER BY lval, rval LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT lval FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey ORDER BY lval, rval LIMIT 2 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey ORDER BY {l}.lkey",
+        "keepOutputRowOrder": false,
+        "comments": "TODO: Setting 'keepOutputRowOrder' fails in this test, look into why. Most likely due to multiple rows for each ORDER BY {l}.lkey"
+      },
+      {
+        "sql": "SELECT * FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey ORDER BY {r}.rkey",
+        "keepOutputRowOrder": false,
+        "comments": "TODO: Setting 'keepOutputRowOrder' fails in this test, look into why. Most likely due to multiple rows for each ORDER BY {r}.rkey"
+      },
+      {
+        "sql": "SELECT {l}.lkey, SUM(lval), SUM(rval) FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey GROUP BY {l}.lkey ORDER BY {l}.lkey",
+        "keepOutputRowOrder": true
+      }
     ]
   },
   "order_by_subqueries": {
@@ -135,16 +236,47 @@
       }
     },
     "queries": [
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col0)"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2)"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2 OFFSET 1)"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2 OFFSET 1) ORDER BY col1 LIMIT 3"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2 OFFSET 1) ORDER BY col2 LIMIT 3 OFFSET 1"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 5 OFFSET 1) ORDER BY col1 LIMIT 3 OFFSET 1"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 5 OFFSET 1) ORDER BY col1 OFFSET 1"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2) LIMIT 1"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1) ORDER BY col0"},
-      {"sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1) ORDER BY col0 LIMIT 1"}
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col0)",
+        "keepOutputRowOrder": false,
+        "comments": "TODO: Setting 'keepOutputRowOrder' fails in this test, look into why. Perhaps this is due to no global ordering"
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2)",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2 OFFSET 1)",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2 OFFSET 1) ORDER BY col1 LIMIT 3",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2 OFFSET 1) ORDER BY col2 LIMIT 3 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 5 OFFSET 1) ORDER BY col1 LIMIT 3 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 5 OFFSET 1) ORDER BY col1 OFFSET 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1 LIMIT 2) LIMIT 1",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1) ORDER BY col0",
+        "keepOutputRowOrder": true
+      },
+      {
+        "sql": "SELECT * FROM (SELECT * FROM {tbl} ORDER BY col1) ORDER BY col0 LIMIT 1",
+        "keepOutputRowOrder": true
+      }
     ]
   },
   "order_by_float": {
@@ -167,11 +299,13 @@
     "queries": [
       {
         "sql": "SELECT col1 FROM {floats} ORDER BY col1 LIMIT 2 OFFSET 1",
-        "description": "Basic test for ordering by a float column with a limit and offset"
+        "description": "Basic test for ordering by a float column with a limit and offset",
+        "keepOutputRowOrder": true
       },
       {
         "sql": "SELECT col0 FROM {floats} ORDER BY col0 * 2 LIMIT 2 OFFSET 1",
-        "description": "Testing order by with an expression involving floats"
+        "description": "Testing order by with an expression involving floats",
+        "keepOutputRowOrder": true
       }
     ]
   },
@@ -195,11 +329,13 @@
     "queries": [
       {
         "sql": "SELECT col1 FROM {doubles} ORDER BY col1 LIMIT 2 OFFSET 1",
-        "description": "Basic test for ordering by a double column with a limit and offset"
+        "description": "Basic test for ordering by a double column with a limit and offset",
+        "keepOutputRowOrder": true
       },
       {
         "sql": "SELECT col0 FROM {doubles} ORDER BY col0 * 2 LIMIT 2 OFFSET 1",
-        "description": "Testing order by with an expression involving doubles"
+        "description": "Testing order by with an expression involving doubles",
+        "keepOutputRowOrder": true
       }
     ]
   },
@@ -225,7 +361,8 @@
     "queries": [
       {
         "sql": "SELECT col1 FROM {bools} ORDER BY col0, col1 LIMIT 2 OFFSET 1",
-        "description": "Basic test for ordering by a boolean column with a limit and offset"
+        "description": "Basic test for ordering by a boolean column with a limit and offset",
+        "keepOutputRowOrder": true
       }
     ]
   }
diff --git a/pinot-query-runtime/src/test/resources/queries/Parallelism.json b/pinot-query-runtime/src/test/resources/queries/Parallelism.json
new file mode 100644
index 00000000000..f177d0b79a4
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/Parallelism.json
@@ -0,0 +1,43 @@
+{
+  "test_parallelism": {
+    "tables": {
+      "l": {
+        "schema": [
+          {"name": "lkey", "type": "STRING"},
+          {"name": "lval", "type": "INT"}
+        ],
+        "inputs": [
+          ["foo", 1],
+          ["foo", 3],
+          ["foo", 5],
+          ["bar", 2],
+          ["bar", 4],
+          ["bar", 6]
+        ]
+      },
+      "r": {
+        "schema": [
+          {"name": "rkey", "type": "STRING"},
+          {"name": "rval", "type": "INT"}
+        ],
+        "inputs": [
+          ["foo", 1],
+          ["foo", 3],
+          ["foo", 7],
+          ["bar", 2],
+          ["bar", 4],
+          ["bar", 8]
+        ]
+      }
+    },
+    "queries": [
+      {"sql": "SET stageParallelism=2; SELECT * FROM {l} WHERE lval > 3"},
+      {"sql": "SET stageParallelism=2; SELECT * FROM {l} WHERE lval > 3 ORDER BY lval LIMIT 1"},
+      {"sql": "SET stageParallelism=2; SELECT lkey, SUM(lval) FROM {l} GROUP BY lkey"},
+      {"sql": "SET stageParallelism=2; SELECT {l}.lkey, {l}.lval, {r}.rval FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey"},
+      {"sql": "SET stageParallelism=2; SELECT {l}.lkey, SUM({l}.lval + {r}.rval) FROM {l} JOIN {r} ON {l}.lkey = {r}.rkey GROUP BY {l}.lkey"},
+      {"sql": "SET stageParallelism=2; SELECT * FROM {l} WHERE lval NOT IN (SELECT rval FROM {r} WHERE rval > 2)"},
+      {"sql": "SET stageParallelism=2; SELECT * FROM {l}, {r}"}
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/QueryHints.json b/pinot-query-runtime/src/test/resources/queries/QueryHints.json
new file mode 100644
index 00000000000..e9721994d98
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/QueryHints.json
@@ -0,0 +1,92 @@
+{
+  "hint_option_queries": {
+    "tables": {
+      "tbl1" : {
+        "schema": [
+          {"name": "num", "type": "INT"},
+          {"name": "name", "type": "STRING"}
+        ],
+        "inputs": [
+          [1, "a"],
+          [2, "b"],
+          [3, "c"],
+          [3, "yyy"],
+          [4, "e"],
+          [4, "e"],
+          [6, "e"],
+          [7, "d"],
+          [7, "f"],
+          [8, "z"]
+        ],
+        "partitionColumns": [
+          "num"
+        ]
+      },
+      "tbl2" : {
+        "schema": [
+          {"name": "num", "type": "INT"},
+          {"name": "val", "type": "STRING"}
+        ],
+        "inputs": [
+          [1, "xxx"],
+          [1, "xxx"],
+          [3, "yyy"],
+          [3, "zzz"],
+          [5, "zzz"],
+          [6, "e"],
+          [7, "d"],
+          [8, "z"]
+        ],
+        "partitionColumns": [
+          "num"
+        ]
+      },
+      "tbl_empty" : {
+        "schema": [
+          {"name": "strCol1", "type": "STRING"},
+          {"name": "intCol1", "type": "INT"},
+          {"name": "strCol2", "type": "STRING"}
+        ],
+        "inputs": [ ]
+      }
+    },
+    "queries": [
+      {
+        "description": "Colocated JOIN with partition column",
+        "sql": "SELECT /*+ joinOptions(is_colocated_by_join_keys='true') */ {tbl1}.num, {tbl1}.name, {tbl2}.num, {tbl2}.val FROM {tbl1} JOIN {tbl2} ON {tbl1}.num = {tbl2}.num"
+      },
+      {
+        "description": "Colocated JOIN with partition column and group by partition column",
+        "sql": "SELECT /*+ joinOptions(is_colocated_by_join_keys='true'), aggOptions(is_partitioned_by_group_by_keys='true') */ {tbl1}.num, {tbl1}.name, SUM({tbl2}.num) FROM {tbl1} JOIN {tbl2} ON {tbl1}.num = {tbl2}.num GROUP BY {tbl1}.num, {tbl1}.name"
+      },
+      {
+        "description": "Colocated JOIN with partition column and group by non-partitioned column",
+        "sql": "SELECT /*+ joinOptions(is_colocated_by_join_keys='true'), aggOptions(is_partitioned_by_group_by_keys='false') */ {tbl1}.name, SUM({tbl2}.num) FROM {tbl1} JOIN {tbl2} ON {tbl1}.num = {tbl2}.num GROUP BY {tbl1}.name"
+      },
+      {
+        "description": "Colocated, Dynamic broadcast SEMI-JOIN with partition column",
+        "sql": "SELECT /*+ joinOptions(join_strategy='dynamic_broadcast', is_colocated_by_join_keys='true') */ {tbl1}.num, {tbl1}.name FROM {tbl1} WHERE {tbl1}.num IN (SELECT {tbl2}.num FROM {tbl2} WHERE {tbl2}.val IN ('xxx', 'yyy'))"
+      },
+      {
+        "description": "Colocated, Dynamic broadcast SEMI-JOIN with partition column and group by partition column",
+        "sql": "SELECT /*+ joinOptions(join_strategy='dynamic_broadcast', is_colocated_by_join_keys='true'), aggOptions(is_partitioned_by_group_by_keys='true') */ {tbl1}.num, COUNT({tbl1}.name) FROM {tbl1} WHERE {tbl1}.num IN (SELECT {tbl2}.num FROM {tbl2} WHERE {tbl2}.val IN ('xxx', 'yyy')) GROUP BY {tbl1}.num, {tbl1}.name"
+      },
+      {
+        "description": "Colocated, Dynamic broadcast SEMI-JOIN with partition column and group by non-partitioned column",
+        "sql": "SELECT /*+ joinOptions(join_strategy='dynamic_broadcast', is_colocated_by_join_keys='true') */ {tbl1}.name, COUNT(*) FROM {tbl1} WHERE {tbl1}.num IN (SELECT {tbl2}.num FROM {tbl2} WHERE {tbl2}.val IN ('xxx', 'yyy')) GROUP BY {tbl1}.name"
+      },
+      {
+        "description": "Dynamic broadcast SEMI-JOIN with empty right table result",
+        "sql": "SELECT /*+ joinOptions(join_strategy='dynamic_broadcast') */ {tbl1}.name, COUNT(*) FROM {tbl1} WHERE {tbl1}.num IN (SELECT {tbl2}.num FROM {tbl2} WHERE {tbl2}.val = 'non-exist') GROUP BY {tbl1}.name"
+      },
+      {
+        "description": "Colocated, Dynamic broadcast SEMI-JOIN with partially empty right table result for some servers",
+        "sql": "SELECT /*+ joinOptions(join_strategy='dynamic_broadcast', is_colocated_by_join_keys='true') */ {tbl1}.name, COUNT(*) FROM {tbl1} WHERE {tbl1}.num IN (SELECT {tbl2}.num FROM {tbl2} WHERE {tbl2}.val = 'z') GROUP BY {tbl1}.name"
+      },
+      {
+        "description": "Skip leaf stage aggregation with GROUP BY hint",
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_group_by='true') */ {tbl1}.name, COUNT(*), SUM({tbl1}.num), MIN({tbl1}.num) FROM {tbl1} WHERE {tbl1}.num >= 0 GROUP BY {tbl1}.name"
+      }
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/SelectExpressions.json b/pinot-query-runtime/src/test/resources/queries/SelectExpressions.json
index 24fb9ab2c79..e0e4fb8b23a 100644
--- a/pinot-query-runtime/src/test/resources/queries/SelectExpressions.json
+++ b/pinot-query-runtime/src/test/resources/queries/SelectExpressions.json
@@ -27,6 +27,15 @@
           [1, "foo"],
           [2, "bar"]
         ]
+      },
+      "tbl3": {
+        "schema":[
+          {"name": "intArrayCol", "type": "INT", "isSingleValue": false},
+          {"name": "strArrayCol", "type": "STRING", "isSingleValue": false}
+        ],
+        "inputs": [
+          [[1, 10], ["foo1", "foo2"]]
+        ]
       }
     },
     "queries": [
@@ -35,7 +44,7 @@
       { "sql": "SELECT {tbl1}.*, {tbl2}.strCol FROM {tbl1}, {tbl2} WHERE {tbl1}.intCol = {tbl2}.intCol"},
       { "sql": "SELECT intCol as \"value\", doubleCol + floatCol AS \"sum\" FROM {tbl1}"},
       { "sql": "SELECT intCol as \"from\" FROM {tbl1}"},
-      { "sql": "SELECT intCol as key, SUM(doubleCol + floatCol) AS aggSum FROM {tbl1} GROUP BY intCol"},
+      { "sql": "SELECT intCol as \"key\", SUM(doubleCol + floatCol) AS aggSum FROM {tbl1} GROUP BY intCol"},
       { "sql": "SELECT intCol, SUM(avgVal) FROM (SELECT strCol, intCol, AVG(doubleCol) AS avgVal FROM {tbl1} GROUP BY intCol, strCol) GROUP BY intCol"},
       { "sql": "SELECT strCol, MAX(sumVal), MAX(sumVal + avgVal) AS transVal FROM (SELECT strCol, intCol, SUM(floatCol + 2 * intCol) AS sumVal, AVG(doubleCol) AS avgVal FROM {tbl1} GROUP BY strCol, intCol) GROUP BY strCol ORDER BY MAX(sumVal)" },
       { "sql": "SELECT intCol, intCol AS intAlias FROM {tbl1} WHERE intCol < 100" },
@@ -53,11 +62,8 @@
       { "sql": "SELECT intCol, intCol, doubleCol, strCol, strCol FROM {tbl1}" },
       { "sql": "SELECT {tbl1}.intCol, {tbl1}.intCol, {tbl1}.doubleCol, {tbl2}.strCol, {tbl2}.strCol FROM {tbl1}, {tbl2} WHERE {tbl1}.intCol = {tbl2}.intCol" },
       { "sql": "SELECT {tbl2}.intCol, {tbl2}.intCol FROM {tbl1}, {tbl2} WHERE {tbl1}.intCol = {tbl2}.intCol AND {tbl1}.intCol < 100 ORDER BY {tbl1}.doubleCol" },
-      {
-        "ignored": true,
-        "comment": "select intCol, intCol without aliasing one of them is not supported.",
-        "sql": "SELECT intCol, intCol FROM {tbl1} WHERE intCol < 100"
-      }
+      { "sql": "SELECT intCol, intCol FROM {tbl1} WHERE intCol < 100"},
+      { "sql": "SELECT intArrayCol, strArrayCol FROM {tbl3}"}
     ]
   }
 }
diff --git a/pinot-query-runtime/src/test/resources/queries/SetOps.json b/pinot-query-runtime/src/test/resources/queries/SetOps.json
new file mode 100644
index 00000000000..4ae8a800e6a
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/SetOps.json
@@ -0,0 +1,51 @@
+{
+  "set_op_test": {
+    "tables": {
+      "tbl1": {
+        "schema":[
+          {"name": "intCol", "type": "INT"},
+          {"name": "longCol", "type": "LONG"},
+          {"name": "floatCol", "type": "FLOAT"},
+          {"name": "doubleCol", "type": "DOUBLE"},
+          {"name": "strCol", "type": "STRING"}
+        ],
+        "inputs": [
+          [1, 8, 3.0, 5.176518e16, "lyons"],
+          [2, 9, 4.0, 4.608155e11, "onan"],
+          [3, 14, 5.0, 1.249261e11, "rudvalis"],
+          [4, 21, 6.0, 8.677557e19, "janko"],
+          [1, 41, 2.0, 4.15478e33, "baby"],
+          [2, 46, 1.0, 8.08017e53, "monster"]
+        ]
+      },
+      "tbl2": {
+        "schema":[
+          {"name": "intCol", "type": "INT"},
+          {"name": "strCol", "type": "STRING"}
+        ],
+        "inputs": [
+          [1, "foo"],
+          [2, "bar"]
+        ]
+      },
+      "tbl3": {
+        "schema":[
+          {"name": "intArrayCol", "type": "INT", "isSingleValue": false},
+          {"name": "strArrayCol", "type": "STRING", "isSingleValue": false}
+        ],
+        "inputs": [
+          [[1, 10], ["foo1", "foo2"]]
+        ]
+      }
+    },
+    "queries": [
+      { "sql": "SELECT intCol FROM {tbl1} INTERSECT SELECT intCol FROM {tbl1}"},
+      { "sql": "SELECT intCol FROM {tbl1} WHERE floatCol > 2.5 MINUS SELECT intCol FROM {tbl1} WHERE floatCol <2.5 "},
+      { "sql": "SELECT intCol FROM {tbl1} WHERE floatCol > 2.5 EXCEPT SELECT intCol FROM {tbl1} WHERE floatCol <2.5 "},
+      { "sql": "SELECT intCol, longCol, doubleCol, strCol FROM {tbl1} UNION ALL SELECT intCol, longCol, doubleCol, strCol FROM {tbl1}"},
+      { "sql": "SELECT intCol, longCol, doubleCol, strCol FROM {tbl1} WHERE strCol = 'monster' UNION ALL SELECT intCol, longCol, doubleCol, strCol FROM {tbl1} WHERE strCol = 'baby' "},
+      { "sql": "SELECT * FROM {tbl2} UNION ALL SELECT * FROM {tbl2}"},
+      { "sql": "SELECT intArrayCol, strArrayCol FROM {tbl3} UNION ALL SELECT intArrayCol, strArrayCol FROM {tbl3}"}
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/Skew.json b/pinot-query-runtime/src/test/resources/queries/Skew.json
deleted file mode 100644
index 7f16a6970e3..00000000000
--- a/pinot-query-runtime/src/test/resources/queries/Skew.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "skew": {
-    "tables": {
-      "tbl": {
-        "schema": [
-          {"name": "groupingCol", "type": "STRING"},
-          {"name": "partitionCol", "type": "STRING"},
-          {"name": "val", "type": "INT"}
-        ],
-        "inputs": [
-          ["a", "key1", 1],
-          ["a", "key2", 2],
-          ["a", "key3", 3],
-          ["a", "key1", 4],
-          ["a", "key2", 4],
-          ["a", "key3", 4],
-          ["a", "key1", 7],
-          ["a", "key2", 9],
-          ["b", "key3", 1],
-          ["b", "key1", 2],
-          ["b", "key2", 3],
-          ["b", "key3", 4],
-          ["b", "key1", 4],
-          ["b", "key2", 4],
-          ["b", "key3", 7],
-          ["b", "key1", 9]
-        ],
-        "partitionColumns": [
-          "partitionCol"
-        ]
-      },
-      "tbl2": {
-        "schema": [
-          {"name": "groupingCol", "type": "STRING"},
-          {"name": "partitionCol", "type": "STRING"},
-          {"name": "val", "type": "INT"}
-        ],
-        "inputs": [
-          ["a", "key1", 1],
-          ["a", "key2", 2],
-          ["a", "key3", 3],
-          ["a", "key1", 4],
-          ["a", "key2", 4],
-          ["a", "key3", 4],
-          ["a", "key1", 7],
-          ["a", "key2", 9],
-          ["b", "key3", 1],
-          ["b", "key1", 2],
-          ["b", "key2", 3],
-          ["b", "key3", 4],
-          ["b", "key1", 4],
-          ["b", "key2", 4],
-          ["b", "key3", 7],
-          ["b", "key1", 9]
-        ],
-        "partitionColumns": [
-          "partitionCol"
-        ]
-      }
-    },
-    "queries": [
-      {
-        "description": "skew for int column",
-        "sql": "SELECT groupingCol, SKEWNESS(val), KURTOSIS(val) FROM {tbl} GROUP BY groupingCol",
-        "outputs": [
-          ["a", 0.8647536091225356, 0.3561662049861511],
-          ["b", 0.8647536091225356, 0.3561662049861511]
-        ]
-      },
-      {
-        "description": "no group by clause",
-        "sql": "SELECT SKEWNESS(val), KURTOSIS(val) FROM {tbl} WHERE groupingCol='a'",
-        "outputs": [
-          [0.8647536091225356, 0.3561662049861511]
-        ]
-      },
-      {
-        "sql": "SELECT t1.groupingCol, SKEWNESS(t1.val + t2.val), KURTOSIS(t1.val + t2.val) FROM {tbl} AS t1 LEFT JOIN {tbl2} AS t2 USING (partitionCol) GROUP BY t1.groupingCol",
-        "outputs": [
-          ["a", 0.5412443772804422, -0.001438580062540293],
-          ["b", 0.5412443772804422, -0.001438580062540293]
-        ]
-      }
-    ]
-  }
-}
diff --git a/pinot-query-runtime/src/test/resources/queries/SpecialSyntax.json b/pinot-query-runtime/src/test/resources/queries/SpecialSyntax.json
index 7fb77c5ad70..f312015b410 100644
--- a/pinot-query-runtime/src/test/resources/queries/SpecialSyntax.json
+++ b/pinot-query-runtime/src/test/resources/queries/SpecialSyntax.json
@@ -60,14 +60,14 @@
         "description": "test agg function with STD SQL operator works properly",
         "sql": "SELECT sUm(col3_r), AvG(col3_r), MAX(PLUS(Add(CAST(col3_l AS DOUBLE), CAST(col3_r AS DOUBLE)), CAST(10 AS DOUBLE))) FROM (SELECT {tbl1}.col1 AS col1, {tbl1}.col3 AS col3_l, {tbl2}.col3 AS col3_r FROM {tbl1} JOIN {tbl2} USING (col2))",
         "outputs": [
-          [7, 3, 15.0]
+          [7, 3.5, 15.0]
         ]
       },
       {
         "description": "test scalar function with STD SQL operator, and scalar function without STD SQL operator can be found properly",
         "sql": "SELECT sUm(col3), AvG(col3), MAX(pluS(CAST(col3 AS DOUBLE), CAST(10 AS DOUBLE))) FROM {tbl1}",
         "outputs": [
-          [3, 1, 12.0]
+          [3, 1.5, 12.0]
         ]
       }
     ]
diff --git a/pinot-query-runtime/src/test/resources/queries/StatisticAggregates.json b/pinot-query-runtime/src/test/resources/queries/StatisticAggregates.json
new file mode 100644
index 00000000000..54e945b93bc
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/StatisticAggregates.json
@@ -0,0 +1,175 @@
+{
+  "stats_aggregate_non_h2": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "partitionCol", "type": "STRING"},
+          {"name": "val", "type": "INT"}
+        ],
+        "inputs": [
+          ["a", "key1", 1],
+          ["a", "key2", 2],
+          ["a", "key3", 3],
+          ["a", "key1", 4],
+          ["a", "key2", 4],
+          ["a", "key3", 4],
+          ["a", "key1", 7],
+          ["a", "key2", 9],
+          ["b", "key3", 1],
+          ["b", "key1", 2],
+          ["b", "key2", 3],
+          ["b", "key3", 4],
+          ["b", "key1", 4],
+          ["b", "key2", 4],
+          ["b", "key3", 7],
+          ["b", "key1", 9]
+        ],
+        "partitionColumns": [
+          "partitionCol"
+        ]
+      },
+      "tbl2": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "partitionCol", "type": "STRING"},
+          {"name": "val", "type": "INT"}
+        ],
+        "inputs": [
+          ["a", "key1", 1],
+          ["a", "key2", 2],
+          ["a", "key3", 3],
+          ["a", "key1", 4],
+          ["a", "key2", 4],
+          ["a", "key3", 4],
+          ["a", "key1", 7],
+          ["a", "key2", 9],
+          ["b", "key3", 1],
+          ["b", "key1", 2],
+          ["b", "key2", 3],
+          ["b", "key3", 4],
+          ["b", "key1", 4],
+          ["b", "key2", 4],
+          ["b", "key3", 7],
+          ["b", "key1", 9]
+        ],
+        "partitionColumns": [
+          "partitionCol"
+        ]
+      }
+    },
+    "queries": [
+      {
+        "description": "skew for int column",
+        "sql": "SELECT groupingCol, SKEWNESS(val), KURTOSIS(val) FROM {tbl} GROUP BY groupingCol",
+        "outputs": [
+          ["a", 0.8647536091225356, 0.3561662049861511],
+          ["b", 0.8647536091225356, 0.3561662049861511]
+        ]
+      },
+      {
+        "description": "no group by clause",
+        "sql": "SELECT SKEWNESS(val), KURTOSIS(val) FROM {tbl} WHERE groupingCol='a'",
+        "outputs": [
+          [0.8647536091225356, 0.3561662049861511]
+        ]
+      },
+      {
+        "sql": "SELECT t1.groupingCol, SKEWNESS(t1.val + t2.val), KURTOSIS(t1.val + t2.val) FROM {tbl} AS t1 LEFT JOIN {tbl2} AS t2 USING (partitionCol) GROUP BY t1.groupingCol",
+        "outputs": [
+          ["a", 0.5412443772804422, -0.001438580062540293],
+          ["b", 0.5412443772804422, -0.001438580062540293]
+        ]
+      }
+    ]
+  },
+  "stats_aggregate_h2": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "partitionCol", "type": "STRING"},
+          {"name": "val", "type": "INT"}
+        ],
+        "inputs": [
+          ["a", "key1", 1],
+          ["a", "key2", 2],
+          ["a", "key3", 3],
+          ["a", "key1", 4],
+          ["a", "key2", 4],
+          ["a", "key3", 4],
+          ["a", "key1", 7],
+          ["a", "key2", 9],
+          ["b", "key3", 1],
+          ["b", "key1", 2],
+          ["b", "key2", 3],
+          ["b", "key3", 4],
+          ["b", "key1", 4],
+          ["b", "key2", 4],
+          ["b", "key3", 7],
+          ["b", "key1", 9]
+        ],
+        "partitionColumns": [
+          "partitionCol"
+        ]
+      },
+      "tbl2": {
+        "schema": [
+          {"name": "groupingCol", "type": "STRING"},
+          {"name": "partitionCol", "type": "STRING"},
+          {"name": "val", "type": "INT"}
+        ],
+        "inputs": [
+          ["a", "key1", 1],
+          ["a", "key2", 2],
+          ["a", "key3", 3],
+          ["a", "key1", 4],
+          ["a", "key2", 4],
+          ["a", "key3", 4],
+          ["a", "key1", 7],
+          ["a", "key2", 9],
+          ["b", "key3", 1],
+          ["b", "key1", 2],
+          ["b", "key2", 3],
+          ["b", "key3", 4],
+          ["b", "key1", 4],
+          ["b", "key2", 4],
+          ["b", "key3", 7],
+          ["b", "key1", 9]
+        ],
+        "partitionColumns": [
+          "partitionCol"
+        ]
+      }
+    },
+    "queries": [
+      {
+        "sql": "SELECT groupingCol, COVARPOP(val, val), COVARSAMP(val, val), VARPOP(val), VARSAMP(val), STDDEVPOP(val), STDDEVSAMP(val) FROM {tbl} GROUP BY groupingCol",
+        "h2Sql": "SELECT groupingCol, COVAR_POP(val, val), COVAR_SAMP(val, val), VAR_POP(val), VAR_SAMP(val), STDDEV_POP(val), STDDEV_SAMP(val) FROM {tbl} GROUP BY groupingCol"
+      },
+      {
+        "sql": "SELECT COVARPOP(val, val), COVARSAMP(val, val), VARPOP(val), VARSAMP(val), STDDEVPOP(val), STDDEVSAMP(val) FROM {tbl} WHERE groupingCol='a'",
+        "h2Sql": "SELECT COVAR_POP(val, val), COVAR_SAMP(val, val), VAR_POP(val), VAR_SAMP(val), STDDEV_POP(val), STDDEV_SAMP(val) FROM {tbl} WHERE groupingCol='a'"
+      },
+      {
+        "sql": "SELECT t1.groupingCol, COVARPOP(t1.val, t2.val), COVARSAMP(t1.val, t2.val), VARPOP(t1.val + t2.val), VARSAMP(t1.val + t2.val), STDDEVPOP(t1.val + t2.val), STDDEVSAMP(t1.val + t2.val) FROM {tbl} AS t1 LEFT JOIN {tbl2} AS t2 USING (partitionCol) GROUP BY t1.groupingCol",
+        "h2Sql": "SELECT t1.groupingCol, COVAR_POP(t1.val, t2.val), COVAR_SAMP(t1.val, t2.val), VAR_POP(t1.val + t2.val), VAR_SAMP(t1.val + t2.val), STDDEV_POP(t1.val + t2.val), STDDEV_SAMP(t1.val + t2.val) FROM {tbl} AS t1 LEFT JOIN {tbl2} AS t2 USING (partitionCol) GROUP BY t1.groupingCol"
+      },
+      {
+        "ignored": true,
+        "comments": "standard name with underscore creates un-supported function from agg-reduce-function calcite rule",
+        "sql": "SELECT groupingCol, COVAR_POP(val, val), COVAR_SAMP(val, val), VAR_POP(val), VAR_SAMP(val), STD_DEV_POP(val), STD_DEV_SAMP(val) FROM {tbl} GROUP BY groupingCol"
+      },
+      {
+        "ignored": true,
+        "comments": "standard name with underscore creates un-supported function from agg-reduce-function calcite rule",
+        "sql": "SELECT COVAR_POP(val, val), COVAR_SAMP(val, val), VAR_POP(val), VAR_SAMP(val), STD_DEV_POP(val), STD_DEV_SAMP(val) FROM {tbl} WHERE groupingCol='a'"
+      },
+      {
+        "ignored": true,
+        "comments": "standard name with underscore creates un-supported function from agg-reduce-function calcite rule",
+        "sql": "SELECT t1.groupingCol, COVAR_POP(t1.val, t2.val), COVAR_SAMP(t1.val, t2.val), VAR_POP(t1.val + t2.val), VAR_SAMP(t1.val + t2.val), STD_DEV_POP(t1.val + t2.val), STD_DEV_SAMP(t1.val + t2.val) FROM {tbl} AS t1 LEFT JOIN {tbl2} AS t2 USING (partitionCol) GROUP BY t1.groupingCol"
+      }
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/TableExpressions.json b/pinot-query-runtime/src/test/resources/queries/TableExpressions.json
index ada612fc1e7..d5e8085bad0 100644
--- a/pinot-query-runtime/src/test/resources/queries/TableExpressions.json
+++ b/pinot-query-runtime/src/test/resources/queries/TableExpressions.json
@@ -12,6 +12,9 @@
           ["bar", 2],
           ["alice", 42],
           ["bob", 196883]
+        ],
+        "partitionColumns": [
+          "strCol"
         ]
       }
     },
@@ -22,6 +25,10 @@
       { "sql": "SELECT * FROM {tbl} WHERE intCol > 5" },
       { "sql": "SELECT * FROM {tbl} WHERE strCol IN ('foo', 'bar')" },
       { "sql": "SELECT * FROM {tbl} WHERE intCol IN (196883, 42)" },
+      { "sql": "SELECT * FROM {tbl} WHERE strCol IN ('foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar')" },
+      { "sql": "SELECT * FROM {tbl} WHERE intCol IN (1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 20, 21, 22, 23, 24, 25, 26, 27, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)" },
+      { "sql": "SELECT * FROM {tbl} WHERE strCol NOT IN ('foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar', 'foo', 'bar')" },
+      { "sql": "SELECT * FROM {tbl} WHERE intCol NOT IN (1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 20, 21, 22, 23, 24, 25, 26, 27, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)" },
       { "sql": "SELECT * FROM {tbl} WHERE intCol NOT IN (196883, 42) AND strCol IN ('alice')" },
       { "sql": "SELECT * FROM {tbl} WHERE strCol IN (SELECT strCol FROM {tbl} WHERE intCol > 100)" },
       { "sql": "SELECT * FROM {tbl} WHERE intCol < (SELECT SUM(intCol) FROM {tbl} AS b WHERE strCol BETWEEN 'bar' AND 'foo')" },
@@ -94,6 +101,12 @@
       { "sql": "SELECT strCol FROM {tbl1} GROUP BY strCol, intCol" },
       { "sql": "SELECT strCol, intCol FROM {tbl1} GROUP BY strCol, intCol" },
       { "sql": "SELECT strCol, SUM(intCol) FROM {tbl1} GROUP BY strCol" },
+      { "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b ON a.strCol > b.strCol1" },
+      { "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b ON a.intCol = b.intCol WHERE a.strCol > b.strCol1" },
+      { "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b ON a.intCol = b.intCol AND a.strCol > b.strCol1" },
+      { "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b ON a.strCol BETWEEN b.strCol1 AND b.strCol2" },
+      { "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b ON a.intCol = b.intCol WHERE a.strCol BETWEEN b.strCol1 AND b.strCol2" },
+      { "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b ON a.intCol = b.intCol AND a.strCol BETWEEN b.strCol1 AND b.strCol2" },
       { "sql": "SELECT strCol, b.strCol2, (sum(a.intCol) * b.intCol) AS colAlias FROM {tbl1} a INNER JOIN {tbl2} b ON a.strCol = b.strCol1 GROUP BY strCol, b.strCol2, b.intCol" },
       { "sql": "SELECT MOD(b.intCol, 2), sum(a.intCol) AS colAlias FROM {tbl1} a INNER JOIN {tbl2} b ON a.strCol = b.strCol1 GROUP BY MOD(b.intCol, 2)" },
       { "sql": "SELECT strCol, SUM(intCol) FROM {tbl1} GROUP BY strCol HAVING SUM(intCol) > 3" },
@@ -108,6 +121,16 @@
         "ignored": true,
         "comment": "correlation is not supported. SOME is only supported if expand = false",
         "sql": "SELECT strCol, SUM(intCol) FROM {tbl1} GROUP BY strCol HAVING AVG(intCol) >= ANY (SELECT AVG(intCol) FROM {tbl1} GROUP BY strCol)"
+      },
+      {
+        "ignored": true,
+        "comments": "where clause inequality join condition is not supported",
+        "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b WHERE a.intCol > b.intCol"
+      },
+      {
+        "ignored": true,
+        "comments": "where clause inequality join condition is not supported yet",
+        "sql": "SELECT b.intCol, a.intCol FROM {tbl1} a INNER JOIN {tbl2} b WHERE a.strCol BETWEEN b.strCol1 AND b.strCol2"
       }
     ]
   }
diff --git a/pinot-query-runtime/src/test/resources/queries/TypeCasting.json b/pinot-query-runtime/src/test/resources/queries/TypeCasting.json
index f134cfd4b2b..39233d6604d 100644
--- a/pinot-query-runtime/src/test/resources/queries/TypeCasting.json
+++ b/pinot-query-runtime/src/test/resources/queries/TypeCasting.json
@@ -36,14 +36,14 @@
       { "sql": "SELECT CAST(floatCol AS DOUBLE) * 1e100, CAST(intCol AS BIGINT) * 2000000000, CAST(longCol AS DOUBLE) * 1e100, CAST(boolCol AS INT) FROM {tbl}" },
       { "sql": "SELECT CAST(a.floatCol AS DOUBLE) * 1e100, CAST(a.intCol AS BIGINT) * 2000000000, CAST(b.longCol AS FLOAT) * 1e20, CAST(a.boolCol AS INT) FROM {tbl} AS a JOIN {tbl} AS b ON a.intCol = b.intCol WHERE a.boolCol = true" },
       {
-        "ignored": true,
-        "comments": "primitive cast not work: cast as DECIMAL doesn't work",
-        "sql": "SELECT CAST(doubleCol AS DECIMAL) FROM {tbl} WHERE bigDecimalCol > 0 AND CAST(bytesCol AS VARCHAR) != '1000'"
+        "comments": "special cast not work: bytes cast to hex is not supported in h2, need to use RAWTOHEX(bytesCol) instead",
+        "sql": "SELECT CAST(doubleCol AS DECIMAL), CAST(bytesCol AS VARCHAR) FROM {tbl} WHERE bigDecimalCol > 0 AND CAST(bytesCol AS VARCHAR) != '1000'",
+        "h2Sql": "SELECT CAST(doubleCol AS DECIMAL), RAWTOHEX(bytesCol) FROM {tbl} WHERE bigDecimalCol > 0 AND RAWTOHEX(bytesCol) != '1000'"
       },
       {
         "ignored": true,
         "comments": "special cast not work: timestamp cast not supported, varchar cast not supported",
-        "sql": "SELECT CAST(b.timestampCol AS BIGINT), CAST(stringCol AS VARBINARY) FROM {tbl}"
+        "sql": "SELECT CAST(timestampCol AS BIGINT), CAST(stringCol AS VARBINARY) FROM {tbl}"
       }
     ]
   },
diff --git a/pinot-query-runtime/src/test/resources/queries/UDFAggregates.json b/pinot-query-runtime/src/test/resources/queries/UDFAggregates.json
new file mode 100644
index 00000000000..f5a765e9ad6
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/UDFAggregates.json
@@ -0,0 +1,69 @@
+{
+  "pinot_aggregate_udf_tests": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "long_col", "type": "LONG"},
+          {"name": "float_col", "type": "FLOAT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"},
+          {"name": "decimal_col", "type": "BIG_DECIMAL"},
+          {"name": "timestamp_col", "type": "TIMESTAMP"}
+        ],
+        "inputs": [
+          [2, 2, 300, 300, "a", true, "1E-307", "2020-01-01 03:10:12"],
+          [2, 2, 400, 400, "a", true, "1E+307", "2020-01-01 03:39:12"],
+          [3, 3, 100, 100, "b", false, "1E-308", "2020-01-01 08:32:12"],
+          [100, 100, 1, 1, "b", false, "1E+308", "2020-02-06 03:32:12"],
+          [101, 101, 1.01, 1.01, "c", false, "1E-317", "2020-05-01 03:32:12"],
+          [150, 150, 1.5, 1.5, "c", false, "1E+317", "2020-02-03 03:32:12"],
+          [175, 175, 1.75, 1.75, "c", true, "1E+328", "2020-01-02 03:32:12"]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "sql": "SELECT FIRSTWITHTIME(int_col, timestamp_col, 'INT'), FIRSTWITHTIME(string_col, timestamp_col, 'STRING'), first_with_time(bool_col, CAST(long_col AS TIMESTAMP), 'BOOLEAN') FROM {tbl}",
+        "outputs": [[2, "a", true]]
+      },
+      {
+        "sql": "SELECT bool_col, FIRSTWITHTIME(float_col, timestamp_col, 'FLOAT'), FIRSTWITHTIME(double_col, timestamp_col, 'DOUBLE'), first_with_time(long_col, CAST(long_col AS TIMESTAMP), 'LONG') FROM {tbl} GROUP BY bool_col",
+        "outputs": [[false, 100, 100, 3], [true, 300, 300, 2]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ string_col, FIRSTWITHTIME(float_col, timestamp_col, 'FLOAT'), FIRSTWITHTIME(double_col, timestamp_col, 'DOUBLE'), first_with_time(long_col, CAST(long_col AS TIMESTAMP), 'LONG') FROM {tbl} GROUP BY string_col",
+        "outputs": [["a", 300, 300, 2], ["b", 100, 100, 3], ["c", 1.75, 1.75, 101]]
+      },
+      {
+        "sql": "SELECT LASTWITHTIME(int_col, timestamp_col, 'INT'), LASTWITHTIME(string_col, timestamp_col, 'STRING'), last_with_time(bool_col, CAST(long_col AS TIMESTAMP), 'BOOLEAN') FROM {tbl}",
+        "outputs": [[101, "c", true]]
+      },
+      {
+        "sql": "SELECT bool_col, LASTWITHTIME(float_col, timestamp_col, 'FLOAT'), LASTWITHTIME(double_col, timestamp_col, 'DOUBLE'), last_with_time(long_col, CAST(long_col AS TIMESTAMP), 'LONG') FROM {tbl} GROUP BY bool_col",
+        "outputs": [[false, 1.01, 1.01, 150], [true, 1.75, 1.75, 175]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ string_col, LASTWITHTIME(float_col, timestamp_col, 'FLOAT'), LASTWITHTIME(double_col, timestamp_col, 'DOUBLE'), last_with_time(long_col, CAST(long_col AS TIMESTAMP), 'LONG') FROM {tbl} GROUP BY string_col",
+        "outputs": [["a", 400, 400, 2], ["b", 1, 1, 100], ["c", 1.01, 1.01, 175]]
+      },
+      {
+        "sql": "SELECT PERCENTILE(float_col, 50), PERCENTILE(double_col, 5), PERCENTILE(int_col, 75), PERCENTILE(long_col, 75) FROM {tbl}",
+        "outputs": [[1.75, 1, 150, 150]]
+      },
+      {
+        "sql": "SELECT bool_col, PERCENTILE(float_col, 50), PERCENTILE(double_col, 5), PERCENTILE(int_col, 75), PERCENTILE(long_col, 75) FROM {tbl} GROUP BY bool_col",
+        "outputs": [[false, 1.5, 1, 150, 150], [true, 300, 1.75, 175, 175]]
+      },
+      {
+        "sql": "SELECT /*+ aggOptions(is_skip_leaf_stage_aggregate='true') */ string_col, PERCENTILE(float_col, 50), PERCENTILE(double_col, 5), PERCENTILE(int_col, 75), PERCENTILE(long_col, 75) FROM {tbl} GROUP BY string_col",
+        "outputs": [["a", 400, 300, 2, 2], ["b", 100, 1, 100, 100], ["c", 1.5, 1.01, 175, 175]]
+      },
+      {
+        "sql": "SELECT SUMPRECISION(decimal_col) FROM {tbl}",
+        "outputs": [["10000000000100000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011000000001"]]
+      }
+    ]
+  }
+}
diff --git a/pinot-query-runtime/src/test/resources/queries/WindowFunctions.json b/pinot-query-runtime/src/test/resources/queries/WindowFunctions.json
new file mode 100644
index 00000000000..dd25411d26a
--- /dev/null
+++ b/pinot-query-runtime/src/test/resources/queries/WindowFunctions.json
@@ -0,0 +1,5352 @@
+{
+  "window_function_aggregations": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [3, 100, "c", true],
+          [100, 1, "b", false],
+          [42, 50.5, "e", true],
+          [42, 42, "d", false],
+          [42, 75, "a", true],
+          [42, 42, "a", false],
+          [42, 50.5, "a", true],
+          [42, 42, "e", false],
+          [101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [150, 1.53, "h", false],
+          [3, 100, "g", true],
+          [2, 400, "c", false]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "description": "Single empty OVER() sum",
+        "sql": "SELECT SUM(int_col) OVER() FROM {tbl}",
+        "outputs": [
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768],
+          [768]
+        ]
+      },
+      {
+        "description": "Single empty OVER() count(*) without select col",
+        "sql": "SELECT COUNT(*) OVER() FROM {tbl}",
+        "outputs": [
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16],
+          [16]
+        ]
+      },
+      {
+        "description": "Single empty OVER() count(*) without select col",
+        "sql": "SELECT 42, COUNT(*) OVER() FROM {tbl}",
+        "outputs": [
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16],
+          [42, 16]
+        ]
+      },
+      {
+        "description": "Single empty OVER() row_number",
+        "sql": "SELECT ROW_NUMBER() OVER() FROM {tbl}",
+        "outputs": [
+          [1],
+          [2],
+          [3],
+          [4],
+          [5],
+          [6],
+          [7],
+          [8],
+          [9],
+          [10],
+          [11],
+          [12],
+          [13],
+          [14],
+          [15],
+          [16]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) sum",
+        "sql": "SELECT SUM(int_col) OVER(ORDER BY string_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [130],
+          [130],
+          [130],
+          [130],
+          [130],
+          [233],
+          [233],
+          [489],
+          [489],
+          [489],
+          [489],
+          [531],
+          [615],
+          [615],
+          [618],
+          [768]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank",
+        "sql": "SELECT RANK() OVER(ORDER BY string_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1],
+          [1],
+          [1],
+          [1],
+          [1],
+          [6],
+          [6],
+          [8],
+          [8],
+          [8],
+          [8],
+          [12],
+          [13],
+          [13],
+          [15],
+          [16]
+        ]
+      },
+      {
+        "description": "Single empty OVER() sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(), int_col FROM {tbl}",
+        "outputs": [
+          ["a", 768, 2],
+          ["a", 768, 2],
+          ["b", 768, 3],
+          ["c", 768, 3],
+          ["b", 768, 100],
+          ["e", 768, 42],
+          ["d", 768, 42],
+          ["a", 768, 42],
+          ["a", 768, 42],
+          ["a", 768, 42],
+          ["e", 768, 42],
+          ["c", 768, 101],
+          ["c", 768, 150],
+          ["h", 768, 150],
+          ["g", 768, 3],
+          ["c", 768, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) sum with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col, int_col), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 4, 2],
+          ["a", 4, 2],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["b", 133, 3],
+          ["b", 233, 100],
+          ["c", 235, 2],
+          ["c", 238, 3],
+          ["c", 339, 101],
+          ["c", 489, 150],
+          ["d", 531, 42],
+          ["e", 615, 42],
+          ["e", 615, 42],
+          ["g", 618, 3],
+          ["h", 768, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(ORDER BY string_col, int_col), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 2, 2],
+          ["a", 3, 42],
+          ["a", 4, 42],
+          ["a", 5, 42],
+          ["b", 6, 3],
+          ["b", 7, 100],
+          ["c", 8, 2],
+          ["c", 9, 3],
+          ["c", 10, 101],
+          ["c", 11, 150],
+          ["d", 12, 42],
+          ["e", 13, 42],
+          ["e", 14, 42],
+          ["g", 15, 3],
+          ["h", 16, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY string_col, int_col), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 1, 2],
+          ["a", 3, 42],
+          ["a", 3, 42],
+          ["a", 3, 42],
+          ["b", 6, 3],
+          ["b", 7, 100],
+          ["c", 8, 2],
+          ["c", 9, 3],
+          ["c", 10, 101],
+          ["c", 11, 150],
+          ["d", 12, 42],
+          ["e", 13, 42],
+          ["e", 13, 42],
+          ["g", 15, 3],
+          ["h", 16, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(ORDER BY string_col, int_col), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 1, 2],
+          ["a", 2, 42],
+          ["a", 2, 42],
+          ["a", 2, 42],
+          ["b", 3, 3],
+          ["b", 4, 100],
+          ["c", 5, 2],
+          ["c", 6, 3],
+          ["c", 7, 101],
+          ["c", 8, 150],
+          ["d", 9, 42],
+          ["e", 10, 42],
+          ["e", 10, 42],
+          ["g", 11, 3],
+          ["h", 12, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) sum with one DESC column with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col DESC, int_col), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 150, 150],
+          ["g", 153, 3],
+          ["e", 237, 42],
+          ["e", 237, 42],
+          ["d", 279, 42],
+          ["c", 281, 2],
+          ["c", 284, 3],
+          ["c", 385, 101],
+          ["c", 535, 150],
+          ["b", 538, 3],
+          ["b", 638, 100],
+          ["a", 642, 2],
+          ["a", 642, 2],
+          ["a", 768, 42],
+          ["a", 768, 42],
+          ["a", 768, 42]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) sum with two DESC columns with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col DESC, int_col DESC), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 150, 150],
+          ["g", 153, 3],
+          ["e", 237, 42],
+          ["e", 237, 42],
+          ["d", 279, 42],
+          ["c", 429, 150],
+          ["c", 530, 101],
+          ["c", 533, 3],
+          ["c", 535, 2],
+          ["b", 635, 100],
+          ["b", 638, 3],
+          ["a", 764, 42],
+          ["a", 764, 42],
+          ["a", 764, 42],
+          ["a", 768, 2],
+          ["a", 768, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with two DESC columns with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(ORDER BY string_col DESC, int_col DESC), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 1, 150],
+          ["g", 2, 3],
+          ["e", 3, 42],
+          ["e", 4, 42],
+          ["d", 5, 42],
+          ["c", 6, 150],
+          ["c", 7, 101],
+          ["c", 8, 3],
+          ["c", 9, 2],
+          ["b", 10, 100],
+          ["b", 11, 3],
+          ["a", 12, 42],
+          ["a", 13, 42],
+          ["a", 14, 42],
+          ["a", 15, 2],
+          ["a", 16, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with two DESC columns with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(ORDER BY string_col DESC, int_col DESC), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 1, 150],
+          ["g", 2, 3],
+          ["e", 3, 42],
+          ["e", 3, 42],
+          ["d", 4, 42],
+          ["c", 5, 150],
+          ["c", 6, 101],
+          ["c", 7, 3],
+          ["c", 8, 2],
+          ["b", 9, 100],
+          ["b", 10, 3],
+          ["a", 11, 42],
+          ["a", 11, 42],
+          ["a", 11, 42],
+          ["a", 12, 2],
+          ["a", 12, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) sum with second DESC column with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col, int_col DESC), int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 126, 42],
+          ["a", 126, 42],
+          ["a", 126, 42],
+          ["a", 130, 2],
+          ["a", 130, 2],
+          ["b", 230, 100],
+          ["b", 233, 3],
+          ["c", 383, 150],
+          ["c", 484, 101],
+          ["c", 487, 3],
+          ["c", 489, 2],
+          ["d", 531, 42],
+          ["e", 615, 42],
+          ["e", 615, 42],
+          ["g", 618, 3],
+          ["h", 768, 150]
+        ]
+      },
+      {
+        "description": "Single empty OVER() max with select columns with alias",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER() AS max, int_col FROM {tbl}",
+        "outputs": [
+          ["a", 400, 2],
+          ["a", 400, 2],
+          ["b", 400, 3],
+          ["c", 400, 3],
+          ["b", 400, 100],
+          ["e", 400, 42],
+          ["d", 400, 42],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["e", 400, 42],
+          ["c", 400, 101],
+          ["c", 400, 150],
+          ["h", 400, 150],
+          ["g", 400, 3],
+          ["c", 400, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) max with select columns with alias (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER(ORDER BY string_col, int_col) AS max, int_col FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 400, 2],
+          ["a", 400, 2],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["b", 400, 3],
+          ["b", 400, 100],
+          ["c", 400, 2],
+          ["c", 400, 3],
+          ["c", 400, 101],
+          ["c", 400, 150],
+          ["d", 400, 42],
+          ["e", 400, 42],
+          ["e", 400, 42],
+          ["g", 400, 3],
+          ["h", 400, 150]
+        ]
+      },
+      {
+        "description": "Single empty OVER() min with select columns and default frame",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), double_col FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "outputs": [
+          [true, 2, 300],
+          [true, 2, 400],
+          [false, 2, 100],
+          [true, 2, 100],
+          [false, 2, 1],
+          [true, 2, 50.5],
+          [false, 2, 42],
+          [true, 2, 75],
+          [false, 2, 42],
+          [true, 2, 50.5],
+          [false, 2, 42],
+          [false, 2, 1.01],
+          [false, 2, 1.5],
+          [false, 2, 1.53],
+          [true, 2, 100],
+          [false, 2, 400]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) min with select columns and default frame (cannot use RANGE with multiple ORDER BY columns so not checking row order)",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(ORDER BY int_col RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used with multiple ORDER BY columns. We don't support ROWS yet. Without frame specification the default is RANGE though.",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 2, 300],
+          [true, 2, 400],
+          [false, 2, 400],
+          [true, 2, 100],
+          [true, 2, 100],
+          [false, 2, 100],
+          [true, 2, 50.5],
+          [false, 2, 42],
+          [true, 2, 75],
+          [false, 2, 42],
+          [true, 2, 50.5],
+          [false, 2, 42],
+          [false, 2, 1],
+          [false, 2, 1.01],
+          [false, 2, 1.5],
+          [false, 2, 1.53]
+        ]
+      },
+      {
+        "description": "Single empty OVER() avg with select col with global order by",
+        "sql": "SELECT string_col, AVG(double_col) OVER() FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 106.69],
+          ["a", 106.69],
+          ["a", 106.69],
+          ["a", 106.69],
+          ["a", 106.69],
+          ["b", 106.69],
+          ["b", 106.69],
+          ["c", 106.69],
+          ["c", 106.69],
+          ["c", 106.69],
+          ["c", 106.69],
+          ["d", 106.69],
+          ["e", 106.69],
+          ["e", 106.69],
+          ["g", 106.69],
+          ["h", 106.69]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) avg with select col with global order by",
+        "sql": "SELECT string_col, AVG(double_col) OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["b", 138.357143],
+          ["b", 138.357143],
+          ["c", 133.728182],
+          ["c", 133.728182],
+          ["c", 133.728182],
+          ["c", 133.728182],
+          ["d", 126.084167],
+          ["e", 114.679286],
+          ["e", 114.679286],
+          ["g", 113.700667],
+          ["h", 106.69]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select col with global order by",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": false,
+        "comments": "Can't enable keeping the row order as the ordering is only based on the string_col and can change on sorting",
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["a", 3],
+          ["a", 4],
+          ["a", 5],
+          ["b", 6],
+          ["b", 7],
+          ["c", 8],
+          ["c", 9],
+          ["c", 10],
+          ["c", 11],
+          ["d", 12],
+          ["e", 13],
+          ["e", 14],
+          ["g", 15],
+          ["h", 16]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select col with global order by",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(ORDER BY string_col) as row_number FROM {tbl} ORDER BY row_number",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["a", 3],
+          ["a", 4],
+          ["a", 5],
+          ["b", 6],
+          ["b", 7],
+          ["c", 8],
+          ["c", 9],
+          ["c", 10],
+          ["c", 11],
+          ["d", 12],
+          ["e", 13],
+          ["e", 14],
+          ["g", 15],
+          ["h", 16]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select col with global order by",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY string_col, int_col) as rank FROM {tbl} ORDER BY rank, string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["a", 3],
+          ["a", 3],
+          ["a", 3],
+          ["b", 6],
+          ["b", 7],
+          ["c", 8],
+          ["c", 9],
+          ["c", 10],
+          ["c", 11],
+          ["d", 12],
+          ["e", 13],
+          ["e", 13],
+          ["g", 15],
+          ["h", 16]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select col with global order by",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY string_col, int_col) as rank FROM {tbl} ORDER BY rank, string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["b", 1],
+          ["c", 1],
+          ["d", 1],
+          ["e", 1],
+          ["e", 1],
+          ["g", 1],
+          ["h", 1],
+          ["b", 2],
+          ["c", 2],
+          ["a", 3],
+          ["a", 3],
+          ["a", 3],
+          ["c", 3],
+          ["c", 4]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with select col with global order by",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(ORDER BY string_col, int_col) as dense_rank FROM {tbl} ORDER BY dense_rank, string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["a", 2],
+          ["a", 2],
+          ["a", 2],
+          ["b", 3],
+          ["b", 4],
+          ["c", 5],
+          ["c", 6],
+          ["c", 7],
+          ["c", 8],
+          ["d", 9],
+          ["e", 10],
+          ["e", 10],
+          ["g", 11],
+          ["h", 12]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with select col with global order by",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY string_col, int_col) as dense_rank FROM {tbl} ORDER BY dense_rank, string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["b", 1],
+          ["c", 1],
+          ["d", 1],
+          ["e", 1],
+          ["e", 1],
+          ["g", 1],
+          ["h", 1],
+          ["a", 2],
+          ["a", 2],
+          ["a", 2],
+          ["b", 2],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select col with global order by",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": false,
+        "comments": "Can't enable keeping the row order as the ordering is only based on the string_col and can change on sorting",
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["a", 1],
+          ["a", 1],
+          ["a", 1],
+          ["b", 6],
+          ["b", 6],
+          ["c", 8],
+          ["c", 8],
+          ["c", 8],
+          ["c", 8],
+          ["d", 12],
+          ["e", 13],
+          ["e", 13],
+          ["g", 15],
+          ["h", 16]
+        ]
+      },
+      {
+        "description": "Single empty OVER() count with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(int_col) OVER() FROM {tbl} ORDER BY string_col LIMIT 5",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 16],
+          ["a", 16],
+          ["a", 16],
+          ["a", 16],
+          ["a", 16]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) count with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(int_col) OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col LIMIT 6",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["b", 7]
+        ]
+      },
+      {
+        "description": "Single empty OVER() and transform col",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), AVG(int_col) OVER() FROM {tbl}",
+        "outputs": [
+          ["a-true", 48],
+          ["a-true", 48],
+          ["a-true", 48],
+          ["a-false", 48],
+          ["a-true", 48],
+          ["b-false", 48],
+          ["b-false", 48],
+          ["c-true", 48],
+          ["c-false", 48],
+          ["c-false", 48],
+          ["c-false", 48],
+          ["d-false", 48],
+          ["e-true", 48],
+          ["e-false", 48],
+          ["g-true", 48],
+          ["h-false", 48]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) and transform col (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), AVG(int_col) OVER(ORDER BY string_col, bool_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 42],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["b-false", 33.2857143],
+          ["b-false", 33.2857143],
+          ["c-false", 48.6],
+          ["c-false", 48.6],
+          ["c-false", 48.6],
+          ["c-true", 44.4545455],
+          ["d-false", 44.25],
+          ["e-false", 44.0769231],
+          ["e-true", 43.9285714],
+          ["g-true", 41.2],
+          ["h-false", 48]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER() FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single empty OVER() row_number with select col and filter",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER() FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "comments": "Hard to test ROW_NUMBER() with empty OVER() since the assigned row number is purely dependent on order of processing the rows and is not deterministic",
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with select col and filter",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col and filter which matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER() FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200",
+        "outputs": []
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col and filter which matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(ORDER BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200",
+        "keepOutputRowOrder": true,
+        "outputs": []
+      },
+      {
+        "description": "Single empty OVER() with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER() as count FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200)",
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER(ORDER BY string_col) as count FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200)",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER() FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "outputs": [
+          [100, 359],
+          [1, 359],
+          [100, 359],
+          [1.01, 359],
+          [1.5, 359],
+          [400, 359]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with filter",
+        "sql": "SELECT SUM(int_col) OVER(ORDER BY string_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [103],
+          [103],
+          [359],
+          [359],
+          [359],
+          [359]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT double_col, SUM(int_col) OVER(ORDER BY string_col, double_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 100],
+          [100, 103],
+          [1.01, 204],
+          [1.5, 354],
+          [100, 357],
+          [400, 359]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select col and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT double_col, ROW_NUMBER() OVER(ORDER BY string_col, double_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1],
+          [100, 2],
+          [1.01, 3],
+          [1.5, 4],
+          [100, 5],
+          [400, 6]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select col and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT double_col, RANK() OVER(ORDER BY string_col, double_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1],
+          [100, 2],
+          [1.01, 3],
+          [1.5, 4],
+          [100, 5],
+          [400, 6]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select transform and filter",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), MAX(int_col) OVER() FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "outputs": [
+          ["a-true", 101],
+          ["a-true", 101],
+          ["a-true", 101],
+          ["a-false", 101],
+          ["a-true", 101],
+          ["b-false", 101],
+          ["c-true", 101],
+          ["c-false", 101],
+          ["c-false", 101],
+          ["d-false", 101],
+          ["e-true", 101],
+          ["e-false", 101],
+          ["g-true", 101]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select transform and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), MAX(int_col) OVER(ORDER BY string_col, bool_col) FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 42],
+          ["a-true", 42],
+          ["a-true", 42],
+          ["a-true", 42],
+          ["a-true", 42],
+          ["b-false", 42],
+          ["c-false", 101],
+          ["c-false", 101],
+          ["c-true", 101],
+          ["d-false", 101],
+          ["e-false", 101],
+          ["e-true", 101],
+          ["g-true", 101]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select transform and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), ROW_NUMBER() OVER(ORDER BY string_col, bool_col) FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 3],
+          ["a-true", 4],
+          ["a-true", 5],
+          ["b-false", 6],
+          ["c-false", 7],
+          ["c-false", 8],
+          ["c-true", 9],
+          ["d-false", 10],
+          ["e-false", 11],
+          ["e-true", 12],
+          ["g-true", 13]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select transform and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), RANK() OVER(ORDER BY string_col, bool_col) FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["b-false", 6],
+          ["c-false", 7],
+          ["c-false", 7],
+          ["c-true", 9],
+          ["d-false", 10],
+          ["e-false", 11],
+          ["e-true", 12],
+          ["g-true", 13]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with select transform and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), DENSE_RANK() OVER(ORDER BY string_col, bool_col) FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["b-false", 3],
+          ["c-false", 4],
+          ["c-false", 4],
+          ["c-true", 5],
+          ["d-false", 6],
+          ["e-false", 7],
+          ["e-true", 8],
+          ["g-true", 9]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with group by",
+        "sql": "SELECT MAX({tbl}.int_col) OVER() FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [150],
+          [150],
+          [150],
+          [150],
+          [150],
+          [150]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with group by",
+        "sql": "SELECT MAX({tbl}.int_col) OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2],
+          [3],
+          [42],
+          [100],
+          [101],
+          [150]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with group by",
+        "sql": "SELECT ROW_NUMBER() OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1],
+          [2],
+          [3],
+          [4],
+          [5],
+          [6]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with group by",
+        "sql": "SELECT RANK() OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1],
+          [2],
+          [3],
+          [4],
+          [5],
+          [6]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.int_col) OVER() FROM {tbl} GROUP BY string_col, int_col",
+        "outputs": [
+          ["a", 2],
+          ["a", 2],
+          ["b", 2],
+          ["b", 2],
+          ["e", 2],
+          ["h", 2],
+          ["g", 2],
+          ["d", 2],
+          ["c", 2],
+          ["c", 2],
+          ["c", 2],
+          ["c", 2]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.int_col) OVER(ORDER BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 2],
+          ["a", 2],
+          ["b", 2],
+          ["b", 2],
+          ["c", 2],
+          ["c", 2],
+          ["c", 2],
+          ["c", 2],
+          ["d", 2],
+          ["e", 2],
+          ["g", 2],
+          ["h", 2]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with agg col and group by",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER() FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [6, 398],
+          [9, 398],
+          [100, 398],
+          [300, 398],
+          [252, 398],
+          [101, 398]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with agg col and group by",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [6, 2],
+          [9, 5],
+          [252, 47],
+          [100, 147],
+          [101, 248],
+          [300, 398]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with agg col and group by",
+        "sql": "SELECT SUM(int_col), ROW_NUMBER() OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [6, 1],
+          [9, 2],
+          [252, 3],
+          [100, 4],
+          [101, 5],
+          [300, 6]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with agg col and group by",
+        "sql": "SELECT SUM(int_col), DENSE_RANK() OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [6, 1],
+          [9, 2],
+          [252, 3],
+          [100, 4],
+          [101, 5],
+          [300, 6]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER() FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [2, 6, 398],
+          [3, 9, 398],
+          [100, 100, 398],
+          [150, 300, 398],
+          [42, 252, 398],
+          [101, 101, 398]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 2],
+          [3, 9, 5],
+          [42, 252, 47],
+          [100, 100, 147],
+          [101, 101, 248],
+          [150, 300, 398]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER() FROM {tbl} GROUP BY int_col ORDER BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 398],
+          [3, 9, 398],
+          [42, 252, 398],
+          [100, 100, 398],
+          [101, 101, 398],
+          [150, 300, 398]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col ORDER BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 2],
+          [3, 9, 5],
+          [42, 252, 47],
+          [100, 100, 147],
+          [101, 101, 248],
+          [150, 300, 398]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), ROW_NUMBER() OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col ORDER BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 1],
+          [3, 9, 2],
+          [42, 252, 3],
+          [100, 100, 4],
+          [101, 101, 5],
+          [150, 300, 6]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) rank with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), RANK() OVER(ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY int_col ORDER BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 1],
+          [3, 9, 2],
+          [42, 252, 3],
+          [100, 100, 4],
+          [101, 101, 5],
+          [150, 300, 6]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER() FROM {tbl} WHERE int_col < 100 GROUP BY int_col",
+        "outputs": [
+          [2, 6, 47],
+          [3, 9, 47],
+          [42, 252, 47]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(ORDER BY {tbl}.int_col) FROM {tbl} WHERE int_col < 100 GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 2],
+          [3, 9, 5],
+          [42, 252, 47]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) row_number with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), ROW_NUMBER() OVER(ORDER BY {tbl}.int_col) FROM {tbl} WHERE int_col < 100 GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 1],
+          [3, 9, 2],
+          [42, 252, 3]
+        ]
+      },
+      {
+        "description": "Single OVER(ORDER BY) dense_rank with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), DENSE_RANK() OVER(ORDER BY {tbl}.int_col) FROM {tbl} WHERE int_col < 100 GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 6, 1],
+          [3, 9, 2],
+          [42, 252, 3]
+        ]
+      },
+      {
+        "description": "Single empty OVER() with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER() FROM {tbl} WHERE int_col > 200 GROUP BY int_col",
+        "outputs": []
+      },
+      {
+        "description": "Single OVER(ORDER BY) with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(ORDER BY {tbl}.int_col) FROM {tbl} WHERE int_col > 200 GROUP BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": []
+      },
+      {
+        "description": "Multiple empty OVER()s",
+        "sql": "SELECT SUM(int_col) OVER(), COUNT(string_col) OVER() FROM {tbl}",
+        "outputs": [
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16],
+          [768, 16]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s",
+        "sql": "SELECT SUM(int_col) OVER(ORDER BY string_col), COUNT(string_col) OVER(ORDER BY string_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [233, 7],
+          [233, 7],
+          [489, 11],
+          [489, 11],
+          [489, 11],
+          [489, 11],
+          [531, 12],
+          [615, 14],
+          [615, 14],
+          [618, 15],
+          [768, 16]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s ranking functinos",
+        "sql": "SELECT RANK() OVER(ORDER BY string_col), DENSE_RANK() OVER(ORDER BY string_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1],
+          [1, 1],
+          [1, 1],
+          [1, 1],
+          [1, 1],
+          [6, 2],
+          [6, 2],
+          [8, 3],
+          [8, 3],
+          [8, 3],
+          [8, 3],
+          [12, 4],
+          [13, 5],
+          [13, 5],
+          [15, 6],
+          [16, 7]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(), int_col, MAX(double_col) OVER() FROM {tbl}",
+        "outputs": [
+          ["a", 768, 2, 400],
+          ["a", 768, 2, 400],
+          ["b", 768, 3, 400],
+          ["c", 768, 3, 400],
+          ["b", 768, 100, 400],
+          ["e", 768, 42, 400],
+          ["d", 768, 42, 400],
+          ["a", 768, 42, 400],
+          ["a", 768, 42, 400],
+          ["a", 768, 42, 400],
+          ["e", 768, 42, 400],
+          ["c", 768, 101, 400],
+          ["c", 768, 150, 400],
+          ["h", 768, 150, 400],
+          ["g", 768, 3, 400],
+          ["c", 768, 2, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col, int_col), int_col, MAX(double_col) OVER(ORDER BY string_col, int_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 4, 2, 400],
+          ["a", 4, 2, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["b", 133, 3, 400],
+          ["b", 233, 100, 400],
+          ["c", 235, 2, 400],
+          ["c", 238, 3, 400],
+          ["c", 339, 101, 400],
+          ["c", 489, 150, 400],
+          ["d", 531, 42, 400],
+          ["e", 615, 42, 400],
+          ["e", 615, 42, 400],
+          ["g", 618, 3, 400],
+          ["h", 768, 150, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select columns (two ORDER BY columns for deterministic output) - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY string_col, int_col), int_col, DENSE_RANK() OVER(ORDER BY string_col, int_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 2, 1],
+          ["a", 1, 2, 1],
+          ["a", 3, 42, 2],
+          ["a", 3, 42, 2],
+          ["a", 3, 42, 2],
+          ["b", 6, 3, 3],
+          ["b", 7, 100, 4],
+          ["c", 8, 2, 5],
+          ["c", 9, 3, 6],
+          ["c", 10, 101, 7],
+          ["c", 11, 150, 8],
+          ["d", 12, 42, 9],
+          ["e", 13, 42, 10],
+          ["e", 13, 42, 10],
+          ["g", 15, 3, 11],
+          ["h", 16, 150, 12]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with one DESC column with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col DESC, int_col), int_col, MAX(double_col) OVER(ORDER BY string_col DESC, int_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 150, 150, 1.53],
+          ["g", 153, 3, 100],
+          ["e", 237, 42, 100],
+          ["e", 237, 42, 100],
+          ["d", 279, 42, 100],
+          ["c", 281, 2, 400],
+          ["c", 284, 3, 400],
+          ["c", 385, 101, 400],
+          ["c", 535, 150, 400],
+          ["b", 538, 3, 400],
+          ["b", 638, 100, 400],
+          ["a", 642, 2, 400],
+          ["a", 642, 2, 400],
+          ["a", 768, 42, 400],
+          ["a", 768, 42, 400],
+          ["a", 768, 42, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with one DESC column with select columns (two ORDER BY columns for deterministic output) - ranking functions",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(ORDER BY string_col DESC, int_col), int_col, MAX(double_col) OVER(ORDER BY string_col DESC, int_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 1, 150, 1.53],
+          ["g", 2, 3, 100],
+          ["e", 3, 42, 100],
+          ["e", 3, 42, 100],
+          ["d", 4, 42, 100],
+          ["c", 5, 2, 400],
+          ["c", 6, 3, 400],
+          ["c", 7, 101, 400],
+          ["c", 8, 150, 400],
+          ["b", 9, 3, 400],
+          ["b", 10, 100, 400],
+          ["a", 11, 2, 400],
+          ["a", 11, 2, 400],
+          ["a", 12, 42, 400],
+          ["a", 12, 42, 400],
+          ["a", 12, 42, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with two DESC columns with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col DESC, int_col DESC), int_col, MAX(double_col) OVER(ORDER BY string_col DESC, int_col DESC) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["h", 150, 150, 1.53],
+          ["g", 153, 3, 100],
+          ["e", 237, 42, 100],
+          ["e", 237, 42, 100],
+          ["d", 279, 42, 100],
+          ["c", 429, 150, 100],
+          ["c", 530, 101, 100],
+          ["c", 533, 3, 100],
+          ["c", 535, 2, 400],
+          ["b", 635, 100, 400],
+          ["b", 638, 3, 400],
+          ["a", 764, 42, 400],
+          ["a", 764, 42, 400],
+          ["a", 764, 42, 400],
+          ["a", 768, 2, 400],
+          ["a", 768, 2, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s  with second DESC column with select columns (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col, int_col DESC), int_col, MAX(double_col) OVER(ORDER BY string_col, int_col DESC) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 126, 42, 75],
+          ["a", 126, 42, 75],
+          ["a", 126, 42, 75],
+          ["a", 130, 2, 400],
+          ["a", 130, 2, 400],
+          ["b", 230, 100, 400],
+          ["b", 233, 3, 400],
+          ["c", 383, 150, 400],
+          ["c", 484, 101, 400],
+          ["c", 487, 3, 400],
+          ["c", 489, 2, 400],
+          ["d", 531, 42, 400],
+          ["e", 615, 42, 400],
+          ["e", 615, 42, 400],
+          ["g", 618, 3, 400],
+          ["h", 768, 150, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s  with second DESC column with select columns (two ORDER BY columns for deterministic output) with alias - ranking functions",
+        "sql": "SELECT string_col, SUM(int_col) OVER(ORDER BY string_col, int_col DESC) as sum, int_col, RANK() OVER(ORDER BY string_col, int_col DESC) as rank FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 126, 42, 1],
+          ["a", 126, 42, 1],
+          ["a", 126, 42, 1],
+          ["a", 130, 2, 4],
+          ["a", 130, 2, 4],
+          ["b", 230, 100, 6],
+          ["b", 233, 3, 7],
+          ["c", 383, 150, 8],
+          ["c", 484, 101, 9],
+          ["c", 487, 3, 10],
+          ["c", 489, 2, 11],
+          ["d", 531, 42, 12],
+          ["e", 615, 42, 13],
+          ["e", 615, 42, 13],
+          ["g", 618, 3, 15],
+          ["h", 768, 150, 16]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select columns with alias",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER() AS max, int_col, SUM(int_col) OVER() AS sum FROM {tbl}",
+        "outputs": [
+          ["a", 400, 2, 768],
+          ["a", 400, 2, 768],
+          ["b", 400, 3, 768],
+          ["c", 400, 3, 768],
+          ["b", 400, 100, 768],
+          ["e", 400, 42, 768],
+          ["d", 400, 42, 768],
+          ["a", 400, 42, 768],
+          ["a", 400, 42, 768],
+          ["a", 400, 42, 768],
+          ["e", 400, 42, 768],
+          ["c", 400, 101, 768],
+          ["c", 400, 150, 768],
+          ["h", 400, 150, 768],
+          ["g", 400, 3, 768],
+          ["c", 400, 2, 768]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select columns with alias (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER(ORDER BY string_col, int_col) AS max, int_col, SUM(int_col) OVER(ORDER BY string_col, int_col) AS sum FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 400, 2, 4],
+          ["a", 400, 2, 4],
+          ["a", 400, 42, 130],
+          ["a", 400, 42, 130],
+          ["a", 400, 42, 130],
+          ["b", 400, 3, 133],
+          ["b", 400, 100, 233],
+          ["c", 400, 2, 235],
+          ["c", 400, 3, 238],
+          ["c", 400, 101, 339],
+          ["c", 400, 150, 489],
+          ["d", 400, 42, 531],
+          ["e", 400, 42, 615],
+          ["e", 400, 42, 615],
+          ["g", 400, 3, 618],
+          ["h", 400, 150, 768]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER() with select columns and default frame on one but not the other",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), double_col, AVG(double_col) OVER() FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "outputs": [
+          [true, 2, 300, 106.69],
+          [true, 2, 400, 106.69],
+          [false, 2, 100, 106.69],
+          [true, 2, 100, 106.69],
+          [false, 2, 1, 106.69],
+          [true, 2, 50.5, 106.69],
+          [false, 2, 42, 106.69],
+          [true, 2, 75, 106.69],
+          [false, 2, 42, 106.69],
+          [true, 2, 50.5, 106.69],
+          [false, 2, 42, 106.69],
+          [false, 2, 1.01, 106.69],
+          [false, 2, 1.5, 106.69],
+          [false, 2, 1.53, 106.69],
+          [true, 2, 100, 106.69],
+          [false, 2, 400, 106.69]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select columns and default frame on one but not the other (cannot use RANGE with multiple ORDER BY columns so not checking row order)",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(ORDER BY int_col RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col, AVG(double_col) OVER(ORDER BY int_col) FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used with multiple ORDER BY columns. We don't support ROWS yet. Without frame specification the default is RANGE though.",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 2, 300, 366.666667],
+          [true, 2, 400, 366.666667],
+          [false, 2, 400, 366.666667],
+          [true, 2, 100, 233.333333],
+          [true, 2, 100, 233.333333],
+          [false, 2, 100, 233.333333],
+          [true, 2, 50.5, 141.833333],
+          [false, 2, 42, 141.833333],
+          [true, 2, 75, 141.833333],
+          [false, 2, 42, 141.833333],
+          [true, 2, 50.5, 141.833333],
+          [false, 2, 42, 141.833333],
+          [false, 2, 1, 131],
+          [false, 2, 1.01, 121.715],
+          [false, 2, 1.5, 106.69],
+          [false, 2, 1.53, 106.69]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select columns and default frame on one but not the other (cannot use RANGE with multiple ORDER BY columns so not checking row order) - ranking functions",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(ORDER BY int_col RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col, RANK() OVER(ORDER BY int_col) FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used with multiple ORDER BY columns. We don't support ROWS yet. Without frame specification the default is RANGE though.",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 2, 300, 1],
+          [true, 2, 400, 1],
+          [false, 2, 400, 1],
+          [true, 2, 100, 4],
+          [true, 2, 100, 4],
+          [false, 2, 100, 4],
+          [true, 2, 50.5, 7],
+          [false, 2, 42, 7],
+          [true, 2, 75, 7],
+          [false, 2, 42, 7],
+          [true, 2, 50.5, 7],
+          [false, 2, 42, 7],
+          [false, 2, 1, 13],
+          [false, 2, 1.01, 14],
+          [false, 2, 1.5, 15],
+          [false, 2, 1.53, 15]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col with global order by",
+        "sql": "SELECT string_col, AVG(double_col) OVER(), COUNT(string_col) OVER() FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 106.69, 16],
+          ["a", 106.69, 16],
+          ["a", 106.69, 16],
+          ["a", 106.69, 16],
+          ["a", 106.69, 16],
+          ["b", 106.69, 16],
+          ["b", 106.69, 16],
+          ["c", 106.69, 16],
+          ["c", 106.69, 16],
+          ["c", 106.69, 16],
+          ["c", 106.69, 16],
+          ["d", 106.69, 16],
+          ["e", 106.69, 16],
+          ["e", 106.69, 16],
+          ["g", 106.69, 16],
+          ["h", 106.69, 16]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col with global order by",
+        "sql": "SELECT string_col, AVG(double_col) OVER(ORDER BY string_col), COUNT(string_col) OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["b", 138.357143, 7],
+          ["b", 138.357143, 7],
+          ["c", 133.728182, 11],
+          ["c", 133.728182, 11],
+          ["c", 133.728182, 11],
+          ["c", 133.728182, 11],
+          ["d", 126.084167, 12],
+          ["e", 114.679286, 14],
+          ["e", 114.679286, 14],
+          ["g", 113.700667, 15],
+          ["h", 106.69, 16]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col with global order by - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY string_col), DENSE_RANK() OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["b", 6, 2],
+          ["b", 6, 2],
+          ["c", 8, 3],
+          ["c", 8, 3],
+          ["c", 8, 3],
+          ["c", 8, 3],
+          ["d", 12, 4],
+          ["e", 13, 5],
+          ["e", 13, 5],
+          ["g", 15, 6],
+          ["h", 16, 7]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(), AVG(int_col) OVER() FROM {tbl} ORDER BY string_col LIMIT 5",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 16, 48],
+          ["a", 16, 48],
+          ["a", 16, 48],
+          ["a", 16, 48],
+          ["a", 16, 48]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(ORDER BY string_col), AVG(int_col) OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col LIMIT 6",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["b", 7, 33.2857143]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col with global order by with LIMIT - ranking functions",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(ORDER BY string_col), AVG(int_col) OVER(ORDER BY string_col) FROM {tbl} ORDER BY string_col LIMIT 6",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 26],
+          ["a", 1, 26],
+          ["a", 1, 26],
+          ["a", 1, 26],
+          ["a", 1, 26],
+          ["b", 2, 33.2857143]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s and transform col",
+        "sql": "SELECT UPPER(CONCAT(string_col, bool_col, '-')), AVG(int_col) OVER(), MIN(double_col) OVER() FROM {tbl}",
+        "outputs": [
+          ["A-TRUE", 48, 1],
+          ["A-TRUE", 48, 1],
+          ["A-TRUE", 48, 1],
+          ["A-FALSE", 48, 1],
+          ["A-TRUE", 48, 1],
+          ["B-FALSE", 48, 1],
+          ["B-FALSE", 48, 1],
+          ["C-TRUE", 48, 1],
+          ["C-FALSE", 48, 1],
+          ["C-FALSE", 48, 1],
+          ["C-FALSE", 48, 1],
+          ["D-FALSE", 48, 1],
+          ["E-TRUE", 48, 1],
+          ["E-FALSE", 48, 1],
+          ["G-TRUE", 48, 1],
+          ["H-FALSE", 48, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s and transform col (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), AVG(int_col) OVER(ORDER BY string_col, bool_col), MIN(double_col) OVER(ORDER BY string_col, bool_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 42, 42],
+          ["a-true", 26, 42],
+          ["a-true", 26, 42],
+          ["a-true", 26, 42],
+          ["a-true", 26, 42],
+          ["b-false", 33.2857143, 1],
+          ["b-false", 33.2857143, 1],
+          ["c-false", 48.6, 1],
+          ["c-false", 48.6, 1],
+          ["c-false", 48.6, 1],
+          ["c-true", 44.4545455, 1],
+          ["d-false", 44.25, 1],
+          ["e-false", 44.0769231, 1],
+          ["e-true", 43.9285714, 1],
+          ["g-true", 41.2, 1],
+          ["h-false", 48, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s and transform col (two ORDER BY columns for deterministic output) - ranking functions",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), RANK() OVER(ORDER BY string_col, bool_col), DENSE_RANK() OVER(ORDER BY string_col, bool_col) FROM {tbl}",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a-false", 1, 1],
+          ["a-true", 2, 2],
+          ["a-true", 2, 2],
+          ["a-true", 2, 2],
+          ["a-true", 2, 2],
+          ["b-false", 6, 3],
+          ["b-false", 6, 3],
+          ["c-false", 8, 4],
+          ["c-false", 8, 4],
+          ["c-false", 8, 4],
+          ["c-true", 11, 5],
+          ["d-false", 12, 6],
+          ["e-false", 13, 7],
+          ["e-true", 14, 8],
+          ["g-true", 15, 9],
+          ["h-false", 16, 10]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(), MIN(double_col) OVER() FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "outputs": [
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s row_number with select col and filter",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(), ROW_NUMBER() OVER() FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "comments": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "outputs": [
+          ["a", 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(ORDER BY string_col), MIN(double_col) OVER(ORDER BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s row_number with select col and filter",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(ORDER BY string_col), ROW_NUMBER() OVER(ORDER BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "comments": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 1],
+          ["a", 2, 2],
+          ["a", 3, 3],
+          ["a", 4, 4]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s ranking functions with select col and filter",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY string_col), DENSE_RANK() OVER(ORDER BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter that matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(), MIN(double_col) OVER() FROM {tbl} WHERE string_col = 'a' AND bool_col != false AND int_col > 200",
+        "outputs": []
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter that matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(ORDER BY string_col), MIN(double_col) OVER(ORDER BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false AND int_col > 200",
+        "keepOutputRowOrder": true,
+        "outputs": []
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER() as count, MIN(double_col) OVER() as min FROM {tbl} WHERE string_col = 'a' AND bool_col != false AND int_col > 200)",
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER(ORDER BY string_col) as count, MIN(double_col) OVER(ORDER BY string_col) as min FROM {tbl} WHERE string_col = 'a' AND bool_col != false AND int_col > 200)",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER(), AVG(double_col) OVER() FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "outputs": [
+          [100, 359, 100.585],
+          [1, 359, 100.585],
+          [100, 359, 100.585],
+          [1.01, 359, 100.585],
+          [1.5, 359, 100.585],
+          [400, 359, 100.585]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY) with filter",
+        "sql": "SELECT SUM(int_col) OVER(ORDER BY string_col), AVG(double_col) OVER(ORDER BY string_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [103, 50.5],
+          [103, 50.5],
+          [359, 100.585],
+          [359, 100.585],
+          [359, 100.585],
+          [359, 100.585]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY) with filter - ranking functions",
+        "sql": "SELECT DENSE_RANK() OVER(ORDER BY string_col), AVG(double_col) OVER(ORDER BY string_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 50.5],
+          [1, 50.5],
+          [2, 100.585],
+          [2, 100.585],
+          [2, 100.585],
+          [2, 100.585]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter (two ORDER BY columns for deterministic output)",
+        "sql": "SELECT double_col, SUM(int_col) OVER(ORDER BY string_col, double_col), AVG(double_col) OVER(ORDER BY string_col, double_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 100, 1],
+          [100, 103, 50.5],
+          [1.01, 204, 34.0033333],
+          [1.5, 354, 25.8775],
+          [100, 357, 40.702],
+          [400, 359, 100.585]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter (two ORDER BY columns for deterministic output) - ranking functions",
+        "sql": "SELECT double_col, SUM(int_col) OVER(ORDER BY string_col, double_col), RANK() OVER(ORDER BY string_col, double_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 100, 1],
+          [100, 103, 2],
+          [1.01, 204, 3],
+          [1.5, 354, 4],
+          [100, 357, 5],
+          [400, 359, 6]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER() with select transform and filter",
+        "sql": "SELECT LENGTH(CONCAT(string_col, bool_col, '-')), MAX(int_col) OVER(), COUNT(double_col) OVER() FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "outputs": [
+          [6, 101, 13],
+          [6, 101, 13],
+          [6, 101, 13],
+          [7, 101, 13],
+          [6, 101, 13],
+          [7, 101, 13],
+          [6, 101, 13],
+          [7, 101, 13],
+          [7, 101, 13],
+          [7, 101, 13],
+          [6, 101, 13],
+          [7, 101, 13],
+          [6, 101, 13]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select transform and filter",
+        "sql": "SELECT LENGTH(CONCAT(string_col, bool_col, '-')), MAX(int_col) OVER(ORDER BY string_col, bool_col), COUNT(double_col) OVER(ORDER BY string_col, bool_col) FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [7, 42, 1],
+          [6, 42, 5],
+          [6, 42, 5],
+          [6, 42, 5],
+          [6, 42, 5],
+          [7, 42, 6],
+          [7, 101, 8],
+          [7, 101, 8],
+          [6, 101, 9],
+          [7, 101, 10],
+          [7, 101, 11],
+          [6, 101, 12],
+          [6, 101, 13]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select transform and filter - ranking functions",
+        "sql": "SELECT LENGTH(CONCAT(string_col, bool_col, '-')), RANK() OVER(ORDER BY string_col, bool_col), DENSE_RANK() OVER(ORDER BY string_col, bool_col) FROM {tbl} where int_col < 50 OR double_col = 1.01",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [7, 1, 1],
+          [6, 2, 2],
+          [6, 2, 2],
+          [6, 2, 2],
+          [6, 2, 2],
+          [7, 6, 3],
+          [7, 7, 4],
+          [7, 7, 4],
+          [6, 9, 5],
+          [7, 10, 6],
+          [7, 11, 7],
+          [6, 12, 8],
+          [6, 13, 9]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with group by",
+        "sql": "SELECT MAX({tbl}.double_col) OVER(), COUNT({tbl}.double_col) OVER() FROM {tbl} GROUP BY double_col",
+        "outputs": [
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10],
+          [400, 10]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with group by",
+        "sql": "SELECT MAX({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), COUNT({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1],
+          [1.01, 2],
+          [1.5, 3],
+          [1.53, 4],
+          [42, 5],
+          [50.5, 6],
+          [75, 7],
+          [100, 8],
+          [300, 9],
+          [400, 10]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with group by - ranking functions",
+        "sql": "SELECT DENSE_RANK() OVER(ORDER BY {tbl}.double_col), COUNT({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1],
+          [2, 2],
+          [3, 3],
+          [4, 4],
+          [5, 5],
+          [6, 6],
+          [7, 7],
+          [8, 8],
+          [9, 9],
+          [10, 10]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.double_col) OVER(), SUM({tbl}.double_col) OVER() FROM {tbl} GROUP BY string_col, double_col",
+        "outputs": [
+          ["a", 1, 1707.04],
+          ["a", 1, 1707.04],
+          ["a", 1, 1707.04],
+          ["a", 1, 1707.04],
+          ["a", 1, 1707.04],
+          ["b", 1, 1707.04],
+          ["b", 1, 1707.04],
+          ["e", 1, 1707.04],
+          ["e", 1, 1707.04],
+          ["d", 1, 1707.04],
+          ["h", 1, 1707.04],
+          ["g", 1, 1707.04],
+          ["c", 1, 1707.04],
+          ["c", 1, 1707.04],
+          ["c", 1, 1707.04],
+          ["c", 1, 1707.04]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.double_col) OVER(ORDER BY {tbl}.string_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 42, 867.5],
+          ["a", 42, 867.5],
+          ["a", 42, 867.5],
+          ["a", 42, 867.5],
+          ["a", 42, 867.5],
+          ["b", 1, 968.5],
+          ["b", 1, 968.5],
+          ["c", 1, 1471.01],
+          ["c", 1, 1471.01],
+          ["c", 1, 1471.01],
+          ["c", 1, 1471.01],
+          ["d", 1, 1513.01],
+          ["e", 1, 1605.51],
+          ["e", 1, 1605.51],
+          ["g", 1, 1705.51],
+          ["h", 1, 1707.04]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and group by - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(ORDER BY {tbl}.string_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 867.5],
+          ["a", 1, 867.5],
+          ["a", 1, 867.5],
+          ["a", 1, 867.5],
+          ["a", 1, 867.5],
+          ["b", 6, 968.5],
+          ["b", 6, 968.5],
+          ["c", 8, 1471.01],
+          ["c", 8, 1471.01],
+          ["c", 8, 1471.01],
+          ["c", 8, 1471.01],
+          ["d", 12, 1513.01],
+          ["e", 13, 1605.51],
+          ["e", 13, 1605.51],
+          ["g", 15, 1705.51],
+          ["h", 16, 1707.04]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with agg col and group by",
+        "sql": "SELECT SUM(double_col), SUM({tbl}.double_col) OVER(), AVG({tbl}.double_col) OVER() FROM {tbl} GROUP BY double_col",
+        "outputs": [
+          [300, 972.54, 97.25399999999999],
+          [800, 972.54, 97.25399999999999],
+          [101, 972.54, 97.25399999999999],
+          [1, 972.54, 97.25399999999999],
+          [1.5, 972.54, 97.25399999999999],
+          [1.53, 972.54, 97.25399999999999],
+          [1.01, 972.54, 97.25399999999999],
+          [75, 972.54, 97.25399999999999],
+          [300, 972.54, 97.25399999999999],
+          [126, 972.54, 97.25399999999999]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with agg col and group by",
+        "sql": "SELECT SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), AVG({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1],
+          [1.01, 2.01, 1.005],
+          [1.5, 3.51, 1.17],
+          [1.53, 5.04, 1.26],
+          [126, 47.04, 9.408],
+          [101, 97.54, 16.2566667],
+          [75, 172.54, 24.6485714],
+          [300, 272.54, 34.0675],
+          [300, 572.54, 63.6155556],
+          [800, 972.54, 97.254]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with agg col and group by - ranking functions",
+        "sql": "SELECT SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), DENSE_RANK() OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1],
+          [1.01, 2.01, 2],
+          [1.5, 3.51, 3],
+          [1.53, 5.04, 4],
+          [126, 47.04, 5],
+          [101, 97.54, 6],
+          [75, 172.54, 7],
+          [300, 272.54, 8],
+          [300, 572.54, 9],
+          [800, 972.54, 10]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col, agg col and group by",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(), AVG({tbl}.double_col) OVER() FROM {tbl} GROUP BY double_col",
+        "outputs": [
+          [300, 300, 972.54, 97.25399999999999],
+          [400, 800, 972.54, 97.25399999999999],
+          [50.5, 101, 972.54, 97.25399999999999],
+          [1, 1, 972.54, 97.25399999999999],
+          [1.5, 1.5, 972.54, 97.25399999999999],
+          [1.53, 1.53, 972.54, 97.25399999999999],
+          [1.01, 1.01, 972.54, 97.25399999999999],
+          [75, 75, 972.54, 97.25399999999999],
+          [100, 300, 972.54, 97.25399999999999],
+          [42, 126, 972.54, 97.25399999999999]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col, agg col and group by",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), AVG({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1, 1],
+          [1.01, 1.01, 2.01, 1.005],
+          [1.5, 1.5, 3.51, 1.17],
+          [1.53, 1.53, 5.04, 1.26],
+          [42, 126, 47.04, 9.408],
+          [50.5, 101, 97.54, 16.2566667],
+          [75, 75, 172.54, 24.6485714],
+          [100, 300, 272.54, 34.0675],
+          [300, 300, 572.54, 63.6155556],
+          [400, 800, 972.54, 97.254]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col, agg col and group by - ranking function",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), RANK() OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1, 1],
+          [1.01, 1.01, 2.01, 2],
+          [1.5, 1.5, 3.51, 3],
+          [1.53, 1.53, 5.04, 4],
+          [42, 126, 47.04, 5],
+          [50.5, 101, 97.54, 6],
+          [75, 75, 172.54, 7],
+          [100, 300, 272.54, 8],
+          [300, 300, 572.54, 9],
+          [400, 800, 972.54, 10]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER() with select col, agg col and group by with global order by",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(), AVG({tbl}.double_col) OVER() FROM {tbl} GROUP BY double_col ORDER BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 972.54, 97.25399999999999],
+          [1.01, 1.01, 972.54, 97.25399999999999],
+          [1.5, 1.5, 972.54, 97.25399999999999],
+          [1.53, 1.53, 972.54, 97.25399999999999],
+          [42, 126, 972.54, 97.25399999999999],
+          [50.5, 101, 972.54, 97.25399999999999],
+          [75, 75, 972.54, 97.25399999999999],
+          [100, 300, 972.54, 97.25399999999999],
+          [300, 300, 972.54, 97.25399999999999],
+          [400, 800, 972.54, 97.25399999999999]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col, agg col and group by with global order by",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), AVG({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col ORDER BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1, 1],
+          [1.01, 1.01, 2.01, 1.005],
+          [1.5, 1.5, 3.51, 1.17],
+          [1.53, 1.53, 5.04, 1.26],
+          [42, 126, 47.04, 9.408],
+          [50.5, 101, 97.54, 16.2566667],
+          [75, 75, 172.54, 24.6485714],
+          [100, 300, 272.54, 34.0675],
+          [300, 300, 572.54, 63.6155556],
+          [400, 800, 972.54, 97.254]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s row_number with select col, agg col and group by with global order by",
+        "sql": "SELECT double_col, SUM(double_col), ROW_NUMBER() OVER(ORDER BY {tbl}.double_col), ROW_NUMBER() OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col ORDER BY double_col",
+        "comments": "ROW_NUMBER requires ROWS as the default frame, and the default frame cannot be overridden, thus it cannot be combined with other functions yet",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1, 1],
+          [1.01, 1.01, 2, 2],
+          [1.5, 1.5, 3, 3],
+          [1.53, 1.53, 4, 4],
+          [42, 126, 5, 5],
+          [50.5, 101, 6, 6],
+          [75, 75, 7, 7],
+          [100, 300, 8, 8],
+          [300, 300, 9, 9],
+          [400, 800, 10, 10]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s ranking functions with select col, agg col and group by with global order by",
+        "sql": "SELECT double_col, SUM(double_col), RANK() OVER(ORDER BY {tbl}.double_col), DENSE_RANK() OVER(ORDER BY {tbl}.double_col) FROM {tbl} GROUP BY double_col ORDER BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [1, 1, 1, 1],
+          [1.01, 1.01, 2, 2],
+          [1.5, 1.5, 3, 3],
+          [1.53, 1.53, 4, 4],
+          [42, 126, 5, 5],
+          [50.5, 101, 6, 6],
+          [75, 75, 7, 7],
+          [100, 300, 8, 8],
+          [300, 300, 9, 9],
+          [400, 800, 10, 10]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col, agg col and group by with a filter",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(), AVG({tbl}.double_col) OVER() FROM {tbl} WHERE double_col > 100 GROUP BY double_col",
+        "outputs": [
+          [300, 300, 700, 350],
+          [400, 800, 700, 350]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col, agg col and group by with a filter",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), AVG({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} WHERE double_col > 100 GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [300, 300, 300, 300],
+          [400, 800, 700, 350]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(), AVG({tbl}.double_col) OVER() FROM {tbl} WHERE double_col > 500 GROUP BY double_col",
+        "outputs": []
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT double_col, SUM(double_col), SUM({tbl}.double_col) OVER(ORDER BY {tbl}.double_col), AVG({tbl}.double_col) OVER(ORDER BY {tbl}.double_col) FROM {tbl} WHERE double_col > 500 GROUP BY double_col",
+        "keepOutputRowOrder": true,
+        "outputs": []
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(), BOOL_AND(bool_col) OVER() FROM {tbl} WHERE string_col = 'a'",
+        "outputs": [
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(ORDER BY bool_col), BOOL_AND(bool_col) OVER(ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a'",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(), BOOL_AND(bool_col) OVER() FROM {tbl} WHERE string_col = 'a' AND double_col = 42",
+        "outputs": [
+          ["a", false, false]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(ORDER BY bool_col), BOOL_AND(bool_col) OVER(ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND double_col = 42",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, false]
+        ]
+      },
+      {
+        "description": "Multiple empty OVER()s with select col and filter using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(), BOOL_AND(bool_col) OVER() FROM {tbl} WHERE string_col = 'a' AND double_col != 42",
+        "outputs": [
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, true]
+        ]
+      },
+      {
+        "description": "Multiple OVER(ORDER BY)s with select col and filter using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(ORDER BY bool_col), BOOL_AND(bool_col) OVER(ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND double_col != 42",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, true]
+        ]
+      },
+      {
+        "description": "Window function subquery: rank having OVER with PARTITION BY ORDER BY and a GROUP BY",
+        "sql": "SELECT string_col, total, rank, dense_rank FROM(SELECT string_col, count(*) as total, RANK() OVER(ORDER BY count(*) DESC) as rank, DENSE_RANK() OVER(ORDER BY count(*) DESC) as dense_rank FROM {tbl} GROUP BY string_col) WHERE rank < 2",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 5, 1, 1]
+        ]
+      }
+    ]
+  },
+  "partition_by_window_function_aggregations": {
+    "tables": {
+      "tbl": {
+        "schema": [
+          {"name": "int_col", "type": "INT"},
+          {"name": "double_col", "type": "DOUBLE"},
+          {"name": "string_col", "type": "STRING"},
+          {"name": "bool_col", "type": "BOOLEAN"}
+        ],
+        "inputs": [
+          [2, 300, "a", true],
+          [2, 400, "a", true],
+          [3, 100, "b", false],
+          [3, 100, "c", true],
+          [100, 1, "b", false],
+          [42, 50.5, "e", true],
+          [42, 42, "d", false],
+          [42, 75, "a", true],
+          [42, 42, "a", false],
+          [42, 50.5, "a", true],
+          [42, 42, "e", false],
+          [-101, 1.01, "c", false],
+          [150, 1.5, "c", false],
+          [150, -1.53, "h", false],
+          [3, 100, "g", true],
+          [2, 400, "c", false]
+        ]
+      }
+    },
+    "queries": [
+      {
+        "description": "Single OVER(PARTITION BY) sum",
+        "sql": "SELECT SUM(int_col) OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          [150],
+          [3],
+          [42],
+          [84],
+          [84],
+          [103],
+          [103],
+          [130],
+          [130],
+          [130],
+          [130],
+          [130],
+          [54],
+          [54],
+          [54],
+          [54]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number",
+        "sql": "SELECT ROW_NUMBER() OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          [1],
+          [2],
+          [3],
+          [4],
+          [5],
+          [1],
+          [2],
+          [1],
+          [1],
+          [1],
+          [1],
+          [2],
+          [1],
+          [2],
+          [3],
+          [4]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) sum",
+        "sql": "SELECT SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4],
+          [4],
+          [130],
+          [130],
+          [130],
+          [3],
+          [103],
+          [-101],
+          [-99],
+          [-96],
+          [54],
+          [42],
+          [84],
+          [84],
+          [3],
+          [150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) ranking functions",
+        "sql": "SELECT RANK() OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1],
+          [1],
+          [3],
+          [3],
+          [3],
+          [1],
+          [2],
+          [1],
+          [2],
+          [3],
+          [4],
+          [1],
+          [1],
+          [1],
+          [1],
+          [1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col), int_col FROM {tbl}",
+        "outputs": [
+          ["a", 130, 2],
+          ["a", 130, 2],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["b", 103, 3],
+          ["b", 103, 100],
+          ["e", 84, 42],
+          ["e", 84, 42],
+          ["d", 42, 42],
+          ["h", 150, 150],
+          ["g", 3, 3],
+          ["c", 54, -101],
+          ["c", 54, 150],
+          ["c", 54, 3],
+          ["c", 54, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number with select columns",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["a", 3],
+          ["a", 4],
+          ["a", 5],
+          ["b", 1],
+          ["b", 2],
+          ["e", 1],
+          ["e", 2],
+          ["d", 1],
+          ["h", 1],
+          ["g", 1],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col), int_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 2],
+          ["a", 4, 2],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["b", 3, 3],
+          ["b", 103, 100],
+          ["c", -101, -101],
+          ["c", -99, 2],
+          ["c", -96, 3],
+          ["c", 54, 150],
+          ["d", 42, 42],
+          ["e", 84, 42],
+          ["e", 84, 42],
+          ["g", 3, 3],
+          ["h", 150, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) row_number with select columns",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col), int_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 2, 2],
+          ["a", 3, 42],
+          ["a", 4, 42],
+          ["a", 5, 42],
+          ["b", 1, 3],
+          ["b", 2, 100],
+          ["c", 1, -101],
+          ["c", 2, 2],
+          ["c", 3, 3],
+          ["c", 4, 150],
+          ["d", 1, 42],
+          ["e", 1, 42],
+          ["e", 2, 42],
+          ["g", 1, 3],
+          ["h", 1, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) ranking functions with select columns",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col), int_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 1, 2],
+          ["a", 2, 42],
+          ["a", 2, 42],
+          ["a", 2, 42],
+          ["b", 1, 3],
+          ["b", 2, 100],
+          ["c", 1, -101],
+          ["c", 2, 2],
+          ["c", 3, 3],
+          ["c", 4, 150],
+          ["d", 1, 42],
+          ["e", 1, 42],
+          ["e", 1, 42],
+          ["g", 1, 3],
+          ["h", 1, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2, k3) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col, bool_col), int_col, bool_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 2, true],
+          ["a", 4, 2, true],
+          ["a", 46, 42, false],
+          ["a", 130, 42, true],
+          ["a", 130, 42, true],
+          ["b", 3, 3, false],
+          ["b", 103, 100, false],
+          ["c", -101, -101, false],
+          ["c", -99, 2, false],
+          ["c", -96, 3, true],
+          ["c", 54, 150, false],
+          ["d", 42, 42, false],
+          ["e", 42, 42, false],
+          ["e", 84, 42, true],
+          ["g", 3, 3, true],
+          ["h", 150, 150, false]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2, k3 DESC) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC), int_col, bool_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 2, true],
+          ["a", 4, 2, true],
+          ["a", 88, 42, true],
+          ["a", 88, 42, true],
+          ["a", 130, 42, false],
+          ["b", 3, 3, false],
+          ["b", 103, 100, false],
+          ["c", -101, -101, false],
+          ["c", -99, 2, false],
+          ["c", -96, 3, true],
+          ["c", 54, 150, false],
+          ["d", 42, 42, false],
+          ["e", 42, 42, true],
+          ["e", 84, 42, false],
+          ["g", 3, 3, true],
+          ["h", 150, 150, false]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2, k3 DESC) row_number with select columns",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC), int_col, bool_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2, true],
+          ["a", 2, 2, true],
+          ["a", 3, 42, true],
+          ["a", 4, 42, true],
+          ["a", 5, 42, false],
+          ["b", 1, 3, false],
+          ["b", 2, 100, false],
+          ["c", 1, -101, false],
+          ["c", 2, 2, false],
+          ["c", 3, 3, true],
+          ["c", 4, 150, false],
+          ["d", 1, 42, false],
+          ["e", 1, 42, true],
+          ["e", 2, 42, false],
+          ["g", 1, 3, true],
+          ["h", 1, 150, false]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2, k3 DESC) rank with select columns",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC), int_col, bool_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2, true],
+          ["a", 1, 2, true],
+          ["a", 3, 42, true],
+          ["a", 3, 42, true],
+          ["a", 5, 42, false],
+          ["b", 1, 3, false],
+          ["b", 2, 100, false],
+          ["c", 1, -101, false],
+          ["c", 2, 2, false],
+          ["c", 3, 3, true],
+          ["c", 4, 150, false],
+          ["d", 1, 42, false],
+          ["e", 1, 42, true],
+          ["e", 2, 42, false],
+          ["g", 1, 3, true],
+          ["h", 1, 150, false]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2 DESC, k3 DESC) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col DESC, bool_col DESC), int_col, bool_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 84, 42, true],
+          ["a", 84, 42, true],
+          ["a", 126, 42, false],
+          ["a", 130, 2, true],
+          ["a", 130, 2, true],
+          ["b", 100, 100, false],
+          ["b", 103, 3, false],
+          ["c", 150, 150, false],
+          ["c", 153, 3, true],
+          ["c", 155, 2, false],
+          ["c", 54, -101, false],
+          ["d", 42, 42, false],
+          ["e", 42, 42, true],
+          ["e", 84, 42, false],
+          ["g", 3, 3, true],
+          ["h", 150, 150, false]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2 DESC, k3) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col DESC, bool_col), int_col, bool_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 42, 42, false],
+          ["a", 126, 42, true],
+          ["a", 126, 42, true],
+          ["a", 130, 2, true],
+          ["a", 130, 2, true],
+          ["b", 100, 100, false],
+          ["b", 103, 3, false],
+          ["c", 150, 150, false],
+          ["c", 153, 3, true],
+          ["c", 155, 2, false],
+          ["c", 54, -101, false],
+          ["d", 42, 42, false],
+          ["e", 42, 42, false],
+          ["e", 84, 42, true],
+          ["g", 3, 3, true],
+          ["h", 150, 150, false]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) sum with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY string_col), int_col FROM {tbl}",
+        "outputs": [
+          ["a", 130, 2],
+          ["a", 130, 2],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["b", 103, 3],
+          ["b", 103, 100],
+          ["e", 84, 42],
+          ["e", 84, 42],
+          ["d", 42, 42],
+          ["h", 150, 150],
+          ["g", 3, 3],
+          ["c", 54, -101],
+          ["c", 54, 150],
+          ["c", 54, 3],
+          ["c", 54, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) sum with select columns - ranking functions",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY string_col), int_col FROM {tbl}",
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 1, 2],
+          ["a", 1, 42],
+          ["a", 1, 42],
+          ["a", 1, 42],
+          ["b", 1, 3],
+          ["b", 1, 100],
+          ["e", 1, 42],
+          ["e", 1, 42],
+          ["d", 1, 42],
+          ["h", 1, 150],
+          ["g", 1, 3],
+          ["c", 1, -101],
+          ["c", 1, 150],
+          ["c", 1, 3],
+          ["c", 1, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) sum with select columns with order by DESC",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY string_col DESC), int_col FROM {tbl}",
+        "outputs": [
+          ["a", 130, 2],
+          ["a", 130, 2],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["a", 130, 42],
+          ["b", 103, 3],
+          ["b", 103, 100],
+          ["e", 84, 42],
+          ["e", 84, 42],
+          ["d", 42, 42],
+          ["h", 150, 150],
+          ["g", 3, 3],
+          ["c", 54, -101],
+          ["c", 54, 150],
+          ["c", 54, 3],
+          ["c", 54, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) row_number with select columns with order by DESC",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY string_col DESC) FROM {tbl}",
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["a", 3],
+          ["a", 4],
+          ["a", 5],
+          ["b", 1],
+          ["b", 2],
+          ["e", 1],
+          ["e", 2],
+          ["d", 1],
+          ["h", 1],
+          ["g", 1],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) rank with select columns with order by DESC",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY string_col DESC) FROM {tbl}",
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["a", 1],
+          ["a", 1],
+          ["a", 1],
+          ["b", 1],
+          ["b", 1],
+          ["e", 1],
+          ["e", 1],
+          ["d", 1],
+          ["h", 1],
+          ["g", 1],
+          ["c", 1],
+          ["c", 1],
+          ["c", 1],
+          ["c", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) max with select columns with alias",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER(PARTITION BY string_col) AS max, int_col FROM {tbl}",
+        "outputs": [
+          ["a", 400, 2],
+          ["a", 400, 2],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["b", 100, 3],
+          ["b", 100, 100],
+          ["e", 50.5, 42],
+          ["e", 50.5, 42],
+          ["d", 42, 42],
+          ["c", 400, -101],
+          ["c", 400, 150],
+          ["c", 400, 3],
+          ["c", 400, 2],
+          ["h", -1.53, 150],
+          ["g", 100, 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) max with select columns with alias",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col) AS max, int_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 400, 2],
+          ["a", 400, 2],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["a", 400, 42],
+          ["b", 100, 3],
+          ["b", 100, 100],
+          ["e", 50.5, 42],
+          ["e", 50.5, 42],
+          ["d", 42, 42],
+          ["c", 1.01, -101],
+          ["c", 400, 2],
+          ["c", 400, 3],
+          ["c", 400, 150],
+          ["h", -1.53, 150],
+          ["g", 100, 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) row_number with select columns with alias",
+        "sql": "SELECT string_col AS str, ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col) AS row_number, int_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 2, 2],
+          ["a", 3, 42],
+          ["a", 4, 42],
+          ["a", 5, 42],
+          ["b", 1, 3],
+          ["b", 2, 100],
+          ["e", 1, 42],
+          ["e", 2, 42],
+          ["d", 1, 42],
+          ["c", 1, -101],
+          ["c", 2, 2],
+          ["c", 3, 3],
+          ["c", 4, 150],
+          ["h", 1, 150],
+          ["g", 1, 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) dense_rank with select columns with alias",
+        "sql": "SELECT string_col AS str, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col) AS dense_rank, int_col FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 1, 2],
+          ["a", 2, 42],
+          ["a", 2, 42],
+          ["a", 2, 42],
+          ["b", 1, 3],
+          ["b", 2, 100],
+          ["e", 1, 42],
+          ["e", 1, 42],
+          ["d", 1, 42],
+          ["c", 1, -101],
+          ["c", 2, 2],
+          ["c", 3, 3],
+          ["c", 4, 150],
+          ["h", 1, 150],
+          ["g", 1, 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) min with select columns and default frame",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), double_col FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "outputs": [
+          [true, 2, 300],
+          [true, 2, 400],
+          [true, 2, 100],
+          [true, 2, 50.5],
+          [true, 2, 75],
+          [true, 2, 50.5],
+          [true, 2, 100],
+          [false, -101, 100],
+          [false, -101, 1],
+          [false, -101, 42],
+          [false, -101, 42],
+          [false, -101, 42],
+          [false, -101, 1.01],
+          [false, -101, 1.5],
+          [false, -101, -1.53],
+          [false, -101, 400]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) min with select columns and default frame",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ORDER BY int_col DESC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col FROM {tbl}",
+        "comments": "Calcite validation fails if more than 1 ORDER BY column is used with RANGE. ROWS is not yet supported. Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 2, 300],
+          [true, 2, 400],
+          [true, 3, 100],
+          [true, 42, 50.5],
+          [true, 42, 75],
+          [true, 42, 50.5],
+          [true, 3, 100],
+          [false, 3, 100],
+          [false, 100, 1],
+          [false, 42, 42],
+          [false, 42, 42],
+          [false, 42, 42],
+          [false, -101, 1.01],
+          [false, 150, 1.5],
+          [false, 150, -1.53],
+          [false, 2, 400]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) min with select columns and default frame",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ORDER BY int_col DESC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col FROM {tbl}",
+        "comments": "Calcite validation fails if more than 1 ORDER BY column is used with RANGE. ROWS is not yet supported. Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 2, 300],
+          [true, 2, 400],
+          [true, 3, 100],
+          [true, 42, 50.5],
+          [true, 42, 75],
+          [true, 42, 50.5],
+          [true, 3, 100],
+          [false, 3, 100],
+          [false, 100, 1],
+          [false, 42, 42],
+          [false, 42, 42],
+          [false, 42, 42],
+          [false, -101, 1.01],
+          [false, 150, 1.5],
+          [false, 150, -1.53],
+          [false, 2, 400]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) avg with select col with global order by",
+        "sql": "SELECT string_col, AVG(double_col) OVER(PARTITION BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["b", 50.5],
+          ["b", 50.5],
+          ["c", 125.6275],
+          ["c", 125.6275],
+          ["c", 125.6275],
+          ["c", 125.6275],
+          ["d", 42],
+          ["e", 46.25],
+          ["e", 46.25],
+          ["g", 100],
+          ["h", -1.53]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number with select col with global order by",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col) as row_number FROM {tbl} ORDER BY string_col, row_number",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["a", 3],
+          ["a", 4],
+          ["a", 5],
+          ["b", 1],
+          ["b", 2],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4],
+          ["d", 1],
+          ["e", 1],
+          ["e", 2],
+          ["g", 1],
+          ["h", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number with select col with global order by",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col) as row_number FROM {tbl} ORDER BY string_col, row_number",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["a", 3],
+          ["a", 4],
+          ["a", 5],
+          ["b", 1],
+          ["b", 2],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4],
+          ["d", 1],
+          ["e", 1],
+          ["e", 2],
+          ["g", 1],
+          ["h", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) avg with select col with global order by (use two global ORDER BY keys for deterministic ordering)",
+        "sql": "SELECT string_col, AVG(double_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 350],
+          ["a", 350],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["a", 173.5],
+          ["b", 100],
+          ["b", 50.5],
+          ["c", 1.01],
+          ["c", 200.505],
+          ["c", 167.003333],
+          ["c", 125.6275],
+          ["d", 42],
+          ["e", 46.25],
+          ["e", 46.25],
+          ["g", 100],
+          ["h", -1.53]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) avg with select col with global order by (use two global ORDER BY keys for deterministic ordering) - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["a", 3],
+          ["a", 3],
+          ["a", 3],
+          ["b", 1],
+          ["b", 2],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4],
+          ["d", 1],
+          ["e", 1],
+          ["e", 1],
+          ["g", 1],
+          ["h", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys)) avg with select col with global order by",
+        "sql": "SELECT string_col, bool_col, AVG(double_col) OVER(PARTITION BY string_col, bool_col) FROM {tbl} ORDER BY string_col, bool_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 42],
+          ["a", true, 206.375],
+          ["a", true, 206.375],
+          ["a", true, 206.375],
+          ["a", true, 206.375],
+          ["b", false, 50.5],
+          ["b", false, 50.5],
+          ["c", false, 134.17],
+          ["c", false, 134.17],
+          ["c", false, 134.17],
+          ["c", true, 100],
+          ["d", false, 42],
+          ["e", false, 42],
+          ["e", true, 50.5],
+          ["g", true, 100],
+          ["h", false, -1.53]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys) ORDER BY different key) avg with select col with global order by (added int_col to global order by for deterministic results)",
+        "sql": "SELECT string_col, bool_col, AVG(double_col) OVER(PARTITION BY string_col, bool_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, bool_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 42],
+          ["a", true, 350.0],
+          ["a", true, 350.0],
+          ["a", true, 206.375],
+          ["a", true, 206.375],
+          ["b", false, 100],
+          ["b", false, 50.5],
+          ["c", false, 1.01],
+          ["c", false, 200.505],
+          ["c", false, 134.17],
+          ["c", true, 100],
+          ["d", false, 42],
+          ["e", false, 42],
+          ["e", true, 50.5],
+          ["g", true, 100],
+          ["h", false, -1.53]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys) ORDER BY different key) row_number with select col with global order by (added int_col to global order by for deterministic results)",
+        "sql": "SELECT string_col, bool_col, ROW_NUMBER() OVER(PARTITION BY string_col, bool_col ORDER BY int_col) as row_number FROM {tbl} ORDER BY string_col, bool_col, int_col, row_number",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 1],
+          ["a", true, 1],
+          ["a", true, 2],
+          ["a", true, 3],
+          ["a", true, 4],
+          ["b", false, 1],
+          ["b", false, 2],
+          ["c", false, 1],
+          ["c", false, 2],
+          ["c", false, 3],
+          ["c", true, 1],
+          ["d", false, 1],
+          ["e", false, 1],
+          ["e", true, 1],
+          ["g", true, 1],
+          ["h", false, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys) ORDER BY different key) dense_rank with select col with global order by (added int_col to global order by for deterministic results)",
+        "sql": "SELECT string_col, bool_col, DENSE_RANK() OVER(PARTITION BY string_col, bool_col ORDER BY int_col) as dense_rank FROM {tbl} ORDER BY string_col, bool_col, int_col, dense_rank",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 1],
+          ["a", true, 1],
+          ["a", true, 1],
+          ["a", true, 2],
+          ["a", true, 2],
+          ["b", false, 1],
+          ["b", false, 2],
+          ["c", false, 1],
+          ["c", false, 2],
+          ["c", false, 3],
+          ["c", true, 1],
+          ["d", false, 1],
+          ["e", false, 1],
+          ["e", true, 1],
+          ["g", true, 1],
+          ["h", false, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) count with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(int_col) OVER(PARTITION BY string_col) FROM {tbl} ORDER BY string_col LIMIT 6",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["b", 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) count with select col with global order by with LIMIT (added int_col to ORDER BY list for deterministic results)",
+        "sql": "SELECT string_col, COUNT(int_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col LIMIT 7",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 2],
+          ["a", 2],
+          ["a", 5],
+          ["a", 5],
+          ["a", 5],
+          ["b", 1],
+          ["b", 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) ranking functions with select col with global order by with LIMIT (added int_col to ORDER BY list for deterministic results)",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col LIMIT 7",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1],
+          ["a", 1],
+          ["a", 3],
+          ["a", 3],
+          ["a", 3],
+          ["b", 1],
+          ["b", 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) and transform col",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), AVG(int_col) OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          ["a-true", 26],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["a-false", 26],
+          ["a-true", 26],
+          ["b-false", 51.5],
+          ["b-false", 51.5],
+          ["c-true", 13.5],
+          ["c-false", 13.5],
+          ["c-false", 13.5],
+          ["c-false", 13.5],
+          ["d-false", 42],
+          ["e-true", 42],
+          ["e-false", 42],
+          ["g-true", 3],
+          ["h-false", 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) and transform col",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), AVG(int_col) OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a-false", 42],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["a-true", 26],
+          ["b-false", 51.5],
+          ["b-false", 51.5],
+          ["c-false", 17.0],
+          ["c-false", 17.0],
+          ["c-false", 17.0],
+          ["c-true", 13.5],
+          ["d-false", 42],
+          ["e-false", 42],
+          ["e-true", 42],
+          ["h-false", 150],
+          ["g-true", 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) row_number and transform col",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 3],
+          ["a-true", 4],
+          ["a-true", 5],
+          ["b-false", 1],
+          ["b-false", 2],
+          ["c-false", 1],
+          ["c-false", 2],
+          ["c-false", 3],
+          ["c-true", 4],
+          ["d-false", 1],
+          ["e-false", 1],
+          ["e-true", 2],
+          ["h-false", 1],
+          ["g-true", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) rank and transform col",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), RANK() OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["b-false", 1],
+          ["b-false", 1],
+          ["c-false", 1],
+          ["c-false", 1],
+          ["c-false", 1],
+          ["c-true", 4],
+          ["d-false", 1],
+          ["e-false", 1],
+          ["e-true", 2],
+          ["h-false", 1],
+          ["g-true", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number with select col and filter",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) rank with select col and filter",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col and filter that matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200",
+        "outputs": []
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and filter that matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": []
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col) as count FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200)",
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY int_col) as count FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200)",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "outputs": [
+          [100, 103],
+          [1, 103],
+          [100, 3],
+          [1.01, 51],
+          [1.5, 51],
+          [400, 51]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col ORDER BY int_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [100, 3],
+          [1, 103],
+          [1.01, -101],
+          [400, -99],
+          [1.5, 51],
+          [100, 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and filter - ranking functions",
+        "sql": "SELECT double_col, DENSE_RANK() OVER(PARTITION BY bool_col, string_col ORDER BY int_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [100, 1],
+          [1, 2],
+          [1.01, 1],
+          [400, 2],
+          [1.5, 3],
+          [100, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col ORDER BY bool_col, string_col) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "outputs": [
+          [100, 103],
+          [1, 103],
+          [100, 3],
+          [1.01, 51],
+          [1.5, 51],
+          [400, 51]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) row_number with select col and filter",
+        "sql": "SELECT double_col, ROW_NUMBER() OVER(PARTITION BY bool_col, string_col ORDER BY bool_col, string_col) FROM {tbl} WHERE string_col IN ('b', 'c') AND int_col < 100 AND int_col > 0",
+        "outputs": [
+          [100, 1],
+          [100, 1],
+          [400, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) rank with select col and filter",
+        "sql": "SELECT double_col, RANK() OVER(PARTITION BY bool_col, string_col ORDER BY bool_col, string_col) FROM {tbl} WHERE string_col IN ('b', 'c') AND int_col < 100 AND int_col > 0",
+        "outputs": [
+          [100, 1],
+          [100, 1],
+          [400, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) with select col and filter where ORDER BY is DESC",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col ORDER BY bool_col, string_col DESC) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "outputs": [
+          [100, 103],
+          [1, 103],
+          [100, 3],
+          [1.01, 51],
+          [1.5, 51],
+          [400, 51]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k1) with select col and filter where ORDER BY is DESC, NULL DIRECTION IS LAST",
+        "comment": "TODO: Modify test to handle null direction when null direction support is added",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col ORDER BY bool_col, string_col DESC NULLS LAST) FROM {tbl} WHERE string_col IN ('b', 'c')",
+        "outputs": [
+          [100, 103],
+          [1, 103],
+          [100, 3],
+          [1.01, 51],
+          [1.5, 51],
+          [400, 51]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select transform and filter",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), MAX(int_col) OVER(PARTITION BY string_col, int_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "outputs": [
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-true", 42],
+          ["a-false", 42],
+          ["a-true", 42],
+          ["b-false", 3],
+          ["b-false", 100],
+          ["c-true", 3],
+          ["c-false", 2],
+          ["c-false", -101],
+          ["d-false", 42],
+          ["e-true", 42],
+          ["e-false", 42],
+          ["g-true", 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select transform and filter",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), MAX(int_col) OVER(PARTITION BY string_col, int_col ORDER BY bool_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a-true", 2],
+          ["a-true", 2],
+          ["a-false", 42],
+          ["a-true", 42],
+          ["a-true", 42],
+          ["b-false", 3],
+          ["b-false", 100],
+          ["c-false", -101],
+          ["c-false", 2],
+          ["c-true", 3],
+          ["d-false", 42],
+          ["e-false", 42],
+          ["e-true", 42],
+          ["g-true", 3]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) row_number with select transform and filter",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), ROW_NUMBER() OVER(PARTITION BY string_col, int_col ORDER BY bool_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a-true", 1],
+          ["a-true", 2],
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 3],
+          ["b-false", 1],
+          ["b-false", 1],
+          ["c-false", 1],
+          ["c-false", 1],
+          ["c-true", 1],
+          ["d-false", 1],
+          ["e-false", 1],
+          ["e-true", 2],
+          ["g-true", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) dense_rank with select transform and filter",
+        "sql": "SELECT CONCAT(string_col, bool_col, '-'), DENSE_RANK() OVER(PARTITION BY string_col, int_col ORDER BY bool_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a-true", 1],
+          ["a-true", 1],
+          ["a-false", 1],
+          ["a-true", 2],
+          ["a-true", 2],
+          ["b-false", 1],
+          ["b-false", 1],
+          ["c-false", 1],
+          ["c-false", 1],
+          ["c-true", 1],
+          ["d-false", 1],
+          ["e-false", 1],
+          ["e-true", 2],
+          ["g-true", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with group by",
+        "sql": "SELECT MAX({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, int_col",
+        "outputs": [
+          [42],
+          [42],
+          [100],
+          [100],
+          [150],
+          [150],
+          [150],
+          [150],
+          [42],
+          [42],
+          [3],
+          [150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with group by",
+        "sql": "SELECT MAX({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [2],
+          [42],
+          [3],
+          [100],
+          [-101],
+          [2],
+          [3],
+          [150],
+          [42],
+          [42],
+          [3],
+          [150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with group by - ranking functions",
+        "sql": "SELECT RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1],
+          [2],
+          [1],
+          [2],
+          [1],
+          [2],
+          [3],
+          [4],
+          [1],
+          [1],
+          [1],
+          [1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, int_col",
+        "outputs": [
+          ["a", 2],
+          ["a", 2],
+          ["b", 3],
+          ["b", 3],
+          ["c", -101],
+          ["c", -101],
+          ["c", -101],
+          ["c", -101],
+          ["d", 42],
+          ["e", 42],
+          ["g", 3],
+          ["h", 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number with select col and group by",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, int_col",
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["b", 1],
+          ["b", 2],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4],
+          ["d", 1],
+          ["e", 1],
+          ["g", 1],
+          ["h", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 2],
+          ["a", 2],
+          ["b", 3],
+          ["b", 3],
+          ["c", -101],
+          ["c", -101],
+          ["c", -101],
+          ["c", -101],
+          ["d", 42],
+          ["e", 42],
+          ["g", 3],
+          ["h", 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col and group by - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1],
+          ["a", 2],
+          ["b", 1],
+          ["b", 2],
+          ["c", 1],
+          ["c", 2],
+          ["c", 3],
+          ["c", 4],
+          ["d", 1],
+          ["e", 1],
+          ["g", 1],
+          ["h", 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with agg col and group by",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [6, 2],
+          [9, 3],
+          [100, 100],
+          [300, 150],
+          [252, 42],
+          [-101, -101]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) with agg col and group by",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4, 2],
+          [126, 44],
+          [3, 3],
+          [100, 103],
+          [-101, -101],
+          [2, -99],
+          [3, -96],
+          [150, 54],
+          [42, 42],
+          [84, 42],
+          [3, 3],
+          [150, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) row_number with agg col and group by",
+        "sql": "SELECT SUM(int_col), ROW_NUMBER() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4, 1],
+          [126, 2],
+          [3, 1],
+          [100, 2],
+          [-101, 1],
+          [2, 2],
+          [3, 3],
+          [150, 4],
+          [42, 1],
+          [84, 1],
+          [3, 1],
+          [150, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) dense_rank with agg col and group by",
+        "sql": "SELECT SUM(int_col), DENSE_RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4, 1],
+          [126, 2],
+          [3, 1],
+          [100, 2],
+          [-101, 1],
+          [2, 2],
+          [3, 3],
+          [150, 4],
+          [42, 1],
+          [84, 1],
+          [3, 1],
+          [150, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [2, 6, 2],
+          [3, 9, 3],
+          [100, 100, 100],
+          [150, 300, 150],
+          [42, 252, 42],
+          [-101, -101, -101]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [2, 4, 2],
+          [42, 126, 44],
+          [3, 3, 3],
+          [100, 100, 103],
+          [-101, -101, -101],
+          [2, 2, -99],
+          [3, 3, -96],
+          [150, 150, 54],
+          [42, 42, 42],
+          [42, 84, 42],
+          [3, 3, 3],
+          [150, 150, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) rank with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [2, 4, 1],
+          [42, 126, 2],
+          [3, 3, 1],
+          [100, 100, 2],
+          [-101, -101, 1],
+          [2, 2, 2],
+          [3, 3, 3],
+          [150, 150, 4],
+          [42, 42, 1],
+          [42, 84, 1],
+          [3, 3, 1],
+          [150, 150, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} GROUP BY int_col ORDER BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [-101, -101, -101],
+          [2, 6, 2],
+          [3, 9, 3],
+          [42, 252, 42],
+          [100, 100, 100],
+          [150, 300, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 4, 2],
+          [42, 126, 44],
+          [3, 3, 3],
+          [100, 100, 103],
+          [-101, -101, -101],
+          [2, 2, -99],
+          [3, 3, -96],
+          [150, 150, 54],
+          [42, 42, 42],
+          [42, 84, 42],
+          [3, 3, 3],
+          [150, 150, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) row_number with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), ROW_NUMBER() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 4, 1],
+          [42, 126, 2],
+          [3, 3, 1],
+          [100, 100, 2],
+          [-101, -101, 1],
+          [2, 2, 2],
+          [3, 3, 3],
+          [150, 150, 4],
+          [42, 42, 1],
+          [42, 84, 1],
+          [3, 3, 1],
+          [150, 150, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER by k2) dense_rank with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), DENSE_RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 4, 1],
+          [42, 126, 2],
+          [3, 3, 1],
+          [100, 100, 2],
+          [-101, -101, 1],
+          [2, 2, 2],
+          [3, 3, 3],
+          [150, 150, 4],
+          [42, 42, 1],
+          [42, 84, 1],
+          [3, 3, 1],
+          [150, 150, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} WHERE int_col >= 100 GROUP BY int_col",
+        "outputs": [
+          [100, 100, 100],
+          [150, 300, 150]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) row_number with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), ROW_NUMBER() OVER(PARTITION BY {tbl}.int_col) FROM {tbl} WHERE int_col >= 100 GROUP BY int_col",
+        "outputs": [
+          [100, 100, 1],
+          [150, 300, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col) FROM {tbl} WHERE int_col >= 100 GROUP BY string_col, int_col",
+        "outputs": [
+          [100, 100, 100],
+          [150, 150, 150],
+          [150, 150, 300]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) rank with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), RANK() OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col) FROM {tbl} WHERE int_col >= 100 GROUP BY string_col, int_col",
+        "outputs": [
+          [100, 100, 1],
+          [150, 150, 1],
+          [150, 150, 2]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY) with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} WHERE int_col > 200 GROUP BY int_col",
+        "outputs": []
+      },
+      {
+        "description": "Single OVER(PARTITION BY k1 ORDER BY k2) with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col) FROM {tbl} WHERE int_col > 200 GROUP BY string_col, int_col",
+        "outputs": []
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s",
+        "sql": "SELECT SUM(int_col) OVER(PARTITION BY string_col), COUNT(string_col) OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          [150, 1],
+          [3, 1],
+          [42, 1],
+          [84, 2],
+          [84, 2],
+          [103, 2],
+          [103, 2],
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [54, 4],
+          [54, 4],
+          [54, 4],
+          [54, 4]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s",
+        "sql": "SELECT SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col), COUNT(string_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4, 2],
+          [4, 2],
+          [130, 5],
+          [130, 5],
+          [130, 5],
+          [3, 1],
+          [103, 2],
+          [-101, 1],
+          [-99, 2],
+          [-96, 3],
+          [54, 4],
+          [42, 1],
+          [84, 2],
+          [84, 2],
+          [3, 1],
+          [150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s - ranking functions",
+        "sql": "SELECT RANK() OVER(PARTITION BY string_col ORDER BY int_col), COUNT(string_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, 2],
+          [1, 2],
+          [3, 5],
+          [3, 5],
+          [3, 5],
+          [1, 1],
+          [2, 2],
+          [1, 1],
+          [2, 2],
+          [3, 3],
+          [4, 4],
+          [1, 1],
+          [1, 2],
+          [1, 2],
+          [1, 1],
+          [1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col), int_col, MAX(double_col) OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          ["a", 130, 2, 400],
+          ["a", 130, 2, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["b", 103, 3, 100],
+          ["b", 103, 100, 100],
+          ["d", 42, 42, 42],
+          ["e", 84, 42, 50.5],
+          ["e", 84, 42, 50.5],
+          ["h", 150, 150, -1.53],
+          ["g", 3, 3, 100],
+          ["c", 54, -101, 400],
+          ["c", 54, 150, 400],
+          ["c", 54, 3, 400],
+          ["c", 54, 2, 400]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col), int_col, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 2, 400],
+          ["a", 4, 2, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["b", 3, 3, 100],
+          ["b", 103, 100, 100],
+          ["c", -101, -101, 1.01],
+          ["c", -99, 2, 400],
+          ["c", -96, 3, 400],
+          ["c", 54, 150, 400],
+          ["d", 42, 42, 42],
+          ["e", 84, 42, 50.5],
+          ["e", 84, 42, 50.5],
+          ["g", 3, 3, 100],
+          ["h", 150, 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s row_number with select columns",
+        "sql": "SELECT string_col, ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col), int_col, ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2, 1],
+          ["a", 2, 2, 2],
+          ["a", 3, 42, 3],
+          ["a", 4, 42, 4],
+          ["a", 5, 42, 5],
+          ["b", 1, 3, 1],
+          ["b", 2, 100, 2],
+          ["c", 1, -101, 1],
+          ["c", 2, 2, 2],
+          ["c", 3, 3, 3],
+          ["c", 4, 150, 4],
+          ["d", 1, 42, 1],
+          ["e", 1, 42, 1],
+          ["e", 2, 42, 2],
+          ["g", 1, 3, 1],
+          ["h", 1, 150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s ranking functions with select columns",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col), int_col, RANK() OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl}",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2, 1],
+          ["a", 1, 2, 1],
+          ["a", 2, 42, 3],
+          ["a", 2, 42, 3],
+          ["a", 2, 42, 3],
+          ["b", 1, 3, 1],
+          ["b", 2, 100, 2],
+          ["c", 1, -101, 1],
+          ["c", 2, 2, 2],
+          ["c", 3, 3, 3],
+          ["c", 4, 150, 4],
+          ["d", 1, 42, 1],
+          ["e", 1, 42, 1],
+          ["e", 1, 42, 1],
+          ["g", 1, 3, 1],
+          ["h", 1, 150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2, k3)s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col, bool_col), int_col, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col, bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 2, 400],
+          ["a", 4, 2, 400],
+          ["a", 46, 42, 400],
+          ["a", 130, 42, 400],
+          ["a", 130, 42, 400],
+          ["b", 3, 3, 100],
+          ["b", 103, 100, 100],
+          ["c", -101, -101, 1.01],
+          ["c", -99, 2, 400],
+          ["c", -96, 3, 400],
+          ["c", 54, 150, 400],
+          ["d", 42, 42, 42],
+          ["e", 42, 42, 42],
+          ["e", 84, 42, 50.5],
+          ["g", 3, 3, 100],
+          ["h", 150, 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2, k3 DESC)s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC), int_col, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 2, 400],
+          ["a", 4, 2, 400],
+          ["a", 88, 42, 400],
+          ["a", 88, 42, 400],
+          ["a", 130, 42, 400],
+          ["b", 3, 3, 100],
+          ["b", 103, 100, 100],
+          ["c", -101, -101, 1.01],
+          ["c", -99, 2, 400],
+          ["c", -96, 3, 400],
+          ["c", 54, 150, 400],
+          ["d", 42, 42, 42],
+          ["e", 42, 42, 50.5],
+          ["e", 84, 42, 50.5],
+          ["g", 3, 3, 100],
+          ["h", 150, 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2, k3 DESC)s with select columns - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC), int_col, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col, bool_col DESC) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2, 1],
+          ["a", 1, 2, 1],
+          ["a", 3, 42, 2],
+          ["a", 3, 42, 2],
+          ["a", 5, 42, 3],
+          ["b", 1, 3, 1],
+          ["b", 2, 100, 2],
+          ["c", 1, -101, 1],
+          ["c", 2, 2, 2],
+          ["c", 3, 3, 3],
+          ["c", 4, 150, 4],
+          ["d", 1, 42, 1],
+          ["e", 1, 42, 1],
+          ["e", 2, 42, 2],
+          ["g", 1, 3, 1],
+          ["h", 1, 150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2 DESC, k3 DESC)s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col DESC, bool_col DESC), int_col, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col DESC, bool_col DESC) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 84, 42, 75],
+          ["a", 84, 42, 75],
+          ["a", 126, 42, 75],
+          ["a", 130, 2, 400],
+          ["a", 130, 2, 400],
+          ["b", 100, 100, 1],
+          ["b", 103, 3, 100],
+          ["c", 150, 150, 1.5],
+          ["c", 153, 3, 100],
+          ["c", 155, 2, 400],
+          ["c", 54, -101, 400],
+          ["d", 42, 42, 42],
+          ["e", 42, 42, 50.5],
+          ["e", 84, 42, 50.5],
+          ["g", 3, 3, 100],
+          ["h", 150, 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2 DESC, k3)s with select columns",
+        "sql": "SELECT string_col, SUM(int_col) OVER(PARTITION BY string_col ORDER BY int_col DESC, bool_col), int_col, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col DESC, bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 42, 42, 42],
+          ["a", 126, 42, 75],
+          ["a", 126, 42, 75],
+          ["a", 130, 2, 400],
+          ["a", 130, 2, 400],
+          ["b", 100, 100, 1],
+          ["b", 103, 3, 100],
+          ["c", 150, 150, 1.5],
+          ["c", 153, 3, 100],
+          ["c", 155, 2, 400],
+          ["c", 54, -101, 400],
+          ["d", 42, 42, 42],
+          ["e", 42, 42, 42],
+          ["e", 84, 42, 50.5],
+          ["g", 3, 3, 100],
+          ["h", 150, 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(PARTITION BY string_col), BOOL_AND(bool_col) OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["a", true, false],
+          ["b", false, false],
+          ["b", false, false],
+          ["d", false, false],
+          ["e", true, false],
+          ["e", true, false],
+          ["h", false, false],
+          ["g", true, true],
+          ["c", true, false],
+          ["c", true, false],
+          ["c", true, false],
+          ["c", true, false]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col using bool aggregation",
+        "sql": "SELECT string_col, BOOL_OR(bool_col) OVER(PARTITION BY string_col ORDER BY bool_col DESC), BOOL_AND(bool_col) OVER(PARTITION BY string_col ORDER BY bool_col DESC) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, true],
+          ["a", true, false],
+          ["b", false, false],
+          ["b", false, false],
+          ["d", false, false],
+          ["e", true, true],
+          ["e", true, false],
+          ["h", false, false],
+          ["g", true, true],
+          ["c", true, true],
+          ["c", true, false],
+          ["c", true, false],
+          ["c", true, false]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col using bool aggregation and ranking function",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY bool_col DESC), BOOL_AND(bool_col) OVER(PARTITION BY string_col ORDER BY bool_col DESC) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, true],
+          ["a", 1, true],
+          ["a", 1, true],
+          ["a", 1, true],
+          ["a", 5, false],
+          ["b", 1, false],
+          ["b", 1, false],
+          ["d", 1, false],
+          ["e", 1, true],
+          ["e", 2, false],
+          ["h", 1, false],
+          ["g", 1, true],
+          ["c", 1, true],
+          ["c", 2, false],
+          ["c", 2, false],
+          ["c", 2, false]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select columns with alias",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER(PARTITION BY string_col) AS max, int_col, MIN(int_col) OVER(PARTITION BY string_col) AS sum FROM {tbl}",
+        "outputs": [
+          ["a", 400, 2, 2],
+          ["a", 400, 2, 2],
+          ["a", 400, 42, 2],
+          ["a", 400, 42, 2],
+          ["a", 400, 42, 2],
+          ["b", 100, 3, 3],
+          ["b", 100, 100, 3],
+          ["d", 42, 42, 42],
+          ["e", 50.5, 42, 42],
+          ["e", 50.5, 42, 42],
+          ["h", -1.53, 150, 150],
+          ["g", 100, 3, 3],
+          ["c", 400, -101, -101],
+          ["c", 400, 150, -101],
+          ["c", 400, 3, -101],
+          ["c", 400, 2, -101]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select columns with alias",
+        "sql": "SELECT string_col AS str, MAX(double_col) OVER(PARTITION BY string_col ORDER BY int_col) AS max, int_col, MIN(int_col) OVER(PARTITION BY string_col ORDER BY int_col) AS sum FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 400, 2, 2],
+          ["a", 400, 2, 2],
+          ["a", 400, 42, 2],
+          ["a", 400, 42, 2],
+          ["a", 400, 42, 2],
+          ["b", 100, 3, 3],
+          ["b", 100, 100, 3],
+          ["e", 50.5, 42, 42],
+          ["e", 50.5, 42, 42],
+          ["d", 42, 42, 42],
+          ["c", 1.01, -101, -101],
+          ["c", 400, 2, -101],
+          ["c", 400, 3, -101],
+          ["c", 400, 150, -101],
+          ["h", -1.53, 150, 150],
+          ["g", 100, 3, 3]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select columns and default frame on one but not the other",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), double_col, AVG(double_col) OVER(PARTITION BY bool_col) FROM {tbl}",
+        "comments": "Calcite validation fails if RANGE is used but later Calcite overrides ROWS with RANGE",
+        "outputs": [
+          [true, 2, 300, 153.714286],
+          [true, 2, 400, 153.714286],
+          [true, 2, 100, 153.714286],
+          [true, 2, 50.5, 153.714286],
+          [true, 2, 75, 153.714286],
+          [true, 2, 50.5, 153.714286],
+          [true, 2, 100, 153.714286],
+          [false, -101, 100, 69.7755556],
+          [false, -101, 1, 69.7755556],
+          [false, -101, 42, 69.7755556],
+          [false, -101, 42, 69.7755556],
+          [false, -101, 42, 69.7755556],
+          [false, -101, 1.01, 69.7755556],
+          [false, -101, 1.5, 69.7755556],
+          [false, -101, -1.53, 69.7755556],
+          [false, -101, 400, 69.7755556]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select columns and default frame on one but not the other",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ORDER BY int_col DESC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col, AVG(double_col) OVER(PARTITION BY bool_col ORDER BY int_col DESC) FROM {tbl}",
+        "comments": "Calcite validation fails if more than 1 ORDER BY column is used with RANGE. ROWS is not yet supported. Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 42, 75, 58.6666667],
+          [true, 42, 50.5, 58.6666667],
+          [true, 42, 50.5, 58.6666667],
+          [true, 3, 100, 75.2],
+          [true, 3, 100, 75.2],
+          [true, 2, 300, 153.714286],
+          [true, 2, 400, 153.714286],
+          [false, 150, 1.5, -0.015],
+          [false, 150, -1.53, -0.015],
+          [false, 100, 1, 0.32333333],
+          [false, 42, 42, 21.1616667],
+          [false, 42, 42, 21.1616667],
+          [false, 42, 42, 21.1616667],
+          [false, 3, 100, 32.4242857],
+          [false, 2, 400, 78.37125],
+          [false, -101, 1.01, 69.7755556]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select columns and default frame on one but not the other with ranking functions",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ORDER BY int_col DESC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col, RANK() OVER(PARTITION BY bool_col ORDER BY int_col DESC) FROM {tbl}",
+        "comments": "Calcite validation fails if more than 1 ORDER BY column is used with RANGE. ROWS is not yet supported. Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 42, 75, 1],
+          [true, 42, 50.5, 1],
+          [true, 42, 50.5, 1],
+          [true, 3, 100, 4],
+          [true, 3, 100, 4],
+          [true, 2, 300, 6],
+          [true, 2, 400, 6],
+          [false, 150, 1.5, 1],
+          [false, 150, -1.53, 1],
+          [false, 100, 1, 3],
+          [false, 42, 42, 4],
+          [false, 42, 42, 4],
+          [false, 42, 42, 4],
+          [false, 3, 100, 7],
+          [false, 2, 400, 8],
+          [false, -101, 1.01, 9]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select columns and default frame on one but not the other with ranking functions",
+        "sql": "SELECT bool_col, MIN(int_col) OVER(PARTITION BY bool_col ORDER BY int_col DESC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), double_col, DENSE_RANK() OVER(PARTITION BY bool_col ORDER BY int_col DESC) FROM {tbl}",
+        "comments": "Calcite validation fails if more than 1 ORDER BY column is used with RANGE. ROWS is not yet supported. Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [true, 42, 75, 1],
+          [true, 42, 50.5, 1],
+          [true, 42, 50.5, 1],
+          [true, 3, 100, 2],
+          [true, 3, 100, 2],
+          [true, 2, 300, 3],
+          [true, 2, 400, 3],
+          [false, 150, 1.5, 1],
+          [false, 150, -1.53, 1],
+          [false, 100, 1, 2],
+          [false, 42, 42, 3],
+          [false, 42, 42, 3],
+          [false, 42, 42, 3],
+          [false, 3, 100, 4],
+          [false, 2, 400, 5],
+          [false, -101, 1.01, 6]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col with global order by",
+        "sql": "SELECT string_col, AVG(double_col) OVER(PARTITION BY string_col), COUNT(string_col) OVER(PARTITION BY string_col) FROM {tbl} ORDER BY string_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["b", 50.5, 2],
+          ["b", 50.5, 2],
+          ["c", 125.6275, 4],
+          ["c", 125.6275, 4],
+          ["c", 125.6275, 4],
+          ["c", 125.6275, 4],
+          ["d", 42, 1],
+          ["e", 46.25, 2],
+          ["e", 46.25, 2],
+          ["g", 100, 1],
+          ["h", -1.53, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col with global order by (use two global ORDER BY keys for deterministic ordering)",
+        "sql": "SELECT string_col, AVG(double_col) OVER(PARTITION BY string_col ORDER BY int_col), COUNT(string_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 350, 2],
+          ["a", 350, 2],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["a", 173.5, 5],
+          ["b", 100, 1],
+          ["b", 50.5, 2],
+          ["c", 1.01, 1],
+          ["c", 200.505, 2],
+          ["c", 167.003333, 3],
+          ["c", 125.6275, 4],
+          ["d", 42, 1],
+          ["e", 46.25, 2],
+          ["e", 46.25, 2],
+          ["g", 100, 1],
+          ["h", -1.53, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col with global order by (use two global ORDER BY keys for deterministic ordering) ranking functions",
+        "sql": "SELECT string_col, DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col), RANK() OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 2, 3],
+          ["a", 2, 3],
+          ["a", 2, 3],
+          ["b", 1, 1],
+          ["b", 2, 2],
+          ["c", 1, 1],
+          ["c", 2, 2],
+          ["c", 3, 3],
+          ["c", 4, 4],
+          ["d", 1, 1],
+          ["e", 1, 1],
+          ["e", 1, 1],
+          ["g", 1, 1],
+          ["h", 1, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys))s avg with select col with global order by",
+        "sql": "SELECT string_col, bool_col, AVG(double_col) OVER(PARTITION BY string_col, bool_col), COUNT(string_col) OVER(PARTITION BY bool_col, string_col) FROM {tbl} ORDER BY string_col, bool_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 42, 1],
+          ["a", true, 206.375, 4],
+          ["a", true, 206.375, 4],
+          ["a", true, 206.375, 4],
+          ["a", true, 206.375, 4],
+          ["b", false, 50.5, 2],
+          ["b", false, 50.5, 2],
+          ["c", false, 134.17, 3],
+          ["c", false, 134.17, 3],
+          ["c", false, 134.17, 3],
+          ["c", true, 100, 1],
+          ["d", false, 42, 1],
+          ["e", false, 42, 1],
+          ["e", true, 50.5, 1],
+          ["g", true, 100, 1],
+          ["h", false, -1.53, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys) ORDER BY different key)s avg with select col with global order by (added int_col to global order by for deterministic results)",
+        "sql": "SELECT string_col, bool_col, AVG(double_col) OVER(PARTITION BY string_col, bool_col ORDER BY int_col), COUNT(string_col) OVER(PARTITION BY bool_col, string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, bool_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 42, 1],
+          ["a", true, 350.0, 2],
+          ["a", true, 350.0, 2],
+          ["a", true, 206.375, 4],
+          ["a", true, 206.375, 4],
+          ["b", false, 100, 1],
+          ["b", false, 50.5, 2],
+          ["c", false, 1.01, 1],
+          ["c", false, 200.505, 2],
+          ["c", false, 134.17, 3],
+          ["c", true, 100, 1],
+          ["d", false, 42, 1],
+          ["e", false, 42, 1],
+          ["e", true, 50.5, 1],
+          ["g", true, 100, 1],
+          ["h", false, -1.53, 1]
+        ]
+      },
+      {
+        "description": "Single OVER(PARTITION BY (2 keys) ORDER BY different key)s avg with select col with global order by (added int_col to global order by for deterministic results) - ranking functions",
+        "sql": "SELECT string_col, bool_col, RANK() OVER(PARTITION BY string_col, bool_col ORDER BY int_col), DENSE_RANK() OVER(PARTITION BY bool_col, string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, bool_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", false, 1, 1],
+          ["a", true, 1, 1],
+          ["a", true, 1, 1],
+          ["a", true, 3, 2],
+          ["a", true, 3, 2],
+          ["b", false, 1, 1],
+          ["b", false, 2, 2],
+          ["c", false, 1, 1],
+          ["c", false, 2, 2],
+          ["c", false, 3, 3],
+          ["c", true, 1, 1],
+          ["d", false, 1, 1],
+          ["e", false, 1, 1],
+          ["e", true, 1, 1],
+          ["g", true, 1, 1],
+          ["h", false, 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col), AVG(int_col) OVER(PARTITION BY string_col) FROM {tbl} ORDER BY string_col LIMIT 6",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["b", 2, 51.5]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col with global order by with LIMIT",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY int_col), AVG(int_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col LIMIT 7",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 2, 2],
+          ["a", 2, 2],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["a", 5, 26],
+          ["b", 1, 3],
+          ["b", 2, 51.5]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col with global order by with LIMIT ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY int_col), AVG(int_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} ORDER BY string_col, int_col LIMIT 7",
+        "comments": "Cannot use LIMIT without ORDER BY since the results can change and we cannot verify exact row outputs",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 1, 2],
+          ["a", 3, 26],
+          ["a", 3, 26],
+          ["a", 3, 26],
+          ["b", 1, 3],
+          ["b", 2, 51.5]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s and transform col",
+        "sql": "SELECT UPPER(CONCAT(string_col, bool_col, '-')), AVG(int_col) OVER(PARTITION BY string_col), MIN(double_col) OVER(PARTITION BY string_col) FROM {tbl}",
+        "outputs": [
+          ["A-TRUE", 26, 42],
+          ["A-TRUE", 26, 42],
+          ["A-TRUE", 26, 42],
+          ["A-FALSE", 26, 42],
+          ["A-TRUE", 26, 42],
+          ["B-FALSE", 51.5, 1],
+          ["B-FALSE", 51.5, 1],
+          ["C-TRUE", 13.5, 1.01],
+          ["C-FALSE", 13.5, 1.01],
+          ["C-FALSE", 13.5, 1.01],
+          ["C-FALSE", 13.5, 1.01],
+          ["D-FALSE", 42, 42],
+          ["E-TRUE", 42, 42],
+          ["E-FALSE", 42, 42],
+          ["G-TRUE", 3, 100],
+          ["H-FALSE", 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s and transform col",
+        "sql": "SELECT UPPER(CONCAT(string_col, bool_col, '-')), AVG(int_col) OVER(PARTITION BY string_col ORDER BY bool_col), MIN(double_col) OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["A-FALSE", 42, 42],
+          ["A-TRUE", 26, 42],
+          ["A-TRUE", 26, 42],
+          ["A-TRUE", 26, 42],
+          ["A-TRUE", 26, 42],
+          ["B-FALSE", 51.5, 1],
+          ["B-FALSE", 51.5, 1],
+          ["C-FALSE", 17.0, 1.01],
+          ["C-FALSE", 17.0, 1.01],
+          ["C-FALSE", 17.0, 1.01],
+          ["C-TRUE", 13.5, 1.01],
+          ["D-FALSE", 42, 42],
+          ["E-FALSE", 42, 42],
+          ["E-TRUE", 42, 42],
+          ["G-TRUE", 3, 100],
+          ["H-FALSE", 150, -1.53]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s and transform col - ranking functions",
+        "sql": "SELECT UPPER(CONCAT(string_col, bool_col, '-')), RANK() OVER(PARTITION BY string_col ORDER BY bool_col), DENSE_RANK() OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl}",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["A-FALSE", 1, 1],
+          ["A-TRUE", 2, 2],
+          ["A-TRUE", 2, 2],
+          ["A-TRUE", 2, 2],
+          ["A-TRUE", 2, 2],
+          ["B-FALSE", 1, 1],
+          ["B-FALSE", 1, 1],
+          ["C-FALSE", 1, 1],
+          ["C-FALSE", 1, 1],
+          ["C-FALSE", 1, 1],
+          ["C-TRUE", 4, 2],
+          ["D-FALSE", 1, 1],
+          ["E-FALSE", 1, 1],
+          ["E-TRUE", 2, 2],
+          ["G-TRUE", 1, 1],
+          ["H-FALSE", 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col), MIN(double_col) OVER(PARTITION BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "outputs": [
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and filter",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY bool_col), MIN(double_col) OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5],
+          ["a", 4, 50.5]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and filter - ranking functinos",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY string_col ORDER BY bool_col), DENSE_RANK() OVER(PARTITION BY string_col ORDER BY bool_col) FROM {tbl} WHERE string_col = 'a' AND bool_col != false",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1],
+          ["a", 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col and filter that matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col), AVG(int_col) OVER(PARTITION BY string_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200",
+        "outputs": []
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and filter that matches no rows",
+        "sql": "SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY int_col), AVG(int_col) OVER(PARTITION BY string_col ORDER BY int_col) FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": []
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col) as count, AVG(int_col) OVER(PARTITION BY string_col) as avg FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200)",
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and filter which matches no rows in a sub-query and outer query with aggregation on that column",
+        "sql": "SELECT SUM(count) FROM (SELECT string_col, COUNT(bool_col) OVER(PARTITION BY string_col ORDER BY int_col) as count, AVG(int_col) OVER(PARTITION BY string_col ORDER BY int_col) as avg FROM {tbl} WHERE string_col = 'a' AND bool_col = false AND int_col > 200)",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [null]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col), AVG(double_col) OVER(PARTITION BY bool_col, string_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "outputs": [
+          [100, 103, 50.5],
+          [1, 103, 50.5],
+          [100, 3, 100],
+          [1.01, 51, 134.17],
+          [1.5, 51, 134.17],
+          [400, 51, 134.17]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and filter",
+        "sql": "SELECT double_col, SUM(int_col) OVER(PARTITION BY bool_col, string_col ORDER BY int_col), AVG(double_col) OVER(PARTITION BY bool_col, string_col ORDER BY int_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [100, 3, 100.0],
+          [1, 103, 50.5],
+          [1.01, -101, 1.01],
+          [400, -99, 200.505],
+          [1.5, 51, 134.17],
+          [100, 3, 100]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and filter - ranking functions",
+        "sql": "SELECT double_col, RANK() OVER(PARTITION BY bool_col, string_col ORDER BY int_col), DENSE_RANK() OVER(PARTITION BY bool_col, string_col ORDER BY int_col) FROM {tbl} WHERE string_col NOT IN ('a', 'd', 'e', 'g', 'h')",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [100, 1, 1],
+          [1, 2, 2],
+          [1.01, 1, 1],
+          [400, 2, 2],
+          [1.5, 3, 3],
+          [100, 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select transform and filter",
+        "sql": "SELECT LENGTH(CONCAT(string_col, bool_col, '-')), MAX(int_col) OVER(PARTITION BY string_col, int_col), COUNT(double_col) OVER(PARTITION BY string_col, int_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "outputs": [
+          [6, 2, 2],
+          [6, 2, 2],
+          [6, 42, 3],
+          [7, 42, 3],
+          [6, 42, 3],
+          [7, 3, 1],
+          [7, 100, 1],
+          [6, 3, 1],
+          [7, 2, 1],
+          [7, -101, 1],
+          [7, 42, 1],
+          [6, 42, 2],
+          [7, 42, 2],
+          [6, 3, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select transform and filter",
+        "sql": "SELECT LENGTH(CONCAT(string_col, bool_col, '-')), MAX(int_col) OVER(PARTITION BY string_col, int_col ORDER BY bool_col), COUNT(double_col) OVER(PARTITION BY string_col, int_col ORDER BY bool_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [6, 2, 2],
+          [6, 2, 2],
+          [7, 42, 1],
+          [6, 42, 3],
+          [6, 42, 3],
+          [7, 3, 1],
+          [7, 100, 1],
+          [7, -101, 1],
+          [7, 2, 1],
+          [6, 3, 1],
+          [7, 42, 1],
+          [7, 42, 1],
+          [6, 42, 2],
+          [6, 3, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select transform and filter - ranking functions",
+        "sql": "SELECT LENGTH(CONCAT(string_col, bool_col, '-')), RANK() OVER(PARTITION BY string_col, int_col ORDER BY bool_col), DENSE_RANK() OVER(PARTITION BY string_col, int_col ORDER BY bool_col) FROM {tbl} where int_col < 50 OR double_col = 1",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [6, 1, 1],
+          [6, 1, 1],
+          [7, 1, 1],
+          [6, 2, 2],
+          [6, 2, 2],
+          [7, 1, 1],
+          [7, 1, 1],
+          [7, 1, 1],
+          [7, 1, 1],
+          [6, 1, 1],
+          [7, 1, 1],
+          [7, 1, 1],
+          [6, 2, 2],
+          [6, 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with group by",
+        "sql": "SELECT MAX({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col), COUNT({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, int_col",
+        "outputs": [
+          [42, 2],
+          [42, 2],
+          [100, 2],
+          [100, 2],
+          [150, 4],
+          [150, 4],
+          [150, 4],
+          [150, 4],
+          [42, 1],
+          [42, 1],
+          [3, 1],
+          [150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with group by",
+        "sql": "SELECT MAX({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), COUNT({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [2, 1],
+          [42, 2],
+          [3, 1],
+          [100, 2],
+          [-101, 1],
+          [2, 2],
+          [3, 3],
+          [150, 4],
+          [42, 1],
+          [42, 1],
+          [3, 1],
+          [150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with group by - ranking functions",
+        "sql": "SELECT MAX({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), DENSE_RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [2, 1],
+          [42, 2],
+          [3, 1],
+          [100, 2],
+          [-101, 1],
+          [2, 2],
+          [3, 3],
+          [150, 4],
+          [42, 1],
+          [42, 1],
+          [3, 1],
+          [150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col) FROM {tbl} GROUP BY string_col, int_col",
+        "outputs": [
+          ["a", 2, 44],
+          ["a", 2, 44],
+          ["b", 3, 103],
+          ["b", 3, 103],
+          ["c", -101, 54],
+          ["c", -101, 54],
+          ["c", -101, 54],
+          ["c", -101, 54],
+          ["d", 42, 42],
+          ["e", 42, 42],
+          ["g", 3, 3],
+          ["h", 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and group by",
+        "sql": "SELECT string_col, MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 2, 2],
+          ["a", 2, 44],
+          ["b", 3, 3],
+          ["b", 3, 103],
+          ["c", -101, -101],
+          ["c", -101, -99],
+          ["c", -101, -96],
+          ["c", -101, 54],
+          ["d", 42, 42],
+          ["e", 42, 42],
+          ["g", 3, 3],
+          ["h", 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col and group by - ranking functions",
+        "sql": "SELECT string_col, RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          ["a", 1, 2],
+          ["a", 2, 44],
+          ["b", 1, 3],
+          ["b", 2, 103],
+          ["c", 1, -101],
+          ["c", 2, -99],
+          ["c", 3, -96],
+          ["c", 4, 54],
+          ["d", 1, 42],
+          ["e", 1, 42],
+          ["g", 1, 3],
+          ["h", 1, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with agg col and group by",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col), AVG({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [6, 2, 2],
+          [9, 3, 3],
+          [100, 100, 100],
+          [300, 150, 150],
+          [252, 42, 42],
+          [-101, -101, -101]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER by k2)s with agg col and group by",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), AVG({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4, 2, 2],
+          [126, 44, 22],
+          [3, 3, 3],
+          [100, 103, 51.5],
+          [-101, -101, -101],
+          [2, -99, -49.5],
+          [3, -96, -32],
+          [150, 54, 13.5],
+          [42, 42, 42],
+          [84, 42, 42],
+          [3, 3, 3],
+          [150, 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER by k2)s with agg col and group by - ranking functions",
+        "sql": "SELECT SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [4, 2, 1],
+          [126, 44, 2],
+          [3, 3, 1],
+          [100, 103, 2],
+          [-101, -101, 1],
+          [2, -99, 2],
+          [3, -96, 3],
+          [150, 54, 4],
+          [42, 42, 1],
+          [84, 42, 1],
+          [3, 3, 1],
+          [150, 150, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col), AVG({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} GROUP BY int_col",
+        "outputs": [
+          [2, 6, 2, 2],
+          [3, 9, 3, 3],
+          [100, 100, 100, 100],
+          [150, 300, 150, 150],
+          [42, 252, 42, 42],
+          [-101, -101, -101, -101]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER by k2)s with select col, agg col and group by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), AVG({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [2, 4, 2, 2],
+          [42, 126, 44, 22],
+          [3, 3, 3, 3],
+          [100, 100, 103, 51.5],
+          [-101, -101, -101, -101],
+          [2, 2, -99, -49.5],
+          [3, 3, -96, -32],
+          [150, 150, 54, 13.5],
+          [42, 42, 42, 42],
+          [42, 84, 42, 42],
+          [3, 3, 3, 3],
+          [150, 150, 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col), AVG({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} GROUP BY int_col ORDER BY int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [-101, -101, -101, -101],
+          [2, 6, 2, 2],
+          [3, 9, 3, 3],
+          [42, 252, 42, 42],
+          [100, 100, 100, 100],
+          [150, 300, 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER by k2)s with select col, agg col and group by with global order by",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), AVG({tbl}.int_col) OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 4, 2, 2],
+          [42, 126, 44, 22],
+          [3, 3, 3, 3],
+          [100, 100, 103, 51.5],
+          [-101, -101, -101, -101],
+          [2, 2, -99, -49.5],
+          [3, 3, -96, -32],
+          [150, 150, 54, 13.5],
+          [42, 42, 42, 42],
+          [42, 84, 42, 42],
+          [3, 3, 3, 3],
+          [150, 150, 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER by k2)s with select col, agg col and group by with global order by - ranking functions",
+        "sql": "SELECT int_col, SUM(int_col), DENSE_RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col), RANK() OVER(PARTITION BY {tbl}.string_col ORDER BY {tbl}.int_col) FROM {tbl} GROUP BY string_col, int_col ORDER BY string_col, int_col",
+        "keepOutputRowOrder": true,
+        "outputs": [
+          [2, 4, 1, 1],
+          [42, 126, 2, 2],
+          [3, 3, 1, 1],
+          [100, 100, 2, 2],
+          [-101, -101, 1, 1],
+          [2, 2, 2, 2],
+          [3, 3, 3, 3],
+          [150, 150, 4, 4],
+          [42, 42, 1, 1],
+          [42, 84, 1, 1],
+          [3, 3, 1, 1],
+          [150, 150, 1, 1]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col), MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} WHERE int_col >= 100 GROUP BY int_col",
+        "outputs": [
+          [100, 100, 100, 100],
+          [150, 300, 150, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col, agg col and group by with a filter",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col), MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col) FROM {tbl} WHERE int_col >= 100 GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [100, 100, 100, 100],
+          [150, 150, 150, 150],
+          [150, 150, 300, 150]
+        ]
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY)s with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col), MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col) FROM {tbl} WHERE int_col > 200 GROUP BY int_col",
+        "outputs": []
+      },
+      {
+        "description": "Multiple OVER(PARTITION BY k1 ORDER BY k2)s with select col, agg col and group by with a filter that matches no rows",
+        "sql": "SELECT int_col, SUM(int_col), SUM({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col), MIN({tbl}.int_col) OVER(PARTITION BY {tbl}.int_col ORDER BY {tbl}.string_col) FROM {tbl} WHERE int_col > 200 GROUP BY string_col, int_col",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": []
+      },
+      {
+        "description": "Subquery with ROW_NUMBER window function to get all values with ROW_NUMBER < value",
+        "sql": "SELECT row_number, string_col, int_col FROM (SELECT ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col) AS row_number, string_col, int_col from {tbl}) WHERE row_number <= 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, "a", 2],
+          [2, "a", 2],
+          [1, "b", 3],
+          [2, "b", 100],
+          [1, "c", -101],
+          [2, "c", 2],
+          [1, "d", 42],
+          [1, "e", 42],
+          [2, "e", 42],
+          [1, "g", 3],
+          [1, "h", 150]
+        ]
+      },
+      {
+        "description": "Subquery with ROW_NUMBER window function to get all values with ROW_NUMBER < value where ORDER BY is DESC",
+        "sql": "SELECT row_number, string_col, int_col FROM (SELECT ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col DESC) AS row_number, string_col, int_col from {tbl}) WHERE row_number <= 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, "a", 42],
+          [2, "a", 42],
+          [1, "b", 100],
+          [2, "b", 3],
+          [1, "c", 150],
+          [2, "c", 3],
+          [1, "d", 42],
+          [1, "e", 42],
+          [2, "e", 42],
+          [1, "g", 3],
+          [1, "h", 150]
+        ]
+      },
+      {
+        "description": "CTE with ROW_NUMBER window function to get all values with ROW_NUMBER < value",
+        "sql": "WITH windowfunc AS (SELECT ROW_NUMBER() OVER(PARTITION BY string_col ORDER BY int_col) AS row_number, string_col, int_col from {tbl}) SELECT row_number, string_col, int_col FROM windowfunc WHERE row_number > 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [3, "a", 42],
+          [4, "a", 42],
+          [5, "a", 42],
+          [3, "c", 3],
+          [4, "c", 150]
+        ]
+      },
+      {
+        "description": "Subquery with RANK window function to get all values with RANK < value",
+        "sql": "SELECT rank, string_col, int_col FROM (SELECT RANK() OVER(PARTITION BY string_col ORDER BY int_col) AS rank, string_col, int_col from {tbl}) WHERE rank <= 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, "a", 2],
+          [1, "a", 2],
+          [1, "b", 3],
+          [2, "b", 100],
+          [1, "c", -101],
+          [2, "c", 2],
+          [1, "d", 42],
+          [1, "e", 42],
+          [1, "e", 42],
+          [1, "g", 3],
+          [1, "h", 150]
+        ]
+      },
+      {
+        "description": "Subquery with DENSE_RANK window function to get all values with RANK < value",
+        "sql": "SELECT dense_rank, string_col, int_col FROM (SELECT DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col) AS dense_rank, string_col, int_col from {tbl}) WHERE dense_rank <= 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, "a", 2],
+          [1, "a", 2],
+          [2, "a", 42],
+          [2, "a", 42],
+          [2, "a", 42],
+          [1, "b", 3],
+          [2, "b", 100],
+          [1, "c", -101],
+          [2, "c", 2],
+          [1, "d", 42],
+          [1, "e", 42],
+          [1, "e", 42],
+          [1, "g", 3],
+          [1, "h", 150]
+        ]
+      },
+      {
+        "description": "Subquery with RANK window function to get all values with RANK < value where ORDER BY is DESC",
+        "sql": "SELECT rank, string_col, int_col FROM (SELECT RANK() OVER(PARTITION BY string_col ORDER BY int_col DESC) AS rank, string_col, int_col from {tbl}) WHERE rank <= 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, "a", 42],
+          [1, "a", 42],
+          [1, "a", 42],
+          [1, "b", 100],
+          [2, "b", 3],
+          [1, "c", 150],
+          [2, "c", 3],
+          [1, "d", 42],
+          [1, "e", 42],
+          [1, "e", 42],
+          [1, "g", 3],
+          [1, "h", 150]
+        ]
+      },
+      {
+        "description": "Subquery with DENSE_RANK window function to get all values with DENSE_RANK < value where ORDER BY is DESC",
+        "sql": "SELECT dense_rank, string_col, int_col FROM (SELECT DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col DESC) AS dense_rank, string_col, int_col from {tbl}) WHERE dense_rank <= 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [1, "a", 42],
+          [1, "a", 42],
+          [1, "a", 42],
+          [2, "a", 2],
+          [2, "a", 2],
+          [1, "b", 100],
+          [2, "b", 3],
+          [1, "c", 150],
+          [2, "c", 3],
+          [1, "d", 42],
+          [1, "e", 42],
+          [1, "e", 42],
+          [1, "g", 3],
+          [1, "h", 150]
+        ]
+      },
+      {
+        "description": "CTE with RANK window function to get all values with RANK < value",
+        "sql": "WITH windowfunc AS (SELECT RANK() OVER(PARTITION BY string_col ORDER BY int_col) AS rank, string_col, int_col from {tbl}) SELECT rank, string_col, int_col FROM windowfunc WHERE rank > 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [3, "a", 42],
+          [3, "a", 42],
+          [3, "a", 42],
+          [3, "c", 3],
+          [4, "c", 150]
+        ]
+      },
+      {
+        "description": "CTE with DENSE_RANK window function to get all values with DENSE_RANK < value",
+        "sql": "WITH windowfunc AS (SELECT DENSE_RANK() OVER(PARTITION BY string_col ORDER BY int_col) AS dense_rank, string_col, int_col from {tbl}) SELECT dense_rank, string_col, int_col FROM windowfunc WHERE dense_rank > 2",
+        "comments": "Cannot enforce a global ordering as partitions aren't ordered, just keys within a partition are",
+        "keepOutputRowOrder": false,
+        "outputs": [
+          [3, "c", 3],
+          [4, "c", 150]
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pinot-query-runtime/src/test/resources/queries/WithStatements.json b/pinot-query-runtime/src/test/resources/queries/WithStatements.json
index 0a1d6ea90d3..401bf39e0bc 100644
--- a/pinot-query-runtime/src/test/resources/queries/WithStatements.json
+++ b/pinot-query-runtime/src/test/resources/queries/WithStatements.json
@@ -18,13 +18,17 @@
         "schema": [
           {"name": "strCol1", "type": "STRING"},
           {"name": "strCol2", "type": "STRING"},
-          {"name": "intCol", "type": "INT"}
+          {"name": "intCol", "type": "INT"},
+          {"name": "doubleCol", "type": "DOUBLE"},
+          {"name": "floatCol", "type": "FLOAT"},
+          {"name": "longCol", "type": "LONG"},
+          {"name": "boolCol", "type": "BOOLEAN"}
         ],
         "inputs": [
-          ["a", "foo", 1],
-          ["a", "bar", 2],
-          ["b", "alice", 42],
-          ["b", "bob", 196883]
+          ["a", "foo", 1, 100.0, 12.0, 10000, true],
+          ["a", "bar", 2, 175.12, 22.22, 300000, false],
+          ["b", "alice", 42, 175.12, 22.22, 300000, true],
+          ["b", "bob", 196883, 175.12, 22.22, 300000, true]
         ]
       }
     },
@@ -39,27 +43,85 @@
           ["b", "bob", 2]
         ]
       },
+      {
+        "description": "single 'with' with all aggregations and group by",
+        "sql": "WITH w AS (SELECT strCol, SUM(intCol) AS c1, AVG(intCol) AS c2, MIN(intCol) AS c3, MAX(intCol) AS c4, COUNT(*) as c5, COUNT(DISTINCT(intCol)) as c6  FROM {tbl1} GROUP BY strCol) SELECT strCol, strCol2, c1, c2, c3, c4, c5, c6 FROM w JOIN {tbl2} ON w.strCol = {tbl2}.strCol1",
+        "outputs": [
+          ["a", "foo", 4, 2.0, 1, 3, 2, 2],
+          ["a", "bar", 4, 2.0, 1, 3, 2, 2],
+          ["b", "alice", 2, 2.0, 2.0, 2.0, 1, 1],
+          ["b", "bob", 2, 2.0, 2.0, 2.0, 1, 1]
+        ]
+      },
       {
         "description": "multi 'with' table",
         "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, avg(intCol) AS avgVal FROM {tbl2} GROUP BY strCol1) SELECT strCol, sumVal - avgVal FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
         "outputs": [
-          ["a", 3],
-          ["b", -98460]
+          ["a", 2.5],
+          ["b", -98460.5]
+        ]
+      },
+      {
+        "description": "multi 'with' table with all aggregations on int column",
+        "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, SUM(intCol) AS c1, AVG(intCol) AS c2, MIN(intCol) AS c3, MAX(intCol) AS c4, COUNT(*) as c5, COUNT(DISTINCT(intCol)) AS c6 FROM {tbl2} GROUP BY strCol1) SELECT strCol, sumVal - c2, c1, c3, c4, c5, c6 FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
+        "outputs": [
+          ["a", 2.5, 3.0, 1, 2, 2, 2],
+          ["b", -98460.5, 196925.0, 42.0, 196883.0, 2, 2]
+        ]
+      },
+      {
+        "description": "multi 'with' table with all aggregations on double column",
+        "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, SUM(doubleCol) AS c1, AVG(doubleCol) AS c2, MIN(doubleCol) AS c3, MAX(doubleCol) AS c4, COUNT(*) as c5, COUNT(DISTINCT(doubleCol)) AS c6 FROM {tbl2} GROUP BY strCol1) SELECT strCol, sumVal - c2, c1, c3, c4, c5, c6 FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
+        "outputs": [
+          ["a", -133.56, 275.12, 100.0, 175.12, 2, 2],
+          ["b", -173.12, 350.24, 175.12, 175.12, 2, 1]
+        ]
+      },
+      {
+        "description": "multi 'with' table with all aggregations on float column",
+        "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, SUM(floatCol) AS c1, AVG(floatCol) AS c2, MIN(floatCol) AS c3, MAX(floatCol) AS c4, COUNT(*) as c5, COUNT(DISTINCT(floatCol)) AS c6 FROM {tbl2} GROUP BY strCol1) SELECT strCol, sumVal - c2, c1, c3, c4, c5, c6 FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
+        "outputs": [
+          ["a", -13.109999656677246, 34.21999931335449, 12.0, 22.219999313354492, 2, 2],
+          ["b", -20.219999313354492, 44.439998626708984, 22.219999313354492, 22.219999313354492, 2, 1]
+        ]
+      },
+      {
+        "description": "multi 'with' table with all aggregations on long column",
+        "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, SUM(longCol) AS c1, AVG(longCol) AS c2, MIN(longCol) AS c3, MAX(longCol) AS c4, COUNT(*) as c5, COUNT(DISTINCT(longCol)) AS c6 FROM {tbl2} GROUP BY strCol1) SELECT strCol, sumVal - c2, c1, c3, c4, c5, c6 FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
+        "outputs": [
+          ["a", -154996.0, 310000.0, 10000.0, 300000.0, 2, 2],
+          ["b", -299998.0, 600000.0, 300000.0, 300000.0, 2, 1]
+        ]
+      },
+      {
+        "description": "multi 'with' table with all aggregations on string column",
+        "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, COUNT(strCol2) as c1, COUNT(DISTINCT(strCol2)) AS c2 FROM {tbl2} GROUP BY strCol1) SELECT strCol, c1, c2 FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
+        "outputs": [
+          ["a", 2, 2],
+          ["b", 2, 2]
+        ]
+      },
+      {
+        "description": "multi 'with' table with all aggregations on bool column",
+        "sql": "WITH agg1 AS ( SELECT strCol, sum(intCol) AS sumVal FROM {tbl1} GROUP BY strCol), agg2 AS (SELECT strCol1, bool_and(boolCol) AS c1, bool_or(boolCol) as c2, COUNT(boolCol) as c3, COUNT(DISTINCT(boolCol)) AS c4 FROM {tbl2} GROUP BY strCol1) SELECT strCol, c1, c2, c3, c4 FROM agg1, agg2 WHERE agg1.strCol = agg2.strCol1",
+        "outputs": [
+          ["a", false, true, 2, 2],
+          ["b", true, true, 2, 1]
         ]
       },
       {
         "description": "nested 'with' on agg table: (with a as ( ... ), select ... ",
         "sql": "WITH agg1 AS (SELECT strCol1, strCol2, sum(intCol) AS sumVal FROM {tbl2} GROUP BY strCol1, strCol2) SELECT strCol1, avg(sumVal) AS avgVal FROM agg1 GROUP BY strCol1",
         "outputs": [
-          ["a", 1],
-          ["b", 98462]
+          ["a", 1.5],
+          ["b", 98462.5]
         ]
       },
       {
         "description": "nested multi 'with' table: (with a as ( ... ), with b as ( ... from a ... ) select ... ",
         "sql": "WITH agg1 AS (SELECT strCol1, strCol2, sum(intCol) AS sumVal FROM {tbl2} GROUP BY strCol1, strCol2), agg2 AS ( SELECT strCol1, avg(sumVal) AS avgVal FROM agg1 GROUP BY strCol1) SELECT strCol1, avgVal FROM agg2 WHERE avgVal < 100",
         "outputs": [
-          ["a", 1]
+          ["a", 1.5]
         ]
       },
       {
@@ -96,6 +158,61 @@
           ["b", 196883, 2]
         ]
       },
+      {
+        "description": "'with' statement using window functions using empty OVER()",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER() as sum FROM {tbl1} ) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol < 5",
+        "outputs": [
+          ["a", 3, 11],
+          ["a", 1, 11],
+          ["b", 2, 11]
+        ]
+      },
+      {
+        "description": "'with' statement using window functions using empty OVER() and empty filter on outer SELECT",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER() as sum FROM {tbl1} ) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol > 5",
+        "outputs": []
+      },
+      {
+        "description": "'with' statement using window functions using empty OVER() with filter inside inner SELECT",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER() as sum FROM {tbl1} WHERE intCol < 5) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol < 5",
+        "outputs": [
+          ["a", 3, 6],
+          ["a", 1, 6],
+          ["b", 2, 6]
+        ]
+      },
+      {
+        "description": "'with' statement using window functions using empty OVER() with empty filter inside inner SELECT",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER() as sum FROM {tbl1} WHERE intCol > 5) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol < 5",
+        "outputs": []
+      },
+      {
+        "description": "'with' statement using window functions using PARTITION BY",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER(PARTITION BY strCol) as sum FROM {tbl1} ) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol < 5",
+        "outputs": [
+          ["a", 3, 4],
+          ["a", 1, 4],
+          ["b", 2, 2]
+        ]
+      },
+      {
+        "description": "'with' statement using window functions using PARTITION BY and empty filter on outer SELECT",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER(PARTITION BY strCol) as sum FROM {tbl1} ) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol > 5",
+        "outputs": []
+      },
+      {
+        "description": "'with' statement using window functions using PARTITION BY with filter inside inner SELECT",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER(PARTITION BY strCol) as sum FROM {tbl1} WHERE intCol > 1) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol < 5",
+        "outputs": [
+          ["a", 3, 3],
+          ["b", 2, 2]
+        ]
+      },
+      {
+        "description": "'with' statement using window functions using PARTITION BY with empty filter inside inner SELECT",
+        "sql": "WITH windowfunc AS (SELECT strCol, intCol, SUM(intCol) OVER(PARTITION BY strCol) as sum FROM {tbl1} WHERE intCol > 5) SELECT a.strCol, a.intCol, a.sum FROM windowfunc AS a WHERE a.intCol < 5",
+        "outputs": []
+      },
       {
         "ignored": true,
         "comment": "materialized is not supported",
diff --git a/pinot-segment-local/pom.xml b/pinot-segment-local/pom.xml
index 6cb22fbf400..b4748d8f08d 100644
--- a/pinot-segment-local/pom.xml
+++ b/pinot-segment-local/pom.xml
@@ -106,6 +106,10 @@
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.auto.service</groupId>
+      <artifactId>auto-service</artifactId>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/DistinctCountThetaSketchValueAggregator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/DistinctCountThetaSketchValueAggregator.java
new file mode 100644
index 00000000000..6acba3ed05a
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/DistinctCountThetaSketchValueAggregator.java
@@ -0,0 +1,178 @@
+/**
+ * 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.pinot.segment.local.aggregator;
+
+import java.util.Arrays;
+import java.util.stream.StreamSupport;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.Sketches;
+import org.apache.datasketches.theta.Union;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.pinot.segment.local.utils.CustomSerDeUtils;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.utils.CommonConstants;
+
+
+public class DistinctCountThetaSketchValueAggregator implements ValueAggregator<Object, Sketch> {
+  public static final DataType AGGREGATED_VALUE_TYPE = DataType.BYTES;
+
+  private final Union _union;
+
+  // This changes a lot similar to the Bitmap aggregator
+  private int _maxByteSize;
+
+  public DistinctCountThetaSketchValueAggregator() {
+    // TODO: Handle configurable nominal entries for StarTreeBuilder
+    _union = Union.builder().setNominalEntries(CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES).buildUnion();
+  }
+
+  @Override
+  public AggregationFunctionType getAggregationType() {
+    return AggregationFunctionType.DISTINCTCOUNTTHETASKETCH;
+  }
+
+  @Override
+  public DataType getAggregatedValueType() {
+    return AGGREGATED_VALUE_TYPE;
+  }
+
+  // Utility method to create a theta sketch with one item in it
+  private Sketch singleItemSketch(Object rawValue) {
+    // TODO: Handle configurable nominal entries for StarTreeBuilder
+    UpdateSketch sketch =
+        Sketches.updateSketchBuilder().setNominalEntries(CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES)
+            .build();
+    if (rawValue instanceof String) {
+      sketch.update((String) rawValue);
+    } else if (rawValue instanceof Integer) {
+      sketch.update((Integer) rawValue);
+    } else if (rawValue instanceof Long) {
+      sketch.update((Long) rawValue);
+    } else if (rawValue instanceof Double) {
+      sketch.update((Double) rawValue);
+    } else if (rawValue instanceof Float) {
+      sketch.update((Float) rawValue);
+    } else if (rawValue instanceof Object[]) {
+      addObjectsToSketch((Object[]) rawValue, sketch);
+    } else {
+      throw new IllegalStateException(
+          "Unsupported data type for Theta Sketch aggregation: " + rawValue.getClass().getName());
+    }
+    return sketch.compact();
+  }
+
+  private void addObjectsToSketch(Object[] rawValues, UpdateSketch updateSketch) {
+    if (rawValues instanceof String[]) {
+      for (String s : (String[]) rawValues) {
+        updateSketch.update(s);
+      }
+    } else if (rawValues instanceof Integer[]) {
+      for (Integer i : (Integer[]) rawValues) {
+        updateSketch.update(i);
+      }
+    } else if (rawValues instanceof Long[]) {
+      for (Long l : (Long[]) rawValues) {
+        updateSketch.update(l);
+      }
+    } else if (rawValues instanceof Double[]) {
+      for (Double d : (Double[]) rawValues) {
+        updateSketch.update(d);
+      }
+    } else if (rawValues instanceof Float[]) {
+      for (Float f : (Float[]) rawValues) {
+        updateSketch.update(f);
+      }
+    } else {
+      throw new IllegalStateException(
+          "Unsupported data type for Theta Sketch aggregation: " + rawValues.getClass().getName());
+    }
+  }
+
+  // Utility method to merge two sketches
+  private Sketch union(Sketch left, Sketch right) {
+    return _union.union(left, right);
+  }
+
+  // Utility method to make an empty sketch
+  private Sketch empty() {
+    // TODO: Handle configurable nominal entries for StarTreeBuilder
+    return Sketches.updateSketchBuilder().setNominalEntries(CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES)
+        .build().compact();
+  }
+
+  @Override
+  public Sketch getInitialAggregatedValue(Object rawValue) {
+    Sketch initialValue;
+    if (rawValue instanceof byte[]) { // Serialized Sketch
+      byte[] bytes = (byte[]) rawValue;
+      initialValue = deserializeAggregatedValue(bytes);
+      _maxByteSize = Math.max(_maxByteSize, bytes.length);
+    } else if (rawValue instanceof byte[][]) { // Multiple Serialized Sketches
+      byte[][] serializedSketches = (byte[][]) rawValue;
+      initialValue = StreamSupport.stream(Arrays.stream(serializedSketches).spliterator(), false)
+          .map(this::deserializeAggregatedValue).reduce(this::union).orElseGet(this::empty);
+      _maxByteSize = Math.max(_maxByteSize, initialValue.getCurrentBytes());
+    } else {
+      initialValue = singleItemSketch(rawValue);
+      _maxByteSize = Math.max(_maxByteSize, initialValue.getCurrentBytes());
+    }
+    return initialValue;
+  }
+
+  @Override
+  public Sketch applyRawValue(Sketch value, Object rawValue) {
+    Sketch right;
+    if (rawValue instanceof byte[]) {
+      right = deserializeAggregatedValue((byte[]) rawValue);
+    } else {
+      right = singleItemSketch(rawValue);
+    }
+    Sketch result = union(value, right).compact();
+    _maxByteSize = Math.max(_maxByteSize, result.getCurrentBytes());
+    return result;
+  }
+
+  @Override
+  public Sketch applyAggregatedValue(Sketch value, Sketch aggregatedValue) {
+    Sketch result = union(value, aggregatedValue);
+    _maxByteSize = Math.max(_maxByteSize, result.getCurrentBytes());
+    return result;
+  }
+
+  @Override
+  public Sketch cloneAggregatedValue(Sketch value) {
+    return deserializeAggregatedValue(serializeAggregatedValue(value));
+  }
+
+  @Override
+  public int getMaxAggregatedValueByteSize() {
+    return _maxByteSize;
+  }
+
+  @Override
+  public byte[] serializeAggregatedValue(Sketch value) {
+    return CustomSerDeUtils.DATA_SKETCH_SER_DE.serialize(value);
+  }
+
+  @Override
+  public Sketch deserializeAggregatedValue(byte[] bytes) {
+    return CustomSerDeUtils.DATA_SKETCH_SER_DE.deserialize(bytes);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/IntegerTupleSketchValueAggregator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/IntegerTupleSketchValueAggregator.java
new file mode 100644
index 00000000000..1440e738d1d
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/IntegerTupleSketchValueAggregator.java
@@ -0,0 +1,99 @@
+/**
+ * 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.pinot.segment.local.aggregator;
+
+import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.Union;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.pinot.segment.local.utils.CustomSerDeUtils;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.spi.data.FieldSpec.DataType;
+
+
+public class IntegerTupleSketchValueAggregator implements ValueAggregator<byte[], Sketch<IntegerSummary>> {
+  public static final DataType AGGREGATED_VALUE_TYPE = DataType.BYTES;
+
+  // This changes a lot similar to the Bitmap aggregator
+  private int _maxByteSize;
+
+  private final IntegerSummary.Mode _mode;
+
+  public IntegerTupleSketchValueAggregator(IntegerSummary.Mode mode) {
+    _mode = mode;
+  }
+
+  @Override
+  public AggregationFunctionType getAggregationType() {
+    return AggregationFunctionType.DISTINCTCOUNTTUPLESKETCH;
+  }
+
+  @Override
+  public DataType getAggregatedValueType() {
+    return AGGREGATED_VALUE_TYPE;
+  }
+
+  // Utility method to merge two sketches
+  private Sketch<IntegerSummary> union(Sketch<IntegerSummary> a, Sketch<IntegerSummary> b) {
+    return new Union<>(new IntegerSummarySetOperations(_mode, _mode)).union(a, b);
+  }
+
+  @Override
+  public Sketch<IntegerSummary> getInitialAggregatedValue(byte[] rawValue) {
+    Sketch<IntegerSummary> initialValue = deserializeAggregatedValue(rawValue);
+    _maxByteSize = Math.max(_maxByteSize, rawValue.length);
+    return initialValue;
+  }
+
+  @Override
+  public Sketch<IntegerSummary> applyRawValue(Sketch<IntegerSummary> value, byte[] rawValue) {
+    Sketch<IntegerSummary> right = deserializeAggregatedValue(rawValue);
+    Sketch<IntegerSummary> result = union(value, right).compact();
+    _maxByteSize = Math.max(_maxByteSize, result.toByteArray().length);
+    return result;
+  }
+
+  @Override
+  public Sketch<IntegerSummary> applyAggregatedValue(Sketch<IntegerSummary> value,
+      Sketch<IntegerSummary> aggregatedValue) {
+    Sketch<IntegerSummary> result = union(value, aggregatedValue);
+    _maxByteSize = Math.max(_maxByteSize, result.toByteArray().length);
+    return result;
+  }
+
+  @Override
+  public Sketch<IntegerSummary> cloneAggregatedValue(Sketch<IntegerSummary> value) {
+    return deserializeAggregatedValue(serializeAggregatedValue(value));
+  }
+
+  @Override
+  public int getMaxAggregatedValueByteSize() {
+    return _maxByteSize;
+  }
+
+  @Override
+  public byte[] serializeAggregatedValue(Sketch<IntegerSummary> value) {
+    return CustomSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.serialize(value);
+  }
+
+  @Override
+  public Sketch<IntegerSummary> deserializeAggregatedValue(byte[] bytes) {
+    return CustomSerDeUtils.DATA_SKETCH_INT_TUPLE_SER_DE.deserialize(bytes);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/ValueAggregatorFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/ValueAggregatorFactory.java
index 092a2858040..b4f90c4952d 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/ValueAggregatorFactory.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/aggregator/ValueAggregatorFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.segment.local.aggregator;
 
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
@@ -63,6 +64,14 @@ public static ValueAggregator getValueAggregator(AggregationFunctionType aggrega
       case PERCENTILETDIGEST:
       case PERCENTILERAWTDIGEST:
         return new PercentileTDigestValueAggregator();
+      case DISTINCTCOUNTTHETASKETCH:
+      case DISTINCTCOUNTRAWTHETASKETCH:
+        return new DistinctCountThetaSketchValueAggregator();
+      case DISTINCTCOUNTTUPLESKETCH:
+      case DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH:
+      case AVGVALUEINTEGERSUMTUPLESKETCH:
+      case SUMVALUESINTEGERSUMTUPLESKETCH:
+        return new IntegerTupleSketchValueAggregator(IntegerSummary.Mode.Sum);
       default:
         throw new IllegalStateException("Unsupported aggregation type: " + aggregationType);
     }
@@ -101,6 +110,14 @@ public static DataType getAggregatedValueType(AggregationFunctionType aggregatio
       case PERCENTILETDIGEST:
       case PERCENTILERAWTDIGEST:
         return PercentileTDigestValueAggregator.AGGREGATED_VALUE_TYPE;
+      case DISTINCTCOUNTTHETASKETCH:
+      case DISTINCTCOUNTRAWTHETASKETCH:
+        return DistinctCountThetaSketchValueAggregator.AGGREGATED_VALUE_TYPE;
+      case DISTINCTCOUNTTUPLESKETCH:
+      case DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH:
+      case AVGVALUEINTEGERSUMTUPLESKETCH:
+      case SUMVALUESINTEGERSUMTUPLESKETCH:
+        return IntegerTupleSketchValueAggregator.AGGREGATED_VALUE_TYPE;
       default:
         throw new IllegalStateException("Unsupported aggregation type: " + aggregationType);
     }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/customobject/SerializedKLL.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/customobject/SerializedKLL.java
new file mode 100644
index 00000000000..f31f7a198d7
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/customobject/SerializedKLL.java
@@ -0,0 +1,49 @@
+/**
+ * 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.pinot.segment.local.customobject;
+
+import java.util.Base64;
+import org.apache.datasketches.kll.KllDoublesSketch;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+/**
+ * Serialized and comparable version of KllDoublesSketch.
+ * Compares two sketches for a specific percentile value.
+ */
+public class SerializedKLL implements Comparable<SerializedKLL> {
+  private final double _quantile;
+  private final KllDoublesSketch _sketch;
+
+  public SerializedKLL(KllDoublesSketch sketch, double percentile) {
+    _sketch = sketch;
+    _quantile = percentile / 100.0;
+  }
+
+  @Override
+  public int compareTo(SerializedKLL other) {
+    checkArgument(other._quantile == _quantile, "Quantile numbers don't match");
+    return Double.compare(_sketch.getQuantile(_quantile), other._sketch.getQuantile(_quantile));
+  }
+
+  @Override
+  public String toString() {
+    return Base64.getEncoder().encodeToString(_sketch.toByteArray());
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/SegmentDataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/SegmentDataManager.java
index 46933a83563..2e1dae8d1f2 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/SegmentDataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/SegmentDataManager.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.segment.local.data.manager;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.pinot.segment.spi.IndexSegment;
 
 
@@ -27,6 +28,7 @@
  */
 public abstract class SegmentDataManager {
   private final long _loadTimeMs = System.currentTimeMillis();
+  private final AtomicBoolean _destroyed = new AtomicBoolean();
   private int _referenceCount = 1;
 
   public long getLoadTimeMs() {
@@ -71,5 +73,15 @@ public synchronized boolean decreaseReferenceCount() {
 
   public abstract IndexSegment getSegment();
 
-  public abstract void destroy();
+  /**
+   * Destroys the data manager and releases all the resources allocated.
+   * The data manager can only be destroyed once.
+   */
+  public void destroy() {
+    if (_destroyed.compareAndSet(false, true)) {
+      doDestroy();
+    }
+  }
+
+  protected abstract void doDestroy();
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java
index 121e47f6f65..45965f4bc4d 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/data/manager/TableDataManager.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import org.apache.commons.lang3.tuple.Pair;
@@ -34,6 +35,7 @@
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.SegmentMetadata;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
 
 
@@ -48,7 +50,9 @@ public interface TableDataManager {
    */
   void init(TableDataManagerConfig tableDataManagerConfig, String instanceId,
       ZkHelixPropertyStore<ZNRecord> propertyStore, ServerMetrics serverMetrics, HelixManager helixManager,
-      LoadingCache<Pair<String, String>, SegmentErrorInfo> errorCache, TableDataManagerParams tableDataManagerParams);
+      @Nullable ExecutorService segmentPreloadExecutor,
+      @Nullable LoadingCache<Pair<String, String>, SegmentErrorInfo> errorCache,
+      TableDataManagerParams tableDataManagerParams);
 
   /**
    * Starts the table data manager. Should be called only once after table data manager gets initialized but before
@@ -62,6 +66,8 @@ void init(TableDataManagerConfig tableDataManagerConfig, String instanceId,
    */
   void shutDown();
 
+  boolean isShutDown();
+
   /**
    * Adds a loaded immutable segment into the table.
    */
@@ -124,6 +130,21 @@ void addOrReplaceSegment(String segmentName, IndexLoadingConfig indexLoadingConf
    */
   void removeSegment(String segmentName);
 
+  /**
+   * Try to load a segment from an existing segment directory managed by the server. The segment loading may fail
+   * because the directory may not exist any more, or the segment data has a different crc now, or the existing segment
+   * data got corrupted etc.
+   *
+   * @return true if the segment is loaded successfully from the existing segment directory; false otherwise.
+   */
+  boolean tryLoadExistingSegment(String segmentName, IndexLoadingConfig indexLoadingConfig,
+      SegmentZKMetadata zkMetadata);
+
+  /**
+   * Get the segment data directory, considering the segment tier if provided.
+   */
+  File getSegmentDataDir(String segmentName, @Nullable String segmentTier, TableConfig tableConfig);
+
   /**
    * Returns true if the segment was deleted in the last few minutes.
    */
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BaseTableDedupMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BaseTableDedupMetadataManager.java
new file mode 100644
index 00000000000..d9045b45831
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BaseTableDedupMetadataManager.java
@@ -0,0 +1,65 @@
+/**
+ * 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.pinot.segment.local.dedup;
+
+import com.google.common.base.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import org.apache.pinot.spi.config.table.DedupConfig;
+import org.apache.pinot.spi.config.table.HashFunction;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+abstract class BaseTableDedupMetadataManager implements TableDedupMetadataManager {
+  protected final Map<Integer, PartitionDedupMetadataManager> _partitionMetadataManagerMap = new ConcurrentHashMap<>();
+  protected String _tableNameWithType;
+  protected List<String> _primaryKeyColumns;
+  protected ServerMetrics _serverMetrics;
+  protected HashFunction _hashFunction;
+
+  @Override
+  public void init(TableConfig tableConfig, Schema schema, TableDataManager tableDataManager,
+      ServerMetrics serverMetrics) {
+    _tableNameWithType = tableConfig.getTableName();
+
+    _primaryKeyColumns = schema.getPrimaryKeyColumns();
+    Preconditions.checkArgument(!CollectionUtils.isEmpty(_primaryKeyColumns),
+        "Primary key columns must be configured for dedup enabled table: %s", _tableNameWithType);
+
+    _serverMetrics = serverMetrics;
+
+    DedupConfig dedupConfig = tableConfig.getDedupConfig();
+    Preconditions.checkArgument(dedupConfig != null, "Dedup must be enabled for table: %s", _tableNameWithType);
+    _hashFunction = dedupConfig.getHashFunction();
+  }
+
+  public PartitionDedupMetadataManager getOrCreatePartitionManager(int partitionId) {
+    return _partitionMetadataManagerMap.computeIfAbsent(partitionId, this::createPartitionDedupMetadataManager);
+  }
+
+  /**
+   * Create PartitionDedupMetadataManager for given partition id.
+   */
+  abstract protected PartitionDedupMetadataManager createPartitionDedupMetadataManager(Integer partitionId);
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/ConcurrentMapPartitionDedupMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/ConcurrentMapPartitionDedupMetadataManager.java
new file mode 100644
index 00000000000..a8925e2200e
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/ConcurrentMapPartitionDedupMetadataManager.java
@@ -0,0 +1,124 @@
+/**
+ * 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.pinot.segment.local.dedup;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.pinot.common.metrics.ServerGauge;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
+import org.apache.pinot.segment.local.utils.HashUtils;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.spi.config.table.HashFunction;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+import org.apache.pinot.spi.utils.ByteArray;
+
+class ConcurrentMapPartitionDedupMetadataManager implements PartitionDedupMetadataManager {
+  private final String _tableNameWithType;
+  private final List<String> _primaryKeyColumns;
+  private final int _partitionId;
+  private final ServerMetrics _serverMetrics;
+  private final HashFunction _hashFunction;
+
+  @VisibleForTesting
+  final ConcurrentHashMap<Object, IndexSegment> _primaryKeyToSegmentMap = new ConcurrentHashMap<>();
+
+  public ConcurrentMapPartitionDedupMetadataManager(String tableNameWithType, List<String> primaryKeyColumns,
+      int partitionId, ServerMetrics serverMetrics, HashFunction hashFunction) {
+    _tableNameWithType = tableNameWithType;
+    _primaryKeyColumns = primaryKeyColumns;
+    _partitionId = partitionId;
+    _serverMetrics = serverMetrics;
+    _hashFunction = hashFunction;
+  }
+
+  public void addSegment(IndexSegment segment) {
+    // Add all PKs to _primaryKeyToSegmentMap
+    Iterator<PrimaryKey> primaryKeyIterator = getPrimaryKeyIterator(segment);
+    while (primaryKeyIterator.hasNext()) {
+      PrimaryKey pk = primaryKeyIterator.next();
+      _primaryKeyToSegmentMap.put(HashUtils.hashPrimaryKey(pk, _hashFunction), segment);
+    }
+    _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.DEDUP_PRIMARY_KEYS_COUNT,
+        _primaryKeyToSegmentMap.size());
+  }
+
+  public void removeSegment(IndexSegment segment) {
+    // TODO(saurabh): Explain reload scenario here
+    Iterator<PrimaryKey> primaryKeyIterator = getPrimaryKeyIterator(segment);
+    while (primaryKeyIterator.hasNext()) {
+      PrimaryKey pk = primaryKeyIterator.next();
+      _primaryKeyToSegmentMap.compute(HashUtils.hashPrimaryKey(pk, _hashFunction), (primaryKey, currentSegment) -> {
+        if (currentSegment == segment) {
+          return null;
+        } else {
+          return currentSegment;
+        }
+      });
+    }
+    _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.DEDUP_PRIMARY_KEYS_COUNT,
+        _primaryKeyToSegmentMap.size());
+  }
+
+  @VisibleForTesting
+  Iterator<PrimaryKey> getPrimaryKeyIterator(IndexSegment segment) {
+    Map<String, PinotSegmentColumnReader> columnToReaderMap = new HashMap<>();
+    for (String primaryKeyColumn : _primaryKeyColumns) {
+      columnToReaderMap.put(primaryKeyColumn, new PinotSegmentColumnReader(segment, primaryKeyColumn));
+    }
+    int numTotalDocs = segment.getSegmentMetadata().getTotalDocs();
+    int numPrimaryKeyColumns = _primaryKeyColumns.size();
+    return new Iterator<PrimaryKey>() {
+      private int _docId = 0;
+
+      @Override
+      public boolean hasNext() {
+        return _docId < numTotalDocs;
+      }
+
+      @Override
+      public PrimaryKey next() {
+        Object[] values = new Object[numPrimaryKeyColumns];
+        for (int i = 0; i < numPrimaryKeyColumns; i++) {
+          Object value = columnToReaderMap.get(_primaryKeyColumns.get(i)).getValue(_docId);
+          if (value instanceof byte[]) {
+            value = new ByteArray((byte[]) value);
+          }
+          values[i] = value;
+        }
+        _docId++;
+        return new PrimaryKey(values);
+      }
+    };
+  }
+
+  public boolean checkRecordPresentOrUpdate(PrimaryKey pk, IndexSegment indexSegment) {
+    boolean present =
+        _primaryKeyToSegmentMap.putIfAbsent(HashUtils.hashPrimaryKey(pk, _hashFunction), indexSegment) != null;
+    if (!present) {
+      _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.DEDUP_PRIMARY_KEYS_COUNT,
+          _primaryKeyToSegmentMap.size());
+    }
+    return present;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/ConcurrentMapTableDedupMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/ConcurrentMapTableDedupMetadataManager.java
new file mode 100644
index 00000000000..0f3de3aa966
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/ConcurrentMapTableDedupMetadataManager.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.local.dedup;
+
+class ConcurrentMapTableDedupMetadataManager extends BaseTableDedupMetadataManager {
+
+  protected PartitionDedupMetadataManager createPartitionDedupMetadataManager(Integer partitionId) {
+    return new ConcurrentMapPartitionDedupMetadataManager(_tableNameWithType, _primaryKeyColumns, partitionId,
+        _serverMetrics, _hashFunction);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
index 258aad7a5dd..82dfc9d5ed3 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
@@ -18,108 +18,24 @@
  */
 package org.apache.pinot.segment.local.dedup;
 
-import com.google.common.annotations.VisibleForTesting;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.apache.pinot.common.metrics.ServerGauge;
-import org.apache.pinot.common.metrics.ServerMetrics;
-import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
-import org.apache.pinot.segment.local.utils.HashUtils;
 import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.spi.config.table.HashFunction;
 import org.apache.pinot.spi.data.readers.PrimaryKey;
-import org.apache.pinot.spi.utils.ByteArray;
 
 
-public class PartitionDedupMetadataManager {
-  private final String _tableNameWithType;
-  private final List<String> _primaryKeyColumns;
-  private final int _partitionId;
-  private final ServerMetrics _serverMetrics;
-  private final HashFunction _hashFunction;
+public interface PartitionDedupMetadataManager {
+  /**
+   * Initializes the dedup metadata for the given immutable segment.
+   */
+  public void addSegment(IndexSegment segment);
 
-  @VisibleForTesting
-  final ConcurrentHashMap<Object, IndexSegment> _primaryKeyToSegmentMap = new ConcurrentHashMap<>();
+  /**
+   * Removes the dedup metadata for the given segment.
+   */
+  public void removeSegment(IndexSegment segment);
 
-  public PartitionDedupMetadataManager(String tableNameWithType, List<String> primaryKeyColumns, int partitionId,
-      ServerMetrics serverMetrics, HashFunction hashFunction) {
-    _tableNameWithType = tableNameWithType;
-    _primaryKeyColumns = primaryKeyColumns;
-    _partitionId = partitionId;
-    _serverMetrics = serverMetrics;
-    _hashFunction = hashFunction;
-  }
-
-  public void addSegment(IndexSegment segment) {
-    // Add all PKs to _primaryKeyToSegmentMap
-    Iterator<PrimaryKey> primaryKeyIterator = getPrimaryKeyIterator(segment);
-    while (primaryKeyIterator.hasNext()) {
-      PrimaryKey pk = primaryKeyIterator.next();
-      _primaryKeyToSegmentMap.put(HashUtils.hashPrimaryKey(pk, _hashFunction), segment);
-    }
-    _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.DEDUP_PRIMARY_KEYS_COUNT,
-        _primaryKeyToSegmentMap.size());
-  }
-
-  public void removeSegment(IndexSegment segment) {
-    // TODO(saurabh): Explain reload scenario here
-    Iterator<PrimaryKey> primaryKeyIterator = getPrimaryKeyIterator(segment);
-    while (primaryKeyIterator.hasNext()) {
-      PrimaryKey pk = primaryKeyIterator.next();
-      _primaryKeyToSegmentMap.compute(HashUtils.hashPrimaryKey(pk, _hashFunction), (primaryKey, currentSegment) -> {
-        if (currentSegment == segment) {
-          return null;
-        } else {
-          return currentSegment;
-        }
-      });
-    }
-    _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.DEDUP_PRIMARY_KEYS_COUNT,
-        _primaryKeyToSegmentMap.size());
-  }
-
-  @VisibleForTesting
-  Iterator<PrimaryKey> getPrimaryKeyIterator(IndexSegment segment) {
-    Map<String, PinotSegmentColumnReader> columnToReaderMap = new HashMap<>();
-    for (String primaryKeyColumn : _primaryKeyColumns) {
-      columnToReaderMap.put(primaryKeyColumn, new PinotSegmentColumnReader(segment, primaryKeyColumn));
-    }
-    int numTotalDocs = segment.getSegmentMetadata().getTotalDocs();
-    int numPrimaryKeyColumns = _primaryKeyColumns.size();
-    return new Iterator<PrimaryKey>() {
-      private int _docId = 0;
-
-      @Override
-      public boolean hasNext() {
-        return _docId < numTotalDocs;
-      }
-
-      @Override
-      public PrimaryKey next() {
-        Object[] values = new Object[numPrimaryKeyColumns];
-        for (int i = 0; i < numPrimaryKeyColumns; i++) {
-          Object value = columnToReaderMap.get(_primaryKeyColumns.get(i)).getValue(_docId);
-          if (value instanceof byte[]) {
-            value = new ByteArray((byte[]) value);
-          }
-          values[i] = value;
-        }
-        _docId++;
-        return new PrimaryKey(values);
-      }
-    };
-  }
-
-  public boolean checkRecordPresentOrUpdate(PrimaryKey pk, IndexSegment indexSegment) {
-    boolean present =
-        _primaryKeyToSegmentMap.putIfAbsent(HashUtils.hashPrimaryKey(pk, _hashFunction), indexSegment) != null;
-    if (!present) {
-      _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.DEDUP_PRIMARY_KEYS_COUNT,
-          _primaryKeyToSegmentMap.size());
-    }
-    return present;
-  }
+  /**
+   * Add the primary key to the given segment to the dedup matadata if it was absent.
+   * Returns true if the key was already present.
+   */
+  boolean checkRecordPresentOrUpdate(PrimaryKey pk, IndexSegment indexSegment);
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManager.java
index dedcebfff0e..aa900f75db0 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManager.java
@@ -18,31 +18,20 @@
  */
 package org.apache.pinot.segment.local.dedup;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import org.apache.pinot.common.metrics.ServerMetrics;
-import org.apache.pinot.spi.config.table.HashFunction;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
 
 
-public class TableDedupMetadataManager {
-  private final Map<Integer, PartitionDedupMetadataManager> _partitionMetadataManagerMap = new ConcurrentHashMap<>();
-  private final String _tableNameWithType;
-  private final List<String> _primaryKeyColumns;
-  private final ServerMetrics _serverMetrics;
-  private final HashFunction _hashFunction;
+public interface TableDedupMetadataManager {
+  /**
+   * Initialize TableDedupMetadataManager.
+   */
+  void init(TableConfig tableConfig, Schema schema, TableDataManager tableDataManager, ServerMetrics serverMetrics);
 
-  public TableDedupMetadataManager(String tableNameWithType, List<String> primaryKeyColumns,
-      ServerMetrics serverMetrics, HashFunction hashFunction) {
-    _tableNameWithType = tableNameWithType;
-    _primaryKeyColumns = primaryKeyColumns;
-    _serverMetrics = serverMetrics;
-    _hashFunction = hashFunction;
-  }
-
-  public PartitionDedupMetadataManager getOrCreatePartitionManager(int partitionId) {
-    return _partitionMetadataManagerMap.computeIfAbsent(partitionId,
-        k -> new PartitionDedupMetadataManager(_tableNameWithType, _primaryKeyColumns, k, _serverMetrics,
-            _hashFunction));
-  }
+  /**
+   * Create a new PartitionDedupMetadataManager if not present already, otherwise return existing one.
+   */
+  PartitionDedupMetadataManager getOrCreatePartitionManager(int partitionId);
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManagerFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManagerFactory.java
new file mode 100644
index 00000000000..7f1aa2d42d0
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/TableDedupMetadataManagerFactory.java
@@ -0,0 +1,65 @@
+/**
+ * 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.pinot.segment.local.dedup;
+
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import org.apache.pinot.spi.config.table.DedupConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class TableDedupMetadataManagerFactory {
+  private TableDedupMetadataManagerFactory() {
+  }
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(TableDedupMetadataManagerFactory.class);
+
+  public static TableDedupMetadataManager create(TableConfig tableConfig, Schema schema,
+      TableDataManager tableDataManager, ServerMetrics serverMetrics) {
+    String tableNameWithType = tableConfig.getTableName();
+    DedupConfig dedupConfig = tableConfig.getDedupConfig();
+    Preconditions.checkArgument(dedupConfig != null, "Must provide dedup config for table: %s", tableNameWithType);
+
+    TableDedupMetadataManager metadataManager;
+    String metadataManagerClass = dedupConfig.getMetadataManagerClass();
+    if (StringUtils.isNotEmpty(metadataManagerClass)) {
+      LOGGER.info("Creating TableDedupMetadataManager with class: {} for table: {}", metadataManagerClass,
+          tableNameWithType);
+      try {
+        metadataManager =
+            (TableDedupMetadataManager) Class.forName(metadataManagerClass).getConstructor().newInstance();
+      } catch (Exception e) {
+        throw new RuntimeException(
+            String.format("Caught exception while constructing TableDedupMetadataManager with class: %s for table: %s",
+                metadataManagerClass, tableNameWithType), e);
+      }
+    } else {
+      LOGGER.info("Creating ConcurrentMapTableDedupMetadataManager for table: {}", tableNameWithType);
+      metadataManager = new ConcurrentMapTableDedupMetadataManager();
+    }
+
+    metadataManager.init(tableConfig, schema, tableDataManager, serverMetrics);
+    return metadataManager;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/function/InbuiltFunctionEvaluator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/function/InbuiltFunctionEvaluator.java
index 2399fdefe72..df896d2c006 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/function/InbuiltFunctionEvaluator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/function/InbuiltFunctionEvaluator.java
@@ -55,7 +55,7 @@ private ExecutableNode planExecution(ExpressionContext expression) {
     switch (expression.getType()) {
       case LITERAL:
         // TODO: pass literal with type into ConstantExecutionNode.
-        return new ConstantExecutionNode(expression.getLiteralString());
+        return new ConstantExecutionNode(expression.getLiteral().getStringValue());
       case IDENTIFIER:
         String columnName = expression.getIdentifier();
         ColumnExecutionNode columnExecutionNode = new ColumnExecutionNode(columnName, _arguments.size());
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/EmptyIndexSegment.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/EmptyIndexSegment.java
index 742a417a3ea..681e93a0e01 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/EmptyIndexSegment.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/EmptyIndexSegment.java
@@ -26,6 +26,8 @@
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
@@ -89,6 +91,12 @@ public ThreadSafeMutableRoaringBitmap getValidDocIds() {
     return null;
   }
 
+  @Nullable
+  @Override
+  public ThreadSafeMutableRoaringBitmap getQueryableDocIds() {
+    return null;
+  }
+
   @Override
   public GenericRow getRecord(int docId, GenericRow reuse) {
     throw new UnsupportedOperationException("Cannot read record from empty segment");
@@ -99,6 +107,11 @@ public Object getValue(int docId, String column) {
     throw new UnsupportedOperationException("Cannot read value from empty segment");
   }
 
+  @Override
+  public <I extends IndexReader> I getIndex(String column, IndexType<?, I, ?> type) {
+    return null;
+  }
+
   @Override
   public Dictionary getDictionary(String column) {
     return null;
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImpl.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImpl.java
index b92097641b9..dcf9d653625 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImpl.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImpl.java
@@ -42,6 +42,9 @@
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
@@ -73,6 +76,7 @@ public class ImmutableSegmentImpl implements ImmutableSegment {
   // For upsert
   private PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
   private ThreadSafeMutableRoaringBitmap _validDocIds;
+  private ThreadSafeMutableRoaringBitmap _queryableDocIds;
 
   public ImmutableSegmentImpl(SegmentDirectory segmentDirectory, SegmentMetadataImpl segmentMetadata,
       Map<String, ColumnIndexContainer> columnIndexContainerMap,
@@ -97,9 +101,10 @@ public void enableDedup(PartitionDedupMetadataManager partitionDedupMetadataMana
    * Enables upsert for this segment. It should be called before the segment getting queried.
    */
   public void enableUpsert(PartitionUpsertMetadataManager partitionUpsertMetadataManager,
-      ThreadSafeMutableRoaringBitmap validDocIds) {
+      ThreadSafeMutableRoaringBitmap validDocIds, @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds) {
     _partitionUpsertMetadataManager = partitionUpsertMetadataManager;
     _validDocIds = validDocIds;
+    _queryableDocIds = queryableDocIds;
   }
 
   @Nullable
@@ -120,7 +125,7 @@ public MutableRoaringBitmap loadValidDocIdsFromSnapshot() {
     return null;
   }
 
-  public void persistValidDocIdsSnapshot(MutableRoaringBitmap validDocIds) {
+  public void persistValidDocIdsSnapshot() {
     File validDocIdsSnapshotFile = getValidDocIdsSnapshotFile();
     try {
       if (validDocIdsSnapshotFile.exists()) {
@@ -129,14 +134,15 @@ public void persistValidDocIdsSnapshot(MutableRoaringBitmap validDocIds) {
           return;
         }
       }
+      MutableRoaringBitmap validDocIdsSnapshot = _validDocIds.getMutableRoaringBitmap();
       try (DataOutputStream dataOutputStream = new DataOutputStream(new FileOutputStream(validDocIdsSnapshotFile))) {
-        validDocIds.serialize(dataOutputStream);
+        validDocIdsSnapshot.serialize(dataOutputStream);
       }
       LOGGER.info("Persisted valid doc ids for segment: {} with: {} valid docs", getSegmentName(),
-          validDocIds.getCardinality());
+          validDocIdsSnapshot.getCardinality());
     } catch (Exception e) {
       LOGGER.warn("Caught exception while persisting valid doc ids to snapshot file: {}, skipping",
-          validDocIdsSnapshotFile);
+          validDocIdsSnapshotFile, e);
     }
   }
 
@@ -162,22 +168,27 @@ private File getValidDocIdsSnapshotFile() {
   }
 
   @Override
-  public Dictionary getDictionary(String column) {
+  public <I extends IndexReader> I getIndex(String column, IndexType<?, I, ?> type) {
     ColumnIndexContainer container = _indexContainerMap.get(column);
     if (container == null) {
       throw new NullPointerException("Invalid column: " + column);
     }
-    return container.getDictionary();
+    return type.getIndexReader(container);
+  }
+
+  @Override
+  public Dictionary getDictionary(String column) {
+    return getIndex(column, StandardIndexes.dictionary());
   }
 
   @Override
   public ForwardIndexReader getForwardIndex(String column) {
-    return _indexContainerMap.get(column).getForwardIndex();
+    return getIndex(column, StandardIndexes.forward());
   }
 
   @Override
   public InvertedIndexReader getInvertedIndex(String column) {
-    return _indexContainerMap.get(column).getInvertedIndex();
+    return getIndex(column, StandardIndexes.inverted());
   }
 
   @Override
@@ -247,7 +258,14 @@ public void destroy() {
     if (_partitionDedupMetadataManager != null) {
       _partitionDedupMetadataManager.removeSegment(this);
     }
-
+    // StarTreeIndexContainer refers to other column index containers, so close it firstly.
+    if (_starTreeIndexContainer != null) {
+      try {
+        _starTreeIndexContainer.close();
+      } catch (IOException e) {
+        LOGGER.error("Failed to close star-tree. Continuing with error.", e);
+      }
+    }
     for (Map.Entry<String, ColumnIndexContainer> entry : _indexContainerMap.entrySet()) {
       try {
         entry.getValue().close();
@@ -260,13 +278,6 @@ public void destroy() {
     } catch (Exception e) {
       LOGGER.error("Failed to close segment directory: {}. Continuing with error.", _segmentDirectory, e);
     }
-    if (_starTreeIndexContainer != null) {
-      try {
-        _starTreeIndexContainer.close();
-      } catch (IOException e) {
-        LOGGER.error("Failed to close star-tree. Continuing with error.", e);
-      }
-    }
   }
 
   @Override
@@ -280,6 +291,12 @@ public ThreadSafeMutableRoaringBitmap getValidDocIds() {
     return _validDocIds;
   }
 
+  @Nullable
+  @Override
+  public ThreadSafeMutableRoaringBitmap getQueryableDocIds() {
+    return _queryableDocIds;
+  }
+
   @Override
   public GenericRow getRecord(int docId, GenericRow reuse) {
     try (PinotSegmentRecordReader recordReader = new PinotSegmentRecordReader()) {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentLoader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentLoader.java
index fbe87f94bc6..b8c5366d27b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentLoader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentLoader.java
@@ -38,7 +38,6 @@
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.converter.SegmentFormatConverter;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
 import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoader;
@@ -166,6 +165,8 @@ public static ImmutableSegment load(SegmentDirectory segmentDirectory, IndexLoad
           segmentMetadata.removeColumn(column);
         }
       }
+    } else {
+      indexLoadingConfig.addKnownColumns(columnMetadataMap.keySet());
     }
 
     URI indexDirURI = segmentDirectory.getIndexDir();
@@ -180,8 +181,7 @@ public static ImmutableSegment load(SegmentDirectory segmentDirectory, IndexLoad
     for (Map.Entry<String, ColumnMetadata> entry : columnMetadataMap.entrySet()) {
       // FIXME: text-index only works with local SegmentDirectory
       indexContainerMap.put(entry.getKey(),
-          new PhysicalColumnIndexContainer(segmentReader, entry.getValue(), indexLoadingConfig, localIndexDir,
-              IndexingOverrides.getIndexReaderProvider()));
+          new PhysicalColumnIndexContainer(segmentReader, entry.getValue(), indexLoadingConfig));
     }
 
     // Instantiate virtual columns
@@ -200,7 +200,7 @@ public static ImmutableSegment load(SegmentDirectory segmentDirectory, IndexLoad
 
     // Load star-tree index if it exists
     StarTreeIndexContainer starTreeIndexContainer = null;
-    if (segmentMetadata.getStarTreeV2MetadataList() != null && segmentReader.getStarTreeIndex() != null) {
+    if (segmentReader.hasStarTreeIndex()) {
       starTreeIndexContainer = new StarTreeIndexContainer(segmentReader, segmentMetadata, indexContainerMap);
     }
 
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/DefaultMutableIndexProvider.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/DefaultMutableIndexProvider.java
deleted file mode 100644
index 820c878c4e8..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/DefaultMutableIndexProvider.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.indexsegment.mutable;
-
-import org.apache.pinot.segment.local.realtime.impl.dictionary.MutableDictionaryFactory;
-import org.apache.pinot.segment.local.realtime.impl.forward.FixedByteMVMutableForwardIndex;
-import org.apache.pinot.segment.local.realtime.impl.forward.FixedByteSVMutableForwardIndex;
-import org.apache.pinot.segment.local.realtime.impl.forward.VarByteSVMutableForwardIndex;
-import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeInvertedIndex;
-import org.apache.pinot.segment.local.realtime.impl.json.MutableJsonIndexImpl;
-import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
-import org.apache.pinot.segment.spi.index.mutable.MutableForwardIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableInvertedIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableJsonIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableTextIndex;
-import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
-import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexProvider;
-import org.apache.pinot.spi.data.FieldSpec;
-
-import static org.apache.pinot.spi.data.FieldSpec.DataType.INT;
-
-
-public class DefaultMutableIndexProvider implements MutableIndexProvider {
-  // For multi-valued column, forward-index.
-  // Maximum number of multi-values per row. We assert on this.
-  private static final int MAX_MULTI_VALUES_PER_ROW = 1000;
-  private static final int NODICT_VARIABLE_WIDTH_ESTIMATED_AVERAGE_VALUE_LENGTH_DEFAULT = 100;
-  private static final int NODICT_VARIABLE_WIDTH_ESTIMATED_NUMBER_OF_VALUES_DEFAULT = 100_000;
-
-  @Override
-  public MutableForwardIndex newForwardIndex(MutableIndexContext.Forward context) {
-    String column = context.getFieldSpec().getName();
-    String segmentName = context.getSegmentName();
-    FieldSpec.DataType storedType = context.getFieldSpec().getDataType().getStoredType();
-    boolean isSingleValue = context.getFieldSpec().isSingleValueField();
-    if (!context.hasDictionary()) {
-      if (isSingleValue) {
-        String allocationContext =
-            buildAllocationContext(context.getSegmentName(), context.getFieldSpec().getName(),
-                V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION);
-        if (storedType.isFixedWidth()) {
-          return new FixedByteSVMutableForwardIndex(false, storedType, context.getCapacity(),
-              context.getMemoryManager(), allocationContext);
-        } else {
-          // RealtimeSegmentStatsHistory does not have the stats for no-dictionary columns from previous consuming
-          // segments
-          // TODO: Add support for updating RealtimeSegmentStatsHistory with average column value size for no dictionary
-          //       columns as well
-          // TODO: Use the stats to get estimated average length
-          // Use a smaller capacity as opposed to segment flush size
-          int initialCapacity = Math.min(context.getCapacity(),
-              NODICT_VARIABLE_WIDTH_ESTIMATED_NUMBER_OF_VALUES_DEFAULT);
-          return new VarByteSVMutableForwardIndex(storedType, context.getMemoryManager(), allocationContext,
-              initialCapacity, NODICT_VARIABLE_WIDTH_ESTIMATED_AVERAGE_VALUE_LENGTH_DEFAULT);
-        }
-      } else {
-        // TODO: Add support for variable width (bytes, string, big decimal) MV RAW column types
-        assert storedType.isFixedWidth();
-        String allocationContext =
-            buildAllocationContext(context.getSegmentName(), context.getFieldSpec().getName(),
-                V1Constants.Indexes.RAW_MV_FORWARD_INDEX_FILE_EXTENSION);
-        // TODO: Start with a smaller capacity on FixedByteMVForwardIndexReaderWriter and let it expand
-        return new FixedByteMVMutableForwardIndex(MAX_MULTI_VALUES_PER_ROW, context.getAvgNumMultiValues(),
-            context.getCapacity(), storedType.size(), context.getMemoryManager(), allocationContext, false,
-            storedType);
-      }
-    } else {
-      if (isSingleValue) {
-        String allocationContext = buildAllocationContext(segmentName, column,
-            V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION);
-        return new FixedByteSVMutableForwardIndex(true, INT, context.getCapacity(), context.getMemoryManager(),
-            allocationContext);
-      } else {
-        String allocationContext = buildAllocationContext(segmentName, column,
-            V1Constants.Indexes.UNSORTED_MV_FORWARD_INDEX_FILE_EXTENSION);
-        // TODO: Start with a smaller capacity on FixedByteMVForwardIndexReaderWriter and let it expand
-        return new FixedByteMVMutableForwardIndex(MAX_MULTI_VALUES_PER_ROW, context.getAvgNumMultiValues(),
-            context.getCapacity(), Integer.BYTES,
-            context.getMemoryManager(), allocationContext, true, INT);
-      }
-    }
-  }
-
-  @Override
-  public MutableInvertedIndex newInvertedIndex(MutableIndexContext.Inverted context) {
-    return new RealtimeInvertedIndex();
-  }
-
-  @Override
-  public MutableJsonIndex newJsonIndex(MutableIndexContext.Json context) {
-    return new MutableJsonIndexImpl(context.getJsonIndexConfig());
-  }
-
-  @Override
-  public MutableTextIndex newTextIndex(MutableIndexContext.Text context) {
-    return null;
-  }
-
-  @Override
-  public MutableDictionary newDictionary(MutableIndexContext.Dictionary context) {
-    String column = context.getFieldSpec().getName();
-    String segmentName = context.getSegmentName();
-    FieldSpec.DataType storedType = context.getFieldSpec().getDataType().getStoredType();
-    int dictionaryColumnSize;
-    if (storedType.isFixedWidth()) {
-      dictionaryColumnSize = storedType.size();
-    } else {
-      dictionaryColumnSize = context.getEstimatedColSize();
-    }
-    // NOTE: preserve 10% buffer for cardinality to reduce the chance of re-sizing the dictionary
-    int estimatedCardinality = (int) (context.getEstimatedCardinality() * 1.1);
-    String dictionaryAllocationContext =
-        buildAllocationContext(segmentName, column, V1Constants.Dict.FILE_EXTENSION);
-    return MutableDictionaryFactory.getMutableDictionary(storedType, context.isOffHeap(), context.getMemoryManager(),
-        dictionaryColumnSize, Math.min(estimatedCardinality, context.getCapacity()), dictionaryAllocationContext);
-  }
-
-  /**
-   * Helper method that builds allocation context that includes segment name, column name, and index type.
-   *
-   * @param segmentName Name of segment.
-   * @param columnName Name of column.
-   * @param indexType Index type.
-   * @return Allocation context built from segment name, column name and index type.
-   */
-  private static String buildAllocationContext(String segmentName, String columnName, String indexType) {
-    return segmentName + ":" + columnName + indexType;
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/IntermediateSegment.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/IntermediateSegment.java
deleted file mode 100644
index 08bbcba7a2e..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/IntermediateSegment.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.indexsegment.mutable;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import javax.annotation.Nullable;
-import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.local.io.writer.impl.MmapMemoryManager;
-import org.apache.pinot.segment.local.realtime.impl.dictionary.MutableDictionaryFactory;
-import org.apache.pinot.segment.local.realtime.impl.forward.FixedByteMVMutableForwardIndex;
-import org.apache.pinot.segment.local.realtime.impl.forward.FixedByteSVMutableForwardIndex;
-import org.apache.pinot.segment.local.segment.index.column.IntermediateIndexContainer;
-import org.apache.pinot.segment.local.segment.index.column.NumValuesInfo;
-import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
-import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
-import org.apache.pinot.segment.spi.MutableSegment;
-import org.apache.pinot.segment.spi.SegmentMetadata;
-import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
-import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
-import org.apache.pinot.segment.spi.index.mutable.MutableForwardIndex;
-import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
-import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
-import org.apache.pinot.segment.spi.memory.PinotDataBufferMemoryManager;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
-import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.FieldSpec.DataType;
-import org.apache.pinot.spi.data.FieldSpec.FieldType;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.stream.RowMetadata;
-import org.apache.pinot.spi.utils.ByteArray;
-import org.apache.pinot.spi.utils.builder.TableNameBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Intermediate segment format to store the collected data so far. This segment format will be used to generate the
- * final
- * offline segment in SegmentIndexCreationDriver.
- */
-public class IntermediateSegment implements MutableSegment {
-  private static final Logger LOGGER = LoggerFactory.getLogger(IntermediateSegment.class);
-
-  private static final int MAX_MULTI_VALUES_PER_ROW = 1000;
-  private static final int DEFAULT_CAPACITY = 100_000;
-  private static final int DEFAULT_EST_AVG_COL_SIZE = 32;
-  private static final int DEFAULT_EST_CARDINALITY = 5000;
-  private static final int DEFAULT_AVG_MULTI_VALUE_COUNT = 2;
-
-  private final SegmentGeneratorConfig _segmentGeneratorConfig;
-  private final Schema _schema;
-  private final TableConfig _tableConfig;
-  private final String _segmentName;
-  private final SegmentMetadata _segmentMetadata;
-  private final Map<String, IntermediateIndexContainer> _indexContainerMap = new HashMap<>();
-  private final PinotDataBufferMemoryManager _memoryManager;
-  private final File _mmapDir;
-
-  private final int _capacity = DEFAULT_CAPACITY;
-  private volatile int _numDocsIndexed = 0;
-
-  public IntermediateSegment(SegmentGeneratorConfig segmentGeneratorConfig) {
-    _segmentGeneratorConfig = segmentGeneratorConfig;
-    _schema = segmentGeneratorConfig.getSchema();
-    _tableConfig = segmentGeneratorConfig.getTableConfig();
-    _segmentName = _segmentGeneratorConfig.getTableName() + System.currentTimeMillis();
-    _segmentMetadata =
-        new SegmentMetadataImpl(TableNameBuilder.extractRawTableName(_tableConfig.getTableName()), _segmentName,
-            _schema, System.currentTimeMillis()) {
-          @Override
-          public int getTotalDocs() {
-            return _numDocsIndexed;
-          }
-        };
-
-    Collection<FieldSpec> allFieldSpecs = _schema.getAllFieldSpecs();
-    List<FieldSpec> physicalFieldSpecs = new ArrayList<>(allFieldSpecs.size());
-    for (FieldSpec fieldSpec : allFieldSpecs) {
-      if (!fieldSpec.isVirtualColumn()) {
-        physicalFieldSpecs.add(fieldSpec);
-      }
-    }
-
-    String outputDir = segmentGeneratorConfig.getOutDir();
-    _mmapDir = new File(outputDir, _segmentName + "_mmap_" + UUID.randomUUID());
-    _mmapDir.mkdir();
-    LOGGER.info("Mmap file dir: " + _mmapDir);
-    _memoryManager = new MmapMemoryManager(_mmapDir.toString(), _segmentName, null);
-
-    // Initialize for each column
-    for (FieldSpec fieldSpec : physicalFieldSpecs) {
-      String column = fieldSpec.getName();
-
-      // Partition info
-      SegmentPartitionConfig segmentPartitionConfig = segmentGeneratorConfig.getSegmentPartitionConfig();
-      PartitionFunction partitionFunction = null;
-      Set<Integer> partitions = null;
-      if (segmentPartitionConfig != null && segmentPartitionConfig.getColumnPartitionMap().containsKey(column)) {
-        partitionFunction =
-            PartitionFunctionFactory.getPartitionFunction(segmentPartitionConfig.getFunctionName(column),
-                segmentPartitionConfig.getNumPartitions(column), segmentPartitionConfig.getFunctionConfig(column));
-        partitions = new HashSet<>();
-        partitions.add(segmentGeneratorConfig.getSequenceId());
-      }
-
-      DataType storedType = fieldSpec.getDataType().getStoredType();
-      boolean isFixedWidthColumn = storedType.isFixedWidth();
-      MutableForwardIndex forwardIndex;
-      MutableDictionary dictionary;
-
-      int dictionaryColumnSize;
-      if (isFixedWidthColumn) {
-        dictionaryColumnSize = storedType.size();
-      } else {
-        dictionaryColumnSize = DEFAULT_EST_AVG_COL_SIZE;
-      }
-      // NOTE: preserve 10% buffer for cardinality to reduce the chance of re-sizing the dictionary
-      int estimatedCardinality = (int) (DEFAULT_EST_CARDINALITY * 1.1);
-      String dictionaryAllocationContext =
-          buildAllocationContext(_segmentName, column, V1Constants.Dict.FILE_EXTENSION);
-      dictionary = MutableDictionaryFactory.getMutableDictionary(storedType, true, _memoryManager, dictionaryColumnSize,
-          Math.min(estimatedCardinality, _capacity), dictionaryAllocationContext);
-
-      if (fieldSpec.isSingleValueField()) {
-        // Single-value dictionary-encoded forward index
-        String allocationContext =
-            buildAllocationContext(_segmentName, column, V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION);
-        forwardIndex =
-            new FixedByteSVMutableForwardIndex(true, DataType.INT, _capacity, _memoryManager, allocationContext);
-      } else {
-        // Multi-value dictionary-encoded forward index
-        String allocationContext =
-            buildAllocationContext(_segmentName, column, V1Constants.Indexes.UNSORTED_MV_FORWARD_INDEX_FILE_EXTENSION);
-        // TODO: Start with a smaller capacity on FixedByteMVForwardIndexReaderWriter and let it expand
-        forwardIndex =
-            new FixedByteMVMutableForwardIndex(MAX_MULTI_VALUES_PER_ROW, DEFAULT_AVG_MULTI_VALUE_COUNT, _capacity,
-                Integer.BYTES, _memoryManager, allocationContext, true, DataType.INT);
-      }
-
-      _indexContainerMap.put(column,
-          new IntermediateIndexContainer(fieldSpec, partitionFunction, partitions, new NumValuesInfo(), forwardIndex,
-              dictionary));
-    }
-  }
-
-  @Override
-  public boolean index(GenericRow row, @Nullable RowMetadata rowMetadata)
-      throws IOException {
-    updateDictionary(row);
-    addNewRow(row);
-    _numDocsIndexed++;
-    return true;
-  }
-
-  @Override
-  public int getNumDocsIndexed() {
-    return _numDocsIndexed;
-  }
-
-  @Override
-  public String getSegmentName() {
-    return _segmentName;
-  }
-
-  @Override
-  public SegmentMetadata getSegmentMetadata() {
-    return _segmentMetadata;
-  }
-
-  @Override
-  public Set<String> getColumnNames() {
-    return _schema.getColumnNames();
-  }
-
-  @Override
-  public Set<String> getPhysicalColumnNames() {
-    return _schema.getPhysicalColumnNames();
-  }
-
-  @Override
-  public DataSource getDataSource(String columnName) {
-    return _indexContainerMap.get(columnName).toDataSource(_numDocsIndexed);
-  }
-
-  @Override
-  public List<StarTreeV2> getStarTrees() {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public ThreadSafeMutableRoaringBitmap getValidDocIds() {
-    return null;
-  }
-
-  @Override
-  public GenericRow getRecord(int docId, GenericRow reuse) {
-    try (PinotSegmentRecordReader recordReader = new PinotSegmentRecordReader()) {
-      recordReader.init(this);
-      recordReader.getRecord(docId, reuse);
-      return reuse;
-    } catch (Exception e) {
-      throw new RuntimeException("Caught exception while reading record for docId: " + docId, e);
-    }
-  }
-
-  @Override
-  public Object getValue(int docId, String column) {
-    try (PinotSegmentColumnReader columnReader = new PinotSegmentColumnReader(this, column)) {
-      return columnReader.getValue(docId);
-    } catch (Exception e) {
-      throw new RuntimeException(
-          String.format("Caught exception while reading value for docId: %d, column: %s", docId, column), e);
-    }
-  }
-
-  @Override
-  public void destroy() {
-    String segmentName = getSegmentName();
-    LOGGER.info("Trying to destroy segment : {}", segmentName);
-    for (Map.Entry<String, IntermediateIndexContainer> entry : _indexContainerMap.entrySet()) {
-      try {
-        entry.getValue().close();
-      } catch (IOException e) {
-        LOGGER.error("Failed to close indexes for column: {}. Continuing with error.", entry.getKey(), e);
-      }
-    }
-    FileUtils.deleteQuietly(_mmapDir);
-  }
-
-  private void updateDictionary(GenericRow row) {
-    for (Map.Entry<String, IntermediateIndexContainer> entry : _indexContainerMap.entrySet()) {
-      String column = entry.getKey();
-      IntermediateIndexContainer indexContainer = entry.getValue();
-      Object value = row.getValue(column);
-      MutableDictionary dictionary = indexContainer.getDictionary();
-      if (dictionary != null) {
-        if (indexContainer.getFieldSpec().isSingleValueField()) {
-          indexContainer.setDictId(dictionary.index(value));
-        } else {
-          indexContainer.setDictIds(dictionary.index((Object[]) value));
-        }
-
-        // Update min/max value from dictionary
-        indexContainer.setMinValue(dictionary.getMinVal());
-        indexContainer.setMaxValue(dictionary.getMaxVal());
-      }
-    }
-  }
-
-  private void addNewRow(GenericRow row)
-      throws IOException {
-    int docId = _numDocsIndexed;
-    for (Map.Entry<String, IntermediateIndexContainer> entry : _indexContainerMap.entrySet()) {
-      String column = entry.getKey();
-      IntermediateIndexContainer indexContainer = entry.getValue();
-      Object value = row.getValue(column);
-      FieldSpec fieldSpec = indexContainer.getFieldSpec();
-      if (fieldSpec.isSingleValueField()) {
-        // Update numValues info
-        indexContainer.getNumValuesInfo().updateSVEntry();
-
-        // Update indexes
-        MutableForwardIndex forwardIndex = indexContainer.getForwardIndex();
-        int dictId = indexContainer.getDictId();
-        if (dictId >= 0) {
-          // Dictionary-encoded single-value column
-
-          // Update forward index
-          forwardIndex.setDictId(docId, dictId);
-        } else {
-          // Single-value column with raw index
-
-          // Update forward index
-          DataType dataType = fieldSpec.getDataType();
-          switch (dataType.getStoredType()) {
-            case INT:
-              forwardIndex.setInt(docId, (Integer) value);
-              break;
-            case LONG:
-              forwardIndex.setLong(docId, (Long) value);
-              break;
-            case FLOAT:
-              forwardIndex.setFloat(docId, (Float) value);
-              break;
-            case DOUBLE:
-              forwardIndex.setDouble(docId, (Double) value);
-              break;
-            case STRING:
-              forwardIndex.setString(docId, (String) value);
-              break;
-            case BYTES:
-              forwardIndex.setBytes(docId, (byte[]) value);
-              break;
-            default:
-              throw new UnsupportedOperationException(
-                  "Unsupported data type: " + dataType + " for no-dictionary column: " + column);
-          }
-
-          // Update min/max value from raw value
-          // NOTE: Skip updating min/max value for aggregated metrics because the value will change over time.
-          if (fieldSpec.getFieldType() != FieldType.METRIC) {
-            Comparable comparable;
-            if (dataType == DataType.BYTES) {
-              comparable = new ByteArray((byte[]) value);
-            } else {
-              comparable = (Comparable) value;
-            }
-            if (indexContainer.getMinValue() == null) {
-              indexContainer.setMinValue(comparable);
-              indexContainer.setMaxValue(comparable);
-            } else {
-              if (comparable.compareTo(indexContainer.getMinValue()) < 0) {
-                indexContainer.setMinValue(comparable);
-              }
-              if (comparable.compareTo(indexContainer.getMaxValue()) > 0) {
-                indexContainer.setMaxValue(comparable);
-              }
-            }
-          }
-        }
-      } else {
-        // Multi-value column (always dictionary-encoded)
-        int[] dictIds = indexContainer.getDictIds();
-
-        // Update numValues info
-        indexContainer.getNumValuesInfo().updateMVEntry(dictIds.length);
-
-        // Update forward index
-        indexContainer.getForwardIndex().setDictIdMV(docId, dictIds);
-      }
-    }
-  }
-
-  private String buildAllocationContext(String segmentName, String columnName, String indexType) {
-    return segmentName + ":" + columnName + indexType;
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImpl.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImpl.java
index 0efa6395e56..2c6885ace5b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImpl.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImpl.java
@@ -19,20 +19,23 @@
 package org.apache.pinot.segment.local.indexsegment.mutable;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
 import it.unimi.dsi.fastutil.ints.IntArrays;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiConsumer;
 import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -48,24 +51,21 @@
 import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentConfig;
 import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
 import org.apache.pinot.segment.local.realtime.impl.dictionary.BaseOffHeapMutableDictionary;
-import org.apache.pinot.segment.local.realtime.impl.geospatial.MutableH3Index;
-import org.apache.pinot.segment.local.realtime.impl.invertedindex.NativeMutableFSTIndex;
-import org.apache.pinot.segment.local.realtime.impl.invertedindex.NativeMutableTextIndex;
 import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeLuceneIndexRefreshState;
 import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeLuceneTextIndex;
 import org.apache.pinot.segment.local.realtime.impl.nullvalue.MutableNullValueVector;
 import org.apache.pinot.segment.local.segment.index.datasource.ImmutableDataSource;
 import org.apache.pinot.segment.local.segment.index.datasource.MutableDataSource;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
-import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
 import org.apache.pinot.segment.local.segment.virtualcolumn.VirtualColumnContext;
 import org.apache.pinot.segment.local.segment.virtualcolumn.VirtualColumnProvider;
 import org.apache.pinot.segment.local.segment.virtualcolumn.VirtualColumnProviderFactory;
+import org.apache.pinot.segment.local.upsert.ComparisonColumns;
 import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
 import org.apache.pinot.segment.local.upsert.RecordInfo;
 import org.apache.pinot.segment.local.utils.FixedIntArrayOffHeapIdMap;
-import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.IdMap;
 import org.apache.pinot.segment.local.utils.IngestionUtils;
 import org.apache.pinot.segment.local.utils.TableConfigUtils;
@@ -73,27 +73,25 @@
 import org.apache.pinot.segment.spi.MutableSegment;
 import org.apache.pinot.segment.spi.SegmentMetadata;
 import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
-import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
 import org.apache.pinot.segment.spi.index.mutable.MutableForwardIndex;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
 import org.apache.pinot.segment.spi.index.mutable.MutableInvertedIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableJsonIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableTextIndex;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
 import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
-import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexProvider;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
 import org.apache.pinot.segment.spi.memory.PinotDataBufferMemoryManager;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
 import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
-import org.apache.pinot.spi.config.table.FieldConfig;
-import org.apache.pinot.spi.config.table.JsonIndexConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
-import org.apache.pinot.spi.config.table.UpsertConfig;
 import org.apache.pinot.spi.config.table.ingestion.AggregationConfig;
 import org.apache.pinot.spi.data.DimensionFieldSpec;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -103,6 +101,7 @@
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.PrimaryKey;
 import org.apache.pinot.spi.stream.RowMetadata;
+import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.apache.pinot.spi.utils.FixedIntArray;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
@@ -111,6 +110,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.pinot.spi.data.FieldSpec.DataType.BYTES;
 import static org.apache.pinot.spi.data.FieldSpec.DataType.STRING;
 
@@ -153,18 +153,17 @@ public class MutableSegmentImpl implements MutableSegment {
   private final Collection<MetricFieldSpec> _physicalMetricFieldSpecs;
   private final Collection<String> _physicalTimeColumnNames;
 
-  private final List<FieldConfig> _fieldConfigList;
-
   // default message metadata
   private volatile long _lastIndexedTimeMs = Long.MIN_VALUE;
   private volatile long _latestIngestionTimeMs = Long.MIN_VALUE;
 
   private RealtimeLuceneIndexRefreshState.RealtimeLuceneReaders _realtimeLuceneReaders;
 
-  private final UpsertConfig.Mode _upsertMode;
-  private final String _upsertComparisonColumn;
-  private final PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
   private final PartitionDedupMetadataManager _partitionDedupMetadataManager;
+
+  private final PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
+  private final List<String> _upsertComparisonColumns;
+  private final String _deleteRecordColumn;
   // The valid doc ids are maintained locally instead of in the upsert metadata manager because:
   // 1. There is only one consuming segment per partition, the committed segments do not need to modify the valid doc
   //    ids for the consuming segment.
@@ -174,6 +173,7 @@ public class MutableSegmentImpl implements MutableSegment {
   //        consumption with newer timestamp (late event in consuming segment), the record location will be updated, but
   //        the valid doc ids won't be updated.
   private final ThreadSafeMutableRoaringBitmap _validDocIds;
+  private final ThreadSafeMutableRoaringBitmap _queryableDocIds;
 
   public MutableSegmentImpl(RealtimeSegmentConfig config, @Nullable ServerMetrics serverMetrics) {
     _serverMetrics = serverMetrics;
@@ -181,7 +181,6 @@ public MutableSegmentImpl(RealtimeSegmentConfig config, @Nullable ServerMetrics
     _segmentName = config.getSegmentName();
     _schema = config.getSchema();
     _timeColumnName = config.getTimeColumnName();
-    _fieldConfigList = config.getFieldConfigList();
     _capacity = config.getCapacity();
     SegmentZKMetadata segmentZKMetadata = config.getSegmentZKMetadata();
     _segmentMetadata = new SegmentMetadataImpl(TableNameBuilder.extractRawTableName(_realtimeTableName),
@@ -243,31 +242,32 @@ public boolean isMutableSegment() {
     _logger =
         LoggerFactory.getLogger(MutableSegmentImpl.class.getName() + "_" + _segmentName + "_" + config.getStreamName());
 
-    Set<String> noDictionaryColumns = config.getNoDictionaryColumns();
-    Set<String> invertedIndexColumns = config.getInvertedIndexColumns();
-    Set<String> textIndexColumns = config.getTextIndexColumns();
-    Set<String> fstIndexColumns = config.getFSTIndexColumns();
-    Map<String, JsonIndexConfig> jsonIndexConfigs = config.getJsonIndexConfigs();
-    Map<String, H3IndexConfig> h3IndexConfigs = config.getH3IndexConfigs();
-
-    int avgNumMultiValues = config.getAvgNumMultiValues();
-
     // Metric aggregation can be enabled only if config is specified, and all dimensions have dictionary,
     // and no metrics have dictionary. If not enabled, the map returned is null.
-    _recordIdMap = enableMetricsAggregationIfPossible(config, noDictionaryColumns);
+    _recordIdMap = enableMetricsAggregationIfPossible(config);
 
     Map<String, Pair<String, ValueAggregator>> metricsAggregators = Collections.emptyMap();
     if (_recordIdMap != null) {
       metricsAggregators = getMetricsAggregators(config);
     }
 
+    Set<IndexType> specialIndexes = Sets.newHashSet(
+        StandardIndexes.dictionary(), // dictionaries implement other contract
+        StandardIndexes.nullValueVector()); // null value vector implement other contract
+
     // Initialize for each column
     for (FieldSpec fieldSpec : _physicalFieldSpecs) {
       String column = fieldSpec.getName();
-      boolean isDictionary = !isNoDictionaryColumn(noDictionaryColumns, invertedIndexColumns, fieldSpec, column);
-      MutableIndexContext.Common context =
+      FieldIndexConfigs indexConfigs = Optional.ofNullable(config.getIndexConfigByCol().get(column))
+          .orElse(FieldIndexConfigs.EMPTY);
+      boolean isDictionary = !isNoDictionaryColumn(indexConfigs, fieldSpec, column);
+      MutableIndexContext context =
           MutableIndexContext.builder().withFieldSpec(fieldSpec).withMemoryManager(_memoryManager)
               .withDictionary(isDictionary).withCapacity(_capacity).offHeap(_offHeap).withSegmentName(_segmentName)
+              .withEstimatedCardinality(_statsHistory.getEstimatedCardinality(column))
+              .withEstimatedColSize(_statsHistory.getEstimatedAvgColSize(column))
+              .withAvgNumMultiValues(_statsHistory.getEstimatedAvgColSize(column))
+              .withConsumerDir(config.getConsumerDir() != null ? new File(config.getConsumerDir()) : null)
               .build();
 
       // Partition info
@@ -284,111 +284,71 @@ public boolean isMutableSegment() {
         partitions.add(config.getPartitionId());
       }
 
+      // TODO (mutable-index-spi): The comment above was here, but no check was done.
+      //  It seems the code that apply that check was removed around 2020. Should we remove the comment?
       // Check whether to generate raw index for the column while consuming
       // Only support generating raw index on single-value columns that do not have inverted index while
       // consuming. After consumption completes and the segment is built, all single-value columns can have raw index
-      DataType storedType = fieldSpec.getDataType().getStoredType();
-      boolean isFixedWidthColumn = storedType.isFixedWidth();
-      MutableIndexProvider indexProvider = IndexingOverrides.getMutableIndexProvider();
-      MutableForwardIndex forwardIndex = indexProvider.newForwardIndex(context.forForwardIndex(avgNumMultiValues));
 
       // Dictionary-encoded column
-      MutableDictionary dictionary = null;
+      MutableDictionary dictionary;
       if (isDictionary) {
-        int dictionaryColumnSize =
-            isFixedWidthColumn ? storedType.size() : _statsHistory.getEstimatedAvgColSize(column);
-        // NOTE: preserve 10% buffer for cardinality to reduce the chance of re-sizing the dictionary
-        int estimatedCardinality = (int) (_statsHistory.getEstimatedCardinality(column) * 1.1);
-        dictionary = indexProvider.newDictionary(context.forDictionary(dictionaryColumnSize, estimatedCardinality));
-        // Even though the column is defined as 'no-dictionary' in the config, we did create dictionary for consuming
-        // segment.
-        noDictionaryColumns.remove(column);
-      }
-
-      // Inverted index
-      MutableInvertedIndex invertedIndexReader =
-          invertedIndexColumns.contains(column) ? indexProvider.newInvertedIndex(context.forInvertedIndex()) : null;
-
-      MutableTextIndex fstIndex = null;
-      // FST Index
-      if (_fieldConfigList != null && fstIndexColumns.contains(column)) {
-        for (FieldConfig fieldConfig : _fieldConfigList) {
-          if (fieldConfig.getName().equals(column)) {
-            Map<String, String> properties = fieldConfig.getProperties();
-            if (TextIndexUtils.isFstTypeNative(properties)) {
-              fstIndex = new NativeMutableFSTIndex(column);
-            }
-          }
+        DictionaryIndexConfig dictionaryIndexConfig = indexConfigs.getConfig(StandardIndexes.dictionary());
+        if (dictionaryIndexConfig.isDisabled()) {
+          // Even if dictionary is disabled in the config, isNoDictionaryColumn(...) returned false, so
+          // we are going to create a dictionary.
+          // This may happen for several reasons. For example, when there is a inverted index on the column.
+          // See isNoDictionaryColumn to have more context.
+          dictionaryIndexConfig = DictionaryIndexConfig.DEFAULT;
         }
-      }
-
-      // Text index
-      MutableTextIndex textIndex;
-      List<String> stopWordsInclude = null;
-      List<String> stopWordsExclude = null;
-      if (textIndexColumns.contains(column)) {
-        boolean useNativeTextIndex = false;
-        if (_fieldConfigList != null) {
-          for (FieldConfig fieldConfig : _fieldConfigList) {
-            if (fieldConfig.getName().equals(column)) {
-              Map<String, String> properties = fieldConfig.getProperties();
-              stopWordsInclude = TextIndexUtils.extractStopWordsInclude(properties);
-              stopWordsExclude = TextIndexUtils.extractStopWordsExclude(properties);
-              if (TextIndexUtils.isFstTypeNative(properties)) {
-                useNativeTextIndex = true;
-              }
-            }
+        dictionary = DictionaryIndexType.createMutableDictionary(context, dictionaryIndexConfig);
+      } else {
+        dictionary = null;
+        if (!fieldSpec.isSingleValueField()) {
+          // Raw MV columns
+          DataType dataType = fieldSpec.getDataType().getStoredType();
+          switch (dataType) {
+            case INT:
+            case LONG:
+            case FLOAT:
+            case DOUBLE:
+              break;
+            default:
+              throw new UnsupportedOperationException(
+                  "Unsupported data type: " + dataType + " for MV no-dictionary column: " + column);
           }
         }
+      }
 
-        if (useNativeTextIndex) {
-          textIndex = new NativeMutableTextIndex(column);
-        } else {
+      // Null value vector
+      MutableNullValueVector nullValueVector = _nullHandlingEnabled ? new MutableNullValueVector() : null;
 
-          // TODO - this logic is in the wrong place and belongs in a Lucene-specific submodule,
-          //  it is beyond the scope of realtime index pluggability to do this refactoring, so realtime
-          //  text indexes remain statically defined. Revisit this after this refactoring has been done.
-          RealtimeLuceneTextIndex luceneTextIndex =
-              new RealtimeLuceneTextIndex(column, new File(config.getConsumerDir()), _segmentName, stopWordsInclude,
-                  stopWordsExclude);
-          if (_realtimeLuceneReaders == null) {
-            _realtimeLuceneReaders = new RealtimeLuceneIndexRefreshState.RealtimeLuceneReaders(_segmentName);
-          }
-          _realtimeLuceneReaders.addReader(luceneTextIndex);
-          textIndex = luceneTextIndex;
+      Map<IndexType, MutableIndex> mutableIndexes = new HashMap<>();
+      for (IndexType<?, ?, ?> indexType : IndexService.getInstance().getAllIndexes()) {
+        if (!specialIndexes.contains(indexType)) {
+          addMutableIndex(mutableIndexes, indexType, context, indexConfigs);
         }
-      } else {
-        textIndex = null;
       }
 
-      // Json index
-      JsonIndexConfig jsonIndexConfig = jsonIndexConfigs.get(column);
-      MutableJsonIndex jsonIndex =
-          jsonIndexConfig != null ? indexProvider.newJsonIndex(context.forJsonIndex(jsonIndexConfig)) : null;
-
-      // H3 index
-      // TODO consider making this overridable
-      MutableH3Index h3Index;
-      try {
-        H3IndexConfig h3IndexConfig = h3IndexConfigs.get(column);
-        h3Index = h3IndexConfig != null ? new MutableH3Index(h3IndexConfig.getResolution()) : null;
-      } catch (IOException e) {
-        throw new RuntimeException(String.format("Failed to initiate H3 index for column: %s", column), e);
+      // TODO - this logic is in the wrong place and belongs in a Lucene-specific submodule,
+      //  it is beyond the scope of realtime index pluggability to do this refactoring, so realtime
+      //  text indexes remain statically defined. Revisit this after this refactoring has been done.
+      MutableIndex textIndex = mutableIndexes.get(StandardIndexes.text());
+      if (textIndex instanceof RealtimeLuceneTextIndex) {
+        if (_realtimeLuceneReaders == null) {
+          _realtimeLuceneReaders = new RealtimeLuceneIndexRefreshState.RealtimeLuceneReaders(_segmentName);
+        }
+        _realtimeLuceneReaders.addReader((RealtimeLuceneTextIndex) textIndex);
       }
 
-      // Null value vector
-      MutableNullValueVector nullValueVector = _nullHandlingEnabled ? new MutableNullValueVector() : null;
-
       Pair<String, ValueAggregator> columnAggregatorPair =
           metricsAggregators.getOrDefault(column, Pair.of(column, null));
       String sourceColumn = columnAggregatorPair.getLeft();
       ValueAggregator valueAggregator = columnAggregatorPair.getRight();
 
-      // TODO: Support range index and bloom filter for mutable segment
       _indexContainerMap.put(column,
-          new IndexContainer(fieldSpec, partitionFunction, partitions, new NumValuesInfo(), forwardIndex, dictionary,
-              invertedIndexReader, null, textIndex, fstIndex, jsonIndex, h3Index, null, nullValueVector, sourceColumn,
-              valueAggregator));
+          new IndexContainer(fieldSpec, partitionFunction, partitions, new ValuesInfo(), mutableIndexes, dictionary,
+              nullValueVector, sourceColumn, valueAggregator));
     }
 
     // TODO separate concerns: this logic does not belong here
@@ -398,60 +358,73 @@ public boolean isMutableSegment() {
       realtimeLuceneIndexRefreshState.addRealtimeReadersToQueue(_realtimeLuceneReaders);
     }
 
-    // init upsert-related data structure
-    _upsertMode = config.getUpsertMode();
     _partitionDedupMetadataManager = config.getPartitionDedupMetadataManager();
 
-    if (isUpsertEnabled()) {
+    _partitionUpsertMetadataManager = config.getPartitionUpsertMetadataManager();
+    if (_partitionUpsertMetadataManager != null) {
       Preconditions.checkState(!isAggregateMetricsEnabled(),
           "Metrics aggregation and upsert cannot be enabled together");
-      _partitionUpsertMetadataManager = config.getPartitionUpsertMetadataManager();
+      List<String> upsertComparisonColumns = config.getUpsertComparisonColumns();
+      _upsertComparisonColumns =
+          upsertComparisonColumns != null ? upsertComparisonColumns : Collections.singletonList(_timeColumnName);
+      _deleteRecordColumn = config.getUpsertDeleteRecordColumn();
       _validDocIds = new ThreadSafeMutableRoaringBitmap();
-      String upsertComparisonColumn = config.getUpsertComparisonColumn();
-      _upsertComparisonColumn = upsertComparisonColumn != null ? upsertComparisonColumn : _timeColumnName;
+      if (_deleteRecordColumn != null) {
+        _queryableDocIds = new ThreadSafeMutableRoaringBitmap();
+      } else {
+        _queryableDocIds = null;
+      }
     } else {
-      _partitionUpsertMetadataManager = null;
+      _upsertComparisonColumns = null;
+      _deleteRecordColumn = null;
       _validDocIds = null;
-      _upsertComparisonColumn = null;
+      _queryableDocIds = null;
+    }
+  }
+
+  private <C extends IndexConfig> void addMutableIndex(Map<IndexType, MutableIndex> mutableIndexes,
+      IndexType<C, ?, ?> indexType, MutableIndexContext context, FieldIndexConfigs indexConfigs) {
+    MutableIndex mutableIndex = indexType.createMutableIndex(context, indexConfigs.getConfig(indexType));
+    if (mutableIndex != null) {
+      mutableIndexes.put(indexType, mutableIndex);
     }
   }
 
   /**
    * Decide whether a given column should be dictionary encoded or not
-   * @param noDictionaryColumns no dictionary column set
-   * @param invertedIndexColumns inverted index column set
    * @param fieldSpec field spec of column
    * @param column column name
    * @return true if column is no-dictionary, false if dictionary encoded
    */
-  private boolean isNoDictionaryColumn(Set<String> noDictionaryColumns, Set<String> invertedIndexColumns,
-      FieldSpec fieldSpec, String column) {
+  private boolean isNoDictionaryColumn(FieldIndexConfigs indexConfigs, FieldSpec fieldSpec, String column) {
     DataType dataType = fieldSpec.getDataType();
-    if (noDictionaryColumns.contains(column)) {
-      // Earlier we didn't support noDict in consuming segments for STRING and BYTES columns.
-      // So even if the user had the column in noDictionaryColumns set in table config, we still
-      // created dictionary in consuming segments.
-      // Later on we added this support. There is a particular impact of this change on the use cases
-      // that have set noDict on their STRING dimension columns for other performance
-      // reasons and also want metricsAggregation. These use cases don't get to
-      // aggregateMetrics because the new implementation is able to honor their table config setting
-      // of noDict on STRING/BYTES. Without metrics aggregation, memory pressure increases.
-      // So to continue aggregating metrics for such cases, we will create dictionary even
-      // if the column is part of noDictionary set from table config
-      if (fieldSpec instanceof DimensionFieldSpec && isAggregateMetricsEnabled() && (dataType == STRING
-          || dataType == BYTES)) {
-        _logger.info(
-            "Aggregate metrics is enabled. Will create dictionary in consuming segment for column {} of type {}",
-            column, dataType);
-        return false;
-      }
-      // So don't create dictionary if the column (1) is member of noDictionary, and (2) is single-value or multi-value
-      // with a fixed-width field, and (3) doesn't have an inverted index
-      return (fieldSpec.isSingleValueField() || fieldSpec.getDataType().isFixedWidth())
-          && !invertedIndexColumns.contains(column);
+    if (indexConfigs == null) {
+      return false;
     }
-    // column is not a part of noDictionary set, so create dictionary
-    return false;
+    if (indexConfigs.getConfig(StandardIndexes.dictionary()).isEnabled()) {
+      return false;
+    }
+    // Earlier we didn't support noDict in consuming segments for STRING and BYTES columns.
+    // So even if the user had the column in noDictionaryColumns set in table config, we still
+    // created dictionary in consuming segments.
+    // Later on we added this support. There is a particular impact of this change on the use cases
+    // that have set noDict on their STRING dimension columns for other performance
+    // reasons and also want metricsAggregation. These use cases don't get to
+    // aggregateMetrics because the new implementation is able to honor their table config setting
+    // of noDict on STRING/BYTES. Without metrics aggregation, memory pressure increases.
+    // So to continue aggregating metrics for such cases, we will create dictionary even
+    // if the column is part of noDictionary set from table config
+    if (fieldSpec instanceof DimensionFieldSpec && isAggregateMetricsEnabled() && (dataType == STRING
+        || dataType == BYTES)) {
+      _logger.info(
+          "Aggregate metrics is enabled. Will create dictionary in consuming segment for column {} of type {}",
+          column, dataType);
+      return false;
+    }
+    // So don't create dictionary if the column (1) is member of noDictionary, and (2) is single-value or multi-value
+    // with a fixed-width field, and (3) doesn't have an inverted index
+    return (fieldSpec.isSingleValueField() || fieldSpec.getDataType().isFixedWidth())
+        && indexConfigs.getConfig(StandardIndexes.inverted()).isDisabled();
   }
 
   public SegmentPartitionConfig getSegmentPartitionConfig() {
@@ -493,21 +466,18 @@ public boolean index(GenericRow row, @Nullable RowMetadata rowMetadata)
     boolean canTakeMore;
     int numDocsIndexed = _numDocsIndexed;
 
-    RecordInfo recordInfo = null;
-
-    if (isDedupEnabled() || isUpsertEnabled()) {
-      recordInfo = getRecordInfo(row, numDocsIndexed);
-    }
-
-    if (isDedupEnabled() && _partitionDedupMetadataManager.checkRecordPresentOrUpdate(recordInfo.getPrimaryKey(),
-        this)) {
-      if (_serverMetrics != null) {
-        _serverMetrics.addMeteredTableValue(_realtimeTableName, ServerMeter.REALTIME_DEDUP_DROPPED, 1);
+    if (isDedupEnabled()) {
+      PrimaryKey primaryKey = row.getPrimaryKey(_schema.getPrimaryKeyColumns());
+      if (_partitionDedupMetadataManager.checkRecordPresentOrUpdate(primaryKey, this)) {
+        if (_serverMetrics != null) {
+          _serverMetrics.addMeteredTableValue(_realtimeTableName, ServerMeter.REALTIME_DEDUP_DROPPED, 1);
+        }
+        return true;
       }
-      return true;
     }
 
     if (isUpsertEnabled()) {
+      RecordInfo recordInfo = getRecordInfo(row, numDocsIndexed);
       GenericRow updatedRow = _partitionUpsertMetadataManager.updateRecord(row, recordInfo);
       updateDictionary(updatedRow);
       addNewRow(numDocsIndexed, updatedRow);
@@ -546,7 +516,7 @@ public boolean index(GenericRow row, @Nullable RowMetadata rowMetadata)
   }
 
   private boolean isUpsertEnabled() {
-    return _upsertMode != UpsertConfig.Mode.NONE;
+    return _partitionUpsertMetadataManager != null;
   }
 
   private boolean isDedupEnabled() {
@@ -555,15 +525,40 @@ private boolean isDedupEnabled() {
 
   private RecordInfo getRecordInfo(GenericRow row, int docId) {
     PrimaryKey primaryKey = row.getPrimaryKey(_schema.getPrimaryKeyColumns());
+    Comparable comparisonValue = getComparisonValue(row);
+    boolean deleteRecord = _deleteRecordColumn != null && BooleanUtils.toBoolean(row.getValue(_deleteRecordColumn));
+    return new RecordInfo(primaryKey, docId, comparisonValue, deleteRecord);
+  }
 
-    if (isUpsertEnabled()) {
-      Object upsertComparisonValue = row.getValue(_upsertComparisonColumn);
-      Preconditions.checkState(upsertComparisonValue instanceof Comparable,
-          "Upsert comparison column: %s must be comparable", _upsertComparisonColumn);
-      return new RecordInfo(primaryKey, docId, (Comparable) upsertComparisonValue);
+  private Comparable getComparisonValue(GenericRow row) {
+    int numComparisonColumns = _upsertComparisonColumns.size();
+    if (numComparisonColumns == 1) {
+      return (Comparable) row.getValue(_upsertComparisonColumns.get(0));
     }
 
-    return new RecordInfo(primaryKey, docId, null);
+    Comparable[] comparisonValues = new Comparable[numComparisonColumns];
+    int comparableIndex = -1;
+    for (int i = 0; i < numComparisonColumns; i++) {
+      String columnName = _upsertComparisonColumns.get(i);
+
+      if (!row.isNullValue(columnName)) {
+        // Inbound records may only have exactly 1 non-null value in one of the comparison column i.e. comparison
+        // columns are mutually exclusive. If comparableIndex has already been modified from its initialized value,
+        // that means there must have already been a non-null value processed and therefore processing an additional
+        // non-null value would be an error.
+        Preconditions.checkState(comparableIndex == -1,
+            "Documents must have exactly 1 non-null comparison column value");
+
+        comparableIndex = i;
+
+        Object comparisonValue = row.getValue(columnName);
+        Preconditions.checkState(comparisonValue instanceof Comparable,
+            "Upsert comparison column: %s must be comparable", columnName);
+        comparisonValues[i] = (Comparable) comparisonValue;
+      }
+    }
+    Preconditions.checkState(comparableIndex != -1, "Documents must have exactly 1 non-null comparison column value");
+    return new ComparisonColumns(comparisonValues, comparableIndex);
   }
 
   private void updateDictionary(GenericRow row) {
@@ -601,25 +596,29 @@ private void addNewRow(int docId, GenericRow row) {
         Object value = row.getValue(indexContainer._sourceColumn);
 
         // Update numValues info
-        indexContainer._numValuesInfo.updateSVEntry();
+        indexContainer._valuesInfo.updateSVNumValues();
 
-        MutableForwardIndex forwardIndex = indexContainer._forwardIndex;
+        MutableIndex forwardIndex = indexContainer._mutableIndexes.get(StandardIndexes.forward());
         FieldSpec fieldSpec = indexContainer._fieldSpec;
 
         DataType dataType = fieldSpec.getDataType();
         value = indexContainer._valueAggregator.getInitialAggregatedValue(value);
+        // aggregator value has to be numeric, but can be a different type of Number from the one expected on the column
+        // therefore we need to do some value changes here.
+        // TODO: Precision may change from one value to other, so we may need to study if this is actually what we want
+        //  to do
         switch (dataType.getStoredType()) {
           case INT:
-            forwardIndex.setInt(docId, ((Number) value).intValue());
+            forwardIndex.add(((Number) value).intValue(), -1, docId);
             break;
           case LONG:
-            forwardIndex.setLong(docId, ((Number) value).longValue());
+            forwardIndex.add(((Number) value).longValue(), -1, docId);
             break;
           case FLOAT:
-            forwardIndex.setFloat(docId, ((Number) value).floatValue());
+            forwardIndex.add(((Number) value).floatValue(), -1, docId);
             break;
           case DOUBLE:
-            forwardIndex.setDouble(docId, ((Number) value).doubleValue());
+            forwardIndex.add(((Number) value).doubleValue(), -1, docId);
             break;
           default:
             throw new UnsupportedOperationException(
@@ -645,8 +644,6 @@ private void addNewRow(int docId, GenericRow row) {
       DataType dataType = fieldSpec.getDataType();
 
       if (fieldSpec.isSingleValueField()) {
-        // Single-value column
-
         // Check partitions
         if (column.equals(_partitionColumn)) {
           Object valueToPartition = (dataType == BYTES) ? new ByteArray((byte[]) value) : value;
@@ -661,57 +658,19 @@ private void addNewRow(int docId, GenericRow row) {
         }
 
         // Update numValues info
-        indexContainer._numValuesInfo.updateSVEntry();
+        indexContainer._valuesInfo.updateSVNumValues();
 
         // Update indexes
-        MutableForwardIndex forwardIndex = indexContainer._forwardIndex;
         int dictId = indexContainer._dictId;
-        if (dictId >= 0) {
-          // Dictionary-encoded single-value column
-
-          // Update forward index
-          forwardIndex.setDictId(docId, dictId);
-
-          // Update inverted index
-          MutableInvertedIndex invertedIndex = indexContainer._invertedIndex;
-          if (invertedIndex != null) {
-            try {
-              invertedIndex.add(dictId, docId);
-            } catch (Exception e) {
-              recordIndexingError(FieldConfig.IndexType.INVERTED, e);
-            }
-          }
-        } else {
-          // Single-value column with raw index
-
-          // Update forward index
-          switch (dataType.getStoredType()) {
-            case INT:
-              forwardIndex.setInt(docId, (Integer) value);
-              break;
-            case LONG:
-              forwardIndex.setLong(docId, (Long) value);
-              break;
-            case FLOAT:
-              forwardIndex.setFloat(docId, (Float) value);
-              break;
-            case DOUBLE:
-              forwardIndex.setDouble(docId, (Double) value);
-              break;
-            case BIG_DECIMAL:
-              forwardIndex.setBigDecimal(docId, (BigDecimal) value);
-              break;
-            case STRING:
-              forwardIndex.setString(docId, (String) value);
-              break;
-            case BYTES:
-              forwardIndex.setBytes(docId, (byte[]) value);
-              break;
-            default:
-              throw new UnsupportedOperationException(
-                  "Unsupported data type: " + dataType + " for no-dictionary column: " + column);
+        for (Map.Entry<IndexType, MutableIndex> indexEntry : indexContainer._mutableIndexes.entrySet()) {
+          try {
+            indexEntry.getValue().add(value, dictId, docId);
+          } catch (Exception e) {
+            recordIndexingError(indexEntry.getKey(), e);
           }
+        }
 
+        if (dictId < 0) {
           // Update min/max value from raw value
           // NOTE: Skip updating min/max value for aggregated metrics because the value will change over time.
           if (!isAggregateMetricsEnabled() || fieldSpec.getFieldType() != FieldSpec.FieldType.METRIC) {
@@ -734,113 +693,29 @@ private void addNewRow(int docId, GenericRow row) {
             }
           }
         }
-
-        // Update text index
-        MutableTextIndex textIndex = indexContainer._textIndex;
-        if (textIndex != null) {
-          try {
-            textIndex.add((String) value);
-          } catch (Exception e) {
-            recordIndexingError(FieldConfig.IndexType.TEXT, e);
-          }
-        }
-
-        // Update json index
-        MutableJsonIndex jsonIndex = indexContainer._jsonIndex;
-        if (jsonIndex != null) {
-          try {
-            jsonIndex.add((String) value);
-          } catch (Exception e) {
-            recordIndexingError(FieldConfig.IndexType.JSON, e);
-          }
-        }
-
-        // Update H3 index
-        MutableH3Index h3Index = indexContainer._h3Index;
-        if (h3Index != null) {
-          try {
-            h3Index.add(GeometrySerializer.deserialize((byte[]) value));
-          } catch (Exception e) {
-            recordIndexingError(FieldConfig.IndexType.H3, e);
-          }
-        }
       } else {
         // Multi-value column
 
         int[] dictIds = indexContainer._dictIds;
-
-        if (dictIds != null) {
-          // Dictionary encoded
-          // Update numValues info
-          indexContainer._numValuesInfo.updateMVEntry(dictIds.length);
-
-          // Update forward index
-          indexContainer._forwardIndex.setDictIdMV(docId, dictIds);
-
-          // Update inverted index
-          MutableInvertedIndex invertedIndex = indexContainer._invertedIndex;
-          if (invertedIndex != null) {
-            for (int dictId : dictIds) {
-              try {
-                invertedIndex.add(dictId, docId);
-              } catch (Exception e) {
-                recordIndexingError(FieldConfig.IndexType.INVERTED, e);
-              }
-            }
-          }
-        } else {
-          // Raw MV columns
-
-          switch (dataType.getStoredType()) {
-            case INT:
-              Object[] values = (Object[]) value;
-              int[] intValues = new int[values.length];
-              for (int i = 0; i < values.length; i++) {
-                intValues[i] = (Integer) values[i];
-              }
-              indexContainer._forwardIndex.setIntMV(docId, intValues);
-              indexContainer._numValuesInfo.updateMVEntry(intValues.length);
-              break;
-            case LONG:
-              values = (Object[]) value;
-              long[] longValues = new long[values.length];
-              for (int i = 0; i < values.length; i++) {
-                longValues[i] = (Long) values[i];
-              }
-              indexContainer._forwardIndex.setLongMV(docId, longValues);
-              indexContainer._numValuesInfo.updateMVEntry(longValues.length);
-              break;
-            case FLOAT:
-              values = (Object[]) value;
-              float[] floatValues = new float[values.length];
-              for (int i = 0; i < values.length; i++) {
-                floatValues[i] = (Float) values[i];
-              }
-              indexContainer._forwardIndex.setFloatMV(docId, floatValues);
-              indexContainer._numValuesInfo.updateMVEntry(floatValues.length);
-              break;
-            case DOUBLE:
-              values = (Object[]) value;
-              double[] doubleValues = new double[values.length];
-              for (int i = 0; i < values.length; i++) {
-                doubleValues[i] = (Double) values[i];
-              }
-              indexContainer._forwardIndex.setDoubleMV(docId, doubleValues);
-              indexContainer._numValuesInfo.updateMVEntry(doubleValues.length);
-              break;
-            default:
-              throw new UnsupportedOperationException(
-                  "Unsupported data type: " + dataType + " for MV no-dictionary column: " + column);
+        indexContainer._valuesInfo.updateVarByteMVMaxRowLengthInBytes(value, dataType.getStoredType());
+        Object[] values = (Object[]) value;
+        for (Map.Entry<IndexType, MutableIndex> indexEntry : indexContainer._mutableIndexes.entrySet()) {
+          try {
+            indexEntry.getValue().add(values, dictIds, docId);
+          } catch (Exception e) {
+            recordIndexingError(indexEntry.getKey(), e);
           }
         }
+        indexContainer._valuesInfo.updateMVNumValues(values.length);
       }
     }
   }
 
-  private void recordIndexingError(FieldConfig.IndexType indexType, Exception exception) {
+  private void recordIndexingError(IndexType<?, ?, ?> indexType, Exception exception) {
     _logger.error("failed to index value with {}", indexType, exception);
     if (_serverMetrics != null) {
-      String metricKeyName = _realtimeTableName + "-" + indexType + "-indexingError";
+      String indexMetricName = indexType.getPrettyName().toUpperCase(Locale.US);
+      String metricKeyName = _realtimeTableName + "-" + indexMetricName + "-indexingError";
       _serverMetrics.addMeteredTableValue(metricKeyName, ServerMeter.INDEXING_FAILURES, 1);
     }
   }
@@ -857,7 +732,8 @@ private void aggregateMetrics(GenericRow row, int docId) {
     for (MetricFieldSpec metricFieldSpec : _physicalMetricFieldSpecs) {
       IndexContainer indexContainer = _indexContainerMap.get(metricFieldSpec.getName());
       Object value = row.getValue(indexContainer._sourceColumn);
-      MutableForwardIndex forwardIndex = indexContainer._forwardIndex;
+      MutableForwardIndex forwardIndex =
+          (MutableForwardIndex) indexContainer._mutableIndexes.get(StandardIndexes.forward());
       DataType dataType = metricFieldSpec.getDataType();
 
       Double oldDoubleValue;
@@ -986,6 +862,12 @@ public ThreadSafeMutableRoaringBitmap getValidDocIds() {
     return _validDocIds;
   }
 
+  @Nullable
+  @Override
+  public ThreadSafeMutableRoaringBitmap getQueryableDocIds() {
+    return _queryableDocIds;
+  }
+
   @Override
   public GenericRow getRecord(int docId, GenericRow reuse) {
     try (PinotSegmentRecordReader recordReader = new PinotSegmentRecordReader()) {
@@ -1101,7 +983,8 @@ public int[] getSortedDocIdIterationOrderWithSortedColumn(String column) {
     IntArrays.quickSort(dictIds, dictionary::compare);
 
     // Re-order documents using the inverted index
-    MutableInvertedIndex invertedIndex = indexContainer._invertedIndex;
+    MutableInvertedIndex invertedIndex =
+        ((MutableInvertedIndex) indexContainer._mutableIndexes.get(StandardIndexes.inverted()));
     int[] docIds = new int[numDocsIndexed];
     int[] batch = new int[256];
     int docIdIndex = 0;
@@ -1163,12 +1046,12 @@ private int getOrCreateDocId() {
    * TODO: Eliminate the requirement on dictionary encoding for dimension and metric columns.
    *
    * @param config Segment config.
-   * @param noDictionaryColumns Set of no dictionary columns.
    *
    * @return Map from dictionary id array to doc id, null if metrics aggregation cannot be enabled.
    */
-  private IdMap<FixedIntArray> enableMetricsAggregationIfPossible(RealtimeSegmentConfig config,
-      Set<String> noDictionaryColumns) {
+  private IdMap<FixedIntArray> enableMetricsAggregationIfPossible(RealtimeSegmentConfig config) {
+    Set<String> noDictionaryColumns =
+        FieldIndexConfigsUtil.columnsWithIndexDisabled(StandardIndexes.dictionary(), config.getIndexConfigByCol());
     if (!config.aggregateMetrics() && CollectionUtils.isEmpty(config.getIngestionAggregationConfigs())) {
       _logger.info("Metrics aggregation is disabled.");
       return null;
@@ -1243,18 +1126,60 @@ private boolean isAggregateMetricsEnabled() {
 
   // NOTE: Okay for single-writer
   @SuppressWarnings("NonAtomicOperationOnVolatileField")
-  private static class NumValuesInfo {
+  private static class ValuesInfo {
     volatile int _numValues = 0;
     volatile int _maxNumValuesPerMVEntry = -1;
+    volatile int _varByteMVMaxRowLengthInBytes = -1;
 
-    void updateSVEntry() {
+    void updateSVNumValues() {
       _numValues++;
     }
 
-    void updateMVEntry(int numValuesInMVEntry) {
+    void updateMVNumValues(int numValuesInMVEntry) {
       _numValues += numValuesInMVEntry;
       _maxNumValuesPerMVEntry = Math.max(_maxNumValuesPerMVEntry, numValuesInMVEntry);
     }
+
+    /**
+     * When an MV VarByte column is created with noDict, the realtime segment is still created with a dictionary.
+     * When the realtime segment is converted to offline segment, the offline segment creates a noDict column.
+     * MultiValueVarByteRawIndexCreator requires the maxRowLengthInBytes. Refer to OSS issue
+     * https://github.com/apache/pinot/issues/10127 for more details.
+     */
+    void updateVarByteMVMaxRowLengthInBytes(Object entry, DataType dataType) {
+      // MV support for BigDecimal is not available.
+      if (dataType != STRING && dataType != BYTES) {
+        return;
+      }
+
+      Object[] values = (Object[]) entry;
+      int rowLength = 0;
+
+      switch (dataType) {
+        case STRING: {
+          for (Object obj : values) {
+            String value = (String) obj;
+            int length = value.getBytes(UTF_8).length;
+            rowLength += length;
+          }
+
+          _varByteMVMaxRowLengthInBytes = Math.max(_varByteMVMaxRowLengthInBytes, rowLength);
+          break;
+        }
+        case BYTES: {
+          for (Object obj : values) {
+            ByteArray value = new ByteArray((byte[]) obj);
+            int length = value.length();
+            rowLength += length;
+          }
+
+          _varByteMVMaxRowLengthInBytes = Math.max(_varByteMVMaxRowLengthInBytes, rowLength);
+          break;
+        }
+        default:
+          throw new IllegalStateException("Invalid type=" + dataType);
+      }
+    }
   }
 
   private static Map<String, Pair<String, ValueAggregator>> getMetricsAggregators(RealtimeSegmentConfig segmentConfig) {
@@ -1311,125 +1236,68 @@ private class IndexContainer implements Closeable {
     final FieldSpec _fieldSpec;
     final PartitionFunction _partitionFunction;
     final Set<Integer> _partitions;
-    final NumValuesInfo _numValuesInfo;
-    final MutableForwardIndex _forwardIndex;
+    final ValuesInfo _valuesInfo;
     final MutableDictionary _dictionary;
-    final MutableInvertedIndex _invertedIndex;
-    final RangeIndexReader _rangeIndex;
-    final MutableH3Index _h3Index;
-    final MutableTextIndex _textIndex;
-    final MutableTextIndex _fstIndex;
-    final MutableJsonIndex _jsonIndex;
-    final BloomFilterReader _bloomFilter;
     final MutableNullValueVector _nullValueVector;
+    final Map<IndexType, MutableIndex> _mutableIndexes;
     final String _sourceColumn;
     final ValueAggregator _valueAggregator;
 
     volatile Comparable _minValue;
     volatile Comparable _maxValue;
 
-    // Hold the dictionary id for the latest record
+    /**
+     * The dictionary id for the latest single-value record.
+     * It is set on {@link #updateDictionary(GenericRow)} and read in {@link #addNewRow(int, GenericRow)}
+     */
     int _dictId = Integer.MIN_VALUE;
+    /**
+     * The dictionary ids for the latest multi-value record.
+     * It is set on {@link #updateDictionary(GenericRow)} and read in {@link #addNewRow(int, GenericRow)}
+     */
     int[] _dictIds;
 
     IndexContainer(FieldSpec fieldSpec, @Nullable PartitionFunction partitionFunction,
-        @Nullable Set<Integer> partitions, NumValuesInfo numValuesInfo, MutableForwardIndex forwardIndex,
-        @Nullable MutableDictionary dictionary, @Nullable MutableInvertedIndex invertedIndex,
-        @Nullable RangeIndexReader rangeIndex, @Nullable MutableTextIndex textIndex,
-        @Nullable MutableTextIndex fstIndex, @Nullable MutableJsonIndex jsonIndex, @Nullable MutableH3Index h3Index,
-        @Nullable BloomFilterReader bloomFilter, @Nullable MutableNullValueVector nullValueVector,
+        @Nullable Set<Integer> partitions, ValuesInfo valuesInfo, Map<IndexType, MutableIndex> mutableIndexes,
+        @Nullable MutableDictionary dictionary, @Nullable MutableNullValueVector nullValueVector,
         @Nullable String sourceColumn, @Nullable ValueAggregator valueAggregator) {
+      Preconditions.checkArgument(mutableIndexes.containsKey(StandardIndexes.forward()), "Forward index is required");
       _fieldSpec = fieldSpec;
-      _partitionFunction = partitionFunction;
-      _partitions = partitions;
-      _numValuesInfo = numValuesInfo;
-      _forwardIndex = forwardIndex;
+      _mutableIndexes = mutableIndexes;
       _dictionary = dictionary;
-      _invertedIndex = invertedIndex;
-      _rangeIndex = rangeIndex;
-      _h3Index = h3Index;
-
-      _textIndex = textIndex;
-      _fstIndex = fstIndex;
-      _jsonIndex = jsonIndex;
-      _bloomFilter = bloomFilter;
       _nullValueVector = nullValueVector;
+      _partitionFunction = partitionFunction;
+      _partitions = partitions;
+      _valuesInfo = valuesInfo;
       _sourceColumn = sourceColumn;
       _valueAggregator = valueAggregator;
     }
 
     DataSource toDataSource() {
-      return new MutableDataSource(_fieldSpec, _numDocsIndexed, _numValuesInfo._numValues,
-          _numValuesInfo._maxNumValuesPerMVEntry, _dictionary == null ? -1 : _dictionary.length(), _partitionFunction,
-          _partitions, _minValue, _maxValue, _forwardIndex, _dictionary, _invertedIndex, _rangeIndex, _textIndex,
-          _fstIndex, _jsonIndex, _h3Index, _bloomFilter, _nullValueVector);
+      return new MutableDataSource(_fieldSpec, _numDocsIndexed, _valuesInfo._numValues,
+          _valuesInfo._maxNumValuesPerMVEntry, _dictionary == null ? -1 : _dictionary.length(), _partitionFunction,
+          _partitions, _minValue, _maxValue, _mutableIndexes, _dictionary, _nullValueVector,
+          _valuesInfo._varByteMVMaxRowLengthInBytes);
     }
 
     @Override
     public void close() {
       String column = _fieldSpec.getName();
-      try {
-        _forwardIndex.close();
-      } catch (Exception e) {
-        _logger.error("Caught exception while closing forward index for column: {}, continuing with error", column, e);
-      }
-      if (_dictionary != null) {
-        try {
-          _dictionary.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing dictionary for column: {}, continuing with error", column, e);
-        }
-      }
-      if (_invertedIndex != null) {
-        try {
-          _invertedIndex.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing inverted index for column: {}, continuing with error", column,
-              e);
-        }
-      }
-      if (_rangeIndex != null) {
-        try {
-          _rangeIndex.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing range index for column: {}, continuing with error", column, e);
-        }
-      }
-      if (_textIndex != null) {
-        try {
-          _textIndex.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing text index for column: {}, continuing with error", column, e);
-        }
-      }
-      if (_fstIndex != null) {
-        try {
-          _fstIndex.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing fst index for column: {}, continuing with error", column, e);
-        }
-      }
-      if (_jsonIndex != null) {
-        try {
-          _jsonIndex.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing json index for column: {}, continuing with error", column, e);
-        }
-      }
-      if (_h3Index != null) {
-        try {
-          _h3Index.close();
-        } catch (Exception e) {
-          _logger.error("Caught exception while closing H3 index for column: {}, continuing with error", column, e);
-        }
-      }
-      if (_bloomFilter != null) {
+
+      BiConsumer<IndexType<?, ?, ?>, AutoCloseable> closer = (indexType, closeable) -> {
         try {
-          _bloomFilter.close();
+          if (closeable != null) {
+            closeable.close();
+          }
         } catch (Exception e) {
-          _logger.error("Caught exception while closing bloom filter for column: {}, continuing with error", column, e);
+          _logger.error("Caught exception while closing {} index for column: {}, continuing with error",
+              indexType, column, e);
         }
-      }
+      };
+
+      _mutableIndexes.forEach(closer::accept);
+      closer.accept(StandardIndexes.dictionary(), _dictionary);
+      closer.accept(StandardIndexes.nullValueVector(), _nullValueVector);
     }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/readerwriter/RealtimeIndexOffHeapMemoryManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/readerwriter/RealtimeIndexOffHeapMemoryManager.java
index 861fa953a17..737460593c0 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/readerwriter/RealtimeIndexOffHeapMemoryManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/readerwriter/RealtimeIndexOffHeapMemoryManager.java
@@ -20,8 +20,9 @@
 
 import com.google.common.base.Preconditions;
 import java.io.IOException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.concurrent.NotThreadSafe;
 import org.apache.pinot.common.metrics.ServerGauge;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.utils.HLCSegmentName;
@@ -32,34 +33,37 @@
 
 
 /**
- * @class RealtimeIndexOffHeapMemoryManager is an abstract class that implements base functionality to allocate and
- * release
+ * RealtimeIndexOffHeapMemoryManager is an abstract class that implements base functionality to allocate and release
  * memory that is acquired during realtime segment consumption.
  *
- * Realtime consuming segments use memory for dictionary, forward index, and inverted indices. For off-heap
- * allocation of memory, we instantiate one OffHeapMemoryManager for each segment in the server,
+ * Realtime consuming segments use memory for dictionary, forward index, and inverted indices. For off-heap allocation
+ * of memory, we instantiate one RealtimeIndexOffHeapMemoryManager for each segment.
  *
- * Closing the RealtimeOffHeapMemoryManager also releases all the resources allocated by the OffHeapMemoryManager.
+ * Closing the RealtimeOffHeapMemoryManager also releases all the resources allocated.
+ *
+ * This class is NOT thread safe. Only one thread should access this class.
  */
+@NotThreadSafe
 public abstract class RealtimeIndexOffHeapMemoryManager implements PinotDataBufferMemoryManager {
-  private final List<PinotDataBuffer> _buffers = new LinkedList<>();
+  private final List<PinotDataBuffer> _buffers = new ArrayList<>();
+  private final String _rawTableName;
   private final String _segmentName;
   private final ServerMetrics _serverMetrics;
+
   private long _totalAllocatedBytes = 0;
-  private final String _tableName;
 
   protected RealtimeIndexOffHeapMemoryManager(ServerMetrics serverMetrics, String segmentName) {
     _serverMetrics = serverMetrics;
     _segmentName = segmentName;
     LLCSegmentName llcSegmentName = LLCSegmentName.of(segmentName);
     if (llcSegmentName != null) {
-      _tableName = llcSegmentName.getTableName();
+      _rawTableName = llcSegmentName.getTableName();
     } else if (SegmentName.isHighLevelConsumerSegmentName(segmentName)) {
       HLCSegmentName hlcSegmentName = new HLCSegmentName(segmentName);
-      _tableName = hlcSegmentName.getTableName();
+      _rawTableName = hlcSegmentName.getTableName();
     } else {
       // For testing only
-      _tableName = "NoSuchTable";
+      _rawTableName = "NoSuchTable";
     }
   }
 
@@ -82,7 +86,7 @@ public PinotDataBuffer allocate(long size, String allocationContext) {
     _totalAllocatedBytes += size;
     _buffers.add(buffer);
     if (_serverMetrics != null) {
-      _serverMetrics.addValueToTableGauge(_tableName, ServerGauge.REALTIME_OFFHEAP_MEMORY_USED, size);
+      _serverMetrics.addValueToTableGauge(_rawTableName, ServerGauge.REALTIME_OFFHEAP_MEMORY_USED, size);
     }
     return buffer;
   }
@@ -97,9 +101,9 @@ protected abstract void doClose()
 
   /**
    * Close out this memory manager and release all memory and resources.
-   * This method must be called when all the memory allocated by this class is not longer in use.
-   * The application may choose to call (or not call) PinotDataBuffer.close(), but this.close() MUST
-   * be called to release all resources allocated.
+   * This method must be called when all the memory allocated by this class is no longer in use.
+   * The application may choose to call (or not call) PinotDataBuffer.close(), but this.close() MUST be called to
+   * release all resources allocated.
    *
    * @throws IOException
    */
@@ -109,7 +113,8 @@ public void close()
       buffer.close();
     }
     if (_serverMetrics != null) {
-      _serverMetrics.addValueToTableGauge(_tableName, ServerGauge.REALTIME_OFFHEAP_MEMORY_USED, -_totalAllocatedBytes);
+      _serverMetrics.addValueToTableGauge(_rawTableName, ServerGauge.REALTIME_OFFHEAP_MEMORY_USED,
+          -_totalAllocatedBytes);
     }
     doClose();
     _buffers.clear();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/FixedByteValueReaderWriter.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/FixedByteValueReaderWriter.java
index f4978bd458d..73ca8c09f4f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/FixedByteValueReaderWriter.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/FixedByteValueReaderWriter.java
@@ -122,6 +122,12 @@ public int compareUtf8Bytes(int index, int numBytesPerValue, byte[] bytes) {
     return ValueReaderComparisons.compareUtf8Bytes(_dataBuffer, startOffset, numBytesPerValue, true, bytes);
   }
 
+  @Override
+  public int compareBytes(int index, int numBytesPerValue, byte[] bytes) {
+    long startOffset = (long) index * numBytesPerValue;
+    return ValueReaderComparisons.compareBytes(_dataBuffer, startOffset, numBytesPerValue, bytes);
+  }
+
   public void writeInt(int index, int value) {
     _dataBuffer.putInt((long) index * Integer.BYTES, value);
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReader.java
index 9f582abe952..4eaf17e37eb 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReader.java
@@ -65,4 +65,9 @@ default BigDecimal getBigDecimal(int index, int numBytesPerValue) {
    * Returns the comparison result of the UTF-8 decoded values.
    */
   int compareUtf8Bytes(int index, int numBytesPerValue, byte[] bytes);
+
+  /**
+   * Returns the comparison result of the bytes values.
+   */
+  int compareBytes(int index, int numBytesPerValue, byte[] bytes);
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReaderComparisons.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReaderComparisons.java
index 3a96f66ce08..a6025b673a8 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReaderComparisons.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/ValueReaderComparisons.java
@@ -54,6 +54,17 @@ private static int mismatch(PinotDataBuffer dataBuffer, long startOffset, int le
     return -1;
   }
 
+  static int compareBytes(PinotDataBuffer dataBuffer, long startOffset, int length, byte[] bytes) {
+    // can use MethodHandles.byteArrayViewVarHandle here after dropping JDK8
+    ByteBuffer buffer = ByteBuffer.wrap(bytes);
+    int mismatchPosition = mismatch(dataBuffer, startOffset, length, buffer);
+    if (mismatchPosition == -1) {
+      return length - bytes.length;
+    }
+    // can use Byte.compareUnsigned here after dropping JDK8
+    return (dataBuffer.getByte(startOffset + mismatchPosition) & 0xFF) - (bytes[mismatchPosition] & 0xFF);
+  }
+
   static int compareUtf8Bytes(PinotDataBuffer dataBuffer, long startOffset, int length, boolean padded, byte[] bytes) {
     // can use MethodHandles.byteArrayViewVarHandle here after dropping JDK8
     ByteBuffer buffer = ByteBuffer.wrap(bytes);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/VarLengthValueReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/VarLengthValueReader.java
index 596cb3125d4..cd1346896a8 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/VarLengthValueReader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/util/VarLengthValueReader.java
@@ -128,6 +128,15 @@ public int compareUtf8Bytes(int index, int numBytesPerValue, byte[] bytes) {
     return ValueReaderComparisons.compareUtf8Bytes(_dataBuffer, startOffset, length, false, bytes);
   }
 
+  @Override
+  public int compareBytes(int index, int numBytesPerValue, byte[] bytes) {
+    int offsetPosition = _dataSectionStartOffSet + Integer.BYTES * index;
+    int startOffset = _dataBuffer.getInt(offsetPosition);
+    int endOffset = _dataBuffer.getInt(offsetPosition + Integer.BYTES);
+    int length = endOffset - startOffset;
+    return ValueReaderComparisons.compareBytes(_dataBuffer, startOffset, length, bytes);
+  }
+
   @Override
   public void close() {
     // NOTE: DO NOT close the PinotDataBuffer here because it is tracked by the caller and might be reused later. The
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/writer/impl/BaseChunkSVForwardIndexWriter.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/writer/impl/BaseChunkSVForwardIndexWriter.java
index 94534747628..d0c41b0763c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/writer/impl/BaseChunkSVForwardIndexWriter.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/io/writer/impl/BaseChunkSVForwardIndexWriter.java
@@ -28,6 +28,7 @@
 import org.apache.pinot.segment.local.io.compression.ChunkCompressorFactory;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
 import org.apache.pinot.segment.spi.compression.ChunkCompressor;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +38,7 @@
  */
 public abstract class BaseChunkSVForwardIndexWriter implements Closeable {
   // TODO: Remove this before release 0.5.0
-  public static final int DEFAULT_VERSION = 2;
+  public static final int DEFAULT_VERSION = ForwardIndexConfig.DEFAULT_RAW_WRITER_VERSION;
   public static final int CURRENT_VERSION = 3;
 
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseChunkSVForwardIndexWriter.class);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/loader/TierBasedSegmentDirectoryLoader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/loader/TierBasedSegmentDirectoryLoader.java
index 170ce710e4b..397aa79c567 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/loader/TierBasedSegmentDirectoryLoader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/loader/TierBasedSegmentDirectoryLoader.java
@@ -26,6 +26,7 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.common.utils.config.TierConfigUtils;
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.store.SegmentLocalFSDirectory;
@@ -205,15 +206,18 @@ private File getSegmentDataDir(String segmentTier, SegmentDirectoryLoaderContext
     TableConfig tableConfig = loaderContext.getTableConfig();
     String tableNameWithType = tableConfig.getTableName();
     String segmentName = loaderContext.getSegmentName();
-    try {
-      String tierDataDir =
-          TierConfigUtils.getDataDirForTier(tableConfig, segmentTier, loaderContext.getInstanceTierConfigs());
-      File tierTableDataDir = new File(tierDataDir, tableNameWithType);
-      return new File(tierTableDataDir, segmentName);
-    } catch (Exception e) {
-      LOGGER.warn("Failed to get dataDir for segment: {} of table: {} on tier: {} due to error: {}", segmentName,
-          tableNameWithType, segmentTier, e.getMessage());
+    String tierDataDir =
+        TierConfigUtils.getDataDirForTier(tableConfig, segmentTier, loaderContext.getInstanceTierConfigs());
+    if (StringUtils.isEmpty(tierDataDir)) {
+      LOGGER.warn("No dataDir for segment: {} of table: {} on tier: {}", segmentName, tableNameWithType, segmentTier);
       return null;
     }
+    File tierTableDataDir = new File(tierDataDir, tableNameWithType);
+    return new File(tierTableDataDir, segmentName);
+  }
+
+  @Override
+  public boolean needsTierMigration(String targetTier, String currentTier) {
+    return !StringUtils.equals(targetTier, currentTier);
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/RealtimeSegmentConverter.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/RealtimeSegmentConverter.java
index a54d837db0b..c0a29afcf0c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/RealtimeSegmentConverter.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/RealtimeSegmentConverter.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.segment.local.realtime.converter;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.util.Collection;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.pinot.common.metrics.ServerGauge;
@@ -27,13 +28,19 @@
 import org.apache.pinot.segment.local.realtime.converter.stats.RealtimeSegmentSegmentCreationDataSource;
 import org.apache.pinot.segment.local.segment.creator.TransformPipeline;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexConfigBuilder;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.FstIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
 import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 
 
@@ -75,9 +82,8 @@ public void build(@Nullable SegmentVersion segmentVersion, ServerMetrics serverM
     // realtime segment generation
     genConfig.setSegmentTimeValueCheck(false);
     if (_columnIndicesForRealtimeTable.getInvertedIndexColumns() != null) {
-      for (String column : _columnIndicesForRealtimeTable.getInvertedIndexColumns()) {
-        genConfig.createInvertedIndexForColumn(column);
-      }
+      genConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED,
+          _columnIndicesForRealtimeTable.getInvertedIndexColumns());
     }
 
     if (_columnIndicesForRealtimeTable.getVarLengthDictionaryColumns() != null) {
@@ -90,8 +96,13 @@ public void build(@Nullable SegmentVersion segmentVersion, ServerMetrics serverM
     genConfig.setTableName(_tableName);
     genConfig.setOutDir(_outputPath);
     genConfig.setSegmentName(_segmentName);
-    genConfig.setTextIndexCreationColumns(_columnIndicesForRealtimeTable.getTextIndexColumns());
-    genConfig.setFSTIndexCreationColumns(_columnIndicesForRealtimeTable.getFstIndexColumns());
+
+    addIndexOrDefault(genConfig, StandardIndexes.text(), _columnIndicesForRealtimeTable.getTextIndexColumns(),
+        new TextIndexConfigBuilder(genConfig.getFSTIndexType()).build());
+
+    addIndexOrDefault(genConfig, StandardIndexes.fst(), _columnIndicesForRealtimeTable.getFstIndexColumns(),
+        new FstIndexConfig(genConfig.getFSTIndexType()));
+
     SegmentPartitionConfig segmentPartitionConfig = _realtimeSegmentImpl.getSegmentPartitionConfig();
     genConfig.setSegmentPartitionConfig(segmentPartitionConfig);
     genConfig.setNullHandlingEnabled(_nullHandlingEnabled);
@@ -119,14 +130,27 @@ public void build(@Nullable SegmentVersion segmentVersion, ServerMetrics serverM
     }
   }
 
+  private <C extends IndexConfig> void addIndexOrDefault(SegmentGeneratorConfig genConfig,
+      IndexType<C, ?, ?> indexType, @Nullable Collection<String> columns, C defaultConfig) {
+    Map<String, C> config = indexType.getConfig(genConfig.getTableConfig(), genConfig.getSchema());
+    if (columns != null) {
+      for (String column : columns) {
+        C colConf = config.get(column);
+        genConfig.setIndexOn(indexType, colConf == null ? defaultConfig : colConf, column);
+      }
+    }
+  }
+
   /**
    * Returns a new schema containing only physical columns
    */
   @VisibleForTesting
   public static Schema getUpdatedSchema(Schema original) {
     Schema newSchema = new Schema();
-    for (String col : original.getPhysicalColumnNames()) {
-      newSchema.addField(original.getFieldSpecFor(col));
+    for (FieldSpec fieldSpec : original.getAllFieldSpecs()) {
+      if (!fieldSpec.isVirtualColumn()) {
+        newSchema.addField(fieldSpec);
+      }
     }
     return newSchema;
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableColumnStatistics.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableColumnStatistics.java
index cff6260b993..d41d55b37d5 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableColumnStatistics.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableColumnStatistics.java
@@ -188,6 +188,11 @@ public PartitionFunction getPartitionFunction() {
     return _dataSource.getDataSourceMetadata().getPartitionFunction();
   }
 
+  @Override
+  public int getMaxRowLengthInBytes() {
+    return _dataSource.getDataSourceMetadata().getMaxRowLengthInBytes();
+  }
+
   @Override
   public int getNumPartitions() {
     PartitionFunction partitionFunction = _dataSource.getDataSourceMetadata().getPartitionFunction();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableNoDictionaryColStatistics.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableNoDictionaryColStatistics.java
index c4a3c910b08..0cf4c37b966 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableNoDictionaryColStatistics.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/converter/stats/MutableNoDictionaryColStatistics.java
@@ -83,7 +83,7 @@ public int getTotalNumberOfEntries() {
 
   @Override
   public int getMaxNumberOfMultiValues() {
-    return 0;
+    return _dataSourceMetadata.getMaxNumValuesPerMVEntry();
   }
 
   @Override
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
index 9af8367b496..f4fd501ac5a 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
@@ -18,20 +18,24 @@
  */
 package org.apache.pinot.segment.local.realtime.impl;
 
+import com.google.common.collect.Maps;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.segment.local.dedup.PartitionDedupMetadataManager;
-import org.apache.pinot.segment.local.indexsegment.mutable.MutableSegmentImpl;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
-import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.memory.PinotDataBufferMemoryManager;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
 import org.apache.pinot.spi.config.table.FieldConfig;
-import org.apache.pinot.spi.config.table.JsonIndexConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.UpsertConfig;
 import org.apache.pinot.spi.config.table.ingestion.AggregationConfig;
 import org.apache.pinot.spi.data.Schema;
@@ -45,13 +49,7 @@ public class RealtimeSegmentConfig {
   private final String _timeColumnName;
   private final int _capacity;
   private final int _avgNumMultiValues;
-  private final Set<String> _noDictionaryColumns;
-  private final Set<String> _varLengthDictionaryColumns;
-  private final Set<String> _invertedIndexColumns;
-  private final Set<String> _textIndexColumns;
-  private final Set<String> _fstIndexColumns;
-  private final Map<String, JsonIndexConfig> _jsonIndexConfigs;
-  private final Map<String, H3IndexConfig> _h3IndexConfigs;
+  private final Map<String, FieldIndexConfigs> _indexConfigByCol;
   private final SegmentZKMetadata _segmentZKMetadata;
   private final boolean _offHeap;
   private final PinotDataBufferMemoryManager _memoryManager;
@@ -62,7 +60,8 @@ public class RealtimeSegmentConfig {
   private final boolean _aggregateMetrics;
   private final boolean _nullHandlingEnabled;
   private final UpsertConfig.Mode _upsertMode;
-  private final String _upsertComparisonColumn;
+  private final List<String> _upsertComparisonColumns;
+  private final String _upsertDeleteRecordColumn;
   private final PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
   private final PartitionDedupMetadataManager _partitionDedupMetadataManager;
   private final String _consumerDir;
@@ -71,14 +70,12 @@ public class RealtimeSegmentConfig {
 
   // TODO: Clean up this constructor. Most of these things can be extracted from tableConfig.
   private RealtimeSegmentConfig(String tableNameWithType, String segmentName, String streamName, Schema schema,
-      String timeColumnName, int capacity, int avgNumMultiValues, Set<String> noDictionaryColumns,
-      Set<String> varLengthDictionaryColumns, Set<String> invertedIndexColumns, Set<String> textIndexColumns,
-      Set<String> fstIndexColumns, Map<String, JsonIndexConfig> jsonIndexConfigs,
-      Map<String, H3IndexConfig> h3IndexConfigs, SegmentZKMetadata segmentZKMetadata, boolean offHeap,
+      String timeColumnName, int capacity, int avgNumMultiValues, Map<String, FieldIndexConfigs> indexConfigByCol,
+      SegmentZKMetadata segmentZKMetadata, boolean offHeap,
       PinotDataBufferMemoryManager memoryManager, RealtimeSegmentStatsHistory statsHistory, String partitionColumn,
       PartitionFunction partitionFunction, int partitionId, boolean aggregateMetrics, boolean nullHandlingEnabled,
-      String consumerDir, UpsertConfig.Mode upsertMode, String upsertComparisonColumn,
-      PartitionUpsertMetadataManager partitionUpsertMetadataManager,
+      String consumerDir, UpsertConfig.Mode upsertMode, List<String> upsertComparisonColumns,
+      String upsertDeleteRecordColumn, PartitionUpsertMetadataManager partitionUpsertMetadataManager,
       PartitionDedupMetadataManager partitionDedupMetadataManager, List<FieldConfig> fieldConfigList,
       List<AggregationConfig> ingestionAggregationConfigs) {
     _tableNameWithType = tableNameWithType;
@@ -88,13 +85,7 @@ private RealtimeSegmentConfig(String tableNameWithType, String segmentName, Stri
     _timeColumnName = timeColumnName;
     _capacity = capacity;
     _avgNumMultiValues = avgNumMultiValues;
-    _noDictionaryColumns = noDictionaryColumns;
-    _varLengthDictionaryColumns = varLengthDictionaryColumns;
-    _invertedIndexColumns = invertedIndexColumns;
-    _textIndexColumns = textIndexColumns;
-    _fstIndexColumns = fstIndexColumns;
-    _jsonIndexConfigs = jsonIndexConfigs;
-    _h3IndexConfigs = h3IndexConfigs;
+    _indexConfigByCol = indexConfigByCol;
     _segmentZKMetadata = segmentZKMetadata;
     _offHeap = offHeap;
     _memoryManager = memoryManager;
@@ -106,7 +97,8 @@ private RealtimeSegmentConfig(String tableNameWithType, String segmentName, Stri
     _nullHandlingEnabled = nullHandlingEnabled;
     _consumerDir = consumerDir;
     _upsertMode = upsertMode != null ? upsertMode : UpsertConfig.Mode.NONE;
-    _upsertComparisonColumn = upsertComparisonColumn;
+    _upsertComparisonColumns = upsertComparisonColumns;
+    _upsertDeleteRecordColumn = upsertDeleteRecordColumn;
     _partitionUpsertMetadataManager = partitionUpsertMetadataManager;
     _partitionDedupMetadataManager = partitionDedupMetadataManager;
     _fieldConfigList = fieldConfigList;
@@ -141,37 +133,8 @@ public int getAvgNumMultiValues() {
     return _avgNumMultiValues;
   }
 
-  public Set<String> getNoDictionaryColumns() {
-    return _noDictionaryColumns;
-  }
-
-  public Set<String> getVarLengthDictionaryColumns() {
-    return _varLengthDictionaryColumns;
-  }
-
-  public Set<String> getInvertedIndexColumns() {
-    return _invertedIndexColumns;
-  }
-
-  /**
-   * Used by {@link MutableSegmentImpl} when
-   * it starts consuming/indexing.
-   * @return
-   */
-  public Set<String> getTextIndexColumns() {
-    return _textIndexColumns;
-  }
-
-  public Set<String> getFSTIndexColumns() {
-    return _fstIndexColumns;
-  }
-
-  public Map<String, JsonIndexConfig> getJsonIndexConfigs() {
-    return _jsonIndexConfigs;
-  }
-
-  public Map<String, H3IndexConfig> getH3IndexConfigs() {
-    return _h3IndexConfigs;
+  public Map<String, FieldIndexConfigs> getIndexConfigByCol() {
+    return _indexConfigByCol;
   }
 
   public SegmentZKMetadata getSegmentZKMetadata() {
@@ -210,6 +173,7 @@ public boolean isNullHandlingEnabled() {
     return _nullHandlingEnabled;
   }
 
+  @Nullable
   public String getConsumerDir() {
     return _consumerDir;
   }
@@ -222,8 +186,12 @@ public boolean isDedupEnabled() {
     return _partitionDedupMetadataManager != null;
   }
 
-  public String getUpsertComparisonColumn() {
-    return _upsertComparisonColumn;
+  public List<String> getUpsertComparisonColumns() {
+    return _upsertComparisonColumns;
+  }
+
+  public String getUpsertDeleteRecordColumn() {
+    return _upsertDeleteRecordColumn;
   }
 
   public PartitionUpsertMetadataManager getPartitionUpsertMetadataManager() {
@@ -250,13 +218,7 @@ public static class Builder {
     private String _timeColumnName;
     private int _capacity;
     private int _avgNumMultiValues;
-    private Set<String> _noDictionaryColumns;
-    private Set<String> _varLengthDictionaryColumns;
-    private Set<String> _invertedIndexColumns;
-    private Set<String> _textIndexColumns = new HashSet<>();
-    private Set<String> _fstIndexColumns = new HashSet<>();
-    private Map<String, JsonIndexConfig> _jsonIndexConfigs = new HashMap<>();
-    private Map<String, H3IndexConfig> _h3IndexConfigs = new HashMap<>();
+    private final Map<String, FieldIndexConfigs.Builder> _indexConfigByCol;
     private SegmentZKMetadata _segmentZKMetadata;
     private boolean _offHeap;
     private PinotDataBufferMemoryManager _memoryManager;
@@ -268,13 +230,30 @@ public static class Builder {
     private boolean _nullHandlingEnabled = false;
     private String _consumerDir;
     private UpsertConfig.Mode _upsertMode;
-    private String _upsertComparisonColumn;
+    private List<String> _upsertComparisonColumns;
+    private String _upsertDeleteRecordColumn;
     private PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
     private PartitionDedupMetadataManager _partitionDedupMetadataManager;
     private List<FieldConfig> _fieldConfigList;
     private List<AggregationConfig> _ingestionAggregationConfigs;
 
     public Builder() {
+      _indexConfigByCol = new HashMap<>();
+    }
+
+    public Builder(IndexLoadingConfig indexLoadingConfig) {
+      this(indexLoadingConfig.getFieldIndexConfigByColName());
+    }
+
+    public Builder(TableConfig tableConfig, Schema schema) {
+      this(FieldIndexConfigsUtil.createIndexConfigsByColName(tableConfig, schema));
+    }
+
+    public Builder(Map<String, FieldIndexConfigs> indexConfigsByColName) {
+      _indexConfigByCol = new HashMap<>(indexConfigsByColName.size());
+      for (Map.Entry<String, FieldIndexConfigs> entry : indexConfigsByColName.entrySet()) {
+        _indexConfigByCol.put(entry.getKey(), new FieldIndexConfigs.Builder(entry.getValue()));
+      }
     }
 
     public Builder setTableNameWithType(String tableNameWithType) {
@@ -312,46 +291,19 @@ public Builder setAvgNumMultiValues(int avgNumMultiValues) {
       return this;
     }
 
-    public Builder setNoDictionaryColumns(Set<String> noDictionaryColumns) {
-      _noDictionaryColumns = noDictionaryColumns;
+    public <C extends IndexConfig> Builder setIndex(Iterable<String> columns, IndexType<C, ?, ?> indexType, C config) {
+      for (String column : columns) {
+        FieldIndexConfigs.Builder builder =
+            _indexConfigByCol.computeIfAbsent(column, (k) -> new FieldIndexConfigs.Builder());
+        builder.add(indexType, config);
+      }
       return this;
     }
 
-    public Builder setVarLengthDictionaryColumns(Set<String> varLengthDictionaryColumns) {
-      _varLengthDictionaryColumns = varLengthDictionaryColumns;
-      return this;
-    }
-
-    public Builder setInvertedIndexColumns(Set<String> invertedIndexColumns) {
-      _invertedIndexColumns = invertedIndexColumns;
-      return this;
-    }
-
-    /**
-     * Used by LLRealtimeSegmentDataManager
-     * to set the list of text index creation columns. This list is later used by
-     * {@link MutableSegmentImpl} when
-     * it starts consuming/indexing.
-     * @param textIndexColumns set of text index enabled columns
-     * @return builder
-     */
-    public Builder setTextIndexColumns(Set<String> textIndexColumns) {
-      _textIndexColumns = textIndexColumns;
-      return this;
-    }
-
-    public Builder setFSTIndexColumns(Set<String> fstIndexColumns) {
-      _fstIndexColumns = fstIndexColumns;
-      return this;
-    }
-
-    public Builder setJsonIndexConfigs(Map<String, JsonIndexConfig> jsonIndexConfigs) {
-      _jsonIndexConfigs = jsonIndexConfigs;
-      return this;
-    }
-
-    public Builder setH3IndexConfigs(Map<String, H3IndexConfig> h3IndexConfigs) {
-      _h3IndexConfigs = h3IndexConfigs;
+    public <C extends IndexConfig> Builder setIndex(String column, IndexType<C, ?, ?> indexType, C config) {
+      FieldIndexConfigs.Builder builder =
+          _indexConfigByCol.computeIfAbsent(column, (k) -> new FieldIndexConfigs.Builder());
+      builder.add(indexType, config);
       return this;
     }
 
@@ -410,8 +362,13 @@ public Builder setUpsertMode(UpsertConfig.Mode upsertMode) {
       return this;
     }
 
-    public Builder setUpsertComparisonColumn(String upsertComparisonColumn) {
-      _upsertComparisonColumn = upsertComparisonColumn;
+    public Builder setUpsertComparisonColumns(List<String> upsertComparisonColumns) {
+      _upsertComparisonColumns = upsertComparisonColumns;
+      return this;
+    }
+
+    public Builder setUpsertDeleteRecordColumn(String upsertDeleteRecordColumn) {
+      _upsertDeleteRecordColumn = upsertDeleteRecordColumn;
       return this;
     }
 
@@ -436,12 +393,17 @@ public Builder setIngestionAggregationConfigs(List<AggregationConfig> ingestionA
     }
 
     public RealtimeSegmentConfig build() {
+      Map<String, FieldIndexConfigs> indexConfigByCol = Maps.newHashMapWithExpectedSize(_indexConfigByCol.size());
+      for (Map.Entry<String, FieldIndexConfigs.Builder> entry : _indexConfigByCol.entrySet()) {
+        indexConfigByCol.put(entry.getKey(), entry.getValue().build());
+      }
+
       return new RealtimeSegmentConfig(_tableNameWithType, _segmentName, _streamName, _schema, _timeColumnName,
-          _capacity, _avgNumMultiValues, _noDictionaryColumns, _varLengthDictionaryColumns, _invertedIndexColumns,
-          _textIndexColumns, _fstIndexColumns, _jsonIndexConfigs, _h3IndexConfigs, _segmentZKMetadata, _offHeap,
+          _capacity, _avgNumMultiValues, Collections.unmodifiableMap(indexConfigByCol), _segmentZKMetadata, _offHeap,
           _memoryManager, _statsHistory, _partitionColumn, _partitionFunction, _partitionId, _aggregateMetrics,
-          _nullHandlingEnabled, _consumerDir, _upsertMode, _upsertComparisonColumn, _partitionUpsertMetadataManager,
-          _partitionDedupMetadataManager, _fieldConfigList, _ingestionAggregationConfigs);
+          _nullHandlingEnabled, _consumerDir, _upsertMode, _upsertComparisonColumns, _upsertDeleteRecordColumn,
+          _partitionUpsertMetadataManager, _partitionDedupMetadataManager, _fieldConfigList,
+          _ingestionAggregationConfigs);
     }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/geospatial/MutableH3Index.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/geospatial/MutableH3Index.java
index 07f139c3f73..b4e2ae5dd54 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/geospatial/MutableH3Index.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/geospatial/MutableH3Index.java
@@ -22,7 +22,11 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.H3Utils;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
 import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
 import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
@@ -36,7 +40,7 @@
  * A H3 index reader for the real-time H3 index values on the fly.
  * <p>This class is thread-safe for single writer multiple readers.
  */
-public class MutableH3Index implements H3IndexReader {
+public class MutableH3Index implements H3IndexReader, MutableIndex {
   private final H3IndexResolution _resolution;
   private final int _lowestResolution;
   private final Map<Long, ThreadSafeMutableRoaringBitmap> _bitmaps = new ConcurrentHashMap<>();
@@ -49,6 +53,21 @@ public MutableH3Index(H3IndexResolution resolution)
     _lowestResolution = resolution.getLowestResolution();
   }
 
+  @Override
+  public void add(@Nonnull Object value, int dictId, int docId) {
+    try {
+      Geometry geometry = GeometrySerializer.deserialize((byte[]) value);
+      add(geometry);
+    } finally {
+      _nextDocId++;
+    }
+  }
+
+  @Override
+  public void add(@Nonnull Object[] values, @Nullable int[] dictIds, int docId) {
+    throw new UnsupportedOperationException("Mutable H3 indexes are not supported for multi-valued columns");
+  }
+
   /**
    * Adds the next geospatial value.
    */
@@ -58,7 +77,7 @@ public void add(Geometry geometry) {
     Coordinate coordinate = geometry.getCoordinate();
     // TODO: support multiple resolutions
     long h3Id = H3Utils.H3_CORE.geoToH3(coordinate.y, coordinate.x, _lowestResolution);
-    _bitmaps.computeIfAbsent(h3Id, k -> new ThreadSafeMutableRoaringBitmap()).add(_nextDocId++);
+    _bitmaps.computeIfAbsent(h3Id, k -> new ThreadSafeMutableRoaringBitmap()).add(_nextDocId);
   }
 
   @Override
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndex.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndex.java
index bea06abbde4..b7d6a7258f5 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndex.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndex.java
@@ -23,21 +23,24 @@
 import org.apache.pinot.segment.local.utils.nativefst.mutablefst.MutableFST;
 import org.apache.pinot.segment.local.utils.nativefst.mutablefst.MutableFSTImpl;
 import org.apache.pinot.segment.local.utils.nativefst.utils.RealTimeRegexpMatcher;
-import org.apache.pinot.segment.spi.index.mutable.MutableTextIndex;
+import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
 import org.roaringbitmap.RoaringBitmapWriter;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
-
-public class NativeMutableFSTIndex implements MutableTextIndex {
-  private final String _column;
+@Deprecated
+public class NativeMutableFSTIndex implements TextIndexReader {
   private final MutableFST _fst;
   private final ReentrantReadWriteLock.ReadLock _readLock;
   private final ReentrantReadWriteLock.WriteLock _writeLock;
   private int _dictId;
 
-  public NativeMutableFSTIndex(String column) {
-    _column = column;
+  @Deprecated
+  public NativeMutableFSTIndex(String columnName) {
+    this();
+  }
+
+  public NativeMutableFSTIndex() {
     _fst = new MutableFSTImpl();
 
     ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock();
@@ -45,7 +48,6 @@ public NativeMutableFSTIndex(String column) {
     _writeLock = readWriteLock.writeLock();
   }
 
-  @Override
   public void add(String document) {
     _writeLock.lock();
     try {
@@ -56,7 +58,6 @@ public void add(String document) {
     }
   }
 
-  @Override
   public ImmutableRoaringBitmap getDictIds(String searchQuery) {
     RoaringBitmapWriter<MutableRoaringBitmap> writer = RoaringBitmapWriter.bufferWriter().get();
     _readLock.lock();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableTextIndex.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableTextIndex.java
index 1f27f57b5af..b78f2dc296e 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableTextIndex.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableTextIndex.java
@@ -82,6 +82,11 @@ public void add(String document) {
     }
   }
 
+  @Override
+  public void add(String[] documents) {
+    throw new UnsupportedOperationException("Mutable native text indexes are not supported for multi-valued columns");
+  }
+
   @Override
   public ImmutableRoaringBitmap getDictIds(String searchQuery) {
     throw new UnsupportedOperationException();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneIndexReaderRefreshThread.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneIndexReaderRefreshThread.java
index a352f374284..13110b4f324 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneIndexReaderRefreshThread.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneIndexReaderRefreshThread.java
@@ -135,7 +135,9 @@ public void run() {
             }
           }
         } finally {
-          _luceneRealtimeReaders.offer(realtimeReadersForSegment);
+          if (!realtimeReadersForSegment.isSegmentDestroyed()) {
+            _luceneRealtimeReaders.offer(realtimeReadersForSegment);
+          }
           realtimeReadersForSegment.getLock().unlock();
         }
       }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneTextIndex.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneTextIndex.java
index e0667483355..54a684be04d 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneTextIndex.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/RealtimeLuceneTextIndex.java
@@ -45,10 +45,9 @@
  */
 public class RealtimeLuceneTextIndex implements MutableTextIndex {
   private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(RealtimeLuceneTextIndex.class);
-
-  private final QueryParser _queryParser;
   private final LuceneTextIndexCreator _indexCreator;
   private SearcherManager _searcherManager;
+  private final StandardAnalyzer _analyzer = new StandardAnalyzer();
   private final String _column;
   private final String _segmentName;
 
@@ -84,8 +83,6 @@ public RealtimeLuceneTextIndex(String column, File segmentIndexDir, String segme
           e.getMessage());
       throw new RuntimeException(e);
     }
-    StandardAnalyzer analyzer = new StandardAnalyzer();
-    _queryParser = new QueryParser(column, analyzer);
   }
 
   /**
@@ -96,6 +93,14 @@ public void add(String document) {
     _indexCreator.add(document);
   }
 
+  /**
+   * Adds a new document, made up of multiple values.
+   */
+  @Override
+  public void add(String[] documents) {
+    _indexCreator.add(documents, documents.length);
+  }
+
   @Override
   public ImmutableRoaringBitmap getDictIds(String searchQuery) {
     throw new UnsupportedOperationException();
@@ -107,7 +112,7 @@ public MutableRoaringBitmap getDocIds(String searchQuery) {
     Collector docIDCollector = new RealtimeLuceneDocIdCollector(docIDs);
     IndexSearcher indexSearcher = null;
     try {
-      Query query = _queryParser.parse(searchQuery);
+      Query query = new QueryParser(_column, _analyzer).parse(searchQuery);
       indexSearcher = _searcherManager.acquire();
       indexSearcher.search(query, docIDCollector);
       return getPinotDocIds(indexSearcher, docIDs);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/IntermediateSegmentStatsContainer.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/IntermediateSegmentStatsContainer.java
deleted file mode 100644
index edec434d66e..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/IntermediateSegmentStatsContainer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.segment.creator;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.pinot.segment.local.indexsegment.mutable.IntermediateSegment;
-import org.apache.pinot.segment.local.realtime.converter.stats.MutableColumnStatistics;
-import org.apache.pinot.segment.spi.creator.ColumnStatistics;
-import org.apache.pinot.segment.spi.creator.SegmentPreIndexStatsContainer;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-
-
-public class IntermediateSegmentStatsContainer implements SegmentPreIndexStatsContainer {
-  private final IntermediateSegment _intermediateSegment;
-  private final Map<String, ColumnStatistics> _columnStatisticsMap = new HashMap<>();
-
-  public IntermediateSegmentStatsContainer(IntermediateSegment intermediateSegment) {
-    _intermediateSegment = intermediateSegment;
-
-    // Create all column statistics
-    for (String columnName : intermediateSegment.getPhysicalColumnNames()) {
-      DataSource dataSource = intermediateSegment.getDataSource(columnName);
-      // Always use dictionary for intermediate segment stats
-      _columnStatisticsMap.put(columnName, new MutableColumnStatistics(dataSource, null));
-    }
-  }
-
-  @Override
-  public ColumnStatistics getColumnProfileFor(String column) {
-    return _columnStatisticsMap.get(column);
-  }
-
-  @Override
-  public int getTotalDocCount() {
-    return _intermediateSegment.getNumDocsIndexed();
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/DefaultIndexCreatorProvider.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/DefaultIndexCreatorProvider.java
deleted file mode 100644
index 6c8859d1ca7..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/DefaultIndexCreatorProvider.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.segment.creator.impl;
-
-import com.google.common.base.Preconditions;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Objects;
-import org.apache.pinot.segment.local.io.writer.impl.BaseChunkSVForwardIndexWriter;
-import org.apache.pinot.segment.local.segment.creator.impl.bloom.OnHeapGuavaBloomFilterCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueFixedByteRawIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueUnsortedForwardIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueVarByteRawIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.NoOpForwardIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueFixedByteRawIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueSortedForwardIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueUnsortedForwardIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueVarByteRawIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.BitSlicedRangeIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.OffHeapBitmapInvertedIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.OnHeapBitmapInvertedIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.RangeIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.geospatial.OffHeapH3IndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.geospatial.OnHeapH3IndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.json.OffHeapJsonIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.json.OnHeapJsonIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.text.LuceneFSTIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.text.LuceneTextIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.text.NativeTextIndexCreator;
-import org.apache.pinot.segment.local.utils.nativefst.NativeFSTIndexCreator;
-import org.apache.pinot.segment.spi.Constants;
-import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
-import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
-import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
-import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
-import org.apache.pinot.spi.config.table.FSTType;
-import org.apache.pinot.spi.config.table.FieldConfig;
-import org.apache.pinot.spi.data.FieldSpec;
-
-
-/**
- * This class centralizes logic for how to create indexes. It can be overridden
- * by SPI {@see IndexCreatorProviders} and should not be constructed directly, but
- * accessed only via {@see IndexCreatorProviders#getIndexCreatorProvider}. Unless
- * a user provides an override, this is the logic which will be used to create
- * each index type.
- */
-public final class DefaultIndexCreatorProvider implements IndexCreatorProvider {
-
-  @Override
-  public ForwardIndexCreator newForwardIndexCreator(IndexCreationContext.Forward context)
-      throws Exception {
-    if (!context.hasDictionary()) {
-      // Dictionary disabled columns
-      boolean deriveNumDocsPerChunk =
-          shouldDeriveNumDocsPerChunk(context.getFieldSpec().getName(), context.getColumnProperties());
-      int writerVersion = getRawIndexWriterVersion(context.getFieldSpec().getName(), context.getColumnProperties());
-      if (context.getFieldSpec().isSingleValueField()) {
-        return getRawIndexCreatorForSVColumn(context.getIndexDir(), context.getChunkCompressionType(),
-            context.getFieldSpec().getName(), context.getFieldSpec().getDataType().getStoredType(),
-            context.getTotalDocs(), context.getLengthOfLongestEntry(), deriveNumDocsPerChunk, writerVersion);
-      } else {
-        return getRawIndexCreatorForMVColumn(context.getIndexDir(), context.getChunkCompressionType(),
-            context.getFieldSpec().getName(), context.getFieldSpec().getDataType().getStoredType(),
-            context.getTotalDocs(), context.getMaxNumberOfMultiValueElements(), deriveNumDocsPerChunk, writerVersion,
-            context.getMaxRowLengthInBytes());
-      }
-    } else {
-      // Dictionary enabled columns
-      if (context.forwardIndexDisabled() && !context.isSorted()) {
-        // Forward index disabled columns which aren't sorted
-        // Sorted columns treat this option as a no-op
-        return new NoOpForwardIndexCreator(context.getFieldSpec().isSingleValueField());
-      } else {
-        // Forward index enabled columns
-        if (context.getFieldSpec().isSingleValueField()) {
-          if (context.isSorted()) {
-            return new SingleValueSortedForwardIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-                context.getCardinality());
-          } else {
-            return new SingleValueUnsortedForwardIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-                context.getCardinality(), context.getTotalDocs());
-          }
-        } else {
-          return new MultiValueUnsortedForwardIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-              context.getCardinality(), context.getTotalDocs(), context.getTotalNumberOfEntries());
-        }
-      }
-    }
-  }
-
-  @Override
-  public DictionaryBasedInvertedIndexCreator newInvertedIndexCreator(IndexCreationContext.Inverted context)
-      throws IOException {
-    if (context.isOnHeap()) {
-      return new OnHeapBitmapInvertedIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-          context.getCardinality());
-    } else {
-      return new OffHeapBitmapInvertedIndexCreator(context.getIndexDir(), context.getFieldSpec(),
-          context.getCardinality(), context.getTotalDocs(), context.getTotalNumberOfEntries());
-    }
-  }
-
-  @Override
-  public JsonIndexCreator newJsonIndexCreator(IndexCreationContext.Json context)
-      throws IOException {
-    Preconditions.checkState(context.getFieldSpec().isSingleValueField(),
-        "Json index is currently only supported on single-value columns");
-    Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.STRING,
-        "Json index is currently only supported on STRING columns");
-    return context.isOnHeap() ? new OnHeapJsonIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-        context.getJsonIndexConfig())
-        : new OffHeapJsonIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-            context.getJsonIndexConfig());
-  }
-
-  @Override
-  public TextIndexCreator newTextIndexCreator(IndexCreationContext.Text context)
-      throws IOException {
-    if (context.isFst()) {
-      Preconditions.checkState(context.getFieldSpec().isSingleValueField(),
-          "FST index is currently only supported on single-value columns");
-      Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.STRING,
-          "FST index is currently only supported on STRING type columns");
-      Preconditions.checkState(context.hasDictionary(),
-          "FST index is currently only supported on dictionary-encoded columns");
-      String[] sortedValues = context.getSortedUniqueElementsArray();
-      if (context.getFstType() == FSTType.NATIVE) {
-        return new NativeFSTIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), sortedValues);
-      } else {
-        return new LuceneFSTIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), sortedValues);
-      }
-    } else {
-      Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.STRING,
-          "Text index is currently only supported on STRING type columns");
-      if (context.getFstType() == FSTType.NATIVE) {
-        return new NativeTextIndexCreator(context.getFieldSpec().getName(), context.getIndexDir());
-      } else {
-        return new LuceneTextIndexCreator(context.getFieldSpec().getName(), context.getIndexDir(),
-                context.isCommitOnClose(), context.getStopWordsInclude(), context.getStopWordsExclude());
-      }
-    }
-  }
-
-  @Override
-  public GeoSpatialIndexCreator newGeoSpatialIndexCreator(IndexCreationContext.Geospatial context)
-      throws IOException {
-    Preconditions.checkState(context.getFieldSpec().isSingleValueField(),
-        "H3 index is currently only supported on single-value columns");
-    Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.BYTES,
-        "H3 index is currently only supported on BYTES columns");
-    H3IndexResolution resolution = Objects.requireNonNull(context.getH3IndexConfig()).getResolution();
-    return context.isOnHeap() ? new OnHeapH3IndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
-        resolution) : new OffHeapH3IndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), resolution);
-  }
-
-  public static boolean shouldDeriveNumDocsPerChunk(String columnName,
-      Map<String, Map<String, String>> columnProperties) {
-    if (columnProperties != null) {
-      Map<String, String> properties = columnProperties.get(columnName);
-      return properties != null && Boolean.parseBoolean(
-          properties.get(FieldConfig.DERIVE_NUM_DOCS_PER_CHUNK_RAW_INDEX_KEY));
-    }
-    return false;
-  }
-
-  public static int getRawIndexWriterVersion(String columnName, Map<String, Map<String, String>> columnProperties) {
-    if (columnProperties != null && columnProperties.get(columnName) != null) {
-      Map<String, String> properties = columnProperties.get(columnName);
-      String version = properties.get(FieldConfig.RAW_INDEX_WRITER_VERSION);
-      if (version == null) {
-        return BaseChunkSVForwardIndexWriter.DEFAULT_VERSION;
-      }
-      return Integer.parseInt(version);
-    }
-    return BaseChunkSVForwardIndexWriter.DEFAULT_VERSION;
-  }
-
-  /**
-   * Helper method to build the raw index creator for the column.
-   * Assumes that column to be indexed is single valued.
-   *
-   * @param file Output index file
-   * @param column Column name
-   * @param totalDocs Total number of documents to index
-   * @param lengthOfLongestEntry Length of longest entry
-   * @param deriveNumDocsPerChunk true if varbyte writer should auto-derive the number of rows per chunk
-   * @param writerVersion version to use for the raw index writer
-   * @return raw index creator
-   */
-  public static ForwardIndexCreator getRawIndexCreatorForSVColumn(File file, ChunkCompressionType compressionType,
-      String column, FieldSpec.DataType dataType, int totalDocs, int lengthOfLongestEntry,
-      boolean deriveNumDocsPerChunk,
-      int writerVersion)
-      throws IOException {
-    switch (dataType.getStoredType()) {
-      case INT:
-      case LONG:
-      case FLOAT:
-      case DOUBLE:
-        return new SingleValueFixedByteRawIndexCreator(file, compressionType, column, totalDocs, dataType,
-            writerVersion);
-      case BIG_DECIMAL:
-      case STRING:
-      case BYTES:
-        return new SingleValueVarByteRawIndexCreator(file, compressionType, column, totalDocs, dataType,
-            lengthOfLongestEntry, deriveNumDocsPerChunk, writerVersion);
-      default:
-        throw new UnsupportedOperationException("Data type not supported for raw indexing: " + dataType);
-    }
-  }
-
-  /**
-   * Helper method to build the raw index creator for the column.
-   * Assumes that column to be indexed is single valued.
-   *
-   * @param file Output index file
-   * @param column Column name
-   * @param totalDocs Total number of documents to index
-   * @param deriveNumDocsPerChunk true if varbyte writer should auto-derive the number of rows
-   *     per chunk
-   * @param writerVersion version to use for the raw index writer
-   * @param maxRowLengthInBytes the length of the longest row in bytes
-   * @return raw index creator
-   */
-  public static ForwardIndexCreator getRawIndexCreatorForMVColumn(File file, ChunkCompressionType compressionType,
-      String column, FieldSpec.DataType dataType, final int totalDocs, int maxNumberOfMultiValueElements,
-      boolean deriveNumDocsPerChunk, int writerVersion, int maxRowLengthInBytes)
-      throws IOException {
-    switch (dataType.getStoredType()) {
-      case INT:
-      case LONG:
-      case FLOAT:
-      case DOUBLE:
-        return new MultiValueFixedByteRawIndexCreator(file, compressionType, column, totalDocs, dataType,
-            maxNumberOfMultiValueElements, deriveNumDocsPerChunk, writerVersion);
-      case STRING:
-      case BYTES:
-        return new MultiValueVarByteRawIndexCreator(file, compressionType, column, totalDocs, dataType, writerVersion,
-            maxRowLengthInBytes, maxNumberOfMultiValueElements);
-      default:
-        throw new UnsupportedOperationException("Data type not supported for raw indexing: " + dataType);
-    }
-  }
-
-  @Override
-  public BloomFilterCreator newBloomFilterCreator(IndexCreationContext.BloomFilter context)
-      throws IOException {
-    int cardinality = context.getCardinality();
-    if (cardinality == Constants.UNKNOWN_CARDINALITY) {
-      // This is when we're creating bloom filters for non dictionary encoded cols where exact cardinality is not
-      // known beforehand.
-      // Since this field is only used for the estimate cardinality, using total # of entries instead
-      // TODO (saurabh) Check if we can do a better estimate
-      cardinality = context.getTotalNumberOfEntries();
-    }
-    return new OnHeapGuavaBloomFilterCreator(context.getIndexDir(), context.getFieldSpec().getName(), cardinality,
-        Objects.requireNonNull(context.getBloomFilterConfig()));
-  }
-
-  @Override
-  public CombinedInvertedIndexCreator newRangeIndexCreator(IndexCreationContext.Range context)
-      throws IOException {
-    if (context.getRangeIndexVersion() == BitSlicedRangeIndexCreator.VERSION && context.getFieldSpec()
-        .isSingleValueField()) {
-      if (context.hasDictionary()) {
-        return new BitSlicedRangeIndexCreator(context.getIndexDir(), context.getFieldSpec(), context.getCardinality());
-      }
-      return new BitSlicedRangeIndexCreator(context.getIndexDir(), context.getFieldSpec(), context.getMinValue(),
-          context.getMaxValue());
-    }
-    // default to RangeIndexCreator for the time being
-    return new RangeIndexCreator(context.getIndexDir(), context.getFieldSpec(),
-        context.hasDictionary() ? FieldSpec.DataType.INT : context.getFieldSpec().getDataType(), -1,
-        -1, context.getTotalDocs(), context.getTotalNumberOfEntries());
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SameValueForwardIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SameValueForwardIndexCreator.java
new file mode 100644
index 00000000000..471495173c7
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SameValueForwardIndexCreator.java
@@ -0,0 +1,138 @@
+/**
+ * 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.pinot.segment.local.segment.creator.impl;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+class SameValueForwardIndexCreator implements ForwardIndexCreator {
+
+  private final Object _actualValue;
+  private final ForwardIndexCreator _delegate;
+
+  public SameValueForwardIndexCreator(Object value, ForwardIndexCreator delegate) {
+    _actualValue = value;
+    _delegate = delegate;
+  }
+
+  @Override
+  public void seal()
+      throws IOException {
+    _delegate.seal();
+  }
+
+  @Override
+  public boolean isDictionaryEncoded() {
+    return false;
+  }
+
+  @Override
+  public boolean isSingleValue() {
+    return _delegate.isSingleValue();
+  }
+
+  @Override
+  public FieldSpec.DataType getValueType() {
+    return _delegate.getValueType();
+  }
+
+  @Override
+  public void putInt(int value) {
+    _delegate.putInt((int) _actualValue);
+  }
+
+  @Override
+  public void putLong(long value) {
+    _delegate.putLong((long) _actualValue);
+  }
+
+  @Override
+  public void putFloat(float value) {
+    _delegate.putFloat((float) _actualValue);
+  }
+
+  @Override
+  public void putDouble(double value) {
+    _delegate.putDouble((double) _actualValue);
+  }
+
+  @Override
+  public void close()
+      throws IOException {
+    _delegate.close();
+  }
+
+  @Override
+  public void putDictId(int dictId) {
+    throw new UnsupportedOperationException("Cannot be used with dictionaries");
+  }
+
+  @Override
+  public void putDictIdMV(int[] dictIds) {
+    throw new UnsupportedOperationException("Cannot be used with dictionaries");
+  }
+
+  @Override
+  public void putBigDecimal(BigDecimal value) {
+    _delegate.putBigDecimal((BigDecimal) _actualValue);
+  }
+
+  @Override
+  public void putString(String value) {
+    _delegate.putString((String) _actualValue);
+  }
+
+  @Override
+  public void putBytes(byte[] value) {
+    _delegate.putBytes((byte[]) _actualValue);
+  }
+
+  @Override
+  public void putIntMV(int[] values) {
+    _delegate.putIntMV((int[]) _actualValue);
+  }
+
+  @Override
+  public void putLongMV(long[] values) {
+    _delegate.putLongMV((long[]) _actualValue);
+  }
+
+  @Override
+  public void putFloatMV(float[] values) {
+    _delegate.putFloatMV((float[]) _actualValue);
+  }
+
+  @Override
+  public void putDoubleMV(double[] values) {
+    _delegate.putDoubleMV((double[]) _actualValue);
+  }
+
+  @Override
+  public void putStringMV(String[] values) {
+    _delegate.putStringMV((String[]) _actualValue);
+  }
+
+  @Override
+  public void putBytesMV(byte[][] values) {
+    _delegate.putBytesMV((byte[][]) _actualValue);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentColumnarIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentColumnarIndexCreator.java
index cbee9ad7466..f86b8cada2b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentColumnarIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentColumnarIndexCreator.java
@@ -20,48 +20,43 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import java.io.File;
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.Collection;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.pinot.common.utils.FileUtils;
 import org.apache.pinot.segment.local.io.util.PinotDataBitSet;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.BitSlicedRangeIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.nullvalue.NullValueVectorCreator;
-import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
-import org.apache.pinot.segment.local.utils.GeometrySerializer;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexPlugin;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
 import org.apache.pinot.segment.spi.creator.ColumnIndexCreationInfo;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentCreator;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
-import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
-import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexCreator;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
-import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
 import org.apache.pinot.segment.spi.index.creator.SegmentIndexCreationInfo;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.apache.pinot.spi.config.table.BloomFilterConfig;
-import org.apache.pinot.spi.config.table.FSTType;
-import org.apache.pinot.spi.config.table.FieldConfig;
-import org.apache.pinot.spi.config.table.IndexingConfig;
-import org.apache.pinot.spi.config.table.JsonIndexConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
 import org.apache.pinot.spi.data.DateTimeFieldSpec;
 import org.apache.pinot.spi.data.DateTimeFormatSpec;
@@ -70,7 +65,6 @@
 import org.apache.pinot.spi.data.FieldSpec.FieldType;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.utils.BytesUtils;
 import org.apache.pinot.spi.utils.TimeUtils;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Interval;
@@ -78,7 +72,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.pinot.segment.spi.V1Constants.MetadataKeys.Column.*;
 import static org.apache.pinot.segment.spi.V1Constants.MetadataKeys.Segment.*;
 
@@ -91,19 +84,15 @@ public class SegmentColumnarIndexCreator implements SegmentCreator {
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentColumnarIndexCreator.class);
   // Allow at most 512 characters for the metadata property
   private static final int METADATA_PROPERTY_LENGTH_LIMIT = 512;
-
   private SegmentGeneratorConfig _config;
-  private Map<String, ColumnIndexCreationInfo> _indexCreationInfoMap;
-  private final IndexCreatorProvider _indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
+  private TreeMap<String, ColumnIndexCreationInfo> _indexCreationInfoMap;
   private final Map<String, SegmentDictionaryCreator> _dictionaryCreatorMap = new HashMap<>();
-  private final Map<String, ForwardIndexCreator> _forwardIndexCreatorMap = new HashMap<>();
-  private final Map<String, DictionaryBasedInvertedIndexCreator> _invertedIndexCreatorMap = new HashMap<>();
-  private final Map<String, BloomFilterCreator> _bloomFilterCreatorMap = new HashMap<>();
-  private final Map<String, CombinedInvertedIndexCreator> _rangeIndexFilterCreatorMap = new HashMap<>();
-  private final Map<String, TextIndexCreator> _textIndexCreatorMap = new HashMap<>();
-  private final Map<String, TextIndexCreator> _fstIndexCreatorMap = new HashMap<>();
-  private final Map<String, JsonIndexCreator> _jsonIndexCreatorMap = new HashMap<>();
-  private final Map<String, GeoSpatialIndexCreator> _h3IndexCreatorMap = new HashMap<>();
+  /**
+   * Contains, indexed by column name, the creator associated with each index type.
+   *
+   * Indexes that {@link #hasSpecialLifecycle(IndexType) have a special lyfecycle} are not included here.
+   */
+  private Map<String, Map<IndexType<?, ?, ?>, IndexCreator>> _creatorsByColAndIndex = new HashMap<>();
   private final Map<String, NullValueVectorCreator> _nullValueVectorCreatorMap = new HashMap<>();
   private String _segmentName;
   private Schema _schema;
@@ -111,16 +100,14 @@ public class SegmentColumnarIndexCreator implements SegmentCreator {
   private int _totalDocs;
   private int _docIdCounter;
   private boolean _nullHandlingEnabled;
-  private Map<String, Map<String, String>> _columnProperties;
 
   @Override
   public void init(SegmentGeneratorConfig segmentCreationSpec, SegmentIndexCreationInfo segmentIndexCreationInfo,
-      Map<String, ColumnIndexCreationInfo> indexCreationInfoMap, Schema schema, File outDir)
+      TreeMap<String, ColumnIndexCreationInfo> indexCreationInfoMap, Schema schema, File outDir)
       throws Exception {
     _docIdCounter = 0;
     _config = segmentCreationSpec;
     _indexCreationInfoMap = indexCreationInfoMap;
-    _columnProperties = segmentCreationSpec.getColumnProperties();
 
     // Check that the output directory does not exist
     Preconditions.checkState(!outDir.exists(), "Segment output directory: %s already exists", outDir);
@@ -134,222 +121,142 @@ public void init(SegmentGeneratorConfig segmentCreationSpec, SegmentIndexCreatio
       return;
     }
 
-    Collection<FieldSpec> fieldSpecs = schema.getAllFieldSpecs();
-    Set<String> invertedIndexColumns = new HashSet<>();
-    for (String columnName : _config.getInvertedIndexCreationColumns()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create inverted index for column: %s because it is not in schema", columnName);
-      invertedIndexColumns.add(columnName);
-    }
-
-    Set<String> bloomFilterColumns = new HashSet<>();
-    for (String columnName : _config.getBloomFilterCreationColumns()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create bloom filter for column: %s because it is not in schema", columnName);
-      bloomFilterColumns.add(columnName);
-    }
-
-    Set<String> rangeIndexColumns = new HashSet<>();
-    for (String columnName : _config.getRangeIndexCreationColumns()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create range index for column: %s because it is not in schema", columnName);
-      rangeIndexColumns.add(columnName);
-    }
-
-    Set<String> textIndexColumns = new HashSet<>();
-    for (String columnName : _config.getTextIndexCreationColumns()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create text index for column: %s because it is not in schema", columnName);
-      textIndexColumns.add(columnName);
-    }
+    Map<String, FieldIndexConfigs> indexConfigs = segmentCreationSpec.getIndexConfigsByColName();
 
-    Set<String> fstIndexColumns = new HashSet<>();
-    for (String columnName : _config.getFSTIndexCreationColumns()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create FST index for column: %s because it is not in schema", columnName);
-      fstIndexColumns.add(columnName);
-    }
-
-    Map<String, JsonIndexConfig> jsonIndexConfigs = _config.getJsonIndexConfigs();
-    for (String columnName : jsonIndexConfigs.keySet()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create json index for column: %s because it is not in schema", columnName);
-    }
-
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    for (String columnName : _config.getForwardIndexDisabledColumns()) {
-      Preconditions.checkState(schema.hasColumn(columnName), String.format("Invalid config. Can't disable "
-          + "forward index creation for a column: %s that does not exist in schema", columnName));
-      forwardIndexDisabledColumns.add(columnName);
-    }
-
-    Map<String, H3IndexConfig> h3IndexConfigs = _config.getH3IndexConfigs();
-    for (String columnName : h3IndexConfigs.keySet()) {
-      Preconditions.checkState(schema.hasColumn(columnName),
-          "Cannot create H3 index for column: %s because it is not in schema", columnName);
-    }
+    _creatorsByColAndIndex = Maps.newHashMapWithExpectedSize(indexConfigs.keySet().size());
 
-    // Initialize creators for dictionary, forward index and inverted index
-    IndexingConfig indexingConfig = _config.getTableConfig().getIndexingConfig();
-    int rangeIndexVersion = indexingConfig.getRangeIndexVersion();
-    for (FieldSpec fieldSpec : fieldSpecs) {
-      // Ignore virtual columns
+    for (String columnName : indexConfigs.keySet()) {
+      FieldSpec fieldSpec = schema.getFieldSpecFor(columnName);
+      if (fieldSpec == null) {
+        Preconditions.checkState(schema.hasColumn(columnName),
+            "Cannot create index for column: %s because it is not in schema", columnName);
+      }
       if (fieldSpec.isVirtualColumn()) {
+        LOGGER.warn("Ignoring index creation for virtual column " + columnName);
         continue;
       }
 
-      String columnName = fieldSpec.getName();
+      FieldIndexConfigs originalConfig = indexConfigs.get(columnName);
       ColumnIndexCreationInfo columnIndexCreationInfo = indexCreationInfoMap.get(columnName);
       Preconditions.checkNotNull(columnIndexCreationInfo, "Missing index creation info for column: %s", columnName);
       boolean dictEnabledColumn = createDictionaryForColumn(columnIndexCreationInfo, segmentCreationSpec, fieldSpec);
-      Preconditions.checkState(dictEnabledColumn || !invertedIndexColumns.contains(columnName),
+      Preconditions.checkState(dictEnabledColumn || !originalConfig.getConfig(StandardIndexes.inverted()).isEnabled(),
           "Cannot create inverted index for raw index column: %s", columnName);
 
-      boolean forwardIndexDisabled = forwardIndexDisabledColumns.contains(columnName);
-      validateForwardIndexDisabledIndexCompatibility(columnName, forwardIndexDisabled, dictEnabledColumn,
-          columnIndexCreationInfo, invertedIndexColumns, rangeIndexColumns, rangeIndexVersion, fieldSpec);
+      IndexType<ForwardIndexConfig, ?, ForwardIndexCreator> forwardIdx = StandardIndexes.forward();
+      boolean forwardIndexDisabled = !originalConfig.getConfig(forwardIdx).isEnabled();
 
       IndexCreationContext.Common context = IndexCreationContext.builder()
           .withIndexDir(_indexDir)
-          .withCardinality(columnIndexCreationInfo.getDistinctValueCount())
           .withDictionary(dictEnabledColumn)
           .withFieldSpec(fieldSpec)
           .withTotalDocs(segmentIndexCreationInfo.getTotalDocs())
-          .withMinValue((Comparable<?>) columnIndexCreationInfo.getMin())
-          .withMaxValue((Comparable<?>) columnIndexCreationInfo.getMax())
-          .withTotalNumberOfEntries(columnIndexCreationInfo.getTotalNumberOfEntries())
           .withColumnIndexCreationInfo(columnIndexCreationInfo)
-          .sorted(columnIndexCreationInfo.isSorted())
+          .withOptimizedDictionary(_config.isOptimizeDictionary()
+              || _config.isOptimizeDictionaryForMetrics() && fieldSpec.getFieldType() == FieldSpec.FieldType.METRIC)
           .onHeap(segmentCreationSpec.isOnHeap())
-          .withforwardIndexDisabled(forwardIndexDisabled)
+          .withForwardIndexDisabled(forwardIndexDisabled)
+          .withTextCommitOnClose(true)
           .build();
-      // Initialize forward index creator
-      ChunkCompressionType chunkCompressionType =
-          dictEnabledColumn ? null : getColumnCompressionType(segmentCreationSpec, fieldSpec);
-      _forwardIndexCreatorMap.put(columnName, _indexCreatorProvider.newForwardIndexCreator(
-          context.forForwardIndex(chunkCompressionType, segmentCreationSpec.getColumnProperties())));
-
-      // Initialize inverted index creator; skip creating inverted index if sorted
-      if (invertedIndexColumns.contains(columnName) && !columnIndexCreationInfo.isSorted()) {
-        _invertedIndexCreatorMap.put(columnName,
-            _indexCreatorProvider.newInvertedIndexCreator(context.forInvertedIndex()));
-      }
+
+      FieldIndexConfigs config = adaptConfig(columnName, originalConfig, columnIndexCreationInfo, segmentCreationSpec);
+
       if (dictEnabledColumn) {
         // Create dictionary-encoded index
         // Initialize dictionary creator
         // TODO: Dictionary creator holds all unique values on heap. Consider keeping dictionary instead of creator
         //       which uses off-heap memory.
-        SegmentDictionaryCreator dictionaryCreator =
-            new SegmentDictionaryCreator(fieldSpec, _indexDir, columnIndexCreationInfo.isUseVarLengthDictionary());
-        _dictionaryCreatorMap.put(columnName, dictionaryCreator);
-        // Create dictionary
+
+        DictionaryIndexConfig dictConfig = config.getConfig(StandardIndexes.dictionary());
+        if (!dictConfig.isEnabled()) {
+          LOGGER.info("Creating dictionary index in column {}.{} even when it is disabled in config",
+              segmentCreationSpec.getTableName(), columnName);
+        }
+        SegmentDictionaryCreator creator = new DictionaryIndexPlugin().getIndexType()
+            .createIndexCreator(context, dictConfig);
+
         try {
-          dictionaryCreator.build(columnIndexCreationInfo.getSortedUniqueElementsArray());
+          creator.build(context.getSortedUniqueElementsArray());
         } catch (Exception e) {
           LOGGER.error("Error building dictionary for field: {}, cardinality: {}, number of bytes per entry: {}",
-              fieldSpec.getName(), columnIndexCreationInfo.getDistinctValueCount(),
-              dictionaryCreator.getNumBytesPerEntry());
+              context.getFieldSpec().getName(), context.getCardinality(), creator.getNumBytesPerEntry());
           throw e;
         }
-      }
-
-      if (bloomFilterColumns.contains(columnName)) {
-        if (indexingConfig.getBloomFilterConfigs() != null
-            && indexingConfig.getBloomFilterConfigs().containsKey(columnName)) {
-          _bloomFilterCreatorMap.put(columnName, _indexCreatorProvider.newBloomFilterCreator(
-              context.forBloomFilter(indexingConfig.getBloomFilterConfigs().get(columnName))));
-        } else {
-          _bloomFilterCreatorMap.put(columnName, _indexCreatorProvider.newBloomFilterCreator(
-              context.forBloomFilter(new BloomFilterConfig(BloomFilterConfig.DEFAULT_FPP, 0, false))));
-        }
-      }
 
-      if (!columnIndexCreationInfo.isSorted() && rangeIndexColumns.contains(columnName)) {
-        _rangeIndexFilterCreatorMap.put(columnName,
-            _indexCreatorProvider.newRangeIndexCreator(context.forRangeIndex(rangeIndexVersion)));
+        _dictionaryCreatorMap.put(columnName, creator);
       }
 
-      if (textIndexColumns.contains(columnName)) {
-        FSTType fstType = FSTType.LUCENE;
-        List<FieldConfig> fieldConfigList = _config.getTableConfig().getFieldConfigList();
-        if (fieldConfigList != null) {
-          for (FieldConfig fieldConfig : fieldConfigList) {
-            if (fieldConfig.getName().equals(columnName)) {
-              Map<String, String> properties = fieldConfig.getProperties();
-              if (TextIndexUtils.isFstTypeNative(properties)) {
-                fstType = FSTType.NATIVE;
-              }
-            }
-          }
+      Map<IndexType<?, ?, ?>, IndexCreator> creatorsByIndex =
+          Maps.newHashMapWithExpectedSize(IndexService.getInstance().getAllIndexes().size());
+      for (IndexType<?, ?, ?> index : IndexService.getInstance().getAllIndexes()) {
+        if (hasSpecialLifecycle(index)) {
+          continue;
         }
-        _textIndexCreatorMap.put(columnName,
-            _indexCreatorProvider.newTextIndexCreator(context.forTextIndex(fstType, true,
-                TextIndexUtils.extractStopWordsInclude(columnName, _columnProperties),
-                TextIndexUtils.extractStopWordsExclude(columnName, _columnProperties))));
-      }
-
-      if (fstIndexColumns.contains(columnName)) {
-        _fstIndexCreatorMap.put(columnName, _indexCreatorProvider.newTextIndexCreator(
-            context.forFSTIndex(_config.getFSTIndexType(),
-                (String[]) columnIndexCreationInfo.getSortedUniqueElementsArray())));
-      }
-
-      JsonIndexConfig jsonIndexConfig = jsonIndexConfigs.get(columnName);
-      if (jsonIndexConfig != null) {
-        _jsonIndexCreatorMap.put(columnName,
-            _indexCreatorProvider.newJsonIndexCreator(context.forJsonIndex(jsonIndexConfig)));
+        tryCreateIndexCreator(creatorsByIndex, index, context, config);
       }
-
-      H3IndexConfig h3IndexConfig = h3IndexConfigs.get(columnName);
-      if (h3IndexConfig != null) {
-        _h3IndexCreatorMap.put(columnName,
-            _indexCreatorProvider.newGeoSpatialIndexCreator(context.forGeospatialIndex(h3IndexConfig)));
+      // TODO: Remove this when values stored as ForwardIndex stop depending on TextIndex config
+      IndexCreator oldFwdCreator = creatorsByIndex.get(forwardIdx);
+      if (oldFwdCreator != null) {
+        Object fakeForwardValue = calculateRawValueForTextIndex(dictEnabledColumn, config, fieldSpec);
+        if (fakeForwardValue != null) {
+          @SuppressWarnings("unchecked")
+          ForwardIndexCreator castedOldFwdCreator = (ForwardIndexCreator) oldFwdCreator;
+          SameValueForwardIndexCreator fakeValueFwdCreator =
+              new SameValueForwardIndexCreator(fakeForwardValue, castedOldFwdCreator);
+          creatorsByIndex.put(forwardIdx, fakeValueFwdCreator);
+        }
       }
+      _creatorsByColAndIndex.put(columnName, creatorsByIndex);
+    }
 
-      _nullHandlingEnabled = _config.isNullHandlingEnabled();
-      if (_nullHandlingEnabled) {
+    // Although NullValueVector is implemented as an index, it needs to be treated in a different way than other indexes
+    _nullHandlingEnabled = _config.isNullHandlingEnabled();
+    if (_nullHandlingEnabled) {
+      for (FieldSpec fieldSpec : schema.getAllFieldSpecs()) {
         // Initialize Null value vector map
+        String columnName = fieldSpec.getName();
         _nullValueVectorCreatorMap.put(columnName, new NullValueVectorCreator(_indexDir, columnName));
       }
     }
   }
 
+  private FieldIndexConfigs adaptConfig(String columnName, FieldIndexConfigs config,
+      ColumnIndexCreationInfo columnIndexCreationInfo, SegmentGeneratorConfig segmentCreationSpec) {
+    FieldIndexConfigs.Builder builder = new FieldIndexConfigs.Builder(config);
+    // Sorted columns treat the 'forwardIndexDisabled' flag as a no-op
+    ForwardIndexConfig fwdConfig = config.getConfig(StandardIndexes.forward());
+    if (!fwdConfig.isEnabled() && columnIndexCreationInfo.isSorted()) {
+      builder.add(StandardIndexes.forward(), new ForwardIndexConfig.Builder(fwdConfig)
+          .withLegacyProperties(segmentCreationSpec.getColumnProperties(), columnName)
+          .build());
+    }
+    // Initialize inverted index creator; skip creating inverted index if sorted
+    if (columnIndexCreationInfo.isSorted()) {
+      builder.undeclare(StandardIndexes.inverted());
+    }
+    return builder.build();
+  }
+
   /**
-   * Validates the compatibility of the indexes if the column has the forward index disabled. Throws exceptions due to
-   * compatibility mismatch. The checks performed are:
-   *     - Validate dictionary is enabled.
-   *     - Validate inverted index is enabled.
-   *     - Validate that either no range index exists for column or the range index version is at least 2 and isn't a
-   *       multi-value column (since multi-value defaults to index v1).
-   *
-   * @param columnName Name of the column
-   * @param forwardIndexDisabled Whether the forward index is disabled for column or not
-   * @param dictEnabledColumn Whether the column is dictionary enabled or not
-   * @param columnIndexCreationInfo Column index creation info
-   * @param invertedIndexColumns Set of columns with inverted index enabled
-   * @param rangeIndexColumns Set of columns with range index enabled
-   * @param rangeIndexVersion Range index version
-   * @param fieldSpec FieldSpec of column
+   * Returns true if the given index type has their own construction lifecycle and therefore should not be instantiated
+   * in the general index loop and shouldn't be notified of each new column.
    */
-  private void validateForwardIndexDisabledIndexCompatibility(String columnName, boolean forwardIndexDisabled,
-      boolean dictEnabledColumn, ColumnIndexCreationInfo columnIndexCreationInfo, Set<String> invertedIndexColumns,
-      Set<String> rangeIndexColumns, int rangeIndexVersion, FieldSpec fieldSpec) {
-    if (!forwardIndexDisabled) {
-      return;
-    }
+  private boolean hasSpecialLifecycle(IndexType<?, ?, ?> indexType) {
+    return indexType == StandardIndexes.nullValueVector() || indexType == StandardIndexes.dictionary();
+  }
 
-    Preconditions.checkState(dictEnabledColumn,
-        String.format("Cannot disable forward index for column %s without dictionary", columnName));
-    Preconditions.checkState(invertedIndexColumns.contains(columnName),
-        String.format("Cannot disable forward index for column %s without inverted index enabled", columnName));
-    if (rangeIndexColumns.contains(columnName)) {
-      Preconditions.checkState(fieldSpec.isSingleValueField(),
-          String.format("Feature not supported for multi-value columns with range index. Cannot disable forward index "
-              + "for column %s. Disable range index on this column to use this feature", columnName));
-      Preconditions.checkState(rangeIndexVersion == BitSlicedRangeIndexCreator.VERSION,
-          String.format("Feature not supported for single-value columns with range index version < 2. Cannot disable "
-              + "forward index for column %s. Either disable range index or create range index with version >= 2 to "
-              + "use this feature", columnName));
+  /**
+   * Creates the {@link IndexCreator} in a type safe way.
+   *
+   * This code needs to be in a specific method instead of inlined in the main loop in order to be able to use the
+   * limited generic capabilities of Java.
+   */
+  private <C extends IndexConfig> void tryCreateIndexCreator(Map<IndexType<?, ?, ?>, IndexCreator> creatorsByIndex,
+      IndexType<C, ?, ?> index, IndexCreationContext.Common context, FieldIndexConfigs fieldIndexConfigs)
+      throws Exception {
+    C config = fieldIndexConfigs.getConfig(index);
+    if (config.isEnabled()) {
+      creatorsByIndex.put(index, index.createIndexCreator(context, config));
     }
   }
 
@@ -371,380 +278,113 @@ private void validateForwardIndexDisabledIndexCompatibility(String columnName, b
   private boolean createDictionaryForColumn(ColumnIndexCreationInfo info, SegmentGeneratorConfig config,
       FieldSpec spec) {
     String column = spec.getName();
+    boolean createDictionary = false;
     if (config.getRawIndexCreationColumns().contains(column) || config.getRawIndexCompressionType()
         .containsKey(column)) {
-      return false;
-    }
-
-    if (config.isOptimizeDictionary()) {
-
-      // Do not create dictionaries for json or text index columns as they are high-cardinality values almost always
-      if ((config.getJsonIndexConfigs().containsKey(column)
-          || config.getTextIndexCreationColumns().contains(column))) {
-        return false;
-      }
-
-      // Do not create dictionary if index size with dictionary is going to be larger than index size without dictionary
-      // This is done to reduce the cost of dictionary for high cardinality columns
-      // Off by default and needs optimizeDictionary to be set to true
-      if (spec.isSingleValueField() && spec.getDataType().isFixedWidth()) {
-        return shouldCreateDictionaryWithinThreshold(info, config, spec);
-      }
-    }
-
-    if (config.isOptimizeDictionaryForMetrics() && !config.isOptimizeDictionary()) {
-      if (spec.isSingleValueField() && spec.getDataType().isFixedWidth() && spec.getFieldType() == FieldType.METRIC) {
-        return shouldCreateDictionaryWithinThreshold(info, config, spec);
-      }
+      return createDictionary;
     }
 
-    return info.isCreateDictionary();
-  }
-
-  private boolean shouldCreateDictionaryWithinThreshold(ColumnIndexCreationInfo info,
-      SegmentGeneratorConfig config, FieldSpec spec) {
-    long dictionarySize = info.getDistinctValueCount() * spec.getDataType().size();
-    long forwardIndexSize =
-        ((long) info.getTotalNumberOfEntries()
-            * PinotDataBitSet.getNumBitsPerValue(info.getDistinctValueCount() - 1) + Byte.SIZE - 1) / Byte.SIZE;
-
-    double indexWithDictSize = dictionarySize + forwardIndexSize;
-    double indexWithoutDictSize = info.getTotalNumberOfEntries() * spec.getDataType().size();
-
-    double indexSizeRatio = indexWithoutDictSize / indexWithDictSize;
-    if (indexSizeRatio <= config.getNoDictionarySizeRatioThreshold()) {
-      return false;
+    FieldIndexConfigs fieldIndexConfigs = config.getIndexConfigsByColName().get(column);
+    if (DictionaryIndexType.ignoreDictionaryOverride(config.isOptimizeDictionary(),
+        config.isOptimizeDictionaryForMetrics(), config.getNoDictionarySizeRatioThreshold(), spec,
+        fieldIndexConfigs, info.getDistinctValueCount(), info.getTotalNumberOfEntries())) {
+      // Ignore overrides and pick from config
+      createDictionary = info.isCreateDictionary();
     }
-    return info.isCreateDictionary();
+    return createDictionary;
   }
 
   /**
-   * Helper method that returns compression type to use based on segment creation spec and field type.
-   * <ul>
-   *   <li> Returns compression type from segment creation spec, if specified there.</li>
-   *   <li> Else, returns PASS_THROUGH for metrics, and SNAPPY for dimensions. This is because metrics are likely
-   *        to be spread in different chunks after applying predicates. Same could be true for dimensions, but in that
-   *        case, clients are expected to explicitly specify the appropriate compression type in the spec. </li>
-   * </ul>
-   * @param segmentCreationSpec Segment creation spec
-   * @param fieldSpec Field spec for the column
-   * @return Compression type to use
+   * @deprecated use {@link ForwardIndexType#getDefaultCompressionType(FieldType)} instead
    */
-  private ChunkCompressionType getColumnCompressionType(SegmentGeneratorConfig segmentCreationSpec,
-      FieldSpec fieldSpec) {
-    ChunkCompressionType compressionType = segmentCreationSpec.getRawIndexCompressionType().get(fieldSpec.getName());
-    if (compressionType == null) {
-      compressionType = getDefaultCompressionType(fieldSpec.getFieldType());
-    }
-
-    return compressionType;
-  }
-
+  @Deprecated
   public static ChunkCompressionType getDefaultCompressionType(FieldType fieldType) {
-    if (fieldType == FieldSpec.FieldType.METRIC) {
-      return ChunkCompressionType.PASS_THROUGH;
-    } else {
-      return ChunkCompressionType.LZ4;
-    }
+    return ForwardIndexType.getDefaultCompressionType(fieldType);
   }
 
   @Override
   public void indexRow(GenericRow row)
       throws IOException {
-    for (Map.Entry<String, ForwardIndexCreator> entry : _forwardIndexCreatorMap.entrySet()) {
-      String columnName = entry.getKey();
-      ForwardIndexCreator forwardIndexCreator = entry.getValue();
+    for (Map.Entry<String, Map<IndexType<?, ?, ?>, IndexCreator>> byColEntry : _creatorsByColAndIndex.entrySet()) {
+      String columnName = byColEntry.getKey();
 
       Object columnValueToIndex = row.getValue(columnName);
       if (columnValueToIndex == null) {
         throw new RuntimeException("Null value for column:" + columnName);
       }
 
-      FieldSpec fieldSpec = _schema.getFieldSpecFor(columnName);
+      Map<IndexType<?, ?, ?>, IndexCreator> creatorsByIndex = byColEntry.getValue();
 
-      //get dictionaryCreator, will be null if column is not dictionaryEncoded
+      FieldSpec fieldSpec = _schema.getFieldSpecFor(columnName);
       SegmentDictionaryCreator dictionaryCreator = _dictionaryCreatorMap.get(columnName);
 
-      // bloom filter
-      BloomFilterCreator bloomFilterCreator = _bloomFilterCreatorMap.get(columnName);
-      if (bloomFilterCreator != null) {
-        if (fieldSpec.isSingleValueField()) {
-          if (fieldSpec.getDataType() == DataType.BYTES) {
-            bloomFilterCreator.add(BytesUtils.toHexString((byte[]) columnValueToIndex));
-          } else {
-            bloomFilterCreator.add(columnValueToIndex.toString());
-          }
-        } else {
-          Object[] values = (Object[]) columnValueToIndex;
-          if (fieldSpec.getDataType() == DataType.BYTES) {
-            for (Object value : values) {
-              bloomFilterCreator.add(BytesUtils.toHexString((byte[]) value));
-            }
-          } else {
-            for (Object value : values) {
-              bloomFilterCreator.add(value.toString());
-            }
-          }
-        }
-      }
-
-      // range index
-      CombinedInvertedIndexCreator combinedInvertedIndexCreator = _rangeIndexFilterCreatorMap.get(columnName);
-      if (combinedInvertedIndexCreator != null) {
-        if (dictionaryCreator != null) {
-          if (fieldSpec.isSingleValueField()) {
-            combinedInvertedIndexCreator.add(dictionaryCreator.indexOfSV(columnValueToIndex));
-          } else {
-            int[] dictIds = dictionaryCreator.indexOfMV(columnValueToIndex);
-            combinedInvertedIndexCreator.add(dictIds, dictIds.length);
-          }
-        } else {
-          if (fieldSpec.isSingleValueField()) {
-            switch (fieldSpec.getDataType()) {
-              case INT:
-                combinedInvertedIndexCreator.add((Integer) columnValueToIndex);
-                break;
-              case LONG:
-                combinedInvertedIndexCreator.add((Long) columnValueToIndex);
-                break;
-              case FLOAT:
-                combinedInvertedIndexCreator.add((Float) columnValueToIndex);
-                break;
-              case DOUBLE:
-                combinedInvertedIndexCreator.add((Double) columnValueToIndex);
-                break;
-              default:
-                throw new RuntimeException("Unsupported data type " + fieldSpec.getDataType() + " for range index");
-            }
-          } else {
-            Object[] values = (Object[]) columnValueToIndex;
-            switch (fieldSpec.getDataType()) {
-              case INT:
-                int[] intValues = new int[values.length];
-                for (int i = 0; i < values.length; i++) {
-                  intValues[i] = (Integer) values[i];
-                }
-                combinedInvertedIndexCreator.add(intValues, values.length);
-                break;
-              case LONG:
-                long[] longValues = new long[values.length];
-                for (int i = 0; i < values.length; i++) {
-                  longValues[i] = (Long) values[i];
-                }
-                combinedInvertedIndexCreator.add(longValues, values.length);
-                break;
-              case FLOAT:
-                float[] floatValues = new float[values.length];
-                for (int i = 0; i < values.length; i++) {
-                  floatValues[i] = (Float) values[i];
-                }
-                combinedInvertedIndexCreator.add(floatValues, values.length);
-                break;
-              case DOUBLE:
-                double[] doubleValues = new double[values.length];
-                for (int i = 0; i < values.length; i++) {
-                  doubleValues[i] = (Double) values[i];
-                }
-                combinedInvertedIndexCreator.add(doubleValues, values.length);
-                break;
-              default:
-                throw new RuntimeException("Unsupported data type " + fieldSpec.getDataType() + " for range index");
-            }
-          }
-        }
-      }
-
-      // text-index
-      TextIndexCreator textIndexCreator = _textIndexCreatorMap.get(columnName);
-      if (textIndexCreator != null) {
-        if (fieldSpec.isSingleValueField()) {
-          textIndexCreator.add((String) columnValueToIndex);
-        } else {
-          Object[] values = (Object[]) columnValueToIndex;
-          int length = values.length;
-          if (values instanceof String[]) {
-            textIndexCreator.add((String[]) values, length);
-          } else {
-            String[] strings = new String[length];
-            for (int i = 0; i < length; i++) {
-              strings[i] = (String) values[i];
-            }
-            textIndexCreator.add(strings, length);
-            columnValueToIndex = strings;
-          }
-        }
-      }
-
       if (fieldSpec.isSingleValueField()) {
-        // Single Value column
-        JsonIndexCreator jsonIndexCreator = _jsonIndexCreatorMap.get(columnName);
-        if (jsonIndexCreator != null) {
-          jsonIndexCreator.add((String) columnValueToIndex);
-        }
-        GeoSpatialIndexCreator h3IndexCreator = _h3IndexCreatorMap.get(columnName);
-        if (h3IndexCreator != null) {
-          h3IndexCreator.add(GeometrySerializer.deserialize((byte[]) columnValueToIndex));
-        }
-        if (dictionaryCreator != null) {
-          // dictionary encoded SV column
-          // get dictID from dictionary
-          int dictId = dictionaryCreator.indexOfSV(columnValueToIndex);
-          // store the docID -> dictID mapping in forward index
-          forwardIndexCreator.putDictId(dictId);
-          DictionaryBasedInvertedIndexCreator invertedIndexCreator = _invertedIndexCreatorMap.get(columnName);
-          if (invertedIndexCreator != null) {
-            // if inverted index enabled during segment creation,
-            // then store dictID -> docID mapping in inverted index
-            invertedIndexCreator.add(dictId);
-          }
-        } else {
-          // non-dictionary encoded SV column
-          // store the docId -> raw value mapping in forward index
-          if (textIndexCreator != null && !shouldStoreRawValueForTextIndex(columnName)) {
-            // for text index on raw columns, check the config to determine if actual raw value should
-            // be stored or not
-            columnValueToIndex = _columnProperties.get(columnName).get(FieldConfig.TEXT_INDEX_RAW_VALUE);
-            if (columnValueToIndex == null) {
-              columnValueToIndex = FieldConfig.TEXT_INDEX_DEFAULT_RAW_VALUE;
-            }
-          }
-          switch (forwardIndexCreator.getValueType()) {
-            case INT:
-              forwardIndexCreator.putInt((int) columnValueToIndex);
-              break;
-            case LONG:
-              forwardIndexCreator.putLong((long) columnValueToIndex);
-              break;
-            case FLOAT:
-              forwardIndexCreator.putFloat((float) columnValueToIndex);
-              break;
-            case DOUBLE:
-              forwardIndexCreator.putDouble((double) columnValueToIndex);
-              break;
-            case BIG_DECIMAL:
-              forwardIndexCreator.putBigDecimal((BigDecimal) columnValueToIndex);
-              break;
-            case STRING:
-              forwardIndexCreator.putString((String) columnValueToIndex);
-              break;
-            case BYTES:
-              forwardIndexCreator.putBytes((byte[]) columnValueToIndex);
-              break;
-            case JSON:
-              if (columnValueToIndex instanceof String) {
-                forwardIndexCreator.putString((String) columnValueToIndex);
-              } else if (columnValueToIndex instanceof byte[]) {
-                forwardIndexCreator.putBytes((byte[]) columnValueToIndex);
-              }
-              break;
-            default:
-              throw new IllegalStateException();
-          }
-        }
+        indexSingleValueRow(dictionaryCreator, columnValueToIndex, creatorsByIndex);
       } else {
-        if (dictionaryCreator != null) {
-          //dictionary encoded
-          int[] dictIds = dictionaryCreator.indexOfMV(columnValueToIndex);
-          forwardIndexCreator.putDictIdMV(dictIds);
-          DictionaryBasedInvertedIndexCreator invertedIndexCreator = _invertedIndexCreatorMap.get(columnName);
-          if (invertedIndexCreator != null) {
-            invertedIndexCreator.add(dictIds, dictIds.length);
-          }
-        } else {
-          // for text index on raw columns, check the config to determine if actual raw value should
-          // be stored or not
-          if (textIndexCreator != null && !shouldStoreRawValueForTextIndex(columnName)) {
-            Object value = _columnProperties.get(columnName).get(FieldConfig.TEXT_INDEX_RAW_VALUE);
-            if (value == null) {
-              value = FieldConfig.TEXT_INDEX_DEFAULT_RAW_VALUE;
-            }
-            if (forwardIndexCreator.getValueType().getStoredType() == DataType.STRING) {
-              columnValueToIndex = new String[]{String.valueOf(value)};
-            } else if (forwardIndexCreator.getValueType().getStoredType() == DataType.BYTES) {
-              columnValueToIndex = new byte[][]{String.valueOf(value).getBytes(UTF_8)};
-            } else {
-              throw new RuntimeException("Text Index is only supported for STRING and BYTES stored type");
-            }
-          }
-          Object[] values = (Object[]) columnValueToIndex;
-          int length = values.length;
-          switch (forwardIndexCreator.getValueType()) {
-            case INT:
-              int[] ints = new int[length];
-              for (int i = 0; i < length; i++) {
-                ints[i] = (Integer) values[i];
-              }
-              forwardIndexCreator.putIntMV(ints);
-              break;
-            case LONG:
-              long[] longs = new long[length];
-              for (int i = 0; i < length; i++) {
-                longs[i] = (Long) values[i];
-              }
-              forwardIndexCreator.putLongMV(longs);
-              break;
-            case FLOAT:
-              float[] floats = new float[length];
-              for (int i = 0; i < length; i++) {
-                floats[i] = (Float) values[i];
-              }
-              forwardIndexCreator.putFloatMV(floats);
-              break;
-            case DOUBLE:
-              double[] doubles = new double[length];
-              for (int i = 0; i < length; i++) {
-                doubles[i] = (Double) values[i];
-              }
-              forwardIndexCreator.putDoubleMV(doubles);
-              break;
-            case STRING:
-              if (values instanceof String[]) {
-                forwardIndexCreator.putStringMV((String[]) values);
-              } else {
-                String[] strings = new String[length];
-                for (int i = 0; i < length; i++) {
-                  strings[i] = (String) values[i];
-                }
-                forwardIndexCreator.putStringMV(strings);
-              }
-              break;
-            case BYTES:
-              if (values instanceof byte[][]) {
-                forwardIndexCreator.putBytesMV((byte[][]) values);
-              } else {
-                byte[][] bytesArray = new byte[length][];
-                for (int i = 0; i < length; i++) {
-                  bytesArray[i] = (byte[]) values[i];
-                }
-                forwardIndexCreator.putBytesMV(bytesArray);
-              }
-              break;
-            default:
-              throw new IllegalStateException();
-          }
-        }
+        indexMultiValueRow(dictionaryCreator, (Object[]) columnValueToIndex, creatorsByIndex);
       }
+    }
 
-      if (_nullHandlingEnabled) {
+    if (_nullHandlingEnabled) {
+      for (Map.Entry<String, NullValueVectorCreator> entry : _nullValueVectorCreatorMap.entrySet()) {
+        String columnName = entry.getKey();
         // If row has null value for given column name, add to null value vector
         if (row.isNullValue(columnName)) {
           _nullValueVectorCreatorMap.get(columnName).setNull(_docIdCounter);
         }
       }
     }
+
     _docIdCounter++;
   }
 
-  private boolean shouldStoreRawValueForTextIndex(String column) {
-    if (_columnProperties != null) {
-      Map<String, String> props = _columnProperties.get(column);
-      // by default always store the raw value
-      // if the config is set to true, don't store the actual raw value
-      // there will be a dummy value
-      return props == null || !Boolean.parseBoolean(props.get(FieldConfig.TEXT_INDEX_NO_RAW_DATA));
+  private void indexSingleValueRow(SegmentDictionaryCreator dictionaryCreator, Object value,
+      Map<IndexType<?, ?, ?>, IndexCreator> creatorsByIndex)
+      throws IOException {
+    int dictId = dictionaryCreator != null ? dictionaryCreator.indexOfSV(value) : -1;
+    for (IndexCreator creator : creatorsByIndex.values()) {
+      creator.add(value, dictId);
     }
+  }
 
-    return true;
+  private void indexMultiValueRow(SegmentDictionaryCreator dictionaryCreator, Object[] values,
+      Map<IndexType<?, ?, ?>, IndexCreator> creatorsByIndex)
+      throws IOException {
+    int[] dictId = dictionaryCreator != null ? dictionaryCreator.indexOfMV(values) : null;
+    for (IndexCreator creator : creatorsByIndex.values()) {
+      creator.add(values, dictId);
+    }
+  }
+
+  @Nullable
+  private Object calculateRawValueForTextIndex(boolean dictEnabledColumn, FieldIndexConfigs configs,
+      FieldSpec fieldSpec) {
+    if (dictEnabledColumn) {
+      return null;
+    }
+    TextIndexConfig textConfig = configs.getConfig(StandardIndexes.text());
+    if (!textConfig.isEnabled()) {
+      return null;
+    }
+
+    Object rawValue = textConfig.getRawValueForTextIndex();
+
+    if (rawValue == null) {
+      return null;
+    } else if (!fieldSpec.isSingleValueField()) {
+      if (fieldSpec.getDataType().getStoredType() == FieldSpec.DataType.STRING) {
+        if (!(rawValue instanceof String[])) {
+          rawValue = new String[]{String.valueOf(rawValue)};
+        }
+      } else if (fieldSpec.getDataType().getStoredType() == FieldSpec.DataType.BYTES) {
+        if (!(rawValue instanceof String[])) {
+          rawValue = new byte[][]{String.valueOf(rawValue).getBytes(StandardCharsets.UTF_8)};
+        }
+      } else {
+        throw new RuntimeException("Text Index is only supported for STRING and BYTES stored type");
+      }
+    }
+    return rawValue;
   }
 
   @Override
@@ -755,32 +395,16 @@ public void setSegmentName(String segmentName) {
   @Override
   public void seal()
       throws ConfigurationException, IOException {
-    for (SegmentDictionaryCreator dictionaryCreator : _dictionaryCreatorMap.values()) {
-      dictionaryCreator.postIndexingCleanup();
-    }
-    for (DictionaryBasedInvertedIndexCreator invertedIndexCreator : _invertedIndexCreatorMap.values()) {
-      invertedIndexCreator.seal();
-    }
-    for (TextIndexCreator textIndexCreator : _textIndexCreatorMap.values()) {
-      textIndexCreator.seal();
-    }
-    for (TextIndexCreator fstIndexCreator : _fstIndexCreatorMap.values()) {
-      fstIndexCreator.seal();
+    for (SegmentDictionaryCreator creator : _dictionaryCreatorMap.values()) {
+      creator.seal();
     }
-    for (JsonIndexCreator jsonIndexCreator : _jsonIndexCreatorMap.values()) {
-      jsonIndexCreator.seal();
+    for (NullValueVectorCreator creator : _nullValueVectorCreatorMap.values()) {
+      creator.seal();
     }
-    for (GeoSpatialIndexCreator h3IndexCreator : _h3IndexCreatorMap.values()) {
-      h3IndexCreator.seal();
-    }
-    for (NullValueVectorCreator nullValueVectorCreator : _nullValueVectorCreatorMap.values()) {
-      nullValueVectorCreator.seal();
-    }
-    for (BloomFilterCreator bloomFilterCreator : _bloomFilterCreatorMap.values()) {
-      bloomFilterCreator.seal();
-    }
-    for (CombinedInvertedIndexCreator combinedInvertedIndexCreator : _rangeIndexFilterCreatorMap.values()) {
-      combinedInvertedIndexCreator.seal();
+    for (Map<IndexType<?, ?, ?>, IndexCreator> creatorsByType : _creatorsByColAndIndex.values()) {
+      for (IndexCreator creator : creatorsByType.values()) {
+        creator.seal();
+      }
     }
     writeMetadata();
   }
@@ -988,9 +612,11 @@ public static void removeColumnMetadataInfo(PropertiesConfiguration properties,
   @Override
   public void close()
       throws IOException {
-    FileUtils.close(Iterables.concat(_dictionaryCreatorMap.values(), _forwardIndexCreatorMap.values(),
-        _invertedIndexCreatorMap.values(), _textIndexCreatorMap.values(), _fstIndexCreatorMap.values(),
-        _jsonIndexCreatorMap.values(), _h3IndexCreatorMap.values(), _nullValueVectorCreatorMap.values(),
-        _bloomFilterCreatorMap.values(), _rangeIndexFilterCreatorMap.values()));
+    List<IndexCreator> creators = _creatorsByColAndIndex.values().stream()
+        .flatMap(map -> map.values().stream())
+        .collect(Collectors.toList());
+    creators.addAll(_nullValueVectorCreatorMap.values());
+    creators.addAll(_dictionaryCreatorMap.values());
+    FileUtils.close(creators);
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentDictionaryCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentDictionaryCreator.java
index 28059755967..96fc96cee42 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentDictionaryCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentDictionaryCreator.java
@@ -24,15 +24,17 @@
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.nio.ByteOrder;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.local.io.util.FixedByteValueReaderWriter;
 import org.apache.pinot.segment.local.io.util.VarLengthValueWriter;
-import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
@@ -43,8 +45,17 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-
-public class SegmentDictionaryCreator implements Closeable {
+/**
+ * The IndexCreator for dictionaries.
+ *
+ * Although this class implements {@link IndexCreator}, it is not intended to be used as a normal IndexCreator.
+ * Specifically, neither {@link #add(Object, int)} or {@link #add(Object[], int[])} should be called on this object.
+ * In order to make sure these methods are not being called, they throw exceptions in this class.
+ *
+ * This requirement is a corollary from the fact that the {@link IndexCreator} contract assumes the dictionary id can be
+ * calculated before calling {@code add} methods.
+ */
+public class SegmentDictionaryCreator implements IndexCreator {
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentDictionaryCreator.class);
 
   private final String _columnName;
@@ -62,9 +73,20 @@ public class SegmentDictionaryCreator implements Closeable {
   public SegmentDictionaryCreator(FieldSpec fieldSpec, File indexDir, boolean useVarLengthDictionary) {
     _columnName = fieldSpec.getName();
     _storedType = fieldSpec.getDataType().getStoredType();
-    _dictionaryFile = new File(indexDir, _columnName + V1Constants.Dict.FILE_EXTENSION);
+    _dictionaryFile = new File(indexDir, _columnName + DictionaryIndexType.getFileExtension());
     _useVarLengthDictionary = useVarLengthDictionary;
   }
+  @Override
+  public void add(@Nonnull Object value, int dictId)
+      throws IOException {
+    throw new UnsupportedOperationException("Dictionaries should not be built as a normal index");
+  }
+
+  @Override
+  public void add(@Nonnull Object[] values, @Nullable int[] dictIds)
+      throws IOException {
+    throw new UnsupportedOperationException("Dictionaries should not be built as a normal index");
+  }
 
   public SegmentDictionaryCreator(FieldSpec fieldSpec, File indexDir) {
     this(fieldSpec, indexDir, false);
@@ -331,6 +353,11 @@ public void postIndexingCleanup() {
     _objectValueToIndexMap = null;
   }
 
+  @Override
+  public void seal() {
+    postIndexingCleanup();
+  }
+
   @Override
   public void close() {
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentIndexCreationDriverImpl.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentIndexCreationDriverImpl.java
index 89ff727c5ba..15f1611c04c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentIndexCreationDriverImpl.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/SegmentIndexCreationDriverImpl.java
@@ -23,11 +23,10 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.UUID;
 import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
@@ -37,6 +36,7 @@
 import org.apache.pinot.segment.local.segment.creator.RecordReaderSegmentCreationDataSource;
 import org.apache.pinot.segment.local.segment.creator.TransformPipeline;
 import org.apache.pinot.segment.local.segment.index.converter.SegmentFormatConverterFactory;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
 import org.apache.pinot.segment.local.startree.v2.builder.MultipleTreesBuilder;
 import org.apache.pinot.segment.local.utils.CrcUtils;
@@ -80,7 +80,8 @@ public class SegmentIndexCreationDriverImpl implements SegmentIndexCreationDrive
   private SegmentGeneratorConfig _config;
   private RecordReader _recordReader;
   private SegmentPreIndexStatsContainer _segmentStats;
-  private Map<String, ColumnIndexCreationInfo> _indexCreationInfoMap;
+  // NOTE: Use TreeMap so that the columns are ordered alphabetically
+  private TreeMap<String, ColumnIndexCreationInfo> _indexCreationInfoMap;
   private SegmentCreator _indexCreator;
   private SegmentIndexCreationInfo _segmentIndexCreationInfo;
   private Schema _dataSchema;
@@ -175,7 +176,7 @@ public void init(SegmentGeneratorConfig config, SegmentCreationDataSource dataSo
 
     // Initialize index creation
     _segmentIndexCreationInfo = new SegmentIndexCreationInfo();
-    _indexCreationInfoMap = new HashMap<>();
+    _indexCreationInfoMap = new TreeMap<>();
 
     // Check if has star tree
     _indexCreator = new SegmentColumnarIndexCreator();
@@ -425,20 +426,14 @@ void buildIndexCreationInfo()
   /**
    * Uses config and column properties like storedType and length of elements to determine if
    * varLengthDictionary should be used for a column
+   * @deprecated Use
+   * {@link DictionaryIndexType#shouldUseVarLengthDictionary(String, Set, DataType, ColumnStatistics)} instead.
    */
+  @Deprecated
   public static boolean shouldUseVarLengthDictionary(String columnName, Set<String> varLengthDictColumns,
       DataType columnStoredType, ColumnStatistics columnProfile) {
-    if (varLengthDictColumns.contains(columnName)) {
-      return true;
-    }
-
-    if (columnStoredType == DataType.BYTES || columnStoredType == DataType.BIG_DECIMAL) {
-      if (!columnProfile.isFixedLength()) {
-        return true;
-      }
-    }
-
-    return false;
+    return DictionaryIndexType.shouldUseVarLengthDictionary(
+        columnName, varLengthDictColumns, columnStoredType, columnProfile);
   }
 
   /**
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/bloom/OnHeapGuavaBloomFilterCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/bloom/OnHeapGuavaBloomFilterCreator.java
index c77817bfa8f..b8b10943198 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/bloom/OnHeapGuavaBloomFilterCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/bloom/OnHeapGuavaBloomFilterCreator.java
@@ -29,6 +29,7 @@
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
 import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,9 +48,19 @@ public class OnHeapGuavaBloomFilterCreator implements BloomFilterCreator {
 
   private final File _bloomFilterFile;
   private final BloomFilter<String> _bloomFilter;
+  private final FieldSpec.DataType _dataType;
 
+  // TODO: This method is here for compatibility reasons, should be removed in future PRs
+  //  exit_criteria: Not needed in Apache Pinot once #10184 is merged
+  @Deprecated
   public OnHeapGuavaBloomFilterCreator(File indexDir, String columnName, int cardinality,
       BloomFilterConfig bloomFilterConfig) {
+    this(indexDir, columnName, cardinality, bloomFilterConfig, null);
+  }
+
+  public OnHeapGuavaBloomFilterCreator(File indexDir, String columnName, int cardinality,
+      BloomFilterConfig bloomFilterConfig, FieldSpec.DataType dataType) {
+    _dataType = dataType;
     _bloomFilterFile = new File(indexDir, columnName + V1Constants.Indexes.BLOOM_FILTER_FILE_EXTENSION);
     // Calculate the actual fpp with regards to the max size for the bloom filter
     double fpp = bloomFilterConfig.getFpp();
@@ -62,6 +73,11 @@ public OnHeapGuavaBloomFilterCreator(File indexDir, String columnName, int cardi
     _bloomFilter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), cardinality, fpp);
   }
 
+  @Override
+  public FieldSpec.DataType getDataType() {
+    return _dataType;
+  }
+
   @Override
   public void add(String value) {
     _bloomFilter.put(value);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitSlicedRangeIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitSlicedRangeIndexCreator.java
index 0f96bf4b2d3..4d70ee7e80d 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitSlicedRangeIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitSlicedRangeIndexCreator.java
@@ -40,12 +40,15 @@ public class BitSlicedRangeIndexCreator implements CombinedInvertedIndexCreator
   private final RangeBitmap.Appender _appender;
   private final File _rangeIndexFile;
   private final long _minValue;
+  private final FieldSpec.DataType _valueType;
 
-  private BitSlicedRangeIndexCreator(File indexDir, FieldSpec fieldSpec, long minValue, long maxValue) {
+  private BitSlicedRangeIndexCreator(File indexDir, FieldSpec fieldSpec, long minValue, long maxValue,
+      FieldSpec.DataType valueType) {
     Preconditions.checkArgument(fieldSpec.isSingleValueField(), "MV columns not supported");
     _rangeIndexFile = new File(indexDir, fieldSpec.getName() + BITMAP_RANGE_INDEX_FILE_EXTENSION);
     _appender = RangeBitmap.appender(maxValue);
     _minValue = minValue;
+    _valueType = valueType;
   }
 
   /**
@@ -55,7 +58,7 @@ private BitSlicedRangeIndexCreator(File indexDir, FieldSpec fieldSpec, long minV
    * @param cardinality the cardinality of the dictionary
    */
   public BitSlicedRangeIndexCreator(File indexDir, FieldSpec fieldSpec, int cardinality) {
-    this(indexDir, fieldSpec, 0, cardinality - 1);
+    this(indexDir, fieldSpec, 0, cardinality - 1, fieldSpec.getDataType());
   }
 
   /**
@@ -67,7 +70,13 @@ public BitSlicedRangeIndexCreator(File indexDir, FieldSpec fieldSpec, int cardin
    */
   public BitSlicedRangeIndexCreator(File indexDir, FieldSpec fieldSpec, Comparable<?> minValue,
       Comparable<?> maxValue) {
-    this(indexDir, fieldSpec, minValue(fieldSpec, minValue), maxValue(fieldSpec, minValue, maxValue));
+    this(indexDir, fieldSpec, minValue(fieldSpec, minValue), maxValue(fieldSpec, minValue, maxValue),
+        fieldSpec.getDataType());
+  }
+
+  @Override
+  public FieldSpec.DataType getDataType() {
+    return _valueType;
   }
 
   @Override
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitmapInvertedIndexWriter.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitmapInvertedIndexWriter.java
index 2e13a65c7eb..c5a64ad68e8 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitmapInvertedIndexWriter.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/BitmapInvertedIndexWriter.java
@@ -56,15 +56,34 @@ public final class BitmapInvertedIndexWriter implements Closeable {
   private final FileChannel _fileChannel;
   private final ByteBuffer _offsetBuffer;
   private ByteBuffer _bitmapBuffer;
-  private long _bytesWritten;
+  private long _currentBufferPosition;
+  private final boolean _ownsChannel;
 
   public BitmapInvertedIndexWriter(File outputFile, int numBitmaps)
       throws IOException {
+    this(new RandomAccessFile(outputFile, "rw").getChannel(), numBitmaps, true);
+  }
+
+  /**
+   * Creates a new writer that uses the given {@link FileChannel}.
+   * It will start to write on the current position of the channel assuming it is the last useful byte in the file.
+   * When this object is {@link #close() closed}, the channel is truncated to the last byte written by this writer.
+   * @param fileChannel the file channel to be used
+   * @param numBitmaps the number of bitmaps that are expected. The actual value cannot be higher than this value. Fewer
+   *                   bitmaps than the given value can be used, but in that case the representation will not be as
+   *                   expected.
+   * @param ownsChannel whether this writer owns the channel or not. If the channel is owned then it will be closed when
+   *                    this object is closed. Otherwise the owner will have to close it by itself. Even if this writer
+   *                    does not own the channel, it will be truncated when the writer is closed.
+   */
+  public BitmapInvertedIndexWriter(FileChannel fileChannel, int numBitmaps, boolean ownsChannel)
+      throws IOException {
+    _ownsChannel = ownsChannel;
     int sizeForOffsets = (numBitmaps + 1) * Integer.BYTES;
     long bitmapBufferEstimate = Math.min(PESSIMISTIC_BITMAP_SIZE_ESTIMATE * numBitmaps, MAX_INITIAL_BUFFER_SIZE);
-    _fileChannel = new RandomAccessFile(outputFile, "rw").getChannel();
-    _offsetBuffer = _fileChannel.map(FileChannel.MapMode.READ_WRITE, 0, sizeForOffsets);
-    _bytesWritten = sizeForOffsets;
+    _fileChannel = fileChannel;
+    _offsetBuffer = _fileChannel.map(FileChannel.MapMode.READ_WRITE, _fileChannel.position(), sizeForOffsets);
+    _currentBufferPosition = sizeForOffsets + _fileChannel.position();
     mapBitmapBuffer(bitmapBufferEstimate);
   }
 
@@ -72,9 +91,9 @@ public void add(RoaringBitmap bitmap)
       throws IOException {
     int length = bitmap.serializedSizeInBytes();
     resizeIfNecessary(length);
-    _offsetBuffer.putInt(asUnsignedInt(_bytesWritten));
+    _offsetBuffer.putInt(asUnsignedInt(_currentBufferPosition));
     bitmap.serialize(_bitmapBuffer);
-    _bytesWritten += length;
+    _currentBufferPosition += length;
   }
 
   public void add(byte[] bitmapBytes)
@@ -85,9 +104,9 @@ public void add(byte[] bitmapBytes)
   public void add(byte[] bitmapBytes, int length)
       throws IOException {
     resizeIfNecessary(length);
-    _offsetBuffer.putInt(asUnsignedInt(_bytesWritten));
+    _offsetBuffer.putInt(asUnsignedInt(_currentBufferPosition));
     _bitmapBuffer.put(bitmapBytes, 0, length);
-    _bytesWritten += length;
+    _currentBufferPosition += length;
   }
 
   private void resizeIfNecessary(int required)
@@ -100,7 +119,7 @@ private void resizeIfNecessary(int required)
   private void mapBitmapBuffer(long size)
       throws IOException {
     cleanBitmapBuffer();
-    _bitmapBuffer = _fileChannel.map(FileChannel.MapMode.READ_WRITE, _bytesWritten, size)
+    _bitmapBuffer = _fileChannel.map(FileChannel.MapMode.READ_WRITE, _currentBufferPosition, size)
         .order(ByteOrder.LITTLE_ENDIAN);
   }
 
@@ -111,13 +130,19 @@ private void cleanBitmapBuffer()
     }
   }
 
+  public long getLastWrittenPosition() {
+    return _currentBufferPosition;
+  }
+
   @Override
   public void close()
       throws IOException {
-    long fileLength = _bytesWritten;
+    long fileLength = _currentBufferPosition;
     _offsetBuffer.putInt(asUnsignedInt(fileLength));
     _fileChannel.truncate(fileLength);
-    _fileChannel.close();
+    if (_ownsChannel) {
+      _fileChannel.close();
+    }
     if (CleanerUtil.UNMAP_SUPPORTED) {
       CleanerUtil.BufferCleaner cleaner = CleanerUtil.getCleaner();
       cleaner.freeBuffer(_offsetBuffer);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/OffHeapBitmapInvertedIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/OffHeapBitmapInvertedIndexCreator.java
index 02304850265..4dc1cc63169 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/OffHeapBitmapInvertedIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/OffHeapBitmapInvertedIndexCreator.java
@@ -18,9 +18,13 @@
  */
 package org.apache.pinot.segment.local.segment.creator.impl.inv;
 
+import it.unimi.dsi.fastutil.ints.IntIterator;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.nio.file.attribute.FileAttribute;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
@@ -80,16 +84,52 @@ public final class OffHeapBitmapInvertedIndexCreator implements DictionaryBasedI
   private PinotDataBuffer _invertedIndexValueBuffer;
   private PinotDataBuffer _invertedIndexLengthBuffer;
 
+  /**
+   * Like calling {@link #OffHeapBitmapInvertedIndexCreator(File, FieldSpec, int, int, int, String)} with the default
+   * {@link V1Constants.Indexes#BITMAP_INVERTED_INDEX_FILE_EXTENSION}.
+   *
+   * @see #OffHeapBitmapInvertedIndexCreator(File, FieldSpec, int, int, int, String)
+   */
   public OffHeapBitmapInvertedIndexCreator(File indexDir, FieldSpec fieldSpec, int cardinality, int numDocs,
       int numValues)
       throws IOException {
-    String columnName = fieldSpec.getName();
-    _invertedIndexFile = new File(indexDir, columnName + V1Constants.Indexes.BITMAP_INVERTED_INDEX_FILE_EXTENSION);
-    _forwardIndexValueBufferFile = new File(indexDir, columnName + FORWARD_INDEX_VALUE_BUFFER_SUFFIX);
-    _forwardIndexLengthBufferFile = new File(indexDir, columnName + FORWARD_INDEX_LENGTH_BUFFER_SUFFIX);
-    _invertedIndexValueBufferFile = new File(indexDir, columnName + INVERTED_INDEX_VALUE_BUFFER_SUFFIX);
-    _invertedIndexLengthBufferFile = new File(indexDir, columnName + INVERTED_INDEX_LENGTH_BUFFER_SUFFIX);
-    _singleValue = fieldSpec.isSingleValueField();
+    this(indexDir, fieldSpec, cardinality, numDocs, numValues,
+        V1Constants.Indexes.BITMAP_INVERTED_INDEX_FILE_EXTENSION);
+  }
+
+  /**
+   * Like calling {@link #OffHeapBitmapInvertedIndexCreator(File, String, boolean, int, int, int, String)} with
+   * the column name and single value specified by the given {@link FieldSpec}.
+   *
+   * @see #OffHeapBitmapInvertedIndexCreator(File, String, boolean, int, int, int, String)
+   */
+  public OffHeapBitmapInvertedIndexCreator(File indexDir, FieldSpec fieldSpec, int cardinality, int numDocs,
+      int numValues, String extension)
+      throws IOException {
+    this(indexDir, fieldSpec.getName(), fieldSpec.isSingleValueField(), cardinality, numDocs, numValues, extension);
+  }
+
+  /**
+   * @param indexDir The directory where the index will be created.
+   * @param columnName The name of the column being indexed.
+   * @param singleValue True iff the column is single value.
+   * @param cardinality How many different values the column has.
+   * @param numDocs How many documents are expected.
+   * @param numValues How many values the index will have. This should be equal to numDocs in single value columns, but
+   *                  may be higher in multivalued columns.
+   * @param extension The suffix added to the file. Although is called extension, it behaves like
+   * {@link java.nio.file.Files#createTempFile(String, String, FileAttribute[])} suffix parameter.
+   */
+  public OffHeapBitmapInvertedIndexCreator(File indexDir, String columnName, boolean singleValue, int cardinality,
+      int numDocs, int numValues, String extension)
+      throws IOException {
+    String ext = extension.equals(V1Constants.Indexes.BITMAP_INVERTED_INDEX_FILE_EXTENSION) ? "" : "." + extension;
+    _invertedIndexFile = getDefaultFile(indexDir, columnName, extension);
+    _forwardIndexValueBufferFile = getDefaultFile(indexDir, columnName, ext + FORWARD_INDEX_VALUE_BUFFER_SUFFIX);
+    _forwardIndexLengthBufferFile = getDefaultFile(indexDir, columnName, ext + FORWARD_INDEX_LENGTH_BUFFER_SUFFIX);
+    _invertedIndexValueBufferFile = getDefaultFile(indexDir, columnName, ext + INVERTED_INDEX_VALUE_BUFFER_SUFFIX);
+    _invertedIndexLengthBufferFile = getDefaultFile(indexDir, columnName, ext + INVERTED_INDEX_LENGTH_BUFFER_SUFFIX);
+    _singleValue = singleValue;
     _cardinality = cardinality;
     _numDocs = numDocs;
     _numValues = _singleValue ? numDocs : numValues;
@@ -116,12 +156,27 @@ public OffHeapBitmapInvertedIndexCreator(File indexDir, FieldSpec fieldSpec, int
     }
   }
 
+  public static File getDefaultFile(File indexDir, String columnName, String extension) {
+    return new File(indexDir, columnName + extension);
+  }
+
   @Override
   public void add(int dictId) {
     putInt(_forwardIndexValueBuffer, _nextDocId++, dictId);
     putInt(_invertedIndexLengthBuffer, dictId, getInt(_invertedIndexLengthBuffer, dictId) + 1);
   }
 
+  public void add(IntIterator dictIds) {
+    int added = 0;
+    while (dictIds.hasNext()) {
+      int dictId = dictIds.nextInt();
+      putInt(_forwardIndexValueBuffer, _nextValueId++, dictId);
+      putInt(_invertedIndexLengthBuffer, dictId, getInt(_invertedIndexLengthBuffer, dictId) + 1);
+      added++;
+    }
+    putInt(_forwardIndexLengthBuffer, _nextDocId++, added);
+  }
+
   @Override
   public void add(int[] dictIds, int length) {
     for (int i = 0; i < length; i++) {
@@ -132,8 +187,7 @@ public void add(int[] dictIds, int length) {
     putInt(_forwardIndexLengthBuffer, _nextDocId++, length);
   }
 
-  @Override
-  public void seal()
+  private void invert()
       throws IOException {
     // Calculate value index for each dictId in the inverted index value buffer
     // Re-use inverted index length buffer to store the value index for each dictId, where value index is the index in
@@ -176,9 +230,12 @@ public void seal()
       destroyBuffer(_forwardIndexLengthBuffer, _forwardIndexLengthBufferFile);
       _forwardIndexLengthBuffer = null;
     }
+  }
 
+  private void write(FileChannel channel)
+      throws IOException {
     // Create bitmaps from inverted index buffers and serialize them to file
-    try (BitmapInvertedIndexWriter writer = new BitmapInvertedIndexWriter(_invertedIndexFile, _cardinality)) {
+    try (BitmapInvertedIndexWriter writer = new BitmapInvertedIndexWriter(channel, _cardinality, false)) {
       RoaringBitmapWriter<RoaringBitmap> bitmapWriter = RoaringBitmapWriter.writer().get();
       int startIndex = 0;
       for (int dictId = 0; dictId < _cardinality; dictId++) {
@@ -193,6 +250,20 @@ public void seal()
     }
   }
 
+  @Override
+  public void seal()
+      throws IOException {
+    try (FileChannel channel = new RandomAccessFile(_invertedIndexFile, "rw").getChannel()) {
+      seal(channel);
+    }
+  }
+
+  public void seal(FileChannel channel)
+      throws IOException {
+    invert();
+    write(channel);
+  }
+
   @Override
   public void close()
       throws IOException {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/RangeIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/RangeIndexCreator.java
index 8b7bcda041d..827fe8decaa 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/RangeIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/RangeIndexCreator.java
@@ -94,8 +94,8 @@ public final class RangeIndexCreator implements CombinedInvertedIndexCreator {
   private final int _numValues;
   private int _nextDocId;
   private int _nextValueId;
-  private int _numValuesPerRange;
-  private DataType _valueType;
+  private final int _numValuesPerRange;
+  private final DataType _valueType;
 
   /**
    *
@@ -160,6 +160,11 @@ public RangeIndexCreator(File indexDir, FieldSpec fieldSpec, DataType valueType,
     }
   }
 
+  @Override
+  public DataType getDataType() {
+    return _valueType;
+  }
+
   @Override
   public void add(int value) {
     _numberValueBuffer.put(_nextDocId, value);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/geospatial/BaseH3IndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/geospatial/BaseH3IndexCreator.java
index 1bb2562498e..ada362c9f8f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/geospatial/BaseH3IndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/geospatial/BaseH3IndexCreator.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.H3Utils;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
@@ -101,6 +102,11 @@ public abstract class BaseH3IndexCreator implements GeoSpatialIndexCreator {
     _lowestResolution = resolution.getLowestResolution();
   }
 
+  @Override
+  public Geometry deserialize(byte[] bytes) {
+    return GeometrySerializer.deserialize(bytes);
+  }
+
   @Override
   public void add(Geometry geometry)
       throws IOException {
@@ -151,9 +157,12 @@ void generateIndexFile()
         FileChannel bitmapOffsetFileChannel = new RandomAccessFile(_bitmapOffsetFile, "r").getChannel();
         FileChannel bitmapValueFileChannel = new RandomAccessFile(_bitmapValueFile, "r").getChannel()) {
       indexFileChannel.write(headerBuffer);
-      dictionaryFileChannel.transferTo(0, _dictionaryFile.length(), indexFileChannel);
-      bitmapOffsetFileChannel.transferTo(0, _bitmapOffsetFile.length(), indexFileChannel);
-      bitmapValueFileChannel.transferTo(0, _bitmapValueFile.length(), indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(dictionaryFileChannel, 0, _dictionaryFile.length(),
+          indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(bitmapOffsetFileChannel, 0, _bitmapOffsetFile.length(),
+          indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(bitmapValueFileChannel, 0, _bitmapValueFile.length(),
+          indexFileChannel);
     }
   }
 
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/json/BaseJsonIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/json/BaseJsonIndexCreator.java
index e2afca19fa2..ec3dc439ddc 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/json/BaseJsonIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/json/BaseJsonIndexCreator.java
@@ -148,8 +148,10 @@ void generateIndexFile()
         FileChannel dictionaryFileChannel = new RandomAccessFile(_dictionaryFile, "r").getChannel();
         FileChannel invertedIndexFileChannel = new RandomAccessFile(_invertedIndexFile, "r").getChannel()) {
       indexFileChannel.write(headerBuffer);
-      dictionaryFileChannel.transferTo(0, dictionaryFileLength, indexFileChannel);
-      invertedIndexFileChannel.transferTo(0, invertedIndexFileLength, indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(dictionaryFileChannel, 0, dictionaryFileLength,
+          indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(invertedIndexFileChannel, 0, invertedIndexFileLength,
+          indexFileChannel);
 
       // Write the doc id mapping to the index file
       ByteBuffer docIdMappingBuffer =
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/text/LuceneFSTIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/text/LuceneFSTIndexCreator.java
index bb772acf746..ab9d7490e80 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/text/LuceneFSTIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/inv/text/LuceneFSTIndexCreator.java
@@ -26,7 +26,8 @@
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentColumnarIndexCreator;
 import org.apache.pinot.segment.local.utils.fst.FSTBuilder;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.creator.FSTIndexCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +38,7 @@
  * to dictionary id as an entry.
  *
  */
-public class LuceneFSTIndexCreator implements TextIndexCreator {
+public class LuceneFSTIndexCreator implements FSTIndexCreator {
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentColumnarIndexCreator.class);
   private final File _fstIndexFile;
   private final FSTBuilder _fstBuilder;
@@ -66,6 +67,11 @@ public LuceneFSTIndexCreator(File indexDir, String columnName, String[] sortedEn
     }
   }
 
+  public LuceneFSTIndexCreator(IndexCreationContext context)
+      throws IOException {
+    this(context.getIndexDir(), context.getFieldSpec().getName(), (String[]) context.getSortedUniqueElementsArray());
+  }
+
   // Expects dictionary entries in sorted order.
   @Override
   public void add(String document) {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreator.java
index 6addd752b79..20550879093 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreator.java
@@ -19,44 +19,67 @@
 package org.apache.pinot.segment.local.segment.creator.impl.nullvalue;
 
 import com.google.common.annotations.VisibleForTesting;
-import java.io.Closeable;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
-import org.roaringbitmap.buffer.MutableRoaringBitmap;
+import org.apache.pinot.segment.spi.index.IndexCreator;
+import org.roaringbitmap.RoaringBitmap;
+import org.roaringbitmap.RoaringBitmapWriter;
 
 
 /**
  * Used to persist the null bitmap on disk. This is used by SegmentCreator while indexing rows.
+ *
+ * Although this class implements {@link IndexCreator}, it is not intended to be used as a normal IndexCreator.
+ * Specifically, neither {@link #add(Object, int)} or {@link #add(Object[], int[])} should be called on this object.
+ * In order to make sure these methods are not being called, they throw exceptions in this class.
+ *
+ * This requirement is a corollary from the fact that the {@link IndexCreator} contract assumes the value will never be
+ * null, which is true for all index creators types unless this one.
  */
-public class NullValueVectorCreator implements Closeable {
-  private final MutableRoaringBitmap _nullBitmap = new MutableRoaringBitmap();
+public class NullValueVectorCreator implements IndexCreator {
+  private final RoaringBitmapWriter<RoaringBitmap> _bitmapWriter;
   private final File _nullValueVectorFile;
 
+  @Override
+  public void add(@Nonnull Object value, int dictId)
+      throws IOException {
+    throw new UnsupportedOperationException("NullValueVector should not be built as a normal index");
+  }
+
+  @Override
+  public void add(@Nonnull Object[] values, @Nullable int[] dictIds)
+      throws IOException {
+    throw new UnsupportedOperationException("NullValueVector should not be built as a normal index");
+  }
+
   public NullValueVectorCreator(File indexDir, String columnName) {
+    _bitmapWriter = RoaringBitmapWriter.writer().get();
     _nullValueVectorFile = new File(indexDir, columnName + V1Constants.Indexes.NULLVALUE_VECTOR_FILE_EXTENSION);
   }
 
   public void setNull(int docId) {
-    _nullBitmap.add(docId);
+    _bitmapWriter.add(docId);
   }
 
   public void seal()
       throws IOException {
     // Create null value vector file only if the bitmap is not empty
-    if (!_nullBitmap.isEmpty()) {
+    RoaringBitmap nullBitmap = _bitmapWriter.get();
+    if (!nullBitmap.isEmpty()) {
       try (DataOutputStream outputStream = new DataOutputStream(new FileOutputStream(_nullValueVectorFile))) {
-        _nullBitmap.serialize(outputStream);
+        nullBitmap.serialize(outputStream);
       }
     }
   }
 
   @VisibleForTesting
-  ImmutableRoaringBitmap getNullBitmap() {
-    return _nullBitmap;
+  RoaringBitmap getNullBitmap() {
+    return _bitmapWriter.get();
   }
 
   @Override
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/LuceneTextIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/LuceneTextIndexCreator.java
index f65e93220f8..1ff32a2b235 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/LuceneTextIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/LuceneTextIndexCreator.java
@@ -36,10 +36,12 @@
 import org.apache.lucene.store.FSDirectory;
 import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeLuceneTextIndex;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentColumnarIndexCreator;
+import org.apache.pinot.segment.local.segment.index.text.AbstractTextIndexCreator;
 import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
 import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
 
 
 /**
@@ -47,7 +49,7 @@
  * Used for both offline from {@link SegmentColumnarIndexCreator}
  * and realtime from {@link RealtimeLuceneTextIndex}
  */
-public class LuceneTextIndexCreator implements TextIndexCreator {
+public class LuceneTextIndexCreator extends AbstractTextIndexCreator {
   // TODO: make buffer size configurable choosing a default value based on the heap usage results in design doc
   private static final int LUCENE_INDEX_MAX_BUFFER_SIZE_MB = 500;
 
@@ -115,6 +117,11 @@ public LuceneTextIndexCreator(String column, File segmentIndexDir, boolean commi
     }
   }
 
+  public LuceneTextIndexCreator(IndexCreationContext context, TextIndexConfig indexConfig) {
+    this(context.getFieldSpec().getName(), context.getIndexDir(), context.isTextCommitOnClose(),
+        indexConfig.getStopWordsInclude(), indexConfig.getStopWordsExclude());
+  }
+
   public IndexWriter getIndexWriter() {
     return _indexWriter;
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/NativeTextIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/NativeTextIndexCreator.java
index 4fff00572d2..d455c1a7890 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/NativeTextIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/creator/impl/text/NativeTextIndexCreator.java
@@ -34,11 +34,11 @@
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.BitmapInvertedIndexWriter;
+import org.apache.pinot.segment.local.segment.index.text.AbstractTextIndexCreator;
 import org.apache.pinot.segment.local.utils.nativefst.FST;
 import org.apache.pinot.segment.local.utils.nativefst.FSTHeader;
 import org.apache.pinot.segment.local.utils.nativefst.builder.FSTBuilder;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
 import org.roaringbitmap.Container;
 import org.roaringbitmap.RoaringBitmap;
 import org.roaringbitmap.RoaringBitmapWriter;
@@ -46,7 +46,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 
-public class NativeTextIndexCreator implements TextIndexCreator {
+public class NativeTextIndexCreator extends AbstractTextIndexCreator {
   private static final String TEMP_DIR_SUFFIX = ".nativetext.idx.tmp";
   private static final String FST_FILE_NAME = "native.fst";
   private static final String INVERTED_INDEX_FILE_NAME = "inverted.index.buf";
@@ -175,8 +175,9 @@ private void generateIndexFile()
         FileChannel invertedIndexFileChannel = new RandomAccessFile(_invertedIndexFile, "r").getChannel();
         FileChannel fstFileChannel = new RandomAccessFile(_fstIndexFile, "rw").getChannel()) {
       indexFileChannel.write(headerBuffer);
-      fstFileChannel.transferTo(0, _fstDataSize, indexFileChannel);
-      invertedIndexFileChannel.transferTo(0, invertedIndexFileLength, indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(fstFileChannel, 0, _fstDataSize, indexFileChannel);
+      org.apache.pinot.common.utils.FileUtils.transferBytes(invertedIndexFileChannel, 0, invertedIndexFileLength,
+          indexFileChannel);
     }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexPlugin.java
new file mode 100644
index 00000000000..87340067e4b
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexPlugin.java
@@ -0,0 +1,32 @@
+/**
+ * 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.pinot.segment.local.segment.index.bloom;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+@AutoService(IndexPlugin.class)
+public class BloomIndexPlugin implements IndexPlugin<BloomIndexType> {
+  private static final BloomIndexType INSTANCE = new BloomIndexType();
+  @Override
+  public BloomIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexType.java
new file mode 100644
index 00000000000..84a00a38020
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexType.java
@@ -0,0 +1,148 @@
+/**
+ * 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.pinot.segment.local.segment.index.bloom;
+
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.segment.creator.impl.bloom.OnHeapGuavaBloomFilterCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.bloomfilter.BloomFilterHandler;
+import org.apache.pinot.segment.local.segment.index.readers.bloom.BloomFilterReaderFactory;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.Constants;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
+import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class BloomIndexType
+    extends AbstractIndexType<BloomFilterConfig, BloomFilterReader, BloomFilterCreator>
+    implements ConfigurableFromIndexLoadingConfig<BloomFilterConfig> {
+  public static final String INDEX_DISPLAY_NAME = "bloom";
+
+  protected BloomIndexType() {
+    super(StandardIndexes.BLOOM_FILTER_ID);
+  }
+
+  @Override
+  public Class<BloomFilterConfig> getIndexConfigClass() {
+    return BloomFilterConfig.class;
+  }
+
+  @Override
+  public Map<String, BloomFilterConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    return indexLoadingConfig.getBloomFilterConfigs();
+  }
+
+  @Override
+  public BloomFilterConfig getDefaultConfig() {
+    return BloomFilterConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<BloomFilterConfig> createDeserializer() {
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative(
+            IndexConfigDeserializer.ifIndexingConfig(// reads tableConfig.indexingConfig.bloomFilterConfigs
+                IndexConfigDeserializer.fromMap(tableConfig -> tableConfig.getIndexingConfig().getBloomFilterConfigs())
+                  .withFallbackAlternative(// reads tableConfig.indexingConfig.bloomFilterColumns
+                      IndexConfigDeserializer.fromCollection(
+                          tableConfig -> tableConfig.getIndexingConfig().getBloomFilterColumns(),
+                          (accum, column) -> accum.put(column, BloomFilterConfig.DEFAULT)))
+            )
+        );
+  }
+
+  @Override
+  public BloomFilterCreator createIndexCreator(IndexCreationContext context, BloomFilterConfig indexConfig) {
+    int cardinality = context.getCardinality();
+    if (cardinality == Constants.UNKNOWN_CARDINALITY) {
+      // This is when we're creating bloom filters for non dictionary encoded cols where exact cardinality is not
+      // known beforehand.
+      // Since this field is only used for the estimate cardinality, using total # of entries instead
+      // TODO (saurabh) Check if we can do a better estimate
+      cardinality = context.getTotalNumberOfEntries();
+    }
+    return new OnHeapGuavaBloomFilterCreator(context.getIndexDir(), context.getFieldSpec().getName(), cardinality,
+        indexConfig, context.getFieldSpec().getDataType());
+  }
+
+  @Override
+  public IndexReaderFactory<BloomFilterReader> getReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new BloomFilterHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.BLOOM_FILTER_FILE_EXTENSION;
+  }
+
+  @Override
+  protected IndexReaderFactory<BloomFilterReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  private static class ReaderFactory extends IndexReaderFactory.Default<BloomFilterConfig, BloomFilterReader> {
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    @Override
+    protected IndexType<BloomFilterConfig, BloomFilterReader, ?> getIndexType() {
+      return StandardIndexes.bloomFilter();
+    }
+
+    @Override
+    protected BloomFilterReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+        BloomFilterConfig indexConfig) {
+      return BloomFilterReaderFactory.getBloomFilterReader(dataBuffer, indexConfig.isLoadOnHeap());
+    }
+  }
+
+  @Override
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+    tableConfig.getIndexingConfig().setBloomFilterColumns(null);
+    tableConfig.getIndexingConfig().setBloomFilterConfigs(null);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProvider.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProvider.java
index aee86896ad7..282043693e6 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProvider.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProvider.java
@@ -35,6 +35,7 @@
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
 import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.utils.ByteArray;
 
 
 /**
@@ -94,6 +95,36 @@ public ColumnMetadataImpl buildMetadata(VirtualColumnContext context) {
       // default null value based on column's data type
       builder.setMaxNumberOfMultiValues(1);
     }
+
+    FieldSpec fieldSpec = context.getFieldSpec();
+    Object defaultNullValue = fieldSpec.getDefaultNullValue();
+    switch (fieldSpec.getDataType().getStoredType()) {
+      case INT:
+        builder.setMinValue((int) defaultNullValue).setMaxValue((int) defaultNullValue);
+        break;
+      case LONG:
+        builder.setMinValue((long) defaultNullValue).setMaxValue((long) defaultNullValue);
+        break;
+      case FLOAT:
+        builder.setMinValue((float) defaultNullValue).setMaxValue((float) defaultNullValue);
+        break;
+      case DOUBLE:
+        builder.setMinValue((double) defaultNullValue).setMaxValue((double) defaultNullValue);
+        break;
+      case BIG_DECIMAL:
+        builder.setMinValue((BigDecimal) defaultNullValue).setMaxValue((BigDecimal) defaultNullValue);
+        break;
+      case STRING:
+        builder.setMinValue((String) defaultNullValue).setMaxValue((String) defaultNullValue);
+        break;
+      case BYTES:
+        builder.setMinValue(new ByteArray((byte[]) defaultNullValue))
+            .setMaxValue(new ByteArray((byte[]) defaultNullValue));
+        break;
+      default:
+        throw new IllegalStateException();
+    }
+
     return builder.build();
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/IntermediateIndexContainer.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/IntermediateIndexContainer.java
deleted file mode 100644
index dd5e8c4ada3..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/IntermediateIndexContainer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.segment.index.column;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Set;
-import javax.annotation.Nullable;
-import org.apache.pinot.segment.local.segment.index.datasource.MutableDataSource;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
-import org.apache.pinot.segment.spi.index.mutable.MutableForwardIndex;
-import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class IntermediateIndexContainer implements Closeable {
-  private static final Logger LOGGER = LoggerFactory.getLogger(IntermediateIndexContainer.class);
-
-  final FieldSpec _fieldSpec;
-  final PartitionFunction _partitionFunction;
-  final Set<Integer> _partitions;
-  final NumValuesInfo _numValuesInfo;
-  final MutableForwardIndex _forwardIndex;
-  final MutableDictionary _dictionary;
-
-  volatile Comparable _minValue;
-  volatile Comparable _maxValue;
-
-  // Hold the dictionary id for the latest record
-  int _dictId = Integer.MIN_VALUE;
-  int[] _dictIds;
-
-  public IntermediateIndexContainer(FieldSpec fieldSpec, @Nullable PartitionFunction partitionFunction,
-      @Nullable Set<Integer> partitions, NumValuesInfo numValuesInfo, MutableForwardIndex forwardIndex,
-      MutableDictionary dictionary) {
-    _fieldSpec = fieldSpec;
-    _partitionFunction = partitionFunction;
-    _partitions = partitions;
-    _numValuesInfo = numValuesInfo;
-    _forwardIndex = forwardIndex;
-    _dictionary = dictionary;
-  }
-
-  public DataSource toDataSource(int numDocsIndexed) {
-    return new MutableDataSource(_fieldSpec, numDocsIndexed, _numValuesInfo._numValues,
-        _numValuesInfo._maxNumValuesPerMVEntry, _dictionary.length(), _partitionFunction, _partitions, _minValue,
-        _maxValue, _forwardIndex, _dictionary, null, null, null, null, null, null, null, null);
-  }
-
-  @Override
-  public void close()
-      throws IOException {
-    String column = _fieldSpec.getName();
-    try {
-      _forwardIndex.close();
-    } catch (Exception e) {
-      LOGGER.error("Caught exception while closing forward index for column: {}, continuing with error", column, e);
-    }
-    if (_dictionary != null) {
-      try {
-        _dictionary.close();
-      } catch (Exception e) {
-        LOGGER.error("Caught exception while closing dictionary for column: {}, continuing with error", column, e);
-      }
-    }
-  }
-
-  public FieldSpec getFieldSpec() {
-    return _fieldSpec;
-  }
-
-  public NumValuesInfo getNumValuesInfo() {
-    return _numValuesInfo;
-  }
-
-  public MutableForwardIndex getForwardIndex() {
-    return _forwardIndex;
-  }
-
-  public MutableDictionary getDictionary() {
-    return _dictionary;
-  }
-
-  public int getDictId() {
-    return _dictId;
-  }
-
-  public void setDictId(int dictId) {
-    _dictId = dictId;
-  }
-
-  public int[] getDictIds() {
-    return _dictIds;
-  }
-
-  public void setDictIds(int[] dictIds) {
-    _dictIds = dictIds;
-  }
-
-  public Comparable getMinValue() {
-    return _minValue;
-  }
-
-  public void setMinValue(Comparable minValue) {
-    _minValue = minValue;
-  }
-
-  public Comparable getMaxValue() {
-    return _maxValue;
-  }
-
-  public void setMaxValue(Comparable maxValue) {
-    _maxValue = maxValue;
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/PhysicalColumnIndexContainer.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/PhysicalColumnIndexContainer.java
index 01cd6f35d7b..35077a29567 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/PhysicalColumnIndexContainer.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/PhysicalColumnIndexContainer.java
@@ -18,289 +18,69 @@
  */
 package org.apache.pinot.segment.local.segment.index.column;
 
-import com.google.common.base.Preconditions;
-import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
-import org.apache.pinot.segment.local.segment.index.readers.BaseImmutableDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.BigDecimalDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.BytesDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.DoubleDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.FloatDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.IntDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.LongDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.NullValueVectorReaderImpl;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapBigDecimalDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapBytesDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapDoubleDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapFloatDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapIntDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapLongDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.OnHeapStringDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.StringDictionary;
 import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.index.reader.SortedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
-import org.apache.pinot.segment.spi.index.reader.provider.IndexReaderProvider;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
-import org.apache.pinot.spi.config.table.BloomFilterConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.pinot.spi.data.FieldSpec.DataType;
-
 
 public final class PhysicalColumnIndexContainer implements ColumnIndexContainer {
   private static final Logger LOGGER = LoggerFactory.getLogger(PhysicalColumnIndexContainer.class);
 
-  private final ForwardIndexReader<?> _forwardIndex;
-  private final InvertedIndexReader<?> _invertedIndex;
-  private final RangeIndexReader<?> _rangeIndex;
-  private final TextIndexReader _textIndex;
-  private final TextIndexReader _fstIndex;
-  private final JsonIndexReader _jsonIndex;
-  private final H3IndexReader _h3Index;
-  private final BaseImmutableDictionary _dictionary;
-  private final BloomFilterReader _bloomFilter;
-  private final NullValueVectorReaderImpl _nullValueVectorReader;
+  private final Map<IndexType, IndexReader> _readersByIndex;
 
   public PhysicalColumnIndexContainer(SegmentDirectory.Reader segmentReader, ColumnMetadata metadata,
-      IndexLoadingConfig indexLoadingConfig, File segmentIndexDir, IndexReaderProvider indexReaderProvider)
+      IndexLoadingConfig indexLoadingConfig)
       throws IOException {
     String columnName = metadata.getColumnName();
-    boolean loadInvertedIndex = indexLoadingConfig.getInvertedIndexColumns().contains(columnName);
-    boolean loadRangeIndex = indexLoadingConfig.getRangeIndexColumns().contains(columnName);
-    boolean loadTextIndex = indexLoadingConfig.getTextIndexColumns().contains(columnName);
-    boolean loadFSTIndex = indexLoadingConfig.getFSTIndexColumns().contains(columnName);
-    boolean loadJsonIndex = indexLoadingConfig.getJsonIndexConfigs().containsKey(columnName);
-    boolean loadH3Index = indexLoadingConfig.getH3IndexConfigs().containsKey(columnName);
-    boolean loadOnHeapDictionary = indexLoadingConfig.getOnHeapDictionaryColumns().contains(columnName);
-    BloomFilterConfig bloomFilterConfig = indexLoadingConfig.getBloomFilterConfigs().get(columnName);
-
-    if (segmentReader.hasIndexFor(columnName, ColumnIndexType.NULLVALUE_VECTOR)) {
-      PinotDataBuffer nullValueVectorBuffer = segmentReader.getIndexFor(columnName, ColumnIndexType.NULLVALUE_VECTOR);
-      _nullValueVectorReader = new NullValueVectorReaderImpl(nullValueVectorBuffer);
-    } else {
-      _nullValueVectorReader = null;
-    }
-
-    if (loadTextIndex && segmentIndexDir != null) {
-      Preconditions.checkState(segmentReader.hasIndexFor(columnName, ColumnIndexType.TEXT_INDEX));
-      Map<String, Map<String, String>> columnProperties = indexLoadingConfig.getColumnProperties();
-      _textIndex = indexReaderProvider.newTextIndexReader(segmentIndexDir, metadata, columnProperties.get(columnName));
-    } else {
-      _textIndex = null;
-    }
-
-    if (loadJsonIndex) {
-      Preconditions.checkState(segmentReader.hasIndexFor(columnName, ColumnIndexType.JSON_INDEX));
-      PinotDataBuffer jsonIndexBuffer = segmentReader.getIndexFor(columnName, ColumnIndexType.JSON_INDEX);
-      _jsonIndex = indexReaderProvider.newJsonIndexReader(jsonIndexBuffer, metadata);
-    } else {
-      _jsonIndex = null;
-    }
 
-    if (loadH3Index) {
-      Preconditions.checkState(segmentReader.hasIndexFor(columnName, ColumnIndexType.H3_INDEX));
-      PinotDataBuffer h3IndexBuffer = segmentReader.getIndexFor(columnName, ColumnIndexType.H3_INDEX);
-      _h3Index = indexReaderProvider.newGeospatialIndexReader(h3IndexBuffer, metadata);
-    } else {
-      _h3Index = null;
-    }
-
-    if (bloomFilterConfig != null) {
-      PinotDataBuffer bloomFilterBuffer = segmentReader.getIndexFor(columnName, ColumnIndexType.BLOOM_FILTER);
-      _bloomFilter = indexReaderProvider.newBloomFilterReader(bloomFilterBuffer, bloomFilterConfig.isLoadOnHeap());
-    } else {
-      _bloomFilter = null;
-    }
-
-    if (loadRangeIndex && !metadata.isSorted()) {
-      PinotDataBuffer buffer = segmentReader.getIndexFor(columnName, ColumnIndexType.RANGE_INDEX);
-      _rangeIndex = indexReaderProvider.newRangeIndexReader(buffer, metadata);
-    } else {
-      _rangeIndex = null;
-    }
-
-    // Setting the 'fwdIndexBuffer' to null if forward index is disabled
-    PinotDataBuffer fwdIndexBuffer =
-        segmentReader.hasIndexFor(columnName, ColumnIndexType.FORWARD_INDEX) ? segmentReader.getIndexFor(columnName,
-            ColumnIndexType.FORWARD_INDEX) : null;
-
-    if (metadata.hasDictionary()) {
-      // Dictionary-based index
-      _dictionary = loadDictionary(segmentReader.getIndexFor(columnName, ColumnIndexType.DICTIONARY), metadata,
-          loadOnHeapDictionary);
-      if (metadata.isSingleValue()) {
-        // Single-value
-        if (metadata.isSorted()) {
-          // Sorted
-          // No need to check for null 'fwdIndexBuffer' as for sorted columns this is a no-op
-          SortedIndexReader<?> sortedIndexReader = indexReaderProvider.newSortedIndexReader(fwdIndexBuffer, metadata);
-          _forwardIndex = sortedIndexReader;
-          _invertedIndex = sortedIndexReader;
-          _fstIndex = null;
-          return;
+    FieldIndexConfigs fieldIndexConfigs = indexLoadingConfig.getFieldIndexConfig(columnName);
+    if (fieldIndexConfigs == null) {
+      fieldIndexConfigs = FieldIndexConfigs.EMPTY;
+    }
+
+    _readersByIndex = new HashMap<>();
+    for (IndexType<?, ?, ?> indexType : IndexService.getInstance().getAllIndexes()) {
+      if (segmentReader.hasIndexFor(columnName, indexType)) {
+        IndexReaderFactory<?> readerProvider = indexType.getReaderFactory();
+        try {
+          IndexReader reader = readerProvider.createIndexReader(segmentReader, fieldIndexConfigs, metadata);
+          if (reader != null) {
+            _readersByIndex.put(indexType, reader);
+          }
+        } catch (IndexReaderConstraintException ex) {
+          LOGGER.warn("Constraint violation when indexing " + columnName + " with " + indexType + " index", ex);
         }
       }
-      if (fwdIndexBuffer != null) {
-        _forwardIndex = indexReaderProvider.newForwardIndexReader(fwdIndexBuffer, metadata);
-      } else {
-        // Forward index disabled
-        _forwardIndex = null;
-      }
-      if (loadInvertedIndex) {
-        _invertedIndex = indexReaderProvider.newInvertedIndexReader(
-            segmentReader.getIndexFor(columnName, ColumnIndexType.INVERTED_INDEX), metadata);
-      } else {
-        _invertedIndex = null;
-      }
-
-      if (loadFSTIndex) {
-        PinotDataBuffer buffer = segmentReader.getIndexFor(columnName, ColumnIndexType.FST_INDEX);
-        _fstIndex = indexReaderProvider.newFSTIndexReader(buffer, metadata);
-      } else {
-        _fstIndex = null;
-      }
-    } else {
-      // Raw index
-      _forwardIndex = indexReaderProvider.newForwardIndexReader(fwdIndexBuffer, metadata);
-      _dictionary = null;
-      _invertedIndex = null;
-      _fstIndex = null;
     }
   }
 
+  @Nullable
   @Override
-  public ForwardIndexReader<?> getForwardIndex() {
-    return _forwardIndex;
-  }
-
-  @Override
-  public InvertedIndexReader<?> getInvertedIndex() {
-    return _invertedIndex;
-  }
-
-  @Override
-  public RangeIndexReader<?> getRangeIndex() {
-    return _rangeIndex;
-  }
-
-  @Override
-  public TextIndexReader getTextIndex() {
-    return _textIndex;
-  }
-
-  @Override
-  public JsonIndexReader getJsonIndex() {
-    return _jsonIndex;
-  }
-
-  @Override
-  public H3IndexReader getH3Index() {
-    return _h3Index;
-  }
-
-  @Override
-  public BaseImmutableDictionary getDictionary() {
-    return _dictionary;
-  }
-
-  @Override
-  public BloomFilterReader getBloomFilter() {
-    return _bloomFilter;
-  }
-
-  @Override
-  public TextIndexReader getFSTIndex() {
-    return _fstIndex;
-  }
-
-  @Override
-  public NullValueVectorReader getNullValueVector() {
-    return _nullValueVectorReader;
-  }
-
-  //TODO: move this to a DictionaryLoader class
-  public static BaseImmutableDictionary loadDictionary(PinotDataBuffer dictionaryBuffer, ColumnMetadata metadata,
-      boolean loadOnHeap) {
-    DataType dataType = metadata.getDataType();
-    if (loadOnHeap) {
-      String columnName = metadata.getColumnName();
-      LOGGER.info("Loading on-heap dictionary for column: {}", columnName);
-    }
-
-    int length = metadata.getCardinality();
-    switch (dataType.getStoredType()) {
-      case INT:
-        return loadOnHeap ? new OnHeapIntDictionary(dictionaryBuffer, length)
-            : new IntDictionary(dictionaryBuffer, length);
-      case LONG:
-        return loadOnHeap ? new OnHeapLongDictionary(dictionaryBuffer, length)
-            : new LongDictionary(dictionaryBuffer, length);
-      case FLOAT:
-        return loadOnHeap ? new OnHeapFloatDictionary(dictionaryBuffer, length)
-            : new FloatDictionary(dictionaryBuffer, length);
-      case DOUBLE:
-        return loadOnHeap ? new OnHeapDoubleDictionary(dictionaryBuffer, length)
-            : new DoubleDictionary(dictionaryBuffer, length);
-      case BIG_DECIMAL:
-        int numBytesPerValue = metadata.getColumnMaxLength();
-        return loadOnHeap ? new OnHeapBigDecimalDictionary(dictionaryBuffer, length, numBytesPerValue)
-            : new BigDecimalDictionary(dictionaryBuffer, length, numBytesPerValue);
-      case STRING:
-        numBytesPerValue = metadata.getColumnMaxLength();
-        return loadOnHeap ? new OnHeapStringDictionary(dictionaryBuffer, length, numBytesPerValue)
-            : new StringDictionary(dictionaryBuffer, length, numBytesPerValue);
-      case BYTES:
-        numBytesPerValue = metadata.getColumnMaxLength();
-        return loadOnHeap ? new OnHeapBytesDictionary(dictionaryBuffer, length, numBytesPerValue)
-            : new BytesDictionary(dictionaryBuffer, length, numBytesPerValue);
-      default:
-        throw new IllegalStateException("Unsupported data type for dictionary: " + dataType);
-    }
+  public <I extends IndexReader, T extends IndexType<?, I, ?>> I getIndex(T indexType) {
+    @SuppressWarnings("unchecked")
+    I reader = (I) _readersByIndex.get(indexType);
+    return reader;
   }
 
   @Override
   public void close()
       throws IOException {
-    if (_forwardIndex != null) {
-      _forwardIndex.close();
-    }
-    if (_invertedIndex != null) {
-      _invertedIndex.close();
-    }
-    if (_rangeIndex != null) {
-      _rangeIndex.close();
-    }
-    if (_dictionary != null) {
-      _dictionary.close();
-    }
-    if (_textIndex != null) {
-      _textIndex.close();
-    }
-    if (_fstIndex != null) {
-      _fstIndex.close();
-    }
-    if (_jsonIndex != null) {
-      _jsonIndex.close();
-    }
-    if (_h3Index != null) {
-      _h3Index.close();
-    }
-    if (_bloomFilter != null) {
-      _bloomFilter.close();
+    // TODO (index-spi): Verify that readers can be closed in any order
+    for (IndexReader index : _readersByIndex.values()) {
+      index.close();
     }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/converter/SegmentV1V2ToV3FormatConverter.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/converter/SegmentV1V2ToV3FormatConverter.java
index bb096385b20..f8c6819efb5 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/converter/SegmentV1V2ToV3FormatConverter.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/converter/SegmentV1V2ToV3FormatConverter.java
@@ -27,8 +27,9 @@
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FileUtils;
@@ -36,12 +37,14 @@
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.converter.SegmentFormatConverter;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
 import org.apache.pinot.spi.env.CommonsConfigurationUtils;
@@ -66,7 +69,7 @@ public void convert(File v2SegmentDirectory)
     Preconditions.checkNotNull(v2SegmentDirectory, "Segment directory should not be null");
 
     Preconditions.checkState(v2SegmentDirectory.exists() && v2SegmentDirectory.isDirectory(),
-        "Segment directory: " + v2SegmentDirectory.toString() + " must exist and should be a directory");
+        "Segment directory: " + v2SegmentDirectory + " must exist and should be a directory");
 
     LOGGER.info("Converting segment: {} to v3 format", v2SegmentDirectory);
 
@@ -86,7 +89,6 @@ public void convert(File v2SegmentDirectory)
 
     createMetadataFile(v2SegmentDirectory, v3TempDirectory);
     copyCreationMetadataIfExists(v2SegmentDirectory, v3TempDirectory);
-    copyLuceneTextIndexIfExists(v2SegmentDirectory, v3TempDirectory);
     copyIndexData(v2SegmentDirectory, v2Metadata, v3TempDirectory);
 
     File newLocation = SegmentDirectoryPaths.segmentDirectoryFor(v2SegmentDirectory, SegmentVersion.v3);
@@ -147,36 +149,31 @@ private void copyIndexData(File v2Directory, SegmentMetadataImpl v2Metadata, Fil
         SegmentDirectory v3Segment = SegmentDirectoryLoaderRegistry.getDefaultSegmentDirectoryLoader()
             .load(v3Directory.toURI(), new SegmentDirectoryLoaderContext.Builder().setSegmentName(v2Metadata.getName())
                 .setSegmentDirectoryConfigs(configuration).build())) {
-
-      // for each dictionary and each fwdIndex, copy that to newDirectory buffer
-      Set<String> allColumns = v2Metadata.getAllColumns();
       try (SegmentDirectory.Reader v2DataReader = v2Segment.createReader();
           SegmentDirectory.Writer v3DataWriter = v3Segment.createWriter()) {
-        for (String column : allColumns) {
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.DICTIONARY);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.FORWARD_INDEX);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.NULLVALUE_VECTOR);
-        }
-
-        // Other indexes are intentionally stored at the end of the single file
-        for (String column : allColumns) {
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.INVERTED_INDEX);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.FST_INDEX);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.JSON_INDEX);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.H3_INDEX);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.RANGE_INDEX);
-          copyIndexIfExists(v2DataReader, v3DataWriter, column, ColumnIndexType.BLOOM_FILTER);
+        for (String column : v2Metadata.getAllColumns()) {
+          for (IndexType<?, ?, ?> indexType : sortedIndexTypes()) {
+            // NOTE: Text index is copied separately
+            if (indexType != StandardIndexes.text()) {
+              copyIndexIfExists(v2DataReader, v3DataWriter, column, indexType);
+            }
+          }
         }
-
         v3DataWriter.save();
       }
     }
-
+    copyLuceneTextIndexIfExists(v2Directory, v3Directory);
     copyStarTreeV2(v2Directory, v3Directory);
   }
 
+  private List<IndexType<?, ?, ?>> sortedIndexTypes() {
+    return IndexService.getInstance().getAllIndexes().stream()
+        .sorted((i1, i2) -> i1.getId().compareTo(i2.getId()))
+        .collect(Collectors.toList());
+  }
+
   private void copyIndexIfExists(SegmentDirectory.Reader reader, SegmentDirectory.Writer writer, String column,
-      ColumnIndexType indexType)
+      IndexType indexType)
       throws IOException {
     if (reader.hasIndexFor(column, indexType)) {
       readCopyBuffers(reader, writer, column, indexType);
@@ -194,7 +191,7 @@ private void copyStarTreeV2(File src, File dest)
   }
 
   private void readCopyBuffers(SegmentDirectory.Reader reader, SegmentDirectory.Writer writer, String column,
-      ColumnIndexType indexType)
+      IndexType indexType)
       throws IOException {
     PinotDataBuffer oldBuffer = reader.getIndexFor(column, indexType);
     long oldBufferSize = oldBuffer.size();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/BaseDataSource.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/BaseDataSource.java
index cb40a4a4537..dfd355ac3a7 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/BaseDataSource.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/BaseDataSource.java
@@ -21,6 +21,10 @@
 import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
 import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
@@ -34,33 +38,11 @@
 
 public abstract class BaseDataSource implements DataSource {
   private final DataSourceMetadata _dataSourceMetadata;
-  private final ForwardIndexReader<?> _forwardIndex;
-  private final Dictionary _dictionary;
-  private final InvertedIndexReader<?> _invertedIndex;
-  private final RangeIndexReader<?> _rangeIndex;
-  private final TextIndexReader _textIndex;
-  private final TextIndexReader _fstIndex;
-  private final JsonIndexReader _jsonIndex;
-  private final H3IndexReader _h3Index;
-  private final BloomFilterReader _bloomFilter;
-  private final NullValueVectorReader _nullValueVector;
-
-  public BaseDataSource(DataSourceMetadata dataSourceMetadata, @Nullable ForwardIndexReader<?> forwardIndex,
-      @Nullable Dictionary dictionary, @Nullable InvertedIndexReader<?> invertedIndex,
-      @Nullable RangeIndexReader<?> rangeIndex, @Nullable TextIndexReader textIndex,
-      @Nullable TextIndexReader fstIndex, @Nullable JsonIndexReader jsonIndex, @Nullable H3IndexReader h3Index,
-      @Nullable BloomFilterReader bloomFilter, @Nullable NullValueVectorReader nullValueVector) {
+  private final ColumnIndexContainer _indexContainer;
+
+  public BaseDataSource(DataSourceMetadata dataSourceMetadata, ColumnIndexContainer indexContainer) {
     _dataSourceMetadata = dataSourceMetadata;
-    _forwardIndex = forwardIndex;
-    _dictionary = dictionary;
-    _invertedIndex = invertedIndex;
-    _rangeIndex = rangeIndex;
-    _textIndex = textIndex;
-    _fstIndex = fstIndex;
-    _jsonIndex = jsonIndex;
-    _h3Index = h3Index;
-    _bloomFilter = bloomFilter;
-    _nullValueVector = nullValueVector;
+    _indexContainer = indexContainer;
   }
 
   @Override
@@ -68,62 +50,67 @@ public DataSourceMetadata getDataSourceMetadata() {
     return _dataSourceMetadata;
   }
 
+  @Override
+  public <R extends IndexReader> R getIndex(IndexType<?, R, ?> type) {
+    return type.getIndexReader(_indexContainer);
+  }
+
   @Override
   public ForwardIndexReader<?> getForwardIndex() {
-    return _forwardIndex;
+    return getIndex(StandardIndexes.forward());
   }
 
   @Nullable
   @Override
   public Dictionary getDictionary() {
-    return _dictionary;
+    return getIndex(StandardIndexes.dictionary());
   }
 
   @Nullable
   @Override
   public InvertedIndexReader<?> getInvertedIndex() {
-    return _invertedIndex;
+    return getIndex(StandardIndexes.inverted());
   }
 
   @Nullable
   @Override
   public RangeIndexReader<?> getRangeIndex() {
-    return _rangeIndex;
+    return getIndex(StandardIndexes.range());
   }
 
   @Nullable
   @Override
   public TextIndexReader getTextIndex() {
-    return _textIndex;
+    return getIndex(StandardIndexes.text());
   }
 
   @Nullable
   @Override
   public TextIndexReader getFSTIndex() {
-    return _fstIndex;
+    return getIndex(StandardIndexes.fst());
   }
 
   @Nullable
   @Override
   public JsonIndexReader getJsonIndex() {
-    return _jsonIndex;
+    return getIndex(StandardIndexes.json());
   }
 
   @Nullable
   @Override
   public H3IndexReader getH3Index() {
-    return _h3Index;
+    return getIndex(StandardIndexes.h3());
   }
 
   @Nullable
   @Override
   public BloomFilterReader getBloomFilter() {
-    return _bloomFilter;
+    return getIndex(StandardIndexes.bloomFilter());
   }
 
   @Nullable
   @Override
   public NullValueVectorReader getNullValueVector() {
-    return _nullValueVector;
+    return getIndex(StandardIndexes.nullValueVector());
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/EmptyDataSource.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/EmptyDataSource.java
index 2622591f4b2..46d8b640465 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/EmptyDataSource.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/EmptyDataSource.java
@@ -22,6 +22,7 @@
 import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
 import org.apache.pinot.spi.data.FieldSpec;
 
@@ -32,7 +33,7 @@
 public class EmptyDataSource extends BaseDataSource {
 
   public EmptyDataSource(ColumnMetadata columnMetadata) {
-    super(new EmptyDataSourceMetadata(columnMetadata), null, null, null, null, null, null, null, null, null, null);
+    super(new EmptyDataSourceMetadata(columnMetadata), ColumnIndexContainer.Empty.INSTANCE);
   }
 
   private static class EmptyDataSourceMetadata implements DataSourceMetadata {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/ImmutableDataSource.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/ImmutableDataSource.java
index 1c09640d0b7..f3098957ff5 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/ImmutableDataSource.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/ImmutableDataSource.java
@@ -33,11 +33,7 @@
 public class ImmutableDataSource extends BaseDataSource {
 
   public ImmutableDataSource(ColumnMetadata columnMetadata, ColumnIndexContainer columnIndexContainer) {
-    super(new ImmutableDataSourceMetadata(columnMetadata), columnIndexContainer.getForwardIndex(),
-        columnIndexContainer.getDictionary(), columnIndexContainer.getInvertedIndex(),
-        columnIndexContainer.getRangeIndex(), columnIndexContainer.getTextIndex(), columnIndexContainer.getFSTIndex(),
-        columnIndexContainer.getJsonIndex(), columnIndexContainer.getH3Index(), columnIndexContainer.getBloomFilter(),
-        columnIndexContainer.getNullValueVector());
+    super(new ImmutableDataSourceMetadata(columnMetadata), columnIndexContainer);
   }
 
   private static class ImmutableDataSourceMetadata implements DataSourceMetadata {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/MutableDataSource.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/MutableDataSource.java
index 90bbb3b773b..497aa243b5f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/MutableDataSource.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/datasource/MutableDataSource.java
@@ -18,18 +18,16 @@
  */
 package org.apache.pinot.segment.local.segment.index.datasource;
 
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.realtime.impl.nullvalue.MutableNullValueVector;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.index.reader.Dictionary;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
+import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
 import org.apache.pinot.spi.data.FieldSpec;
 
@@ -42,15 +40,16 @@ public class MutableDataSource extends BaseDataSource {
 
   public MutableDataSource(FieldSpec fieldSpec, int numDocs, int numValues, int maxNumValuesPerMVEntry, int cardinality,
       @Nullable PartitionFunction partitionFunction, @Nullable Set<Integer> partitions, @Nullable Comparable minValue,
-      @Nullable Comparable maxValue, ForwardIndexReader forwardIndex, @Nullable Dictionary dictionary,
-      @Nullable InvertedIndexReader invertedIndex, @Nullable RangeIndexReader rangeIndex,
-      @Nullable TextIndexReader textIndex, @Nullable TextIndexReader fstIndex, @Nullable JsonIndexReader jsonIndex,
-      @Nullable H3IndexReader h3Index, @Nullable BloomFilterReader bloomFilter,
-      @Nullable NullValueVectorReader nullValueVector) {
+      @Nullable Comparable maxValue, Map<IndexType, MutableIndex> mutableIndexes,
+      @Nullable MutableDictionary dictionary, @Nullable MutableNullValueVector nullValueVector,
+      int maxRowLengthInBytes) {
     super(new MutableDataSourceMetadata(fieldSpec, numDocs, numValues, maxNumValuesPerMVEntry, cardinality,
-            partitionFunction,
-            partitions, minValue, maxValue), forwardIndex, dictionary, invertedIndex, rangeIndex, textIndex, fstIndex,
-        jsonIndex, h3Index, bloomFilter, nullValueVector);
+            partitionFunction, partitions, minValue, maxValue, maxRowLengthInBytes),
+        new ColumnIndexContainer.FromMap.Builder()
+            .withAll(mutableIndexes)
+            .with(StandardIndexes.dictionary(), dictionary)
+            .with(StandardIndexes.nullValueVector(), nullValueVector)
+            .build());
   }
 
   private static class MutableDataSourceMetadata implements DataSourceMetadata {
@@ -63,10 +62,11 @@ private static class MutableDataSourceMetadata implements DataSourceMetadata {
     final Set<Integer> _partitions;
     final Comparable _minValue;
     final Comparable _maxValue;
+    final int _maxRowLengthInBytes;
 
     MutableDataSourceMetadata(FieldSpec fieldSpec, int numDocs, int numValues, int maxNumValuesPerMVEntry,
         int cardinality, @Nullable PartitionFunction partitionFunction, @Nullable Set<Integer> partitions,
-        @Nullable Comparable minValue, @Nullable Comparable maxValue) {
+        @Nullable Comparable minValue, @Nullable Comparable maxValue, int maxRowLengthInBytes) {
       _fieldSpec = fieldSpec;
       _numDocs = numDocs;
       _numValues = numValues;
@@ -81,6 +81,7 @@ private static class MutableDataSourceMetadata implements DataSourceMetadata {
       _minValue = minValue;
       _maxValue = maxValue;
       _cardinality = cardinality;
+      _maxRowLengthInBytes = maxRowLengthInBytes;
     }
 
     @Override
@@ -115,7 +116,6 @@ public Comparable getMinValue() {
       return _minValue;
     }
 
-    @Nullable
     @Override
     public Comparable getMaxValue() {
       return _maxValue;
@@ -137,5 +137,10 @@ public Set<Integer> getPartitions() {
     public int getCardinality() {
       return _cardinality;
     }
+
+    @Override
+    public int getMaxRowLengthInBytes() {
+      return _maxRowLengthInBytes;
+    }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexPlugin.java
new file mode 100644
index 00000000000..926c3dd9962
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexPlugin.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pinot.segment.local.segment.index.dictionary;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+
+@AutoService(IndexPlugin.class)
+public class DictionaryIndexPlugin implements IndexPlugin<DictionaryIndexType> {
+  private static final DictionaryIndexType INSTANCE = new DictionaryIndexType();
+
+  @Override
+  public DictionaryIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexType.java
new file mode 100644
index 00000000000..4ff2eed65ee
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexType.java
@@ -0,0 +1,451 @@
+/**
+ * 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.pinot.segment.local.segment.index.dictionary;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.io.util.PinotDataBitSet;
+import org.apache.pinot.segment.local.realtime.impl.dictionary.MutableDictionaryFactory;
+import org.apache.pinot.segment.local.segment.creator.impl.SegmentDictionaryCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.readers.BigDecimalDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.BytesDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.DoubleDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.FloatDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.IntDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.LongDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapBigDecimalDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapBytesDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapDoubleDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapFloatDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapIntDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapLongDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.OnHeapStringDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.StringDictionary;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.ColumnStatistics;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.IndexUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.IndexingConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class DictionaryIndexType
+    extends AbstractIndexType<DictionaryIndexConfig, Dictionary, SegmentDictionaryCreator>
+    implements ConfigurableFromIndexLoadingConfig<DictionaryIndexConfig> {
+  private static final Logger LOGGER = LoggerFactory.getLogger(DictionaryIndexType.class);
+
+  protected DictionaryIndexType() {
+    super(StandardIndexes.DICTIONARY_ID);
+  }
+
+  @Override
+  public Class<DictionaryIndexConfig> getIndexConfigClass() {
+    return DictionaryIndexConfig.class;
+  }
+
+  @Override
+  public Map<String, DictionaryIndexConfig> fromIndexLoadingConfig(
+      IndexLoadingConfig indexLoadingConfig) {
+    Map<String, DictionaryIndexConfig> result = new HashMap<>();
+    Set<String> noDictionaryCols = indexLoadingConfig.getNoDictionaryColumns();
+    Set<String> onHeapCols = indexLoadingConfig.getOnHeapDictionaryColumns();
+    Set<String> varLengthCols = indexLoadingConfig.getVarLengthDictionaryColumns();
+    for (String column : indexLoadingConfig.getAllKnownColumns()) {
+      if (noDictionaryCols.contains(column)) {
+        result.put(column, DictionaryIndexConfig.disabled());
+      } else {
+        result.put(column, new DictionaryIndexConfig(onHeapCols.contains(column), varLengthCols.contains(column)));
+      }
+    }
+    return result;
+  }
+
+  @Override
+  public DictionaryIndexConfig getDefaultConfig() {
+    return DictionaryIndexConfig.DEFAULT;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return getId();
+  }
+
+  @Override
+  public ColumnConfigDeserializer<DictionaryIndexConfig> createDeserializer() {
+    // reads tableConfig.indexingConfig.noDictionaryConfig
+    ColumnConfigDeserializer<DictionaryIndexConfig> fromNoDictConf = IndexConfigDeserializer.fromMap(
+        tableConfig -> tableConfig.getIndexingConfig() == null ? Collections.emptyMap()
+            : tableConfig.getIndexingConfig().getNoDictionaryConfig(),
+        (accum, col, value) -> accum.put(col, DictionaryIndexConfig.disabled()));
+
+    // reads tableConfig.indexingConfig.noDictionaryColumns
+    ColumnConfigDeserializer<DictionaryIndexConfig> fromNoDictCol = IndexConfigDeserializer.fromCollection(
+        tableConfig -> tableConfig.getIndexingConfig() == null ? Collections.emptyList()
+            : tableConfig.getIndexingConfig().getNoDictionaryColumns(),
+        (accum, noDictionaryCol) -> accum.put(noDictionaryCol, DictionaryIndexConfig.disabled()));
+
+    // reads tableConfig.fieldConfigList.encodingType
+    ColumnConfigDeserializer<DictionaryIndexConfig> fromFieldConfigList = IndexConfigDeserializer.fromCollection(
+        TableConfig::getFieldConfigList,
+        (accum, fieldConfig) -> {
+          if (fieldConfig.getEncodingType() == FieldConfig.EncodingType.RAW) {
+            accum.put(fieldConfig.getName(), DictionaryIndexConfig.disabled());
+          }
+        });
+
+    // reads tableConfig.indexingConfig.onHeapDictionaryColumns and
+    // tableConfig.indexingConfig.varLengthDictionaryColumns
+    ColumnConfigDeserializer<DictionaryIndexConfig> fromIndexingConfig = (tableConfig, schema) -> {
+      IndexingConfig ic = tableConfig.getIndexingConfig();
+      if (ic == null) {
+        return Collections.emptyMap();
+      }
+      Set<String> onHeap = new HashSet<>(
+          ic.getOnHeapDictionaryColumns() == null ? Collections.emptyList() : ic.getOnHeapDictionaryColumns());
+      Set<String> varLength = new HashSet<>(
+          ic.getVarLengthDictionaryColumns() == null ? Collections.emptyList() : ic.getVarLengthDictionaryColumns()
+      );
+      Function<String, DictionaryIndexConfig> valueCalculator =
+          column -> new DictionaryIndexConfig(onHeap.contains(column), varLength.contains(column));
+      return Sets.union(onHeap, varLength).stream()
+          .collect(Collectors.toMap(Function.identity(), valueCalculator));
+    };
+
+    return fromNoDictConf
+        .withFallbackAlternative(fromNoDictCol)
+        .withFallbackAlternative(fromFieldConfigList)
+        .withFallbackAlternative(fromIndexingConfig)
+        .withExclusiveAlternative(IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass()));
+  }
+
+  @Override
+  public SegmentDictionaryCreator createIndexCreator(IndexCreationContext context, DictionaryIndexConfig indexConfig) {
+    boolean useVarLengthDictionary = shouldUseVarLengthDictionary(context, indexConfig);
+    return new SegmentDictionaryCreator(context.getFieldSpec(), context.getIndexDir(), useVarLengthDictionary);
+  }
+
+  public boolean shouldUseVarLengthDictionary(IndexCreationContext context, DictionaryIndexConfig indexConfig) {
+    if (indexConfig.getUseVarLengthDictionary()) {
+      return true;
+    }
+    FieldSpec.DataType storedType = context.getFieldSpec().getDataType().getStoredType();
+    if (storedType != FieldSpec.DataType.BYTES && storedType != FieldSpec.DataType.BIG_DECIMAL) {
+      return false;
+    }
+    return !context.isFixedLength();
+  }
+
+  public static boolean shouldUseVarLengthDictionary(String columnName, Set<String> varLengthDictColumns,
+      FieldSpec.DataType columnStoredType, ColumnStatistics columnProfile) {
+    if (varLengthDictColumns.contains(columnName)) {
+      return true;
+    }
+
+    return shouldUseVarLengthDictionary(columnStoredType, columnProfile);
+  }
+
+  public static boolean shouldUseVarLengthDictionary(FieldSpec.DataType columnStoredType, ColumnStatistics profile) {
+    if (columnStoredType == FieldSpec.DataType.BYTES || columnStoredType == FieldSpec.DataType.BIG_DECIMAL) {
+      return !profile.isFixedLength();
+    }
+
+    return false;
+  }
+
+  /**
+   * This function evaluates whether to override dictionary (i.e use noDictionary)
+   * for a column even when its explicitly configured. This evaluation is for both dimension and metric
+   * column types.
+   */
+  public static boolean ignoreDictionaryOverride(boolean optimizeDictionary,
+      boolean optimizeDictionaryForMetrics, double noDictionarySizeRatioThreshold,
+      FieldSpec fieldSpec, FieldIndexConfigs fieldIndexConfigs, int cardinality,
+      int totalNumberOfEntries) {
+    if (optimizeDictionary) {
+      // Do not create dictionaries for json or text index columns as they are high-cardinality values almost always
+      if ((fieldIndexConfigs.getConfig(StandardIndexes.json()).isEnabled() || fieldIndexConfigs.getConfig(
+          StandardIndexes.text()).isEnabled())) {
+        return false;
+      }
+      // Do not create dictionary if index size with dictionary is going to be larger than index size without dictionary
+      // This is done to reduce the cost of dictionary for high cardinality columns
+      // Off by default and needs optimizeDictionary to be set to true
+      if (fieldSpec.isSingleValueField() && fieldSpec.getDataType().isFixedWidth()) {
+        // if you can safely enable dictionary, you can ignore overrides
+        return canSafelyCreateDictionaryWithinThreshold(cardinality, totalNumberOfEntries,
+            noDictionarySizeRatioThreshold, fieldSpec);
+      }
+    }
+
+    if (optimizeDictionaryForMetrics && !optimizeDictionary) {
+      if (fieldSpec.isSingleValueField() && fieldSpec.getDataType().isFixedWidth() && fieldSpec.getFieldType()
+          == FieldSpec.FieldType.METRIC) {
+        // if you can safely enable dictionary, you can ignore overrides
+        return canSafelyCreateDictionaryWithinThreshold(cardinality, totalNumberOfEntries,
+            noDictionarySizeRatioThreshold, fieldSpec);
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Given the column cardinality, totalNumberOfEntries, this function checks if the savings ratio
+   * is larger than the configured threshold (noDictionarySizeRatioThreshold). If savings ratio is
+   * smaller than the threshold, we want to override to noDictionary.
+   */
+  private static boolean canSafelyCreateDictionaryWithinThreshold(int cardinality, int totalNumberOfEntries,
+      double noDictionarySizeRatioThreshold, FieldSpec spec) {
+    long dictionarySize = cardinality * (long) spec.getDataType().size();
+    long forwardIndexSize =
+        ((long) totalNumberOfEntries * PinotDataBitSet.getNumBitsPerValue(cardinality - 1)
+            + Byte.SIZE - 1) / Byte.SIZE;
+
+    double indexWithDictSize = dictionarySize + forwardIndexSize;
+    double indexWithoutDictSize = totalNumberOfEntries * spec.getDataType().size();
+
+    double indexSizeRatio = indexWithoutDictSize / indexWithDictSize;
+    if (indexSizeRatio <= noDictionarySizeRatioThreshold) {
+      return false;
+    }
+    return true;
+  }
+
+  public SegmentDictionaryCreator createIndexCreator(FieldSpec fieldSpec, File indexDir, boolean useVarLengthDictionary)
+      throws Exception {
+    return new SegmentDictionaryCreator(fieldSpec, indexDir, useVarLengthDictionary);
+  }
+
+  public static Dictionary read(SegmentDirectory.Reader segmentReader, ColumnMetadata columnMetadata)
+      throws IOException {
+    PinotDataBuffer dataBuffer =
+        segmentReader.getIndexFor(columnMetadata.getColumnName(), StandardIndexes.dictionary());
+    return read(dataBuffer, columnMetadata, DictionaryIndexConfig.DEFAULT);
+  }
+
+  public static Dictionary read(PinotDataBuffer dataBuffer, ColumnMetadata metadata, DictionaryIndexConfig indexConfig)
+      throws IOException {
+    FieldSpec.DataType dataType = metadata.getDataType();
+    boolean loadOnHeap = indexConfig.isOnHeap();
+    if (loadOnHeap) {
+      String columnName = metadata.getColumnName();
+      LOGGER.info("Loading on-heap dictionary for column: {}", columnName);
+    }
+
+    int length = metadata.getCardinality();
+    switch (dataType.getStoredType()) {
+      case INT:
+        return loadOnHeap ? new OnHeapIntDictionary(dataBuffer, length)
+            : new IntDictionary(dataBuffer, length);
+      case LONG:
+        return loadOnHeap ? new OnHeapLongDictionary(dataBuffer, length)
+            : new LongDictionary(dataBuffer, length);
+      case FLOAT:
+        return loadOnHeap ? new OnHeapFloatDictionary(dataBuffer, length)
+            : new FloatDictionary(dataBuffer, length);
+      case DOUBLE:
+        return loadOnHeap ? new OnHeapDoubleDictionary(dataBuffer, length)
+            : new DoubleDictionary(dataBuffer, length);
+      case BIG_DECIMAL:
+        int numBytesPerValue = metadata.getColumnMaxLength();
+        return loadOnHeap ? new OnHeapBigDecimalDictionary(dataBuffer, length, numBytesPerValue)
+            : new BigDecimalDictionary(dataBuffer, length, numBytesPerValue);
+      case STRING:
+        numBytesPerValue = metadata.getColumnMaxLength();
+        return loadOnHeap ? new OnHeapStringDictionary(dataBuffer, length, numBytesPerValue)
+            : new StringDictionary(dataBuffer, length, numBytesPerValue);
+      case BYTES:
+        numBytesPerValue = metadata.getColumnMaxLength();
+        return loadOnHeap ? new OnHeapBytesDictionary(dataBuffer, length, numBytesPerValue)
+            : new BytesDictionary(dataBuffer, length, numBytesPerValue);
+      default:
+        throw new IllegalStateException("Unsupported data type for dictionary: " + dataType);
+    }
+  }
+
+  @Override
+  protected IndexReaderFactory<Dictionary> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return IndexHandler.NoOp.INSTANCE;
+  }
+
+  public static String getFileExtension() {
+    return V1Constants.Dict.FILE_EXTENSION;
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return getFileExtension();
+  }
+
+  private static class ReaderFactory extends IndexReaderFactory.Default<DictionaryIndexConfig, Dictionary> {
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+    @Override
+    protected IndexType<DictionaryIndexConfig, Dictionary, ?> getIndexType() {
+      return StandardIndexes.dictionary();
+    }
+
+    @Override
+    protected Dictionary createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+        DictionaryIndexConfig indexConfig)
+          throws IOException, IndexReaderConstraintException {
+      return DictionaryIndexType.read(dataBuffer, metadata, indexConfig);
+    }
+  }
+
+  @Override
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+    IndexingConfig indexingConfig = tableConfig.getIndexingConfig();
+    List<String> noDictionaryColumns = indexingConfig.getNoDictionaryColumns() == null
+        ? Lists.newArrayList()
+        : indexingConfig.getNoDictionaryColumns();
+    List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList() == null
+        ? Lists.newArrayList()
+        : tableConfig.getFieldConfigList();
+
+    List<FieldConfig> configsToUpdate = new ArrayList<>();
+    for (FieldConfig fieldConfig : fieldConfigList) {
+      // skip further computation of field configs which already has RAW encodingType
+      if (fieldConfig.getEncodingType() == FieldConfig.EncodingType.RAW) {
+        continue;
+      }
+      // ensure encodingType is RAW on noDictionaryColumns
+      if (noDictionaryColumns.remove(fieldConfig.getName())) {
+        configsToUpdate.add(fieldConfig);
+      }
+      if (fieldConfig.getIndexes() == null || fieldConfig.getIndexes().get(getPrettyName()) == null) {
+        continue;
+      }
+      try {
+        DictionaryIndexConfig indexConfig = JsonUtils.jsonNodeToObject(
+            fieldConfig.getIndexes().get(getPrettyName()),
+            DictionaryIndexConfig.class);
+        // ensure encodingType is RAW where dictionary index config has disabled = true
+        if (indexConfig.isDisabled()) {
+          configsToUpdate.add(fieldConfig);
+        }
+      } catch (IOException e) {
+        throw new UncheckedIOException(e);
+      }
+    }
+
+    // update the encodingType to RAW on the selected field configs
+    for (FieldConfig fieldConfig : configsToUpdate) {
+      FieldConfig.Builder builder = new FieldConfig.Builder(fieldConfig);
+      builder.withEncodingType(FieldConfig.EncodingType.RAW);
+      fieldConfigList.remove(fieldConfig);
+      fieldConfigList.add(builder.build());
+    }
+
+    // create the missing field config for the remaining noDictionaryColumns
+    for (String column : noDictionaryColumns) {
+      FieldConfig.Builder builder = new FieldConfig.Builder(column);
+      builder.withEncodingType(FieldConfig.EncodingType.RAW);
+      fieldConfigList.add(builder.build());
+    }
+
+    // old configs cleanup
+    indexingConfig.setNoDictionaryConfig(null);
+    indexingConfig.setNoDictionaryColumns(null);
+    indexingConfig.setOnHeapDictionaryColumns(null);
+    indexingConfig.setVarLengthDictionaryColumns(null);
+  }
+
+  /**
+   * Creates a MutableDictionary.
+   *
+   * Unlikes most indexes, while dictionaries are important when
+   * {@link org.apache.pinot.segment.spi.MutableSegment mutable segments} are created, they do not follow the
+   * {@link MutableIndex} interface and therefore
+   * {@link DictionaryIndexType#createMutableIndex(MutableIndexContext, IndexConfig)} is not implemented.
+   *
+   * This also means that dictionaries cannot be overridden in realtime tables.
+   */
+  @Nullable
+  public static MutableDictionary createMutableDictionary(MutableIndexContext context, DictionaryIndexConfig config) {
+    if (config.isDisabled()) {
+      return null;
+    }
+    String column = context.getFieldSpec().getName();
+    String segmentName = context.getSegmentName();
+    FieldSpec.DataType storedType = context.getFieldSpec().getDataType().getStoredType();
+    int dictionaryColumnSize;
+    if (storedType.isFixedWidth()) {
+      dictionaryColumnSize = storedType.size();
+    } else {
+      dictionaryColumnSize = context.getEstimatedColSize();
+    }
+    // NOTE: preserve 10% buffer for cardinality to reduce the chance of re-sizing the dictionary
+    // TODO(mutable-index-spi): Actually this 10% extra was applied twice, multiplying the cardinality by 1.21
+    //  first time it was applied in MutableSegmentImpl and then in DefaultMutableIndexProvider (where this code was
+    //  copied from). Decide if we want to actually use 10% as the comment said or 21% as we were doing
+    int estimatedCardinality = (int) (context.getEstimatedCardinality() * 1.21);
+    String dictionaryAllocationContext =
+        IndexUtil.buildAllocationContext(segmentName, column, V1Constants.Dict.FILE_EXTENSION);
+    return MutableDictionaryFactory.getMutableDictionary(storedType, context.isOffHeap(), context.getMemoryManager(),
+        dictionaryColumnSize, Math.min(estimatedCardinality, context.getCapacity()), dictionaryAllocationContext);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexCreatorFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexCreatorFactory.java
new file mode 100644
index 00000000000..9cb35aa36fa
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexCreatorFactory.java
@@ -0,0 +1,147 @@
+/**
+ * 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.pinot.segment.local.segment.index.forward;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueFixedByteRawIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueUnsortedForwardIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueVarByteRawIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueFixedByteRawIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueSortedForwardIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueUnsortedForwardIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueVarByteRawIndexCreator;
+import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ForwardIndexCreatorFactory {
+  private ForwardIndexCreatorFactory() {
+  }
+
+  public static ForwardIndexCreator createIndexCreator(IndexCreationContext context, ForwardIndexConfig indexConfig)
+      throws Exception {
+    String colName = context.getFieldSpec().getName();
+
+    if (!context.hasDictionary()) {
+      ChunkCompressionType chunkCompressionType = indexConfig.getChunkCompressionType();
+      if (chunkCompressionType == null) {
+        chunkCompressionType = ForwardIndexType.getDefaultCompressionType(context.getFieldSpec().getFieldType());
+      }
+
+      // Dictionary disabled columns
+      boolean deriveNumDocsPerChunk = indexConfig.isDeriveNumDocsPerChunk();
+      int writerVersion = indexConfig.getRawIndexWriterVersion();
+      if (context.getFieldSpec().isSingleValueField()) {
+        return getRawIndexCreatorForSVColumn(context.getIndexDir(), chunkCompressionType, colName,
+            context.getFieldSpec().getDataType().getStoredType(),
+            context.getTotalDocs(), context.getLengthOfLongestEntry(), deriveNumDocsPerChunk, writerVersion);
+      } else {
+        return getRawIndexCreatorForMVColumn(context.getIndexDir(), chunkCompressionType, colName,
+            context.getFieldSpec().getDataType().getStoredType(),
+            context.getTotalDocs(), context.getMaxNumberOfMultiValueElements(), deriveNumDocsPerChunk, writerVersion,
+            context.getMaxRowLengthInBytes());
+      }
+    } else {
+      // Dictionary enabled columns
+      if (context.getFieldSpec().isSingleValueField()) {
+        if (context.isSorted()) {
+          return new SingleValueSortedForwardIndexCreator(context.getIndexDir(), colName,
+              context.getCardinality());
+        } else {
+          return new SingleValueUnsortedForwardIndexCreator(context.getIndexDir(), colName,
+              context.getCardinality(), context.getTotalDocs());
+        }
+      } else {
+        return new MultiValueUnsortedForwardIndexCreator(context.getIndexDir(), colName,
+            context.getCardinality(), context.getTotalDocs(), context.getTotalNumberOfEntries());
+      }
+    }
+  }
+
+  /**
+   * Helper method to build the raw index creator for the column.
+   * Assumes that column to be indexed is single valued.
+   *
+   * @param file Output index file
+   * @param column Column name
+   * @param totalDocs Total number of documents to index
+   * @param lengthOfLongestEntry Length of longest entry
+   * @param deriveNumDocsPerChunk true if varbyte writer should auto-derive the number of rows per chunk
+   * @param writerVersion version to use for the raw index writer
+   * @return raw index creator
+   */
+  public static ForwardIndexCreator getRawIndexCreatorForSVColumn(File file, ChunkCompressionType compressionType,
+      String column, FieldSpec.DataType dataType, int totalDocs, int lengthOfLongestEntry,
+      boolean deriveNumDocsPerChunk, int writerVersion)
+      throws IOException {
+    switch (dataType.getStoredType()) {
+      case INT:
+      case LONG:
+      case FLOAT:
+      case DOUBLE:
+        return new SingleValueFixedByteRawIndexCreator(file, compressionType, column, totalDocs, dataType,
+            writerVersion);
+      case BIG_DECIMAL:
+      case STRING:
+      case BYTES:
+        return new SingleValueVarByteRawIndexCreator(file, compressionType, column, totalDocs, dataType,
+            lengthOfLongestEntry, deriveNumDocsPerChunk, writerVersion);
+      default:
+        throw new UnsupportedOperationException("Data type not supported for raw indexing: " + dataType);
+    }
+  }
+
+  /**
+   * Helper method to build the raw index creator for the column.
+   * Assumes that column to be indexed is multi-valued.
+   *
+   * @param file Output index file
+   * @param column Column name
+   * @param totalDocs Total number of documents to index
+   * @param deriveNumDocsPerChunk true if varbyte writer should auto-derive the number of rows
+   *     per chunk
+   * @param writerVersion version to use for the raw index writer
+   * @param maxRowLengthInBytes the length of the longest row in bytes
+   * @return raw index creator
+   */
+  public static ForwardIndexCreator getRawIndexCreatorForMVColumn(File file, ChunkCompressionType compressionType,
+      String column, FieldSpec.DataType dataType, final int totalDocs, int maxNumberOfMultiValueElements,
+      boolean deriveNumDocsPerChunk, int writerVersion, int maxRowLengthInBytes)
+      throws IOException {
+    switch (dataType.getStoredType()) {
+      case INT:
+      case LONG:
+      case FLOAT:
+      case DOUBLE:
+        return new MultiValueFixedByteRawIndexCreator(file, compressionType, column, totalDocs, dataType,
+            maxNumberOfMultiValueElements, deriveNumDocsPerChunk, writerVersion);
+      case STRING:
+      case BYTES:
+        return new MultiValueVarByteRawIndexCreator(file, compressionType, column, totalDocs, dataType, writerVersion,
+            maxRowLengthInBytes, maxNumberOfMultiValueElements);
+      default:
+        throw new UnsupportedOperationException("Data type not supported for raw indexing: " + dataType);
+    }
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexPlugin.java
new file mode 100644
index 00000000000..98283d85723
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexPlugin.java
@@ -0,0 +1,35 @@
+/**
+ * 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.pinot.segment.local.segment.index.forward;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+
+@AutoService(IndexPlugin.class)
+public class ForwardIndexPlugin implements IndexPlugin<ForwardIndexType> {
+
+  private static final ForwardIndexType INSTANCE = new ForwardIndexType();
+
+  @Override
+  public ForwardIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexReaderFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexReaderFactory.java
new file mode 100644
index 00000000000..283f569f401
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexReaderFactory.java
@@ -0,0 +1,90 @@
+/**
+ * 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.pinot.segment.local.segment.index.forward;
+
+import org.apache.pinot.segment.local.io.writer.impl.VarByteChunkSVForwardIndexWriterV4;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedBitMVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedBitSVForwardIndexReaderV2;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedByteChunkMVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedByteChunkSVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedBytePower2ChunkSVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkMVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReaderV4;
+import org.apache.pinot.segment.local.segment.index.readers.sorted.SortedIndexReaderImpl;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+class ForwardIndexReaderFactory extends IndexReaderFactory.Default<ForwardIndexConfig, ForwardIndexReader> {
+
+  public static final ForwardIndexReaderFactory INSTANCE = new ForwardIndexReaderFactory();
+
+  @Override
+  protected IndexType<ForwardIndexConfig, ForwardIndexReader, ?> getIndexType() {
+    return StandardIndexes.forward();
+  }
+
+  @Override
+  protected ForwardIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+      ForwardIndexConfig indexConfig)
+      throws IndexReaderConstraintException {
+    return createIndexReader(dataBuffer, metadata);
+  }
+
+  public static ForwardIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata) {
+    if (metadata.hasDictionary()) {
+      if (metadata.isSingleValue()) {
+        if (metadata.isSorted()) {
+          return new SortedIndexReaderImpl(dataBuffer, metadata.getCardinality());
+        } else {
+          return new FixedBitSVForwardIndexReaderV2(dataBuffer, metadata.getTotalDocs(), metadata.getBitsPerElement());
+        }
+      } else {
+        return new FixedBitMVForwardIndexReader(dataBuffer, metadata.getTotalDocs(), metadata.getTotalNumberOfEntries(),
+            metadata.getBitsPerElement());
+      }
+    } else {
+      FieldSpec.DataType storedType = metadata.getDataType().getStoredType();
+      if (metadata.isSingleValue()) {
+        int version = dataBuffer.getInt(0);
+        if (storedType.isFixedWidth()) {
+          return version >= FixedBytePower2ChunkSVForwardIndexReader.VERSION
+              ? new FixedBytePower2ChunkSVForwardIndexReader(dataBuffer, storedType)
+              : new FixedByteChunkSVForwardIndexReader(dataBuffer, storedType);
+        }
+        if (version >= VarByteChunkSVForwardIndexWriterV4.VERSION) {
+          return new VarByteChunkSVForwardIndexReaderV4(dataBuffer, storedType);
+        }
+        return new VarByteChunkSVForwardIndexReader(dataBuffer, storedType);
+      } else {
+        return storedType.isFixedWidth() ? new FixedByteChunkMVForwardIndexReader(dataBuffer, storedType)
+            : new VarByteChunkMVForwardIndexReader(dataBuffer, storedType);
+      }
+    }
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexType.java
new file mode 100644
index 00000000000..e45cca536e9
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexType.java
@@ -0,0 +1,319 @@
+/**
+ * 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.pinot.segment.local.segment.index.forward;
+
+import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.realtime.impl.forward.FixedByteMVMutableForwardIndex;
+import org.apache.pinot.segment.local.realtime.impl.forward.FixedByteSVMutableForwardIndex;
+import org.apache.pinot.segment.local.realtime.impl.forward.VarByteSVMutableForwardIndex;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.ForwardIndexHandler;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class ForwardIndexType
+    extends AbstractIndexType<ForwardIndexConfig, ForwardIndexReader, ForwardIndexCreator>
+    implements ConfigurableFromIndexLoadingConfig<ForwardIndexConfig> {
+  public static final String INDEX_DISPLAY_NAME = "forward";
+  // For multi-valued column, forward-index.
+  // Maximum number of multi-values per row. We assert on this.
+  private static final int MAX_MULTI_VALUES_PER_ROW = 1000;
+  private static final int NODICT_VARIABLE_WIDTH_ESTIMATED_AVERAGE_VALUE_LENGTH_DEFAULT = 100;
+  private static final int NODICT_VARIABLE_WIDTH_ESTIMATED_NUMBER_OF_VALUES_DEFAULT = 100_000;
+
+  protected ForwardIndexType() {
+    super(StandardIndexes.FORWARD_ID);
+  }
+
+  @Override
+  public Class<ForwardIndexConfig> getIndexConfigClass() {
+    return ForwardIndexConfig.class;
+  }
+
+  @Override
+  public Map<String, ForwardIndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    Set<String> disabledCols = indexLoadingConfig.getForwardIndexDisabledColumns();
+    Map<String, ForwardIndexConfig> result = new HashMap<>();
+    Set<String> allColumns = Sets.union(disabledCols, indexLoadingConfig.getAllKnownColumns());
+    for (String column : allColumns) {
+      ChunkCompressionType compressionType =
+          indexLoadingConfig.getCompressionConfigs() != null
+              ? indexLoadingConfig.getCompressionConfigs().get(column)
+              : null;
+      Supplier<ForwardIndexConfig> defaultConfig = () -> {
+        if (compressionType == null) {
+          return ForwardIndexConfig.DEFAULT;
+        } else {
+          return new ForwardIndexConfig.Builder().withCompressionType(compressionType).build();
+        }
+      };
+      if (!disabledCols.contains(column)) {
+        TableConfig tableConfig = indexLoadingConfig.getTableConfig();
+        if (tableConfig == null) {
+          result.put(column, defaultConfig.get());
+        } else {
+          List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
+          if (fieldConfigList == null) {
+            result.put(column, defaultConfig.get());
+            continue;
+          }
+          FieldConfig fieldConfig = fieldConfigList.stream()
+              .filter(fc -> fc.getName().equals(column))
+              .findAny()
+              .orElse(null);
+          if (fieldConfig == null) {
+            result.put(column, defaultConfig.get());
+            continue;
+          }
+          ForwardIndexConfig.Builder builder = new ForwardIndexConfig.Builder();
+          if (compressionType != null) {
+            builder.withCompressionType(compressionType);
+          } else {
+            FieldConfig.CompressionCodec compressionCodec = fieldConfig.getCompressionCodec();
+            if (compressionCodec != null) {
+              builder.withCompressionType(ChunkCompressionType.valueOf(compressionCodec.name()));
+            }
+          }
+
+          result.put(column, builder.build());
+        }
+      } else {
+        result.put(column, ForwardIndexConfig.DISABLED);
+      }
+    }
+    return result;
+  }
+
+  @Override
+  public ForwardIndexConfig getDefaultConfig() {
+    return ForwardIndexConfig.DEFAULT;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<ForwardIndexConfig> createDeserializer() {
+    // reads tableConfig.fieldConfigList and decides what to create using the FieldConfig properties and encoding
+    ColumnConfigDeserializer<ForwardIndexConfig> fromFieldConfig = IndexConfigDeserializer.fromCollection(
+        TableConfig::getFieldConfigList,
+        (accum, fieldConfig) -> {
+          Map<String, String> properties = fieldConfig.getProperties();
+          if (properties != null && isDisabled(properties)) {
+            accum.put(fieldConfig.getName(), ForwardIndexConfig.DISABLED);
+          } else if (fieldConfig.getEncodingType() == FieldConfig.EncodingType.RAW) {
+            accum.put(fieldConfig.getName(), createConfigFromFieldConfig(fieldConfig));
+          }
+          // On other case encoding is DICTIONARY. We create the default forward index by default. That means that if
+          // field config indicates for example a compression while using encoding dictionary, the compression is
+          // ignored.
+          // It is important to do not explicitly add the default value here in order to avoid exclusive problems with
+          // the default `fromIndexes` deserializer.
+        }
+    );
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative(fromFieldConfig);
+  }
+
+  private boolean isDisabled(Map<String, String> props) {
+    return Boolean.parseBoolean(
+        props.getOrDefault(FieldConfig.FORWARD_INDEX_DISABLED, FieldConfig.DEFAULT_FORWARD_INDEX_DISABLED));
+  }
+
+  private ForwardIndexConfig createConfigFromFieldConfig(FieldConfig fieldConfig) {
+    FieldConfig.CompressionCodec compressionCodec = fieldConfig.getCompressionCodec();
+    ForwardIndexConfig.Builder builder = new ForwardIndexConfig.Builder();
+    if (compressionCodec != null) {
+      builder.withCompressionType(ChunkCompressionType.valueOf(compressionCodec.name()));
+    }
+
+    Map<String, String> properties = fieldConfig.getProperties();
+    if (properties != null) {
+      builder.withLegacyProperties(properties);
+    }
+
+    return builder.build();
+  }
+
+  public static ChunkCompressionType getDefaultCompressionType(FieldSpec.FieldType fieldType) {
+    if (fieldType == FieldSpec.FieldType.METRIC) {
+      return ChunkCompressionType.PASS_THROUGH;
+    } else {
+      return ChunkCompressionType.LZ4;
+    }
+  }
+
+  @Override
+  public ForwardIndexCreator createIndexCreator(IndexCreationContext context, ForwardIndexConfig indexConfig)
+      throws Exception {
+    return ForwardIndexCreatorFactory.createIndexCreator(context, indexConfig);
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new ForwardIndexHandler(segmentDirectory, configsByCol, schema, tableConfig);
+  }
+
+  @Override
+  protected IndexReaderFactory<ForwardIndexReader> createReaderFactory() {
+    return ForwardIndexReaderFactory.INSTANCE;
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    if (columnMetadata.isSingleValue()) {
+      if (!columnMetadata.hasDictionary()) {
+        return V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION;
+      } else if (columnMetadata.isSorted()) {
+        return V1Constants.Indexes.SORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+      } else {
+        return V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+      }
+    } else if (!columnMetadata.hasDictionary()) {
+      return V1Constants.Indexes.RAW_MV_FORWARD_INDEX_FILE_EXTENSION;
+    } else {
+      return V1Constants.Indexes.UNSORTED_MV_FORWARD_INDEX_FILE_EXTENSION;
+    }
+  }
+
+  /**
+   * Returns the forward index reader for the given column.
+   *
+   * This method will return the default reader, skipping any index overload.
+   */
+  public static ForwardIndexReader<?> read(SegmentDirectory.Reader segmentReader,
+      ColumnMetadata columnMetadata)
+      throws IOException {
+    PinotDataBuffer dataBuffer = segmentReader.getIndexFor(columnMetadata.getColumnName(), StandardIndexes.forward());
+    return read(dataBuffer, columnMetadata);
+  }
+
+  /**
+   * Returns the forward index reader for the given column.
+   *
+   * This method will return the default reader, skipping any index overload.
+   */
+  public static ForwardIndexReader read(PinotDataBuffer dataBuffer, ColumnMetadata metadata) {
+    return ForwardIndexReaderFactory.createIndexReader(dataBuffer, metadata);
+  }
+
+  /**
+   * Returns the forward index reader for the given column.
+   *
+   * This method will delegate on {@link StandardIndexes}, so the correct reader will be returned even when using
+   * index overload.
+   */
+  public static ForwardIndexReader<?> read(SegmentDirectory.Reader segmentReader, FieldIndexConfigs fieldIndexConfigs,
+      ColumnMetadata metadata)
+      throws IndexReaderConstraintException, IOException {
+    return StandardIndexes.forward().getReaderFactory().createIndexReader(segmentReader, fieldIndexConfigs, metadata);
+  }
+
+  @Nullable
+  @Override
+  public MutableIndex createMutableIndex(MutableIndexContext context, ForwardIndexConfig config) {
+    if (config.isDisabled()) {
+      return null;
+    }
+    String column = context.getFieldSpec().getName();
+    String segmentName = context.getSegmentName();
+    FieldSpec.DataType storedType = context.getFieldSpec().getDataType().getStoredType();
+    boolean isSingleValue = context.getFieldSpec().isSingleValueField();
+    if (!context.hasDictionary()) {
+      if (isSingleValue) {
+        String allocationContext = IndexUtil.buildAllocationContext(context.getSegmentName(),
+            context.getFieldSpec().getName(), V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION);
+        if (storedType.isFixedWidth()) {
+          return new FixedByteSVMutableForwardIndex(false, storedType, context.getCapacity(),
+              context.getMemoryManager(), allocationContext);
+        } else {
+          // RealtimeSegmentStatsHistory does not have the stats for no-dictionary columns from previous consuming
+          // segments
+          // TODO: Add support for updating RealtimeSegmentStatsHistory with average column value size for no dictionary
+          //       columns as well
+          // TODO: Use the stats to get estimated average length
+          // Use a smaller capacity as opposed to segment flush size
+          int initialCapacity = Math.min(context.getCapacity(),
+              NODICT_VARIABLE_WIDTH_ESTIMATED_NUMBER_OF_VALUES_DEFAULT);
+          return new VarByteSVMutableForwardIndex(storedType, context.getMemoryManager(), allocationContext,
+              initialCapacity, NODICT_VARIABLE_WIDTH_ESTIMATED_AVERAGE_VALUE_LENGTH_DEFAULT);
+        }
+      } else {
+        // TODO: Add support for variable width (bytes, string, big decimal) MV RAW column types
+        assert storedType.isFixedWidth();
+        String allocationContext =
+            IndexUtil.buildAllocationContext(context.getSegmentName(), context.getFieldSpec().getName(),
+                V1Constants.Indexes.RAW_MV_FORWARD_INDEX_FILE_EXTENSION);
+        // TODO: Start with a smaller capacity on FixedByteMVForwardIndexReaderWriter and let it expand
+        return new FixedByteMVMutableForwardIndex(MAX_MULTI_VALUES_PER_ROW, context.getAvgNumMultiValues(),
+            context.getCapacity(), storedType.size(), context.getMemoryManager(), allocationContext, false,
+            storedType);
+      }
+    } else {
+      if (isSingleValue) {
+        String allocationContext = IndexUtil.buildAllocationContext(segmentName, column,
+            V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION);
+        return new FixedByteSVMutableForwardIndex(true, FieldSpec.DataType.INT, context.getCapacity(),
+            context.getMemoryManager(), allocationContext);
+      } else {
+        String allocationContext = IndexUtil.buildAllocationContext(segmentName, column,
+            V1Constants.Indexes.UNSORTED_MV_FORWARD_INDEX_FILE_EXTENSION);
+        // TODO: Start with a smaller capacity on FixedByteMVForwardIndexReaderWriter and let it expand
+        return new FixedByteMVMutableForwardIndex(MAX_MULTI_VALUES_PER_ROW, context.getAvgNumMultiValues(),
+            context.getCapacity(), Integer.BYTES, context.getMemoryManager(), allocationContext, true,
+            FieldSpec.DataType.INT);
+      }
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableTextIndexReaderProvider.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexPlugin.java
similarity index 67%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableTextIndexReaderProvider.java
rename to pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexPlugin.java
index de30926a855..22cb509393f 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableTextIndexReaderProvider.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexPlugin.java
@@ -16,11 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.index.mutable.provider;
 
-import org.apache.pinot.segment.spi.index.mutable.MutableTextIndex;
+package org.apache.pinot.segment.local.segment.index.fst;
 
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
 
-public interface MutableTextIndexReaderProvider {
-  MutableTextIndex newTextIndex(MutableIndexContext.Text context);
+
+@AutoService(IndexPlugin.class)
+public class FstIndexPlugin implements IndexPlugin<FstIndexType> {
+  private static final FstIndexType INSTANCE = new FstIndexType();
+
+  @Override
+  public FstIndexType getIndexType() {
+    return INSTANCE;
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexType.java
new file mode 100644
index 00000000000..39b56a368d1
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexType.java
@@ -0,0 +1,212 @@
+/**
+ * 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.pinot.segment.local.segment.index.fst;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.text.LuceneFSTIndexCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.invertedindex.FSTIndexHandler;
+import org.apache.pinot.segment.local.segment.index.readers.LuceneFSTIndexReader;
+import org.apache.pinot.segment.local.utils.nativefst.FSTHeader;
+import org.apache.pinot.segment.local.utils.nativefst.NativeFSTIndexCreator;
+import org.apache.pinot.segment.local.utils.nativefst.NativeFSTIndexReader;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FstIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.FSTIndexCreator;
+import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexingConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class FstIndexType extends AbstractIndexType<FstIndexConfig, TextIndexReader, FSTIndexCreator>
+    implements ConfigurableFromIndexLoadingConfig<FstIndexConfig> {
+  public static final String INDEX_DISPLAY_NAME = "fst";
+
+  protected FstIndexType() {
+    super(StandardIndexes.FST_ID);
+  }
+
+  @Override
+  public Class<FstIndexConfig> getIndexConfigClass() {
+    return FstIndexConfig.class;
+  }
+
+  @Override
+  public Map<String, FstIndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    Map<String, FstIndexConfig> result = new HashMap<>();
+    Set<String> fstIndexColumns = indexLoadingConfig.getFSTIndexColumns();
+    for (String column : indexLoadingConfig.getAllKnownColumns()) {
+      if (fstIndexColumns.contains(column)) {
+        FSTType fstType = getFstTypeFromIndexLoadingConfig(indexLoadingConfig, column);
+        FstIndexConfig conf = new FstIndexConfig(fstType);
+        result.put(column, conf);
+      } else {
+        result.put(column, FstIndexConfig.DISABLED);
+      }
+    }
+    return result;
+  }
+
+  private FSTType getFstTypeFromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig, String column) {
+
+    FSTType fstType = indexLoadingConfig.getFSTIndexType();
+
+    TableConfig tableConfig = indexLoadingConfig.getTableConfig();
+    if (tableConfig != null) {
+      List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
+      if (fieldConfigList != null) {
+        FieldConfig fieldConfig = fieldConfigList.stream()
+            .filter(fc -> fc.getName().equals(column))
+            .findAny()
+            .orElse(null);
+        if (fieldConfig != null) {
+          Map<String, String> textProperties = fieldConfig.getProperties();
+          if (textProperties != null) {
+            for (Map.Entry<String, String> entry : textProperties.entrySet()) {
+              if (entry.getKey().equalsIgnoreCase(FieldConfig.TEXT_FST_TYPE)) {
+                fstType = FSTType.NATIVE;
+              } else {
+                fstType = FSTType.LUCENE;
+              }
+            }
+          }
+        }
+      }
+    }
+    return fstType;
+  }
+
+  @Override
+  public FstIndexConfig getDefaultConfig() {
+    return FstIndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<FstIndexConfig> createDeserializer() {
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative(IndexConfigDeserializer.fromIndexTypes(
+            FieldConfig.IndexType.FST,
+            (tableConfig, fieldConfig) -> {
+              IndexingConfig indexingConfig = tableConfig.getIndexingConfig();
+              FSTType fstIndexType = indexingConfig != null ? indexingConfig.getFSTIndexType() : null;
+              return new FstIndexConfig(fstIndexType);
+            }));
+  }
+
+  @Override
+  public FSTIndexCreator createIndexCreator(IndexCreationContext context, FstIndexConfig indexConfig)
+      throws IOException {
+    Preconditions.checkState(context.getFieldSpec().isSingleValueField(),
+        "FST index is currently only supported on single-value columns");
+    Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.STRING,
+        "FST index is currently only supported on STRING type columns");
+    Preconditions.checkState(context.hasDictionary(),
+        "FST index is currently only supported on dictionary-encoded columns");
+    if (indexConfig.getFstType() == FSTType.NATIVE) {
+      return new NativeFSTIndexCreator(context);
+    } else {
+      return new LuceneFSTIndexCreator(context);
+    }
+  }
+
+  @Override
+  protected IndexReaderFactory<TextIndexReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  public static TextIndexReader read(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
+      throws IndexReaderConstraintException, IOException {
+    return ReaderFactory.INSTANCE.createIndexReader(dataBuffer, metadata);
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new FSTIndexHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.FST_INDEX_FILE_EXTENSION;
+  }
+
+  private static class ReaderFactory extends IndexReaderFactory.Default<FstIndexConfig, TextIndexReader> {
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+    @Override
+    protected IndexType<FstIndexConfig, TextIndexReader, ?> getIndexType() {
+      return StandardIndexes.fst();
+    }
+
+    protected TextIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
+        throws IndexReaderConstraintException, IOException {
+      if (!metadata.hasDictionary()) {
+        throw new IndexReaderConstraintException(metadata.getColumnName(), StandardIndexes.fst(),
+            "This index requires a dictionary");
+      }
+      int magicHeader = dataBuffer.getInt(0);
+      if (magicHeader == FSTHeader.FST_MAGIC) {
+        return new NativeFSTIndexReader(dataBuffer);
+      } else {
+        return new LuceneFSTIndexReader(dataBuffer);
+      }
+    }
+
+    @Override
+    protected TextIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+        FstIndexConfig indexConfig)
+        throws IndexReaderConstraintException, IOException {
+      return createIndexReader(dataBuffer, metadata);
+    }
+  }
+
+  @Override
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+    tableConfig.getIndexingConfig().setFSTIndexType(null);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockMetadata.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/h3/H3IndexPlugin.java
similarity index 67%
rename from pinot-core/src/main/java/org/apache/pinot/core/common/BlockMetadata.java
rename to pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/h3/H3IndexPlugin.java
index 041ea219dec..7fef16540fa 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockMetadata.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/h3/H3IndexPlugin.java
@@ -16,27 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.core.common;
 
-import org.apache.pinot.segment.spi.index.reader.Dictionary;
-import org.apache.pinot.spi.data.FieldSpec;
+package org.apache.pinot.segment.local.segment.index.h3;
 
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
 
-public interface BlockMetadata {
 
-  int getLength();
+@AutoService(IndexPlugin.class)
+public class H3IndexPlugin implements IndexPlugin<H3IndexType> {
 
-  int getStartDocId();
+  private static final H3IndexType INSTANCE = new H3IndexType();
 
-  int getEndDocId();
-
-  FieldSpec.DataType getDataType();
-
-  boolean isSingleValue();
-
-  int getMaxNumberOfMultiValues();
-
-  boolean hasDictionary();
-
-  Dictionary getDictionary();
+  @Override
+  public H3IndexType getIndexType() {
+    return INSTANCE;
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/h3/H3IndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/h3/H3IndexType.java
new file mode 100644
index 00000000000..bdf2b32a307
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/h3/H3IndexType.java
@@ -0,0 +1,159 @@
+/**
+ * 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.pinot.segment.local.segment.index.h3;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.realtime.impl.geospatial.MutableH3Index;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.geospatial.OffHeapH3IndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.geospatial.OnHeapH3IndexCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.invertedindex.H3IndexHandler;
+import org.apache.pinot.segment.local.segment.index.readers.geospatial.ImmutableH3IndexReader;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
+import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class H3IndexType extends AbstractIndexType<H3IndexConfig, H3IndexReader, GeoSpatialIndexCreator>
+  implements ConfigurableFromIndexLoadingConfig<H3IndexConfig> {
+  public static final String INDEX_DISPLAY_NAME = "h3";
+
+  protected H3IndexType() {
+    super(StandardIndexes.H3_ID);
+  }
+
+  @Override
+  public Class<H3IndexConfig> getIndexConfigClass() {
+    return H3IndexConfig.class;
+  }
+
+  @Override
+  public Map<String, H3IndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    return indexLoadingConfig.getH3IndexConfigs();
+  }
+
+  @Override
+  public H3IndexConfig getDefaultConfig() {
+    return H3IndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<H3IndexConfig> createDeserializer() {
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative(IndexConfigDeserializer.fromIndexTypes(
+            FieldConfig.IndexType.H3,
+            ((tableConfig, fieldConfig) -> new H3IndexConfig(fieldConfig.getProperties()))));
+  }
+
+  @Override
+  public GeoSpatialIndexCreator createIndexCreator(IndexCreationContext context, H3IndexConfig indexConfig)
+      throws IOException {
+    Preconditions.checkState(context.getFieldSpec().isSingleValueField(),
+        "H3 index is currently only supported on single-value columns");
+    Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.BYTES,
+        "H3 index is currently only supported on BYTES columns");
+    H3IndexResolution resolution = Objects.requireNonNull(indexConfig).getResolution();
+    return context.isOnHeap()
+        ? new OnHeapH3IndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), resolution)
+        : new OffHeapH3IndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), resolution);
+  }
+
+  @Override
+  protected IndexReaderFactory<H3IndexReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new H3IndexHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.H3_INDEX_FILE_EXTENSION;
+  }
+
+  private static class ReaderFactory extends IndexReaderFactory.Default<H3IndexConfig, H3IndexReader> {
+
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+
+    @Override
+    protected IndexType<H3IndexConfig, H3IndexReader, ?> getIndexType() {
+      return StandardIndexes.h3();
+    }
+
+    @Override
+    protected H3IndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+        H3IndexConfig indexConfig) {
+      return new ImmutableH3IndexReader(dataBuffer);
+    }
+  }
+
+  @Nullable
+  @Override
+  public MutableIndex createMutableIndex(MutableIndexContext context, H3IndexConfig config) {
+    if (config.isDisabled()) {
+      return null;
+    }
+    if (!context.getFieldSpec().isSingleValueField()) {
+      return null;
+    }
+    try {
+      return new MutableH3Index(config.getResolution());
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexPlugin.java
new file mode 100644
index 00000000000..923e17b2904
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexPlugin.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pinot.segment.local.segment.index.inverted;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+
+@AutoService(IndexPlugin.class)
+public class InvertedIndexPlugin implements IndexPlugin<InvertedIndexType> {
+  private static final InvertedIndexType INSTANCE = new InvertedIndexType();
+
+  @Override
+  public InvertedIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexType.java
new file mode 100644
index 00000000000..fce5097e062
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexType.java
@@ -0,0 +1,211 @@
+/**
+ * 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.pinot.segment.local.segment.index.inverted;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeInvertedIndex;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.OffHeapBitmapInvertedIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.OnHeapBitmapInvertedIndexCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.invertedindex.InvertedIndexHandler;
+import org.apache.pinot.segment.local.segment.index.readers.BitmapInvertedIndexReader;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
+import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
+import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
+import org.apache.pinot.segment.spi.index.reader.SortedIndexReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class InvertedIndexType
+    extends AbstractIndexType<IndexConfig, InvertedIndexReader, DictionaryBasedInvertedIndexCreator>
+    implements ConfigurableFromIndexLoadingConfig<IndexConfig> {
+  public static final String INDEX_DISPLAY_NAME = "inverted";
+
+  protected InvertedIndexType() {
+    super(StandardIndexes.INVERTED_ID);
+  }
+
+  @Override
+  public Class<IndexConfig> getIndexConfigClass() {
+    return IndexConfig.class;
+  }
+
+  @Override
+  public Map<String, IndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    return indexLoadingConfig.getInvertedIndexColumns().stream()
+        .collect(Collectors.toMap(Function.identity(), v -> IndexConfig.ENABLED));
+  }
+
+  @Override
+  public IndexConfig getDefaultConfig() {
+    return IndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<IndexConfig> createDeserializer() {
+    ColumnConfigDeserializer<IndexConfig> fromInvertedCols = IndexConfigDeserializer.fromCollection(
+        tableConfig -> tableConfig.getIndexingConfig().getInvertedIndexColumns(),
+        (acum, column) -> acum.put(column, IndexConfig.ENABLED));
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative(IndexConfigDeserializer.ifIndexingConfig(fromInvertedCols));
+  }
+
+  public DictionaryBasedInvertedIndexCreator createIndexCreator(IndexCreationContext context)
+      throws IOException {
+    if (context.isOnHeap()) {
+      return new OnHeapBitmapInvertedIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(),
+          context.getCardinality());
+    } else {
+      return new OffHeapBitmapInvertedIndexCreator(context.getIndexDir(), context.getFieldSpec(),
+          context.getCardinality(), context.getTotalDocs(), context.getTotalNumberOfEntries());
+    }
+  }
+
+  @Override
+  public DictionaryBasedInvertedIndexCreator createIndexCreator(IndexCreationContext context,
+      IndexConfig indexConfig)
+      throws IOException {
+    return createIndexCreator(context);
+  }
+
+  @Override
+  protected IndexReaderFactory<InvertedIndexReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  @Override
+  @Nullable
+  public InvertedIndexReader getIndexReader(ColumnIndexContainer indexContainer) {
+    InvertedIndexReader reader = super.getIndexReader(indexContainer);
+    if (reader != null) {
+      return reader;
+    }
+    ForwardIndexReader fwdReader = indexContainer.getIndex(StandardIndexes.forward());
+    return fwdReader instanceof SortedIndexReader ? (SortedIndexReader) fwdReader : null;
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.BITMAP_INVERTED_INDEX_FILE_EXTENSION;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new InvertedIndexHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  public static class ReaderFactory implements IndexReaderFactory<InvertedIndexReader> {
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+
+    /**
+     * Creates a {@link InvertedIndexReader}.
+     *
+     * Unless {@link #createSkippingForward(SegmentDirectory.Reader, ColumnMetadata)}, this method first try to use the
+     * forward index reader in case it is also an inverted index. That is the case, for example, when the column is
+     * sorted and single value.
+     */
+    @Override
+    public InvertedIndexReader createIndexReader(SegmentDirectory.Reader segmentReader,
+        FieldIndexConfigs fieldIndexConfigs, ColumnMetadata metadata)
+        throws IOException, IndexReaderConstraintException {
+      if (!segmentReader.hasIndexFor(metadata.getColumnName(), StandardIndexes.inverted())) {
+        return null;
+      }
+      if (!metadata.hasDictionary()) {
+        throw new IllegalStateException("Column " + metadata.getColumnName() + " cannot be indexed by an inverted "
+            + "index if it has no dictionary");
+      }
+      if (metadata.isSorted() && metadata.isSingleValue()) {
+        ForwardIndexReader fwdReader = StandardIndexes.forward().getReaderFactory()
+            .createIndexReader(segmentReader, fieldIndexConfigs, metadata);
+        Preconditions.checkState(fwdReader instanceof SortedIndexReader);
+        return (SortedIndexReader) fwdReader;
+      } else {
+        return createSkippingForward(segmentReader, metadata);
+      }
+    }
+
+    /**
+     * Directly creates a {@link InvertedIndexReader}.
+     *
+     * Unless {@link #createIndexReader}, this method always tries to create the actual inverted index reader instead of
+     * try to use the forward index when the column is sorted and single value.
+     */
+    public InvertedIndexReader createSkippingForward(SegmentDirectory.Reader segmentReader, ColumnMetadata metadata)
+        throws IOException {
+      if (!metadata.hasDictionary()) {
+        throw new IllegalStateException("Column " + metadata.getColumnName() + " cannot be indexed by an inverted "
+            + "index if it has no dictionary");
+      }
+      PinotDataBuffer dataBuffer = segmentReader.getIndexFor(metadata.getColumnName(), StandardIndexes.inverted());
+      return new BitmapInvertedIndexReader(dataBuffer, metadata.getCardinality());
+    }
+  }
+
+  @Override
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+    tableConfig.getIndexingConfig().setInvertedIndexColumns(null);
+  }
+
+  @Nullable
+  @Override
+  public MutableIndex createMutableIndex(MutableIndexContext context, IndexConfig config) {
+    if (config.isDisabled()) {
+      return null;
+    }
+    if (!context.hasDictionary()) {
+      return null;
+    }
+    return new RealtimeInvertedIndex();
+  }
+}
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaSimpleConsumerFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/json/JsonIndexPlugin.java
similarity index 66%
rename from pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaSimpleConsumerFactory.java
rename to pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/json/JsonIndexPlugin.java
index 1cd37c55cb9..28f00ead900 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/src/main/java/org/apache/pinot/plugin/stream/kafka09/KafkaSimpleConsumerFactory.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/json/JsonIndexPlugin.java
@@ -16,15 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.plugin.stream.kafka09;
 
-import kafka.javaapi.consumer.SimpleConsumer;
+package org.apache.pinot.segment.local.segment.index.json;
 
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
 
-/**
- * Factory for Kafka SimpleConsumer instances, so that we can create mock instances of the Kafka SimpleConsumer for
- * unit tests.
- */
-public interface KafkaSimpleConsumerFactory {
-  SimpleConsumer buildSimpleConsumer(String host, int port, int soTimeout, int bufferSize, String clientId);
+
+@AutoService(IndexPlugin.class)
+public class JsonIndexPlugin implements IndexPlugin<JsonIndexType> {
+  public static final JsonIndexType INSTANCE = new JsonIndexType();
+
+  @Override
+  public JsonIndexType getIndexType() {
+    return INSTANCE;
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/json/JsonIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/json/JsonIndexType.java
new file mode 100644
index 00000000000..37e94b3630a
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/json/JsonIndexType.java
@@ -0,0 +1,182 @@
+/**
+ * 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.pinot.segment.local.segment.index.json;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.realtime.impl.json.MutableJsonIndexImpl;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.json.OffHeapJsonIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.json.OnHeapJsonIndexCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.invertedindex.JsonIndexHandler;
+import org.apache.pinot.segment.local.segment.index.readers.json.ImmutableJsonIndexReader;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.JsonIndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class JsonIndexType extends AbstractIndexType<JsonIndexConfig, JsonIndexReader, JsonIndexCreator>
+    implements ConfigurableFromIndexLoadingConfig<JsonIndexConfig> {
+  public static final String INDEX_DISPLAY_NAME = "json";
+
+  protected JsonIndexType() {
+    super(StandardIndexes.JSON_ID);
+  }
+
+  @Override
+  public Class<JsonIndexConfig> getIndexConfigClass() {
+    return JsonIndexConfig.class;
+  }
+
+  @Override
+  public Map<String, JsonIndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    return indexLoadingConfig.getJsonIndexConfigs();
+  }
+
+  @Override
+  public JsonIndexConfig getDefaultConfig() {
+    return JsonIndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<JsonIndexConfig> createDeserializer() {
+    // reads tableConfig.indexingConfig.jsonIndexConfigs
+    ColumnConfigDeserializer<JsonIndexConfig> fromJsonIndexConf =
+        IndexConfigDeserializer.fromMap(tableConfig -> tableConfig.getIndexingConfig().getJsonIndexConfigs());
+    // reads tableConfig.indexingConfig.jsonIndexColumns
+    ColumnConfigDeserializer<JsonIndexConfig> fromJsonIndexCols =
+        IndexConfigDeserializer.fromCollection(
+            tableConfig -> tableConfig.getIndexingConfig().getJsonIndexColumns(),
+            (accum, column) -> accum.put(column, new JsonIndexConfig()));
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative(
+            IndexConfigDeserializer.ifIndexingConfig(fromJsonIndexCols.withExclusiveAlternative(fromJsonIndexConf)));
+  }
+
+  @Override
+  public JsonIndexCreator createIndexCreator(IndexCreationContext context, JsonIndexConfig indexConfig)
+      throws IOException {
+    Preconditions.checkState(context.getFieldSpec().isSingleValueField(),
+        "Json index is currently only supported on single-value columns");
+    Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.STRING,
+        "Json index is currently only supported on STRING columns");
+    return context.isOnHeap()
+        ? new OnHeapJsonIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), indexConfig)
+        : new OffHeapJsonIndexCreator(context.getIndexDir(), context.getFieldSpec().getName(), indexConfig);
+  }
+
+  @Override
+  protected IndexReaderFactory<JsonIndexReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  public static JsonIndexReader read(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
+      throws IndexReaderConstraintException {
+    return ReaderFactory.createIndexReader(dataBuffer, columnMetadata);
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.JSON_INDEX_FILE_EXTENSION;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new JsonIndexHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  private static class ReaderFactory extends IndexReaderFactory.Default<JsonIndexConfig, JsonIndexReader> {
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+
+    @Override
+    protected IndexType<JsonIndexConfig, JsonIndexReader, ?> getIndexType() {
+      return StandardIndexes.json();
+    }
+
+    @Override
+    protected JsonIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+        JsonIndexConfig indexConfig)
+        throws IndexReaderConstraintException {
+      return createIndexReader(dataBuffer, metadata);
+    }
+
+    public static JsonIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
+        throws IndexReaderConstraintException {
+      if (!metadata.getFieldSpec().isSingleValueField()) {
+        throw new IndexReaderConstraintException(metadata.getColumnName(), StandardIndexes.json(),
+            "Json index is currently only supported on single-value columns");
+      }
+      if (metadata.getFieldSpec().getDataType().getStoredType() != FieldSpec.DataType.STRING) {
+        throw new IndexReaderConstraintException(metadata.getColumnName(), StandardIndexes.json(),
+            "Json index is currently only supported on STRING columns");
+      }
+      return new ImmutableJsonIndexReader(dataBuffer, metadata.getTotalDocs());
+    }
+  }
+
+  @Override
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+    tableConfig.getIndexingConfig().setJsonIndexColumns(null);
+    tableConfig.getIndexingConfig().setJsonIndexConfigs(null);
+  }
+
+  @Nullable
+  @Override
+  public MutableIndex createMutableIndex(MutableIndexContext context, JsonIndexConfig config) {
+    if (config.isDisabled()) {
+      return null;
+    }
+    if (!context.getFieldSpec().isSingleValueField()) {
+      return null;
+    }
+    return new MutableJsonIndexImpl(config);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/BaseIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/BaseIndexHandler.java
index f9f0f0d3ea3..8bd4447c90b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/BaseIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/BaseIndexHandler.java
@@ -20,12 +20,19 @@
 
 import com.google.common.base.Preconditions;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,14 +46,31 @@
  */
 public abstract class BaseIndexHandler implements IndexHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseIndexHandler.class);
-
-  protected final IndexLoadingConfig _indexLoadingConfig;
   protected final Set<String> _tmpForwardIndexColumns;
   protected final SegmentDirectory _segmentDirectory;
+  protected final Map<String, FieldIndexConfigs> _fieldIndexConfigs;
+  @Nullable
+  protected final TableConfig _tableConfig;
 
   public BaseIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
+    this(segmentDirectory, indexLoadingConfig.getFieldIndexConfigByColName(), indexLoadingConfig.getTableConfig());
+  }
+
+  public BaseIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
     _segmentDirectory = segmentDirectory;
-    _indexLoadingConfig = indexLoadingConfig;
+    SegmentMetadataImpl segmentMetadata = segmentDirectory.getSegmentMetadata();
+    if (fieldIndexConfigs.keySet().equals(segmentMetadata.getAllColumns())) {
+      _fieldIndexConfigs = fieldIndexConfigs;
+    } else {
+      _fieldIndexConfigs = new HashMap<>(fieldIndexConfigs);
+      for (String column : segmentMetadata.getAllColumns()) {
+        if (!_fieldIndexConfigs.containsKey(column)) {
+          _fieldIndexConfigs.put(column, FieldIndexConfigs.EMPTY);
+        }
+      }
+    }
+    _tableConfig = tableConfig;
     _tmpForwardIndexColumns = new HashSet<>();
   }
 
@@ -57,32 +81,43 @@ public void postUpdateIndicesCleanup(SegmentDirectory.Writer segmentWriter)
     // IndexHandlers have updated their indexes as some of them need to temporarily create a forward index to
     // generate other indexes off of.
     for (String column : _tmpForwardIndexColumns) {
-      segmentWriter.removeIndex(column, ColumnIndexType.FORWARD_INDEX);
+      segmentWriter.removeIndex(column, StandardIndexes.forward());
     }
   }
 
-  protected ColumnMetadata createForwardIndexIfNeeded(SegmentDirectory.Writer segmentWriter,
-      String columnName, IndexCreatorProvider indexCreatorProvider, boolean isTemporaryForwardIndex)
+  protected ColumnMetadata createForwardIndexIfNeeded(SegmentDirectory.Writer segmentWriter, String columnName,
+      boolean isTemporaryForwardIndex)
       throws IOException {
-    if (segmentWriter.hasIndexFor(columnName, ColumnIndexType.FORWARD_INDEX)) {
+    if (segmentWriter.hasIndexFor(columnName, StandardIndexes.forward())) {
       LOGGER.info("Forward index already exists for column: {}, skip trying to create it", columnName);
       return _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(columnName);
     }
 
-    // If forward index is disabled it means that it has to be dictionary based and the inverted index must exist.
-    Preconditions.checkState(segmentWriter.hasIndexFor(columnName, ColumnIndexType.DICTIONARY),
-        String.format("Forward index disabled column %s must have a dictionary", columnName));
-    Preconditions.checkState(segmentWriter.hasIndexFor(columnName, ColumnIndexType.INVERTED_INDEX),
-        String.format("Forward index disabled column %s must have an inverted index", columnName));
+    // If forward index is disabled it means that it has to be dictionary based and the inverted index must exist to
+    // regenerate it. If either are missing the only way to get the forward index back and potentially use it to
+    // generate newly added indexes is to refresh or back-fill the forward index.
+    Preconditions.checkState(segmentWriter.hasIndexFor(columnName, StandardIndexes.dictionary()),
+        String.format("Forward index disabled column %s must have a dictionary to regenerate the forward index. "
+            + "Regeneration of the forward index is required to create new indexes as well. Please refresh or "
+            + "back-fill the forward index", columnName));
+    Preconditions.checkState(segmentWriter.hasIndexFor(columnName, StandardIndexes.inverted()),
+        String.format("Forward index disabled column %s must have an inverted index to regenerate the forward index. "
+            + "Regeneration of the forward index is required to create new indexes as well. Please refresh or "
+            + "back-fill the forward index", columnName));
 
     LOGGER.info("Rebuilding the forward index for column: {}, is temporary: {}", columnName, isTemporaryForwardIndex);
+
+    FieldIndexConfigs fieldIndexConfig = _fieldIndexConfigs.get(columnName);
+    boolean dictionaryEnabled = fieldIndexConfig.getConfig(StandardIndexes.dictionary()).isEnabled();
+    ForwardIndexConfig forwardIndexConfig = fieldIndexConfig.getConfig(StandardIndexes.forward());
+
     InvertedIndexAndDictionaryBasedForwardIndexCreator invertedIndexAndDictionaryBasedForwardIndexCreator =
-        new InvertedIndexAndDictionaryBasedForwardIndexCreator(columnName, _segmentDirectory, _indexLoadingConfig,
-            segmentWriter, indexCreatorProvider, isTemporaryForwardIndex);
+        new InvertedIndexAndDictionaryBasedForwardIndexCreator(columnName, _segmentDirectory, dictionaryEnabled,
+            forwardIndexConfig, segmentWriter, isTemporaryForwardIndex);
     invertedIndexAndDictionaryBasedForwardIndexCreator.regenerateForwardIndex();
 
     // Validate that the forward index is created.
-    if (!segmentWriter.hasIndexFor(columnName, ColumnIndexType.FORWARD_INDEX)) {
+    if (!segmentWriter.hasIndexFor(columnName, StandardIndexes.forward())) {
       throw new IOException(String.format("Forward index was not created for column: %s, is temporary: %s", columnName,
           isTemporaryForwardIndex ? "true" : "false"));
     }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ConfigurableFromIndexLoadingConfig.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ConfigurableFromIndexLoadingConfig.java
new file mode 100644
index 00000000000..2fe78011a4d
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ConfigurableFromIndexLoadingConfig.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pinot.segment.local.segment.index.loader;
+
+import java.util.Map;
+import org.apache.pinot.spi.config.table.IndexConfig;
+
+
+/**
+ * This interface can be optionally implemented by {@link org.apache.pinot.segment.spi.index.IndexType index types} to
+ * indicate that they can extract their configuration from an older {@link IndexLoadingConfig} object.
+ */
+public interface ConfigurableFromIndexLoadingConfig<C extends IndexConfig> {
+
+
+  /**
+   * Returns a map that can be used to get the index config.
+   *
+   * This map is used with higher priority whenever the index configuration needs to be read from an
+   * {@link IndexLoadingConfig}.
+   *
+   * Sometimes {@link IndexLoadingConfig} is not completely configured and
+   * {@link IndexLoadingConfig#getAllKnownColumns()} does not return all columns in the table.
+   * Therefore the returned map may not have an entry for each column in the actual schema.
+   *
+   * @return a map whose keys are the column names and the values are the index configuration for that column.
+   */
+  Map<String, C> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig);
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java
index 83d4d339b7c..ffdb7485d84 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java
@@ -21,9 +21,9 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import java.io.File;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -31,9 +31,7 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentColumnarIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentDictionaryCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
 import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueVarByteRawIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.AbstractColumnStatisticsCollector;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.BigDecimalColumnPreIndexStatsCollector;
@@ -43,21 +41,28 @@
 import org.apache.pinot.segment.local.segment.creator.impl.stats.IntColumnPreIndexStatsCollector;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.LongColumnPreIndexStatsCollector;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.StringColumnPreIndexStatsCollector;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
 import org.apache.pinot.segment.spi.creator.StatsCollectorConfig;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.utils.SegmentMetadataUtils;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.slf4j.Logger;
@@ -87,115 +92,115 @@ public class ForwardIndexHandler extends BaseIndexHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(ForwardIndexHandler.class);
 
   // This should contain a list of all indexes that need to be rewritten if the dictionary is enabled or disabled
-  private static final List<ColumnIndexType> DICTIONARY_BASED_INDEXES_TO_REWRITE =
-      Arrays.asList(ColumnIndexType.RANGE_INDEX, ColumnIndexType.FST_INDEX, ColumnIndexType.INVERTED_INDEX);
+  private static final List<IndexType<?, ?, ?>> DICTIONARY_BASED_INDEXES_TO_REWRITE =
+      Arrays.asList(StandardIndexes.range(), StandardIndexes.fst(), StandardIndexes.inverted());
 
   private final Schema _schema;
 
   protected enum Operation {
-    DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN,
-    DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN,
-    ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN,
-    ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN,
-    ENABLE_DICTIONARY,
+    DISABLE_FORWARD_INDEX,
+    ENABLE_FORWARD_INDEX,
     DISABLE_DICTIONARY,
+    ENABLE_DICTIONARY,
     CHANGE_RAW_INDEX_COMPRESSION_TYPE,
   }
 
+  @VisibleForTesting
   public ForwardIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig, Schema schema) {
     super(segmentDirectory, indexLoadingConfig);
     _schema = schema;
   }
 
+  public ForwardIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      Schema schema, @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _schema = schema;
+  }
+
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader)
       throws Exception {
-    Map<String, Operation> columnOperationMap = computeOperation(segmentReader);
-    return !columnOperationMap.isEmpty();
+    Map<String, List<Operation>> columnOperationsMap = computeOperations(segmentReader);
+    return !columnOperationsMap.isEmpty();
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception {
-    Map<String, Operation> columnOperationMap = computeOperation(segmentWriter);
-    if (columnOperationMap.isEmpty()) {
+    Map<String, List<Operation>> columnOperationsMap = computeOperations(segmentWriter);
+    if (columnOperationsMap.isEmpty()) {
       return;
     }
 
-    for (Map.Entry<String, Operation> entry : columnOperationMap.entrySet()) {
+    for (Map.Entry<String, List<Operation>> entry : columnOperationsMap.entrySet()) {
       String column = entry.getKey();
-      Operation operation = entry.getValue();
-
-      switch (operation) {
-        case DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN: {
-          // Deletion of the forward index will be handled outside the index handler to ensure that other index
-          // handlers that need the forward index to construct their own indexes will have it available.
-          // The existing forward index must be in dictionary format for this to be a no-op.
-          _tmpForwardIndexColumns.add(column);
-          break;
-        }
-        case DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN: {
-          // The forward index has been disabled for a column which has a noDictionary based forward index. A dictionary
-          // and inverted index need to be created before we can delete the forward index. We create a dictionary here,
-          // but let the InvertedIndexHandler handle the creation of the inverted index. We create a temporary
-          // forward index here which is dictionary based and allow the post deletion step handle the actual deletion
-          // of the forward index.
-          createDictBasedForwardIndex(column, segmentWriter, indexCreatorProvider);
-          if (!segmentWriter.hasIndexFor(column, ColumnIndexType.FORWARD_INDEX)) {
-            throw new IOException(String.format("Temporary forward index was not created for column: %s", column));
-          }
-          _tmpForwardIndexColumns.add(column);
-          break;
-        }
-        case ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN: {
-          createForwardIndexIfNeeded(segmentWriter, column, indexCreatorProvider, false);
-          if (!segmentWriter.hasIndexFor(column, ColumnIndexType.DICTIONARY)) {
-            throw new IOException(
-                String.format("Dictionary should still exist after rebuilding forward index for dictionary column: %s",
-                    column));
-          }
-          break;
-        }
-        case ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN: {
-          createForwardIndexIfNeeded(segmentWriter, column, indexCreatorProvider, false);
-          if (segmentWriter.hasIndexFor(column, ColumnIndexType.DICTIONARY)) {
-            throw new IOException(
-                String.format("Dictionary should not exist after rebuilding forward index for raw column: %s", column));
-          }
-          break;
-        }
-        case ENABLE_DICTIONARY: {
-          createDictBasedForwardIndex(column, segmentWriter, indexCreatorProvider);
-          break;
+      List<Operation> operations = entry.getValue();
+
+      for (Operation operation : operations) {
+        switch (operation) {
+          case DISABLE_FORWARD_INDEX:
+            // Deletion of the forward index will be handled outside the index handler to ensure that other index
+            // handlers that need the forward index to construct their own indexes will have it available.
+            _tmpForwardIndexColumns.add(column);
+            break;
+          case ENABLE_FORWARD_INDEX:
+            ColumnMetadata columnMetadata = createForwardIndexIfNeeded(segmentWriter, column, false);
+            if (columnMetadata.hasDictionary()) {
+              if (!segmentWriter.hasIndexFor(column, StandardIndexes.dictionary())) {
+                throw new IllegalStateException(String.format("Dictionary should still exist after rebuilding "
+                    + "forward index for dictionary column: %s", column));
+              }
+            } else {
+              if (segmentWriter.hasIndexFor(column, StandardIndexes.dictionary())) {
+                throw new IllegalStateException(
+                    String.format("Dictionary should not exist after rebuilding forward index for raw column: %s",
+                        column));
+              }
+            }
+            break;
+          case DISABLE_DICTIONARY:
+            Set<String> newForwardIndexDisabledColumns = FieldIndexConfigsUtil.columnsWithIndexDisabled(
+                _fieldIndexConfigs.keySet(), StandardIndexes.forward(), _fieldIndexConfigs);
+            if (newForwardIndexDisabledColumns.contains(column)) {
+              removeDictionaryFromForwardIndexDisabledColumn(column, segmentWriter);
+              if (segmentWriter.hasIndexFor(column, StandardIndexes.dictionary())) {
+                throw new IllegalStateException(
+                    String.format("Dictionary should not exist after disabling dictionary for column: %s", column));
+              }
+            } else {
+              disableDictionaryAndCreateRawForwardIndex(column, segmentWriter);
+            }
+            break;
+          case ENABLE_DICTIONARY:
+            createDictBasedForwardIndex(column, segmentWriter);
+            if (!segmentWriter.hasIndexFor(column, StandardIndexes.forward())) {
+              throw new IllegalStateException(String.format("Forward index was not created for column: %s", column));
+            }
+            break;
+          case CHANGE_RAW_INDEX_COMPRESSION_TYPE:
+            rewriteRawForwardIndexForCompressionChange(column, segmentWriter);
+            break;
+          default:
+            throw new IllegalStateException("Unsupported operation for column " + column);
         }
-        case DISABLE_DICTIONARY: {
-          disableDictionaryAndCreateRawForwardIndex(column, segmentWriter, indexCreatorProvider);
-          break;
-        }
-        case CHANGE_RAW_INDEX_COMPRESSION_TYPE: {
-          rewriteRawForwardIndexForCompressionChange(column, segmentWriter, indexCreatorProvider);
-          break;
-        }
-        default:
-          throw new IllegalStateException("Unsupported operation for column " + column);
       }
     }
   }
 
   @VisibleForTesting
-  Map<String, Operation> computeOperation(SegmentDirectory.Reader segmentReader)
+  Map<String, List<Operation>> computeOperations(SegmentDirectory.Reader segmentReader)
       throws Exception {
-    Map<String, Operation> columnOperationMap = new HashMap<>();
+    Map<String, List<Operation>> columnOperationsMap = new HashMap<>();
 
     // Does not work for segment versions < V3.
     if (_segmentDirectory.getSegmentMetadata().getVersion().compareTo(SegmentVersion.v3) < 0) {
-      return columnOperationMap;
+      return columnOperationsMap;
     }
 
     // From existing column config.
     Set<String> existingAllColumns = _segmentDirectory.getSegmentMetadata().getAllColumns();
     Set<String> existingDictColumns =
-        segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.DICTIONARY);
+        segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.dictionary());
     Set<String> existingNoDictColumns = new HashSet<>();
     for (String column : existingAllColumns) {
       if (!existingDictColumns.contains(column)) {
@@ -205,7 +210,7 @@ Map<String, Operation> computeOperation(SegmentDirectory.Reader segmentReader)
 
     // Get list of columns with forward index and those without forward index
     Set<String> existingForwardIndexColumns =
-        segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.FORWARD_INDEX);
+        segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.forward());
     Set<String> existingForwardIndexDisabledColumns = new HashSet<>();
     for (String column : existingAllColumns) {
       if (!existingForwardIndexColumns.contains(column)) {
@@ -213,17 +218,14 @@ Map<String, Operation> computeOperation(SegmentDirectory.Reader segmentReader)
       }
     }
 
-    // From new column config.
-    Set<String> newNoDictColumns = _indexLoadingConfig.getNoDictionaryColumns();
-    Set<String> newForwardIndexDisabledColumns = _indexLoadingConfig.getForwardIndexDisabledColumns();
-
     for (String column : existingAllColumns) {
-      if (existingForwardIndexColumns.contains(column) && newForwardIndexDisabledColumns.contains(column)) {
+      FieldIndexConfigs newConf = _fieldIndexConfigs.get(column);
+      boolean newIsFwd = newConf.getConfig(StandardIndexes.forward()).isEnabled();
+      boolean newIsDict = newConf.getConfig(StandardIndexes.dictionary()).isEnabled();
+      boolean newIsRange = newConf.getConfig(StandardIndexes.range()).isEnabled();
+
+      if (existingForwardIndexColumns.contains(column) && !newIsFwd) {
         // Existing column has a forward index. New column config disables the forward index
-        Preconditions.checkState(!newNoDictColumns.contains(column),
-            String.format("Must enable dictionary to disable the forward index for column: %s", column));
-        Preconditions.checkState(_indexLoadingConfig.getInvertedIndexColumns().contains(column),
-            String.format("Must enable inverted index to disable the forward index for column: %s", column));
 
         ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
         if (columnMetadata.isSorted()) {
@@ -234,13 +236,31 @@ Map<String, Operation> computeOperation(SegmentDirectory.Reader segmentReader)
         }
 
         if (existingDictColumns.contains(column)) {
-          columnOperationMap.put(column, Operation.DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+          if (!newIsDict) {
+            // Dictionary was also disabled. Just disable the dictionary and remove it along with the forward index
+            // If range index exists, don't try to regenerate it on toggling the dictionary, throw an error instead
+            Preconditions.checkState(!newIsRange,
+                String.format("Must disable range (enabled) index to disable the dictionary and forward index for "
+                        + "column: %s or refresh / back-fill the forward index", column));
+            columnOperationsMap.put(column,
+                Arrays.asList(Operation.DISABLE_FORWARD_INDEX, Operation.DISABLE_DICTIONARY));
+          } else {
+            // Dictionary is still enabled, keep it but remove the forward index
+            columnOperationsMap.put(column, Collections.singletonList(Operation.DISABLE_FORWARD_INDEX));
+          }
         } else {
-          columnOperationMap.put(column, Operation.DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+          if (!newIsDict) {
+            // Dictionary remains disabled and we should not reconstruct temporary forward index as dictionary based
+            columnOperationsMap.put(column, Collections.singletonList(Operation.DISABLE_FORWARD_INDEX));
+          } else {
+            // Dictionary is enabled, creation of dictionary and conversion to dictionary based forward index is needed
+            columnOperationsMap.put(column,
+                Arrays.asList(Operation.DISABLE_FORWARD_INDEX, Operation.ENABLE_DICTIONARY));
+          }
         }
-      } else if (existingForwardIndexDisabledColumns.contains(column)
-          && !newForwardIndexDisabledColumns.contains(column)) {
+      } else if (existingForwardIndexDisabledColumns.contains(column) && newIsFwd) {
         // Existing column does not have a forward index. New column config enables the forward index
+
         ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
         if (columnMetadata != null && columnMetadata.isSorted()) {
           // Check if the column is sorted. If sorted, disabling forward index should be a no-op and forward index
@@ -249,50 +269,90 @@ Map<String, Operation> computeOperation(SegmentDirectory.Reader segmentReader)
           continue;
         }
 
-        if (newNoDictColumns.contains(column)) {
-          Preconditions.checkState(!_indexLoadingConfig.getInvertedIndexColumns().contains(column),
-              String.format("Must disable inverted index to enable the forward index as noDictionary for column: %s",
-                  column));
-          columnOperationMap.put(column, Operation.ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
-        } else {
-          columnOperationMap.put(column, Operation.ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        // Get list of columns with inverted index
+        Set<String> existingInvertedIndexColumns =
+            segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.inverted());
+        if (!existingDictColumns.contains(column) || !existingInvertedIndexColumns.contains(column)) {
+          // If either dictionary or inverted index is missing on the column there is no way to re-generate the forward
+          // index. Treat this as a no-op and log a warning.
+          LOGGER.warn("Trying to enable the forward index for a column {} missing either the dictionary ({}) and / or "
+                  + "the inverted index ({}) is not possible. Either a refresh or back-fill is required to get the "
+                  + "forward index, ignoring", column, existingDictColumns.contains(column) ? "enabled" : "disabled",
+              existingInvertedIndexColumns.contains(column) ? "enabled" : "disabled");
+          continue;
         }
-      } else if (existingForwardIndexDisabledColumns.contains(column)
-          && newForwardIndexDisabledColumns.contains(column)) {
+
+        columnOperationsMap.put(column, Collections.singletonList(Operation.ENABLE_FORWARD_INDEX));
+      } else if (existingForwardIndexDisabledColumns.contains(column) && !newIsFwd) {
         // Forward index is disabled for the existing column and should remain disabled based on the latest config
-        Preconditions.checkState(existingDictColumns.contains(column) && !newNoDictColumns.contains(column),
-            String.format("Not allowed to disable the dictionary for a column: %s without forward index", column));
-      } else if (existingNoDictColumns.contains(column) && !newNoDictColumns.contains(column)) {
+        // Need some checks to see whether the dictionary is being enabled or disabled here and take appropriate actions
+
+        // If the dictionary is not enabled on the existing column it must be on the new noDictionary column list.
+        // Cannot enable the dictionary for a column with forward index disabled.
+        Preconditions.checkState(existingDictColumns.contains(column) || !newIsDict,
+            String.format("Cannot regenerate the dictionary for column %s with forward index disabled. Please "
+                + "refresh or back-fill the data to add back the forward index", column));
+
+        if (existingDictColumns.contains(column) && !newIsDict) {
+          // Dictionary is currently enabled on this column but is supposed to be disabled. Remove the dictionary
+          // and update the segment metadata If the range index exists then throw an error since we are not
+          // regenerating the range index on toggling the dictionary
+          Preconditions.checkState(!newIsRange,
+              String.format("Must disable range (enabled) index to disable the dictionary for a forwardIndexDisabled "
+                      + "column: %s or refresh / back-fill the forward index", column));
+          columnOperationsMap.put(column, Collections.singletonList(Operation.DISABLE_DICTIONARY));
+        }
+      } else if (existingNoDictColumns.contains(column) && newIsDict) {
         // Existing column is RAW. New column is dictionary enabled.
-        if (_schema == null || _indexLoadingConfig.getTableConfig() == null) {
+        if (_schema == null || _tableConfig == null) {
           // This can only happen in tests.
           LOGGER.warn("Cannot enable dictionary for column={} as schema or tableConfig is null.", column);
           continue;
         }
-
-        // Note that RAW columns cannot be sorted.
-        ColumnMetadata existingColMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
-        Preconditions.checkState(!existingColMetadata.isSorted(), "Raw column=" + column + " cannot be sorted.");
-
-        columnOperationMap.put(column, Operation.ENABLE_DICTIONARY);
-      } else if (existingDictColumns.contains(column) && newNoDictColumns.contains(column)) {
+        ColumnMetadata existingColumnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
+        if (DictionaryIndexType.ignoreDictionaryOverride(
+            _tableConfig.getIndexingConfig().isOptimizeDictionary(),
+            _tableConfig.getIndexingConfig().isOptimizeDictionaryForMetrics(),
+            _tableConfig.getIndexingConfig().getNoDictionarySizeRatioThreshold(),
+            existingColumnMetadata.getFieldSpec(), _fieldIndexConfigs.get(column),
+            existingColumnMetadata.getCardinality(),
+            existingColumnMetadata.getTotalNumberOfEntries())) {
+          columnOperationsMap.put(column, Collections.singletonList(Operation.ENABLE_DICTIONARY));
+        }
+      } else if (existingDictColumns.contains(column) && !newIsDict) {
         // Existing column has dictionary. New config for the column is RAW.
         if (shouldDisableDictionary(column, _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column))) {
-          columnOperationMap.put(column, Operation.DISABLE_DICTIONARY);
+          columnOperationsMap.put(column, Collections.singletonList(Operation.DISABLE_DICTIONARY));
         }
-      } else if (existingNoDictColumns.contains(column) && newNoDictColumns.contains(column)) {
+      } else if (existingNoDictColumns.contains(column) && !newIsDict) {
         // Both existing and new column is RAW forward index encoded. Check if compression needs to be changed.
         if (shouldChangeCompressionType(column, segmentReader)) {
-          columnOperationMap.put(column, Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE);
+          columnOperationsMap.put(column, Collections.singletonList(Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE));
         }
       }
     }
 
-    return columnOperationMap;
+    return columnOperationsMap;
+  }
+
+  private void removeDictionaryFromForwardIndexDisabledColumn(String column, SegmentDirectory.Writer segmentWriter)
+      throws Exception {
+    // Remove the dictionary and update the metadata to indicate that the dictionary is no longer present
+    segmentWriter.removeIndex(column, StandardIndexes.dictionary());
+    String segmentName = _segmentDirectory.getSegmentMetadata().getName();
+    LOGGER.info("Removed dictionary for noForwardIndex column. Updating metadata properties for segment={} and "
+            + "column={}", segmentName, column);
+    Map<String, String> metadataProperties = new HashMap<>();
+    metadataProperties.put(getKeyFor(column, HAS_DICTIONARY), String.valueOf(false));
+    metadataProperties.put(getKeyFor(column, DICTIONARY_ELEMENT_SIZE), String.valueOf(0));
+    SegmentMetadataUtils.updateMetadataProperties(_segmentDirectory, metadataProperties);
+
+    // Remove the inverted index, FST index and range index
+    removeDictRelatedIndexes(column, segmentWriter);
   }
 
   private boolean shouldDisableDictionary(String column, ColumnMetadata existingColumnMetadata) {
-    if (_schema == null || _indexLoadingConfig.getTableConfig() == null) {
+    if (_schema == null || _tableConfig == null) {
       // This can only happen in tests.
       LOGGER.warn("Cannot disable dictionary for column={} as schema or tableConfig is null.", column);
       return false;
@@ -307,8 +367,7 @@ private boolean shouldDisableDictionary(String column, ColumnMetadata existingCo
     // Allow disabling dictionary only if the new config specifies that inverted index and FST index should not
     // be present. So for existing segments where inverted index and FST index are already present, disabling
     // dictionary will only be allowed if FST and inverted index are also disabled.
-    if (_indexLoadingConfig.getInvertedIndexColumns().contains(column) || _indexLoadingConfig.getFSTIndexColumns()
-        .contains(column)) {
+    if (hasIndex(column, StandardIndexes.inverted()) || hasIndex(column, StandardIndexes.fst())) {
       LOGGER.warn("Cannot disable dictionary as column={} has FST index or inverted index or both.", column);
       return false;
     }
@@ -321,17 +380,14 @@ private boolean shouldChangeCompressionType(String column, SegmentDirectory.Read
     ColumnMetadata existingColMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
 
     // The compression type for an existing segment can only be determined by reading the forward index header.
-    try (ForwardIndexReader fwdIndexReader = LoaderUtils.getForwardIndexReader(segmentReader, existingColMetadata)) {
+    try (ForwardIndexReader<?> fwdIndexReader = ForwardIndexType.read(segmentReader, existingColMetadata)) {
       ChunkCompressionType existingCompressionType = fwdIndexReader.getCompressionType();
       Preconditions.checkState(existingCompressionType != null,
           "Existing compressionType cannot be null for raw forward index column=" + column);
 
       // Get the new compression type.
-      ChunkCompressionType newCompressionType = null;
-      Map<String, ChunkCompressionType> newCompressionConfigs = _indexLoadingConfig.getCompressionConfigs();
-      if (newCompressionConfigs.containsKey(column)) {
-        newCompressionType = newCompressionConfigs.get(column);
-      }
+      ChunkCompressionType newCompressionType = _fieldIndexConfigs.get(column).getConfig(StandardIndexes.forward())
+          .getChunkCompressionType();
 
       // Note that default compression type (PASS_THROUGH for metric and LZ4 for dimension) is not considered if the
       // compressionType is not explicitly provided in tableConfig. This is to avoid incorrectly rewriting all the
@@ -340,8 +396,7 @@ private boolean shouldChangeCompressionType(String column, SegmentDirectory.Read
     }
   }
 
-  private void rewriteRawForwardIndexForCompressionChange(String column, SegmentDirectory.Writer segmentWriter,
-      IndexCreatorProvider indexCreatorProvider)
+  private void rewriteRawForwardIndexForCompressionChange(String column, SegmentDirectory.Writer segmentWriter)
       throws Exception {
     ColumnMetadata existingColMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
     boolean isSingleValue = existingColMetadata.isSingleValue();
@@ -365,19 +420,18 @@ private void rewriteRawForwardIndexForCompressionChange(String column, SegmentDi
 
     LOGGER.info("Creating new forward index for segment={} and column={}", segmentName, column);
 
-    Map<String, ChunkCompressionType> compressionConfigs = _indexLoadingConfig.getCompressionConfigs();
-    Preconditions.checkState(compressionConfigs.containsKey(column));
     // At this point, compressionConfigs is guaranteed to contain the column. If there's no entry in the map, we
     // wouldn't have computed the CHANGE_RAW_COMPRESSION_TYPE operation for this column as compressionType changes
     // are processed only if a valid compressionType is specified in fieldConfig.
-    ChunkCompressionType newCompressionType = compressionConfigs.get(column);
+    ChunkCompressionType newCompressionType = _fieldIndexConfigs.get(column)
+        .getConfig(StandardIndexes.forward()).getChunkCompressionType();
 
     if (isSingleValue) {
       rewriteRawSVForwardIndexForCompressionChange(column, existingColMetadata, indexDir, segmentWriter,
-          indexCreatorProvider, newCompressionType);
+          newCompressionType);
     } else {
       rewriteRawMVForwardIndexForCompressionChange(column, existingColMetadata, indexDir, segmentWriter,
-          indexCreatorProvider, newCompressionType);
+          newCompressionType);
     }
 
     // We used the existing forward index to generate a new forward index. The existing forward index will be in V3
@@ -385,8 +439,8 @@ private void rewriteRawForwardIndexForCompressionChange(String column, SegmentDi
     // anymore. Note that removeIndex() will only mark an index for removal and remove the in-memory state. The
     // actual cleanup from columns.psf file will happen when singleFileIndexDirectory.cleanupRemovedIndices() is
     // called during segmentWriter.close().
-    segmentWriter.removeIndex(column, ColumnIndexType.FORWARD_INDEX);
-    LoaderUtils.writeIndexToV3Format(segmentWriter, column, fwdIndexFile, ColumnIndexType.FORWARD_INDEX);
+    segmentWriter.removeIndex(column, StandardIndexes.forward());
+    LoaderUtils.writeIndexToV3Format(segmentWriter, column, fwdIndexFile, StandardIndexes.forward());
 
     // Delete the marker file.
     FileUtils.deleteQuietly(inProgress);
@@ -395,10 +449,9 @@ private void rewriteRawForwardIndexForCompressionChange(String column, SegmentDi
   }
 
   private void rewriteRawMVForwardIndexForCompressionChange(String column, ColumnMetadata existingColMetadata,
-      File indexDir, SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider,
-      ChunkCompressionType newCompressionType)
+      File indexDir, SegmentDirectory.Writer segmentWriter, ChunkCompressionType newCompressionType)
       throws Exception {
-    try (ForwardIndexReader reader = LoaderUtils.getForwardIndexReader(segmentWriter, existingColMetadata)) {
+    try (ForwardIndexReader<?> reader = ForwardIndexType.read(segmentWriter, existingColMetadata)) {
       // For VarByte MV columns like String and Bytes, the storage representation of each row contains the following
       // components:
       // 1. bytes required to store the actual elements of the MV row (A)
@@ -412,12 +465,16 @@ private void rewriteRawMVForwardIndexForCompressionChange(String column, ColumnM
       int maxRowLengthInBytes =
           MultiValueVarByteRawIndexCreator.getMaxRowDataLengthInBytes(lengthOfLongestEntry, maxNumberOfMVEntries);
 
-      IndexCreationContext.Forward context =
-          IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(existingColMetadata)
-              .withLengthOfLongestEntry(lengthOfLongestEntry).withMaxRowLengthInBytes(maxRowLengthInBytes).build()
-              .forForwardIndex(newCompressionType, _indexLoadingConfig.getColumnProperties());
+      IndexCreationContext context = IndexCreationContext.builder()
+          .withMaxRowLengthInBytes(maxRowLengthInBytes)
+          .withIndexDir(indexDir)
+          .withColumnMetadata(existingColMetadata)
+          .withLengthOfLongestEntry(lengthOfLongestEntry)
+          .build();
+
+      ForwardIndexConfig config = _fieldIndexConfigs.get(column).getConfig(StandardIndexes.forward());
 
-      try (ForwardIndexCreator creator = indexCreatorProvider.newForwardIndexCreator(context)) {
+      try (ForwardIndexCreator creator = StandardIndexes.forward().createIndexCreator(context, config)) {
         if (!reader.getStoredType().equals(creator.getValueType())) {
           // Creator stored type should match reader stored type for raw columns. We do not support changing datatypes.
           String failureMsg =
@@ -433,18 +490,20 @@ private void rewriteRawMVForwardIndexForCompressionChange(String column, ColumnM
   }
 
   private void rewriteRawSVForwardIndexForCompressionChange(String column, ColumnMetadata existingColMetadata,
-      File indexDir, SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider,
-      ChunkCompressionType newCompressionType)
+      File indexDir, SegmentDirectory.Writer segmentWriter, ChunkCompressionType newCompressionType)
       throws Exception {
-    try (ForwardIndexReader reader = LoaderUtils.getForwardIndexReader(segmentWriter, existingColMetadata)) {
+    try (ForwardIndexReader<?> reader = ForwardIndexType.read(segmentWriter, existingColMetadata)) {
       int lengthOfLongestEntry = reader.getLengthOfLongestEntry();
 
-      IndexCreationContext.Forward context =
-          IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(existingColMetadata)
-              .withLengthOfLongestEntry(lengthOfLongestEntry).build()
-              .forForwardIndex(newCompressionType, _indexLoadingConfig.getColumnProperties());
+      IndexCreationContext context = IndexCreationContext.builder()
+          .withIndexDir(indexDir)
+          .withColumnMetadata(existingColMetadata)
+          .withLengthOfLongestEntry(lengthOfLongestEntry)
+          .build();
+
+      ForwardIndexConfig config = _fieldIndexConfigs.get(column).getConfig(StandardIndexes.forward());
 
-      try (ForwardIndexCreator creator = indexCreatorProvider.newForwardIndexCreator(context)) {
+      try (ForwardIndexCreator creator = StandardIndexes.forward().createIndexCreator(context, config)) {
         if (!reader.getStoredType().equals(creator.getValueType())) {
           // Creator stored type should match reader stored type for raw columns. We do not support changing datatypes.
           String failureMsg =
@@ -460,7 +519,7 @@ private void rewriteRawSVForwardIndexForCompressionChange(String column, ColumnM
   }
 
   private void forwardIndexRewriteHelper(String column, ColumnMetadata existingColumnMetadata,
-      ForwardIndexReader reader, ForwardIndexCreator creator, int numDocs,
+      ForwardIndexReader<?> reader, ForwardIndexCreator creator, int numDocs,
       @Nullable SegmentDictionaryCreator dictionaryCreator, @Nullable Dictionary dictionaryReader) {
     if (dictionaryReader == null && dictionaryCreator == null) {
       // Read raw forward index and write raw forward index.
@@ -468,7 +527,7 @@ private void forwardIndexRewriteHelper(String column, ColumnMetadata existingCol
     } else if (dictionaryReader != null && dictionaryCreator == null) {
       // Read dictionary based forward index and write raw forward index.
       forwardIndexReadDictWriteRawHelper(column, existingColumnMetadata, reader, creator, numDocs, dictionaryReader);
-    } else if (dictionaryReader == null && dictionaryCreator != null) {
+    } else if (dictionaryReader == null) {
       // Read raw forward index and write dictionary based forward index.
       forwardIndexReadRawWriteDictHelper(column, existingColumnMetadata, reader, creator, numDocs, dictionaryCreator);
     } else {
@@ -476,9 +535,9 @@ private void forwardIndexRewriteHelper(String column, ColumnMetadata existingCol
     }
   }
 
-  private void forwardIndexReadRawWriteRawHelper(String column, ColumnMetadata existingColumnMetadata,
-      ForwardIndexReader reader, ForwardIndexCreator creator, int numDocs) {
-    ForwardIndexReaderContext readerContext = reader.createContext();
+  private <C extends ForwardIndexReaderContext> void forwardIndexReadRawWriteRawHelper(String column,
+      ColumnMetadata existingColumnMetadata, ForwardIndexReader<C> reader, ForwardIndexCreator creator, int numDocs) {
+    C readerContext = reader.createContext();
     boolean isSVColumn = reader.isSingleValue();
 
     switch (reader.getStoredType()) {
@@ -569,9 +628,10 @@ private void forwardIndexReadRawWriteRawHelper(String column, ColumnMetadata exi
     }
   }
 
-  private void forwardIndexReadDictWriteRawHelper(String column, ColumnMetadata existingColumnMetadata,
-      ForwardIndexReader reader, ForwardIndexCreator creator, int numDocs, Dictionary dictionaryReader) {
-    ForwardIndexReaderContext readerContext = reader.createContext();
+  private <C extends ForwardIndexReaderContext> void forwardIndexReadDictWriteRawHelper(String column,
+      ColumnMetadata existingColumnMetadata, ForwardIndexReader<C> reader, ForwardIndexCreator creator, int numDocs,
+      Dictionary dictionaryReader) {
+    C readerContext = reader.createContext();
     boolean isSVColumn = reader.isSingleValue();
     FieldSpec.DataType storedType = dictionaryReader.getValueType().getStoredType();
 
@@ -681,7 +741,8 @@ private void forwardIndexReadDictWriteRawHelper(String column, ColumnMetadata ex
   }
 
   private void forwardIndexReadRawWriteDictHelper(String column, ColumnMetadata existingColumnMetadata,
-      ForwardIndexReader reader, ForwardIndexCreator creator, int numDocs, SegmentDictionaryCreator dictionaryCreator) {
+      ForwardIndexReader<?> reader, ForwardIndexCreator creator, int numDocs,
+      SegmentDictionaryCreator dictionaryCreator) {
     boolean isSVColumn = reader.isSingleValue();
     int maxNumValuesPerEntry = existingColumnMetadata.getMaxNumberOfMultiValues();
     PinotSegmentColumnReader columnReader = new PinotSegmentColumnReader(reader, null, null, maxNumValuesPerEntry);
@@ -699,8 +760,7 @@ private void forwardIndexReadRawWriteDictHelper(String column, ColumnMetadata ex
     }
   }
 
-  private void createDictBasedForwardIndex(String column, SegmentDirectory.Writer segmentWriter,
-      IndexCreatorProvider indexCreatorProvider)
+  private void createDictBasedForwardIndex(String column, SegmentDirectory.Writer segmentWriter)
       throws Exception {
     ColumnMetadata existingColMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
     boolean isSingleValue = existingColMetadata.isSingleValue();
@@ -711,8 +771,11 @@ private void createDictBasedForwardIndex(String column, SegmentDirectory.Writer
     File dictionaryFile = new File(indexDir, column + V1Constants.Dict.FILE_EXTENSION);
     String fwdIndexFileExtension;
     if (isSingleValue) {
-      // Raw columns cannot be sorted.
-      fwdIndexFileExtension = V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+      if (existingColMetadata.isSorted()) {
+        fwdIndexFileExtension = V1Constants.Indexes.SORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+      } else {
+        fwdIndexFileExtension = V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+      }
     } else {
       fwdIndexFileExtension = V1Constants.Indexes.UNSORTED_MV_FORWARD_INDEX_FILE_EXTENSION;
     }
@@ -734,19 +797,18 @@ private void createDictBasedForwardIndex(String column, SegmentDirectory.Writer
         getStatsCollector(column, existingColMetadata.getDataType().getStoredType());
     SegmentDictionaryCreator dictionaryCreator =
         buildDictionary(column, existingColMetadata, segmentWriter, statsCollector);
-    LoaderUtils.writeIndexToV3Format(segmentWriter, column, dictionaryFile, ColumnIndexType.DICTIONARY);
+    LoaderUtils.writeIndexToV3Format(segmentWriter, column, dictionaryFile, StandardIndexes.dictionary());
 
     LOGGER.info("Built dictionary. Rewriting dictionary enabled forward index for segment={} and column={}",
         segmentName, column);
-    writeDictEnabledForwardIndex(column, existingColMetadata, segmentWriter, indexDir, indexCreatorProvider,
-        dictionaryCreator);
+    writeDictEnabledForwardIndex(column, existingColMetadata, segmentWriter, indexDir, dictionaryCreator);
     // We used the existing forward index to generate a new forward index. The existing forward index will be in V3
     // format and the new forward index will be in V1 format. Remove the existing forward index as it is not needed
     // anymore. Note that removeIndex() will only mark an index for removal and remove the in-memory state. The
     // actual cleanup from columns.psf file will happen when singleFileIndexDirectory.cleanupRemovedIndices() is
     // called during segmentWriter.close().
-    segmentWriter.removeIndex(column, ColumnIndexType.FORWARD_INDEX);
-    LoaderUtils.writeIndexToV3Format(segmentWriter, column, fwdIndexFile, ColumnIndexType.FORWARD_INDEX);
+    segmentWriter.removeIndex(column, StandardIndexes.forward());
+    LoaderUtils.writeIndexToV3Format(segmentWriter, column, fwdIndexFile, StandardIndexes.forward());
 
     LOGGER.info("Created forwardIndex. Updating metadata properties for segment={} and column={}", segmentName, column);
     Map<String, String> metadataProperties = new HashMap<>();
@@ -774,7 +836,7 @@ private SegmentDictionaryCreator buildDictionary(String column, ColumnMetadata e
       throws Exception {
     int numDocs = existingColMetadata.getTotalDocs();
 
-    try (ForwardIndexReader reader = LoaderUtils.getForwardIndexReader(segmentWriter, existingColMetadata)) {
+    try (ForwardIndexReader<?> reader = ForwardIndexType.read(segmentWriter, existingColMetadata)) {
       // Note: Special Null handling is not necessary here. This is because, the existing default null value in the
       // raw forwardIndex will be retained as such while created the dictionary and dict-based forward index. Also,
       // null value vectors maintain a bitmap of docIds. No handling is necessary there.
@@ -786,8 +848,10 @@ private SegmentDictionaryCreator buildDictionary(String column, ColumnMetadata e
       }
       statsCollector.seal();
 
-      boolean useVarLength = SegmentIndexCreationDriverImpl.shouldUseVarLengthDictionary(column,
-          _indexLoadingConfig.getVarLengthDictionaryColumns(), reader.getStoredType(), statsCollector);
+      DictionaryIndexConfig dictConf = _fieldIndexConfigs.get(column).getConfig(StandardIndexes.dictionary());
+
+      boolean useVarLength = dictConf.getUseVarLengthDictionary()
+          || DictionaryIndexType.shouldUseVarLengthDictionary(reader.getStoredType(), statsCollector);
       SegmentDictionaryCreator dictionaryCreator =
           new SegmentDictionaryCreator(existingColMetadata.getFieldSpec(),
               _segmentDirectory.getSegmentMetadata().getIndexDir(), useVarLength);
@@ -798,20 +862,19 @@ private SegmentDictionaryCreator buildDictionary(String column, ColumnMetadata e
   }
 
   private void writeDictEnabledForwardIndex(String column, ColumnMetadata existingColMetadata,
-      SegmentDirectory.Writer segmentWriter, File indexDir, IndexCreatorProvider indexCreatorProvider,
-      SegmentDictionaryCreator dictionaryCreator)
+      SegmentDirectory.Writer segmentWriter, File indexDir, SegmentDictionaryCreator dictionaryCreator)
       throws Exception {
-    try (ForwardIndexReader reader = LoaderUtils.getForwardIndexReader(segmentWriter, existingColMetadata)) {
+    try (ForwardIndexReader<?> reader = ForwardIndexType.read(segmentWriter, existingColMetadata)) {
       int lengthOfLongestEntry = reader.getLengthOfLongestEntry();
       IndexCreationContext.Builder builder =
           IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(existingColMetadata)
               .withLengthOfLongestEntry(lengthOfLongestEntry);
       // existingColMetadata has dictEnable=false. Overwrite the value.
       builder.withDictionary(true);
-      IndexCreationContext.Forward context =
-          builder.build().forForwardIndex(null, _indexLoadingConfig.getColumnProperties());
+      IndexCreationContext context = builder.build();
+      ForwardIndexConfig config = _fieldIndexConfigs.get(column).getConfig(StandardIndexes.forward());
 
-      try (ForwardIndexCreator creator = indexCreatorProvider.newForwardIndexCreator(context)) {
+      try (ForwardIndexCreator creator = StandardIndexes.forward().createIndexCreator(context, config)) {
         int numDocs = existingColMetadata.getTotalDocs();
         forwardIndexRewriteHelper(column, existingColMetadata, reader, creator, numDocs, dictionaryCreator, null);
       }
@@ -826,8 +889,7 @@ static void removeDictRelatedIndexes(String column, SegmentDirectory.Writer segm
     DICTIONARY_BASED_INDEXES_TO_REWRITE.forEach((index) -> segmentWriter.removeIndex(column, index));
   }
 
-  private void disableDictionaryAndCreateRawForwardIndex(String column, SegmentDirectory.Writer segmentWriter,
-      IndexCreatorProvider indexCreatorProvider)
+  private void disableDictionaryAndCreateRawForwardIndex(String column, SegmentDirectory.Writer segmentWriter)
       throws Exception {
     ColumnMetadata existingColMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
     boolean isSingleValue = existingColMetadata.isSingleValue();
@@ -850,12 +912,12 @@ private void disableDictionaryAndCreateRawForwardIndex(String column, SegmentDir
     }
 
     LOGGER.info("Creating raw forward index for segment={} and column={}", segmentName, column);
-    rewriteDictToRawForwardIndex(column, existingColMetadata, segmentWriter, indexDir, indexCreatorProvider);
+    rewriteDictToRawForwardIndex(column, existingColMetadata, segmentWriter, indexDir);
 
     // Remove dictionary and forward index
-    segmentWriter.removeIndex(column, ColumnIndexType.FORWARD_INDEX);
-    segmentWriter.removeIndex(column, ColumnIndexType.DICTIONARY);
-    LoaderUtils.writeIndexToV3Format(segmentWriter, column, fwdIndexFile, ColumnIndexType.FORWARD_INDEX);
+    segmentWriter.removeIndex(column, StandardIndexes.forward());
+    segmentWriter.removeIndex(column, StandardIndexes.dictionary());
+    LoaderUtils.writeIndexToV3Format(segmentWriter, column, fwdIndexFile, StandardIndexes.forward());
 
     LOGGER.info("Created raw forwardIndex. Updating metadata properties for segment={} and column={}", segmentName,
         column);
@@ -874,10 +936,10 @@ private void disableDictionaryAndCreateRawForwardIndex(String column, SegmentDir
   }
 
   private void rewriteDictToRawForwardIndex(String column, ColumnMetadata existingColMetadata,
-      SegmentDirectory.Writer segmentWriter, File indexDir, IndexCreatorProvider indexCreatorProvider)
+      SegmentDirectory.Writer segmentWriter, File indexDir)
       throws Exception {
-    try (ForwardIndexReader reader = LoaderUtils.getForwardIndexReader(segmentWriter, existingColMetadata)) {
-      Dictionary dictionary = LoaderUtils.getDictionary(segmentWriter, existingColMetadata);
+    try (ForwardIndexReader<?> reader = ForwardIndexType.read(segmentWriter, existingColMetadata)) {
+      Dictionary dictionary = DictionaryIndexType.read(segmentWriter, existingColMetadata);
       IndexCreationContext.Builder builder =
           IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(existingColMetadata);
       builder.withDictionary(false);
@@ -898,24 +960,17 @@ private void rewriteDictToRawForwardIndex(String column, ColumnMetadata existing
         }
       }
 
-      Map<String, ChunkCompressionType> compressionConfigs = _indexLoadingConfig.getCompressionConfigs();
-      ChunkCompressionType compressionType;
-      if (compressionConfigs.containsKey(column)) {
-        compressionType = compressionConfigs.get(column);
-      } else {
-        compressionType = SegmentColumnarIndexCreator.getDefaultCompressionType(existingColMetadata.getFieldType());
-      }
+      IndexCreationContext context = builder.build();
+      ForwardIndexConfig config = _fieldIndexConfigs.get(column).getConfig(StandardIndexes.forward());
 
-      IndexCreationContext.Forward context =
-          builder.build().forForwardIndex(compressionType, _indexLoadingConfig.getColumnProperties());
-      try (ForwardIndexCreator creator = indexCreatorProvider.newForwardIndexCreator(context)) {
+      try (ForwardIndexCreator creator = StandardIndexes.forward().createIndexCreator(context, config)) {
         int numDocs = existingColMetadata.getTotalDocs();
         forwardIndexRewriteHelper(column, existingColMetadata, reader, creator, numDocs, null, dictionary);
       }
     }
   }
 
-  private int getMaxRowLengthForMVColumn(String column, ForwardIndexReader reader, Dictionary dictionary)
+  private int getMaxRowLengthForMVColumn(String column, ForwardIndexReader<?> reader, Dictionary dictionary)
       throws Exception {
     ColumnMetadata existingColMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
     AbstractColumnStatisticsCollector statsCollector =
@@ -939,8 +994,7 @@ private int getMaxRowLengthForMVColumn(String column, ForwardIndexReader reader,
 
   private AbstractColumnStatisticsCollector getStatsCollector(String column, FieldSpec.DataType storedType)
       throws Exception {
-    StatsCollectorConfig statsCollectorConfig =
-        new StatsCollectorConfig(_indexLoadingConfig.getTableConfig(), _schema, null);
+    StatsCollectorConfig statsCollectorConfig = new StatsCollectorConfig(_tableConfig, _schema, null);
     AbstractColumnStatisticsCollector statsCollector;
 
     // TODO(Vivek): Check if checking stored type will be problematic if column has dictionary. ie will dictionary
@@ -973,4 +1027,8 @@ private AbstractColumnStatisticsCollector getStatsCollector(String column, Field
 
     return statsCollector;
   }
+
+  private boolean hasIndex(String column, IndexType<?, ?, ?> indexType) {
+    return _fieldIndexConfigs.get(column).getConfig(indexType).isEnabled();
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexHandlerFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexHandlerFactory.java
deleted file mode 100644
index 0f64475bd8d..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexHandlerFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.segment.index.loader;
-
-import org.apache.pinot.segment.local.segment.index.loader.bloomfilter.BloomFilterHandler;
-import org.apache.pinot.segment.local.segment.index.loader.invertedindex.FSTIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.invertedindex.H3IndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.invertedindex.InvertedIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.invertedindex.JsonIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.invertedindex.RangeIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.invertedindex.TextIndexHandler;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
-import org.apache.pinot.segment.spi.store.SegmentDirectory;
-import org.apache.pinot.spi.data.Schema;
-
-
-public class IndexHandlerFactory {
-  private IndexHandlerFactory() {
-  }
-
-  private static final IndexHandler NO_OP_HANDLER = new IndexHandler() {
-    @Override
-    public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider) {
-    }
-
-    @Override
-    public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
-      return false;
-    }
-
-    @Override
-    public void postUpdateIndicesCleanup(SegmentDirectory.Writer segmentWriter) {
-    }
-  };
-
-  public static IndexHandler getIndexHandler(ColumnIndexType type, SegmentDirectory segmentDirectory,
-      IndexLoadingConfig indexLoadingConfig, Schema schema) {
-    switch (type) {
-      case INVERTED_INDEX:
-        return new InvertedIndexHandler(segmentDirectory, indexLoadingConfig);
-      case RANGE_INDEX:
-        return new RangeIndexHandler(segmentDirectory, indexLoadingConfig);
-      case TEXT_INDEX:
-        return new TextIndexHandler(segmentDirectory, indexLoadingConfig);
-      case FST_INDEX:
-        return new FSTIndexHandler(segmentDirectory, indexLoadingConfig);
-      case JSON_INDEX:
-        return new JsonIndexHandler(segmentDirectory, indexLoadingConfig);
-      case H3_INDEX:
-        return new H3IndexHandler(segmentDirectory, indexLoadingConfig);
-      case BLOOM_FILTER:
-        return new BloomFilterHandler(segmentDirectory, indexLoadingConfig);
-      case FORWARD_INDEX:
-        return new ForwardIndexHandler(segmentDirectory, indexLoadingConfig, schema);
-      default:
-        return NO_OP_HANDLER;
-    }
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfig.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfig.java
index c4ccc3e7a74..66c0e3b6c4b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfig.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfig.java
@@ -20,34 +20,49 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.utils.config.TableConfigUtils;
 import org.apache.pinot.segment.local.segment.index.column.PhysicalColumnIndexContainer;
 import org.apache.pinot.segment.local.segment.index.loader.columnminmaxvalue.ColumnMinMaxValueGeneratorMode;
-import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
 import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
 import org.apache.pinot.spi.config.instance.InstanceDataManagerConfig;
 import org.apache.pinot.spi.config.table.BloomFilterConfig;
 import org.apache.pinot.spi.config.table.FSTType;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.JsonIndexConfig;
 import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.spi.utils.TimestampIndexUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -56,13 +71,14 @@
 public class IndexLoadingConfig {
   private static final int DEFAULT_REALTIME_AVG_MULTI_VALUE_COUNT = 2;
   public static final String READ_MODE_KEY = "readMode";
+  private static final Logger LOGGER = LoggerFactory.getLogger(IndexLoadingConfig.class);
 
   private InstanceDataManagerConfig _instanceDataManagerConfig = null;
   private ReadMode _readMode = ReadMode.DEFAULT_MODE;
   private List<String> _sortedColumns = Collections.emptyList();
   private Set<String> _invertedIndexColumns = new HashSet<>();
   private Set<String> _rangeIndexColumns = new HashSet<>();
-  private int _rangeIndexVersion = IndexingConfig.DEFAULT_RANGE_INDEX_VERSION;
+  private int _rangeIndexVersion = RangeIndexConfig.DEFAULT.getVersion();
   private Set<String> _textIndexColumns = new HashSet<>();
   private Set<String> _fstIndexColumns = new HashSet<>();
   private FSTType _fstIndexType = FSTType.LUCENE;
@@ -78,6 +94,7 @@ public class IndexLoadingConfig {
   private List<StarTreeIndexConfig> _starTreeIndexConfigs;
   private boolean _enableDefaultStarTree;
   private Map<String, ChunkCompressionType> _compressionConfigs = new HashMap<>();
+  private Map<String, FieldIndexConfigs> _indexConfigsByColName = new HashMap<>();
 
   private SegmentVersion _segmentVersion;
   private ColumnMinMaxValueGeneratorMode _columnMinMaxValueGeneratorMode = ColumnMinMaxValueGeneratorMode.DEFAULT_MODE;
@@ -91,15 +108,17 @@ public class IndexLoadingConfig {
   // constructed from FieldConfig
   private Map<String, Map<String, String>> _columnProperties = new HashMap<>();
 
+  @Nullable
   private TableConfig _tableConfig;
   private Schema _schema;
-
   private String _tableDataDir;
   private String _segmentDirectoryLoader;
   private String _segmentTier;
 
   private String _instanceId;
   private Map<String, Map<String, String>> _instanceTierConfigs;
+  private boolean _dirty = true;
+  private Set<String> _knownColumns = null;
 
   /**
    * NOTE: This step might modify the passed in table config and schema.
@@ -115,7 +134,6 @@ public IndexLoadingConfig(InstanceDataManagerConfig instanceDataManagerConfig, T
     this(instanceDataManagerConfig, tableConfig, null);
   }
 
-  @VisibleForTesting
   public IndexLoadingConfig() {
   }
 
@@ -213,10 +231,6 @@ private void extractFromTableConfigAndSchema(TableConfig tableConfig, @Nullable
       _onHeapDictionaryColumns.addAll(onHeapDictionaryColumns);
     }
 
-    _enableDynamicStarTreeCreation = indexingConfig.isEnableDynamicStarTreeCreation();
-    _starTreeIndexConfigs = indexingConfig.getStarTreeIndexConfigs();
-    _enableDefaultStarTree = indexingConfig.isEnableDefaultStarTree();
-
     String tableSegmentVersion = indexingConfig.getSegmentFormatVersion();
     if (tableSegmentVersion != null) {
       _segmentVersion = SegmentVersion.valueOf(tableSegmentVersion.toLowerCase());
@@ -227,6 +241,96 @@ private void extractFromTableConfigAndSchema(TableConfig tableConfig, @Nullable
       _columnMinMaxValueGeneratorMode =
           ColumnMinMaxValueGeneratorMode.valueOf(columnMinMaxValueGeneratorMode.toUpperCase());
     }
+
+    refreshIndexConfigs();
+  }
+
+  public void refreshIndexConfigs() {
+    TableConfig tableConfig = getTableConfigWithTierOverwrites();
+    // Accessing the index configs for single-column index is handled by IndexType.getConfig() as defined in index-spi.
+    // As the tableConfig is overwritten with tier specific configs, IndexType.getConfig() can access the tier
+    // specific index configs transparently.
+    _indexConfigsByColName = calculateIndexConfigsByColName(tableConfig, inferSchema());
+    // Accessing the StarTree index configs is not handled by IndexType.getConfig(), so we manually update them.
+    if (tableConfig != null) {
+      IndexingConfig indexingConfig = tableConfig.getIndexingConfig();
+      _enableDynamicStarTreeCreation = indexingConfig.isEnableDynamicStarTreeCreation();
+      _starTreeIndexConfigs = indexingConfig.getStarTreeIndexConfigs();
+      _enableDefaultStarTree = indexingConfig.isEnableDefaultStarTree();
+    }
+    _dirty = false;
+  }
+
+  /**
+   * Calculates the map from column to {@link FieldIndexConfigs}, merging the information related to older configs (
+   * which is also heavily used by tests) and the one included in the TableConfig (in case the latter is not null).
+   *
+   * This method does not modify the result of {@link #getFieldIndexConfigByColName()} or
+   * {@link #getFieldIndexConfigByColName()}. To do so, call {@link #refreshIndexConfigs()}.
+   *
+   * The main difference between this method and
+   * {@link FieldIndexConfigsUtil#createIndexConfigsByColName(TableConfig, Schema)} is that the former relays
+   * on the TableConfig, while this method can be used even when the {@link IndexLoadingConfig} was configured by
+   * calling the setter methods.
+   */
+  public Map<String, FieldIndexConfigs> calculateIndexConfigsByColName() {
+    return calculateIndexConfigsByColName(getTableConfigWithTierOverwrites(), inferSchema());
+  }
+
+  private Map<String, FieldIndexConfigs> calculateIndexConfigsByColName(@Nullable TableConfig tableConfig,
+      Schema schema) {
+    return FieldIndexConfigsUtil.createIndexConfigsByColName(tableConfig, schema, this::getDeserializer);
+  }
+
+  private <C extends IndexConfig> ColumnConfigDeserializer<C> getDeserializer(IndexType<C, ?, ?> indexType) {
+    ColumnConfigDeserializer<C> deserializer;
+
+    ColumnConfigDeserializer<C> stdDeserializer = indexType::getConfig;
+    if (indexType instanceof ConfigurableFromIndexLoadingConfig) {
+      @SuppressWarnings("unchecked")
+      Map<String, C> fromIndexLoadingConfig =
+          ((ConfigurableFromIndexLoadingConfig<C>) indexType).fromIndexLoadingConfig(this);
+
+      if (_schema == null || _tableConfig == null) {
+        LOGGER.debug("Ignoring default deserializers given that there is no schema [{}] or table config [{}]. Using "
+            + "indexLoadingConfig for indexType: {}", _schema == null, _tableConfig == null, indexType);
+        deserializer = IndexConfigDeserializer.fromMap(table -> fromIndexLoadingConfig);
+      } else if (_segmentTier == null) {
+        deserializer = IndexConfigDeserializer.fromMap(table -> fromIndexLoadingConfig)
+            .withFallbackAlternative(stdDeserializer);
+      } else {
+        // No need to fall back to fromIndexLoadingConfig which contains index configs for default tier, when looking
+        // for tier specific index configs.
+        deserializer = stdDeserializer;
+      }
+    } else {
+      if (_schema == null || _tableConfig == null) {
+        LOGGER.debug(
+            "Ignoring default deserializers given that there is no schema [{}] or table config [{}]. Using default "
+                + "configs for indexType: {}", _schema == null, _tableConfig == null, indexType);
+        deserializer = (tableConfig, schema) -> getAllKnownColumns().stream()
+            .collect(Collectors.toMap(Function.identity(), col -> indexType.getDefaultConfig()));
+      } else {
+        deserializer = stdDeserializer;
+      }
+    }
+    return deserializer;
+  }
+
+  private TableConfig getTableConfigWithTierOverwrites() {
+    return (_segmentTier == null || _tableConfig == null) ? _tableConfig
+        : TableConfigUtils.overwriteTableConfigForTier(_tableConfig, _segmentTier);
+  }
+
+  private Schema inferSchema() {
+    if (_schema != null) {
+      return _schema;
+    }
+    Schema schema = new Schema();
+    for (String column : getAllKnownColumns()) {
+      schema.addField(new DimensionFieldSpec(column, FieldSpec.DataType.STRING, true));
+    }
+    return schema;
   }
 
   /**
@@ -266,10 +370,6 @@ private void extractTextIndexColumnsFromTableConfig(TableConfig tableConfig) {
         String column = fieldConfig.getName();
         if (fieldConfig.getIndexType() == FieldConfig.IndexType.TEXT) {
           _textIndexColumns.add(column);
-          Map<String, String> propertiesMap = fieldConfig.getProperties();
-          if (TextIndexUtils.isFstTypeNative(propertiesMap)) {
-            _fstIndexType = FSTType.NATIVE;
-          }
         }
       }
     }
@@ -366,10 +466,11 @@ public ReadMode getReadMode() {
    */
   public void setReadMode(ReadMode readMode) {
     _readMode = readMode;
+    _dirty = true;
   }
 
   public List<String> getSortedColumns() {
-    return _sortedColumns;
+    return unmodifiable(_sortedColumns);
   }
 
   /**
@@ -383,14 +484,20 @@ public void setSortedColumn(String sortedColumn) {
     } else {
       _sortedColumns = Collections.emptyList();
     }
+    _dirty = true;
   }
 
   public Set<String> getInvertedIndexColumns() {
-    return _invertedIndexColumns;
+    return unmodifiable(_invertedIndexColumns);
   }
 
   public Set<String> getRangeIndexColumns() {
-    return _rangeIndexColumns;
+    return unmodifiable(_rangeIndexColumns);
+  }
+
+  public void addRangeIndexColumn(String... columns) {
+    _rangeIndexColumns.addAll(Arrays.asList(columns));
+    _dirty = true;
   }
 
   public int getRangeIndexVersion() {
@@ -410,27 +517,28 @@ public FSTType getFSTIndexType() {
    * @return a set containing names of text index columns
    */
   public Set<String> getTextIndexColumns() {
-    return _textIndexColumns;
+    return unmodifiable(_textIndexColumns);
   }
 
   public Set<String> getFSTIndexColumns() {
-    return _fstIndexColumns;
+    return unmodifiable(_fstIndexColumns);
   }
 
   public Map<String, JsonIndexConfig> getJsonIndexConfigs() {
-    return _jsonIndexConfigs;
+    return unmodifiable(_jsonIndexConfigs);
   }
 
   public Map<String, H3IndexConfig> getH3IndexConfigs() {
-    return _h3IndexConfigs;
+    return unmodifiable(_h3IndexConfigs);
   }
 
   public Map<String, Map<String, String>> getColumnProperties() {
-    return _columnProperties;
+    return unmodifiable(_columnProperties);
   }
 
   public void setColumnProperties(Map<String, Map<String, String>> columnProperties) {
-    _columnProperties = columnProperties;
+    _columnProperties = new HashMap<>(columnProperties);
+    _dirty = true;
   }
 
   /**
@@ -438,7 +546,32 @@ public void setColumnProperties(Map<String, Map<String, String>> columnPropertie
    */
   @VisibleForTesting
   public void setInvertedIndexColumns(Set<String> invertedIndexColumns) {
-    _invertedIndexColumns = invertedIndexColumns;
+    _invertedIndexColumns = new HashSet<>(invertedIndexColumns);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addInvertedIndexColumns(String... invertedIndexColumns) {
+    _invertedIndexColumns.addAll(Arrays.asList(invertedIndexColumns));
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addInvertedIndexColumns(Collection<String> invertedIndexColumns) {
+    _invertedIndexColumns.addAll(invertedIndexColumns);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void removeInvertedIndexColumns(String... invertedIndexColumns) {
+    removeInvertedIndexColumns(Arrays.asList(invertedIndexColumns));
+    assert _dirty;
+  }
+
+  @VisibleForTesting
+  public void removeInvertedIndexColumns(Collection<String> invertedIndexColumns) {
+    _invertedIndexColumns.removeAll(invertedIndexColumns);
+    _dirty = true;
   }
 
   /**
@@ -447,7 +580,32 @@ public void setInvertedIndexColumns(Set<String> invertedIndexColumns) {
    */
   @VisibleForTesting
   public void setNoDictionaryColumns(Set<String> noDictionaryColumns) {
-    _noDictionaryColumns = noDictionaryColumns;
+    _noDictionaryColumns = new HashSet<>(noDictionaryColumns);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void removeNoDictionaryColumns(String... noDictionaryColumns) {
+    Arrays.asList(noDictionaryColumns).forEach(_noDictionaryColumns::remove);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void removeNoDictionaryColumns(Collection<String> noDictionaryColumns) {
+    noDictionaryColumns.forEach(_noDictionaryColumns::remove);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addNoDictionaryColumns(String... noDictionaryColumns) {
+    _noDictionaryColumns.addAll(Arrays.asList(noDictionaryColumns));
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addNoDictionaryColumns(Collection<String> noDictionaryColumns) {
+    _noDictionaryColumns.addAll(noDictionaryColumns);
+    _dirty = true;
   }
 
   /**
@@ -456,7 +614,8 @@ public void setNoDictionaryColumns(Set<String> noDictionaryColumns) {
    */
   @VisibleForTesting
   public void setCompressionConfigs(Map<String, ChunkCompressionType> compressionConfigs) {
-    _compressionConfigs = compressionConfigs;
+    _compressionConfigs = new HashMap<>(compressionConfigs);
+    _dirty = true;
   }
 
   /**
@@ -464,7 +623,18 @@ public void setCompressionConfigs(Map<String, ChunkCompressionType> compressionC
    */
   @VisibleForTesting
   public void setRangeIndexColumns(Set<String> rangeIndexColumns) {
-    _rangeIndexColumns = rangeIndexColumns;
+    _rangeIndexColumns = new HashSet<>(rangeIndexColumns);
+    _dirty = true;
+  }
+
+  public void addRangeIndexColumns(String... rangeIndexColumns) {
+    _rangeIndexColumns.addAll(Arrays.asList(rangeIndexColumns));
+    _dirty = true;
+  }
+
+  public void removeRangeIndexColumns(String... rangeIndexColumns) {
+    Arrays.asList(rangeIndexColumns).forEach(_rangeIndexColumns::remove);
+    _dirty = true;
   }
 
   /**
@@ -475,17 +645,44 @@ public void setRangeIndexColumns(Set<String> rangeIndexColumns) {
    */
   @VisibleForTesting
   public void setTextIndexColumns(Set<String> textIndexColumns) {
-    _textIndexColumns = textIndexColumns;
+    _textIndexColumns = new HashSet<>(textIndexColumns);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addTextIndexColumns(String... textIndexColumns) {
+    _textIndexColumns.addAll(Arrays.asList(textIndexColumns));
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void removeTextIndexColumns(String... textIndexColumns) {
+    Arrays.asList(textIndexColumns).forEach(_textIndexColumns::remove);
+    _dirty = true;
   }
 
   @VisibleForTesting
   public void setFSTIndexColumns(Set<String> fstIndexColumns) {
-    _fstIndexColumns = fstIndexColumns;
+    _fstIndexColumns = new HashSet<>(fstIndexColumns);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addFSTIndexColumns(String... fstIndexColumns) {
+    _fstIndexColumns.addAll(Arrays.asList(fstIndexColumns));
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void removeFSTIndexColumns(String... fstIndexColumns) {
+    Arrays.asList(fstIndexColumns).forEach(_fstIndexColumns::remove);
+    _dirty = true;
   }
 
   @VisibleForTesting
   public void setFSTIndexType(FSTType fstType) {
     _fstIndexType = fstType;
+    _dirty = true;
   }
 
   @VisibleForTesting
@@ -498,21 +695,25 @@ public void setJsonIndexColumns(Set<String> jsonIndexColumns) {
     } else {
       _jsonIndexConfigs = null;
     }
+    _dirty = true;
   }
 
   @VisibleForTesting
   public void setH3IndexConfigs(Map<String, H3IndexConfig> h3IndexConfigs) {
-    _h3IndexConfigs = h3IndexConfigs;
+    _h3IndexConfigs = new HashMap<>(h3IndexConfigs);
+    _dirty = true;
   }
 
   @VisibleForTesting
   public void setBloomFilterConfigs(Map<String, BloomFilterConfig> bloomFilterConfigs) {
-    _bloomFilterConfigs = bloomFilterConfigs;
+    _bloomFilterConfigs = new HashMap<>(bloomFilterConfigs);
+    _dirty = true;
   }
 
   @VisibleForTesting
   public void setOnHeapDictionaryColumns(Set<String> onHeapDictionaryColumns) {
-    _onHeapDictionaryColumns = onHeapDictionaryColumns;
+    _onHeapDictionaryColumns = new HashSet<>(onHeapDictionaryColumns);
+    _dirty = true;
   }
 
   /**
@@ -521,11 +722,24 @@ public void setOnHeapDictionaryColumns(Set<String> onHeapDictionaryColumns) {
   @VisibleForTesting
   public void setForwardIndexDisabledColumns(Set<String> forwardIndexDisabledColumns) {
     _forwardIndexDisabledColumns =
-        forwardIndexDisabledColumns == null ? Collections.emptySet() : forwardIndexDisabledColumns;
+        forwardIndexDisabledColumns == null ? new HashSet<>() : new HashSet<>(forwardIndexDisabledColumns);
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void addForwardIndexDisabledColumns(String... forwardIndexDisabledColumns) {
+    _forwardIndexDisabledColumns.addAll(Arrays.asList(forwardIndexDisabledColumns));
+    _dirty = true;
+  }
+
+  @VisibleForTesting
+  public void removeForwardIndexDisabledColumns(String... forwardIndexDisabledColumns) {
+    Arrays.asList(forwardIndexDisabledColumns).forEach(_forwardIndexDisabledColumns::remove);
+    _dirty = true;
   }
 
   public Set<String> getNoDictionaryColumns() {
-    return _noDictionaryColumns;
+    return unmodifiable(_noDictionaryColumns);
   }
 
   /**
@@ -537,39 +751,48 @@ public Set<String> getNoDictionaryColumns() {
    * @return a map containing column name as key and compressionType as value.
    */
   public Map<String, ChunkCompressionType> getCompressionConfigs() {
-    return _compressionConfigs;
+    return unmodifiable(_compressionConfigs);
   }
 
   public Map<String, String> getNoDictionaryConfig() {
-    return _noDictionaryConfig;
+    return unmodifiable(_noDictionaryConfig);
   }
 
   public Set<String> getVarLengthDictionaryColumns() {
-    return _varLengthDictionaryColumns;
+    return unmodifiable(_varLengthDictionaryColumns);
   }
 
   public Set<String> getOnHeapDictionaryColumns() {
-    return _onHeapDictionaryColumns;
+    return unmodifiable(_onHeapDictionaryColumns);
   }
 
   public Set<String> getForwardIndexDisabledColumns() {
-    return _forwardIndexDisabledColumns;
+    return unmodifiable(_forwardIndexDisabledColumns);
   }
 
   public Map<String, BloomFilterConfig> getBloomFilterConfigs() {
-    return _bloomFilterConfigs;
+    return unmodifiable(_bloomFilterConfigs);
   }
 
   public boolean isEnableDynamicStarTreeCreation() {
+    if (_dirty) {
+      refreshIndexConfigs();
+    }
     return _enableDynamicStarTreeCreation;
   }
 
   @Nullable
   public List<StarTreeIndexConfig> getStarTreeIndexConfigs() {
-    return _starTreeIndexConfigs;
+    if (_dirty) {
+      refreshIndexConfigs();
+    }
+    return unmodifiable(_starTreeIndexConfigs);
   }
 
   public boolean isEnableDefaultStarTree() {
+    if (_dirty) {
+      refreshIndexConfigs();
+    }
     return _enableDefaultStarTree;
   }
 
@@ -583,6 +806,7 @@ public SegmentVersion getSegmentVersion() {
    */
   public void setSegmentVersion(SegmentVersion segmentVersion) {
     _segmentVersion = segmentVersion;
+    _dirty = true;
   }
 
   public boolean isEnableSplitCommit() {
@@ -614,6 +838,7 @@ public String getSegmentStoreURI() {
    */
   public void setColumnMinMaxValueGeneratorMode(ColumnMinMaxValueGeneratorMode columnMinMaxValueGeneratorMode) {
     _columnMinMaxValueGeneratorMode = columnMinMaxValueGeneratorMode;
+    _dirty = true;
   }
 
   public int getRealtimeAvgMultiValueCount() {
@@ -632,6 +857,7 @@ public Schema getSchema() {
   @VisibleForTesting
   public void setTableConfig(TableConfig tableConfig) {
     _tableConfig = tableConfig;
+    _dirty = true;
   }
 
   public String getSegmentDirectoryLoader() {
@@ -651,6 +877,7 @@ public String getInstanceId() {
 
   public void setTableDataDir(String tableDataDir) {
     _tableDataDir = tableDataDir;
+    _dirty = true;
   }
 
   public String getTableDataDir() {
@@ -659,17 +886,92 @@ public String getTableDataDir() {
 
   public void setSegmentTier(String segmentTier) {
     _segmentTier = segmentTier;
+    _dirty = true;
   }
 
   public String getSegmentTier() {
     return _segmentTier;
   }
 
+  @Nullable
+  public FieldIndexConfigs getFieldIndexConfig(String columnName) {
+    if (_indexConfigsByColName == null || _dirty) {
+      refreshIndexConfigs();
+    }
+    return _indexConfigsByColName.get(columnName);
+  }
+
+  public Map<String, FieldIndexConfigs> getFieldIndexConfigByColName() {
+    if (_indexConfigsByColName == null || _dirty) {
+      refreshIndexConfigs();
+    }
+    return unmodifiable(_indexConfigsByColName);
+  }
+
+  /**
+   * Returns a subset of the columns on the table.
+   *
+   * When {@link #getSchema()} is defined, the subset is equal the columns on the schema. In other cases, this method
+   * tries its bests to get the columns from other attributes like {@link #getTableConfig()}, which may also not be
+   * defined or may not be complete.
+   */
+  public Set<String> getAllKnownColumns() {
+    if (_schema != null) {
+      return _schema.getColumnNames();
+    }
+    if (!_dirty && _knownColumns != null) {
+      return _knownColumns;
+    }
+    if (_knownColumns == null) {
+      _knownColumns = new HashSet<>();
+    }
+    if (_tableConfig != null) {
+      List<FieldConfig> fieldConfigs = _tableConfig.getFieldConfigList();
+      if (fieldConfigs != null) {
+        for (FieldConfig fieldConfig : fieldConfigs) {
+          _knownColumns.add(fieldConfig.getName());
+        }
+      }
+    }
+    _knownColumns.addAll(_columnProperties.keySet());
+    _knownColumns.addAll(_invertedIndexColumns);
+    _knownColumns.addAll(_fstIndexColumns);
+    _knownColumns.addAll(_rangeIndexColumns);
+    _knownColumns.addAll(_noDictionaryColumns);
+    _knownColumns.addAll(_textIndexColumns);
+    _knownColumns.addAll(_forwardIndexDisabledColumns);
+    _knownColumns.addAll(_onHeapDictionaryColumns);
+    _knownColumns.addAll(_varLengthDictionaryColumns);
+    return _knownColumns;
+  }
+
   public void setInstanceTierConfigs(Map<String, Map<String, String>> tierConfigs) {
-    _instanceTierConfigs = tierConfigs;
+    _instanceTierConfigs = new HashMap<>(tierConfigs);
+    _dirty = true;
   }
 
   public Map<String, Map<String, String>> getInstanceTierConfigs() {
-    return _instanceTierConfigs;
+    return unmodifiable(_instanceTierConfigs);
+  }
+
+  private <E> List<E> unmodifiable(List<E> list) {
+    return list == null ? null : Collections.unmodifiableList(list);
+  }
+
+  private <E> Set<E> unmodifiable(Set<E> set) {
+    return set == null ? null : Collections.unmodifiableSet(set);
+  }
+
+  private <K, V> Map<K, V> unmodifiable(Map<K, V> map) {
+    return map == null ? null : Collections.unmodifiableMap(map);
+  }
+
+  public void addKnownColumns(Set<String> columns) {
+    if (_knownColumns == null) {
+      _knownColumns = new HashSet<>(columns);
+    } else {
+      _knownColumns.addAll(columns);
+    }
+    _dirty = true;
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/InvertedIndexAndDictionaryBasedForwardIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/InvertedIndexAndDictionaryBasedForwardIndexCreator.java
index 532c9374b33..155dc47fe0e 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/InvertedIndexAndDictionaryBasedForwardIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/InvertedIndexAndDictionaryBasedForwardIndexCreator.java
@@ -24,18 +24,19 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentColumnarIndexCreator;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.inverted.InvertedIndexType;
 import org.apache.pinot.segment.local.segment.index.readers.BitmapInvertedIndexReader;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.SegmentMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.utils.SegmentMetadataUtils;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -62,6 +63,9 @@
  * TODO: Currently for multi-value columns generating the forward index can lead to a data loss as frequency information
  *       is not available for repeats within a given row. This needs to be addressed by tracking the frequency data
  *       as part of an on-disk structure when forward index is disabled for a column.
+ *
+ * TODO (index-spi): Rename this class, as it is not an implementation of
+ * {@link org.apache.pinot.segment.spi.index.IndexCreator}.
  */
 public class InvertedIndexAndDictionaryBasedForwardIndexCreator implements AutoCloseable {
   private static final Logger LOGGER =
@@ -75,9 +79,8 @@ public class InvertedIndexAndDictionaryBasedForwardIndexCreator implements AutoC
   private static final String FORWARD_INDEX_MAX_SIZE_BUFFER_SUFFIX = ".fwd.idx.maxsize.buf";
 
   private final String _columnName;
-  private final IndexLoadingConfig _indexLoadingConfig;
+  private final ForwardIndexConfig _forwardIndexConfig;
   private final SegmentDirectory.Writer _segmentWriter;
-  private final IndexCreatorProvider _indexCreatorProvider;
   private final boolean _isTemporaryForwardIndex;
 
   // Metadata
@@ -90,7 +93,6 @@ public class InvertedIndexAndDictionaryBasedForwardIndexCreator implements AutoC
   private final FieldSpec.DataType _storedType;
   private final int _totalNumberOfEntries;
   private final boolean _dictionaryEnabled;
-  private final ChunkCompressionType _chunkCompressionType;
   private final boolean _useMMapBuffer;
 
   // Files and temporary buffers
@@ -111,15 +113,13 @@ public class InvertedIndexAndDictionaryBasedForwardIndexCreator implements AutoC
   private PinotDataBuffer _forwardIndexMaxSizeBuffer;
 
   public InvertedIndexAndDictionaryBasedForwardIndexCreator(String columnName, SegmentDirectory segmentDirectory,
-      IndexLoadingConfig indexLoadingConfig, SegmentDirectory.Writer segmentWriter,
-      IndexCreatorProvider indexCreatorProvider, boolean isTemporaryForwardIndex)
+      boolean dictionaryEnabled, ForwardIndexConfig fwdConf, SegmentDirectory.Writer segmentWriter,
+      boolean isTemporaryForwardIndex)
       throws IOException {
     _columnName = columnName;
     _segmentDirectory = segmentDirectory;
     _segmentMetadata = segmentDirectory.getSegmentMetadata();
-    _indexLoadingConfig = indexLoadingConfig;
     _segmentWriter = segmentWriter;
-    _indexCreatorProvider = indexCreatorProvider;
     _isTemporaryForwardIndex = isTemporaryForwardIndex;
 
     _columnMetadata = _segmentMetadata.getColumnMetadataFor(columnName);
@@ -129,8 +129,7 @@ public InvertedIndexAndDictionaryBasedForwardIndexCreator(String columnName, Seg
     _totalNumberOfEntries = _columnMetadata.getTotalNumberOfEntries();
     _maxNumberOfMultiValues = _columnMetadata.getMaxNumberOfMultiValues();
     _storedType = _columnMetadata.getFieldSpec().getDataType().getStoredType();
-    _dictionaryEnabled = !_indexLoadingConfig.getNoDictionaryColumns().contains(columnName);
-    _chunkCompressionType = getColumnCompressionType();
+    _dictionaryEnabled = dictionaryEnabled;
     int numValues = _singleValue ? _numDocs : _totalNumberOfEntries;
     _useMMapBuffer = numValues > NUM_VALUES_THRESHOLD_FOR_MMAP_BUFFER;
 
@@ -145,6 +144,7 @@ public InvertedIndexAndDictionaryBasedForwardIndexCreator(String columnName, Seg
       fileExtension = _singleValue ? V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION
           : V1Constants.Indexes.RAW_MV_FORWARD_INDEX_FILE_EXTENSION;
     }
+    _forwardIndexConfig = fwdConf;
     _forwardIndexFile = new File(indexDir, columnName + fileExtension);
     _forwardIndexValueBufferFile = new File(indexDir, columnName + FORWARD_INDEX_VALUE_BUFFER_SUFFIX);
     _forwardIndexLengthBufferFile = new File(indexDir, columnName + FORWARD_INDEX_LENGTH_BUFFER_SUFFIX);
@@ -175,24 +175,6 @@ public InvertedIndexAndDictionaryBasedForwardIndexCreator(String columnName, Seg
     }
   }
 
-  private ChunkCompressionType getColumnCompressionType() {
-    if (_dictionaryEnabled) {
-      return null;
-    }
-
-    Map<String, ChunkCompressionType> compressionConfigs = _indexLoadingConfig.getCompressionConfigs();
-    Map<String, String> noDictionaryConfig = _indexLoadingConfig.getNoDictionaryConfig();
-    ChunkCompressionType compressionType;
-    if (compressionConfigs.containsKey(_columnName)) {
-      compressionType = compressionConfigs.get(_columnName);
-    } else if (noDictionaryConfig.containsKey(_columnName)) {
-      compressionType = ChunkCompressionType.valueOf(_indexLoadingConfig.getNoDictionaryConfig().get(_columnName));
-    } else {
-      compressionType = SegmentColumnarIndexCreator.getDefaultCompressionType(_columnMetadata.getFieldType());
-    }
-    return compressionType;
-  }
-
   public void regenerateForwardIndex()
       throws IOException {
     File indexDir = _segmentMetadata.getIndexDir();
@@ -220,7 +202,7 @@ public void regenerateForwardIndex()
       metadataProperties = createForwardIndexForMVColumn();
     }
 
-    LoaderUtils.writeIndexToV3Format(_segmentWriter, _columnName, _forwardIndexFile, ColumnIndexType.FORWARD_INDEX);
+    LoaderUtils.writeIndexToV3Format(_segmentWriter, _columnName, _forwardIndexFile, StandardIndexes.forward());
 
     try {
       // Update the metadata even for temporary forward index as other IndexHandlers may rely on the updated metadata
@@ -247,7 +229,7 @@ public void regenerateForwardIndex()
         LOGGER.info("Clean up indexes no longer needed or which need to be rewritten for segment: {}, column: {}",
             segmentName, _columnName);
         // Delete the dictionary
-        _segmentWriter.removeIndex(_columnName, ColumnIndexType.DICTIONARY);
+        _segmentWriter.removeIndex(_columnName, StandardIndexes.dictionary());
 
         // We remove indexes that have to be rewritten when a dictEnabled is toggled. Note that the respective index
         // handler will take care of recreating the index.
@@ -265,8 +247,9 @@ public void regenerateForwardIndex()
   private Map<String, String> createForwardIndexForSVColumn()
       throws IOException {
     try (BitmapInvertedIndexReader invertedIndexReader =
-        (BitmapInvertedIndexReader) LoaderUtils.getInvertedIndexReader(_segmentWriter, _columnMetadata);
-        Dictionary dictionary = LoaderUtils.getDictionary(_segmentWriter, _columnMetadata)) {
+        (BitmapInvertedIndexReader) InvertedIndexType.ReaderFactory
+            .INSTANCE.createSkippingForward(_segmentWriter, _columnMetadata);
+        Dictionary dictionary = DictionaryIndexType.read(_segmentWriter, _columnMetadata)) {
       boolean isFixedWidth = _columnMetadata.getFieldSpec().getDataType().isFixedWidth();
       int lengthOfLongestEntry = isFixedWidth ? -1 : 0;
       // Construct the forward index in the values buffer
@@ -279,11 +262,13 @@ private Map<String, String> createForwardIndexForSVColumn()
         }
       }
 
-      IndexCreationContext.Forward context =
-          IndexCreationContext.builder().withIndexDir(_segmentMetadata.getIndexDir())
-              .withColumnMetadata(_columnMetadata).withforwardIndexDisabled(false).withDictionary(_dictionaryEnabled)
-              .withLengthOfLongestEntry(lengthOfLongestEntry).build()
-              .forForwardIndex(_chunkCompressionType, _indexLoadingConfig.getColumnProperties());
+      IndexCreationContext context = IndexCreationContext.builder()
+          .withIndexDir(_segmentMetadata.getIndexDir())
+          .withColumnMetadata(_columnMetadata)
+          .withForwardIndexDisabled(false)
+          .withDictionary(_dictionaryEnabled)
+          .withLengthOfLongestEntry(lengthOfLongestEntry)
+          .build();
 
       writeToForwardIndex(dictionary, context);
 
@@ -299,8 +284,9 @@ private Map<String, String> createForwardIndexForSVColumn()
   private Map<String, String> createForwardIndexForMVColumn()
       throws IOException {
     try (BitmapInvertedIndexReader invertedIndexReader =
-        (BitmapInvertedIndexReader) LoaderUtils.getInvertedIndexReader(_segmentWriter, _columnMetadata);
-        Dictionary dictionary = LoaderUtils.getDictionary(_segmentWriter, _columnMetadata)) {
+        (BitmapInvertedIndexReader) InvertedIndexType.ReaderFactory.INSTANCE
+            .createSkippingForward(_segmentWriter, _columnMetadata);
+        Dictionary dictionary = DictionaryIndexType.read(_segmentWriter, _columnMetadata)) {
       // Construct the forward index length buffer and create the inverted index values and length buffers
       int[] maxNumberOfMultiValues = new int[]{0};
       final boolean isFixedWidth = _columnMetadata.getFieldSpec().getDataType().isFixedWidth();
@@ -358,12 +344,16 @@ private Map<String, String> createForwardIndexForMVColumn()
         });
       }
 
-      IndexCreationContext.Forward context =
-          IndexCreationContext.builder().withIndexDir(_segmentMetadata.getIndexDir())
-              .withColumnMetadata(_columnMetadata).withforwardIndexDisabled(false).withDictionary(_dictionaryEnabled)
-              .withTotalNumberOfEntries(_nextValueId).withMaxNumberOfMultiValueElements(maxNumberOfMultiValues[0])
-              .withMaxRowLengthInBytes(maxRowLengthInBytes[0]).withLengthOfLongestEntry(lengthOfLongestEntry)
-              .build().forForwardIndex(_chunkCompressionType, _indexLoadingConfig.getColumnProperties());
+      IndexCreationContext context = IndexCreationContext.builder()
+          .withIndexDir(_segmentMetadata.getIndexDir())
+          .withColumnMetadata(_columnMetadata)
+          .withForwardIndexDisabled(false)
+          .withDictionary(_dictionaryEnabled)
+          .withTotalNumberOfEntries(_nextValueId)
+          .withMaxNumberOfMultiValueElements(maxNumberOfMultiValues[0])
+          .withMaxRowLengthInBytes(maxRowLengthInBytes[0])
+          .withLengthOfLongestEntry(lengthOfLongestEntry)
+          .build();
 
       writeToForwardIndex(dictionary, context);
 
@@ -427,9 +417,9 @@ private void trackMaxRowLengthInBytes(Dictionary dictionary, int[] maxRowLengthI
     }
   }
 
-  private void writeToForwardIndex(Dictionary dictionary, IndexCreationContext.Forward context)
+  private void writeToForwardIndex(Dictionary dictionary, IndexCreationContext context)
       throws IOException {
-    try (ForwardIndexCreator creator = _indexCreatorProvider.newForwardIndexCreator(context)) {
+    try (ForwardIndexCreator creator = StandardIndexes.forward().createIndexCreator(context, _forwardIndexConfig)) {
       if (_dictionaryEnabled) {
         if (_singleValue) {
           for (int docId = 0; docId < _numDocs; docId++) {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/LoaderUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/LoaderUtils.java
index 22c0a243a24..d417c223ca0 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/LoaderUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/LoaderUtils.java
@@ -25,14 +25,8 @@
 import java.util.List;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.local.segment.index.column.PhysicalColumnIndexContainer;
-import org.apache.pinot.segment.local.segment.index.readers.BaseImmutableDictionary;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
@@ -45,38 +39,6 @@ private LoaderUtils() {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(LoaderUtils.class);
 
-  /**
-   * Returns the forward index reader for the given column.
-   */
-  public static ForwardIndexReader<?> getForwardIndexReader(SegmentDirectory.Reader segmentReader,
-      ColumnMetadata columnMetadata)
-      throws IOException {
-    PinotDataBuffer dataBuffer =
-        segmentReader.getIndexFor(columnMetadata.getColumnName(), ColumnIndexType.FORWARD_INDEX);
-    return IndexingOverrides.getIndexReaderProvider().newForwardIndexReader(dataBuffer, columnMetadata);
-  }
-
-  /**
-   * Returns the dictionary for the given column.
-   */
-  public static BaseImmutableDictionary getDictionary(SegmentDirectory.Reader segmentReader,
-      ColumnMetadata columnMetadata)
-      throws IOException {
-    PinotDataBuffer dataBuffer = segmentReader.getIndexFor(columnMetadata.getColumnName(), ColumnIndexType.DICTIONARY);
-    return PhysicalColumnIndexContainer.loadDictionary(dataBuffer, columnMetadata, false);
-  }
-
-  /**
-   * Returns the inverted index reader for the given column.
-   */
-  public static InvertedIndexReader<?> getInvertedIndexReader(SegmentDirectory.Reader segmentReader,
-      ColumnMetadata columnMetadata)
-      throws IOException {
-    PinotDataBuffer dataBuffer =
-        segmentReader.getIndexFor(columnMetadata.getColumnName(), ColumnIndexType.INVERTED_INDEX);
-    return IndexingOverrides.getIndexReaderProvider().newInvertedIndexReader(dataBuffer, columnMetadata);
-  }
-
   /**
    * Write an index file to v3 format single index file and remove the old one.
    *
@@ -87,7 +49,7 @@ public static InvertedIndexReader<?> getInvertedIndexReader(SegmentDirectory.Rea
    * @throws IOException
    */
   public static void writeIndexToV3Format(SegmentDirectory.Writer segmentWriter, String column, File indexFile,
-      ColumnIndexType indexType)
+      IndexType<?, ?, ?> indexType)
       throws IOException {
     long fileLength = indexFile.length();
     // NOTE: DO NOT close buffer here as it is managed in the SegmentDirectory.
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessor.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessor.java
index 1f262595584..4913088fc55 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessor.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessor.java
@@ -33,11 +33,12 @@
 import org.apache.pinot.segment.local.startree.v2.builder.MultipleTreesBuilder;
 import org.apache.pinot.segment.local.startree.v2.builder.StarTreeV2BuilderConfig;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2Metadata;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.data.Schema;
 import org.slf4j.Logger;
@@ -103,20 +104,31 @@ public void process()
       }
 
       // Update single-column indices, like inverted index, json index etc.
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
       List<IndexHandler> indexHandlers = new ArrayList<>();
-      for (ColumnIndexType type : ColumnIndexType.values()) {
-        IndexHandler handler =
-            IndexHandlerFactory.getIndexHandler(type, _segmentDirectory, _indexLoadingConfig, _schema);
-        indexHandlers.add(handler);
-        // TODO: Find a way to ensure ForwardIndexHandler is always executed before other handlers instead of
-        // relying on enum ordering.
-        handler.updateIndices(segmentWriter, indexCreatorProvider);
-        // ForwardIndexHandler may modify the segment metadata while rewriting forward index to create / remove a
-        // dictionary. Other IndexHandler classes may modify the segment metadata while creating a temporary forward
-        // index to generate their respective indexes from if the forward index was disabled. This new metadata is
-        // needed to construct other indexes like RangeIndex.
-        _segmentMetadata = _segmentDirectory.getSegmentMetadata();
+
+      // We cannot just create all the index handlers in a random order.
+      // Specifically, ForwardIndexHandler needs to be executed first. This is because it modifies the segment metadata
+      // while rewriting forward index to create a dictionary. Some other handlers (like the range one) assume that
+      // metadata was already been modified by ForwardIndexHandler.
+      IndexHandler forwardHandler = createHandler(StandardIndexes.forward());
+      indexHandlers.add(forwardHandler);
+      forwardHandler.updateIndices(segmentWriter);
+
+      // Now that ForwardIndexHandler.updateIndices has been updated, we can run all other indexes in any order
+
+      _segmentMetadata = new SegmentMetadataImpl(indexDir);
+      _segmentDirectory.reloadMetadata();
+
+      for (IndexType<?, ?, ?> type : IndexService.getInstance().getAllIndexes()) {
+        if (type != StandardIndexes.forward()) {
+          IndexHandler handler = createHandler(type);
+          indexHandlers.add(handler);
+          handler.updateIndices(segmentWriter);
+          // Other IndexHandler classes may modify the segment metadata while creating a temporary forward
+          // index to generate their respective indexes from if the forward index was disabled. This new metadata is
+          // needed to construct other indexes like RangeIndex.
+          _segmentMetadata = _segmentDirectory.getSegmentMetadata();
+        }
       }
 
       // Create/modify/remove star-trees if required.
@@ -143,6 +155,11 @@ public void process()
     }
   }
 
+  private IndexHandler createHandler(IndexType<?, ?, ?> type) {
+    return type.createIndexHandler(_segmentDirectory,
+        _indexLoadingConfig.getFieldIndexConfigByColName(), _schema, _indexLoadingConfig.getTableConfig());
+  }
+
   /**
    * This method checks if there is any discrepancy between the segment and current table config and schema.
    * If so, it returns true indicating the segment needs to be reprocessed. Right now, the default columns,
@@ -164,9 +181,8 @@ public boolean needProcess()
         }
       }
       // Check if there is need to update single-column indices, like inverted index, json index etc.
-      for (ColumnIndexType type : ColumnIndexType.values()) {
-        if (IndexHandlerFactory.getIndexHandler(type, _segmentDirectory, _indexLoadingConfig, _schema)
-            .needUpdateIndices(segmentReader)) {
+      for (IndexType<?, ?, ?> type : IndexService.getInstance().getAllIndexes()) {
+        if (createHandler(type).needUpdateIndices(segmentReader)) {
           LOGGER.info("Found index type: {} needs updates", type);
           return true;
         }
@@ -207,9 +223,10 @@ private boolean needProcessStarTrees() {
     List<StarTreeV2Metadata> starTreeMetadataList = _segmentMetadata.getStarTreeV2MetadataList();
     // There are existing star-trees, but if they match the builder configs exactly,
     // then there is no need to generate the star-trees
-    if (starTreeMetadataList != null && !StarTreeBuilderUtils
-        .shouldRemoveExistingStarTrees(starTreeBuilderConfigs, starTreeMetadataList)) {
-      return false;
+
+    // We need reprocessing if existing configs are to be removed, or new configs have been added
+    if (starTreeMetadataList != null) {
+      return StarTreeBuilderUtils.shouldModifyExistingStarTrees(starTreeBuilderConfigs, starTreeMetadataList);
     }
     return !starTreeBuilderConfigs.isEmpty();
   }
@@ -225,11 +242,14 @@ private void processStarTrees(File indexDir)
       List<StarTreeV2Metadata> starTreeMetadataList = _segmentMetadata.getStarTreeV2MetadataList();
       if (starTreeMetadataList != null) {
         // There are existing star-trees
-        if (StarTreeBuilderUtils.shouldRemoveExistingStarTrees(starTreeBuilderConfigs, starTreeMetadataList)) {
-          // Remove the existing star-trees
+        if (!shouldGenerateStarTree) {
+          // Newer config does not have star-trees. Delete all existing star-trees.
           LOGGER.info("Removing star-trees from segment: {}", _segmentMetadata.getName());
           StarTreeBuilderUtils.removeStarTrees(indexDir);
           _segmentMetadata = new SegmentMetadataImpl(indexDir);
+        } else if (StarTreeBuilderUtils.shouldModifyExistingStarTrees(starTreeBuilderConfigs, starTreeMetadataList)) {
+          // Existing and newer both have star-trees, but they don't match. Rebuild the star-trees.
+          LOGGER.info("Change detected in star-trees for segment: {}", _segmentMetadata.getName());
         } else {
           // Existing star-trees match the builder configs, no need to generate the star-trees
           shouldGenerateStarTree = false;
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/bloomfilter/BloomFilterHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/bloomfilter/BloomFilterHandler.java
index 109a945f309..f6857460e27 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/bloomfilter/BloomFilterHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/bloomfilter/BloomFilterHandler.java
@@ -23,31 +23,28 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
-import org.apache.pinot.segment.local.segment.index.readers.BaseImmutableDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.BytesDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.DoubleDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.FloatDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.IntDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.LongDictionary;
-import org.apache.pinot.segment.local.segment.index.readers.StringDictionary;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.creator.BloomFilterCreatorProvider;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.slf4j.Logger;
@@ -59,16 +56,17 @@ public class BloomFilterHandler extends BaseIndexHandler {
 
   private final Map<String, BloomFilterConfig> _bloomFilterConfigs;
 
-  public BloomFilterHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
-    super(segmentDirectory, indexLoadingConfig);
-    _bloomFilterConfigs = indexLoadingConfig.getBloomFilterConfigs();
+  public BloomFilterHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _bloomFilterConfigs = FieldIndexConfigsUtil.enableConfigByColumn(StandardIndexes.bloomFilter(), fieldIndexConfigs);
   }
 
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddBF = new HashSet<>(_bloomFilterConfigs.keySet());
-    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.BLOOM_FILTER);
+    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.bloomFilter());
     // Check if any existing bloomfilter need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddBF.remove(column)) {
@@ -88,23 +86,23 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception {
     Set<String> columnsToAddBF = new HashSet<>(_bloomFilterConfigs.keySet());
     // Remove indices not set in table config any more.
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
-    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.BLOOM_FILTER);
+    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.bloomFilter());
     for (String column : existingColumns) {
       if (!columnsToAddBF.remove(column)) {
         LOGGER.info("Removing existing bloom filter from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.BLOOM_FILTER);
+        segmentWriter.removeIndex(column, StandardIndexes.bloomFilter());
         LOGGER.info("Removed existing bloom filter from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddBF) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateBloomFilter(columnMetadata)) {
-        createBloomFilterForColumn(segmentWriter, columnMetadata, indexCreatorProvider, indexCreatorProvider);
+        createBloomFilterForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -113,13 +111,15 @@ private boolean shouldCreateBloomFilter(ColumnMetadata columnMetadata) {
     return columnMetadata != null;
   }
 
-  private void createAndSealBloomFilterForDictionaryColumn(BloomFilterCreatorProvider indexCreatorProvider,
-      File indexDir, ColumnMetadata columnMetadata, BloomFilterConfig bloomFilterConfig,
-      SegmentDirectory.Writer segmentWriter)
+  private void createAndSealBloomFilterForDictionaryColumn(File indexDir, ColumnMetadata columnMetadata,
+      BloomFilterConfig bloomFilterConfig, SegmentDirectory.Writer segmentWriter)
       throws Exception {
-    try (BloomFilterCreator bloomFilterCreator = indexCreatorProvider.newBloomFilterCreator(
-        IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-            .forBloomFilter(bloomFilterConfig));
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    try (BloomFilterCreator bloomFilterCreator =
+        StandardIndexes.bloomFilter().createIndexCreator(context, bloomFilterConfig);
         Dictionary dictionary = getDictionaryReader(columnMetadata, segmentWriter)) {
       int length = dictionary.length();
       for (int i = 0; i < length; i++) {
@@ -129,15 +129,17 @@ private void createAndSealBloomFilterForDictionaryColumn(BloomFilterCreatorProvi
     }
   }
 
-  private void createAndSealBloomFilterForNonDictionaryColumn(BloomFilterCreatorProvider indexCreatorProvider,
-      File indexDir, ColumnMetadata columnMetadata, BloomFilterConfig bloomFilterConfig,
-      SegmentDirectory.Writer segmentWriter)
+  private void createAndSealBloomFilterForNonDictionaryColumn(File indexDir, ColumnMetadata columnMetadata,
+      BloomFilterConfig bloomFilterConfig, SegmentDirectory.Writer segmentWriter)
       throws Exception {
     int numDocs = columnMetadata.getTotalDocs();
-    try (BloomFilterCreator bloomFilterCreator = indexCreatorProvider.newBloomFilterCreator(
-        IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-            .forBloomFilter(bloomFilterConfig));
-        ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    try (BloomFilterCreator bloomFilterCreator = StandardIndexes.bloomFilter()
+        .createIndexCreator(context, bloomFilterConfig);
+        ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext()) {
       if (columnMetadata.isSingleValue()) {
         // SV
@@ -243,8 +245,7 @@ private void createAndSealBloomFilterForNonDictionaryColumn(BloomFilterCreatorPr
     }
   }
 
-  private void createBloomFilterForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      BloomFilterCreatorProvider bloomFilterCreatorProvider, IndexCreatorProvider indexCreatorProvider)
+  private void createBloomFilterForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
       throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
@@ -264,7 +265,7 @@ private void createBloomFilterForColumn(SegmentDirectory.Writer segmentWriter, C
 
     if (!columnMetadata.hasDictionary()) {
       // Create a temporary forward index if it is disabled and does not exist
-      columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, indexCreatorProvider, true);
+      columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, true);
     }
 
     // Create new bloom filter for the column.
@@ -272,16 +273,14 @@ private void createBloomFilterForColumn(SegmentDirectory.Writer segmentWriter, C
     LOGGER.info("Creating new bloom filter for segment: {}, column: {} with config: {}", segmentName, columnName,
         bloomFilterConfig);
     if (columnMetadata.hasDictionary()) {
-      createAndSealBloomFilterForDictionaryColumn(bloomFilterCreatorProvider, indexDir, columnMetadata,
-          bloomFilterConfig, segmentWriter);
+      createAndSealBloomFilterForDictionaryColumn(indexDir, columnMetadata, bloomFilterConfig, segmentWriter);
     } else {
-      createAndSealBloomFilterForNonDictionaryColumn(bloomFilterCreatorProvider, indexDir, columnMetadata,
-          bloomFilterConfig, segmentWriter);
+      createAndSealBloomFilterForNonDictionaryColumn(indexDir, columnMetadata, bloomFilterConfig, segmentWriter);
     }
 
     // For v3, write the generated bloom filter file into the single file and remove it.
     if (_segmentDirectory.getSegmentMetadata().getVersion() == SegmentVersion.v3) {
-      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, bloomFilterFile, ColumnIndexType.BLOOM_FILTER);
+      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, bloomFilterFile, StandardIndexes.bloomFilter());
     }
 
     // Delete the marker file.
@@ -289,26 +288,19 @@ private void createBloomFilterForColumn(SegmentDirectory.Writer segmentWriter, C
     LOGGER.info("Created bloom filter for segment: {}, column: {}", segmentName, columnName);
   }
 
-  private BaseImmutableDictionary getDictionaryReader(ColumnMetadata columnMetadata,
-      SegmentDirectory.Writer segmentWriter)
+  private Dictionary getDictionaryReader(ColumnMetadata columnMetadata, SegmentDirectory.Writer segmentWriter)
       throws IOException {
-    PinotDataBuffer dictionaryBuffer =
-        segmentWriter.getIndexFor(columnMetadata.getColumnName(), ColumnIndexType.DICTIONARY);
-    int cardinality = columnMetadata.getCardinality();
     DataType dataType = columnMetadata.getDataType();
+
     switch (dataType) {
       case INT:
-        return new IntDictionary(dictionaryBuffer, cardinality);
       case LONG:
-        return new LongDictionary(dictionaryBuffer, cardinality);
       case FLOAT:
-        return new FloatDictionary(dictionaryBuffer, cardinality);
       case DOUBLE:
-        return new DoubleDictionary(dictionaryBuffer, cardinality);
       case STRING:
-        return new StringDictionary(dictionaryBuffer, cardinality, columnMetadata.getColumnMaxLength());
       case BYTES:
-        return new BytesDictionary(dictionaryBuffer, cardinality, columnMetadata.getColumnMaxLength());
+        PinotDataBuffer buf = segmentWriter.getIndexFor(columnMetadata.getColumnName(), StandardIndexes.dictionary());
+        return DictionaryIndexType.read(buf, columnMetadata, DictionaryIndexConfig.DEFAULT);
       default:
         throw new IllegalStateException(
             "Unsupported data type: " + dataType + " for column: " + columnMetadata.getColumnName());
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/columnminmaxvalue/ColumnMinMaxValueGenerator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/columnminmaxvalue/ColumnMinMaxValueGenerator.java
index a3c2479bbca..5cfa637ee2f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/columnminmaxvalue/ColumnMinMaxValueGenerator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/columnminmaxvalue/ColumnMinMaxValueGenerator.java
@@ -19,9 +19,10 @@
 package org.apache.pinot.segment.local.segment.index.loader.columnminmaxvalue;
 
 import com.google.common.base.Preconditions;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentColumnarIndexCreator;
 import org.apache.pinot.segment.local.segment.index.readers.BytesDictionary;
 import org.apache.pinot.segment.local.segment.index.readers.DoubleDictionary;
@@ -29,13 +30,20 @@
 import org.apache.pinot.segment.local.segment.index.readers.IntDictionary;
 import org.apache.pinot.segment.local.segment.index.readers.LongDictionary;
 import org.apache.pinot.segment.local.segment.index.readers.StringDictionary;
+import org.apache.pinot.segment.local.segment.index.readers.forward.ChunkReaderContext;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedByteChunkMVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.FixedByteChunkSVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkMVForwardIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReader;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.SegmentMetadata;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.utils.SegmentMetadataUtils;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.ByteArray;
 
 import static org.apache.pinot.spi.data.FieldSpec.DataType;
 
@@ -79,88 +87,296 @@ public void addColumnMinMaxValue()
     }
   }
 
-  private Set<String> getColumnsToAddMinMaxValue() {
+  private List<String> getColumnsToAddMinMaxValue() {
     Schema schema = _segmentMetadata.getSchema();
-    Set<String> columnsToAddMinMaxValue = new HashSet<>(schema.getPhysicalColumnNames());
+    List<String> columnsToAddMinMaxValue = new ArrayList<>();
 
     // mode ALL - use all columns
     // mode NON_METRIC - use all dimensions and time columns
     // mode TIME - use only time columns
     switch (_columnMinMaxValueGeneratorMode) {
-      case TIME:
-        columnsToAddMinMaxValue.removeAll(schema.getDimensionNames());
-        columnsToAddMinMaxValue.removeAll(schema.getMetricNames());
+      case ALL:
+        for (FieldSpec fieldSpec : schema.getAllFieldSpecs()) {
+          if (!fieldSpec.isVirtualColumn()) {
+            columnsToAddMinMaxValue.add(fieldSpec.getName());
+          }
+        }
         break;
       case NON_METRIC:
-        columnsToAddMinMaxValue.removeAll(schema.getMetricNames());
+        for (FieldSpec fieldSpec : schema.getAllFieldSpecs()) {
+          if (!fieldSpec.isVirtualColumn() && fieldSpec.getFieldType() != FieldSpec.FieldType.METRIC) {
+            columnsToAddMinMaxValue.add(fieldSpec.getName());
+          }
+        }
         break;
-      default:
+      case TIME:
+        for (FieldSpec fieldSpec : schema.getAllFieldSpecs()) {
+          if (!fieldSpec.isVirtualColumn() && (fieldSpec.getFieldType() == FieldSpec.FieldType.TIME
+              || fieldSpec.getFieldType() == FieldSpec.FieldType.DATE_TIME)) {
+            columnsToAddMinMaxValue.add(fieldSpec.getName());
+          }
+        }
         break;
+      default:
+        throw new IllegalStateException("Unsupported generator mode: " + _columnMinMaxValueGeneratorMode);
     }
+
     return columnsToAddMinMaxValue;
   }
 
   private boolean needAddColumnMinMaxValueForColumn(String columnName) {
     ColumnMetadata columnMetadata = _segmentMetadata.getColumnMetadataFor(columnName);
-    return columnMetadata.hasDictionary() && columnMetadata.getMinValue() == null
-        && columnMetadata.getMaxValue() == null && !columnMetadata.isMinMaxValueInvalid();
+    return columnMetadata.getMinValue() == null && columnMetadata.getMaxValue() == null
+        && !columnMetadata.isMinMaxValueInvalid();
   }
 
   private void addColumnMinMaxValueForColumn(String columnName)
       throws Exception {
-    // Skip column without dictionary or with min/max value already set
+    // Skip column with min/max value already set
     ColumnMetadata columnMetadata = _segmentMetadata.getColumnMetadataFor(columnName);
-    if (!columnMetadata.hasDictionary() || columnMetadata.getMinValue() != null
-        || columnMetadata.getMaxValue() != null) {
+    if (columnMetadata.getMinValue() != null || columnMetadata.getMaxValue() != null) {
       return;
     }
 
-    PinotDataBuffer dictionaryBuffer = _segmentWriter.getIndexFor(columnName, ColumnIndexType.DICTIONARY);
     DataType dataType = columnMetadata.getDataType().getStoredType();
-    int length = columnMetadata.getCardinality();
-    switch (dataType) {
-      case INT:
-        try (IntDictionary intDictionary = new IntDictionary(dictionaryBuffer, length)) {
+    if (columnMetadata.hasDictionary()) {
+      PinotDataBuffer dictionaryBuffer = _segmentWriter.getIndexFor(columnName, StandardIndexes.dictionary());
+      int length = columnMetadata.getCardinality();
+      switch (dataType) {
+        case INT:
+          try (IntDictionary intDictionary = new IntDictionary(dictionaryBuffer, length)) {
+            SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
+                intDictionary.getStringValue(0), intDictionary.getStringValue(length - 1));
+          }
+          break;
+        case LONG:
+          try (LongDictionary longDictionary = new LongDictionary(dictionaryBuffer, length)) {
+            SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
+                longDictionary.getStringValue(0), longDictionary.getStringValue(length - 1));
+          }
+          break;
+        case FLOAT:
+          try (FloatDictionary floatDictionary = new FloatDictionary(dictionaryBuffer, length)) {
+            SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
+                floatDictionary.getStringValue(0), floatDictionary.getStringValue(length - 1));
+          }
+          break;
+        case DOUBLE:
+          try (DoubleDictionary doubleDictionary = new DoubleDictionary(dictionaryBuffer, length)) {
+            SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
+                doubleDictionary.getStringValue(0), doubleDictionary.getStringValue(length - 1));
+          }
+          break;
+        case STRING:
+          try (StringDictionary stringDictionary = new StringDictionary(dictionaryBuffer, length,
+              columnMetadata.getColumnMaxLength())) {
+            SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
+                stringDictionary.getStringValue(0), stringDictionary.getStringValue(length - 1));
+          }
+          break;
+        case BYTES:
+          try (BytesDictionary bytesDictionary = new BytesDictionary(dictionaryBuffer, length,
+              columnMetadata.getColumnMaxLength())) {
+            SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
+                bytesDictionary.getStringValue(0), bytesDictionary.getStringValue(length - 1));
+          }
+          break;
+        default:
+          throw new IllegalStateException("Unsupported data type: " + dataType + " for column: " + columnName);
+      }
+    } else {
+      // setting min/max for non-dictionary columns.
+      int numDocs = columnMetadata.getTotalDocs();
+      boolean isSingleValueField = _segmentMetadata.getSchema().getFieldSpecFor(columnName).isSingleValueField();
+      PinotDataBuffer forwardBuffer = _segmentWriter.getIndexFor(columnName, StandardIndexes.forward());
+      switch (dataType) {
+        case INT: {
+          int min = Integer.MAX_VALUE;
+          int max = Integer.MIN_VALUE;
+          if (isSingleValueField) {
+            try (FixedByteChunkSVForwardIndexReader rawIndexReader = new FixedByteChunkSVForwardIndexReader(
+                forwardBuffer, DataType.INT); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  int value = rawIndexReader.getInt(docId, readerContext);
+                  min = Math.min(min, value);
+                  max = Math.max(max, value);
+                }
+            }
+          } else {
+            try (FixedByteChunkMVForwardIndexReader rawIndexReader = new FixedByteChunkMVForwardIndexReader(
+                forwardBuffer, DataType.INT); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  int[] value = rawIndexReader.getIntMV(docId, readerContext);
+                  for (int i = 0; i < value.length; i++) {
+                    min = Math.min(min, value[i]);
+                    max = Math.max(max, value[i]);
+                  }
+                }
+            }
+          }
           SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
-              intDictionary.getStringValue(0), intDictionary.getStringValue(length - 1));
-        }
-        break;
-      case LONG:
-        try (LongDictionary longDictionary = new LongDictionary(dictionaryBuffer, length)) {
+              String.valueOf(min), String.valueOf(max));
+         }
+         break;
+        case LONG: {
+          long min = Long.MAX_VALUE;
+          long max = Long.MIN_VALUE;
+          if (isSingleValueField) {
+            try (FixedByteChunkSVForwardIndexReader rawIndexReader = new FixedByteChunkSVForwardIndexReader(
+                forwardBuffer, DataType.LONG); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  long value = rawIndexReader.getLong(docId, readerContext);
+                  min = Math.min(min, value);
+                  max = Math.max(max, value);
+                }
+            }
+          } else {
+            try (FixedByteChunkMVForwardIndexReader rawIndexReader = new FixedByteChunkMVForwardIndexReader(
+                forwardBuffer, DataType.LONG); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  long[] value = rawIndexReader.getLongMV(docId, readerContext);
+                  for (int i = 0; i < value.length; i++) {
+                    min = Math.min(min, value[i]);
+                    max = Math.max(max, value[i]);
+                  }
+                }
+            }
+          }
           SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
-              longDictionary.getStringValue(0), longDictionary.getStringValue(length - 1));
-        }
-        break;
-      case FLOAT:
-        try (FloatDictionary floatDictionary = new FloatDictionary(dictionaryBuffer, length)) {
+                String.valueOf(min), String.valueOf(max));
+         }
+         break;
+        case FLOAT: {
+          float min = Float.MAX_VALUE;
+          float max = Float.MIN_VALUE;
+          if (isSingleValueField) {
+            try (FixedByteChunkSVForwardIndexReader rawIndexReader = new FixedByteChunkSVForwardIndexReader(
+                forwardBuffer, DataType.FLOAT); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  float value = rawIndexReader.getFloat(docId, readerContext);
+                  min = Math.min(min, value);
+                  max = Math.max(max, value);
+                }
+            }
+          } else {
+            try (FixedByteChunkMVForwardIndexReader rawIndexReader = new FixedByteChunkMVForwardIndexReader(
+                forwardBuffer, DataType.FLOAT); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  float[] value = rawIndexReader.getFloatMV(docId, readerContext);
+                  for (int i = 0; i < value.length; i++) {
+                    min = Math.min(min, value[i]);
+                    max = Math.max(max, value[i]);
+                  }
+                }
+            }
+          }
           SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
-              floatDictionary.getStringValue(0), floatDictionary.getStringValue(length - 1));
-        }
-        break;
-      case DOUBLE:
-        try (DoubleDictionary doubleDictionary = new DoubleDictionary(dictionaryBuffer, length)) {
-          SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
-              doubleDictionary.getStringValue(0), doubleDictionary.getStringValue(length - 1));
-        }
-        break;
-      case STRING:
-        try (StringDictionary stringDictionary = new StringDictionary(dictionaryBuffer, length,
-            columnMetadata.getColumnMaxLength())) {
+                String.valueOf(min), String.valueOf(max));
+         }
+         break;
+        case DOUBLE: {
+          double min = Double.MAX_VALUE;
+          double max = Double.MIN_VALUE;
+          if (isSingleValueField) {
+            try (FixedByteChunkSVForwardIndexReader rawIndexReader = new FixedByteChunkSVForwardIndexReader(
+                forwardBuffer, DataType.DOUBLE); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  double value = rawIndexReader.getDouble(docId, readerContext);
+                  min = Math.min(min, value);
+                  max = Math.max(max, value);
+                }
+            }
+          } else {
+            try (FixedByteChunkMVForwardIndexReader rawIndexReader = new FixedByteChunkMVForwardIndexReader(
+                forwardBuffer, DataType.DOUBLE); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  double[] value = rawIndexReader.getDoubleMV(docId, readerContext);
+                  for (int i = 0; i < value.length; i++) {
+                    min = Math.min(min, value[i]);
+                    max = Math.max(max, value[i]);
+                  }
+                }
+            }
+          }
           SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
-              stringDictionary.getStringValue(0), stringDictionary.getStringValue(length - 1));
-        }
-        break;
-      case BYTES:
-        try (BytesDictionary bytesDictionary = new BytesDictionary(dictionaryBuffer, length,
-            columnMetadata.getColumnMaxLength())) {
+                String.valueOf(min), String.valueOf(max));
+          }
+          break;
+        case STRING: {
+          String min = null;
+          String max = null;
+          if (isSingleValueField) {
+            try (VarByteChunkSVForwardIndexReader rawIndexReader = new VarByteChunkSVForwardIndexReader(forwardBuffer,
+                DataType.STRING); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  String value = rawIndexReader.getString(docId, readerContext);
+                  if (min == null || StringUtils.compare(min, value) > 0) {
+                    min = value;
+                  }
+                  if (max == null || StringUtils.compare(max, value) < 0) {
+                    max = value;
+                  }
+                }
+            }
+          } else {
+            try (VarByteChunkMVForwardIndexReader rawIndexReader = new VarByteChunkMVForwardIndexReader(forwardBuffer,
+                DataType.STRING); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  String[] value = rawIndexReader.getStringMV(docId, readerContext);
+                  for (int i = 0; i < value.length; i++) {
+                    if (min == null || StringUtils.compare(min, value[i]) > 0) {
+                      min = value[i];
+                    }
+                    if (max == null || StringUtils.compare(max, value[i]) < 0) {
+                      max = value[i];
+                    }
+                  }
+                }
+            }
+          }
+          SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName, min, max);
+          }
+          break;
+        case BYTES: {
+          byte[] min = null;
+          byte[] max = null;
+          if (isSingleValueField) {
+            try (VarByteChunkSVForwardIndexReader rawIndexReader = new VarByteChunkSVForwardIndexReader(forwardBuffer,
+                DataType.BYTES); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  byte[] value = rawIndexReader.getBytes(docId, readerContext);
+                  if (min == null || ByteArray.compare(value, min) > 0) {
+                    min = value;
+                  }
+                  if (max == null || ByteArray.compare(value, max) < 0) {
+                    max = value;
+                  }
+                }
+            }
+          } else {
+            try (VarByteChunkMVForwardIndexReader rawIndexReader = new VarByteChunkMVForwardIndexReader(forwardBuffer,
+                DataType.BYTES); ChunkReaderContext readerContext = rawIndexReader.createContext()) {
+                for (int docId = 0; docId < numDocs; docId++) {
+                  byte[][] value = rawIndexReader.getBytesMV(docId, readerContext);
+                  for (int i = 0; i < value.length; i++) {
+                    if (min == null || ByteArray.compare(value[i], min) > 0) {
+                      min = value[i];
+                    }
+                    if (max == null || ByteArray.compare(value[i], max) < 0) {
+                      max = value[i];
+                    }
+                  }
+                }
+            }
+          }
           SegmentColumnarIndexCreator.addColumnMinMaxValueInfo(_segmentProperties, columnName,
-              bytesDictionary.getStringValue(0), bytesDictionary.getStringValue(length - 1));
-        }
-        break;
-      default:
-        throw new IllegalStateException("Unsupported data type: " + dataType + " for column: " + columnName);
+              String.valueOf(new ByteArray(min)), String.valueOf(new ByteArray(max)));
+          }
+          break;
+        default:
+          throw new IllegalStateException("Unsupported data type: " + dataType + " for column: " + columnName);
+      }
     }
-
     _minMaxValueAdded = true;
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/BaseDefaultColumnHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/BaseDefaultColumnHandler.java
index 5d647cd335e..f2148dce9ed 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/BaseDefaultColumnHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/BaseDefaultColumnHandler.java
@@ -25,12 +25,10 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.pinot.common.function.FunctionUtils;
 import org.apache.pinot.common.utils.PinotDataType;
@@ -41,7 +39,6 @@
 import org.apache.pinot.segment.local.segment.creator.impl.fwd.MultiValueUnsortedForwardIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueSortedForwardIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.fwd.SingleValueUnsortedForwardIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.BitSlicedRangeIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.OffHeapBitmapInvertedIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.nullvalue.NullValueVectorCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.BytesColumnPredIndexStatsCollector;
@@ -50,6 +47,8 @@
 import org.apache.pinot.segment.local.segment.creator.impl.stats.IntColumnPreIndexStatsCollector;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.LongColumnPreIndexStatsCollector;
 import org.apache.pinot.segment.local.segment.creator.impl.stats.StringColumnPreIndexStatsCollector;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
@@ -58,11 +57,11 @@
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.ColumnIndexCreationInfo;
 import org.apache.pinot.segment.spi.creator.StatsCollectorConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
 import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.utils.SegmentMetadataUtils;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -136,6 +135,9 @@ protected BaseDefaultColumnHandler(File indexDir, SegmentMetadata segmentMetadat
   @Override
   public boolean needUpdateDefaultColumns() {
     Map<String, DefaultColumnAction> defaultColumnActionMap = computeDefaultColumnActionMap();
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("Need to update default columns with actionMap: {}", defaultColumnActionMap);
+    }
     return !defaultColumnActionMap.isEmpty();
   }
 
@@ -147,6 +149,9 @@ public void updateDefaultColumns()
       throws Exception {
     // Compute the action needed for each column.
     Map<String, DefaultColumnAction> defaultColumnActionMap = computeDefaultColumnActionMap();
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("Update default columns with actionMap: {}", defaultColumnActionMap);
+    }
     if (defaultColumnActionMap.isEmpty()) {
       return;
     }
@@ -215,10 +220,11 @@ Map<String, DefaultColumnAction> computeDefaultColumnActionMap() {
     Map<String, DefaultColumnAction> defaultColumnActionMap = new HashMap<>();
 
     // Compute ADD and UPDATE actions.
-    Collection<String> columnsInSchema = _schema.getPhysicalColumnNames();
-    for (String column : columnsInSchema) {
-      FieldSpec fieldSpecInSchema = _schema.getFieldSpecFor(column);
-      Preconditions.checkNotNull(fieldSpecInSchema);
+    for (FieldSpec fieldSpecInSchema : _schema.getAllFieldSpecs()) {
+      if (fieldSpecInSchema.isVirtualColumn()) {
+        continue;
+      }
+      String column = fieldSpecInSchema.getName();
       FieldSpec.FieldType fieldTypeInSchema = fieldSpecInSchema.getFieldType();
       ColumnMetadata columnMetadata = _segmentMetadata.getColumnMetadataFor(column);
 
@@ -292,21 +298,17 @@ Map<String, DefaultColumnAction> computeDefaultColumnActionMap() {
     }
 
     // Compute REMOVE actions.
-    Set<String> columnsInMetadata = _segmentMetadata.getAllColumns();
-    for (String column : columnsInMetadata) {
-      if (!columnsInSchema.contains(column)) {
-        ColumnMetadata columnMetadata = _segmentMetadata.getColumnMetadataFor(column);
-
-        // Only remove auto-generated columns.
-        if (columnMetadata.isAutoGenerated()) {
-          FieldSpec.FieldType fieldTypeInMetadata = columnMetadata.getFieldSpec().getFieldType();
-          if (fieldTypeInMetadata == DIMENSION) {
-            defaultColumnActionMap.put(column, DefaultColumnAction.REMOVE_DIMENSION);
-          } else if (fieldTypeInMetadata == METRIC) {
-            defaultColumnActionMap.put(column, DefaultColumnAction.REMOVE_METRIC);
-          } else if (fieldTypeInMetadata == DATE_TIME) {
-            defaultColumnActionMap.put(column, DefaultColumnAction.REMOVE_DATE_TIME);
-          }
+    for (ColumnMetadata columnMetadata : _segmentMetadata.getColumnMetadataMap().values()) {
+      String column = columnMetadata.getColumnName();
+      // Only remove auto-generated columns
+      if (!_schema.hasColumn(column) && columnMetadata.isAutoGenerated()) {
+        FieldSpec.FieldType fieldTypeInMetadata = columnMetadata.getFieldSpec().getFieldType();
+        if (fieldTypeInMetadata == DIMENSION) {
+          defaultColumnActionMap.put(column, DefaultColumnAction.REMOVE_DIMENSION);
+        } else if (fieldTypeInMetadata == METRIC) {
+          defaultColumnActionMap.put(column, DefaultColumnAction.REMOVE_METRIC);
+        } else if (fieldTypeInMetadata == DATE_TIME) {
+          defaultColumnActionMap.put(column, DefaultColumnAction.REMOVE_DATE_TIME);
         }
       }
     }
@@ -331,8 +333,8 @@ protected void removeColumnIndices(String column)
     String segmentName = _segmentMetadata.getName();
     LOGGER.info("Removing default column: {} from segment: {}", column, segmentName);
     // Delete existing dictionary and forward index
-    _segmentWriter.removeIndex(column, ColumnIndexType.DICTIONARY);
-    _segmentWriter.removeIndex(column, ColumnIndexType.FORWARD_INDEX);
+    _segmentWriter.removeIndex(column, StandardIndexes.dictionary());
+    _segmentWriter.removeIndex(column, StandardIndexes.forward());
     // Remove the column metadata
     SegmentColumnarIndexCreator.removeColumnMetadataInfo(_segmentProperties, column);
     LOGGER.info("Removed default column: {} from segment: {}", column, segmentName);
@@ -365,7 +367,7 @@ protected boolean createColumnV1Indices(String column)
               return false;
             }
             // TODO: Support creation of derived columns from forward index disabled columns
-            if (!_segmentWriter.hasIndexFor(argument, ColumnIndexType.FORWARD_INDEX)) {
+            if (!_segmentWriter.hasIndexFor(argument, StandardIndexes.forward())) {
               throw new UnsupportedOperationException(String.format("Operation not supported! Cannot create a derived "
                   + "column %s because argument: %s does not have a forward index. Enable forward index and "
                   + "refresh/backfill the segments to create a derived column from source column %s", column, argument,
@@ -402,33 +404,6 @@ protected boolean createColumnV1Indices(String column)
     return true;
   }
 
-  /**
-   * Validates the compatibility of the indexes if the column has the forward index disabled. Throws exceptions due to
-   * compatibility mismatch. The checks performed are:
-   *     - Validate dictionary is enabled.
-   *     - Validate inverted index is enabled.
-   *     - Validate that either no range index exists for column or the range index version is at least 2 and isn't a
-   *       multi-value column (since multi-value defaults to index v1).
-   */
-  protected void validateForwardIndexDisabledConfigsIfPresent(String column, boolean forwardIndexDisabled) {
-    if (!forwardIndexDisabled) {
-      return;
-    }
-    FieldSpec fieldSpec = _schema.getFieldSpecFor(column);
-    Preconditions.checkState(_indexLoadingConfig.getInvertedIndexColumns().contains(column),
-          String.format("Inverted index must be enabled for forward index disabled column: %s", column));
-      Preconditions.checkState(!_indexLoadingConfig.getNoDictionaryColumns().contains(column),
-          String.format("Dictionary disabled column: %s cannot disable the forward index", column));
-      if (_indexLoadingConfig.getRangeIndexColumns() != null
-          && _indexLoadingConfig.getRangeIndexColumns().contains(column)) {
-        Preconditions.checkState(fieldSpec.isSingleValueField(),
-            String.format("Multi-value column with range index: %s cannot disable the forward index", column));
-        Preconditions.checkState(_indexLoadingConfig.getRangeIndexVersion() == BitSlicedRangeIndexCreator.VERSION,
-            String.format("Single-value column with range index version < 2: %s cannot disable the forward index",
-                column));
-      }
-  }
-
   /**
    * Check and return whether the forward index is disabled for a given column
    */
@@ -450,9 +425,6 @@ private void createDefaultValueColumnV1Indices(String column)
     Object defaultValue = fieldSpec.getDefaultNullValue();
     boolean isSingleValue = fieldSpec.isSingleValueField();
     int maxNumberOfMultiValueElements = isSingleValue ? 0 : 1;
-    boolean forwardIndexDisabled = isForwardIndexDisabled(column);
-
-    validateForwardIndexDisabledConfigsIfPresent(column, forwardIndexDisabled);
 
     Object sortedArray;
     switch (dataType.getStoredType()) {
@@ -519,12 +491,14 @@ private void createDefaultValueColumnV1Indices(String column)
     } else {
       // Multi-value column.
 
+      boolean forwardIndexDisabled = isForwardIndexDisabled(column);
       if (forwardIndexDisabled) {
         // Generate an inverted index instead of forward index for multi-value columns when forward index is disabled
         try (DictionaryBasedInvertedIndexCreator creator = new OffHeapBitmapInvertedIndexCreator(_indexDir, fieldSpec,
             1, totalDocs, totalDocs)) {
+          int[] dictIds = new int[]{0};
           for (int docId = 0; docId < totalDocs; docId++) {
-            creator.add(0);
+            creator.add(dictIds, 1);
           }
           creator.seal();
         }
@@ -543,7 +517,7 @@ private void createDefaultValueColumnV1Indices(String column)
     if (_indexLoadingConfig.getTableConfig() != null
         && _indexLoadingConfig.getTableConfig().getIndexingConfig() != null
         && _indexLoadingConfig.getTableConfig().getIndexingConfig().isNullHandlingEnabled()) {
-      if (!_segmentWriter.hasIndexFor(column, ColumnIndexType.NULLVALUE_VECTOR)) {
+      if (!_segmentWriter.hasIndexFor(column, StandardIndexes.nullValueVector())) {
         try (NullValueVectorCreator nullValueVectorCreator =
             new NullValueVectorCreator(_indexDir, fieldSpec.getName())) {
           for (int docId = 0; docId < totalDocs; docId++) {
@@ -809,9 +783,9 @@ private class ValueReader implements Closeable {
 
     ValueReader(ColumnMetadata columnMetadata)
         throws IOException {
-      _forwardIndexReader = LoaderUtils.getForwardIndexReader(_segmentWriter, columnMetadata);
+      _forwardIndexReader = ForwardIndexType.read(_segmentWriter, columnMetadata);
       if (columnMetadata.hasDictionary()) {
-        _dictionary = LoaderUtils.getDictionary(_segmentWriter, columnMetadata);
+        _dictionary = DictionaryIndexType.read(_segmentWriter, columnMetadata);
       } else {
         _dictionary = null;
       }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/V3DefaultColumnHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/V3DefaultColumnHandler.java
index 30af7457f67..4f8dc7e8bee 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/V3DefaultColumnHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/V3DefaultColumnHandler.java
@@ -23,8 +23,8 @@
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.Schema;
@@ -79,17 +79,17 @@ protected boolean updateDefaultColumn(String column, DefaultColumnAction action)
       }
     }
     if (forwardIndexFile != null) {
-      LoaderUtils.writeIndexToV3Format(_segmentWriter, column, forwardIndexFile, ColumnIndexType.FORWARD_INDEX);
+      LoaderUtils.writeIndexToV3Format(_segmentWriter, column, forwardIndexFile, StandardIndexes.forward());
     }
     if (invertedIndexFile != null) {
-      LoaderUtils.writeIndexToV3Format(_segmentWriter, column, invertedIndexFile, ColumnIndexType.INVERTED_INDEX);
+      LoaderUtils.writeIndexToV3Format(_segmentWriter, column, invertedIndexFile, StandardIndexes.inverted());
     }
     File dictionaryFile = new File(_indexDir, column + V1Constants.Dict.FILE_EXTENSION);
-    LoaderUtils.writeIndexToV3Format(_segmentWriter, column, dictionaryFile, ColumnIndexType.DICTIONARY);
+    LoaderUtils.writeIndexToV3Format(_segmentWriter, column, dictionaryFile, StandardIndexes.dictionary());
 
     File nullValueVectorFile = new File(_indexDir, column + V1Constants.Indexes.NULLVALUE_VECTOR_FILE_EXTENSION);
     if (nullValueVectorFile.exists()) {
-      LoaderUtils.writeIndexToV3Format(_segmentWriter, column, nullValueVectorFile, ColumnIndexType.NULLVALUE_VECTOR);
+      LoaderUtils.writeIndexToV3Format(_segmentWriter, column, nullValueVectorFile, StandardIndexes.nullValueVector());
     }
     return true;
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/FSTIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/FSTIndexHandler.java
index 892915ddd26..e387ba39293 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/FSTIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/FSTIndexHandler.java
@@ -20,24 +20,26 @@
 package org.apache.pinot.segment.local.segment.index.loader.invertedindex;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.local.segment.index.loader.SegmentPreProcessor;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
-import org.apache.pinot.segment.spi.creator.TextIndexCreatorProvider;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.FstIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.FSTIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
-import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,19 +69,18 @@ public class FSTIndexHandler extends BaseIndexHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(FSTIndexHandler.class);
 
   private final Set<String> _columnsToAddIdx;
-  private final FSTType _fstType;
 
-  public FSTIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
-    super(segmentDirectory, indexLoadingConfig);
-    _fstType = indexLoadingConfig.getFSTIndexType();
-    _columnsToAddIdx = indexLoadingConfig.getFSTIndexColumns();
+  public FSTIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _columnsToAddIdx = FieldIndexConfigsUtil.columnsWithIndexEnabled(StandardIndexes.fst(), _fieldIndexConfigs);
   }
 
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
-    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.FST_INDEX);
+    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.fst());
     // Check if any existing index need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
@@ -99,23 +100,23 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception {
     // Remove indices not set in table config any more
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
-    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.FST_INDEX);
+    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.fst());
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
         LOGGER.info("Removing existing FST index from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.FST_INDEX);
+        segmentWriter.removeIndex(column, StandardIndexes.fst());
         LOGGER.info("Removed existing FST index from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddIdx) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateFSTIndex(columnMetadata)) {
-        createFSTIndexForColumn(segmentWriter, columnMetadata, indexCreatorProvider);
+        createFSTIndexForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -150,9 +151,8 @@ private void checkUnsupportedOperationsForFSTIndex(ColumnMetadata columnMetadata
     }
   }
 
-  private void createFSTIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      TextIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void createFSTIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     String columnName = columnMetadata.getColumnName();
@@ -169,20 +169,23 @@ private void createFSTIndexForColumn(SegmentDirectory.Writer segmentWriter, Colu
     LOGGER.info("Creating new FST index for column: {} in segment: {}, cardinality: {}", columnName, segmentName,
         columnMetadata.getCardinality());
 
-    TextIndexCreator fstIndexCreator = indexCreatorProvider.newTextIndexCreator(
-        IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-            .forFSTIndex(_fstType, null));
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    FstIndexConfig config = _fieldIndexConfigs.get(columnName).getConfig(StandardIndexes.fst());
 
-    try (Dictionary dictionary = LoaderUtils.getDictionary(segmentWriter, columnMetadata)) {
+    try (FSTIndexCreator fstIndexCreator = StandardIndexes.fst().createIndexCreator(context, config);
+        Dictionary dictionary = DictionaryIndexType.read(segmentWriter, columnMetadata)) {
       for (int dictId = 0; dictId < dictionary.length(); dictId++) {
         fstIndexCreator.add(dictionary.getStringValue(dictId));
       }
+      fstIndexCreator.seal();
     }
-    fstIndexCreator.seal();
 
     // For v3, write the generated range index file into the single file and remove it.
     if (_segmentDirectory.getSegmentMetadata().getVersion() == SegmentVersion.v3) {
-      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, fstIndexFile, ColumnIndexType.FST_INDEX);
+      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, fstIndexFile, StandardIndexes.fst());
     }
 
     // Delete the marker file.
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/H3IndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/H3IndexHandler.java
index 603e7d515fc..f55903ff319 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/H3IndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/H3IndexHandler.java
@@ -20,28 +20,29 @@
 
 import com.google.common.base.Preconditions;
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.creator.GeoSpatialIndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
 import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,16 +54,17 @@ public class H3IndexHandler extends BaseIndexHandler {
 
   private final Map<String, H3IndexConfig> _h3Configs;
 
-  public H3IndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
-    super(segmentDirectory, indexLoadingConfig);
-    _h3Configs = indexLoadingConfig.getH3IndexConfigs();
+  public H3IndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _h3Configs = FieldIndexConfigsUtil.enableConfigByColumn(StandardIndexes.h3(), _fieldIndexConfigs);
   }
 
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_h3Configs.keySet());
-    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.H3_INDEX);
+    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.h3());
     // Check if any existing index need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
@@ -82,23 +84,23 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception {
     Set<String> columnsToAddIdx = new HashSet<>(_h3Configs.keySet());
     // Remove indices not set in table config any more
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
-    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.H3_INDEX);
+    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.h3());
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
         LOGGER.info("Removing existing H3 index from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.H3_INDEX);
+        segmentWriter.removeIndex(column, StandardIndexes.h3());
         LOGGER.info("Removed existing H3 index from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddIdx) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateH3Index(columnMetadata)) {
-        createH3IndexForColumn(segmentWriter, columnMetadata, indexCreatorProvider, indexCreatorProvider);
+        createH3IndexForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -107,8 +109,7 @@ private boolean shouldCreateH3Index(ColumnMetadata columnMetadata) {
     return columnMetadata != null;
   }
 
-  private void createH3IndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      GeoSpatialIndexCreatorProvider geoSpatialIndexCreatorProvider, IndexCreatorProvider indexCreatorProvider)
+  private void createH3IndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
       throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
@@ -128,21 +129,21 @@ private void createH3IndexForColumn(SegmentDirectory.Writer segmentWriter, Colum
     }
 
     // Create a temporary forward index if it is disabled and does not exist
-    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, indexCreatorProvider, true);
+    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, true);
 
     // Create new H3 index for the column.
     LOGGER.info("Creating new H3 index for segment: {}, column: {}", segmentName, columnName);
     Preconditions
         .checkState(columnMetadata.getDataType() == DataType.BYTES, "H3 index can only be applied to BYTES columns");
     if (columnMetadata.hasDictionary()) {
-      handleDictionaryBasedColumn(segmentWriter, columnMetadata, geoSpatialIndexCreatorProvider);
+      handleDictionaryBasedColumn(segmentWriter, columnMetadata);
     } else {
-      handleNonDictionaryBasedColumn(segmentWriter, columnMetadata, geoSpatialIndexCreatorProvider);
+      handleNonDictionaryBasedColumn(segmentWriter, columnMetadata);
     }
 
     // For v3, write the generated H3 index file into the single file and remove it.
     if (_segmentDirectory.getSegmentMetadata().getVersion() == SegmentVersion.v3) {
-      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, h3IndexFile, ColumnIndexType.H3_INDEX);
+      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, h3IndexFile, StandardIndexes.h3());
     }
 
     // Delete the marker file.
@@ -151,17 +152,25 @@ private void createH3IndexForColumn(SegmentDirectory.Writer segmentWriter, Colum
     LOGGER.info("Created H3 index for segment: {}, column: {}", segmentName, columnName);
   }
 
-  private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      GeoSpatialIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String columnName = columnMetadata.getColumnName();
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+
+    FieldIndexConfigs colIndexConf = _fieldIndexConfigs.get(columnName);
+
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    H3IndexConfig config = colIndexConf.getConfig(StandardIndexes.h3());
+
+    try (ForwardIndexReader forwardIndexReader = StandardIndexes.forward().getReaderFactory()
+        .createIndexReader(segmentWriter, colIndexConf, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        Dictionary dictionary = LoaderUtils.getDictionary(segmentWriter, columnMetadata);
-        GeoSpatialIndexCreator h3IndexCreator = indexCreatorProvider.newGeoSpatialIndexCreator(
-            IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata)
-                .build().forGeospatialIndex(_h3Configs.get(columnName)))) {
+        Dictionary dictionary = StandardIndexes.dictionary().getReaderFactory()
+            .createIndexReader(segmentWriter, colIndexConf, columnMetadata);
+        GeoSpatialIndexCreator h3IndexCreator = StandardIndexes.h3().createIndexCreator(context, config)) {
       int numDocs = columnMetadata.getTotalDocs();
       for (int i = 0; i < numDocs; i++) {
         int dictId = forwardIndexReader.getDictId(i, readerContext);
@@ -171,16 +180,18 @@ private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter,
     }
   }
 
-  private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      GeoSpatialIndexCreatorProvider indexCreatorProvider)
+  private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
       throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String columnName = columnMetadata.getColumnName();
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    H3IndexConfig config = _fieldIndexConfigs.get(columnName).getConfig(StandardIndexes.h3());
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        GeoSpatialIndexCreator h3IndexCreator = indexCreatorProvider.newGeoSpatialIndexCreator(
-            IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata)
-                .build().forGeospatialIndex(_h3Configs.get(columnName)))) {
+        GeoSpatialIndexCreator h3IndexCreator = StandardIndexes.h3().createIndexCreator(context, config)) {
       int numDocs = columnMetadata.getTotalDocs();
       for (int i = 0; i < numDocs; i++) {
         h3IndexCreator.add(GeometrySerializer.deserialize(forwardIndexReader.getBytes(i, readerContext)));
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/InvertedIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/InvertedIndexHandler.java
index b273c4017c4..857e00d79fb 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/InvertedIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/InvertedIndexHandler.java
@@ -19,24 +19,27 @@
 package org.apache.pinot.segment.local.segment.index.loader.invertedindex;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.creator.InvertedIndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,9 +50,10 @@ public class InvertedIndexHandler extends BaseIndexHandler {
 
   private final Set<String> _columnsToAddIdx;
 
-  public InvertedIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
-    super(segmentDirectory, indexLoadingConfig);
-    _columnsToAddIdx = indexLoadingConfig.getInvertedIndexColumns();
+  public InvertedIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _columnsToAddIdx = FieldIndexConfigsUtil.columnsWithIndexEnabled(StandardIndexes.inverted(), _fieldIndexConfigs);
   }
 
   @Override
@@ -57,7 +61,7 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
     Set<String> existingColumns =
-        segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.INVERTED_INDEX);
+        segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.inverted());
     // Check if any existing index need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
@@ -77,24 +81,24 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
+      throws Exception {
     // Remove indices not set in table config any more.
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
     Set<String> existingColumns =
-        segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.INVERTED_INDEX);
+        segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.inverted());
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
         LOGGER.info("Removing existing inverted index from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.INVERTED_INDEX);
+        segmentWriter.removeIndex(column, StandardIndexes.inverted());
         LOGGER.info("Removed existing inverted index from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddIdx) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateInvertedIndex(columnMetadata)) {
-        createInvertedIndexForColumn(segmentWriter, columnMetadata, indexCreatorProvider);
+        createInvertedIndexForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -109,9 +113,8 @@ private boolean shouldCreateInvertedIndex(ColumnMetadata columnMetadata) {
     return columnMetadata != null && !columnMetadata.isSorted() && columnMetadata.hasDictionary();
   }
 
-  private void createInvertedIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      InvertedIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void createInvertedIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     String columnName = columnMetadata.getColumnName();
@@ -132,10 +135,15 @@ private void createInvertedIndexForColumn(SegmentDirectory.Writer segmentWriter,
     // Create new inverted index for the column.
     LOGGER.info("Creating new inverted index for segment: {}, column: {}", segmentName, columnName);
     int numDocs = columnMetadata.getTotalDocs();
-    try (DictionaryBasedInvertedIndexCreator creator = indexCreatorProvider.newInvertedIndexCreator(
-        IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-            .forInvertedIndex())) {
-      try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+
+    IndexCreationContext.Common context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+
+    try (DictionaryBasedInvertedIndexCreator creator = StandardIndexes.inverted()
+        .createIndexCreator(context, IndexConfig.ENABLED)) {
+      try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
           ForwardIndexReaderContext readerContext = forwardIndexReader.createContext()) {
         if (columnMetadata.isSingleValue()) {
           // Single-value column.
@@ -156,7 +164,7 @@ private void createInvertedIndexForColumn(SegmentDirectory.Writer segmentWriter,
 
     // For v3, write the generated inverted index file into the single file and remove it.
     if (_segmentDirectory.getSegmentMetadata().getVersion() == SegmentVersion.v3) {
-      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, invertedIndexFile, ColumnIndexType.INVERTED_INDEX);
+      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, invertedIndexFile, StandardIndexes.inverted());
     }
 
     // Delete the marker file.
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/JsonIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/JsonIndexHandler.java
index c7271018546..4c7c14bf2d8 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/JsonIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/JsonIndexHandler.java
@@ -20,27 +20,29 @@
 
 import com.google.common.base.Preconditions;
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.creator.JsonIndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.config.table.JsonIndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,16 +54,17 @@ public class JsonIndexHandler extends BaseIndexHandler {
 
   private final Map<String, JsonIndexConfig> _jsonIndexConfigs;
 
-  public JsonIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
-    super(segmentDirectory, indexLoadingConfig);
-    _jsonIndexConfigs = indexLoadingConfig.getJsonIndexConfigs();
+  public JsonIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _jsonIndexConfigs = FieldIndexConfigsUtil.enableConfigByColumn(StandardIndexes.json(), _fieldIndexConfigs);
   }
 
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_jsonIndexConfigs.keySet());
-    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.JSON_INDEX);
+    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.json());
     // Check if any existing index need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
@@ -81,23 +84,23 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception {
     // Remove indices not set in table config any more
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_jsonIndexConfigs.keySet());
-    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.JSON_INDEX);
+    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.json());
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
         LOGGER.info("Removing existing json index from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.JSON_INDEX);
+        segmentWriter.removeIndex(column, StandardIndexes.json());
         LOGGER.info("Removed existing json index from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddIdx) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateJsonIndex(columnMetadata)) {
-        createJsonIndexForColumn(segmentWriter, columnMetadata, indexCreatorProvider, indexCreatorProvider);
+        createJsonIndexForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -106,8 +109,7 @@ private boolean shouldCreateJsonIndex(ColumnMetadata columnMetadata) {
     return columnMetadata != null;
   }
 
-  private void createJsonIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      JsonIndexCreatorProvider jsonIndexCreatorProvider, IndexCreatorProvider indexCreatorProvider)
+  private void createJsonIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
       throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
@@ -127,7 +129,7 @@ private void createJsonIndexForColumn(SegmentDirectory.Writer segmentWriter, Col
     }
 
     // Create a temporary forward index if it is disabled and does not exist
-    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, indexCreatorProvider, true);
+    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, true);
 
     // Create new json index for the column.
     LOGGER.info("Creating new json index for segment: {}, column: {}", segmentName, columnName);
@@ -135,14 +137,14 @@ private void createJsonIndexForColumn(SegmentDirectory.Writer segmentWriter, Col
             || columnMetadata.getDataType() == DataType.JSON),
         "Json index can only be applied to single-value STRING or JSON columns");
     if (columnMetadata.hasDictionary()) {
-      handleDictionaryBasedColumn(segmentWriter, columnMetadata, jsonIndexCreatorProvider);
+      handleDictionaryBasedColumn(segmentWriter, columnMetadata);
     } else {
-      handleNonDictionaryBasedColumn(segmentWriter, columnMetadata, jsonIndexCreatorProvider);
+      handleNonDictionaryBasedColumn(segmentWriter, columnMetadata);
     }
 
     // For v3, write the generated json index file into the single file and remove it.
     if (_segmentDirectory.getSegmentMetadata().getVersion() == SegmentVersion.v3) {
-      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, jsonIndexFile, ColumnIndexType.JSON_INDEX);
+      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, jsonIndexFile, StandardIndexes.json());
     }
 
     // Delete the marker file.
@@ -151,17 +153,19 @@ private void createJsonIndexForColumn(SegmentDirectory.Writer segmentWriter, Col
     LOGGER.info("Created json index for segment: {}, column: {}", segmentName, columnName);
   }
 
-  private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      JsonIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String columnName = columnMetadata.getColumnName();
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    JsonIndexConfig config = _jsonIndexConfigs.get(columnName);
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        Dictionary dictionary = LoaderUtils.getDictionary(segmentWriter, columnMetadata);
-        JsonIndexCreator jsonIndexCreator = indexCreatorProvider.newJsonIndexCreator(
-            IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-                .forJsonIndex(_jsonIndexConfigs.get(columnName)))) {
+        Dictionary dictionary = DictionaryIndexType.read(segmentWriter, columnMetadata);
+        JsonIndexCreator jsonIndexCreator = StandardIndexes.json().createIndexCreator(context, config)) {
       int numDocs = columnMetadata.getTotalDocs();
       for (int i = 0; i < numDocs; i++) {
         int dictId = forwardIndexReader.getDictId(i, readerContext);
@@ -171,16 +175,18 @@ private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter,
     }
   }
 
-  private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      JsonIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String columnName = columnMetadata.getColumnName();
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    JsonIndexConfig config = _jsonIndexConfigs.get(columnName);
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        JsonIndexCreator jsonIndexCreator = indexCreatorProvider.newJsonIndexCreator(
-            IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-                .forJsonIndex(_jsonIndexConfigs.get(columnName)))) {
+        JsonIndexCreator jsonIndexCreator = StandardIndexes.json().createIndexCreator(context, config)) {
       int numDocs = columnMetadata.getTotalDocs();
       for (int i = 0; i < numDocs; i++) {
         jsonIndexCreator.add(forwardIndexReader.getString(i, readerContext));
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/RangeIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/RangeIndexHandler.java
index 8c39a9dc6fc..f53aa78d780 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/RangeIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/RangeIndexHandler.java
@@ -18,25 +18,30 @@
  */
 package org.apache.pinot.segment.local.segment.index.loader.invertedindex;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
 import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
 import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.creator.RangeIndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,19 +51,24 @@ public class RangeIndexHandler extends BaseIndexHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(RangeIndexHandler.class);
 
   private final Set<String> _columnsToAddIdx;
-  private final int _rangeIndexVersion;
 
+  @VisibleForTesting
   public RangeIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
     super(segmentDirectory, indexLoadingConfig);
     _columnsToAddIdx = indexLoadingConfig.getRangeIndexColumns();
-    _rangeIndexVersion = indexLoadingConfig.getRangeIndexVersion();
+  }
+
+  public RangeIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _columnsToAddIdx = FieldIndexConfigsUtil.columnsWithIndexEnabled(StandardIndexes.range(), _fieldIndexConfigs);
   }
 
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
-    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.RANGE_INDEX);
+    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.range());
     // Check if any existing index need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
@@ -78,23 +88,23 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
+      throws Exception {
     // Remove indices not set in table config any more
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
-    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.RANGE_INDEX);
+    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.range());
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
         LOGGER.info("Removing existing range index from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.RANGE_INDEX);
+        segmentWriter.removeIndex(column, StandardIndexes.range());
         LOGGER.info("Removed existing range index from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddIdx) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateRangeIndex(columnMetadata)) {
-        createRangeIndexForColumn(segmentWriter, columnMetadata, indexCreatorProvider, indexCreatorProvider);
+        createRangeIndexForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -104,9 +114,8 @@ private boolean shouldCreateRangeIndex(ColumnMetadata columnMetadata) {
     return columnMetadata != null && !columnMetadata.isSorted();
   }
 
-  private void createRangeIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      RangeIndexCreatorProvider rangeIndexCreatorProvider, IndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void createRangeIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     String columnName = columnMetadata.getColumnName();
@@ -125,19 +134,19 @@ private void createRangeIndexForColumn(SegmentDirectory.Writer segmentWriter, Co
     }
 
     // Create a temporary forward index if it is disabled and does not exist
-    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, indexCreatorProvider, true);
+    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, true);
 
     // Create new range index for the column.
     LOGGER.info("Creating new range index for segment: {}, column: {}", segmentName, columnName);
     if (columnMetadata.hasDictionary()) {
-      handleDictionaryBasedColumn(segmentWriter, columnMetadata, rangeIndexCreatorProvider);
+      handleDictionaryBasedColumn(segmentWriter, columnMetadata);
     } else {
-      handleNonDictionaryBasedColumn(segmentWriter, columnMetadata, rangeIndexCreatorProvider);
+      handleNonDictionaryBasedColumn(segmentWriter, columnMetadata);
     }
 
     // For v3, write the generated range index file into the single file and remove it.
     if (_segmentDirectory.getSegmentMetadata().getVersion() == SegmentVersion.v3) {
-      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, rangeIndexFile, ColumnIndexType.RANGE_INDEX);
+      LoaderUtils.writeIndexToV3Format(segmentWriter, columnName, rangeIndexFile, StandardIndexes.range());
     }
 
     // Delete the marker file.
@@ -146,13 +155,12 @@ private void createRangeIndexForColumn(SegmentDirectory.Writer segmentWriter, Co
     LOGGER.info("Created range index for segment: {}, column: {}", segmentName, columnName);
   }
 
-  private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      RangeIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     int numDocs = columnMetadata.getTotalDocs();
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        CombinedInvertedIndexCreator rangeIndexCreator = newRangeIndexCreator(columnMetadata, indexCreatorProvider)) {
+        CombinedInvertedIndexCreator rangeIndexCreator = newRangeIndexCreator(columnMetadata)) {
       if (columnMetadata.isSingleValue()) {
         // Single-value column
         for (int i = 0; i < numDocs; i++) {
@@ -170,13 +178,12 @@ private void handleDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter,
     }
   }
 
-  private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      RangeIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
+      throws Exception {
     int numDocs = columnMetadata.getTotalDocs();
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        CombinedInvertedIndexCreator rangeIndexCreator = newRangeIndexCreator(columnMetadata, indexCreatorProvider)) {
+        CombinedInvertedIndexCreator rangeIndexCreator = newRangeIndexCreator(columnMetadata)) {
       if (columnMetadata.isSingleValue()) {
         // Single-value column.
         switch (columnMetadata.getDataType()) {
@@ -243,12 +250,15 @@ private void handleNonDictionaryBasedColumn(SegmentDirectory.Writer segmentWrite
     }
   }
 
-  private CombinedInvertedIndexCreator newRangeIndexCreator(ColumnMetadata columnMetadata,
-      RangeIndexCreatorProvider indexCreatorProvider)
-      throws IOException {
+  private CombinedInvertedIndexCreator newRangeIndexCreator(ColumnMetadata columnMetadata)
+      throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
-    return indexCreatorProvider.newRangeIndexCreator(
-        IndexCreationContext.builder().withIndexDir(indexDir).withColumnMetadata(columnMetadata).build()
-            .forRangeIndex(_rangeIndexVersion));
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withIndexDir(indexDir)
+        .withColumnMetadata(columnMetadata)
+        .build();
+    RangeIndexConfig config = _fieldIndexConfigs.get(columnMetadata.getColumnName())
+        .getConfig(StandardIndexes.range());
+    return StandardIndexes.range().createIndexCreator(context, config);
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/TextIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/TextIndexHandler.java
index 61dafff36c3..2dddcc30cec 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/TextIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/invertedindex/TextIndexHandler.java
@@ -41,23 +41,24 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.BaseIndexHandler;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
-import org.apache.pinot.segment.local.segment.index.loader.LoaderUtils;
 import org.apache.pinot.segment.local.segment.index.loader.SegmentPreProcessor;
-import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.creator.TextIndexCreatorProvider;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
-import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,21 +87,18 @@ public class TextIndexHandler extends BaseIndexHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(TextIndexHandler.class);
 
   private final Set<String> _columnsToAddIdx;
-  private final FSTType _fstType;
-  private final Map<String, Map<String, String>> _columnProperties;
 
-  public TextIndexHandler(SegmentDirectory segmentDirectory, IndexLoadingConfig indexLoadingConfig) {
-    super(segmentDirectory, indexLoadingConfig);
-    _fstType = indexLoadingConfig.getFSTIndexType();
-    _columnsToAddIdx = indexLoadingConfig.getTextIndexColumns();
-    _columnProperties = indexLoadingConfig.getColumnProperties();
+  public TextIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> fieldIndexConfigs,
+      @Nullable TableConfig tableConfig) {
+    super(segmentDirectory, fieldIndexConfigs, tableConfig);
+    _columnsToAddIdx = FieldIndexConfigsUtil.columnsWithIndexEnabled(StandardIndexes.text(), _fieldIndexConfigs);
   }
 
   @Override
   public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
-    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.TEXT_INDEX);
+    Set<String> existingColumns = segmentReader.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.text());
     // Check if any existing index need to be removed.
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
@@ -120,23 +118,23 @@ public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
   }
 
   @Override
-  public void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  public void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception {
     // Remove indices not set in table config any more
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
     Set<String> columnsToAddIdx = new HashSet<>(_columnsToAddIdx);
-    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(ColumnIndexType.TEXT_INDEX);
+    Set<String> existingColumns = segmentWriter.toSegmentDirectory().getColumnsWithIndex(StandardIndexes.text());
     for (String column : existingColumns) {
       if (!columnsToAddIdx.remove(column)) {
         LOGGER.info("Removing existing text index from segment: {}, column: {}", segmentName, column);
-        segmentWriter.removeIndex(column, ColumnIndexType.TEXT_INDEX);
+        segmentWriter.removeIndex(column, StandardIndexes.text());
         LOGGER.info("Removed existing text index from segment: {}, column: {}", segmentName, column);
       }
     }
     for (String column : columnsToAddIdx) {
       ColumnMetadata columnMetadata = _segmentDirectory.getSegmentMetadata().getColumnMetadataFor(column);
       if (shouldCreateTextIndex(columnMetadata)) {
-        createTextIndexForColumn(segmentWriter, columnMetadata, indexCreatorProvider, indexCreatorProvider);
+        createTextIndexForColumn(segmentWriter, columnMetadata);
       }
     }
   }
@@ -162,8 +160,7 @@ private void checkUnsupportedOperationsForTextIndex(ColumnMetadata columnMetadat
     }
   }
 
-  private void createTextIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata,
-      TextIndexCreatorProvider textIndexCreatorProvider, IndexCreatorProvider indexCreatorProvider)
+  private void createTextIndexForColumn(SegmentDirectory.Writer segmentWriter, ColumnMetadata columnMetadata)
       throws Exception {
     File indexDir = _segmentDirectory.getSegmentMetadata().getIndexDir();
     String segmentName = _segmentDirectory.getSegmentMetadata().getName();
@@ -172,7 +169,7 @@ private void createTextIndexForColumn(SegmentDirectory.Writer segmentWriter, Col
     boolean hasDictionary = columnMetadata.hasDictionary();
 
     // Create a temporary forward index if it is disabled and does not exist
-    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, indexCreatorProvider, true);
+    columnMetadata = createForwardIndexIfNeeded(segmentWriter, columnName, true);
 
     LOGGER.info("Creating new text index for column: {} in segment: {}, hasDictionary: {}", columnName, segmentName,
         hasDictionary);
@@ -183,12 +180,17 @@ private void createTextIndexForColumn(SegmentDirectory.Writer segmentWriter, Col
     // segmentDirectory is indicated to us by SegmentDirectoryPaths, we create lucene index there. There is no
     // further need to move around the lucene index directory since it is created with correct directory structure
     // based on segmentVersion.
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(segmentWriter, columnMetadata);
+
+    IndexCreationContext context = IndexCreationContext.builder()
+        .withColumnMetadata(columnMetadata)
+        .withIndexDir(segmentDirectory)
+        .withTextCommitOnClose(true)
+        .build();
+    TextIndexConfig config = _fieldIndexConfigs.get(columnName).getConfig(StandardIndexes.text());
+
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(segmentWriter, columnMetadata);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext();
-        TextIndexCreator textIndexCreator = textIndexCreatorProvider.newTextIndexCreator(IndexCreationContext.builder()
-            .withColumnMetadata(columnMetadata).withIndexDir(segmentDirectory).build().forTextIndex(_fstType, true,
-                TextIndexUtils.extractStopWordsInclude(columnName, _columnProperties),
-                TextIndexUtils.extractStopWordsExclude(columnName, _columnProperties)))) {
+        TextIndexCreator textIndexCreator = StandardIndexes.text().createIndexCreator(context, config)) {
       if (columnMetadata.isSingleValue()) {
         processSVField(segmentWriter, hasDictionary, forwardIndexReader, readerContext, textIndexCreator, numDocs,
             columnMetadata);
@@ -215,7 +217,7 @@ private void processSVField(SegmentDirectory.Writer segmentWriter, boolean hasDi
       // text index on dictionary encoded SV column
       // read forward index to get dictId
       // read the raw value from dictionary using dictId
-      try (Dictionary dictionary = LoaderUtils.getDictionary(segmentWriter, columnMetadata)) {
+      try (Dictionary dictionary = DictionaryIndexType.read(segmentWriter, columnMetadata)) {
         for (int docId = 0; docId < numDocs; docId++) {
           int dictId = forwardIndexReader.getDictId(docId, readerContext);
           textIndexCreator.add(dictionary.getStringValue(dictId));
@@ -239,7 +241,7 @@ private void processMVField(SegmentDirectory.Writer segmentWriter, boolean hasDi
       // text index on dictionary encoded MV column
       // read forward index to get dictId
       // read the raw value from dictionary using dictId
-      try (Dictionary dictionary = LoaderUtils.getDictionary(segmentWriter, columnMetadata)) {
+      try (Dictionary dictionary = DictionaryIndexType.read(segmentWriter, columnMetadata)) {
         int maxNumEntries = columnMetadata.getMaxNumberOfMultiValues();
         int[] dictIdBuffer = new int[maxNumEntries];
         String[] valueBuffer = new String[maxNumEntries];
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/nullvalue/NullValueIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/nullvalue/NullValueIndexPlugin.java
new file mode 100644
index 00000000000..ea1681426e3
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/nullvalue/NullValueIndexPlugin.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pinot.segment.local.segment.index.nullvalue;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+
+@AutoService(IndexPlugin.class)
+public class NullValueIndexPlugin implements IndexPlugin<NullValueIndexType> {
+
+  public static final NullValueIndexType INSTANCE = new NullValueIndexType();
+  @Override
+  public NullValueIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/nullvalue/NullValueIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/nullvalue/NullValueIndexType.java
new file mode 100644
index 00000000000..1c6b5faea9e
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/nullvalue/NullValueIndexType.java
@@ -0,0 +1,129 @@
+/**
+ * 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.pinot.segment.local.segment.index.nullvalue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.segment.creator.impl.nullvalue.NullValueVectorCreator;
+import org.apache.pinot.segment.local.segment.index.readers.NullValueVectorReaderImpl;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class NullValueIndexType extends AbstractIndexType<IndexConfig, NullValueVectorReader, NullValueVectorCreator> {
+  public static final String INDEX_DISPLAY_NAME = "null";
+
+  protected NullValueIndexType() {
+    super(StandardIndexes.NULL_VALUE_VECTOR_ID);
+  }
+
+  @Override
+  public Class<IndexConfig> getIndexConfigClass() {
+    return IndexConfig.class;
+  }
+
+  @Override
+  public NullValueVectorCreator createIndexCreator(IndexCreationContext context, IndexConfig indexConfig)
+      throws Exception {
+    return new NullValueVectorCreator(context.getIndexDir(), context.getFieldSpec().getName());
+  }
+
+  @Override
+  public IndexConfig getDefaultConfig() {
+    return IndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<IndexConfig> createDeserializer() {
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withFallbackAlternative(
+            IndexConfigDeserializer.ifIndexingConfig(
+                IndexConfigDeserializer.alwaysCall((TableConfig tableConfig, Schema schema) ->
+                  tableConfig.getIndexingConfig().isNullHandlingEnabled()
+                      ? IndexConfig.ENABLED
+                      : IndexConfig.DISABLED))
+        );
+  }
+
+  public NullValueVectorCreator createIndexCreator(File indexDir, String columnName) {
+    return new NullValueVectorCreator(indexDir, columnName);
+  }
+
+  @Override
+  protected IndexReaderFactory<NullValueVectorReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return IndexHandler.NoOp.INSTANCE;
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.NULLVALUE_VECTOR_FILE_EXTENSION;
+  }
+
+  private static class ReaderFactory implements IndexReaderFactory<NullValueVectorReader> {
+
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+
+    @Nullable
+    @Override
+    public NullValueVectorReader createIndexReader(SegmentDirectory.Reader segmentReader,
+        FieldIndexConfigs fieldIndexConfigs, ColumnMetadata metadata)
+          throws IOException {
+      if (!segmentReader.hasIndexFor(metadata.getColumnName(), StandardIndexes.nullValueVector())) {
+        return null;
+      }
+      PinotDataBuffer buffer = segmentReader.getIndexFor(metadata.getColumnName(), StandardIndexes.nullValueVector());
+      return new NullValueVectorReaderImpl(buffer);
+    }
+  }
+
+  @Override
+  public void convertToNewFormat(TableConfig tableConfig, Schema schema) {
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/range/RangeIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/range/RangeIndexPlugin.java
new file mode 100644
index 00000000000..4e2499b8654
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/range/RangeIndexPlugin.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pinot.segment.local.segment.index.range;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+
+@AutoService(IndexPlugin.class)
+public class RangeIndexPlugin implements IndexPlugin<RangeIndexType> {
+  public static final RangeIndexType INSTANCE = new RangeIndexType();
+
+  @Override
+  public RangeIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/range/RangeIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/range/RangeIndexType.java
new file mode 100644
index 00000000000..56ee6b25df1
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/range/RangeIndexType.java
@@ -0,0 +1,187 @@
+/**
+ * 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.pinot.segment.local.segment.index.range;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.BitSlicedRangeIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.inv.RangeIndexCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.invertedindex.RangeIndexHandler;
+import org.apache.pinot.segment.local.segment.index.readers.BitSlicedRangeIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.RangeIndexReaderImpl;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
+import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class RangeIndexType extends AbstractIndexType<RangeIndexConfig, RangeIndexReader, CombinedInvertedIndexCreator>
+  implements ConfigurableFromIndexLoadingConfig<RangeIndexConfig> {
+  public static final String INDEX_DISPLAY_NAME = "range";
+
+  protected RangeIndexType() {
+    super(StandardIndexes.RANGE_ID);
+  }
+
+  @Override
+  public Class<RangeIndexConfig> getIndexConfigClass() {
+    return RangeIndexConfig.class;
+  }
+
+  @Override
+  public Map<String, RangeIndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    int rangeVersion = indexLoadingConfig.getRangeIndexVersion();
+    return indexLoadingConfig.getRangeIndexColumns().stream()
+        .collect(Collectors.toMap(
+            Function.identity(),
+            c -> new RangeIndexConfig(rangeVersion)));
+  }
+
+  @Override
+  public RangeIndexConfig getDefaultConfig() {
+    return RangeIndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<RangeIndexConfig> createDeserializer() {
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative((tableConfig, schema) -> {
+          if (tableConfig.getIndexingConfig() == null) {
+            return Collections.emptyMap();
+          }
+          List<String> rangeIndexColumns = tableConfig.getIndexingConfig().getRangeIndexColumns();
+          if (rangeIndexColumns == null) {
+            return Collections.emptyMap();
+          }
+          int rangeVersion = tableConfig.getIndexingConfig().getRangeIndexVersion();
+          if (rangeVersion == 0) {
+            rangeVersion = RangeIndexConfig.DEFAULT.getVersion();
+          }
+          Map<String, RangeIndexConfig> result = new HashMap<>();
+          for (String col : rangeIndexColumns) {
+            result.put(col, new RangeIndexConfig(rangeVersion));
+          }
+          return result;
+        });
+  }
+
+  @Override
+  public CombinedInvertedIndexCreator createIndexCreator(IndexCreationContext context, RangeIndexConfig indexConfig)
+      throws IOException {
+    if (indexConfig.getVersion() == BitSlicedRangeIndexCreator.VERSION && context.getFieldSpec().isSingleValueField()) {
+      if (context.hasDictionary()) {
+        return new BitSlicedRangeIndexCreator(context.getIndexDir(), context.getFieldSpec(), context.getCardinality());
+      }
+      return new BitSlicedRangeIndexCreator(context.getIndexDir(), context.getFieldSpec(), context.getMinValue(),
+          context.getMaxValue());
+    }
+    // default to RangeIndexCreator for the time being
+    return new RangeIndexCreator(context.getIndexDir(), context.getFieldSpec(),
+        context.hasDictionary() ? FieldSpec.DataType.INT : context.getFieldSpec().getDataType(), -1,
+        -1, context.getTotalDocs(), context.getTotalNumberOfEntries());
+  }
+
+  @Override
+  protected IndexReaderFactory<RangeIndexReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  public static RangeIndexReader read(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
+      throws IndexReaderConstraintException {
+    return ReaderFactory.read(dataBuffer, metadata);
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.BITMAP_RANGE_INDEX_FILE_EXTENSION;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new RangeIndexHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  private static class ReaderFactory extends IndexReaderFactory.Default<RangeIndexConfig, RangeIndexReader> {
+
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+
+    @Override
+    protected IndexType<RangeIndexConfig, RangeIndexReader, ?> getIndexType() {
+      return StandardIndexes.range();
+    }
+
+    @Override
+    protected RangeIndexReader createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata,
+        RangeIndexConfig indexConfig)
+        throws IndexReaderConstraintException {
+      return read(dataBuffer, metadata);
+    }
+
+    public static RangeIndexReader read(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
+        throws IndexReaderConstraintException {
+      int version = dataBuffer.getInt(0);
+      if (version == RangeIndexCreator.VERSION) {
+        return new RangeIndexReaderImpl(dataBuffer);
+      } else if (version == BitSlicedRangeIndexCreator.VERSION) {
+        return new BitSlicedRangeIndexReader(dataBuffer, metadata);
+      }
+      throw new IndexReaderConstraintException(metadata.getColumnName(), StandardIndexes.range(),
+          "Unknown range index version " + version);
+    }
+  }
+
+  @Override
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+    tableConfig.getIndexingConfig().setRangeIndexColumns(null);
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BaseImmutableDictionary.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BaseImmutableDictionary.java
index 0c162e09f05..c5f90a0000a 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BaseImmutableDictionary.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BaseImmutableDictionary.java
@@ -22,12 +22,13 @@
 import it.unimi.dsi.fastutil.ints.IntSet;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
 import org.apache.pinot.segment.local.io.util.FixedByteValueReaderWriter;
 import org.apache.pinot.segment.local.io.util.ValueReader;
 import org.apache.pinot.segment.local.io.util.VarLengthValueReader;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.spi.utils.ByteArray;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -212,7 +213,6 @@ protected int binarySearch(String value) {
     byte[] utf8 = value.getBytes(UTF_8);
     while (low <= high) {
       int mid = (low + high) >>> 1;
-      // method requires zero padding byte, not safe to call in nonzero padding byte branch below
       int compareResult = _valueReader.compareUtf8Bytes(mid, _numBytesPerValue, utf8);
       if (compareResult < 0) {
         low = mid + 1;
@@ -228,11 +228,9 @@ protected int binarySearch(String value) {
   protected int binarySearch(byte[] value) {
     int low = 0;
     int high = _length - 1;
-
     while (low <= high) {
       int mid = (low + high) >>> 1;
-      byte[] midValue = _valueReader.getBytes(mid, _numBytesPerValue);
-      int compareResult = ByteArray.compare(midValue, value);
+      int compareResult = _valueReader.compareBytes(mid, _numBytesPerValue, value);
       if (compareResult < 0) {
         low = mid + 1;
       } else if (compareResult > 0) {
@@ -283,4 +281,37 @@ protected byte[] getBytes(int dictId) {
   protected byte[] getBuffer() {
     return new byte[_numBytesPerValue];
   }
+
+  /**
+   * Returns the dictionary id for the given sorted values.
+   * @param sortedValues
+   * @param dictIds
+   */
+  @Override
+  public void getDictIds(List<String> sortedValues, IntSet dictIds) {
+    int valueIdx = 0;
+    int dictIdx = 0;
+    byte[] utf8 = null;
+    boolean needNewUtf8 = true;
+    int sortedValuesSize = sortedValues.size();
+    int dictLength = length();
+    while (valueIdx < sortedValuesSize && dictIdx < dictLength) {
+      if (needNewUtf8) {
+        utf8 = sortedValues.get(valueIdx).getBytes(StandardCharsets.UTF_8);
+      }
+      int comparison = _valueReader.compareUtf8Bytes(dictIdx, _numBytesPerValue, utf8);
+      if (comparison == 0) {
+        dictIds.add(dictIdx);
+        dictIdx++;
+        valueIdx++;
+        needNewUtf8 = true;
+      } else if (comparison > 0) {
+        valueIdx++;
+        needNewUtf8 = true;
+      } else {
+        dictIdx++;
+        needNewUtf8 = false;
+      }
+    }
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java
index 7b422b74d63..a21891e2386 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/BitSlicedRangeIndexReader.java
@@ -203,7 +203,7 @@ private ImmutableRoaringBitmap queryRangeBitmap(long min, long max, long columnM
 
   private ImmutableRoaringBitmap queryRangeBitmap(long value, long columnMax) {
     RangeBitmap rangeBitmap = mapRangeBitmap();
-    if (Long.compareUnsigned(value, columnMax) < 0) {
+    if (Long.compareUnsigned(value, columnMax) <= 0) {
       return rangeBitmap.eq(value).toMutableRoaringBitmap();
     } else {
       return new MutableRoaringBitmap();
@@ -230,7 +230,7 @@ private int queryRangeBitmapCardinality(long min, long max, long columnMax) {
 
   private int queryRangeBitmapCardinality(long value, long columnMax) {
     RangeBitmap rangeBitmap = mapRangeBitmap();
-    if (Long.compareUnsigned(value, columnMax) < 0) {
+    if (Long.compareUnsigned(value, columnMax) <= 0) {
       return (int) rangeBitmap.eqCardinality(value);
     } else {
       return 0;
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/DefaultIndexReaderProvider.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/DefaultIndexReaderProvider.java
deleted file mode 100644
index 1693b6231b2..00000000000
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/DefaultIndexReaderProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.segment.index.readers;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import javax.annotation.Nullable;
-import org.apache.pinot.segment.local.io.writer.impl.VarByteChunkSVForwardIndexWriterV4;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.BitSlicedRangeIndexCreator;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.RangeIndexCreator;
-import org.apache.pinot.segment.local.segment.index.readers.bloom.BloomFilterReaderFactory;
-import org.apache.pinot.segment.local.segment.index.readers.forward.FixedBitMVForwardIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.forward.FixedBitSVForwardIndexReaderV2;
-import org.apache.pinot.segment.local.segment.index.readers.forward.FixedByteChunkMVForwardIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.forward.FixedByteChunkSVForwardIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.forward.FixedBytePower2ChunkSVForwardIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkMVForwardIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReaderV4;
-import org.apache.pinot.segment.local.segment.index.readers.geospatial.ImmutableH3IndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.json.ImmutableJsonIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.sorted.SortedIndexReaderImpl;
-import org.apache.pinot.segment.local.segment.index.readers.text.LuceneTextIndexReader;
-import org.apache.pinot.segment.local.segment.index.readers.text.NativeTextIndexReader;
-import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
-import org.apache.pinot.segment.local.utils.nativefst.FSTHeader;
-import org.apache.pinot.segment.local.utils.nativefst.NativeFSTIndexReader;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.index.reader.SortedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
-import org.apache.pinot.segment.spi.index.reader.provider.IndexReaderProvider;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.spi.config.table.FSTType;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Default implementations of index reader provision logic. This class should not be
- * instantiated but accessed via {@see IndexReaderProviders#getIndexReaderProvider} so
- * this logic may be overridden by users of the SPI. Unless an override is specified,
- * this is the logic which will be used to construct readers for data buffers.
- */
-public class DefaultIndexReaderProvider implements IndexReaderProvider {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(DefaultIndexReaderProvider.class);
-
-  @Override
-  public BloomFilterReader newBloomFilterReader(PinotDataBuffer dataBuffer, boolean onHeap)
-      throws IOException {
-    return BloomFilterReaderFactory.getBloomFilterReader(dataBuffer, onHeap);
-  }
-
-  @Override
-  public ForwardIndexReader<?> newForwardIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    if (columnMetadata.hasDictionary()) {
-      if (columnMetadata.isSingleValue()) {
-        if (columnMetadata.isSorted()) {
-          return new SortedIndexReaderImpl(dataBuffer, columnMetadata.getCardinality());
-        } else {
-          return new FixedBitSVForwardIndexReaderV2(dataBuffer, columnMetadata.getTotalDocs(),
-              columnMetadata.getBitsPerElement());
-        }
-      } else {
-        return new FixedBitMVForwardIndexReader(dataBuffer, columnMetadata.getTotalDocs(),
-            columnMetadata.getTotalNumberOfEntries(), columnMetadata.getBitsPerElement());
-      }
-    } else {
-      FieldSpec.DataType storedType = columnMetadata.getDataType().getStoredType();
-      if (columnMetadata.isSingleValue()) {
-        int version = dataBuffer.getInt(0);
-        if (storedType.isFixedWidth()) {
-          return version >= FixedBytePower2ChunkSVForwardIndexReader.VERSION
-              ? new FixedBytePower2ChunkSVForwardIndexReader(dataBuffer, storedType)
-              : new FixedByteChunkSVForwardIndexReader(dataBuffer, storedType);
-        }
-        if (version >= VarByteChunkSVForwardIndexWriterV4.VERSION) {
-          return new VarByteChunkSVForwardIndexReaderV4(dataBuffer, storedType);
-        }
-        return new VarByteChunkSVForwardIndexReader(dataBuffer, storedType);
-      } else {
-        return storedType.isFixedWidth() ? new FixedByteChunkMVForwardIndexReader(dataBuffer, storedType)
-            : new VarByteChunkMVForwardIndexReader(dataBuffer, storedType);
-      }
-    }
-  }
-
-  @Override
-  public H3IndexReader newGeospatialIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    return new ImmutableH3IndexReader(dataBuffer);
-  }
-
-  @Override
-  public InvertedIndexReader<?> newInvertedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    return new BitmapInvertedIndexReader(dataBuffer, columnMetadata.getCardinality());
-  }
-
-  @Override
-  public JsonIndexReader newJsonIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    return new ImmutableJsonIndexReader(dataBuffer, columnMetadata.getTotalDocs());
-  }
-
-  @Override
-  public RangeIndexReader<?> newRangeIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    int version = dataBuffer.getInt(0);
-    if (version == RangeIndexCreator.VERSION) {
-      return new RangeIndexReaderImpl(dataBuffer);
-    } else if (version == BitSlicedRangeIndexCreator.VERSION) {
-      return new BitSlicedRangeIndexReader(dataBuffer, columnMetadata);
-    }
-    LOGGER.warn("Unknown range index version: {}, skip loading range index for column: {}", version,
-        columnMetadata.getColumnName());
-    return null;
-  }
-
-  @Override
-  public SortedIndexReader<?> newSortedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    return new SortedIndexReaderImpl(dataBuffer, columnMetadata.getCardinality());
-  }
-
-  @Override
-  public TextIndexReader newFSTIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata columnMetadata)
-      throws IOException {
-    int magicHeader = dataBuffer.getInt(0);
-    if (magicHeader == FSTHeader.FST_MAGIC) {
-      return new NativeFSTIndexReader(dataBuffer);
-    } else {
-      return new LuceneFSTIndexReader(dataBuffer);
-    }
-  }
-
-  @Override
-  public TextIndexReader newTextIndexReader(File file, ColumnMetadata columnMetadata,
-      @Nullable Map<String, String> textIndexProperties) {
-    FSTType textIndexFSTType = TextIndexUtils.getFSTTypeOfIndex(file, columnMetadata.getColumnName());
-    if (textIndexFSTType == FSTType.NATIVE) {
-      // TODO: Support loading native text index from a PinotDataBuffer
-      return new NativeTextIndexReader(columnMetadata.getColumnName(), file);
-    }
-    return new LuceneTextIndexReader(columnMetadata.getColumnName(), file, columnMetadata.getTotalDocs(),
-        textIndexProperties);
-  }
-}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/LuceneTextIndexReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/LuceneTextIndexReader.java
index 2f1f445f3db..f1b5789fd5f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/LuceneTextIndexReader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/LuceneTextIndexReader.java
@@ -37,12 +37,14 @@
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
 import org.apache.pinot.segment.local.segment.creator.impl.text.LuceneTextIndexCreator;
 import org.apache.pinot.segment.local.segment.index.column.PhysicalColumnIndexContainer;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexConfigBuilder;
 import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
 import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
-import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.FSTType;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 import org.slf4j.LoggerFactory;
@@ -64,47 +66,50 @@ public class LuceneTextIndexReader implements TextIndexReader {
   private final StandardAnalyzer _standardAnalyzer;
   private boolean _useANDForMultiTermQueries = false;
 
-  /**
-   * As part of loading the segment in ImmutableSegmentLoader,
-   * we load the text index (per column if it exists) and store
-   * the reference in {@link PhysicalColumnIndexContainer}
-   * similar to how it is done for other types of indexes.
-   * @param column column name
-   * @param indexDir segment index directory
-   * @param numDocs number of documents in the segment
-   */
-  public LuceneTextIndexReader(String column, File indexDir, int numDocs,
-      @Nullable Map<String, String> textIndexProperties) {
+  public LuceneTextIndexReader(String column, File indexDir, int numDocs, TextIndexConfig config) {
     _column = column;
     try {
       File indexFile = getTextIndexFile(indexDir);
       _indexDirectory = FSDirectory.open(indexFile.toPath());
       _indexReader = DirectoryReader.open(_indexDirectory);
       _indexSearcher = new IndexSearcher(_indexReader);
-      if (textIndexProperties == null || !Boolean
-          .parseBoolean(textIndexProperties.get(FieldConfig.TEXT_INDEX_ENABLE_QUERY_CACHE))) {
+      if (!config.isEnableQueryCache()) {
         // Disable Lucene query result cache. While it helps a lot with performance for
         // repeated queries, on the downside it cause heap issues.
         _indexSearcher.setQueryCache(null);
       }
-      if (textIndexProperties != null && Boolean
-          .parseBoolean(textIndexProperties.get(FieldConfig.TEXT_INDEX_USE_AND_FOR_MULTI_TERM_QUERIES))) {
+      if (config.isUseANDForMultiTermQueries()) {
         _useANDForMultiTermQueries = true;
       }
       // TODO: consider using a threshold of num docs per segment to decide between building
       // mapping file upfront on segment load v/s on-the-fly during query processing
       _docIdTranslator = new DocIdTranslator(indexDir, _column, numDocs, _indexSearcher);
       _standardAnalyzer = TextIndexUtils.getStandardAnalyzerWithCustomizedStopWords(
-          TextIndexUtils.extractStopWordsInclude(textIndexProperties),
-          TextIndexUtils.extractStopWordsExclude(textIndexProperties)
+          config.getStopWordsInclude(), config.getStopWordsExclude()
       );
     } catch (Exception e) {
-      LOGGER
-          .error("Failed to instantiate Lucene text index reader for column {}, exception {}", column, e.getMessage());
+      LOGGER.error("Failed to instantiate Lucene text index reader for column {}, exception {}", column,
+          e.getMessage());
       throw new RuntimeException(e);
     }
   }
 
+  /**
+   * As part of loading the segment in ImmutableSegmentLoader,
+   * we load the text index (per column if it exists) and store
+   * the reference in {@link PhysicalColumnIndexContainer}
+   * similar to how it is done for other types of indexes.
+   * @param column column name
+   * @param indexDir segment index directory
+   * @param numDocs number of documents in the segment
+   */
+  public LuceneTextIndexReader(String column, File indexDir, int numDocs,
+      @Nullable Map<String, String> textIndexProperties) {
+    this(column, indexDir, numDocs, new TextIndexConfigBuilder(FSTType.LUCENE)
+        .withProperties(textIndexProperties)
+        .build());
+  }
+
   /**
    * CASE 1: If IndexLoadingConfig specifies a segment version to load and if it is different then
    * the on-disk version of the segment, then {@link ImmutableSegmentLoader}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/NativeTextIndexReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/NativeTextIndexReader.java
index 8f1c2e6a73e..3650e3531f6 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/NativeTextIndexReader.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/readers/text/NativeTextIndexReader.java
@@ -52,7 +52,11 @@ public class NativeTextIndexReader implements TextIndexReader {
   public NativeTextIndexReader(String column, File indexDir) {
     _column = column;
     try {
-      _buffer = PinotDataBuffer.loadBigEndianFile(getTextIndexFile(indexDir));
+      String desc = "Native text index buffer: " + column;
+      File indexFile = getTextIndexFile(indexDir);
+      //TODO: Pass the load mode in (Direct, MMap)
+      _buffer =
+          PinotDataBuffer.mapFile(indexFile, /* readOnly */ true, 0, indexFile.length(), ByteOrder.BIG_ENDIAN, desc);
       populateIndexes();
     } catch (Exception e) {
       LOGGER.error("Failed to instantiate Lucene text index reader for column {}, exception {}", column,
@@ -115,5 +119,6 @@ public MutableRoaringBitmap getDocIds(String searchQuery) {
   @Override
   public void close()
       throws IOException {
+    _buffer.close();
   }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/TextIndexCreatorProvider.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/AbstractTextIndexCreator.java
similarity index 56%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/TextIndexCreatorProvider.java
rename to pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/AbstractTextIndexCreator.java
index 05f53ea81b0..1c9c60b0358 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/TextIndexCreatorProvider.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/AbstractTextIndexCreator.java
@@ -16,22 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.creator;
 
-import java.io.IOException;
+package org.apache.pinot.segment.local.segment.index.text;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
 
 
-public interface TextIndexCreatorProvider {
+public abstract class AbstractTextIndexCreator implements TextIndexCreator {
+
+  @Override
+  public void add(@Nonnull Object value, int dictId) {
+    add((String) value);
+  }
 
-  /**
-   * Creates a {@see TextIndexCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws IOException whenever something goes wrong matching or constructing the creator
-   */
-  TextIndexCreator newTextIndexCreator(IndexCreationContext.Text context)
-      throws IOException;
+  @Override
+  public void add(@Nonnull Object[] values, @Nullable int[] dictIds) {
+    int length = values.length;
+    if (values instanceof String[]) {
+      add((String[]) values, length);
+    } else {
+      String[] strings = new String[length];
+      for (int i = 0; i < length; i++) {
+        strings[i] = (String) values[i];
+      }
+      add(strings, length);
+    }
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexConfigBuilder.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexConfigBuilder.java
new file mode 100644
index 00000000000..74d82caca60
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexConfigBuilder.java
@@ -0,0 +1,64 @@
+/**
+ * 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.pinot.segment.local.segment.index.text;
+
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.FieldConfig;
+
+
+public class TextIndexConfigBuilder extends TextIndexConfig.AbstractBuilder {
+  public TextIndexConfigBuilder(@Nullable FSTType fstType) {
+    super(fstType);
+  }
+
+  public TextIndexConfigBuilder(TextIndexConfig other) {
+    super(other);
+  }
+
+  @Override
+  public TextIndexConfig.AbstractBuilder withProperties(@Nullable Map<String, String> textIndexProperties) {
+    if (textIndexProperties != null) {
+      if (Boolean.parseBoolean(textIndexProperties.get(FieldConfig.TEXT_INDEX_NO_RAW_DATA))) {
+        _rawValueForTextIndex = textIndexProperties.get(FieldConfig.TEXT_INDEX_RAW_VALUE);
+        if (_rawValueForTextIndex == null) {
+          _rawValueForTextIndex = FieldConfig.TEXT_INDEX_DEFAULT_RAW_VALUE;
+        }
+      }
+      _enableQueryCache = Boolean.parseBoolean(textIndexProperties.get(FieldConfig.TEXT_INDEX_ENABLE_QUERY_CACHE));
+      _useANDForMultiTermQueries = Boolean.parseBoolean(
+          textIndexProperties.get(FieldConfig.TEXT_INDEX_USE_AND_FOR_MULTI_TERM_QUERIES));
+      _stopWordsInclude = TextIndexUtils.extractStopWordsInclude(textIndexProperties);
+      _stopWordsExclude = TextIndexUtils.extractStopWordsExclude(textIndexProperties);
+
+      for (Map.Entry<String, String> entry : textIndexProperties.entrySet()) {
+        if (entry.getKey().equalsIgnoreCase(FieldConfig.TEXT_FST_TYPE)) {
+          _fstType = FSTType.NATIVE;
+        } else {
+          _fstType = FSTType.LUCENE;
+        }
+      }
+    }
+    return this;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexPlugin.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexPlugin.java
new file mode 100644
index 00000000000..08b853c3345
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexPlugin.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pinot.segment.local.segment.index.text;
+
+import com.google.auto.service.AutoService;
+import org.apache.pinot.segment.spi.index.IndexPlugin;
+
+
+@AutoService(IndexPlugin.class)
+public class TextIndexPlugin implements IndexPlugin<TextIndexType> {
+
+  public static final TextIndexType INSTANCE = new TextIndexType();
+  @Override
+  public TextIndexType getIndexType() {
+    return INSTANCE;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexType.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexType.java
new file mode 100644
index 00000000000..a23d2f550e6
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/text/TextIndexType.java
@@ -0,0 +1,198 @@
+/**
+ * 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.pinot.segment.local.segment.index.text;
+
+import com.google.common.base.Preconditions;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.local.realtime.impl.invertedindex.NativeMutableTextIndex;
+import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeLuceneTextIndex;
+import org.apache.pinot.segment.local.segment.creator.impl.text.LuceneTextIndexCreator;
+import org.apache.pinot.segment.local.segment.creator.impl.text.NativeTextIndexCreator;
+import org.apache.pinot.segment.local.segment.index.loader.ConfigurableFromIndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.segment.index.loader.invertedindex.TextIndexHandler;
+import org.apache.pinot.segment.local.segment.index.readers.text.LuceneTextIndexReader;
+import org.apache.pinot.segment.local.segment.index.readers.text.NativeTextIndexReader;
+import org.apache.pinot.segment.local.segment.store.TextIndexUtils;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.AbstractIndexType;
+import org.apache.pinot.segment.spi.index.ColumnConfigDeserializer;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexConfigDeserializer;
+import org.apache.pinot.segment.spi.index.IndexHandler;
+import org.apache.pinot.segment.spi.index.IndexReaderConstraintException;
+import org.apache.pinot.segment.spi.index.IndexReaderFactory;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
+import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class TextIndexType extends AbstractIndexType<TextIndexConfig, TextIndexReader, TextIndexCreator>
+    implements ConfigurableFromIndexLoadingConfig<TextIndexConfig> {
+  protected static final Logger LOGGER = LoggerFactory.getLogger(TextIndexType.class);
+
+  public static final String INDEX_DISPLAY_NAME = "text";
+
+  protected TextIndexType() {
+    super(StandardIndexes.TEXT_ID);
+  }
+
+  @Override
+  public Class<TextIndexConfig> getIndexConfigClass() {
+    return TextIndexConfig.class;
+  }
+
+  @Override
+  public Map<String, TextIndexConfig> fromIndexLoadingConfig(IndexLoadingConfig indexLoadingConfig) {
+    Map<String, Map<String, String>> allColProps = indexLoadingConfig.getColumnProperties();
+    return indexLoadingConfig.getTextIndexColumns().stream().collect(Collectors.toMap(
+        Function.identity(),
+        colName -> new TextIndexConfigBuilder(indexLoadingConfig.getFSTIndexType())
+            .withProperties(allColProps.get(colName))
+            .build()
+    ));
+  }
+
+  @Override
+  public TextIndexConfig getDefaultConfig() {
+    return TextIndexConfig.DISABLED;
+  }
+
+  @Override
+  public String getPrettyName() {
+    return INDEX_DISPLAY_NAME;
+  }
+
+  @Override
+  public ColumnConfigDeserializer<TextIndexConfig> createDeserializer() {
+    return IndexConfigDeserializer.fromIndexes(getPrettyName(), getIndexConfigClass())
+        .withExclusiveAlternative((tableConfig, schema) -> {
+          List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
+          if (fieldConfigList == null) {
+            return Collections.emptyMap();
+          }
+          Map<String, TextIndexConfig> result = new HashMap<>();
+          for (FieldConfig fieldConfig : fieldConfigList) {
+            if (fieldConfig.getIndexTypes().contains(FieldConfig.IndexType.TEXT)) {
+              String column = fieldConfig.getName();
+              Map<String, String> properties = fieldConfig.getProperties();
+              FSTType fstType = TextIndexUtils.isFstTypeNative(properties) ? FSTType.NATIVE : FSTType.LUCENE;
+              result.put(column, new TextIndexConfigBuilder(fstType).withProperties(properties).build());
+            }
+          }
+          return result;
+        });
+  }
+
+  @Override
+  public TextIndexCreator createIndexCreator(IndexCreationContext context, TextIndexConfig indexConfig)
+      throws IOException {
+    Preconditions.checkState(context.getFieldSpec().getDataType().getStoredType() == FieldSpec.DataType.STRING,
+        "Text index is currently only supported on STRING type columns");
+    if (indexConfig.getFstType() == FSTType.NATIVE) {
+      return new NativeTextIndexCreator(context.getFieldSpec().getName(), context.getIndexDir());
+    } else {
+      return new LuceneTextIndexCreator(context, indexConfig);
+    }
+  }
+
+  @Override
+  protected IndexReaderFactory<TextIndexReader> createReaderFactory() {
+    return ReaderFactory.INSTANCE;
+  }
+
+  @Override
+  public IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig) {
+    return new TextIndexHandler(segmentDirectory, configsByCol, tableConfig);
+  }
+
+  @Override
+  public String getFileExtension(ColumnMetadata columnMetadata) {
+    return V1Constants.Indexes.LUCENE_TEXT_INDEX_FILE_EXTENSION;
+  }
+
+  private static class ReaderFactory implements IndexReaderFactory<TextIndexReader> {
+
+    public static final ReaderFactory INSTANCE = new ReaderFactory();
+
+    private ReaderFactory() {
+    }
+
+    @Nullable
+    @Override
+    public TextIndexReader createIndexReader(SegmentDirectory.Reader segmentReader,
+        FieldIndexConfigs fieldIndexConfigs, ColumnMetadata metadata)
+          throws IndexReaderConstraintException {
+      if (metadata.getDataType() != FieldSpec.DataType.STRING) {
+        throw new IndexReaderConstraintException(metadata.getColumnName(), StandardIndexes.text(),
+            "Text index is currently only supported on STRING type columns");
+      }
+      File segmentDir = segmentReader.toSegmentDirectory().getPath().toFile();
+      FSTType textIndexFSTType = TextIndexUtils.getFSTTypeOfIndex(segmentDir, metadata.getColumnName());
+      if (textIndexFSTType == FSTType.NATIVE) {
+        // TODO: Support loading native text index from a PinotDataBuffer
+        return new NativeTextIndexReader(metadata.getColumnName(), segmentDir);
+      }
+      TextIndexConfig indexConfig = fieldIndexConfigs.getConfig(StandardIndexes.text());
+      return new LuceneTextIndexReader(metadata.getColumnName(), segmentDir, metadata.getTotalDocs(), indexConfig);
+    }
+  }
+
+  @Nullable
+  @Override
+  public MutableIndex createMutableIndex(MutableIndexContext context, TextIndexConfig config) {
+    if (config.isDisabled()) {
+      return null;
+    }
+    if (config.getFstType() == FSTType.NATIVE) {
+      if (!context.getFieldSpec().isSingleValueField()) {
+        return null;
+      }
+      return new NativeMutableTextIndex(context.getFieldSpec().getName());
+    }
+    if (context.getConsumerDir() == null) {
+      throw new IllegalArgumentException("A consumer directory is required");
+    }
+    return new RealtimeLuceneTextIndex(context.getFieldSpec().getName(), context.getConsumerDir(),
+        context.getSegmentName(), config.getStopWordsInclude(), config.getStopWordsExclude());
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectory.java
index a85e5b629ce..0923aa7dea2 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectory.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectory.java
@@ -21,22 +21,18 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.ByteOrder;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.io.FileUtils;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
-import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.spi.utils.ReadMode;
 
 
@@ -45,9 +41,7 @@ class FilePerIndexDirectory extends ColumnIndexDirectory {
   private SegmentMetadataImpl _segmentMetadata;
   private final ReadMode _readMode;
   private final Map<IndexKey, PinotDataBuffer> _indexBuffers = new HashMap<>();
-  // Different from the other column-index entries, starTree index is multi-column index and has its own index map,
-  // thus manage it separately.
-  private PinotDataBuffer _starTreeIndexDataBuffer;
+
   /**
    * @param segmentDirectory File pointing to segment directory
    * @param segmentMetadata segment metadata. Metadata must be fully initialized
@@ -74,44 +68,21 @@ public void setSegmentMetadata(SegmentMetadataImpl segmentMetadata) {
   }
 
   @Override
-  public PinotDataBuffer getBuffer(String column, ColumnIndexType type)
+  public PinotDataBuffer getBuffer(String column, IndexType<?, ?, ?> type)
       throws IOException {
     IndexKey key = new IndexKey(column, type);
     return getReadBufferFor(key);
   }
 
   @Override
-  public PinotDataBuffer getStarTreeIndex()
-      throws IOException {
-    if (_starTreeIndexDataBuffer != null) {
-      return _starTreeIndexDataBuffer;
-    }
-    File indexFile = new File(_segmentDirectory, StarTreeV2Constants.INDEX_FILE_NAME);
-    if (_readMode == ReadMode.heap) {
-      _starTreeIndexDataBuffer =
-          PinotDataBuffer.loadFile(indexFile, 0, indexFile.length(), ByteOrder.BIG_ENDIAN, "Star-tree V2 data buffer");
-    } else {
-      _starTreeIndexDataBuffer = PinotDataBuffer.mapFile(indexFile, true, 0, indexFile.length(), ByteOrder.BIG_ENDIAN,
-          "Star-tree V2 data buffer");
-    }
-    return _starTreeIndexDataBuffer;
-  }
-
-  @Override
-  public InputStream getStarTreeIndexMap()
-      throws IOException {
-    return new FileInputStream(new File(_segmentDirectory, StarTreeV2Constants.INDEX_MAP_FILE_NAME));
-  }
-
-  @Override
-  public PinotDataBuffer newBuffer(String column, ColumnIndexType type, long sizeBytes)
+  public PinotDataBuffer newBuffer(String column, IndexType<?, ?, ?> type, long sizeBytes)
       throws IOException {
     IndexKey key = new IndexKey(column, type);
     return getWriteBufferFor(key, sizeBytes);
   }
 
   @Override
-  public boolean hasIndexFor(String column, ColumnIndexType type) {
+  public boolean hasIndexFor(String column, IndexType<?, ?, ?> type) {
     File indexFile = getFileFor(column, type);
     return indexFile.exists();
   }
@@ -122,15 +93,12 @@ public void close()
     for (PinotDataBuffer dataBuffer : _indexBuffers.values()) {
       dataBuffer.close();
     }
-    if (_starTreeIndexDataBuffer != null) {
-      _starTreeIndexDataBuffer.close();
-    }
   }
 
   @Override
-  public void removeIndex(String columnName, ColumnIndexType indexType) {
+  public void removeIndex(String columnName, IndexType<?, ?, ?> indexType) {
     _indexBuffers.remove(new IndexKey(columnName, indexType));
-    if (indexType == ColumnIndexType.TEXT_INDEX) {
+    if (indexType == StandardIndexes.text()) {
       TextIndexUtils.cleanupTextIndex(_segmentDirectory, columnName);
     } else {
       FileUtils.deleteQuietly(getFileFor(columnName, indexType));
@@ -138,7 +106,7 @@ public void removeIndex(String columnName, ColumnIndexType indexType) {
   }
 
   @Override
-  public Set<String> getColumnsWithIndex(ColumnIndexType type) {
+  public Set<String> getColumnsWithIndex(IndexType<?, ?, ?> type) {
     // _indexBuffers is just a cache of index files, thus not reliable as
     // the source of truth about which indices exist in the directory.
     // Call hasIndexFor() to check if a column-index exists for sure.
@@ -163,7 +131,7 @@ private PinotDataBuffer getReadBufferFor(IndexKey key)
           "Could not find index for column: " + key._name + ", type: " + key._type + ", segment: " + _segmentDirectory
               .toString());
     }
-    PinotDataBuffer buffer = mapForReads(file, key._type.toString() + ".reader");
+    PinotDataBuffer buffer = mapForReads(file, key._type.getId() + ".reader");
     _indexBuffers.put(key, buffer);
     return buffer;
   }
@@ -181,57 +149,8 @@ private PinotDataBuffer getWriteBufferFor(IndexKey key, long sizeBytes)
   }
 
   @VisibleForTesting
-  File getFileFor(String column, ColumnIndexType indexType) {
-    String fileExtension;
-    switch (indexType) {
-      case DICTIONARY:
-        fileExtension = V1Constants.Dict.FILE_EXTENSION;
-        break;
-      case FORWARD_INDEX:
-        ColumnMetadata columnMetadata = _segmentMetadata.getColumnMetadataFor(column);
-        if (columnMetadata.isSingleValue()) {
-          if (!columnMetadata.hasDictionary()) {
-            fileExtension = V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION;
-          } else if (columnMetadata.isSorted()) {
-            fileExtension = V1Constants.Indexes.SORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
-          } else {
-            fileExtension = V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
-          }
-        } else {
-          if (!columnMetadata.hasDictionary()) {
-            fileExtension = V1Constants.Indexes.RAW_MV_FORWARD_INDEX_FILE_EXTENSION;
-          } else {
-            fileExtension = V1Constants.Indexes.UNSORTED_MV_FORWARD_INDEX_FILE_EXTENSION;
-          }
-        }
-        break;
-      case INVERTED_INDEX:
-        fileExtension = V1Constants.Indexes.BITMAP_INVERTED_INDEX_FILE_EXTENSION;
-        break;
-      case RANGE_INDEX:
-        fileExtension = V1Constants.Indexes.BITMAP_RANGE_INDEX_FILE_EXTENSION;
-        break;
-      case BLOOM_FILTER:
-        fileExtension = V1Constants.Indexes.BLOOM_FILTER_FILE_EXTENSION;
-        break;
-      case NULLVALUE_VECTOR:
-        fileExtension = V1Constants.Indexes.NULLVALUE_VECTOR_FILE_EXTENSION;
-        break;
-      case TEXT_INDEX:
-        fileExtension = V1Constants.Indexes.LUCENE_TEXT_INDEX_FILE_EXTENSION;
-        break;
-      case FST_INDEX:
-        fileExtension = V1Constants.Indexes.FST_INDEX_FILE_EXTENSION;
-        break;
-      case JSON_INDEX:
-        fileExtension = V1Constants.Indexes.JSON_INDEX_FILE_EXTENSION;
-        break;
-      case H3_INDEX:
-        fileExtension = V1Constants.Indexes.H3_INDEX_FILE_EXTENSION;
-        break;
-      default:
-        throw new IllegalStateException("Unsupported index type: " + indexType);
-    }
+  File getFileFor(String column, IndexType<?, ?, ?> indexType) {
+    String fileExtension = indexType.getFileExtension(_segmentMetadata.getColumnMetadataFor(column));
     return new File(_segmentDirectory, column + fileExtension);
   }
 
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/IndexKey.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/IndexKey.java
index a81cb9d6a76..90bf9b820df 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/IndexKey.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/IndexKey.java
@@ -18,7 +18,8 @@
  */
 package org.apache.pinot.segment.local.segment.store;
 
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,17 +31,25 @@ public class IndexKey implements Comparable<IndexKey> {
   private static final Logger LOGGER = LoggerFactory.getLogger(IndexKey.class);
 
   final String _name;
-  final ColumnIndexType _type;
+  final IndexType<?, ?, ?> _type;
 
   /**
    * @param name column name
    * @param type index type
    */
-  public IndexKey(String name, ColumnIndexType type) {
+  public IndexKey(String name, IndexType<?, ?, ?> type) {
     _name = name;
     _type = type;
   }
 
+  /**
+   * @throws IllegalArgumentException if there is no index with the given index id
+   */
+  public static IndexKey fromIndexName(String name, String indexName) {
+    IndexType<?, ?, ?> type = IndexService.getInstance().get(indexName);
+    return new IndexKey(name, type);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -67,13 +76,13 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return _name + "." + _type.getIndexName();
+    return _name + "." + _type.getId();
   }
 
   @Override
   public int compareTo(IndexKey o) {
     if (_name.equals(o._name)) {
-      return _type.compareTo(o._type);
+      return _type.getId().compareTo(o._type.getId());
     }
     return _name.compareTo(o._name);
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectory.java
index 4edfdd2b709..b5efaa215ab 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectory.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectory.java
@@ -22,20 +22,20 @@
 import com.google.common.base.Preconditions;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nullable;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
 import org.apache.pinot.spi.utils.CommonConstants;
@@ -64,6 +64,7 @@ public class SegmentLocalFSDirectory extends SegmentDirectory {
   private final ReadMode _readMode;
   private SegmentMetadataImpl _segmentMetadata;
   private ColumnIndexDirectory _columnIndexDirectory;
+  private StarTreeIndexReader _starTreeIndexReader;
   private String _tier;
 
   // Create an empty SegmentLocalFSDirectory object mainly used to
@@ -207,7 +208,7 @@ public long getDiskSizeBytes() {
   }
 
   @Override
-  public Set<String> getColumnsWithIndex(ColumnIndexType type) {
+  public Set<String> getColumnsWithIndex(IndexType<?, ?, ?> type) {
     if (_columnIndexDirectory == null) {
       return Collections.emptySet();
     }
@@ -251,7 +252,6 @@ private synchronized void loadData()
     if (_columnIndexDirectory != null) {
       return;
     }
-
     switch (_segmentMetadata.getVersion()) {
       case v1:
       case v2:
@@ -268,6 +268,9 @@ private synchronized void loadData()
       default:
         break;
     }
+    if (CollectionUtils.isNotEmpty(_segmentMetadata.getStarTreeV2MetadataList())) {
+      _starTreeIndexReader = new StarTreeIndexReader(_segmentDirectory, _segmentMetadata, _readMode);
+    }
   }
 
   @Override
@@ -279,10 +282,14 @@ public void close()
         _columnIndexDirectory.close();
         _columnIndexDirectory = null;
       }
+      if (_starTreeIndexReader != null) {
+        _starTreeIndexReader.close();
+        _starTreeIndexReader = null;
+      }
     }
   }
 
-  private PinotDataBuffer getIndexForColumn(String column, ColumnIndexType type)
+  private PinotDataBuffer getIndexForColumn(String column, IndexType<?, ?, ?> type)
       throws IOException {
     PinotDataBuffer buffer;
 
@@ -325,11 +332,9 @@ private void prefetchMmapData(PinotDataBuffer buffer) {
         PREFETCHED_PAGES.incrementAndGet();
       }
     } else {
-      // pos needs to be long because buffer.size() is 32 bit but
-      // adding 4k can make it go over int size
       for (long pos = 0; pos < buffer.size() && PREFETCHED_PAGES.get() < prefetchSlowdownPageLimit;
           pos += PAGE_SIZE_BYTES) {
-        buffer.getByte((int) pos);
+        buffer.getByte(pos);
         PREFETCHED_PAGES.incrementAndGet();
       }
     }
@@ -339,37 +344,57 @@ private void prefetchMmapData(PinotDataBuffer buffer) {
   public class Reader extends SegmentDirectory.Reader {
 
     @Override
-    public PinotDataBuffer getIndexFor(String column, ColumnIndexType type)
+    public PinotDataBuffer getIndexFor(String column, IndexType<?, ?, ?> type)
         throws IOException {
       return getIndexForColumn(column, type);
     }
 
     @Override
-    public boolean hasIndexFor(String column, ColumnIndexType type) {
+    public boolean hasIndexFor(String column, IndexType<?, ?, ?> type) {
       return _columnIndexDirectory.hasIndexFor(column, type);
     }
 
     @Override
-    public void close() {
-      // do nothing here
-      _segmentLock.unlock();
+    public boolean hasStarTreeIndex() {
+      return _starTreeIndexReader != null;
     }
 
     @Override
-    public String toString() {
-      return _segmentDirectory.toString();
+    public SegmentDirectory.Reader getStarTreeIndexReader(int starTreeId) {
+      return new SegmentDirectory.Reader() {
+        @Override
+        public PinotDataBuffer getIndexFor(String column, IndexType<?, ?, ?> type)
+            throws IOException {
+          return _starTreeIndexReader.getBuffer(starTreeId, column, type);
+        }
+
+        @Override
+        public boolean hasIndexFor(String column, IndexType<?, ?, ?> type) {
+          return _starTreeIndexReader.hasIndexFor(starTreeId, column, type);
+        }
+
+        @Override
+        public String toString() {
+          return _starTreeIndexReader.toString() + " for " + starTreeId;
+        }
+
+        @Override
+        public void close()
+            throws IOException {
+          // Noop as _starTreeIndexReader is owned by the top level Reader
+        }
+      };
     }
 
     @Override
-    public PinotDataBuffer getStarTreeIndex()
-        throws IOException {
-      return _columnIndexDirectory.getStarTreeIndex();
+    public void close() {
+      // do nothing here
+      _segmentLock.unlock();
     }
 
     @Override
-    public InputStream getStarTreeIndexMap()
-        throws IOException {
-      return _columnIndexDirectory.getStarTreeIndexMap();
+    public String toString() {
+      return _segmentDirectory.toString();
     }
   }
 
@@ -383,13 +408,13 @@ public Writer() {
     }
 
     @Override
-    public PinotDataBuffer newIndexFor(String columnName, ColumnIndexType indexType, long sizeBytes)
+    public PinotDataBuffer newIndexFor(String columnName, IndexType<?, ?, ?> indexType, long sizeBytes)
         throws IOException {
       return getNewIndexBuffer(new IndexKey(columnName, indexType), sizeBytes);
     }
 
     @Override
-    public void removeIndex(String columnName, ColumnIndexType indexType) {
+    public void removeIndex(String columnName, IndexType<?, ?, ?> indexType) {
       _columnIndexDirectory.removeIndex(columnName, indexType);
     }
 
@@ -413,18 +438,22 @@ public void close()
       _segmentLock.unlock();
       if (_columnIndexDirectory != null) {
         _columnIndexDirectory.close();
+        _columnIndexDirectory = null;
+      }
+      if (_starTreeIndexReader != null) {
+        _starTreeIndexReader.close();
+        _starTreeIndexReader = null;
       }
-      _columnIndexDirectory = null;
     }
 
     @Override
-    public PinotDataBuffer getIndexFor(String column, ColumnIndexType type)
+    public PinotDataBuffer getIndexFor(String column, IndexType<?, ?, ?> type)
         throws IOException {
       return getIndexForColumn(column, type);
     }
 
     @Override
-    public boolean hasIndexFor(String column, ColumnIndexType type) {
+    public boolean hasIndexFor(String column, IndexType<?, ?, ?> type) {
       return _columnIndexDirectory.hasIndexFor(column, type);
     }
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectory.java
index f9824dd5a23..a8af853be3b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectory.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectory.java
@@ -22,16 +22,13 @@
 import com.google.common.base.Preconditions;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.RandomAccessFile;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -42,11 +39,11 @@
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
-import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.ColumnIndexUtils;
 import org.apache.pinot.spi.env.CommonsConfigurationUtils;
 import org.apache.pinot.spi.utils.ReadMode;
@@ -85,11 +82,8 @@ class SingleFileIndexDirectory extends ColumnIndexDirectory {
   private SegmentMetadataImpl _segmentMetadata;
   private final ReadMode _readMode;
   private final File _indexFile;
-  private final Map<IndexKey, IndexEntry> _columnEntries;
+  private final TreeMap<IndexKey, IndexEntry> _columnEntries;
   private final List<PinotDataBuffer> _allocBuffers;
-  // Different from the other column-index entries, starTree index is multi-column index and has its own index map,
-  // thus manage it separately.
-  private PinotDataBuffer _starTreeIndexDataBuffer;
 
   // For V3 segment format, the index cleanup consists of two steps: mark and sweep.
   // The removeIndex() method marks an index to be removed; and the index info is
@@ -122,7 +116,7 @@ public SingleFileIndexDirectory(File segmentDirectory, SegmentMetadataImpl segme
     if (!_indexFile.exists()) {
       _indexFile.createNewFile();
     }
-    _columnEntries = new HashMap<>(_segmentMetadata.getAllColumns().size());
+    _columnEntries = new TreeMap<>();
     _allocBuffers = new ArrayList<>();
     load();
   }
@@ -133,27 +127,27 @@ public void setSegmentMetadata(SegmentMetadataImpl segmentMetadata) {
   }
 
   @Override
-  public PinotDataBuffer getBuffer(String column, ColumnIndexType type)
+  public PinotDataBuffer getBuffer(String column, IndexType<?, ?, ?> type)
       throws IOException {
     return checkAndGetIndexBuffer(column, type);
   }
 
   @Override
-  public PinotDataBuffer newBuffer(String column, ColumnIndexType type, long sizeBytes)
+  public PinotDataBuffer newBuffer(String column, IndexType<?, ?, ?> type, long sizeBytes)
       throws IOException {
-    return allocNewBufferInternal(column, type, sizeBytes, type.name().toLowerCase() + ".create");
+    return allocNewBufferInternal(column, type, sizeBytes, type.getId().toLowerCase() + ".create");
   }
 
   @Override
-  public boolean hasIndexFor(String column, ColumnIndexType type) {
-    if (type == ColumnIndexType.TEXT_INDEX) {
+  public boolean hasIndexFor(String column, IndexType<?, ?, ?> type) {
+    if (type == StandardIndexes.text()) {
       return TextIndexUtils.hasTextIndex(_segmentDirectory, column);
     }
     IndexKey key = new IndexKey(column, type);
     return _columnEntries.containsKey(key);
   }
 
-  private PinotDataBuffer checkAndGetIndexBuffer(String column, ColumnIndexType type) {
+  private PinotDataBuffer checkAndGetIndexBuffer(String column, IndexType<?, ?, ?> type) {
     IndexKey key = new IndexKey(column, type);
     IndexEntry entry = _columnEntries.get(key);
     if (entry == null || entry._buffer == null) {
@@ -165,7 +159,8 @@ private PinotDataBuffer checkAndGetIndexBuffer(String column, ColumnIndexType ty
   }
 
   // This is using extra resources right now which can be changed.
-  private PinotDataBuffer allocNewBufferInternal(String column, ColumnIndexType indexType, long size, String context)
+  private PinotDataBuffer allocNewBufferInternal(String column, IndexType<?, ?, ?> indexType, long size,
+      String context)
       throws IOException {
 
     IndexKey key = new IndexKey(column, indexType);
@@ -213,21 +208,6 @@ private void load()
       throws IOException, ConfigurationException {
     loadMap();
     mapBufferEntries();
-    if (_segmentMetadata.getStarTreeV2MetadataList() != null) {
-      loadStarTreeIndex();
-    }
-  }
-
-  private void loadStarTreeIndex()
-      throws IOException {
-    File indexFile = new File(_segmentDirectory, StarTreeV2Constants.INDEX_FILE_NAME);
-    if (_readMode == ReadMode.heap) {
-      _starTreeIndexDataBuffer =
-          PinotDataBuffer.loadFile(indexFile, 0, indexFile.length(), ByteOrder.BIG_ENDIAN, "Star-tree V2 data buffer");
-    } else {
-      _starTreeIndexDataBuffer = PinotDataBuffer.mapFile(indexFile, true, 0, indexFile.length(), ByteOrder.BIG_ENDIAN,
-          "Star-tree V2 data buffer");
-    }
   }
 
   private void loadMap()
@@ -238,7 +218,7 @@ private void loadMap()
 
     for (String key : CommonsConfigurationUtils.getKeys(mapConfig)) {
       String[] parsedKeys = ColumnIndexUtils.parseIndexMapKeys(key, _segmentDirectory.getPath());
-      IndexKey indexKey = new IndexKey(parsedKeys[0], ColumnIndexType.getValue(parsedKeys[1]));
+      IndexKey indexKey = IndexKey.fromIndexName(parsedKeys[0], parsedKeys[1]);
       IndexEntry entry = _columnEntries.get(indexKey);
       if (entry == null) {
         entry = new IndexEntry(indexKey);
@@ -347,7 +327,7 @@ private void cleanupRemovedIndices()
     File tmpIdxFile = new File(_segmentDirectory, V1Constants.INDEX_FILE_NAME + ".tmp");
     // Sort indices by column name and index type while copying, so that the
     // new index_map file is easy to inspect for troubleshooting.
-    List<IndexEntry> retained = copyIndices(_indexFile, tmpIdxFile, new TreeMap<>(_columnEntries));
+    List<IndexEntry> retained = copyIndices(_indexFile, tmpIdxFile, _columnEntries);
 
     FileUtils.deleteQuietly(_indexFile);
     Preconditions
@@ -367,9 +347,6 @@ public void close()
     for (PinotDataBuffer buf : _allocBuffers) {
       buf.close();
     }
-    if (_starTreeIndexDataBuffer != null) {
-      _starTreeIndexDataBuffer.close();
-    }
     // Cleanup removed indices after closing and flushing buffers, so
     // that potential index updates can be persisted across cleanups.
     if (_shouldCleanupRemovedIndices) {
@@ -380,9 +357,9 @@ public void close()
   }
 
   @Override
-  public void removeIndex(String columnName, ColumnIndexType indexType) {
+  public void removeIndex(String columnName, IndexType<?, ?, ?> indexType) {
     // Text index is kept in its own files, thus can be removed directly.
-    if (indexType == ColumnIndexType.TEXT_INDEX) {
+    if (indexType == StandardIndexes.text()) {
       TextIndexUtils.cleanupTextIndex(_segmentDirectory, columnName);
       return;
     }
@@ -394,10 +371,10 @@ public void removeIndex(String columnName, ColumnIndexType indexType) {
   }
 
   @Override
-  public Set<String> getColumnsWithIndex(ColumnIndexType type) {
+  public Set<String> getColumnsWithIndex(IndexType<?, ?, ?> type) {
     Set<String> columns = new HashSet<>();
     // TEXT_INDEX is not tracked via _columnEntries, so handled separately.
-    if (type == ColumnIndexType.TEXT_INDEX) {
+    if (type == StandardIndexes.text()) {
       for (String column : _segmentMetadata.getAllColumns()) {
         if (TextIndexUtils.hasTextIndex(_segmentDirectory, column)) {
           columns.add(column);
@@ -413,21 +390,9 @@ public Set<String> getColumnsWithIndex(ColumnIndexType type) {
     return columns;
   }
 
-  @Override
-  public PinotDataBuffer getStarTreeIndex()
-      throws IOException {
-    return _starTreeIndexDataBuffer;
-  }
-
-  @Override
-  public InputStream getStarTreeIndexMap()
-      throws IOException {
-    return new FileInputStream(new File(_segmentDirectory, StarTreeV2Constants.INDEX_MAP_FILE_NAME));
-  }
-
   @Override
   public String toString() {
-    return _segmentDirectory.toString() + "/" + _indexFile.toString();
+    return _indexFile.toString();
   }
 
   /**
@@ -442,7 +407,7 @@ public String toString() {
    * @throws IOException from FileChannels upon failure to r/w the index files, and simply raised to caller.
    */
   @VisibleForTesting
-  static List<IndexEntry> copyIndices(File srcFile, File destFile, Map<IndexKey, IndexEntry> indicesToCopy)
+  static List<IndexEntry> copyIndices(File srcFile, File destFile, TreeMap<IndexKey, IndexEntry> indicesToCopy)
       throws IOException {
     // Copy index from original index file and append to temp file.
     // Keep track of the index entry pointing to the temp index file.
@@ -452,7 +417,7 @@ static List<IndexEntry> copyIndices(File srcFile, File destFile, Map<IndexKey, I
     try (FileChannel srcCh = new RandomAccessFile(srcFile, "r").getChannel();
         FileChannel dstCh = new RandomAccessFile(destFile, "rw").getChannel()) {
       for (IndexEntry index : indicesToCopy.values()) {
-        srcCh.transferTo(index._startOffset, index._size, dstCh);
+        org.apache.pinot.common.utils.FileUtils.transferBytes(srcCh, index._startOffset, index._size, dstCh);
         retained.add(new IndexEntry(index._key, nextOffset, index._size));
         nextOffset += index._size;
       }
@@ -474,7 +439,7 @@ static void persistIndexMaps(List<IndexEntry> entries, PrintWriter writer) {
 
   private static void persistIndexMap(IndexEntry entry, PrintWriter writer) {
     String colName = entry._key._name;
-    String idxType = entry._key._type.getIndexName();
+    String idxType = entry._key._type.getId();
 
     String startKey = getKey(colName, idxType, true);
     StringBuilder sb = new StringBuilder();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/StarTreeIndexReader.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/StarTreeIndexReader.java
new file mode 100644
index 00000000000..524fab0d235
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/store/StarTreeIndexReader.java
@@ -0,0 +1,190 @@
+/**
+ * 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.pinot.segment.local.segment.store;
+
+import com.google.common.base.Preconditions;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
+import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
+import org.apache.pinot.segment.spi.index.startree.StarTreeV2Metadata;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * This class provides access to the StarTree index data in a segment directory. The StarTree index data is stored in
+ * star_tree_index file, whose content can be parsed according to offset/size from star_tree_index_map file.
+ */
+public class StarTreeIndexReader implements Closeable {
+  private static final Logger LOGGER = LoggerFactory.getLogger(StarTreeIndexReader.class);
+
+  private final File _segmentDirectory;
+  private final SegmentMetadataImpl _segmentMetadata;
+  private final ReadMode _readMode;
+  private final File _indexFile;
+  private final int _numStarTrees;
+
+  // StarTree index can contain multiple index instances, identified by ids like 0, 1, etc.
+  private final Map<Integer, Map<IndexKey, StarTreeIndexEntry>> _indexColumnEntries;
+  private PinotDataBuffer _dataBuffer;
+
+  /**
+   * @param segmentDirectory the segment directory contains StarTree index
+   * @param segmentMetadata  segment metadata must be fully initialized
+   * @param readMode         mmap vs heap mode
+   */
+  public StarTreeIndexReader(File segmentDirectory, SegmentMetadataImpl segmentMetadata, ReadMode readMode)
+      throws IOException {
+    Preconditions.checkNotNull(segmentDirectory);
+    Preconditions.checkArgument(segmentDirectory.exists(), "SegmentDirectory: " + segmentDirectory + " does not exist");
+    Preconditions.checkArgument(segmentDirectory.isDirectory(),
+        "SegmentDirectory: " + segmentDirectory + " is not a directory");
+    Preconditions.checkNotNull(segmentMetadata);
+    Preconditions.checkNotNull(readMode);
+
+    _segmentDirectory = segmentDirectory;
+    _segmentMetadata = segmentMetadata;
+    _readMode = readMode;
+    _numStarTrees = _segmentMetadata.getStarTreeV2MetadataList().size();
+    _indexFile = new File(_segmentDirectory, StarTreeV2Constants.INDEX_FILE_NAME);
+    _indexColumnEntries = new HashMap<>(_numStarTrees);
+    load();
+  }
+
+  private void load()
+      throws IOException {
+    List<Map<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue>> indexMapList;
+    try (InputStream inputStream = new FileInputStream(
+        new File(_segmentDirectory, StarTreeV2Constants.INDEX_MAP_FILE_NAME))) {
+      indexMapList = StarTreeIndexMapUtils.loadFromInputStream(inputStream, _numStarTrees);
+    }
+    if (_readMode == ReadMode.heap) {
+      _dataBuffer = PinotDataBuffer.loadFile(_indexFile, 0, _indexFile.length(), ByteOrder.LITTLE_ENDIAN,
+          "StarTree V2 data buffer from: " + _indexFile);
+    } else {
+      _dataBuffer = PinotDataBuffer.mapFile(_indexFile, true, 0, _indexFile.length(), ByteOrder.LITTLE_ENDIAN,
+          "StarTree V2 data buffer from: " + _indexFile);
+    }
+    for (int i = 0; i < _numStarTrees; i++) {
+      mapBufferEntries(i, indexMapList.get(i));
+    }
+    LOGGER.debug("Loaded StarTree index data buffers: {} in segment: {}", _indexColumnEntries, _segmentDirectory);
+  }
+
+  private void mapBufferEntries(int starTreeId,
+      Map<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue> indexMap) {
+    Map<IndexKey, StarTreeIndexEntry> columnEntries =
+        _indexColumnEntries.computeIfAbsent(starTreeId, k -> new HashMap<>());
+    // Load star-tree index. The index tree doesn't have corresponding column name or column index type to create an
+    // IndexKey. As it's a kind of inverted index, we uniquely identify it with index id and inverted index type.
+    columnEntries.computeIfAbsent(new IndexKey(String.valueOf(starTreeId), StandardIndexes.inverted()),
+        k -> new StarTreeIndexEntry(indexMap.get(StarTreeIndexMapUtils.STAR_TREE_INDEX_KEY), _dataBuffer,
+            ByteOrder.LITTLE_ENDIAN));
+    List<StarTreeV2Metadata> starTreeMetadataList = _segmentMetadata.getStarTreeV2MetadataList();
+    StarTreeV2Metadata starTreeMetadata = starTreeMetadataList.get(starTreeId);
+    // Load dimension forward indexes
+    for (String dimension : starTreeMetadata.getDimensionsSplitOrder()) {
+      IndexKey indexKey = new IndexKey(dimension, StandardIndexes.forward());
+      columnEntries.computeIfAbsent(indexKey, k -> new StarTreeIndexEntry(
+          indexMap.get(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, dimension)),
+          _dataBuffer, ByteOrder.BIG_ENDIAN));
+    }
+    // Load metric (function-column pair) forward indexes
+    for (AggregationFunctionColumnPair functionColumnPair : starTreeMetadata.getFunctionColumnPairs()) {
+      String metric = functionColumnPair.toColumnName();
+      IndexKey indexKey = new IndexKey(metric, StandardIndexes.forward());
+      columnEntries.computeIfAbsent(indexKey, k -> new StarTreeIndexEntry(
+          indexMap.get(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, metric)),
+          _dataBuffer, ByteOrder.BIG_ENDIAN));
+    }
+  }
+
+  public PinotDataBuffer getBuffer(int starTreeId, String column, IndexType<?, ?, ?> type)
+      throws IOException {
+    Map<IndexKey, StarTreeIndexEntry> columnEntries = _indexColumnEntries.get(starTreeId);
+    if (columnEntries == null) {
+      throw new RuntimeException(
+          String.format("Could not find StarTree index: %s in segment: %s", starTreeId, _segmentDirectory.toString()));
+    }
+    StarTreeIndexEntry entry = columnEntries.get(new IndexKey(column, type));
+    if (entry != null && entry._buffer != null) {
+      return entry._buffer;
+    }
+    throw new RuntimeException(
+        String.format("Could not find index for column: %s, type: %s in StarTree index: %s in segment: %s", column,
+            type, starTreeId, _segmentDirectory.toString()));
+  }
+
+  public boolean hasIndexFor(int starTreeId, String column, IndexType<?, ?, ?> type) {
+    Map<IndexKey, StarTreeIndexEntry> columnEntries = _indexColumnEntries.get(starTreeId);
+    if (columnEntries == null) {
+      return false;
+    }
+    return columnEntries.containsKey(new IndexKey(column, type));
+  }
+
+  @Override
+  public String toString() {
+    return _indexFile.toString();
+  }
+
+  @Override
+  public void close()
+      throws IOException {
+    _indexColumnEntries.clear();
+    _dataBuffer.close();
+  }
+
+  private static class StarTreeIndexEntry {
+    private final long _offset;
+    private final long _size;
+    private final PinotDataBuffer _buffer;
+
+    public StarTreeIndexEntry(long offset, long size, PinotDataBuffer buffer) {
+      _offset = offset;
+      _size = size;
+      _buffer = buffer;
+    }
+
+    public StarTreeIndexEntry(StarTreeIndexMapUtils.IndexValue indexValue, PinotDataBuffer dataBuffer,
+        ByteOrder byteOrder) {
+      this(indexValue._offset, indexValue._size,
+          dataBuffer.view(indexValue._offset, indexValue._offset + indexValue._size, byteOrder));
+    }
+
+    @Override
+    public String toString() {
+      return "StarTreeIndexEntry{" + "_offset=" + _offset + ", _size=" + _size + '}';
+    }
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/virtualcolumn/VirtualColumnIndexContainer.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/virtualcolumn/VirtualColumnIndexContainer.java
index 16b9941faeb..9d9e1a6630e 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/virtualcolumn/VirtualColumnIndexContainer.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/virtualcolumn/VirtualColumnIndexContainer.java
@@ -19,16 +19,14 @@
 package org.apache.pinot.segment.local.segment.virtualcolumn;
 
 import java.io.IOException;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
 import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
 
 
 /**
@@ -46,53 +44,18 @@ public VirtualColumnIndexContainer(ForwardIndexReader<?> forwardIndex, InvertedI
     _dictionary = dictionary;
   }
 
+  @Nullable
   @Override
-  public ForwardIndexReader<?> getForwardIndex() {
-    return _forwardIndex;
-  }
-
-  @Override
-  public InvertedIndexReader<?> getInvertedIndex() {
-    return _invertedIndex;
-  }
-
-  @Override
-  public RangeIndexReader<?> getRangeIndex() {
-    return null;
-  }
-
-  @Override
-  public TextIndexReader getTextIndex() {
-    return null;
-  }
-
-  @Override
-  public TextIndexReader getFSTIndex() {
-    return null;
-  }
-
-  @Override
-  public JsonIndexReader getJsonIndex() {
-    return null;
-  }
-
-  @Override
-  public H3IndexReader getH3Index() {
-    return null;
-  }
-
-  @Override
-  public Dictionary getDictionary() {
-    return _dictionary;
-  }
-
-  @Override
-  public BloomFilterReader getBloomFilter() {
-    return null;
-  }
-
-  @Override
-  public NullValueVectorReader getNullValueVector() {
+  public <I extends IndexReader, T extends IndexType<?, I, ?>> I getIndex(T indexType) {
+    if (indexType.equals(StandardIndexes.forward())) {
+      return (I) _forwardIndex;
+    }
+    if (indexType.equals(StandardIndexes.inverted())) {
+      return (I) _invertedIndex;
+    }
+    if (indexType.equals(StandardIndexes.dictionary())) {
+      return (I) _dictionary;
+    }
     return null;
   }
 
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/StarTreeBuilderUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/StarTreeBuilderUtils.java
index 3c681c9c5bd..f9c66d79aba 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/StarTreeBuilderUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/StarTreeBuilderUtils.java
@@ -226,9 +226,9 @@ private static long writeNode(PinotDataBuffer dataBuffer, long offset, TreeNode
 
   /**
    * Returns {@code true} if the given star-tree builder configs do not match the star-tree metadata, in which case the
-   * existing star-trees need to be removed, {@code false} otherwise.
+   * relevant star-trees need to be added/removed, {@code false} otherwise.
    */
-  public static boolean shouldRemoveExistingStarTrees(List<StarTreeV2BuilderConfig> builderConfigs,
+  public static boolean shouldModifyExistingStarTrees(List<StarTreeV2BuilderConfig> builderConfigs,
       List<StarTreeV2Metadata> metadataList) {
     int numStarTrees = builderConfigs.size();
     if (metadataList.size() != numStarTrees) {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/BaseSingleTreeBuilder.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/BaseSingleTreeBuilder.java
index b5f3f7a5710..1c1b03832e7 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/BaseSingleTreeBuilder.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/BaseSingleTreeBuilder.java
@@ -380,12 +380,12 @@ private Map<Integer, TreeNode> constructNonStarNodes(int startDocId, int endDocI
         nodeDimensionValue = dimensionValue;
       }
     }
-    TreeNode laseNode = getNewNode();
-    laseNode._dimensionId = dimensionId;
-    laseNode._dimensionValue = nodeDimensionValue;
-    laseNode._startDocId = nodeStartDocId;
-    laseNode._endDocId = endDocId;
-    nodes.put(nodeDimensionValue, laseNode);
+    TreeNode lastNode = getNewNode();
+    lastNode._dimensionId = dimensionId;
+    lastNode._dimensionValue = nodeDimensionValue;
+    lastNode._startDocId = nodeStartDocId;
+    lastNode._endDocId = endDocId;
+    nodes.put(nodeDimensionValue, lastNode);
     return nodes;
   }
 
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/MultipleTreesBuilder.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/MultipleTreesBuilder.java
index 50f04abe0b4..231825c264f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/MultipleTreesBuilder.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/MultipleTreesBuilder.java
@@ -22,14 +22,15 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
 import org.apache.pinot.segment.local.startree.StarTreeBuilderUtils;
 import org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils;
@@ -63,6 +64,8 @@ public class MultipleTreesBuilder implements Closeable {
   private final File _segmentDirectory;
   private final PropertiesConfiguration _metadataProperties;
   private final ImmutableSegment _segment;
+  private StarTreeIndexSeparator _separator;
+  private File _separatorTempDir;
 
   public enum BuildMode {
     ON_HEAP, OFF_HEAP
@@ -83,7 +86,7 @@ public MultipleTreesBuilder(List<StarTreeV2BuilderConfig> builderConfigs, File i
     _segmentDirectory = SegmentDirectoryPaths.findSegmentDirectory(indexDir);
     _metadataProperties =
         CommonsConfigurationUtils.fromFile(new File(_segmentDirectory, V1Constants.MetadataKeys.METADATA_FILE_NAME));
-    Preconditions.checkState(!_metadataProperties.containsKey(MetadataKey.STAR_TREE_COUNT), "Star-tree already exists");
+    _separator = getSeparator();
     _segment = ImmutableSegmentLoader.load(indexDir, ReadMode.mmap);
   }
 
@@ -115,6 +118,36 @@ public MultipleTreesBuilder(@Nullable List<StarTreeIndexConfig> indexConfigs, bo
     }
   }
 
+  @Nullable
+  private StarTreeIndexSeparator getSeparator()
+      throws Exception {
+    if (!_metadataProperties.containsKey(MetadataKey.STAR_TREE_COUNT)) {
+      return null;
+    }
+    try {
+      _separatorTempDir = new File(_segmentDirectory, StarTreeV2Constants.EXISTING_STAR_TREE_TEMP_DIR);
+      FileUtils.forceMkdir(_separatorTempDir);
+      FileUtils.moveFileToDirectory(
+          new File(_segmentDirectory, StarTreeV2Constants.INDEX_FILE_NAME), _separatorTempDir, false);
+      FileUtils.moveFileToDirectory(
+          new File(_segmentDirectory, StarTreeV2Constants.INDEX_MAP_FILE_NAME), _separatorTempDir, false);
+      StarTreeIndexSeparator separator = new StarTreeIndexSeparator(
+              new File(_separatorTempDir, StarTreeV2Constants.INDEX_MAP_FILE_NAME),
+              new File(_separatorTempDir, StarTreeV2Constants.INDEX_FILE_NAME), _metadataProperties);
+      _metadataProperties.subset(StarTreeV2Constants.MetadataKey.STAR_TREE_SUBSET).clear();
+      SegmentMetadataUtils.savePropertiesConfiguration(_metadataProperties);
+      return separator;
+    } catch (Exception e) {
+      try {
+        FileUtils.forceDelete(_separatorTempDir);
+      } catch (Exception e1) {
+        LOGGER.warn("Caught exception while deleting the separator tmp directory: {}",
+                _separatorTempDir.getAbsolutePath());
+      }
+      throw e;
+    }
+  }
+
   /**
    * Builds the star-trees.
    */
@@ -122,6 +155,7 @@ public void build()
       throws Exception {
     long startTime = System.currentTimeMillis();
     int numStarTrees = _builderConfigs.size();
+    int reusedStarTrees = 0;
     LOGGER.info("Starting building {} star-trees with configs: {} using {} builder", numStarTrees, _builderConfigs,
         _buildMode);
 
@@ -130,15 +164,21 @@ public void build()
       File starTreeIndexDir = new File(_segmentDirectory, StarTreeV2Constants.STAR_TREE_TEMP_DIR);
       FileUtils.forceMkdir(starTreeIndexDir);
       _metadataProperties.addProperty(MetadataKey.STAR_TREE_COUNT, numStarTrees);
-      List<Map<IndexKey, IndexValue>> indexMaps = new ArrayList<>(numStarTrees);
+      List<List<Pair<IndexKey, IndexValue>>> indexMaps = new ArrayList<>(numStarTrees);
 
       // Build all star-trees
       for (int i = 0; i < numStarTrees; i++) {
         StarTreeV2BuilderConfig builderConfig = _builderConfigs.get(i);
         Configuration metadataProperties = _metadataProperties.subset(MetadataKey.getStarTreePrefix(i));
-        try (SingleTreeBuilder singleTreeBuilder = getSingleTreeBuilder(builderConfig, starTreeIndexDir, _segment,
-            metadataProperties, _buildMode)) {
-          singleTreeBuilder.build();
+        if (_separator != null && handleExistingStarTreeAddition(starTreeIndexDir, metadataProperties, builderConfig)) {
+          // Used existing tree
+          LOGGER.info("Reused existing star-tree: {}", builderConfig.toString());
+          reusedStarTrees++;
+        } else {
+          try (SingleTreeBuilder singleTreeBuilder = getSingleTreeBuilder(builderConfig, starTreeIndexDir, _segment,
+              metadataProperties, _buildMode)) {
+            singleTreeBuilder.build();
+          }
         }
         indexMaps.add(indexCombiner.combine(builderConfig, starTreeIndexDir));
       }
@@ -150,7 +190,31 @@ public void build()
       FileUtils.forceDelete(starTreeIndexDir);
     }
 
-    LOGGER.info("Finished building {} star-trees in {}ms", numStarTrees, System.currentTimeMillis() - startTime);
+    LOGGER.info("Finished building {} star-trees ({} reused) in {}ms", numStarTrees, reusedStarTrees,
+        System.currentTimeMillis() - startTime);
+  }
+
+  /**
+   * Helper utility to move the individual star-tree files to the {@param starTreeIndexDir} from where it will be picked
+   * by the combiner to merge them into the single star-tree index file. The method also takes care of updating the
+   * {@param metadataProperties} for the star-tree.
+   * Returns {@code false} if the star-tree is not present in the existing star-trees, otherwise returns {@code true}
+   * upon successful transfer completion
+   */
+  private boolean handleExistingStarTreeAddition(File starTreeIndexDir, Configuration metadataProperties,
+      StarTreeV2BuilderConfig builderConfig)
+      throws IOException {
+    int totalDocs = _separator.separate(starTreeIndexDir, builderConfig);
+    if (totalDocs == -1) {
+      return false;
+    }
+    metadataProperties.setProperty(MetadataKey.TOTAL_DOCS, totalDocs);
+    metadataProperties.setProperty(MetadataKey.DIMENSIONS_SPLIT_ORDER, builderConfig.getDimensionsSplitOrder());
+    metadataProperties.setProperty(MetadataKey.FUNCTION_COLUMN_PAIRS, builderConfig.getFunctionColumnPairs());
+    metadataProperties.setProperty(MetadataKey.MAX_LEAF_RECORDS, builderConfig.getMaxLeafRecords());
+    metadataProperties.setProperty(MetadataKey.SKIP_STAR_NODE_CREATION_FOR_DIMENSIONS,
+        builderConfig.getSkipStarNodeCreationForDimensions());
+    return true;
   }
 
   private static SingleTreeBuilder getSingleTreeBuilder(StarTreeV2BuilderConfig builderConfig, File outputDir,
@@ -165,6 +229,14 @@ private static SingleTreeBuilder getSingleTreeBuilder(StarTreeV2BuilderConfig bu
 
   @Override
   public void close() {
+    if (_separatorTempDir != null) {
+      try {
+        FileUtils.forceDelete(_separatorTempDir);
+      } catch (Exception e) {
+        LOGGER.warn("Caught exception while deleting the separator tmp directory: {}",
+                _separatorTempDir.getAbsolutePath());
+      }
+    }
     _segment.destroy();
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexCombiner.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexCombiner.java
index dbe44c7a130..4d4c805d39c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexCombiner.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexCombiner.java
@@ -24,9 +24,10 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
@@ -52,19 +53,19 @@ public StarTreeIndexCombiner(File indexFile)
   /**
    * Combines the index files inside the given directory into the single index file, then cleans the directory.
    */
-  public Map<IndexKey, IndexValue> combine(StarTreeV2BuilderConfig builderConfig, File starTreeIndexDir)
+  public List<Pair<IndexKey, IndexValue>> combine(StarTreeV2BuilderConfig builderConfig, File starTreeIndexDir)
       throws IOException {
-    Map<IndexKey, IndexValue> indexMap = new HashMap<>();
+    List<Pair<IndexKey, IndexValue>> indexMap = new ArrayList<>();
 
     // Write star-tree index
     File starTreeIndexFile = new File(starTreeIndexDir, StarTreeV2Constants.STAR_TREE_INDEX_FILE_NAME);
-    indexMap.put(STAR_TREE_INDEX_KEY, writeFile(starTreeIndexFile));
+    indexMap.add(Pair.of(STAR_TREE_INDEX_KEY, writeFile(starTreeIndexFile)));
 
     // Write dimension indexes
     for (String dimension : builderConfig.getDimensionsSplitOrder()) {
       File dimensionIndexFile =
           new File(starTreeIndexDir, dimension + V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION);
-      indexMap.put(new IndexKey(IndexType.FORWARD_INDEX, dimension), writeFile(dimensionIndexFile));
+      indexMap.add(Pair.of(new IndexKey(IndexType.FORWARD_INDEX, dimension), writeFile(dimensionIndexFile)));
     }
 
     // Write metric (function-column pair) indexes
@@ -72,7 +73,7 @@ public Map<IndexKey, IndexValue> combine(StarTreeV2BuilderConfig builderConfig,
       String metric = functionColumnPair.toColumnName();
       File metricIndexFile =
           new File(starTreeIndexDir, metric + V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION);
-      indexMap.put(new IndexKey(IndexType.FORWARD_INDEX, metric), writeFile(metricIndexFile));
+      indexMap.add(Pair.of(new IndexKey(IndexType.FORWARD_INDEX, metric), writeFile(metricIndexFile)));
     }
 
     FileUtils.cleanDirectory(starTreeIndexDir);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexSeparator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexSeparator.java
new file mode 100644
index 00000000000..dc475b93fdd
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexSeparator.java
@@ -0,0 +1,154 @@
+/**
+ * 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.pinot.segment.local.startree.v2.builder;
+
+import com.google.common.collect.Lists;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
+import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
+import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
+
+
+/**
+ * The {@code StarTreeIndexSeparator} pulls out the individual star-trees from the common star-tree index file
+ */
+public class StarTreeIndexSeparator implements Closeable {
+
+  private final FileChannel _indexFileChannel;
+  private final List<Map<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue>> _indexMapList;
+  private final List<StarTreeV2BuilderConfig> _builderConfigList;
+  private final List<Integer> _totalDocsList;
+
+  public StarTreeIndexSeparator(File indexMapFile, File indexFile, PropertiesConfiguration metadataProperties)
+      throws IOException {
+    _indexMapList = extractIndexMap(indexMapFile,
+        metadataProperties.getInt(StarTreeV2Constants.MetadataKey.STAR_TREE_COUNT));
+    _indexFileChannel = new RandomAccessFile(indexFile, "r").getChannel();
+    _builderConfigList = extractBuilderConfigs(metadataProperties);
+    _totalDocsList = extractTotalDocsList(metadataProperties);
+  }
+
+  private List<Map<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue>> extractIndexMap(File indexMapFile,
+      int numStarTrees) {
+    try (InputStream inputStream = new FileInputStream(indexMapFile)) {
+      return StarTreeIndexMapUtils.loadFromInputStream(inputStream, numStarTrees);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public List<Integer> extractTotalDocsList(PropertiesConfiguration metadataProperties) {
+    List<Integer> totalDocsList = new ArrayList<>(_indexMapList.size());
+    for (int i = 0; i < _indexMapList.size(); i++) {
+      Configuration metadata = metadataProperties.subset(StarTreeV2Constants.MetadataKey.getStarTreePrefix(i));
+      totalDocsList.add(i, metadata.getInt(StarTreeV2Constants.MetadataKey.TOTAL_DOCS));
+    }
+    return totalDocsList;
+  }
+
+  /**
+   * Extract the list of {@link StarTreeV2BuilderConfig} for each of the star-tree present in the given metadata
+   * properties.
+   * @param metadataProperties index metadata properties
+   * @return List of {@link StarTreeV2BuilderConfig}
+   */
+  public List<StarTreeV2BuilderConfig> extractBuilderConfigs(PropertiesConfiguration metadataProperties) {
+    List<StarTreeV2BuilderConfig> builderConfigList = new ArrayList<>(_indexMapList.size());
+    for (int i = 0; i < _indexMapList.size(); i++) {
+      Configuration metadata = metadataProperties.subset(StarTreeV2Constants.MetadataKey.getStarTreePrefix(i));
+      builderConfigList.add(i, StarTreeV2BuilderConfig.fromIndexConfig(new StarTreeIndexConfig(
+          Lists.newArrayList(metadata.getStringArray(StarTreeV2Constants.MetadataKey.DIMENSIONS_SPLIT_ORDER)),
+          Lists.newArrayList(
+              metadata.getStringArray(StarTreeV2Constants.MetadataKey.SKIP_STAR_NODE_CREATION_FOR_DIMENSIONS)),
+          Lists.newArrayList(metadata.getStringArray(StarTreeV2Constants.MetadataKey.FUNCTION_COLUMN_PAIRS)),
+          metadata.getInt(StarTreeV2Constants.MetadataKey.MAX_LEAF_RECORDS))));
+    }
+    return builderConfigList;
+  }
+
+  /**
+   * Extract star-tree index files of the star-tree represented by the builderConfig.
+   * The extracted star-tree index files are written to the provided starTreeOutputDir.
+   *
+   * @param starTreeOutputDir output directory for extracted star-trees
+   * @param builderConfig {@link StarTreeV2BuilderConfig} of the star-tree to separate
+   * @return if star-tree exist then total docs in the separated tree, else -1
+   * @throws IOException
+   */
+  public int separate(File starTreeOutputDir, StarTreeV2BuilderConfig builderConfig)
+      throws IOException {
+    int treeIndex = _builderConfigList.indexOf(builderConfig);
+    if (treeIndex == -1) {
+      return -1;
+    }
+    separate(starTreeOutputDir, treeIndex);
+    return _totalDocsList.get(treeIndex);
+  }
+
+  private void separate(File starTreeOutputDir, int treeIndex)
+      throws IOException {
+    Map<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue> indexMap = _indexMapList.get(treeIndex);
+    FileUtils.forceMkdir(starTreeOutputDir);
+    for (StarTreeIndexMapUtils.IndexKey key : indexMap.keySet()) {
+      File destIndexFile;
+      switch (key._indexType) {
+        case STAR_TREE:
+          destIndexFile = new File(starTreeOutputDir, StarTreeV2Constants.STAR_TREE_INDEX_FILE_NAME);
+          writeIndexToFile(destIndexFile, indexMap.get(key));
+          break;
+        case FORWARD_INDEX:
+          String suffix = key._column.contains(AggregationFunctionColumnPair.DELIMITER)
+              ? V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION
+              : V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+          destIndexFile = new File(starTreeOutputDir, key._column + suffix);
+          writeIndexToFile(destIndexFile, indexMap.get(key));
+          break;
+        default:
+      }
+    }
+  }
+
+  private void writeIndexToFile(File destFile, StarTreeIndexMapUtils.IndexValue value)
+      throws IOException {
+    try (FileChannel dest = new RandomAccessFile(destFile, "rw").getChannel()) {
+      org.apache.pinot.common.utils.FileUtils.transferBytes(_indexFileChannel, value._offset, value._size, dest);
+    }
+  }
+
+  @Override
+  public void close()
+      throws IOException {
+    _indexFileChannel.close();
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeV2BuilderConfig.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeV2BuilderConfig.java
index 87ea5214cdb..56e778a38b8 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeV2BuilderConfig.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeV2BuilderConfig.java
@@ -21,10 +21,10 @@
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeSet;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
@@ -56,7 +56,7 @@ public static StarTreeV2BuilderConfig fromIndexConfig(StarTreeIndexConfig indexC
 
     Set<String> skipStarNodeCreationForDimensions;
     if (indexConfig.getSkipStarNodeCreationForDimensions() != null) {
-      skipStarNodeCreationForDimensions = new HashSet<>(indexConfig.getSkipStarNodeCreationForDimensions());
+      skipStarNodeCreationForDimensions = new TreeSet<>(indexConfig.getSkipStarNodeCreationForDimensions());
       Preconditions.checkArgument(dimensionsSplitOrder.containsAll(skipStarNodeCreationForDimensions),
           "Can not skip star-node creation for dimensions not in the split order, dimensionsSplitOrder: %s, "
               + "skipStarNodeCreationForDimensions: %s",
@@ -65,7 +65,7 @@ public static StarTreeV2BuilderConfig fromIndexConfig(StarTreeIndexConfig indexC
       skipStarNodeCreationForDimensions = Collections.emptySet();
     }
 
-    Set<AggregationFunctionColumnPair> functionColumnPairs = new HashSet<>();
+    Set<AggregationFunctionColumnPair> functionColumnPairs = new TreeSet<>();
     for (String functionColumnPair : indexConfig.getFunctionColumnPairs()) {
       functionColumnPairs.add(AggregationFunctionColumnPair.fromColumnName(functionColumnPair));
     }
@@ -145,7 +145,7 @@ public static StarTreeV2BuilderConfig generateDefaultConfig(SegmentMetadata segm
     }
     Preconditions.checkState(!dimensionsSplitOrder.isEmpty(), "No qualified dimension found for star-tree split order");
 
-    Set<AggregationFunctionColumnPair> functionColumnPairs = new HashSet<>();
+    Set<AggregationFunctionColumnPair> functionColumnPairs = new TreeSet<>();
     functionColumnPairs.add(AggregationFunctionColumnPair.COUNT_STAR);
     for (String numericMetric : numericMetrics) {
       functionColumnPairs.add(new AggregationFunctionColumnPair(AggregationFunctionType.SUM, numericMetric));
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeDataSource.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeDataSource.java
index e179dd156c8..0b9df128648 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeDataSource.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeDataSource.java
@@ -22,6 +22,8 @@
 import javax.annotation.Nullable;
 import org.apache.pinot.segment.local.segment.index.datasource.BaseDataSource;
 import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
@@ -32,8 +34,12 @@ public class StarTreeDataSource extends BaseDataSource {
 
   public StarTreeDataSource(FieldSpec fieldSpec, int numDocs, ForwardIndexReader<?> forwardIndex,
       @Nullable Dictionary dictionary) {
-    super(new StarTreeDataSourceMetadata(fieldSpec, numDocs), forwardIndex, dictionary, null, null, null, null, null,
-        null, null, null);
+    super(
+        new StarTreeDataSourceMetadata(fieldSpec, numDocs),
+        new ColumnIndexContainer.FromMap.Builder()
+            .with(StandardIndexes.forward(), forwardIndex)
+            .with(StandardIndexes.dictionary(), dictionary)
+            .build());
   }
 
   private static final class StarTreeDataSourceMetadata implements DataSourceMetadata {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexContainer.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexContainer.java
index 3a7220c9532..03b200174be 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexContainer.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexContainer.java
@@ -20,7 +20,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
@@ -38,11 +37,7 @@ public class StarTreeIndexContainer implements Closeable {
   public StarTreeIndexContainer(SegmentDirectory.Reader segmentReader, SegmentMetadataImpl segmentMetadata,
       Map<String, ColumnIndexContainer> indexContainerMap)
       throws IOException {
-    try (InputStream inputStream = segmentReader.getStarTreeIndexMap()) {
-      _starTrees = StarTreeLoaderUtils.loadStarTreeV2(segmentReader.getStarTreeIndex(),
-          StarTreeIndexMapUtils.loadFromInputStream(inputStream, segmentMetadata.getStarTreeV2MetadataList().size()),
-          segmentMetadata, indexContainerMap);
-    }
+    _starTrees = StarTreeLoaderUtils.loadStarTreeV2(segmentReader, segmentMetadata, indexContainerMap);
   }
 
   public List<StarTreeV2> getStarTrees() {
@@ -52,6 +47,10 @@ public List<StarTreeV2> getStarTrees() {
   @Override
   public void close()
       throws IOException {
-    // The startree index buffer is owned by segment reader now.
+    // The startree index data buffer is owned by segment reader, but still need to close those startree instances as
+    // they have created their own fwd value readers.
+    for (StarTreeV2 starTree : _starTrees) {
+      starTree.close();
+    }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexMapUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexMapUtils.java
index d50e5073724..3b989d3c79b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexMapUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeIndexMapUtils.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,9 +31,9 @@
 import javax.annotation.Nullable;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pinot.spi.env.CommonsConfigurationUtils;
 
-
 /**
  * The {@code StarTreeIndexMapUtils} class is a utility class to store/load star-tree index map to/from file.
  * <p>
@@ -81,7 +82,7 @@ public enum IndexType {
   /**
    * Key of the index map.
    */
-  public static class IndexKey {
+  public static class IndexKey implements Comparable<IndexKey> {
     public final IndexType _indexType;
     // For star-tree index, column will be null
     public final String _column;
@@ -112,6 +113,14 @@ public boolean equals(@Nullable Object obj) {
         return false;
       }
     }
+
+    @Override
+    public int compareTo(IndexKey other) {
+      return Comparator
+          .comparing((IndexKey i) -> i._column, Comparator.nullsLast(Comparator.naturalOrder()))
+          .thenComparing((IndexKey i) -> i._indexType)
+          .compare(this, other);
+    }
   }
 
   /**
@@ -138,14 +147,14 @@ public int compareTo(@Nonnull IndexValue o) {
   /**
    * Stores the index maps for multiple star-trees into a file.
    */
-  public static void storeToFile(List<Map<IndexKey, IndexValue>> indexMaps, File indexMapFile) {
+  public static void storeToFile(List<List<Pair<IndexKey, IndexValue>>> indexMaps, File indexMapFile) {
     Preconditions.checkState(!indexMapFile.exists(), "Star-tree index map file already exists");
 
     PropertiesConfiguration configuration = CommonsConfigurationUtils.fromFile(indexMapFile);
     int numStarTrees = indexMaps.size();
     for (int i = 0; i < numStarTrees; i++) {
-      Map<IndexKey, IndexValue> indexMap = indexMaps.get(i);
-      for (Map.Entry<IndexKey, IndexValue> entry : indexMap.entrySet()) {
+      List<Pair<IndexKey, IndexValue>> indexMap = indexMaps.get(i);
+      for (Pair<IndexKey, IndexValue> entry : indexMap) {
         IndexKey key = entry.getKey();
         IndexValue value = entry.getValue();
         configuration.addProperty(key.getPropertyName(i, OFFSET_SUFFIX), value._offset);
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeLoaderUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeLoaderUtils.java
index 899d736542f..0c666703c0f 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeLoaderUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/startree/v2/store/StarTreeLoaderUtils.java
@@ -19,7 +19,6 @@
 package org.apache.pinot.segment.local.startree.v2.store;
 
 import java.io.IOException;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -32,6 +31,7 @@
 import org.apache.pinot.segment.local.startree.OffHeapStarTree;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.datasource.DataSource;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
@@ -39,15 +39,11 @@
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2Metadata;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.data.MetricFieldSpec;
 
-import static org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils.IndexKey;
-import static org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils.IndexType;
-import static org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils.IndexValue;
-import static org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils.STAR_TREE_INDEX_KEY;
-
 
 /**
  * The {@code StarTreeLoaderUtils} class provides utility methods to load star-tree indexes.
@@ -56,21 +52,17 @@ public class StarTreeLoaderUtils {
   private StarTreeLoaderUtils() {
   }
 
-  public static List<StarTreeV2> loadStarTreeV2(PinotDataBuffer dataBuffer,
-      List<Map<IndexKey, IndexValue>> indexMapList, SegmentMetadataImpl segmentMetadata,
-      Map<String, ColumnIndexContainer> indexContainerMap) {
+  public static List<StarTreeV2> loadStarTreeV2(SegmentDirectory.Reader segmentReader,
+      SegmentMetadataImpl segmentMetadata, Map<String, ColumnIndexContainer> indexContainerMap)
+      throws IOException {
     List<StarTreeV2Metadata> starTreeMetadataList = segmentMetadata.getStarTreeV2MetadataList();
     int numStarTrees = starTreeMetadataList.size();
     List<StarTreeV2> starTrees = new ArrayList<>(numStarTrees);
-
     for (int i = 0; i < numStarTrees; i++) {
-      Map<IndexKey, IndexValue> indexMap = indexMapList.get(i);
-
+      SegmentDirectory.Reader indexReader = segmentReader.getStarTreeIndexReader(i);
       // Load star-tree index
-      IndexValue indexValue = indexMap.get(STAR_TREE_INDEX_KEY);
-      long start = indexValue._offset;
-      long end = start + indexValue._size;
-      StarTree starTree = new OffHeapStarTree(dataBuffer.view(start, end, ByteOrder.LITTLE_ENDIAN));
+      StarTree starTree =
+          new OffHeapStarTree(indexReader.getIndexFor(String.valueOf(i), StandardIndexes.inverted()));
 
       StarTreeV2Metadata starTreeMetadata = starTreeMetadataList.get(i);
       int numDocs = starTreeMetadata.getNumDocs();
@@ -78,24 +70,18 @@ public static List<StarTreeV2> loadStarTreeV2(PinotDataBuffer dataBuffer,
 
       // Load dimension forward indexes
       for (String dimension : starTreeMetadata.getDimensionsSplitOrder()) {
-        indexValue = indexMap.get(new IndexKey(IndexType.FORWARD_INDEX, dimension));
-        start = indexValue._offset;
-        end = start + indexValue._size;
-        PinotDataBuffer forwardIndexDataBuffer = dataBuffer.view(start, end, ByteOrder.BIG_ENDIAN);
+        PinotDataBuffer forwardIndexDataBuffer = indexReader.getIndexFor(dimension, StandardIndexes.forward());
         ColumnMetadata columnMetadata = segmentMetadata.getColumnMetadataFor(dimension);
         FixedBitSVForwardIndexReaderV2 forwardIndex =
             new FixedBitSVForwardIndexReaderV2(forwardIndexDataBuffer, numDocs, columnMetadata.getBitsPerElement());
         dataSourceMap.put(dimension, new StarTreeDataSource(columnMetadata.getFieldSpec(), numDocs, forwardIndex,
-            indexContainerMap.get(dimension).getDictionary()));
+            indexContainerMap.get(dimension).getIndex(StandardIndexes.dictionary())));
       }
 
       // Load metric (function-column pair) forward indexes
       for (AggregationFunctionColumnPair functionColumnPair : starTreeMetadata.getFunctionColumnPairs()) {
         String metric = functionColumnPair.toColumnName();
-        indexValue = indexMap.get(new IndexKey(IndexType.FORWARD_INDEX, metric));
-        start = indexValue._offset;
-        end = start + indexValue._size;
-        PinotDataBuffer forwardIndexDataBuffer = dataBuffer.view(start, end, ByteOrder.BIG_ENDIAN);
+        PinotDataBuffer forwardIndexDataBuffer = indexReader.getIndexFor(metric, StandardIndexes.forward());
         DataType dataType = ValueAggregatorFactory.getAggregatedValueType(functionColumnPair.getFunctionType());
         FieldSpec fieldSpec = new MetricFieldSpec(metric, dataType);
         BaseChunkForwardIndexReader forwardIndex;
@@ -134,7 +120,6 @@ public void close()
         }
       });
     }
-
     return starTrees;
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BasePartitionUpsertMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BasePartitionUpsertMetadataManager.java
index 6bc9e94067e..6dc9d2bb7f3 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BasePartitionUpsertMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BasePartitionUpsertMetadataManager.java
@@ -20,15 +20,24 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
+import org.apache.commons.io.FileUtils;
 import org.apache.pinot.common.metrics.ServerGauge;
 import org.apache.pinot.common.metrics.ServerMeter;
 import org.apache.pinot.common.metrics.ServerMetrics;
@@ -37,8 +46,11 @@
 import org.apache.pinot.segment.local.utils.SegmentLocks;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.MutableSegment;
+import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
 import org.apache.pinot.spi.config.table.HashFunction;
+import org.apache.pinot.spi.data.readers.GenericRow;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,33 +63,56 @@ public abstract class BasePartitionUpsertMetadataManager implements PartitionUps
   protected final String _tableNameWithType;
   protected final int _partitionId;
   protected final List<String> _primaryKeyColumns;
-  protected final String _comparisonColumn;
+  protected final List<String> _comparisonColumns;
+  protected final String _deleteRecordColumn;
   protected final HashFunction _hashFunction;
   protected final PartialUpsertHandler _partialUpsertHandler;
   protected final boolean _enableSnapshot;
+  protected final double _metadataTTL;
+  protected final File _tableIndexDir;
   protected final ServerMetrics _serverMetrics;
   protected final Logger _logger;
 
-  @VisibleForTesting
-  public final Set<IndexSegment> _replacedSegments = ConcurrentHashMap.newKeySet();
+  // Tracks all the segments managed by this manager (excluding EmptySegment)
+  protected final Set<IndexSegment> _trackedSegments = ConcurrentHashMap.newKeySet();
+
+  // NOTE: We do not persist snapshot on the first consuming segment because most segments might not be loaded yet
+  protected volatile boolean _gotFirstConsumingSegment = false;
+  protected final ReadWriteLock _snapshotLock;
 
-  protected volatile boolean _closed = false;
+  protected volatile boolean _stopped = false;
+  // Initialize with 1 pending operation to indicate the metadata manager can take more operations
+  protected final AtomicInteger _numPendingOperations = new AtomicInteger(1);
 
   protected long _lastOutOfOrderEventReportTimeNs = Long.MIN_VALUE;
   protected int _numOutOfOrderEvents = 0;
 
+  // Used to maintain the largestSeenComparisonValue to avoid handling out-of-ttl segments/records.
+  // If upsertTTL enabled, we will keep track of largestSeenComparisonValue to compute expired segments.
+  protected volatile double _largestSeenComparisonValue;
+
   protected BasePartitionUpsertMetadataManager(String tableNameWithType, int partitionId,
-      List<String> primaryKeyColumns, String comparisonColumn, HashFunction hashFunction,
-      @Nullable PartialUpsertHandler partialUpsertHandler, boolean enableSnapshot, ServerMetrics serverMetrics) {
+      List<String> primaryKeyColumns, List<String> comparisonColumns, @Nullable String deleteRecordColumn,
+      HashFunction hashFunction, @Nullable PartialUpsertHandler partialUpsertHandler, boolean enableSnapshot,
+      double metadataTTL, File tableIndexDir, ServerMetrics serverMetrics) {
     _tableNameWithType = tableNameWithType;
     _partitionId = partitionId;
     _primaryKeyColumns = primaryKeyColumns;
-    _comparisonColumn = comparisonColumn;
+    _comparisonColumns = comparisonColumns;
+    _deleteRecordColumn = deleteRecordColumn;
     _hashFunction = hashFunction;
     _partialUpsertHandler = partialUpsertHandler;
     _enableSnapshot = enableSnapshot;
+    _metadataTTL = metadataTTL;
+    _tableIndexDir = tableIndexDir;
+    _snapshotLock = enableSnapshot ? new ReentrantReadWriteLock() : null;
     _serverMetrics = serverMetrics;
     _logger = LoggerFactory.getLogger(tableNameWithType + "-" + partitionId + "-" + getClass().getSimpleName());
+    if (metadataTTL > 0) {
+      _largestSeenComparisonValue = loadWatermark();
+    } else {
+      deleteWatermark();
+    }
   }
 
   @Override
@@ -88,33 +123,77 @@ public List<String> getPrimaryKeyColumns() {
   @Override
   public void addSegment(ImmutableSegment segment) {
     String segmentName = segment.getSegmentName();
-    _logger.info("Adding segment: {}, current primary key count: {}", segmentName, getNumPrimaryKeys());
-
+    if (_stopped) {
+      _logger.info("Skip adding segment: {} because metadata manager is already stopped", segment.getSegmentName());
+      return;
+    }
     if (segment instanceof EmptyIndexSegment) {
       _logger.info("Skip adding empty segment: {}", segmentName);
       return;
     }
-
     Preconditions.checkArgument(segment instanceof ImmutableSegmentImpl,
         "Got unsupported segment implementation: {} for segment: {}, table: {}", segment.getClass(), segmentName,
         _tableNameWithType);
+    ImmutableSegmentImpl immutableSegment = (ImmutableSegmentImpl) segment;
+
+    // Skip adding segment that has max comparison value smaller than (largestSeenComparisonValue - TTL)
+    if (_largestSeenComparisonValue > 0) {
+      Preconditions.checkState(_enableSnapshot, "Upsert TTL must have snapshot enabled");
+      Preconditions.checkState(_comparisonColumns.size() == 1,
+          "Upsert TTL does not work with multiple comparison columns");
+      // TODO: Support deletion for TTL. Need to construct queryableDocIds when adding segments out of TTL.
+      Preconditions.checkState(_deleteRecordColumn == null, "Upsert TTL doesn't work with record deletion");
+      Number maxComparisonValue =
+          (Number) segment.getSegmentMetadata().getColumnMetadataMap().get(_comparisonColumns.get(0)).getMaxValue();
+      if (maxComparisonValue.doubleValue() < _largestSeenComparisonValue - _metadataTTL) {
+        _logger.info("Skip adding segment: {} because it's out of TTL", segmentName);
+        MutableRoaringBitmap validDocIdsSnapshot = immutableSegment.loadValidDocIdsFromSnapshot();
+        if (validDocIdsSnapshot != null) {
+          immutableSegment.enableUpsert(this, new ThreadSafeMutableRoaringBitmap(validDocIdsSnapshot), null);
+        } else {
+          _logger.warn("Failed to find snapshot from segment: {} which is out of TTL, treating all documents as valid",
+              segmentName);
+        }
+        return;
+      }
+    }
+
+    if (_enableSnapshot) {
+      _snapshotLock.readLock().lock();
+    }
+    startOperation();
+    try {
+      doAddSegment(immutableSegment);
+      _trackedSegments.add(segment);
+    } finally {
+      finishOperation();
+      if (_enableSnapshot) {
+        _snapshotLock.readLock().unlock();
+      }
+    }
+  }
+
+  protected void doAddSegment(ImmutableSegmentImpl segment) {
+    String segmentName = segment.getSegmentName();
+    _logger.info("Adding segment: {}, current primary key count: {}", segmentName, getNumPrimaryKeys());
+    long startTimeMs = System.currentTimeMillis();
 
-    ImmutableSegmentImpl immutableSegmentImpl = (ImmutableSegmentImpl) segment;
     MutableRoaringBitmap validDocIds;
     if (_enableSnapshot) {
-      validDocIds = immutableSegmentImpl.loadValidDocIdsFromSnapshot();
+      validDocIds = segment.loadValidDocIdsFromSnapshot();
       if (validDocIds != null && validDocIds.isEmpty()) {
         _logger.info("Skip adding segment: {} without valid doc, current primary key count: {}",
             segment.getSegmentName(), getNumPrimaryKeys());
+        segment.enableUpsert(this, new ThreadSafeMutableRoaringBitmap(), null);
         return;
       }
     } else {
       validDocIds = null;
-      immutableSegmentImpl.deleteValidDocIdsSnapshot();
+      segment.deleteValidDocIdsSnapshot();
     }
 
     try (UpsertUtils.RecordInfoReader recordInfoReader = new UpsertUtils.RecordInfoReader(segment, _primaryKeyColumns,
-        _comparisonColumn)) {
+        _comparisonColumns, _deleteRecordColumn)) {
       Iterator<RecordInfo> recordInfoIterator;
       if (validDocIds != null) {
         recordInfoIterator = UpsertUtils.getRecordInfoIterator(recordInfoReader, validDocIds);
@@ -122,7 +201,7 @@ public void addSegment(ImmutableSegment segment) {
         recordInfoIterator =
             UpsertUtils.getRecordInfoIterator(recordInfoReader, segment.getSegmentMetadata().getTotalDocs());
       }
-      addSegment(immutableSegmentImpl, null, recordInfoIterator);
+      addSegment(segment, null, null, recordInfoIterator);
     } catch (Exception e) {
       throw new RuntimeException(
           String.format("Caught exception while adding segment: %s, table: %s", segmentName, _tableNameWithType), e);
@@ -133,16 +212,80 @@ public void addSegment(ImmutableSegment segment) {
     _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.UPSERT_PRIMARY_KEYS_COUNT,
         numPrimaryKeys);
 
-    _logger.info("Finished adding segment: {}, current primary key count: {}", segmentName, numPrimaryKeys);
+    _logger.info("Finished adding segment: {} in {}ms, current primary key count: {}", segmentName,
+        System.currentTimeMillis() - startTimeMs, numPrimaryKeys);
+  }
+
+  @Override
+  public void preloadSegment(ImmutableSegment segment) {
+    String segmentName = segment.getSegmentName();
+    if (_stopped) {
+      _logger.info("Skip preloading segment: {} because metadata manager is already stopped", segmentName);
+      return;
+    }
+    Preconditions.checkArgument(_enableSnapshot, "Snapshot must be enabled to preload segment: {}, table: {}",
+        segmentName, _tableNameWithType);
+    // Note that EmptyIndexSegment should not reach here either, as it doesn't have validDocIds snapshot.
+    Preconditions.checkArgument(segment instanceof ImmutableSegmentImpl,
+        "Got unsupported segment implementation: {} for segment: {}, table: {}", segment.getClass(), segmentName,
+        _tableNameWithType);
+    _snapshotLock.readLock().lock();
+    startOperation();
+    try {
+      doPreloadSegment((ImmutableSegmentImpl) segment);
+      _trackedSegments.add(segment);
+    } finally {
+      finishOperation();
+      _snapshotLock.readLock().unlock();
+    }
+  }
+
+  private void doPreloadSegment(ImmutableSegmentImpl segment) {
+    String segmentName = segment.getSegmentName();
+    _logger.info("Preloading segment: {}, current primary key count: {}", segmentName, getNumPrimaryKeys());
+    long startTimeMs = System.currentTimeMillis();
+
+    MutableRoaringBitmap validDocIds = segment.loadValidDocIdsFromSnapshot();
+    Preconditions.checkState(validDocIds != null,
+        "Snapshot of validDocIds is required to preload segment: {}, table: {}", segmentName, _tableNameWithType);
+    if (validDocIds.isEmpty()) {
+      _logger.info("Skip preloading segment: {} without valid doc, current primary key count: {}",
+          segment.getSegmentName(), getNumPrimaryKeys());
+      segment.enableUpsert(this, new ThreadSafeMutableRoaringBitmap(), null);
+      return;
+    }
+
+    try (UpsertUtils.RecordInfoReader recordInfoReader = new UpsertUtils.RecordInfoReader(segment, _primaryKeyColumns,
+        _comparisonColumns, _deleteRecordColumn)) {
+      addSegment(segment, null, null, UpsertUtils.getRecordInfoIterator(recordInfoReader, validDocIds), true);
+    } catch (Exception e) {
+      throw new RuntimeException(
+          String.format("Caught exception while preloading segment: %s, table: %s", segmentName, _tableNameWithType),
+          e);
+    }
+
+    // Update metrics
+    long numPrimaryKeys = getNumPrimaryKeys();
+    _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.UPSERT_PRIMARY_KEYS_COUNT,
+        numPrimaryKeys);
+    _logger.info("Finished preloading segment: {} in {}ms, current primary key count: {}", segmentName,
+        System.currentTimeMillis() - startTimeMs, numPrimaryKeys);
   }
 
   /**
-   * NOTE: We allow passing in validDocIds here so that the value can be easily accessed from the tests. The passed in
-   *       validDocIds should always be empty.
+   * NOTE: We allow passing in validDocIds and queryableDocIds here so that the value can be easily accessed from the
+   *       tests. The passed in bitmaps should always be empty.
    */
   @VisibleForTesting
   public void addSegment(ImmutableSegmentImpl segment, @Nullable ThreadSafeMutableRoaringBitmap validDocIds,
-      Iterator<RecordInfo> recordInfoIterator) {
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, Iterator<RecordInfo> recordInfoIterator) {
+    addSegment(segment, validDocIds, queryableDocIds, recordInfoIterator, false);
+  }
+
+  @VisibleForTesting
+  public void addSegment(ImmutableSegmentImpl segment, @Nullable ThreadSafeMutableRoaringBitmap validDocIds,
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, Iterator<RecordInfo> recordInfoIterator,
+      boolean isPreloading) {
     String segmentName = segment.getSegmentName();
     Lock segmentLock = SegmentLocks.getSegmentLock(_tableNameWithType, segmentName);
     segmentLock.lock();
@@ -150,7 +293,14 @@ public void addSegment(ImmutableSegmentImpl segment, @Nullable ThreadSafeMutable
       if (validDocIds == null) {
         validDocIds = new ThreadSafeMutableRoaringBitmap();
       }
-      addOrReplaceSegment(segment, validDocIds, recordInfoIterator, null, null);
+      if (queryableDocIds == null && _deleteRecordColumn != null) {
+        queryableDocIds = new ThreadSafeMutableRoaringBitmap();
+      }
+      if (isPreloading) {
+        addSegmentWithoutUpsert(segment, validDocIds, queryableDocIds, recordInfoIterator);
+      } else {
+        addOrReplaceSegment(segment, validDocIds, queryableDocIds, recordInfoIterator, null, null);
+      }
     } finally {
       segmentLock.unlock();
     }
@@ -159,29 +309,81 @@ public void addSegment(ImmutableSegmentImpl segment, @Nullable ThreadSafeMutable
   protected abstract long getNumPrimaryKeys();
 
   protected abstract void addOrReplaceSegment(ImmutableSegmentImpl segment, ThreadSafeMutableRoaringBitmap validDocIds,
-      Iterator<RecordInfo> recordInfoIterator, @Nullable IndexSegment oldSegment,
-      @Nullable MutableRoaringBitmap validDocIdsForOldSegment);
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, Iterator<RecordInfo> recordInfoIterator,
+      @Nullable IndexSegment oldSegment, @Nullable MutableRoaringBitmap validDocIdsForOldSegment);
+
+  protected void addSegmentWithoutUpsert(ImmutableSegmentImpl segment, ThreadSafeMutableRoaringBitmap validDocIds,
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, Iterator<RecordInfo> recordInfoIterator) {
+    addOrReplaceSegment(segment, validDocIds, queryableDocIds, recordInfoIterator, null, null);
+  }
+
+  @Override
+  public void addRecord(MutableSegment segment, RecordInfo recordInfo) {
+    if (_stopped) {
+      _logger.debug("Skip adding record to segment: {} because metadata manager is already stopped",
+          segment.getSegmentName());
+      return;
+    }
+
+    // NOTE: We don't acquire snapshot read lock here because snapshot is always taken before a new consuming segment
+    //       starts consuming, so it won't overlap with this method
+    _gotFirstConsumingSegment = true;
+    startOperation();
+    try {
+      doAddRecord(segment, recordInfo);
+      _trackedSegments.add(segment);
+    } finally {
+      finishOperation();
+    }
+  }
+
+  protected abstract void doAddRecord(MutableSegment segment, RecordInfo recordInfo);
 
   @Override
   public void replaceSegment(ImmutableSegment segment, IndexSegment oldSegment) {
+    if (_stopped) {
+      _logger.info("Skip replacing segment: {} because metadata manager is already stopped", segment.getSegmentName());
+      return;
+    }
+
+    if (_enableSnapshot) {
+      _snapshotLock.readLock().lock();
+    }
+    startOperation();
+    try {
+      doReplaceSegment(segment, oldSegment);
+      if (!(segment instanceof EmptyIndexSegment)) {
+        _trackedSegments.add(segment);
+      }
+      _trackedSegments.remove(oldSegment);
+    } finally {
+      finishOperation();
+      if (_enableSnapshot) {
+        _snapshotLock.readLock().unlock();
+      }
+    }
+  }
+
+  protected void doReplaceSegment(ImmutableSegment segment, IndexSegment oldSegment) {
     String segmentName = segment.getSegmentName();
     Preconditions.checkArgument(segmentName.equals(oldSegment.getSegmentName()),
         "Cannot replace segment with different name for table: {}, old segment: {}, new segment: {}",
         _tableNameWithType, oldSegment.getSegmentName(), segmentName);
     _logger.info("Replacing {} segment: {}, current primary key count: {}",
         oldSegment instanceof ImmutableSegment ? "immutable" : "mutable", segmentName, getNumPrimaryKeys());
+    long startTimeMs = System.currentTimeMillis();
 
     if (segment instanceof EmptyIndexSegment) {
       _logger.info("Skip adding empty segment: {}", segmentName);
-      replaceSegment(segment, null, null, oldSegment);
+      replaceSegment(segment, null, null, null, oldSegment);
       return;
     }
 
     try (UpsertUtils.RecordInfoReader recordInfoReader = new UpsertUtils.RecordInfoReader(segment, _primaryKeyColumns,
-        _comparisonColumn)) {
+        _comparisonColumns, _deleteRecordColumn)) {
       Iterator<RecordInfo> recordInfoIterator =
           UpsertUtils.getRecordInfoIterator(recordInfoReader, segment.getSegmentMetadata().getTotalDocs());
-      replaceSegment(segment, null, recordInfoIterator, oldSegment);
+      replaceSegment(segment, null, null, recordInfoIterator, oldSegment);
     } catch (Exception e) {
       throw new RuntimeException(
           String.format("Caught exception while replacing segment: %s, table: %s", segmentName, _tableNameWithType), e);
@@ -192,18 +394,26 @@ public void replaceSegment(ImmutableSegment segment, IndexSegment oldSegment) {
     _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.UPSERT_PRIMARY_KEYS_COUNT,
         numPrimaryKeys);
 
-    _logger.info("Finished replacing segment: {}, current primary key count: {}", segmentName, numPrimaryKeys);
+    _logger.info("Finished replacing segment: {} in {}ms, current primary key count: {}", segmentName,
+        System.currentTimeMillis() - startTimeMs, numPrimaryKeys);
   }
 
   /**
-   * NOTE: We allow passing in validDocIds here so that the value can be easily accessed from the tests. The passed in
-   *       validDocIds should always be empty.
+   * NOTE: We allow passing in validDocIds and queryableDocIds here so that the value can be easily accessed from the
+   *       tests. The passed in bitmaps should always be empty.
    */
   @VisibleForTesting
   public void replaceSegment(ImmutableSegment segment, @Nullable ThreadSafeMutableRoaringBitmap validDocIds,
-      @Nullable Iterator<RecordInfo> recordInfoIterator, IndexSegment oldSegment) {
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, @Nullable Iterator<RecordInfo> recordInfoIterator,
+      IndexSegment oldSegment) {
     String segmentName = segment.getSegmentName();
     Lock segmentLock = SegmentLocks.getSegmentLock(_tableNameWithType, segmentName);
+
+    // Currently when TTL is enabled, we don't support skip loading out-of-TTL segment with snapshots, since we don't
+    // know which docs are valid in the new segment.
+    // TODO: when ttl is enabled, we can allow
+    //       (1) skip loading segments without any invalid docs.
+    //       (2) assign the invalid docs from the replaced segment to the new segment.
     segmentLock.lock();
     try {
       MutableRoaringBitmap validDocIdsForOldSegment =
@@ -215,8 +425,11 @@ public void replaceSegment(ImmutableSegment segment, @Nullable ThreadSafeMutable
         if (validDocIds == null) {
           validDocIds = new ThreadSafeMutableRoaringBitmap();
         }
-        addOrReplaceSegment((ImmutableSegmentImpl) segment, validDocIds, recordInfoIterator, oldSegment,
-            validDocIdsForOldSegment);
+        if (queryableDocIds == null && _deleteRecordColumn != null) {
+          queryableDocIds = new ThreadSafeMutableRoaringBitmap();
+        }
+        addOrReplaceSegment((ImmutableSegmentImpl) segment, validDocIds, queryableDocIds, recordInfoIterator,
+            oldSegment, validDocIdsForOldSegment);
       }
 
       if (validDocIdsForOldSegment != null && !validDocIdsForOldSegment.isEmpty()) {
@@ -239,45 +452,63 @@ public void replaceSegment(ImmutableSegment segment, @Nullable ThreadSafeMutable
     } finally {
       segmentLock.unlock();
     }
-
-    if (!(oldSegment instanceof EmptyIndexSegment)) {
-      _replacedSegments.add(oldSegment);
-    }
   }
 
   protected abstract void removeSegment(IndexSegment segment, MutableRoaringBitmap validDocIds);
 
   @Override
   public void removeSegment(IndexSegment segment) {
+    String segmentName = segment.getSegmentName();
+    if (_stopped) {
+      _logger.info("Skip removing segment: {} because metadata manager is already stopped", segmentName);
+      return;
+    }
+    if (!_trackedSegments.contains(segment)) {
+      _logger.info("Skip removing untracked (replaced or empty) segment: {}", segmentName);
+      return;
+    }
+
+    // Skip removing segment that has max comparison value smaller than (largestSeenComparisonValue - TTL)
+    if (_largestSeenComparisonValue > 0) {
+      Number maxComparisonValue =
+          (Number) segment.getSegmentMetadata().getColumnMetadataMap().get(_comparisonColumns.get(0)).getMaxValue();
+      if (maxComparisonValue.doubleValue() < _largestSeenComparisonValue - _metadataTTL) {
+        _logger.info("Skip removing segment: {} because it's out of TTL", segmentName);
+        return;
+      }
+    }
+
+    if (_enableSnapshot) {
+      _snapshotLock.readLock().lock();
+    }
+    startOperation();
+    try {
+      doRemoveSegment(segment);
+      _trackedSegments.remove(segment);
+    } finally {
+      finishOperation();
+      if (_enableSnapshot) {
+        _snapshotLock.readLock().unlock();
+      }
+    }
+  }
+
+  protected void doRemoveSegment(IndexSegment segment) {
     String segmentName = segment.getSegmentName();
     _logger.info("Removing {} segment: {}, current primary key count: {}",
         segment instanceof ImmutableSegment ? "immutable" : "mutable", segmentName, getNumPrimaryKeys());
+    long startTimeMs = System.currentTimeMillis();
 
-    if (_replacedSegments.remove(segment)) {
-      _logger.info("Skip removing replaced segment: {}", segmentName);
+    MutableRoaringBitmap validDocIds =
+        segment.getValidDocIds() != null ? segment.getValidDocIds().getMutableRoaringBitmap() : null;
+    if (validDocIds == null || validDocIds.isEmpty()) {
+      _logger.info("Skip removing segment without valid docs: {}", segmentName);
       return;
     }
 
     Lock segmentLock = SegmentLocks.getSegmentLock(_tableNameWithType, segmentName);
     segmentLock.lock();
     try {
-      MutableRoaringBitmap validDocIds =
-          segment.getValidDocIds() != null ? segment.getValidDocIds().getMutableRoaringBitmap() : null;
-
-      if (_enableSnapshot && segment instanceof ImmutableSegmentImpl && validDocIds != null) {
-        ((ImmutableSegmentImpl) segment).persistValidDocIdsSnapshot(validDocIds);
-      }
-
-      if (_closed) {
-        _logger.info("Skip removing segment: {} because metadata manager is already closed", segment);
-        return;
-      }
-
-      if (validDocIds == null || validDocIds.isEmpty()) {
-        _logger.info("Skip removing segment without valid docs: {}", segmentName);
-        return;
-      }
-
       _logger.info("Removing {} primary keys for segment: {}", validDocIds.getCardinality(), segmentName);
       removeSegment(segment, validDocIds);
     } finally {
@@ -289,26 +520,211 @@ public void removeSegment(IndexSegment segment) {
     _serverMetrics.setValueOfPartitionGauge(_tableNameWithType, _partitionId, ServerGauge.UPSERT_PRIMARY_KEYS_COUNT,
         numPrimaryKeys);
 
-    _logger.info("Finished removing segment: {}, current primary key count: {}", segmentName, numPrimaryKeys);
+    _logger.info("Finished removing segment: {} in {}ms, current primary key count: {}", segmentName,
+        System.currentTimeMillis() - startTimeMs, numPrimaryKeys);
   }
 
+  @Override
+  public GenericRow updateRecord(GenericRow record, RecordInfo recordInfo) {
+    // Directly return the record when partial-upsert is not enabled
+    if (_partialUpsertHandler == null) {
+      return record;
+    }
+    if (_stopped) {
+      _logger.debug("Skip updating record because metadata manager is already stopped");
+      return record;
+    }
+
+    startOperation();
+    try {
+      return doUpdateRecord(record, recordInfo);
+    } finally {
+      finishOperation();
+    }
+  }
+
+  protected abstract GenericRow doUpdateRecord(GenericRow record, RecordInfo recordInfo);
+
   protected void handleOutOfOrderEvent(Object currentComparisonValue, Object recordComparisonValue) {
-    _serverMetrics.addMeteredTableValue(_tableNameWithType, ServerMeter.PARTIAL_UPSERT_OUT_OF_ORDER, 1L);
+    boolean isPartialUpsertTable = (_partialUpsertHandler != null);
+    _serverMetrics.addMeteredTableValue(_tableNameWithType,
+        isPartialUpsertTable ? ServerMeter.PARTIAL_UPSERT_OUT_OF_ORDER : ServerMeter.UPSERT_OUT_OF_ORDER, 1L);
     _numOutOfOrderEvents++;
     long currentTimeNs = System.nanoTime();
     if (currentTimeNs - _lastOutOfOrderEventReportTimeNs > OUT_OF_ORDER_EVENT_MIN_REPORT_INTERVAL_NS) {
-      _logger.warn("Skipped {} out-of-order events for partial-upsert table (the last event has current comparison "
-              + "value: {}, record comparison value: {})", _numOutOfOrderEvents, currentComparisonValue,
+      _logger.warn("Skipped {} out-of-order events for {} upsert table {} (the last event has current comparison "
+              + "value: {}, record comparison value: {})", _numOutOfOrderEvents,
+          (isPartialUpsertTable ? "partial" : "full"), _tableNameWithType, currentComparisonValue,
           recordComparisonValue);
       _lastOutOfOrderEventReportTimeNs = currentTimeNs;
       _numOutOfOrderEvents = 0;
     }
   }
 
+  @Override
+  public void takeSnapshot() {
+    if (!_enableSnapshot) {
+      return;
+    }
+    if (_stopped) {
+      _logger.info("Skip taking snapshot because metadata manager is already stopped");
+      return;
+    }
+    if (!_gotFirstConsumingSegment) {
+      _logger.info("Skip taking snapshot before getting the first consuming segment");
+      return;
+    }
+
+    _snapshotLock.writeLock().lock();
+    startOperation();
+    try {
+      doTakeSnapshot();
+    } finally {
+      finishOperation();
+      _snapshotLock.writeLock().unlock();
+    }
+  }
+
+  // TODO: Consider optimizing it by tracking and persisting only the changed snapshot
+  protected void doTakeSnapshot() {
+    int numTrackedSegments = _trackedSegments.size();
+    _logger.info("Taking snapshot for {} segments", numTrackedSegments);
+    long startTimeMs = System.currentTimeMillis();
+
+    int numImmutableSegments = 0;
+    for (IndexSegment segment : _trackedSegments) {
+      if (segment instanceof ImmutableSegmentImpl) {
+        ((ImmutableSegmentImpl) segment).persistValidDocIdsSnapshot();
+        numImmutableSegments++;
+      }
+    }
+
+    _logger.info("Finished taking snapshot for {} immutable segments (out of {} total segments) in {}ms",
+        numImmutableSegments, numTrackedSegments, System.currentTimeMillis() - startTimeMs);
+  }
+
+  /**
+   * Loads watermark from the file if exists.
+   */
+  protected double loadWatermark() {
+    File watermarkFile = getWatermarkFile();
+    if (watermarkFile.exists()) {
+      try {
+        byte[] bytes = FileUtils.readFileToByteArray(watermarkFile);
+        double watermark = ByteBuffer.wrap(bytes).getDouble();
+        _logger.info("Loaded watermark: {} from file for table: {} partition_id: {}", watermark, _tableNameWithType,
+            _partitionId);
+        return watermark;
+      } catch (Exception e) {
+        _logger.warn("Caught exception while loading watermark file: {}, skipping", watermarkFile);
+      }
+    }
+    return Double.MIN_VALUE;
+  }
+
+  /**
+   * Persists watermark to the file.
+   */
+  protected void persistWatermark(double watermark) {
+    File watermarkFile = getWatermarkFile();
+    try {
+      if (watermarkFile.exists()) {
+        if (!FileUtils.deleteQuietly(watermarkFile)) {
+          _logger.warn("Cannot delete watermark file: {}, skipping", watermarkFile);
+          return;
+        }
+      }
+      try (OutputStream outputStream = new FileOutputStream(watermarkFile, false);
+          DataOutputStream dataOutputStream = new DataOutputStream(outputStream)) {
+        dataOutputStream.writeDouble(watermark);
+      }
+      _logger.info("Persisted watermark: {} to file: {}", watermark, watermarkFile);
+    } catch (Exception e) {
+      _logger.warn("Caught exception while persisting watermark file: {}, skipping", watermarkFile);
+    }
+  }
+
+  /**
+   * Deletes the watermark file.
+   */
+  protected void deleteWatermark() {
+    File watermarkFile = getWatermarkFile();
+    if (watermarkFile.exists()) {
+      if (!FileUtils.deleteQuietly(watermarkFile)) {
+        _logger.warn("Cannot delete watermark file: {}, skipping", watermarkFile);
+      }
+    }
+  }
+
+  protected File getWatermarkFile() {
+    return new File(_tableIndexDir, V1Constants.TTL_WATERMARK_TABLE_PARTITION + _partitionId);
+  }
+
+  protected void startOperation() {
+    _numPendingOperations.getAndIncrement();
+  }
+
+  protected void finishOperation() {
+    if (_numPendingOperations.decrementAndGet() == 0) {
+      synchronized (_numPendingOperations) {
+        _numPendingOperations.notifyAll();
+      }
+    }
+  }
+
+  @Override
+  public void removeExpiredPrimaryKeys() {
+    if (_metadataTTL <= 0) {
+      return;
+    }
+    if (_stopped) {
+      _logger.info("Skip removing expired primary keys because metadata manager is already stopped");
+      return;
+    }
+
+    startOperation();
+    try {
+      doRemoveExpiredPrimaryKeys();
+    } finally {
+      finishOperation();
+    }
+  }
+
+  /**
+   * Removes all primary keys that have comparison value smaller than (largestSeenComparisonValue - TTL).
+   */
+  protected abstract void doRemoveExpiredPrimaryKeys();
+
+  @Override
+  public void stop() {
+    _stopped = true;
+    int numPendingOperations = _numPendingOperations.decrementAndGet();
+    _logger.info("Stopped the metadata manager with {} pending operations, current primary key count: {}",
+        numPendingOperations, getNumPrimaryKeys());
+  }
+
   @Override
   public void close()
       throws IOException {
-    _logger.info("Closing the metadata manager, current primary key count: {}", getNumPrimaryKeys());
-    _closed = true;
+    Preconditions.checkState(_stopped, "Must stop the metadata manager before closing it");
+    _logger.info("Closing the metadata manager");
+    synchronized (_numPendingOperations) {
+      int numPendingOperations;
+      while ((numPendingOperations = _numPendingOperations.get()) != 0) {
+        _logger.info("Waiting for {} pending operations to finish", numPendingOperations);
+        try {
+          _numPendingOperations.wait();
+        } catch (InterruptedException e) {
+          throw new RuntimeException(
+              String.format("Interrupted while waiting for %d pending operations to finish", numPendingOperations), e);
+        }
+      }
+    }
+    doClose();
+    _logger.info("Closed the metadata manager");
+  }
+
+  protected void doClose()
+      throws IOException {
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BaseTableUpsertMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BaseTableUpsertMetadataManager.java
index 7147341b69d..e23689ad09c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BaseTableUpsertMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/BaseTableUpsertMetadataManager.java
@@ -18,32 +18,66 @@
  */
 package org.apache.pinot.segment.local.upsert;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.locks.Lock;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.local.utils.SegmentLocks;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
+import org.apache.pinot.spi.config.instance.InstanceDataManagerConfig;
 import org.apache.pinot.spi.config.table.HashFunction;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.UpsertConfig;
 import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 @ThreadSafe
 public abstract class BaseTableUpsertMetadataManager implements TableUpsertMetadataManager {
+  private static final Logger LOGGER = LoggerFactory.getLogger(BaseTableUpsertMetadataManager.class);
+  private TableConfig _tableConfig;
+  private Schema _schema;
+  private TableDataManager _tableDataManager;
   protected String _tableNameWithType;
   protected List<String> _primaryKeyColumns;
-  protected String _comparisonColumn;
+  protected List<String> _comparisonColumns;
+  protected String _deleteRecordColumn;
   protected HashFunction _hashFunction;
   protected PartialUpsertHandler _partialUpsertHandler;
   protected boolean _enableSnapshot;
+  protected double _metadataTTL;
+  protected File _tableIndexDir;
   protected ServerMetrics _serverMetrics;
+  private volatile boolean _isPreloading = false;
 
   @Override
   public void init(TableConfig tableConfig, Schema schema, TableDataManager tableDataManager,
-      ServerMetrics serverMetrics) {
+      ServerMetrics serverMetrics, HelixManager helixManager, @Nullable ExecutorService segmentPreloadExecutor) {
+    _tableConfig = tableConfig;
+    _schema = schema;
+    _tableDataManager = tableDataManager;
     _tableNameWithType = tableConfig.getTableName();
 
     UpsertConfig upsertConfig = tableConfig.getUpsertConfig();
@@ -54,11 +88,12 @@ public void init(TableConfig tableConfig, Schema schema, TableDataManager tableD
     Preconditions.checkArgument(!CollectionUtils.isEmpty(_primaryKeyColumns),
         "Primary key columns must be configured for upsert enabled table: %s", _tableNameWithType);
 
-    _comparisonColumn = upsertConfig.getComparisonColumn();
-    if (_comparisonColumn == null) {
-      _comparisonColumn = tableConfig.getValidationConfig().getTimeColumnName();
+    _comparisonColumns = upsertConfig.getComparisonColumns();
+    if (_comparisonColumns == null) {
+      _comparisonColumns = Collections.singletonList(tableConfig.getValidationConfig().getTimeColumnName());
     }
 
+    _deleteRecordColumn = upsertConfig.getDeleteRecordColumn();
     _hashFunction = upsertConfig.getHashFunction();
 
     if (upsertConfig.getMode() == UpsertConfig.Mode.PARTIAL) {
@@ -67,12 +102,132 @@ public void init(TableConfig tableConfig, Schema schema, TableDataManager tableD
           "Partial-upsert strategies must be configured for partial-upsert enabled table: %s", _tableNameWithType);
       _partialUpsertHandler =
           new PartialUpsertHandler(schema, partialUpsertStrategies, upsertConfig.getDefaultPartialUpsertStrategy(),
-              _comparisonColumn);
+              _comparisonColumns);
     }
 
     _enableSnapshot = upsertConfig.isEnableSnapshot();
-
+    _metadataTTL = upsertConfig.getMetadataTTL();
+    _tableIndexDir = tableDataManager.getTableDataDir();
     _serverMetrics = serverMetrics;
+    if (_enableSnapshot && segmentPreloadExecutor != null && upsertConfig.isEnablePreload()) {
+      // Preloading the segments with snapshots for fast upsert metadata recovery.
+      // Note that there is an implicit waiting logic between the thread doing the segment preloading here and the
+      // other helix threads about to process segment state transitions (e.g. taking segments from OFFLINE to ONLINE).
+      // The thread doing the segment preloading here must complete before the other helix threads start to handle
+      // segment state transitions. This is ensured implicitly because segment preloading happens here when
+      // initializing this TableUpsertMetadataManager, which happens when initializing the TableDataManager, which
+      // happens as the lambda of ConcurrentHashMap.computeIfAbsent() method, which ensures the waiting logic.
+      try {
+        _isPreloading = true;
+        preloadSegments(helixManager, segmentPreloadExecutor);
+      } catch (Exception e) {
+        // Even if preloading fails, we should continue to complete the initialization, so that TableDataManager can be
+        // created. Once TableDataManager is created, no more segment preloading would happen, and the normal segment
+        // loading logic would be used. The segments not being preloaded successfully here would be loaded via the
+        // normal segment loading logic, the one doing more costly checks on the upsert metadata.
+        LOGGER.warn("Failed to preload segments from table: {}, skipping", _tableNameWithType, e);
+        if (e instanceof InterruptedException) {
+          // Restore the interrupted status in case the upper callers want to check.
+          Thread.currentThread().interrupt();
+        }
+      } finally {
+        _isPreloading = false;
+      }
+    }
+  }
+
+  /**
+   * Get the ideal state and find segments assigned to current instance, then preload those with validDocIds snapshot.
+   * Skip those without the snapshots and those whose crc has changed, as they will be handled by normal Helix state
+   * transitions, which will proceed after the preloading phase fully completes.
+   */
+  private void preloadSegments(HelixManager helixManager, ExecutorService segmentPreloadExecutor)
+      throws Exception {
+    LOGGER.info("Preload segments from table: {} for fast upsert metadata recovery", _tableNameWithType);
+    IdealState idealState = HelixHelper.getTableIdealState(helixManager, _tableNameWithType);
+    ZkHelixPropertyStore<ZNRecord> propertyStore = helixManager.getHelixPropertyStore();
+    String instanceId = getInstanceId();
+    IndexLoadingConfig indexLoadingConfig = createIndexLoadingConfig();
+    List<Future<?>> futures = new ArrayList<>();
+    for (String segmentName : idealState.getPartitionSet()) {
+      Map<String, String> instanceStateMap = idealState.getInstanceStateMap(segmentName);
+      String state = instanceStateMap.get(instanceId);
+      if (!CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE.equals(state)) {
+        LOGGER.info("Skip segment: {} as its ideal state: {} is not ONLINE", segmentName, state);
+        continue;
+      }
+      futures.add(segmentPreloadExecutor.submit(() -> {
+        try {
+          preloadSegment(segmentName, indexLoadingConfig, propertyStore);
+        } catch (Exception e) {
+          LOGGER.warn("Failed to preload segment: {} from table: {}, skipping", segmentName, _tableNameWithType, e);
+        }
+      }));
+    }
+    try {
+      for (Future<?> f : futures) {
+        f.get();
+      }
+    } finally {
+      for (Future<?> f : futures) {
+        if (!f.isDone()) {
+          f.cancel(true);
+        }
+      }
+    }
+    LOGGER.info("Preloaded segments from table: {} for fast upsert metadata recovery", _tableNameWithType);
+  }
+
+  private String getInstanceId() {
+    InstanceDataManagerConfig instanceDataManagerConfig =
+        _tableDataManager.getTableDataManagerConfig().getInstanceDataManagerConfig();
+    return instanceDataManagerConfig.getInstanceId();
+  }
+
+  @VisibleForTesting
+  protected IndexLoadingConfig createIndexLoadingConfig() {
+    return new IndexLoadingConfig(_tableDataManager.getTableDataManagerConfig().getInstanceDataManagerConfig(),
+        _tableConfig, _schema);
+  }
+
+  private void preloadSegment(String segmentName, IndexLoadingConfig indexLoadingConfig,
+      ZkHelixPropertyStore<ZNRecord> propertyStore) {
+    LOGGER.info("Preload segment: {} from table: {}", segmentName, _tableNameWithType);
+    SegmentZKMetadata zkMetadata =
+        ZKMetadataProvider.getSegmentZKMetadata(propertyStore, _tableNameWithType, segmentName);
+    Preconditions.checkState(zkMetadata != null, "Failed to find ZK metadata for segment: %s, table: %s", segmentName,
+        _tableNameWithType);
+    File snapshotFile = getValidDocIdsSnapshotFile(segmentName, zkMetadata.getTier());
+    if (!snapshotFile.exists()) {
+      LOGGER.info("Skip segment: {} as no validDocIds snapshot at: {}", segmentName, snapshotFile);
+      return;
+    }
+    preloadSegmentWithSnapshot(segmentName, indexLoadingConfig, zkMetadata);
+    LOGGER.info("Preloaded segment: {} from table: {}", segmentName, _tableNameWithType);
+  }
+
+  @VisibleForTesting
+  protected void preloadSegmentWithSnapshot(String segmentName, IndexLoadingConfig indexLoadingConfig,
+      SegmentZKMetadata zkMetadata) {
+    // This method might modify the file on disk. Use segment lock to prevent race condition
+    Lock segmentLock = SegmentLocks.getSegmentLock(_tableNameWithType, segmentName);
+    try {
+      segmentLock.lock();
+      // This method checks segment crc and if it has changed, the segment is not loaded.
+      _tableDataManager.tryLoadExistingSegment(segmentName, indexLoadingConfig, zkMetadata);
+    } finally {
+      segmentLock.unlock();
+    }
+  }
+
+  private File getValidDocIdsSnapshotFile(String segmentName, String segmentTier) {
+    File indexDir = _tableDataManager.getSegmentDataDir(segmentName, segmentTier, _tableConfig);
+    return new File(SegmentDirectoryPaths.findSegmentDirectory(indexDir), V1Constants.VALID_DOC_IDS_SNAPSHOT_FILE_NAME);
+  }
+
+  @Override
+  public boolean isPreloading() {
+    return _isPreloading;
   }
 
   @Override
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ComparisonColumns.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ComparisonColumns.java
new file mode 100644
index 00000000000..174e441a20d
--- /dev/null
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ComparisonColumns.java
@@ -0,0 +1,108 @@
+/**
+ * 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.pinot.segment.local.upsert;
+
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ComparisonColumns implements Comparable<ComparisonColumns> {
+  private final Comparable[] _values;
+  private final int _comparableIndex;
+  public static final int SEALED_SEGMENT_COMPARISON_INDEX = -1;
+
+  public ComparisonColumns(Comparable[] values, int comparableIndex) {
+    _values = values;
+    _comparableIndex = comparableIndex;
+  }
+
+  public Comparable[] getValues() {
+    return _values;
+  }
+
+  public int getComparableIndex() {
+    return _comparableIndex;
+  }
+
+  public int compareToSealed(ComparisonColumns other) {
+      /*
+       - iterate over all columns
+       - if any value in _values is greater than its counterpart in _other._values, keep _values as-is and return 1
+       - if any value in _values is less than its counterpart  in _other._values, keep _values as-is and return -1
+       - if all values between the two sets of Comparables are equal (compareTo == 0), keep _values as-is and return 0
+       */
+    for (int i = 0; i < _values.length; i++) {
+      Comparable comparisonValue = _values[i];
+      Comparable otherComparisonValue = other.getValues()[i];
+      if (comparisonValue == null && otherComparisonValue == null) {
+        continue;
+      }
+
+      // Always keep the record with non-null value, or that with the greater comparisonResult
+      if (comparisonValue == null) {
+        // implies comparisonValue == null && otherComparisonValue != null
+        return -1;
+      } else if (otherComparisonValue == null) {
+        // implies comparisonValue != null && otherComparisonValue == null
+        return 1;
+      } else {
+        int comparisonResult = comparisonValue.compareTo(otherComparisonValue);
+        if (comparisonResult != 0) {
+          return comparisonResult;
+        }
+      }
+    }
+    return 0;
+  }
+
+  @Override
+  public int compareTo(ComparisonColumns other) {
+    if (_comparableIndex == SEALED_SEGMENT_COMPARISON_INDEX) {
+      return compareToSealed(other);
+    }
+
+    // _comparisonColumns should only at most one non-null comparison value for newly ingested data. If not, it is
+    // the user's responsibility. There is no attempt to guarantee behavior in the case where there are multiple
+    // non-null values
+    int comparisonResult;
+
+    Comparable comparisonValue = _values[_comparableIndex];
+    Comparable otherComparisonValue = other.getValues()[_comparableIndex];
+
+    if (otherComparisonValue == null) {
+      // Keep this record because the existing record has no value for the same comparison column, therefore the
+      // (lack of) existing value could not possibly cause the new value to be rejected.
+      comparisonResult = 1;
+    } else {
+      comparisonResult = comparisonValue.compareTo(otherComparisonValue);
+    }
+
+    if (comparisonResult >= 0) {
+      // TODO(egalpin):  This method currently may have side-effects on _values. Depending on the comparison result,
+      //  entities from {@param other} may be merged into _values. This really should not be done implicitly as part
+      //  of compareTo, but has been implemented this way to minimize the changes required within all subclasses of
+      //  {@link BasePartitionUpsertMetadataManager}. Ideally, this merge should only be triggered explicitly by
+      //  implementations of {@link BasePartitionUpsertMetadataManager}.
+      for (int i = 0; i < _values.length; i++) {
+        if (i != _comparableIndex) {
+          _values[i] = other._values[i];
+        }
+      }
+    }
+    return comparisonResult;
+  }
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManager.java
index e11c1899f3b..3ce09412e3a 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManager.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.segment.local.upsert;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -57,10 +58,11 @@ public class ConcurrentMapPartitionUpsertMetadataManager extends BasePartitionUp
   private final GenericRow _reuse = new GenericRow();
 
   public ConcurrentMapPartitionUpsertMetadataManager(String tableNameWithType, int partitionId,
-      List<String> primaryKeyColumns, String comparisonColumn, HashFunction hashFunction,
-      @Nullable PartialUpsertHandler partialUpsertHandler, boolean enableSnapshot, ServerMetrics serverMetrics) {
-    super(tableNameWithType, partitionId, primaryKeyColumns, comparisonColumn, hashFunction, partialUpsertHandler,
-        enableSnapshot, serverMetrics);
+      List<String> primaryKeyColumns, List<String> comparisonColumns, @Nullable String deleteRecordColumn,
+      HashFunction hashFunction, @Nullable PartialUpsertHandler partialUpsertHandler, boolean enableSnapshot,
+      double metadataTTL, File tableIndexDir, ServerMetrics serverMetrics) {
+    super(tableNameWithType, partitionId, primaryKeyColumns, comparisonColumns, deleteRecordColumn, hashFunction,
+        partialUpsertHandler, enableSnapshot, metadataTTL, tableIndexDir, serverMetrics);
   }
 
   @Override
@@ -70,29 +72,31 @@ protected long getNumPrimaryKeys() {
 
   @Override
   protected void addOrReplaceSegment(ImmutableSegmentImpl segment, ThreadSafeMutableRoaringBitmap validDocIds,
-      Iterator<RecordInfo> recordInfoIterator, @Nullable IndexSegment oldSegment,
-      @Nullable MutableRoaringBitmap validDocIdsForOldSegment) {
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, Iterator<RecordInfo> recordInfoIterator,
+      @Nullable IndexSegment oldSegment, @Nullable MutableRoaringBitmap validDocIdsForOldSegment) {
     String segmentName = segment.getSegmentName();
-    segment.enableUpsert(this, validDocIds);
+    segment.enableUpsert(this, validDocIds, queryableDocIds);
 
     AtomicInteger numKeysInWrongSegment = new AtomicInteger();
     while (recordInfoIterator.hasNext()) {
       RecordInfo recordInfo = recordInfoIterator.next();
+      int newDocId = recordInfo.getDocId();
+      Comparable newComparisonValue = recordInfo.getComparisonValue();
       _primaryKeyToRecordLocationMap.compute(HashUtils.hashPrimaryKey(recordInfo.getPrimaryKey(), _hashFunction),
           (primaryKey, currentRecordLocation) -> {
             if (currentRecordLocation != null) {
               // Existing primary key
               IndexSegment currentSegment = currentRecordLocation.getSegment();
-              int comparisonResult =
-                  recordInfo.getComparisonValue().compareTo(currentRecordLocation.getComparisonValue());
+              int currentDocId = currentRecordLocation.getDocId();
+              int comparisonResult = newComparisonValue.compareTo(currentRecordLocation.getComparisonValue());
 
               // The current record is in the same segment
               // Update the record location when there is a tie to keep the newer record. Note that the record info
               // iterator will return records with incremental doc ids.
               if (currentSegment == segment) {
                 if (comparisonResult >= 0) {
-                  validDocIds.replace(currentRecordLocation.getDocId(), recordInfo.getDocId());
-                  return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+                  replaceDocId(validDocIds, queryableDocIds, currentDocId, newDocId, recordInfo);
+                  return new RecordLocation(segment, newDocId, newComparisonValue);
                 } else {
                   return currentRecordLocation;
                 }
@@ -106,11 +110,11 @@ protected void addOrReplaceSegment(ImmutableSegmentImpl segment, ThreadSafeMutab
               // snapshot for the old segment, which can be updated and used to track the docs not replaced yet.
               if (currentSegment == oldSegment) {
                 if (comparisonResult >= 0) {
-                  validDocIds.add(recordInfo.getDocId());
+                  addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
                   if (validDocIdsForOldSegment != null) {
-                    validDocIdsForOldSegment.remove(currentRecordLocation.getDocId());
+                    validDocIdsForOldSegment.remove(currentDocId);
                   }
-                  return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+                  return new RecordLocation(segment, newDocId, newComparisonValue);
                 } else {
                   return currentRecordLocation;
                 }
@@ -122,8 +126,8 @@ protected void addOrReplaceSegment(ImmutableSegmentImpl segment, ThreadSafeMutab
               if (currentSegmentName.equals(segmentName)) {
                 numKeysInWrongSegment.getAndIncrement();
                 if (comparisonResult >= 0) {
-                  validDocIds.add(recordInfo.getDocId());
-                  return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+                  addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
+                  return new RecordLocation(segment, newDocId, newComparisonValue);
                 } else {
                   return currentRecordLocation;
                 }
@@ -137,16 +141,16 @@ protected void addOrReplaceSegment(ImmutableSegmentImpl segment, ThreadSafeMutab
                   segmentName) && LLCSegmentName.isLowLevelConsumerSegmentName(currentSegmentName)
                   && LLCSegmentName.getSequenceNumber(segmentName) > LLCSegmentName.getSequenceNumber(
                   currentSegmentName))) {
-                Objects.requireNonNull(currentSegment.getValidDocIds()).remove(currentRecordLocation.getDocId());
-                validDocIds.add(recordInfo.getDocId());
-                return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+                removeDocId(currentSegment, currentDocId);
+                addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
+                return new RecordLocation(segment, newDocId, newComparisonValue);
               } else {
                 return currentRecordLocation;
               }
             } else {
               // New primary key
-              validDocIds.add(recordInfo.getDocId());
-              return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+              addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
+              return new RecordLocation(segment, newDocId, newComparisonValue);
             }
           });
     }
@@ -157,9 +161,52 @@ protected void addOrReplaceSegment(ImmutableSegmentImpl segment, ThreadSafeMutab
     }
   }
 
+  @Override
+  protected void addSegmentWithoutUpsert(ImmutableSegmentImpl segment, ThreadSafeMutableRoaringBitmap validDocIds,
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, Iterator<RecordInfo> recordInfoIterator) {
+    segment.enableUpsert(this, validDocIds, queryableDocIds);
+    while (recordInfoIterator.hasNext()) {
+      RecordInfo recordInfo = recordInfoIterator.next();
+      int newDocId = recordInfo.getDocId();
+      Comparable newComparisonValue = recordInfo.getComparisonValue();
+      addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
+      _primaryKeyToRecordLocationMap.put(HashUtils.hashPrimaryKey(recordInfo.getPrimaryKey(), _hashFunction),
+          new RecordLocation(segment, newDocId, newComparisonValue));
+    }
+  }
+
+  private static void replaceDocId(ThreadSafeMutableRoaringBitmap validDocIds,
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, int oldDocId, int newDocId, RecordInfo recordInfo) {
+    validDocIds.replace(oldDocId, newDocId);
+    if (queryableDocIds != null) {
+      if (recordInfo.isDeleteRecord()) {
+        queryableDocIds.remove(oldDocId);
+      } else {
+        queryableDocIds.replace(oldDocId, newDocId);
+      }
+    }
+  }
+
+  private static void addDocId(ThreadSafeMutableRoaringBitmap validDocIds,
+      @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds, int docId, RecordInfo recordInfo) {
+    validDocIds.add(docId);
+    if (queryableDocIds != null && !recordInfo.isDeleteRecord()) {
+      queryableDocIds.add(docId);
+    }
+  }
+
+  private static void removeDocId(IndexSegment segment, int docId) {
+    Objects.requireNonNull(segment.getValidDocIds()).remove(docId);
+    ThreadSafeMutableRoaringBitmap currentQueryableDocIds = segment.getQueryableDocIds();
+    if (currentQueryableDocIds != null) {
+      currentQueryableDocIds.remove(docId);
+    }
+  }
+
   @Override
   protected void removeSegment(IndexSegment segment, MutableRoaringBitmap validDocIds) {
     assert !validDocIds.isEmpty();
+
     PrimaryKey primaryKey = new PrimaryKey(new Object[_primaryKeyColumns.size()]);
     PeekableIntIterator iterator = validDocIds.getIntIterator();
     try (
@@ -182,32 +229,52 @@ protected void removeSegment(IndexSegment segment, MutableRoaringBitmap validDoc
   }
 
   @Override
-  public void addRecord(MutableSegment segment, RecordInfo recordInfo) {
+  public void doRemoveExpiredPrimaryKeys() {
+    double threshold = _largestSeenComparisonValue - _metadataTTL;
+    _primaryKeyToRecordLocationMap.forEach((primaryKey, recordLocation) -> {
+      if (((Number) recordLocation.getComparisonValue()).doubleValue() < threshold) {
+        _primaryKeyToRecordLocationMap.remove(primaryKey, recordLocation);
+      }
+    });
+    persistWatermark(_largestSeenComparisonValue);
+  }
+
+  @Override
+  protected void doAddRecord(MutableSegment segment, RecordInfo recordInfo) {
     ThreadSafeMutableRoaringBitmap validDocIds = Objects.requireNonNull(segment.getValidDocIds());
+    ThreadSafeMutableRoaringBitmap queryableDocIds = segment.getQueryableDocIds();
+    int newDocId = recordInfo.getDocId();
+    Comparable newComparisonValue = recordInfo.getComparisonValue();
     _primaryKeyToRecordLocationMap.compute(HashUtils.hashPrimaryKey(recordInfo.getPrimaryKey(), _hashFunction),
         (primaryKey, currentRecordLocation) -> {
+          // Update largestSeenComparisonValue when adding new record
+          if (_metadataTTL > 0) {
+            double comparisonValue = ((Number) recordInfo.getComparisonValue()).doubleValue();
+            _largestSeenComparisonValue = Math.max(_largestSeenComparisonValue, comparisonValue);
+          }
           if (currentRecordLocation != null) {
             // Existing primary key
 
             // Update the record location when the new comparison value is greater than or equal to the current value.
             // Update the record location when there is a tie to keep the newer record.
-            if (recordInfo.getComparisonValue().compareTo(currentRecordLocation.getComparisonValue()) >= 0) {
+            if (newComparisonValue.compareTo(currentRecordLocation.getComparisonValue()) >= 0) {
               IndexSegment currentSegment = currentRecordLocation.getSegment();
               int currentDocId = currentRecordLocation.getDocId();
               if (segment == currentSegment) {
-                validDocIds.replace(currentDocId, recordInfo.getDocId());
+                replaceDocId(validDocIds, queryableDocIds, currentDocId, newDocId, recordInfo);
               } else {
-                Objects.requireNonNull(currentSegment.getValidDocIds()).remove(currentDocId);
-                validDocIds.add(recordInfo.getDocId());
+                removeDocId(currentSegment, currentDocId);
+                addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
               }
-              return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+              return new RecordLocation(segment, newDocId, newComparisonValue);
             } else {
+              handleOutOfOrderEvent(currentRecordLocation.getComparisonValue(), recordInfo.getComparisonValue());
               return currentRecordLocation;
             }
           } else {
             // New primary key
-            validDocIds.add(recordInfo.getDocId());
-            return new RecordLocation(segment, recordInfo.getDocId(), recordInfo.getComparisonValue());
+            addDocId(validDocIds, queryableDocIds, newDocId, recordInfo);
+            return new RecordLocation(segment, newDocId, newComparisonValue);
           }
         });
 
@@ -217,34 +284,29 @@ public void addRecord(MutableSegment segment, RecordInfo recordInfo) {
   }
 
   @Override
-  public GenericRow updateRecord(GenericRow record, RecordInfo recordInfo) {
-    // Directly return the record when partial-upsert is not enabled
-    if (_partialUpsertHandler == null) {
-      return record;
-    }
-
+  protected GenericRow doUpdateRecord(GenericRow record, RecordInfo recordInfo) {
+    assert _partialUpsertHandler != null;
     AtomicReference<GenericRow> previousRecordReference = new AtomicReference<>();
-    RecordLocation currentRecordLocation = _primaryKeyToRecordLocationMap.computeIfPresent(
-        HashUtils.hashPrimaryKey(recordInfo.getPrimaryKey(), _hashFunction), (pk, recordLocation) -> {
-          if (recordInfo.getComparisonValue().compareTo(recordLocation.getComparisonValue()) >= 0) {
-            _reuse.clear();
-            previousRecordReference.set(recordLocation.getSegment().getRecord(recordLocation.getDocId(), _reuse));
+    _primaryKeyToRecordLocationMap.computeIfPresent(HashUtils.hashPrimaryKey(recordInfo.getPrimaryKey(), _hashFunction),
+        (pk, recordLocation) -> {
+          // Read the previous record if the following conditions are met:
+          // - New record is not a DELETE record
+          // - New record is not out-of-order
+          // - Previous record is not deleted
+          if (!recordInfo.isDeleteRecord()
+              && recordInfo.getComparisonValue().compareTo(recordLocation.getComparisonValue()) >= 0) {
+            IndexSegment currentSegment = recordLocation.getSegment();
+            ThreadSafeMutableRoaringBitmap currentQueryableDocIds = currentSegment.getQueryableDocIds();
+            int currentDocId = recordLocation.getDocId();
+            if (currentQueryableDocIds == null || currentQueryableDocIds.contains(currentDocId)) {
+              _reuse.clear();
+              previousRecordReference.set(currentSegment.getRecord(currentDocId, _reuse));
+            }
           }
           return recordLocation;
         });
-    if (currentRecordLocation != null) {
-      // Existing primary key
-      GenericRow previousRecord = previousRecordReference.get();
-      if (previousRecord != null) {
-        return _partialUpsertHandler.merge(previousRecord, record);
-      } else {
-        handleOutOfOrderEvent(currentRecordLocation.getComparisonValue(), recordInfo.getComparisonValue());
-        return record;
-      }
-    } else {
-      // New primary key
-      return record;
-    }
+    GenericRow previousRecord = previousRecordReference.get();
+    return previousRecord != null ? _partialUpsertHandler.merge(previousRecord, record) : record;
   }
 
   @VisibleForTesting
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManager.java
index 3f830bb3a79..33802036560 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManager.java
@@ -36,15 +36,22 @@ public class ConcurrentMapTableUpsertMetadataManager extends BaseTableUpsertMeta
   public ConcurrentMapPartitionUpsertMetadataManager getOrCreatePartitionManager(int partitionId) {
     return _partitionMetadataManagerMap.computeIfAbsent(partitionId,
         k -> new ConcurrentMapPartitionUpsertMetadataManager(_tableNameWithType, k, _primaryKeyColumns,
-            _comparisonColumn, _hashFunction, _partialUpsertHandler, _enableSnapshot, _serverMetrics));
+            _comparisonColumns, _deleteRecordColumn, _hashFunction, _partialUpsertHandler,
+            _enableSnapshot, _metadataTTL, _tableIndexDir, _serverMetrics));
+  }
+
+  @Override
+  public void stop() {
+    for (ConcurrentMapPartitionUpsertMetadataManager metadataManager : _partitionMetadataManagerMap.values()) {
+      metadataManager.stop();
+    }
   }
 
   @Override
   public void close()
       throws IOException {
-    for (ConcurrentMapPartitionUpsertMetadataManager partitionUpsertMetadataManager
-        : _partitionMetadataManagerMap.values()) {
-      partitionUpsertMetadataManager.close();
+    for (ConcurrentMapPartitionUpsertMetadataManager metadataManager : _partitionMetadataManagerMap.values()) {
+      metadataManager.close();
     }
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandler.java
index 3444a5ac549..86c268e509c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandler.java
@@ -35,13 +35,13 @@ public class PartialUpsertHandler {
   // _column2Mergers maintains the mapping of merge strategies per columns.
   private final Map<String, PartialUpsertMerger> _column2Mergers = new HashMap<>();
   private final PartialUpsertMerger _defaultPartialUpsertMerger;
-  private final String _comparisonColumn;
+  private final List<String> _comparisonColumns;
   private final List<String> _primaryKeyColumns;
 
   public PartialUpsertHandler(Schema schema, Map<String, UpsertConfig.Strategy> partialUpsertStrategies,
-      UpsertConfig.Strategy defaultPartialUpsertStrategy, String comparisonColumn) {
+      UpsertConfig.Strategy defaultPartialUpsertStrategy, List<String> comparisonColumns) {
     _defaultPartialUpsertMerger = PartialUpsertMergerFactory.getMerger(defaultPartialUpsertStrategy);
-    _comparisonColumn = comparisonColumn;
+    _comparisonColumns = comparisonColumns;
     _primaryKeyColumns = schema.getPrimaryKeyColumns();
 
     for (Map.Entry<String, UpsertConfig.Strategy> entry : partialUpsertStrategies.entrySet()) {
@@ -66,12 +66,16 @@ public PartialUpsertHandler(Schema schema, Map<String, UpsertConfig.Strategy> pa
    */
   public GenericRow merge(GenericRow previousRecord, GenericRow newRecord) {
     for (String column : previousRecord.getFieldToValueMap().keySet()) {
-      if (!_primaryKeyColumns.contains(column) && !_comparisonColumn.equals(column)) {
+      if (!_primaryKeyColumns.contains(column)) {
         if (!previousRecord.isNullValue(column)) {
           if (newRecord.isNullValue(column)) {
+            // Note that we intentionally want to overwrite any previous _comparisonColumn value in the case of using
+            // multiple comparison columns. We never apply a merge function to it, rather we just take any/all non-null
+            // comparison column values from the previous record, and the sole non-null comparison column value from
+            // the new record.
             newRecord.putValue(column, previousRecord.getValue(column));
             newRecord.removeNullValueField(column);
-          } else {
+          } else if (!_comparisonColumns.contains(column)) {
             PartialUpsertMerger merger = _column2Mergers.getOrDefault(column, _defaultPartialUpsertMerger);
             newRecord.putValue(column,
                 merger.merge(previousRecord.getValue(column), newRecord.getValue(column)));
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartitionUpsertMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartitionUpsertMetadataManager.java
index ef5ec7c4141..6ebd08c74cf 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartitionUpsertMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/PartitionUpsertMetadataManager.java
@@ -64,6 +64,13 @@ public interface PartitionUpsertMetadataManager extends Closeable {
    */
   void addSegment(ImmutableSegment segment);
 
+  /**
+   * Different from adding a segment, when preloading a segment, the upsert metadata may be updated more efficiently.
+   * Basically the upsert metadata can be directly updated for each primary key, without doing the more costly
+   * read-compare-update.
+   */
+  void preloadSegment(ImmutableSegment segment);
+
   /**
    * Updates the upsert metadata for a new consumed record in the given consuming segment.
    */
@@ -83,4 +90,20 @@ public interface PartitionUpsertMetadataManager extends Closeable {
    * Returns the merged record when partial-upsert is enabled.
    */
   GenericRow updateRecord(GenericRow record, RecordInfo recordInfo);
+
+  /**
+   * Takes snapshot for all the tracked immutable segments when snapshot is enabled. This method should be invoked
+   * before a new consuming segment starts consuming.
+   */
+  void takeSnapshot();
+
+  /**
+   * Remove the expired primary keys from the metadata when TTL is enabled.
+   */
+  void removeExpiredPrimaryKeys();
+
+  /**
+   * Stops the metadata manager. After invoking this method, no access to the metadata will be accepted.
+   */
+  void stop();
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/RecordInfo.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/RecordInfo.java
index f4f139f6c3e..4df31f27c00 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/RecordInfo.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/RecordInfo.java
@@ -26,11 +26,13 @@ public class RecordInfo {
   private final PrimaryKey _primaryKey;
   private final int _docId;
   private final Comparable _comparisonValue;
+  private final boolean _deleteRecord;
 
-  public RecordInfo(PrimaryKey primaryKey, int docId, Comparable comparisonValue) {
+  public RecordInfo(PrimaryKey primaryKey, int docId, Comparable comparisonValue, boolean deleteRecord) {
     _primaryKey = primaryKey;
     _docId = docId;
     _comparisonValue = comparisonValue;
+    _deleteRecord = deleteRecord;
   }
 
   public PrimaryKey getPrimaryKey() {
@@ -44,4 +46,8 @@ public int getDocId() {
   public Comparable getComparisonValue() {
     return _comparisonValue;
   }
+
+  public boolean isDeleteRecord() {
+    return _deleteRecord;
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManager.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManager.java
index de468797120..b6ae51b265e 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManager.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManager.java
@@ -19,7 +19,10 @@
 package org.apache.pinot.segment.local.upsert;
 
 import java.io.Closeable;
+import java.util.concurrent.ExecutorService;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
+import org.apache.helix.HelixManager;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.segment.local.data.manager.TableDataManager;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -32,10 +35,17 @@
  */
 @ThreadSafe
 public interface TableUpsertMetadataManager extends Closeable {
-
-  void init(TableConfig tableConfig, Schema schema, TableDataManager tableDataManager, ServerMetrics serverMetrics);
+  void init(TableConfig tableConfig, Schema schema, TableDataManager tableDataManager, ServerMetrics serverMetrics,
+      HelixManager helixManager, @Nullable ExecutorService segmentPreloadExecutor);
 
   PartitionUpsertMetadataManager getOrCreatePartitionManager(int partitionId);
 
   UpsertConfig.Mode getUpsertMode();
+
+  /**
+   * Stops the metadata manager. After invoking this method, no access to the metadata will be accepted.
+   */
+  void stop();
+
+  boolean isPreloading();
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManagerFactory.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManagerFactory.java
index 307128ff633..1750aaefc9a 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManagerFactory.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/TableUpsertMetadataManagerFactory.java
@@ -20,11 +20,8 @@
 
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pinot.common.metrics.ServerMetrics;
-import org.apache.pinot.segment.local.data.manager.TableDataManager;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.UpsertConfig;
-import org.apache.pinot.spi.data.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,8 +32,7 @@ private TableUpsertMetadataManagerFactory() {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(TableUpsertMetadataManagerFactory.class);
 
-  public static TableUpsertMetadataManager create(TableConfig tableConfig, Schema schema,
-      TableDataManager tableDataManager, ServerMetrics serverMetrics) {
+  public static TableUpsertMetadataManager create(TableConfig tableConfig) {
     String tableNameWithType = tableConfig.getTableName();
     UpsertConfig upsertConfig = tableConfig.getUpsertConfig();
     Preconditions.checkArgument(upsertConfig != null, "Must provide upsert config for table: %s", tableNameWithType);
@@ -59,7 +55,6 @@ public static TableUpsertMetadataManager create(TableConfig tableConfig, Schema
       metadataManager = new ConcurrentMapTableUpsertMetadataManager();
     }
 
-    metadataManager.init(tableConfig, schema, tableDataManager, serverMetrics);
     return metadataManager;
   }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/UpsertUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/UpsertUtils.java
index 8ac5fee8d3e..8dd1d8c475b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/UpsertUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/upsert/UpsertUtils.java
@@ -23,9 +23,11 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.spi.data.readers.PrimaryKey;
+import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.ByteArray;
 import org.roaringbitmap.PeekableIntIterator;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
@@ -76,18 +78,31 @@ public RecordInfo next() {
   }
 
   public static class RecordInfoReader implements Closeable {
-    public final PrimaryKeyReader _primaryKeyReader;
-    public final PinotSegmentColumnReader _comparisonColumnReader;
+    private final PrimaryKeyReader _primaryKeyReader;
+    private final ComparisonColumnReader _comparisonColumnReader;
+    private final PinotSegmentColumnReader _deleteRecordColumnReader;
 
-    public RecordInfoReader(IndexSegment segment, List<String> primaryKeyColumns, String comparisonColumn) {
+    public RecordInfoReader(IndexSegment segment, List<String> primaryKeyColumns, List<String> comparisonColumns,
+        @Nullable String deleteRecordColumn) {
       _primaryKeyReader = new PrimaryKeyReader(segment, primaryKeyColumns);
-      _comparisonColumnReader = new PinotSegmentColumnReader(segment, comparisonColumn);
+      if (comparisonColumns.size() == 1) {
+        _comparisonColumnReader = new SingleComparisonColumnReader(segment, comparisonColumns.get(0));
+      } else {
+        _comparisonColumnReader = new MultiComparisonColumnReader(segment, comparisonColumns);
+      }
+      if (deleteRecordColumn != null) {
+        _deleteRecordColumnReader = new PinotSegmentColumnReader(segment, deleteRecordColumn);
+      } else {
+        _deleteRecordColumnReader = null;
+      }
     }
 
     public RecordInfo getRecordInfo(int docId) {
       PrimaryKey primaryKey = _primaryKeyReader.getPrimaryKey(docId);
-      Comparable comparisonValue = (Comparable) getValue(_comparisonColumnReader, docId);
-      return new RecordInfo(primaryKey, docId, comparisonValue);
+      Comparable comparisonValue = _comparisonColumnReader.getComparisonValue(docId);
+      boolean deleteRecord = _deleteRecordColumnReader != null
+          && BooleanUtils.toBoolean(_deleteRecordColumnReader.getValue(docId));
+      return new RecordInfo(primaryKey, docId, comparisonValue, deleteRecord);
     }
 
     @Override
@@ -134,8 +149,66 @@ public void close()
     }
   }
 
-  private static Object getValue(PinotSegmentColumnReader columnReader, int docId) {
+  static Object getValue(PinotSegmentColumnReader columnReader, int docId) {
     Object value = columnReader.getValue(docId);
     return value instanceof byte[] ? new ByteArray((byte[]) value) : value;
   }
+
+  public interface ComparisonColumnReader extends Closeable {
+    Comparable getComparisonValue(int docId);
+  }
+
+  public static class SingleComparisonColumnReader implements UpsertUtils.ComparisonColumnReader {
+    private final PinotSegmentColumnReader _comparisonColumnReader;
+
+    public SingleComparisonColumnReader(IndexSegment segment, String comparisonColumn) {
+      _comparisonColumnReader = new PinotSegmentColumnReader(segment, comparisonColumn);
+    }
+
+    @Override
+    public Comparable getComparisonValue(int docId) {
+      return (Comparable) _comparisonColumnReader.getValue(docId);
+    }
+
+    @Override
+    public void close()
+        throws IOException {
+      _comparisonColumnReader.close();
+    }
+  }
+
+  public static class MultiComparisonColumnReader implements UpsertUtils.ComparisonColumnReader {
+    private final PinotSegmentColumnReader[] _comparisonColumnReaders;
+
+    public MultiComparisonColumnReader(IndexSegment segment, List<String> comparisonColumns) {
+      _comparisonColumnReaders = new PinotSegmentColumnReader[comparisonColumns.size()];
+
+      for (int i = 0; i < comparisonColumns.size(); i++) {
+        _comparisonColumnReaders[i] = new PinotSegmentColumnReader(segment, comparisonColumns.get(i));
+      }
+    }
+
+    public Comparable getComparisonValue(int docId) {
+      Comparable[] comparisonColumns = new Comparable[_comparisonColumnReaders.length];
+
+      for (int i = 0; i < _comparisonColumnReaders.length; i++) {
+        PinotSegmentColumnReader columnReader = _comparisonColumnReaders[i];
+        Comparable comparisonValue = null;
+        if (!columnReader.isNull(docId)) {
+          comparisonValue = (Comparable) UpsertUtils.getValue(columnReader, docId);
+        }
+        comparisonColumns[i] = comparisonValue;
+      }
+
+      return new ComparisonColumns(comparisonColumns, ComparisonColumns.SEALED_SEGMENT_COMPARISON_INDEX);
+    }
+
+    @Override
+    public void close()
+        throws IOException {
+      for (PinotSegmentColumnReader comparisonColumnReader : _comparisonColumnReaders) {
+        comparisonColumnReader.close();
+      }
+    }
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/ConsistentDataPushUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/ConsistentDataPushUtils.java
index 5de1cb65a4f..7296cc7928c 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/ConsistentDataPushUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/ConsistentDataPushUtils.java
@@ -168,7 +168,8 @@ public static void endReplaceSegments(SegmentGenerationJobSpec spec, Map<URI, St
       DEFAULT_RETRY_POLICY.attempt(() -> {
         try {
           SimpleHttpResponse response =
-              FILE_UPLOAD_DOWNLOAD_CLIENT.endReplaceSegments(uri, HttpClient.DEFAULT_SOCKET_TIMEOUT_MS, authProvider);
+              FILE_UPLOAD_DOWNLOAD_CLIENT.endReplaceSegments(uri, HttpClient.DEFAULT_SOCKET_TIMEOUT_MS,
+                  null, authProvider);
           LOGGER.info("Got response {}: {} while sending end replace segment request for table: {}, uploadURI: {}",
               response.getStatusCode(), response.getResponse(), rawTableName, uri);
           return true;
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CrcUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CrcUtils.java
index f88706f8681..659d54f9ea4 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CrcUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CrcUtils.java
@@ -23,8 +23,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -92,33 +90,4 @@ public long computeCrc()
     LOGGER.info("Computed crc = {}, based on files {}", crc, _files);
     return crc;
   }
-
-  public String computeMD5()
-      throws NoSuchAlgorithmException, IOException {
-    byte[] buffer = new byte[BUFFER_SIZE];
-    MessageDigest digest = MessageDigest.getInstance("md5");
-
-    for (File file : _files) {
-      try (InputStream input = new FileInputStream(file)) {
-        int len;
-        while ((len = input.read(buffer)) > 0) {
-          digest.update(buffer, 0, len);
-        }
-      }
-    }
-    String md5Value = toHexaDecimal(digest.digest());
-    LOGGER.info("Computed MD5 = {}, based on files {}", md5Value, _files);
-    return md5Value;
-  }
-
-  public static String toHexaDecimal(byte[] bytesToConvert) {
-    final char[] hexCharactersAsArray = "0123456789ABCDEF".toCharArray();
-    final char[] convertedHexCharsArray = new char[bytesToConvert.length * 2];
-    for (int j = 0; j < bytesToConvert.length; j++) {
-      final int v = bytesToConvert[j] & 0xFF;
-      convertedHexCharsArray[j * 2] = hexCharactersAsArray[v >>> 4];
-      convertedHexCharsArray[j * 2 + 1] = hexCharactersAsArray[v & 0x0F];
-    }
-    return new String(convertedHexCharsArray);
-  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CustomSerDeUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CustomSerDeUtils.java
index 289715680b0..1ed3a3e3411 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CustomSerDeUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/CustomSerDeUtils.java
@@ -26,6 +26,8 @@
 import java.nio.ByteBuffer;
 import org.apache.datasketches.memory.Memory;
 import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.datasketches.tuple.aninteger.IntegerSummaryDeserializer;
 import org.apache.pinot.segment.local.customobject.AvgPair;
 import org.apache.pinot.segment.local.customobject.MinMaxRangePair;
 import org.apache.pinot.segment.local.customobject.QuantileDigest;
@@ -228,6 +230,28 @@ public Sketch deserialize(ByteBuffer byteBuffer) {
     }
   };
 
+  public static final ObjectSerDe<org.apache.datasketches.tuple.Sketch<IntegerSummary>> DATA_SKETCH_INT_TUPLE_SER_DE =
+      new ObjectSerDe<org.apache.datasketches.tuple.Sketch<IntegerSummary>>() {
+        @Override
+        public byte[] serialize(org.apache.datasketches.tuple.Sketch<IntegerSummary> value) {
+          return value.compact().toByteArray();
+        }
+
+        @Override
+        public org.apache.datasketches.tuple.Sketch<IntegerSummary> deserialize(byte[] bytes) {
+          return org.apache.datasketches.tuple.Sketches.heapifySketch(Memory.wrap(bytes),
+              new IntegerSummaryDeserializer());
+        }
+
+        @Override
+        public org.apache.datasketches.tuple.Sketch<IntegerSummary> deserialize(ByteBuffer byteBuffer) {
+          byte[] bytes = new byte[byteBuffer.remaining()];
+          byteBuffer.get(bytes);
+          return org.apache.datasketches.tuple.Sketches.heapifySketch(Memory.wrap(bytes),
+              new IntegerSummaryDeserializer());
+        }
+      };
+
   public static final ObjectSerDe<RoaringBitmap> ROARING_BITMAP_SER_DE = new ObjectSerDe<RoaringBitmap>() {
 
     @Override
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/IngestionUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/IngestionUtils.java
index 72aadb70cb0..1d73c4cfd50 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/IngestionUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/IngestionUtils.java
@@ -328,7 +328,7 @@ private static Set<String> getFieldsToReadWithComplexType(Set<String> fieldsToRe
     String delimiter = complexTypeConfig.getDelimiter() == null ? ComplexTypeTransformer.DEFAULT_DELIMITER
         : complexTypeConfig.getDelimiter();
     for (String field : fieldsToRead) {
-      result.add(StringUtils.split(field, delimiter)[0]);
+      result.add(StringUtils.splitByWholeSeparator(field, delimiter)[0]);
     }
     return result;
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/SchemaUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/SchemaUtils.java
index cd17e276647..6812b275e51 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/SchemaUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/SchemaUtils.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.segment.local.function.FunctionEvaluator;
 import org.apache.pinot.segment.local.function.FunctionEvaluatorFactory;
@@ -71,10 +72,14 @@ private SchemaUtils() {
    * @param tableConfigs table configs associated with this schema (table configs with raw name = schema name)
    */
   public static void validate(Schema schema, List<TableConfig> tableConfigs) {
+    validate(schema, tableConfigs, false);
+  }
+
+  public static void validate(Schema schema, List<TableConfig> tableConfigs, @Nullable boolean isIgnoreCase) {
     for (TableConfig tableConfig : tableConfigs) {
       validateCompatibilityWithTableConfig(schema, tableConfig);
     }
-    validate(schema);
+    validate(schema, isIgnoreCase);
   }
 
   /**
@@ -95,8 +100,20 @@ public static void validate(Schema schema, List<TableConfig> tableConfigs) {
    * 6) Schema validations from {@link Schema#validate}
    */
   public static void validate(Schema schema) {
+    validate(schema, false);
+  }
+
+  public static void validate(Schema schema, boolean isIgnoreCase) {
     schema.validate();
 
+    if (isIgnoreCase) {
+      Set<String> lowerCaseColumnNames = new HashSet<>();
+      for (String column : schema.getColumnNames()) {
+        Preconditions.checkState(lowerCaseColumnNames.add(column.toLowerCase()),
+          "When enable case insensitive, you can't use the same lowercase column name: %s",
+          column.toLowerCase());
+      }
+    }
     Set<String> transformedColumns = new HashSet<>();
     Set<String> argumentColumns = new HashSet<>();
     Set<String> primaryKeyColumnCandidates = new HashSet<>();
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/TableConfigUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/TableConfigUtils.java
index 6319431c75a..a64170c60f5 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/TableConfigUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/TableConfigUtils.java
@@ -22,6 +22,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -31,6 +32,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -44,6 +46,8 @@
 import org.apache.pinot.segment.local.function.FunctionEvaluatorFactory;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.BitSlicedRangeIndexCreator;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
 import org.apache.pinot.spi.config.table.FieldConfig;
 import org.apache.pinot.spi.config.table.IndexingConfig;
@@ -56,6 +60,7 @@
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.TierConfig;
 import org.apache.pinot.spi.config.table.UpsertConfig;
+import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
 import org.apache.pinot.spi.config.table.ingestion.AggregationConfig;
 import org.apache.pinot.spi.config.table.ingestion.BatchIngestionConfig;
@@ -78,6 +83,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.pinot.segment.spi.AggregationFunctionType.*;
+
 
 /**
  * Utils related to table config operations
@@ -93,13 +100,16 @@ private TableConfigUtils() {
 
   // supported TableTaskTypes, must be identical to the one return in the impl of {@link PinotTaskGenerator}.
   private static final String REALTIME_TO_OFFLINE_TASK_TYPE = "RealtimeToOfflineSegmentsTask";
+  private static final String UPSERT_COMPACTION_TASK_TYPE = "UpsertCompactionTask";
 
   // this is duplicate with KinesisConfig.STREAM_TYPE, while instead of use KinesisConfig.STREAM_TYPE directly, we
   // hardcode the value here to avoid pulling the entire pinot-kinesis module as dependency.
   private static final String KINESIS_STREAM_TYPE = "kinesis";
   private static final EnumSet<AggregationFunctionType> SUPPORTED_INGESTION_AGGREGATIONS =
-      EnumSet.of(AggregationFunctionType.SUM, AggregationFunctionType.MIN, AggregationFunctionType.MAX,
-          AggregationFunctionType.COUNT);
+      EnumSet.of(SUM, MIN, MAX, COUNT);
+  private static final Set<String> UPSERT_DEDUP_ALLOWED_ROUTING_STRATEGIES =
+      ImmutableSet.of(RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE,
+          RoutingConfig.MULTI_STAGE_REPLICA_GROUP_SELECTOR_TYPE);
 
   /**
    * @see TableConfigUtils#validate(TableConfig, Schema, String, boolean)
@@ -134,6 +144,7 @@ public static void validate(TableConfig tableConfig, @Nullable Schema schema, @N
       validateIndexingConfig(tableConfig.getIndexingConfig(), schema);
       validateFieldConfigList(tableConfig.getFieldConfigList(), tableConfig.getIndexingConfig(), schema);
       validateInstancePartitionsTypeMapConfig(tableConfig);
+      validatePartitionedReplicaGroupInstance(tableConfig);
       if (!skipTypes.contains(ValidationType.UPSERT)) {
         validateUpsertAndDedupConfig(tableConfig, schema);
         validatePartialUpsertStrategies(tableConfig, schema);
@@ -390,13 +401,6 @@ public static void validateIngestionConfig(TableConfig tableConfig, @Nullable Sc
         Set<String> transformColumns = new HashSet<>();
         for (TransformConfig transformConfig : transformConfigs) {
           String columnName = transformConfig.getColumnName();
-          if (schema != null) {
-            Preconditions.checkState(
-                schema.getFieldSpecFor(columnName) != null || aggregationSourceColumns.contains(columnName),
-                "The destination column '" + columnName
-                    + "' of the transform function must be present in the schema or as a source column for "
-                    + "aggregations");
-          }
           String transformFunction = transformConfig.getTransformFunction();
           if (columnName == null || transformFunction == null) {
             throw new IllegalStateException(
@@ -405,6 +409,13 @@ public static void validateIngestionConfig(TableConfig tableConfig, @Nullable Sc
           if (!transformColumns.add(columnName)) {
             throw new IllegalStateException("Duplicate transform config found for column '" + columnName + "'");
           }
+          if (schema != null) {
+            Preconditions.checkState(
+                schema.getFieldSpecFor(columnName) != null || aggregationSourceColumns.contains(columnName),
+                "The destination column '" + columnName
+                    + "' of the transform function must be present in the schema or as a source column for "
+                    + "aggregations");
+          }
           FunctionEvaluator expressionEvaluator;
           if (disableGroovy && FunctionEvaluatorFactory.isGroovyExpression(transformFunction)) {
             throw new IllegalStateException(
@@ -430,8 +441,8 @@ public static void validateIngestionConfig(TableConfig tableConfig, @Nullable Sc
       ComplexTypeConfig complexTypeConfig = ingestionConfig.getComplexTypeConfig();
       if (complexTypeConfig != null && schema != null) {
         Map<String, String> prefixesToRename = complexTypeConfig.getPrefixesToRename();
-        Set<String> fieldNames = schema.getFieldSpecMap().keySet();
         if (MapUtils.isNotEmpty(prefixesToRename)) {
+          Set<String> fieldNames = schema.getColumnNames();
           for (String prefix : prefixesToRename.keySet()) {
             for (String field : fieldNames) {
               Preconditions.checkState(!field.startsWith(prefix),
@@ -474,6 +485,11 @@ static void validateDecoder(StreamConfig streamConfig) {
     }
   }
 
+  public final static EnumSet<AggregationFunctionType> AVAILABLE_CORE_VALUE_AGGREGATORS =
+      EnumSet.of(MIN, MAX, SUM, DISTINCTCOUNTHLL, DISTINCTCOUNTRAWHLL, DISTINCTCOUNTTHETASKETCH,
+          DISTINCTCOUNTRAWTHETASKETCH, DISTINCTCOUNTTUPLESKETCH, DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH,
+          SUMVALUESINTEGERSUMTUPLESKETCH, AVGVALUEINTEGERSUMTUPLESKETCH);
+
   @VisibleForTesting
   static void validateTaskConfigs(TableConfig tableConfig, Schema schema) {
     TableTaskConfig taskConfig = tableConfig.getTaskConfig();
@@ -514,10 +530,47 @@ static void validateTaskConfigs(TableConfig tableConfig, Schema schema) {
             if (entry.getKey().endsWith(".aggregationType")) {
               Preconditions.checkState(columnNames.contains(StringUtils.removeEnd(entry.getKey(), ".aggregationType")),
                   String.format("Column \"%s\" not found in schema!", entry.getKey()));
-              Preconditions.checkState(ImmutableSet.of("SUM", "MAX", "MIN").contains(entry.getValue().toUpperCase()),
-                  String.format("Column \"%s\" has invalid aggregate type: %s", entry.getKey(), entry.getValue()));
+              try {
+                // check that it's a valid aggregation function type
+                AggregationFunctionType aft = AggregationFunctionType.getAggregationFunctionType(entry.getValue());
+                // check that a value aggregator is available
+                if (!AVAILABLE_CORE_VALUE_AGGREGATORS.contains(aft)) {
+                  throw new IllegalArgumentException("ValueAggregator not enabled for type: " + aft.toString());
+                }
+              } catch (IllegalArgumentException e) {
+                String err = String.format(
+                    "Column \"%s\" has invalid aggregate type: %s", entry.getKey(), entry.getValue());
+                throw new IllegalStateException(err);
+              }
             }
           }
+        } else if (taskTypeConfigName.equals(UPSERT_COMPACTION_TASK_TYPE)) {
+          // check table is realtime
+          Preconditions.checkState(tableConfig.getTableType() == TableType.REALTIME,
+              "UpsertCompactionTask only supports realtime tables!");
+          // check upsert enabled
+          Preconditions.checkState(tableConfig.isUpsertEnabled(), "Upsert must be enabled for UpsertCompactionTask");
+
+          // check no malformed period
+          if (taskTypeConfig.containsKey("bufferTimePeriod")) {
+            TimeUtils.convertPeriodToMillis(taskTypeConfig.get("bufferTimePeriod"));
+          }
+          // check maxNumRecordsPerSegment
+          if (taskTypeConfig.containsKey("invalidRecordsThresholdPercent")) {
+            Preconditions.checkState(Double.parseDouble(taskTypeConfig.get("invalidRecordsThresholdPercent")) > 0
+                    && Double.parseDouble(taskTypeConfig.get("invalidRecordsThresholdPercent")) <= 100,
+                "invalidRecordsThresholdPercent must be > 0 and <= 100");
+          }
+          // check invalidRecordsThresholdCount
+          if (taskTypeConfig.containsKey("invalidRecordsThresholdCount")) {
+            Preconditions.checkState(Long.parseLong(taskTypeConfig.get("invalidRecordsThresholdCount")) >= 1,
+                "invalidRecordsThresholdCount must be >= 1");
+          }
+          // check that either invalidRecordsThresholdPercent or invalidRecordsThresholdCount was provided
+          Preconditions.checkState(
+              taskTypeConfig.containsKey("invalidRecordsThresholdPercent") || taskTypeConfig.containsKey(
+                  "invalidRecordsThresholdCount"),
+              "invalidRecordsThresholdPercent or invalidRecordsThresholdCount or both must be provided");
         }
       }
     }
@@ -556,26 +609,65 @@ static void validateUpsertAndDedupConfig(TableConfig tableConfig, Schema schema)
     Preconditions.checkState(streamConfig.hasLowLevelConsumerType() && !streamConfig.hasHighLevelConsumerType(),
         "Upsert/Dedup table must use low-level streaming consumer type");
     // replica group is configured for routing
-    Preconditions.checkState(tableConfig.getRoutingConfig() != null
-            && RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE.equalsIgnoreCase(
-            tableConfig.getRoutingConfig().getInstanceSelectorType()),
+    Preconditions.checkState(
+        tableConfig.getRoutingConfig() != null && isRoutingStrategyAllowedForUpsert(tableConfig.getRoutingConfig()),
         "Upsert/Dedup table must use strict replica-group (i.e. strictReplicaGroup) based routing");
 
     // specifically for upsert
-    if (tableConfig.getUpsertMode() != UpsertConfig.Mode.NONE) {
-
+    UpsertConfig upsertConfig = tableConfig.getUpsertConfig();
+    if (upsertConfig != null) {
       // no startree index
       Preconditions.checkState(CollectionUtils.isEmpty(tableConfig.getIndexingConfig().getStarTreeIndexConfigs())
               && !tableConfig.getIndexingConfig().isEnableDefaultStarTree(),
           "The upsert table cannot have star-tree index.");
 
       // comparison column exists
-      if (tableConfig.getUpsertConfig().getComparisonColumn() != null) {
-        String comparisonCol = tableConfig.getUpsertConfig().getComparisonColumn();
-        Preconditions.checkState(schema.hasColumn(comparisonCol), "The comparison column does not exist on schema");
+      List<String> comparisonColumns = upsertConfig.getComparisonColumns();
+      if (comparisonColumns != null) {
+        for (String column : comparisonColumns) {
+          Preconditions.checkState(schema.hasColumn(column), "The comparison column does not exist on schema");
+        }
+      }
+
+      // Delete record column exist and is a BOOLEAN field
+      String deleteRecordColumn = upsertConfig.getDeleteRecordColumn();
+      if (deleteRecordColumn != null) {
+        FieldSpec fieldSpec = schema.getFieldSpecFor(deleteRecordColumn);
+        Preconditions.checkState(
+            fieldSpec != null && fieldSpec.isSingleValueField() && fieldSpec.getDataType() == DataType.BOOLEAN,
+            "The delete record column must be a single-valued BOOLEAN column");
       }
     }
     validateAggregateMetricsForUpsertConfig(tableConfig);
+    validateTTLForUpsertConfig(tableConfig, schema);
+  }
+
+  /**
+   * Validates the upsert config related to TTL.
+   */
+  @VisibleForTesting
+  static void validateTTLForUpsertConfig(TableConfig tableConfig, Schema schema) {
+    UpsertConfig upsertConfig = tableConfig.getUpsertConfig();
+    if (upsertConfig == null || upsertConfig.getMetadataTTL() == 0) {
+      return;
+    }
+
+    List<String> comparisonColumns = upsertConfig.getComparisonColumns();
+    if (CollectionUtils.isNotEmpty(comparisonColumns)) {
+      Preconditions.checkState(comparisonColumns.size() == 1,
+          "Upsert TTL does not work with multiple comparison columns");
+      String comparisonColumn = comparisonColumns.get(0);
+      DataType comparisonColumnDataType = schema.getFieldSpecFor(comparisonColumn).getDataType();
+      Preconditions.checkState(comparisonColumnDataType.isNumeric(),
+          "Upsert TTL must have comparison column: %s in numeric type, found: %s", comparisonColumn,
+          comparisonColumnDataType);
+    }
+
+    Preconditions.checkState(upsertConfig.isEnableSnapshot(), "Upsert TTL must have snapshot enabled");
+
+    // TODO: Support deletion for TTL. Need to construct queryableDocIds when adding segments out of TTL.
+    Preconditions.checkState(upsertConfig.getDeleteRecordColumn() == null,
+        "Upsert TTL doesn't work with record deletion");
   }
 
   /**
@@ -585,17 +677,36 @@ static void validateUpsertAndDedupConfig(TableConfig tableConfig, Schema schema)
    */
   @VisibleForTesting
   static void validateInstancePartitionsTypeMapConfig(TableConfig tableConfig) {
-    if (MapUtils.isEmpty(tableConfig.getInstancePartitionsMap())
-        || MapUtils.isEmpty(tableConfig.getInstanceAssignmentConfigMap())) {
+    if (MapUtils.isEmpty(tableConfig.getInstancePartitionsMap()) || MapUtils.isEmpty(
+        tableConfig.getInstanceAssignmentConfigMap())) {
       return;
     }
     for (InstancePartitionsType instancePartitionsType : tableConfig.getInstancePartitionsMap().keySet()) {
-      Preconditions.checkState(!tableConfig.getInstanceAssignmentConfigMap().containsKey(instancePartitionsType),
+      Preconditions.checkState(
+          !tableConfig.getInstanceAssignmentConfigMap().containsKey(instancePartitionsType.toString()),
           String.format("Both InstanceAssignmentConfigMap and InstancePartitionsMap set for %s",
               instancePartitionsType));
     }
   }
 
+  /**
+   * Detects whether both replicaGroupStrategyConfig and replicaGroupPartitionConfig are set for a given
+   * table. Validation fails because the table would ignore replicaGroupStrategyConfig
+   * when the replicaGroupPartitionConfig is already set.
+   */
+  @VisibleForTesting
+  static void validatePartitionedReplicaGroupInstance(TableConfig tableConfig) {
+    if (tableConfig.getValidationConfig().getReplicaGroupStrategyConfig() == null || MapUtils.isEmpty(
+        tableConfig.getInstanceAssignmentConfigMap())) {
+      return;
+    }
+    for (Map.Entry<String, InstanceAssignmentConfig> entry : tableConfig.getInstanceAssignmentConfigMap().entrySet()) {
+      boolean isNullReplicaGroupPartitionConfig = entry.getValue().getReplicaGroupPartitionConfig() == null;
+      Preconditions.checkState(isNullReplicaGroupPartitionConfig,
+          "Both replicaGroupStrategyConfig and replicaGroupPartitionConfig is provided");
+    }
+  }
+
   /**
    * Validates metrics aggregation when upsert config is enabled
    * - Metrics aggregation cannot be enabled when Upsert Config is enabled.
@@ -641,8 +752,8 @@ static void validatePartialUpsertStrategies(TableConfig tableConfig, Schema sche
       UpsertConfig.Strategy columnStrategy = entry.getValue();
       Preconditions.checkState(!primaryKeyColumns.contains(column), "Merger cannot be applied to primary key columns");
 
-      if (upsertConfig.getComparisonColumn() != null) {
-        Preconditions.checkState(!upsertConfig.getComparisonColumn().equals(column),
+      if (upsertConfig.getComparisonColumns() != null) {
+        Preconditions.checkState(!upsertConfig.getComparisonColumns().contains(column),
             "Merger cannot be applied to comparison column");
       } else {
         Preconditions.checkState(!tableConfig.getValidationConfig().getTimeColumnName().equals(column),
@@ -927,10 +1038,13 @@ private static void validateFieldConfigList(@Nullable List<FieldConfig> fieldCon
   /**
    * Validates the compatibility of the indexes if the column has the forward index disabled. Throws exceptions due to
    * compatibility mismatch. The checks performed are:
-   *     - Validate dictionary is enabled.
-   *     - Validate inverted index is enabled.
+   *
    *     - Validate that either no range index exists for column or the range index version is at least 2 and isn't a
-   *       multi-value column (since mulit-value defaults to index v1).
+   *       multi-value column (since multi-value defaults to index v1).
+   *
+   * To rebuild the forward index when it has been disabled the dictionary and inverted index must be enabled for the
+   * given column. If either the inverted index or dictionary are disabled then the only way to get the forward index
+   * back or generate a new index for existing segments is to either refresh or back-fill the segments.
    */
   private static void validateForwardIndexDisabledIndexCompatibility(String columnName, FieldConfig fieldConfig,
       IndexingConfig indexingConfigs, List<String> noDictionaryColumns, Schema schema) {
@@ -939,18 +1053,15 @@ private static void validateForwardIndexDisabledIndexCompatibility(String column
       return;
     }
 
-    boolean forwardIndexDisabled = Boolean.parseBoolean(fieldConfigProperties.get(FieldConfig.FORWARD_INDEX_DISABLED));
+    boolean forwardIndexDisabled = Boolean.parseBoolean(
+        fieldConfigProperties.getOrDefault(FieldConfig.FORWARD_INDEX_DISABLED,
+            FieldConfig.DEFAULT_FORWARD_INDEX_DISABLED));
     if (!forwardIndexDisabled) {
       return;
     }
 
     FieldSpec fieldSpec = schema.getFieldSpecFor(columnName);
-    Preconditions.checkState(fieldConfig.getEncodingType() == FieldConfig.EncodingType.DICTIONARY
-            || noDictionaryColumns == null || !noDictionaryColumns.contains(columnName),
-        String.format("Forward index disabled column %s must have dictionary enabled", columnName));
-    Preconditions.checkState(indexingConfigs.getInvertedIndexColumns() != null
-            && indexingConfigs.getInvertedIndexColumns().contains(columnName),
-        String.format("Forward index disabled column %s must have inverted index enabled", columnName));
+    // Check for the range index since the index itself relies on the existence of the forward index to work.
     if (indexingConfigs.getRangeIndexColumns() != null && indexingConfigs.getRangeIndexColumns().contains(columnName)) {
       Preconditions.checkState(fieldSpec.isSingleValueField(), String.format("Feature not supported for multi-value "
           + "columns with range index. Cannot disable forward index for column %s. Disable range index on this "
@@ -960,6 +1071,26 @@ private static void validateForwardIndexDisabledIndexCompatibility(String column
               + "forward index for column %s. Either disable range index or create range index with"
               + " version >= 2 to use this feature", columnName));
     }
+
+    Preconditions.checkState(
+        !indexingConfigs.isOptimizeDictionaryForMetrics() && !indexingConfigs.isOptimizeDictionary(), String.format(
+            "Dictionary override optimization options (OptimizeDictionary, optimizeDictionaryForMetrics)"
+                + " not supported with forward index for column: %s, disabled", columnName));
+
+    boolean hasDictionary =
+        fieldConfig.getEncodingType() == FieldConfig.EncodingType.DICTIONARY || noDictionaryColumns == null
+            || !noDictionaryColumns.contains(columnName);
+    boolean hasInvertedIndex =
+        indexingConfigs.getInvertedIndexColumns() != null && indexingConfigs.getInvertedIndexColumns()
+            .contains(columnName);
+
+    if (!hasDictionary || !hasInvertedIndex) {
+      LOGGER.warn("Forward index has been disabled for column {}. Either dictionary ({}) and / or inverted index ({}) "
+              + "has been disabled. If the forward index needs to be regenerated or another index added please refresh "
+              + "or back-fill the forward index as it cannot be rebuilt without dictionary and inverted index.",
+          columnName,
+          hasDictionary ? "enabled" : "disabled", hasInvertedIndex ? "enabled" : "disabled");
+    }
   }
 
   private static void sanitize(TableConfig tableConfig) {
@@ -1148,4 +1279,33 @@ private static boolean isKinesisConfigured(TableConfig tableConfig) {
     }
     return false;
   }
+
+  private static boolean isRoutingStrategyAllowedForUpsert(@Nonnull RoutingConfig routingConfig) {
+    String instanceSelectorType = routingConfig.getInstanceSelectorType();
+    return UPSERT_DEDUP_ALLOWED_ROUTING_STRATEGIES.stream().anyMatch(x -> x.equalsIgnoreCase(instanceSelectorType));
+  }
+
+  /**
+   * Helper method to extract TableConfig in updated syntax from current TableConfig.
+   * <ul>
+   *   <li>Moves all index configs to FieldConfig.indexes</li>
+   *   <li>Clean up index related configs from IndexingConfig and FieldConfig.IndexTypes</li>
+   * </ul>
+   */
+  public static TableConfig createTableConfigFromOldFormat(TableConfig tableConfig, Schema schema) {
+    TableConfig clone = new TableConfig(tableConfig);
+    for (IndexType<?, ?, ?> indexType : IndexService.getInstance().getAllIndexes()) {
+      // get all the index data in new format
+      indexType.convertToNewFormat(clone, schema);
+    }
+    // cleanup the indexTypes field from all FieldConfig items
+    if (clone.getFieldConfigList() != null) {
+      List<FieldConfig> cleanFieldConfigList = new ArrayList<>();
+      for (FieldConfig fieldConfig : clone.getFieldConfigList()) {
+        cleanFieldConfigList.add(new FieldConfig.Builder(fieldConfig).withIndexTypes(null).build());
+      }
+      clone.setFieldConfigList(cleanFieldConfigList);
+    }
+    return clone;
+  }
 }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/fst/PinotBufferIndexInput.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/fst/PinotBufferIndexInput.java
index b3fbdfc9578..f4ee48b6fe1 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/fst/PinotBufferIndexInput.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/fst/PinotBufferIndexInput.java
@@ -31,11 +31,11 @@
  */
 public class PinotBufferIndexInput extends IndexInput {
   private final PinotDataBuffer _pinotDataBuffer;
-  private final Long _sliceOffset;
-  private final Long _length;
-  private Long _readPointerOffset;
+  private final long _sliceOffset;
+  private final long _length;
+  private long _readPointerOffset;
 
-  public PinotBufferIndexInput(PinotDataBuffer pinotDataBuffer, Long offset, Long length) {
+  public PinotBufferIndexInput(PinotDataBuffer pinotDataBuffer, long offset, long length) {
     super("");
     _pinotDataBuffer = pinotDataBuffer;
     _sliceOffset = offset;
@@ -73,7 +73,7 @@ public IndexInput slice(String s, long l, long l1)
   @Override
   public byte readByte()
       throws IOException {
-    Byte b = _pinotDataBuffer.getByte(_readPointerOffset);
+    byte b = _pinotDataBuffer.getByte(_readPointerOffset);
     _readPointerOffset += 1;
     return b;
   }
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/nativefst/NativeFSTIndexCreator.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/nativefst/NativeFSTIndexCreator.java
index 99298b1e3ad..1fb58b56bc4 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/nativefst/NativeFSTIndexCreator.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/nativefst/NativeFSTIndexCreator.java
@@ -23,12 +23,13 @@
 import java.io.IOException;
 import org.apache.pinot.segment.local.utils.nativefst.builder.FSTBuilder;
 import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.creator.FSTIndexCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class NativeFSTIndexCreator implements TextIndexCreator {
+public class NativeFSTIndexCreator implements FSTIndexCreator {
   private static final Logger LOGGER = LoggerFactory.getLogger(NativeFSTIndexCreator.class);
 
   private final File _fstIndexFile;
@@ -44,7 +45,6 @@ public class NativeFSTIndexCreator implements TextIndexCreator {
    * @param indexDir  Index directory
    * @param columnName Column name for which index is being created
    * @param sortedEntries Sorted entries of the unique values of the column.
-   * @throws IOException
    */
   public NativeFSTIndexCreator(File indexDir, String columnName, String[] sortedEntries) {
     _fstIndexFile = new File(indexDir, columnName + V1Constants.Indexes.FST_INDEX_FILE_EXTENSION);
@@ -58,6 +58,10 @@ public NativeFSTIndexCreator(File indexDir, String columnName, String[] sortedEn
     }
   }
 
+  public NativeFSTIndexCreator(IndexCreationContext context) {
+    this(context.getIndexDir(), context.getFieldSpec().getName(), (String[]) context.getSortedUniqueElementsArray());
+  }
+
   // Expects dictionary entries in sorted order.
   @Override
   public void add(String document) {
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/tablestate/TableStateUtils.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/tablestate/TableStateUtils.java
index c11886f613e..6de4536de1b 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/tablestate/TableStateUtils.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/tablestate/TableStateUtils.java
@@ -27,13 +27,14 @@
 import org.apache.helix.model.CurrentState;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.LiveInstance;
-import org.apache.pinot.spi.utils.CommonConstants;
+import org.apache.pinot.spi.utils.CommonConstants.Helix.StateModel.SegmentStateModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 public class TableStateUtils {
   private static final Logger LOGGER = LoggerFactory.getLogger(TableStateUtils.class);
+  private static final int MAX_NUM_SEGMENTS_TO_LOG = 10;
 
   private TableStateUtils() {
   }
@@ -83,58 +84,57 @@ public static List<String> getSegmentsInGivenStateForThisInstance(HelixManager h
    * @return true if all segments for the given table are succesfully loaded. False otherwise
    */
   public static boolean isAllSegmentsLoaded(HelixManager helixManager, String tableNameWithType) {
+    List<String> onlineSegments =
+        getSegmentsInGivenStateForThisInstance(helixManager, tableNameWithType, SegmentStateModel.ONLINE);
+    if (onlineSegments.isEmpty()) {
+      LOGGER.info("No ONLINE segment found for table: {}", tableNameWithType);
+      return true;
+    }
+
+    // Check if ideal state and current state matches for all segments assigned to the current instance
     HelixDataAccessor dataAccessor = helixManager.getHelixDataAccessor();
     PropertyKey.Builder keyBuilder = dataAccessor.keyBuilder();
     String instanceName = helixManager.getInstanceName();
-
-    List<String> onlineSegments = getSegmentsInGivenStateForThisInstance(helixManager, tableNameWithType,
-        CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE);
-    if (onlineSegments.size() > 0) {
-      LiveInstance liveInstance = dataAccessor.getProperty(keyBuilder.liveInstance(instanceName));
-      if (liveInstance == null) {
-        LOGGER.warn("Failed to find live instance for instance: {}", instanceName);
-        return false;
-      }
-      String sessionId = liveInstance.getEphemeralOwner();
-      CurrentState currentState =
-          dataAccessor.getProperty(keyBuilder.currentState(instanceName, sessionId, tableNameWithType));
-      if (currentState == null) {
-        LOGGER.warn("Failed to find current state for instance: {}, sessionId: {}, table: {}", instanceName, sessionId,
-            tableNameWithType);
-        return false;
-      }
-      // Check if ideal state and current state matches for all segments assigned to the current instance
-      Map<String, String> currentStateMap = currentState.getPartitionStateMap();
-
-      for (String segmentName : onlineSegments) {
-        String actualState = currentStateMap.get(segmentName);
-        if (!CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE.equals(actualState)) {
-          if (CommonConstants.Helix.StateModel.SegmentStateModel.ERROR.equals(actualState)) {
-            LOGGER.error("Find ERROR segment: {}, table: {}, expected: {}", segmentName, tableNameWithType,
-                CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE);
-          } else {
-            LOGGER.info("Find unloaded segment: {}, table: {}, expected: {}, actual: {}", segmentName,
-                tableNameWithType, CommonConstants.Helix.StateModel.SegmentStateModel.ONLINE, actualState);
-          }
+    LiveInstance liveInstance = dataAccessor.getProperty(keyBuilder.liveInstance(instanceName));
+    if (liveInstance == null) {
+      LOGGER.warn("Failed to find live instance for instance: {}", instanceName);
+      return false;
+    }
+    String sessionId = liveInstance.getEphemeralOwner();
+    CurrentState currentState =
+        dataAccessor.getProperty(keyBuilder.currentState(instanceName, sessionId, tableNameWithType));
+    if (currentState == null) {
+      LOGGER.warn("Failed to find current state for instance: {}, sessionId: {}, table: {}", instanceName, sessionId,
+          tableNameWithType);
+      return false;
+    }
+    List<String> unloadedSegments = new ArrayList<>();
+    Map<String, String> currentStateMap = currentState.getPartitionStateMap();
+    for (String segmentName : onlineSegments) {
+      String actualState = currentStateMap.get(segmentName);
+      if (!SegmentStateModel.ONLINE.equals(actualState)) {
+        if (SegmentStateModel.ERROR.equals(actualState)) {
+          LOGGER.error("Found segment: {}, table: {} in ERROR state, expected: {}", segmentName, tableNameWithType,
+              SegmentStateModel.ONLINE);
           return false;
+        } else {
+          unloadedSegments.add(segmentName);
         }
       }
     }
-
-    LOGGER.info("All segments loaded for table: {}", tableNameWithType);
-    return true;
-  }
-
-  public static void waitForAllSegmentsLoaded(HelixManager helixManager, String tableNameWithType) {
-    try {
-      while (!TableStateUtils.isAllSegmentsLoaded(helixManager, tableNameWithType)) {
-        LOGGER.info("Sleeping 1 second waiting for all segments loaded for table: {}", tableNameWithType);
-        //noinspection BusyWait
-        Thread.sleep(1000L);
+    if (unloadedSegments.isEmpty()) {
+      LOGGER.info("All segments loaded for table: {}", tableNameWithType);
+      return true;
+    } else {
+      int numUnloadedSegments = unloadedSegments.size();
+      if (numUnloadedSegments <= MAX_NUM_SEGMENTS_TO_LOG) {
+        LOGGER.info("Found {} unloaded segments: {} for table: {}", numUnloadedSegments, unloadedSegments,
+            tableNameWithType);
+      } else {
+        LOGGER.info("Found {} unloaded segments: {}... for table: {}", numUnloadedSegments,
+            unloadedSegments.subList(0, MAX_NUM_SEGMENTS_TO_LOG), tableNameWithType);
       }
-    } catch (Exception e) {
-      throw new RuntimeException(
-          "Caught exception while waiting for all segments loaded for table: " + tableNameWithType, e);
+      return false;
     }
   }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/aggregator/DistinctCountThetaSketchValueAggregatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/aggregator/DistinctCountThetaSketchValueAggregatorTest.java
new file mode 100644
index 00000000000..822335cfb05
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/aggregator/DistinctCountThetaSketchValueAggregatorTest.java
@@ -0,0 +1,165 @@
+/**
+ * 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.pinot.segment.local.aggregator;
+
+import java.util.stream.IntStream;
+import org.apache.datasketches.theta.Sketch;
+import org.apache.datasketches.theta.Sketches;
+import org.apache.datasketches.theta.Union;
+import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+
+public class DistinctCountThetaSketchValueAggregatorTest {
+
+  @Test
+  public void initialShouldCreateSingleItemSketch() {
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    assertEquals(agg.getInitialAggregatedValue("hello world").getEstimate(), 1.0);
+  }
+
+  @Test
+  public void initialShouldParseASketch() {
+    UpdateSketch input = Sketches.updateSketchBuilder().build();
+    IntStream.range(0, 1000).forEach(input::update);
+    Sketch result = input.compact();
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    byte[] bytes = agg.serializeAggregatedValue(result);
+    assertEquals(agg.getInitialAggregatedValue(bytes).getEstimate(), result.getEstimate());
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), result.getCurrentBytes());
+  }
+
+  @Test
+  public void initialShouldParseMultiValueSketches() {
+    UpdateSketch input1 = Sketches.updateSketchBuilder().build();
+    input1.update("hello");
+    UpdateSketch input2 = Sketches.updateSketchBuilder().build();
+    input2.update("world");
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    byte[][] bytes = {agg.serializeAggregatedValue(input1), agg.serializeAggregatedValue(input2)};
+    assertEquals(agg.getInitialAggregatedValue(bytes).getEstimate(), 2.0);
+  }
+
+  @Test
+  public void applyAggregatedValueShouldUnion() {
+    UpdateSketch input1 = Sketches.updateSketchBuilder().build();
+    IntStream.range(0, 1000).forEach(input1::update);
+    Sketch result1 = input1.compact();
+    UpdateSketch input2 = Sketches.updateSketchBuilder().build();
+    IntStream.range(0, 1000).forEach(input2::update);
+    Sketch result2 = input2.compact();
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    Sketch result = agg.applyAggregatedValue(result1, result2);
+    Union union =
+        Union.builder().setNominalEntries(CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES).buildUnion();
+
+    Sketch merged = union.union(result1, result2);
+
+    assertEquals(result.getEstimate(), merged.getEstimate());
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), merged.getCurrentBytes());
+  }
+
+  @Test
+  public void applyRawValueShouldUnion() {
+    UpdateSketch input1 = Sketches.updateSketchBuilder().build();
+    IntStream.range(0, 1000).forEach(input1::update);
+    Sketch result1 = input1.compact();
+    UpdateSketch input2 = Sketches.updateSketchBuilder().build();
+    IntStream.range(0, 1000).forEach(input2::update);
+    Sketch result2 = input2.compact();
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    byte[] result2bytes = agg.serializeAggregatedValue(result2);
+    Sketch result = agg.applyRawValue(result1, result2bytes);
+    Union union =
+        Union.builder().setNominalEntries(CommonConstants.Helix.DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES).buildUnion();
+
+    Sketch merged = union.union(result1, result2);
+
+    assertEquals(result.getEstimate(), merged.getEstimate());
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), merged.getCurrentBytes());
+  }
+
+  @Test
+  public void applyRawValueShouldAdd() {
+    UpdateSketch input1 = Sketches.updateSketchBuilder().build();
+    input1.update("hello".hashCode());
+    Sketch result1 = input1.compact();
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    Sketch result = agg.applyRawValue(result1, "world");
+
+    assertEquals(result.getEstimate(), 2.0);
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), 32 // may change in future versions of datasketches
+    );
+  }
+
+  @Test
+  public void applyRawValueShouldSupportMultiValue() {
+    UpdateSketch input1 = Sketches.updateSketchBuilder().build();
+    input1.update("hello");
+    Sketch result1 = input1.compact();
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    String[] strings = {"hello", "world", "this", "is", "some", "strings"};
+    Sketch result = agg.applyRawValue(result1, (Object) strings);
+
+    assertEquals(result.getEstimate(), 6.0);
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), 64 // may change in future versions of datasketches
+    );
+  }
+
+  @Test
+  public void getInitialValueShouldSupportDifferentTypes() {
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    assertEquals(agg.getInitialAggregatedValue(12345).getEstimate(), 1.0);
+    assertEquals(agg.getInitialAggregatedValue(12345L).getEstimate(), 1.0);
+    assertEquals(agg.getInitialAggregatedValue(12.345f).getEstimate(), 1.0);
+    assertEquals(agg.getInitialAggregatedValue(12.345d).getEstimate(), 1.0);
+    assertThrows(() -> agg.getInitialAggregatedValue(new Object()));
+  }
+
+  @Test
+  public void getInitialValueShouldSupportMultiValueTypes() {
+    DistinctCountThetaSketchValueAggregator agg = new DistinctCountThetaSketchValueAggregator();
+    Integer[] ints = {12345};
+    assertEquals(agg.getInitialAggregatedValue(ints).getEstimate(), 1.0);
+    Long[] longs = {12345L};
+    assertEquals(agg.getInitialAggregatedValue(longs).getEstimate(), 1.0);
+    Float[] floats = {12.345f};
+    assertEquals(agg.getInitialAggregatedValue(floats).getEstimate(), 1.0);
+    Double[] doubles = {12.345d};
+    assertEquals(agg.getInitialAggregatedValue(doubles).getEstimate(), 1.0);
+    Object[] objects = {new Object()};
+    assertThrows(() -> agg.getInitialAggregatedValue(objects));
+    byte[][] zeroSketches = {};
+    assertEquals(agg.getInitialAggregatedValue(zeroSketches).getEstimate(), 0.0);
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/aggregator/IntegerTupleSketchValueAggregatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/aggregator/IntegerTupleSketchValueAggregatorTest.java
new file mode 100644
index 00000000000..d108d799b04
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/aggregator/IntegerTupleSketchValueAggregatorTest.java
@@ -0,0 +1,70 @@
+/**
+ * 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.pinot.segment.local.aggregator;
+
+import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSketch;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class IntegerTupleSketchValueAggregatorTest {
+
+  private byte[] sketchContaining(String key, int value) {
+    IntegerSketch is = new IntegerSketch(16, IntegerSummary.Mode.Sum);
+    is.update(key, value);
+    return is.compact().toByteArray();
+  };
+
+  @Test
+  public void initialShouldParseASketch() {
+    IntegerTupleSketchValueAggregator agg = new IntegerTupleSketchValueAggregator(IntegerSummary.Mode.Sum);
+    assertEquals(agg.getInitialAggregatedValue(sketchContaining("hello world", 1)).getEstimate(), 1.0);
+  }
+
+  @Test
+  public void applyAggregatedValueShouldUnion() {
+    IntegerSketch s1 = new IntegerSketch(16, IntegerSummary.Mode.Sum);
+    IntegerSketch s2 = new IntegerSketch(16, IntegerSummary.Mode.Sum);
+    s1.update("a", 1);
+    s2.update("b", 1);
+    IntegerTupleSketchValueAggregator agg = new IntegerTupleSketchValueAggregator(IntegerSummary.Mode.Sum);
+    Sketch<IntegerSummary> merged = agg.applyAggregatedValue(s1, s2);
+    assertEquals(merged.getEstimate(), 2.0);
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), agg.serializeAggregatedValue(merged).length);
+  }
+
+  @Test
+  public void applyRawValueShouldUnion() {
+    IntegerSketch s1 = new IntegerSketch(16, IntegerSummary.Mode.Sum);
+    IntegerSketch s2 = new IntegerSketch(16, IntegerSummary.Mode.Sum);
+    s1.update("a", 1);
+    s2.update("b", 1);
+    IntegerTupleSketchValueAggregator agg = new IntegerTupleSketchValueAggregator(IntegerSummary.Mode.Sum);
+    Sketch<IntegerSummary> merged = agg.applyRawValue(s1, agg.serializeAggregatedValue(s2));
+    assertEquals(merged.getEstimate(), 2.0);
+
+    // and should update the max size
+    assertEquals(agg.getMaxAggregatedValueByteSize(), agg.serializeAggregatedValue(merged).length);
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManagerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManagerTest.java
index ca305278caf..0fed3d59ddc 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManagerTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManagerTest.java
@@ -25,7 +25,6 @@
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentImpl;
-import org.apache.pinot.segment.local.upsert.RecordInfo;
 import org.apache.pinot.segment.local.utils.HashUtils;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.spi.config.table.HashFunction;
@@ -122,20 +121,16 @@ public void verifyAddRow() {
     metadataManager.addSegment(segment1);
 
     // Same PK exists
-    RecordInfo recordInfo = mock(RecordInfo.class);
-    when(recordInfo.getPrimaryKey()).thenReturn(getPrimaryKey(0));
     ImmutableSegmentImpl segment2 = mockSegment(2);
-    Assert.assertTrue(metadataManager.checkRecordPresentOrUpdate(recordInfo.getPrimaryKey(), segment2));
+    Assert.assertTrue(metadataManager.checkRecordPresentOrUpdate(getPrimaryKey(0), segment2));
     checkRecordLocation(recordLocationMap, 0, segment1, hashFunction);
 
     // New PK
-    when(recordInfo.getPrimaryKey()).thenReturn(getPrimaryKey(3));
-    Assert.assertFalse(metadataManager.checkRecordPresentOrUpdate(recordInfo.getPrimaryKey(), segment2));
+    Assert.assertFalse(metadataManager.checkRecordPresentOrUpdate(getPrimaryKey(3), segment2));
     checkRecordLocation(recordLocationMap, 3, segment2, hashFunction);
 
     // Same PK as the one recently ingested
-    when(recordInfo.getPrimaryKey()).thenReturn(getPrimaryKey(3));
-    Assert.assertTrue(metadataManager.checkRecordPresentOrUpdate(recordInfo.getPrimaryKey(), segment2));
+    Assert.assertTrue(metadataManager.checkRecordPresentOrUpdate(getPrimaryKey(3), segment2));
   }
 
   private static ImmutableSegmentImpl mockSegment(int sequenceNumber) {
@@ -160,7 +155,7 @@ private static void checkRecordLocation(Map<Object, IndexSegment> recordLocation
     assertSame(indexSegment, segment);
   }
 
-  private static class TestMetadataManager extends PartitionDedupMetadataManager {
+  private static class TestMetadataManager extends ConcurrentMapPartitionDedupMetadataManager {
     Iterator<PrimaryKey> _primaryKeyIterator;
 
     TestMetadataManager(String tableNameWithType, List<String> primaryKeyColumns, int partitionId,
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImplUpsertSnapshotTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImplUpsertSnapshotTest.java
deleted file mode 100644
index 6c31c3981ff..00000000000
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImplUpsertSnapshotTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.indexsegment.immutable;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.commons.io.FileUtils;
-import org.apache.pinot.common.metrics.ServerMetrics;
-import org.apache.pinot.segment.local.segment.creator.SegmentTestUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
-import org.apache.pinot.segment.local.upsert.ConcurrentMapPartitionUpsertMetadataManager;
-import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
-import org.apache.pinot.segment.spi.V1Constants;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
-import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
-import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
-import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
-import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
-import org.apache.pinot.segment.spi.store.SegmentDirectory;
-import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
-import org.apache.pinot.spi.config.table.HashFunction;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.config.table.UpsertConfig;
-import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.utils.ReadMode;
-import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
-import org.mockito.Mockito;
-import org.roaringbitmap.buffer.MutableRoaringBitmap;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-
-public class ImmutableSegmentImplUpsertSnapshotTest {
-  private static final String AVRO_FILE = "data/test_data-mv.avro";
-  private static final String SCHEMA = "data/testDataMVSchema.json";
-  private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "ImmutableSegmentImplTest");
-
-  private SegmentDirectory _segmentDirectory;
-  private SegmentMetadataImpl _segmentMetadata;
-  private PinotConfiguration _configuration;
-  private TableConfig _tableConfig;
-  private Schema _schema;
-
-  private PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
-  private ImmutableSegmentImpl _immutableSegmentImpl;
-
-  @BeforeClass
-  public void setUp()
-      throws Exception {
-    FileUtils.deleteQuietly(INDEX_DIR);
-
-    Map<String, Object> props = new HashMap<>();
-    props.put(IndexLoadingConfig.READ_MODE_KEY, ReadMode.mmap.toString());
-    _configuration = new PinotConfiguration(props);
-
-    _segmentDirectory = SegmentDirectoryLoaderRegistry.getDefaultSegmentDirectoryLoader().load(INDEX_DIR.toURI(),
-        new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
-
-    URL resourceUrl = ImmutableSegmentImpl.class.getClassLoader().getResource(AVRO_FILE);
-    Assert.assertNotNull(resourceUrl);
-    File avroFile = new File(resourceUrl.getFile());
-
-    IngestionConfig ingestionConfig = new IngestionConfig();
-    ingestionConfig.setRowTimeValueCheck(false);
-    ingestionConfig.setSegmentTimeValueCheck(false);
-
-    UpsertConfig upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
-    upsertConfig.setEnableSnapshot(true);
-
-    _tableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName("testTable").setTimeColumnName("daysSinceEpoch")
-            .setIngestionConfig(ingestionConfig).setUpsertConfig(upsertConfig).build();
-
-    resourceUrl = ImmutableSegmentImpl.class.getClassLoader().getResource(SCHEMA);
-    _schema = Schema.fromFile(new File(resourceUrl.getFile()));
-
-    SegmentGeneratorConfig config =
-        SegmentTestUtils.getSegmentGeneratorConfigWithSchema(avroFile, INDEX_DIR, "testTable", _tableConfig, _schema);
-
-    SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
-    driver.init(config);
-    driver.build();
-    _segmentMetadata = Mockito.mock(SegmentMetadataImpl.class);
-    Mockito.when(_segmentMetadata.getColumnMetadataMap()).thenReturn(new HashMap<>());
-    Mockito.when(_segmentMetadata.getIndexDir()).thenReturn(INDEX_DIR);
-    _immutableSegmentImpl = new ImmutableSegmentImpl(_segmentDirectory, _segmentMetadata, new HashMap<>(), null);
-
-    ServerMetrics serverMetrics = Mockito.mock(ServerMetrics.class);
-    _partitionUpsertMetadataManager =
-        new ConcurrentMapPartitionUpsertMetadataManager("testTable_REALTIME", 0, Collections.singletonList("column6"),
-            "daysSinceEpoch", HashFunction.NONE, null, true, serverMetrics);
-
-    _immutableSegmentImpl.enableUpsert(_partitionUpsertMetadataManager, new ThreadSafeMutableRoaringBitmap());
-  }
-
-  @Test
-  public void testPersistValidDocIdsSnapshot() {
-    int[] docIds1 = new int[]{1, 4, 6, 10, 15, 17, 18, 20};
-    MutableRoaringBitmap validDocIds = new MutableRoaringBitmap();
-    validDocIds.add(docIds1);
-
-    _immutableSegmentImpl.persistValidDocIdsSnapshot(validDocIds);
-    assertTrue(new File(SegmentDirectoryPaths.findSegmentDirectory(_segmentMetadata.getIndexDir()),
-        V1Constants.VALID_DOC_IDS_SNAPSHOT_FILE_NAME).exists());
-
-    MutableRoaringBitmap bitmap = _immutableSegmentImpl.loadValidDocIdsFromSnapshot();
-    assertEquals(bitmap.toArray(), docIds1);
-
-    _immutableSegmentImpl.deleteValidDocIdsSnapshot();
-    assertFalse(new File(SegmentDirectoryPaths.findSegmentDirectory(_segmentMetadata.getIndexDir()),
-        V1Constants.VALID_DOC_IDS_SNAPSHOT_FILE_NAME).exists());
-  }
-
-  @AfterMethod
-  public void tearDown() {
-    FileUtils.deleteQuietly(INDEX_DIR);
-  }
-}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/IntermediateSegmentTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/IntermediateSegmentTest.java
deleted file mode 100644
index c7629426264..00000000000
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/IntermediateSegmentTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.indexsegment.mutable;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.FileUtils;
-import org.apache.pinot.plugin.inputformat.avro.AvroRecordReader;
-import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
-import org.apache.pinot.segment.local.segment.creator.SegmentTestUtils;
-import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
-import org.apache.pinot.segment.local.segment.readers.PinotSegmentRecordReader;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
-import org.apache.pinot.segment.spi.datasource.DataSource;
-import org.apache.pinot.segment.spi.index.reader.Dictionary;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
-import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
-import org.apache.pinot.spi.config.table.TableConfig;
-import org.apache.pinot.spi.config.table.TableType;
-import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.apache.pinot.spi.data.Schema;
-import org.apache.pinot.spi.data.TimeGranularitySpec;
-import org.apache.pinot.spi.data.readers.GenericRow;
-import org.apache.pinot.spi.utils.ReadMode;
-import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-
-public class IntermediateSegmentTest {
-  private static final String AVRO_DATA_SV = "data/test_data-sv.avro";
-  private static final String AVRO_DATA_MV = "data/test_data-mv.avro";
-  private static final String SEGMENT_NAME = "testSegmentName";
-  private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "IntermediateSegmentTest");
-
-  @BeforeMethod
-  public void setUp()
-      throws Exception {
-    FileUtils.deleteQuietly(INDEX_DIR);
-  }
-
-  @AfterMethod
-  public void tearDown() {
-    FileUtils.deleteQuietly(INDEX_DIR);
-  }
-
-  @DataProvider(name = "segmentCreationTestCases")
-  private static Object[][] createSegmentCreationTestCases() {
-    return new Object[][]{{AVRO_DATA_SV}, {AVRO_DATA_MV}};
-  }
-
-  @Test(dataProvider = "segmentCreationTestCases")
-  public void testOfflineSegmentCreationFromDifferentWays(String inputFile)
-      throws Exception {
-    // Get resource file path.
-    URL resource = getClass().getClassLoader().getResource(inputFile);
-    assertNotNull(resource);
-    String filePath = resource.getFile();
-
-    Schema schema = createSchema(inputFile);
-    TableConfig tableConfig = createTableConfig(inputFile);
-
-    // Create the segment generator config.
-    SegmentGeneratorConfig segmentGeneratorConfig = new SegmentGeneratorConfig(tableConfig, schema);
-    segmentGeneratorConfig.setInputFilePath(filePath);
-    segmentGeneratorConfig.setTableName("testTable");
-    segmentGeneratorConfig.setSegmentName(SEGMENT_NAME);
-    segmentGeneratorConfig.setOutDir(INDEX_DIR.getAbsolutePath());
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(Arrays.asList("column6", "column7"));
-
-    IndexSegment segmentFromIntermediateSegment = buildSegmentFromIntermediateSegment(segmentGeneratorConfig);
-    IndexSegment segmentFromAvroRecordReader = buildSegmentFromAvroRecordReader(segmentGeneratorConfig);
-
-    assertNotNull(segmentFromIntermediateSegment);
-    assertNotNull(segmentFromAvroRecordReader);
-    assertEquals(segmentFromIntermediateSegment.getColumnNames(), segmentFromAvroRecordReader.getColumnNames());
-    Set<String> physicalColumnsFromIntermediateSegment = segmentFromIntermediateSegment.getPhysicalColumnNames();
-    Set<String> physicalColumnsFromAvroSegment = segmentFromAvroRecordReader.getPhysicalColumnNames();
-    assertEquals(physicalColumnsFromIntermediateSegment, physicalColumnsFromAvroSegment);
-
-    // Comparison for every columns
-    for (String column : physicalColumnsFromIntermediateSegment) {
-      DataSource dataSourceFromIntermediateSegment = segmentFromIntermediateSegment.getDataSource(column);
-      DataSource dataSourceFromAvroRecordReader = segmentFromAvroRecordReader.getDataSource(column);
-
-      // Comparison for dictionaries.
-      Dictionary actualDictionary = dataSourceFromIntermediateSegment.getDictionary();
-      Dictionary expectedDictionary = dataSourceFromAvroRecordReader.getDictionary();
-      assertEquals(actualDictionary.getMinVal(), expectedDictionary.getMinVal());
-      assertEquals(actualDictionary.getMaxVal(), expectedDictionary.getMaxVal());
-      assertEquals(actualDictionary.getValueType(), expectedDictionary.getValueType());
-      assertEquals(actualDictionary.length(), expectedDictionary.length());
-      int dictionaryLength = actualDictionary.length();
-      for (int i = 0; i < dictionaryLength; i++) {
-        assertEquals(actualDictionary.get(i), expectedDictionary.get(i));
-      }
-
-      // Comparison for inverted index
-      InvertedIndexReader actualInvertedIndexReader = dataSourceFromIntermediateSegment.getInvertedIndex();
-      InvertedIndexReader expectedInvertedIndexReader = dataSourceFromAvroRecordReader.getInvertedIndex();
-      if (actualInvertedIndexReader != null) {
-        for (int j = 0; j < dictionaryLength; j++) {
-          assertEquals(actualInvertedIndexReader.getDocIds(j), expectedInvertedIndexReader.getDocIds(j));
-        }
-      }
-
-      // Check for Partition Metadata.
-      SegmentPartitionConfig segmentPartitionConfig = tableConfig.getIndexingConfig().getSegmentPartitionConfig();
-      if (segmentPartitionConfig != null && segmentPartitionConfig.getColumnPartitionMap().containsKey(column)) {
-        ColumnMetadata columnMetadata =
-            segmentFromIntermediateSegment.getSegmentMetadata().getColumnMetadataFor(column);
-        assertNotNull(columnMetadata.getPartitionFunction());
-        assertEquals(columnMetadata.getPartitionFunction().getName(), segmentPartitionConfig.getFunctionName(column));
-        assertEquals(columnMetadata.getPartitionFunction().getNumPartitions(),
-            segmentPartitionConfig.getNumPartitions(column));
-        assertEquals(columnMetadata.getPartitionFunction().getFunctionConfig(),
-            segmentPartitionConfig.getFunctionConfig(column));
-        assertNotNull(columnMetadata.getPartitions());
-        assertEquals(columnMetadata.getPartitions().size(), 1);
-      }
-    }
-  }
-
-  private IndexSegment buildSegmentFromIntermediateSegment(SegmentGeneratorConfig segmentGeneratorConfig)
-      throws Exception {
-    // Set intermediate segment record reader.
-    String segmentName = SEGMENT_NAME + "_from_intermediate_segment";
-    segmentGeneratorConfig.setSegmentName(segmentName);
-    IntermediateSegment intermediateSegment = new IntermediateSegment(segmentGeneratorConfig);
-
-    // Ingest data.
-    ingestDataToIntermediateSegment(segmentGeneratorConfig, intermediateSegment);
-    PinotSegmentRecordReader recordReader = new PinotSegmentRecordReader();
-    recordReader.init(intermediateSegment);
-
-    // Build the segment from intermediate segment.
-    SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
-    driver.init(segmentGeneratorConfig, recordReader);
-    driver.build();
-
-    // Destroy intermediate segment after the segment creation.
-    recordReader.close();
-    intermediateSegment.destroy();
-
-    return ImmutableSegmentLoader.load(new File(INDEX_DIR, segmentName), ReadMode.heap);
-  }
-
-  private IndexSegment buildSegmentFromAvroRecordReader(SegmentGeneratorConfig segmentGeneratorConfig)
-      throws Exception {
-    // Use avro record reader by default
-    String segmentName = SEGMENT_NAME + "_from_avro_reader";
-    segmentGeneratorConfig.setSegmentName(segmentName);
-
-    // Build the index segment.
-    SegmentIndexCreationDriver driver = new SegmentIndexCreationDriverImpl();
-    driver.init(segmentGeneratorConfig);
-    driver.build();
-
-    return ImmutableSegmentLoader.load(new File(INDEX_DIR, segmentName), ReadMode.heap);
-  }
-
-  private void ingestDataToIntermediateSegment(SegmentGeneratorConfig segmentGeneratorConfig,
-      IntermediateSegment intermediateSegment)
-      throws IOException {
-    AvroRecordReader avroRecordReader = new AvroRecordReader();
-    avroRecordReader.init(new File(segmentGeneratorConfig.getInputFilePath()), null, null);
-
-    GenericRow genericRow = new GenericRow();
-    while (avroRecordReader.hasNext()) {
-      genericRow.clear();
-      genericRow = avroRecordReader.next(genericRow);
-      intermediateSegment.index(genericRow, null);
-    }
-  }
-
-  private static Schema createSchema(String inputFile)
-      throws IOException {
-    Schema schema;
-    if (AVRO_DATA_SV.equals(inputFile)) {
-      schema = new Schema.SchemaBuilder().setSchemaName("testTable").addMetric("column1", FieldSpec.DataType.INT)
-          .addMetric("column3", FieldSpec.DataType.INT).addSingleValueDimension("column5", FieldSpec.DataType.STRING)
-          .addSingleValueDimension("column6", FieldSpec.DataType.INT)
-          .addSingleValueDimension("column7", FieldSpec.DataType.INT)
-          .addSingleValueDimension("column9", FieldSpec.DataType.INT)
-          .addSingleValueDimension("column11", FieldSpec.DataType.STRING)
-          .addSingleValueDimension("column12", FieldSpec.DataType.STRING).addMetric("column17", FieldSpec.DataType.INT)
-          .addMetric("column18", FieldSpec.DataType.INT)
-          .addTime(new TimeGranularitySpec(FieldSpec.DataType.INT, TimeUnit.DAYS, "daysSinceEpoch"), null).build();
-    } else {
-      URL resource = IntermediateSegmentTest.class.getClassLoader().getResource(inputFile);
-      assertNotNull(resource);
-      String filePath = resource.getFile();
-      schema = SegmentTestUtils.extractSchemaFromAvroWithoutTime(new File(filePath));
-    }
-    return schema;
-  }
-
-  private static TableConfig createTableConfig(String inputFile) {
-    TableConfig tableConfig;
-    if (AVRO_DATA_SV.equals(inputFile)) {
-      // The segment generation code in SegmentColumnarIndexCreator will throw
-      // exception if start and end time in time column are not in acceptable
-      // range. For this test, we first need to fix the input avro data
-      // to have the time column values in allowed range. Until then, the check
-      // is explicitly disabled
-      IngestionConfig ingestionConfig = new IngestionConfig();
-      ingestionConfig.setSegmentTimeValueCheck(false);
-      ingestionConfig.setRowTimeValueCheck(false);
-      tableConfig =
-          new TableConfigBuilder(TableType.OFFLINE).setTableName("testTable").setTimeColumnName("daysSinceEpoch")
-              .setInvertedIndexColumns(Arrays.asList("column6", "column7", "column11", "column17", "column18"))
-              .setSegmentPartitionConfig(getSegmentPartitionConfig())
-              .setIngestionConfig(ingestionConfig).build();
-    } else {
-      tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName("testTable").build();
-    }
-    return tableConfig;
-  }
-
-  private static SegmentPartitionConfig getSegmentPartitionConfig() {
-    Map<String, ColumnPartitionConfig> columnPartitionConfigMap = new HashMap<>();
-    ColumnPartitionConfig columnOneConfig = new ColumnPartitionConfig("Murmur", 1);
-    columnPartitionConfigMap.put("column7", columnOneConfig);
-    ColumnPartitionConfig columnTwoConfig = new ColumnPartitionConfig("HashCode", 1);
-    columnPartitionConfigMap.put("column11", columnTwoConfig);
-    return new SegmentPartitionConfig(columnPartitionConfigMap);
-  }
-}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentDedupeTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentDedupeTest.java
index 6f310c863c0..ebc092eb2b9 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentDedupeTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentDedupeTest.java
@@ -23,8 +23,10 @@
 import java.net.URL;
 import java.util.Collections;
 import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
 import org.apache.pinot.segment.local.dedup.PartitionDedupMetadataManager;
 import org.apache.pinot.segment.local.dedup.TableDedupMetadataManager;
+import org.apache.pinot.segment.local.dedup.TableDedupMetadataManagerFactory;
 import org.apache.pinot.segment.local.recordtransformer.CompositeTransformer;
 import org.apache.pinot.spi.config.table.DedupConfig;
 import org.apache.pinot.spi.config.table.HashFunction;
@@ -56,8 +58,7 @@ private void setup(boolean dedupEnabled)
     CompositeTransformer recordTransformer = CompositeTransformer.getDefaultTransformer(tableConfig, schema);
     File jsonFile = new File(dataResourceUrl.getFile());
     PartitionDedupMetadataManager partitionDedupMetadataManager =
-        (dedupEnabled) ? new TableDedupMetadataManager("testTable_REALTIME", schema.getPrimaryKeyColumns(),
-            Mockito.mock(ServerMetrics.class), HashFunction.NONE).getOrCreatePartitionManager(0) : null;
+        (dedupEnabled) ? getTableDedupMetadataManager(schema).getOrCreatePartitionManager(0) : null;
     _mutableSegmentImpl =
         MutableSegmentImplTestUtils.createMutableSegmentImpl(schema, Collections.emptySet(), Collections.emptySet(),
             Collections.emptySet(), false, true, null, "secondsSinceEpoch", null, partitionDedupMetadataManager);
@@ -73,6 +74,14 @@ private void setup(boolean dedupEnabled)
     }
   }
 
+  private static TableDedupMetadataManager getTableDedupMetadataManager(Schema schema) {
+    TableConfig tableConfig = Mockito.mock(TableConfig.class);
+    Mockito.when(tableConfig.getTableName()).thenReturn("testTable_REALTIME");
+    Mockito.when(tableConfig.getDedupConfig()).thenReturn(new DedupConfig(true, HashFunction.NONE));
+    return TableDedupMetadataManagerFactory.create(tableConfig, schema, Mockito.mock(TableDataManager.class),
+        Mockito.mock(ServerMetrics.class));
+  }
+
   @Test
   public void testDedupeEnabled()
       throws Exception {
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplTestUtils.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplTestUtils.java
index 4c0a924c817..10270e5b6fb 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplTestUtils.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplTestUtils.java
@@ -29,6 +29,9 @@
 import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentConfig;
 import org.apache.pinot.segment.local.realtime.impl.RealtimeSegmentStatsHistory;
 import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.JsonIndexConfig;
 import org.apache.pinot.spi.config.table.UpsertConfig;
 import org.apache.pinot.spi.config.table.ingestion.AggregationConfig;
@@ -96,19 +99,26 @@ public static MutableSegmentImpl createMutableSegmentImpl(Schema schema, Set<Str
     when(statsHistory.getEstimatedAvgColSize(anyString())).thenReturn(32);
 
     UpsertConfig.Mode upsertMode = upsertConfig == null ? UpsertConfig.Mode.NONE : upsertConfig.getMode();
-    String comparisonColumn = upsertConfig == null ? null : upsertConfig.getComparisonColumn();
-    RealtimeSegmentConfig realtimeSegmentConfig =
-        new RealtimeSegmentConfig.Builder().setTableNameWithType(TABLE_NAME_WITH_TYPE).setSegmentName(SEGMENT_NAME)
-            .setStreamName(STREAM_NAME).setSchema(schema).setTimeColumnName(timeColumnName).setCapacity(100000)
-            .setAvgNumMultiValues(2).setNoDictionaryColumns(noDictionaryColumns).setJsonIndexConfigs(jsonIndexConfigs)
-            .setVarLengthDictionaryColumns(varLengthDictionaryColumns).setInvertedIndexColumns(invertedIndexColumns)
-            .setSegmentZKMetadata(new SegmentZKMetadata(SEGMENT_NAME))
-            .setMemoryManager(new DirectMemoryManager(SEGMENT_NAME)).setStatsHistory(statsHistory)
-            .setAggregateMetrics(aggregateMetrics).setNullHandlingEnabled(nullHandlingEnabled).setUpsertMode(upsertMode)
-            .setUpsertComparisonColumn(comparisonColumn)
-            .setPartitionUpsertMetadataManager(partitionUpsertMetadataManager)
-            .setPartitionDedupMetadataManager(partitionDedupMetadataManager)
-            .setIngestionAggregationConfigs(aggregationConfigs).build();
+    List<String> comparisonColumns = upsertConfig == null ? null : upsertConfig.getComparisonColumns();
+    DictionaryIndexConfig varLengthDictConf = new DictionaryIndexConfig(false, true);
+    RealtimeSegmentConfig.Builder segmentConfBuilder = new RealtimeSegmentConfig.Builder()
+        .setTableNameWithType(TABLE_NAME_WITH_TYPE).setSegmentName(SEGMENT_NAME)
+        .setStreamName(STREAM_NAME).setSchema(schema).setTimeColumnName(timeColumnName).setCapacity(100000)
+        .setAvgNumMultiValues(2)
+        .setIndex(noDictionaryColumns, StandardIndexes.dictionary(), DictionaryIndexConfig.DISABLED)
+        .setIndex(varLengthDictionaryColumns, StandardIndexes.dictionary(), varLengthDictConf)
+        .setIndex(invertedIndexColumns, StandardIndexes.inverted(), IndexConfig.ENABLED)
+        .setSegmentZKMetadata(new SegmentZKMetadata(SEGMENT_NAME))
+        .setMemoryManager(new DirectMemoryManager(SEGMENT_NAME)).setStatsHistory(statsHistory)
+        .setAggregateMetrics(aggregateMetrics).setNullHandlingEnabled(nullHandlingEnabled).setUpsertMode(upsertMode)
+        .setUpsertComparisonColumns(comparisonColumns)
+        .setPartitionUpsertMetadataManager(partitionUpsertMetadataManager)
+        .setPartitionDedupMetadataManager(partitionDedupMetadataManager)
+        .setIngestionAggregationConfigs(aggregationConfigs);
+    for (Map.Entry<String, JsonIndexConfig> entry : jsonIndexConfigs.entrySet()) {
+      segmentConfBuilder.setIndex(entry.getKey(), StandardIndexes.json(), entry.getValue());
+    }
+    RealtimeSegmentConfig realtimeSegmentConfig = segmentConfBuilder.build();
     return new MutableSegmentImpl(realtimeSegmentConfig, serverMetrics);
   }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertComparisonColTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertComparisonColTest.java
index a8d8e956c47..aae9b9cec69 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertComparisonColTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertComparisonColTest.java
@@ -21,10 +21,13 @@
 import java.io.File;
 import java.net.URL;
 import java.util.Collections;
+import java.util.concurrent.ExecutorService;
+import org.apache.helix.HelixManager;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.segment.local.data.manager.TableDataManager;
 import org.apache.pinot.segment.local.recordtransformer.CompositeTransformer;
 import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
+import org.apache.pinot.segment.local.upsert.TableUpsertMetadataManager;
 import org.apache.pinot.segment.local.upsert.TableUpsertMetadataManagerFactory;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -65,9 +68,10 @@ public void setup()
             .build();
     _recordTransformer = CompositeTransformer.getDefaultTransformer(_tableConfig, _schema);
     File jsonFile = new File(dataResourceUrl.getFile());
-    _partitionUpsertMetadataManager =
-        TableUpsertMetadataManagerFactory.create(_tableConfig, _schema, mock(TableDataManager.class),
-            mock(ServerMetrics.class)).getOrCreatePartitionManager(0);
+    TableUpsertMetadataManager tableUpsertMetadataManager = TableUpsertMetadataManagerFactory.create(_tableConfig);
+    tableUpsertMetadataManager.init(_tableConfig, _schema, mock(TableDataManager.class), mock(ServerMetrics.class),
+        mock(HelixManager.class), mock(ExecutorService.class));
+    _partitionUpsertMetadataManager = tableUpsertMetadataManager.getOrCreatePartitionManager(0);
     _mutableSegmentImpl =
         MutableSegmentImplTestUtils.createMutableSegmentImpl(_schema, Collections.emptySet(), Collections.emptySet(),
             Collections.emptySet(), false, true, offsetUpsertConfig, "secondsSinceEpoch",
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertTest.java
index a2439d9f8f7..4f243c60008 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/indexsegment/mutable/MutableSegmentImplUpsertTest.java
@@ -20,11 +20,16 @@
 
 import java.io.File;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import org.apache.helix.HelixManager;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.segment.local.data.manager.TableDataManager;
 import org.apache.pinot.segment.local.recordtransformer.CompositeTransformer;
 import org.apache.pinot.segment.local.upsert.PartitionUpsertMetadataManager;
+import org.apache.pinot.segment.local.upsert.TableUpsertMetadataManager;
 import org.apache.pinot.segment.local.upsert.TableUpsertMetadataManagerFactory;
 import org.apache.pinot.spi.config.table.HashFunction;
 import org.apache.pinot.spi.config.table.TableConfig;
@@ -52,21 +57,35 @@ public class MutableSegmentImplUpsertTest {
   private MutableSegmentImpl _mutableSegmentImpl;
   private PartitionUpsertMetadataManager _partitionUpsertMetadataManager;
 
-  private void setup(HashFunction hashFunction)
+  private UpsertConfig createPartialUpsertConfig(HashFunction hashFunction) {
+    UpsertConfig upsertConfigWithHash = new UpsertConfig(UpsertConfig.Mode.PARTIAL);
+    upsertConfigWithHash.setPartialUpsertStrategies(new HashMap<>());
+    upsertConfigWithHash.setDefaultPartialUpsertStrategy(UpsertConfig.Strategy.OVERWRITE);
+    upsertConfigWithHash.setComparisonColumns(Arrays.asList("secondsSinceEpoch", "otherComparisonColumn"));
+    upsertConfigWithHash.setHashFunction(hashFunction);
+    return upsertConfigWithHash;
+  }
+
+  private UpsertConfig createFullUpsertConfig(HashFunction hashFunction) {
+    UpsertConfig upsertConfigWithHash = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfigWithHash.setHashFunction(hashFunction);
+    return upsertConfigWithHash;
+  }
+
+  private void setup(UpsertConfig upsertConfigWithHash)
       throws Exception {
     URL schemaResourceUrl = this.getClass().getClassLoader().getResource(SCHEMA_FILE_PATH);
     URL dataResourceUrl = this.getClass().getClassLoader().getResource(DATA_FILE_PATH);
     _schema = Schema.fromFile(new File(schemaResourceUrl.getFile()));
-    UpsertConfig upsertConfigWithHash = new UpsertConfig(UpsertConfig.Mode.FULL);
-    upsertConfigWithHash.setHashFunction(hashFunction);
     _tableConfig =
         new TableConfigBuilder(TableType.REALTIME).setTableName("testTable").setUpsertConfig(upsertConfigWithHash)
-            .build();
+            .setNullHandlingEnabled(true).build();
     _recordTransformer = CompositeTransformer.getDefaultTransformer(_tableConfig, _schema);
     File jsonFile = new File(dataResourceUrl.getFile());
-    _partitionUpsertMetadataManager =
-        TableUpsertMetadataManagerFactory.create(_tableConfig, _schema, mock(TableDataManager.class),
-            mock(ServerMetrics.class)).getOrCreatePartitionManager(0);
+    TableUpsertMetadataManager tableUpsertMetadataManager = TableUpsertMetadataManagerFactory.create(_tableConfig);
+    tableUpsertMetadataManager.init(_tableConfig, _schema, mock(TableDataManager.class), mock(ServerMetrics.class),
+        mock(HelixManager.class), mock(ExecutorService.class));
+    _partitionUpsertMetadataManager = tableUpsertMetadataManager.getOrCreatePartitionManager(0);
     _mutableSegmentImpl =
         MutableSegmentImplTestUtils.createMutableSegmentImpl(_schema, Collections.emptySet(), Collections.emptySet(),
             Collections.emptySet(), false, true, upsertConfigWithHash, "secondsSinceEpoch",
@@ -87,18 +106,54 @@ private void setup(HashFunction hashFunction)
   @Test
   public void testHashFunctions()
       throws Exception {
-    testUpsertIngestion(HashFunction.NONE);
-    testUpsertIngestion(HashFunction.MD5);
-    testUpsertIngestion(HashFunction.MURMUR3);
+    testUpsertIngestion(createFullUpsertConfig(HashFunction.NONE));
+    testUpsertIngestion(createFullUpsertConfig(HashFunction.MD5));
+    testUpsertIngestion(createFullUpsertConfig(HashFunction.MURMUR3));
   }
 
-  private void testUpsertIngestion(HashFunction hashFunction)
+  @Test
+  public void testMultipleComparisonColumns()
       throws Exception {
-    setup(hashFunction);
+    testUpsertIngestion(createPartialUpsertConfig(HashFunction.NONE));
+    testUpsertIngestion(createPartialUpsertConfig(HashFunction.MD5));
+    testUpsertIngestion(createPartialUpsertConfig(HashFunction.MURMUR3));
+  }
+
+  private void testUpsertIngestion(UpsertConfig upsertConfig)
+      throws Exception {
+    setup(upsertConfig);
     ImmutableRoaringBitmap bitmap = _mutableSegmentImpl.getValidDocIds().getMutableRoaringBitmap();
-    Assert.assertFalse(bitmap.contains(0));
-    Assert.assertTrue(bitmap.contains(1));
-    Assert.assertTrue(bitmap.contains(2));
-    Assert.assertFalse(bitmap.contains(3));
+    if (upsertConfig.getComparisonColumns() == null) {
+      // aa
+      Assert.assertFalse(bitmap.contains(0));
+      Assert.assertTrue(bitmap.contains(1));
+      Assert.assertFalse(bitmap.contains(2));
+      Assert.assertFalse(bitmap.contains(3));
+      // bb
+      Assert.assertFalse(bitmap.contains(4));
+      Assert.assertTrue(bitmap.contains(5));
+      Assert.assertFalse(bitmap.contains(6));
+    } else {
+      // aa
+      Assert.assertFalse(bitmap.contains(0));
+      Assert.assertFalse(bitmap.contains(1));
+      Assert.assertTrue(bitmap.contains(2));
+      Assert.assertFalse(bitmap.contains(3));
+      // Confirm that both comparison column values have made it into the persisted upserted doc
+      Assert.assertEquals(1567205397L, _mutableSegmentImpl.getValue(2, "secondsSinceEpoch"));
+      Assert.assertEquals(1567205395L, _mutableSegmentImpl.getValue(2, "otherComparisonColumn"));
+      Assert.assertFalse(_mutableSegmentImpl.getDataSource("secondsSinceEpoch").getNullValueVector().isNull(2));
+      Assert.assertFalse(_mutableSegmentImpl.getDataSource("otherComparisonColumn").getNullValueVector().isNull(2));
+
+      // bb
+      Assert.assertFalse(bitmap.contains(4));
+      Assert.assertTrue(bitmap.contains(5));
+      Assert.assertFalse(bitmap.contains(6));
+      // Confirm that comparison column values have made it into the persisted upserted doc
+      Assert.assertEquals(1567205396L, _mutableSegmentImpl.getValue(5, "secondsSinceEpoch"));
+      Assert.assertEquals(Long.MIN_VALUE, _mutableSegmentImpl.getValue(5, "otherComparisonColumn"));
+      Assert.assertTrue(_mutableSegmentImpl.getDataSource("otherComparisonColumn").getNullValueVector().isNull(5));
+      Assert.assertFalse(_mutableSegmentImpl.getDataSource("secondsSinceEpoch").getNullValueVector().isNull(5));
+    }
   }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/LuceneMutableTextIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/LuceneMutableTextIndexTest.java
new file mode 100644
index 00000000000..8a807b5e5e4
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/LuceneMutableTextIndexTest.java
@@ -0,0 +1,72 @@
+/**
+ * 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.pinot.segment.local.realtime.impl.invertedindex;
+
+import java.io.File;
+import org.apache.commons.io.FileUtils;
+import org.apache.lucene.search.SearcherManager;
+import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+
+public class LuceneMutableTextIndexTest {
+  private static final File INDEX_DIR = new File(FileUtils.getTempDirectory(), "LuceneMutableIndexTest");
+  private static final String TEXT_COLUMN_NAME = "testColumnName";
+
+  private RealtimeLuceneTextIndex _realtimeLuceneTextIndex;
+
+  private String[][] getTextData() {
+    return new String[][]{
+        {"realtime stream processing"}, {"publish subscribe", "columnar processing for data warehouses", "concurrency"}
+    };
+  }
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    _realtimeLuceneTextIndex = new RealtimeLuceneTextIndex(TEXT_COLUMN_NAME, INDEX_DIR, "fooBar", null, null);
+    String[][] documents = getTextData();
+    for (String[] row : documents) {
+      _realtimeLuceneTextIndex.add(row);
+    }
+
+    SearcherManager searcherManager = _realtimeLuceneTextIndex.getSearcherManager();
+    try {
+      searcherManager.maybeRefresh();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @AfterClass
+  public void tearDown() {
+    _realtimeLuceneTextIndex.close();
+  }
+
+  @Test
+  public void testQueries() {
+    assertEquals(_realtimeLuceneTextIndex.getDocIds("stream"), ImmutableRoaringBitmap.bitmapOf(0));
+    assertEquals(_realtimeLuceneTextIndex.getDocIds("/.*house.*/"), ImmutableRoaringBitmap.bitmapOf(1));
+    assertEquals(_realtimeLuceneTextIndex.getDocIds("invalid"), ImmutableRoaringBitmap.bitmapOf());
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndexTest.java
index 0846aeb3db4..20b4523b4f3 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndexTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/realtime/impl/invertedindex/NativeMutableFSTIndexTest.java
@@ -32,13 +32,12 @@
 
 
 public class NativeMutableFSTIndexTest {
-  private static final String TEXT_COLUMN_NAME = "testColumnName";
   private NativeMutableFSTIndex _nativeMutableFSTIndex;
 
   @BeforeClass
   public void setUp()
       throws Exception {
-    _nativeMutableFSTIndex = new NativeMutableFSTIndex(TEXT_COLUMN_NAME);
+    _nativeMutableFSTIndex = new NativeMutableFSTIndex();
     List<String> documents = getTextData();
 
     for (String doc : documents) {
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/SegmentTestUtils.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/SegmentTestUtils.java
index e43aaa09797..c4329257399 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/SegmentTestUtils.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/SegmentTestUtils.java
@@ -37,6 +37,8 @@
 import org.apache.pinot.plugin.inputformat.avro.AvroSchemaUtil;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.table.ingestion.IngestionConfig;
@@ -93,7 +95,8 @@ public static SegmentGeneratorConfig getSegmentGenSpecWithSchemAndProjectedColum
     segmentGenSpec.setSegmentVersion(SegmentVersion.v1);
     segmentGenSpec.setTableName(tableName);
     segmentGenSpec.setOutDir(outputDir.getAbsolutePath());
-    segmentGenSpec.createInvertedIndexForAllColumns();
+    segmentGenSpec.getSchema().getAllFieldSpecs()
+        .forEach(fs -> segmentGenSpec.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, fs.getName()));
     return segmentGenSpec;
   }
 
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreatorTest.java
index 1099ec0000e..8bb530bb8b7 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreatorTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/creator/impl/nullvalue/NullValueVectorCreatorTest.java
@@ -21,7 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FileUtils;
-import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
+import org.roaringbitmap.RoaringBitmap;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -49,7 +49,7 @@ public void testNullValueVectorCreation()
     for (int i = 0; i < 100; i++) {
       creator.setNull(i);
     }
-    ImmutableRoaringBitmap nullBitmap = creator.getNullBitmap();
+    RoaringBitmap nullBitmap = creator.getNullBitmap();
     for (int i = 0; i < 100; i++) {
       Assert.assertTrue(nullBitmap.contains(i));
     }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/AbstractSerdeIndexContract.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/AbstractSerdeIndexContract.java
new file mode 100644
index 00000000000..86eb33ac200
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/AbstractSerdeIndexContract.java
@@ -0,0 +1,132 @@
+/**
+ * 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.pinot.segment.local.segment.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.segment.local.utils.TableConfigUtils;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.BeforeMethod;
+
+
+public class AbstractSerdeIndexContract {
+
+  protected Schema _schema;
+  protected TableConfig _tableConfig;
+
+  protected Schema createSchema()
+      throws JsonProcessingException {
+    return JsonUtils.stringToObject(""
+        + "{\n"
+        + "  \"schemaName\": \"transcript\",\n"
+        + "  \"dimensionFieldSpecs\": [\n"
+        + "    {\n"
+        + "      \"name\": \"dimInt\",\n"
+        + "      \"dataType\": \"INT\"\n"
+        + "    },\n"
+        + "    {\n"
+        + "      \"name\": \"dimStr\",\n"
+        + "      \"dataType\": \"STRING\"\n"
+        + "    }\n"
+        + "  ],\n"
+        + "  \"metricFieldSpecs\": [\n"
+        + "    {\n"
+        + "      \"name\": \"metInt\",\n"
+        + "      \"dataType\": \"INT\"\n"
+        + "    }\n"
+        + "  ]\n"
+        + "}", Schema.class);
+  }
+
+  protected TableConfig createTableConfig()
+      throws JsonProcessingException {
+    return JsonUtils.stringToObject(""
+        + "{\n"
+        + "  \"tableName\": \"transcript\"\n,"
+        + "  \"segmentsConfig\" : {\n"
+        + "    \"replication\" : \"1\",\n"
+        + "    \"schemaName\" : \"transcript\"\n"
+        + "  },\n"
+        + "  \"tableIndexConfig\" : {\n"
+        + "  },\n"
+        + "  \"tenants\" : {\n"
+        + "    \"broker\":\"DefaultTenant\",\n"
+        + "    \"server\":\"DefaultTenant\"\n"
+        + "  },\n"
+        + "  \"tableType\":\"OFFLINE\",\n"
+        + "  \"metadata\": {}\n"
+        + "}", TableConfig.class);
+  }
+  protected final TypeReference<List<String>> _stringListTypeRef = new TypeReference<List<String>>() {
+  };
+  protected final TypeReference<List<FieldConfig>> _fieldConfigListTypeRef = new TypeReference<List<FieldConfig>>() {
+  };
+
+  @BeforeMethod
+  public void reset()
+      throws JsonProcessingException {
+    _schema = createSchema();
+    _tableConfig = createTableConfig();
+  }
+
+  protected <C extends IndexConfig> C getActualConfig(String column, IndexType<C, ?, ?> type) {
+    Map<String, FieldIndexConfigs> confMap =
+        FieldIndexConfigsUtil.createIndexConfigsByColName(_tableConfig, _schema);
+
+    return confMap.get(column).getConfig(type);
+  }
+
+  protected void addFieldIndexConfig(String config)
+      throws JsonProcessingException {
+    addFieldIndexConfig(JsonUtils.stringToObject(config, FieldConfig.class));
+  }
+
+  protected void cleanFieldConfig() {
+    _tableConfig.setFieldConfigList(new ArrayList<>());
+  }
+
+  protected void addFieldIndexConfig(FieldConfig config) {
+    List<FieldConfig> fieldConfigList = _tableConfig.getFieldConfigList();
+    if (fieldConfigList == null) {
+      fieldConfigList = new ArrayList<>();
+    }
+    fieldConfigList.add(config);
+    _tableConfig.setFieldConfigList(fieldConfigList);
+  }
+
+  protected List<String> parseStringList(String json)
+      throws IOException {
+    return JsonUtils.stringToObject(json, _stringListTypeRef);
+  }
+
+  protected void convertToUpdatedFormat() {
+    _tableConfig = TableConfigUtils.createTableConfigFromOldFormat(_tableConfig, _schema);
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/H3IndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/H3IndexTest.java
index 6b25b5e8c65..39ba18a9041 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/H3IndexTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/H3IndexTest.java
@@ -18,23 +18,32 @@
  */
 package org.apache.pinot.segment.local.segment.index;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.Lists;
 import java.io.File;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.local.realtime.impl.geospatial.MutableH3Index;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.geospatial.OffHeapH3IndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.geospatial.OnHeapH3IndexCreator;
+import org.apache.pinot.segment.local.segment.index.h3.H3IndexType;
 import org.apache.pinot.segment.local.segment.index.readers.geospatial.ImmutableH3IndexReader;
+import org.apache.pinot.segment.local.utils.GeometrySerializer;
 import org.apache.pinot.segment.local.utils.GeometryUtils;
 import org.apache.pinot.segment.local.utils.H3Utils;
 import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
 import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
 import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.config.table.FieldConfig;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Point;
 import org.testng.Assert;
@@ -42,6 +51,10 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 
 public class H3IndexTest {
   private static final File TEMP_DIR = new File(FileUtils.getTempDirectory(), "H3IndexCreatorTest");
@@ -77,13 +90,14 @@ public void testH3Index()
           h3IndexResolution);
           GeoSpatialIndexCreator offHeapCreator = new OffHeapH3IndexCreator(TEMP_DIR, offHeapColumnName,
               h3IndexResolution)) {
+        int docId = 0;
         while (expectedCardinalities.size() < numUniqueH3Ids) {
           double longitude = RANDOM.nextDouble() * 360 - 180;
           double latitude = RANDOM.nextDouble() * 180 - 90;
           Point point = GeometryUtils.GEOMETRY_FACTORY.createPoint(new Coordinate(longitude, latitude));
           onHeapCreator.add(point);
           offHeapCreator.add(point);
-          mutableH3Index.add(point);
+          mutableH3Index.add(GeometrySerializer.serialize(point), -1, docId++);
           long h3Id = H3Utils.H3_CORE.geoToH3(latitude, longitude, resolution);
           expectedCardinalities.merge(h3Id, 1, Integer::sum);
         }
@@ -107,4 +121,89 @@ public void testH3Index()
       }
     }
   }
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    protected void assertEquals(H3IndexConfig expected) {
+      Assert.assertEquals(getActualConfig("dimStr", StandardIndexes.h3()), expected);
+    }
+
+    @Test
+    public void oldFieldConfigNull()
+        throws JsonProcessingException {
+      _tableConfig.setFieldConfigList(null);
+
+      assertEquals(H3IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldEmptyFieldConfig()
+        throws JsonProcessingException {
+      cleanFieldConfig();
+
+      assertEquals(H3IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldFieldConfigNotH3()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : []\n"
+          + " }");
+
+      assertEquals(H3IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldFieldConfigH3Resolution()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"H3\"],\n"
+          + "    \"properties\": {\n"
+          + "       \"resolutions\": \"3\""
+          + "     }\n"
+          + " }");
+
+      assertEquals(new H3IndexConfig(new H3IndexResolution(Lists.newArrayList(3))));
+    }
+
+    @Test
+    public void newConfEnabled()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexes\" : {\n"
+          + "       \"h3\": {\n"
+          + "          \"enabled\": \"true\",\n"
+          + "          \"resolution\": [3]\n"
+          + "       }\n"
+          + "    }\n"
+          + " }");
+      assertEquals(new H3IndexConfig(new H3IndexResolution(Lists.newArrayList(3))));
+    }
+
+    @Test
+    public void oldToNewConfConversion()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexes\" : {\n"
+          + "       \"h3\": {\n"
+          + "          \"enabled\": \"true\",\n"
+          + "          \"resolution\": [3]\n"
+          + "       }\n"
+          + "    }\n"
+          + " }");
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimStr"))
+          .collect(Collectors.toList()).get(0);
+      assertNotNull(fieldConfig.getIndexes().get(H3IndexType.INDEX_DISPLAY_NAME));
+      assertTrue(fieldConfig.getIndexTypes().isEmpty());
+    }
+  }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/IndexOverridesTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/IndexOverridesTest.java
deleted file mode 100644
index e96fe4d9864..00000000000
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/IndexOverridesTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.local.segment.index;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.UUID;
-import org.apache.pinot.segment.local.segment.creator.impl.inv.OffHeapBitmapInvertedIndexCreator;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
-import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.metadata.ColumnMetadataImpl;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.spi.data.DimensionFieldSpec;
-import org.apache.pinot.spi.data.FieldSpec;
-import org.mockito.MockedStatic;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import static org.apache.commons.io.FileUtils.deleteQuietly;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-
-public class IndexOverridesTest {
-
-  private File _file;
-
-  @BeforeTest
-  public void before()
-      throws IOException {
-    _file = Files.createTempFile("IndexOverridesTest", UUID.randomUUID().toString()).toFile();
-  }
-
-  @AfterTest
-  public void cleanup() {
-    deleteQuietly(_file);
-  }
-
-  @Test
-  public void testOverrideInvertedIndexCreation()
-      throws IOException {
-    DictionaryBasedInvertedIndexCreator highCardinalityInvertedIndex = mock(DictionaryBasedInvertedIndexCreator.class);
-    InvertedIndexReader<?> highCardinalityInvertedIndexReader = mock(InvertedIndexReader.class);
-    IndexCreatorProvider provider = new IndexingOverrides.Default() {
-      @Override
-      public DictionaryBasedInvertedIndexCreator newInvertedIndexCreator(IndexCreationContext.Inverted context)
-          throws IOException {
-        if (context.getCardinality() >= 10000) {
-          return highCardinalityInvertedIndex;
-        }
-        return super.newInvertedIndexCreator(context);
-      }
-
-      @Override
-      public InvertedIndexReader<?> newInvertedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-          throws IOException {
-        if (metadata.getCardinality() >= 10000) {
-          return highCardinalityInvertedIndexReader;
-        }
-        return super.newInvertedIndexReader(dataBuffer, metadata);
-      }
-    };
-    MockedStatic<IndexingOverrides> overrides = mockStatic(IndexingOverrides.class);
-    overrides.when(IndexingOverrides::getIndexCreatorProvider).thenReturn(provider);
-    IndexCreationContext.Inverted highCardinalityContext = newContext(Integer.MAX_VALUE);
-    assertEquals(IndexingOverrides.getIndexCreatorProvider().newInvertedIndexCreator(highCardinalityContext),
-        highCardinalityInvertedIndex);
-    IndexCreationContext.Inverted lowCardinalityContext = newContext(1);
-    assertTrue(IndexingOverrides.getIndexCreatorProvider()
-        .newInvertedIndexCreator(lowCardinalityContext) instanceof OffHeapBitmapInvertedIndexCreator);
-    overrides.when(IndexingOverrides::getIndexReaderProvider).thenReturn(provider);
-    ColumnMetadata highCardinalityMetadata = mock(ColumnMetadata.class);
-    when(highCardinalityMetadata.getCardinality()).thenReturn(100_000);
-    assertEquals(IndexingOverrides.getIndexReaderProvider()
-            .newInvertedIndexReader(mock(PinotDataBuffer.class), highCardinalityMetadata),
-        highCardinalityInvertedIndexReader);
-  }
-
-  private IndexCreationContext.Inverted newContext(int cardinality) {
-    FieldSpec fieldSpec = new DimensionFieldSpec("test", FieldSpec.DataType.INT, true);
-    return IndexCreationContext.builder().withIndexDir(_file)
-        .withColumnMetadata(ColumnMetadataImpl.builder().setFieldSpec(fieldSpec).setCardinality(cardinality).build())
-        .build().forInvertedIndex();
-  }
-}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/JsonIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/JsonIndexTest.java
index 656b47a9c57..53a98c5d550 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/JsonIndexTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/JsonIndexTest.java
@@ -18,17 +18,23 @@
  */
 package org.apache.pinot.segment.local.segment.index;
 
+import com.google.common.collect.Lists;
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.local.realtime.impl.json.MutableJsonIndexImpl;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.json.OffHeapJsonIndexCreator;
 import org.apache.pinot.segment.local.segment.creator.impl.inv.json.OnHeapJsonIndexCreator;
+import org.apache.pinot.segment.local.segment.index.json.JsonIndexType;
 import org.apache.pinot.segment.local.segment.index.readers.json.ImmutableJsonIndexReader;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
 import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.config.table.FieldConfig;
 import org.apache.pinot.spi.config.table.JsonIndexConfig;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 import org.testng.Assert;
@@ -36,6 +42,10 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
 
 /**
  * Unit test for {@link JsonIndexCreator} and {@link JsonIndexReader}.
@@ -226,4 +236,26 @@ public void testLargeIndex()
   private MutableRoaringBitmap getMatchingDocIds(JsonIndexReader indexReader, String filter) {
     return indexReader.getMatchingDocIds(filter);
   }
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    @Test
+    public void oldToNewConfConversion() {
+      Map<String, JsonIndexConfig> configs = new HashMap<>();
+      JsonIndexConfig config = new JsonIndexConfig();
+      config.setMaxLevels(2);
+      configs.put("dimStr", config);
+      _tableConfig.getIndexingConfig().setJsonIndexConfigs(configs);
+      _tableConfig.getIndexingConfig().setJsonIndexColumns(Lists.newArrayList("dimStr2"));
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimStr"))
+          .collect(Collectors.toList()).get(0);
+      assertNotNull(fieldConfig.getIndexes().get(JsonIndexType.INDEX_DISPLAY_NAME));
+      assertNull(_tableConfig.getIndexingConfig().getJsonIndexColumns());
+      assertNull(_tableConfig.getIndexingConfig().getJsonIndexConfigs());
+    }
+  }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/NullValueIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/NullValueIndexTest.java
new file mode 100644
index 00000000000..14a81421f5a
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/NullValueIndexTest.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.segment.local.segment.index;
+
+import org.apache.pinot.segment.local.segment.index.nullvalue.NullValueIndexPlugin;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+
+public class NullValueIndexTest {
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    @Test
+    public void oldToNewConfConversion() {
+      _tableConfig.getIndexingConfig().setNullHandlingEnabled(true);
+      convertToUpdatedFormat();
+      assertTrue(_tableConfig.getIndexingConfig().isNullHandlingEnabled());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertEquals(StandardIndexes.nullValueVector(), new NullValueIndexPlugin().getIndexType(),
+        "Standard index should be equal to the instance returned by the plugin");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/RangeIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/RangeIndexTest.java
new file mode 100644
index 00000000000..0308956871d
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/RangeIndexTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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.pinot.segment.local.segment.index;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.collect.Lists;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.range.RangeIndexPlugin;
+import org.apache.pinot.segment.local.segment.index.range.RangeIndexType;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+
+
+public class RangeIndexTest {
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    @Test
+    public void oldToNewConfConversion() {
+      _tableConfig.getIndexingConfig().setRangeIndexColumns(Lists.newArrayList("dimInt"));
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimInt")).collect(Collectors.toList()).get(0);
+      JsonNode indexConfig = fieldConfig.getIndexes().get(RangeIndexType.INDEX_DISPLAY_NAME);
+      assertNotNull(indexConfig);
+      assertEquals(RangeIndexConfig.DEFAULT.getVersion(), indexConfig.get("version").asInt());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertEquals(StandardIndexes.range(), new RangeIndexPlugin().getIndexType(),
+        "Standard index should be equal to the instance returned by the plugin");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/TextIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/TextIndexTest.java
new file mode 100644
index 00000000000..918de113908
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/TextIndexTest.java
@@ -0,0 +1,61 @@
+/**
+ * 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.pinot.segment.local.segment.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexPlugin;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+
+
+public class TextIndexTest {
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    @Test
+    public void oldToNewConfConversion()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"TEXT\"]\n"
+          + " }");
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimStr")).collect(Collectors.toList()).get(0);
+      JsonNode indexConfig = fieldConfig.getIndexes().get(TextIndexType.INDEX_DISPLAY_NAME);
+      assertNotNull(indexConfig);
+      assertFalse(indexConfig.get("disabled").asBoolean());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertEquals(StandardIndexes.text(), new TextIndexPlugin().getIndexType(),
+        "Standard index should be equal to the instance returned by the plugin");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexTypeTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexTypeTest.java
new file mode 100644
index 00000000000..16479b40651
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/bloom/BloomIndexTypeTest.java
@@ -0,0 +1,192 @@
+/**
+ * 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.pinot.segment.local.segment.index.bloom;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.AbstractSerdeIndexContract;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class BloomIndexTypeTest {
+
+  @DataProvider(name = "allConfigs")
+  public static Object[][] allConfigs() {
+    return new String[][] {
+        new String[] {"{}"},
+        new String[] {"{\n"
+            + "  \"fpp\": 0.5\n"
+            + "}"},
+        new String[] {"{\n"
+            + "  \"fpp\": 0.5,\n"
+            + "  \"maxSizeInBytes\": 1024,\n"
+            + "  \"loadOnHeap\": true"
+            + "}"}
+    };
+  }
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    protected void assertEquals(BloomFilterConfig expected) {
+      Assert.assertEquals(getActualConfig("dimInt", StandardIndexes.bloomFilter()), expected);
+    }
+
+    @Test
+    public void oldIndexingConfigNull()
+        throws JsonProcessingException {
+      _tableConfig.setIndexingConfig(null);
+
+      assertEquals(BloomFilterConfig.DISABLED);
+    }
+
+    @Test
+    public void oldConfNull()
+        throws JsonProcessingException {
+      _tableConfig.getIndexingConfig().setBloomFilterColumns(null);
+      _tableConfig.getIndexingConfig().setBloomFilterConfigs(null);
+
+      assertEquals(BloomFilterConfig.DISABLED);
+    }
+
+    @Test
+    public void oldMapConfNotFound()
+        throws IOException {
+      _tableConfig.getIndexingConfig().setBloomFilterConfigs(
+          JsonUtils.stringToObject("{}", new TypeReference<Map<String, BloomFilterConfig>>() {
+          })
+      );
+
+      assertEquals(BloomFilterConfig.DISABLED);
+    }
+
+    @Test(dataProvider = "allConfigs", dataProviderClass = BloomIndexTypeTest.class)
+    public void oldMapConfFound(String confStr)
+        throws IOException {
+      BloomFilterConfig config =
+          JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+      _tableConfig.getIndexingConfig().setBloomFilterConfigs(Collections.singletonMap("dimInt", config));
+
+      assertEquals(config);
+    }
+
+    @Test
+    public void oldListConfNotFound()
+        throws IOException {
+      _tableConfig.getIndexingConfig().setBloomFilterColumns(
+          JsonUtils.stringToObject("[]", _stringListTypeRef)
+      );
+
+      assertEquals(BloomFilterConfig.DISABLED);
+    }
+
+    @Test
+    public void oldListConfFound()
+        throws IOException {
+      _tableConfig.getIndexingConfig().setBloomFilterColumns(
+          JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef)
+      );
+
+      assertEquals(BloomFilterConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfPrioritizesMap()
+        throws IOException {
+      BloomFilterConfig config = JsonUtils.stringToObject(
+          "{\n"
+              + "  \"fpp\": 0.5,\n"
+              + "  \"maxSizeInBytes\": 1024,\n"
+              + "  \"loadOnHeap\": true"
+              + "}", BloomFilterConfig.class
+      );
+      _tableConfig.getIndexingConfig().setBloomFilterConfigs(Collections.singletonMap("dimInt", config));
+      _tableConfig.getIndexingConfig().setBloomFilterColumns(
+          JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef)
+      );
+
+      assertEquals(config);
+    }
+
+    @Test
+    public void newConfDisabled()
+        throws IOException {
+      addFieldIndexConfig("{"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"indexes\" : {\n"
+          + "      \"bloom\": null\n"
+          + "    }"
+          + "}");
+
+      assertEquals(BloomFilterConfig.DISABLED);
+    }
+
+    @Test(dataProvider = "allConfigs", dataProviderClass = BloomIndexTypeTest.class)
+    public void newConfFound(String confStr)
+        throws IOException {
+      BloomFilterConfig config =
+          JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+      addFieldIndexConfig("{"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"indexes\" : {\n"
+          + "      \"bloom\": " + confStr + "\n"
+          + "    }"
+          + "}");
+
+      assertEquals(config);
+    }
+
+    @Test(dataProvider = "allConfigs", dataProviderClass = BloomIndexTypeTest.class)
+    public void oldToNewConfConversion(String confStr)
+        throws IOException {
+      _tableConfig.getIndexingConfig().setBloomFilterColumns(
+          JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef)
+      );
+      BloomFilterConfig config =
+          JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+      _tableConfig.getIndexingConfig().setBloomFilterConfigs(Collections.singletonMap("dimInt", config));
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimInt"))
+          .collect(Collectors.toList()).get(0);
+      assertNotNull(fieldConfig.getIndexes().get(BloomIndexType.INDEX_DISPLAY_NAME));
+      assertNull(_tableConfig.getIndexingConfig().getBloomFilterColumns());
+      assertNull(_tableConfig.getIndexingConfig().getBloomFilterConfigs());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertEquals(StandardIndexes.bloomFilter(), new BloomIndexPlugin().getIndexType(),
+        "Standard index should be equal to the instance returned by the plugin");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProviderTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProviderTest.java
index 0b44ef38700..f1f655ae9bd 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProviderTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/column/DefaultNullValueVirtualColumnProviderTest.java
@@ -30,6 +30,7 @@
 import org.apache.pinot.spi.data.DimensionFieldSpec;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
+import org.apache.pinot.spi.utils.ByteArray;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -41,6 +42,8 @@ public class DefaultNullValueVirtualColumnProviderTest {
   private static final FieldSpec SV_FLOAT = new DimensionFieldSpec("svFloatColumn", DataType.FLOAT, true);
   private static final FieldSpec SV_DOUBLE = new DimensionFieldSpec("svDoubleColumn", DataType.DOUBLE, true);
   private static final FieldSpec SV_STRING = new DimensionFieldSpec("svStringColumn", DataType.STRING, true);
+  private static final FieldSpec SV_STRING_WITH_DEFAULT =
+      new DimensionFieldSpec("svStringColumn", DataType.STRING, true, "default");
   private static final FieldSpec SV_BYTES = new DimensionFieldSpec("svBytesColumn", DataType.BYTES, true);
   private static final FieldSpec MV_INT = new DimensionFieldSpec("mvIntColumn", DataType.INT, false);
   private static final FieldSpec MV_LONG = new DimensionFieldSpec("mvLongColumn", DataType.LONG, false);
@@ -52,47 +55,63 @@ public class DefaultNullValueVirtualColumnProviderTest {
   public void testBuildMetadata() {
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_INT, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(SV_INT).setTotalDocs(1).setCardinality(1).setSorted(true)
-            .setHasDictionary(true).build());
+            .setHasDictionary(true).setMinValue((int) SV_INT.getDefaultNullValue())
+            .setMaxValue((int) SV_INT.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_LONG, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(SV_LONG).setTotalDocs(1).setCardinality(1).setSorted(true)
-            .setHasDictionary(true).build());
+            .setHasDictionary(true).setMinValue((long) SV_LONG.getDefaultNullValue())
+            .setMaxValue((long) SV_LONG.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_FLOAT, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(SV_FLOAT).setTotalDocs(1).setCardinality(1).setSorted(true)
-            .setHasDictionary(true).build());
+            .setHasDictionary(true).setMinValue((float) SV_FLOAT.getDefaultNullValue())
+            .setMaxValue((float) SV_FLOAT.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_DOUBLE, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(SV_DOUBLE).setTotalDocs(1).setCardinality(1).setSorted(true)
-            .setHasDictionary(true).build());
+            .setHasDictionary(true).setMinValue((double) SV_DOUBLE.getDefaultNullValue())
+            .setMaxValue((double) SV_DOUBLE.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_STRING, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(SV_STRING).setTotalDocs(1).setCardinality(1).setSorted(true)
-            .setHasDictionary(true).build());
+            .setHasDictionary(true).setMinValue((String) SV_STRING.getDefaultNullValue())
+            .setMaxValue((String) SV_STRING.getDefaultNullValue()).build());
+
+    assertEquals(
+        new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_STRING_WITH_DEFAULT, 1)),
+        new ColumnMetadataImpl.Builder().setFieldSpec(SV_STRING_WITH_DEFAULT).setTotalDocs(1).setCardinality(1)
+            .setSorted(true).setHasDictionary(true).setMinValue("default").setMaxValue("default").build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(SV_BYTES, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(SV_BYTES).setTotalDocs(1).setCardinality(1).setSorted(true)
-            .setHasDictionary(true).build());
+            .setHasDictionary(true).setMinValue(new ByteArray((byte[]) SV_BYTES.getDefaultNullValue()))
+            .setMaxValue(new ByteArray((byte[]) SV_BYTES.getDefaultNullValue())).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(MV_INT, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(MV_INT).setTotalDocs(1).setCardinality(1).setSorted(false)
-            .setHasDictionary(true).setMaxNumberOfMultiValues(1).build());
+            .setHasDictionary(true).setMaxNumberOfMultiValues(1).setMinValue((int) MV_INT.getDefaultNullValue())
+            .setMaxValue((int) MV_INT.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(MV_LONG, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(MV_LONG).setTotalDocs(1).setCardinality(1).setSorted(false)
-            .setHasDictionary(true).setMaxNumberOfMultiValues(1).build());
+            .setHasDictionary(true).setMaxNumberOfMultiValues(1).setMinValue((long) MV_LONG.getDefaultNullValue())
+            .setMaxValue((long) MV_LONG.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(MV_FLOAT, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(MV_FLOAT).setTotalDocs(1).setCardinality(1).setSorted(false)
-            .setHasDictionary(true).setMaxNumberOfMultiValues(1).build());
+            .setHasDictionary(true).setMaxNumberOfMultiValues(1).setMinValue((float) MV_FLOAT.getDefaultNullValue())
+        .setMaxValue((float) MV_FLOAT.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(MV_DOUBLE, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(MV_DOUBLE).setTotalDocs(1).setCardinality(1).setSorted(false)
-            .setHasDictionary(true).setMaxNumberOfMultiValues(1).build());
+            .setHasDictionary(true).setMaxNumberOfMultiValues(1).setMinValue((double) MV_DOUBLE.getDefaultNullValue())
+            .setMaxValue((double) MV_DOUBLE.getDefaultNullValue()).build());
 
     assertEquals(new DefaultNullValueVirtualColumnProvider().buildMetadata(new VirtualColumnContext(MV_STRING, 1)),
         new ColumnMetadataImpl.Builder().setFieldSpec(MV_STRING).setTotalDocs(1).setCardinality(1).setSorted(false)
-            .setHasDictionary(true).setMaxNumberOfMultiValues(1).build());
+            .setHasDictionary(true).setMaxNumberOfMultiValues(1).setMinValue((String) MV_STRING.getDefaultNullValue())
+            .setMaxValue((String) MV_STRING.getDefaultNullValue()).build());
   }
 
   @Test
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/BloomFilterCreatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/BloomFilterCreatorTest.java
index f531a4290a2..48a691f3a65 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/BloomFilterCreatorTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/BloomFilterCreatorTest.java
@@ -27,6 +27,7 @@
 import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.util.TestUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -50,7 +51,7 @@ public void testBloomFilterCreator()
     int cardinality = 10000;
     String columnName = "testColumn";
     try (BloomFilterCreator bloomFilterCreator = new OnHeapGuavaBloomFilterCreator(TEMP_DIR, columnName, cardinality,
-        new BloomFilterConfig(BloomFilterConfig.DEFAULT_FPP, 0, false))) {
+        new BloomFilterConfig(BloomFilterConfig.DEFAULT_FPP, 0, false), FieldSpec.DataType.INT)) {
       for (int i = 0; i < 5; i++) {
         bloomFilterCreator.add(Integer.toString(i));
       }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/LuceneFSTIndexCreatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/LuceneFSTIndexCreatorTest.java
index 128411ddce4..c12a9690373 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/LuceneFSTIndexCreatorTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/LuceneFSTIndexCreatorTest.java
@@ -25,6 +25,8 @@
 import org.apache.pinot.segment.local.segment.creator.impl.inv.text.LuceneFSTIndexCreator;
 import org.apache.pinot.segment.local.segment.index.readers.LuceneFSTIndexReader;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -56,7 +58,9 @@ public void testIndexWriterReader()
     uniqueValues[1] = "hello-world123";
     uniqueValues[2] = "still";
 
-    LuceneFSTIndexCreator creator = new LuceneFSTIndexCreator(INDEX_DIR, "testFSTColumn", uniqueValues);
+    FieldSpec fieldSpec = new DimensionFieldSpec("testFSTColumn", FieldSpec.DataType.STRING, true);
+    LuceneFSTIndexCreator creator = new LuceneFSTIndexCreator(
+        INDEX_DIR, "testFSTColumn", uniqueValues);
     creator.seal();
     File fstFile = new File(INDEX_DIR, "testFSTColumn" + FST_INDEX_FILE_EXTENSION);
     PinotDataBuffer pinotDataBuffer =
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/NativeTextIndexCreatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/NativeTextIndexCreatorTest.java
index bdce94d54ae..e7489ca1774 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/NativeTextIndexCreatorTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/NativeTextIndexCreatorTest.java
@@ -23,6 +23,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.local.segment.creator.impl.text.NativeTextIndexCreator;
 import org.apache.pinot.segment.local.segment.index.readers.text.NativeTextIndexReader;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
+import org.apache.pinot.spi.data.FieldSpec;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -55,6 +57,7 @@ public void testIndexWriterReader()
     uniqueValues[2] = "still";
     uniqueValues[3] = "zoobar";
 
+    FieldSpec fieldSpec = new DimensionFieldSpec("testFSTColumn", FieldSpec.DataType.STRING, true);
     try (NativeTextIndexCreator creator = new NativeTextIndexCreator("testFSTColumn", INDEX_DIR)) {
       for (int i = 0; i < 4; i++) {
         creator.add(uniqueValues[i]);
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RawIndexCreatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RawIndexCreatorTest.java
index 05b77ec670a..391f5d03a85 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RawIndexCreatorTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RawIndexCreatorTest.java
@@ -36,10 +36,10 @@
 import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReader;
 import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -269,7 +269,7 @@ public void testBytesMVRawIndexCreator()
    */
   private PinotDataBuffer getIndexBufferForColumn(String column)
       throws IOException {
-    return _segmentReader.getIndexFor(column, ColumnIndexType.FORWARD_INDEX);
+    return _segmentReader.getIndexFor(column, StandardIndexes.forward());
   }
 
   /**
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexTypeTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexTypeTest.java
new file mode 100644
index 00000000000..8e3db4f99b4
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/dictionary/DictionaryIndexTypeTest.java
@@ -0,0 +1,289 @@
+/**
+ * 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.pinot.segment.local.segment.index.dictionary;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.AbstractSerdeIndexContract;
+import org.apache.pinot.segment.spi.index.DictionaryIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+public class DictionaryIndexTypeTest {
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    protected void assertEquals(DictionaryIndexConfig expected) {
+      Assert.assertEquals(getActualConfig("dimInt", StandardIndexes.dictionary()), expected);
+    }
+
+    @Test
+    public void oldIndexingConfigNull()
+        throws JsonProcessingException {
+      _tableConfig.setIndexingConfig(null);
+
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void defaultCase()
+        throws JsonProcessingException {
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void withNullFieldConfig() {
+      _tableConfig.setFieldConfigList(null);
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void withEmptyFieldConfig()
+        throws IOException {
+      cleanFieldConfig();
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void noDictionaryCol()
+        throws IOException {
+      _tableConfig.getIndexingConfig().setNoDictionaryColumns(
+          JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef)
+      );
+      assertEquals(DictionaryIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldRawEncodingType()
+        throws IOException {
+      _tableConfig.getIndexingConfig().setNoDictionaryConfig(
+          JsonUtils.stringToObject("{\"dimInt\": \"RAW\"}",
+              new TypeReference<Map<String, String>>() {
+              })
+      );
+      assertEquals(DictionaryIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldWithRawEncodingFieldConfig()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"encodingType\": \"RAW\"\n"
+          + "}");
+      assertEquals(DictionaryIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldWithDictionaryEncodingFieldConfig()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"encodingType\": \"DICTIONARY\"\n"
+          + "}");
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldWithDictionaryEncodingUndeclaredFieldConfig()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimInt\"\n"
+          + "}");
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldWithDictionaryEncodingNullFieldConfig()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"encodingType\": null\n"
+          + "}");
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldWithOnHeap()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setOnHeapDictionaryColumns(JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef));
+      assertEquals(new DictionaryIndexConfig(true, null));
+    }
+
+    @Test
+    public void oldWithVarLength()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setVarLengthDictionaryColumns(JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef));
+      assertEquals(new DictionaryIndexConfig(false, true));
+    }
+
+    @Test
+    public void newUndefined()
+        throws IOException {
+      _tableConfig.setFieldConfigList(JsonUtils.stringToObject("[]", _fieldConfigListTypeRef));
+      assertEquals(DictionaryIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void newDisabled()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"indexes\" : {\n"
+          + "      \"dictionary\": null\n"
+          + "    }\n"
+          + " }");
+      assertEquals(DictionaryIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void newOnHeapVarLength()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"indexes\" : {\n"
+          + "      \"dictionary\": {\n"
+          + "        \"onHeap\": true,\n"
+          + "        \"useVarLengthDictionary\": true\n"
+          + "      }"
+          + "    }\n"
+          + " }");
+      assertEquals(new DictionaryIndexConfig(true, true));
+    }
+
+    @Test
+    public void newOnHeap()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"indexes\" : {\n"
+          + "      \"dictionary\": {\n"
+          + "        \"onHeap\": true\n"
+          + "      }"
+          + "    }\n"
+          + " }");
+      assertEquals(new DictionaryIndexConfig(true, false));
+    }
+
+    @Test
+    public void newDefault()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"indexes\" : {\n"
+          + "      \"dictionary\": {\n"
+          + "      }"
+          + "    }\n"
+          + " }");
+      assertEquals(new DictionaryIndexConfig(false, false));
+    }
+
+    @Test
+    public void newVarLength()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"indexes\" : {\n"
+          + "      \"dictionary\": {\n"
+          + "        \"useVarLengthDictionary\": true\n"
+          + "      }"
+          + "    }\n"
+          + " }");
+      assertEquals(new DictionaryIndexConfig(false, true));
+    }
+
+    @Test
+    public void oldToNewConfConversionWithOnHeap()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setOnHeapDictionaryColumns(JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef));
+      convertToUpdatedFormat();
+      FieldConfig fieldConfig = getFieldConfigByColumn("dimInt");
+      DictionaryIndexConfig config = JsonUtils.jsonNodeToObject(
+          fieldConfig.getIndexes().get(StandardIndexes.dictionary().getPrettyName()),
+          DictionaryIndexConfig.class);
+      assertNotNull(config);
+      assertTrue(config.isOnHeap());
+      postConversionAsserts();
+    }
+
+    @Test
+    public void oldToNewConfConversionWithVarLength()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setVarLengthDictionaryColumns(JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef));
+      convertToUpdatedFormat();
+      FieldConfig fieldConfig = getFieldConfigByColumn("dimInt");
+      DictionaryIndexConfig config = JsonUtils.jsonNodeToObject(
+          fieldConfig.getIndexes().get(StandardIndexes.dictionary().getPrettyName()),
+          DictionaryIndexConfig.class);
+      assertNotNull(config);
+      assertTrue(config.getUseVarLengthDictionary());
+      postConversionAsserts();
+    }
+
+    @Test
+    public void oldToNewConfConversionWithNoDictionaryColumns()
+        throws IOException {
+      _tableConfig.getIndexingConfig().setNoDictionaryColumns(
+          JsonUtils.stringToObject("[\"dimInt\"]", _stringListTypeRef)
+      );
+      convertToUpdatedFormat();
+      FieldConfig fieldConfig = getFieldConfigByColumn("dimInt");
+      Assert.assertEquals(fieldConfig.getEncodingType(), FieldConfig.EncodingType.RAW);
+      postConversionAsserts();
+    }
+
+    private FieldConfig getFieldConfigByColumn(String column) {
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      return _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals(column))
+          .collect(Collectors.toList()).get(0);
+    }
+
+    private void postConversionAsserts() {
+      assertNull(_tableConfig.getIndexingConfig().getNoDictionaryColumns());
+      assertNull(_tableConfig.getIndexingConfig().getOnHeapDictionaryColumns());
+      assertNull(_tableConfig.getIndexingConfig().getVarLengthDictionaryColumns());
+      assertNull(_tableConfig.getIndexingConfig().getNoDictionaryConfig());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertSame(StandardIndexes.dictionary(), StandardIndexes.dictionary(), "Standard index should use the same as "
+        + "the DictionaryIndexType static instance");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexTypeTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexTypeTest.java
new file mode 100644
index 00000000000..b686d69ba82
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/ForwardIndexTypeTest.java
@@ -0,0 +1,301 @@
+/**
+ * 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.pinot.segment.local.segment.index.forward;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.AbstractSerdeIndexContract;
+import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class ForwardIndexTypeTest {
+
+  @DataProvider(name = "allChunkCompressionType")
+  public static Object[][] allChunkCompressionType() {
+    return new String[][] {
+        new String[] {"PASS_THROUGH"},
+        new String[] {"SNAPPY"},
+        new String[] {"ZSTANDARD"},
+        new String[] {"LZ4"},
+        new String[] {null}
+    };
+  }
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    protected void assertEquals(ForwardIndexConfig expected) {
+      Assert.assertEquals(getActualConfig("dimInt", StandardIndexes.forward()), expected);
+    }
+
+    @Test
+    public void oldConfNull()
+        throws JsonProcessingException {
+      _tableConfig.setIndexingConfig(null);
+
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfNotFound()
+        throws IOException {
+      _tableConfig.setFieldConfigList(
+          JsonUtils.stringToObject("[]", _fieldConfigListTypeRef)
+      );
+
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfDisabled()
+        throws IOException {
+      _tableConfig.setFieldConfigList(
+          JsonUtils.stringToObject(""
+                  + " [{\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"properties\" : {"
+                  + "      \"forwardIndexDisabled\": true"
+                  + "    }\n"
+                  + " }]", _fieldConfigListTypeRef)
+      );
+
+      assertEquals(ForwardIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldConfEnableDefault()
+        throws IOException {
+      addFieldIndexConfig(
+          "{\n"
+          + "    \"name\": \"dimInt\""
+          + " }"
+      );
+
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfEnableDict()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"encodingType\": \"DICTIONARY\"\n"
+          + " }"
+      );
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfEnableDictWithSnappyCompression()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"encodingType\": \"DICTIONARY\",\n"
+          + "    \"compressionCodec\": \"SNAPPY\"\n"
+          + " }"
+      );
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfEnableDictWithLZ4Compression()
+        throws IOException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"encodingType\": \"DICTIONARY\",\n"
+          + "    \"compressionCodec\": \"LZ4\"\n"
+          + " }"
+      );
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test
+    public void oldConfEnableRawDefault()
+        throws IOException {
+      addFieldIndexConfig(""
+                  + " {\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"encodingType\": \"RAW\"\n"
+                  + " }"
+      );
+
+      assertEquals(
+          new ForwardIndexConfig.Builder()
+              .withCompressionType(null)
+              .withDeriveNumDocsPerChunk(false)
+              .withRawIndexWriterVersion(2)
+              .build()
+      );
+    }
+
+    @Test(dataProvider = "allChunkCompressionType", dataProviderClass = ForwardIndexTypeTest.class)
+    public void oldConfEnableRawWithCompression(String compression)
+        throws IOException {
+      String valueJson = compression == null ? "null" : "\"" + compression + "\"";
+
+      addFieldIndexConfig(""
+                  + " {\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"encodingType\": \"RAW\",\n"
+                  + "    \"compressionCodec\": " + valueJson + "\n"
+                  + " }"
+      );
+
+      assertEquals(
+            new ForwardIndexConfig.Builder()
+                .withCompressionType(compression == null ? null : ChunkCompressionType.valueOf(compression))
+                .withDeriveNumDocsPerChunk(false)
+                .withRawIndexWriterVersion(2)
+                .build()
+      );
+    }
+
+    @Test
+    public void oldConfEnableRawWithDeriveNumDocs()
+        throws IOException {
+      addFieldIndexConfig(""
+                  + " {\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"encodingType\": \"RAW\",\n"
+                  + "    \"properties\" : {"
+                  + "      \"deriveNumDocsPerChunkForRawIndex\": true"
+                  + "    }\n"
+                  + " }"
+      );
+
+      assertEquals(new ForwardIndexConfig.Builder()
+          .withCompressionType(null)
+          .withDeriveNumDocsPerChunk(true)
+          .withRawIndexWriterVersion(2)
+          .build());
+    }
+
+    @Test
+    public void oldConfEnableRawWithRawIndexWriterVersion()
+        throws IOException {
+      addFieldIndexConfig(""
+                  + " {\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"encodingType\": \"RAW\",\n"
+                  + "    \"properties\" : {"
+                  + "      \"rawIndexWriterVersion\": 3"
+                  + "    }\n"
+                  + " }"
+      );
+
+      assertEquals(new ForwardIndexConfig.Builder()
+          .withCompressionType(null)
+          .withDeriveNumDocsPerChunk(false)
+          .withRawIndexWriterVersion(3)
+          .build());
+    }
+
+    @Test
+    public void newConfigDisabled2()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+              + "    \"name\": \"dimInt\",\n"
+              + "    \"indexes\" : {\n"
+              + "      \"forward\": {\n"
+              + "          \"disabled\": true\n"
+              + "       }\n"
+              + "    }\n"
+              + "  }"
+      );
+      assertEquals(ForwardIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void newConfigDefault()
+        throws IOException {
+      addFieldIndexConfig(""
+                  + " {\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"indexes\" : {}\n"
+                  + " }"
+      );
+
+      assertEquals(ForwardIndexConfig.DEFAULT);
+    }
+
+    @Test(dataProvider = "allChunkCompressionType", dataProviderClass = ForwardIndexTypeTest.class)
+    public void newConfigEnabled(String compression)
+        throws IOException {
+      String valueJson = compression == null ? "null" : "\"" + compression + "\"";
+      addFieldIndexConfig(""
+                  + " {\n"
+                  + "    \"name\": \"dimInt\","
+                  + "    \"indexes\" : {"
+                  + "      \"forward\": {"
+                  + "        \"chunkCompressionType\": " + valueJson + ",\n"
+                  + "        \"deriveNumDocsPerChunk\": true,\n"
+                  + "        \"rawIndexWriterVersion\": 10\n"
+                  + "      }"
+                  + "    }\n"
+                  + " }"
+      );
+
+      assertEquals(
+          new ForwardIndexConfig.Builder()
+              .withCompressionType(compression == null ? null : ChunkCompressionType.valueOf(compression))
+              .withDeriveNumDocsPerChunk(true)
+              .withRawIndexWriterVersion(10)
+              .build()
+      );
+    }
+
+    @Test
+    public void oldToNewConfConversion()
+        throws JsonProcessingException {
+      addFieldIndexConfig(""
+          + " {\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"compressionCodec\": \"PASS_THROUGH\",\n"
+          + "    \"encodingType\": \"RAW\"\n"
+          + " }"
+      );
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimInt"))
+          .collect(Collectors.toList()).get(0);
+      assertNotNull(fieldConfig.getIndexes().get(ForwardIndexType.INDEX_DISPLAY_NAME));
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertSame(StandardIndexes.forward(), StandardIndexes.forward(), "Standard index should use the same as "
+        + "the ForwardIndexType static instance");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/VarByteChunkSVForwardIndexTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/VarByteChunkSVForwardIndexTest.java
index fedac57d4c7..419836c38a6 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/VarByteChunkSVForwardIndexTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/forward/VarByteChunkSVForwardIndexTest.java
@@ -33,9 +33,8 @@
 import org.apache.pinot.segment.local.segment.index.readers.forward.ChunkReaderContext;
 import org.apache.pinot.segment.local.segment.index.readers.forward.VarByteChunkSVForwardIndexReader;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.segment.spi.memory.PinotByteBuffer;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.memory.PinotNativeOrderLBuffer;
-import org.apache.pinot.segment.spi.memory.PinotNonNativeOrderLBuffer;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -248,17 +247,15 @@ private void testLargeVarcharHelper(ChunkCompressionType compressionType, int nu
     }
 
     // For large variable width column values (where total size of data
-    // across all rows in the segment is > 2GB), LBuffer will be used for
-    // reading the fwd index. However, to test this scenario the unit test
+    // across all rows in the segment is > 2GB), Pinot may try to use different buffer
+    // implementation when the fwd index. However, to test this scenario the unit test
     // will take a long time to execute due to comparison
     // (75000 characters in each row and 10000 rows will hit this scenario).
-    // So we specifically test for mapping the index file into a LBuffer
-    // to exercise the LBuffer code
-    if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
-      buffer = PinotNativeOrderLBuffer.mapFile(outFile, true, 0, outFile.length());
-    } else {
-      buffer = PinotNonNativeOrderLBuffer.mapFile(outFile, true, 0, outFile.length());
-    }
+    // So we specifically test for mapping the index file using the default factory
+    // trying to exercise the buffer used in larger cases
+    buffer = PinotDataBuffer.createDefaultFactory(false)
+        .mapFile(outFile, outFile.canRead(), 0, outFile.length(), ByteOrder.BIG_ENDIAN);
+    assert !(buffer instanceof PinotByteBuffer) : "This test tries to exercise the long buffer algorithm";
 
     try (VarByteChunkSVForwardIndexReader reader = new VarByteChunkSVForwardIndexReader(buffer, DataType.STRING);
         ChunkReaderContext readerContext = reader.createContext()) {
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexTypeTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexTypeTest.java
new file mode 100644
index 00000000000..c07d5ff9103
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/fst/FstIndexTypeTest.java
@@ -0,0 +1,183 @@
+/**
+ * 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.pinot.segment.local.segment.index.fst;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.AbstractSerdeIndexContract;
+import org.apache.pinot.segment.spi.index.FstIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class FstIndexTypeTest {
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    protected void assertEquals(FstIndexConfig expected) {
+      Assert.assertEquals(getActualConfig("dimStr", StandardIndexes.fst()), expected);
+    }
+
+    @Test
+    public void oldFieldConfigNull()
+        throws JsonProcessingException {
+      _tableConfig.setFieldConfigList(null);
+
+      assertEquals(FstIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldEmptyFieldConfig()
+        throws JsonProcessingException {
+      cleanFieldConfig();
+
+      assertEquals(FstIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldFieldConfigNotFst()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : []\n"
+          + " }");
+
+      assertEquals(FstIndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldFieldConfigFstNoType()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"FST\"]\n"
+          + " }");
+
+      assertEquals(new FstIndexConfig(null));
+    }
+
+    @Test
+    public void oldFieldConfigFstNullIndexingType()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"FST\"]\n"
+          + " }");
+      _tableConfig.setIndexingConfig(null);
+
+      assertEquals(new FstIndexConfig(null));
+    }
+
+    @Test
+    public void oldFieldConfigFstExplicitLuceneType()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"FST\"]\n"
+          + " }");
+      _tableConfig.getIndexingConfig().setFSTIndexType(FSTType.LUCENE);
+
+      assertEquals(new FstIndexConfig(FSTType.LUCENE));
+    }
+
+    @Test
+    public void oldFieldConfigFstExplicitNativeType()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"FST\"]\n"
+          + " }");
+      _tableConfig.getIndexingConfig().setFSTIndexType(FSTType.NATIVE);
+
+      assertEquals(new FstIndexConfig(FSTType.NATIVE));
+    }
+
+    @Test
+    public void newNative()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexes\" : {\n"
+          + "       \"fst\": {\n"
+          + "          \"type\": \"NATIVE\""
+          + "       }\n"
+          + "    }\n"
+          + " }");
+      assertEquals(new FstIndexConfig(FSTType.NATIVE));
+    }
+
+    @Test
+    public void newLucene()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexes\" : {\n"
+          + "       \"fst\": {\n"
+          + "          \"type\": \"LUCENE\""
+          + "       }\n"
+          + "    }\n"
+          + " }");
+      assertEquals(new FstIndexConfig(FSTType.LUCENE));
+    }
+
+    @Test
+    public void newEmpty()
+        throws JsonProcessingException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexes\" : {\n"
+          + "       \"fst\": {\n"
+          + "       }\n"
+          + "    }\n"
+          + " }");
+      assertEquals(new FstIndexConfig(null));
+    }
+
+    @Test
+    public void oldToNewConfConversion()
+        throws IOException {
+      addFieldIndexConfig("{\n"
+          + "    \"name\": \"dimStr\",\n"
+          + "    \"indexTypes\" : [\"FST\"]\n"
+          + " }");
+      _tableConfig.getIndexingConfig().setFSTIndexType(FSTType.NATIVE);
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimStr"))
+          .collect(Collectors.toList()).get(0);
+      assertNotNull(fieldConfig.getIndexes().get(FstIndexType.INDEX_DISPLAY_NAME));
+      assertTrue(fieldConfig.getIndexTypes().isEmpty());
+      assertNull(_tableConfig.getIndexingConfig().getFSTIndexType());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertSame(StandardIndexes.fst(), StandardIndexes.fst(), "Standard index should use the same as "
+        + "the FstIndexType static instance");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexTypeTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexTypeTest.java
new file mode 100644
index 00000000000..cbdd49f8ae5
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/inverted/InvertedIndexTypeTest.java
@@ -0,0 +1,138 @@
+/**
+ * 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.pinot.segment.local.segment.index.inverted;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import org.apache.pinot.segment.local.segment.index.AbstractSerdeIndexContract;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class InvertedIndexTypeTest {
+
+
+  public static class ConfTest extends AbstractSerdeIndexContract {
+
+    protected void assertEquals(IndexConfig expected) {
+      Assert.assertEquals(getActualConfig("dimInt", StandardIndexes.inverted()), expected);
+    }
+
+    @Test
+    public void oldConfNull()
+        throws JsonProcessingException {
+      _tableConfig.setIndexingConfig(null);
+
+      assertEquals(IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldConfNotFound()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setInvertedIndexColumns(parseStringList("[]")
+      );
+
+      assertEquals(IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void oldConfEnabled()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setInvertedIndexColumns(parseStringList("[\"dimInt\"]"));
+
+      assertEquals(IndexConfig.ENABLED);
+    }
+
+    @Test
+    public void newConfDisableByDefault()
+        throws IOException {
+      addFieldIndexConfig(
+          "{\n"
+          + "    \"name\": \"dimInt\","
+          + "    \"indexes\" : {"
+          + "    }\n"
+          + "}");
+
+      assertEquals(IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void newConfDisabled()
+        throws IOException {
+      addFieldIndexConfig(
+          "{\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"indexes\" : {\n"
+          + "      \"inverted\": {\n"
+          + "         \"disabled\": true\n"
+          + "      }\n"
+          + "    }\n"
+          + "}"
+      );
+
+      assertEquals(IndexConfig.DISABLED);
+    }
+
+    @Test
+    public void newConfEnabled()
+        throws IOException {
+      addFieldIndexConfig(
+          "{\n"
+          + "    \"name\": \"dimInt\",\n"
+          + "    \"indexes\" : {\n"
+          + "      \"inverted\": {\n"
+          + "         \"disabled\": false\n"
+          + "      }\n"
+          + "    }\n"
+          + "}"
+      );
+      assertEquals(IndexConfig.ENABLED);
+    }
+
+    @Test
+    public void oldToNewConfConversion()
+        throws IOException {
+      _tableConfig.getIndexingConfig()
+          .setInvertedIndexColumns(parseStringList("[\"dimInt\"]"));
+      convertToUpdatedFormat();
+      assertNotNull(_tableConfig.getFieldConfigList());
+      assertFalse(_tableConfig.getFieldConfigList().isEmpty());
+      FieldConfig fieldConfig = _tableConfig.getFieldConfigList().stream()
+          .filter(fc -> fc.getName().equals("dimInt"))
+          .collect(Collectors.toList()).get(0);
+      assertNotNull(fieldConfig.getIndexes().get(InvertedIndexType.INDEX_DISPLAY_NAME));
+      assertNull(_tableConfig.getIndexingConfig().getInvertedIndexColumns());
+      assertTrue(fieldConfig.getIndexTypes().isEmpty());
+    }
+  }
+
+  @Test
+  public void testStandardIndex() {
+    assertSame(StandardIndexes.inverted(), StandardIndexes.inverted(), "Inverted index should use the same as "
+        + "the InvertedIndexType static instance");
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java
index d43ad5badd4..2800cf9053f 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +35,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
+import org.apache.pinot.segment.local.segment.index.dictionary.DictionaryIndexType;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.invertedindex.RangeIndexHandler;
 import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
 import org.apache.pinot.segment.local.segment.readers.PinotSegmentColumnReader;
@@ -43,23 +44,28 @@
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.DimensionFieldSpec;
 import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.MetricFieldSpec;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.data.readers.GenericRow;
 import org.apache.pinot.spi.data.readers.RecordReader;
 import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.mockito.Mockito;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -95,6 +101,10 @@ public class ForwardIndexHandlerTest {
   private static final String DIM_ZSTANDARD_BYTES = "DIM_ZSTANDARD_BYTES";
   private static final String DIM_LZ4_BYTES = "DIM_LZ4_BYTES";
 
+  // Sorted columns
+  private static final String DIM_RAW_SORTED_INTEGER = "DIM_RAW_SORTED_INTEGER";
+
+
   // Metric columns
   private static final String METRIC_PASS_THROUGH_INTEGER = "METRIC_PASS_THROUGH_INTEGER";
   private static final String METRIC_SNAPPY_INTEGER = "METRIC_SNAPPY_INTEGER";
@@ -122,7 +132,6 @@ public class ForwardIndexHandlerTest {
   private static final String DIM_DICT_MV_STRING = "DIM_DICT_MV_STRING";
   private static final String DIM_DICT_MV_BYTES = "DIM_DICT_MV_BYTES";
 
-
   // Forward index disabled single-value columns
   private static final String DIM_SV_FORWARD_INDEX_DISABLED_INTEGER = "DIM_SV_FORWARD_INDEX_DISABLED_INTEGER";
   private static final String DIM_SV_FORWARD_INDEX_DISABLED_LONG = "DIM_SV_FORWARD_INDEX_DISABLED_LONG";
@@ -145,10 +154,26 @@ public class ForwardIndexHandlerTest {
   private static final String DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_BYTES =
       "DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_BYTES";
 
+  // Forward index disabled raw single-value column
+  private static final String DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER = "DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER";
+
+  // Forward index disabled raw multi-value column
+  private static final String DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER = "DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER";
+
+  // Forward index disabled dictionary enabled but inverted index disabled single-value column
+  private static final String DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX =
+      "DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX";
+
+  // Dictionary based forward index disabled column with a range index
+  private static final String DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX =
+      "DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX";
+
   private static final List<String> RAW_SNAPPY_INDEX_COLUMNS =
       Arrays.asList(DIM_SNAPPY_STRING, DIM_SNAPPY_LONG, DIM_SNAPPY_INTEGER, DIM_SNAPPY_BYTES, METRIC_SNAPPY_BIG_DECIMAL,
           METRIC_SNAPPY_INTEGER);
 
+  private static final List<String> RAW_SORTED_INDEX_COLUMNS = Arrays.asList(DIM_RAW_SORTED_INTEGER);
+
   private static final List<String> RAW_ZSTANDARD_INDEX_COLUMNS =
       Arrays.asList(DIM_ZSTANDARD_STRING, DIM_ZSTANDARD_LONG, DIM_ZSTANDARD_INTEGER, DIM_ZSTANDARD_BYTES,
           METRIC_ZSTANDARD_BIG_DECIMAL, METRIC_ZSTANDARD_INTEGER);
@@ -178,8 +203,12 @@ public class ForwardIndexHandlerTest {
       Arrays.asList(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_INTEGER, DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_LONG,
           DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_STRING, DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_BYTES);
 
+  private static final List<String> FORWARD_INDEX_DISABLED_RAW_COLUMNS =
+      Arrays.asList(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+
   private final List<String> _noDictionaryColumns = new ArrayList<>();
   private final List<String> _forwardIndexDisabledColumns = new ArrayList<>();
+  private final List<String> _invertedIndexColumns = new ArrayList<>();
   TableConfig _tableConfig;
   Schema _schema;
   File _segmentDirectory;
@@ -206,15 +235,21 @@ private void buildSegment()
     List<GenericRow> rows = createTestData();
 
     List<FieldConfig> fieldConfigs = new ArrayList<>(
-        RAW_SNAPPY_INDEX_COLUMNS.size() + RAW_ZSTANDARD_INDEX_COLUMNS.size() + RAW_PASS_THROUGH_INDEX_COLUMNS.size()
-            + RAW_LZ4_INDEX_COLUMNS.size() + SV_FORWARD_INDEX_DISABLED_COLUMNS.size()
-            + MV_FORWARD_INDEX_DISABLED_COLUMNS.size() + MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.size());
+        RAW_SNAPPY_INDEX_COLUMNS.size() + RAW_SORTED_INDEX_COLUMNS.size() + RAW_ZSTANDARD_INDEX_COLUMNS.size()
+            + RAW_PASS_THROUGH_INDEX_COLUMNS.size() + RAW_LZ4_INDEX_COLUMNS.size()
+            + SV_FORWARD_INDEX_DISABLED_COLUMNS.size() + MV_FORWARD_INDEX_DISABLED_COLUMNS.size()
+            + MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.size() + FORWARD_INDEX_DISABLED_RAW_COLUMNS.size() + 2);
 
     for (String indexColumn : RAW_SNAPPY_INDEX_COLUMNS) {
       fieldConfigs.add(new FieldConfig(indexColumn, FieldConfig.EncodingType.RAW, Collections.emptyList(),
           FieldConfig.CompressionCodec.SNAPPY, null));
     }
 
+    for (String indexColumn : RAW_SORTED_INDEX_COLUMNS) {
+      fieldConfigs.add(new FieldConfig(indexColumn, FieldConfig.EncodingType.RAW,
+          Collections.singletonList(FieldConfig.IndexType.SORTED), FieldConfig.CompressionCodec.SNAPPY, null));
+    }
+
     for (String indexColumn : RAW_ZSTANDARD_INDEX_COLUMNS) {
       fieldConfigs.add(new FieldConfig(indexColumn, FieldConfig.EncodingType.RAW, Collections.emptyList(),
           FieldConfig.CompressionCodec.ZSTANDARD, null));
@@ -248,24 +283,50 @@ private void buildSegment()
           Collections.singletonMap(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString())));
     }
 
+    for (String indexColumn : FORWARD_INDEX_DISABLED_RAW_COLUMNS) {
+      fieldConfigs.add(new FieldConfig(indexColumn, FieldConfig.EncodingType.RAW,
+          Collections.emptyList(), FieldConfig.CompressionCodec.LZ4,
+          Collections.singletonMap(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString())));
+    }
+
+    fieldConfigs.add(new FieldConfig(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX,
+        FieldConfig.EncodingType.DICTIONARY, Collections.emptyList(), null,
+        Collections.singletonMap(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString())));
+
+    fieldConfigs.add(new FieldConfig(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX,
+        FieldConfig.EncodingType.DICTIONARY, Collections.singletonList(FieldConfig.IndexType.RANGE), null,
+        Collections.singletonMap(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString())));
+
     _noDictionaryColumns.addAll(RAW_SNAPPY_INDEX_COLUMNS);
     _noDictionaryColumns.addAll(RAW_ZSTANDARD_INDEX_COLUMNS);
     _noDictionaryColumns.addAll(RAW_PASS_THROUGH_INDEX_COLUMNS);
     _noDictionaryColumns.addAll(RAW_LZ4_INDEX_COLUMNS);
+    _noDictionaryColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    _noDictionaryColumns.addAll(RAW_SORTED_INDEX_COLUMNS);
 
     _forwardIndexDisabledColumns.addAll(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     _forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
     _forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    _forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    _forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    _forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+
+    _invertedIndexColumns.addAll(SV_FORWARD_INDEX_DISABLED_COLUMNS);
+    _invertedIndexColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
+    _invertedIndexColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
 
     _tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).setNoDictionaryColumns(_noDictionaryColumns)
-            .setInvertedIndexColumns(_forwardIndexDisabledColumns).setFieldConfigList(fieldConfigs).build();
+            .setInvertedIndexColumns(_invertedIndexColumns)
+            .setRangeIndexColumns(Collections.singletonList(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX))
+            .setFieldConfigList(fieldConfigs).build();
     _schema = new Schema.SchemaBuilder().setSchemaName(TABLE_NAME)
         .addSingleValueDimension(DIM_SNAPPY_STRING, FieldSpec.DataType.STRING)
         .addSingleValueDimension(DIM_PASS_THROUGH_STRING, FieldSpec.DataType.STRING)
         .addSingleValueDimension(DIM_ZSTANDARD_STRING, FieldSpec.DataType.STRING)
         .addSingleValueDimension(DIM_LZ4_STRING, FieldSpec.DataType.STRING)
         .addSingleValueDimension(DIM_SNAPPY_INTEGER, FieldSpec.DataType.INT)
+        .addSingleValueDimension(DIM_RAW_SORTED_INTEGER, FieldSpec.DataType.INT)
         .addSingleValueDimension(DIM_ZSTANDARD_INTEGER, FieldSpec.DataType.INT)
         .addSingleValueDimension(DIM_PASS_THROUGH_INTEGER, FieldSpec.DataType.INT)
         .addSingleValueDimension(DIM_LZ4_INTEGER, FieldSpec.DataType.INT)
@@ -286,7 +347,8 @@ private void buildSegment()
         .addSingleValueDimension(DIM_DICT_STRING, FieldSpec.DataType.STRING)
         .addSingleValueDimension(DIM_DICT_BYES, FieldSpec.DataType.BYTES)
         .addMetric(METRIC_PASS_THROUGH_INTEGER, FieldSpec.DataType.INT)
-        .addMetric(METRIC_SNAPPY_INTEGER, FieldSpec.DataType.INT).addMetric(METRIC_LZ4_INTEGER, FieldSpec.DataType.INT)
+        .addMetric(METRIC_SNAPPY_INTEGER, FieldSpec.DataType.INT)
+        .addMetric(METRIC_LZ4_INTEGER, FieldSpec.DataType.INT)
         .addMetric(METRIC_ZSTANDARD_INTEGER, FieldSpec.DataType.INT)
         .addMultiValueDimension(DIM_MV_PASS_THROUGH_INTEGER, FieldSpec.DataType.INT)
         .addMultiValueDimension(DIM_MV_PASS_THROUGH_LONG, FieldSpec.DataType.LONG)
@@ -307,13 +369,21 @@ private void buildSegment()
         .addMultiValueDimension(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_INTEGER, FieldSpec.DataType.INT)
         .addMultiValueDimension(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_LONG, FieldSpec.DataType.LONG)
         .addMultiValueDimension(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_STRING, FieldSpec.DataType.STRING)
-        .addMultiValueDimension(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_BYTES, FieldSpec.DataType.BYTES).build();
+        .addMultiValueDimension(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_BYTES, FieldSpec.DataType.BYTES)
+        .addSingleValueDimension(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, FieldSpec.DataType.INT)
+        .addMultiValueDimension(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER, FieldSpec.DataType.INT)
+        .addSingleValueDimension(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX, FieldSpec.DataType.INT)
+        .addSingleValueDimension(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX, FieldSpec.DataType.INT)
+        .build();
 
     SegmentGeneratorConfig config = new SegmentGeneratorConfig(_tableConfig, _schema);
     config.setOutDir(INDEX_DIR.getPath());
     config.setTableName(TABLE_NAME);
     config.setSegmentName(SEGMENT_NAME);
-    config.setInvertedIndexCreationColumns(_forwardIndexDisabledColumns);
+    config.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, _invertedIndexColumns);
+    config.setForwardIndexDisabledColumns(_forwardIndexDisabledColumns);
+    config.setRangeIndexCreationColumns(
+        Collections.singletonList(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX));
     SegmentIndexCreationDriverImpl driver = new SegmentIndexCreationDriverImpl();
     try (RecordReader recordReader = new GenericRowRecordReader(rows)) {
       driver.init(config, recordReader);
@@ -415,6 +485,7 @@ private List<GenericRow> createTestData() {
       row.putValue(METRIC_PASS_THROUGH_INTEGER, tempIntRows[i]);
       row.putValue(METRIC_ZSTANDARD_INTEGER, tempIntRows[i]);
       row.putValue(METRIC_SNAPPY_INTEGER, tempIntRows[i]);
+      row.putValue(DIM_RAW_SORTED_INTEGER, i);
 
       // Raw long columns
       row.putValue(DIM_SNAPPY_LONG, tempLongRows[i]);
@@ -457,12 +528,16 @@ private List<GenericRow> createTestData() {
       row.putValue(DIM_SV_FORWARD_INDEX_DISABLED_LONG, tempLongRows[i]);
       row.putValue(DIM_SV_FORWARD_INDEX_DISABLED_STRING, tempStringRows[i]);
       row.putValue(DIM_SV_FORWARD_INDEX_DISABLED_BYTES, tempBytesRows[i]);
+      row.putValue(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, tempIntRows[i]);
+      row.putValue(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX, tempIntRows[i]);
+      row.putValue(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX, tempIntRows[i]);
 
       // Forward index disabled MV columns
       row.putValue(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER, tempMVIntRowsForwardIndexDisabled[i]);
       row.putValue(DIM_MV_FORWARD_INDEX_DISABLED_LONG, tempMVLongRowsForwardIndexDisabled[i]);
       row.putValue(DIM_MV_FORWARD_INDEX_DISABLED_STRING, tempMVStringRowsForwardIndexDisabled[i]);
       row.putValue(DIM_MV_FORWARD_INDEX_DISABLED_BYTES, tempMVByteRowsForwardIndexDisabled[i]);
+      row.putValue(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER, tempMVIntRowsForwardIndexDisabled[i]);
 
       // Forward index disabled MV columns with duplicates
       row.putValue(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_INTEGER, tempMVIntRows[i]);
@@ -486,8 +561,7 @@ public void testComputeOperationNoOp() throws Exception {
     // TEST1: Validate with zero changes. ForwardIndexHandler should be a No-Op.
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
-    Map<String, ForwardIndexHandler.Operation> operationMap = new HashMap<>();
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    Map<String, List<ForwardIndexHandler.Operation>> operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // Tear down
@@ -504,39 +578,51 @@ public void testComputeOperationEnableDictionary() throws Exception {
 
     // TEST1: Enable dictionary for a RAW_ZSTANDARD_INDEX_COLUMN.
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().remove(DIM_ZSTANDARD_STRING);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_ZSTANDARD_STRING);
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    Map<String, ForwardIndexHandler.Operation> operationMap = fwdIndexHandler.computeOperation(writer);
-    assertEquals(operationMap.get(DIM_ZSTANDARD_STRING), ForwardIndexHandler.Operation.ENABLE_DICTIONARY);
+    Map<String, List<ForwardIndexHandler.Operation>> operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.get(DIM_ZSTANDARD_STRING),
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
 
     // TEST2: Enable dictionary for an MV column.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().remove(DIM_MV_PASS_THROUGH_STRING);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_MV_PASS_THROUGH_STRING);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
-    assertEquals(operationMap.get(DIM_MV_PASS_THROUGH_STRING), ForwardIndexHandler.Operation.ENABLE_DICTIONARY);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.get(DIM_MV_PASS_THROUGH_STRING),
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
 
     // TEST3: Enable dictionary for a dict column. Should be a No-op.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // TEST4: Add an additional text index. ForwardIndexHandler should be a No-Op.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getTextIndexColumns().add(DIM_DICT_INTEGER);
-    indexLoadingConfig.getTextIndexColumns().add(DIM_LZ4_INTEGER);
+    indexLoadingConfig.addTextIndexColumns(DIM_DICT_INTEGER);
+    indexLoadingConfig.addTextIndexColumns(DIM_LZ4_INTEGER);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // TEST5: Add text index and enable dictionary.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getRangeIndexColumns().add(METRIC_LZ4_INTEGER);
-    indexLoadingConfig.getNoDictionaryColumns().remove(METRIC_LZ4_INTEGER);
+    indexLoadingConfig.addRangeIndexColumns(METRIC_LZ4_INTEGER);
+    indexLoadingConfig.removeNoDictionaryColumns(METRIC_LZ4_INTEGER);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
-    assertEquals(operationMap.get(METRIC_LZ4_INTEGER), ForwardIndexHandler.Operation.ENABLE_DICTIONARY);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.get(METRIC_LZ4_INTEGER),
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
+
+    // TEST6: Enable Dictionary for sorted column.
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_RAW_SORTED_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.get(DIM_RAW_SORTED_INTEGER),
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
+
 
     // Tear down
     segmentLocalFSDirectory.close();
@@ -552,32 +638,34 @@ public void testComputeOperationDisableDictionary() throws Exception {
 
     // TEST1: Disable dictionary for a raw column. Should be a no-op.
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_SNAPPY_INTEGER);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_SNAPPY_INTEGER);
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    Map<String, ForwardIndexHandler.Operation> operationMap = fwdIndexHandler.computeOperation(writer);
+    Map<String, List<ForwardIndexHandler.Operation>> operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // TEST2: Disable dictionary for a dictionary SV column.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_DICT_INTEGER);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_DICT_INTEGER);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
-    assertEquals(operationMap.get(DIM_DICT_INTEGER), ForwardIndexHandler.Operation.DISABLE_DICTIONARY);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.get(DIM_DICT_INTEGER),
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_DICTIONARY));
 
     // TEST3: Disable dictionary for a dictionary MV column.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_DICT_MV_BYTES);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_DICT_MV_BYTES);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
-    assertEquals(operationMap.get(DIM_DICT_MV_BYTES), ForwardIndexHandler.Operation.DISABLE_DICTIONARY);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.get(DIM_DICT_MV_BYTES),
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_DICTIONARY));
 
     // TEST4: Disable dictionary and enable inverted index. Should be a no-op.
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_DICT_STRING);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_DICT_STRING);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_DICT_STRING);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_DICT_STRING);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
-    assertEquals(operationMap, Collections.emptyMap());
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // Tear down
     segmentLocalFSDirectory.close();
@@ -603,7 +691,10 @@ public void testComputeOperationChangeCompression() throws Exception {
       randIdx = rand.nextInt(fieldConfigs.size());
       name = fieldConfigs.get(randIdx).getName();
     } while (SV_FORWARD_INDEX_DISABLED_COLUMNS.contains(name) || MV_FORWARD_INDEX_DISABLED_COLUMNS.contains(name)
-        || MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.contains(name));
+        || MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.contains(name)
+        || FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(name)
+        || DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX.equals(name)
+        || DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX.equals(name));
     FieldConfig config = fieldConfigs.remove(randIdx);
     FieldConfig.CompressionCodec newCompressionType = null;
     for (FieldConfig.CompressionCodec type : _allCompressionTypes) {
@@ -623,9 +714,10 @@ public void testComputeOperationChangeCompression() throws Exception {
 
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, tableConfig);
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
-    Map<String, ForwardIndexHandler.Operation> operationMap = fwdIndexHandler.computeOperation(writer);
+    Map<String, List<ForwardIndexHandler.Operation>> operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 1);
-    assertEquals(operationMap.get(config.getName()), ForwardIndexHandler.Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE);
+    assertEquals(operationMap.get(config.getName()),
+        Collections.singletonList(ForwardIndexHandler.Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE));
 
     // TEST2: Change compression and add index. Change compressionType for more than 1 column.
     fieldConfigs = new ArrayList<>(_tableConfig.getFieldConfigList());
@@ -645,13 +737,15 @@ public void testComputeOperationChangeCompression() throws Exception {
     tableConfig.setFieldConfigList(fieldConfigs);
 
     indexLoadingConfig = new IndexLoadingConfig(null, tableConfig);
-    indexLoadingConfig.getTextIndexColumns().add(config1.getName());
-    indexLoadingConfig.getInvertedIndexColumns().add(config1.getName());
+    indexLoadingConfig.addTextIndexColumns(config1.getName());
+    indexLoadingConfig.addInvertedIndexColumns(config1.getName());
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
-    assertEquals(operationMap.get(config1.getName()), ForwardIndexHandler.Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE);
-    assertEquals(operationMap.get(config2.getName()), ForwardIndexHandler.Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE);
+    assertEquals(operationMap.get(config1.getName()),
+        Collections.singletonList(ForwardIndexHandler.Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE));
+    assertEquals(operationMap.get(config2.getName()),
+        Collections.singletonList(ForwardIndexHandler.Operation.CHANGE_RAW_INDEX_COMPRESSION_TYPE));
 
     // Tear down
     segmentLocalFSDirectory.close();
@@ -668,74 +762,184 @@ public void testComputeOperationDisableForwardIndex()
 
     // TEST1: Disable forward index for a column which already has forward index disabled
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
-    Map<String, ForwardIndexHandler.Operation> operationMap = fwdIndexHandler.computeOperation(writer);
+    Map<String, List<ForwardIndexHandler.Operation>> operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // TEST2: Disable forward index for a dictionary column with forward index enabled
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_DICT_INTEGER);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_DICT_INTEGER);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_DICT_INTEGER);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_DICT_INTEGER);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 1);
     assertEquals(operationMap.get(DIM_DICT_INTEGER),
-        ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX));
 
     // TEST3: Disable forward index for a raw column with forward index enabled and enable inverted index and
     // dictionary
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_LZ4_INTEGER);
-    indexLoadingConfig.getNoDictionaryColumns().remove(DIM_LZ4_INTEGER);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_LZ4_INTEGER);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_LZ4_INTEGER);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_LZ4_INTEGER);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_LZ4_INTEGER);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 1);
-    assertEquals(operationMap.get(DIM_LZ4_INTEGER), ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+    Set<ForwardIndexHandler.Operation> operations = new HashSet<>(operationMap.get(DIM_LZ4_INTEGER));
+    assertEquals(operations.size(), 2);
+    Set<ForwardIndexHandler.Operation> expectedOperations =
+        new HashSet<>(Arrays.asList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX,
+            ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
+    assertEquals(expectedOperations, operations);
 
     // TEST4: Disable forward index for two dictionary columns with forward index enabled
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_DICT_LONG);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_DICT_STRING);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_DICT_LONG);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_DICT_STRING);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_DICT_LONG);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_DICT_STRING);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_DICT_LONG);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_DICT_STRING);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
-    assertEquals(operationMap.get(DIM_DICT_LONG), ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+    assertEquals(operationMap.get(DIM_DICT_LONG),
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX));
     assertEquals(operationMap.get(DIM_DICT_STRING),
-        ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX));
 
     // TEST5: Disable forward index for two raw columns with forward index enabled and enable dictionary
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_LZ4_LONG);
-    indexLoadingConfig.getNoDictionaryColumns().remove(DIM_LZ4_LONG);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_LZ4_LONG);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_SNAPPY_STRING);
-    indexLoadingConfig.getNoDictionaryColumns().remove(DIM_SNAPPY_STRING);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_SNAPPY_STRING);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_LZ4_LONG);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_LZ4_LONG);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_LZ4_LONG);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_SNAPPY_STRING);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_SNAPPY_STRING);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_SNAPPY_STRING);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
-    assertEquals(operationMap.get(DIM_LZ4_LONG), ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
-    assertEquals(operationMap.get(DIM_SNAPPY_STRING),
-        ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+    operations = new HashSet<>(operationMap.get(DIM_LZ4_LONG));
+    assertEquals(operations.size(), 2);
+    expectedOperations = new HashSet<>(Arrays.asList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX,
+            ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
+    assertEquals(expectedOperations, operations);
+    operations = new HashSet<>(operationMap.get(DIM_SNAPPY_STRING));
+    assertEquals(operations.size(), 2);
+    assertEquals(expectedOperations, operations);
 
     // TEST6: Disable forward index for a dictionary and a raw column with forward index enabled
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_ZSTANDARD_INTEGER);
-    indexLoadingConfig.getNoDictionaryColumns().remove(DIM_ZSTANDARD_INTEGER);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_ZSTANDARD_INTEGER);
-    indexLoadingConfig.getInvertedIndexColumns().add(DIM_DICT_STRING);
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(DIM_DICT_STRING);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_ZSTANDARD_INTEGER);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_ZSTANDARD_INTEGER);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_ZSTANDARD_INTEGER);
+    indexLoadingConfig.addInvertedIndexColumns(DIM_DICT_STRING);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_DICT_STRING);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
-    assertEquals(operationMap.get(DIM_ZSTANDARD_INTEGER),
-        ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+    operations = new HashSet<>(operationMap.get(DIM_ZSTANDARD_INTEGER));
+    assertEquals(operations.size(), 2);
+    expectedOperations = new HashSet<>(Arrays.asList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX,
+        ForwardIndexHandler.Operation.ENABLE_DICTIONARY));
+    assertEquals(expectedOperations, operations);
     assertEquals(operationMap.get(DIM_DICT_STRING),
-        ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX));
+
+    // TEST7: Disable forward index for a raw column without enabling dictionary or inverted index
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_LZ4_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.size(), 1);
+    assertEquals(operationMap.get(DIM_LZ4_INTEGER),
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX));
+
+    // TEST8: Disable forward index for a dictionary column and also disable dictionary and inverted index
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_DICT_INTEGER);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_DICT_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.size(), 1);
+    operations = new HashSet<>(operationMap.get(DIM_DICT_INTEGER));
+    assertEquals(operations.size(), 2);
+    expectedOperations = new HashSet<>(Arrays.asList(ForwardIndexHandler.Operation.DISABLE_FORWARD_INDEX,
+        ForwardIndexHandler.Operation.DISABLE_DICTIONARY));
+    assertEquals(expectedOperations, operations);
+
+    // TEST9: Disable dictionary on a column that already has forward index disabled
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.size(), 1);
+    assertEquals(operationMap.get(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER),
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_DICTIONARY));
+
+    // TEST10: Disable inverted index on a column that already has forward index disabled
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap, Collections.EMPTY_MAP);
+
+    // TEST11: Disable dictionary on a column that already has forward index disabled and inverted index disabled
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap.size(), 1);
+    assertEquals(operationMap.get(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX),
+        Collections.singletonList(ForwardIndexHandler.Operation.DISABLE_DICTIONARY));
+
+    // TEST12: Enable dictionary on a column that already has forward index disabled and dictionary disabled
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.removeNoDictionaryColumns(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
+    try {
+      operationMap = fwdIndexHandler.computeOperations(writer);
+      Assert.fail("Enabling dictionary on forward index disabled column is not possible");
+    } catch (IllegalStateException e) {
+      assertEquals(e.getMessage(), "Cannot regenerate the dictionary for column "
+          + "DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER with forward index disabled. Please refresh or back-fill "
+          + "the data to add back the forward index");
+    }
+
+    // TEST13: Disable dictionary on a column that already has forward index disabled without an inverted index but
+    // with a range index
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
+    try {
+      operationMap = fwdIndexHandler.computeOperations(writer);
+      Assert.fail("Disabling dictionary on forward index disabled column without inverted index but which has a "
+          + "range index is not possible");
+    } catch (IllegalStateException e) {
+      assertEquals(e.getMessage(), "Must disable range (enabled) index to disable the dictionary for a "
+          + "forwardIndexDisabled column: DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX or refresh / "
+          + "back-fill the forward index");
+    }
+
+    // TEST13: Disable dictionary on a column that already has forward index disabled and inverted index enabled with
+    // a range index
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.addRangeIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
+    try {
+      operationMap = fwdIndexHandler.computeOperations(writer);
+      Assert.fail("Disabling dictionary on forward index disabled column with inverted index and a range index "
+          + "is not possible");
+    } catch (IllegalStateException e) {
+      assertEquals(e.getMessage(), "Must disable range (enabled) index to disable the dictionary for a "
+          + "forwardIndexDisabled column: DIM_SV_FORWARD_INDEX_DISABLED_INTEGER or refresh / back-fill the "
+          + "forward index");
+    }
   }
 
   @Test
@@ -774,83 +978,97 @@ public void testComputeOperationEnableForwardIndex()
     noDictionaryColumns.add(config.getName());
     TableConfig tableConfig =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).setNoDictionaryColumns(noDictionaryColumns)
-            .setInvertedIndexColumns(_forwardIndexDisabledColumns).setFieldConfigList(fieldConfigs).build();
+            .setInvertedIndexColumns(_invertedIndexColumns).setFieldConfigList(fieldConfigs).build();
     tableConfig.setFieldConfigList(fieldConfigs);
 
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, tableConfig);
-    indexLoadingConfig.getNoDictionaryColumns().add(config.getName());
-    indexLoadingConfig.getInvertedIndexColumns().remove(config.getName());
+    indexLoadingConfig.addNoDictionaryColumns(config.getName());
+    indexLoadingConfig.removeInvertedIndexColumns(config.getName());
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
-    Map<String, ForwardIndexHandler.Operation> operationMap = fwdIndexHandler.computeOperation(writer);
+    Map<String, List<ForwardIndexHandler.Operation>> operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 1);
     assertEquals(operationMap.get(config.getName()),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
 
     // TEST2: Enable forward index in dictionary format for a column with forward index disabled
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_SV_FORWARD_INDEX_DISABLED_BYTES);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_BYTES);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 1);
     assertEquals(operationMap.get(DIM_SV_FORWARD_INDEX_DISABLED_BYTES),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
 
     // TEST3: Enable forward index in raw format for a column with forward index disabled. Remove column from inverted
     // index as well (inverted index needs dictionary)
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER);
-    indexLoadingConfig.getInvertedIndexColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 1);
     assertEquals(operationMap.get(DIM_MV_FORWARD_INDEX_DISABLED_INTEGER),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
 
     // TEST4: Enable forward index in dictionary format for two columns with forward index disabled. Disable inverted
     // index for one of them
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_SV_FORWARD_INDEX_DISABLED_LONG);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_STRING);
-    indexLoadingConfig.getInvertedIndexColumns().remove(DIM_SV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_MV_FORWARD_INDEX_DISABLED_STRING);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_LONG);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
     assertEquals(operationMap.get(DIM_SV_FORWARD_INDEX_DISABLED_LONG),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
     assertEquals(operationMap.get(DIM_MV_FORWARD_INDEX_DISABLED_STRING),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
 
     // TEST5: Enable forward index in raw format for two columns with forward index disabled. Remove column from
     // inverted index as well (inverted index needs dictionary)
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_SV_FORWARD_INDEX_DISABLED_STRING);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_SV_FORWARD_INDEX_DISABLED_STRING);
-    indexLoadingConfig.getInvertedIndexColumns().remove(DIM_SV_FORWARD_INDEX_DISABLED_STRING);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
-    indexLoadingConfig.getInvertedIndexColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_STRING);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_SV_FORWARD_INDEX_DISABLED_STRING);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_STRING);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
     assertEquals(operationMap.get(DIM_SV_FORWARD_INDEX_DISABLED_STRING),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
     assertEquals(operationMap.get(DIM_MV_FORWARD_INDEX_DISABLED_LONG),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
 
     // TEST6: Enable forward index in dictionary format and one in raw format for columns with forward index disabled
     indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
-    indexLoadingConfig.getNoDictionaryColumns().add(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
-    indexLoadingConfig.getInvertedIndexColumns().remove(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(DIM_SV_FORWARD_INDEX_DISABLED_BYTES);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.addNoDictionaryColumns(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.removeInvertedIndexColumns(DIM_MV_FORWARD_INDEX_DISABLED_LONG);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_BYTES);
     fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    operationMap = fwdIndexHandler.computeOperation(writer);
+    operationMap = fwdIndexHandler.computeOperations(writer);
     assertEquals(operationMap.size(), 2);
     assertEquals(operationMap.get(DIM_MV_FORWARD_INDEX_DISABLED_LONG),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_RAW_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
     assertEquals(operationMap.get(DIM_SV_FORWARD_INDEX_DISABLED_BYTES),
-        ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX_FOR_DICT_COLUMN);
+        Collections.singletonList(ForwardIndexHandler.Operation.ENABLE_FORWARD_INDEX));
+
+    // TEST7: Enable forward index for a raw column with forward index disabled and keep it as raw
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap, Collections.EMPTY_MAP);
+
+    // TEST8: Enable forward index for a dictionary based column with forward index and inverted index disabled
+    indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    operationMap = fwdIndexHandler.computeOperations(writer);
+    assertEquals(operationMap, Collections.EMPTY_MAP);
 
     // Tear down
     segmentLocalFSDirectory.close();
@@ -860,6 +1078,10 @@ public void testComputeOperationEnableForwardIndex()
   public void testChangeCompressionForSingleColumn()
       throws Exception {
     for (int i = 0; i < _noDictionaryColumns.size(); i++) {
+      if (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(_noDictionaryColumns.get(i))) {
+        // Don't run this test for forward index disabled columns
+        continue;
+      }
       // For every noDictionaryColumn, change the compressionType to all available types, one by one.
       for (FieldConfig.CompressionCodec compressionType : _allCompressionTypes) {
         // Setup
@@ -890,24 +1112,23 @@ public void testChangeCompressionForSingleColumn()
         tableConfig.setFieldConfigList(fieldConfigs);
 
         IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, tableConfig);
-        IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
         ForwardIndexHandler fwdIndexHandler =
             new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
         boolean val = fwdIndexHandler.needUpdateIndices(writer);
-        fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+        fwdIndexHandler.updateIndices(writer);
         fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
         // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
         segmentLocalFSDirectory.close();
 
         // Validation
-        testIndexExists(columnName, ColumnIndexType.FORWARD_INDEX);
+        ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(columnName);
+        testIndexExists(columnName, StandardIndexes.forward());
         validateIndexMap(columnName, false, false);
-        validateForwardIndex(columnName, newCompressionType);
+        validateForwardIndex(columnName, newCompressionType, metadata.isSorted());
 
         // Validate metadata properties. Nothing should change when a forwardIndex is rewritten for compressionType
         // change.
-        ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(columnName);
         validateMetadataProperties(columnName, metadata.hasDictionary(), metadata.getColumnMaxLength(),
             metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(),
             metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
@@ -938,7 +1159,10 @@ public void testChangeCompressionForMultipleColumns()
       randomIdx = rand.nextInt(fieldConfigs.size());
       name = fieldConfigs.get(randomIdx).getName();
     } while (SV_FORWARD_INDEX_DISABLED_COLUMNS.contains(name) || MV_FORWARD_INDEX_DISABLED_COLUMNS.contains(name)
-        || MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.contains(name));
+        || MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.contains(name)
+        || FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(name)
+        || DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX.equals(name)
+        || DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX.equals(name));
     FieldConfig config1 = fieldConfigs.remove(randomIdx);
     String column1 = config1.getName();
     FieldConfig newConfig1 =
@@ -951,7 +1175,10 @@ public void testChangeCompressionForMultipleColumns()
       randomIdx = rand.nextInt(fieldConfigs.size());
       name = fieldConfigs.get(randomIdx).getName();
     } while (SV_FORWARD_INDEX_DISABLED_COLUMNS.contains(name) || MV_FORWARD_INDEX_DISABLED_COLUMNS.contains(name)
-        || MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.contains(name));
+        || MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.contains(name)
+        || FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(name)
+        || DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX.equals(name)
+        || DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX.equals(name));
     FieldConfig config2 = fieldConfigs.remove(randomIdx);
     String column2 = config2.getName();
     FieldConfig newConfig2 =
@@ -964,30 +1191,29 @@ public void testChangeCompressionForMultipleColumns()
     tableConfig.setFieldConfigList(fieldConfigs);
 
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, tableConfig);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, null);
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
     segmentLocalFSDirectory.close();
 
-    testIndexExists(column1, ColumnIndexType.FORWARD_INDEX);
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column1);
+    testIndexExists(column1, StandardIndexes.forward());
     validateIndexMap(column1, false, false);
-    validateForwardIndex(column1, newCompressionType);
+    validateForwardIndex(column1, newCompressionType, metadata.isSorted());
     // Validate metadata properties. Nothing should change when a forwardIndex is rewritten for compressionType
     // change.
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column1);
     validateMetadataProperties(column1, metadata.hasDictionary(), metadata.getColumnMaxLength(),
         metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(),
         metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
         metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(), metadata.getMinValue(), metadata.getMaxValue(),
         false);
 
-    testIndexExists(column2, ColumnIndexType.FORWARD_INDEX);
-    validateIndexMap(column2, false, false);
-    validateForwardIndex(column2, newCompressionType);
     metadata = existingSegmentMetadata.getColumnMetadataFor(column2);
+    testIndexExists(column2, StandardIndexes.forward());
+    validateIndexMap(column2, false, false);
+    validateForwardIndex(column2, newCompressionType, metadata.isSorted());
     validateMetadataProperties(column2, metadata.hasDictionary(), metadata.getColumnMaxLength(),
         metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(),
         metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
@@ -1005,27 +1231,32 @@ public void testEnableDictionaryForMultipleColumns()
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
 
     Random rand = new Random();
-    String col1 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
-    indexLoadingConfig.getNoDictionaryColumns().remove(col1);
-    String col2 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
-    indexLoadingConfig.getNoDictionaryColumns().remove(col2);
+    String col1;
+    do {
+      col1 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
+    } while (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(col1));
+    indexLoadingConfig.removeNoDictionaryColumns(col1);
+    String col2;
+    do {
+      col2 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
+    } while (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(col2) || col2.equals(col1));
+    indexLoadingConfig.removeNoDictionaryColumns(col2);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
     segmentLocalFSDirectory.close();
 
     // Col1 validation.
-    testIndexExists(col1, ColumnIndexType.FORWARD_INDEX);
-    testIndexExists(col1, ColumnIndexType.DICTIONARY);
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(col1);
+    testIndexExists(col1, StandardIndexes.forward());
+    testIndexExists(col1, StandardIndexes.dictionary());
     validateIndexMap(col1, true, false);
-    validateForwardIndex(col1, null);
+    validateForwardIndex(col1, null, metadata.isSorted());
     // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
     int dictionaryElementSize = 0;
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(col1);
     FieldSpec.DataType dataType = metadata.getDataType();
     if (dataType == FieldSpec.DataType.STRING || dataType == FieldSpec.DataType.BYTES) {
       // This value is based on the rows in createTestData().
@@ -1039,13 +1270,13 @@ public void testEnableDictionaryForMultipleColumns()
         metadata.getMinValue(), metadata.getMaxValue(), false);
 
     // Col2 validation.
-    testIndexExists(col2, ColumnIndexType.FORWARD_INDEX);
-    testIndexExists(col2, ColumnIndexType.DICTIONARY);
+    metadata = existingSegmentMetadata.getColumnMetadataFor(col2);
+    testIndexExists(col2, StandardIndexes.forward());
+    testIndexExists(col2, StandardIndexes.dictionary());
     validateIndexMap(col2, true, false);
-    validateForwardIndex(col2, null);
+    validateForwardIndex(col2, null, metadata.isSorted());
     // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
     dictionaryElementSize = 0;
-    metadata = existingSegmentMetadata.getColumnMetadataFor(col2);
     dataType = metadata.getDataType();
     if (dataType == FieldSpec.DataType.STRING || dataType == FieldSpec.DataType.BYTES) {
       // This value is based on the rows in createTestData().
@@ -1059,36 +1290,81 @@ public void testEnableDictionaryForMultipleColumns()
         metadata.getMinValue(), metadata.getMaxValue(), false);
   }
 
+  @Test
+  public void testEnableDictionaryForSortedColumn() throws Exception {
+    IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+
+    for (int i = 0; i < RAW_SORTED_INDEX_COLUMNS.size(); i++) {
+      SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
+      SegmentDirectory segmentLocalFSDirectory =
+          new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
+      SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
+
+      String column = RAW_SORTED_INDEX_COLUMNS.get(i);
+      indexLoadingConfig.removeNoDictionaryColumns(column);
+      ForwardIndexHandler fwdIndexHandler =
+          new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+      fwdIndexHandler.updateIndices(writer);
+      fwdIndexHandler.postUpdateIndicesCleanup(writer);
+
+      // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
+      segmentLocalFSDirectory.close();
+
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
+      testIndexExists(column, StandardIndexes.forward());
+      testIndexExists(column, StandardIndexes.dictionary());
+      validateIndexMap(column, true, false);
+      validateForwardIndex(column, null, metadata.isSorted());
+
+      // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
+      int dictionaryElementSize = 0;
+      FieldSpec.DataType dataType = metadata.getDataType();
+      if (dataType == FieldSpec.DataType.STRING || dataType == FieldSpec.DataType.BYTES) {
+        // This value is based on the rows in createTestData().
+        dictionaryElementSize = 7;
+      } else if (dataType == FieldSpec.DataType.BIG_DECIMAL) {
+        dictionaryElementSize = 4;
+      }
+      validateMetadataProperties(column, true, dictionaryElementSize, metadata.getCardinality(),
+          metadata.getTotalDocs(), dataType, metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(),
+          metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(),
+          metadata.getMinValue(), metadata.getMaxValue(), false);
+    }
+  }
+
   @Test
   public void testEnableDictionaryForSingleColumn()
       throws Exception {
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
 
     for (int i = 0; i < _noDictionaryColumns.size(); i++) {
+      if (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(_noDictionaryColumns.get(i))) {
+        // Skip the RAW forward index disabled columns
+        continue;
+      }
       SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
       SegmentDirectory segmentLocalFSDirectory =
           new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
       SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
 
       String column = _noDictionaryColumns.get(i);
-      indexLoadingConfig.getNoDictionaryColumns().remove(column);
+      indexLoadingConfig.removeNoDictionaryColumns(column);
       ForwardIndexHandler fwdIndexHandler =
           new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-      fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+      fwdIndexHandler.updateIndices(writer);
       fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
       // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
       segmentLocalFSDirectory.close();
 
-      testIndexExists(column, ColumnIndexType.FORWARD_INDEX);
-      testIndexExists(column, ColumnIndexType.DICTIONARY);
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
+      testIndexExists(column, StandardIndexes.forward());
+      testIndexExists(column, StandardIndexes.dictionary());
       validateIndexMap(column, true, false);
-      validateForwardIndex(column, null);
+      validateForwardIndex(column, null, metadata.isSorted());
 
       // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
       int dictionaryElementSize = 0;
-      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
       FieldSpec.DataType dataType = metadata.getDataType();
       if (dataType == FieldSpec.DataType.STRING || dataType == FieldSpec.DataType.BYTES) {
         // This value is based on the rows in createTestData().
@@ -1115,18 +1391,17 @@ public void testDisableForwardIndexForMultipleDictColumns()
     Random rand = new Random();
     String col1 = DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.get(
         rand.nextInt(DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(col1);
-    indexLoadingConfig.getInvertedIndexColumns().add(col1);
+    indexLoadingConfig.addForwardIndexDisabledColumns(col1);
+    indexLoadingConfig.addInvertedIndexColumns(col1);
     String col2;
     do {
       col2 = DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.get(rand.nextInt(DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.size()));
     } while (col2.equals(col1));
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(col2);
-    indexLoadingConfig.getInvertedIndexColumns().add(col2);
+    indexLoadingConfig.addForwardIndexDisabledColumns(col2);
+    indexLoadingConfig.addInvertedIndexColumns(col2);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
@@ -1159,6 +1434,9 @@ public void testDisableForwardIndexForSingleDictColumn()
     Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
     for (String column : DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX) {
       SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
       SegmentDirectory segmentLocalFSDirectory =
@@ -1168,11 +1446,14 @@ public void testDisableForwardIndexForSingleDictColumn()
       IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
       forwardIndexDisabledColumns.add(column);
       indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-      indexLoadingConfig.setInvertedIndexColumns(forwardIndexDisabledColumns);
+      Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+      invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+      indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
       ForwardIndexHandler fwdIndexHandler =
           new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-      fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+      fwdIndexHandler.updateIndices(writer);
       fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
       // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
@@ -1203,23 +1484,22 @@ public void testDisableDictionaryForSingleColumn()
       SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
 
       String column = DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.get(i);
-      indexLoadingConfig.getNoDictionaryColumns().add(column);
+      indexLoadingConfig.addNoDictionaryColumns(column);
 
       ForwardIndexHandler fwdIndexHandler =
           new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-      fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+      fwdIndexHandler.updateIndices(writer);
       fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
       segmentLocalFSDirectory.close();
 
-      testIndexExists(column, ColumnIndexType.FORWARD_INDEX);
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
+      testIndexExists(column, StandardIndexes.forward());
       validateIndexMap(column, false, false);
       // All the columns are dimensions. So default compression type is LZ4.
-      validateForwardIndex(column, FieldConfig.CompressionCodec.LZ4);
+      validateForwardIndex(column, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
 
       // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
-      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
       validateMetadataProperties(column, false, 0, metadata.getCardinality(), metadata.getTotalDocs(),
           metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(),
           metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(),
@@ -1240,41 +1520,40 @@ public void testDisableDictionaryForMultipleColumns()
     Random rand = new Random();
     int randomIdx = rand.nextInt(DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.size());
     String column1 = DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.get(randomIdx);
-    indexLoadingConfig.getNoDictionaryColumns().add(column1);
+    indexLoadingConfig.addNoDictionaryColumns(column1);
 
     // Column 2
     randomIdx = rand.nextInt(DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.size());
     String column2 = DICT_ENABLED_COLUMNS_WITH_FORWARD_INDEX.get(randomIdx);
-    indexLoadingConfig.getNoDictionaryColumns().add(column2);
+    indexLoadingConfig.addNoDictionaryColumns(column2);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     segmentLocalFSDirectory.close();
 
     // Column1 validation.
-    testIndexExists(column1, ColumnIndexType.FORWARD_INDEX);
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column1);
+    testIndexExists(column1, StandardIndexes.forward());
     validateIndexMap(column1, false, false);
     // All the columns are dimensions. So default compression type is LZ4.
-    validateForwardIndex(column1, FieldConfig.CompressionCodec.LZ4);
+    validateForwardIndex(column1, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
 
     // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column1);
     validateMetadataProperties(column1, false, 0, metadata.getCardinality(), metadata.getTotalDocs(),
         metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(),
         metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(),
         metadata.getMinValue(), metadata.getMaxValue(), false);
 
     // Column2 validation.
-    testIndexExists(column2, ColumnIndexType.FORWARD_INDEX);
+    metadata = existingSegmentMetadata.getColumnMetadataFor(column2);
+    testIndexExists(column2, StandardIndexes.forward());
     validateIndexMap(column2, false, false);
     // All the columns are dimensions. So default compression type is LZ4.
-    validateForwardIndex(column2, FieldConfig.CompressionCodec.LZ4);
+    validateForwardIndex(column2, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
 
     // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
-    metadata = existingSegmentMetadata.getColumnMetadataFor(column2);
     validateMetadataProperties(column2, false, 0, metadata.getCardinality(), metadata.getTotalDocs(),
         metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(),
         metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(),
@@ -1293,17 +1572,16 @@ public void testDisableForwardIndexForMultipleRawColumns()
     Random rand = new Random();
     String col1 = RAW_LZ4_INDEX_COLUMNS.get(
         rand.nextInt(RAW_LZ4_INDEX_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(col1);
-    indexLoadingConfig.getNoDictionaryColumns().remove(col1);
-    indexLoadingConfig.getInvertedIndexColumns().add(col1);
+    indexLoadingConfig.addForwardIndexDisabledColumns(col1);
+    indexLoadingConfig.removeNoDictionaryColumns(col1);
+    indexLoadingConfig.addInvertedIndexColumns(col1);
     String col2 = RAW_SNAPPY_INDEX_COLUMNS.get(rand.nextInt(RAW_SNAPPY_INDEX_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().add(col2);
-    indexLoadingConfig.getNoDictionaryColumns().remove(col2);
-    indexLoadingConfig.getInvertedIndexColumns().add(col2);
+    indexLoadingConfig.addForwardIndexDisabledColumns(col2);
+    indexLoadingConfig.removeNoDictionaryColumns(col2);
+    indexLoadingConfig.addInvertedIndexColumns(col2);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
@@ -1352,7 +1630,14 @@ public void testDisableForwardIndexForSingleRawColumn()
     Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
     for (String column : _noDictionaryColumns) {
+      if (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(column) || RAW_SORTED_INDEX_COLUMNS.contains(column)) {
+        // Forward index already disabled for these columns, skip them
+        continue;
+      }
       SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
       SegmentDirectory segmentLocalFSDirectory =
           new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
@@ -1361,12 +1646,16 @@ public void testDisableForwardIndexForSingleRawColumn()
       IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
       forwardIndexDisabledColumns.add(column);
       indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-      indexLoadingConfig.getNoDictionaryColumns().removeAll(forwardIndexDisabledColumns);
-      indexLoadingConfig.setInvertedIndexColumns(forwardIndexDisabledColumns);
+      indexLoadingConfig.removeNoDictionaryColumns(forwardIndexDisabledColumns);
+      indexLoadingConfig.addNoDictionaryColumns(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+      Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+      invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+      indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
       ForwardIndexHandler fwdIndexHandler =
           new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-      fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+      fwdIndexHandler.updateIndices(writer);
       fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
       // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
@@ -1392,6 +1681,115 @@ public void testDisableForwardIndexForSingleRawColumn()
     }
   }
 
+  @Test
+  public void testDisableForwardIndexForRawAndInvertedIndexDisabledColumns()
+      throws Exception {
+    Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+    for (String column : _noDictionaryColumns) {
+      if (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(column) || RAW_SORTED_INDEX_COLUMNS.contains(column)) {
+        // Forward index already disabled for these columns, skip them
+        continue;
+      }
+      SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
+      SegmentDirectory segmentLocalFSDirectory =
+          new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
+      SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
+
+      IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+      forwardIndexDisabledColumns.add(column);
+      indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+      Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+      invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+      invertedIndexColumns.remove(column);
+      indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+      ForwardIndexHandler fwdIndexHandler =
+          new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+      fwdIndexHandler.updateIndices(writer);
+      fwdIndexHandler.postUpdateIndicesCleanup(writer);
+
+      // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
+      segmentLocalFSDirectory.close();
+
+      validateIndexMap(column, false, true);
+      validateIndexesForForwardIndexDisabledColumns(column);
+
+      // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
+      FieldSpec.DataType dataType = metadata.getDataType();
+      validateMetadataProperties(column, false, 0, metadata.getCardinality(),
+          metadata.getTotalDocs(), dataType, metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(),
+          metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(),
+          metadata.getMinValue(), metadata.getMaxValue(), false);
+    }
+  }
+
+  @Test
+  public void testDisableForwardIndexForInvertedIndexDisabledColumns()
+      throws Exception {
+    Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+    Set<String> noDictColumnsToRemove = new HashSet<>();
+    noDictColumnsToRemove.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    for (String column : _noDictionaryColumns) {
+      if (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(column) || RAW_SORTED_INDEX_COLUMNS.contains(column)) {
+        // Forward index already disabled for these columns, skip them
+        continue;
+      }
+      SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
+      SegmentDirectory segmentLocalFSDirectory =
+          new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
+      SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
+
+      IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+      forwardIndexDisabledColumns.add(column);
+      indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+      noDictColumnsToRemove.add(column);
+      indexLoadingConfig.removeNoDictionaryColumns(noDictColumnsToRemove);
+      Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+      invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+      invertedIndexColumns.remove(column);
+      indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+      ForwardIndexHandler fwdIndexHandler =
+          new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+      fwdIndexHandler.updateIndices(writer);
+      fwdIndexHandler.postUpdateIndicesCleanup(writer);
+
+      // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
+      segmentLocalFSDirectory.close();
+
+      validateIndexMap(column, true, true);
+      validateIndexesForForwardIndexDisabledColumns(column);
+
+      // In column metadata, nothing other than hasDictionary and dictionaryElementSize should change.
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
+      FieldSpec.DataType dataType = metadata.getDataType();
+      int dictionaryElementSize = 0;
+      if (dataType == FieldSpec.DataType.STRING || dataType == FieldSpec.DataType.BYTES) {
+        // This value is based on the rows in createTestData().
+        dictionaryElementSize = 7;
+      } else if (dataType == FieldSpec.DataType.BIG_DECIMAL) {
+        dictionaryElementSize = 4;
+      }
+      validateMetadataProperties(column, true, dictionaryElementSize, metadata.getCardinality(),
+          metadata.getTotalDocs(), dataType, metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(),
+          metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(),
+          metadata.getMinValue(), metadata.getMaxValue(), false);
+    }
+  }
+
   @Test
   public void testEnableForwardIndexInDictModeForMultipleForwardIndexDisabledColumns()
       throws Exception {
@@ -1404,33 +1802,32 @@ public void testEnableForwardIndexInDictModeForMultipleForwardIndexDisabledColum
     Random rand = new Random();
     // Remove from forward index list but keep the inverted index enabled
     String col1 = SV_FORWARD_INDEX_DISABLED_COLUMNS.get(rand.nextInt(SV_FORWARD_INDEX_DISABLED_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(col1);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(col1);
     String col2 = MV_FORWARD_INDEX_DISABLED_COLUMNS.get(rand.nextInt(MV_FORWARD_INDEX_DISABLED_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(col2);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(col2);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
     segmentLocalFSDirectory.close();
 
     // Col1 validation.
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(col1);
     validateIndexMap(col1, true, false);
-    validateForwardIndex(col1, null);
+    validateForwardIndex(col1, null, metadata.isSorted());
     // In column metadata, nothing should change.
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(col1);
     validateMetadataProperties(col1, metadata.hasDictionary(), metadata.getColumnMaxLength(), metadata.getCardinality(),
         metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(),
         metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(),
         metadata.isAutoGenerated(), metadata.getMinValue(), metadata.getMaxValue(), false);
 
     // Col2 validation.
+    metadata = existingSegmentMetadata.getColumnMetadataFor(col2);
     validateIndexMap(col2, true, false);
-    validateForwardIndex(col2, null);
+    validateForwardIndex(col2, null, metadata.isSorted());
     // In column metadata, nothing should change.
-    metadata = existingSegmentMetadata.getColumnMetadataFor(col2);
     validateMetadataProperties(col2, metadata.hasDictionary(), metadata.getColumnMaxLength(), metadata.getCardinality(),
         metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(),
         metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(),
@@ -1450,22 +1847,21 @@ public void testEnableForwardIndexInDictModeForMVForwardIndexDisabledColumnWithD
     // Remove from forward index list but keep the inverted index enabled
     String column = MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS
         .get(rand.nextInt(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(column);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(column);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
     segmentLocalFSDirectory.close();
 
     // Column validation.
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
     validateIndexMap(column, true, false);
-    validateForwardIndex(column, null);
+    validateForwardIndex(column, null, metadata.isSorted());
     // In column metadata, some values can change since MV columns with duplicates lose the duplicates on forward index
     // regeneration.
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
     validateMetadataProperties(column, metadata.hasDictionary(), metadata.getColumnMaxLength(),
         metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(),
         metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
@@ -1479,6 +1875,9 @@ public void testEnableForwardIndexInDictModeForSingleForwardIndexDisabledColumn(
     Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
     List<String> allForwardIndexDisabledColumns = new ArrayList<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     allForwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
     for (String column : allForwardIndexDisabledColumns) {
@@ -1493,18 +1892,17 @@ public void testEnableForwardIndexInDictModeForSingleForwardIndexDisabledColumn(
       indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
       ForwardIndexHandler fwdIndexHandler =
           new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-      fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+      fwdIndexHandler.updateIndices(writer);
       fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
       // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
       segmentLocalFSDirectory.close();
 
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
       validateIndexMap(column, true, false);
-      validateForwardIndex(column, null);
+      validateForwardIndex(column, null, metadata.isSorted());
 
       // In column metadata, nothing should change.
-      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
       validateMetadataProperties(column, metadata.hasDictionary(), metadata.getColumnMaxLength(),
           metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(),
           metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
@@ -1524,37 +1922,36 @@ public void testEnableForwardIndexInRawModeForMultipleForwardIndexDisabledColumn
 
     Random rand = new Random();
     String col1 = SV_FORWARD_INDEX_DISABLED_COLUMNS.get(rand.nextInt(SV_FORWARD_INDEX_DISABLED_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(col1);
-    indexLoadingConfig.getInvertedIndexColumns().remove(col1);
-    indexLoadingConfig.getNoDictionaryColumns().add(col1);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(col1);
+    indexLoadingConfig.removeInvertedIndexColumns(col1);
+    indexLoadingConfig.addNoDictionaryColumns(col1);
     String col2 = MV_FORWARD_INDEX_DISABLED_COLUMNS.get(rand.nextInt(MV_FORWARD_INDEX_DISABLED_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(col2);
-    indexLoadingConfig.getInvertedIndexColumns().remove(col2);
-    indexLoadingConfig.getNoDictionaryColumns().add(col2);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(col2);
+    indexLoadingConfig.removeInvertedIndexColumns(col2);
+    indexLoadingConfig.addNoDictionaryColumns(col2);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
     segmentLocalFSDirectory.close();
 
     // Col1 validation.
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(col1);
     validateIndexMap(col1, false, false);
-    validateForwardIndex(col1, FieldConfig.CompressionCodec.LZ4);
+    validateForwardIndex(col1, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
     // In column metadata, nothing should change.
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(col1);
     validateMetadataProperties(col1, false, 0, metadata.getCardinality(),
         metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(),
         metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(),
         metadata.isAutoGenerated(), metadata.getMinValue(), metadata.getMaxValue(), false);
 
     // Col2 validation.
+    metadata = existingSegmentMetadata.getColumnMetadataFor(col2);
     validateIndexMap(col2, false, false);
-    validateForwardIndex(col2, FieldConfig.CompressionCodec.LZ4);
+    validateForwardIndex(col2, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
     // In column metadata, nothing should change.
-    metadata = existingSegmentMetadata.getColumnMetadataFor(col2);
     validateMetadataProperties(col2, false, 0, metadata.getCardinality(),
         metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(),
         metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(),
@@ -1574,24 +1971,23 @@ public void testEnableForwardIndexInRawModeForMVForwardIndexDisabledColumnWithDu
     // Remove from forward index list but keep the inverted index enabled
     String column = MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS
         .get(rand.nextInt(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.size()));
-    indexLoadingConfig.getForwardIndexDisabledColumns().remove(column);
-    indexLoadingConfig.getInvertedIndexColumns().remove(column);
-    indexLoadingConfig.getNoDictionaryColumns().add(column);
+    indexLoadingConfig.removeForwardIndexDisabledColumns(column);
+    indexLoadingConfig.removeInvertedIndexColumns(column);
+    indexLoadingConfig.addNoDictionaryColumns(column);
 
     ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+    fwdIndexHandler.updateIndices(writer);
     fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
     // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
     segmentLocalFSDirectory.close();
 
     // Column validation.
+    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
     validateIndexMap(column, false, false);
-    validateForwardIndex(column, FieldConfig.CompressionCodec.LZ4);
+    validateForwardIndex(column, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
     // In column metadata, some values can change since MV columns with duplicates lose the duplicates on forward index
     // regeneration.
-    ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
     validateMetadataProperties(column, false, 0, metadata.getCardinality(),
         metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(), metadata.isSorted(),
         metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(), metadata.getTotalNumberOfEntries(),
@@ -1604,9 +2000,11 @@ public void testEnableForwardIndexInRawModeForSingleForwardIndexDisabledColumn()
     Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
     forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
     List<String> allForwardIndexDisabledColumns = new ArrayList<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
     allForwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
-    List<String> columnList = new ArrayList<>();
     for (String column : allForwardIndexDisabledColumns) {
       SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
       SegmentDirectory segmentLocalFSDirectory =
@@ -1616,23 +2014,25 @@ public void testEnableForwardIndexInRawModeForSingleForwardIndexDisabledColumn()
       IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
       forwardIndexDisabledColumns.remove(column);
       indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-      indexLoadingConfig.setInvertedIndexColumns(forwardIndexDisabledColumns);
-      columnList.add(column);
-      indexLoadingConfig.getNoDictionaryColumns().addAll(columnList);
+      Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+      invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+      invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+      indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+      indexLoadingConfig.addNoDictionaryColumns(column);
       ForwardIndexHandler fwdIndexHandler =
           new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
-      IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-      fwdIndexHandler.updateIndices(writer, indexCreatorProvider);
+      fwdIndexHandler.updateIndices(writer);
       fwdIndexHandler.postUpdateIndicesCleanup(writer);
 
       // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
       segmentLocalFSDirectory.close();
 
+      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
       validateIndexMap(column, false, false);
-      validateForwardIndex(column, FieldConfig.CompressionCodec.LZ4);
+      validateForwardIndex(column, FieldConfig.CompressionCodec.LZ4, metadata.isSorted());
 
       // In column metadata, nothing should change.
-      ColumnMetadata metadata = existingSegmentMetadata.getColumnMetadataFor(column);
       validateMetadataProperties(column, false, 0,
           metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(), metadata.getFieldType(),
           metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
@@ -1641,6 +2041,116 @@ public void testEnableForwardIndexInRawModeForSingleForwardIndexDisabledColumn()
     }
   }
 
+  @Test
+  public void testEnableForwardIndexForInvertedIndexDisabledColumn()
+      throws Exception {
+    Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+
+    SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
+    SegmentDirectory segmentLocalFSDirectory =
+        new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
+    SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
+
+    IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    forwardIndexDisabledColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+    Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+    invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+    indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+
+    validateIndexMap(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX, true, true);
+    validateIndexesForForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+
+    ForwardIndexHandler fwdIndexHandler =
+        new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    fwdIndexHandler.updateIndices(writer);
+    fwdIndexHandler.postUpdateIndicesCleanup(writer);
+
+    // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
+    segmentLocalFSDirectory.close();
+
+    // Validate nothing has changed
+    validateIndexMap(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX, true, true);
+    validateIndexesForForwardIndexDisabledColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+
+    // In column metadata, nothing should change.
+    ColumnMetadata metadata =
+        existingSegmentMetadata.getColumnMetadataFor(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    validateMetadataProperties(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX, metadata.hasDictionary(),
+        metadata.getColumnMaxLength(), metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(),
+        metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
+        metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(), metadata.getMinValue(),
+        metadata.getMaxValue(), false);
+  }
+
+  @Test
+  public void testEnableForwardIndexForDictionaryDisabledColumns()
+      throws Exception {
+    Set<String> forwardIndexDisabledColumns = new HashSet<>(SV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_COLUMNS);
+    forwardIndexDisabledColumns.addAll(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS);
+    forwardIndexDisabledColumns.addAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    forwardIndexDisabledColumns.add(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+
+    SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
+    SegmentDirectory segmentLocalFSDirectory =
+        new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
+    SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
+
+    IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+    forwardIndexDisabledColumns.remove(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    forwardIndexDisabledColumns.remove(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+    Set<String> invertedIndexColumns = new HashSet<>(forwardIndexDisabledColumns);
+    invertedIndexColumns.removeAll(FORWARD_INDEX_DISABLED_RAW_COLUMNS);
+    invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    invertedIndexColumns.remove(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITH_RANGE_INDEX);
+    indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+
+    validateIndexMap(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, false, true);
+    validateIndexesForForwardIndexDisabledColumns(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    validateIndexMap(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, false, true);
+    validateIndexesForForwardIndexDisabledColumns(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+
+    ForwardIndexHandler fwdIndexHandler =
+        new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
+    fwdIndexHandler.updateIndices(writer);
+    fwdIndexHandler.postUpdateIndicesCleanup(writer);
+
+    // Tear down before validation. Because columns.psf and index map cleanup happens at segmentDirectory.close()
+    segmentLocalFSDirectory.close();
+
+    // Validate nothing has changed
+    validateIndexMap(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, false, true);
+    validateIndexesForForwardIndexDisabledColumns(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    validateIndexMap(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER, false, true);
+    validateIndexesForForwardIndexDisabledColumns(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+
+    // In column metadata, nothing should change.
+    ColumnMetadata metadata =
+        existingSegmentMetadata.getColumnMetadataFor(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    validateMetadataProperties(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER, metadata.hasDictionary(),
+        metadata.getColumnMaxLength(), metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(),
+        metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
+        metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(), metadata.getMinValue(),
+        metadata.getMaxValue(), false);
+    metadata =
+        existingSegmentMetadata.getColumnMetadataFor(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER);
+    validateMetadataProperties(DIM_RAW_MV_FORWARD_INDEX_DISABLED_INTEGER, metadata.hasDictionary(),
+        metadata.getColumnMaxLength(), metadata.getCardinality(), metadata.getTotalDocs(), metadata.getDataType(),
+        metadata.getFieldType(), metadata.isSorted(), metadata.isSingleValue(), metadata.getMaxNumberOfMultiValues(),
+        metadata.getTotalNumberOfEntries(), metadata.isAutoGenerated(), metadata.getMinValue(),
+        metadata.getMaxValue(), false);
+  }
+
   @Test
   public void testAddOtherIndexForForwardIndexDisabledColumn()
       throws Exception {
@@ -1658,11 +2168,10 @@ public void testAddOtherIndexForForwardIndexDisabledColumn()
           .get(rand.nextInt(MV_FORWARD_INDEX_DISABLED_DUPLICATES_COLUMNS.size()));
     } while (!column.equals(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_STRING)
         && !column.equals(DIM_MV_FORWARD_INDEX_DISABLED_DUPLICATES_BYTES));
-    indexLoadingConfig.getRangeIndexColumns().add(column);
+    indexLoadingConfig.addRangeIndexColumns(column);
 
     RangeIndexHandler rangeIndexHandler = new RangeIndexHandler(segmentLocalFSDirectory, indexLoadingConfig);
-    IndexCreatorProvider indexCreatorProvider = IndexingOverrides.getIndexCreatorProvider();
-    rangeIndexHandler.updateIndices(writer, indexCreatorProvider);
+    rangeIndexHandler.updateIndices(writer);
 
     // Validate forward index exists before calling post cleanup
     validateIndexMap(column, true, false);
@@ -1697,6 +2206,85 @@ public void testAddOtherIndexForForwardIndexDisabledColumn()
     assertNotEquals(metadata.getTotalNumberOfEntries(), columnMetadata.getTotalNumberOfEntries());
   }
 
+  @Test
+  public void testAddOtherIndexWhenForwardIndexDisabledAndInvertedIndexOrDictionaryDisabled()
+      throws Exception {
+    SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
+    SegmentDirectory segmentLocalFSDirectory =
+        new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
+    SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
+    IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
+
+    // Add a forward index and inverted index disabled column to the range index list
+    indexLoadingConfig.addRangeIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    RangeIndexHandler rangeIndexHandler = new RangeIndexHandler(segmentLocalFSDirectory, indexLoadingConfig);
+    try {
+      rangeIndexHandler.updateIndices(writer);
+      Assert.fail("Creating the range index on forward index and inverted index disabled column should fail");
+    } catch (IllegalStateException e) {
+      assertEquals(e.getMessage(), "Forward index disabled column "
+          + "DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX must have an inverted index to regenerate the "
+          + "forward index. Regeneration of the forward index is required to create new indexes as well. Please "
+          + "refresh or back-fill the forward index");
+    }
+
+    // Remove inverted index disabled column from range index list and add a raw column instead
+    indexLoadingConfig.removeRangeIndexColumns(DIM_SV_FORWARD_INDEX_DISABLED_INTEGER_WITHOUT_INV_IDX);
+    indexLoadingConfig.addRangeIndexColumns(DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER);
+    rangeIndexHandler = new RangeIndexHandler(segmentLocalFSDirectory, indexLoadingConfig);
+    try {
+      rangeIndexHandler.updateIndices(writer);
+      Assert.fail("Creating the range index on forward index and inverted index disabled column should fail");
+    } catch (IllegalStateException e) {
+      assertEquals(e.getMessage(), "Forward index disabled column "
+          + "DIM_RAW_SV_FORWARD_INDEX_DISABLED_INTEGER must have a dictionary to regenerate the forward index. "
+          + "Regeneration of the forward index is required to create new indexes as well. Please refresh or back-fill "
+          + "the forward index");
+    }
+  }
+
+  /**
+   * Tests to verify various combinations of inputs to test dictionary override optimization.
+   */
+  @Test
+  public void testDictionaryOverride() {
+    FieldSpec fieldSpec = new MetricFieldSpec();
+    fieldSpec.setName("test");
+    fieldSpec.setDataType(FieldSpec.DataType.DOUBLE);
+    IndexType index1 = Mockito.mock(IndexType.class);
+    Mockito.when(index1.getId()).thenReturn("index1");
+    IndexConfig indexConf = new IndexConfig(true);
+    FieldIndexConfigs fieldIndexConfigs = new FieldIndexConfigs.Builder()
+        .add(index1, indexConf)
+        .build();
+    // No need to disable dictionary
+    boolean result = DictionaryIndexType.ignoreDictionaryOverride(false, true,
+        2, fieldSpec,
+        fieldIndexConfigs, 5, 20);
+    Assert.assertEquals(result, true);
+
+    // Set a higher noDictionarySizeRatioThreshold
+    result = DictionaryIndexType.ignoreDictionaryOverride(false, true,
+        5, fieldSpec,
+        fieldIndexConfigs, 5, 20);
+    Assert.assertEquals(result, false);
+
+    // optimizeDictionary and optimizeDictionaryForMetrics both turned on
+    result = DictionaryIndexType.ignoreDictionaryOverride(true, true,
+        5, fieldSpec,
+        fieldIndexConfigs, 5, 20);
+    Assert.assertEquals(result, false);
+
+    // Don't ignore for Json. We want to disable dictionary for json.
+    fieldSpec = new DimensionFieldSpec();
+    fieldSpec.setName("test");
+    fieldSpec.setDataType(FieldSpec.DataType.JSON);
+    result = DictionaryIndexType.ignoreDictionaryOverride(true, true,
+        5, fieldSpec,
+        fieldIndexConfigs, 5, 20);
+    Assert.assertEquals(result, true);
+  }
+
   private void validateIndexesForForwardIndexDisabledColumns(String columnName)
       throws IOException {
     // Setup
@@ -1706,18 +2294,22 @@ private void validateIndexesForForwardIndexDisabledColumns(String columnName)
     SegmentDirectory.Writer writer = segmentLocalFSDirectory.createWriter();
     ColumnMetadata columnMetadata = existingSegmentMetadata.getColumnMetadataFor(columnName);
 
-    assertTrue(writer.hasIndexFor(columnName, ColumnIndexType.DICTIONARY));
+    if (columnMetadata.hasDictionary()) {
+      assertTrue(writer.hasIndexFor(columnName, StandardIndexes.dictionary()));
+      Dictionary dictionary = DictionaryIndexType.read(writer, columnMetadata);
+      assertEquals(columnMetadata.getCardinality(), dictionary.length());
+    } else {
+      assertFalse(writer.hasIndexFor(columnName, StandardIndexes.dictionary()));
+    }
     if (columnMetadata.isSorted()) {
-      assertTrue(writer.hasIndexFor(columnName, ColumnIndexType.FORWARD_INDEX));
+      assertTrue(writer.hasIndexFor(columnName, StandardIndexes.forward()));
     } else {
-      assertFalse(writer.hasIndexFor(columnName, ColumnIndexType.FORWARD_INDEX));
+      assertFalse(writer.hasIndexFor(columnName, StandardIndexes.forward()));
     }
-
-    Dictionary dictionary = LoaderUtils.getDictionary(writer, columnMetadata);
-    assertEquals(columnMetadata.getCardinality(), dictionary.length());
   }
 
-  private void validateForwardIndex(String columnName, @Nullable FieldConfig.CompressionCodec expectedCompressionType)
+  private void validateForwardIndex(String columnName, @Nullable FieldConfig.CompressionCodec expectedCompressionType,
+      boolean isSorted)
       throws IOException {
     // Setup
     SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
@@ -1728,23 +2320,23 @@ private void validateForwardIndex(String columnName, @Nullable FieldConfig.Compr
     boolean isSingleValue = columnMetadata.isSingleValue();
 
     if (expectedCompressionType == null) {
-      assertTrue(writer.hasIndexFor(columnName, ColumnIndexType.DICTIONARY));
+      assertTrue(writer.hasIndexFor(columnName, StandardIndexes.dictionary()));
     } else {
-      assertFalse(writer.hasIndexFor(columnName, ColumnIndexType.DICTIONARY));
+      assertFalse(writer.hasIndexFor(columnName, StandardIndexes.dictionary()));
     }
-    assertTrue(writer.hasIndexFor(columnName, ColumnIndexType.FORWARD_INDEX));
+    assertTrue(writer.hasIndexFor(columnName, StandardIndexes.forward()));
 
     // Check Compression type in header
-    ForwardIndexReader fwdIndexReader = LoaderUtils.getForwardIndexReader(writer, columnMetadata);
+    ForwardIndexReader fwdIndexReader = ForwardIndexType.read(writer, columnMetadata);
     ChunkCompressionType fwdIndexCompressionType = fwdIndexReader.getCompressionType();
     if (expectedCompressionType != null) {
       assertEquals(fwdIndexCompressionType.name(), expectedCompressionType.name());
     }
 
-    try (ForwardIndexReader forwardIndexReader = LoaderUtils.getForwardIndexReader(writer, columnMetadata)) {
+    try (ForwardIndexReader forwardIndexReader = ForwardIndexType.read(writer, columnMetadata)) {
       Dictionary dictionary = null;
       if (columnMetadata.hasDictionary()) {
-        dictionary = LoaderUtils.getDictionary(writer, columnMetadata);
+        dictionary = DictionaryIndexType.read(writer, columnMetadata);
       }
       PinotSegmentColumnReader columnReader = new PinotSegmentColumnReader(forwardIndexReader, dictionary, null,
           columnMetadata.getMaxNumberOfMultiValues());
@@ -1770,7 +2362,8 @@ private void validateForwardIndex(String columnName, @Nullable FieldConfig.Compr
             }
             case INT: {
               if (isSingleValue) {
-                assertEquals((int) val, 1001, columnName + " " + rowIdx + " " + expectedCompressionType);
+                int expectedVal = isSorted ? rowIdx : 1001;
+                assertEquals((int) val, expectedVal, columnName + " " + rowIdx + " " + expectedCompressionType);
               } else {
                 Object[] values = (Object[]) val;
                 int length = values.length;
@@ -1782,7 +2375,8 @@ private void validateForwardIndex(String columnName, @Nullable FieldConfig.Compr
             }
             case LONG: {
               if (isSingleValue) {
-                assertEquals((long) val, 1001L, columnName + " " + rowIdx + " " + expectedCompressionType);
+                long expectedVal = isSorted ? rowIdx : 1001L;
+                assertEquals((long) val, expectedVal, columnName + " " + rowIdx + " " + expectedCompressionType);
               } else {
                 Object[] values = (Object[]) val;
                 int length = values.length;
@@ -1886,7 +2480,7 @@ private void validateForwardIndex(String columnName, @Nullable FieldConfig.Compr
     }
   }
 
-  private void testIndexExists(String columnName, ColumnIndexType indexType) throws Exception {
+  private void testIndexExists(String columnName, IndexType<?, ?, ?> indexType) throws Exception {
     SegmentMetadataImpl existingSegmentMetadata = new SegmentMetadataImpl(_segmentDirectory);
     SegmentDirectory segmentLocalFSDirectory =
         new SegmentLocalFSDirectory(_segmentDirectory, existingSegmentMetadata, ReadMode.mmap);
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfigTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfigTest.java
new file mode 100644
index 00000000000..aeadd3621f1
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfigTest.java
@@ -0,0 +1,154 @@
+/**
+ * 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.pinot.segment.local.segment.index.loader;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.spi.config.instance.InstanceDataManagerConfig;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.apache.pinot.spi.utils.builder.TableConfigBuilder;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+public class IndexLoadingConfigTest {
+  private static final String TABLE_NAME = "table01";
+
+  @Test
+  public void testCalculateIndexConfigsWithoutTierOverwrites()
+      throws IOException {
+    InstanceDataManagerConfig idmCfg = mock(InstanceDataManagerConfig.class);
+    when(idmCfg.getConfig()).thenReturn(new PinotConfiguration());
+    // Schema has two string columns: col1 and col2.
+    Schema schema =
+        new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).addSingleValueDimension("col1", FieldSpec.DataType.INT)
+            .addSingleValueDimension("col2", FieldSpec.DataType.STRING).build();
+    // On the default tier, both are dict-encoded. col1 has inverted index as set in `tableIndexConfig` and col2 has
+    // bloom filter as configured with `fieldConfigList`; and there is one ST index built with col1.
+    String col2CfgStr = "{"
+        + "  \"name\": \"col2\","
+        + "  \"indexes\": {"
+        + "    \"bloom\": {\"enabled\": \"true\"}"
+        + "  }"
+        + "}";
+    FieldConfig col2Cfg = JsonUtils.stringToObject(col2CfgStr, FieldConfig.class);
+    String stIdxCfgStr = "{"
+        + "  \"dimensionsSplitOrder\": [\"col1\"],"
+        + "  \"functionColumnPairs\": [\"MAX__col1\"],"
+        + "  \"maxLeafRecords\": 10"
+        + "}";
+    StarTreeIndexConfig stIdxCfg = JsonUtils.stringToObject(stIdxCfgStr, StarTreeIndexConfig.class);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setInvertedIndexColumns(Collections.singletonList("col1"))
+        .setStarTreeIndexConfigs(Collections.singletonList(stIdxCfg))
+        .setFieldConfigList(Collections.singletonList(col2Cfg)).build();
+    IndexLoadingConfig ilc = new IndexLoadingConfig(idmCfg, tableConfig, schema);
+    // Check index configs for default tier
+    assertEquals(ilc.getStarTreeIndexConfigs().size(), 1);
+    Map<String, FieldIndexConfigs> allFieldCfgs = ilc.getFieldIndexConfigByColName();
+    FieldIndexConfigs fieldCfgs = allFieldCfgs.get("col1");
+    assertTrue(fieldCfgs.getConfig(StandardIndexes.inverted()).isEnabled());
+    assertFalse(fieldCfgs.getConfig(StandardIndexes.bloomFilter()).isEnabled());
+    assertTrue(fieldCfgs.getConfig(StandardIndexes.dictionary()).isEnabled());
+    fieldCfgs = allFieldCfgs.get("col2");
+    assertFalse(fieldCfgs.getConfig(StandardIndexes.inverted()).isEnabled());
+    assertTrue(fieldCfgs.getConfig(StandardIndexes.bloomFilter()).isEnabled());
+    assertTrue(fieldCfgs.getConfig(StandardIndexes.dictionary()).isEnabled());
+  }
+
+  @Test
+  public void testCalculateIndexConfigsWithTierOverwrites()
+      throws IOException {
+    InstanceDataManagerConfig idmCfg = mock(InstanceDataManagerConfig.class);
+    when(idmCfg.getConfig()).thenReturn(new PinotConfiguration());
+    // Schema has two string columns: col1 and col2.
+    Schema schema =
+        new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).addSingleValueDimension("col1", FieldSpec.DataType.INT)
+            .addSingleValueDimension("col2", FieldSpec.DataType.STRING).build();
+    // On the default tier, both are dict-encoded. col1 has inverted index as set in `tableIndexConfig` and col2 has
+    // bloom filter as configured with `fieldConfigList`; and there is one ST index built with col1.
+    // On the coldTier, we overwrite col1 to use bloom filter only and col2 to use raw encoding w/o any index.
+    String col1CfgStr = "{"
+        + "  \"name\": \"col1\","
+        + "  \"indexes\": {"
+        + "    \"inverted\": {\"enabled\": \"true\"}"
+        + "  },"
+        + "  \"tierOverwrites\": {"
+        + "    \"coldTier\": {"
+        + "      \"indexes\": {"
+        + "        \"bloom\": {\"enabled\": \"true\"}"
+        + "      }"
+        + "    }"
+        + "  }"
+        + "}";
+    FieldConfig col1Cfg = JsonUtils.stringToObject(col1CfgStr, FieldConfig.class);
+    String col2CfgStr = "{"
+        + "  \"name\": \"col2\","
+        + "  \"indexes\": {"
+        + "    \"bloom\": {\"enabled\": \"true\"}"
+        + "  },"
+        + "  \"tierOverwrites\": {"
+        + "    \"coldTier\": {"
+        + "      \"encodingType\": \"RAW\","
+        + "      \"indexes\": {}"
+        + "    }"
+        + "  }"
+        + "}";
+    FieldConfig col2Cfg = JsonUtils.stringToObject(col2CfgStr, FieldConfig.class);
+    String stIdxCfgStr = "{"
+        + "  \"dimensionsSplitOrder\": [\"col1\"],"
+        + "  \"functionColumnPairs\": [\"MAX__col1\"],"
+        + "  \"maxLeafRecords\": 10"
+        + "}";
+    StarTreeIndexConfig stIdxCfg = JsonUtils.stringToObject(stIdxCfgStr, StarTreeIndexConfig.class);
+    TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setStarTreeIndexConfigs(Collections.singletonList(stIdxCfg))
+        .setTierOverwrites(JsonUtils.stringToJsonNode("{\"coldTier\": {\"starTreeIndexConfigs\": []}}"))
+        .setFieldConfigList(Arrays.asList(col1Cfg, col2Cfg)).build();
+    IndexLoadingConfig ilc = new IndexLoadingConfig(idmCfg, tableConfig, schema);
+    ilc.setSegmentTier("coldTier");
+    // Check index configs for coldTier
+    assertEquals(ilc.getStarTreeIndexConfigs().size(), 0);
+    Map<String, FieldIndexConfigs> allFieldCfgs = ilc.getFieldIndexConfigByColName();
+    FieldIndexConfigs fieldCfgs = allFieldCfgs.get("col1");
+    assertFalse(fieldCfgs.getConfig(StandardIndexes.inverted()).isEnabled());
+    assertTrue(fieldCfgs.getConfig(StandardIndexes.bloomFilter()).isEnabled());
+    assertTrue(fieldCfgs.getConfig(StandardIndexes.dictionary()).isEnabled());
+    fieldCfgs = allFieldCfgs.get("col2");
+    assertFalse(fieldCfgs.getConfig(StandardIndexes.inverted()).isEnabled());
+    assertFalse(fieldCfgs.getConfig(StandardIndexes.bloomFilter()).isEnabled());
+    assertFalse(fieldCfgs.getConfig(StandardIndexes.dictionary()).isEnabled());
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/LoaderTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/LoaderTest.java
index 50b8489fbde..c9db1e31484 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/LoaderTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/LoaderTest.java
@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,19 +31,24 @@
 import org.apache.pinot.segment.local.segment.creator.SegmentTestUtils;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentCreationDriverFactory;
 import org.apache.pinot.segment.local.segment.index.converter.SegmentV1V2ToV3FormatConverter;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexConfigBuilder;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.FstIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoader;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.data.DimensionFieldSpec;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.MetricFieldSpec;
@@ -60,7 +64,6 @@
 import org.testng.collections.Lists;
 
 import static org.apache.pinot.segment.spi.V1Constants.Indexes.FST_INDEX_FILE_EXTENSION;
-import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
@@ -258,7 +261,8 @@ private void constructSegmentWithFSTIndex(SegmentVersion segmentVersion)
         SegmentTestUtils.getSegmentGeneratorConfigWithoutTimeColumn(_avroFile, INDEX_DIR, "testTable");
     SegmentIndexCreationDriver driver = SegmentCreationDriverFactory.get(null);
     List<String> fstIndexCreationColumns = Lists.newArrayList(FST_INDEX_COL_NAME);
-    segmentGeneratorConfig.setFSTIndexCreationColumns(fstIndexCreationColumns);
+    FstIndexConfig fstConfig = new FstIndexConfig(segmentGeneratorConfig.getFSTIndexType());
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.fst(), fstConfig, fstIndexCreationColumns);
     segmentGeneratorConfig.setSegmentVersion(segmentVersion);
     driver.init(segmentGeneratorConfig);
     driver.build();
@@ -290,7 +294,7 @@ public void testFSTIndexLoad()
         new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_pinotConfiguration).build());
     SegmentDirectory.Reader reader = segmentDir.createReader();
     Assert.assertNotNull(reader);
-    Assert.assertTrue(reader.hasIndexFor(FST_INDEX_COL_NAME, ColumnIndexType.FST_INDEX));
+    Assert.assertTrue(reader.hasIndexFor(FST_INDEX_COL_NAME, StandardIndexes.fst()));
     indexSegment.destroy();
 
     // CASE 2: set the segment version to load in IndexLoadingConfig as V3
@@ -307,7 +311,7 @@ public void testFSTIndexLoad()
         new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_pinotConfiguration).build());
     reader = segmentDir.createReader();
     Assert.assertNotNull(reader);
-    Assert.assertTrue(reader.hasIndexFor(FST_INDEX_COL_NAME, ColumnIndexType.FST_INDEX));
+    Assert.assertTrue(reader.hasIndexFor(FST_INDEX_COL_NAME, StandardIndexes.fst()));
     indexSegment.destroy();
 
     // Test for scenarios by creating on-disk segment in V1 and then loading
@@ -382,7 +386,7 @@ public void testFSTIndexLoad()
         new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_pinotConfiguration).build());
     reader = segmentDir.createReader();
     Assert.assertNotNull(reader);
-    Assert.assertTrue(reader.hasIndexFor(FST_INDEX_COL_NAME, ColumnIndexType.FST_INDEX));
+    Assert.assertTrue(reader.hasIndexFor(FST_INDEX_COL_NAME, StandardIndexes.fst()));
     indexSegment.destroy();
   }
 
@@ -392,11 +396,10 @@ private void constructSegmentWithForwardIndexDisabled(SegmentVersion segmentVers
     SegmentGeneratorConfig segmentGeneratorConfig =
         SegmentTestUtils.getSegmentGeneratorConfigWithoutTimeColumn(_avroFile, INDEX_DIR, "testTable");
     SegmentIndexCreationDriver driver = SegmentCreationDriverFactory.get(null);
-    List<String> forwardIndexDisabledColumns = new ArrayList<>();
-    forwardIndexDisabledColumns.add(NO_FORWARD_INDEX_COL_NAME);
-    segmentGeneratorConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.forward(), ForwardIndexConfig.DISABLED,
+        NO_FORWARD_INDEX_COL_NAME);
     if (enableInvertedIndex) {
-      segmentGeneratorConfig.createInvertedIndexForColumn(NO_FORWARD_INDEX_COL_NAME);
+      segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, NO_FORWARD_INDEX_COL_NAME);
     }
     segmentGeneratorConfig.setSegmentVersion(segmentVersion);
     driver.init(segmentGeneratorConfig);
@@ -523,20 +526,18 @@ public void testForwardIndexDisabledLoad()
     indexSegment.destroy();
 
     // Test scenarios to create a column with no forward index but without enabling inverted index for it
+    // This should still work as the original constraint to enforce that a column has a dictionary + inverted index
+    // has been relaxed.
     try {
       constructSegmentWithForwardIndexDisabled(SegmentVersion.v3, false);
-      Assert.fail("Disabling forward index without enabling inverted index is not allowed!");
     } catch (IllegalStateException e) {
-      assertEquals(String.format("Cannot disable forward index for column %s without inverted index enabled",
-          NO_FORWARD_INDEX_COL_NAME), e.getMessage());
+      Assert.fail("Disabling forward index without enabling inverted index is allowed now");
     }
 
     try {
       constructSegmentWithForwardIndexDisabled(SegmentVersion.v1, false);
-      Assert.fail("Disabling forward index without enabling inverted index is not allowed!");
     } catch (IllegalStateException e) {
-      assertEquals(String.format("Cannot disable forward index for column %s without inverted index enabled",
-          NO_FORWARD_INDEX_COL_NAME), e.getMessage());
+      Assert.fail("Disabling forward index without enabling inverted index is allowed now");
     }
   }
 
@@ -546,9 +547,9 @@ private void constructSegmentWithTextIndex(SegmentVersion segmentVersion)
     SegmentGeneratorConfig segmentGeneratorConfig =
         SegmentTestUtils.getSegmentGeneratorConfigWithoutTimeColumn(_avroFile, INDEX_DIR, "testTable");
     SegmentIndexCreationDriver driver = SegmentCreationDriverFactory.get(null);
-    List<String> textIndexCreationColumns = Lists.newArrayList(TEXT_INDEX_COL_NAME);
     List<String> rawIndexCreationColumns = Lists.newArrayList(TEXT_INDEX_COL_NAME);
-    segmentGeneratorConfig.setTextIndexCreationColumns(textIndexCreationColumns);
+    TextIndexConfig textIndexConfig = new TextIndexConfigBuilder(segmentGeneratorConfig.getFSTIndexType()).build();
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.text(), textIndexConfig, TEXT_INDEX_COL_NAME);
     segmentGeneratorConfig.setRawIndexCreationColumns(rawIndexCreationColumns);
     segmentGeneratorConfig.setSegmentVersion(segmentVersion);
     driver.init(segmentGeneratorConfig);
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java
index ea3f8f3579d..0bdaefca0aa 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.segment.local.segment.index.loader;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import java.io.File;
 import java.net.URL;
 import java.nio.file.Files;
@@ -39,7 +40,9 @@
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentCreationDriverFactory;
 import org.apache.pinot.segment.local.segment.creator.impl.SegmentIndexCreationDriverImpl;
 import org.apache.pinot.segment.local.segment.index.converter.SegmentV1V2ToV3FormatConverter;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexType;
 import org.apache.pinot.segment.local.segment.index.loader.columnminmaxvalue.ColumnMinMaxValueGeneratorMode;
+import org.apache.pinot.segment.local.segment.index.text.TextIndexConfigBuilder;
 import org.apache.pinot.segment.local.segment.readers.GenericRowRecordReader;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
@@ -47,16 +50,19 @@
 import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.TextIndexConfig;
 import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
 import org.apache.pinot.segment.spi.utils.SegmentMetadataUtils;
 import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.config.table.TableType;
@@ -173,7 +179,7 @@ public void setUp()
     // We specify two columns without inverted index ('column1', 'column13'), one non-existing column ('noSuchColumn')
     // and one column with existed inverted index ('column7').
     _indexLoadingConfig.setInvertedIndexColumns(
-        new HashSet<>(Arrays.asList(COLUMN1_NAME, COLUMN7_NAME, COLUMN13_NAME, NO_SUCH_COLUMN_NAME)));
+        Sets.newHashSet(COLUMN1_NAME, COLUMN7_NAME, COLUMN13_NAME, NO_SUCH_COLUMN_NAME));
 
     _indexLoadingConfig.setTableConfig(_tableConfig);
 
@@ -220,9 +226,8 @@ private IndexLoadingConfig getDefaultIndexLoadingConfig() {
     IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig();
 
     // Set RAW columns. Otherwise, they will end up being converted to dict columns (default) during segment reload.
-    indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
-    indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
-    indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW);
+    indexLoadingConfig.setNoDictionaryColumns(
+        Sets.newHashSet(EXISTING_STRING_COL_RAW, EXISTING_INT_COL_RAW_MV, EXISTING_INT_COL_RAW));
 
     indexLoadingConfig.setTableConfig(_tableConfig);
     return indexLoadingConfig;
@@ -242,21 +247,20 @@ private void constructV1Segment(List<String> invertedIndexCols, List<String> tex
     SegmentGeneratorConfig segmentGeneratorConfig =
         SegmentTestUtils.getSegmentGeneratorConfigWithSchema(_avroFile, INDEX_DIR, "testTable", _tableConfig, _schema);
     segmentGeneratorConfig.setRawIndexCreationColumns(rawCols);
-    segmentGeneratorConfig.setInvertedIndexCreationColumns(Collections.singletonList(COLUMN7_NAME));
+    segmentGeneratorConfig.setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, COLUMN7_NAME);
     if (invertedIndexCols.size() > 0) {
-      for (String col : invertedIndexCols) {
-        segmentGeneratorConfig.getInvertedIndexCreationColumns().add(col);
-      }
+      segmentGeneratorConfig.addInvertedIndexCreationColumns(invertedIndexCols);
     }
     if (textIndexCols.size() > 0) {
-      segmentGeneratorConfig.setTextIndexCreationColumns(textIndexCols);
+      TextIndexConfig textIndexConfig = new TextIndexConfigBuilder(segmentGeneratorConfig.getFSTIndexType()).build();
+      segmentGeneratorConfig.setIndexOn(StandardIndexes.text(), textIndexConfig, textIndexCols);
     }
     if (rangeIndexCols.size() > 0) {
       segmentGeneratorConfig.setRangeIndexCreationColumns(rangeIndexCols);
     }
     if (forwardIndexDisabledCols.size() > 0) {
       segmentGeneratorConfig.setForwardIndexDisabledColumns(forwardIndexDisabledCols);
-      segmentGeneratorConfig.getInvertedIndexCreationColumns().addAll(forwardIndexDisabledCols);
+      segmentGeneratorConfig.addInvertedIndexCreationColumns(forwardIndexDisabledCols);
     }
 
     SegmentIndexCreationDriver driver = SegmentCreationDriverFactory.get(null);
@@ -376,19 +380,19 @@ public void testSimpleEnableDictionarySV()
         Collections.emptyList());
     checkForwardIndexCreation(EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, ChunkCompressionType.LZ4,
         true, 0, DataType.STRING, 100000);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_INT_COL_RAW, 42242, 16, _schema, false, false, false, 0, true,
+    validateIndex(StandardIndexes.forward(), EXISTING_INT_COL_RAW, 42242, 16, _schema, false, false, false, 0, true,
         0, ChunkCompressionType.LZ4, false, DataType.INT, 100000);
 
     // Convert the segment to V3.
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
 
     // TEST 2: Enable dictionary on EXISTING_STRING_COL_RAW
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_RAW);
     checkForwardIndexCreation(EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, null, true, 0,
         DataType.STRING, 100000);
 
     // TEST 3: Enable dictionary on EXISTING_INT_COL_RAW
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW, 42242, 16, _schema, false, true, false, 0, null, true, 0,
         DataType.INT, 100000);
   }
@@ -398,7 +402,7 @@ public void testSimpleEnableDictionaryMV()
       throws Exception {
     // Add raw columns in indexingConfig so that the ForwardIndexHandler doesn't end up converting them to dictionary
     // enabled columns
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
 
     // TEST 1. Check running forwardIndexHandler on a V1 segment. No-op for all existing raw columns.
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
@@ -410,7 +414,7 @@ public void testSimpleEnableDictionaryMV()
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
 
     // TEST 2: Enable dictionary on EXISTING_STRING_COL_RAW
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0, null, false, 13,
         DataType.INT, 106688);
   }
@@ -420,22 +424,22 @@ public void testEnableDictAndOtherIndexesSV()
       throws Exception {
     // Add raw columns in indexingConfig so that the ForwardIndexHandler doesn't end up converting them to dictionary
     // enabled columns
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_RAW);
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
 
     // TEST 1: EXISTING_STRING_COL_RAW. Enable dictionary. Also add inverted index and text index. Reload code path
     // will create dictionary, inverted index and text index.
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getInvertedIndexColumns().add(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getTextIndexColumns().add(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addInvertedIndexColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addTextIndexColumns(EXISTING_STRING_COL_RAW);
     checkForwardIndexCreation(EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, null, true, 0,
         DataType.STRING, 100000);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, true,
+    validateIndex(StandardIndexes.inverted(), EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, true,
         0, null, false, DataType.STRING, 100000);
-    validateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, true, 0,
+    validateIndex(StandardIndexes.text(), EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, true, 0,
         null, false, DataType.STRING, 100000);
 
     // TEST 2: EXISTING_STRING_COL_RAW. Enable dictionary on a raw column that already has text index.
@@ -444,41 +448,41 @@ public void testEnableDictAndOtherIndexesSV()
     constructV1Segment(Collections.emptyList(), textIndexCols, Collections.emptyList(),
         Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
-    validateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, true, 0,
+    validateIndex(StandardIndexes.text(), EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, true, 0,
         null, false, DataType.STRING, 100000);
 
     // At this point, the segment has text index. Now, the reload path should create a dictionary.
     checkForwardIndexCreation(EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, null, true, 0,
         DataType.STRING, 100000);
-    validateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, true, 0,
+    validateIndex(StandardIndexes.text(), EXISTING_STRING_COL_RAW, 5, 3, _schema, false, true, false, 4, true, 0,
         null, false, DataType.STRING, 100000);
     // Add it back so that this column is not rewritten for the other tests below.
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_RAW);
 
     // TEST 3: EXISTING_INT_COL_RAW. Enable dictionary on a column that already has range index.
     List<String> rangeIndexCols = new ArrayList<>();
     rangeIndexCols.add(EXISTING_INT_COL_RAW);
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), rangeIndexCols, Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW, 42242, 16, _schema, false, false, false, 0, true,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW, 42242, 16, _schema, false, false, false, 0, true,
         0, ChunkCompressionType.LZ4, false, DataType.INT, 100000);
     long oldRangeIndexSize =
         new SegmentMetadataImpl(_indexDir).getColumnMetadataFor(EXISTING_INT_COL_RAW).getIndexSizeMap()
-            .get(ColumnIndexType.RANGE_INDEX);
+            .get(StandardIndexes.range());
     // At this point, the segment has range index. Now the reload path should create a dictionary and rewrite the
     // range index.
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.getRangeIndexColumns().add(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.addRangeIndexColumns(EXISTING_INT_COL_RAW);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW, 42242, 16, _schema, false, true, false, 0, null, true, 0,
         DataType.INT, 100000);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW, 42242, 16, _schema, false, true, false, 0, true, 0,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW, 42242, 16, _schema, false, true, false, 0, true, 0,
         null, false, DataType.INT, 100000);
     long newRangeIndexSize =
         new SegmentMetadataImpl(_indexDir).getColumnMetadataFor(EXISTING_INT_COL_RAW).getIndexSizeMap()
-            .get(ColumnIndexType.RANGE_INDEX);
+            .get(StandardIndexes.range());
     assertNotEquals(oldRangeIndexSize, newRangeIndexSize);
     // Add it back so that this column is not rewritten for the other tests below.
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW);
   }
 
   @Test
@@ -486,20 +490,20 @@ public void testEnableDictAndOtherIndexesMV()
       throws Exception {
     // Add raw columns in indexingConfig so that the ForwardIndexHandler doesn't end up converting them to dictionary
     // enabled columns
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
 
     // TEST 1: EXISTING_INT_COL_RAW_MV. Enable dictionary for an MV column. Also enable inverted index and range index.
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW_MV);
-    _indexLoadingConfig.getInvertedIndexColumns().add(EXISTING_INT_COL_RAW_MV);
-    _indexLoadingConfig.getRangeIndexColumns().add(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addInvertedIndexColumns(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addRangeIndexColumns(EXISTING_INT_COL_RAW_MV);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0, null, false, 13,
         DataType.INT, 106688);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
+    validateIndex(StandardIndexes.inverted(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
         false, 13, null, false, DataType.INT, 106688);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
         false, 13, null, false, DataType.INT, 106688);
 
     // TEST 2: EXISTING_INT_COL_RAW_MV. Enable dictionary for an MV column that already has range index.
@@ -507,16 +511,16 @@ public void testEnableDictAndOtherIndexesMV()
     rangeIndexCols.add(EXISTING_INT_COL_RAW_MV);
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), rangeIndexCols, Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0,
+    validateIndex(StandardIndexes.forward(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0,
         false, 13, ChunkCompressionType.LZ4, false, DataType.INT, 106688);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0,
         false, 13, ChunkCompressionType.LZ4, false, DataType.INT, 106688);
 
     // Enable dictionary.
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0, null, false, 13,
         DataType.INT, 106688);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
         false, 13, null, false, DataType.INT, 106688);
   }
 
@@ -528,19 +532,19 @@ public void testSimpleDisableDictionary()
         Collections.emptyList());
     checkForwardIndexCreation(EXISTING_STRING_COL_DICT, 9, 4, _schema, false, true, false, 26, null, true, 0,
         DataType.STRING, 100000);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, COLUMN10_NAME, 3960, 12, _schema, false, true, false, 0, true, 0, null,
+    validateIndex(StandardIndexes.forward(), COLUMN10_NAME, 3960, 12, _schema, false, true, false, 0, true, 0, null,
         false, DataType.INT, 100000);
 
     // Convert the segment to V3.
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
 
     // TEST 2: Disable dictionary for EXISTING_STRING_COL_DICT.
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_DICT);
     checkForwardIndexCreation(EXISTING_STRING_COL_DICT, 9, 4, _schema, false, false, false, 0, ChunkCompressionType.LZ4,
         true, 0, DataType.STRING, 100000);
 
     // TEST 3: Disable dictionary for COLUMN10_NAME
-    _indexLoadingConfig.getNoDictionaryColumns().add(COLUMN10_NAME);
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN10_NAME);
     checkForwardIndexCreation(COLUMN10_NAME, 3960, 12, _schema, false, false, false, 0, ChunkCompressionType.LZ4, true,
         0, DataType.INT, 100000);
   }
@@ -555,13 +559,13 @@ public void testDisableDictAndOtherIndexesSV()
 
     // TEST 1: Disable dictionary on a column that has inverted index. Should be a no-op and column should still have
     // a dictionary.
-    _indexLoadingConfig.getNoDictionaryColumns().add(COLUMN1_NAME);
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN1_NAME);
     checkForwardIndexCreation(COLUMN1_NAME, 51594, 16, _schema, false, true, false, 0, null, true, 0, DataType.INT,
         100000);
 
     // TEST 2: Disable dictionary. Also remove inverted index on column1.
-    _indexLoadingConfig.getNoDictionaryColumns().add(COLUMN1_NAME);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(COLUMN1_NAME);
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN1_NAME);
+    _indexLoadingConfig.removeInvertedIndexColumns(COLUMN1_NAME);
     checkForwardIndexCreation(COLUMN1_NAME, 51594, 16, _schema, false, false, false, 0, null, true, 0, DataType.INT,
         100000);
 
@@ -570,33 +574,33 @@ public void testDisableDictAndOtherIndexesSV()
     rangeIndexCols.add(COLUMN10_NAME);
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), rangeIndexCols, Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, COLUMN10_NAME, 3960, 12, _schema, false, true, false, 0, true, 0, null,
+    validateIndex(StandardIndexes.forward(), COLUMN10_NAME, 3960, 12, _schema, false, true, false, 0, true, 0, null,
         false, DataType.INT, 100000);
-    validateIndex(ColumnIndexType.RANGE_INDEX, COLUMN10_NAME, 3960, 12, _schema, false, true, false, 0, true, 0, null,
+    validateIndex(StandardIndexes.range(), COLUMN10_NAME, 3960, 12, _schema, false, true, false, 0, true, 0, null,
         false, DataType.INT, 100000);
     long oldRangeIndexSize = new SegmentMetadataImpl(_indexDir).getColumnMetadataFor(COLUMN10_NAME).getIndexSizeMap()
-        .get(ColumnIndexType.RANGE_INDEX);
+        .get(StandardIndexes.range());
 
 
-    _indexLoadingConfig.getNoDictionaryColumns().add(COLUMN10_NAME);
-    _indexLoadingConfig.getRangeIndexColumns().add(COLUMN10_NAME);
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN10_NAME);
+    _indexLoadingConfig.addRangeIndexColumns(COLUMN10_NAME);
     checkForwardIndexCreation(COLUMN10_NAME, 3960, 12, _schema, false, false, false, 0, ChunkCompressionType.LZ4, true,
         0, DataType.INT, 100000);
-    validateIndex(ColumnIndexType.RANGE_INDEX, COLUMN10_NAME, 3960, 12, _schema, false, false, false, 0, true, 0,
+    validateIndex(StandardIndexes.range(), COLUMN10_NAME, 3960, 12, _schema, false, false, false, 0, true, 0,
         ChunkCompressionType.LZ4, false, DataType.INT, 100000);
     long newRangeIndexSize = new SegmentMetadataImpl(_indexDir).getColumnMetadataFor(COLUMN10_NAME).getIndexSizeMap()
-        .get(ColumnIndexType.RANGE_INDEX);
+        .get(StandardIndexes.range());
     assertNotEquals(oldRangeIndexSize, newRangeIndexSize);
 
     // TEST4: Disable dictionary but add text index.
-    validateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4, _schema, false, true, false, 26, true,
+    validateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4, _schema, false, true, false, 26, true,
         0, null, false, DataType.STRING, 100000);
 
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getTextIndexColumns().add(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addTextIndexColumns(EXISTING_STRING_COL_DICT);
     checkForwardIndexCreation(EXISTING_STRING_COL_DICT, 9, 4, _schema, false, false, false, 0, ChunkCompressionType.LZ4,
         true, 0, DataType.STRING, 100000);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4, _schema, false, false, false, 0, true,
+    validateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4, _schema, false, false, false, 0, true,
         0, null, false, DataType.STRING, 100000);
   }
 
@@ -607,34 +611,34 @@ public void testDisableDictAndOtherIndexesMV()
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
 
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW_MV);
-    _indexLoadingConfig.getRangeIndexColumns().add(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addRangeIndexColumns(EXISTING_INT_COL_RAW_MV);
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0, null, false, 13,
         DataType.INT, 106688);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, true, false, 0,
         false, 13, null, false, DataType.INT, 106688);
 
     // TEST 1: Disable dictionary on a column where range index is already enabled.
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
     checkForwardIndexCreation(EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0, null, false, 13,
         DataType.INT, 106688);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW_MV, 18499, 15, _schema, false, false, false, 0,
         false, 13, null, false, DataType.INT, 106688);
 
     // TEST 2. Disable dictionary on a column where inverted index is enabled. Should be a no-op.
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, COLUMN7_NAME, 359, 9, _newColumnsSchemaWithForwardIndexDisabled, false,
+    validateIndex(StandardIndexes.forward(), COLUMN7_NAME, 359, 9, _newColumnsSchemaWithForwardIndexDisabled, false,
         true, false, 0, false, 24, null, false, DataType.INT, 134090);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, COLUMN7_NAME, 359, 9, _newColumnsSchemaWithForwardIndexDisabled,
+    validateIndex(StandardIndexes.inverted(), COLUMN7_NAME, 359, 9, _newColumnsSchemaWithForwardIndexDisabled,
         false, true, false, 0, false, 24, null, false, DataType.INT, 134090);
 
-    _indexLoadingConfig.getNoDictionaryColumns().add(COLUMN7_NAME);
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN7_NAME);
     checkForwardIndexCreation(COLUMN7_NAME, 359, 9, _schema, false, true, false, 0, null, false, 24, DataType.INT,
         134090);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, COLUMN7_NAME, 359, 9, _newColumnsSchemaWithForwardIndexDisabled,
+    validateIndex(StandardIndexes.inverted(), COLUMN7_NAME, 359, 9, _newColumnsSchemaWithForwardIndexDisabled,
         false, true, false, 0, false, 24, null, false, DataType.INT, 134090);
 
     // TEST 3: Disable dictionary and disable inverted index on column7.
@@ -642,8 +646,8 @@ public void testDisableDictAndOtherIndexesMV()
         Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
 
-    _indexLoadingConfig.getNoDictionaryColumns().add(COLUMN7_NAME);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(COLUMN7_NAME);
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN7_NAME);
+    _indexLoadingConfig.removeInvertedIndexColumns(COLUMN7_NAME);
     checkForwardIndexCreation(COLUMN7_NAME, 359, 9, _schema, false, false, false, 0, null, false, 24, DataType.INT,
         134090);
   }
@@ -655,7 +659,7 @@ public void testForwardIndexHandlerChangeCompression()
     ChunkCompressionType newCompressionType = ChunkCompressionType.ZSTANDARD;
     compressionConfigs.put(EXISTING_STRING_COL_RAW, newCompressionType);
     _indexLoadingConfig.setCompressionConfigs(compressionConfigs);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_RAW);
 
     // Test1: Rewriting forward index will be a no-op for v1 segments. Default LZ4 compressionType will be retained.
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
@@ -673,6 +677,7 @@ public void testForwardIndexHandlerChangeCompression()
     // Test3: Change compression on existing raw index column. Also add text index on same column. Check correctness.
     newCompressionType = ChunkCompressionType.SNAPPY;
     compressionConfigs.put(EXISTING_STRING_COL_RAW, newCompressionType);
+    _indexLoadingConfig.setCompressionConfigs(compressionConfigs);
     Set<String> textIndexColumns = new HashSet<>();
     textIndexColumns.add(EXISTING_STRING_COL_RAW);
     _indexLoadingConfig.setTextIndexColumns(textIndexColumns);
@@ -682,12 +687,13 @@ public void testForwardIndexHandlerChangeCompression()
     ColumnMetadata columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_RAW);
     assertNotNull(columnMetadata);
     checkTextIndexCreation(EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0);
-    validateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, true,
+    validateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, true,
         0, newCompressionType, false, DataType.STRING, 100000);
 
     // Test4: Change compression on RAW index column. Change another index on another column. Check correctness.
     newCompressionType = ChunkCompressionType.ZSTANDARD;
     compressionConfigs.put(EXISTING_STRING_COL_RAW, newCompressionType);
+    _indexLoadingConfig.setCompressionConfigs(compressionConfigs);
     Set<String> fstColumns = new HashSet<>();
     fstColumns.add(EXISTING_STRING_COL_DICT);
     _indexLoadingConfig.setFSTIndexColumns(fstColumns);
@@ -699,14 +705,14 @@ public void testForwardIndexHandlerChangeCompression()
     // Check FST index
     checkFSTIndexCreation(EXISTING_STRING_COL_DICT, 9, 4, _newColumnsSchemaWithFST, false, false, 26);
     // Check forward index.
-    validateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, true,
+    validateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3, _schema, false, false, false, 0, true,
         0, newCompressionType, false, DataType.STRING, 100000);
 
     // Test5: Change compressionType for an MV column
     newCompressionType = ChunkCompressionType.ZSTANDARD;
     compressionConfigs.put(EXISTING_INT_COL_RAW_MV, newCompressionType);
     _indexLoadingConfig.setCompressionConfigs(compressionConfigs);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
@@ -816,14 +822,14 @@ public void testEnableTextIndexOnExistingDictEncodedColumn()
   private void checkFSTIndexCreation(String column, int cardinality, int bits, Schema schema, boolean isAutoGenerated,
       boolean isSorted, int dictionaryElementSize)
       throws Exception {
-    createAndValidateIndex(ColumnIndexType.FST_INDEX, column, cardinality, bits, schema, isAutoGenerated, true,
+    createAndValidateIndex(StandardIndexes.fst(), column, cardinality, bits, schema, isAutoGenerated, true,
         isSorted, dictionaryElementSize, true, 0, null, false, DataType.STRING, 100000);
   }
 
   private void checkTextIndexCreation(String column, int cardinality, int bits, Schema schema, boolean isAutoGenerated,
       boolean hasDictionary, boolean isSorted, int dictionaryElementSize)
       throws Exception {
-    createAndValidateIndex(ColumnIndexType.TEXT_INDEX, column, cardinality, bits, schema, isAutoGenerated,
+    createAndValidateIndex(StandardIndexes.text(), column, cardinality, bits, schema, isAutoGenerated,
         hasDictionary, isSorted, dictionaryElementSize, true, 0, null, false, DataType.STRING, 100000);
   }
 
@@ -831,7 +837,7 @@ private void checkTextIndexCreation(String column, int cardinality, int bits, Sc
       boolean hasDictionary, boolean isSorted, int dictionaryElementSize, boolean isSingleValue,
       int maxNumberOfMultiValues)
       throws Exception {
-    createAndValidateIndex(ColumnIndexType.TEXT_INDEX, column, cardinality, bits, schema, isAutoGenerated,
+    createAndValidateIndex(StandardIndexes.text(), column, cardinality, bits, schema, isAutoGenerated,
         hasDictionary, isSorted, dictionaryElementSize, isSingleValue, maxNumberOfMultiValues, null, false,
         DataType.STRING, 100000);
   }
@@ -841,12 +847,12 @@ private void checkForwardIndexCreation(String column, int cardinality, int bits,
       ChunkCompressionType expectedCompressionType, boolean isSingleValue, int maxNumberOfMultiValues,
       DataType dataType, int totalNumberOfEntries)
       throws Exception {
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, column, cardinality, bits, schema, isAutoGenerated,
+    createAndValidateIndex(StandardIndexes.forward(), column, cardinality, bits, schema, isAutoGenerated,
         hasDictionary, isSorted, dictionaryElementSize, isSingleValue, maxNumberOfMultiValues, expectedCompressionType,
         false, dataType, totalNumberOfEntries);
   }
 
-  private void createAndValidateIndex(ColumnIndexType indexType, String column, int cardinality, int bits,
+  private void createAndValidateIndex(IndexType<?, ?, ?> indexType, String column, int cardinality, int bits,
       Schema schema, boolean isAutoGenerated, boolean hasDictionary, boolean isSorted, int dictionaryElementSize,
       boolean isSingleValued, int maxNumberOfMultiValues, ChunkCompressionType expectedCompressionType,
       boolean forwardIndexDisabled, DataType dataType, int totalNumberOfEntries)
@@ -863,7 +869,7 @@ private void createAndValidateIndex(ColumnIndexType indexType, String column, in
     }
   }
 
-  private void validateIndex(ColumnIndexType indexType, String column, int cardinality, int bits, Schema schema,
+  private void validateIndex(IndexType<?, ?, ?> indexType, String column, int cardinality, int bits, Schema schema,
       boolean isAutoGenerated, boolean hasDictionary, boolean isSorted, int dictionaryElementSize,
       boolean isSingleValued, int maxNumberOfMultiValues, ChunkCompressionType expectedCompressionType,
       boolean forwardIndexDisabled, DataType dataType, int totalNumberOfEntries)
@@ -885,21 +891,19 @@ private void validateIndex(ColumnIndexType indexType, String column, int cardina
         .load(_indexDir.toURI(),
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory1.createReader()) {
-      if (indexType != ColumnIndexType.FORWARD_INDEX || !forwardIndexDisabled) {
+      if (indexType != StandardIndexes.forward() || !forwardIndexDisabled) {
         assertTrue(reader.hasIndexFor(column, indexType));
       }
       if (isSingleValued && isSorted && forwardIndexDisabled) {
         // Disabling the forward index for sorted columns should be a no-op
-        assertTrue(reader.hasIndexFor(column, ColumnIndexType.FORWARD_INDEX));
-        assertFalse(reader.hasIndexFor(column, ColumnIndexType.INVERTED_INDEX));
+        assertTrue(reader.hasIndexFor(column, StandardIndexes.forward()));
+        assertFalse(reader.hasIndexFor(column, StandardIndexes.inverted()));
       } else if (forwardIndexDisabled) {
         if (segmentMetadata.getVersion() == SegmentVersion.v3 || isAutoGenerated) {
-          assertFalse(reader.hasIndexFor(column, ColumnIndexType.FORWARD_INDEX));
-          assertTrue(reader.hasIndexFor(column, ColumnIndexType.INVERTED_INDEX));
-          assertTrue(reader.hasIndexFor(column, ColumnIndexType.DICTIONARY));
+          assertFalse(reader.hasIndexFor(column, StandardIndexes.forward()));
         } else {
           // Updating dictionary or forward index for existing columns not supported for v1 segments yet
-          assertTrue(reader.hasIndexFor(column, ColumnIndexType.FORWARD_INDEX));
+          assertTrue(reader.hasIndexFor(column, StandardIndexes.forward()));
         }
       }
 
@@ -907,9 +911,9 @@ private void validateIndex(ColumnIndexType indexType, String column, int cardina
       if (expectedCompressionType != null) {
         assertFalse(hasDictionary);
 
-        try (ForwardIndexReader fwdIndexReader = LoaderUtils.getForwardIndexReader(reader, columnMetadata)) {
+        try (ForwardIndexReader fwdIndexReader = ForwardIndexType.read(reader, columnMetadata)) {
           ChunkCompressionType compressionType = fwdIndexReader.getCompressionType();
-          assertEquals(expectedCompressionType, compressionType, compressionType.toString());
+          assertEquals(compressionType, expectedCompressionType);
         }
 
         File inProgressFile = new File(_indexDir, column + ".fwd.inprogress");
@@ -932,14 +936,14 @@ private void validateIndex(ColumnIndexType indexType, String column, int cardina
       // if the text index is enabled on a new column with dictionary,
       // then dictionary should be created by the default column handler
       if (hasDictionary) {
-        assertTrue(reader.hasIndexFor(column, ColumnIndexType.DICTIONARY));
+        assertTrue(reader.hasIndexFor(column, StandardIndexes.dictionary()));
       } else {
-        assertFalse(reader.hasIndexFor(column, ColumnIndexType.DICTIONARY));
+        assertFalse(reader.hasIndexFor(column, StandardIndexes.dictionary()));
       }
     }
   }
 
-  private void validateIndexDoesNotExist(String column, ColumnIndexType indexType)
+  private void validateIndexDoesNotExist(String column, IndexType<?, ?, ?> indexType)
       throws Exception {
     try (SegmentDirectory segmentDirectory1 = SegmentDirectoryLoaderRegistry.getDefaultSegmentDirectoryLoader()
         .load(_indexDir.toURI(),
@@ -949,6 +953,16 @@ private void validateIndexDoesNotExist(String column, ColumnIndexType indexType)
     }
   }
 
+  private void validateIndexExists(String column, IndexType<?, ?, ?> indexType)
+      throws Exception {
+    try (SegmentDirectory segmentDirectory1 = SegmentDirectoryLoaderRegistry.getDefaultSegmentDirectoryLoader()
+        .load(_indexDir.toURI(),
+            new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
+        SegmentDirectory.Reader reader = segmentDirectory1.createReader()) {
+      assertTrue(reader.hasIndexFor(column, indexType));
+    }
+  }
+
   @Test
   public void testV1CreateInvertedIndices()
       throws Exception {
@@ -1026,8 +1040,8 @@ public void testV3CreateInvertedIndices()
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
       // 8 bytes overhead is for checking integrity of the segment.
-      addedLength += reader.getIndexFor(COLUMN1_NAME, ColumnIndexType.INVERTED_INDEX).size() + 8;
-      addedLength += reader.getIndexFor(COLUMN13_NAME, ColumnIndexType.INVERTED_INDEX).size() + 8;
+      addedLength += reader.getIndexFor(COLUMN1_NAME, StandardIndexes.inverted()).size() + 8;
+      addedLength += reader.getIndexFor(COLUMN13_NAME, StandardIndexes.inverted()).size() + 8;
     }
     FileTime newLastModifiedTime = Files.getLastModifiedTime(singleFileIndex.toPath());
     assertTrue(newLastModifiedTime.compareTo(lastModifiedTime) > 0);
@@ -1050,15 +1064,15 @@ private void checkInvertedIndexCreation(boolean reCreate)
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
       if (reCreate) {
-        assertTrue(reader.hasIndexFor(COLUMN1_NAME, ColumnIndexType.INVERTED_INDEX));
-        assertTrue(reader.hasIndexFor(COLUMN13_NAME, ColumnIndexType.INVERTED_INDEX));
-        assertTrue(reader.hasIndexFor(COLUMN7_NAME, ColumnIndexType.INVERTED_INDEX));
-        assertFalse(reader.hasIndexFor(NO_SUCH_COLUMN_NAME, ColumnIndexType.INVERTED_INDEX));
+        assertTrue(reader.hasIndexFor(COLUMN1_NAME, StandardIndexes.inverted()));
+        assertTrue(reader.hasIndexFor(COLUMN13_NAME, StandardIndexes.inverted()));
+        assertTrue(reader.hasIndexFor(COLUMN7_NAME, StandardIndexes.inverted()));
+        assertFalse(reader.hasIndexFor(NO_SUCH_COLUMN_NAME, StandardIndexes.inverted()));
       } else {
-        assertFalse(reader.hasIndexFor(COLUMN1_NAME, ColumnIndexType.INVERTED_INDEX));
-        assertTrue(reader.hasIndexFor(COLUMN7_NAME, ColumnIndexType.INVERTED_INDEX));
-        assertFalse(reader.hasIndexFor(COLUMN13_NAME, ColumnIndexType.INVERTED_INDEX));
-        assertFalse(reader.hasIndexFor(NO_SUCH_COLUMN_NAME, ColumnIndexType.INVERTED_INDEX));
+        assertFalse(reader.hasIndexFor(COLUMN1_NAME, StandardIndexes.inverted()));
+        assertTrue(reader.hasIndexFor(COLUMN7_NAME, StandardIndexes.inverted()));
+        assertFalse(reader.hasIndexFor(COLUMN13_NAME, StandardIndexes.inverted()));
+        assertFalse(reader.hasIndexFor(NO_SUCH_COLUMN_NAME, StandardIndexes.inverted()));
       }
     }
 
@@ -1073,10 +1087,10 @@ private void checkInvertedIndexCreation(boolean reCreate)
         .load(_indexDir.toURI(),
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
-      assertTrue(reader.hasIndexFor(COLUMN1_NAME, ColumnIndexType.INVERTED_INDEX));
-      assertTrue(reader.hasIndexFor(COLUMN13_NAME, ColumnIndexType.INVERTED_INDEX));
-      assertTrue(reader.hasIndexFor(COLUMN7_NAME, ColumnIndexType.INVERTED_INDEX));
-      assertFalse(reader.hasIndexFor(NO_SUCH_COLUMN_NAME, ColumnIndexType.INVERTED_INDEX));
+      assertTrue(reader.hasIndexFor(COLUMN1_NAME, StandardIndexes.inverted()));
+      assertTrue(reader.hasIndexFor(COLUMN13_NAME, StandardIndexes.inverted()));
+      assertTrue(reader.hasIndexFor(COLUMN7_NAME, StandardIndexes.inverted()));
+      assertFalse(reader.hasIndexFor(NO_SUCH_COLUMN_NAME, StandardIndexes.inverted()));
     }
   }
 
@@ -1089,7 +1103,7 @@ public void testV1UpdateDefaultColumns()
     ingestionConfig.setTransformConfigs(
         Collections.singletonList(new TransformConfig(NEW_INT_SV_DIMENSION_COLUMN_NAME, "plus(column1, 1)")));
     _tableConfig.setIngestionConfig(ingestionConfig);
-    _indexLoadingConfig.getInvertedIndexColumns().add(NEW_COLUMN_INVERTED_INDEX);
+    _indexLoadingConfig.addInvertedIndexColumns(NEW_COLUMN_INVERTED_INDEX);
     checkUpdateDefaultColumns();
 
     // Try to use the third schema and update default value again.
@@ -1136,7 +1150,7 @@ public void testV3UpdateDefaultColumns()
     ingestionConfig.setTransformConfigs(
         Collections.singletonList(new TransformConfig(NEW_INT_SV_DIMENSION_COLUMN_NAME, "plus(column1, 1)")));
     _tableConfig.setIngestionConfig(ingestionConfig);
-    _indexLoadingConfig.getInvertedIndexColumns().add(NEW_COLUMN_INVERTED_INDEX);
+    _indexLoadingConfig.addInvertedIndexColumns(NEW_COLUMN_INVERTED_INDEX);
     checkUpdateDefaultColumns();
 
     // Try to use the third schema and update default value again.
@@ -1248,27 +1262,27 @@ private void checkUpdateDefaultColumns()
         .load(_indexDir.toURI(),
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
-      assertTrue(reader.hasIndexFor(NEW_INT_METRIC_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_INT_METRIC_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-      assertTrue(reader.hasIndexFor(NEW_LONG_METRIC_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_LONG_METRIC_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-      assertTrue(reader.hasIndexFor(NEW_FLOAT_METRIC_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_FLOAT_METRIC_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-      assertTrue(reader.hasIndexFor(NEW_DOUBLE_METRIC_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_DOUBLE_METRIC_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-      assertTrue(reader.hasIndexFor(NEW_BOOLEAN_SV_DIMENSION_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_BOOLEAN_SV_DIMENSION_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-      assertTrue(reader.hasIndexFor(NEW_INT_SV_DIMENSION_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_INT_SV_DIMENSION_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-      assertTrue(reader.hasIndexFor(NEW_STRING_MV_DIMENSION_COLUMN_NAME, ColumnIndexType.DICTIONARY));
-      assertTrue(reader.hasIndexFor(NEW_STRING_MV_DIMENSION_COLUMN_NAME, ColumnIndexType.FORWARD_INDEX));
-
-      assertTrue(reader.hasIndexFor(NEW_INT_METRIC_COLUMN_NAME, ColumnIndexType.NULLVALUE_VECTOR));
-      assertTrue(reader.hasIndexFor(NEW_LONG_METRIC_COLUMN_NAME, ColumnIndexType.NULLVALUE_VECTOR));
-      assertTrue(reader.hasIndexFor(NEW_FLOAT_METRIC_COLUMN_NAME, ColumnIndexType.NULLVALUE_VECTOR));
-      assertTrue(reader.hasIndexFor(NEW_DOUBLE_METRIC_COLUMN_NAME, ColumnIndexType.NULLVALUE_VECTOR));
-      assertTrue(reader.hasIndexFor(NEW_BOOLEAN_SV_DIMENSION_COLUMN_NAME, ColumnIndexType.NULLVALUE_VECTOR));
-      assertTrue(reader.hasIndexFor(NEW_STRING_MV_DIMENSION_COLUMN_NAME, ColumnIndexType.NULLVALUE_VECTOR));
+      assertTrue(reader.hasIndexFor(NEW_INT_METRIC_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_INT_METRIC_COLUMN_NAME, StandardIndexes.forward()));
+      assertTrue(reader.hasIndexFor(NEW_LONG_METRIC_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_LONG_METRIC_COLUMN_NAME, StandardIndexes.forward()));
+      assertTrue(reader.hasIndexFor(NEW_FLOAT_METRIC_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_FLOAT_METRIC_COLUMN_NAME, StandardIndexes.forward()));
+      assertTrue(reader.hasIndexFor(NEW_DOUBLE_METRIC_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_DOUBLE_METRIC_COLUMN_NAME, StandardIndexes.forward()));
+      assertTrue(reader.hasIndexFor(NEW_BOOLEAN_SV_DIMENSION_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_BOOLEAN_SV_DIMENSION_COLUMN_NAME, StandardIndexes.forward()));
+      assertTrue(reader.hasIndexFor(NEW_INT_SV_DIMENSION_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_INT_SV_DIMENSION_COLUMN_NAME, StandardIndexes.forward()));
+      assertTrue(reader.hasIndexFor(NEW_STRING_MV_DIMENSION_COLUMN_NAME, StandardIndexes.dictionary()));
+      assertTrue(reader.hasIndexFor(NEW_STRING_MV_DIMENSION_COLUMN_NAME, StandardIndexes.forward()));
+
+      assertTrue(reader.hasIndexFor(NEW_INT_METRIC_COLUMN_NAME, StandardIndexes.nullValueVector()));
+      assertTrue(reader.hasIndexFor(NEW_LONG_METRIC_COLUMN_NAME, StandardIndexes.nullValueVector()));
+      assertTrue(reader.hasIndexFor(NEW_FLOAT_METRIC_COLUMN_NAME, StandardIndexes.nullValueVector()));
+      assertTrue(reader.hasIndexFor(NEW_DOUBLE_METRIC_COLUMN_NAME, StandardIndexes.nullValueVector()));
+      assertTrue(reader.hasIndexFor(NEW_BOOLEAN_SV_DIMENSION_COLUMN_NAME, StandardIndexes.nullValueVector()));
+      assertTrue(reader.hasIndexFor(NEW_STRING_MV_DIMENSION_COLUMN_NAME, StandardIndexes.nullValueVector()));
     }
 
     // Use the second schema and update default value again.
@@ -1485,11 +1499,11 @@ public void testV3CleanupIndices()
         .load(_indexDir.toURI(),
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
-      addedLength += reader.getIndexFor(strColumn, ColumnIndexType.INVERTED_INDEX).size() + 8;
-      addedLength += reader.getIndexFor(strColumn, ColumnIndexType.RANGE_INDEX).size() + 8;
-      addedLength += reader.getIndexFor(strColumn, ColumnIndexType.FST_INDEX).size() + 8;
-      addedLength += reader.getIndexFor(strColumn, ColumnIndexType.BLOOM_FILTER).size() + 8;
-      assertTrue(reader.hasIndexFor(strColumn, ColumnIndexType.TEXT_INDEX));
+      addedLength += reader.getIndexFor(strColumn, StandardIndexes.inverted()).size() + 8;
+      addedLength += reader.getIndexFor(strColumn, StandardIndexes.range()).size() + 8;
+      addedLength += reader.getIndexFor(strColumn, StandardIndexes.fst()).size() + 8;
+      addedLength += reader.getIndexFor(strColumn, StandardIndexes.bloomFilter()).size() + 8;
+      assertTrue(reader.hasIndexFor(strColumn, StandardIndexes.text()));
     }
     assertEquals(singleFileIndex.length(), initFileSize + addedLength);
 
@@ -1600,8 +1614,8 @@ public void testV3CleanupH3AndTextIndices()
         .load(_indexDir.toURI(),
             new SegmentDirectoryLoaderContext.Builder().setSegmentDirectoryConfigs(_configuration).build());
         SegmentDirectory.Reader reader = segmentDirectory.createReader()) {
-      addedLength += reader.getIndexFor("newH3Col", ColumnIndexType.H3_INDEX).size() + 8;
-      addedLength += reader.getIndexFor("newJsonCol", ColumnIndexType.JSON_INDEX).size() + 8;
+      addedLength += reader.getIndexFor("newH3Col", StandardIndexes.h3()).size() + 8;
+      addedLength += reader.getIndexFor("newJsonCol", StandardIndexes.json()).size() + 8;
     }
     assertEquals(singleFileIndex.length(), initFileSize + addedLength);
 
@@ -1711,9 +1725,8 @@ private void testIfNeedProcess()
     _tableConfig.setIndexingConfig(indexingConfig);
     IndexLoadingConfig configWithStarTreeIndex = new IndexLoadingConfig(null, _tableConfig);
     // Set RAW columns. Otherwise, they will end up being converted to dict columns (default) during segment reload.
-    configWithStarTreeIndex.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
-    configWithStarTreeIndex.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
-    configWithStarTreeIndex.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW);
+    configWithStarTreeIndex.addNoDictionaryColumns(EXISTING_STRING_COL_RAW, EXISTING_INT_COL_RAW_MV,
+        EXISTING_INT_COL_RAW);
     createConfigPrepFunctions().forEach((k, v) -> v.accept(configWithStarTreeIndex));
     try (SegmentDirectory segmentDirectory = SegmentDirectoryLoaderRegistry.getDefaultSegmentDirectoryLoader()
         .load(_indexDir.toURI(),
@@ -1742,13 +1755,8 @@ private void testIfNeedProcess()
     }
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
     segmentMetadata.getColumnMetadataMap().forEach((k, v) -> {
-      if (v.hasDictionary()) {
-        assertNotNull(v.getMinValue(), "checking column: " + k);
-        assertNotNull(v.getMaxValue(), "checking column: " + k);
-      } else {
-        assertNull(v.getMinValue(), "checking column: " + k);
-        assertNull(v.getMaxValue(), "checking column: " + k);
-      }
+      assertNotNull(v.getMinValue(), "checking column: " + k);
+      assertNotNull(v.getMaxValue(), "checking column: " + k);
     });
   }
 
@@ -1890,12 +1898,8 @@ private static Map<String, Consumer<IndexLoadingConfig>> createConfigPrepFunctio
   @Test
   public void testForwardIndexDisabledOnNewColumnsSV()
       throws Exception {
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    Set<String> invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
-    _indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV));
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     // Create a segment in V3, add a new column with no forward index enabled
     constructV3Segment();
@@ -1906,7 +1910,7 @@ public void testForwardIndexDisabledOnNewColumnsSV()
 
     // Forward index is always going to be present for default SV columns with forward index disabled. This is because
     // such default columns are going to be sorted and the forwardIndexDisabled flag is a no-op for sorted columns
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, true, DataType.STRING, 100000);
 
     // Create a segment in V1, add a column with no forward index enabled
@@ -1919,12 +1923,12 @@ public void testForwardIndexDisabledOnNewColumnsSV()
 
     // Forward index is always going to be present for default SV columns with forward index disabled. This is because
     // such default columns are going to be sorted and the forwardIndexDisabled flag is a no-op for sorted columns
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, true, DataType.STRING, 100000);
 
     // Add the column to the no dictionary column list
     Set<String> existingNoDictionaryColumns = _indexLoadingConfig.getNoDictionaryColumns();
-    _indexLoadingConfig.setNoDictionaryColumns(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setNoDictionaryColumns(_indexLoadingConfig.getForwardIndexDisabledColumns());
 
     // Create a segment in V3, add a new column with no forward index enabled
     constructV3Segment();
@@ -1933,15 +1937,11 @@ public void testForwardIndexDisabledOnNewColumnsSV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Forward index cannot be disabled for dictionary disabled columns!");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Dictionary disabled column: newForwardIndexDisabledColumnSV cannot disable the "
-          + "forward index");
-    }
+    // Forward index is always going to be present for default SV columns with forward index disabled. This is because
+    // such default columns are going to be sorted and the forwardIndexDisabled flag is a no-op for sorted columns
+    // Even raw columns are created with dictionary and forward index
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING, 100000);
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
@@ -1950,15 +1950,11 @@ public void testForwardIndexDisabledOnNewColumnsSV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Forward index cannot be disabled for dictionary disabled columns!");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Dictionary disabled column: newForwardIndexDisabledColumnSV cannot disable the "
-          + "forward index");
-    }
+    // Forward index is always going to be present for default SV columns with forward index disabled. This is because
+    // such default columns are going to be sorted and the forwardIndexDisabled flag is a no-op for sorted columns
+    // Even raw columns are created with dictionary and forward index
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING, 100000);
 
     // Reset the no dictionary columns
     _indexLoadingConfig.setNoDictionaryColumns(existingNoDictionaryColumns);
@@ -1976,7 +1972,7 @@ public void testForwardIndexDisabledOnNewColumnsSV()
 
     // Column should be sorted and should be created successfully since for SV columns the forwardIndexDisabled flag
     // is a no-op
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX,
+    createAndValidateIndex(StandardIndexes.forward(),
         NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1, _newColumnsSchemaWithForwardIndexDisabled, true, true, true,
         4, true, 0, null, false, DataType.STRING, 100000);
 
@@ -1989,15 +1985,14 @@ public void testForwardIndexDisabledOnNewColumnsSV()
 
     // Column should be sorted and should be created successfully since for SV columns the forwardIndexDisabled flag
     // is a no-op
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING, 100000);
 
     // Reset the sorted column list
     _indexLoadingConfig.setSortedColumn(existingSortedColumns.isEmpty() ? null : existingSortedColumns.get(0));
 
     // Remove the column from the inverted index column list and validate that it fails
-    invertedIndexColumns.removeAll(forwardIndexDisabledColumns);
-    _indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+    _indexLoadingConfig.setInvertedIndexColumns(new HashSet<>());
 
     // Create a segment in V3, add a new column with no forward index enabled
     constructV3Segment();
@@ -2006,15 +2001,9 @@ public void testForwardIndexDisabledOnNewColumnsSV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Forward index cannot be disabled without enabling the inverted index!");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Inverted index must be enabled for forward index disabled column: "
-          + "newForwardIndexDisabledColumnSV");
-    }
+    // Disabling inverted index should be fine for disabling the forward index
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING, 100000);
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
@@ -2023,15 +2012,10 @@ public void testForwardIndexDisabledOnNewColumnsSV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Should not be able to disable forward index without inverted index for column");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Inverted index must be enabled for forward index disabled column: "
-          + "newForwardIndexDisabledColumnSV");
-    }
+    // Disabling inverted index should be fine for disabling the forward index
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_SV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, true, 4, true, 0, null, false, DataType.STRING,
+        100000);
 
     _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
   }
@@ -2042,12 +2026,8 @@ public void testForwardIndexDisabledOnNewColumnsSV()
   @Test
   public void testForwardIndexDisabledOnNewColumnsMV()
       throws Exception {
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    Set<String> invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
-    _indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV));
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     // Create a segment in V3, add a new column with no forward index enabled
     constructV3Segment();
@@ -2057,9 +2037,9 @@ public void testForwardIndexDisabledOnNewColumnsMV()
     assertNull(columnMetadata);
 
     // Validate that the forward index doesn't exist and that inverted index does exist
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING, 100000);
-    createAndValidateIndex(ColumnIndexType.INVERTED_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+    createAndValidateIndex(StandardIndexes.inverted(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING, 100000);
 
     // Create a segment in V1, add a column with no forward index enabled
@@ -2071,14 +2051,16 @@ public void testForwardIndexDisabledOnNewColumnsMV()
     assertNull(columnMetadata);
 
     // Validate that the forward index doesn't exist and that inverted index does exist
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING, 100000);
-    createAndValidateIndex(ColumnIndexType.INVERTED_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+    createAndValidateIndex(StandardIndexes.inverted(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
         _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING, 100000);
 
     // Add the column to the no dictionary column list
-    Set<String> existingNoDictionaryColumns = _indexLoadingConfig.getNoDictionaryColumns();
-    _indexLoadingConfig.setNoDictionaryColumns(forwardIndexDisabledColumns);
+    Set<String> existingNoDictionaryColumns = new HashSet<>(_indexLoadingConfig.getNoDictionaryColumns());
+    _indexLoadingConfig.addNoDictionaryColumns(_indexLoadingConfig.getForwardIndexDisabledColumns());
+    // Disable the inverted index and validate that disabling the forward index goes through
+    _indexLoadingConfig.removeInvertedIndexColumns(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV);
 
     // Create a segment in V3, add a new column with no forward index enabled
     constructV3Segment();
@@ -2087,15 +2069,14 @@ public void testForwardIndexDisabledOnNewColumnsMV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Should not be able to disable forward index for raw column");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Dictionary disabled column: newForwardIndexDisabledColumnMV cannot disable the "
-          + "forward index");
-    }
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, false, false, 0, false, 1, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
+    validateIndexDoesNotExist(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.dictionary());
+
+    // Re-enable the inverted index
+    _indexLoadingConfig.addInvertedIndexColumns(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV);
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
@@ -2104,22 +2085,21 @@ public void testForwardIndexDisabledOnNewColumnsMV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Should not be able to disable forward index for raw column");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Dictionary disabled column: newForwardIndexDisabledColumnMV cannot disable the "
-          + "forward index");
-    }
+    // For V1 segments reload doesn't support modifying the forward index yet. Since for MV columns we create a
+    // dictionary and inverted index in the default column handler, the forward index should indeed be disabled
+    // but we should still have the dictionary and inverted index.
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING,
+        100000);
+    validateIndexExists(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
+    validateIndexExists(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.dictionary());
 
     // Reset the no dictionary columns
     _indexLoadingConfig.setNoDictionaryColumns(existingNoDictionaryColumns);
+    _indexLoadingConfig.removeNoDictionaryColumns(_indexLoadingConfig.getForwardIndexDisabledColumns());
 
     // Remove the column from the inverted index column list and validate that it fails
-    invertedIndexColumns.removeAll(forwardIndexDisabledColumns);
-    _indexLoadingConfig.setInvertedIndexColumns(invertedIndexColumns);
+    _indexLoadingConfig.setInvertedIndexColumns(new HashSet<>());
 
     // Create a segment in V3, add a new column with no forward index enabled
     constructV3Segment();
@@ -2128,15 +2108,11 @@ public void testForwardIndexDisabledOnNewColumnsMV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Should not be able to disable forward index for raw column");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Inverted index must be enabled for forward index disabled column: "
-          + "newForwardIndexDisabledColumnMV");
-    }
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
+    validateIndexExists(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.dictionary());
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
@@ -2145,15 +2121,11 @@ public void testForwardIndexDisabledOnNewColumnsMV()
     // should be null since column does not exist in the schema
     assertNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
-          _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, false, DataType.STRING,
-          100000);
-      Assert.fail("Should not be able to disable forward index for raw column");
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Inverted index must be enabled for forward index disabled column: "
-          + "newForwardIndexDisabledColumnMV");
-    }
+    createAndValidateIndex(StandardIndexes.forward(), NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, 1, 1,
+        _newColumnsSchemaWithForwardIndexDisabled, true, true, false, 4, false, 1, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
+    validateIndexExists(NEWLY_ADDED_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.dictionary());
 
     _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
   }
@@ -2165,73 +2137,64 @@ public void testForwardIndexDisabledOnNewColumnsMV()
   @Test
   public void testForwardIndexDisabledOnExistingColumnDictEncoded()
       throws Exception {
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    Set<String> invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.addForwardIndexDisabledColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV3Segment();
     SegmentMetadataImpl segmentMetadata = new SegmentMetadataImpl(_indexDir);
     ColumnMetadata columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_DICT);
     assertNotNull(columnMetadata);
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.emptyList());
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
 
     // Add the column to the noDictionaryColumns list
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_DICT);
+    // Also remove the column from the inverted index list and try again
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_STRING_COL_DICT);
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
     columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_DICT);
     assertNotNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
-          _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
-          100000);
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Must enable dictionary to disable the forward index for column: column5");
-    }
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
+        _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, StandardIndexes.inverted());
+    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, StandardIndexes.dictionary());
 
     // Reset the noDictionaryColumns list
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_DICT);
 
     // Remove te column from the inverted index list
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_STRING_COL_DICT);
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
     columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_DICT);
     assertNotNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
-          _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
-          100000);
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Must enable inverted index to disable the forward index for column: column5");
-    }
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
+        _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, StandardIndexes.inverted());
+    validateIndexExists(EXISTING_STRING_COL_DICT, StandardIndexes.dictionary());
 
     // Reset the inverted index list
-    _indexLoadingConfig.getInvertedIndexColumns().add(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addInvertedIndexColumns(EXISTING_STRING_COL_DICT);
 
     // Test updating two columns to be forward index disabled, one being a MV column
-    forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_STRING_COL_DICT);
-    forwardIndexDisabledColumns.add(COLUMN7_NAME);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_STRING_COL_DICT, COLUMN7_NAME));
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
@@ -2240,23 +2203,23 @@ public void testForwardIndexDisabledOnExistingColumnDictEncoded()
     ColumnMetadata columnMetadata2 = segmentMetadata.getColumnMetadataFor(COLUMN7_NAME);
     assertNotNull(columnMetadata2);
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, COLUMN7_NAME, 359, 9,
+    validateIndexExists(EXISTING_STRING_COL_DICT, StandardIndexes.inverted());
+    validateIndexExists(EXISTING_STRING_COL_DICT, StandardIndexes.dictionary());
+    createAndValidateIndex(StandardIndexes.forward(), COLUMN7_NAME, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, true, DataType.INT,
         134090);
+    validateIndexExists(COLUMN7_NAME, StandardIndexes.inverted());
+    validateIndexExists(COLUMN7_NAME, StandardIndexes.dictionary());
 
     // Add another index on the column which has forward index disabled
-    forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_STRING_COL_DICT);
-    forwardIndexDisabledColumns.add(COLUMN1_NAME);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getTextIndexColumns().add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getFSTIndexColumns().add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getRangeIndexColumns().add(COLUMN1_NAME);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_STRING_COL_DICT, COLUMN1_NAME));
+    _indexLoadingConfig.addTextIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addFSTIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addRangeIndexColumn(COLUMN1_NAME);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
@@ -2265,26 +2228,57 @@ public void testForwardIndexDisabledOnExistingColumnDictEncoded()
     columnMetadata2 = segmentMetadata.getColumnMetadataFor(COLUMN1_NAME);
     assertNotNull(columnMetadata2);
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.text(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.FST_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.fst(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, COLUMN1_NAME, 51594, 16,
+    validateIndexExists(EXISTING_STRING_COL_DICT, StandardIndexes.inverted());
+    validateIndexExists(EXISTING_STRING_COL_DICT, StandardIndexes.dictionary());
+    createAndValidateIndex(StandardIndexes.forward(), COLUMN1_NAME, 51594, 16,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.RANGE_INDEX, COLUMN1_NAME, 51594, 16,
+    createAndValidateIndex(StandardIndexes.range(), COLUMN1_NAME, 51594, 16,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
+    validateIndexExists(COLUMN1_NAME, StandardIndexes.inverted());
+    validateIndexExists(COLUMN1_NAME, StandardIndexes.dictionary());
+
+    // Reset indexLoadingConfig to remove the EXISTING_STRING_COL_DICT column from additional index lists
+    _indexLoadingConfig.removeTextIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeFSTIndexColumns(EXISTING_STRING_COL_DICT);
+
+    // Remove COLUMN1_NAME from the dictionary list and inverted index column list while leaving it on the range list
+    // Test reload fails since dictionary is being disabled for a forward index disabled column and range index has
+    // to be changed.
+    _indexLoadingConfig.addNoDictionaryColumns(COLUMN1_NAME);
+    _indexLoadingConfig.removeInvertedIndexColumns(COLUMN1_NAME);
+
+    constructV3Segment();
+    segmentMetadata = new SegmentMetadataImpl(_indexDir);
+    columnMetadata = segmentMetadata.getColumnMetadataFor(COLUMN1_NAME);
+    assertNotNull(columnMetadata);
+
+    try {
+      createAndValidateIndex(StandardIndexes.forward(), COLUMN1_NAME, 51594, 16,
+          _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, null, true, DataType.INT,
+          100000);
+      Assert.fail("Should fail since we are disabling dictionary for forward index disabled column with range index");
+    } catch (IllegalStateException e) {
+      assertEquals(e.getMessage(), "Must disable range (enabled) index to disable the dictionary and forward "
+          + "index for column: column1 or refresh / back-fill the forward index");
+    }
 
     // Reset indexLoadingConfig to remove the column from additional index lists
-    _indexLoadingConfig.getTextIndexColumns().remove(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getFSTIndexColumns().remove(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getRangeIndexColumns().remove(COLUMN1_NAME);
+    // TODO: This is wrong! If this test fail, the state will be incorrect
+    //  and it may produce false errors in other tests!
+    _indexLoadingConfig.removeRangeIndexColumns(COLUMN1_NAME);
+    _indexLoadingConfig.removeNoDictionaryColumns(COLUMN1_NAME);
+    _indexLoadingConfig.addInvertedIndexColumns(COLUMN1_NAME);
   }
 
   /**
@@ -2294,19 +2288,16 @@ public void testForwardIndexDisabledOnExistingColumnDictEncoded()
   @Test
   public void testForwardIndexDisabledOnExistingColumnRaw()
       throws Exception {
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_RAW);
-    Set<String> invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_STRING_COL_RAW));
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV3Segment();
     SegmentMetadataImpl segmentMetadata = new SegmentMetadataImpl(_indexDir);
     ColumnMetadata columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_RAW);
     assertNotNull(columnMetadata);
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 4, true, 0, null, true, DataType.STRING,
         100000);
 
@@ -2314,12 +2305,12 @@ public void testForwardIndexDisabledOnExistingColumnRaw()
         Collections.emptyList());
 
     // No dictionary is created nor is the forward index disabled since this is a v1 type segment
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, null, true, DataType.STRING,
         100000);
 
     // Add the column back to the noDictionaryColumns list
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_RAW);
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
@@ -2327,44 +2318,50 @@ public void testForwardIndexDisabledOnExistingColumnRaw()
     assertNotNull(columnMetadata);
 
     try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+      createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
           _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, null, true, DataType.STRING,
           100000);
     } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Must enable dictionary to disable the forward index for column: column4");
+      assertEquals(e.getMessage(), "Must disable inverted index (enabled) and FST (disabled) index to disable "
+          + "the dictionary and forward index for column: column4");
     }
 
-    // Reset the noDictionaryColumns list
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_RAW);
+    // Also remove the column from the inverted index list and validate that now it works
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_STRING_COL_RAW);
 
-    // Remove te column from the inverted index list
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_STRING_COL_RAW);
+    constructV3Segment();
+    segmentMetadata = new SegmentMetadataImpl(_indexDir);
+    columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_RAW);
+    assertNotNull(columnMetadata);
+
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
+        _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(EXISTING_STRING_COL_RAW, StandardIndexes.inverted());
+    validateIndexDoesNotExist(EXISTING_STRING_COL_RAW, StandardIndexes.dictionary());
+
+    // Reset just the noDictionaryColumns list and keep the column off the inverted index list
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_RAW);
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
     columnMetadata = segmentMetadata.getColumnMetadataFor(EXISTING_STRING_COL_RAW);
     assertNotNull(columnMetadata);
 
-    try {
-      createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
-          _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, null, true, DataType.STRING,
-          100000);
-    } catch (IllegalStateException e) {
-      assertEquals(e.getMessage(), "Must enable inverted index to disable the forward index for column: column4");
-    }
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
+        _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 4, true, 0, null, true, DataType.STRING,
+        100000);
+    validateIndexDoesNotExist(EXISTING_STRING_COL_RAW, StandardIndexes.inverted());
+    validateIndexExists(EXISTING_STRING_COL_RAW, StandardIndexes.dictionary());
 
     // Reset the inverted index list
-    _indexLoadingConfig.getInvertedIndexColumns().add(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addInvertedIndexColumns(EXISTING_STRING_COL_RAW);
 
     // Test updating two columns to be forward index disabled, one being a MV column
-    forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_STRING_COL_RAW);
-    forwardIndexDisabledColumns.add(EXISTING_INT_COL_RAW_MV);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW_MV);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(
+        Sets.newHashSet(EXISTING_STRING_COL_RAW, EXISTING_INT_COL_RAW_MV));
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_RAW, EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
@@ -2373,25 +2370,21 @@ public void testForwardIndexDisabledOnExistingColumnRaw()
     ColumnMetadata columnMetadata2 = segmentMetadata.getColumnMetadataFor(EXISTING_INT_COL_RAW_MV);
     assertNotNull(columnMetadata2);
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 4, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_INT_COL_RAW_MV, 18499, 15,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_INT_COL_RAW_MV, 18499, 15,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 13, null, true, DataType.INT,
         106688);
 
     // Add another index on the column which has forward index disabled
-    forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_STRING_COL_RAW);
-    forwardIndexDisabledColumns.add(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getTextIndexColumns().add(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getFSTIndexColumns().add(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getRangeIndexColumns().add(EXISTING_INT_COL_RAW);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_STRING_COL_RAW, EXISTING_INT_COL_RAW));
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addTextIndexColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addFSTIndexColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addRangeIndexColumn(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV3Segment();
     segmentMetadata = new SegmentMetadataImpl(_indexDir);
@@ -2400,31 +2393,31 @@ public void testForwardIndexDisabledOnExistingColumnRaw()
     columnMetadata2 = segmentMetadata.getColumnMetadataFor(EXISTING_INT_COL_RAW);
     assertNotNull(columnMetadata2);
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_RAW, 5, 3,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 4, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+    createAndValidateIndex(StandardIndexes.text(), EXISTING_STRING_COL_RAW, 5, 3,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 4, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.FST_INDEX, EXISTING_STRING_COL_RAW, 5, 3,
+    createAndValidateIndex(StandardIndexes.fst(), EXISTING_STRING_COL_RAW, 5, 3,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 4, true, 0, null, true, DataType.STRING,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_INT_COL_RAW, 42242, 16,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_INT_COL_RAW, 42242, 16,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW, 42242, 16,
+    createAndValidateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW, 42242, 16,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
 
     // Reset indexLoadingConfig to remove the column from additional index lists
-    _indexLoadingConfig.getTextIndexColumns().remove(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getFSTIndexColumns().remove(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getRangeIndexColumns().remove(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.removeTextIndexColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.removeFSTIndexColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.removeRangeIndexColumns(EXISTING_INT_COL_RAW);
 
     // Add back columns to noDictionaryColumns list
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_STRING_COL_RAW);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW_MV);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_STRING_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW_MV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW);
 
     // EXISTING_INT_COL_RAW: Disable forward index and enable dictionary and inverted index on a column that already
     // has range index.
@@ -2432,26 +2425,24 @@ public void testForwardIndexDisabledOnExistingColumnRaw()
     rangeIndexCols.add(EXISTING_INT_COL_RAW);
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), rangeIndexCols, Collections.emptyList());
     new SegmentV1V2ToV3FormatConverter().convert(_indexDir);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW, 42242, 16, _schema, false, false, false, 0, true,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW, 42242, 16, _schema, false, false, false, 0, true,
         0, ChunkCompressionType.LZ4, false, DataType.INT, 100000);
 
     // At this point, the segment has range index. Now the reload path should disable the forward index create a
     // dictionary and inverted index and rewrite the range index.
-    forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.getRangeIndexColumns().add(EXISTING_INT_COL_RAW);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.addRangeIndexColumn(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_INT_COL_RAW));
 
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_INT_COL_RAW, 42242, 16,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_INT_COL_RAW, 42242, 16,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_INT_COL_RAW, 42242, 16,
+    validateIndex(StandardIndexes.range(), EXISTING_INT_COL_RAW, 42242, 16,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
 
     // Add it back so that this column is not rewritten for the other tests below.
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_INT_COL_RAW);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_INT_COL_RAW);
   }
 
   /**
@@ -2461,11 +2452,8 @@ public void testForwardIndexDisabledOnExistingColumnRaw()
   @Test
   public void testForwardIndexEnabledWithDictOnExistingForwardIndexDisabledColumn()
       throws Exception {
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    Set<String> invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV));
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.singletonList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV));
@@ -2475,31 +2463,27 @@ public void testForwardIndexEnabledWithDictOnExistingForwardIndexDisabledColumn(
     assertNotNull(columnMetadata);
 
     // Forward index should be disabled for column10
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
 
     // At this point, the segment has forward index disabled for column10. Enable the forward index and invoke reload
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
 
     // Forward index should be enabled for column10 along with inverted index and dictionary
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.inverted(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
 
     // Enable the forward index but disable the inverted index
-    forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV));
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.singletonList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV));
@@ -2509,31 +2493,28 @@ public void testForwardIndexEnabledWithDictOnExistingForwardIndexDisabledColumn(
     assertNotNull(columnMetadata);
 
     // Forward index should be disabled for column10
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
 
     // At this point, the segment has forward index disabled for column10. Enable the forward index and invoke reload.
     // Disable the inverted index and ensure it gets removed.
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
 
     // Forward index should be enabled for column10 dictionary. Inverted index should be disabled.
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.INVERTED_INDEX);
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.inverted());
 
     // Enable the forward index for two columns at once, one being a MV column
-    forwardIndexDisabledColumns = new HashSet<>(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
         EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
@@ -2545,44 +2526,41 @@ public void testForwardIndexEnabledWithDictOnExistingForwardIndexDisabledColumn(
     assertNotNull(columnMetadata2);
 
     // Forward index should be disabled for column10 and column7
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, true, DataType.INT,
         134090);
 
     // At this point, the segment has forward index disabled for column10 and column7. Enable the forward index and
     // invoke reload.
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
 
     // Forward index should be enabled for column10 and column7 along with inverted index and dictionary
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.inverted(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndex(StandardIndexes.inverted(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
 
     //  Enable the forward index for multiple columns at once and enable other indexes
-    forwardIndexDisabledColumns = new HashSet<>(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
         EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT));
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, EXISTING_FORWARD_INDEX_DISABLED_COL_MV,
@@ -2597,72 +2575,71 @@ public void testForwardIndexEnabledWithDictOnExistingForwardIndexDisabledColumn(
     assertNotNull(columnMetadata3);
 
     // Forward index should be disabled for column10 and column7
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, true, DataType.INT,
         134090);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
 
     // At this point, the segment has forward index disabled for column10, column5 and column7. Enable the forward
     // index and invoke reload.
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getRangeIndexColumns().addAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.getTextIndexColumns().add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getFSTIndexColumns().add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
+    _indexLoadingConfig.addRangeIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.addTextIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addFSTIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
 
     // Forward index should be enabled for column10 and column7 along with inverted index and dictionary
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.inverted(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndex(StandardIndexes.range(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, false, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, ColumnIndexType.INVERTED_INDEX);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
+    validateIndex(StandardIndexes.range(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, false, DataType.STRING,
         100000);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_STRING_COL_DICT, 9, 4,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, false, DataType.STRING,
         100000);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    validateIndex(StandardIndexes.inverted(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, false, DataType.STRING,
         100000);
-    validateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    validateIndex(StandardIndexes.text(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, false, DataType.STRING,
         100000);
-    validateIndex(ColumnIndexType.FST_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    validateIndex(StandardIndexes.fst(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, false, DataType.STRING,
         100000);
 
     // Reset the indexLoadingConfig
-    _indexLoadingConfig.getRangeIndexColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.getTextIndexColumns().remove(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getFSTIndexColumns().remove(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getInvertedIndexColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_STRING_COL_DICT));
+    _indexLoadingConfig.removeRangeIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.removeTextIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeFSTIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_STRING_COL_DICT);
   }
 
   /**
@@ -2672,11 +2649,8 @@ public void testForwardIndexEnabledWithDictOnExistingForwardIndexDisabledColumn(
   @Test
   public void testForwardIndexEnabledWithRawOnExistingForwardIndexDisabledColumn()
       throws Exception {
-    Set<String> forwardIndexDisabledColumns = new HashSet<>();
-    forwardIndexDisabledColumns.add(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    Set<String> invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV));
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Collections.singletonList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV));
@@ -2686,33 +2660,30 @@ public void testForwardIndexEnabledWithRawOnExistingForwardIndexDisabledColumn()
     assertNotNull(columnMetadata);
 
     // Forward index should be disabled for column10
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
 
     // At this point, the segment has forward index disabled for column10. Enable the forward index, disable the
     // dictionary and inverted index
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
 
     // Forward index should be enabled for column10. Dictionary and inverted index shouldn't be present.
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.INT, 100000);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.INVERTED_INDEX);
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.inverted());
 
     // Reset indexLoadingConfig
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
 
     // Enable the forward index for two columns at once, one being a MV column
-    forwardIndexDisabledColumns = new HashSet<>(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
         EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
@@ -2724,44 +2695,41 @@ public void testForwardIndexEnabledWithRawOnExistingForwardIndexDisabledColumn()
     assertNotNull(columnMetadata2);
 
     // Forward index should be disabled for column10 and column7
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, true, DataType.INT,
         134090);
 
     // At this point, the segment has forward index disabled for column10 and column7. Enable the forward index and
     // invoke reload.
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getInvertedIndexColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.getNoDictionaryColumns().addAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
 
     // Forward index should be enabled for column10 and column7. No dictionary or inverted index should exist.
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.INT, 100000);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.INVERTED_INDEX);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.inverted());
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, false, 24, ChunkCompressionType.LZ4, false,
         DataType.INT, 134090);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, ColumnIndexType.INVERTED_INDEX);
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
 
     // Reset indexLoadingConfig
-    _indexLoadingConfig.getNoDictionaryColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
 
     // Enable the forward index for two columns at once, one as raw another as dictionary enabled
-    forwardIndexDisabledColumns = new HashSet<>(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
         EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
@@ -2773,46 +2741,43 @@ public void testForwardIndexEnabledWithRawOnExistingForwardIndexDisabledColumn()
     assertNotNull(columnMetadata2);
 
     // Forward index should be disabled for column10 and column7
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, true, DataType.INT,
         134090);
 
     // At this point, the segment has forward index disabled for column10 and column7. Enable the forward index and
     // invoke reload.
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.getNoDictionaryColumns().add(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
 
     // Forward index should be enabled for column10 and column7. No dictionary or inverted index should exist.
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.INT, 100000);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.INVERTED_INDEX);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.inverted());
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    validateIndex(ColumnIndexType.DICTIONARY, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndex(StandardIndexes.dictionary(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
-    validateIndex(ColumnIndexType.INVERTED_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndex(StandardIndexes.inverted(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, false, DataType.INT,
         134090);
 
     // Reset indexLoadingConfig
-    _indexLoadingConfig.getNoDictionaryColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
-    _indexLoadingConfig.getInvertedIndexColumns().remove(EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV);
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
 
     //  Enable the forward index for multiple columns at once and enable other indexes
-    forwardIndexDisabledColumns = new HashSet<>(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+    _indexLoadingConfig.setForwardIndexDisabledColumns(Sets.newHashSet(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
         EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT));
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    invertedIndexColumns = _indexLoadingConfig.getInvertedIndexColumns();
-    invertedIndexColumns.addAll(forwardIndexDisabledColumns);
+    _indexLoadingConfig.getForwardIndexDisabledColumns().forEach(c -> _indexLoadingConfig.addInvertedIndexColumns(c));
 
     constructV1Segment(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
         Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, EXISTING_FORWARD_INDEX_DISABLED_COL_MV,
@@ -2827,59 +2792,58 @@ public void testForwardIndexEnabledWithRawOnExistingForwardIndexDisabledColumn()
     assertNotNull(columnMetadata3);
 
     // Forward index should be disabled for column10 and column7
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, true, 0, null, true, DataType.INT,
         100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 0, false, 24, null, true, DataType.INT,
         134090);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, true, false, 26, true, 0, null, true, DataType.STRING,
         100000);
 
     // At this point, the segment has forward index disabled for column10, column5 and column7. Enable the forward
     // index and invoke reload.
-    forwardIndexDisabledColumns = new HashSet<>();
-    _indexLoadingConfig.setForwardIndexDisabledColumns(forwardIndexDisabledColumns);
-    _indexLoadingConfig.getRangeIndexColumns().addAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.getTextIndexColumns().add(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getInvertedIndexColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT));
-    _indexLoadingConfig.getNoDictionaryColumns().addAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT));
+    _indexLoadingConfig.setForwardIndexDisabledColumns(new HashSet<>());
+    _indexLoadingConfig.addRangeIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.addTextIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeInvertedIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.addNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT);
 
     // Forward index should be enabled for column10 and column7. Dictionary and inverted index should not exist
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.INT, 100000);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, ColumnIndexType.INVERTED_INDEX);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_SV, StandardIndexes.inverted());
+    validateIndex(StandardIndexes.range(), EXISTING_FORWARD_INDEX_DISABLED_COL_SV, 3960, 12,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.INT, 100000);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, false, 24, ChunkCompressionType.LZ4, false,
         DataType.INT, 134090);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, ColumnIndexType.INVERTED_INDEX);
-    validateIndex(ColumnIndexType.RANGE_INDEX, EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_FORWARD_INDEX_DISABLED_COL_MV, StandardIndexes.inverted());
+    validateIndex(StandardIndexes.range(), EXISTING_FORWARD_INDEX_DISABLED_COL_MV, 359, 9,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, false, 24, ChunkCompressionType.LZ4, false,
         DataType.INT, 134090);
-    createAndValidateIndex(ColumnIndexType.FORWARD_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    createAndValidateIndex(StandardIndexes.forward(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.STRING, 100000);
-    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, ColumnIndexType.DICTIONARY);
-    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, ColumnIndexType.INVERTED_INDEX);
-    validateIndex(ColumnIndexType.TEXT_INDEX, EXISTING_STRING_COL_DICT, 9, 4,
+    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, StandardIndexes.dictionary());
+    validateIndexDoesNotExist(EXISTING_STRING_COL_DICT, StandardIndexes.inverted());
+    validateIndex(StandardIndexes.text(), EXISTING_STRING_COL_DICT, 9, 4,
         _newColumnsSchemaWithForwardIndexDisabled, false, false, false, 0, true, 0, ChunkCompressionType.LZ4, false,
         DataType.STRING, 100000);
 
     // Reset the indexLoadingConfig
-    _indexLoadingConfig.getRangeIndexColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV));
-    _indexLoadingConfig.getTextIndexColumns().remove(EXISTING_STRING_COL_DICT);
-    _indexLoadingConfig.getNoDictionaryColumns().removeAll(Arrays.asList(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
-        EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT));
+    _indexLoadingConfig.removeRangeIndexColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV);
+    _indexLoadingConfig.removeTextIndexColumns(EXISTING_STRING_COL_DICT);
+    _indexLoadingConfig.removeNoDictionaryColumns(EXISTING_FORWARD_INDEX_DISABLED_COL_SV,
+        EXISTING_FORWARD_INDEX_DISABLED_COL_MV, EXISTING_STRING_COL_DICT);
   }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/ColumnIndexDirectoryTestHelper.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/ColumnIndexDirectoryTestHelper.java
index d475c5f8e6a..a18b24f5912 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/ColumnIndexDirectoryTestHelper.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/ColumnIndexDirectoryTestHelper.java
@@ -21,10 +21,11 @@
 import java.io.IOException;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.mockito.Mockito;
 import org.testng.Assert;
 
@@ -36,16 +37,16 @@ public class ColumnIndexDirectoryTestHelper {
   private ColumnIndexDirectoryTestHelper() {
   }
 
-  private static final ColumnIndexType[] INDEX_TYPES = {
-      ColumnIndexType.DICTIONARY, ColumnIndexType.FORWARD_INDEX, ColumnIndexType.INVERTED_INDEX,
-      ColumnIndexType.BLOOM_FILTER, ColumnIndexType.NULLVALUE_VECTOR
+  private static final IndexType[] INDEX_TYPES = {
+     StandardIndexes.dictionary(), StandardIndexes.forward(), StandardIndexes.inverted(),
+      StandardIndexes.bloomFilter(), StandardIndexes.nullValueVector()
   };
 
   static PinotDataBuffer newIndexBuffer(ColumnIndexDirectory columnDirectory, String column, int size, int index)
       throws IOException {
     String columnName = column + "." + index;
     // skip star tree. It's managed differently
-    ColumnIndexType indexType = INDEX_TYPES[index % INDEX_TYPES.length];
+    IndexType indexType = INDEX_TYPES[index % INDEX_TYPES.length];
     PinotDataBuffer buf = columnDirectory.newBuffer(columnName, indexType, size);
     return buf;
   }
@@ -54,7 +55,7 @@ static PinotDataBuffer getIndexBuffer(ColumnIndexDirectory columnDirectory, Stri
       throws IOException {
     String columnName = column + "." + index;
     // skip star tree
-    ColumnIndexType indexType = INDEX_TYPES[index % INDEX_TYPES.length];
+    IndexType indexType = INDEX_TYPES[index % INDEX_TYPES.length];
     PinotDataBuffer buf = columnDirectory.getBuffer(columnName, indexType);
     return buf;
   }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectoryTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectoryTest.java
index 5f9275ae950..7d039d79be1 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectoryTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectoryTest.java
@@ -24,15 +24,16 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.TreeSet;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.local.segment.creator.impl.text.LuceneTextIndexCreator;
 import org.apache.pinot.segment.local.segment.index.readers.text.LuceneTextIndexReader;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.util.TestUtils;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
@@ -74,7 +75,7 @@ public void testEmptyDirectory()
       throws Exception {
     assertEquals(0, TEMP_DIR.list().length, TEMP_DIR.list().toString());
     try (FilePerIndexDirectory fpiDir = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.heap);
-        PinotDataBuffer buffer = fpiDir.newBuffer("col1", ColumnIndexType.DICTIONARY, 1024)) {
+        PinotDataBuffer buffer = fpiDir.newBuffer("col1", StandardIndexes.dictionary(), 1024)) {
       assertEquals(1, TEMP_DIR.list().length, TEMP_DIR.list().toString());
 
       buffer.putLong(0, 0xbadfadL);
@@ -86,7 +87,7 @@ public void testEmptyDirectory()
     assertEquals(1, TEMP_DIR.list().length);
 
     try (FilePerIndexDirectory colDir = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap);
-        PinotDataBuffer readBuffer = colDir.getBuffer("col1", ColumnIndexType.DICTIONARY)) {
+        PinotDataBuffer readBuffer = colDir.getBuffer("col1", StandardIndexes.dictionary())) {
       assertEquals(readBuffer.getLong(0), 0xbadfadL);
       assertEquals(readBuffer.getInt(8), 51);
       assertEquals(readBuffer.getInt(101), 55);
@@ -130,10 +131,10 @@ private void testMultipleRW(ReadMode readMode, int numIter, long size)
   public void testWriteExisting()
       throws Exception {
     try (FilePerIndexDirectory columnDirectory = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      columnDirectory.newBuffer("column1", ColumnIndexType.DICTIONARY, 1024);
+      columnDirectory.newBuffer("column1", StandardIndexes.dictionary(), 1024);
     }
     try (FilePerIndexDirectory columnDirectory = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      columnDirectory.newBuffer("column1", ColumnIndexType.DICTIONARY, 1024);
+      columnDirectory.newBuffer("column1", StandardIndexes.dictionary(), 1024);
     }
   }
 
@@ -141,7 +142,7 @@ public void testWriteExisting()
   public void testMissingIndex()
       throws IOException {
     try (FilePerIndexDirectory fpiDirectory = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      fpiDirectory.getBuffer("noSuchColumn", ColumnIndexType.DICTIONARY);
+      fpiDirectory.getBuffer("noSuchColumn", StandardIndexes.dictionary());
     }
   }
 
@@ -149,9 +150,9 @@ public void testMissingIndex()
   public void testHasIndex()
       throws IOException {
     try (FilePerIndexDirectory fpiDirectory = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      PinotDataBuffer buffer = fpiDirectory.newBuffer("foo", ColumnIndexType.DICTIONARY, 1024);
+      PinotDataBuffer buffer = fpiDirectory.newBuffer("foo", StandardIndexes.dictionary(), 1024);
       buffer.putInt(0, 100);
-      assertTrue(fpiDirectory.hasIndexFor("foo", ColumnIndexType.DICTIONARY));
+      assertTrue(fpiDirectory.hasIndexFor("foo", StandardIndexes.dictionary()));
     }
   }
 
@@ -159,12 +160,12 @@ public void testHasIndex()
   public void testRemoveIndex()
       throws IOException {
     try (FilePerIndexDirectory fpi = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      fpi.newBuffer("col1", ColumnIndexType.FORWARD_INDEX, 1024);
-      fpi.newBuffer("col2", ColumnIndexType.DICTIONARY, 100);
-      assertTrue(fpi.getFileFor("col1", ColumnIndexType.FORWARD_INDEX).exists());
-      assertTrue(fpi.getFileFor("col2", ColumnIndexType.DICTIONARY).exists());
-      fpi.removeIndex("col1", ColumnIndexType.FORWARD_INDEX);
-      assertFalse(fpi.getFileFor("col1", ColumnIndexType.FORWARD_INDEX).exists());
+      fpi.newBuffer("col1", StandardIndexes.forward(), 1024);
+      fpi.newBuffer("col2", StandardIndexes.dictionary(), 100);
+      assertTrue(fpi.getFileFor("col1", StandardIndexes.forward()).exists());
+      assertTrue(fpi.getFileFor("col2", StandardIndexes.dictionary()).exists());
+      fpi.removeIndex("col1", StandardIndexes.forward());
+      assertFalse(fpi.getFileFor("col1", StandardIndexes.forward()).exists());
     }
   }
 
@@ -176,10 +177,10 @@ public void testRemoveTextIndices()
             null, null);
         LuceneTextIndexCreator barCreator = new LuceneTextIndexCreator("bar", TEMP_DIR, true,
             null, null)) {
-      PinotDataBuffer buf = fpi.newBuffer("col1", ColumnIndexType.FORWARD_INDEX, 1024);
+      PinotDataBuffer buf = fpi.newBuffer("col1", StandardIndexes.forward(), 1024);
       buf.putInt(0, 1);
 
-      buf = fpi.newBuffer("col1", ColumnIndexType.DICTIONARY, 1024);
+      buf = fpi.newBuffer("col1", StandardIndexes.dictionary(), 1024);
       buf.putChar(111, 'h');
 
       fooCreator.add("{\"clean\":\"this\"}");
@@ -192,7 +193,7 @@ public void testRemoveTextIndices()
 
     // Remove the Text index to trigger cleanup.
     try (FilePerIndexDirectory fpi = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertTrue(fpi.hasIndexFor("foo", ColumnIndexType.TEXT_INDEX));
+      assertTrue(fpi.hasIndexFor("foo", StandardIndexes.text()));
       // Use TextIndex once to trigger the creation of mapping files.
       LuceneTextIndexReader fooReader = new LuceneTextIndexReader("foo", TEMP_DIR, 1, new HashMap<>());
       fooReader.getDocIds("clean");
@@ -200,7 +201,7 @@ public void testRemoveTextIndices()
       barReader.getDocIds("retain hold");
 
       // Both files for TextIndex should be removed.
-      fpi.removeIndex("foo", ColumnIndexType.TEXT_INDEX);
+      fpi.removeIndex("foo", StandardIndexes.text());
       assertFalse(new File(TEMP_DIR, "foo" + V1Constants.Indexes.LUCENE_TEXT_INDEX_FILE_EXTENSION).exists());
       assertFalse(
           new File(TEMP_DIR, "foo" + V1Constants.Indexes.LUCENE_TEXT_INDEX_DOCID_MAPPING_FILE_EXTENSION).exists());
@@ -210,17 +211,17 @@ public void testRemoveTextIndices()
 
     // Read indices back and check the content.
     try (FilePerIndexDirectory fpi = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertFalse(fpi.hasIndexFor("foo", ColumnIndexType.TEXT_INDEX));
+      assertFalse(fpi.hasIndexFor("foo", StandardIndexes.text()));
 
-      assertTrue(fpi.hasIndexFor("col1", ColumnIndexType.FORWARD_INDEX));
-      PinotDataBuffer buf = fpi.getBuffer("col1", ColumnIndexType.FORWARD_INDEX);
+      assertTrue(fpi.hasIndexFor("col1", StandardIndexes.forward()));
+      PinotDataBuffer buf = fpi.getBuffer("col1", StandardIndexes.forward());
       assertEquals(buf.getInt(0), 1);
 
-      assertTrue(fpi.hasIndexFor("col1", ColumnIndexType.DICTIONARY));
-      buf = fpi.getBuffer("col1", ColumnIndexType.DICTIONARY);
+      assertTrue(fpi.hasIndexFor("col1", StandardIndexes.dictionary()));
+      buf = fpi.getBuffer("col1", StandardIndexes.dictionary());
       assertEquals(buf.getChar(111), 'h');
 
-      assertTrue(fpi.hasIndexFor("bar", ColumnIndexType.TEXT_INDEX));
+      assertTrue(fpi.hasIndexFor("bar", StandardIndexes.text()));
 
       // Check if the text index still work.
       LuceneTextIndexReader barReader = new LuceneTextIndexReader("bar", TEMP_DIR, 3, new HashMap<>());
@@ -239,15 +240,15 @@ public void testGetColumnIndices()
             null, null);
         LuceneTextIndexCreator barCreator = new LuceneTextIndexCreator("bar", TEMP_DIR, true,
             null, null)) {
-      PinotDataBuffer buf = fpi.newBuffer("col1", ColumnIndexType.FORWARD_INDEX, 1024);
+      PinotDataBuffer buf = fpi.newBuffer("col1", StandardIndexes.forward(), 1024);
       buf.putInt(0, 111);
-      buf = fpi.newBuffer("col2", ColumnIndexType.DICTIONARY, 1024);
+      buf = fpi.newBuffer("col2", StandardIndexes.dictionary(), 1024);
       buf.putInt(0, 222);
-      buf = fpi.newBuffer("col3", ColumnIndexType.FORWARD_INDEX, 1024);
+      buf = fpi.newBuffer("col3", StandardIndexes.forward(), 1024);
       buf.putInt(0, 333);
-      buf = fpi.newBuffer("col4", ColumnIndexType.INVERTED_INDEX, 1024);
+      buf = fpi.newBuffer("col4", StandardIndexes.inverted(), 1024);
       buf.putInt(0, 444);
-      buf = fpi.newBuffer("col5", ColumnIndexType.H3_INDEX, 1024);
+      buf = fpi.newBuffer("col5", StandardIndexes.h3(), 1024);
       buf.putInt(0, 555);
 
       fooCreator.add("{\"clean\":\"this\"}");
@@ -260,31 +261,31 @@ public void testGetColumnIndices()
 
     // Need segmentMetadata to tell the full set of columns in this segment.
     when(_segmentMetadata.getAllColumns())
-        .thenReturn(new HashSet<>(Arrays.asList("col1", "col2", "col3", "col4", "col5", "foo", "bar")));
+        .thenReturn(new TreeSet<>(Arrays.asList("col1", "col2", "col3", "col4", "col5", "foo", "bar")));
     try (FilePerIndexDirectory fpi = new FilePerIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.FORWARD_INDEX),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.forward()),
           new HashSet<>(Arrays.asList("col1", "col3")));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.DICTIONARY),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.dictionary()),
           new HashSet<>(Collections.singletonList("col2")));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.INVERTED_INDEX),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.inverted()),
           new HashSet<>(Collections.singletonList("col4")));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.H3_INDEX),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.h3()),
           new HashSet<>(Collections.singletonList("col5")));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.TEXT_INDEX), new HashSet<>(Arrays.asList("foo", "bar")));
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.text()), new HashSet<>(Arrays.asList("foo", "bar")));
 
-      fpi.removeIndex("col1", ColumnIndexType.FORWARD_INDEX);
-      fpi.removeIndex("col2", ColumnIndexType.DICTIONARY);
-      fpi.removeIndex("col5", ColumnIndexType.H3_INDEX);
-      fpi.removeIndex("foo", ColumnIndexType.TEXT_INDEX);
-      fpi.removeIndex("col111", ColumnIndexType.DICTIONARY);
+      fpi.removeIndex("col1", StandardIndexes.forward());
+      fpi.removeIndex("col2", StandardIndexes.dictionary());
+      fpi.removeIndex("col5", StandardIndexes.h3());
+      fpi.removeIndex("foo", StandardIndexes.text());
+      fpi.removeIndex("col111", StandardIndexes.dictionary());
 
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.FORWARD_INDEX),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.forward()),
           new HashSet<>(Collections.singletonList("col3")));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.DICTIONARY), new HashSet<>(Collections.emptySet()));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.INVERTED_INDEX),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.dictionary()), new HashSet<>(Collections.emptySet()));
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.inverted()),
           new HashSet<>(Collections.singletonList("col4")));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.H3_INDEX), new HashSet<>(Collections.emptySet()));
-      assertEquals(fpi.getColumnsWithIndex(ColumnIndexType.TEXT_INDEX),
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.h3()), new HashSet<>(Collections.emptySet()));
+      assertEquals(fpi.getColumnsWithIndex(StandardIndexes.text()),
           new HashSet<>(Collections.singletonList("bar")));
     }
   }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/IndexKeyTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/IndexKeyTest.java
index cf764118c75..bf8d37560cf 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/IndexKeyTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/IndexKeyTest.java
@@ -21,7 +21,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -31,13 +31,13 @@ public class IndexKeyTest {
   @Test
   public void testCompareTo() {
     List<IndexKey> iks = Arrays
-        .asList(new IndexKey("foo", ColumnIndexType.INVERTED_INDEX), new IndexKey("bar", ColumnIndexType.BLOOM_FILTER),
-            new IndexKey("foo", ColumnIndexType.FORWARD_INDEX), new IndexKey("bar", ColumnIndexType.DICTIONARY),
-            new IndexKey("baz", ColumnIndexType.JSON_INDEX), new IndexKey("baz", ColumnIndexType.FST_INDEX));
+        .asList(new IndexKey("foo", StandardIndexes.inverted()), new IndexKey("bar", StandardIndexes.bloomFilter()),
+            new IndexKey("foo", StandardIndexes.forward()), new IndexKey("bar", StandardIndexes.dictionary()),
+            new IndexKey("baz", StandardIndexes.json()), new IndexKey("baz", StandardIndexes.fst()));
     Collections.sort(iks);
     assertEquals(iks, Arrays
-        .asList(new IndexKey("bar", ColumnIndexType.DICTIONARY), new IndexKey("bar", ColumnIndexType.BLOOM_FILTER),
-            new IndexKey("baz", ColumnIndexType.FST_INDEX), new IndexKey("baz", ColumnIndexType.JSON_INDEX),
-            new IndexKey("foo", ColumnIndexType.FORWARD_INDEX), new IndexKey("foo", ColumnIndexType.INVERTED_INDEX)));
+        .asList(new IndexKey("bar", StandardIndexes.bloomFilter()), new IndexKey("bar", StandardIndexes.dictionary()),
+            new IndexKey("baz", StandardIndexes.fst()), new IndexKey("baz", StandardIndexes.json()),
+            new IndexKey("foo", StandardIndexes.forward()), new IndexKey("foo", StandardIndexes.inverted())));
   }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectoryTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectoryTest.java
index 878202b6fd3..f2aed2fdef5 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectoryTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SegmentLocalFSDirectoryTest.java
@@ -21,9 +21,9 @@
 import java.io.File;
 import org.apache.commons.io.FileUtils;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
 import org.apache.pinot.spi.utils.ReadMode;
@@ -105,13 +105,13 @@ public void testWriteAndReadBackData()
       throws java.lang.Exception {
     try (SegmentDirectory.Writer writer = _segmentDirectory.createWriter()) {
       Assert.assertNotNull(writer);
-      PinotDataBuffer buffer = writer.newIndexFor("newColumn", ColumnIndexType.FORWARD_INDEX, 1024);
+      PinotDataBuffer buffer = writer.newIndexFor("newColumn", StandardIndexes.forward(), 1024);
       loadData(buffer);
       writer.save();
     }
     try (SegmentDirectory.Reader reader = _segmentDirectory.createReader()) {
       Assert.assertNotNull(reader);
-      PinotDataBuffer newDataBuffer = reader.getIndexFor("newColumn", ColumnIndexType.FORWARD_INDEX);
+      PinotDataBuffer newDataBuffer = reader.getIndexFor("newColumn", StandardIndexes.forward());
       verifyData(newDataBuffer);
     }
   }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectoryTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectoryTest.java
index 98c32a93b08..070691f92fa 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectoryTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/SingleFileIndexDirectoryTest.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableMap;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Arrays;
@@ -29,8 +28,8 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.apache.commons.configuration.ConfigurationException;
@@ -39,10 +38,10 @@
 import org.apache.pinot.segment.local.segment.index.readers.text.LuceneTextIndexReader;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.spi.utils.ReadMode;
 import org.apache.pinot.util.TestUtils;
 import org.mockito.Mockito;
@@ -55,7 +54,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 
 public class SingleFileIndexDirectoryTest {
@@ -94,7 +92,7 @@ public void testWithEmptyDir()
     // segmentDir does not have anything to begin with
     assertEquals(TEMP_DIR.list().length, 0);
     SingleFileIndexDirectory columnDirectory = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap);
-    PinotDataBuffer writtenBuffer = columnDirectory.newBuffer("foo", ColumnIndexType.DICTIONARY, 1024);
+    PinotDataBuffer writtenBuffer = columnDirectory.newBuffer("foo", StandardIndexes.dictionary(), 1024);
     String data = "This is a test string";
     final byte[] dataBytes = data.getBytes();
     int pos = 0;
@@ -103,9 +101,9 @@ public void testWithEmptyDir()
     }
     writtenBuffer.close();
 
-    Mockito.when(_segmentMetadata.getAllColumns()).thenReturn(new HashSet<String>(Arrays.asList("foo")));
+    Mockito.when(_segmentMetadata.getAllColumns()).thenReturn(new TreeSet<>(Arrays.asList("foo")));
     try (SingleFileIndexDirectory directoryReader = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata,
-        ReadMode.mmap); PinotDataBuffer readBuffer = directoryReader.getBuffer("foo", ColumnIndexType.DICTIONARY)) {
+        ReadMode.mmap); PinotDataBuffer readBuffer = directoryReader.getBuffer("foo", StandardIndexes.dictionary())) {
       assertEquals(1024, readBuffer.size());
       int length = dataBytes.length;
       for (int i = 0; i < length; i++) {
@@ -157,11 +155,11 @@ public void testWriteExisting()
       throws Exception {
     try (SingleFileIndexDirectory columnDirectory = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata,
         ReadMode.mmap)) {
-      columnDirectory.newBuffer("column1", ColumnIndexType.DICTIONARY, 1024);
+      columnDirectory.newBuffer("column1", StandardIndexes.dictionary(), 1024);
     }
     try (SingleFileIndexDirectory columnDirectory = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata,
         ReadMode.mmap)) {
-      columnDirectory.newBuffer("column1", ColumnIndexType.DICTIONARY, 1024);
+      columnDirectory.newBuffer("column1", StandardIndexes.dictionary(), 1024);
     }
   }
 
@@ -170,7 +168,7 @@ public void testMissingIndex()
       throws IOException, ConfigurationException {
     try (SingleFileIndexDirectory columnDirectory = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata,
         ReadMode.mmap)) {
-      columnDirectory.getBuffer("column1", ColumnIndexType.DICTIONARY);
+      columnDirectory.getBuffer("column1", StandardIndexes.dictionary());
     }
   }
 
@@ -178,9 +176,9 @@ public void testMissingIndex()
   public void testRemoveIndex()
       throws IOException, ConfigurationException {
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      sfd.newBuffer("col1", ColumnIndexType.DICTIONARY, 1024);
-      sfd.removeIndex("col1", ColumnIndexType.DICTIONARY);
-      assertFalse(sfd.hasIndexFor("col1", ColumnIndexType.DICTIONARY));
+      sfd.newBuffer("col1", StandardIndexes.dictionary(), 1024);
+      sfd.removeIndex("col1", StandardIndexes.dictionary());
+      assertFalse(sfd.hasIndexFor("col1", StandardIndexes.dictionary()));
     }
   }
 
@@ -188,46 +186,46 @@ public void testRemoveIndex()
   public void testCleanupRemovedIndices()
       throws IOException, ConfigurationException {
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      PinotDataBuffer buf = sfd.newBuffer("col1", ColumnIndexType.FORWARD_INDEX, 1024);
+      PinotDataBuffer buf = sfd.newBuffer("col1", StandardIndexes.forward(), 1024);
       buf.putInt(0, 1); // from begin position.
 
-      buf = sfd.newBuffer("col1", ColumnIndexType.DICTIONARY, 1024);
+      buf = sfd.newBuffer("col1", StandardIndexes.dictionary(), 1024);
       buf.putChar(111, 'h');
 
-      buf = sfd.newBuffer("col2", ColumnIndexType.FORWARD_INDEX, 1024);
+      buf = sfd.newBuffer("col2", StandardIndexes.forward(), 1024);
       buf.putChar(222, 'w');
 
-      buf = sfd.newBuffer("col1", ColumnIndexType.JSON_INDEX, 1024);
+      buf = sfd.newBuffer("col1", StandardIndexes.json(), 1024);
       buf.putLong(333, 111111L);
 
-      buf = sfd.newBuffer("col2", ColumnIndexType.H3_INDEX, 1024);
+      buf = sfd.newBuffer("col2", StandardIndexes.h3(), 1024);
       buf.putDouble(1016, 222.222); // touch end position.
     }
 
     // Remove the JSON index to trigger cleanup, but keep H3 index.
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertTrue(sfd.hasIndexFor("col1", ColumnIndexType.JSON_INDEX));
-      sfd.removeIndex("col1", ColumnIndexType.JSON_INDEX);
+      assertTrue(sfd.hasIndexFor("col1", StandardIndexes.json()));
+      sfd.removeIndex("col1", StandardIndexes.json());
     }
 
     // Read indices back and check the content.
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertFalse(sfd.hasIndexFor("col1", ColumnIndexType.JSON_INDEX));
+      assertFalse(sfd.hasIndexFor("col1", StandardIndexes.json()));
 
-      assertTrue(sfd.hasIndexFor("col1", ColumnIndexType.FORWARD_INDEX));
-      PinotDataBuffer buf = sfd.getBuffer("col1", ColumnIndexType.FORWARD_INDEX);
+      assertTrue(sfd.hasIndexFor("col1", StandardIndexes.forward()));
+      PinotDataBuffer buf = sfd.getBuffer("col1", StandardIndexes.forward());
       assertEquals(buf.getInt(0), 1);
 
-      assertTrue(sfd.hasIndexFor("col1", ColumnIndexType.DICTIONARY));
-      buf = sfd.getBuffer("col1", ColumnIndexType.DICTIONARY);
+      assertTrue(sfd.hasIndexFor("col1", StandardIndexes.dictionary()));
+      buf = sfd.getBuffer("col1", StandardIndexes.dictionary());
       assertEquals(buf.getChar(111), 'h');
 
-      assertTrue(sfd.hasIndexFor("col2", ColumnIndexType.FORWARD_INDEX));
-      buf = sfd.getBuffer("col2", ColumnIndexType.FORWARD_INDEX);
+      assertTrue(sfd.hasIndexFor("col2", StandardIndexes.forward()));
+      buf = sfd.getBuffer("col2", StandardIndexes.forward());
       assertEquals(buf.getChar(222), 'w');
 
-      assertTrue(sfd.hasIndexFor("col2", ColumnIndexType.H3_INDEX));
-      buf = sfd.getBuffer("col2", ColumnIndexType.H3_INDEX);
+      assertTrue(sfd.hasIndexFor("col2", StandardIndexes.h3()));
+      buf = sfd.getBuffer("col2", StandardIndexes.h3());
       assertEquals(buf.getDouble(1016), 222.222);
     }
   }
@@ -240,10 +238,10 @@ public void testRemoveTextIndices()
             null, null);
         LuceneTextIndexCreator barCreator = new LuceneTextIndexCreator("bar", TEMP_DIR, true,
             null, null)) {
-      PinotDataBuffer buf = sfd.newBuffer("col1", ColumnIndexType.FORWARD_INDEX, 1024);
+      PinotDataBuffer buf = sfd.newBuffer("col1", StandardIndexes.forward(), 1024);
       buf.putInt(0, 1);
 
-      buf = sfd.newBuffer("col1", ColumnIndexType.DICTIONARY, 1024);
+      buf = sfd.newBuffer("col1", StandardIndexes.dictionary(), 1024);
       buf.putChar(111, 'h');
 
       fooCreator.add("{\"clean\":\"this\"}");
@@ -256,7 +254,7 @@ public void testRemoveTextIndices()
 
     // Remove the Text index to trigger cleanup.
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertTrue(sfd.hasIndexFor("foo", ColumnIndexType.TEXT_INDEX));
+      assertTrue(sfd.hasIndexFor("foo", StandardIndexes.text()));
       // Use TextIndex once to trigger the creation of mapping files.
       LuceneTextIndexReader fooReader = new LuceneTextIndexReader("foo", TEMP_DIR, 1, new HashMap<>());
       fooReader.getDocIds("clean");
@@ -264,7 +262,7 @@ public void testRemoveTextIndices()
       barReader.getDocIds("retain hold");
 
       // Both files for TextIndex should be removed.
-      sfd.removeIndex("foo", ColumnIndexType.TEXT_INDEX);
+      sfd.removeIndex("foo", StandardIndexes.text());
       assertFalse(new File(TEMP_DIR, "foo" + V1Constants.Indexes.LUCENE_TEXT_INDEX_FILE_EXTENSION).exists());
       assertFalse(
           new File(TEMP_DIR, "foo" + V1Constants.Indexes.LUCENE_TEXT_INDEX_DOCID_MAPPING_FILE_EXTENSION).exists());
@@ -274,17 +272,17 @@ public void testRemoveTextIndices()
 
     // Read indices back and check the content.
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertFalse(sfd.hasIndexFor("foo", ColumnIndexType.TEXT_INDEX));
+      assertFalse(sfd.hasIndexFor("foo", StandardIndexes.text()));
 
-      assertTrue(sfd.hasIndexFor("col1", ColumnIndexType.FORWARD_INDEX));
-      PinotDataBuffer buf = sfd.getBuffer("col1", ColumnIndexType.FORWARD_INDEX);
+      assertTrue(sfd.hasIndexFor("col1", StandardIndexes.forward()));
+      PinotDataBuffer buf = sfd.getBuffer("col1", StandardIndexes.forward());
       assertEquals(buf.getInt(0), 1);
 
-      assertTrue(sfd.hasIndexFor("col1", ColumnIndexType.DICTIONARY));
-      buf = sfd.getBuffer("col1", ColumnIndexType.DICTIONARY);
+      assertTrue(sfd.hasIndexFor("col1", StandardIndexes.dictionary()));
+      buf = sfd.getBuffer("col1", StandardIndexes.dictionary());
       assertEquals(buf.getChar(111), 'h');
 
-      assertTrue(sfd.hasIndexFor("bar", ColumnIndexType.TEXT_INDEX));
+      assertTrue(sfd.hasIndexFor("bar", StandardIndexes.text()));
 
       // Check if the text index still work.
       LuceneTextIndexReader barReader = new LuceneTextIndexReader("bar", TEMP_DIR, 3, new HashMap<>());
@@ -302,24 +300,24 @@ public void testCopyIndices()
       FileUtils.touch(srcTmp);
     }
     File dstTmp = new File(TEMP_DIR, UUID.randomUUID().toString());
-    Map<IndexKey, IndexEntry> indicesToCopy = new TreeMap<>(ImmutableMap
-        .of(new IndexKey("foo", ColumnIndexType.INVERTED_INDEX),
-            new IndexEntry(new IndexKey("foo", ColumnIndexType.INVERTED_INDEX), 0, 0),
-            new IndexKey("foo", ColumnIndexType.FORWARD_INDEX),
-            new IndexEntry(new IndexKey("foo", ColumnIndexType.FORWARD_INDEX), 0, 0),
-            new IndexKey("bar", ColumnIndexType.FORWARD_INDEX),
-            new IndexEntry(new IndexKey("bar", ColumnIndexType.FORWARD_INDEX), 0, 0),
-            new IndexKey("bar", ColumnIndexType.DICTIONARY),
-            new IndexEntry(new IndexKey("bar", ColumnIndexType.DICTIONARY), 0, 0),
-            new IndexKey("bar", ColumnIndexType.JSON_INDEX),
-            new IndexEntry(new IndexKey("bar", ColumnIndexType.JSON_INDEX), 0, 0)));
+    TreeMap<IndexKey, IndexEntry> indicesToCopy = new TreeMap<>(ImmutableMap
+        .of(new IndexKey("foo", StandardIndexes.inverted()),
+            new IndexEntry(new IndexKey("foo", StandardIndexes.inverted()), 0, 0),
+            new IndexKey("foo", StandardIndexes.forward()),
+            new IndexEntry(new IndexKey("foo", StandardIndexes.forward()), 0, 0),
+            new IndexKey("bar", StandardIndexes.forward()),
+            new IndexEntry(new IndexKey("bar", StandardIndexes.forward()), 0, 0),
+            new IndexKey("bar", StandardIndexes.dictionary()),
+            new IndexEntry(new IndexKey("bar", StandardIndexes.dictionary()), 0, 0),
+            new IndexKey("bar", StandardIndexes.json()),
+            new IndexEntry(new IndexKey("bar", StandardIndexes.json()), 0, 0)));
     List<IndexEntry> retained = SingleFileIndexDirectory.copyIndices(srcTmp, dstTmp, indicesToCopy);
     List<IndexKey> retainedKeys = retained.stream().map(e -> e._key).collect(Collectors.toList());
     // The returned entries are sorted.
     assertEquals(retainedKeys, Arrays
-        .asList(new IndexKey("bar", ColumnIndexType.DICTIONARY), new IndexKey("bar", ColumnIndexType.FORWARD_INDEX),
-            new IndexKey("bar", ColumnIndexType.JSON_INDEX), new IndexKey("foo", ColumnIndexType.FORWARD_INDEX),
-            new IndexKey("foo", ColumnIndexType.INVERTED_INDEX)));
+        .asList(new IndexKey("bar", StandardIndexes.dictionary()), new IndexKey("bar", StandardIndexes.forward()),
+            new IndexKey("bar", StandardIndexes.json()), new IndexKey("foo", StandardIndexes.forward()),
+            new IndexKey("foo", StandardIndexes.inverted())));
   }
 
   @Test
@@ -327,9 +325,9 @@ public void testPersistIndexMaps() {
     ByteArrayOutputStream output = new ByteArrayOutputStream(1024 * 1024);
     try (PrintWriter pw = new PrintWriter(output)) {
       List<IndexEntry> entries = Arrays
-          .asList(new IndexEntry(new IndexKey("foo", ColumnIndexType.INVERTED_INDEX), 0, 1024),
-              new IndexEntry(new IndexKey("bar", ColumnIndexType.INVERTED_INDEX), 1024, 100),
-              new IndexEntry(new IndexKey("baz", ColumnIndexType.INVERTED_INDEX), 1124, 200));
+          .asList(new IndexEntry(new IndexKey("foo", StandardIndexes.inverted()), 0, 1024),
+              new IndexEntry(new IndexKey("bar", StandardIndexes.inverted()), 1024, 100),
+              new IndexEntry(new IndexKey("baz", StandardIndexes.inverted()), 1124, 200));
       SingleFileIndexDirectory.persistIndexMaps(entries, pw);
     }
     assertEquals(output.toString(), "foo.inverted_index.startOffset = 0\nfoo.inverted_index.size = 1024\n"
@@ -345,15 +343,15 @@ public void testGetColumnIndices()
             null, null);
         LuceneTextIndexCreator barCreator = new LuceneTextIndexCreator("bar", TEMP_DIR, true,
             null, null)) {
-      PinotDataBuffer buf = sfd.newBuffer("col1", ColumnIndexType.FORWARD_INDEX, 1024);
+      PinotDataBuffer buf = sfd.newBuffer("col1", StandardIndexes.forward(), 1024);
       buf.putInt(0, 111);
-      buf = sfd.newBuffer("col2", ColumnIndexType.DICTIONARY, 1024);
+      buf = sfd.newBuffer("col2", StandardIndexes.dictionary(), 1024);
       buf.putInt(0, 222);
-      buf = sfd.newBuffer("col3", ColumnIndexType.FORWARD_INDEX, 1024);
+      buf = sfd.newBuffer("col3", StandardIndexes.forward(), 1024);
       buf.putInt(0, 333);
-      buf = sfd.newBuffer("col4", ColumnIndexType.INVERTED_INDEX, 1024);
+      buf = sfd.newBuffer("col4", StandardIndexes.inverted(), 1024);
       buf.putInt(0, 444);
-      buf = sfd.newBuffer("col5", ColumnIndexType.H3_INDEX, 1024);
+      buf = sfd.newBuffer("col5", StandardIndexes.h3(), 1024);
       buf.putInt(0, 555);
 
       fooCreator.add("{\"clean\":\"this\"}");
@@ -366,42 +364,32 @@ public void testGetColumnIndices()
 
     // Need segmentMetadata to tell the full set of columns in this segment.
     when(_segmentMetadata.getAllColumns())
-        .thenReturn(new HashSet<>(Arrays.asList("col1", "col2", "col3", "col4", "foo", "bar")));
+        .thenReturn(new TreeSet<>(Arrays.asList("col1", "col2", "col3", "col4", "foo", "bar")));
     try (SingleFileIndexDirectory sfd = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.FORWARD_INDEX),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.forward()),
           new HashSet<>(Arrays.asList("col1", "col3")));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.DICTIONARY),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.dictionary()),
           new HashSet<>(Collections.singletonList("col2")));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.INVERTED_INDEX),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.inverted()),
           new HashSet<>(Collections.singletonList("col4")));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.H3_INDEX),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.h3()),
           new HashSet<>(Collections.singletonList("col5")));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.TEXT_INDEX), new HashSet<>(Arrays.asList("foo", "bar")));
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.text()), new HashSet<>(Arrays.asList("foo", "bar")));
 
-      sfd.removeIndex("col1", ColumnIndexType.FORWARD_INDEX);
-      sfd.removeIndex("col2", ColumnIndexType.DICTIONARY);
-      sfd.removeIndex("col5", ColumnIndexType.H3_INDEX);
-      sfd.removeIndex("foo", ColumnIndexType.TEXT_INDEX);
-      sfd.removeIndex("col111", ColumnIndexType.DICTIONARY);
+      sfd.removeIndex("col1", StandardIndexes.forward());
+      sfd.removeIndex("col2", StandardIndexes.dictionary());
+      sfd.removeIndex("col5", StandardIndexes.h3());
+      sfd.removeIndex("foo", StandardIndexes.text());
+      sfd.removeIndex("col111", StandardIndexes.dictionary());
 
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.FORWARD_INDEX),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.forward()),
           new HashSet<>(Collections.singletonList("col3")));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.DICTIONARY), new HashSet<>(Collections.emptySet()));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.INVERTED_INDEX),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.dictionary()), new HashSet<>(Collections.emptySet()));
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.inverted()),
           new HashSet<>(Collections.singletonList("col4")));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.H3_INDEX), new HashSet<>(Collections.emptySet()));
-      assertEquals(sfd.getColumnsWithIndex(ColumnIndexType.TEXT_INDEX),
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.h3()), new HashSet<>(Collections.emptySet()));
+      assertEquals(sfd.getColumnsWithIndex(StandardIndexes.text()),
           new HashSet<>(Collections.singletonList("bar")));
     }
   }
-
-  @Test(expectedExceptions = FileNotFoundException.class, expectedExceptionsMessageRegExp = ".*star_tree_index.*")
-  public void testLoadStarTreeIndex()
-      throws Exception {
-    Mockito.when(_segmentMetadata.getStarTreeV2MetadataList()).thenReturn(Collections.emptyList());
-    try (SingleFileIndexDirectory ignore = new SingleFileIndexDirectory(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
-      // Trying to load startree index but not able to find the file.
-      fail();
-    }
-  }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/StarTreeIndexReaderTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/StarTreeIndexReaderTest.java
new file mode 100644
index 00000000000..93a8e7428e1
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/store/StarTreeIndexReaderTest.java
@@ -0,0 +1,171 @@
+/**
+ * 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.pinot.segment.local.segment.store;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.pinot.segment.local.startree.v2.store.StarTreeIndexMapUtils;
+import org.apache.pinot.segment.spi.AggregationFunctionType;
+import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
+import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
+import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
+import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
+import org.apache.pinot.segment.spi.index.startree.StarTreeV2Metadata;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.spi.utils.ReadMode;
+import org.apache.pinot.util.TestUtils;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+
+public class StarTreeIndexReaderTest {
+  private static final File TEMP_DIR = new File(FileUtils.getTempDirectory(), StarTreeIndexReaderTest.class.toString());
+
+  private SegmentMetadataImpl _segmentMetadata;
+
+  @BeforeMethod
+  public void setUp()
+      throws IOException {
+    TestUtils.ensureDirectoriesExistAndEmpty(TEMP_DIR);
+    writeMetadata();
+  }
+
+  @AfterMethod
+  public void tearDown()
+      throws IOException {
+    FileUtils.deleteDirectory(TEMP_DIR);
+  }
+
+  void writeMetadata() {
+    SegmentMetadataImpl meta = mock(SegmentMetadataImpl.class);
+    when(meta.getVersion()).thenReturn(SegmentVersion.v3);
+    when(meta.getStarTreeV2MetadataList()).thenReturn(null);
+    _segmentMetadata = meta;
+  }
+
+  @Test
+  public void testLoadStarTreeIndexBuffers()
+      throws IOException {
+    // Test with 2 index trees.
+    StarTreeV2Metadata stMeta1 = mock(StarTreeV2Metadata.class);
+    when(stMeta1.getDimensionsSplitOrder()).thenReturn(Arrays.asList("dim0", "dim1"));
+    when(stMeta1.getFunctionColumnPairs()).thenReturn(
+        Collections.singleton(new AggregationFunctionColumnPair(AggregationFunctionType.COUNT, "*")));
+    StarTreeV2Metadata stMeta2 = mock(StarTreeV2Metadata.class);
+    when(stMeta2.getDimensionsSplitOrder()).thenReturn(Arrays.asList("dimX", "dimY"));
+    when(stMeta2.getFunctionColumnPairs()).thenReturn(
+        Collections.singleton(new AggregationFunctionColumnPair(AggregationFunctionType.SUM, "dimX")));
+    when(_segmentMetadata.getStarTreeV2MetadataList()).thenReturn(Arrays.asList(stMeta1, stMeta2));
+    // Mock the offset/sizes for the index buffers.
+    List<List<Pair<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue>>> indexMaps = new ArrayList<>();
+    List<Pair<StarTreeIndexMapUtils.IndexKey, StarTreeIndexMapUtils.IndexValue>> indexMap = new ArrayList<>();
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.STAR_TREE, null),
+        new StarTreeIndexMapUtils.IndexValue(0, 1)));
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, "dim0"),
+        new StarTreeIndexMapUtils.IndexValue(1, 1)));
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, "dim1"),
+        new StarTreeIndexMapUtils.IndexValue(2, 1)));
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, "count__*"),
+        new StarTreeIndexMapUtils.IndexValue(3, 1)));
+    indexMaps.add(indexMap);
+    indexMap = new ArrayList<>();
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.STAR_TREE, null),
+        new StarTreeIndexMapUtils.IndexValue(10, 3)));
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, "dimX"),
+        new StarTreeIndexMapUtils.IndexValue(13, 3)));
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, "dimY"),
+        new StarTreeIndexMapUtils.IndexValue(16, 3)));
+    indexMap.add(Pair.of(new StarTreeIndexMapUtils.IndexKey(StarTreeIndexMapUtils.IndexType.FORWARD_INDEX, "sum__dimX"),
+        new StarTreeIndexMapUtils.IndexValue(19, 3)));
+    indexMaps.add(indexMap);
+    File indexMapFile = new File(TEMP_DIR, StarTreeV2Constants.INDEX_MAP_FILE_NAME);
+    StarTreeIndexMapUtils.storeToFile(indexMaps, indexMapFile);
+
+    File indexFile = new File(TEMP_DIR, StarTreeV2Constants.INDEX_FILE_NAME);
+    if (!indexFile.exists()) {
+      indexFile.createNewFile();
+    }
+    byte[] data = new byte[32];
+    for (int i = 0; i < data.length; i++) {
+      data[i] = (byte) i;
+    }
+    try (PinotDataBuffer dataBuffer = PinotDataBuffer.mapFile(indexFile, false, 0, data.length, ByteOrder.LITTLE_ENDIAN,
+        "StarTree V2 data buffer from: " + indexFile)) {
+      dataBuffer.readFrom(0, data);
+    }
+
+    try (StarTreeIndexReader reader = new StarTreeIndexReader(TEMP_DIR, _segmentMetadata, ReadMode.mmap)) {
+      // Check the bytes of the 1st ST index
+      assertTrue(reader.hasIndexFor(0, "0", StandardIndexes.inverted()));
+      PinotDataBuffer buf = reader.getBuffer(0, "0", StandardIndexes.inverted());
+      assertEquals(buf.size(), 1);
+      assertEquals(buf.getByte(0), 0);
+
+      assertTrue(reader.hasIndexFor(0, "dim0", StandardIndexes.forward()));
+      buf = reader.getBuffer(0, "dim0", StandardIndexes.forward());
+      assertEquals(buf.size(), 1);
+      assertEquals(buf.getByte(0), 1);
+
+      assertTrue(reader.hasIndexFor(0, "dim1", StandardIndexes.forward()));
+      buf = reader.getBuffer(0, "dim1", StandardIndexes.forward());
+      assertEquals(buf.size(), 1);
+      assertEquals(buf.getByte(0), 2);
+
+      assertTrue(reader.hasIndexFor(0, "count__*", StandardIndexes.forward()));
+      buf = reader.getBuffer(0, "count__*", StandardIndexes.forward());
+      assertEquals(buf.size(), 1);
+      assertEquals(buf.getByte(0), 3);
+
+      // Check the bytes of the 2nd ST index
+      assertTrue(reader.hasIndexFor(1, "1", StandardIndexes.inverted()));
+      buf = reader.getBuffer(1, "1", StandardIndexes.inverted());
+      assertEquals(buf.size(), 3);
+      assertEquals(buf.getByte(2), 12);
+
+      assertTrue(reader.hasIndexFor(1, "dimX", StandardIndexes.forward()));
+      buf = reader.getBuffer(1, "dimX", StandardIndexes.forward());
+      assertEquals(buf.size(), 3);
+      assertEquals(buf.getByte(2), 15);
+
+      assertTrue(reader.hasIndexFor(1, "dimY", StandardIndexes.forward()));
+      buf = reader.getBuffer(1, "dimY", StandardIndexes.forward());
+      assertEquals(buf.size(), 3);
+      assertEquals(buf.getByte(2), 18);
+
+      assertTrue(reader.hasIndexFor(1, "sum__dimX", StandardIndexes.forward()));
+      buf = reader.getBuffer(1, "sum__dimX", StandardIndexes.forward());
+      assertEquals(buf.size(), 3);
+      assertEquals(buf.getByte(2), 21);
+    }
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexSeparatorTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexSeparatorTest.java
new file mode 100644
index 00000000000..bc1be710e63
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/startree/v2/builder/StarTreeIndexSeparatorTest.java
@@ -0,0 +1,100 @@
+/**
+ * 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.pinot.segment.local.startree.v2.builder;
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.io.FileUtils;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
+import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
+import org.apache.pinot.spi.env.CommonsConfigurationUtils;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.apache.pinot.segment.spi.V1Constants.Indexes.RAW_SV_FORWARD_INDEX_FILE_EXTENSION;
+import static org.apache.pinot.segment.spi.V1Constants.Indexes.UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION;
+import static org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants.STAR_TREE_INDEX_FILE_NAME;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+
+public class StarTreeIndexSeparatorTest {
+
+  private static final String SEGMENT_PATH = "data/startree/segment";
+  private static final String TOTAL_DOCS_KEY = "startree.v2.0.total.docs";
+
+  private StarTreeIndexSeparator _separator;
+  private PropertiesConfiguration _metadataProperties;
+  private final StarTreeV2BuilderConfig _builderConfig = StarTreeV2BuilderConfig.fromIndexConfig(
+      new StarTreeIndexConfig(
+          Lists.newArrayList("AirlineID", "Origin", "Dest"),
+          Lists.newArrayList(),
+          Lists.newArrayList("count__*", "max__ArrDelay"),
+          10));
+
+  @BeforeClass
+  public void setup()
+      throws IOException {
+    ClassLoader classLoader = getClass().getClassLoader();
+    URL segmentUrl = classLoader.getResource(SEGMENT_PATH);
+    File segmentDir = new File(segmentUrl.getFile());
+    _metadataProperties = CommonsConfigurationUtils.fromFile(
+        new File(segmentDir, V1Constants.MetadataKeys.METADATA_FILE_NAME));
+    _separator = new StarTreeIndexSeparator(
+        new File(segmentDir, StarTreeV2Constants.INDEX_MAP_FILE_NAME),
+        new File(segmentDir, StarTreeV2Constants.INDEX_FILE_NAME),
+        _metadataProperties);
+  }
+
+  @Test
+  public void extractTotalDocsListTest() {
+    assertNotNull(_separator);
+    List<Integer> docsList = _separator.extractTotalDocsList(_metadataProperties);
+    assertNotNull(docsList);
+    assertEquals(docsList, Lists.newArrayList(_metadataProperties.getInt(TOTAL_DOCS_KEY)));
+  }
+
+  @Test
+  public void extractBuilderConfigsTest() {
+    List<StarTreeV2BuilderConfig> builderConfigList = _separator.extractBuilderConfigs(_metadataProperties);
+    assertEquals(builderConfigList, Lists.newArrayList(_builderConfig));
+  }
+
+  @Test
+  public void separateTest()
+      throws IOException {
+    File tempDir = new File(FileUtils.getTempDirectory(), "separateTest");
+    _separator.separate(tempDir, _builderConfig);
+    List<String> files = Arrays.asList(Objects.requireNonNull(tempDir.list()));
+    assertTrue(files.contains(STAR_TREE_INDEX_FILE_NAME));
+    _builderConfig.getDimensionsSplitOrder()
+        .forEach(dimension -> assertTrue(files.contains(dimension + UNSORTED_SV_FORWARD_INDEX_FILE_EXTENSION)));
+    _builderConfig.getFunctionColumnPairs()
+        .forEach(dimension -> assertTrue(files.contains(dimension + RAW_SV_FORWARD_INDEX_FILE_EXTENSION)));
+    FileUtils.forceDelete(tempDir);
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ComparisonColumnsTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ComparisonColumnsTest.java
new file mode 100644
index 00000000000..2fae498b44d
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ComparisonColumnsTest.java
@@ -0,0 +1,171 @@
+/**
+ * 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.pinot.segment.local.upsert;
+
+import java.util.Arrays;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class ComparisonColumnsTest {
+  private void nullFill(Comparable[]... comparables) {
+    for (Comparable[] comps : comparables) {
+      Arrays.fill(comps, null);
+    }
+  }
+
+  @Test
+  public void testRealtimeComparison() {
+    Comparable[] newComparables = new Comparable[3];
+    Comparable[] persistedComparables = new Comparable[3];
+    ComparisonColumns alreadyPersisted = new ComparisonColumns(persistedComparables, 0);
+    ComparisonColumns toBeIngested = new ComparisonColumns(newComparables, 0);
+
+    // reject same col with smaller value
+    newComparables[0] = 1;
+    persistedComparables[0] = 2;
+    int comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, -1);
+
+    // persist same col with equal value
+    nullFill(newComparables, persistedComparables);
+    newComparables[0] = 2;
+    persistedComparables[0] = 2;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 0);
+
+    // persist same col with larger value
+    nullFill(newComparables, persistedComparables);
+    newComparables[0] = 2;
+    persistedComparables[0] = 1;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+    Assert.assertEquals(toBeIngested.getValues(), new Comparable[]{2, null, null});
+
+    // persist doc with col which was previously null, even though its value is smaller than the previous non-null col
+    nullFill(newComparables, persistedComparables);
+    toBeIngested = new ComparisonColumns(newComparables, newComparables.length - 1);
+    newComparables[newComparables.length - 1] = 1;
+    persistedComparables[0] = 2;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+    Assert.assertEquals(toBeIngested.getValues(), new Comparable[]{2, null, 1});
+
+    // persist new doc where existing doc has multiple non-null comparison values
+    nullFill(newComparables, persistedComparables);
+    toBeIngested = new ComparisonColumns(newComparables, 1);
+    newComparables[1] = 2;
+    Arrays.fill(persistedComparables, 1);
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+    Assert.assertEquals(toBeIngested.getValues(), new Comparable[]{1, 2, 1});
+
+    // reject new doc where existing doc has multiple non-null comparison values
+    nullFill(newComparables, persistedComparables);
+    newComparables[1] = 0;
+    Arrays.fill(persistedComparables, 1);
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, -1);
+  }
+
+  @Test
+  public void testSealedComparison() {
+    // Remember to be cognizant of which scenarios are _actually_ possible in a sealed segment. The way in which docs
+    // are compared during realtime ingestion dictates the possible scenarios of persisted rows. Ex. it is not
+    // possible for 2 docs with the same primary key to have a mutually exclusive set of non-null values; if such a
+    // scenario arose during realtime ingestion, the values would be merged such that the newly persisted doc would
+    // have all non-null comparison values. We should avoid making tests pass for scenarios that are not intended to
+    // be supported.
+    Comparable[] newComparables = new Comparable[3];
+    Comparable[] persistedComparables = new Comparable[3];
+    ComparisonColumns alreadyPersisted =
+        new ComparisonColumns(persistedComparables, ComparisonColumns.SEALED_SEGMENT_COMPARISON_INDEX);
+    ComparisonColumns toBeIngested =
+        new ComparisonColumns(newComparables, ComparisonColumns.SEALED_SEGMENT_COMPARISON_INDEX);
+
+    // reject same col with smaller value
+    newComparables[0] = 1;
+    persistedComparables[0] = 2;
+    int comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, -1);
+
+    // persist same col with equal value
+    nullFill(newComparables, persistedComparables);
+    newComparables[0] = 2;
+    persistedComparables[0] = 2;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 0);
+    // Verify unchanged comparables in the case of SEALED comparison
+    Assert.assertEquals(toBeIngested.getValues(), newComparables);
+
+    // persist same col with larger value
+    nullFill(newComparables, persistedComparables);
+    newComparables[0] = 2;
+    persistedComparables[0] = 1;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+
+    // reject doc where existing doc has more than one, but not all, non-null comparison values, but _this_ doc has 2
+    // null columns. The presence of null columns in one of the docs implies that it must have come before the doc
+    // with non-null columns.
+    nullFill(newComparables, persistedComparables);
+    newComparables[1] = 1;
+    persistedComparables[0] = 1;
+    persistedComparables[2] = 1;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, -1);
+
+    // persist doc where existing doc has more than one, but not all, non-null comparison values, but _this_ doc has
+    nullFill(newComparables, persistedComparables);
+    newComparables[0] = 1;
+    newComparables[2] = 2;
+    persistedComparables[0] = 1;
+    persistedComparables[2] = 1;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+
+    // persist doc with non-null value where existing doc had null value in same column previously (but multiple
+    // non-null in other columns)
+    nullFill(newComparables, persistedComparables);
+    newComparables[0] = 1;
+    newComparables[1] = 1;
+    newComparables[2] = 1;
+    persistedComparables[0] = 1;
+    persistedComparables[2] = 1;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+
+    // reject doc where existing doc has all non-null comparison values, but _this_ doc has 2 null values.
+    // The presence of null columns in one of the docs implies that it must have come before the doc with non-null
+    // columns.
+    nullFill(newComparables, persistedComparables);
+    newComparables[1] = 1;
+    Arrays.fill(persistedComparables, 1);
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, -1);
+
+    // Persist doc where existing doc has all non-null comparison values, but _this_ doc has a larger value.
+    nullFill(newComparables, persistedComparables);
+    Arrays.fill(newComparables, 1);
+    Arrays.fill(persistedComparables, 1);
+    newComparables[1] = 2;
+    comparisonResult = toBeIngested.compareTo(alreadyPersisted);
+    Assert.assertEquals(comparisonResult, 1);
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManagerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManagerTest.java
index a0f18aaf148..fe3907ada32 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManagerTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapPartitionUpsertMetadataManagerTest.java
@@ -18,19 +18,27 @@
  */
 package org.apache.pinot.segment.local.upsert;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.segment.local.indexsegment.immutable.EmptyIndexSegment;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentImpl;
 import org.apache.pinot.segment.local.upsert.ConcurrentMapPartitionUpsertMetadataManager.RecordLocation;
 import org.apache.pinot.segment.local.utils.HashUtils;
+import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.MutableSegment;
+import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.datasource.DataSource;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
@@ -42,6 +50,7 @@
 import org.apache.pinot.spi.utils.BytesUtils;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -58,9 +67,19 @@
 public class ConcurrentMapPartitionUpsertMetadataManagerTest {
   private static final String RAW_TABLE_NAME = "testTable";
   private static final String REALTIME_TABLE_NAME = TableNameBuilder.REALTIME.tableNameWithType(RAW_TABLE_NAME);
+  private static final File INDEX_DIR =
+      new File(FileUtils.getTempDirectory(), "ConcurrentMapPartitionUpsertMetadataManagerTest");
+
+  @BeforeClass
+  public void setup()
+      throws Exception {
+    FileUtils.deleteQuietly(INDEX_DIR);
+    FileUtils.forceMkdir(INDEX_DIR);
+  }
 
   @Test
-  public void testAddReplaceRemoveSegment() {
+  public void testAddReplaceRemoveSegment()
+      throws IOException {
     verifyAddReplaceRemoveSegment(HashFunction.NONE, false);
     verifyAddReplaceRemoveSegment(HashFunction.MD5, false);
     verifyAddReplaceRemoveSegment(HashFunction.MURMUR3, false);
@@ -69,19 +88,202 @@ public void testAddReplaceRemoveSegment() {
     verifyAddReplaceRemoveSegment(HashFunction.MURMUR3, true);
   }
 
-  private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean enableSnapshot) {
+  @Test
+  public void testUpsertMetadataCleanupWithTTLConfig() {
+    verifyRemoveExpiredPrimaryKeys(new Integer(80), new Integer(120));
+    verifyRemoveExpiredPrimaryKeys(new Float(80), new Float(120));
+    verifyRemoveExpiredPrimaryKeys(new Double(80), new Double(120));
+    verifyRemoveExpiredPrimaryKeys(new Long(80), new Long(120));
+    verifyPersistAndLoadWatermark();
+    verifyAddSegmentForTTL(new Integer(80));
+    verifyAddSegmentForTTL(new Float(80));
+    verifyAddSegmentForTTL(new Double(80));
+    verifyAddSegmentForTTL(new Long(80));
+    verifyAddOutOfTTLSegment();
+  }
+
+  private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean enableSnapshot)
+      throws IOException {
+    String comparisonColumn = "timeCol";
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList(comparisonColumn), null, hashFunction, null, false, 0, INDEX_DIR,
+            mock(ServerMetrics.class));
+    Map<Object, RecordLocation> recordLocationMap = upsertMetadataManager._primaryKeyToRecordLocationMap;
+    Set<IndexSegment> trackedSegments = upsertMetadataManager._trackedSegments;
+
+    // Add the first segment
+    int numRecords = 6;
+    int[] primaryKeys = new int[]{0, 1, 2, 0, 1, 0};
+    int[] timestamps = new int[]{100, 100, 100, 80, 120, 100};
+    ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    List<PrimaryKey> primaryKeys1 = getPrimaryKeyList(numRecords, primaryKeys);
+    ImmutableSegmentImpl segment1 = mockImmutableSegment(1, validDocIds1, null, primaryKeys1);
+    List<RecordInfo> recordInfoList1;
+    if (enableSnapshot) {
+      // get recordInfo from validDocIdSnapshot.
+      // segment1 snapshot: 0 -> {5, 100}, 1 -> {4, 120}, 2 -> {2, 100}
+      int[] docIds1 = new int[]{2, 4, 5};
+      MutableRoaringBitmap validDocIdsSnapshot1 = new MutableRoaringBitmap();
+      validDocIdsSnapshot1.add(docIds1);
+      recordInfoList1 = getRecordInfoList(validDocIdsSnapshot1, primaryKeys, timestamps, null);
+    } else {
+      // get recordInfo by iterating all records.
+      recordInfoList1 = getRecordInfoList(numRecords, primaryKeys, timestamps, null);
+    }
+    upsertMetadataManager.addSegment(segment1, validDocIds1, null, recordInfoList1.iterator());
+    trackedSegments.add(segment1);
+    // segment1: 0 -> {5, 100}, 1 -> {4, 120}, 2 -> {2, 100}
+    assertEquals(recordLocationMap.size(), 3);
+    checkRecordLocation(recordLocationMap, 0, segment1, 5, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 4, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment1, 2, 100, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{2, 4, 5});
+
+    // Add the second segment
+    numRecords = 5;
+    primaryKeys = new int[]{0, 1, 2, 3, 0};
+    timestamps = new int[]{100, 100, 120, 80, 80};
+    ThreadSafeMutableRoaringBitmap validDocIds2 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl segment2 =
+        mockImmutableSegment(2, validDocIds2, null, getPrimaryKeyList(numRecords, primaryKeys));
+    List<RecordInfo> recordInfoList2;
+    if (enableSnapshot) {
+      // get recordInfo from validDocIdSnapshot.
+      // segment2 snapshot: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
+      // segment1 snapshot: 1 -> {4, 120}
+      MutableRoaringBitmap validDocIdsSnapshot2 = new MutableRoaringBitmap();
+      validDocIdsSnapshot2.add(0, 2, 3);
+      recordInfoList2 = getRecordInfoList(validDocIdsSnapshot2, primaryKeys, timestamps, null);
+    } else {
+      // get recordInfo by iterating all records.
+      recordInfoList2 = getRecordInfoList(numRecords, primaryKeys, timestamps, null);
+    }
+    upsertMetadataManager.addSegment(segment2, validDocIds2, null, recordInfoList2.iterator());
+    trackedSegments.add(segment2);
+
+    // segment1: 1 -> {4, 120}
+    // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
+    assertEquals(recordLocationMap.size(), 4);
+    checkRecordLocation(recordLocationMap, 0, segment2, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 4, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 2, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+
+    // Add an empty segment
+    EmptyIndexSegment emptySegment = mockEmptySegment(3);
+    upsertMetadataManager.addSegment(emptySegment);
+    // segment1: 1 -> {4, 120}
+    // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
+    assertEquals(recordLocationMap.size(), 4);
+    checkRecordLocation(recordLocationMap, 0, segment2, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 4, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 2, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+
+    // Replace (reload) the first segment
+    ThreadSafeMutableRoaringBitmap newValidDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl newSegment1 = mockImmutableSegment(1, newValidDocIds1, null, primaryKeys1);
+    upsertMetadataManager.replaceSegment(newSegment1, newValidDocIds1, null, recordInfoList1.iterator(), segment1);
+    trackedSegments.add(newSegment1);
+    trackedSegments.remove(segment1);
+    // original segment1: 1 -> {4, 120} (not in the map)
+    // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
+    // new segment1: 1 -> {4, 120}
+    assertEquals(recordLocationMap.size(), 4);
+    checkRecordLocation(recordLocationMap, 0, segment2, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 2, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+    assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+
+    // Remove the original segment1
+    upsertMetadataManager.removeSegment(segment1);
+    // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
+    // new segment1: 1 -> {4, 120}
+    assertEquals(recordLocationMap.size(), 4);
+    checkRecordLocation(recordLocationMap, 0, segment2, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 2, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+    assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+
+    // Remove the empty segment
+    upsertMetadataManager.removeSegment(emptySegment);
+    // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
+    // new segment1: 1 -> {4, 120}
+    assertEquals(recordLocationMap.size(), 4);
+    checkRecordLocation(recordLocationMap, 0, segment2, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 2, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+    assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+
+    // Remove segment2
+    upsertMetadataManager.removeSegment(segment2);
+    // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80} (not in the map)
+    // new segment1: 1 -> {4, 120}
+    assertEquals(recordLocationMap.size(), 1);
+    checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+    assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(trackedSegments, Collections.singleton(newSegment1));
+
+    // Stop the metadata manager
+    upsertMetadataManager.stop();
+
+    // Remove new segment1, should be no-op
+    upsertMetadataManager.removeSegment(newSegment1);
+    // new segment1: 1 -> {4, 120}
+    assertEquals(recordLocationMap.size(), 1);
+    checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
+    assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(trackedSegments, Collections.singleton(newSegment1));
+
+    // Close the metadata manager
+    upsertMetadataManager.close();
+  }
+
+  @Test
+  public void testAddReplaceRemoveSegmentWithRecordDelete()
+      throws IOException {
+    verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction.NONE, false);
+    verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction.MD5, false);
+    verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction.MURMUR3, false);
+    verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction.NONE, true);
+    verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction.MD5, true);
+    verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction.MURMUR3, true);
+  }
+
+  private void verifyAddReplaceRemoveSegmentWithRecordDelete(HashFunction hashFunction, boolean enableSnapshot)
+      throws IOException {
+    String comparisonColumn = "timeCol";
+    String deleteRecordColumn = "deleteCol";
     ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
         new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
-            "timeCol", hashFunction, null, false, mock(ServerMetrics.class));
+            Collections.singletonList(comparisonColumn), deleteRecordColumn, hashFunction, null, false, 0, INDEX_DIR,
+            mock(ServerMetrics.class));
     Map<Object, RecordLocation> recordLocationMap = upsertMetadataManager._primaryKeyToRecordLocationMap;
+    Set<IndexSegment> trackedSegments = upsertMetadataManager._trackedSegments;
 
     // Add the first segment
     int numRecords = 6;
     int[] primaryKeys = new int[]{0, 1, 2, 0, 1, 0};
     int[] timestamps = new int[]{100, 100, 100, 80, 120, 100};
+    boolean[] deleteFlags = new boolean[]{false, false, false, true, true, false};
     ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    ThreadSafeMutableRoaringBitmap queryableDocIds1 = new ThreadSafeMutableRoaringBitmap();
     List<PrimaryKey> primaryKeys1 = getPrimaryKeyList(numRecords, primaryKeys);
-    ImmutableSegmentImpl segment1 = mockImmutableSegment(1, validDocIds1, primaryKeys1);
+    ImmutableSegmentImpl segment1 = mockImmutableSegment(1, validDocIds1, queryableDocIds1, primaryKeys1);
     List<RecordInfo> recordInfoList1;
     if (enableSnapshot) {
       // get recordInfo from validDocIdSnapshot.
@@ -89,25 +291,30 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
       int[] docIds1 = new int[]{2, 4, 5};
       MutableRoaringBitmap validDocIdsSnapshot1 = new MutableRoaringBitmap();
       validDocIdsSnapshot1.add(docIds1);
-      recordInfoList1 = getRecordInfoList(validDocIdsSnapshot1, primaryKeys, timestamps);
+      recordInfoList1 = getRecordInfoList(validDocIdsSnapshot1, primaryKeys, timestamps, deleteFlags);
     } else {
       // get recordInfo by iterating all records.
-      recordInfoList1 = getRecordInfoList(numRecords, primaryKeys, timestamps);
+      recordInfoList1 = getRecordInfoList(numRecords, primaryKeys, timestamps, deleteFlags);
     }
-    upsertMetadataManager.addSegment(segment1, validDocIds1, recordInfoList1.iterator());
+    upsertMetadataManager.addSegment(segment1, validDocIds1, queryableDocIds1, recordInfoList1.iterator());
+    trackedSegments.add(segment1);
     // segment1: 0 -> {5, 100}, 1 -> {4, 120}, 2 -> {2, 100}
     assertEquals(recordLocationMap.size(), 3);
     checkRecordLocation(recordLocationMap, 0, segment1, 5, 100, hashFunction);
     checkRecordLocation(recordLocationMap, 1, segment1, 4, 120, hashFunction);
     checkRecordLocation(recordLocationMap, 2, segment1, 2, 100, hashFunction);
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{2, 4, 5});
+    assertEquals(queryableDocIds1.getMutableRoaringBitmap().toArray(), new int[]{2, 5});
 
     // Add the second segment
     numRecords = 5;
     primaryKeys = new int[]{0, 1, 2, 3, 0};
     timestamps = new int[]{100, 100, 120, 80, 80};
+    deleteFlags = new boolean[]{false, true, true, false, false};
     ThreadSafeMutableRoaringBitmap validDocIds2 = new ThreadSafeMutableRoaringBitmap();
-    ImmutableSegmentImpl segment2 = mockImmutableSegment(2, validDocIds2, getPrimaryKeyList(numRecords, primaryKeys));
+    ThreadSafeMutableRoaringBitmap queryableDocIds2 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl segment2 =
+        mockImmutableSegment(2, validDocIds2, queryableDocIds2, getPrimaryKeyList(numRecords, primaryKeys));
     List<RecordInfo> recordInfoList2;
     if (enableSnapshot) {
       // get recordInfo from validDocIdSnapshot.
@@ -115,12 +322,13 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
       // segment1 snapshot: 1 -> {4, 120}
       MutableRoaringBitmap validDocIdsSnapshot2 = new MutableRoaringBitmap();
       validDocIdsSnapshot2.add(0, 2, 3);
-      recordInfoList2 = getRecordInfoList(validDocIdsSnapshot2, primaryKeys, timestamps);
+      recordInfoList2 = getRecordInfoList(validDocIdsSnapshot2, primaryKeys, timestamps, deleteFlags);
     } else {
       // get recordInfo by iterating all records.
-      recordInfoList2 = getRecordInfoList(numRecords, primaryKeys, timestamps);
+      recordInfoList2 = getRecordInfoList(numRecords, primaryKeys, timestamps, deleteFlags);
     }
-    upsertMetadataManager.addSegment(segment2, validDocIds2, recordInfoList2.iterator());
+    upsertMetadataManager.addSegment(segment2, validDocIds2, queryableDocIds2, recordInfoList2.iterator());
+    trackedSegments.add(segment2);
 
     // segment1: 1 -> {4, 120}
     // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
@@ -131,6 +339,8 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
     checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+    assertTrue(queryableDocIds1.getMutableRoaringBitmap().isEmpty());
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 3});
 
     // Add an empty segment
     EmptyIndexSegment emptySegment = mockEmptySegment(3);
@@ -144,11 +354,18 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
     checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
+    assertTrue(queryableDocIds1.getMutableRoaringBitmap().isEmpty());
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 3});
 
     // Replace (reload) the first segment
     ThreadSafeMutableRoaringBitmap newValidDocIds1 = new ThreadSafeMutableRoaringBitmap();
-    ImmutableSegmentImpl newSegment1 = mockImmutableSegment(1, newValidDocIds1, primaryKeys1);
-    upsertMetadataManager.replaceSegment(newSegment1, newValidDocIds1, recordInfoList1.iterator(), segment1);
+    ThreadSafeMutableRoaringBitmap newQueryableDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl newSegment1 = mockImmutableSegment(1, newValidDocIds1, newQueryableDocIds1, primaryKeys1);
+    upsertMetadataManager.replaceSegment(newSegment1, newValidDocIds1, newQueryableDocIds1, recordInfoList1.iterator(),
+        segment1);
+    trackedSegments.add(newSegment1);
+    trackedSegments.remove(segment1);
+
     // original segment1: 1 -> {4, 120} (not in the map)
     // segment2: 0 -> {0, 100}, 2 -> {2, 120}, 3 -> {3, 80}
     // new segment1: 1 -> {4, 120}
@@ -160,7 +377,9 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
     assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
-    assertEquals(upsertMetadataManager._replacedSegments, Collections.singleton(segment1));
+    assertTrue(queryableDocIds1.getMutableRoaringBitmap().isEmpty());
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 3});
+    assertTrue(newQueryableDocIds1.getMutableRoaringBitmap().isEmpty());
 
     // Remove the original segment1
     upsertMetadataManager.removeSegment(segment1);
@@ -174,7 +393,9 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
     assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
-    assertTrue(upsertMetadataManager._replacedSegments.isEmpty());
+    assertTrue(queryableDocIds1.getMutableRoaringBitmap().isEmpty());
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 3});
+    assertTrue(newQueryableDocIds1.getMutableRoaringBitmap().isEmpty());
 
     // Remove the empty segment
     upsertMetadataManager.removeSegment(emptySegment);
@@ -187,6 +408,8 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
     checkRecordLocation(recordLocationMap, 3, segment2, 3, 80, hashFunction);
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
     assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 3});
+    assertTrue(newQueryableDocIds1.getMutableRoaringBitmap().isEmpty());
 
     // Remove segment2
     upsertMetadataManager.removeSegment(segment2);
@@ -196,12 +419,32 @@ private void verifyAddReplaceRemoveSegment(HashFunction hashFunction, boolean en
     checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 2, 3});
     assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(trackedSegments, Collections.singleton(newSegment1));
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 3});
+    assertTrue(newQueryableDocIds1.getMutableRoaringBitmap().isEmpty());
+
+    // Stop the metadata manager
+    upsertMetadataManager.stop();
+
+    // Remove new segment1, should be no-op
+    upsertMetadataManager.removeSegment(newSegment1);
+    // new segment1: 1 -> {4, 120}
+    assertEquals(recordLocationMap.size(), 1);
+    checkRecordLocation(recordLocationMap, 1, newSegment1, 4, 120, hashFunction);
+    assertEquals(newValidDocIds1.getMutableRoaringBitmap().toArray(), new int[]{4});
+    assertEquals(trackedSegments, Collections.singleton(newSegment1));
+    assertTrue(newQueryableDocIds1.getMutableRoaringBitmap().isEmpty());
+
+    // Close the metadata manager
+    upsertMetadataManager.close();
   }
 
-  private List<RecordInfo> getRecordInfoList(int numRecords, int[] primaryKeys, int[] timestamps) {
+  private List<RecordInfo> getRecordInfoList(int numRecords, int[] primaryKeys, int[] timestamps,
+      @Nullable boolean[] deleteRecordFlags) {
     List<RecordInfo> recordInfoList = new ArrayList<>();
     for (int i = 0; i < numRecords; i++) {
-      recordInfoList.add(new RecordInfo(makePrimaryKey(primaryKeys[i]), i, new IntWrapper(timestamps[i])));
+      recordInfoList.add(new RecordInfo(makePrimaryKey(primaryKeys[i]), i, new IntWrapper(timestamps[i]),
+          deleteRecordFlags != null && deleteRecordFlags[i]));
     }
     return recordInfoList;
   }
@@ -210,11 +453,12 @@ private List<RecordInfo> getRecordInfoList(int numRecords, int[] primaryKeys, in
    * Get recordInfo from validDocIdsSnapshot (enabledSnapshot = True).
    */
   private List<RecordInfo> getRecordInfoList(MutableRoaringBitmap validDocIdsSnapshot, int[] primaryKeys,
-      int[] timestamps) {
+      int[] timestamps, @Nullable boolean[] deleteRecordFlags) {
     List<RecordInfo> recordInfoList = new ArrayList<>();
     Iterator<Integer> validDocIdsIterator = validDocIdsSnapshot.iterator();
     validDocIdsIterator.forEachRemaining((docId) -> recordInfoList.add(
-        new RecordInfo(makePrimaryKey(primaryKeys[docId]), docId, new IntWrapper(timestamps[docId]))));
+        new RecordInfo(makePrimaryKey(primaryKeys[docId]), docId, new IntWrapper(timestamps[docId]),
+            deleteRecordFlags != null && deleteRecordFlags[docId])));
     return recordInfoList;
   }
 
@@ -227,10 +471,12 @@ private List<PrimaryKey> getPrimaryKeyList(int numRecords, int[] primaryKeys) {
   }
 
   private static ImmutableSegmentImpl mockImmutableSegment(int sequenceNumber,
-      ThreadSafeMutableRoaringBitmap validDocIds, List<PrimaryKey> primaryKeys) {
+      ThreadSafeMutableRoaringBitmap validDocIds, @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds,
+      List<PrimaryKey> primaryKeys) {
     ImmutableSegmentImpl segment = mock(ImmutableSegmentImpl.class);
     when(segment.getSegmentName()).thenReturn(getSegmentName(sequenceNumber));
     when(segment.getValidDocIds()).thenReturn(validDocIds);
+    when(segment.getQueryableDocIds()).thenReturn(queryableDocIds);
     DataSource dataSource = mock(DataSource.class);
     when(segment.getDataSource(anyString())).thenReturn(dataSource);
     ForwardIndexReader forwardIndex = mock(ForwardIndexReader.class);
@@ -242,15 +488,36 @@ private static ImmutableSegmentImpl mockImmutableSegment(int sequenceNumber,
     return segment;
   }
 
+  private static ImmutableSegmentImpl mockImmutableSegmentWithEndTime(int sequenceNumber,
+      ThreadSafeMutableRoaringBitmap validDocIds, @Nullable ThreadSafeMutableRoaringBitmap queryableDocIds,
+      List<PrimaryKey> primaryKeys, List<String> comparisonColumns, Comparable endTime, MutableRoaringBitmap snapshot) {
+    ImmutableSegmentImpl segment = mockImmutableSegment(sequenceNumber, validDocIds, queryableDocIds, primaryKeys);
+    SegmentMetadataImpl segmentMetadata = mock(SegmentMetadataImpl.class);
+    when(segment.getSegmentMetadata()).thenReturn(segmentMetadata);
+    ColumnMetadata columnMetadata = mock(ColumnMetadata.class);
+    when(segmentMetadata.getColumnMetadataMap()).thenReturn(new TreeMap() {{
+      this.put(comparisonColumns.get(0), columnMetadata);
+    }});
+    when(columnMetadata.getMaxValue()).thenReturn(endTime);
+    if (snapshot != null) {
+      when(segment.loadValidDocIdsFromSnapshot()).thenReturn(snapshot);
+    } else {
+      when(segment.loadValidDocIdsFromSnapshot()).thenReturn(validDocIds.getMutableRoaringBitmap());
+    }
+    return segment;
+  }
+
   private static EmptyIndexSegment mockEmptySegment(int sequenceNumber) {
     SegmentMetadataImpl segmentMetadata = mock(SegmentMetadataImpl.class);
     when(segmentMetadata.getName()).thenReturn(getSegmentName(sequenceNumber));
     return new EmptyIndexSegment(segmentMetadata);
   }
 
-  private static MutableSegment mockMutableSegment(int sequenceNumber, ThreadSafeMutableRoaringBitmap validDocIds) {
+  private static MutableSegment mockMutableSegment(int sequenceNumber, ThreadSafeMutableRoaringBitmap validDocIds,
+      ThreadSafeMutableRoaringBitmap queryableDocIds) {
     MutableSegment segment = mock(MutableSegment.class);
     when(segment.getSegmentName()).thenReturn(getSegmentName(sequenceNumber));
+    when(segment.getQueryableDocIds()).thenReturn(queryableDocIds);
     when(segment.getValidDocIds()).thenReturn(validDocIds);
     return segment;
   }
@@ -274,16 +541,20 @@ private static void checkRecordLocation(Map<Object, RecordLocation> recordLocati
   }
 
   @Test
-  public void testAddRecord() {
+  public void testAddRecord()
+      throws IOException {
     verifyAddRecord(HashFunction.NONE);
     verifyAddRecord(HashFunction.MD5);
     verifyAddRecord(HashFunction.MURMUR3);
   }
 
-  private void verifyAddRecord(HashFunction hashFunction) {
+  private void verifyAddRecord(HashFunction hashFunction)
+      throws IOException {
+    String comparisonColumn = "timeCol";
     ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
         new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
-            "timeCol", hashFunction, null, false, mock(ServerMetrics.class));
+            Collections.singletonList(comparisonColumn), null, hashFunction, null, false, 0, INDEX_DIR,
+            mock(ServerMetrics.class));
     Map<Object, RecordLocation> recordLocationMap = upsertMetadataManager._primaryKeyToRecordLocationMap;
 
     // Add the first segment
@@ -292,14 +563,15 @@ private void verifyAddRecord(HashFunction hashFunction) {
     int[] primaryKeys = new int[]{0, 1, 2};
     int[] timestamps = new int[]{100, 120, 100};
     ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
-    ImmutableSegmentImpl segment1 = mockImmutableSegment(1, validDocIds1, getPrimaryKeyList(numRecords, primaryKeys));
-    upsertMetadataManager.addSegment(segment1, validDocIds1,
-        getRecordInfoList(numRecords, primaryKeys, timestamps).iterator());
+    ImmutableSegmentImpl segment1 =
+        mockImmutableSegment(1, validDocIds1, null, getPrimaryKeyList(numRecords, primaryKeys));
+    upsertMetadataManager.addSegment(segment1, validDocIds1, null,
+        getRecordInfoList(numRecords, primaryKeys, timestamps, null).iterator());
 
     // Update records from the second segment
     ThreadSafeMutableRoaringBitmap validDocIds2 = new ThreadSafeMutableRoaringBitmap();
-    MutableSegment segment2 = mockMutableSegment(1, validDocIds2);
-    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(3), 0, new IntWrapper(100)));
+    MutableSegment segment2 = mockMutableSegment(1, validDocIds2, null);
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(3), 0, new IntWrapper(100), false));
 
     // segment1: 0 -> {0, 100}, 1 -> {1, 120}, 2 -> {2, 100}
     // segment2: 3 -> {0, 100}
@@ -310,7 +582,8 @@ private void verifyAddRecord(HashFunction hashFunction) {
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0});
 
-    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(2), 1, new IntWrapper(120)));
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(2), 1, new IntWrapper(120), false));
+
     // segment1: 0 -> {0, 100}, 1 -> {1, 120}
     // segment2: 2 -> {1, 120}, 3 -> {0, 100}
     checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
@@ -320,7 +593,8 @@ private void verifyAddRecord(HashFunction hashFunction) {
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
 
-    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(1), 2, new IntWrapper(100)));
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(1), 2, new IntWrapper(100), false));
+
     // segment1: 0 -> {0, 100}, 1 -> {1, 120}
     // segment2: 2 -> {1, 120}, 3 -> {0, 100}
     checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
@@ -330,7 +604,22 @@ private void verifyAddRecord(HashFunction hashFunction) {
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
 
-    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(0), 3, new IntWrapper(100)));
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(0), 3, new IntWrapper(100), false));
+
+    // segment1: 1 -> {1, 120}
+    // segment2: 0 -> {3, 100}, 2 -> {1, 120}, 3 -> {0, 100}
+    checkRecordLocation(recordLocationMap, 0, segment2, 3, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 0, 100, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{1});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 3});
+
+    // Stop the metadata manager
+    upsertMetadataManager.stop();
+
+    // Add record should be no-op
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(0), 4, new IntWrapper(120), false));
     // segment1: 1 -> {1, 120}
     // segment2: 0 -> {3, 100}, 2 -> {1, 120}, 3 -> {0, 100}
     checkRecordLocation(recordLocationMap, 0, segment2, 3, 100, hashFunction);
@@ -339,6 +628,369 @@ private void verifyAddRecord(HashFunction hashFunction) {
     checkRecordLocation(recordLocationMap, 3, segment2, 0, 100, hashFunction);
     assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{1});
     assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 3});
+
+    // Close the metadata manager
+    upsertMetadataManager.close();
+  }
+
+  @Test
+  public void testPreloadSegment() {
+    verifyPreloadSegment(HashFunction.NONE);
+    verifyPreloadSegment(HashFunction.MD5);
+    verifyPreloadSegment(HashFunction.MURMUR3);
+  }
+
+  private void verifyPreloadSegment(HashFunction hashFunction) {
+    String comparisonColumn = "timeCol";
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList(comparisonColumn), null, hashFunction, null, false, 0, INDEX_DIR,
+            mock(ServerMetrics.class));
+    Map<Object, RecordLocation> recordLocationMap = upsertMetadataManager._primaryKeyToRecordLocationMap;
+
+    // Add the first segment
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}, 2 -> {2, 100}
+    int numRecords = 3;
+    int[] primaryKeys = new int[]{0, 1, 2};
+    int[] timestamps = new int[]{100, 120, 100};
+    ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl segment1 =
+        mockImmutableSegment(1, validDocIds1, null, getPrimaryKeyList(numRecords, primaryKeys));
+    // Preloading segment adds the segment without checking for upsert.
+    upsertMetadataManager.addSegment(segment1, validDocIds1, null,
+        getRecordInfoList(numRecords, primaryKeys, timestamps, null).iterator(), true);
+
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}, 2 -> {2, 100}
+    checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment1, 2, 100, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2});
+
+    // Add the 2nd segment
+    // segment2: 0 -> {0, 1}, 1 -> {1, 2}
+    numRecords = 2;
+    primaryKeys = new int[]{0, 1};
+    timestamps = new int[]{1, 2};
+    ThreadSafeMutableRoaringBitmap validDocIds2 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl segment2 =
+        mockImmutableSegment(2, validDocIds2, null, getPrimaryKeyList(numRecords, primaryKeys));
+    upsertMetadataManager.addSegment(segment2, validDocIds2, null,
+        getRecordInfoList(numRecords, primaryKeys, timestamps, null).iterator(), true);
+
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}, 2 -> {2, 100}
+    // segment2: 0 -> {0, 1}, 1 -> {1, 2}
+    // segment2 was preloaded, so new locations got put in tracking map w/o checking on comparison values.
+    checkRecordLocation(recordLocationMap, 0, segment2, 0, 1, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment2, 1, 2, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment1, 2, 100, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2});
+  }
+
+  @Test
+  public void testAddRecordWithDeleteColumn()
+      throws IOException {
+    verifyAddRecordWithDeleteColumn(HashFunction.NONE);
+    verifyAddRecordWithDeleteColumn(HashFunction.MD5);
+    verifyAddRecordWithDeleteColumn(HashFunction.MURMUR3);
+  }
+
+  private void verifyAddRecordWithDeleteColumn(HashFunction hashFunction)
+      throws IOException {
+    String comparisonColumn = "timeCol";
+    String deleteColumn = "deleteCol";
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList(comparisonColumn), deleteColumn, hashFunction, null, false, 0, INDEX_DIR,
+            mock(ServerMetrics.class));
+    Map<Object, RecordLocation> recordLocationMap = upsertMetadataManager._primaryKeyToRecordLocationMap;
+
+    // queryableDocIds is same as validDocIds in the absence of delete markers
+    // Add the first segment
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}, 2 -> {2, 100}
+    int numRecords = 3;
+    int[] primaryKeys = new int[]{0, 1, 2};
+    int[] timestamps = new int[]{100, 120, 100};
+    ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    ThreadSafeMutableRoaringBitmap queryableDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl segment1 =
+        mockImmutableSegment(1, validDocIds1, queryableDocIds1, getPrimaryKeyList(numRecords, primaryKeys));
+    upsertMetadataManager.addSegment(segment1, validDocIds1, queryableDocIds1,
+        getRecordInfoList(numRecords, primaryKeys, timestamps, null).iterator());
+
+    // Update records from the second segment
+    ThreadSafeMutableRoaringBitmap validDocIds2 = new ThreadSafeMutableRoaringBitmap();
+    ThreadSafeMutableRoaringBitmap queryableDocIds2 = new ThreadSafeMutableRoaringBitmap();
+    MutableSegment segment2 = mockMutableSegment(1, validDocIds2, queryableDocIds2);
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(3), 0, new IntWrapper(100), false));
+
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}, 2 -> {2, 100}
+    // segment2: 3 -> {0, 100}
+    checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment1, 2, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 0, 100, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0});
+    assertEquals(queryableDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2});
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0});
+
+    // Mark a record with latest value in segment1 as deleted
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(2), 1, new IntWrapper(120), true));
+
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}
+    // segment2: 2 -> {1, 120}, 3 -> {0, 100}
+    checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 0, 100, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(queryableDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{0});
+
+    // Mark a record with latest value in segment2 as deleted
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(3), 2, new IntWrapper(150), true));
+
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}
+    // segment2: 2 -> {1, 120}, 3 -> {2, 150}
+    checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 2, 150, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{1, 2});
+    assertEquals(queryableDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{});
+
+    // Revive a deleted primary key (by providing a larger comparisonValue)
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(3), 3, new IntWrapper(200), false));
+
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}
+    // segment2: 2 -> {1, 120}, 3 -> {3, 200}
+    checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 200, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{1, 3});
+    assertEquals(queryableDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{3});
+
+    // Stop the metadata manager
+    upsertMetadataManager.stop();
+
+    // Add record should be no-op
+    upsertMetadataManager.addRecord(segment2, new RecordInfo(makePrimaryKey(0), 4, new IntWrapper(120), false));
+    // segment1: 0 -> {0, 100}, 1 -> {1, 120}
+    // segment2: 2 -> {1, 120}, 3 -> {3, 200}
+    checkRecordLocation(recordLocationMap, 0, segment1, 0, 100, hashFunction);
+    checkRecordLocation(recordLocationMap, 1, segment1, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 2, segment2, 1, 120, hashFunction);
+    checkRecordLocation(recordLocationMap, 3, segment2, 3, 200, hashFunction);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(validDocIds2.getMutableRoaringBitmap().toArray(), new int[]{1, 3});
+    assertEquals(queryableDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1});
+    assertEquals(queryableDocIds2.getMutableRoaringBitmap().toArray(), new int[]{3});
+
+    // Close the metadata manager
+    upsertMetadataManager.close();
+  }
+
+  private void verifyRemoveExpiredPrimaryKeys(Comparable earlierComparisonValue, Comparable largerComparisonValue) {
+    File tableDir = new File(INDEX_DIR, REALTIME_TABLE_NAME);
+
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList("timeCol"), null, HashFunction.NONE, null, false, 30, tableDir,
+            mock(ServerMetrics.class));
+    Map<Object, ConcurrentMapPartitionUpsertMetadataManager.RecordLocation> recordLocationMap =
+        upsertMetadataManager._primaryKeyToRecordLocationMap;
+
+    // Add record to update largestSeenTimestamp, largest seen timestamp: earlierComparisonValue
+    ThreadSafeMutableRoaringBitmap validDocIds0 = new ThreadSafeMutableRoaringBitmap();
+    MutableSegment segment0 = mockMutableSegment(1, validDocIds0, null);
+    upsertMetadataManager.addRecord(segment0, new RecordInfo(makePrimaryKey(10), 1, earlierComparisonValue, false));
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+
+    // Add a segment with segmentEndTime = earlierComparisonValue, so it will not be skipped
+    int numRecords = 4;
+    int[] primaryKeys = new int[]{0, 1, 2, 3};
+    Number[] timestamps = new Number[]{100, 100, 120, 80};
+    ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    List<PrimaryKey> primaryKeys1 = getPrimaryKeyList(numRecords, primaryKeys);
+    ImmutableSegmentImpl segment1 =
+        mockImmutableSegmentWithEndTime(1, validDocIds1, null, primaryKeys1, Collections.singletonList("timeCol"),
+            earlierComparisonValue, null);
+
+    int[] docIds1 = new int[]{0, 1, 2, 3};
+    MutableRoaringBitmap validDocIdsSnapshot1 = new MutableRoaringBitmap();
+    validDocIdsSnapshot1.add(docIds1);
+
+    // load segment1.
+    upsertMetadataManager.addSegment(segment1, validDocIds1, null,
+        getRecordInfoListForTTL(numRecords, primaryKeys, timestamps).iterator());
+    assertEquals(recordLocationMap.size(), 5);
+    checkRecordLocationForTTL(recordLocationMap, 0, segment1, 0, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 1, segment1, 1, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 2, segment1, 2, 120, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 3, segment1, 3, 80, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+
+    // Add record to update largestSeenTimestamp, largest seen timestamp: largerComparisonValue
+    upsertMetadataManager.addRecord(segment0, new RecordInfo(makePrimaryKey(10), 0, largerComparisonValue, false));
+    assertEquals(recordLocationMap.size(), 5);
+    checkRecordLocationForTTL(recordLocationMap, 0, segment1, 0, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 1, segment1, 1, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 2, segment1, 2, 120, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 3, segment1, 3, 80, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 0, 120, HashFunction.NONE);
+
+    // records before (largest seen timestamp - TTL) are expired and removed from upsertMetadata.
+    upsertMetadataManager.removeExpiredPrimaryKeys();
+    assertEquals(recordLocationMap.size(), 4);
+    checkRecordLocationForTTL(recordLocationMap, 0, segment1, 0, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 1, segment1, 1, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 2, segment1, 2, 120, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 0, 120, HashFunction.NONE);
+
+    // ValidDocIds for out-of-ttl records should not be removed.
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2, 3});
+  }
+
+  private void verifyAddOutOfTTLSegment() {
+    File tableDir = new File(INDEX_DIR, REALTIME_TABLE_NAME);
+
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList("timeCol"), null, HashFunction.NONE, null, true, 30, tableDir,
+            mock(ServerMetrics.class));
+    Map<Object, ConcurrentMapPartitionUpsertMetadataManager.RecordLocation> recordLocationMap =
+        upsertMetadataManager._primaryKeyToRecordLocationMap;
+
+    // Add record to update largestSeenTimestamp, largest seen timestamp: 80
+    ThreadSafeMutableRoaringBitmap validDocIds0 = new ThreadSafeMutableRoaringBitmap();
+    MutableSegment segment0 = mockMutableSegment(1, validDocIds0, null);
+    upsertMetadataManager.addRecord(segment0, new RecordInfo(makePrimaryKey(10), 1, new Double(80), false));
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+
+    // Add a segment with segmentEndTime = 80, so it will not be skipped
+    int numRecords = 4;
+    int[] primaryKeys = new int[]{0, 1, 2, 3};
+    Number[] timestamps = new Number[]{100, 100, 120, 80};
+    ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    List<PrimaryKey> primaryKeys1 = getPrimaryKeyList(numRecords, primaryKeys);
+    ImmutableSegmentImpl segment1 =
+        mockImmutableSegmentWithEndTime(1, validDocIds1, null, primaryKeys1, Collections.singletonList("timeCol"),
+            new Double(80), null);
+
+    int[] docIds1 = new int[]{0, 1, 2, 3};
+    MutableRoaringBitmap validDocIdsSnapshot1 = new MutableRoaringBitmap();
+    validDocIdsSnapshot1.add(docIds1);
+
+    // load segment1 with segmentEndTime: 80, largest seen timestamp: 80. the segment will be loaded.
+    upsertMetadataManager.addSegment(segment1, validDocIds1, null,
+        getRecordInfoListForTTL(numRecords, primaryKeys, timestamps).iterator());
+    assertEquals(recordLocationMap.size(), 5);
+    checkRecordLocationForTTL(recordLocationMap, 0, segment1, 0, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 1, segment1, 1, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 2, segment1, 2, 120, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 3, segment1, 3, 80, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{0, 1, 2, 3});
+
+    // Add record to update largestSeenTimestamp, largest seen timestamp: 120
+    upsertMetadataManager.addRecord(segment0, new RecordInfo(makePrimaryKey(0), 0, new Double(120), false));
+    assertEquals(validDocIds1.getMutableRoaringBitmap().toArray(), new int[]{1, 2, 3});
+    assertEquals(recordLocationMap.size(), 5);
+    checkRecordLocationForTTL(recordLocationMap, 0, segment0, 0, 120, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 1, segment1, 1, 100, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 2, segment1, 2, 120, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 3, segment1, 3, 80, HashFunction.NONE);
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+
+    // Add an out-of-ttl segment, verify all the invalid docs should not show up again.
+    // Add a segment with segmentEndTime: 80, largest seen timestamp: 120. the segment will be skipped.
+    List<PrimaryKey> primaryKeys2 = getPrimaryKeyList(numRecords, new int[]{100, 101, 102, 103});
+    int[] docIds2 = new int[]{0, 1};
+    MutableRoaringBitmap validDocIdsSnapshot2 = new MutableRoaringBitmap();
+    validDocIdsSnapshot2.add(docIds2);
+    ThreadSafeMutableRoaringBitmap validDocIds2 = new ThreadSafeMutableRoaringBitmap();
+    ImmutableSegmentImpl segment2 =
+        mockImmutableSegmentWithEndTime(1, validDocIds2, null, primaryKeys2, Collections.singletonList("timeCol"),
+            new Double(80), validDocIdsSnapshot2);
+    upsertMetadataManager.addSegment(segment2);
+    // out of ttl segment should not be added to recordLocationMap
+    assertEquals(recordLocationMap.size(), 5);
+  }
+
+  private void verifyAddSegmentForTTL(Comparable comparisonValue) {
+    File tableDir = new File(INDEX_DIR, REALTIME_TABLE_NAME);
+
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList("timeCol"), null, HashFunction.NONE, null, true, 30, tableDir,
+            mock(ServerMetrics.class));
+    Map<Object, ConcurrentMapPartitionUpsertMetadataManager.RecordLocation> recordLocationMap =
+        upsertMetadataManager._primaryKeyToRecordLocationMap;
+
+    // Add record to update largestSeenTimestamp, largest seen timestamp: comparisonValue
+    ThreadSafeMutableRoaringBitmap validDocIds0 = new ThreadSafeMutableRoaringBitmap();
+    MutableSegment segment0 = mockMutableSegment(1, validDocIds0, null);
+    upsertMetadataManager.addRecord(segment0, new RecordInfo(makePrimaryKey(10), 1, comparisonValue, false));
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+
+    // add a segment with segmentEndTime = -1 so it will be skipped since it out-of-TTL
+    int numRecords = 4;
+    int[] primaryKeys = new int[]{0, 1, 2, 3};
+    ThreadSafeMutableRoaringBitmap validDocIds1 = new ThreadSafeMutableRoaringBitmap();
+    List<PrimaryKey> primaryKeys1 = getPrimaryKeyList(numRecords, primaryKeys);
+    ImmutableSegmentImpl segment1 =
+        mockImmutableSegmentWithEndTime(1, validDocIds1, null, primaryKeys1, Collections.singletonList("timeCol"), -1,
+            null);
+
+    int[] docIds1 = new int[]{0, 1, 2, 3};
+    MutableRoaringBitmap validDocIdsSnapshot1 = new MutableRoaringBitmap();
+    validDocIdsSnapshot1.add(docIds1);
+
+    // load segment1.
+    upsertMetadataManager.addSegment(segment1);
+    assertEquals(recordLocationMap.size(), 1);
+    checkRecordLocationForTTL(recordLocationMap, 10, segment0, 1, 80, HashFunction.NONE);
+  }
+
+  // Add the following utils function since the Comparison column is a long value for TTL enabled upsert table.
+  private List<RecordInfo> getRecordInfoListForTTL(int numRecords, int[] primaryKeys, Number[] timestamps) {
+    List<RecordInfo> recordInfoList = new ArrayList<>();
+    for (int i = 0; i < numRecords; i++) {
+      recordInfoList.add(
+          new RecordInfo(makePrimaryKey(primaryKeys[i]), i, new Double(timestamps[i].doubleValue()), false));
+    }
+    return recordInfoList;
+  }
+
+  // Add the following utils function since the Comparison column is a long value for TTL enabled upsert table.
+  private static void checkRecordLocationForTTL(Map<Object, RecordLocation> recordLocationMap, int keyValue,
+      IndexSegment segment, int docId, Number comparisonValue, HashFunction hashFunction) {
+    RecordLocation recordLocation =
+        recordLocationMap.get(HashUtils.hashPrimaryKey(makePrimaryKey(keyValue), hashFunction));
+    assertNotNull(recordLocation);
+    assertSame(recordLocation.getSegment(), segment);
+    assertEquals(recordLocation.getDocId(), docId);
+    assertEquals(((Number) recordLocation.getComparisonValue()).doubleValue(), comparisonValue.doubleValue());
+  }
+
+  private void verifyPersistAndLoadWatermark() {
+    ConcurrentMapPartitionUpsertMetadataManager upsertMetadataManager =
+        new ConcurrentMapPartitionUpsertMetadataManager(REALTIME_TABLE_NAME, 0, Collections.singletonList("pk"),
+            Collections.singletonList("timeCol"), null, HashFunction.NONE, null, true, 10, INDEX_DIR,
+            mock(ServerMetrics.class));
+
+    double currentTimeMs = System.currentTimeMillis();
+    upsertMetadataManager.persistWatermark(currentTimeMs);
+    assertTrue(new File(INDEX_DIR, V1Constants.TTL_WATERMARK_TABLE_PARTITION + 0).exists());
+
+    double watermark = upsertMetadataManager.loadWatermark();
+    assertEquals(watermark, currentTimeMs);
   }
 
   @Test
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManagerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManagerTest.java
new file mode 100644
index 00000000000..ee1d6ffbd28
--- /dev/null
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/ConcurrentMapTableUpsertMetadataManagerTest.java
@@ -0,0 +1,211 @@
+/**
+ * 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.pinot.segment.local.upsert;
+
+import com.google.common.collect.ImmutableMap;
+import java.io.File;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.io.FileUtils;
+import org.apache.helix.HelixDataAccessor;
+import org.apache.helix.HelixManager;
+import org.apache.helix.PropertyKey;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.zookeeper.datamodel.ZNRecord;
+import org.apache.pinot.common.metadata.ZKMetadataProvider;
+import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
+import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.segment.local.data.manager.TableDataManager;
+import org.apache.pinot.segment.local.data.manager.TableDataManagerConfig;
+import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
+import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.spi.config.instance.InstanceDataManagerConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.UpsertConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.CommonConstants;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+public class ConcurrentMapTableUpsertMetadataManagerTest {
+  private static final File TEMP_DIR =
+      new File(FileUtils.getTempDirectory(), "ConcurrentMapTableUpsertMetadataManagerTest");
+  private ExecutorService _segmentPreloadExecutor;
+
+  @BeforeClass
+  public void setUp()
+      throws Exception {
+    FileUtils.deleteQuietly(TEMP_DIR);
+    _segmentPreloadExecutor = Executors.newFixedThreadPool(1);
+  }
+
+  @AfterClass
+  public void tearDown() {
+    FileUtils.deleteQuietly(TEMP_DIR);
+    _segmentPreloadExecutor.shutdownNow();
+  }
+
+  @Test
+  public void testSkipPreloadSegments() {
+    TableConfig tableConfig = mock(TableConfig.class);
+    UpsertConfig upsertConfig = new UpsertConfig();
+    upsertConfig.setComparisonColumn("ts");
+    when(tableConfig.getUpsertConfig()).thenReturn(upsertConfig);
+    Schema schema = mock(Schema.class);
+    when(schema.getPrimaryKeyColumns()).thenReturn(Collections.singletonList("pk"));
+
+    // Preloading is skipped as snapshot is not enabled.
+    ConcurrentMapTableUpsertMetadataManager mgr = new ConcurrentMapTableUpsertMetadataManager();
+    assertFalse(mgr.isPreloading());
+    mgr.init(tableConfig, schema, mock(TableDataManager.class), mock(ServerMetrics.class), mock(HelixManager.class),
+        _segmentPreloadExecutor);
+    assertFalse(mgr.isPreloading());
+
+    // Preloading is skipped as preloading is not turned on.
+    upsertConfig.setEnableSnapshot(true);
+    mgr = new ConcurrentMapTableUpsertMetadataManager();
+    assertFalse(mgr.isPreloading());
+    mgr.init(tableConfig, schema, mock(TableDataManager.class), mock(ServerMetrics.class), mock(HelixManager.class),
+        _segmentPreloadExecutor);
+    assertFalse(mgr.isPreloading());
+
+    upsertConfig.setEnablePreload(true);
+    mgr = new ConcurrentMapTableUpsertMetadataManager();
+    assertFalse(mgr.isPreloading());
+    // The preloading logic will hit on error as the HelixManager mock is not fully setup. But failure of preloading
+    // should not fail the init() method.
+    mgr.init(tableConfig, schema, mock(TableDataManager.class), mock(ServerMetrics.class), mock(HelixManager.class),
+        _segmentPreloadExecutor);
+    assertFalse(mgr.isPreloading());
+  }
+
+  @Test
+  public void testPreloadOnlineSegments()
+      throws Exception {
+    Set<String> preloadedSegments = new HashSet<>();
+    AtomicBoolean wasPreloading = new AtomicBoolean(false);
+    ConcurrentMapTableUpsertMetadataManager mgr = new ConcurrentMapTableUpsertMetadataManager() {
+      @Override
+      protected IndexLoadingConfig createIndexLoadingConfig() {
+        return mock(IndexLoadingConfig.class);
+      }
+
+      @Override
+      protected void preloadSegmentWithSnapshot(String segmentName, IndexLoadingConfig indexLoadingConfig,
+          SegmentZKMetadata zkMetadata) {
+        wasPreloading.set(isPreloading());
+        preloadedSegments.add(segmentName);
+      }
+    };
+    // Setup mocks for TableConfig and Schema.
+    String tableNameWithType = "myTable_REALTIME";
+    TableConfig tableConfig = mock(TableConfig.class);
+    UpsertConfig upsertConfig = new UpsertConfig();
+    upsertConfig.setComparisonColumn("ts");
+    upsertConfig.setEnablePreload(true);
+    upsertConfig.setEnableSnapshot(true);
+    when(tableConfig.getUpsertConfig()).thenReturn(upsertConfig);
+    when(tableConfig.getTableName()).thenReturn(tableNameWithType);
+    Schema schema = mock(Schema.class);
+    when(schema.getPrimaryKeyColumns()).thenReturn(Collections.singletonList("pk"));
+
+    // Setup mocks for HelixManager.
+    HelixManager helixManager = mock(HelixManager.class);
+    IdealState idealState = mock(IdealState.class);
+    HelixDataAccessor dataAccessor = mock(HelixDataAccessor.class);
+    PropertyKey.Builder keyBuilder = mock(PropertyKey.Builder.class);
+    ZkHelixPropertyStore<ZNRecord> propertyStore = mock(ZkHelixPropertyStore.class);
+    PropertyKey propKey = mock(PropertyKey.class);
+    when(helixManager.getHelixDataAccessor()).thenReturn(dataAccessor);
+    when(helixManager.getHelixPropertyStore()).thenReturn(propertyStore);
+    when(dataAccessor.keyBuilder()).thenReturn(keyBuilder);
+    when(keyBuilder.idealStates(anyString())).thenReturn(propKey);
+    when(dataAccessor.getProperty(propKey)).thenReturn(idealState);
+
+    // Setup mocks to return the instanceId.
+    String instanceId = "server01";
+    TableDataManager tableDataManager = mock(TableDataManager.class);
+    TableDataManagerConfig tdmc = mock(TableDataManagerConfig.class);
+    InstanceDataManagerConfig idmc = mock(InstanceDataManagerConfig.class);
+    when(tableDataManager.getTableDataManagerConfig()).thenReturn(tdmc);
+    when(tdmc.getInstanceDataManagerConfig()).thenReturn(idmc);
+    when(idmc.getInstanceId()).thenReturn(instanceId);
+
+    // Only ONLINE segments are preloaded.
+    Map<String, Map<String, String>> segStates = new HashMap<>();
+    segStates.put("consuming_seg01", ImmutableMap.of(instanceId, "CONSUMING"));
+    segStates.put("consuming_seg02", ImmutableMap.of(instanceId, "CONSUMING"));
+    segStates.put("online_seg01", ImmutableMap.of(instanceId, "ONLINE"));
+    segStates.put("online_seg02", ImmutableMap.of(instanceId, "ONLINE"));
+    segStates.put("offline_seg01", ImmutableMap.of(instanceId, "OFFLINE"));
+    segStates.put("offline_seg02", ImmutableMap.of(instanceId, "OFFLINE"));
+    when(idealState.getPartitionSet()).thenReturn(segStates.keySet());
+    for (String segName : segStates.keySet()) {
+      when(idealState.getInstanceStateMap(segName)).thenReturn(segStates.get(segName));
+    }
+
+    // Setup mocks to get file path to validDocIds snapshot.
+    SegmentZKMetadata realtimeSegmentZKMetadata = new SegmentZKMetadata("online_seg01");
+    realtimeSegmentZKMetadata.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
+    when(propertyStore.get(
+        eq(ZKMetadataProvider.constructPropertyStorePathForSegment(tableNameWithType, "online_seg01")), any(),
+        anyInt())).thenReturn(realtimeSegmentZKMetadata.toZNRecord());
+    realtimeSegmentZKMetadata = new SegmentZKMetadata("online_seg02");
+    realtimeSegmentZKMetadata.setStatus(CommonConstants.Segment.Realtime.Status.DONE);
+    when(propertyStore.get(
+        eq(ZKMetadataProvider.constructPropertyStorePathForSegment(tableNameWithType, "online_seg02")), any(),
+        anyInt())).thenReturn(realtimeSegmentZKMetadata.toZNRecord());
+
+    // No snapshot file for online_seg01, so it's skipped.
+    File seg01IdxDir = new File(TEMP_DIR, "online_seg01");
+    FileUtils.forceMkdir(seg01IdxDir);
+    when(tableDataManager.getSegmentDataDir("online_seg01", null, tableConfig)).thenReturn(seg01IdxDir);
+
+    File seg02IdxDir = new File(TEMP_DIR, "online_seg02");
+    FileUtils.forceMkdir(seg02IdxDir);
+    FileUtils.touch(new File(new File(seg02IdxDir, "v3"), V1Constants.VALID_DOC_IDS_SNAPSHOT_FILE_NAME));
+    when(tableDataManager.getSegmentDataDir("online_seg02", null, tableConfig)).thenReturn(seg02IdxDir);
+
+    assertFalse(mgr.isPreloading());
+    mgr.init(tableConfig, schema, tableDataManager, mock(ServerMetrics.class), helixManager, _segmentPreloadExecutor);
+    assertEquals(preloadedSegments.size(), 1);
+    assertTrue(preloadedSegments.contains("online_seg02"));
+    assertTrue(wasPreloading.get());
+    assertFalse(mgr.isPreloading());
+  }
+}
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandlerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandlerTest.java
index 913215c85d6..fd335ad41b0 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandlerTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/upsert/PartialUpsertHandlerTest.java
@@ -19,6 +19,7 @@
 package org.apache.pinot.segment.local.upsert;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.pinot.spi.config.table.UpsertConfig;
@@ -43,7 +44,8 @@ public void testMerge() {
     Map<String, UpsertConfig.Strategy> partialUpsertStrategies = new HashMap<>();
     partialUpsertStrategies.put("field1", UpsertConfig.Strategy.INCREMENT);
     PartialUpsertHandler handler =
-        new PartialUpsertHandler(schema, partialUpsertStrategies, UpsertConfig.Strategy.OVERWRITE, "hoursSinceEpoch");
+        new PartialUpsertHandler(schema, partialUpsertStrategies, UpsertConfig.Strategy.OVERWRITE,
+            Collections.singletonList("hoursSinceEpoch"));
 
     // both records are null.
     GenericRow previousRecord = new GenericRow();
@@ -98,7 +100,8 @@ public void testMergeWithDefaultPartialUpsertStrategy() {
     Map<String, UpsertConfig.Strategy> partialUpsertStrategies = new HashMap<>();
     partialUpsertStrategies.put("field1", UpsertConfig.Strategy.INCREMENT);
     PartialUpsertHandler handler =
-        new PartialUpsertHandler(schema, partialUpsertStrategies, UpsertConfig.Strategy.OVERWRITE, "hoursSinceEpoch");
+        new PartialUpsertHandler(schema, partialUpsertStrategies, UpsertConfig.Strategy.OVERWRITE,
+            Collections.singletonList("hoursSinceEpoch"));
 
     // previousRecord is null default value, while newRecord is not.
     GenericRow previousRecord = new GenericRow();
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/IngestionUtilsTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/IngestionUtilsTest.java
index 9b54600e93b..817ce0362a3 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/IngestionUtilsTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/IngestionUtilsTest.java
@@ -233,4 +233,20 @@ public void testExtractFieldsAggregationConfig() {
     Assert.assertEquals(fields.size(), 1);
     Assert.assertTrue(fields.containsAll(Sets.newHashSet("s1")));
   }
+
+  @Test
+  public void testComplexTypeConfig() {
+    IngestionConfig ingestionConfig = new IngestionConfig();
+    ComplexTypeConfig complexTypeConfig = new ComplexTypeConfig(null, "__",
+        ComplexTypeConfig.CollectionNotUnnestedToJson.NON_PRIMITIVE, null);
+    Schema schema = new Schema();
+
+    ingestionConfig.setComplexTypeConfig(complexTypeConfig);
+    schema.addField(new DimensionFieldSpec("a_b__c_d", FieldSpec.DataType.STRING, true));
+    schema.addField(new DimensionFieldSpec("f_d", FieldSpec.DataType.STRING, false));
+    schema.addField(new DimensionFieldSpec("ab__cd", FieldSpec.DataType.STRING, true));
+    Set<String> fields = IngestionUtils.getFieldsForRecordExtractor(ingestionConfig, schema);
+    Assert.assertEquals(fields.size(), 3);
+    Assert.assertTrue(fields.containsAll(Sets.newHashSet("a_b", "f_d", "ab")));
+  }
 }
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/TableConfigUtilsTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/TableConfigUtilsTest.java
index adf81f9b30b..9d58b42161b 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/TableConfigUtilsTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/TableConfigUtilsTest.java
@@ -32,6 +32,7 @@
 import org.apache.pinot.spi.config.table.DedupConfig;
 import org.apache.pinot.spi.config.table.FieldConfig;
 import org.apache.pinot.spi.config.table.HashFunction;
+import org.apache.pinot.spi.config.table.ReplicaGroupStrategyConfig;
 import org.apache.pinot.spi.config.table.RoutingConfig;
 import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
 import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
@@ -42,6 +43,7 @@
 import org.apache.pinot.spi.config.table.UpsertConfig;
 import org.apache.pinot.spi.config.table.assignment.InstanceAssignmentConfig;
 import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
+import org.apache.pinot.spi.config.table.assignment.InstanceReplicaGroupPartitionConfig;
 import org.apache.pinot.spi.config.table.ingestion.AggregationConfig;
 import org.apache.pinot.spi.config.table.ingestion.BatchIngestionConfig;
 import org.apache.pinot.spi.config.table.ingestion.ComplexTypeConfig;
@@ -918,29 +920,42 @@ public void testValidateFieldConfig() {
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
         .setNoDictionaryColumns(Arrays.asList("myCol1")).build();
     try {
-      // Enable forward index disabled flag for a raw column
+      // Enable forward index disabled flag for a raw column. This should succeed as though the forward index cannot
+      // be rebuilt without a dictionary, the constraint to have a dictionary has been lifted.
       Map<String, String> fieldConfigProperties = new HashMap<>();
       fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
-      FieldConfig fieldConfig = new FieldConfig("myCol1", FieldConfig.EncodingType.RAW, null, null, null, null,
-          fieldConfigProperties);
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol1", FieldConfig.EncodingType.RAW, null, null, null, null, fieldConfigProperties);
       tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
       TableConfigUtils.validate(tableConfig, schema);
-      Assert.fail("Should fail for myCol1 without dictionary and with forward index disabled");
     } catch (Exception e) {
-      Assert.assertEquals(e.getMessage(), "Forward index disabled column myCol1 must have dictionary enabled");
+      Assert.fail("Validation should pass since forward index can be disabled for a column without a dictionary");
     }
 
     try {
-      // Enable forward index disabled flag for a column without inverted index
+      // Enable forward index disabled flag for a column without inverted index. This should succeed as though the
+      // forward index cannot be rebuilt without an inverted index, the constraint to have an inverted index has been
+      // lifted.
       Map<String, String> fieldConfigProperties = new HashMap<>();
       fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
-      FieldConfig fieldConfig = new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY, null, null, null, null,
-          fieldConfigProperties);
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY, null, null, null, null, fieldConfigProperties);
       tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
       TableConfigUtils.validate(tableConfig, schema);
-      Assert.fail("Should fail for conflicting myCol2 with forward index disabled but no inverted index");
     } catch (Exception e) {
-      Assert.assertEquals(e.getMessage(), "Forward index disabled column myCol2 must have inverted index enabled");
+      Assert.fail("Validation should pass since forward index can be disabled for a column without an inverted index");
+    }
+
+    try {
+      // Enable forward index disabled flag for a column and verify that dictionary override options are not set.
+      Map<String, String> fieldConfigProperties = new HashMap<>();
+      fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
+      tableConfig.getIndexingConfig().setOptimizeDictionaryForMetrics(true);
+      tableConfig.getIndexingConfig().setOptimizeDictionaryForMetrics(true);
+      TableConfigUtils.validate(tableConfig, schema);
+    } catch (Exception e) {
+      Assert.assertEquals(e.getMessage(), "Dictionary override optimization options (OptimizeDictionary, "
+          + "optimizeDictionaryForMetrics) not supported with forward index for column: myCol2, disabled");
     }
 
     tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
@@ -949,8 +964,9 @@ public void testValidateFieldConfig() {
       // Enable forward index disabled flag for a column with inverted index
       Map<String, String> fieldConfigProperties = new HashMap<>();
       fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
-      FieldConfig fieldConfig = new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY,
-          FieldConfig.IndexType.INVERTED, null, null, null, fieldConfigProperties);
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY, FieldConfig.IndexType.INVERTED, null, null,
+              null, fieldConfigProperties);
       tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
       TableConfigUtils.validate(tableConfig, schema);
     } catch (Exception e) {
@@ -964,8 +980,9 @@ public void testValidateFieldConfig() {
       // Enable forward index disabled flag for a column with inverted index and is sorted
       Map<String, String> fieldConfigProperties = new HashMap<>();
       fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
-      FieldConfig fieldConfig = new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY,
-          FieldConfig.IndexType.INVERTED, null, null, null, fieldConfigProperties);
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY, FieldConfig.IndexType.INVERTED, null, null,
+              null, fieldConfigProperties);
       tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
       TableConfigUtils.validate(tableConfig, schema);
     } catch (Exception e) {
@@ -979,9 +996,10 @@ public void testValidateFieldConfig() {
       // Enable forward index disabled flag for a multi-value column with inverted index and range index
       Map<String, String> fieldConfigProperties = new HashMap<>();
       fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
-      FieldConfig fieldConfig = new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY,
-          FieldConfig.IndexType.INVERTED, Arrays.asList(FieldConfig.IndexType.INVERTED, FieldConfig.IndexType.RANGE),
-          null, null, fieldConfigProperties);
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol2", FieldConfig.EncodingType.DICTIONARY, FieldConfig.IndexType.INVERTED,
+              Arrays.asList(FieldConfig.IndexType.INVERTED, FieldConfig.IndexType.RANGE), null, null,
+              fieldConfigProperties);
       tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
       TableConfigUtils.validate(tableConfig, schema);
       Assert.fail("Should fail for MV myCol2 with forward index disabled but has range and inverted index");
@@ -996,9 +1014,10 @@ public void testValidateFieldConfig() {
       // Enable forward index disabled flag for a singe-value column with inverted index and range index v1
       Map<String, String> fieldConfigProperties = new HashMap<>();
       fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
-      FieldConfig fieldConfig = new FieldConfig("myCol1", FieldConfig.EncodingType.DICTIONARY,
-          FieldConfig.IndexType.INVERTED, Arrays.asList(FieldConfig.IndexType.INVERTED, FieldConfig.IndexType.RANGE),
-          null, null, fieldConfigProperties);
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol1", FieldConfig.EncodingType.DICTIONARY, FieldConfig.IndexType.INVERTED,
+              Arrays.asList(FieldConfig.IndexType.INVERTED, FieldConfig.IndexType.RANGE), null, null,
+              fieldConfigProperties);
       tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
       tableConfig.getIndexingConfig().setRangeIndexVersion(1);
       TableConfigUtils.validate(tableConfig, schema);
@@ -1008,6 +1027,54 @@ public void testValidateFieldConfig() {
           + "< 2. Cannot disable forward index for column myCol1. Either disable range index or create range index "
           + "with version >= 2 to use this feature");
     }
+
+    tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setNoDictionaryColumns(Arrays.asList("myCol2")).setInvertedIndexColumns(Arrays.asList("myCol2")).build();
+    try {
+      // Enable forward index disabled flag for a column with inverted index and disable dictionary
+      Map<String, String> fieldConfigProperties = new HashMap<>();
+      fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol2", FieldConfig.EncodingType.RAW, FieldConfig.IndexType.INVERTED, null, null, null,
+              fieldConfigProperties);
+      tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
+      TableConfigUtils.validate(tableConfig, schema);
+      Assert.fail("Should not be able to disable dictionary but keep inverted index");
+    } catch (Exception e) {
+      Assert.assertEquals(e.getMessage(),
+          "Cannot create an Inverted index on column myCol2 specified in the " + "noDictionaryColumns config");
+    }
+
+    tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setNoDictionaryColumns(Arrays.asList("myCol2")).build();
+    try {
+      // Enable forward index disabled flag for a column with FST index and disable dictionary
+      Map<String, String> fieldConfigProperties = new HashMap<>();
+      fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
+      FieldConfig fieldConfig =
+          new FieldConfig("myCol2", FieldConfig.EncodingType.RAW, FieldConfig.IndexType.FST, null, null, null,
+              fieldConfigProperties);
+      tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
+      TableConfigUtils.validate(tableConfig, schema);
+      Assert.fail("Should not be able to disable dictionary but keep inverted index");
+    } catch (Exception e) {
+      Assert.assertEquals(e.getMessage(), "FST Index is only enabled on dictionary encoded columns");
+    }
+
+    tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setNoDictionaryColumns(Arrays.asList("intCol")).setRangeIndexColumns(Arrays.asList("intCol")).build();
+    try {
+      // Enable forward index disabled flag for a column with FST index and disable dictionary
+      Map<String, String> fieldConfigProperties = new HashMap<>();
+      fieldConfigProperties.put(FieldConfig.FORWARD_INDEX_DISABLED, Boolean.TRUE.toString());
+      FieldConfig fieldConfig =
+          new FieldConfig("intCol", FieldConfig.EncodingType.RAW, FieldConfig.IndexType.RANGE, null, null, null,
+              fieldConfigProperties);
+      tableConfig.setFieldConfigList(Arrays.asList(fieldConfig));
+      TableConfigUtils.validate(tableConfig, schema);
+    } catch (Exception e) {
+      Assert.fail("Range index with forward index disabled no dictionary column is allowed");
+    }
   }
 
   @Test
@@ -1461,6 +1528,41 @@ public void testValidateUpsertConfig() {
       Assert.assertEquals(e.getMessage(),
           "Metrics aggregation cannot be enabled in the Indexing Config and Ingestion Config at the same time");
     }
+
+    // Table upsert with delete column
+    String incorrectTypeDelCol = "incorrectTypeDeleteCol";
+    String delCol = "myDelCol";
+    schema = new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).setPrimaryKeyColumns(Lists.newArrayList("myPkCol"))
+        .addSingleValueDimension("myCol", FieldSpec.DataType.STRING)
+        .addSingleValueDimension(incorrectTypeDelCol, FieldSpec.DataType.STRING)
+        .addSingleValueDimension(delCol, FieldSpec.DataType.BOOLEAN).build();
+    streamConfigs = getStreamConfigs();
+    streamConfigs.put("stream.kafka.consumer.type", "simple");
+
+    upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setDeleteRecordColumn(incorrectTypeDelCol);
+    tableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setStreamConfigs(streamConfigs)
+        .setUpsertConfig(upsertConfig)
+        .setRoutingConfig(new RoutingConfig(null, null, RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE))
+        .build();
+    try {
+      TableConfigUtils.validateUpsertAndDedupConfig(tableConfig, schema);
+      Assert.fail("Invalid delete column type (string) should have failed table creation");
+    } catch (IllegalStateException e) {
+      Assert.assertEquals(e.getMessage(), "The delete record column must be a single-valued BOOLEAN column");
+    }
+
+    upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setDeleteRecordColumn(delCol);
+    tableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setStreamConfigs(streamConfigs)
+        .setUpsertConfig(upsertConfig)
+        .setRoutingConfig(new RoutingConfig(null, null, RoutingConfig.STRICT_REPLICA_GROUP_INSTANCE_SELECTOR_TYPE))
+        .build();
+    try {
+      TableConfigUtils.validateUpsertAndDedupConfig(tableConfig, schema);
+    } catch (IllegalStateException e) {
+      Assert.fail("Shouldn't fail table creation when delete column type is boolean.");
+    }
   }
 
   @Test
@@ -1657,6 +1759,27 @@ public void testTaskConfig() {
     } catch (IllegalStateException e) {
       Assert.assertTrue(e.getMessage().contains("has invalid aggregate type"));
     }
+
+    // aggregation function that exists but has no ValueAggregator available
+    HashMap<String, String> invalidAgg2Config = new HashMap<>(realtimeToOfflineTaskConfig);
+    invalidAgg2Config.put("myCol.aggregationType", "Histogram");
+    tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).setTaskConfig(new TableTaskConfig(
+        ImmutableMap.of("RealtimeToOfflineSegmentsTask", invalidAgg2Config, "SegmentGenerationAndPushTask",
+            segmentGenerationAndPushTaskConfig))).build();
+    try {
+      TableConfigUtils.validateTaskConfigs(tableConfig, schema);
+      Assert.fail();
+    } catch (IllegalStateException e) {
+      Assert.assertTrue(e.getMessage().contains("has invalid aggregate type"));
+    }
+
+    // valid agg
+    HashMap<String, String> validAggConfig = new HashMap<>(realtimeToOfflineTaskConfig);
+    validAggConfig.put("myCol.aggregationType", "distinctCountHLL");
+    tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).setTaskConfig(new TableTaskConfig(
+        ImmutableMap.of("RealtimeToOfflineSegmentsTask", validAggConfig, "SegmentGenerationAndPushTask",
+            segmentGenerationAndPushTaskConfig))).build();
+    TableConfigUtils.validateTaskConfigs(tableConfig, schema);
   }
 
   @Test
@@ -1664,25 +1787,22 @@ public void testValidateInstancePartitionsMap() {
     InstanceAssignmentConfig instanceAssignmentConfig = Mockito.mock(InstanceAssignmentConfig.class);
 
     TableConfig tableConfigWithoutInstancePartitionsMap =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
-            .build();
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
 
     // Call validate with a table-config without any instance partitions or instance assignment config
     TableConfigUtils.validateInstancePartitionsTypeMapConfig(tableConfigWithoutInstancePartitionsMap);
 
     TableConfig tableConfigWithInstancePartitionsMap =
         new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
-            .setInstancePartitionsMap(ImmutableMap.of(InstancePartitionsType.OFFLINE, "test_OFFLINE"))
-            .build();
+            .setInstancePartitionsMap(ImmutableMap.of(InstancePartitionsType.OFFLINE, "test_OFFLINE")).build();
 
     // Call validate with a table-config with instance partitions set but not instance assignment config
     TableConfigUtils.validateInstancePartitionsTypeMapConfig(tableConfigWithInstancePartitionsMap);
 
-    TableConfig invalidTableConfig =
-        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
-            .setInstancePartitionsMap(ImmutableMap.of(InstancePartitionsType.OFFLINE, "test_OFFLINE"))
-            .setInstanceAssignmentConfigMap(ImmutableMap.of(InstancePartitionsType.OFFLINE, instanceAssignmentConfig))
-            .build();
+    TableConfig invalidTableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setInstancePartitionsMap(ImmutableMap.of(InstancePartitionsType.OFFLINE, "test_OFFLINE"))
+        .setInstanceAssignmentConfigMap(
+            ImmutableMap.of(InstancePartitionsType.OFFLINE.toString(), instanceAssignmentConfig)).build();
     try {
       // Call validate with instance partitions and config set for the same type
       TableConfigUtils.validateInstancePartitionsTypeMapConfig(invalidTableConfig);
@@ -1691,6 +1811,180 @@ public void testValidateInstancePartitionsMap() {
     }
   }
 
+  @Test
+  public void testValidateTTLConfigForUpsertConfig() {
+    // Default comparison column (timestamp)
+    Schema schema =
+        new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).addSingleValueDimension("myCol", FieldSpec.DataType.STRING)
+            .addDateTime(TIME_COLUMN, FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
+            .setPrimaryKeyColumns(Lists.newArrayList("myCol")).build();
+    UpsertConfig upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setMetadataTTL(3600);
+    upsertConfig.setEnableSnapshot(true);
+    TableConfig tableConfigWithoutComparisonColumn =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setTimeColumnName(TIME_COLUMN)
+            .setUpsertConfig(upsertConfig).build();
+    TableConfigUtils.validateTTLForUpsertConfig(tableConfigWithoutComparisonColumn, schema);
+
+    // Invalid comparison columns: "myCol"
+    upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setComparisonColumns(Collections.singletonList("myCol"));
+    upsertConfig.setEnableSnapshot(true);
+    upsertConfig.setMetadataTTL(3600);
+    TableConfig tableConfigWithInvalidComparisonColumn =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setTimeColumnName(TIME_COLUMN)
+            .setUpsertConfig(upsertConfig).build();
+    try {
+      TableConfigUtils.validateTTLForUpsertConfig(tableConfigWithInvalidComparisonColumn, schema);
+      Assert.fail();
+    } catch (IllegalStateException e) {
+      // Expected
+    }
+
+    // Invalid comparison columns: multiple comparison columns are not supported for TTL-enabled upsert table.
+    upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setComparisonColumns(Lists.newArrayList(TIME_COLUMN, "myCol"));
+    upsertConfig.setEnableSnapshot(true);
+    upsertConfig.setMetadataTTL(3600);
+    TableConfig tableConfigWithInvalidComparisonColumn2 =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setTimeColumnName(TIME_COLUMN)
+            .setUpsertConfig(upsertConfig).build();
+    try {
+      TableConfigUtils.validateTTLForUpsertConfig(tableConfigWithInvalidComparisonColumn2, schema);
+      Assert.fail();
+    } catch (IllegalStateException e) {
+      // Expected
+    }
+
+    // Invalid config with TTLConfig but Snapshot is not enabled
+    schema =
+        new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).addSingleValueDimension("myCol", FieldSpec.DataType.STRING)
+            .addDateTime(TIME_COLUMN, FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
+            .setPrimaryKeyColumns(Lists.newArrayList("myCol")).build();
+    upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setMetadataTTL(3600);
+    upsertConfig.setEnableSnapshot(false);
+    TableConfig tableConfigWithInvalidTTLConfig =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setTimeColumnName(TIME_COLUMN)
+            .setUpsertConfig(upsertConfig).build();
+    try {
+      TableConfigUtils.validateTTLForUpsertConfig(tableConfigWithInvalidTTLConfig, schema);
+      Assert.fail();
+    } catch (IllegalStateException e) {
+      // Expected
+    }
+
+    // Invalid config with both delete and TTL enabled
+    String delCol = "myDelCol";
+    schema =
+        new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).addSingleValueDimension("myCol", FieldSpec.DataType.STRING)
+            .addDateTime(TIME_COLUMN, FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
+            .addSingleValueDimension(delCol, FieldSpec.DataType.STRING)
+            .setPrimaryKeyColumns(Lists.newArrayList("myCol")).build();
+    upsertConfig = new UpsertConfig(UpsertConfig.Mode.FULL);
+    upsertConfig.setMetadataTTL(3600);
+    upsertConfig.setEnableSnapshot(true);
+    upsertConfig.setDeleteRecordColumn(delCol);
+    TableConfig tableConfigWithBothDeleteAndTTL =
+        new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setTimeColumnName(TIME_COLUMN)
+            .setUpsertConfig(upsertConfig).build();
+    try {
+      TableConfigUtils.validateTTLForUpsertConfig(tableConfigWithBothDeleteAndTTL, schema);
+      Assert.fail();
+    } catch (IllegalStateException e) {
+      // Expected
+    }
+  }
+
+  @Test
+  public void testUpsertCompactionTaskConfig() {
+    Schema schema =
+        new Schema.SchemaBuilder().setSchemaName(TABLE_NAME).addSingleValueDimension("myCol", FieldSpec.DataType.STRING)
+            .addDateTime(TIME_COLUMN, FieldSpec.DataType.LONG, "1:MILLISECONDS:EPOCH", "1:MILLISECONDS")
+            .setPrimaryKeyColumns(Lists.newArrayList("myCol")).build();
+    Map<String, String> upsertCompactionTaskConfig =
+        ImmutableMap.of("bufferTimePeriod", "5d", "invalidRecordsThresholdPercent", "1", "invalidRecordsThresholdCount",
+            "1");
+    TableConfig tableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME)
+        .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL))
+        .setTaskConfig(new TableTaskConfig(ImmutableMap.of("UpsertCompactionTask", upsertCompactionTaskConfig)))
+        .build();
+
+    TableConfigUtils.validateTaskConfigs(tableConfig, schema);
+
+    // test with invalid invalidRecordsThresholdPercents
+    upsertCompactionTaskConfig = ImmutableMap.of("invalidRecordsThresholdPercent", "0");
+    TableConfig zeroPercentTableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME)
+        .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL))
+        .setTaskConfig(new TableTaskConfig(ImmutableMap.of("UpsertCompactionTask", upsertCompactionTaskConfig)))
+        .build();
+    Assert.assertThrows(IllegalStateException.class,
+        () -> TableConfigUtils.validateTaskConfigs(zeroPercentTableConfig, schema));
+    upsertCompactionTaskConfig = ImmutableMap.of("invalidRecordsThresholdPercent", "110");
+    TableConfig hundredTenPercentTableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME)
+        .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL))
+        .setTaskConfig(new TableTaskConfig(ImmutableMap.of("UpsertCompactionTask", upsertCompactionTaskConfig)))
+        .build();
+    Assert.assertThrows(IllegalStateException.class,
+        () -> TableConfigUtils.validateTaskConfigs(hundredTenPercentTableConfig, schema));
+
+    // test with invalid invalidRecordsThresholdCount
+    upsertCompactionTaskConfig = ImmutableMap.of("invalidRecordsThresholdCount", "0");
+    TableConfig invalidCountTableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME)
+        .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL))
+        .setTaskConfig(new TableTaskConfig(ImmutableMap.of("UpsertCompactionTask", upsertCompactionTaskConfig)))
+        .build();
+    Assert.assertThrows(IllegalStateException.class,
+        () -> TableConfigUtils.validateTaskConfigs(invalidCountTableConfig, schema));
+
+    // test without invalidRecordsThresholdPercent or invalidRecordsThresholdCount
+    upsertCompactionTaskConfig = ImmutableMap.of("bufferTimePeriod", "5d");
+    TableConfig invalidTableConfig = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME)
+        .setUpsertConfig(new UpsertConfig(UpsertConfig.Mode.FULL))
+        .setTaskConfig(new TableTaskConfig(ImmutableMap.of("UpsertCompactionTask", upsertCompactionTaskConfig)))
+        .build();
+    Assert.assertThrows(IllegalStateException.class,
+        () -> TableConfigUtils.validateTaskConfigs(invalidTableConfig, schema));
+  }
+
+  @Test
+  public void testValidatePartitionedReplicaGroupInstance() {
+    String partitionColumn = "testPartitionCol";
+    ReplicaGroupStrategyConfig replicaGroupStrategyConfig = new ReplicaGroupStrategyConfig(partitionColumn, 2);
+
+    TableConfig tableConfigWithoutReplicaGroupStrategyConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
+    // Call validate with a table-config without replicaGroupStrategyConfig or replicaGroupPartitionConfig.
+    TableConfigUtils.validatePartitionedReplicaGroupInstance(tableConfigWithoutReplicaGroupStrategyConfig);
+
+    TableConfig tableConfigWithReplicaGroupStrategyConfig =
+        new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME).build();
+    tableConfigWithReplicaGroupStrategyConfig.getValidationConfig()
+        .setReplicaGroupStrategyConfig(replicaGroupStrategyConfig);
+
+    // Call validate with a table-config with replicaGroupStrategyConfig and without replicaGroupPartitionConfig.
+    TableConfigUtils.validatePartitionedReplicaGroupInstance(tableConfigWithReplicaGroupStrategyConfig);
+
+    InstanceAssignmentConfig instanceAssignmentConfig = Mockito.mock(InstanceAssignmentConfig.class);
+    InstanceReplicaGroupPartitionConfig instanceReplicaGroupPartitionConfig =
+        new InstanceReplicaGroupPartitionConfig(true, 0, 0, 0, 2, 0, false, partitionColumn);
+    Mockito.doReturn(instanceReplicaGroupPartitionConfig).when(instanceAssignmentConfig)
+        .getReplicaGroupPartitionConfig();
+
+    TableConfig invalidTableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(TABLE_NAME)
+        .setInstanceAssignmentConfigMap(ImmutableMap.of(TableType.OFFLINE.toString(), instanceAssignmentConfig))
+        .build();
+    invalidTableConfig.getValidationConfig().setReplicaGroupStrategyConfig(replicaGroupStrategyConfig);
+
+    try {
+      // Call validate with a table-config with replicaGroupStrategyConfig and replicaGroupPartitionConfig.
+      TableConfigUtils.validatePartitionedReplicaGroupInstance(invalidTableConfig);
+      Assert.fail("Validation should have failed since both replicaGroupStrategyConfig "
+          + "and replicaGroupPartitionConfig are set");
+    } catch (IllegalStateException ignored) {
+    }
+  }
+
   private Map<String, String> getStreamConfigs() {
     Map<String, String> streamConfigs = new HashMap<>();
     streamConfigs.put("streamType", "kafka");
diff --git a/pinot-segment-local/src/test/resources/data/startree/segment/index_map b/pinot-segment-local/src/test/resources/data/startree/segment/index_map
new file mode 100644
index 00000000000..616b3f7a110
--- /dev/null
+++ b/pinot-segment-local/src/test/resources/data/startree/segment/index_map
@@ -0,0 +1,363 @@
+#
+# 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.
+#
+
+$ts$DAY.dictionary.startOffset = 0
+$ts$DAY.dictionary.size = 16
+$ts$DAY.forward_index.startOffset = 16
+$ts$DAY.forward_index.size = 16
+$ts$DAY.range_index.startOffset = 32
+$ts$DAY.range_index.size = 38
+$ts$MONTH.dictionary.startOffset = 70
+$ts$MONTH.dictionary.size = 16
+$ts$MONTH.forward_index.startOffset = 86
+$ts$MONTH.forward_index.size = 16
+$ts$MONTH.range_index.startOffset = 102
+$ts$MONTH.range_index.size = 38
+$ts$WEEK.dictionary.startOffset = 140
+$ts$WEEK.dictionary.size = 16
+$ts$WEEK.forward_index.startOffset = 156
+$ts$WEEK.forward_index.size = 16
+$ts$WEEK.range_index.startOffset = 172
+$ts$WEEK.range_index.size = 38
+ActualElapsedTime.dictionary.startOffset = 210
+ActualElapsedTime.dictionary.size = 620
+ActualElapsedTime.forward_index.startOffset = 830
+ActualElapsedTime.forward_index.size = 321
+AirTime.dictionary.startOffset = 1151
+AirTime.dictionary.size = 612
+AirTime.forward_index.startOffset = 1763
+AirTime.forward_index.size = 321
+AirlineID.dictionary.startOffset = 2084
+AirlineID.dictionary.size = 64
+AirlineID.forward_index.startOffset = 2148
+AirlineID.forward_index.size = 165
+ArrDel15.dictionary.startOffset = 2313
+ArrDel15.dictionary.size = 20
+ArrDel15.forward_index.startOffset = 2333
+ArrDel15.forward_index.size = 87
+ArrDelay.dictionary.startOffset = 2420
+ArrDelay.dictionary.size = 320
+ArrDelay.forward_index.startOffset = 2740
+ArrDelay.forward_index.size = 282
+ArrDelayMinutes.dictionary.startOffset = 3022
+ArrDelayMinutes.dictionary.size = 172
+ArrDelayMinutes.forward_index.startOffset = 3194
+ArrDelayMinutes.forward_index.size = 243
+ArrTime.dictionary.startOffset = 3437
+ArrTime.dictionary.size = 1056
+ArrTime.forward_index.startOffset = 4493
+ArrTime.forward_index.size = 361
+ArrTimeBlk.dictionary.startOffset = 4854
+ArrTimeBlk.dictionary.size = 179
+ArrTimeBlk.forward_index.startOffset = 5033
+ArrTimeBlk.forward_index.size = 204
+ArrTimeBlk.inverted_index.startOffset = 5237
+ArrTimeBlk.inverted_index.size = 1018
+ArrivalDelayGroups.dictionary.startOffset = 6255
+ArrivalDelayGroups.dictionary.size = 56
+ArrivalDelayGroups.forward_index.startOffset = 6311
+ArrivalDelayGroups.forward_index.size = 165
+CRSArrTime.dictionary.startOffset = 6476
+CRSArrTime.dictionary.size = 972
+CRSArrTime.forward_index.startOffset = 7448
+CRSArrTime.forward_index.size = 321
+CRSDepTime.dictionary.startOffset = 7769
+CRSDepTime.dictionary.size = 832
+CRSDepTime.forward_index.startOffset = 8601
+CRSDepTime.forward_index.size = 321
+CRSElapsedTime.dictionary.startOffset = 8922
+CRSElapsedTime.dictionary.size = 624
+CRSElapsedTime.forward_index.startOffset = 9546
+CRSElapsedTime.forward_index.size = 321
+CancellationCode.dictionary.startOffset = 9867
+CancellationCode.dictionary.size = 24
+CancellationCode.forward_index.startOffset = 9891
+CancellationCode.forward_index.size = 87
+Cancelled.dictionary.startOffset = 9978
+Cancelled.dictionary.size = 16
+Cancelled.forward_index.startOffset = 9994
+Cancelled.forward_index.size = 48
+Carrier.dictionary.startOffset = 10042
+Carrier.dictionary.size = 36
+Carrier.forward_index.startOffset = 10078
+Carrier.forward_index.size = 165
+CarrierDelay.dictionary.startOffset = 10243
+CarrierDelay.dictionary.size = 84
+CarrierDelay.forward_index.startOffset = 10327
+CarrierDelay.forward_index.size = 204
+DayOfWeek.dictionary.startOffset = 10531
+DayOfWeek.dictionary.size = 12
+DayOfWeek.forward_index.startOffset = 10543
+DayOfWeek.forward_index.size = 16
+DayofMonth.dictionary.startOffset = 10559
+DayofMonth.dictionary.size = 12
+DayofMonth.forward_index.startOffset = 10571
+DayofMonth.forward_index.size = 16
+DaysSinceEpoch.dictionary.startOffset = 10587
+DaysSinceEpoch.dictionary.size = 12
+DaysSinceEpoch.forward_index.startOffset = 10599
+DaysSinceEpoch.forward_index.size = 16
+DepDel15.dictionary.startOffset = 10615
+DepDel15.dictionary.size = 20
+DepDel15.forward_index.startOffset = 10635
+DepDel15.forward_index.size = 87
+DepDelay.dictionary.startOffset = 10722
+DepDelay.dictionary.size = 292
+DepDelay.forward_index.startOffset = 11014
+DepDelay.forward_index.size = 282
+DepDelayMinutes.dictionary.startOffset = 11296
+DepDelayMinutes.dictionary.size = 224
+DepDelayMinutes.forward_index.startOffset = 11520
+DepDelayMinutes.forward_index.size = 243
+DepTime.dictionary.startOffset = 11763
+DepTime.dictionary.size = 1068
+DepTime.forward_index.startOffset = 12831
+DepTime.forward_index.size = 361
+DepTimeBlk.dictionary.startOffset = 13192
+DepTimeBlk.dictionary.size = 170
+DepTimeBlk.forward_index.startOffset = 13362
+DepTimeBlk.forward_index.size = 204
+DepartureDelayGroups.dictionary.startOffset = 13566
+DepartureDelayGroups.dictionary.size = 64
+DepartureDelayGroups.forward_index.startOffset = 13630
+DepartureDelayGroups.forward_index.size = 165
+Dest.dictionary.startOffset = 13795
+Dest.dictionary.size = 320
+Dest.forward_index.startOffset = 14115
+Dest.forward_index.size = 282
+DestAirportID.dictionary.startOffset = 14397
+DestAirportID.dictionary.size = 424
+DestAirportID.forward_index.startOffset = 14821
+DestAirportID.forward_index.size = 282
+DestAirportSeqID.dictionary.startOffset = 15103
+DestAirportSeqID.dictionary.size = 424
+DestAirportSeqID.forward_index.startOffset = 15527
+DestAirportSeqID.forward_index.size = 282
+DestCityMarketID.dictionary.startOffset = 15809
+DestCityMarketID.dictionary.size = 360
+DestCityMarketID.forward_index.startOffset = 16169
+DestCityMarketID.forward_index.size = 282
+DestCityName.dictionary.startOffset = 16451
+DestCityName.dictionary.size = 3008
+DestCityName.forward_index.startOffset = 19459
+DestCityName.forward_index.size = 282
+DestState.dictionary.startOffset = 19741
+DestState.dictionary.size = 92
+DestState.forward_index.startOffset = 19833
+DestState.forward_index.size = 243
+DestStateFips.dictionary.startOffset = 20076
+DestStateFips.dictionary.size = 176
+DestStateFips.forward_index.startOffset = 20252
+DestStateFips.forward_index.size = 243
+DestStateName.dictionary.startOffset = 20495
+DestStateName.dictionary.size = 1940
+DestStateName.forward_index.startOffset = 22435
+DestStateName.forward_index.size = 243
+DestWac.dictionary.startOffset = 22678
+DestWac.dictionary.size = 176
+DestWac.forward_index.startOffset = 22854
+DestWac.forward_index.size = 243
+Distance.dictionary.startOffset = 23097
+Distance.dictionary.size = 1008
+Distance.forward_index.startOffset = 24105
+Distance.forward_index.size = 321
+DistanceGroup.dictionary.startOffset = 24426
+DistanceGroup.dictionary.size = 52
+DistanceGroup.forward_index.startOffset = 24478
+DistanceGroup.forward_index.size = 165
+DivActualElapsedTime.dictionary.startOffset = 24643
+DivActualElapsedTime.dictionary.size = 152
+DivActualElapsedTime.forward_index.startOffset = 24795
+DivActualElapsedTime.forward_index.size = 243
+DivAirportIDs.dictionary.startOffset = 25038
+DivAirportIDs.dictionary.size = 140
+DivAirportIDs.forward_index.startOffset = 25178
+DivAirportIDs.forward_index.size = 287
+DivAirportLandings.dictionary.startOffset = 25465
+DivAirportLandings.dictionary.size = 20
+DivAirportLandings.forward_index.startOffset = 25485
+DivAirportLandings.forward_index.size = 87
+DivAirportSeqIDs.dictionary.startOffset = 25572
+DivAirportSeqIDs.dictionary.size = 140
+DivAirportSeqIDs.forward_index.startOffset = 25712
+DivAirportSeqIDs.forward_index.size = 287
+DivAirports.dictionary.startOffset = 25999
+DivAirports.dictionary.size = 140
+DivAirports.forward_index.startOffset = 26139
+DivAirports.forward_index.size = 287
+DivArrDelay.dictionary.startOffset = 26426
+DivArrDelay.dictionary.size = 132
+DivArrDelay.forward_index.startOffset = 26558
+DivArrDelay.forward_index.size = 204
+DivDistance.dictionary.startOffset = 26762
+DivDistance.dictionary.size = 44
+DivDistance.forward_index.startOffset = 26806
+DivDistance.forward_index.size = 165
+DivLongestGTimes.dictionary.startOffset = 26971
+DivLongestGTimes.dictionary.size = 120
+DivLongestGTimes.forward_index.startOffset = 27091
+DivLongestGTimes.forward_index.size = 248
+DivReachedDest.dictionary.startOffset = 27339
+DivReachedDest.dictionary.size = 20
+DivReachedDest.forward_index.startOffset = 27359
+DivReachedDest.forward_index.size = 87
+DivTailNums.dictionary.startOffset = 27446
+DivTailNums.dictionary.size = 230
+DivTailNums.forward_index.startOffset = 27676
+DivTailNums.forward_index.size = 287
+DivTotalGTimes.dictionary.startOffset = 27963
+DivTotalGTimes.dictionary.size = 140
+DivTotalGTimes.forward_index.startOffset = 28103
+DivTotalGTimes.forward_index.size = 287
+DivWheelsOffs.dictionary.startOffset = 28390
+DivWheelsOffs.dictionary.size = 148
+DivWheelsOffs.forward_index.startOffset = 28538
+DivWheelsOffs.forward_index.size = 287
+DivWheelsOns.dictionary.startOffset = 28825
+DivWheelsOns.dictionary.size = 208
+DivWheelsOns.forward_index.startOffset = 29033
+DivWheelsOns.forward_index.size = 287
+Diverted.dictionary.startOffset = 29320
+Diverted.dictionary.size = 16
+Diverted.forward_index.startOffset = 29336
+Diverted.forward_index.size = 48
+FirstDepTime.dictionary.startOffset = 29384
+FirstDepTime.dictionary.size = 20
+FirstDepTime.forward_index.startOffset = 29404
+FirstDepTime.forward_index.size = 87
+FlightDate.dictionary.startOffset = 29491
+FlightDate.dictionary.size = 18
+FlightDate.forward_index.startOffset = 29509
+FlightDate.forward_index.size = 16
+FlightNum.dictionary.startOffset = 29525
+FlightNum.dictionary.size = 1224
+FlightNum.forward_index.startOffset = 30749
+FlightNum.forward_index.size = 361
+Flights.dictionary.startOffset = 31110
+Flights.dictionary.size = 12
+Flights.forward_index.startOffset = 31122
+Flights.forward_index.size = 16
+LateAircraftDelay.dictionary.startOffset = 31138
+LateAircraftDelay.dictionary.size = 76
+LateAircraftDelay.forward_index.startOffset = 31214
+LateAircraftDelay.forward_index.size = 204
+LongestAddGTime.dictionary.startOffset = 31418
+LongestAddGTime.dictionary.size = 20
+LongestAddGTime.forward_index.startOffset = 31438
+LongestAddGTime.forward_index.size = 87
+Month.dictionary.startOffset = 31525
+Month.dictionary.size = 12
+Month.forward_index.startOffset = 31537
+Month.forward_index.size = 16
+NASDelay.dictionary.startOffset = 31553
+NASDelay.dictionary.size = 84
+NASDelay.forward_index.startOffset = 31637
+NASDelay.forward_index.size = 204
+Origin.dictionary.startOffset = 31841
+Origin.dictionary.size = 299
+Origin.forward_index.startOffset = 32140
+Origin.forward_index.size = 282
+OriginAirportID.dictionary.startOffset = 32422
+OriginAirportID.dictionary.size = 396
+OriginAirportID.forward_index.startOffset = 32818
+OriginAirportID.forward_index.size = 282
+OriginAirportSeqID.dictionary.startOffset = 33100
+OriginAirportSeqID.dictionary.size = 396
+OriginAirportSeqID.forward_index.startOffset = 33496
+OriginAirportSeqID.forward_index.size = 282
+OriginCityMarketID.dictionary.startOffset = 33778
+OriginCityMarketID.dictionary.size = 336
+OriginCityMarketID.forward_index.startOffset = 34114
+OriginCityMarketID.forward_index.size = 282
+OriginCityName.dictionary.startOffset = 34396
+OriginCityName.dictionary.size = 2798
+OriginCityName.forward_index.startOffset = 37194
+OriginCityName.forward_index.size = 282
+OriginState.dictionary.startOffset = 37476
+OriginState.dictionary.size = 94
+OriginState.forward_index.startOffset = 37570
+OriginState.forward_index.size = 243
+OriginStateFips.dictionary.startOffset = 37813
+OriginStateFips.dictionary.size = 180
+OriginStateFips.forward_index.startOffset = 37993
+OriginStateFips.forward_index.size = 243
+OriginStateName.dictionary.startOffset = 38236
+OriginStateName.dictionary.size = 610
+OriginStateName.forward_index.startOffset = 38846
+OriginStateName.forward_index.size = 243
+OriginWac.dictionary.startOffset = 39089
+OriginWac.dictionary.size = 180
+OriginWac.forward_index.startOffset = 39269
+OriginWac.forward_index.size = 243
+Quarter.dictionary.startOffset = 39512
+Quarter.dictionary.size = 12
+Quarter.forward_index.startOffset = 39524
+Quarter.forward_index.size = 16
+RandomAirports.dictionary.startOffset = 39540
+RandomAirports.dictionary.size = 320
+RandomAirports.forward_index.startOffset = 39860
+RandomAirports.forward_index.size = 4436
+SecurityDelay.dictionary.startOffset = 44296
+SecurityDelay.dictionary.size = 16
+SecurityDelay.forward_index.startOffset = 44312
+SecurityDelay.forward_index.size = 48
+TailNum.dictionary.startOffset = 44360
+TailNum.dictionary.size = 1826
+TailNum.forward_index.startOffset = 46186
+TailNum.forward_index.size = 361
+TaxiIn.dictionary.startOffset = 46547
+TaxiIn.dictionary.size = 92
+TaxiIn.forward_index.startOffset = 46639
+TaxiIn.forward_index.size = 204
+TaxiOut.dictionary.startOffset = 46843
+TaxiOut.dictionary.size = 148
+TaxiOut.forward_index.startOffset = 46991
+TaxiOut.forward_index.size = 243
+TotalAddGTime.dictionary.startOffset = 47234
+TotalAddGTime.dictionary.size = 20
+TotalAddGTime.forward_index.startOffset = 47254
+TotalAddGTime.forward_index.size = 87
+UniqueCarrier.dictionary.startOffset = 47341
+UniqueCarrier.dictionary.size = 36
+UniqueCarrier.forward_index.startOffset = 47377
+UniqueCarrier.forward_index.size = 165
+WeatherDelay.dictionary.startOffset = 47542
+WeatherDelay.dictionary.size = 16
+WeatherDelay.forward_index.startOffset = 47558
+WeatherDelay.forward_index.size = 48
+WheelsOff.dictionary.startOffset = 47606
+WheelsOff.dictionary.size = 1084
+WheelsOff.forward_index.startOffset = 48690
+WheelsOff.forward_index.size = 361
+WheelsOn.dictionary.startOffset = 49051
+WheelsOn.dictionary.size = 1044
+WheelsOn.forward_index.startOffset = 50095
+WheelsOn.forward_index.size = 361
+Year.dictionary.startOffset = 50456
+Year.dictionary.size = 12
+Year.forward_index.startOffset = 50468
+Year.forward_index.size = 16
+ts.dictionary.startOffset = 50484
+ts.dictionary.size = 16
+ts.forward_index.startOffset = 50500
+ts.forward_index.size = 16
+tsRaw.dictionary.startOffset = 50516
+tsRaw.dictionary.size = 16
+tsRaw.forward_index.startOffset = 50532
+tsRaw.forward_index.size = 16
diff --git a/pinot-segment-local/src/test/resources/data/startree/segment/metadata.properties b/pinot-segment-local/src/test/resources/data/startree/segment/metadata.properties
new file mode 100644
index 00000000000..96112e136c1
--- /dev/null
+++ b/pinot-segment-local/src/test/resources/data/startree/segment/metadata.properties
@@ -0,0 +1,1307 @@
+#
+# 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.
+#
+
+segment.padding.character = \u0000
+segment.name = airlineStats_OFFLINE_16085_16085_0
+segment.table.name = airlineStats
+segment.datetime.column.names = $ts$DAY,$ts$MONTH,$ts$WEEK,DaysSinceEpoch,ts,tsRaw
+segment.time.column.name = DaysSinceEpoch
+segment.total.docs = 313
+segment.start.time = 16085
+segment.end.time = 16085
+segment.time.unit = DAYS
+column.$ts$DAY.cardinality = 1
+column.$ts$DAY.totalDocs = 313
+column.$ts$DAY.dataType = TIMESTAMP
+column.$ts$DAY.bitsPerElement = 1
+column.$ts$DAY.lengthOfEachEntry = 0
+column.$ts$DAY.columnType = DATE_TIME
+column.$ts$DAY.isSorted = true
+column.$ts$DAY.hasDictionary = true
+column.$ts$DAY.isSingleValues = true
+column.$ts$DAY.maxNumberOfMultiValues = 0
+column.$ts$DAY.totalNumberOfEntries = 313
+column.$ts$DAY.isAutoGenerated = false
+column.$ts$DAY.datetimeFormat = TIMESTAMP
+column.$ts$DAY.datetimeGranularity = 1:DAYS
+column.$ts$DAY.minValue = 1389744000000
+column.$ts$DAY.maxValue = 1389744000000
+column.$ts$DAY.defaultNullValue = 0
+column.$ts$MONTH.cardinality = 1
+column.$ts$MONTH.totalDocs = 313
+column.$ts$MONTH.dataType = TIMESTAMP
+column.$ts$MONTH.bitsPerElement = 1
+column.$ts$MONTH.lengthOfEachEntry = 0
+column.$ts$MONTH.columnType = DATE_TIME
+column.$ts$MONTH.isSorted = true
+column.$ts$MONTH.hasDictionary = true
+column.$ts$MONTH.isSingleValues = true
+column.$ts$MONTH.maxNumberOfMultiValues = 0
+column.$ts$MONTH.totalNumberOfEntries = 313
+column.$ts$MONTH.isAutoGenerated = false
+column.$ts$MONTH.datetimeFormat = TIMESTAMP
+column.$ts$MONTH.datetimeGranularity = 30:DAYS
+column.$ts$MONTH.minValue = 1388534400000
+column.$ts$MONTH.maxValue = 1388534400000
+column.$ts$MONTH.defaultNullValue = 0
+column.$ts$WEEK.cardinality = 1
+column.$ts$WEEK.totalDocs = 313
+column.$ts$WEEK.dataType = TIMESTAMP
+column.$ts$WEEK.bitsPerElement = 1
+column.$ts$WEEK.lengthOfEachEntry = 0
+column.$ts$WEEK.columnType = DATE_TIME
+column.$ts$WEEK.isSorted = true
+column.$ts$WEEK.hasDictionary = true
+column.$ts$WEEK.isSingleValues = true
+column.$ts$WEEK.maxNumberOfMultiValues = 0
+column.$ts$WEEK.totalNumberOfEntries = 313
+column.$ts$WEEK.isAutoGenerated = false
+column.$ts$WEEK.datetimeFormat = TIMESTAMP
+column.$ts$WEEK.datetimeGranularity = 7:DAYS
+column.$ts$WEEK.minValue = 1389571200000
+column.$ts$WEEK.maxValue = 1389571200000
+column.$ts$WEEK.defaultNullValue = 0
+column.ActualElapsedTime.cardinality = 153
+column.ActualElapsedTime.totalDocs = 313
+column.ActualElapsedTime.dataType = INT
+column.ActualElapsedTime.bitsPerElement = 8
+column.ActualElapsedTime.lengthOfEachEntry = 0
+column.ActualElapsedTime.columnType = DIMENSION
+column.ActualElapsedTime.isSorted = false
+column.ActualElapsedTime.hasDictionary = true
+column.ActualElapsedTime.isSingleValues = true
+column.ActualElapsedTime.maxNumberOfMultiValues = 0
+column.ActualElapsedTime.totalNumberOfEntries = 313
+column.ActualElapsedTime.isAutoGenerated = false
+column.ActualElapsedTime.minValue = -2147483648
+column.ActualElapsedTime.maxValue = 461
+column.ActualElapsedTime.defaultNullValue = -2147483648
+column.AirTime.cardinality = 151
+column.AirTime.totalDocs = 313
+column.AirTime.dataType = INT
+column.AirTime.bitsPerElement = 8
+column.AirTime.lengthOfEachEntry = 0
+column.AirTime.columnType = DIMENSION
+column.AirTime.isSorted = false
+column.AirTime.hasDictionary = true
+column.AirTime.isSingleValues = true
+column.AirTime.maxNumberOfMultiValues = 0
+column.AirTime.totalNumberOfEntries = 313
+column.AirTime.isAutoGenerated = false
+column.AirTime.minValue = -2147483648
+column.AirTime.maxValue = 437
+column.AirTime.defaultNullValue = -2147483648
+column.AirlineID.cardinality = 14
+column.AirlineID.totalDocs = 313
+column.AirlineID.dataType = INT
+column.AirlineID.bitsPerElement = 4
+column.AirlineID.lengthOfEachEntry = 0
+column.AirlineID.columnType = DIMENSION
+column.AirlineID.isSorted = false
+column.AirlineID.hasDictionary = true
+column.AirlineID.isSingleValues = true
+column.AirlineID.maxNumberOfMultiValues = 0
+column.AirlineID.totalNumberOfEntries = 313
+column.AirlineID.isAutoGenerated = false
+column.AirlineID.minValue = 19393
+column.AirlineID.maxValue = 21171
+column.AirlineID.defaultNullValue = -2147483648
+column.ArrDel15.cardinality = 3
+column.ArrDel15.totalDocs = 313
+column.ArrDel15.dataType = INT
+column.ArrDel15.bitsPerElement = 2
+column.ArrDel15.lengthOfEachEntry = 0
+column.ArrDel15.columnType = DIMENSION
+column.ArrDel15.isSorted = false
+column.ArrDel15.hasDictionary = true
+column.ArrDel15.isSingleValues = true
+column.ArrDel15.maxNumberOfMultiValues = 0
+column.ArrDel15.totalNumberOfEntries = 313
+column.ArrDel15.isAutoGenerated = false
+column.ArrDel15.minValue = -2147483648
+column.ArrDel15.maxValue = 1
+column.ArrDel15.defaultNullValue = -2147483648
+column.ArrDelay.cardinality = 78
+column.ArrDelay.totalDocs = 313
+column.ArrDelay.dataType = INT
+column.ArrDelay.bitsPerElement = 7
+column.ArrDelay.lengthOfEachEntry = 0
+column.ArrDelay.columnType = DIMENSION
+column.ArrDelay.isSorted = false
+column.ArrDelay.hasDictionary = true
+column.ArrDelay.isSingleValues = true
+column.ArrDelay.maxNumberOfMultiValues = 0
+column.ArrDelay.totalNumberOfEntries = 313
+column.ArrDelay.isAutoGenerated = false
+column.ArrDelay.minValue = -2147483648
+column.ArrDelay.maxValue = 343
+column.ArrDelay.defaultNullValue = -2147483648
+column.ArrDelayMinutes.cardinality = 41
+column.ArrDelayMinutes.totalDocs = 313
+column.ArrDelayMinutes.dataType = INT
+column.ArrDelayMinutes.bitsPerElement = 6
+column.ArrDelayMinutes.lengthOfEachEntry = 0
+column.ArrDelayMinutes.columnType = DIMENSION
+column.ArrDelayMinutes.isSorted = false
+column.ArrDelayMinutes.hasDictionary = true
+column.ArrDelayMinutes.isSingleValues = true
+column.ArrDelayMinutes.maxNumberOfMultiValues = 0
+column.ArrDelayMinutes.totalNumberOfEntries = 313
+column.ArrDelayMinutes.isAutoGenerated = false
+column.ArrDelayMinutes.minValue = -2147483648
+column.ArrDelayMinutes.maxValue = 343
+column.ArrDelayMinutes.defaultNullValue = -2147483648
+column.ArrTime.cardinality = 262
+column.ArrTime.totalDocs = 313
+column.ArrTime.dataType = INT
+column.ArrTime.bitsPerElement = 9
+column.ArrTime.lengthOfEachEntry = 0
+column.ArrTime.columnType = DIMENSION
+column.ArrTime.isSorted = false
+column.ArrTime.hasDictionary = true
+column.ArrTime.isSingleValues = true
+column.ArrTime.maxNumberOfMultiValues = 0
+column.ArrTime.totalNumberOfEntries = 313
+column.ArrTime.isAutoGenerated = false
+column.ArrTime.minValue = -2147483648
+column.ArrTime.maxValue = 2348
+column.ArrTime.defaultNullValue = -2147483648
+column.ArrTimeBlk.cardinality = 19
+column.ArrTimeBlk.totalDocs = 313
+column.ArrTimeBlk.dataType = STRING
+column.ArrTimeBlk.bitsPerElement = 5
+column.ArrTimeBlk.lengthOfEachEntry = 9
+column.ArrTimeBlk.columnType = DIMENSION
+column.ArrTimeBlk.isSorted = false
+column.ArrTimeBlk.hasDictionary = true
+column.ArrTimeBlk.isSingleValues = true
+column.ArrTimeBlk.maxNumberOfMultiValues = 0
+column.ArrTimeBlk.totalNumberOfEntries = 313
+column.ArrTimeBlk.isAutoGenerated = false
+column.ArrTimeBlk.minValue = 0001-0559
+column.ArrTimeBlk.maxValue = 2300-2359
+column.ArrTimeBlk.defaultNullValue = null
+column.ArrivalDelayGroups.cardinality = 12
+column.ArrivalDelayGroups.totalDocs = 313
+column.ArrivalDelayGroups.dataType = INT
+column.ArrivalDelayGroups.bitsPerElement = 4
+column.ArrivalDelayGroups.lengthOfEachEntry = 0
+column.ArrivalDelayGroups.columnType = DIMENSION
+column.ArrivalDelayGroups.isSorted = false
+column.ArrivalDelayGroups.hasDictionary = true
+column.ArrivalDelayGroups.isSingleValues = true
+column.ArrivalDelayGroups.maxNumberOfMultiValues = 0
+column.ArrivalDelayGroups.totalNumberOfEntries = 313
+column.ArrivalDelayGroups.isAutoGenerated = false
+column.ArrivalDelayGroups.minValue = -2147483648
+column.ArrivalDelayGroups.maxValue = 12
+column.ArrivalDelayGroups.defaultNullValue = -2147483648
+column.CRSArrTime.cardinality = 241
+column.CRSArrTime.totalDocs = 313
+column.CRSArrTime.dataType = INT
+column.CRSArrTime.bitsPerElement = 8
+column.CRSArrTime.lengthOfEachEntry = 0
+column.CRSArrTime.columnType = DIMENSION
+column.CRSArrTime.isSorted = false
+column.CRSArrTime.hasDictionary = true
+column.CRSArrTime.isSingleValues = true
+column.CRSArrTime.maxNumberOfMultiValues = 0
+column.CRSArrTime.totalNumberOfEntries = 313
+column.CRSArrTime.isAutoGenerated = false
+column.CRSArrTime.minValue = 10
+column.CRSArrTime.maxValue = 2359
+column.CRSArrTime.defaultNullValue = -2147483648
+column.CRSDepTime.cardinality = 206
+column.CRSDepTime.totalDocs = 313
+column.CRSDepTime.dataType = INT
+column.CRSDepTime.bitsPerElement = 8
+column.CRSDepTime.lengthOfEachEntry = 0
+column.CRSDepTime.columnType = DIMENSION
+column.CRSDepTime.isSorted = false
+column.CRSDepTime.hasDictionary = true
+column.CRSDepTime.isSingleValues = true
+column.CRSDepTime.maxNumberOfMultiValues = 0
+column.CRSDepTime.totalNumberOfEntries = 313
+column.CRSDepTime.isAutoGenerated = false
+column.CRSDepTime.minValue = 510
+column.CRSDepTime.maxValue = 2209
+column.CRSDepTime.defaultNullValue = -2147483648
+column.CRSElapsedTime.cardinality = 154
+column.CRSElapsedTime.totalDocs = 313
+column.CRSElapsedTime.dataType = INT
+column.CRSElapsedTime.bitsPerElement = 8
+column.CRSElapsedTime.lengthOfEachEntry = 0
+column.CRSElapsedTime.columnType = DIMENSION
+column.CRSElapsedTime.isSorted = false
+column.CRSElapsedTime.hasDictionary = true
+column.CRSElapsedTime.isSingleValues = true
+column.CRSElapsedTime.maxNumberOfMultiValues = 0
+column.CRSElapsedTime.totalNumberOfEntries = 313
+column.CRSElapsedTime.isAutoGenerated = false
+column.CRSElapsedTime.minValue = 33
+column.CRSElapsedTime.maxValue = 470
+column.CRSElapsedTime.defaultNullValue = -2147483648
+column.CancellationCode.cardinality = 4
+column.CancellationCode.totalDocs = 313
+column.CancellationCode.dataType = STRING
+column.CancellationCode.bitsPerElement = 2
+column.CancellationCode.lengthOfEachEntry = 4
+column.CancellationCode.columnType = DIMENSION
+column.CancellationCode.isSorted = false
+column.CancellationCode.hasDictionary = true
+column.CancellationCode.isSingleValues = true
+column.CancellationCode.maxNumberOfMultiValues = 0
+column.CancellationCode.totalNumberOfEntries = 313
+column.CancellationCode.isAutoGenerated = false
+column.CancellationCode.minValue = A
+column.CancellationCode.maxValue = null
+column.CancellationCode.defaultNullValue = null
+column.Cancelled.cardinality = 2
+column.Cancelled.totalDocs = 313
+column.Cancelled.dataType = INT
+column.Cancelled.bitsPerElement = 1
+column.Cancelled.lengthOfEachEntry = 0
+column.Cancelled.columnType = DIMENSION
+column.Cancelled.isSorted = false
+column.Cancelled.hasDictionary = true
+column.Cancelled.isSingleValues = true
+column.Cancelled.maxNumberOfMultiValues = 0
+column.Cancelled.totalNumberOfEntries = 313
+column.Cancelled.isAutoGenerated = false
+column.Cancelled.minValue = 0
+column.Cancelled.maxValue = 1
+column.Cancelled.defaultNullValue = -2147483648
+column.Carrier.cardinality = 14
+column.Carrier.totalDocs = 313
+column.Carrier.dataType = STRING
+column.Carrier.bitsPerElement = 4
+column.Carrier.lengthOfEachEntry = 2
+column.Carrier.columnType = DIMENSION
+column.Carrier.isSorted = false
+column.Carrier.hasDictionary = true
+column.Carrier.isSingleValues = true
+column.Carrier.maxNumberOfMultiValues = 0
+column.Carrier.totalNumberOfEntries = 313
+column.Carrier.isAutoGenerated = false
+column.Carrier.minValue = AA
+column.Carrier.maxValue = WN
+column.Carrier.defaultNullValue = null
+column.CarrierDelay.cardinality = 19
+column.CarrierDelay.totalDocs = 313
+column.CarrierDelay.dataType = INT
+column.CarrierDelay.bitsPerElement = 5
+column.CarrierDelay.lengthOfEachEntry = 0
+column.CarrierDelay.columnType = DIMENSION
+column.CarrierDelay.isSorted = false
+column.CarrierDelay.hasDictionary = true
+column.CarrierDelay.isSingleValues = true
+column.CarrierDelay.maxNumberOfMultiValues = 0
+column.CarrierDelay.totalNumberOfEntries = 313
+column.CarrierDelay.isAutoGenerated = false
+column.CarrierDelay.minValue = -2147483648
+column.CarrierDelay.maxValue = 343
+column.CarrierDelay.defaultNullValue = -2147483648
+column.DayOfWeek.cardinality = 1
+column.DayOfWeek.totalDocs = 313
+column.DayOfWeek.dataType = INT
+column.DayOfWeek.bitsPerElement = 1
+column.DayOfWeek.lengthOfEachEntry = 0
+column.DayOfWeek.columnType = DIMENSION
+column.DayOfWeek.isSorted = true
+column.DayOfWeek.hasDictionary = true
+column.DayOfWeek.isSingleValues = true
+column.DayOfWeek.maxNumberOfMultiValues = 0
+column.DayOfWeek.totalNumberOfEntries = 313
+column.DayOfWeek.isAutoGenerated = false
+column.DayOfWeek.minValue = 3
+column.DayOfWeek.maxValue = 3
+column.DayOfWeek.defaultNullValue = -2147483648
+column.DayofMonth.cardinality = 1
+column.DayofMonth.totalDocs = 313
+column.DayofMonth.dataType = INT
+column.DayofMonth.bitsPerElement = 1
+column.DayofMonth.lengthOfEachEntry = 0
+column.DayofMonth.columnType = DIMENSION
+column.DayofMonth.isSorted = true
+column.DayofMonth.hasDictionary = true
+column.DayofMonth.isSingleValues = true
+column.DayofMonth.maxNumberOfMultiValues = 0
+column.DayofMonth.totalNumberOfEntries = 313
+column.DayofMonth.isAutoGenerated = false
+column.DayofMonth.minValue = 15
+column.DayofMonth.maxValue = 15
+column.DayofMonth.defaultNullValue = -2147483648
+column.DaysSinceEpoch.cardinality = 1
+column.DaysSinceEpoch.totalDocs = 313
+column.DaysSinceEpoch.dataType = INT
+column.DaysSinceEpoch.bitsPerElement = 1
+column.DaysSinceEpoch.lengthOfEachEntry = 0
+column.DaysSinceEpoch.columnType = DATE_TIME
+column.DaysSinceEpoch.isSorted = true
+column.DaysSinceEpoch.hasDictionary = true
+column.DaysSinceEpoch.isSingleValues = true
+column.DaysSinceEpoch.maxNumberOfMultiValues = 0
+column.DaysSinceEpoch.totalNumberOfEntries = 313
+column.DaysSinceEpoch.isAutoGenerated = false
+column.DaysSinceEpoch.datetimeFormat = 1:DAYS:EPOCH
+column.DaysSinceEpoch.datetimeGranularity = 1:DAYS
+column.DaysSinceEpoch.minValue = 16085
+column.DaysSinceEpoch.maxValue = 16085
+column.DaysSinceEpoch.defaultNullValue = -2147483648
+column.DepDel15.cardinality = 3
+column.DepDel15.totalDocs = 313
+column.DepDel15.dataType = INT
+column.DepDel15.bitsPerElement = 2
+column.DepDel15.lengthOfEachEntry = 0
+column.DepDel15.columnType = DIMENSION
+column.DepDel15.isSorted = false
+column.DepDel15.hasDictionary = true
+column.DepDel15.isSingleValues = true
+column.DepDel15.maxNumberOfMultiValues = 0
+column.DepDel15.totalNumberOfEntries = 313
+column.DepDel15.isAutoGenerated = false
+column.DepDel15.minValue = -2147483648
+column.DepDel15.maxValue = 1
+column.DepDel15.defaultNullValue = -2147483648
+column.DepDelay.cardinality = 71
+column.DepDelay.totalDocs = 313
+column.DepDelay.dataType = INT
+column.DepDelay.bitsPerElement = 7
+column.DepDelay.lengthOfEachEntry = 0
+column.DepDelay.columnType = DIMENSION
+column.DepDelay.isSorted = false
+column.DepDelay.hasDictionary = true
+column.DepDelay.isSingleValues = true
+column.DepDelay.maxNumberOfMultiValues = 0
+column.DepDelay.totalNumberOfEntries = 313
+column.DepDelay.isAutoGenerated = false
+column.DepDelay.minValue = -2147483648
+column.DepDelay.maxValue = 356
+column.DepDelay.defaultNullValue = -2147483648
+column.DepDelayMinutes.cardinality = 54
+column.DepDelayMinutes.totalDocs = 313
+column.DepDelayMinutes.dataType = INT
+column.DepDelayMinutes.bitsPerElement = 6
+column.DepDelayMinutes.lengthOfEachEntry = 0
+column.DepDelayMinutes.columnType = DIMENSION
+column.DepDelayMinutes.isSorted = false
+column.DepDelayMinutes.hasDictionary = true
+column.DepDelayMinutes.isSingleValues = true
+column.DepDelayMinutes.maxNumberOfMultiValues = 0
+column.DepDelayMinutes.totalNumberOfEntries = 313
+column.DepDelayMinutes.isAutoGenerated = false
+column.DepDelayMinutes.minValue = -2147483648
+column.DepDelayMinutes.maxValue = 356
+column.DepDelayMinutes.defaultNullValue = -2147483648
+column.DepTime.cardinality = 265
+column.DepTime.totalDocs = 313
+column.DepTime.dataType = INT
+column.DepTime.bitsPerElement = 9
+column.DepTime.lengthOfEachEntry = 0
+column.DepTime.columnType = DIMENSION
+column.DepTime.isSorted = false
+column.DepTime.hasDictionary = true
+column.DepTime.isSingleValues = true
+column.DepTime.maxNumberOfMultiValues = 0
+column.DepTime.totalNumberOfEntries = 313
+column.DepTime.isAutoGenerated = false
+column.DepTime.minValue = -2147483648
+column.DepTime.maxValue = 2216
+column.DepTime.defaultNullValue = -2147483648
+column.DepTimeBlk.cardinality = 18
+column.DepTimeBlk.totalDocs = 313
+column.DepTimeBlk.dataType = STRING
+column.DepTimeBlk.bitsPerElement = 5
+column.DepTimeBlk.lengthOfEachEntry = 9
+column.DepTimeBlk.columnType = DIMENSION
+column.DepTimeBlk.isSorted = false
+column.DepTimeBlk.hasDictionary = true
+column.DepTimeBlk.isSingleValues = true
+column.DepTimeBlk.maxNumberOfMultiValues = 0
+column.DepTimeBlk.totalNumberOfEntries = 313
+column.DepTimeBlk.isAutoGenerated = false
+column.DepTimeBlk.minValue = 0001-0559
+column.DepTimeBlk.maxValue = 2200-2259
+column.DepTimeBlk.defaultNullValue = null
+column.DepartureDelayGroups.cardinality = 14
+column.DepartureDelayGroups.totalDocs = 313
+column.DepartureDelayGroups.dataType = INT
+column.DepartureDelayGroups.bitsPerElement = 4
+column.DepartureDelayGroups.lengthOfEachEntry = 0
+column.DepartureDelayGroups.columnType = DIMENSION
+column.DepartureDelayGroups.isSorted = false
+column.DepartureDelayGroups.hasDictionary = true
+column.DepartureDelayGroups.isSingleValues = true
+column.DepartureDelayGroups.maxNumberOfMultiValues = 0
+column.DepartureDelayGroups.totalNumberOfEntries = 313
+column.DepartureDelayGroups.isAutoGenerated = false
+column.DepartureDelayGroups.minValue = -2147483648
+column.DepartureDelayGroups.maxValue = 12
+column.DepartureDelayGroups.defaultNullValue = -2147483648
+column.Dest.cardinality = 104
+column.Dest.totalDocs = 313
+column.Dest.dataType = STRING
+column.Dest.bitsPerElement = 7
+column.Dest.lengthOfEachEntry = 3
+column.Dest.columnType = DIMENSION
+column.Dest.isSorted = false
+column.Dest.hasDictionary = true
+column.Dest.isSingleValues = true
+column.Dest.maxNumberOfMultiValues = 0
+column.Dest.totalNumberOfEntries = 313
+column.Dest.isAutoGenerated = false
+column.Dest.minValue = ABE
+column.Dest.maxValue = VPS
+column.Dest.defaultNullValue = null
+column.DestAirportID.cardinality = 104
+column.DestAirportID.totalDocs = 313
+column.DestAirportID.dataType = INT
+column.DestAirportID.bitsPerElement = 7
+column.DestAirportID.lengthOfEachEntry = 0
+column.DestAirportID.columnType = DIMENSION
+column.DestAirportID.isSorted = false
+column.DestAirportID.hasDictionary = true
+column.DestAirportID.isSingleValues = true
+column.DestAirportID.maxNumberOfMultiValues = 0
+column.DestAirportID.totalNumberOfEntries = 313
+column.DestAirportID.isAutoGenerated = false
+column.DestAirportID.minValue = 10135
+column.DestAirportID.maxValue = 15624
+column.DestAirportID.defaultNullValue = -2147483648
+column.DestAirportSeqID.cardinality = 104
+column.DestAirportSeqID.totalDocs = 313
+column.DestAirportSeqID.dataType = INT
+column.DestAirportSeqID.bitsPerElement = 7
+column.DestAirportSeqID.lengthOfEachEntry = 0
+column.DestAirportSeqID.columnType = DIMENSION
+column.DestAirportSeqID.isSorted = false
+column.DestAirportSeqID.hasDictionary = true
+column.DestAirportSeqID.isSingleValues = true
+column.DestAirportSeqID.maxNumberOfMultiValues = 0
+column.DestAirportSeqID.totalNumberOfEntries = 313
+column.DestAirportSeqID.isAutoGenerated = false
+column.DestAirportSeqID.minValue = 1013503
+column.DestAirportSeqID.maxValue = 1562401
+column.DestAirportSeqID.defaultNullValue = -2147483648
+column.DestCityMarketID.cardinality = 88
+column.DestCityMarketID.totalDocs = 313
+column.DestCityMarketID.dataType = INT
+column.DestCityMarketID.bitsPerElement = 7
+column.DestCityMarketID.lengthOfEachEntry = 0
+column.DestCityMarketID.columnType = DIMENSION
+column.DestCityMarketID.isSorted = false
+column.DestCityMarketID.hasDictionary = true
+column.DestCityMarketID.isSingleValues = true
+column.DestCityMarketID.maxNumberOfMultiValues = 0
+column.DestCityMarketID.totalNumberOfEntries = 313
+column.DestCityMarketID.isAutoGenerated = false
+column.DestCityMarketID.minValue = 30135
+column.DestCityMarketID.maxValue = 35412
+column.DestCityMarketID.defaultNullValue = -2147483648
+column.DestCityName.cardinality = 100
+column.DestCityName.totalDocs = 313
+column.DestCityName.dataType = STRING
+column.DestCityName.bitsPerElement = 7
+column.DestCityName.lengthOfEachEntry = 30
+column.DestCityName.columnType = DIMENSION
+column.DestCityName.isSorted = false
+column.DestCityName.hasDictionary = true
+column.DestCityName.isSingleValues = true
+column.DestCityName.maxNumberOfMultiValues = 0
+column.DestCityName.totalNumberOfEntries = 313
+column.DestCityName.isAutoGenerated = false
+column.DestCityName.minMaxValueInvalid = true
+column.DestCityName.defaultNullValue = null
+column.DestState.cardinality = 42
+column.DestState.totalDocs = 313
+column.DestState.dataType = STRING
+column.DestState.bitsPerElement = 6
+column.DestState.lengthOfEachEntry = 2
+column.DestState.columnType = DIMENSION
+column.DestState.isSorted = false
+column.DestState.hasDictionary = true
+column.DestState.isSingleValues = true
+column.DestState.maxNumberOfMultiValues = 0
+column.DestState.totalNumberOfEntries = 313
+column.DestState.isAutoGenerated = false
+column.DestState.minValue = AK
+column.DestState.maxValue = WI
+column.DestState.defaultNullValue = null
+column.DestStateFips.cardinality = 42
+column.DestStateFips.totalDocs = 313
+column.DestStateFips.dataType = INT
+column.DestStateFips.bitsPerElement = 6
+column.DestStateFips.lengthOfEachEntry = 0
+column.DestStateFips.columnType = DIMENSION
+column.DestStateFips.isSorted = false
+column.DestStateFips.hasDictionary = true
+column.DestStateFips.isSingleValues = true
+column.DestStateFips.maxNumberOfMultiValues = 0
+column.DestStateFips.totalNumberOfEntries = 313
+column.DestStateFips.isAutoGenerated = false
+column.DestStateFips.minValue = 1
+column.DestStateFips.maxValue = 75
+column.DestStateFips.defaultNullValue = -2147483648
+column.DestStateName.cardinality = 42
+column.DestStateName.totalDocs = 313
+column.DestStateName.dataType = STRING
+column.DestStateName.bitsPerElement = 6
+column.DestStateName.lengthOfEachEntry = 46
+column.DestStateName.columnType = DIMENSION
+column.DestStateName.isSorted = false
+column.DestStateName.hasDictionary = true
+column.DestStateName.isSingleValues = true
+column.DestStateName.maxNumberOfMultiValues = 0
+column.DestStateName.totalNumberOfEntries = 313
+column.DestStateName.isAutoGenerated = false
+column.DestStateName.minValue = Alabama
+column.DestStateName.maxValue = Wisconsin
+column.DestStateName.defaultNullValue = null
+column.DestWac.cardinality = 42
+column.DestWac.totalDocs = 313
+column.DestWac.dataType = INT
+column.DestWac.bitsPerElement = 6
+column.DestWac.lengthOfEachEntry = 0
+column.DestWac.columnType = DIMENSION
+column.DestWac.isSorted = false
+column.DestWac.hasDictionary = true
+column.DestWac.isSingleValues = true
+column.DestWac.maxNumberOfMultiValues = 0
+column.DestWac.totalNumberOfEntries = 313
+column.DestWac.isAutoGenerated = false
+column.DestWac.minValue = 1
+column.DestWac.maxValue = 93
+column.DestWac.defaultNullValue = -2147483648
+column.Distance.cardinality = 250
+column.Distance.totalDocs = 313
+column.Distance.dataType = INT
+column.Distance.bitsPerElement = 8
+column.Distance.lengthOfEachEntry = 0
+column.Distance.columnType = DIMENSION
+column.Distance.isSorted = false
+column.Distance.hasDictionary = true
+column.Distance.isSingleValues = true
+column.Distance.maxNumberOfMultiValues = 0
+column.Distance.totalNumberOfEntries = 313
+column.Distance.isAutoGenerated = false
+column.Distance.minValue = 67
+column.Distance.maxValue = 3801
+column.Distance.defaultNullValue = -2147483648
+column.DistanceGroup.cardinality = 11
+column.DistanceGroup.totalDocs = 313
+column.DistanceGroup.dataType = INT
+column.DistanceGroup.bitsPerElement = 4
+column.DistanceGroup.lengthOfEachEntry = 0
+column.DistanceGroup.columnType = DIMENSION
+column.DistanceGroup.isSorted = false
+column.DistanceGroup.hasDictionary = true
+column.DistanceGroup.isSingleValues = true
+column.DistanceGroup.maxNumberOfMultiValues = 0
+column.DistanceGroup.totalNumberOfEntries = 313
+column.DistanceGroup.isAutoGenerated = false
+column.DistanceGroup.minValue = 1
+column.DistanceGroup.maxValue = 11
+column.DistanceGroup.defaultNullValue = -2147483648
+column.DivActualElapsedTime.cardinality = 36
+column.DivActualElapsedTime.totalDocs = 313
+column.DivActualElapsedTime.dataType = INT
+column.DivActualElapsedTime.bitsPerElement = 6
+column.DivActualElapsedTime.lengthOfEachEntry = 0
+column.DivActualElapsedTime.columnType = DIMENSION
+column.DivActualElapsedTime.isSorted = false
+column.DivActualElapsedTime.hasDictionary = true
+column.DivActualElapsedTime.isSingleValues = true
+column.DivActualElapsedTime.maxNumberOfMultiValues = 0
+column.DivActualElapsedTime.totalNumberOfEntries = 313
+column.DivActualElapsedTime.isAutoGenerated = false
+column.DivActualElapsedTime.minValue = -2147483648
+column.DivActualElapsedTime.maxValue = 1099
+column.DivActualElapsedTime.defaultNullValue = -2147483648
+column.DivAirportIDs.cardinality = 33
+column.DivAirportIDs.totalDocs = 313
+column.DivAirportIDs.dataType = INT
+column.DivAirportIDs.bitsPerElement = 6
+column.DivAirportIDs.lengthOfEachEntry = 0
+column.DivAirportIDs.columnType = DIMENSION
+column.DivAirportIDs.isSorted = false
+column.DivAirportIDs.hasDictionary = true
+column.DivAirportIDs.isSingleValues = false
+column.DivAirportIDs.maxNumberOfMultiValues = 1
+column.DivAirportIDs.totalNumberOfEntries = 313
+column.DivAirportIDs.isAutoGenerated = false
+column.DivAirportIDs.minValue = -2147483648
+column.DivAirportIDs.maxValue = 15096
+column.DivAirportIDs.defaultNullValue = -2147483648
+column.DivAirportLandings.cardinality = 3
+column.DivAirportLandings.totalDocs = 313
+column.DivAirportLandings.dataType = INT
+column.DivAirportLandings.bitsPerElement = 2
+column.DivAirportLandings.lengthOfEachEntry = 0
+column.DivAirportLandings.columnType = DIMENSION
+column.DivAirportLandings.isSorted = false
+column.DivAirportLandings.hasDictionary = true
+column.DivAirportLandings.isSingleValues = true
+column.DivAirportLandings.maxNumberOfMultiValues = 0
+column.DivAirportLandings.totalNumberOfEntries = 313
+column.DivAirportLandings.isAutoGenerated = false
+column.DivAirportLandings.minValue = 0
+column.DivAirportLandings.maxValue = 9
+column.DivAirportLandings.defaultNullValue = -2147483648
+column.DivAirportSeqIDs.cardinality = 33
+column.DivAirportSeqIDs.totalDocs = 313
+column.DivAirportSeqIDs.dataType = INT
+column.DivAirportSeqIDs.bitsPerElement = 6
+column.DivAirportSeqIDs.lengthOfEachEntry = 0
+column.DivAirportSeqIDs.columnType = DIMENSION
+column.DivAirportSeqIDs.isSorted = false
+column.DivAirportSeqIDs.hasDictionary = true
+column.DivAirportSeqIDs.isSingleValues = false
+column.DivAirportSeqIDs.maxNumberOfMultiValues = 1
+column.DivAirportSeqIDs.totalNumberOfEntries = 313
+column.DivAirportSeqIDs.isAutoGenerated = false
+column.DivAirportSeqIDs.minValue = -2147483648
+column.DivAirportSeqIDs.maxValue = 1509602
+column.DivAirportSeqIDs.defaultNullValue = -2147483648
+column.DivAirports.cardinality = 33
+column.DivAirports.totalDocs = 313
+column.DivAirports.dataType = STRING
+column.DivAirports.bitsPerElement = 6
+column.DivAirports.lengthOfEachEntry = 4
+column.DivAirports.columnType = DIMENSION
+column.DivAirports.isSorted = false
+column.DivAirports.hasDictionary = true
+column.DivAirports.isSingleValues = false
+column.DivAirports.maxNumberOfMultiValues = 1
+column.DivAirports.totalNumberOfEntries = 313
+column.DivAirports.isAutoGenerated = false
+column.DivAirports.minValue = ALB
+column.DivAirports.maxValue = null
+column.DivAirports.defaultNullValue = null
+column.DivArrDelay.cardinality = 31
+column.DivArrDelay.totalDocs = 313
+column.DivArrDelay.dataType = INT
+column.DivArrDelay.bitsPerElement = 5
+column.DivArrDelay.lengthOfEachEntry = 0
+column.DivArrDelay.columnType = DIMENSION
+column.DivArrDelay.isSorted = false
+column.DivArrDelay.hasDictionary = true
+column.DivArrDelay.isSingleValues = true
+column.DivArrDelay.maxNumberOfMultiValues = 0
+column.DivArrDelay.totalNumberOfEntries = 313
+column.DivArrDelay.isAutoGenerated = false
+column.DivArrDelay.minValue = -2147483648
+column.DivArrDelay.maxValue = 1024
+column.DivArrDelay.defaultNullValue = -2147483648
+column.DivDistance.cardinality = 9
+column.DivDistance.totalDocs = 313
+column.DivDistance.dataType = INT
+column.DivDistance.bitsPerElement = 4
+column.DivDistance.lengthOfEachEntry = 0
+column.DivDistance.columnType = DIMENSION
+column.DivDistance.isSorted = false
+column.DivDistance.hasDictionary = true
+column.DivDistance.isSingleValues = true
+column.DivDistance.maxNumberOfMultiValues = 0
+column.DivDistance.totalNumberOfEntries = 313
+column.DivDistance.isAutoGenerated = false
+column.DivDistance.minValue = -2147483648
+column.DivDistance.maxValue = 257
+column.DivDistance.defaultNullValue = -2147483648
+column.DivLongestGTimes.cardinality = 28
+column.DivLongestGTimes.totalDocs = 313
+column.DivLongestGTimes.dataType = INT
+column.DivLongestGTimes.bitsPerElement = 5
+column.DivLongestGTimes.lengthOfEachEntry = 0
+column.DivLongestGTimes.columnType = DIMENSION
+column.DivLongestGTimes.isSorted = false
+column.DivLongestGTimes.hasDictionary = true
+column.DivLongestGTimes.isSingleValues = false
+column.DivLongestGTimes.maxNumberOfMultiValues = 1
+column.DivLongestGTimes.totalNumberOfEntries = 313
+column.DivLongestGTimes.isAutoGenerated = false
+column.DivLongestGTimes.minValue = -2147483648
+column.DivLongestGTimes.maxValue = 145
+column.DivLongestGTimes.defaultNullValue = -2147483648
+column.DivReachedDest.cardinality = 3
+column.DivReachedDest.totalDocs = 313
+column.DivReachedDest.dataType = INT
+column.DivReachedDest.bitsPerElement = 2
+column.DivReachedDest.lengthOfEachEntry = 0
+column.DivReachedDest.columnType = DIMENSION
+column.DivReachedDest.isSorted = false
+column.DivReachedDest.hasDictionary = true
+column.DivReachedDest.isSingleValues = true
+column.DivReachedDest.maxNumberOfMultiValues = 0
+column.DivReachedDest.totalNumberOfEntries = 313
+column.DivReachedDest.isAutoGenerated = false
+column.DivReachedDest.minValue = -2147483648
+column.DivReachedDest.maxValue = 1
+column.DivReachedDest.defaultNullValue = -2147483648
+column.DivTailNums.cardinality = 37
+column.DivTailNums.totalDocs = 313
+column.DivTailNums.dataType = STRING
+column.DivTailNums.bitsPerElement = 6
+column.DivTailNums.lengthOfEachEntry = 6
+column.DivTailNums.columnType = DIMENSION
+column.DivTailNums.isSorted = false
+column.DivTailNums.hasDictionary = true
+column.DivTailNums.isSingleValues = false
+column.DivTailNums.maxNumberOfMultiValues = 1
+column.DivTailNums.totalNumberOfEntries = 313
+column.DivTailNums.isAutoGenerated = false
+column.DivTailNums.minValue = N11536
+column.DivTailNums.maxValue = null
+column.DivTailNums.defaultNullValue = null
+column.DivTotalGTimes.cardinality = 33
+column.DivTotalGTimes.totalDocs = 313
+column.DivTotalGTimes.dataType = INT
+column.DivTotalGTimes.bitsPerElement = 6
+column.DivTotalGTimes.lengthOfEachEntry = 0
+column.DivTotalGTimes.columnType = DIMENSION
+column.DivTotalGTimes.isSorted = false
+column.DivTotalGTimes.hasDictionary = true
+column.DivTotalGTimes.isSingleValues = false
+column.DivTotalGTimes.maxNumberOfMultiValues = 1
+column.DivTotalGTimes.totalNumberOfEntries = 313
+column.DivTotalGTimes.isAutoGenerated = false
+column.DivTotalGTimes.minValue = -2147483648
+column.DivTotalGTimes.maxValue = 145
+column.DivTotalGTimes.defaultNullValue = -2147483648
+column.DivWheelsOffs.cardinality = 35
+column.DivWheelsOffs.totalDocs = 313
+column.DivWheelsOffs.dataType = INT
+column.DivWheelsOffs.bitsPerElement = 6
+column.DivWheelsOffs.lengthOfEachEntry = 0
+column.DivWheelsOffs.columnType = DIMENSION
+column.DivWheelsOffs.isSorted = false
+column.DivWheelsOffs.hasDictionary = true
+column.DivWheelsOffs.isSingleValues = false
+column.DivWheelsOffs.maxNumberOfMultiValues = 1
+column.DivWheelsOffs.totalNumberOfEntries = 313
+column.DivWheelsOffs.isAutoGenerated = false
+column.DivWheelsOffs.minValue = -2147483648
+column.DivWheelsOffs.maxValue = 2322
+column.DivWheelsOffs.defaultNullValue = -2147483648
+column.DivWheelsOns.cardinality = 50
+column.DivWheelsOns.totalDocs = 313
+column.DivWheelsOns.dataType = INT
+column.DivWheelsOns.bitsPerElement = 6
+column.DivWheelsOns.lengthOfEachEntry = 0
+column.DivWheelsOns.columnType = DIMENSION
+column.DivWheelsOns.isSorted = false
+column.DivWheelsOns.hasDictionary = true
+column.DivWheelsOns.isSingleValues = false
+column.DivWheelsOns.maxNumberOfMultiValues = 1
+column.DivWheelsOns.totalNumberOfEntries = 313
+column.DivWheelsOns.isAutoGenerated = false
+column.DivWheelsOns.minValue = -2147483648
+column.DivWheelsOns.maxValue = 2347
+column.DivWheelsOns.defaultNullValue = -2147483648
+column.Diverted.cardinality = 2
+column.Diverted.totalDocs = 313
+column.Diverted.dataType = INT
+column.Diverted.bitsPerElement = 1
+column.Diverted.lengthOfEachEntry = 0
+column.Diverted.columnType = DIMENSION
+column.Diverted.isSorted = false
+column.Diverted.hasDictionary = true
+column.Diverted.isSingleValues = true
+column.Diverted.maxNumberOfMultiValues = 0
+column.Diverted.totalNumberOfEntries = 313
+column.Diverted.isAutoGenerated = false
+column.Diverted.minValue = 0
+column.Diverted.maxValue = 1
+column.Diverted.defaultNullValue = -2147483648
+column.FirstDepTime.cardinality = 3
+column.FirstDepTime.totalDocs = 313
+column.FirstDepTime.dataType = INT
+column.FirstDepTime.bitsPerElement = 2
+column.FirstDepTime.lengthOfEachEntry = 0
+column.FirstDepTime.columnType = DIMENSION
+column.FirstDepTime.isSorted = false
+column.FirstDepTime.hasDictionary = true
+column.FirstDepTime.isSingleValues = true
+column.FirstDepTime.maxNumberOfMultiValues = 0
+column.FirstDepTime.totalNumberOfEntries = 313
+column.FirstDepTime.isAutoGenerated = false
+column.FirstDepTime.minValue = -2147483648
+column.FirstDepTime.maxValue = 1301
+column.FirstDepTime.defaultNullValue = -2147483648
+column.FlightDate.cardinality = 1
+column.FlightDate.totalDocs = 313
+column.FlightDate.dataType = STRING
+column.FlightDate.bitsPerElement = 1
+column.FlightDate.lengthOfEachEntry = 10
+column.FlightDate.columnType = DIMENSION
+column.FlightDate.isSorted = true
+column.FlightDate.hasDictionary = true
+column.FlightDate.isSingleValues = true
+column.FlightDate.maxNumberOfMultiValues = 0
+column.FlightDate.totalNumberOfEntries = 313
+column.FlightDate.isAutoGenerated = false
+column.FlightDate.minValue = 2014-01-15
+column.FlightDate.maxValue = 2014-01-15
+column.FlightDate.defaultNullValue = null
+column.FlightNum.cardinality = 304
+column.FlightNum.totalDocs = 313
+column.FlightNum.dataType = INT
+column.FlightNum.bitsPerElement = 9
+column.FlightNum.lengthOfEachEntry = 0
+column.FlightNum.columnType = DIMENSION
+column.FlightNum.isSorted = false
+column.FlightNum.hasDictionary = true
+column.FlightNum.isSingleValues = true
+column.FlightNum.maxNumberOfMultiValues = 0
+column.FlightNum.totalNumberOfEntries = 313
+column.FlightNum.isAutoGenerated = false
+column.FlightNum.minValue = 3
+column.FlightNum.maxValue = 7416
+column.FlightNum.defaultNullValue = -2147483648
+column.Flights.cardinality = 1
+column.Flights.totalDocs = 313
+column.Flights.dataType = INT
+column.Flights.bitsPerElement = 1
+column.Flights.lengthOfEachEntry = 0
+column.Flights.columnType = DIMENSION
+column.Flights.isSorted = true
+column.Flights.hasDictionary = true
+column.Flights.isSingleValues = true
+column.Flights.maxNumberOfMultiValues = 0
+column.Flights.totalNumberOfEntries = 313
+column.Flights.isAutoGenerated = false
+column.Flights.minValue = 1
+column.Flights.maxValue = 1
+column.Flights.defaultNullValue = -2147483648
+column.LateAircraftDelay.cardinality = 17
+column.LateAircraftDelay.totalDocs = 313
+column.LateAircraftDelay.dataType = INT
+column.LateAircraftDelay.bitsPerElement = 5
+column.LateAircraftDelay.lengthOfEachEntry = 0
+column.LateAircraftDelay.columnType = DIMENSION
+column.LateAircraftDelay.isSorted = false
+column.LateAircraftDelay.hasDictionary = true
+column.LateAircraftDelay.isSingleValues = true
+column.LateAircraftDelay.maxNumberOfMultiValues = 0
+column.LateAircraftDelay.totalNumberOfEntries = 313
+column.LateAircraftDelay.isAutoGenerated = false
+column.LateAircraftDelay.minValue = -2147483648
+column.LateAircraftDelay.maxValue = 221
+column.LateAircraftDelay.defaultNullValue = -2147483648
+column.LongestAddGTime.cardinality = 3
+column.LongestAddGTime.totalDocs = 313
+column.LongestAddGTime.dataType = INT
+column.LongestAddGTime.bitsPerElement = 2
+column.LongestAddGTime.lengthOfEachEntry = 0
+column.LongestAddGTime.columnType = DIMENSION
+column.LongestAddGTime.isSorted = false
+column.LongestAddGTime.hasDictionary = true
+column.LongestAddGTime.isSingleValues = true
+column.LongestAddGTime.maxNumberOfMultiValues = 0
+column.LongestAddGTime.totalNumberOfEntries = 313
+column.LongestAddGTime.isAutoGenerated = false
+column.LongestAddGTime.minValue = -2147483648
+column.LongestAddGTime.maxValue = 41
+column.LongestAddGTime.defaultNullValue = -2147483648
+column.Month.cardinality = 1
+column.Month.totalDocs = 313
+column.Month.dataType = INT
+column.Month.bitsPerElement = 1
+column.Month.lengthOfEachEntry = 0
+column.Month.columnType = DIMENSION
+column.Month.isSorted = true
+column.Month.hasDictionary = true
+column.Month.isSingleValues = true
+column.Month.maxNumberOfMultiValues = 0
+column.Month.totalNumberOfEntries = 313
+column.Month.isAutoGenerated = false
+column.Month.minValue = 1
+column.Month.maxValue = 1
+column.Month.defaultNullValue = -2147483648
+column.NASDelay.cardinality = 19
+column.NASDelay.totalDocs = 313
+column.NASDelay.dataType = INT
+column.NASDelay.bitsPerElement = 5
+column.NASDelay.lengthOfEachEntry = 0
+column.NASDelay.columnType = DIMENSION
+column.NASDelay.isSorted = false
+column.NASDelay.hasDictionary = true
+column.NASDelay.isSingleValues = true
+column.NASDelay.maxNumberOfMultiValues = 0
+column.NASDelay.totalNumberOfEntries = 313
+column.NASDelay.isAutoGenerated = false
+column.NASDelay.minValue = -2147483648
+column.NASDelay.maxValue = 66
+column.NASDelay.defaultNullValue = -2147483648
+column.Origin.cardinality = 97
+column.Origin.totalDocs = 313
+column.Origin.dataType = STRING
+column.Origin.bitsPerElement = 7
+column.Origin.lengthOfEachEntry = 3
+column.Origin.columnType = DIMENSION
+column.Origin.isSorted = false
+column.Origin.hasDictionary = true
+column.Origin.isSingleValues = true
+column.Origin.maxNumberOfMultiValues = 0
+column.Origin.totalNumberOfEntries = 313
+column.Origin.isAutoGenerated = false
+column.Origin.minValue = ABR
+column.Origin.maxValue = XNA
+column.Origin.defaultNullValue = null
+column.OriginAirportID.cardinality = 97
+column.OriginAirportID.totalDocs = 313
+column.OriginAirportID.dataType = INT
+column.OriginAirportID.bitsPerElement = 7
+column.OriginAirportID.lengthOfEachEntry = 0
+column.OriginAirportID.columnType = DIMENSION
+column.OriginAirportID.isSorted = false
+column.OriginAirportID.hasDictionary = true
+column.OriginAirportID.isSingleValues = true
+column.OriginAirportID.maxNumberOfMultiValues = 0
+column.OriginAirportID.totalNumberOfEntries = 313
+column.OriginAirportID.isAutoGenerated = false
+column.OriginAirportID.minValue = 10141
+column.OriginAirportID.maxValue = 15919
+column.OriginAirportID.defaultNullValue = -2147483648
+column.OriginAirportSeqID.cardinality = 97
+column.OriginAirportSeqID.totalDocs = 313
+column.OriginAirportSeqID.dataType = INT
+column.OriginAirportSeqID.bitsPerElement = 7
+column.OriginAirportSeqID.lengthOfEachEntry = 0
+column.OriginAirportSeqID.columnType = DIMENSION
+column.OriginAirportSeqID.isSorted = false
+column.OriginAirportSeqID.hasDictionary = true
+column.OriginAirportSeqID.isSingleValues = true
+column.OriginAirportSeqID.maxNumberOfMultiValues = 0
+column.OriginAirportSeqID.totalNumberOfEntries = 313
+column.OriginAirportSeqID.isAutoGenerated = false
+column.OriginAirportSeqID.minValue = 1014102
+column.OriginAirportSeqID.maxValue = 1591902
+column.OriginAirportSeqID.defaultNullValue = -2147483648
+column.OriginCityMarketID.cardinality = 82
+column.OriginCityMarketID.totalDocs = 313
+column.OriginCityMarketID.dataType = INT
+column.OriginCityMarketID.bitsPerElement = 7
+column.OriginCityMarketID.lengthOfEachEntry = 0
+column.OriginCityMarketID.columnType = DIMENSION
+column.OriginCityMarketID.isSorted = false
+column.OriginCityMarketID.hasDictionary = true
+column.OriginCityMarketID.isSingleValues = true
+column.OriginCityMarketID.maxNumberOfMultiValues = 0
+column.OriginCityMarketID.totalNumberOfEntries = 313
+column.OriginCityMarketID.isAutoGenerated = false
+column.OriginCityMarketID.minValue = 30070
+column.OriginCityMarketID.maxValue = 35165
+column.OriginCityMarketID.defaultNullValue = -2147483648
+column.OriginCityName.cardinality = 93
+column.OriginCityName.totalDocs = 313
+column.OriginCityName.dataType = STRING
+column.OriginCityName.bitsPerElement = 7
+column.OriginCityName.lengthOfEachEntry = 30
+column.OriginCityName.columnType = DIMENSION
+column.OriginCityName.isSorted = false
+column.OriginCityName.hasDictionary = true
+column.OriginCityName.isSingleValues = true
+column.OriginCityName.maxNumberOfMultiValues = 0
+column.OriginCityName.totalNumberOfEntries = 313
+column.OriginCityName.isAutoGenerated = false
+column.OriginCityName.minMaxValueInvalid = true
+column.OriginCityName.defaultNullValue = null
+column.OriginState.cardinality = 43
+column.OriginState.totalDocs = 313
+column.OriginState.dataType = STRING
+column.OriginState.bitsPerElement = 6
+column.OriginState.lengthOfEachEntry = 2
+column.OriginState.columnType = DIMENSION
+column.OriginState.isSorted = false
+column.OriginState.hasDictionary = true
+column.OriginState.isSingleValues = true
+column.OriginState.maxNumberOfMultiValues = 0
+column.OriginState.totalNumberOfEntries = 313
+column.OriginState.isAutoGenerated = false
+column.OriginState.minValue = AK
+column.OriginState.maxValue = WI
+column.OriginState.defaultNullValue = null
+column.OriginStateFips.cardinality = 43
+column.OriginStateFips.totalDocs = 313
+column.OriginStateFips.dataType = INT
+column.OriginStateFips.bitsPerElement = 6
+column.OriginStateFips.lengthOfEachEntry = 0
+column.OriginStateFips.columnType = DIMENSION
+column.OriginStateFips.isSorted = false
+column.OriginStateFips.hasDictionary = true
+column.OriginStateFips.isSingleValues = true
+column.OriginStateFips.maxNumberOfMultiValues = 0
+column.OriginStateFips.totalNumberOfEntries = 313
+column.OriginStateFips.isAutoGenerated = false
+column.OriginStateFips.minValue = 1
+column.OriginStateFips.maxValue = 72
+column.OriginStateFips.defaultNullValue = -2147483648
+column.OriginStateName.cardinality = 43
+column.OriginStateName.totalDocs = 313
+column.OriginStateName.dataType = STRING
+column.OriginStateName.bitsPerElement = 6
+column.OriginStateName.lengthOfEachEntry = 14
+column.OriginStateName.columnType = DIMENSION
+column.OriginStateName.isSorted = false
+column.OriginStateName.hasDictionary = true
+column.OriginStateName.isSingleValues = true
+column.OriginStateName.maxNumberOfMultiValues = 0
+column.OriginStateName.totalNumberOfEntries = 313
+column.OriginStateName.isAutoGenerated = false
+column.OriginStateName.minValue = Alabama
+column.OriginStateName.maxValue = Wisconsin
+column.OriginStateName.defaultNullValue = null
+column.OriginWac.cardinality = 43
+column.OriginWac.totalDocs = 313
+column.OriginWac.dataType = INT
+column.OriginWac.bitsPerElement = 6
+column.OriginWac.lengthOfEachEntry = 0
+column.OriginWac.columnType = DIMENSION
+column.OriginWac.isSorted = false
+column.OriginWac.hasDictionary = true
+column.OriginWac.isSingleValues = true
+column.OriginWac.maxNumberOfMultiValues = 0
+column.OriginWac.totalNumberOfEntries = 313
+column.OriginWac.isAutoGenerated = false
+column.OriginWac.minValue = 1
+column.OriginWac.maxValue = 93
+column.OriginWac.defaultNullValue = -2147483648
+column.Quarter.cardinality = 1
+column.Quarter.totalDocs = 313
+column.Quarter.dataType = INT
+column.Quarter.bitsPerElement = 1
+column.Quarter.lengthOfEachEntry = 0
+column.Quarter.columnType = DIMENSION
+column.Quarter.isSorted = true
+column.Quarter.hasDictionary = true
+column.Quarter.isSingleValues = true
+column.Quarter.maxNumberOfMultiValues = 0
+column.Quarter.totalNumberOfEntries = 313
+column.Quarter.isAutoGenerated = false
+column.Quarter.minValue = 1
+column.Quarter.maxValue = 1
+column.Quarter.defaultNullValue = -2147483648
+column.RandomAirports.cardinality = 78
+column.RandomAirports.totalDocs = 313
+column.RandomAirports.dataType = STRING
+column.RandomAirports.bitsPerElement = 7
+column.RandomAirports.lengthOfEachEntry = 4
+column.RandomAirports.columnType = DIMENSION
+column.RandomAirports.isSorted = false
+column.RandomAirports.hasDictionary = true
+column.RandomAirports.isSingleValues = false
+column.RandomAirports.maxNumberOfMultiValues = 77
+column.RandomAirports.totalNumberOfEntries = 4415
+column.RandomAirports.isAutoGenerated = false
+column.RandomAirports.minValue = ABI
+column.RandomAirports.maxValue = null
+column.RandomAirports.defaultNullValue = null
+column.SecurityDelay.cardinality = 2
+column.SecurityDelay.totalDocs = 313
+column.SecurityDelay.dataType = INT
+column.SecurityDelay.bitsPerElement = 1
+column.SecurityDelay.lengthOfEachEntry = 0
+column.SecurityDelay.columnType = DIMENSION
+column.SecurityDelay.isSorted = false
+column.SecurityDelay.hasDictionary = true
+column.SecurityDelay.isSingleValues = true
+column.SecurityDelay.maxNumberOfMultiValues = 0
+column.SecurityDelay.totalNumberOfEntries = 313
+column.SecurityDelay.isAutoGenerated = false
+column.SecurityDelay.minValue = -2147483648
+column.SecurityDelay.maxValue = 0
+column.SecurityDelay.defaultNullValue = -2147483648
+column.TailNum.cardinality = 303
+column.TailNum.totalDocs = 313
+column.TailNum.dataType = STRING
+column.TailNum.bitsPerElement = 9
+column.TailNum.lengthOfEachEntry = 6
+column.TailNum.columnType = DIMENSION
+column.TailNum.isSorted = false
+column.TailNum.hasDictionary = true
+column.TailNum.isSingleValues = true
+column.TailNum.maxNumberOfMultiValues = 0
+column.TailNum.totalNumberOfEntries = 313
+column.TailNum.isAutoGenerated = false
+column.TailNum.minValue = N002AA
+column.TailNum.maxValue = N995DL
+column.TailNum.defaultNullValue = null
+column.TaxiIn.cardinality = 21
+column.TaxiIn.totalDocs = 313
+column.TaxiIn.dataType = INT
+column.TaxiIn.bitsPerElement = 5
+column.TaxiIn.lengthOfEachEntry = 0
+column.TaxiIn.columnType = DIMENSION
+column.TaxiIn.isSorted = false
+column.TaxiIn.hasDictionary = true
+column.TaxiIn.isSingleValues = true
+column.TaxiIn.maxNumberOfMultiValues = 0
+column.TaxiIn.totalNumberOfEntries = 313
+column.TaxiIn.isAutoGenerated = false
+column.TaxiIn.minValue = -2147483648
+column.TaxiIn.maxValue = 36
+column.TaxiIn.defaultNullValue = -2147483648
+column.TaxiOut.cardinality = 35
+column.TaxiOut.totalDocs = 313
+column.TaxiOut.dataType = INT
+column.TaxiOut.bitsPerElement = 6
+column.TaxiOut.lengthOfEachEntry = 0
+column.TaxiOut.columnType = DIMENSION
+column.TaxiOut.isSorted = false
+column.TaxiOut.hasDictionary = true
+column.TaxiOut.isSingleValues = true
+column.TaxiOut.maxNumberOfMultiValues = 0
+column.TaxiOut.totalNumberOfEntries = 313
+column.TaxiOut.isAutoGenerated = false
+column.TaxiOut.minValue = -2147483648
+column.TaxiOut.maxValue = 54
+column.TaxiOut.defaultNullValue = -2147483648
+column.TotalAddGTime.cardinality = 3
+column.TotalAddGTime.totalDocs = 313
+column.TotalAddGTime.dataType = INT
+column.TotalAddGTime.bitsPerElement = 2
+column.TotalAddGTime.lengthOfEachEntry = 0
+column.TotalAddGTime.columnType = DIMENSION
+column.TotalAddGTime.isSorted = false
+column.TotalAddGTime.hasDictionary = true
+column.TotalAddGTime.isSingleValues = true
+column.TotalAddGTime.maxNumberOfMultiValues = 0
+column.TotalAddGTime.totalNumberOfEntries = 313
+column.TotalAddGTime.isAutoGenerated = false
+column.TotalAddGTime.minValue = -2147483648
+column.TotalAddGTime.maxValue = 41
+column.TotalAddGTime.defaultNullValue = -2147483648
+column.UniqueCarrier.cardinality = 14
+column.UniqueCarrier.totalDocs = 313
+column.UniqueCarrier.dataType = STRING
+column.UniqueCarrier.bitsPerElement = 4
+column.UniqueCarrier.lengthOfEachEntry = 2
+column.UniqueCarrier.columnType = DIMENSION
+column.UniqueCarrier.isSorted = false
+column.UniqueCarrier.hasDictionary = true
+column.UniqueCarrier.isSingleValues = true
+column.UniqueCarrier.maxNumberOfMultiValues = 0
+column.UniqueCarrier.totalNumberOfEntries = 313
+column.UniqueCarrier.isAutoGenerated = false
+column.UniqueCarrier.minValue = AA
+column.UniqueCarrier.maxValue = WN
+column.UniqueCarrier.defaultNullValue = null
+column.WeatherDelay.cardinality = 2
+column.WeatherDelay.totalDocs = 313
+column.WeatherDelay.dataType = INT
+column.WeatherDelay.bitsPerElement = 1
+column.WeatherDelay.lengthOfEachEntry = 0
+column.WeatherDelay.columnType = DIMENSION
+column.WeatherDelay.isSorted = false
+column.WeatherDelay.hasDictionary = true
+column.WeatherDelay.isSingleValues = true
+column.WeatherDelay.maxNumberOfMultiValues = 0
+column.WeatherDelay.totalNumberOfEntries = 313
+column.WeatherDelay.isAutoGenerated = false
+column.WeatherDelay.minValue = -2147483648
+column.WeatherDelay.maxValue = 0
+column.WeatherDelay.defaultNullValue = -2147483648
+column.WheelsOff.cardinality = 269
+column.WheelsOff.totalDocs = 313
+column.WheelsOff.dataType = INT
+column.WheelsOff.bitsPerElement = 9
+column.WheelsOff.lengthOfEachEntry = 0
+column.WheelsOff.columnType = DIMENSION
+column.WheelsOff.isSorted = false
+column.WheelsOff.hasDictionary = true
+column.WheelsOff.isSingleValues = true
+column.WheelsOff.maxNumberOfMultiValues = 0
+column.WheelsOff.totalNumberOfEntries = 313
+column.WheelsOff.isAutoGenerated = false
+column.WheelsOff.minValue = -2147483648
+column.WheelsOff.maxValue = 2243
+column.WheelsOff.defaultNullValue = -2147483648
+column.WheelsOn.cardinality = 259
+column.WheelsOn.totalDocs = 313
+column.WheelsOn.dataType = INT
+column.WheelsOn.bitsPerElement = 9
+column.WheelsOn.lengthOfEachEntry = 0
+column.WheelsOn.columnType = DIMENSION
+column.WheelsOn.isSorted = false
+column.WheelsOn.hasDictionary = true
+column.WheelsOn.isSingleValues = true
+column.WheelsOn.maxNumberOfMultiValues = 0
+column.WheelsOn.totalNumberOfEntries = 313
+column.WheelsOn.isAutoGenerated = false
+column.WheelsOn.minValue = -2147483648
+column.WheelsOn.maxValue = 2355
+column.WheelsOn.defaultNullValue = -2147483648
+column.Year.cardinality = 1
+column.Year.totalDocs = 313
+column.Year.dataType = INT
+column.Year.bitsPerElement = 1
+column.Year.lengthOfEachEntry = 0
+column.Year.columnType = DIMENSION
+column.Year.isSorted = true
+column.Year.hasDictionary = true
+column.Year.isSingleValues = true
+column.Year.maxNumberOfMultiValues = 0
+column.Year.totalNumberOfEntries = 313
+column.Year.isAutoGenerated = false
+column.Year.minValue = 2014
+column.Year.maxValue = 2014
+column.Year.defaultNullValue = -2147483648
+column.ts.cardinality = 1
+column.ts.totalDocs = 313
+column.ts.dataType = TIMESTAMP
+column.ts.bitsPerElement = 1
+column.ts.lengthOfEachEntry = 0
+column.ts.columnType = DATE_TIME
+column.ts.isSorted = true
+column.ts.hasDictionary = true
+column.ts.isSingleValues = true
+column.ts.maxNumberOfMultiValues = 0
+column.ts.totalNumberOfEntries = 313
+column.ts.isAutoGenerated = false
+column.ts.datetimeFormat = 1:MILLISECONDS:TIMESTAMP
+column.ts.datetimeGranularity = 1:SECONDS
+column.ts.minValue = 1389744000000
+column.ts.maxValue = 1389744000000
+column.ts.defaultNullValue = 0
+column.tsRaw.cardinality = 1
+column.tsRaw.totalDocs = 313
+column.tsRaw.dataType = TIMESTAMP
+column.tsRaw.bitsPerElement = 1
+column.tsRaw.lengthOfEachEntry = 0
+column.tsRaw.columnType = DATE_TIME
+column.tsRaw.isSorted = true
+column.tsRaw.hasDictionary = true
+column.tsRaw.isSingleValues = true
+column.tsRaw.maxNumberOfMultiValues = 0
+column.tsRaw.totalNumberOfEntries = 313
+column.tsRaw.isAutoGenerated = false
+column.tsRaw.datetimeFormat = 1:MILLISECONDS:TIMESTAMP
+column.tsRaw.datetimeGranularity = 1:SECONDS
+column.tsRaw.minValue = 1389744000000
+column.tsRaw.maxValue = 1389744000000
+column.tsRaw.defaultNullValue = 0
+segment.index.version = v3
+startree.v2.count = 1
+startree.v2.0.total.docs = 1004
+startree.v2.0.split.order = AirlineID
+startree.v2.0.split.order = Origin
+startree.v2.0.split.order = Dest
+startree.v2.0.function.column.pairs = count__*
+startree.v2.0.function.column.pairs = max__ArrDelay
+startree.v2.0.max.leaf.records = 10
diff --git a/pinot-segment-local/src/test/resources/data/startree/segment/star_tree_index b/pinot-segment-local/src/test/resources/data/startree/segment/star_tree_index
new file mode 100644
index 00000000000..c75da7ea817
Binary files /dev/null and b/pinot-segment-local/src/test/resources/data/startree/segment/star_tree_index differ
diff --git a/pinot-segment-local/src/test/resources/data/startree/segment/star_tree_index_map b/pinot-segment-local/src/test/resources/data/startree/segment/star_tree_index_map
new file mode 100644
index 00000000000..0931e9ab535
--- /dev/null
+++ b/pinot-segment-local/src/test/resources/data/startree/segment/star_tree_index_map
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+0.null.STAR_TREE.OFFSET = 0
+0.null.STAR_TREE.SIZE = 18715
+0.AirlineID.FORWARD_INDEX.OFFSET = 18715
+0.AirlineID.FORWARD_INDEX.SIZE = 502
+0.Origin.FORWARD_INDEX.OFFSET = 19217
+0.Origin.FORWARD_INDEX.SIZE = 879
+0.Dest.FORWARD_INDEX.OFFSET = 20096
+0.Dest.FORWARD_INDEX.SIZE = 879
+0.count__*.FORWARD_INDEX.OFFSET = 20975
+0.count__*.FORWARD_INDEX.SIZE = 8068
+0.max__ArrDelay.FORWARD_INDEX.OFFSET = 29043
+0.max__ArrDelay.FORWARD_INDEX.SIZE = 8068
diff --git a/pinot-segment-local/src/test/resources/data/test_upsert_data.json b/pinot-segment-local/src/test/resources/data/test_upsert_data.json
index 70fe90b4c1a..5407326f9c2 100644
--- a/pinot-segment-local/src/test/resources/data/test_upsert_data.json
+++ b/pinot-segment-local/src/test/resources/data/test_upsert_data.json
@@ -4,15 +4,30 @@
     "description" : "first",
     "secondsSinceEpoch": 1567205394
   },
+  {
+    "event_id": "aa",
+    "description" : "update",
+    "secondsSinceEpoch": 1567205397
+  },
+  {
+    "event_id": "aa",
+    "description" : "first arrival, other column",
+    "otherComparisonColumn": 1567205395
+  },
+  {
+    "event_id": "aa",
+    "description" : "late arrival, other column",
+    "otherComparisonColumn": 1567205393
+  },
   {
     "event_id": "bb",
     "description" : "first",
     "secondsSinceEpoch": 1567205396
   },
   {
-    "event_id": "aa",
-    "description" : "update",
-    "secondsSinceEpoch": 1567205397
+    "event_id": "bb",
+    "description" : "duplicate arrival",
+    "secondsSinceEpoch": 1567205396
   },
   {
     "event_id": "bb",
diff --git a/pinot-segment-local/src/test/resources/data/test_upsert_schema.json b/pinot-segment-local/src/test/resources/data/test_upsert_schema.json
index 859c6f70c7a..8e6b7d28496 100644
--- a/pinot-segment-local/src/test/resources/data/test_upsert_schema.json
+++ b/pinot-segment-local/src/test/resources/data/test_upsert_schema.json
@@ -8,6 +8,10 @@
     {
       "name": "description",
       "dataType": "STRING"
+    },
+    {
+      "name": "otherComparisonColumn",
+      "dataType": "LONG"
     }
   ],
   "timeFieldSpec": {
diff --git a/pinot-segment-local/src/test/resources/log4j2.xml b/pinot-segment-local/src/test/resources/log4j2.xml
index 439331f9d7b..452631f6370 100644
--- a/pinot-segment-local/src/test/resources/log4j2.xml
+++ b/pinot-segment-local/src/test/resources/log4j2.xml
@@ -32,5 +32,9 @@
     <Root level="error">
       <AppenderRef ref="console"/>
     </Root>
+    <Logger name="org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig" additivity="false"
+            level="error">
+      <AppenderRef ref="console"/>
+    </Logger>
   </Loggers>
 </Configuration>
diff --git a/pinot-segment-spi/pom.xml b/pinot-segment-spi/pom.xml
index d77510ad9ac..d8859664789 100644
--- a/pinot-segment-spi/pom.xml
+++ b/pinot-segment-spi/pom.xml
@@ -76,6 +76,18 @@
       <groupId>org.xerial.larray</groupId>
       <artifactId>larray-mmap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>posix</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>chronicle-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-core</artifactId>
+    </dependency>
 
     <!-- test -->
     <dependency>
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/AggregationFunctionType.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/AggregationFunctionType.java
index 7c355d0057d..b636ed4f244 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/AggregationFunctionType.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/AggregationFunctionType.java
@@ -18,56 +18,133 @@
  */
 package org.apache.pinot.segment.spi;
 
+import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.ReturnTypes;
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlReturnTypeInference;
+import org.apache.calcite.sql.type.SqlTypeFamily;
+import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.commons.lang.StringUtils;
+import org.apache.pinot.spi.utils.CommonConstants;
 
 
 /**
- * NOTE: No underscore is allowed in the enum name.
+ * NOTES:
+ * - No underscore is allowed in the enum name.
+ * - '$' is allowed in the name field but not in the enum name.
+ *
+ * This enum is used both in the v1 engine and multistage engine to define the allowed Pinot aggregation functions.
+ * The v1 engine only relies on the 'name' field, whereas all the other fields are used in the multistage engine
+ * to register the aggregation function with Calcite. This allows using a unified approach to aggregations across both
+ * the v1 and multistage engines.
  */
 public enum AggregationFunctionType {
   // Aggregation functions for single-valued columns
-  COUNT("count"),
-  MIN("min"),
-  MAX("max"),
-  SUM("sum"),
-  SUMPRECISION("sumPrecision"),
+  COUNT("count", null, SqlKind.COUNT, SqlFunctionCategory.NUMERIC, OperandTypes.ONE_OR_MORE,
+      ReturnTypes.explicit(SqlTypeName.BIGINT), ReturnTypes.explicit(SqlTypeName.BIGINT)),
+  // TODO: min/max only supports NUMERIC in Pinot, where Calcite supports COMPARABLE_ORDERED
+  MIN("min", null, SqlKind.MIN, SqlFunctionCategory.SYSTEM, OperandTypes.NUMERIC, ReturnTypes.ARG0_NULLABLE_IF_EMPTY,
+      ReturnTypes.explicit(SqlTypeName.DOUBLE)),
+  MAX("max", null, SqlKind.MAX, SqlFunctionCategory.SYSTEM, OperandTypes.NUMERIC, ReturnTypes.ARG0_NULLABLE_IF_EMPTY,
+      ReturnTypes.explicit(SqlTypeName.DOUBLE)),
+  SUM("sum", null, SqlKind.SUM, SqlFunctionCategory.NUMERIC, OperandTypes.NUMERIC, ReturnTypes.AGG_SUM,
+      ReturnTypes.explicit(SqlTypeName.DOUBLE)),
+  SUM0("$sum0", null, SqlKind.SUM0, SqlFunctionCategory.NUMERIC, OperandTypes.NUMERIC,
+      ReturnTypes.AGG_SUM_EMPTY_IS_ZERO, ReturnTypes.explicit(SqlTypeName.DOUBLE)),
+  SUMPRECISION("sumPrecision", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.ANY, ReturnTypes.explicit(SqlTypeName.DECIMAL), ReturnTypes.explicit(SqlTypeName.OTHER)),
   AVG("avg"),
   MODE("mode"),
-  FIRSTWITHTIME("firstWithTime"),
-  LASTWITHTIME("lastWithTime"),
+
+  FIRSTWITHTIME("firstWithTime", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.TIMESTAMP, SqlTypeFamily.CHARACTER)),
+      ReturnTypes.ARG0, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  LASTWITHTIME("lastWithTime", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.TIMESTAMP, SqlTypeFamily.CHARACTER)),
+      ReturnTypes.ARG0, ReturnTypes.explicit(SqlTypeName.OTHER)),
   MINMAXRANGE("minMaxRange"),
-  DISTINCTCOUNT("distinctCount"),
+  /**
+   * for all distinct count family functions:
+   * (1) distinct_count only supports single argument;
+   * (2) count(distinct ...) support multi-argument and will be converted into DISTINCT + COUNT
+   */
+  DISTINCTCOUNT("distinctCount", null, SqlKind.OTHER_FUNCTION,
+      SqlFunctionCategory.USER_DEFINED_FUNCTION, OperandTypes.ANY, ReturnTypes.BIGINT,
+      ReturnTypes.explicit(SqlTypeName.OTHER)),
   DISTINCTCOUNTBITMAP("distinctCountBitmap"),
   SEGMENTPARTITIONEDDISTINCTCOUNT("segmentPartitionedDistinctCount"),
-  DISTINCTCOUNTHLL("distinctCountHLL"),
+  DISTINCTCOUNTHLL("distinctCountHLL", ImmutableList.of("DISTINCT_COUNT_HLL"), SqlKind.OTHER_FUNCTION,
+      SqlFunctionCategory.USER_DEFINED_FUNCTION, OperandTypes.ANY, ReturnTypes.BIGINT,
+      ReturnTypes.explicit(SqlTypeName.OTHER)),
   DISTINCTCOUNTRAWHLL("distinctCountRawHLL"),
   DISTINCTCOUNTSMARTHLL("distinctCountSmartHLL"),
   FASTHLL("fastHLL"),
-  DISTINCTCOUNTTHETASKETCH("distinctCountThetaSketch"),
-  DISTINCTCOUNTRAWTHETASKETCH("distinctCountRawThetaSketch"),
+  DISTINCTCOUNTTHETASKETCH("distinctCountThetaSketch", ImmutableList.of("DISTINCT_COUNT_THETA_SKETCH"),
+      SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER), ordinal -> ordinal > 0),
+      ReturnTypes.BIGINT, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  DISTINCTCOUNTRAWTHETASKETCH("distinctCountRawThetaSketch", ImmutableList.of("DISTINCT_COUNT_RAW_THETA_SKETCH"),
+      SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.ANY, SqlTypeFamily.CHARACTER), ordinal -> ordinal > 0),
+      ReturnTypes.VARCHAR_2000, ReturnTypes.explicit(SqlTypeName.OTHER)),
   DISTINCTSUM("distinctSum"),
   DISTINCTAVG("distinctAvg"),
-  PERCENTILE("percentile"),
+
+  PERCENTILE("percentile", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC)), ReturnTypes.ARG0,
+      ReturnTypes.explicit(SqlTypeName.OTHER)),
   PERCENTILEEST("percentileEst"),
   PERCENTILERAWEST("percentileRawEst"),
   PERCENTILETDIGEST("percentileTDigest"),
   PERCENTILERAWTDIGEST("percentileRawTDigest"),
   PERCENTILESMARTTDIGEST("percentileSmartTDigest"),
+  PERCENTILEKLL("percentileKLL"),
+  PERCENTILERAWKLL("percentileRawKLL"),
+
   IDSET("idSet"),
+
   HISTOGRAM("histogram"),
-  COVARPOP("covarPop"),
-  COVARSAMP("covarSamp"),
-  VARPOP("varPop"),
-  VARSAMP("varSamp"),
-  STDDEVPOP("stdDevPop"),
-  STDDEVSAMP("stdDevSamp"),
-  SKEWNESS("skewness"),
-  KURTOSIS("kurtosis"),
-  FOURTHMOMENT("fourthmoment"),
+
+  // TODO: support underscore separated version of the stats functions
+  // currently Pinot is missing generated agg functions impl from Calcite's AggregateReduceFunctionsRule
+  COVARPOP("covarPop", Collections.emptyList(), SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC)), ReturnTypes.DOUBLE,
+      ReturnTypes.explicit(SqlTypeName.OTHER)),
+  COVARSAMP("covarSamp", Collections.emptyList(), SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC)), ReturnTypes.DOUBLE,
+      ReturnTypes.explicit(SqlTypeName.OTHER)),
+  VARPOP("varPop", Collections.emptyList(), SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.NUMERIC, ReturnTypes.DOUBLE, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  VARSAMP("varSamp", Collections.emptyList(), SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.NUMERIC, ReturnTypes.DOUBLE, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  STDDEVPOP("stdDevPop", Collections.emptyList(), SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.NUMERIC, ReturnTypes.DOUBLE, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  STDDEVSAMP("stdDevSamp", Collections.emptyList(), SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.NUMERIC, ReturnTypes.DOUBLE, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  SKEWNESS("skewness", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.NUMERIC, ReturnTypes.DOUBLE, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  KURTOSIS("kurtosis", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.NUMERIC, ReturnTypes.DOUBLE, ReturnTypes.explicit(SqlTypeName.OTHER)),
+  FOURTHMOMENT("fourthMoment"),
+
+  // DataSketches Tuple Sketch support
+  DISTINCTCOUNTTUPLESKETCH("distinctCountTupleSketch"),
+
+  // DataSketches Tuple Sketch support for Integer based Tuple Sketches
+  DISTINCTCOUNTRAWINTEGERSUMTUPLESKETCH("distinctCountRawIntegerSumTupleSketch"),
+
+  SUMVALUESINTEGERSUMTUPLESKETCH("sumValuesIntegerSumTupleSketch"),
+  AVGVALUEINTEGERSUMTUPLESKETCH("avgValueIntegerSumTupleSketch"),
 
   // Geo aggregation functions
   STUNION("STUnion"),
@@ -90,25 +167,124 @@ public enum AggregationFunctionType {
   PERCENTILERAWESTMV("percentileRawEstMV"),
   PERCENTILETDIGESTMV("percentileTDigestMV"),
   PERCENTILERAWTDIGESTMV("percentileRawTDigestMV"),
-  DISTINCT("distinct"),
+  PERCENTILEKLLMV("percentileKLLMV"),
+  PERCENTILERAWKLLMV("percentileRawKLLMV"),
 
   // boolean aggregate functions
-  BOOLAND("boolAnd"),
-  BOOLOR("boolOr");
+  BOOLAND("boolAnd", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.BOOLEAN, ReturnTypes.BOOLEAN, ReturnTypes.explicit(SqlTypeName.INTEGER)),
+  BOOLOR("boolOr", null, SqlKind.OTHER_FUNCTION, SqlFunctionCategory.USER_DEFINED_FUNCTION,
+      OperandTypes.BOOLEAN, ReturnTypes.BOOLEAN, ReturnTypes.explicit(SqlTypeName.INTEGER)),
+
+  // argMin and argMax
+  ARGMIN("argMin"),
+  ARGMAX("argMax"),
+  PARENTARGMIN(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX + ARGMIN.getName()),
+  PARENTARGMAX(CommonConstants.RewriterConstants.PARENT_AGGREGATION_NAME_PREFIX + ARGMAX.getName()),
+  CHILDARGMIN(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX + ARGMIN.getName()),
+  CHILDARGMAX(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX + ARGMAX.getName()),
+
+  // funnel aggregate functions
+  FUNNELCOUNT("funnelCount");
 
   private static final Set<String> NAMES = Arrays.stream(values()).flatMap(func -> Stream.of(func.name(),
       func.getName(), func.getName().toLowerCase())).collect(Collectors.toSet());
 
+  // --------------------------------------------------------------------------
+  // Function signature used by Calcite.
+  // --------------------------------------------------------------------------
   private final String _name;
+  private final List<String> _alternativeNames;
+
+  // Fields for registering the aggregation function with Calcite in multistage. These are typically used for the
+  // user facing aggregation functions and the return and operand types should reflect that which is user facing.
+  private final SqlKind _sqlKind;
+  private final SqlFunctionCategory _sqlFunctionCategory;
 
+  // override options for Pinot aggregate functions that expects different return type or operand type
+  private final SqlReturnTypeInference _returnTypeInference;
+  private final SqlOperandTypeChecker _operandTypeChecker;
+  // override options for Pinot aggregate rules to insert intermediate results that are non-standard than return type.
+  private final SqlReturnTypeInference _intermediateReturnTypeInference;
+
+  /**
+   * Constructor to use for aggregation functions which are only supported in v1 engine today
+   */
   AggregationFunctionType(String name) {
+    this(name, null, null, null);
+  }
+
+  /**
+   * Constructor to use for aggregation functions which are supported in both v1 and multistage engines.
+   * <ul>
+   *   <li>single input operand.</li>
+   *   <li>built-in input/output behavior expected by {@link org.apache.calcite.sql.fun.SqlStdOperatorTable}.</li>
+   *   <li>intermediate output type the same as final output type.</li>
+   * </ul>
+   */
+  AggregationFunctionType(String name, List<String> alternativeNames, SqlKind sqlKind,
+      SqlFunctionCategory sqlFunctionCategory) {
+    this(name, alternativeNames, sqlKind, sqlFunctionCategory, null, null, null);
+  }
+
+  /**
+   * Constructor to use for aggregation functions which are supported in both v1 and multistage engines with
+   * different behavior comparing to Calcite and requires literal operand inputs.
+   *
+   * @param name name of the agg function
+   * @param alternativeNames alternative name of the agg function.
+   * @param sqlKind sql kind indicator, used by Calcite
+   * @param sqlFunctionCategory function catalog, used by Calcite
+   * @param operandTypeChecker input operand type signature, used by Calcite
+   * @param finalReturnType final output type signature, used by Calcite
+   * @param intermediateReturnType intermediate output type signature, used by Pinot and Calcite
+   */
+  AggregationFunctionType(String name, @Nullable List<String> alternativeNames, @Nullable SqlKind sqlKind,
+      @Nullable SqlFunctionCategory sqlFunctionCategory, @Nullable SqlOperandTypeChecker operandTypeChecker,
+      @Nullable SqlReturnTypeInference finalReturnType, @Nullable SqlReturnTypeInference intermediateReturnType) {
     _name = name;
+    if (alternativeNames == null) {
+      _alternativeNames = Collections.singletonList(getUnderscoreSplitAggregationFunctionName(_name));
+    } else {
+      _alternativeNames = alternativeNames;
+    }
+    _sqlKind = sqlKind;
+    _sqlFunctionCategory = sqlFunctionCategory;
+
+    _returnTypeInference = finalReturnType;
+    _operandTypeChecker = operandTypeChecker;
+    _intermediateReturnTypeInference = intermediateReturnType == null ? _returnTypeInference
+        : intermediateReturnType;
   }
 
   public String getName() {
     return _name;
   }
 
+  public List<String> getAlternativeNames() {
+    return _alternativeNames;
+  }
+
+  public SqlKind getSqlKind() {
+    return _sqlKind;
+  }
+
+  public SqlReturnTypeInference getIntermediateReturnTypeInference() {
+    return _intermediateReturnTypeInference;
+  }
+
+  public SqlReturnTypeInference getReturnTypeInference() {
+    return _returnTypeInference;
+  }
+
+  public SqlOperandTypeChecker getOperandTypeChecker() {
+    return _operandTypeChecker;
+  }
+
+  public SqlFunctionCategory getSqlFunctionCategory() {
+    return _sqlFunctionCategory;
+  }
+
   public static boolean isAggregationFunction(String functionName) {
     if (NAMES.contains(functionName)) {
       return true;
@@ -121,17 +297,29 @@ public static boolean isAggregationFunction(String functionName) {
         return false;
       }
     }
-    String upperCaseFunctionName = StringUtils.remove(functionName, '_').toUpperCase();
+    String upperCaseFunctionName = getNormalizedAggregationFunctionName(functionName);
     return NAMES.contains(upperCaseFunctionName);
   }
 
+  public static String getNormalizedAggregationFunctionName(String functionName) {
+    return StringUtils.remove(StringUtils.remove(functionName, '_').toUpperCase(), "$");
+  }
+
+  public static String getUnderscoreSplitAggregationFunctionName(String functionName) {
+    // Skip functions that have numbers for now and return their name as is
+    return functionName.matches(".*\\d.*")
+        ? functionName
+        : functionName.replaceAll("(.)(\\p{Upper}+|\\d+)", "$1_$2");
+  }
+
   /**
    * Returns the corresponding aggregation function type for the given function name.
    * <p>NOTE: Underscores in the function name are ignored.
    */
   public static AggregationFunctionType getAggregationFunctionType(String functionName) {
     if (functionName.regionMatches(true, 0, "percentile", 0, 10)) {
-      String remainingFunctionName = StringUtils.remove(functionName, '_').substring(10).toUpperCase();
+      // This style of aggregation functions is not supported in the multistage engine
+      String remainingFunctionName = getNormalizedAggregationFunctionName(functionName).substring(10).toUpperCase();
       if (remainingFunctionName.isEmpty() || remainingFunctionName.matches("\\d+")) {
         return PERCENTILE;
       } else if (remainingFunctionName.equals("EST") || remainingFunctionName.matches("EST\\d+")) {
@@ -142,6 +330,10 @@ public static AggregationFunctionType getAggregationFunctionType(String function
         return PERCENTILETDIGEST;
       } else if (remainingFunctionName.equals("RAWTDIGEST") || remainingFunctionName.matches("RAWTDIGEST\\d+")) {
         return PERCENTILERAWTDIGEST;
+      } else if (remainingFunctionName.equals("KLL") || remainingFunctionName.matches("KLL\\d+")) {
+        return PERCENTILEKLL;
+      } else if (remainingFunctionName.equals("RAWKLL") || remainingFunctionName.matches("RAWKLL\\d+")) {
+        return PERCENTILERAWKLL;
       } else if (remainingFunctionName.equals("MV") || remainingFunctionName.matches("\\d+MV")) {
         return PERCENTILEMV;
       } else if (remainingFunctionName.equals("ESTMV") || remainingFunctionName.matches("EST\\d+MV")) {
@@ -152,12 +344,16 @@ public static AggregationFunctionType getAggregationFunctionType(String function
         return PERCENTILETDIGESTMV;
       } else if (remainingFunctionName.equals("RAWTDIGESTMV") || remainingFunctionName.matches("RAWTDIGEST\\d+MV")) {
         return PERCENTILERAWTDIGESTMV;
+      } else if (remainingFunctionName.equals("KLLMV") || remainingFunctionName.matches("KLL\\d+MV")) {
+        return PERCENTILEKLLMV;
+      } else if (remainingFunctionName.equals("RAWKLLMV") || remainingFunctionName.matches("RAWKLL\\d+MV")) {
+        return PERCENTILEKLLMV;
       } else {
         throw new IllegalArgumentException("Invalid aggregation function name: " + functionName);
       }
     } else {
       try {
-        return AggregationFunctionType.valueOf(StringUtils.remove(functionName, '_').toUpperCase());
+        return AggregationFunctionType.valueOf(getNormalizedAggregationFunctionName(functionName));
       } catch (IllegalArgumentException e) {
         throw new IllegalArgumentException("Invalid aggregation function name: " + functionName);
       }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ColumnMetadata.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ColumnMetadata.java
index 620712e3072..2f6177ce5be 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ColumnMetadata.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ColumnMetadata.java
@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.spi.annotations.InterfaceAudience;
 import org.apache.pinot.spi.data.FieldSpec;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
@@ -90,7 +90,7 @@ default boolean isMinMaxValueInvalid() {
   @Nullable
   Set<Integer> getPartitions();
 
-  Map<ColumnIndexType, Long> getIndexSizeMap();
+  Map<IndexType<?, ?, ?>, Long> getIndexSizeMap();
 
   boolean isAutoGenerated();
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/FetchContext.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/FetchContext.java
index f116f064d45..9d571e89086 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/FetchContext.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/FetchContext.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
+import org.apache.pinot.segment.spi.index.IndexType;
 
 
 /**
@@ -32,7 +32,7 @@
 public class FetchContext {
   private final UUID _fetchId;
   private final String _segmentName;
-  private final Map<String, List<ColumnIndexType>> _columnToIndexList;
+  private final Map<String, List<IndexType<?, ?, ?>>> _columnToIndexList;
 
   /**
    * Create a new FetchRequest for this segment, to fetch all buffers of the given columns
@@ -55,7 +55,7 @@ public FetchContext(UUID fetchId, String segmentName, Set<String> columns) {
    * @param segmentName segment name
    * @param columnToIndexList map of column names as key, and list of indexes to fetch as values
    */
-  public FetchContext(UUID fetchId, String segmentName, Map<String, List<ColumnIndexType>> columnToIndexList) {
+  public FetchContext(UUID fetchId, String segmentName, Map<String, List<IndexType<?, ?, ?>>> columnToIndexList) {
     _fetchId = fetchId;
     _segmentName = segmentName;
     _columnToIndexList = columnToIndexList;
@@ -80,7 +80,7 @@ public String getSegmentName() {
    * Map of columns to fetch as key, and the list of indexes to fetch for the column as value
    * The list of indexes can be null, which indicates that every index for this column should be fetched
    */
-  public Map<String, List<ColumnIndexType>> getColumnToIndexList() {
+  public Map<String, List<IndexType<?, ?, ?>>> getColumnToIndexList() {
     return _columnToIndexList;
   }
 
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ImmutableSegment.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ImmutableSegment.java
index 72a34b689c8..63a1a4d4ed1 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ImmutableSegment.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/ImmutableSegment.java
@@ -19,6 +19,8 @@
 package org.apache.pinot.segment.spi;
 
 import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
@@ -34,6 +36,8 @@ public interface ImmutableSegment extends IndexSegment {
    */
   Dictionary getDictionary(String column);
 
+  <I extends IndexReader> I getIndex(String column, IndexType<?, I, ?> type);
+
   /**
    * Returns the forward index for the given column.
    *
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/IndexSegment.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/IndexSegment.java
index de200e6be9f..9c48a00efca 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/IndexSegment.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/IndexSegment.java
@@ -72,10 +72,21 @@ public interface IndexSegment {
    */
   List<StarTreeV2> getStarTrees();
 
+  /**
+   * Returns a bitmap of the valid document ids. Valid document is the document that holds the latest timestamp (or
+   * largest comparison value) for the primary key for upsert enabled tables.
+   */
   // TODO(upsert): solve the coordination problems of getting validDoc across segments for result consistency
   @Nullable
   ThreadSafeMutableRoaringBitmap getValidDocIds();
 
+  /**
+   * Returns a bitmap of the queryable document ids. Queryable document is the document that holds the latest timestamp
+   * (or largest comparison value) for the primary key and is not deleted for upsert enabled tables.
+   */
+  @Nullable
+  ThreadSafeMutableRoaringBitmap getQueryableDocIds();
+
   /**
    * Returns the record for the given document id. Virtual column values are not returned.
    * <p>NOTE: don't use this method for high performance code. Use PinotSegmentRecordReader when reading multiple
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/SegmentMetadata.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/SegmentMetadata.java
index bad5f4d3f98..63f897e0a7b 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/SegmentMetadata.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/SegmentMetadata.java
@@ -22,7 +22,9 @@
 import java.io.File;
 import java.util.List;
 import java.util.Map;
+import java.util.NavigableSet;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
@@ -98,11 +100,11 @@ public interface SegmentMetadata {
 
   String getEndOffset();
 
-  default Set<String> getAllColumns() {
+  default NavigableSet<String> getAllColumns() {
     return getSchema().getColumnNames();
   }
 
-  Map<String, ColumnMetadata> getColumnMetadataMap();
+  TreeMap<String, ColumnMetadata> getColumnMetadataMap();
 
   default ColumnMetadata getColumnMetadataFor(String column) {
     return getColumnMetadataMap().get(column);
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/V1Constants.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/V1Constants.java
index 38d2e212644..9f2c02fddd6 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/V1Constants.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/V1Constants.java
@@ -26,6 +26,7 @@ private V1Constants() {
   public static final String INDEX_MAP_FILE_NAME = "index_map";
   public static final String INDEX_FILE_NAME = "columns.psf";
   public static final String VALID_DOC_IDS_SNAPSHOT_FILE_NAME = "validdocids.bitmap.snapshot";
+  public static final String TTL_WATERMARK_TABLE_PARTITION = "ttl.watermark.partition.";
 
   public static class Str {
     public static final char DEFAULT_STRING_PAD_CHAR = '\0';
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/BloomFilterCreatorProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/BloomFilterCreatorProvider.java
deleted file mode 100644
index ba2335987bd..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/BloomFilterCreatorProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.creator;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
-
-
-public interface BloomFilterCreatorProvider {
-  /**
-   * Creates a {@see BloomFilterCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws IOException whenever something goes wrong matching or constructing the creator
-   */
-  BloomFilterCreator newBloomFilterCreator(IndexCreationContext.BloomFilter context)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ColumnIndexCreationInfo.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ColumnIndexCreationInfo.java
index a8c127bff1f..af0232d661b 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ColumnIndexCreationInfo.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ColumnIndexCreationInfo.java
@@ -111,6 +111,10 @@ public int getNumPartitions() {
     return _columnStatistics.getNumPartitions();
   }
 
+  public boolean isFixedLength() {
+    return _columnStatistics.isFixedLength();
+  }
+
   @Nullable
   public Map<String, String> getPartitionFunctionConfig() {
     return _columnStatistics.getPartitionFunctionConfig();
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ForwardIndexCreatorProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ForwardIndexCreatorProvider.java
deleted file mode 100644
index 8c15dbb6324..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/ForwardIndexCreatorProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.creator;
-
-import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
-
-
-public interface ForwardIndexCreatorProvider {
-  /**
-   * Creates a {@see ForwardIndexCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws Exception whenever something goes wrong matching or constructing the creator
-   */
-  ForwardIndexCreator newForwardIndexCreator(IndexCreationContext.Forward context)
-      throws Exception;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreationContext.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreationContext.java
index 9e15345ef2c..5f4dd2cd66a 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreationContext.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/IndexCreationContext.java
@@ -19,22 +19,15 @@
 package org.apache.pinot.segment.spi.creator;
 
 import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
-import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
-import org.apache.pinot.spi.config.table.BloomFilterConfig;
-import org.apache.pinot.spi.config.table.FSTType;
-import org.apache.pinot.spi.config.table.JsonIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.data.FieldSpec;
 
 
 /**
- * Provides parameters for constructing indexes via {@see IndexCreatorProvider}.
+ * Provides parameters for constructing indexes via {@link IndexType#createIndexCreator(IndexCreationContext, Object)}.
  * The responsibility for ensuring that the correct parameters for a particular
  * index type lies with the caller.
  */
@@ -68,6 +61,33 @@ public interface IndexCreationContext {
 
   boolean forwardIndexDisabled();
 
+  /**
+   * Returns a sorted array with the unique values for the associated column.
+   *
+   * Primitive types will be stored in an unboxed array (ie if the column contains {@code int}s, this method returns an
+   * {@code int[]}).
+   *
+   * This is an abstraction leak from Text and FST indexes.
+   */
+  Object getSortedUniqueElementsArray();
+
+  /**
+   * This could be set for all metrics in {@link IndexingConfig#isOptimizeDictionary()} or only when the field is a
+   * metric with {@link IndexingConfig#isOptimizeDictionaryForMetrics()}, in which case this method will only return
+   * true if the column is a metric.
+   *
+   * Therefore the caller code doesn't need to verify the later condition.
+   */
+  boolean isOptimizeDictionary();
+
+  boolean isFixedLength();
+
+  /**
+   * This is an abstraction leak from TextIndexType.
+   * @return
+   */
+  boolean isTextCommitOnClose();
+
   final class Builder {
     private File _indexDir;
     private int _lengthOfLongestEntry;
@@ -83,11 +103,22 @@ final class Builder {
     private Comparable<?> _minValue;
     private Comparable<?> _maxValue;
     private boolean _forwardIndexDisabled;
+    private Object _sortedUniqueElementsArray;
+    private boolean _optimizedDictionary;
+    private boolean _fixedLength;
+    private boolean _textCommitOnClose;
 
     public Builder withColumnIndexCreationInfo(ColumnIndexCreationInfo columnIndexCreationInfo) {
       return withLengthOfLongestEntry(columnIndexCreationInfo.getLengthOfLongestEntry())
           .withMaxNumberOfMultiValueElements(columnIndexCreationInfo.getMaxNumberOfMultiValueElements())
-          .withMaxRowLengthInBytes(columnIndexCreationInfo.getMaxRowLengthInBytes());
+          .withMaxRowLengthInBytes(columnIndexCreationInfo.getMaxRowLengthInBytes())
+          .withMinValue((Comparable<?>) columnIndexCreationInfo.getMin())
+          .withMaxValue((Comparable<?>) columnIndexCreationInfo.getMax())
+          .withTotalNumberOfEntries(columnIndexCreationInfo.getTotalNumberOfEntries())
+          .withSortedUniqueElementsArray(columnIndexCreationInfo.getSortedUniqueElementsArray())
+          .withCardinality(columnIndexCreationInfo.getDistinctValueCount())
+          .withFixedLength(columnIndexCreationInfo.isFixedLength())
+          .sorted(columnIndexCreationInfo.isSorted());
     }
 
     public Builder withIndexDir(File indexDir) {
@@ -112,6 +143,16 @@ public Builder withColumnMetadata(ColumnMetadata columnMetadata) {
           .withMaxNumberOfMultiValueElements(columnMetadata.getMaxNumberOfMultiValues());
     }
 
+    public Builder withOptimizedDictionary(boolean optimized) {
+      _optimizedDictionary = optimized;
+      return this;
+    }
+
+    public Builder withFixedLength(boolean fixedLength) {
+      _fixedLength = fixedLength;
+      return this;
+    }
+
     public Builder withLengthOfLongestEntry(int lengthOfLongestEntry) {
       _lengthOfLongestEntry = lengthOfLongestEntry;
       return this;
@@ -167,15 +208,26 @@ public Builder withMaxValue(Comparable<?> maxValue) {
       return this;
     }
 
-    public Builder withforwardIndexDisabled(boolean forwardIndexDisabled) {
+    public Builder withForwardIndexDisabled(boolean forwardIndexDisabled) {
       _forwardIndexDisabled = forwardIndexDisabled;
       return this;
     }
 
+    public Builder withTextCommitOnClose(boolean textCommitOnClose) {
+      _textCommitOnClose = textCommitOnClose;
+      return this;
+    }
+
     public Common build() {
       return new Common(Objects.requireNonNull(_indexDir), _lengthOfLongestEntry, _maxNumberOfMultiValueElements,
           _maxRowLengthInBytes, _onHeap, Objects.requireNonNull(_fieldSpec), _sorted, _cardinality,
-          _totalNumberOfEntries, _totalDocs, _hasDictionary, _minValue, _maxValue, _forwardIndexDisabled);
+          _totalNumberOfEntries, _totalDocs, _hasDictionary, _minValue, _maxValue, _forwardIndexDisabled,
+          _sortedUniqueElementsArray, _optimizedDictionary, _fixedLength, _textCommitOnClose);
+    }
+
+    public Builder withSortedUniqueElementsArray(Object sortedUniqueElementsArray) {
+      _sortedUniqueElementsArray = sortedUniqueElementsArray;
+      return this;
     }
   }
 
@@ -199,12 +251,17 @@ final class Common implements IndexCreationContext {
     private final Comparable<?> _minValue;
     private final Comparable<?> _maxValue;
     private final boolean _forwardIndexDisabled;
+    private final Object _sortedUniqueElementsArray;
+    private final boolean _optimizeDictionary;
+    private final boolean _fixedLength;
+    private final boolean _textCommitOnClose;
 
     public Common(File indexDir, int lengthOfLongestEntry,
         int maxNumberOfMultiValueElements, int maxRowLengthInBytes, boolean onHeap,
         FieldSpec fieldSpec, boolean sorted, int cardinality, int totalNumberOfEntries,
         int totalDocs, boolean hasDictionary, Comparable<?> minValue, Comparable<?> maxValue,
-        boolean forwardIndexDisabled) {
+        boolean forwardIndexDisabled, Object sortedUniqueElementsArray, boolean optimizeDictionary,
+        boolean fixedLength, boolean textCommitOnClose) {
       _indexDir = indexDir;
       _lengthOfLongestEntry = lengthOfLongestEntry;
       _maxNumberOfMultiValueElements = maxNumberOfMultiValueElements;
@@ -219,6 +276,10 @@ public Common(File indexDir, int lengthOfLongestEntry,
       _minValue = minValue;
       _maxValue = maxValue;
       _forwardIndexDisabled = forwardIndexDisabled;
+      _sortedUniqueElementsArray = sortedUniqueElementsArray;
+      _optimizeDictionary = optimizeDictionary;
+      _fixedLength = fixedLength;
+      _textCommitOnClose = textCommitOnClose;
     }
 
     public FieldSpec getFieldSpec() {
@@ -280,264 +341,24 @@ public boolean forwardIndexDisabled() {
       return _forwardIndexDisabled;
     }
 
-    public BloomFilter forBloomFilter(BloomFilterConfig bloomFilterConfig) {
-      return new BloomFilter(this, bloomFilterConfig);
-    }
-
-    public Forward forForwardIndex(ChunkCompressionType chunkCompressionType,
-        @Nullable Map<String, Map<String, String>> columnProperties) {
-      return new Forward(this, chunkCompressionType, columnProperties);
-    }
-
-    public Text forFSTIndex(FSTType fstType, String[] sortedUniqueElementsArray) {
-      return new Text(this, fstType, sortedUniqueElementsArray);
-    }
-
-    public Geospatial forGeospatialIndex(H3IndexConfig h3IndexConfig) {
-      return new Geospatial(this, h3IndexConfig);
-    }
-
-    public Inverted forInvertedIndex() {
-      return new Inverted(this);
-    }
-
-    public Json forJsonIndex(JsonIndexConfig jsonIndexConfig) {
-      return new Json(this, jsonIndexConfig);
-    }
-
-    public Range forRangeIndex(int rangeIndexVersion) {
-      return new Range(this, rangeIndexVersion);
-    }
-
-    public Text forTextIndex(FSTType fstType, boolean commitOnClose, List<String> stopWordsInclude,
-        List<String> stopWordExclude) {
-      return new Text(this, fstType, commitOnClose, stopWordsInclude, stopWordExclude);
-    }
-  }
-
-  class Wrapper implements IndexCreationContext {
-
-    private final IndexCreationContext _delegate;
-
-    Wrapper(IndexCreationContext delegate) {
-      _delegate = delegate;
-    }
-
-    @Override
-    public FieldSpec getFieldSpec() {
-      return _delegate.getFieldSpec();
-    }
-
-    @Override
-    public File getIndexDir() {
-      return _delegate.getIndexDir();
-    }
-
-    @Override
-    public boolean isOnHeap() {
-      return _delegate.isOnHeap();
-    }
-
-    @Override
-    public int getLengthOfLongestEntry() {
-      return _delegate.getLengthOfLongestEntry();
-    }
-
-    @Override
-    public int getMaxNumberOfMultiValueElements() {
-      return _delegate.getMaxNumberOfMultiValueElements();
-    }
-
-    @Override
-    public int getMaxRowLengthInBytes() {
-      return _delegate.getMaxRowLengthInBytes();
-    }
-
-    @Override
-    public boolean isSorted() {
-      return _delegate.isSorted();
-    }
-
-    @Override
-    public int getCardinality() {
-      return _delegate.getCardinality();
-    }
-
     @Override
-    public int getTotalNumberOfEntries() {
-      return _delegate.getTotalNumberOfEntries();
-    }
-
-    @Override
-    public int getTotalDocs() {
-      return _delegate.getTotalDocs();
-    }
-
-    @Override
-    public boolean hasDictionary() {
-      return _delegate.hasDictionary();
+    public Object getSortedUniqueElementsArray() {
+      return _sortedUniqueElementsArray;
     }
 
     @Override
-    public Comparable getMinValue() {
-      return _delegate.getMinValue();
+    public boolean isOptimizeDictionary() {
+      return _optimizeDictionary;
     }
 
     @Override
-    public Comparable getMaxValue() {
-      return _delegate.getMaxValue();
+    public boolean isFixedLength() {
+      return _fixedLength;
     }
 
     @Override
-    public boolean forwardIndexDisabled() {
-      return _delegate.forwardIndexDisabled();
-    }
-  }
-
-  class BloomFilter extends Wrapper {
-
-    private final BloomFilterConfig _bloomFilterConfig;
-
-    public BloomFilter(IndexCreationContext wrapped, BloomFilterConfig bloomFilterConfig) {
-      super(wrapped);
-      _bloomFilterConfig = bloomFilterConfig;
-    }
-
-    public BloomFilterConfig getBloomFilterConfig() {
-      return _bloomFilterConfig;
-    }
-  }
-
-  class Forward extends Wrapper {
-
-    private final ChunkCompressionType _chunkCompressionType;
-    private final Map<String, Map<String, String>> _columnProperties;
-
-    Forward(IndexCreationContext delegate, ChunkCompressionType chunkCompressionType,
-        @Nullable Map<String, Map<String, String>> columnProperties) {
-      super(delegate);
-      _chunkCompressionType = chunkCompressionType;
-      _columnProperties = columnProperties;
-    }
-
-    public ChunkCompressionType getChunkCompressionType() {
-      return _chunkCompressionType;
-    }
-
-    @Nullable
-    public Map<String, Map<String, String>> getColumnProperties() {
-      return _columnProperties;
-    }
-  }
-
-  class Geospatial extends Wrapper {
-
-    private final H3IndexConfig _h3IndexConfig;
-
-    Geospatial(IndexCreationContext delegate, H3IndexConfig h3IndexConfig) {
-      super(delegate);
-      _h3IndexConfig = h3IndexConfig;
-    }
-
-    public H3IndexConfig getH3IndexConfig() {
-      return _h3IndexConfig;
-    }
-  }
-
-  class Inverted extends Wrapper {
-
-    Inverted(IndexCreationContext delegate) {
-      super(delegate);
-    }
-  }
-
-  class Json extends Wrapper {
-    private final JsonIndexConfig _jsonIndexConfig;
-
-    public Json(IndexCreationContext delegate, JsonIndexConfig jsonIndexConfig) {
-      super(delegate);
-      _jsonIndexConfig = jsonIndexConfig;
-    }
-
-    public JsonIndexConfig getJsonIndexConfig() {
-      return _jsonIndexConfig;
-    }
-  }
-
-  class Range extends Wrapper {
-    private final int _rangeIndexVersion;
-
-
-    Range(IndexCreationContext delegate, int rangeIndexVersion) {
-      super(delegate);
-      _rangeIndexVersion = rangeIndexVersion;
-    }
-
-    public int getRangeIndexVersion() {
-      return _rangeIndexVersion;
-    }
-  }
-
-  class Text extends Wrapper {
-    private final boolean _commitOnClose;
-    private final boolean _isFst;
-    private final FSTType _fstType;
-    private final String[] _sortedUniqueElementsArray;
-
-    @Nullable
-    public List<String> getStopWordsInclude() {
-      return _stopWordsInclude;
-    }
-
-    @Nullable
-    public List<String> getStopWordsExclude() {
-      return _stopWordsExclude;
-    }
-
-    private final List<String> _stopWordsInclude;
-    private final List<String> _stopWordsExclude;
-
-    /**
-     * For text indexes
-     */
-    public Text(IndexCreationContext wrapped, FSTType fstType, boolean commitOnClose, List<String> stopWordsInclude,
-        List<String> stopWordExclude) {
-      super(wrapped);
-      _commitOnClose = commitOnClose;
-      _fstType = fstType;
-      _sortedUniqueElementsArray = null;
-      _isFst = false;
-      _stopWordsInclude = stopWordsInclude;
-      _stopWordsExclude = stopWordExclude;
-    }
-
-    /**
-     * For FST indexes
-     */
-    public Text(IndexCreationContext wrapped, FSTType fstType, String[] sortedUniqueElementsArray) {
-      super(wrapped);
-      _commitOnClose = true;
-      _fstType = fstType;
-      _sortedUniqueElementsArray = sortedUniqueElementsArray;
-      _isFst = true;
-      _stopWordsInclude = Collections.EMPTY_LIST;
-      _stopWordsExclude = Collections.EMPTY_LIST;
-    }
-
-    public boolean isCommitOnClose() {
-      return _commitOnClose;
-    }
-
-    public FSTType getFstType() {
-      return _fstType;
-    }
-
-    public boolean isFst() {
-      return _isFst;
-    }
-
-    public String[] getSortedUniqueElementsArray() {
-      return _sortedUniqueElementsArray;
+    public boolean isTextCommitOnClose() {
+      return _textCommitOnClose;
     }
   }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/InvertedIndexCreatorProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/InvertedIndexCreatorProvider.java
deleted file mode 100644
index 2bf7f1a342e..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/InvertedIndexCreatorProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.creator;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
-
-
-public interface InvertedIndexCreatorProvider {
-  /**
-   * Creates a {@see DictionaryBasedInvertedIndexCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws IOException whenever something goes wrong matching or constructing the creator
-   */
-  DictionaryBasedInvertedIndexCreator newInvertedIndexCreator(IndexCreationContext.Inverted context)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/JsonIndexCreatorProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/JsonIndexCreatorProvider.java
deleted file mode 100644
index 22e7f547113..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/JsonIndexCreatorProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.creator;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
-
-
-public interface JsonIndexCreatorProvider {
-  /**
-   * Creates a {@see JsonIndexCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws IOException whenever something goes wrong matching or constructing the creator
-   */
-  JsonIndexCreator newJsonIndexCreator(IndexCreationContext.Json context)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/RangeIndexCreatorProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/RangeIndexCreatorProvider.java
deleted file mode 100644
index a3abfc6c8b6..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/RangeIndexCreatorProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.creator;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
-
-
-public interface RangeIndexCreatorProvider {
-  /**
-   * Creates a {@see CombinedInvertedIndexCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws IOException whenever something goes wrong matching or constructing the creator
-   */
-  CombinedInvertedIndexCreator newRangeIndexCreator(IndexCreationContext.Range context)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentCreator.java
index d384d5854aa..bc9420658f5 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentCreator.java
@@ -22,7 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Map;
+import java.util.TreeMap;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.pinot.segment.spi.index.creator.SegmentIndexCreationInfo;
 import org.apache.pinot.spi.data.Schema;
@@ -44,7 +44,7 @@ public interface SegmentCreator extends Closeable, Serializable {
    * @throws Exception
    */
   void init(SegmentGeneratorConfig segmentCreationSpec, SegmentIndexCreationInfo segmentIndexCreationInfo,
-      Map<String, ColumnIndexCreationInfo> indexCreationInfoMap, Schema schema, File outDir)
+      TreeMap<String, ColumnIndexCreationInfo> indexCreationInfoMap, Schema schema, File outDir)
       throws Exception;
 
   /**
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
index 86f4042617c..a5a10b8ae51 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
@@ -23,12 +23,15 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -37,11 +40,16 @@
 import org.apache.pinot.segment.spi.creator.name.NormalizedDateSegmentNameGenerator;
 import org.apache.pinot.segment.spi.creator.name.SegmentNameGenerator;
 import org.apache.pinot.segment.spi.creator.name.SimpleSegmentNameGenerator;
-import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigs;
+import org.apache.pinot.segment.spi.index.FieldIndexConfigsUtil;
+import org.apache.pinot.segment.spi.index.ForwardIndexConfig;
+import org.apache.pinot.segment.spi.index.IndexType;
+import org.apache.pinot.segment.spi.index.RangeIndexConfig;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.spi.config.table.FSTType;
 import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
 import org.apache.pinot.spi.config.table.IndexingConfig;
-import org.apache.pinot.spi.config.table.JsonIndexConfig;
 import org.apache.pinot.spi.config.table.SegmentPartitionConfig;
 import org.apache.pinot.spi.config.table.SegmentZKPropsConfig;
 import org.apache.pinot.spi.config.table.StarTreeIndexConfig;
@@ -71,20 +79,13 @@ public enum TimeColumnType {
   }
 
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentGeneratorConfig.class);
-  public static final double DEFAULT_NO_DICTIONARY_SIZE_RATIO_THRESHOLD = 0.85d;
+  public static final String GENERATE_INV_BEFORE_PUSH_DEPREC_PROP = "generate.inverted.index.before.push";
 
   private final TableConfig _tableConfig;
-  private final Map<String, String> _customProperties = new HashMap<>();
+  // NOTE: Use TreeMap to guarantee the order. The custom properties will be written into the segment metadata.
+  private final TreeMap<String, String> _customProperties = new TreeMap<>();
   private final Set<String> _rawIndexCreationColumns = new HashSet<>();
   private final Map<String, ChunkCompressionType> _rawIndexCompressionType = new HashMap<>();
-  private final List<String> _invertedIndexCreationColumns = new ArrayList<>();
-  private final List<String> _bloomFilterCreationColumns = new ArrayList<>();
-  private final List<String> _rangeIndexCreationColumns = new ArrayList<>();
-  private final List<String> _textIndexCreationColumns = new ArrayList<>();
-  private final List<String> _fstIndexCreationColumns = new ArrayList<>();
-  private final Map<String, JsonIndexConfig> _jsonIndexConfigs = new HashMap<>();
-  private final List<String> _forwardIndexDisabledColumns = new ArrayList<>();
-  private final Map<String, H3IndexConfig> _h3IndexConfigs = new HashMap<>();
   private final List<String> _columnSortOrder = new ArrayList<>();
   private List<String> _varLengthDictionaryColumns = new ArrayList<>();
   private String _inputFilePath = null;
@@ -122,7 +123,8 @@ public enum TimeColumnType {
   private boolean _failOnEmptySegment = false;
   private boolean _optimizeDictionary = false;
   private boolean _optimizeDictionaryForMetrics = false;
-  private double _noDictionarySizeRatioThreshold = DEFAULT_NO_DICTIONARY_SIZE_RATIO_THRESHOLD;
+  private double _noDictionarySizeRatioThreshold = IndexingConfig.DEFAULT_NO_DICTIONARY_SIZE_RATIO_THRESHOLD;
+  private final Map<String, FieldIndexConfigs> _indexConfigsByColName;
 
   // constructed from FieldConfig
   private Map<String, Map<String, String>> _columnProperties = new HashMap<>();
@@ -182,55 +184,17 @@ public SegmentGeneratorConfig(TableConfig tableConfig, Schema schema) {
       setStarTreeIndexConfigs(indexingConfig.getStarTreeIndexConfigs());
       setEnableDefaultStarTree(indexingConfig.isEnableDefaultStarTree());
 
-      // NOTE: There are 2 ways to configure creating inverted index during segment generation:
-      //       - Set 'generate.inverted.index.before.push' to 'true' in custom config (deprecated)
-      //       - Enable 'createInvertedIndexDuringSegmentGeneration' in indexing config
-      // TODO: Clean up the table configs with the deprecated settings, and always use the one in the indexing config
-      if (indexingConfig.getInvertedIndexColumns() != null) {
-        Map<String, String> customConfigs = tableConfig.getCustomConfig().getCustomConfigs();
-        if ((customConfigs != null && Boolean.parseBoolean(customConfigs.get("generate.inverted.index.before.push")))
-            || indexingConfig.isCreateInvertedIndexDuringSegmentGeneration()) {
-          _invertedIndexCreationColumns.addAll(indexingConfig.getInvertedIndexColumns());
-        }
-      }
-
-      if (indexingConfig.getBloomFilterColumns() != null) {
-        _bloomFilterCreationColumns.addAll(indexingConfig.getBloomFilterColumns());
-      }
-
-      if (indexingConfig.getBloomFilterConfigs() != null) {
-        _bloomFilterCreationColumns.addAll(indexingConfig.getBloomFilterConfigs().keySet());
-      }
-
-      if (indexingConfig.getRangeIndexColumns() != null) {
-        _rangeIndexCreationColumns.addAll(indexingConfig.getRangeIndexColumns());
-      }
-
-      // Ignore jsonIndexColumns when jsonIndexConfigs is configured
-      Map<String, JsonIndexConfig> jsonIndexConfigs = indexingConfig.getJsonIndexConfigs();
-      if (jsonIndexConfigs != null) {
-        _jsonIndexConfigs.putAll(jsonIndexConfigs);
-      } else {
-        List<String> jsonIndexColumns = indexingConfig.getJsonIndexColumns();
-        if (jsonIndexColumns != null) {
-          for (String jsonIndexColumn : jsonIndexColumns) {
-            _jsonIndexConfigs.put(jsonIndexColumn, new JsonIndexConfig());
-          }
-        }
-      }
-
       List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
       if (fieldConfigList != null) {
         for (FieldConfig fieldConfig : fieldConfigList) {
-          _columnProperties.put(fieldConfig.getName(), fieldConfig.getProperties());
+          Map<String, String> properties = fieldConfig.getProperties();
+          if (properties != null) {
+            _columnProperties.put(fieldConfig.getName(), Collections.unmodifiableMap(properties));
+          }
         }
       }
 
-      extractTextIndexColumnsFromTableConfig(tableConfig);
-      extractFSTIndexColumnsFromTableConfig(tableConfig);
-      extractH3IndexConfigsFromTableConfig(tableConfig);
       extractCompressionCodecConfigsFromTableConfig(tableConfig);
-      extractForwardIndexDisabledColumnsFromTableConfig(tableConfig);
 
       _fstTypeForFSTIndex = indexingConfig.getFSTIndexType();
       _nullHandlingEnabled = indexingConfig.isNullHandlingEnabled();
@@ -246,10 +210,53 @@ public SegmentGeneratorConfig(TableConfig tableConfig, Schema schema) {
       _rowTimeValueCheck = ingestionConfig.isRowTimeValueCheck();
       _segmentTimeValueCheck = ingestionConfig.isSegmentTimeValueCheck();
     }
+
+    _indexConfigsByColName = FieldIndexConfigsUtil.createIndexConfigsByColName(tableConfig, schema);
+
+    if (indexingConfig != null) {
+      // NOTE: By default inverted indexes are not created during segment creation
+      // There are 2 ways to configure creating inverted index during segment generation:
+      //       - Set 'generate.inverted.index.before.push' to 'true' in custom config (deprecated)
+      //       - Enable 'createInvertedIndexDuringSegmentGeneration' in indexing config
+      // TODO: Clean up the table configs with the deprecated settings, and always use the one in the indexing config
+      // TODO 2: Decide what to do with this. Index-spi is based on the idea that TableConfig is the source of truth
+      if (indexingConfig.getInvertedIndexColumns() != null) {
+        Map<String, String> customConfigs = tableConfig.getCustomConfig().getCustomConfigs();
+        boolean customConfigEnabled =
+            customConfigs != null && Boolean.parseBoolean(customConfigs.get(GENERATE_INV_BEFORE_PUSH_DEPREC_PROP));
+        boolean indexingConfigEnable = indexingConfig.isCreateInvertedIndexDuringSegmentGeneration();
+        if (!customConfigEnabled && !indexingConfigEnable) {
+          setIndexOn(StandardIndexes.inverted(), IndexConfig.DISABLED, indexingConfig.getInvertedIndexColumns());
+        }
+      }
+    }
+  }
+
+  public <C extends IndexConfig> void setIndexOn(IndexType<C, ?, ?> indexType, C config, String... columns) {
+    setIndexOn(indexType, config, Arrays.asList(columns));
+  }
+
+  @VisibleForTesting
+  public <C extends IndexConfig> void setIndexOn(IndexType<C, ?, ?> indexType, C config,
+      @Nullable Iterable<String> columns) {
+    if (columns == null) {
+      return;
+    }
+    for (String column : columns) {
+      _indexConfigsByColName.compute(column, (key, old) -> {
+        FieldIndexConfigs.Builder builder;
+        if (old == null) {
+          builder = new FieldIndexConfigs.Builder();
+        } else {
+          builder = new FieldIndexConfigs.Builder(old);
+        }
+        return builder.add(indexType, config).build();
+      });
+    }
   }
 
   public Map<String, Map<String, String>> getColumnProperties() {
-    return _columnProperties;
+    return Collections.unmodifiableMap(_columnProperties);
   }
 
   /**
@@ -266,48 +273,6 @@ private void setTime(@Nullable String timeColumnName, Schema schema) {
     }
   }
 
-  /**
-   * Text index creation info for each column is specified
-   * using {@link FieldConfig} model of indicating per column
-   * encoding and indexing information. Since SegmentGeneratorConfig
-   * is created from TableConfig, we extract the text index info
-   * from fieldConfigList in TableConfig.
-   * @param tableConfig table config
-   */
-  private void extractTextIndexColumnsFromTableConfig(TableConfig tableConfig) {
-    List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
-    if (fieldConfigList != null) {
-      for (FieldConfig fieldConfig : fieldConfigList) {
-        if (fieldConfig.getIndexType() == FieldConfig.IndexType.TEXT) {
-          _textIndexCreationColumns.add(fieldConfig.getName());
-        }
-      }
-    }
-  }
-
-  private void extractFSTIndexColumnsFromTableConfig(TableConfig tableConfig) {
-    List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
-    if (fieldConfigList != null) {
-      for (FieldConfig fieldConfig : fieldConfigList) {
-        if (fieldConfig.getIndexType() == FieldConfig.IndexType.FST) {
-          _fstIndexCreationColumns.add(fieldConfig.getName());
-        }
-      }
-    }
-  }
-
-  private void extractH3IndexConfigsFromTableConfig(TableConfig tableConfig) {
-    List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
-    if (fieldConfigList != null) {
-      for (FieldConfig fieldConfig : fieldConfigList) {
-        if (fieldConfig.getIndexType() == FieldConfig.IndexType.H3) {
-          //noinspection ConstantConditions
-          _h3IndexConfigs.put(fieldConfig.getName(), new H3IndexConfig(fieldConfig.getProperties()));
-        }
-      }
-    }
-  }
-
   private void extractCompressionCodecConfigsFromTableConfig(TableConfig tableConfig) {
     List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
     if (fieldConfigList != null) {
@@ -322,33 +287,8 @@ private void extractCompressionCodecConfigsFromTableConfig(TableConfig tableConf
     }
   }
 
-  /**
-   * Forward index disabled info for each column is specified
-   * using {@link FieldConfig} model of indicating per column
-   * encoding and indexing information. Since SegmentGeneratorConfig
-   * is created from TableConfig, we extract the forward index disabled info
-   * from fieldConfigList in TableConfig via the properties bag.
-   * @param tableConfig table config
-   */
-  private void extractForwardIndexDisabledColumnsFromTableConfig(TableConfig tableConfig) {
-    List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
-    if (fieldConfigList != null) {
-      for (FieldConfig fieldConfig : fieldConfigList) {
-        Map<String, String> fieldConfigProperties = fieldConfig.getProperties();
-        if (fieldConfigProperties != null) {
-          boolean forwardIndexDisabled = Boolean.parseBoolean(
-              fieldConfigProperties.getOrDefault(FieldConfig.FORWARD_INDEX_DISABLED,
-                  FieldConfig.DEFAULT_FORWARD_INDEX_DISABLED));
-          if (forwardIndexDisabled) {
-            _forwardIndexDisabledColumns.add(fieldConfig.getName());
-          }
-        }
-      }
-    }
-  }
-
   public Map<String, String> getCustomProperties() {
-    return _customProperties;
+    return Collections.unmodifiableMap(_customProperties);
   }
 
   public void setCustomProperties(Map<String, String> properties) {
@@ -381,133 +321,55 @@ public boolean containsCustomProperty(String key) {
   }
 
   public Set<String> getRawIndexCreationColumns() {
-    return _rawIndexCreationColumns;
-  }
-
-  public List<String> getInvertedIndexCreationColumns() {
-    return _invertedIndexCreationColumns;
+    return Collections.unmodifiableSet(_rawIndexCreationColumns);
   }
 
-  public List<String> getBloomFilterCreationColumns() {
-    return _bloomFilterCreationColumns;
+  public void addInvertedIndexCreationColumns(Collection<String> newColumns) {
+    setIndexOn(StandardIndexes.inverted(), IndexConfig.ENABLED, newColumns);
   }
 
-  public List<String> getRangeIndexCreationColumns() {
-    return _rangeIndexCreationColumns;
+  public List<String> getColumnSortOrder() {
+    return Collections.unmodifiableList(_columnSortOrder);
   }
 
   /**
-   * Used by org.apache.pinot.core.segment.creator.impl.SegmentColumnarIndexCreator
-   * to get the list of text index columns.
-   * @return list of text index columns.
+   * Even when this method looks like a setter, it is in fact an adder.
    */
-  public List<String> getTextIndexCreationColumns() {
-    return _textIndexCreationColumns;
-  }
-
-  public List<String> getFSTIndexCreationColumns() {
-    return _fstIndexCreationColumns;
-  }
-
-  public Map<String, JsonIndexConfig> getJsonIndexConfigs() {
-    return _jsonIndexConfigs;
-  }
-
-  public List<String> getForwardIndexDisabledColumns() {
-    return _forwardIndexDisabledColumns;
-  }
-
-  public Map<String, H3IndexConfig> getH3IndexConfigs() {
-    return _h3IndexConfigs;
-  }
-
-  public List<String> getColumnSortOrder() {
-    return _columnSortOrder;
-  }
-
   public void setRawIndexCreationColumns(List<String> rawIndexCreationColumns) {
     Preconditions.checkNotNull(rawIndexCreationColumns);
     _rawIndexCreationColumns.addAll(rawIndexCreationColumns);
   }
 
-  // NOTE: Should always be extracted from the table config
-  @Deprecated
-  public void setInvertedIndexCreationColumns(List<String> indexCreationColumns) {
-    Preconditions.checkNotNull(indexCreationColumns);
-    _invertedIndexCreationColumns.addAll(indexCreationColumns);
-  }
-
-  /**
-   * Used by org.apache.pinot.core.realtime.converter.RealtimeSegmentConverter
-   * and text search functional tests
-   * @param textIndexCreationColumns list of columns with text index creation enabled
-   */
-  public void setTextIndexCreationColumns(List<String> textIndexCreationColumns) {
-    if (textIndexCreationColumns != null) {
-      _textIndexCreationColumns.addAll(textIndexCreationColumns);
-    }
-  }
-
   @VisibleForTesting
   public void setRangeIndexCreationColumns(List<String> rangeIndexCreationColumns) {
     if (rangeIndexCreationColumns != null) {
-      _rangeIndexCreationColumns.addAll(rangeIndexCreationColumns);
+      setIndexOn(StandardIndexes.range(), RangeIndexConfig.DEFAULT, rangeIndexCreationColumns);
     }
   }
 
   @VisibleForTesting
   public void setForwardIndexDisabledColumns(List<String> forwardIndexDisabledColumns) {
     if (forwardIndexDisabledColumns != null) {
-      _forwardIndexDisabledColumns.addAll(forwardIndexDisabledColumns);
-    }
-  }
-
-  @VisibleForTesting
-  public void setColumnProperties(Map<String, Map<String, String>> columnProperties) {
-    _columnProperties = columnProperties;
-  }
-
-  public void setFSTIndexCreationColumns(List<String> fstIndexCreationColumns) {
-    if (fstIndexCreationColumns != null) {
-      _fstIndexCreationColumns.addAll(fstIndexCreationColumns);
+      setIndexOn(StandardIndexes.forward(), ForwardIndexConfig.DISABLED, forwardIndexDisabledColumns);
     }
   }
 
+  /**
+   * Even when this method looks like a setter, it is in fact an adder.
+   */
   public void setColumnSortOrder(List<String> sortOrder) {
     Preconditions.checkNotNull(sortOrder);
     _columnSortOrder.addAll(sortOrder);
   }
 
   public List<String> getVarLengthDictionaryColumns() {
-    return _varLengthDictionaryColumns;
+    return Collections.unmodifiableList(_varLengthDictionaryColumns);
   }
 
   public void setVarLengthDictionaryColumns(List<String> varLengthDictionaryColumns) {
     _varLengthDictionaryColumns = varLengthDictionaryColumns;
   }
 
-  public void createInvertedIndexForColumn(String column) {
-    Preconditions.checkNotNull(column);
-    if (_schema != null && _schema.getFieldSpecFor(column) == null) {
-      LOGGER.warn("Cannot find column {} in schema, will not create inverted index.", column);
-      return;
-    }
-    if (_schema == null) {
-      LOGGER.warn("Schema has not been set, column {} might not exist in schema after all.", column);
-    }
-    _invertedIndexCreationColumns.add(column);
-  }
-
-  public void createInvertedIndexForAllColumns() {
-    if (_schema == null) {
-      LOGGER.warn("Schema has not been set, will not create inverted index for all columns.");
-      return;
-    }
-    for (FieldSpec spec : _schema.getAllFieldSpecs()) {
-      _invertedIndexCreationColumns.add(spec.getName());
-    }
-  }
-
   public String getInputFilePath() {
     return _inputFilePath;
   }
@@ -660,6 +522,15 @@ public void setSegmentVersion(SegmentVersion segmentVersion) {
     _segmentVersion = segmentVersion;
   }
 
+  /**
+   * Returns the {@link TableConfig} that was used to initialize this object.
+   *
+   * Remember that this object is mutable. Therefore it may have modified since the object was created. Changes on this
+   * object may or may not modify the initial table config, so the object returned by this method may not contain the
+   * same information stored on this SegmentGeneratorConfig. For example, if someone called
+   * {@link #setFSTIndexType(FSTType)} on the SegmentGeneratorConfig, the TableConfig returned by this method
+   * will not be modified accordingly.
+   */
   public TableConfig getTableConfig() {
     return _tableConfig;
   }
@@ -678,7 +549,10 @@ public void setReaderConfig(RecordReaderConfig readerConfig) {
 
   @Nullable
   public List<StarTreeIndexConfig> getStarTreeIndexConfigs() {
-    return _starTreeIndexConfigs;
+    if (_starTreeIndexConfigs == null) {
+      return null;
+    }
+    return Collections.unmodifiableList(_starTreeIndexConfigs);
   }
 
   public void setStarTreeIndexConfigs(List<StarTreeIndexConfig> starTreeIndexConfigs) {
@@ -750,7 +624,7 @@ public void setSkipTimeValueCheck(boolean skipTimeValueCheck) {
   }
 
   public Map<String, ChunkCompressionType> getRawIndexCompressionType() {
-    return _rawIndexCompressionType;
+    return Collections.unmodifiableMap(_rawIndexCompressionType);
   }
 
   public void setRawIndexCompressionType(Map<String, ChunkCompressionType> rawIndexCompressionType) {
@@ -871,4 +745,8 @@ public SegmentZKPropsConfig getSegmentZKPropsConfig() {
   public void setSegmentZKPropsConfig(SegmentZKPropsConfig segmentZKPropsConfig) {
     _segmentZKPropsConfig = segmentZKPropsConfig;
   }
+
+  public Map<String, FieldIndexConfigs> getIndexConfigsByColName() {
+    return _indexConfigsByColName;
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGenerator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGenerator.java
index f313d65829d..951dc8d022d 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGenerator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGenerator.java
@@ -19,15 +19,14 @@
 package org.apache.pinot.segment.spi.creator.name;
 
 import com.google.common.base.Preconditions;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
+import org.apache.pinot.spi.data.DateTimeFieldSpec;
 import org.apache.pinot.spi.data.DateTimeFieldSpec.TimeFormat;
+import org.apache.pinot.spi.data.DateTimeFormatPatternSpec;
 import org.apache.pinot.spi.data.DateTimeFormatSpec;
+import org.joda.time.DateTime;
 
 
 /**
@@ -46,11 +45,11 @@ public class NormalizedDateSegmentNameGenerator implements SegmentNameGenerator
   private final boolean _appendUUIDToSegmentName;
 
   // For APPEND tables
-  private final SimpleDateFormat _outputSDF;
+  private final DateTimeFormatPatternSpec _outputSDF;
   // For EPOCH time format
   private final TimeUnit _inputTimeUnit;
   // For SIMPLE_DATE_FORMAT time format
-  private final SimpleDateFormat _inputSDF;
+  private final DateTimeFormatPatternSpec _inputSDF;
 
   public NormalizedDateSegmentNameGenerator(String tableName, @Nullable String segmentNamePrefix,
       boolean excludeSequenceId, @Nullable String pushType, @Nullable String pushFrequency,
@@ -78,26 +77,29 @@ public NormalizedDateSegmentNameGenerator(String tableName, @Nullable String seg
     // Include time info for APPEND push type
     if (_appendPushType) {
       // For HOURLY push frequency, include hours into output format
+      String sdfPattern;
       if (PUSH_FREQUENCY_HOURLY.equalsIgnoreCase(pushFrequency)) {
-        _outputSDF = new SimpleDateFormat("yyyy-MM-dd-HH");
+        sdfPattern = "yyyy-MM-dd-HH";
       } else {
-        _outputSDF = new SimpleDateFormat("yyyy-MM-dd");
+        sdfPattern = "yyyy-MM-dd";
       }
-      _outputSDF.setTimeZone(TimeZone.getTimeZone("UTC"));
+      _outputSDF = new DateTimeFormatPatternSpec(DateTimeFieldSpec.TimeFormat.SIMPLE_DATE_FORMAT, sdfPattern, "UTC");
 
       // Parse input time format: 'EPOCH'/'TIMESTAMP' or 'SIMPLE_DATE_FORMAT' using pattern
       Preconditions.checkArgument(dateTimeFormatSpec != null,
-          "Must provide date time format spec for NormalizedDateSegmentNameGenerator");
+          "Must provide date time format spec for NormalizedDateSegmentNameGenerator. "
+              + "Common problems: missing timeColumnName in table config, missing schema for timeColumnName, "
+              + "timeColumnName is not a date time field, or missing format spec in timeColumnName schema");
       TimeFormat timeFormat = dateTimeFormatSpec.getTimeFormat();
       if (timeFormat == TimeFormat.EPOCH || timeFormat == TimeFormat.TIMESTAMP) {
         _inputTimeUnit = dateTimeFormatSpec.getColumnUnit();
         _inputSDF = null;
       } else {
         Preconditions.checkArgument(dateTimeFormatSpec.getSDFPattern() != null,
-            "Must provide pattern for SIMPLE_DATE_FORMAT for NormalizedDateSegmentNameGenerator");
+            "Must provide pattern for SIMPLE_DATE_FORMAT for NormalizedDateSegmentNameGenerator. Common problem: "
+                + "the format spec in timeColumnName schema is SIMPLE_DATE_FORMAT but pattern is missing");
         _inputTimeUnit = null;
-        _inputSDF = new SimpleDateFormat(dateTimeFormatSpec.getSDFPattern());
-        _inputSDF.setTimeZone(TimeZone.getTimeZone("UTC"));
+        _inputSDF = dateTimeFormatSpec.getDateTimeFormatPattenSpec();
       }
     } else {
       _outputSDF = null;
@@ -130,14 +132,15 @@ public String generateSegmentName(int sequenceId, @Nullable Object minTimeValue,
    */
   public String getNormalizedDate(Object timeValue) {
     if (_inputTimeUnit != null) {
-      return _outputSDF.format(new Date(_inputTimeUnit.toMillis(Long.parseLong(timeValue.toString()))));
+      return new DateTime(_inputTimeUnit.toMillis(Long.parseLong(timeValue.toString()))).toString(
+          _outputSDF.getDateTimeFormatter());
     } else {
       try {
-        return _outputSDF.format(_inputSDF.parse(timeValue.toString()));
-      } catch (ParseException e) {
-        throw new RuntimeException(String
-            .format("Caught exception while parsing simple date format: %s with value: %s", _inputSDF.toPattern(),
-                timeValue), e);
+        return _inputSDF.getDateTimeFormatter().parseDateTime(timeValue.toString())
+            .toString(_outputSDF.getDateTimeFormatter());
+      } catch (Exception e) {
+        throw new RuntimeException(String.format("Caught exception while parsing simple date format: %s with value: %s",
+            _inputSDF.getSdfPattern(), timeValue), e);
       }
     }
   }
@@ -154,13 +157,13 @@ public String toString() {
       stringBuilder.append(", excludeSequenceId=true");
     }
     if (_outputSDF != null) {
-      stringBuilder.append(", outputSDF=").append(_outputSDF.toPattern());
+      stringBuilder.append(", outputSDF=").append(_outputSDF.getSdfPattern());
     }
     if (_inputTimeUnit != null) {
       stringBuilder.append(", inputTimeUnit=").append(_inputTimeUnit);
     }
     if (_inputSDF != null) {
-      stringBuilder.append(", inputSDF=").append(_inputSDF.toPattern());
+      stringBuilder.append(", inputSDF=").append(_inputSDF.getSdfPattern());
     }
     return stringBuilder.toString();
   }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSource.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSource.java
index e260de20f0a..821cfc67267 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSource.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSource.java
@@ -19,6 +19,8 @@
 package org.apache.pinot.segment.spi.datasource;
 
 import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
 import org.apache.pinot.segment.spi.index.reader.Dictionary;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
@@ -40,6 +42,8 @@ public interface DataSource {
    */
   DataSourceMetadata getDataSourceMetadata();
 
+  <R extends IndexReader> R getIndex(IndexType<?, R, ?> type);
+
   /**
    * Returns the forward index for the column. The forward index can be either dictionary-encoded or raw.
    */
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSourceMetadata.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSourceMetadata.java
index 494129f0a1e..3f14601d326 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSourceMetadata.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/datasource/DataSourceMetadata.java
@@ -100,4 +100,12 @@ default boolean isSingleValue() {
    * Returns the cardinality of the column, {@code -1} if not applicable
    */
   int getCardinality();
+
+  /**
+   * Returns the max row length in bytes for a var byte MV column. {@code -1} if not applicable.
+   * @return
+   */
+  default int getMaxRowLengthInBytes() {
+    return -1;
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/AbstractIndexType.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/AbstractIndexType.java
new file mode 100644
index 00000000000..110360cee4a
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/AbstractIndexType.java
@@ -0,0 +1,131 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+public abstract class AbstractIndexType<C extends IndexConfig, IR extends IndexReader, IC extends IndexCreator>
+    implements IndexType<C, IR, IC> {
+
+  private final String _id;
+  private ColumnConfigDeserializer<C> _deserializer;
+  private IndexReaderFactory<IR> _readerFactory;
+
+  protected abstract ColumnConfigDeserializer<C> createDeserializer();
+
+  protected abstract IndexReaderFactory<IR> createReaderFactory();
+
+  protected void handleIndexSpecificCleanup(TableConfig tableConfig) {
+  }
+
+  public AbstractIndexType(String id) {
+    _id = id;
+  }
+
+  @Override
+  public String getId() {
+    return _id;
+  }
+
+  @Override
+  public Map<String, C> getConfig(TableConfig tableConfig, Schema schema) {
+    if (_deserializer == null) {
+      _deserializer = createDeserializer();
+    }
+    return _deserializer.deserialize(tableConfig, schema);
+  }
+
+  @Override
+  public IndexReaderFactory<IR> getReaderFactory() {
+    if (_readerFactory == null) {
+      _readerFactory = createReaderFactory();
+    }
+    return _readerFactory;
+  }
+
+  public void convertToNewFormat(TableConfig tableConfig, Schema schema) {
+    Map<String, C> deserialize = getConfig(tableConfig, schema);
+    List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList() == null
+        ? new ArrayList<>()
+        : tableConfig.getFieldConfigList();
+    Map<String, FieldConfig> fieldConfigMap = fieldConfigList.stream()
+        .collect(Collectors.toMap(FieldConfig::getName, Function.identity()));
+    for (Map.Entry<String, C> entry : deserialize.entrySet()) {
+      C configValue = entry.getValue();
+      if (configValue.equals(getDefaultConfig())) {
+        continue;
+      }
+      FieldConfig fieldConfig = fieldConfigMap.get(entry.getKey());
+      if (fieldConfig != null) {
+        ObjectNode currentIndexes = fieldConfig.getIndexes().isNull()
+            ? new ObjectMapper().createObjectNode()
+            : new ObjectMapper().valueToTree(fieldConfig.getIndexes());
+        JsonNode indexes = currentIndexes.set(getPrettyName(), configValue.toJsonNode());
+        FieldConfig.Builder builder = new FieldConfig.Builder(fieldConfig);
+        builder.withIndexes(indexes);
+        fieldConfigList.remove(fieldConfig);
+        fieldConfigList.add(builder.build());
+      } else {
+        JsonNode indexes = new ObjectMapper().createObjectNode().set(getPrettyName(), configValue.toJsonNode());
+        FieldConfig.Builder builder = new FieldConfig.Builder(entry.getKey());
+        builder.withIndexes(indexes);
+        builder.withEncodingType(FieldConfig.EncodingType.DICTIONARY);
+        fieldConfigList.add(builder.build());
+      }
+    }
+    tableConfig.setFieldConfigList(fieldConfigList);
+    handleIndexSpecificCleanup(tableConfig);
+  }
+
+  @Override
+  public String toString() {
+    return _id;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AbstractIndexType<?, ?, ?> that = (AbstractIndexType<?, ?, ?>) o;
+    return _id.equals(that._id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_id);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/ColumnConfigDeserializer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/ColumnConfigDeserializer.java
new file mode 100644
index 00000000000..b31e8d7995d
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/ColumnConfigDeserializer.java
@@ -0,0 +1,61 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.function.Predicate;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+@FunctionalInterface
+public interface ColumnConfigDeserializer<C> {
+
+  /**
+   * This method is called to extract the configuration from user configuration for all columns.
+   */
+  Map<String, C> deserialize(TableConfig tableConfig, Schema schema);
+
+  /**
+   * Returns a new {@link ColumnConfigDeserializer} that will merge results from the receiver deserializer and the one
+   * received as parameter, failing if a column is defined in both.
+   */
+  default ColumnConfigDeserializer<C> withExclusiveAlternative(ColumnConfigDeserializer<C> alternative) {
+    return new MergedColumnConfigDeserializer<>(MergedColumnConfigDeserializer.OnConflict.FAIL, this, alternative);
+  }
+
+  /**
+   * Returns a new {@link ColumnConfigDeserializer} that will merge results from the receiver deserializer and the one
+   * received as parameter, giving priority to the ones in the receiver if a column is defined in both.
+   */
+  default ColumnConfigDeserializer<C> withFallbackAlternative(ColumnConfigDeserializer<C> alternative) {
+    return new MergedColumnConfigDeserializer<>(MergedColumnConfigDeserializer.OnConflict.PICK_FIRST, this,
+        alternative);
+  }
+
+  static <C extends IndexConfig> ColumnConfigDeserializer<C> onlyIf(Predicate<TableConfig> predicate,
+      ColumnConfigDeserializer<C> delegate) {
+    return ((tableConfig, schema) -> predicate.test(tableConfig)
+        ? delegate.deserialize(tableConfig, schema)
+        : Collections.emptyMap());
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/DictionaryIndexConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/DictionaryIndexConfig.java
new file mode 100644
index 00000000000..f93f13c32c3
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/DictionaryIndexConfig.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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.IndexConfig;
+
+
+public class DictionaryIndexConfig extends IndexConfig {
+
+  public static final DictionaryIndexConfig DEFAULT = new DictionaryIndexConfig(false, false, false);
+  public static final DictionaryIndexConfig DISABLED = new DictionaryIndexConfig(true, false, false);
+
+  private final boolean _onHeap;
+  private final boolean _useVarLengthDictionary;
+
+  public DictionaryIndexConfig(Boolean onHeap, @Nullable Boolean useVarLengthDictionary) {
+    this(false, onHeap, useVarLengthDictionary);
+  }
+
+  @JsonCreator
+  public DictionaryIndexConfig(@JsonProperty("disabled") Boolean disabled, @JsonProperty("onHeap") Boolean onHeap,
+      @JsonProperty("useVarLengthDictionary") @Nullable Boolean useVarLengthDictionary) {
+    super(disabled);
+    _onHeap = onHeap != null && onHeap;
+    _useVarLengthDictionary = Boolean.TRUE.equals(useVarLengthDictionary);
+  }
+
+  public static DictionaryIndexConfig disabled() {
+    return DISABLED;
+  }
+
+  public boolean isOnHeap() {
+    return _onHeap;
+  }
+
+  public boolean getUseVarLengthDictionary() {
+    return _useVarLengthDictionary;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DictionaryIndexConfig that = (DictionaryIndexConfig) o;
+    return _onHeap == that._onHeap && _useVarLengthDictionary == that._useVarLengthDictionary;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_onHeap, _useVarLengthDictionary);
+  }
+
+  @Override
+  public String toString() {
+    if (isEnabled()) {
+      return "DictionaryIndexConfig{" + "\"onHeap\":" + _onHeap + ", \"useVarLengthDictionary\":"
+          + _useVarLengthDictionary + "}";
+    } else {
+      return "DictionaryIndexConfig{" + "\"disabled\": true}";
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FieldIndexConfigs.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FieldIndexConfigs.java
new file mode 100644
index 00000000000..3d192aa6a1a
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FieldIndexConfigs.java
@@ -0,0 +1,119 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.utils.JsonUtils;
+
+
+/**
+ * FieldIndexConfigs are a map like structure that relates index types with their configuration, providing a type safe
+ * interface.
+ */
+public class FieldIndexConfigs {
+
+  public static final FieldIndexConfigs EMPTY = new FieldIndexConfigs(new HashMap<>());
+
+  private final Map<IndexType, IndexConfig> _configMap;
+
+  private FieldIndexConfigs(Map<IndexType, IndexConfig> configMap) {
+    _configMap = Collections.unmodifiableMap(configMap);
+  }
+
+  /**
+   * Returns the configuration associated with the given index type, which will be null if there is no configuration for
+   * that index type.
+   */
+  public <C extends IndexConfig, I extends IndexType<C, ?, ?>> C getConfig(I indexType) {
+    IndexConfig config = _configMap.get(indexType);
+    if (config == null) {
+      return indexType.getDefaultConfig();
+    }
+    return (C) config;
+  }
+
+  public Map<String, JsonNode> unwrapIndexes() {
+    Function<Map.Entry<IndexType, IndexConfig>, JsonNode> serializer =
+        entry -> entry.getValue().toJsonNode();
+    return _configMap.entrySet().stream()
+        .filter(e -> e.getValue() != null)
+        .collect(Collectors.toMap(entry -> entry.getKey().getId(), serializer));
+  }
+
+  @Override
+  public String toString() {
+    try {
+      return JsonUtils.objectToString(unwrapIndexes());
+    } catch (JsonProcessingException e) {
+      return "Unserializable value due to " + e.getMessage();
+    }
+  }
+
+  public static class Builder {
+    private final Map<IndexType, IndexConfig> _configMap;
+
+    public Builder() {
+      _configMap = new HashMap<>();
+    }
+
+    public Builder(FieldIndexConfigs other) {
+      _configMap = new HashMap<>(other._configMap);
+    }
+
+    public <C extends IndexConfig, I extends IndexType<C, ?, ?>> Builder add(I indexType, C config) {
+      _configMap.put(indexType, config);
+      return this;
+    }
+
+    public Builder addUnsafe(IndexType<?, ?, ?> indexType, IndexConfig config) {
+      _configMap.put(indexType, config);
+      return this;
+    }
+
+    public Builder undeclare(IndexType<?, ?, ?> indexType) {
+      _configMap.remove(indexType);
+      return this;
+    }
+
+    public FieldIndexConfigs build() {
+      return new FieldIndexConfigs(_configMap);
+    }
+  }
+
+  public static class UnrecognizedIndexException extends RuntimeException {
+    private final String _indexId;
+
+    public UnrecognizedIndexException(String indexId) {
+      super("There is no index type whose identified as " + indexId);
+      _indexId = indexId;
+    }
+
+    public String getIndexId() {
+      return _indexId;
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FieldIndexConfigsUtil.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FieldIndexConfigsUtil.java
new file mode 100644
index 00000000000..033918e437f
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FieldIndexConfigsUtil.java
@@ -0,0 +1,117 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.google.common.collect.Sets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class FieldIndexConfigsUtil {
+  private FieldIndexConfigsUtil() {
+  }
+
+  public static Map<String, FieldIndexConfigs> createIndexConfigsByColName(TableConfig tableConfig, Schema schema) {
+    return createIndexConfigsByColName(tableConfig, schema, DefaultDeserializerProvider.INSTANCE);
+  }
+
+  public static Map<String, FieldIndexConfigs> createIndexConfigsByColName(
+      TableConfig tableConfig, Schema schema, DeserializerProvider deserializerProvider) {
+    Map<String, FieldIndexConfigs.Builder> builderMap = new HashMap<>();
+    for (String columnName : schema.getColumnNames()) {
+      builderMap.put(columnName, new FieldIndexConfigs.Builder());
+    }
+    for (IndexType<?, ?, ?> indexType : IndexService.getInstance().getAllIndexes()) {
+      readConfig(builderMap, indexType, tableConfig, schema, deserializerProvider);
+    }
+
+    return builderMap.entrySet().stream()
+        .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().build()));
+  }
+
+  @FunctionalInterface
+  public interface DeserializerProvider {
+    <C extends IndexConfig> ColumnConfigDeserializer<C> get(IndexType<C, ?, ?> indexType);
+  }
+
+  private static <C extends IndexConfig> void readConfig(
+      Map<String, FieldIndexConfigs.Builder> builderMap, IndexType<C, ?, ?> indexType,
+      TableConfig tableConfig, Schema schema, DeserializerProvider deserializerProvider) {
+    ColumnConfigDeserializer<C> deserializer = deserializerProvider.get(indexType);
+    Map<String, C> deserialize = deserializer.deserialize(tableConfig, schema);
+
+    for (Map.Entry<String, C> entry : deserialize.entrySet()) {
+      FieldIndexConfigs.Builder colBuilder =
+          builderMap.computeIfAbsent(entry.getKey(), key -> new FieldIndexConfigs.Builder());
+      colBuilder.addUnsafe(indexType, entry.getValue());
+    }
+  }
+
+  public static Set<String> columnsWithIndexEnabled(IndexType<?, ?, ?> indexType,
+      Map<String, FieldIndexConfigs> configByCol) {
+    return configByCol.entrySet().stream()
+        .filter(e -> {
+          IndexConfig config = e.getValue().getConfig(indexType);
+          return config != null && config.isEnabled();
+        })
+        .map(Map.Entry::getKey)
+        .collect(Collectors.toSet());
+  }
+
+  /**
+   * Returns the columns on the map that whose given index type is disabled.
+   *
+   * It is recommended to use {@link #columnsWithIndexDisabled(Set, IndexType, Map)} when the map may not have an entry
+   * for all columns in the schema.
+   */
+  public static Set<String> columnsWithIndexDisabled(IndexType<?, ?, ?> indexType,
+      Map<String, FieldIndexConfigs> configByCol) {
+    return Sets.difference(configByCol.keySet(), columnsWithIndexEnabled(indexType, configByCol));
+  }
+
+  public static Set<String> columnsWithIndexDisabled(Set<String> allColumns, IndexType<?, ?, ?> indexType,
+      Map<String, FieldIndexConfigs> configByCol) {
+    return Sets.difference(allColumns, columnsWithIndexEnabled(indexType, configByCol));
+  }
+
+  public static <C extends IndexConfig> Map<String, C> enableConfigByColumn(IndexType<C, ?, ?> indexType,
+      Map<String, FieldIndexConfigs> configByCol) {
+    return configByCol.entrySet().stream()
+        .filter(e -> {
+          C config = e.getValue().getConfig(indexType);
+          return config != null && config.isEnabled();
+        })
+        .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getConfig(indexType)));
+  }
+
+  private static class DefaultDeserializerProvider implements DeserializerProvider {
+    public static final DefaultDeserializerProvider INSTANCE = new DefaultDeserializerProvider();
+
+    @Override
+    public <C extends IndexConfig> ColumnConfigDeserializer<C> get(IndexType<C, ?, ?> indexType) {
+      return indexType::getConfig;
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/ForwardIndexConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/ForwardIndexConfig.java
new file mode 100644
index 00000000000..445dcc0b710
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/ForwardIndexConfig.java
@@ -0,0 +1,156 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.utils.JsonUtils;
+
+
+public class ForwardIndexConfig extends IndexConfig {
+  public static final int DEFAULT_RAW_WRITER_VERSION = 2;
+  public static final ForwardIndexConfig DISABLED = new ForwardIndexConfig(true, null, null, null);
+  public static final ForwardIndexConfig DEFAULT = new Builder().build();
+
+  @Nullable
+  private final ChunkCompressionType _chunkCompressionType;
+  private final boolean _deriveNumDocsPerChunk;
+  private final int _rawIndexWriterVersion;
+
+  @JsonCreator
+  public ForwardIndexConfig(@Nullable @JsonProperty("disabled") Boolean disabled,
+      @Nullable @JsonProperty("chunkCompressionType") ChunkCompressionType chunkCompressionType,
+      @JsonProperty("deriveNumDocsPerChunk") Boolean deriveNumDocsPerChunk,
+      @JsonProperty("rawIndexWriterVersion") Integer rawIndexWriterVersion) {
+    super(disabled);
+    _chunkCompressionType = chunkCompressionType;
+    _deriveNumDocsPerChunk = deriveNumDocsPerChunk != null && deriveNumDocsPerChunk;
+    _rawIndexWriterVersion = rawIndexWriterVersion == null ? DEFAULT_RAW_WRITER_VERSION : rawIndexWriterVersion;
+  }
+
+  @Nullable
+  public ChunkCompressionType getChunkCompressionType() {
+    return _chunkCompressionType;
+  }
+
+  public boolean isDeriveNumDocsPerChunk() {
+    return _deriveNumDocsPerChunk;
+  }
+
+  public int getRawIndexWriterVersion() {
+    return _rawIndexWriterVersion;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+    ForwardIndexConfig that = (ForwardIndexConfig) o;
+    return _deriveNumDocsPerChunk == that._deriveNumDocsPerChunk
+        && _rawIndexWriterVersion == that._rawIndexWriterVersion && _chunkCompressionType == that._chunkCompressionType;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), _chunkCompressionType, _deriveNumDocsPerChunk, _rawIndexWriterVersion);
+  }
+
+  public static class Builder {
+    @Nullable
+    private ChunkCompressionType _chunkCompressionType;
+    private boolean _deriveNumDocsPerChunk = false;
+    private int _rawIndexWriterVersion = DEFAULT_RAW_WRITER_VERSION;
+
+    public Builder() {
+    }
+
+    public Builder(ForwardIndexConfig other) {
+      _chunkCompressionType = other.getChunkCompressionType();
+      _deriveNumDocsPerChunk = other._deriveNumDocsPerChunk;
+      _rawIndexWriterVersion = other._rawIndexWriterVersion;
+    }
+
+    public Builder withCompressionType(ChunkCompressionType chunkCompressionType) {
+      _chunkCompressionType = chunkCompressionType;
+      return this;
+    }
+
+    public Builder withDeriveNumDocsPerChunk(boolean deriveNumDocsPerChunk) {
+      _deriveNumDocsPerChunk = deriveNumDocsPerChunk;
+      return this;
+    }
+
+    public Builder withRawIndexWriterVersion(int rawIndexWriterVersion) {
+      _rawIndexWriterVersion = rawIndexWriterVersion;
+      return this;
+    }
+
+    public Builder withLegacyProperties(Map<String, Map<String, String>> propertiesByCol, String colName) {
+      if (propertiesByCol != null) {
+        Map<String, String> colProps = propertiesByCol.get(colName);
+        if (colProps != null) {
+          withLegacyProperties(colProps);
+        }
+      }
+      return this;
+    }
+
+    public Builder withLegacyProperties(Map<String, String> properties) {
+      String newDerive = properties.get(FieldConfig.DERIVE_NUM_DOCS_PER_CHUNK_RAW_INDEX_KEY);
+      if (newDerive != null) {
+        withDeriveNumDocsPerChunk(Boolean.parseBoolean(newDerive));
+      }
+      String newRawIndexVersion = properties.get(FieldConfig.RAW_INDEX_WRITER_VERSION);
+      if (newRawIndexVersion != null) {
+        withRawIndexWriterVersion(Integer.parseInt(newRawIndexVersion));
+      }
+      return this;
+    }
+
+    public ForwardIndexConfig build() {
+      return new ForwardIndexConfig(false, _chunkCompressionType, _deriveNumDocsPerChunk, _rawIndexWriterVersion);
+    }
+  }
+
+  @Override
+  public String toString() {
+    try {
+      return JsonUtils.objectToString(this);
+    } catch (IOException ex) {
+      return "{" + "\"chunkCompressionType\":" + _chunkCompressionType
+          + ", \"deriveNumDocsPerChunk\":" + _deriveNumDocsPerChunk
+          + ", \"rawIndexWriterVersion\":" + _rawIndexWriterVersion + '}';
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FstIndexConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FstIndexConfig.java
new file mode 100644
index 00000000000..e90377acf55
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/FstIndexConfig.java
@@ -0,0 +1,71 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.IndexConfig;
+
+
+public class FstIndexConfig extends IndexConfig {
+  public static final FstIndexConfig DISABLED = new FstIndexConfig(true, null);
+  private final FSTType _fstType;
+
+  public FstIndexConfig(@JsonProperty("type") @Nullable FSTType fstType) {
+    this(false, fstType);
+  }
+
+  @JsonCreator
+  public FstIndexConfig(@JsonProperty("disabled") @Nullable Boolean disabled,
+      @JsonProperty("type") @Nullable FSTType fstType) {
+    super(disabled);
+    _fstType = fstType;
+  }
+
+  @JsonProperty("type")
+  public FSTType getFstType() {
+    return _fstType;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FstIndexConfig that = (FstIndexConfig) o;
+    return _fstType == that._fstType;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_fstType);
+  }
+
+  @Override
+  public String toString() {
+    return "FstIndexConfig{\"fstType\":" + _fstType + '}';
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexConfigDeserializer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexConfigDeserializer.java
new file mode 100644
index 00000000000..2517416811c
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexConfigDeserializer.java
@@ -0,0 +1,175 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import org.apache.pinot.spi.config.table.FieldConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+import org.apache.pinot.spi.utils.JsonUtils;
+
+
+public class IndexConfigDeserializer {
+  private IndexConfigDeserializer() {
+  }
+
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> ifIndexingConfig(
+      ColumnConfigDeserializer<C> delegate) {
+    return ((tableConfig, schema) -> tableConfig.getIndexingConfig() != null
+        ? delegate.deserialize(tableConfig, schema) : Collections.emptyMap());
+  }
+
+  /**
+   * Returns a {@link ColumnConfigDeserializer} that always returns the same config object
+   */
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> always(C config) {
+    return (tableConfig, schema) -> {
+      Map<String, C> result = new HashMap<>();
+      for (String col : schema.getColumnNames()) {
+        result.put(col, config);
+      }
+      return result;
+    };
+  }
+
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> alwaysDefault(IndexType<C, ?, ?> indexType) {
+    return always(indexType.getDefaultConfig());
+  }
+
+  /**
+   * Returns a {@link ColumnConfigDeserializer} that always returns whatever is returned by the function given as
+   * parameter.
+   */
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> alwaysCall(BiFunction<TableConfig, Schema, C> map) {
+    return (tableConfig, schema) -> {
+      C config = map.apply(tableConfig, schema);
+      Map<String, C> result = new HashMap<>();
+      for (String col : schema.getColumnNames()) {
+        result.put(col, config);
+      }
+      return result;
+    };
+  }
+
+  /**
+   * Returns a {@link ColumnConfigDeserializer} that reads a specific fieldName of the <pre>indexes</pre> attribute on
+   * each FieldConfig.
+   */
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> fromIndexes(String fieldName, Class<C> aClass) {
+    return (tableConfig, schema) -> {
+      Map<String, C> result = new HashMap<>();
+      List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
+      if (fieldConfigList != null) {
+        for (FieldConfig fc : fieldConfigList) {
+          if (!fc.getIndexes().isObject()) {
+            continue;
+          }
+          JsonNode jsonNode = fc.getIndexes().get(fieldName);
+          if (jsonNode == null) {
+            continue;
+          }
+          C config;
+          try {
+            config = JsonUtils.jsonNodeToObject(jsonNode, aClass);
+          } catch (IOException e) {
+            throw new UncheckedIOException(e);
+          }
+          result.put(fc.getName(), config);
+        }
+      }
+      return result;
+    };
+  }
+
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> fromIndexTypes(
+      FieldConfig.IndexType configIndexType, BiFunction<TableConfig, FieldConfig, C> mapFunction) {
+    return (tableConfig, schema) -> {
+      List<FieldConfig> fieldConfigList = tableConfig.getFieldConfigList();
+      if (fieldConfigList == null) {
+        return Collections.emptyMap();
+      }
+      Map<String, C> result = new HashMap<>();
+      for (FieldConfig fieldConfig : fieldConfigList) {
+        if (!fieldConfig.getIndexTypes().contains(configIndexType)) {
+          continue;
+        }
+        result.put(fieldConfig.getName(), mapFunction.apply(tableConfig, fieldConfig));
+      }
+      return result;
+    };
+  }
+
+  public static <T, C extends IndexConfig> ColumnConfigDeserializer<C> fromCollection(
+      Function<TableConfig, Collection<T>> extract, BiConsumer<Map<String, C>, T> consume) {
+    return (tableConfig, schema) -> {
+      Collection<T> col = extract.apply(tableConfig);
+      if (col == null) {
+        return Collections.emptyMap();
+      }
+      Map<String, C> result = new HashMap<>();
+      for (T temp : col) {
+        consume.accept(result, temp);
+      }
+      return result;
+    };
+  }
+
+  public static <K, T, C extends IndexConfig> ColumnConfigDeserializer<C> fromMap(
+      Function<TableConfig, Map<K, T>> extract, TriConsumer<K, T, C> consume) {
+    return (tableConfig, schema) -> {
+      Map<K, T> map = extract.apply(tableConfig);
+      if (map == null) {
+        return Collections.emptyMap();
+      }
+      Map<String, C> result = new HashMap<>();
+      for (Map.Entry<K, T> entry : map.entrySet()) {
+        consume.accept(result, entry.getKey(), entry.getValue());
+      }
+      return result;
+    };
+  }
+
+  @FunctionalInterface
+  public interface TriConsumer<K, T, C> {
+    void accept(Map<String, C> accum, K key, T temp);
+  }
+
+  public static <C extends IndexConfig> ColumnConfigDeserializer<C> fromMap(
+      Function<TableConfig, Map<String, C>> extract) {
+    return (tableConfig, schema) -> {
+      Map<String, C> result = extract.apply(tableConfig);
+      if (result == null) {
+        return Collections.emptyMap();
+      }
+      return result;
+    };
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexCreator.java
new file mode 100644
index 00000000000..3e2389f388a
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexCreator.java
@@ -0,0 +1,65 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import java.io.Closeable;
+import java.io.IOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * The interface used to create indexes.
+ *
+ * The lifecycle for an IndexCreator is:
+ * <ol>
+ *   <li>To be created.</li>
+ *   <li>Zero or more calls to either {@link #add(Object, int)} or {@link #add(Object[], int[])} (but not mix them).
+ *   Calls to add methods must be done in document id order, starting from the first document id.</li>
+ *   <li>A call to {@link #seal()}</li>
+ *   <li>A call to {@link #close()}</li>
+ * </ol>
+ */
+public interface IndexCreator extends Closeable {
+  /**
+   * Adds the given single value cell to the index.
+   *
+   * Rows will be added in docId order, starting with the one with docId 0.
+   *
+   * @param value The nonnull value of the cell. In case the cell was actually null, a default value is received instead
+   * @param dictId An optional dictionary value of the cell. If there is no dictionary, -1 is received
+   */
+  void add(@Nonnull Object value, int dictId)
+      throws IOException;
+
+  /**
+   * Adds the given multi value cell to the index
+   *
+   * Rows will be added in docId order, starting with the one with docId 0.
+   *
+   * @param values The nonnull value of the cell. In case the cell was actually null, an empty array is received instead
+   * @param dictIds An optional array of dictionary values. If there is no dictionary, null is received.
+   */
+  void add(@Nonnull Object[] values, @Nullable int[] dictIds)
+      throws IOException;
+
+  void seal()
+      throws IOException;
+}
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexHandler.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexHandler.java
similarity index 74%
rename from pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexHandler.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexHandler.java
index 2d65fc5b849..201c2411701 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexHandler.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexHandler.java
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.local.segment.index.loader;
+package org.apache.pinot.segment.spi.index;
 
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
 import org.apache.pinot.segment.spi.store.SegmentDirectory;
 
 
@@ -30,7 +29,7 @@ public interface IndexHandler {
   /**
    * Adds new indices and removes obsolete indices.
    */
-  void updateIndices(SegmentDirectory.Writer segmentWriter, IndexCreatorProvider indexCreatorProvider)
+  void updateIndices(SegmentDirectory.Writer segmentWriter)
       throws Exception;
 
   /**
@@ -46,4 +45,24 @@ boolean needUpdateIndices(SegmentDirectory.Reader segmentReader)
    */
   void postUpdateIndicesCleanup(SegmentDirectory.Writer segmentWriter)
     throws Exception;
+
+  public static class NoOp implements IndexHandler {
+    public static final NoOp INSTANCE = new NoOp();
+
+    private NoOp() {
+    }
+
+    @Override
+    public void updateIndices(SegmentDirectory.Writer segmentWriter) {
+    }
+
+    @Override
+    public boolean needUpdateIndices(SegmentDirectory.Reader segmentReader) {
+      return false;
+    }
+
+    @Override
+    public void postUpdateIndicesCleanup(SegmentDirectory.Writer segmentWriter) {
+    }
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexPlugin.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexPlugin.java
new file mode 100644
index 00000000000..714cd2717ae
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexPlugin.java
@@ -0,0 +1,35 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+/**
+ * IndexPlugins are the way {@link IndexType}s are registered in a {@link IndexService}.
+ *
+ * In order to create an IndexService, a set of IndexPlugin must be provided. Although IndexTypes could be directly
+ * added into a IndexService, this indirection is used to decouple the way indexes are discovered
+ * (usually by {@link java.util.ServiceLoader} services) and the actual implementation.
+ *
+ * In order to mark a class as a {@link java.util.ServiceLoader} service, some metadata has to be added. Java modules
+ * define a typesafe way to define services, but given that Pinot does not use them right now, the easier way to create
+ * these services is by using Google AutoService. BloomIndexPlugin can be used as example.
+ */
+public interface IndexPlugin<T extends IndexType<?, ?, ?>> {
+  T getIndexType();
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdValueSet.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReader.java
similarity index 87%
rename from pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdValueSet.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReader.java
index f917df22c3d..967c5e2b6f0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/BlockDocIdValueSet.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReader.java
@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.core.common;
 
-public interface BlockDocIdValueSet {
+package org.apache.pinot.segment.spi.index;
 
-  public BlockDocIdValueIterator iterator();
+import java.io.Closeable;
+
+
+public interface IndexReader extends Closeable {
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReaderConstraintException.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReaderConstraintException.java
new file mode 100644
index 00000000000..105129389e5
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReaderConstraintException.java
@@ -0,0 +1,47 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+public class IndexReaderConstraintException extends Exception {
+  public IndexReaderConstraintException() {
+  }
+
+  public IndexReaderConstraintException(String message) {
+    super(message);
+  }
+
+  public IndexReaderConstraintException(String columnName, IndexType<?, ?, ?> type, String constraintDesc,
+      Throwable cause) {
+    this("Cannot read an index of type " + type + " on column " + columnName + ". Reason: " + constraintDesc,
+        cause);
+  }
+
+  public IndexReaderConstraintException(String columnName, IndexType<?, ?, ?> type, String constraintDesc) {
+    this(columnName, type, constraintDesc, null);
+  }
+
+  public IndexReaderConstraintException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public IndexReaderConstraintException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReaderFactory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReaderFactory.java
new file mode 100644
index 00000000000..c8fb5d6b58a
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexReaderFactory.java
@@ -0,0 +1,74 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import java.io.IOException;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.IndexConfig;
+
+
+public interface IndexReaderFactory<R extends IndexReader> {
+
+  /**
+   * Tries to create an index reader for the given column and segment.
+   *
+   * It may be the case that the configuration indicates that the index should be disabled but it is actually there.
+   * Also, it may be the case that the configuration says that the index should be there but it is not in the reader.
+   * In both cases the source of truth is the segment reader.
+   *
+   * @throws IndexReaderConstraintException if the constraints of the index reader are not matched. For example, some
+   * indexes may require the column to be dictionary based.
+   * @return the index reader or null if there is no index for that column
+   */
+  @Nullable
+  R createIndexReader(SegmentDirectory.Reader segmentReader, FieldIndexConfigs fieldIndexConfigs,
+      ColumnMetadata metadata)
+      throws IOException, IndexReaderConstraintException;
+
+  abstract class Default<C extends IndexConfig, R extends IndexReader> implements IndexReaderFactory<R> {
+
+    protected abstract IndexType<C, R, ?> getIndexType();
+
+    protected abstract R createIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata, C indexConfig)
+        throws IOException, IndexReaderConstraintException;
+
+    @Override
+    public R createIndexReader(SegmentDirectory.Reader segmentReader, FieldIndexConfigs fieldIndexConfigs,
+        ColumnMetadata metadata)
+        throws IOException, IndexReaderConstraintException {
+      IndexType<C, R, ?> indexType = getIndexType();
+
+      if (!segmentReader.hasIndexFor(metadata.getColumnName(), indexType)) { // there is no buffer for this index
+        return null;
+      }
+
+      PinotDataBuffer buffer = segmentReader.getIndexFor(metadata.getColumnName(), indexType);
+      try {
+        return createIndexReader(buffer, metadata, fieldIndexConfigs.getConfig(indexType));
+      } catch (RuntimeException ex) {
+        throw new RuntimeException(
+            "Cannot read index " + indexType + " for column " + metadata.getColumnName(), ex);
+      }
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexService.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexService.java
new file mode 100644
index 00000000000..3910ac43c7c
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexService.java
@@ -0,0 +1,148 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.Set;
+import javax.annotation.concurrent.ThreadSafe;
+
+
+/**
+ * This is the entry point of the Index SPI, containing all index types that can be used.
+ *
+ * A caller can get a specific index type by calling {@link #get(String)} with their id or list all indexes by invoking
+ * {@link IndexService#getAllIndexes()}.
+ *
+ * In production, there should be a single instance of this class and that instance should be returned by
+ * {@link #getInstance()}. By default, this instance will be created by calling {@link #fromServiceLoader()}, which
+ * reads all ServiceLoader SPI services that implement {@link IndexPlugin}, adding all the {@link IndexType} that can be
+ * found in that way. In case we need to change the default behavior, the static instance can be changed with
+ * {@link #setInstance(IndexService)}.
+ *
+ * Thread safety: All methods in this class, including static ones, are thread safe.
+ *
+ * Note: This class offers a singleton interface, but callers are encouraged to receive a IndexService instance in their
+ * constructor and use that instance instead of using the static {@link #getInstance()} method directly. This is
+ * specially important when callers want to test the behavior when dealing with different index type sets.
+ *
+ */
+@ThreadSafe
+public class IndexService {
+
+  private static volatile IndexService _instance = fromServiceLoader();
+
+  private final Set<IndexType<?, ?, ?>> _allIndexes;
+  private final Map<String, IndexType<?, ?, ?>> _allIndexesById;
+
+  private IndexService(Set<IndexPlugin<?>> allPlugins) {
+    ImmutableMap.Builder<String, IndexType<?, ?, ?>> builder = ImmutableMap.builder();
+
+    for (IndexPlugin<?> plugin : allPlugins) {
+      IndexType<?, ?, ?> indexType = plugin.getIndexType();
+      builder.put(indexType.getId().toLowerCase(Locale.US), indexType);
+    }
+    _allIndexesById = builder.build();
+    _allIndexes = ImmutableSet.copyOf(_allIndexesById.values());
+  }
+
+  /**
+   * Get the static IndexService instance that Pinot should use.
+   */
+  public static IndexService getInstance() {
+    return _instance;
+  }
+
+  /**
+   * Sets the static IndexService.
+   *
+   * This is the instance that will be used by most of the code.
+   */
+  public static void setInstance(IndexService other) {
+    _instance = other;
+  }
+
+  /**
+   * Creates an IndexService by looking for all {@link IndexPlugin} defined as services by {@link ServiceLoader}.
+   *
+   * This is the default way to create an IndexService. In case more tuning is needed,
+   * {@link IndexService#IndexService(Set)}} can be used.
+   */
+  public static IndexService fromServiceLoader() {
+    Set<IndexPlugin<?>> pluginList = new HashSet<>();
+    for (IndexPlugin indexPlugin : ServiceLoader.load(IndexPlugin.class)) {
+      pluginList.add(indexPlugin);
+    }
+    return new IndexService(pluginList);
+  }
+
+  /**
+   * Returns a set with all the index types stored by this index service.
+   *
+   * @return an immutable list with all index types known by this instance.
+   */
+  public Set<IndexType<?, ?, ?>> getAllIndexes() {
+    return _allIndexes;
+  }
+
+  /**
+   * Get the IndexType that is identified by the given index id.
+   *
+   * All IndexType references must be obtained using the {@link IndexService} class (directly or indirectly). Even
+   * if the callers have a compile time dependency to the actual IndexType class. Otherwise problems may arise when
+   * using index overriding.
+   *
+   * In order to have a typesafe access to standard indexes, it is recommended to use {@link StandardIndexes} whenever
+   * it is possible.
+   *
+   * @param indexId the index id, as defined in {@link IndexType#getId()}.
+   * @return An optional which will be empty in case there is no index identified by that id.
+   */
+  public Optional<IndexType<?, ?, ?>> getOptional(String indexId) {
+    return Optional.ofNullable(_allIndexesById.get(indexId.toLowerCase(Locale.US)));
+  }
+
+  /**
+   * Get the IndexType that is identified by the given index id.
+   *
+   * All IndexType references must be obtained using the {@link IndexService} class (directly or indirectly). Even
+   * if the callers have a compile time dependency to the actual IndexType class. Otherwise problems may arise when
+   * using index overriding.
+   *
+   * In order to have a typesafe access to standard indexes, it is recommended to use {@link StandardIndexes} whenever
+   * it is possible.
+   *
+   * @param indexId the index id, as defined in {@link IndexType#getId()}.
+   * @return The index type that is identified by the given id.
+   * @throws IllegalArgumentException in case there is not index type identified by the given id.
+   */
+  public IndexType<?, ?, ?> get(String indexId) {
+    IndexType<?, ?, ?> indexType = _allIndexesById.get(indexId.toLowerCase(Locale.US));
+    if (indexType == null) {
+      throw new IllegalArgumentException("Unknown index id: " + indexId);
+    }
+    return indexType;
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexType.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexType.java
new file mode 100644
index 00000000000..03e6e263912
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexType.java
@@ -0,0 +1,123 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.ColumnMetadata;
+import org.apache.pinot.segment.spi.creator.IndexCreationContext;
+import org.apache.pinot.segment.spi.index.column.ColumnIndexContainer;
+import org.apache.pinot.segment.spi.index.mutable.MutableIndex;
+import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
+import org.apache.pinot.segment.spi.store.SegmentDirectory;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+/**
+ * @param <C> the class that represents how this object is configured.
+ * @param <IR> the {@link IndexReader} subclass that should be used to read indexes of this type.
+ * @param <IC> the {@link IndexCreator} subclass that should be used to create indexes of this type.
+ */
+public interface IndexType<C extends IndexConfig, IR extends IndexReader, IC extends IndexCreator> {
+
+  /**
+   * The unique id that identifies this index type.
+   * <p>The returned value for each index should be constant across different Pinot versions as it is used as:</p>
+   *
+   * <ul>
+   *   <li>The key used when the index is registered in IndexService.</li>
+   *   <li>The internal identification in v1 files and metadata persisted on disk.</li>
+   *   <li>The default toString implementation.</li>
+   *   <li>The key that identifies the index config in the indexes section inside
+   *   {@link org.apache.pinot.spi.config.table.FieldConfig}, although specific index types may choose to read other
+   *   names (for example, <code>inverted_index</code> may read <code>inverted</code> key.</li>
+   * </ul>
+   */
+  String getId();
+
+  Class<C> getIndexConfigClass();
+
+  /**
+   * The default config when it is not explicitly defined by the user.
+   */
+  C getDefaultConfig();
+
+  Map<String, C> getConfig(TableConfig tableConfig, Schema schema);
+
+  default String getPrettyName() {
+    return getId();
+  }
+
+  /**
+   * Returns the {@link IndexCreator} that can should be used to create an index of this type with the given context
+   * and configuration.
+   *
+   * The caller has the ownership of the creator and therefore it has to close it.
+   * @param context The object that stores all the contextual information related to the index creation. Like the
+   *                cardinality or the total number of documents.
+   * @param indexConfig The index specific configuration that should be used.
+   */
+  IC createIndexCreator(IndexCreationContext context, C indexConfig)
+      throws Exception;
+
+  /**
+   * Returns the {@link IndexReaderFactory} that should be used to return readers for this type.
+   */
+  IndexReaderFactory<IR> getReaderFactory();
+
+  /**
+   * This method is used to extract a compatible reader from a given ColumnIndexContainer.
+   *
+   * Most implementations just return {@link ColumnIndexContainer#getIndex(IndexType)}, but some may try to reuse other
+   * indexes. For example, InvertedIndexType delegates on the ForwardIndexReader when it is sorted.
+   */
+  @Nullable
+  default IR getIndexReader(ColumnIndexContainer indexContainer) {
+    return indexContainer.getIndex(this);
+  }
+
+  String getFileExtension(ColumnMetadata columnMetadata);
+
+  IndexHandler createIndexHandler(SegmentDirectory segmentDirectory, Map<String, FieldIndexConfigs> configsByCol,
+      @Nullable Schema schema, @Nullable TableConfig tableConfig);
+
+  /**
+   * This method is used to perform in place conversion of provided {@link TableConfig} to newer format
+   * related to the IndexType that implements it.
+   *
+   * {@link AbstractIndexType#convertToNewFormat(TableConfig, Schema)} ensures all the index information from old format
+   * is made available in the new format while it depends on the individual index types to handle the data cleanup from
+   * old format.
+   */
+  void convertToNewFormat(TableConfig tableConfig, Schema schema);
+
+  /**
+   * Creates a mutable index.
+   *
+   * Implementations return null if the index type doesn't support mutable indexes. Some indexes may support mutable
+   * index only in some conditions. For example, they may only be supported if there is a dictionary or if the column is
+   * single-valued.
+   */
+  @Nullable
+  default MutableIndex createMutableIndex(MutableIndexContext context, C config) {
+    return null;
+  }
+}
diff --git a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/Utils.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexUtil.java
similarity index 58%
rename from pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/Utils.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexUtil.java
index 60ae614a2f5..fe2bec135fd 100644
--- a/pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/Utils.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexUtil.java
@@ -16,25 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.query.mailbox;
 
-public final class Utils {
+package org.apache.pinot.segment.spi.index;
 
-  private Utils() {
-    // do not instantiate.
-  }
-
-  public static String constructChannelId(String mailboxId) {
-    MailboxIdentifier mailboxIdentifier = toMailboxIdentifier(mailboxId);
-    ServerAddress dest = mailboxIdentifier.getToHost();
-    return dest.toString();
-  }
+public class IndexUtil {
 
-  public static MailboxIdentifier toMailboxIdentifier(String mailboxId) {
-    return JsonMailboxIdentifier.parse(mailboxId);
+  private IndexUtil() {
   }
 
-  public static String fromMailboxIdentifier(MailboxIdentifier mailboxId) {
-    return mailboxId.toString();
+  /**
+   * Helper method that builds allocation context that includes segment name, column name, and index type.
+   *
+   * @param segmentName Name of segment.
+   * @param columnName Name of column.
+   * @param suffix The suffix to use.
+   * @return Allocation context built from segment name, column name and index type.
+   */
+  public static String buildAllocationContext(String segmentName, String columnName, String suffix) {
+    return segmentName + ":" + columnName + suffix;
   }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexingOverrides.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexingOverrides.java
deleted file mode 100644
index 8fc65d9964e..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/IndexingOverrides.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.creator.IndexCreationContext;
-import org.apache.pinot.segment.spi.creator.IndexCreatorProvider;
-import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
-import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
-import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
-import org.apache.pinot.segment.spi.index.mutable.MutableDictionary;
-import org.apache.pinot.segment.spi.index.mutable.MutableForwardIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableInvertedIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableJsonIndex;
-import org.apache.pinot.segment.spi.index.mutable.MutableTextIndex;
-import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexContext;
-import org.apache.pinot.segment.spi.index.mutable.provider.MutableIndexProvider;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.index.reader.SortedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
-import org.apache.pinot.segment.spi.index.reader.provider.IndexReaderProvider;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class IndexingOverrides {
-
-  public interface IndexingOverride extends IndexCreatorProvider, IndexReaderProvider, MutableIndexProvider {
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(IndexingOverrides.class);
-
-  private static final IndexCreatorProvider CREATOR_DEFAULTS = createDefaultCreatorProvider();
-  private static final IndexReaderProvider READER_DEFAULTS = createDefaultReaderProvider();
-  private static final MutableIndexProvider MUTABLE_INDEX_DEFAULTS = createDefaultMutableIndexProvider();
-
-  private static final AtomicReference<IndexingOverride> REGISTRATION = new AtomicReference<>(null);
-
-  private IndexingOverrides() {
-  }
-
-  /**
-   * The caller provides a decorator to wrap the default provider, which allows plugins to create
-   * a delegation chain.
-   * @param provider indexing override
-   * @return true if this is the first invocation and the provider has not yet been used.
-   */
-  public static boolean registerProvider(IndexingOverride provider) {
-    return REGISTRATION.compareAndSet(null, provider);
-  }
-
-  /**
-   * Gets the registered {@see IndexReaderProvider} or the default if none was registered yet.
-   * @return an index reader provider.
-   */
-  public static IndexReaderProvider getIndexReaderProvider() {
-    return Holder.PROVIDER;
-  }
-
-  /**
-   * Gets the registered {@see MutableIndexProvider} or the default if none was registered yet.
-   * @return a mutable index reader provider.
-   */
-  public static MutableIndexProvider getMutableIndexProvider() {
-    return Holder.PROVIDER;
-  }
-
-  /**
-   * Obtain the registered index creator provider. If the user has provided an override, then it will be used instead.
-   * If the user has not provided an override yet, then this action will prevent them from doing so.
-   * @return the global index provision logic.
-   */
-  public static IndexCreatorProvider getIndexCreatorProvider() {
-    return Holder.PROVIDER;
-  }
-
-  private static final class Holder {
-    public static final IndexingOverride PROVIDER = Optional.ofNullable(REGISTRATION.get()).orElseGet(Default::new);
-  }
-
-  private static IndexCreatorProvider createDefaultCreatorProvider() {
-    return invokeDefaultConstructor("org.apache.pinot.segment.local.segment.creator.impl.DefaultIndexCreatorProvider");
-  }
-
-  private static IndexReaderProvider createDefaultReaderProvider() {
-    return invokeDefaultConstructor("org.apache.pinot.segment.local.segment.index.readers.DefaultIndexReaderProvider");
-  }
-
-  private static MutableIndexProvider createDefaultMutableIndexProvider() {
-    return invokeDefaultConstructor(
-        "org.apache.pinot.segment.local.indexsegment.mutable.DefaultMutableIndexProvider");
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <T> T invokeDefaultConstructor(String className) {
-    try {
-      Class<?> clazz = Class.forName(className, false, IndexingOverrides.class.getClassLoader());
-      return (T) MethodHandles.publicLookup()
-          .findConstructor(clazz, MethodType.methodType(void.class)).invoke();
-    } catch (Throwable missing) {
-      LOGGER.error("could not construct MethodHandle for {}", className, missing);
-      return null;
-    }
-  }
-
-  /**
-   * Extend this class to override index creation
-   */
-  public static class Default implements IndexingOverride {
-
-    @Override
-    public BloomFilterCreator newBloomFilterCreator(IndexCreationContext.BloomFilter context)
-        throws IOException {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newBloomFilterCreator(context);
-    }
-
-    @Override
-    public ForwardIndexCreator newForwardIndexCreator(IndexCreationContext.Forward context)
-        throws Exception {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newForwardIndexCreator(context);
-    }
-
-    @Override
-    public GeoSpatialIndexCreator newGeoSpatialIndexCreator(IndexCreationContext.Geospatial context)
-        throws IOException {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newGeoSpatialIndexCreator(context);
-    }
-
-    @Override
-    public DictionaryBasedInvertedIndexCreator newInvertedIndexCreator(IndexCreationContext.Inverted context)
-        throws IOException {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newInvertedIndexCreator(context);
-    }
-
-    @Override
-    public JsonIndexCreator newJsonIndexCreator(IndexCreationContext.Json context)
-        throws IOException {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newJsonIndexCreator(context);
-    }
-
-    @Override
-    public CombinedInvertedIndexCreator newRangeIndexCreator(IndexCreationContext.Range context)
-        throws IOException {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newRangeIndexCreator(context);
-    }
-
-    @Override
-    public TextIndexCreator newTextIndexCreator(IndexCreationContext.Text context)
-        throws IOException {
-      ensureCreatorPresent();
-      return CREATOR_DEFAULTS.newTextIndexCreator(context);
-    }
-
-    @Override
-    public BloomFilterReader newBloomFilterReader(PinotDataBuffer dataBuffer, boolean onHeap)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newBloomFilterReader(dataBuffer, onHeap);
-    }
-
-    @Override
-    public ForwardIndexReader<?> newForwardIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newForwardIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public H3IndexReader newGeospatialIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newGeospatialIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public InvertedIndexReader<?> newInvertedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newInvertedIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public JsonIndexReader newJsonIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newJsonIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public RangeIndexReader<?> newRangeIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newRangeIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public SortedIndexReader<?> newSortedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newSortedIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public TextIndexReader newFSTIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-        throws IOException {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newFSTIndexReader(dataBuffer, metadata);
-    }
-
-    @Override
-    public TextIndexReader newTextIndexReader(File file, ColumnMetadata columnMetadata,
-        @Nullable Map<String, String> textIndexProperties) {
-      ensureReaderPresent();
-      return READER_DEFAULTS.newTextIndexReader(file, columnMetadata, textIndexProperties);
-    }
-
-    @Override
-    public MutableForwardIndex newForwardIndex(MutableIndexContext.Forward context) {
-      ensureMutableReaderPresent();
-      return MUTABLE_INDEX_DEFAULTS.newForwardIndex(context);
-    }
-
-    @Override
-    public MutableInvertedIndex newInvertedIndex(MutableIndexContext.Inverted context) {
-      ensureMutableReaderPresent();
-      return MUTABLE_INDEX_DEFAULTS.newInvertedIndex(context);
-    }
-
-    @Override
-    public MutableTextIndex newTextIndex(MutableIndexContext.Text context) {
-      ensureMutableReaderPresent();
-      return MUTABLE_INDEX_DEFAULTS.newTextIndex(context);
-    }
-
-    @Override
-    public MutableJsonIndex newJsonIndex(MutableIndexContext.Json context) {
-      ensureMutableReaderPresent();
-      return MUTABLE_INDEX_DEFAULTS.newJsonIndex(context);
-    }
-
-    @Override
-    public MutableDictionary newDictionary(MutableIndexContext.Dictionary context) {
-      ensureMutableReaderPresent();
-      return MUTABLE_INDEX_DEFAULTS.newDictionary(context);
-    }
-
-    private void ensureReaderPresent() {
-      if (READER_DEFAULTS == null) {
-        throw new UnsupportedOperationException("default implementation not present on classpath");
-      }
-    }
-
-    private void ensureMutableReaderPresent() {
-      if (MUTABLE_INDEX_DEFAULTS == null) {
-        throw new UnsupportedOperationException("default implementation not present on classpath");
-      }
-    }
-
-    private void ensureCreatorPresent() {
-      if (CREATOR_DEFAULTS == null) {
-        throw new UnsupportedOperationException("default implementation not present on classpath");
-      }
-    }
-  }
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/MergedColumnConfigDeserializer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/MergedColumnConfigDeserializer.java
new file mode 100644
index 00000000000..5642034acd9
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/MergedColumnConfigDeserializer.java
@@ -0,0 +1,95 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.data.Schema;
+
+
+public class MergedColumnConfigDeserializer<C> implements ColumnConfigDeserializer<C> {
+
+  private final OnConflict _onConflict;
+  private final Iterable<ColumnConfigDeserializer<C>> _deserializers;
+
+  @SafeVarargs
+  public MergedColumnConfigDeserializer(OnConflict onConflict, ColumnConfigDeserializer<C>... deserializers) {
+    this(onConflict, Arrays.asList(deserializers));
+  }
+
+  public MergedColumnConfigDeserializer(OnConflict onConflict, Iterable<ColumnConfigDeserializer<C>> deserializers) {
+    _onConflict = onConflict;
+    _deserializers = deserializers;
+  }
+
+  @Override
+  public Map<String, C> deserialize(TableConfig tableConfig, Schema schema) {
+    Map<String, C> result = new HashMap<>();
+    for (ColumnConfigDeserializer<C> deserializer : _deserializers) {
+      Map<String, C> partialResult = deserializer.deserialize(tableConfig, schema);
+
+      for (Map.Entry<String, C> entry : partialResult.entrySet()) {
+        String column = entry.getKey();
+        if (result.containsKey(column)) {
+          _onConflict.merge(result, column, entry.getValue());
+        } else {
+          result.put(column, entry.getValue());
+        }
+      }
+    }
+    return result;
+  }
+
+  public static class ConfigDeclaredTwiceException extends RuntimeException {
+    private final String _column;
+
+    public ConfigDeclaredTwiceException(String column) {
+      super("Configuration is declared in two different ways for column " + column);
+      _column = column;
+    }
+
+    public String getColumn() {
+      return _column;
+    }
+  }
+
+  public static enum OnConflict {
+    FAIL {
+      @Override
+      public <C> void merge(Map<String, C> map, String column, C newValue) {
+        throw new ConfigDeclaredTwiceException(column);
+      }
+    },
+    PICK_FIRST {
+      @Override
+      public <C> void merge(Map<String, C> map, String column, C newValue) {
+      }
+    },
+    PICK_LAST {
+      @Override
+      public <C> void merge(Map<String, C> map, String column, C newValue) {
+        map.put(column, newValue);
+      }
+    };
+
+    public abstract <C> void merge(Map<String, C> map, String column, C newValue);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/RangeIndexConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/RangeIndexConfig.java
new file mode 100644
index 00000000000..ba5d67eda9c
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/RangeIndexConfig.java
@@ -0,0 +1,69 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.IndexConfig;
+
+
+public class RangeIndexConfig extends IndexConfig {
+  public static final RangeIndexConfig DEFAULT = new RangeIndexConfig(false, 2);
+  public static final RangeIndexConfig DISABLED = new RangeIndexConfig(true, null);
+
+  private final int _version;
+
+  public RangeIndexConfig(int version) {
+    this(false, version);
+  }
+
+  @JsonCreator
+  public RangeIndexConfig(@JsonProperty("disabled") Boolean disabled,
+      @JsonProperty("version") @Nullable Integer version) {
+    super(disabled);
+    _version = version != null ? version : 2;
+  }
+
+  public int getVersion() {
+    return _version;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+    RangeIndexConfig that = (RangeIndexConfig) o;
+    return _version == that._version;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), _version);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/StandardIndexes.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/StandardIndexes.java
new file mode 100644
index 00000000000..4c61cb6d0a6
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/StandardIndexes.java
@@ -0,0 +1,130 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
+import org.apache.pinot.segment.spi.index.creator.CombinedInvertedIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.DictionaryBasedInvertedIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.FSTIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.ForwardIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.H3IndexConfig;
+import org.apache.pinot.segment.spi.index.creator.JsonIndexCreator;
+import org.apache.pinot.segment.spi.index.creator.TextIndexCreator;
+import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
+import org.apache.pinot.segment.spi.index.reader.Dictionary;
+import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
+import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
+import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
+import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
+import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
+import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
+import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
+import org.apache.pinot.spi.config.table.BloomFilterConfig;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.config.table.JsonIndexConfig;
+
+
+/**
+ * This is a utility class that can be used to get references to the standard index types in a safe way.
+ * <p>
+ *   The ultimate container of valid index types (and therefore the source of truth) is {@link IndexService}.
+ *   In order to get some specific index type, callers have to use {@link IndexService#get(String)}.
+ *   The usability of this method is not great, given that the caller needs to use a literal (which imply that typos
+ *   may produce exceptions at runtime) and it returns the most generic IndexType signature. This signature is so
+ *   general that most of the time caller is forced to do castings.
+ * </p>
+ * <p>
+ *   These usability problems are a cost we have to pay in order to have the ability to get references to index types
+ *   that are not know at compile time, which is a requirement when we have custom index types. But Pinot includes
+ *   a bunch of predefined index types (like forward index, dictionary, null value vector, etc) that should always be
+ *   included in a Pinot distribution. {@link StandardIndexes} contains one get method for each standard index,
+ *   providing a typesafe way to get these references. Instead of having to write something like
+ *   {@code (IndexType<BloomFilterConfig, BloomFilterReader, IndexCreator>)
+ *   IndexService.getInstance().get("bloom_filter")},
+ *   a caller can simply use {@link StandardIndexes#bloomFilter()}
+ * </p>
+ */
+@SuppressWarnings("unchecked")
+public class StandardIndexes {
+  public static final String FORWARD_ID = "forward_index";
+  public static final String DICTIONARY_ID = "dictionary";
+  public static final String NULL_VALUE_VECTOR_ID = "nullvalue_vector";
+  public static final String BLOOM_FILTER_ID = "bloom_filter";
+  public static final String FST_ID = "fst_index";
+  public static final String INVERTED_ID = "inverted_index";
+  public static final String JSON_ID = "json_index";
+  public static final String RANGE_ID = "range_index";
+  public static final String TEXT_ID = "text_index";
+  public static final String H3_ID = "h3_index";
+
+  private StandardIndexes() {
+  }
+
+  public static IndexType<ForwardIndexConfig, ForwardIndexReader, ForwardIndexCreator> forward() {
+    return (IndexType<ForwardIndexConfig, ForwardIndexReader, ForwardIndexCreator>)
+        IndexService.getInstance().get(FORWARD_ID);
+  }
+
+  public static IndexType<DictionaryIndexConfig, Dictionary, ?> dictionary() {
+    return (IndexType<DictionaryIndexConfig, Dictionary, ?>)
+        IndexService.getInstance().get(DICTIONARY_ID);
+  }
+
+  public static IndexType<IndexConfig, NullValueVectorReader, ?> nullValueVector() {
+    return (IndexType<IndexConfig, NullValueVectorReader, ?>)
+        IndexService.getInstance().get(NULL_VALUE_VECTOR_ID);
+  }
+
+  public static IndexType<BloomFilterConfig, BloomFilterReader, BloomFilterCreator> bloomFilter() {
+    return (IndexType<BloomFilterConfig, BloomFilterReader, BloomFilterCreator>)
+        IndexService.getInstance().get(BLOOM_FILTER_ID);
+  }
+
+  public static IndexType<FstIndexConfig, TextIndexReader, FSTIndexCreator> fst() {
+    return (IndexType<FstIndexConfig, TextIndexReader, FSTIndexCreator>)
+        IndexService.getInstance().get(FST_ID);
+  }
+
+  public static IndexType<IndexConfig, InvertedIndexReader, DictionaryBasedInvertedIndexCreator> inverted() {
+    return (IndexType<IndexConfig, InvertedIndexReader, DictionaryBasedInvertedIndexCreator>)
+        IndexService.getInstance().get(INVERTED_ID);
+  }
+
+  public static IndexType<JsonIndexConfig, JsonIndexReader, JsonIndexCreator> json() {
+    return (IndexType<JsonIndexConfig, JsonIndexReader, JsonIndexCreator>)
+        IndexService.getInstance().get(JSON_ID);
+  }
+
+  public static IndexType<RangeIndexConfig, RangeIndexReader, CombinedInvertedIndexCreator> range() {
+    return (IndexType<RangeIndexConfig, RangeIndexReader, CombinedInvertedIndexCreator>)
+        IndexService.getInstance().get(RANGE_ID);
+  }
+
+  public static IndexType<TextIndexConfig, TextIndexReader, TextIndexCreator> text() {
+    return (IndexType<TextIndexConfig, TextIndexReader, TextIndexCreator>)
+        IndexService.getInstance().get(TEXT_ID);
+  }
+
+  public static IndexType<H3IndexConfig, H3IndexReader, GeoSpatialIndexCreator> h3() {
+    return (IndexType<H3IndexConfig, H3IndexReader, GeoSpatialIndexCreator>)
+        IndexService.getInstance().get(H3_ID);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/TextIndexConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/TextIndexConfig.java
new file mode 100644
index 00000000000..babc5645d0c
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/TextIndexConfig.java
@@ -0,0 +1,161 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.config.table.IndexConfig;
+
+
+public class TextIndexConfig extends IndexConfig {
+  public static final TextIndexConfig DISABLED = new TextIndexConfig(true, null, null, false, false,
+      Collections.emptyList(), Collections.emptyList());
+  private final FSTType _fstType;
+  @Nullable
+  private final Object _rawValueForTextIndex;
+  private final boolean _enableQueryCache;
+  private final boolean _useANDForMultiTermQueries;
+  private final List<String> _stopWordsInclude;
+  private final List<String> _stopWordsExclude;
+
+  @JsonCreator
+  public TextIndexConfig(
+      @JsonProperty("disabled") Boolean disabled,
+      @JsonProperty("fst") FSTType fstType,
+      @JsonProperty("rawValue") @Nullable Object rawValueForTextIndex,
+      @JsonProperty("queryCache") boolean enableQueryCache,
+      @JsonProperty("useANDForMultiTermQueries") boolean useANDForMultiTermQueries,
+      @JsonProperty("stopWordsInclude") List<String> stopWordsInclude,
+      @JsonProperty("stopWordsExclude") List<String> stopWordsExclude) {
+    super(disabled);
+    _fstType = fstType;
+    _rawValueForTextIndex = rawValueForTextIndex;
+    _enableQueryCache = enableQueryCache;
+    _useANDForMultiTermQueries = useANDForMultiTermQueries;
+    _stopWordsInclude = stopWordsInclude;
+    _stopWordsExclude = stopWordsExclude;
+  }
+
+  public FSTType getFstType() {
+    return _fstType;
+  }
+
+  @Nullable
+  public Object getRawValueForTextIndex() {
+    return _rawValueForTextIndex;
+  }
+
+  /**
+   * Whether Lucene query result cache should be enabled.
+   *
+   * While it helps a lot with performance for repeated queries, on the downside it causes heap issues.
+   */
+  public boolean isEnableQueryCache() {
+    return _enableQueryCache;
+  }
+
+  public boolean isUseANDForMultiTermQueries() {
+    return _useANDForMultiTermQueries;
+  }
+
+  public List<String> getStopWordsInclude() {
+    return _stopWordsInclude;
+  }
+
+  public List<String> getStopWordsExclude() {
+    return _stopWordsExclude;
+  }
+
+  public static abstract class AbstractBuilder {
+    @Nullable
+    protected FSTType _fstType;
+    @Nullable
+    protected Object _rawValueForTextIndex;
+    protected boolean _enableQueryCache = false;
+    protected boolean _useANDForMultiTermQueries = true;
+    protected List<String> _stopWordsInclude = new ArrayList<>();
+    protected List<String> _stopWordsExclude = new ArrayList<>();
+
+    public AbstractBuilder(@Nullable FSTType fstType) {
+      _fstType = fstType;
+    }
+
+    public AbstractBuilder(TextIndexConfig other) {
+      _fstType = other._fstType;
+      _enableQueryCache = other._enableQueryCache;
+      _useANDForMultiTermQueries = other._useANDForMultiTermQueries;
+      _stopWordsInclude = new ArrayList<>(other._stopWordsInclude);
+      _stopWordsExclude = new ArrayList<>(other._stopWordsExclude);
+    }
+
+    public TextIndexConfig build() {
+      return new TextIndexConfig(false, _fstType, _rawValueForTextIndex, _enableQueryCache, _useANDForMultiTermQueries,
+          _stopWordsInclude, _stopWordsExclude);
+    }
+
+    public abstract AbstractBuilder withProperties(@Nullable Map<String, String> textIndexProperties);
+
+    public AbstractBuilder withRawValueForTextIndex(@Nullable Object rawValueForTextIndex) {
+      _rawValueForTextIndex = rawValueForTextIndex;
+      return this;
+    }
+
+    public AbstractBuilder withStopWordsInclude(List<String> stopWordsInclude) {
+      _stopWordsInclude = stopWordsInclude;
+      return this;
+    }
+
+    public AbstractBuilder withStopWordsExclude(List<String> stopWordsExclude) {
+      _stopWordsExclude = stopWordsExclude;
+      return this;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+    TextIndexConfig that = (TextIndexConfig) o;
+    return _enableQueryCache == that._enableQueryCache && _useANDForMultiTermQueries == that._useANDForMultiTermQueries
+        && _fstType == that._fstType && Objects.equals(_rawValueForTextIndex, that._rawValueForTextIndex)
+        && Objects.equals(_stopWordsInclude, that._stopWordsInclude) && Objects.equals(_stopWordsExclude,
+        that._stopWordsExclude);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), _fstType, _rawValueForTextIndex, _enableQueryCache,
+        _useANDForMultiTermQueries, _stopWordsInclude, _stopWordsExclude);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/column/ColumnIndexContainer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/column/ColumnIndexContainer.java
index 6fdc28ec76d..5e6b8ded9e6 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/column/ColumnIndexContainer.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/column/ColumnIndexContainer.java
@@ -19,15 +19,12 @@
 package org.apache.pinot.segment.spi.index.column;
 
 import java.io.Closeable;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.index.reader.Dictionary;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
-import org.apache.pinot.segment.spi.index.reader.NullValueVectorReader;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexReader;
+import org.apache.pinot.segment.spi.index.IndexType;
 
 
 /**
@@ -36,53 +33,69 @@
 public interface ColumnIndexContainer extends Closeable {
 
   /**
-   * Returns the forward index for the column.
+   * Returns the index reader of the given type or null if the column doesn't have an index of that type.
+   * @param indexType the type of the index the caller is interested in.
+   * @return The index reader of the given type, or null if the column doesn't have an index of that type.
+   * @param <I> The index reader class
+   * @param <T> The index type
    */
-  ForwardIndexReader<?> getForwardIndex();
+  @Nullable
+  <I extends IndexReader, T extends IndexType<?, I, ?>> I getIndex(T indexType);
 
-  /**
-   * Returns the inverted index for the column, or {@code null} if it does not exist.
-   */
-  InvertedIndexReader<?> getInvertedIndex();
+  class Empty implements ColumnIndexContainer {
+    public static final Empty INSTANCE = new Empty();
 
-  /**
-   * Returns the range index for the column, or {@code null} if it does not exist.
-   */
-  RangeIndexReader<?> getRangeIndex();
+    @Nullable
+    @Override
+    public <I extends IndexReader, T extends IndexType<?, I, ?>> I getIndex(T indexType) {
+      return null;
+    }
 
-  /**
-   * Returns the text index for the column, or {@code null} if it does not exist.
-   */
-  TextIndexReader getTextIndex();
+    @Override
+    public void close()
+        throws IOException {
+    }
+  }
 
-  /**
-   * Returns the FST index for the column, or {@code null} if it does not exist.
-   */
-  TextIndexReader getFSTIndex();
+  class FromMap implements ColumnIndexContainer {
+    private final Map<IndexType, ? extends IndexReader> _readersByIndex;
 
-  /**
-   * Returns the json index for the column, or {@code null} if it does not exist.
-   */
-  JsonIndexReader getJsonIndex();
+    /**
+     * @param readersByIndex it is assumed that each index is associated with a compatible reader, but there is no check
+     *                       to verify that. It is recommended to construct instances of this class by using
+     *                       {@link FromMap.Builder}
+     */
+    public FromMap(Map<IndexType, ? extends IndexReader> readersByIndex) {
+      _readersByIndex = readersByIndex;
+    }
 
-  /**
-   * Returns the H3 index for the column, or {@code null} if it does not exist.
-   */
-  H3IndexReader getH3Index();
+    @Nullable
+    @Override
+    public <I extends IndexReader, T extends IndexType<?, I, ?>> I getIndex(T indexType) {
+      return (I) _readersByIndex.get(indexType);
+    }
 
-  /**
-   * Returns the dictionary for the column, or {@code null} if it does not exist.
-   */
-  Dictionary getDictionary();
+    @Override
+    public void close()
+        throws IOException {
+    }
 
-  /**
-   * Returns the bloom filter for the column, or {@code null} if it does not exist.
-   */
-  BloomFilterReader getBloomFilter();
+    public static class Builder {
+      private final Map<IndexType, IndexReader> _readersByIndex = new HashMap<>();
 
-  /**
-   * Returns the null value vector for the column, or {@code null} if it does not exist.
-   * @return
-   */
-  NullValueVectorReader getNullValueVector();
+      public Builder withAll(Map<IndexType, ? extends IndexReader> safeMap) {
+        _readersByIndex.putAll(safeMap);
+        return this;
+      }
+
+      public <R extends IndexReader> Builder with(IndexType<?, ? super R, ?> type, R reader) {
+        _readersByIndex.put(type, reader);
+        return this;
+      }
+
+      public FromMap build() {
+        return new FromMap(_readersByIndex);
+      }
+    }
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/BloomFilterCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/BloomFilterCreator.java
index 64cfbc00289..55d4371561e 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/BloomFilterCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/BloomFilterCreator.java
@@ -18,12 +18,39 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
-import java.io.Closeable;
 import java.io.IOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexCreator;
+import org.apache.pinot.spi.data.FieldSpec;
+import org.apache.pinot.spi.utils.BytesUtils;
 
 
-public interface BloomFilterCreator extends Closeable {
+public interface BloomFilterCreator extends IndexCreator {
 
+  FieldSpec.DataType getDataType();
+
+  @Override
+  default void add(@Nonnull Object value, int dictId) {
+    if (getDataType() == FieldSpec.DataType.BYTES) {
+      add(BytesUtils.toHexString((byte[]) value));
+    } else {
+      add(value.toString());
+    }
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds) {
+    if (getDataType() == FieldSpec.DataType.BYTES) {
+      for (Object value : values) {
+        add(BytesUtils.toHexString((byte[]) value));
+      }
+    } else {
+      for (Object value : values) {
+        add(value.toString());
+      }
+    }
+  }
   /**
    * Adds a value to the bloom filter.
    */
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/CombinedInvertedIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/CombinedInvertedIndexCreator.java
index b94824f8e7f..0011c5b1c89 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/CombinedInvertedIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/CombinedInvertedIndexCreator.java
@@ -18,6 +18,80 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+/**
+ * This is the index used to create range indexes
+ */
 public interface CombinedInvertedIndexCreator
     extends DictionaryBasedInvertedIndexCreator, RawValueBasedInvertedIndexCreator {
+
+  FieldSpec.DataType getDataType();
+
+  @Override
+  default void add(@Nonnull Object value, int dictId) {
+    if (dictId >= 0) {
+      add(dictId);
+    } else {
+      switch (getDataType()) {
+        case INT:
+          add((Integer) value);
+          break;
+        case LONG:
+          add((Long) value);
+          break;
+        case FLOAT:
+          add((Float) value);
+          break;
+        case DOUBLE:
+          add((Double) value);
+          break;
+        default:
+          throw new RuntimeException("Unsupported data type " + getDataType() + " for range index");
+      }
+    }
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds) {
+    if (dictIds != null) {
+      add(dictIds, dictIds.length);
+    } else {
+      switch (getDataType()) {
+        case INT:
+          int[] intValues = new int[values.length];
+          for (int i = 0; i < values.length; i++) {
+            intValues[i] = (Integer) values[i];
+          }
+          add(intValues, values.length);
+          break;
+        case LONG:
+          long[] longValues = new long[values.length];
+          for (int i = 0; i < values.length; i++) {
+            longValues[i] = (Long) values[i];
+          }
+          add(longValues, values.length);
+          break;
+        case FLOAT:
+          float[] floatValues = new float[values.length];
+          for (int i = 0; i < values.length; i++) {
+            floatValues[i] = (Float) values[i];
+          }
+          add(floatValues, values.length);
+          break;
+        case DOUBLE:
+          double[] doubleValues = new double[values.length];
+          for (int i = 0; i < values.length; i++) {
+            doubleValues[i] = (Double) values[i];
+          }
+          add(doubleValues, values.length);
+          break;
+        default:
+          throw new RuntimeException("Unsupported data type " + getDataType() + " for range index");
+      }
+    }
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/DictionaryBasedInvertedIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/DictionaryBasedInvertedIndexCreator.java
index 9499eceff48..96a718ceda1 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/DictionaryBasedInvertedIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/DictionaryBasedInvertedIndexCreator.java
@@ -18,6 +18,11 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
+import com.google.common.base.Preconditions;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
 /**
  * Support for RoaringBitmap inverted index:
  * <pre>
@@ -53,6 +58,17 @@
  * Support for Lucene based inverted index for text
  */
 public interface DictionaryBasedInvertedIndexCreator extends InvertedIndexCreator {
+  @Override
+  default void add(@Nonnull Object value, int dictId) {
+    Preconditions.checkArgument(dictId >= 0, "A dictionary id is required");
+    add(dictId);
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds) {
+    Preconditions.checkArgument(dictIds != null, "A dictionary id is required");
+    add(dictIds, dictIds.length);
+  }
 
   /**
    * For single-value column, adds the dictionary id for the next document.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/BloomFilterReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/FSTIndexCreator.java
similarity index 54%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/BloomFilterReaderProvider.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/FSTIndexCreator.java
index fb6221cff8b..fa033902f9a 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/BloomFilterReaderProvider.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/FSTIndexCreator.java
@@ -16,22 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.index.reader.provider;
+package org.apache.pinot.segment.spi.index.creator;
 
 import java.io.IOException;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 
 
-public interface BloomFilterReaderProvider {
+public interface FSTIndexCreator extends IndexCreator {
+
+  @Override
+  default void add(@Nonnull Object value, int dictId)
+      throws IOException {
+    // FST indexes should do nothing when called for each row
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds)
+      throws IOException {
+    // FST indexes should do nothing when called for each row
+  }
+
+  /**
+   * Adds the next document.
+   */
+  void add(String document);
 
   /**
-   * Creates a {@see BloomFilterReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param onHeap whether to duplicate on heap.
-   * @return a bloom filter reader
-   * @throws IOException if reading from the buffer fails.
+   * Adds a set of documents to the index
    */
-  BloomFilterReader newBloomFilterReader(PinotDataBuffer dataBuffer, boolean onHeap)
-      throws IOException;
+  void add(String[] document, int length);
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/ForwardIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/ForwardIndexCreator.java
index 48b2728a246..0ddfb6c30c2 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/ForwardIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/ForwardIndexCreator.java
@@ -18,15 +18,130 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
-import java.io.Closeable;
+import java.io.IOException;
 import java.math.BigDecimal;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 
 
 /**
  * Interface for forward index creator.
  */
-public interface ForwardIndexCreator extends Closeable {
+public interface ForwardIndexCreator extends IndexCreator {
+
+  @Override
+  default void seal()
+      throws IOException {
+  }
+
+  @Override
+  default void add(@Nonnull Object cellValue, int dictId) {
+    if (dictId >= 0) {
+      putDictId(dictId);
+    } else {
+      switch (getValueType()) {
+        case INT:
+          putInt((int) cellValue);
+          break;
+        case LONG:
+          putLong((long) cellValue);
+          break;
+        case FLOAT:
+          putFloat((float) cellValue);
+          break;
+        case DOUBLE:
+          putDouble((double) cellValue);
+          break;
+        case BIG_DECIMAL:
+          putBigDecimal((BigDecimal) cellValue);
+          break;
+        case STRING:
+          putString((String) cellValue);
+          break;
+        case BYTES:
+          putBytes((byte[]) cellValue);
+          break;
+        case JSON:
+          if (cellValue instanceof String) {
+            putString((String) cellValue);
+          } else if (cellValue instanceof byte[]) {
+            putBytes((byte[]) cellValue);
+          }
+          break;
+        default:
+          throw new IllegalStateException();
+      }
+    }
+  }
+
+  @Override
+  default void add(@Nonnull Object[] cellValues, @Nullable int[] dictIds)
+      throws IOException {
+    if (dictIds != null) {
+      putDictIdMV(dictIds);
+    } else {
+      int length = cellValues.length;
+      // TODO: The new int[], long[], etc objects are not actually used as arrays iterated again, so we could skip the
+      //  array copy by calling an add(Object[]) method and having overloaded indexes for each type.
+      // TODO: Longer methods are not optimized by C2 JIT. We should try to move each loop to a specific method.
+      switch (getValueType()) {
+        case INT:
+          int[] ints = new int[length];
+          for (int i = 0; i < length; i++) {
+            ints[i] = (Integer) cellValues[i];
+          }
+          putIntMV(ints);
+          break;
+        case LONG:
+          long[] longs = new long[length];
+          for (int i = 0; i < length; i++) {
+            longs[i] = (Long) cellValues[i];
+          }
+          putLongMV(longs);
+          break;
+        case FLOAT:
+          float[] floats = new float[length];
+          for (int i = 0; i < length; i++) {
+            floats[i] = (Float) cellValues[i];
+          }
+          putFloatMV(floats);
+          break;
+        case DOUBLE:
+          double[] doubles = new double[length];
+          for (int i = 0; i < length; i++) {
+            doubles[i] = (Double) cellValues[i];
+          }
+          putDoubleMV(doubles);
+          break;
+        case STRING:
+          if (cellValues instanceof String[]) {
+            putStringMV((String[]) cellValues);
+          } else {
+            String[] strings = new String[length];
+            for (int i = 0; i < length; i++) {
+              strings[i] = (String) cellValues[i];
+            }
+            putStringMV(strings);
+          }
+          break;
+        case BYTES:
+          if (cellValues instanceof byte[][]) {
+            putBytesMV((byte[][]) cellValues);
+          } else {
+            byte[][] bytesArray = new byte[length][];
+            for (int i = 0; i < length; i++) {
+              bytesArray[i] = (byte[]) cellValues[i];
+            }
+            putBytesMV(bytesArray);
+          }
+          break;
+        default:
+          throw new IllegalStateException();
+      }
+    }
+  }
 
   /**
    * Returns {@code true} if the forward index is dictionary-encoded, {@code false} if it is raw.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/GeoSpatialIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/GeoSpatialIndexCreator.java
index 345fc68fac0..8282702b507 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/GeoSpatialIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/GeoSpatialIndexCreator.java
@@ -18,15 +18,30 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
-import java.io.Closeable;
 import java.io.IOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 import org.locationtech.jts.geom.Geometry;
 
 
 /**
  * Index creator for geospatial index.
  */
-public interface GeoSpatialIndexCreator extends Closeable {
+public interface GeoSpatialIndexCreator extends IndexCreator {
+
+  Geometry deserialize(byte[] bytes);
+
+  @Override
+  default void add(@Nonnull Object value, int dictId)
+      throws IOException {
+    add(deserialize((byte[]) value));
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds)
+      throws IOException {
+  }
 
   /**
    * Adds the next geospatial value.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfig.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfig.java
index af33ebe4e8a..bde1e8c9c92 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfig.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfig.java
@@ -18,20 +18,39 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
+import org.apache.pinot.spi.config.table.IndexConfig;
 
 
-public class H3IndexConfig {
+public class H3IndexConfig extends IndexConfig {
+  public static final H3IndexConfig DISABLED = new H3IndexConfig(true, null);
   public static final String RESOLUTIONS_KEY = "resolutions";
 
   private final H3IndexResolution _resolution;
 
-  public H3IndexConfig(Map<String, String> properties) {
+  public H3IndexConfig(H3IndexResolution resolution) {
+    this(false, resolution);
+  }
+
+  @JsonCreator
+  public H3IndexConfig(@JsonProperty("disabled") @Nullable Boolean disabled,
+      @JsonProperty("resolution") H3IndexResolution resolution) {
+    super(disabled);
+    _resolution = resolution;
+  }
+
+  // Used to read from older configs
+  public H3IndexConfig(@Nullable Map<String, String> properties) {
+    super(false);
     Preconditions.checkArgument(properties != null && properties.containsKey(RESOLUTIONS_KEY),
         "Properties must contain H3 resolutions");
     List<Integer> resolutions = new ArrayList<>();
@@ -48,4 +67,24 @@ public H3IndexConfig(Map<String, String> properties) {
   public H3IndexResolution getResolution() {
     return _resolution;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+    H3IndexConfig that = (H3IndexConfig) o;
+    return Objects.equals(_resolution, that._resolution);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), _resolution);
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/InvertedIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/InvertedIndexCreator.java
index e1dfbdbefa2..dc25d596833 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/InvertedIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/InvertedIndexCreator.java
@@ -18,18 +18,19 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
-import java.io.Closeable;
 import java.io.IOException;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 
 
 /**
  * Marker interface for all inverted index creators.
  */
-public interface InvertedIndexCreator extends Closeable {
+public interface InvertedIndexCreator extends IndexCreator {
 
   /**
    * Seals the index and flushes it to disk.
    */
+  @Override
   void seal()
       throws IOException;
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/JsonIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/JsonIndexCreator.java
index 8f0af493ba9..64e42c7f35f 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/JsonIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/JsonIndexCreator.java
@@ -18,16 +18,28 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
-import java.io.Closeable;
 import java.io.IOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 
 
 /**
  * Index creator for json index.
  */
-public interface JsonIndexCreator extends Closeable {
+public interface JsonIndexCreator extends IndexCreator {
   char KEY_VALUE_SEPARATOR = '\0';
 
+  @Override
+  default void add(@Nonnull Object value, int dictId)
+      throws IOException {
+    add((String) value);
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds) {
+  }
+
   /**
    * Adds the next json value.
    */
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/TextIndexCreator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/TextIndexCreator.java
index bad466e543f..0d53772ff26 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/TextIndexCreator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/creator/TextIndexCreator.java
@@ -18,14 +18,16 @@
  */
 package org.apache.pinot.segment.spi.index.creator;
 
-import java.io.Closeable;
 import java.io.IOException;
+import org.apache.pinot.segment.spi.index.IndexCreator;
 
 
 /**
- * Index creator for text index.
+ * Index creator for text indexes.
+ *
+ * In order to create FST indexes, {@link FSTIndexCreator} must be used.
  */
-public interface TextIndexCreator extends Closeable {
+public interface TextIndexCreator extends IndexCreator {
 
   /**
    * Adds the next document.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
index dec639198bd..c5938236082 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
@@ -30,14 +30,15 @@
 import javax.annotation.Nullable;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.V1Constants.MetadataKeys.Column;
 import org.apache.pinot.segment.spi.V1Constants.MetadataKeys.Segment;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.partition.PartitionFunction;
 import org.apache.pinot.segment.spi.partition.PartitionFunctionFactory;
 import org.apache.pinot.segment.spi.partition.metadata.ColumnPartitionMetadata;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.spi.data.DateTimeFieldSpec;
 import org.apache.pinot.spi.data.DimensionFieldSpec;
 import org.apache.pinot.spi.data.FieldSpec;
@@ -65,14 +66,14 @@ public class ColumnMetadataImpl implements ColumnMetadata {
   private final int _totalNumberOfEntries;
   private final PartitionFunction _partitionFunction;
   private final Set<Integer> _partitions;
-  private final Map<ColumnIndexType, Long> _indexSizeMap;
+  private final Map<IndexType<?, ?, ?>, Long> _indexSizeMap;
   private final boolean _autoGenerated;
 
   private ColumnMetadataImpl(FieldSpec fieldSpec, int totalDocs, int cardinality, boolean sorted,
       Comparable<?> minValue, Comparable<?> maxValue, boolean minMaxValueInvalid, boolean hasDictionary,
       int columnMaxLength, int bitsPerElement, int maxNumberOfMultiValues, int totalNumberOfEntries,
       @Nullable PartitionFunction partitionFunction, @Nullable Set<Integer> partitions,
-      Map<ColumnIndexType, Long> indexSizeMap, boolean autoGenerated) {
+      Map<IndexType<?, ?, ?>, Long> indexSizeMap, boolean autoGenerated) {
     _fieldSpec = fieldSpec;
     _totalDocs = totalDocs;
     _cardinality = cardinality;
@@ -164,7 +165,7 @@ public Set<Integer> getPartitions() {
 
   @Nullable
   @Override
-  public Map<ColumnIndexType, Long> getIndexSizeMap() {
+  public Map<IndexType<?, ?, ?>, Long> getIndexSizeMap() {
     return _indexSizeMap;
   }
 
@@ -290,8 +291,8 @@ public static ColumnMetadataImpl fromPropertiesConfiguration(String column, Prop
 
     // Only support zero padding
     String padding = config.getString(Segment.SEGMENT_PADDING_CHARACTER, null);
-    Preconditions.checkState(String.valueOf(V1Constants.Str.DEFAULT_STRING_PAD_CHAR).equals(padding),
-        "Got non-zero string padding: %s", padding);
+    Preconditions.checkState(String.valueOf(V1Constants.Str.DEFAULT_STRING_PAD_CHAR)
+        .equals(StringEscapeUtils.unescapeJava(padding)), "Got non-zero string padding: %s", padding);
 
     String partitionFunctionName = config.getString(Column.getKeyFor(column, Column.PARTITION_FUNCTION), null);
     if (partitionFunctionName != null) {
@@ -345,7 +346,7 @@ public static class Builder {
     private PartitionFunction _partitionFunction;
     private Set<Integer> _partitions;
     private boolean _autoGenerated;
-    private Map<ColumnIndexType, Long> _indexSizeMap = new HashMap<>();
+    private Map<IndexType<?, ?, ?>, Long> _indexSizeMap = new HashMap<>();
 
     public Builder setFieldSpec(FieldSpec fieldSpec) {
       _fieldSpec = fieldSpec;
@@ -417,7 +418,7 @@ public Builder setPartitions(Set<Integer> partitions) {
       return this;
     }
 
-    public void setIndexSizeMap(Map<ColumnIndexType, Long> indexSizeMap) {
+    public void setIndexSizeMap(Map<IndexType<?, ?, ?>, Long> indexSizeMap) {
       _indexSizeMap = indexSizeMap;
     }
 
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/SegmentMetadataImpl.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/SegmentMetadataImpl.java
index dc2b6ded7c3..9117bb9d01e 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/SegmentMetadataImpl.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/SegmentMetadataImpl.java
@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 import org.apache.commons.configuration.Configuration;
@@ -48,9 +49,10 @@
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.V1Constants.MetadataKeys.Segment;
 import org.apache.pinot.segment.spi.creator.SegmentVersion;
+import org.apache.pinot.segment.spi.index.IndexService;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2Constants;
 import org.apache.pinot.segment.spi.index.startree.StarTreeV2Metadata;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.segment.spi.store.ColumnIndexUtils;
 import org.apache.pinot.segment.spi.store.SegmentDirectoryPaths;
 import org.apache.pinot.segment.spi.utils.SegmentMetadataUtils;
@@ -71,7 +73,7 @@ public class SegmentMetadataImpl implements SegmentMetadata {
   private static final Logger LOGGER = LoggerFactory.getLogger(SegmentMetadataImpl.class);
 
   private final File _indexDir;
-  private final Map<String, ColumnMetadata> _columnMetadataMap;
+  private final TreeMap<String, ColumnMetadata> _columnMetadataMap;
   private String _segmentName;
   private final Schema _schema;
   private long _crc = Long.MIN_VALUE;
@@ -102,7 +104,7 @@ public class SegmentMetadataImpl implements SegmentMetadata {
   public SegmentMetadataImpl(InputStream metadataPropertiesInputStream, InputStream creationMetaInputStream)
       throws IOException {
     _indexDir = null;
-    _columnMetadataMap = new HashMap<>();
+    _columnMetadataMap = new TreeMap<>();
     _schema = new Schema();
 
     PropertiesConfiguration segmentMetadataPropertiesConfiguration =
@@ -122,7 +124,7 @@ public SegmentMetadataImpl(InputStream metadataPropertiesInputStream, InputStrea
   public SegmentMetadataImpl(File indexDir)
       throws IOException {
     _indexDir = indexDir;
-    _columnMetadataMap = new HashMap<>();
+    _columnMetadataMap = new TreeMap<>();
     _schema = new Schema();
 
     PropertiesConfiguration segmentMetadataPropertiesConfiguration =
@@ -243,8 +245,8 @@ private void init(PropertiesConfiguration segmentMetadataPropertiesConfiguration
           try {
             String[] parsedKeys = ColumnIndexUtils.parseIndexMapKeys(key, _indexDir.getPath());
             if (parsedKeys[2].equals(ColumnIndexUtils.MAP_KEY_NAME_SIZE)) {
-              ColumnIndexType columnIndexType = ColumnIndexType.getValue(parsedKeys[1]);
-              _columnMetadataMap.get(parsedKeys[0]).getIndexSizeMap().put(columnIndexType, mapConfig.getLong(key));
+              IndexType<?, ?, ?> indexType = IndexService.getInstance().get(parsedKeys[1]);
+              _columnMetadataMap.get(parsedKeys[0]).getIndexSizeMap().put(indexType, mapConfig.getLong(key));
             }
           } catch (Exception e) {
             LOGGER.debug("Unable to load index metadata in {} for {}!", indexMapFile, key, e);
@@ -405,7 +407,7 @@ public String getEndOffset() {
   }
 
   @Override
-  public Map<String, ColumnMetadata> getColumnMetadataMap() {
+  public TreeMap<String, ColumnMetadata> getColumnMetadataMap() {
     return _columnMetadataMap;
   }
 
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableForwardIndex.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableForwardIndex.java
index 402992dac84..5b63c989d43 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableForwardIndex.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableForwardIndex.java
@@ -19,6 +19,8 @@
 package org.apache.pinot.segment.spi.index.mutable;
 
 import java.math.BigDecimal;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
 import org.apache.pinot.segment.spi.index.reader.ForwardIndexReaderContext;
 
@@ -27,7 +29,113 @@
  * Interface for mutable forward index (for CONSUMING segment).
  * NOTE: Mutable forward index does not use reader context to accelerate the reads.
  */
-public interface MutableForwardIndex extends ForwardIndexReader<ForwardIndexReaderContext> {
+public interface MutableForwardIndex extends ForwardIndexReader<ForwardIndexReaderContext>, MutableIndex {
+
+  @Override
+  default void add(@Nonnull Object value, int dictId, int docId) {
+    if (dictId >= 0) {
+      setDictId(docId, dictId);
+    } else {
+      switch (getStoredType()) {
+        case INT:
+          setInt(docId, (int) value);
+          break;
+        case LONG:
+          setLong(docId, (long) value);
+          break;
+        case FLOAT:
+          setFloat(docId, (float) value);
+          break;
+        case DOUBLE:
+          setDouble(docId, (double) value);
+          break;
+        case BIG_DECIMAL:
+          setBigDecimal(docId, (BigDecimal) value);
+          break;
+        case STRING:
+          setString(docId, (String) value);
+          break;
+        case BYTES:
+          setBytes(docId, (byte[]) value);
+          break;
+        case JSON:
+          if (value instanceof String) {
+            setString(docId, (String) value);
+          } else if (value instanceof byte[]) {
+            setBytes(docId, (byte[]) value);
+          }
+          break;
+        default:
+          throw new IllegalStateException();
+      }
+    }
+  }
+
+  @Override
+  default void add(@Nonnull Object[] value, @Nullable int[] dictIds, int docId) {
+    if (dictIds != null) {
+      setDictIdMV(docId, dictIds);
+    } else {
+      int length = value.length;
+      // TODO: The new int[], long[], etc objects are not actually used as arrays iterated again, so we could skip the
+      //  array copy by calling an add(Object[]) method and having overloaded indexes for each type.
+      // TODO: Longer methods are not optimized by C2 JIT. We should try to move each loop to a specific method.
+      switch (getStoredType()) {
+        case INT:
+          int[] ints = new int[length];
+          for (int i = 0; i < length; i++) {
+            ints[i] = (Integer) value[i];
+          }
+          setIntMV(docId, ints);
+          break;
+        case LONG:
+          long[] longs = new long[length];
+          for (int i = 0; i < length; i++) {
+            longs[i] = (Long) value[i];
+          }
+          setLongMV(docId, longs);
+          break;
+        case FLOAT:
+          float[] floats = new float[length];
+          for (int i = 0; i < length; i++) {
+            floats[i] = (Float) value[i];
+          }
+          setFloatMV(docId, floats);
+          break;
+        case DOUBLE:
+          double[] doubles = new double[length];
+          for (int i = 0; i < length; i++) {
+            doubles[i] = (Double) value[i];
+          }
+          setDoubleMV(docId, doubles);
+          break;
+        case STRING:
+          if (value instanceof String[]) {
+            setStringMV(docId, (String[]) value);
+          } else {
+            String[] strings = new String[length];
+            for (int i = 0; i < length; i++) {
+              strings[i] = (String) value[i];
+            }
+            setStringMV(docId, strings);
+          }
+          break;
+        case BYTES:
+          if (value instanceof byte[][]) {
+            setBytesMV(docId, (byte[][]) value);
+          } else {
+            byte[][] bytesArray = new byte[length][];
+            for (int i = 0; i < length; i++) {
+              bytesArray[i] = (byte[]) value[i];
+            }
+            setBytesMV(docId, bytesArray);
+          }
+          break;
+        default:
+          throw new IllegalStateException();
+      }
+    }
+  }
 
   /**
    * Returns the length (size in bytes) of the shortest elements inside the forward index.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableIndex.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableIndex.java
new file mode 100644
index 00000000000..2a9c4d9a56c
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableIndex.java
@@ -0,0 +1,63 @@
+/**
+ * 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.pinot.segment.spi.index.mutable;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.pinot.segment.spi.index.IndexReader;
+
+/**
+ * Implementations of this interface can be used to create indexes in realtime tables and at the same time to read them.
+ *
+ * This interface extends {@link IndexReader} as a marker interface and implementations are encouraged to extend the
+ * index specific reader. For example, MutableForwardIndex should extend ForwardIndexReader. The Java typesystem is not
+ * expressive enough to enforce this constraint.
+ *
+ * This interface explicitly do not extend {@link org.apache.pinot.segment.spi.index.IndexCreator} and usually
+ * implementations should not implement that interface. As explained in their Javadoc, IndexCreators are designed to
+ * add rows in docId order. MutableIndexes, on the other hand, can be modified adding indexes in any order and therefore
+ * their {@link #add(Object, int, int)} methods include an extra parameter that indicates the docId of the value to add.
+ */
+public interface MutableIndex extends IndexReader {
+
+  /**
+   * Adds the given single value cell to the index.
+   *
+   * Unlike {@link org.apache.pinot.segment.spi.index.IndexCreator#add(Object, int)}, rows can be added in no
+   * particular order, so the docId is required by this method.
+   *
+   * @param value The nonnull value of the cell. In case the cell was actually null, a default value is received instead
+   * @param dictId An optional dictionary value of the cell. If there is no dictionary, -1 is received
+   * @param docId The document id of the given row. A non-negative value.
+   */
+  void add(@Nonnull Object value, int dictId, int docId);
+
+  /**
+   * Adds the given multi value cell to the index.
+   *
+   * Unlike {@link org.apache.pinot.segment.spi.index.IndexCreator#add(Object[], int[])}, rows can be added in no
+   * particular order, so the docId is required by this method.
+   *
+   * @param values The nonnull value of the cell. In case the cell was actually null, an empty array is received instead
+   * @param dictIds An optional array of dictionary values. If there is no dictionary, null is received.
+   * @param docId The document id of the given row. A non-negative value.
+   */
+  void add(@Nonnull Object[] values, @Nullable int[] dictIds, int docId);
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableInvertedIndex.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableInvertedIndex.java
index c88499e6eef..9e0331c911e 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableInvertedIndex.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableInvertedIndex.java
@@ -18,11 +18,25 @@
  */
 package org.apache.pinot.segment.spi.index.mutable;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
 
-public interface MutableInvertedIndex extends InvertedIndexReader<MutableRoaringBitmap> {
+public interface MutableInvertedIndex extends InvertedIndexReader<MutableRoaringBitmap>, MutableIndex {
+  @Override
+  default void add(@Nonnull Object value, int dictId, int docId) {
+    add(dictId, docId);
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds, int docId) {
+    for (int dictId : dictIds) {
+      add(dictId, docId);
+    }
+  }
+
   /**
    * Add the docId to the posting list for the dictionary id.
    * @param dictId dictionary id
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableJsonIndex.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableJsonIndex.java
index b5e34f7bf43..99111714842 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableJsonIndex.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableJsonIndex.java
@@ -19,10 +19,27 @@
 package org.apache.pinot.segment.spi.index.mutable;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.index.reader.JsonIndexReader;
 
 
-public interface MutableJsonIndex extends JsonIndexReader {
+public interface MutableJsonIndex extends JsonIndexReader, MutableIndex {
+  @Override
+  default void add(@Nonnull Object value, int dictId, int docId) {
+    try {
+      add((String) value);
+    } catch (IOException ex) {
+      throw new UncheckedIOException(ex);
+    }
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds, int docId) {
+    throw new UnsupportedOperationException("Mutable JSON indexes are not supported for multi-valued columns");
+  }
+
   /**
    * Index a JSON document
    * @param jsonString the JSON
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableTextIndex.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableTextIndex.java
index 00e894f80d8..feddce15d1c 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableTextIndex.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/MutableTextIndex.java
@@ -18,13 +18,41 @@
  */
 package org.apache.pinot.segment.spi.index.mutable;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
 
 
-public interface MutableTextIndex extends TextIndexReader {
+public interface MutableTextIndex extends TextIndexReader, MutableIndex {
+  @Override
+  default void add(@Nonnull Object value, int dictId, int docId) {
+    add((String) value);
+  }
+
+  @Override
+  default void add(@Nonnull Object[] values, @Nullable int[] dictIds, int docId) {
+    if (values instanceof String[]) {
+      add((String[]) values);
+      return;
+    }
+
+    int length = values.length;
+    String[] strings = new String[length];
+    for (int i = 0; i < length; i++) {
+      strings[i] = (String) values[i];
+    }
+    add(strings);
+  }
+
   /**
    * Index the document
    * @param document the document as a string
    */
   void add(String document);
+
+  /**
+   * Index the multi-value document
+   * @param documents the documents as an array of strings
+   */
+  void add(String[] documents);
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/ThreadSafeMutableRoaringBitmap.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/ThreadSafeMutableRoaringBitmap.java
index 58631531f3f..05ab86628d5 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/ThreadSafeMutableRoaringBitmap.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/ThreadSafeMutableRoaringBitmap.java
@@ -36,6 +36,10 @@ public ThreadSafeMutableRoaringBitmap(int firstDocId) {
     _mutableRoaringBitmap.add(firstDocId);
   }
 
+  public ThreadSafeMutableRoaringBitmap(MutableRoaringBitmap mutableRoaringBitmap) {
+    _mutableRoaringBitmap = mutableRoaringBitmap;
+  }
+
   public synchronized void add(int docId) {
     _mutableRoaringBitmap.add(docId);
   }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexContext.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexContext.java
index 9bc8695e7e6..f6ffdc128e5 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexContext.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexContext.java
@@ -18,36 +18,97 @@
  */
 package org.apache.pinot.segment.spi.index.mutable.provider;
 
+import java.io.File;
 import java.util.Objects;
+import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.memory.PinotDataBufferMemoryManager;
-import org.apache.pinot.spi.config.table.JsonIndexConfig;
 import org.apache.pinot.spi.data.FieldSpec;
 
 
-public interface MutableIndexContext {
-  PinotDataBufferMemoryManager getMemoryManager();
+public class MutableIndexContext {
+  private final int _capacity;
+  private final FieldSpec _fieldSpec;
+  private final boolean _hasDictionary;
+  private final boolean _offHeap;
+  private final int _estimatedColSize;
+  private final int _estimatedCardinality;
+  private final int _avgNumMultiValues;
+  private final String _segmentName;
+  private final PinotDataBufferMemoryManager _memoryManager;
+  private final File _consumerDir;
+
+  public MutableIndexContext(FieldSpec fieldSpec, boolean hasDictionary, String segmentName,
+      PinotDataBufferMemoryManager memoryManager, int capacity, boolean offHeap, int estimatedColSize,
+      int estimatedCardinality, int avgNumMultiValues, File consumerDir) {
+    _fieldSpec = fieldSpec;
+    _hasDictionary = hasDictionary;
+    _segmentName = segmentName;
+    _memoryManager = memoryManager;
+    _capacity = capacity;
+    _offHeap = offHeap;
+    _estimatedColSize = estimatedColSize;
+    _estimatedCardinality = estimatedCardinality;
+    _avgNumMultiValues = avgNumMultiValues;
+    _consumerDir = consumerDir;
+  }
+
+  public PinotDataBufferMemoryManager getMemoryManager() {
+    return _memoryManager;
+  }
+
+  public String getSegmentName() {
+    return _segmentName;
+  }
+
+  public FieldSpec getFieldSpec() {
+    return _fieldSpec;
+  }
+
+  public boolean hasDictionary() {
+    return _hasDictionary;
+  }
 
-  FieldSpec getFieldSpec();
+  public int getCapacity() {
+    return _capacity;
+  }
+
+  public boolean isOffHeap() {
+    return _offHeap;
+  }
 
-  String getSegmentName();
+  public int getEstimatedColSize() {
+    return _estimatedColSize;
+  }
 
-  boolean hasDictionary();
+  public int getEstimatedCardinality() {
+    return _estimatedCardinality;
+  }
 
-  int getCapacity();
+  public int getAvgNumMultiValues() {
+    return _avgNumMultiValues;
+  }
 
-  boolean isOffHeap();
+  @Nullable
+  public File getConsumerDir() {
+    return _consumerDir;
+  }
 
-  static Builder builder() {
+  public static Builder builder() {
     return new Builder();
   }
 
-  class Builder {
+  public static class Builder {
     private FieldSpec _fieldSpec;
     private String _segmentName;
     private boolean _hasDictionary = true;
     private boolean _offHeap = true;
     private int _capacity;
     private PinotDataBufferMemoryManager _memoryManager;
+    private int _estimatedColSize;
+    private int _estimatedCardinality;
+    private int _avgNumMultiValues;
+    @Nullable
+    private File _consumerDir;
 
     public Builder withMemoryManager(PinotDataBufferMemoryManager memoryManager) {
       _memoryManager = memoryManager;
@@ -79,178 +140,30 @@ public Builder withCapacity(int capacity) {
       return this;
     }
 
-    public Common build() {
-      return new Common(Objects.requireNonNull(_fieldSpec), _hasDictionary, Objects.requireNonNull(_segmentName),
-          Objects.requireNonNull(_memoryManager), _capacity, _offHeap);
-    }
-  }
-
-  final class Common implements MutableIndexContext {
-    private final int _capacity;
-    private final FieldSpec _fieldSpec;
-    private final boolean _hasDictionary;
-    private final boolean _offHeap;
-    private final String _segmentName;
-    private final PinotDataBufferMemoryManager _memoryManager;
-
-    public Common(FieldSpec fieldSpec, boolean hasDictionary, String segmentName,
-        PinotDataBufferMemoryManager memoryManager, int capacity, boolean offHeap) {
-      _fieldSpec = fieldSpec;
-      _hasDictionary = hasDictionary;
-      _segmentName = segmentName;
-      _memoryManager = memoryManager;
-      _capacity = capacity;
-      _offHeap = offHeap;
-    }
-
-    @Override
-    public PinotDataBufferMemoryManager getMemoryManager() {
-      return _memoryManager;
-    }
-
-    @Override
-    public String getSegmentName() {
-      return _segmentName;
-    }
-
-    @Override
-    public FieldSpec getFieldSpec() {
-      return _fieldSpec;
-    }
-
-    @Override
-    public boolean hasDictionary() {
-      return _hasDictionary;
-    }
-
-    @Override
-    public int getCapacity() {
-      return _capacity;
-    }
-
-    @Override
-    public boolean isOffHeap() {
-      return _offHeap;
-    }
-
-    public Dictionary forDictionary(int estimatedColSize, int estimatedCardinality) {
-      return new Dictionary(this, estimatedColSize, estimatedCardinality);
-    }
-
-    public Forward forForwardIndex(int avgNumMultiValues) {
-      return new Forward(this, avgNumMultiValues);
-    }
-
-    public Inverted forInvertedIndex() {
-      return new Inverted(this);
-    }
-
-    public Json forJsonIndex(JsonIndexConfig jsonIndexConfig) {
-      return new Json(this, jsonIndexConfig);
-    }
-
-    public Text forTextIndex() {
-      return new Text(this);
-    }
-  }
-
-  class Wrapper implements MutableIndexContext {
-
-    private final MutableIndexContext _wrapped;
-
-    public Wrapper(MutableIndexContext wrapped) {
-      _wrapped = wrapped;
-    }
-
-    @Override
-    public PinotDataBufferMemoryManager getMemoryManager() {
-      return _wrapped.getMemoryManager();
-    }
-
-    @Override
-    public FieldSpec getFieldSpec() {
-      return _wrapped.getFieldSpec();
-    }
-
-    @Override
-    public String getSegmentName() {
-      return _wrapped.getSegmentName();
-    }
-
-    @Override
-    public boolean hasDictionary() {
-      return _wrapped.hasDictionary();
-    }
-
-    @Override
-    public int getCapacity() {
-      return _wrapped.getCapacity();
-    }
-
-    @Override
-    public boolean isOffHeap() {
-      return _wrapped.isOffHeap();
-    }
-  }
-
-  class Dictionary extends Wrapper {
-
-    private final int _estimatedColSize;
-    private final int _estimatedCardinality;
-
-    public Dictionary(MutableIndexContext wrapped, int estimatedColSize, int estimatedCardinality) {
-      super(wrapped);
+    public Builder withEstimatedColSize(int estimatedColSize) {
       _estimatedColSize = estimatedColSize;
-      _estimatedCardinality = estimatedCardinality;
-    }
-
-    public int getEstimatedColSize() {
-      return _estimatedColSize;
+      return this;
     }
 
-    public int getEstimatedCardinality() {
-      return _estimatedCardinality;
+    public Builder withEstimatedCardinality(int estimatedCardinality) {
+      _estimatedCardinality = estimatedCardinality;
+      return this;
     }
-  }
-
-  class Forward extends Wrapper {
-
-    private final int _avgNumMultiValues;
 
-    public Forward(MutableIndexContext wrapped, int avgNumMultiValues) {
-      super(wrapped);
+    public Builder withAvgNumMultiValues(int avgNumMultiValues) {
       _avgNumMultiValues = avgNumMultiValues;
+      return this;
     }
 
-    public int getAvgNumMultiValues() {
-      return _avgNumMultiValues;
-    }
-  }
-
-  class Inverted extends Wrapper {
-
-    public Inverted(MutableIndexContext wrapped) {
-      super(wrapped);
-    }
-  }
-
-  class Json extends Wrapper {
-    private final JsonIndexConfig _jsonIndexConfig;
-
-    public Json(MutableIndexContext wrapped, JsonIndexConfig jsonIndexConfig) {
-      super(wrapped);
-      _jsonIndexConfig = jsonIndexConfig;
-    }
-
-    public JsonIndexConfig getJsonIndexConfig() {
-      return _jsonIndexConfig;
+    public Builder withConsumerDir(File consumerDir) {
+      _consumerDir = consumerDir;
+      return this;
     }
-  }
-
-  class Text extends Wrapper {
 
-    public Text(MutableIndexContext wrapped) {
-      super(wrapped);
+    public MutableIndexContext build() {
+      return new MutableIndexContext(Objects.requireNonNull(_fieldSpec), _hasDictionary,
+          Objects.requireNonNull(_segmentName), Objects.requireNonNull(_memoryManager), _capacity, _offHeap,
+          _estimatedColSize, _estimatedCardinality, _avgNumMultiValues, _consumerDir);
     }
   }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexProvider.java
deleted file mode 100644
index 60f07c53744..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableIndexProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.mutable.provider;
-
-public interface MutableIndexProvider
-    extends MutableForwardIndexProvider, MutableInvertedIndexProvider, MutableTextIndexReaderProvider,
-            MutableJsonIndexProvider, MutableDictionaryProvider {
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableInvertedIndexProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableInvertedIndexProvider.java
deleted file mode 100644
index d67d5aa990d..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/mutable/provider/MutableInvertedIndexProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.mutable.provider;
-
-import org.apache.pinot.segment.spi.index.mutable.MutableInvertedIndex;
-
-
-public interface MutableInvertedIndexProvider {
-  MutableInvertedIndex newInvertedIndex(MutableIndexContext.Inverted context);
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/BloomFilterReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/BloomFilterReader.java
index dccc18eb85f..5b63aa6717b 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/BloomFilterReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/BloomFilterReader.java
@@ -18,13 +18,13 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
+import org.apache.pinot.segment.spi.index.IndexReader;
 
 
 /**
  * Interface for bloom filter reader.
  */
-public interface BloomFilterReader extends Closeable {
+public interface BloomFilterReader extends IndexReader {
 
   /**
    * Returns {@code true} if the given value might have been put in this bloom filer, {@code false} otherwise.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/Dictionary.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/Dictionary.java
index a5ec723d223..9e7fe305b06 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/Dictionary.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/Dictionary.java
@@ -19,9 +19,10 @@
 package org.apache.pinot.segment.spi.index.reader;
 
 import it.unimi.dsi.fastutil.ints.IntSet;
-import java.io.Closeable;
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
+import org.apache.pinot.segment.spi.index.IndexReader;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.ByteArray;
 
@@ -31,7 +32,7 @@
  * supported. Type conversion between STRING and BYTES via Hex encoding/decoding should be supported.
  */
 @SuppressWarnings("rawtypes")
-public interface Dictionary extends Closeable {
+public interface Dictionary extends IndexReader {
   int NULL_VALUE_INDEX = -1;
 
   /**
@@ -242,4 +243,18 @@ default void readBytesValues(int[] dictIds, int length, byte[][] outValues) {
       outValues[i] = getBytesValue(dictIds[i]);
     }
   }
+
+  /**
+   * Returns the dictIds for the given sorted values. This method is for the IN/NOT IN predicate evaluation.
+   * @param sortedValues
+   * @param dictIds
+   */
+  default void getDictIds(List<String> sortedValues, IntSet dictIds) {
+    for (String value : sortedValues) {
+      int dictId = indexOf(value);
+      if (dictId >= 0) {
+        dictIds.add(dictId);
+      }
+    }
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/ForwardIndexReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/ForwardIndexReader.java
index 86331a28ae6..35f7a811177 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/ForwardIndexReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/ForwardIndexReader.java
@@ -18,10 +18,10 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
 import java.math.BigDecimal;
 import javax.annotation.Nullable;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.segment.spi.index.IndexReader;
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.apache.pinot.spi.utils.BigDecimalUtils;
 
@@ -31,7 +31,7 @@
  *
  * @param <T> Type of the ReaderContext
  */
-public interface ForwardIndexReader<T extends ForwardIndexReaderContext> extends Closeable {
+public interface ForwardIndexReader<T extends ForwardIndexReaderContext> extends IndexReader {
 
   /**
    * Returns {@code true} if the forward index is dictionary-encoded, {@code false} if it is raw.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexReader.java
index 664916152de..fd032fe9e5a 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexReader.java
@@ -18,14 +18,14 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
+import org.apache.pinot.segment.spi.index.IndexReader;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 
 
 /**
  * Reader of the H3 index.
  */
-public interface H3IndexReader extends Closeable {
+public interface H3IndexReader extends IndexReader {
 
   /**
    * Gets the matching Doc IDs of the given H3 index ID as bitmaps.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexResolution.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexResolution.java
index 6bbb3bc1a42..c8e05b6f864 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexResolution.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/H3IndexResolution.java
@@ -18,16 +18,30 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.type.CollectionLikeType;
+import com.fasterxml.jackson.databind.util.StdConverter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
- * Stores the resolutions for an index. There are in total of H3 resolutions https://h3geo
- * .org/#/documentation/core-library/resolution-table
+ * Stores the resolutions for an index. There are in total of H3 resolutions
+ * https://h3geo.org/#/documentation/core-library/resolution-table
  * To efficiently serialize the resolutions, we use two bytes for encoding th enabled resolutions. The resolution level
  * maps to the corresponding bit.
  */
+@JsonSerialize(converter = H3IndexResolution.ToIntListConverted.class)
+@JsonDeserialize(using = H3IndexResolution.Deserializator.class)
 public class H3IndexResolution {
   private short _resolutions;
 
@@ -66,7 +80,60 @@ public List<Integer> getResolutions() {
     return res;
   }
 
+  @JsonIgnore
   public int getLowestResolution() {
     return Integer.numberOfTrailingZeros(_resolutions);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    H3IndexResolution that = (H3IndexResolution) o;
+    return _resolutions == that._resolutions;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_resolutions);
+  }
+
+  public static class ToIntListConverted extends StdConverter<H3IndexResolution, List<Integer>> {
+    @Override
+    public List<Integer> convert(H3IndexResolution value) {
+      return value.getResolutions();
+    }
+  }
+
+  public static class Deserializator extends StdDeserializer<H3IndexResolution> {
+    public Deserializator() {
+      super(H3IndexResolution.class);
+    }
+
+    @Override
+    public H3IndexResolution deserialize(JsonParser p, DeserializationContext ctxt)
+        throws IOException, JsonProcessingException {
+      switch (p.currentToken()) {
+        case VALUE_NUMBER_INT: {
+          long longValue = p.getLongValue();
+          if (longValue > Short.MAX_VALUE || longValue < Short.MIN_VALUE) {
+            throw new JsonParseException(p, "Resolution value is outside the short int range");
+          }
+          return new H3IndexResolution((short) longValue);
+        }
+        case START_ARRAY: {
+          CollectionLikeType arrayType = ctxt.getTypeFactory().constructCollectionLikeType(List.class, Integer.class);
+          List<Integer> resolutions = ctxt.readValue(p, arrayType);
+          return new H3IndexResolution(resolutions);
+        }
+        default: {
+          throw new JsonParseException(p, "Expecting number or array, but found " + p.currentToken());
+        }
+      }
+    }
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/InvertedIndexReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/InvertedIndexReader.java
index 00a73b589bd..e22aa67b8f2 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/InvertedIndexReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/InvertedIndexReader.java
@@ -18,10 +18,10 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
+import org.apache.pinot.segment.spi.index.IndexReader;
 
 
-public interface InvertedIndexReader<T> extends Closeable {
+public interface InvertedIndexReader<T> extends IndexReader {
 
   /**
    * Returns the document ids for the given dictionary id.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/JsonIndexReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/JsonIndexReader.java
index fa8d4a49e0d..b57d219e043 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/JsonIndexReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/JsonIndexReader.java
@@ -18,14 +18,14 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
+import org.apache.pinot.segment.spi.index.IndexReader;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
 
 /**
  * Reader for json index.
  */
-public interface JsonIndexReader extends Closeable {
+public interface JsonIndexReader extends IndexReader {
 
   /**
    * Returns the matching document ids for the given filter.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/NullValueVectorReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/NullValueVectorReader.java
index 3aa3d3d9397..d6dc63e6f74 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/NullValueVectorReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/NullValueVectorReader.java
@@ -18,6 +18,8 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
+import java.io.IOException;
+import org.apache.pinot.segment.spi.index.IndexReader;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 
 
@@ -26,7 +28,7 @@
  * primarily used to check if a particular column value corresponding to
  * a document ID is null or not.
  */
-public interface NullValueVectorReader {
+public interface NullValueVectorReader extends IndexReader {
 
   /**
    * Check if the given docId has a null value in the corresponding column
@@ -40,4 +42,9 @@ public interface NullValueVectorReader {
    * Return the underlying null bitmap (used in query execution)
    */
   ImmutableRoaringBitmap getNullBitmap();
+
+  @Override
+  default void close()
+      throws IOException {
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/RangeIndexReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/RangeIndexReader.java
index f457056f178..6ddc1ef5595 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/RangeIndexReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/RangeIndexReader.java
@@ -18,15 +18,14 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
 import javax.annotation.Nullable;
-
+import org.apache.pinot.segment.spi.index.IndexReader;
 
 /**
  * Interface for indexed range queries
  * @param <T>
  */
-public interface RangeIndexReader<T> extends Closeable {
+public interface RangeIndexReader<T> extends IndexReader {
 
   /**
    * @return true if the results are exact and don't need refinement by scanning.
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/TextIndexReader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/TextIndexReader.java
index de8abd00627..aba719d67b4 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/TextIndexReader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/TextIndexReader.java
@@ -18,12 +18,12 @@
  */
 package org.apache.pinot.segment.spi.index.reader;
 
-import java.io.Closeable;
+import org.apache.pinot.segment.spi.index.IndexReader;
 import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
 import org.roaringbitmap.buffer.MutableRoaringBitmap;
 
 
-public interface TextIndexReader extends Closeable {
+public interface TextIndexReader extends IndexReader {
 
   /**
    * Returns the matching dictionary ids for the given search query (optional).
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/ForwardIndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/ForwardIndexReaderProvider.java
deleted file mode 100644
index cc90c230f34..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/ForwardIndexReaderProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.ForwardIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-
-
-public interface ForwardIndexReaderProvider {
-
-  /**
-   * Creates a {@see ForwardIndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a forward index reader
-   * @throws IOException if reading from the buffer fails.
-   */
-  ForwardIndexReader<?> newForwardIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/GeospatialIndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/GeospatialIndexReaderProvider.java
deleted file mode 100644
index 0de4d63e08e..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/GeospatialIndexReaderProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-
-
-public interface GeospatialIndexReaderProvider {
-  /**
-   * Creates a {@see H3IndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a geospatial index reader
-   * @throws IOException if reading from the buffer fails.
-   */
-  H3IndexReader newGeospatialIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/IndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/IndexReaderProvider.java
deleted file mode 100644
index 0db3e4d789b..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/IndexReaderProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-public interface IndexReaderProvider
-    extends BloomFilterReaderProvider, ForwardIndexReaderProvider, GeospatialIndexReaderProvider,
-            InvertedIndexReaderProvider, JsonIndexReaderProvider, RangeIndexReaderProvider, SortedIndexReaderProvider,
-            TextIndexReaderProvider {
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/InvertedIndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/InvertedIndexReaderProvider.java
deleted file mode 100644
index 0aad43dd3b8..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/InvertedIndexReaderProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.InvertedIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-
-
-public interface InvertedIndexReaderProvider {
-
-  /**
-   * Creates a {@see InvertedIndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return an inverted index reader
-   * @throws IOException if reading from the buffer fails.
-   */
-  InvertedIndexReader<?> newInvertedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/RangeIndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/RangeIndexReaderProvider.java
deleted file mode 100644
index 80fee404890..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/RangeIndexReaderProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.RangeIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-
-
-public interface RangeIndexReaderProvider {
-
-  /**
-   * Creates a {@see RangeIndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a range index reader
-   * @throws IOException if reading from the buffer fails.
-   */
-  RangeIndexReader<?> newRangeIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/SortedIndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/SortedIndexReaderProvider.java
deleted file mode 100644
index d04ed1dd010..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/SortedIndexReaderProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.SortedIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-
-
-public interface SortedIndexReaderProvider {
-
-  /**
-   * Creates a {@see SortedIndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a sorted index reader
-   * @throws IOException if reading from the buffer fails.
-   */
-  SortedIndexReader<?> newSortedIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/TextIndexReaderProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/TextIndexReaderProvider.java
deleted file mode 100644
index bc2e6000769..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/reader/provider/TextIndexReaderProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.index.reader.provider;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import javax.annotation.Nullable;
-import org.apache.pinot.segment.spi.ColumnMetadata;
-import org.apache.pinot.segment.spi.index.reader.TextIndexReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-
-
-public interface TextIndexReaderProvider {
-
-  /**
-   * Creates a {@see TextIndexReader}
-   * @param dataBuffer the buffer, the caller is responsible for closing it
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a text index reader
-   * @throws IOException if reading from the buffer fails.
-   */
-  TextIndexReader newFSTIndexReader(PinotDataBuffer dataBuffer, ColumnMetadata metadata)
-      throws IOException;
-
-  /**
-   * Creates a {@see TextIndexReader}
-   * @param file the file
-   * @param metadata the column metadata, may be used to select a reader if the buffer does not start with a magic byte.
-   * @return a text index reader
-   */
-  TextIndexReader newTextIndexReader(File file, ColumnMetadata metadata,
-      @Nullable Map<String, String> textIndexProperties);
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/AggregationFunctionColumnPair.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/AggregationFunctionColumnPair.java
index 86f0cc7cd10..e77c65d0285 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/AggregationFunctionColumnPair.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/AggregationFunctionColumnPair.java
@@ -18,10 +18,11 @@
  */
 package org.apache.pinot.segment.spi.index.startree;
 
+import java.util.Comparator;
 import org.apache.pinot.segment.spi.AggregationFunctionType;
 
 
-public class AggregationFunctionColumnPair {
+public class AggregationFunctionColumnPair implements Comparable<AggregationFunctionColumnPair> {
   public static final String DELIMITER = "__";
   public static final String STAR = "*";
   public static final AggregationFunctionColumnPair COUNT_STAR =
@@ -86,4 +87,11 @@ public boolean equals(Object obj) {
   public String toString() {
     return toColumnName();
   }
+
+  @Override
+  public int compareTo(AggregationFunctionColumnPair other) {
+    return Comparator.comparing((AggregationFunctionColumnPair o) -> o._column)
+        .thenComparing((AggregationFunctionColumnPair o) -> o._functionType)
+        .compare(this, other);
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/StarTreeV2Constants.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/StarTreeV2Constants.java
index 0d2dba6395b..1f5df2ab5e9 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/StarTreeV2Constants.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/startree/StarTreeV2Constants.java
@@ -32,6 +32,7 @@ private StarTreeV2Constants() {
   // File names before combining
   public static final String STAR_TREE_TEMP_DIR = "star_tree_tmp";
   public static final String STAR_TREE_INDEX_FILE_NAME = "star_tree.index";
+  public static final String EXISTING_STAR_TREE_TEMP_DIR = "existing_star_tree_tmp";
 
   // NOTE: because of bit compression, we cannot store -1 for star in forward index. Because star value should never be
   // accessed, we can simply put 0 as the place holder
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/loader/SegmentDirectoryLoader.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/loader/SegmentDirectoryLoader.java
index 591c0997b5e..cf945f83f5e 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/loader/SegmentDirectoryLoader.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/loader/SegmentDirectoryLoader.java
@@ -42,4 +42,13 @@ SegmentDirectory load(URI indexDir, SegmentDirectoryLoaderContext segmentDirecto
   default void delete(SegmentDirectoryLoaderContext segmentDirectoryLoaderContext)
       throws Exception {
   }
+
+  /**
+   * Based on the zkMetadata's and current segment tier, checks whether or not tier migration is needed
+   * @param targetTier segment's ZKMetadata's tier
+   * @param currentTier Current segment tier
+   */
+  default boolean needsTierMigration(String targetTier, String currentTier) {
+    return false;
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/BasePinotLBuffer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/BasePinotLBuffer.java
index 115212db691..0718c99082f 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/BasePinotLBuffer.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/BasePinotLBuffer.java
@@ -61,25 +61,12 @@ public void putByte(long offset, byte value) {
     _buffer.putByte(offset, value);
   }
 
-  @Override
-  public void copyTo(long offset, byte[] buffer, int destOffset, int size) {
-    if (size <= BULK_BYTES_PROCESSING_THRESHOLD) {
-      int end = destOffset + size;
-      for (int i = destOffset; i < end; i++) {
-        buffer[i] = _buffer.getByte(offset++);
-      }
-    } else {
-      _buffer.toDirectByteBuffer(offset, size).get(buffer, destOffset, size);
-    }
-  }
-
   @Override
   public void copyTo(long offset, PinotDataBuffer buffer, long destOffset, long size) {
     if (buffer instanceof BasePinotLBuffer) {
       _buffer.copyTo(offset, ((BasePinotLBuffer) buffer)._buffer, destOffset, size);
     } else {
-      assert size <= Integer.MAX_VALUE;
-      buffer.readFrom(destOffset, _buffer.toDirectByteBuffer(offset, (int) size));
+      super.copyTo(offset, buffer, destOffset, size);
     }
   }
 
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/ByteBufferPinotBufferFactory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/ByteBufferPinotBufferFactory.java
new file mode 100644
index 00000000000..507b61b727c
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/ByteBufferPinotBufferFactory.java
@@ -0,0 +1,50 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import com.google.common.base.Preconditions;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+
+
+public class ByteBufferPinotBufferFactory implements PinotBufferFactory {
+  @Override
+  public PinotDataBuffer allocateDirect(long size, ByteOrder byteOrder) {
+    Preconditions.checkArgument(size <= Integer.MAX_VALUE,
+        "Trying to allocate %s bytes when max is %s", size, Integer.MAX_VALUE);
+    return PinotByteBuffer.allocateDirect((int) size, byteOrder);
+  }
+
+  @Override
+  public PinotDataBuffer readFile(File file, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    Preconditions.checkArgument(size <= Integer.MAX_VALUE,
+        "Trying to allocate %s bytes when max is %s", size, Integer.MAX_VALUE);
+    return PinotByteBuffer.loadFile(file, offset, (int) size, byteOrder);
+  }
+
+  @Override
+  public PinotDataBuffer mapFile(File file, boolean readOnly, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    Preconditions.checkArgument(size <= Integer.MAX_VALUE,
+        "Trying to allocate {} bytes when max is {}", size, Integer.MAX_VALUE);
+    return PinotByteBuffer.mapFile(file, readOnly, offset, (int) size, byteOrder);
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/ByteBufferUtil.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/ByteBufferUtil.java
new file mode 100644
index 00000000000..6e9bbe420a6
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/ByteBufferUtil.java
@@ -0,0 +1,117 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import com.google.common.collect.Lists;
+import java.lang.reflect.Constructor;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+
+/**
+ * A utility class used to allocate a ByteBuffer pointing to an already used address in memory.
+ *
+ * This feature is used internally by the JVM but there is no way to directly call these internal methods from user Java
+ * code. By using reflection, this class let us call these methods. Given that these methods are private, they may
+ * change from JVM to JVM and in fact they do. Therefore this class tries several methods that we know that exists in
+ * different JVM versions.
+ */
+public class ByteBufferUtil {
+
+  private static final ByteBufferCreator CREATOR;
+  private static final List<CreatorSupplier> _SUPPLIERS = Lists.newArrayList(
+      // From Java 21
+      () -> {
+        Class<?> memorySegmentProxyClass = Class.forName("java.lang.foreign.MemorySegment");
+        Constructor<? extends ByteBuffer> dbbCC =
+            (Constructor<? extends ByteBuffer>) Class.forName("java.nio.DirectByteBuffer")
+                .getDeclaredConstructor(Long.TYPE, Integer.TYPE, Object.class, memorySegmentProxyClass);
+        return (addr, size, att) -> {
+          dbbCC.setAccessible(true);
+          try {
+            return dbbCC.newInstance(Long.valueOf(addr), Integer.valueOf(size), att, null);
+          } catch (Exception e) {
+            throw new IllegalStateException("Failed to create DirectByteBuffer", e);
+          }
+        };
+      },
+      // From Java 17 to 20
+      () -> {
+        Constructor<? extends ByteBuffer> dbbCC =
+            (Constructor<? extends ByteBuffer>) Class.forName("java.nio.DirectByteBuffer")
+                .getDeclaredConstructor(Long.TYPE, Integer.TYPE, Object.class);
+        return (addr, size, att) -> {
+          dbbCC.setAccessible(true);
+          try {
+            return dbbCC.newInstance(Long.valueOf(addr), Integer.valueOf(size), att);
+          } catch (Exception e) {
+            throw new IllegalStateException("Failed to create DirectByteBuffer", e);
+          }
+        };
+      },
+      // Java < 17
+      () -> {
+        Constructor<? extends ByteBuffer> dbbCC =
+            (Constructor<? extends ByteBuffer>) Class.forName("java.nio.DirectByteBuffer")
+                .getDeclaredConstructor(Long.TYPE, Integer.TYPE);
+        return (addr, size, att) -> {
+          dbbCC.setAccessible(true);
+          try {
+            return dbbCC.newInstance(Long.valueOf(addr), Integer.valueOf(size));
+          } catch (Exception e) {
+            throw new IllegalStateException("Failed to create DirectByteBuffer", e);
+          }
+        };
+      }
+  );
+
+  private ByteBufferUtil() {
+  }
+
+  static {
+    ByteBufferCreator creator = null;
+    Exception firstException = null;
+    for (CreatorSupplier supplier : _SUPPLIERS) {
+      try {
+        creator = supplier.createCreator();
+      } catch (ClassNotFoundException | NoSuchMethodException e) {
+        if (firstException == null) {
+          firstException = e;
+        }
+      }
+    }
+    if (creator == null) {
+      throw new IllegalStateException("Cannot find a way to instantiate DirectByteBuffer. "
+          + "Please verify you are using a supported JVM", firstException);
+    }
+    CREATOR = creator;
+  }
+
+  public static ByteBuffer newDirectByteBuffer(long addr, int size, Object att) {
+    return CREATOR.newDirectByteBuffer(addr, size, att);
+  }
+
+  private interface CreatorSupplier {
+    ByteBufferCreator createCreator() throws ClassNotFoundException, NoSuchMethodException;
+  }
+
+  private interface ByteBufferCreator {
+    ByteBuffer newDirectByteBuffer(long addr, int size, Object att);
+  }
+}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ArrayBasedDocIdIterator.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/LArrayPinotBufferFactory.java
similarity index 51%
rename from pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ArrayBasedDocIdIterator.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/LArrayPinotBufferFactory.java
index 3b8591bfed0..d547c88acc8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ArrayBasedDocIdIterator.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/LArrayPinotBufferFactory.java
@@ -16,38 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.core.operator.dociditerators;
+package org.apache.pinot.segment.spi.memory;
 
-import org.apache.pinot.core.common.BlockDocIdIterator;
-import org.apache.pinot.segment.spi.Constants;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
 
 
-/**
- * The {@code ArrayBasedDocIdIterator} is the iterator for ArrayBasedDocIdSet. It iterates on an array of matching
- * document ids.
- */
-public final class ArrayBasedDocIdIterator implements BlockDocIdIterator {
-  private final int[] _docIds;
-  private final int _searchableLength;
-
-  private int _nextIndex = 0;
-
-  public ArrayBasedDocIdIterator(int[] docIds, int searchableLength) {
-    _docIds = docIds;
-    _searchableLength = searchableLength;
-  }
-
+public class LArrayPinotBufferFactory implements PinotBufferFactory {
   @Override
-  public int next() {
-    if (_nextIndex < _searchableLength) {
-      return _docIds[_nextIndex++];
+  public PinotDataBuffer allocateDirect(long size, ByteOrder byteOrder) {
+    if (byteOrder == ByteOrder.nativeOrder()) {
+      return PinotNativeOrderLBuffer.allocateDirect(size);
     } else {
-      return Constants.EOF;
+      return PinotNonNativeOrderLBuffer.allocateDirect(size);
     }
   }
 
   @Override
-  public int advance(int targetDocId) {
-    throw new UnsupportedOperationException();
+  public PinotDataBuffer mapFile(File file, boolean readOnly, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    if (byteOrder == ByteOrder.nativeOrder()) {
+      return PinotNativeOrderLBuffer.mapFile(file, readOnly, offset, size);
+    } else {
+      return PinotNonNativeOrderLBuffer.mapFile(file, readOnly, offset, size);
+    }
   }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/NonNativePinotDataBuffer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/NonNativePinotDataBuffer.java
new file mode 100644
index 00000000000..755345666f6
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/NonNativePinotDataBuffer.java
@@ -0,0 +1,253 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+
+public class NonNativePinotDataBuffer extends PinotDataBuffer {
+  private final PinotDataBuffer _nativeBuffer;
+
+  public NonNativePinotDataBuffer(PinotDataBuffer nativeBuffer) {
+    super(nativeBuffer.isCloseable());
+    _nativeBuffer = nativeBuffer;
+  }
+
+  @Override
+  public PinotDataBuffer view(long start, long end, ByteOrder byteOrder) {
+    PinotDataBuffer nativeView = _nativeBuffer.view(start, end);
+    if (byteOrder == ByteOrder.nativeOrder()) {
+      return nativeView;
+    }
+    return new NonNativePinotDataBuffer(nativeView);
+  }
+
+  /*
+  Methods that require special byte order treatment
+  */
+
+  @Override
+  public char getChar(int offset) {
+    return Character.reverseBytes(_nativeBuffer.getChar(offset));
+  }
+
+  @Override
+  public char getChar(long offset) {
+    return Character.reverseBytes(_nativeBuffer.getChar(offset));
+  }
+
+  @Override
+  public void putChar(int offset, char value) {
+    _nativeBuffer.putChar(offset, Character.reverseBytes(value));
+  }
+
+  @Override
+  public void putChar(long offset, char value) {
+    _nativeBuffer.putChar(offset, Character.reverseBytes(value));
+  }
+
+  @Override
+  public short getShort(int offset) {
+    return Short.reverseBytes(_nativeBuffer.getShort(offset));
+  }
+
+  @Override
+  public short getShort(long offset) {
+    return Short.reverseBytes(_nativeBuffer.getShort(offset));
+  }
+
+  @Override
+  public void putShort(int offset, short value) {
+    _nativeBuffer.putShort(offset, Short.reverseBytes(value));
+  }
+
+  @Override
+  public void putShort(long offset, short value) {
+    _nativeBuffer.putShort(offset, Short.reverseBytes(value));
+  }
+
+  @Override
+  public int getInt(int offset) {
+    return Integer.reverseBytes(_nativeBuffer.getInt(offset));
+  }
+
+  @Override
+  public int getInt(long offset) {
+    return Integer.reverseBytes(_nativeBuffer.getInt(offset));
+  }
+
+  @Override
+  public void putInt(int offset, int value) {
+    _nativeBuffer.putInt(offset, Integer.reverseBytes(value));
+  }
+
+  @Override
+  public void putInt(long offset, int value) {
+    _nativeBuffer.putInt(offset, Integer.reverseBytes(value));
+  }
+
+  @Override
+  public long getLong(int offset) {
+    return Long.reverseBytes(_nativeBuffer.getLong(offset));
+  }
+
+  @Override
+  public long getLong(long offset) {
+    return Long.reverseBytes(_nativeBuffer.getLong(offset));
+  }
+
+  @Override
+  public void putLong(int offset, long value) {
+    _nativeBuffer.putLong(offset, Long.reverseBytes(value));
+  }
+
+  @Override
+  public void putLong(long offset, long value) {
+    _nativeBuffer.putLong(offset, Long.reverseBytes(value));
+  }
+
+  @Override
+  public float getFloat(int offset) {
+    return Float.intBitsToFloat(Integer.reverseBytes(_nativeBuffer.getInt(offset)));
+  }
+
+  @Override
+  public float getFloat(long offset) {
+    return Float.intBitsToFloat(Integer.reverseBytes(_nativeBuffer.getInt(offset)));
+  }
+
+  @Override
+  public void putFloat(int offset, float value) {
+    _nativeBuffer.putInt(offset, Integer.reverseBytes(Float.floatToRawIntBits(value)));
+  }
+
+  @Override
+  public void putFloat(long offset, float value) {
+    _nativeBuffer.putInt(offset, Integer.reverseBytes(Float.floatToRawIntBits(value)));
+  }
+
+  @Override
+  public double getDouble(int offset) {
+    return Double.longBitsToDouble(Long.reverseBytes(_nativeBuffer.getLong(offset)));
+  }
+
+  @Override
+  public double getDouble(long offset) {
+    return Double.longBitsToDouble(Long.reverseBytes(_nativeBuffer.getLong(offset)));
+  }
+
+  @Override
+  public void putDouble(int offset, double value) {
+    _nativeBuffer.putLong(offset, Long.reverseBytes(Double.doubleToRawLongBits(value)));
+  }
+
+  @Override
+  public void putDouble(long offset, double value) {
+    _nativeBuffer.putLong(offset, Long.reverseBytes(Double.doubleToRawLongBits(value)));
+  }
+
+  @Override
+  public ByteOrder order() {
+    return NON_NATIVE_ORDER;
+  }
+
+  /*
+   Methods that can be directly delegated on the native buffer
+   */
+
+  @Override
+  public byte getByte(int offset) {
+    return _nativeBuffer.getByte(offset);
+  }
+
+  @Override
+  public byte getByte(long offset) {
+    return _nativeBuffer.getByte(offset);
+  }
+
+  @Override
+  public void putByte(int offset, byte value) {
+    _nativeBuffer.putByte(offset, value);
+  }
+
+  @Override
+  public void putByte(long offset, byte value) {
+    _nativeBuffer.putByte(offset, value);
+  }
+
+  @Override
+  public void copyTo(long offset, byte[] buffer, int destOffset, int size) {
+    _nativeBuffer.copyTo(offset, buffer, destOffset, size);
+  }
+
+  @Override
+  public void copyTo(long offset, byte[] buffer) {
+    _nativeBuffer.copyTo(offset, buffer);
+  }
+
+  @Override
+  public void copyTo(long offset, PinotDataBuffer buffer, long destOffset, long size) {
+    _nativeBuffer.copyTo(offset, buffer, destOffset, size);
+  }
+
+  @Override
+  public void readFrom(long offset, byte[] buffer, int srcOffset, int size) {
+    _nativeBuffer.readFrom(offset, buffer, srcOffset, size);
+  }
+
+  @Override
+  public void readFrom(long offset, byte[] buffer) {
+    _nativeBuffer.readFrom(offset, buffer);
+  }
+
+  @Override
+  public void readFrom(long offset, ByteBuffer buffer) {
+    _nativeBuffer.readFrom(offset, buffer);
+  }
+
+  @Override
+  public void readFrom(long offset, File file, long srcOffset, long size)
+      throws IOException {
+    _nativeBuffer.readFrom(offset, file, srcOffset, size);
+  }
+
+  @Override
+  public ByteBuffer toDirectByteBuffer(long offset, int size, ByteOrder byteOrder) {
+    return _nativeBuffer.toDirectByteBuffer(offset, size, byteOrder);
+  }
+
+  @Override
+  public long size() {
+    return _nativeBuffer.size();
+  }
+
+  @Override
+  public void flush() {
+    _nativeBuffer.flush();
+  }
+
+  @Override
+  public void release()
+      throws IOException {
+    _nativeBuffer.release();
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotBufferFactory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotBufferFactory.java
new file mode 100644
index 00000000000..cf0b349f480
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotBufferFactory.java
@@ -0,0 +1,76 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+
+
+/**
+ * A factory used to create {@link PinotDataBuffer} instances.
+ *
+ * Normal code should not use factories directly. {@link PinotDataBuffer} static methods should be used instead. These
+ * static methods delegate on a factory and also accounts the amount of memory that is being reserved and export that
+ * as a {@link org.apache.pinot.spi.metrics.PinotMetric}.
+ */
+public interface PinotBufferFactory {
+
+  /**
+   * Returns a buffer with at least the given number of bytes. The buffer should be backed by direct memory.
+   * @param size the number of bytes to allocate. A non-negative value.
+   * @param byteOrder the byte order to use. Remember to do not use native if the buffer is going to be persisted.
+   * @return the buffer to use. The ownership is transferred to the caller.
+   */
+  PinotDataBuffer allocateDirect(long size, ByteOrder byteOrder);
+
+  /**
+   * Copies the content of a file into a buffer.
+   * <p>
+   * Further modifications on the file or the buffer will not affect each other.
+   * </p>
+   * @param file The file to be read.
+   * @param offset The offset in the file where the read will start.
+   * @param size The number of bytes that will be read.
+   * @param byteOrder The byte order the buffer will use.
+   * @return a buffer with a copy of content of the file. The ownership is transferred to the caller.
+   */
+  default PinotDataBuffer readFile(File file, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    PinotDataBuffer buffer = allocateDirect(size, byteOrder);
+    buffer.readFrom(0, file, offset, size);
+    return buffer;
+  }
+
+  /**
+   * Maps a section of a file in memory.
+   * <p>
+   * Each OS has its own restrictions on memory mapped files. For example, Linux (and possible other POSIX base OS)
+   * requires the offset to be page aligned. This method tries abstract all these requirements from the caller.
+   * </p>
+   * @param file the file to be mapped.
+   * @param readOnly whether the map should be read only or not.
+   * @param offset the offset in the file where the map should start. Doesn't have to be page aligned.
+   * @param size the number of bytes that will be mapped.
+   * @param byteOrder the byte order the buffer will use.
+   * @return a buffer with a copy of content of the file. The ownership is transferred to the caller.
+   */
+  PinotDataBuffer mapFile(File file, boolean readOnly, long offset, long size, ByteOrder byteOrder)
+      throws IOException;
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
index 7a2a494732b..9bd36aeb38d 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
@@ -22,8 +22,10 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +33,10 @@
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.segment.spi.memory.unsafe.UnsafePinotBufferFactory;
+import org.apache.pinot.segment.spi.utils.JavaVersion;
+import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.plugin.PluginManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,6 +105,102 @@ public String toString() {
   private static final AtomicLong ALLOCATION_FAILURE_COUNT = new AtomicLong();
   private static final Map<PinotDataBuffer, BufferContext> BUFFER_CONTEXT_MAP = new WeakHashMap<>();
 
+  /**
+   * Configuration key used to change the offheap buffer factory used by Pinot.
+   * Value should be the qualified path of a class that extends {@link PinotBufferFactory} and has empty
+   * constructor.
+   */
+  private static final String OFFHEAP_BUFFER_FACTORY_CONFIG = "pinot.offheap.buffer.factory";
+  /**
+   * Boolean configuration that decides whether to allocate using {@link ByteBufferPinotBufferFactory} when the buffer
+   * to allocate fits in a {@link ByteBuffer}.
+   *
+   * Defaults to true.
+   */
+  private static final String OFFHEAP_BUFFER_PRIORITIZE_BYTE_BUFFER_CONFIG = "pinot.offheap.prioritize.bytebuffer";
+
+  /**
+   * The default {@link PinotBufferFactory} used by all threads that do not define their own factory.
+   */
+  private static PinotBufferFactory _defaultFactory = createDefaultFactory();
+  /**
+   * A thread local variable that can be used to customize the {@link PinotBufferFactory} used on tests. This is mostly
+   * useful in tests.
+   */
+  private static final ThreadLocal<PinotBufferFactory> _FACTORY = new ThreadLocal<>();
+
+  /**
+   * Change the {@link PinotBufferFactory} used by the current thread.
+   *
+   * If this method is not called, the default factory configured at startup time will be used.
+   *
+   * @see #loadDefaultFactory(PinotConfiguration)
+   */
+  public static void useFactory(PinotBufferFactory factory) {
+    _FACTORY.set(factory);
+  }
+
+  /**
+   * Returns the factory the current thread should use.
+   */
+  public static PinotBufferFactory getFactory() {
+    PinotBufferFactory pinotBufferFactory = _FACTORY.get();
+    if (pinotBufferFactory == null) {
+      pinotBufferFactory = _defaultFactory;
+    }
+    return pinotBufferFactory;
+  }
+
+  public static PinotBufferFactory createDefaultFactory() {
+    return createDefaultFactory(true);
+  }
+
+  public static PinotBufferFactory createDefaultFactory(boolean prioritizeByteBuffer) {
+    String factoryClassName;
+    if (JavaVersion.VERSION < 16) {
+      LOGGER.info("Using LArray as buffer on JVM version {}", JavaVersion.VERSION);
+      factoryClassName = LArrayPinotBufferFactory.class.getCanonicalName();
+    } else {
+      LOGGER.info("Using Unsafe as buffer on JVM version {}", JavaVersion.VERSION);
+      factoryClassName = UnsafePinotBufferFactory.class.getCanonicalName();
+    }
+    return createFactory(factoryClassName, prioritizeByteBuffer);
+  }
+
+  private static PinotBufferFactory createFactory(String factoryClassName, boolean prioritizeByteBuffer) {
+    try {
+      LOGGER.info("Instantiating Pinot buffer factory class {}", factoryClassName);
+      PinotBufferFactory factory = PluginManager.get().createInstance(factoryClassName);
+
+      if (prioritizeByteBuffer) {
+        factory = new SmallWithFallbackPinotBufferFactory(new ByteBufferPinotBufferFactory(), factory);
+      }
+
+      return factory;
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Configures the default {@link PinotBufferFactory}.
+   *
+   * This method guarantees that threads that didn't use the factory before this method is called are going to use the
+   * new factory. In other words, threads that were already running when this method was called may use other factories.
+   * Therefore it is recommended to call this method during Pinot startup.
+   */
+  public static void loadDefaultFactory(PinotConfiguration configuration) {
+    boolean prioritizeByteBuffer = configuration.getProperty(OFFHEAP_BUFFER_PRIORITIZE_BYTE_BUFFER_CONFIG, true);
+    String factoryClassName = configuration.getProperty(OFFHEAP_BUFFER_FACTORY_CONFIG);
+    if (factoryClassName != null) {
+      _defaultFactory = createFactory(factoryClassName, prioritizeByteBuffer);
+    } else {
+      LOGGER.info("No custom Pinot buffer factory class found in configuration. Using default factory with "
+          + "prioritize bytebuffer = {}", prioritizeByteBuffer);
+      _defaultFactory = createDefaultFactory(prioritizeByteBuffer);
+    }
+  }
+
   /**
    * Allocates a buffer using direct memory.
    * <p>NOTE: The contents of the allocated buffer are not defined.
@@ -111,19 +213,10 @@ public String toString() {
   public static PinotDataBuffer allocateDirect(long size, ByteOrder byteOrder, @Nullable String description) {
     PinotDataBuffer buffer;
     try {
-      if (size <= Integer.MAX_VALUE) {
-        buffer = PinotByteBuffer.allocateDirect((int) size, byteOrder);
-      } else {
-        if (byteOrder == NATIVE_ORDER) {
-          buffer = PinotNativeOrderLBuffer.allocateDirect(size);
-        } else {
-          buffer = PinotNonNativeOrderLBuffer.allocateDirect(size);
-        }
-      }
+      buffer = getFactory().allocateDirect(size, byteOrder);
     } catch (Exception e) {
-      LOGGER
-          .error("Caught exception while allocating direct buffer of size: {} with description: {}", size, description,
-              e);
+      LOGGER.error("Caught exception while allocating direct buffer of size: {} with description: {}", size,
+          description, e);
       LOGGER.error("Buffer stats: {}", getBufferStats());
       ALLOCATION_FAILURE_COUNT.getAndIncrement();
       throw e;
@@ -144,15 +237,7 @@ public static PinotDataBuffer loadFile(File file, long offset, long size, ByteOr
       throws IOException {
     PinotDataBuffer buffer;
     try {
-      if (size <= Integer.MAX_VALUE) {
-        buffer = PinotByteBuffer.loadFile(file, offset, (int) size, byteOrder);
-      } else {
-        if (byteOrder == NATIVE_ORDER) {
-          buffer = PinotNativeOrderLBuffer.loadFile(file, offset, size);
-        } else {
-          buffer = PinotNonNativeOrderLBuffer.loadFile(file, offset, size);
-        }
-      }
+      buffer = getFactory().readFile(file, offset, size, byteOrder);
     } catch (Exception e) {
       LOGGER.error("Caught exception while loading file: {} from offset: {} of size: {} with description: {}",
           file.getAbsolutePath(), offset, size, description, e);
@@ -187,15 +272,7 @@ public static PinotDataBuffer mapFile(File file, boolean readOnly, long offset,
       throws IOException {
     PinotDataBuffer buffer;
     try {
-      if (size <= Integer.MAX_VALUE) {
-        buffer = PinotByteBuffer.mapFile(file, readOnly, offset, (int) size, byteOrder);
-      } else {
-        if (byteOrder == NATIVE_ORDER) {
-          buffer = PinotNativeOrderLBuffer.mapFile(file, readOnly, offset, size);
-        } else {
-          buffer = PinotNonNativeOrderLBuffer.mapFile(file, readOnly, offset, size);
-        }
-      }
+      buffer = getFactory().mapFile(file, readOnly, offset, size, byteOrder);
     } catch (Exception e) {
       LOGGER.error("Caught exception while mapping file: {} from offset: {} of size: {} with description: {}",
           file.getAbsolutePath(), offset, size, description, e);
@@ -241,6 +318,15 @@ public static long getAllocationFailureCount() {
     return ALLOCATION_FAILURE_COUNT.get();
   }
 
+  @VisibleForTesting
+  protected static void cleanStats() {
+    DIRECT_BUFFER_COUNT.set(0);
+    DIRECT_BUFFER_USAGE.set(0);
+    MMAP_BUFFER_COUNT.set(0);
+    MMAP_BUFFER_USAGE.set(0);
+    ALLOCATION_FAILURE_COUNT.set(0);
+  }
+
   public static List<String> getBufferInfo() {
     synchronized (BUFFER_CONTEXT_MAP) {
       List<String> bufferInfo = new ArrayList<>(BUFFER_CONTEXT_MAP.size());
@@ -257,7 +343,7 @@ private static String getBufferStats() {
             DIRECT_BUFFER_USAGE.get(), MMAP_BUFFER_COUNT.get(), MMAP_BUFFER_USAGE.get());
   }
 
-  private boolean _closeable;
+  private volatile boolean _closeable;
 
   protected PinotDataBuffer(boolean closeable) {
     _closeable = closeable;
@@ -286,80 +372,183 @@ public synchronized void close()
     }
   }
 
-  public abstract byte getByte(int offset);
+  public byte getByte(int offset) {
+    return getByte((long) offset);
+  }
 
   public abstract byte getByte(long offset);
 
-  public abstract void putByte(int offset, byte value);
+  public void putByte(int offset, byte value) {
+    putByte((long) offset, value);
+  }
 
   public abstract void putByte(long offset, byte value);
 
-  public abstract char getChar(int offset);
+  public char getChar(int offset) {
+    return getChar((long) offset);
+  }
 
   public abstract char getChar(long offset);
 
-  public abstract void putChar(int offset, char value);
+  public void putChar(int offset, char value) {
+    putChar((long) offset, value);
+  }
 
   public abstract void putChar(long offset, char value);
 
-  public abstract short getShort(int offset);
+  public short getShort(int offset) {
+    return getShort((long) offset);
+  }
 
   public abstract short getShort(long offset);
 
-  public abstract void putShort(int offset, short value);
+  public void putShort(int offset, short value) {
+    putShort((long) offset, value);
+  }
 
   public abstract void putShort(long offset, short value);
 
-  public abstract int getInt(int offset);
+  public int getInt(int offset) {
+    return getInt((long) offset);
+  }
 
   public abstract int getInt(long offset);
 
-  public abstract void putInt(int offset, int value);
+  public void putInt(int offset, int value) {
+    putInt((long) offset, value);
+  }
 
   public abstract void putInt(long offset, int value);
 
-  public abstract long getLong(int offset);
+  public long getLong(int offset) {
+    return getLong((long) offset);
+  }
 
   public abstract long getLong(long offset);
 
-  public abstract void putLong(int offset, long value);
+  public void putLong(int offset, long value) {
+    putLong((long) offset, value);
+  }
 
   public abstract void putLong(long offset, long value);
 
-  public abstract float getFloat(int offset);
+  public float getFloat(int offset) {
+    return getFloat((long) offset);
+  }
 
   public abstract float getFloat(long offset);
 
-  public abstract void putFloat(int offset, float value);
+  public void putFloat(int offset, float value) {
+    putFloat((long) offset, value);
+  }
 
   public abstract void putFloat(long offset, float value);
 
-  public abstract double getDouble(int offset);
+  public double getDouble(int offset) {
+    return getDouble((long) offset);
+  }
 
   public abstract double getDouble(long offset);
 
-  public abstract void putDouble(int offset, double value);
+  public void putDouble(int offset, double value) {
+    putDouble((long) offset, value);
+  }
 
   public abstract void putDouble(long offset, double value);
 
-  public abstract void copyTo(long offset, byte[] buffer, int destOffset, int size);
+  /**
+   * Given an array of bytes, copies the content of this object into the array of bytes.
+   * The first byte to be copied is the one that could be read with {@code this.getByte(offset)}
+   */
+  public void copyTo(long offset, byte[] buffer, int destOffset, int size) {
+    if (size <= BULK_BYTES_PROCESSING_THRESHOLD) {
+      int end = destOffset + size;
+      for (int i = destOffset; i < end; i++) {
+        buffer[i] = getByte(offset++);
+      }
+    } else {
+      toDirectByteBuffer(offset, size).get(buffer, destOffset, size);
+    }
+  }
 
+  /**
+   * Given an array of bytes, copies the content of this object into the array of bytes.
+   * The first byte to be copied is the one that could be read with {@code this.getByte(offset)}
+   */
   public void copyTo(long offset, byte[] buffer) {
     copyTo(offset, buffer, 0, buffer.length);
   }
 
-  public abstract void copyTo(long offset, PinotDataBuffer buffer, long destOffset, long size);
+  /**
+   * Note: It is the responsibility of the caller to make sure arguments are checked before the methods are called.
+   * While some rudimentary checks are performed on the input, the checks are best effort and when performance is an
+   * overriding priority, as when methods of this class are optimized by the runtime compiler, some or all checks
+   * (if any) may be elided. Hence, the caller must not rely on the checks and corresponding exceptions!
+   */
+  public void copyTo(long offset, PinotDataBuffer buffer, long destOffset, long size) {
+    int pageSize = Integer.MAX_VALUE;
+    long alreadyCopied = 0;
+
+    while (size - alreadyCopied > 0L) {
+      int step;
+      long remaining = size - alreadyCopied;
 
-  public abstract void readFrom(long offset, byte[] buffer, int srcOffset, int size);
+      if (remaining > pageSize) {
+        step = pageSize;
+      } else {
+        step = (int) remaining;
+      }
+      ByteBuffer destBb = buffer.toDirectByteBuffer(destOffset + alreadyCopied, step);
+      ByteBuffer myView = toDirectByteBuffer(offset + alreadyCopied, step);
+
+      destBb.put(myView);
+
+      alreadyCopied += step;
+    }
+  }
+
+  /**
+   * Given an array of bytes, writes the content in the specified position.
+   */
+  public void readFrom(long offset, byte[] buffer, int srcOffset, int size) {
+    assert offset <= Integer.MAX_VALUE;
+    int intOffset = (int) offset;
+
+    if (size <= BULK_BYTES_PROCESSING_THRESHOLD) {
+      int end = srcOffset + size;
+      for (int i = srcOffset; i < end; i++) {
+        putByte(intOffset++, buffer[i]);
+      }
+    } else {
+      toDirectByteBuffer(offset, size).put(buffer, srcOffset, size);
+    }
+  }
 
   public void readFrom(long offset, byte[] buffer) {
     readFrom(offset, buffer, 0, buffer.length);
   }
 
-  public abstract void readFrom(long offset, ByteBuffer buffer);
+  public void readFrom(long offset, ByteBuffer buffer) {
+    toDirectByteBuffer(offset, buffer.remaining()).put(buffer);
+  }
 
-  public abstract void readFrom(long offset, File file, long srcOffset, long size)
-      throws IOException;
+  public void readFrom(long offset, File file, long srcOffset, long size)
+      throws IOException {
+    try (
+        RandomAccessFile raf = new RandomAccessFile(file, "r");
+        FileChannel fileChannel = raf.getChannel()) {
+      int step = Integer.MAX_VALUE / 2;
+      while (size > Integer.MAX_VALUE) {
+        ByteBuffer bb = toDirectByteBuffer(offset, step);
+        fileChannel.read(bb, srcOffset);
+        offset += step;
+        srcOffset += step;
+        size -= step;
+      }
+      ByteBuffer bb = toDirectByteBuffer(offset, (int) size);
+      fileChannel.read(bb, srcOffset);
+    }
+  }
 
   public abstract long size();
 
@@ -379,8 +568,49 @@ public PinotDataBuffer view(long start, long end) {
     return view(start, end, order());
   }
 
+  /**
+   * Returns an ByteBuffer with the same content of this buffer.
+   *
+   * This receiver object and the returned ByteBuffer share the same memory address, but the receiver conserves the
+   * ownership. This means that:
+   * <ol>
+   *   <li>The returned ByteBuffer should not be released (aka freed in C). For example, its cleaner should not be
+   *   called. <b>Violations of this rule may produce segmentation faults</b></li>
+   *   <li>The returned ByteBuffer should not be used once the receiver is released.
+   *   <b>Violations of this rule may produce segmentation faults</b></li>
+   *   <li>A write made by either the receiver or the returned ByteBuffer will be seen by the other.</li>
+   * </ol>
+   *
+   * Depending on the implementation, this may be a view (and therefore changes on any buffer will be seen by the other)
+   * or a copy (in which case the cost will be higher, but each copy will have their own lifecycle).
+   *
+   * @param byteOrder The byte order of the returned ByteBuffer. No special treatment is done if the order of the
+   *                  receiver buffer is different from the order requested. In other words: if this buffer was written
+   *                  in big endian and the direct buffer is requested in little endian, the integers read from each
+   *                  buffer will be different.
+   */
   public abstract ByteBuffer toDirectByteBuffer(long offset, int size, ByteOrder byteOrder);
 
+  /**
+   * Returns an ByteBuffer with the same content of this buffer.
+   *
+   * This receiver object and the returned ByteBuffer share the same memory address, but the receiver conserves the
+   * ownership. This means that:
+   * <ol>
+   *   <li>The returned ByteBuffer should not be released (aka freed in C). For example, its cleaner should not be
+   *   called. <b>Violations of this rule may produce segmentation faults</b></li>
+   *   <li>The returned ByteBuffer should not be used once the receiver is released.
+   *   <b>Violations of this rule may produce segmentation faults</b></li>
+   *   <li>A write made by either the receiver or the returned ByteBuffer will be seen by the other.</li>
+   * </ol>
+   *
+   * Depending on the implementation, this may be a view (and therefore changes on any buffer will be seen by the other)
+   * or a copy (in which case the cost will be higher, but each copy will have their own lifecycle).
+   *
+   */
+  // TODO: Most calls to this method are just used to then read the content of the buffer.
+  //  This is unnecessary an generates 2-5 unnecessary objects. We should benchmark whether there is some advantage on
+  //  transforming this buffer into a IntBuffer/LongBuffer/etc when reading sequentially
   public ByteBuffer toDirectByteBuffer(long offset, int size) {
     return toDirectByteBuffer(offset, size, order());
   }
@@ -389,4 +619,21 @@ public ByteBuffer toDirectByteBuffer(long offset, int size) {
 
   public abstract void release()
       throws IOException;
+
+  public boolean isCloseable() {
+    return _closeable;
+  }
+
+  protected static void checkLimits(long capacity, long offset, long size) {
+    if (offset < 0) {
+      throw new IllegalArgumentException("Offset " + offset + " cannot be negative");
+    }
+    if (size < 0) {
+      throw new IllegalArgumentException("Size " + size + " cannot be negative");
+    }
+    if (offset + size > capacity) {
+      throw new IllegalArgumentException("Size (" + size + ") + offset (" + offset + ") exceeds the capacity of "
+          + capacity);
+    }
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/SmallWithFallbackPinotBufferFactory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/SmallWithFallbackPinotBufferFactory.java
new file mode 100644
index 00000000000..c16cd4f89f9
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/SmallWithFallbackPinotBufferFactory.java
@@ -0,0 +1,72 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+
+
+/**
+ * A factory that receives two delegates, using one when the requested buffer can be indexes with integers and the other
+ * in the other case.
+ *
+ * This is commonly used to use ByteBuffers when possible. The utility of that is questionable, as it can increase the
+ * number of megamorphic calls in the hot path and also make errors related with -XX:MaxDirectMemorySize more
+ * indeterministic. But it is also the default behavior of Pinot, so it is kept as the default for compatibility
+ * reasons.
+ */
+public class SmallWithFallbackPinotBufferFactory implements PinotBufferFactory {
+  private final PinotBufferFactory _small;
+  private final PinotBufferFactory _fallback;
+
+  public SmallWithFallbackPinotBufferFactory(PinotBufferFactory small, PinotBufferFactory fallback) {
+    _small = small;
+    _fallback = fallback;
+  }
+
+  @Override
+  public PinotDataBuffer allocateDirect(long size, ByteOrder byteOrder) {
+    if (size <= Integer.MAX_VALUE) {
+      return _small.allocateDirect(size, byteOrder);
+    } else {
+      return _fallback.allocateDirect(size, byteOrder);
+    }
+  }
+
+  @Override
+  public PinotDataBuffer readFile(File file, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    if (size <= Integer.MAX_VALUE) {
+      return _small.readFile(file, offset, size, byteOrder);
+    } else {
+      return _fallback.readFile(file, offset, size, byteOrder);
+    }
+  }
+
+  @Override
+  public PinotDataBuffer mapFile(File file, boolean readOnly, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    if (size <= Integer.MAX_VALUE) {
+      return _small.mapFile(file, readOnly, offset, size, byteOrder);
+    } else {
+      return _fallback.mapFile(file, readOnly, offset, size, byteOrder);
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/DirectMemory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/DirectMemory.java
new file mode 100644
index 00000000000..aef92af1dff
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/DirectMemory.java
@@ -0,0 +1,79 @@
+/**
+ * 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.pinot.segment.spi.memory.unsafe;
+
+import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A {@link Memory} that is anonymous and therefore there it is not backed by any file.
+ */
+public class DirectMemory implements Memory {
+  private static final Logger LOGGER = LoggerFactory.getLogger(DirectMemory.class);
+
+  private final long _address;
+  private final long _size;
+  private volatile boolean _closed = false;
+
+  public DirectMemory(long size) {
+    _address = Unsafer.UNSAFE.allocateMemory(size);
+    _size = size;
+
+    Unsafer.UNSAFE.setMemory(_address, _size, (byte) 0);
+  }
+
+  @Override
+  public long getAddress() {
+    return _address;
+  }
+
+  @Override
+  public long getSize() {
+    return _size;
+  }
+
+  @Override
+  public void flush() {
+  }
+
+  @Override
+  public void close()
+      throws IOException {
+    if (!_closed) {
+      synchronized (this) {
+        if (!_closed) {
+          Unsafer.UNSAFE.freeMemory(_address);
+          _closed = true;
+        }
+      }
+    }
+  }
+
+  @Override
+  protected void finalize()
+      throws Throwable {
+    if (!_closed) {
+      LOGGER.warn("Mmap section of " + _size + " wasn't explicitly closed");
+      close();
+    }
+    super.finalize();
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/GeoSpatialIndexCreatorProvider.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/Memory.java
similarity index 52%
rename from pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/GeoSpatialIndexCreatorProvider.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/Memory.java
index 34341a1e3e3..061c8f2465d 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/GeoSpatialIndexCreatorProvider.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/Memory.java
@@ -16,22 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.segment.spi.creator;
+package org.apache.pinot.segment.spi.memory.unsafe;
 
+import java.io.Closeable;
 import java.io.IOException;
-import org.apache.pinot.segment.spi.index.creator.GeoSpatialIndexCreator;
 
 
-public interface GeoSpatialIndexCreatorProvider {
+/**
+ * A representation of some offheap memory previously allocated. This is mainly an address, a size and a way to
+ * release it.
+ */
+public interface Memory extends Closeable {
+   /**
+    * The virtual address where the memory starts.
+    */
+   long getAddress();
+
+   /**
+    * The number of bytes that can be accessed starting from {@link #getAddress()}.
+    */
+   long getSize();
+
+   /**
+    * If the memory is backed by a file (like in a memory map file) it syncs the content between the memory and the
+    * disk. Otherwise it does nothing.
+    */
+   void flush();
 
-  /**
-   * Creates a {@see GeoSpatialIndexCreator} from information about index creation.
-   * This allows a plugin to pattern match index creation information to select
-   * an appropriate implementation.
-   * @param context context about the index creation.
-   * @return a {@see ForwardIndexCreator}
-   * @throws IOException whenever something goes wrong matching or constructing the creator
-   */
-  GeoSpatialIndexCreator newGeoSpatialIndexCreator(IndexCreationContext.Geospatial context)
-      throws IOException;
+   /**
+    * Close this object, releasing the reserved memory.
+    */
+   @Override
+   void close()
+       throws IOException;
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/MmapMemory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/MmapMemory.java
new file mode 100644
index 00000000000..521d7f4cdf3
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/MmapMemory.java
@@ -0,0 +1,377 @@
+/**
+ * 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.pinot.segment.spi.memory.unsafe;
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.io.UncheckedIOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.channels.FileChannel;
+import java.util.List;
+import java.util.function.BiConsumer;
+import net.openhft.chronicle.core.Jvm;
+import net.openhft.chronicle.core.OS;
+import net.openhft.posix.MSyncFlag;
+import net.openhft.posix.PosixAPI;
+import org.apache.pinot.segment.spi.utils.JavaVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A {@link Memory} that whose bytes are mapped on a file.
+ */
+public class MmapMemory implements Memory {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MmapMemory.class);
+
+  private static final MapFun MAP_FUN;
+
+  /**
+   * The address that correspond to the offset given at creation time.
+   *
+   * The actual mapping address may be smaller than this value, as usually memory map must start on an address that is
+   * page aligned.
+   */
+  private final long _address;
+  /**
+   * How many bytes have been requested to be mapped.
+   * The actual mapped size may be larger (up to the next page), but the actual mapped size
+   * is stored by {@link #_section}.
+   */
+  private final long _size;
+  private final MapSection _section;
+  private boolean _closed = false;
+
+  static {
+    try {
+      Jvm.init();
+      MAP_FUN = MapFun.find();
+    } catch (ClassNotFoundException | NoSuchMethodException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public MmapMemory(File file, boolean readOnly, long offset, long size) {
+    _size = size;
+
+    try {
+      _section = MAP_FUN.map(file, readOnly, offset, size);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+    _address = _section.getAddress();
+  }
+
+  @Override
+  public long getAddress() {
+    return _address;
+  }
+
+  @Override
+  public long getSize() {
+    return _size;
+  }
+
+  @Override
+  public void flush() {
+    MSyncFlag mode = MSyncFlag.MS_SYNC;
+    PosixAPI.posix().msync(_address, _size, mode);
+  }
+
+  @Override
+  public void close()
+      throws IOException {
+    try {
+      if (!_closed) {
+        synchronized (this) {
+          if (!_closed) {
+            _section._unmapFun.unmap();
+            _closed = true;
+          }
+        }
+      }
+    } catch (InvocationTargetException | IllegalAccessException e) {
+      throw new RuntimeException("Error while calling unmap", e);
+    }
+  }
+
+  @Override
+  protected void finalize()
+      throws Throwable {
+    if (!_closed) {
+      LOGGER.warn("Mmap section of " + _size + " wasn't explicitly closed");
+      close();
+    }
+    super.finalize();
+  }
+
+  private static class MapSection {
+    public static final MapSection EMPTY = new MapSection(0, () -> {
+    });
+    private final long _address;
+    private final UnmapFun _unmapFun;
+
+    public MapSection(long address, UnmapFun unmapFun) {
+      _address = address;
+      _unmapFun = unmapFun;
+    }
+
+    public long getAddress() {
+      return _address;
+    }
+
+    public UnmapFun getUnmapFun() {
+      return _unmapFun;
+    }
+  }
+
+  /**
+   * This is a factory method that can be used to create {@link MapSection}s.
+   *
+   * Each JVM may provide different method to map files in memory.
+   */
+  interface MapFun {
+
+    /**
+     * @param file The file to be mapped. If its length is lower than offset + size and the mode is not read only,
+     *            the file will be resized to that size.
+     * @param offset The offset in the file. Any positive value is valid, even if it is larger than the file size.
+     * @param size How many bytes to map.
+     * @throws IOException in several situations. For example, if the offset + size is larger than file length and the
+     * mode is read only or if the process doesn't have permission to read or modify the file.
+     */
+    MapSection map(File file, boolean readOnly, long offset, long size) throws IOException;
+
+    static MapFun find()
+        throws ClassNotFoundException, NoSuchMethodException {
+      List<Finder<? extends MapFun>> candidates = Lists.newArrayList(
+          new Map0Fun.ChronicleCore(),
+          new Map0Fun.Java11(),
+          new Map0Fun.Java17(),
+          new Map0Fun.Java20()
+      );
+
+      for (Finder<? extends MapFun> candidate : candidates) {
+        try {
+          return candidate.tryFind();
+        } catch (NoSuchMethodException | ClassNotFoundException | AssertionError e) {
+          // IGNORE
+        }
+      }
+      throw new NoSuchMethodException("Cannot find how to create memory map files in Java " + JavaVersion.VERSION);
+    }
+  }
+
+  /**
+   * As defined by POSIX, the map0 method requires that the offset is page aligned. Failing to do that may produce
+   * segfault errors. This interface is a {@link MapFun} that does some sanitation before calling the map method.
+   * They include:
+   * <ul>
+   *   <li>Grow the file if the last mapped byte is larger than the file length.</li>
+   *   <li>Align the offset with the previous page. This means that we need to correct the actual mapped address.</li>
+   * </ul>
+   */
+  interface Map0Fun extends MapFun {
+
+    /**
+     * @param pageAlignedOffset It has to be a positive value that is page aligned.
+     */
+    MapSection map0(FileChannel fc, boolean readOnly, long pageAlignedOffset, long size)
+        throws InvocationTargetException, IllegalAccessException, IOException;
+
+    default MapSection map(File file, boolean readOnly, long offset, long size) throws IOException {
+      String mode = readOnly ? "r" : "rw";
+      try (RandomAccessFile raf = new RandomAccessFile(file, mode); FileChannel fc = raf.getChannel()) {
+        if (size == 0) {
+          return MapSection.EMPTY;
+        }
+
+        long allocationGranule = Unsafer.UNSAFE.pageSize();
+        int pagePosition = (int) (offset % allocationGranule);
+
+        // Compute mmap address
+        if (!fc.isOpen()) {
+          throw new IOException("closed " + file.getPath());
+        }
+
+        long fileSize = fc.size();
+        if (fileSize < offset + size) {
+          // If file size is smaller than the specified size, extend the file size
+          raf.seek(offset + size - 1);
+          raf.write(0);
+        }
+        long mapPosition = offset - pagePosition;
+        long mapSize = size + pagePosition;
+
+        MapSection map0Section = map0(fc, readOnly, mapPosition, mapSize);
+        return new MapSection(map0Section.getAddress() + pagePosition, map0Section.getUnmapFun());
+      } catch (InvocationTargetException | IllegalAccessException e) {
+        throw new RuntimeException("Cannot map file " + file + " from address " + offset + " with size " + size, e);
+      }
+    }
+
+    static BiConsumer<Long, Long> tryFindUnmapper()
+        throws NoSuchMethodException, ClassNotFoundException {
+      Class<?> fileChannelImpl = MmapMemory.class.getClassLoader().loadClass("sun.nio.ch.FileChannelImpl");
+      Method unmapMethod = fileChannelImpl.getDeclaredMethod("unmap0", long.class, long.class);
+      unmapMethod.setAccessible(true);
+      return (address, size) -> {
+        try {
+          unmapMethod.invoke(null, address, size);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+          throw new RuntimeException(e);
+        }
+      };
+    }
+
+    /**
+     * Instead of looking for the correct map method by our self, this finder delegates on
+     * {@link OS#map(FileChannel, FileChannel.MapMode, long, long)} and {@link OS#unmap(long, long)}, which internally
+     * does the same thing.
+     */
+    class ChronicleCore implements Finder<Map0Fun> {
+      @Override
+      public Map0Fun tryFind() {
+        OS.mapAlignment();
+        return (fc, readOnly, pageAlignedOffset, size) -> {
+          if (size == 0) {
+            return MapSection.EMPTY;
+          }
+          FileChannel.MapMode mapMode = readOnly ? FileChannel.MapMode.READ_ONLY : FileChannel.MapMode.READ_WRITE;
+          long alignedSize = OS.pageAlign(size);
+          long address = OS.map(fc, mapMode, pageAlignedOffset, alignedSize);
+          return new MapSection(address, () -> {
+            try {
+              OS.unmap(address, alignedSize);
+            } catch (IOException e) {
+              throw new UncheckedIOException(e);
+            }
+          });
+        };
+      }
+    }
+
+    class Java11 implements Finder<Map0Fun> {
+      @Override
+      public Map0Fun tryFind()
+          throws NoSuchMethodException, ClassNotFoundException {
+        Class<?> fileChannelImpl = MmapMemory.class.getClassLoader().loadClass("sun.nio.ch.FileChannelImpl");
+
+        // this is the usual method in JDK 11
+        Method mapMethod = fileChannelImpl.getDeclaredMethod("map0", int.class, long.class, long.class);
+        mapMethod.setAccessible(true);
+
+        BiConsumer<Long, Long> unmap0 = tryFindUnmapper();
+
+        return (fc, readOnly, pageAlignedOffset, size) -> {
+          // see FileChannelImpl.MAP_RO and MAP_RW
+          int iMode = readOnly ? 0 : 1;
+
+          long address = (long) mapMethod.invoke(fc, iMode, pageAlignedOffset, size);
+
+          UnmapFun unmapFun = () -> unmap0.accept(address, size);
+
+          return new MapSection(address, unmapFun);
+        };
+      }
+    }
+
+    class Java17 implements Finder<Map0Fun> {
+      @Override
+      public Map0Fun tryFind()
+          throws NoSuchMethodException, ClassNotFoundException {
+        Class<?> fileChannelImpl = MmapMemory.class.getClassLoader().loadClass("sun.nio.ch.FileChannelImpl");
+
+        // https://github.com/openjdk/jdk17/blob/dfacda488bfbe2e11e8d607a6d08527710286982/src/java.base/share/classes/
+        // sun/nio/ch/FileChannelImpl.java#L1341
+        Method mapMethod = fileChannelImpl.getDeclaredMethod("map0", int.class, long.class, long.class, boolean.class);
+        mapMethod.setAccessible(true);
+
+        BiConsumer<Long, Long> unmap0 = tryFindUnmapper();
+
+        return (fc, readOnly, pageAlignedOffset, size) -> {
+          // see FileChannelImpl.MAP_RO and MAP_RW
+          int iMode = readOnly ? 0 : 1;
+          long address = (long) mapMethod.invoke(fc, iMode, pageAlignedOffset, size, false);
+
+          UnmapFun unmapFun = () -> unmap0.accept(address, size);
+
+          return new MapSection(address, unmapFun);
+        };
+      }
+    }
+
+    /**
+     * In Java 20 the method used to map already does the alignment corrections, so we could call it with a non-aligned
+     * offset. But we need to know the position in the page in order to correct the address, so it is useful to return a
+     * Map0Fun instead of a MapFun.
+     */
+    class Java20 implements Finder<Map0Fun> {
+      @Override
+      public Map0Fun tryFind()
+          throws NoSuchMethodException, ClassNotFoundException {
+        Class<?> fileChannelImpl = MmapMemory.class.getClassLoader().loadClass("sun.nio.ch.FileChannelImpl");
+
+        Method mapMethod = fileChannelImpl.getDeclaredMethod("mapInternal", FileChannel.MapMode.class, long.class,
+            long.class, int.class, boolean.class);
+        mapMethod.setAccessible(true);
+
+        Class<?> unmapperClass = MmapMemory.class.getClassLoader().loadClass("sun.nio.ch.FileChannelImpl$Unmapper");
+        Method unmapMethod = unmapperClass.getDeclaredMethod("unmap");
+        unmapMethod.setAccessible(true);
+        Method addressMethod = unmapperClass.getDeclaredMethod("address");
+        addressMethod.setAccessible(true);
+
+        return (fc, readOnly, pageAlignedOffset, size) -> {
+          FileChannel.MapMode mapMode = readOnly ? FileChannel.MapMode.READ_ONLY : FileChannel.MapMode.READ_WRITE;
+          // see https://github.com/openjdk/jdk/blob/cc9f7ad9ce33dc44d335fb7fb5483795c62ba936/src/java.base/share/
+          // classes/sun/nio/ch/FileChannelImpl.java#L1223
+          int prot = readOnly ? 0 : 1;
+
+          Object unmapper = mapMethod.invoke(fc, mapMode, pageAlignedOffset, size, prot, false);
+          long address;
+          UnmapFun unmapFun;
+          if (unmapper == null) {
+            // unmapper may be null if the size is 0 or if the file descriptor is closed while mapInternal was called
+            address = 0;
+            unmapFun = () -> {
+            };
+          } else {
+            address = (long) addressMethod.invoke(unmapper);
+            unmapFun = () -> unmapMethod.invoke(unmapper);
+          }
+
+          return new MapSection(address, unmapFun);
+        };
+      }
+    }
+  }
+
+  interface UnmapFun {
+    void unmap()
+        throws InvocationTargetException, IllegalAccessException;
+  }
+
+  private interface Finder<C> {
+    C tryFind() throws NoSuchMethodException, ClassNotFoundException;
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafePinotBuffer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafePinotBuffer.java
new file mode 100644
index 00000000000..5830edf51ad
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafePinotBuffer.java
@@ -0,0 +1,184 @@
+/**
+ * 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.pinot.segment.spi.memory.unsafe;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import org.apache.pinot.segment.spi.memory.ByteBufferUtil;
+import org.apache.pinot.segment.spi.memory.NonNativePinotDataBuffer;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import sun.misc.Unsafe;
+
+
+/**
+ * A {@link PinotDataBuffer} that uses {@link Unsafe} and can only read native byte order.
+ */
+public class UnsafePinotBuffer extends PinotDataBuffer {
+
+  private final long _address;
+  private final long _size;
+  private final Memory _memory;
+
+  public UnsafePinotBuffer(Memory memory, boolean ownsMemory) {
+    this(memory, ownsMemory, memory.getAddress(), memory.getSize());
+  }
+
+  private UnsafePinotBuffer(Memory memory, boolean ownsMemory, long address, long size) {
+    super(ownsMemory);
+    _memory = memory;
+    _size = size;
+    _address = address;
+  }
+
+  void checkOffset(long offset, long size) {
+    if (offset < 0) {
+      throw new IllegalArgumentException("Offset is " + offset);
+    }
+    if (offset + size > _size) {
+      throw new IllegalArgumentException("Cannot apply a " + size + " byte length operation in offset " + offset);
+    }
+  }
+
+  @Override
+  public byte getByte(long offset) {
+    checkOffset(offset, 1);
+    return Unsafer.UNSAFE.getByte(_address + offset);
+  }
+
+  @Override
+  public void putByte(long offset, byte value) {
+    checkOffset(offset, 1);
+    Unsafer.UNSAFE.putByte(_address + offset, value);
+  }
+
+  @Override
+  public char getChar(long offset) {
+    checkOffset(offset, 2);
+    return Unsafer.UNSAFE.getChar(_address + offset);
+  }
+
+  @Override
+  public void putChar(long offset, char value) {
+    checkOffset(offset, 2);
+    Unsafer.UNSAFE.putChar(_address + offset, value);
+  }
+
+  @Override
+  public short getShort(long offset) {
+    checkOffset(offset, 2);
+    return Unsafer.UNSAFE.getShort(_address + offset);
+  }
+
+  @Override
+  public void putShort(long offset, short value) {
+    checkOffset(offset, 2);
+    Unsafer.UNSAFE.putShort(_address + offset, value);
+  }
+
+  @Override
+  public int getInt(long offset) {
+    checkOffset(offset, 4);
+    return Unsafer.UNSAFE.getInt(_address + offset);
+  }
+
+  @Override
+  public void putInt(long offset, int value) {
+    checkOffset(offset, 4);
+    Unsafer.UNSAFE.putInt(_address + offset, value);
+  }
+
+  @Override
+  public long getLong(long offset) {
+    checkOffset(offset, 8);
+    return Unsafer.UNSAFE.getLong(_address + offset);
+  }
+
+  @Override
+  public void putLong(long offset, long value) {
+    checkOffset(offset, 8);
+    Unsafer.UNSAFE.putLong(_address + offset, value);
+  }
+
+  @Override
+  public float getFloat(long offset) {
+    checkOffset(offset, 4);
+    return Unsafer.UNSAFE.getFloat(_address + offset);
+  }
+
+  @Override
+  public void putFloat(long offset, float value) {
+    checkOffset(offset, 4);
+    Unsafer.UNSAFE.putFloat(_address + offset, value);
+  }
+
+  @Override
+  public double getDouble(long offset) {
+    checkOffset(offset, 8);
+    return Unsafer.UNSAFE.getDouble(_address + offset);
+  }
+
+  @Override
+  public void putDouble(long offset, double value) {
+    checkOffset(offset, 8);
+    Unsafer.UNSAFE.putDouble(_address + offset, value);
+  }
+
+  @Override
+  public long size() {
+    return _size;
+  }
+
+  @Override
+  public ByteOrder order() {
+    return ByteOrder.nativeOrder();
+  }
+
+  @Override
+  public PinotDataBuffer view(long start, long end, ByteOrder byteOrder) {
+    long size = end - start;
+    checkOffset(start, size);
+
+    UnsafePinotBuffer nativeView = new UnsafePinotBuffer(_memory, false, _address + start, size);
+
+    if (byteOrder == ByteOrder.nativeOrder()) {
+      return nativeView;
+    } else {
+      return new NonNativePinotDataBuffer(nativeView);
+    }
+  }
+
+  @Override
+  public ByteBuffer toDirectByteBuffer(long offset, int size, ByteOrder byteOrder) {
+    checkOffset(offset, size);
+    return ByteBufferUtil.newDirectByteBuffer(_address + offset, size, this)
+        .order(byteOrder);
+  }
+
+  @Override
+  public void flush() {
+    _memory.flush();
+  }
+
+  @Override
+  public void release()
+      throws IOException {
+    _memory.close();
+  }
+}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafePinotBufferFactory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafePinotBufferFactory.java
new file mode 100644
index 00000000000..3b7cce2b002
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafePinotBufferFactory.java
@@ -0,0 +1,57 @@
+/**
+ * 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.pinot.segment.spi.memory.unsafe;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import org.apache.pinot.segment.spi.memory.NonNativePinotDataBuffer;
+import org.apache.pinot.segment.spi.memory.PinotBufferFactory;
+import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
+import xerial.larray.impl.OSInfo;
+
+
+public class UnsafePinotBufferFactory implements PinotBufferFactory {
+  public UnsafePinotBufferFactory() {
+    if (OSInfo.isWindows()) {
+      throw new IllegalStateException(getClass().getCanonicalName() + " cannot be used in Windows");
+    }
+  }
+
+  @Override
+  public PinotDataBuffer allocateDirect(long size, ByteOrder byteOrder) {
+    UnsafePinotBuffer buffer = new UnsafePinotBuffer(new DirectMemory(size), true);
+    if (byteOrder == ByteOrder.nativeOrder()) {
+      return buffer;
+    } else {
+      return new NonNativePinotDataBuffer(buffer);
+    }
+  }
+
+  @Override
+  public PinotDataBuffer mapFile(File file, boolean readOnly, long offset, long size, ByteOrder byteOrder)
+      throws IOException {
+    UnsafePinotBuffer buffer = new UnsafePinotBuffer(new MmapMemory(file, readOnly, offset, size), true);
+    if (byteOrder == ByteOrder.nativeOrder()) {
+      return buffer;
+    } else {
+      return new NonNativePinotDataBuffer(buffer);
+    }
+  }
+}
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/HadoopUtils.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/Unsafer.java
similarity index 59%
rename from pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/HadoopUtils.java
rename to pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/Unsafer.java
index 0596259021f..43389e25031 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/src/main/java/org/apache/pinot/hadoop/utils/preprocess/HadoopUtils.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/unsafe/Unsafer.java
@@ -16,26 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.hadoop.utils.preprocess;
+package org.apache.pinot.segment.spi.memory.unsafe;
 
-import java.io.IOException;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
+import java.lang.reflect.Field;
+import sun.misc.Unsafe;
 
+public class Unsafer {
 
-public class HadoopUtils {
-  private HadoopUtils() {
-  }
-
-  public static final Configuration DEFAULT_CONFIGURATION;
-  public static final FileSystem DEFAULT_FILE_SYSTEM;
+  public static final Unsafe UNSAFE;
 
   static {
-    DEFAULT_CONFIGURATION = new Configuration();
     try {
-      DEFAULT_FILE_SYSTEM = FileSystem.get(DEFAULT_CONFIGURATION);
-    } catch (IOException e) {
-      throw new IllegalStateException("Failed to get the default file system", e);
+      Field f = Unsafe.class.getDeclaredField("theUnsafe");
+      f.setAccessible(true);
+      UNSAFE = Unsafe.class.cast(f.get(null));
+    } catch (NoSuchFieldException e) {
+      throw new IllegalStateException("sun.misc.Unsafe is not available in this JVM");
+    } catch (IllegalAccessException e) {
+      throw new IllegalStateException("sun.misc.Unsafe is not available in this JVM");
     }
   }
+
+  private Unsafer() {
+  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexDirectory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexDirectory.java
index eee9e90990c..866de41e55d 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexDirectory.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexDirectory.java
@@ -21,9 +21,9 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Set;
 import org.apache.pinot.segment.spi.FetchContext;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 
@@ -53,7 +53,7 @@ protected String allocationContext(File f, String context) {
    * @return ByteBuffer like buffer for data
    * @throws IOException
    */
-  public abstract PinotDataBuffer getBuffer(String column, ColumnIndexType type)
+  public abstract PinotDataBuffer getBuffer(String column, IndexType<?, ?, ?> type)
       throws IOException;
 
   /**
@@ -64,7 +64,7 @@ public abstract PinotDataBuffer getBuffer(String column, ColumnIndexType type)
    * @return ByteBuffer like buffer for data
    * @throws IOException
    */
-  public abstract PinotDataBuffer newBuffer(String column, ColumnIndexType type, long sizeBytes)
+  public abstract PinotDataBuffer newBuffer(String column, IndexType<?, ?, ?> type, long sizeBytes)
       throws IOException;
 
   /**
@@ -73,20 +73,20 @@ public abstract PinotDataBuffer newBuffer(String column, ColumnIndexType type, l
    * @param type index type
    * @return true if the index exists; false otherwise
    */
-  public abstract boolean hasIndexFor(String column, ColumnIndexType type);
+  public abstract boolean hasIndexFor(String column, IndexType<?, ?, ?> type);
 
   /**
    * Remove the specified index
    * @param columnName column name
    * @param indexType index type
    */
-  public abstract void removeIndex(String columnName, ColumnIndexType indexType);
+  public abstract void removeIndex(String columnName, IndexType<?, ?, ?> indexType);
 
   /**
    * Get the columns with specific index type, loaded by column index directory.
    * @return a set of columns with such index type.
    */
-  public abstract Set<String> getColumnsWithIndex(ColumnIndexType type);
+  public abstract Set<String> getColumnsWithIndex(IndexType<?, ?, ?> type);
 
   /**
    * A hint to prefetch the buffers for columns in the context, in preparation for operating on the segment.
@@ -105,17 +105,4 @@ public void acquireBuffer(FetchContext fetchContext) {
    */
   public void releaseBuffer(FetchContext fetchContext) {
   }
-
-  public PinotDataBuffer getStarTreeIndex()
-      throws IOException {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * The caller should close the input stream.
-   */
-  public InputStream getStarTreeIndexMap()
-      throws IOException {
-    throw new UnsupportedOperationException();
-  }
 }
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexType.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexType.java
deleted file mode 100644
index 37c9d608af5..00000000000
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/ColumnIndexType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.store;
-
-// Note: It is required to keep DICTIONARY and FORWARD_INDEX as the starting entries in this enum to ensure
-// correctness during preprocessing a segment during segmentReload. Please add new entries at the end (or at least
-// below DICTIONARY and FORWARD_INDEX).
-public enum ColumnIndexType {
-  DICTIONARY("dictionary"),
-  FORWARD_INDEX("forward_index"),
-  INVERTED_INDEX("inverted_index"),
-  BLOOM_FILTER("bloom_filter"),
-  NULLVALUE_VECTOR("nullvalue_vector"),
-  TEXT_INDEX("text_index"),
-  FST_INDEX("fst_index"),
-  JSON_INDEX("json_index"),
-  RANGE_INDEX("range_index"),
-  H3_INDEX("h3_index");
-
-  private final String _indexName;
-
-  ColumnIndexType(String name) {
-    _indexName = name;
-  }
-
-  public String getIndexName() {
-    return _indexName;
-  }
-
-  public static ColumnIndexType getValue(String val) {
-    for (ColumnIndexType type : values()) {
-      if (type.getIndexName().equalsIgnoreCase(val)) {
-        return type;
-      }
-    }
-    throw new IllegalArgumentException("Unknown value: " + val);
-  }
-}
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/SegmentDirectory.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/SegmentDirectory.java
index 7ba897a01dd..5f95f5c094f 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/SegmentDirectory.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/store/SegmentDirectory.java
@@ -21,13 +21,13 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.pinot.segment.spi.FetchContext;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 
@@ -43,9 +43,9 @@
  *     SegmentDirectory.Writer writer =
  *          segmentDir.createWriter();
  *     try {
- *       writer.getIndexFor("column1", ColumnIndexType.FORWARD_INDEX);
+ *       writer.getIndexFor("column1", StandardIndexes.forward());
  *       PinotDataBufferOld buffer =
- *           writer.newIndexFor("column1", ColumnIndexType.FORWARD_INDEX, 1024);
+ *           writer.newIndexFor("column1", StandardIndexes.forward(), 1024);
  *       // write value 87 at index 512
  *       buffer.putLong(512, 87L);
  *       writer.saveAndClose();
@@ -56,7 +56,7 @@
  *     SegmentDirectory.Reader reader =
  *           segmentDir.createReader();
  *     try {
- *       PinotDataBufferOld col1Dictionary = reader.getIndexFor("col1Dictionary", ColumnIndexType.DICTIONARY);
+ *       PinotDataBufferOld col1Dictionary = reader.getIndexFor("col1Dictionary", StandardIndexes.dictionary());
  *     } catch (Exception e) {
  *       // handle error
  *     } finally {
@@ -116,7 +116,7 @@ public abstract void reloadMetadata()
    * Get the columns with specific index type, in this local segment directory.
    * @return a set of columns with such index type.
    */
-  public abstract Set<String> getColumnsWithIndex(ColumnIndexType type);
+  public abstract Set<String> getColumnsWithIndex(IndexType<?, ?, ?> type);
 
   /**
    * This is a hint to the segment directory, to begin prefetching buffers for given context.
@@ -176,29 +176,34 @@ public abstract class Reader implements Closeable {
      * @return a bytebuffer-like buffer holding index data
      * @throws IOException
      */
-    public abstract PinotDataBuffer getIndexFor(String column, ColumnIndexType type)
+    public abstract PinotDataBuffer getIndexFor(String column, IndexType<?, ?, ?> type)
         throws IOException;
 
-    public abstract boolean hasIndexFor(String column, ColumnIndexType type);
+    public abstract boolean hasIndexFor(String column, IndexType<?, ?, ?> type);
 
-    public SegmentDirectory toSegmentDirectory() {
-      return SegmentDirectory.this;
-    }
-
-    public abstract String toString();
-
-    public PinotDataBuffer getStarTreeIndex()
-        throws IOException {
-      throw new UnsupportedOperationException();
+    public boolean hasStarTreeIndex() {
+      return false;
     }
 
     /**
-     * The caller should close the input stream.
+     * The StarTree index is a multi-column index but modelled like those single-column indices kept in columns.psf and
+     * index_map files, so access to its index data can be abstracted with SegmentDirectory.Reader interface too. In the
+     * future, if new kinds of multi-column index e.g. materialized views is added, this interface can be generalized to
+     * access them too.
+     *
+     * @param starTreeId to look for a specific index instance. The StarTree index can contain multiple index instances,
+     *                   each one of them has a tree and a set of fwd indices referred to by the tree.
+     * @return SegmentDirectory.Reader object to access the index buffers inside the specific index instance.
      */
-    public InputStream getStarTreeIndexMap()
-        throws IOException {
-      throw new UnsupportedOperationException();
+    public Reader getStarTreeIndexReader(int starTreeId) {
+      return null;
     }
+
+    public SegmentDirectory toSegmentDirectory() {
+      return SegmentDirectory.this;
+    }
+
+    public abstract String toString();
   }
 
   /**
@@ -217,10 +222,10 @@ public abstract class Writer extends Reader {
      * @return PinotDataBufferOld that writers can update
      * @throws IOException
      */
-    // NOTE: an interface like readFrom(File f, String column, ColumnIndexType, int sizeBytes) will be safe
+    // NOTE: an interface like readFrom(File f, String column, IndexType<?, ?, ?>, int sizeBytes) will be safe
     // but it can lead to potential endianness issues. Endianness used to create data may not be
     // same as PinotDataBufferOld
-    public abstract PinotDataBuffer newIndexFor(String columnName, ColumnIndexType indexType, long sizeBytes)
+    public abstract PinotDataBuffer newIndexFor(String columnName, IndexType<?, ?, ?> indexType, long sizeBytes)
         throws IOException;
 
     /**
@@ -228,7 +233,7 @@ public abstract PinotDataBuffer newIndexFor(String columnName, ColumnIndexType i
      * @param columnName column name
      * @param indexType column index type
      */
-    public abstract void removeIndex(String columnName, ColumnIndexType indexType);
+    public abstract void removeIndex(String columnName, IndexType<?, ?, ?> indexType);
 
     public abstract void save()
         throws IOException;
diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/JavaVersion.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/JavaVersion.java
new file mode 100644
index 00000000000..f86c45cd590
--- /dev/null
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/JavaVersion.java
@@ -0,0 +1,38 @@
+/**
+ * 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.pinot.segment.spi.utils;
+
+import net.openhft.chronicle.core.Jvm;
+
+
+public class JavaVersion {
+
+  /**
+   * Returns the major Java version (ie 6, 8, 11, 15, 21, etc)
+   */
+  public static final int VERSION;
+
+  static {
+    Jvm.init();
+    VERSION = Jvm.majorVersion();
+  }
+
+  private JavaVersion() {
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/IndexingOverridesTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/IndexingOverridesTest.java
deleted file mode 100644
index e6be3bf3ec4..00000000000
--- a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/IndexingOverridesTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.segment.spi.creator;
-
-import java.io.IOException;
-import org.apache.pinot.segment.spi.index.IndexingOverrides;
-import org.apache.pinot.segment.spi.index.creator.BloomFilterCreator;
-import org.apache.pinot.segment.spi.index.reader.BloomFilterReader;
-import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
-import org.testng.annotations.Test;
-
-import static org.mockito.Mockito.mock;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-
-public class IndexingOverridesTest {
-
-  @Test
-  public void indexingOverridesLoadableWithoutDefaultImplementation()
-      throws IOException {
-    BloomFilterCreator mockBloomFilterCreator = mock(BloomFilterCreator.class);
-    BloomFilterReader mockBloomFilterReader = mock(BloomFilterReader.class);
-    assertTrue(IndexingOverrides.registerProvider(new IndexingOverrides.Default() {
-      @Override
-      public BloomFilterCreator newBloomFilterCreator(IndexCreationContext.BloomFilter context) {
-        return mockBloomFilterCreator;
-      }
-
-      @Override
-      public BloomFilterReader newBloomFilterReader(PinotDataBuffer dataBuffer, boolean onHeap) {
-        return mockBloomFilterReader;
-      }
-    }));
-    // it's ok to load external overrides without an internal implementation present, e.g. for testing
-    assertEquals(mockBloomFilterCreator, IndexingOverrides.getIndexCreatorProvider()
-        .newBloomFilterCreator(mock(IndexCreationContext.BloomFilter.class)));
-    assertEquals(mockBloomFilterReader, IndexingOverrides.getIndexReaderProvider()
-        .newBloomFilterReader(mock(PinotDataBuffer.class), false));
-  }
-
-  @Test(expectedExceptions = UnsupportedOperationException.class)
-  public void whenDefaultImplementationMissingThrowUnsupportedOperationExceptionCreator()
-      throws IOException {
-    // the implementation is missing so no indexes will be created anyway...
-    new IndexingOverrides.Default().newBloomFilterCreator(mock(IndexCreationContext.BloomFilter.class));
-  }
-
-  @Test(expectedExceptions = UnsupportedOperationException.class)
-  public void whenDefaultImplementationMissingThrowUnsupportedOperationExceptionReader()
-      throws IOException {
-    // the implementation is missing so no indexes will be created anyway...
-    new IndexingOverrides.Default().newBloomFilterReader(mock(PinotDataBuffer.class), true);
-  }
-}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGeneratorTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGeneratorTest.java
index 0fef3e69918..4352aa4a243 100644
--- a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGeneratorTest.java
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/creator/name/NormalizedDateSegmentNameGeneratorTest.java
@@ -215,6 +215,13 @@ public void testStringSimpleDateFormat() {
         "myTable_1970-01-02_1970-01-04");
     assertEquals(segmentNameGenerator.generateSegmentName(VALID_SEQUENCE_ID, "1970-01-02", "1970-01-04"),
         "myTable_1970-01-02_1970-01-04_1");
+
+    // The following date time format will work with Joda time library and not java.text
+    segmentNameGenerator =
+        new NormalizedDateSegmentNameGenerator(TABLE_NAME, null, false, APPEND_PUSH_TYPE, DAILY_PUSH_FREQUENCY,
+            DateTimeFormatSpec.forSimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSZ"), null);
+    assertEquals(segmentNameGenerator.generateSegmentName(VALID_SEQUENCE_ID, "2023-01-01T12:00:00.111111111Z",
+        "2023-01-02T12:00:00.111111111Z"), "myTable_2023-01-01_2023-01-02_1");
   }
 
   @Test
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/DictionaryIndexConfigTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/DictionaryIndexConfigTest.java
new file mode 100644
index 00000000000..f4faf0a62d6
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/DictionaryIndexConfigTest.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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class DictionaryIndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    DictionaryIndexConfig config = JsonUtils.stringToObject(confStr, DictionaryIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isOnHeap(), "Unexpected onHeap");
+    assertFalse(config.getUseVarLengthDictionary(), "Unexpected useVarLengthDictionary");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    DictionaryIndexConfig config = JsonUtils.stringToObject(confStr, DictionaryIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isOnHeap(), "Unexpected onHeap");
+    assertFalse(config.getUseVarLengthDictionary(), "Unexpected useVarLengthDictionary");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    DictionaryIndexConfig config = JsonUtils.stringToObject(confStr, DictionaryIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isOnHeap(), "Unexpected onHeap");
+    assertFalse(config.getUseVarLengthDictionary(), "Unexpected useVarLengthDictionary");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    DictionaryIndexConfig config = JsonUtils.stringToObject(confStr, DictionaryIndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isOnHeap(), "Unexpected onHeap");
+    assertFalse(config.getUseVarLengthDictionary(), "Unexpected useVarLengthDictionary");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "  \"onHeap\": true,\n"
+        + "  \"useVarLengthDictionary\": true\n"
+        + "}";
+    DictionaryIndexConfig config = JsonUtils.stringToObject(confStr, DictionaryIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertTrue(config.isOnHeap(), "Unexpected onHeap");
+    assertTrue(config.getUseVarLengthDictionary(), "Unexpected useVarLengthDictionary");
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/FieldIndexConfigsTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/FieldIndexConfigsTest.java
new file mode 100644
index 00000000000..36817188fcd
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/FieldIndexConfigsTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.spi.index;
+
+import java.io.IOException;
+import org.apache.pinot.spi.config.table.IndexConfig;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class FieldIndexConfigsTest {
+
+  @Test
+  public void testToString()
+      throws IOException {
+    IndexType index1 = Mockito.mock(IndexType.class);
+    Mockito.when(index1.getId()).thenReturn("index1");
+    IndexConfig indexConf = new IndexConfig(false);
+    FieldIndexConfigs fieldIndexConfigs = new FieldIndexConfigs.Builder()
+        .add(index1, indexConf)
+        .build();
+
+    Assert.assertEquals(fieldIndexConfigs.toString(), "{\"index1\":"
+        + JsonUtils.objectToString(indexConf) + "}");
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/ForwardIndexConfigTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/ForwardIndexConfigTest.java
new file mode 100644
index 00000000000..4d181d288ac
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/ForwardIndexConfigTest.java
@@ -0,0 +1,98 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class ForwardIndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    ForwardIndexConfig config = JsonUtils.stringToObject(confStr, ForwardIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getChunkCompressionType(), "Unexpected chunkCompressionType");
+    assertFalse(config.isDeriveNumDocsPerChunk(), "Unexpected deriveNumDocsPerChunk");
+    assertEquals(config.getRawIndexWriterVersion(), ForwardIndexConfig.DEFAULT_RAW_WRITER_VERSION,
+        "Unexpected rawIndexWriterVersion");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    ForwardIndexConfig config = JsonUtils.stringToObject(confStr, ForwardIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getChunkCompressionType(), "Unexpected chunkCompressionType");
+    assertFalse(config.isDeriveNumDocsPerChunk(), "Unexpected deriveNumDocsPerChunk");
+    assertEquals(config.getRawIndexWriterVersion(), ForwardIndexConfig.DEFAULT_RAW_WRITER_VERSION,
+        "Unexpected rawIndexWriterVersion");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    ForwardIndexConfig config = JsonUtils.stringToObject(confStr, ForwardIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getChunkCompressionType(), "Unexpected chunkCompressionType");
+    assertFalse(config.isDeriveNumDocsPerChunk(), "Unexpected deriveNumDocsPerChunk");
+    assertEquals(config.getRawIndexWriterVersion(), ForwardIndexConfig.DEFAULT_RAW_WRITER_VERSION,
+        "Unexpected rawIndexWriterVersion");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    ForwardIndexConfig config = JsonUtils.stringToObject(confStr, ForwardIndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getChunkCompressionType(), "Unexpected chunkCompressionType");
+    assertFalse(config.isDeriveNumDocsPerChunk(), "Unexpected deriveNumDocsPerChunk");
+    assertEquals(config.getRawIndexWriterVersion(), ForwardIndexConfig.DEFAULT_RAW_WRITER_VERSION,
+        "Unexpected rawIndexWriterVersion");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"chunkCompressionType\": \"SNAPPY\",\n"
+        + "        \"deriveNumDocsPerChunk\": true,\n"
+        + "        \"rawIndexWriterVersion\": 10\n"
+        + "}";
+    ForwardIndexConfig config = JsonUtils.stringToObject(confStr, ForwardIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getChunkCompressionType(), ChunkCompressionType.SNAPPY, "Unexpected chunkCompressionType");
+    assertTrue(config.isDeriveNumDocsPerChunk(), "Unexpected deriveNumDocsPerChunk");
+    assertEquals(config.getRawIndexWriterVersion(), 10, "Unexpected rawIndexWriterVersion");
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/FstIndexConfigTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/FstIndexConfigTest.java
new file mode 100644
index 00000000000..fac69f9db0e
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/FstIndexConfigTest.java
@@ -0,0 +1,82 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class FstIndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    FstIndexConfig config = JsonUtils.stringToObject(confStr, FstIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected type");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    FstIndexConfig config = JsonUtils.stringToObject(confStr, FstIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected type");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    FstIndexConfig config = JsonUtils.stringToObject(confStr, FstIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected type");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    FstIndexConfig config = JsonUtils.stringToObject(confStr, FstIndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected type");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"type\": \"NATIVE\"\n"
+        + "}";
+    FstIndexConfig config = JsonUtils.stringToObject(confStr, FstIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getFstType(), FSTType.NATIVE, "Unexpected type");
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/RangeIndexConfigTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/RangeIndexConfigTest.java
new file mode 100644
index 00000000000..f06ef9c8aac
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/RangeIndexConfigTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class RangeIndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    RangeIndexConfig config = JsonUtils.stringToObject(confStr, RangeIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getVersion(), RangeIndexConfig.DEFAULT.getVersion(), "Unexpected version");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    RangeIndexConfig config = JsonUtils.stringToObject(confStr, RangeIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getVersion(), RangeIndexConfig.DEFAULT.getVersion(), "Unexpected version");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    RangeIndexConfig config = JsonUtils.stringToObject(confStr, RangeIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getVersion(), RangeIndexConfig.DEFAULT.getVersion(), "Unexpected version");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    RangeIndexConfig config = JsonUtils.stringToObject(confStr, RangeIndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getVersion(), RangeIndexConfig.DEFAULT.getVersion(), "Unexpected version");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"version\": 42\n"
+        + "}";
+    RangeIndexConfig config = JsonUtils.stringToObject(confStr, RangeIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getVersion(), 42, "Unexpected version");
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/TextIndexConfigTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/TextIndexConfigTest.java
new file mode 100644
index 00000000000..fd7147740f8
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/TextIndexConfigTest.java
@@ -0,0 +1,112 @@
+/**
+ * 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.pinot.segment.spi.index;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.config.table.FSTType;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import static org.testng.Assert.*;
+
+
+public class TextIndexConfigTest {
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    TextIndexConfig config = JsonUtils.stringToObject(confStr, TextIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected fst");
+    assertNull(config.getRawValueForTextIndex(), "Unexpected rawValue");
+    assertFalse(config.isEnableQueryCache(), "Unexpected queryCache");
+    assertFalse(config.isUseANDForMultiTermQueries(), "Unexpected useANDForMultiTermQueries");
+    assertNull(config.getStopWordsInclude(), "Unexpected stopWordsInclude");
+    assertNull(config.getStopWordsExclude(), "Unexpected stopWordsExclude");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    TextIndexConfig config = JsonUtils.stringToObject(confStr, TextIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected fst");
+    assertNull(config.getRawValueForTextIndex(), "Unexpected rawValue");
+    assertFalse(config.isEnableQueryCache(), "Unexpected queryCache");
+    assertFalse(config.isUseANDForMultiTermQueries(), "Unexpected useANDForMultiTermQueries");
+    assertNull(config.getStopWordsInclude(), "Unexpected stopWordsInclude");
+    assertNull(config.getStopWordsExclude(), "Unexpected stopWordsExclude");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    TextIndexConfig config = JsonUtils.stringToObject(confStr, TextIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected fst");
+    assertNull(config.getRawValueForTextIndex(), "Unexpected rawValue");
+    assertFalse(config.isEnableQueryCache(), "Unexpected queryCache");
+    assertFalse(config.isUseANDForMultiTermQueries(), "Unexpected useANDForMultiTermQueries");
+    assertNull(config.getStopWordsInclude(), "Unexpected stopWordsInclude");
+    assertNull(config.getStopWordsExclude(), "Unexpected stopWordsExclude");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    TextIndexConfig config = JsonUtils.stringToObject(confStr, TextIndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getFstType(), "Unexpected fst");
+    assertNull(config.getRawValueForTextIndex(), "Unexpected rawValue");
+    assertFalse(config.isEnableQueryCache(), "Unexpected queryCache");
+    assertFalse(config.isUseANDForMultiTermQueries(), "Unexpected useANDForMultiTermQueries");
+    assertNull(config.getStopWordsInclude(), "Unexpected stopWordsInclude");
+    assertNull(config.getStopWordsExclude(), "Unexpected stopWordsExclude");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"fst\": \"NATIVE\",\n"
+        + "        \"rawValue\": \"fakeValue\",\n"
+        + "        \"queryCache\": true,\n"
+        + "        \"useANDForMultiTermQueries\": true,\n"
+        + "        \"stopWordsInclude\": [\"a\"],\n"
+        + "        \"stopWordsExclude\": [\"b\"]\n"
+        + "}";
+    TextIndexConfig config = JsonUtils.stringToObject(confStr, TextIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertEquals(config.getFstType(), FSTType.NATIVE, "Unexpected fst");
+    assertEquals(config.getRawValueForTextIndex(), "fakeValue", "Unexpected rawValue");
+    assertTrue(config.isEnableQueryCache(), "Unexpected queryCache");
+    assertTrue(config.isUseANDForMultiTermQueries(), "Unexpected useANDForMultiTermQueries");
+    assertEquals(config.getStopWordsInclude(), Lists.newArrayList("a"), "Unexpected stopWordsInclude");
+    assertEquals(config.getStopWordsExclude(), Lists.newArrayList("b"), "Unexpected stopWordsExclude");
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfigTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfigTest.java
new file mode 100644
index 00000000000..d3043afef44
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/index/creator/H3IndexConfigTest.java
@@ -0,0 +1,110 @@
+/**
+ * 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.pinot.segment.spi.index.creator;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.Lists;
+import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class H3IndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    H3IndexConfig config = JsonUtils.stringToObject(confStr, H3IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getResolution(), "Unexpected resolution");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    H3IndexConfig config = JsonUtils.stringToObject(confStr, H3IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getResolution(), "Unexpected resolution");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    H3IndexConfig config = JsonUtils.stringToObject(confStr, H3IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getResolution(), "Unexpected resolution");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    H3IndexConfig config = JsonUtils.stringToObject(confStr, H3IndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertNull(config.getResolution(), "Unexpected resolution");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"resolution\": [13, 5, 6]\n"
+        + "}";
+    H3IndexConfig config = JsonUtils.stringToObject(confStr, H3IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    H3IndexResolution resolution = config.getResolution();
+    Assert.assertEquals(resolution.size(), 3);
+    Assert.assertEquals(resolution.getLowestResolution(), 5);
+    Assert.assertEquals(resolution.getResolutions(), Lists.newArrayList(5, 6, 13));
+  }
+
+  @Test
+  public void serde()
+      throws JsonProcessingException {
+    H3IndexConfig initialConf = new H3IndexConfig(new H3IndexResolution(Lists.newArrayList(5, 6, 13)));
+
+    String confAsJson = JsonUtils.objectToString(initialConf);
+    Assert.assertEquals(confAsJson, "{\"disabled\":false,\"resolution\":[5,6,13]}");
+
+    H3IndexConfig readConf = JsonUtils.stringToObject(confAsJson, H3IndexConfig.class);
+    Assert.assertEquals(readConf, initialConf, "Unexpected configuration after serialization and deserialization");
+  }
+
+  @Test
+  public void deserializeShort()
+      throws JsonProcessingException {
+    H3IndexConfig initialConf = new H3IndexConfig(new H3IndexResolution(Lists.newArrayList(5, 6, 13)));
+
+    String serialized = "{\"resolution\":8288}";
+    H3IndexConfig h3IndexConfig = JsonUtils.stringToObject(serialized, H3IndexConfig.class);
+
+    Assert.assertEquals(h3IndexConfig, initialConf, "Unexpected configuration after reading " + serialized);
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotByteBufferTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotByteBufferTest.java
new file mode 100644
index 00000000000..fc80635ca4b
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotByteBufferTest.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.spi.memory;
+
+public class PinotByteBufferTest extends PinotDataBufferInstanceTestBase {
+  public PinotByteBufferTest() {
+    super(new ByteBufferPinotBufferFactory());
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferInstanceTestBase.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferInstanceTestBase.java
new file mode 100644
index 00000000000..52f85d676f8
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferInstanceTestBase.java
@@ -0,0 +1,366 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.concurrent.Future;
+import org.apache.commons.io.FileUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+/**
+ * A test contract that all pinot data buffer implementations should include.
+ */
+public abstract class PinotDataBufferInstanceTestBase extends PinotDataBufferTestBase {
+
+  public final PinotBufferFactory _factory;
+
+  public PinotDataBufferInstanceTestBase(PinotBufferFactory factory) {
+    _factory = factory;
+  }
+
+  @BeforeMethod
+  public void setFactory() {
+    PinotDataBuffer.useFactory(_factory);
+  }
+
+  @AfterTest
+  public void cleanFactory() {
+    PinotDataBuffer.useFactory(PinotDataBuffer.createDefaultFactory());
+  }
+
+  @BeforeMethod
+  public void cleanStats() {
+    PinotDataBuffer.cleanStats();
+  }
+
+  @SuppressWarnings("RedundantExplicitClose")
+  @Test
+  public void testMultipleClose()
+      throws Exception {
+    try (PinotDataBuffer buffer = _factory.allocateDirect(BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
+      buffer.close();
+    }
+    try (PinotDataBuffer buffer = _factory.allocateDirect(BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
+      buffer.close();
+    }
+    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
+      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
+      try (PinotDataBuffer buffer = _factory.readFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, ByteOrder.LITTLE_ENDIAN)) {
+        buffer.close();
+      }
+      try (PinotDataBuffer buffer = _factory.readFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN)) {
+        buffer.close();
+      }
+      try (PinotDataBuffer buffer = _factory
+          .mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE, ByteOrder.LITTLE_ENDIAN)) {
+        buffer.close();
+      }
+      try (PinotDataBuffer buffer =
+          _factory.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN)) {
+        buffer.close();
+      }
+    } finally {
+      FileUtils.forceDelete(TEMP_FILE);
+    }
+  }
+
+  @Test
+  public void testDirectBE()
+      throws Exception {
+    try (PinotDataBuffer buffer = _factory.allocateDirect(BUFFER_SIZE, ByteOrder.BIG_ENDIAN)) {
+      Assert.assertSame(buffer.order(), ByteOrder.BIG_ENDIAN);
+      testPinotDataBuffer(buffer);
+    }
+  }
+
+  @Test
+  public void testDirectLE()
+      throws Exception {
+    try (PinotDataBuffer buffer = PinotByteBuffer.allocateDirect(BUFFER_SIZE, ByteOrder.LITTLE_ENDIAN)) {
+      Assert.assertSame(buffer.order(), ByteOrder.LITTLE_ENDIAN);
+      testPinotDataBuffer(buffer);
+    }
+  }
+
+  @Test
+  public void testReadFileBE()
+      throws Exception {
+    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
+      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
+      try (PinotDataBuffer buffer = _factory
+          .readFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN)) {
+        Assert.assertSame(buffer.order(), ByteOrder.BIG_ENDIAN);
+        testPinotDataBuffer(buffer);
+      }
+    }
+  }
+
+  @Test
+  public void testReadFileLE()
+      throws Exception {
+    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
+      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
+      try (PinotDataBuffer buffer = _factory
+          .readFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, ByteOrder.LITTLE_ENDIAN)) {
+        Assert.assertSame(buffer.order(), ByteOrder.LITTLE_ENDIAN);
+        testPinotDataBuffer(buffer);
+      }
+    }
+  }
+
+  @Test
+  public void testMapFileBE()
+      throws Exception {
+    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
+      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
+      try (PinotDataBuffer buffer = _factory
+          .mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN)) {
+        Assert.assertSame(buffer.order(), ByteOrder.BIG_ENDIAN);
+        testPinotDataBuffer(buffer);
+      }
+    }
+  }
+
+  @Test
+  public void testMapFileLE()
+      throws Exception {
+    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
+      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
+      try (PinotDataBuffer buffer = _factory
+          .mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE, ByteOrder.LITTLE_ENDIAN)) {
+        Assert.assertSame(buffer.order(), ByteOrder.LITTLE_ENDIAN);
+        testPinotDataBuffer(buffer);
+      }
+    }
+  }
+
+  protected void testPinotDataBuffer(PinotDataBuffer buffer)
+      throws Exception {
+    Assert.assertEquals(buffer.size(), BUFFER_SIZE);
+    testReadWriteByte(buffer);
+    testReadWriteChar(buffer);
+    testReadWriteShort(buffer);
+    testReadWriteInt(buffer);
+    testReadWriteLong(buffer);
+    testReadWriteFloat(buffer);
+    testReadWriteDouble(buffer);
+    testReadWriteBytes(buffer);
+    testReadWritePinotDataBuffer(buffer);
+    testReadFromByteBuffer(buffer);
+    testConcurrentReadWrite(buffer);
+  }
+
+  protected void testReadWriteByte(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int intOffset = RANDOM.nextInt(BUFFER_SIZE);
+      buffer.putByte(intOffset, _bytes[i]);
+      Assert.assertEquals(buffer.getByte(intOffset), _bytes[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      long longOffset = RANDOM.nextInt(BUFFER_SIZE);
+      buffer.putByte(longOffset, _bytes[i]);
+      Assert.assertEquals(buffer.getByte(longOffset), _bytes[i]);
+    }
+  }
+
+  protected void testReadWriteChar(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(CHAR_ARRAY_LENGTH);
+      int intOffset = index * Byte.BYTES;
+      buffer.putChar(intOffset, _chars[i]);
+      Assert.assertEquals(buffer.getChar(intOffset), _chars[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(CHAR_ARRAY_LENGTH);
+      long longOffset = index * Byte.BYTES;
+      buffer.putChar(longOffset, _chars[i]);
+      Assert.assertEquals(buffer.getChar(longOffset), _chars[i]);
+    }
+  }
+
+  protected void testReadWriteShort(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(SHORT_ARRAY_LENGTH);
+      int intOffset = index * Byte.BYTES;
+      buffer.putShort(intOffset, _shorts[i]);
+      Assert.assertEquals(buffer.getShort(intOffset), _shorts[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(SHORT_ARRAY_LENGTH);
+      long longOffset = index * Byte.BYTES;
+      buffer.putShort(longOffset, _shorts[i]);
+      Assert.assertEquals(buffer.getShort(longOffset), _shorts[i]);
+    }
+  }
+
+  protected void testReadWriteInt(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(INT_ARRAY_LENGTH);
+      int intOffset = index * Byte.BYTES;
+      buffer.putInt(intOffset, _ints[i]);
+      Assert.assertEquals(buffer.getInt(intOffset), _ints[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(INT_ARRAY_LENGTH);
+      long longOffset = index * Byte.BYTES;
+      buffer.putInt(longOffset, _ints[i]);
+      Assert.assertEquals(buffer.getInt(longOffset), _ints[i]);
+    }
+  }
+
+  protected void testReadWriteLong(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(LONG_ARRAY_LENGTH);
+      int intOffset = index * Byte.BYTES;
+      buffer.putLong(intOffset, _longs[i]);
+      Assert.assertEquals(buffer.getLong(intOffset), _longs[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(LONG_ARRAY_LENGTH);
+      long longOffset = index * Byte.BYTES;
+      buffer.putLong(longOffset, _longs[i]);
+      Assert.assertEquals(buffer.getLong(longOffset), _longs[i]);
+    }
+  }
+
+  protected void testReadWriteFloat(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(FLOAT_ARRAY_LENGTH);
+      int intOffset = index * Byte.BYTES;
+      buffer.putFloat(intOffset, _floats[i]);
+      Assert.assertEquals(buffer.getFloat(intOffset), _floats[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(FLOAT_ARRAY_LENGTH);
+      long longOffset = index * Byte.BYTES;
+      buffer.putFloat(longOffset, _floats[i]);
+      Assert.assertEquals(buffer.getFloat(longOffset), _floats[i]);
+    }
+  }
+
+  protected void testReadWriteDouble(PinotDataBuffer buffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(DOUBLE_ARRAY_LENGTH);
+      int intOffset = index * Byte.BYTES;
+      buffer.putDouble(intOffset, _doubles[i]);
+      Assert.assertEquals(buffer.getDouble(intOffset), _doubles[i]);
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int index = RANDOM.nextInt(DOUBLE_ARRAY_LENGTH);
+      long longOffset = index * Byte.BYTES;
+      buffer.putDouble(longOffset, _doubles[i]);
+      Assert.assertEquals(buffer.getDouble(longOffset), _doubles[i]);
+    }
+  }
+
+  protected void testReadWriteBytes(PinotDataBuffer buffer) {
+    byte[] readBuffer = new byte[MAX_BYTES_LENGTH];
+    byte[] writeBuffer = new byte[MAX_BYTES_LENGTH];
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
+      int offset = RANDOM.nextInt(BUFFER_SIZE - length);
+      int arrayOffset = RANDOM.nextInt(MAX_BYTES_LENGTH - length);
+      System.arraycopy(_bytes, offset, readBuffer, arrayOffset, length);
+      buffer.readFrom(offset, readBuffer, arrayOffset, length);
+      buffer.copyTo(offset, writeBuffer, arrayOffset, length);
+      int end = arrayOffset + length;
+      for (int j = arrayOffset; j < end; j++) {
+        Assert.assertEquals(writeBuffer[j], readBuffer[j]);
+      }
+    }
+  }
+
+  protected void testReadWritePinotDataBuffer(PinotDataBuffer buffer) {
+    testReadWritePinotDataBuffer(buffer, PinotByteBuffer.allocateDirect(MAX_BYTES_LENGTH, PinotDataBuffer.NATIVE_ORDER),
+        PinotByteBuffer.allocateDirect(MAX_BYTES_LENGTH, PinotDataBuffer.NON_NATIVE_ORDER));
+    testReadWritePinotDataBuffer(buffer,
+        PinotByteBuffer.allocateDirect(2 * MAX_BYTES_LENGTH, PinotDataBuffer.NON_NATIVE_ORDER)
+            .view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH),
+        PinotByteBuffer.allocateDirect(2 * MAX_BYTES_LENGTH, PinotDataBuffer.NATIVE_ORDER)
+            .view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH));
+    testReadWritePinotDataBuffer(buffer, _factory.allocateDirect(MAX_BYTES_LENGTH, ByteOrder.nativeOrder()),
+        _factory.allocateDirect(MAX_BYTES_LENGTH, PinotDataBuffer.NON_NATIVE_ORDER));
+    testReadWritePinotDataBuffer(buffer,
+        _factory.allocateDirect(2 * MAX_BYTES_LENGTH, ByteOrder.nativeOrder())
+            .view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH),
+        _factory.allocateDirect(2 * MAX_BYTES_LENGTH, PinotDataBuffer.NON_NATIVE_ORDER)
+            .view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH));
+  }
+
+  protected void testReadWritePinotDataBuffer(PinotDataBuffer buffer, PinotDataBuffer readBuffer,
+      PinotDataBuffer writeBuffer) {
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
+      int offset = RANDOM.nextInt(BUFFER_SIZE - length);
+      readBuffer.readFrom(0, _bytes, RANDOM.nextInt(BUFFER_SIZE - length), length);
+      readBuffer.copyTo(0, buffer, offset, length);
+      for (int j = 0; j < length; j++) {
+        Assert.assertEquals(buffer.getByte(j + offset), readBuffer.getByte(j));
+      }
+      buffer.copyTo(offset, writeBuffer, 0, length);
+      for (int j = 0; j < length; j++) {
+        Assert.assertEquals(writeBuffer.getByte(j), readBuffer.getByte(j));
+      }
+    }
+  }
+
+  protected void testReadFromByteBuffer(PinotDataBuffer buffer) {
+    byte[] readBuffer = new byte[MAX_BYTES_LENGTH];
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
+      int offset = RANDOM.nextInt(BUFFER_SIZE - length);
+      System.arraycopy(_bytes, offset, readBuffer, 0, length);
+      buffer.readFrom(offset, ByteBuffer.wrap(readBuffer, 0, length));
+      for (int j = 0; j < length; j++) {
+        Assert.assertEquals(buffer.getByte(offset + j), readBuffer[j]);
+      }
+    }
+  }
+
+  protected void testConcurrentReadWrite(PinotDataBuffer buffer)
+      throws Exception {
+    Future[] futures = new Future[NUM_ROUNDS];
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      futures[i] = _executorService.submit(() -> {
+        PinotDataBuffer.useFactory(_factory);
+        int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
+        int offset = RANDOM.nextInt(BUFFER_SIZE - length);
+        byte[] readBuffer = new byte[length];
+        byte[] writeBuffer = new byte[length];
+        System.arraycopy(_bytes, offset, readBuffer, 0, length);
+        buffer.readFrom(offset, readBuffer);
+        buffer.copyTo(offset, writeBuffer);
+        Assert.assertTrue(Arrays.equals(readBuffer, writeBuffer));
+        buffer.readFrom(offset, ByteBuffer.wrap(readBuffer));
+        buffer.copyTo(offset, writeBuffer);
+        Assert.assertTrue(Arrays.equals(readBuffer, writeBuffer));
+      });
+    }
+    for (int i = 0; i < NUM_ROUNDS; i++) {
+      futures[i].get();
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTest.java
index 1538351c152..7a59af52767 100644
--- a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTest.java
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTest.java
@@ -18,71 +18,22 @@
  */
 package org.apache.pinot.segment.spi.memory;
 
-import java.io.File;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.Arrays;
-import java.util.Random;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import org.apache.commons.io.FileUtils;
 import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 
-public class PinotDataBufferTest {
-  private static final Random RANDOM = new Random();
-  private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(10);
-  private static final File TEMP_FILE = new File(FileUtils.getTempDirectory(), "PinotDataBufferTest");
-  private static final int FILE_OFFSET = 10;      // Not page-aligned
-  private static final int BUFFER_SIZE = 10_000;  // Not page-aligned
-  private static final int CHAR_ARRAY_LENGTH = BUFFER_SIZE / Character.BYTES;
-  private static final int SHORT_ARRAY_LENGTH = BUFFER_SIZE / Short.BYTES;
-  private static final int INT_ARRAY_LENGTH = BUFFER_SIZE / Integer.BYTES;
-  private static final int LONG_ARRAY_LENGTH = BUFFER_SIZE / Long.BYTES;
-  private static final int FLOAT_ARRAY_LENGTH = BUFFER_SIZE / Float.BYTES;
-  private static final int DOUBLE_ARRAY_LENGTH = BUFFER_SIZE / Double.BYTES;
-  private static final int NUM_ROUNDS = 1000;
-  private static final int MAX_BYTES_LENGTH = 100;
-  private static final long LARGE_BUFFER_SIZE = Integer.MAX_VALUE + 2L; // Not page-aligned
+public abstract class PinotDataBufferTest extends PinotDataBufferInstanceTestBase {
 
-  private byte[] _bytes = new byte[BUFFER_SIZE];
-  private char[] _chars = new char[CHAR_ARRAY_LENGTH];
-  private short[] _shorts = new short[SHORT_ARRAY_LENGTH];
-  private int[] _ints = new int[INT_ARRAY_LENGTH];
-  private long[] _longs = new long[LONG_ARRAY_LENGTH];
-  private float[] _floats = new float[FLOAT_ARRAY_LENGTH];
-  private double[] _doubles = new double[DOUBLE_ARRAY_LENGTH];
-
-  @BeforeClass
-  public void setUp() {
-    for (int i = 0; i < BUFFER_SIZE; i++) {
-      _bytes[i] = (byte) RANDOM.nextInt();
-    }
-    for (int i = 0; i < CHAR_ARRAY_LENGTH; i++) {
-      _chars[i] = (char) RANDOM.nextInt();
-    }
-    for (int i = 0; i < SHORT_ARRAY_LENGTH; i++) {
-      _shorts[i] = (short) RANDOM.nextInt();
-    }
-    for (int i = 0; i < INT_ARRAY_LENGTH; i++) {
-      _ints[i] = RANDOM.nextInt();
-    }
-    for (int i = 0; i < LONG_ARRAY_LENGTH; i++) {
-      _longs[i] = RANDOM.nextLong();
-    }
-    for (int i = 0; i < FLOAT_ARRAY_LENGTH; i++) {
-      _floats[i] = RANDOM.nextFloat();
-    }
-    for (int i = 0; i < DOUBLE_ARRAY_LENGTH; i++) {
-      _doubles[i] = RANDOM.nextDouble();
-    }
+  public PinotDataBufferTest(PinotBufferFactory factory) {
+    super(factory);
   }
 
+  protected abstract boolean prioritizeByteBuffer();
+
   @Test
   public void testPinotByteBuffer()
       throws Exception {
@@ -115,18 +66,17 @@ public void testPinotByteBuffer()
     }
   }
 
-  @Test
-  public void testPinotNativeOrderLBuffer()
-      throws Exception {
-    try (PinotDataBuffer buffer = PinotNativeOrderLBuffer.allocateDirect(BUFFER_SIZE)) {
+  private void testOrderBuffer(ByteOrder byteOrder) throws Exception {
+    try (PinotDataBuffer buffer = _factory.allocateDirect(BUFFER_SIZE, byteOrder)) {
       testPinotDataBuffer(buffer);
     }
     try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
       randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
-      try (PinotDataBuffer buffer = PinotNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE)) {
+      try (PinotDataBuffer buffer = _factory.readFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, byteOrder)) {
         testPinotDataBuffer(buffer);
       }
-      try (PinotDataBuffer buffer = PinotNativeOrderLBuffer.mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE)) {
+      try (PinotDataBuffer buffer =
+          _factory.mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE, byteOrder)) {
         testPinotDataBuffer(buffer);
       }
     } finally {
@@ -135,223 +85,15 @@ public void testPinotNativeOrderLBuffer()
   }
 
   @Test
-  public void testPinotNonNativeOrderLBuffer()
-      throws Exception {
-    try (PinotDataBuffer buffer = PinotNonNativeOrderLBuffer.allocateDirect(BUFFER_SIZE)) {
-      testPinotDataBuffer(buffer);
-    }
-    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
-      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
-      try (PinotDataBuffer buffer = PinotNonNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE)) {
-        testPinotDataBuffer(buffer);
-      }
-      try (PinotDataBuffer buffer = PinotNonNativeOrderLBuffer.mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE)) {
-        testPinotDataBuffer(buffer);
-      }
-    } finally {
-      FileUtils.forceDelete(TEMP_FILE);
-    }
-  }
-
-  private void testPinotDataBuffer(PinotDataBuffer buffer)
+  public void testPinotNativeOrderBuffer()
       throws Exception {
-    Assert.assertEquals(buffer.size(), BUFFER_SIZE);
-    testReadWriteByte(buffer);
-    testReadWriteChar(buffer);
-    testReadWriteShort(buffer);
-    testReadWriteInt(buffer);
-    testReadWriteLong(buffer);
-    testReadWriteFloat(buffer);
-    testReadWriteDouble(buffer);
-    testReadWriteBytes(buffer);
-    testReadWritePinotDataBuffer(buffer);
-    testReadFromByteBuffer(buffer);
-    testConcurrentReadWrite(buffer);
-  }
-
-  private void testReadWriteByte(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int intOffset = RANDOM.nextInt(BUFFER_SIZE);
-      buffer.putByte(intOffset, _bytes[i]);
-      Assert.assertEquals(buffer.getByte(intOffset), _bytes[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      long longOffset = RANDOM.nextInt(BUFFER_SIZE);
-      buffer.putByte(longOffset, _bytes[i]);
-      Assert.assertEquals(buffer.getByte(longOffset), _bytes[i]);
-    }
-  }
-
-  private void testReadWriteChar(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(CHAR_ARRAY_LENGTH);
-      int intOffset = index * Byte.BYTES;
-      buffer.putChar(intOffset, _chars[i]);
-      Assert.assertEquals(buffer.getChar(intOffset), _chars[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(CHAR_ARRAY_LENGTH);
-      long longOffset = index * Byte.BYTES;
-      buffer.putChar(longOffset, _chars[i]);
-      Assert.assertEquals(buffer.getChar(longOffset), _chars[i]);
-    }
-  }
-
-  private void testReadWriteShort(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(SHORT_ARRAY_LENGTH);
-      int intOffset = index * Byte.BYTES;
-      buffer.putShort(intOffset, _shorts[i]);
-      Assert.assertEquals(buffer.getShort(intOffset), _shorts[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(SHORT_ARRAY_LENGTH);
-      long longOffset = index * Byte.BYTES;
-      buffer.putShort(longOffset, _shorts[i]);
-      Assert.assertEquals(buffer.getShort(longOffset), _shorts[i]);
-    }
-  }
-
-  private void testReadWriteInt(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(INT_ARRAY_LENGTH);
-      int intOffset = index * Byte.BYTES;
-      buffer.putInt(intOffset, _ints[i]);
-      Assert.assertEquals(buffer.getInt(intOffset), _ints[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(INT_ARRAY_LENGTH);
-      long longOffset = index * Byte.BYTES;
-      buffer.putInt(longOffset, _ints[i]);
-      Assert.assertEquals(buffer.getInt(longOffset), _ints[i]);
-    }
+    testOrderBuffer(PinotDataBuffer.NATIVE_ORDER);
   }
 
-  private void testReadWriteLong(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(LONG_ARRAY_LENGTH);
-      int intOffset = index * Byte.BYTES;
-      buffer.putLong(intOffset, _longs[i]);
-      Assert.assertEquals(buffer.getLong(intOffset), _longs[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(LONG_ARRAY_LENGTH);
-      long longOffset = index * Byte.BYTES;
-      buffer.putLong(longOffset, _longs[i]);
-      Assert.assertEquals(buffer.getLong(longOffset), _longs[i]);
-    }
-  }
-
-  private void testReadWriteFloat(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(FLOAT_ARRAY_LENGTH);
-      int intOffset = index * Byte.BYTES;
-      buffer.putFloat(intOffset, _floats[i]);
-      Assert.assertEquals(buffer.getFloat(intOffset), _floats[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(FLOAT_ARRAY_LENGTH);
-      long longOffset = index * Byte.BYTES;
-      buffer.putFloat(longOffset, _floats[i]);
-      Assert.assertEquals(buffer.getFloat(longOffset), _floats[i]);
-    }
-  }
-
-  private void testReadWriteDouble(PinotDataBuffer buffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(DOUBLE_ARRAY_LENGTH);
-      int intOffset = index * Byte.BYTES;
-      buffer.putDouble(intOffset, _doubles[i]);
-      Assert.assertEquals(buffer.getDouble(intOffset), _doubles[i]);
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int index = RANDOM.nextInt(DOUBLE_ARRAY_LENGTH);
-      long longOffset = index * Byte.BYTES;
-      buffer.putDouble(longOffset, _doubles[i]);
-      Assert.assertEquals(buffer.getDouble(longOffset), _doubles[i]);
-    }
-  }
-
-  private void testReadWriteBytes(PinotDataBuffer buffer) {
-    byte[] readBuffer = new byte[MAX_BYTES_LENGTH];
-    byte[] writeBuffer = new byte[MAX_BYTES_LENGTH];
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
-      int offset = RANDOM.nextInt(BUFFER_SIZE - length);
-      int arrayOffset = RANDOM.nextInt(MAX_BYTES_LENGTH - length);
-      System.arraycopy(_bytes, offset, readBuffer, arrayOffset, length);
-      buffer.readFrom(offset, readBuffer, arrayOffset, length);
-      buffer.copyTo(offset, writeBuffer, arrayOffset, length);
-      int end = arrayOffset + length;
-      for (int j = arrayOffset; j < end; j++) {
-        Assert.assertEquals(writeBuffer[j], readBuffer[j]);
-      }
-    }
-  }
-
-  private void testReadWritePinotDataBuffer(PinotDataBuffer buffer) {
-    testReadWritePinotDataBuffer(buffer, PinotByteBuffer.allocateDirect(MAX_BYTES_LENGTH, PinotDataBuffer.NATIVE_ORDER),
-        PinotByteBuffer.allocateDirect(MAX_BYTES_LENGTH, PinotDataBuffer.NON_NATIVE_ORDER));
-    testReadWritePinotDataBuffer(buffer,
-        PinotByteBuffer.allocateDirect(2 * MAX_BYTES_LENGTH, PinotDataBuffer.NON_NATIVE_ORDER)
-            .view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH),
-        PinotByteBuffer.allocateDirect(2 * MAX_BYTES_LENGTH, PinotDataBuffer.NATIVE_ORDER)
-            .view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH));
-    testReadWritePinotDataBuffer(buffer, PinotNativeOrderLBuffer.allocateDirect(MAX_BYTES_LENGTH),
-        PinotNonNativeOrderLBuffer.allocateDirect(MAX_BYTES_LENGTH));
-    testReadWritePinotDataBuffer(buffer,
-        PinotNonNativeOrderLBuffer.allocateDirect(2 * MAX_BYTES_LENGTH).view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH),
-        PinotNativeOrderLBuffer.allocateDirect(2 * MAX_BYTES_LENGTH).view(MAX_BYTES_LENGTH, 2 * MAX_BYTES_LENGTH));
-  }
-
-  private void testReadWritePinotDataBuffer(PinotDataBuffer buffer, PinotDataBuffer readBuffer,
-      PinotDataBuffer writeBuffer) {
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
-      int offset = RANDOM.nextInt(BUFFER_SIZE - length);
-      readBuffer.readFrom(0, _bytes, RANDOM.nextInt(BUFFER_SIZE - length), length);
-      readBuffer.copyTo(0, buffer, offset, length);
-      buffer.copyTo(offset, writeBuffer, 0, length);
-      for (int j = 0; j < length; j++) {
-        Assert.assertEquals(writeBuffer.getByte(j), readBuffer.getByte(j));
-      }
-    }
-  }
-
-  private void testReadFromByteBuffer(PinotDataBuffer buffer) {
-    byte[] readBuffer = new byte[MAX_BYTES_LENGTH];
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
-      int offset = RANDOM.nextInt(BUFFER_SIZE - length);
-      System.arraycopy(_bytes, offset, readBuffer, 0, length);
-      buffer.readFrom(offset, ByteBuffer.wrap(readBuffer, 0, length));
-      for (int j = 0; j < length; j++) {
-        Assert.assertEquals(buffer.getByte(offset + j), readBuffer[j]);
-      }
-    }
-  }
-
-  private void testConcurrentReadWrite(PinotDataBuffer buffer)
+  @Test
+  public void testPinotNonNativeOrderBuffer()
       throws Exception {
-    Future[] futures = new Future[NUM_ROUNDS];
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      futures[i] = EXECUTOR_SERVICE.submit(() -> {
-        int length = RANDOM.nextInt(MAX_BYTES_LENGTH);
-        int offset = RANDOM.nextInt(BUFFER_SIZE - length);
-        byte[] readBuffer = new byte[length];
-        byte[] writeBuffer = new byte[length];
-        System.arraycopy(_bytes, offset, readBuffer, 0, length);
-        buffer.readFrom(offset, readBuffer);
-        buffer.copyTo(offset, writeBuffer);
-        Assert.assertTrue(Arrays.equals(readBuffer, writeBuffer));
-        buffer.readFrom(offset, ByteBuffer.wrap(readBuffer));
-        buffer.copyTo(offset, writeBuffer);
-        Assert.assertTrue(Arrays.equals(readBuffer, writeBuffer));
-      });
-    }
-    for (int i = 0; i < NUM_ROUNDS; i++) {
-      futures[i].get();
-    }
+    testOrderBuffer(PinotDataBuffer.NON_NATIVE_ORDER);
   }
 
   @Test
@@ -373,15 +115,14 @@ public void testPinotByteBufferReadWriteFile()
     }
   }
 
-  @Test
-  public void testPinotNativeOrderLBufferReadWriteFile()
+  public void testPinotBufferReadWriteFile(ByteOrder byteOrder)
       throws Exception {
-    try (PinotDataBuffer writeBuffer = PinotNativeOrderLBuffer.mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE)) {
+    try (PinotDataBuffer writeBuffer = _factory.mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE, byteOrder)) {
       putInts(writeBuffer);
-      try (PinotDataBuffer readBuffer = PinotNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE)) {
+      try (PinotDataBuffer readBuffer = _factory.readFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, byteOrder)) {
         getInts(readBuffer);
       }
-      try (PinotDataBuffer readBuffer = PinotNativeOrderLBuffer.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE)) {
+      try (PinotDataBuffer readBuffer = _factory.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE, byteOrder)) {
         getInts(readBuffer);
       }
     } finally {
@@ -390,19 +131,15 @@ public void testPinotNativeOrderLBufferReadWriteFile()
   }
 
   @Test
-  public void testPinotNonNativeOrderLBufferReadWriteFile()
+  public void testPinotNativeOrderBufferReadWriteFile()
       throws Exception {
-    try (PinotDataBuffer writeBuffer = PinotNonNativeOrderLBuffer.mapFile(TEMP_FILE, false, FILE_OFFSET, BUFFER_SIZE)) {
-      putInts(writeBuffer);
-      try (PinotDataBuffer readBuffer = PinotNonNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE)) {
-        getInts(readBuffer);
-      }
-      try (PinotDataBuffer readBuffer = PinotNonNativeOrderLBuffer.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE)) {
-        getInts(readBuffer);
-      }
-    } finally {
-      FileUtils.forceDelete(TEMP_FILE);
-    }
+    testPinotBufferReadWriteFile(PinotDataBuffer.NATIVE_ORDER);
+  }
+
+  @Test
+  public void testPinotNonNativeOrderBufferReadWriteFile()
+      throws Exception {
+    testPinotBufferReadWriteFile(PinotDataBuffer.NON_NATIVE_ORDER);
   }
 
   private void putInts(PinotDataBuffer buffer) {
@@ -425,43 +162,47 @@ private void getInts(PinotDataBuffer buffer) {
   public void testViewAndToDirectByteBuffer()
       throws Exception {
     int startOffset = RANDOM.nextInt(BUFFER_SIZE);
+    ByteOrder nativeOrder = PinotDataBuffer.NATIVE_ORDER;
+    ByteOrder nonNativeOrder = PinotDataBuffer.NON_NATIVE_ORDER;
     try (PinotDataBuffer writeBuffer = PinotByteBuffer
-        .mapFile(TEMP_FILE, false, FILE_OFFSET, 3 * BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
+        .mapFile(TEMP_FILE, false, FILE_OFFSET, 3 * BUFFER_SIZE, nativeOrder)) {
       putLongs(writeBuffer, startOffset);
       try (PinotDataBuffer readBuffer = PinotByteBuffer
-          .loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
+          .loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE, nativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
       try (PinotDataBuffer readBuffer = PinotByteBuffer
-          .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
+          .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE, nativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
-      try (PinotDataBuffer readBuffer = PinotNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE)) {
+      try (PinotDataBuffer readBuffer = PinotByteBuffer
+          .loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE, nativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
       try (
-          PinotDataBuffer readBuffer = PinotNativeOrderLBuffer.mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE)) {
+          PinotDataBuffer readBuffer = PinotByteBuffer
+              .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE, nativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
     } finally {
       FileUtils.forceDelete(TEMP_FILE);
     }
     try (PinotDataBuffer writeBuffer = PinotByteBuffer
-        .mapFile(TEMP_FILE, false, FILE_OFFSET, 3 * BUFFER_SIZE, PinotDataBuffer.NON_NATIVE_ORDER)) {
+        .mapFile(TEMP_FILE, false, FILE_OFFSET, 3 * BUFFER_SIZE, nonNativeOrder)) {
       putLongs(writeBuffer, startOffset);
       try (PinotDataBuffer readBuffer = PinotByteBuffer
-          .loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE, PinotDataBuffer.NON_NATIVE_ORDER)) {
+          .loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE, nonNativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
       try (PinotDataBuffer readBuffer = PinotByteBuffer
-          .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE, PinotDataBuffer.NON_NATIVE_ORDER)) {
+          .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE, nonNativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
-      try (PinotDataBuffer readBuffer = PinotNonNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE)) {
+      try (PinotDataBuffer readBuffer = _factory.readFile(TEMP_FILE, FILE_OFFSET, 3 * BUFFER_SIZE, nonNativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
-      try (PinotDataBuffer readBuffer = PinotNonNativeOrderLBuffer
-          .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE)) {
+      try (PinotDataBuffer readBuffer = _factory
+          .mapFile(TEMP_FILE, true, FILE_OFFSET, 3 * BUFFER_SIZE, nonNativeOrder)) {
         testViewAndToDirectByteBuffer(readBuffer, startOffset);
       }
     } finally {
@@ -510,85 +251,48 @@ private void testByteBuffer(ByteBuffer byteBuffer) {
     }
   }
 
-  @SuppressWarnings("RedundantExplicitClose")
-  @Test
-  public void testMultipleClose()
-      throws Exception {
-    try (PinotDataBuffer buffer = PinotByteBuffer.allocateDirect(BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
-      buffer.close();
-    }
-    try (PinotDataBuffer buffer = PinotNativeOrderLBuffer.allocateDirect(BUFFER_SIZE)) {
-      buffer.close();
-    }
-    try (PinotDataBuffer buffer = PinotNonNativeOrderLBuffer.allocateDirect(BUFFER_SIZE)) {
-      buffer.close();
-    }
-    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
-      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
-      try (PinotDataBuffer buffer = PinotByteBuffer
-          .loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
-        buffer.close();
-      }
-      try (PinotDataBuffer buffer = PinotNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE)) {
-        buffer.close();
-      }
-      try (PinotDataBuffer buffer = PinotNonNativeOrderLBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE)) {
-        buffer.close();
-      }
-      try (PinotDataBuffer buffer = PinotByteBuffer
-          .mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER)) {
-        buffer.close();
-      }
-      try (PinotDataBuffer buffer = PinotNativeOrderLBuffer.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE)) {
-        buffer.close();
-      }
-      try (PinotDataBuffer buffer = PinotNonNativeOrderLBuffer.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE)) {
-        buffer.close();
-      }
-    } finally {
-      FileUtils.forceDelete(TEMP_FILE);
-    }
-  }
-
   @Test
   public void testConstructors()
       throws Exception {
     testBufferStats(0, 0, 0, 0);
-    try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
-      randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
-      try (PinotDataBuffer buffer1 = PinotDataBuffer.allocateDirect(BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER, null)) {
-        Assert.assertTrue(buffer1 instanceof PinotByteBuffer);
-        testBufferStats(1, BUFFER_SIZE, 0, 0);
-        try (PinotDataBuffer buffer2 = PinotDataBuffer
-            .loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN, null)) {
-          Assert.assertTrue(buffer2 instanceof PinotByteBuffer);
-          testBufferStats(2, 2 * BUFFER_SIZE, 0, 0);
-          try (PinotDataBuffer buffer3 = PinotDataBuffer
-              .mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN, null)) {
-            Assert.assertTrue(buffer3 instanceof PinotByteBuffer);
-            testBufferStats(2, 2 * BUFFER_SIZE, 1, BUFFER_SIZE);
+    if (prioritizeByteBuffer()) {
+      try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
+        randomAccessFile.setLength(FILE_OFFSET + BUFFER_SIZE);
+        try (PinotDataBuffer buffer1 =
+            PinotDataBuffer.allocateDirect(BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER, null)) {
+          Assert.assertTrue(buffer1 instanceof PinotByteBuffer);
+          testBufferStats(1, BUFFER_SIZE, 0, 0);
+          try (PinotDataBuffer buffer2 =
+              PinotDataBuffer.loadFile(TEMP_FILE, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN, null)) {
+            Assert.assertTrue(buffer2 instanceof PinotByteBuffer);
+            testBufferStats(2, 2 * BUFFER_SIZE, 0, 0);
+            try (PinotDataBuffer buffer3 =
+                PinotDataBuffer.mapFile(TEMP_FILE, true, FILE_OFFSET, BUFFER_SIZE, ByteOrder.BIG_ENDIAN, null)) {
+              Assert.assertTrue(buffer3 instanceof PinotByteBuffer);
+              testBufferStats(2, 2 * BUFFER_SIZE, 1, BUFFER_SIZE);
+            }
+            testBufferStats(2, 2 * BUFFER_SIZE, 0, 0);
           }
-          testBufferStats(2, 2 * BUFFER_SIZE, 0, 0);
+          testBufferStats(1, BUFFER_SIZE, 0, 0);
         }
-        testBufferStats(1, BUFFER_SIZE, 0, 0);
+        testBufferStats(0, 0, 0, 0);
+      } finally {
+        FileUtils.forceDelete(TEMP_FILE);
       }
-      testBufferStats(0, 0, 0, 0);
-    } finally {
-      FileUtils.forceDelete(TEMP_FILE);
     }
     try (RandomAccessFile randomAccessFile = new RandomAccessFile(TEMP_FILE, "rw")) {
       randomAccessFile.setLength(FILE_OFFSET + LARGE_BUFFER_SIZE);
       try (PinotDataBuffer buffer1 = PinotDataBuffer
           .allocateDirect(LARGE_BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER, null)) {
-        Assert.assertTrue(buffer1 instanceof PinotNativeOrderLBuffer);
+        Assert.assertSame(buffer1.order(), PinotDataBuffer.NATIVE_ORDER);
         testBufferStats(1, LARGE_BUFFER_SIZE, 0, 0);
         try (PinotDataBuffer buffer2 = PinotDataBuffer
             .loadFile(TEMP_FILE, FILE_OFFSET, LARGE_BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER, null)) {
-          Assert.assertTrue(buffer2 instanceof PinotNativeOrderLBuffer);
+          Assert.assertSame(buffer2.order(), PinotDataBuffer.NATIVE_ORDER);
           testBufferStats(2, 2 * LARGE_BUFFER_SIZE, 0, 0);
           try (PinotDataBuffer buffer3 = PinotDataBuffer
               .mapFile(TEMP_FILE, true, FILE_OFFSET, LARGE_BUFFER_SIZE, PinotDataBuffer.NATIVE_ORDER, null)) {
-            Assert.assertTrue(buffer3 instanceof PinotNativeOrderLBuffer);
+            Assert.assertSame(buffer3.order(), PinotDataBuffer.NATIVE_ORDER);
             testBufferStats(2, 2 * LARGE_BUFFER_SIZE, 1, LARGE_BUFFER_SIZE);
           }
           testBufferStats(2, 2 * LARGE_BUFFER_SIZE, 0, 0);
@@ -603,15 +307,15 @@ public void testConstructors()
       randomAccessFile.setLength(FILE_OFFSET + LARGE_BUFFER_SIZE);
       try (PinotDataBuffer buffer1 = PinotDataBuffer
           .allocateDirect(LARGE_BUFFER_SIZE, PinotDataBuffer.NON_NATIVE_ORDER, null)) {
-        Assert.assertTrue(buffer1 instanceof PinotNonNativeOrderLBuffer);
+        Assert.assertSame(buffer1.order(), PinotDataBuffer.NON_NATIVE_ORDER);
         testBufferStats(1, LARGE_BUFFER_SIZE, 0, 0);
         try (PinotDataBuffer buffer2 = PinotDataBuffer
             .loadFile(TEMP_FILE, FILE_OFFSET, LARGE_BUFFER_SIZE, PinotDataBuffer.NON_NATIVE_ORDER, null)) {
-          Assert.assertTrue(buffer2 instanceof PinotNonNativeOrderLBuffer);
+          Assert.assertSame(buffer2.order(), PinotDataBuffer.NON_NATIVE_ORDER);
           testBufferStats(2, 2 * LARGE_BUFFER_SIZE, 0, 0);
           try (PinotDataBuffer buffer3 = PinotDataBuffer
               .mapFile(TEMP_FILE, true, FILE_OFFSET, LARGE_BUFFER_SIZE, PinotDataBuffer.NON_NATIVE_ORDER, null)) {
-            Assert.assertTrue(buffer3 instanceof PinotNonNativeOrderLBuffer);
+            Assert.assertSame(buffer3.order(), PinotDataBuffer.NON_NATIVE_ORDER);
             testBufferStats(2, 2 * LARGE_BUFFER_SIZE, 1, LARGE_BUFFER_SIZE);
           }
           testBufferStats(2, 2 * LARGE_BUFFER_SIZE, 0, 0);
@@ -623,19 +327,4 @@ public void testConstructors()
       FileUtils.forceDelete(TEMP_FILE);
     }
   }
-
-  private void testBufferStats(int directBufferCount, long directBufferUsage, int mmapBufferCount,
-      long mmapBufferUsage) {
-    Assert.assertEquals(PinotDataBuffer.getAllocationFailureCount(), 0);
-    Assert.assertEquals(PinotDataBuffer.getDirectBufferCount(), directBufferCount);
-    Assert.assertEquals(PinotDataBuffer.getDirectBufferUsage(), directBufferUsage);
-    Assert.assertEquals(PinotDataBuffer.getMmapBufferCount(), mmapBufferCount);
-    Assert.assertEquals(PinotDataBuffer.getMmapBufferUsage(), mmapBufferUsage);
-    Assert.assertEquals(PinotDataBuffer.getBufferInfo().size(), directBufferCount + mmapBufferCount);
-  }
-
-  @AfterClass
-  public void tearDown() {
-    EXECUTOR_SERVICE.shutdown();
-  }
 }
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTestBase.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTestBase.java
new file mode 100644
index 00000000000..4c3725cc12d
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDataBufferTestBase.java
@@ -0,0 +1,115 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.apache.commons.io.FileUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+
+
+/**
+ * Not an actual test but a base class that can be extended by tests in order to have some basic data
+ */
+public class PinotDataBufferTestBase {
+
+  protected static final Random RANDOM = new Random();
+  protected ExecutorService _executorService;
+  protected static final File TEMP_FILE = new File(FileUtils.getTempDirectory(), "PinotDataBufferTest");
+  protected static final int FILE_OFFSET = 10;      // Not page-aligned
+  protected static final int BUFFER_SIZE = 10_000;  // Not page-aligned
+  protected static final int CHAR_ARRAY_LENGTH = BUFFER_SIZE / Character.BYTES;
+  protected static final int SHORT_ARRAY_LENGTH = BUFFER_SIZE / Short.BYTES;
+  protected static final int INT_ARRAY_LENGTH = BUFFER_SIZE / Integer.BYTES;
+  protected static final int LONG_ARRAY_LENGTH = BUFFER_SIZE / Long.BYTES;
+  protected static final int FLOAT_ARRAY_LENGTH = BUFFER_SIZE / Float.BYTES;
+  protected static final int DOUBLE_ARRAY_LENGTH = BUFFER_SIZE / Double.BYTES;
+  protected static final int NUM_ROUNDS = 1000;
+  protected static final int MAX_BYTES_LENGTH = 100;
+  protected static final long LARGE_BUFFER_SIZE = Integer.MAX_VALUE + 2L; // Not page-aligned
+
+  protected byte[] _bytes = new byte[BUFFER_SIZE];
+  protected char[] _chars = new char[CHAR_ARRAY_LENGTH];
+  protected short[] _shorts = new short[SHORT_ARRAY_LENGTH];
+  protected int[] _ints = new int[INT_ARRAY_LENGTH];
+  protected long[] _longs = new long[LONG_ARRAY_LENGTH];
+  protected float[] _floats = new float[FLOAT_ARRAY_LENGTH];
+  protected double[] _doubles = new double[DOUBLE_ARRAY_LENGTH];
+
+  @BeforeClass
+  public void setUp() {
+    for (int i = 0; i < BUFFER_SIZE; i++) {
+      _bytes[i] = (byte) RANDOM.nextInt();
+    }
+    for (int i = 0; i < CHAR_ARRAY_LENGTH; i++) {
+      _chars[i] = (char) RANDOM.nextInt();
+    }
+    for (int i = 0; i < SHORT_ARRAY_LENGTH; i++) {
+      _shorts[i] = (short) RANDOM.nextInt();
+    }
+    for (int i = 0; i < INT_ARRAY_LENGTH; i++) {
+      _ints[i] = RANDOM.nextInt();
+    }
+    for (int i = 0; i < LONG_ARRAY_LENGTH; i++) {
+      _longs[i] = RANDOM.nextLong();
+    }
+    for (int i = 0; i < FLOAT_ARRAY_LENGTH; i++) {
+      _floats[i] = RANDOM.nextFloat();
+    }
+    for (int i = 0; i < DOUBLE_ARRAY_LENGTH; i++) {
+      _doubles[i] = RANDOM.nextDouble();
+    }
+  }
+
+  protected void testBufferStats(int directBufferCount, long directBufferUsage, int mmapBufferCount,
+      long mmapBufferUsage) {
+    Assert.assertEquals(PinotDataBuffer.getAllocationFailureCount(), 0);
+    Assert.assertEquals(PinotDataBuffer.getDirectBufferCount(), directBufferCount);
+    Assert.assertEquals(PinotDataBuffer.getDirectBufferUsage(), directBufferUsage);
+    Assert.assertEquals(PinotDataBuffer.getMmapBufferCount(), mmapBufferCount);
+    Assert.assertEquals(PinotDataBuffer.getMmapBufferUsage(), mmapBufferUsage);
+    Assert.assertEquals(PinotDataBuffer.getBufferInfo().size(), directBufferCount + mmapBufferCount);
+  }
+
+  @AfterMethod
+  public void deleteFileIfExists()
+      throws IOException {
+    if (TEMP_FILE.exists()) {
+      FileUtils.forceDelete(TEMP_FILE);
+    }
+  }
+
+  @BeforeMethod
+  public void setupExecutor() {
+    _executorService = Executors.newFixedThreadPool(10);
+  }
+
+  @AfterMethod
+  public void tearDown() {
+    if (_executorService != null) {
+      _executorService.shutdown();
+    }
+  }
+}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/exception/NoTaskMetadataException.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDefaultByteBufferTest.java
similarity index 74%
rename from pinot-controller/src/main/java/org/apache/pinot/controller/api/exception/NoTaskMetadataException.java
rename to pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDefaultByteBufferTest.java
index 64ffe620ba8..3c4012fa998 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/exception/NoTaskMetadataException.java
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotDefaultByteBufferTest.java
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.controller.api.exception;
+package org.apache.pinot.segment.spi.memory;
 
-public class NoTaskMetadataException extends RuntimeException {
-  public NoTaskMetadataException(String message) {
-    super(message);
+
+public class PinotDefaultByteBufferTest extends PinotDataBufferTest {
+  public PinotDefaultByteBufferTest() {
+    super(PinotByteBuffer.createDefaultFactory());
   }
 
-  public NoTaskMetadataException(String message, Throwable cause) {
-    super(message, cause);
+  @Override
+  protected boolean prioritizeByteBuffer() {
+    return false;
   }
 }
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotLArrayByteBufferTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotLArrayByteBufferTest.java
new file mode 100644
index 00000000000..5c343fb7ef4
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/PinotLArrayByteBufferTest.java
@@ -0,0 +1,42 @@
+/**
+ * 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.pinot.segment.spi.memory;
+
+import org.apache.pinot.segment.spi.utils.JavaVersion;
+import org.testng.SkipException;
+import org.testng.annotations.BeforeClass;
+
+
+public class PinotLArrayByteBufferTest extends PinotDataBufferTest {
+  public PinotLArrayByteBufferTest() {
+    super(new LArrayPinotBufferFactory());
+  }
+
+  @Override
+  protected boolean prioritizeByteBuffer() {
+    return false;
+  }
+
+  @BeforeClass
+  public void abortOnModernJava() {
+    if (JavaVersion.VERSION > 15) {
+      throw new SkipException("Skipping LArray tests because they cannot run in Java " + JavaVersion.VERSION);
+    }
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafeMemoryPinotDataBufferTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafeMemoryPinotDataBufferTest.java
new file mode 100644
index 00000000000..5f4e845a03e
--- /dev/null
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/memory/unsafe/UnsafeMemoryPinotDataBufferTest.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.spi.memory.unsafe;
+
+import org.apache.pinot.segment.spi.memory.PinotDataBufferTest;
+
+
+public class UnsafeMemoryPinotDataBufferTest extends PinotDataBufferTest {
+  public UnsafeMemoryPinotDataBufferTest() {
+    super(new UnsafePinotBufferFactory());
+  }
+
+  @Override
+  protected boolean prioritizeByteBuffer() {
+    return false;
+  }
+}
diff --git a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/reader/H3IndexResolutionTest.java b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/reader/H3IndexResolutionTest.java
index d9128a46f27..ec6ef8dbfea 100644
--- a/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/reader/H3IndexResolutionTest.java
+++ b/pinot-segment-spi/src/test/java/org/apache/pinot/segment/spi/reader/H3IndexResolutionTest.java
@@ -18,7 +18,10 @@
  */
 package org.apache.pinot.segment.spi.reader;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.pinot.segment.spi.index.reader.H3IndexResolution;
+import org.apache.pinot.spi.utils.JsonUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.testng.collections.Lists;
@@ -33,4 +36,50 @@ public void testH3IndexResolution() {
     Assert.assertEquals(resolution.getLowestResolution(), 5);
     Assert.assertEquals(resolution.getResolutions(), Lists.newArrayList(5, 6, 13));
   }
+
+  @Test
+  public void serialization()
+      throws JsonProcessingException {
+    H3IndexResolution resolution = new H3IndexResolution(Lists.newArrayList(13, 5, 6));
+    String string = JsonUtils.objectToString(resolution);
+    Assert.assertEquals(string, "[5,6,13]");
+  }
+
+  @Test
+  public void deserializationList()
+      throws JsonProcessingException {
+    H3IndexResolution resolution =
+        JsonUtils.stringToObject("[5,6,13]", H3IndexResolution.class);
+    Assert.assertEquals(resolution.size(), 3);
+    Assert.assertEquals(resolution.getLowestResolution(), 5);
+    Assert.assertEquals(resolution.getResolutions(), Lists.newArrayList(5, 6, 13));
+  }
+
+  @Test
+  public void deserializationShort()
+      throws JsonProcessingException {
+    H3IndexResolution resolution =
+        JsonUtils.stringToObject("8288", H3IndexResolution.class);
+    Assert.assertEquals(resolution.size(), 3);
+    Assert.assertEquals(resolution.getLowestResolution(), 5);
+    Assert.assertEquals(resolution.getResolutions(), Lists.newArrayList(5, 6, 13));
+  }
+
+  @Test
+  public void deserializationLargeInt() {
+    Assert.assertThrows(JsonParseException.class,
+        () -> JsonUtils.stringToObject(Integer.toString(Integer.MAX_VALUE), H3IndexResolution.class));
+  }
+
+  @Test
+  public void deserializationSmallInt() {
+    Assert.assertThrows(JsonParseException.class,
+        () -> JsonUtils.stringToObject(Integer.toString(Integer.MIN_VALUE), H3IndexResolution.class));
+  }
+
+  @Test
+  public void deserializationObject() {
+    Assert.assertThrows(JsonParseException.class,
+        () -> JsonUtils.stringToObject("{}", H3IndexResolution.class));
+  }
 }
diff --git a/pinot-server/pom.xml b/pinot-server/pom.xml
index e63f0f0a12a..4f8bfb3e7ce 100644
--- a/pinot-server/pom.xml
+++ b/pinot-server/pom.xml
@@ -104,12 +104,6 @@
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/api/AdminApiApplication.java b/pinot-server/src/main/java/org/apache/pinot/server/api/AdminApiApplication.java
index 5a3e0acb670..a590449f554 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/api/AdminApiApplication.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/api/AdminApiApplication.java
@@ -29,6 +29,7 @@
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ContainerResponseFilter;
+import org.apache.helix.HelixManager;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.utils.log.DummyLogFileServer;
 import org.apache.pinot.common.utils.log.LocalLogFileServer;
@@ -70,6 +71,7 @@ public AdminApiApplication(ServerInstance instance, AccessControlFactory accessC
       protected void configure() {
         bind(_shutDownInProgress).to(AtomicBoolean.class);
         bind(_serverInstance).to(ServerInstance.class);
+        bind(_serverInstance.getHelixManager()).to(HelixManager.class);
         bind(_serverInstance.getServerMetrics()).to(ServerMetrics.class);
         bind(accessControlFactory).to(AccessControlFactory.class);
         bind(serverConf.getProperty(CommonConstants.Server.CONFIG_OF_INSTANCE_ID)).named(SERVER_INSTANCE_ID);
@@ -145,7 +147,7 @@ private void setupSwagger(PinotConfiguration pinotConfiguration) {
     _httpServer.getServerConfiguration().addHttpHandler(staticHttpHandler, "/help/");
 
     URL swaggerDistLocation =
-        AdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
+        AdminApiApplication.class.getClassLoader().getResource(CommonConstants.CONFIG_OF_SWAGGER_RESOURCES_PATH);
     CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new URLClassLoader(new URL[]{swaggerDistLocation}));
     _httpServer.getServerConfiguration().addHttpHandler(swaggerDist, "/swaggerui-dist/");
   }
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/api/resources/InstanceResource.java b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/InstanceResource.java
new file mode 100644
index 00000000000..5b90d5935ca
--- /dev/null
+++ b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/InstanceResource.java
@@ -0,0 +1,76 @@
+/**
+ * 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.pinot.server.api.resources;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiKeyAuthDefinition;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.SecurityDefinition;
+import io.swagger.annotations.SwaggerDefinition;
+import java.util.Collections;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import org.apache.helix.HelixManager;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.pinot.common.utils.helix.HelixHelper;
+import org.apache.pinot.server.api.AdminApiApplication;
+
+import static org.apache.pinot.spi.utils.CommonConstants.SWAGGER_AUTHORIZATION_KEY;
+
+
+/**
+ * This resource API can be used to retrieve instance level information like instance tags.
+ */
+@Api(description = "Metadata for this instance (like tenant tags)", tags = "instance", authorizations =
+    {@Authorization(value = SWAGGER_AUTHORIZATION_KEY)})
+@SwaggerDefinition(securityDefinition = @SecurityDefinition(apiKeyAuthDefinitions = @ApiKeyAuthDefinition(name =
+    HttpHeaders.AUTHORIZATION, in = ApiKeyAuthDefinition.ApiKeyLocation.HEADER, key = SWAGGER_AUTHORIZATION_KEY)))
+@Path("instance")
+public class InstanceResource {
+  @Inject
+  @Named(AdminApiApplication.SERVER_INSTANCE_ID)
+  private String _instanceId;
+  @Inject
+  private HelixManager _helixManager;
+
+  @GET
+  @Path("tags")
+  @ApiOperation(value = "Tenant tags for current instance")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"), @ApiResponse(code = 500, message = "Internal server error")
+  })
+  @Produces(MediaType.APPLICATION_JSON)
+  public List<String> getInstanceTags() {
+    InstanceConfig config = HelixHelper.getInstanceConfig(_helixManager, _instanceId);
+    if (config != null && config.getTags() != null) {
+      return config.getTags();
+    }
+    return Collections.emptyList();
+  }
+}
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java
index 96130b90472..5f19715bc19 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java
@@ -55,6 +55,9 @@ private SegmentMetadataFetcher() {
   private static final String NULL_VALUE_VECTOR_READER = "null-value-vector-reader";
   private static final String RANGE_INDEX = "range-index";
   private static final String JSON_INDEX = "json-index";
+  private static final String H3_INDEX = "h3-index";
+  private static final String FST_INDEX = "fst-index";
+  private static final String TEXT_INDEX = "text-index";
 
   private static final String INDEX_NOT_AVAILABLE = "NO";
   private static final String INDEX_AVAILABLE = "YES";
@@ -152,6 +155,24 @@ private static Map<String, String> getColumnIndexes(DataSource dataSource) {
       indexStatus.put(JSON_INDEX, INDEX_AVAILABLE);
     }
 
+    if (Objects.isNull(dataSource.getH3Index())) {
+      indexStatus.put(H3_INDEX, INDEX_NOT_AVAILABLE);
+    } else {
+      indexStatus.put(H3_INDEX, INDEX_AVAILABLE);
+    }
+
+    if (Objects.isNull(dataSource.getFSTIndex())) {
+      indexStatus.put(FST_INDEX, INDEX_NOT_AVAILABLE);
+    } else {
+      indexStatus.put(FST_INDEX, INDEX_AVAILABLE);
+    }
+
+    if (Objects.isNull(dataSource.getTextIndex())) {
+      indexStatus.put(TEXT_INDEX, INDEX_NOT_AVAILABLE);
+    } else {
+      indexStatus.put(TEXT_INDEX, INDEX_AVAILABLE);
+    }
+
     return indexStatus;
   }
 
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/api/resources/TablesResource.java b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/TablesResource.java
index 4495d19ebb0..c03328c2bbd 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/api/resources/TablesResource.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/TablesResource.java
@@ -71,6 +71,7 @@
 import org.apache.pinot.common.utils.LLCSegmentName;
 import org.apache.pinot.common.utils.RoaringBitmapUtils;
 import org.apache.pinot.common.utils.TarGzCompressionUtils;
+import org.apache.pinot.common.utils.URIUtils;
 import org.apache.pinot.common.utils.helix.HelixHelper;
 import org.apache.pinot.core.data.manager.InstanceDataManager;
 import org.apache.pinot.core.data.manager.offline.ImmutableSegmentDataManager;
@@ -82,8 +83,8 @@
 import org.apache.pinot.segment.spi.ColumnMetadata;
 import org.apache.pinot.segment.spi.ImmutableSegment;
 import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.index.IndexType;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.server.access.AccessControlFactory;
 import org.apache.pinot.server.api.AdminApiApplication;
 import org.apache.pinot.server.starter.ServerInstance;
@@ -164,8 +165,8 @@ public String listTableSegments(
   @Encoded
   @Produces(MediaType.APPLICATION_JSON)
   @Path("/tables/{tableName}/metadata")
-  @ApiOperation(value = "List metadata for all segments of a given table",
-      notes = "List segments metadata of table hosted on this server")
+  @ApiOperation(value = "List metadata for all segments of a given table", notes = "List segments metadata of table "
+      + "hosted on this server")
   @ApiResponses(value = {
       @ApiResponse(code = 200, message = "Success"),
       @ApiResponse(code = 500, message = "Internal server error"),
@@ -174,7 +175,7 @@ public String listTableSegments(
   public String getSegmentMetadata(
       @ApiParam(value = "Table Name with type", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "Column name", allowMultiple = true) @QueryParam("columns") @DefaultValue("")
-          List<String> columns)
+      List<String> columns)
       throws WebApplicationException {
     InstanceDataManager instanceDataManager = _serverInstance.getInstanceDataManager();
 
@@ -259,8 +260,8 @@ public String getSegmentMetadata(
               int maxNumMultiValues = columnMetadata.getMaxNumberOfMultiValues();
               maxNumMultiValuesMap.merge(column, (double) maxNumMultiValues, Double::sum);
             }
-            for (Map.Entry<ColumnIndexType, Long> entry : columnMetadata.getIndexSizeMap().entrySet()) {
-              String indexName = entry.getKey().getIndexName();
+            for (Map.Entry<IndexType<?, ?, ?>, Long> entry : columnMetadata.getIndexSizeMap().entrySet()) {
+              String indexName = entry.getKey().getId();
               Map<String, Double> columnIndexSizes = columnIndexSizesMap.getOrDefault(column, new HashMap<>());
               Double indexSize = columnIndexSizes.getOrDefault(indexName, 0d) + entry.getValue();
               columnIndexSizes.put(indexName, indexSize);
@@ -299,7 +300,7 @@ public String getSegmentMetadata(
       @PathParam("tableName") String tableName,
       @ApiParam(value = "Segment name", required = true) @PathParam("segmentName") String segmentName,
       @ApiParam(value = "Column name", allowMultiple = true) @QueryParam("columns") @DefaultValue("")
-          List<String> columns) {
+      List<String> columns) {
     for (int i = 0; i < columns.size(); i++) {
       try {
         columns.set(i, URLDecoder.decode(columns.get(i), StandardCharsets.UTF_8.name()));
@@ -348,8 +349,8 @@ public String getCrcMetadataForTable(
     try {
       Map<String, String> segmentCrcForTable = new HashMap<>();
       for (SegmentDataManager segmentDataManager : segmentDataManagers) {
-        segmentCrcForTable
-            .put(segmentDataManager.getSegmentName(), segmentDataManager.getSegment().getSegmentMetadata().getCrc());
+        segmentCrcForTable.put(segmentDataManager.getSegmentName(),
+            segmentDataManager.getSegment().getSegmentMetadata().getCrc());
       }
       return ResourceUtils.convertToJsonString(segmentCrcForTable);
     } catch (Exception e) {
@@ -394,8 +395,10 @@ public Response downloadSegment(
           new File(_serverInstance.getInstanceDataManager().getSegmentFileDirectory(), PEER_SEGMENT_DOWNLOAD_DIR);
       tmpSegmentTarDir.mkdir();
 
-      File segmentTarFile = new File(tmpSegmentTarDir, tableNameWithType + "_" + segmentName + "_" + UUID.randomUUID()
-          + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION);
+      File segmentTarFile = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(tmpSegmentTarDir,
+          tableNameWithType + "_" + segmentName + "_" + UUID.randomUUID() + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION,
+          "Invalid table / segment name: %s , %s", tableNameWithType, segmentName);
+
       TarGzCompressionUtils.createTarGzFile(new File(tableDataManager.getTableDataDir(), segmentName), segmentTarFile);
       Response.ResponseBuilder builder = Response.ok();
       builder.entity((StreamingOutput) output -> {
@@ -427,6 +430,7 @@ public Response downloadValidDocIds(
       @PathParam("tableNameWithType") String tableNameWithType,
       @ApiParam(value = "Name of the segment", required = true) @PathParam("segmentName") @Encoded String segmentName,
       @Context HttpHeaders httpHeaders) {
+    segmentName = URIUtils.decode(segmentName);
     LOGGER.info("Received a request to download validDocIds for segment {} table {}", segmentName, tableNameWithType);
     // Validate data access
     ServerResourceUtils.validateDataAccess(_accessControlFactory, tableNameWithType, httpHeaders);
@@ -464,12 +468,73 @@ public Response downloadValidDocIds(
     }
   }
 
+  @GET
+  @Path("/tables/{tableNameWithType}/validDocIdMetadata")
+  @Produces(MediaType.APPLICATION_JSON)
+  @ApiOperation(value = "Provides segment validDocId metadata", notes = "Provides segment validDocId metadata")
+  @ApiResponses(value = {
+      @ApiResponse(code = 200, message = "Success"),
+      @ApiResponse(code = 500, message = "Internal server error", response = ErrorInfo.class),
+      @ApiResponse(code = 404, message = "Table or segment not found", response = ErrorInfo.class)
+  })
+  public String getValidDocIdMetadata(
+      @ApiParam(value = "Table name including type", required = true, example = "myTable_REALTIME")
+      @PathParam("tableNameWithType") String tableNameWithType,
+      @ApiParam(value = "Segment name", allowMultiple = true, required = true) @QueryParam("segmentNames")
+      List<String> segmentNames) {
+    TableDataManager tableDataManager =
+        ServerResourceUtils.checkGetTableDataManager(_serverInstance, tableNameWithType);
+    List<String> missingSegments = new ArrayList<>();
+    List<SegmentDataManager> segmentDataManagers = tableDataManager.acquireSegments(segmentNames, missingSegments);
+    if (!missingSegments.isEmpty()) {
+      throw new WebApplicationException(String.format("Table %s has missing segments", tableNameWithType),
+          Response.Status.NOT_FOUND);
+    }
+    List<Map<String, Object>> allValidDocIdMetadata = new ArrayList<>();
+    for (SegmentDataManager segmentDataManager : segmentDataManagers) {
+      try {
+        IndexSegment indexSegment = segmentDataManager.getSegment();
+        if (!(indexSegment instanceof ImmutableSegmentImpl)) {
+          throw new WebApplicationException(
+              String.format("Table %s segment %s is not a immutable segment", tableNameWithType,
+                  segmentDataManager.getSegmentName()), Response.Status.BAD_REQUEST);
+        }
+        MutableRoaringBitmap validDocIds =
+            indexSegment.getValidDocIds() != null ? indexSegment.getValidDocIds().getMutableRoaringBitmap() : null;
+        if (validDocIds == null) {
+          throw new WebApplicationException(
+              String.format("Missing validDocIds for table %s segment %s does not exist", tableNameWithType,
+                  segmentDataManager.getSegmentName()), Response.Status.NOT_FOUND);
+        }
+        Map<String, Object> validDocIdMetadata = new HashMap<>();
+        int totalDocs = indexSegment.getSegmentMetadata().getTotalDocs();
+        int totalValidDocs = validDocIds.getCardinality();
+        int totalInvalidDocs = totalDocs - totalValidDocs;
+        validDocIdMetadata.put("segmentName", segmentDataManager.getSegmentName());
+        validDocIdMetadata.put("totalDocs", totalDocs);
+        validDocIdMetadata.put("totalValidDocs", totalValidDocs);
+        validDocIdMetadata.put("totalInvalidDocs", totalInvalidDocs);
+        allValidDocIdMetadata.add(validDocIdMetadata);
+      } finally {
+        tableDataManager.releaseSegment(segmentDataManager);
+      }
+    }
+    return ResourceUtils.convertToJsonString(allValidDocIdMetadata);
+  }
+
   /**
    * Upload a low level consumer segment to segment store and return the segment download url. This endpoint is used
    * when segment store copy is unavailable for committed low level consumer segments.
    * Please note that invocation of this endpoint may cause query performance to suffer, since we tar up the segment
    * to upload it.
-   * @see <a>href="https://tinyurl.com/f63ru4sb</a>
+   *
+   * @see <a href="https://tinyurl.com/f63ru4sb></a>
+   * @param realtimeTableName table name with type.
+   * @param segmentName name of the segment to be uploaded
+   * @param timeoutMs timeout for the segment upload to the deep-store. If this is negative, the default timeout
+   *                  would be used.
+   * @return full url where the segment is uploaded
+   * @throws Exception if an error occurred during the segment upload.
    */
   @POST
   @Path("/segments/{realtimeTableName}/{segmentName}/upload")
@@ -484,8 +549,9 @@ public Response downloadValidDocIds(
   })
   public String uploadLLCSegment(
       @ApiParam(value = "Name of the REALTIME table", required = true) @PathParam("realtimeTableName")
-          String realtimeTableName,
-      @ApiParam(value = "Name of the segment", required = true) @PathParam("segmentName") String segmentName)
+      String realtimeTableName,
+      @ApiParam(value = "Name of the segment", required = true) @PathParam("segmentName") String segmentName,
+      @QueryParam("uploadTimeoutMs") @DefaultValue("-1") int timeoutMs)
       throws Exception {
     LOGGER.info("Received a request to upload low level consumer segment {} for table {}", segmentName,
         realtimeTableName);
@@ -521,13 +587,21 @@ public String uploadLLCSegment(
           new File(_serverInstance.getInstanceDataManager().getSegmentFileDirectory(), SEGMENT_UPLOAD_DIR);
       segmentTarUploadDir.mkdir();
 
-      segmentTarFile = new File(segmentTarUploadDir, tableNameWithType + "_" + segmentName + "_" + UUID.randomUUID()
-          + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION);
+      segmentTarFile = org.apache.pinot.common.utils.FileUtils.concatAndValidateFile(segmentTarUploadDir,
+          tableNameWithType + "_" + segmentName + "_" + UUID.randomUUID() + TarGzCompressionUtils.TAR_GZ_FILE_EXTENSION,
+          "Invalid table / segment name: %s, %s", tableNameWithType, segmentName);
+
       TarGzCompressionUtils.createTarGzFile(new File(tableDataManager.getTableDataDir(), segmentName), segmentTarFile);
 
       // Use segment uploader to upload the segment tar file to segment store and return the segment download url.
       SegmentUploader segmentUploader = _serverInstance.getInstanceDataManager().getSegmentUploader();
-      URI segmentDownloadUrl = segmentUploader.uploadSegment(segmentTarFile, new LLCSegmentName(segmentName));
+      URI segmentDownloadUrl;
+      if (timeoutMs <= 0) {
+        // Use default timeout if passed timeout is not positive
+        segmentDownloadUrl = segmentUploader.uploadSegment(segmentTarFile, new LLCSegmentName(segmentName));
+      } else {
+        segmentDownloadUrl = segmentUploader.uploadSegment(segmentTarFile, new LLCSegmentName(segmentName), timeoutMs);
+      }
       if (segmentDownloadUrl == null) {
         throw new WebApplicationException(
             String.format("Failed to upload table %s segment %s to segment store", realtimeTableName, segmentName),
@@ -543,13 +617,13 @@ public String uploadLLCSegment(
   @GET
   @Path("tables/{realtimeTableName}/consumingSegmentsInfo")
   @Produces(MediaType.APPLICATION_JSON)
-  @ApiOperation(value = "Get the info for consumers of this REALTIME table",
-      notes = "Get consumers info from the table data manager. Note that the partitionToOffsetMap has been deprecated "
+  @ApiOperation(value = "Get the info for consumers of this REALTIME table", notes =
+      "Get consumers info from the table data manager. Note that the partitionToOffsetMap has been deprecated "
           + "and will be removed in the next release. The info is now embedded within each partition's state as "
           + "currentOffsetsMap")
   public List<SegmentConsumerInfo> getConsumingSegmentsInfo(
       @ApiParam(value = "Name of the REALTIME table", required = true) @PathParam("realtimeTableName")
-          String realtimeTableName) {
+      String realtimeTableName) {
     TableType tableType = TableNameBuilder.getTableTypeFromTableName(realtimeTableName);
     if (TableType.OFFLINE == tableType) {
       throw new WebApplicationException("Cannot get consuming segment info for OFFLINE table: " + realtimeTableName);
@@ -572,18 +646,14 @@ public List<SegmentConsumerInfo> getConsumingSegmentsInfo(
             recordsLagMap.put(k, v.getRecordsLag());
             availabilityLagMsMap.put(k, v.getAvailabilityLagMs());
           });
-          @Deprecated Map<String, String> partitiionToOffsetMap =
-              realtimeSegmentDataManager.getPartitionToCurrentOffset();
-          segmentConsumerInfoList.add(
-              new SegmentConsumerInfo(segmentDataManager.getSegmentName(),
-                  realtimeSegmentDataManager.getConsumerState().toString(),
-                  realtimeSegmentDataManager.getLastConsumedTimestamp(),
-                  partitiionToOffsetMap,
-                  new SegmentConsumerInfo.PartitionOffsetInfo(
-                      partitiionToOffsetMap,
-                      partitionStateMap.entrySet().stream().collect(
-                          Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getUpstreamLatestOffset().toString())
-                      ), recordsLagMap, availabilityLagMsMap)));
+          @Deprecated
+          Map<String, String> partitiionToOffsetMap = realtimeSegmentDataManager.getPartitionToCurrentOffset();
+          segmentConsumerInfoList.add(new SegmentConsumerInfo(segmentDataManager.getSegmentName(),
+              realtimeSegmentDataManager.getConsumerState().toString(),
+              realtimeSegmentDataManager.getLastConsumedTimestamp(), partitiionToOffsetMap,
+              new SegmentConsumerInfo.PartitionOffsetInfo(partitiionToOffsetMap, partitionStateMap.entrySet().stream()
+                  .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getUpstreamLatestOffset().toString())),
+                  recordsLagMap, availabilityLagMsMap)));
         }
       }
     } catch (Exception e) {
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/conf/ServerConf.java b/pinot-server/src/main/java/org/apache/pinot/server/conf/ServerConf.java
index a169e1fe7fc..a121d23c05b 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/conf/ServerConf.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/conf/ServerConf.java
@@ -18,12 +18,12 @@
  */
 package org.apache.pinot.server.conf;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Helix;
 import org.apache.pinot.spi.utils.CommonConstants.Server;
 
@@ -34,43 +34,23 @@
  * The config used for Server.
  */
 public class ServerConf {
-  // TODO: Replace with constants in CommonConstants
-  private static final String PINOT_CONFIG_PREFIX = "pinot.";
-  private static final String PINOT_SERVER_INSTANCE = "pinot.server.instance";
-  private static final String PINOT_SERVER_METRICS = "pinot.server.metrics";
-  private static final String PINOT_SERVER_METRICS_PREFIX = "pinot.server.metrics.prefix";
-  private static final String PINOT_SERVER_QUERY = "pinot.server.query.executor";
-  private static final String PINOT_SERVER_REQUEST = "pinot.server.request";
-  private static final String PINOT_SERVER_INSTANCE_DATA_MANAGER_CLASS = "pinot.server.instance.data.manager.class";
-  private static final String PINOT_SERVER_QUERY_EXECUTOR_CLASS = "pinot.server.query.executor.class";
-  private static final String PINOT_SERVER_TRANSFORM_FUNCTIONS = "pinot.server.transforms";
 
-  public static final String PINOT_QUERY_SCHEDULER_PREFIX = "pinot.query.scheduler";
-
-  private PinotConfiguration _serverConf;
+  private final PinotConfiguration _serverConf;
 
   public ServerConf(PinotConfiguration serverConfig) {
     _serverConf = serverConfig;
   }
 
-  public void init(PinotConfiguration serverConfig) {
-    _serverConf = serverConfig;
-  }
-
   public PinotConfiguration getInstanceDataManagerConfig() {
-    return _serverConf.subset(PINOT_SERVER_INSTANCE);
+    return _serverConf.subset(INSTANCE_DATA_MANAGER_CONFIG_PREFIX);
   }
 
   public PinotConfiguration getQueryExecutorConfig() {
-    return _serverConf.subset(PINOT_SERVER_QUERY);
-  }
-
-  public PinotConfiguration getRequestConfig() {
-    return _serverConf.subset(PINOT_SERVER_REQUEST);
+    return _serverConf.subset(QUERY_EXECUTOR_CONFIG_PREFIX);
   }
 
   public PinotConfiguration getMetricsConfig() {
-    return _serverConf.subset(PINOT_SERVER_METRICS);
+    return _serverConf.subset(METRICS_CONFIG_PREFIX);
   }
 
   public boolean isNettyServerEnabled() {
@@ -118,20 +98,16 @@ public int getMultiStageMailboxPort() {
     return _serverConf.getProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, QueryConfig.DEFAULT_QUERY_RUNNER_PORT);
   }
 
-  public PinotConfiguration getConfig(String component) {
-    return _serverConf.subset(PINOT_CONFIG_PREFIX + component);
-  }
-
   public String getInstanceDataManagerClassName() {
-    return _serverConf.getProperty(PINOT_SERVER_INSTANCE_DATA_MANAGER_CLASS);
+    return _serverConf.getProperty(CONFIG_OF_INSTANCE_DATA_MANAGER_CLASS, DEFAULT_DATA_MANAGER_CLASS);
   }
 
   public String getQueryExecutorClassName() {
-    return _serverConf.getProperty(PINOT_SERVER_QUERY_EXECUTOR_CLASS);
+    return _serverConf.getProperty(CONFIG_OF_QUERY_EXECUTOR_CLASS, DEFAULT_QUERY_EXECUTOR_CLASS);
   }
 
   public PinotConfiguration getSchedulerConfig() {
-    return _serverConf.subset(PINOT_QUERY_SCHEDULER_PREFIX);
+    return _serverConf.subset(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX);
   }
 
   /**
@@ -139,7 +115,7 @@ public PinotConfiguration getSchedulerConfig() {
    * @return List of transform functions
    */
   public List<String> getTransformFunctions() {
-    return _serverConf.getProperty(PINOT_SERVER_TRANSFORM_FUNCTIONS, Arrays.asList());
+    return _serverConf.getProperty(CONFIG_OF_TRANSFORM_FUNCTIONS, Collections.emptyList());
   }
 
   public boolean emitTableLevelMetrics() {
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java
index ff694200d56..ece3d87428b 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java
@@ -50,6 +50,7 @@
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.metrics.PinotMetricUtils;
 import org.apache.pinot.spi.metrics.PinotMetricsRegistry;
+import org.apache.pinot.spi.plugin.PluginManager;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -95,14 +96,14 @@ public ServerInstance(ServerConf serverConf, HelixManager helixManager, AccessCo
 
     String instanceDataManagerClassName = serverConf.getInstanceDataManagerClassName();
     LOGGER.info("Initializing instance data manager of class: {}", instanceDataManagerClassName);
-    _instanceDataManager = (InstanceDataManager) Class.forName(instanceDataManagerClassName).newInstance();
+    _instanceDataManager = PluginManager.get().createInstance(instanceDataManagerClassName);
     _instanceDataManager.init(serverConf.getInstanceDataManagerConfig(), helixManager, _serverMetrics);
 
     // Initialize FunctionRegistry before starting the query executor
     FunctionRegistry.init();
     String queryExecutorClassName = serverConf.getQueryExecutorClassName();
     LOGGER.info("Initializing query executor of class: {}", queryExecutorClassName);
-    _queryExecutor = (QueryExecutor) Class.forName(queryExecutorClassName).newInstance();
+    _queryExecutor = PluginManager.get().createInstance(queryExecutorClassName);
     PinotConfiguration queryExecutorConfig = serverConf.getQueryExecutorConfig();
     _queryExecutor.init(queryExecutorConfig, _instanceDataManager, _serverMetrics);
 
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java
index fda6caf5c12..48e99d74f63 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java
@@ -54,6 +54,7 @@
 import org.apache.pinot.common.metrics.ServerMeter;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.common.restlet.resources.SystemResourceInfo;
+import org.apache.pinot.common.utils.PinotAppConfigs;
 import org.apache.pinot.common.utils.ServiceStartableUtils;
 import org.apache.pinot.common.utils.ServiceStatus;
 import org.apache.pinot.common.utils.ServiceStatus.Status;
@@ -67,6 +68,7 @@
 import org.apache.pinot.core.data.manager.realtime.RealtimeConsumptionRateManager;
 import org.apache.pinot.core.transport.ListenerConfig;
 import org.apache.pinot.core.util.ListenerConfigUtil;
+import org.apache.pinot.query.service.QueryConfig;
 import org.apache.pinot.segment.local.realtime.impl.invertedindex.RealtimeLuceneIndexRefreshState;
 import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
 import org.apache.pinot.server.access.AccessControlFactory;
@@ -85,6 +87,7 @@
 import org.apache.pinot.spi.plugin.PluginManager;
 import org.apache.pinot.spi.services.ServiceRole;
 import org.apache.pinot.spi.services.ServiceStartable;
+import org.apache.pinot.spi.trace.Tracing;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.CommonConstants.Helix;
 import org.apache.pinot.spi.utils.CommonConstants.Helix.Instance;
@@ -169,6 +172,12 @@ public void init(PinotConfiguration serverConf)
       // NOTE: Need to add the instance id to the config because it is required in HelixInstanceDataManagerConfig
       _serverConf.addProperty(Server.CONFIG_OF_INSTANCE_ID, _instanceId);
     }
+    if (_serverConf.getProperty(QueryConfig.KEY_OF_QUERY_SERVER_PORT, QueryConfig.DEFAULT_QUERY_SERVER_PORT) == 0) {
+      _serverConf.setProperty(QueryConfig.KEY_OF_QUERY_SERVER_PORT, NetUtils.findOpenPort());
+    }
+    if (_serverConf.getProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, QueryConfig.DEFAULT_QUERY_RUNNER_PORT) == 0) {
+      _serverConf.setProperty(QueryConfig.KEY_OF_QUERY_RUNNER_PORT, NetUtils.findOpenPort());
+    }
 
     _instanceConfigScope =
         new HelixConfigScopeBuilder(ConfigScopeProperty.PARTICIPANT, _helixClusterName).forParticipant(_instanceId)
@@ -177,6 +186,9 @@ public void init(PinotConfiguration serverConf)
     // Initialize Pinot Environment Provider
     _pinotEnvironmentProvider = initializePinotEnvironmentProvider();
 
+    // Initialize the data buffer factory
+    PinotDataBuffer.loadDefaultFactory(serverConf);
+
     // Enable/disable thread CPU time measurement through instance config.
     ThreadResourceUsageProvider.setThreadCpuTimeMeasurementEnabled(
         _serverConf.getProperty(Server.CONFIG_OF_ENABLE_THREAD_CPU_TIME_MEASUREMENT,
@@ -502,6 +514,7 @@ public ServiceRole getServiceRole() {
   public void start()
       throws Exception {
     LOGGER.info("Starting Pinot server (Version: {})", PinotVersion.VERSION);
+    LOGGER.info("Server configs: {}", new PinotAppConfigs(getConfig()).toJSONString());
     long startTimeMs = System.currentTimeMillis();
 
     // install default SSL context if necessary (even if not force-enabled everywhere)
@@ -530,11 +543,14 @@ public void start()
     ControllerLeaderLocator.create(_helixManager);
     ServerSegmentCompletionProtocolHandler.init(
         _serverConf.subset(SegmentCompletionProtocol.PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER));
-    ServerConf serverConf = DefaultHelixStarterServerConfig.getDefaultHelixServerConfig(_serverConf);
+    ServerConf serverConf = new ServerConf(_serverConf);
     _serverInstance = new ServerInstance(serverConf, _helixManager, accessControlFactory);
     ServerMetrics serverMetrics = _serverInstance.getServerMetrics();
     InstanceDataManager instanceDataManager = _serverInstance.getInstanceDataManager();
     instanceDataManager.setSupplierOfIsServerReadyToServeQueries(() -> _isServerReadyToServeQueries);
+    // initialize the thread accountant for query killing
+    Tracing.ThreadAccountantOps
+        .initializeThreadAccountant(_serverConf.subset(CommonConstants.PINOT_QUERY_SCHEDULER_PREFIX), _instanceId);
     initSegmentFetcher(_serverConf);
     StateModelFactory<?> stateModelFactory =
         new SegmentOnlineOfflineStateModelFactory(_instanceId, instanceDataManager);
@@ -611,12 +627,6 @@ public void stop() {
     LOGGER.info("Shutting down Pinot server");
     long startTimeMs = System.currentTimeMillis();
 
-    try {
-      LOGGER.info("Closing PinotFS classes");
-      PinotFSFactory.shutdown();
-    } catch (IOException e) {
-      LOGGER.warn("Caught exception closing PinotFS classes", e);
-    }
     _adminApiApplication.startShuttingDown();
     _helixAdmin.setConfig(_instanceConfigScope,
         Collections.singletonMap(Helix.IS_SHUTDOWN_IN_PROGRESS, Boolean.toString(true)));
@@ -635,6 +645,14 @@ public void stop() {
     }
     _serverQueriesDisabledTracker.stop();
     _realtimeLuceneIndexRefreshState.stop();
+    try {
+      // Close PinotFS after all data managers are shutdown. Otherwise, segments which are being committed will not
+      // be uploaded to the deep-store.
+      LOGGER.info("Closing PinotFS classes");
+      PinotFSFactory.shutdown();
+    } catch (IOException e) {
+      LOGGER.warn("Caught exception closing PinotFS classes", e);
+    }
     LOGGER.info("Deregistering service status handler");
     ServiceStatus.removeServiceStatusCallback(_instanceId);
     _adminApiApplication.stop();
@@ -658,13 +676,15 @@ private void shutdownQueryCheck(long endTimeMs) {
     boolean noIncomingQueries = false;
     long currentTimeMs;
     while ((currentTimeMs = System.currentTimeMillis()) < endTimeMs) {
-      long noQueryTimeMs = currentTimeMs - _serverInstance.getLatestQueryTime();
+      // Ensure we wait the full noQueryTimeMs since the start of shutdown
+      long noQueryTimeMs = currentTimeMs - Math.max(startTimeMs, _serverInstance.getLatestQueryTime());
       if (noQueryTimeMs >= noQueryThresholdMs) {
         LOGGER.info("No query received within {}ms (larger than the threshold: {}ms), mark it as no incoming queries",
             noQueryTimeMs, noQueryThresholdMs);
         noIncomingQueries = true;
         break;
       }
+      // Otherwise sleep the difference, or use shutdown execution timeout if it's smaller
       long sleepTimeMs = Math.min(noQueryThresholdMs - noQueryTimeMs, endTimeMs - currentTimeMs);
       LOGGER.info(
           "Sleep for {}ms as there are still incoming queries (no query time: {}ms is smaller than the threshold: "
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/DefaultHelixStarterServerConfig.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/DefaultHelixStarterServerConfig.java
deleted file mode 100644
index 17191957706..00000000000
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/DefaultHelixStarterServerConfig.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.server.starter.helix;
-
-import org.apache.pinot.server.conf.ServerConf;
-import org.apache.pinot.spi.env.PinotConfiguration;
-import org.apache.pinot.spi.utils.CommonConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class DefaultHelixStarterServerConfig {
-  private DefaultHelixStarterServerConfig() {
-  }
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(DefaultHelixStarterServerConfig.class);
-
-  public static ServerConf getDefaultHelixServerConfig(PinotConfiguration externalConfigs) {
-    PinotConfiguration defaultConfigs = loadDefaultServerConf();
-
-    for (String key : externalConfigs.getKeys()) {
-      defaultConfigs.setProperty(key, externalConfigs.getRawProperty(key));
-
-      LOGGER.info("External config key: {}, value: {}", key, externalConfigs.getProperty(key));
-    }
-    return new ServerConf(defaultConfigs);
-  }
-
-  public static PinotConfiguration loadDefaultServerConf() {
-    PinotConfiguration serverConf = new PinotConfiguration();
-
-    serverConf.addProperty(CommonConstants.Server.CONFIG_OF_INSTANCE_DATA_DIR,
-        CommonConstants.Server.DEFAULT_INSTANCE_DATA_DIR);
-    serverConf.addProperty(CommonConstants.Server.CONFIG_OF_INSTANCE_SEGMENT_TAR_DIR,
-        CommonConstants.Server.DEFAULT_INSTANCE_SEGMENT_TAR_DIR);
-
-    serverConf
-        .addProperty(CommonConstants.Server.CONFIG_OF_INSTANCE_READ_MODE, CommonConstants.Server.DEFAULT_READ_MODE);
-    serverConf.addProperty(CommonConstants.Server.CONFIG_OF_INSTANCE_DATA_MANAGER_CLASS,
-        CommonConstants.Server.DEFAULT_DATA_MANAGER_CLASS);
-
-    // query executor parameters
-    serverConf.addProperty(CommonConstants.Server.CONFIG_OF_QUERY_EXECUTOR_CLASS,
-        CommonConstants.Server.DEFAULT_QUERY_EXECUTOR_CLASS);
-    serverConf.addProperty(CommonConstants.Server.CONFIG_OF_QUERY_EXECUTOR_PRUNER_CLASS,
-        "ColumnValueSegmentPruner,SelectionQuerySegmentPruner");
-
-    // request handler factory parameters
-    serverConf.addProperty(CommonConstants.Server.CONFIG_OF_REQUEST_HANDLER_FACTORY_CLASS,
-        CommonConstants.Server.DEFAULT_REQUEST_HANDLER_FACTORY_CLASS);
-
-    // netty port
-    serverConf
-        .addProperty(CommonConstants.Server.CONFIG_OF_NETTY_PORT, CommonConstants.Helix.DEFAULT_SERVER_NETTY_PORT);
-    return serverConf;
-  }
-}
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java
index c4eb0d3e6b8..f01d13ea94c 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java
@@ -22,7 +22,9 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -52,6 +54,7 @@
 import org.apache.pinot.core.data.manager.offline.TableDataManagerProvider;
 import org.apache.pinot.core.data.manager.realtime.LLRealtimeSegmentDataManager;
 import org.apache.pinot.core.data.manager.realtime.PinotFSSegmentUploader;
+import org.apache.pinot.core.data.manager.realtime.RealtimeSegmentDataManager;
 import org.apache.pinot.core.data.manager.realtime.SegmentBuildTimeLeaseExtender;
 import org.apache.pinot.core.data.manager.realtime.SegmentUploader;
 import org.apache.pinot.core.util.SegmentRefreshSemaphore;
@@ -64,6 +67,7 @@
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoader;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderContext;
 import org.apache.pinot.segment.spi.loader.SegmentDirectoryLoaderRegistry;
+import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler;
 import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -78,9 +82,6 @@
 @ThreadSafe
 public class HelixInstanceDataManager implements InstanceDataManager {
   private static final Logger LOGGER = LoggerFactory.getLogger(HelixInstanceDataManager.class);
-  // TODO: Make this configurable
-  private static final long EXTERNAL_VIEW_DROPPED_MAX_WAIT_MS = 20 * 60_000L; // 20 minutes
-  private static final long EXTERNAL_VIEW_CHECK_INTERVAL_MS = 1_000L; // 1 second
 
   private final ConcurrentHashMap<String, TableDataManager> _tableDataManagerMap = new ConcurrentHashMap<>();
 
@@ -91,10 +92,14 @@ public class HelixInstanceDataManager implements InstanceDataManager {
   private ZkHelixPropertyStore<ZNRecord> _propertyStore;
   private SegmentUploader _segmentUploader;
   private Supplier<Boolean> _isServerReadyToServeQueries = () -> false;
+  private long _externalViewDroppedMaxWaitMs;
+  private long _externalViewDroppedCheckInternalMs;
 
   // Fixed size LRU cache for storing last N errors on the instance.
   // Key is TableNameWithType-SegmentName pair.
   private LoadingCache<Pair<String, String>, SegmentErrorInfo> _errorCache;
+  private ExecutorService _segmentRefreshExecutor;
+  private ExecutorService _segmentPreloadExecutor;
 
   @Override
   public void setSupplierOfIsServerReadyToServeQueries(Supplier<Boolean> isServingQueries) {
@@ -112,12 +117,14 @@ public synchronized void init(PinotConfiguration config, HelixManager helixManag
     _helixManager = helixManager;
     _serverMetrics = serverMetrics;
     _segmentUploader = new PinotFSSegmentUploader(_instanceDataManagerConfig.getSegmentStoreUri(),
-        PinotFSSegmentUploader.DEFAULT_SEGMENT_UPLOAD_TIMEOUT_MILLIS);
+        ServerSegmentCompletionProtocolHandler.getSegmentUploadRequestTimeoutMs(), _serverMetrics);
+
+    _externalViewDroppedMaxWaitMs = _instanceDataManagerConfig.getExternalViewDroppedMaxWaitMs();
+    _externalViewDroppedCheckInternalMs = _instanceDataManagerConfig.getExternalViewDroppedCheckIntervalMs();
 
     File instanceDataDir = new File(_instanceDataManagerConfig.getInstanceDataDir());
-    if (!instanceDataDir.exists()) {
-      Preconditions.checkState(instanceDataDir.mkdirs());
-    }
+    initInstanceDataDir(instanceDataDir);
+
     File instanceSegmentTarDir = new File(_instanceDataManagerConfig.getInstanceSegmentTarDir());
     if (!instanceSegmentTarDir.exists()) {
       Preconditions.checkState(instanceSegmentTarDir.mkdirs());
@@ -125,7 +132,22 @@ public synchronized void init(PinotConfiguration config, HelixManager helixManag
 
     // Initialize segment build time lease extender executor
     SegmentBuildTimeLeaseExtender.initExecutor();
-
+    // Initialize a fixed thread pool to reload/refresh segments in parallel. The getMaxParallelRefreshThreads() is
+    // used to initialize a segment refresh semaphore to limit the parallelism, so create a pool of same size.
+    int poolSize = getMaxParallelRefreshThreads();
+    Preconditions.checkArgument(poolSize > 0,
+        "SegmentRefreshExecutor requires a positive pool size but got: " + poolSize);
+    _segmentRefreshExecutor = Executors.newFixedThreadPool(poolSize,
+        new ThreadFactoryBuilder().setNameFormat("segment-refresh-thread-%d").build());
+    LOGGER.info("Created SegmentRefreshExecutor with pool size: {}", poolSize);
+    poolSize = _instanceDataManagerConfig.getMaxSegmentPreloadThreads();
+    if (poolSize > 0) {
+      _segmentPreloadExecutor = Executors.newFixedThreadPool(poolSize,
+          new ThreadFactoryBuilder().setNameFormat("segment-preload-thread-%d").build());
+      LOGGER.info("Created SegmentPreloadExecutor with pool size: {}", poolSize);
+    } else {
+      LOGGER.info("SegmentPreloadExecutor was not created with pool size: {}", poolSize);
+    }
     // Initialize the table data manager provider
     TableDataManagerProvider.init(_instanceDataManagerConfig);
     LOGGER.info("Initialized Helix instance data manager");
@@ -141,6 +163,32 @@ public SegmentErrorInfo load(Pair<String, String> tableNameWithTypeSegmentNamePa
         });
   }
 
+  private void initInstanceDataDir(File instanceDataDir) {
+    if (!instanceDataDir.exists()) {
+      Preconditions.checkState(instanceDataDir.mkdirs(), "Failed to create instance data dir: %s", instanceDataDir);
+    } else {
+      // Clean up the _tmp (consuming segments) dir and empty table data dir
+      File[] tableDataDirs = instanceDataDir.listFiles((dir, name) -> TableNameBuilder.isTableResource(name));
+      if (tableDataDirs != null) {
+        for (File tableDataDir : tableDataDirs) {
+          File resourceTempDir = new File(tableDataDir, RealtimeSegmentDataManager.RESOURCE_TEMP_DIR_NAME);
+          try {
+            FileUtils.deleteDirectory(resourceTempDir);
+          } catch (IOException e) {
+            LOGGER.error("Failed to delete temporary resource dir: {}, continue with error", resourceTempDir, e);
+          }
+          try {
+            if (FileUtils.isEmptyDirectory(tableDataDir)) {
+              FileUtils.deleteDirectory(tableDataDir);
+            }
+          } catch (IOException e) {
+            LOGGER.error("Failed to delete empty table data dir: {}, continue with error", tableDataDir, e);
+          }
+        }
+      }
+    }
+  }
+
   @Override
   public String getInstanceId() {
     return _instanceId;
@@ -154,6 +202,10 @@ public synchronized void start() {
 
   @Override
   public synchronized void shutDown() {
+    _segmentRefreshExecutor.shutdownNow();
+    if (_segmentPreloadExecutor != null) {
+      _segmentPreloadExecutor.shutdownNow();
+    }
     for (TableDataManager tableDataManager : _tableDataManagerMap.values()) {
       tableDataManager.shutDown();
     }
@@ -195,7 +247,7 @@ private TableDataManager createTableDataManager(String tableNameWithType, TableC
     TableDataManagerConfig tableDataManagerConfig = new TableDataManagerConfig(_instanceDataManagerConfig, tableConfig);
     TableDataManager tableDataManager =
         TableDataManagerProvider.getTableDataManager(tableDataManagerConfig, _instanceId, _propertyStore,
-            _serverMetrics, _helixManager, _errorCache, _isServerReadyToServeQueries);
+            _serverMetrics, _helixManager, _segmentPreloadExecutor, _errorCache, _isServerReadyToServeQueries);
     tableDataManager.start();
     LOGGER.info("Created table data manager for table: {}", tableNameWithType);
     return tableDataManager;
@@ -205,7 +257,7 @@ private TableDataManager createTableDataManager(String tableNameWithType, TableC
   public void deleteTable(String tableNameWithType)
       throws Exception {
     // Wait externalview to converge
-    long endTimeMs = System.currentTimeMillis() + EXTERNAL_VIEW_DROPPED_MAX_WAIT_MS;
+    long endTimeMs = System.currentTimeMillis() + _externalViewDroppedMaxWaitMs;
     do {
       ExternalView externalView = _helixManager.getHelixDataAccessor()
           .getProperty(_helixManager.getHelixDataAccessor().keyBuilder().externalView(tableNameWithType));
@@ -222,7 +274,7 @@ public void deleteTable(String tableNameWithType)
         });
         return;
       }
-      Thread.sleep(EXTERNAL_VIEW_CHECK_INTERVAL_MS);
+      Thread.sleep(_externalViewDroppedCheckInternalMs);
     } while (System.currentTimeMillis() < endTimeMs);
     throw new TimeoutException(
         "Timeout while waiting for ExternalView to converge for the table to delete: " + tableNameWithType);
@@ -231,11 +283,14 @@ public void deleteTable(String tableNameWithType)
   @Override
   public void offloadSegment(String tableNameWithType, String segmentName) {
     LOGGER.info("Removing segment: {} from table: {}", segmentName, tableNameWithType);
-    _tableDataManagerMap.computeIfPresent(tableNameWithType, (k, v) -> {
-      v.removeSegment(segmentName);
-      LOGGER.info("Removed segment: {} from table: {}", segmentName, k);
-      return v;
-    });
+    TableDataManager tableDataManager = _tableDataManagerMap.get(tableNameWithType);
+    if (tableDataManager != null) {
+      tableDataManager.removeSegment(segmentName);
+      LOGGER.info("Removed segment: {} from table: {}", segmentName, tableNameWithType);
+    } else {
+      LOGGER.warn("Failed to find data manager for table: {}, skipping removing segment: {}", tableNameWithType,
+          segmentName);
+    }
   }
 
   @Override
@@ -336,7 +391,6 @@ private void reloadSegmentsWithMetadata(String tableNameWithType, List<SegmentMe
     Preconditions.checkNotNull(tableConfig);
     Schema schema = ZKMetadataProvider.getTableSchema(_propertyStore, tableNameWithType);
     List<String> failedSegments = new ArrayList<>();
-    ExecutorService workers = Executors.newCachedThreadPool();
     final AtomicReference<Exception> sampleException = new AtomicReference<>();
     //calling thread hasn't acquired any permit so we don't reload any segments using it.
     CompletableFuture.allOf(segmentsMetadata.stream().map(segmentMetadata -> CompletableFuture.runAsync(() -> {
@@ -353,10 +407,7 @@ private void reloadSegmentsWithMetadata(String tableNameWithType, List<SegmentMe
         failedSegments.add(segmentName);
         sampleException.set(e);
       }
-    }, workers)).toArray(CompletableFuture[]::new)).get();
-
-    workers.shutdownNow();
-
+    }, _segmentRefreshExecutor)).toArray(CompletableFuture[]::new)).get();
     if (sampleException.get() != null) {
       throw new RuntimeException(
           String.format("Failed to reload %d/%d segments: %s in table: %s", failedSegments.size(),
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java
index f5bfc878056..67a28dd4482 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java
@@ -30,6 +30,9 @@
 import org.slf4j.LoggerFactory;
 
 import static org.apache.pinot.spi.utils.CommonConstants.Server.CONFIG_OF_SEGMENT_STORE_URI;
+import static org.apache.pinot.spi.utils.CommonConstants.Server.DEFAULT_INSTANCE_DATA_DIR;
+import static org.apache.pinot.spi.utils.CommonConstants.Server.DEFAULT_INSTANCE_SEGMENT_TAR_DIR;
+import static org.apache.pinot.spi.utils.CommonConstants.Server.DEFAULT_READ_MODE;
 
 
 /**
@@ -118,6 +121,9 @@ public class HelixInstanceDataManagerConfig implements InstanceDataManagerConfig
   //
   private static final String MAX_PARALLEL_REFRESH_THREADS = "max.parallel.refresh.threads";
 
+  // To preload segments of table using upsert in parallel for fast upsert metadata recovery.
+  private static final String MAX_SEGMENT_PRELOAD_THREADS = "max.segment.preload.threads";
+
   // Size of cache that holds errors.
   private static final String ERROR_CACHE_SIZE = "error.cache.size";
 
@@ -125,11 +131,19 @@ public class HelixInstanceDataManagerConfig implements InstanceDataManagerConfig
   private static final String DELETED_SEGMENTS_CACHE_TTL_MINUTES = "table.deleted.segments.cache.ttl.minutes";
   private static final String PEER_DOWNLOAD_SCHEME = "peer.download.scheme";
 
-  private final static String[] REQUIRED_KEYS = {INSTANCE_ID, INSTANCE_DATA_DIR, READ_MODE};
+  // Check if the external view is dropped for a table, and if so, wait for the external view to
+  // be updated for a maximum of this time.
+  private static final String EXTERNAL_VIEW_DROPPED_MAX_WAIT_MS = "external.view.dropped.max.wait.ms";
+  private static final String EXTERNAL_VIEW_DROPPED_CHECK_INTERVAL_MS = "external.view.dropped.check.interval.ms";
+
+  private final static String[] REQUIRED_KEYS = {INSTANCE_ID};
   private static final long DEFAULT_ERROR_CACHE_SIZE = 100L;
   private static final int DEFAULT_DELETED_SEGMENTS_CACHE_SIZE = 10_000;
   private static final int DEFAULT_DELETED_SEGMENTS_CACHE_TTL_MINUTES = 2;
-  private PinotConfiguration _instanceDataManagerConfiguration = null;
+  public static final long DEFAULT_EXTERNAL_VIEW_DROPPED_MAX_WAIT_MS = 20 * 60_000L;
+  public static final long DEFAULT_EXTERNAL_VIEW_DROPPED_CHECK_INTERVAL_MS = 1_000L;
+
+  private final PinotConfiguration _instanceDataManagerConfiguration;
 
   public HelixInstanceDataManagerConfig(PinotConfiguration serverConfig)
       throws ConfigurationException {
@@ -146,7 +160,6 @@ private void checkRequiredKeys()
       throws ConfigurationException {
     for (String keyString : REQUIRED_KEYS) {
       Optional.ofNullable(_instanceDataManagerConfiguration.getProperty(keyString))
-
           .orElseThrow(() -> new ConfigurationException("Cannot find required key : " + keyString));
     }
   }
@@ -163,7 +176,7 @@ public String getInstanceId() {
 
   @Override
   public String getInstanceDataDir() {
-    return _instanceDataManagerConfiguration.getProperty(INSTANCE_DATA_DIR);
+    return _instanceDataManagerConfiguration.getProperty(INSTANCE_DATA_DIR, DEFAULT_INSTANCE_DATA_DIR);
   }
 
   @Override
@@ -173,7 +186,7 @@ public String getConsumerDir() {
 
   @Override
   public String getInstanceSegmentTarDir() {
-    return _instanceDataManagerConfiguration.getProperty(INSTANCE_SEGMENT_TAR_DIR);
+    return _instanceDataManagerConfiguration.getProperty(INSTANCE_SEGMENT_TAR_DIR, DEFAULT_INSTANCE_SEGMENT_TAR_DIR);
   }
 
   @Override
@@ -188,7 +201,7 @@ public String getSegmentStoreUri() {
 
   @Override
   public ReadMode getReadMode() {
-    return ReadMode.valueOf(_instanceDataManagerConfiguration.getProperty(READ_MODE));
+    return ReadMode.valueOf(_instanceDataManagerConfiguration.getProperty(READ_MODE, DEFAULT_READ_MODE));
   }
 
   @Override
@@ -230,6 +243,10 @@ public int getMaxParallelRefreshThreads() {
     return _instanceDataManagerConfiguration.getProperty(MAX_PARALLEL_REFRESH_THREADS, 1);
   }
 
+  public int getMaxSegmentPreloadThreads() {
+    return _instanceDataManagerConfiguration.getProperty(MAX_SEGMENT_PRELOAD_THREADS, 0);
+  }
+
   public int getMaxParallelSegmentBuilds() {
     return _instanceDataManagerConfiguration
         .getProperty(MAX_PARALLEL_SEGMENT_BUILDS, DEFAULT_MAX_PARALLEL_SEGMENT_BUILDS);
@@ -280,6 +297,18 @@ public String getSegmentPeerDownloadScheme() {
     return _instanceDataManagerConfiguration.getProperty(PEER_DOWNLOAD_SCHEME);
   }
 
+  @Override
+  public long getExternalViewDroppedMaxWaitMs() {
+    return _instanceDataManagerConfiguration.getProperty(EXTERNAL_VIEW_DROPPED_MAX_WAIT_MS,
+        DEFAULT_EXTERNAL_VIEW_DROPPED_MAX_WAIT_MS);
+  }
+
+  @Override
+  public long getExternalViewDroppedCheckIntervalMs() {
+    return _instanceDataManagerConfiguration.getProperty(EXTERNAL_VIEW_DROPPED_CHECK_INTERVAL_MS,
+        DEFAULT_EXTERNAL_VIEW_DROPPED_CHECK_INTERVAL_MS);
+  }
+
   @Override
   public String toString() {
     String configString = "";
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java b/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
index b38b89093c5..ba3336553eb 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
@@ -79,7 +79,7 @@ private static PinotConfiguration toWorkerQueryConfig(PinotConfiguration configu
     int servicePort =
         newConfig.getProperty(QueryConfig.KEY_OF_QUERY_SERVER_PORT, QueryConfig.DEFAULT_QUERY_SERVER_PORT);
     if (servicePort == -1) {
-      servicePort = newConfig.getProperty(CommonConstants.Server.CONFIG_OF_NETTY_PORT,
+      servicePort = newConfig.getProperty(CommonConstants.Helix.KEY_OF_SERVER_NETTY_PORT,
           CommonConstants.Helix.DEFAULT_SERVER_NETTY_PORT);
       newConfig.addProperty(QueryConfig.KEY_OF_QUERY_SERVER_PORT, servicePort);
     }
diff --git a/pinot-server/src/test/java/org/apache/pinot/server/api/AccessControlTest.java b/pinot-server/src/test/java/org/apache/pinot/server/api/AccessControlTest.java
index 153fdf739ae..3cafcf102b4 100644
--- a/pinot-server/src/test/java/org/apache/pinot/server/api/AccessControlTest.java
+++ b/pinot-server/src/test/java/org/apache/pinot/server/api/AccessControlTest.java
@@ -30,6 +30,7 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
 import org.apache.commons.io.FileUtils;
+import org.apache.helix.HelixManager;
 import org.apache.pinot.common.config.TlsConfig;
 import org.apache.pinot.common.metrics.ServerMetrics;
 import org.apache.pinot.core.auth.BasicAuthUtils;
@@ -42,7 +43,6 @@
 import org.apache.pinot.server.access.HttpRequesterIdentity;
 import org.apache.pinot.server.access.RequesterIdentity;
 import org.apache.pinot.server.starter.ServerInstance;
-import org.apache.pinot.server.starter.helix.DefaultHelixStarterServerConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.NetUtils;
@@ -74,8 +74,9 @@ public void setUp()
     // Mock the server instance
     ServerInstance serverInstance = mock(ServerInstance.class);
     when(serverInstance.getServerMetrics()).thenReturn(mock(ServerMetrics.class));
+    when(serverInstance.getHelixManager()).thenReturn(mock(HelixManager.class));
 
-    PinotConfiguration serverConf = DefaultHelixStarterServerConfig.loadDefaultServerConf();
+    PinotConfiguration serverConf = new PinotConfiguration();
     String hostname = serverConf.getProperty(CommonConstants.Helix.KEY_OF_SERVER_NETTY_HOST,
         serverConf.getProperty(CommonConstants.Helix.SET_INSTANCE_ID_TO_HOSTNAME_KEY, false)
             ? NetUtils.getHostnameOrAddress() : NetUtils.getHostAddress());
diff --git a/pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java b/pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java
index 0b80cd0b646..3723f7a2596 100644
--- a/pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java
+++ b/pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java
@@ -50,7 +50,6 @@
 import org.apache.pinot.segment.spi.creator.SegmentIndexCreationDriver;
 import org.apache.pinot.server.access.AllowAllAccessFactory;
 import org.apache.pinot.server.starter.ServerInstance;
-import org.apache.pinot.server.starter.helix.DefaultHelixStarterServerConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.NetUtils;
@@ -111,6 +110,7 @@ public void setUp()
     when(serverInstance.getInstanceDataManager()).thenReturn(instanceDataManager);
     when(serverInstance.getInstanceDataManager().getSegmentFileDirectory())
         .thenReturn(FileUtils.getTempDirectoryPath());
+    when(serverInstance.getHelixManager()).thenReturn(mock(HelixManager.class));
 
     // Mock the segment uploader
     SegmentUploader segmentUploader = mock(SegmentUploader.class);
@@ -129,7 +129,7 @@ public void setUp()
     setUpSegment(realtimeTableName, null, "default", _realtimeIndexSegments);
     setUpSegment(offlineTableName, null, "default", _offlineIndexSegments);
 
-    PinotConfiguration serverConf = DefaultHelixStarterServerConfig.loadDefaultServerConf();
+    PinotConfiguration serverConf = new PinotConfiguration();
     String hostname = serverConf.getProperty(CommonConstants.Helix.KEY_OF_SERVER_NETTY_HOST,
         serverConf.getProperty(CommonConstants.Helix.SET_INSTANCE_ID_TO_HOSTNAME_KEY, false)
             ? NetUtils.getHostnameOrAddress() : NetUtils.getHostAddress());
@@ -194,9 +194,8 @@ protected void addTable(String tableNameWithType) {
     // NOTE: Use OfflineTableDataManager for both OFFLINE and REALTIME table because RealtimeTableDataManager requires
     //       table config.
     TableDataManager tableDataManager = new OfflineTableDataManager();
-    tableDataManager
-        .init(tableDataManagerConfig, "testInstance", mock(ZkHelixPropertyStore.class), mock(ServerMetrics.class),
-            mock(HelixManager.class), null, new TableDataManagerParams(0, false, -1));
+    tableDataManager.init(tableDataManagerConfig, "testInstance", mock(ZkHelixPropertyStore.class),
+        mock(ServerMetrics.class), mock(HelixManager.class), null, null, new TableDataManagerParams(0, false, -1));
     tableDataManager.start();
     _tableDataManagerMap.put(tableNameWithType, tableDataManager);
   }
diff --git a/pinot-server/src/test/java/org/apache/pinot/server/api/PinotServerAppConfigsTest.java b/pinot-server/src/test/java/org/apache/pinot/server/api/PinotServerAppConfigsTest.java
index ad7bdcf2c6c..fa498ab5fb2 100644
--- a/pinot-server/src/test/java/org/apache/pinot/server/api/PinotServerAppConfigsTest.java
+++ b/pinot-server/src/test/java/org/apache/pinot/server/api/PinotServerAppConfigsTest.java
@@ -23,7 +23,6 @@
 import java.net.UnknownHostException;
 import javax.ws.rs.core.Response;
 import org.apache.pinot.common.utils.PinotAppConfigs;
-import org.apache.pinot.server.starter.helix.DefaultHelixStarterServerConfig;
 import org.apache.pinot.spi.env.PinotConfiguration;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -46,7 +45,7 @@ public class PinotServerAppConfigsTest extends BaseResourceTest {
   @Test
   public void testAppConfigs()
       throws JsonProcessingException, SocketException, UnknownHostException {
-    PinotConfiguration expectedServerConf = DefaultHelixStarterServerConfig.loadDefaultServerConf();
+    PinotConfiguration expectedServerConf = new PinotConfiguration();
     String hostname = expectedServerConf.getProperty(CommonConstants.Helix.KEY_OF_SERVER_NETTY_HOST,
         expectedServerConf.getProperty(CommonConstants.Helix.SET_INSTANCE_ID_TO_HOSTNAME_KEY, false)
             ? NetUtils.getHostnameOrAddress() : NetUtils.getHostAddress());
diff --git a/pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java b/pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java
index ce7ed438ccd..7e7c4b7fbaa 100644
--- a/pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java
+++ b/pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java
@@ -35,9 +35,9 @@
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.SegmentMetadata;
 import org.apache.pinot.segment.spi.V1Constants;
+import org.apache.pinot.segment.spi.index.StandardIndexes;
 import org.apache.pinot.segment.spi.index.metadata.SegmentMetadataImpl;
 import org.apache.pinot.segment.spi.index.mutable.ThreadSafeMutableRoaringBitmap;
-import org.apache.pinot.segment.spi.store.ColumnIndexType;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.utils.JsonUtils;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
@@ -113,29 +113,30 @@ public void getSegments()
   public void getTableMetadata()
       throws Exception {
     for (TableType tableType : TableType.values()) {
-      String tableMetadataPath = "/tables/" + TableNameBuilder.forType(tableType).tableNameWithType(TABLE_NAME)
-          + "/metadata";
+      String tableMetadataPath =
+          "/tables/" + TableNameBuilder.forType(tableType).tableNameWithType(TABLE_NAME) + "/metadata";
 
       JsonNode jsonResponse =
           JsonUtils.stringToJsonNode(_webTarget.path(tableMetadataPath).request().get(String.class));
       TableMetadataInfo metadataInfo = JsonUtils.jsonNodeToObject(jsonResponse, TableMetadataInfo.class);
       Assert.assertNotNull(metadataInfo);
-      Assert.assertEquals(metadataInfo.getTableName(), TableNameBuilder.forType(tableType)
-          .tableNameWithType(TABLE_NAME));
+      Assert.assertEquals(metadataInfo.getTableName(),
+          TableNameBuilder.forType(tableType).tableNameWithType(TABLE_NAME));
       Assert.assertEquals(metadataInfo.getColumnLengthMap().size(), 0);
       Assert.assertEquals(metadataInfo.getColumnCardinalityMap().size(), 0);
       Assert.assertEquals(metadataInfo.getColumnIndexSizeMap().size(), 0);
 
-      jsonResponse = JsonUtils.stringToJsonNode(_webTarget.path(tableMetadataPath)
-          .queryParam("columns", "column1").queryParam("columns", "column2").request().get(String.class));
+      jsonResponse = JsonUtils.stringToJsonNode(
+          _webTarget.path(tableMetadataPath).queryParam("columns", "column1").queryParam("columns", "column2").request()
+              .get(String.class));
       metadataInfo = JsonUtils.jsonNodeToObject(jsonResponse, TableMetadataInfo.class);
       Assert.assertEquals(metadataInfo.getColumnLengthMap().size(), 2);
       Assert.assertEquals(metadataInfo.getColumnCardinalityMap().size(), 2);
       Assert.assertEquals(metadataInfo.getColumnIndexSizeMap().size(), 2);
-      Assert.assertTrue(metadataInfo.getColumnIndexSizeMap().get("column1")
-          .containsKey(ColumnIndexType.DICTIONARY.getIndexName()));
-      Assert.assertTrue(metadataInfo.getColumnIndexSizeMap().get("column2")
-          .containsKey(ColumnIndexType.FORWARD_INDEX.getIndexName()));
+      Assert.assertTrue(
+          metadataInfo.getColumnIndexSizeMap().get("column1").containsKey(StandardIndexes.dictionary().getId()));
+      Assert.assertTrue(
+          metadataInfo.getColumnIndexSizeMap().get("column2").containsKey(StandardIndexes.forward().getId()));
     }
 
     // No such table
@@ -148,9 +149,8 @@ public void getTableMetadata()
   public void testSegmentMetadata()
       throws Exception {
     IndexSegment defaultSegment = _realtimeIndexSegments.get(0);
-    String segmentMetadataPath =
-        "/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/" + defaultSegment
-            .getSegmentName() + "/metadata";
+    String segmentMetadataPath = "/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/"
+        + defaultSegment.getSegmentName() + "/metadata";
 
     JsonNode jsonResponse =
         JsonUtils.stringToJsonNode(_webTarget.path(segmentMetadataPath).request().get(String.class));
@@ -171,6 +171,12 @@ public void testSegmentMetadata()
     Assert.assertEquals(jsonResponse.get("indexes").size(), 2);
     Assert.assertNotNull(jsonResponse.get("columns").get(0).get("indexSizeMap"));
     Assert.assertNotNull(jsonResponse.get("columns").get(1).get("indexSizeMap"));
+    Assert.assertEquals(jsonResponse.get("indexes").get("column1").get("h3-index").asText(), "NO");
+    Assert.assertEquals(jsonResponse.get("indexes").get("column1").get("fst-index").asText(), "NO");
+    Assert.assertEquals(jsonResponse.get("indexes").get("column1").get("text-index").asText(), "NO");
+    Assert.assertEquals(jsonResponse.get("indexes").get("column2").get("h3-index").asText(), "NO");
+    Assert.assertEquals(jsonResponse.get("indexes").get("column2").get("fst-index").asText(), "NO");
+    Assert.assertEquals(jsonResponse.get("indexes").get("column2").get("text-index").asText(), "NO");
 
     jsonResponse = JsonUtils.stringToJsonNode(
         (_webTarget.path(segmentMetadataPath).queryParam("columns", "*").request().get(String.class)));
@@ -182,8 +188,8 @@ public void testSegmentMetadata()
         .get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
 
-    response = _webTarget
-        .path("/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/UNKNOWN_SEGMENT")
+    response = _webTarget.path(
+            "/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/UNKNOWN_SEGMENT")
         .request().get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
   }
@@ -223,8 +229,8 @@ public void testDownloadSegments()
     Response response = _webTarget.path("/tables/UNKNOWN_REALTIME/segments/segmentname").request().get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
 
-    response = _webTarget
-        .path("/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/UNKNOWN_SEGMENT")
+    response = _webTarget.path(
+            "/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/UNKNOWN_SEGMENT")
         .request().get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
   }
@@ -237,8 +243,8 @@ public void testDownloadValidDocIdsSnapshot()
         (ImmutableSegmentImpl) _realtimeIndexSegments.get(0));
 
     // Verify non-existent table and segment download return NOT_FOUND status.
-    Response response = _webTarget.path("/tables/UNKNOWN_REALTIME/segments/segmentname/validDocIds").request()
-        .get(Response.class);
+    Response response =
+        _webTarget.path("/tables/UNKNOWN_REALTIME/segments/segmentname/validDocIds").request().get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
 
     response = _webTarget.path(
@@ -247,6 +253,26 @@ public void testDownloadValidDocIdsSnapshot()
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
   }
 
+  @Test
+  public void testValidDocIdMetadata()
+      throws IOException {
+    IndexSegment segment = _realtimeIndexSegments.get(0);
+    // Verify the content of the downloaded snapshot from a realtime table.
+    downLoadAndVerifyValidDocIdsSnapshot(TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME),
+        (ImmutableSegmentImpl) segment);
+
+    String validDocIdMetadataPath =
+        "/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/validDocIdMetadata";
+    String metadataResponse =
+        _webTarget.path(validDocIdMetadataPath).queryParam("segmentNames", segment.getSegmentName()).request()
+            .get(String.class);
+    JsonNode validDocIdMetadata = JsonUtils.stringToJsonNode(metadataResponse).get(0);
+
+    Assert.assertEquals(validDocIdMetadata.get("totalDocs").asInt(), 100000);
+    Assert.assertEquals(validDocIdMetadata.get("totalValidDocs").asInt(), 8);
+    Assert.assertEquals(validDocIdMetadata.get("totalInvalidDocs").asInt(), 99992);
+  }
+
   // Verify metadata file from segments.
   private void downLoadAndVerifySegmentContent(String tableNameWithType, IndexSegment segment)
       throws IOException {
@@ -284,10 +310,10 @@ private void downLoadAndVerifyValidDocIdsSnapshot(String tableNameWithType, Immu
     PartitionUpsertMetadataManager upsertMetadataManager = mock(PartitionUpsertMetadataManager.class);
     ThreadSafeMutableRoaringBitmap validDocIds = new ThreadSafeMutableRoaringBitmap();
     int[] docIds = new int[]{1, 4, 6, 10, 15, 17, 18, 20};
-    for (int docId: docIds) {
+    for (int docId : docIds) {
       validDocIds.add(docId);
     }
-    segment.enableUpsert(upsertMetadataManager, validDocIds);
+    segment.enableUpsert(upsertMetadataManager, validDocIds, null);
 
     // Download the snapshot in byte[] format.
     Response response = _webTarget.path(snapshotPath).request().get(Response.class);
@@ -309,21 +335,21 @@ public void testUploadSegments()
         _realtimeIndexSegments);
 
     // Verify segment uploading succeed.
-    Response response = _webTarget.path(String
-        .format("/segments/%s/%s/upload", TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME),
+    Response response = _webTarget.path(
+        String.format("/segments/%s/%s/upload", TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME),
             LLC_SEGMENT_NAME_FOR_UPLOAD_SUCCESS)).request().post(null);
     Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
     Assert.assertEquals(response.readEntity(String.class), SEGMENT_DOWNLOAD_URL);
 
     // Verify bad request: table type is offline
-    response = _webTarget.path(String
-        .format("/segments/%s/%s/upload", TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME),
+    response = _webTarget.path(
+        String.format("/segments/%s/%s/upload", TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME),
             _offlineIndexSegments.get(0).getSegmentName())).request().post(null);
     Assert.assertEquals(response.getStatus(), Response.Status.BAD_REQUEST.getStatusCode());
 
     // Verify bad request: segment is not low level consumer segment
-    response = _webTarget.path(String
-        .format("/segments/%s/%s/upload", TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME),
+    response = _webTarget.path(
+        String.format("/segments/%s/%s/upload", TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME),
             _realtimeIndexSegments.get(0).getSegmentName())).request().post(null);
     Assert.assertEquals(response.getStatus(), Response.Status.BAD_REQUEST.getStatusCode());
 
@@ -343,9 +369,8 @@ public void testUploadSegments()
   public void testOfflineTableSegmentMetadata()
       throws Exception {
     IndexSegment defaultSegment = _offlineIndexSegments.get(0);
-    String segmentMetadataPath =
-        "/tables/" + TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME) + "/segments/" + defaultSegment
-            .getSegmentName() + "/metadata";
+    String segmentMetadataPath = "/tables/" + TableNameBuilder.OFFLINE.tableNameWithType(TABLE_NAME) + "/segments/"
+        + defaultSegment.getSegmentName() + "/metadata";
 
     JsonNode jsonResponse =
         JsonUtils.stringToJsonNode(_webTarget.path(segmentMetadataPath).request().get(String.class));
@@ -377,8 +402,8 @@ public void testOfflineTableSegmentMetadata()
         .get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
 
-    response = _webTarget
-        .path("/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/UNKNOWN_SEGMENT")
+    response = _webTarget.path(
+            "/tables/" + TableNameBuilder.REALTIME.tableNameWithType(TABLE_NAME) + "/segments/UNKNOWN_SEGMENT")
         .request().get(Response.class);
     Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
   }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadAccountantFactory.java b/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadAccountantFactory.java
index 285e24b143b..f3755c55697 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadAccountantFactory.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadAccountantFactory.java
@@ -22,5 +22,5 @@
 
 
 public interface ThreadAccountantFactory {
-  ThreadResourceUsageAccountant init(int numRunnerThreads, int numWorkerThreads, PinotConfiguration config);
+  ThreadResourceUsageAccountant init(PinotConfiguration config, String instanceId);
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadResourceUsageAccountant.java b/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadResourceUsageAccountant.java
index ed825fd5493..41bbd591109 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadResourceUsageAccountant.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/accounting/ThreadResourceUsageAccountant.java
@@ -57,6 +57,13 @@ public interface ThreadResourceUsageAccountant {
    */
   void sampleUsage();
 
+  /**
+   * special interface to aggregate usage to the stats store only once, it is used for response
+   * ser/de threads where the thread execution context cannot be setup before hands as
+   * queryId/taskId is unknown and the execution process is hard to instrument
+   */
+  void updateQueryUsageConcurrently(String queryId);
+
   /**
    * start the periodical task
    */
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceDataManagerConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceDataManagerConfig.java
index 9069ee7a570..4c380cb5b25 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceDataManagerConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/instance/InstanceDataManagerConfig.java
@@ -68,4 +68,8 @@ public interface InstanceDataManagerConfig {
   int getDeletedSegmentsCacheTtlMinutes();
 
   String getSegmentPeerDownloadScheme();
+
+  long getExternalViewDroppedMaxWaitMs();
+
+  long getExternalViewDroppedCheckIntervalMs();
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/BloomFilterConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/BloomFilterConfig.java
index 22af21b5139..e9330e472db 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/BloomFilterConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/BloomFilterConfig.java
@@ -21,20 +21,28 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
-import org.apache.pinot.spi.config.BaseJsonConfig;
+import java.util.Objects;
 
 
-public class BloomFilterConfig extends BaseJsonConfig {
+public class BloomFilterConfig extends IndexConfig {
   public static final double DEFAULT_FPP = 0.05;
+  public static final BloomFilterConfig DEFAULT = new BloomFilterConfig(BloomFilterConfig.DEFAULT_FPP, 0, false);
+  public static final BloomFilterConfig DISABLED = new BloomFilterConfig(true, BloomFilterConfig.DEFAULT_FPP, 0,
+      false);
 
   private final double _fpp;
   private final int _maxSizeInBytes;
   private final boolean _loadOnHeap;
 
+  public BloomFilterConfig(double fpp, int maxSizeInBytes, boolean loadOnHeap) {
+    this(false, fpp, maxSizeInBytes, loadOnHeap);
+  }
+
   @JsonCreator
-  public BloomFilterConfig(@JsonProperty(value = "fpp") double fpp,
+  public BloomFilterConfig(@JsonProperty("disabled") Boolean disabled, @JsonProperty(value = "fpp") double fpp,
       @JsonProperty(value = "maxSizeInBytes") int maxSizeInBytes,
       @JsonProperty(value = "loadOnHeap") boolean loadOnHeap) {
+    super(disabled);
     if (fpp != 0.0) {
       Preconditions.checkArgument(fpp > 0.0 && fpp < 1.0, "Invalid fpp (false positive probability): %s", fpp);
       _fpp = fpp;
@@ -56,4 +64,25 @@ public int getMaxSizeInBytes() {
   public boolean isLoadOnHeap() {
     return _loadOnHeap;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+    BloomFilterConfig that = (BloomFilterConfig) o;
+    return Double.compare(that._fpp, _fpp) == 0 && _maxSizeInBytes == that._maxSizeInBytes
+        && _loadOnHeap == that._loadOnHeap && isEnabled() == that.isEnabled();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), _fpp, _maxSizeInBytes, _loadOnHeap, isEnabled());
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/DedupConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/DedupConfig.java
index 9cbe2623384..17ff1e271a3 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/DedupConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/DedupConfig.java
@@ -25,13 +25,20 @@
 public class DedupConfig extends BaseJsonConfig {
   private final boolean _dedupEnabled;
   private final HashFunction _hashFunction;
+  private final String _metadataManagerClass;
 
+  public DedupConfig(@JsonProperty(value = "dedupEnabled", required = true) boolean dedupEnabled,
+      @JsonProperty(value = "hashFunction") HashFunction hashFunction) {
+    this(dedupEnabled, hashFunction, null);
+  }
   @JsonCreator
   public DedupConfig(@JsonProperty(value = "dedupEnabled", required = true) boolean dedupEnabled,
-      @JsonProperty(value = "hashFunction") HashFunction hashFunction
+      @JsonProperty(value = "hashFunction") HashFunction hashFunction,
+      @JsonProperty(value = "metadataManagerClass") String metadataManagerClass
   ) {
     _dedupEnabled = dedupEnabled;
     _hashFunction = hashFunction == null ? HashFunction.NONE : hashFunction;
+    _metadataManagerClass = metadataManagerClass;
   }
 
   public HashFunction getHashFunction() {
@@ -41,4 +48,8 @@ public HashFunction getHashFunction() {
   public boolean isDedupEnabled() {
     return _dedupEnabled;
   }
+
+  public String getMetadataManagerClass() {
+    return _metadataManagerClass;
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java
index e04fac4d130..e567bb6f2e2 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/FieldConfig.java
@@ -20,10 +20,13 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.NullNode;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.pinot.spi.config.BaseJsonConfig;
 
@@ -57,6 +60,8 @@ public class FieldConfig extends BaseJsonConfig {
   private final String _name;
   private final EncodingType _encodingType;
   private final List<IndexType> _indexTypes;
+  private final JsonNode _indexes;
+  private final JsonNode _tierOverwrites;
   private final CompressionCodec _compressionCodec;
   private final Map<String, String> _properties;
   private final TimestampConfig _timestampConfig;
@@ -64,12 +69,19 @@ public class FieldConfig extends BaseJsonConfig {
   @Deprecated
   public FieldConfig(String name, EncodingType encodingType, IndexType indexType, CompressionCodec compressionCodec,
       Map<String, String> properties) {
-    this(name, encodingType, indexType, null, compressionCodec, null, properties);
+    this(name, encodingType, indexType, null, compressionCodec, null, null, properties, null);
   }
 
   public FieldConfig(String name, EncodingType encodingType, List<IndexType> indexTypes,
       CompressionCodec compressionCodec, Map<String, String> properties) {
-    this(name, encodingType, null, indexTypes, compressionCodec, null, properties);
+    this(name, encodingType, null, indexTypes, compressionCodec, null, null, properties, null);
+  }
+
+  @Deprecated
+  public FieldConfig(String name, EncodingType encodingType, @Nullable IndexType indexType,
+      @Nullable List<IndexType> indexTypes, @Nullable CompressionCodec compressionCodec,
+      @Nullable TimestampConfig timestampConfig, @Nullable Map<String, String> properties) {
+    this(name, encodingType, indexType, indexTypes, compressionCodec, timestampConfig, null, properties, null);
   }
 
   @JsonCreator
@@ -79,7 +91,9 @@ public FieldConfig(@JsonProperty(value = "name", required = true) String name,
       @JsonProperty(value = "indexTypes") @Nullable List<IndexType> indexTypes,
       @JsonProperty(value = "compressionCodec") @Nullable CompressionCodec compressionCodec,
       @JsonProperty(value = "timestampConfig") @Nullable TimestampConfig timestampConfig,
-      @JsonProperty(value = "properties") @Nullable Map<String, String> properties) {
+      @JsonProperty(value = "indexes") @Nullable JsonNode indexes,
+      @JsonProperty(value = "properties") @Nullable Map<String, String> properties,
+      @JsonProperty(value = "tierOverwrites") @Nullable JsonNode tierOverwrites) {
     Preconditions.checkArgument(name != null, "'name' must be configured");
     _name = name;
     _encodingType = encodingType;
@@ -88,6 +102,8 @@ public FieldConfig(@JsonProperty(value = "name", required = true) String name,
     _compressionCodec = compressionCodec;
     _timestampConfig = timestampConfig;
     _properties = properties;
+    _indexes = indexes == null ? NullNode.getInstance() : indexes;
+    _tierOverwrites = tierOverwrites == null ? NullNode.getInstance() : tierOverwrites;
   }
 
   // If null, we will create dictionary encoded forward index by default
@@ -122,6 +138,14 @@ public List<IndexType> getIndexTypes() {
     return _indexTypes;
   }
 
+  public JsonNode getIndexes() {
+    return _indexes;
+  }
+
+  public JsonNode getTierOverwrites() {
+    return _tierOverwrites;
+  }
+
   @Nullable
   public CompressionCodec getCompressionCodec() {
     return _compressionCodec;
@@ -136,4 +160,76 @@ public TimestampConfig getTimestampConfig() {
   public Map<String, String> getProperties() {
     return _properties;
   }
+
+  public static class Builder {
+    @Nonnull
+    private String _name;
+    private EncodingType _encodingType;
+    private List<IndexType> _indexTypes;
+    private JsonNode _indexes;
+    private CompressionCodec _compressionCodec;
+    private Map<String, String> _properties;
+    private TimestampConfig _timestampConfig;
+    private JsonNode _tierOverwrites;
+
+    public Builder(@Nonnull String name) {
+      _name = name;
+    }
+
+    public Builder(FieldConfig other) {
+      _name = other._name;
+      _encodingType = other._encodingType;
+      _indexTypes = other._indexTypes;
+      _indexes = other._indexes;
+      _compressionCodec = other._compressionCodec;
+      _properties = other._properties;
+      _timestampConfig = other._timestampConfig;
+      _tierOverwrites = other._tierOverwrites;
+    }
+
+    public Builder withIndexes(JsonNode indexes) {
+      _indexes = indexes;
+      return this;
+    }
+
+    public Builder withName(String name) {
+      _name = name;
+      return this;
+    }
+
+    public Builder withEncodingType(EncodingType encodingType) {
+      _encodingType = encodingType;
+      return this;
+    }
+
+    public Builder withIndexTypes(List<IndexType> indexTypes) {
+      _indexTypes = indexTypes;
+      return this;
+    }
+
+    public Builder withCompressionCodec(CompressionCodec compressionCodec) {
+      _compressionCodec = compressionCodec;
+      return this;
+    }
+
+    public Builder withProperties(Map<String, String> properties) {
+      _properties = properties;
+      return this;
+    }
+
+    public Builder withTimestampConfig(TimestampConfig timestampConfig) {
+      _timestampConfig = timestampConfig;
+      return this;
+    }
+
+    public Builder withTierOverwrites(JsonNode tierOverwrites) {
+      _tierOverwrites = tierOverwrites;
+      return this;
+    }
+
+    public FieldConfig build() {
+      return new FieldConfig(_name, _encodingType, null, _indexTypes, _compressionCodec, _timestampConfig,
+          _indexes, _properties, _tierOverwrites);
+    }
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexConfig.java
new file mode 100644
index 00000000000..16d9a47fb0a
--- /dev/null
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexConfig.java
@@ -0,0 +1,73 @@
+/**
+ * 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.pinot.spi.config.table;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+import org.apache.pinot.spi.config.BaseJsonConfig;
+
+
+/**
+ * This is the base class used to configure indexes.
+ *
+ * The common logic between all indexes is that they can be enabled or disabled.
+ *
+ * Indexes that do not require extra configuration can directly use this class.
+ */
+public class IndexConfig extends BaseJsonConfig {
+  public static final IndexConfig ENABLED = new IndexConfig(false);
+  public static final IndexConfig DISABLED = new IndexConfig(true);
+  private final boolean _disabled;
+
+  /**
+   * @param disabled whether the config is disabled. Null is considered enabled.
+   */
+  @JsonCreator
+  public IndexConfig(@JsonProperty("disabled") Boolean disabled) {
+    _disabled = Boolean.TRUE.equals(disabled);
+  }
+
+  public boolean isDisabled() {
+    return _disabled;
+  }
+
+  @JsonIgnore
+  public boolean isEnabled() {
+    return !_disabled;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IndexConfig that = (IndexConfig) o;
+    return _disabled == that._disabled;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_disabled);
+  }
+}
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java
index cbb351675ea..75599cb2e6b 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/IndexingConfig.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.spi.config.table;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -26,8 +27,13 @@
 
 
 public class IndexingConfig extends BaseJsonConfig {
+  // Default ratio for overriding dictionary
+  public static final double DEFAULT_NO_DICTIONARY_SIZE_RATIO_THRESHOLD = 0.85d;
 
-  public static final int DEFAULT_RANGE_INDEX_VERSION = 2;
+  /**
+   * This should be equal to the one specified in RangeIndexType.
+   */
+  private static final int DEFAULT_RANGE_INDEX_VERSION = 2;
 
   private List<String> _invertedIndexColumns;
   private List<String> _rangeIndexColumns;
@@ -68,7 +74,7 @@ public class IndexingConfig extends BaseJsonConfig {
    */
   private boolean _optimizeDictionaryForMetrics;
 
-  private double _noDictionarySizeRatioThreshold;
+  private double _noDictionarySizeRatioThreshold = DEFAULT_NO_DICTIONARY_SIZE_RATIO_THRESHOLD;
 
   // TODO: Add a new configuration related to the segment generation
   private boolean _autoGeneratedInvertedIndex;
@@ -82,6 +88,8 @@ public class IndexingConfig extends BaseJsonConfig {
    */
   private List<String> _varLengthDictionaryColumns;
 
+  private JsonNode _tierOverwrites;
+
   @Nullable
   public List<String> getInvertedIndexColumns() {
     return _invertedIndexColumns;
@@ -267,6 +275,14 @@ public void setStarTreeIndexConfigs(List<StarTreeIndexConfig> starTreeIndexConfi
     _starTreeIndexConfigs = starTreeIndexConfigs;
   }
 
+  public JsonNode getTierOverwrites() {
+    return _tierOverwrites;
+  }
+
+  public void setTierOverwrites(JsonNode tierOverwrites) {
+    _tierOverwrites = tierOverwrites;
+  }
+
   public boolean isEnableDynamicStarTreeCreation() {
     return _enableDynamicStarTreeCreation;
   }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/JsonIndexConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/JsonIndexConfig.java
index 292b676c033..fbb848f6beb 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/JsonIndexConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/JsonIndexConfig.java
@@ -18,10 +18,12 @@
  */
 package org.apache.pinot.spi.config.table;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
+import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Nullable;
-import org.apache.pinot.spi.config.BaseJsonConfig;
 
 
 /**
@@ -38,7 +40,9 @@
  *                 to be excluded.
  * - excludeFields: Exclude the given fields, e.g. "b", "c", even if it is under the included paths.
  */
-public class JsonIndexConfig extends BaseJsonConfig {
+public class JsonIndexConfig extends IndexConfig {
+  public static final JsonIndexConfig DISABLED = new JsonIndexConfig(true);
+
   private int _maxLevels = -1;
   private boolean _excludeArray = false;
   private boolean _disableCrossArrayUnnest = false;
@@ -46,6 +50,30 @@ public class JsonIndexConfig extends BaseJsonConfig {
   private Set<String> _excludePaths;
   private Set<String> _excludeFields;
 
+  public JsonIndexConfig() {
+    super(false);
+  }
+
+  public JsonIndexConfig(Boolean disabled) {
+    super(disabled);
+  }
+
+  @JsonCreator
+  public JsonIndexConfig(@JsonProperty("disabled") Boolean disabled, @JsonProperty("maxLevels") int maxLevels,
+      @JsonProperty("excludeArray") boolean excludeArray,
+      @JsonProperty("disableCrossArrayUnnest") boolean disableCrossArrayUnnest,
+      @JsonProperty("includePaths") @Nullable Set<String> includePaths,
+      @JsonProperty("excludePaths") @Nullable Set<String> excludePaths,
+      @JsonProperty("excludeFields") @Nullable Set<String> excludeFields) {
+    super(disabled);
+    _maxLevels = maxLevels;
+    _excludeArray = excludeArray;
+    _disableCrossArrayUnnest = disableCrossArrayUnnest;
+    _includePaths = includePaths;
+    _excludePaths = excludePaths;
+    _excludeFields = excludeFields;
+  }
+
   public int getMaxLevels() {
     return _maxLevels;
   }
@@ -101,4 +129,28 @@ public Set<String> getExcludeFields() {
   public void setExcludeFields(@Nullable Set<String> excludeFields) {
     _excludeFields = excludeFields;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    if (!super.equals(o)) {
+      return false;
+    }
+    JsonIndexConfig config = (JsonIndexConfig) o;
+    return _maxLevels == config._maxLevels && _excludeArray == config._excludeArray
+        && _disableCrossArrayUnnest == config._disableCrossArrayUnnest && Objects.equals(_includePaths,
+        config._includePaths) && Objects.equals(_excludePaths, config._excludePaths) && Objects.equals(_excludeFields,
+        config._excludeFields);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), _maxLevels, _excludeArray, _disableCrossArrayUnnest, _includePaths,
+        _excludePaths, _excludeFields);
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java
index a71ddb47f68..f16d2e67f91 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/TableConfig.java
@@ -59,6 +59,7 @@ public class TableConfig extends BaseJsonConfig {
   public static final String INGESTION_CONFIG_KEY = "ingestionConfig";
   public static final String TIER_CONFIGS_LIST_KEY = "tierConfigs";
   public static final String TUNER_CONFIG_LIST_KEY = "tunerConfigs";
+  public static final String TIER_OVERWRITES_KEY = "tierOverwrites";
 
   // Double underscore is reserved for real-time segment name delimiter
   private static final String TABLE_NAME_FORBIDDEN_SUBSTRING = "__";
@@ -89,7 +90,7 @@ public class TableConfig extends BaseJsonConfig {
   private TableTaskConfig _taskConfig;
   private RoutingConfig _routingConfig;
   private QueryConfig _queryConfig;
-  private Map<InstancePartitionsType, InstanceAssignmentConfig> _instanceAssignmentConfigMap;
+  private Map<String, InstanceAssignmentConfig> _instanceAssignmentConfigMap;
 
   @JsonPropertyDescription(value = "Point to an existing instance partitions")
   private Map<InstancePartitionsType, String> _instancePartitionsMap;
@@ -128,7 +129,7 @@ public TableConfig(@JsonProperty(value = TABLE_NAME_KEY, required = true) String
       @JsonProperty(ROUTING_CONFIG_KEY) @Nullable RoutingConfig routingConfig,
       @JsonProperty(QUERY_CONFIG_KEY) @Nullable QueryConfig queryConfig,
       @JsonProperty(INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY) @Nullable
-          Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap,
+          Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap,
       @JsonProperty(FIELD_CONFIG_LIST_KEY) @Nullable List<FieldConfig> fieldConfigList,
       @JsonProperty(UPSERT_CONFIG_KEY) @Nullable UpsertConfig upsertConfig,
       @JsonProperty(DEDUP_CONFIG_KEY) @Nullable DedupConfig dedupConfig,
@@ -174,6 +175,30 @@ public TableConfig(@JsonProperty(value = TABLE_NAME_KEY, required = true) String
     _segmentAssignmentConfigMap = segmentAssignmentConfigMap;
   }
 
+  public TableConfig(TableConfig tableConfig) {
+    _tableType = tableConfig.getTableType();
+    _tableName = tableConfig.getTableName();
+    _validationConfig = tableConfig.getValidationConfig();
+    _tenantConfig = tableConfig.getTenantConfig();
+    _indexingConfig = tableConfig.getIndexingConfig();
+    _customConfig = tableConfig.getCustomConfig();
+    _quotaConfig = tableConfig.getQuotaConfig();
+    _taskConfig = tableConfig.getTaskConfig();
+    _routingConfig = tableConfig.getRoutingConfig();
+    _queryConfig = tableConfig.getQueryConfig();
+    _instanceAssignmentConfigMap = tableConfig.getInstanceAssignmentConfigMap();
+    _fieldConfigList = tableConfig.getFieldConfigList();
+    _upsertConfig = tableConfig.getUpsertConfig();
+    _dedupConfig = tableConfig.getDedupConfig();
+    _dimensionTableConfig = tableConfig.getDimensionTableConfig();
+    _ingestionConfig = tableConfig.getIngestionConfig();
+    _tierConfigsList = tableConfig.getTierConfigsList();
+    _dimTable = tableConfig.isDimTable();
+    _tunerConfigList = tableConfig.getTunerConfigsList();
+    _instancePartitionsMap = tableConfig.getInstancePartitionsMap();
+    _segmentAssignmentConfigMap = tableConfig.getSegmentAssignmentConfigMap();
+  }
+
   @JsonProperty(TABLE_NAME_KEY)
   public String getTableName() {
     return _tableName;
@@ -267,12 +292,12 @@ public void setQueryConfig(QueryConfig queryConfig) {
 
   @JsonProperty(INSTANCE_ASSIGNMENT_CONFIG_MAP_KEY)
   @Nullable
-  public Map<InstancePartitionsType, InstanceAssignmentConfig> getInstanceAssignmentConfigMap() {
+  public Map<String, InstanceAssignmentConfig> getInstanceAssignmentConfigMap() {
     return _instanceAssignmentConfigMap;
   }
 
   public void setInstanceAssignmentConfigMap(
-      Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap) {
+      Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap) {
     _instanceAssignmentConfigMap = instanceAssignmentConfigMap;
   }
 
@@ -359,8 +384,14 @@ public boolean isUpsertEnabled() {
 
   @JsonIgnore
   @Nullable
-  public String getUpsertComparisonColumn() {
-    return _upsertConfig == null ? null : _upsertConfig.getComparisonColumn();
+  public List<String> getUpsertComparisonColumns() {
+    return _upsertConfig == null ? null : _upsertConfig.getComparisonColumns();
+  }
+
+  @JsonIgnore
+  @Nullable
+  public String getUpsertDeleteRecordColumn() {
+    return _upsertConfig == null ? null : _upsertConfig.getDeleteRecordColumn();
   }
 
   @JsonProperty(TUNER_CONFIG_LIST_KEY)
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/UpsertConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/UpsertConfig.java
index 0c06d9e07d1..2e2a3f645aa 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/UpsertConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/UpsertConfig.java
@@ -18,12 +18,12 @@
  */
 package org.apache.pinot.spi.config.table;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import com.google.common.base.Preconditions;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.pinot.spi.config.BaseJsonConfig;
 
 
@@ -49,42 +49,29 @@ public enum Strategy {
   private Map<String, Strategy> _partialUpsertStrategies;
 
   @JsonPropertyDescription("default upsert strategy for partial mode")
-  private Strategy _defaultPartialUpsertStrategy;
+  private Strategy _defaultPartialUpsertStrategy = Strategy.OVERWRITE;
 
-  @JsonPropertyDescription("Column for upsert comparison, default to time column")
-  private String _comparisonColumn;
+  @JsonPropertyDescription("Columns for upsert comparison, default to time column")
+  private List<String> _comparisonColumns;
+
+  @JsonPropertyDescription("Boolean column to indicate whether a records should be deleted")
+  private String _deleteRecordColumn;
 
   @JsonPropertyDescription("Whether to use snapshot for fast upsert metadata recovery")
   private boolean _enableSnapshot;
 
+  @JsonPropertyDescription("Whether to use TTL for upsert metadata cleanup, it uses the same unit as comparison col")
+  private double _metadataTTL;
+
+  @JsonPropertyDescription("Whether to preload segments for fast upsert metadata recovery")
+  private boolean _enablePreload;
+
   @JsonPropertyDescription("Custom class for upsert metadata manager")
   private String _metadataManagerClass;
 
   @JsonPropertyDescription("Custom configs for upsert metadata manager")
   private Map<String, String> _metadataManagerConfigs;
 
-  @Deprecated
-  public UpsertConfig(@JsonProperty(value = "mode", required = true) Mode mode,
-      @JsonProperty("partialUpsertStrategies") @Nullable Map<String, Strategy> partialUpsertStrategies,
-      @JsonProperty("defaultPartialUpsertStrategy") @Nullable Strategy defaultPartialUpsertStrategy,
-      @JsonProperty("comparisonColumn") @Nullable String comparisonColumn,
-      @JsonProperty("hashFunction") @Nullable HashFunction hashFunction) {
-    Preconditions.checkArgument(mode != null, "Upsert mode must be configured");
-    _mode = mode;
-
-    if (mode == Mode.PARTIAL) {
-      _partialUpsertStrategies = partialUpsertStrategies != null ? partialUpsertStrategies : new HashMap<>();
-      _defaultPartialUpsertStrategy =
-          defaultPartialUpsertStrategy != null ? defaultPartialUpsertStrategy : Strategy.OVERWRITE;
-    } else {
-      _partialUpsertStrategies = null;
-      _defaultPartialUpsertStrategy = null;
-    }
-
-    _comparisonColumn = comparisonColumn;
-    _hashFunction = hashFunction == null ? HashFunction.NONE : hashFunction;
-  }
-
   public UpsertConfig(Mode mode) {
     _mode = mode;
   }
@@ -97,6 +84,10 @@ public Mode getMode() {
     return _mode;
   }
 
+  public void setMode(Mode mode) {
+    _mode = mode;
+  }
+
   public HashFunction getHashFunction() {
     return _hashFunction;
   }
@@ -110,14 +101,27 @@ public Strategy getDefaultPartialUpsertStrategy() {
     return _defaultPartialUpsertStrategy;
   }
 
-  public String getComparisonColumn() {
-    return _comparisonColumn;
+  public List<String> getComparisonColumns() {
+    return _comparisonColumns;
+  }
+
+  @Nullable
+  public String getDeleteRecordColumn() {
+    return _deleteRecordColumn;
   }
 
   public boolean isEnableSnapshot() {
     return _enableSnapshot;
   }
 
+  public double getMetadataTTL() {
+    return _metadataTTL;
+  }
+
+  public boolean isEnablePreload() {
+    return _enablePreload;
+  }
+
   @Nullable
   public String getMetadataManagerClass() {
     return _metadataManagerClass;
@@ -154,16 +158,42 @@ public void setDefaultPartialUpsertStrategy(Strategy defaultPartialUpsertStrateg
    * same primary key, the record with the larger value of the time column is picked as the
    * latest update.
    * However, there are cases when users need to use another column to determine the order.
-   * In such case, you can use option comparisonColumn to override the column used for comparison.
+   * In such case, you can use option comparisonColumn to override the column used for comparison. When using
+   * multiple comparison columns, typically in the case of partial upserts, it is expected that input documents will
+   * each only have a singular non-null comparisonColumn. Multiple non-null values in an input document _will_ result
+   * in undefined behaviour. Typically, one comparisonColumn is allocated per distinct producer application of data
+   * in the case where there are multiple producers sinking to the same table.
    */
+  public void setComparisonColumns(List<String> comparisonColumns) {
+    if (CollectionUtils.isNotEmpty(comparisonColumns)) {
+      _comparisonColumns = comparisonColumns;
+    }
+  }
+
   public void setComparisonColumn(String comparisonColumn) {
-    _comparisonColumn = comparisonColumn;
+    if (comparisonColumn != null) {
+      _comparisonColumns = Collections.singletonList(comparisonColumn);
+    }
+  }
+
+  public void setDeleteRecordColumn(String deleteRecordColumn) {
+    if (deleteRecordColumn != null) {
+      _deleteRecordColumn = deleteRecordColumn;
+    }
   }
 
   public void setEnableSnapshot(boolean enableSnapshot) {
     _enableSnapshot = enableSnapshot;
   }
 
+  public void setMetadataTTL(double metadataTTL) {
+    _metadataTTL = metadataTTL;
+  }
+
+  public void setEnablePreload(boolean enablePreload) {
+    _enablePreload = enablePreload;
+  }
+
   public void setMetadataManagerClass(String metadataManagerClass) {
     _metadataManagerClass = metadataManagerClass;
   }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java
index 95102e77c44..adc72e8f1ce 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/InstanceReplicaGroupPartitionConfig.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import javax.annotation.Nullable;
 import org.apache.pinot.spi.config.BaseJsonConfig;
 
 
@@ -51,6 +52,10 @@ public class InstanceReplicaGroupPartitionConfig extends BaseJsonConfig {
           + "instances if not " + "specified")
   private final int _numInstancesPerPartition;
 
+  @JsonPropertyDescription(
+      "Name of the column used for partition, if not provided table level replica group will be used")
+  private final String _partitionColumn;
+
   private final boolean _minimizeDataMovement;
 
   @JsonCreator
@@ -59,7 +64,8 @@ public InstanceReplicaGroupPartitionConfig(@JsonProperty("replicaGroupBased") bo
       @JsonProperty("numInstancesPerReplicaGroup") int numInstancesPerReplicaGroup,
       @JsonProperty("numPartitions") int numPartitions,
       @JsonProperty("numInstancesPerPartition") int numInstancesPerPartition,
-      @JsonProperty("minimizeDataMovement") boolean minimizeDataMovement) {
+      @JsonProperty("minimizeDataMovement") boolean minimizeDataMovement,
+      @Nullable @JsonProperty("partitionColumn") String partitionColumn) {
     _replicaGroupBased = replicaGroupBased;
     _numInstances = numInstances;
     _numReplicaGroups = numReplicaGroups;
@@ -67,6 +73,7 @@ public InstanceReplicaGroupPartitionConfig(@JsonProperty("replicaGroupBased") bo
     _numPartitions = numPartitions;
     _numInstancesPerPartition = numInstancesPerPartition;
     _minimizeDataMovement = minimizeDataMovement;
+    _partitionColumn = partitionColumn;
   }
 
   public boolean isReplicaGroupBased() {
@@ -96,4 +103,9 @@ public int getNumInstancesPerPartition() {
   public boolean isMinimizeDataMovement() {
     return _minimizeDataMovement;
   }
+
+  @Nullable
+  public String getPartitionColumn() {
+    return _partitionColumn;
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/SegmentAssignmentConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/SegmentAssignmentConfig.java
index 7c7064cfbec..eef95257f00 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/SegmentAssignmentConfig.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/config/table/assignment/SegmentAssignmentConfig.java
@@ -27,6 +27,7 @@
 public class SegmentAssignmentConfig extends BaseJsonConfig {
 
   @JsonPropertyDescription("Configuration for Segment Assignment Strategy")
+  @JsonProperty("segmentAssignmentStrategy")
   private final String _assignmentStrategy;
 
   @JsonCreator
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeFormatSpec.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeFormatSpec.java
index 4f208a9eff8..fc9bc9259e6 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeFormatSpec.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeFormatSpec.java
@@ -257,6 +257,10 @@ public DateTimeFormatter getDateTimeFormatter() {
     return _patternSpec.getDateTimeFormatter();
   }
 
+  public DateTimeFormatPatternSpec getDateTimeFormatPattenSpec() {
+    return _patternSpec;
+  }
+
   /**
    * Converts the time in millis to the date time format.
    * <ul>
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeGranularitySpec.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeGranularitySpec.java
index c8cd10eb156..036432ee043 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeGranularitySpec.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/DateTimeGranularitySpec.java
@@ -29,11 +29,18 @@
  * Class to represent granularity from {@link DateTimeFieldSpec}
  */
 public class DateTimeGranularitySpec {
-  // 'size:timeUnit'
-  private static final char SEPARATOR = ':';
-  private static final int SIZE_POSITION = 0;
-  private static final int TIME_UNIT_POSITION = 1;
-  private static final int NUM_TOKENS = 2;
+  // Colon format: 'size:timeUnit'
+  private static final char COLON_SEPARATOR = ':';
+  private static final int COLON_FORMAT_SIZE_POSITION = 0;
+  private static final int COLON_FORMAT_TIME_UNIT_POSITION = 1;
+  private static final int COLON_FORMAT_NUM_TOKENS = 2;
+
+  // Pipe format: 'timeUnit|size'
+  private static final char PIPE_SEPARATOR = '|';
+  private static final int PIPE_FORMAT_TIME_UNIT_POSITION = 0;
+  private static final int PIPE_FORMAT_SIZE_POSITION = 1;
+  private static final int PIPE_FORMAT_MIN_TOKENS = 1;
+  private static final int PIPE_FORMAT_MAX_TOKENS = 2;
 
   private final int _size;
   private final TimeUnit _timeUnit;
@@ -43,23 +50,56 @@ public class DateTimeGranularitySpec {
    */
   public DateTimeGranularitySpec(String granularity) {
     Preconditions.checkArgument(StringUtils.isNotEmpty(granularity), "Must provide granularity");
-    String[] granularityTokens = StringUtil.split(granularity, SEPARATOR, 2);
-    Preconditions.checkArgument(granularityTokens.length >= NUM_TOKENS,
-        "Invalid granularity: %s, must be of format 'size:timeUnit", granularity);
+
+    char separator;
+    int sizePosition;
+    int timeUnitPosition;
+    int minTokens;
+    int maxTokens;
+
+    if (Character.isDigit(granularity.charAt(0))) {
+      // Colon format: 'size:timeUnit'
+      separator = COLON_SEPARATOR;
+      sizePosition = COLON_FORMAT_SIZE_POSITION;
+      timeUnitPosition = COLON_FORMAT_TIME_UNIT_POSITION;
+
+      minTokens = COLON_FORMAT_NUM_TOKENS;
+      maxTokens = COLON_FORMAT_NUM_TOKENS;
+    } else {
+      // Pipe format: 'timeUnit(|size)'
+      separator = PIPE_SEPARATOR;
+      sizePosition = PIPE_FORMAT_SIZE_POSITION;
+      timeUnitPosition = PIPE_FORMAT_TIME_UNIT_POSITION;
+
+      minTokens = PIPE_FORMAT_MIN_TOKENS;
+      maxTokens = PIPE_FORMAT_MAX_TOKENS;
+    }
+
+    String[] granularityTokens = StringUtil.split(granularity, separator, 2);
+    Preconditions.checkArgument(granularityTokens.length >= minTokens && granularityTokens.length <= maxTokens,
+            "Invalid granularity: %s, must be of format 'timeUnit(|size)' or 'size:timeUnit'", granularity);
+
     try {
-      _size = Integer.parseInt(granularityTokens[SIZE_POSITION]);
+      _timeUnit = TimeUnit.valueOf(granularityTokens[timeUnitPosition]);
     } catch (Exception e) {
       throw new IllegalArgumentException(
-          String.format("Invalid size: %s in granularity: %s", granularityTokens[SIZE_POSITION], granularity));
+          String.format("Invalid time unit: %s in granularity: %s", granularityTokens[timeUnitPosition],
+              granularity));
     }
-    Preconditions.checkArgument(_size > 0, "Invalid size: %s in granularity: %s, must be positive", _size, granularity);
+
+    // New format without explicitly setting size - use default size = 1
+    if (granularityTokens.length == PIPE_FORMAT_MIN_TOKENS) {
+      _size = 1;
+      return;
+    }
+
     try {
-      _timeUnit = TimeUnit.valueOf(granularityTokens[TIME_UNIT_POSITION]);
+      _size = Integer.parseInt(granularityTokens[sizePosition]);
     } catch (Exception e) {
       throw new IllegalArgumentException(
-          String.format("Invalid time unit: %s in granularity: %s", granularityTokens[TIME_UNIT_POSITION],
-              granularity));
+          String.format("Invalid size: %s in granularity: %s", granularityTokens[sizePosition], granularity));
     }
+    Preconditions.checkArgument(_size > 0, "Invalid size: %s in granularity: %s, must be positive", _size, granularity);
   }
 
   /**
@@ -82,6 +122,15 @@ public TimeUnit getTimeUnit() {
 
   /**
    * Converts a granularity to millis.
+   *
+   * Using new format:
+   * <ul>
+   *   <li>1) granularityToMillis(HOURS|1) = 3600000 (60*60*1000)</li>
+   *   <li>2) granularityToMillis(MILLISECONDS|1) = 1</li>
+   *   <li>3) granularityToMillis(MINUTES|15) = 900000 (15*60*1000)</li>
+   * </ul>
+   *
+   * Using old format:
    * <ul>
    *   <li>1) granularityToMillis(1:HOURS) = 3600000 (60*60*1000)</li>
    *   <li>2) granularityToMillis(1:MILLISECONDS) = 1</li>
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/FieldSpec.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/FieldSpec.java
index 9b3ea0862bc..3c931204a92 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/data/FieldSpec.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/FieldSpec.java
@@ -19,10 +19,13 @@
 package org.apache.pinot.spi.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.pinot.spi.utils.BooleanUtils;
 import org.apache.pinot.spi.utils.BytesUtils;
@@ -64,6 +67,34 @@ public abstract class FieldSpec implements Comparable<FieldSpec>, Serializable {
   public static final BigDecimal DEFAULT_METRIC_NULL_VALUE_OF_BIG_DECIMAL = BigDecimal.ZERO;
   public static final String DEFAULT_METRIC_NULL_VALUE_OF_STRING = "null";
   public static final byte[] DEFAULT_METRIC_NULL_VALUE_OF_BYTES = new byte[0];
+  public static final FieldSpecMetadata FIELD_SPEC_METADATA;
+
+  static {
+    // The metadata on the valid list of {@link DataType} for each {@link FieldType}
+    // and the default null values for each combination
+    FIELD_SPEC_METADATA = new FieldSpecMetadata();
+    for (FieldType fieldType : FieldType.values()) {
+      FieldTypeMetadata fieldTypeMetadata = new FieldTypeMetadata();
+      for (DataType dataType : DataType.values()) {
+        try {
+          Schema.validate(fieldType, dataType);
+          try {
+            fieldTypeMetadata.put(dataType, new DataTypeMetadata(getDefaultNullValue(fieldType, dataType, null)));
+          } catch (IllegalStateException ignored) {
+            // default null value not defined for the (DataType, FieldType) combination
+            // defaulting to null in such cases
+            fieldTypeMetadata.put(dataType, new DataTypeMetadata(null));
+          }
+        } catch (IllegalStateException ignored) {
+          // invalid DataType for the given FieldType
+        }
+      }
+      FIELD_SPEC_METADATA.put(fieldType, fieldTypeMetadata);
+    }
+    for (DataType dataType : DataType.values()) {
+      FIELD_SPEC_METADATA.put(dataType, new DataTypeProperties(dataType));
+    }
+  }
 
   protected String _name;
   protected DataType _dataType;
@@ -397,7 +428,8 @@ public enum DataType {
     BYTES(false, false),
     STRUCT(false, false),
     MAP(false, false),
-    LIST(false, false);
+    LIST(false, false),
+    UNKNOWN(false, true);
 
     private final DataType _storedType;
     private final int _size;
@@ -461,6 +493,13 @@ public boolean isNumeric() {
       return _numeric;
     }
 
+    /**
+     * Returns {@code true} if the data type is unknown, {@code false} otherwise.
+     */
+    public boolean isUnknown() {
+      return _storedType == UNKNOWN;
+    }
+
     /**
      * Converts the given string value to the data type. Returns byte[] for BYTES.
      */
@@ -555,4 +594,55 @@ public boolean isBackwardCompatibleWith(FieldSpec oldFieldSpec) {
             && EqualityUtils.isEqual(_dataType, oldFieldSpec._dataType)
             && EqualityUtils.isEqual(_isSingleValueField, oldFieldSpec._isSingleValueField);
   }
+
+  public static class FieldSpecMetadata {
+    @JsonProperty("fieldTypes")
+    public Map<FieldType, FieldTypeMetadata> _fieldTypes = new HashMap<>();
+    @JsonProperty("dataTypes")
+    public Map<DataType, DataTypeProperties> _dataTypes = new HashMap<>();
+
+    void put(FieldType type, FieldTypeMetadata metadata) {
+      _fieldTypes.put(type, metadata);
+    }
+
+    void put(DataType type, DataTypeProperties metadata) {
+      _dataTypes.put(type, metadata);
+    }
+  }
+
+  public static class FieldTypeMetadata {
+    @JsonProperty("allowedDataTypes")
+    public Map<DataType, DataTypeMetadata> _allowedDataTypes = new HashMap<>();
+
+    void put(DataType dataType, DataTypeMetadata metadata) {
+      _allowedDataTypes.put(dataType, metadata);
+    }
+  }
+
+  public static class DataTypeMetadata {
+    @JsonProperty("nullDefault")
+    public Object _nullDefault;
+
+    public DataTypeMetadata(Object nullDefault) {
+      _nullDefault = nullDefault;
+    }
+  }
+
+  public static class DataTypeProperties {
+    @JsonProperty("storedType")
+    public final DataType _storedType;
+    @JsonProperty("size")
+    public final int _size;
+    @JsonProperty("sortable")
+    public final boolean _sortable;
+    @JsonProperty("numeric")
+    public final boolean _numeric;
+
+    public DataTypeProperties(DataType dataType) {
+      _storedType = dataType._storedType;
+      _sortable = dataType._sortable;
+      _numeric = dataType._numeric;
+      _size = dataType._size;
+    }
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/MultiValueVisitor.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/MultiValueVisitor.java
new file mode 100644
index 00000000000..13fc4d3568b
--- /dev/null
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/MultiValueVisitor.java
@@ -0,0 +1,99 @@
+/**
+ * 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.pinot.spi.data;
+
+import java.math.BigDecimal;
+
+
+public interface MultiValueVisitor<R> {
+
+  R visitInt(int[] value);
+
+  R visitLong(long[] value);
+
+  R visitFloat(float[] value);
+
+  R visitDouble(double[] value);
+
+  R visitBigDecimal(BigDecimal[] value);
+
+  R visitBoolean(boolean[] value);
+
+  R visitTimestamp(long[] value);
+
+  R visitString(String[] value);
+
+  R visitJson(String[] value);
+
+  R visitBytes(byte[][] value);
+
+  default SingleValueVisitor<R> asSingleValueVisitor() {
+    return new SingleValueVisitor<R>() {
+      @Override
+      public R visitInt(int value) {
+        return MultiValueVisitor.this.visitInt(new int[] {value});
+      }
+
+      @Override
+      public R visitLong(long value) {
+        return MultiValueVisitor.this.visitLong(new long[] {value});
+      }
+
+      @Override
+      public R visitFloat(float value) {
+        return MultiValueVisitor.this.visitFloat(new float[] {value});
+      }
+
+      @Override
+      public R visitDouble(double value) {
+        return MultiValueVisitor.this.visitDouble(new double[] {value});
+      }
+
+      @Override
+      public R visitBigDecimal(BigDecimal value) {
+        return MultiValueVisitor.this.visitBigDecimal(new BigDecimal[] {value});
+      }
+
+      @Override
+      public R visitBoolean(boolean value) {
+        return MultiValueVisitor.this.visitBoolean(new boolean[] {value});
+      }
+
+      @Override
+      public R visitTimestamp(long value) {
+        return MultiValueVisitor.this.visitLong(new long[] {value});
+      }
+
+      @Override
+      public R visitString(String value) {
+        return MultiValueVisitor.this.visitString(new String[] {value});
+      }
+
+      @Override
+      public R visitJson(String value) {
+        return MultiValueVisitor.this.visitString(new String[] {value});
+      }
+
+      @Override
+      public R visitBytes(byte[] value) {
+        return MultiValueVisitor.this.visitBytes(new byte[][] {value});
+      }
+    };
+  }
+}
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
index 74832cf81fc..4bd63a16df0 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
@@ -30,11 +30,12 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.NavigableSet;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.tuple.Pair;
@@ -73,11 +74,11 @@ public final class Schema implements Serializable {
   private List<String> _primaryKeyColumns;
 
   // Json ignored fields
-  private final Map<String, FieldSpec> _fieldSpecMap = new HashMap<>();
-  private transient final List<String> _dimensionNames = new ArrayList<>();
-  private transient final List<String> _metricNames = new ArrayList<>();
-  private transient final List<String> _dateTimeNames = new ArrayList<>();
-
+  // NOTE: Use TreeMap so that the columns are ordered alphabetically
+  private final TreeMap<String, FieldSpec> _fieldSpecMap = new TreeMap<>();
+  private final List<String> _dimensionNames = new ArrayList<>();
+  private final List<String> _metricNames = new ArrayList<>();
+  private final List<String> _dateTimeNames = new ArrayList<>();
   // Set to true if this schema has a JSON column (used to quickly decide whether to run JsonStatementOptimizer on
   // queries or not).
   private boolean _hasJSONColumn;
@@ -103,6 +104,56 @@ public static Schema fromInputStream(InputStream schemaInputStream)
     return JsonUtils.inputStreamToObject(schemaInputStream, Schema.class);
   }
 
+  public static void validate(FieldType fieldType, DataType dataType) {
+    switch (fieldType) {
+      case DIMENSION:
+      case TIME:
+      case DATE_TIME:
+        switch (dataType) {
+          case INT:
+          case LONG:
+          case FLOAT:
+          case DOUBLE:
+          case BIG_DECIMAL:
+          case BOOLEAN:
+          case TIMESTAMP:
+          case STRING:
+          case JSON:
+          case BYTES:
+            break;
+          default:
+            throw new IllegalStateException(
+                "Unsupported data type: " + dataType + " in DIMENSION/TIME field");
+        }
+        break;
+      case METRIC:
+        switch (dataType) {
+          case INT:
+          case LONG:
+          case FLOAT:
+          case DOUBLE:
+          case BIG_DECIMAL:
+          case BYTES:
+            break;
+          default:
+            throw new IllegalStateException("Unsupported data type: " + dataType + " in METRIC field");
+        }
+        break;
+      case COMPLEX:
+        switch (dataType) {
+          case STRUCT:
+          case MAP:
+          case LIST:
+            break;
+          default:
+            throw new IllegalStateException("Unsupported data type: " + dataType + " in COMPLEX field");
+        }
+        break;
+      default:
+        throw new IllegalStateException("Unsupported data type: " + dataType + " for field");
+    }
+  }
+
   /**
    * NOTE: schema name could be null in tests
    */
@@ -192,8 +243,8 @@ public void addField(FieldSpec fieldSpec) {
     Preconditions.checkNotNull(fieldSpec);
     String columnName = fieldSpec.getName();
     Preconditions.checkNotNull(columnName);
-    Preconditions
-        .checkState(!_fieldSpecMap.containsKey(columnName), "Field spec already exists for column: " + columnName);
+    Preconditions.checkState(!_fieldSpecMap.containsKey(columnName),
+        "Field spec already exists for column: " + columnName);
 
     FieldType fieldType = fieldSpec.getFieldType();
     switch (fieldType) {
@@ -265,23 +316,24 @@ public boolean hasColumn(String columnName) {
     return _fieldSpecMap.containsKey(columnName);
   }
 
+  @JsonIgnore
   public boolean hasJSONColumn() {
     return _hasJSONColumn;
   }
 
   @JsonIgnore
-  public Map<String, FieldSpec> getFieldSpecMap() {
+  public TreeMap<String, FieldSpec> getFieldSpecMap() {
     return _fieldSpecMap;
   }
 
   @JsonIgnore
-  public Set<String> getColumnNames() {
-    return _fieldSpecMap.keySet();
+  public NavigableSet<String> getColumnNames() {
+    return _fieldSpecMap.navigableKeySet();
   }
 
   @JsonIgnore
-  public Set<String> getPhysicalColumnNames() {
-    Set<String> physicalColumnNames = new HashSet<>();
+  public TreeSet<String> getPhysicalColumnNames() {
+    TreeSet<String> physicalColumnNames = new TreeSet<>();
     for (FieldSpec fieldSpec : _fieldSpecMap.values()) {
       if (!fieldSpec.isVirtualColumn()) {
         physicalColumnNames.add(fieldSpec.getName());
@@ -290,6 +342,9 @@ public Set<String> getPhysicalColumnNames() {
     return physicalColumnNames;
   }
 
+  /**
+   * NOTE: The returned FieldSpecs are sorted with the column name alphabetically.
+   */
   @JsonIgnore
   public Collection<FieldSpec> getAllFieldSpecs() {
     return _fieldSpecMap.values();
@@ -445,58 +500,16 @@ public void validate() {
       FieldType fieldType = fieldSpec.getFieldType();
       DataType dataType = fieldSpec.getDataType();
       String fieldName = fieldSpec.getName();
-      switch (fieldType) {
-        case DIMENSION:
-        case TIME:
-        case DATE_TIME:
-          switch (dataType) {
-            case INT:
-            case LONG:
-            case FLOAT:
-            case DOUBLE:
-            case BIG_DECIMAL:
-            case BOOLEAN:
-            case TIMESTAMP:
-            case STRING:
-            case JSON:
-            case BYTES:
-              break;
-            default:
-              throw new IllegalStateException(
-                  "Unsupported data type: " + dataType + " in DIMENSION/TIME field: " + fieldName);
-          }
-          break;
-        case METRIC:
-          switch (dataType) {
-            case INT:
-            case LONG:
-            case FLOAT:
-            case DOUBLE:
-            case BIG_DECIMAL:
-            case BYTES:
-              break;
-            default:
-              throw new IllegalStateException("Unsupported data type: " + dataType + " in METRIC field: " + fieldName);
-          }
-          break;
-        case COMPLEX:
-          switch (dataType) {
-            case STRUCT:
-            case MAP:
-            case LIST:
-              break;
-            default:
-              throw new IllegalStateException("Unsupported data type: " + dataType + " in COMPLEX field: " + fieldName);
-          }
-          break;
-        default:
-          throw new IllegalStateException("Unsupported data type: " + dataType + " for field: " + fieldName);
+      try {
+        validate(fieldType, dataType);
+      } catch (IllegalStateException e) {
+        throw new IllegalStateException(e.getMessage() + ": " + fieldName);
       }
     }
   }
 
   public static class SchemaBuilder {
-    private Schema _schema;
+    private final Schema _schema;
 
     public SchemaBuilder() {
       _schema = new Schema();
@@ -528,8 +541,8 @@ public SchemaBuilder addSingleValueDimension(String dimensionName, DataType data
      */
     public SchemaBuilder addSingleValueDimension(String dimensionName, DataType dataType, int maxLength,
         Object defaultNullValue) {
-      Preconditions
-          .checkArgument(dataType == DataType.STRING, "The maxLength field only applies to STRING field right now");
+      Preconditions.checkArgument(dataType == DataType.STRING,
+          "The maxLength field only applies to STRING field right now");
       _schema.addField(new DimensionFieldSpec(dimensionName, dataType, true, maxLength, defaultNullValue));
       return this;
     }
@@ -555,8 +568,8 @@ public SchemaBuilder addMultiValueDimension(String dimensionName, DataType dataT
      */
     public SchemaBuilder addMultiValueDimension(String dimensionName, DataType dataType, int maxLength,
         Object defaultNullValue) {
-      Preconditions
-          .checkArgument(dataType == DataType.STRING, "The maxLength field only applies to STRING field right now");
+      Preconditions.checkArgument(dataType == DataType.STRING,
+          "The maxLength field only applies to STRING field right now");
       _schema.addField(new DimensionFieldSpec(dimensionName, dataType, false, maxLength, defaultNullValue));
       return this;
     }
@@ -650,22 +663,19 @@ public boolean equals(Object o) {
     if (EqualityUtils.isSameReference(this, o)) {
       return true;
     }
-
     if (EqualityUtils.isNullOrNotSameClass(this, o)) {
       return false;
     }
-
     Schema that = (Schema) o;
-
-    return EqualityUtils.isEqual(_schemaName, that._schemaName) && EqualityUtils
-        .isEqualIgnoreOrder(_dimensionFieldSpecs, that._dimensionFieldSpecs) && EqualityUtils
-        .isEqualIgnoreOrder(_metricFieldSpecs, that._metricFieldSpecs) && EqualityUtils
-        .isEqual(_timeFieldSpec, that._timeFieldSpec) && EqualityUtils
-        .isEqualIgnoreOrder(_dateTimeFieldSpecs, that._dateTimeFieldSpecs) && EqualityUtils
-        .isEqualIgnoreOrder(_complexFieldSpecs, that._complexFieldSpecs) && EqualityUtils
-        .isEqualMap(_fieldSpecMap, that._fieldSpecMap) && EqualityUtils
-        .isEqual(_primaryKeyColumns, that._primaryKeyColumns) && EqualityUtils
-        .isEqual(_hasJSONColumn, that._hasJSONColumn);
+    //@formatter:off
+    return EqualityUtils.isEqual(_schemaName, that._schemaName)
+        && EqualityUtils.isEqualIgnoreOrder(_dimensionFieldSpecs, that._dimensionFieldSpecs)
+        && EqualityUtils.isEqualIgnoreOrder(_metricFieldSpecs, that._metricFieldSpecs)
+        && EqualityUtils.isEqual(_timeFieldSpec, that._timeFieldSpec)
+        && EqualityUtils.isEqualIgnoreOrder(_dateTimeFieldSpecs, that._dateTimeFieldSpecs)
+        && EqualityUtils.isEqualIgnoreOrder(_complexFieldSpecs, that._complexFieldSpecs)
+        && EqualityUtils.isEqual(_primaryKeyColumns, that._primaryKeyColumns);
+    //@formatter:on
   }
 
   /**
@@ -722,9 +732,7 @@ public int hashCode() {
     result = EqualityUtils.hashCodeOf(result, _timeFieldSpec);
     result = EqualityUtils.hashCodeOf(result, _dateTimeFieldSpecs);
     result = EqualityUtils.hashCodeOf(result, _complexFieldSpecs);
-    result = EqualityUtils.hashCodeOf(result, _fieldSpecMap);
     result = EqualityUtils.hashCodeOf(result, _primaryKeyColumns);
-    result = EqualityUtils.hashCodeOf(result, _hasJSONColumn);
     return result;
   }
 
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/SingleValueVisitor.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/SingleValueVisitor.java
new file mode 100644
index 00000000000..6184bbf057a
--- /dev/null
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/SingleValueVisitor.java
@@ -0,0 +1,45 @@
+/**
+ * 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.pinot.spi.data;
+
+import java.math.BigDecimal;
+
+
+public interface SingleValueVisitor<R> {
+
+  R visitInt(int value);
+
+  R visitLong(long value);
+
+  R visitFloat(float value);
+
+  R visitDouble(double value);
+
+  R visitBigDecimal(BigDecimal value);
+
+  R visitBoolean(boolean value);
+
+  R visitTimestamp(long value);
+
+  R visitString(String value);
+
+  R visitJson(String value);
+
+  R visitBytes(byte[] value);
+}
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/readers/RecordReaderFileConfig.java b/pinot-spi/src/main/java/org/apache/pinot/spi/data/readers/RecordReaderFileConfig.java
new file mode 100644
index 00000000000..628de1052a6
--- /dev/null
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/readers/RecordReaderFileConfig.java
@@ -0,0 +1,57 @@
+/**
+ * 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.pinot.spi.data.readers;
+
+import java.io.File;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+/**
+ * Wraps RecordReader info to instantiate a reader. Users can either pass in the
+ * RecordReader instance directly or the info required to initialize the RecordReader, so that the
+ * RecordReader can be initialized just when its about to be used, which avoids early/eager
+ * initialization/memory allocation.
+ */
+public class RecordReaderFileConfig {
+  public final FileFormat _fileFormat;
+  public final File _dataFile;
+  public final Set<String> _fieldsToRead;
+  public final RecordReaderConfig _recordReaderConfig;
+  public final RecordReader _recordReader;
+
+  // Pass in the info needed to initialize the reader
+  public RecordReaderFileConfig(FileFormat fileFormat, File dataFile, Set<String> fieldsToRead,
+      @Nullable RecordReaderConfig recordReaderConfig) {
+    _fileFormat = fileFormat;
+    _dataFile = dataFile;
+    _fieldsToRead = fieldsToRead;
+    _recordReaderConfig = recordReaderConfig;
+    _recordReader = null;
+  }
+
+  // Pass in the reader instance directly
+  public RecordReaderFileConfig(RecordReader recordReader) {
+    _recordReader = recordReader;
+    _fileFormat = null;
+    _dataFile = null;
+    _fieldsToRead = null;
+    _recordReaderConfig = null;
+  }
+}
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java b/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
index 9bf3575fa28..b8984baf944 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
@@ -35,6 +35,7 @@
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
@@ -119,8 +120,57 @@ public static Map<String, Object> toMap(Configuration configuration) {
   }
 
   private static Object mapValue(String key, Configuration configuration) {
-    return Optional.of(configuration.getStringArray(key)).filter(values -> values.length > 1).<Object>map(
-        values -> Arrays.stream(values).collect(Collectors.joining(",")))
-        .orElseGet(() -> configuration.getProperty(key));
+    // For multi-value config, convert it to a single comma connected string value.
+    // For single-value config, return its raw property, unless it needs interpolation.
+    return Optional.of(configuration.getStringArray(key)).filter(values -> values.length > 1)
+        .<Object>map(values -> Arrays.stream(values).collect(Collectors.joining(","))).orElseGet(() -> {
+          Object rawProperty = configuration.getProperty(key);
+          if (!needInterpolate(rawProperty)) {
+            return rawProperty;
+          }
+          // The string value is converted to the requested type when accessing it via PinotConfiguration.
+          return configuration.getString(key);
+        });
+  }
+
+  public static boolean needInterpolate(Object rawProperty) {
+    if (rawProperty instanceof String) {
+      String strProperty = (String) rawProperty;
+      // e.g. if config value is '${sys:FOO}', it's replaced by value of system property FOO; If config value is
+      // '${env:FOO}', it's replaced by value of env var FOO.
+      return StringUtils.isNotEmpty(strProperty) && strProperty.startsWith("${") && strProperty.endsWith("}");
+    }
+    return false;
+  }
+
+  @SuppressWarnings("unchecked")
+  public static <T> T interpolate(Configuration configuration, String key, T defaultValue, Class<T> returnType) {
+    // Different from the generic getProperty() method, those type specific getters do config interpolation.
+    if (Integer.class.equals(returnType)) {
+      return (T) configuration.getInteger(key, (Integer) defaultValue);
+    } else if (Boolean.class.equals(returnType)) {
+      return (T) configuration.getBoolean(key, (Boolean) defaultValue);
+    } else if (Long.class.equals(returnType)) {
+      return (T) configuration.getLong(key, (Long) defaultValue);
+    } else if (Double.class.equals(returnType)) {
+      return (T) configuration.getDouble(key, (Double) defaultValue);
+    } else {
+      throw new IllegalArgumentException(returnType + " is not a supported type for conversion.");
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  public static <T> T convert(Object value, Class<T> returnType) {
+    if (Integer.class.equals(returnType)) {
+      return (T) Integer.valueOf(value.toString());
+    } else if (Boolean.class.equals(returnType)) {
+      return (T) Boolean.valueOf(value.toString());
+    } else if (Long.class.equals(returnType)) {
+      return (T) Long.valueOf(value.toString());
+    } else if (Double.class.equals(returnType)) {
+      return (T) Double.valueOf(value.toString());
+    } else {
+      throw new IllegalArgumentException(returnType + " is not a supported type for conversion.");
+    }
   }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/env/PinotConfiguration.java b/pinot-spi/src/main/java/org/apache/pinot/spi/env/PinotConfiguration.java
index ab843b3cc06..7bd23f503cf 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/env/PinotConfiguration.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/env/PinotConfiguration.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pinot.spi.env;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -32,7 +31,6 @@
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.MapConfiguration;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.spi.ingestion.batch.spec.PinotFSSpec;
 import org.apache.pinot.spi.utils.Obfuscator;
 
@@ -356,15 +354,12 @@ public long getProperty(String name, long defaultValue) {
    * @return the property String value. Fallback to default value if missing.
    */
   public String getProperty(String name, String defaultValue) {
-    Object rawProperty = getRawProperty(name, defaultValue);
-    if (rawProperty instanceof List) {
-      return StringUtils.join(((ArrayList) rawProperty).toArray(), ',');
-    } else {
-      if (rawProperty == null) {
-        return null;
-      }
-      return rawProperty.toString();
+    String relaxedPropertyName = relaxPropertyName(name);
+    if (!_configuration.containsKey(relaxedPropertyName)) {
+      return defaultValue;
     }
+    // Method below calls getStringArray() which can interpolate multi values properly.
+    return getProperty(name, _configuration);
   }
 
   private <T> T getProperty(String name, T defaultValue, Class<T> returnType) {
@@ -372,8 +367,11 @@ private <T> T getProperty(String name, T defaultValue, Class<T> returnType) {
     if (!_configuration.containsKey(relaxedPropertyName)) {
       return defaultValue;
     }
-
-    return PropertyConverter.convert(getRawProperty(name, defaultValue), returnType);
+    Object rawProperty = _configuration.getProperty(relaxedPropertyName);
+    if (CommonsConfigurationUtils.needInterpolate(rawProperty)) {
+      return CommonsConfigurationUtils.interpolate(_configuration, relaxedPropertyName, defaultValue, returnType);
+    }
+    return CommonsConfigurationUtils.convert(rawProperty, returnType);
   }
 
   /**
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/env/PropertyConverter.java b/pinot-spi/src/main/java/org/apache/pinot/spi/env/PropertyConverter.java
deleted file mode 100644
index b2b7ca71a43..00000000000
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/env/PropertyConverter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.spi.env;
-
-public abstract class PropertyConverter {
-  @SuppressWarnings("unchecked")
-  public static <T> T convert(Object value, Class<T> returnType) {
-    if (Integer.class.equals(returnType)) {
-      return (T) Integer.valueOf(value.toString());
-    } else if (Boolean.class.equals(returnType)) {
-      return (T) Boolean.valueOf(value.toString());
-    } else if (Long.class.equals(returnType)) {
-      return (T) Long.valueOf(value.toString());
-    } else if (Double.class.equals(returnType)) {
-      return (T) Double.valueOf(value.toString());
-    } else {
-      throw new IllegalArgumentException(returnType + " is not a supported type for conversion.");
-    }
-  }
-}
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/exception/EarlyTerminationException.java b/pinot-spi/src/main/java/org/apache/pinot/spi/exception/EarlyTerminationException.java
index ff87a0b8e53..27f4d1ba2ce 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/exception/EarlyTerminationException.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/exception/EarlyTerminationException.java
@@ -23,7 +23,16 @@
  * terminated (interrupted).
  */
 public class EarlyTerminationException extends RuntimeException {
+
   public EarlyTerminationException() {
     super();
   }
+
+  public EarlyTerminationException(String message) {
+    super(message);
+  }
+
+  public EarlyTerminationException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/MessageBatch.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/MessageBatch.java
index d22a46af675..8bde04aed44 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/MessageBatch.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/MessageBatch.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.spi.stream;
 
+import javax.annotation.Nullable;
 import org.apache.pinot.spi.annotations.InterfaceAudience;
 import org.apache.pinot.spi.annotations.InterfaceStability;
 
@@ -56,12 +57,12 @@ default byte[] getMessageBytesAtIndex(int index) {
   }
 
   default StreamMessage<T> getStreamMessage(int index) {
-    return new LegacyStreamMessage(getMessageBytesAtIndex(index));
+    return new LegacyStreamMessage(getMessageBytesAtIndex(index), (StreamMessageMetadata) getMetadataAtIndex(index));
   }
 
   class LegacyStreamMessage extends StreamMessage {
-    public LegacyStreamMessage(byte[] value) {
-      super(value, value.length);
+    public LegacyStreamMessage(byte[] value, StreamMessageMetadata metadata) {
+      super(value, value.length, metadata);
     }
   }
   /**
@@ -116,4 +117,17 @@ default StreamPartitionMsgOffset getOffsetOfNextBatch() {
   default boolean isEndOfPartitionGroup() {
     return false;
   }
+
+  /**
+   * This is useful while determining ingestion delay for a message batch. Retaining metadata for last filtered message
+   * in a batch can enable us to estimate the ingestion delay for the batch.
+   * Note that a batch can be fully filtered, and we can still retain the metadata for the last filtered message to
+   * facilitate computing ingestion delay in the face of a fully filtered batch.
+   *
+   * @return null by default.
+   */
+  @Nullable
+  default public StreamMessageMetadata getLastMessageMetadata() {
+    return null;
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java
index 6ffdbe03cc7..69ad7c9ac1a 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java
@@ -63,7 +63,8 @@ public Exception getException() {
   @Override
   public Boolean call()
       throws Exception {
-    String clientId = PartitionGroupMetadataFetcher.class.getSimpleName() + "-" + _topicName;
+    String clientId = PartitionGroupMetadataFetcher.class.getSimpleName() + "-"
+            + _streamConfig.getTableNameWithType() + "-" + _topicName;
     try (
         StreamMetadataProvider streamMetadataProvider = _streamConsumerFactory.createStreamMetadataProvider(clientId)) {
       _newPartitionGroupMetadataList = streamMetadataProvider.computePartitionGroupMetadata(clientId, _streamConfig,
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/RowMetadata.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/RowMetadata.java
index 4c4f17792e3..8a5eac3981d 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/RowMetadata.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/RowMetadata.java
@@ -39,8 +39,8 @@ public interface RowMetadata {
 
   /**
    * Returns the timestamp associated with the record. This typically refers to the time it was ingested into the
-   * upstream source. In some cases, it may be the time at which the record was created, aka event time (eg. in kafka,
-   * a topic may be configured to use record `CreateTime` instead of `LogAppendTime`).
+   * (last) upstream source. In some cases, it may be the time at which the record was created, aka event time
+   * (eg. in kafka, a topic may be configured to use record `CreateTime` instead of `LogAppendTime`).
    *
    * Expected to be used for stream-based sources.
    *
@@ -49,6 +49,20 @@ public interface RowMetadata {
    */
   long getRecordIngestionTimeMs();
 
+  /**
+   * When supported by the underlying stream, this method returns the timestamp in milliseconds associated with
+   * the ingestion of the record in the first stream.
+   *
+   * Complex ingestion pipelines may be composed of multiple streams:
+   * (EventCreation) -> {First Stream} -> ... -> {Last Stream}
+   *
+   * @return timestamp (epoch in milliseconds) when the row was initially ingested upstream for the first
+   *         time Long.MIN_VALUE if not supported by the underlying stream.
+   */
+  default long getFirstStreamRecordIngestionTimeMs() {
+    return Long.MIN_VALUE;
+  }
+
   /**
    * Returns the stream message headers
    *
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamConfigProperties.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamConfigProperties.java
index 1cc9548a327..b16984a3015 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamConfigProperties.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamConfigProperties.java
@@ -124,6 +124,7 @@ public static String constructStreamProperty(String streamType, String property)
   }
 
   public static String getPropertySuffix(String incoming, String propertyPrefix) {
-    return incoming.split(propertyPrefix + ".")[1];
+    String prefix = propertyPrefix + DOT_SEPARATOR;
+    return incoming.substring(prefix.length());
   }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamDataDecoderImpl.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamDataDecoderImpl.java
index 97958b92d30..5093c2c8b9b 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamDataDecoderImpl.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamDataDecoderImpl.java
@@ -50,10 +50,11 @@ public StreamDataDecoderResult decode(StreamMessage message) {
           row.putValue(KEY, new String(message.getKey(), StandardCharsets.UTF_8));
         }
         RowMetadata metadata = message.getMetadata();
-        if (metadata != null && metadata.getHeaders() != null) {
-          metadata.getHeaders().getFieldToValueMap()
-              .forEach((key, value) -> row.putValue(HEADER_KEY_PREFIX + key, value));
-
+        if (metadata != null) {
+          if (metadata.getHeaders() != null) {
+            metadata.getHeaders().getFieldToValueMap()
+                .forEach((key, value) -> row.putValue(HEADER_KEY_PREFIX + key, value));
+          }
           metadata.getRecordMetadata()
                   .forEach((key, value) -> row.putValue(METADATA_KEY_PREFIX + key, value));
         }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessage.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessage.java
index e626dc8106d..17f66b6a5a4 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessage.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessage.java
@@ -52,7 +52,11 @@ public StreamMessage(@Nullable byte[] key, T value, @Nullable StreamMessageMetad
   }
 
   public StreamMessage(T value, int length) {
-    this(null, value, null, length);
+    this(value, length, null);
+  }
+
+  public StreamMessage(T value, int length, @Nullable StreamMessageMetadata metadata) {
+    this(null, value, metadata, length);
   }
 
   public T getValue() {
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessageMetadata.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessageMetadata.java
index 2b0860690a1..557069a5815 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessageMetadata.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/StreamMessageMetadata.java
@@ -30,23 +30,35 @@
  */
 public class StreamMessageMetadata implements RowMetadata {
   private final long _recordIngestionTimeMs;
+  private final long _firstStreamRecordIngestionTimeMs;
   private final GenericRow _headers;
   private final Map<String, String> _metadata;
 
+  public StreamMessageMetadata(long recordIngestionTimeMs) {
+    this(recordIngestionTimeMs, Long.MIN_VALUE, null, Collections.emptyMap());
+  }
+
   public StreamMessageMetadata(long recordIngestionTimeMs, @Nullable GenericRow headers) {
-    this(recordIngestionTimeMs, headers, Collections.emptyMap());
+    this(recordIngestionTimeMs, Long.MIN_VALUE, headers, Collections.emptyMap());
   }
 
+  public StreamMessageMetadata(long recordIngestionTimeMs, @Nullable GenericRow headers,
+      Map<String, String> metadata) {
+    this(recordIngestionTimeMs, Long.MIN_VALUE, headers, metadata);
+  }
   /**
    * Construct the stream based message/row message metadata
    *
-   * @param recordIngestionTimeMs  the time that the message was ingested by the stream provider
+   * @param recordIngestionTimeMs  the time that the message was ingested by the stream provider.
    *                         use Long.MIN_VALUE if not applicable
+   * @param firstStreamRecordIngestionTimeMs the time that the message was ingested by the first stream provider
+   *                         in the ingestion pipeline. use Long.MIN_VALUE if not applicable
    * @param metadata
    */
-  public StreamMessageMetadata(long recordIngestionTimeMs, @Nullable GenericRow headers,
-      Map<String, String> metadata) {
+  public StreamMessageMetadata(long recordIngestionTimeMs, long firstStreamRecordIngestionTimeMs,
+      @Nullable GenericRow headers, Map<String, String> metadata) {
     _recordIngestionTimeMs = recordIngestionTimeMs;
+    _firstStreamRecordIngestionTimeMs = firstStreamRecordIngestionTimeMs;
     _headers = headers;
     _metadata = metadata;
   }
@@ -56,6 +68,11 @@ public long getRecordIngestionTimeMs() {
     return _recordIngestionTimeMs;
   }
 
+  @Override
+  public long getFirstStreamRecordIngestionTimeMs() {
+    return _firstStreamRecordIngestionTimeMs;
+  }
+
   @Override
   public GenericRow getHeaders() {
     return _headers;
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Scope.java b/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Scope.java
index c0e5d66aa9b..5238a511893 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Scope.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Scope.java
@@ -26,4 +26,7 @@ public interface Scope extends AutoCloseable {
 
   @Override
   void close();
+
+  default void close(Object context) {
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Tracing.java b/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Tracing.java
index fe27b8d3ad1..a853b03c206 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Tracing.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/trace/Tracing.java
@@ -26,6 +26,7 @@
 import org.apache.pinot.spi.accounting.ThreadResourceUsageAccountant;
 import org.apache.pinot.spi.accounting.ThreadResourceUsageProvider;
 import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.exception.EarlyTerminationException;
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,8 +58,8 @@ private Tracing() {
 
   private static final class Holder {
     static final Tracer TRACER = TRACER_REGISTRATION.get() == null ? createDefaultTracer() : TRACER_REGISTRATION.get();
-    static final ThreadResourceUsageAccountant ACCOUNTANT = ACCOUNTANT_REGISTRATION.get() == null
-        ? createDefaultThreadAccountant() : ACCOUNTANT_REGISTRATION.get();
+    static final ThreadResourceUsageAccountant ACCOUNTANT =
+        ACCOUNTANT_REGISTRATION.get() == null ? createDefaultThreadAccountant() : ACCOUNTANT_REGISTRATION.get();
   }
 
   /**
@@ -81,6 +82,13 @@ public static boolean register(ThreadResourceUsageAccountant threadResourceUsage
     return ACCOUNTANT_REGISTRATION.compareAndSet(null, threadResourceUsageAccountant);
   }
 
+  /**
+   * visible for testing only
+   */
+  public static boolean isAccountantRegistered() {
+    return ACCOUNTANT_REGISTRATION.get() != null;
+  }
+
   /**
    * @return the registered tracer.
    */
@@ -108,8 +116,7 @@ private static Tracer createDefaultTracer() {
     String defaultImplementationClassName = "org.apache.pinot.core.util.trace.BuiltInTracer";
     try {
       Class<?> clazz = Class.forName(defaultImplementationClassName, false, Tracing.class.getClassLoader());
-      return (Tracer) MethodHandles.publicLookup()
-          .findConstructor(clazz, MethodType.methodType(void.class)).invoke();
+      return (Tracer) MethodHandles.publicLookup().findConstructor(clazz, MethodType.methodType(void.class)).invoke();
     } catch (Throwable missing) {
       return FallbackTracer.INSTANCE;
     }
@@ -184,8 +191,11 @@ public void sampleUsage() {
     }
 
     @Override
-    public final void createExecutionContext(String queryId, int taskId,
-        ThreadExecutionContext parentContext) {
+    public void updateQueryUsageConcurrently(String queryId) {
+    }
+
+    @Override
+    public final void createExecutionContext(String queryId, int taskId, ThreadExecutionContext parentContext) {
       _anchorThread.set(parentContext == null ? Thread.currentThread() : parentContext.getAnchorThread());
       createExecutionContextInner(queryId, taskId, parentContext);
     }
@@ -223,13 +233,14 @@ public Exception getErrorStatus() {
    */
   public static class ThreadAccountantOps {
 
+    public static final int MAX_ENTRIES_KEYS_MERGED_PER_INTERRUPTION_CHECK_MASK = 0b1_1111_1111_1111;
+
     private ThreadAccountantOps() {
     }
 
     public static void setupRunner(String queryId) {
       Tracing.getThreadAccountant().setThreadResourceUsageProvider(new ThreadResourceUsageProvider());
-      Tracing.getThreadAccountant().createExecutionContext(queryId, CommonConstants.Accounting.ANCHOR_TASK_ID,
-          null);
+      Tracing.getThreadAccountant().createExecutionContext(queryId, CommonConstants.Accounting.ANCHOR_TASK_ID, null);
     }
 
     public static void setupWorker(int taskId, ThreadResourceUsageProvider threadResourceUsageProvider,
@@ -246,20 +257,24 @@ public static void clear() {
       Tracing.getThreadAccountant().clear();
     }
 
-    public static void initializeThreadAccountant(int numPqr, int numPqw, PinotConfiguration config) {
+    public static void initializeThreadAccountant(PinotConfiguration config, String instanceId) {
       String factoryName = config.getProperty(CommonConstants.Accounting.CONFIG_OF_FACTORY_NAME);
-      LOGGER.info("Config-specified accountant factory name {}", factoryName);
-      try {
-        ThreadAccountantFactory threadAccountantFactory =
-            (ThreadAccountantFactory) Class.forName(factoryName).getDeclaredConstructor().newInstance();
-        boolean registered = Tracing.register(threadAccountantFactory.init(numPqr, numPqw, config));
-        LOGGER.info("Using accountant provided by {}", factoryName);
-        if (!registered) {
-          LOGGER.warn("ThreadAccountant {} register unsuccessful, as it is already registered.", factoryName);
+      if (factoryName == null) {
+        LOGGER.warn("No thread accountant factory provided, using default implementation");
+      } else {
+        LOGGER.info("Config-specified accountant factory name {}", factoryName);
+        try {
+          ThreadAccountantFactory threadAccountantFactory =
+              (ThreadAccountantFactory) Class.forName(factoryName).getDeclaredConstructor().newInstance();
+          boolean registered = Tracing.register(threadAccountantFactory.init(config, instanceId));
+          LOGGER.info("Using accountant provided by {}", factoryName);
+          if (!registered) {
+            LOGGER.warn("ThreadAccountant {} register unsuccessful, as it is already registered.", factoryName);
+          }
+        } catch (Exception exception) {
+          LOGGER.warn("Using default implementation of thread accountant, "
+              + "due to invalid thread accountant factory {} provided, exception:", factoryName, exception);
         }
-      } catch (Exception exception) {
-        LOGGER.warn("Using default implementation of thread accountant, "
-            + "due to invalid thread accountant factory {} provided.", factoryName);
       }
       Tracing.getThreadAccountant().startWatcherTask();
     }
@@ -267,5 +282,27 @@ public static void initializeThreadAccountant(int numPqr, int numPqw, PinotConfi
     public static boolean isInterrupted() {
       return Thread.interrupted() || Tracing.getThreadAccountant().isAnchorThreadInterrupted();
     }
+
+    public static void sampleAndCheckInterruption() {
+      if (isInterrupted()) {
+        throw new EarlyTerminationException("Interrupted while merging records");
+      }
+      sample();
+    }
+
+    public static void updateQueryUsageConcurrently(String queryId) {
+      Tracing.getThreadAccountant().updateQueryUsageConcurrently(queryId);
+    }
+
+    public static void setThreadResourceUsageProvider() {
+      Tracing.getThreadAccountant().setThreadResourceUsageProvider(new ThreadResourceUsageProvider());
+    }
+
+    // Check for thread interruption, every time after merging 8192 keys
+    public static void sampleAndCheckInterruptionPeriodically(int mergedKeys) {
+      if ((mergedKeys & MAX_ENTRIES_KEYS_MERGED_PER_INTERRUPTION_CHECK_MASK) == 0) {
+        sampleAndCheckInterruption();
+      }
+    }
   }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
index 0abc692fbbd..180744a8313 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
@@ -18,7 +18,10 @@
  */
 package org.apache.pinot.spi.utils;
 
+import com.google.common.collect.ImmutableList;
 import java.io.File;
+import java.util.List;
+import org.apache.pinot.spi.config.instance.InstanceType;
 
 
 public class CommonConstants {
@@ -43,6 +46,8 @@ private CommonConstants() {
       "org.apache.pinot.plugin.metrics.yammer.YammerMetricsFactory";
 
   public static final String SWAGGER_AUTHORIZATION_KEY = "oauth";
+  public static final String CONFIG_OF_SWAGGER_RESOURCES_PATH = "META-INF/resources/webjars/swagger-ui/5.1.0/";
+
   /**
    * The state of the consumer for a given segment
    */
@@ -80,14 +85,20 @@ public static class Helix {
     public static final String LEAD_CONTROLLER_RESOURCE_ENABLED_KEY = "RESOURCE_ENABLED";
 
     public static final String ENABLE_CASE_INSENSITIVE_KEY = "enable.case.insensitive";
+    public static final boolean DEFAULT_ENABLE_CASE_INSENSITIVE = true;
     public static final String ALLOW_TABLE_NAME_WITH_DATABASE = "allow.table.name.with.database";
     public static final boolean DEFAULT_ALLOW_TABLE_NAME_WITH_DATABASE = false;
-    @Deprecated
-    public static final String DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY = "enable.case.insensitive.pql";
 
     public static final String DEFAULT_HYPERLOGLOG_LOG2M_KEY = "default.hyperloglog.log2m";
     public static final int DEFAULT_HYPERLOGLOG_LOG2M = 8;
 
+    // 2 to the power of 16, for tradeoffs see datasketches library documentation:
+    // https://datasketches.apache.org/docs/Theta/ThetaErrorTable.html
+    public static final int DEFAULT_THETA_SKETCH_NOMINAL_ENTRIES = 65536;
+
+
+    public static final int DEFAULT_TUPLE_SKETCH_LGK = 16;
+
     // Whether to rewrite DistinctCount to DistinctCountBitmap
     public static final String ENABLE_DISTINCT_COUNT_BITMAP_OVERRIDE_KEY = "enable.distinct.count.bitmap.override";
 
@@ -186,7 +197,7 @@ public static class Instance {
     public static final String CONFIG_OF_PINOT_MINION_STARTABLE_CLASS = "pinot.minion.startable.class";
 
     public static final String CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED = "pinot.multistage.engine.enabled";
-    public static final boolean DEFAULT_MULTI_STAGE_ENGINE_ENABLED = false;
+    public static final boolean DEFAULT_MULTI_STAGE_ENGINE_ENABLED = true;
   }
 
   public static class Broker {
@@ -217,8 +228,12 @@ public static class Broker {
     public static final String CONFIG_OF_BROKER_ID = "pinot.broker.instance.id";
     public static final String CONFIG_OF_BROKER_HOSTNAME = "pinot.broker.hostname";
     public static final String CONFIG_OF_SWAGGER_USE_HTTPS = "pinot.broker.swagger.use.https";
+    // Comma separated list of packages that contains javax service resources.
+    public static final String BROKER_RESOURCE_PACKAGES = "broker.restlet.api.resource.packages";
+    public static final String DEFAULT_BROKER_RESOURCE_PACKAGES = "org.apache.pinot.broker.api.resources";
+
     // Configuration to consider the broker ServiceStatus as being STARTED if the percent of resources (tables) that
-    // are ONLINE for this this broker has crossed the threshold percentage of the total number of tables
+    // are ONLINE for this broker has crossed the threshold percentage of the total number of tables
     // that it is expected to serve.
     public static final String CONFIG_OF_BROKER_MIN_RESOURCE_PERCENT_FOR_START =
         "pinot.broker.startup.minResourcePercent";
@@ -231,6 +246,25 @@ public static class Broker {
         Math.max(1, Math.min(10, Runtime.getRuntime().availableProcessors() / 2));
     // Same logic as CombineOperatorUtils
 
+    // Config for Jersey ThreadPoolExecutorProvider.
+    // By default, Jersey uses the default unbounded thread pool to process queries.
+    // By enabling it, BrokerManagedAsyncExecutorProvider will be used to create a bounded thread pool.
+    public static final String CONFIG_OF_ENABLE_BOUNDED_JERSEY_THREADPOOL_EXECUTOR =
+            "pinot.broker.enable.bounded.jersey.threadpool.executor";
+    public static final boolean DEFAULT_ENABLE_BOUNDED_JERSEY_THREADPOOL_EXECUTOR = false;
+    // Default capacities for the bounded thread pool
+    public static final String CONFIG_OF_JERSEY_THREADPOOL_EXECUTOR_MAX_POOL_SIZE =
+            "pinot.broker.jersey.threadpool.executor.max.pool.size";
+    public static final int DEFAULT_JERSEY_THREADPOOL_EXECUTOR_MAX_POOL_SIZE =
+            Runtime.getRuntime().availableProcessors() * 2;
+    public static final String CONFIG_OF_JERSEY_THREADPOOL_EXECUTOR_CORE_POOL_SIZE =
+            "pinot.broker.jersey.threadpool.executor.core.pool.size";
+    public static final int DEFAULT_JERSEY_THREADPOOL_EXECUTOR_CORE_POOL_SIZE =
+            Runtime.getRuntime().availableProcessors() * 2;
+    public static final String CONFIG_OF_JERSEY_THREADPOOL_EXECUTOR_QUEUE_SIZE =
+            "pinot.broker.jersey.threadpool.executor.queue.size";
+    public static final int DEFAULT_JERSEY_THREADPOOL_EXECUTOR_QUEUE_SIZE = Integer.MAX_VALUE;
+
     // used for SQL GROUP BY during broker reduce
     public static final String CONFIG_OF_BROKER_GROUPBY_TRIM_THRESHOLD = "pinot.broker.groupby.trim.threshold";
     public static final int DEFAULT_BROKER_GROUPBY_TRIM_THRESHOLD = 1_000_000;
@@ -251,7 +285,6 @@ public static class Broker {
 
     public static final String DISABLE_GROOVY = "pinot.broker.disable.query.groovy";
     public static final boolean DEFAULT_DISABLE_GROOVY = true;
-
     // Rewrite potential expensive functions to their approximation counterparts
     // - DISTINCT_COUNT -> DISTINCT_COUNT_SMART_HLL
     // - PERCENTILE -> PERCENTILE_SMART_TDIGEST
@@ -259,8 +292,7 @@ public static class Broker {
 
     public static final String CONTROLLER_URL = "pinot.broker.controller.url";
 
-    public static final String CONFIG_OF_BROKER_REQUEST_CLIENT_IP_LOGGING =
-        "pinot.broker.request.client.ip.logging";
+    public static final String CONFIG_OF_BROKER_REQUEST_CLIENT_IP_LOGGING = "pinot.broker.request.client.ip.logging";
 
     // TODO: Support populating clientIp for GrpcRequestIdentity.
     public static final boolean DEFAULT_BROKER_REQUEST_CLIENT_IP_LOGGING = false;
@@ -268,6 +300,18 @@ public static class Broker {
     public static final String CONFIG_OF_LOGGER_ROOT_DIR = "pinot.broker.logger.root.dir";
     public static final String CONFIG_OF_SWAGGER_BROKER_ENABLED = "pinot.broker.swagger.enabled";
     public static final boolean DEFAULT_SWAGGER_BROKER_ENABLED = true;
+    public static final String CONFIG_OF_ENABLE_THREAD_CPU_TIME_MEASUREMENT =
+        "pinot.broker.instance.enableThreadCpuTimeMeasurement";
+    public static final String CONFIG_OF_ENABLE_THREAD_ALLOCATED_BYTES_MEASUREMENT =
+        "pinot.broker.instance.enableThreadAllocatedBytesMeasurement";
+    public static final boolean DEFAULT_ENABLE_THREAD_CPU_TIME_MEASUREMENT = false;
+    public static final boolean DEFAULT_THREAD_ALLOCATED_BYTES_MEASUREMENT = false;
+    public static final String CONFIG_OF_BROKER_RESULT_REWRITER_CLASS_NAMES
+        = "pinot.broker.result.rewriter.class.names";
+
+    public static final String CONFIG_OF_ENABLE_PARTITION_METADATA_MANAGER =
+        "pinot.broker.enable.partition.metadata.manager";
+    public static final boolean DEFAULT_ENABLE_PARTITION_METADATA_MANAGER = false;
 
     public static class Request {
       public static final String SQL = "sql";
@@ -299,6 +343,12 @@ public static class QueryOptionKey {
         public static final String NUM_GROUPS_LIMIT = "numGroupsLimit";
         public static final String MAX_INITIAL_RESULT_HOLDER_CAPACITY = "maxInitialResultHolderCapacity";
         public static final String GROUP_TRIM_THRESHOLD = "groupTrimThreshold";
+        public static final String STAGE_PARALLELISM = "stageParallelism";
+
+        // Handle IN predicate evaluation for big IN lists
+        public static final String IN_PREDICATE_SORT_THRESHOLD = "inPredicateSortThreshold";
+
+        public static final String DROP_RESULTS = "dropResults";
 
         // TODO: Remove these keys (only apply to PQL) after releasing 0.11.0
         @Deprecated
@@ -311,6 +361,7 @@ public static class QueryOptionKey {
 
       public static class QueryOptionValue {
         public static final String ROUTING_FORCE_HLC = "FORCE_HLC";
+        public static final String DEFAULT_IN_PREDICATE_SORT_THRESHOLD = "1000";
       }
     }
 
@@ -428,6 +479,10 @@ public enum Type {
   }
 
   public static class Server {
+    public static final String INSTANCE_DATA_MANAGER_CONFIG_PREFIX = "pinot.server.instance";
+    public static final String QUERY_EXECUTOR_CONFIG_PREFIX = "pinot.server.query.executor";
+    public static final String METRICS_CONFIG_PREFIX = "pinot.server.metrics";
+
     public static final String CONFIG_OF_INSTANCE_ID = "pinot.server.instance.id";
     public static final String CONFIG_OF_INSTANCE_DATA_DIR = "pinot.server.instance.dataDir";
     public static final String CONFIG_OF_CONSUMER_DIR = "pinot.server.instance.consumerDir";
@@ -436,15 +491,16 @@ public static class Server {
     public static final String CONFIG_OF_INSTANCE_RELOAD_CONSUMING_SEGMENT =
         "pinot.server.instance.reload.consumingSegment";
     public static final String CONFIG_OF_INSTANCE_DATA_MANAGER_CLASS = "pinot.server.instance.data.manager.class";
+    public static final String CONFIG_OF_QUERY_EXECUTOR_CLASS = "pinot.server.query.executor.class";
     public static final String CONFIG_OF_QUERY_EXECUTOR_PRUNER_CLASS = "pinot.server.query.executor.pruner.class";
+    public static final String CONFIG_OF_QUERY_EXECUTOR_PLAN_MAKER_CLASS =
+        "pinot.server.query.executor.plan.maker.class";
     public static final String CONFIG_OF_QUERY_EXECUTOR_TIMEOUT = "pinot.server.query.executor.timeout";
-    public static final String CONFIG_OF_QUERY_EXECUTOR_CLASS = "pinot.server.query.executor.class";
+    public static final String CONFIG_OF_TRANSFORM_FUNCTIONS = "pinot.server.transforms";
     public static final String CONFIG_OF_SERVER_QUERY_REWRITER_CLASS_NAMES = "pinot.server.query.rewriter.class.names";
     public static final String CONFIG_OF_ENABLE_QUERY_CANCELLATION = "pinot.server.enable.query.cancellation";
-    public static final String CONFIG_OF_REQUEST_HANDLER_FACTORY_CLASS = "pinot.server.requestHandlerFactory.class";
     public static final String CONFIG_OF_NETTY_SERVER_ENABLED = "pinot.server.netty.enabled";
     public static final boolean DEFAULT_NETTY_SERVER_ENABLED = true;
-    public static final String CONFIG_OF_NETTY_PORT = "pinot.server.netty.port";
     public static final String CONFIG_OF_ENABLE_GRPC_SERVER = "pinot.server.grpc.enable";
     public static final boolean DEFAULT_ENABLE_GRPC_SERVER = true;
     public static final String CONFIG_OF_GRPC_PORT = "pinot.server.grpc.port";
@@ -512,9 +568,13 @@ public static class Server {
         "org.apache.pinot.server.starter.helix.HelixInstanceDataManager";
     public static final String DEFAULT_QUERY_EXECUTOR_CLASS =
         "org.apache.pinot.core.query.executor.ServerQueryExecutorV1Impl";
+    // The order of the pruners matters. Pruning with segment metadata ahead of those using segment data like bloom
+    // filters to reduce the required data access.
+    public static final List<String> DEFAULT_QUERY_EXECUTOR_PRUNER_CLASS =
+        ImmutableList.of("ColumnValueSegmentPruner", "BloomFilterSegmentPruner", "SelectionQuerySegmentPruner");
+    public static final String DEFAULT_QUERY_EXECUTOR_PLAN_MAKER_CLASS =
+        "org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2";
     public static final long DEFAULT_QUERY_EXECUTOR_TIMEOUT_MS = 15_000L;
-    public static final String DEFAULT_REQUEST_HANDLER_FACTORY_CLASS =
-        "org.apache.pinot.server.request.SimpleRequestHandlerFactory";
     public static final String PREFIX_OF_CONFIG_OF_SEGMENT_FETCHER_FACTORY = "pinot.server.segment.fetcher";
 
     // Configs for server starter startup/shutdown checks
@@ -707,9 +767,11 @@ public static class ControllerJob {
     public static final String CONSUMING_SEGMENTS_FORCE_COMMITTED_LIST = "segmentsForceCommitted";
   }
 
+  // prefix for scheduler related features, e.g. query accountant
+  public static final String PINOT_QUERY_SCHEDULER_PREFIX = "pinot.query.scheduler";
+
   public static class Accounting {
     public static final int ANCHOR_TASK_ID = -1;
-    public static final int IGNORED_TASK_ID = -2;
     public static final String CONFIG_OF_FACTORY_NAME = "accounting.factory.name";
 
     public static final String CONFIG_OF_ENABLE_THREAD_CPU_SAMPLING = "accounting.enable.thread.cpu.sampling";
@@ -724,30 +786,50 @@ public static class Accounting {
     public static final String CONFIG_OF_PUBLISHING_JVM_USAGE = "accounting.publishing.jvm.heap.usage";
     public static final boolean DEFAULT_PUBLISHING_JVM_USAGE = false;
 
+    public static final String CONFIG_OF_CPU_TIME_BASED_KILLING_ENABLED = "accounting.cpu.time.based.killing.enabled";
+    public static final boolean DEFAULT_CPU_TIME_BASED_KILLING_ENABLED = false;
+
+    public static final String CONFIG_OF_CPU_TIME_BASED_KILLING_THRESHOLD_MS =
+        "accounting.cpu.time.based.killing.threshold.ms";
+    public static final int DEFAULT_CPU_TIME_BASED_KILLING_THRESHOLD_MS = 30_000;
+
     public static final String CONFIG_OF_PANIC_LEVEL_HEAP_USAGE_RATIO = "accounting.oom.panic.heap.usage.ratio";
     public static final float DFAULT_PANIC_LEVEL_HEAP_USAGE_RATIO = 0.99f;
 
     public static final String CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO = "accounting.oom.critical.heap.usage.ratio";
     public static final float DEFAULT_CRITICAL_LEVEL_HEAP_USAGE_RATIO = 0.96f;
 
+    public static final String CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO_DELTA_AFTER_GC =
+        "accounting.oom.critical.heap.usage.ratio.delta.after.gc";
+    public static final float DEFAULT_CONFIG_OF_CRITICAL_LEVEL_HEAP_USAGE_RATIO_DELTA_AFTER_GC = 0.15f;
+
     public static final String CONFIG_OF_ALARMING_LEVEL_HEAP_USAGE_RATIO = "accounting.oom.alarming.usage.ratio";
     public static final float DEFAULT_ALARMING_LEVEL_HEAP_USAGE_RATIO = 0.75f;
 
-    public static final String CONFIG_OF_HEAP_USAGE_PUBLISH_PERIOD = "accounting.heap.usage.publish.period";
+    public static final String CONFIG_OF_HEAP_USAGE_PUBLISHING_PERIOD_MS = "accounting.heap.usage.publishing.period.ms";
     public static final int DEFAULT_HEAP_USAGE_PUBLISH_PERIOD = 5000;
 
-    public static final String CONFIG_OF_SLEEP_TIME = "accounting.sleep.ms";
-    public static final int DEFAULT_SLEEP_TIME = 30;
+    public static final String CONFIG_OF_SLEEP_TIME_MS = "accounting.sleep.ms";
+    public static final int DEFAULT_SLEEP_TIME_MS = 30;
 
     public static final String CONFIG_OF_SLEEP_TIME_DENOMINATOR = "accounting.sleep.time.denominator";
     public static final int DEFAULT_SLEEP_TIME_DENOMINATOR = 3;
 
-    public static final String CONFIG_OF_MIN_MEMORY_FOOTPRINT_TO_KILL_RATIO
-        = "accounting.min.memory.footprint.to.kill.ratio";
+    public static final String CONFIG_OF_MIN_MEMORY_FOOTPRINT_TO_KILL_RATIO =
+        "accounting.min.memory.footprint.to.kill.ratio";
     public static final double DEFAULT_MEMORY_FOOTPRINT_TO_KILL_RATIO = 0.025;
 
     public static final String CONFIG_OF_GC_BACKOFF_COUNT = "accounting.gc.backoff.count";
     public static final int DEFAULT_GC_BACKOFF_COUNT = 5;
+
+    public static final String CONFIG_OF_INSTANCE_TYPE = "accounting.instance.type";
+    public static final InstanceType DEFAULT_CONFIG_OF_INSTANCE_TYPE = InstanceType.SERVER;
+
+    public static final String CONFIG_OF_GC_WAIT_TIME_MS = "accounting.gc.wait.time.ms";
+    public static final int DEFAULT_CONFIG_OF_GC_WAIT_TIME_MS = 0;
+
+    public static final String CONFIG_OF_QUERY_KILLED_METRIC_ENABLED = "accounting.query.killed.metric.enabled";
+    public static final boolean DEFAULT_QUERY_KILLED_METRIC_ENABLED = false;
   }
 
   public static class ExecutorService {
@@ -902,4 +984,11 @@ public static class Range {
   public static class IdealState {
     public static final String HYBRID_TABLE_TIME_BOUNDARY = "HYBRID_TABLE_TIME_BOUNDARY";
   }
+
+  public static class RewriterConstants {
+    public static final String PARENT_AGGREGATION_NAME_PREFIX = "parent";
+    public static final String CHILD_AGGREGATION_NAME_PREFIX = "child";
+    public static final String CHILD_AGGREGATION_SEPERATOR = "@";
+    public static final String CHILD_KEY_SEPERATOR = "_";
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java
index 3bf8a7f9894..a6dbd0883e4 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java
@@ -351,7 +351,16 @@ private static Object extractSingleValue(JsonNode jsonValue, DataType dataType)
    * </pre>
    */
   public static List<Map<String, String>> flatten(JsonNode node, JsonIndexConfig jsonIndexConfig) {
-    return flatten(node, jsonIndexConfig, 0, "$", false);
+    try {
+      return flatten(node, jsonIndexConfig, 0, "$", false);
+    } catch (OutOfMemoryError oom) {
+      throw new OutOfMemoryError(
+          String.format("Flattening JSON node: %s with config: %s requires too much memory, please adjust the config",
+              node, jsonIndexConfig));
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          String.format("Caught exception while flattening JSON node: %s with config: %s", node, jsonIndexConfig), e);
+    }
   }
 
   private static List<Map<String, String>> flatten(JsonNode node, JsonIndexConfig jsonIndexConfig, int level,
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/RebalanceConfigConstants.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/RebalanceConfigConstants.java
index cf4290b7d52..37cd4f3f254 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/RebalanceConfigConstants.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/RebalanceConfigConstants.java
@@ -25,6 +25,12 @@ public class RebalanceConfigConstants {
   private RebalanceConfigConstants() {
   }
 
+  // Unique Id for rebalance
+  public static final String JOB_ID = "jobId";
+
+  // Progress of the Rebalance operartion
+  public static final String REBALANCE_PROGRESS_STATS = "REBALANCE_PROGRESS_STATS";
+
   // Whether to rebalance table in dry-run mode
   public static final String DRY_RUN = "dryRun";
   public static final boolean DEFAULT_DRY_RUN = false;
@@ -65,4 +71,6 @@ private RebalanceConfigConstants() {
   public static final long DEFAULT_EXTERNAL_VIEW_CHECK_INTERVAL_IN_MS = 1_000L; // 1 second
   public static final String EXTERNAL_VIEW_STABILIZATION_TIMEOUT_IN_MS = "externalViewStabilizationTimeoutInMs";
   public static final long DEFAULT_EXTERNAL_VIEW_STABILIZATION_TIMEOUT_IN_MS = 60 * 60_000L; // 1 hour
+  public static final String UPDATE_TARGET_TIER = "updateTargetTier";
+  public static final boolean DEFAULT_UPDATE_TARGET_TIER = false;
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
index a687a3eafdf..fe04bc3e193 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
@@ -163,6 +163,11 @@ public String forBrokerTablesGet(String state) {
     return StringUtil.join("/", _baseUrl, "brokers", "tables", "?state=" + state);
   }
 
+  public String forTenantInstancesToggle(String tenant, String tenantType, String state) {
+    return StringUtil.join("/", _baseUrl, "tenants", tenant)
+        + "?type=" + tenantType + "&state=" + state;
+  }
+
   public String forLiveBrokerTablesGet() {
     return StringUtil.join("/", _baseUrl, "tables", "livebrokers");
   }
@@ -379,29 +384,58 @@ public String forDeleteTableWithType(String tableName, String tableType) {
   }
 
   public String forSegmentListAPI(String tableName) {
-    return forSegmentListAPI(tableName, null, false);
+    return forSegmentListAPI(tableName, null, false, Long.MIN_VALUE, Long.MAX_VALUE, false);
   }
 
   public String forSegmentListAPI(String tableName, String tableType) {
-    return forSegmentListAPI(tableName, tableType, false);
+    return forSegmentListAPI(tableName, tableType, false, Long.MIN_VALUE, Long.MAX_VALUE, false);
+  }
+
+  public String forSegmentListAPI(String tableName, String tableType, boolean excludeReplacedSegments) {
+    return forSegmentListAPI(tableName, tableType, excludeReplacedSegments, Long.MIN_VALUE, Long.MAX_VALUE, false);
   }
 
-  public String forSegmentListAPI(String tableName, @Nullable String tableType, boolean excludeReplacedSegments) {
-    String url = StringUtil.join("/", _baseUrl, "segments", tableName);
+  public String forSegmentListAPI(String tableName, @Nullable String tableType, boolean excludeReplacedSegments,
+      long startTimestamp, long endTimestamp, boolean excludeOverlapping) {
+    StringBuilder url = new StringBuilder();
+    url.append(StringUtil.join("/", _baseUrl, "segments", tableName));
+
+    StringBuilder parameter = new StringBuilder();
     if (tableType != null) {
-      url += "?type=" + tableType;
-      if (excludeReplacedSegments) {
-        url += "&excludeReplacedSegments=" + excludeReplacedSegments;
-      }
+      appendUrlParameter(parameter, "type", tableType);
+    }
+    if (excludeReplacedSegments) {
+      appendUrlParameter(parameter, "excludeReplacedSegments", "true");
+    }
+    if (startTimestamp != Long.MIN_VALUE) {
+      appendUrlParameter(parameter, "startTimestamp", Long.toString(startTimestamp));
+    }
+    if (endTimestamp != Long.MAX_VALUE) {
+      appendUrlParameter(parameter, "endTimestamp", Long.toString(endTimestamp));
+    }
+    if (excludeOverlapping) {
+      appendUrlParameter(parameter, "excludeOverlapping", "true");
+    }
+    return url.append(parameter).toString();
+  }
+
+  public String forSegmentDeleteWithTimeWindowAPI(String tableName, long startTimeInMilliSeconds,
+      long endTimeInMilliSeconds) {
+    StringBuilder url = new StringBuilder();
+    url.append(StringUtil.join("/", _baseUrl, "segments", tableName,
+        String.format("choose?startTimestamp=%d&endTimestamp=%d", startTimeInMilliSeconds, endTimeInMilliSeconds)));
+    return url.toString();
+  }
+
+  private void appendUrlParameter(StringBuilder url, String urlParameterKey, String urlParameterValue) {
+    if (url.length() == 0) {
+      url.append("?").append(urlParameterKey).append("=").append(urlParameterValue);
     } else {
-      if (excludeReplacedSegments) {
-        url += "?excludeReplacedSegments=" + excludeReplacedSegments;
-      }
+      url.append("&").append(urlParameterKey).append("=").append(urlParameterValue);
     }
-    return url;
   }
 
-  public String forInstancePartitions(String tableName, @Nullable InstancePartitionsType instancePartitionsType) {
+  public String forInstancePartitions(String tableName, @Nullable String instancePartitionsType) {
     String url = StringUtil.join("/", _baseUrl, "tables", tableName, "instancePartitions");
     if (instancePartitionsType != null) {
       url += "?type=" + instancePartitionsType;
@@ -508,6 +542,10 @@ public String forPauseStatus(String tableName) {
     return StringUtil.join("/", _baseUrl, "tables", tableName, "pauseStatus");
   }
 
+  public String forUpdateTagsValidation() {
+    return String.format("%s/instances/updateTags/validate", _baseUrl);
+  }
+
   private static String encode(String s) {
     try {
       return URLEncoder.encode(s, "UTF-8");
@@ -516,4 +554,8 @@ private static String encode(String s) {
       throw new RuntimeException(e);
     }
   }
+
+  public String forSegmentUpload() {
+    return StringUtil.join("/", _baseUrl, "v2/segments");
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java
index 4bc86d2004d..b4dc9403152 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableConfigBuilder.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.spi.utils.builder;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Preconditions;
 import java.util.Collections;
 import java.util.List;
@@ -103,13 +104,17 @@ public class TableConfigBuilder {
   private List<StarTreeIndexConfig> _starTreeIndexConfigs;
   private List<String> _jsonIndexColumns;
   private boolean _aggregateMetrics;
+  private boolean _optimizeDictionaryForMetrics;
+  // This threshold determines if dictionary should be enabled or not for a metric column and is relevant
+  // only when _optimizeDictionaryForMetrics is set to true.
+  private double _noDictionarySizeRatioThreshold;
 
   private TableCustomConfig _customConfig;
   private QuotaConfig _quotaConfig;
   private TableTaskConfig _taskConfig;
   private RoutingConfig _routingConfig;
   private QueryConfig _queryConfig;
-  private Map<InstancePartitionsType, InstanceAssignmentConfig> _instanceAssignmentConfigMap;
+  private Map<String, InstanceAssignmentConfig> _instanceAssignmentConfigMap;
   private Map<InstancePartitionsType, String> _instancePartitionsMap;
   private Map<String, SegmentAssignmentConfig> _segmentAssignmentConfigMap;
   private List<FieldConfig> _fieldConfigList;
@@ -120,6 +125,7 @@ public class TableConfigBuilder {
   private IngestionConfig _ingestionConfig;
   private List<TierConfig> _tierConfigList;
   private List<TunerConfig> _tunerConfigList;
+  private JsonNode _tierOverwrites;
 
   public TableConfigBuilder(TableType tableType) {
     _tableType = tableType;
@@ -172,6 +178,11 @@ public TableConfigBuilder setRetentionTimeValue(String retentionTimeValue) {
     return this;
   }
 
+  public TableConfigBuilder setDeletedSegmentsRetentionPeriod(String deletedSegmentsRetentionPeriod) {
+    _deletedSegmentsRetentionPeriod = deletedSegmentsRetentionPeriod;
+    return this;
+  }
+
   /**
    * @deprecated Use {@code segmentIngestionType} from {@link IngestionConfig#getBatchIngestionConfig()}
    */
@@ -251,6 +262,16 @@ public TableConfigBuilder setInvertedIndexColumns(List<String> invertedIndexColu
     return this;
   }
 
+  public TableConfigBuilder setOptimizeDictionaryForMetrics(boolean optimizeDictionaryForMetrics) {
+    _optimizeDictionaryForMetrics = optimizeDictionaryForMetrics;
+    return this;
+  }
+
+  public TableConfigBuilder setNoDictionarySizeRatioThreshold(double noDictionarySizeRatioThreshold) {
+    _noDictionarySizeRatioThreshold = noDictionarySizeRatioThreshold;
+    return this;
+  }
+
   public TableConfigBuilder setCreateInvertedIndexDuringSegmentGeneration(
       boolean createInvertedIndexDuringSegmentGeneration) {
     _createInvertedIndexDuringSegmentGeneration = createInvertedIndexDuringSegmentGeneration;
@@ -339,7 +360,7 @@ public TableConfigBuilder setQueryConfig(QueryConfig queryConfig) {
   }
 
   public TableConfigBuilder setInstanceAssignmentConfigMap(
-      Map<InstancePartitionsType, InstanceAssignmentConfig> instanceAssignmentConfigMap) {
+      Map<String, InstanceAssignmentConfig> instanceAssignmentConfigMap) {
     _instanceAssignmentConfigMap = instanceAssignmentConfigMap;
     return this;
   }
@@ -395,6 +416,11 @@ public TableConfigBuilder setSegmentAssignmentConfigMap(
     return this;
   }
 
+  public TableConfigBuilder setTierOverwrites(JsonNode tierOverwrites) {
+    _tierOverwrites = tierOverwrites;
+    return this;
+  }
+
   public TableConfig build() {
     // Validation config
     SegmentsValidationAndRetentionConfig validationConfig = new SegmentsValidationAndRetentionConfig();
@@ -439,6 +465,9 @@ public TableConfig build() {
     indexingConfig.setStarTreeIndexConfigs(_starTreeIndexConfigs);
     indexingConfig.setJsonIndexColumns(_jsonIndexColumns);
     indexingConfig.setAggregateMetrics(_aggregateMetrics);
+    indexingConfig.setOptimizeDictionaryForMetrics(_optimizeDictionaryForMetrics);
+    indexingConfig.setNoDictionarySizeRatioThreshold(_noDictionarySizeRatioThreshold);
+    indexingConfig.setTierOverwrites(_tierOverwrites);
 
     if (_customConfig == null) {
       _customConfig = new TableCustomConfig(null);
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/AttemptsExceededException.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/AttemptsExceededException.java
index a67d0f20401..c710aa1e72c 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/AttemptsExceededException.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/AttemptsExceededException.java
@@ -24,7 +24,18 @@
  */
 public class AttemptsExceededException extends AttemptFailureException {
 
+  private int _attempts = 0;
+
   public AttemptsExceededException(String message) {
     super(message);
   }
+
+  public AttemptsExceededException(String message, int attempts) {
+    super(message);
+    _attempts = attempts;
+  }
+
+  public int getAttempts() {
+    return _attempts;
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/BaseRetryPolicy.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/BaseRetryPolicy.java
index 17d1ac9d381..e66d35ac5b0 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/BaseRetryPolicy.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/BaseRetryPolicy.java
@@ -42,14 +42,14 @@ protected BaseRetryPolicy(int maxNumAttempts) {
   protected abstract long getDelayMs(int currentAttempt);
 
   @Override
-  public void attempt(Callable<Boolean> operation)
+  public int attempt(Callable<Boolean> operation)
       throws AttemptsExceededException, RetriableOperationException {
     int attempt = 0;
     try {
       while (attempt < _maxNumAttempts - 1) {
         if (Boolean.TRUE.equals(operation.call())) {
           // Succeeded
-          return;
+          return attempt;
         } else {
           // Failed
           Thread.sleep(getDelayMs(attempt++));
@@ -57,11 +57,11 @@ public void attempt(Callable<Boolean> operation)
       }
       if (_maxNumAttempts > 0 && Boolean.TRUE.equals(operation.call())) {
         // Succeeded
-        return;
+        return attempt;
       }
     } catch (Exception e) {
-      throw new RetriableOperationException(e);
+      throw new RetriableOperationException(e, attempt + 1);
     }
-    throw new AttemptsExceededException("Operation failed after " + _maxNumAttempts + " attempts");
+    throw new AttemptsExceededException("Operation failed after " + _maxNumAttempts + " attempts", _maxNumAttempts);
   }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetriableOperationException.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetriableOperationException.java
index 14001e58a1f..23385e85bb2 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetriableOperationException.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetriableOperationException.java
@@ -23,7 +23,18 @@
  */
 public class RetriableOperationException extends AttemptFailureException {
 
+  private int _attempts = 0;
+
+  public int getAttempts() {
+    return _attempts;
+  }
+
   public RetriableOperationException(Throwable cause) {
     super(cause);
   }
+
+  public RetriableOperationException(Throwable cause, int attempts) {
+    super(cause);
+    _attempts = attempts;
+  }
 }
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetryPolicy.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetryPolicy.java
index 752c1ba642f..edbfb365723 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetryPolicy.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/RetryPolicy.java
@@ -33,7 +33,8 @@ public interface RetryPolicy {
    * @param operation The operation to attempt, which returns true on success and false on failure.
    * @throws AttemptsExceededException
    * @throws RetriableOperationException
+   * @return the number of attempts used for the operation. 0 means the first try was successful.
    */
-  void attempt(Callable<Boolean> operation)
+  int attempt(Callable<Boolean> operation)
       throws AttemptsExceededException, RetriableOperationException;
 }
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/BloomFilterConfigTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/BloomFilterConfigTest.java
new file mode 100644
index 00000000000..6043a43d325
--- /dev/null
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/BloomFilterConfigTest.java
@@ -0,0 +1,80 @@
+/**
+ * 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.pinot.spi.config.table;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class BloomFilterConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    BloomFilterConfig config = JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+
+    Assert.assertTrue(config.isEnabled(), "Config should be enabled");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    BloomFilterConfig config = JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+
+    Assert.assertTrue(config.isEnabled(), "Config should be enabled");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    BloomFilterConfig config = JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+
+    Assert.assertTrue(config.isEnabled(), "Config should be enabled");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    BloomFilterConfig config = JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+
+    Assert.assertFalse(config.isEnabled(), "Config should be disabled");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "  \"fpp\": 0.5,\n"
+        + "  \"maxSizeInBytes\": 1024,\n"
+        + "  \"loadOnHeap\": true"
+        + "}";
+    BloomFilterConfig config = JsonUtils.stringToObject(confStr, BloomFilterConfig.class);
+
+    Assert.assertTrue(config.isEnabled(), "Config should be enabled");
+    Assert.assertEquals(config.getFpp(), 0.5d, "FPP is wrong");
+    Assert.assertEquals(config.getMaxSizeInBytes(), 1024, "maxSizeInBytes is wrong");
+    Assert.assertTrue(config.isLoadOnHeap(), "loadOnHeap is wrong");
+  }
+}
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/IndexConfigTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/IndexConfigTest.java
new file mode 100644
index 00000000000..26362791404
--- /dev/null
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/IndexConfigTest.java
@@ -0,0 +1,76 @@
+/**
+ * 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.pinot.spi.config.table;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+
+public class IndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    IndexConfig config = JsonUtils.stringToObject(confStr, IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    IndexConfig config = JsonUtils.stringToObject(confStr, IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    IndexConfig config = JsonUtils.stringToObject(confStr, IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    IndexConfig config = JsonUtils.stringToObject(confStr, IndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"version\": 42\n"
+        + "}";
+    IndexConfig config = JsonUtils.stringToObject(confStr, IndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+  }
+}
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/JsonIndexConfigTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/JsonIndexConfigTest.java
new file mode 100644
index 00000000000..aaa75b7ebde
--- /dev/null
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/JsonIndexConfigTest.java
@@ -0,0 +1,107 @@
+/**
+ * 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.pinot.spi.config.table;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.pinot.spi.utils.JsonUtils;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import static org.testng.Assert.*;
+
+
+public class JsonIndexConfigTest {
+
+  @Test
+  public void withEmptyConf()
+      throws JsonProcessingException {
+    String confStr = "{}";
+    JsonIndexConfig config = JsonUtils.stringToObject(confStr, JsonIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isExcludeArray(), "Unexpected excludeArray");
+    assertFalse(config.isDisableCrossArrayUnnest(), "Unexpected disableCrossArrayUnnest");
+    assertNull(config.getIncludePaths(), "Unexpected includePaths");
+    assertNull(config.getExcludePaths(), "Unexpected excludePaths");
+    assertNull(config.getExcludeFields(), "Unexpected excludeFields");
+  }
+
+  @Test
+  public void withDisabledNull()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": null}";
+    JsonIndexConfig config = JsonUtils.stringToObject(confStr, JsonIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isExcludeArray(), "Unexpected excludeArray");
+    assertFalse(config.isDisableCrossArrayUnnest(), "Unexpected disableCrossArrayUnnest");
+    assertNull(config.getIncludePaths(), "Unexpected includePaths");
+    assertNull(config.getExcludePaths(), "Unexpected excludePaths");
+    assertNull(config.getExcludeFields(), "Unexpected excludeFields");
+  }
+
+  @Test
+  public void withDisabledFalse()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": false}";
+    JsonIndexConfig config = JsonUtils.stringToObject(confStr, JsonIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isExcludeArray(), "Unexpected excludeArray");
+    assertFalse(config.isDisableCrossArrayUnnest(), "Unexpected disableCrossArrayUnnest");
+    assertNull(config.getIncludePaths(), "Unexpected includePaths");
+    assertNull(config.getExcludePaths(), "Unexpected excludePaths");
+    assertNull(config.getExcludeFields(), "Unexpected excludeFields");
+  }
+
+  @Test
+  public void withDisabledTrue()
+      throws JsonProcessingException {
+    String confStr = "{\"disabled\": true}";
+    JsonIndexConfig config = JsonUtils.stringToObject(confStr, JsonIndexConfig.class);
+
+    assertTrue(config.isDisabled(), "Unexpected disabled");
+    assertFalse(config.isExcludeArray(), "Unexpected excludeArray");
+    assertFalse(config.isDisableCrossArrayUnnest(), "Unexpected disableCrossArrayUnnest");
+    assertNull(config.getIncludePaths(), "Unexpected includePaths");
+    assertNull(config.getExcludePaths(), "Unexpected excludePaths");
+    assertNull(config.getExcludeFields(), "Unexpected excludeFields");
+  }
+
+  @Test
+  public void withSomeData()
+      throws JsonProcessingException {
+    String confStr = "{\n"
+        + "        \"maxLevels\": 2,\n"
+        + "        \"excludeArray\": true,\n"
+        + "        \"disableCrossArrayUnnest\": true,\n"
+        + "        \"includePaths\": [\"a\"],\n"
+        + "        \"excludePaths\": [\"b\"],\n"
+        + "        \"excludeFields\": [\"c\"]\n"
+        + "}";
+    JsonIndexConfig config = JsonUtils.stringToObject(confStr, JsonIndexConfig.class);
+
+    assertFalse(config.isDisabled(), "Unexpected disabled");
+    assertTrue(config.isExcludeArray(), "Unexpected excludeArray");
+    assertTrue(config.isDisableCrossArrayUnnest(), "Unexpected disableCrossArrayUnnest");
+    assertEquals(config.getIncludePaths(), Lists.newArrayList("a"), "Unexpected includePaths");
+    assertEquals(config.getExcludePaths(), Lists.newArrayList("b"), "Unexpected excludePaths");
+    assertEquals(config.getExcludeFields(), Lists.newArrayList("c"), "Unexpected excludeFields");
+  }
+}
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/UpsertConfigTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/UpsertConfigTest.java
index df5875fe337..6b5df41e25f 100644
--- a/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/UpsertConfigTest.java
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/config/table/UpsertConfigTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.spi.config.table;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.testng.annotations.Test;
@@ -33,7 +34,7 @@ public void testUpsertConfig() {
     assertEquals(upsertConfig1.getMode(), UpsertConfig.Mode.FULL);
 
     upsertConfig1.setComparisonColumn("comparison");
-    assertEquals(upsertConfig1.getComparisonColumn(), "comparison");
+    assertEquals(upsertConfig1.getComparisonColumns(), Collections.singletonList("comparison"));
 
     upsertConfig1.setHashFunction(HashFunction.MURMUR3);
     assertEquals(upsertConfig1.getHashFunction(), HashFunction.MURMUR3);
@@ -45,4 +46,11 @@ public void testUpsertConfig() {
     upsertConfig2.setDefaultPartialUpsertStrategy(UpsertConfig.Strategy.OVERWRITE);
     assertEquals(upsertConfig2.getPartialUpsertStrategies(), partialUpsertStratgies);
   }
+
+  @Test
+  public void testUpsertConfigForDefaults() {
+    UpsertConfig upsertConfig = new UpsertConfig(UpsertConfig.Mode.PARTIAL);
+    assertEquals(upsertConfig.getHashFunction(), HashFunction.NONE);
+    assertEquals(upsertConfig.getDefaultPartialUpsertStrategy(), UpsertConfig.Strategy.OVERWRITE);
+  }
 }
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/data/DateTimeGranularitySpecTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/data/DateTimeGranularitySpecTest.java
new file mode 100644
index 00000000000..ed60c5d9153
--- /dev/null
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/data/DateTimeGranularitySpecTest.java
@@ -0,0 +1,93 @@
+/**
+ * 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.pinot.spi.data;
+
+import java.util.concurrent.TimeUnit;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+
+public class DateTimeGranularitySpecTest {
+
+  @Test
+  public void testDateTimeGranularitySpec() {
+    // Old format
+    DateTimeGranularitySpec dateTimeGranularitySpec = new DateTimeGranularitySpec("1:HOURS");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.HOURS);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 3600000);
+
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("15:MINUTES");
+    assertEquals(dateTimeGranularitySpec.getSize(), 15);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.MINUTES);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 900000);
+
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("1:MILLISECONDS");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.MILLISECONDS);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 1);
+
+    // New format
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("HOURS|1");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.HOURS);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 3600000);
+
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("MINUTES|15");
+    assertEquals(dateTimeGranularitySpec.getSize(), 15);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.MINUTES);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 900000);
+
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("MILLISECONDS|1");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.MILLISECONDS);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 1);
+
+    // New format without explicitly setting size
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("HOURS");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.HOURS);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 3600000);
+
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("MINUTES");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.MINUTES);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 60000);
+
+    dateTimeGranularitySpec = new DateTimeGranularitySpec("MILLISECONDS");
+    assertEquals(dateTimeGranularitySpec.getSize(), 1);
+    assertEquals(dateTimeGranularitySpec.getTimeUnit(), TimeUnit.MILLISECONDS);
+    assertEquals(dateTimeGranularitySpec.granularityToMillis(), 1);
+
+    // IllegalArguments
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec(""));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("1"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("1:1"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("1|1"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("DAY:DAY"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("DAY|DAY"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("DAY:1"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("1|DAY"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("EPOCH|DAY|1"));
+    assertThrows(IllegalArgumentException.class, () -> new DateTimeGranularitySpec("1:DAY:EPOCH"));
+  }
+}
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/env/PinotConfigurationTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/env/PinotConfigurationTest.java
index 240eb4f31d8..0b33d73d716 100644
--- a/pinot-spi/src/test/java/org/apache/pinot/spi/env/PinotConfigurationTest.java
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/env/PinotConfigurationTest.java
@@ -207,6 +207,58 @@ public void assertPropertiesFromFSSpec() {
     new PinotConfiguration(new PinotFSSpec());
   }
 
+  @Test
+  public void assertPropertyInterpolation() {
+    Map<String, Object> configs = new HashMap<>();
+    configs.put("config.property.1", "${sys:PINOT_CONFIGURATION_TEST_VAR}");
+    PinotConfiguration pinotConfiguration = new PinotConfiguration(configs);
+
+    try {
+      // Env var is not defined, thus interpolation doesn't happen
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1"), "${sys:PINOT_CONFIGURATION_TEST_VAR}");
+
+      // String value
+      System.setProperty("PINOT_CONFIGURATION_TEST_VAR", "val1");
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1"), "val1");
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1", "defaultVal"), "val1");
+      Map<String, Object> properties = pinotConfiguration.toMap();
+      Assert.assertEquals(properties.get("config.property.1"), "val1");
+
+      // Boolean value
+      System.setProperty("PINOT_CONFIGURATION_TEST_VAR", "true");
+      Assert.assertTrue(pinotConfiguration.getProperty("config.property.1", false));
+      properties = pinotConfiguration.toMap();
+      Assert.assertEquals(properties.get("config.property.1"), "true");
+      Assert.assertTrue(new PinotConfiguration(properties).getProperty("config.property.1", false));
+
+      // Number value
+      System.setProperty("PINOT_CONFIGURATION_TEST_VAR", "10");
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1", 0), 10);
+      properties = pinotConfiguration.toMap();
+      Assert.assertEquals(properties.get("config.property.1"), "10");
+      Assert.assertEquals(new PinotConfiguration(properties).getProperty("config.property.1", 0), 10);
+
+      // String array, with elements specified as env vars separately.
+      System.setProperty("PINOT_CONFIGURATION_TEST_VAR", "a");
+      System.setProperty("PINOT_CONFIGURATION_TEST_VAR2", "b");
+      configs.put("config.property.1", "${sys:PINOT_CONFIGURATION_TEST_VAR},${sys:PINOT_CONFIGURATION_TEST_VAR2}");
+      pinotConfiguration = new PinotConfiguration(configs);
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1", Arrays.asList()),
+          Arrays.asList("a", "b"));
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1", "val1"), "a,b");
+      Assert.assertEquals(pinotConfiguration.getProperty("config.property.1"), "a,b");
+      properties = pinotConfiguration.toMap();
+      Assert.assertEquals(properties.get("config.property.1"), "a,b");
+      Assert.assertEquals(new PinotConfiguration(properties).getProperty("config.property.1", Arrays.asList()),
+          Arrays.asList("a", "b"));
+      Assert.assertEquals(new PinotConfiguration(properties).getProperty("config.property.1", "val1"), "a,b");
+      Assert.assertEquals(new PinotConfiguration(properties).getProperty("config.property.1"), "a,b");
+    } finally {
+      System.clearProperty("PINOT_CONFIGURATION_TEST_VAR");
+      System.clearProperty("PINOT_CONFIGURATION_TEST_VAR2");
+    }
+  }
+
   private void copyClasspathResource(String classpathResource, String target)
       throws IOException {
     try (InputStream inputStream = PinotConfigurationTest.class.getResourceAsStream(classpathResource)) {
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamDataDecoderImplTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamDataDecoderImplTest.java
index 56bfb9b97b4..9aaf4bc386a 100644
--- a/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamDataDecoderImplTest.java
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamDataDecoderImplTest.java
@@ -41,7 +41,7 @@ public void testDecodeValueOnly()
     messageDecoder.init(Collections.emptyMap(), ImmutableSet.of(NAME_FIELD), "");
     String value = "Alice";
     StreamMessage<byte[]> message = new StreamMessage(value.getBytes(StandardCharsets.UTF_8),
-        value.getBytes(StandardCharsets.UTF_8).length);
+        value.getBytes(StandardCharsets.UTF_8).length, null);
     StreamDataDecoderResult result = new StreamDataDecoderImpl(messageDecoder).decode(message);
     Assert.assertNotNull(result);
     Assert.assertNull(result.getException());
@@ -87,7 +87,7 @@ public void testNoExceptionIsThrown()
     messageDecoder.init(Collections.emptyMap(), ImmutableSet.of(NAME_FIELD), "");
     String value = "Alice";
     StreamMessage<byte[]> message = new StreamMessage(value.getBytes(StandardCharsets.UTF_8),
-        value.getBytes(StandardCharsets.UTF_8).length);
+        value.getBytes(StandardCharsets.UTF_8).length, null);
     StreamDataDecoderResult result = new StreamDataDecoderImpl(messageDecoder).decode(message);
     Assert.assertNotNull(result);
     Assert.assertNotNull(result.getException());
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamMessageTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamMessageTest.java
index 10e5087493e..d0d028709fd 100644
--- a/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamMessageTest.java
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/stream/StreamMessageTest.java
@@ -29,7 +29,7 @@ public class StreamMessageTest {
   public void testAllowNullKeyAndMetadata() {
     String value = "hello";
     byte[] valBytes = value.getBytes(StandardCharsets.UTF_8);
-    StreamMessage<byte[]> msg = new StreamMessage(valBytes, valBytes.length);
+    StreamMessage<byte[]> msg = new StreamMessage(valBytes, valBytes.length, null);
     Assert.assertNull(msg.getKey());
     Assert.assertNull(msg.getMetadata());
     Assert.assertEquals(new String(msg.getValue()), value);
diff --git a/pinot-spi/src/test/java/org/apache/pinot/spi/utils/retry/RetryPolicyTest.java b/pinot-spi/src/test/java/org/apache/pinot/spi/utils/retry/RetryPolicyTest.java
index f1eda8d51e5..b2bfeb47fb0 100644
--- a/pinot-spi/src/test/java/org/apache/pinot/spi/utils/retry/RetryPolicyTest.java
+++ b/pinot-spi/src/test/java/org/apache/pinot/spi/utils/retry/RetryPolicyTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.spi.utils.retry;
 
+import java.util.concurrent.atomic.AtomicInteger;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -105,6 +106,7 @@ public void testBaseRetryPolicy()
         Assert.fail();
       } catch (AttemptsExceededException e) {
         // Expected
+        Assert.assertEquals(e.getAttempts(), MAX_NUM_ATTEMPTS);
       }
 
       try {
@@ -112,6 +114,7 @@ public void testBaseRetryPolicy()
         Assert.fail();
       } catch (AttemptsExceededException e) {
         // Expected
+        Assert.assertEquals(e.getAttempts(), MAX_NUM_ATTEMPTS);
       }
 
       try {
@@ -121,7 +124,17 @@ public void testBaseRetryPolicy()
         Assert.fail();
       } catch (RetriableOperationException e) {
         // Expected
+        Assert.assertEquals(e.getAttempts(), 1);
       }
+
+      // Function returns false MAX_NUM_ATTEMPTS - 2 times and does not throw, make sure
+      // we return the correct value of attempts.
+      // Use MAX_NUM_ATTEMPTS - 1 to make sure we do not throw and return attempts
+      AtomicInteger atomicInteger = new AtomicInteger(MAX_NUM_ATTEMPTS - 1);
+      int retries = retryPolicy.attempt(() -> {
+          return (atomicInteger.decrementAndGet() <= 0);
+      });
+      Assert.assertEquals(retries, MAX_NUM_ATTEMPTS - 2);
     }
   }
 }
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 94b182cd355..5e32bad954e 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -33,9 +33,9 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <aws.version>2.14.28</aws.version>
     <scala.version>2.12</scala.version>
     <spark.version>3.2.1</spark.version>
+    <airlift.version>0.16</airlift.version>
   </properties>
   <dependencies>
     <dependency>
@@ -91,6 +91,12 @@
       <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-orc</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.airlift</groupId>
+          <artifactId>aircompressor</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -128,77 +134,85 @@
       <artifactId>pinot-kinesis</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>sdk-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>s3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.reactivestreams</groupId>
+      <artifactId>reactive-streams</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-kafka-${kafka.version}</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pinot</groupId>
+      <artifactId>pinot-pulsar</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>http-client-spi</artifactId>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>protocol-core</artifactId>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>annotations</artifactId>
+          <groupId>io.airlift</groupId>
+          <artifactId>aircompressor</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>utils</artifactId>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>profiles</artifactId>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>animal-sniffer-annotations</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>regions</artifactId>
+          <groupId>com.google.api.grpc</groupId>
+          <artifactId>proto-google-common-protos</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>auth</artifactId>
+          <groupId>org.glassfish.jersey.containers</groupId>
+          <artifactId>jersey-container-servlet-core</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>aws-core</artifactId>
+          <groupId>io.swagger</groupId>
+          <artifactId>swagger-annotations</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>apache-client</artifactId>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-protobuf-lite</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>sdk-core</artifactId>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-context</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>netty-nio-client</artifactId>
+          <groupId>jakarta.activation</groupId>
+          <artifactId>jakarta.activation-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec</artifactId>
+          <groupId>com.typesafe.netty</groupId>
+          <artifactId>netty-reactive-streams</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.beust</groupId>
+          <artifactId>jcommander</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>sdk-core</artifactId>
-      <version>${aws.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-      <version>${aws.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.reactivestreams</groupId>
-      <artifactId>reactive-streams</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-kafka-${kafka.version}</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-batch-ingestion-standalone</artifactId>
@@ -210,12 +224,6 @@
       <artifactId>pinot-s3</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>software.amazon.awssdk</groupId>
-          <artifactId>s3</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.pinot</groupId>
@@ -236,6 +244,11 @@
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.airlift</groupId>
+      <artifactId>aircompressor</artifactId>
+      <version>${airlift.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/AuthQuickstart.java b/pinot-tools/src/main/java/org/apache/pinot/tools/AuthQuickstart.java
index 2642bbbb19f..59d4b3f9f0c 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/AuthQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/AuthQuickstart.java
@@ -47,19 +47,23 @@ public Map<String, Object> getConfigOverrides() {
     properties.put("pinot.controller.segment.fetcher.auth.token", "Basic YWRtaW46dmVyeXNlY3JldA==");
     properties.put("controller.admin.access.control.factory.class",
         "org.apache.pinot.controller.api.access.BasicAuthAccessControlFactory");
-    properties.put("controller.admin.access.control.principals", "admin, user");
+    properties.put("controller.admin.access.control.principals", "admin, user, service, tableonly");
     properties.put("controller.admin.access.control.principals.admin.password", "verysecret");
+    properties.put("controller.admin.access.control.principals.service.password", "verysecrettoo");
     properties.put("controller.admin.access.control.principals.user.password", "secret");
-    properties.put("controller.admin.access.control.principals.user.tables", "baseballStats");
-    properties.put("controller.admin.access.control.principals.user.permissions", "read");
+    properties.put("controller.admin.access.control.principals.user.permissions", "READ");
+    properties.put("controller.admin.access.control.principals.tableonly.password", "secrettoo");
+    properties.put("controller.admin.access.control.principals.tableonly.permissions", "READ");
+    properties.put("controller.admin.access.control.principals.tableonly.tables", "baseballStats");
 
     // broker
     properties.put("pinot.broker.access.control.class", "org.apache.pinot.broker.broker.BasicAuthAccessControlFactory");
-    properties.put("pinot.broker.access.control.principals", "admin, user");
+    properties.put("pinot.broker.access.control.principals", "admin, user, service, tableonly");
     properties.put("pinot.broker.access.control.principals.admin.password", "verysecret");
+    properties.put("pinot.broker.access.control.principals.service.password", "verysecrettoo");
     properties.put("pinot.broker.access.control.principals.user.password", "secret");
-    properties.put("pinot.broker.access.control.principals.user.tables", "baseballStats");
-    properties.put("pinot.broker.access.control.principals.user.permissions", "read");
+    properties.put("pinot.broker.access.control.principals.tableonly.password", "secrettoo");
+    properties.put("pinot.broker.access.control.principals.tableonly.tables", "baseballStats");
 
     // server
     properties.put("pinot.server.segment.fetcher.auth.token", "Basic YWRtaW46dmVyeXNlY3JldA==");
@@ -70,6 +74,11 @@ public Map<String, Object> getConfigOverrides() {
     properties.put("segment.fetcher.auth.token", "Basic YWRtaW46dmVyeXNlY3JldA==");
     properties.put("task.auth.token", "Basic YWRtaW46dmVyeXNlY3JldA==");
 
+    // loggers
+    properties.put("pinot.controller.logger.root.dir", "logs");
+    properties.put("pinot.broker.logger.root.dir", "logs");
+    properties.put("pinot.server.logger.root.dir", "logs");
+    properties.put("pinot.minion.logger.root.dir", "logs");
     return properties;
   }
 
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/ColocatedJoinEngineQuickStart.java b/pinot-tools/src/main/java/org/apache/pinot/tools/ColocatedJoinEngineQuickStart.java
index c59603d2fdb..0241168b814 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/ColocatedJoinEngineQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/ColocatedJoinEngineQuickStart.java
@@ -38,10 +38,7 @@ public List<String> types() {
 
   @Override
   public String[] getDefaultBatchTableDirectories() {
-    List<String> colocatedTableDirs = new ArrayList<>(Arrays.asList(COLOCATED_JOIN_DIRECTORIES));
-    String[] multiStageTableDirs = super.getDefaultBatchTableDirectories();
-    colocatedTableDirs.addAll(Arrays.asList(multiStageTableDirs));
-    return colocatedTableDirs.toArray(new String[0]);
+    return COLOCATED_JOIN_DIRECTORIES;
   }
 
   @Override
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java b/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
index 8765333b962..ef06dfcd414 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
@@ -104,7 +104,8 @@ private void execute(String personalAccessToken, StreamSourceType streamSourceTy
     File tableConfigFile = new File(quickStartDataDir, "pullRequestMergedEvents_realtime_table_config.json");
 
     ClassLoader classLoader = Quickstart.class.getClassLoader();
-    URL resource = classLoader.getResource("examples/stream/githubEvents/pullRequestMergedEvents_schema.json");
+    URL resource = classLoader.getResource(
+        "examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_schema.json");
     Preconditions.checkNotNull(resource);
     FileUtils.copyURLToFile(resource, schemaFile);
     String tableConfigFilePath = getTableConfigFilePath();
@@ -186,12 +187,12 @@ private String getTableConfigFilePath() {
     switch (_sourceType) {
       case KINESIS:
         tableConfigFilePath =
-            "examples/stream/githubEvents/pullRequestMergedEvents_kinesis_realtime_table_config.json";
+            "examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_kinesis_realtime_table_config.json";
         break;
       case KAFKA:
       default:
         tableConfigFilePath =
-            "examples/stream/githubEvents/pullRequestMergedEvents_realtime_table_config.json";
+            "examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_realtime_table_config.json";
         break;
     }
     return tableConfigFilePath;
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/MultistageEngineQuickStart.java b/pinot-tools/src/main/java/org/apache/pinot/tools/MultistageEngineQuickStart.java
index f192bd54512..226f3dc5189 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/MultistageEngineQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/MultistageEngineQuickStart.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.pinot.spi.utils.CommonConstants;
@@ -31,11 +30,18 @@
 
 public class MultistageEngineQuickStart extends Quickstart {
   private static final String[] MULTI_STAGE_TABLE_DIRECTORIES = new String[]{
+      "examples/batch/airlineStats",
+      "examples/batch/baseballStats",
+      "examples/batch/billing",
+      "examples/batch/dimBaseballTeams",
+      "examples/batch/githubEvents",
+      "examples/batch/githubComplexTypeEvents",
       "examples/batch/ssb/customer",
       "examples/batch/ssb/dates",
       "examples/batch/ssb/lineorder",
       "examples/batch/ssb/part",
       "examples/batch/ssb/supplier",
+      "examples/batch/starbucksStores",
   };
 
   @Override
@@ -50,7 +56,7 @@ public void runSampleQueries(QuickstartRunner runner)
     printStatus(Quickstart.Color.YELLOW, "***** Multi-stage engine quickstart setup complete *****");
     Map<String, String> queryOptions = Collections.singletonMap("queryOptions",
         CommonConstants.Broker.Request.QueryOptionKey.USE_MULTISTAGE_ENGINE + "=true");
-    String q1 = "SELECT count(*) FROM baseballStats_OFFLINE";
+    String q1 = "SELECT count(*) FROM baseballStats_OFFLINE LIMIT 10";
     printStatus(Quickstart.Color.YELLOW, "Total number of documents in the table");
     printStatus(Quickstart.Color.CYAN, "Query : " + q1);
     printStatus(Quickstart.Color.YELLOW, prettyPrintResponse(runner.runQuery(q1, queryOptions)));
@@ -58,7 +64,7 @@ public void runSampleQueries(QuickstartRunner runner)
 
     String q2 = "SELECT a.playerID, a.runs, a.yearID, b.runs, b.yearID"
         + " FROM baseballStats_OFFLINE AS a JOIN baseballStats_OFFLINE AS b ON a.playerID = b.playerID"
-        + " WHERE a.runs > 160 AND b.runs < 2";
+        + " WHERE a.runs > 160 AND b.runs < 2 LIMIT 10";
     printStatus(Quickstart.Color.YELLOW, "Correlate the same player(s) with more than 160-run some year(s) and"
         + " with less than 2-run some other year(s)");
     printStatus(Quickstart.Color.CYAN, "Query : " + q2);
@@ -68,7 +74,7 @@ public void runSampleQueries(QuickstartRunner runner)
     String q3 = "SELECT a.playerName, a.teamID, b.teamName \n"
         + "FROM baseballStats_OFFLINE AS a\n"
         + "JOIN dimBaseballTeams_OFFLINE AS b\n"
-        + "ON a.teamID = b.teamID";
+        + "ON a.teamID = b.teamID LIMIT 10";
     printStatus(Quickstart.Color.YELLOW, "Baseball Stats with joined team names");
     printStatus(Quickstart.Color.CYAN, "Query : " + q3);
     printStatus(Quickstart.Color.YELLOW, prettyPrintResponse(runner.runQuery(q3, queryOptions)));
@@ -81,17 +87,12 @@ public void runSampleQueries(QuickstartRunner runner)
 
   @Override
   public String[] getDefaultBatchTableDirectories() {
-    List<String> tableDirs = new ArrayList<>(Arrays.asList(MULTI_STAGE_TABLE_DIRECTORIES));
-    tableDirs.addAll(Arrays.asList(DEFAULT_OFFLINE_TABLE_DIRECTORIES));
-    return tableDirs.toArray(new String[]{});
+    return MULTI_STAGE_TABLE_DIRECTORIES;
   }
 
   @Override
-  public Map<String, Object> getConfigOverrides() {
-    Map<String, Object> overrides = new HashMap<>(super.getConfigOverrides());
-    overrides.put("pinot.multistage.engine.enabled", "true");
-    overrides.put("pinot.server.instance.currentDataTableVersion", 4);
-    return overrides;
+  protected int getNumQuickstartRunnerServers() {
+    return 3;
   }
 
   public static void main(String[] args)
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
index 7e4006f9ea3..6d1d58f7435 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
@@ -50,6 +50,8 @@ public PinotTableRebalancer(String zkAddress, String clusterName, boolean dryRun
         externalViewCheckIntervalInMs);
     _rebalanceConfig.addProperty(RebalanceConfigConstants.EXTERNAL_VIEW_STABILIZATION_TIMEOUT_IN_MS,
         externalViewStabilizationTimeoutInMs);
+    _rebalanceConfig.addProperty(RebalanceConfigConstants.JOB_ID,
+        TableRebalancer.createUniqueRebalanceJobIdentifier());
   }
 
   public RebalanceResult rebalance(String tableNameWithType) {
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java b/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
index b7192aa04f9..bf86ec3c65a 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
@@ -78,7 +78,7 @@ public abstract class QuickStartBase {
 
   protected static final Map<String, String> DEFAULT_STREAM_TABLE_DIRECTORIES = ImmutableMap.<String, String>builder()
       .put("airlineStats", "examples/stream/airlineStats")
-      .put("githubEvents", "examples/minions/stream/githubEvents")
+      .put("githubEvents", "examples/stream/githubEvents")
       .put("meetupRsvp", "examples/stream/meetupRsvp")
       .put("meetupRsvpJson", "examples/stream/meetupRsvpJson")
       .put("meetupRsvpComplexType", "examples/stream/meetupRsvpComplexType")
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/TPCHQuickStart.java b/pinot-tools/src/main/java/org/apache/pinot/tools/TPCHQuickStart.java
new file mode 100644
index 00000000000..b0dc58dd28b
--- /dev/null
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/TPCHQuickStart.java
@@ -0,0 +1,63 @@
+/**
+ * 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.pinot.tools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.pinot.tools.admin.PinotAdministrator;
+
+
+public class TPCHQuickStart extends MultistageEngineQuickStart {
+  private static final String QUICKSTART_IDENTIFIER = "TPCH";
+  private static final String[] TPCH_DIRECTORIES = new String[]{
+      "examples/batch/tpch/customer",
+      "examples/batch/tpch/lineitem",
+      "examples/batch/tpch/nation",
+      "examples/batch/tpch/orders",
+      "examples/batch/tpch/part",
+      "examples/batch/tpch/partsupp",
+      "examples/batch/tpch/region",
+      "examples/batch/tpch/supplier"
+  };
+
+  @Override
+  public List<String> types() {
+    return Collections.singletonList(QUICKSTART_IDENTIFIER);
+  }
+
+  @Override
+  public String[] getDefaultBatchTableDirectories() {
+    return TPCH_DIRECTORIES;
+  }
+
+  @Override
+  protected int getNumQuickstartRunnerServers() {
+    return 1;
+  }
+
+  public static void main(String[] args)
+      throws Exception {
+    List<String> arguments = new ArrayList<>();
+    arguments.addAll(Arrays.asList("QuickStart", "-type", QUICKSTART_IDENTIFIER));
+    arguments.addAll(Arrays.asList(args));
+    PinotAdministrator.main(arguments.toArray(new String[arguments.size()]));
+  }
+}
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AbstractBaseAdminCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AbstractBaseAdminCommand.java
index 85da5d31a48..b91c3bf83ab 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AbstractBaseAdminCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AbstractBaseAdminCommand.java
@@ -101,7 +101,10 @@ public static String sendRequest(String requestMethod, String urlString, String
     try {
       return readInputStream(conn.getInputStream());
     } catch (Exception e) {
-      return readInputStream(conn.getErrorStream());
+      if (conn.getErrorStream() != null) {
+        return readInputStream(conn.getErrorStream());
+      }
+      throw new IOException("Request failed due to connection error", e);
     }
   }
 
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
index a9950cdf4f8..76bdfada058 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
@@ -119,12 +119,10 @@ public String description() {
 
   @Override
   public String toString() {
-    String retString =
-        ("AddTable -tableConfigFile " + _tableConfigFile + " -offlineTableConfigFile " + _offlineTableConfigFile
-            + " -realtimeTableConfigFile" + _realtimeTableConfigFile + " -schemaFile " + _schemaFile
-            + " -controllerProtocol " + _controllerProtocol + " -controllerHost " + _controllerHost
-            + " -controllerPort " + _controllerPort + " -user " + _user + " -password " + "[hidden]");
-    return ((_exec) ? (retString + " -exec") : retString);
+    return "AddTable -tableConfigFile " + _tableConfigFile + " -offlineTableConfigFile " + _offlineTableConfigFile
+        + " -realtimeTableConfigFile " + _realtimeTableConfigFile + " -schemaFile " + _schemaFile
+        + " -controllerProtocol " + _controllerProtocol + " -controllerHost " + _controllerHost + " -controllerPort "
+        + _controllerPort + " -user " + _user + " -password [hidden]" + (_exec ? " -exec" : "");
   }
 
   @Override
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/LaunchDataIngestionJobCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/LaunchDataIngestionJobCommand.java
index f5085db172a..a56b820a5fb 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/LaunchDataIngestionJobCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/LaunchDataIngestionJobCommand.java
@@ -160,6 +160,9 @@ public String description() {
   public static void main(String[] args) {
     PluginManager.get().init();
     int exitCode = new CommandLine(new LaunchDataIngestionJobCommand()).execute(args);
-    System.exit(exitCode);
+    if ((exitCode != 0)
+        || Boolean.parseBoolean(System.getProperties().getProperty("pinot.admin.system.exit"))) {
+      System.exit(exitCode);
+    }
   }
 }
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
index d68ece9473b..e1e80e8ae02 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -54,10 +55,6 @@ public class QuickstartRunner {
   private static final int DEFAULT_SERVER_GRPC_PORT = 7100;
   private static final int DEFAULT_MINION_PORT = 6000;
 
-  private static final int DEFAULT_BROKER_MULTISTAGE_RUNNER_PORT = 8421;
-  private static final int DEFAULT_SERVER_MULTISTAGE_RUNNER_PORT = 8442;
-  private static final int DEFAULT_SERVER_MULTISTAGE_SERVER_PORT = 8842;
-
   private static final String DEFAULT_ZK_DIR = "PinotZkDir";
   private static final String DEFAULT_CONTROLLER_DIR = "PinotControllerDir";
   private static final String DEFAULT_SERVER_DATA_DIR = "PinotServerDataDir";
@@ -100,7 +97,12 @@ public QuickstartRunner(List<QuickstartTableRequest> tableRequests, int numContr
     _tempDir = tempDir;
     _enableTenantIsolation = enableIsolation;
     _authProvider = authProvider;
-    _configOverrides = configOverrides;
+    _configOverrides = new HashMap<>(configOverrides);
+    if (numMinions > 0) {
+      // configure the controller to schedule tasks when minion is enabled
+      _configOverrides.put("controller.task.scheduler.enabled", true);
+      _configOverrides.put("controller.task.skipLateCronSchedule", true);
+    }
     _zkExternalAddress = zkExternalAddress;
     _deleteExistingData = deleteExistingData;
     if (deleteExistingData) {
@@ -137,7 +139,6 @@ private void startBrokers()
     for (int i = 0; i < _numBrokers; i++) {
       StartBrokerCommand brokerStarter = new StartBrokerCommand();
       brokerStarter.setPort(DEFAULT_BROKER_PORT + i)
-          .setBrokerMultiStageRunnerPort(DEFAULT_BROKER_MULTISTAGE_RUNNER_PORT + i)
           .setZkAddress(_zkExternalAddress != null ? _zkExternalAddress : ZK_ADDRESS).setClusterName(CLUSTER_NAME)
           .setConfigOverrides(_configOverrides);
       if (!brokerStarter.execute()) {
@@ -153,8 +154,6 @@ private void startServers()
       StartServerCommand serverStarter = new StartServerCommand();
       serverStarter.setPort(DEFAULT_SERVER_NETTY_PORT + i).setAdminPort(DEFAULT_SERVER_ADMIN_API_PORT + i)
           .setGrpcPort(DEFAULT_SERVER_GRPC_PORT + i)
-          .setMultiStageServerPort(DEFAULT_SERVER_MULTISTAGE_SERVER_PORT + i)
-          .setMultiStageRunnerPort(DEFAULT_SERVER_MULTISTAGE_RUNNER_PORT + i)
           .setZkAddress(_zkExternalAddress != null ? _zkExternalAddress : ZK_ADDRESS).setClusterName(CLUSTER_NAME)
           .setDataDir(new File(_tempDir, DEFAULT_SERVER_DATA_DIR + i).getAbsolutePath())
           .setSegmentDir(new File(_tempDir, DEFAULT_SERVER_SEGMENT_DIR + i).getAbsolutePath())
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java
index d86dcc2a911..4ae7fa3f977 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/RealtimeProvisioningHelperCommand.java
@@ -262,20 +262,20 @@ public boolean execute()
     long maxUsableHostMemBytes = DataSizeUtils.toBytes(_maxUsableHostMemory);
 
     File workingDir = Files.createTempDir();
+    File file = new File(_schemaWithMetadataFile);
+    Schema schema = deserialize(file, Schema.class);
     MemoryEstimator memoryEstimator;
     if (segmentProvided) {
       // use the provided segment to estimate memory
       memoryEstimator =
-          new MemoryEstimator(tableConfig, new File(_sampleCompletedSegmentDir), _ingestionRate, maxUsableHostMemBytes,
-              tableRetentionHours, workingDir);
+          new MemoryEstimator(tableConfig, schema, new File(_sampleCompletedSegmentDir), _ingestionRate,
+              maxUsableHostMemBytes, tableRetentionHours, workingDir);
     } else {
       // no segments provided;
       // generate a segment based on the provided characteristics and then use it to estimate memory
       if (_numRows == 0) {
         _numRows = DEFAULT_NUMBER_OF_ROWS;
       }
-      File file = new File(_schemaWithMetadataFile);
-      Schema schema = deserialize(file, Schema.class);
       SchemaWithMetaData schemaWithMetaData = deserialize(file, SchemaWithMetaData.class);
       memoryEstimator =
           new MemoryEstimator(tableConfig, schema, schemaWithMetaData, _numRows, _ingestionRate, maxUsableHostMemBytes,
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java
index ce365bfac17..9b8753f7acb 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/ShowClusterInfoCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.tools.admin.command;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,7 +42,6 @@
 import org.apache.pinot.spi.utils.CommonConstants;
 import org.apache.pinot.spi.utils.builder.TableNameBuilder;
 import org.apache.pinot.tools.Command;
-import org.codehaus.jackson.annotate.JsonProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
index e8e5ae7f684..9ff706b2b24 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
@@ -67,6 +67,8 @@ public class StartBrokerCommand extends AbstractBaseAdminCommand implements Comm
       // TODO: support forbids = {"-brokerHost", "-brokerPort"})
   private String _configFileName;
 
+  @CommandLine.Option(names = {"-configOverrides"}, required = false, split = ",",
+      description = "Proxy config overrides")
   private Map<String, Object> _configOverrides = new HashMap<>();
 
   public boolean getHelp() {
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
index 660ab1bfc42..1de1ca80f13 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
@@ -73,6 +73,7 @@ public class StartControllerCommand extends AbstractBaseAdminCommand implements
   // This can be set via the set method, or via config file input.
   private boolean _tenantIsolation = true;
 
+  @CommandLine.Option(names = {"-configOverride"}, required = false, split = ",")
   private Map<String, Object> _configOverrides = new HashMap<>();
 
   @Override
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
index 80b2cd70bd6..e515d134973 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
@@ -86,6 +86,7 @@ public class StartServerCommand extends AbstractBaseAdminCommand implements Comm
   // TODO support forbids = {"-serverHost", "-serverPort", "-dataDir", "-segmentDir"}
   private String _configFileName;
 
+  @CommandLine.Option(names = {"-configOverride"}, required = false, split = ",")
   private Map<String, Object> _configOverrides = new HashMap<>();
 
   @Override
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServiceManagerCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServiceManagerCommand.java
index b3274077ac0..b211a2c0192 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServiceManagerCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServiceManagerCommand.java
@@ -198,8 +198,8 @@ public boolean execute()
         savePID(System.getProperty("java.io.tmpdir") + File.separator + pidFile);
         return true;
       }
-    } catch (Exception e) {
-      LOGGER.error("Caught exception while starting pinot service, exiting.", e);
+    } catch (Throwable t) {
+      LOGGER.error("Caught exception while starting pinot service, exiting.", t);
     }
     System.exit(-1);
     return false;
@@ -303,8 +303,8 @@ private static boolean startPinotService(Object role, Callable<String> serviceSt
       LOGGER.info("Starting a Pinot [{}] at {}s since launch", role, startOffsetSeconds());
       String instanceId = serviceStarter.call();
       LOGGER.info("Started Pinot [{}] instance [{}] at {}s since launch", role, instanceId, startOffsetSeconds());
-    } catch (Exception e) {
-      LOGGER.error(String.format("Failed to start a Pinot [%s] at %s since launch", role, startOffsetSeconds()), e);
+    } catch (Throwable t) {
+      LOGGER.error(String.format("Failed to start a Pinot [%s] at %s since launch", role, startOffsetSeconds()), t);
       return false;
     }
     return true;
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StreamGitHubEventsCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StreamGitHubEventsCommand.java
index 579dd630897..06f06f8979f 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StreamGitHubEventsCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StreamGitHubEventsCommand.java
@@ -38,37 +38,55 @@ public class StreamGitHubEventsCommand extends AbstractBaseAdminCommand implemen
   @CommandLine.Option(names = {"-personalAccessToken"}, required = true, description = "GitHub personal access token.")
   private String _personalAccessToken;
 
-  @CommandLine.Option(names = {"-sourceType"}, defaultValue = "Kafka",
-      description = "Stream DataSource to use for ingesting data. Supported values - Kafka,Kinesis")
+  @CommandLine.Option(names = {"-sourceType"}, defaultValue = "Kafka", description = "Stream DataSource to use for "
+      + "ingesting data. Supported values - Kafka,Kinesis")
   private String _sourceType;
 
-  @CommandLine.Option(names = {"-kafkaBrokerList"},
-      description = "Kafka broker list of the kafka cluster to produce events.")
+  @CommandLine.Option(names = {"-kafkaBrokerList"}, description = "Kafka broker list of the kafka cluster to produce "
+      + "events.")
   private String _kafkaBrokerList = KafkaStarterUtils.DEFAULT_KAFKA_BROKER;
 
-  @CommandLine.Option(names = {"-kinesisEndpoint"},
-      description = "Endpoint of localstack or any other Kinesis cluster when not using AWS.")
+  @CommandLine.Option(names = {"-kafkaSecurityProtocol"}, description = "Kafka security protocol "
+      + "(PLAINTEXT/SASL_SSL/etc")
+  private String _kafkaSecurityProtocol;
+
+  // Only needed when configured as SASL_SSL
+  @CommandLine.Option(names = {"-kafkaUserName"}, description = "Kafka Username")
+  private String _kafkaSaslUserName;
+
+  @CommandLine.Option(names = {"-kafkaPassword"}, description = "Kafka Password")
+  private String _kafkaSaslPassword;
+
+  @CommandLine.Option(names = {"-kinesisEndpoint"}, description = "Endpoint of localstack or any other Kinesis "
+      + "cluster when not using AWS.")
   private String _kinesisEndpoint = null;
 
   @CommandLine.Option(names = {"-awsRegion"}, description = "AWS Region in which Kinesis is located")
   private String _awsRegion = "us-east-1";
 
-  @CommandLine.Option(names = {"-awsAccessKey"}, description = "AccessKey for AWS Account.")
+  @CommandLine.Option(names = {"-awsAccessKey"}, description = "AccessKey for AWS Account")
   private String _accessKey;
 
   @CommandLine.Option(names = {"-awsSecretKey"}, description = "SecretKey for AWS Account")
   private String _secretKey;
 
-  @CommandLine.Option(names = {"-topic"}, required = true,
-      description = "Name of kafka-topic/kinesis-stream to publish events.")
+  // Pulsar related Configs
+  @CommandLine.Option(names = {"-pulsarBrokerServiceUrl"}, description = "Pulsar broker service url.")
+  private String _pulsarBrokerServiceUrl;
+
+  @CommandLine.Option(names = {"-token"}, description = "Pulsar token.")
+  private String _pulsarToken;
+
+  @CommandLine.Option(names = {"-topic"}, required = true, description = "Name of kafka-topic/kinesis-stream to "
+      + "publish events.")
   private String _topic;
 
-  @CommandLine.Option(names = {"-eventType"},
-      description = "Type of GitHub event. Supported types - pullRequestMergedEvent")
+  @CommandLine.Option(names = {"-eventType"}, description = "Type of GitHub event. Supported types - "
+      + "pullRequestMergedEvent")
   private String _eventType = PULL_REQUEST_MERGED_EVENT_TYPE;
 
   @CommandLine.Option(names = {"-schemaFile"}, description = "Path to schema file. "
-      + "By default uses examples/stream/githubEvents/pullRequestMergedEvents_schema.json")
+      + "By default uses examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_schema.json")
   private String _schemaFile;
 
   @CommandLine.Option(names = {"-help", "-h", "--h", "--help"}, help = true, description = "Print this message.")
@@ -131,9 +149,15 @@ public boolean execute()
               PullRequestMergedEventsStream.getKinesisStreamDataProducer(_kinesisEndpoint, _awsRegion, _accessKey,
                   _secretKey);
           break;
+        case PULSAR:
+          streamDataProducer =
+              PullRequestMergedEventsStream.getPulsarStreamDataProducer(_pulsarBrokerServiceUrl, _pulsarToken);
+          break;
         case KAFKA:
         default:
-          streamDataProducer = PullRequestMergedEventsStream.getKafkaStreamDataProducer(_kafkaBrokerList);
+          streamDataProducer =
+              PullRequestMergedEventsStream.getKafkaStreamDataProducer(_kafkaBrokerList, _kafkaSecurityProtocol,
+                  _kafkaSaslUserName, _kafkaSaslPassword);
           break;
       }
       PullRequestMergedEventsStream pullRequestMergedEventsStream =
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/DictionaryToRawIndexConverter.java b/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/DictionaryToRawIndexConverter.java
index fc937bc1d0b..b7723f1294a 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/DictionaryToRawIndexConverter.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/segment/converter/DictionaryToRawIndexConverter.java
@@ -32,7 +32,7 @@
 import org.apache.pinot.common.utils.TarGzCompressionUtils;
 import org.apache.pinot.segment.local.indexsegment.immutable.ImmutableSegmentLoader;
 import org.apache.pinot.segment.local.io.writer.impl.BaseChunkSVForwardIndexWriter;
-import org.apache.pinot.segment.local.segment.creator.impl.DefaultIndexCreatorProvider;
+import org.apache.pinot.segment.local.segment.index.forward.ForwardIndexCreatorFactory;
 import org.apache.pinot.segment.spi.IndexSegment;
 import org.apache.pinot.segment.spi.V1Constants;
 import org.apache.pinot.segment.spi.compression.ChunkCompressionType;
@@ -317,7 +317,7 @@ private void convertOneColumn(IndexSegment segment, String column, File newSegme
     int numDocs = segment.getSegmentMetadata().getTotalDocs();
     int lengthOfLongestEntry = (storedType == DataType.STRING) ? getLengthOfLongestEntry(dictionary) : -1;
 
-    try (ForwardIndexCreator rawIndexCreator = DefaultIndexCreatorProvider
+    try (ForwardIndexCreator rawIndexCreator = ForwardIndexCreatorFactory
         .getRawIndexCreatorForSVColumn(newSegment, compressionType, column, storedType, numDocs, lengthOfLongestEntry,
             false, BaseChunkSVForwardIndexWriter.DEFAULT_VERSION);
         ForwardIndexReaderContext readerContext = forwardIndexReader.createContext()) {
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java b/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
index c04286d1bf7..fbdfc2ebefd 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
@@ -78,7 +78,7 @@ private void setupSwagger() {
     _httpServer.getServerConfiguration().addHttpHandler(httpHandler, "/api/", "/help/");
 
     URL swaggerDistLocation = PinotServiceManagerAdminApiApplication.class.getClassLoader()
-        .getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
+        .getResource(CommonConstants.CONFIG_OF_SWAGGER_RESOURCES_PATH);
     CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new URLClassLoader(new URL[]{swaggerDistLocation}));
     _httpServer.getServerConfiguration().addHttpHandler(swaggerDist, "/swaggerui-dist/");
   }
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/streams/githubevents/PullRequestMergedEventsStream.java b/pinot-tools/src/main/java/org/apache/pinot/tools/streams/githubevents/PullRequestMergedEventsStream.java
index 950af0d260e..a13a4c6f205 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/streams/githubevents/PullRequestMergedEventsStream.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/streams/githubevents/PullRequestMergedEventsStream.java
@@ -46,6 +46,9 @@
 public class PullRequestMergedEventsStream {
   private static final Logger LOGGER = LoggerFactory.getLogger(PullRequestMergedEventsStream.class);
 
+  private static final String PULSAR_DATA_PRODUCER_CLASS_NAME =
+      "org.apache.pinot.plugin.stream.pulsar.server.PulsarDataProducer";
+
   private PinotRealtimeSource _pinotStream;
 
   public PullRequestMergedEventsStream(File schemaFile, String topicName, String personalAccessToken,
@@ -67,7 +70,8 @@ public static File getSchemaFile(String schemaFilePath) {
     try {
       if (schemaFilePath == null) {
         ClassLoader classLoader = PullRequestMergedEventsStream.class.getClassLoader();
-        URL resource = classLoader.getResource("examples/stream/githubEvents/pullRequestMergedEvents_schema.json");
+        URL resource = classLoader.getResource(
+            "examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_schema.json");
         Preconditions.checkNotNull(resource);
         pinotSchema = new File(resource.getFile());
       } else {
@@ -82,15 +86,29 @@ public static File getSchemaFile(String schemaFilePath) {
 
   public static StreamDataProducer getKafkaStreamDataProducer()
       throws Exception {
-    return getKafkaStreamDataProducer(KafkaStarterUtils.DEFAULT_KAFKA_BROKER);
+    return getKafkaStreamDataProducer(KafkaStarterUtils.DEFAULT_KAFKA_BROKER, null, null, null);
   }
 
-  public static StreamDataProducer getKafkaStreamDataProducer(String kafkaBrokerList)
+  public static StreamDataProducer getKafkaStreamDataProducer(String kafkaBrokerList, String kafkaSecurityProtocol,
+      String kafkaSaslUserName, String kafkaSaslPassword)
       throws Exception {
     Properties properties = new Properties();
     properties.put("metadata.broker.list", kafkaBrokerList);
     properties.put("serializer.class", "kafka.serializer.DefaultEncoder");
     properties.put("request.required.acks", "1");
+
+    if (StringUtils.isNotEmpty(kafkaSecurityProtocol)) {
+      properties.put("security.protocol", kafkaSecurityProtocol);
+      // If the protocol is 'SASL_SSL', fill the sasl related configs
+      if (kafkaSecurityProtocol.equals("SASL_SSL") && StringUtils.isNotEmpty(kafkaSaslUserName)
+          && StringUtils.isNotEmpty(kafkaSaslPassword)) {
+        properties.put("sasl.mechanism", "PLAIN");
+        String jaasConfig = String.format(
+            "org.apache.kafka.common.security.plain.PlainLoginModule required \n username=\"%s\" \n password=\"%s\";",
+            kafkaSaslUserName, kafkaSaslPassword);
+        properties.put("sasl.jaas.config", jaasConfig);
+      }
+    }
     return StreamDataProvider.getStreamDataProducer(KafkaStarterUtils.KAFKA_PRODUCER_CLASS_NAME, properties);
   }
 
@@ -111,6 +129,21 @@ public static StreamDataProducer getKinesisStreamDataProducer(String endpoint, S
     return StreamDataProvider.getStreamDataProducer(KinesisStarterUtils.KINESIS_PRODUCER_CLASS_NAME, properties);
   }
 
+  public static StreamDataProducer getPulsarStreamDataProducer(String brokerServiceUrl, String token)
+      throws Exception {
+    Properties properties = new Properties();
+
+    if (StringUtils.isNotEmpty(brokerServiceUrl)) {
+      properties.put("brokerServiceUrl", brokerServiceUrl);
+    }
+
+    if (StringUtils.isNotEmpty(token)) {
+      properties.put("token", token);
+    }
+
+    return StreamDataProvider.getStreamDataProducer(PULSAR_DATA_PRODUCER_CLASS_NAME, properties);
+  }
+
   public static StreamDataProducer getKinesisStreamDataProducer()
       throws Exception {
     return getKinesisStreamDataProducer("http://localhost:4566", "us-east-1", "access", "secret");
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/utils/StreamSourceType.java b/pinot-tools/src/main/java/org/apache/pinot/tools/utils/StreamSourceType.java
index 846451246c8..456d1c3268d 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/utils/StreamSourceType.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/utils/StreamSourceType.java
@@ -20,5 +20,6 @@
 
 public enum StreamSourceType {
   KAFKA,
-  KINESIS;
+  KINESIS,
+  PULSAR;
 }
diff --git a/pinot-tools/src/main/resources/appAssemblerScriptTemplate b/pinot-tools/src/main/resources/appAssemblerScriptTemplate
index e3e35e34086..f639f3d653c 100644
--- a/pinot-tools/src/main/resources/appAssemblerScriptTemplate
+++ b/pinot-tools/src/main/resources/appAssemblerScriptTemplate
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -171,12 +171,44 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
+
+jdk_version() {
+  IFS='
+'
+  # remove \r for Cygwin
+  lines=$(java -Xms32M -Xmx32M -version 2>&1 | tr '\r' '\n')
+  for line in $lines; do
+    if test -z $result && echo "$line" | grep -q 'version "'
+    then
+      ver=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
+      # on macOS, sed doesn't support '?'
+      if case $ver in "1."*) true;; *) false;; esac;
+      then
+        result=$(echo $ver | sed -e 's/1\.\([0-9]*\)\(.*\)/\1/; 1q')
+      else
+        result=$(echo $ver | sed -e 's/\([0-9]*\)\(.*\)/\1/; 1q')
+      fi
+    fi
+  done
+  unset IFS
+  echo "$result"
+}
+
 if [ -z "$JAVA_OPTS" ] ; then
   ALL_JAVA_OPTS="@EXTRA_JVM_ARGUMENTS@"
 else
   ALL_JAVA_OPTS=$JAVA_OPTS
 fi
 
+if [ "$(jdk_version)" -gt 11 ]; then
+  ALL_JAVA_OPTS="--add-opens=java.base/java.nio=ALL-UNNAMED \
+  --add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
+  --add-opens=java.base/java.lang=ALL-UNNAMED \
+  --add-opens=java.base/java.util=ALL-UNNAMED \
+  --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+  $JAVA_OPTS"
+fi
+
 if [ -z "$PLUGINS_DIR" ] ; then
   PLUGINS_DIR=$BASEDIR/plugins
 fi
diff --git a/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
index d9fbb552774..856719e0582 100644
--- a/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
+++ b/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
@@ -23,6 +23,33 @@
           "MONTH"
         ]
       }
+    },
+    {
+      "name": "ArrTimeBlk",
+      "encodingType": "DICTIONARY",
+      "indexes": {
+        "inverted": {
+          "enabled": "true"
+        }
+      },
+      "tierOverwrites": {
+        "hotTier": {
+          "encodingType": "DICTIONARY",
+          "indexes": {
+            "bloom": {
+              "enabled": "true"
+            }
+          }
+        },
+        "coldTier": {
+          "encodingType": "RAW",
+          "indexes": {
+            "text": {
+              "enabled": "true"
+            }
+          }
+        }
+      }
     }
   ],
   "tableIndexConfig": {
@@ -39,24 +66,33 @@
           "MAX__ArrDelay"
         ],
         "maxLeafRecords": 10
-      },
-      {
-        "dimensionsSplitOrder": [
-          "Carrier",
-          "CancellationCode",
-          "Origin",
-          "Dest"
-        ],
-        "skipStarNodeCreationForDimensions": [],
-        "functionColumnPairs": [
-          "MAX__CarrierDelay",
-          "AVG__CarrierDelay"
-        ],
-        "maxLeafRecords": 10
       }
     ],
     "enableDynamicStarTreeCreation": true,
-    "loadMode": "MMAP"
+    "loadMode": "MMAP",
+    "tierOverwrites": {
+      "hotTier": {
+        "starTreeIndexConfigs": [
+          {
+            "dimensionsSplitOrder": [
+              "Carrier",
+              "CancellationCode",
+              "Origin",
+              "Dest"
+            ],
+            "skipStarNodeCreationForDimensions": [],
+            "functionColumnPairs": [
+              "MAX__CarrierDelay",
+              "AVG__CarrierDelay"
+            ],
+            "maxLeafRecords": 10
+          }
+        ]
+      },
+      "coldTier": {
+        "starTreeIndexConfigs": []
+      }
+    }
   },
   "metadata": {
     "customConfigs": {}
diff --git a/pinot-tools/src/main/resources/examples/batch/colocated/userAttributes/userAttributes_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/colocated/userAttributes/userAttributes_offline_table_config.json
index d75441c1bc3..6a5aecb8688 100644
--- a/pinot-tools/src/main/resources/examples/batch/colocated/userAttributes/userAttributes_offline_table_config.json
+++ b/pinot-tools/src/main/resources/examples/batch/colocated/userAttributes/userAttributes_offline_table_config.json
@@ -3,52 +3,43 @@
   "tableType": "OFFLINE",
   "segmentsConfig": {
     "segmentPushType": "APPEND",
-    "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
-    "schemaName": "userAttributes",
-    "replication": 2,
-    "replicaGroupStrategyConfig": {
-      "partitionColumn": "userUUID",
-      "numInstancesPerPartition": 2
+    "replication": 2
+  },
+  "tenants": {
+    "broker": "DefaultTenant",
+    "server": "DefaultTenant"
+  },
+  "tableIndexConfig": {
+    "invertedIndexColumns": [
+      "userUUID"
+    ],
+    "segmentPartitionConfig": {
+      "columnPartitionMap": {
+        "userUUID": {
+          "functionName": "Murmur",
+          "numPartitions": 4
+        }
+      }
     }
   },
   "instanceAssignmentConfigMap": {
     "OFFLINE": {
       "tagPoolConfig": {
-        "tag": "DefaultTenant_OFFLINE",
-        "poolBased": false,
-        "numPools": 0
+        "tag": "DefaultTenant_OFFLINE"
       },
       "replicaGroupPartitionConfig": {
         "replicaGroupBased": true,
-        "numInstances": 0,
         "numReplicaGroups": 2,
         "numInstancesPerReplicaGroup": 2,
         "numPartitions": 2,
         "numInstancesPerPartition": 1,
-        "minimizeDataMovement": false
-      },
-      "partitionSelector": "INSTANCE_REPLICA_GROUP_PARTITION_SELECTOR"
+        "partitionColumn": "userUUID"
+      }
     }
   },
   "routing": {
     "instanceSelectorType": "multiStageReplicaGroup"
   },
-  "tenants": {
-  },
-  "tableIndexConfig": {
-    "loadMode": "HEAP",
-    "invertedIndexColumns": [
-      "userUUID"
-    ],
-    "segmentPartitionConfig": {
-      "columnPartitionMap": {
-        "userUUID": {
-          "functionName": "Murmur",
-          "numPartitions": 4
-        }
-      }
-    }
-  },
   "metadata": {
     "customConfigs": {
     }
diff --git a/pinot-tools/src/main/resources/examples/batch/colocated/userGroups/userGroups_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/colocated/userGroups/userGroups_offline_table_config.json
index 8940b06b8d1..9f7d3fd0456 100644
--- a/pinot-tools/src/main/resources/examples/batch/colocated/userGroups/userGroups_offline_table_config.json
+++ b/pinot-tools/src/main/resources/examples/batch/colocated/userGroups/userGroups_offline_table_config.json
@@ -3,21 +3,17 @@
   "tableType": "OFFLINE",
   "segmentsConfig": {
     "segmentPushType": "APPEND",
-    "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
-    "schemaName": "userGroups",
     "replication": "2",
     "replicaGroupStrategyConfig": {
       "partitionColumn": "userUUID",
       "numInstancesPerPartition": 2
     }
   },
-  "instancePartitionsMap": {
-    "OFFLINE": "userAttributes_OFFLINE"
-  },
   "tenants": {
+    "broker": "DefaultTenant",
+    "server": "DefaultTenant"
   },
   "tableIndexConfig": {
-    "loadMode": "HEAP",
     "invertedIndexColumns": [
       "userUUID",
       "groupUUID"
@@ -31,6 +27,9 @@
       }
     }
   },
+  "instancePartitionsMap": {
+    "OFFLINE": "userAttributes_OFFLINE"
+  },
   "routing": {
     "instanceSelectorType": "multiStageReplicaGroup"
   },
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/customer/customer_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/customer/customer_offline_table_config.json
new file mode 100644
index 00000000000..a8f954ca5dc
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/customer/customer_offline_table_config.json
@@ -0,0 +1,27 @@
+{
+  "tableName": "customer",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "customer"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+      "c_comment"
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/customer/customer_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/customer/customer_schema.json
new file mode 100644
index 00000000000..da08354f1eb
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/customer/customer_schema.json
@@ -0,0 +1,39 @@
+{
+  "schemaName": "customer",
+  "metricFieldSpecs": [
+    {
+      "dataType": "DOUBLE",
+      "name": "c_acctbal"
+    }
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "c_custkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "c_name"
+    },
+    {
+      "dataType": "STRING",
+      "name": "c_address"
+    },
+    {
+      "dataType": "INT",
+      "name": "c_nationkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "c_phone"
+    },
+    {
+      "dataType": "STRING",
+      "name": "c_mktsegment"
+    },
+    {
+      "dataType": "STRING",
+      "name": "c_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/customer/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/customer/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..2297e8ed6a7
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/customer/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/customer/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/customer/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'customer'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/customer/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/customer'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/customer/rawdata/customer.avro b/pinot-tools/src/main/resources/examples/batch/tpch/customer/rawdata/customer.avro
new file mode 100644
index 00000000000..f446eef075e
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/customer/rawdata/customer.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..13bf410ece7
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/lineitem/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/lineitem/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'lineitem'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/lineitem/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/lineitem'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/lineitem_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/lineitem_offline_table_config.json
new file mode 100644
index 00000000000..84ecc8ab002
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/lineitem_offline_table_config.json
@@ -0,0 +1,26 @@
+{
+  "tableName": "lineitem",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "lineitem"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/lineitem_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/lineitem_schema.json
new file mode 100644
index 00000000000..4a2ae474cfb
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/lineitem_schema.json
@@ -0,0 +1,71 @@
+{
+  "schemaName": "lineitem",
+  "metricFieldSpecs": [
+    {
+      "dataType": "DOUBLE",
+      "name": "l_extendedprice"
+    },
+    {
+      "dataType": "DOUBLE",
+      "name": "l_tax"
+    },
+    {
+      "dataType": "DOUBLE",
+      "name": "l_discount"
+    }
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "l_orderkey"
+    },
+    {
+      "dataType": "INT",
+      "name": "l_partkey"
+    },
+    {
+      "dataType": "INT",
+      "name": "l_suppkey"
+    },
+    {
+      "dataType": "INT",
+      "name": "l_linenumber"
+    },
+    {
+      "dataType": "INT",
+      "name": "l_quantity"
+    },
+    {
+      "dataType": "STRING",
+      "name": "l_returnflag"
+    },
+    {
+      "dataType": "STRING",
+      "name": "l_linestatus"
+    },
+    {
+      "dataType": "LONG",
+      "name": "l_shipdate"
+    },
+    {
+      "dataType": "LONG",
+      "name": "l_commitdate"
+    },
+    {
+      "dataType": "LONG",
+      "name": "l_receiptdate"
+    },
+    {
+      "dataType": "STRING",
+      "name": "l_shipinstruct"
+    },
+    {
+      "dataType": "STRING",
+      "name": "l_shipmode"
+    },
+    {
+      "dataType": "STRING",
+      "name": "l_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/rawdata/lineitem.avro b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/rawdata/lineitem.avro
new file mode 100644
index 00000000000..fa68458255c
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/lineitem/rawdata/lineitem.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/nation/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/nation/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..fd5d608610a
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/nation/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/nation/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/nation/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'nation'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/nation/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/nation'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/nation/nation_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/nation/nation_offline_table_config.json
new file mode 100644
index 00000000000..f8bab64048c
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/nation/nation_offline_table_config.json
@@ -0,0 +1,27 @@
+{
+  "tableName": "nation",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "nation"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+      "n_comment"
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/nation/nation_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/nation/nation_schema.json
new file mode 100644
index 00000000000..a69f08d10b6
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/nation/nation_schema.json
@@ -0,0 +1,23 @@
+{
+  "schemaName": "nation",
+  "metricFieldSpecs": [
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "n_nationkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "n_name"
+    },
+    {
+      "dataType": "INT",
+      "name": "n_regionkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "n_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/nation/rawdata/nation.avro b/pinot-tools/src/main/resources/examples/batch/tpch/nation/rawdata/nation.avro
new file mode 100644
index 00000000000..12cb1fc805f
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/nation/rawdata/nation.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/orders/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/orders/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..ac0412a54dc
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/orders/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/orders/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/orders/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'orders'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/orders/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/orders'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/orders/orders_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/orders/orders_offline_table_config.json
new file mode 100644
index 00000000000..80c4e5c2d98
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/orders/orders_offline_table_config.json
@@ -0,0 +1,34 @@
+{
+  "tableName": "orders",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "orders"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+      "o_orderkey",
+      "o_custkey",
+      "o_orderstatus",
+      "o_orderdate",
+      "o_orderpriority",
+      "o_clerk",
+      "o_shippriority"
+    ],
+    "noDictionaryColumns": [
+      "o_comment"
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/orders/orders_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/orders/orders_schema.json
new file mode 100644
index 00000000000..6efde76bedf
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/orders/orders_schema.json
@@ -0,0 +1,43 @@
+{
+  "schemaName": "orders",
+  "metricFieldSpecs": [
+    {
+      "dataType": "DOUBLE",
+      "name": "o_totalprice"
+    }
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "o_orderkey"
+    },
+    {
+      "dataType": "INT",
+      "name": "o_custkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "o_orderstatus"
+    },
+    {
+      "dataType": "LONG",
+      "name": "o_orderdate"
+    },
+    {
+      "dataType": "STRING",
+      "name": "o_orderpriority"
+    },
+    {
+      "dataType": "STRING",
+      "name": "o_clerk"
+    },
+    {
+      "dataType": "STRING",
+      "name": "o_shippriority"
+    },
+    {
+      "dataType": "STRING",
+      "name": "o_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/orders/rawdata/orders.avro b/pinot-tools/src/main/resources/examples/batch/tpch/orders/rawdata/orders.avro
new file mode 100644
index 00000000000..003f91eb205
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/orders/rawdata/orders.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/part/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/part/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..02e62bef06c
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/part/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/part/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/part/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'part'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/part/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/part'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/part/part_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/part/part_offline_table_config.json
new file mode 100644
index 00000000000..19b76f90c31
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/part/part_offline_table_config.json
@@ -0,0 +1,27 @@
+{
+  "tableName": "part",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "part"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+      "p_comment"
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/part/part_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/part/part_schema.json
new file mode 100644
index 00000000000..cebdf93a798
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/part/part_schema.json
@@ -0,0 +1,43 @@
+{
+  "schemaName": "part",
+  "metricFieldSpecs": [
+    {
+      "dataType": "DOUBLE",
+      "name": "p_retailprice"
+    }
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "p_partkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "p_name"
+    },
+    {
+      "dataType": "STRING",
+      "name": "p_mfgr"
+    },
+    {
+      "dataType": "STRING",
+      "name": "p_brand"
+    },
+    {
+      "dataType": "STRING",
+      "name": "p_type"
+    },
+    {
+      "dataType": "INT",
+      "name": "p_size"
+    },
+    {
+      "dataType": "STRING",
+      "name": "p_container"
+    },
+    {
+      "dataType": "STRING",
+      "name": "p_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/part/rawdata/part.avro b/pinot-tools/src/main/resources/examples/batch/tpch/part/rawdata/part.avro
new file mode 100644
index 00000000000..ae74dfa2893
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/part/rawdata/part.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..4189f91967f
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/partsupp/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/partsupp/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'partsupp'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/partsupp/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/partsupp'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/partsupp_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/partsupp_offline_table_config.json
new file mode 100644
index 00000000000..f7d32c5206c
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/partsupp_offline_table_config.json
@@ -0,0 +1,27 @@
+{
+  "tableName": "partsupp",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "partsupp"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+      "ps_comment"
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/partsupp_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/partsupp_schema.json
new file mode 100644
index 00000000000..c07c56baec9
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/partsupp_schema.json
@@ -0,0 +1,28 @@
+{
+  "schemaName": "partsupp",
+  "metricFieldSpecs": [
+    {
+      "dataType": "DOUBLE",
+      "name": "ps_supplycost"
+    }
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "ps_partkey"
+    },
+    {
+      "dataType": "INT",
+      "name": "ps_suppkey"
+    },
+    {
+      "dataType": "INT",
+      "name": "ps_availqty"
+    },
+    {
+      "dataType": "STRING",
+      "name": "ps_comment",
+      "maxLength": 4096
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/rawdata/partsupp.avro b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/rawdata/partsupp.avro
new file mode 100644
index 00000000000..83e846fba29
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/partsupp/rawdata/partsupp.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/region/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/region/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..a94d6a778cd
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/region/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/region/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/region/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'region'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/region/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/region'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/region/rawdata/region.avro b/pinot-tools/src/main/resources/examples/batch/tpch/region/rawdata/region.avro
new file mode 100644
index 00000000000..f8ac435feb8
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/region/rawdata/region.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/region/region_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/region/region_offline_table_config.json
new file mode 100644
index 00000000000..88d62a83158
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/region/region_offline_table_config.json
@@ -0,0 +1,26 @@
+{
+  "tableName": "region",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "region"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/region/region_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/region/region_schema.json
new file mode 100644
index 00000000000..e1cc5728fdd
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/region/region_schema.json
@@ -0,0 +1,19 @@
+{
+  "schemaName": "region",
+  "metricFieldSpecs": [
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "r_regionkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "r_name"
+    },
+    {
+      "dataType": "STRING",
+      "name": "r_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/supplier/ingestionJobSpec.yaml b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/ingestionJobSpec.yaml
new file mode 100644
index 00000000000..e25baeb6e68
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/ingestionJobSpec.yaml
@@ -0,0 +1,119 @@
+#
+# 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.
+#
+
+# executionFrameworkSpec: Defines ingestion jobs to be running.
+executionFrameworkSpec:
+
+  # name: execution framework name
+  name: 'standalone'
+
+  # Class to use for segment generation and different push types.
+  segmentGenerationJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentGenerationJobRunner'
+  segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
+  segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
+  segmentMetadataPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentMetadataPushJobRunner'
+
+
+# jobType: Pinot ingestion job type.
+# Supported job types are defined in PinotIngestionJobType class.
+#   'SegmentCreation'
+#   'SegmentTarPush'
+#   'SegmentUriPush'
+#   'SegmentMetadataPush'
+#   'SegmentCreationAndTarPush'
+#   'SegmentCreationAndUriPush'
+#   'SegmentCreationAndMetadataPush'
+jobType: SegmentCreationAndTarPush
+
+# inputDirURI: Root directory of input data, expected to have scheme configured in PinotFS.
+inputDirURI: 'examples/batch/tpch/supplier/rawdata'
+
+# includeFileNamePattern: include file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will include all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will include all the avro files under inputDirURI recursively.
+includeFileNamePattern: 'glob:**/*.avro'
+
+# excludeFileNamePattern: exclude file name pattern, supported glob pattern.
+# Sample usage:
+#   'glob:*.avro' will exclude all avro files just under the inputDirURI, not sub directories;
+#   'glob:**/*.avro' will exclude all the avro files under inputDirURI recursively.
+# _excludeFileNamePattern: ''
+
+# outputDirURI: Root directory of output segments, expected to have scheme configured in PinotFS.
+outputDirURI: 'examples/batch/tpch/supplier/segments'
+
+# overwriteOutput: Overwrite output segments if existed.
+overwriteOutput: true
+
+# pinotFSSpecs: defines all related Pinot file systems.
+pinotFSSpecs:
+
+  - # scheme: used to identify a PinotFS.
+    # E.g. local, hdfs, dbfs, etc
+    scheme: file
+
+    # className: Class name used to create the PinotFS instance.
+    # E.g.
+    #   org.apache.pinot.spi.filesystem.LocalPinotFS is used for local filesystem
+    #   org.apache.pinot.plugin.filesystem.AzurePinotFS is used for Azure Data Lake
+    #   org.apache.pinot.plugin.filesystem.HadoopPinotFS is used for HDFS
+    className: org.apache.pinot.spi.filesystem.LocalPinotFS
+
+# recordReaderSpec: defines all record reader
+recordReaderSpec:
+  dataFormat: 'avro'
+  className: 'org.apache.pinot.plugin.inputformat.avro.AvroRecordReader'
+
+
+# tableSpec: defines table name and where to fetch corresponding table config and table schema.
+tableSpec:
+
+  # tableName: Table name
+  tableName: 'supplier'
+
+  # schemaURI: defines where to read the table schema, supports PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_schema.json
+  #   http://localhost:9000/tables/myTable/schema
+  schemaURI: 'http://localhost:9000/tables/supplier/schema'
+
+  # tableConfigURI: defines where to reade the table config.
+  # Supports using PinotFS or HTTP.
+  # E.g.
+  #   hdfs://path/to/table_config.json
+  #   http://localhost:9000/tables/myTable
+  # Note that the API to read Pinot table config directly from pinot controller contains a JSON wrapper.
+  # The real table config is the object under the field 'OFFLINE'.
+  tableConfigURI: 'http://localhost:9000/tables/supplier'
+
+# pinotClusterSpecs: defines the Pinot Cluster Access Point.
+pinotClusterSpecs:
+  - # controllerURI: used to fetch table/schema information and data push.
+    # E.g. http://localhost:9000
+    controllerURI: 'http://localhost:9000'
+
+# pushJobSpec: defines segment push job related configuration.
+pushJobSpec:
+
+  # pushAttempts: number of attempts for push job, default is 1, which means no retry.
+  pushAttempts: 2
+
+  # pushRetryIntervalMillis: retry wait Ms, default to 1 second.
+  pushRetryIntervalMillis: 1000
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/supplier/rawdata/supplier.avro b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/rawdata/supplier.avro
new file mode 100644
index 00000000000..0961696e694
Binary files /dev/null and b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/rawdata/supplier.avro differ
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/supplier/supplier_offline_table_config.json b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/supplier_offline_table_config.json
new file mode 100644
index 00000000000..adeaaa5d06c
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/supplier_offline_table_config.json
@@ -0,0 +1,26 @@
+{
+  "tableName": "supplier",
+  "tableType": "OFFLINE",
+  "tenants": {
+  },
+  "segmentsConfig": {
+    "segmentPushType": "REFRESH",
+    "replication": "1",
+    "schemaName": "supplier"
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+    ],
+    "noDictionaryColumns": [
+    ]
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+    ]
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/batch/tpch/supplier/supplier_schema.json b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/supplier_schema.json
new file mode 100644
index 00000000000..69227960e31
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/batch/tpch/supplier/supplier_schema.json
@@ -0,0 +1,35 @@
+{
+  "schemaName": "supplier",
+  "metricFieldSpecs": [
+    {
+      "dataType": "DOUBLE",
+      "name": "s_acctbal"
+    }
+  ],
+  "dimensionFieldSpecs": [
+    {
+      "dataType": "INT",
+      "name": "s_suppkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "s_name"
+    },
+    {
+      "dataType": "STRING",
+      "name": "s_address"
+    },
+    {
+      "dataType": "INT",
+      "name": "s_nationkey"
+    },
+    {
+      "dataType": "STRING",
+      "name": "s_phone"
+    },
+    {
+      "dataType": "STRING",
+      "name": "s_comment"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_offline_table_config.json b/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_offline_table_config.json
index 3d9b581d32e..6147573fa6e 100644
--- a/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_offline_table_config.json
+++ b/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_offline_table_config.json
@@ -3,8 +3,6 @@
   "tableType": "OFFLINE",
   "segmentsConfig": {
     "timeColumnName": "created_at_timestamp",
-    "retentionTimeUnit": "DAYS",
-    "retentionTimeValue": "365",
     "segmentPushType": "APPEND",
     "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
     "schemaName": "githubEvents",
diff --git a/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_realtime_table_config.json b/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_realtime_table_config.json
index 5a3550f297d..fef0efb7227 100644
--- a/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_realtime_table_config.json
+++ b/pinot-tools/src/main/resources/examples/minions/stream/githubEvents/githubEvents_realtime_table_config.json
@@ -3,8 +3,6 @@
   "tableType": "REALTIME",
   "segmentsConfig": {
     "timeColumnName": "created_at_timestamp",
-    "retentionTimeUnit": "DAYS",
-    "retentionTimeValue": "365",
     "segmentPushType": "APPEND",
     "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
     "schemaName": "githubEvents",
diff --git a/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
index 94da8849f2a..4d227d6c77e 100644
--- a/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
+++ b/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
@@ -12,6 +12,11 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
+  "routing": {
+    "segmentPrunerTypes": [
+      "time"
+    ]
+  },
   "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/githubEvents_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/githubEvents/githubEvents_realtime_table_config.json
new file mode 100644
index 00000000000..22047712568
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/stream/githubEvents/githubEvents_realtime_table_config.json
@@ -0,0 +1,45 @@
+{
+  "tableName": "githubEvents",
+  "tableType": "REALTIME",
+  "segmentsConfig": {
+    "timeColumnName": "created_at_timestamp",
+    "segmentPushType": "APPEND",
+    "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
+    "schemaName": "githubEvents",
+    "replication": "1",
+    "replicasPerPartition": "1"
+  },
+  "tenants": {
+  },
+  "ingestionConfig": {
+    "transformConfigs": [
+      {
+        "columnName": "created_at_timestamp",
+        "transformFunction": "fromDateTime(created_at, 'yyyy-MM-dd''T''HH:mm:ssZ')"
+      }
+    ]
+  },
+  "tableIndexConfig": {
+    "loadMode": "MMAP",
+    "invertedIndexColumns": [
+      "id"
+    ],
+    "segmentNameGeneratorType": "normalizedDate",
+    "streamConfigs": {
+      "streamType": "kafka",
+      "stream.kafka.consumer.type": "simple",
+      "stream.kafka.topic.name": "githubEvents",
+      "stream.kafka.decoder.class.name": "org.apache.pinot.plugin.stream.kafka.KafkaJSONMessageDecoder",
+      "stream.kafka.consumer.factory.class.name": "org.apache.pinot.plugin.stream.kafka20.KafkaConsumerFactory",
+      "stream.kafka.zk.broker.url": "localhost:2191/kafka",
+      "stream.kafka.broker.list": "localhost:19092",
+      "realtime.segment.flush.threshold.time": "1h",
+      "realtime.segment.flush.threshold.size": "100",
+      "stream.kafka.consumer.prop.auto.offset.reset": "smallest"
+    }
+  },
+  "metadata": {
+    "customConfigs": {
+    }
+  }
+}
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/githubEvents_schema.json b/pinot-tools/src/main/resources/examples/stream/githubEvents/githubEvents_schema.json
new file mode 100644
index 00000000000..51bd58c79cc
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/stream/githubEvents/githubEvents_schema.json
@@ -0,0 +1,27 @@
+{
+  "schemaName": "githubEvents",
+  "dimensionFieldSpecs": [
+    {
+      "name": "id",
+      "dataType": "STRING"
+    },
+    {
+      "name": "type",
+      "dataType": "STRING"
+    }
+  ],
+  "dateTimeFieldSpecs": [
+    {
+      "name": "created_at",
+      "dataType": "STRING",
+      "format": "1:SECONDS:SIMPLE_DATE_FORMAT:yyyy-MM-dd'T'HH:mm:ssZ",
+      "granularity": "1:HOURS"
+    },
+    {
+      "name": "created_at_timestamp",
+      "dataType": "TIMESTAMP",
+      "format": "1:MILLISECONDS:TIMESTAMP",
+      "granularity": "1:SECONDS"
+    }
+  ]
+}
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/rawdata/2021-07-21-few-hours.json b/pinot-tools/src/main/resources/examples/stream/githubEvents/rawdata/2021-07-21-few-hours.json
new file mode 100644
index 00000000000..fb50dae2d8a
--- /dev/null
+++ b/pinot-tools/src/main/resources/examples/stream/githubEvents/rawdata/2021-07-21-few-hours.json
@@ -0,0 +1,800 @@
+{"id":"17244207336","type":"DeleteEvent","actor":{"id":71354125,"login":"aws-connector-for-github[bot]","display_login":"aws-connector-for-github","gravatar_id":"","url":"https://api.github.com/users/aws-connector-for-github[bot]","avatar_url":"https://avatars.githubusercontent.com/u/71354125?"},"repo":{"id":318651349,"name":"bullet-dev-team/python-pyramid-public","url":"https://api.github.com/repos/bullet-dev-team/python-pyramid-public"},"payload":{"ref":"cicd-e2e-g1szrn","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207337","type":"CreateEvent","actor":{"id":33440610,"login":"jwhan77","display_login":"jwhan77","gravatar_id":"","url":"https://api.github.com/users/jwhan77","avatar_url":"https://avatars.githubusercontent.com/u/33440610?"},"repo":{"id":379773947,"name":"RobolinkInc/Zumi_Content_Chinese","url":"https://api.github.com/repos/RobolinkInc/Zumi_Content_Chinese"},"payload":{"ref":"1.71","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z","org":{"id":39782173,"login":"RobolinkInc","gravatar_id":"","url":"https://api.github.com/orgs/RobolinkInc","avatar_url":"https://avatars.githubusercontent.com/u/39782173?"}}
+{"id":"17244207339","type":"CreateEvent","actor":{"id":87748029,"login":"24BBBB","display_login":"24BBBB","gravatar_id":"","url":"https://api.github.com/users/24BBBB","avatar_url":"https://avatars.githubusercontent.com/u/87748029?"},"repo":{"id":388010493,"name":"24BBBB/BOSSBOT","url":"https://api.github.com/repos/24BBBB/BOSSBOT"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207340","type":"PushEvent","actor":{"id":87747503,"login":"thetishemedia","display_login":"thetishemedia","gravatar_id":"","url":"https://api.github.com/users/thetishemedia","avatar_url":"https://avatars.githubusercontent.com/u/87747503?"},"repo":{"id":388007075,"name":"thetishemedia/thetishemedia.github.io","url":"https://api.github.com/repos/thetishemedia/thetishemedia.github.io"},"payload":{"push_id":7561414800,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"437b1d8e604a352706d890784fff12409083d382","before":"44022521dad544dc159118c82ee8c87f3f6d131b","commits":[{"sha":"437b1d8e604a352706d890784fff12409083d382","author":{"name":"thetishemedia","email":"15d8c3070dffc755df9ea39fc7c0c8fcb59772c5@users.noreply.github.com"},"message":"Delete img directory","distinct":true,"url":"https://api.github.com/repos/thetishemedia/thetishemedia.github.io/commits/437b1d8e604a352706d890784fff12409083d382"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207342","type":"PushEvent","actor":{"id":737767,"login":"LeSuisse","display_login":"LeSuisse","gravatar_id":"","url":"https://api.github.com/users/LeSuisse","avatar_url":"https://avatars.githubusercontent.com/u/737767?"},"repo":{"id":187371359,"name":"Enalean/php-prometheus-client","url":"https://api.github.com/repos/Enalean/php-prometheus-client"},"payload":{"push_id":7561414809,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"58621053aeb50947c477c66e26d28ae18d917960","before":"adf23d2d203a60ffceac252184a5834c52130756","commits":[{"sha":"58621053aeb50947c477c66e26d28ae18d917960","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump phpstan/phpstan from 0.12.92 to 0.12.93\n\nBumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.92 to 0.12.93.\n- [Release notes](https://github.com/phpstan/phpstan/releases)\n- [Commits](https://github.com/phpstan/phpstan/compare/0.12.92...0.12.93)\n\n---\nupdated-dependencies:\n- dependency-name: phpstan/phpstan\n  dependency-type: direct:development\n  update-type: version-update:semver-patch\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":true,"url":"https://api.github.com/repos/Enalean/php-prometheus-client/commits/58621053aeb50947c477c66e26d28ae18d917960"}]},"public":true,"created_at":"2021-07-21T06:00:00Z","org":{"id":1095084,"login":"Enalean","gravatar_id":"","url":"https://api.github.com/orgs/Enalean","avatar_url":"https://avatars.githubusercontent.com/u/1095084?"}}
+{"id":"17244207343","type":"PushEvent","actor":{"id":6077080,"login":"paperdev","display_login":"paperdev","gravatar_id":"","url":"https://api.github.com/users/paperdev","avatar_url":"https://avatars.githubusercontent.com/u/6077080?"},"repo":{"id":388008661,"name":"paperdev/paper.github.io","url":"https://api.github.com/repos/paperdev/paper.github.io"},"payload":{"push_id":7561414806,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"17c0bfa6d38298904d17ba1ab5eed440cedd2fda","before":"fca355cdeff74d20d608b8c27390b28786756528","commits":[{"sha":"17c0bfa6d38298904d17ba1ab5eed440cedd2fda","author":{"name":"Kevin","email":"5445649e0375a9b2afd76dbe937bb16d094ce1c0@gmail.com"},"message":"Set theme jekyll-theme-minimal","distinct":true,"url":"https://api.github.com/repos/paperdev/paper.github.io/commits/17c0bfa6d38298904d17ba1ab5eed440cedd2fda"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207355","type":"PushEvent","actor":{"id":54515587,"login":"DarshanaVithanage","display_login":"DarshanaVithanage","gravatar_id":"","url":"https://api.github.com/users/DarshanaVithanage","avatar_url":"https://avatars.githubusercontent.com/u/54515587?"},"repo":{"id":309269609,"name":"Aero-Travel-Solutions/sabre-webtop-ticketing-service","url":"https://api.github.com/repos/Aero-Travel-Solutions/sabre-webtop-ticketing-service"},"payload":{"push_id":7561414799,"size":1,"distinct_size":1,"ref":"refs/heads/develop","head":"fce91d6eee9fdbe70e5758eb998b14402856d422","before":"3035dbe65923cd3fd1e4af39b46afbf23971d069","commits":[{"sha":"fce91d6eee9fdbe70e5758eb998b14402856d422","author":{"name":"darshana.vithanage@aeronology.travel","email":"f39e8f5ba9764c01c5459869d1ea7cea73e08cd6@aeronology.travel"},"message":"update","distinct":true,"url":"https://api.github.com/repos/Aero-Travel-Solutions/sabre-webtop-ticketing-service/commits/fce91d6eee9fdbe70e5758eb998b14402856d422"}]},"public":true,"created_at":"2021-07-21T06:00:00Z","org":{"id":54561253,"login":"Aero-Travel-Solutions","gravatar_id":"","url":"https://api.github.com/orgs/Aero-Travel-Solutions","avatar_url":"https://avatars.githubusercontent.com/u/54561253?"}}
+{"id":"17244207357","type":"PullRequestEvent","actor":{"id":20798510,"login":"jthegedus","display_login":"jthegedus","gravatar_id":"","url":"https://api.github.com/users/jthegedus","avatar_url":"https://avatars.githubusercontent.com/u/20798510?"},"repo":{"id":326604100,"name":"jthegedus/svelte-adapter-firebase","url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase"},"payload":{"action":"closed","number":120,"pull_request":{"url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/120","id":694073641,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczNjQx","html_url":"https://github.com/jthegedus/svelte-adapter-firebase/pull/120","diff_url":"https://github.com/jthegedus/svelte-adapter-firebase/pull/120.diff","patch_url":"https://github.com/jthegedus/svelte-adapter-firebase/pull/120.patch","issue_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/120","number":120,"state":"closed","locked":false,"title":"chore: release 0.10.5","user":{"login":"github-actions[bot]","id":41898282,"node_id":"MDM6Qm90NDE4OTgyODI=","avatar_url":"https://avatars.githubusercontent.com/in/15368?v=4","gravatar_id":"","url":"https://api.github.com/users/github-actions%5Bbot%5D","html_url":"https://github.com/apps/github-actions","followers_url":"https://api.github.com/users/github-actions%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-actions%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-actions%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-actions%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-actions%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":":robot: I have created a release \\*beep\\* \\*boop\\*\n---\n### [0.10.5](https://www.github.com/jthegedus/svelte-adapter-firebase/compare/v0.10.4...v0.10.5) (2021-07-21)\n\n\n### Bug Fixes\n\n* document potential Cloud Run deprecation ([#119](https://www.github.com/jthegedus/svelte-adapter-firebase/issues/119)) ([ac8cd74](https://www.github.com/jthegedus/svelte-adapter-firebase/commit/ac8cd745632f4d0f63d116dd6ea0aedf4d7178ab))\n---\n\n\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).","created_at":"2021-07-21T05:59:14Z","updated_at":"2021-07-21T05:59:59Z","closed_at":"2021-07-21T05:59:59Z","merged_at":"2021-07-21T05:59:59Z","merge_commit_sha":"3f2ac17efb3b65b4a40d25d94b01dcbdcc84d286","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3184575526,"node_id":"MDU6TGFiZWwzMTg0NTc1NTI2","url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/labels/autorelease:%20pending","name":"autorelease: pending","color":"ededed","default":false,"description":null}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/120/commits","review_comments_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/120/comments","review_comment_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/120/comments","statuses_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/statuses/79a5f8b1c60ffa50a07b652b86bb6911badb8d58","head":{"label":"jthegedus:release-v0.10.5","ref":"release-v0.10.5","sha":"79a5f8b1c60ffa50a07b652b86bb6911badb8d58","user":{"login":"jthegedus","id":20798510,"node_id":"MDQ6VXNlcjIwNzk4NTEw","avatar_url":"https://avatars.githubusercontent.com/u/20798510?v=4","gravatar_id":"","url":"https://api.github.com/users/jthegedus","html_url":"https://github.com/jthegedus","followers_url":"https://api.github.com/users/jthegedus/followers","following_url":"https://api.github.com/users/jthegedus/following{/other_user}","gists_url":"https://api.github.com/users/jthegedus/gists{/gist_id}","starred_url":"https://api.github.com/users/jthegedus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jthegedus/subscriptions","organizations_url":"https://api.github.com/users/jthegedus/orgs","repos_url":"https://api.github.com/users/jthegedus/repos","events_url":"https://api.github.com/users/jthegedus/events{/privacy}","received_events_url":"https://api.github.com/users/jthegedus/received_events","type":"User","site_admin":false},"repo":{"id":326604100,"node_id":"MDEwOlJlcG9zaXRvcnkzMjY2MDQxMDA=","name":"svelte-adapter-firebase","full_name":"jthegedus/svelte-adapter-firebase","private":false,"owner":{"login":"jthegedus","id":20798510,"node_id":"MDQ6VXNlcjIwNzk4NTEw","avatar_url":"https://avatars.githubusercontent.com/u/20798510?v=4","gravatar_id":"","url":"https://api.github.com/users/jthegedus","html_url":"https://github.com/jthegedus","followers_url":"https://api.github.com/users/jthegedus/followers","following_url":"https://api.github.com/users/jthegedus/following{/other_user}","gists_url":"https://api.github.com/users/jthegedus/gists{/gist_id}","starred_url":"https://api.github.com/users/jthegedus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jthegedus/subscriptions","organizations_url":"https://api.github.com/users/jthegedus/orgs","repos_url":"https://api.github.com/users/jthegedus/repos","events_url":"https://api.github.com/users/jthegedus/events{/privacy}","received_events_url":"https://api.github.com/users/jthegedus/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jthegedus/svelte-adapter-firebase","description":"SvelteKit adapter for Firebase Hosting rewrites to either Cloud Functions or Cloud Run for a Svelte SSR experience","fork":false,"url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase","forks_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/forks","keys_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/teams","hooks_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/hooks","issue_events_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/events{/number}","events_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/events","assignees_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/assignees{/user}","branches_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/branches{/branch}","tags_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/tags","blobs_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/refs{/sha}","trees_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/statuses/{sha}","languages_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/languages","stargazers_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/stargazers","contributors_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/contributors","subscribers_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/subscribers","subscription_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/subscription","commits_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/commits{/sha}","git_commits_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/commits{/sha}","comments_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/comments{/number}","issue_comment_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/comments{/number}","contents_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/contents/{+path}","compare_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/merges","archive_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/downloads","issues_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues{/number}","pulls_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls{/number}","milestones_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/milestones{/number}","notifications_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/labels{/name}","releases_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/releases{/id}","deployments_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/deployments","created_at":"2021-01-04T07:32:34Z","updated_at":"2021-07-21T05:58:51Z","pushed_at":"2021-07-21T05:59:59Z","git_url":"git://github.com/jthegedus/svelte-adapter-firebase.git","ssh_url":"git@github.com:jthegedus/svelte-adapter-firebase.git","clone_url":"https://github.com/jthegedus/svelte-adapter-firebase.git","svn_url":"https://github.com/jthegedus/svelte-adapter-firebase","homepage":"https://github.com/jthegedus/svelte-adapter-firebase","size":1675,"stargazers_count":47,"watchers_count":47,"language":"JavaScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":8,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":10,"open_issues":8,"watchers":47,"default_branch":"main"}},"base":{"label":"jthegedus:main","ref":"main","sha":"ac8cd745632f4d0f63d116dd6ea0aedf4d7178ab","user":{"login":"jthegedus","id":20798510,"node_id":"MDQ6VXNlcjIwNzk4NTEw","avatar_url":"https://avatars.githubusercontent.com/u/20798510?v=4","gravatar_id":"","url":"https://api.github.com/users/jthegedus","html_url":"https://github.com/jthegedus","followers_url":"https://api.github.com/users/jthegedus/followers","following_url":"https://api.github.com/users/jthegedus/following{/other_user}","gists_url":"https://api.github.com/users/jthegedus/gists{/gist_id}","starred_url":"https://api.github.com/users/jthegedus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jthegedus/subscriptions","organizations_url":"https://api.github.com/users/jthegedus/orgs","repos_url":"https://api.github.com/users/jthegedus/repos","events_url":"https://api.github.com/users/jthegedus/events{/privacy}","received_events_url":"https://api.github.com/users/jthegedus/received_events","type":"User","site_admin":false},"repo":{"id":326604100,"node_id":"MDEwOlJlcG9zaXRvcnkzMjY2MDQxMDA=","name":"svelte-adapter-firebase","full_name":"jthegedus/svelte-adapter-firebase","private":false,"owner":{"login":"jthegedus","id":20798510,"node_id":"MDQ6VXNlcjIwNzk4NTEw","avatar_url":"https://avatars.githubusercontent.com/u/20798510?v=4","gravatar_id":"","url":"https://api.github.com/users/jthegedus","html_url":"https://github.com/jthegedus","followers_url":"https://api.github.com/users/jthegedus/followers","following_url":"https://api.github.com/users/jthegedus/following{/other_user}","gists_url":"https://api.github.com/users/jthegedus/gists{/gist_id}","starred_url":"https://api.github.com/users/jthegedus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jthegedus/subscriptions","organizations_url":"https://api.github.com/users/jthegedus/orgs","repos_url":"https://api.github.com/users/jthegedus/repos","events_url":"https://api.github.com/users/jthegedus/events{/privacy}","received_events_url":"https://api.github.com/users/jthegedus/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jthegedus/svelte-adapter-firebase","description":"SvelteKit adapter for Firebase Hosting rewrites to either Cloud Functions or Cloud Run for a Svelte SSR experience","fork":false,"url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase","forks_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/forks","keys_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/teams","hooks_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/hooks","issue_events_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/events{/number}","events_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/events","assignees_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/assignees{/user}","branches_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/branches{/branch}","tags_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/tags","blobs_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/refs{/sha}","trees_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/statuses/{sha}","languages_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/languages","stargazers_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/stargazers","contributors_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/contributors","subscribers_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/subscribers","subscription_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/subscription","commits_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/commits{/sha}","git_commits_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/git/commits{/sha}","comments_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/comments{/number}","issue_comment_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/comments{/number}","contents_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/contents/{+path}","compare_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/merges","archive_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/downloads","issues_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues{/number}","pulls_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls{/number}","milestones_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/milestones{/number}","notifications_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/labels{/name}","releases_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/releases{/id}","deployments_url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/deployments","created_at":"2021-01-04T07:32:34Z","updated_at":"2021-07-21T05:58:51Z","pushed_at":"2021-07-21T05:59:59Z","git_url":"git://github.com/jthegedus/svelte-adapter-firebase.git","ssh_url":"git@github.com:jthegedus/svelte-adapter-firebase.git","clone_url":"https://github.com/jthegedus/svelte-adapter-firebase.git","svn_url":"https://github.com/jthegedus/svelte-adapter-firebase","homepage":"https://github.com/jthegedus/svelte-adapter-firebase","size":1675,"stargazers_count":47,"watchers_count":47,"language":"JavaScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":8,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":10,"open_issues":8,"watchers":47,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/120"},"html":{"href":"https://github.com/jthegedus/svelte-adapter-firebase/pull/120"},"issue":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/120"},"comments":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/issues/120/comments"},"review_comments":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/120/comments"},"review_comment":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/pulls/120/commits"},"statuses":{"href":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/statuses/79a5f8b1c60ffa50a07b652b86bb6911badb8d58"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"jthegedus","id":20798510,"node_id":"MDQ6VXNlcjIwNzk4NTEw","avatar_url":"https://avatars.githubusercontent.com/u/20798510?v=4","gravatar_id":"","url":"https://api.github.com/users/jthegedus","html_url":"https://github.com/jthegedus","followers_url":"https://api.github.com/users/jthegedus/followers","following_url":"https://api.github.com/users/jthegedus/following{/other_user}","gists_url":"https://api.github.com/users/jthegedus/gists{/gist_id}","starred_url":"https://api.github.com/users/jthegedus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jthegedus/subscriptions","organizations_url":"https://api.github.com/users/jthegedus/orgs","repos_url":"https://api.github.com/users/jthegedus/repos","events_url":"https://api.github.com/users/jthegedus/events{/privacy}","received_events_url":"https://api.github.com/users/jthegedus/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":8,"deletions":1,"changed_files":2}},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207358","type":"PushEvent","actor":{"id":464211,"login":"christopherrobin","display_login":"christopherrobin","gravatar_id":"","url":"https://api.github.com/users/christopherrobin","avatar_url":"https://avatars.githubusercontent.com/u/464211?"},"repo":{"id":388007435,"name":"christopherrobin/MRRT","url":"https://api.github.com/repos/christopherrobin/MRRT"},"payload":{"push_id":7561414804,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"1378c6a552006fc91a3d6bd98d377dca232f94f9","before":"e0116b7c42843b98ef2a9ebeb20b98902defca2a","commits":[{"sha":"109debe3de34f67b4ed6cdd383a2b221d9fdf5da","author":{"name":"Christopher Robin Reynolds","email":"da3d03a92642a56a7dcdc7df7843242785ab857d@gmail.com"},"message":"React-Router implementation","distinct":true,"url":"https://api.github.com/repos/christopherrobin/MRRT/commits/109debe3de34f67b4ed6cdd383a2b221d9fdf5da"},{"sha":"1378c6a552006fc91a3d6bd98d377dca232f94f9","author":{"name":"Christopher Robin Reynolds","email":"da3d03a92642a56a7dcdc7df7843242785ab857d@gmail.com"},"message":"Merge branch 'main' of https://github.com/christopherrobin/MRRT into main","distinct":true,"url":"https://api.github.com/repos/christopherrobin/MRRT/commits/1378c6a552006fc91a3d6bd98d377dca232f94f9"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207362","type":"ForkEvent","actor":{"id":74587830,"login":"MyoungSeokLee","display_login":"MyoungSeokLee","gravatar_id":"","url":"https://api.github.com/users/MyoungSeokLee","avatar_url":"https://avatars.githubusercontent.com/u/74587830?"},"repo":{"id":387992781,"name":"code-presso/jenkins-k8s-hello-spring","url":"https://api.github.com/repos/code-presso/jenkins-k8s-hello-spring"},"payload":{"forkee":{"id":388010494,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMTA0OTQ=","name":"jenkins-k8s-hello-spring","full_name":"MyoungSeokLee/jenkins-k8s-hello-spring","private":false,"owner":{"login":"MyoungSeokLee","id":74587830,"node_id":"MDQ6VXNlcjc0NTg3ODMw","avatar_url":"https://avatars.githubusercontent.com/u/74587830?v=4","gravatar_id":"","url":"https://api.github.com/users/MyoungSeokLee","html_url":"https://github.com/MyoungSeokLee","followers_url":"https://api.github.com/users/MyoungSeokLee/followers","following_url":"https://api.github.com/users/MyoungSeokLee/following{/other_user}","gists_url":"https://api.github.com/users/MyoungSeokLee/gists{/gist_id}","starred_url":"https://api.github.com/users/MyoungSeokLee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MyoungSeokLee/subscriptions","organizations_url":"https://api.github.com/users/MyoungSeokLee/orgs","repos_url":"https://api.github.com/users/MyoungSeokLee/repos","events_url":"https://api.github.com/users/MyoungSeokLee/events{/privacy}","received_events_url":"https://api.github.com/users/MyoungSeokLee/received_events","type":"User","site_admin":false},"html_url":"https://github.com/MyoungSeokLee/jenkins-k8s-hello-spring","description":"기본 스프링 샘플 예제입니다.","fork":true,"url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring","forks_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/forks","keys_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/teams","hooks_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/hooks","issue_events_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/issues/events{/number}","events_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/events","assignees_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/assignees{/user}","branches_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/branches{/branch}","tags_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/tags","blobs_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/git/refs{/sha}","trees_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/statuses/{sha}","languages_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/languages","stargazers_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/stargazers","contributors_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/contributors","subscribers_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/subscribers","subscription_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/subscription","commits_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/commits{/sha}","git_commits_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/git/commits{/sha}","comments_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/comments{/number}","issue_comment_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/issues/comments{/number}","contents_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/contents/{+path}","compare_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/merges","archive_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/downloads","issues_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/issues{/number}","pulls_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/pulls{/number}","milestones_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/milestones{/number}","notifications_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/labels{/name}","releases_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/releases{/id}","deployments_url":"https://api.github.com/repos/MyoungSeokLee/jenkins-k8s-hello-spring/deployments","created_at":"2021-07-21T05:59:59Z","updated_at":"2021-07-21T05:58:40Z","pushed_at":"2021-07-21T05:58:38Z","git_url":"git://github.com/MyoungSeokLee/jenkins-k8s-hello-spring.git","ssh_url":"git@github.com:MyoungSeokLee/jenkins-k8s-hello-spring.git","clone_url":"https://github.com/MyoungSeokLee/jenkins-k8s-hello-spring.git","svn_url":"https://github.com/MyoungSeokLee/jenkins-k8s-hello-spring","homepage":null,"size":1,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207364","type":"PullRequestEvent","actor":{"id":56112790,"login":"yeslee-v","display_login":"yeslee-v","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","avatar_url":"https://avatars.githubusercontent.com/u/56112790?"},"repo":{"id":380422017,"name":"yeslee-v/42_minishell","url":"https://api.github.com/repos/yeslee-v/42_minishell"},"payload":{"action":"closed","number":33,"pull_request":{"url":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/33","id":694068346,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDY4MzQ2","html_url":"https://github.com/yeslee-v/42_minishell/pull/33","diff_url":"https://github.com/yeslee-v/42_minishell/pull/33.diff","patch_url":"https://github.com/yeslee-v/42_minishell/pull/33.patch","issue_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues/33","number":33,"state":"closed","locked":false,"title":"Jaekpark [Write] search_env_value , change env value functions","user":{"login":"Jaekpark","id":59547427,"node_id":"MDQ6VXNlcjU5NTQ3NDI3","avatar_url":"https://avatars.githubusercontent.com/u/59547427?v=4","gravatar_id":"","url":"https://api.github.com/users/Jaekpark","html_url":"https://github.com/Jaekpark","followers_url":"https://api.github.com/users/Jaekpark/followers","following_url":"https://api.github.com/users/Jaekpark/following{/other_user}","gists_url":"https://api.github.com/users/Jaekpark/gists{/gist_id}","starred_url":"https://api.github.com/users/Jaekpark/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Jaekpark/subscriptions","organizations_url":"https://api.github.com/users/Jaekpark/orgs","repos_url":"https://api.github.com/users/Jaekpark/repos","events_url":"https://api.github.com/users/Jaekpark/events{/privacy}","received_events_url":"https://api.github.com/users/Jaekpark/received_events","type":"User","site_admin":false},"body":"search_env_value()\r\nsearch_env_node()\r\nchange_env_value()","created_at":"2021-07-21T05:46:04Z","updated_at":"2021-07-21T05:59:59Z","closed_at":"2021-07-21T05:59:59Z","merged_at":"2021-07-21T05:59:59Z","merge_commit_sha":"4346aad0ea904e4d83c92a7e9fe2ae284b4d92a7","assignee":{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false},"assignees":[{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3118082052,"node_id":"MDU6TGFiZWwzMTE4MDgyMDUy","url":"https://api.github.com/repos/yeslee-v/42_minishell/labels/enhancement","name":"enhancement","color":"a2eeef","default":true,"description":"New feature or request"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/33/commits","review_comments_url":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/33/comments","review_comment_url":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/comments{/number}","comments_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues/33/comments","statuses_url":"https://api.github.com/repos/yeslee-v/42_minishell/statuses/e4c9de9ad6b5a08f6370f653262ba90d58372b61","head":{"label":"yeslee-v:jaekpark_write_change_env_value","ref":"jaekpark_write_change_env_value","sha":"e4c9de9ad6b5a08f6370f653262ba90d58372b61","user":{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false},"repo":{"id":380422017,"node_id":"MDEwOlJlcG9zaXRvcnkzODA0MjIwMTc=","name":"42_minishell","full_name":"yeslee-v/42_minishell","private":false,"owner":{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false},"html_url":"https://github.com/yeslee-v/42_minishell","description":null,"fork":false,"url":"https://api.github.com/repos/yeslee-v/42_minishell","forks_url":"https://api.github.com/repos/yeslee-v/42_minishell/forks","keys_url":"https://api.github.com/repos/yeslee-v/42_minishell/keys{/key_id}","collaborators_url":"https://api.github.com/repos/yeslee-v/42_minishell/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/yeslee-v/42_minishell/teams","hooks_url":"https://api.github.com/repos/yeslee-v/42_minishell/hooks","issue_events_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues/events{/number}","events_url":"https://api.github.com/repos/yeslee-v/42_minishell/events","assignees_url":"https://api.github.com/repos/yeslee-v/42_minishell/assignees{/user}","branches_url":"https://api.github.com/repos/yeslee-v/42_minishell/branches{/branch}","tags_url":"https://api.github.com/repos/yeslee-v/42_minishell/tags","blobs_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/refs{/sha}","trees_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/trees{/sha}","statuses_url":"https://api.github.com/repos/yeslee-v/42_minishell/statuses/{sha}","languages_url":"https://api.github.com/repos/yeslee-v/42_minishell/languages","stargazers_url":"https://api.github.com/repos/yeslee-v/42_minishell/stargazers","contributors_url":"https://api.github.com/repos/yeslee-v/42_minishell/contributors","subscribers_url":"https://api.github.com/repos/yeslee-v/42_minishell/subscribers","subscription_url":"https://api.github.com/repos/yeslee-v/42_minishell/subscription","commits_url":"https://api.github.com/repos/yeslee-v/42_minishell/commits{/sha}","git_commits_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/commits{/sha}","comments_url":"https://api.github.com/repos/yeslee-v/42_minishell/comments{/number}","issue_comment_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues/comments{/number}","contents_url":"https://api.github.com/repos/yeslee-v/42_minishell/contents/{+path}","compare_url":"https://api.github.com/repos/yeslee-v/42_minishell/compare/{base}...{head}","merges_url":"https://api.github.com/repos/yeslee-v/42_minishell/merges","archive_url":"https://api.github.com/repos/yeslee-v/42_minishell/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/yeslee-v/42_minishell/downloads","issues_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues{/number}","pulls_url":"https://api.github.com/repos/yeslee-v/42_minishell/pulls{/number}","milestones_url":"https://api.github.com/repos/yeslee-v/42_minishell/milestones{/number}","notifications_url":"https://api.github.com/repos/yeslee-v/42_minishell/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/yeslee-v/42_minishell/labels{/name}","releases_url":"https://api.github.com/repos/yeslee-v/42_minishell/releases{/id}","deployments_url":"https://api.github.com/repos/yeslee-v/42_minishell/deployments","created_at":"2021-06-26T05:32:03Z","updated_at":"2021-07-21T03:56:09Z","pushed_at":"2021-07-21T05:59:59Z","git_url":"git://github.com/yeslee-v/42_minishell.git","ssh_url":"git@github.com:yeslee-v/42_minishell.git","clone_url":"https://github.com/yeslee-v/42_minishell.git","svn_url":"https://github.com/yeslee-v/42_minishell","homepage":null,"size":2361,"stargazers_count":0,"watchers_count":0,"language":"C","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"yeslee-v:main","ref":"main","sha":"c92a94af4f7c3b8e61d64c8d00222be679adf1eb","user":{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false},"repo":{"id":380422017,"node_id":"MDEwOlJlcG9zaXRvcnkzODA0MjIwMTc=","name":"42_minishell","full_name":"yeslee-v/42_minishell","private":false,"owner":{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false},"html_url":"https://github.com/yeslee-v/42_minishell","description":null,"fork":false,"url":"https://api.github.com/repos/yeslee-v/42_minishell","forks_url":"https://api.github.com/repos/yeslee-v/42_minishell/forks","keys_url":"https://api.github.com/repos/yeslee-v/42_minishell/keys{/key_id}","collaborators_url":"https://api.github.com/repos/yeslee-v/42_minishell/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/yeslee-v/42_minishell/teams","hooks_url":"https://api.github.com/repos/yeslee-v/42_minishell/hooks","issue_events_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues/events{/number}","events_url":"https://api.github.com/repos/yeslee-v/42_minishell/events","assignees_url":"https://api.github.com/repos/yeslee-v/42_minishell/assignees{/user}","branches_url":"https://api.github.com/repos/yeslee-v/42_minishell/branches{/branch}","tags_url":"https://api.github.com/repos/yeslee-v/42_minishell/tags","blobs_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/refs{/sha}","trees_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/trees{/sha}","statuses_url":"https://api.github.com/repos/yeslee-v/42_minishell/statuses/{sha}","languages_url":"https://api.github.com/repos/yeslee-v/42_minishell/languages","stargazers_url":"https://api.github.com/repos/yeslee-v/42_minishell/stargazers","contributors_url":"https://api.github.com/repos/yeslee-v/42_minishell/contributors","subscribers_url":"https://api.github.com/repos/yeslee-v/42_minishell/subscribers","subscription_url":"https://api.github.com/repos/yeslee-v/42_minishell/subscription","commits_url":"https://api.github.com/repos/yeslee-v/42_minishell/commits{/sha}","git_commits_url":"https://api.github.com/repos/yeslee-v/42_minishell/git/commits{/sha}","comments_url":"https://api.github.com/repos/yeslee-v/42_minishell/comments{/number}","issue_comment_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues/comments{/number}","contents_url":"https://api.github.com/repos/yeslee-v/42_minishell/contents/{+path}","compare_url":"https://api.github.com/repos/yeslee-v/42_minishell/compare/{base}...{head}","merges_url":"https://api.github.com/repos/yeslee-v/42_minishell/merges","archive_url":"https://api.github.com/repos/yeslee-v/42_minishell/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/yeslee-v/42_minishell/downloads","issues_url":"https://api.github.com/repos/yeslee-v/42_minishell/issues{/number}","pulls_url":"https://api.github.com/repos/yeslee-v/42_minishell/pulls{/number}","milestones_url":"https://api.github.com/repos/yeslee-v/42_minishell/milestones{/number}","notifications_url":"https://api.github.com/repos/yeslee-v/42_minishell/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/yeslee-v/42_minishell/labels{/name}","releases_url":"https://api.github.com/repos/yeslee-v/42_minishell/releases{/id}","deployments_url":"https://api.github.com/repos/yeslee-v/42_minishell/deployments","created_at":"2021-06-26T05:32:03Z","updated_at":"2021-07-21T03:56:09Z","pushed_at":"2021-07-21T05:59:59Z","git_url":"git://github.com/yeslee-v/42_minishell.git","ssh_url":"git@github.com:yeslee-v/42_minishell.git","clone_url":"https://github.com/yeslee-v/42_minishell.git","svn_url":"https://github.com/yeslee-v/42_minishell","homepage":null,"size":2361,"stargazers_count":0,"watchers_count":0,"language":"C","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/33"},"html":{"href":"https://github.com/yeslee-v/42_minishell/pull/33"},"issue":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/issues/33"},"comments":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/issues/33/comments"},"review_comments":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/33/comments"},"review_comment":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/pulls/33/commits"},"statuses":{"href":"https://api.github.com/repos/yeslee-v/42_minishell/statuses/e4c9de9ad6b5a08f6370f653262ba90d58372b61"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"yeslee-v","id":56112790,"node_id":"MDQ6VXNlcjU2MTEyNzkw","avatar_url":"https://avatars.githubusercontent.com/u/56112790?v=4","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","html_url":"https://github.com/yeslee-v","followers_url":"https://api.github.com/users/yeslee-v/followers","following_url":"https://api.github.com/users/yeslee-v/following{/other_user}","gists_url":"https://api.github.com/users/yeslee-v/gists{/gist_id}","starred_url":"https://api.github.com/users/yeslee-v/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yeslee-v/subscriptions","organizations_url":"https://api.github.com/users/yeslee-v/orgs","repos_url":"https://api.github.com/users/yeslee-v/repos","events_url":"https://api.github.com/users/yeslee-v/events{/privacy}","received_events_url":"https://api.github.com/users/yeslee-v/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":59,"deletions":13,"changed_files":83}},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207371","type":"CreateEvent","actor":{"id":37919421,"login":"Seungyeup","display_login":"Seungyeup","gravatar_id":"","url":"https://api.github.com/users/Seungyeup","avatar_url":"https://avatars.githubusercontent.com/u/37919421?"},"repo":{"id":385122965,"name":"Seungyeup/Project-WebRTC","url":"https://api.github.com/repos/Seungyeup/Project-WebRTC"},"payload":{"ref":"back","ref_type":"branch","master_branch":"master","description":"webcam chatting application","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207372","type":"CreateEvent","actor":{"id":75279162,"login":"mattwoodruff808","display_login":"mattwoodruff808","gravatar_id":"","url":"https://api.github.com/users/mattwoodruff808","avatar_url":"https://avatars.githubusercontent.com/u/75279162?"},"repo":{"id":388010306,"name":"mattwoodruff808/tron-like","url":"https://api.github.com/repos/mattwoodruff808/tron-like"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207377","type":"PushEvent","actor":{"id":11451439,"login":"dxwayne","display_login":"dxwayne","gravatar_id":"","url":"https://api.github.com/users/dxwayne","avatar_url":"https://avatars.githubusercontent.com/u/11451439?"},"repo":{"id":349754787,"name":"dxwayne/FlexSpec1","url":"https://api.github.com/repos/dxwayne/FlexSpec1"},"payload":{"push_id":7561414823,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"cfd12c003d73c1dede8af3dda50a5aecdc403951","before":"dee3c5c3554ccf3a91c77526ceaf804c7a2ba858","commits":[{"sha":"99b93e97dbf15180e307c23b87d666e7581e4f9a","author":{"name":"dxwayne","email":"74ac98f9fe2a1e35a9782f08131eb8df866413ad@gmail.com"},"message":"Fixed a call by reference (doesn't work) with a dictionary enbedded\nin an instance class. The class may support error checking in future.","distinct":true,"url":"https://api.github.com/repos/dxwayne/FlexSpec1/commits/99b93e97dbf15180e307c23b87d666e7581e4f9a"},{"sha":"cfd12c003d73c1dede8af3dda50a5aecdc403951","author":{"name":"dxwayne","email":"74ac98f9fe2a1e35a9782f08131eb8df866413ad@gmail.com"},"message":"Some checkin hosed me.","distinct":true,"url":"https://api.github.com/repos/dxwayne/FlexSpec1/commits/cfd12c003d73c1dede8af3dda50a5aecdc403951"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207391","type":"PullRequestEvent","actor":{"id":242026,"login":"nak2k","display_login":"nak2k","gravatar_id":"","url":"https://api.github.com/users/nak2k","avatar_url":"https://avatars.githubusercontent.com/u/242026?"},"repo":{"id":327014346,"name":"nak2k/cdk-util","url":"https://api.github.com/repos/nak2k/cdk-util"},"payload":{"action":"closed","number":23,"pull_request":{"url":"https://api.github.com/repos/nak2k/cdk-util/pulls/23","id":694073914,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTE0","html_url":"https://github.com/nak2k/cdk-util/pull/23","diff_url":"https://github.com/nak2k/cdk-util/pull/23.diff","patch_url":"https://github.com/nak2k/cdk-util/pull/23.patch","issue_url":"https://api.github.com/repos/nak2k/cdk-util/issues/23","number":23,"state":"closed","locked":false,"title":"@cdk-util/aws-lambda@0.2.8","user":{"login":"nak2k","id":242026,"node_id":"MDQ6VXNlcjI0MjAyNg==","avatar_url":"https://avatars.githubusercontent.com/u/242026?v=4","gravatar_id":"","url":"https://api.github.com/users/nak2k","html_url":"https://github.com/nak2k","followers_url":"https://api.github.com/users/nak2k/followers","following_url":"https://api.github.com/users/nak2k/following{/other_user}","gists_url":"https://api.github.com/users/nak2k/gists{/gist_id}","starred_url":"https://api.github.com/users/nak2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nak2k/subscriptions","organizations_url":"https://api.github.com/users/nak2k/orgs","repos_url":"https://api.github.com/users/nak2k/repos","events_url":"https://api.github.com/users/nak2k/events{/privacy}","received_events_url":"https://api.github.com/users/nak2k/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T05:59:51Z","updated_at":"2021-07-21T05:59:59Z","closed_at":"2021-07-21T05:59:59Z","merged_at":"2021-07-21T05:59:59Z","merge_commit_sha":"2e79895ed8f66e2a5b27fa69a1b314d8ed2b2295","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/nak2k/cdk-util/pulls/23/commits","review_comments_url":"https://api.github.com/repos/nak2k/cdk-util/pulls/23/comments","review_comment_url":"https://api.github.com/repos/nak2k/cdk-util/pulls/comments{/number}","comments_url":"https://api.github.com/repos/nak2k/cdk-util/issues/23/comments","statuses_url":"https://api.github.com/repos/nak2k/cdk-util/statuses/6479ea592588f37e26e33b6fb017d35dfa059dc6","head":{"label":"nak2k:aws-lambda","ref":"aws-lambda","sha":"6479ea592588f37e26e33b6fb017d35dfa059dc6","user":{"login":"nak2k","id":242026,"node_id":"MDQ6VXNlcjI0MjAyNg==","avatar_url":"https://avatars.githubusercontent.com/u/242026?v=4","gravatar_id":"","url":"https://api.github.com/users/nak2k","html_url":"https://github.com/nak2k","followers_url":"https://api.github.com/users/nak2k/followers","following_url":"https://api.github.com/users/nak2k/following{/other_user}","gists_url":"https://api.github.com/users/nak2k/gists{/gist_id}","starred_url":"https://api.github.com/users/nak2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nak2k/subscriptions","organizations_url":"https://api.github.com/users/nak2k/orgs","repos_url":"https://api.github.com/users/nak2k/repos","events_url":"https://api.github.com/users/nak2k/events{/privacy}","received_events_url":"https://api.github.com/users/nak2k/received_events","type":"User","site_admin":false},"repo":{"id":327014346,"node_id":"MDEwOlJlcG9zaXRvcnkzMjcwMTQzNDY=","name":"cdk-util","full_name":"nak2k/cdk-util","private":false,"owner":{"login":"nak2k","id":242026,"node_id":"MDQ6VXNlcjI0MjAyNg==","avatar_url":"https://avatars.githubusercontent.com/u/242026?v=4","gravatar_id":"","url":"https://api.github.com/users/nak2k","html_url":"https://github.com/nak2k","followers_url":"https://api.github.com/users/nak2k/followers","following_url":"https://api.github.com/users/nak2k/following{/other_user}","gists_url":"https://api.github.com/users/nak2k/gists{/gist_id}","starred_url":"https://api.github.com/users/nak2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nak2k/subscriptions","organizations_url":"https://api.github.com/users/nak2k/orgs","repos_url":"https://api.github.com/users/nak2k/repos","events_url":"https://api.github.com/users/nak2k/events{/privacy}","received_events_url":"https://api.github.com/users/nak2k/received_events","type":"User","site_admin":false},"html_url":"https://github.com/nak2k/cdk-util","description":"Utilities for AWS CDK","fork":false,"url":"https://api.github.com/repos/nak2k/cdk-util","forks_url":"https://api.github.com/repos/nak2k/cdk-util/forks","keys_url":"https://api.github.com/repos/nak2k/cdk-util/keys{/key_id}","collaborators_url":"https://api.github.com/repos/nak2k/cdk-util/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/nak2k/cdk-util/teams","hooks_url":"https://api.github.com/repos/nak2k/cdk-util/hooks","issue_events_url":"https://api.github.com/repos/nak2k/cdk-util/issues/events{/number}","events_url":"https://api.github.com/repos/nak2k/cdk-util/events","assignees_url":"https://api.github.com/repos/nak2k/cdk-util/assignees{/user}","branches_url":"https://api.github.com/repos/nak2k/cdk-util/branches{/branch}","tags_url":"https://api.github.com/repos/nak2k/cdk-util/tags","blobs_url":"https://api.github.com/repos/nak2k/cdk-util/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/nak2k/cdk-util/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/nak2k/cdk-util/git/refs{/sha}","trees_url":"https://api.github.com/repos/nak2k/cdk-util/git/trees{/sha}","statuses_url":"https://api.github.com/repos/nak2k/cdk-util/statuses/{sha}","languages_url":"https://api.github.com/repos/nak2k/cdk-util/languages","stargazers_url":"https://api.github.com/repos/nak2k/cdk-util/stargazers","contributors_url":"https://api.github.com/repos/nak2k/cdk-util/contributors","subscribers_url":"https://api.github.com/repos/nak2k/cdk-util/subscribers","subscription_url":"https://api.github.com/repos/nak2k/cdk-util/subscription","commits_url":"https://api.github.com/repos/nak2k/cdk-util/commits{/sha}","git_commits_url":"https://api.github.com/repos/nak2k/cdk-util/git/commits{/sha}","comments_url":"https://api.github.com/repos/nak2k/cdk-util/comments{/number}","issue_comment_url":"https://api.github.com/repos/nak2k/cdk-util/issues/comments{/number}","contents_url":"https://api.github.com/repos/nak2k/cdk-util/contents/{+path}","compare_url":"https://api.github.com/repos/nak2k/cdk-util/compare/{base}...{head}","merges_url":"https://api.github.com/repos/nak2k/cdk-util/merges","archive_url":"https://api.github.com/repos/nak2k/cdk-util/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/nak2k/cdk-util/downloads","issues_url":"https://api.github.com/repos/nak2k/cdk-util/issues{/number}","pulls_url":"https://api.github.com/repos/nak2k/cdk-util/pulls{/number}","milestones_url":"https://api.github.com/repos/nak2k/cdk-util/milestones{/number}","notifications_url":"https://api.github.com/repos/nak2k/cdk-util/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/nak2k/cdk-util/labels{/name}","releases_url":"https://api.github.com/repos/nak2k/cdk-util/releases{/id}","deployments_url":"https://api.github.com/repos/nak2k/cdk-util/deployments","created_at":"2021-01-05T13:55:08Z","updated_at":"2021-07-16T12:31:19Z","pushed_at":"2021-07-21T05:59:59Z","git_url":"git://github.com/nak2k/cdk-util.git","ssh_url":"git@github.com:nak2k/cdk-util.git","clone_url":"https://github.com/nak2k/cdk-util.git","svn_url":"https://github.com/nak2k/cdk-util","homepage":"","size":1566,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"nak2k:master","ref":"master","sha":"4957072e553fba94c2bc09bce6ec32612685502a","user":{"login":"nak2k","id":242026,"node_id":"MDQ6VXNlcjI0MjAyNg==","avatar_url":"https://avatars.githubusercontent.com/u/242026?v=4","gravatar_id":"","url":"https://api.github.com/users/nak2k","html_url":"https://github.com/nak2k","followers_url":"https://api.github.com/users/nak2k/followers","following_url":"https://api.github.com/users/nak2k/following{/other_user}","gists_url":"https://api.github.com/users/nak2k/gists{/gist_id}","starred_url":"https://api.github.com/users/nak2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nak2k/subscriptions","organizations_url":"https://api.github.com/users/nak2k/orgs","repos_url":"https://api.github.com/users/nak2k/repos","events_url":"https://api.github.com/users/nak2k/events{/privacy}","received_events_url":"https://api.github.com/users/nak2k/received_events","type":"User","site_admin":false},"repo":{"id":327014346,"node_id":"MDEwOlJlcG9zaXRvcnkzMjcwMTQzNDY=","name":"cdk-util","full_name":"nak2k/cdk-util","private":false,"owner":{"login":"nak2k","id":242026,"node_id":"MDQ6VXNlcjI0MjAyNg==","avatar_url":"https://avatars.githubusercontent.com/u/242026?v=4","gravatar_id":"","url":"https://api.github.com/users/nak2k","html_url":"https://github.com/nak2k","followers_url":"https://api.github.com/users/nak2k/followers","following_url":"https://api.github.com/users/nak2k/following{/other_user}","gists_url":"https://api.github.com/users/nak2k/gists{/gist_id}","starred_url":"https://api.github.com/users/nak2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nak2k/subscriptions","organizations_url":"https://api.github.com/users/nak2k/orgs","repos_url":"https://api.github.com/users/nak2k/repos","events_url":"https://api.github.com/users/nak2k/events{/privacy}","received_events_url":"https://api.github.com/users/nak2k/received_events","type":"User","site_admin":false},"html_url":"https://github.com/nak2k/cdk-util","description":"Utilities for AWS CDK","fork":false,"url":"https://api.github.com/repos/nak2k/cdk-util","forks_url":"https://api.github.com/repos/nak2k/cdk-util/forks","keys_url":"https://api.github.com/repos/nak2k/cdk-util/keys{/key_id}","collaborators_url":"https://api.github.com/repos/nak2k/cdk-util/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/nak2k/cdk-util/teams","hooks_url":"https://api.github.com/repos/nak2k/cdk-util/hooks","issue_events_url":"https://api.github.com/repos/nak2k/cdk-util/issues/events{/number}","events_url":"https://api.github.com/repos/nak2k/cdk-util/events","assignees_url":"https://api.github.com/repos/nak2k/cdk-util/assignees{/user}","branches_url":"https://api.github.com/repos/nak2k/cdk-util/branches{/branch}","tags_url":"https://api.github.com/repos/nak2k/cdk-util/tags","blobs_url":"https://api.github.com/repos/nak2k/cdk-util/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/nak2k/cdk-util/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/nak2k/cdk-util/git/refs{/sha}","trees_url":"https://api.github.com/repos/nak2k/cdk-util/git/trees{/sha}","statuses_url":"https://api.github.com/repos/nak2k/cdk-util/statuses/{sha}","languages_url":"https://api.github.com/repos/nak2k/cdk-util/languages","stargazers_url":"https://api.github.com/repos/nak2k/cdk-util/stargazers","contributors_url":"https://api.github.com/repos/nak2k/cdk-util/contributors","subscribers_url":"https://api.github.com/repos/nak2k/cdk-util/subscribers","subscription_url":"https://api.github.com/repos/nak2k/cdk-util/subscription","commits_url":"https://api.github.com/repos/nak2k/cdk-util/commits{/sha}","git_commits_url":"https://api.github.com/repos/nak2k/cdk-util/git/commits{/sha}","comments_url":"https://api.github.com/repos/nak2k/cdk-util/comments{/number}","issue_comment_url":"https://api.github.com/repos/nak2k/cdk-util/issues/comments{/number}","contents_url":"https://api.github.com/repos/nak2k/cdk-util/contents/{+path}","compare_url":"https://api.github.com/repos/nak2k/cdk-util/compare/{base}...{head}","merges_url":"https://api.github.com/repos/nak2k/cdk-util/merges","archive_url":"https://api.github.com/repos/nak2k/cdk-util/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/nak2k/cdk-util/downloads","issues_url":"https://api.github.com/repos/nak2k/cdk-util/issues{/number}","pulls_url":"https://api.github.com/repos/nak2k/cdk-util/pulls{/number}","milestones_url":"https://api.github.com/repos/nak2k/cdk-util/milestones{/number}","notifications_url":"https://api.github.com/repos/nak2k/cdk-util/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/nak2k/cdk-util/labels{/name}","releases_url":"https://api.github.com/repos/nak2k/cdk-util/releases{/id}","deployments_url":"https://api.github.com/repos/nak2k/cdk-util/deployments","created_at":"2021-01-05T13:55:08Z","updated_at":"2021-07-16T12:31:19Z","pushed_at":"2021-07-21T05:59:59Z","git_url":"git://github.com/nak2k/cdk-util.git","ssh_url":"git@github.com:nak2k/cdk-util.git","clone_url":"https://github.com/nak2k/cdk-util.git","svn_url":"https://github.com/nak2k/cdk-util","homepage":"","size":1566,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/nak2k/cdk-util/pulls/23"},"html":{"href":"https://github.com/nak2k/cdk-util/pull/23"},"issue":{"href":"https://api.github.com/repos/nak2k/cdk-util/issues/23"},"comments":{"href":"https://api.github.com/repos/nak2k/cdk-util/issues/23/comments"},"review_comments":{"href":"https://api.github.com/repos/nak2k/cdk-util/pulls/23/comments"},"review_comment":{"href":"https://api.github.com/repos/nak2k/cdk-util/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/nak2k/cdk-util/pulls/23/commits"},"statuses":{"href":"https://api.github.com/repos/nak2k/cdk-util/statuses/6479ea592588f37e26e33b6fb017d35dfa059dc6"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"nak2k","id":242026,"node_id":"MDQ6VXNlcjI0MjAyNg==","avatar_url":"https://avatars.githubusercontent.com/u/242026?v=4","gravatar_id":"","url":"https://api.github.com/users/nak2k","html_url":"https://github.com/nak2k","followers_url":"https://api.github.com/users/nak2k/followers","following_url":"https://api.github.com/users/nak2k/following{/other_user}","gists_url":"https://api.github.com/users/nak2k/gists{/gist_id}","starred_url":"https://api.github.com/users/nak2k/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nak2k/subscriptions","organizations_url":"https://api.github.com/users/nak2k/orgs","repos_url":"https://api.github.com/users/nak2k/repos","events_url":"https://api.github.com/users/nak2k/events{/privacy}","received_events_url":"https://api.github.com/users/nak2k/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":68,"deletions":12,"changed_files":11}},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207401","type":"PushEvent","actor":{"id":84785003,"login":"manojtyagi2021","display_login":"manojtyagi2021","gravatar_id":"","url":"https://api.github.com/users/manojtyagi2021","avatar_url":"https://avatars.githubusercontent.com/u/84785003?"},"repo":{"id":381637523,"name":"HCL-Cloud-Native-Labs/cfmr-cf-cli-plugin-network-policy","url":"https://api.github.com/repos/HCL-Cloud-Native-Labs/cfmr-cf-cli-plugin-network-policy"},"payload":{"push_id":7561414825,"size":1,"distinct_size":1,"ref":"refs/heads/CFEE-1631","head":"3e6b090aed1bb92099d11b167a3c42c38b2a09fc","before":"72ff8f991ad72cb2de6bc02b797eb2242b625a05","commits":[{"sha":"3e6b090aed1bb92099d11b167a3c42c38b2a09fc","author":{"name":"Manoj Kumar Tyagi","email":"e66755831c14b8e14a46643e024906f6394d172e@hcl.com"},"message":"added debug logs","distinct":true,"url":"https://api.github.com/repos/HCL-Cloud-Native-Labs/cfmr-cf-cli-plugin-network-policy/commits/3e6b090aed1bb92099d11b167a3c42c38b2a09fc"}]},"public":true,"created_at":"2021-07-21T06:00:00Z","org":{"id":42739816,"login":"HCL-Cloud-Native-Labs","gravatar_id":"","url":"https://api.github.com/orgs/HCL-Cloud-Native-Labs","avatar_url":"https://avatars.githubusercontent.com/u/42739816?"}}
+{"id":"17244207402","type":"PushEvent","actor":{"id":72592300,"login":"stalnakerwang","display_login":"stalnakerwang","gravatar_id":"","url":"https://api.github.com/users/stalnakerwang","avatar_url":"https://avatars.githubusercontent.com/u/72592300?"},"repo":{"id":384024329,"name":"stalnakerwang/Stock_data","url":"https://api.github.com/repos/stalnakerwang/Stock_data"},"payload":{"push_id":7561414832,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"716454d5f8131f87e9fcf1352e0ab63c94954e21","before":"50411264bdf0b6208de286f631a176d7e1e27374","commits":[{"sha":"716454d5f8131f87e9fcf1352e0ab63c94954e21","author":{"name":"stalnakerwang","email":"f344e620d0451a1f3ba0e4946f5dfb16544abb33@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/stalnakerwang/Stock_data/commits/716454d5f8131f87e9fcf1352e0ab63c94954e21"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207407","type":"PushEvent","actor":{"id":24821209,"login":"kainetic","display_login":"kainetic","gravatar_id":"","url":"https://api.github.com/users/kainetic","avatar_url":"https://avatars.githubusercontent.com/u/24821209?"},"repo":{"id":388004992,"name":"kainetic/CodeUp","url":"https://api.github.com/repos/kainetic/CodeUp"},"payload":{"push_id":7561414833,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1f3221ba7a11de3458169bac46a40f30111ed980","before":"5790d30b80f916465975dbb089c597356fa4702f","commits":[{"sha":"1f3221ba7a11de3458169bac46a40f30111ed980","author":{"name":"andy","email":"df12532d77f4dcda945e2f339de2de68a7486c2a@gmail.com"},"message":"add ignore","distinct":true,"url":"https://api.github.com/repos/kainetic/CodeUp/commits/1f3221ba7a11de3458169bac46a40f30111ed980"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207422","type":"CreateEvent","actor":{"id":37919421,"login":"Seungyeup","display_login":"Seungyeup","gravatar_id":"","url":"https://api.github.com/users/Seungyeup","avatar_url":"https://avatars.githubusercontent.com/u/37919421?"},"repo":{"id":385122965,"name":"Seungyeup/Project-WebRTC","url":"https://api.github.com/repos/Seungyeup/Project-WebRTC"},"payload":{"ref":"develop","ref_type":"branch","master_branch":"master","description":"webcam chatting application","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207424","type":"DeleteEvent","actor":{"id":71311970,"login":"RONIN808","display_login":"RONIN808","gravatar_id":"","url":"https://api.github.com/users/RONIN808","avatar_url":"https://avatars.githubusercontent.com/u/71311970?"},"repo":{"id":388008866,"name":"RONIN808/local","url":"https://api.github.com/repos/RONIN808/local"},"payload":{"ref":"patch-1","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207425","type":"DeleteEvent","actor":{"id":20798510,"login":"jthegedus","display_login":"jthegedus","gravatar_id":"","url":"https://api.github.com/users/jthegedus","avatar_url":"https://avatars.githubusercontent.com/u/20798510?"},"repo":{"id":326604100,"name":"jthegedus/svelte-adapter-firebase","url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase"},"payload":{"ref":"release-v0.10.5","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207428","type":"CreateEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":263629279,"name":"peavers/terrible-monolith","url":"https://api.github.com/repos/peavers/terrible-monolith"},"payload":{"ref":"dependabot/gradle/com.diffplug.gradle.spotless-5.14.2","ref_type":"branch","master_branch":"master","description":"Are micro services a thing of the past? Terrible thoughts. ","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207433","type":"PushEvent","actor":{"id":2220914,"login":"devatsrs","display_login":"devatsrs","gravatar_id":"","url":"https://api.github.com/users/devatsrs","avatar_url":"https://avatars.githubusercontent.com/u/2220914?"},"repo":{"id":387368282,"name":"devatsrs/gst-retun-portal","url":"https://api.github.com/repos/devatsrs/gst-retun-portal"},"payload":{"push_id":7561414843,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"03a9816e42773ae6b609bc03aa6615b0bb28b7e1","before":"0cb8d423eaccc7865aaaf3b0b09ca5b164388aea","commits":[{"sha":"03a9816e42773ae6b609bc03aa6615b0bb28b7e1","author":{"name":"Deven Sitapara","email":"841b36306105e5ddea801fce8cad8225bd504a02@gmail.com"},"message":"design change","distinct":true,"url":"https://api.github.com/repos/devatsrs/gst-retun-portal/commits/03a9816e42773ae6b609bc03aa6615b0bb28b7e1"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207434","type":"DeleteEvent","actor":{"id":55547546,"login":"fragmentedbin","display_login":"fragmentedbin","gravatar_id":"","url":"https://api.github.com/users/fragmentedbin","avatar_url":"https://avatars.githubusercontent.com/u/55547546?"},"repo":{"id":387353679,"name":"okanemo/Muhammad-maududy","url":"https://api.github.com/repos/okanemo/Muhammad-maududy"},"payload":{"ref":"bug","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z","org":{"id":15762332,"login":"okanemo","gravatar_id":"","url":"https://api.github.com/orgs/okanemo","avatar_url":"https://avatars.githubusercontent.com/u/15762332?"}}
+{"id":"17244207435","type":"PushEvent","actor":{"id":80952336,"login":"weather-now-data2","display_login":"weather-now-data2","gravatar_id":"","url":"https://api.github.com/users/weather-now-data2","avatar_url":"https://avatars.githubusercontent.com/u/80952336?"},"repo":{"id":349369264,"name":"weather-now-data2/weather-now-data2.github.io","url":"https://api.github.com/repos/weather-now-data2/weather-now-data2.github.io"},"payload":{"push_id":7561414854,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8a2e816db96c949315853981173b291592205136","before":"458927447886d746c72d274217543f27e8e3aaae","commits":[{"sha":"8a2e816db96c949315853981173b291592205136","author":{"name":"weather-now-data2","email":"fdb8fd3bcbc6ca1a56b90d28769ba0b8f0d56a23@users.noreply.github.com"},"message":"Create data/forecast/20210724/202107241500-temp_7_2_3_95.jpg","distinct":true,"url":"https://api.github.com/repos/weather-now-data2/weather-now-data2.github.io/commits/8a2e816db96c949315853981173b291592205136"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207438","type":"PushEvent","actor":{"id":20798510,"login":"jthegedus","display_login":"jthegedus","gravatar_id":"","url":"https://api.github.com/users/jthegedus","avatar_url":"https://avatars.githubusercontent.com/u/20798510?"},"repo":{"id":326604100,"name":"jthegedus/svelte-adapter-firebase","url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase"},"payload":{"push_id":7561414855,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"3f2ac17efb3b65b4a40d25d94b01dcbdcc84d286","before":"ac8cd745632f4d0f63d116dd6ea0aedf4d7178ab","commits":[{"sha":"3f2ac17efb3b65b4a40d25d94b01dcbdcc84d286","author":{"name":"github-actions[bot]","email":"17973dcf2e10b67f63417c88ca4c460b2c9439f2@users.noreply.github.com"},"message":"chore: release 0.10.5 (#120)\n\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>","distinct":true,"url":"https://api.github.com/repos/jthegedus/svelte-adapter-firebase/commits/3f2ac17efb3b65b4a40d25d94b01dcbdcc84d286"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207445","type":"PullRequestEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":263629279,"name":"peavers/terrible-monolith","url":"https://api.github.com/repos/peavers/terrible-monolith"},"payload":{"action":"opened","number":145,"pull_request":{"url":"https://api.github.com/repos/peavers/terrible-monolith/pulls/145","id":694073962,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTYy","html_url":"https://github.com/peavers/terrible-monolith/pull/145","diff_url":"https://github.com/peavers/terrible-monolith/pull/145.diff","patch_url":"https://github.com/peavers/terrible-monolith/pull/145.patch","issue_url":"https://api.github.com/repos/peavers/terrible-monolith/issues/145","number":145,"state":"open","locked":false,"title":"build(deps): bump com.diffplug.gradle.spotless from 5.14.1 to 5.14.2","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps com.diffplug.gradle.spotless from 5.14.1 to 5.14.2.\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=com.diffplug.gradle.spotless&package-manager=gradle&previous-version=5.14.1&new-version=5.14.2)](https://dependabot.com/compatibility-score/?dependency-name=com.diffplug.gradle.spotless&package-manager=gradle&previous-version=5.14.1&new-version=5.14.2)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\nIf all status checks pass Dependabot will automatically merge this pull request.\n\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in the `.dependabot/config.yml` file in this repo:\n- Update frequency\n- Automerge options (never/patch/minor, and dev/runtime dependencies)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","created_at":"2021-07-21T06:00:00Z","updated_at":"2021-07-21T06:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/peavers/terrible-monolith/pulls/145/commits","review_comments_url":"https://api.github.com/repos/peavers/terrible-monolith/pulls/145/comments","review_comment_url":"https://api.github.com/repos/peavers/terrible-monolith/pulls/comments{/number}","comments_url":"https://api.github.com/repos/peavers/terrible-monolith/issues/145/comments","statuses_url":"https://api.github.com/repos/peavers/terrible-monolith/statuses/0c131fba48e76e36cd07fd8436ce499886d15272","head":{"label":"peavers:dependabot/gradle/com.diffplug.gradle.spotless-5.14.2","ref":"dependabot/gradle/com.diffplug.gradle.spotless-5.14.2","sha":"0c131fba48e76e36cd07fd8436ce499886d15272","user":{"login":"peavers","id":1758007,"node_id":"MDQ6VXNlcjE3NTgwMDc=","avatar_url":"https://avatars.githubusercontent.com/u/1758007?v=4","gravatar_id":"","url":"https://api.github.com/users/peavers","html_url":"https://github.com/peavers","followers_url":"https://api.github.com/users/peavers/followers","following_url":"https://api.github.com/users/peavers/following{/other_user}","gists_url":"https://api.github.com/users/peavers/gists{/gist_id}","starred_url":"https://api.github.com/users/peavers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peavers/subscriptions","organizations_url":"https://api.github.com/users/peavers/orgs","repos_url":"https://api.github.com/users/peavers/repos","events_url":"https://api.github.com/users/peavers/events{/privacy}","received_events_url":"https://api.github.com/users/peavers/received_events","type":"User","site_admin":false},"repo":{"id":263629279,"node_id":"MDEwOlJlcG9zaXRvcnkyNjM2MjkyNzk=","name":"terrible-monolith","full_name":"peavers/terrible-monolith","private":false,"owner":{"login":"peavers","id":1758007,"node_id":"MDQ6VXNlcjE3NTgwMDc=","avatar_url":"https://avatars.githubusercontent.com/u/1758007?v=4","gravatar_id":"","url":"https://api.github.com/users/peavers","html_url":"https://github.com/peavers","followers_url":"https://api.github.com/users/peavers/followers","following_url":"https://api.github.com/users/peavers/following{/other_user}","gists_url":"https://api.github.com/users/peavers/gists{/gist_id}","starred_url":"https://api.github.com/users/peavers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peavers/subscriptions","organizations_url":"https://api.github.com/users/peavers/orgs","repos_url":"https://api.github.com/users/peavers/repos","events_url":"https://api.github.com/users/peavers/events{/privacy}","received_events_url":"https://api.github.com/users/peavers/received_events","type":"User","site_admin":false},"html_url":"https://github.com/peavers/terrible-monolith","description":"Are micro services a thing of the past? Terrible thoughts. ","fork":false,"url":"https://api.github.com/repos/peavers/terrible-monolith","forks_url":"https://api.github.com/repos/peavers/terrible-monolith/forks","keys_url":"https://api.github.com/repos/peavers/terrible-monolith/keys{/key_id}","collaborators_url":"https://api.github.com/repos/peavers/terrible-monolith/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/peavers/terrible-monolith/teams","hooks_url":"https://api.github.com/repos/peavers/terrible-monolith/hooks","issue_events_url":"https://api.github.com/repos/peavers/terrible-monolith/issues/events{/number}","events_url":"https://api.github.com/repos/peavers/terrible-monolith/events","assignees_url":"https://api.github.com/repos/peavers/terrible-monolith/assignees{/user}","branches_url":"https://api.github.com/repos/peavers/terrible-monolith/branches{/branch}","tags_url":"https://api.github.com/repos/peavers/terrible-monolith/tags","blobs_url":"https://api.github.com/repos/peavers/terrible-monolith/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/peavers/terrible-monolith/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/peavers/terrible-monolith/git/refs{/sha}","trees_url":"https://api.github.com/repos/peavers/terrible-monolith/git/trees{/sha}","statuses_url":"https://api.github.com/repos/peavers/terrible-monolith/statuses/{sha}","languages_url":"https://api.github.com/repos/peavers/terrible-monolith/languages","stargazers_url":"https://api.github.com/repos/peavers/terrible-monolith/stargazers","contributors_url":"https://api.github.com/repos/peavers/terrible-monolith/contributors","subscribers_url":"https://api.github.com/repos/peavers/terrible-monolith/subscribers","subscription_url":"https://api.github.com/repos/peavers/terrible-monolith/subscription","commits_url":"https://api.github.com/repos/peavers/terrible-monolith/commits{/sha}","git_commits_url":"https://api.github.com/repos/peavers/terrible-monolith/git/commits{/sha}","comments_url":"https://api.github.com/repos/peavers/terrible-monolith/comments{/number}","issue_comment_url":"https://api.github.com/repos/peavers/terrible-monolith/issues/comments{/number}","contents_url":"https://api.github.com/repos/peavers/terrible-monolith/contents/{+path}","compare_url":"https://api.github.com/repos/peavers/terrible-monolith/compare/{base}...{head}","merges_url":"https://api.github.com/repos/peavers/terrible-monolith/merges","archive_url":"https://api.github.com/repos/peavers/terrible-monolith/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/peavers/terrible-monolith/downloads","issues_url":"https://api.github.com/repos/peavers/terrible-monolith/issues{/number}","pulls_url":"https://api.github.com/repos/peavers/terrible-monolith/pulls{/number}","milestones_url":"https://api.github.com/repos/peavers/terrible-monolith/milestones{/number}","notifications_url":"https://api.github.com/repos/peavers/terrible-monolith/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/peavers/terrible-monolith/labels{/name}","releases_url":"https://api.github.com/repos/peavers/terrible-monolith/releases{/id}","deployments_url":"https://api.github.com/repos/peavers/terrible-monolith/deployments","created_at":"2020-05-13T12:53:38Z","updated_at":"2021-07-14T05:59:27Z","pushed_at":"2021-07-21T06:00:00Z","git_url":"git://github.com/peavers/terrible-monolith.git","ssh_url":"git@github.com:peavers/terrible-monolith.git","clone_url":"https://github.com/peavers/terrible-monolith.git","svn_url":"https://github.com/peavers/terrible-monolith","homepage":null,"size":42991,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":null,"forks":1,"open_issues":2,"watchers":0,"default_branch":"master"}},"base":{"label":"peavers:master","ref":"master","sha":"4a3f0ad97e116f007f10f62846fd223390d57bbd","user":{"login":"peavers","id":1758007,"node_id":"MDQ6VXNlcjE3NTgwMDc=","avatar_url":"https://avatars.githubusercontent.com/u/1758007?v=4","gravatar_id":"","url":"https://api.github.com/users/peavers","html_url":"https://github.com/peavers","followers_url":"https://api.github.com/users/peavers/followers","following_url":"https://api.github.com/users/peavers/following{/other_user}","gists_url":"https://api.github.com/users/peavers/gists{/gist_id}","starred_url":"https://api.github.com/users/peavers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peavers/subscriptions","organizations_url":"https://api.github.com/users/peavers/orgs","repos_url":"https://api.github.com/users/peavers/repos","events_url":"https://api.github.com/users/peavers/events{/privacy}","received_events_url":"https://api.github.com/users/peavers/received_events","type":"User","site_admin":false},"repo":{"id":263629279,"node_id":"MDEwOlJlcG9zaXRvcnkyNjM2MjkyNzk=","name":"terrible-monolith","full_name":"peavers/terrible-monolith","private":false,"owner":{"login":"peavers","id":1758007,"node_id":"MDQ6VXNlcjE3NTgwMDc=","avatar_url":"https://avatars.githubusercontent.com/u/1758007?v=4","gravatar_id":"","url":"https://api.github.com/users/peavers","html_url":"https://github.com/peavers","followers_url":"https://api.github.com/users/peavers/followers","following_url":"https://api.github.com/users/peavers/following{/other_user}","gists_url":"https://api.github.com/users/peavers/gists{/gist_id}","starred_url":"https://api.github.com/users/peavers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peavers/subscriptions","organizations_url":"https://api.github.com/users/peavers/orgs","repos_url":"https://api.github.com/users/peavers/repos","events_url":"https://api.github.com/users/peavers/events{/privacy}","received_events_url":"https://api.github.com/users/peavers/received_events","type":"User","site_admin":false},"html_url":"https://github.com/peavers/terrible-monolith","description":"Are micro services a thing of the past? Terrible thoughts. ","fork":false,"url":"https://api.github.com/repos/peavers/terrible-monolith","forks_url":"https://api.github.com/repos/peavers/terrible-monolith/forks","keys_url":"https://api.github.com/repos/peavers/terrible-monolith/keys{/key_id}","collaborators_url":"https://api.github.com/repos/peavers/terrible-monolith/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/peavers/terrible-monolith/teams","hooks_url":"https://api.github.com/repos/peavers/terrible-monolith/hooks","issue_events_url":"https://api.github.com/repos/peavers/terrible-monolith/issues/events{/number}","events_url":"https://api.github.com/repos/peavers/terrible-monolith/events","assignees_url":"https://api.github.com/repos/peavers/terrible-monolith/assignees{/user}","branches_url":"https://api.github.com/repos/peavers/terrible-monolith/branches{/branch}","tags_url":"https://api.github.com/repos/peavers/terrible-monolith/tags","blobs_url":"https://api.github.com/repos/peavers/terrible-monolith/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/peavers/terrible-monolith/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/peavers/terrible-monolith/git/refs{/sha}","trees_url":"https://api.github.com/repos/peavers/terrible-monolith/git/trees{/sha}","statuses_url":"https://api.github.com/repos/peavers/terrible-monolith/statuses/{sha}","languages_url":"https://api.github.com/repos/peavers/terrible-monolith/languages","stargazers_url":"https://api.github.com/repos/peavers/terrible-monolith/stargazers","contributors_url":"https://api.github.com/repos/peavers/terrible-monolith/contributors","subscribers_url":"https://api.github.com/repos/peavers/terrible-monolith/subscribers","subscription_url":"https://api.github.com/repos/peavers/terrible-monolith/subscription","commits_url":"https://api.github.com/repos/peavers/terrible-monolith/commits{/sha}","git_commits_url":"https://api.github.com/repos/peavers/terrible-monolith/git/commits{/sha}","comments_url":"https://api.github.com/repos/peavers/terrible-monolith/comments{/number}","issue_comment_url":"https://api.github.com/repos/peavers/terrible-monolith/issues/comments{/number}","contents_url":"https://api.github.com/repos/peavers/terrible-monolith/contents/{+path}","compare_url":"https://api.github.com/repos/peavers/terrible-monolith/compare/{base}...{head}","merges_url":"https://api.github.com/repos/peavers/terrible-monolith/merges","archive_url":"https://api.github.com/repos/peavers/terrible-monolith/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/peavers/terrible-monolith/downloads","issues_url":"https://api.github.com/repos/peavers/terrible-monolith/issues{/number}","pulls_url":"https://api.github.com/repos/peavers/terrible-monolith/pulls{/number}","milestones_url":"https://api.github.com/repos/peavers/terrible-monolith/milestones{/number}","notifications_url":"https://api.github.com/repos/peavers/terrible-monolith/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/peavers/terrible-monolith/labels{/name}","releases_url":"https://api.github.com/repos/peavers/terrible-monolith/releases{/id}","deployments_url":"https://api.github.com/repos/peavers/terrible-monolith/deployments","created_at":"2020-05-13T12:53:38Z","updated_at":"2021-07-14T05:59:27Z","pushed_at":"2021-07-21T06:00:00Z","git_url":"git://github.com/peavers/terrible-monolith.git","ssh_url":"git@github.com:peavers/terrible-monolith.git","clone_url":"https://github.com/peavers/terrible-monolith.git","svn_url":"https://github.com/peavers/terrible-monolith","homepage":null,"size":42991,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":null,"forks":1,"open_issues":2,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/peavers/terrible-monolith/pulls/145"},"html":{"href":"https://github.com/peavers/terrible-monolith/pull/145"},"issue":{"href":"https://api.github.com/repos/peavers/terrible-monolith/issues/145"},"comments":{"href":"https://api.github.com/repos/peavers/terrible-monolith/issues/145/comments"},"review_comments":{"href":"https://api.github.com/repos/peavers/terrible-monolith/pulls/145/comments"},"review_comment":{"href":"https://api.github.com/repos/peavers/terrible-monolith/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/peavers/terrible-monolith/pulls/145/commits"},"statuses":{"href":"https://api.github.com/repos/peavers/terrible-monolith/statuses/0c131fba48e76e36cd07fd8436ce499886d15272"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207448","type":"DeleteEvent","actor":{"id":10810283,"login":"direwolf-github","display_login":"direwolf-github","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","avatar_url":"https://avatars.githubusercontent.com/u/10810283?"},"repo":{"id":183051410,"name":"direwolf-github/my-app","url":"https://api.github.com/repos/direwolf-github/my-app"},"payload":{"ref":"branch-cdedfb96","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207450","type":"PushEvent","actor":{"id":242026,"login":"nak2k","display_login":"nak2k","gravatar_id":"","url":"https://api.github.com/users/nak2k","avatar_url":"https://avatars.githubusercontent.com/u/242026?"},"repo":{"id":327014346,"name":"nak2k/cdk-util","url":"https://api.github.com/repos/nak2k/cdk-util"},"payload":{"push_id":7561414870,"size":3,"distinct_size":1,"ref":"refs/heads/master","head":"2e79895ed8f66e2a5b27fa69a1b314d8ed2b2295","before":"4957072e553fba94c2bc09bce6ec32612685502a","commits":[{"sha":"7e5a9087a188ad48c8900701df207c0ef309eae5","author":{"name":"Kengo Nakatsuka","email":"53e052f51feceaf0fdc8065ab802a750c5b8c571@gmail.com"},"message":"Support tarballs in NodejsLayerVersion","distinct":false,"url":"https://api.github.com/repos/nak2k/cdk-util/commits/7e5a9087a188ad48c8900701df207c0ef309eae5"},{"sha":"6479ea592588f37e26e33b6fb017d35dfa059dc6","author":{"name":"Kengo Nakatsuka","email":"53e052f51feceaf0fdc8065ab802a750c5b8c571@gmail.com"},"message":"@cdk-util/aws-lambda@0.2.8","distinct":false,"url":"https://api.github.com/repos/nak2k/cdk-util/commits/6479ea592588f37e26e33b6fb017d35dfa059dc6"},{"sha":"2e79895ed8f66e2a5b27fa69a1b314d8ed2b2295","author":{"name":"Kengo Nakatsuka","email":"53e052f51feceaf0fdc8065ab802a750c5b8c571@gmail.com"},"message":"Merge pull request #23 from nak2k/aws-lambda\n\n@cdk-util/aws-lambda@0.2.8","distinct":true,"url":"https://api.github.com/repos/nak2k/cdk-util/commits/2e79895ed8f66e2a5b27fa69a1b314d8ed2b2295"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207454","type":"CreateEvent","actor":{"id":37919421,"login":"Seungyeup","display_login":"Seungyeup","gravatar_id":"","url":"https://api.github.com/users/Seungyeup","avatar_url":"https://avatars.githubusercontent.com/u/37919421?"},"repo":{"id":385122965,"name":"Seungyeup/Project-WebRTC","url":"https://api.github.com/repos/Seungyeup/Project-WebRTC"},"payload":{"ref":"front","ref_type":"branch","master_branch":"master","description":"webcam chatting application","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207461","type":"PushEvent","actor":{"id":59435267,"login":"albertoabellagarcia","display_login":"albertoabellagarcia","gravatar_id":"","url":"https://api.github.com/users/albertoabellagarcia","avatar_url":"https://avatars.githubusercontent.com/u/59435267?"},"repo":{"id":190601053,"name":"smart-data-models/dataModel.PointOfInterest","url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest"},"payload":{"push_id":7561414861,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5ab04f38d3f9a175a5cef8332cf6ad063e04a770","before":"b25bce2fb5d1027a44730da8c4a588d52b5ed788","commits":[{"sha":"5ab04f38d3f9a175a5cef8332cf6ad063e04a770","author":{"name":"Alberto Abella","email":"4641006ed1a70ab96eea2556876687c02238d7d2@fiware.org"},"message":"updated on the 2021-07-21 07:59:59.432378","distinct":true,"url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest/commits/5ab04f38d3f9a175a5cef8332cf6ad063e04a770"}]},"public":true,"created_at":"2021-07-21T06:00:00Z","org":{"id":44724489,"login":"smart-data-models","gravatar_id":"","url":"https://api.github.com/orgs/smart-data-models","avatar_url":"https://avatars.githubusercontent.com/u/44724489?"}}
+{"id":"17244207462","type":"PushEvent","actor":{"id":56112790,"login":"yeslee-v","display_login":"yeslee-v","gravatar_id":"","url":"https://api.github.com/users/yeslee-v","avatar_url":"https://avatars.githubusercontent.com/u/56112790?"},"repo":{"id":380422017,"name":"yeslee-v/42_minishell","url":"https://api.github.com/repos/yeslee-v/42_minishell"},"payload":{"push_id":7561414859,"size":2,"distinct_size":1,"ref":"refs/heads/main","head":"4346aad0ea904e4d83c92a7e9fe2ae284b4d92a7","before":"c92a94af4f7c3b8e61d64c8d00222be679adf1eb","commits":[{"sha":"e4c9de9ad6b5a08f6370f653262ba90d58372b61","author":{"name":"jaekpark","email":"1437d78b1d7af594a870d38cce13debef535c0c1@student.42seoul.kr"},"message":"[Write] search_env_value , change env value functions","distinct":false,"url":"https://api.github.com/repos/yeslee-v/42_minishell/commits/e4c9de9ad6b5a08f6370f653262ba90d58372b61"},{"sha":"4346aad0ea904e4d83c92a7e9fe2ae284b4d92a7","author":{"name":"yeslee-v","email":"7e82b509cfa7a107b8a57cae9923282f057947a8@gmail.com"},"message":"Merge pull request #33 from yeslee-v/jaekpark_write_change_env_value\n\nJaekpark [Write] search_env_value , change env value functions","distinct":true,"url":"https://api.github.com/repos/yeslee-v/42_minishell/commits/4346aad0ea904e4d83c92a7e9fe2ae284b4d92a7"}]},"public":true,"created_at":"2021-07-21T06:00:00Z"}
+{"id":"17244207469","type":"CreateEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":252766607,"name":"Georges7Haddad/BubblyEverAfter","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter"},"payload":{"ref":"dependabot/pip/develop/pylint-2.9.4","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207472","type":"PushEvent","actor":{"id":71067732,"login":"yiyule10","display_login":"yiyule10","gravatar_id":"","url":"https://api.github.com/users/yiyule10","avatar_url":"https://avatars.githubusercontent.com/u/71067732?"},"repo":{"id":347798255,"name":"yiyule10/jd_tasks","url":"https://api.github.com/repos/yiyule10/jd_tasks"},"payload":{"push_id":7561414872,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"ef7574a5abdefbd601a7438cc9bc883f480a780e","before":"60a4683d223b6d8614ba173e8e8520cac4a28f37","commits":[{"sha":"ef7574a5abdefbd601a7438cc9bc883f480a780e","author":{"name":"yiyule10","email":"c0ecde530e218cb647642180adaa27e017a4a117@users.noreply.github.com"},"message":"Update getJDCookie.js","distinct":true,"url":"https://api.github.com/repos/yiyule10/jd_tasks/commits/ef7574a5abdefbd601a7438cc9bc883f480a780e"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207473","type":"CreateEvent","actor":{"id":64199201,"login":"bhanuyempati","display_login":"bhanuyempati","gravatar_id":"","url":"https://api.github.com/users/bhanuyempati","avatar_url":"https://avatars.githubusercontent.com/u/64199201?"},"repo":{"id":263835578,"name":"bhanuyempati/Sample","url":"https://api.github.com/repos/bhanuyempati/Sample"},"payload":{"ref":"regtest-5","ref_type":"branch","master_branch":"master","description":"Test","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207475","type":"PushEvent","actor":{"id":75224105,"login":"kanei0415","display_login":"kanei0415","gravatar_id":"","url":"https://api.github.com/users/kanei0415","avatar_url":"https://avatars.githubusercontent.com/u/75224105?"},"repo":{"id":380415622,"name":"H-A-T-C-A-T/KNU-Hakaton","url":"https://api.github.com/repos/H-A-T-C-A-T/KNU-Hakaton"},"payload":{"push_id":7561414884,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"7a3321c79f47804e80f6eb9357b9e06955b73ca6","before":"e68cdd068ddf8f151d0d4d9fc444f20ccdefc8a7","commits":[{"sha":"7a3321c79f47804e80f6eb9357b9e06955b73ca6","author":{"name":"kanei0415","email":"24491cfe1f487c3f36af2b6c86a4ee994a05216f@gmail.com"},"message":"Add : Post Modify","distinct":true,"url":"https://api.github.com/repos/H-A-T-C-A-T/KNU-Hakaton/commits/7a3321c79f47804e80f6eb9357b9e06955b73ca6"}]},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":86507794,"login":"H-A-T-C-A-T","gravatar_id":"","url":"https://api.github.com/orgs/H-A-T-C-A-T","avatar_url":"https://avatars.githubusercontent.com/u/86507794?"}}
+{"id":"17244207478","type":"PushEvent","actor":{"id":15136735,"login":"YuXiawei","display_login":"YuXiawei","gravatar_id":"","url":"https://api.github.com/users/YuXiawei","avatar_url":"https://avatars.githubusercontent.com/u/15136735?"},"repo":{"id":379790392,"name":"YuXiawei/iOS-Collection","url":"https://api.github.com/repos/YuXiawei/iOS-Collection"},"payload":{"push_id":7561414883,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"68f7415a7686c3b71b419a70a70e1255f2966cfd","before":"8021f89f1f17212d6206cebe70309c6bcd07e260","commits":[{"sha":"68f7415a7686c3b71b419a70a70e1255f2966cfd","author":{"name":"YyXia","email":"9aef40bed1086bcb5dfb00d6e5a50996b8b84134@qq.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/YuXiawei/iOS-Collection/commits/68f7415a7686c3b71b419a70a70e1255f2966cfd"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207483","type":"CreateEvent","actor":{"id":519830,"login":"hellodudu","display_login":"hellodudu","gravatar_id":"","url":"https://api.github.com/users/hellodudu","avatar_url":"https://avatars.githubusercontent.com/u/519830?"},"repo":{"id":357549615,"name":"hellodudu/task","url":"https://api.github.com/repos/hellodudu/task"},"payload":{"ref":"v1.1.5","ref_type":"tag","master_branch":"master","description":"task handle in queue","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207498","type":"CreateEvent","actor":{"id":65284784,"login":"rudjersimek","display_login":"rudjersimek","gravatar_id":"","url":"https://api.github.com/users/rudjersimek","avatar_url":"https://avatars.githubusercontent.com/u/65284784?"},"repo":{"id":388010157,"name":"arguo-gxp/synapse-gdp-kviz","url":"https://api.github.com/repos/arguo-gxp/synapse-gdp-kviz"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":62749039,"login":"arguo-gxp","gravatar_id":"","url":"https://api.github.com/orgs/arguo-gxp","avatar_url":"https://avatars.githubusercontent.com/u/62749039?"}}
+{"id":"17244207500","type":"PushEvent","actor":{"id":16883389,"login":"TheRogerDodger","display_login":"TheRogerDodger","gravatar_id":"","url":"https://api.github.com/users/TheRogerDodger","avatar_url":"https://avatars.githubusercontent.com/u/16883389?"},"repo":{"id":309290217,"name":"TheRogerDodger/Portfolio","url":"https://api.github.com/repos/TheRogerDodger/Portfolio"},"payload":{"push_id":7561414895,"size":1,"distinct_size":1,"ref":"refs/heads/gh-pages","head":"26df348ef1b23cb7609133385012c56570fbc1af","before":"f69d430e5936f185580354a528d6ddd1683aad37","commits":[{"sha":"26df348ef1b23cb7609133385012c56570fbc1af","author":{"name":"Roger Johnson","email":"d8914b028ee7a727816dd536b6f19cebd69fd878@gmail.com"},"message":"Update index.md","distinct":true,"url":"https://api.github.com/repos/TheRogerDodger/Portfolio/commits/26df348ef1b23cb7609133385012c56570fbc1af"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207505","type":"PushEvent","actor":{"id":698003,"login":"thinkyhead","display_login":"thinkyhead","gravatar_id":"","url":"https://api.github.com/users/thinkyhead","avatar_url":"https://avatars.githubusercontent.com/u/698003?"},"repo":{"id":298356391,"name":"Malderin/Marlin_2.0.x_official","url":"https://api.github.com/repos/Malderin/Marlin_2.0.x_official"},"payload":{"push_id":7561414891,"size":1,"distinct_size":1,"ref":"refs/heads/fan_control","head":"2baa6913d14ed34ba27560df7f7dd7b22f1608a5","before":"bb8114cccd4e5740565e5242d41d0bae4fa8a423","commits":[{"sha":"2baa6913d14ed34ba27560df7f7dd7b22f1608a5","author":{"name":"Scott Lahteine","email":"64b2b6d12bfe4baae7dad3d018f8cbf6b0e7a044@thinkyhead.com"},"message":"Rounding should be ok, yes?","distinct":true,"url":"https://api.github.com/repos/Malderin/Marlin_2.0.x_official/commits/2baa6913d14ed34ba27560df7f7dd7b22f1608a5"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207506","type":"PushEvent","actor":{"id":83536916,"login":"swagmode","display_login":"swagmode","gravatar_id":"","url":"https://api.github.com/users/swagmode","avatar_url":"https://avatars.githubusercontent.com/u/83536916?"},"repo":{"id":363624124,"name":"swagmode/swagmode","url":"https://api.github.com/repos/swagmode/swagmode"},"payload":{"push_id":7561414900,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"6a390545a132c8e640d9531e1cd14379380344ac","before":"0e3af0c3f579a199df2328e2f686ee247d17f64b","commits":[{"sha":"6a390545a132c8e640d9531e1cd14379380344ac","author":{"name":"swagmode","email":"789929612471da05903f15269d696334553162fd@users.noreply.github.com"},"message":"Update swagmain","distinct":true,"url":"https://api.github.com/repos/swagmode/swagmode/commits/6a390545a132c8e640d9531e1cd14379380344ac"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207508","type":"ForkEvent","actor":{"id":81348598,"login":"AgurZheng","display_login":"AgurZheng","gravatar_id":"","url":"https://api.github.com/users/AgurZheng","avatar_url":"https://avatars.githubusercontent.com/u/81348598?"},"repo":{"id":213012659,"name":"bclswl0827/v2ray-heroku","url":"https://api.github.com/repos/bclswl0827/v2ray-heroku"},"payload":{"forkee":{"id":388010495,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMTA0OTU=","name":"v2ray-heroku","full_name":"AgurZheng/v2ray-heroku","private":false,"owner":{"login":"AgurZheng","id":81348598,"node_id":"MDQ6VXNlcjgxMzQ4NTk4","avatar_url":"https://avatars.githubusercontent.com/u/81348598?v=4","gravatar_id":"","url":"https://api.github.com/users/AgurZheng","html_url":"https://github.com/AgurZheng","followers_url":"https://api.github.com/users/AgurZheng/followers","following_url":"https://api.github.com/users/AgurZheng/following{/other_user}","gists_url":"https://api.github.com/users/AgurZheng/gists{/gist_id}","starred_url":"https://api.github.com/users/AgurZheng/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AgurZheng/subscriptions","organizations_url":"https://api.github.com/users/AgurZheng/orgs","repos_url":"https://api.github.com/users/AgurZheng/repos","events_url":"https://api.github.com/users/AgurZheng/events{/privacy}","received_events_url":"https://api.github.com/users/AgurZheng/received_events","type":"User","site_admin":false},"html_url":"https://github.com/AgurZheng/v2ray-heroku","description":"用于在 Heroku 上部署 V2Ray WebSocket。","fork":true,"url":"https://api.github.com/repos/AgurZheng/v2ray-heroku","forks_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/forks","keys_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/keys{/key_id}","collaborators_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/teams","hooks_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/hooks","issue_events_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/issues/events{/number}","events_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/events","assignees_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/assignees{/user}","branches_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/branches{/branch}","tags_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/tags","blobs_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/git/refs{/sha}","trees_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/git/trees{/sha}","statuses_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/statuses/{sha}","languages_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/languages","stargazers_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/stargazers","contributors_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/contributors","subscribers_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/subscribers","subscription_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/subscription","commits_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/commits{/sha}","git_commits_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/git/commits{/sha}","comments_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/comments{/number}","issue_comment_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/issues/comments{/number}","contents_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/contents/{+path}","compare_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/compare/{base}...{head}","merges_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/merges","archive_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/downloads","issues_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/issues{/number}","pulls_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/pulls{/number}","milestones_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/milestones{/number}","notifications_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/labels{/name}","releases_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/releases{/id}","deployments_url":"https://api.github.com/repos/AgurZheng/v2ray-heroku/deployments","created_at":"2021-07-21T06:00:00Z","updated_at":"2021-07-21T03:18:22Z","pushed_at":"2021-07-11T12:19:27Z","git_url":"git://github.com/AgurZheng/v2ray-heroku.git","ssh_url":"git@github.com:AgurZheng/v2ray-heroku.git","clone_url":"https://github.com/AgurZheng/v2ray-heroku.git","svn_url":"https://github.com/AgurZheng/v2ray-heroku","homepage":"https://ibcl.us/Heroku-V2Ray_20191014/","size":95,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207513","type":"IssueCommentEvent","actor":{"id":16376959,"login":"Little-Wallace","display_login":"Little-Wallace","gravatar_id":"","url":"https://api.github.com/users/Little-Wallace","avatar_url":"https://avatars.githubusercontent.com/u/16376959?"},"repo":{"id":157680689,"name":"tikv/client-java","url":"https://api.github.com/repos/tikv/client-java"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/tikv/client-java/issues/235","repository_url":"https://api.github.com/repos/tikv/client-java","labels_url":"https://api.github.com/repos/tikv/client-java/issues/235/labels{/name}","comments_url":"https://api.github.com/repos/tikv/client-java/issues/235/comments","events_url":"https://api.github.com/repos/tikv/client-java/issues/235/events","html_url":"https://github.com/tikv/client-java/pull/235","id":948411274,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMjU5MTEz","number":235,"title":"fix test","user":{"login":"Little-Wallace","id":16376959,"node_id":"MDQ6VXNlcjE2Mzc2OTU5","avatar_url":"https://avatars.githubusercontent.com/u/16376959?v=4","gravatar_id":"","url":"https://api.github.com/users/Little-Wallace","html_url":"https://github.com/Little-Wallace","followers_url":"https://api.github.com/users/Little-Wallace/followers","following_url":"https://api.github.com/users/Little-Wallace/following{/other_user}","gists_url":"https://api.github.com/users/Little-Wallace/gists{/gist_id}","starred_url":"https://api.github.com/users/Little-Wallace/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Little-Wallace/subscriptions","organizations_url":"https://api.github.com/users/Little-Wallace/orgs","repos_url":"https://api.github.com/users/Little-Wallace/repos","events_url":"https://api.github.com/users/Little-Wallace/events{/privacy}","received_events_url":"https://api.github.com/users/Little-Wallace/received_events","type":"User","site_admin":false},"labels":[{"id":2944716585,"node_id":"MDU6TGFiZWwyOTQ0NzE2NTg1","url":"https://api.github.com/repos/tikv/client-java/labels/status/LGT1","name":"status/LGT1","color":"ededed","default":false,"description":null},{"id":2944722937,"node_id":"MDU6TGFiZWwyOTQ0NzIyOTM3","url":"https://api.github.com/repos/tikv/client-java/labels/status/can-merge","name":"status/can-merge","color":"ededed","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":5,"created_at":"2021-07-20T08:13:08Z","updated_at":"2021-07-21T06:00:01Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/tikv/client-java/pulls/235","html_url":"https://github.com/tikv/client-java/pull/235","diff_url":"https://github.com/tikv/client-java/pull/235.diff","patch_url":"https://github.com/tikv/client-java/pull/235.patch"},"body":"Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>\r\n\r\n### What problem does this PR solve? <!--add issue link with summary if exists-->\r\n\r\n\r\n### What is changed and how it works?\r\n\r\n\r\n### Check List <!--REMOVE the items that are not applicable-->\r\n\r\nTests <!-- At least one of them must be included. -->\r\n\r\n - Unit test\r\n - Integration test\r\n - Manual test (add detailed scripts or steps below)\r\n - No code\r\n\r\nCode changes\r\n\r\n - Has exported function/method change\r\n - Has exported variable/fields change\r\n - Has interface methods change\r\n - Has persistent data change\r\n\r\nSide effects\r\n\r\n - Possible performance regression\r\n - Increased code complexity\r\n - Breaking backward compatibility\r\n\r\nRelated changes\r\n\r\n - Need to cherry-pick to the release branch\r\n - Need to update the documentation\r\n - Need to be included in the release note\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/tikv/client-java/issues/comments/883913999","html_url":"https://github.com/tikv/client-java/pull/235#issuecomment-883913999","issue_url":"https://api.github.com/repos/tikv/client-java/issues/235","id":883913999,"node_id":"IC_kwDOCWYEMc40r3UP","user":{"login":"Little-Wallace","id":16376959,"node_id":"MDQ6VXNlcjE2Mzc2OTU5","avatar_url":"https://avatars.githubusercontent.com/u/16376959?v=4","gravatar_id":"","url":"https://api.github.com/users/Little-Wallace","html_url":"https://github.com/Little-Wallace","followers_url":"https://api.github.com/users/Little-Wallace/followers","following_url":"https://api.github.com/users/Little-Wallace/following{/other_user}","gists_url":"https://api.github.com/users/Little-Wallace/gists{/gist_id}","starred_url":"https://api.github.com/users/Little-Wallace/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Little-Wallace/subscriptions","organizations_url":"https://api.github.com/users/Little-Wallace/orgs","repos_url":"https://api.github.com/users/Little-Wallace/repos","events_url":"https://api.github.com/users/Little-Wallace/events{/privacy}","received_events_url":"https://api.github.com/users/Little-Wallace/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T06:00:01Z","updated_at":"2021-07-21T06:00:01Z","author_association":"CONTRIBUTOR","body":"/merge","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":41004122,"login":"tikv","gravatar_id":"","url":"https://api.github.com/orgs/tikv","avatar_url":"https://avatars.githubusercontent.com/u/41004122?"}}
+{"id":"17244207521","type":"PushEvent","actor":{"id":80952336,"login":"weather-now-data2","display_login":"weather-now-data2","gravatar_id":"","url":"https://api.github.com/users/weather-now-data2","avatar_url":"https://avatars.githubusercontent.com/u/80952336?"},"repo":{"id":349369264,"name":"weather-now-data2/weather-now-data2.github.io","url":"https://api.github.com/repos/weather-now-data2/weather-now-data2.github.io"},"payload":{"push_id":7561414893,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"80bd22fd8d37666f79e59469413461d4f73ca4f6","before":"8a2e816db96c949315853981173b291592205136","commits":[{"sha":"80bd22fd8d37666f79e59469413461d4f73ca4f6","author":{"name":"weather-now-data2","email":"fdb8fd3bcbc6ca1a56b90d28769ba0b8f0d56a23@users.noreply.github.com"},"message":"Create data/forecast/20210724/202107241500-temp_7_3_3_95.jpg","distinct":true,"url":"https://api.github.com/repos/weather-now-data2/weather-now-data2.github.io/commits/80bd22fd8d37666f79e59469413461d4f73ca4f6"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207525","type":"PullRequestEvent","actor":{"id":87747382,"login":"NikitaHap","display_login":"NikitaHap","gravatar_id":"","url":"https://api.github.com/users/NikitaHap","avatar_url":"https://avatars.githubusercontent.com/u/87747382?"},"repo":{"id":388007655,"name":"NikitaHap/OneProject","url":"https://api.github.com/repos/NikitaHap/OneProject"},"payload":{"action":"opened","number":2,"pull_request":{"url":"https://api.github.com/repos/NikitaHap/OneProject/pulls/2","id":694073965,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTY1","html_url":"https://github.com/NikitaHap/OneProject/pull/2","diff_url":"https://github.com/NikitaHap/OneProject/pull/2.diff","patch_url":"https://github.com/NikitaHap/OneProject/pull/2.patch","issue_url":"https://api.github.com/repos/NikitaHap/OneProject/issues/2","number":2,"state":"open","locked":false,"title":"Update README.md","user":{"login":"NikitaHap","id":87747382,"node_id":"MDQ6VXNlcjg3NzQ3Mzgy","avatar_url":"https://avatars.githubusercontent.com/u/87747382?v=4","gravatar_id":"","url":"https://api.github.com/users/NikitaHap","html_url":"https://github.com/NikitaHap","followers_url":"https://api.github.com/users/NikitaHap/followers","following_url":"https://api.github.com/users/NikitaHap/following{/other_user}","gists_url":"https://api.github.com/users/NikitaHap/gists{/gist_id}","starred_url":"https://api.github.com/users/NikitaHap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NikitaHap/subscriptions","organizations_url":"https://api.github.com/users/NikitaHap/orgs","repos_url":"https://api.github.com/users/NikitaHap/repos","events_url":"https://api.github.com/users/NikitaHap/events{/privacy}","received_events_url":"https://api.github.com/users/NikitaHap/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T06:00:00Z","updated_at":"2021-07-21T06:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/NikitaHap/OneProject/pulls/2/commits","review_comments_url":"https://api.github.com/repos/NikitaHap/OneProject/pulls/2/comments","review_comment_url":"https://api.github.com/repos/NikitaHap/OneProject/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NikitaHap/OneProject/issues/2/comments","statuses_url":"https://api.github.com/repos/NikitaHap/OneProject/statuses/12033b98524e4a4897a5cd694a6d9839ab54483b","head":{"label":"NikitaHap:readme-edit","ref":"readme-edit","sha":"12033b98524e4a4897a5cd694a6d9839ab54483b","user":{"login":"NikitaHap","id":87747382,"node_id":"MDQ6VXNlcjg3NzQ3Mzgy","avatar_url":"https://avatars.githubusercontent.com/u/87747382?v=4","gravatar_id":"","url":"https://api.github.com/users/NikitaHap","html_url":"https://github.com/NikitaHap","followers_url":"https://api.github.com/users/NikitaHap/followers","following_url":"https://api.github.com/users/NikitaHap/following{/other_user}","gists_url":"https://api.github.com/users/NikitaHap/gists{/gist_id}","starred_url":"https://api.github.com/users/NikitaHap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NikitaHap/subscriptions","organizations_url":"https://api.github.com/users/NikitaHap/orgs","repos_url":"https://api.github.com/users/NikitaHap/repos","events_url":"https://api.github.com/users/NikitaHap/events{/privacy}","received_events_url":"https://api.github.com/users/NikitaHap/received_events","type":"User","site_admin":false},"repo":{"id":388007655,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMDc2NTU=","name":"OneProject","full_name":"NikitaHap/OneProject","private":false,"owner":{"login":"NikitaHap","id":87747382,"node_id":"MDQ6VXNlcjg3NzQ3Mzgy","avatar_url":"https://avatars.githubusercontent.com/u/87747382?v=4","gravatar_id":"","url":"https://api.github.com/users/NikitaHap","html_url":"https://github.com/NikitaHap","followers_url":"https://api.github.com/users/NikitaHap/followers","following_url":"https://api.github.com/users/NikitaHap/following{/other_user}","gists_url":"https://api.github.com/users/NikitaHap/gists{/gist_id}","starred_url":"https://api.github.com/users/NikitaHap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NikitaHap/subscriptions","organizations_url":"https://api.github.com/users/NikitaHap/orgs","repos_url":"https://api.github.com/users/NikitaHap/repos","events_url":"https://api.github.com/users/NikitaHap/events{/privacy}","received_events_url":"https://api.github.com/users/NikitaHap/received_events","type":"User","site_admin":false},"html_url":"https://github.com/NikitaHap/OneProject","description":null,"fork":false,"url":"https://api.github.com/repos/NikitaHap/OneProject","forks_url":"https://api.github.com/repos/NikitaHap/OneProject/forks","keys_url":"https://api.github.com/repos/NikitaHap/OneProject/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NikitaHap/OneProject/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NikitaHap/OneProject/teams","hooks_url":"https://api.github.com/repos/NikitaHap/OneProject/hooks","issue_events_url":"https://api.github.com/repos/NikitaHap/OneProject/issues/events{/number}","events_url":"https://api.github.com/repos/NikitaHap/OneProject/events","assignees_url":"https://api.github.com/repos/NikitaHap/OneProject/assignees{/user}","branches_url":"https://api.github.com/repos/NikitaHap/OneProject/branches{/branch}","tags_url":"https://api.github.com/repos/NikitaHap/OneProject/tags","blobs_url":"https://api.github.com/repos/NikitaHap/OneProject/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NikitaHap/OneProject/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NikitaHap/OneProject/git/refs{/sha}","trees_url":"https://api.github.com/repos/NikitaHap/OneProject/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NikitaHap/OneProject/statuses/{sha}","languages_url":"https://api.github.com/repos/NikitaHap/OneProject/languages","stargazers_url":"https://api.github.com/repos/NikitaHap/OneProject/stargazers","contributors_url":"https://api.github.com/repos/NikitaHap/OneProject/contributors","subscribers_url":"https://api.github.com/repos/NikitaHap/OneProject/subscribers","subscription_url":"https://api.github.com/repos/NikitaHap/OneProject/subscription","commits_url":"https://api.github.com/repos/NikitaHap/OneProject/commits{/sha}","git_commits_url":"https://api.github.com/repos/NikitaHap/OneProject/git/commits{/sha}","comments_url":"https://api.github.com/repos/NikitaHap/OneProject/comments{/number}","issue_comment_url":"https://api.github.com/repos/NikitaHap/OneProject/issues/comments{/number}","contents_url":"https://api.github.com/repos/NikitaHap/OneProject/contents/{+path}","compare_url":"https://api.github.com/repos/NikitaHap/OneProject/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NikitaHap/OneProject/merges","archive_url":"https://api.github.com/repos/NikitaHap/OneProject/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NikitaHap/OneProject/downloads","issues_url":"https://api.github.com/repos/NikitaHap/OneProject/issues{/number}","pulls_url":"https://api.github.com/repos/NikitaHap/OneProject/pulls{/number}","milestones_url":"https://api.github.com/repos/NikitaHap/OneProject/milestones{/number}","notifications_url":"https://api.github.com/repos/NikitaHap/OneProject/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NikitaHap/OneProject/labels{/name}","releases_url":"https://api.github.com/repos/NikitaHap/OneProject/releases{/id}","deployments_url":"https://api.github.com/repos/NikitaHap/OneProject/deployments","created_at":"2021-07-21T05:46:08Z","updated_at":"2021-07-21T05:46:11Z","pushed_at":"2021-07-21T06:00:01Z","git_url":"git://github.com/NikitaHap/OneProject.git","ssh_url":"git@github.com:NikitaHap/OneProject.git","clone_url":"https://github.com/NikitaHap/OneProject.git","svn_url":"https://github.com/NikitaHap/OneProject","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"NikitaHap:main","ref":"main","sha":"7965fa73d362dba6979e5b6b195989c305096b4f","user":{"login":"NikitaHap","id":87747382,"node_id":"MDQ6VXNlcjg3NzQ3Mzgy","avatar_url":"https://avatars.githubusercontent.com/u/87747382?v=4","gravatar_id":"","url":"https://api.github.com/users/NikitaHap","html_url":"https://github.com/NikitaHap","followers_url":"https://api.github.com/users/NikitaHap/followers","following_url":"https://api.github.com/users/NikitaHap/following{/other_user}","gists_url":"https://api.github.com/users/NikitaHap/gists{/gist_id}","starred_url":"https://api.github.com/users/NikitaHap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NikitaHap/subscriptions","organizations_url":"https://api.github.com/users/NikitaHap/orgs","repos_url":"https://api.github.com/users/NikitaHap/repos","events_url":"https://api.github.com/users/NikitaHap/events{/privacy}","received_events_url":"https://api.github.com/users/NikitaHap/received_events","type":"User","site_admin":false},"repo":{"id":388007655,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMDc2NTU=","name":"OneProject","full_name":"NikitaHap/OneProject","private":false,"owner":{"login":"NikitaHap","id":87747382,"node_id":"MDQ6VXNlcjg3NzQ3Mzgy","avatar_url":"https://avatars.githubusercontent.com/u/87747382?v=4","gravatar_id":"","url":"https://api.github.com/users/NikitaHap","html_url":"https://github.com/NikitaHap","followers_url":"https://api.github.com/users/NikitaHap/followers","following_url":"https://api.github.com/users/NikitaHap/following{/other_user}","gists_url":"https://api.github.com/users/NikitaHap/gists{/gist_id}","starred_url":"https://api.github.com/users/NikitaHap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NikitaHap/subscriptions","organizations_url":"https://api.github.com/users/NikitaHap/orgs","repos_url":"https://api.github.com/users/NikitaHap/repos","events_url":"https://api.github.com/users/NikitaHap/events{/privacy}","received_events_url":"https://api.github.com/users/NikitaHap/received_events","type":"User","site_admin":false},"html_url":"https://github.com/NikitaHap/OneProject","description":null,"fork":false,"url":"https://api.github.com/repos/NikitaHap/OneProject","forks_url":"https://api.github.com/repos/NikitaHap/OneProject/forks","keys_url":"https://api.github.com/repos/NikitaHap/OneProject/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NikitaHap/OneProject/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NikitaHap/OneProject/teams","hooks_url":"https://api.github.com/repos/NikitaHap/OneProject/hooks","issue_events_url":"https://api.github.com/repos/NikitaHap/OneProject/issues/events{/number}","events_url":"https://api.github.com/repos/NikitaHap/OneProject/events","assignees_url":"https://api.github.com/repos/NikitaHap/OneProject/assignees{/user}","branches_url":"https://api.github.com/repos/NikitaHap/OneProject/branches{/branch}","tags_url":"https://api.github.com/repos/NikitaHap/OneProject/tags","blobs_url":"https://api.github.com/repos/NikitaHap/OneProject/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NikitaHap/OneProject/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NikitaHap/OneProject/git/refs{/sha}","trees_url":"https://api.github.com/repos/NikitaHap/OneProject/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NikitaHap/OneProject/statuses/{sha}","languages_url":"https://api.github.com/repos/NikitaHap/OneProject/languages","stargazers_url":"https://api.github.com/repos/NikitaHap/OneProject/stargazers","contributors_url":"https://api.github.com/repos/NikitaHap/OneProject/contributors","subscribers_url":"https://api.github.com/repos/NikitaHap/OneProject/subscribers","subscription_url":"https://api.github.com/repos/NikitaHap/OneProject/subscription","commits_url":"https://api.github.com/repos/NikitaHap/OneProject/commits{/sha}","git_commits_url":"https://api.github.com/repos/NikitaHap/OneProject/git/commits{/sha}","comments_url":"https://api.github.com/repos/NikitaHap/OneProject/comments{/number}","issue_comment_url":"https://api.github.com/repos/NikitaHap/OneProject/issues/comments{/number}","contents_url":"https://api.github.com/repos/NikitaHap/OneProject/contents/{+path}","compare_url":"https://api.github.com/repos/NikitaHap/OneProject/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NikitaHap/OneProject/merges","archive_url":"https://api.github.com/repos/NikitaHap/OneProject/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NikitaHap/OneProject/downloads","issues_url":"https://api.github.com/repos/NikitaHap/OneProject/issues{/number}","pulls_url":"https://api.github.com/repos/NikitaHap/OneProject/pulls{/number}","milestones_url":"https://api.github.com/repos/NikitaHap/OneProject/milestones{/number}","notifications_url":"https://api.github.com/repos/NikitaHap/OneProject/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NikitaHap/OneProject/labels{/name}","releases_url":"https://api.github.com/repos/NikitaHap/OneProject/releases{/id}","deployments_url":"https://api.github.com/repos/NikitaHap/OneProject/deployments","created_at":"2021-07-21T05:46:08Z","updated_at":"2021-07-21T05:46:11Z","pushed_at":"2021-07-21T06:00:01Z","git_url":"git://github.com/NikitaHap/OneProject.git","ssh_url":"git@github.com:NikitaHap/OneProject.git","clone_url":"https://github.com/NikitaHap/OneProject.git","svn_url":"https://github.com/NikitaHap/OneProject","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/NikitaHap/OneProject/pulls/2"},"html":{"href":"https://github.com/NikitaHap/OneProject/pull/2"},"issue":{"href":"https://api.github.com/repos/NikitaHap/OneProject/issues/2"},"comments":{"href":"https://api.github.com/repos/NikitaHap/OneProject/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/NikitaHap/OneProject/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/NikitaHap/OneProject/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NikitaHap/OneProject/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/NikitaHap/OneProject/statuses/12033b98524e4a4897a5cd694a6d9839ab54483b"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207527","type":"PullRequestEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":252766607,"name":"Georges7Haddad/BubblyEverAfter","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter"},"payload":{"action":"opened","number":145,"pull_request":{"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/145","id":694073964,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTY0","html_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/145","diff_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/145.diff","patch_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/145.patch","issue_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/145","number":145,"state":"open","locked":false,"title":"Bump pylint from 2.5.0 to 2.9.4","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [pylint](https://github.com/PyCQA/pylint) from 2.5.0 to 2.9.4.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/PyCQA/pylint/releases\">pylint's releases</a>.</em></p>\n<blockquote>\n<h2>pylint-2.8.1</h2>\n<ul>\n<li>\n<p>Add numversion back (temporarily) in <code>__pkginfo__</code> because it broke Pylama and revert the unnecessary\n<code>pylint.version</code> breaking change.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4399\">#4399</a></p>\n</li>\n</ul>\n<h2>pylint-2.8.0</h2>\n<ul>\n<li>\n<p>New refactoring message <code>consider-using-with</code>. This message is emitted if resource-allocating functions or methods of the\nstandard library (like <code>open()</code> or <code>threading.Lock.acquire()</code>) that can be used as a context manager are called without\na <code>with</code> block.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3413\">#3413</a></p>\n</li>\n<li>\n<p>Resolve false positives on unused variables in decorator functions</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4252\">#4252</a></p>\n</li>\n<li>\n<p>Add new extension <code>ConfusingConsecutiveElifChecker</code>. This optional checker emits a refactoring message (R5601 <code>confusing-consecutive-elif</code>)\nif if/elif statements with different indentation levels follow directly one after the other.</p>\n</li>\n<li>\n<p>New option <code>--output=&lt;file&gt;</code> to output result to a file rather than printing to stdout.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/1070\">#1070</a></p>\n</li>\n<li>\n<p>Use a prescriptive message for <code>unidiomatic-typecheck</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3891\">#3891</a></p>\n</li>\n<li>\n<p>Apply <code>const-naming-style</code> to module constants annotated with\n<code>typing.Final</code></p>\n</li>\n<li>\n<p>The packaging is now done via setuptools exclusively. <code>doc</code>, <code>tests</code>, <code>man</code>, <code>elisp</code> and <code>Changelog</code> are\nnot packaged anymore - reducing the size of the package by 75%.</p>\n</li>\n<li>\n<p>Debian packaging is now  (officially) done in <a href=\"https://salsa.debian.org/python-team/packages/pylint\">https://salsa.debian.org/python-team/packages/pylint</a>.</p>\n</li>\n<li>\n<p>The 'doc' extra-require has been removed.</p>\n</li>\n<li>\n<p><code>__pkginfo__</code> now only contain <code>__version__</code> (also accessible with <code>pylint.__version__</code>), other meta-information are still\naccessible with <code>import importlib;metadata.metadata('pylint')</code>.</p>\n</li>\n<li>\n<p>COPYING has been renamed to LICENSE for standardization.</p>\n</li>\n<li>\n<p>Fix false-positive <code>used-before-assignment</code> in function returns.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4301\">#4301</a></p>\n</li>\n<li>\n<p>Updated <code>astroid</code> to 2.5.3</p>\n</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/PyCQA/pylint/blob/main/ChangeLog\">pylint's changelog</a>.</em></p>\n<blockquote>\n<h1>What's New in Pylint 2.9.4?</h1>\n<p>Release date: 2021-07-20</p>\n<ul>\n<li>\n<p>Added <code>time.clock</code> to deprecated functions/methods for python 3.3</p>\n</li>\n<li>\n<p>Fix bug in which --fail-on can return a zero exit code even when the specified issue is present</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4296\">#4296</a>\nCloses <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3363\">#3363</a></p>\n</li>\n<li>\n<p>Fix hard failure when handling missing attribute in a class with duplicated bases</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4687\">#4687</a></p>\n</li>\n<li>\n<p>Fix false-positive <code>consider-using-with</code> (R1732) if a ternary conditional is used together with <code>with</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4676\">#4676</a></p>\n</li>\n<li>\n<p>Fix false-positive <code>deprecated-module</code> when relative import uses deprecated module name.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4629\">#4629</a></p>\n</li>\n<li>\n<p>Fix false-positive <code>consider-using-with</code> (R1732) if <code>contextlib.ExitStack</code> takes care of calling the <code>__exit__</code> method</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4654\">#4654</a></p>\n</li>\n<li>\n<p>Fix a false positive for <code>unused-private-member</code> when mutating a private attribute\nwith <code>cls</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4657\">#4657</a></p>\n</li>\n<li>\n<p>Fix ignored empty functions by similarities checker with &quot;ignore-signatures&quot; option enabled</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4652\">#4652</a></p>\n</li>\n<li>\n<p>Fix false-positive of <code>use-maxsplit-arg</code> when index is incremented in\na loop</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4664\">#4664</a></p>\n</li>\n<li>\n<p>Don't emit <code>cyclic-import</code> message if import is guarded by <code>typing.TYPE_CHECKING</code>.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3525\">#3525</a></p>\n</li>\n<li>\n<p>Fix false-positive <code>not-callable</code> with alternative <code>TypedDict</code> syntax</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4715\">#4715</a></p>\n</li>\n<li>\n<p>Clarify documentation for consider-using-from-import</p>\n</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/867d61b2345a1322474ad2a9772c9e1ef3e218c3\"><code>867d61b</code></a> Bump pylint to 2.9.4, update changelog</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/dd54e55265c5b3dc8d99278e77a9c73359fb4ccf\"><code>dd54e55</code></a> Fix 4689 Exclude <code>ThreadPoolExecutor</code> and <code>ProcessPoolExecutor</code> from ``co...</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/3fe9954b2c19688a06df5d941de1ee6281c0324e\"><code>3fe9954</code></a> [pre-commit.ci] auto fixes from pre-commit.com hooks</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/b95668bc7259f69c63fe236415497c4b6b38286d\"><code>b95668b</code></a> Added <code>time.clock</code> to deprecated functions/methods for python 3.3.</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/838a8b2bf5fefa4a95d29e1d6cd337b09624e705\"><code>838a8b2</code></a> [pre-commit.ci] pre-commit autoupdate (<a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4726\">#4726</a>)</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/6b9119a5d09d08713d150af4ece6368e879255ea\"><code>6b9119a</code></a> Upgrade astroid to 2.6.4</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/4b0ea3192166b525511bcf137e1a546f9832f048\"><code>4b0ea31</code></a> Add a regression test for generator raised StopIteration <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4723\">#4723</a></li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/f437752ae66dea1c2027dfb4b240b3d2287d89e7\"><code>f437752</code></a> Add regression test TypedDict not-callable (<a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4717\">#4717</a>)</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/bf493bb85e4419411d648df1355a694a6106c4e3\"><code>bf493bb</code></a> Ignore import errors if in guarded import block (<a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4702\">#4702</a>)</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/6a166250526b1c6da25c639327197e3ad05709f4\"><code>6a16625</code></a> Fix cyclic import with TYPE_CHECKING (<a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4703\">#4703</a>)</li>\n<li>Additional commits viewable in <a href=\"https://github.com/PyCQA/pylint/compare/pylint-2.5.0...v2.9.4\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=pylint&package-manager=pip&previous-version=2.5.0&new-version=2.9.4)](https://dependabot.com/compatibility-score/?dependency-name=pylint&package-manager=pip&previous-version=2.5.0&new-version=2.9.4)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):\n- Update frequency (including time of day and day of week)\n- Pull request limits (per update run and/or open at any time)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","created_at":"2021-07-21T06:00:00Z","updated_at":"2021-07-21T06:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/145/commits","review_comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/145/comments","review_comment_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/145/comments","statuses_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/a515903e342af6f4dfd5277f14fd544a146a8793","head":{"label":"Georges7Haddad:dependabot/pip/develop/pylint-2.9.4","ref":"dependabot/pip/develop/pylint-2.9.4","sha":"a515903e342af6f4dfd5277f14fd544a146a8793","user":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"repo":{"id":252766607,"node_id":"MDEwOlJlcG9zaXRvcnkyNTI3NjY2MDc=","name":"BubblyEverAfter","full_name":"Georges7Haddad/BubblyEverAfter","private":false,"owner":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Georges7Haddad/BubblyEverAfter","description":null,"fork":false,"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter","forks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/forks","keys_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/teams","hooks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/hooks","issue_events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/events{/number}","events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/events","assignees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/assignees{/user}","branches_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/branches{/branch}","tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/tags","blobs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/refs{/sha}","trees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/{sha}","languages_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/languages","stargazers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/stargazers","contributors_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contributors","subscribers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscribers","subscription_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscription","commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/commits{/sha}","git_commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/commits{/sha}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/comments{/number}","issue_comment_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/comments{/number}","contents_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contents/{+path}","compare_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/merges","archive_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/downloads","issues_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues{/number}","pulls_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls{/number}","milestones_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/milestones{/number}","notifications_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/labels{/name}","releases_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/releases{/id}","deployments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/deployments","created_at":"2020-04-03T15:10:17Z","updated_at":"2021-04-09T08:13:09Z","pushed_at":"2021-07-21T06:00:00Z","git_url":"git://github.com/Georges7Haddad/BubblyEverAfter.git","ssh_url":"git@github.com:Georges7Haddad/BubblyEverAfter.git","clone_url":"https://github.com/Georges7Haddad/BubblyEverAfter.git","svn_url":"https://github.com/Georges7Haddad/BubblyEverAfter","homepage":null,"size":17198,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":18,"license":null,"forks":0,"open_issues":18,"watchers":0,"default_branch":"master"}},"base":{"label":"Georges7Haddad:develop","ref":"develop","sha":"3eb7df99aafb5055b38a39ed20a39671c6d0dfe0","user":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"repo":{"id":252766607,"node_id":"MDEwOlJlcG9zaXRvcnkyNTI3NjY2MDc=","name":"BubblyEverAfter","full_name":"Georges7Haddad/BubblyEverAfter","private":false,"owner":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Georges7Haddad/BubblyEverAfter","description":null,"fork":false,"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter","forks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/forks","keys_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/teams","hooks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/hooks","issue_events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/events{/number}","events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/events","assignees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/assignees{/user}","branches_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/branches{/branch}","tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/tags","blobs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/refs{/sha}","trees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/{sha}","languages_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/languages","stargazers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/stargazers","contributors_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contributors","subscribers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscribers","subscription_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscription","commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/commits{/sha}","git_commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/commits{/sha}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/comments{/number}","issue_comment_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/comments{/number}","contents_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contents/{+path}","compare_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/merges","archive_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/downloads","issues_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues{/number}","pulls_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls{/number}","milestones_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/milestones{/number}","notifications_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/labels{/name}","releases_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/releases{/id}","deployments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/deployments","created_at":"2020-04-03T15:10:17Z","updated_at":"2021-04-09T08:13:09Z","pushed_at":"2021-07-21T06:00:00Z","git_url":"git://github.com/Georges7Haddad/BubblyEverAfter.git","ssh_url":"git@github.com:Georges7Haddad/BubblyEverAfter.git","clone_url":"https://github.com/Georges7Haddad/BubblyEverAfter.git","svn_url":"https://github.com/Georges7Haddad/BubblyEverAfter","homepage":null,"size":17198,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":18,"license":null,"forks":0,"open_issues":18,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/145"},"html":{"href":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/145"},"issue":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/145"},"comments":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/145/comments"},"review_comments":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/145/comments"},"review_comment":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/145/commits"},"statuses":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/a515903e342af6f4dfd5277f14fd544a146a8793"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207535","type":"PushEvent","actor":{"id":87601611,"login":"Muhammad-Aljufri","display_login":"Muhammad-Aljufri","gravatar_id":"","url":"https://api.github.com/users/Muhammad-Aljufri","avatar_url":"https://avatars.githubusercontent.com/u/87601611?"},"repo":{"id":388007937,"name":"Muhammad-Aljufri/Responsive-Project-Using-SASS","url":"https://api.github.com/repos/Muhammad-Aljufri/Responsive-Project-Using-SASS"},"payload":{"push_id":7561414914,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"75c6a6d3aa0641d9e0db4f2f7c4173362d3a303f","before":"91bf1650d4c630de70956ca89887d498a1dad22a","commits":[{"sha":"75c6a6d3aa0641d9e0db4f2f7c4173362d3a303f","author":{"name":"NJ-2020","email":"d4519cd851377f7af9f2b67016c34e0c52b736f4@users.noreply.github.com"},"message":"Update readme file","distinct":true,"url":"https://api.github.com/repos/Muhammad-Aljufri/Responsive-Project-Using-SASS/commits/75c6a6d3aa0641d9e0db4f2f7c4173362d3a303f"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207538","type":"WatchEvent","actor":{"id":48468979,"login":"liujoy","display_login":"liujoy","gravatar_id":"","url":"https://api.github.com/users/liujoy","avatar_url":"https://avatars.githubusercontent.com/u/48468979?"},"repo":{"id":98771110,"name":"zhongyang219/TrafficMonitor","url":"https://api.github.com/repos/zhongyang219/TrafficMonitor"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207541","type":"PushEvent","actor":{"id":171129,"login":"puredanger","display_login":"puredanger","gravatar_id":"","url":"https://api.github.com/users/puredanger","avatar_url":"https://avatars.githubusercontent.com/u/171129?"},"repo":{"id":98682008,"name":"clojure/brew-install","url":"https://api.github.com/repos/clojure/brew-install"},"payload":{"push_id":7561414906,"size":5,"distinct_size":5,"ref":"refs/heads/1.10.3","head":"16593bbdaa4b84214d6bf1541bf288d865483c9e","before":"fc75b6f74cc251eaed8ffa95e4ec1ac854c9aa38","commits":[{"sha":"b6e9866d5ea341ec032bdfbaff5c390554be4f5d","author":{"name":"Alex Miller","email":"99328387f8334f68433c424d2dfd83062f62754b@cognitect.com"},"message":"update to latest tools.tools","distinct":true,"url":"https://api.github.com/repos/clojure/brew-install/commits/b6e9866d5ea341ec032bdfbaff5c390554be4f5d"},{"sha":"daf25a4b48bf820343ed25ace4994bd9b6f6ccf1","author":{"name":"Alex Miller","email":"99328387f8334f68433c424d2dfd83062f62754b@cognitect.com"},"message":"TDEPS-189 Port -T changes to Windows powershell","distinct":true,"url":"https://api.github.com/repos/clojure/brew-install/commits/daf25a4b48bf820343ed25ace4994bd9b6f6ccf1"},{"sha":"b71c34e268e91d1ebb498c5ff3fcf22098eccf35","author":{"name":"Alex Miller","email":"99328387f8334f68433c424d2dfd83062f62754b@cognitect.com"},"message":"remove unused vars in clojure script","distinct":true,"url":"https://api.github.com/repos/clojure/brew-install/commits/b71c34e268e91d1ebb498c5ff3fcf22098eccf35"},{"sha":"f5d51d922203eb64dc7caa4854574faa6083be9b","author":{"name":"Alex Miller","email":"99328387f8334f68433c424d2dfd83062f62754b@cognitect.com"},"message":"remove bad change in the config paths for tool mode","distinct":true,"url":"https://api.github.com/repos/clojure/brew-install/commits/f5d51d922203eb64dc7caa4854574faa6083be9b"},{"sha":"16593bbdaa4b84214d6bf1541bf288d865483c9e","author":{"name":"Alex Miller","email":"99328387f8334f68433c424d2dfd83062f62754b@cognitect.com"},"message":"collapse -X/-T case in script","distinct":true,"url":"https://api.github.com/repos/clojure/brew-install/commits/16593bbdaa4b84214d6bf1541bf288d865483c9e"}]},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":317875,"login":"clojure","gravatar_id":"","url":"https://api.github.com/orgs/clojure","avatar_url":"https://avatars.githubusercontent.com/u/317875?"}}
+{"id":"17244207548","type":"PullRequestReviewEvent","actor":{"id":86106068,"login":"hakeen0618","display_login":"hakeen0618","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","avatar_url":"https://avatars.githubusercontent.com/u/86106068?"},"repo":{"id":170803235,"name":"magma/magma","url":"https://api.github.com/repos/magma/magma"},"payload":{"action":"created","review":{"id":711282642,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMjgyNjQy","user":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"body":null,"commit_id":"cac401202bc67835b46c97e4f5db5e6f66e61b48","submitted_at":"2021-07-21T06:00:01Z","state":"commented","html_url":"https://github.com/magma/magma/pull/8124#pullrequestreview-711282642","pull_request_url":"https://api.github.com/repos/magma/magma/pulls/8124","author_association":"NONE","_links":{"html":{"href":"https://github.com/magma/magma/pull/8124#pullrequestreview-711282642"},"pull_request":{"href":"https://api.github.com/repos/magma/magma/pulls/8124"}}},"pull_request":{"url":"https://api.github.com/repos/magma/magma/pulls/8124","id":691208930,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkxMjA4OTMw","html_url":"https://github.com/magma/magma/pull/8124","diff_url":"https://github.com/magma/magma/pull/8124.diff","patch_url":"https://github.com/magma/magma/pull/8124.patch","issue_url":"https://api.github.com/repos/magma/magma/issues/8124","number":8124,"state":"open","locked":false,"title":"[nms,agw,orc8r] Adding MME_IP to eNB configs","user":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"body":"<!--\r\n    Tag your PR title with the components that it touches along with\r\n    the type of change\r\n    E.g. \"fix(orc8r): Fix reindexer race condition\" or \"feat(agw) ...\"\r\n-->\r\nSigned-off-by: HakeenHan hanhufeng@baicells.com\r\n## Summary\r\n\r\n\r\n- Adding MME_IP value to eNB  configs\r\n- MME_IP parameter is used to set enb  in the nms UI .\r\n\r\n\r\n## Test Plan\r\n\r\n<!--\r\n    How did you test your change? How do you know it works?\r\n    Add supporting screenshots, terminal pastes, etc. as necessary\r\n-->\r\n- make precommit\r\n- running locally with eNB configured manually.\r\n\r\n\r\n## Additional Information\r\n\r\n- [ ] This change is backwards-breaking\r\n\r\n<!--\r\n    If this is a backwards-breaking change, document the upgrade instructions.\r\n    All upgrade instructions for backwards-breaking changes will be aggregated\r\n    in the next release's changelog so this is very important to fill out.\r\n-->\r\nThis adds mme_ip field for managed configs. however we don't have any of these registered yet on any of the environments so we should be good.","created_at":"2021-07-16T05:33:00Z","updated_at":"2021-07-21T06:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3e9f5d947e7b08d383c619c1992fb81e3adddad9","assignee":null,"assignees":[],"requested_reviewers":[{"login":"emakeev","id":2341877,"node_id":"MDQ6VXNlcjIzNDE4Nzc=","avatar_url":"https://avatars.githubusercontent.com/u/2341877?v=4","gravatar_id":"","url":"https://api.github.com/users/emakeev","html_url":"https://github.com/emakeev","followers_url":"https://api.github.com/users/emakeev/followers","following_url":"https://api.github.com/users/emakeev/following{/other_user}","gists_url":"https://api.github.com/users/emakeev/gists{/gist_id}","starred_url":"https://api.github.com/users/emakeev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/emakeev/subscriptions","organizations_url":"https://api.github.com/users/emakeev/orgs","repos_url":"https://api.github.com/users/emakeev/repos","events_url":"https://api.github.com/users/emakeev/events{/privacy}","received_events_url":"https://api.github.com/users/emakeev/received_events","type":"User","site_admin":false},{"login":"pshelar","id":7134705,"node_id":"MDQ6VXNlcjcxMzQ3MDU=","avatar_url":"https://avatars.githubusercontent.com/u/7134705?v=4","gravatar_id":"","url":"https://api.github.com/users/pshelar","html_url":"https://github.com/pshelar","followers_url":"https://api.github.com/users/pshelar/followers","following_url":"https://api.github.com/users/pshelar/following{/other_user}","gists_url":"https://api.github.com/users/pshelar/gists{/gist_id}","starred_url":"https://api.github.com/users/pshelar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pshelar/subscriptions","organizations_url":"https://api.github.com/users/pshelar/orgs","repos_url":"https://api.github.com/users/pshelar/repos","events_url":"https://api.github.com/users/pshelar/events{/privacy}","received_events_url":"https://api.github.com/users/pshelar/received_events","type":"User","site_admin":false},{"login":"koolzz","id":11281728,"node_id":"MDQ6VXNlcjExMjgxNzI4","avatar_url":"https://avatars.githubusercontent.com/u/11281728?v=4","gravatar_id":"","url":"https://api.github.com/users/koolzz","html_url":"https://github.com/koolzz","followers_url":"https://api.github.com/users/koolzz/followers","following_url":"https://api.github.com/users/koolzz/following{/other_user}","gists_url":"https://api.github.com/users/koolzz/gists{/gist_id}","starred_url":"https://api.github.com/users/koolzz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/koolzz/subscriptions","organizations_url":"https://api.github.com/users/koolzz/orgs","repos_url":"https://api.github.com/users/koolzz/repos","events_url":"https://api.github.com/users/koolzz/events{/privacy}","received_events_url":"https://api.github.com/users/koolzz/received_events","type":"User","site_admin":false},{"login":"HannaFar","id":26038920,"node_id":"MDQ6VXNlcjI2MDM4OTIw","avatar_url":"https://avatars.githubusercontent.com/u/26038920?v=4","gravatar_id":"","url":"https://api.github.com/users/HannaFar","html_url":"https://github.com/HannaFar","followers_url":"https://api.github.com/users/HannaFar/followers","following_url":"https://api.github.com/users/HannaFar/following{/other_user}","gists_url":"https://api.github.com/users/HannaFar/gists{/gist_id}","starred_url":"https://api.github.com/users/HannaFar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HannaFar/subscriptions","organizations_url":"https://api.github.com/users/HannaFar/orgs","repos_url":"https://api.github.com/users/HannaFar/repos","events_url":"https://api.github.com/users/HannaFar/events{/privacy}","received_events_url":"https://api.github.com/users/HannaFar/received_events","type":"User","site_admin":false}],"requested_teams":[{"name":"approvers-nms","id":4683595,"node_id":"MDQ6VGVhbTQ2ODM1OTU=","slug":"approvers-nms","description":"CODEOWNERS for NMS","privacy":"closed","url":"https://api.github.com/organizations/66266171/team/4683595","html_url":"https://github.com/orgs/magma/teams/approvers-nms","members_url":"https://api.github.com/organizations/66266171/team/4683595/members{/member}","repositories_url":"https://api.github.com/organizations/66266171/team/4683595/repos","permission":"pull","parent":{"name":"repo-magma-maintain","id":4477370,"node_id":"MDQ6VGVhbTQ0NzczNzA=","slug":"repo-magma-maintain","description":"Magma project maintainers (codeowners)","privacy":"closed","url":"https://api.github.com/organizations/66266171/team/4477370","html_url":"https://github.com/orgs/magma/teams/repo-magma-maintain","members_url":"https://api.github.com/organizations/66266171/team/4477370/members{/member}","repositories_url":"https://api.github.com/organizations/66266171/team/4477370/repos","permission":"pull"}}],"labels":[{"id":1638987760,"node_id":"MDU6TGFiZWwxNjM4OTg3NzYw","url":"https://api.github.com/repos/magma/magma/labels/component:%20agw","name":"component: agw","color":"4b8caf","default":false,"description":"Access gateway-related issue"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/magma/magma/pulls/8124/commits","review_comments_url":"https://api.github.com/repos/magma/magma/pulls/8124/comments","review_comment_url":"https://api.github.com/repos/magma/magma/pulls/comments{/number}","comments_url":"https://api.github.com/repos/magma/magma/issues/8124/comments","statuses_url":"https://api.github.com/repos/magma/magma/statuses/cac401202bc67835b46c97e4f5db5e6f66e61b48","head":{"label":"hakeen0618:fix-readme-typo","ref":"fix-readme-typo","sha":"cac401202bc67835b46c97e4f5db5e6f66e61b48","user":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"repo":{"id":378818746,"node_id":"MDEwOlJlcG9zaXRvcnkzNzg4MTg3NDY=","name":"magma","full_name":"hakeen0618/magma","private":false,"owner":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"html_url":"https://github.com/hakeen0618/magma","description":"Platform for building access networks and modular network services","fork":true,"url":"https://api.github.com/repos/hakeen0618/magma","forks_url":"https://api.github.com/repos/hakeen0618/magma/forks","keys_url":"https://api.github.com/repos/hakeen0618/magma/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hakeen0618/magma/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hakeen0618/magma/teams","hooks_url":"https://api.github.com/repos/hakeen0618/magma/hooks","issue_events_url":"https://api.github.com/repos/hakeen0618/magma/issues/events{/number}","events_url":"https://api.github.com/repos/hakeen0618/magma/events","assignees_url":"https://api.github.com/repos/hakeen0618/magma/assignees{/user}","branches_url":"https://api.github.com/repos/hakeen0618/magma/branches{/branch}","tags_url":"https://api.github.com/repos/hakeen0618/magma/tags","blobs_url":"https://api.github.com/repos/hakeen0618/magma/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hakeen0618/magma/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hakeen0618/magma/git/refs{/sha}","trees_url":"https://api.github.com/repos/hakeen0618/magma/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hakeen0618/magma/statuses/{sha}","languages_url":"https://api.github.com/repos/hakeen0618/magma/languages","stargazers_url":"https://api.github.com/repos/hakeen0618/magma/stargazers","contributors_url":"https://api.github.com/repos/hakeen0618/magma/contributors","subscribers_url":"https://api.github.com/repos/hakeen0618/magma/subscribers","subscription_url":"https://api.github.com/repos/hakeen0618/magma/subscription","commits_url":"https://api.github.com/repos/hakeen0618/magma/commits{/sha}","git_commits_url":"https://api.github.com/repos/hakeen0618/magma/git/commits{/sha}","comments_url":"https://api.github.com/repos/hakeen0618/magma/comments{/number}","issue_comment_url":"https://api.github.com/repos/hakeen0618/magma/issues/comments{/number}","contents_url":"https://api.github.com/repos/hakeen0618/magma/contents/{+path}","compare_url":"https://api.github.com/repos/hakeen0618/magma/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hakeen0618/magma/merges","archive_url":"https://api.github.com/repos/hakeen0618/magma/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hakeen0618/magma/downloads","issues_url":"https://api.github.com/repos/hakeen0618/magma/issues{/number}","pulls_url":"https://api.github.com/repos/hakeen0618/magma/pulls{/number}","milestones_url":"https://api.github.com/repos/hakeen0618/magma/milestones{/number}","notifications_url":"https://api.github.com/repos/hakeen0618/magma/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hakeen0618/magma/labels{/name}","releases_url":"https://api.github.com/repos/hakeen0618/magma/releases{/id}","deployments_url":"https://api.github.com/repos/hakeen0618/magma/deployments","created_at":"2021-06-21T05:40:58Z","updated_at":"2021-07-13T03:44:33Z","pushed_at":"2021-07-13T08:42:19Z","git_url":"git://github.com/hakeen0618/magma.git","ssh_url":"git@github.com:hakeen0618/magma.git","clone_url":"https://github.com/hakeen0618/magma.git","svn_url":"https://github.com/hakeen0618/magma","homepage":"https://www.magmacore.org/","size":190836,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"magma:master","ref":"master","sha":"c0148b227885e0a8fdabc7ce44249c3754625a18","user":{"login":"magma","id":66266171,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY2MjY2MTcx","avatar_url":"https://avatars.githubusercontent.com/u/66266171?v=4","gravatar_id":"","url":"https://api.github.com/users/magma","html_url":"https://github.com/magma","followers_url":"https://api.github.com/users/magma/followers","following_url":"https://api.github.com/users/magma/following{/other_user}","gists_url":"https://api.github.com/users/magma/gists{/gist_id}","starred_url":"https://api.github.com/users/magma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magma/subscriptions","organizations_url":"https://api.github.com/users/magma/orgs","repos_url":"https://api.github.com/users/magma/repos","events_url":"https://api.github.com/users/magma/events{/privacy}","received_events_url":"https://api.github.com/users/magma/received_events","type":"Organization","site_admin":false},"repo":{"id":170803235,"node_id":"MDEwOlJlcG9zaXRvcnkxNzA4MDMyMzU=","name":"magma","full_name":"magma/magma","private":false,"owner":{"login":"magma","id":66266171,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY2MjY2MTcx","avatar_url":"https://avatars.githubusercontent.com/u/66266171?v=4","gravatar_id":"","url":"https://api.github.com/users/magma","html_url":"https://github.com/magma","followers_url":"https://api.github.com/users/magma/followers","following_url":"https://api.github.com/users/magma/following{/other_user}","gists_url":"https://api.github.com/users/magma/gists{/gist_id}","starred_url":"https://api.github.com/users/magma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magma/subscriptions","organizations_url":"https://api.github.com/users/magma/orgs","repos_url":"https://api.github.com/users/magma/repos","events_url":"https://api.github.com/users/magma/events{/privacy}","received_events_url":"https://api.github.com/users/magma/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/magma/magma","description":"Platform for building access networks and modular network services","fork":false,"url":"https://api.github.com/repos/magma/magma","forks_url":"https://api.github.com/repos/magma/magma/forks","keys_url":"https://api.github.com/repos/magma/magma/keys{/key_id}","collaborators_url":"https://api.github.com/repos/magma/magma/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/magma/magma/teams","hooks_url":"https://api.github.com/repos/magma/magma/hooks","issue_events_url":"https://api.github.com/repos/magma/magma/issues/events{/number}","events_url":"https://api.github.com/repos/magma/magma/events","assignees_url":"https://api.github.com/repos/magma/magma/assignees{/user}","branches_url":"https://api.github.com/repos/magma/magma/branches{/branch}","tags_url":"https://api.github.com/repos/magma/magma/tags","blobs_url":"https://api.github.com/repos/magma/magma/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/magma/magma/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/magma/magma/git/refs{/sha}","trees_url":"https://api.github.com/repos/magma/magma/git/trees{/sha}","statuses_url":"https://api.github.com/repos/magma/magma/statuses/{sha}","languages_url":"https://api.github.com/repos/magma/magma/languages","stargazers_url":"https://api.github.com/repos/magma/magma/stargazers","contributors_url":"https://api.github.com/repos/magma/magma/contributors","subscribers_url":"https://api.github.com/repos/magma/magma/subscribers","subscription_url":"https://api.github.com/repos/magma/magma/subscription","commits_url":"https://api.github.com/repos/magma/magma/commits{/sha}","git_commits_url":"https://api.github.com/repos/magma/magma/git/commits{/sha}","comments_url":"https://api.github.com/repos/magma/magma/comments{/number}","issue_comment_url":"https://api.github.com/repos/magma/magma/issues/comments{/number}","contents_url":"https://api.github.com/repos/magma/magma/contents/{+path}","compare_url":"https://api.github.com/repos/magma/magma/compare/{base}...{head}","merges_url":"https://api.github.com/repos/magma/magma/merges","archive_url":"https://api.github.com/repos/magma/magma/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/magma/magma/downloads","issues_url":"https://api.github.com/repos/magma/magma/issues{/number}","pulls_url":"https://api.github.com/repos/magma/magma/pulls{/number}","milestones_url":"https://api.github.com/repos/magma/magma/milestones{/number}","notifications_url":"https://api.github.com/repos/magma/magma/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/magma/magma/labels{/name}","releases_url":"https://api.github.com/repos/magma/magma/releases{/id}","deployments_url":"https://api.github.com/repos/magma/magma/deployments","created_at":"2019-02-15T04:46:24Z","updated_at":"2021-07-21T03:37:03Z","pushed_at":"2021-07-21T05:22:30Z","git_url":"git://github.com/magma/magma.git","ssh_url":"git@github.com:magma/magma.git","clone_url":"https://github.com/magma/magma.git","svn_url":"https://github.com/magma/magma","homepage":"https://www.magmacore.org/","size":194815,"stargazers_count":1019,"watchers_count":1019,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":360,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1143,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":360,"open_issues":1143,"watchers":1019,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/magma/magma/pulls/8124"},"html":{"href":"https://github.com/magma/magma/pull/8124"},"issue":{"href":"https://api.github.com/repos/magma/magma/issues/8124"},"comments":{"href":"https://api.github.com/repos/magma/magma/issues/8124/comments"},"review_comments":{"href":"https://api.github.com/repos/magma/magma/pulls/8124/comments"},"review_comment":{"href":"https://api.github.com/repos/magma/magma/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/magma/magma/pulls/8124/commits"},"statuses":{"href":"https://api.github.com/repos/magma/magma/statuses/cac401202bc67835b46c97e4f5db5e6f66e61b48"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":66266171,"login":"magma","gravatar_id":"","url":"https://api.github.com/orgs/magma","avatar_url":"https://avatars.githubusercontent.com/u/66266171?"}}
+{"id":"17244207553","type":"PushEvent","actor":{"id":76249959,"login":"Ravi-072","display_login":"Ravi-072","gravatar_id":"","url":"https://api.github.com/users/Ravi-072","avatar_url":"https://avatars.githubusercontent.com/u/76249959?"},"repo":{"id":388010388,"name":"Ravi-072/origami-website","url":"https://api.github.com/repos/Ravi-072/origami-website"},"payload":{"push_id":7561414905,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f3819f5860c42623964d2dbc03e64a1f6ca9e359","before":"7ea1407bfbbb126be7003d26a44e6ce0e1ca8718","commits":[{"sha":"f3819f5860c42623964d2dbc03e64a1f6ca9e359","author":{"name":"Ravi-072","email":"9b663cd8faeb7f73e2ce53e058881be47fb7ecac@users.noreply.github.com"},"message":"Add files via upload","distinct":true,"url":"https://api.github.com/repos/Ravi-072/origami-website/commits/f3819f5860c42623964d2dbc03e64a1f6ca9e359"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207554","type":"IssueCommentEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":127114442,"name":"wix/ricos","url":"https://api.github.com/repos/wix/ricos"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/wix/ricos/issues/2755","repository_url":"https://api.github.com/repos/wix/ricos","labels_url":"https://api.github.com/repos/wix/ricos/issues/2755/labels{/name}","comments_url":"https://api.github.com/repos/wix/ricos/issues/2755/comments","events_url":"https://api.github.com/repos/wix/ricos/issues/2755/events","html_url":"https://github.com/wix/ricos/pull/2755","id":949348127,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDY4MjE2","number":2755,"title":"move i18next to external","user":{"login":"oded-soffrin","id":1297297,"node_id":"MDQ6VXNlcjEyOTcyOTc=","avatar_url":"https://avatars.githubusercontent.com/u/1297297?v=4","gravatar_id":"","url":"https://api.github.com/users/oded-soffrin","html_url":"https://github.com/oded-soffrin","followers_url":"https://api.github.com/users/oded-soffrin/followers","following_url":"https://api.github.com/users/oded-soffrin/following{/other_user}","gists_url":"https://api.github.com/users/oded-soffrin/gists{/gist_id}","starred_url":"https://api.github.com/users/oded-soffrin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oded-soffrin/subscriptions","organizations_url":"https://api.github.com/users/oded-soffrin/orgs","repos_url":"https://api.github.com/users/oded-soffrin/repos","events_url":"https://api.github.com/users/oded-soffrin/events{/privacy}","received_events_url":"https://api.github.com/users/oded-soffrin/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-07-21T05:45:44Z","updated_at":"2021-07-21T06:00:01Z","closed_at":null,"author_association":"COLLABORATOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/wix/ricos/pulls/2755","html_url":"https://github.com/wix/ricos/pull/2755","diff_url":"https://github.com/wix/ricos/pull/2755.diff","patch_url":"https://github.com/wix/ricos/pull/2755.patch"},"body":"","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/wix/ricos/issues/comments/883914002","html_url":"https://github.com/wix/ricos/pull/2755#issuecomment-883914002","issue_url":"https://api.github.com/repos/wix/ricos/issues/2755","id":883914002,"node_id":"IC_kwDOB5Ocys40r3US","user":{"login":"github-actions[bot]","id":41898282,"node_id":"MDM6Qm90NDE4OTgyODI=","avatar_url":"https://avatars.githubusercontent.com/in/15368?v=4","gravatar_id":"","url":"https://api.github.com/users/github-actions%5Bbot%5D","html_url":"https://github.com/apps/github-actions","followers_url":"https://api.github.com/users/github-actions%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-actions%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-actions%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-actions%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-actions%5Bbot%5D/received_events","type":"Bot","site_admin":false},"created_at":"2021-07-21T06:00:01Z","updated_at":"2021-07-21T06:00:01Z","author_association":"NONE","body":"Deploy examples (Click below to open examples):\nrich-content: https://rich-content-i18next-external.surge.sh/\nrich-content-storybook: https://rich-content-storybook-i18next-external.surge.sh/","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":686511,"login":"wix","gravatar_id":"","url":"https://api.github.com/orgs/wix","avatar_url":"https://avatars.githubusercontent.com/u/686511?"}}
+{"id":"17244207559","type":"PullRequestReviewCommentEvent","actor":{"id":86106068,"login":"hakeen0618","display_login":"hakeen0618","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","avatar_url":"https://avatars.githubusercontent.com/u/86106068?"},"repo":{"id":170803235,"name":"magma/magma","url":"https://api.github.com/repos/magma/magma"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/magma/magma/pulls/comments/673682347","pull_request_review_id":711282642,"id":673682347,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3MzY4MjM0Nw==","diff_hunk":"@@ -83,6 +83,9 @@ export default function AddEditEnodebDialog(props: Props) {\n   );\n   const [serialId, setSerialId] = useState<string>(editingEnodeb?.serial || '');\n   const [tac, setTac] = useState(String(editingEnodeb?.config.tac || ''));\n+  const [mme_ip, setMmeIP] = useState(\n+    String(editingEnodeb?.config.mme_ip || '10.0.2.1'),","path":"nms/app/packages/magmalte/app/components/lte/AddEditEnodebDialog.js","position":5,"original_position":5,"commit_id":"cac401202bc67835b46c97e4f5db5e6f66e61b48","original_commit_id":"cac401202bc67835b46c97e4f5db5e6f66e61b48","user":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"body":"ok , i will make changes and git push.","created_at":"2021-07-21T06:00:01Z","updated_at":"2021-07-21T06:00:01Z","html_url":"https://github.com/magma/magma/pull/8124#discussion_r673682347","pull_request_url":"https://api.github.com/repos/magma/magma/pulls/8124","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/magma/magma/pulls/comments/673682347"},"html":{"href":"https://github.com/magma/magma/pull/8124#discussion_r673682347"},"pull_request":{"href":"https://api.github.com/repos/magma/magma/pulls/8124"}},"start_line":null,"original_start_line":null,"start_side":null,"line":87,"original_line":87,"side":"RIGHT","in_reply_to_id":673586735},"pull_request":{"url":"https://api.github.com/repos/magma/magma/pulls/8124","id":691208930,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkxMjA4OTMw","html_url":"https://github.com/magma/magma/pull/8124","diff_url":"https://github.com/magma/magma/pull/8124.diff","patch_url":"https://github.com/magma/magma/pull/8124.patch","issue_url":"https://api.github.com/repos/magma/magma/issues/8124","number":8124,"state":"open","locked":false,"title":"[nms,agw,orc8r] Adding MME_IP to eNB configs","user":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"body":"<!--\r\n    Tag your PR title with the components that it touches along with\r\n    the type of change\r\n    E.g. \"fix(orc8r): Fix reindexer race condition\" or \"feat(agw) ...\"\r\n-->\r\nSigned-off-by: HakeenHan hanhufeng@baicells.com\r\n## Summary\r\n\r\n\r\n- Adding MME_IP value to eNB  configs\r\n- MME_IP parameter is used to set enb  in the nms UI .\r\n\r\n\r\n## Test Plan\r\n\r\n<!--\r\n    How did you test your change? How do you know it works?\r\n    Add supporting screenshots, terminal pastes, etc. as necessary\r\n-->\r\n- make precommit\r\n- running locally with eNB configured manually.\r\n\r\n\r\n## Additional Information\r\n\r\n- [ ] This change is backwards-breaking\r\n\r\n<!--\r\n    If this is a backwards-breaking change, document the upgrade instructions.\r\n    All upgrade instructions for backwards-breaking changes will be aggregated\r\n    in the next release's changelog so this is very important to fill out.\r\n-->\r\nThis adds mme_ip field for managed configs. however we don't have any of these registered yet on any of the environments so we should be good.","created_at":"2021-07-16T05:33:00Z","updated_at":"2021-07-21T06:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3e9f5d947e7b08d383c619c1992fb81e3adddad9","assignee":null,"assignees":[],"requested_reviewers":[{"login":"emakeev","id":2341877,"node_id":"MDQ6VXNlcjIzNDE4Nzc=","avatar_url":"https://avatars.githubusercontent.com/u/2341877?v=4","gravatar_id":"","url":"https://api.github.com/users/emakeev","html_url":"https://github.com/emakeev","followers_url":"https://api.github.com/users/emakeev/followers","following_url":"https://api.github.com/users/emakeev/following{/other_user}","gists_url":"https://api.github.com/users/emakeev/gists{/gist_id}","starred_url":"https://api.github.com/users/emakeev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/emakeev/subscriptions","organizations_url":"https://api.github.com/users/emakeev/orgs","repos_url":"https://api.github.com/users/emakeev/repos","events_url":"https://api.github.com/users/emakeev/events{/privacy}","received_events_url":"https://api.github.com/users/emakeev/received_events","type":"User","site_admin":false},{"login":"pshelar","id":7134705,"node_id":"MDQ6VXNlcjcxMzQ3MDU=","avatar_url":"https://avatars.githubusercontent.com/u/7134705?v=4","gravatar_id":"","url":"https://api.github.com/users/pshelar","html_url":"https://github.com/pshelar","followers_url":"https://api.github.com/users/pshelar/followers","following_url":"https://api.github.com/users/pshelar/following{/other_user}","gists_url":"https://api.github.com/users/pshelar/gists{/gist_id}","starred_url":"https://api.github.com/users/pshelar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pshelar/subscriptions","organizations_url":"https://api.github.com/users/pshelar/orgs","repos_url":"https://api.github.com/users/pshelar/repos","events_url":"https://api.github.com/users/pshelar/events{/privacy}","received_events_url":"https://api.github.com/users/pshelar/received_events","type":"User","site_admin":false},{"login":"koolzz","id":11281728,"node_id":"MDQ6VXNlcjExMjgxNzI4","avatar_url":"https://avatars.githubusercontent.com/u/11281728?v=4","gravatar_id":"","url":"https://api.github.com/users/koolzz","html_url":"https://github.com/koolzz","followers_url":"https://api.github.com/users/koolzz/followers","following_url":"https://api.github.com/users/koolzz/following{/other_user}","gists_url":"https://api.github.com/users/koolzz/gists{/gist_id}","starred_url":"https://api.github.com/users/koolzz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/koolzz/subscriptions","organizations_url":"https://api.github.com/users/koolzz/orgs","repos_url":"https://api.github.com/users/koolzz/repos","events_url":"https://api.github.com/users/koolzz/events{/privacy}","received_events_url":"https://api.github.com/users/koolzz/received_events","type":"User","site_admin":false},{"login":"HannaFar","id":26038920,"node_id":"MDQ6VXNlcjI2MDM4OTIw","avatar_url":"https://avatars.githubusercontent.com/u/26038920?v=4","gravatar_id":"","url":"https://api.github.com/users/HannaFar","html_url":"https://github.com/HannaFar","followers_url":"https://api.github.com/users/HannaFar/followers","following_url":"https://api.github.com/users/HannaFar/following{/other_user}","gists_url":"https://api.github.com/users/HannaFar/gists{/gist_id}","starred_url":"https://api.github.com/users/HannaFar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HannaFar/subscriptions","organizations_url":"https://api.github.com/users/HannaFar/orgs","repos_url":"https://api.github.com/users/HannaFar/repos","events_url":"https://api.github.com/users/HannaFar/events{/privacy}","received_events_url":"https://api.github.com/users/HannaFar/received_events","type":"User","site_admin":false}],"requested_teams":[{"name":"approvers-nms","id":4683595,"node_id":"MDQ6VGVhbTQ2ODM1OTU=","slug":"approvers-nms","description":"CODEOWNERS for NMS","privacy":"closed","url":"https://api.github.com/organizations/66266171/team/4683595","html_url":"https://github.com/orgs/magma/teams/approvers-nms","members_url":"https://api.github.com/organizations/66266171/team/4683595/members{/member}","repositories_url":"https://api.github.com/organizations/66266171/team/4683595/repos","permission":"pull","parent":{"name":"repo-magma-maintain","id":4477370,"node_id":"MDQ6VGVhbTQ0NzczNzA=","slug":"repo-magma-maintain","description":"Magma project maintainers (codeowners)","privacy":"closed","url":"https://api.github.com/organizations/66266171/team/4477370","html_url":"https://github.com/orgs/magma/teams/repo-magma-maintain","members_url":"https://api.github.com/organizations/66266171/team/4477370/members{/member}","repositories_url":"https://api.github.com/organizations/66266171/team/4477370/repos","permission":"pull"}}],"labels":[{"id":1638987760,"node_id":"MDU6TGFiZWwxNjM4OTg3NzYw","url":"https://api.github.com/repos/magma/magma/labels/component:%20agw","name":"component: agw","color":"4b8caf","default":false,"description":"Access gateway-related issue"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/magma/magma/pulls/8124/commits","review_comments_url":"https://api.github.com/repos/magma/magma/pulls/8124/comments","review_comment_url":"https://api.github.com/repos/magma/magma/pulls/comments{/number}","comments_url":"https://api.github.com/repos/magma/magma/issues/8124/comments","statuses_url":"https://api.github.com/repos/magma/magma/statuses/cac401202bc67835b46c97e4f5db5e6f66e61b48","head":{"label":"hakeen0618:fix-readme-typo","ref":"fix-readme-typo","sha":"cac401202bc67835b46c97e4f5db5e6f66e61b48","user":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"repo":{"id":378818746,"node_id":"MDEwOlJlcG9zaXRvcnkzNzg4MTg3NDY=","name":"magma","full_name":"hakeen0618/magma","private":false,"owner":{"login":"hakeen0618","id":86106068,"node_id":"MDQ6VXNlcjg2MTA2MDY4","avatar_url":"https://avatars.githubusercontent.com/u/86106068?v=4","gravatar_id":"","url":"https://api.github.com/users/hakeen0618","html_url":"https://github.com/hakeen0618","followers_url":"https://api.github.com/users/hakeen0618/followers","following_url":"https://api.github.com/users/hakeen0618/following{/other_user}","gists_url":"https://api.github.com/users/hakeen0618/gists{/gist_id}","starred_url":"https://api.github.com/users/hakeen0618/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakeen0618/subscriptions","organizations_url":"https://api.github.com/users/hakeen0618/orgs","repos_url":"https://api.github.com/users/hakeen0618/repos","events_url":"https://api.github.com/users/hakeen0618/events{/privacy}","received_events_url":"https://api.github.com/users/hakeen0618/received_events","type":"User","site_admin":false},"html_url":"https://github.com/hakeen0618/magma","description":"Platform for building access networks and modular network services","fork":true,"url":"https://api.github.com/repos/hakeen0618/magma","forks_url":"https://api.github.com/repos/hakeen0618/magma/forks","keys_url":"https://api.github.com/repos/hakeen0618/magma/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hakeen0618/magma/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hakeen0618/magma/teams","hooks_url":"https://api.github.com/repos/hakeen0618/magma/hooks","issue_events_url":"https://api.github.com/repos/hakeen0618/magma/issues/events{/number}","events_url":"https://api.github.com/repos/hakeen0618/magma/events","assignees_url":"https://api.github.com/repos/hakeen0618/magma/assignees{/user}","branches_url":"https://api.github.com/repos/hakeen0618/magma/branches{/branch}","tags_url":"https://api.github.com/repos/hakeen0618/magma/tags","blobs_url":"https://api.github.com/repos/hakeen0618/magma/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hakeen0618/magma/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hakeen0618/magma/git/refs{/sha}","trees_url":"https://api.github.com/repos/hakeen0618/magma/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hakeen0618/magma/statuses/{sha}","languages_url":"https://api.github.com/repos/hakeen0618/magma/languages","stargazers_url":"https://api.github.com/repos/hakeen0618/magma/stargazers","contributors_url":"https://api.github.com/repos/hakeen0618/magma/contributors","subscribers_url":"https://api.github.com/repos/hakeen0618/magma/subscribers","subscription_url":"https://api.github.com/repos/hakeen0618/magma/subscription","commits_url":"https://api.github.com/repos/hakeen0618/magma/commits{/sha}","git_commits_url":"https://api.github.com/repos/hakeen0618/magma/git/commits{/sha}","comments_url":"https://api.github.com/repos/hakeen0618/magma/comments{/number}","issue_comment_url":"https://api.github.com/repos/hakeen0618/magma/issues/comments{/number}","contents_url":"https://api.github.com/repos/hakeen0618/magma/contents/{+path}","compare_url":"https://api.github.com/repos/hakeen0618/magma/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hakeen0618/magma/merges","archive_url":"https://api.github.com/repos/hakeen0618/magma/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hakeen0618/magma/downloads","issues_url":"https://api.github.com/repos/hakeen0618/magma/issues{/number}","pulls_url":"https://api.github.com/repos/hakeen0618/magma/pulls{/number}","milestones_url":"https://api.github.com/repos/hakeen0618/magma/milestones{/number}","notifications_url":"https://api.github.com/repos/hakeen0618/magma/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hakeen0618/magma/labels{/name}","releases_url":"https://api.github.com/repos/hakeen0618/magma/releases{/id}","deployments_url":"https://api.github.com/repos/hakeen0618/magma/deployments","created_at":"2021-06-21T05:40:58Z","updated_at":"2021-07-13T03:44:33Z","pushed_at":"2021-07-13T08:42:19Z","git_url":"git://github.com/hakeen0618/magma.git","ssh_url":"git@github.com:hakeen0618/magma.git","clone_url":"https://github.com/hakeen0618/magma.git","svn_url":"https://github.com/hakeen0618/magma","homepage":"https://www.magmacore.org/","size":190836,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"magma:master","ref":"master","sha":"c0148b227885e0a8fdabc7ce44249c3754625a18","user":{"login":"magma","id":66266171,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY2MjY2MTcx","avatar_url":"https://avatars.githubusercontent.com/u/66266171?v=4","gravatar_id":"","url":"https://api.github.com/users/magma","html_url":"https://github.com/magma","followers_url":"https://api.github.com/users/magma/followers","following_url":"https://api.github.com/users/magma/following{/other_user}","gists_url":"https://api.github.com/users/magma/gists{/gist_id}","starred_url":"https://api.github.com/users/magma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magma/subscriptions","organizations_url":"https://api.github.com/users/magma/orgs","repos_url":"https://api.github.com/users/magma/repos","events_url":"https://api.github.com/users/magma/events{/privacy}","received_events_url":"https://api.github.com/users/magma/received_events","type":"Organization","site_admin":false},"repo":{"id":170803235,"node_id":"MDEwOlJlcG9zaXRvcnkxNzA4MDMyMzU=","name":"magma","full_name":"magma/magma","private":false,"owner":{"login":"magma","id":66266171,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY2MjY2MTcx","avatar_url":"https://avatars.githubusercontent.com/u/66266171?v=4","gravatar_id":"","url":"https://api.github.com/users/magma","html_url":"https://github.com/magma","followers_url":"https://api.github.com/users/magma/followers","following_url":"https://api.github.com/users/magma/following{/other_user}","gists_url":"https://api.github.com/users/magma/gists{/gist_id}","starred_url":"https://api.github.com/users/magma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magma/subscriptions","organizations_url":"https://api.github.com/users/magma/orgs","repos_url":"https://api.github.com/users/magma/repos","events_url":"https://api.github.com/users/magma/events{/privacy}","received_events_url":"https://api.github.com/users/magma/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/magma/magma","description":"Platform for building access networks and modular network services","fork":false,"url":"https://api.github.com/repos/magma/magma","forks_url":"https://api.github.com/repos/magma/magma/forks","keys_url":"https://api.github.com/repos/magma/magma/keys{/key_id}","collaborators_url":"https://api.github.com/repos/magma/magma/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/magma/magma/teams","hooks_url":"https://api.github.com/repos/magma/magma/hooks","issue_events_url":"https://api.github.com/repos/magma/magma/issues/events{/number}","events_url":"https://api.github.com/repos/magma/magma/events","assignees_url":"https://api.github.com/repos/magma/magma/assignees{/user}","branches_url":"https://api.github.com/repos/magma/magma/branches{/branch}","tags_url":"https://api.github.com/repos/magma/magma/tags","blobs_url":"https://api.github.com/repos/magma/magma/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/magma/magma/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/magma/magma/git/refs{/sha}","trees_url":"https://api.github.com/repos/magma/magma/git/trees{/sha}","statuses_url":"https://api.github.com/repos/magma/magma/statuses/{sha}","languages_url":"https://api.github.com/repos/magma/magma/languages","stargazers_url":"https://api.github.com/repos/magma/magma/stargazers","contributors_url":"https://api.github.com/repos/magma/magma/contributors","subscribers_url":"https://api.github.com/repos/magma/magma/subscribers","subscription_url":"https://api.github.com/repos/magma/magma/subscription","commits_url":"https://api.github.com/repos/magma/magma/commits{/sha}","git_commits_url":"https://api.github.com/repos/magma/magma/git/commits{/sha}","comments_url":"https://api.github.com/repos/magma/magma/comments{/number}","issue_comment_url":"https://api.github.com/repos/magma/magma/issues/comments{/number}","contents_url":"https://api.github.com/repos/magma/magma/contents/{+path}","compare_url":"https://api.github.com/repos/magma/magma/compare/{base}...{head}","merges_url":"https://api.github.com/repos/magma/magma/merges","archive_url":"https://api.github.com/repos/magma/magma/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/magma/magma/downloads","issues_url":"https://api.github.com/repos/magma/magma/issues{/number}","pulls_url":"https://api.github.com/repos/magma/magma/pulls{/number}","milestones_url":"https://api.github.com/repos/magma/magma/milestones{/number}","notifications_url":"https://api.github.com/repos/magma/magma/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/magma/magma/labels{/name}","releases_url":"https://api.github.com/repos/magma/magma/releases{/id}","deployments_url":"https://api.github.com/repos/magma/magma/deployments","created_at":"2019-02-15T04:46:24Z","updated_at":"2021-07-21T03:37:03Z","pushed_at":"2021-07-21T05:22:30Z","git_url":"git://github.com/magma/magma.git","ssh_url":"git@github.com:magma/magma.git","clone_url":"https://github.com/magma/magma.git","svn_url":"https://github.com/magma/magma","homepage":"https://www.magmacore.org/","size":194815,"stargazers_count":1019,"watchers_count":1019,"language":"Go","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":360,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1143,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":360,"open_issues":1143,"watchers":1019,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/magma/magma/pulls/8124"},"html":{"href":"https://github.com/magma/magma/pull/8124"},"issue":{"href":"https://api.github.com/repos/magma/magma/issues/8124"},"comments":{"href":"https://api.github.com/repos/magma/magma/issues/8124/comments"},"review_comments":{"href":"https://api.github.com/repos/magma/magma/pulls/8124/comments"},"review_comment":{"href":"https://api.github.com/repos/magma/magma/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/magma/magma/pulls/8124/commits"},"statuses":{"href":"https://api.github.com/repos/magma/magma/statuses/cac401202bc67835b46c97e4f5db5e6f66e61b48"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":66266171,"login":"magma","gravatar_id":"","url":"https://api.github.com/orgs/magma","avatar_url":"https://avatars.githubusercontent.com/u/66266171?"}}
+{"id":"17244207563","type":"WatchEvent","actor":{"id":82815793,"login":"xuxinl","display_login":"xuxinl","gravatar_id":"","url":"https://api.github.com/users/xuxinl","avatar_url":"https://avatars.githubusercontent.com/u/82815793?"},"repo":{"id":260087808,"name":"ruicky/jd_sign_bot","url":"https://api.github.com/repos/ruicky/jd_sign_bot"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207564","type":"WatchEvent","actor":{"id":47804091,"login":"aladdinding","display_login":"aladdinding","gravatar_id":"","url":"https://api.github.com/users/aladdinding","avatar_url":"https://avatars.githubusercontent.com/u/47804091?"},"repo":{"id":387065610,"name":"aladdinding/aladdinding.github.io","url":"https://api.github.com/repos/aladdinding/aladdinding.github.io"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207566","type":"CreateEvent","actor":{"id":74011967,"login":"custard0413","display_login":"custard0413","gravatar_id":"","url":"https://api.github.com/users/custard0413","avatar_url":"https://avatars.githubusercontent.com/u/74011967?"},"repo":{"id":388010497,"name":"custard0413/test","url":"https://api.github.com/repos/custard0413/test"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207567","type":"CreateEvent","actor":{"id":72034695,"login":"WebDevBernard","display_login":"WebDevBernard","gravatar_id":"","url":"https://api.github.com/users/WebDevBernard","avatar_url":"https://avatars.githubusercontent.com/u/72034695?"},"repo":{"id":388003393,"name":"WebDevBernard/React-Practice","url":"https://api.github.com/repos/WebDevBernard/React-Practice"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207574","type":"PushEvent","actor":{"id":67401482,"login":"bfixy","display_login":"bfixy","gravatar_id":"","url":"https://api.github.com/users/bfixy","avatar_url":"https://avatars.githubusercontent.com/u/67401482?"},"repo":{"id":364427771,"name":"bfixy/photo","url":"https://api.github.com/repos/bfixy/photo"},"payload":{"push_id":7561414921,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"737158acf11360cd2e0066343587dba386bbff41","before":"dc05ed3a5db54de9bab800da8dbd675ea9816d15","commits":[{"sha":"737158acf11360cd2e0066343587dba386bbff41","author":{"name":"北枫","email":"8d2f9b11acafc1e5c8114c67bb42db3e6f566fe1@users.noreply.github.com"},"message":"upload by GithubStatic","distinct":true,"url":"https://api.github.com/repos/bfixy/photo/commits/737158acf11360cd2e0066343587dba386bbff41"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207577","type":"PushEvent","actor":{"id":15719775,"login":"bugsoftware","display_login":"bugsoftware","gravatar_id":"","url":"https://api.github.com/users/bugsoftware","avatar_url":"https://avatars.githubusercontent.com/u/15719775?"},"repo":{"id":118932150,"name":"bugsoftware/xml","url":"https://api.github.com/repos/bugsoftware/xml"},"payload":{"push_id":7561414916,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"0cb31f2fc82ac6dd95269daa1e35dab74c300dfe","before":"2aa678ec91f91a602cecaf3435289d16e7bd3844","commits":[{"sha":"0cb31f2fc82ac6dd95269daa1e35dab74c300dfe","author":{"name":"Paulo Andrade","email":"fd077434a7c3095bfe440741787d02f6a7bab07e@corp.bug-software.com"},"message":"Automated commit -","distinct":true,"url":"https://api.github.com/repos/bugsoftware/xml/commits/0cb31f2fc82ac6dd95269daa1e35dab74c300dfe"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207578","type":"PushEvent","actor":{"id":57827814,"login":"DinkyDieDingus","display_login":"DinkyDieDingus","gravatar_id":"","url":"https://api.github.com/users/DinkyDieDingus","avatar_url":"https://avatars.githubusercontent.com/u/57827814?"},"repo":{"id":385216212,"name":"DinkyDieDingus/fotools","url":"https://api.github.com/repos/DinkyDieDingus/fotools"},"payload":{"push_id":7561414917,"size":1,"distinct_size":1,"ref":"refs/heads/dynamic-shortcuts","head":"8d36352199e4a7b99e1a83bfa7c47789d50e4327","before":"903c1d0e720d7c1825103f83266e41211ec4b9c8","commits":[{"sha":"8d36352199e4a7b99e1a83bfa7c47789d50e4327","author":{"name":"Sean Spiegl","email":"8da468bf4ad35a41d4222fe2269c3ed2a8625feb@outlook.com"},"message":"added shortcut export to file","distinct":true,"url":"https://api.github.com/repos/DinkyDieDingus/fotools/commits/8d36352199e4a7b99e1a83bfa7c47789d50e4327"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207583","type":"IssueCommentEvent","actor":{"id":21051488,"login":"mikeesto","display_login":"mikeesto","gravatar_id":"","url":"https://api.github.com/users/mikeesto","avatar_url":"https://avatars.githubusercontent.com/u/21051488?"},"repo":{"id":168201675,"name":"nodejs/nodejs.dev","url":"https://api.github.com/repos/nodejs/nodejs.dev"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/nodejs/nodejs.dev/issues/1569","repository_url":"https://api.github.com/repos/nodejs/nodejs.dev","labels_url":"https://api.github.com/repos/nodejs/nodejs.dev/issues/1569/labels{/name}","comments_url":"https://api.github.com/repos/nodejs/nodejs.dev/issues/1569/comments","events_url":"https://api.github.com/repos/nodejs/nodejs.dev/issues/1569/events","html_url":"https://github.com/nodejs/nodejs.dev/pull/1569","id":946959824,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMDM1MjU5","number":1569,"title":"feat: 🎸 gatsby-remark-code-buttons plugin","user":{"login":"benhalverson","id":7907232,"node_id":"MDQ6VXNlcjc5MDcyMzI=","avatar_url":"https://avatars.githubusercontent.com/u/7907232?v=4","gravatar_id":"","url":"https://api.github.com/users/benhalverson","html_url":"https://github.com/benhalverson","followers_url":"https://api.github.com/users/benhalverson/followers","following_url":"https://api.github.com/users/benhalverson/following{/other_user}","gists_url":"https://api.github.com/users/benhalverson/gists{/gist_id}","starred_url":"https://api.github.com/users/benhalverson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/benhalverson/subscriptions","organizations_url":"https://api.github.com/users/benhalverson/orgs","repos_url":"https://api.github.com/users/benhalverson/repos","events_url":"https://api.github.com/users/benhalverson/events{/privacy}","received_events_url":"https://api.github.com/users/benhalverson/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":7,"created_at":"2021-07-18T06:02:24Z","updated_at":"2021-07-21T06:00:01Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/nodejs/nodejs.dev/pulls/1569","html_url":"https://github.com/nodejs/nodejs.dev/pull/1569","diff_url":"https://github.com/nodejs/nodejs.dev/pull/1569.diff","patch_url":"https://github.com/nodejs/nodejs.dev/pull/1569.patch"},"body":"## Description\r\nThis plugin allows us to copy code from markdown text to the clipboard.\r\n\r\nOne thing to consider is now we have text that needs to be translated in our gatsby-config.js file assuming we have the text copy next to the icon and assuming we include the toaster message.\r\n\r\nStill needs to be styled better so I'm keeping it as a draft for now.\r\n\r\n## Related Issues\r\nhttps://github.com/nodejs/nodejs.dev/issues/1567\r\nhttps://github.com/nodejs/nodejs.dev/pull/1564","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/nodejs/nodejs.dev/issues/comments/883914004","html_url":"https://github.com/nodejs/nodejs.dev/pull/1569#issuecomment-883914004","issue_url":"https://api.github.com/repos/nodejs/nodejs.dev/issues/1569","id":883914004,"node_id":"IC_kwDOCgaNy840r3UU","user":{"login":"mikeesto","id":21051488,"node_id":"MDQ6VXNlcjIxMDUxNDg4","avatar_url":"https://avatars.githubusercontent.com/u/21051488?v=4","gravatar_id":"","url":"https://api.github.com/users/mikeesto","html_url":"https://github.com/mikeesto","followers_url":"https://api.github.com/users/mikeesto/followers","following_url":"https://api.github.com/users/mikeesto/following{/other_user}","gists_url":"https://api.github.com/users/mikeesto/gists{/gist_id}","starred_url":"https://api.github.com/users/mikeesto/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mikeesto/subscriptions","organizations_url":"https://api.github.com/users/mikeesto/orgs","repos_url":"https://api.github.com/users/mikeesto/repos","events_url":"https://api.github.com/users/mikeesto/events{/privacy}","received_events_url":"https://api.github.com/users/mikeesto/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T06:00:01Z","updated_at":"2021-07-21T06:00:01Z","author_association":"CONTRIBUTOR","body":"> I'm ok with or without it. If we keep it we will need someway to have the same message translated for other languages.\r\n\r\nThat's a good point. I live without it too if it's going to be a pain to do i18n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":9950313,"login":"nodejs","gravatar_id":"","url":"https://api.github.com/orgs/nodejs","avatar_url":"https://avatars.githubusercontent.com/u/9950313?"}}
+{"id":"17244207584","type":"CreateEvent","actor":{"id":16423277,"login":"Lester-xie","display_login":"Lester-xie","gravatar_id":"","url":"https://api.github.com/users/Lester-xie","avatar_url":"https://avatars.githubusercontent.com/u/16423277?"},"repo":{"id":388009921,"name":"Lester-xie/lester-blog","url":"https://api.github.com/repos/Lester-xie/lester-blog"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207586","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":365756231,"name":"Arumi09/Arumi09","url":"https://api.github.com/repos/Arumi09/Arumi09"},"payload":{"push_id":7561414923,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"16c9207776aab8055fb6db87031d96f52aae61f9","before":"f220c48514a93d7f6b642b82d6c269af0521dabd","commits":[{"sha":"16c9207776aab8055fb6db87031d96f52aae61f9","author":{"name":"Arumi09","email":"e4d131051d1b6a0d1034526e934dd144941789df@users.noreply.github.com"},"message":"Update README","distinct":true,"url":"https://api.github.com/repos/Arumi09/Arumi09/commits/16c9207776aab8055fb6db87031d96f52aae61f9"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207593","type":"WatchEvent","actor":{"id":3108178,"login":"Neacy","display_login":"Neacy","gravatar_id":"","url":"https://api.github.com/users/Neacy","avatar_url":"https://avatars.githubusercontent.com/u/3108178?"},"repo":{"id":386492981,"name":"bytedance/flutter_ume","url":"https://api.github.com/repos/bytedance/flutter_ume"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:01Z","org":{"id":4158466,"login":"bytedance","gravatar_id":"","url":"https://api.github.com/orgs/bytedance","avatar_url":"https://avatars.githubusercontent.com/u/4158466?"}}
+{"id":"17244207594","type":"PushEvent","actor":{"id":68417258,"login":"breakingheatmap","display_login":"breakingheatmap","gravatar_id":"","url":"https://api.github.com/users/breakingheatmap","avatar_url":"https://avatars.githubusercontent.com/u/68417258?"},"repo":{"id":280356388,"name":"breakingheatmap/breakingheatmap","url":"https://api.github.com/repos/breakingheatmap/breakingheatmap"},"payload":{"push_id":7561414926,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"fc8eec65a40b15767007da98a5c7e7964adb053c","before":"1fd8073c402a4173e4b98150cdd5195d285d73c3","commits":[{"sha":"fc8eec65a40b15767007da98a5c7e7964adb053c","author":{"name":"sudomaze","email":"6fbf11c1befd5a6b40696150a1a62f21b2fc7860@gmail.com"},"message":"1626847197","distinct":true,"url":"https://api.github.com/repos/breakingheatmap/breakingheatmap/commits/fc8eec65a40b15767007da98a5c7e7964adb053c"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207598","type":"PushEvent","actor":{"id":85274304,"login":"Dhruvi143","display_login":"Dhruvi143","gravatar_id":"","url":"https://api.github.com/users/Dhruvi143","avatar_url":"https://avatars.githubusercontent.com/u/85274304?"},"repo":{"id":388009029,"name":"Dhruvi143/Document-TestCases","url":"https://api.github.com/repos/Dhruvi143/Document-TestCases"},"payload":{"push_id":7561414928,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"dccb7fd5cdfc08294cb375fe2a4e5ffe3ad317f4","before":"2b87c731bcf0d48e4205cef9502117fd3ee8e45b","commits":[{"sha":"dccb7fd5cdfc08294cb375fe2a4e5ffe3ad317f4","author":{"name":"Dhruvi Shah","email":"61dbadc6bda0861b5a584cbe34281896af824a86@codilar.com"},"message":"Sample Document amd testcases","distinct":true,"url":"https://api.github.com/repos/Dhruvi143/Document-TestCases/commits/dccb7fd5cdfc08294cb375fe2a4e5ffe3ad317f4"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207602","type":"PushEvent","actor":{"id":85989057,"login":"internetzbot","display_login":"internetzbot","gravatar_id":"","url":"https://api.github.com/users/internetzbot","avatar_url":"https://avatars.githubusercontent.com/u/85989057?"},"repo":{"id":377260146,"name":"internetztube/jaukerl-ooe-archive","url":"https://api.github.com/repos/internetztube/jaukerl-ooe-archive"},"payload":{"push_id":7561414931,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2e2441ab658fc816237130f90a09e803068062a3","before":"d5d880747baca1fff9294c23b7bc0a9df7041849","commits":[{"sha":"2e2441ab658fc816237130f90a09e803068062a3","author":{"name":"internetzbot","email":"c5d6e309f28eeb1bf280506bcf24a90da3518803@users.noreply.github.com"},"message":"Add 2021-07-21T06:00:00+00:00.json.","distinct":true,"url":"https://api.github.com/repos/internetztube/jaukerl-ooe-archive/commits/2e2441ab658fc816237130f90a09e803068062a3"}]},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207610","type":"CreateEvent","actor":{"id":85274304,"login":"Dhruvi143","display_login":"Dhruvi143","gravatar_id":"","url":"https://api.github.com/users/Dhruvi143","avatar_url":"https://avatars.githubusercontent.com/u/85274304?"},"repo":{"id":388009029,"name":"Dhruvi143/Document-TestCases","url":"https://api.github.com/repos/Dhruvi143/Document-TestCases"},"payload":{"ref":"v1.0.6","ref_type":"tag","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:01Z"}
+{"id":"17244207623","type":"DeleteEvent","actor":{"id":49699333,"login":"dependabot[bot]","display_login":"dependabot","gravatar_id":"","url":"https://api.github.com/users/dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},"repo":{"id":247019637,"name":"samwonder/RNBoilerplate_0.61","url":"https://api.github.com/repos/samwonder/RNBoilerplate_0.61"},"payload":{"ref":"dependabot/npm_and_yarn/color-string-1.6.0","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207625","type":"PushEvent","actor":{"id":66472813,"login":"CaolanCode","display_login":"CaolanCode","gravatar_id":"","url":"https://api.github.com/users/CaolanCode","avatar_url":"https://avatars.githubusercontent.com/u/66472813?"},"repo":{"id":387342980,"name":"CaolanCode/Rent-Review","url":"https://api.github.com/repos/CaolanCode/Rent-Review"},"payload":{"push_id":7561414939,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"44a733acdd01db59ffbfaa14d559035632b21c04","before":"ff996f1588e3312c4e15bf590cae2c15e15fc655","commits":[{"sha":"44a733acdd01db59ffbfaa14d559035632b21c04","author":{"name":"CaolanCode","email":"4502197df7750dd9e950290717caee9c90ef26c8@gmail.com"},"message":"changed location of search icon","distinct":true,"url":"https://api.github.com/repos/CaolanCode/Rent-Review/commits/44a733acdd01db59ffbfaa14d559035632b21c04"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207629","type":"PushEvent","actor":{"id":71981858,"login":"Nishchal-007","display_login":"Nishchal-007","gravatar_id":"","url":"https://api.github.com/users/Nishchal-007","avatar_url":"https://avatars.githubusercontent.com/u/71981858?"},"repo":{"id":353037889,"name":"Nishchal-007/Niffler","url":"https://api.github.com/repos/Nishchal-007/Niffler"},"payload":{"push_id":7561414951,"size":19,"distinct_size":2,"ref":"refs/heads/dev","head":"b6e625c09cadc426ce563cf35212a37ade5ffb40","before":"1c2bc7dd983d660774b851fbfc2542191526057d","commits":[{"sha":"f297e521be84dd2a99274986531c32acddd12d78","author":{"name":"Ramon Luis Correa Medero","email":"79d5797154be7873040faca12648875d839bc046@emory.edu"},"message":"mismatch bug for  external datasets \n\nadds check for None when fixing data mismatches.","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/f297e521be84dd2a99274986531c32acddd12d78"},{"sha":"8d4bdcede035c652bbe2c929354908c5bdd428f6","author":{"name":"Ramon Luis Correa Medero","email":"79d5797154be7873040faca12648875d839bc046@emory.edu"},"message":"Merge pull request #1 from ramon349/ramon349-fixMismatch\n\nmismatch bug for  external datasets","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/8d4bdcede035c652bbe2c929354908c5bdd428f6"},{"sha":"cc0c34e6d07938fe48bd69cdfb475ccf99b0898f","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Merge pull request #179 from ramon349/dev\n\nsimple check that \"skips\" dealing with VRS that are None.","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/cc0c34e6d07938fe48bd69cdfb475ccf99b0898f"},{"sha":"3685b85f92c7f071eca0f98a12d6a79f2dda2a5d","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Experimental c-find only mode","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/3685b85f92c7f071eca0f98a12d6a79f2dda2a5d"},{"sha":"61d2039337fea1781980a90990c3fd6ed07a607e","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Merge branch 'dev' of github.com:Emory-HITI/Niffler into dev","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/61d2039337fea1781980a90990c3fd6ed07a607e"},{"sha":"702dfe7d81c0cf5353ff42326b2b14ae9fd363a6","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix multiple decimal separator issue","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/702dfe7d81c0cf5353ff42326b2b14ae9fd363a6"},{"sha":"35285686b4ed3343fa5418cefa1bdd82f519e26b","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix multiple decimal separator issue","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/35285686b4ed3343fa5418cefa1bdd82f519e26b"},{"sha":"96725f79deb4bdb32780259154362994af9c09fe","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix c-find only mode","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/96725f79deb4bdb32780259154362994af9c09fe"},{"sha":"7cce9a75c53f24cd866dc4655a255451db14e0dc","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"merge the cfind output to a single file","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/7cce9a75c53f24cd866dc4655a255451db14e0dc"},{"sha":"9227ce93e406cdad2b6a1b08aa844bfc6c671c24","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix filepath typo","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/9227ce93e406cdad2b6a1b08aa844bfc6c671c24"},{"sha":"39904729c734cf5fc4ef9123c79397d19a3c2502","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix filepath typo","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/39904729c734cf5fc4ef9123c79397d19a3c2502"},{"sha":"2150b49dbcd103e7cf9996f2e6c0c1d9e4ef14ab","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix filepath typo","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/2150b49dbcd103e7cf9996f2e6c0c1d9e4ef14ab"},{"sha":"761d9408760e2239ad7d5c4c7b4528e9c93294a0","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix filepath typo","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/761d9408760e2239ad7d5c4c7b4528e9c93294a0"},{"sha":"965c493769e5605572470077d082609d655d8a63","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix filepath typo","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/965c493769e5605572470077d082609d655d8a63"},{"sha":"cb2de5ced7a33c2cc3b7edf32eb5ca7645859c8c","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix csv merge","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/cb2de5ced7a33c2cc3b7edf32eb5ca7645859c8c"},{"sha":"ef0c9e0c85d7919344a24afccbb52a504a5190a6","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Fix csv merge","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/ef0c9e0c85d7919344a24afccbb52a504a5190a6"},{"sha":"6b7c8dff4c8f30ae5b640759ca03d681c4359ac1","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"add new line for filemerge","distinct":false,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/6b7c8dff4c8f30ae5b640759ca03d681c4359ac1"},{"sha":"e027577e4914652b598e6e7a3819f8b012c855e9","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Remove unused import","distinct":true,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/e027577e4914652b598e6e7a3819f8b012c855e9"},{"sha":"b6e625c09cadc426ce563cf35212a37ade5ffb40","author":{"name":"Pradeeban Kathiravelu","email":"920c84cb135840545ff944768a887f30e4312c5a@gmail.com"},"message":"Update to reflect the status as of Niffler-0.8.1","distinct":true,"url":"https://api.github.com/repos/Nishchal-007/Niffler/commits/b6e625c09cadc426ce563cf35212a37ade5ffb40"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207633","type":"CreateEvent","actor":{"id":37322044,"login":"sriramviswanathan-bb","display_login":"sriramviswanathan-bb","gravatar_id":"","url":"https://api.github.com/users/sriramviswanathan-bb","avatar_url":"https://avatars.githubusercontent.com/u/37322044?"},"repo":{"id":388010498,"name":"sriramviswanathan-bb/sampleTestRepo","url":"https://api.github.com/repos/sriramviswanathan-bb/sampleTestRepo"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207640","type":"PushEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":227131980,"name":"SDA-SE/sda-dropwizard-commons","url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons"},"payload":{"push_id":7561414942,"size":2,"distinct_size":1,"ref":"refs/heads/dependabot/gradle/master/org.flywaydb-flyway-core-7.11.3","head":"53446179ea61758c6504b7f9e0dc9da6187fee0e","before":"02dc41a4137cb3271ab6f24e5114c7d0eacb7a8c","commits":[{"sha":"1eb7ae12e7e38630f115b821244168f160d2db24","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"chore(deps): bump com.diffplug.spotless from 5.14.1 to 5.14.2\n\nBumps com.diffplug.spotless from 5.14.1 to 5.14.2.\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":false,"url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons/commits/1eb7ae12e7e38630f115b821244168f160d2db24"},{"sha":"53446179ea61758c6504b7f9e0dc9da6187fee0e","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"fix(deps): bump flyway-core from 6.5.5 to 7.11.3\n\nBumps [flyway-core](https://github.com/flyway/flyway) from 6.5.5 to 7.11.3.\n- [Release notes](https://github.com/flyway/flyway/releases)\n- [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.5...flyway-7.11.3)\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":true,"url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons/commits/53446179ea61758c6504b7f9e0dc9da6187fee0e"}]},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":28891100,"login":"SDA-SE","gravatar_id":"","url":"https://api.github.com/orgs/SDA-SE","avatar_url":"https://avatars.githubusercontent.com/u/28891100?"}}
+{"id":"17244207647","type":"PublicEvent","actor":{"id":48037590,"login":"rungjoo","display_login":"rungjoo","gravatar_id":"","url":"https://api.github.com/users/rungjoo","avatar_url":"https://avatars.githubusercontent.com/u/48037590?"},"repo":{"id":364754905,"name":"rungjoo/Paraphrasing-ranking","url":"https://api.github.com/repos/rungjoo/Paraphrasing-ranking"},"payload":{},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207650","type":"PushEvent","actor":{"id":48682370,"login":"rikanakai0823","display_login":"rikanakai0823","gravatar_id":"","url":"https://api.github.com/users/rikanakai0823","avatar_url":"https://avatars.githubusercontent.com/u/48682370?"},"repo":{"id":176296125,"name":"rikanakai0823/bangumi-data","url":"https://api.github.com/repos/rikanakai0823/bangumi-data"},"payload":{"push_id":7561414957,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"db0daa6b091a9a8ff03e003c866809720d33ffc8","before":"e0e1d227f31209924d8f84d54528b171b5d4caec","commits":[{"sha":"db0daa6b091a9a8ff03e003c866809720d33ffc8","author":{"name":"rikanakai0823","email":"b58812a1de528b10e45c95eac7749d14dececc61@users.noreply.github.com"},"message":"data update Wed Jul 21 03:00:05 PM JST 2021","distinct":true,"url":"https://api.github.com/repos/rikanakai0823/bangumi-data/commits/db0daa6b091a9a8ff03e003c866809720d33ffc8"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207656","type":"PushEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":227131980,"name":"SDA-SE/sda-dropwizard-commons","url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons"},"payload":{"push_id":7561414946,"size":2,"distinct_size":1,"ref":"refs/heads/dependabot/gradle/master/com.amazonaws-aws-java-sdk-bom-1.12.28","head":"f2d271e83af1112e025ba0a3613b7a1ff812f14a","before":"2ed3c9ddf729331bc15f890cfcdd51094c7ed020","commits":[{"sha":"1eb7ae12e7e38630f115b821244168f160d2db24","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"chore(deps): bump com.diffplug.spotless from 5.14.1 to 5.14.2\n\nBumps com.diffplug.spotless from 5.14.1 to 5.14.2.\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":false,"url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons/commits/1eb7ae12e7e38630f115b821244168f160d2db24"},{"sha":"f2d271e83af1112e025ba0a3613b7a1ff812f14a","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"fix(deps): bump aws-java-sdk-bom from 1.12.22 to 1.12.28\n\nBumps [aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.22 to 1.12.28.\n- [Release notes](https://github.com/aws/aws-sdk-java/releases)\n- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)\n- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.22...1.12.28)\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":true,"url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons/commits/f2d271e83af1112e025ba0a3613b7a1ff812f14a"}]},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":28891100,"login":"SDA-SE","gravatar_id":"","url":"https://api.github.com/orgs/SDA-SE","avatar_url":"https://avatars.githubusercontent.com/u/28891100?"}}
+{"id":"17244207658","type":"IssueCommentEvent","actor":{"id":54859811,"login":"shopinvader-git-bot","display_login":"shopinvader-git-bot","gravatar_id":"","url":"https://api.github.com/users/shopinvader-git-bot","avatar_url":"https://avatars.githubusercontent.com/u/54859811?"},"repo":{"id":71813459,"name":"shopinvader/odoo-shopinvader","url":"https://api.github.com/repos/shopinvader/odoo-shopinvader"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/issues/1016","repository_url":"https://api.github.com/repos/shopinvader/odoo-shopinvader","labels_url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/issues/1016/labels{/name}","comments_url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/issues/1016/comments","events_url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/issues/1016/events","html_url":"https://github.com/shopinvader/odoo-shopinvader/pull/1016","id":941098124,"node_id":"MDExOlB1bGxSZXF1ZXN0Njg3MDY2ODMz","number":1016,"title":"[14.0][REF] clean up mix with id and object id fix issue #1000","user":{"login":"sebastienbeau","id":1164578,"node_id":"MDQ6VXNlcjExNjQ1Nzg=","avatar_url":"https://avatars.githubusercontent.com/u/1164578?v=4","gravatar_id":"","url":"https://api.github.com/users/sebastienbeau","html_url":"https://github.com/sebastienbeau","followers_url":"https://api.github.com/users/sebastienbeau/followers","following_url":"https://api.github.com/users/sebastienbeau/following{/other_user}","gists_url":"https://api.github.com/users/sebastienbeau/gists{/gist_id}","starred_url":"https://api.github.com/users/sebastienbeau/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sebastienbeau/subscriptions","organizations_url":"https://api.github.com/users/sebastienbeau/orgs","repos_url":"https://api.github.com/users/sebastienbeau/repos","events_url":"https://api.github.com/users/sebastienbeau/events{/privacy}","received_events_url":"https://api.github.com/users/sebastienbeau/received_events","type":"User","site_admin":false},"labels":[{"id":2794891521,"node_id":"MDU6TGFiZWwyNzk0ODkxNTIx","url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/labels/14.0","name":"14.0","color":"93f45f","default":false,"description":""},{"id":1540242734,"node_id":"MDU6TGFiZWwxNTQwMjQyNzM0","url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/labels/approved","name":"approved","color":"ededed","default":false,"description":null},{"id":1565798727,"node_id":"MDU6TGFiZWwxNTY1Nzk4NzI3","url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/labels/ready%20to%20merge","name":"ready to merge","color":"ededed","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-09T22:23:04Z","updated_at":"2021-07-21T06:00:02Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/pulls/1016","html_url":"https://github.com/shopinvader/odoo-shopinvader/pull/1016","diff_url":"https://github.com/shopinvader/odoo-shopinvader/pull/1016.diff","patch_url":"https://github.com/shopinvader/odoo-shopinvader/pull/1016.patch"},"body":"Depends on\r\n- [x] https://github.com/OCA/search-engine/pull/96\r\n\r\nFix issue #1000 \r\n\r\n@simahawk @lmignon \r\n\r\n@thibaultrey ;)","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/issues/comments/883914011","html_url":"https://github.com/shopinvader/odoo-shopinvader/pull/1016#issuecomment-883914011","issue_url":"https://api.github.com/repos/shopinvader/odoo-shopinvader/issues/1016","id":883914011,"node_id":"IC_kwDOBEfJU840r3Ub","user":{"login":"shopinvader-git-bot","id":54859811,"node_id":"MDQ6VXNlcjU0ODU5ODEx","avatar_url":"https://avatars.githubusercontent.com/u/54859811?v=4","gravatar_id":"","url":"https://api.github.com/users/shopinvader-git-bot","html_url":"https://github.com/shopinvader-git-bot","followers_url":"https://api.github.com/users/shopinvader-git-bot/followers","following_url":"https://api.github.com/users/shopinvader-git-bot/following{/other_user}","gists_url":"https://api.github.com/users/shopinvader-git-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/shopinvader-git-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shopinvader-git-bot/subscriptions","organizations_url":"https://api.github.com/users/shopinvader-git-bot/orgs","repos_url":"https://api.github.com/users/shopinvader-git-bot/repos","events_url":"https://api.github.com/users/shopinvader-git-bot/events{/privacy}","received_events_url":"https://api.github.com/users/shopinvader-git-bot/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T06:00:02Z","updated_at":"2021-07-21T06:00:02Z","author_association":"NONE","body":"This PR has the `approved` label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":28007312,"login":"shopinvader","gravatar_id":"","url":"https://api.github.com/orgs/shopinvader","avatar_url":"https://avatars.githubusercontent.com/u/28007312?"}}
+{"id":"17244207660","type":"WatchEvent","actor":{"id":68039932,"login":"ng8eke","display_login":"ng8eke","gravatar_id":"","url":"https://api.github.com/users/ng8eke","avatar_url":"https://avatars.githubusercontent.com/u/68039932?"},"repo":{"id":385451253,"name":"KawayAlpaka/Sorter","url":"https://api.github.com/repos/KawayAlpaka/Sorter"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207666","type":"IssueCommentEvent","actor":{"id":16489133,"login":"Duckwhale","display_login":"Duckwhale","gravatar_id":"","url":"https://api.github.com/users/Duckwhale","avatar_url":"https://avatars.githubusercontent.com/u/16489133?"},"repo":{"id":109406705,"name":"WowRarity/Rarity","url":"https://api.github.com/repos/WowRarity/Rarity"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/WowRarity/Rarity/issues/336","repository_url":"https://api.github.com/repos/WowRarity/Rarity","labels_url":"https://api.github.com/repos/WowRarity/Rarity/issues/336/labels{/name}","comments_url":"https://api.github.com/repos/WowRarity/Rarity/issues/336/comments","events_url":"https://api.github.com/repos/WowRarity/Rarity/issues/336/events","html_url":"https://github.com/WowRarity/Rarity/issues/336","id":884424247,"node_id":"MDU6SXNzdWU4ODQ0MjQyNDc=","number":336,"title":"Tracking for Larion Pouncer might be broken / use the wrong NPC ID (?)","user":{"login":"Duckwhale","id":16489133,"node_id":"MDQ6VXNlcjE2NDg5MTMz","avatar_url":"https://avatars.githubusercontent.com/u/16489133?v=4","gravatar_id":"","url":"https://api.github.com/users/Duckwhale","html_url":"https://github.com/Duckwhale","followers_url":"https://api.github.com/users/Duckwhale/followers","following_url":"https://api.github.com/users/Duckwhale/following{/other_user}","gists_url":"https://api.github.com/users/Duckwhale/gists{/gist_id}","starred_url":"https://api.github.com/users/Duckwhale/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Duckwhale/subscriptions","organizations_url":"https://api.github.com/users/Duckwhale/orgs","repos_url":"https://api.github.com/users/Duckwhale/repos","events_url":"https://api.github.com/users/Duckwhale/events{/privacy}","received_events_url":"https://api.github.com/users/Duckwhale/received_events","type":"User","site_admin":false},"labels":[{"id":1251563545,"node_id":"MDU6TGFiZWwxMjUxNTYzNTQ1","url":"https://api.github.com/repos/WowRarity/Rarity/labels/Category:%20Database","name":"Category: Database","color":"d4c5f9","default":false,"description":""},{"id":1266751376,"node_id":"MDU6TGFiZWwxMjY2NzUxMzc2","url":"https://api.github.com/repos/WowRarity/Rarity/labels/Complexity:%20Trivial","name":"Complexity: Trivial","color":"3f1f89","default":false,"description":""},{"id":808044578,"node_id":"MDU6TGFiZWw4MDgwNDQ1Nzg=","url":"https://api.github.com/repos/WowRarity/Rarity/labels/Priority:%20High","name":"Priority: High","color":"1d76db","default":false,"description":""},{"id":808046150,"node_id":"MDU6TGFiZWw4MDgwNDYxNTA=","url":"https://api.github.com/repos/WowRarity/Rarity/labels/Status:%20In%20Progress","name":"Status: In Progress","color":"fbca04","default":false,"description":""},{"id":808047234,"node_id":"MDU6TGFiZWw4MDgwNDcyMzQ=","url":"https://api.github.com/repos/WowRarity/Rarity/labels/Type:%20Bug","name":"Type: Bug","color":"d93f0b","default":false,"description":""}],"state":"open","locked":false,"assignee":{"login":"Duckwhale","id":16489133,"node_id":"MDQ6VXNlcjE2NDg5MTMz","avatar_url":"https://avatars.githubusercontent.com/u/16489133?v=4","gravatar_id":"","url":"https://api.github.com/users/Duckwhale","html_url":"https://github.com/Duckwhale","followers_url":"https://api.github.com/users/Duckwhale/followers","following_url":"https://api.github.com/users/Duckwhale/following{/other_user}","gists_url":"https://api.github.com/users/Duckwhale/gists{/gist_id}","starred_url":"https://api.github.com/users/Duckwhale/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Duckwhale/subscriptions","organizations_url":"https://api.github.com/users/Duckwhale/orgs","repos_url":"https://api.github.com/users/Duckwhale/repos","events_url":"https://api.github.com/users/Duckwhale/events{/privacy}","received_events_url":"https://api.github.com/users/Duckwhale/received_events","type":"User","site_admin":false},"assignees":[{"login":"Duckwhale","id":16489133,"node_id":"MDQ6VXNlcjE2NDg5MTMz","avatar_url":"https://avatars.githubusercontent.com/u/16489133?v=4","gravatar_id":"","url":"https://api.github.com/users/Duckwhale","html_url":"https://github.com/Duckwhale","followers_url":"https://api.github.com/users/Duckwhale/followers","following_url":"https://api.github.com/users/Duckwhale/following{/other_user}","gists_url":"https://api.github.com/users/Duckwhale/gists{/gist_id}","starred_url":"https://api.github.com/users/Duckwhale/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Duckwhale/subscriptions","organizations_url":"https://api.github.com/users/Duckwhale/orgs","repos_url":"https://api.github.com/users/Duckwhale/repos","events_url":"https://api.github.com/users/Duckwhale/events{/privacy}","received_events_url":"https://api.github.com/users/Duckwhale/received_events","type":"User","site_admin":false}],"milestone":{"url":"https://api.github.com/repos/WowRarity/Rarity/milestones/8","html_url":"https://github.com/WowRarity/Rarity/milestone/8","labels_url":"https://api.github.com/repos/WowRarity/Rarity/milestones/8/labels","id":4126589,"node_id":"MDk6TWlsZXN0b25lNDEyNjU4OQ==","number":8,"title":"Maintenance","description":"Housekeeping, bugfixing, run-of-the-mill and routine tasks. It's not exiciting, but nevertheless important to not fall behind on these.","creator":{"login":"Duckwhale","id":16489133,"node_id":"MDQ6VXNlcjE2NDg5MTMz","avatar_url":"https://avatars.githubusercontent.com/u/16489133?v=4","gravatar_id":"","url":"https://api.github.com/users/Duckwhale","html_url":"https://github.com/Duckwhale","followers_url":"https://api.github.com/users/Duckwhale/followers","following_url":"https://api.github.com/users/Duckwhale/following{/other_user}","gists_url":"https://api.github.com/users/Duckwhale/gists{/gist_id}","starred_url":"https://api.github.com/users/Duckwhale/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Duckwhale/subscriptions","organizations_url":"https://api.github.com/users/Duckwhale/orgs","repos_url":"https://api.github.com/users/Duckwhale/repos","events_url":"https://api.github.com/users/Duckwhale/events{/privacy}","received_events_url":"https://api.github.com/users/Duckwhale/received_events","type":"User","site_admin":false},"open_issues":62,"closed_issues":94,"state":"open","created_at":"2019-03-10T19:29:53Z","updated_at":"2021-07-18T15:18:14Z","due_on":null,"closed_at":null},"comments":2,"created_at":"2021-05-10T15:05:06Z","updated_at":"2021-07-21T06:00:02Z","closed_at":null,"author_association":"MEMBER","active_lock_reason":null,"body":"Source: [CurseForge](https://www.wowace.com/projects/rarity?comment=2627)\r\n> Hello, I've got an issue with the tracking of Larion Pouncer. The npc id of the npc that is looted seemed correct and localization also should not be an thing in this case. I've disabled the quest id 61634 but this didn't help. So I added 156339 to the npcs and it finally counted. I didn't reactivate the quest id I previously commented out, so I don't know if this matters.\r\n\r\n> My line looks like this now \"line 578 npcs = {156340, 156339 },\" but it wasn't counted twice. So no idea what is wrong with Orstus, but Sotiros works. \r\n\r\nNot sure what's the matter here, maybe it can only looted from one of the NPCs? Perhaps it's \"random\" which one it is? I have never even been to this location ingame, so I don't know anything about these rares.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/WowRarity/Rarity/issues/comments/883914010","html_url":"https://github.com/WowRarity/Rarity/issues/336#issuecomment-883914010","issue_url":"https://api.github.com/repos/WowRarity/Rarity/issues/336","id":883914010,"node_id":"IC_kwDOBoVp8c40r3Ua","user":{"login":"Duckwhale","id":16489133,"node_id":"MDQ6VXNlcjE2NDg5MTMz","avatar_url":"https://avatars.githubusercontent.com/u/16489133?v=4","gravatar_id":"","url":"https://api.github.com/users/Duckwhale","html_url":"https://github.com/Duckwhale","followers_url":"https://api.github.com/users/Duckwhale/followers","following_url":"https://api.github.com/users/Duckwhale/following{/other_user}","gists_url":"https://api.github.com/users/Duckwhale/gists{/gist_id}","starred_url":"https://api.github.com/users/Duckwhale/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Duckwhale/subscriptions","organizations_url":"https://api.github.com/users/Duckwhale/orgs","repos_url":"https://api.github.com/users/Duckwhale/repos","events_url":"https://api.github.com/users/Duckwhale/events{/privacy}","received_events_url":"https://api.github.com/users/Duckwhale/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T06:00:02Z","updated_at":"2021-07-21T06:00:02Z","author_association":"MEMBER","body":"From the CurseForge comment:\r\n\r\n> Not both of this NPC pair are lootable after defeating them, only Sotiros was glimmering","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":79935280,"login":"WowRarity","gravatar_id":"","url":"https://api.github.com/orgs/WowRarity","avatar_url":"https://avatars.githubusercontent.com/u/79935280?"}}
+{"id":"17244207675","type":"CreateEvent","actor":{"id":67725652,"login":"hak2711","display_login":"hak2711","gravatar_id":"","url":"https://api.github.com/users/hak2711","avatar_url":"https://avatars.githubusercontent.com/u/67725652?"},"repo":{"id":384118160,"name":"Pork-Potatoes/Pork-Potatoes-Back","url":"https://api.github.com/repos/Pork-Potatoes/Pork-Potatoes-Back"},"payload":{"ref":"feature-91-save-restaurant","ref_type":"branch","master_branch":"develop","description":"돼지감자 백엔드팀 레포","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":86966129,"login":"Pork-Potatoes","gravatar_id":"","url":"https://api.github.com/orgs/Pork-Potatoes","avatar_url":"https://avatars.githubusercontent.com/u/86966129?"}}
+{"id":"17244207677","type":"CreateEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"ref":"4158","ref_type":"branch","master_branch":"master","description":"Testing Github Pull requests limits","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207678","type":"WatchEvent","actor":{"id":62786413,"login":"Trisha170401","display_login":"Trisha170401","gravatar_id":"","url":"https://api.github.com/users/Trisha170401","avatar_url":"https://avatars.githubusercontent.com/u/62786413?"},"repo":{"id":215159541,"name":"fterh/leetcode-curation-topical","url":"https://api.github.com/repos/fterh/leetcode-curation-topical"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207684","type":"PushEvent","actor":{"id":45457584,"login":"Morri-sama","display_login":"Morri-sama","gravatar_id":"","url":"https://api.github.com/users/Morri-sama","avatar_url":"https://avatars.githubusercontent.com/u/45457584?"},"repo":{"id":382439818,"name":"Morri-sama/RPGTest","url":"https://api.github.com/repos/Morri-sama/RPGTest"},"payload":{"push_id":7561414968,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"d325ef48ac50a3e088b54dbc4900baa09b1a3a0e","before":"438ce4d72c424cd367c2fb54b821ee2526e1d35c","commits":[{"sha":"319e0edbdfd9948769976c7c963574c66eae93c6","author":{"name":"Morri","email":"a2b6de8d7c3ab69ba8bd92cced787c82731a6660@gmail.com"},"message":"xdd","distinct":true,"url":"https://api.github.com/repos/Morri-sama/RPGTest/commits/319e0edbdfd9948769976c7c963574c66eae93c6"},{"sha":"d325ef48ac50a3e088b54dbc4900baa09b1a3a0e","author":{"name":"Morri","email":"a2b6de8d7c3ab69ba8bd92cced787c82731a6660@gmail.com"},"message":"xddd","distinct":true,"url":"https://api.github.com/repos/Morri-sama/RPGTest/commits/d325ef48ac50a3e088b54dbc4900baa09b1a3a0e"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207692","type":"PushEvent","actor":{"id":55400130,"login":"Kolenchitssi","display_login":"Kolenchitssi","gravatar_id":"","url":"https://api.github.com/users/Kolenchitssi","avatar_url":"https://avatars.githubusercontent.com/u/55400130?"},"repo":{"id":385634337,"name":"Kolenchitssi/HiQo_JavaScript","url":"https://api.github.com/repos/Kolenchitssi/HiQo_JavaScript"},"payload":{"push_id":7561414972,"size":1,"distinct_size":1,"ref":"refs/heads/feature/task1","head":"f50ef42b4a0e2a9a0e14e1c0ed41359e82007a58","before":"826b9af948c656fbd701fae6dd8644b2fe8caf1f","commits":[{"sha":"f50ef42b4a0e2a9a0e14e1c0ed41359e82007a58","author":{"name":"Kolenchitssi","email":"3bae36f479ec4bc1d85d6607fd8e70ce4708a098@gmail.com"},"message":"fix: add check for existence","distinct":true,"url":"https://api.github.com/repos/Kolenchitssi/HiQo_JavaScript/commits/f50ef42b4a0e2a9a0e14e1c0ed41359e82007a58"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207693","type":"PushEvent","actor":{"id":34484660,"login":"sudheermuthyala","display_login":"sudheermuthyala","gravatar_id":"","url":"https://api.github.com/users/sudheermuthyala","avatar_url":"https://avatars.githubusercontent.com/u/34484660?"},"repo":{"id":352357026,"name":"sudheermuthyala/DevOps_tools","url":"https://api.github.com/repos/sudheermuthyala/DevOps_tools"},"payload":{"push_id":7561414971,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"40814df6fdd7e6fdcc81056a3ff4c0e4bef68f6b","before":"7b1728553c3e9bf17f13c094b2a3ea6249d69222","commits":[{"sha":"40814df6fdd7e6fdcc81056a3ff4c0e4bef68f6b","author":{"name":"Your Name","email":"8af56de68279cb6f5ed022f31af18b9fcdcc2e92@example.com"},"message":"--- Auto-Git Commit ---","distinct":true,"url":"https://api.github.com/repos/sudheermuthyala/DevOps_tools/commits/40814df6fdd7e6fdcc81056a3ff4c0e4bef68f6b"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207697","type":"PushEvent","actor":{"id":8517910,"login":"LombiqBot","display_login":"LombiqBot","gravatar_id":"","url":"https://api.github.com/users/LombiqBot","avatar_url":"https://avatars.githubusercontent.com/u/8517910?"},"repo":{"id":90270884,"name":"Lombiq/vandelay","url":"https://api.github.com/repos/Lombiq/vandelay"},"payload":{"push_id":7561414966,"size":0,"distinct_size":0,"ref":"refs/heads/master","head":"3ce0f7a0b46bd195b53e17f1c9073df87c503ebd","before":"3ce0f7a0b46bd195b53e17f1c9073df87c503ebd","commits":[]},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":8158177,"login":"Lombiq","gravatar_id":"","url":"https://api.github.com/orgs/Lombiq","avatar_url":"https://avatars.githubusercontent.com/u/8158177?"}}
+{"id":"17244207698","type":"PushEvent","actor":{"id":87746026,"login":"FOEIM","display_login":"FOEIM","gravatar_id":"","url":"https://api.github.com/users/FOEIM","avatar_url":"https://avatars.githubusercontent.com/u/87746026?"},"repo":{"id":388004548,"name":"FOEIM/assessment_reg","url":"https://api.github.com/repos/FOEIM/assessment_reg"},"payload":{"push_id":7561414977,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"2c993184e15ccac6a490eea3276f0951376119d2","before":"e9b35d48b444d89a154424416fbc2b41e5f96d2c","commits":[{"sha":"2c993184e15ccac6a490eea3276f0951376119d2","author":{"name":"FOEIM","email":"2ad569f0b76e27e71d626e90948fb249c4a71c81@users.noreply.github.com"},"message":"Rename index.html to index.php","distinct":true,"url":"https://api.github.com/repos/FOEIM/assessment_reg/commits/2c993184e15ccac6a490eea3276f0951376119d2"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207708","type":"CreateEvent","actor":{"id":74011967,"login":"custard0413","display_login":"custard0413","gravatar_id":"","url":"https://api.github.com/users/custard0413","avatar_url":"https://avatars.githubusercontent.com/u/74011967?"},"repo":{"id":388010497,"name":"custard0413/test","url":"https://api.github.com/repos/custard0413/test"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207710","type":"PushEvent","actor":{"id":72592300,"login":"stalnakerwang","display_login":"stalnakerwang","gravatar_id":"","url":"https://api.github.com/users/stalnakerwang","avatar_url":"https://avatars.githubusercontent.com/u/72592300?"},"repo":{"id":384024329,"name":"stalnakerwang/Stock_data","url":"https://api.github.com/repos/stalnakerwang/Stock_data"},"payload":{"push_id":7561414984,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f19acf90045ec3f96554cbdffbf9754710a8658b","before":"716454d5f8131f87e9fcf1352e0ab63c94954e21","commits":[{"sha":"f19acf90045ec3f96554cbdffbf9754710a8658b","author":{"name":"stalnakerwang","email":"f344e620d0451a1f3ba0e4946f5dfb16544abb33@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/stalnakerwang/Stock_data/commits/f19acf90045ec3f96554cbdffbf9754710a8658b"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207722","type":"PushEvent","actor":{"id":85772399,"login":"TatsuoOoshi","display_login":"TatsuoOoshi","gravatar_id":"","url":"https://api.github.com/users/TatsuoOoshi","avatar_url":"https://avatars.githubusercontent.com/u/85772399?"},"repo":{"id":388004589,"name":"TatsuoOoshi/CorpusClinicaSite","url":"https://api.github.com/repos/TatsuoOoshi/CorpusClinicaSite"},"payload":{"push_id":7561414988,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"c905b25959407ba036418ffc33bb4f68852806e1","before":"de82eb6ae2af579096b2d060330251f80951c336","commits":[{"sha":"c905b25959407ba036418ffc33bb4f68852806e1","author":{"name":"TatsuoOoshi","email":"0b925969c52a6b6bb97cc850d87ee52e879c4249@users.noreply.github.com"},"message":"Delete CNAME","distinct":true,"url":"https://api.github.com/repos/TatsuoOoshi/CorpusClinicaSite/commits/c905b25959407ba036418ffc33bb4f68852806e1"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207707","type":"ForkEvent","actor":{"id":55054567,"login":"marcotimothy","display_login":"marcotimothy","gravatar_id":"","url":"https://api.github.com/users/marcotimothy","avatar_url":"https://avatars.githubusercontent.com/u/55054567?"},"repo":{"id":374113566,"name":"TheFriskyVyper/FreeRdp","url":"https://api.github.com/repos/TheFriskyVyper/FreeRdp"},"payload":{"forkee":{"id":388010501,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMTA1MDE=","name":"FreeRdp","full_name":"marcotimothy/FreeRdp","private":false,"owner":{"login":"marcotimothy","id":55054567,"node_id":"MDQ6VXNlcjU1MDU0NTY3","avatar_url":"https://avatars.githubusercontent.com/u/55054567?v=4","gravatar_id":"","url":"https://api.github.com/users/marcotimothy","html_url":"https://github.com/marcotimothy","followers_url":"https://api.github.com/users/marcotimothy/followers","following_url":"https://api.github.com/users/marcotimothy/following{/other_user}","gists_url":"https://api.github.com/users/marcotimothy/gists{/gist_id}","starred_url":"https://api.github.com/users/marcotimothy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marcotimothy/subscriptions","organizations_url":"https://api.github.com/users/marcotimothy/orgs","repos_url":"https://api.github.com/users/marcotimothy/repos","events_url":"https://api.github.com/users/marcotimothy/events{/privacy}","received_events_url":"https://api.github.com/users/marcotimothy/received_events","type":"User","site_admin":false},"html_url":"https://github.com/marcotimothy/FreeRdp","description":null,"fork":true,"url":"https://api.github.com/repos/marcotimothy/FreeRdp","forks_url":"https://api.github.com/repos/marcotimothy/FreeRdp/forks","keys_url":"https://api.github.com/repos/marcotimothy/FreeRdp/keys{/key_id}","collaborators_url":"https://api.github.com/repos/marcotimothy/FreeRdp/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/marcotimothy/FreeRdp/teams","hooks_url":"https://api.github.com/repos/marcotimothy/FreeRdp/hooks","issue_events_url":"https://api.github.com/repos/marcotimothy/FreeRdp/issues/events{/number}","events_url":"https://api.github.com/repos/marcotimothy/FreeRdp/events","assignees_url":"https://api.github.com/repos/marcotimothy/FreeRdp/assignees{/user}","branches_url":"https://api.github.com/repos/marcotimothy/FreeRdp/branches{/branch}","tags_url":"https://api.github.com/repos/marcotimothy/FreeRdp/tags","blobs_url":"https://api.github.com/repos/marcotimothy/FreeRdp/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/marcotimothy/FreeRdp/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/marcotimothy/FreeRdp/git/refs{/sha}","trees_url":"https://api.github.com/repos/marcotimothy/FreeRdp/git/trees{/sha}","statuses_url":"https://api.github.com/repos/marcotimothy/FreeRdp/statuses/{sha}","languages_url":"https://api.github.com/repos/marcotimothy/FreeRdp/languages","stargazers_url":"https://api.github.com/repos/marcotimothy/FreeRdp/stargazers","contributors_url":"https://api.github.com/repos/marcotimothy/FreeRdp/contributors","subscribers_url":"https://api.github.com/repos/marcotimothy/FreeRdp/subscribers","subscription_url":"https://api.github.com/repos/marcotimothy/FreeRdp/subscription","commits_url":"https://api.github.com/repos/marcotimothy/FreeRdp/commits{/sha}","git_commits_url":"https://api.github.com/repos/marcotimothy/FreeRdp/git/commits{/sha}","comments_url":"https://api.github.com/repos/marcotimothy/FreeRdp/comments{/number}","issue_comment_url":"https://api.github.com/repos/marcotimothy/FreeRdp/issues/comments{/number}","contents_url":"https://api.github.com/repos/marcotimothy/FreeRdp/contents/{+path}","compare_url":"https://api.github.com/repos/marcotimothy/FreeRdp/compare/{base}...{head}","merges_url":"https://api.github.com/repos/marcotimothy/FreeRdp/merges","archive_url":"https://api.github.com/repos/marcotimothy/FreeRdp/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/marcotimothy/FreeRdp/downloads","issues_url":"https://api.github.com/repos/marcotimothy/FreeRdp/issues{/number}","pulls_url":"https://api.github.com/repos/marcotimothy/FreeRdp/pulls{/number}","milestones_url":"https://api.github.com/repos/marcotimothy/FreeRdp/milestones{/number}","notifications_url":"https://api.github.com/repos/marcotimothy/FreeRdp/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/marcotimothy/FreeRdp/labels{/name}","releases_url":"https://api.github.com/repos/marcotimothy/FreeRdp/releases{/id}","deployments_url":"https://api.github.com/repos/marcotimothy/FreeRdp/deployments","created_at":"2021-07-21T06:00:02Z","updated_at":"2021-07-02T03:04:24Z","pushed_at":"2021-06-05T12:52:52Z","git_url":"git://github.com/marcotimothy/FreeRdp.git","ssh_url":"git@github.com:marcotimothy/FreeRdp.git","clone_url":"https://github.com/marcotimothy/FreeRdp.git","svn_url":"https://github.com/marcotimothy/FreeRdp","homepage":null,"size":519,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207734","type":"WatchEvent","actor":{"id":43681370,"login":"pc29564530","display_login":"pc29564530","gravatar_id":"","url":"https://api.github.com/users/pc29564530","avatar_url":"https://avatars.githubusercontent.com/u/43681370?"},"repo":{"id":323155484,"name":"LloydJanseVanRensburg/mini-mern-ecommerce-project","url":"https://api.github.com/repos/LloydJanseVanRensburg/mini-mern-ecommerce-project"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207735","type":"WatchEvent","actor":{"id":8367760,"login":"CreatorMetaSky","display_login":"CreatorMetaSky","gravatar_id":"","url":"https://api.github.com/users/CreatorMetaSky","avatar_url":"https://avatars.githubusercontent.com/u/8367760?"},"repo":{"id":99260363,"name":"jmpews/Dobby","url":"https://api.github.com/repos/jmpews/Dobby"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207737","type":"PushEvent","actor":{"id":80685876,"login":"Hack4lLive","display_login":"Hack4lLive","gravatar_id":"","url":"https://api.github.com/users/Hack4lLive","avatar_url":"https://avatars.githubusercontent.com/u/80685876?"},"repo":{"id":388004884,"name":"Hack4lLive/Api-Mans","url":"https://api.github.com/repos/Hack4lLive/Api-Mans"},"payload":{"push_id":7561415003,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"753646b2e5f5e1c3edd18f9ff57c84230feef15d","before":"fc62120b14817870809f304cf7b444f9e25f8115","commits":[{"sha":"753646b2e5f5e1c3edd18f9ff57c84230feef15d","author":{"name":"Hack4lLive","email":"ac80d7cefb3ff05fd84d01129af5dd388281bb31@users.noreply.github.com"},"message":"Delete docs.html","distinct":true,"url":"https://api.github.com/repos/Hack4lLive/Api-Mans/commits/753646b2e5f5e1c3edd18f9ff57c84230feef15d"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207739","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":346231315,"name":"frunoob/WakeLeanCloud","url":"https://api.github.com/repos/frunoob/WakeLeanCloud"},"payload":{"push_id":7561414998,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"90aeb2a699c363e3b9342e72d45590eddfbba6a2","before":"76f44bb382f500555f12f602dd8634cfe47504b1","commits":[{"sha":"90aeb2a699c363e3b9342e72d45590eddfbba6a2","author":{"name":"AutoWakeUp","email":"9859c42ca70ff3b1b032e3b68da91f9166e9b599@email.com"},"message":"Successfully Wake","distinct":true,"url":"https://api.github.com/repos/frunoob/WakeLeanCloud/commits/90aeb2a699c363e3b9342e72d45590eddfbba6a2"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207747","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561415005,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2968f2a3fb933897fb0d2a3c690ed0cd0fe4d6f2","before":"9d8f37830d4550d76b9c116b33b2d67528d2676e","commits":[{"sha":"2968f2a3fb933897fb0d2a3c690ed0cd0fe4d6f2","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/2968f2a3fb933897fb0d2a3c690ed0cd0fe4d6f2"}]},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207748","type":"PushEvent","actor":{"id":59435267,"login":"albertoabellagarcia","display_login":"albertoabellagarcia","gravatar_id":"","url":"https://api.github.com/users/albertoabellagarcia","avatar_url":"https://avatars.githubusercontent.com/u/59435267?"},"repo":{"id":190601053,"name":"smart-data-models/dataModel.PointOfInterest","url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest"},"payload":{"push_id":7561414992,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"815272e09865af03f0bb4c42a89e67e1c9f062b2","before":"5ab04f38d3f9a175a5cef8332cf6ad063e04a770","commits":[{"sha":"815272e09865af03f0bb4c42a89e67e1c9f062b2","author":{"name":"Alberto Abella","email":"4641006ed1a70ab96eea2556876687c02238d7d2@fiware.org"},"message":"updated on the 2021-07-21 08:00:01.195835","distinct":true,"url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest/commits/815272e09865af03f0bb4c42a89e67e1c9f062b2"}]},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":44724489,"login":"smart-data-models","gravatar_id":"","url":"https://api.github.com/orgs/smart-data-models","avatar_url":"https://avatars.githubusercontent.com/u/44724489?"}}
+{"id":"17244207754","type":"ForkEvent","actor":{"id":11943956,"login":"JaKrIvMa","display_login":"JaKrIvMa","gravatar_id":"","url":"https://api.github.com/users/JaKrIvMa","avatar_url":"https://avatars.githubusercontent.com/u/11943956?"},"repo":{"id":198662994,"name":"Dineshkarthik/telegram_media_downloader","url":"https://api.github.com/repos/Dineshkarthik/telegram_media_downloader"},"payload":{"forkee":{"id":388010504,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMTA1MDQ=","name":"telegram_media_downloader","full_name":"JaKrIvMa/telegram_media_downloader","private":false,"owner":{"login":"JaKrIvMa","id":11943956,"node_id":"MDQ6VXNlcjExOTQzOTU2","avatar_url":"https://avatars.githubusercontent.com/u/11943956?v=4","gravatar_id":"","url":"https://api.github.com/users/JaKrIvMa","html_url":"https://github.com/JaKrIvMa","followers_url":"https://api.github.com/users/JaKrIvMa/followers","following_url":"https://api.github.com/users/JaKrIvMa/following{/other_user}","gists_url":"https://api.github.com/users/JaKrIvMa/gists{/gist_id}","starred_url":"https://api.github.com/users/JaKrIvMa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JaKrIvMa/subscriptions","organizations_url":"https://api.github.com/users/JaKrIvMa/orgs","repos_url":"https://api.github.com/users/JaKrIvMa/repos","events_url":"https://api.github.com/users/JaKrIvMa/events{/privacy}","received_events_url":"https://api.github.com/users/JaKrIvMa/received_events","type":"User","site_admin":false},"html_url":"https://github.com/JaKrIvMa/telegram_media_downloader","description":"Download media files from a telegram conversation/chat/channel up to 2GiB","fork":true,"url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader","forks_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/forks","keys_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/keys{/key_id}","collaborators_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/teams","hooks_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/hooks","issue_events_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/issues/events{/number}","events_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/events","assignees_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/assignees{/user}","branches_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/branches{/branch}","tags_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/tags","blobs_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/git/refs{/sha}","trees_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/git/trees{/sha}","statuses_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/statuses/{sha}","languages_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/languages","stargazers_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/stargazers","contributors_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/contributors","subscribers_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/subscribers","subscription_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/subscription","commits_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/commits{/sha}","git_commits_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/git/commits{/sha}","comments_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/comments{/number}","issue_comment_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/issues/comments{/number}","contents_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/contents/{+path}","compare_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/compare/{base}...{head}","merges_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/merges","archive_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/downloads","issues_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/issues{/number}","pulls_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/pulls{/number}","milestones_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/milestones{/number}","notifications_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/labels{/name}","releases_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/releases{/id}","deployments_url":"https://api.github.com/repos/JaKrIvMa/telegram_media_downloader/deployments","created_at":"2021-07-21T06:00:02Z","updated_at":"2021-07-20T09:06:46Z","pushed_at":"2021-06-30T12:21:52Z","git_url":"git://github.com/JaKrIvMa/telegram_media_downloader.git","ssh_url":"git@github.com:JaKrIvMa/telegram_media_downloader.git","clone_url":"https://github.com/JaKrIvMa/telegram_media_downloader.git","svn_url":"https://github.com/JaKrIvMa/telegram_media_downloader","homepage":"","size":161,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T06:00:02Z"}
+{"id":"17244207755","type":"ForkEvent","actor":{"id":40752332,"login":"MirrorFork","display_login":"MirrorFork","gravatar_id":"","url":"https://api.github.com/users/MirrorFork","avatar_url":"https://avatars.githubusercontent.com/u/40752332?"},"repo":{"id":131212638,"name":"google/gvisor","url":"https://api.github.com/repos/google/gvisor"},"payload":{"forkee":{"id":388010502,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMTA1MDI=","name":"gvisor","full_name":"MirrorFork/gvisor","private":false,"owner":{"login":"MirrorFork","id":40752332,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQwNzUyMzMy","avatar_url":"https://avatars.githubusercontent.com/u/40752332?v=4","gravatar_id":"","url":"https://api.github.com/users/MirrorFork","html_url":"https://github.com/MirrorFork","followers_url":"https://api.github.com/users/MirrorFork/followers","following_url":"https://api.github.com/users/MirrorFork/following{/other_user}","gists_url":"https://api.github.com/users/MirrorFork/gists{/gist_id}","starred_url":"https://api.github.com/users/MirrorFork/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MirrorFork/subscriptions","organizations_url":"https://api.github.com/users/MirrorFork/orgs","repos_url":"https://api.github.com/users/MirrorFork/repos","events_url":"https://api.github.com/users/MirrorFork/events{/privacy}","received_events_url":"https://api.github.com/users/MirrorFork/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/MirrorFork/gvisor","description":"Application Kernel for Containers","fork":true,"url":"https://api.github.com/repos/MirrorFork/gvisor","forks_url":"https://api.github.com/repos/MirrorFork/gvisor/forks","keys_url":"https://api.github.com/repos/MirrorFork/gvisor/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MirrorFork/gvisor/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MirrorFork/gvisor/teams","hooks_url":"https://api.github.com/repos/MirrorFork/gvisor/hooks","issue_events_url":"https://api.github.com/repos/MirrorFork/gvisor/issues/events{/number}","events_url":"https://api.github.com/repos/MirrorFork/gvisor/events","assignees_url":"https://api.github.com/repos/MirrorFork/gvisor/assignees{/user}","branches_url":"https://api.github.com/repos/MirrorFork/gvisor/branches{/branch}","tags_url":"https://api.github.com/repos/MirrorFork/gvisor/tags","blobs_url":"https://api.github.com/repos/MirrorFork/gvisor/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MirrorFork/gvisor/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MirrorFork/gvisor/git/refs{/sha}","trees_url":"https://api.github.com/repos/MirrorFork/gvisor/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MirrorFork/gvisor/statuses/{sha}","languages_url":"https://api.github.com/repos/MirrorFork/gvisor/languages","stargazers_url":"https://api.github.com/repos/MirrorFork/gvisor/stargazers","contributors_url":"https://api.github.com/repos/MirrorFork/gvisor/contributors","subscribers_url":"https://api.github.com/repos/MirrorFork/gvisor/subscribers","subscription_url":"https://api.github.com/repos/MirrorFork/gvisor/subscription","commits_url":"https://api.github.com/repos/MirrorFork/gvisor/commits{/sha}","git_commits_url":"https://api.github.com/repos/MirrorFork/gvisor/git/commits{/sha}","comments_url":"https://api.github.com/repos/MirrorFork/gvisor/comments{/number}","issue_comment_url":"https://api.github.com/repos/MirrorFork/gvisor/issues/comments{/number}","contents_url":"https://api.github.com/repos/MirrorFork/gvisor/contents/{+path}","compare_url":"https://api.github.com/repos/MirrorFork/gvisor/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MirrorFork/gvisor/merges","archive_url":"https://api.github.com/repos/MirrorFork/gvisor/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MirrorFork/gvisor/downloads","issues_url":"https://api.github.com/repos/MirrorFork/gvisor/issues{/number}","pulls_url":"https://api.github.com/repos/MirrorFork/gvisor/pulls{/number}","milestones_url":"https://api.github.com/repos/MirrorFork/gvisor/milestones{/number}","notifications_url":"https://api.github.com/repos/MirrorFork/gvisor/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MirrorFork/gvisor/labels{/name}","releases_url":"https://api.github.com/repos/MirrorFork/gvisor/releases{/id}","deployments_url":"https://api.github.com/repos/MirrorFork/gvisor/deployments","created_at":"2021-07-21T06:00:02Z","updated_at":"2021-07-21T05:59:49Z","pushed_at":"2021-07-21T05:55:27Z","git_url":"git://github.com/MirrorFork/gvisor.git","ssh_url":"git@github.com:MirrorFork/gvisor.git","clone_url":"https://github.com/MirrorFork/gvisor.git","svn_url":"https://github.com/MirrorFork/gvisor","homepage":"https://gvisor.dev","size":72467,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":1342004,"login":"google","gravatar_id":"","url":"https://api.github.com/orgs/google","avatar_url":"https://avatars.githubusercontent.com/u/1342004?"}}
+{"id":"17244207761","type":"PullRequestReviewEvent","actor":{"id":4606607,"login":"J0c4","display_login":"J0c4","gravatar_id":"","url":"https://api.github.com/users/J0c4","avatar_url":"https://avatars.githubusercontent.com/u/4606607?"},"repo":{"id":385125304,"name":"fjcoding/AT-BC-LAT-01","url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01"},"payload":{"action":"created","review":{"id":711280855,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMjgwODU1","user":{"login":"J0c4","id":4606607,"node_id":"MDQ6VXNlcjQ2MDY2MDc=","avatar_url":"https://avatars.githubusercontent.com/u/4606607?v=4","gravatar_id":"","url":"https://api.github.com/users/J0c4","html_url":"https://github.com/J0c4","followers_url":"https://api.github.com/users/J0c4/followers","following_url":"https://api.github.com/users/J0c4/following{/other_user}","gists_url":"https://api.github.com/users/J0c4/gists{/gist_id}","starred_url":"https://api.github.com/users/J0c4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/J0c4/subscriptions","organizations_url":"https://api.github.com/users/J0c4/orgs","repos_url":"https://api.github.com/users/J0c4/repos","events_url":"https://api.github.com/users/J0c4/events{/privacy}","received_events_url":"https://api.github.com/users/J0c4/received_events","type":"User","site_admin":false},"body":"Hi @JeanPeare , your code has good style, however, it would be interesting to handle more classes and objects for your implementation instead of just functions.","commit_id":"5db995276b77cf67c8cb7db306485f6b79eacf4c","submitted_at":"2021-07-21T06:00:02Z","state":"approved","html_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26#pullrequestreview-711280855","pull_request_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26#pullrequestreview-711280855"},"pull_request":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26"}}},"pull_request":{"url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26","id":691108356,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkxMTA4MzU2","html_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26","diff_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26.diff","patch_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26.patch","issue_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26","number":26,"state":"open","locked":false,"title":"Jeanpeare/args","user":{"login":"JeanPeare","id":87339632,"node_id":"MDQ6VXNlcjg3MzM5NjMy","avatar_url":"https://avatars.githubusercontent.com/u/87339632?v=4","gravatar_id":"","url":"https://api.github.com/users/JeanPeare","html_url":"https://github.com/JeanPeare","followers_url":"https://api.github.com/users/JeanPeare/followers","following_url":"https://api.github.com/users/JeanPeare/following{/other_user}","gists_url":"https://api.github.com/users/JeanPeare/gists{/gist_id}","starred_url":"https://api.github.com/users/JeanPeare/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JeanPeare/subscriptions","organizations_url":"https://api.github.com/users/JeanPeare/orgs","repos_url":"https://api.github.com/users/JeanPeare/repos","events_url":"https://api.github.com/users/JeanPeare/events{/privacy}","received_events_url":"https://api.github.com/users/JeanPeare/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-16T00:15:45Z","updated_at":"2021-07-21T06:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"abe3c50e05df7a8f865fd7227a8dbacfa74892d5","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/commits","review_comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/comments","review_comment_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/comments{/number}","comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26/comments","statuses_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/5db995276b77cf67c8cb7db306485f6b79eacf4c","head":{"label":"fjcoding:jeanpeare/args","ref":"jeanpeare/args","sha":"5db995276b77cf67c8cb7db306485f6b79eacf4c","user":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"repo":{"id":385125304,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjUzMDQ=","name":"AT-BC-LAT-01","full_name":"fjcoding/AT-BC-LAT-01","private":false,"owner":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/fjcoding/AT-BC-LAT-01","description":"Repository for Automation bootcamp LAT 01","fork":false,"url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01","forks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/forks","keys_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/teams","hooks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/hooks","issue_events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/events{/number}","events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/events","assignees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/assignees{/user}","branches_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/branches{/branch}","tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/tags","blobs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/refs{/sha}","trees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/{sha}","languages_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/languages","stargazers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/stargazers","contributors_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contributors","subscribers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscribers","subscription_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscription","commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/commits{/sha}","git_commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/commits{/sha}","comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/comments{/number}","issue_comment_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/comments{/number}","contents_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contents/{+path}","compare_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/merges","archive_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/downloads","issues_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues{/number}","pulls_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls{/number}","milestones_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/milestones{/number}","notifications_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/labels{/name}","releases_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/releases{/id}","deployments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/deployments","created_at":"2021-07-12T04:34:27Z","updated_at":"2021-07-21T05:46:13Z","pushed_at":"2021-07-21T05:46:10Z","git_url":"git://github.com/fjcoding/AT-BC-LAT-01.git","ssh_url":"git@github.com:fjcoding/AT-BC-LAT-01.git","clone_url":"https://github.com/fjcoding/AT-BC-LAT-01.git","svn_url":"https://github.com/fjcoding/AT-BC-LAT-01","homepage":null,"size":338,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":null,"forks":1,"open_issues":6,"watchers":1,"default_branch":"main"}},"base":{"label":"fjcoding:main","ref":"main","sha":"ca9cb0fd52996cbcabf9f32727120c94764a3631","user":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"repo":{"id":385125304,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjUzMDQ=","name":"AT-BC-LAT-01","full_name":"fjcoding/AT-BC-LAT-01","private":false,"owner":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/fjcoding/AT-BC-LAT-01","description":"Repository for Automation bootcamp LAT 01","fork":false,"url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01","forks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/forks","keys_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/teams","hooks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/hooks","issue_events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/events{/number}","events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/events","assignees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/assignees{/user}","branches_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/branches{/branch}","tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/tags","blobs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/refs{/sha}","trees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/{sha}","languages_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/languages","stargazers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/stargazers","contributors_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contributors","subscribers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscribers","subscription_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscription","commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/commits{/sha}","git_commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/commits{/sha}","comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/comments{/number}","issue_comment_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/comments{/number}","contents_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contents/{+path}","compare_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/merges","archive_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/downloads","issues_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues{/number}","pulls_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls{/number}","milestones_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/milestones{/number}","notifications_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/labels{/name}","releases_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/releases{/id}","deployments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/deployments","created_at":"2021-07-12T04:34:27Z","updated_at":"2021-07-21T05:46:13Z","pushed_at":"2021-07-21T05:46:10Z","git_url":"git://github.com/fjcoding/AT-BC-LAT-01.git","ssh_url":"git@github.com:fjcoding/AT-BC-LAT-01.git","clone_url":"https://github.com/fjcoding/AT-BC-LAT-01.git","svn_url":"https://github.com/fjcoding/AT-BC-LAT-01","homepage":null,"size":338,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":null,"forks":1,"open_issues":6,"watchers":1,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26"},"html":{"href":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26"},"issue":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26"},"comments":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26/comments"},"review_comments":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/comments"},"review_comment":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/commits"},"statuses":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/5db995276b77cf67c8cb7db306485f6b79eacf4c"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T06:00:02Z","org":{"id":50977159,"login":"fjcoding","gravatar_id":"","url":"https://api.github.com/orgs/fjcoding","avatar_url":"https://avatars.githubusercontent.com/u/50977159?"}}
+{"id":"17244207770","type":"CreateEvent","actor":{"id":55547546,"login":"fragmentedbin","display_login":"fragmentedbin","gravatar_id":"","url":"https://api.github.com/users/fragmentedbin","avatar_url":"https://avatars.githubusercontent.com/u/55547546?"},"repo":{"id":387353679,"name":"okanemo/Muhammad-maududy","url":"https://api.github.com/repos/okanemo/Muhammad-maududy"},"payload":{"ref":"bug","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":15762332,"login":"okanemo","gravatar_id":"","url":"https://api.github.com/orgs/okanemo","avatar_url":"https://avatars.githubusercontent.com/u/15762332?"}}
+{"id":"17244207772","type":"PushEvent","actor":{"id":87740085,"login":"CGelisK","display_login":"CGelisK","gravatar_id":"","url":"https://api.github.com/users/CGelisK","avatar_url":"https://avatars.githubusercontent.com/u/87740085?"},"repo":{"id":388009972,"name":"CGelisK/soma_simples","url":"https://api.github.com/repos/CGelisK/soma_simples"},"payload":{"push_id":7561415023,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"f596bdf6476b97f7849dfa9e555040c48e8618de","before":"ed4b17bbd2500fc3cd74e5d9a15ebc1e217a4226","commits":[{"sha":"f596bdf6476b97f7849dfa9e555040c48e8618de","author":{"name":"Caio Gelisk","email":"715eb6447e1d909c91372e21c34928752c5e73b7@users.noreply.github.com"},"message":"Create README.md","distinct":true,"url":"https://api.github.com/repos/CGelisK/soma_simples/commits/f596bdf6476b97f7849dfa9e555040c48e8618de"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207778","type":"ForkEvent","actor":{"id":35371233,"login":"jangocheng","display_login":"jangocheng","gravatar_id":"","url":"https://api.github.com/users/jangocheng","avatar_url":"https://avatars.githubusercontent.com/u/35371233?"},"repo":{"id":104172832,"name":"vueComponent/ant-design-vue","url":"https://api.github.com/repos/vueComponent/ant-design-vue"},"payload":{"forkee":{"id":388010503,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMTA1MDM=","name":"ant-design-vue","full_name":"jangocheng/ant-design-vue","private":false,"owner":{"login":"jangocheng","id":35371233,"node_id":"MDQ6VXNlcjM1MzcxMjMz","avatar_url":"https://avatars.githubusercontent.com/u/35371233?v=4","gravatar_id":"","url":"https://api.github.com/users/jangocheng","html_url":"https://github.com/jangocheng","followers_url":"https://api.github.com/users/jangocheng/followers","following_url":"https://api.github.com/users/jangocheng/following{/other_user}","gists_url":"https://api.github.com/users/jangocheng/gists{/gist_id}","starred_url":"https://api.github.com/users/jangocheng/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jangocheng/subscriptions","organizations_url":"https://api.github.com/users/jangocheng/orgs","repos_url":"https://api.github.com/users/jangocheng/repos","events_url":"https://api.github.com/users/jangocheng/events{/privacy}","received_events_url":"https://api.github.com/users/jangocheng/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jangocheng/ant-design-vue","description":"🌈  An enterprise-class UI components based on Ant Design and Vue. 🐜","fork":true,"url":"https://api.github.com/repos/jangocheng/ant-design-vue","forks_url":"https://api.github.com/repos/jangocheng/ant-design-vue/forks","keys_url":"https://api.github.com/repos/jangocheng/ant-design-vue/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jangocheng/ant-design-vue/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jangocheng/ant-design-vue/teams","hooks_url":"https://api.github.com/repos/jangocheng/ant-design-vue/hooks","issue_events_url":"https://api.github.com/repos/jangocheng/ant-design-vue/issues/events{/number}","events_url":"https://api.github.com/repos/jangocheng/ant-design-vue/events","assignees_url":"https://api.github.com/repos/jangocheng/ant-design-vue/assignees{/user}","branches_url":"https://api.github.com/repos/jangocheng/ant-design-vue/branches{/branch}","tags_url":"https://api.github.com/repos/jangocheng/ant-design-vue/tags","blobs_url":"https://api.github.com/repos/jangocheng/ant-design-vue/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jangocheng/ant-design-vue/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jangocheng/ant-design-vue/git/refs{/sha}","trees_url":"https://api.github.com/repos/jangocheng/ant-design-vue/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jangocheng/ant-design-vue/statuses/{sha}","languages_url":"https://api.github.com/repos/jangocheng/ant-design-vue/languages","stargazers_url":"https://api.github.com/repos/jangocheng/ant-design-vue/stargazers","contributors_url":"https://api.github.com/repos/jangocheng/ant-design-vue/contributors","subscribers_url":"https://api.github.com/repos/jangocheng/ant-design-vue/subscribers","subscription_url":"https://api.github.com/repos/jangocheng/ant-design-vue/subscription","commits_url":"https://api.github.com/repos/jangocheng/ant-design-vue/commits{/sha}","git_commits_url":"https://api.github.com/repos/jangocheng/ant-design-vue/git/commits{/sha}","comments_url":"https://api.github.com/repos/jangocheng/ant-design-vue/comments{/number}","issue_comment_url":"https://api.github.com/repos/jangocheng/ant-design-vue/issues/comments{/number}","contents_url":"https://api.github.com/repos/jangocheng/ant-design-vue/contents/{+path}","compare_url":"https://api.github.com/repos/jangocheng/ant-design-vue/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jangocheng/ant-design-vue/merges","archive_url":"https://api.github.com/repos/jangocheng/ant-design-vue/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jangocheng/ant-design-vue/downloads","issues_url":"https://api.github.com/repos/jangocheng/ant-design-vue/issues{/number}","pulls_url":"https://api.github.com/repos/jangocheng/ant-design-vue/pulls{/number}","milestones_url":"https://api.github.com/repos/jangocheng/ant-design-vue/milestones{/number}","notifications_url":"https://api.github.com/repos/jangocheng/ant-design-vue/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jangocheng/ant-design-vue/labels{/name}","releases_url":"https://api.github.com/repos/jangocheng/ant-design-vue/releases{/id}","deployments_url":"https://api.github.com/repos/jangocheng/ant-design-vue/deployments","created_at":"2021-07-21T06:00:02Z","updated_at":"2021-07-21T01:48:30Z","pushed_at":"2021-07-19T05:10:05Z","git_url":"git://github.com/jangocheng/ant-design-vue.git","ssh_url":"git@github.com:jangocheng/ant-design-vue.git","clone_url":"https://github.com/jangocheng/ant-design-vue.git","svn_url":"https://github.com/jangocheng/ant-design-vue","homepage":"https://antdv.com/","size":17241,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":32120805,"login":"vueComponent","gravatar_id":"","url":"https://api.github.com/orgs/vueComponent","avatar_url":"https://avatars.githubusercontent.com/u/32120805?"}}
+{"id":"17244207781","type":"PushEvent","actor":{"id":85180677,"login":"anversa-pro","display_login":"anversa-pro","gravatar_id":"","url":"https://api.github.com/users/anversa-pro","avatar_url":"https://avatars.githubusercontent.com/u/85180677?"},"repo":{"id":375478258,"name":"anversa-pro/holberton-system_engineering-devops","url":"https://api.github.com/repos/anversa-pro/holberton-system_engineering-devops"},"payload":{"push_id":7561415025,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"371de4c4474448b9482326cf18dedaf80f7049d4","before":"12600cbaedab10f705590d130d124aae4d00164c","commits":[{"sha":"371de4c4474448b9482326cf18dedaf80f7049d4","author":{"name":"Angela Vergara","email":"5fa576caeccca9890f61230c5a4d4ddd8075dda2@users.noreply.github.com"},"message":"[UPDATE] image size","distinct":true,"url":"https://api.github.com/repos/anversa-pro/holberton-system_engineering-devops/commits/371de4c4474448b9482326cf18dedaf80f7049d4"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207784","type":"PushEvent","actor":{"id":2687598,"login":"milesholt","display_login":"milesholt","gravatar_id":"","url":"https://api.github.com/users/milesholt","avatar_url":"https://avatars.githubusercontent.com/u/2687598?"},"repo":{"id":247480564,"name":"milesholt/autotrade1","url":"https://api.github.com/repos/milesholt/autotrade1"},"payload":{"push_id":7561415026,"size":1,"distinct_size":1,"ref":"refs/heads/version2","head":"233a0b82d5409070aac87e431b2104cfc8b81ca6","before":"aebece4e0adfe5becb664861892458aabe9a4635","commits":[{"sha":"233a0b82d5409070aac87e431b2104cfc8b81ca6","author":{"name":"milesholt","email":"1a73af9e7ae00182733b2292511b814be66f065f@milesholt.co.uk"},"message":"File updated - July 21, 2021 7:00 AM","distinct":true,"url":"https://api.github.com/repos/milesholt/autotrade1/commits/233a0b82d5409070aac87e431b2104cfc8b81ca6"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207793","type":"PullRequestReviewEvent","actor":{"id":4606607,"login":"J0c4","display_login":"J0c4","gravatar_id":"","url":"https://api.github.com/users/J0c4","avatar_url":"https://avatars.githubusercontent.com/u/4606607?"},"repo":{"id":385125304,"name":"fjcoding/AT-BC-LAT-01","url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01"},"payload":{"action":"created","review":{"id":711280855,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMjgwODU1","user":{"login":"J0c4","id":4606607,"node_id":"MDQ6VXNlcjQ2MDY2MDc=","avatar_url":"https://avatars.githubusercontent.com/u/4606607?v=4","gravatar_id":"","url":"https://api.github.com/users/J0c4","html_url":"https://github.com/J0c4","followers_url":"https://api.github.com/users/J0c4/followers","following_url":"https://api.github.com/users/J0c4/following{/other_user}","gists_url":"https://api.github.com/users/J0c4/gists{/gist_id}","starred_url":"https://api.github.com/users/J0c4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/J0c4/subscriptions","organizations_url":"https://api.github.com/users/J0c4/orgs","repos_url":"https://api.github.com/users/J0c4/repos","events_url":"https://api.github.com/users/J0c4/events{/privacy}","received_events_url":"https://api.github.com/users/J0c4/received_events","type":"User","site_admin":false},"body":"Hi @JeanPeare , your code has good style, however, it would be interesting to handle more classes and objects for your implementation instead of just functions.","commit_id":"5db995276b77cf67c8cb7db306485f6b79eacf4c","submitted_at":"2021-07-21T06:00:02Z","state":"approved","html_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26#pullrequestreview-711280855","pull_request_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26#pullrequestreview-711280855"},"pull_request":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26"}}},"pull_request":{"url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26","id":691108356,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkxMTA4MzU2","html_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26","diff_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26.diff","patch_url":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26.patch","issue_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26","number":26,"state":"open","locked":false,"title":"Jeanpeare/args","user":{"login":"JeanPeare","id":87339632,"node_id":"MDQ6VXNlcjg3MzM5NjMy","avatar_url":"https://avatars.githubusercontent.com/u/87339632?v=4","gravatar_id":"","url":"https://api.github.com/users/JeanPeare","html_url":"https://github.com/JeanPeare","followers_url":"https://api.github.com/users/JeanPeare/followers","following_url":"https://api.github.com/users/JeanPeare/following{/other_user}","gists_url":"https://api.github.com/users/JeanPeare/gists{/gist_id}","starred_url":"https://api.github.com/users/JeanPeare/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JeanPeare/subscriptions","organizations_url":"https://api.github.com/users/JeanPeare/orgs","repos_url":"https://api.github.com/users/JeanPeare/repos","events_url":"https://api.github.com/users/JeanPeare/events{/privacy}","received_events_url":"https://api.github.com/users/JeanPeare/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-16T00:15:45Z","updated_at":"2021-07-21T06:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"abe3c50e05df7a8f865fd7227a8dbacfa74892d5","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/commits","review_comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/comments","review_comment_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/comments{/number}","comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26/comments","statuses_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/5db995276b77cf67c8cb7db306485f6b79eacf4c","head":{"label":"fjcoding:jeanpeare/args","ref":"jeanpeare/args","sha":"5db995276b77cf67c8cb7db306485f6b79eacf4c","user":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"repo":{"id":385125304,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjUzMDQ=","name":"AT-BC-LAT-01","full_name":"fjcoding/AT-BC-LAT-01","private":false,"owner":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/fjcoding/AT-BC-LAT-01","description":"Repository for Automation bootcamp LAT 01","fork":false,"url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01","forks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/forks","keys_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/teams","hooks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/hooks","issue_events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/events{/number}","events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/events","assignees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/assignees{/user}","branches_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/branches{/branch}","tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/tags","blobs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/refs{/sha}","trees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/{sha}","languages_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/languages","stargazers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/stargazers","contributors_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contributors","subscribers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscribers","subscription_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscription","commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/commits{/sha}","git_commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/commits{/sha}","comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/comments{/number}","issue_comment_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/comments{/number}","contents_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contents/{+path}","compare_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/merges","archive_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/downloads","issues_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues{/number}","pulls_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls{/number}","milestones_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/milestones{/number}","notifications_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/labels{/name}","releases_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/releases{/id}","deployments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/deployments","created_at":"2021-07-12T04:34:27Z","updated_at":"2021-07-21T05:46:13Z","pushed_at":"2021-07-21T05:46:10Z","git_url":"git://github.com/fjcoding/AT-BC-LAT-01.git","ssh_url":"git@github.com:fjcoding/AT-BC-LAT-01.git","clone_url":"https://github.com/fjcoding/AT-BC-LAT-01.git","svn_url":"https://github.com/fjcoding/AT-BC-LAT-01","homepage":null,"size":338,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":null,"forks":1,"open_issues":6,"watchers":1,"default_branch":"main"}},"base":{"label":"fjcoding:main","ref":"main","sha":"ca9cb0fd52996cbcabf9f32727120c94764a3631","user":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"repo":{"id":385125304,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjUzMDQ=","name":"AT-BC-LAT-01","full_name":"fjcoding/AT-BC-LAT-01","private":false,"owner":{"login":"fjcoding","id":50977159,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUwOTc3MTU5","avatar_url":"https://avatars.githubusercontent.com/u/50977159?v=4","gravatar_id":"","url":"https://api.github.com/users/fjcoding","html_url":"https://github.com/fjcoding","followers_url":"https://api.github.com/users/fjcoding/followers","following_url":"https://api.github.com/users/fjcoding/following{/other_user}","gists_url":"https://api.github.com/users/fjcoding/gists{/gist_id}","starred_url":"https://api.github.com/users/fjcoding/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjcoding/subscriptions","organizations_url":"https://api.github.com/users/fjcoding/orgs","repos_url":"https://api.github.com/users/fjcoding/repos","events_url":"https://api.github.com/users/fjcoding/events{/privacy}","received_events_url":"https://api.github.com/users/fjcoding/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/fjcoding/AT-BC-LAT-01","description":"Repository for Automation bootcamp LAT 01","fork":false,"url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01","forks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/forks","keys_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/teams","hooks_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/hooks","issue_events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/events{/number}","events_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/events","assignees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/assignees{/user}","branches_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/branches{/branch}","tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/tags","blobs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/refs{/sha}","trees_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/{sha}","languages_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/languages","stargazers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/stargazers","contributors_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contributors","subscribers_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscribers","subscription_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/subscription","commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/commits{/sha}","git_commits_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/git/commits{/sha}","comments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/comments{/number}","issue_comment_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/comments{/number}","contents_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/contents/{+path}","compare_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/merges","archive_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/downloads","issues_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues{/number}","pulls_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls{/number}","milestones_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/milestones{/number}","notifications_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/labels{/name}","releases_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/releases{/id}","deployments_url":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/deployments","created_at":"2021-07-12T04:34:27Z","updated_at":"2021-07-21T05:46:13Z","pushed_at":"2021-07-21T05:46:10Z","git_url":"git://github.com/fjcoding/AT-BC-LAT-01.git","ssh_url":"git@github.com:fjcoding/AT-BC-LAT-01.git","clone_url":"https://github.com/fjcoding/AT-BC-LAT-01.git","svn_url":"https://github.com/fjcoding/AT-BC-LAT-01","homepage":null,"size":338,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":null,"forks":1,"open_issues":6,"watchers":1,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26"},"html":{"href":"https://github.com/fjcoding/AT-BC-LAT-01/pull/26"},"issue":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26"},"comments":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/issues/26/comments"},"review_comments":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/comments"},"review_comment":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/pulls/26/commits"},"statuses":{"href":"https://api.github.com/repos/fjcoding/AT-BC-LAT-01/statuses/5db995276b77cf67c8cb7db306485f6b79eacf4c"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":50977159,"login":"fjcoding","gravatar_id":"","url":"https://api.github.com/orgs/fjcoding","avatar_url":"https://avatars.githubusercontent.com/u/50977159?"}}
+{"id":"17244207803","type":"DeleteEvent","actor":{"id":84948785,"login":"guru-dev-cicd-canary-beta","display_login":"guru-dev-cicd-canary-beta","gravatar_id":"","url":"https://api.github.com/users/guru-dev-cicd-canary-beta","avatar_url":"https://avatars.githubusercontent.com/u/84948785?"},"repo":{"id":377897987,"name":"GuruCICDCanary-Prod-Release/BughuntCICDCanary-preprod","url":"https://api.github.com/repos/GuruCICDCanary-Prod-Release/BughuntCICDCanary-preprod"},"payload":{"ref":"BughuntCICDCanarySource-preprod-us-east-1-1626845047302","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":85661847,"login":"GuruCICDCanary-Prod-Release","gravatar_id":"","url":"https://api.github.com/orgs/GuruCICDCanary-Prod-Release","avatar_url":"https://avatars.githubusercontent.com/u/85661847?"}}
+{"id":"17244207808","type":"PushEvent","actor":{"id":48811634,"login":"gabbyparish","display_login":"gabbyparish","gravatar_id":"","url":"https://api.github.com/users/gabbyparish","avatar_url":"https://avatars.githubusercontent.com/u/48811634?"},"repo":{"id":191760324,"name":"gabbyparish/gabbyparish.github.io","url":"https://api.github.com/repos/gabbyparish/gabbyparish.github.io"},"payload":{"push_id":7561415031,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b10f890adb827c51a3de4112dd1e0b620ebbd117","before":"e6610ceed7111d070f1500977a06649dba910b35","commits":[{"sha":"b10f890adb827c51a3de4112dd1e0b620ebbd117","author":{"name":"Gabby Parish","email":"068dcb29ffb7c9be924a22633b1a3aec308db897@hotmail.com"},"message":"update","distinct":true,"url":"https://api.github.com/repos/gabbyparish/gabbyparish.github.io/commits/b10f890adb827c51a3de4112dd1e0b620ebbd117"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207813","type":"PushEvent","actor":{"id":5560673,"login":"rieske","display_login":"rieske","gravatar_id":"","url":"https://api.github.com/users/rieske","avatar_url":"https://avatars.githubusercontent.com/u/5560673?"},"repo":{"id":302322,"name":"gradle/gradle","url":"https://api.github.com/repos/gradle/gradle"},"payload":{"push_id":7561414995,"size":112,"distinct_size":1,"ref":"refs/heads/vv/jdk17/tweaks","head":"a1169144eaff2dd86e0e6ae5fbb91a6a1d991a86","before":"c3bc140db7bc9ce06a36056660c24c3bde4c1961","commits":[{"sha":"89e4c38b0e5bde8196d8a11c142b16640aa92fd6","author":{"name":"Mikhail Lopatkin","email":"bc3d01171b0cad8ce8d0581a53f7cdd1d753978b@gradle.com"},"message":"Discard the object body when doing metadata request to S3\n\nOtherwise the client library issues a warning about potential waste.\nThere is waste but only 1 byte (Range header is used). I've kept an\ninfo message for the cases where more than 1 byte is downloaded - just\nin case if someone needs to investigate issues with the S3-compatible\nservice that doesn't understand Range headers and returns the whole\nobject instead.","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/89e4c38b0e5bde8196d8a11c142b16640aa92fd6"},{"sha":"78d0ed15f41a2d79a406cf95ebb27ba9cff373f5","author":{"name":"Sterling Greene","email":"7a57d889ea7f266299434459898a90c7f6a1ca4d@gradle.com"},"message":"Update to latest nightly","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/78d0ed15f41a2d79a406cf95ebb27ba9cff373f5"},{"sha":"b97382c16195036639598bc08d11ce88f7dfcb29","author":{"name":"Stefan Wolf","email":"a3cb738850fa39be667c4d6428d72aee854b2cc7@gradle.com"},"message":"Add line break before using multiline parameters\n\nBefore:\n```\npublic DefaultAfterPreviousExecutionState(OriginMetadata originMetadata,\n                                          ImplementationSnapshot implementation,\n                                          ImmutableList<ImplementationSnapshot> additionalImplementations,\n                                          ImmutableSortedMap<String, ValueSnapshot> inputProperties,\n                                          ImmutableSortedMap<String, FileCollectionFingerprint> inputFileProperties,\n                                          ImmutableSortedMap<String, FileSystemSnapshot> outputFilesProducedByWork,\n                                          boolean successful) {\n    super(implementation, additionalImplementations, inputProperties, inputFileProperties);\n```\n\nAfter:\n\n```\npublic DefaultAfterPreviousExecutionState(\n    OriginMetadata originMetadata,\n    ImplementationSnapshot implementation,\n    ImmutableList<ImplementationSnapshot> additionalImplementations,\n    ImmutableSortedMap<String, ValueSnapshot> inputProperties,\n    ImmutableSortedMap<String, FileCollectionFingerprint> inputFileProperties,\n    ImmutableSortedMap<String, FileSystemSnapshot> outputFilesProducedByWork,\n    boolean successful\n) {\n    super(implementation, additionalImplementations, inputProperties, inputFileProperties);\n```","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/b97382c16195036639598bc08d11ce88f7dfcb29"},{"sha":"b83a71af5f7a280e354d3530648ee1da15df27da","author":{"name":"Mikhail Lopatkin","email":"bc3d01171b0cad8ce8d0581a53f7cdd1d753978b@gradle.com"},"message":"Fix after review\n\n - use Debug level for all logs\n - fix NPE in tests (library sources suggest that the stream may be\n   null in production too).","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/b83a71af5f7a280e354d3530648ee1da15df27da"},{"sha":"ee1f6f0da0e5d7f2b06c4521f7422ed8522a0535","author":{"name":"Sterling Greene","email":"7a57d889ea7f266299434459898a90c7f6a1ca4d@gradle.com"},"message":"Errors from gradlew are logged to stderr","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/ee1f6f0da0e5d7f2b06c4521f7422ed8522a0535"},{"sha":"b4c5aa5ee60adf5ca4be4e0f4a3a2ffcfa953038","author":{"name":"bot-gradle","email":"63713bb7c0377b447bf238fc296de9167d8557c0@gradle.com"},"message":"Merge pull request #17743\n\nAdd line break before using multiline parameters","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/b4c5aa5ee60adf5ca4be4e0f4a3a2ffcfa953038"},{"sha":"0947d7fa05aeacc643a5e44ac3560254571e787e","author":{"name":"Vaidotas Valuckas","email":"1d40bb72737e9d7770fba4ffc839e9c1727a0475@gmail.com"},"message":"Fix command line integration test\n\nWrapper errors are sent to stdout on Windows, stderr otherwise","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/0947d7fa05aeacc643a5e44ac3560254571e787e"},{"sha":"31b9e4d9fc04106428a6ff8e77451875abc55703","author":{"name":"bot-gradle","email":"63713bb7c0377b447bf238fc296de9167d8557c0@gradle.com"},"message":"Merge pull request #17733\n\nUpdate to latest nightly","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/31b9e4d9fc04106428a6ff8e77451875abc55703"},{"sha":"bd1e496fd1650b4a76355dbf548848b22787eaa5","author":{"name":"Stefan Wolf","email":"a3cb738850fa39be667c4d6428d72aee854b2cc7@gradle.com"},"message":"Use newer native platform version\n\nfixing a bug for FAT and improving performance on Windows.","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/bd1e496fd1650b4a76355dbf548848b22787eaa5"},{"sha":"f92b530855381ab973260e713f17d929003ada95","author":{"name":"Stefan Wolf","email":"a3cb738850fa39be667c4d6428d72aee854b2cc7@gradle.com"},"message":"Fix location of JMH report","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/f92b530855381ab973260e713f17d929003ada95"},{"sha":"2e852e38772cec35960acc828e8b56d8c2d271eb","author":{"name":"bot-gradle","email":"63713bb7c0377b447bf238fc296de9167d8557c0@gradle.com"},"message":"Merge pull request #17764\n\nUpgrade to newer native platform version","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/2e852e38772cec35960acc828e8b56d8c2d271eb"},{"sha":"1055000ebbb1bbe98e4ea0ef203ab8b926676df4","author":{"name":"Vaidotas Valuckas","email":"7eef4b2a741508bc3445d3a691f2f0b7ffcfbf8d@users.noreply.github.com"},"message":"Unignore passing tests (#17747)","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/1055000ebbb1bbe98e4ea0ef203ab8b926676df4"},{"sha":"617b3a09edf79beecf6e4b2e953e95aeb1488a49","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Upgrade embedded Kotlin to 1.5.0","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/617b3a09edf79beecf6e4b2e953e95aeb1488a49"},{"sha":"ae4c7b4a83765b8578057dcb3140bdb9811b0092","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Let `AbstractKotlinIntegrationTest` force the Kotlin 1.5.20","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/ae4c7b4a83765b8578057dcb3140bdb9811b0092"},{"sha":"43a771128c1ea8c21aaa90ca00950057f43a4f45","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Ignore tests that require a new `kotlin-dsl` temporarily","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/43a771128c1ea8c21aaa90ca00950057f43a4f45"},{"sha":"6241e4a02900a72e51cd6fdf07779d8b63377e36","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Temporarily force plugin integration tests to use Kotlin 1.5.20","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/6241e4a02900a72e51cd6fdf07779d8b63377e36"},{"sha":"5c641427728dbc76b6051d920b922c11653f55aa","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Temporarily ignore test","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/5c641427728dbc76b6051d920b922c11653f55aa"},{"sha":"7392b7f568702dab06b6a4e9074cb8e4ba63de15","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Increase expected distribution size to account for Kotlin 1.5.20","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/7392b7f568702dab06b6a4e9074cb8e4ba63de15"},{"sha":"205a4b478f2ead40b0e0976476fc4de3aef0d180","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Accept `gradle-download-task` artifacts from mavencentral as well as jcenter","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/205a4b478f2ead40b0e0976476fc4de3aef0d180"},{"sha":"80676958b63f163307ade6046aa3cedeaa730e34","author":{"name":"Rodrigo B. de Oliveira","email":"6dfa9cecb562e345739f2e4eb69e9ebd0fbff687@gradle.com"},"message":"Verify `org.nodejs:node:14.15.4` artifacts","distinct":false,"url":"https://api.github.com/repos/gradle/gradle/commits/80676958b63f163307ade6046aa3cedeaa730e34"}]},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":124156,"login":"gradle","gravatar_id":"","url":"https://api.github.com/orgs/gradle","avatar_url":"https://avatars.githubusercontent.com/u/124156?"}}
+{"id":"17244207828","type":"CreateEvent","actor":{"id":11512994,"login":"chenjazz","display_login":"chenjazz","gravatar_id":"","url":"https://api.github.com/users/chenjazz","avatar_url":"https://avatars.githubusercontent.com/u/11512994?"},"repo":{"id":388010505,"name":"chenjazz/interview","url":"https://api.github.com/repos/chenjazz/interview"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207834","type":"DeleteEvent","actor":{"id":84948785,"login":"guru-dev-cicd-canary-beta","display_login":"guru-dev-cicd-canary-beta","gravatar_id":"","url":"https://api.github.com/users/guru-dev-cicd-canary-beta","avatar_url":"https://avatars.githubusercontent.com/u/84948785?"},"repo":{"id":377897987,"name":"GuruCICDCanary-Prod-Release/BughuntCICDCanary-preprod","url":"https://api.github.com/repos/GuruCICDCanary-Prod-Release/BughuntCICDCanary-preprod"},"payload":{"ref":"BughuntCICDCanaryDestination-preprod-us-east-1-1626845047301","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":85661847,"login":"GuruCICDCanary-Prod-Release","gravatar_id":"","url":"https://api.github.com/orgs/GuruCICDCanary-Prod-Release","avatar_url":"https://avatars.githubusercontent.com/u/85661847?"}}
+{"id":"17244207840","type":"PushEvent","actor":{"id":5656627,"login":"hustme520","display_login":"hustme520","gravatar_id":"","url":"https://api.github.com/users/hustme520","avatar_url":"https://avatars.githubusercontent.com/u/5656627?"},"repo":{"id":381968954,"name":"hustme520/miner","url":"https://api.github.com/repos/hustme520/miner"},"payload":{"push_id":7561415036,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"3ba0e61cd6e43eedc4eec259b287b0da4bb048c8","before":"43149724b9b21ae41df366822d24df23ea329ad6","commits":[{"sha":"3ba0e61cd6e43eedc4eec259b287b0da4bb048c8","author":{"name":"root","email":"dc76e9f0c0006e8f919e0c515c66dbba3982f785@2e807f713fc6"},"message":"hello","distinct":true,"url":"https://api.github.com/repos/hustme520/miner/commits/3ba0e61cd6e43eedc4eec259b287b0da4bb048c8"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207843","type":"PushEvent","actor":{"id":37306479,"login":"awsdevopsssp","display_login":"awsdevopsssp","gravatar_id":"","url":"https://api.github.com/users/awsdevopsssp","avatar_url":"https://avatars.githubusercontent.com/u/37306479?"},"repo":{"id":379505890,"name":"kps25/DevSecOps","url":"https://api.github.com/repos/kps25/DevSecOps"},"payload":{"push_id":7561415047,"size":1,"distinct_size":1,"ref":"refs/heads/ssp-files","head":"04c45d9bc8b1b1f154cab2a0aa70d379719dd4d3","before":"082a5b76e40006bb57e769091e47b5b0bea803d5","commits":[{"sha":"04c45d9bc8b1b1f154cab2a0aa70d379719dd4d3","author":{"name":"imssp","email":"4c417b826a462aa7a52b3adad53a275bf0943871@gmail.com"},"message":"Kustomize","distinct":true,"url":"https://api.github.com/repos/kps25/DevSecOps/commits/04c45d9bc8b1b1f154cab2a0aa70d379719dd4d3"}]},"public":true,"created_at":"2021-07-21T06:00:03Z","org":{"id":42441173,"login":"kps25","gravatar_id":"","url":"https://api.github.com/orgs/kps25","avatar_url":"https://avatars.githubusercontent.com/u/42441173?"}}
+{"id":"17244207851","type":"PushEvent","actor":{"id":32414976,"login":"skwcrd","display_login":"skwcrd","gravatar_id":"","url":"https://api.github.com/users/skwcrd","avatar_url":"https://avatars.githubusercontent.com/u/32414976?"},"repo":{"id":378659614,"name":"skwcrd/todo_list","url":"https://api.github.com/repos/skwcrd/todo_list"},"payload":{"push_id":7561415052,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"271a38a33155c5148eb66f94908d924fef70ef05","before":"06fceb4f72f732795b2d0c94e1541ece2d4b3ad2","commits":[{"sha":"c1e4a11ed03adb259f234d2ea83140899e2cd42d","author":{"name":"Sukawit Charoendet","email":"6bd362ee3ff3980c2cc683b86206b783153e669a@hotmail.com"},"message":"Update project files","distinct":true,"url":"https://api.github.com/repos/skwcrd/todo_list/commits/c1e4a11ed03adb259f234d2ea83140899e2cd42d"},{"sha":"271a38a33155c5148eb66f94908d924fef70ef05","author":{"name":"Sukawit Charoendet","email":"6bd362ee3ff3980c2cc683b86206b783153e669a@hotmail.com"},"message":"Merge branch 'main' of github.com:skwcrd/todo_list","distinct":true,"url":"https://api.github.com/repos/skwcrd/todo_list/commits/271a38a33155c5148eb66f94908d924fef70ef05"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207856","type":"IssueCommentEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":252766607,"name":"Georges7Haddad/BubblyEverAfter","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139","repository_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter","labels_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139/labels{/name}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139/comments","events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139/events","html_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139","id":935441187,"node_id":"MDExOlB1bGxSZXF1ZXN0NjgyMzU1NzI3","number":139,"title":"Bump pylint from 2.5.0 to 2.9.3","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"labels":[{"id":1959962328,"node_id":"MDU6TGFiZWwxOTU5OTYyMzI4","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-02T05:53:44Z","updated_at":"2021-07-21T06:00:03Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139","html_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139","diff_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139.diff","patch_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139.patch"},"body":"Bumps [pylint](https://github.com/PyCQA/pylint) from 2.5.0 to 2.9.3.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/PyCQA/pylint/releases\">pylint's releases</a>.</em></p>\n<blockquote>\n<h2>pylint-2.8.1</h2>\n<ul>\n<li>\n<p>Add numversion back (temporarily) in <code>__pkginfo__</code> because it broke Pylama and revert the unnecessary\n<code>pylint.version</code> breaking change.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4399\">#4399</a></p>\n</li>\n</ul>\n<h2>pylint-2.8.0</h2>\n<ul>\n<li>\n<p>New refactoring message <code>consider-using-with</code>. This message is emitted if resource-allocating functions or methods of the\nstandard library (like <code>open()</code> or <code>threading.Lock.acquire()</code>) that can be used as a context manager are called without\na <code>with</code> block.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3413\">#3413</a></p>\n</li>\n<li>\n<p>Resolve false positives on unused variables in decorator functions</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4252\">#4252</a></p>\n</li>\n<li>\n<p>Add new extension <code>ConfusingConsecutiveElifChecker</code>. This optional checker emits a refactoring message (R5601 <code>confusing-consecutive-elif</code>)\nif if/elif statements with different indentation levels follow directly one after the other.</p>\n</li>\n<li>\n<p>New option <code>--output=&lt;file&gt;</code> to output result to a file rather than printing to stdout.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/1070\">#1070</a></p>\n</li>\n<li>\n<p>Use a prescriptive message for <code>unidiomatic-typecheck</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3891\">#3891</a></p>\n</li>\n<li>\n<p>Apply <code>const-naming-style</code> to module constants annotated with\n<code>typing.Final</code></p>\n</li>\n<li>\n<p>The packaging is now done via setuptools exclusively. <code>doc</code>, <code>tests</code>, <code>man</code>, <code>elisp</code> and <code>Changelog</code> are\nnot packaged anymore - reducing the size of the package by 75%.</p>\n</li>\n<li>\n<p>Debian packaging is now  (officially) done in <a href=\"https://salsa.debian.org/python-team/packages/pylint\">https://salsa.debian.org/python-team/packages/pylint</a>.</p>\n</li>\n<li>\n<p>The 'doc' extra-require has been removed.</p>\n</li>\n<li>\n<p><code>__pkginfo__</code> now only contain <code>__version__</code> (also accessible with <code>pylint.__version__</code>), other meta-information are still\naccessible with <code>import importlib;metadata.metadata('pylint')</code>.</p>\n</li>\n<li>\n<p>COPYING has been renamed to LICENSE for standardization.</p>\n</li>\n<li>\n<p>Fix false-positive <code>used-before-assignment</code> in function returns.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4301\">#4301</a></p>\n</li>\n<li>\n<p>Updated <code>astroid</code> to 2.5.3</p>\n</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/PyCQA/pylint/blob/main/ChangeLog\">pylint's changelog</a>.</em></p>\n<blockquote>\n<h1>What's New in Pylint 2.9.3?</h1>\n<p>Release date: 2021-07-01</p>\n<ul>\n<li>\n<p>Fix a crash that happened when analysing empty function with docstring\nin the <code>similarity</code> checker.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4648\">#4648</a></p>\n</li>\n<li>\n<p>The <code>similarity</code> checker no longer add three trailing whitespaces for\nempty lines in its report.</p>\n</li>\n</ul>\n<h1>What's New in Pylint 2.9.2?</h1>\n<p>Release date: 2021-07-01</p>\n<ul>\n<li>\n<p>Fix a crash that happened when analysing code using <code>type(self)</code> to access\na class attribute in the <code>unused-private-member</code> checker.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4638\">#4638</a></p>\n</li>\n<li>\n<p>Fix a false positive for <code>unused-private-member</code> when accessing a private variable\nwith <code>self</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4644\">#4644</a></p>\n</li>\n<li>\n<p>Fix false-positive of <code>unnecessary-dict-index-lookup</code> and <code>consider-using-dict-items</code>\nfor reassigned dict index lookups</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4630\">#4630</a></p>\n</li>\n</ul>\n<h1>What's New in Pylint 2.9.1?</h1>\n<p>Release date: 2021-06-30</p>\n<ul>\n<li>\n<p>Upgrade astroid to 2.6.2</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4631\">#4631</a>\nCloses <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4633\">#4633</a></p>\n</li>\n</ul>\n<h1>What's New in Pylint 2.9.0?</h1>\n<p>Release date: 2021-06-29</p>\n<ul>\n<li>Python 3.10 is now supported.</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/aa688de05e469e33a20478144013946ccb752736\"><code>aa688de</code></a> Bump pylint to 2.9.3, update changelog</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/d1048a15618c136d9f6621692495abf70e5cfa5a\"><code>d1048a1</code></a> [duplicate-code] Remove trailing whitespaces in similarity report</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/c983d7d7620db90b82d13d3aa8cc48c8d7b96085\"><code>c983d7d</code></a> [duplicate-code] Separate creation and displaying of similarity reports</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/65b57287ab2ebc6950f56b0b0fc1a6ae5dbde202\"><code>65b5728</code></a> [duplicate-code] Add typing for '_display_sims'</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/30adba799758b1897b3d2af5aa71392e67bbf9ba\"><code>30adba7</code></a> [duplicate-code] Rename french variable name to english in legacy code</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/7ee9de59fd31c3fdbe7e820406db4e5fb7cd3350\"><code>7ee9de5</code></a> [duplicate-code] Fix crash when analysing empty function with docstring</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/21290866a2da5ac25a888624bec2ba350e521e98\"><code>2129086</code></a> Fix copyright links (<a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4647\">#4647</a>)</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/f26e986077cbfa17ddb6ab498359bedfc20ead35\"><code>f26e986</code></a> Move back to a dev version following 2.9.2 release</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/cb83d73b5c2cc36f8f0c57d0d448257da305b751\"><code>cb83d73</code></a> Bump pylint to 2.9.2, update changelog</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/eff4ad891df501be4ce4179ed772fb3dddae2ace\"><code>eff4ad8</code></a> [unnecessary-dict-index-lookup] Add a test case in the functional test</li>\n<li>Additional commits viewable in <a href=\"https://github.com/PyCQA/pylint/compare/pylint-2.5.0...v2.9.3\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=pylint&package-manager=pip&previous-version=2.5.0&new-version=2.9.3)](https://dependabot.com/compatibility-score/?dependency-name=pylint&package-manager=pip&previous-version=2.5.0&new-version=2.9.3)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):\n- Update frequency (including time of day and day of week)\n- Pull request limits (per update run and/or open at any time)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/comments/883914021","html_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139#issuecomment-883914021","issue_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139","id":883914021,"node_id":"IC_kwDODxDpj840r3Ul","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"created_at":"2021-07-21T06:00:03Z","updated_at":"2021-07-21T06:00:03Z","author_association":"CONTRIBUTOR","body":"Superseded by #145.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207858","type":"PushEvent","actor":{"id":86603506,"login":"rs-rjadhav","display_login":"rs-rjadhav","gravatar_id":"","url":"https://api.github.com/users/rs-rjadhav","avatar_url":"https://avatars.githubusercontent.com/u/86603506?"},"repo":{"id":383116238,"name":"rs-rjadhav/localjenkins","url":"https://api.github.com/repos/rs-rjadhav/localjenkins"},"payload":{"push_id":7561415058,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"9da7db9accb3d1f980720cfe74073379f263260a","before":"1e5cc3b07bb29bb6ac227722a0facc86dd5e8750","commits":[{"sha":"9da7db9accb3d1f980720cfe74073379f263260a","author":{"name":"Rohan Jadhav","email":"3e4d0a1f1f83d6ad776d588d0048e54fea1d7bbc@users.noreply.github.com"},"message":"Update cronjob","distinct":true,"url":"https://api.github.com/repos/rs-rjadhav/localjenkins/commits/9da7db9accb3d1f980720cfe74073379f263260a"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207861","type":"PushEvent","actor":{"id":38429025,"login":"chuan12","display_login":"chuan12","gravatar_id":"","url":"https://api.github.com/users/chuan12","avatar_url":"https://avatars.githubusercontent.com/u/38429025?"},"repo":{"id":386557993,"name":"chuan12/chuan12.github.io","url":"https://api.github.com/repos/chuan12/chuan12.github.io"},"payload":{"push_id":7561415060,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"cd590dc3ab43d949529159382e56d03a4eefffe2","before":"5d8f08651014ce13b3968cd0398245f27dc9554c","commits":[{"sha":"cd590dc3ab43d949529159382e56d03a4eefffe2","author":{"name":"chuan12","email":"355aa477360314b41707201943c676d1da11ebe9@users.noreply.github.com"},"message":"Update data.js","distinct":true,"url":"https://api.github.com/repos/chuan12/chuan12.github.io/commits/cd590dc3ab43d949529159382e56d03a4eefffe2"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207865","type":"PushEvent","actor":{"id":38429025,"login":"chuan12","display_login":"chuan12","gravatar_id":"","url":"https://api.github.com/users/chuan12","avatar_url":"https://avatars.githubusercontent.com/u/38429025?"},"repo":{"id":129750934,"name":"chuan12/shenzhouzd","url":"https://api.github.com/repos/chuan12/shenzhouzd"},"payload":{"push_id":7561415057,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"3d35ff169ac76234790397a7f35cd116f9c3d75c","before":"9901270402eb0839a66ac702532a198750904406","commits":[{"sha":"3d35ff169ac76234790397a7f35cd116f9c3d75c","author":{"name":"chuan12","email":"355aa477360314b41707201943c676d1da11ebe9@users.noreply.github.com"},"message":"Update data.js","distinct":true,"url":"https://api.github.com/repos/chuan12/shenzhouzd/commits/3d35ff169ac76234790397a7f35cd116f9c3d75c"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207871","type":"PullRequestEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"action":"opened","number":4137,"pull_request":{"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4137","id":694073973,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTcz","html_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4137","diff_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4137.diff","patch_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4137.patch","issue_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4137","number":4137,"state":"open","locked":false,"title":"Add file 4158.txt","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"body":null,"created_at":"2021-07-21T06:00:03Z","updated_at":"2021-07-21T06:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4137/commits","review_comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4137/comments","review_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4137/comments","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/4f951067f562d09dcfa998918cc2eab24e56afcd","head":{"label":"gabrieldonadel:4158","ref":"4158","sha":"4f951067f562d09dcfa998918cc2eab24e56afcd","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T06:00:01Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":856,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4135,"license":null,"forks":0,"open_issues":4135,"watchers":1,"default_branch":"master"}},"base":{"label":"gabrieldonadel:master","ref":"master","sha":"d82cf4fd9e97a60cfebab6b8f7f85f9f8380b29b","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T06:00:01Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":856,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4135,"license":null,"forks":0,"open_issues":4135,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4137"},"html":{"href":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4137"},"issue":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4137"},"comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4137/comments"},"review_comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4137/comments"},"review_comment":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4137/commits"},"statuses":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/4f951067f562d09dcfa998918cc2eab24e56afcd"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207873","type":"PushEvent","actor":{"id":32856376,"login":"corcd","display_login":"corcd","gravatar_id":"","url":"https://api.github.com/users/corcd","avatar_url":"https://avatars.githubusercontent.com/u/32856376?"},"repo":{"id":322000836,"name":"corcd/charlotte","url":"https://api.github.com/repos/corcd/charlotte"},"payload":{"push_id":7561415062,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"59f1f5b8458b1f3572df4af4b0927706a56ae5d8","before":"e13af758a6cf12106c16d8483ccaf41791a35444","commits":[{"sha":"efbaf4cb611c95a31ff011fe213d6eb94f097d4d","author":{"name":"Upptime Bot","email":"a5fe14dc80e25d5da3c3f3af26c46f0f8a52d0c9@users.noreply.github.com"},"message":":pencil: Update summary in README [skip ci] [upptime]","distinct":true,"url":"https://api.github.com/repos/corcd/charlotte/commits/efbaf4cb611c95a31ff011fe213d6eb94f097d4d"},{"sha":"59f1f5b8458b1f3572df4af4b0927706a56ae5d8","author":{"name":"Upptime Bot","email":"a5fe14dc80e25d5da3c3f3af26c46f0f8a52d0c9@users.noreply.github.com"},"message":":card_file_box: Update status summary [skip ci] [upptime]","distinct":true,"url":"https://api.github.com/repos/corcd/charlotte/commits/59f1f5b8458b1f3572df4af4b0927706a56ae5d8"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207886","type":"PushEvent","actor":{"id":82876799,"login":"hvaish01","display_login":"hvaish01","gravatar_id":"","url":"https://api.github.com/users/hvaish01","avatar_url":"https://avatars.githubusercontent.com/u/82876799?"},"repo":{"id":359772248,"name":"hvaish01/StixBundles","url":"https://api.github.com/repos/hvaish01/StixBundles"},"payload":{"push_id":7561415077,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"c80f87169380d203827443d9c611f4638fa1f741","before":"df2a109106555d1cda2c4b368c03aeecef1d3d99","commits":[{"sha":"c80f87169380d203827443d9c611f4638fa1f741","author":{"name":"hvaish01","email":"2afd248fb67ac19cdeb0148e32ca7ee71c30c76d@users.noreply.github.com"},"message":"Updated at 11:00:02 20-07-2021","distinct":true,"url":"https://api.github.com/repos/hvaish01/StixBundles/commits/c80f87169380d203827443d9c611f4638fa1f741"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207890","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561415064,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"1267af341cdc9d013d84e0c469124d7c7b3497ee","before":"2968f2a3fb933897fb0d2a3c690ed0cd0fe4d6f2","commits":[{"sha":"1267af341cdc9d013d84e0c469124d7c7b3497ee","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/1267af341cdc9d013d84e0c469124d7c7b3497ee"}]},"public":true,"created_at":"2021-07-21T06:00:03Z"}
+{"id":"17244207920","type":"PushEvent","actor":{"id":45310468,"login":"yoonyounghoon","display_login":"yoonyounghoon","gravatar_id":"","url":"https://api.github.com/users/yoonyounghoon","avatar_url":"https://avatars.githubusercontent.com/u/45310468?"},"repo":{"id":366365907,"name":"yoonyounghoon/AlbalogClient","url":"https://api.github.com/repos/yoonyounghoon/AlbalogClient"},"payload":{"push_id":7561415081,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"c518b5dd7578094934b4f60fe48d318736b2093f","before":"8daaaf56de88fb6226a30b8f1a4785947bca8f1a","commits":[{"sha":"22df3af3b2668a0e5315ca1da3ba008eebfd2670","author":{"name":"yoonyounghoon","email":"94e0f016ca41c18212252c87f0dc34598025b71e@gmail.com"},"message":"Fix: 불필요한 주석 제거","distinct":true,"url":"https://api.github.com/repos/yoonyounghoon/AlbalogClient/commits/22df3af3b2668a0e5315ca1da3ba008eebfd2670"},{"sha":"c518b5dd7578094934b4f60fe48d318736b2093f","author":{"name":"yoonyounghoon","email":"94e0f016ca41c18212252c87f0dc34598025b71e@gmail.com"},"message":"Implements: 직원초대버튼 컴포넌트화,  커스텀 훅을 이용한 관심사 분리","distinct":true,"url":"https://api.github.com/repos/yoonyounghoon/AlbalogClient/commits/c518b5dd7578094934b4f60fe48d318736b2093f"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207930","type":"CreateEvent","actor":{"id":10481232,"login":"kotjarko","display_login":"kotjarko","gravatar_id":"","url":"https://api.github.com/users/kotjarko","avatar_url":"https://avatars.githubusercontent.com/u/10481232?"},"repo":{"id":388010507,"name":"kotjarko/yarus_test","url":"https://api.github.com/repos/kotjarko/yarus_test"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207937","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249783941,"name":"miwebst/ssRunnerAngular","url":"https://api.github.com/repos/miwebst/ssRunnerAngular"},"payload":{"push_id":7561415108,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"3b4a76bda56710ad195489aa1bc3e7522240ccb2","before":"71e78673dfbd47c8077046bbee93b99984284dc7","commits":[{"sha":"3b4a76bda56710ad195489aa1bc3e7522240ccb2","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 6:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerAngular/commits/3b4a76bda56710ad195489aa1bc3e7522240ccb2"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207940","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":248646333,"name":"miwebst/ssRunner","url":"https://api.github.com/repos/miwebst/ssRunner"},"payload":{"push_id":7561415098,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"dba1726637c8e6af416e3f7cb1deaa874efed44b","before":"440344ca0029b138fd673927160af10920a1c669","commits":[{"sha":"dba1726637c8e6af416e3f7cb1deaa874efed44b","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 6:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunner/commits/dba1726637c8e6af416e3f7cb1deaa874efed44b"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207946","type":"WatchEvent","actor":{"id":24413354,"login":"zhouchaozhi","display_login":"zhouchaozhi","gravatar_id":"","url":"https://api.github.com/users/zhouchaozhi","avatar_url":"https://avatars.githubusercontent.com/u/24413354?"},"repo":{"id":292877948,"name":"YyzHarry/imbalanced-semi-self","url":"https://api.github.com/repos/YyzHarry/imbalanced-semi-self"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207947","type":"WatchEvent","actor":{"id":1003461,"login":"n4j","display_login":"n4j","gravatar_id":"","url":"https://api.github.com/users/n4j","avatar_url":"https://avatars.githubusercontent.com/u/1003461?"},"repo":{"id":2310495,"name":"ceph/ceph","url":"https://api.github.com/repos/ceph/ceph"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":1015767,"login":"ceph","gravatar_id":"","url":"https://api.github.com/orgs/ceph","avatar_url":"https://avatars.githubusercontent.com/u/1015767?"}}
+{"id":"17244207949","type":"PushEvent","actor":{"id":1354510,"login":"leo91000","display_login":"leo91000","gravatar_id":"","url":"https://api.github.com/users/leo91000","avatar_url":"https://avatars.githubusercontent.com/u/1354510?"},"repo":{"id":372306529,"name":"leo91000/covid-japan-informations","url":"https://api.github.com/repos/leo91000/covid-japan-informations"},"payload":{"push_id":7561415096,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"d001efdf13decbb1361e760d5ee9f18d1d9cc921","before":"a0a8fa677de0cb41669377f96ff8798ece157173","commits":[{"sha":"d001efdf13decbb1361e760d5ee9f18d1d9cc921","author":{"name":"Léo Coletta","email":"c44abbda51c039fd3030f3ac7bea105b5e3f239d@gmail.com"},"message":"update 2021-07-21T06:00:03.106Z","distinct":true,"url":"https://api.github.com/repos/leo91000/covid-japan-informations/commits/d001efdf13decbb1361e760d5ee9f18d1d9cc921"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207951","type":"PushEvent","actor":{"id":18361961,"login":"sishenhei7","display_login":"sishenhei7","gravatar_id":"","url":"https://api.github.com/users/sishenhei7","avatar_url":"https://avatars.githubusercontent.com/u/18361961?"},"repo":{"id":298586827,"name":"sishenhei7/front-end-map","url":"https://api.github.com/repos/sishenhei7/front-end-map"},"payload":{"push_id":7561415107,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"552c940b5a076416a1d08faaeb12ee55a3b43113","before":"9bebd933a0dd98b0d249f4747880d650318f4815","commits":[{"sha":"552c940b5a076416a1d08faaeb12ee55a3b43113","author":{"name":"yangzhou","email":"6233b4f1f3b37119573e86d79f0a1fc0f52f1e18@klook.com"},"message":"chore: 上传md","distinct":true,"url":"https://api.github.com/repos/sishenhei7/front-end-map/commits/552c940b5a076416a1d08faaeb12ee55a3b43113"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207953","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":384376185,"name":"Druugur/Jar-Build2","url":"https://api.github.com/repos/Druugur/Jar-Build2"},"payload":{"push_id":7561415089,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1149a52309da470caad7c6d6e2f4bc8afc0fb7b2","before":"963eadef986ca8ffe2535598fa0fca26b240e833","commits":[{"sha":"1149a52309da470caad7c6d6e2f4bc8afc0fb7b2","author":{"name":"Druugur","email":"fe4a5db9963c76ce5ed7d10975727d5b539b93c2@users.noreply.github.com"},"message":"Update File","distinct":true,"url":"https://api.github.com/repos/Druugur/Jar-Build2/commits/1149a52309da470caad7c6d6e2f4bc8afc0fb7b2"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207957","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249503742,"name":"miwebst/ssRunnerReact","url":"https://api.github.com/repos/miwebst/ssRunnerReact"},"payload":{"push_id":7561415110,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"ad623cb726b72b79709c10b54f47268ba096b42c","before":"d3583e589c990d3936b77e2a2de5ec78e37c0bf0","commits":[{"sha":"ad623cb726b72b79709c10b54f47268ba096b42c","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 6:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerReact/commits/ad623cb726b72b79709c10b54f47268ba096b42c"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207959","type":"PushEvent","actor":{"id":53048187,"login":"wowls1227","display_login":"wowls1227","gravatar_id":"","url":"https://api.github.com/users/wowls1227","avatar_url":"https://avatars.githubusercontent.com/u/53048187?"},"repo":{"id":384024809,"name":"wowls1227/terraform-aws-s3-webapp","url":"https://api.github.com/repos/wowls1227/terraform-aws-s3-webapp"},"payload":{"push_id":7561415104,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b0c67ec757f059528633b8e3171f40ff8161a6a7","before":"46b6b612d3beaddb7cf78d7549cbea292fc99732","commits":[{"sha":"b0c67ec757f059528633b8e3171f40ff8161a6a7","author":{"name":"wowls1227","email":"b3aec4d8d5106c3c9a87a43cc77cff2697e358f6@users.noreply.github.com"},"message":"Update main.tf","distinct":true,"url":"https://api.github.com/repos/wowls1227/terraform-aws-s3-webapp/commits/b0c67ec757f059528633b8e3171f40ff8161a6a7"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207960","type":"PushEvent","actor":{"id":878058,"login":"ParkMinKyu","display_login":"ParkMinKyu","gravatar_id":"","url":"https://api.github.com/users/ParkMinKyu","avatar_url":"https://avatars.githubusercontent.com/u/878058?"},"repo":{"id":362471221,"name":"ApartMoney/Apartmoney.github.io","url":"https://api.github.com/repos/ApartMoney/Apartmoney.github.io"},"payload":{"push_id":7561415095,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"6f68e512765522a5ce9fb7284366303644e10654","before":"097796c3c8dbdf8dee084cbfc736b1e232dd18c4","commits":[{"sha":"6f68e512765522a5ce9fb7284366303644e10654","author":{"name":"ParkMinkyu","email":"f1d6fc1b4c5023402fddfd826b843346eec78543@naver.com"},"message":"update news data","distinct":true,"url":"https://api.github.com/repos/ApartMoney/Apartmoney.github.io/commits/6f68e512765522a5ce9fb7284366303644e10654"}]},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":60907646,"login":"ApartMoney","gravatar_id":"","url":"https://api.github.com/orgs/ApartMoney","avatar_url":"https://avatars.githubusercontent.com/u/60907646?"}}
+{"id":"17244207962","type":"PushEvent","actor":{"id":61833244,"login":"ivanbo97","display_login":"ivanbo97","gravatar_id":"","url":"https://api.github.com/users/ivanbo97","avatar_url":"https://avatars.githubusercontent.com/u/61833244?"},"repo":{"id":372793606,"name":"ivanbo97/plants-irrigation-app","url":"https://api.github.com/repos/ivanbo97/plants-irrigation-app"},"payload":{"push_id":7561415106,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"a440ea784ff0c830e287b8edab4d25fa6eb55ffc","before":"3b79cc7dca1650588f2a9ec605cfdfef2b336d1c","commits":[{"sha":"a440ea784ff0c830e287b8edab4d25fa6eb55ffc","author":{"name":"Ivan Boyukliev","email":"13e93c1159c9cdd322ea4ec98d0cd8d4d45d4298@abv.bg"},"message":"Bug fix in update broker method.","distinct":true,"url":"https://api.github.com/repos/ivanbo97/plants-irrigation-app/commits/a440ea784ff0c830e287b8edab4d25fa6eb55ffc"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207966","type":"PushEvent","actor":{"id":59435267,"login":"albertoabellagarcia","display_login":"albertoabellagarcia","gravatar_id":"","url":"https://api.github.com/users/albertoabellagarcia","avatar_url":"https://avatars.githubusercontent.com/u/59435267?"},"repo":{"id":190601053,"name":"smart-data-models/dataModel.PointOfInterest","url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest"},"payload":{"push_id":7561415102,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8b36851baaaa34afb5837f5ef1bfcbef9d0ca469","before":"815272e09865af03f0bb4c42a89e67e1c9f062b2","commits":[{"sha":"8b36851baaaa34afb5837f5ef1bfcbef9d0ca469","author":{"name":"Alberto Abella","email":"4641006ed1a70ab96eea2556876687c02238d7d2@fiware.org"},"message":"updated on the 2021-07-21 08:00:02.757660","distinct":true,"url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest/commits/8b36851baaaa34afb5837f5ef1bfcbef9d0ca469"}]},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":44724489,"login":"smart-data-models","gravatar_id":"","url":"https://api.github.com/orgs/smart-data-models","avatar_url":"https://avatars.githubusercontent.com/u/44724489?"}}
+{"id":"17244207967","type":"PushEvent","actor":{"id":1042170,"login":"cadonna","display_login":"cadonna","gravatar_id":"","url":"https://api.github.com/users/cadonna","avatar_url":"https://avatars.githubusercontent.com/u/1042170?"},"repo":{"id":2211243,"name":"apache/kafka","url":"https://api.github.com/repos/apache/kafka"},"payload":{"push_id":7561415116,"size":1,"distinct_size":1,"ref":"refs/heads/3.0","head":"00c51eae1c1e9ee2b080a7b0155fdb3c7c6b6d4c","before":"b894e9ec1dbc9736a77e81b4f8000e1cf1b8b05a","commits":[{"sha":"00c51eae1c1e9ee2b080a7b0155fdb3c7c6b6d4c","author":{"name":"Bruno Cadonna","email":"8548e651fb34cb712e02d8943f3f81ebe776615b@apache.org"},"message":"HOTFIX: Modify system test config to reduce time to stable task assignment. (#11090)\n\nCurrently, we verify the startup of a Streams client by checking the transition\r\nfrom REBALANCING to RUNNING and if the client processed some records\r\nin the EOS system test. However, if the Streams client only\r\nhas standby tasks assigned as it can happen if the client is catching \r\nup by using warm-up replicas, the client will never process\r\nrecords within the timeout of the startup verification. Hence, the test \r\nwill fail although everything is fine. This commit fixes this by reducing\r\nthe time to the next probing rebalance and by increasing the number of \r\nmax warm-up replicas. In such a way, the catch up of the client and the \r\nfollowing processing of records should still be within the startup verification \r\ntimeout of the client.\r\n\r\nReviewers: Anna Sophie Blee-Goldman <ableegoldman@apache.org>","distinct":true,"url":"https://api.github.com/repos/apache/kafka/commits/00c51eae1c1e9ee2b080a7b0155fdb3c7c6b6d4c"}]},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":47359,"login":"apache","gravatar_id":"","url":"https://api.github.com/orgs/apache","avatar_url":"https://avatars.githubusercontent.com/u/47359?"}}
+{"id":"17244207968","type":"PullRequestEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":252766607,"name":"Georges7Haddad/BubblyEverAfter","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter"},"payload":{"action":"closed","number":139,"pull_request":{"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139","id":682355727,"node_id":"MDExOlB1bGxSZXF1ZXN0NjgyMzU1NzI3","html_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139","diff_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139.diff","patch_url":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139.patch","issue_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139","number":139,"state":"closed","locked":false,"title":"Bump pylint from 2.5.0 to 2.9.3","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [pylint](https://github.com/PyCQA/pylint) from 2.5.0 to 2.9.3.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/PyCQA/pylint/releases\">pylint's releases</a>.</em></p>\n<blockquote>\n<h2>pylint-2.8.1</h2>\n<ul>\n<li>\n<p>Add numversion back (temporarily) in <code>__pkginfo__</code> because it broke Pylama and revert the unnecessary\n<code>pylint.version</code> breaking change.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4399\">#4399</a></p>\n</li>\n</ul>\n<h2>pylint-2.8.0</h2>\n<ul>\n<li>\n<p>New refactoring message <code>consider-using-with</code>. This message is emitted if resource-allocating functions or methods of the\nstandard library (like <code>open()</code> or <code>threading.Lock.acquire()</code>) that can be used as a context manager are called without\na <code>with</code> block.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3413\">#3413</a></p>\n</li>\n<li>\n<p>Resolve false positives on unused variables in decorator functions</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4252\">#4252</a></p>\n</li>\n<li>\n<p>Add new extension <code>ConfusingConsecutiveElifChecker</code>. This optional checker emits a refactoring message (R5601 <code>confusing-consecutive-elif</code>)\nif if/elif statements with different indentation levels follow directly one after the other.</p>\n</li>\n<li>\n<p>New option <code>--output=&lt;file&gt;</code> to output result to a file rather than printing to stdout.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/1070\">#1070</a></p>\n</li>\n<li>\n<p>Use a prescriptive message for <code>unidiomatic-typecheck</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/3891\">#3891</a></p>\n</li>\n<li>\n<p>Apply <code>const-naming-style</code> to module constants annotated with\n<code>typing.Final</code></p>\n</li>\n<li>\n<p>The packaging is now done via setuptools exclusively. <code>doc</code>, <code>tests</code>, <code>man</code>, <code>elisp</code> and <code>Changelog</code> are\nnot packaged anymore - reducing the size of the package by 75%.</p>\n</li>\n<li>\n<p>Debian packaging is now  (officially) done in <a href=\"https://salsa.debian.org/python-team/packages/pylint\">https://salsa.debian.org/python-team/packages/pylint</a>.</p>\n</li>\n<li>\n<p>The 'doc' extra-require has been removed.</p>\n</li>\n<li>\n<p><code>__pkginfo__</code> now only contain <code>__version__</code> (also accessible with <code>pylint.__version__</code>), other meta-information are still\naccessible with <code>import importlib;metadata.metadata('pylint')</code>.</p>\n</li>\n<li>\n<p>COPYING has been renamed to LICENSE for standardization.</p>\n</li>\n<li>\n<p>Fix false-positive <code>used-before-assignment</code> in function returns.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4301\">#4301</a></p>\n</li>\n<li>\n<p>Updated <code>astroid</code> to 2.5.3</p>\n</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/PyCQA/pylint/blob/main/ChangeLog\">pylint's changelog</a>.</em></p>\n<blockquote>\n<h1>What's New in Pylint 2.9.3?</h1>\n<p>Release date: 2021-07-01</p>\n<ul>\n<li>\n<p>Fix a crash that happened when analysing empty function with docstring\nin the <code>similarity</code> checker.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4648\">#4648</a></p>\n</li>\n<li>\n<p>The <code>similarity</code> checker no longer add three trailing whitespaces for\nempty lines in its report.</p>\n</li>\n</ul>\n<h1>What's New in Pylint 2.9.2?</h1>\n<p>Release date: 2021-07-01</p>\n<ul>\n<li>\n<p>Fix a crash that happened when analysing code using <code>type(self)</code> to access\na class attribute in the <code>unused-private-member</code> checker.</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4638\">#4638</a></p>\n</li>\n<li>\n<p>Fix a false positive for <code>unused-private-member</code> when accessing a private variable\nwith <code>self</code></p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4644\">#4644</a></p>\n</li>\n<li>\n<p>Fix false-positive of <code>unnecessary-dict-index-lookup</code> and <code>consider-using-dict-items</code>\nfor reassigned dict index lookups</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4630\">#4630</a></p>\n</li>\n</ul>\n<h1>What's New in Pylint 2.9.1?</h1>\n<p>Release date: 2021-06-30</p>\n<ul>\n<li>\n<p>Upgrade astroid to 2.6.2</p>\n<p>Closes <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4631\">#4631</a>\nCloses <a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4633\">#4633</a></p>\n</li>\n</ul>\n<h1>What's New in Pylint 2.9.0?</h1>\n<p>Release date: 2021-06-29</p>\n<ul>\n<li>Python 3.10 is now supported.</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/aa688de05e469e33a20478144013946ccb752736\"><code>aa688de</code></a> Bump pylint to 2.9.3, update changelog</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/d1048a15618c136d9f6621692495abf70e5cfa5a\"><code>d1048a1</code></a> [duplicate-code] Remove trailing whitespaces in similarity report</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/c983d7d7620db90b82d13d3aa8cc48c8d7b96085\"><code>c983d7d</code></a> [duplicate-code] Separate creation and displaying of similarity reports</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/65b57287ab2ebc6950f56b0b0fc1a6ae5dbde202\"><code>65b5728</code></a> [duplicate-code] Add typing for '_display_sims'</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/30adba799758b1897b3d2af5aa71392e67bbf9ba\"><code>30adba7</code></a> [duplicate-code] Rename french variable name to english in legacy code</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/7ee9de59fd31c3fdbe7e820406db4e5fb7cd3350\"><code>7ee9de5</code></a> [duplicate-code] Fix crash when analysing empty function with docstring</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/21290866a2da5ac25a888624bec2ba350e521e98\"><code>2129086</code></a> Fix copyright links (<a href=\"https://github-redirect.dependabot.com/PyCQA/pylint/issues/4647\">#4647</a>)</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/f26e986077cbfa17ddb6ab498359bedfc20ead35\"><code>f26e986</code></a> Move back to a dev version following 2.9.2 release</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/cb83d73b5c2cc36f8f0c57d0d448257da305b751\"><code>cb83d73</code></a> Bump pylint to 2.9.2, update changelog</li>\n<li><a href=\"https://github.com/PyCQA/pylint/commit/eff4ad891df501be4ce4179ed772fb3dddae2ace\"><code>eff4ad8</code></a> [unnecessary-dict-index-lookup] Add a test case in the functional test</li>\n<li>Additional commits viewable in <a href=\"https://github.com/PyCQA/pylint/compare/pylint-2.5.0...v2.9.3\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=pylint&package-manager=pip&previous-version=2.5.0&new-version=2.9.3)](https://dependabot.com/compatibility-score/?dependency-name=pylint&package-manager=pip&previous-version=2.5.0&new-version=2.9.3)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):\n- Update frequency (including time of day and day of week)\n- Pull request limits (per update run and/or open at any time)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","created_at":"2021-07-02T05:53:44Z","updated_at":"2021-07-21T06:00:03Z","closed_at":"2021-07-21T06:00:03Z","merged_at":null,"merge_commit_sha":"ce0366c96ea1eda5c9c5b91499e148bda4679a1e","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":1959962328,"node_id":"MDU6TGFiZWwxOTU5OTYyMzI4","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139/commits","review_comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139/comments","review_comment_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139/comments","statuses_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/bf81977a42af27585a1fb5f4ce9f5b85911ba600","head":{"label":"Georges7Haddad:dependabot/pip/develop/pylint-2.9.3","ref":"dependabot/pip/develop/pylint-2.9.3","sha":"bf81977a42af27585a1fb5f4ce9f5b85911ba600","user":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"repo":{"id":252766607,"node_id":"MDEwOlJlcG9zaXRvcnkyNTI3NjY2MDc=","name":"BubblyEverAfter","full_name":"Georges7Haddad/BubblyEverAfter","private":false,"owner":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Georges7Haddad/BubblyEverAfter","description":null,"fork":false,"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter","forks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/forks","keys_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/teams","hooks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/hooks","issue_events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/events{/number}","events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/events","assignees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/assignees{/user}","branches_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/branches{/branch}","tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/tags","blobs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/refs{/sha}","trees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/{sha}","languages_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/languages","stargazers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/stargazers","contributors_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contributors","subscribers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscribers","subscription_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscription","commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/commits{/sha}","git_commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/commits{/sha}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/comments{/number}","issue_comment_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/comments{/number}","contents_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contents/{+path}","compare_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/merges","archive_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/downloads","issues_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues{/number}","pulls_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls{/number}","milestones_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/milestones{/number}","notifications_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/labels{/name}","releases_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/releases{/id}","deployments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/deployments","created_at":"2020-04-03T15:10:17Z","updated_at":"2021-04-09T08:13:09Z","pushed_at":"2021-07-21T06:00:01Z","git_url":"git://github.com/Georges7Haddad/BubblyEverAfter.git","ssh_url":"git@github.com:Georges7Haddad/BubblyEverAfter.git","clone_url":"https://github.com/Georges7Haddad/BubblyEverAfter.git","svn_url":"https://github.com/Georges7Haddad/BubblyEverAfter","homepage":null,"size":17198,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":17,"license":null,"forks":0,"open_issues":17,"watchers":0,"default_branch":"master"}},"base":{"label":"Georges7Haddad:develop","ref":"develop","sha":"3eb7df99aafb5055b38a39ed20a39671c6d0dfe0","user":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"repo":{"id":252766607,"node_id":"MDEwOlJlcG9zaXRvcnkyNTI3NjY2MDc=","name":"BubblyEverAfter","full_name":"Georges7Haddad/BubblyEverAfter","private":false,"owner":{"login":"Georges7Haddad","id":41213058,"node_id":"MDQ6VXNlcjQxMjEzMDU4","avatar_url":"https://avatars.githubusercontent.com/u/41213058?v=4","gravatar_id":"","url":"https://api.github.com/users/Georges7Haddad","html_url":"https://github.com/Georges7Haddad","followers_url":"https://api.github.com/users/Georges7Haddad/followers","following_url":"https://api.github.com/users/Georges7Haddad/following{/other_user}","gists_url":"https://api.github.com/users/Georges7Haddad/gists{/gist_id}","starred_url":"https://api.github.com/users/Georges7Haddad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Georges7Haddad/subscriptions","organizations_url":"https://api.github.com/users/Georges7Haddad/orgs","repos_url":"https://api.github.com/users/Georges7Haddad/repos","events_url":"https://api.github.com/users/Georges7Haddad/events{/privacy}","received_events_url":"https://api.github.com/users/Georges7Haddad/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Georges7Haddad/BubblyEverAfter","description":null,"fork":false,"url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter","forks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/forks","keys_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/teams","hooks_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/hooks","issue_events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/events{/number}","events_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/events","assignees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/assignees{/user}","branches_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/branches{/branch}","tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/tags","blobs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/refs{/sha}","trees_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/{sha}","languages_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/languages","stargazers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/stargazers","contributors_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contributors","subscribers_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscribers","subscription_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/subscription","commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/commits{/sha}","git_commits_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/git/commits{/sha}","comments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/comments{/number}","issue_comment_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/comments{/number}","contents_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/contents/{+path}","compare_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/merges","archive_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/downloads","issues_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues{/number}","pulls_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls{/number}","milestones_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/milestones{/number}","notifications_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/labels{/name}","releases_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/releases{/id}","deployments_url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/deployments","created_at":"2020-04-03T15:10:17Z","updated_at":"2021-04-09T08:13:09Z","pushed_at":"2021-07-21T06:00:01Z","git_url":"git://github.com/Georges7Haddad/BubblyEverAfter.git","ssh_url":"git@github.com:Georges7Haddad/BubblyEverAfter.git","clone_url":"https://github.com/Georges7Haddad/BubblyEverAfter.git","svn_url":"https://github.com/Georges7Haddad/BubblyEverAfter","homepage":null,"size":17198,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":17,"license":null,"forks":0,"open_issues":17,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139"},"html":{"href":"https://github.com/Georges7Haddad/BubblyEverAfter/pull/139"},"issue":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139"},"comments":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/issues/139/comments"},"review_comments":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139/comments"},"review_comment":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/pulls/139/commits"},"statuses":{"href":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter/statuses/bf81977a42af27585a1fb5f4ce9f5b85911ba600"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":true,"rebaseable":true,"mergeable_state":"clean","merged_by":null,"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207975","type":"PushEvent","actor":{"id":81820655,"login":"Marinabsanz","display_login":"Marinabsanz","gravatar_id":"","url":"https://api.github.com/users/Marinabsanz","avatar_url":"https://avatars.githubusercontent.com/u/81820655?"},"repo":{"id":388008090,"name":"Marinabsanz/CurriculumInHTMLandCSS","url":"https://api.github.com/repos/Marinabsanz/CurriculumInHTMLandCSS"},"payload":{"push_id":7561415135,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"cc9c6934ad4de27d39296d696b56358c79e1315c","before":"54eacf9787a8a776699f577e015a5de564180c24","commits":[{"sha":"cc9c6934ad4de27d39296d696b56358c79e1315c","author":{"name":"Marina Benitez Sanchez","email":"eb4f6d12c20fdad59db4d6a905d97b816d53cdc9@gmail.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/Marinabsanz/CurriculumInHTMLandCSS/commits/cc9c6934ad4de27d39296d696b56358c79e1315c"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207977","type":"PushEvent","actor":{"id":83493113,"login":"yanagawawa","display_login":"yanagawawa","gravatar_id":"","url":"https://api.github.com/users/yanagawawa","avatar_url":"https://avatars.githubusercontent.com/u/83493113?"},"repo":{"id":385513848,"name":"c-karuizawa/nagano-cake","url":"https://api.github.com/repos/c-karuizawa/nagano-cake"},"payload":{"push_id":7561415114,"size":1,"distinct_size":1,"ref":"refs/heads/admin/orders","head":"6bba2fa2fe7addcd5400ffdd313909f6a3e3d0b8","before":"ce72c00bfb951589e77ad6ff192caf8989ca9d1e","commits":[{"sha":"6bba2fa2fe7addcd5400ffdd313909f6a3e3d0b8","author":{"name":"yanagawawa","email":"213d566b259357c111972219af52fe01e2c09ed1@gmail.com"},"message":"　導入完了","distinct":true,"url":"https://api.github.com/repos/c-karuizawa/nagano-cake/commits/6bba2fa2fe7addcd5400ffdd313909f6a3e3d0b8"}]},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":87359322,"login":"c-karuizawa","gravatar_id":"","url":"https://api.github.com/orgs/c-karuizawa","avatar_url":"https://avatars.githubusercontent.com/u/87359322?"}}
+{"id":"17244207979","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":258381365,"name":"woe-knite/AutoApiSecret","url":"https://api.github.com/repos/woe-knite/AutoApiSecret"},"payload":{"push_id":7561415125,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2129cd417058685bc1708aa6575a420a77d175dc","before":"dcffaf1008782035f659f06cb5a80f498f147934","commits":[{"sha":"2129cd417058685bc1708aa6575a420a77d175dc","author":{"name":"AutoupdateRobot","email":"657c0808fb00587b5344768389637d65bc464913@email.com"},"message":"update new refresh_token","distinct":true,"url":"https://api.github.com/repos/woe-knite/AutoApiSecret/commits/2129cd417058685bc1708aa6575a420a77d175dc"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207980","type":"PushEvent","actor":{"id":72592300,"login":"stalnakerwang","display_login":"stalnakerwang","gravatar_id":"","url":"https://api.github.com/users/stalnakerwang","avatar_url":"https://avatars.githubusercontent.com/u/72592300?"},"repo":{"id":384024329,"name":"stalnakerwang/Stock_data","url":"https://api.github.com/repos/stalnakerwang/Stock_data"},"payload":{"push_id":7561415128,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"c1ee92cc1a46f3668a12938fd0904c609038cde8","before":"f19acf90045ec3f96554cbdffbf9754710a8658b","commits":[{"sha":"c1ee92cc1a46f3668a12938fd0904c609038cde8","author":{"name":"stalnakerwang","email":"f344e620d0451a1f3ba0e4946f5dfb16544abb33@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/stalnakerwang/Stock_data/commits/c1ee92cc1a46f3668a12938fd0904c609038cde8"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207982","type":"IssuesEvent","actor":{"id":10616340,"login":"kanai-leek08","display_login":"kanai-leek08","gravatar_id":"","url":"https://api.github.com/users/kanai-leek08","avatar_url":"https://avatars.githubusercontent.com/u/10616340?"},"repo":{"id":321259466,"name":"nerds-odd-e/doughnut","url":"https://api.github.com/repos/nerds-odd-e/doughnut"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/nerds-odd-e/doughnut/issues/429","repository_url":"https://api.github.com/repos/nerds-odd-e/doughnut","labels_url":"https://api.github.com/repos/nerds-odd-e/doughnut/issues/429/labels{/name}","comments_url":"https://api.github.com/repos/nerds-odd-e/doughnut/issues/429/comments","events_url":"https://api.github.com/repos/nerds-odd-e/doughnut/issues/429/events","html_url":"https://github.com/nerds-odd-e/doughnut/issues/429","id":949355519,"node_id":"MDU6SXNzdWU5NDkzNTU1MTk=","number":429,"title":"org.springframework.web.server.ResponseStatusException","user":{"login":"kanai-leek08","id":10616340,"node_id":"MDQ6VXNlcjEwNjE2MzQw","avatar_url":"https://avatars.githubusercontent.com/u/10616340?v=4","gravatar_id":"","url":"https://api.github.com/users/kanai-leek08","html_url":"https://github.com/kanai-leek08","followers_url":"https://api.github.com/users/kanai-leek08/followers","following_url":"https://api.github.com/users/kanai-leek08/following{/other_user}","gists_url":"https://api.github.com/users/kanai-leek08/gists{/gist_id}","starred_url":"https://api.github.com/users/kanai-leek08/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kanai-leek08/subscriptions","organizations_url":"https://api.github.com/users/kanai-leek08/orgs","repos_url":"https://api.github.com/users/kanai-leek08/repos","events_url":"https://api.github.com/users/kanai-leek08/events{/privacy}","received_events_url":"https://api.github.com/users/kanai-leek08/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T06:00:04Z","updated_at":"2021-07-21T06:00:04Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"body":"Find the detail at: https://doughnut.odd-e.com/failure-report-list/show/437","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":4197463,"login":"nerds-odd-e","gravatar_id":"","url":"https://api.github.com/orgs/nerds-odd-e","avatar_url":"https://avatars.githubusercontent.com/u/4197463?"}}
+{"id":"17244207985","type":"PushEvent","actor":{"id":3379460,"login":"beanslee2012","display_login":"beanslee2012","gravatar_id":"","url":"https://api.github.com/users/beanslee2012","avatar_url":"https://avatars.githubusercontent.com/u/3379460?"},"repo":{"id":215003385,"name":"beanslee2012/games","url":"https://api.github.com/repos/beanslee2012/games"},"payload":{"push_id":7561415123,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9041a835777613d91e9a7f59a74012781dcb3948","before":"406ec68806bc00616b772d30cd7483feafd7dec9","commits":[{"sha":"9041a835777613d91e9a7f59a74012781dcb3948","author":{"name":"beanslee2012","email":"9aadcc12fe6ab8c01e6245204a102e9e34317220@gmail.com"},"message":"daily update","distinct":true,"url":"https://api.github.com/repos/beanslee2012/games/commits/9041a835777613d91e9a7f59a74012781dcb3948"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207989","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561415113,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"31f2d408506c0dc9c2b60b5084e9ebb508f74614","before":"1267af341cdc9d013d84e0c469124d7c7b3497ee","commits":[{"sha":"31f2d408506c0dc9c2b60b5084e9ebb508f74614","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/31f2d408506c0dc9c2b60b5084e9ebb508f74614"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207992","type":"PushEvent","actor":{"id":86647189,"login":"sohamshindework","display_login":"sohamshindework","gravatar_id":"","url":"https://api.github.com/users/sohamshindework","avatar_url":"https://avatars.githubusercontent.com/u/86647189?"},"repo":{"id":388007516,"name":"sohamshindework/Bus-location-tracker-app","url":"https://api.github.com/repos/sohamshindework/Bus-location-tracker-app"},"payload":{"push_id":7561415138,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"a0aa0afb1641bd0ffb656542cbf31c4027ccea3b","before":"a8b1652c58b45a39bde1a2f46965bba03fd6b454","commits":[{"sha":"a0aa0afb1641bd0ffb656542cbf31c4027ccea3b","author":{"name":"sohamshindework","email":"c23e6fe9399a0d3444aec901991e2d4092ff8e4f@users.noreply.github.com"},"message":"Create build","distinct":true,"url":"https://api.github.com/repos/sohamshindework/Bus-location-tracker-app/commits/a0aa0afb1641bd0ffb656542cbf31c4027ccea3b"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244207993","type":"PushEvent","actor":{"id":541490,"login":"morrah","display_login":"morrah","gravatar_id":"","url":"https://api.github.com/users/morrah","avatar_url":"https://avatars.githubusercontent.com/u/541490?"},"repo":{"id":224001345,"name":"morrah/oro-market","url":"https://api.github.com/repos/morrah/oro-market"},"payload":{"push_id":7561415137,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9770d0943fb73a641ac2065190d8712d88d0094b","before":"c463345b902a22030bee901e4d84745bddd530f4","commits":[{"sha":"9770d0943fb73a641ac2065190d8712d88d0094b","author":{"name":"morrah","email":"5b2d4826958c41aa3d7920ac238926453de1302d@users.noreply.github.com"},"message":"data update","distinct":true,"url":"https://api.github.com/repos/morrah/oro-market/commits/9770d0943fb73a641ac2065190d8712d88d0094b"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244208009","type":"PushEvent","actor":{"id":87474318,"login":"Xiaoakaikai","display_login":"Xiaoakaikai","gravatar_id":"","url":"https://api.github.com/users/Xiaoakaikai","avatar_url":"https://avatars.githubusercontent.com/u/87474318?"},"repo":{"id":386244505,"name":"Xiaoakaikai/xakk","url":"https://api.github.com/repos/Xiaoakaikai/xakk"},"payload":{"push_id":7561415129,"size":1,"distinct_size":1,"ref":"refs/heads/css","head":"8485d81a981c9bfd7ecebb0c843b93c66ac8a185","before":"c8c040e0f2c267822e87ac7dab793b1251a3e31c","commits":[{"sha":"8485d81a981c9bfd7ecebb0c843b93c66ac8a185","author":{"name":"Xiaoakaikai","email":"089c3c70be86fdde30751ba3f2eb1bef0375571c@users.noreply.github.com"},"message":"Delete PIE.htc","distinct":true,"url":"https://api.github.com/repos/Xiaoakaikai/xakk/commits/8485d81a981c9bfd7ecebb0c843b93c66ac8a185"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244208023","type":"IssueCommentEvent","actor":{"id":5110976,"login":"kebekus","display_login":"kebekus","gravatar_id":"","url":"https://api.github.com/users/kebekus","avatar_url":"https://avatars.githubusercontent.com/u/5110976?"},"repo":{"id":230746946,"name":"Akaflieg-Freiburg/enrouteServer","url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22","repository_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer","labels_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22/labels{/name}","comments_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22/comments","events_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22/events","html_url":"https://github.com/Akaflieg-Freiburg/enrouteServer/issues/22","id":947443223,"node_id":"MDU6SXNzdWU5NDc0NDMyMjM=","number":22,"title":"Macedonia","user":{"login":"Tridson","id":45800925,"node_id":"MDQ6VXNlcjQ1ODAwOTI1","avatar_url":"https://avatars.githubusercontent.com/u/45800925?v=4","gravatar_id":"","url":"https://api.github.com/users/Tridson","html_url":"https://github.com/Tridson","followers_url":"https://api.github.com/users/Tridson/followers","following_url":"https://api.github.com/users/Tridson/following{/other_user}","gists_url":"https://api.github.com/users/Tridson/gists{/gist_id}","starred_url":"https://api.github.com/users/Tridson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Tridson/subscriptions","organizations_url":"https://api.github.com/users/Tridson/orgs","repos_url":"https://api.github.com/users/Tridson/repos","events_url":"https://api.github.com/users/Tridson/events{/privacy}","received_events_url":"https://api.github.com/users/Tridson/received_events","type":"User","site_admin":false},"labels":[{"id":1758762617,"node_id":"MDU6TGFiZWwxNzU4NzYyNjE3","url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/labels/enhancement","name":"enhancement","color":"a2eeef","default":true,"description":"New feature or request"}],"state":"closed","locked":false,"assignee":{"login":"kebekus","id":5110976,"node_id":"MDQ6VXNlcjUxMTA5NzY=","avatar_url":"https://avatars.githubusercontent.com/u/5110976?v=4","gravatar_id":"","url":"https://api.github.com/users/kebekus","html_url":"https://github.com/kebekus","followers_url":"https://api.github.com/users/kebekus/followers","following_url":"https://api.github.com/users/kebekus/following{/other_user}","gists_url":"https://api.github.com/users/kebekus/gists{/gist_id}","starred_url":"https://api.github.com/users/kebekus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kebekus/subscriptions","organizations_url":"https://api.github.com/users/kebekus/orgs","repos_url":"https://api.github.com/users/kebekus/repos","events_url":"https://api.github.com/users/kebekus/events{/privacy}","received_events_url":"https://api.github.com/users/kebekus/received_events","type":"User","site_admin":false},"assignees":[{"login":"kebekus","id":5110976,"node_id":"MDQ6VXNlcjUxMTA5NzY=","avatar_url":"https://avatars.githubusercontent.com/u/5110976?v=4","gravatar_id":"","url":"https://api.github.com/users/kebekus","html_url":"https://github.com/kebekus","followers_url":"https://api.github.com/users/kebekus/followers","following_url":"https://api.github.com/users/kebekus/following{/other_user}","gists_url":"https://api.github.com/users/kebekus/gists{/gist_id}","starred_url":"https://api.github.com/users/kebekus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kebekus/subscriptions","organizations_url":"https://api.github.com/users/kebekus/orgs","repos_url":"https://api.github.com/users/kebekus/repos","events_url":"https://api.github.com/users/kebekus/events{/privacy}","received_events_url":"https://api.github.com/users/kebekus/received_events","type":"User","site_admin":false}],"milestone":null,"comments":3,"created_at":"2021-07-19T09:11:36Z","updated_at":"2021-07-21T06:00:04Z","closed_at":"2021-07-21T06:00:04Z","author_association":"NONE","active_lock_reason":null,"body":"Hi,\r\nI am a pilot from North Macedonia and I think that it would be very useful to have this tool available on the phone/tablet in flight as a back up to the Garmin GPS. I looked up at the openAIP maps and everything seems to match up to the official aviation maps.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/comments/883914026","html_url":"https://github.com/Akaflieg-Freiburg/enrouteServer/issues/22#issuecomment-883914026","issue_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22","id":883914026,"node_id":"IC_kwDODcDrQs40r3Uq","user":{"login":"kebekus","id":5110976,"node_id":"MDQ6VXNlcjUxMTA5NzY=","avatar_url":"https://avatars.githubusercontent.com/u/5110976?v=4","gravatar_id":"","url":"https://api.github.com/users/kebekus","html_url":"https://github.com/kebekus","followers_url":"https://api.github.com/users/kebekus/followers","following_url":"https://api.github.com/users/kebekus/following{/other_user}","gists_url":"https://api.github.com/users/kebekus/gists{/gist_id}","starred_url":"https://api.github.com/users/kebekus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kebekus/subscriptions","organizations_url":"https://api.github.com/users/kebekus/orgs","repos_url":"https://api.github.com/users/kebekus/repos","events_url":"https://api.github.com/users/kebekus/events{/privacy}","received_events_url":"https://api.github.com/users/kebekus/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T06:00:04Z","updated_at":"2021-07-21T06:00:04Z","author_association":"MEMBER","body":"Dear Tridson,\r\n\r\nok, we're on the same page here. Since I want the app to be known as reliable and complete, I have the policy to include a country only when all the data is there. Thus, I have to ask for your understanding that I will not add Macedonia at this point. I will hence close the issue now.\r\n\r\n>  I hope openAIP updates their aviation maps for our country so it includes these things. \r\n\r\nLike **Enroute Flight Navigation**, openAIP is a volunteer effort. Aviation data for Macedonia will only be added to openAIP if someone from your country volunteers to provide the data and to maintain it. Let me know if you are interested to do the job, I could then get you in touch with the relevant people there.\r\n\r\nBest,\r\n\r\nStefan.\r\n\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":59165675,"login":"Akaflieg-Freiburg","gravatar_id":"","url":"https://api.github.com/orgs/Akaflieg-Freiburg","avatar_url":"https://avatars.githubusercontent.com/u/59165675?"}}
+{"id":"17244208020","type":"PushEvent","actor":{"id":75016136,"login":"CastformMadrid","display_login":"CastformMadrid","gravatar_id":"","url":"https://api.github.com/users/CastformMadrid","avatar_url":"https://avatars.githubusercontent.com/u/75016136?"},"repo":{"id":315383656,"name":"alexelgt/Castform-Madrid","url":"https://api.github.com/repos/alexelgt/Castform-Madrid"},"payload":{"push_id":7561415145,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"3d9daadb9745e005cd35fa866be64e59aa8bb67f","before":"613ca64316e4c7daf8daca68b57fffe802514871","commits":[{"sha":"3d9daadb9745e005cd35fa866be64e59aa8bb67f","author":{"name":"CastformMadrid","email":"4bf3034b7f6dbaf30fedab8adaf278c90d929f80@gmail.com"},"message":"21/7/2021 08:00","distinct":true,"url":"https://api.github.com/repos/alexelgt/Castform-Madrid/commits/3d9daadb9745e005cd35fa866be64e59aa8bb67f"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244208025","type":"CreateEvent","actor":{"id":78917781,"login":"aishwarya236-gif","display_login":"aishwarya236-gif","gravatar_id":"","url":"https://api.github.com/users/aishwarya236-gif","avatar_url":"https://avatars.githubusercontent.com/u/78917781?"},"repo":{"id":388010509,"name":"aishwarya236-gif/Django_ImageUploader","url":"https://api.github.com/repos/aishwarya236-gif/Django_ImageUploader"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244208026","type":"ReleaseEvent","actor":{"id":180613,"login":"tuxtof","display_login":"tuxtof","gravatar_id":"","url":"https://api.github.com/users/tuxtof","avatar_url":"https://avatars.githubusercontent.com/u/180613?"},"repo":{"id":246599412,"name":"nutanix/docker-machine","url":"https://api.github.com/repos/nutanix/docker-machine"},"payload":{"action":"published","release":{"url":"https://api.github.com/repos/nutanix/docker-machine/releases/46519596","assets_url":"https://api.github.com/repos/nutanix/docker-machine/releases/46519596/assets","upload_url":"https://uploads.github.com/repos/nutanix/docker-machine/releases/46519596/assets{?name,label}","html_url":"https://github.com/nutanix/docker-machine/releases/tag/v3.0.0-beta5","id":46519596,"author":{"login":"tuxtof","id":180613,"node_id":"MDQ6VXNlcjE4MDYxMw==","avatar_url":"https://avatars.githubusercontent.com/u/180613?v=4","gravatar_id":"","url":"https://api.github.com/users/tuxtof","html_url":"https://github.com/tuxtof","followers_url":"https://api.github.com/users/tuxtof/followers","following_url":"https://api.github.com/users/tuxtof/following{/other_user}","gists_url":"https://api.github.com/users/tuxtof/gists{/gist_id}","starred_url":"https://api.github.com/users/tuxtof/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tuxtof/subscriptions","organizations_url":"https://api.github.com/users/tuxtof/orgs","repos_url":"https://api.github.com/users/tuxtof/repos","events_url":"https://api.github.com/users/tuxtof/events{/privacy}","received_events_url":"https://api.github.com/users/tuxtof/received_events","type":"User","site_admin":false},"node_id":"MDc6UmVsZWFzZTQ2NTE5NTk2","tag_name":"v3.0.0-beta5","target_commitish":"master","name":"v3.0.0-beta5","draft":false,"prerelease":false,"created_at":"2021-07-21T05:59:03Z","published_at":"2021-07-21T06:00:04Z","assets":[],"tarball_url":"https://api.github.com/repos/nutanix/docker-machine/tarball/v3.0.0-beta5","zipball_url":"https://api.github.com/repos/nutanix/docker-machine/zipball/v3.0.0-beta5","body":"","short_description_html":null,"is_short_description_html_truncated":false}},"public":true,"created_at":"2021-07-21T06:00:04Z","org":{"id":6165865,"login":"nutanix","gravatar_id":"","url":"https://api.github.com/orgs/nutanix","avatar_url":"https://avatars.githubusercontent.com/u/6165865?"}}
+{"id":"17244208035","type":"PushEvent","actor":{"id":40586421,"login":"himobi","display_login":"himobi","gravatar_id":"","url":"https://api.github.com/users/himobi","avatar_url":"https://avatars.githubusercontent.com/u/40586421?"},"repo":{"id":138676186,"name":"himobi/hotspot","url":"https://api.github.com/repos/himobi/hotspot"},"payload":{"push_id":7561415159,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9d60416e611211a9386a1f1df41869af668596dc","before":"614e81bb117a0b0a4504418c4a2fe6ea6d03962b","commits":[{"sha":"9d60416e611211a9386a1f1df41869af668596dc","author":{"name":"himobi","email":"25be52bce459ebff50c126f5ac512648f87cbe75@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/himobi/hotspot/commits/9d60416e611211a9386a1f1df41869af668596dc"}]},"public":true,"created_at":"2021-07-21T06:00:04Z"}
+{"id":"17244208049","type":"PullRequestEvent","actor":{"id":6924409,"login":"cg1101","display_login":"cg1101","gravatar_id":"","url":"https://api.github.com/users/cg1101","avatar_url":"https://avatars.githubusercontent.com/u/6924409?"},"repo":{"id":157529668,"name":"f-club/my-angular-app","url":"https://api.github.com/repos/f-club/my-angular-app"},"payload":{"action":"closed","number":189,"pull_request":{"url":"https://api.github.com/repos/f-club/my-angular-app/pulls/189","id":692887979,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyODg3OTc5","html_url":"https://github.com/f-club/my-angular-app/pull/189","diff_url":"https://github.com/f-club/my-angular-app/pull/189.diff","patch_url":"https://github.com/f-club/my-angular-app/pull/189.patch","issue_url":"https://api.github.com/repos/f-club/my-angular-app/issues/189","number":189,"state":"closed","locked":false,"title":"Bump @angular/common from 12.1.1 to 12.1.2","user":{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"[//]: # (dependabot-start)\n⚠️  **Dependabot is rebasing this PR** ⚠️ \n\nRebasing might not happen immediately, so don't worry if this takes some time.\n\nNote: if you make any changes to this PR yourself, they will take precedence over the rebase.\n\n---\n\n[//]: # (dependabot-end)\n\nBumps [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) from 12.1.1 to 12.1.2.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/angular/angular/releases\"><code>@​angular/common</code>'s releases</a>.</em></p>\n<blockquote>\n<h2>v12.1.2</h2>\n<p><!-- raw HTML omitted --><!-- raw HTML omitted --></p>\n<h1>12.1.2 (2021-07-14)</h1>\n<h3>bazel</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>4a8ab4f149</td>\n<td>fix(bazel): enable dts bundling for Ivy packages (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42728\">#42728</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>common</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>d654c7933a</td>\n<td>fix(common): re-sort output of <code>KeyValuePipe</code> when <code>compareFn</code> changes (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42821\">#42821</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>compiler</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>2566cbb48c</td>\n<td>fix(compiler): add mappings for all HTML entities (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42818\">#42818</a>)</td>\n</tr>\n<tr>\n<td>65330f03a9</td>\n<td>fix(compiler): incorrect context object being referenced from listener instructions inside embedded views (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42755\">#42755</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>compiler-cli</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>17d3de25da</td>\n<td>fix(compiler-cli): properly emit literal types when recreating type parameters in a different file (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42761\">#42761</a>)</td>\n</tr>\n<tr>\n<td>0a17e98ae2</td>\n<td>fix(compiler-cli): inline type checking instructions no longer prevent incremental reuse (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42759\">#42759</a>)</td>\n</tr>\n<tr>\n<td>45116097c1</td>\n<td>fix(compiler-cli): support reflecting namespace declarations (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42728\">#42728</a>)</td>\n</tr>\n<tr>\n<td>df5cc1fbbf</td>\n<td>fix(compiler-cli): return directives for an element on a microsyntax template (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42640\">#42640</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>core</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>63013546e1</td>\n<td>fix(core): associate the NgModule scope for an overridden component (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42817\">#42817</a>)</td>\n</tr>\n<tr>\n<td>9ebd41e39c</td>\n<td>fix(core): allow proper type inference when <code>ngFor</code> is used with a <code>trackBy</code> function (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42692\">#42692</a>)</td>\n</tr>\n<tr>\n<td>41c6877c01</td>\n<td>fix(core): error in TestBed if module is reset mid-compilation in ViewEngine (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42669\">#42669</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>language-service</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>97c18f4527</td>\n<td>fix(language-service): Do not override TS LS methods not supported by VE NgLS (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42727\">#42727</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>service-worker</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>d87917542a</td>\n<td>fix(service-worker): correctly handle unrecoverable state when a client no longer exists (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42736\">#42736</a>)</td>\n</tr>\n<tr>\n<td>f2523a8fef</td>\n<td>fix(service-worker): avoid storing redundant metadata for hashed assets (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42606\">#42606</a>)</td>\n</tr>\n</tbody>\n</table>\n<h2>Special Thanks:</h2>\n<p>Alan Agius, Andrew Kushnir, Andrew Scott, Arthur Ming, Bastian, Borislav Ivanov, David Gilson, David Shevitz, Gabriele Franchitto, George Kalpakas, Joey Perrott, JoostK, Kristiyan Kostadinov, Mark Goho, Meir Blumenfeld, Paul Gschwendtner, Pete Bacon Darwin, Renovate Bot, Ryan Andersen, Theoklitos Bampouris, behrooz bozorg chami, dario-piotrowicz, ivanwonder and mgechev</p>\n</blockquote>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/angular/angular/blob/master/CHANGELOG.md\"><code>@​angular/common</code>'s changelog</a>.</em></p>\n<blockquote>\n<h1>12.1.2 (2021-07-14)</h1>\n<h3>bazel</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/4a8ab4f1499a560bb4373b088785e43f26384e1c\">4a8ab4f149</a></td>\n<td>fix(bazel): enable dts bundling for Ivy packages (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42728\">#42728</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>common</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/d654c7933a732c23dc1e68b17766457d2d11a4d8\">d654c7933a</a></td>\n<td>fix(common): re-sort output of <code>KeyValuePipe</code> when <code>compareFn</code> changes (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42821\">#42821</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>compiler</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/2566cbb48cddd23c4b29d01ad557bc71ac716700\">2566cbb48c</a></td>\n<td>fix(compiler): add mappings for all HTML entities (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42818\">#42818</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/65330f03a92f2743719d0e0d4cedcaadbb8c5b21\">65330f03a9</a></td>\n<td>fix(compiler): incorrect context object being referenced from listener instructions inside embedded views (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42755\">#42755</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>compiler-cli</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/17d3de25daf339612c267001f0c2237533d7c789\">17d3de25da</a></td>\n<td>fix(compiler-cli): properly emit literal types when recreating type parameters in a different file (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42761\">#42761</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/0a17e98ae2813338f03e3e01bb7cfa6024f4632b\">0a17e98ae2</a></td>\n<td>fix(compiler-cli): inline type checking instructions no longer prevent incremental reuse (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42759\">#42759</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/45116097c1dafd902014e0f680e0d50023467883\">45116097c1</a></td>\n<td>fix(compiler-cli): support reflecting namespace declarations (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42728\">#42728</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/df5cc1fbbf1b1f02f1f45603552a2530bb59688d\">df5cc1fbbf</a></td>\n<td>fix(compiler-cli): return directives for an element on a microsyntax template (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42640\">#42640</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>core</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/63013546e130d823db26ad96e1d4cb346e633a03\">63013546e1</a></td>\n<td>fix(core): associate the NgModule scope for an overridden component (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42817\">#42817</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/9ebd41e39c597ef6df2de2fb63d6458337e2757d\">9ebd41e39c</a></td>\n<td>fix(core): allow proper type inference when <code>ngFor</code> is used with a <code>trackBy</code> function (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42692\">#42692</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/41c6877c013ba84ba5e46309b2310c097ad9e354\">41c6877c01</a></td>\n<td>fix(core): error in TestBed if module is reset mid-compilation in ViewEngine (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42669\">#42669</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>language-service</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/97c18f4527187206db8b0f5730b80d2220027f9f\">97c18f4527</a></td>\n<td>fix(language-service): Do not override TS LS methods not supported by VE NgLS (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42727\">#42727</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>service-worker</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/d87917542a00ed6f58c7b95e3eba6aeddc5eee01\">d87917542a</a></td>\n<td>fix(service-worker): correctly handle unrecoverable state when a client no longer exists (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42736\">#42736</a>)</td>\n</tr>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/f2523a8fef549fab6ec480ecfc966c9d938a5423\">f2523a8fef</a></td>\n<td>fix(service-worker): avoid storing redundant metadata for hashed assets (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42606\">#42606</a>)</td>\n</tr>\n</tbody>\n</table>\n<h2>Special Thanks:</h2>\n<p>Alan Agius, Andrew Kushnir, Andrew Scott, Arthur Ming, Bastian, Borislav Ivanov, David Gilson, David Shevitz, Gabriele Franchitto, George Kalpakas, Joey Perrott, JoostK, Kristiyan Kostadinov, Mark Goho, Meir Blumenfeld, Paul Gschwendtner, Pete Bacon Darwin, Ryan Andersen, Theoklitos Bampouris, behrooz bozorg chami, dario-piotrowicz, ivanwonder and mgechev</p>\n<p><!-- raw HTML omitted --><!-- raw HTML omitted --></p>\n<h1>12.2.0-next.1 (2021-06-30)</h1>\n<h3>compiler</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/9f5cc7c808458f312543c7c044fe7a361cdc7798\">9f5cc7c808</a></td>\n<td>feat(compiler): support number separators in templates (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/42672\">#42672</a>)</td>\n</tr>\n</tbody>\n</table>\n<h3>compiler-cli</h3>\n<table>\n<thead>\n<tr>\n<th>Commit</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"https://github.com/angular/angular/commit/37a740c6590b7725053f8578d39e53ecba4f5727\">37a740c659</a></td>\n<td>fix(compiler-cli): add support for partially evaluating types (<a href=\"https://github-redirect.dependabot.com/angular/angular/pull/41661\">#41661</a>)</td>\n</tr>\n</tbody>\n</table>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/angular/angular/commit/d654c7933a732c23dc1e68b17766457d2d11a4d8\"><code>d654c79</code></a> fix(common): re-sort output of <code>KeyValuePipe</code> when <code>compareFn</code> changes (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42821\">#42821</a>)</li>\n<li><a href=\"https://github.com/angular/angular/commit/04472d23c2bbc7ffa456a7984a96105934d55246\"><code>04472d2</code></a> refactor: add override keyword to members implementing abstract declarations ...</li>\n<li><a href=\"https://github.com/angular/angular/commit/1f84f01ff923d66d74c759ba7c1979844abb6083\"><code>1f84f01</code></a> refactor(common): ensure compatibility with noImplicitOverride (<a href=\"https://github.com/angular/angular/tree/HEAD/packages/common/issues/42512\">#42512</a>)</li>\n<li>See full diff in <a href=\"https://github.com/angular/angular/commits/12.1.2/packages/common\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@angular/common&package-manager=npm_and_yarn&previous-version=12.1.1&new-version=12.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n\n\n</details>","created_at":"2021-07-19T20:06:46Z","updated_at":"2021-07-21T06:00:04Z","closed_at":"2021-07-21T06:00:04Z","merged_at":"2021-07-21T06:00:04Z","merge_commit_sha":"02a705eebb49f91fab457ba053d73c9362739a16","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":2961171209,"node_id":"MDU6TGFiZWwyOTYxMTcxMjA5","url":"https://api.github.com/repos/f-club/my-angular-app/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/f-club/my-angular-app/pulls/189/commits","review_comments_url":"https://api.github.com/repos/f-club/my-angular-app/pulls/189/comments","review_comment_url":"https://api.github.com/repos/f-club/my-angular-app/pulls/comments{/number}","comments_url":"https://api.github.com/repos/f-club/my-angular-app/issues/189/comments","statuses_url":"https://api.github.com/repos/f-club/my-angular-app/statuses/1b6c31899f2c70ab4e1fca761d93b9cb034cbaf2","head":{"label":"f-club:dependabot/npm_and_yarn/angular/common-12.1.2","ref":"dependabot/npm_and_yarn/angular/common-12.1.2","sha":"1b6c31899f2c70ab4e1fca761d93b9cb034cbaf2","user":{"login":"f-club","id":83454129,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0MTI5","avatar_url":"https://avatars.githubusercontent.com/u/83454129?v=4","gravatar_id":"","url":"https://api.github.com/users/f-club","html_url":"https://github.com/f-club","followers_url":"https://api.github.com/users/f-club/followers","following_url":"https://api.github.com/users/f-club/following{/other_user}","gists_url":"https://api.github.com/users/f-club/gists{/gist_id}","starred_url":"https://api.github.com/users/f-club/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/f-club/subscriptions","organizations_url":"https://api.github.com/users/f-club/orgs","repos_url":"https://api.github.com/users/f-club/repos","events_url":"https://api.github.com/users/f-club/events{/privacy}","received_events_url":"https://api.github.com/users/f-club/received_events","type":"Organization","site_admin":false},"repo":{"id":157529668,"node_id":"MDEwOlJlcG9zaXRvcnkxNTc1Mjk2Njg=","name":"my-angular-app","full_name":"f-club/my-angular-app","private":false,"owner":{"login":"f-club","id":83454129,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0MTI5","avatar_url":"https://avatars.githubusercontent.com/u/83454129?v=4","gravatar_id":"","url":"https://api.github.com/users/f-club","html_url":"https://github.com/f-club","followers_url":"https://api.github.com/users/f-club/followers","following_url":"https://api.github.com/users/f-club/following{/other_user}","gists_url":"https://api.github.com/users/f-club/gists{/gist_id}","starred_url":"https://api.github.com/users/f-club/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/f-club/subscriptions","organizations_url":"https://api.github.com/users/f-club/orgs","repos_url":"https://api.github.com/users/f-club/repos","events_url":"https://api.github.com/users/f-club/events{/privacy}","received_events_url":"https://api.github.com/users/f-club/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/f-club/my-angular-app","description":null,"fork":false,"url":"https://api.github.com/repos/f-club/my-angular-app","forks_url":"https://api.github.com/repos/f-club/my-angular-app/forks","keys_url":"https://api.github.com/repos/f-club/my-angular-app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/f-club/my-angular-app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/f-club/my-angular-app/teams","hooks_url":"https://api.github.com/repos/f-club/my-angular-app/hooks","issue_events_url":"https://api.github.com/repos/f-club/my-angular-app/issues/events{/number}","events_url":"https://api.github.com/repos/f-club/my-angular-app/events","assignees_url":"https://api.github.com/repos/f-club/my-angular-app/assignees{/user}","branches_url":"https://api.github.com/repos/f-club/my-angular-app/branches{/branch}","tags_url":"https://api.github.com/repos/f-club/my-angular-app/tags","blobs_url":"https://api.github.com/repos/f-club/my-angular-app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/f-club/my-angular-app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/f-club/my-angular-app/git/refs{/sha}","trees_url":"https://api.github.com/repos/f-club/my-angular-app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/f-club/my-angular-app/statuses/{sha}","languages_url":"https://api.github.com/repos/f-club/my-angular-app/languages","stargazers_url":"https://api.github.com/repos/f-club/my-angular-app/stargazers","contributors_url":"https://api.github.com/repos/f-club/my-angular-app/contributors","subscribers_url":"https://api.github.com/repos/f-club/my-angular-app/subscribers","subscription_url":"https://api.github.com/repos/f-club/my-angular-app/subscription","commits_url":"https://api.github.com/repos/f-club/my-angular-app/commits{/sha}","git_commits_url":"https://api.github.com/repos/f-club/my-angular-app/git/commits{/sha}","comments_url":"https://api.github.com/repos/f-club/my-angular-app/comments{/number}","issue_comment_url":"https://api.github.com/repos/f-club/my-angular-app/issues/comments{/number}","contents_url":"https://api.github.com/repos/f-club/my-angular-app/contents/{+path}","compare_url":"https://api.github.com/repos/f-club/my-angular-app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/f-club/my-angular-app/merges","archive_url":"https://api.github.com/repos/f-club/my-angular-app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/f-club/my-angular-app/downloads","issues_url":"https://api.github.com/repos/f-club/my-angular-app/issues{/number}","pulls_url":"https://api.github.com/repos/f-club/my-angular-app/pulls{/number}","milestones_url":"https://api.github.com/repos/f-club/my-angular-app/milestones{/number}","notifications_url":"https://api.github.com/repos/f-club/my-angular-app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/f-club/my-angular-app/labels{/name}","releases_url":"https://api.github.com/repos/f-club/my-angular-app/releases{/id}","deployments_url":"https://api.github.com/repos/f-club/my-angular-app/deployments","created_at":"2018-11-14T10:11:29Z","updated_at":"2021-07-21T05:59:59Z","pushed_at":"2021-07-21T06:00:04Z","git_url":"git://github.com/f-club/my-angular-app.git","ssh_url":"git@github.com:f-club/my-angular-app.git","clone_url":"https://github.com/f-club/my-angular-app.git","svn_url":"https://github.com/f-club/my-angular-app","homepage":null,"size":18107,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":null,"forks":0,"open_issues":5,"watchers":0,"default_branch":"master"}},"base":{"label":"f-club:master","ref":"master","sha":"ee3ab69f81ea6737ed91c3b2ab2834798e52000f","user":{"login":"f-club","id":83454129,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0MTI5","avatar_url":"https://avatars.githubusercontent.com/u/83454129?v=4","gravatar_id":"","url":"https://api.github.com/users/f-club","html_url":"https://github.com/f-club","followers_url":"https://api.github.com/users/f-club/followers","following_url":"https://api.github.com/users/f-club/following{/other_user}","gists_url":"https://api.github.com/users/f-club/gists{/gist_id}","starred_url":"https://api.github.com/users/f-club/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/f-club/subscriptions","organizations_url":"https://api.github.com/users/f-club/orgs","repos_url":"https://api.github.com/users/f-club/repos","events_url":"https://api.github.com/users/f-club/events{/privacy}","received_events_url":"https://api.github.com/users/f-club/received_events","type":"Organization","site_admin":false},"repo":{"id":157529668,"node_id":"MDEwOlJlcG9zaXRvcnkxNTc1Mjk2Njg=","name":"my-angular-app","full_name":"f-club/my-angular-app","private":false,"owner":{"login":"f-club","id":83454129,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0MTI5","avatar_url":"https://avatars.githubusercontent.com/u/83454129?v=4","gravatar_id":"","url":"https://api.github.com/users/f-club","html_url":"https://github.com/f-club","followers_url":"https://api.github.com/users/f-club/followers","following_url":"https://api.github.com/users/f-club/following{/other_user}","gists_url":"https://api.github.com/users/f-club/gists{/gist_id}","starred_url":"https://api.github.com/users/f-club/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/f-club/subscriptions","organizations_url":"https://api.github.com/users/f-club/orgs","repos_url":"https://api.github.com/users/f-club/repos","events_url":"https://api.github.com/users/f-club/events{/privacy}","received_events_url":"https://api.github.com/users/f-club/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/f-club/my-angular-app","description":null,"fork":false,"url":"https://api.github.com/repos/f-club/my-angular-app","forks_url":"https://api.github.com/repos/f-club/my-angular-app/forks","keys_url":"https://api.github.com/repos/f-club/my-angular-app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/f-club/my-angular-app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/f-club/my-angular-app/teams","hooks_url":"https://api.github.com/repos/f-club/my-angular-app/hooks","issue_events_url":"https://api.github.com/repos/f-club/my-angular-app/issues/events{/number}","events_url":"https://api.github.com/repos/f-club/my-angular-app/events","assignees_url":"https://api.github.com/repos/f-club/my-angular-app/assignees{/user}","branches_url":"https://api.github.com/repos/f-club/my-angular-app/branches{/branch}","tags_url":"https://api.github.com/repos/f-club/my-angular-app/tags","blobs_url":"https://api.github.com/repos/f-club/my-angular-app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/f-club/my-angular-app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/f-club/my-angular-app/git/refs{/sha}","trees_url":"https://api.github.com/repos/f-club/my-angular-app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/f-club/my-angular-app/statuses/{sha}","languages_url":"https://api.github.com/repos/f-club/my-angular-app/languages","stargazers_url":"https://api.github.com/repos/f-club/my-angular-app/stargazers","contributors_url":"https://api.github.com/repos/f-club/my-angular-app/contributors","subscribers_url":"https://api.github.com/repos/f-club/my-angular-app/subscribers","subscription_url":"https://api.github.com/repos/f-club/my-angular-app/subscription","commits_url":"https://api.github.com/repos/f-club/my-angular-app/commits{/sha}","git_commits_url":"https://api.github.com/repos/f-club/my-angular-app/git/commits{/sha}","comments_url":"https://api.github.com/repos/f-club/my-angular-app/comments{/number}","issue_comment_url":"https://api.github.com/repos/f-club/my-angular-app/issues/comments{/number}","contents_url":"https://api.github.com/repos/f-club/my-angular-app/contents/{+path}","compare_url":"https://api.github.com/repos/f-club/my-angular-app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/f-club/my-angular-app/merges","archive_url":"https://api.github.com/repos/f-club/my-angular-app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/f-club/my-angular-app/downloads","issues_url":"https://api.github.com/repos/f-club/my-angular-app/issues{/number}","pulls_url":"https://api.github.com/repos/f-club/my-angular-app/pulls{/number}","milestones_url":"https://api.github.com/repos/f-club/my-angular-app/milestones{/number}","notifications_url":"https://api.github.com/repos/f-club/my-angular-app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/f-club/my-angular-app/labels{/name}","releases_url":"https://api.github.com/repos/f-club/my-angular-app/releases{/id}","deployments_url":"https://api.github.com/repos/f-club/my-angular-app/deployments","created_at":"2018-11-14T10:11:29Z","updated_at":"2021-07-21T05:59:59Z","pushed_at":"2021-07-21T06:00:04Z","git_url":"git://github.com/f-club/my-angular-app.git","ssh_url":"git@github.com:f-club/my-angular-app.git","clone_url":"https://github.com/f-club/my-angular-app.git","svn_url":"https://github.com/f-club/my-angular-app","homepage":null,"size":18107,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":null,"forks":0,"open_issues":5,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/f-club/my-angular-app/pulls/189"},"html":{"href":"https://github.com/f-club/my-angular-app/pull/189"},"issue":{"href":"https://api.github.com/repos/f-club/my-angular-app/issues/189"},"comments":{"href":"https://api.github.com/repos/f-club/my-angular-app/issues/189/comments"},"review_comments":{"href":"https://api.github.com/repos/f-club/my-angular-app/pulls/189/comments"},"review_comment":{"href":"https://api.github.com/repos/f-club/my-angular-app/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/f-club/my-angular-app/pulls/189/commits"},"statuses":{"href":"https://api.github.com/repos/f-club/my-angular-app/statuses/1b6c31899f2c70ab4e1fca761d93b9cb034cbaf2"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"cg1101","id":6924409,"node_id":"MDQ6VXNlcjY5MjQ0MDk=","avatar_url":"https://avatars.githubusercontent.com/u/6924409?v=4","gravatar_id":"","url":"https://api.github.com/users/cg1101","html_url":"https://github.com/cg1101","followers_url":"https://api.github.com/users/cg1101/followers","following_url":"https://api.github.com/users/cg1101/following{/other_user}","gists_url":"https://api.github.com/users/cg1101/gists{/gist_id}","starred_url":"https://api.github.com/users/cg1101/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cg1101/subscriptions","organizations_url":"https://api.github.com/users/cg1101/orgs","repos_url":"https://api.github.com/users/cg1101/repos","events_url":"https://api.github.com/users/cg1101/events{/privacy}","received_events_url":"https://api.github.com/users/cg1101/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":9,"deletions":9,"changed_files":2}},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":83454129,"login":"f-club","gravatar_id":"","url":"https://api.github.com/orgs/f-club","avatar_url":"https://avatars.githubusercontent.com/u/83454129?"}}
+{"id":"17244208050","type":"PullRequestEvent","actor":{"id":80881229,"login":"ItsMeVishal007","display_login":"ItsMeVishal007","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","avatar_url":"https://avatars.githubusercontent.com/u/80881229?"},"repo":{"id":373055818,"name":"ItsMeVishal007/Share-Site","url":"https://api.github.com/repos/ItsMeVishal007/Share-Site"},"payload":{"action":"closed","number":29,"pull_request":{"url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/29","id":694073936,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTM2","html_url":"https://github.com/ItsMeVishal007/Share-Site/pull/29","diff_url":"https://github.com/ItsMeVishal007/Share-Site/pull/29.diff","patch_url":"https://github.com/ItsMeVishal007/Share-Site/pull/29.patch","issue_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/29","number":29,"state":"closed","locked":false,"title":"established relationship between user and place","user":{"login":"ItsMeVishal007","id":80881229,"node_id":"MDQ6VXNlcjgwODgxMjI5","avatar_url":"https://avatars.githubusercontent.com/u/80881229?v=4","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","html_url":"https://github.com/ItsMeVishal007","followers_url":"https://api.github.com/users/ItsMeVishal007/followers","following_url":"https://api.github.com/users/ItsMeVishal007/following{/other_user}","gists_url":"https://api.github.com/users/ItsMeVishal007/gists{/gist_id}","starred_url":"https://api.github.com/users/ItsMeVishal007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ItsMeVishal007/subscriptions","organizations_url":"https://api.github.com/users/ItsMeVishal007/orgs","repos_url":"https://api.github.com/users/ItsMeVishal007/repos","events_url":"https://api.github.com/users/ItsMeVishal007/events{/privacy}","received_events_url":"https://api.github.com/users/ItsMeVishal007/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T05:59:56Z","updated_at":"2021-07-21T06:00:04Z","closed_at":"2021-07-21T06:00:04Z","merged_at":"2021-07-21T06:00:04Z","merge_commit_sha":"cd138585cef701abc91e63a31e1462b367f4ac70","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/29/commits","review_comments_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/29/comments","review_comment_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/29/comments","statuses_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/statuses/ea2894db8c72dae243f5e7532b71375ac13ddcbd","head":{"label":"ItsMeVishal007:feat/cyber-dev","ref":"feat/cyber-dev","sha":"ea2894db8c72dae243f5e7532b71375ac13ddcbd","user":{"login":"ItsMeVishal007","id":80881229,"node_id":"MDQ6VXNlcjgwODgxMjI5","avatar_url":"https://avatars.githubusercontent.com/u/80881229?v=4","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","html_url":"https://github.com/ItsMeVishal007","followers_url":"https://api.github.com/users/ItsMeVishal007/followers","following_url":"https://api.github.com/users/ItsMeVishal007/following{/other_user}","gists_url":"https://api.github.com/users/ItsMeVishal007/gists{/gist_id}","starred_url":"https://api.github.com/users/ItsMeVishal007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ItsMeVishal007/subscriptions","organizations_url":"https://api.github.com/users/ItsMeVishal007/orgs","repos_url":"https://api.github.com/users/ItsMeVishal007/repos","events_url":"https://api.github.com/users/ItsMeVishal007/events{/privacy}","received_events_url":"https://api.github.com/users/ItsMeVishal007/received_events","type":"User","site_admin":false},"repo":{"id":373055818,"node_id":"MDEwOlJlcG9zaXRvcnkzNzMwNTU4MTg=","name":"Share-Site","full_name":"ItsMeVishal007/Share-Site","private":false,"owner":{"login":"ItsMeVishal007","id":80881229,"node_id":"MDQ6VXNlcjgwODgxMjI5","avatar_url":"https://avatars.githubusercontent.com/u/80881229?v=4","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","html_url":"https://github.com/ItsMeVishal007","followers_url":"https://api.github.com/users/ItsMeVishal007/followers","following_url":"https://api.github.com/users/ItsMeVishal007/following{/other_user}","gists_url":"https://api.github.com/users/ItsMeVishal007/gists{/gist_id}","starred_url":"https://api.github.com/users/ItsMeVishal007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ItsMeVishal007/subscriptions","organizations_url":"https://api.github.com/users/ItsMeVishal007/orgs","repos_url":"https://api.github.com/users/ItsMeVishal007/repos","events_url":"https://api.github.com/users/ItsMeVishal007/events{/privacy}","received_events_url":"https://api.github.com/users/ItsMeVishal007/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ItsMeVishal007/Share-Site","description":"a MERN app through which you can share locations","fork":false,"url":"https://api.github.com/repos/ItsMeVishal007/Share-Site","forks_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/forks","keys_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/teams","hooks_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/hooks","issue_events_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/events{/number}","events_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/events","assignees_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/assignees{/user}","branches_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/branches{/branch}","tags_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/tags","blobs_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/refs{/sha}","trees_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/statuses/{sha}","languages_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/languages","stargazers_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/stargazers","contributors_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/contributors","subscribers_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/subscribers","subscription_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/subscription","commits_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/commits{/sha}","git_commits_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/commits{/sha}","comments_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/comments{/number}","issue_comment_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/comments{/number}","contents_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/contents/{+path}","compare_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/merges","archive_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/downloads","issues_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues{/number}","pulls_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls{/number}","milestones_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/milestones{/number}","notifications_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/labels{/name}","releases_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/releases{/id}","deployments_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/deployments","created_at":"2021-06-02T05:57:02Z","updated_at":"2021-07-21T05:23:46Z","pushed_at":"2021-07-21T06:00:04Z","git_url":"git://github.com/ItsMeVishal007/Share-Site.git","ssh_url":"git@github.com:ItsMeVishal007/Share-Site.git","clone_url":"https://github.com/ItsMeVishal007/Share-Site.git","svn_url":"https://github.com/ItsMeVishal007/Share-Site","homepage":null,"size":740,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"base":{"label":"ItsMeVishal007:master","ref":"master","sha":"4466e60114723817ab2624226d2e99f49c36378b","user":{"login":"ItsMeVishal007","id":80881229,"node_id":"MDQ6VXNlcjgwODgxMjI5","avatar_url":"https://avatars.githubusercontent.com/u/80881229?v=4","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","html_url":"https://github.com/ItsMeVishal007","followers_url":"https://api.github.com/users/ItsMeVishal007/followers","following_url":"https://api.github.com/users/ItsMeVishal007/following{/other_user}","gists_url":"https://api.github.com/users/ItsMeVishal007/gists{/gist_id}","starred_url":"https://api.github.com/users/ItsMeVishal007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ItsMeVishal007/subscriptions","organizations_url":"https://api.github.com/users/ItsMeVishal007/orgs","repos_url":"https://api.github.com/users/ItsMeVishal007/repos","events_url":"https://api.github.com/users/ItsMeVishal007/events{/privacy}","received_events_url":"https://api.github.com/users/ItsMeVishal007/received_events","type":"User","site_admin":false},"repo":{"id":373055818,"node_id":"MDEwOlJlcG9zaXRvcnkzNzMwNTU4MTg=","name":"Share-Site","full_name":"ItsMeVishal007/Share-Site","private":false,"owner":{"login":"ItsMeVishal007","id":80881229,"node_id":"MDQ6VXNlcjgwODgxMjI5","avatar_url":"https://avatars.githubusercontent.com/u/80881229?v=4","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","html_url":"https://github.com/ItsMeVishal007","followers_url":"https://api.github.com/users/ItsMeVishal007/followers","following_url":"https://api.github.com/users/ItsMeVishal007/following{/other_user}","gists_url":"https://api.github.com/users/ItsMeVishal007/gists{/gist_id}","starred_url":"https://api.github.com/users/ItsMeVishal007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ItsMeVishal007/subscriptions","organizations_url":"https://api.github.com/users/ItsMeVishal007/orgs","repos_url":"https://api.github.com/users/ItsMeVishal007/repos","events_url":"https://api.github.com/users/ItsMeVishal007/events{/privacy}","received_events_url":"https://api.github.com/users/ItsMeVishal007/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ItsMeVishal007/Share-Site","description":"a MERN app through which you can share locations","fork":false,"url":"https://api.github.com/repos/ItsMeVishal007/Share-Site","forks_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/forks","keys_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/teams","hooks_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/hooks","issue_events_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/events{/number}","events_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/events","assignees_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/assignees{/user}","branches_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/branches{/branch}","tags_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/tags","blobs_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/refs{/sha}","trees_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/statuses/{sha}","languages_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/languages","stargazers_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/stargazers","contributors_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/contributors","subscribers_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/subscribers","subscription_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/subscription","commits_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/commits{/sha}","git_commits_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/git/commits{/sha}","comments_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/comments{/number}","issue_comment_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/comments{/number}","contents_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/contents/{+path}","compare_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/merges","archive_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/downloads","issues_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues{/number}","pulls_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls{/number}","milestones_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/milestones{/number}","notifications_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/labels{/name}","releases_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/releases{/id}","deployments_url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/deployments","created_at":"2021-06-02T05:57:02Z","updated_at":"2021-07-21T05:23:46Z","pushed_at":"2021-07-21T06:00:04Z","git_url":"git://github.com/ItsMeVishal007/Share-Site.git","ssh_url":"git@github.com:ItsMeVishal007/Share-Site.git","clone_url":"https://github.com/ItsMeVishal007/Share-Site.git","svn_url":"https://github.com/ItsMeVishal007/Share-Site","homepage":null,"size":740,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/29"},"html":{"href":"https://github.com/ItsMeVishal007/Share-Site/pull/29"},"issue":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/29"},"comments":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/issues/29/comments"},"review_comments":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/29/comments"},"review_comment":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/pulls/29/commits"},"statuses":{"href":"https://api.github.com/repos/ItsMeVishal007/Share-Site/statuses/ea2894db8c72dae243f5e7532b71375ac13ddcbd"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"ItsMeVishal007","id":80881229,"node_id":"MDQ6VXNlcjgwODgxMjI5","avatar_url":"https://avatars.githubusercontent.com/u/80881229?v=4","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","html_url":"https://github.com/ItsMeVishal007","followers_url":"https://api.github.com/users/ItsMeVishal007/followers","following_url":"https://api.github.com/users/ItsMeVishal007/following{/other_user}","gists_url":"https://api.github.com/users/ItsMeVishal007/gists{/gist_id}","starred_url":"https://api.github.com/users/ItsMeVishal007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ItsMeVishal007/subscriptions","organizations_url":"https://api.github.com/users/ItsMeVishal007/orgs","repos_url":"https://api.github.com/users/ItsMeVishal007/repos","events_url":"https://api.github.com/users/ItsMeVishal007/events{/privacy}","received_events_url":"https://api.github.com/users/ItsMeVishal007/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":13,"deletions":8,"changed_files":3}},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208052","type":"CreateEvent","actor":{"id":86180918,"login":"sinta222","display_login":"sinta222","gravatar_id":"","url":"https://api.github.com/users/sinta222","avatar_url":"https://avatars.githubusercontent.com/u/86180918?"},"repo":{"id":388010510,"name":"sinta222/quis1_blog","url":"https://api.github.com/repos/sinta222/quis1_blog"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208056","type":"PushEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":227131980,"name":"SDA-SE/sda-dropwizard-commons","url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons"},"payload":{"push_id":7561415160,"size":2,"distinct_size":1,"ref":"refs/heads/dependabot/gradle/master/com.github.tomakehurst-wiremock-jre8-2.29.1","head":"2b11b0abe4d0f5c12ca145648e3d57c2c7722fbb","before":"d5c98e30a3e411e9c2616eea697f9ea486d44ab9","commits":[{"sha":"1eb7ae12e7e38630f115b821244168f160d2db24","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"chore(deps): bump com.diffplug.spotless from 5.14.1 to 5.14.2\n\nBumps com.diffplug.spotless from 5.14.1 to 5.14.2.\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":false,"url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons/commits/1eb7ae12e7e38630f115b821244168f160d2db24"},{"sha":"2b11b0abe4d0f5c12ca145648e3d57c2c7722fbb","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"fix(deps): bump wiremock-jre8 from 2.28.1 to 2.29.1\n\nBumps [wiremock-jre8](https://github.com/tomakehurst/wiremock) from 2.28.1 to 2.29.1.\n- [Release notes](https://github.com/tomakehurst/wiremock/releases)\n- [Commits](https://github.com/tomakehurst/wiremock/compare/2.28.1...2.29.1)\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":true,"url":"https://api.github.com/repos/SDA-SE/sda-dropwizard-commons/commits/2b11b0abe4d0f5c12ca145648e3d57c2c7722fbb"}]},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":28891100,"login":"SDA-SE","gravatar_id":"","url":"https://api.github.com/orgs/SDA-SE","avatar_url":"https://avatars.githubusercontent.com/u/28891100?"}}
+{"id":"17244208057","type":"IssuesEvent","actor":{"id":5110976,"login":"kebekus","display_login":"kebekus","gravatar_id":"","url":"https://api.github.com/users/kebekus","avatar_url":"https://avatars.githubusercontent.com/u/5110976?"},"repo":{"id":230746946,"name":"Akaflieg-Freiburg/enrouteServer","url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22","repository_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer","labels_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22/labels{/name}","comments_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22/comments","events_url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/issues/22/events","html_url":"https://github.com/Akaflieg-Freiburg/enrouteServer/issues/22","id":947443223,"node_id":"MDU6SXNzdWU5NDc0NDMyMjM=","number":22,"title":"Macedonia","user":{"login":"Tridson","id":45800925,"node_id":"MDQ6VXNlcjQ1ODAwOTI1","avatar_url":"https://avatars.githubusercontent.com/u/45800925?v=4","gravatar_id":"","url":"https://api.github.com/users/Tridson","html_url":"https://github.com/Tridson","followers_url":"https://api.github.com/users/Tridson/followers","following_url":"https://api.github.com/users/Tridson/following{/other_user}","gists_url":"https://api.github.com/users/Tridson/gists{/gist_id}","starred_url":"https://api.github.com/users/Tridson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Tridson/subscriptions","organizations_url":"https://api.github.com/users/Tridson/orgs","repos_url":"https://api.github.com/users/Tridson/repos","events_url":"https://api.github.com/users/Tridson/events{/privacy}","received_events_url":"https://api.github.com/users/Tridson/received_events","type":"User","site_admin":false},"labels":[{"id":1758762617,"node_id":"MDU6TGFiZWwxNzU4NzYyNjE3","url":"https://api.github.com/repos/Akaflieg-Freiburg/enrouteServer/labels/enhancement","name":"enhancement","color":"a2eeef","default":true,"description":"New feature or request"}],"state":"closed","locked":false,"assignee":{"login":"kebekus","id":5110976,"node_id":"MDQ6VXNlcjUxMTA5NzY=","avatar_url":"https://avatars.githubusercontent.com/u/5110976?v=4","gravatar_id":"","url":"https://api.github.com/users/kebekus","html_url":"https://github.com/kebekus","followers_url":"https://api.github.com/users/kebekus/followers","following_url":"https://api.github.com/users/kebekus/following{/other_user}","gists_url":"https://api.github.com/users/kebekus/gists{/gist_id}","starred_url":"https://api.github.com/users/kebekus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kebekus/subscriptions","organizations_url":"https://api.github.com/users/kebekus/orgs","repos_url":"https://api.github.com/users/kebekus/repos","events_url":"https://api.github.com/users/kebekus/events{/privacy}","received_events_url":"https://api.github.com/users/kebekus/received_events","type":"User","site_admin":false},"assignees":[{"login":"kebekus","id":5110976,"node_id":"MDQ6VXNlcjUxMTA5NzY=","avatar_url":"https://avatars.githubusercontent.com/u/5110976?v=4","gravatar_id":"","url":"https://api.github.com/users/kebekus","html_url":"https://github.com/kebekus","followers_url":"https://api.github.com/users/kebekus/followers","following_url":"https://api.github.com/users/kebekus/following{/other_user}","gists_url":"https://api.github.com/users/kebekus/gists{/gist_id}","starred_url":"https://api.github.com/users/kebekus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kebekus/subscriptions","organizations_url":"https://api.github.com/users/kebekus/orgs","repos_url":"https://api.github.com/users/kebekus/repos","events_url":"https://api.github.com/users/kebekus/events{/privacy}","received_events_url":"https://api.github.com/users/kebekus/received_events","type":"User","site_admin":false}],"milestone":null,"comments":3,"created_at":"2021-07-19T09:11:36Z","updated_at":"2021-07-21T06:00:04Z","closed_at":"2021-07-21T06:00:04Z","author_association":"NONE","active_lock_reason":null,"body":"Hi,\r\nI am a pilot from North Macedonia and I think that it would be very useful to have this tool available on the phone/tablet in flight as a back up to the Garmin GPS. I looked up at the openAIP maps and everything seems to match up to the official aviation maps.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":59165675,"login":"Akaflieg-Freiburg","gravatar_id":"","url":"https://api.github.com/orgs/Akaflieg-Freiburg","avatar_url":"https://avatars.githubusercontent.com/u/59165675?"}}
+{"id":"17244208058","type":"PushEvent","actor":{"id":156685,"login":"MarkEWaite","display_login":"MarkEWaite","gravatar_id":"","url":"https://api.github.com/users/MarkEWaite","avatar_url":"https://avatars.githubusercontent.com/u/156685?"},"repo":{"id":51146391,"name":"MarkEWaite/jenkins-bugs","url":"https://api.github.com/repos/MarkEWaite/jenkins-bugs"},"payload":{"push_id":7561415157,"size":4,"distinct_size":2,"ref":"refs/heads/JENKINS-33202","head":"a7e50bd5f9e190ef1d81c20b359b47ae8741b913","before":"13975618c6c0795ff363dac396249589aa3a97a1","commits":[{"sha":"4997b5af0510dcbe11904f4d679feb381d0cf8a3","author":{"name":"Jenkins Docker User","email":"9acaf5e46fbf3d05de45a7843ca7090cb5245aa3@mark-pc2.markwaite.net"},"message":"Added date stamp 2021-07-20 23:59:16 on branch-1","distinct":false,"url":"https://api.github.com/repos/MarkEWaite/jenkins-bugs/commits/4997b5af0510dcbe11904f4d679feb381d0cf8a3"},{"sha":"35ebeaac621b727ce9e1ed181ff34fc0f537cbbc","author":{"name":"Jenkins Docker User","email":"9acaf5e46fbf3d05de45a7843ca7090cb5245aa3@mark-pc2.markwaite.net"},"message":"Added date stamp 2021-07-21 05:59:23 on branch-2","distinct":false,"url":"https://api.github.com/repos/MarkEWaite/jenkins-bugs/commits/35ebeaac621b727ce9e1ed181ff34fc0f537cbbc"},{"sha":"73c7a3e7a5d45de7989d60bcbdcb2dea31524b66","author":{"name":"Jenkins Docker User","email":"9acaf5e46fbf3d05de45a7843ca7090cb5245aa3@mark-pc2.markwaite.net"},"message":"jagent on JENKINS-33202, build was 35697","distinct":true,"url":"https://api.github.com/repos/MarkEWaite/jenkins-bugs/commits/73c7a3e7a5d45de7989d60bcbdcb2dea31524b66"},{"sha":"a7e50bd5f9e190ef1d81c20b359b47ae8741b913","author":{"name":"Jenkins Docker User","email":"9acaf5e46fbf3d05de45a7843ca7090cb5245aa3@mark-pc2.markwaite.net"},"message":"Merge remote-tracking branches 'origin/JENKINS-33202-x/branch-1' and 'origin/JENKINS-33202-x/branch-2' into JENKINS-33202","distinct":true,"url":"https://api.github.com/repos/MarkEWaite/jenkins-bugs/commits/a7e50bd5f9e190ef1d81c20b359b47ae8741b913"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208059","type":"PushEvent","actor":{"id":37988559,"login":"Murayu0225","display_login":"Murayu0225","gravatar_id":"","url":"https://api.github.com/users/Murayu0225","avatar_url":"https://avatars.githubusercontent.com/u/37988559?"},"repo":{"id":387998433,"name":"Murayu0225/Kanagawa-covid19-Vaccine","url":"https://api.github.com/repos/Murayu0225/Kanagawa-covid19-Vaccine"},"payload":{"push_id":7561415174,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"b9d60319341459608150ed94a96ff2f0d3360c1c","before":"c5b4532e5d9697dcdc1805d4fd94815a6d1aac03","commits":[{"sha":"b9d60319341459608150ed94a96ff2f0d3360c1c","author":{"name":"Yu Muramatsu","email":"49567a3a2f29ca52b10c138eb040792c3996b310@assistant-app.com"},"message":"Update auto-download.yml","distinct":true,"url":"https://api.github.com/repos/Murayu0225/Kanagawa-covid19-Vaccine/commits/b9d60319341459608150ed94a96ff2f0d3360c1c"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208065","type":"PushEvent","actor":{"id":17319293,"login":"peerstelter","display_login":"peerstelter","gravatar_id":"","url":"https://api.github.com/users/peerstelter","avatar_url":"https://avatars.githubusercontent.com/u/17319293?"},"repo":{"id":388010100,"name":"peerstelter/EosKit","url":"https://api.github.com/repos/peerstelter/EosKit"},"payload":{"push_id":7561415164,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"807d087dafca0d0fefd34cdcebf8468b7f2a9a7d","before":"d5f2730cbc8dbda5e72c9f4ea0749d2c27444cc4","commits":[{"sha":"807d087dafca0d0fefd34cdcebf8468b7f2a9a7d","author":{"name":"peerstelter","email":"d527b65d1787e9085549b7541b12d076c007f4d7@gmx.de"},"message":"Update Package.swift","distinct":true,"url":"https://api.github.com/repos/peerstelter/EosKit/commits/807d087dafca0d0fefd34cdcebf8468b7f2a9a7d"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208074","type":"PushEvent","actor":{"id":38429025,"login":"chuan12","display_login":"chuan12","gravatar_id":"","url":"https://api.github.com/users/chuan12","avatar_url":"https://avatars.githubusercontent.com/u/38429025?"},"repo":{"id":129750934,"name":"chuan12/shenzhouzd","url":"https://api.github.com/repos/chuan12/shenzhouzd"},"payload":{"push_id":7561415175,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"6933e29b4e4717dd6831301db2e23c12b9c23ebd","before":"3d35ff169ac76234790397a7f35cd116f9c3d75c","commits":[{"sha":"6933e29b4e4717dd6831301db2e23c12b9c23ebd","author":{"name":"chuan12","email":"355aa477360314b41707201943c676d1da11ebe9@users.noreply.github.com"},"message":"Update data.json","distinct":true,"url":"https://api.github.com/repos/chuan12/shenzhouzd/commits/6933e29b4e4717dd6831301db2e23c12b9c23ebd"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208078","type":"DeleteEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":252766607,"name":"Georges7Haddad/BubblyEverAfter","url":"https://api.github.com/repos/Georges7Haddad/BubblyEverAfter"},"payload":{"ref":"dependabot/pip/develop/pylint-2.9.3","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208079","type":"PushEvent","actor":{"id":23554983,"login":"Commando18","display_login":"Commando18","gravatar_id":"","url":"https://api.github.com/users/Commando18","avatar_url":"https://avatars.githubusercontent.com/u/23554983?"},"repo":{"id":289866099,"name":"Commando18/liferay-portal","url":"https://api.github.com/repos/Commando18/liferay-portal"},"payload":{"push_id":7561415117,"size":653,"distinct_size":653,"ref":"refs/heads/COMMERCE-6904","head":"e5cc2b55f93e95212718f66e4bc9cdd4f07cde0e","before":"0c984b636ea010da3dfe45e74f29d9e35a729e19","commits":[{"sha":"39083469641949b1b563fd4965c5aec15ae72db6","author":{"name":"Liferay Translation","email":"213530a25197c98d4bca489589ef744fc924a59b@liferay.com"},"message":"LPS-77699 Update Translations","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/39083469641949b1b563fd4965c5aec15ae72db6"},{"sha":"a2b767d8e796785adb24d63b16de5442f66b83e8","author":{"name":"Adolfo Pérez Álvarez","email":"65bd3d53a3df115ce246ecaeb98cf1c15b9cd636@liferay.com"},"message":"LPS-135773 This should check 'visibleNodes'","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/a2b767d8e796785adb24d63b16de5442f66b83e8"},{"sha":"2e00acb6d2deea7faa3b684b157f2f666286f51b","author":{"name":"Adolfo Pérez Álvarez","email":"65bd3d53a3df115ce246ecaeb98cf1c15b9cd636@liferay.com"},"message":"LPS-135773 Extract method","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/2e00acb6d2deea7faa3b684b157f2f666286f51b"},{"sha":"683bffc1c66d41c1f0e532815942f1d3a0d9211b","author":{"name":"Joyce Wang","email":"4c49c297f0472200b7228d625ded3af5abf4beb6@liferay.com"},"message":"LPS-134649 Update case to mouse over the tooltip","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/683bffc1c66d41c1f0e532815942f1d3a0d9211b"},{"sha":"f4de18047aa7cfb96c20eab41c364803725e612d","author":{"name":"Joyce Wang","email":"4c49c297f0472200b7228d625ded3af5abf4beb6@liferay.com"},"message":"LPS-135779 Update macro to login multiple IdPs","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/f4de18047aa7cfb96c20eab41c364803725e612d"},{"sha":"7b8bd422d9c0a61487218ce70595f567b7dba61c","author":{"name":"Jürgen","email":"1f9212a2f0c3daf5dd2ca663957c5636691bf24e@liferay.com"},"message":"LPS-135798 Remove dead code","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/7b8bd422d9c0a61487218ce70595f567b7dba61c"},{"sha":"4a8bb09e9a14af7698415a9ac8553df175bf9526","author":{"name":"Adolfo Pérez Álvarez","email":"65bd3d53a3df115ce246ecaeb98cf1c15b9cd636@liferay.com"},"message":"LPS-135789 Remove Xuggler UI from server admin","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/4a8bb09e9a14af7698415a9ac8553df175bf9526"},{"sha":"299145801b6caa0a450c3395777d9d5a8d355c3c","author":{"name":"Adolfo Pérez Álvarez","email":"65bd3d53a3df115ce246ecaeb98cf1c15b9cd636@liferay.com"},"message":"LPS-135789 Deprecate classes","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/299145801b6caa0a450c3395777d9d5a8d355c3c"},{"sha":"92c013657a70a376bcbb42fdcce9cf949b9b0732","author":{"name":"Adolfo Pérez Álvarez","email":"65bd3d53a3df115ce246ecaeb98cf1c15b9cd636@liferay.com"},"message":"LPS-135789 Remove lang keys","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/92c013657a70a376bcbb42fdcce9cf949b9b0732"},{"sha":"72ba4bf15069654306f6691538dcc461aadd139f","author":{"name":"Adolfo Pérez Álvarez","email":"65bd3d53a3df115ce246ecaeb98cf1c15b9cd636@liferay.com"},"message":"LPS-135789 Build lang","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/72ba4bf15069654306f6691538dcc461aadd139f"},{"sha":"02eb1c39a72f28d179b689b46954068fb9155abd","author":{"name":"Minhchau","email":"3018eee16c93484da21988ccabb0ac4ef483df08@liferay.com"},"message":"LPS-135364 Allow all standard HTML5 attributes and all styles for table elements","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/02eb1c39a72f28d179b689b46954068fb9155abd"},{"sha":"6d5855a180f20b56b5c4c0eac2404b80d6118744","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8125 Modify ASSETS_TABLE path","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/6d5855a180f20b56b5c4c0eac2404b80d6118744"},{"sha":"2afb6544ab68f0063d5635b63f62314e9f1892e3","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8125 Upgrade ACUtils macro","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/2afb6544ab68f0063d5635b63f62314e9f1892e3"},{"sha":"561833a01d8ecef4d07ae9f2bda627bc1e4e8e3c","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8125 Add ViewAllWebContentShownInAssetList testcase","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/561833a01d8ecef4d07ae9f2bda627bc1e4e8e3c"},{"sha":"92d02444a199a838ebaaf85549c5c38e5554bf2f","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8125 SF","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/92d02444a199a838ebaaf85549c5c38e5554bf2f"},{"sha":"470f47b06dbe2602f799879007e6f6dc23c8e8fc","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8130 Add viewCards macro","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/470f47b06dbe2602f799879007e6f6dc23c8e8fc"},{"sha":"b1b1d109f69c5f48c06afcf76b65142d06d1a799","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8130 Add viewActiveSwitchTab macro","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/b1b1d109f69c5f48c06afcf76b65142d06d1a799"},{"sha":"4d50bf0a21decca76ed9712a6f02b014281b8cb8","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8130 Add viewVisitorsBehaviorMetric macro","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/4d50bf0a21decca76ed9712a6f02b014281b8cb8"},{"sha":"e95ea2c821c2dfd441f97a7eca6527c72fb532b8","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8130 Update some testcases with the new macro","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/e95ea2c821c2dfd441f97a7eca6527c72fb532b8"},{"sha":"8bdd8922e06a6ae562dc2afd13e58e44ea35c75d","author":{"name":"Vinicius Lopes","email":"9f13398adbae4e290c833a82fae82279780de78c@liferay.com"},"message":"LRAC-8130 Add CanNavigateToWebContentOverviewPage testcase","distinct":true,"url":"https://api.github.com/repos/Commando18/liferay-portal/commits/8bdd8922e06a6ae562dc2afd13e58e44ea35c75d"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208082","type":"CreateEvent","actor":{"id":180613,"login":"tuxtof","display_login":"tuxtof","gravatar_id":"","url":"https://api.github.com/users/tuxtof","avatar_url":"https://avatars.githubusercontent.com/u/180613?"},"repo":{"id":246599412,"name":"nutanix/docker-machine","url":"https://api.github.com/repos/nutanix/docker-machine"},"payload":{"ref":"v3.0.0-beta5","ref_type":"tag","master_branch":"master","description":"Docker Machine driver for Nutanix AHV","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":6165865,"login":"nutanix","gravatar_id":"","url":"https://api.github.com/orgs/nutanix","avatar_url":"https://avatars.githubusercontent.com/u/6165865?"}}
+{"id":"17244208088","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561415185,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"fbe21faba3add7d6f7d6695e2e89ca505d06755e","before":"31f2d408506c0dc9c2b60b5084e9ebb508f74614","commits":[{"sha":"fbe21faba3add7d6f7d6695e2e89ca505d06755e","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/fbe21faba3add7d6f7d6695e2e89ca505d06755e"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208090","type":"PushEvent","actor":{"id":40587912,"login":"supermobiteam2","display_login":"supermobiteam2","gravatar_id":"","url":"https://api.github.com/users/supermobiteam2","avatar_url":"https://avatars.githubusercontent.com/u/40587912?"},"repo":{"id":138681984,"name":"supermobiteam2/Tizi","url":"https://api.github.com/repos/supermobiteam2/Tizi"},"payload":{"push_id":7561415183,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"57e1abccecf63a96f30fc887420186f2cb9f1b37","before":"07afbeef76f0417300a3b126097df58cce2d8496","commits":[{"sha":"57e1abccecf63a96f30fc887420186f2cb9f1b37","author":{"name":"supermobiteam2","email":"f34688687956b708ea5937840a164da02e7b6797@users.noreply.github.com"},"message":"tizi ios","distinct":true,"url":"https://api.github.com/repos/supermobiteam2/Tizi/commits/57e1abccecf63a96f30fc887420186f2cb9f1b37"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208091","type":"PushEvent","actor":{"id":38429025,"login":"chuan12","display_login":"chuan12","gravatar_id":"","url":"https://api.github.com/users/chuan12","avatar_url":"https://avatars.githubusercontent.com/u/38429025?"},"repo":{"id":386557993,"name":"chuan12/chuan12.github.io","url":"https://api.github.com/repos/chuan12/chuan12.github.io"},"payload":{"push_id":7561415180,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"537af5e40705f7a7db7609f163a26b207bb0dfcf","before":"cd590dc3ab43d949529159382e56d03a4eefffe2","commits":[{"sha":"537af5e40705f7a7db7609f163a26b207bb0dfcf","author":{"name":"chuan12","email":"355aa477360314b41707201943c676d1da11ebe9@users.noreply.github.com"},"message":"Update data.json","distinct":true,"url":"https://api.github.com/repos/chuan12/chuan12.github.io/commits/537af5e40705f7a7db7609f163a26b207bb0dfcf"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208096","type":"PushEvent","actor":{"id":22955941,"login":"Volodichev","display_login":"Volodichev","gravatar_id":"","url":"https://api.github.com/users/Volodichev","avatar_url":"https://avatars.githubusercontent.com/u/22955941?"},"repo":{"id":374556291,"name":"Volodichev/proxy-list","url":"https://api.github.com/repos/Volodichev/proxy-list"},"payload":{"push_id":7561415177,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"5a7d1169bccad9e6a184fce04ee21bc7213310d9","before":"640ddec83af1fa5dc0ebcc8cd81579040255dac5","commits":[{"sha":"5a7d1169bccad9e6a184fce04ee21bc7213310d9","author":{"name":"Alexander","email":"db02dbb7d5376400a8069895ae273c92e0d1f31d@gmail.com"},"message":"hmn keys 21.07.21 09:00:01","distinct":true,"url":"https://api.github.com/repos/Volodichev/proxy-list/commits/5a7d1169bccad9e6a184fce04ee21bc7213310d9"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208105","type":"PushEvent","actor":{"id":3379460,"login":"beanslee2012","display_login":"beanslee2012","gravatar_id":"","url":"https://api.github.com/users/beanslee2012","avatar_url":"https://avatars.githubusercontent.com/u/3379460?"},"repo":{"id":215003385,"name":"beanslee2012/games","url":"https://api.github.com/repos/beanslee2012/games"},"payload":{"push_id":7561415198,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5d245be4221b56177f0a64b28df7e8b8bc2f2692","before":"9041a835777613d91e9a7f59a74012781dcb3948","commits":[{"sha":"5d245be4221b56177f0a64b28df7e8b8bc2f2692","author":{"name":"beanslee2012","email":"9aadcc12fe6ab8c01e6245204a102e9e34317220@gmail.com"},"message":"daily update","distinct":true,"url":"https://api.github.com/repos/beanslee2012/games/commits/5d245be4221b56177f0a64b28df7e8b8bc2f2692"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208109","type":"PushEvent","actor":{"id":82322312,"login":"ifan-master","display_login":"ifan-master","gravatar_id":"","url":"https://api.github.com/users/ifan-master","avatar_url":"https://avatars.githubusercontent.com/u/82322312?"},"repo":{"id":372350393,"name":"ifan-master/ifan-master.github.io","url":"https://api.github.com/repos/ifan-master/ifan-master.github.io"},"payload":{"push_id":7561415066,"size":1,"distinct_size":1,"ref":"refs/heads/hexo","head":"314ac4dc64aa943f3806c2dd28eca054dce59366","before":"f25d95dc3f9b033a162f211b191cc72ef2528fd6","commits":[{"sha":"314ac4dc64aa943f3806c2dd28eca054dce59366","author":{"name":"ifan-master","email":"6fb0d5a9c69da8e92c5ca4c7990c1dbf272b9260@users.noreply.github.com"},"message":"Delete node_modules directory","distinct":true,"url":"https://api.github.com/repos/ifan-master/ifan-master.github.io/commits/314ac4dc64aa943f3806c2dd28eca054dce59366"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208110","type":"CreateEvent","actor":{"id":87747956,"login":"sayak58","display_login":"sayak58","gravatar_id":"","url":"https://api.github.com/users/sayak58","avatar_url":"https://avatars.githubusercontent.com/u/87747956?"},"repo":{"id":388010511,"name":"sayak58/sayak58","url":"https://api.github.com/repos/sayak58/sayak58"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":"Config files for my GitHub profile.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208116","type":"PushEvent","actor":{"id":5033193,"login":"rtx4d","display_login":"rtx4d","gravatar_id":"","url":"https://api.github.com/users/rtx4d","avatar_url":"https://avatars.githubusercontent.com/u/5033193?"},"repo":{"id":387563334,"name":"rtx4d/android_device_oneplus_oneplus9","url":"https://api.github.com/repos/rtx4d/android_device_oneplus_oneplus9"},"payload":{"push_id":7561415190,"size":1,"distinct_size":1,"ref":"refs/heads/ruby","head":"a200b9c016e1ae9412846a5bd8a70d16e899e328","before":"25f911fa703a8543c02c2f726e2f6691f980fd9a","commits":[{"sha":"a200b9c016e1ae9412846a5bd8a70d16e899e328","author":{"name":"Łukasz Patron","email":"6c9bff5473b68c1565a176ad458785864409abaa@gmail.com"},"message":"op9: sepolicy: Write PowerShare policy","distinct":true,"url":"https://api.github.com/repos/rtx4d/android_device_oneplus_oneplus9/commits/a200b9c016e1ae9412846a5bd8a70d16e899e328"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208117","type":"CreateEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":183236577,"name":"BlueBaseJS/plugin-native-web-swiper","url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper"},"payload":{"ref":"dependabot/npm_and_yarn/babel/cli-7.14.8","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":44442180,"login":"BlueBaseJS","gravatar_id":"","url":"https://api.github.com/orgs/BlueBaseJS","avatar_url":"https://avatars.githubusercontent.com/u/44442180?"}}
+{"id":"17244208121","type":"PushEvent","actor":{"id":6924409,"login":"cg1101","display_login":"cg1101","gravatar_id":"","url":"https://api.github.com/users/cg1101","avatar_url":"https://avatars.githubusercontent.com/u/6924409?"},"repo":{"id":157529668,"name":"f-club/my-angular-app","url":"https://api.github.com/repos/f-club/my-angular-app"},"payload":{"push_id":7561415201,"size":2,"distinct_size":1,"ref":"refs/heads/master","head":"02a705eebb49f91fab457ba053d73c9362739a16","before":"ee3ab69f81ea6737ed91c3b2ab2834798e52000f","commits":[{"sha":"1b6c31899f2c70ab4e1fca761d93b9cb034cbaf2","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump @angular/common from 12.1.1 to 12.1.2\n\nBumps [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) from 12.1.1 to 12.1.2.\n- [Release notes](https://github.com/angular/angular/releases)\n- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)\n- [Commits](https://github.com/angular/angular/commits/12.1.2/packages/common)\n\n---\nupdated-dependencies:\n- dependency-name: \"@angular/common\"\n  dependency-type: direct:production\n  update-type: version-update:semver-patch\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":false,"url":"https://api.github.com/repos/f-club/my-angular-app/commits/1b6c31899f2c70ab4e1fca761d93b9cb034cbaf2"},{"sha":"02a705eebb49f91fab457ba053d73c9362739a16","author":{"name":"cg1101","email":"e872fbfcf937194499ec2854e712a6b3cc3570f5@gmail.com"},"message":"Merge pull request #189 from f-club/dependabot/npm_and_yarn/angular/common-12.1.2\n\nBump @angular/common from 12.1.1 to 12.1.2","distinct":true,"url":"https://api.github.com/repos/f-club/my-angular-app/commits/02a705eebb49f91fab457ba053d73c9362739a16"}]},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":83454129,"login":"f-club","gravatar_id":"","url":"https://api.github.com/orgs/f-club","avatar_url":"https://avatars.githubusercontent.com/u/83454129?"}}
+{"id":"17244208142","type":"PushEvent","actor":{"id":80881229,"login":"ItsMeVishal007","display_login":"ItsMeVishal007","gravatar_id":"","url":"https://api.github.com/users/ItsMeVishal007","avatar_url":"https://avatars.githubusercontent.com/u/80881229?"},"repo":{"id":373055818,"name":"ItsMeVishal007/Share-Site","url":"https://api.github.com/repos/ItsMeVishal007/Share-Site"},"payload":{"push_id":7561415208,"size":2,"distinct_size":1,"ref":"refs/heads/master","head":"cd138585cef701abc91e63a31e1462b367f4ac70","before":"4466e60114723817ab2624226d2e99f49c36378b","commits":[{"sha":"ea2894db8c72dae243f5e7532b71375ac13ddcbd","author":{"name":"Cd-Vishal007","email":"0e130d04afb61092e8b8a1fe644f5ec0d0e0b09b@gmail.com"},"message":"established relationship between user and place","distinct":false,"url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/commits/ea2894db8c72dae243f5e7532b71375ac13ddcbd"},{"sha":"cd138585cef701abc91e63a31e1462b367f4ac70","author":{"name":"Vishal kumar","email":"baa2cf5bdc227d95286c48ea254c811c15ffd8c0@users.noreply.github.com"},"message":"Merge pull request #29 from ItsMeVishal007/feat/cyber-dev\n\nestablished relationship between user and place","distinct":true,"url":"https://api.github.com/repos/ItsMeVishal007/Share-Site/commits/cd138585cef701abc91e63a31e1462b367f4ac70"}]},"public":true,"created_at":"2021-07-21T06:00:05Z"}
+{"id":"17244208155","type":"PushEvent","actor":{"id":59435267,"login":"albertoabellagarcia","display_login":"albertoabellagarcia","gravatar_id":"","url":"https://api.github.com/users/albertoabellagarcia","avatar_url":"https://avatars.githubusercontent.com/u/59435267?"},"repo":{"id":190601053,"name":"smart-data-models/dataModel.PointOfInterest","url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest"},"payload":{"push_id":7561415210,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8dc8ab81028aa735144fccfa270c01ecb624055b","before":"8b36851baaaa34afb5837f5ef1bfcbef9d0ca469","commits":[{"sha":"8dc8ab81028aa735144fccfa270c01ecb624055b","author":{"name":"Alberto Abella","email":"4641006ed1a70ab96eea2556876687c02238d7d2@fiware.org"},"message":"updated on the 2021-07-21 08:00:04.445252","distinct":true,"url":"https://api.github.com/repos/smart-data-models/dataModel.PointOfInterest/commits/8dc8ab81028aa735144fccfa270c01ecb624055b"}]},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":44724489,"login":"smart-data-models","gravatar_id":"","url":"https://api.github.com/orgs/smart-data-models","avatar_url":"https://avatars.githubusercontent.com/u/44724489?"}}
+{"id":"17244208163","type":"PullRequestReviewEvent","actor":{"id":26274310,"login":"bucherarnold","display_login":"bucherarnold","gravatar_id":"","url":"https://api.github.com/users/bucherarnold","avatar_url":"https://avatars.githubusercontent.com/u/26274310?"},"repo":{"id":293791520,"name":"i-Cell-Mobilsoft-Open-Source/roaster","url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster"},"payload":{"action":"created","review":{"id":711282688,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMjgyNjg4","user":{"login":"bucherarnold","id":26274310,"node_id":"MDQ6VXNlcjI2Mjc0MzEw","avatar_url":"https://avatars.githubusercontent.com/u/26274310?v=4","gravatar_id":"","url":"https://api.github.com/users/bucherarnold","html_url":"https://github.com/bucherarnold","followers_url":"https://api.github.com/users/bucherarnold/followers","following_url":"https://api.github.com/users/bucherarnold/following{/other_user}","gists_url":"https://api.github.com/users/bucherarnold/gists{/gist_id}","starred_url":"https://api.github.com/users/bucherarnold/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bucherarnold/subscriptions","organizations_url":"https://api.github.com/users/bucherarnold/orgs","repos_url":"https://api.github.com/users/bucherarnold/repos","events_url":"https://api.github.com/users/bucherarnold/events{/privacy}","received_events_url":"https://api.github.com/users/bucherarnold/received_events","type":"User","site_admin":false},"body":"","commit_id":"0eed8e69fac1746ef7c4cbdc9d320393d2eb9caf","submitted_at":"2021-07-21T06:00:05Z","state":"approved","html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster/pull/39#pullrequestreview-711282688","pull_request_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39","author_association":"NONE","_links":{"html":{"href":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster/pull/39#pullrequestreview-711282688"},"pull_request":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39"}}},"pull_request":{"url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39","id":693488670,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDg4Njcw","html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster/pull/39","diff_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster/pull/39.diff","patch_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster/pull/39.patch","issue_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/39","number":39,"state":"open","locked":false,"title":"Bugfix/37 fix noclassdeffounderror from coffee ","user":{"login":"rombow","id":5195827,"node_id":"MDQ6VXNlcjUxOTU4Mjc=","avatar_url":"https://avatars.githubusercontent.com/u/5195827?v=4","gravatar_id":"","url":"https://api.github.com/users/rombow","html_url":"https://github.com/rombow","followers_url":"https://api.github.com/users/rombow/followers","following_url":"https://api.github.com/users/rombow/following{/other_user}","gists_url":"https://api.github.com/users/rombow/gists{/gist_id}","starred_url":"https://api.github.com/users/rombow/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rombow/subscriptions","organizations_url":"https://api.github.com/users/rombow/orgs","repos_url":"https://api.github.com/users/rombow/repos","events_url":"https://api.github.com/users/rombow/events{/privacy}","received_events_url":"https://api.github.com/users/rombow/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T13:55:42Z","updated_at":"2021-07-21T06:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bf78aaea90a1ccd5d2efb2a62af3793e389849d6","assignee":null,"assignees":[],"requested_reviewers":[{"login":"petrenyi-mark","id":46930755,"node_id":"MDQ6VXNlcjQ2OTMwNzU1","avatar_url":"https://avatars.githubusercontent.com/u/46930755?v=4","gravatar_id":"","url":"https://api.github.com/users/petrenyi-mark","html_url":"https://github.com/petrenyi-mark","followers_url":"https://api.github.com/users/petrenyi-mark/followers","following_url":"https://api.github.com/users/petrenyi-mark/following{/other_user}","gists_url":"https://api.github.com/users/petrenyi-mark/gists{/gist_id}","starred_url":"https://api.github.com/users/petrenyi-mark/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petrenyi-mark/subscriptions","organizations_url":"https://api.github.com/users/petrenyi-mark/orgs","repos_url":"https://api.github.com/users/petrenyi-mark/repos","events_url":"https://api.github.com/users/petrenyi-mark/events{/privacy}","received_events_url":"https://api.github.com/users/petrenyi-mark/received_events","type":"User","site_admin":false},{"login":"vasizs","id":63969139,"node_id":"MDQ6VXNlcjYzOTY5MTM5","avatar_url":"https://avatars.githubusercontent.com/u/63969139?v=4","gravatar_id":"","url":"https://api.github.com/users/vasizs","html_url":"https://github.com/vasizs","followers_url":"https://api.github.com/users/vasizs/followers","following_url":"https://api.github.com/users/vasizs/following{/other_user}","gists_url":"https://api.github.com/users/vasizs/gists{/gist_id}","starred_url":"https://api.github.com/users/vasizs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vasizs/subscriptions","organizations_url":"https://api.github.com/users/vasizs/orgs","repos_url":"https://api.github.com/users/vasizs/repos","events_url":"https://api.github.com/users/vasizs/events{/privacy}","received_events_url":"https://api.github.com/users/vasizs/received_events","type":"User","site_admin":false},{"login":"balazsbakos","id":64023218,"node_id":"MDQ6VXNlcjY0MDIzMjE4","avatar_url":"https://avatars.githubusercontent.com/u/64023218?v=4","gravatar_id":"","url":"https://api.github.com/users/balazsbakos","html_url":"https://github.com/balazsbakos","followers_url":"https://api.github.com/users/balazsbakos/followers","following_url":"https://api.github.com/users/balazsbakos/following{/other_user}","gists_url":"https://api.github.com/users/balazsbakos/gists{/gist_id}","starred_url":"https://api.github.com/users/balazsbakos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/balazsbakos/subscriptions","organizations_url":"https://api.github.com/users/balazsbakos/orgs","repos_url":"https://api.github.com/users/balazsbakos/repos","events_url":"https://api.github.com/users/balazsbakos/events{/privacy}","received_events_url":"https://api.github.com/users/balazsbakos/received_events","type":"User","site_admin":false},{"login":"csabasuli","id":64023961,"node_id":"MDQ6VXNlcjY0MDIzOTYx","avatar_url":"https://avatars.githubusercontent.com/u/64023961?v=4","gravatar_id":"","url":"https://api.github.com/users/csabasuli","html_url":"https://github.com/csabasuli","followers_url":"https://api.github.com/users/csabasuli/followers","following_url":"https://api.github.com/users/csabasuli/following{/other_user}","gists_url":"https://api.github.com/users/csabasuli/gists{/gist_id}","starred_url":"https://api.github.com/users/csabasuli/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/csabasuli/subscriptions","organizations_url":"https://api.github.com/users/csabasuli/orgs","repos_url":"https://api.github.com/users/csabasuli/repos","events_url":"https://api.github.com/users/csabasuli/events{/privacy}","received_events_url":"https://api.github.com/users/csabasuli/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39/commits","review_comments_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39/comments","review_comment_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/comments{/number}","comments_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/39/comments","statuses_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/statuses/0eed8e69fac1746ef7c4cbdc9d320393d2eb9caf","head":{"label":"i-Cell-Mobilsoft-Open-Source:bugfix/37-fix-noclassdeffounderror-from-coffee-","ref":"bugfix/37-fix-noclassdeffounderror-from-coffee-","sha":"0eed8e69fac1746ef7c4cbdc9d320393d2eb9caf","user":{"login":"i-Cell-Mobilsoft-Open-Source","id":63906642,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYzOTA2NjQy","avatar_url":"https://avatars.githubusercontent.com/u/63906642?v=4","gravatar_id":"","url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source","html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source","followers_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/followers","following_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/following{/other_user}","gists_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/gists{/gist_id}","starred_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/subscriptions","organizations_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/orgs","repos_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/repos","events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/events{/privacy}","received_events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/received_events","type":"Organization","site_admin":false},"repo":{"id":293791520,"node_id":"MDEwOlJlcG9zaXRvcnkyOTM3OTE1MjA=","name":"roaster","full_name":"i-Cell-Mobilsoft-Open-Source/roaster","private":false,"owner":{"login":"i-Cell-Mobilsoft-Open-Source","id":63906642,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYzOTA2NjQy","avatar_url":"https://avatars.githubusercontent.com/u/63906642?v=4","gravatar_id":"","url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source","html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source","followers_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/followers","following_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/following{/other_user}","gists_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/gists{/gist_id}","starred_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/subscriptions","organizations_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/orgs","repos_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/repos","events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/events{/privacy}","received_events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster","description":"Developer and Intergration test framework based on coff:ee","fork":false,"url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster","forks_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/forks","keys_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/keys{/key_id}","collaborators_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/teams","hooks_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/hooks","issue_events_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/events{/number}","events_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/events","assignees_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/assignees{/user}","branches_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/branches{/branch}","tags_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/tags","blobs_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/refs{/sha}","trees_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/trees{/sha}","statuses_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/statuses/{sha}","languages_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/languages","stargazers_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/stargazers","contributors_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/contributors","subscribers_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/subscribers","subscription_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/subscription","commits_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/commits{/sha}","git_commits_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/commits{/sha}","comments_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/comments{/number}","issue_comment_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/comments{/number}","contents_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/contents/{+path}","compare_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/compare/{base}...{head}","merges_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/merges","archive_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/downloads","issues_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues{/number}","pulls_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls{/number}","milestones_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/milestones{/number}","notifications_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/labels{/name}","releases_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/releases{/id}","deployments_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/deployments","created_at":"2020-09-08T11:36:43Z","updated_at":"2021-07-19T11:17:35Z","pushed_at":"2021-07-20T14:01:41Z","git_url":"git://github.com/i-Cell-Mobilsoft-Open-Source/roaster.git","ssh_url":"git@github.com:i-Cell-Mobilsoft-Open-Source/roaster.git","clone_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster.git","svn_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster","homepage":"https://i-cell-mobilsoft-open-source.github.io/roaster/","size":471,"stargazers_count":7,"watchers_count":7,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":3,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":3,"open_issues":6,"watchers":7,"default_branch":"master"}},"base":{"label":"i-Cell-Mobilsoft-Open-Source:master","ref":"master","sha":"b08154d2688dbbb29b7bcefbf81c49e55b203887","user":{"login":"i-Cell-Mobilsoft-Open-Source","id":63906642,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYzOTA2NjQy","avatar_url":"https://avatars.githubusercontent.com/u/63906642?v=4","gravatar_id":"","url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source","html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source","followers_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/followers","following_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/following{/other_user}","gists_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/gists{/gist_id}","starred_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/subscriptions","organizations_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/orgs","repos_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/repos","events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/events{/privacy}","received_events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/received_events","type":"Organization","site_admin":false},"repo":{"id":293791520,"node_id":"MDEwOlJlcG9zaXRvcnkyOTM3OTE1MjA=","name":"roaster","full_name":"i-Cell-Mobilsoft-Open-Source/roaster","private":false,"owner":{"login":"i-Cell-Mobilsoft-Open-Source","id":63906642,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYzOTA2NjQy","avatar_url":"https://avatars.githubusercontent.com/u/63906642?v=4","gravatar_id":"","url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source","html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source","followers_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/followers","following_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/following{/other_user}","gists_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/gists{/gist_id}","starred_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/subscriptions","organizations_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/orgs","repos_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/repos","events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/events{/privacy}","received_events_url":"https://api.github.com/users/i-Cell-Mobilsoft-Open-Source/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster","description":"Developer and Intergration test framework based on coff:ee","fork":false,"url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster","forks_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/forks","keys_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/keys{/key_id}","collaborators_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/teams","hooks_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/hooks","issue_events_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/events{/number}","events_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/events","assignees_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/assignees{/user}","branches_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/branches{/branch}","tags_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/tags","blobs_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/refs{/sha}","trees_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/trees{/sha}","statuses_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/statuses/{sha}","languages_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/languages","stargazers_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/stargazers","contributors_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/contributors","subscribers_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/subscribers","subscription_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/subscription","commits_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/commits{/sha}","git_commits_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/git/commits{/sha}","comments_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/comments{/number}","issue_comment_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/comments{/number}","contents_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/contents/{+path}","compare_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/compare/{base}...{head}","merges_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/merges","archive_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/downloads","issues_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues{/number}","pulls_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls{/number}","milestones_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/milestones{/number}","notifications_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/labels{/name}","releases_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/releases{/id}","deployments_url":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/deployments","created_at":"2020-09-08T11:36:43Z","updated_at":"2021-07-19T11:17:35Z","pushed_at":"2021-07-20T14:01:41Z","git_url":"git://github.com/i-Cell-Mobilsoft-Open-Source/roaster.git","ssh_url":"git@github.com:i-Cell-Mobilsoft-Open-Source/roaster.git","clone_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster.git","svn_url":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster","homepage":"https://i-cell-mobilsoft-open-source.github.io/roaster/","size":471,"stargazers_count":7,"watchers_count":7,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":3,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":3,"open_issues":6,"watchers":7,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39"},"html":{"href":"https://github.com/i-Cell-Mobilsoft-Open-Source/roaster/pull/39"},"issue":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/39"},"comments":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/issues/39/comments"},"review_comments":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39/comments"},"review_comment":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/pulls/39/commits"},"statuses":{"href":"https://api.github.com/repos/i-Cell-Mobilsoft-Open-Source/roaster/statuses/0eed8e69fac1746ef7c4cbdc9d320393d2eb9caf"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":63906642,"login":"i-Cell-Mobilsoft-Open-Source","gravatar_id":"","url":"https://api.github.com/orgs/i-Cell-Mobilsoft-Open-Source","avatar_url":"https://avatars.githubusercontent.com/u/63906642?"}}
+{"id":"17244208166","type":"PullRequestEvent","actor":{"id":58432773,"login":"hakumizuki","display_login":"hakumizuki","gravatar_id":"","url":"https://api.github.com/users/hakumizuki","avatar_url":"https://avatars.githubusercontent.com/u/58432773?"},"repo":{"id":82206054,"name":"weseek/growi","url":"https://api.github.com/repos/weseek/growi"},"payload":{"action":"opened","number":4051,"pull_request":{"url":"https://api.github.com/repos/weseek/growi/pulls/4051","id":694073982,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTgy","html_url":"https://github.com/weseek/growi/pull/4051","diff_url":"https://github.com/weseek/growi/pull/4051.diff","patch_url":"https://github.com/weseek/growi/pull/4051.patch","issue_url":"https://api.github.com/repos/weseek/growi/issues/4051","number":4051,"state":"open","locked":false,"title":"Imprv/gw 5883 error handling using http errors","user":{"login":"hakumizuki","id":58432773,"node_id":"MDQ6VXNlcjU4NDMyNzcz","avatar_url":"https://avatars.githubusercontent.com/u/58432773?v=4","gravatar_id":"","url":"https://api.github.com/users/hakumizuki","html_url":"https://github.com/hakumizuki","followers_url":"https://api.github.com/users/hakumizuki/followers","following_url":"https://api.github.com/users/hakumizuki/following{/other_user}","gists_url":"https://api.github.com/users/hakumizuki/gists{/gist_id}","starred_url":"https://api.github.com/users/hakumizuki/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hakumizuki/subscriptions","organizations_url":"https://api.github.com/users/hakumizuki/orgs","repos_url":"https://api.github.com/users/hakumizuki/repos","events_url":"https://api.github.com/users/hakumizuki/events{/privacy}","received_events_url":"https://api.github.com/users/hakumizuki/received_events","type":"User","site_admin":false},"body":"GW-6738 Review&Merge(5883)\r\nGW-5883 エラーハンドリングの改善\r\n\r\nのマージです。動作確認済みです。","created_at":"2021-07-21T06:00:05Z","updated_at":"2021-07-21T06:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/weseek/growi/pulls/4051/commits","review_comments_url":"https://api.github.com/repos/weseek/growi/pulls/4051/comments","review_comment_url":"https://api.github.com/repos/weseek/growi/pulls/comments{/number}","comments_url":"https://api.github.com/repos/weseek/growi/issues/4051/comments","statuses_url":"https://api.github.com/repos/weseek/growi/statuses/5f92e03b39d16c57ae5657b0fa9e1b246281c2a2","head":{"label":"weseek:imprv/GW-5883-error-handling-using-http-errors","ref":"imprv/GW-5883-error-handling-using-http-errors","sha":"5f92e03b39d16c57ae5657b0fa9e1b246281c2a2","user":{"login":"weseek","id":6468105,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY0NjgxMDU=","avatar_url":"https://avatars.githubusercontent.com/u/6468105?v=4","gravatar_id":"","url":"https://api.github.com/users/weseek","html_url":"https://github.com/weseek","followers_url":"https://api.github.com/users/weseek/followers","following_url":"https://api.github.com/users/weseek/following{/other_user}","gists_url":"https://api.github.com/users/weseek/gists{/gist_id}","starred_url":"https://api.github.com/users/weseek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/weseek/subscriptions","organizations_url":"https://api.github.com/users/weseek/orgs","repos_url":"https://api.github.com/users/weseek/repos","events_url":"https://api.github.com/users/weseek/events{/privacy}","received_events_url":"https://api.github.com/users/weseek/received_events","type":"Organization","site_admin":false},"repo":{"id":82206054,"node_id":"MDEwOlJlcG9zaXRvcnk4MjIwNjA1NA==","name":"growi","full_name":"weseek/growi","private":false,"owner":{"login":"weseek","id":6468105,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY0NjgxMDU=","avatar_url":"https://avatars.githubusercontent.com/u/6468105?v=4","gravatar_id":"","url":"https://api.github.com/users/weseek","html_url":"https://github.com/weseek","followers_url":"https://api.github.com/users/weseek/followers","following_url":"https://api.github.com/users/weseek/following{/other_user}","gists_url":"https://api.github.com/users/weseek/gists{/gist_id}","starred_url":"https://api.github.com/users/weseek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/weseek/subscriptions","organizations_url":"https://api.github.com/users/weseek/orgs","repos_url":"https://api.github.com/users/weseek/repos","events_url":"https://api.github.com/users/weseek/events{/privacy}","received_events_url":"https://api.github.com/users/weseek/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/weseek/growi","description":":anchor: GROWI - Team collaboration software using markdown","fork":false,"url":"https://api.github.com/repos/weseek/growi","forks_url":"https://api.github.com/repos/weseek/growi/forks","keys_url":"https://api.github.com/repos/weseek/growi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/weseek/growi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/weseek/growi/teams","hooks_url":"https://api.github.com/repos/weseek/growi/hooks","issue_events_url":"https://api.github.com/repos/weseek/growi/issues/events{/number}","events_url":"https://api.github.com/repos/weseek/growi/events","assignees_url":"https://api.github.com/repos/weseek/growi/assignees{/user}","branches_url":"https://api.github.com/repos/weseek/growi/branches{/branch}","tags_url":"https://api.github.com/repos/weseek/growi/tags","blobs_url":"https://api.github.com/repos/weseek/growi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/weseek/growi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/weseek/growi/git/refs{/sha}","trees_url":"https://api.github.com/repos/weseek/growi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/weseek/growi/statuses/{sha}","languages_url":"https://api.github.com/repos/weseek/growi/languages","stargazers_url":"https://api.github.com/repos/weseek/growi/stargazers","contributors_url":"https://api.github.com/repos/weseek/growi/contributors","subscribers_url":"https://api.github.com/repos/weseek/growi/subscribers","subscription_url":"https://api.github.com/repos/weseek/growi/subscription","commits_url":"https://api.github.com/repos/weseek/growi/commits{/sha}","git_commits_url":"https://api.github.com/repos/weseek/growi/git/commits{/sha}","comments_url":"https://api.github.com/repos/weseek/growi/comments{/number}","issue_comment_url":"https://api.github.com/repos/weseek/growi/issues/comments{/number}","contents_url":"https://api.github.com/repos/weseek/growi/contents/{+path}","compare_url":"https://api.github.com/repos/weseek/growi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/weseek/growi/merges","archive_url":"https://api.github.com/repos/weseek/growi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/weseek/growi/downloads","issues_url":"https://api.github.com/repos/weseek/growi/issues{/number}","pulls_url":"https://api.github.com/repos/weseek/growi/pulls{/number}","milestones_url":"https://api.github.com/repos/weseek/growi/milestones{/number}","notifications_url":"https://api.github.com/repos/weseek/growi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/weseek/growi/labels{/name}","releases_url":"https://api.github.com/repos/weseek/growi/releases{/id}","deployments_url":"https://api.github.com/repos/weseek/growi/deployments","created_at":"2017-02-16T17:15:47Z","updated_at":"2021-07-21T04:02:55Z","pushed_at":"2021-07-21T05:38:26Z","git_url":"git://github.com/weseek/growi.git","ssh_url":"git@github.com:weseek/growi.git","clone_url":"https://github.com/weseek/growi.git","svn_url":"https://github.com/weseek/growi","homepage":"https://growi.org","size":58035,"stargazers_count":905,"watchers_count":905,"language":"JavaScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":185,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":81,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":185,"open_issues":81,"watchers":905,"default_branch":"master"}},"base":{"label":"weseek:master","ref":"master","sha":"22d7937681adcf542910fe6510011ed5f7783e43","user":{"login":"weseek","id":6468105,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY0NjgxMDU=","avatar_url":"https://avatars.githubusercontent.com/u/6468105?v=4","gravatar_id":"","url":"https://api.github.com/users/weseek","html_url":"https://github.com/weseek","followers_url":"https://api.github.com/users/weseek/followers","following_url":"https://api.github.com/users/weseek/following{/other_user}","gists_url":"https://api.github.com/users/weseek/gists{/gist_id}","starred_url":"https://api.github.com/users/weseek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/weseek/subscriptions","organizations_url":"https://api.github.com/users/weseek/orgs","repos_url":"https://api.github.com/users/weseek/repos","events_url":"https://api.github.com/users/weseek/events{/privacy}","received_events_url":"https://api.github.com/users/weseek/received_events","type":"Organization","site_admin":false},"repo":{"id":82206054,"node_id":"MDEwOlJlcG9zaXRvcnk4MjIwNjA1NA==","name":"growi","full_name":"weseek/growi","private":false,"owner":{"login":"weseek","id":6468105,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY0NjgxMDU=","avatar_url":"https://avatars.githubusercontent.com/u/6468105?v=4","gravatar_id":"","url":"https://api.github.com/users/weseek","html_url":"https://github.com/weseek","followers_url":"https://api.github.com/users/weseek/followers","following_url":"https://api.github.com/users/weseek/following{/other_user}","gists_url":"https://api.github.com/users/weseek/gists{/gist_id}","starred_url":"https://api.github.com/users/weseek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/weseek/subscriptions","organizations_url":"https://api.github.com/users/weseek/orgs","repos_url":"https://api.github.com/users/weseek/repos","events_url":"https://api.github.com/users/weseek/events{/privacy}","received_events_url":"https://api.github.com/users/weseek/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/weseek/growi","description":":anchor: GROWI - Team collaboration software using markdown","fork":false,"url":"https://api.github.com/repos/weseek/growi","forks_url":"https://api.github.com/repos/weseek/growi/forks","keys_url":"https://api.github.com/repos/weseek/growi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/weseek/growi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/weseek/growi/teams","hooks_url":"https://api.github.com/repos/weseek/growi/hooks","issue_events_url":"https://api.github.com/repos/weseek/growi/issues/events{/number}","events_url":"https://api.github.com/repos/weseek/growi/events","assignees_url":"https://api.github.com/repos/weseek/growi/assignees{/user}","branches_url":"https://api.github.com/repos/weseek/growi/branches{/branch}","tags_url":"https://api.github.com/repos/weseek/growi/tags","blobs_url":"https://api.github.com/repos/weseek/growi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/weseek/growi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/weseek/growi/git/refs{/sha}","trees_url":"https://api.github.com/repos/weseek/growi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/weseek/growi/statuses/{sha}","languages_url":"https://api.github.com/repos/weseek/growi/languages","stargazers_url":"https://api.github.com/repos/weseek/growi/stargazers","contributors_url":"https://api.github.com/repos/weseek/growi/contributors","subscribers_url":"https://api.github.com/repos/weseek/growi/subscribers","subscription_url":"https://api.github.com/repos/weseek/growi/subscription","commits_url":"https://api.github.com/repos/weseek/growi/commits{/sha}","git_commits_url":"https://api.github.com/repos/weseek/growi/git/commits{/sha}","comments_url":"https://api.github.com/repos/weseek/growi/comments{/number}","issue_comment_url":"https://api.github.com/repos/weseek/growi/issues/comments{/number}","contents_url":"https://api.github.com/repos/weseek/growi/contents/{+path}","compare_url":"https://api.github.com/repos/weseek/growi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/weseek/growi/merges","archive_url":"https://api.github.com/repos/weseek/growi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/weseek/growi/downloads","issues_url":"https://api.github.com/repos/weseek/growi/issues{/number}","pulls_url":"https://api.github.com/repos/weseek/growi/pulls{/number}","milestones_url":"https://api.github.com/repos/weseek/growi/milestones{/number}","notifications_url":"https://api.github.com/repos/weseek/growi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/weseek/growi/labels{/name}","releases_url":"https://api.github.com/repos/weseek/growi/releases{/id}","deployments_url":"https://api.github.com/repos/weseek/growi/deployments","created_at":"2017-02-16T17:15:47Z","updated_at":"2021-07-21T04:02:55Z","pushed_at":"2021-07-21T05:38:26Z","git_url":"git://github.com/weseek/growi.git","ssh_url":"git@github.com:weseek/growi.git","clone_url":"https://github.com/weseek/growi.git","svn_url":"https://github.com/weseek/growi","homepage":"https://growi.org","size":58035,"stargazers_count":905,"watchers_count":905,"language":"JavaScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":185,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":81,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":185,"open_issues":81,"watchers":905,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/weseek/growi/pulls/4051"},"html":{"href":"https://github.com/weseek/growi/pull/4051"},"issue":{"href":"https://api.github.com/repos/weseek/growi/issues/4051"},"comments":{"href":"https://api.github.com/repos/weseek/growi/issues/4051/comments"},"review_comments":{"href":"https://api.github.com/repos/weseek/growi/pulls/4051/comments"},"review_comment":{"href":"https://api.github.com/repos/weseek/growi/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/weseek/growi/pulls/4051/commits"},"statuses":{"href":"https://api.github.com/repos/weseek/growi/statuses/5f92e03b39d16c57ae5657b0fa9e1b246281c2a2"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":16,"additions":150,"deletions":15,"changed_files":15}},"public":true,"created_at":"2021-07-21T06:00:05Z","org":{"id":6468105,"login":"weseek","gravatar_id":"","url":"https://api.github.com/orgs/weseek","avatar_url":"https://avatars.githubusercontent.com/u/6468105?"}}
+{"id":"17244208178","type":"PullRequestEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":183236577,"name":"BlueBaseJS/plugin-native-web-swiper","url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper"},"payload":{"action":"opened","number":248,"pull_request":{"url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/248","id":694073981,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTgx","html_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper/pull/248","diff_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper/pull/248.diff","patch_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper/pull/248.patch","issue_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/248","number":248,"state":"open","locked":false,"title":"build(deps-dev): bump @babel/cli from 7.4.3 to 7.14.8","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [@babel/cli](https://github.com/babel/babel/tree/HEAD/packages/babel-cli) from 7.4.3 to 7.14.8.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/babel/babel/releases\"><code>@​babel/cli</code>'s releases</a>.</em></p>\n<blockquote>\n<h2>v7.14.8 (2021-07-20)</h2>\n<p>Thanks <a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>, <a href=\"https://github.com/jaeseokk\"><code>@​jaeseokk</code></a> and <a href=\"https://github.com/nme077\"><code>@​nme077</code></a> for your first PRs!</p>\n<h4>:eyeglasses: Spec Compliance</h4>\n<ul>\n<li><code>babel-helper-create-class-features-plugin</code>, <code>babel-plugin-proposal-class-static-block</code>, <code>babel-plugin-transform-new-target</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13560\">#13560</a> fix(class-properties): replace <code>new.target</code> in static properties with <code>undefined</code> (<a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-parser</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13088\">#13088</a> Fix await binding error within static block (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13531\">#13531</a> fix: disallow computed <code>async</code>/<code>get</code>/<code>set</code> keyword (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-helper-module-transforms</code>, <code>babel-helper-simple-access</code>, <code>babel-plugin-transform-modules-commonjs</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13258\">#13258</a> Fix const violations in ESM imports when transformed to CJS (<a href=\"https://github.com/overlookmotel\"><code>@​overlookmotel</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:bug: Bug Fix</h4>\n<ul>\n<li><code>babel-parser</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13575\">#13575</a> Update babel-parser.d.ts (<a href=\"https://github.com/sosukesuzuki\"><code>@​sosukesuzuki</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13548\">#13548</a> Fix  parser <code>strictMode</code> option (<a href=\"https://github.com/overlookmotel\"><code>@​overlookmotel</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13573\">#13573</a> Fix issue to allow module block in member expression (<a href=\"https://github.com/nme077\"><code>@​nme077</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13521\">#13521</a> Overhaul comment attachment (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13534\">#13534</a> Async do expression should start at async (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-plugin-transform-arrow-functions</code>, <code>babel-traverse</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/12344\">#12344</a> Fix arrow transformation when <code>arguments</code> is defined as variable (<a href=\"https://github.com/snitin315\"><code>@​snitin315</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-traverse</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13527\">#13527</a> fix: accept duplicated import/variable in different module (<a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-types</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13525\">#13525</a> fix(babel-types): accept <code>UnaryExpression</code> in <code>TSLiteralType</code> (<a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13500\">#13500</a> Add typeParameters to tagged template visitor keys (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:nail_care: Polish</h4>\n<ul>\n<li><code>babel-core</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13515\">#13515</a> Fix config validation message typo (<a href=\"https://github.com/jaeseokk\"><code>@​jaeseokk</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-cli</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13508\">#13508</a> fix: sync default_extensions to babel-cli usage (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:memo: Documentation</h4>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13562\">#13562</a> Fix <code>make generate-standalone</code> -&gt; <code>make build-standalone</code> (<a href=\"https://github.com/sosukesuzuki\"><code>@​sosukesuzuki</code></a>)</li>\n</ul>\n<h4>:house: Internal</h4>\n<ul>\n<li><code>babel-helpers</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13522\">#13522</a> minor improvement to gulp generate-runtime-helpers error message (<a href=\"https://github.com/lightmare\"><code>@​lightmare</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:running_woman: Performance</h4>\n<ul>\n<li><code>babel-parser</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13521\">#13521</a> Overhaul comment attachment (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>Committers: 12</h4>\n<ul>\n<li>Babel Bot (<a href=\"https://github.com/babel-bot\"><code>@​babel-bot</code></a>)</li>\n<li>Bogdan Savluk (<a href=\"https://github.com/zxbodya\"><code>@​zxbodya</code></a>)</li>\n<li>Federico Ciardi (<a href=\"https://github.com/fedeci\"><code>@​fedeci</code></a>)</li>\n<li>Huáng Jùnliàng (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Changelog</summary>\n<p><em>Sourced from <a href=\"https://github.com/babel/babel/blob/main/CHANGELOG.md\"><code>@​babel/cli</code>'s changelog</a>.</em></p>\n<blockquote>\n<h2>v7.14.8 (2021-07-20)</h2>\n<h4>:eyeglasses: Spec Compliance</h4>\n<ul>\n<li><code>babel-helper-create-class-features-plugin</code>, <code>babel-plugin-proposal-class-static-block</code>, <code>babel-plugin-transform-new-target</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13560\">#13560</a> fix(class-properties): replace <code>new.target</code> in static properties with <code>undefined</code> (<a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-parser</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13088\">#13088</a> Fix await binding error within static block (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13531\">#13531</a> fix: disallow computed <code>async</code>/<code>get</code>/<code>set</code> keyword (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-helper-module-transforms</code>, <code>babel-helper-simple-access</code>, <code>babel-plugin-transform-modules-commonjs</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13258\">#13258</a> Fix const violations in ESM imports when transformed to CJS (<a href=\"https://github.com/overlookmotel\"><code>@​overlookmotel</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:bug: Bug Fix</h4>\n<ul>\n<li><code>babel-parser</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13575\">#13575</a> Update babel-parser.d.ts (<a href=\"https://github.com/sosukesuzuki\"><code>@​sosukesuzuki</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13548\">#13548</a> Fix  parser <code>strictMode</code> option (<a href=\"https://github.com/overlookmotel\"><code>@​overlookmotel</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13573\">#13573</a> Fix issue to allow module block in member expression (<a href=\"https://github.com/nme077\"><code>@​nme077</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13521\">#13521</a> Overhaul comment attachment (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13534\">#13534</a> Async do expression should start at async (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-plugin-transform-arrow-functions</code>, <code>babel-traverse</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/12344\">#12344</a> Fix arrow transformation when <code>arguments</code> is defined as variable (<a href=\"https://github.com/snitin315\"><code>@​snitin315</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-traverse</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13527\">#13527</a> fix: accept duplicated import/variable in different module (<a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-types</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13525\">#13525</a> fix(babel-types): accept <code>UnaryExpression</code> in <code>TSLiteralType</code> (<a href=\"https://github.com/colinaaa\"><code>@​colinaaa</code></a>)</li>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13500\">#13500</a> Add typeParameters to tagged template visitor keys (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:nail_care: Polish</h4>\n<ul>\n<li><code>babel-core</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13515\">#13515</a> Fix config validation message typo (<a href=\"https://github.com/jaeseokk\"><code>@​jaeseokk</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-cli</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13508\">#13508</a> fix: sync default_extensions to babel-cli usage (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:memo: Documentation</h4>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13562\">#13562</a> Fix <code>make generate-standalone</code> -&gt; <code>make build-standalone</code> (<a href=\"https://github.com/sosukesuzuki\"><code>@​sosukesuzuki</code></a>)</li>\n</ul>\n<h4>:house: Internal</h4>\n<ul>\n<li><code>babel-helpers</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13522\">#13522</a> minor improvement to gulp generate-runtime-helpers error message (<a href=\"https://github.com/lightmare\"><code>@​lightmare</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h4>:running_woman: Performance</h4>\n<ul>\n<li><code>babel-parser</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13521\">#13521</a> Overhaul comment attachment (<a href=\"https://github.com/JLHwung\"><code>@​JLHwung</code></a>)</li>\n</ul>\n</li>\n</ul>\n<h2>v7.14.7 (2021-06-21)</h2>\n<h4>:bug: Bug Fix</h4>\n<ul>\n<li><code>babel-plugin-proposal-object-rest-spread</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13483\">#13483</a> Don't hoist template literal keys in <code>object-rest-spread</code> (<a href=\"https://github.com/lala7573\"><code>@​lala7573</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-plugin-transform-destructuring</code>\n<ul>\n<li><a href=\"https://github-redirect.dependabot.com/babel/babel/pull/13482\">#13482</a> Don't hoist template strings from destructuring keys (<a href=\"https://github.com/lala7573\"><code>@​lala7573</code></a>)</li>\n</ul>\n</li>\n<li><code>babel-traverse</code></li>\n</ul>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/babel/babel/commit/e59178024431aa2cdfecd5b1694088edd1ced8a2\"><code>e591780</code></a> v7.14.8</li>\n<li><a href=\"https://github.com/babel/babel/commit/90d5eb7f2f2c699019aab2d5388ec1e8f3f469d2\"><code>90d5eb7</code></a> fix: sync default_extensions to babel-cli usage (<a href=\"https://github.com/babel/babel/tree/HEAD/packages/babel-cli/issues/13508\">#13508</a>)</li>\n<li><a href=\"https://github.com/babel/babel/commit/7a2a9283982239e2419f63e2a324160c5f8ac341\"><code>7a2a928</code></a> v7.14.5</li>\n<li><a href=\"https://github.com/babel/babel/commit/9252da782b22fdac98ee9829fffb48bdf9e6cd19\"><code>9252da7</code></a> Update <code>@nicolo-ribaudo/chokidar-2</code> (<a href=\"https://github.com/babel/babel/tree/HEAD/packages/babel-cli/issues/13438\">#13438</a>)</li>\n<li><a href=\"https://github.com/babel/babel/commit/4eda1c860507e84b44a718a39ce58cf45f7ccc6e\"><code>4eda1c8</code></a> chore: bump eslint and its plugins (<a href=\"https://github.com/babel/babel/tree/HEAD/packages/babel-cli/issues/13412\">#13412</a>)</li>\n<li><a href=\"https://github.com/babel/babel/commit/140ec5aa5c0361e2390f6fb0743fd900fb981426\"><code>140ec5a</code></a> chore: setup Yarn constraints (<a href=\"https://github.com/babel/babel/tree/HEAD/packages/babel-cli/issues/13363\">#13363</a>)</li>\n<li><a href=\"https://github.com/babel/babel/commit/1487a46dd58ddb788be542420400574ef20cdf00\"><code>1487a46</code></a> v7.14.3</li>\n<li><a href=\"https://github.com/babel/babel/commit/bb70ea47f51c985adb678c93cfaf2ee549e55668\"><code>bb70ea4</code></a> convert <code>@​babel/cli</code> to typescript (<a href=\"https://github.com/babel/babel/tree/HEAD/packages/babel-cli/issues/13213\">#13213</a>)</li>\n<li><a href=\"https://github.com/babel/babel/commit/2521c666f74e64c6336499986382fb838ac88009\"><code>2521c66</code></a> Add internal ESLint rule for consistent parser error messages (<a href=\"https://github.com/babel/babel/tree/HEAD/packages/babel-cli/issues/13130\">#13130</a>)</li>\n<li><a href=\"https://github.com/babel/babel/commit/d94a8e50edb62aff0bb3c8eb76d5073f731cf798\"><code>d94a8e5</code></a> v7.13.16</li>\n<li>Additional commits viewable in <a href=\"https://github.com/babel/babel/commits/v7.14.8/packages/babel-cli\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=@babel/cli&package-manager=npm_and_yarn&previous-version=7.4.3&new-version=7.14.8)](https://dependabot.com/compatibility-score/?dependency-name=@babel/cli&package-manager=npm_and_yarn&previous-version=7.4.3&new-version=7.14.8)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):\n- Update frequency (including time of day and day of week)\n- Pull request limits (per update run and/or open at any time)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","created_at":"2021-07-21T06:00:05Z","updated_at":"2021-07-21T06:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/248/commits","review_comments_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/248/comments","review_comment_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/comments{/number}","comments_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/248/comments","statuses_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/statuses/ecdc17bf091f7a9eeb3336d0dc0ebe2c83591b04","head":{"label":"BlueBaseJS:dependabot/npm_and_yarn/babel/cli-7.14.8","ref":"dependabot/npm_and_yarn/babel/cli-7.14.8","sha":"ecdc17bf091f7a9eeb3336d0dc0ebe2c83591b04","user":{"login":"BlueBaseJS","id":44442180,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ0NDQyMTgw","avatar_url":"https://avatars.githubusercontent.com/u/44442180?v=4","gravatar_id":"","url":"https://api.github.com/users/BlueBaseJS","html_url":"https://github.com/BlueBaseJS","followers_url":"https://api.github.com/users/BlueBaseJS/followers","following_url":"https://api.github.com/users/BlueBaseJS/following{/other_user}","gists_url":"https://api.github.com/users/BlueBaseJS/gists{/gist_id}","starred_url":"https://api.github.com/users/BlueBaseJS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BlueBaseJS/subscriptions","organizations_url":"https://api.github.com/users/BlueBaseJS/orgs","repos_url":"https://api.github.com/users/BlueBaseJS/repos","events_url":"https://api.github.com/users/BlueBaseJS/events{/privacy}","received_events_url":"https://api.github.com/users/BlueBaseJS/received_events","type":"Organization","site_admin":false},"repo":{"id":183236577,"node_id":"MDEwOlJlcG9zaXRvcnkxODMyMzY1Nzc=","name":"plugin-native-web-swiper","full_name":"BlueBaseJS/plugin-native-web-swiper","private":false,"owner":{"login":"BlueBaseJS","id":44442180,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ0NDQyMTgw","avatar_url":"https://avatars.githubusercontent.com/u/44442180?v=4","gravatar_id":"","url":"https://api.github.com/users/BlueBaseJS","html_url":"https://github.com/BlueBaseJS","followers_url":"https://api.github.com/users/BlueBaseJS/followers","following_url":"https://api.github.com/users/BlueBaseJS/following{/other_user}","gists_url":"https://api.github.com/users/BlueBaseJS/gists{/gist_id}","starred_url":"https://api.github.com/users/BlueBaseJS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BlueBaseJS/subscriptions","organizations_url":"https://api.github.com/users/BlueBaseJS/orgs","repos_url":"https://api.github.com/users/BlueBaseJS/repos","events_url":"https://api.github.com/users/BlueBaseJS/events{/privacy}","received_events_url":"https://api.github.com/users/BlueBaseJS/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper","description":null,"fork":false,"url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper","forks_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/forks","keys_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/keys{/key_id}","collaborators_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/teams","hooks_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/hooks","issue_events_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/events{/number}","events_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/events","assignees_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/assignees{/user}","branches_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/branches{/branch}","tags_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/tags","blobs_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/refs{/sha}","trees_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/trees{/sha}","statuses_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/statuses/{sha}","languages_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/languages","stargazers_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/stargazers","contributors_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/contributors","subscribers_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/subscribers","subscription_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/subscription","commits_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/commits{/sha}","git_commits_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/commits{/sha}","comments_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/comments{/number}","issue_comment_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/comments{/number}","contents_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/contents/{+path}","compare_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/compare/{base}...{head}","merges_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/merges","archive_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/downloads","issues_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues{/number}","pulls_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls{/number}","milestones_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/milestones{/number}","notifications_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/labels{/name}","releases_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/releases{/id}","deployments_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/deployments","created_at":"2019-04-24T13:38:50Z","updated_at":"2019-05-25T07:42:18Z","pushed_at":"2021-07-21T06:00:05Z","git_url":"git://github.com/BlueBaseJS/plugin-native-web-swiper.git","ssh_url":"git@github.com:BlueBaseJS/plugin-native-web-swiper.git","clone_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper.git","svn_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper","homepage":null,"size":5203,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":27,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":27,"watchers":0,"default_branch":"master"}},"base":{"label":"BlueBaseJS:master","ref":"master","sha":"21b93164e63404deca457cdf57695ddbb4a055b6","user":{"login":"BlueBaseJS","id":44442180,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ0NDQyMTgw","avatar_url":"https://avatars.githubusercontent.com/u/44442180?v=4","gravatar_id":"","url":"https://api.github.com/users/BlueBaseJS","html_url":"https://github.com/BlueBaseJS","followers_url":"https://api.github.com/users/BlueBaseJS/followers","following_url":"https://api.github.com/users/BlueBaseJS/following{/other_user}","gists_url":"https://api.github.com/users/BlueBaseJS/gists{/gist_id}","starred_url":"https://api.github.com/users/BlueBaseJS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BlueBaseJS/subscriptions","organizations_url":"https://api.github.com/users/BlueBaseJS/orgs","repos_url":"https://api.github.com/users/BlueBaseJS/repos","events_url":"https://api.github.com/users/BlueBaseJS/events{/privacy}","received_events_url":"https://api.github.com/users/BlueBaseJS/received_events","type":"Organization","site_admin":false},"repo":{"id":183236577,"node_id":"MDEwOlJlcG9zaXRvcnkxODMyMzY1Nzc=","name":"plugin-native-web-swiper","full_name":"BlueBaseJS/plugin-native-web-swiper","private":false,"owner":{"login":"BlueBaseJS","id":44442180,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ0NDQyMTgw","avatar_url":"https://avatars.githubusercontent.com/u/44442180?v=4","gravatar_id":"","url":"https://api.github.com/users/BlueBaseJS","html_url":"https://github.com/BlueBaseJS","followers_url":"https://api.github.com/users/BlueBaseJS/followers","following_url":"https://api.github.com/users/BlueBaseJS/following{/other_user}","gists_url":"https://api.github.com/users/BlueBaseJS/gists{/gist_id}","starred_url":"https://api.github.com/users/BlueBaseJS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BlueBaseJS/subscriptions","organizations_url":"https://api.github.com/users/BlueBaseJS/orgs","repos_url":"https://api.github.com/users/BlueBaseJS/repos","events_url":"https://api.github.com/users/BlueBaseJS/events{/privacy}","received_events_url":"https://api.github.com/users/BlueBaseJS/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper","description":null,"fork":false,"url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper","forks_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/forks","keys_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/keys{/key_id}","collaborators_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/teams","hooks_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/hooks","issue_events_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/events{/number}","events_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/events","assignees_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/assignees{/user}","branches_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/branches{/branch}","tags_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/tags","blobs_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/refs{/sha}","trees_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/trees{/sha}","statuses_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/statuses/{sha}","languages_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/languages","stargazers_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/stargazers","contributors_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/contributors","subscribers_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/subscribers","subscription_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/subscription","commits_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/commits{/sha}","git_commits_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/git/commits{/sha}","comments_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/comments{/number}","issue_comment_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/comments{/number}","contents_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/contents/{+path}","compare_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/compare/{base}...{head}","merges_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/merges","archive_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/downloads","issues_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues{/number}","pulls_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls{/number}","milestones_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/milestones{/number}","notifications_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/labels{/name}","releases_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/releases{/id}","deployments_url":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/deployments","created_at":"2019-04-24T13:38:50Z","updated_at":"2019-05-25T07:42:18Z","pushed_at":"2021-07-21T06:00:05Z","git_url":"git://github.com/BlueBaseJS/plugin-native-web-swiper.git","ssh_url":"git@github.com:BlueBaseJS/plugin-native-web-swiper.git","clone_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper.git","svn_url":"https://github.com/BlueBaseJS/plugin-native-web-swiper","homepage":null,"size":5203,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":27,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":27,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/248"},"html":{"href":"https://github.com/BlueBaseJS/plugin-native-web-swiper/pull/248"},"issue":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/248"},"comments":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/issues/248/comments"},"review_comments":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/248/comments"},"review_comment":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/pulls/248/commits"},"statuses":{"href":"https://api.github.com/repos/BlueBaseJS/plugin-native-web-swiper/statuses/ecdc17bf091f7a9eeb3336d0dc0ebe2c83591b04"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":118,"deletions":21,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":44442180,"login":"BlueBaseJS","gravatar_id":"","url":"https://api.github.com/orgs/BlueBaseJS","avatar_url":"https://avatars.githubusercontent.com/u/44442180?"}}
+{"id":"17244208180","type":"CreateEvent","actor":{"id":62318101,"login":"SyifaAinnur","display_login":"SyifaAinnur","gravatar_id":"","url":"https://api.github.com/users/SyifaAinnur","avatar_url":"https://avatars.githubusercontent.com/u/62318101?"},"repo":{"id":388010515,"name":"SyifaAinnur/Money_management-flutter","url":"https://api.github.com/repos/SyifaAinnur/Money_management-flutter"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208182","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561415228,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2102bfa1028e8abd5a10b8d8cc49caaf58a4665d","before":"fbe21faba3add7d6f7d6695e2e89ca505d06755e","commits":[{"sha":"2102bfa1028e8abd5a10b8d8cc49caaf58a4665d","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/2102bfa1028e8abd5a10b8d8cc49caaf58a4665d"}]},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208190","type":"CreateEvent","actor":{"id":86511397,"login":"AvijeetSahoo","display_login":"AvijeetSahoo","gravatar_id":"","url":"https://api.github.com/users/AvijeetSahoo","avatar_url":"https://avatars.githubusercontent.com/u/86511397?"},"repo":{"id":380437695,"name":"AvijeetSahoo/AvijeetSahoo","url":"https://api.github.com/repos/AvijeetSahoo/AvijeetSahoo"},"payload":{"ref":"master","ref_type":"branch","master_branch":"main","description":"Config files for my GitHub profile.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208195","type":"PushEvent","actor":{"id":53513,"login":"nsuan","display_login":"nsuan","gravatar_id":"","url":"https://api.github.com/users/nsuan","avatar_url":"https://avatars.githubusercontent.com/u/53513?"},"repo":{"id":370881581,"name":"nsuan/furry-fortnight","url":"https://api.github.com/repos/nsuan/furry-fortnight"},"payload":{"push_id":7561415235,"size":4,"distinct_size":4,"ref":"refs/heads/main","head":"42cf3a6e89ef5891997a6758f09ebbc4297426c1","before":"ca40b77ab40cac010598e537cf0058bc4fad93b7","commits":[{"sha":"e6d9dea7cc63a00770776c67a5891e7b0b1f94f4","author":{"name":"Nick Suan","email":"cf0bc5f1c1ddb0fada692904e0e398c835913fed@nonexiste.net"},"message":"update userinfo Wed Jul 21 01:00:36 EDT 2021","distinct":true,"url":"https://api.github.com/repos/nsuan/furry-fortnight/commits/e6d9dea7cc63a00770776c67a5891e7b0b1f94f4"},{"sha":"f99e3e0144de566b751029f776d25af4f66ac90d","author":{"name":"Nick Suan","email":"cf0bc5f1c1ddb0fada692904e0e398c835913fed@nonexiste.net"},"message":"update userinfo Wed Jul 21 01:16:42 EDT 2021","distinct":true,"url":"https://api.github.com/repos/nsuan/furry-fortnight/commits/f99e3e0144de566b751029f776d25af4f66ac90d"},{"sha":"aac0aac6b6f864eeaa718440f1e27a6a94c95dea","author":{"name":"Nick Suan","email":"cf0bc5f1c1ddb0fada692904e0e398c835913fed@nonexiste.net"},"message":"update userinfo Wed Jul 21 01:32:48 EDT 2021","distinct":true,"url":"https://api.github.com/repos/nsuan/furry-fortnight/commits/aac0aac6b6f864eeaa718440f1e27a6a94c95dea"},{"sha":"42cf3a6e89ef5891997a6758f09ebbc4297426c1","author":{"name":"Nick Suan","email":"cf0bc5f1c1ddb0fada692904e0e398c835913fed@nonexiste.net"},"message":"update userinfo Wed Jul 21 01:48:53 EDT 2021","distinct":true,"url":"https://api.github.com/repos/nsuan/furry-fortnight/commits/42cf3a6e89ef5891997a6758f09ebbc4297426c1"}]},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208198","type":"PushEvent","actor":{"id":82876799,"login":"hvaish01","display_login":"hvaish01","gravatar_id":"","url":"https://api.github.com/users/hvaish01","avatar_url":"https://avatars.githubusercontent.com/u/82876799?"},"repo":{"id":359772248,"name":"hvaish01/StixBundles","url":"https://api.github.com/repos/hvaish01/StixBundles"},"payload":{"push_id":7561415238,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"9706084c932ef2b39a19ff7002d538d0629f8504","before":"c80f87169380d203827443d9c611f4638fa1f741","commits":[{"sha":"9706084c932ef2b39a19ff7002d538d0629f8504","author":{"name":"hvaish01","email":"2afd248fb67ac19cdeb0148e32ca7ee71c30c76d@users.noreply.github.com"},"message":"Updated at 11:00:03 20-07-2021","distinct":true,"url":"https://api.github.com/repos/hvaish01/StixBundles/commits/9706084c932ef2b39a19ff7002d538d0629f8504"}]},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208199","type":"PushEvent","actor":{"id":60849980,"login":"jordans-bot","display_login":"jordans-bot","gravatar_id":"","url":"https://api.github.com/users/jordans-bot","avatar_url":"https://avatars.githubusercontent.com/u/60849980?"},"repo":{"id":139190305,"name":"JTuwiner/bitcoinclock","url":"https://api.github.com/repos/JTuwiner/bitcoinclock"},"payload":{"push_id":7561415225,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"a7d5f669fd71ebd564eb9934aff62af1bb1cae7f","before":"36d4ef46fef03b4ca626aa20d5053be93b3eef3b","commits":[{"sha":"a7d5f669fd71ebd564eb9934aff62af1bb1cae7f","author":{"name":"jordans-bot","email":"6323b4aabf9938a958e69e4471281fb61992bb8f@users.noreply.github.com"},"message":"Updated block height","distinct":true,"url":"https://api.github.com/repos/JTuwiner/bitcoinclock/commits/a7d5f669fd71ebd564eb9934aff62af1bb1cae7f"}]},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208204","type":"WatchEvent","actor":{"id":8991635,"login":"wangchongya","display_login":"wangchongya","gravatar_id":"","url":"https://api.github.com/users/wangchongya","avatar_url":"https://avatars.githubusercontent.com/u/8991635?"},"repo":{"id":172491011,"name":"baidu-security/openrasp-v8","url":"https://api.github.com/repos/baidu-security/openrasp-v8"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":24645557,"login":"baidu-security","gravatar_id":"","url":"https://api.github.com/orgs/baidu-security","avatar_url":"https://avatars.githubusercontent.com/u/24645557?"}}
+{"id":"17244208211","type":"WatchEvent","actor":{"id":73470270,"login":"outscale-hai","display_login":"outscale-hai","gravatar_id":"","url":"https://api.github.com/users/outscale-hai","avatar_url":"https://avatars.githubusercontent.com/u/73470270?"},"repo":{"id":165101310,"name":"outscale/osc-cli","url":"https://api.github.com/repos/outscale/osc-cli"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":8233735,"login":"outscale","gravatar_id":"","url":"https://api.github.com/orgs/outscale","avatar_url":"https://avatars.githubusercontent.com/u/8233735?"}}
+{"id":"17244208220","type":"PushEvent","actor":{"id":1614429,"login":"skabashnyuk","display_login":"skabashnyuk","gravatar_id":"","url":"https://api.github.com/users/skabashnyuk","avatar_url":"https://avatars.githubusercontent.com/u/1614429?"},"repo":{"id":281644786,"name":"skabashnyuk/che-docs","url":"https://api.github.com/repos/skabashnyuk/che-docs"},"payload":{"push_id":7561415243,"size":1,"distinct_size":1,"ref":"refs/heads/che19944","head":"7b8847be43549340a3b1b0d346acd07e0c383759","before":"ad342c2f1cf67b623d39fad43f83c5e6dc9848d5","commits":[{"sha":"7b8847be43549340a3b1b0d346acd07e0c383759","author":{"name":"Sergii Kabashniuk","email":"29c0f357da1539d701cf38481baf17db5d000cda@redhat.com"},"message":"fixup! Enable Devworkspaces on k8s\n\nSigned-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>","distinct":true,"url":"https://api.github.com/repos/skabashnyuk/che-docs/commits/7b8847be43549340a3b1b0d346acd07e0c383759"}]},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208237","type":"PullRequestEvent","actor":{"id":38143731,"login":"joonvena","display_login":"joonvena","gravatar_id":"","url":"https://api.github.com/users/joonvena","avatar_url":"https://avatars.githubusercontent.com/u/38143731?"},"repo":{"id":87910985,"name":"City-of-Helsinki/mvj","url":"https://api.github.com/repos/City-of-Helsinki/mvj"},"payload":{"action":"closed","number":268,"pull_request":{"url":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/268","id":692576288,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyNTc2Mjg4","html_url":"https://github.com/City-of-Helsinki/mvj/pull/268","diff_url":"https://github.com/City-of-Helsinki/mvj/pull/268.diff","patch_url":"https://github.com/City-of-Helsinki/mvj/pull/268.patch","issue_url":"https://api.github.com/repos/City-of-Helsinki/mvj/issues/268","number":268,"state":"closed","locked":false,"title":"Fix invoicing preview error","user":{"login":"joonvena","id":38143731,"node_id":"MDQ6VXNlcjM4MTQzNzMx","avatar_url":"https://avatars.githubusercontent.com/u/38143731?v=4","gravatar_id":"","url":"https://api.github.com/users/joonvena","html_url":"https://github.com/joonvena","followers_url":"https://api.github.com/users/joonvena/followers","following_url":"https://api.github.com/users/joonvena/following{/other_user}","gists_url":"https://api.github.com/users/joonvena/gists{/gist_id}","starred_url":"https://api.github.com/users/joonvena/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joonvena/subscriptions","organizations_url":"https://api.github.com/users/joonvena/orgs","repos_url":"https://api.github.com/users/joonvena/repos","events_url":"https://api.github.com/users/joonvena/events{/privacy}","received_events_url":"https://api.github.com/users/joonvena/received_events","type":"User","site_admin":false},"body":"When tenant is used as billing contact on another tenant and vice versa shares will have duplicate tenant keys which leads to KeyError. This will fix the issue.","created_at":"2021-07-19T12:49:05Z","updated_at":"2021-07-21T06:00:06Z","closed_at":"2021-07-21T06:00:05Z","merged_at":"2021-07-21T06:00:05Z","merge_commit_sha":"24983699432dccb432683cd272f83a40b8399c0e","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/268/commits","review_comments_url":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/268/comments","review_comment_url":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/comments{/number}","comments_url":"https://api.github.com/repos/City-of-Helsinki/mvj/issues/268/comments","statuses_url":"https://api.github.com/repos/City-of-Helsinki/mvj/statuses/909d699e3c50c3934e287c9165f2254baf183524","head":{"label":"joonvena:fix/billing-contacts","ref":"fix/billing-contacts","sha":"909d699e3c50c3934e287c9165f2254baf183524","user":{"login":"joonvena","id":38143731,"node_id":"MDQ6VXNlcjM4MTQzNzMx","avatar_url":"https://avatars.githubusercontent.com/u/38143731?v=4","gravatar_id":"","url":"https://api.github.com/users/joonvena","html_url":"https://github.com/joonvena","followers_url":"https://api.github.com/users/joonvena/followers","following_url":"https://api.github.com/users/joonvena/following{/other_user}","gists_url":"https://api.github.com/users/joonvena/gists{/gist_id}","starred_url":"https://api.github.com/users/joonvena/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joonvena/subscriptions","organizations_url":"https://api.github.com/users/joonvena/orgs","repos_url":"https://api.github.com/users/joonvena/repos","events_url":"https://api.github.com/users/joonvena/events{/privacy}","received_events_url":"https://api.github.com/users/joonvena/received_events","type":"User","site_admin":false},"repo":{"id":360854370,"node_id":"MDEwOlJlcG9zaXRvcnkzNjA4NTQzNzA=","name":"mvj","full_name":"joonvena/mvj","private":false,"owner":{"login":"joonvena","id":38143731,"node_id":"MDQ6VXNlcjM4MTQzNzMx","avatar_url":"https://avatars.githubusercontent.com/u/38143731?v=4","gravatar_id":"","url":"https://api.github.com/users/joonvena","html_url":"https://github.com/joonvena","followers_url":"https://api.github.com/users/joonvena/followers","following_url":"https://api.github.com/users/joonvena/following{/other_user}","gists_url":"https://api.github.com/users/joonvena/gists{/gist_id}","starred_url":"https://api.github.com/users/joonvena/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joonvena/subscriptions","organizations_url":"https://api.github.com/users/joonvena/orgs","repos_url":"https://api.github.com/users/joonvena/repos","events_url":"https://api.github.com/users/joonvena/events{/privacy}","received_events_url":"https://api.github.com/users/joonvena/received_events","type":"User","site_admin":false},"html_url":"https://github.com/joonvena/mvj","description":"City of Helsinki ground rent system","fork":true,"url":"https://api.github.com/repos/joonvena/mvj","forks_url":"https://api.github.com/repos/joonvena/mvj/forks","keys_url":"https://api.github.com/repos/joonvena/mvj/keys{/key_id}","collaborators_url":"https://api.github.com/repos/joonvena/mvj/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/joonvena/mvj/teams","hooks_url":"https://api.github.com/repos/joonvena/mvj/hooks","issue_events_url":"https://api.github.com/repos/joonvena/mvj/issues/events{/number}","events_url":"https://api.github.com/repos/joonvena/mvj/events","assignees_url":"https://api.github.com/repos/joonvena/mvj/assignees{/user}","branches_url":"https://api.github.com/repos/joonvena/mvj/branches{/branch}","tags_url":"https://api.github.com/repos/joonvena/mvj/tags","blobs_url":"https://api.github.com/repos/joonvena/mvj/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/joonvena/mvj/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/joonvena/mvj/git/refs{/sha}","trees_url":"https://api.github.com/repos/joonvena/mvj/git/trees{/sha}","statuses_url":"https://api.github.com/repos/joonvena/mvj/statuses/{sha}","languages_url":"https://api.github.com/repos/joonvena/mvj/languages","stargazers_url":"https://api.github.com/repos/joonvena/mvj/stargazers","contributors_url":"https://api.github.com/repos/joonvena/mvj/contributors","subscribers_url":"https://api.github.com/repos/joonvena/mvj/subscribers","subscription_url":"https://api.github.com/repos/joonvena/mvj/subscription","commits_url":"https://api.github.com/repos/joonvena/mvj/commits{/sha}","git_commits_url":"https://api.github.com/repos/joonvena/mvj/git/commits{/sha}","comments_url":"https://api.github.com/repos/joonvena/mvj/comments{/number}","issue_comment_url":"https://api.github.com/repos/joonvena/mvj/issues/comments{/number}","contents_url":"https://api.github.com/repos/joonvena/mvj/contents/{+path}","compare_url":"https://api.github.com/repos/joonvena/mvj/compare/{base}...{head}","merges_url":"https://api.github.com/repos/joonvena/mvj/merges","archive_url":"https://api.github.com/repos/joonvena/mvj/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/joonvena/mvj/downloads","issues_url":"https://api.github.com/repos/joonvena/mvj/issues{/number}","pulls_url":"https://api.github.com/repos/joonvena/mvj/pulls{/number}","milestones_url":"https://api.github.com/repos/joonvena/mvj/milestones{/number}","notifications_url":"https://api.github.com/repos/joonvena/mvj/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/joonvena/mvj/labels{/name}","releases_url":"https://api.github.com/repos/joonvena/mvj/releases{/id}","deployments_url":"https://api.github.com/repos/joonvena/mvj/deployments","created_at":"2021-04-23T10:59:31Z","updated_at":"2021-05-20T12:40:39Z","pushed_at":"2021-07-19T12:35:24Z","git_url":"git://github.com/joonvena/mvj.git","ssh_url":"git@github.com:joonvena/mvj.git","clone_url":"https://github.com/joonvena/mvj.git","svn_url":"https://github.com/joonvena/mvj","homepage":null,"size":2273,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":2,"watchers":0,"default_branch":"develop"}},"base":{"label":"City-of-Helsinki:develop","ref":"develop","sha":"2191a6e23067f8e7fdda2bcbfe5e80a5dd749abc","user":{"login":"City-of-Helsinki","id":1875564,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE4NzU1NjQ=","avatar_url":"https://avatars.githubusercontent.com/u/1875564?v=4","gravatar_id":"","url":"https://api.github.com/users/City-of-Helsinki","html_url":"https://github.com/City-of-Helsinki","followers_url":"https://api.github.com/users/City-of-Helsinki/followers","following_url":"https://api.github.com/users/City-of-Helsinki/following{/other_user}","gists_url":"https://api.github.com/users/City-of-Helsinki/gists{/gist_id}","starred_url":"https://api.github.com/users/City-of-Helsinki/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/City-of-Helsinki/subscriptions","organizations_url":"https://api.github.com/users/City-of-Helsinki/orgs","repos_url":"https://api.github.com/users/City-of-Helsinki/repos","events_url":"https://api.github.com/users/City-of-Helsinki/events{/privacy}","received_events_url":"https://api.github.com/users/City-of-Helsinki/received_events","type":"Organization","site_admin":false},"repo":{"id":87910985,"node_id":"MDEwOlJlcG9zaXRvcnk4NzkxMDk4NQ==","name":"mvj","full_name":"City-of-Helsinki/mvj","private":false,"owner":{"login":"City-of-Helsinki","id":1875564,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE4NzU1NjQ=","avatar_url":"https://avatars.githubusercontent.com/u/1875564?v=4","gravatar_id":"","url":"https://api.github.com/users/City-of-Helsinki","html_url":"https://github.com/City-of-Helsinki","followers_url":"https://api.github.com/users/City-of-Helsinki/followers","following_url":"https://api.github.com/users/City-of-Helsinki/following{/other_user}","gists_url":"https://api.github.com/users/City-of-Helsinki/gists{/gist_id}","starred_url":"https://api.github.com/users/City-of-Helsinki/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/City-of-Helsinki/subscriptions","organizations_url":"https://api.github.com/users/City-of-Helsinki/orgs","repos_url":"https://api.github.com/users/City-of-Helsinki/repos","events_url":"https://api.github.com/users/City-of-Helsinki/events{/privacy}","received_events_url":"https://api.github.com/users/City-of-Helsinki/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/City-of-Helsinki/mvj","description":"City of Helsinki ground rent system","fork":false,"url":"https://api.github.com/repos/City-of-Helsinki/mvj","forks_url":"https://api.github.com/repos/City-of-Helsinki/mvj/forks","keys_url":"https://api.github.com/repos/City-of-Helsinki/mvj/keys{/key_id}","collaborators_url":"https://api.github.com/repos/City-of-Helsinki/mvj/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/City-of-Helsinki/mvj/teams","hooks_url":"https://api.github.com/repos/City-of-Helsinki/mvj/hooks","issue_events_url":"https://api.github.com/repos/City-of-Helsinki/mvj/issues/events{/number}","events_url":"https://api.github.com/repos/City-of-Helsinki/mvj/events","assignees_url":"https://api.github.com/repos/City-of-Helsinki/mvj/assignees{/user}","branches_url":"https://api.github.com/repos/City-of-Helsinki/mvj/branches{/branch}","tags_url":"https://api.github.com/repos/City-of-Helsinki/mvj/tags","blobs_url":"https://api.github.com/repos/City-of-Helsinki/mvj/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/City-of-Helsinki/mvj/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/City-of-Helsinki/mvj/git/refs{/sha}","trees_url":"https://api.github.com/repos/City-of-Helsinki/mvj/git/trees{/sha}","statuses_url":"https://api.github.com/repos/City-of-Helsinki/mvj/statuses/{sha}","languages_url":"https://api.github.com/repos/City-of-Helsinki/mvj/languages","stargazers_url":"https://api.github.com/repos/City-of-Helsinki/mvj/stargazers","contributors_url":"https://api.github.com/repos/City-of-Helsinki/mvj/contributors","subscribers_url":"https://api.github.com/repos/City-of-Helsinki/mvj/subscribers","subscription_url":"https://api.github.com/repos/City-of-Helsinki/mvj/subscription","commits_url":"https://api.github.com/repos/City-of-Helsinki/mvj/commits{/sha}","git_commits_url":"https://api.github.com/repos/City-of-Helsinki/mvj/git/commits{/sha}","comments_url":"https://api.github.com/repos/City-of-Helsinki/mvj/comments{/number}","issue_comment_url":"https://api.github.com/repos/City-of-Helsinki/mvj/issues/comments{/number}","contents_url":"https://api.github.com/repos/City-of-Helsinki/mvj/contents/{+path}","compare_url":"https://api.github.com/repos/City-of-Helsinki/mvj/compare/{base}...{head}","merges_url":"https://api.github.com/repos/City-of-Helsinki/mvj/merges","archive_url":"https://api.github.com/repos/City-of-Helsinki/mvj/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/City-of-Helsinki/mvj/downloads","issues_url":"https://api.github.com/repos/City-of-Helsinki/mvj/issues{/number}","pulls_url":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls{/number}","milestones_url":"https://api.github.com/repos/City-of-Helsinki/mvj/milestones{/number}","notifications_url":"https://api.github.com/repos/City-of-Helsinki/mvj/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/City-of-Helsinki/mvj/labels{/name}","releases_url":"https://api.github.com/repos/City-of-Helsinki/mvj/releases{/id}","deployments_url":"https://api.github.com/repos/City-of-Helsinki/mvj/deployments","created_at":"2017-04-11T08:43:59Z","updated_at":"2021-05-20T08:56:44Z","pushed_at":"2021-07-21T06:00:05Z","git_url":"git://github.com/City-of-Helsinki/mvj.git","ssh_url":"git@github.com:City-of-Helsinki/mvj.git","clone_url":"https://github.com/City-of-Helsinki/mvj.git","svn_url":"https://github.com/City-of-Helsinki/mvj","homepage":null,"size":2263,"stargazers_count":1,"watchers_count":1,"language":"Python","has_issues":false,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":6,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":14,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":6,"open_issues":14,"watchers":1,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/268"},"html":{"href":"https://github.com/City-of-Helsinki/mvj/pull/268"},"issue":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/issues/268"},"comments":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/issues/268/comments"},"review_comments":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/268/comments"},"review_comment":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/pulls/268/commits"},"statuses":{"href":"https://api.github.com/repos/City-of-Helsinki/mvj/statuses/909d699e3c50c3934e287c9165f2254baf183524"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"joonvena","id":38143731,"node_id":"MDQ6VXNlcjM4MTQzNzMx","avatar_url":"https://avatars.githubusercontent.com/u/38143731?v=4","gravatar_id":"","url":"https://api.github.com/users/joonvena","html_url":"https://github.com/joonvena","followers_url":"https://api.github.com/users/joonvena/followers","following_url":"https://api.github.com/users/joonvena/following{/other_user}","gists_url":"https://api.github.com/users/joonvena/gists{/gist_id}","starred_url":"https://api.github.com/users/joonvena/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joonvena/subscriptions","organizations_url":"https://api.github.com/users/joonvena/orgs","repos_url":"https://api.github.com/users/joonvena/repos","events_url":"https://api.github.com/users/joonvena/events{/privacy}","received_events_url":"https://api.github.com/users/joonvena/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":6,"deletions":3,"changed_files":1}},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":1875564,"login":"City-of-Helsinki","gravatar_id":"","url":"https://api.github.com/orgs/City-of-Helsinki","avatar_url":"https://avatars.githubusercontent.com/u/1875564?"}}
+{"id":"17244208238","type":"IssuesEvent","actor":{"id":24877853,"login":"Itherma","display_login":"Itherma","gravatar_id":"","url":"https://api.github.com/users/Itherma","avatar_url":"https://avatars.githubusercontent.com/u/24877853?"},"repo":{"id":379208352,"name":"Itherma/blog-gitalk-comment","url":"https://api.github.com/repos/Itherma/blog-gitalk-comment"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/issues/15","repository_url":"https://api.github.com/repos/Itherma/blog-gitalk-comment","labels_url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/issues/15/labels{/name}","comments_url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/issues/15/comments","events_url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/issues/15/events","html_url":"https://github.com/Itherma/blog-gitalk-comment/issues/15","id":949355535,"node_id":"MDU6SXNzdWU5NDkzNTU1MzU=","number":15,"title":"「评论」Git分支的新建与合并-分支操作","user":{"login":"Itherma","id":24877853,"node_id":"MDQ6VXNlcjI0ODc3ODUz","avatar_url":"https://avatars.githubusercontent.com/u/24877853?v=4","gravatar_id":"","url":"https://api.github.com/users/Itherma","html_url":"https://github.com/Itherma","followers_url":"https://api.github.com/users/Itherma/followers","following_url":"https://api.github.com/users/Itherma/following{/other_user}","gists_url":"https://api.github.com/users/Itherma/gists{/gist_id}","starred_url":"https://api.github.com/users/Itherma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Itherma/subscriptions","organizations_url":"https://api.github.com/users/Itherma/orgs","repos_url":"https://api.github.com/users/Itherma/repos","events_url":"https://api.github.com/users/Itherma/events{/privacy}","received_events_url":"https://api.github.com/users/Itherma/received_events","type":"User","site_admin":false},"labels":[{"id":3186781096,"node_id":"MDU6TGFiZWwzMTg2NzgxMDk2","url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/labels//pages/ea5a8c/","name":"/pages/ea5a8c/","color":"ededed","default":false,"description":null},{"id":3107104037,"node_id":"MDU6TGFiZWwzMTA3MTA0MDM3","url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/labels/Comment","name":"Comment","color":"ededed","default":false,"description":null},{"id":3107104036,"node_id":"MDU6TGFiZWwzMTA3MTA0MDM2","url":"https://api.github.com/repos/Itherma/blog-gitalk-comment/labels/Gitalk","name":"Gitalk","color":"ededed","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T06:00:06Z","updated_at":"2021-07-21T06:00:06Z","closed_at":null,"author_association":"OWNER","active_lock_reason":null,"body":"页面：https://itherma.github.io/pages/ea5a8c/","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208242","type":"PullRequestEvent","actor":{"id":11026689,"login":"niranjanshk27","display_login":"niranjanshk27","gravatar_id":"","url":"https://api.github.com/users/niranjanshk27","avatar_url":"https://avatars.githubusercontent.com/u/11026689?"},"repo":{"id":313846192,"name":"Bhoos/react-kit","url":"https://api.github.com/repos/Bhoos/react-kit"},"payload":{"action":"opened","number":20,"pull_request":{"url":"https://api.github.com/repos/Bhoos/react-kit/pulls/20","id":694073985,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDczOTg1","html_url":"https://github.com/Bhoos/react-kit/pull/20","diff_url":"https://github.com/Bhoos/react-kit/pull/20.diff","patch_url":"https://github.com/Bhoos/react-kit/pull/20.patch","issue_url":"https://api.github.com/repos/Bhoos/react-kit/issues/20","number":20,"state":"open","locked":false,"title":"Use of GITHUB_TOKEN to publish","user":{"login":"niranjanshk27","id":11026689,"node_id":"MDQ6VXNlcjExMDI2Njg5","avatar_url":"https://avatars.githubusercontent.com/u/11026689?v=4","gravatar_id":"","url":"https://api.github.com/users/niranjanshk27","html_url":"https://github.com/niranjanshk27","followers_url":"https://api.github.com/users/niranjanshk27/followers","following_url":"https://api.github.com/users/niranjanshk27/following{/other_user}","gists_url":"https://api.github.com/users/niranjanshk27/gists{/gist_id}","starred_url":"https://api.github.com/users/niranjanshk27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/niranjanshk27/subscriptions","organizations_url":"https://api.github.com/users/niranjanshk27/orgs","repos_url":"https://api.github.com/users/niranjanshk27/repos","events_url":"https://api.github.com/users/niranjanshk27/events{/privacy}","received_events_url":"https://api.github.com/users/niranjanshk27/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T06:00:06Z","updated_at":"2021-07-21T06:00:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Bhoos/react-kit/pulls/20/commits","review_comments_url":"https://api.github.com/repos/Bhoos/react-kit/pulls/20/comments","review_comment_url":"https://api.github.com/repos/Bhoos/react-kit/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Bhoos/react-kit/issues/20/comments","statuses_url":"https://api.github.com/repos/Bhoos/react-kit/statuses/d6f69e58602534070ef49d1f9044e285ec9251fa","head":{"label":"niranjanshk27:master","ref":"master","sha":"d6f69e58602534070ef49d1f9044e285ec9251fa","user":{"login":"niranjanshk27","id":11026689,"node_id":"MDQ6VXNlcjExMDI2Njg5","avatar_url":"https://avatars.githubusercontent.com/u/11026689?v=4","gravatar_id":"","url":"https://api.github.com/users/niranjanshk27","html_url":"https://github.com/niranjanshk27","followers_url":"https://api.github.com/users/niranjanshk27/followers","following_url":"https://api.github.com/users/niranjanshk27/following{/other_user}","gists_url":"https://api.github.com/users/niranjanshk27/gists{/gist_id}","starred_url":"https://api.github.com/users/niranjanshk27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/niranjanshk27/subscriptions","organizations_url":"https://api.github.com/users/niranjanshk27/orgs","repos_url":"https://api.github.com/users/niranjanshk27/repos","events_url":"https://api.github.com/users/niranjanshk27/events{/privacy}","received_events_url":"https://api.github.com/users/niranjanshk27/received_events","type":"User","site_admin":false},"repo":{"id":385220332,"node_id":"MDEwOlJlcG9zaXRvcnkzODUyMjAzMzI=","name":"react-kit","full_name":"niranjanshk27/react-kit","private":false,"owner":{"login":"niranjanshk27","id":11026689,"node_id":"MDQ6VXNlcjExMDI2Njg5","avatar_url":"https://avatars.githubusercontent.com/u/11026689?v=4","gravatar_id":"","url":"https://api.github.com/users/niranjanshk27","html_url":"https://github.com/niranjanshk27","followers_url":"https://api.github.com/users/niranjanshk27/followers","following_url":"https://api.github.com/users/niranjanshk27/following{/other_user}","gists_url":"https://api.github.com/users/niranjanshk27/gists{/gist_id}","starred_url":"https://api.github.com/users/niranjanshk27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/niranjanshk27/subscriptions","organizations_url":"https://api.github.com/users/niranjanshk27/orgs","repos_url":"https://api.github.com/users/niranjanshk27/repos","events_url":"https://api.github.com/users/niranjanshk27/events{/privacy}","received_events_url":"https://api.github.com/users/niranjanshk27/received_events","type":"User","site_admin":false},"html_url":"https://github.com/niranjanshk27/react-kit","description":"Bhoos React Library","fork":true,"url":"https://api.github.com/repos/niranjanshk27/react-kit","forks_url":"https://api.github.com/repos/niranjanshk27/react-kit/forks","keys_url":"https://api.github.com/repos/niranjanshk27/react-kit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/niranjanshk27/react-kit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/niranjanshk27/react-kit/teams","hooks_url":"https://api.github.com/repos/niranjanshk27/react-kit/hooks","issue_events_url":"https://api.github.com/repos/niranjanshk27/react-kit/issues/events{/number}","events_url":"https://api.github.com/repos/niranjanshk27/react-kit/events","assignees_url":"https://api.github.com/repos/niranjanshk27/react-kit/assignees{/user}","branches_url":"https://api.github.com/repos/niranjanshk27/react-kit/branches{/branch}","tags_url":"https://api.github.com/repos/niranjanshk27/react-kit/tags","blobs_url":"https://api.github.com/repos/niranjanshk27/react-kit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/niranjanshk27/react-kit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/niranjanshk27/react-kit/git/refs{/sha}","trees_url":"https://api.github.com/repos/niranjanshk27/react-kit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/niranjanshk27/react-kit/statuses/{sha}","languages_url":"https://api.github.com/repos/niranjanshk27/react-kit/languages","stargazers_url":"https://api.github.com/repos/niranjanshk27/react-kit/stargazers","contributors_url":"https://api.github.com/repos/niranjanshk27/react-kit/contributors","subscribers_url":"https://api.github.com/repos/niranjanshk27/react-kit/subscribers","subscription_url":"https://api.github.com/repos/niranjanshk27/react-kit/subscription","commits_url":"https://api.github.com/repos/niranjanshk27/react-kit/commits{/sha}","git_commits_url":"https://api.github.com/repos/niranjanshk27/react-kit/git/commits{/sha}","comments_url":"https://api.github.com/repos/niranjanshk27/react-kit/comments{/number}","issue_comment_url":"https://api.github.com/repos/niranjanshk27/react-kit/issues/comments{/number}","contents_url":"https://api.github.com/repos/niranjanshk27/react-kit/contents/{+path}","compare_url":"https://api.github.com/repos/niranjanshk27/react-kit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/niranjanshk27/react-kit/merges","archive_url":"https://api.github.com/repos/niranjanshk27/react-kit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/niranjanshk27/react-kit/downloads","issues_url":"https://api.github.com/repos/niranjanshk27/react-kit/issues{/number}","pulls_url":"https://api.github.com/repos/niranjanshk27/react-kit/pulls{/number}","milestones_url":"https://api.github.com/repos/niranjanshk27/react-kit/milestones{/number}","notifications_url":"https://api.github.com/repos/niranjanshk27/react-kit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/niranjanshk27/react-kit/labels{/name}","releases_url":"https://api.github.com/repos/niranjanshk27/react-kit/releases{/id}","deployments_url":"https://api.github.com/repos/niranjanshk27/react-kit/deployments","created_at":"2021-07-12T11:14:04Z","updated_at":"2021-07-21T05:59:34Z","pushed_at":"2021-07-21T05:59:32Z","git_url":"git://github.com/niranjanshk27/react-kit.git","ssh_url":"git@github.com:niranjanshk27/react-kit.git","clone_url":"https://github.com/niranjanshk27/react-kit.git","svn_url":"https://github.com/niranjanshk27/react-kit","homepage":null,"size":78,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"Bhoos:master","ref":"master","sha":"05deaa7b687fd932d79bf828535c77b7c41419ea","user":{"login":"Bhoos","id":24890692,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0ODkwNjky","avatar_url":"https://avatars.githubusercontent.com/u/24890692?v=4","gravatar_id":"","url":"https://api.github.com/users/Bhoos","html_url":"https://github.com/Bhoos","followers_url":"https://api.github.com/users/Bhoos/followers","following_url":"https://api.github.com/users/Bhoos/following{/other_user}","gists_url":"https://api.github.com/users/Bhoos/gists{/gist_id}","starred_url":"https://api.github.com/users/Bhoos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Bhoos/subscriptions","organizations_url":"https://api.github.com/users/Bhoos/orgs","repos_url":"https://api.github.com/users/Bhoos/repos","events_url":"https://api.github.com/users/Bhoos/events{/privacy}","received_events_url":"https://api.github.com/users/Bhoos/received_events","type":"Organization","site_admin":false},"repo":{"id":313846192,"node_id":"MDEwOlJlcG9zaXRvcnkzMTM4NDYxOTI=","name":"react-kit","full_name":"Bhoos/react-kit","private":false,"owner":{"login":"Bhoos","id":24890692,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0ODkwNjky","avatar_url":"https://avatars.githubusercontent.com/u/24890692?v=4","gravatar_id":"","url":"https://api.github.com/users/Bhoos","html_url":"https://github.com/Bhoos","followers_url":"https://api.github.com/users/Bhoos/followers","following_url":"https://api.github.com/users/Bhoos/following{/other_user}","gists_url":"https://api.github.com/users/Bhoos/gists{/gist_id}","starred_url":"https://api.github.com/users/Bhoos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Bhoos/subscriptions","organizations_url":"https://api.github.com/users/Bhoos/orgs","repos_url":"https://api.github.com/users/Bhoos/repos","events_url":"https://api.github.com/users/Bhoos/events{/privacy}","received_events_url":"https://api.github.com/users/Bhoos/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Bhoos/react-kit","description":"Bhoos React Library","fork":false,"url":"https://api.github.com/repos/Bhoos/react-kit","forks_url":"https://api.github.com/repos/Bhoos/react-kit/forks","keys_url":"https://api.github.com/repos/Bhoos/react-kit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Bhoos/react-kit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Bhoos/react-kit/teams","hooks_url":"https://api.github.com/repos/Bhoos/react-kit/hooks","issue_events_url":"https://api.github.com/repos/Bhoos/react-kit/issues/events{/number}","events_url":"https://api.github.com/repos/Bhoos/react-kit/events","assignees_url":"https://api.github.com/repos/Bhoos/react-kit/assignees{/user}","branches_url":"https://api.github.com/repos/Bhoos/react-kit/branches{/branch}","tags_url":"https://api.github.com/repos/Bhoos/react-kit/tags","blobs_url":"https://api.github.com/repos/Bhoos/react-kit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Bhoos/react-kit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Bhoos/react-kit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Bhoos/react-kit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Bhoos/react-kit/statuses/{sha}","languages_url":"https://api.github.com/repos/Bhoos/react-kit/languages","stargazers_url":"https://api.github.com/repos/Bhoos/react-kit/stargazers","contributors_url":"https://api.github.com/repos/Bhoos/react-kit/contributors","subscribers_url":"https://api.github.com/repos/Bhoos/react-kit/subscribers","subscription_url":"https://api.github.com/repos/Bhoos/react-kit/subscription","commits_url":"https://api.github.com/repos/Bhoos/react-kit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Bhoos/react-kit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Bhoos/react-kit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Bhoos/react-kit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Bhoos/react-kit/contents/{+path}","compare_url":"https://api.github.com/repos/Bhoos/react-kit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Bhoos/react-kit/merges","archive_url":"https://api.github.com/repos/Bhoos/react-kit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Bhoos/react-kit/downloads","issues_url":"https://api.github.com/repos/Bhoos/react-kit/issues{/number}","pulls_url":"https://api.github.com/repos/Bhoos/react-kit/pulls{/number}","milestones_url":"https://api.github.com/repos/Bhoos/react-kit/milestones{/number}","notifications_url":"https://api.github.com/repos/Bhoos/react-kit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Bhoos/react-kit/labels{/name}","releases_url":"https://api.github.com/repos/Bhoos/react-kit/releases{/id}","deployments_url":"https://api.github.com/repos/Bhoos/react-kit/deployments","created_at":"2020-11-18T06:41:31Z","updated_at":"2021-07-20T07:54:59Z","pushed_at":"2021-07-20T07:54:59Z","git_url":"git://github.com/Bhoos/react-kit.git","ssh_url":"git@github.com:Bhoos/react-kit.git","clone_url":"https://github.com/Bhoos/react-kit.git","svn_url":"https://github.com/Bhoos/react-kit","homepage":null,"size":79,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":6,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":null,"forks":6,"open_issues":4,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Bhoos/react-kit/pulls/20"},"html":{"href":"https://github.com/Bhoos/react-kit/pull/20"},"issue":{"href":"https://api.github.com/repos/Bhoos/react-kit/issues/20"},"comments":{"href":"https://api.github.com/repos/Bhoos/react-kit/issues/20/comments"},"review_comments":{"href":"https://api.github.com/repos/Bhoos/react-kit/pulls/20/comments"},"review_comment":{"href":"https://api.github.com/repos/Bhoos/react-kit/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Bhoos/react-kit/pulls/20/commits"},"statuses":{"href":"https://api.github.com/repos/Bhoos/react-kit/statuses/d6f69e58602534070ef49d1f9044e285ec9251fa"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":1,"additions":2,"deletions":2,"changed_files":2}},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":24890692,"login":"Bhoos","gravatar_id":"","url":"https://api.github.com/orgs/Bhoos","avatar_url":"https://avatars.githubusercontent.com/u/24890692?"}}
+{"id":"17244208243","type":"PushEvent","actor":{"id":6334546,"login":"reynaldoeg","display_login":"reynaldoeg","gravatar_id":"","url":"https://api.github.com/users/reynaldoeg","avatar_url":"https://avatars.githubusercontent.com/u/6334546?"},"repo":{"id":165695619,"name":"reynaldoeg/cron-bash","url":"https://api.github.com/repos/reynaldoeg/cron-bash"},"payload":{"push_id":7561415265,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"d3e7a695f4523c1fdc5a61e82718593fc5cf011a","before":"a9fe861554f8e4754f9e9777001ed1b0b5435ab8","commits":[{"sha":"d3e7a695f4523c1fdc5a61e82718593fc5cf011a","author":{"name":"Reynaldo Esparza","email":"95b30e9cdfc69ddd5127248f1edf158cc384728d@hotmail.com"},"message":"2021-07-21 06:00:01","distinct":true,"url":"https://api.github.com/repos/reynaldoeg/cron-bash/commits/d3e7a695f4523c1fdc5a61e82718593fc5cf011a"}]},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208244","type":"CreateEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":206050670,"name":"krynv/feature-rich-graphql-express-server","url":"https://api.github.com/repos/krynv/feature-rich-graphql-express-server"},"payload":{"ref":"dependabot/npm_and_yarn/babel/cli-7.14.8","ref_type":"branch","master_branch":"master","description":"PostgreSQL connectivity, subscriptions, validation, error handling, user registration, token-based authentication, authorisation, custom scalars, cursor pagination, batching, caching and end-to-end testing","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208251","type":"PushEvent","actor":{"id":32030603,"login":"assafattas","display_login":"assafattas","gravatar_id":"","url":"https://api.github.com/users/assafattas","avatar_url":"https://avatars.githubusercontent.com/u/32030603?"},"repo":{"id":109857546,"name":"SarineTechnologies/sarine.viewer.clarity","url":"https://api.github.com/repos/SarineTechnologies/sarine.viewer.clarity"},"payload":{"push_id":7561415262,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"554a2819beb0e633187326e0d8da6bbc074c1651","before":"1d0e7a5b3b558ca6d84a4d7d434221fb870e183e","commits":[{"sha":"554a2819beb0e633187326e0d8da6bbc074c1651","author":{"name":"assafattas","email":"833d0ff0ebc34b28e0c774b113d1ed012f0c65dc@users.noreply.github.com"},"message":"rollback to clarityDiamondImageDark for 'halo'","distinct":true,"url":"https://api.github.com/repos/SarineTechnologies/sarine.viewer.clarity/commits/554a2819beb0e633187326e0d8da6bbc074c1651"}]},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":10775474,"login":"SarineTechnologies","gravatar_id":"","url":"https://api.github.com/orgs/SarineTechnologies","avatar_url":"https://avatars.githubusercontent.com/u/10775474?"}}
+{"id":"17244208257","type":"PullRequestReviewEvent","actor":{"id":57981365,"login":"sowu880","display_login":"sowu880","gravatar_id":"","url":"https://api.github.com/users/sowu880","avatar_url":"https://avatars.githubusercontent.com/u/57981365?"},"repo":{"id":233114737,"name":"microsoft/FHIR-Tools-for-Anonymization","url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization"},"payload":{"action":"created","review":{"id":711282691,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMjgyNjkx","user":{"login":"sowu880","id":57981365,"node_id":"MDQ6VXNlcjU3OTgxMzY1","avatar_url":"https://avatars.githubusercontent.com/u/57981365?v=4","gravatar_id":"","url":"https://api.github.com/users/sowu880","html_url":"https://github.com/sowu880","followers_url":"https://api.github.com/users/sowu880/followers","following_url":"https://api.github.com/users/sowu880/following{/other_user}","gists_url":"https://api.github.com/users/sowu880/gists{/gist_id}","starred_url":"https://api.github.com/users/sowu880/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sowu880/subscriptions","organizations_url":"https://api.github.com/users/sowu880/orgs","repos_url":"https://api.github.com/users/sowu880/repos","events_url":"https://api.github.com/users/sowu880/events{/privacy}","received_events_url":"https://api.github.com/users/sowu880/received_events","type":"User","site_admin":false},"body":null,"commit_id":"c84cbb40b861c6001a7db6817c1178ea0a7c6f03","submitted_at":"2021-07-21T06:00:06Z","state":"commented","html_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization/pull/115#pullrequestreview-711282691","pull_request_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/microsoft/FHIR-Tools-for-Anonymization/pull/115#pullrequestreview-711282691"},"pull_request":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115"}}},"pull_request":{"url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115","id":683146914,"node_id":"MDExOlB1bGxSZXF1ZXN0NjgzMTQ2OTE0","html_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization/pull/115","diff_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization/pull/115.diff","patch_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization/pull/115.patch","issue_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/115","number":115,"state":"open","locked":false,"title":"Update exception handling","user":{"login":"sowu880","id":57981365,"node_id":"MDQ6VXNlcjU3OTgxMzY1","avatar_url":"https://avatars.githubusercontent.com/u/57981365?v=4","gravatar_id":"","url":"https://api.github.com/users/sowu880","html_url":"https://github.com/sowu880","followers_url":"https://api.github.com/users/sowu880/followers","following_url":"https://api.github.com/users/sowu880/following{/other_user}","gists_url":"https://api.github.com/users/sowu880/gists{/gist_id}","starred_url":"https://api.github.com/users/sowu880/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sowu880/subscriptions","organizations_url":"https://api.github.com/users/sowu880/orgs","repos_url":"https://api.github.com/users/sowu880/repos","events_url":"https://api.github.com/users/sowu880/events{/privacy}","received_events_url":"https://api.github.com/users/sowu880/received_events","type":"User","site_admin":false},"body":"Add two kind of exceptions:\r\n1. AnonymizerRuleNotApplicableException (inherit from AnonymizerConfigurationErrorsException)\r\n2. AnonymizationProcessFailedException (Runtime exception)\r\nWe plan to  support skipping the second exception in the future.\r\n\r\nGeneralization methods will throw these two exceptions, while other methods will not throw exceptions for now. \r\n","created_at":"2021-07-04T09:59:44Z","updated_at":"2021-07-21T06:00:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e7d93659ea357d683ece768f03341efb175995a0","assignee":null,"assignees":[],"requested_reviewers":[{"login":"tongwu-msft","id":7133968,"node_id":"MDQ6VXNlcjcxMzM5Njg=","avatar_url":"https://avatars.githubusercontent.com/u/7133968?v=4","gravatar_id":"","url":"https://api.github.com/users/tongwu-msft","html_url":"https://github.com/tongwu-msft","followers_url":"https://api.github.com/users/tongwu-msft/followers","following_url":"https://api.github.com/users/tongwu-msft/following{/other_user}","gists_url":"https://api.github.com/users/tongwu-msft/gists{/gist_id}","starred_url":"https://api.github.com/users/tongwu-msft/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tongwu-msft/subscriptions","organizations_url":"https://api.github.com/users/tongwu-msft/orgs","repos_url":"https://api.github.com/users/tongwu-msft/repos","events_url":"https://api.github.com/users/tongwu-msft/events{/privacy}","received_events_url":"https://api.github.com/users/tongwu-msft/received_events","type":"User","site_admin":false},{"login":"moria97","id":59813791,"node_id":"MDQ6VXNlcjU5ODEzNzkx","avatar_url":"https://avatars.githubusercontent.com/u/59813791?v=4","gravatar_id":"","url":"https://api.github.com/users/moria97","html_url":"https://github.com/moria97","followers_url":"https://api.github.com/users/moria97/followers","following_url":"https://api.github.com/users/moria97/following{/other_user}","gists_url":"https://api.github.com/users/moria97/gists{/gist_id}","starred_url":"https://api.github.com/users/moria97/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/moria97/subscriptions","organizations_url":"https://api.github.com/users/moria97/orgs","repos_url":"https://api.github.com/users/moria97/repos","events_url":"https://api.github.com/users/moria97/events{/privacy}","received_events_url":"https://api.github.com/users/moria97/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115/commits","review_comments_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115/comments","review_comment_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/comments{/number}","comments_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/115/comments","statuses_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/statuses/c84cbb40b861c6001a7db6817c1178ea0a7c6f03","head":{"label":"microsoft:personal/sowu/refine-exception-handling","ref":"personal/sowu/refine-exception-handling","sha":"c84cbb40b861c6001a7db6817c1178ea0a7c6f03","user":{"login":"microsoft","id":6154722,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTQ3MjI=","avatar_url":"https://avatars.githubusercontent.com/u/6154722?v=4","gravatar_id":"","url":"https://api.github.com/users/microsoft","html_url":"https://github.com/microsoft","followers_url":"https://api.github.com/users/microsoft/followers","following_url":"https://api.github.com/users/microsoft/following{/other_user}","gists_url":"https://api.github.com/users/microsoft/gists{/gist_id}","starred_url":"https://api.github.com/users/microsoft/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/microsoft/subscriptions","organizations_url":"https://api.github.com/users/microsoft/orgs","repos_url":"https://api.github.com/users/microsoft/repos","events_url":"https://api.github.com/users/microsoft/events{/privacy}","received_events_url":"https://api.github.com/users/microsoft/received_events","type":"Organization","site_admin":false},"repo":{"id":233114737,"node_id":"MDEwOlJlcG9zaXRvcnkyMzMxMTQ3Mzc=","name":"FHIR-Tools-for-Anonymization","full_name":"microsoft/FHIR-Tools-for-Anonymization","private":false,"owner":{"login":"microsoft","id":6154722,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTQ3MjI=","avatar_url":"https://avatars.githubusercontent.com/u/6154722?v=4","gravatar_id":"","url":"https://api.github.com/users/microsoft","html_url":"https://github.com/microsoft","followers_url":"https://api.github.com/users/microsoft/followers","following_url":"https://api.github.com/users/microsoft/following{/other_user}","gists_url":"https://api.github.com/users/microsoft/gists{/gist_id}","starred_url":"https://api.github.com/users/microsoft/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/microsoft/subscriptions","organizations_url":"https://api.github.com/users/microsoft/orgs","repos_url":"https://api.github.com/users/microsoft/repos","events_url":"https://api.github.com/users/microsoft/events{/privacy}","received_events_url":"https://api.github.com/users/microsoft/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization","description":"Set of tools for helping with data (in FHIR format) anonymization.","fork":false,"url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization","forks_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/forks","keys_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/keys{/key_id}","collaborators_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/teams","hooks_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/hooks","issue_events_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/events{/number}","events_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/events","assignees_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/assignees{/user}","branches_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/branches{/branch}","tags_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/tags","blobs_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/refs{/sha}","trees_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/trees{/sha}","statuses_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/statuses/{sha}","languages_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/languages","stargazers_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/stargazers","contributors_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/contributors","subscribers_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/subscribers","subscription_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/subscription","commits_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/commits{/sha}","git_commits_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/commits{/sha}","comments_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/comments{/number}","issue_comment_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/comments{/number}","contents_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/contents/{+path}","compare_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/compare/{base}...{head}","merges_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/merges","archive_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/downloads","issues_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues{/number}","pulls_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls{/number}","milestones_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/milestones{/number}","notifications_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/labels{/name}","releases_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/releases{/id}","deployments_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/deployments","created_at":"2020-01-10T19:16:48Z","updated_at":"2021-07-19T05:12:02Z","pushed_at":"2021-07-21T05:01:26Z","git_url":"git://github.com/microsoft/FHIR-Tools-for-Anonymization.git","ssh_url":"git@github.com:microsoft/FHIR-Tools-for-Anonymization.git","clone_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization.git","svn_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization","homepage":null,"size":1574,"stargazers_count":85,"watchers_count":85,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":32,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":32,"open_issues":3,"watchers":85,"default_branch":"master"}},"base":{"label":"microsoft:master","ref":"master","sha":"ceb44383e2e3ebc9d2ee8e1497eda893a56991ca","user":{"login":"microsoft","id":6154722,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTQ3MjI=","avatar_url":"https://avatars.githubusercontent.com/u/6154722?v=4","gravatar_id":"","url":"https://api.github.com/users/microsoft","html_url":"https://github.com/microsoft","followers_url":"https://api.github.com/users/microsoft/followers","following_url":"https://api.github.com/users/microsoft/following{/other_user}","gists_url":"https://api.github.com/users/microsoft/gists{/gist_id}","starred_url":"https://api.github.com/users/microsoft/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/microsoft/subscriptions","organizations_url":"https://api.github.com/users/microsoft/orgs","repos_url":"https://api.github.com/users/microsoft/repos","events_url":"https://api.github.com/users/microsoft/events{/privacy}","received_events_url":"https://api.github.com/users/microsoft/received_events","type":"Organization","site_admin":false},"repo":{"id":233114737,"node_id":"MDEwOlJlcG9zaXRvcnkyMzMxMTQ3Mzc=","name":"FHIR-Tools-for-Anonymization","full_name":"microsoft/FHIR-Tools-for-Anonymization","private":false,"owner":{"login":"microsoft","id":6154722,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTQ3MjI=","avatar_url":"https://avatars.githubusercontent.com/u/6154722?v=4","gravatar_id":"","url":"https://api.github.com/users/microsoft","html_url":"https://github.com/microsoft","followers_url":"https://api.github.com/users/microsoft/followers","following_url":"https://api.github.com/users/microsoft/following{/other_user}","gists_url":"https://api.github.com/users/microsoft/gists{/gist_id}","starred_url":"https://api.github.com/users/microsoft/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/microsoft/subscriptions","organizations_url":"https://api.github.com/users/microsoft/orgs","repos_url":"https://api.github.com/users/microsoft/repos","events_url":"https://api.github.com/users/microsoft/events{/privacy}","received_events_url":"https://api.github.com/users/microsoft/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization","description":"Set of tools for helping with data (in FHIR format) anonymization.","fork":false,"url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization","forks_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/forks","keys_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/keys{/key_id}","collaborators_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/teams","hooks_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/hooks","issue_events_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/events{/number}","events_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/events","assignees_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/assignees{/user}","branches_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/branches{/branch}","tags_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/tags","blobs_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/refs{/sha}","trees_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/trees{/sha}","statuses_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/statuses/{sha}","languages_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/languages","stargazers_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/stargazers","contributors_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/contributors","subscribers_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/subscribers","subscription_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/subscription","commits_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/commits{/sha}","git_commits_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/git/commits{/sha}","comments_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/comments{/number}","issue_comment_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/comments{/number}","contents_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/contents/{+path}","compare_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/compare/{base}...{head}","merges_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/merges","archive_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/downloads","issues_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues{/number}","pulls_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls{/number}","milestones_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/milestones{/number}","notifications_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/labels{/name}","releases_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/releases{/id}","deployments_url":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/deployments","created_at":"2020-01-10T19:16:48Z","updated_at":"2021-07-19T05:12:02Z","pushed_at":"2021-07-21T05:01:26Z","git_url":"git://github.com/microsoft/FHIR-Tools-for-Anonymization.git","ssh_url":"git@github.com:microsoft/FHIR-Tools-for-Anonymization.git","clone_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization.git","svn_url":"https://github.com/microsoft/FHIR-Tools-for-Anonymization","homepage":null,"size":1574,"stargazers_count":85,"watchers_count":85,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":32,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":32,"open_issues":3,"watchers":85,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115"},"html":{"href":"https://github.com/microsoft/FHIR-Tools-for-Anonymization/pull/115"},"issue":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/115"},"comments":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/issues/115/comments"},"review_comments":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115/comments"},"review_comment":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/pulls/115/commits"},"statuses":{"href":"https://api.github.com/repos/microsoft/FHIR-Tools-for-Anonymization/statuses/c84cbb40b861c6001a7db6817c1178ea0a7c6f03"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":6154722,"login":"microsoft","gravatar_id":"","url":"https://api.github.com/orgs/microsoft","avatar_url":"https://avatars.githubusercontent.com/u/6154722?"}}
+{"id":"17244208258","type":"IssuesEvent","actor":{"id":61173114,"login":"BlueWolf3682","display_login":"BlueWolf3682","gravatar_id":"","url":"https://api.github.com/users/BlueWolf3682","avatar_url":"https://avatars.githubusercontent.com/u/61173114?"},"repo":{"id":89822531,"name":"Anuken/Mindustry","url":"https://api.github.com/repos/Anuken/Mindustry"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/Anuken/Mindustry/issues/5627","repository_url":"https://api.github.com/repos/Anuken/Mindustry","labels_url":"https://api.github.com/repos/Anuken/Mindustry/issues/5627/labels{/name}","comments_url":"https://api.github.com/repos/Anuken/Mindustry/issues/5627/comments","events_url":"https://api.github.com/repos/Anuken/Mindustry/issues/5627/events","html_url":"https://github.com/Anuken/Mindustry/issues/5627","id":949355537,"node_id":"MDU6SXNzdWU5NDkzNTU1Mzc=","number":5627,"title":"Can't use drawBlock fields in GenericCrafters right","user":{"login":"BlueWolf3682","id":61173114,"node_id":"MDQ6VXNlcjYxMTczMTE0","avatar_url":"https://avatars.githubusercontent.com/u/61173114?v=4","gravatar_id":"","url":"https://api.github.com/users/BlueWolf3682","html_url":"https://github.com/BlueWolf3682","followers_url":"https://api.github.com/users/BlueWolf3682/followers","following_url":"https://api.github.com/users/BlueWolf3682/following{/other_user}","gists_url":"https://api.github.com/users/BlueWolf3682/gists{/gist_id}","starred_url":"https://api.github.com/users/BlueWolf3682/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BlueWolf3682/subscriptions","organizations_url":"https://api.github.com/users/BlueWolf3682/orgs","repos_url":"https://api.github.com/users/BlueWolf3682/repos","events_url":"https://api.github.com/users/BlueWolf3682/events{/privacy}","received_events_url":"https://api.github.com/users/BlueWolf3682/received_events","type":"User","site_admin":false},"labels":[{"id":594803818,"node_id":"MDU6TGFiZWw1OTQ4MDM4MTg=","url":"https://api.github.com/repos/Anuken/Mindustry/labels/bug","name":"bug","color":"d30051","default":true,"description":""}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T06:00:06Z","updated_at":"2021-07-21T06:00:06Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"body":"**Platform**: *Android*\r\n\r\n**Build**: *128.1.*\r\n\r\n**Issue**: *yeah cool*\r\n![Screenshot_20210720-235031](https://user-images.githubusercontent.com/61173114/126438258-64b65a07-f519-4991-acc8-fb482075f07a.png)\r\n![Screenshot_20210720-234956](https://user-images.githubusercontent.com/61173114/126438268-3818cbf6-5c99-497e-befe-1fa1e0203b52.png)\r\n\r\n**Steps to reproduce**: *Give any JSON GenericCrafter a DrawSmelter/DrawArcSmelter and try to change the drawer's fields.*\r\n\r\n**Link(s) to mod(s) used**: *[unavailable for testing, was done on local files. Blame android 11 for me being unable to rip it out.]*\r\n\r\n**Save file**: *Cannot provide because I cannot export the mod zip i am using for this - if I provided the save, it would remove the block on world load due to invalid size and fields.*\r\n\r\nIf you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.\r\n\r\nDon't matter this time\r\n\r\n**(Crash) logs**: *none.*\r\n\r\n---\r\n\r\n*Place an X (no spaces) between the brackets to confirm that you have read the line below.*  \r\n- [X] **I have not updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**\r\n- [X] **I have searched the closed and open issues to make sure that this problem has not already been reported.**\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208259","type":"CreateEvent","actor":{"id":86597160,"login":"Govindswaroop-astro","display_login":"Govindswaroop-astro","gravatar_id":"","url":"https://api.github.com/users/Govindswaroop-astro","avatar_url":"https://avatars.githubusercontent.com/u/86597160?"},"repo":{"id":387852769,"name":"Govindswaroop-astro/DS-and-ML-Capstone-Project","url":"https://api.github.com/repos/Govindswaroop-astro/DS-and-ML-Capstone-Project"},"payload":{"ref":"Module-2-Exploratory-Data-analysis","ref_type":"branch","master_branch":"main","description":"This repository contains the codes and resources used in edX Data Science and Machine Learning Capstone Project.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T06:00:06Z"}
+{"id":"17244208264","type":"PushEvent","actor":{"id":48645689,"login":"linusromland","display_login":"linusromland","gravatar_id":"","url":"https://api.github.com/users/linusromland","avatar_url":"https://avatars.githubusercontent.com/u/48645689?"},"repo":{"id":381823039,"name":"linusromlandArchives/MinecraftServer","url":"https://api.github.com/repos/linusromlandArchives/MinecraftServer"},"payload":{"push_id":7561415260,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"573e90df10c209cd37f792953cc201a3f969e9f5","before":"ac8f6db1daa54f0da545aeaa0fa6697462102fbc","commits":[{"sha":"573e90df10c209cd37f792953cc201a3f969e9f5","author":{"name":"linusromlandBackups","email":"df4abc6316c2aa0cfb1adaa6a44405041f33e9a8@gmail.com"},"message":"Backup from Wed 21 Jul 2021 08:00:01 AM CEST","distinct":true,"url":"https://api.github.com/repos/linusromlandArchives/MinecraftServer/commits/573e90df10c209cd37f792953cc201a3f969e9f5"}]},"public":true,"created_at":"2021-07-21T06:00:06Z","org":{"id":83013944,"login":"linusromlandArchives","gravatar_id":"","url":"https://api.github.com/orgs/linusromlandArchives","avatar_url":"https://avatars.githubusercontent.com/u/83013944?"}}
+{"id":"17244791732","type":"PushEvent","actor":{"id":39515279,"login":"DylanJoo","display_login":"DylanJoo","gravatar_id":"","url":"https://api.github.com/users/DylanJoo","avatar_url":"https://avatars.githubusercontent.com/u/39515279?"},"repo":{"id":387684637,"name":"DylanJoo/temp","url":"https://api.github.com/repos/DylanJoo/temp"},"payload":{"push_id":7561706124,"size":1,"distinct_size":1,"ref":"refs/heads/treccast","head":"79767fd0ca111938ac3fc202f22b0fc4c577ce29","before":"e3a951afd59a45cf2ec9bfe6e5cfd0f16643f679","commits":[{"sha":"79767fd0ca111938ac3fc202f22b0fc4c577ce29","author":{"name":"DylanJoo","email":"a3ba619d846b98fedd06454761876fc743c419da@gmail.com"},"message":"fix","distinct":true,"url":"https://api.github.com/repos/DylanJoo/temp/commits/79767fd0ca111938ac3fc202f22b0fc4c577ce29"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791734","type":"CreateEvent","actor":{"id":32995012,"login":"ekrctb","display_login":"ekrctb","gravatar_id":"","url":"https://api.github.com/users/ekrctb","avatar_url":"https://avatars.githubusercontent.com/u/32995012?"},"repo":{"id":134741029,"name":"ekrctb/osu","url":"https://api.github.com/repos/ekrctb/osu"},"payload":{"ref":"selection-box-can-flip","ref_type":"branch","master_branch":"master","description":"rhythm is just a *click* away!","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791735","type":"PushEvent","actor":{"id":12613821,"login":"gregdhill","display_login":"gregdhill","gravatar_id":"","url":"https://api.github.com/users/gregdhill","avatar_url":"https://avatars.githubusercontent.com/u/12613821?"},"repo":{"id":251576007,"name":"interlay/interbtc","url":"https://api.github.com/repos/interlay/interbtc"},"payload":{"push_id":7561706114,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"0ea0ea26ef9879af4533a05da7ea90f0ca9aecc4","before":"4316a61837300e2d5dc91332e860c95ec1abeb8c","commits":[{"sha":"318509bcec548430a2f4c8930aa0f6799a211732","author":{"name":"Sander Bosma","email":"3d8a9d6e5a12e0b56d8a6110f96ee9c51e9e4542@gmail.com"},"message":"fix: use upstream orml","distinct":true,"url":"https://api.github.com/repos/interlay/interbtc/commits/318509bcec548430a2f4c8930aa0f6799a211732"},{"sha":"0ea0ea26ef9879af4533a05da7ea90f0ca9aecc4","author":{"name":"Greg Hill","email":"e80390f752b9f7611a96fbe9a58a9ad92499ac4c@outlook.com"},"message":"Merge pull request #195 from sander2/fix/broken-dependency\n\nfix: use upstream orml","distinct":true,"url":"https://api.github.com/repos/interlay/interbtc/commits/0ea0ea26ef9879af4533a05da7ea90f0ca9aecc4"}]},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":57096748,"login":"interlay","gravatar_id":"","url":"https://api.github.com/orgs/interlay","avatar_url":"https://avatars.githubusercontent.com/u/57096748?"}}
+{"id":"17244791736","type":"PushEvent","actor":{"id":33936852,"login":"m0c0r30n","display_login":"m0c0r30n","gravatar_id":"","url":"https://api.github.com/users/m0c0r30n","avatar_url":"https://avatars.githubusercontent.com/u/33936852?"},"repo":{"id":321111180,"name":"m0c0r30n/kabu-database","url":"https://api.github.com/repos/m0c0r30n/kabu-database"},"payload":{"push_id":7561706132,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"758d4d936b45904d8b062b3f944c93084cfbb61b","before":"3ba86bbd487264f3bae30a286e0417a551a4dce2","commits":[{"sha":"758d4d936b45904d8b062b3f944c93084cfbb61b","author":{"name":"m0c0r30n","email":"770645c6e89108578397b8226b3a39c03f9fcffb@gmail.cm"},"message":"fix bug","distinct":true,"url":"https://api.github.com/repos/m0c0r30n/kabu-database/commits/758d4d936b45904d8b062b3f944c93084cfbb61b"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791737","type":"DeleteEvent","actor":{"id":52546,"login":"hirotaka","display_login":"hirotaka","gravatar_id":"","url":"https://api.github.com/users/hirotaka","avatar_url":"https://avatars.githubusercontent.com/u/52546?"},"repo":{"id":356442765,"name":"stackhackerio/astron","url":"https://api.github.com/repos/stackhackerio/astron"},"payload":{"ref":"dependabot/npm_and_yarn/types/node-15.12.5","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":79205277,"login":"stackhackerio","gravatar_id":"","url":"https://api.github.com/orgs/stackhackerio","avatar_url":"https://avatars.githubusercontent.com/u/79205277?"}}
+{"id":"17244791738","type":"PushEvent","actor":{"id":21104054,"login":"Alanscut","display_login":"Alanscut","gravatar_id":"","url":"https://api.github.com/users/Alanscut","avatar_url":"https://avatars.githubusercontent.com/u/21104054?"},"repo":{"id":277434398,"name":"Alanscut/snakeyaml","url":"https://api.github.com/repos/Alanscut/snakeyaml"},"payload":{"push_id":7561706111,"size":108,"distinct_size":1,"ref":"refs/heads/generic-type","head":"8fb780772c8e2fbb1557b9e69e5e2aac68c3ca02","before":"09e85d4b8c02b97bcddd468530fe955468849812","commits":[{"sha":"08d8cf9c222c44e1af7f2f8a29842943aaea3bb7","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Add test","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/08d8cf9c222c44e1af7f2f8a29842943aaea3bb7"},{"sha":"c4abec129bda0f98f4a5548822c29dd96a64c848","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"fix typos","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/c4abec129bda0f98f4a5548822c29dd96a64c848"},{"sha":"82f66083c69d0c90c8127485581b3d7d1fd2f33e","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"add github actions CI","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/82f66083c69d0c90c8127485581b3d7d1fd2f33e"},{"sha":"d6a31ae3a9a8b65e9cbdd5d14640a82fdc3a7e92","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"Fix issue #481: dump anchor not used by alias","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/d6a31ae3a9a8b65e9cbdd5d14640a82fdc3a7e92"},{"sha":"3b8ff94e6976e93f7ba66537caebaf47ef86380e","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"setAnchorGenerator","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/3b8ff94e6976e93f7ba66537caebaf47ef86380e"},{"sha":"bae1eae5ffbe8b17d2b2045a6c329441e19b168e","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Merge pull request #7 from Alanscut/typo\n\nfix typos","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/bae1eae5ffbe8b17d2b2045a6c329441e19b168e"},{"sha":"6bb7dc3ba36f4e218eaee7e0db01395b1895e57e","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Merge branch 'master' of https://github.com/asomov/snakeyaml","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/6bb7dc3ba36f4e218eaee7e0db01395b1895e57e"},{"sha":"187d7e47d1e91777238602470ea3f0ce2d480636","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Add Javadoc","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/187d7e47d1e91777238602470ea3f0ce2d480636"},{"sha":"9013a19afc8a37871f4f40ed0c39c97193ddbc3e","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"add OrderTest","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/9013a19afc8a37871f4f40ed0c39c97193ddbc3e"},{"sha":"f3b9a5856e1fa7cd2c6783084bbc78a7552aee53","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"remove java8 new feature","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/f3b9a5856e1fa7cd2c6783084bbc78a7552aee53"},{"sha":"cfbcde3d10c9605a3ae3ac5b3430d308ea081529","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"rename dump(Node, Writer) and yaml file","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/cfbcde3d10c9605a3ae3ac5b3430d308ea081529"},{"sha":"7e04ea59a6ce0c9b91c097d39559dcdbce4e75b5","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"Merge remote-tracking branch 'origin/master' into actions","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/7e04ea59a6ce0c9b91c097d39559dcdbce4e75b5"},{"sha":"d5cd403d1b508ca6cc9d0ae686960e01d492468e","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Merge pull request #8 from Alanscut/dump-anchor\n\nFix issue #481: Dump anchors that is not used by any alias","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/d5cd403d1b508ca6cc9d0ae686960e01d492468e"},{"sha":"a89fae85fe6001031204e001a3b0719cf2163397","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Update changes.xml","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/a89fae85fe6001031204e001a3b0719cf2163397"},{"sha":"ef90eecf66808cd10c0eedd642b93b201f77a96d","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Improve Javadoc","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/ef90eecf66808cd10c0eedd642b93b201f77a96d"},{"sha":"fbadd3e80bd11bd01e40ab5186c10f90a7f104d2","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Merge pull request #6 from Alanscut/actions\n\nadd github actions CI","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/fbadd3e80bd11bd01e40ab5186c10f90a7f104d2"},{"sha":"e00bad6fa30304b1fd69a8fadc67331357499810","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Merge pull request #10 from Alanscut/order-test\n\nAdd OrderTest","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/e00bad6fa30304b1fd69a8fadc67331357499810"},{"sha":"3bb34a0ab511a0069661bf8cef888097abe8bfc1","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Update maven-resources-plugin to version 3.2.0","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/3bb34a0ab511a0069661bf8cef888097abe8bfc1"},{"sha":"da1f7d84d4f3d25621300f14d1c956dc837fa231","author":{"name":"Alanscut","email":"e08551f5d33a2dec2b66b477babbfb1d58954415@163.com"},"message":"fix CI, specify maven-resources-plugin as 3.0.2","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/da1f7d84d4f3d25621300f14d1c956dc837fa231"},{"sha":"edcc678890a92f1eb2e499db27f879c97d533cb5","author":{"name":"Andrey Somov","email":"873702c7a96d3e6faa6d1afbee8ebd6f9560e35c@gmail.com"},"message":"Merge pull request #11 from Alanscut/ci\n\nfix CI, specify maven-resources-plugin as 3.0.2","distinct":false,"url":"https://api.github.com/repos/Alanscut/snakeyaml/commits/edcc678890a92f1eb2e499db27f879c97d533cb5"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791744","type":"CreateEvent","actor":{"id":68605386,"login":"sarkarnab","display_login":"sarkarnab","gravatar_id":"","url":"https://api.github.com/users/sarkarnab","avatar_url":"https://avatars.githubusercontent.com/u/68605386?"},"repo":{"id":388024717,"name":"sarkarnab/udemy_syscloud","url":"https://api.github.com/repos/sarkarnab/udemy_syscloud"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791752","type":"PushEvent","actor":{"id":8517910,"login":"LombiqBot","display_login":"LombiqBot","gravatar_id":"","url":"https://api.github.com/users/LombiqBot","avatar_url":"https://avatars.githubusercontent.com/u/8517910?"},"repo":{"id":264168728,"name":"Lombiq/OrchardCMS.Poll","url":"https://api.github.com/repos/Lombiq/OrchardCMS.Poll"},"payload":{"push_id":7561706118,"size":0,"distinct_size":0,"ref":"refs/heads/issue/EETT-12","head":"3cf997d062664a70200cd2233dd396dc73ff2eb5","before":"3cf997d062664a70200cd2233dd396dc73ff2eb5","commits":[]},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":8158177,"login":"Lombiq","gravatar_id":"","url":"https://api.github.com/orgs/Lombiq","avatar_url":"https://avatars.githubusercontent.com/u/8158177?"}}
+{"id":"17244791760","type":"CreateEvent","actor":{"id":65045755,"login":"Vasile-Hij","display_login":"Vasile-Hij","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","avatar_url":"https://avatars.githubusercontent.com/u/65045755?"},"repo":{"id":387832280,"name":"Vasile-Hij/excels-pandas","url":"https://api.github.com/repos/Vasile-Hij/excels-pandas"},"payload":{"ref":"v0.1","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791788","type":"PushEvent","actor":{"id":52546,"login":"hirotaka","display_login":"hirotaka","gravatar_id":"","url":"https://api.github.com/users/hirotaka","avatar_url":"https://avatars.githubusercontent.com/u/52546?"},"repo":{"id":356442765,"name":"stackhackerio/astron","url":"https://api.github.com/repos/stackhackerio/astron"},"payload":{"push_id":7561706148,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"7e320b88075f95fca78370b34c8313c7ef3941d6","before":"3ddf5053cc022cdd62c178e22358850315457315","commits":[{"sha":"05999764f584216ebe7f0c0b24e3f7ceda9207c4","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump @types/node from 14.14.41 to 15.12.5\n\nBumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.41 to 15.12.5.\n- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)\n- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)\n\n---\nupdated-dependencies:\n- dependency-name: \"@types/node\"\n  dependency-type: direct:development\n  update-type: version-update:semver-major\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":true,"url":"https://api.github.com/repos/stackhackerio/astron/commits/05999764f584216ebe7f0c0b24e3f7ceda9207c4"},{"sha":"7e320b88075f95fca78370b34c8313c7ef3941d6","author":{"name":"Hirotaka Mizutani","email":"d5244bcffa2fcdcd3bdd4de3fa07c2e28eaae737@mizutani.to"},"message":"Merge pull request #7 from stackhackerio/dependabot/npm_and_yarn/types/node-15.12.5\n\nBump @types/node from 14.14.41 to 15.12.5","distinct":true,"url":"https://api.github.com/repos/stackhackerio/astron/commits/7e320b88075f95fca78370b34c8313c7ef3941d6"}]},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":79205277,"login":"stackhackerio","gravatar_id":"","url":"https://api.github.com/orgs/stackhackerio","avatar_url":"https://avatars.githubusercontent.com/u/79205277?"}}
+{"id":"17244791795","type":"WatchEvent","actor":{"id":74425534,"login":"sjoveska","display_login":"sjoveska","gravatar_id":"","url":"https://api.github.com/users/sjoveska","avatar_url":"https://avatars.githubusercontent.com/u/74425534?"},"repo":{"id":381091798,"name":"gabrieldim/Accounting-System-Software-Testing","url":"https://api.github.com/repos/gabrieldim/Accounting-System-Software-Testing"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791796","type":"IssueCommentEvent","actor":{"id":11555354,"login":"SilasKenneth","display_login":"SilasKenneth","gravatar_id":"","url":"https://api.github.com/users/SilasKenneth","avatar_url":"https://avatars.githubusercontent.com/u/11555354?"},"repo":{"id":66662684,"name":"microsoftgraph/msgraph-sdk-php","url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/issues/557","repository_url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php","labels_url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/issues/557/labels{/name}","comments_url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/issues/557/comments","events_url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/issues/557/events","html_url":"https://github.com/microsoftgraph/msgraph-sdk-php/issues/557","id":948757874,"node_id":"MDU6SXNzdWU5NDg3NTc4NzQ=","number":557,"title":"object return instead of array when call getMeetingTimeSuggestions under MeetingTimeSuggestionResult","user":{"login":"jp-Telus","id":86217312,"node_id":"MDQ6VXNlcjg2MjE3MzEy","avatar_url":"https://avatars.githubusercontent.com/u/86217312?v=4","gravatar_id":"","url":"https://api.github.com/users/jp-Telus","html_url":"https://github.com/jp-Telus","followers_url":"https://api.github.com/users/jp-Telus/followers","following_url":"https://api.github.com/users/jp-Telus/following{/other_user}","gists_url":"https://api.github.com/users/jp-Telus/gists{/gist_id}","starred_url":"https://api.github.com/users/jp-Telus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jp-Telus/subscriptions","organizations_url":"https://api.github.com/users/jp-Telus/orgs","repos_url":"https://api.github.com/users/jp-Telus/repos","events_url":"https://api.github.com/users/jp-Telus/events{/privacy}","received_events_url":"https://api.github.com/users/jp-Telus/received_events","type":"User","site_admin":false},"labels":[{"id":1242045599,"node_id":"MDU6TGFiZWwxMjQyMDQ1NTk5","url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/labels/ToTriage","name":"ToTriage","color":"a16bdb","default":false,"description":""}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-20T15:14:06Z","updated_at":"2021-07-21T07:00:00Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"I called the FindMeetingTime API ( /me/findMeetingTimes ) and got the list of suggestion result returned, \r\n\r\nHere is the code:\r\n\r\n        $findMeetingEventsUrl = '/me/findMeetingTimes';\r\n        $results = $graph->createRequest('POST', $findMeetingEventsUrl)\r\n            ->addHeaders(['Prefer'=> 'outlook.timezone=\"Pacific Standard Time\"'])\r\n            ->attachBody($newEvent)\r\n            ->setReturnType(Model\\MeetingTimeSuggestionsResult::class)\r\n            ->execute();\r\n\r\nWhen I call the getMeetingTimeSuggestions, I only get get an 'object' (\"MeetingTimeSuggtesions\") instead of array of \"MeetingTimeSuggtesions\". I expect to get the collections from this call. Do I miss something? Thank you.\r\n\r\n       Error\r\n       Cannot use object of type Microsoft\\Graph\\Model\\MeetingTimeSuggestion as array\r\n\r\n\r\n\r\n\r\nSource: https://github.com/microsoftgraph/msgraph-sdk-php/blob/dev/src/Model/MeetingTimeSuggestionsResult.php\r\n \r\n[AB#10302](https://microsoftgraph.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_workitems/edit/10302)","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/issues/comments/883942776","html_url":"https://github.com/microsoftgraph/msgraph-sdk-php/issues/557#issuecomment-883942776","issue_url":"https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/issues/557","id":883942776,"node_id":"IC_kwDOA_kxHM40r-V4","user":{"login":"SilasKenneth","id":11555354,"node_id":"MDQ6VXNlcjExNTU1MzU0","avatar_url":"https://avatars.githubusercontent.com/u/11555354?v=4","gravatar_id":"","url":"https://api.github.com/users/SilasKenneth","html_url":"https://github.com/SilasKenneth","followers_url":"https://api.github.com/users/SilasKenneth/followers","following_url":"https://api.github.com/users/SilasKenneth/following{/other_user}","gists_url":"https://api.github.com/users/SilasKenneth/gists{/gist_id}","starred_url":"https://api.github.com/users/SilasKenneth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SilasKenneth/subscriptions","organizations_url":"https://api.github.com/users/SilasKenneth/orgs","repos_url":"https://api.github.com/users/SilasKenneth/repos","events_url":"https://api.github.com/users/SilasKenneth/events{/privacy}","received_events_url":"https://api.github.com/users/SilasKenneth/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:00Z","updated_at":"2021-07-21T07:00:00Z","author_association":"MEMBER","body":"Related to #76 #97 ","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":17304259,"login":"microsoftgraph","gravatar_id":"","url":"https://api.github.com/orgs/microsoftgraph","avatar_url":"https://avatars.githubusercontent.com/u/17304259?"}}
+{"id":"17244791800","type":"PushEvent","actor":{"id":87482730,"login":"selabhust","display_login":"selabhust","gravatar_id":"","url":"https://api.github.com/users/selabhust","avatar_url":"https://avatars.githubusercontent.com/u/87482730?"},"repo":{"id":386300868,"name":"selabhust/home","url":"https://api.github.com/repos/selabhust/home"},"payload":{"push_id":7561706157,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"c6bb6978c20cc8abe91083d532bd79ba80ac8730","before":"43e696fd1a49c19d0cd0dacdd47dc740bca9191f","commits":[{"sha":"e200f8aa04419cdfcc0bc1e284ff63bb0ffff2ad","author":{"name":"selabhust","email":"13a82a6c3f5000321cbe8c6b7e9c7567b1dbdead@gmail.com"},"message":"update team, album","distinct":true,"url":"https://api.github.com/repos/selabhust/home/commits/e200f8aa04419cdfcc0bc1e284ff63bb0ffff2ad"},{"sha":"c6bb6978c20cc8abe91083d532bd79ba80ac8730","author":{"name":"selabhust","email":"13a82a6c3f5000321cbe8c6b7e9c7567b1dbdead@gmail.com"},"message":"Merge branch 'main' of https://github.com/selabhust/home into main","distinct":true,"url":"https://api.github.com/repos/selabhust/home/commits/c6bb6978c20cc8abe91083d532bd79ba80ac8730"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791804","type":"PushEvent","actor":{"id":72680186,"login":"bg-shorthand","display_login":"bg-shorthand","gravatar_id":"","url":"https://api.github.com/users/bg-shorthand","avatar_url":"https://avatars.githubusercontent.com/u/72680186?"},"repo":{"id":381590294,"name":"bg-shorthand/reserve-meet","url":"https://api.github.com/repos/bg-shorthand/reserve-meet"},"payload":{"push_id":7561706163,"size":9,"distinct_size":9,"ref":"refs/heads/master","head":"789adb7ceff02a1dbfc97f4e02a4e6a354967f67","before":"4492815520667522b4afb809e9ef32b7925fa43e","commits":[{"sha":"39016f2bafe9e359b84dc6f59629ab5045e14839","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[수정] 17시까지만 예약이 가능하도록 타임테이블, 종료시간 수정","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/39016f2bafe9e359b84dc6f59629ab5045e14839"},{"sha":"d1f18f787e4ddded6dfd1f9a6c5313b24d13548f","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[추가] 테이블에서 이전 시간은 예약을 막도록, 테이블을 흐릿하게 가림막","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/d1f18f787e4ddded6dfd1f9a6c5313b24d13548f"},{"sha":"88253282b9e8cc08b23ab0ea4ea4bf7d0a8a8b7b","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[수정] table > tr 에러처리","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/88253282b9e8cc08b23ab0ea4ea4bf7d0a8a8b7b"},{"sha":"792aecc1a149b19b77cb6c91c7afa55aeaaef917","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[수정] 테이블 가림막 높이 수정","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/792aecc1a149b19b77cb6c91c7afa55aeaaef917"},{"sha":"fed59fa5fedf0bba7a6c8ae5f75d508780f9cd82","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[수정] 전날에는 가림막이 전체를 가리도록, 다음날엔 가림막 삭제","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/fed59fa5fedf0bba7a6c8ae5f75d508780f9cd82"},{"sha":"fe54264296df7aa1d61743d62074d43c329b976c","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[추가] 회의 등록할 때 회의 이름 없으면 버튼 안 눌리게","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/fe54264296df7aa1d61743d62074d43c329b976c"},{"sha":"a0652c412068565152a1ab505eae755228cfdfc9","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[수정] 모달 다이얼로그 컨테이너 디렉토리 구분","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/a0652c412068565152a1ab505eae755228cfdfc9"},{"sha":"c6cd572466351c35d02c56fd6138615b05fcc32d","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[추가] 캘린더 추가하기\n\n1. calendarApi에 insertCalendar 추가\n2. 캘린더 리스트 아래 추가 버튼 추가\n3. newCalendar 모달 다이얼로그 추가(다이얼로그를 위한 상태 추가)","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/c6cd572466351c35d02c56fd6138615b05fcc32d"},{"sha":"789adb7ceff02a1dbfc97f4e02a4e6a354967f67","author":{"name":"한병국","email":"745954d696451689c6fbddb4bffa6e5ced9cec1e@gmail.com"},"message":"[추가] 현재 표시 중인 캘린더 fontWeight: 700","distinct":true,"url":"https://api.github.com/repos/bg-shorthand/reserve-meet/commits/789adb7ceff02a1dbfc97f4e02a4e6a354967f67"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791827","type":"PushEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388024715,"name":"thatjohn01/754365578","url":"https://api.github.com/repos/thatjohn01/754365578"},"payload":{"push_id":7561706175,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"5d7638319e0ea19597df177a8a51d73455ee1a7b","before":"2443e9e84518ed2cb7a31c51024e860fb9c3bbc0","commits":[{"sha":"5d7638319e0ea19597df177a8a51d73455ee1a7b","author":{"name":"thatjohn01","email":"72eb81e66410b3da65da4cca287ce0578825ce64@users.noreply.github.com"},"message":"change README.md","distinct":true,"url":"https://api.github.com/repos/thatjohn01/754365578/commits/5d7638319e0ea19597df177a8a51d73455ee1a7b"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791835","type":"PushEvent","actor":{"id":67408315,"login":"jheok318","display_login":"jheok318","gravatar_id":"","url":"https://api.github.com/users/jheok318","avatar_url":"https://avatars.githubusercontent.com/u/67408315?"},"repo":{"id":381617821,"name":"jheok318/mobigen-python-study-2021","url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021"},"payload":{"push_id":7561706176,"size":13,"distinct_size":13,"ref":"refs/heads/master","head":"d663eb4978a82ba5bf775da379da7defdda7eafc","before":"fef51dc263f08a7b1eddd2eb505fa1c4004c8592","commits":[{"sha":"457a39e4e2fdeb15c3ef0a38172b878fe265e88e","author":{"name":"서승환","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"[week3] Add presentation files (String, RE) (#15) (#17)\n\n장혜선 책임님 3주차 발표자료 업로드\r\n\r\nCo-authored-by: hyesunjang1201 <hyesunjang1201@users.noreply.github.com>\r\nSigned-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/457a39e4e2fdeb15c3ef0a38172b878fe265e88e"},{"sha":"1720a83ad3480bc4550561b2dbf3d1053d59338d","author":{"name":"seungfwani","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"Add week05 스터디_내용.md","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/1720a83ad3480bc4550561b2dbf3d1053d59338d"},{"sha":"85c598123b4b385397886490459e239523165d7c","author":{"name":"seungfwani","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"Update week05 스터디_내용.md","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/85c598123b4b385397886490459e239523165d7c"},{"sha":"9616631a4493e247fa246c86c1786f17662c2e13","author":{"name":"seungfwani","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"Update deque_performace example code","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/9616631a4493e247fa246c86c1786f17662c2e13"},{"sha":"46d7f7e5b5ccb7bd200c78aa82c8d3e4793b4ea8","author":{"name":"seungfwani","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"Add collections.abc example","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/46d7f7e5b5ccb7bd200c78aa82c8d3e4793b4ea8"},{"sha":"4bee73ee2d3adc8ba5abb4fbf89e921e2b850da4","author":{"name":"seungfwani","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"Update deque_performace test result","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/4bee73ee2d3adc8ba5abb4fbf89e921e2b850da4"},{"sha":"cfcab32d801dafac68759dc399034e8b0ec2b913","author":{"name":"JinHee","email":"a7d991dc3130579593e14445b71d1d909f95ff69@users.noreply.github.com"},"message":"[week05] Add presentation files - DataType (#22)\n\nAuthored-by: pojh5090 <pojh5090@users.noreply.github.com>\r\nSinged-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/cfcab32d801dafac68759dc399034e8b0ec2b913"},{"sha":"b53e6d5c18eb41e898044a2fb2b9466983d1100c","author":{"name":"최현민","email":"bc06dcf85f45629afa3a10f0ff5c050bd910f968@users.noreply.github.com"},"message":"[week03] Add homework - word_count & re (#20)\n\nAuthored-by: choihyuunmin <choihyuunmin@users.noreply.github.com>\r\nSinged-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/b53e6d5c18eb41e898044a2fb2b9466983d1100c"},{"sha":"ec4f0080cd3fdbee0d006289ea49dc1ea166940c","author":{"name":"seungfwani","email":"49bb3b1e0393b26cdae4c091e32b32511193655e@gmail.com"},"message":"Add week06 스터디_내용.md\n\nSigned-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/ec4f0080cd3fdbee0d006289ea49dc1ea166940c"},{"sha":"ad37a599cf99f662b812a4c11e6fcb1bb8a4a421","author":{"name":"jheok318","email":"51198ae36c500916a81d2cefd92ff109f7e2808b@gmail.com"},"message":"[week04] Add homework - answer of questions (#16)\n\nAuthored-by: jheok318 <cfd0318@gmail.com>\nSinged-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/ad37a599cf99f662b812a4c11e6fcb1bb8a4a421"},{"sha":"f881ba4d8b974a5107a2f20b560ca415794a2044","author":{"name":"gyojun","email":"b448e5c0d6e1314968770a7d2e20853f79be5c30@mobigen.com"},"message":"[week04] Add homework - answer of questions (#18)\n\nAuthored-by: Altera520 <Altera520@users.noreply.github.com>\nSinged-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/f881ba4d8b974a5107a2f20b560ca415794a2044"},{"sha":"b51fa33bba76039a38515d268ab0021dd01a21b0","author":{"name":"nayunoh16","email":"6dcea65820184544d371f4f82fe4df5cef303c99@users.noreply.github.com"},"message":"[week04] Add homework - answer of questions (#21)\n\nAuthored-by: nayunoh16 <58417462+nayunoh16@users.noreply.github.com>\nSinged-off-by: seungfwani <seungfwani2@gmail.com>","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/b51fa33bba76039a38515d268ab0021dd01a21b0"},{"sha":"d663eb4978a82ba5bf775da379da7defdda7eafc","author":{"name":"오준혁","email":"932857287d536e6ebd609979559b0ec2c07491af@jheok.local"},"message":"Merge branch 'master' of https://github.com/mobigen/mobigen-python-study-2021","distinct":true,"url":"https://api.github.com/repos/jheok318/mobigen-python-study-2021/commits/d663eb4978a82ba5bf775da379da7defdda7eafc"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791842","type":"PushEvent","actor":{"id":69377958,"login":"aikefu002","display_login":"aikefu002","gravatar_id":"","url":"https://api.github.com/users/aikefu002","avatar_url":"https://avatars.githubusercontent.com/u/69377958?"},"repo":{"id":343052750,"name":"aikefu002/book","url":"https://api.github.com/repos/aikefu002/book"},"payload":{"push_id":7561706180,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"4a91e32f13c6b83ed7ef3915a6653466e71c6bb7","before":"e65a16034a1837cdb57a2642a78c77c52c449e2e","commits":[{"sha":"4a91e32f13c6b83ed7ef3915a6653466e71c6bb7","author":{"name":"aikefu002","email":"81afe41e9034909903e17c7c7fb5aa6d9ac3e16c@users.noreply.github.com"},"message":"2021-07-21 14:59:58 upload 4ccb0a07d51045c7929740471e672868_400.jpeg","distinct":true,"url":"https://api.github.com/repos/aikefu002/book/commits/4a91e32f13c6b83ed7ef3915a6653466e71c6bb7"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791855","type":"PullRequestReviewEvent","actor":{"id":50898502,"login":"cothis","display_login":"cothis","gravatar_id":"","url":"https://api.github.com/users/cothis","avatar_url":"https://avatars.githubusercontent.com/u/50898502?"},"repo":{"id":385124567,"name":"woowa-techcamp-2021/deal-17","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17"},"payload":{"action":"created","review":{"id":711317352,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3MzUy","user":{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false},"body":null,"commit_id":"cb1568ae5f146dc08882a53ed030218de604cd3c","submitted_at":"2021-07-21T07:00:00Z","state":"commented","html_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119#pullrequestreview-711317352","pull_request_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119","author_association":"COLLABORATOR","_links":{"html":{"href":"https://github.com/woowa-techcamp-2021/deal-17/pull/119#pullrequestreview-711317352"},"pull_request":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119"}}},"pull_request":{"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119","id":693989579,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzOTg5NTc5","html_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119","diff_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119.diff","patch_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119.patch","issue_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119","number":119,"state":"open","locked":false,"title":"[feature/mypage] 로그인 시 메인페이지에서 회원정보 페이지로 이동","user":{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T02:13:48Z","updated_at":"2021-07-21T07:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"0e3370b7911358702d3c4ea59cc923ad68fe2e97","assignee":{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false},"assignees":[{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3160810249,"node_id":"MDU6TGFiZWwzMTYwODEwMjQ5","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/labels/frontend","name":"frontend","color":"8B0759","default":false,"description":""}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/commits","review_comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/comments","review_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/comments{/number}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119/comments","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/cb1568ae5f146dc08882a53ed030218de604cd3c","head":{"label":"woowa-techcamp-2021:feature/mypage","ref":"feature/mypage","sha":"cb1568ae5f146dc08882a53ed030218de604cd3c","user":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"repo":{"id":385124567,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjQ1Njc=","name":"deal-17","full_name":"woowa-techcamp-2021/deal-17","private":false,"owner":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/woowa-techcamp-2021/deal-17","description":"우아마켓 - 17팀 김채은, 윤민호","fork":false,"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17","forks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/forks","keys_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/keys{/key_id}","collaborators_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/teams","hooks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/hooks","issue_events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/events{/number}","events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/events","assignees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/assignees{/user}","branches_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/branches{/branch}","tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/tags","blobs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/refs{/sha}","trees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/trees{/sha}","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/{sha}","languages_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/languages","stargazers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/stargazers","contributors_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contributors","subscribers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscribers","subscription_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscription","commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/commits{/sha}","git_commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/commits{/sha}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/comments{/number}","issue_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/comments{/number}","contents_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contents/{+path}","compare_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/compare/{base}...{head}","merges_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/merges","archive_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/downloads","issues_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues{/number}","pulls_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls{/number}","milestones_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/milestones{/number}","notifications_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/labels{/name}","releases_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/releases{/id}","deployments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/deployments","created_at":"2021-07-12T04:29:47Z","updated_at":"2021-07-20T15:57:20Z","pushed_at":"2021-07-21T06:59:54Z","git_url":"git://github.com/woowa-techcamp-2021/deal-17.git","ssh_url":"git@github.com:woowa-techcamp-2021/deal-17.git","clone_url":"https://github.com/woowa-techcamp-2021/deal-17.git","svn_url":"https://github.com/woowa-techcamp-2021/deal-17","homepage":"","size":488,"stargazers_count":1,"watchers_count":1,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":11,"license":null,"forks":0,"open_issues":11,"watchers":1,"default_branch":"dev"}},"base":{"label":"woowa-techcamp-2021:dev","ref":"dev","sha":"dbb8ee602d263a0cfdd8c7b3890fab0303a73472","user":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"repo":{"id":385124567,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjQ1Njc=","name":"deal-17","full_name":"woowa-techcamp-2021/deal-17","private":false,"owner":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/woowa-techcamp-2021/deal-17","description":"우아마켓 - 17팀 김채은, 윤민호","fork":false,"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17","forks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/forks","keys_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/keys{/key_id}","collaborators_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/teams","hooks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/hooks","issue_events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/events{/number}","events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/events","assignees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/assignees{/user}","branches_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/branches{/branch}","tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/tags","blobs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/refs{/sha}","trees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/trees{/sha}","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/{sha}","languages_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/languages","stargazers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/stargazers","contributors_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contributors","subscribers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscribers","subscription_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscription","commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/commits{/sha}","git_commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/commits{/sha}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/comments{/number}","issue_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/comments{/number}","contents_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contents/{+path}","compare_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/compare/{base}...{head}","merges_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/merges","archive_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/downloads","issues_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues{/number}","pulls_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls{/number}","milestones_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/milestones{/number}","notifications_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/labels{/name}","releases_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/releases{/id}","deployments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/deployments","created_at":"2021-07-12T04:29:47Z","updated_at":"2021-07-20T15:57:20Z","pushed_at":"2021-07-21T06:59:54Z","git_url":"git://github.com/woowa-techcamp-2021/deal-17.git","ssh_url":"git@github.com:woowa-techcamp-2021/deal-17.git","clone_url":"https://github.com/woowa-techcamp-2021/deal-17.git","svn_url":"https://github.com/woowa-techcamp-2021/deal-17","homepage":"","size":488,"stargazers_count":1,"watchers_count":1,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":11,"license":null,"forks":0,"open_issues":11,"watchers":1,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119"},"html":{"href":"https://github.com/woowa-techcamp-2021/deal-17/pull/119"},"issue":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119"},"comments":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119/comments"},"review_comments":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/comments"},"review_comment":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/commits"},"statuses":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/cb1568ae5f146dc08882a53ed030218de604cd3c"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":86336942,"login":"woowa-techcamp-2021","gravatar_id":"","url":"https://api.github.com/orgs/woowa-techcamp-2021","avatar_url":"https://avatars.githubusercontent.com/u/86336942?"}}
+{"id":"17244791862","type":"PushEvent","actor":{"id":86361200,"login":"mariyaFiliya","display_login":"mariyaFiliya","gravatar_id":"","url":"https://api.github.com/users/mariyaFiliya","avatar_url":"https://avatars.githubusercontent.com/u/86361200?"},"repo":{"id":379609830,"name":"mariyaFiliya/-Python","url":"https://api.github.com/repos/mariyaFiliya/-Python"},"payload":{"push_id":7561706186,"size":1,"distinct_size":1,"ref":"refs/heads/lesson_7","head":"c4272c5a8cc377ef3098630041824fd36d62ea68","before":"c073d2a9257f3840dfc3e73cdcc96db963cdbb44","commits":[{"sha":"c4272c5a8cc377ef3098630041824fd36d62ea68","author":{"name":"cheshir","email":"720f44c8e896248c4aa6eb9c0504944260cfe693@gmail.com"},"message":"урок 7 - задание 1","distinct":true,"url":"https://api.github.com/repos/mariyaFiliya/-Python/commits/c4272c5a8cc377ef3098630041824fd36d62ea68"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791863","type":"CreateEvent","actor":{"id":81615240,"login":"Mehul57","display_login":"Mehul57","gravatar_id":"","url":"https://api.github.com/users/Mehul57","avatar_url":"https://avatars.githubusercontent.com/u/81615240?"},"repo":{"id":388024721,"name":"Mehul57/Project-30","url":"https://api.github.com/repos/Mehul57/Project-30"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791866","type":"PushEvent","actor":{"id":44427720,"login":"user11681","display_login":"user11681","gravatar_id":"","url":"https://api.github.com/users/user11681","avatar_url":"https://avatars.githubusercontent.com/u/44427720?"},"repo":{"id":388023362,"name":"user11681/archloom-forge-test","url":"https://api.github.com/repos/user11681/archloom-forge-test"},"payload":{"push_id":7561706192,"size":1,"distinct_size":1,"ref":"refs/heads/1.16","head":"243bfe67ed7a15033cdebf2f7dde4056146cd220","before":"fee28fd5b30d3f76a842d5db5bf703bf47c28160","commits":[{"sha":"243bfe67ed7a15033cdebf2f7dde4056146cd220","author":{"name":"user11681","email":"32f9b6ae0e0705b5c44297892453c854a8232bdc@gmail.com"},"message":"remove Fabric-specific information","distinct":true,"url":"https://api.github.com/repos/user11681/archloom-forge-test/commits/243bfe67ed7a15033cdebf2f7dde4056146cd220"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791867","type":"PushEvent","actor":{"id":76616434,"login":"oddfar","display_login":"oddfar","gravatar_id":"","url":"https://api.github.com/users/oddfar","avatar_url":"https://avatars.githubusercontent.com/u/76616434?"},"repo":{"id":358109980,"name":"oddfar/static","url":"https://api.github.com/repos/oddfar/static"},"payload":{"push_id":7561706193,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"c2f54368078462d3f26643e880f6d172d9a2ba0f","before":"53032aa8a65db2e824c43fe39f9275ac7f3c6144","commits":[{"sha":"c2f54368078462d3f26643e880f6d172d9a2ba0f","author":{"name":"oddfar","email":"d943519d353020e5f203d841cfec1dd7007febbd@163.com"},"message":"JUC","distinct":true,"url":"https://api.github.com/repos/oddfar/static/commits/c2f54368078462d3f26643e880f6d172d9a2ba0f"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791873","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":377774547,"name":"FrancesMadden/PIDResources","url":"https://api.github.com/repos/FrancesMadden/PIDResources"},"payload":{"push_id":7561706184,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"f81170fc949878c7989b7b52388ce42c6d5fa881","before":"49be7b4f883649baeb1ca334ebadf64eabc543bc","commits":[{"sha":"f81170fc949878c7989b7b52388ce42c6d5fa881","author":{"name":"FrancesMadden","email":"63a5fd3bc5f45a0490e4deca178d288050e26803@fv-az278-174.b3qsmdnmz0tudpq43p2gswzmkf.xx.internal.cloudapp.net"},"message":"Updating the repository GitHub html pages in the docs folder","distinct":true,"url":"https://api.github.com/repos/FrancesMadden/PIDResources/commits/f81170fc949878c7989b7b52388ce42c6d5fa881"}]},"public":true,"created_at":"2021-07-21T07:00:00Z"}
+{"id":"17244791876","type":"PullRequestReviewCommentEvent","actor":{"id":50898502,"login":"cothis","display_login":"cothis","gravatar_id":"","url":"https://api.github.com/users/cothis","avatar_url":"https://avatars.githubusercontent.com/u/50898502?"},"repo":{"id":385124567,"name":"woowa-techcamp-2021/deal-17","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/comments/673711119","pull_request_review_id":711317352,"id":673711119,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3MzcxMTExOQ==","diff_hunk":"@@ -28,13 +28,20 @@ export default class MypageView extends View {\n   }\n \n   render() {\n-    this.setTemplateData('username', 'test user');\n+    console.log(this.store.user);\n+    this.setTemplateData('username', this.store.user?.email!);\n     this.appendView(AnimateType.RIGHT, AnimateType.RIGHT);\n     new HeaderComponent('#mypageView__header', this.store, { title: '내 계정' }).render();\n-    new LoginButtonComponent('#myPage', this.store, { title: '로그아웃', id: 'logout', onClick: () => {} }).render();\n-\n-    this.container.querySelector('#logout')?.addEventListener('click', (e) => {\n-      RouterEvent.dispatchEvent('@back');\n-    });\n+    new LoginButtonComponent('#myPage', this.store, {\n+      title: '로그아웃',\n+      id: 'logout',\n+      onClick: () => {\n+        this.store.user = null;","path":"frontend/page/mypage-view.ts","position":null,"original_position":18,"commit_id":"cb1568ae5f146dc08882a53ed030218de604cd3c","original_commit_id":"c4b73b9c481b27e8a3648850c5e458203ca5b94e","user":{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false},"body":"수정했습니다","created_at":"2021-07-21T07:00:00Z","updated_at":"2021-07-21T07:00:00Z","html_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119#discussion_r673711119","pull_request_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119","author_association":"COLLABORATOR","_links":{"self":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/comments/673711119"},"html":{"href":"https://github.com/woowa-techcamp-2021/deal-17/pull/119#discussion_r673711119"},"pull_request":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119"}},"start_line":null,"original_start_line":null,"start_side":null,"line":null,"original_line":39,"side":"RIGHT","in_reply_to_id":673703709},"pull_request":{"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119","id":693989579,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzOTg5NTc5","html_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119","diff_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119.diff","patch_url":"https://github.com/woowa-techcamp-2021/deal-17/pull/119.patch","issue_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119","number":119,"state":"open","locked":false,"title":"[feature/mypage] 로그인 시 메인페이지에서 회원정보 페이지로 이동","user":{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T02:13:48Z","updated_at":"2021-07-21T07:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"0e3370b7911358702d3c4ea59cc923ad68fe2e97","assignee":{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false},"assignees":[{"login":"cothis","id":50898502,"node_id":"MDQ6VXNlcjUwODk4NTAy","avatar_url":"https://avatars.githubusercontent.com/u/50898502?v=4","gravatar_id":"","url":"https://api.github.com/users/cothis","html_url":"https://github.com/cothis","followers_url":"https://api.github.com/users/cothis/followers","following_url":"https://api.github.com/users/cothis/following{/other_user}","gists_url":"https://api.github.com/users/cothis/gists{/gist_id}","starred_url":"https://api.github.com/users/cothis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cothis/subscriptions","organizations_url":"https://api.github.com/users/cothis/orgs","repos_url":"https://api.github.com/users/cothis/repos","events_url":"https://api.github.com/users/cothis/events{/privacy}","received_events_url":"https://api.github.com/users/cothis/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3160810249,"node_id":"MDU6TGFiZWwzMTYwODEwMjQ5","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/labels/frontend","name":"frontend","color":"8B0759","default":false,"description":""}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/commits","review_comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/comments","review_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/comments{/number}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119/comments","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/cb1568ae5f146dc08882a53ed030218de604cd3c","head":{"label":"woowa-techcamp-2021:feature/mypage","ref":"feature/mypage","sha":"cb1568ae5f146dc08882a53ed030218de604cd3c","user":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"repo":{"id":385124567,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjQ1Njc=","name":"deal-17","full_name":"woowa-techcamp-2021/deal-17","private":false,"owner":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/woowa-techcamp-2021/deal-17","description":"우아마켓 - 17팀 김채은, 윤민호","fork":false,"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17","forks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/forks","keys_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/keys{/key_id}","collaborators_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/teams","hooks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/hooks","issue_events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/events{/number}","events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/events","assignees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/assignees{/user}","branches_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/branches{/branch}","tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/tags","blobs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/refs{/sha}","trees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/trees{/sha}","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/{sha}","languages_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/languages","stargazers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/stargazers","contributors_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contributors","subscribers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscribers","subscription_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscription","commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/commits{/sha}","git_commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/commits{/sha}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/comments{/number}","issue_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/comments{/number}","contents_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contents/{+path}","compare_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/compare/{base}...{head}","merges_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/merges","archive_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/downloads","issues_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues{/number}","pulls_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls{/number}","milestones_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/milestones{/number}","notifications_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/labels{/name}","releases_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/releases{/id}","deployments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/deployments","created_at":"2021-07-12T04:29:47Z","updated_at":"2021-07-20T15:57:20Z","pushed_at":"2021-07-21T06:59:54Z","git_url":"git://github.com/woowa-techcamp-2021/deal-17.git","ssh_url":"git@github.com:woowa-techcamp-2021/deal-17.git","clone_url":"https://github.com/woowa-techcamp-2021/deal-17.git","svn_url":"https://github.com/woowa-techcamp-2021/deal-17","homepage":"","size":488,"stargazers_count":1,"watchers_count":1,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":11,"license":null,"forks":0,"open_issues":11,"watchers":1,"default_branch":"dev"}},"base":{"label":"woowa-techcamp-2021:dev","ref":"dev","sha":"dbb8ee602d263a0cfdd8c7b3890fab0303a73472","user":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"repo":{"id":385124567,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMjQ1Njc=","name":"deal-17","full_name":"woowa-techcamp-2021/deal-17","private":false,"owner":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/woowa-techcamp-2021/deal-17","description":"우아마켓 - 17팀 김채은, 윤민호","fork":false,"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17","forks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/forks","keys_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/keys{/key_id}","collaborators_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/teams","hooks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/hooks","issue_events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/events{/number}","events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/events","assignees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/assignees{/user}","branches_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/branches{/branch}","tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/tags","blobs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/refs{/sha}","trees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/trees{/sha}","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/{sha}","languages_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/languages","stargazers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/stargazers","contributors_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contributors","subscribers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscribers","subscription_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/subscription","commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/commits{/sha}","git_commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/git/commits{/sha}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/comments{/number}","issue_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/comments{/number}","contents_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/contents/{+path}","compare_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/compare/{base}...{head}","merges_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/merges","archive_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/downloads","issues_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues{/number}","pulls_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls{/number}","milestones_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/milestones{/number}","notifications_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/labels{/name}","releases_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/releases{/id}","deployments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/deployments","created_at":"2021-07-12T04:29:47Z","updated_at":"2021-07-20T15:57:20Z","pushed_at":"2021-07-21T06:59:54Z","git_url":"git://github.com/woowa-techcamp-2021/deal-17.git","ssh_url":"git@github.com:woowa-techcamp-2021/deal-17.git","clone_url":"https://github.com/woowa-techcamp-2021/deal-17.git","svn_url":"https://github.com/woowa-techcamp-2021/deal-17","homepage":"","size":488,"stargazers_count":1,"watchers_count":1,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":11,"license":null,"forks":0,"open_issues":11,"watchers":1,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119"},"html":{"href":"https://github.com/woowa-techcamp-2021/deal-17/pull/119"},"issue":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119"},"comments":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/issues/119/comments"},"review_comments":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/comments"},"review_comment":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/pulls/119/commits"},"statuses":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-17/statuses/cb1568ae5f146dc08882a53ed030218de604cd3c"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:00Z","org":{"id":86336942,"login":"woowa-techcamp-2021","gravatar_id":"","url":"https://api.github.com/orgs/woowa-techcamp-2021","avatar_url":"https://avatars.githubusercontent.com/u/86336942?"}}
+{"id":"17244791881","type":"IssueCommentEvent","actor":{"id":1096355,"login":"gvissers","display_login":"gvissers","gravatar_id":"","url":"https://api.github.com/users/gvissers","avatar_url":"https://avatars.githubusercontent.com/u/1096355?"},"repo":{"id":2496724,"name":"raduprv/Eternal-Lands","url":"https://api.github.com/repos/raduprv/Eternal-Lands"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/raduprv/Eternal-Lands/issues/137","repository_url":"https://api.github.com/repos/raduprv/Eternal-Lands","labels_url":"https://api.github.com/repos/raduprv/Eternal-Lands/issues/137/labels{/name}","comments_url":"https://api.github.com/repos/raduprv/Eternal-Lands/issues/137/comments","events_url":"https://api.github.com/repos/raduprv/Eternal-Lands/issues/137/events","html_url":"https://github.com/raduprv/Eternal-Lands/issues/137","id":941448779,"node_id":"MDU6SXNzdWU5NDE0NDg3Nzk=","number":137,"title":"Coordinating the next release","user":{"login":"pjbroad","id":1093822,"node_id":"MDQ6VXNlcjEwOTM4MjI=","avatar_url":"https://avatars.githubusercontent.com/u/1093822?v=4","gravatar_id":"","url":"https://api.github.com/users/pjbroad","html_url":"https://github.com/pjbroad","followers_url":"https://api.github.com/users/pjbroad/followers","following_url":"https://api.github.com/users/pjbroad/following{/other_user}","gists_url":"https://api.github.com/users/pjbroad/gists{/gist_id}","starred_url":"https://api.github.com/users/pjbroad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pjbroad/subscriptions","organizations_url":"https://api.github.com/users/pjbroad/orgs","repos_url":"https://api.github.com/users/pjbroad/repos","events_url":"https://api.github.com/users/pjbroad/events{/privacy}","received_events_url":"https://api.github.com/users/pjbroad/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":12,"created_at":"2021-07-11T13:04:06Z","updated_at":"2021-07-21T07:00:00Z","closed_at":null,"author_association":"COLLABORATOR","active_lock_reason":null,"body":"We have a full client update coming that includes maps updates (from @feeltheburn) and a server update (from @raduprv).  This will be the next major version bump.  We've been holding off major changes to the client code so but have the exciting prospect of #132 (from @gvissers) so we need to decide whether to merge that so we can test fully before the release.  I'm in favour of merging #132 but what do others think?  Are there other changes should we consider?","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/raduprv/Eternal-Lands/issues/comments/883942781","html_url":"https://github.com/raduprv/Eternal-Lands/issues/137#issuecomment-883942781","issue_url":"https://api.github.com/repos/raduprv/Eternal-Lands/issues/137","id":883942781,"node_id":"IC_kwDOACYY1M40r-V9","user":{"login":"gvissers","id":1096355,"node_id":"MDQ6VXNlcjEwOTYzNTU=","avatar_url":"https://avatars.githubusercontent.com/u/1096355?v=4","gravatar_id":"","url":"https://api.github.com/users/gvissers","html_url":"https://github.com/gvissers","followers_url":"https://api.github.com/users/gvissers/followers","following_url":"https://api.github.com/users/gvissers/following{/other_user}","gists_url":"https://api.github.com/users/gvissers/gists{/gist_id}","starred_url":"https://api.github.com/users/gvissers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gvissers/subscriptions","organizations_url":"https://api.github.com/users/gvissers/orgs","repos_url":"https://api.github.com/users/gvissers/repos","events_url":"https://api.github.com/users/gvissers/events{/privacy}","received_events_url":"https://api.github.com/users/gvissers/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:00Z","updated_at":"2021-07-21T07:00:00Z","author_association":"COLLABORATOR","body":"I have merged #132 and enabled USE_SSL by default so that the code can get wider testing. Things should work as they were on unencrypted connections. Encrypted connections can be tested on Learner's proxies, just add the following lines to servers.lst:\r\n```\r\nlrnr-ssl-main   main            proxy1.other-life.com   3000    encrypted   Encrypted proxy to the main game server\r\nlrnr-ssl-test   test            proxy1.other-life.com   3001    encrypted   Encrypted proxy to the test server\r\n```\r\nUsing one of these will pop up a warning that the certificate could not be verified because these aren't distributed with the client yet. For now, just ignore the warning and click \"Continue\".\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791886","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":385301722,"name":"alyssafrndz/automatic-scraper","url":"https://api.github.com/repos/alyssafrndz/automatic-scraper"},"payload":{"push_id":7561706191,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"794fa4f28993792071408e2776e7780ed6987a5c","before":"9dae3aea34a4919e4ac04e4e66395715ab0f0395","commits":[{"sha":"794fa4f28993792071408e2776e7780ed6987a5c","author":{"name":"Automated","email":"326b426f9ac7a96ed6baf62f8838565416d27df8@users.noreply.github.com"},"message":"Latest data: Wed Jul 21 06:59:58 UTC 2021","distinct":true,"url":"https://api.github.com/repos/alyssafrndz/automatic-scraper/commits/794fa4f28993792071408e2776e7780ed6987a5c"}]},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791890","type":"CreateEvent","actor":{"id":8135172,"login":"LeonellS","display_login":"LeonellS","gravatar_id":"","url":"https://api.github.com/users/LeonellS","avatar_url":"https://avatars.githubusercontent.com/u/8135172?"},"repo":{"id":388024722,"name":"LeonellS/leonells.github.io","url":"https://api.github.com/repos/LeonellS/leonells.github.io"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791895","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":373733367,"name":"jakubm/phx-data","url":"https://api.github.com/repos/jakubm/phx-data"},"payload":{"push_id":7561706203,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"79e4de7dc1b756e701b1ad9f9f6f0ba6dd23e120","before":"6c2192fdb4b3fd81ba21720e68ac172a8be40dbd","commits":[{"sha":"79e4de7dc1b756e701b1ad9f9f6f0ba6dd23e120","author":{"name":"Automated","email":"326b426f9ac7a96ed6baf62f8838565416d27df8@users.noreply.github.com"},"message":"Latest data: Tue Jul 20 23:59:58 MST 2021","distinct":true,"url":"https://api.github.com/repos/jakubm/phx-data/commits/79e4de7dc1b756e701b1ad9f9f6f0ba6dd23e120"}]},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791906","type":"DeleteEvent","actor":{"id":19972370,"login":"goutamp","display_login":"goutamp","gravatar_id":"","url":"https://api.github.com/users/goutamp","avatar_url":"https://avatars.githubusercontent.com/u/19972370?"},"repo":{"id":368109195,"name":"goutamp/sample3","url":"https://api.github.com/repos/goutamp/sample3"},"payload":{"ref":"release-v1.0.6","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791913","type":"WatchEvent","actor":{"id":57927650,"login":"accaplan","display_login":"accaplan","gravatar_id":"","url":"https://api.github.com/users/accaplan","avatar_url":"https://avatars.githubusercontent.com/u/57927650?"},"repo":{"id":261786851,"name":"sparkbox/vue-storybook-starter","url":"https://api.github.com/repos/sparkbox/vue-storybook-starter"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":524508,"login":"sparkbox","gravatar_id":"","url":"https://api.github.com/orgs/sparkbox","avatar_url":"https://avatars.githubusercontent.com/u/524508?"}}
+{"id":"17244791914","type":"ForkEvent","actor":{"id":43455153,"login":"HantangFXW","display_login":"HantangFXW","gravatar_id":"","url":"https://api.github.com/users/HantangFXW","avatar_url":"https://avatars.githubusercontent.com/u/43455153?"},"repo":{"id":194904677,"name":"BorealisAI/de-simple","url":"https://api.github.com/repos/BorealisAI/de-simple"},"payload":{"forkee":{"id":388024723,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMjQ3MjM=","name":"de-simple","full_name":"HantangFXW/de-simple","private":false,"owner":{"login":"HantangFXW","id":43455153,"node_id":"MDQ6VXNlcjQzNDU1MTUz","avatar_url":"https://avatars.githubusercontent.com/u/43455153?v=4","gravatar_id":"","url":"https://api.github.com/users/HantangFXW","html_url":"https://github.com/HantangFXW","followers_url":"https://api.github.com/users/HantangFXW/followers","following_url":"https://api.github.com/users/HantangFXW/following{/other_user}","gists_url":"https://api.github.com/users/HantangFXW/gists{/gist_id}","starred_url":"https://api.github.com/users/HantangFXW/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HantangFXW/subscriptions","organizations_url":"https://api.github.com/users/HantangFXW/orgs","repos_url":"https://api.github.com/users/HantangFXW/repos","events_url":"https://api.github.com/users/HantangFXW/events{/privacy}","received_events_url":"https://api.github.com/users/HantangFXW/received_events","type":"User","site_admin":false},"html_url":"https://github.com/HantangFXW/de-simple","description":"Diachronic Embedding for Temporal Knowledge Graph Completion","fork":true,"url":"https://api.github.com/repos/HantangFXW/de-simple","forks_url":"https://api.github.com/repos/HantangFXW/de-simple/forks","keys_url":"https://api.github.com/repos/HantangFXW/de-simple/keys{/key_id}","collaborators_url":"https://api.github.com/repos/HantangFXW/de-simple/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/HantangFXW/de-simple/teams","hooks_url":"https://api.github.com/repos/HantangFXW/de-simple/hooks","issue_events_url":"https://api.github.com/repos/HantangFXW/de-simple/issues/events{/number}","events_url":"https://api.github.com/repos/HantangFXW/de-simple/events","assignees_url":"https://api.github.com/repos/HantangFXW/de-simple/assignees{/user}","branches_url":"https://api.github.com/repos/HantangFXW/de-simple/branches{/branch}","tags_url":"https://api.github.com/repos/HantangFXW/de-simple/tags","blobs_url":"https://api.github.com/repos/HantangFXW/de-simple/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/HantangFXW/de-simple/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/HantangFXW/de-simple/git/refs{/sha}","trees_url":"https://api.github.com/repos/HantangFXW/de-simple/git/trees{/sha}","statuses_url":"https://api.github.com/repos/HantangFXW/de-simple/statuses/{sha}","languages_url":"https://api.github.com/repos/HantangFXW/de-simple/languages","stargazers_url":"https://api.github.com/repos/HantangFXW/de-simple/stargazers","contributors_url":"https://api.github.com/repos/HantangFXW/de-simple/contributors","subscribers_url":"https://api.github.com/repos/HantangFXW/de-simple/subscribers","subscription_url":"https://api.github.com/repos/HantangFXW/de-simple/subscription","commits_url":"https://api.github.com/repos/HantangFXW/de-simple/commits{/sha}","git_commits_url":"https://api.github.com/repos/HantangFXW/de-simple/git/commits{/sha}","comments_url":"https://api.github.com/repos/HantangFXW/de-simple/comments{/number}","issue_comment_url":"https://api.github.com/repos/HantangFXW/de-simple/issues/comments{/number}","contents_url":"https://api.github.com/repos/HantangFXW/de-simple/contents/{+path}","compare_url":"https://api.github.com/repos/HantangFXW/de-simple/compare/{base}...{head}","merges_url":"https://api.github.com/repos/HantangFXW/de-simple/merges","archive_url":"https://api.github.com/repos/HantangFXW/de-simple/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/HantangFXW/de-simple/downloads","issues_url":"https://api.github.com/repos/HantangFXW/de-simple/issues{/number}","pulls_url":"https://api.github.com/repos/HantangFXW/de-simple/pulls{/number}","milestones_url":"https://api.github.com/repos/HantangFXW/de-simple/milestones{/number}","notifications_url":"https://api.github.com/repos/HantangFXW/de-simple/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/HantangFXW/de-simple/labels{/name}","releases_url":"https://api.github.com/repos/HantangFXW/de-simple/releases{/id}","deployments_url":"https://api.github.com/repos/HantangFXW/de-simple/deployments","created_at":"2021-07-21T07:00:00Z","updated_at":"2021-07-14T06:55:46Z","pushed_at":"2019-12-19T20:46:21Z","git_url":"git://github.com/HantangFXW/de-simple.git","ssh_url":"git@github.com:HantangFXW/de-simple.git","clone_url":"https://github.com/HantangFXW/de-simple.git","svn_url":"https://github.com/HantangFXW/de-simple","homepage":"","size":28533,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":38730800,"login":"BorealisAI","gravatar_id":"","url":"https://api.github.com/orgs/BorealisAI","avatar_url":"https://avatars.githubusercontent.com/u/38730800?"}}
+{"id":"17244791921","type":"PullRequestEvent","actor":{"id":76930969,"login":"agenius-mohammed-ali","display_login":"agenius-mohammed-ali","gravatar_id":"","url":"https://api.github.com/users/agenius-mohammed-ali","avatar_url":"https://avatars.githubusercontent.com/u/76930969?"},"repo":{"id":341858207,"name":"saranya-ag/DGEobj.plots","url":"https://api.github.com/repos/saranya-ag/DGEobj.plots"},"payload":{"action":"opened","number":13,"pull_request":{"url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/13","id":694104861,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODYx","html_url":"https://github.com/saranya-ag/DGEobj.plots/pull/13","diff_url":"https://github.com/saranya-ag/DGEobj.plots/pull/13.diff","patch_url":"https://github.com/saranya-ag/DGEobj.plots/pull/13.patch","issue_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues/13","number":13,"state":"open","locked":false,"title":"Develop","user":{"login":"agenius-mohammed-ali","id":76930969,"node_id":"MDQ6VXNlcjc2OTMwOTY5","avatar_url":"https://avatars.githubusercontent.com/u/76930969?v=4","gravatar_id":"","url":"https://api.github.com/users/agenius-mohammed-ali","html_url":"https://github.com/agenius-mohammed-ali","followers_url":"https://api.github.com/users/agenius-mohammed-ali/followers","following_url":"https://api.github.com/users/agenius-mohammed-ali/following{/other_user}","gists_url":"https://api.github.com/users/agenius-mohammed-ali/gists{/gist_id}","starred_url":"https://api.github.com/users/agenius-mohammed-ali/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/agenius-mohammed-ali/subscriptions","organizations_url":"https://api.github.com/users/agenius-mohammed-ali/orgs","repos_url":"https://api.github.com/users/agenius-mohammed-ali/repos","events_url":"https://api.github.com/users/agenius-mohammed-ali/events{/privacy}","received_events_url":"https://api.github.com/users/agenius-mohammed-ali/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:00:00Z","updated_at":"2021-07-21T07:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/13/commits","review_comments_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/13/comments","review_comment_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/comments{/number}","comments_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues/13/comments","statuses_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/statuses/4bbd2e9bbafc54bafc6d8f7a502d6d93e6afe485","head":{"label":"agenius-mohammed-ali:develop","ref":"develop","sha":"4bbd2e9bbafc54bafc6d8f7a502d6d93e6afe485","user":{"login":"agenius-mohammed-ali","id":76930969,"node_id":"MDQ6VXNlcjc2OTMwOTY5","avatar_url":"https://avatars.githubusercontent.com/u/76930969?v=4","gravatar_id":"","url":"https://api.github.com/users/agenius-mohammed-ali","html_url":"https://github.com/agenius-mohammed-ali","followers_url":"https://api.github.com/users/agenius-mohammed-ali/followers","following_url":"https://api.github.com/users/agenius-mohammed-ali/following{/other_user}","gists_url":"https://api.github.com/users/agenius-mohammed-ali/gists{/gist_id}","starred_url":"https://api.github.com/users/agenius-mohammed-ali/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/agenius-mohammed-ali/subscriptions","organizations_url":"https://api.github.com/users/agenius-mohammed-ali/orgs","repos_url":"https://api.github.com/users/agenius-mohammed-ali/repos","events_url":"https://api.github.com/users/agenius-mohammed-ali/events{/privacy}","received_events_url":"https://api.github.com/users/agenius-mohammed-ali/received_events","type":"User","site_admin":false},"repo":{"id":328005118,"node_id":"MDEwOlJlcG9zaXRvcnkzMjgwMDUxMTg=","name":"DGEobj.plots","full_name":"agenius-mohammed-ali/DGEobj.plots","private":false,"owner":{"login":"agenius-mohammed-ali","id":76930969,"node_id":"MDQ6VXNlcjc2OTMwOTY5","avatar_url":"https://avatars.githubusercontent.com/u/76930969?v=4","gravatar_id":"","url":"https://api.github.com/users/agenius-mohammed-ali","html_url":"https://github.com/agenius-mohammed-ali","followers_url":"https://api.github.com/users/agenius-mohammed-ali/followers","following_url":"https://api.github.com/users/agenius-mohammed-ali/following{/other_user}","gists_url":"https://api.github.com/users/agenius-mohammed-ali/gists{/gist_id}","starred_url":"https://api.github.com/users/agenius-mohammed-ali/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/agenius-mohammed-ali/subscriptions","organizations_url":"https://api.github.com/users/agenius-mohammed-ali/orgs","repos_url":"https://api.github.com/users/agenius-mohammed-ali/repos","events_url":"https://api.github.com/users/agenius-mohammed-ali/events{/privacy}","received_events_url":"https://api.github.com/users/agenius-mohammed-ali/received_events","type":"User","site_admin":false},"html_url":"https://github.com/agenius-mohammed-ali/DGEobj.plots","description":"DGE Plotting tools designed to work with the DGEobj data structure.","fork":true,"url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots","forks_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/forks","keys_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/keys{/key_id}","collaborators_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/teams","hooks_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/hooks","issue_events_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/issues/events{/number}","events_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/events","assignees_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/assignees{/user}","branches_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/branches{/branch}","tags_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/tags","blobs_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/git/refs{/sha}","trees_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/git/trees{/sha}","statuses_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/statuses/{sha}","languages_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/languages","stargazers_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/stargazers","contributors_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/contributors","subscribers_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/subscribers","subscription_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/subscription","commits_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/commits{/sha}","git_commits_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/git/commits{/sha}","comments_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/comments{/number}","issue_comment_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/issues/comments{/number}","contents_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/contents/{+path}","compare_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/compare/{base}...{head}","merges_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/merges","archive_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/downloads","issues_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/issues{/number}","pulls_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/pulls{/number}","milestones_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/milestones{/number}","notifications_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/labels{/name}","releases_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/releases{/id}","deployments_url":"https://api.github.com/repos/agenius-mohammed-ali/DGEobj.plots/deployments","created_at":"2021-01-08T20:26:49Z","updated_at":"2021-02-15T05:25:39Z","pushed_at":"2021-07-20T14:49:07Z","git_url":"git://github.com/agenius-mohammed-ali/DGEobj.plots.git","ssh_url":"git@github.com:agenius-mohammed-ali/DGEobj.plots.git","clone_url":"https://github.com/agenius-mohammed-ali/DGEobj.plots.git","svn_url":"https://github.com/agenius-mohammed-ali/DGEobj.plots","homepage":null,"size":416,"stargazers_count":0,"watchers_count":0,"language":"R","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"base":{"label":"saranya-ag:develop","ref":"develop","sha":"9e0b7d697dab6972b70f3139b5a04dccb14562c4","user":{"login":"saranya-ag","id":51917619,"node_id":"MDQ6VXNlcjUxOTE3NjE5","avatar_url":"https://avatars.githubusercontent.com/u/51917619?v=4","gravatar_id":"","url":"https://api.github.com/users/saranya-ag","html_url":"https://github.com/saranya-ag","followers_url":"https://api.github.com/users/saranya-ag/followers","following_url":"https://api.github.com/users/saranya-ag/following{/other_user}","gists_url":"https://api.github.com/users/saranya-ag/gists{/gist_id}","starred_url":"https://api.github.com/users/saranya-ag/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saranya-ag/subscriptions","organizations_url":"https://api.github.com/users/saranya-ag/orgs","repos_url":"https://api.github.com/users/saranya-ag/repos","events_url":"https://api.github.com/users/saranya-ag/events{/privacy}","received_events_url":"https://api.github.com/users/saranya-ag/received_events","type":"User","site_admin":false},"repo":{"id":341858207,"node_id":"MDEwOlJlcG9zaXRvcnkzNDE4NTgyMDc=","name":"DGEobj.plots","full_name":"saranya-ag/DGEobj.plots","private":false,"owner":{"login":"saranya-ag","id":51917619,"node_id":"MDQ6VXNlcjUxOTE3NjE5","avatar_url":"https://avatars.githubusercontent.com/u/51917619?v=4","gravatar_id":"","url":"https://api.github.com/users/saranya-ag","html_url":"https://github.com/saranya-ag","followers_url":"https://api.github.com/users/saranya-ag/followers","following_url":"https://api.github.com/users/saranya-ag/following{/other_user}","gists_url":"https://api.github.com/users/saranya-ag/gists{/gist_id}","starred_url":"https://api.github.com/users/saranya-ag/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saranya-ag/subscriptions","organizations_url":"https://api.github.com/users/saranya-ag/orgs","repos_url":"https://api.github.com/users/saranya-ag/repos","events_url":"https://api.github.com/users/saranya-ag/events{/privacy}","received_events_url":"https://api.github.com/users/saranya-ag/received_events","type":"User","site_admin":false},"html_url":"https://github.com/saranya-ag/DGEobj.plots","description":"DGE Plotting tools designed to work with the DGEobj data structure.","fork":true,"url":"https://api.github.com/repos/saranya-ag/DGEobj.plots","forks_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/forks","keys_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/keys{/key_id}","collaborators_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/teams","hooks_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/hooks","issue_events_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues/events{/number}","events_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/events","assignees_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/assignees{/user}","branches_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/branches{/branch}","tags_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/tags","blobs_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/git/refs{/sha}","trees_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/git/trees{/sha}","statuses_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/statuses/{sha}","languages_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/languages","stargazers_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/stargazers","contributors_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/contributors","subscribers_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/subscribers","subscription_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/subscription","commits_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/commits{/sha}","git_commits_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/git/commits{/sha}","comments_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/comments{/number}","issue_comment_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues/comments{/number}","contents_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/contents/{+path}","compare_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/compare/{base}...{head}","merges_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/merges","archive_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/downloads","issues_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues{/number}","pulls_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls{/number}","milestones_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/milestones{/number}","notifications_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/labels{/name}","releases_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/releases{/id}","deployments_url":"https://api.github.com/repos/saranya-ag/DGEobj.plots/deployments","created_at":"2021-02-24T10:10:55Z","updated_at":"2021-02-24T10:10:56Z","pushed_at":"2021-07-20T14:49:09Z","git_url":"git://github.com/saranya-ag/DGEobj.plots.git","ssh_url":"git@github.com:saranya-ag/DGEobj.plots.git","clone_url":"https://github.com/saranya-ag/DGEobj.plots.git","svn_url":"https://github.com/saranya-ag/DGEobj.plots","homepage":null,"size":344,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":null,"forks":0,"open_issues":5,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/13"},"html":{"href":"https://github.com/saranya-ag/DGEobj.plots/pull/13"},"issue":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues/13"},"comments":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/issues/13/comments"},"review_comments":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/13/comments"},"review_comment":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/pulls/13/commits"},"statuses":{"href":"https://api.github.com/repos/saranya-ag/DGEobj.plots/statuses/4bbd2e9bbafc54bafc6d8f7a502d6d93e6afe485"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":87,"additions":7129,"deletions":2640,"changed_files":37}},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791922","type":"PushEvent","actor":{"id":4085151,"login":"umbros","display_login":"umbros","gravatar_id":"","url":"https://api.github.com/users/umbros","avatar_url":"https://avatars.githubusercontent.com/u/4085151?"},"repo":{"id":357874499,"name":"pcm-dpc/DPC-Bollettini-Criticita-Idrogeologica-Idraulica","url":"https://api.github.com/repos/pcm-dpc/DPC-Bollettini-Criticita-Idrogeologica-Idraulica"},"payload":{"push_id":7561706207,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8f1aeffcb0e28ad03cb027dee932ad497704437e","before":"f185084404afc6ed8f87fded2765b0df87b5788c","commits":[{"sha":"8f1aeffcb0e28ad03cb027dee932ad497704437e","author":{"name":"pcm-dpc","email":"b0251f6150d8b49ab6136a836e55d225b09599de@protezionecivile.it"},"message":"Published by DPC Github Pipeline","distinct":true,"url":"https://api.github.com/repos/pcm-dpc/DPC-Bollettini-Criticita-Idrogeologica-Idraulica/commits/8f1aeffcb0e28ad03cb027dee932ad497704437e"}]},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":61385480,"login":"pcm-dpc","gravatar_id":"","url":"https://api.github.com/orgs/pcm-dpc","avatar_url":"https://avatars.githubusercontent.com/u/61385480?"}}
+{"id":"17244791940","type":"PushEvent","actor":{"id":4061040,"login":"irJERAD","display_login":"irJERAD","gravatar_id":"","url":"https://api.github.com/users/irJERAD","avatar_url":"https://avatars.githubusercontent.com/u/4061040?"},"repo":{"id":359328023,"name":"irJERAD/jerad","url":"https://api.github.com/repos/irJERAD/jerad"},"payload":{"push_id":7561706222,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"369bcda906d4e4887653f9492279f4a62e5ea1f9","before":"04d2463b34049d5fb7685dc31f20cab93ab5fd61","commits":[{"sha":"369bcda906d4e4887653f9492279f4a62e5ea1f9","author":{"name":"Jerad","email":"07180e29522c63a29aa310901dd2038f90e083ee@gmail.com"},"message":"this should clear things up","distinct":true,"url":"https://api.github.com/repos/irJERAD/jerad/commits/369bcda906d4e4887653f9492279f4a62e5ea1f9"}]},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791942","type":"PushEvent","actor":{"id":34388810,"login":"NickGeramanis","display_login":"NickGeramanis","gravatar_id":"","url":"https://api.github.com/users/NickGeramanis","avatar_url":"https://avatars.githubusercontent.com/u/34388810?"},"repo":{"id":382729875,"name":"NickGeramanis/denoising-inpainting-lbp","url":"https://api.github.com/repos/NickGeramanis/denoising-inpainting-lbp"},"payload":{"push_id":7561706213,"size":1,"distinct_size":1,"ref":"refs/heads/gh-pages","head":"37e4ed0691cf3eb94446f8806298c736fe2deee9","before":"ebd4f735508e9fb9087ffc11288b4516f16d5a3c","commits":[{"sha":"37e4ed0691cf3eb94446f8806298c736fe2deee9","author":{"name":"NickGer","email":"0441ee8f7690af8f679f359d20d088dabb70e20c@gmail.com"},"message":"changed to html, not yet completed","distinct":true,"url":"https://api.github.com/repos/NickGeramanis/denoising-inpainting-lbp/commits/37e4ed0691cf3eb94446f8806298c736fe2deee9"}]},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791943","type":"PushEvent","actor":{"id":56509042,"login":"shakhawat07","display_login":"shakhawat07","gravatar_id":"","url":"https://api.github.com/users/shakhawat07","avatar_url":"https://avatars.githubusercontent.com/u/56509042?"},"repo":{"id":387504787,"name":"shakhawat07/getting-started-bootstrap","url":"https://api.github.com/repos/shakhawat07/getting-started-bootstrap"},"payload":{"push_id":7561706218,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8fdf0fed8cd4696808bad2f786eeb05631aab1f9","before":"c09b29903566b6b195e6b09d3e46090edec19b26","commits":[{"sha":"8fdf0fed8cd4696808bad2f786eeb05631aab1f9","author":{"name":"shakhawat07","email":"2d5003e191ce0b0270b024f1e58da60326159b48@gmail.com"},"message":"carousel.html added","distinct":true,"url":"https://api.github.com/repos/shakhawat07/getting-started-bootstrap/commits/8fdf0fed8cd4696808bad2f786eeb05631aab1f9"}]},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791952","type":"IssueCommentEvent","actor":{"id":29044647,"login":"NicolaZee","display_login":"NicolaZee","gravatar_id":"","url":"https://api.github.com/users/NicolaZee","avatar_url":"https://avatars.githubusercontent.com/u/29044647?"},"repo":{"id":65782263,"name":"NPBruce/valkyrie","url":"https://api.github.com/repos/NPBruce/valkyrie"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/NPBruce/valkyrie/issues/1451","repository_url":"https://api.github.com/repos/NPBruce/valkyrie","labels_url":"https://api.github.com/repos/NPBruce/valkyrie/issues/1451/labels{/name}","comments_url":"https://api.github.com/repos/NPBruce/valkyrie/issues/1451/comments","events_url":"https://api.github.com/repos/NPBruce/valkyrie/issues/1451/events","html_url":"https://github.com/NPBruce/valkyrie/issues/1451","id":802713736,"node_id":"MDU6SXNzdWU4MDI3MTM3MzY=","number":1451,"title":"[Feature] Add event visibility indicator ","user":{"login":"antontimmermans","id":42072372,"node_id":"MDQ6VXNlcjQyMDcyMzcy","avatar_url":"https://avatars.githubusercontent.com/u/42072372?v=4","gravatar_id":"","url":"https://api.github.com/users/antontimmermans","html_url":"https://github.com/antontimmermans","followers_url":"https://api.github.com/users/antontimmermans/followers","following_url":"https://api.github.com/users/antontimmermans/following{/other_user}","gists_url":"https://api.github.com/users/antontimmermans/gists{/gist_id}","starred_url":"https://api.github.com/users/antontimmermans/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/antontimmermans/subscriptions","organizations_url":"https://api.github.com/users/antontimmermans/orgs","repos_url":"https://api.github.com/users/antontimmermans/repos","events_url":"https://api.github.com/users/antontimmermans/events{/privacy}","received_events_url":"https://api.github.com/users/antontimmermans/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-02-06T14:29:52Z","updated_at":"2021-07-21T07:00:01Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"<!--\r\n  Thank you for proposing a new feature! To streamline our all efforts, please\r\n  first read this short paragraph. If you can check all the boxes below, go for\r\n  it and propose the feature!\r\n\r\n  - [ ] I will update AddFeatureShortDescriptionHere in the issue title to contain a useful short description for the feature (this makes the list look much cleaner ;)\r\n  - [ ] I have searched the documentation to make sure I did not overlook it.\r\n  - [ ] Valkyrie's current features cannot be used to approximate this behaviour.\r\n  - [ ] I have searched all issues (open and closed) to see if someone else\r\n        wants something similar to which I could propose modifications (two\r\n        features in one are easier and faster for us to implement).\r\n-->\r\n\r\n## Is your feature request related to a problem? Please describe.**\r\nWhen you move events around (for example to add variation to a scenario), it happens that an event that once had text and an active button becomes a 'silent event'. (and sometimes the other way around). \r\nThat event must become invisible (or silent).\r\nThis does not always happen, and it is difficult to spot.\r\n\r\n## Describe the solution you'd like\r\nA clear and concise description of what you want to happen.\r\nAdd a field + tickbox in the editor for **events** and **tokens** that shows if they are processed silently or not. In principle, it should who if the event or token contains `display=false` in its code'. With that tickbox, you should also be able to force it to be visible or not. \r\n `display=false` : Box is empty\r\n\r\n![image](https://user-images.githubusercontent.com/42072372/107120897-cdf61280-688f-11eb-8e73-1a119cb0c6d3.png)\r\n\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/NPBruce/valkyrie/issues/comments/883942784","html_url":"https://github.com/NPBruce/valkyrie/issues/1451#issuecomment-883942784","issue_url":"https://api.github.com/repos/NPBruce/valkyrie/issues/1451","id":883942784,"node_id":"IC_kwDOA-vB9840r-WA","user":{"login":"NicolaZee","id":29044647,"node_id":"MDQ6VXNlcjI5MDQ0NjQ3","avatar_url":"https://avatars.githubusercontent.com/u/29044647?v=4","gravatar_id":"","url":"https://api.github.com/users/NicolaZee","html_url":"https://github.com/NicolaZee","followers_url":"https://api.github.com/users/NicolaZee/followers","following_url":"https://api.github.com/users/NicolaZee/following{/other_user}","gists_url":"https://api.github.com/users/NicolaZee/gists{/gist_id}","starred_url":"https://api.github.com/users/NicolaZee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NicolaZee/subscriptions","organizations_url":"https://api.github.com/users/NicolaZee/orgs","repos_url":"https://api.github.com/users/NicolaZee/repos","events_url":"https://api.github.com/users/NicolaZee/events{/privacy}","received_events_url":"https://api.github.com/users/NicolaZee/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:01Z","updated_at":"2021-07-21T07:00:01Z","author_association":"NONE","body":"Good idea to show the Display Tick box.  That way it is easier to spot the bug has occurred.   But the underlying issue is a bug and sometime (hopefully) the bug will be fixed.  So, I suggest not having the tick box enabled and instead raise an issue to request the  bug to be fixed.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791956","type":"WatchEvent","actor":{"id":11945133,"login":"huangshichao","display_login":"huangshichao","gravatar_id":"","url":"https://api.github.com/users/huangshichao","avatar_url":"https://avatars.githubusercontent.com/u/11945133?"},"repo":{"id":138895417,"name":"bash-c/pin-in-CTF","url":"https://api.github.com/repos/bash-c/pin-in-CTF"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791962","type":"PushEvent","actor":{"id":69785449,"login":"koichimatz","display_login":"koichimatz","gravatar_id":"","url":"https://api.github.com/users/koichimatz","avatar_url":"https://avatars.githubusercontent.com/u/69785449?"},"repo":{"id":386122519,"name":"dwc-mimm/work-github","url":"https://api.github.com/repos/dwc-mimm/work-github"},"payload":{"push_id":7561706232,"size":1,"distinct_size":1,"ref":"refs/heads/make-header","head":"ee64ccf8ee50fca46c99e2b164f8eecee043f294","before":"c7d62be981e1f63054297a16a913017d9ebfd127","commits":[{"sha":"ee64ccf8ee50fca46c99e2b164f8eecee043f294","author":{"name":"koichimatz","email":"31cb1c31bfb4e160dd3b3f96703f086589adf6e6@gmail.com"},"message":"[Add]Header&Footer&Siderbar&Searchbox","distinct":true,"url":"https://api.github.com/repos/dwc-mimm/work-github/commits/ee64ccf8ee50fca46c99e2b164f8eecee043f294"}]},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":87454251,"login":"dwc-mimm","gravatar_id":"","url":"https://api.github.com/orgs/dwc-mimm","avatar_url":"https://avatars.githubusercontent.com/u/87454251?"}}
+{"id":"17244791971","type":"PullRequestReviewEvent","actor":{"id":1019641,"login":"rvl","display_login":"rvl","gravatar_id":"","url":"https://api.github.com/users/rvl","avatar_url":"https://avatars.githubusercontent.com/u/1019641?"},"repo":{"id":173286031,"name":"input-output-hk/cardano-wallet","url":"https://api.github.com/repos/input-output-hk/cardano-wallet"},"payload":{"action":"created","review":{"id":711317243,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3MjQz","user":{"login":"rvl","id":1019641,"node_id":"MDQ6VXNlcjEwMTk2NDE=","avatar_url":"https://avatars.githubusercontent.com/u/1019641?v=4","gravatar_id":"","url":"https://api.github.com/users/rvl","html_url":"https://github.com/rvl","followers_url":"https://api.github.com/users/rvl/followers","following_url":"https://api.github.com/users/rvl/following{/other_user}","gists_url":"https://api.github.com/users/rvl/gists{/gist_id}","starred_url":"https://api.github.com/users/rvl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rvl/subscriptions","organizations_url":"https://api.github.com/users/rvl/orgs","repos_url":"https://api.github.com/users/rvl/repos","events_url":"https://api.github.com/users/rvl/events{/privacy}","received_events_url":"https://api.github.com/users/rvl/received_events","type":"User","site_admin":false},"body":":+1:","commit_id":"6331d91891bd1639873947dd9e0854534e9a4207","submitted_at":"2021-07-21T07:00:01Z","state":"approved","html_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770#pullrequestreview-711317243","pull_request_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/input-output-hk/cardano-wallet/pull/2770#pullrequestreview-711317243"},"pull_request":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770"}}},"pull_request":{"url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770","id":693500926,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNTAwOTI2","html_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770","diff_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770.diff","patch_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770.patch","issue_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770","number":2770,"state":"open","locked":false,"title":"switch to newer node in e2e docker workflow","user":{"login":"piotr-iohk","id":42900201,"node_id":"MDQ6VXNlcjQyOTAwMjAx","avatar_url":"https://avatars.githubusercontent.com/u/42900201?v=4","gravatar_id":"","url":"https://api.github.com/users/piotr-iohk","html_url":"https://github.com/piotr-iohk","followers_url":"https://api.github.com/users/piotr-iohk/followers","following_url":"https://api.github.com/users/piotr-iohk/following{/other_user}","gists_url":"https://api.github.com/users/piotr-iohk/gists{/gist_id}","starred_url":"https://api.github.com/users/piotr-iohk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/piotr-iohk/subscriptions","organizations_url":"https://api.github.com/users/piotr-iohk/orgs","repos_url":"https://api.github.com/users/piotr-iohk/repos","events_url":"https://api.github.com/users/piotr-iohk/events{/privacy}","received_events_url":"https://api.github.com/users/piotr-iohk/received_events","type":"User","site_admin":false},"body":"# Issue Number\r\n\r\n<!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. -->\r\n\r\n\r\n# Overview\r\n\r\n<!-- Detail in a few bullet points the work accomplished in this PR -->\r\n\r\n- [ ] switch to newer node in e2e docker workflow\r\n\r\n\r\n# Comments\r\n\r\nSince cardano-wallet master doesn't work with cardano-node `1.27.0` switching temporarily to `alonzo-white-1.1`.","created_at":"2021-07-20T14:10:28Z","updated_at":"2021-07-21T07:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"ca5f44152d091000a4b646768b32571ddeeb26e8","assignee":{"login":"piotr-iohk","id":42900201,"node_id":"MDQ6VXNlcjQyOTAwMjAx","avatar_url":"https://avatars.githubusercontent.com/u/42900201?v=4","gravatar_id":"","url":"https://api.github.com/users/piotr-iohk","html_url":"https://github.com/piotr-iohk","followers_url":"https://api.github.com/users/piotr-iohk/followers","following_url":"https://api.github.com/users/piotr-iohk/following{/other_user}","gists_url":"https://api.github.com/users/piotr-iohk/gists{/gist_id}","starred_url":"https://api.github.com/users/piotr-iohk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/piotr-iohk/subscriptions","organizations_url":"https://api.github.com/users/piotr-iohk/orgs","repos_url":"https://api.github.com/users/piotr-iohk/repos","events_url":"https://api.github.com/users/piotr-iohk/events{/privacy}","received_events_url":"https://api.github.com/users/piotr-iohk/received_events","type":"User","site_admin":false},"assignees":[{"login":"piotr-iohk","id":42900201,"node_id":"MDQ6VXNlcjQyOTAwMjAx","avatar_url":"https://avatars.githubusercontent.com/u/42900201?v=4","gravatar_id":"","url":"https://api.github.com/users/piotr-iohk","html_url":"https://github.com/piotr-iohk","followers_url":"https://api.github.com/users/piotr-iohk/followers","following_url":"https://api.github.com/users/piotr-iohk/following{/other_user}","gists_url":"https://api.github.com/users/piotr-iohk/gists{/gist_id}","starred_url":"https://api.github.com/users/piotr-iohk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/piotr-iohk/subscriptions","organizations_url":"https://api.github.com/users/piotr-iohk/orgs","repos_url":"https://api.github.com/users/piotr-iohk/repos","events_url":"https://api.github.com/users/piotr-iohk/events{/privacy}","received_events_url":"https://api.github.com/users/piotr-iohk/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/commits","review_comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/comments","review_comment_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/comments{/number}","comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770/comments","statuses_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/6331d91891bd1639873947dd9e0854534e9a4207","head":{"label":"input-output-hk:piotr/e2e-tests-maintenance","ref":"piotr/e2e-tests-maintenance","sha":"6331d91891bd1639873947dd9e0854534e9a4207","user":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"repo":{"id":173286031,"node_id":"MDEwOlJlcG9zaXRvcnkxNzMyODYwMzE=","name":"cardano-wallet","full_name":"input-output-hk/cardano-wallet","private":false,"owner":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/input-output-hk/cardano-wallet","description":"HTTP server & command-line for managing UTxOs and HD wallets in Cardano.","fork":false,"url":"https://api.github.com/repos/input-output-hk/cardano-wallet","forks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/forks","keys_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/keys{/key_id}","collaborators_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/teams","hooks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/hooks","issue_events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/events{/number}","events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/events","assignees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/assignees{/user}","branches_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/branches{/branch}","tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/tags","blobs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/refs{/sha}","trees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/trees{/sha}","statuses_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/{sha}","languages_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/languages","stargazers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/stargazers","contributors_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contributors","subscribers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscribers","subscription_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscription","commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/commits{/sha}","git_commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/commits{/sha}","comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/comments{/number}","issue_comment_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/comments{/number}","contents_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contents/{+path}","compare_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/compare/{base}...{head}","merges_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/merges","archive_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/downloads","issues_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues{/number}","pulls_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls{/number}","milestones_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/milestones{/number}","notifications_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/labels{/name}","releases_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/releases{/id}","deployments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/deployments","created_at":"2019-03-01T10:50:58Z","updated_at":"2021-07-20T16:38:07Z","pushed_at":"2021-07-21T06:29:48Z","git_url":"git://github.com/input-output-hk/cardano-wallet.git","ssh_url":"git@github.com:input-output-hk/cardano-wallet.git","clone_url":"https://github.com/input-output-hk/cardano-wallet.git","svn_url":"https://github.com/input-output-hk/cardano-wallet","homepage":"","size":162328,"stargazers_count":426,"watchers_count":426,"language":"Haskell","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":86,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":61,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":86,"open_issues":61,"watchers":426,"default_branch":"master"}},"base":{"label":"input-output-hk:master","ref":"master","sha":"66d0d8d67b88710f275ce6dc374c3babf4e506dd","user":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"repo":{"id":173286031,"node_id":"MDEwOlJlcG9zaXRvcnkxNzMyODYwMzE=","name":"cardano-wallet","full_name":"input-output-hk/cardano-wallet","private":false,"owner":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/input-output-hk/cardano-wallet","description":"HTTP server & command-line for managing UTxOs and HD wallets in Cardano.","fork":false,"url":"https://api.github.com/repos/input-output-hk/cardano-wallet","forks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/forks","keys_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/keys{/key_id}","collaborators_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/teams","hooks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/hooks","issue_events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/events{/number}","events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/events","assignees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/assignees{/user}","branches_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/branches{/branch}","tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/tags","blobs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/refs{/sha}","trees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/trees{/sha}","statuses_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/{sha}","languages_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/languages","stargazers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/stargazers","contributors_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contributors","subscribers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscribers","subscription_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscription","commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/commits{/sha}","git_commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/commits{/sha}","comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/comments{/number}","issue_comment_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/comments{/number}","contents_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contents/{+path}","compare_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/compare/{base}...{head}","merges_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/merges","archive_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/downloads","issues_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues{/number}","pulls_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls{/number}","milestones_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/milestones{/number}","notifications_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/labels{/name}","releases_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/releases{/id}","deployments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/deployments","created_at":"2019-03-01T10:50:58Z","updated_at":"2021-07-20T16:38:07Z","pushed_at":"2021-07-21T06:29:48Z","git_url":"git://github.com/input-output-hk/cardano-wallet.git","ssh_url":"git@github.com:input-output-hk/cardano-wallet.git","clone_url":"https://github.com/input-output-hk/cardano-wallet.git","svn_url":"https://github.com/input-output-hk/cardano-wallet","homepage":"","size":162328,"stargazers_count":426,"watchers_count":426,"language":"Haskell","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":86,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":61,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":86,"open_issues":61,"watchers":426,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770"},"html":{"href":"https://github.com/input-output-hk/cardano-wallet/pull/2770"},"issue":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770"},"comments":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770/comments"},"review_comments":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/comments"},"review_comment":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/commits"},"statuses":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/6331d91891bd1639873947dd9e0854534e9a4207"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":12909177,"login":"input-output-hk","gravatar_id":"","url":"https://api.github.com/orgs/input-output-hk","avatar_url":"https://avatars.githubusercontent.com/u/12909177?"}}
+{"id":"17244791972","type":"PullRequestReviewEvent","actor":{"id":1019641,"login":"rvl","display_login":"rvl","gravatar_id":"","url":"https://api.github.com/users/rvl","avatar_url":"https://avatars.githubusercontent.com/u/1019641?"},"repo":{"id":173286031,"name":"input-output-hk/cardano-wallet","url":"https://api.github.com/repos/input-output-hk/cardano-wallet"},"payload":{"action":"created","review":{"id":711317243,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3MjQz","user":{"login":"rvl","id":1019641,"node_id":"MDQ6VXNlcjEwMTk2NDE=","avatar_url":"https://avatars.githubusercontent.com/u/1019641?v=4","gravatar_id":"","url":"https://api.github.com/users/rvl","html_url":"https://github.com/rvl","followers_url":"https://api.github.com/users/rvl/followers","following_url":"https://api.github.com/users/rvl/following{/other_user}","gists_url":"https://api.github.com/users/rvl/gists{/gist_id}","starred_url":"https://api.github.com/users/rvl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rvl/subscriptions","organizations_url":"https://api.github.com/users/rvl/orgs","repos_url":"https://api.github.com/users/rvl/repos","events_url":"https://api.github.com/users/rvl/events{/privacy}","received_events_url":"https://api.github.com/users/rvl/received_events","type":"User","site_admin":false},"body":":+1:","commit_id":"6331d91891bd1639873947dd9e0854534e9a4207","submitted_at":"2021-07-21T07:00:01Z","state":"approved","html_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770#pullrequestreview-711317243","pull_request_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/input-output-hk/cardano-wallet/pull/2770#pullrequestreview-711317243"},"pull_request":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770"}}},"pull_request":{"url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770","id":693500926,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNTAwOTI2","html_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770","diff_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770.diff","patch_url":"https://github.com/input-output-hk/cardano-wallet/pull/2770.patch","issue_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770","number":2770,"state":"open","locked":false,"title":"switch to newer node in e2e docker workflow","user":{"login":"piotr-iohk","id":42900201,"node_id":"MDQ6VXNlcjQyOTAwMjAx","avatar_url":"https://avatars.githubusercontent.com/u/42900201?v=4","gravatar_id":"","url":"https://api.github.com/users/piotr-iohk","html_url":"https://github.com/piotr-iohk","followers_url":"https://api.github.com/users/piotr-iohk/followers","following_url":"https://api.github.com/users/piotr-iohk/following{/other_user}","gists_url":"https://api.github.com/users/piotr-iohk/gists{/gist_id}","starred_url":"https://api.github.com/users/piotr-iohk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/piotr-iohk/subscriptions","organizations_url":"https://api.github.com/users/piotr-iohk/orgs","repos_url":"https://api.github.com/users/piotr-iohk/repos","events_url":"https://api.github.com/users/piotr-iohk/events{/privacy}","received_events_url":"https://api.github.com/users/piotr-iohk/received_events","type":"User","site_admin":false},"body":"# Issue Number\r\n\r\n<!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. -->\r\n\r\n\r\n# Overview\r\n\r\n<!-- Detail in a few bullet points the work accomplished in this PR -->\r\n\r\n- [ ] switch to newer node in e2e docker workflow\r\n\r\n\r\n# Comments\r\n\r\nSince cardano-wallet master doesn't work with cardano-node `1.27.0` switching temporarily to `alonzo-white-1.1`.","created_at":"2021-07-20T14:10:28Z","updated_at":"2021-07-21T07:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"ca5f44152d091000a4b646768b32571ddeeb26e8","assignee":{"login":"piotr-iohk","id":42900201,"node_id":"MDQ6VXNlcjQyOTAwMjAx","avatar_url":"https://avatars.githubusercontent.com/u/42900201?v=4","gravatar_id":"","url":"https://api.github.com/users/piotr-iohk","html_url":"https://github.com/piotr-iohk","followers_url":"https://api.github.com/users/piotr-iohk/followers","following_url":"https://api.github.com/users/piotr-iohk/following{/other_user}","gists_url":"https://api.github.com/users/piotr-iohk/gists{/gist_id}","starred_url":"https://api.github.com/users/piotr-iohk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/piotr-iohk/subscriptions","organizations_url":"https://api.github.com/users/piotr-iohk/orgs","repos_url":"https://api.github.com/users/piotr-iohk/repos","events_url":"https://api.github.com/users/piotr-iohk/events{/privacy}","received_events_url":"https://api.github.com/users/piotr-iohk/received_events","type":"User","site_admin":false},"assignees":[{"login":"piotr-iohk","id":42900201,"node_id":"MDQ6VXNlcjQyOTAwMjAx","avatar_url":"https://avatars.githubusercontent.com/u/42900201?v=4","gravatar_id":"","url":"https://api.github.com/users/piotr-iohk","html_url":"https://github.com/piotr-iohk","followers_url":"https://api.github.com/users/piotr-iohk/followers","following_url":"https://api.github.com/users/piotr-iohk/following{/other_user}","gists_url":"https://api.github.com/users/piotr-iohk/gists{/gist_id}","starred_url":"https://api.github.com/users/piotr-iohk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/piotr-iohk/subscriptions","organizations_url":"https://api.github.com/users/piotr-iohk/orgs","repos_url":"https://api.github.com/users/piotr-iohk/repos","events_url":"https://api.github.com/users/piotr-iohk/events{/privacy}","received_events_url":"https://api.github.com/users/piotr-iohk/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/commits","review_comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/comments","review_comment_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/comments{/number}","comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770/comments","statuses_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/6331d91891bd1639873947dd9e0854534e9a4207","head":{"label":"input-output-hk:piotr/e2e-tests-maintenance","ref":"piotr/e2e-tests-maintenance","sha":"6331d91891bd1639873947dd9e0854534e9a4207","user":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"repo":{"id":173286031,"node_id":"MDEwOlJlcG9zaXRvcnkxNzMyODYwMzE=","name":"cardano-wallet","full_name":"input-output-hk/cardano-wallet","private":false,"owner":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/input-output-hk/cardano-wallet","description":"HTTP server & command-line for managing UTxOs and HD wallets in Cardano.","fork":false,"url":"https://api.github.com/repos/input-output-hk/cardano-wallet","forks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/forks","keys_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/keys{/key_id}","collaborators_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/teams","hooks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/hooks","issue_events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/events{/number}","events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/events","assignees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/assignees{/user}","branches_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/branches{/branch}","tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/tags","blobs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/refs{/sha}","trees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/trees{/sha}","statuses_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/{sha}","languages_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/languages","stargazers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/stargazers","contributors_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contributors","subscribers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscribers","subscription_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscription","commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/commits{/sha}","git_commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/commits{/sha}","comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/comments{/number}","issue_comment_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/comments{/number}","contents_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contents/{+path}","compare_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/compare/{base}...{head}","merges_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/merges","archive_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/downloads","issues_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues{/number}","pulls_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls{/number}","milestones_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/milestones{/number}","notifications_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/labels{/name}","releases_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/releases{/id}","deployments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/deployments","created_at":"2019-03-01T10:50:58Z","updated_at":"2021-07-20T16:38:07Z","pushed_at":"2021-07-21T06:29:48Z","git_url":"git://github.com/input-output-hk/cardano-wallet.git","ssh_url":"git@github.com:input-output-hk/cardano-wallet.git","clone_url":"https://github.com/input-output-hk/cardano-wallet.git","svn_url":"https://github.com/input-output-hk/cardano-wallet","homepage":"","size":162328,"stargazers_count":426,"watchers_count":426,"language":"Haskell","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":86,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":61,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":86,"open_issues":61,"watchers":426,"default_branch":"master"}},"base":{"label":"input-output-hk:master","ref":"master","sha":"66d0d8d67b88710f275ce6dc374c3babf4e506dd","user":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"repo":{"id":173286031,"node_id":"MDEwOlJlcG9zaXRvcnkxNzMyODYwMzE=","name":"cardano-wallet","full_name":"input-output-hk/cardano-wallet","private":false,"owner":{"login":"input-output-hk","id":12909177,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyOTA5MTc3","avatar_url":"https://avatars.githubusercontent.com/u/12909177?v=4","gravatar_id":"","url":"https://api.github.com/users/input-output-hk","html_url":"https://github.com/input-output-hk","followers_url":"https://api.github.com/users/input-output-hk/followers","following_url":"https://api.github.com/users/input-output-hk/following{/other_user}","gists_url":"https://api.github.com/users/input-output-hk/gists{/gist_id}","starred_url":"https://api.github.com/users/input-output-hk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/input-output-hk/subscriptions","organizations_url":"https://api.github.com/users/input-output-hk/orgs","repos_url":"https://api.github.com/users/input-output-hk/repos","events_url":"https://api.github.com/users/input-output-hk/events{/privacy}","received_events_url":"https://api.github.com/users/input-output-hk/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/input-output-hk/cardano-wallet","description":"HTTP server & command-line for managing UTxOs and HD wallets in Cardano.","fork":false,"url":"https://api.github.com/repos/input-output-hk/cardano-wallet","forks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/forks","keys_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/keys{/key_id}","collaborators_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/teams","hooks_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/hooks","issue_events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/events{/number}","events_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/events","assignees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/assignees{/user}","branches_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/branches{/branch}","tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/tags","blobs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/refs{/sha}","trees_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/trees{/sha}","statuses_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/{sha}","languages_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/languages","stargazers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/stargazers","contributors_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contributors","subscribers_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscribers","subscription_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/subscription","commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/commits{/sha}","git_commits_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/git/commits{/sha}","comments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/comments{/number}","issue_comment_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/comments{/number}","contents_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/contents/{+path}","compare_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/compare/{base}...{head}","merges_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/merges","archive_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/downloads","issues_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues{/number}","pulls_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls{/number}","milestones_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/milestones{/number}","notifications_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/labels{/name}","releases_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/releases{/id}","deployments_url":"https://api.github.com/repos/input-output-hk/cardano-wallet/deployments","created_at":"2019-03-01T10:50:58Z","updated_at":"2021-07-20T16:38:07Z","pushed_at":"2021-07-21T06:29:48Z","git_url":"git://github.com/input-output-hk/cardano-wallet.git","ssh_url":"git@github.com:input-output-hk/cardano-wallet.git","clone_url":"https://github.com/input-output-hk/cardano-wallet.git","svn_url":"https://github.com/input-output-hk/cardano-wallet","homepage":"","size":162328,"stargazers_count":426,"watchers_count":426,"language":"Haskell","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":86,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":61,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":86,"open_issues":61,"watchers":426,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770"},"html":{"href":"https://github.com/input-output-hk/cardano-wallet/pull/2770"},"issue":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770"},"comments":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/issues/2770/comments"},"review_comments":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/comments"},"review_comment":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/pulls/2770/commits"},"statuses":{"href":"https://api.github.com/repos/input-output-hk/cardano-wallet/statuses/6331d91891bd1639873947dd9e0854534e9a4207"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":12909177,"login":"input-output-hk","gravatar_id":"","url":"https://api.github.com/orgs/input-output-hk","avatar_url":"https://avatars.githubusercontent.com/u/12909177?"}}
+{"id":"17244791973","type":"WatchEvent","actor":{"id":3261505,"login":"cakefile","display_login":"cakefile","gravatar_id":"","url":"https://api.github.com/users/cakefile","avatar_url":"https://avatars.githubusercontent.com/u/3261505?"},"repo":{"id":189273689,"name":"agiletortoise/drafts-script-reference","url":"https://api.github.com/repos/agiletortoise/drafts-script-reference"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791974","type":"WatchEvent","actor":{"id":25742988,"login":"Geekhyt","display_login":"Geekhyt","gravatar_id":"","url":"https://api.github.com/users/Geekhyt","avatar_url":"https://avatars.githubusercontent.com/u/25742988?"},"repo":{"id":98029592,"name":"ziishaned/learn-regex","url":"https://api.github.com/repos/ziishaned/learn-regex"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791975","type":"WatchEvent","actor":{"id":74425534,"login":"sjoveska","display_login":"sjoveska","gravatar_id":"","url":"https://api.github.com/users/sjoveska","avatar_url":"https://avatars.githubusercontent.com/u/74425534?"},"repo":{"id":380509015,"name":"gabrieldim/Markdown-Crash-Course","url":"https://api.github.com/repos/gabrieldim/Markdown-Crash-Course"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791977","type":"WatchEvent","actor":{"id":32324169,"login":"cuteshuai","display_login":"cuteshuai","gravatar_id":"","url":"https://api.github.com/users/cuteshuai","avatar_url":"https://avatars.githubusercontent.com/u/32324169?"},"repo":{"id":11171548,"name":"nlohmann/json","url":"https://api.github.com/repos/nlohmann/json"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244791979","type":"PushEvent","actor":{"id":49210012,"login":"challenger009","display_login":"challenger009","gravatar_id":"","url":"https://api.github.com/users/challenger009","avatar_url":"https://avatars.githubusercontent.com/u/49210012?"},"repo":{"id":214436347,"name":"Ressource-Allocation/Cache-Allocation-Project","url":"https://api.github.com/repos/Ressource-Allocation/Cache-Allocation-Project"},"payload":{"push_id":7561706237,"size":1,"distinct_size":1,"ref":"refs/heads/temp","head":"056284ce8ad23a2ee5f5a7dd4acda53e1c1bef42","before":"7ee0ed7d9009cb753c8381090f8ab4800dc21aa3","commits":[{"sha":"056284ce8ad23a2ee5f5a7dd4acda53e1c1bef42","author":{"name":"challenger009","email":"7fade1806ceb0c6ee86c8831b6b2f2835ff2d6f5@supcom.tn"},"message":"update code","distinct":true,"url":"https://api.github.com/repos/Ressource-Allocation/Cache-Allocation-Project/commits/056284ce8ad23a2ee5f5a7dd4acda53e1c1bef42"}]},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":56404846,"login":"Ressource-Allocation","gravatar_id":"","url":"https://api.github.com/orgs/Ressource-Allocation","avatar_url":"https://avatars.githubusercontent.com/u/56404846?"}}
+{"id":"17244791980","type":"PushEvent","actor":{"id":34688948,"login":"cozy-bot","display_login":"cozy-bot","gravatar_id":"","url":"https://api.github.com/users/cozy-bot","avatar_url":"https://avatars.githubusercontent.com/u/34688948?"},"repo":{"id":343777796,"name":"konnectors/tracemob","url":"https://api.github.com/repos/konnectors/tracemob"},"payload":{"push_id":7561706241,"size":1,"distinct_size":1,"ref":"refs/heads/build","head":"762b132fcb848c7bf911bb41a7f1cb6155256f09","before":"a916f7befdba7c476679d2eb88d18cb5a6be2ca1","commits":[{"sha":"762b132fcb848c7bf911bb41a7f1cb6155256f09","author":{"name":"Travis CI User","email":"e6cc0fb2b8dad4110ef62e9a33e5a8aa4e0f86d7@example.org"},"message":"publish: chore(deps): update dependency jest to v27\n\ngenerated from commit 7b39b2dc2cf4d739bceb2ebc90e06b43c2eb0b79","distinct":true,"url":"https://api.github.com/repos/konnectors/tracemob/commits/762b132fcb848c7bf911bb41a7f1cb6155256f09"}]},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":35696401,"login":"konnectors","gravatar_id":"","url":"https://api.github.com/orgs/konnectors","avatar_url":"https://avatars.githubusercontent.com/u/35696401?"}}
+{"id":"17244791985","type":"WatchEvent","actor":{"id":18587417,"login":"micro-step","display_login":"micro-step","gravatar_id":"","url":"https://api.github.com/users/micro-step","avatar_url":"https://avatars.githubusercontent.com/u/18587417?"},"repo":{"id":130252887,"name":"amirgholami/SqueezeNext","url":"https://api.github.com/repos/amirgholami/SqueezeNext"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244792000","type":"DeleteEvent","actor":{"id":73186203,"login":"enthr","display_login":"enthr","gravatar_id":"","url":"https://api.github.com/users/enthr","avatar_url":"https://avatars.githubusercontent.com/u/73186203?"},"repo":{"id":386189669,"name":"enthr/first-contributions","url":"https://api.github.com/repos/enthr/first-contributions"},"payload":{"ref":"add-Jaimin-Prajapati","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244792007","type":"CreateEvent","actor":{"id":49699333,"login":"dependabot[bot]","display_login":"dependabot","gravatar_id":"","url":"https://api.github.com/users/dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},"repo":{"id":262461195,"name":"crowdbotics-apps/aviannasavatarmaker-16781","url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781"},"payload":{"ref":"dependabot/npm_and_yarn/react-native-0.62.3","ref_type":"branch","master_branch":"master","description":"This react_native application was built with Crowdbotics www.crowdbotics.com","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244792002","type":"PushEvent","actor":{"id":524596,"login":"Varriount","display_login":"Varriount","gravatar_id":"","url":"https://api.github.com/users/Varriount","avatar_url":"https://avatars.githubusercontent.com/u/524596?"},"repo":{"id":378265592,"name":"Varriount/Yoyo","url":"https://api.github.com/repos/Varriount/Yoyo"},"payload":{"push_id":7561706246,"size":0,"distinct_size":0,"ref":"refs/heads/remove-python-slugify","head":"67470dcf23d23503bcd12bb368c04faed05f26ff","before":"67470dcf23d23503bcd12bb368c04faed05f26ff","commits":[]},"public":true,"created_at":"2021-07-21T07:00:01Z"}
+{"id":"17244792016","type":"PushEvent","actor":{"id":10910590,"login":"michelescarlato","display_login":"michelescarlato","gravatar_id":"","url":"https://api.github.com/users/michelescarlato","avatar_url":"https://avatars.githubusercontent.com/u/10910590?"},"repo":{"id":372401824,"name":"fasten-project/LCV-CM","url":"https://api.github.com/repos/fasten-project/LCV-CM"},"payload":{"push_id":7561706258,"size":1,"distinct_size":1,"ref":"refs/heads/maven-use-case","head":"bad489245aff2321d3815c2e973439458d70728e","before":"bc12e228e44814e1aebd23fd323ad85f7b173214","commits":[{"sha":"bad489245aff2321d3815c2e973439458d70728e","author":{"name":"Michele Scarlato","email":"7e6432671aece48a2c6d283607e7c6e3ccc8c2f2@gmail.com"},"message":"Added sleepycat (not supported), to insert `Berkeley` as possible keyword for bsd.","distinct":true,"url":"https://api.github.com/repos/fasten-project/LCV-CM/commits/bad489245aff2321d3815c2e973439458d70728e"}]},"public":true,"created_at":"2021-07-21T07:00:01Z","org":{"id":47090554,"login":"fasten-project","gravatar_id":"","url":"https://api.github.com/orgs/fasten-project","avatar_url":"https://avatars.githubusercontent.com/u/47090554?"}}
+{"id":"17244792027","type":"PushEvent","actor":{"id":5637090,"login":"ruscur","display_login":"ruscur","gravatar_id":"","url":"https://api.github.com/users/ruscur","avatar_url":"https://avatars.githubusercontent.com/u/5637090?"},"repo":{"id":52412231,"name":"ruscur/skiboot","url":"https://api.github.com/repos/ruscur/skiboot"},"payload":{"push_id":7561706261,"size":61,"distinct_size":61,"ref":"refs/heads/_61_61__hw_chiptod__Abort_if_core_frequency_is_not_set_mbox_master","head":"caaf0e0bd72df87fd24c6d6d9ebde98ed56ad89a","before":"b47b6418b5f825648e20ecf0f9c835b8ed5d4ba8","commits":[{"sha":"cd9f63136278b16d5b6eaf664f312c75070815ef","author":{"name":"Nicholas Piggin","email":"24829078df5003d9dd1dd871ca2aeb0b1cf95ef4@gmail.com"},"message":"external/mambo: skiboot.tcl add POWER10 config\n\nCo-authored-by: Nicholas Piggin <npiggin@gmail.com>\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\nCo-authored-by: Madhavan Srinivasan <maddy@linux.ibm.com>\nSigned-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>\nCo-authored-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>\nSigned-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>\n[Folded Maddy's IMC changes and Ravi's DAWR changes - Vasant]\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/cd9f63136278b16d5b6eaf664f312c75070815ef"},{"sha":"88ee1f5255ee3ab4ce1826a5ba2a4ddc2a4e6c83","author":{"name":"Nicholas Piggin","email":"24829078df5003d9dd1dd871ca2aeb0b1cf95ef4@gmail.com"},"message":"Initial POWER10 enablement\n\nCo-authored-by: Nicholas Piggin <npiggin@gmail.com>\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\nCo-authored-by: Vaidyanathan Srinivasan <svaidy@linux.ibm.com>\nSigned-off-by: Vaidyanathan Srinivasan <svaidy@linux.ibm.com>\nCo-authored-by: Michael Neuling <mikey@neuling.org>\nSigned-off-by: Michael Neuling <mikey@neuling.org>\nCo-authored-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>\nCo-authored-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>\nSigned-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>\nCo-authored-by: Cédric Le Goater <clg@kaod.org>\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/88ee1f5255ee3ab4ce1826a5ba2a4ddc2a4e6c83"},{"sha":"01284fa003bfa730ac20335972dc2388cd9a5d54","author":{"name":"Oliver O'Halloran","email":"3dfaff8fa6ae977f042064a112a6aac576279b9b@gmail.com"},"message":"hw/p8-i2c: Add POWER10 support\n\nEarly P8s didn't have the I2C interrupt, but all the subsequent chips\nhave one. Flip the interrupt support checking so the old chips are the\nspecial case rather than having to add a new entry for every new chip.\n\nP10 added several additional flag registers and moved the existing\nflag register. The actual data bits have not changed so the existing\nhandshake protocol between the OCC and OPAL works just fine.\n\nSigned-off-by: Oliver O'Halloran <oohall@gmail.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/01284fa003bfa730ac20335972dc2388cd9a5d54"},{"sha":"ac105b395cbdbbf649de3c49929b93d3a6a80ef3","author":{"name":"Michael Neuling","email":"7b0ab45a730e48a69239010b5b8fe5fa4e8eaac6@neuling.org"},"message":"p10: Workaround core recovery issue\n\nThis works around a core recovery issue in P10. The workaround involves\nthe CME polling for a core recovery and performing the recovery\nprocedure itself.\n\nFor this to happen, the host leaves core recovery off (HID[5]) and\nthen masks the PC system checkstop. This patch does this.\n\nFirmware starts skiboot with recovery already off, so we just leave it\noff for longer and then mask the PC system checkstop. This makes the\nwindow longer where a core recovery can cause an xstop but this\nwindow is still small and can still only happens on boot.\n\nSigned-off-by: Michael Neuling <mikey@neuling.org>\n[Added mambo check - Vasant]\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/ac105b395cbdbbf649de3c49929b93d3a6a80ef3"},{"sha":"33a66d56295521963b81f447f6bf05ab7f9796bd","author":{"name":"Nicholas Piggin","email":"24829078df5003d9dd1dd871ca2aeb0b1cf95ef4@gmail.com"},"message":"cpufeatures: Add POWER10 support\n\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\nSigned-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>\n[Folded Ravi's DAWR patch - Vasant]\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/33a66d56295521963b81f447f6bf05ab7f9796bd"},{"sha":"412dfc8f633b814b4cfc63e019b8c80f4204cc27","author":{"name":"Nicholas Piggin","email":"24829078df5003d9dd1dd871ca2aeb0b1cf95ef4@gmail.com"},"message":"chiptod: Add POWER10 support\n\nPOWER10 changes to use the SCOM addressing mode, as it was found to\nbe more robust than the core ID addressing mode.\n\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/412dfc8f633b814b4cfc63e019b8c80f4204cc27"},{"sha":"6bac77d2e986fd8c1bf080a8972562d320ffd082","author":{"name":"Vaidyanathan Srinivasan","email":"c012decff9dffda4c10860ab2ba9eb53320d90bc@linux.ibm.com"},"message":"Basic P10 stop state support\n\nAdds support for STOP0 lite, STOP2 and STOP3 for Power10 with the\nfollowing latencies, residency requirements:\n\n            latency residency\nstop0lite   1us     10us\nstop0       10us    100us\nstop2       20us    200us\nstop3       45us    450us\n\nSigned-off-by: Vaidyanathan Srinivasan <svaidy@linux.ibm.com>\nSigned-off-by: Pratik R. Sampat <psampat@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/6bac77d2e986fd8c1bf080a8972562d320ffd082"},{"sha":"60f458dd03bfed6168723c41c3b75d1f182207de","author":{"name":"Cédric Le Goater","email":"2d8cace2254d4e43578d21933db015d84bcc468a@kaod.org"},"message":"plat/qemu/p10: add a POWER10 platform\n\nBMC is still defined as ast2500 but it should change to ast2600 when\navailable.\n\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/60f458dd03bfed6168723c41c3b75d1f182207de"},{"sha":"bd3500d89b1225e843c5e9adb39840722e416823","author":{"name":"Cédric Le Goater","email":"2d8cace2254d4e43578d21933db015d84bcc468a@kaod.org"},"message":"psi/p10: Activate P10 interrupts\n\nBehave as P9 for now until we know more on P10. Interface should be\nthe same, apart from the size of the ESB pages.\n\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\n[Fixed suprious interrupt issue - Vasant]\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/bd3500d89b1225e843c5e9adb39840722e416823"},{"sha":"b86f50172e82fde19defdc2ea249fe320a96edb4","author":{"name":"Klaus Heinrich Kiwi","email":"d568b8cd7ef64877891488bb3328757d2d21c847@linux.vnet.ibm.com"},"message":"external/gard: Enable Power10\n\nAdd Power10 support for opal-gard utility.\n\nSigned-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>\n[Folded test case fix and updated commit message - Vasant]\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/b86f50172e82fde19defdc2ea249fe320a96edb4"},{"sha":"5d08ac410914e6908b6b29f290c40fa2b8ff1b89","author":{"name":"Vasant Hegde","email":"a6d753843573f7bfed5075c1e875b0be8007a0ab@linux.vnet.ibm.com"},"message":"external/xscom-utils: Add P10 chip info\n\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/5d08ac410914e6908b6b29f290c40fa2b8ff1b89"},{"sha":"d30741730491f015560a1eee49d51f3127f6b914","author":{"name":"Vasant Hegde","email":"a6d753843573f7bfed5075c1e875b0be8007a0ab@linux.vnet.ibm.com"},"message":"external/opal-prd: Fix occ, homer node label search\n\nStarting P10, hostboot/HDAT will provide consistent reserved node name. It will\njust provide node name without starting string \"ibm,\". That will cause\n`pm-complex <*>` operation to fails.\n\nThis patch fixes above issue. For backward compatability purpose I have\nkept support for old variant of node name as well.\n\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/d30741730491f015560a1eee49d51f3127f6b914"},{"sha":"d85f42cbcf312f6fe4ef47f311124590a8f27b33","author":{"name":"Vaidyanathan Srinivasan","email":"c012decff9dffda4c10860ab2ba9eb53320d90bc@linux.ibm.com"},"message":"occ: Add POWER10 support\n\nAdd support for parsing OCC on Power10 to populate the pstate\ninformation. Also enables OCC on P10 Denali system.\n\nCo-authored-by: Pratik R. Sampat <psampat@linux.ibm.com>\nCo-authored-by: Vaidyanathan Srinivasan <svaidy@linux.ibm.com>\nSigned-off-by: Pratik R. Sampat <psampat@linux.ibm.com>\nSigned-off-by: Vaidyanathan Srinivasan <svaidy@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/d85f42cbcf312f6fe4ef47f311124590a8f27b33"},{"sha":"1320d894e9641c3cae78034046fb332c3cfe8936","author":{"name":"Ravi Bangoria","email":"c3c2a342b6d0b20c2fffcb500dabb9f78ad28a56@linux.ibm.com"},"message":"hdata: Add POWER10 support\n\nInitial P10 support\n  - LPC : This contains two useful information:\n      LPC MCTP Memory Window Base Address\n      Second vUART console details\n  - Enable memory-buffer mmio\n  - Fix ipmi sensors\n      IPMI sensors are deprecated in P10. Hence do not parse ipmi sensors.\n  - I2C support\n  - Detect PHB5\n  - Create p10 xscom, xive, chiptod nodes\n  - Set pa-features bit for 2nd DAWR\n    Availability of 2nd DAWR depends on 0th bit of 64th byte of\n    ibm,pa-features property. Set it for p10.\n\nCo-authored-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>\nCo-authored-by: Nicholas Piggin <npiggin@gmail.com>\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\nCo-authored-by: Reza Arbab <arbab@linux.ibm.com>\nSigned-off-by: Reza Arbab <arbab@linux.ibm.com>\nCo-authored-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>\nSigned-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/1320d894e9641c3cae78034046fb332c3cfe8936"},{"sha":"3a47c281ec3f05bff90e7a17782a5cf5c09e6e08","author":{"name":"Haren Myneni","email":"b227902ebd12300369f7adca5621d6a4c3524817@linux.ibm.com"},"message":"hdat/spira: Define ibm, primary-topology-index property per chip\n\nHDAT provides Topology ID table and the primary topology location on\nP10. This primary location points to primary topology entry in ID table\nwhich contains the primary topology index and this index is used to\ndefine the paste base address per chip.\n\nThis patch reads Topology ID table and the primary topology location\nfrom hdata and retrieves the primary topology index in the ID table.\n\nMake this primaty topology index value available with\nibm,primary-topology-index property per chip. VAS reads this property\nto setup paste base address for each chip.\n\nSigned-off-by: Haren Myneni <haren@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/3a47c281ec3f05bff90e7a17782a5cf5c09e6e08"},{"sha":"8e73dfa2d5d098d19c595c3db98dfe83b418988f","author":{"name":"Haren Myneni","email":"b227902ebd12300369f7adca5621d6a4c3524817@linux.ibm.com"},"message":"hdat/spira: Add ibm, power10-vas-x string to VAS compatible property\n\nVAS SCOM base address and paste address format are changed on P10.\nThis patch adds ibm,power10-vas-x string to compatible property per\neach VAS node. This compatible string is used to define the paste\nbase address later during VAS initialization.\n\nAlso enables NX on P10 without adding any compatible string since\nthe NX SCOM base address is not changed.\n\nSigned-off-by: Haren Myneni <haren@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/8e73dfa2d5d098d19c595c3db98dfe83b418988f"},{"sha":"92e4b3d365466f7a80abba9fcace72af8856c35b","author":{"name":"Vasant Hegde","email":"a6d753843573f7bfed5075c1e875b0be8007a0ab@linux.vnet.ibm.com"},"message":"hdata/P10: Fix xscom address and ibm, chip-id property\n\n`xscom_id` is deprecated in P10. Instead we should use topology ID's\n(\"Primary topology table index\") to calculate xscom address. Also\nuse (\"Processor fabric topology id\") for \"ibm,chip-id\" property.\n\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/92e4b3d365466f7a80abba9fcace72af8856c35b"},{"sha":"e7a5c607d9ab90000435403ecff682bc72d3cc57","author":{"name":"Vasant Hegde","email":"a6d753843573f7bfed5075c1e875b0be8007a0ab@linux.vnet.ibm.com"},"message":"phys/P10: Use topology index to get phys mapping\n\nThis fixes multipchip rainier boot issue.\n\nfor Rainer:\n\nchip0: ibm,primary-topology-index = < 0x0>;\nchip1: ibm,primary-topology-index = < 0x4>;\nchip2: ibm,primary-topology-index = < 0x8>;\nchip3: ibm,primary-topology-index = < 0xc>;\n\nfor Denali:\n\nnode0:\nchip0: ibm,primary-topology-index = < 0x0>;\nchip1: ibm,primary-topology-index = < 0x1>;\nchip2: ibm,primary-topology-index = < 0x2>;\nchip3: ibm,primary-topology-index = < 0x3>;\n\nnode1:\nchip0: ibm,primary-topology-index = < 0x4>;\nchip1: ibm,primary-topology-index = < 0x5>;\nchip2: ibm,primary-topology-index = < 0x6>;\nchip3: ibm,primary-topology-index = < 0x7>;\n\nNote that bmc_create_node() gets called very early in the boot process.\nHence we have to traverse through HDAT ntuple to get right topology index.\n\nMay be we can optimize pcid_to_topology_idx() function as its pretty\nmuch duplicate of pcid_to_chip_id(). But for now lets keep it as\nseparate function.\n\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>\nSigned-off-by: Ryan Grimm <grimm@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/e7a5c607d9ab90000435403ecff682bc72d3cc57"},{"sha":"a1a09b26a633865a135eaed969d5a1f0078cc77d","author":{"name":"Frederic Barrat","email":"c90240987c583ac0802fbeb88cb1684edc683e18@linux.ibm.com"},"message":"hdata/iohub: Read PCI Gen5 equalization settings for P10\n\nHDAT spec added fields to define the equalization settings for PCI\nGen5 link. Format is the same as PCI Gen4, so we just need to add\nextra fields in the \"ibm,lane-eq\" in the device tree.\n\nSigned-off-by: Frederic Barrat <fbarrat@linux.ibm.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/a1a09b26a633865a135eaed969d5a1f0078cc77d"},{"sha":"a1be7faf3af01e388865db81248f0f3fcf8d59f9","author":{"name":"Oliver O'Halloran","email":"3dfaff8fa6ae977f042064a112a6aac576279b9b@gmail.com"},"message":"prd: Add base P10 support\n\nSigned-off-by: Oliver O'Halloran <oohall@gmail.com>\nSigned-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>","distinct":true,"url":"https://api.github.com/repos/ruscur/skiboot/commits/a1be7faf3af01e388865db81248f0f3fcf8d59f9"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792035","type":"PushEvent","actor":{"id":66377779,"login":"georgesunnyt","display_login":"georgesunnyt","gravatar_id":"","url":"https://api.github.com/users/georgesunnyt","avatar_url":"https://avatars.githubusercontent.com/u/66377779?"},"repo":{"id":387549810,"name":"georgesunnyt/portfolio","url":"https://api.github.com/repos/georgesunnyt/portfolio"},"payload":{"push_id":7561706272,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"76f5451eaf8ec6d24cb8367853af96c614c21dad","before":"eb100fe4a60c33aaec7a1c9f17ec9c649f433551","commits":[{"sha":"76f5451eaf8ec6d24cb8367853af96c614c21dad","author":{"name":"georgesunnyt","email":"37bc2366be960e25f54540d7d6812cecc994ebd5@gmail.com"},"message":"update navigation link for portfolio","distinct":true,"url":"https://api.github.com/repos/georgesunnyt/portfolio/commits/76f5451eaf8ec6d24cb8367853af96c614c21dad"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792058","type":"CreateEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388024725,"name":"thatjohn01/781116602","url":"https://api.github.com/repos/thatjohn01/781116602"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":"瞬间人生--一个聪明的傻子的故事_PDF下载_徐光炜","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792061","type":"PushEvent","actor":{"id":8517910,"login":"LombiqBot","display_login":"LombiqBot","gravatar_id":"","url":"https://api.github.com/users/LombiqBot","avatar_url":"https://avatars.githubusercontent.com/u/8517910?"},"repo":{"id":264168728,"name":"Lombiq/OrchardCMS.Poll","url":"https://api.github.com/repos/Lombiq/OrchardCMS.Poll"},"payload":{"push_id":7561706271,"size":0,"distinct_size":0,"ref":"refs/heads/master","head":"bfe0fdff97231d1d169486262e8d0548f594a1b7","before":"bfe0fdff97231d1d169486262e8d0548f594a1b7","commits":[]},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":8158177,"login":"Lombiq","gravatar_id":"","url":"https://api.github.com/orgs/Lombiq","avatar_url":"https://avatars.githubusercontent.com/u/8158177?"}}
+{"id":"17244792072","type":"PullRequestEvent","actor":{"id":19240202,"login":"jonghopark95","display_login":"jonghopark95","gravatar_id":"","url":"https://api.github.com/users/jonghopark95","avatar_url":"https://avatars.githubusercontent.com/u/19240202?"},"repo":{"id":385130973,"name":"woowa-techcamp-2021/deal-7","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7"},"payload":{"action":"opened","number":48,"pull_request":{"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/48","id":694104865,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODY1","html_url":"https://github.com/woowa-techcamp-2021/deal-7/pull/48","diff_url":"https://github.com/woowa-techcamp-2021/deal-7/pull/48.diff","patch_url":"https://github.com/woowa-techcamp-2021/deal-7/pull/48.patch","issue_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/48","number":48,"state":"open","locked":false,"title":"[Feature/#13] 메인 페이지-카테고리 슬라이드 API 연결","user":{"login":"jonghopark95","id":19240202,"node_id":"MDQ6VXNlcjE5MjQwMjAy","avatar_url":"https://avatars.githubusercontent.com/u/19240202?v=4","gravatar_id":"","url":"https://api.github.com/users/jonghopark95","html_url":"https://github.com/jonghopark95","followers_url":"https://api.github.com/users/jonghopark95/followers","following_url":"https://api.github.com/users/jonghopark95/following{/other_user}","gists_url":"https://api.github.com/users/jonghopark95/gists{/gist_id}","starred_url":"https://api.github.com/users/jonghopark95/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jonghopark95/subscriptions","organizations_url":"https://api.github.com/users/jonghopark95/orgs","repos_url":"https://api.github.com/users/jonghopark95/repos","events_url":"https://api.github.com/users/jonghopark95/events{/privacy}","received_events_url":"https://api.github.com/users/jonghopark95/received_events","type":"User","site_admin":false},"body":"## :bookmark_tabs: 제목\r\n\r\n### 카테고리 필터에 맞게 상품들 렌더링 (반환값이 없을 경우 텅~~~~~)\r\n\r\nhttps://user-images.githubusercontent.com/19240202/126444993-f388e801-01a0-4dc4-b529-37eefd293b96.mov\r\n\r\n\r\n### 로그인 했을 경우, 사용자가 이전에 좋아요 했던 상품 하트 \r\n> 로그인, 로그아웃 시에도 바로 바로 반영되도록 (영상 참고) \r\n\r\nhttps://user-images.githubusercontent.com/19240202/126445093-f1f71d55-a5b1-4d2e-9c65-2a2daf69793b.mov\r\n\r\n## :heavy_check_mark: 셀프 체크리스트\r\n\r\n> 최소 1명 이상의 assign을 받아야만 Merge 가능합니다.\r\n\r\n- [x] Warning Message가 발생하지 않았나요?\r\n- [x] Coding Convention을 준수했나요?\r\n\r\n## :speech_balloon: 작업 내용\r\n\r\n> 구현 내용 및 작업 했던 내역\r\n\r\n- [x] Close #13\r\n\r\n## :construction: PR 특이 사항\r\n\r\n> PR을 볼 때 주의깊게 봐야하거나 말하고 싶은 점\r\n\r\n- 로딩 스피너는 고민중입니다... 근데 후순위로 미뤄두려고요...\r\n- 코드가 슬슬 많이 더러워집니다 ㅜㅜ 시간 때문에 기능 구현과 코드의 리팩토링을 저울질 했는데 일단 기능구현이 우선이라 생각했습니다.","created_at":"2021-07-21T07:00:01Z","updated_at":"2021-07-21T07:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":{"login":"jonghopark95","id":19240202,"node_id":"MDQ6VXNlcjE5MjQwMjAy","avatar_url":"https://avatars.githubusercontent.com/u/19240202?v=4","gravatar_id":"","url":"https://api.github.com/users/jonghopark95","html_url":"https://github.com/jonghopark95","followers_url":"https://api.github.com/users/jonghopark95/followers","following_url":"https://api.github.com/users/jonghopark95/following{/other_user}","gists_url":"https://api.github.com/users/jonghopark95/gists{/gist_id}","starred_url":"https://api.github.com/users/jonghopark95/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jonghopark95/subscriptions","organizations_url":"https://api.github.com/users/jonghopark95/orgs","repos_url":"https://api.github.com/users/jonghopark95/repos","events_url":"https://api.github.com/users/jonghopark95/events{/privacy}","received_events_url":"https://api.github.com/users/jonghopark95/received_events","type":"User","site_admin":false},"assignees":[{"login":"jonghopark95","id":19240202,"node_id":"MDQ6VXNlcjE5MjQwMjAy","avatar_url":"https://avatars.githubusercontent.com/u/19240202?v=4","gravatar_id":"","url":"https://api.github.com/users/jonghopark95","html_url":"https://github.com/jonghopark95","followers_url":"https://api.github.com/users/jonghopark95/followers","following_url":"https://api.github.com/users/jonghopark95/following{/other_user}","gists_url":"https://api.github.com/users/jonghopark95/gists{/gist_id}","starred_url":"https://api.github.com/users/jonghopark95/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jonghopark95/subscriptions","organizations_url":"https://api.github.com/users/jonghopark95/orgs","repos_url":"https://api.github.com/users/jonghopark95/repos","events_url":"https://api.github.com/users/jonghopark95/events{/privacy}","received_events_url":"https://api.github.com/users/jonghopark95/received_events","type":"User","site_admin":false}],"requested_reviewers":[{"login":"Kwongiseok","id":18898526,"node_id":"MDQ6VXNlcjE4ODk4NTI2","avatar_url":"https://avatars.githubusercontent.com/u/18898526?v=4","gravatar_id":"","url":"https://api.github.com/users/Kwongiseok","html_url":"https://github.com/Kwongiseok","followers_url":"https://api.github.com/users/Kwongiseok/followers","following_url":"https://api.github.com/users/Kwongiseok/following{/other_user}","gists_url":"https://api.github.com/users/Kwongiseok/gists{/gist_id}","starred_url":"https://api.github.com/users/Kwongiseok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Kwongiseok/subscriptions","organizations_url":"https://api.github.com/users/Kwongiseok/orgs","repos_url":"https://api.github.com/users/Kwongiseok/repos","events_url":"https://api.github.com/users/Kwongiseok/events{/privacy}","received_events_url":"https://api.github.com/users/Kwongiseok/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[{"id":3163702595,"node_id":"MDU6TGFiZWwzMTYzNzAyNTk1","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/labels/BE","name":"BE","color":"674395","default":false,"description":"백엔드 개발"},{"id":3163702051,"node_id":"MDU6TGFiZWwzMTYzNzAyMDUx","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/labels/FE","name":"FE","color":"0E1A42","default":false,"description":"프론트엔드 개발"},{"id":3163705958,"node_id":"MDU6TGFiZWwzMTYzNzA1OTU4","url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/labels/%EC%9E%91%EC%97%85%20%EC%99%84%EB%A3%8C","name":"작업 완료","color":"9FBA8B","default":false,"description":""}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/48/commits","review_comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/48/comments","review_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/comments{/number}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/48/comments","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/statuses/637da1a12fab1b1186b042361cc951bb094e3e76","head":{"label":"woowa-techcamp-2021:feature/#13","ref":"feature/#13","sha":"637da1a12fab1b1186b042361cc951bb094e3e76","user":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"repo":{"id":385130973,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMzA5NzM=","name":"deal-7","full_name":"woowa-techcamp-2021/deal-7","private":false,"owner":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/woowa-techcamp-2021/deal-7","description":null,"fork":false,"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7","forks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/forks","keys_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/keys{/key_id}","collaborators_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/teams","hooks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/hooks","issue_events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/events{/number}","events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/events","assignees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/assignees{/user}","branches_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/branches{/branch}","tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/tags","blobs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/refs{/sha}","trees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/trees{/sha}","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/statuses/{sha}","languages_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/languages","stargazers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/stargazers","contributors_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/contributors","subscribers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/subscribers","subscription_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/subscription","commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/commits{/sha}","git_commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/commits{/sha}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/comments{/number}","issue_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/comments{/number}","contents_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/contents/{+path}","compare_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/compare/{base}...{head}","merges_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/merges","archive_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/downloads","issues_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues{/number}","pulls_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls{/number}","milestones_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/milestones{/number}","notifications_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/labels{/name}","releases_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/releases{/id}","deployments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/deployments","created_at":"2021-07-12T05:08:04Z","updated_at":"2021-07-21T01:18:56Z","pushed_at":"2021-07-21T07:00:01Z","git_url":"git://github.com/woowa-techcamp-2021/deal-7.git","ssh_url":"git@github.com:woowa-techcamp-2021/deal-7.git","clone_url":"https://github.com/woowa-techcamp-2021/deal-7.git","svn_url":"https://github.com/woowa-techcamp-2021/deal-7","homepage":null,"size":1747,"stargazers_count":2,"watchers_count":2,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":1,"open_issues":6,"watchers":2,"default_branch":"dev"}},"base":{"label":"woowa-techcamp-2021:dev","ref":"dev","sha":"503ab8f0ec1137905ee8901d33a90b9a0274e397","user":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"repo":{"id":385130973,"node_id":"MDEwOlJlcG9zaXRvcnkzODUxMzA5NzM=","name":"deal-7","full_name":"woowa-techcamp-2021/deal-7","private":false,"owner":{"login":"woowa-techcamp-2021","id":86336942,"node_id":"MDEyOk9yZ2FuaXphdGlvbjg2MzM2OTQy","avatar_url":"https://avatars.githubusercontent.com/u/86336942?v=4","gravatar_id":"","url":"https://api.github.com/users/woowa-techcamp-2021","html_url":"https://github.com/woowa-techcamp-2021","followers_url":"https://api.github.com/users/woowa-techcamp-2021/followers","following_url":"https://api.github.com/users/woowa-techcamp-2021/following{/other_user}","gists_url":"https://api.github.com/users/woowa-techcamp-2021/gists{/gist_id}","starred_url":"https://api.github.com/users/woowa-techcamp-2021/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/woowa-techcamp-2021/subscriptions","organizations_url":"https://api.github.com/users/woowa-techcamp-2021/orgs","repos_url":"https://api.github.com/users/woowa-techcamp-2021/repos","events_url":"https://api.github.com/users/woowa-techcamp-2021/events{/privacy}","received_events_url":"https://api.github.com/users/woowa-techcamp-2021/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/woowa-techcamp-2021/deal-7","description":null,"fork":false,"url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7","forks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/forks","keys_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/keys{/key_id}","collaborators_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/teams","hooks_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/hooks","issue_events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/events{/number}","events_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/events","assignees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/assignees{/user}","branches_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/branches{/branch}","tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/tags","blobs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/refs{/sha}","trees_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/trees{/sha}","statuses_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/statuses/{sha}","languages_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/languages","stargazers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/stargazers","contributors_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/contributors","subscribers_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/subscribers","subscription_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/subscription","commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/commits{/sha}","git_commits_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/git/commits{/sha}","comments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/comments{/number}","issue_comment_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/comments{/number}","contents_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/contents/{+path}","compare_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/compare/{base}...{head}","merges_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/merges","archive_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/downloads","issues_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues{/number}","pulls_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls{/number}","milestones_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/milestones{/number}","notifications_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/labels{/name}","releases_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/releases{/id}","deployments_url":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/deployments","created_at":"2021-07-12T05:08:04Z","updated_at":"2021-07-21T01:18:56Z","pushed_at":"2021-07-21T07:00:01Z","git_url":"git://github.com/woowa-techcamp-2021/deal-7.git","ssh_url":"git@github.com:woowa-techcamp-2021/deal-7.git","clone_url":"https://github.com/woowa-techcamp-2021/deal-7.git","svn_url":"https://github.com/woowa-techcamp-2021/deal-7","homepage":null,"size":1747,"stargazers_count":2,"watchers_count":2,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":6,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":1,"open_issues":6,"watchers":2,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/48"},"html":{"href":"https://github.com/woowa-techcamp-2021/deal-7/pull/48"},"issue":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/48"},"comments":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/issues/48/comments"},"review_comments":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/48/comments"},"review_comment":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/pulls/48/commits"},"statuses":{"href":"https://api.github.com/repos/woowa-techcamp-2021/deal-7/statuses/637da1a12fab1b1186b042361cc951bb094e3e76"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":8,"additions":150,"deletions":43,"changed_files":8}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":86336942,"login":"woowa-techcamp-2021","gravatar_id":"","url":"https://api.github.com/orgs/woowa-techcamp-2021","avatar_url":"https://avatars.githubusercontent.com/u/86336942?"}}
+{"id":"17244792075","type":"PushEvent","actor":{"id":73381050,"login":"Kunal0007","display_login":"Kunal0007","gravatar_id":"","url":"https://api.github.com/users/Kunal0007","avatar_url":"https://avatars.githubusercontent.com/u/73381050?"},"repo":{"id":383790190,"name":"Kunal0007/Shopping-cart","url":"https://api.github.com/repos/Kunal0007/Shopping-cart"},"payload":{"push_id":7561706290,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"3bf84f4457abbd012e9e32cc4597ccda37830d05","before":"19fdb24ed3c5d328eb9e68b9a0c032c83c6c1996","commits":[{"sha":"3bf84f4457abbd012e9e32cc4597ccda37830d05","author":{"name":"Kunal Patil","email":"9626b594ec2184340966475c58ae4ba89b546a58@users.noreply.github.com"},"message":"Delete index.css","distinct":true,"url":"https://api.github.com/repos/Kunal0007/Shopping-cart/commits/3bf84f4457abbd012e9e32cc4597ccda37830d05"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792079","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":208147593,"name":"influxdata/influxdb2-sample-data","url":"https://api.github.com/repos/influxdata/influxdb2-sample-data"},"payload":{"push_id":7561706299,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"6bb3fe1b85296d7476b43363399c89e541f5a31a","before":"bc7ea8502c0ff3594a360201df63c770a7b77a6f","commits":[{"sha":"6bb3fe1b85296d7476b43363399c89e541f5a31a","author":{"name":"github-actions","email":"17973dcf2e10b67f63417c88ca4c460b2c9439f2@users.noreply.github.com"},"message":"Adding LP and annotated CSV file","distinct":true,"url":"https://api.github.com/repos/influxdata/influxdb2-sample-data/commits/6bb3fe1b85296d7476b43363399c89e541f5a31a"}]},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":5713248,"login":"influxdata","gravatar_id":"","url":"https://api.github.com/orgs/influxdata","avatar_url":"https://avatars.githubusercontent.com/u/5713248?"}}
+{"id":"17244792084","type":"CreateEvent","actor":{"id":8135172,"login":"LeonellS","display_login":"LeonellS","gravatar_id":"","url":"https://api.github.com/users/LeonellS","avatar_url":"https://avatars.githubusercontent.com/u/8135172?"},"repo":{"id":388024722,"name":"LeonellS/leonells.github.io","url":"https://api.github.com/repos/LeonellS/leonells.github.io"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792085","type":"PushEvent","actor":{"id":85987457,"login":"Nirmalya61","display_login":"Nirmalya61","gravatar_id":"","url":"https://api.github.com/users/Nirmalya61","avatar_url":"https://avatars.githubusercontent.com/u/85987457?"},"repo":{"id":388018240,"name":"Nirmalya61/New-folder","url":"https://api.github.com/repos/Nirmalya61/New-folder"},"payload":{"push_id":7561706304,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"456b2d0987d2d79d5f16702742124573b7f32008","before":"7827ff52436d8dee36467746da5d51d30e06d0db","commits":[{"sha":"456b2d0987d2d79d5f16702742124573b7f32008","author":{"name":"Nirmalya","email":"3a2789cf63cb1531afedba7ecb498a043ebe784b@users.noreply.github.com"},"message":"Create style.css","distinct":true,"url":"https://api.github.com/repos/Nirmalya61/New-folder/commits/456b2d0987d2d79d5f16702742124573b7f32008"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792086","type":"PushEvent","actor":{"id":9397845,"login":"ford442","display_login":"ford442","gravatar_id":"","url":"https://api.github.com/users/ford442","avatar_url":"https://avatars.githubusercontent.com/u/9397845?"},"repo":{"id":387942769,"name":"ford442/r3g","url":"https://api.github.com/repos/ford442/r3g"},"payload":{"push_id":7561706296,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"e3203e93ee89a6d222bcec006eeab6b9994dd250","before":"981a4a009b15de8b39a720f0451354cb8bf7762a","commits":[{"sha":"e3203e93ee89a6d222bcec006eeab6b9994dd250","author":{"name":"Noah Cohn","email":"28c606380e2d43e0ea2b0c4890117e1a35650978@gmail.com"},"message":"Delete array.h","distinct":true,"url":"https://api.github.com/repos/ford442/r3g/commits/e3203e93ee89a6d222bcec006eeab6b9994dd250"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792087","type":"CreateEvent","actor":{"id":86947924,"login":"JustInPosition","display_login":"JustInPosition","gravatar_id":"","url":"https://api.github.com/users/JustInPosition","avatar_url":"https://avatars.githubusercontent.com/u/86947924?"},"repo":{"id":388022686,"name":"PositionExchange/position-token","url":"https://api.github.com/repos/PositionExchange/position-token"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":86948262,"login":"PositionExchange","gravatar_id":"","url":"https://api.github.com/orgs/PositionExchange","avatar_url":"https://avatars.githubusercontent.com/u/86948262?"}}
+{"id":"17244792092","type":"PushEvent","actor":{"id":67720330,"login":"Labruhtoory","display_login":"Labruhtoory","gravatar_id":"","url":"https://api.github.com/users/Labruhtoory","avatar_url":"https://avatars.githubusercontent.com/u/67720330?"},"repo":{"id":330309164,"name":"Labruhtoory/os_setups","url":"https://api.github.com/repos/Labruhtoory/os_setups"},"payload":{"push_id":7561706306,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"6604fc4b5b89c86fadef14cae2a41b8ec70f67de","before":"c6863e592b9be8d93819dd37ba67463a0eeb19f5","commits":[{"sha":"6604fc4b5b89c86fadef14cae2a41b8ec70f67de","author":{"name":"Labruhtoory","email":"ae98245dcac678d585d9d98787531f027ec0afcb@users.noreply.github.com"},"message":"Update deb_os.sh","distinct":true,"url":"https://api.github.com/repos/Labruhtoory/os_setups/commits/6604fc4b5b89c86fadef14cae2a41b8ec70f67de"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792098","type":"IssueCommentEvent","actor":{"id":25307165,"login":"JNKPercona","display_login":"JNKPercona","gravatar_id":"","url":"https://api.github.com/users/JNKPercona","avatar_url":"https://avatars.githubusercontent.com/u/25307165?"},"repo":{"id":114283030,"name":"Percona-Lab/pmm-submodules","url":"https://api.github.com/repos/Percona-Lab/pmm-submodules"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/issues/1919","repository_url":"https://api.github.com/repos/Percona-Lab/pmm-submodules","labels_url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/issues/1919/labels{/name}","comments_url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/issues/1919/comments","events_url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/issues/1919/events","html_url":"https://github.com/Percona-Lab/pmm-submodules/pull/1919","id":948481409,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMzE4Mzc0","number":1919,"title":"PMM-8408 DBaaS: use correct pmm-client image based on environment","user":{"login":"jprukner","id":13995559,"node_id":"MDQ6VXNlcjEzOTk1NTU5","avatar_url":"https://avatars.githubusercontent.com/u/13995559?v=4","gravatar_id":"","url":"https://api.github.com/users/jprukner","html_url":"https://github.com/jprukner","followers_url":"https://api.github.com/users/jprukner/followers","following_url":"https://api.github.com/users/jprukner/following{/other_user}","gists_url":"https://api.github.com/users/jprukner/gists{/gist_id}","starred_url":"https://api.github.com/users/jprukner/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jprukner/subscriptions","organizations_url":"https://api.github.com/users/jprukner/orgs","repos_url":"https://api.github.com/users/jprukner/repos","events_url":"https://api.github.com/users/jprukner/events{/privacy}","received_events_url":"https://api.github.com/users/jprukner/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":5,"created_at":"2021-07-20T09:41:45Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/pulls/1919","html_url":"https://github.com/Percona-Lab/pmm-submodules/pull/1919","diff_url":"https://github.com/Percona-Lab/pmm-submodules/pull/1919.diff","patch_url":"https://github.com/Percona-Lab/pmm-submodules/pull/1919.patch"},"body":"","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/issues/comments/883942790","html_url":"https://github.com/Percona-Lab/pmm-submodules/pull/1919#issuecomment-883942790","issue_url":"https://api.github.com/repos/Percona-Lab/pmm-submodules/issues/1919","id":883942790,"node_id":"IC_kwDOBs_SFs40r-WG","user":{"login":"JNKPercona","id":25307165,"node_id":"MDQ6VXNlcjI1MzA3MTY1","avatar_url":"https://avatars.githubusercontent.com/u/25307165?v=4","gravatar_id":"","url":"https://api.github.com/users/JNKPercona","html_url":"https://github.com/JNKPercona","followers_url":"https://api.github.com/users/JNKPercona/followers","following_url":"https://api.github.com/users/JNKPercona/following{/other_user}","gists_url":"https://api.github.com/users/JNKPercona/gists{/gist_id}","starred_url":"https://api.github.com/users/JNKPercona/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JNKPercona/subscriptions","organizations_url":"https://api.github.com/users/JNKPercona/orgs","repos_url":"https://api.github.com/users/JNKPercona/repos","events_url":"https://api.github.com/users/JNKPercona/events{/privacy}","received_events_url":"https://api.github.com/users/JNKPercona/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","author_association":"COLLABORATOR","body":"server docker - perconalab/pmm-server-fb:PR-1919-643b5aa\nclient docker - perconalab/pmm-client-fb:PR-1919-643b5aa\nclient - https://s3.us-east-2.amazonaws.com/pmm-build-cache/PR-BUILDS/pmm2-client/pmm2-client-PR-1919-643b5aa.tar.gz\nCreate Staging Instance: https://pmm.cd.percona.com/job/aws-staging-start/parambuild/?DOCKER_VERSION=perconalab/pmm-server-fb:PR-1919-643b5aa&CLIENT_VERSION=https://s3.us-east-2.amazonaws.com/pmm-build-cache/PR-BUILDS/pmm2-client/pmm2-client-PR-1919-643b5aa.tar.gz","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":12824839,"login":"Percona-Lab","gravatar_id":"","url":"https://api.github.com/orgs/Percona-Lab","avatar_url":"https://avatars.githubusercontent.com/u/12824839?"}}
+{"id":"17244792119","type":"WatchEvent","actor":{"id":44917879,"login":"Root970103","display_login":"Root970103","gravatar_id":"","url":"https://api.github.com/users/Root970103","avatar_url":"https://avatars.githubusercontent.com/u/44917879?"},"repo":{"id":177778222,"name":"luopeixiang/im2latex","url":"https://api.github.com/repos/luopeixiang/im2latex"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792120","type":"PushEvent","actor":{"id":87436052,"login":"ZahiCohen","display_login":"ZahiCohen","gravatar_id":"","url":"https://api.github.com/users/ZahiCohen","avatar_url":"https://avatars.githubusercontent.com/u/87436052?"},"repo":{"id":385995015,"name":"ZahiCohen/JB","url":"https://api.github.com/repos/ZahiCohen/JB"},"payload":{"push_id":7561706316,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"914e757e71c4c3b32aefbb754f21a61eecec3ff5","before":"85f2a24b54106c0b49a66752163ebcc3b7579078","commits":[{"sha":"914e757e71c4c3b32aefbb754f21a61eecec3ff5","author":{"name":"ZahiCohen","email":"80573d27bfaac40c91d00e13e2e520afd7037825@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/ZahiCohen/JB/commits/914e757e71c4c3b32aefbb754f21a61eecec3ff5"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792121","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":275871713,"name":"NethServer/dns-community-blacklist","url":"https://api.github.com/repos/NethServer/dns-community-blacklist"},"payload":{"push_id":7561706324,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"53e920bdbfb5ebffc1bcf5640fa673d1e082ca7f","before":"21cc010de57c1e15d5626be49aa71102031a1aaa","commits":[{"sha":"53e920bdbfb5ebffc1bcf5640fa673d1e082ca7f","author":{"name":"dnutan","email":"759532faf728bc7a97f912a9df9d6c70aa6f0244@mailbox.org"},"message":"[Bot] Update DNS Blacklists (2021-07-21T06:59:58Z)","distinct":true,"url":"https://api.github.com/repos/NethServer/dns-community-blacklist/commits/53e920bdbfb5ebffc1bcf5640fa673d1e082ca7f"}]},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":6469208,"login":"NethServer","gravatar_id":"","url":"https://api.github.com/orgs/NethServer","avatar_url":"https://avatars.githubusercontent.com/u/6469208?"}}
+{"id":"17244792123","type":"PushEvent","actor":{"id":69618456,"login":"adityachaphekar","display_login":"adityachaphekar","gravatar_id":"","url":"https://api.github.com/users/adityachaphekar","avatar_url":"https://avatars.githubusercontent.com/u/69618456?"},"repo":{"id":387539318,"name":"adityachaphekar/dynamicpipeline","url":"https://api.github.com/repos/adityachaphekar/dynamicpipeline"},"payload":{"push_id":7561706321,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"a2eed8358f53552df18daafe3c90d5078a9b1475","before":"c5449b591bdf0b5bbd461821cbc32d31df04fc0d","commits":[{"sha":"a2eed8358f53552df18daafe3c90d5078a9b1475","author":{"name":"adityachaphekar","email":"609587ff81c32b9d2b093aeccc69c53a301a1e30@users.noreply.github.com"},"message":"Update samplereactjob.yaml","distinct":true,"url":"https://api.github.com/repos/adityachaphekar/dynamicpipeline/commits/a2eed8358f53552df18daafe3c90d5078a9b1475"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792127","type":"CreateEvent","actor":{"id":1413417,"login":"nutgaard","display_login":"nutgaard","gravatar_id":"","url":"https://api.github.com/users/nutgaard","avatar_url":"https://avatars.githubusercontent.com/u/1413417?"},"repo":{"id":122311682,"name":"navikt/modiapersonoversikt","url":"https://api.github.com/repos/navikt/modiapersonoversikt"},"payload":{"ref":"fix/fagsystem-177153","ref_type":"branch","master_branch":"dev","description":" Modiapersonoversikt er en intern arbeidsflate som gir veiledere og saksbehandlere oversikt over brukeres forhold til NAV.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":11848947,"login":"navikt","gravatar_id":"","url":"https://api.github.com/orgs/navikt","avatar_url":"https://avatars.githubusercontent.com/u/11848947?"}}
+{"id":"17244792134","type":"IssueCommentEvent","actor":{"id":11410715,"login":"AsierGonzalez","display_login":"AsierGonzalez","gravatar_id":"","url":"https://api.github.com/users/AsierGonzalez","avatar_url":"https://avatars.githubusercontent.com/u/11410715?"},"repo":{"id":362871994,"name":"iRNA-COSI/APAeval","url":"https://api.github.com/repos/iRNA-COSI/APAeval"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/iRNA-COSI/APAeval/issues/152","repository_url":"https://api.github.com/repos/iRNA-COSI/APAeval","labels_url":"https://api.github.com/repos/iRNA-COSI/APAeval/issues/152/labels{/name}","comments_url":"https://api.github.com/repos/iRNA-COSI/APAeval/issues/152/comments","events_url":"https://api.github.com/repos/iRNA-COSI/APAeval/issues/152/events","html_url":"https://github.com/iRNA-COSI/APAeval/issues/152","id":948488020,"node_id":"MDU6SXNzdWU5NDg0ODgwMjA=","number":152,"title":"OpenEBench summary workflow: rename output consolidation file","user":{"login":"AsierGonzalez","id":11410715,"node_id":"MDQ6VXNlcjExNDEwNzE1","avatar_url":"https://avatars.githubusercontent.com/u/11410715?v=4","gravatar_id":"","url":"https://api.github.com/users/AsierGonzalez","html_url":"https://github.com/AsierGonzalez","followers_url":"https://api.github.com/users/AsierGonzalez/followers","following_url":"https://api.github.com/users/AsierGonzalez/following{/other_user}","gists_url":"https://api.github.com/users/AsierGonzalez/gists{/gist_id}","starred_url":"https://api.github.com/users/AsierGonzalez/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AsierGonzalez/subscriptions","organizations_url":"https://api.github.com/users/AsierGonzalez/orgs","repos_url":"https://api.github.com/users/AsierGonzalez/repos","events_url":"https://api.github.com/users/AsierGonzalez/events{/privacy}","received_events_url":"https://api.github.com/users/AsierGonzalez/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":{"login":"yuukiiwa","id":41866052,"node_id":"MDQ6VXNlcjQxODY2MDUy","avatar_url":"https://avatars.githubusercontent.com/u/41866052?v=4","gravatar_id":"","url":"https://api.github.com/users/yuukiiwa","html_url":"https://github.com/yuukiiwa","followers_url":"https://api.github.com/users/yuukiiwa/followers","following_url":"https://api.github.com/users/yuukiiwa/following{/other_user}","gists_url":"https://api.github.com/users/yuukiiwa/gists{/gist_id}","starred_url":"https://api.github.com/users/yuukiiwa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yuukiiwa/subscriptions","organizations_url":"https://api.github.com/users/yuukiiwa/orgs","repos_url":"https://api.github.com/users/yuukiiwa/repos","events_url":"https://api.github.com/users/yuukiiwa/events{/privacy}","received_events_url":"https://api.github.com/users/yuukiiwa/received_events","type":"User","site_admin":false},"assignees":[{"login":"yuukiiwa","id":41866052,"node_id":"MDQ6VXNlcjQxODY2MDUy","avatar_url":"https://avatars.githubusercontent.com/u/41866052?v=4","gravatar_id":"","url":"https://api.github.com/users/yuukiiwa","html_url":"https://github.com/yuukiiwa","followers_url":"https://api.github.com/users/yuukiiwa/followers","following_url":"https://api.github.com/users/yuukiiwa/following{/other_user}","gists_url":"https://api.github.com/users/yuukiiwa/gists{/gist_id}","starred_url":"https://api.github.com/users/yuukiiwa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yuukiiwa/subscriptions","organizations_url":"https://api.github.com/users/yuukiiwa/orgs","repos_url":"https://api.github.com/users/yuukiiwa/repos","events_url":"https://api.github.com/users/yuukiiwa/events{/privacy}","received_events_url":"https://api.github.com/users/yuukiiwa/received_events","type":"User","site_admin":false}],"milestone":null,"comments":3,"created_at":"2021-07-20T09:50:24Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"COLLABORATOR","active_lock_reason":null,"body":"At the moment the output file is called `{challenge_name}_summary.json` (e.g. `Q2_summary.json`), which causes issue with the visualisation as the js code used expects the file to be called `{challenge_name}.json` (e.g. `Q2.json`). Could you please change the code in [line 138 of manage_assessment_data.py](https://github.com/iRNA-COSI/APAeval/blob/main/summary_workflows/quantification/Q2/benchmarking_dockers/apaeval_consolidation/manage_assessment_data.py#L138) to remove the \"_summary\" bit? \r\n\r\n\r\n`summary_dir = os.path.join(challenge_dir,challenge + `~~\"_summary.json\"~~ `\".json\")`\r\n\r\nI believe this is the only place in the code this filename is reference but I haven't checked thoroughly","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/iRNA-COSI/APAeval/issues/comments/883942792","html_url":"https://github.com/iRNA-COSI/APAeval/issues/152#issuecomment-883942792","issue_url":"https://api.github.com/repos/iRNA-COSI/APAeval/issues/152","id":883942792,"node_id":"IC_kwDOFaD8us40r-WI","user":{"login":"AsierGonzalez","id":11410715,"node_id":"MDQ6VXNlcjExNDEwNzE1","avatar_url":"https://avatars.githubusercontent.com/u/11410715?v=4","gravatar_id":"","url":"https://api.github.com/users/AsierGonzalez","html_url":"https://github.com/AsierGonzalez","followers_url":"https://api.github.com/users/AsierGonzalez/followers","following_url":"https://api.github.com/users/AsierGonzalez/following{/other_user}","gists_url":"https://api.github.com/users/AsierGonzalez/gists{/gist_id}","starred_url":"https://api.github.com/users/AsierGonzalez/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AsierGonzalez/subscriptions","organizations_url":"https://api.github.com/users/AsierGonzalez/orgs","repos_url":"https://api.github.com/users/AsierGonzalez/repos","events_url":"https://api.github.com/users/AsierGonzalez/events{/privacy}","received_events_url":"https://api.github.com/users/AsierGonzalez/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","author_association":"COLLABORATOR","body":"Thank you @yuukiiwa. I see you have changed `manage_assessment_data.py` but not  `merge_data_model_files.py`, do you think the latter is fine as it?","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":63477102,"login":"iRNA-COSI","gravatar_id":"","url":"https://api.github.com/orgs/iRNA-COSI","avatar_url":"https://avatars.githubusercontent.com/u/63477102?"}}
+{"id":"17244792139","type":"CreateEvent","actor":{"id":45584744,"login":"kuangzhilu","display_login":"kuangzhilu","gravatar_id":"","url":"https://api.github.com/users/kuangzhilu","avatar_url":"https://avatars.githubusercontent.com/u/45584744?"},"repo":{"id":388021305,"name":"kuangzhilu/init","url":"https://api.github.com/repos/kuangzhilu/init"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792144","type":"PushEvent","actor":{"id":37845953,"login":"openapi-sdkautomation[bot]","display_login":"openapi-sdkautomation","gravatar_id":"","url":"https://api.github.com/users/openapi-sdkautomation[bot]","avatar_url":"https://avatars.githubusercontent.com/u/37845953?"},"repo":{"id":379510750,"name":"AzureSDKAutomation/azure-sdk-for-go","url":"https://api.github.com/repos/AzureSDKAutomation/azure-sdk-for-go"},"payload":{"push_id":7561706300,"size":0,"distinct_size":0,"ref":"refs/heads/main","head":"063ba36b88e88a618ebb1372ca84f2ab26d74927","before":"063ba36b88e88a618ebb1372ca84f2ab26d74927","commits":[]},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":50844873,"login":"AzureSDKAutomation","gravatar_id":"","url":"https://api.github.com/orgs/AzureSDKAutomation","avatar_url":"https://avatars.githubusercontent.com/u/50844873?"}}
+{"id":"17244792146","type":"PushEvent","actor":{"id":85284788,"login":"kokowhen","display_login":"kokowhen","gravatar_id":"","url":"https://api.github.com/users/kokowhen","avatar_url":"https://avatars.githubusercontent.com/u/85284788?"},"repo":{"id":387367469,"name":"kokowhen/my_Learning_Notes","url":"https://api.github.com/repos/kokowhen/my_Learning_Notes"},"payload":{"push_id":7561706323,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"1ee00fca38eac0ecc17bc7ba89f0030d9928247c","before":"9c6e938ef13bec9d2bc62af47b9c9950d6993e26","commits":[{"sha":"1ee00fca38eac0ecc17bc7ba89f0030d9928247c","author":{"name":"Jeffery","email":"4e13c45a9d1913391d03bd93e4bf29dd2c8c0672@gmail.com"},"message":"Delete Project1 directory","distinct":true,"url":"https://api.github.com/repos/kokowhen/my_Learning_Notes/commits/1ee00fca38eac0ecc17bc7ba89f0030d9928247c"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792152","type":"PullRequestEvent","actor":{"id":49699333,"login":"dependabot[bot]","display_login":"dependabot","gravatar_id":"","url":"https://api.github.com/users/dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},"repo":{"id":262461195,"name":"crowdbotics-apps/aviannasavatarmaker-16781","url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781"},"payload":{"action":"opened","number":16,"pull_request":{"url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/16","id":694104871,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODcx","html_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781/pull/16","diff_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781/pull/16.diff","patch_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781/pull/16.patch","issue_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/16","number":16,"state":"open","locked":false,"title":"Bump react-native from 0.60.5 to 0.62.3","user":{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [react-native](https://github.com/facebook/react-native) from 0.60.5 to 0.62.3.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/facebook/react-native/releases\">react-native's releases</a>.</em></p>\n<blockquote>\n<h2>v0.62.3</h2>\n<p>This patch release is specifically targetted towards Xcode 12.5. The changes done are tailored to unblock developers still relying on v0.62 of RN.</p>\n<p>Aside from bumping your version from 0.62.2 to 0.62.3, please make sure to add this line to your podfile (or modify it if you already had it):</p>\n<pre><code>use_flipper!('Flipper' =&gt; '0.75.1', 'Flipper-Folly' =&gt; '2.5.3', 'Flipper-RSocket' =&gt; '1.3.1')\n</code></pre>\n<p>After which, do all the classic necessary cleans (node_modules, caches, pod folders, etc)(<a href=\"https://github.com/pmadruga/react-native-clean-project\">react-native-clean-project</a> is your ally) then do <code>yarn install</code> and a <code>pod install --repo-update</code> (if pod install fails on an error about a Flipper package, just remove the relevant lines from the podfile.lock and run the pod install again).</p>\n<p>The only other commit picked &amp; released along the Xcode 12.5 fixes is:</p>\n<ul>\n<li>Update validateBaseUrl to use latest regex (<a href=\"https://github.com/facebook/react-native/commit/ca09ae82715e33c9ac77b3fa55495cf84ba891c7\">commit</a>) which fixes CVE-2020-1920, GHSL-2020-293.</li>\n</ul>\n<hr />\n<p>To help you upgrade to this version, you can use the <a href=\"https://react-native-community.github.io/upgrade-helper/\">upgrade helper</a> ⚛️</p>\n<hr />\n<p>You can find the whole <a href=\"https://github.com/react-native-community/react-native-releases/blob/master/CHANGELOG.md\">changelog history</a> over at <code>react-native-releases</code>.</p>\n<h2>v0.62.2</h2>\n<p>This release fixes a few minor issues that were reported by the community. You can view the complete changelog <a href=\"https://github.com/react-native-community/releases/blob/master/CHANGELOG.md#v0622\">here</a>.</p>\n<p>You can participate in the conversation for the next patch release in the dedicated <a href=\"https://github-redirect.dependabot.com/react-native-community/releases/issues/188\">issue</a>.</p>\n<hr />\n<p>To help you upgrade to this version, you can use the new <a href=\"https://react-native-community.github.io/upgrade-helper/\">upgrade helper</a> ⚛️</p>\n<hr />\n<p>You can find the whole <a href=\"https://github.com/react-native-community/react-native-releases/blob/master/CHANGELOG.md\">changelog history</a> over at <code>react-native-releases</code>.</p>\n<h2>v0.62.1</h2>\n<p>This release fixes a YellowBox regression in v0.62.0 where the Flipper network inspector causes YellowBox to crash the app due to using base64 images.</p>\n<p>You can view the complete changelog <a href=\"https://github.com/react-native-community/releases/blob/master/CHANGELOG.md#v0621\">here</a>.</p>\n<p>You can participate in the conversation for the next patch release in the dedicated <a href=\"https://github-redirect.dependabot.com/react-native-community/releases/issues/184\">issue</a>.</p>\n<hr />\n<p>To help you upgrade to this version, you can use the new <a href=\"https://react-native-community.github.io/upgrade-helper/\">upgrade helper</a> ⚛️</p>\n<hr />\n<p>You can find the whole <a href=\"https://github.com/react-native-community/react-native-releases/blob/master/CHANGELOG.md\">changelog history</a> over at <code>react-native-releases</code>.</p>\n<!-- raw HTML omitted -->\n</blockquote>\n<p>... (truncated)</p>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/facebook/react-native/commit/83425fa72f1f9a12f6b6deefd66fa8bd154a3651\"><code>83425fa</code></a> [0.62.3] Bump version numbers</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/c6f4611dcbfbb64d5b54e242570e2a1acffcabef\"><code>c6f4611</code></a> [local] change autolink to match requirements for FlipperFolly working with X...</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/c4ea556d64c7fc146d1412548788c48bbcc0f6bb\"><code>c4ea556</code></a> [local] change podfile to rely on the autolink-ios rb file</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/ca09ae82715e33c9ac77b3fa55495cf84ba891c7\"><code>ca09ae8</code></a> Update validateBaseUrl to use latest regex</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/166a5ddf88aca0d0235e48c624681eec095e9ef8\"><code>166a5dd</code></a> Get ReactiveNative compiled with Clang 10 (<a href=\"https://github-redirect.dependabot.com/facebook/react-native/issues/28362\">#28362</a>)</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/158b558e500576f434dec09417bb02cc0bc53f7a\"><code>158b558</code></a> [local] update detox to work on Xcode 12</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/b9944e54ae35c2beed0e78ea454d871e0fe92ec6\"><code>b9944e5</code></a> [0.62.2] Bump version numbers</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/f89c5098bec5ba1a3b4bee54b51d639beff559f6\"><code>f89c509</code></a> Make Vibration.vibrate compatible with TurboModules (<a href=\"https://github-redirect.dependabot.com/facebook/react-native/issues/27951\">#27951</a>)</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/8858d879eb689a9a7efda83c5f7e45f154a2f935\"><code>8858d87</code></a> Exclude all FlipperKit transitive dependencies from iOS Release builds (<a href=\"https://github-redirect.dependabot.com/facebook/react-native/issues/28504\">#28504</a>)</li>\n<li><a href=\"https://github.com/facebook/react-native/commit/4fd9c9d544d741fb2df3ad849dfa4bdf4719ccf4\"><code>4fd9c9d</code></a> Fix Appearance module when using Chrome Debugger</li>\n<li>Additional commits viewable in <a href=\"https://github.com/facebook/react-native/compare/v0.60.5...v0.62.3\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=react-native&package-manager=npm_and_yarn&previous-version=0.60.5&new-version=0.62.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/crowdbotics-apps/aviannasavatarmaker-16781/network/alerts).\n\n</details>","created_at":"2021-07-21T07:00:01Z","updated_at":"2021-07-21T07:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/16/commits","review_comments_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/16/comments","review_comment_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/comments{/number}","comments_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/16/comments","statuses_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/statuses/296e1658337a372871cb5528c85bdaa81ef7bc3f","head":{"label":"crowdbotics-apps:dependabot/npm_and_yarn/react-native-0.62.3","ref":"dependabot/npm_and_yarn/react-native-0.62.3","sha":"296e1658337a372871cb5528c85bdaa81ef7bc3f","user":{"login":"crowdbotics-apps","id":46582385,"node_id":"MDQ6VXNlcjQ2NTgyMzg1","avatar_url":"https://avatars.githubusercontent.com/u/46582385?v=4","gravatar_id":"","url":"https://api.github.com/users/crowdbotics-apps","html_url":"https://github.com/crowdbotics-apps","followers_url":"https://api.github.com/users/crowdbotics-apps/followers","following_url":"https://api.github.com/users/crowdbotics-apps/following{/other_user}","gists_url":"https://api.github.com/users/crowdbotics-apps/gists{/gist_id}","starred_url":"https://api.github.com/users/crowdbotics-apps/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/crowdbotics-apps/subscriptions","organizations_url":"https://api.github.com/users/crowdbotics-apps/orgs","repos_url":"https://api.github.com/users/crowdbotics-apps/repos","events_url":"https://api.github.com/users/crowdbotics-apps/events{/privacy}","received_events_url":"https://api.github.com/users/crowdbotics-apps/received_events","type":"User","site_admin":false},"repo":{"id":262461195,"node_id":"MDEwOlJlcG9zaXRvcnkyNjI0NjExOTU=","name":"aviannasavatarmaker-16781","full_name":"crowdbotics-apps/aviannasavatarmaker-16781","private":false,"owner":{"login":"crowdbotics-apps","id":46582385,"node_id":"MDQ6VXNlcjQ2NTgyMzg1","avatar_url":"https://avatars.githubusercontent.com/u/46582385?v=4","gravatar_id":"","url":"https://api.github.com/users/crowdbotics-apps","html_url":"https://github.com/crowdbotics-apps","followers_url":"https://api.github.com/users/crowdbotics-apps/followers","following_url":"https://api.github.com/users/crowdbotics-apps/following{/other_user}","gists_url":"https://api.github.com/users/crowdbotics-apps/gists{/gist_id}","starred_url":"https://api.github.com/users/crowdbotics-apps/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/crowdbotics-apps/subscriptions","organizations_url":"https://api.github.com/users/crowdbotics-apps/orgs","repos_url":"https://api.github.com/users/crowdbotics-apps/repos","events_url":"https://api.github.com/users/crowdbotics-apps/events{/privacy}","received_events_url":"https://api.github.com/users/crowdbotics-apps/received_events","type":"User","site_admin":false},"html_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781","description":"This react_native application was built with Crowdbotics www.crowdbotics.com","fork":false,"url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781","forks_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/forks","keys_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/keys{/key_id}","collaborators_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/teams","hooks_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/hooks","issue_events_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/events{/number}","events_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/events","assignees_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/assignees{/user}","branches_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/branches{/branch}","tags_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/tags","blobs_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/refs{/sha}","trees_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/trees{/sha}","statuses_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/statuses/{sha}","languages_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/languages","stargazers_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/stargazers","contributors_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/contributors","subscribers_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/subscribers","subscription_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/subscription","commits_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/commits{/sha}","git_commits_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/commits{/sha}","comments_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/comments{/number}","issue_comment_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/comments{/number}","contents_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/contents/{+path}","compare_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/compare/{base}...{head}","merges_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/merges","archive_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/downloads","issues_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues{/number}","pulls_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls{/number}","milestones_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/milestones{/number}","notifications_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/labels{/name}","releases_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/releases{/id}","deployments_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/deployments","created_at":"2020-05-09T01:10:54Z","updated_at":"2020-05-09T01:11:50Z","pushed_at":"2021-07-21T07:00:02Z","git_url":"git://github.com/crowdbotics-apps/aviannasavatarmaker-16781.git","ssh_url":"git@github.com:crowdbotics-apps/aviannasavatarmaker-16781.git","clone_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781.git","svn_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781","homepage":null,"size":36052,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":14,"license":null,"forks":0,"open_issues":14,"watchers":0,"default_branch":"master"}},"base":{"label":"crowdbotics-apps:master","ref":"master","sha":"0d6f23c1cea953c1fbc0a8a8144e7c3040a5e4a1","user":{"login":"crowdbotics-apps","id":46582385,"node_id":"MDQ6VXNlcjQ2NTgyMzg1","avatar_url":"https://avatars.githubusercontent.com/u/46582385?v=4","gravatar_id":"","url":"https://api.github.com/users/crowdbotics-apps","html_url":"https://github.com/crowdbotics-apps","followers_url":"https://api.github.com/users/crowdbotics-apps/followers","following_url":"https://api.github.com/users/crowdbotics-apps/following{/other_user}","gists_url":"https://api.github.com/users/crowdbotics-apps/gists{/gist_id}","starred_url":"https://api.github.com/users/crowdbotics-apps/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/crowdbotics-apps/subscriptions","organizations_url":"https://api.github.com/users/crowdbotics-apps/orgs","repos_url":"https://api.github.com/users/crowdbotics-apps/repos","events_url":"https://api.github.com/users/crowdbotics-apps/events{/privacy}","received_events_url":"https://api.github.com/users/crowdbotics-apps/received_events","type":"User","site_admin":false},"repo":{"id":262461195,"node_id":"MDEwOlJlcG9zaXRvcnkyNjI0NjExOTU=","name":"aviannasavatarmaker-16781","full_name":"crowdbotics-apps/aviannasavatarmaker-16781","private":false,"owner":{"login":"crowdbotics-apps","id":46582385,"node_id":"MDQ6VXNlcjQ2NTgyMzg1","avatar_url":"https://avatars.githubusercontent.com/u/46582385?v=4","gravatar_id":"","url":"https://api.github.com/users/crowdbotics-apps","html_url":"https://github.com/crowdbotics-apps","followers_url":"https://api.github.com/users/crowdbotics-apps/followers","following_url":"https://api.github.com/users/crowdbotics-apps/following{/other_user}","gists_url":"https://api.github.com/users/crowdbotics-apps/gists{/gist_id}","starred_url":"https://api.github.com/users/crowdbotics-apps/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/crowdbotics-apps/subscriptions","organizations_url":"https://api.github.com/users/crowdbotics-apps/orgs","repos_url":"https://api.github.com/users/crowdbotics-apps/repos","events_url":"https://api.github.com/users/crowdbotics-apps/events{/privacy}","received_events_url":"https://api.github.com/users/crowdbotics-apps/received_events","type":"User","site_admin":false},"html_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781","description":"This react_native application was built with Crowdbotics www.crowdbotics.com","fork":false,"url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781","forks_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/forks","keys_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/keys{/key_id}","collaborators_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/teams","hooks_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/hooks","issue_events_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/events{/number}","events_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/events","assignees_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/assignees{/user}","branches_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/branches{/branch}","tags_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/tags","blobs_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/refs{/sha}","trees_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/trees{/sha}","statuses_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/statuses/{sha}","languages_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/languages","stargazers_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/stargazers","contributors_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/contributors","subscribers_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/subscribers","subscription_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/subscription","commits_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/commits{/sha}","git_commits_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/git/commits{/sha}","comments_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/comments{/number}","issue_comment_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/comments{/number}","contents_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/contents/{+path}","compare_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/compare/{base}...{head}","merges_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/merges","archive_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/downloads","issues_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues{/number}","pulls_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls{/number}","milestones_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/milestones{/number}","notifications_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/labels{/name}","releases_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/releases{/id}","deployments_url":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/deployments","created_at":"2020-05-09T01:10:54Z","updated_at":"2020-05-09T01:11:50Z","pushed_at":"2021-07-21T07:00:02Z","git_url":"git://github.com/crowdbotics-apps/aviannasavatarmaker-16781.git","ssh_url":"git@github.com:crowdbotics-apps/aviannasavatarmaker-16781.git","clone_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781.git","svn_url":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781","homepage":null,"size":36052,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":14,"license":null,"forks":0,"open_issues":14,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/16"},"html":{"href":"https://github.com/crowdbotics-apps/aviannasavatarmaker-16781/pull/16"},"issue":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/16"},"comments":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/issues/16/comments"},"review_comments":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/16/comments"},"review_comment":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/pulls/16/commits"},"statuses":{"href":"https://api.github.com/repos/crowdbotics-apps/aviannasavatarmaker-16781/statuses/296e1658337a372871cb5528c85bdaa81ef7bc3f"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":860,"deletions":593,"changed_files":2}},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792153","type":"ForkEvent","actor":{"id":68951627,"login":"kawata-yuya","display_login":"kawata-yuya","gravatar_id":"","url":"https://api.github.com/users/kawata-yuya","avatar_url":"https://avatars.githubusercontent.com/u/68951627?"},"repo":{"id":81598961,"name":"python/cpython","url":"https://api.github.com/repos/python/cpython"},"payload":{"forkee":{"id":388024727,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMjQ3Mjc=","name":"cpython","full_name":"kawata-yuya/cpython","private":false,"owner":{"login":"kawata-yuya","id":68951627,"node_id":"MDQ6VXNlcjY4OTUxNjI3","avatar_url":"https://avatars.githubusercontent.com/u/68951627?v=4","gravatar_id":"","url":"https://api.github.com/users/kawata-yuya","html_url":"https://github.com/kawata-yuya","followers_url":"https://api.github.com/users/kawata-yuya/followers","following_url":"https://api.github.com/users/kawata-yuya/following{/other_user}","gists_url":"https://api.github.com/users/kawata-yuya/gists{/gist_id}","starred_url":"https://api.github.com/users/kawata-yuya/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kawata-yuya/subscriptions","organizations_url":"https://api.github.com/users/kawata-yuya/orgs","repos_url":"https://api.github.com/users/kawata-yuya/repos","events_url":"https://api.github.com/users/kawata-yuya/events{/privacy}","received_events_url":"https://api.github.com/users/kawata-yuya/received_events","type":"User","site_admin":false},"html_url":"https://github.com/kawata-yuya/cpython","description":"The Python programming language","fork":true,"url":"https://api.github.com/repos/kawata-yuya/cpython","forks_url":"https://api.github.com/repos/kawata-yuya/cpython/forks","keys_url":"https://api.github.com/repos/kawata-yuya/cpython/keys{/key_id}","collaborators_url":"https://api.github.com/repos/kawata-yuya/cpython/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/kawata-yuya/cpython/teams","hooks_url":"https://api.github.com/repos/kawata-yuya/cpython/hooks","issue_events_url":"https://api.github.com/repos/kawata-yuya/cpython/issues/events{/number}","events_url":"https://api.github.com/repos/kawata-yuya/cpython/events","assignees_url":"https://api.github.com/repos/kawata-yuya/cpython/assignees{/user}","branches_url":"https://api.github.com/repos/kawata-yuya/cpython/branches{/branch}","tags_url":"https://api.github.com/repos/kawata-yuya/cpython/tags","blobs_url":"https://api.github.com/repos/kawata-yuya/cpython/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/kawata-yuya/cpython/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/kawata-yuya/cpython/git/refs{/sha}","trees_url":"https://api.github.com/repos/kawata-yuya/cpython/git/trees{/sha}","statuses_url":"https://api.github.com/repos/kawata-yuya/cpython/statuses/{sha}","languages_url":"https://api.github.com/repos/kawata-yuya/cpython/languages","stargazers_url":"https://api.github.com/repos/kawata-yuya/cpython/stargazers","contributors_url":"https://api.github.com/repos/kawata-yuya/cpython/contributors","subscribers_url":"https://api.github.com/repos/kawata-yuya/cpython/subscribers","subscription_url":"https://api.github.com/repos/kawata-yuya/cpython/subscription","commits_url":"https://api.github.com/repos/kawata-yuya/cpython/commits{/sha}","git_commits_url":"https://api.github.com/repos/kawata-yuya/cpython/git/commits{/sha}","comments_url":"https://api.github.com/repos/kawata-yuya/cpython/comments{/number}","issue_comment_url":"https://api.github.com/repos/kawata-yuya/cpython/issues/comments{/number}","contents_url":"https://api.github.com/repos/kawata-yuya/cpython/contents/{+path}","compare_url":"https://api.github.com/repos/kawata-yuya/cpython/compare/{base}...{head}","merges_url":"https://api.github.com/repos/kawata-yuya/cpython/merges","archive_url":"https://api.github.com/repos/kawata-yuya/cpython/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/kawata-yuya/cpython/downloads","issues_url":"https://api.github.com/repos/kawata-yuya/cpython/issues{/number}","pulls_url":"https://api.github.com/repos/kawata-yuya/cpython/pulls{/number}","milestones_url":"https://api.github.com/repos/kawata-yuya/cpython/milestones{/number}","notifications_url":"https://api.github.com/repos/kawata-yuya/cpython/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/kawata-yuya/cpython/labels{/name}","releases_url":"https://api.github.com/repos/kawata-yuya/cpython/releases{/id}","deployments_url":"https://api.github.com/repos/kawata-yuya/cpython/deployments","created_at":"2021-07-21T07:00:01Z","updated_at":"2021-07-21T06:02:33Z","pushed_at":"2021-07-20T22:27:20Z","git_url":"git://github.com/kawata-yuya/cpython.git","ssh_url":"git@github.com:kawata-yuya/cpython.git","clone_url":"https://github.com/kawata-yuya/cpython.git","svn_url":"https://github.com/kawata-yuya/cpython","homepage":"https://www.python.org/","size":389658,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master","public":true}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":1525981,"login":"python","gravatar_id":"","url":"https://api.github.com/orgs/python","avatar_url":"https://avatars.githubusercontent.com/u/1525981?"}}
+{"id":"17244792161","type":"PushEvent","actor":{"id":71702360,"login":"ZhouJianzj","display_login":"ZhouJianzj","gravatar_id":"","url":"https://api.github.com/users/ZhouJianzj","avatar_url":"https://avatars.githubusercontent.com/u/71702360?"},"repo":{"id":371244830,"name":"ZhouJianzj/Vue.js","url":"https://api.github.com/repos/ZhouJianzj/Vue.js"},"payload":{"push_id":7561706340,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"eed08791c40520ce256c15938b826e293c663df0","before":"0ececbd2f38ef7a0111e5cb4696d8d9abc193555","commits":[{"sha":"eed08791c40520ce256c15938b826e293c663df0","author":{"name":"ZhouJianzj","email":"576e16d22093e22c1906170e4170d4b8c928852a@qq.com"},"message":"elementUI、嵌套路由","distinct":true,"url":"https://api.github.com/repos/ZhouJianzj/Vue.js/commits/eed08791c40520ce256c15938b826e293c663df0"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792171","type":"IssueCommentEvent","actor":{"id":4538033,"login":"CarstenHollmann","display_login":"CarstenHollmann","gravatar_id":"","url":"https://api.github.com/users/CarstenHollmann","avatar_url":"https://avatars.githubusercontent.com/u/4538033?"},"repo":{"id":17742767,"name":"52North/SOS","url":"https://api.github.com/repos/52North/SOS"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/52North/SOS/issues/1112","repository_url":"https://api.github.com/repos/52North/SOS","labels_url":"https://api.github.com/repos/52North/SOS/issues/1112/labels{/name}","comments_url":"https://api.github.com/repos/52North/SOS/issues/1112/comments","events_url":"https://api.github.com/repos/52North/SOS/issues/1112/events","html_url":"https://github.com/52North/SOS/pull/1112","id":949298930,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDI2Mzcw","number":1112,"title":"Bump version.slf4j from 1.7.31 to 1.7.32","user":{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","site_admin":false},"labels":[{"id":1676802469,"node_id":"MDU6TGFiZWwxNjc2ODAyNDY5","url":"https://api.github.com/repos/52North/SOS/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-07-21T04:02:21Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/52North/SOS/pulls/1112","html_url":"https://github.com/52North/SOS/pull/1112","diff_url":"https://github.com/52North/SOS/pull/1112.diff","patch_url":"https://github.com/52North/SOS/pull/1112.patch"},"body":"Bumps `version.slf4j` from 1.7.31 to 1.7.32.\nUpdates `slf4j-api` from 1.7.31 to 1.7.32\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/qos-ch/slf4j/commits\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `jcl-over-slf4j` from 1.7.31 to 1.7.32\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/qos-ch/slf4j/commits\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `jul-to-slf4j` from 1.7.31 to 1.7.32\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/qos-ch/slf4j/commits\">compare view</a></li>\n</ul>\n</details>\n<br />\n\nUpdates `log4j-over-slf4j` from 1.7.31 to 1.7.32\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/qos-ch/slf4j/commits\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n\n\n</details>","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/52North/SOS/issues/comments/883942793","html_url":"https://github.com/52North/SOS/pull/1112#issuecomment-883942793","issue_url":"https://api.github.com/repos/52North/SOS/issues/1112","id":883942793,"node_id":"IC_kwDOAQ67r840r-WJ","user":{"login":"CarstenHollmann","id":4538033,"node_id":"MDQ6VXNlcjQ1MzgwMzM=","avatar_url":"https://avatars.githubusercontent.com/u/4538033?v=4","gravatar_id":"","url":"https://api.github.com/users/CarstenHollmann","html_url":"https://github.com/CarstenHollmann","followers_url":"https://api.github.com/users/CarstenHollmann/followers","following_url":"https://api.github.com/users/CarstenHollmann/following{/other_user}","gists_url":"https://api.github.com/users/CarstenHollmann/gists{/gist_id}","starred_url":"https://api.github.com/users/CarstenHollmann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CarstenHollmann/subscriptions","organizations_url":"https://api.github.com/users/CarstenHollmann/orgs","repos_url":"https://api.github.com/users/CarstenHollmann/repos","events_url":"https://api.github.com/users/CarstenHollmann/events{/privacy}","received_events_url":"https://api.github.com/users/CarstenHollmann/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","author_association":"MEMBER","body":"@dependabot recreate","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":3714494,"login":"52North","gravatar_id":"","url":"https://api.github.com/orgs/52North","avatar_url":"https://avatars.githubusercontent.com/u/3714494?"}}
+{"id":"17244792191","type":"PushEvent","actor":{"id":830993,"login":"bihe0832","display_login":"bihe0832","gravatar_id":"","url":"https://api.github.com/users/bihe0832","avatar_url":"https://avatars.githubusercontent.com/u/830993?"},"repo":{"id":85289060,"name":"bihe0832/bihe0832.github.io","url":"https://api.github.com/repos/bihe0832/bihe0832.github.io"},"payload":{"push_id":7561706355,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"6ffa3a7b8924f8bc64814128b9c8a2aee07facc9","before":"ca9739d5c8f45a081c7f01ee09a6e5c54d7e29d6","commits":[{"sha":"6ffa3a7b8924f8bc64814128b9c8a2aee07facc9","author":{"name":"子勰","email":"e6fb06210fafc02fd7479ddbed2d042cc3a5155e@bihe0832.com"},"message":"装机步骤优化","distinct":true,"url":"https://api.github.com/repos/bihe0832/bihe0832.github.io/commits/6ffa3a7b8924f8bc64814128b9c8a2aee07facc9"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792160","type":"PushEvent","actor":{"id":87353876,"login":"CharcyZhang","display_login":"CharcyZhang","gravatar_id":"","url":"https://api.github.com/users/CharcyZhang","avatar_url":"https://avatars.githubusercontent.com/u/87353876?"},"repo":{"id":385829752,"name":"CharcyZhang/CharcyZhang.github.io","url":"https://api.github.com/repos/CharcyZhang/CharcyZhang.github.io"},"payload":{"push_id":7561706346,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"7cb762f690af2a88e384f61cfab9fd18d9045cc7","before":"9c46feaebe47930e8120f883affd1c3d67d674bd","commits":[{"sha":"7cb762f690af2a88e384f61cfab9fd18d9045cc7","author":{"name":"CharcyZhang","email":"88ef02781f18875f2bb561d3ad6e0cdae6967ad4@outlook.com"},"message":"Site updated: 2021-07-21 14:59:58","distinct":true,"url":"https://api.github.com/repos/CharcyZhang/CharcyZhang.github.io/commits/7cb762f690af2a88e384f61cfab9fd18d9045cc7"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792180","type":"IssueCommentEvent","actor":{"id":79381923,"login":"boostsecurity-staging-ci[bot]","display_login":"boostsecurity-staging-ci","gravatar_id":"","url":"https://api.github.com/users/boostsecurity-staging-ci[bot]","avatar_url":"https://avatars.githubusercontent.com/u/79381923?"},"repo":{"id":376948559,"name":"boost-e2e-stage-ci-buildkite/pr-comments","url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3686","repository_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments","labels_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3686/labels{/name}","comments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3686/comments","events_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3686/events","html_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3686","id":949390530,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTAzNjM1","number":3686,"title":"Test PR Comment","user":{"login":"boost-e2e-tester-user","id":74347264,"node_id":"MDQ6VXNlcjc0MzQ3MjY0","avatar_url":"https://avatars.githubusercontent.com/u/74347264?v=4","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-tester-user","html_url":"https://github.com/boost-e2e-tester-user","followers_url":"https://api.github.com/users/boost-e2e-tester-user/followers","following_url":"https://api.github.com/users/boost-e2e-tester-user/following{/other_user}","gists_url":"https://api.github.com/users/boost-e2e-tester-user/gists{/gist_id}","starred_url":"https://api.github.com/users/boost-e2e-tester-user/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boost-e2e-tester-user/subscriptions","organizations_url":"https://api.github.com/users/boost-e2e-tester-user/orgs","repos_url":"https://api.github.com/users/boost-e2e-tester-user/repos","events_url":"https://api.github.com/users/boost-e2e-tester-user/events{/privacy}","received_events_url":"https://api.github.com/users/boost-e2e-tester-user/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":3,"created_at":"2021-07-21T06:57:44Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3686","html_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3686","diff_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3686.diff","patch_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3686.patch"},"body":null,"performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/comments/883942794","html_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3686#issuecomment-883942794","issue_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3686","id":883942794,"node_id":"IC_kwDOFnfHT840r-WK","user":{"login":"boostsecurity-staging-ci[bot]","id":79381923,"node_id":"MDM6Qm90NzkzODE5MjM=","avatar_url":"https://avatars.githubusercontent.com/in/101556?v=4","gravatar_id":"","url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D","html_url":"https://github.com/apps/boostsecurity-staging-ci","followers_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/followers","following_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/repos","events_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/boostsecurity-staging-ci%5Bbot%5D/received_events","type":"Bot","site_admin":false},"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","author_association":"NONE","body":"### :warning:  2 New Security Findings\nThe latest commit contains 2 new security issues.\n\n\n\n\n| **Findings**\n| ------------\n| **GCP GCS Acess Logs Off** <br/> Bucket should log access [ 📘 Learn More](https://docs.boostsecurity.io/rules/gcp-gcs-logs-off.html) https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/blob/45fe656831fffc25cf4ccb5089260d43ae9d18e8/goat.tf#L16-L19\n| **GCP GCS Anon Or Public Access** <br/> Ensure that Cloud Storage bucket is not anonymously or publicly accessible [ 📘 Learn More](https://docs.boostsecurity.io/rules/gcp-gcs-anon-or-public.html) https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/blob/45fe656831fffc25cf4ccb5089260d43ae9d18e8/goat.tf#L20-L24\n\n\n\n\n[Not an issue?](https://docs.boostsecurity.io/faq/index.html#how-can-i-ignore-a-finding) Ignore it by adding a comment on the line with just the word `noboost`.\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":81248900,"login":"boost-e2e-stage-ci-buildkite","gravatar_id":"","url":"https://api.github.com/orgs/boost-e2e-stage-ci-buildkite","avatar_url":"https://avatars.githubusercontent.com/u/81248900?"}}
+{"id":"17244792192","type":"CreateEvent","actor":{"id":61691813,"login":"nik-redhat","display_login":"nik-redhat","gravatar_id":"","url":"https://api.github.com/users/nik-redhat","avatar_url":"https://avatars.githubusercontent.com/u/61691813?"},"repo":{"id":366715532,"name":"nik-redhat/redant","url":"https://api.github.com/repos/nik-redhat/redant"},"payload":{"ref":"test/peer_probe_while_snapd_running","ref_type":"branch","master_branch":"main","description":"A Test Automation Framework for a clustered network filesystem -> GlusterFS","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792202","type":"IssueCommentEvent","actor":{"id":46420768,"login":"JimB40","display_login":"JimB40","gravatar_id":"","url":"https://api.github.com/users/JimB40","avatar_url":"https://avatars.githubusercontent.com/u/46420768?"},"repo":{"id":364871330,"name":"EdgeTX/edgetx","url":"https://api.github.com/repos/EdgeTX/edgetx"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/EdgeTX/edgetx/issues/417","repository_url":"https://api.github.com/repos/EdgeTX/edgetx","labels_url":"https://api.github.com/repos/EdgeTX/edgetx/issues/417/labels{/name}","comments_url":"https://api.github.com/repos/EdgeTX/edgetx/issues/417/comments","events_url":"https://api.github.com/repos/EdgeTX/edgetx/issues/417/events","html_url":"https://github.com/EdgeTX/edgetx/issues/417","id":938800994,"node_id":"MDU6SXNzdWU5Mzg4MDA5OTQ=","number":417,"title":"Warnings can be dismissed by touching anywhere on screen","user":{"login":"jmil-dev","id":55990463,"node_id":"MDQ6VXNlcjU1OTkwNDYz","avatar_url":"https://avatars.githubusercontent.com/u/55990463?v=4","gravatar_id":"","url":"https://api.github.com/users/jmil-dev","html_url":"https://github.com/jmil-dev","followers_url":"https://api.github.com/users/jmil-dev/followers","following_url":"https://api.github.com/users/jmil-dev/following{/other_user}","gists_url":"https://api.github.com/users/jmil-dev/gists{/gist_id}","starred_url":"https://api.github.com/users/jmil-dev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmil-dev/subscriptions","organizations_url":"https://api.github.com/users/jmil-dev/orgs","repos_url":"https://api.github.com/users/jmil-dev/repos","events_url":"https://api.github.com/users/jmil-dev/events{/privacy}","received_events_url":"https://api.github.com/users/jmil-dev/received_events","type":"User","site_admin":false},"labels":[{"id":3051489750,"node_id":"MDU6TGFiZWwzMDUxNDg5NzUw","url":"https://api.github.com/repos/EdgeTX/edgetx/labels/UX-UI","name":"UX-UI","color":"118305","default":false,"description":"Related to user experience (UX) or user interface (UI) behaviour"},{"id":3004269185,"node_id":"MDU6TGFiZWwzMDA0MjY5MTg1","url":"https://api.github.com/repos/EdgeTX/edgetx/labels/color","name":"color","color":"4CE8A1","default":false,"description":"Related generally to color LCD radios"},{"id":2976987157,"node_id":"MDU6TGFiZWwyOTc2OTg3MTU3","url":"https://api.github.com/repos/EdgeTX/edgetx/labels/enhancement","name":"enhancement","color":"a2eeef","default":true,"description":"New feature or request"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":12,"created_at":"2021-07-07T11:41:55Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"If you start the radio and a warning appears (throttle/switch/failsafe) it can be dismissed by tapping the screen anywhere.\r\n\r\nThis seems a little unsafe as the screens are capacitive and respond to a very light touch. \r\n\r\nI think there should be a specific onscreen UI element that needs to be tapped - possibly with \"an are you sure\" confirmation, especially around throttle.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/EdgeTX/edgetx/issues/comments/883942797","html_url":"https://github.com/EdgeTX/edgetx/issues/417#issuecomment-883942797","issue_url":"https://api.github.com/repos/EdgeTX/edgetx/issues/417","id":883942797,"node_id":"IC_kwDOFb9-os40r-WN","user":{"login":"JimB40","id":46420768,"node_id":"MDQ6VXNlcjQ2NDIwNzY4","avatar_url":"https://avatars.githubusercontent.com/u/46420768?v=4","gravatar_id":"","url":"https://api.github.com/users/JimB40","html_url":"https://github.com/JimB40","followers_url":"https://api.github.com/users/JimB40/followers","following_url":"https://api.github.com/users/JimB40/following{/other_user}","gists_url":"https://api.github.com/users/JimB40/gists{/gist_id}","starred_url":"https://api.github.com/users/JimB40/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JimB40/subscriptions","organizations_url":"https://api.github.com/users/JimB40/orgs","repos_url":"https://api.github.com/users/JimB40/repos","events_url":"https://api.github.com/users/JimB40/events{/privacy}","received_events_url":"https://api.github.com/users/JimB40/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","author_association":"NONE","body":"Hey we are Edge :)\r\nModern drones firmware will not allow arming with throttle applied.\r\nI have throttle & switches warn off in my quads.\r\nSo throttle & switch warning may appear if option is selected in model setup but surely no warning that any of these options was set to off","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":83762968,"login":"EdgeTX","gravatar_id":"","url":"https://api.github.com/orgs/EdgeTX","avatar_url":"https://avatars.githubusercontent.com/u/83762968?"}}
+{"id":"17244792205","type":"PushEvent","actor":{"id":21287366,"login":"GNUxeava","display_login":"GNUxeava","gravatar_id":"","url":"https://api.github.com/users/GNUxeava","avatar_url":"https://avatars.githubusercontent.com/u/21287366?"},"repo":{"id":248956791,"name":"GNUxeava/python","url":"https://api.github.com/repos/GNUxeava/python"},"payload":{"push_id":7561706358,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"c35491930ed202203aa06818c524f14dc17292d8","before":"b6a692c5881542173a75f621032e4ac5174229aa","commits":[{"sha":"c35491930ed202203aa06818c524f14dc17292d8","author":{"name":"GNUxeava","email":"1ba3c160d4a42bb32b833178bb72cf0d96605ab6@protonmail.com"},"message":"queue - initial","distinct":true,"url":"https://api.github.com/repos/GNUxeava/python/commits/c35491930ed202203aa06818c524f14dc17292d8"}]},"public":true,"created_at":"2021-07-21T07:00:02Z"}
+{"id":"17244792210","type":"CreateEvent","actor":{"id":13083020,"login":"Matthew-J-Spencer","display_login":"Matthew-J-Spencer","gravatar_id":"","url":"https://api.github.com/users/Matthew-J-Spencer","avatar_url":"https://avatars.githubusercontent.com/u/13083020?"},"repo":{"id":388024730,"name":"tide-foundation/dauth-docs","url":"https://api.github.com/repos/tide-foundation/dauth-docs"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":50648942,"login":"tide-foundation","gravatar_id":"","url":"https://api.github.com/orgs/tide-foundation","avatar_url":"https://avatars.githubusercontent.com/u/50648942?"}}
+{"id":"17244792282","type":"PullRequestReviewCommentEvent","actor":{"id":26194949,"login":"andreievg","display_login":"andreievg","gravatar_id":"","url":"https://api.github.com/users/andreievg","avatar_url":"https://avatars.githubusercontent.com/u/26194949?"},"repo":{"id":370520458,"name":"openmsupply/remote-server","url":"https://api.github.com/repos/openmsupply/remote-server"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/openmsupply/remote-server/pulls/comments/673711137","pull_request_review_id":711317379,"id":673711137,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3MzcxMTEzNw==","diff_hunk":"@@ -40,3 +45,41 @@ impl DatabaseSettings {\n         )\n     }\n }\n+\n+pub enum SettingsError {\n+    Config(ConfigError),\n+    Environment(EnvironmentError),\n+    Path(String),\n+}\n+\n+impl Debug for SettingsError {","path":"src/util/settings.rs","position":20,"original_position":20,"commit_id":"49a384ab75d2e3b639091430a8b1a1e0920a8946","original_commit_id":"49a384ab75d2e3b639091430a8b1a1e0920a8946","user":{"login":"andreievg","id":26194949,"node_id":"MDQ6VXNlcjI2MTk0OTQ5","avatar_url":"https://avatars.githubusercontent.com/u/26194949?v=4","gravatar_id":"","url":"https://api.github.com/users/andreievg","html_url":"https://github.com/andreievg","followers_url":"https://api.github.com/users/andreievg/followers","following_url":"https://api.github.com/users/andreievg/following{/other_user}","gists_url":"https://api.github.com/users/andreievg/gists{/gist_id}","starred_url":"https://api.github.com/users/andreievg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/andreievg/subscriptions","organizations_url":"https://api.github.com/users/andreievg/orgs","repos_url":"https://api.github.com/users/andreievg/repos","events_url":"https://api.github.com/users/andreievg/events{/privacy}","received_events_url":"https://api.github.com/users/andreievg/received_events","type":"User","site_admin":false},"body":"True, forget about that, sorry comment miss-leading. (i thought both implementations are fully equivalent)  ","created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:03Z","html_url":"https://github.com/openmsupply/remote-server/pull/224#discussion_r673711137","pull_request_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/comments/673711137"},"html":{"href":"https://github.com/openmsupply/remote-server/pull/224#discussion_r673711137"},"pull_request":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224"}},"start_line":null,"original_start_line":null,"start_side":null,"line":55,"original_line":55,"side":"RIGHT","in_reply_to_id":673613457},"pull_request":{"url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224","id":693971695,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzOTcxNjk1","html_url":"https://github.com/openmsupply/remote-server/pull/224","diff_url":"https://github.com/openmsupply/remote-server/pull/224.diff","patch_url":"https://github.com/openmsupply/remote-server/pull/224.patch","issue_url":"https://api.github.com/repos/openmsupply/remote-server/issues/224","number":224,"state":"open","locked":false,"title":"Configuration improvements (improvements)","user":{"login":"wlthomson","id":43223637,"node_id":"MDQ6VXNlcjQzMjIzNjM3","avatar_url":"https://avatars.githubusercontent.com/u/43223637?v=4","gravatar_id":"","url":"https://api.github.com/users/wlthomson","html_url":"https://github.com/wlthomson","followers_url":"https://api.github.com/users/wlthomson/followers","following_url":"https://api.github.com/users/wlthomson/following{/other_user}","gists_url":"https://api.github.com/users/wlthomson/gists{/gist_id}","starred_url":"https://api.github.com/users/wlthomson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wlthomson/subscriptions","organizations_url":"https://api.github.com/users/wlthomson/orgs","repos_url":"https://api.github.com/users/wlthomson/repos","events_url":"https://api.github.com/users/wlthomson/events{/privacy}","received_events_url":"https://api.github.com/users/wlthomson/received_events","type":"User","site_admin":false},"body":"Some more improvements to build on #222.\r\n\r\nE.g. of what the resulting output looks like:\r\n\r\n```\r\nthread 'main' panicked at 'Failed to parse configuration settings: configuration file \"/mnt/c/Users/will-desktop/Desktop/dev/repos/configuration-improvements-improvements/configuratio/base\" not found'\r\n```","created_at":"2021-07-21T01:18:14Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"2b3ca1b03bedfa00cf19823ed26e0ca696299d6d","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/commits","review_comments_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/comments","review_comment_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openmsupply/remote-server/issues/224/comments","statuses_url":"https://api.github.com/repos/openmsupply/remote-server/statuses/49a384ab75d2e3b639091430a8b1a1e0920a8946","head":{"label":"openmsupply:configuration-improvements-improvements","ref":"configuration-improvements-improvements","sha":"49a384ab75d2e3b639091430a8b1a1e0920a8946","user":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"repo":{"id":370520458,"node_id":"MDEwOlJlcG9zaXRvcnkzNzA1MjA0NTg=","name":"remote-server","full_name":"openmsupply/remote-server","private":false,"owner":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/openmsupply/remote-server","description":"mSupply Remote Server is an offline-first implementation of mSupply health supply chain management software. It requires an mSupply central server.","fork":false,"url":"https://api.github.com/repos/openmsupply/remote-server","forks_url":"https://api.github.com/repos/openmsupply/remote-server/forks","keys_url":"https://api.github.com/repos/openmsupply/remote-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openmsupply/remote-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openmsupply/remote-server/teams","hooks_url":"https://api.github.com/repos/openmsupply/remote-server/hooks","issue_events_url":"https://api.github.com/repos/openmsupply/remote-server/issues/events{/number}","events_url":"https://api.github.com/repos/openmsupply/remote-server/events","assignees_url":"https://api.github.com/repos/openmsupply/remote-server/assignees{/user}","branches_url":"https://api.github.com/repos/openmsupply/remote-server/branches{/branch}","tags_url":"https://api.github.com/repos/openmsupply/remote-server/tags","blobs_url":"https://api.github.com/repos/openmsupply/remote-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openmsupply/remote-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openmsupply/remote-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/openmsupply/remote-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openmsupply/remote-server/statuses/{sha}","languages_url":"https://api.github.com/repos/openmsupply/remote-server/languages","stargazers_url":"https://api.github.com/repos/openmsupply/remote-server/stargazers","contributors_url":"https://api.github.com/repos/openmsupply/remote-server/contributors","subscribers_url":"https://api.github.com/repos/openmsupply/remote-server/subscribers","subscription_url":"https://api.github.com/repos/openmsupply/remote-server/subscription","commits_url":"https://api.github.com/repos/openmsupply/remote-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/openmsupply/remote-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/openmsupply/remote-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/openmsupply/remote-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/openmsupply/remote-server/contents/{+path}","compare_url":"https://api.github.com/repos/openmsupply/remote-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openmsupply/remote-server/merges","archive_url":"https://api.github.com/repos/openmsupply/remote-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openmsupply/remote-server/downloads","issues_url":"https://api.github.com/repos/openmsupply/remote-server/issues{/number}","pulls_url":"https://api.github.com/repos/openmsupply/remote-server/pulls{/number}","milestones_url":"https://api.github.com/repos/openmsupply/remote-server/milestones{/number}","notifications_url":"https://api.github.com/repos/openmsupply/remote-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openmsupply/remote-server/labels{/name}","releases_url":"https://api.github.com/repos/openmsupply/remote-server/releases{/id}","deployments_url":"https://api.github.com/repos/openmsupply/remote-server/deployments","created_at":"2021-05-25T00:34:00Z","updated_at":"2021-07-21T05:50:00Z","pushed_at":"2021-07-21T05:50:45Z","git_url":"git://github.com/openmsupply/remote-server.git","ssh_url":"git@github.com:openmsupply/remote-server.git","clone_url":"https://github.com/openmsupply/remote-server.git","svn_url":"https://github.com/openmsupply/remote-server","homepage":"","size":648,"stargazers_count":0,"watchers_count":0,"language":"Rust","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":25,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":25,"watchers":0,"default_branch":"master"}},"base":{"label":"openmsupply:configuration-improvements","ref":"configuration-improvements","sha":"fc5324d1cd71652e5db558cd60b330d2f5c5661f","user":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"repo":{"id":370520458,"node_id":"MDEwOlJlcG9zaXRvcnkzNzA1MjA0NTg=","name":"remote-server","full_name":"openmsupply/remote-server","private":false,"owner":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/openmsupply/remote-server","description":"mSupply Remote Server is an offline-first implementation of mSupply health supply chain management software. It requires an mSupply central server.","fork":false,"url":"https://api.github.com/repos/openmsupply/remote-server","forks_url":"https://api.github.com/repos/openmsupply/remote-server/forks","keys_url":"https://api.github.com/repos/openmsupply/remote-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openmsupply/remote-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openmsupply/remote-server/teams","hooks_url":"https://api.github.com/repos/openmsupply/remote-server/hooks","issue_events_url":"https://api.github.com/repos/openmsupply/remote-server/issues/events{/number}","events_url":"https://api.github.com/repos/openmsupply/remote-server/events","assignees_url":"https://api.github.com/repos/openmsupply/remote-server/assignees{/user}","branches_url":"https://api.github.com/repos/openmsupply/remote-server/branches{/branch}","tags_url":"https://api.github.com/repos/openmsupply/remote-server/tags","blobs_url":"https://api.github.com/repos/openmsupply/remote-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openmsupply/remote-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openmsupply/remote-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/openmsupply/remote-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openmsupply/remote-server/statuses/{sha}","languages_url":"https://api.github.com/repos/openmsupply/remote-server/languages","stargazers_url":"https://api.github.com/repos/openmsupply/remote-server/stargazers","contributors_url":"https://api.github.com/repos/openmsupply/remote-server/contributors","subscribers_url":"https://api.github.com/repos/openmsupply/remote-server/subscribers","subscription_url":"https://api.github.com/repos/openmsupply/remote-server/subscription","commits_url":"https://api.github.com/repos/openmsupply/remote-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/openmsupply/remote-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/openmsupply/remote-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/openmsupply/remote-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/openmsupply/remote-server/contents/{+path}","compare_url":"https://api.github.com/repos/openmsupply/remote-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openmsupply/remote-server/merges","archive_url":"https://api.github.com/repos/openmsupply/remote-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openmsupply/remote-server/downloads","issues_url":"https://api.github.com/repos/openmsupply/remote-server/issues{/number}","pulls_url":"https://api.github.com/repos/openmsupply/remote-server/pulls{/number}","milestones_url":"https://api.github.com/repos/openmsupply/remote-server/milestones{/number}","notifications_url":"https://api.github.com/repos/openmsupply/remote-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openmsupply/remote-server/labels{/name}","releases_url":"https://api.github.com/repos/openmsupply/remote-server/releases{/id}","deployments_url":"https://api.github.com/repos/openmsupply/remote-server/deployments","created_at":"2021-05-25T00:34:00Z","updated_at":"2021-07-21T05:50:00Z","pushed_at":"2021-07-21T05:50:45Z","git_url":"git://github.com/openmsupply/remote-server.git","ssh_url":"git@github.com:openmsupply/remote-server.git","clone_url":"https://github.com/openmsupply/remote-server.git","svn_url":"https://github.com/openmsupply/remote-server","homepage":"","size":648,"stargazers_count":0,"watchers_count":0,"language":"Rust","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":25,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":25,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224"},"html":{"href":"https://github.com/openmsupply/remote-server/pull/224"},"issue":{"href":"https://api.github.com/repos/openmsupply/remote-server/issues/224"},"comments":{"href":"https://api.github.com/repos/openmsupply/remote-server/issues/224/comments"},"review_comments":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/comments"},"review_comment":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/commits"},"statuses":{"href":"https://api.github.com/repos/openmsupply/remote-server/statuses/49a384ab75d2e3b639091430a8b1a1e0920a8946"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:02Z","org":{"id":45471207,"login":"openmsupply","gravatar_id":"","url":"https://api.github.com/orgs/openmsupply","avatar_url":"https://avatars.githubusercontent.com/u/45471207?"}}
+{"id":"17244792217","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561706360,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"35c01d8b8650950a99a1ab9a206bee0acdb37323","before":"e53953c107fe3bf568e838241907ff708661d957","commits":[{"sha":"35c01d8b8650950a99a1ab9a206bee0acdb37323","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/35c01d8b8650950a99a1ab9a206bee0acdb37323"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792218","type":"IssuesEvent","actor":{"id":22133785,"login":"SheepTester","display_login":"SheepTester","gravatar_id":"","url":"https://api.github.com/users/SheepTester","avatar_url":"https://avatars.githubusercontent.com/u/22133785?"},"repo":{"id":264790929,"name":"SheepTester/htmlifier","url":"https://api.github.com/repos/SheepTester/htmlifier"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/SheepTester/htmlifier/issues/102","repository_url":"https://api.github.com/repos/SheepTester/htmlifier","labels_url":"https://api.github.com/repos/SheepTester/htmlifier/issues/102/labels{/name}","comments_url":"https://api.github.com/repos/SheepTester/htmlifier/issues/102/comments","events_url":"https://api.github.com/repos/SheepTester/htmlifier/issues/102/events","html_url":"https://github.com/SheepTester/htmlifier/issues/102","id":949391974,"node_id":"MDU6SXNzdWU5NDkzOTE5NzQ=","number":102,"title":"Multiple pointers","user":{"login":"SheepTester","id":22133785,"node_id":"MDQ6VXNlcjIyMTMzNzg1","avatar_url":"https://avatars.githubusercontent.com/u/22133785?v=4","gravatar_id":"","url":"https://api.github.com/users/SheepTester","html_url":"https://github.com/SheepTester","followers_url":"https://api.github.com/users/SheepTester/followers","following_url":"https://api.github.com/users/SheepTester/following{/other_user}","gists_url":"https://api.github.com/users/SheepTester/gists{/gist_id}","starred_url":"https://api.github.com/users/SheepTester/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SheepTester/subscriptions","organizations_url":"https://api.github.com/users/SheepTester/orgs","repos_url":"https://api.github.com/users/SheepTester/repos","events_url":"https://api.github.com/users/SheepTester/events{/privacy}","received_events_url":"https://api.github.com/users/SheepTester/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"OWNER","active_lock_reason":null,"body":"Ref: https://discord.com/channels/@me/818068592708550696/867079855106555915 (but this wasn't the first time this was asked)\r\n\r\nI've been enlightened and inspired by a recent exchange with an intellectual over email with a project regarding keys and on-screen keyboards. Although on-screen keyboards can't reliably detect for how long keys are held down, they should still be able to work by triggering the hat blocks. This is done by repeatedly sending the isDown: true thing to the VM\r\n\r\nPerhaps something similar can be done with the \"when this sprite clicked\" block. Thus, this issue is multi-part:\r\n\r\n1. Investigate whether postIOData-ing isDown: true for mouse multiple times can trigger the \"when this sprite clicked\" hat block multiple times.\r\n  - Hopefully it does. Maybe some finicking might be required (eg if it requires a mouseup before the next mousedown)\r\n  - If this is not possible, close this issue.\r\n2. Implement.\r\n  - An option to support multiple fingers\r\n  - Every pointerdown should cause a isDown: true at the new pointer's location\r\n  - <mouse down?> should return whether *at least* one pointer is down. Should check what the existing behaviour is\r\n  - (mouse x) and (mouse y) can do whatever\r\n\r\nAlso, might consider adding an option to support on-screen keyboards?\r\n\r\nI'm writing this late at night; hopefully when I see this later I don't get confused","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792221","type":"CreateEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388024725,"name":"thatjohn01/781116602","url":"https://api.github.com/repos/thatjohn01/781116602"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":"瞬间人生--一个聪明的傻子的故事_PDF下载_徐光炜","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792224","type":"IssueCommentEvent","actor":{"id":57662928,"login":"LeonidVas","display_login":"LeonidVas","gravatar_id":"","url":"https://api.github.com/users/LeonidVas","avatar_url":"https://avatars.githubusercontent.com/u/57662928?"},"repo":{"id":68709874,"name":"knazarov/mkrepo","url":"https://api.github.com/repos/knazarov/mkrepo"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/knazarov/mkrepo/issues/30","repository_url":"https://api.github.com/repos/knazarov/mkrepo","labels_url":"https://api.github.com/repos/knazarov/mkrepo/issues/30/labels{/name}","comments_url":"https://api.github.com/repos/knazarov/mkrepo/issues/30/comments","events_url":"https://api.github.com/repos/knazarov/mkrepo/issues/30/events","html_url":"https://github.com/knazarov/mkrepo/issues/30","id":947746645,"node_id":"MDU6SXNzdWU5NDc3NDY2NDU=","number":30,"title":"Add an ability to specify \"suite\" and \"version\" for the Release file","user":{"login":"LeonidVas","id":57662928,"node_id":"MDQ6VXNlcjU3NjYyOTI4","avatar_url":"https://avatars.githubusercontent.com/u/57662928?v=4","gravatar_id":"","url":"https://api.github.com/users/LeonidVas","html_url":"https://github.com/LeonidVas","followers_url":"https://api.github.com/users/LeonidVas/followers","following_url":"https://api.github.com/users/LeonidVas/following{/other_user}","gists_url":"https://api.github.com/users/LeonidVas/gists{/gist_id}","starred_url":"https://api.github.com/users/LeonidVas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LeonidVas/subscriptions","organizations_url":"https://api.github.com/users/LeonidVas/orgs","repos_url":"https://api.github.com/users/LeonidVas/repos","events_url":"https://api.github.com/users/LeonidVas/events{/privacy}","received_events_url":"https://api.github.com/users/LeonidVas/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-19T15:02:54Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"author_association":"COLLABORATOR","active_lock_reason":null,"body":"It would be nice to add the ability to specify \"[suite](https://wiki.debian.org/DebianRepository/Format#Suite)\" and \"[version](https://wiki.debian.org/DebianRepository/Format#Version)\" fields for the Release file via environment variables.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/knazarov/mkrepo/issues/comments/883942798","html_url":"https://github.com/knazarov/mkrepo/issues/30#issuecomment-883942798","issue_url":"https://api.github.com/repos/knazarov/mkrepo/issues/30","id":883942798,"node_id":"IC_kwDOBBht8s40r-WO","user":{"login":"LeonidVas","id":57662928,"node_id":"MDQ6VXNlcjU3NjYyOTI4","avatar_url":"https://avatars.githubusercontent.com/u/57662928?v=4","gravatar_id":"","url":"https://api.github.com/users/LeonidVas","html_url":"https://github.com/LeonidVas","followers_url":"https://api.github.com/users/LeonidVas/followers","following_url":"https://api.github.com/users/LeonidVas/following{/other_user}","gists_url":"https://api.github.com/users/LeonidVas/gists{/gist_id}","starred_url":"https://api.github.com/users/LeonidVas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LeonidVas/subscriptions","organizations_url":"https://api.github.com/users/LeonidVas/orgs","repos_url":"https://api.github.com/users/LeonidVas/repos","events_url":"https://api.github.com/users/LeonidVas/events{/privacy}","received_events_url":"https://api.github.com/users/LeonidVas/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:02Z","updated_at":"2021-07-21T07:00:02Z","author_association":"COLLABORATOR","body":"It won't solve any problem)\r\nBut my motivation was the following:\r\n* these fields are included to the list of fields that \"[have a well defined meaning](https://wiki.debian.org/DebianRepository/Format#A.22Release.22_files)\" \r\n* one of the arguments of `Release` class constructor is `suite`, but it is not uses now (looks like dead code)\r\n*  the `suite` field was used in the tarantool repositories","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792230","type":"PushEvent","actor":{"id":1170025,"login":"0xln","display_login":"0xln","gravatar_id":"","url":"https://api.github.com/users/0xln","avatar_url":"https://avatars.githubusercontent.com/u/1170025?"},"repo":{"id":258129694,"name":"0xln/Blog","url":"https://api.github.com/repos/0xln/Blog"},"payload":{"push_id":7561706371,"size":60,"distinct_size":60,"ref":"refs/heads/master","head":"f1d233251256af2a4a456ee88a0bbda18c51e9f6","before":"3fc07833423ccab5e9b4bc3f77c33c6409d04dcf","commits":[{"sha":"ca8844b9e8226a7926c4166e477c757273140cb1","author":{"name":"Daniel","email":"9a831c4df64657a4c34f91b2df20aa333d52fb98@gmail.com"},"message":"Implement a git pre-commit hook for gulp\n\n- Not working as intended.\n- Will fire every time there is an asset change (staged or non-staged).\n- Can't know if asset was optimized already.\n- No way to parse STDIN in git hooks.\n- Can't ask if the user wants to continue or abort commit.\n- More a nuissance than something useful.","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/ca8844b9e8226a7926c4166e477c757273140cb1"},{"sha":"5ec0a96ac19e4ca9829530a85e2430969c1f6e51","author":{"name":"Daniel","email":"9a831c4df64657a4c34f91b2df20aa333d52fb98@gmail.com"},"message":"Rewrite and disable gulp env checker\n\nAs gulp is not being invoked in the hook, it is ancillary.","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/5ec0a96ac19e4ca9829530a85e2430969c1f6e51"},{"sha":"23865bd551c86a73f65b7e7f2b87a3e1b4ab6933","author":{"name":"Daniel","email":"9a831c4df64657a4c34f91b2df20aa333d52fb98@gmail.com"},"message":"Rewrite non-staged assets checker\n\nWill abort if there are any.","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/23865bd551c86a73f65b7e7f2b87a3e1b4ab6933"},{"sha":"cec13feec2c19a18034ce2c06deaf30969fe9454","author":{"name":"Daniel","email":"9a831c4df64657a4c34f91b2df20aa333d52fb98@gmail.com"},"message":"Update documentation\n\nChanges:\n- Move hooks section to another README inside hooks dir.\n- Write instructions for bypassing.\n\nNew use case for pre-commit hook.\n- Before: auto-optimize assets pre-commit (not feasible)\n- After: check if there are non-staged assets, if so abort","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/cec13feec2c19a18034ce2c06deaf30969fe9454"},{"sha":"e12f4f5508c3a9d21b97d2e752dcbea515b4bf4b","author":{"name":"sylhare","email":"4a05f09746a35a1cf3a3b5859001cf244d696663@outlook.com"},"message":"Fix shadow and border","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/e12f4f5508c3a9d21b97d2e752dcbea515b4bf4b"},{"sha":"0b008f73402c0cb64b33173bbe329521abd9def0","author":{"name":"sylhare","email":"4a05f09746a35a1cf3a3b5859001cf244d696663@outlook.com"},"message":"Fix post borders","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/0b008f73402c0cb64b33173bbe329521abd9def0"},{"sha":"9bddee18000da04ec9cf8c21acd21fb3ff0a7aa8","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Sort alphabetically","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/9bddee18000da04ec9cf8c21acd21fb3ff0a7aa8"},{"sha":"610df9b1bf26f6cc7a13fb698e85aaa5bf4284b1","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Add Mastodon, Matrix and Telegram","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/610df9b1bf26f6cc7a13fb698e85aaa5bf4284b1"},{"sha":"ab14020f31da3fda8d4c652485b311597a46e8fb","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Use rel=\"me\" for identity consolidation\n\nAdopt XFN specification\nhttps://gmpg.org/xfn/and/#idconsolidation","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/ab14020f31da3fda8d4c652485b311597a46e8fb"},{"sha":"79c6f3367b24138bb8416809c06cf2cb6d817863","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Merge remote-tracking branch 'upstream/master' into social++","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/79c6f3367b24138bb8416809c06cf2cb6d817863"},{"sha":"e624a8db4133ee8da852f3ec63ecf601b927da1d","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Refactored icons\n\nIt will break configuration.","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/e624a8db4133ee8da852f3ec63ecf601b927da1d"},{"sha":"a6786fcbaef27d34bc2f326331c896dec7adabc3","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Include HackerNews","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/a6786fcbaef27d34bc2f326331c896dec7adabc3"},{"sha":"3ec2eeb9ea37366be82c42127a2e7a6b2f349abf","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Add a bunch of icons","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/3ec2eeb9ea37366be82c42127a2e7a6b2f349abf"},{"sha":"8fb0a1114deae955c518eda993d202b146d0448b","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Move social icons config to _config.yml","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/8fb0a1114deae955c518eda993d202b146d0448b"},{"sha":"07351e38afc09f85ac057ad39d9c046a0afb6164","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Remove deprecated field","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/07351e38afc09f85ac057ad39d9c046a0afb6164"},{"sha":"99e4b295d4ef7605051c14c1a480c11eab8ad3f8","author":{"name":"Daniel Souza","email":"cbaba2936ec94f338df1b8cb56e7afa32611150f@gmail.com"},"message":"Remove empty keys from icons.yml","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/99e4b295d4ef7605051c14c1a480c11eab8ad3f8"},{"sha":"3492998d03f6fc5a41efea7ac1ab6b99a25e14b7","author":{"name":"Hex","email":"51861e947a4430cfac8fc7d0fd8f67891a409f7d@gmail.com"},"message":"added utterances code","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/3492998d03f6fc5a41efea7ac1ab6b99a25e14b7"},{"sha":"cab7706e3a150466032fe4aeec05b1b1d0313051","author":{"name":"Hex","email":"51861e947a4430cfac8fc7d0fd8f67891a409f7d@gmail.com"},"message":"utterances and more changes","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/cab7706e3a150466032fe4aeec05b1b1d0313051"},{"sha":"31a8d2f503e2b984a7ac3171642ed71313518a00","author":{"name":"Hex","email":"51861e947a4430cfac8fc7d0fd8f67891a409f7d@gmail.com"},"message":"utterances and more","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/31a8d2f503e2b984a7ac3171642ed71313518a00"},{"sha":"227693bd07e67570776cf325a86e744cf7e62b2f","author":{"name":"LG","email":"5893d215c38efeb43002898c99f00c12d2fa864e@users.noreply.github.com"},"message":"Update _config.yml","distinct":true,"url":"https://api.github.com/repos/0xln/Blog/commits/227693bd07e67570776cf325a86e744cf7e62b2f"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792231","type":"PushEvent","actor":{"id":18002923,"login":"NickMitrokhin","display_login":"NickMitrokhin","gravatar_id":"","url":"https://api.github.com/users/NickMitrokhin","avatar_url":"https://avatars.githubusercontent.com/u/18002923?"},"repo":{"id":195004922,"name":"NickMitrokhin/DevExtreme","url":"https://api.github.com/repos/NickMitrokhin/DevExtreme"},"payload":{"push_id":7561706367,"size":8,"distinct_size":8,"ref":"refs/heads/20_2","head":"fb0a610c796c95d565827b41d49cb50572546ff5","before":"d018af2dd8b1561b79839742cff4b68df35f798f","commits":[{"sha":"f36d29b88af90f95baca1965715630368a4cca39","author":{"name":"Roman Semenov","email":"84c51f19620479f033e23f12095b1ace11570037@devexpress.com"},"message":"DataGrid - displays two loading indicators if the widget contains fixed columns (T1011801) (#18268)\n\n* fix\r\n\r\n(cherry picked from commit b54aa53900164b9af6fc33f381a0c720f8b4cada)\r\n\r\n* fix review\r\n\r\n(cherry picked from commit 8a6ddc286ea577906160fa41e2c6b375f32e923f)\r\n(cherry picked from commit 270e7f76e2871f42187f7b0b9ec61f4103d2c3b2)\r\n\r\n* add tests after review\r\n\r\n(cherry picked from commit bd04e833667051a88ba3c147a688e5d6c2efb1e8)\r\n(cherry picked from commit 66fb5375a35ebe9c78ba68e3ddbf89819996ded3)\r\n\r\n* remove debug","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/f36d29b88af90f95baca1965715630368a4cca39"},{"sha":"8b6498401c5e5c7abae583c008fa872c1e5b54b5","author":{"name":"Ignatov Dan","email":"0fd226043cd3fd2c5e0de7ea20bbc39fc86b9830@gmail.com"},"message":"Form - Move \"layoutManager._renderLabel\" to \"form.utils.js\" (#18312) (#18332)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/8b6498401c5e5c7abae583c008fa872c1e5b54b5"},{"sha":"02be756c5d1a6bf7e3d49f60b3e6efd7db7bb803","author":{"name":"Denis Gradoboev","email":"87c731d9a37e1881588da53fa52a8216d79eaac1@yandex.com"},"message":"dxScheduler - Fix blinking test (#17949) (#18352)\n\n(cherry picked from commit 2ad7302fcd4a86176de32288ad26bd5f1d75b816)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/02be756c5d1a6bf7e3d49f60b3e6efd7db7bb803"},{"sha":"31c0f03af189754942f4711abc529f1e24b9a50f","author":{"name":"VictorSavushkin","email":"69c2a72a78f84ca06064830f5e81a125eac53766@users.noreply.github.com"},"message":"Diagram - Nested-containers issues, T1005859 (#18354)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/31c0f03af189754942f4711abc529f1e24b9a50f"},{"sha":"ca798cecaec1b0b09c47f2384c79c9963bc356de","author":{"name":"Nick Mitrokhin","email":"f4ca497b1504a889c3f8703aa018117c001cf8ba@users.noreply.github.com"},"message":"datagrid: fix horizontal gap between header and content when the master detail is expanded (T1004507) (#18328) (#18330)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/ca798cecaec1b0b09c47f2384c79c9963bc356de"},{"sha":"0150f9a647cd912b1f408eca33d375534d6ed331","author":{"name":"Sergey Novikov","email":"d780c892552784cdfe42a463f8f5aa4a13ac14e6@users.noreply.github.com"},"message":"Bugfix T1014291 (#18365)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/0150f9a647cd912b1f408eca33d375534d6ed331"},{"sha":"01e1eeab5babe8cdee0fced32a3b7bca6fbc49a6","author":{"name":"Evgeniy.Zaborshchikov","email":"6a38ea8f42f0fa9e94b8bc2adc2c88891ce5060a@users.noreply.github.com"},"message":"LDML Date Parser: getRegExpInfo should return correct regular expression for unambiguous not separated `formats` and throw warning message in another case. (T1008667) (#18117) (#18364)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/01e1eeab5babe8cdee0fced32a3b7bca6fbc49a6"},{"sha":"fb0a610c796c95d565827b41d49cb50572546ff5","author":{"name":"Evgeniy.Zaborshchikov","email":"6a38ea8f42f0fa9e94b8bc2adc2c88891ce5060a@users.noreply.github.com"},"message":"Attach CSS device classes if viewport already exist (T1010826) (#18368) (#18379)","distinct":true,"url":"https://api.github.com/repos/NickMitrokhin/DevExtreme/commits/fb0a610c796c95d565827b41d49cb50572546ff5"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792236","type":"PushEvent","actor":{"id":85949713,"login":"BolliAkshitha","display_login":"BolliAkshitha","gravatar_id":"","url":"https://api.github.com/users/BolliAkshitha","avatar_url":"https://avatars.githubusercontent.com/u/85949713?"},"repo":{"id":387741243,"name":"BolliAkshitha/-pps-programs","url":"https://api.github.com/repos/BolliAkshitha/-pps-programs"},"payload":{"push_id":7561706366,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"a5e53b6d9b2eb50870c5c658881e2b321fabb306","before":"eae30e2f2f1628d87314d90426cff4c2227fcf18","commits":[{"sha":"a5e53b6d9b2eb50870c5c658881e2b321fabb306","author":{"name":"BolliAkshitha","email":"11a15edc12b5187612cb7e76e328723098c5aa6d@users.noreply.github.com"},"message":"Add files via upload","distinct":true,"url":"https://api.github.com/repos/BolliAkshitha/-pps-programs/commits/a5e53b6d9b2eb50870c5c658881e2b321fabb306"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792248","type":"PushEvent","actor":{"id":86811115,"login":"bamba280","display_login":"bamba280","gravatar_id":"","url":"https://api.github.com/users/bamba280","avatar_url":"https://avatars.githubusercontent.com/u/86811115?"},"repo":{"id":383036127,"name":"bamba280/personal","url":"https://api.github.com/repos/bamba280/personal"},"payload":{"push_id":7561706378,"size":1,"distinct_size":1,"ref":"refs/heads/itakura","head":"771b965ba4dd636cd551e9ad0ac625293798feff","before":"b5ddca06dc6b03dcae4ea47236af53f1f1a2a145","commits":[{"sha":"771b965ba4dd636cd551e9ad0ac625293798feff","author":{"name":"itakura","email":"672d5521ad75418c07cfc6811eed4acf9c9cc4ed@test.com"},"message":"15:58暫定詳細基本設計","distinct":true,"url":"https://api.github.com/repos/bamba280/personal/commits/771b965ba4dd636cd551e9ad0ac625293798feff"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792250","type":"WatchEvent","actor":{"id":74425534,"login":"sjoveska","display_login":"sjoveska","gravatar_id":"","url":"https://api.github.com/users/sjoveska","avatar_url":"https://avatars.githubusercontent.com/u/74425534?"},"repo":{"id":374119728,"name":"gabrieldim/Shopping-Cart-And-Products-Layout","url":"https://api.github.com/repos/gabrieldim/Shopping-Cart-And-Products-Layout"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792253","type":"PushEvent","actor":{"id":22544249,"login":"c-mertes","display_login":"c-mertes","gravatar_id":"","url":"https://api.github.com/users/c-mertes","avatar_url":"https://avatars.githubusercontent.com/u/22544249?"},"repo":{"id":213693892,"name":"gagneurlab/drop","url":"https://api.github.com/repos/gagneurlab/drop"},"payload":{"push_id":7561706387,"size":1,"distinct_size":1,"ref":"refs/heads/dev","head":"572beb4e979bd3c87022ec971d9e23e44c5096fe","before":"cd98bcd687772f603ada82cfdb06b082ce269aba","commits":[{"sha":"572beb4e979bd3c87022ec971d9e23e44c5096fe","author":{"name":"Christian Mertes","email":"0d9545ff4dc5b65d4f01bf587f8b55debe71de03@in.tum.de"},"message":"Update tests/pipeline/test_MAE.py","distinct":true,"url":"https://api.github.com/repos/gagneurlab/drop/commits/572beb4e979bd3c87022ec971d9e23e44c5096fe"}]},"public":true,"created_at":"2021-07-21T07:00:03Z","org":{"id":29893284,"login":"gagneurlab","gravatar_id":"","url":"https://api.github.com/orgs/gagneurlab","avatar_url":"https://avatars.githubusercontent.com/u/29893284?"}}
+{"id":"17244792257","type":"PushEvent","actor":{"id":10744793,"login":"alisonthemonster","display_login":"alisonthemonster","gravatar_id":"","url":"https://api.github.com/users/alisonthemonster","avatar_url":"https://avatars.githubusercontent.com/u/10744793?"},"repo":{"id":162841152,"name":"alisonthemonster/Presently","url":"https://api.github.com/repos/alisonthemonster/Presently"},"payload":{"push_id":7561706379,"size":1,"distinct_size":1,"ref":"refs/heads/logging","head":"97eae360f686236c044250ed843e963245802083","before":"bf0249e4d273ca317b63f1bb7490a2eff217a031","commits":[{"sha":"97eae360f686236c044250ed843e963245802083","author":{"name":"alisonthemonster","email":"21daf519ef5309dff350061433670e592b28dc2a@gmail.com"},"message":"Fix issues with test themes","distinct":true,"url":"https://api.github.com/repos/alisonthemonster/Presently/commits/97eae360f686236c044250ed843e963245802083"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792264","type":"PushEvent","actor":{"id":46604893,"login":"rohankalbag","display_login":"rohankalbag","gravatar_id":"","url":"https://api.github.com/users/rohankalbag","avatar_url":"https://avatars.githubusercontent.com/u/46604893?"},"repo":{"id":383245102,"name":"rohankalbag/20d170033_IntroToAppDev","url":"https://api.github.com/repos/rohankalbag/20d170033_IntroToAppDev"},"payload":{"push_id":7561706384,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"0e17714b040753438f6b8e6e41731d68a4671d33","before":"5db7cd2e4b02612c2b074747c10f1e580a1eb133","commits":[{"sha":"0e17714b040753438f6b8e6e41731d68a4671d33","author":{"name":"Rohan Rajesh Kalbag","email":"0f0320094c4077ce81e56a721bfdb2bbce8d0b50@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/rohankalbag/20d170033_IntroToAppDev/commits/0e17714b040753438f6b8e6e41731d68a4671d33"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792274","type":"PullRequestReviewEvent","actor":{"id":26194949,"login":"andreievg","display_login":"andreievg","gravatar_id":"","url":"https://api.github.com/users/andreievg","avatar_url":"https://avatars.githubusercontent.com/u/26194949?"},"repo":{"id":370520458,"name":"openmsupply/remote-server","url":"https://api.github.com/repos/openmsupply/remote-server"},"payload":{"action":"created","review":{"id":711317379,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3Mzc5","user":{"login":"andreievg","id":26194949,"node_id":"MDQ6VXNlcjI2MTk0OTQ5","avatar_url":"https://avatars.githubusercontent.com/u/26194949?v=4","gravatar_id":"","url":"https://api.github.com/users/andreievg","html_url":"https://github.com/andreievg","followers_url":"https://api.github.com/users/andreievg/followers","following_url":"https://api.github.com/users/andreievg/following{/other_user}","gists_url":"https://api.github.com/users/andreievg/gists{/gist_id}","starred_url":"https://api.github.com/users/andreievg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/andreievg/subscriptions","organizations_url":"https://api.github.com/users/andreievg/orgs","repos_url":"https://api.github.com/users/andreievg/repos","events_url":"https://api.github.com/users/andreievg/events{/privacy}","received_events_url":"https://api.github.com/users/andreievg/received_events","type":"User","site_admin":false},"body":null,"commit_id":"49a384ab75d2e3b639091430a8b1a1e0920a8946","submitted_at":"2021-07-21T07:00:02Z","state":"commented","html_url":"https://github.com/openmsupply/remote-server/pull/224#pullrequestreview-711317379","pull_request_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224","author_association":"NONE","_links":{"html":{"href":"https://github.com/openmsupply/remote-server/pull/224#pullrequestreview-711317379"},"pull_request":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224"}}},"pull_request":{"url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224","id":693971695,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzOTcxNjk1","html_url":"https://github.com/openmsupply/remote-server/pull/224","diff_url":"https://github.com/openmsupply/remote-server/pull/224.diff","patch_url":"https://github.com/openmsupply/remote-server/pull/224.patch","issue_url":"https://api.github.com/repos/openmsupply/remote-server/issues/224","number":224,"state":"open","locked":false,"title":"Configuration improvements (improvements)","user":{"login":"wlthomson","id":43223637,"node_id":"MDQ6VXNlcjQzMjIzNjM3","avatar_url":"https://avatars.githubusercontent.com/u/43223637?v=4","gravatar_id":"","url":"https://api.github.com/users/wlthomson","html_url":"https://github.com/wlthomson","followers_url":"https://api.github.com/users/wlthomson/followers","following_url":"https://api.github.com/users/wlthomson/following{/other_user}","gists_url":"https://api.github.com/users/wlthomson/gists{/gist_id}","starred_url":"https://api.github.com/users/wlthomson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wlthomson/subscriptions","organizations_url":"https://api.github.com/users/wlthomson/orgs","repos_url":"https://api.github.com/users/wlthomson/repos","events_url":"https://api.github.com/users/wlthomson/events{/privacy}","received_events_url":"https://api.github.com/users/wlthomson/received_events","type":"User","site_admin":false},"body":"Some more improvements to build on #222.\r\n\r\nE.g. of what the resulting output looks like:\r\n\r\n```\r\nthread 'main' panicked at 'Failed to parse configuration settings: configuration file \"/mnt/c/Users/will-desktop/Desktop/dev/repos/configuration-improvements-improvements/configuratio/base\" not found'\r\n```","created_at":"2021-07-21T01:18:14Z","updated_at":"2021-07-21T07:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"2b3ca1b03bedfa00cf19823ed26e0ca696299d6d","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/commits","review_comments_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/comments","review_comment_url":"https://api.github.com/repos/openmsupply/remote-server/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openmsupply/remote-server/issues/224/comments","statuses_url":"https://api.github.com/repos/openmsupply/remote-server/statuses/49a384ab75d2e3b639091430a8b1a1e0920a8946","head":{"label":"openmsupply:configuration-improvements-improvements","ref":"configuration-improvements-improvements","sha":"49a384ab75d2e3b639091430a8b1a1e0920a8946","user":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"repo":{"id":370520458,"node_id":"MDEwOlJlcG9zaXRvcnkzNzA1MjA0NTg=","name":"remote-server","full_name":"openmsupply/remote-server","private":false,"owner":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/openmsupply/remote-server","description":"mSupply Remote Server is an offline-first implementation of mSupply health supply chain management software. It requires an mSupply central server.","fork":false,"url":"https://api.github.com/repos/openmsupply/remote-server","forks_url":"https://api.github.com/repos/openmsupply/remote-server/forks","keys_url":"https://api.github.com/repos/openmsupply/remote-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openmsupply/remote-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openmsupply/remote-server/teams","hooks_url":"https://api.github.com/repos/openmsupply/remote-server/hooks","issue_events_url":"https://api.github.com/repos/openmsupply/remote-server/issues/events{/number}","events_url":"https://api.github.com/repos/openmsupply/remote-server/events","assignees_url":"https://api.github.com/repos/openmsupply/remote-server/assignees{/user}","branches_url":"https://api.github.com/repos/openmsupply/remote-server/branches{/branch}","tags_url":"https://api.github.com/repos/openmsupply/remote-server/tags","blobs_url":"https://api.github.com/repos/openmsupply/remote-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openmsupply/remote-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openmsupply/remote-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/openmsupply/remote-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openmsupply/remote-server/statuses/{sha}","languages_url":"https://api.github.com/repos/openmsupply/remote-server/languages","stargazers_url":"https://api.github.com/repos/openmsupply/remote-server/stargazers","contributors_url":"https://api.github.com/repos/openmsupply/remote-server/contributors","subscribers_url":"https://api.github.com/repos/openmsupply/remote-server/subscribers","subscription_url":"https://api.github.com/repos/openmsupply/remote-server/subscription","commits_url":"https://api.github.com/repos/openmsupply/remote-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/openmsupply/remote-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/openmsupply/remote-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/openmsupply/remote-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/openmsupply/remote-server/contents/{+path}","compare_url":"https://api.github.com/repos/openmsupply/remote-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openmsupply/remote-server/merges","archive_url":"https://api.github.com/repos/openmsupply/remote-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openmsupply/remote-server/downloads","issues_url":"https://api.github.com/repos/openmsupply/remote-server/issues{/number}","pulls_url":"https://api.github.com/repos/openmsupply/remote-server/pulls{/number}","milestones_url":"https://api.github.com/repos/openmsupply/remote-server/milestones{/number}","notifications_url":"https://api.github.com/repos/openmsupply/remote-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openmsupply/remote-server/labels{/name}","releases_url":"https://api.github.com/repos/openmsupply/remote-server/releases{/id}","deployments_url":"https://api.github.com/repos/openmsupply/remote-server/deployments","created_at":"2021-05-25T00:34:00Z","updated_at":"2021-07-21T05:50:00Z","pushed_at":"2021-07-21T05:50:45Z","git_url":"git://github.com/openmsupply/remote-server.git","ssh_url":"git@github.com:openmsupply/remote-server.git","clone_url":"https://github.com/openmsupply/remote-server.git","svn_url":"https://github.com/openmsupply/remote-server","homepage":"","size":648,"stargazers_count":0,"watchers_count":0,"language":"Rust","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":25,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":25,"watchers":0,"default_branch":"master"}},"base":{"label":"openmsupply:configuration-improvements","ref":"configuration-improvements","sha":"fc5324d1cd71652e5db558cd60b330d2f5c5661f","user":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"repo":{"id":370520458,"node_id":"MDEwOlJlcG9zaXRvcnkzNzA1MjA0NTg=","name":"remote-server","full_name":"openmsupply/remote-server","private":false,"owner":{"login":"openmsupply","id":45471207,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ1NDcxMjA3","avatar_url":"https://avatars.githubusercontent.com/u/45471207?v=4","gravatar_id":"","url":"https://api.github.com/users/openmsupply","html_url":"https://github.com/openmsupply","followers_url":"https://api.github.com/users/openmsupply/followers","following_url":"https://api.github.com/users/openmsupply/following{/other_user}","gists_url":"https://api.github.com/users/openmsupply/gists{/gist_id}","starred_url":"https://api.github.com/users/openmsupply/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openmsupply/subscriptions","organizations_url":"https://api.github.com/users/openmsupply/orgs","repos_url":"https://api.github.com/users/openmsupply/repos","events_url":"https://api.github.com/users/openmsupply/events{/privacy}","received_events_url":"https://api.github.com/users/openmsupply/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/openmsupply/remote-server","description":"mSupply Remote Server is an offline-first implementation of mSupply health supply chain management software. It requires an mSupply central server.","fork":false,"url":"https://api.github.com/repos/openmsupply/remote-server","forks_url":"https://api.github.com/repos/openmsupply/remote-server/forks","keys_url":"https://api.github.com/repos/openmsupply/remote-server/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openmsupply/remote-server/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openmsupply/remote-server/teams","hooks_url":"https://api.github.com/repos/openmsupply/remote-server/hooks","issue_events_url":"https://api.github.com/repos/openmsupply/remote-server/issues/events{/number}","events_url":"https://api.github.com/repos/openmsupply/remote-server/events","assignees_url":"https://api.github.com/repos/openmsupply/remote-server/assignees{/user}","branches_url":"https://api.github.com/repos/openmsupply/remote-server/branches{/branch}","tags_url":"https://api.github.com/repos/openmsupply/remote-server/tags","blobs_url":"https://api.github.com/repos/openmsupply/remote-server/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openmsupply/remote-server/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openmsupply/remote-server/git/refs{/sha}","trees_url":"https://api.github.com/repos/openmsupply/remote-server/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openmsupply/remote-server/statuses/{sha}","languages_url":"https://api.github.com/repos/openmsupply/remote-server/languages","stargazers_url":"https://api.github.com/repos/openmsupply/remote-server/stargazers","contributors_url":"https://api.github.com/repos/openmsupply/remote-server/contributors","subscribers_url":"https://api.github.com/repos/openmsupply/remote-server/subscribers","subscription_url":"https://api.github.com/repos/openmsupply/remote-server/subscription","commits_url":"https://api.github.com/repos/openmsupply/remote-server/commits{/sha}","git_commits_url":"https://api.github.com/repos/openmsupply/remote-server/git/commits{/sha}","comments_url":"https://api.github.com/repos/openmsupply/remote-server/comments{/number}","issue_comment_url":"https://api.github.com/repos/openmsupply/remote-server/issues/comments{/number}","contents_url":"https://api.github.com/repos/openmsupply/remote-server/contents/{+path}","compare_url":"https://api.github.com/repos/openmsupply/remote-server/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openmsupply/remote-server/merges","archive_url":"https://api.github.com/repos/openmsupply/remote-server/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openmsupply/remote-server/downloads","issues_url":"https://api.github.com/repos/openmsupply/remote-server/issues{/number}","pulls_url":"https://api.github.com/repos/openmsupply/remote-server/pulls{/number}","milestones_url":"https://api.github.com/repos/openmsupply/remote-server/milestones{/number}","notifications_url":"https://api.github.com/repos/openmsupply/remote-server/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openmsupply/remote-server/labels{/name}","releases_url":"https://api.github.com/repos/openmsupply/remote-server/releases{/id}","deployments_url":"https://api.github.com/repos/openmsupply/remote-server/deployments","created_at":"2021-05-25T00:34:00Z","updated_at":"2021-07-21T05:50:00Z","pushed_at":"2021-07-21T05:50:45Z","git_url":"git://github.com/openmsupply/remote-server.git","ssh_url":"git@github.com:openmsupply/remote-server.git","clone_url":"https://github.com/openmsupply/remote-server.git","svn_url":"https://github.com/openmsupply/remote-server","homepage":"","size":648,"stargazers_count":0,"watchers_count":0,"language":"Rust","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":25,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":25,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224"},"html":{"href":"https://github.com/openmsupply/remote-server/pull/224"},"issue":{"href":"https://api.github.com/repos/openmsupply/remote-server/issues/224"},"comments":{"href":"https://api.github.com/repos/openmsupply/remote-server/issues/224/comments"},"review_comments":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/comments"},"review_comment":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openmsupply/remote-server/pulls/224/commits"},"statuses":{"href":"https://api.github.com/repos/openmsupply/remote-server/statuses/49a384ab75d2e3b639091430a8b1a1e0920a8946"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:03Z","org":{"id":45471207,"login":"openmsupply","gravatar_id":"","url":"https://api.github.com/orgs/openmsupply","avatar_url":"https://avatars.githubusercontent.com/u/45471207?"}}
+{"id":"17244792278","type":"PushEvent","actor":{"id":69447371,"login":"brendanlsz","display_login":"brendanlsz","gravatar_id":"","url":"https://api.github.com/users/brendanlsz","avatar_url":"https://avatars.githubusercontent.com/u/69447371?"},"repo":{"id":382786978,"name":"brendanlsz/ShopZen","url":"https://api.github.com/repos/brendanlsz/ShopZen"},"payload":{"push_id":7561706396,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"7fedcab4d46245a58d368af638df04340611848b","before":"b77a498c95207a1846888f91cb735bd7974e4df8","commits":[{"sha":"7fedcab4d46245a58d368af638df04340611848b","author":{"name":"brendanlsz","email":"d80cfc9cb09728247f0fb81a8e9e55d1f1e766fe@gmail.com"},"message":"slide show","distinct":true,"url":"https://api.github.com/repos/brendanlsz/ShopZen/commits/7fedcab4d46245a58d368af638df04340611848b"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792285","type":"WatchEvent","actor":{"id":19624222,"login":"benlhy","display_login":"benlhy","gravatar_id":"","url":"https://api.github.com/users/benlhy","avatar_url":"https://avatars.githubusercontent.com/u/19624222?"},"repo":{"id":379133630,"name":"GovTechSIOT/decada-embedded-example-zephyr","url":"https://api.github.com/repos/GovTechSIOT/decada-embedded-example-zephyr"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:03Z","org":{"id":53718274,"login":"GovTechSIOT","gravatar_id":"","url":"https://api.github.com/orgs/GovTechSIOT","avatar_url":"https://avatars.githubusercontent.com/u/53718274?"}}
+{"id":"17244792296","type":"PushEvent","actor":{"id":2687598,"login":"milesholt","display_login":"milesholt","gravatar_id":"","url":"https://api.github.com/users/milesholt","avatar_url":"https://avatars.githubusercontent.com/u/2687598?"},"repo":{"id":247480564,"name":"milesholt/autotrade1","url":"https://api.github.com/repos/milesholt/autotrade1"},"payload":{"push_id":7561706392,"size":1,"distinct_size":1,"ref":"refs/heads/version2","head":"b295fb49fd192fbb1a8fdcdcc88d0291b0d9b446","before":"996ccda165162d1b4f2a1ed7e1b4e3c489de9cdb","commits":[{"sha":"b295fb49fd192fbb1a8fdcdcc88d0291b0d9b446","author":{"name":"milesholt","email":"1a73af9e7ae00182733b2292511b814be66f065f@milesholt.co.uk"},"message":"File updated - July 21, 2021 8:00 AM","distinct":true,"url":"https://api.github.com/repos/milesholt/autotrade1/commits/b295fb49fd192fbb1a8fdcdcc88d0291b0d9b446"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792297","type":"PullRequestEvent","actor":{"id":17320781,"login":"krtk6160","display_login":"krtk6160","gravatar_id":"","url":"https://api.github.com/users/krtk6160","avatar_url":"https://avatars.githubusercontent.com/u/17320781?"},"repo":{"id":348296522,"name":"GaloyMoney/galoy","url":"https://api.github.com/repos/GaloyMoney/galoy"},"payload":{"action":"opened","number":362,"pull_request":{"url":"https://api.github.com/repos/GaloyMoney/galoy/pulls/362","id":694104882,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODgy","html_url":"https://github.com/GaloyMoney/galoy/pull/362","diff_url":"https://github.com/GaloyMoney/galoy/pull/362.diff","patch_url":"https://github.com/GaloyMoney/galoy/pull/362.patch","issue_url":"https://api.github.com/repos/GaloyMoney/galoy/issues/362","number":362,"state":"open","locked":false,"title":"Upgrade bitcoind chart to v0.2.1","user":{"login":"krtk6160","id":17320781,"node_id":"MDQ6VXNlcjE3MzIwNzgx","avatar_url":"https://avatars.githubusercontent.com/u/17320781?v=4","gravatar_id":"","url":"https://api.github.com/users/krtk6160","html_url":"https://github.com/krtk6160","followers_url":"https://api.github.com/users/krtk6160/followers","following_url":"https://api.github.com/users/krtk6160/following{/other_user}","gists_url":"https://api.github.com/users/krtk6160/gists{/gist_id}","starred_url":"https://api.github.com/users/krtk6160/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/krtk6160/subscriptions","organizations_url":"https://api.github.com/users/krtk6160/orgs","repos_url":"https://api.github.com/users/krtk6160/repos","events_url":"https://api.github.com/users/krtk6160/events{/privacy}","received_events_url":"https://api.github.com/users/krtk6160/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:00:03Z","updated_at":"2021-07-21T07:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/GaloyMoney/galoy/pulls/362/commits","review_comments_url":"https://api.github.com/repos/GaloyMoney/galoy/pulls/362/comments","review_comment_url":"https://api.github.com/repos/GaloyMoney/galoy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/GaloyMoney/galoy/issues/362/comments","statuses_url":"https://api.github.com/repos/GaloyMoney/galoy/statuses/9f19792e67e909b714e3453dc80e9215429f4500","head":{"label":"GaloyMoney:upgrade_bitcoind_0.2.1","ref":"upgrade_bitcoind_0.2.1","sha":"9f19792e67e909b714e3453dc80e9215429f4500","user":{"login":"GaloyMoney","id":77592451,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3NTkyNDUx","avatar_url":"https://avatars.githubusercontent.com/u/77592451?v=4","gravatar_id":"","url":"https://api.github.com/users/GaloyMoney","html_url":"https://github.com/GaloyMoney","followers_url":"https://api.github.com/users/GaloyMoney/followers","following_url":"https://api.github.com/users/GaloyMoney/following{/other_user}","gists_url":"https://api.github.com/users/GaloyMoney/gists{/gist_id}","starred_url":"https://api.github.com/users/GaloyMoney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GaloyMoney/subscriptions","organizations_url":"https://api.github.com/users/GaloyMoney/orgs","repos_url":"https://api.github.com/users/GaloyMoney/repos","events_url":"https://api.github.com/users/GaloyMoney/events{/privacy}","received_events_url":"https://api.github.com/users/GaloyMoney/received_events","type":"Organization","site_admin":false},"repo":{"id":348296522,"node_id":"MDEwOlJlcG9zaXRvcnkzNDgyOTY1MjI=","name":"galoy","full_name":"GaloyMoney/galoy","private":false,"owner":{"login":"GaloyMoney","id":77592451,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3NTkyNDUx","avatar_url":"https://avatars.githubusercontent.com/u/77592451?v=4","gravatar_id":"","url":"https://api.github.com/users/GaloyMoney","html_url":"https://github.com/GaloyMoney","followers_url":"https://api.github.com/users/GaloyMoney/followers","following_url":"https://api.github.com/users/GaloyMoney/following{/other_user}","gists_url":"https://api.github.com/users/GaloyMoney/gists{/gist_id}","starred_url":"https://api.github.com/users/GaloyMoney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GaloyMoney/subscriptions","organizations_url":"https://api.github.com/users/GaloyMoney/orgs","repos_url":"https://api.github.com/users/GaloyMoney/repos","events_url":"https://api.github.com/users/GaloyMoney/events{/privacy}","received_events_url":"https://api.github.com/users/GaloyMoney/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/GaloyMoney/galoy","description":"bitcoin banking infrastructure","fork":false,"url":"https://api.github.com/repos/GaloyMoney/galoy","forks_url":"https://api.github.com/repos/GaloyMoney/galoy/forks","keys_url":"https://api.github.com/repos/GaloyMoney/galoy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/GaloyMoney/galoy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/GaloyMoney/galoy/teams","hooks_url":"https://api.github.com/repos/GaloyMoney/galoy/hooks","issue_events_url":"https://api.github.com/repos/GaloyMoney/galoy/issues/events{/number}","events_url":"https://api.github.com/repos/GaloyMoney/galoy/events","assignees_url":"https://api.github.com/repos/GaloyMoney/galoy/assignees{/user}","branches_url":"https://api.github.com/repos/GaloyMoney/galoy/branches{/branch}","tags_url":"https://api.github.com/repos/GaloyMoney/galoy/tags","blobs_url":"https://api.github.com/repos/GaloyMoney/galoy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/GaloyMoney/galoy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/GaloyMoney/galoy/git/refs{/sha}","trees_url":"https://api.github.com/repos/GaloyMoney/galoy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/GaloyMoney/galoy/statuses/{sha}","languages_url":"https://api.github.com/repos/GaloyMoney/galoy/languages","stargazers_url":"https://api.github.com/repos/GaloyMoney/galoy/stargazers","contributors_url":"https://api.github.com/repos/GaloyMoney/galoy/contributors","subscribers_url":"https://api.github.com/repos/GaloyMoney/galoy/subscribers","subscription_url":"https://api.github.com/repos/GaloyMoney/galoy/subscription","commits_url":"https://api.github.com/repos/GaloyMoney/galoy/commits{/sha}","git_commits_url":"https://api.github.com/repos/GaloyMoney/galoy/git/commits{/sha}","comments_url":"https://api.github.com/repos/GaloyMoney/galoy/comments{/number}","issue_comment_url":"https://api.github.com/repos/GaloyMoney/galoy/issues/comments{/number}","contents_url":"https://api.github.com/repos/GaloyMoney/galoy/contents/{+path}","compare_url":"https://api.github.com/repos/GaloyMoney/galoy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/GaloyMoney/galoy/merges","archive_url":"https://api.github.com/repos/GaloyMoney/galoy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/GaloyMoney/galoy/downloads","issues_url":"https://api.github.com/repos/GaloyMoney/galoy/issues{/number}","pulls_url":"https://api.github.com/repos/GaloyMoney/galoy/pulls{/number}","milestones_url":"https://api.github.com/repos/GaloyMoney/galoy/milestones{/number}","notifications_url":"https://api.github.com/repos/GaloyMoney/galoy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/GaloyMoney/galoy/labels{/name}","releases_url":"https://api.github.com/repos/GaloyMoney/galoy/releases{/id}","deployments_url":"https://api.github.com/repos/GaloyMoney/galoy/deployments","created_at":"2021-03-16T10:02:03Z","updated_at":"2021-07-21T04:40:53Z","pushed_at":"2021-07-21T07:00:03Z","git_url":"git://github.com/GaloyMoney/galoy.git","ssh_url":"git@github.com:GaloyMoney/galoy.git","clone_url":"https://github.com/GaloyMoney/galoy.git","svn_url":"https://github.com/GaloyMoney/galoy","homepage":"https://galoy.io","size":5209,"stargazers_count":145,"watchers_count":145,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":24,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":122,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":24,"open_issues":122,"watchers":145,"default_branch":"main"}},"base":{"label":"GaloyMoney:main","ref":"main","sha":"96bc61cd6e74daea0be458551eabc113885da01b","user":{"login":"GaloyMoney","id":77592451,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3NTkyNDUx","avatar_url":"https://avatars.githubusercontent.com/u/77592451?v=4","gravatar_id":"","url":"https://api.github.com/users/GaloyMoney","html_url":"https://github.com/GaloyMoney","followers_url":"https://api.github.com/users/GaloyMoney/followers","following_url":"https://api.github.com/users/GaloyMoney/following{/other_user}","gists_url":"https://api.github.com/users/GaloyMoney/gists{/gist_id}","starred_url":"https://api.github.com/users/GaloyMoney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GaloyMoney/subscriptions","organizations_url":"https://api.github.com/users/GaloyMoney/orgs","repos_url":"https://api.github.com/users/GaloyMoney/repos","events_url":"https://api.github.com/users/GaloyMoney/events{/privacy}","received_events_url":"https://api.github.com/users/GaloyMoney/received_events","type":"Organization","site_admin":false},"repo":{"id":348296522,"node_id":"MDEwOlJlcG9zaXRvcnkzNDgyOTY1MjI=","name":"galoy","full_name":"GaloyMoney/galoy","private":false,"owner":{"login":"GaloyMoney","id":77592451,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3NTkyNDUx","avatar_url":"https://avatars.githubusercontent.com/u/77592451?v=4","gravatar_id":"","url":"https://api.github.com/users/GaloyMoney","html_url":"https://github.com/GaloyMoney","followers_url":"https://api.github.com/users/GaloyMoney/followers","following_url":"https://api.github.com/users/GaloyMoney/following{/other_user}","gists_url":"https://api.github.com/users/GaloyMoney/gists{/gist_id}","starred_url":"https://api.github.com/users/GaloyMoney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GaloyMoney/subscriptions","organizations_url":"https://api.github.com/users/GaloyMoney/orgs","repos_url":"https://api.github.com/users/GaloyMoney/repos","events_url":"https://api.github.com/users/GaloyMoney/events{/privacy}","received_events_url":"https://api.github.com/users/GaloyMoney/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/GaloyMoney/galoy","description":"bitcoin banking infrastructure","fork":false,"url":"https://api.github.com/repos/GaloyMoney/galoy","forks_url":"https://api.github.com/repos/GaloyMoney/galoy/forks","keys_url":"https://api.github.com/repos/GaloyMoney/galoy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/GaloyMoney/galoy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/GaloyMoney/galoy/teams","hooks_url":"https://api.github.com/repos/GaloyMoney/galoy/hooks","issue_events_url":"https://api.github.com/repos/GaloyMoney/galoy/issues/events{/number}","events_url":"https://api.github.com/repos/GaloyMoney/galoy/events","assignees_url":"https://api.github.com/repos/GaloyMoney/galoy/assignees{/user}","branches_url":"https://api.github.com/repos/GaloyMoney/galoy/branches{/branch}","tags_url":"https://api.github.com/repos/GaloyMoney/galoy/tags","blobs_url":"https://api.github.com/repos/GaloyMoney/galoy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/GaloyMoney/galoy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/GaloyMoney/galoy/git/refs{/sha}","trees_url":"https://api.github.com/repos/GaloyMoney/galoy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/GaloyMoney/galoy/statuses/{sha}","languages_url":"https://api.github.com/repos/GaloyMoney/galoy/languages","stargazers_url":"https://api.github.com/repos/GaloyMoney/galoy/stargazers","contributors_url":"https://api.github.com/repos/GaloyMoney/galoy/contributors","subscribers_url":"https://api.github.com/repos/GaloyMoney/galoy/subscribers","subscription_url":"https://api.github.com/repos/GaloyMoney/galoy/subscription","commits_url":"https://api.github.com/repos/GaloyMoney/galoy/commits{/sha}","git_commits_url":"https://api.github.com/repos/GaloyMoney/galoy/git/commits{/sha}","comments_url":"https://api.github.com/repos/GaloyMoney/galoy/comments{/number}","issue_comment_url":"https://api.github.com/repos/GaloyMoney/galoy/issues/comments{/number}","contents_url":"https://api.github.com/repos/GaloyMoney/galoy/contents/{+path}","compare_url":"https://api.github.com/repos/GaloyMoney/galoy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/GaloyMoney/galoy/merges","archive_url":"https://api.github.com/repos/GaloyMoney/galoy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/GaloyMoney/galoy/downloads","issues_url":"https://api.github.com/repos/GaloyMoney/galoy/issues{/number}","pulls_url":"https://api.github.com/repos/GaloyMoney/galoy/pulls{/number}","milestones_url":"https://api.github.com/repos/GaloyMoney/galoy/milestones{/number}","notifications_url":"https://api.github.com/repos/GaloyMoney/galoy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/GaloyMoney/galoy/labels{/name}","releases_url":"https://api.github.com/repos/GaloyMoney/galoy/releases{/id}","deployments_url":"https://api.github.com/repos/GaloyMoney/galoy/deployments","created_at":"2021-03-16T10:02:03Z","updated_at":"2021-07-21T04:40:53Z","pushed_at":"2021-07-21T07:00:03Z","git_url":"git://github.com/GaloyMoney/galoy.git","ssh_url":"git@github.com:GaloyMoney/galoy.git","clone_url":"https://github.com/GaloyMoney/galoy.git","svn_url":"https://github.com/GaloyMoney/galoy","homepage":"https://galoy.io","size":5209,"stargazers_count":145,"watchers_count":145,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":24,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":122,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":24,"open_issues":122,"watchers":145,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/GaloyMoney/galoy/pulls/362"},"html":{"href":"https://github.com/GaloyMoney/galoy/pull/362"},"issue":{"href":"https://api.github.com/repos/GaloyMoney/galoy/issues/362"},"comments":{"href":"https://api.github.com/repos/GaloyMoney/galoy/issues/362/comments"},"review_comments":{"href":"https://api.github.com/repos/GaloyMoney/galoy/pulls/362/comments"},"review_comment":{"href":"https://api.github.com/repos/GaloyMoney/galoy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/GaloyMoney/galoy/pulls/362/commits"},"statuses":{"href":"https://api.github.com/repos/GaloyMoney/galoy/statuses/9f19792e67e909b714e3453dc80e9215429f4500"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T07:00:03Z","org":{"id":77592451,"login":"GaloyMoney","gravatar_id":"","url":"https://api.github.com/orgs/GaloyMoney","avatar_url":"https://avatars.githubusercontent.com/u/77592451?"}}
+{"id":"17244792312","type":"IssuesEvent","actor":{"id":172204,"login":"BohuTANG","display_login":"BohuTANG","gravatar_id":"","url":"https://api.github.com/users/BohuTANG","avatar_url":"https://avatars.githubusercontent.com/u/172204?"},"repo":{"id":302827809,"name":"datafuselabs/datafuse","url":"https://api.github.com/repos/datafuselabs/datafuse"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/datafuselabs/datafuse/issues/1136","repository_url":"https://api.github.com/repos/datafuselabs/datafuse","labels_url":"https://api.github.com/repos/datafuselabs/datafuse/issues/1136/labels{/name}","comments_url":"https://api.github.com/repos/datafuselabs/datafuse/issues/1136/comments","events_url":"https://api.github.com/repos/datafuselabs/datafuse/issues/1136/events","html_url":"https://github.com/datafuselabs/datafuse/issues/1136","id":949391980,"node_id":"MDU6SXNzdWU5NDkzOTE5ODA=","number":1136,"title":"[security] Http api TLS support","user":{"login":"BohuTANG","id":172204,"node_id":"MDQ6VXNlcjE3MjIwNA==","avatar_url":"https://avatars.githubusercontent.com/u/172204?v=4","gravatar_id":"","url":"https://api.github.com/users/BohuTANG","html_url":"https://github.com/BohuTANG","followers_url":"https://api.github.com/users/BohuTANG/followers","following_url":"https://api.github.com/users/BohuTANG/following{/other_user}","gists_url":"https://api.github.com/users/BohuTANG/gists{/gist_id}","starred_url":"https://api.github.com/users/BohuTANG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BohuTANG/subscriptions","organizations_url":"https://api.github.com/users/BohuTANG/orgs","repos_url":"https://api.github.com/users/BohuTANG/repos","events_url":"https://api.github.com/users/BohuTANG/events{/privacy}","received_events_url":"https://api.github.com/users/BohuTANG/received_events","type":"User","site_admin":false},"labels":[{"id":2414530921,"node_id":"MDU6TGFiZWwyNDE0NTMwOTIx","url":"https://api.github.com/repos/datafuselabs/datafuse/labels/feature","name":"feature","color":"FBCA04","default":false,"description":"Extra attention is needed"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T07:00:03Z","updated_at":"2021-07-21T07:00:03Z","closed_at":null,"author_association":"MEMBER","active_lock_reason":null,"body":"**Summary**\r\n\r\nAdd TLS for warp http.\r\nExample:\r\nhttps://github.com/seanmonstar/warp/blob/master/examples/tls.rs\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:03Z","org":{"id":80994548,"login":"datafuselabs","gravatar_id":"","url":"https://api.github.com/orgs/datafuselabs","avatar_url":"https://avatars.githubusercontent.com/u/80994548?"}}
+{"id":"17244792315","type":"PushEvent","actor":{"id":22863512,"login":"YURARINGACHEV","display_login":"YURARINGACHEV","gravatar_id":"","url":"https://api.github.com/users/YURARINGACHEV","avatar_url":"https://avatars.githubusercontent.com/u/22863512?"},"repo":{"id":385816364,"name":"YURARINGACHEV/ruby_on_rails","url":"https://api.github.com/repos/YURARINGACHEV/ruby_on_rails"},"payload":{"push_id":7561706409,"size":1,"distinct_size":1,"ref":"refs/heads/lesson3","head":"9936f4b6860c408cea8f15936147043faaf57577","before":"f8ed6c06e0991a6b2776b44237be75d1e9a9f1d0","commits":[{"sha":"9936f4b6860c408cea8f15936147043faaf57577","author":{"name":"YOUR NAME","email":"23f6a0713fca098434027764f6a2a425f389fdab"},"message":"asd","distinct":true,"url":"https://api.github.com/repos/YURARINGACHEV/ruby_on_rails/commits/9936f4b6860c408cea8f15936147043faaf57577"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792332","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561706415,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8bad30072ea48ae8c430eb696c742391758231c1","before":"35c01d8b8650950a99a1ab9a206bee0acdb37323","commits":[{"sha":"8bad30072ea48ae8c430eb696c742391758231c1","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/8bad30072ea48ae8c430eb696c742391758231c1"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792342","type":"PushEvent","actor":{"id":38880224,"login":"fazchanneltv","display_login":"fazchanneltv","gravatar_id":"","url":"https://api.github.com/users/fazchanneltv","avatar_url":"https://avatars.githubusercontent.com/u/38880224?"},"repo":{"id":387105424,"name":"fazchanneltv/radio","url":"https://api.github.com/repos/fazchanneltv/radio"},"payload":{"push_id":7561706426,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1605fcf33ed775f7baee35c8753f20a0e64833d6","before":"e5a48336e34f985d9c204c5c7444dcd892f8b66a","commits":[{"sha":"1605fcf33ed775f7baee35c8753f20a0e64833d6","author":{"name":"fazchanneltv","email":"7588a9eb7622457cfef32d700780dfed85ec5b9f@users.noreply.github.com"},"message":"Update style.css","distinct":true,"url":"https://api.github.com/repos/fazchanneltv/radio/commits/1605fcf33ed775f7baee35c8753f20a0e64833d6"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792344","type":"PushEvent","actor":{"id":46918839,"login":"rosa2070","display_login":"rosa2070","gravatar_id":"","url":"https://api.github.com/users/rosa2070","avatar_url":"https://avatars.githubusercontent.com/u/46918839?"},"repo":{"id":381922075,"name":"rosa2070/FAST_JAVA_AGAIN","url":"https://api.github.com/repos/rosa2070/FAST_JAVA_AGAIN"},"payload":{"push_id":7561706431,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"beac12e09e878cf6241ea256306b27df553ea4e6","before":"94f34ddb9358ee8db0c454b1b0ba4f3a41ad8868","commits":[{"sha":"beac12e09e878cf6241ea256306b27df553ea4e6","author":{"name":"jaeeunhyun","email":"4276311f62018bfb314b438b493116bcf870a6da@naver.com"},"message":"sgfd","distinct":true,"url":"https://api.github.com/repos/rosa2070/FAST_JAVA_AGAIN/commits/beac12e09e878cf6241ea256306b27df553ea4e6"}]},"public":true,"created_at":"2021-07-21T07:00:03Z"}
+{"id":"17244792366","type":"PushEvent","actor":{"id":20573784,"login":"DavidCambre","display_login":"DavidCambre","gravatar_id":"","url":"https://api.github.com/users/DavidCambre","avatar_url":"https://avatars.githubusercontent.com/u/20573784?"},"repo":{"id":365583432,"name":"DavidCambre/godot","url":"https://api.github.com/repos/DavidCambre/godot"},"payload":{"push_id":7561706427,"size":1,"distinct_size":1,"ref":"refs/heads/Expose_VisualScriptCustomNode_TypeHints_m","head":"d03175f22ceac5b61bd90f7e0209dbef9734d2c3","before":"5807ec1d95f581a8875012976344a2054b56ac20","commits":[{"sha":"d03175f22ceac5b61bd90f7e0209dbef9734d2c3","author":{"name":"DavidCambre","email":"04d80ad3d6b9d9ff92b6f39db74f421b124ca051@gmail.com"},"message":"Update modules/visual_script/doc_classes/VisualScriptCustomNode.xml\n\nCo-authored-by: Rémi Verschelde <rverschelde@gmail.com>","distinct":true,"url":"https://api.github.com/repos/DavidCambre/godot/commits/d03175f22ceac5b61bd90f7e0209dbef9734d2c3"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792370","type":"PullRequestEvent","actor":{"id":32645537,"login":"Beziel","display_login":"Beziel","gravatar_id":"","url":"https://api.github.com/users/Beziel","avatar_url":"https://avatars.githubusercontent.com/u/32645537?"},"repo":{"id":388022780,"name":"Beziel/demo-gitflow","url":"https://api.github.com/repos/Beziel/demo-gitflow"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/1","id":694104836,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODM2","html_url":"https://github.com/Beziel/demo-gitflow/pull/1","diff_url":"https://github.com/Beziel/demo-gitflow/pull/1.diff","patch_url":"https://github.com/Beziel/demo-gitflow/pull/1.patch","issue_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues/1","number":1,"state":"closed","locked":false,"title":"Release/1.0.0","user":{"login":"Beziel","id":32645537,"node_id":"MDQ6VXNlcjMyNjQ1NTM3","avatar_url":"https://avatars.githubusercontent.com/u/32645537?v=4","gravatar_id":"","url":"https://api.github.com/users/Beziel","html_url":"https://github.com/Beziel","followers_url":"https://api.github.com/users/Beziel/followers","following_url":"https://api.github.com/users/Beziel/following{/other_user}","gists_url":"https://api.github.com/users/Beziel/gists{/gist_id}","starred_url":"https://api.github.com/users/Beziel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Beziel/subscriptions","organizations_url":"https://api.github.com/users/Beziel/orgs","repos_url":"https://api.github.com/users/Beziel/repos","events_url":"https://api.github.com/users/Beziel/events{/privacy}","received_events_url":"https://api.github.com/users/Beziel/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T06:59:57Z","updated_at":"2021-07-21T07:00:03Z","closed_at":"2021-07-21T07:00:03Z","merged_at":"2021-07-21T07:00:03Z","merge_commit_sha":"6f6d75cd1d878d21f95fa8873c3c21088d4106fe","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/1/commits","review_comments_url":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/1/comments","review_comment_url":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues/1/comments","statuses_url":"https://api.github.com/repos/Beziel/demo-gitflow/statuses/2fa94f06b8eb3319ddc8bb7984a91d71da44529d","head":{"label":"Beziel:release/1.0.0","ref":"release/1.0.0","sha":"2fa94f06b8eb3319ddc8bb7984a91d71da44529d","user":{"login":"Beziel","id":32645537,"node_id":"MDQ6VXNlcjMyNjQ1NTM3","avatar_url":"https://avatars.githubusercontent.com/u/32645537?v=4","gravatar_id":"","url":"https://api.github.com/users/Beziel","html_url":"https://github.com/Beziel","followers_url":"https://api.github.com/users/Beziel/followers","following_url":"https://api.github.com/users/Beziel/following{/other_user}","gists_url":"https://api.github.com/users/Beziel/gists{/gist_id}","starred_url":"https://api.github.com/users/Beziel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Beziel/subscriptions","organizations_url":"https://api.github.com/users/Beziel/orgs","repos_url":"https://api.github.com/users/Beziel/repos","events_url":"https://api.github.com/users/Beziel/events{/privacy}","received_events_url":"https://api.github.com/users/Beziel/received_events","type":"User","site_admin":false},"repo":{"id":388022780,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMjI3ODA=","name":"demo-gitflow","full_name":"Beziel/demo-gitflow","private":false,"owner":{"login":"Beziel","id":32645537,"node_id":"MDQ6VXNlcjMyNjQ1NTM3","avatar_url":"https://avatars.githubusercontent.com/u/32645537?v=4","gravatar_id":"","url":"https://api.github.com/users/Beziel","html_url":"https://github.com/Beziel","followers_url":"https://api.github.com/users/Beziel/followers","following_url":"https://api.github.com/users/Beziel/following{/other_user}","gists_url":"https://api.github.com/users/Beziel/gists{/gist_id}","starred_url":"https://api.github.com/users/Beziel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Beziel/subscriptions","organizations_url":"https://api.github.com/users/Beziel/orgs","repos_url":"https://api.github.com/users/Beziel/repos","events_url":"https://api.github.com/users/Beziel/events{/privacy}","received_events_url":"https://api.github.com/users/Beziel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Beziel/demo-gitflow","description":null,"fork":false,"url":"https://api.github.com/repos/Beziel/demo-gitflow","forks_url":"https://api.github.com/repos/Beziel/demo-gitflow/forks","keys_url":"https://api.github.com/repos/Beziel/demo-gitflow/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Beziel/demo-gitflow/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Beziel/demo-gitflow/teams","hooks_url":"https://api.github.com/repos/Beziel/demo-gitflow/hooks","issue_events_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues/events{/number}","events_url":"https://api.github.com/repos/Beziel/demo-gitflow/events","assignees_url":"https://api.github.com/repos/Beziel/demo-gitflow/assignees{/user}","branches_url":"https://api.github.com/repos/Beziel/demo-gitflow/branches{/branch}","tags_url":"https://api.github.com/repos/Beziel/demo-gitflow/tags","blobs_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/refs{/sha}","trees_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Beziel/demo-gitflow/statuses/{sha}","languages_url":"https://api.github.com/repos/Beziel/demo-gitflow/languages","stargazers_url":"https://api.github.com/repos/Beziel/demo-gitflow/stargazers","contributors_url":"https://api.github.com/repos/Beziel/demo-gitflow/contributors","subscribers_url":"https://api.github.com/repos/Beziel/demo-gitflow/subscribers","subscription_url":"https://api.github.com/repos/Beziel/demo-gitflow/subscription","commits_url":"https://api.github.com/repos/Beziel/demo-gitflow/commits{/sha}","git_commits_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/commits{/sha}","comments_url":"https://api.github.com/repos/Beziel/demo-gitflow/comments{/number}","issue_comment_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues/comments{/number}","contents_url":"https://api.github.com/repos/Beziel/demo-gitflow/contents/{+path}","compare_url":"https://api.github.com/repos/Beziel/demo-gitflow/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Beziel/demo-gitflow/merges","archive_url":"https://api.github.com/repos/Beziel/demo-gitflow/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Beziel/demo-gitflow/downloads","issues_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues{/number}","pulls_url":"https://api.github.com/repos/Beziel/demo-gitflow/pulls{/number}","milestones_url":"https://api.github.com/repos/Beziel/demo-gitflow/milestones{/number}","notifications_url":"https://api.github.com/repos/Beziel/demo-gitflow/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Beziel/demo-gitflow/labels{/name}","releases_url":"https://api.github.com/repos/Beziel/demo-gitflow/releases{/id}","deployments_url":"https://api.github.com/repos/Beziel/demo-gitflow/deployments","created_at":"2021-07-21T06:52:11Z","updated_at":"2021-07-21T06:56:15Z","pushed_at":"2021-07-21T07:00:03Z","git_url":"git://github.com/Beziel/demo-gitflow.git","ssh_url":"git@github.com:Beziel/demo-gitflow.git","clone_url":"https://github.com/Beziel/demo-gitflow.git","svn_url":"https://github.com/Beziel/demo-gitflow","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"Beziel:main","ref":"main","sha":"18c286a19563567013176cc441b849d1835536b5","user":{"login":"Beziel","id":32645537,"node_id":"MDQ6VXNlcjMyNjQ1NTM3","avatar_url":"https://avatars.githubusercontent.com/u/32645537?v=4","gravatar_id":"","url":"https://api.github.com/users/Beziel","html_url":"https://github.com/Beziel","followers_url":"https://api.github.com/users/Beziel/followers","following_url":"https://api.github.com/users/Beziel/following{/other_user}","gists_url":"https://api.github.com/users/Beziel/gists{/gist_id}","starred_url":"https://api.github.com/users/Beziel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Beziel/subscriptions","organizations_url":"https://api.github.com/users/Beziel/orgs","repos_url":"https://api.github.com/users/Beziel/repos","events_url":"https://api.github.com/users/Beziel/events{/privacy}","received_events_url":"https://api.github.com/users/Beziel/received_events","type":"User","site_admin":false},"repo":{"id":388022780,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMjI3ODA=","name":"demo-gitflow","full_name":"Beziel/demo-gitflow","private":false,"owner":{"login":"Beziel","id":32645537,"node_id":"MDQ6VXNlcjMyNjQ1NTM3","avatar_url":"https://avatars.githubusercontent.com/u/32645537?v=4","gravatar_id":"","url":"https://api.github.com/users/Beziel","html_url":"https://github.com/Beziel","followers_url":"https://api.github.com/users/Beziel/followers","following_url":"https://api.github.com/users/Beziel/following{/other_user}","gists_url":"https://api.github.com/users/Beziel/gists{/gist_id}","starred_url":"https://api.github.com/users/Beziel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Beziel/subscriptions","organizations_url":"https://api.github.com/users/Beziel/orgs","repos_url":"https://api.github.com/users/Beziel/repos","events_url":"https://api.github.com/users/Beziel/events{/privacy}","received_events_url":"https://api.github.com/users/Beziel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Beziel/demo-gitflow","description":null,"fork":false,"url":"https://api.github.com/repos/Beziel/demo-gitflow","forks_url":"https://api.github.com/repos/Beziel/demo-gitflow/forks","keys_url":"https://api.github.com/repos/Beziel/demo-gitflow/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Beziel/demo-gitflow/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Beziel/demo-gitflow/teams","hooks_url":"https://api.github.com/repos/Beziel/demo-gitflow/hooks","issue_events_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues/events{/number}","events_url":"https://api.github.com/repos/Beziel/demo-gitflow/events","assignees_url":"https://api.github.com/repos/Beziel/demo-gitflow/assignees{/user}","branches_url":"https://api.github.com/repos/Beziel/demo-gitflow/branches{/branch}","tags_url":"https://api.github.com/repos/Beziel/demo-gitflow/tags","blobs_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/refs{/sha}","trees_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Beziel/demo-gitflow/statuses/{sha}","languages_url":"https://api.github.com/repos/Beziel/demo-gitflow/languages","stargazers_url":"https://api.github.com/repos/Beziel/demo-gitflow/stargazers","contributors_url":"https://api.github.com/repos/Beziel/demo-gitflow/contributors","subscribers_url":"https://api.github.com/repos/Beziel/demo-gitflow/subscribers","subscription_url":"https://api.github.com/repos/Beziel/demo-gitflow/subscription","commits_url":"https://api.github.com/repos/Beziel/demo-gitflow/commits{/sha}","git_commits_url":"https://api.github.com/repos/Beziel/demo-gitflow/git/commits{/sha}","comments_url":"https://api.github.com/repos/Beziel/demo-gitflow/comments{/number}","issue_comment_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues/comments{/number}","contents_url":"https://api.github.com/repos/Beziel/demo-gitflow/contents/{+path}","compare_url":"https://api.github.com/repos/Beziel/demo-gitflow/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Beziel/demo-gitflow/merges","archive_url":"https://api.github.com/repos/Beziel/demo-gitflow/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Beziel/demo-gitflow/downloads","issues_url":"https://api.github.com/repos/Beziel/demo-gitflow/issues{/number}","pulls_url":"https://api.github.com/repos/Beziel/demo-gitflow/pulls{/number}","milestones_url":"https://api.github.com/repos/Beziel/demo-gitflow/milestones{/number}","notifications_url":"https://api.github.com/repos/Beziel/demo-gitflow/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Beziel/demo-gitflow/labels{/name}","releases_url":"https://api.github.com/repos/Beziel/demo-gitflow/releases{/id}","deployments_url":"https://api.github.com/repos/Beziel/demo-gitflow/deployments","created_at":"2021-07-21T06:52:11Z","updated_at":"2021-07-21T06:56:15Z","pushed_at":"2021-07-21T07:00:03Z","git_url":"git://github.com/Beziel/demo-gitflow.git","ssh_url":"git@github.com:Beziel/demo-gitflow.git","clone_url":"https://github.com/Beziel/demo-gitflow.git","svn_url":"https://github.com/Beziel/demo-gitflow","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/1"},"html":{"href":"https://github.com/Beziel/demo-gitflow/pull/1"},"issue":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/issues/1"},"comments":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/Beziel/demo-gitflow/statuses/2fa94f06b8eb3319ddc8bb7984a91d71da44529d"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"Beziel","id":32645537,"node_id":"MDQ6VXNlcjMyNjQ1NTM3","avatar_url":"https://avatars.githubusercontent.com/u/32645537?v=4","gravatar_id":"","url":"https://api.github.com/users/Beziel","html_url":"https://github.com/Beziel","followers_url":"https://api.github.com/users/Beziel/followers","following_url":"https://api.github.com/users/Beziel/following{/other_user}","gists_url":"https://api.github.com/users/Beziel/gists{/gist_id}","starred_url":"https://api.github.com/users/Beziel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Beziel/subscriptions","organizations_url":"https://api.github.com/users/Beziel/orgs","repos_url":"https://api.github.com/users/Beziel/repos","events_url":"https://api.github.com/users/Beziel/events{/privacy}","received_events_url":"https://api.github.com/users/Beziel/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792373","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":248646333,"name":"miwebst/ssRunner","url":"https://api.github.com/repos/miwebst/ssRunner"},"payload":{"push_id":7561706437,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9624c2d0a26660b9cad330fede032c2500bccab9","before":"354d364064aad6fd2fbb6d0de79ea7cbc70c99f7","commits":[{"sha":"9624c2d0a26660b9cad330fede032c2500bccab9","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 7:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunner/commits/9624c2d0a26660b9cad330fede032c2500bccab9"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792374","type":"CreateEvent","actor":{"id":72749136,"login":"kotawonism","display_login":"kotawonism","gravatar_id":"","url":"https://api.github.com/users/kotawonism","avatar_url":"https://avatars.githubusercontent.com/u/72749136?"},"repo":{"id":388024733,"name":"kotawonism/react","url":"https://api.github.com/repos/kotawonism/react"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792375","type":"PushEvent","actor":{"id":7485710,"login":"ToryZhou","display_login":"ToryZhou","gravatar_id":"","url":"https://api.github.com/users/ToryZhou","avatar_url":"https://avatars.githubusercontent.com/u/7485710?"},"repo":{"id":96061680,"name":"ToryZhou/draw_io","url":"https://api.github.com/repos/ToryZhou/draw_io"},"payload":{"push_id":7561706439,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b6ae60e8f8d985ea6d8c27b87e954d7f9d10046b","before":"d35679e3c5dc1d15c088105ac18431fff50fad3c","commits":[{"sha":"b6ae60e8f8d985ea6d8c27b87e954d7f9d10046b","author":{"name":"torychow","email":"33a4d31ca61fafe4b6830b4dacabdd1c4d7f84c8@qq.com"},"message":"Update BOP Architecture.drawio","distinct":true,"url":"https://api.github.com/repos/ToryZhou/draw_io/commits/b6ae60e8f8d985ea6d8c27b87e954d7f9d10046b"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792379","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249503742,"name":"miwebst/ssRunnerReact","url":"https://api.github.com/repos/miwebst/ssRunnerReact"},"payload":{"push_id":7561706445,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"add793f2731d9f62648b4c7649c2d9d4c11c6756","before":"afd2755f5dff8597f69c0393af6d56531944e2c6","commits":[{"sha":"add793f2731d9f62648b4c7649c2d9d4c11c6756","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 7:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerReact/commits/add793f2731d9f62648b4c7649c2d9d4c11c6756"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792380","type":"PushEvent","actor":{"id":40586421,"login":"himobi","display_login":"himobi","gravatar_id":"","url":"https://api.github.com/users/himobi","avatar_url":"https://avatars.githubusercontent.com/u/40586421?"},"repo":{"id":138676186,"name":"himobi/hotspot","url":"https://api.github.com/repos/himobi/hotspot"},"payload":{"push_id":7561706440,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"0c9401da4a36551a87c89709651300b0bffc159d","before":"03c99342ff10ebc36212046bead68f82f73c402b","commits":[{"sha":"0c9401da4a36551a87c89709651300b0bffc159d","author":{"name":"himobi","email":"25be52bce459ebff50c126f5ac512648f87cbe75@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/himobi/hotspot/commits/0c9401da4a36551a87c89709651300b0bffc159d"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792381","type":"PushEvent","actor":{"id":13587915,"login":"BinBear","display_login":"BinBear","gravatar_id":"","url":"https://api.github.com/users/BinBear","avatar_url":"https://avatars.githubusercontent.com/u/13587915?"},"repo":{"id":387381308,"name":"BinBear/LeetCode","url":"https://api.github.com/repos/BinBear/LeetCode"},"payload":{"push_id":7561706438,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"646c27d26cccd6ba4265b51cb2c273704d45f36a","before":"6a6d296beb5e54727ba6cd5d74ea333a30feb1df","commits":[{"sha":"646c27d26cccd6ba4265b51cb2c273704d45f36a","author":{"name":"vin","email":"bda1f7ce004368cbf3b542b02dc078cc7ccbc88c@vindeMacBook-Pro.local"},"message":"📝 增加【字符串】-->【最长回文子串】","distinct":true,"url":"https://api.github.com/repos/BinBear/LeetCode/commits/646c27d26cccd6ba4265b51cb2c273704d45f36a"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792389","type":"PushEvent","actor":{"id":70911038,"login":"ultimate-hosts-blacklist-bot","display_login":"ultimate-hosts-blacklist-bot","gravatar_id":"","url":"https://api.github.com/users/ultimate-hosts-blacklist-bot","avatar_url":"https://avatars.githubusercontent.com/u/70911038?"},"repo":{"id":130666244,"name":"Ultimate-Hosts-Blacklist/Phishing.Database","url":"https://api.github.com/repos/Ultimate-Hosts-Blacklist/Phishing.Database"},"payload":{"push_id":7561706444,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"dbb7485e90044039e16f4780e8fbfcf3492068cc","before":"563eeda6bf44ce9ca2cf94682e8c556524bc9895","commits":[{"sha":"dbb7485e90044039e16f4780e8fbfcf3492068cc","author":{"name":"ultimate-hosts-blacklist-bot","email":"cf66b13d5686610465f885e6ad57f099f056751f@outlook.com"},"message":"[Autosave] Testing for Ultimate Hosts Blacklist\n\ni_XhjJ0NaPyauHrc3udblTGi","distinct":true,"url":"https://api.github.com/repos/Ultimate-Hosts-Blacklist/Phishing.Database/commits/dbb7485e90044039e16f4780e8fbfcf3492068cc"}]},"public":true,"created_at":"2021-07-21T07:00:04Z","org":{"id":37181187,"login":"Ultimate-Hosts-Blacklist","gravatar_id":"","url":"https://api.github.com/orgs/Ultimate-Hosts-Blacklist","avatar_url":"https://avatars.githubusercontent.com/u/37181187?"}}
+{"id":"17244792390","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249783941,"name":"miwebst/ssRunnerAngular","url":"https://api.github.com/repos/miwebst/ssRunnerAngular"},"payload":{"push_id":7561706448,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"57ce98911eb84b6e591c4f8e40628105450489cd","before":"6981c514462269d49236a08a170c8005d571f72b","commits":[{"sha":"57ce98911eb84b6e591c4f8e40628105450489cd","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 7:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerAngular/commits/57ce98911eb84b6e591c4f8e40628105450489cd"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792398","type":"CreateEvent","actor":{"id":71575781,"login":"Shin-sibainu","display_login":"Shin-sibainu","gravatar_id":"","url":"https://api.github.com/users/Shin-sibainu","avatar_url":"https://avatars.githubusercontent.com/u/71575781?"},"repo":{"id":388002580,"name":"Shin-sibainu/react-redux-crud-application","url":"https://api.github.com/repos/Shin-sibainu/react-redux-crud-application"},"payload":{"ref":"hello-world","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792400","type":"PushEvent","actor":{"id":82876799,"login":"hvaish01","display_login":"hvaish01","gravatar_id":"","url":"https://api.github.com/users/hvaish01","avatar_url":"https://avatars.githubusercontent.com/u/82876799?"},"repo":{"id":359772248,"name":"hvaish01/StixBundles","url":"https://api.github.com/repos/hvaish01/StixBundles"},"payload":{"push_id":7561706454,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"48f098644e5efee0604c33496b7d10ec32444853","before":"0aa3c41daa61b362a00ef78ea33f64354d1ada99","commits":[{"sha":"48f098644e5efee0604c33496b7d10ec32444853","author":{"name":"hvaish01","email":"2afd248fb67ac19cdeb0148e32ca7ee71c30c76d@users.noreply.github.com"},"message":"Updated at 12:00:02 21-07-2021","distinct":true,"url":"https://api.github.com/repos/hvaish01/StixBundles/commits/48f098644e5efee0604c33496b7d10ec32444853"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792403","type":"IssuesEvent","actor":{"id":10670690,"login":"pankaj-ag","display_login":"pankaj-ag","gravatar_id":"","url":"https://api.github.com/users/pankaj-ag","avatar_url":"https://avatars.githubusercontent.com/u/10670690?"},"repo":{"id":125008594,"name":"ColoredCow/portal","url":"https://api.github.com/repos/ColoredCow/portal"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/ColoredCow/portal/issues/797","repository_url":"https://api.github.com/repos/ColoredCow/portal","labels_url":"https://api.github.com/repos/ColoredCow/portal/issues/797/labels{/name}","comments_url":"https://api.github.com/repos/ColoredCow/portal/issues/797/comments","events_url":"https://api.github.com/repos/ColoredCow/portal/issues/797/events","html_url":"https://github.com/ColoredCow/portal/issues/797","id":949391988,"node_id":"MDU6SXNzdWU5NDkzOTE5ODg=","number":797,"title":"Rename conversion rate to conversion rate diff in the invoice module. ","user":{"login":"pankaj-ag","id":10670690,"node_id":"MDQ6VXNlcjEwNjcwNjkw","avatar_url":"https://avatars.githubusercontent.com/u/10670690?v=4","gravatar_id":"","url":"https://api.github.com/users/pankaj-ag","html_url":"https://github.com/pankaj-ag","followers_url":"https://api.github.com/users/pankaj-ag/followers","following_url":"https://api.github.com/users/pankaj-ag/following{/other_user}","gists_url":"https://api.github.com/users/pankaj-ag/gists{/gist_id}","starred_url":"https://api.github.com/users/pankaj-ag/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pankaj-ag/subscriptions","organizations_url":"https://api.github.com/users/pankaj-ag/orgs","repos_url":"https://api.github.com/users/pankaj-ag/repos","events_url":"https://api.github.com/users/pankaj-ag/events{/privacy}","received_events_url":"https://api.github.com/users/pankaj-ag/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T07:00:03Z","updated_at":"2021-07-21T07:00:03Z","closed_at":null,"author_association":"MEMBER","active_lock_reason":null,"body":"**Describe the bug**\r\nWe have a typo in the conversion rate, it should be conversion rate diff. \r\n\r\n\r\n**Expected behavior**\r\n1. Rename label from Conversion rate to conversion rate diff\r\n2. Rename database column from conversion_rate to conversion_rate_diff\r\n3. Update the invoice modal column as well.\r\n\r\n\r\n**Screenshots**\r\n<img width=\"1031\" alt=\"Screenshot 2021-07-16 at 12 14 20 PM\" src=\"https://user-images.githubusercontent.com/10670690/125904112-a5b98dab-85b6-4c23-b74e-485dd17d21fc.png\">\r\n\r\n\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:04Z","org":{"id":17040495,"login":"ColoredCow","gravatar_id":"","url":"https://api.github.com/orgs/ColoredCow","avatar_url":"https://avatars.githubusercontent.com/u/17040495?"}}
+{"id":"17244792410","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561706447,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"1e8d3c37bdaa27f94049689bd806b189b0e2397b","before":"8bad30072ea48ae8c430eb696c742391758231c1","commits":[{"sha":"1e8d3c37bdaa27f94049689bd806b189b0e2397b","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/1e8d3c37bdaa27f94049689bd806b189b0e2397b"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792412","type":"PushEvent","actor":{"id":16056222,"login":"atoka93","display_login":"atoka93","gravatar_id":"","url":"https://api.github.com/users/atoka93","avatar_url":"https://avatars.githubusercontent.com/u/16056222?"},"repo":{"id":380180906,"name":"atoka93/flutter","url":"https://api.github.com/repos/atoka93/flutter"},"payload":{"push_id":7561706446,"size":15,"distinct_size":15,"ref":"refs/heads/override-mediaquery-reland","head":"7fee22c09a99c3f3803fd89a1d6f1e9e6bd9aeb6","before":"c2cca8579ae6e8b98ac7bae3aadbd41391567bc3","commits":[{"sha":"0874e421f7b2d1c5c5428eb10500051c105e7964","author":{"name":"engine-flutter-autoroll","email":"a47edd1763f49b05bae299d69dc4f7760a67278c@skia.org"},"message":"Roll Engine from 9edde7423fba to f0325b6a3d6d (3 revisions) (#86690)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/0874e421f7b2d1c5c5428eb10500051c105e7964"},{"sha":"8802e325a0c5a4890d91840d129273379de13b7b","author":{"name":"Kate Lovett","email":"81c5e0f3070abf35a3b1d7524fc9dd001c6df39a@google.com"},"message":"Revert \"Make LiveTestWidgetsFlutterBinding work with setSurfaceSize and live tests (#86449)\" (#86730)\n\nThis reverts commit cd78190b0caec337a7ed51506d93f9ba20cefa29.","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/8802e325a0c5a4890d91840d129273379de13b7b"},{"sha":"94f71f374f904de336d81fcdcce3a48cbf26639a","author":{"name":"Taha Tesser","email":"f79453d7be905cb01b36f143d132af6b11a4cdb3@gmail.com"},"message":"[flutter_tools] Refactor Android Studio Detection on Windows (support 4.x and 202x releases detection) (#86624)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/94f71f374f904de336d81fcdcce3a48cbf26639a"},{"sha":"2b7b4bdcab1acfb8745a1b69ed395c29e505a079","author":{"name":"Greg Spencer","email":"83f1cccf7fd0a8e921e6f6c34bd822b6ff976e6e@users.noreply.github.com"},"message":"Fix an exception being thrown when focus groups are empty. (#86734)\n\nWhen a focus traversal group has no entries, but traversal is requested, we were throwing an exception because we couldn't find the group marker's scope in the list of candidates. This fixes that, and adds a test.","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/2b7b4bdcab1acfb8745a1b69ed395c29e505a079"},{"sha":"0504fac7e2bc80a6c44ca7fc556033571860ef4c","author":{"name":"Emmanuel Garcia","email":"863f45a983d17b4f7833f956ca6e746b37fb6365@google.com"},"message":"Android e2e screenshot (#84472)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/0504fac7e2bc80a6c44ca7fc556033571860ef4c"},{"sha":"89c8616f0e417a0be0610948d92bb7b9231b82ba","author":{"name":"Taha Tesser","email":"f79453d7be905cb01b36f143d132af6b11a4cdb3@gmail.com"},"message":"fix `_owner` nullability in `routers.dart` (#84840)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/89c8616f0e417a0be0610948d92bb7b9231b82ba"},{"sha":"376584289cc3b3b5a40687fc579cb2530945e3c0","author":{"name":"Arthas","email":"d81fa96e3a020fbaadb9935e27b6386f6c0023d5@163.com"},"message":"Add onPlatformViewCreated to HtmlElementView (#84095)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/376584289cc3b3b5a40687fc579cb2530945e3c0"},{"sha":"841beff5204ebff30b297cf6d4342b6b6db1bb39","author":{"name":"Jeff Ward","email":"bc07e03c2c31887191e05b41bc2bca84fb2ce2d4@willowtreeapps.com"},"message":"Support Float32Lists in StandardMessageCodec (#72613) (#83318)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/841beff5204ebff30b297cf6d4342b6b6db1bb39"},{"sha":"3d47dd851d8ae7bf3dd53f0d08699416f920c7f6","author":{"name":"engine-flutter-autoroll","email":"a47edd1763f49b05bae299d69dc4f7760a67278c@skia.org"},"message":"Roll Engine from f0325b6a3d6d to 19f853d5a733 (14 revisions) (#86725)\n\n* dd4850440 add test for scaled playback of DL and SkPicture (flutter/engine#27503)\r\n\r\n* 791e2dc60 Roll Fuchsia Linux SDK from FGuPZEZLt... to 665qcW5C1... (flutter/engine#27561)\r\n\r\n* dd95642ba Roll Skia from fe49b2c6f41b to 946a4cb8acb7 (9 revisions) (flutter/engine#27564)\r\n\r\n* b47764518 Added a test filter for objc tests (flutter/engine#27566)\r\n\r\n* 6975e55cb Roll Fuchsia Mac SDK from 897eI2xwc... to rQOi2N8BM... (flutter/engine#27572)\r\n\r\n* a0f41b21e Roll Skia from 946a4cb8acb7 to 38a6e5aa1a49 (8 revisions) (flutter/engine#27573)\r\n\r\n* 024dbabee Roll Skia from 38a6e5aa1a49 to 2373b9ed9617 (1 revision) (flutter/engine#27574)\r\n\r\n* 1898563b3 Roll Skia from 2373b9ed9617 to 3f6e8d8864bb (2 revisions) (flutter/engine#27575)\r\n\r\n* ef9ac7539 Roll Skia from 3f6e8d8864bb to b5cd95b58fba (2 revisions) (flutter/engine#27576)\r\n\r\n* 1de3b8778 MacOS: Release backbuffer surface when idle (flutter/engine#27189)\r\n\r\n* a1ed81a37 Roll Skia from b5cd95b58fba to d37bb6ae7248 (1 revision) (flutter/engine#27578)\r\n\r\n* 52b976c3e Extract the prebuilt Dart SDK to a temp directory and then move it after the extraction completes (flutter/engine#27569)\r\n\r\n* 00da6c3d8 Roll Fuchsia Linux SDK from 665qcW5C1... to q6H_ZE5Bs... (flutter/engine#27581)\r\n\r\n* 19f853d5a Roll Dart SDK from b410651bd18e to f82b36d0b4f0 (5 revisions) (flutter/engine#27582)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/3d47dd851d8ae7bf3dd53f0d08699416f920c7f6"},{"sha":"4ab29de67fc98c81d6c0269b427bc60896e32d8a","author":{"name":"Casey Rogers","email":"7cddd715df2ca47c807585b5adbf325fd6b7342b@google.com"},"message":"Cancel DraggableScrollableSheet ballistic animation if a new activity begins (#86614)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/4ab29de67fc98c81d6c0269b427bc60896e32d8a"},{"sha":"d8cdaba085d8b2209bddd3d52a31768650cb6928","author":{"name":"nt4f04uNd","email":"1136cd697587f2df9b91a0f65f7c50518988f322@gmail.com"},"message":"init (#82348)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/d8cdaba085d8b2209bddd3d52a31768650cb6928"},{"sha":"f3d8562c93f19d3288d04875a3672f68e7f530d6","author":{"name":"engine-flutter-autoroll","email":"a47edd1763f49b05bae299d69dc4f7760a67278c@skia.org"},"message":"Roll Engine from 19f853d5a733 to 9b270621e479 (8 revisions) (#86743)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/f3d8562c93f19d3288d04875a3672f68e7f530d6"},{"sha":"b0e51db8d5f0d29603373e34929b8c501bba5354","author":{"name":"Michael Goderbauer","email":"522722b1c28e4103284e3443be8591136ff57aa2@google.com"},"message":"Fixes for upcoming changes to avoid_classes_with_only_static_members (#86744)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/b0e51db8d5f0d29603373e34929b8c501bba5354"},{"sha":"5acf7e98f16222610a4e6bfe1e36b08a90cf53a4","author":{"name":"Zachary Anderson","email":"5eb3a7c582f90a28bb9481c4774e095ba372fd77@users.noreply.github.com"},"message":"Manually close the tree for issue #86754 (#86755)","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/5acf7e98f16222610a4e6bfe1e36b08a90cf53a4"},{"sha":"7fee22c09a99c3f3803fd89a1d6f1e9e6bd9aeb6","author":{"name":"Attila Szabó","email":"aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d@attilaszabo.com"},"message":"Merge branch 'master' into override-mediaquery-reland","distinct":true,"url":"https://api.github.com/repos/atoka93/flutter/commits/7fee22c09a99c3f3803fd89a1d6f1e9e6bd9aeb6"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792416","type":"PublicEvent","actor":{"id":49427541,"login":"op30132","display_login":"op30132","gravatar_id":"","url":"https://api.github.com/users/op30132","avatar_url":"https://avatars.githubusercontent.com/u/49427541?"},"repo":{"id":353660572,"name":"op30132/todo-service","url":"https://api.github.com/repos/op30132/todo-service"},"payload":{},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792423","type":"PullRequestEvent","actor":{"id":87011024,"login":"anhnsq-2596","display_login":"anhnsq-2596","gravatar_id":"","url":"https://api.github.com/users/anhnsq-2596","avatar_url":"https://avatars.githubusercontent.com/u/87011024?"},"repo":{"id":387410570,"name":"anhnsq-2596/project-demo","url":"https://api.github.com/repos/anhnsq-2596/project-demo"},"payload":{"action":"opened","number":3,"pull_request":{"url":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/3","id":694104889,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODg5","html_url":"https://github.com/anhnsq-2596/project-demo/pull/3","diff_url":"https://github.com/anhnsq-2596/project-demo/pull/3.diff","patch_url":"https://github.com/anhnsq-2596/project-demo/pull/3.patch","issue_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/3","number":3,"state":"open","locked":false,"title":"Feature: Login & logout","user":{"login":"anhnsq-2596","id":87011024,"node_id":"MDQ6VXNlcjg3MDExMDI0","avatar_url":"https://avatars.githubusercontent.com/u/87011024?v=4","gravatar_id":"","url":"https://api.github.com/users/anhnsq-2596","html_url":"https://github.com/anhnsq-2596","followers_url":"https://api.github.com/users/anhnsq-2596/followers","following_url":"https://api.github.com/users/anhnsq-2596/following{/other_user}","gists_url":"https://api.github.com/users/anhnsq-2596/gists{/gist_id}","starred_url":"https://api.github.com/users/anhnsq-2596/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anhnsq-2596/subscriptions","organizations_url":"https://api.github.com/users/anhnsq-2596/orgs","repos_url":"https://api.github.com/users/anhnsq-2596/repos","events_url":"https://api.github.com/users/anhnsq-2596/events{/privacy}","received_events_url":"https://api.github.com/users/anhnsq-2596/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-21T07:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/3/commits","review_comments_url":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/3/comments","review_comment_url":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/comments{/number}","comments_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/3/comments","statuses_url":"https://api.github.com/repos/anhnsq-2596/project-demo/statuses/6424da80c9e6db47c57f184f71ed510b5e5b6ee2","head":{"label":"anhnsq-2596:feature/login","ref":"feature/login","sha":"6424da80c9e6db47c57f184f71ed510b5e5b6ee2","user":{"login":"anhnsq-2596","id":87011024,"node_id":"MDQ6VXNlcjg3MDExMDI0","avatar_url":"https://avatars.githubusercontent.com/u/87011024?v=4","gravatar_id":"","url":"https://api.github.com/users/anhnsq-2596","html_url":"https://github.com/anhnsq-2596","followers_url":"https://api.github.com/users/anhnsq-2596/followers","following_url":"https://api.github.com/users/anhnsq-2596/following{/other_user}","gists_url":"https://api.github.com/users/anhnsq-2596/gists{/gist_id}","starred_url":"https://api.github.com/users/anhnsq-2596/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anhnsq-2596/subscriptions","organizations_url":"https://api.github.com/users/anhnsq-2596/orgs","repos_url":"https://api.github.com/users/anhnsq-2596/repos","events_url":"https://api.github.com/users/anhnsq-2596/events{/privacy}","received_events_url":"https://api.github.com/users/anhnsq-2596/received_events","type":"User","site_admin":false},"repo":{"id":387410570,"node_id":"MDEwOlJlcG9zaXRvcnkzODc0MTA1NzA=","name":"project-demo","full_name":"anhnsq-2596/project-demo","private":false,"owner":{"login":"anhnsq-2596","id":87011024,"node_id":"MDQ6VXNlcjg3MDExMDI0","avatar_url":"https://avatars.githubusercontent.com/u/87011024?v=4","gravatar_id":"","url":"https://api.github.com/users/anhnsq-2596","html_url":"https://github.com/anhnsq-2596","followers_url":"https://api.github.com/users/anhnsq-2596/followers","following_url":"https://api.github.com/users/anhnsq-2596/following{/other_user}","gists_url":"https://api.github.com/users/anhnsq-2596/gists{/gist_id}","starred_url":"https://api.github.com/users/anhnsq-2596/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anhnsq-2596/subscriptions","organizations_url":"https://api.github.com/users/anhnsq-2596/orgs","repos_url":"https://api.github.com/users/anhnsq-2596/repos","events_url":"https://api.github.com/users/anhnsq-2596/events{/privacy}","received_events_url":"https://api.github.com/users/anhnsq-2596/received_events","type":"User","site_admin":false},"html_url":"https://github.com/anhnsq-2596/project-demo","description":null,"fork":false,"url":"https://api.github.com/repos/anhnsq-2596/project-demo","forks_url":"https://api.github.com/repos/anhnsq-2596/project-demo/forks","keys_url":"https://api.github.com/repos/anhnsq-2596/project-demo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/anhnsq-2596/project-demo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/anhnsq-2596/project-demo/teams","hooks_url":"https://api.github.com/repos/anhnsq-2596/project-demo/hooks","issue_events_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/events{/number}","events_url":"https://api.github.com/repos/anhnsq-2596/project-demo/events","assignees_url":"https://api.github.com/repos/anhnsq-2596/project-demo/assignees{/user}","branches_url":"https://api.github.com/repos/anhnsq-2596/project-demo/branches{/branch}","tags_url":"https://api.github.com/repos/anhnsq-2596/project-demo/tags","blobs_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/refs{/sha}","trees_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/anhnsq-2596/project-demo/statuses/{sha}","languages_url":"https://api.github.com/repos/anhnsq-2596/project-demo/languages","stargazers_url":"https://api.github.com/repos/anhnsq-2596/project-demo/stargazers","contributors_url":"https://api.github.com/repos/anhnsq-2596/project-demo/contributors","subscribers_url":"https://api.github.com/repos/anhnsq-2596/project-demo/subscribers","subscription_url":"https://api.github.com/repos/anhnsq-2596/project-demo/subscription","commits_url":"https://api.github.com/repos/anhnsq-2596/project-demo/commits{/sha}","git_commits_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/commits{/sha}","comments_url":"https://api.github.com/repos/anhnsq-2596/project-demo/comments{/number}","issue_comment_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/comments{/number}","contents_url":"https://api.github.com/repos/anhnsq-2596/project-demo/contents/{+path}","compare_url":"https://api.github.com/repos/anhnsq-2596/project-demo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/anhnsq-2596/project-demo/merges","archive_url":"https://api.github.com/repos/anhnsq-2596/project-demo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/anhnsq-2596/project-demo/downloads","issues_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues{/number}","pulls_url":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls{/number}","milestones_url":"https://api.github.com/repos/anhnsq-2596/project-demo/milestones{/number}","notifications_url":"https://api.github.com/repos/anhnsq-2596/project-demo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/anhnsq-2596/project-demo/labels{/name}","releases_url":"https://api.github.com/repos/anhnsq-2596/project-demo/releases{/id}","deployments_url":"https://api.github.com/repos/anhnsq-2596/project-demo/deployments","created_at":"2021-07-19T09:32:40Z","updated_at":"2021-07-21T03:11:59Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/anhnsq-2596/project-demo.git","ssh_url":"git@github.com:anhnsq-2596/project-demo.git","clone_url":"https://github.com/anhnsq-2596/project-demo.git","svn_url":"https://github.com/anhnsq-2596/project-demo","homepage":null,"size":223,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"anhnsq-2596:main","ref":"main","sha":"24947f2f69038e711fd132933d20ecbd18068366","user":{"login":"anhnsq-2596","id":87011024,"node_id":"MDQ6VXNlcjg3MDExMDI0","avatar_url":"https://avatars.githubusercontent.com/u/87011024?v=4","gravatar_id":"","url":"https://api.github.com/users/anhnsq-2596","html_url":"https://github.com/anhnsq-2596","followers_url":"https://api.github.com/users/anhnsq-2596/followers","following_url":"https://api.github.com/users/anhnsq-2596/following{/other_user}","gists_url":"https://api.github.com/users/anhnsq-2596/gists{/gist_id}","starred_url":"https://api.github.com/users/anhnsq-2596/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anhnsq-2596/subscriptions","organizations_url":"https://api.github.com/users/anhnsq-2596/orgs","repos_url":"https://api.github.com/users/anhnsq-2596/repos","events_url":"https://api.github.com/users/anhnsq-2596/events{/privacy}","received_events_url":"https://api.github.com/users/anhnsq-2596/received_events","type":"User","site_admin":false},"repo":{"id":387410570,"node_id":"MDEwOlJlcG9zaXRvcnkzODc0MTA1NzA=","name":"project-demo","full_name":"anhnsq-2596/project-demo","private":false,"owner":{"login":"anhnsq-2596","id":87011024,"node_id":"MDQ6VXNlcjg3MDExMDI0","avatar_url":"https://avatars.githubusercontent.com/u/87011024?v=4","gravatar_id":"","url":"https://api.github.com/users/anhnsq-2596","html_url":"https://github.com/anhnsq-2596","followers_url":"https://api.github.com/users/anhnsq-2596/followers","following_url":"https://api.github.com/users/anhnsq-2596/following{/other_user}","gists_url":"https://api.github.com/users/anhnsq-2596/gists{/gist_id}","starred_url":"https://api.github.com/users/anhnsq-2596/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anhnsq-2596/subscriptions","organizations_url":"https://api.github.com/users/anhnsq-2596/orgs","repos_url":"https://api.github.com/users/anhnsq-2596/repos","events_url":"https://api.github.com/users/anhnsq-2596/events{/privacy}","received_events_url":"https://api.github.com/users/anhnsq-2596/received_events","type":"User","site_admin":false},"html_url":"https://github.com/anhnsq-2596/project-demo","description":null,"fork":false,"url":"https://api.github.com/repos/anhnsq-2596/project-demo","forks_url":"https://api.github.com/repos/anhnsq-2596/project-demo/forks","keys_url":"https://api.github.com/repos/anhnsq-2596/project-demo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/anhnsq-2596/project-demo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/anhnsq-2596/project-demo/teams","hooks_url":"https://api.github.com/repos/anhnsq-2596/project-demo/hooks","issue_events_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/events{/number}","events_url":"https://api.github.com/repos/anhnsq-2596/project-demo/events","assignees_url":"https://api.github.com/repos/anhnsq-2596/project-demo/assignees{/user}","branches_url":"https://api.github.com/repos/anhnsq-2596/project-demo/branches{/branch}","tags_url":"https://api.github.com/repos/anhnsq-2596/project-demo/tags","blobs_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/refs{/sha}","trees_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/anhnsq-2596/project-demo/statuses/{sha}","languages_url":"https://api.github.com/repos/anhnsq-2596/project-demo/languages","stargazers_url":"https://api.github.com/repos/anhnsq-2596/project-demo/stargazers","contributors_url":"https://api.github.com/repos/anhnsq-2596/project-demo/contributors","subscribers_url":"https://api.github.com/repos/anhnsq-2596/project-demo/subscribers","subscription_url":"https://api.github.com/repos/anhnsq-2596/project-demo/subscription","commits_url":"https://api.github.com/repos/anhnsq-2596/project-demo/commits{/sha}","git_commits_url":"https://api.github.com/repos/anhnsq-2596/project-demo/git/commits{/sha}","comments_url":"https://api.github.com/repos/anhnsq-2596/project-demo/comments{/number}","issue_comment_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/comments{/number}","contents_url":"https://api.github.com/repos/anhnsq-2596/project-demo/contents/{+path}","compare_url":"https://api.github.com/repos/anhnsq-2596/project-demo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/anhnsq-2596/project-demo/merges","archive_url":"https://api.github.com/repos/anhnsq-2596/project-demo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/anhnsq-2596/project-demo/downloads","issues_url":"https://api.github.com/repos/anhnsq-2596/project-demo/issues{/number}","pulls_url":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls{/number}","milestones_url":"https://api.github.com/repos/anhnsq-2596/project-demo/milestones{/number}","notifications_url":"https://api.github.com/repos/anhnsq-2596/project-demo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/anhnsq-2596/project-demo/labels{/name}","releases_url":"https://api.github.com/repos/anhnsq-2596/project-demo/releases{/id}","deployments_url":"https://api.github.com/repos/anhnsq-2596/project-demo/deployments","created_at":"2021-07-19T09:32:40Z","updated_at":"2021-07-21T03:11:59Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/anhnsq-2596/project-demo.git","ssh_url":"git@github.com:anhnsq-2596/project-demo.git","clone_url":"https://github.com/anhnsq-2596/project-demo.git","svn_url":"https://github.com/anhnsq-2596/project-demo","homepage":null,"size":223,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/3"},"html":{"href":"https://github.com/anhnsq-2596/project-demo/pull/3"},"issue":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/3"},"comments":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/issues/3/comments"},"review_comments":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/3/comments"},"review_comment":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/pulls/3/commits"},"statuses":{"href":"https://api.github.com/repos/anhnsq-2596/project-demo/statuses/6424da80c9e6db47c57f184f71ed510b5e5b6ee2"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":409,"deletions":34,"changed_files":32}},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792424","type":"PullRequestEvent","actor":{"id":15313630,"login":"michaelWuensch","display_login":"michaelWuensch","gravatar_id":"","url":"https://api.github.com/users/michaelWuensch","avatar_url":"https://avatars.githubusercontent.com/u/15313630?"},"repo":{"id":160931942,"name":"LN-Zap/zap-android","url":"https://api.github.com/repos/LN-Zap/zap-android"},"payload":{"action":"closed","number":342,"pull_request":{"url":"https://api.github.com/repos/LN-Zap/zap-android/pulls/342","id":694102096,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTAyMDk2","html_url":"https://github.com/LN-Zap/zap-android/pull/342","diff_url":"https://github.com/LN-Zap/zap-android/pull/342.diff","patch_url":"https://github.com/LN-Zap/zap-android/pull/342.patch","issue_url":"https://api.github.com/repos/LN-Zap/zap-android/issues/342","number":342,"state":"closed","locked":false,"title":"Fix wallet status dot","user":{"login":"michaelWuensch","id":15313630,"node_id":"MDQ6VXNlcjE1MzEzNjMw","avatar_url":"https://avatars.githubusercontent.com/u/15313630?v=4","gravatar_id":"","url":"https://api.github.com/users/michaelWuensch","html_url":"https://github.com/michaelWuensch","followers_url":"https://api.github.com/users/michaelWuensch/followers","following_url":"https://api.github.com/users/michaelWuensch/following{/other_user}","gists_url":"https://api.github.com/users/michaelWuensch/gists{/gist_id}","starred_url":"https://api.github.com/users/michaelWuensch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michaelWuensch/subscriptions","organizations_url":"https://api.github.com/users/michaelWuensch/orgs","repos_url":"https://api.github.com/users/michaelWuensch/repos","events_url":"https://api.github.com/users/michaelWuensch/events{/privacy}","received_events_url":"https://api.github.com/users/michaelWuensch/received_events","type":"User","site_admin":false},"body":"<!--- Provide a general summary of your changes in the Title above -->\r\n\r\n## Description\r\n<!--- Describe your changes in detail -->\r\nMoved the update function of the dot from onCreate() to onResume() so it gets updated when minimizing and maximizing again.\r\nMade the dot also visible on long wallet names. (before it was moved out of screen)\r\n\r\n## Motivation and Context\r\n<!--- Why is this change required? What problem does it solve? -->\r\n<!--- If it fixes an open issue, please link to the issue here. -->\r\nThe status dot helps to see if a working lnd connection was established. It was invisible on long wallet names, so there was no indication at all if after bringing the app to foreground again the connection was actually working.\r\nThis should improve UX.\r\n\r\n## How Has This Been Tested?\r\n<!--- Please describe in detail how you tested your changes. -->\r\n<!--- Include details of your testing environment, and the tests you ran to -->\r\n<!--- see how your change affects other areas of the code, etc. -->\r\nMy S9 with very long tor name from umbrel\r\n\r\n## Types of changes\r\n<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->\r\n- [x] Bug fix (non-breaking change which fixes an issue)\r\n- [ ] New feature (non-breaking change which adds functionality)\r\n- [ ] Breaking change (fix or feature that would cause existing functionality to change)\r\n\r\n## Checklist:\r\n<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->\r\n<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->\r\n- [x] My code follows the code style of this project.\r\n- [ ] My change requires a change to the documentation.\r\n- [ ] I have updated the documentation accordingly.\r\n- [x] I have read the [Contribution document](../docs/CONTRIBUTING.md).\r\n- [ ] I have added tests to cover my changes.\r\n- [x] All new and existing tests passed.","created_at":"2021-07-21T06:54:55Z","updated_at":"2021-07-21T07:00:04Z","closed_at":"2021-07-21T07:00:03Z","merged_at":"2021-07-21T07:00:03Z","merge_commit_sha":"06df1ad43954195ed198ed64b238c184ec80b711","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/LN-Zap/zap-android/pulls/342/commits","review_comments_url":"https://api.github.com/repos/LN-Zap/zap-android/pulls/342/comments","review_comment_url":"https://api.github.com/repos/LN-Zap/zap-android/pulls/comments{/number}","comments_url":"https://api.github.com/repos/LN-Zap/zap-android/issues/342/comments","statuses_url":"https://api.github.com/repos/LN-Zap/zap-android/statuses/74bcbe9b26aabc1d258495bec951759984ecc8f5","head":{"label":"michaelWuensch:FixWalletStatusDot","ref":"FixWalletStatusDot","sha":"74bcbe9b26aabc1d258495bec951759984ecc8f5","user":{"login":"michaelWuensch","id":15313630,"node_id":"MDQ6VXNlcjE1MzEzNjMw","avatar_url":"https://avatars.githubusercontent.com/u/15313630?v=4","gravatar_id":"","url":"https://api.github.com/users/michaelWuensch","html_url":"https://github.com/michaelWuensch","followers_url":"https://api.github.com/users/michaelWuensch/followers","following_url":"https://api.github.com/users/michaelWuensch/following{/other_user}","gists_url":"https://api.github.com/users/michaelWuensch/gists{/gist_id}","starred_url":"https://api.github.com/users/michaelWuensch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michaelWuensch/subscriptions","organizations_url":"https://api.github.com/users/michaelWuensch/orgs","repos_url":"https://api.github.com/users/michaelWuensch/repos","events_url":"https://api.github.com/users/michaelWuensch/events{/privacy}","received_events_url":"https://api.github.com/users/michaelWuensch/received_events","type":"User","site_admin":false},"repo":{"id":191994403,"node_id":"MDEwOlJlcG9zaXRvcnkxOTE5OTQ0MDM=","name":"zap-android","full_name":"michaelWuensch/zap-android","private":false,"owner":{"login":"michaelWuensch","id":15313630,"node_id":"MDQ6VXNlcjE1MzEzNjMw","avatar_url":"https://avatars.githubusercontent.com/u/15313630?v=4","gravatar_id":"","url":"https://api.github.com/users/michaelWuensch","html_url":"https://github.com/michaelWuensch","followers_url":"https://api.github.com/users/michaelWuensch/followers","following_url":"https://api.github.com/users/michaelWuensch/following{/other_user}","gists_url":"https://api.github.com/users/michaelWuensch/gists{/gist_id}","starred_url":"https://api.github.com/users/michaelWuensch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michaelWuensch/subscriptions","organizations_url":"https://api.github.com/users/michaelWuensch/orgs","repos_url":"https://api.github.com/users/michaelWuensch/repos","events_url":"https://api.github.com/users/michaelWuensch/events{/privacy}","received_events_url":"https://api.github.com/users/michaelWuensch/received_events","type":"User","site_admin":false},"html_url":"https://github.com/michaelWuensch/zap-android","description":"Native android lightning wallet focused on user experience and ease of use ⚡️","fork":true,"url":"https://api.github.com/repos/michaelWuensch/zap-android","forks_url":"https://api.github.com/repos/michaelWuensch/zap-android/forks","keys_url":"https://api.github.com/repos/michaelWuensch/zap-android/keys{/key_id}","collaborators_url":"https://api.github.com/repos/michaelWuensch/zap-android/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/michaelWuensch/zap-android/teams","hooks_url":"https://api.github.com/repos/michaelWuensch/zap-android/hooks","issue_events_url":"https://api.github.com/repos/michaelWuensch/zap-android/issues/events{/number}","events_url":"https://api.github.com/repos/michaelWuensch/zap-android/events","assignees_url":"https://api.github.com/repos/michaelWuensch/zap-android/assignees{/user}","branches_url":"https://api.github.com/repos/michaelWuensch/zap-android/branches{/branch}","tags_url":"https://api.github.com/repos/michaelWuensch/zap-android/tags","blobs_url":"https://api.github.com/repos/michaelWuensch/zap-android/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/michaelWuensch/zap-android/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/michaelWuensch/zap-android/git/refs{/sha}","trees_url":"https://api.github.com/repos/michaelWuensch/zap-android/git/trees{/sha}","statuses_url":"https://api.github.com/repos/michaelWuensch/zap-android/statuses/{sha}","languages_url":"https://api.github.com/repos/michaelWuensch/zap-android/languages","stargazers_url":"https://api.github.com/repos/michaelWuensch/zap-android/stargazers","contributors_url":"https://api.github.com/repos/michaelWuensch/zap-android/contributors","subscribers_url":"https://api.github.com/repos/michaelWuensch/zap-android/subscribers","subscription_url":"https://api.github.com/repos/michaelWuensch/zap-android/subscription","commits_url":"https://api.github.com/repos/michaelWuensch/zap-android/commits{/sha}","git_commits_url":"https://api.github.com/repos/michaelWuensch/zap-android/git/commits{/sha}","comments_url":"https://api.github.com/repos/michaelWuensch/zap-android/comments{/number}","issue_comment_url":"https://api.github.com/repos/michaelWuensch/zap-android/issues/comments{/number}","contents_url":"https://api.github.com/repos/michaelWuensch/zap-android/contents/{+path}","compare_url":"https://api.github.com/repos/michaelWuensch/zap-android/compare/{base}...{head}","merges_url":"https://api.github.com/repos/michaelWuensch/zap-android/merges","archive_url":"https://api.github.com/repos/michaelWuensch/zap-android/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/michaelWuensch/zap-android/downloads","issues_url":"https://api.github.com/repos/michaelWuensch/zap-android/issues{/number}","pulls_url":"https://api.github.com/repos/michaelWuensch/zap-android/pulls{/number}","milestones_url":"https://api.github.com/repos/michaelWuensch/zap-android/milestones{/number}","notifications_url":"https://api.github.com/repos/michaelWuensch/zap-android/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/michaelWuensch/zap-android/labels{/name}","releases_url":"https://api.github.com/repos/michaelWuensch/zap-android/releases{/id}","deployments_url":"https://api.github.com/repos/michaelWuensch/zap-android/deployments","created_at":"2019-06-14T19:16:02Z","updated_at":"2021-07-18T10:53:58Z","pushed_at":"2021-07-21T06:55:24Z","git_url":"git://github.com/michaelWuensch/zap-android.git","ssh_url":"git@github.com:michaelWuensch/zap-android.git","clone_url":"https://github.com/michaelWuensch/zap-android.git","svn_url":"https://github.com/michaelWuensch/zap-android","homepage":"","size":3959,"stargazers_count":1,"watchers_count":1,"language":"Java","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"base":{"label":"LN-Zap:master","ref":"master","sha":"7e2d404c4905b60ae608c9c3756f4f214aff0301","user":{"login":"LN-Zap","id":30905490,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMwOTA1NDkw","avatar_url":"https://avatars.githubusercontent.com/u/30905490?v=4","gravatar_id":"","url":"https://api.github.com/users/LN-Zap","html_url":"https://github.com/LN-Zap","followers_url":"https://api.github.com/users/LN-Zap/followers","following_url":"https://api.github.com/users/LN-Zap/following{/other_user}","gists_url":"https://api.github.com/users/LN-Zap/gists{/gist_id}","starred_url":"https://api.github.com/users/LN-Zap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LN-Zap/subscriptions","organizations_url":"https://api.github.com/users/LN-Zap/orgs","repos_url":"https://api.github.com/users/LN-Zap/repos","events_url":"https://api.github.com/users/LN-Zap/events{/privacy}","received_events_url":"https://api.github.com/users/LN-Zap/received_events","type":"Organization","site_admin":false},"repo":{"id":160931942,"node_id":"MDEwOlJlcG9zaXRvcnkxNjA5MzE5NDI=","name":"zap-android","full_name":"LN-Zap/zap-android","private":false,"owner":{"login":"LN-Zap","id":30905490,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMwOTA1NDkw","avatar_url":"https://avatars.githubusercontent.com/u/30905490?v=4","gravatar_id":"","url":"https://api.github.com/users/LN-Zap","html_url":"https://github.com/LN-Zap","followers_url":"https://api.github.com/users/LN-Zap/followers","following_url":"https://api.github.com/users/LN-Zap/following{/other_user}","gists_url":"https://api.github.com/users/LN-Zap/gists{/gist_id}","starred_url":"https://api.github.com/users/LN-Zap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LN-Zap/subscriptions","organizations_url":"https://api.github.com/users/LN-Zap/orgs","repos_url":"https://api.github.com/users/LN-Zap/repos","events_url":"https://api.github.com/users/LN-Zap/events{/privacy}","received_events_url":"https://api.github.com/users/LN-Zap/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/LN-Zap/zap-android","description":"Native android lightning wallet focused on user experience and ease of use ⚡️","fork":false,"url":"https://api.github.com/repos/LN-Zap/zap-android","forks_url":"https://api.github.com/repos/LN-Zap/zap-android/forks","keys_url":"https://api.github.com/repos/LN-Zap/zap-android/keys{/key_id}","collaborators_url":"https://api.github.com/repos/LN-Zap/zap-android/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/LN-Zap/zap-android/teams","hooks_url":"https://api.github.com/repos/LN-Zap/zap-android/hooks","issue_events_url":"https://api.github.com/repos/LN-Zap/zap-android/issues/events{/number}","events_url":"https://api.github.com/repos/LN-Zap/zap-android/events","assignees_url":"https://api.github.com/repos/LN-Zap/zap-android/assignees{/user}","branches_url":"https://api.github.com/repos/LN-Zap/zap-android/branches{/branch}","tags_url":"https://api.github.com/repos/LN-Zap/zap-android/tags","blobs_url":"https://api.github.com/repos/LN-Zap/zap-android/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/LN-Zap/zap-android/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/LN-Zap/zap-android/git/refs{/sha}","trees_url":"https://api.github.com/repos/LN-Zap/zap-android/git/trees{/sha}","statuses_url":"https://api.github.com/repos/LN-Zap/zap-android/statuses/{sha}","languages_url":"https://api.github.com/repos/LN-Zap/zap-android/languages","stargazers_url":"https://api.github.com/repos/LN-Zap/zap-android/stargazers","contributors_url":"https://api.github.com/repos/LN-Zap/zap-android/contributors","subscribers_url":"https://api.github.com/repos/LN-Zap/zap-android/subscribers","subscription_url":"https://api.github.com/repos/LN-Zap/zap-android/subscription","commits_url":"https://api.github.com/repos/LN-Zap/zap-android/commits{/sha}","git_commits_url":"https://api.github.com/repos/LN-Zap/zap-android/git/commits{/sha}","comments_url":"https://api.github.com/repos/LN-Zap/zap-android/comments{/number}","issue_comment_url":"https://api.github.com/repos/LN-Zap/zap-android/issues/comments{/number}","contents_url":"https://api.github.com/repos/LN-Zap/zap-android/contents/{+path}","compare_url":"https://api.github.com/repos/LN-Zap/zap-android/compare/{base}...{head}","merges_url":"https://api.github.com/repos/LN-Zap/zap-android/merges","archive_url":"https://api.github.com/repos/LN-Zap/zap-android/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/LN-Zap/zap-android/downloads","issues_url":"https://api.github.com/repos/LN-Zap/zap-android/issues{/number}","pulls_url":"https://api.github.com/repos/LN-Zap/zap-android/pulls{/number}","milestones_url":"https://api.github.com/repos/LN-Zap/zap-android/milestones{/number}","notifications_url":"https://api.github.com/repos/LN-Zap/zap-android/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/LN-Zap/zap-android/labels{/name}","releases_url":"https://api.github.com/repos/LN-Zap/zap-android/releases{/id}","deployments_url":"https://api.github.com/repos/LN-Zap/zap-android/deployments","created_at":"2018-12-08T11:21:11Z","updated_at":"2021-07-18T10:52:50Z","pushed_at":"2021-07-21T07:00:03Z","git_url":"git://github.com/LN-Zap/zap-android.git","ssh_url":"git@github.com:LN-Zap/zap-android.git","clone_url":"https://github.com/LN-Zap/zap-android.git","svn_url":"https://github.com/LN-Zap/zap-android","homepage":"","size":3951,"stargazers_count":79,"watchers_count":79,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":33,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":23,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":33,"open_issues":23,"watchers":79,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/LN-Zap/zap-android/pulls/342"},"html":{"href":"https://github.com/LN-Zap/zap-android/pull/342"},"issue":{"href":"https://api.github.com/repos/LN-Zap/zap-android/issues/342"},"comments":{"href":"https://api.github.com/repos/LN-Zap/zap-android/issues/342/comments"},"review_comments":{"href":"https://api.github.com/repos/LN-Zap/zap-android/pulls/342/comments"},"review_comment":{"href":"https://api.github.com/repos/LN-Zap/zap-android/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/LN-Zap/zap-android/pulls/342/commits"},"statuses":{"href":"https://api.github.com/repos/LN-Zap/zap-android/statuses/74bcbe9b26aabc1d258495bec951759984ecc8f5"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"michaelWuensch","id":15313630,"node_id":"MDQ6VXNlcjE1MzEzNjMw","avatar_url":"https://avatars.githubusercontent.com/u/15313630?v=4","gravatar_id":"","url":"https://api.github.com/users/michaelWuensch","html_url":"https://github.com/michaelWuensch","followers_url":"https://api.github.com/users/michaelWuensch/followers","following_url":"https://api.github.com/users/michaelWuensch/following{/other_user}","gists_url":"https://api.github.com/users/michaelWuensch/gists{/gist_id}","starred_url":"https://api.github.com/users/michaelWuensch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michaelWuensch/subscriptions","organizations_url":"https://api.github.com/users/michaelWuensch/orgs","repos_url":"https://api.github.com/users/michaelWuensch/repos","events_url":"https://api.github.com/users/michaelWuensch/events{/privacy}","received_events_url":"https://api.github.com/users/michaelWuensch/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":21,"deletions":10,"changed_files":4}},"public":true,"created_at":"2021-07-21T07:00:04Z","org":{"id":30905490,"login":"LN-Zap","gravatar_id":"","url":"https://api.github.com/orgs/LN-Zap","avatar_url":"https://avatars.githubusercontent.com/u/30905490?"}}
+{"id":"17244792427","type":"PushEvent","actor":{"id":75016136,"login":"CastformMadrid","display_login":"CastformMadrid","gravatar_id":"","url":"https://api.github.com/users/CastformMadrid","avatar_url":"https://avatars.githubusercontent.com/u/75016136?"},"repo":{"id":315383656,"name":"alexelgt/Castform-Madrid","url":"https://api.github.com/repos/alexelgt/Castform-Madrid"},"payload":{"push_id":7561706470,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"c18ce1429a65e78d4052a2f525048fc3d71c1012","before":"3d9daadb9745e005cd35fa866be64e59aa8bb67f","commits":[{"sha":"c18ce1429a65e78d4052a2f525048fc3d71c1012","author":{"name":"CastformMadrid","email":"4bf3034b7f6dbaf30fedab8adaf278c90d929f80@gmail.com"},"message":"21/7/2021 09:00","distinct":true,"url":"https://api.github.com/repos/alexelgt/Castform-Madrid/commits/c18ce1429a65e78d4052a2f525048fc3d71c1012"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792435","type":"PushEvent","actor":{"id":541490,"login":"morrah","display_login":"morrah","gravatar_id":"","url":"https://api.github.com/users/morrah","avatar_url":"https://avatars.githubusercontent.com/u/541490?"},"repo":{"id":224001345,"name":"morrah/oro-market","url":"https://api.github.com/repos/morrah/oro-market"},"payload":{"push_id":7561706466,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"dea50f42eb9399854a65ed60ffa85f781fa84fe1","before":"45534b305f87bacad5e0a99a21aca8bcb43e2d91","commits":[{"sha":"dea50f42eb9399854a65ed60ffa85f781fa84fe1","author":{"name":"morrah","email":"5b2d4826958c41aa3d7920ac238926453de1302d@users.noreply.github.com"},"message":"data update","distinct":true,"url":"https://api.github.com/repos/morrah/oro-market/commits/dea50f42eb9399854a65ed60ffa85f781fa84fe1"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792437","type":"PushEvent","actor":{"id":524596,"login":"Varriount","display_login":"Varriount","gravatar_id":"","url":"https://api.github.com/users/Varriount","avatar_url":"https://avatars.githubusercontent.com/u/524596?"},"repo":{"id":378265592,"name":"Varriount/Yoyo","url":"https://api.github.com/repos/Varriount/Yoyo"},"payload":{"push_id":7561706455,"size":0,"distinct_size":0,"ref":"refs/heads/snowflake","head":"2d9a38d8134ef2d1a267a5fe8e83ee714f832e08","before":"2d9a38d8134ef2d1a267a5fe8e83ee714f832e08","commits":[]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792443","type":"PushEvent","actor":{"id":32645537,"login":"Beziel","display_login":"Beziel","gravatar_id":"","url":"https://api.github.com/users/Beziel","avatar_url":"https://avatars.githubusercontent.com/u/32645537?"},"repo":{"id":388022780,"name":"Beziel/demo-gitflow","url":"https://api.github.com/repos/Beziel/demo-gitflow"},"payload":{"push_id":7561706463,"size":3,"distinct_size":1,"ref":"refs/heads/main","head":"6f6d75cd1d878d21f95fa8873c3c21088d4106fe","before":"18c286a19563567013176cc441b849d1835536b5","commits":[{"sha":"2795c9da9e64b098a686668608e43424ad691bd2","author":{"name":"jenkins","email":"d95b56ce41a2e1ac4cecdd398defd7414407cc08@test.com"},"message":"[maven-release-plugin] prepare release v1.0.0","distinct":false,"url":"https://api.github.com/repos/Beziel/demo-gitflow/commits/2795c9da9e64b098a686668608e43424ad691bd2"},{"sha":"2fa94f06b8eb3319ddc8bb7984a91d71da44529d","author":{"name":"jenkins","email":"d95b56ce41a2e1ac4cecdd398defd7414407cc08@test.com"},"message":"[maven-release-plugin] prepare for next development iteration","distinct":false,"url":"https://api.github.com/repos/Beziel/demo-gitflow/commits/2fa94f06b8eb3319ddc8bb7984a91d71da44529d"},{"sha":"6f6d75cd1d878d21f95fa8873c3c21088d4106fe","author":{"name":"Beziel","email":"509f91063c05dda398f8d14637739901cbfe86cc@users.noreply.github.com"},"message":"Merge pull request #1 from Beziel/release/1.0.0\n\nRelease/1.0.0","distinct":true,"url":"https://api.github.com/repos/Beziel/demo-gitflow/commits/6f6d75cd1d878d21f95fa8873c3c21088d4106fe"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792444","type":"PushEvent","actor":{"id":25794267,"login":"abhi1122","display_login":"abhi1122","gravatar_id":"","url":"https://api.github.com/users/abhi1122","avatar_url":"https://avatars.githubusercontent.com/u/25794267?"},"repo":{"id":231720120,"name":"abhi1122/react-test","url":"https://api.github.com/repos/abhi1122/react-test"},"payload":{"push_id":7561706474,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"31c7c535ec80c9283e2890aaa05b111550d1218e","before":"90402ab6857a68864515bc13814f5a5e7e9b355b","commits":[{"sha":"31c7c535ec80c9283e2890aaa05b111550d1218e","author":{"name":"abhi1122","email":"a0e3c6ad9773afc14a8b2586a4e93f1f865645b1@gmail.com"},"message":"Update Jenkinsfile","distinct":true,"url":"https://api.github.com/repos/abhi1122/react-test/commits/31c7c535ec80c9283e2890aaa05b111550d1218e"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792447","type":"PushEvent","actor":{"id":85440641,"login":"sun0225","display_login":"sun0225","gravatar_id":"","url":"https://api.github.com/users/sun0225","avatar_url":"https://avatars.githubusercontent.com/u/85440641?"},"repo":{"id":374349858,"name":"sun0225/fei","url":"https://api.github.com/repos/sun0225/fei"},"payload":{"push_id":7561706469,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"9096a3a775114690bd129f504914291ee3a0f0ff","before":"91c2c4f25b64e182d572304c141ba09a5157f784","commits":[{"sha":"9096a3a775114690bd129f504914291ee3a0f0ff","author":{"name":"sun0225","email":"3eb5f2ff8c6c14e9452b3144893767da3bb7dd0e@qq.com"},"message":"Add files via upload","distinct":true,"url":"https://api.github.com/repos/sun0225/fei/commits/9096a3a775114690bd129f504914291ee3a0f0ff"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792461","type":"ForkEvent","actor":{"id":11326721,"login":"zhaijf1992","display_login":"zhaijf1992","gravatar_id":"","url":"https://api.github.com/users/zhaijf1992","avatar_url":"https://avatars.githubusercontent.com/u/11326721?"},"repo":{"id":180340000,"name":"cookcodeblog/OneDayDevOps","url":"https://api.github.com/repos/cookcodeblog/OneDayDevOps"},"payload":{"forkee":{"id":388024737,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMjQ3Mzc=","name":"OneDayDevOps","full_name":"zhaijf1992/OneDayDevOps","private":false,"owner":{"login":"zhaijf1992","id":11326721,"node_id":"MDQ6VXNlcjExMzI2NzIx","avatar_url":"https://avatars.githubusercontent.com/u/11326721?v=4","gravatar_id":"","url":"https://api.github.com/users/zhaijf1992","html_url":"https://github.com/zhaijf1992","followers_url":"https://api.github.com/users/zhaijf1992/followers","following_url":"https://api.github.com/users/zhaijf1992/following{/other_user}","gists_url":"https://api.github.com/users/zhaijf1992/gists{/gist_id}","starred_url":"https://api.github.com/users/zhaijf1992/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zhaijf1992/subscriptions","organizations_url":"https://api.github.com/users/zhaijf1992/orgs","repos_url":"https://api.github.com/users/zhaijf1992/repos","events_url":"https://api.github.com/users/zhaijf1992/events{/privacy}","received_events_url":"https://api.github.com/users/zhaijf1992/received_events","type":"User","site_admin":false},"html_url":"https://github.com/zhaijf1992/OneDayDevOps","description":"Build a DevOps platform in one day using open source components","fork":true,"url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps","forks_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/forks","keys_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/teams","hooks_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/hooks","issue_events_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/issues/events{/number}","events_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/events","assignees_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/assignees{/user}","branches_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/branches{/branch}","tags_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/tags","blobs_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/git/refs{/sha}","trees_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/statuses/{sha}","languages_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/languages","stargazers_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/stargazers","contributors_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/contributors","subscribers_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/subscribers","subscription_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/subscription","commits_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/commits{/sha}","git_commits_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/git/commits{/sha}","comments_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/comments{/number}","issue_comment_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/issues/comments{/number}","contents_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/contents/{+path}","compare_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/merges","archive_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/downloads","issues_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/issues{/number}","pulls_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/pulls{/number}","milestones_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/milestones{/number}","notifications_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/labels{/name}","releases_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/releases{/id}","deployments_url":"https://api.github.com/repos/zhaijf1992/OneDayDevOps/deployments","created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-06T17:07:51Z","pushed_at":"2020-11-13T03:25:52Z","git_url":"git://github.com/zhaijf1992/OneDayDevOps.git","ssh_url":"git@github.com:zhaijf1992/OneDayDevOps.git","clone_url":"https://github.com/zhaijf1992/OneDayDevOps.git","svn_url":"https://github.com/zhaijf1992/OneDayDevOps","homepage":"https://blog.csdn.net/nklinsirui/article/details/89416151","size":79,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master","public":true}},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792465","type":"PushEvent","actor":{"id":57280724,"login":"112312","display_login":"112312","gravatar_id":"","url":"https://api.github.com/users/112312","avatar_url":"https://avatars.githubusercontent.com/u/57280724?"},"repo":{"id":222697611,"name":"112312/112312.github.io","url":"https://api.github.com/repos/112312/112312.github.io"},"payload":{"push_id":7561706476,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9e2d6788b56e1ea3e7242f87a79b2037a930f02f","before":"6f1420fe5e2a3761e191f4ec377e4a863bcc0f6a","commits":[{"sha":"9e2d6788b56e1ea3e7242f87a79b2037a930f02f","author":{"name":"NDFS","email":"a75a20f6cc7e06672d35a787e265ec9a92575273@users.noreply.github.com"},"message":"Delete 1.png","distinct":true,"url":"https://api.github.com/repos/112312/112312.github.io/commits/9e2d6788b56e1ea3e7242f87a79b2037a930f02f"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792469","type":"WatchEvent","actor":{"id":6847747,"login":"duqb","display_login":"duqb","gravatar_id":"","url":"https://api.github.com/users/duqb","avatar_url":"https://avatars.githubusercontent.com/u/6847747?"},"repo":{"id":196664765,"name":"pwstrick/daily","url":"https://api.github.com/repos/pwstrick/daily"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792470","type":"PushEvent","actor":{"id":2738836,"login":"Mgamerz","display_login":"Mgamerz","gravatar_id":"","url":"https://api.github.com/users/Mgamerz","avatar_url":"https://avatars.githubusercontent.com/u/2738836?"},"repo":{"id":206195000,"name":"ME3Tweaks/ME3TweaksModManager","url":"https://api.github.com/repos/ME3Tweaks/ME3TweaksModManager"},"payload":{"push_id":7561706475,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"df3127756ddadf63d46c740616b9500cef2ec3b1","before":"8721baf7e39ce1399f933bb8b27d323e7afe880d","commits":[{"sha":"df3127756ddadf63d46c740616b9500cef2ec3b1","author":{"name":"ME3Tweaks-Github-Sync","email":"77da312b502727c949f6f457441753cc14a6e2a5@me3tweaks.com"},"message":"Synchronize Fallback Startup Manifest to GitHub","distinct":true,"url":"https://api.github.com/repos/ME3Tweaks/ME3TweaksModManager/commits/df3127756ddadf63d46c740616b9500cef2ec3b1"}]},"public":true,"created_at":"2021-07-21T07:00:04Z","org":{"id":49797801,"login":"ME3Tweaks","gravatar_id":"","url":"https://api.github.com/orgs/ME3Tweaks","avatar_url":"https://avatars.githubusercontent.com/u/49797801?"}}
+{"id":"17244792471","type":"PushEvent","actor":{"id":35090897,"login":"geekyorion","display_login":"geekyorion","gravatar_id":"","url":"https://api.github.com/users/geekyorion","avatar_url":"https://avatars.githubusercontent.com/u/35090897?"},"repo":{"id":228024960,"name":"geekyorion/devSocialMedia","url":"https://api.github.com/repos/geekyorion/devSocialMedia"},"payload":{"push_id":7561706478,"size":1,"distinct_size":1,"ref":"refs/heads/gitDeploy","head":"ee7ccfb324ccb248f41ba25a8c94e1cc7968810f","before":"daa9132de5bb82fcf1c50cd8fc0fddb9ccf8efd0","commits":[{"sha":"ee7ccfb324ccb248f41ba25a8c94e1cc7968810f","author":{"name":"Shashank Sharma","email":"2582e3ba67800baed5efa2e724dcf8229e9cf50b@users.noreply.github.com"},"message":"Update gitDeploy.js.yml","distinct":true,"url":"https://api.github.com/repos/geekyorion/devSocialMedia/commits/ee7ccfb324ccb248f41ba25a8c94e1cc7968810f"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792472","type":"PushEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388024725,"name":"thatjohn01/781116602","url":"https://api.github.com/repos/thatjohn01/781116602"},"payload":{"push_id":7561706483,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"3f38aabeeda7a9c59a4240a36f7bd3632ce86b73","before":"ff90d91d59bf59426cc444c626dc81d72348987e","commits":[{"sha":"3f38aabeeda7a9c59a4240a36f7bd3632ce86b73","author":{"name":"thatjohn01","email":"72eb81e66410b3da65da4cca287ce0578825ce64@users.noreply.github.com"},"message":"change README.md","distinct":true,"url":"https://api.github.com/repos/thatjohn01/781116602/commits/3f38aabeeda7a9c59a4240a36f7bd3632ce86b73"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792482","type":"PullRequestEvent","actor":{"id":49731213,"login":"s-hadinger","display_login":"s-hadinger","gravatar_id":"","url":"https://api.github.com/users/s-hadinger","avatar_url":"https://avatars.githubusercontent.com/u/49731213?"},"repo":{"id":80286288,"name":"arendst/Tasmota","url":"https://api.github.com/repos/arendst/Tasmota"},"payload":{"action":"closed","number":12711,"pull_request":{"url":"https://api.github.com/repos/arendst/Tasmota/pulls/12711","id":693818589,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzODE4NTg5","html_url":"https://github.com/arendst/Tasmota/pull/12711","diff_url":"https://github.com/arendst/Tasmota/pull/12711.diff","patch_url":"https://github.com/arendst/Tasmota/pull/12711.patch","issue_url":"https://api.github.com/repos/arendst/Tasmota/issues/12711","number":12711,"state":"closed","locked":false,"title":"Berry add tasmota.publish_result","user":{"login":"s-hadinger","id":49731213,"node_id":"MDQ6VXNlcjQ5NzMxMjEz","avatar_url":"https://avatars.githubusercontent.com/u/49731213?v=4","gravatar_id":"","url":"https://api.github.com/users/s-hadinger","html_url":"https://github.com/s-hadinger","followers_url":"https://api.github.com/users/s-hadinger/followers","following_url":"https://api.github.com/users/s-hadinger/following{/other_user}","gists_url":"https://api.github.com/users/s-hadinger/gists{/gist_id}","starred_url":"https://api.github.com/users/s-hadinger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/s-hadinger/subscriptions","organizations_url":"https://api.github.com/users/s-hadinger/orgs","repos_url":"https://api.github.com/users/s-hadinger/repos","events_url":"https://api.github.com/users/s-hadinger/events{/privacy}","received_events_url":"https://api.github.com/users/s-hadinger/received_events","type":"User","site_admin":false},"body":"## Description:\r\n\r\nAdd Berry `tasmota.publish_result(payload:string, subtopic:string)` to publish a result as JSON and trigger any potential rule.\r\n\r\n## Checklist:\r\n  - [x] The pull request is done against the latest development branch\r\n  - [x] Only relevant files were touched\r\n  - [x] Only one feature/fix was added per PR and the code change compiles without warnings\r\n  - [ ] The code change is tested and works with Tasmota core ESP8266 V.2.7.4.9\r\n  - [x] The code change is tested and works with Tasmota core ESP32 V.1.0.7.2\r\n  - [x] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).\r\n\r\n_NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_\r\n","created_at":"2021-07-20T20:32:32Z","updated_at":"2021-07-21T07:00:04Z","closed_at":"2021-07-21T07:00:04Z","merged_at":"2021-07-21T07:00:04Z","merge_commit_sha":"4fb8f679d73feb333bbff6593e300101ac5d1baa","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/arendst/Tasmota/pulls/12711/commits","review_comments_url":"https://api.github.com/repos/arendst/Tasmota/pulls/12711/comments","review_comment_url":"https://api.github.com/repos/arendst/Tasmota/pulls/comments{/number}","comments_url":"https://api.github.com/repos/arendst/Tasmota/issues/12711/comments","statuses_url":"https://api.github.com/repos/arendst/Tasmota/statuses/0539e8ec32d8f202c89af3e5731db11807970295","head":{"label":"s-hadinger:berry_publish_result","ref":"berry_publish_result","sha":"0539e8ec32d8f202c89af3e5731db11807970295","user":{"login":"s-hadinger","id":49731213,"node_id":"MDQ6VXNlcjQ5NzMxMjEz","avatar_url":"https://avatars.githubusercontent.com/u/49731213?v=4","gravatar_id":"","url":"https://api.github.com/users/s-hadinger","html_url":"https://github.com/s-hadinger","followers_url":"https://api.github.com/users/s-hadinger/followers","following_url":"https://api.github.com/users/s-hadinger/following{/other_user}","gists_url":"https://api.github.com/users/s-hadinger/gists{/gist_id}","starred_url":"https://api.github.com/users/s-hadinger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/s-hadinger/subscriptions","organizations_url":"https://api.github.com/users/s-hadinger/orgs","repos_url":"https://api.github.com/users/s-hadinger/repos","events_url":"https://api.github.com/users/s-hadinger/events{/privacy}","received_events_url":"https://api.github.com/users/s-hadinger/received_events","type":"User","site_admin":false},"repo":{"id":181951063,"node_id":"MDEwOlJlcG9zaXRvcnkxODE5NTEwNjM=","name":"Tasmota","full_name":"s-hadinger/Tasmota","private":false,"owner":{"login":"s-hadinger","id":49731213,"node_id":"MDQ6VXNlcjQ5NzMxMjEz","avatar_url":"https://avatars.githubusercontent.com/u/49731213?v=4","gravatar_id":"","url":"https://api.github.com/users/s-hadinger","html_url":"https://github.com/s-hadinger","followers_url":"https://api.github.com/users/s-hadinger/followers","following_url":"https://api.github.com/users/s-hadinger/following{/other_user}","gists_url":"https://api.github.com/users/s-hadinger/gists{/gist_id}","starred_url":"https://api.github.com/users/s-hadinger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/s-hadinger/subscriptions","organizations_url":"https://api.github.com/users/s-hadinger/orgs","repos_url":"https://api.github.com/users/s-hadinger/repos","events_url":"https://api.github.com/users/s-hadinger/events{/privacy}","received_events_url":"https://api.github.com/users/s-hadinger/received_events","type":"User","site_admin":false},"html_url":"https://github.com/s-hadinger/Tasmota","description":"Provide ESP8266 based itead Sonoff with Web, MQTT and OTA firmware using Arduino IDE or PlatformIO","fork":true,"url":"https://api.github.com/repos/s-hadinger/Tasmota","forks_url":"https://api.github.com/repos/s-hadinger/Tasmota/forks","keys_url":"https://api.github.com/repos/s-hadinger/Tasmota/keys{/key_id}","collaborators_url":"https://api.github.com/repos/s-hadinger/Tasmota/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/s-hadinger/Tasmota/teams","hooks_url":"https://api.github.com/repos/s-hadinger/Tasmota/hooks","issue_events_url":"https://api.github.com/repos/s-hadinger/Tasmota/issues/events{/number}","events_url":"https://api.github.com/repos/s-hadinger/Tasmota/events","assignees_url":"https://api.github.com/repos/s-hadinger/Tasmota/assignees{/user}","branches_url":"https://api.github.com/repos/s-hadinger/Tasmota/branches{/branch}","tags_url":"https://api.github.com/repos/s-hadinger/Tasmota/tags","blobs_url":"https://api.github.com/repos/s-hadinger/Tasmota/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/s-hadinger/Tasmota/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/s-hadinger/Tasmota/git/refs{/sha}","trees_url":"https://api.github.com/repos/s-hadinger/Tasmota/git/trees{/sha}","statuses_url":"https://api.github.com/repos/s-hadinger/Tasmota/statuses/{sha}","languages_url":"https://api.github.com/repos/s-hadinger/Tasmota/languages","stargazers_url":"https://api.github.com/repos/s-hadinger/Tasmota/stargazers","contributors_url":"https://api.github.com/repos/s-hadinger/Tasmota/contributors","subscribers_url":"https://api.github.com/repos/s-hadinger/Tasmota/subscribers","subscription_url":"https://api.github.com/repos/s-hadinger/Tasmota/subscription","commits_url":"https://api.github.com/repos/s-hadinger/Tasmota/commits{/sha}","git_commits_url":"https://api.github.com/repos/s-hadinger/Tasmota/git/commits{/sha}","comments_url":"https://api.github.com/repos/s-hadinger/Tasmota/comments{/number}","issue_comment_url":"https://api.github.com/repos/s-hadinger/Tasmota/issues/comments{/number}","contents_url":"https://api.github.com/repos/s-hadinger/Tasmota/contents/{+path}","compare_url":"https://api.github.com/repos/s-hadinger/Tasmota/compare/{base}...{head}","merges_url":"https://api.github.com/repos/s-hadinger/Tasmota/merges","archive_url":"https://api.github.com/repos/s-hadinger/Tasmota/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/s-hadinger/Tasmota/downloads","issues_url":"https://api.github.com/repos/s-hadinger/Tasmota/issues{/number}","pulls_url":"https://api.github.com/repos/s-hadinger/Tasmota/pulls{/number}","milestones_url":"https://api.github.com/repos/s-hadinger/Tasmota/milestones{/number}","notifications_url":"https://api.github.com/repos/s-hadinger/Tasmota/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/s-hadinger/Tasmota/labels{/name}","releases_url":"https://api.github.com/repos/s-hadinger/Tasmota/releases{/id}","deployments_url":"https://api.github.com/repos/s-hadinger/Tasmota/deployments","created_at":"2019-04-17T18:56:10Z","updated_at":"2021-07-20T19:36:40Z","pushed_at":"2021-07-20T20:31:28Z","git_url":"git://github.com/s-hadinger/Tasmota.git","ssh_url":"git@github.com:s-hadinger/Tasmota.git","clone_url":"https://github.com/s-hadinger/Tasmota.git","svn_url":"https://github.com/s-hadinger/Tasmota","homepage":"","size":157171,"stargazers_count":1,"watchers_count":1,"language":"C","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":0,"open_issues":0,"watchers":1,"default_branch":"development"}},"base":{"label":"arendst:development","ref":"development","sha":"acd9ea1661ceda475b90919d7892991ae00673df","user":{"login":"arendst","id":11044339,"node_id":"MDQ6VXNlcjExMDQ0MzM5","avatar_url":"https://avatars.githubusercontent.com/u/11044339?v=4","gravatar_id":"","url":"https://api.github.com/users/arendst","html_url":"https://github.com/arendst","followers_url":"https://api.github.com/users/arendst/followers","following_url":"https://api.github.com/users/arendst/following{/other_user}","gists_url":"https://api.github.com/users/arendst/gists{/gist_id}","starred_url":"https://api.github.com/users/arendst/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arendst/subscriptions","organizations_url":"https://api.github.com/users/arendst/orgs","repos_url":"https://api.github.com/users/arendst/repos","events_url":"https://api.github.com/users/arendst/events{/privacy}","received_events_url":"https://api.github.com/users/arendst/received_events","type":"User","site_admin":false},"repo":{"id":80286288,"node_id":"MDEwOlJlcG9zaXRvcnk4MDI4NjI4OA==","name":"Tasmota","full_name":"arendst/Tasmota","private":false,"owner":{"login":"arendst","id":11044339,"node_id":"MDQ6VXNlcjExMDQ0MzM5","avatar_url":"https://avatars.githubusercontent.com/u/11044339?v=4","gravatar_id":"","url":"https://api.github.com/users/arendst","html_url":"https://github.com/arendst","followers_url":"https://api.github.com/users/arendst/followers","following_url":"https://api.github.com/users/arendst/following{/other_user}","gists_url":"https://api.github.com/users/arendst/gists{/gist_id}","starred_url":"https://api.github.com/users/arendst/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arendst/subscriptions","organizations_url":"https://api.github.com/users/arendst/orgs","repos_url":"https://api.github.com/users/arendst/repos","events_url":"https://api.github.com/users/arendst/events{/privacy}","received_events_url":"https://api.github.com/users/arendst/received_events","type":"User","site_admin":false},"html_url":"https://github.com/arendst/Tasmota","description":"Alternative firmware for ESP8266 with easy configuration using webUI, OTA updates, automation using timers or rules, expandability and entirely local control over MQTT, HTTP, Serial or KNX. Full documentation at","fork":false,"url":"https://api.github.com/repos/arendst/Tasmota","forks_url":"https://api.github.com/repos/arendst/Tasmota/forks","keys_url":"https://api.github.com/repos/arendst/Tasmota/keys{/key_id}","collaborators_url":"https://api.github.com/repos/arendst/Tasmota/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/arendst/Tasmota/teams","hooks_url":"https://api.github.com/repos/arendst/Tasmota/hooks","issue_events_url":"https://api.github.com/repos/arendst/Tasmota/issues/events{/number}","events_url":"https://api.github.com/repos/arendst/Tasmota/events","assignees_url":"https://api.github.com/repos/arendst/Tasmota/assignees{/user}","branches_url":"https://api.github.com/repos/arendst/Tasmota/branches{/branch}","tags_url":"https://api.github.com/repos/arendst/Tasmota/tags","blobs_url":"https://api.github.com/repos/arendst/Tasmota/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/arendst/Tasmota/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/arendst/Tasmota/git/refs{/sha}","trees_url":"https://api.github.com/repos/arendst/Tasmota/git/trees{/sha}","statuses_url":"https://api.github.com/repos/arendst/Tasmota/statuses/{sha}","languages_url":"https://api.github.com/repos/arendst/Tasmota/languages","stargazers_url":"https://api.github.com/repos/arendst/Tasmota/stargazers","contributors_url":"https://api.github.com/repos/arendst/Tasmota/contributors","subscribers_url":"https://api.github.com/repos/arendst/Tasmota/subscribers","subscription_url":"https://api.github.com/repos/arendst/Tasmota/subscription","commits_url":"https://api.github.com/repos/arendst/Tasmota/commits{/sha}","git_commits_url":"https://api.github.com/repos/arendst/Tasmota/git/commits{/sha}","comments_url":"https://api.github.com/repos/arendst/Tasmota/comments{/number}","issue_comment_url":"https://api.github.com/repos/arendst/Tasmota/issues/comments{/number}","contents_url":"https://api.github.com/repos/arendst/Tasmota/contents/{+path}","compare_url":"https://api.github.com/repos/arendst/Tasmota/compare/{base}...{head}","merges_url":"https://api.github.com/repos/arendst/Tasmota/merges","archive_url":"https://api.github.com/repos/arendst/Tasmota/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/arendst/Tasmota/downloads","issues_url":"https://api.github.com/repos/arendst/Tasmota/issues{/number}","pulls_url":"https://api.github.com/repos/arendst/Tasmota/pulls{/number}","milestones_url":"https://api.github.com/repos/arendst/Tasmota/milestones{/number}","notifications_url":"https://api.github.com/repos/arendst/Tasmota/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/arendst/Tasmota/labels{/name}","releases_url":"https://api.github.com/repos/arendst/Tasmota/releases{/id}","deployments_url":"https://api.github.com/repos/arendst/Tasmota/deployments","created_at":"2017-01-28T13:37:08Z","updated_at":"2021-07-21T05:14:23Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/arendst/Tasmota.git","ssh_url":"git@github.com:arendst/Tasmota.git","clone_url":"https://github.com/arendst/Tasmota.git","svn_url":"https://github.com/arendst/Tasmota","homepage":"https://tasmota.github.io/docs","size":1480255,"stargazers_count":15528,"watchers_count":15528,"language":"C","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":3434,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":17,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":3434,"open_issues":17,"watchers":15528,"default_branch":"development"}},"_links":{"self":{"href":"https://api.github.com/repos/arendst/Tasmota/pulls/12711"},"html":{"href":"https://github.com/arendst/Tasmota/pull/12711"},"issue":{"href":"https://api.github.com/repos/arendst/Tasmota/issues/12711"},"comments":{"href":"https://api.github.com/repos/arendst/Tasmota/issues/12711/comments"},"review_comments":{"href":"https://api.github.com/repos/arendst/Tasmota/pulls/12711/comments"},"review_comment":{"href":"https://api.github.com/repos/arendst/Tasmota/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/arendst/Tasmota/pulls/12711/commits"},"statuses":{"href":"https://api.github.com/repos/arendst/Tasmota/statuses/0539e8ec32d8f202c89af3e5731db11807970295"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"s-hadinger","id":49731213,"node_id":"MDQ6VXNlcjQ5NzMxMjEz","avatar_url":"https://avatars.githubusercontent.com/u/49731213?v=4","gravatar_id":"","url":"https://api.github.com/users/s-hadinger","html_url":"https://github.com/s-hadinger","followers_url":"https://api.github.com/users/s-hadinger/followers","following_url":"https://api.github.com/users/s-hadinger/following{/other_user}","gists_url":"https://api.github.com/users/s-hadinger/gists{/gist_id}","starred_url":"https://api.github.com/users/s-hadinger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/s-hadinger/subscriptions","organizations_url":"https://api.github.com/users/s-hadinger/orgs","repos_url":"https://api.github.com/users/s-hadinger/repos","events_url":"https://api.github.com/users/s-hadinger/events{/privacy}","received_events_url":"https://api.github.com/users/s-hadinger/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1591,"deletions":1568,"changed_files":5}},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792488","type":"PullRequestEvent","actor":{"id":84075616,"login":"liguowen2001","display_login":"liguowen2001","gravatar_id":"","url":"https://api.github.com/users/liguowen2001","avatar_url":"https://avatars.githubusercontent.com/u/84075616?"},"repo":{"id":385091185,"name":"mengyunzhi/MicroCourse2021","url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021"},"payload":{"action":"opened","number":213,"pull_request":{"url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/213","id":694104892,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODky","html_url":"https://github.com/mengyunzhi/MicroCourse2021/pull/213","diff_url":"https://github.com/mengyunzhi/MicroCourse2021/pull/213.diff","patch_url":"https://github.com/mengyunzhi/MicroCourse2021/pull/213.patch","issue_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/213","number":213,"state":"open","locked":false,"title":"成绩导入bug修复212","user":{"login":"liguowen2001","id":84075616,"node_id":"MDQ6VXNlcjg0MDc1NjE2","avatar_url":"https://avatars.githubusercontent.com/u/84075616?v=4","gravatar_id":"","url":"https://api.github.com/users/liguowen2001","html_url":"https://github.com/liguowen2001","followers_url":"https://api.github.com/users/liguowen2001/followers","following_url":"https://api.github.com/users/liguowen2001/following{/other_user}","gists_url":"https://api.github.com/users/liguowen2001/gists{/gist_id}","starred_url":"https://api.github.com/users/liguowen2001/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/liguowen2001/subscriptions","organizations_url":"https://api.github.com/users/liguowen2001/orgs","repos_url":"https://api.github.com/users/liguowen2001/repos","events_url":"https://api.github.com/users/liguowen2001/events{/privacy}","received_events_url":"https://api.github.com/users/liguowen2001/received_events","type":"User","site_admin":false},"body":"close #212 ","created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-21T07:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/213/commits","review_comments_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/213/comments","review_comment_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/213/comments","statuses_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/statuses/aa35cf16aa2a8f229edd21db445e62e576b0680b","head":{"label":"mengyunzhi:212","ref":"212","sha":"aa35cf16aa2a8f229edd21db445e62e576b0680b","user":{"login":"mengyunzhi","id":25142052,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI1MTQyMDUy","avatar_url":"https://avatars.githubusercontent.com/u/25142052?v=4","gravatar_id":"","url":"https://api.github.com/users/mengyunzhi","html_url":"https://github.com/mengyunzhi","followers_url":"https://api.github.com/users/mengyunzhi/followers","following_url":"https://api.github.com/users/mengyunzhi/following{/other_user}","gists_url":"https://api.github.com/users/mengyunzhi/gists{/gist_id}","starred_url":"https://api.github.com/users/mengyunzhi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mengyunzhi/subscriptions","organizations_url":"https://api.github.com/users/mengyunzhi/orgs","repos_url":"https://api.github.com/users/mengyunzhi/repos","events_url":"https://api.github.com/users/mengyunzhi/events{/privacy}","received_events_url":"https://api.github.com/users/mengyunzhi/received_events","type":"Organization","site_admin":false},"repo":{"id":385091185,"node_id":"MDEwOlJlcG9zaXRvcnkzODUwOTExODU=","name":"MicroCourse2021","full_name":"mengyunzhi/MicroCourse2021","private":false,"owner":{"login":"mengyunzhi","id":25142052,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI1MTQyMDUy","avatar_url":"https://avatars.githubusercontent.com/u/25142052?v=4","gravatar_id":"","url":"https://api.github.com/users/mengyunzhi","html_url":"https://github.com/mengyunzhi","followers_url":"https://api.github.com/users/mengyunzhi/followers","following_url":"https://api.github.com/users/mengyunzhi/following{/other_user}","gists_url":"https://api.github.com/users/mengyunzhi/gists{/gist_id}","starred_url":"https://api.github.com/users/mengyunzhi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mengyunzhi/subscriptions","organizations_url":"https://api.github.com/users/mengyunzhi/orgs","repos_url":"https://api.github.com/users/mengyunzhi/repos","events_url":"https://api.github.com/users/mengyunzhi/events{/privacy}","received_events_url":"https://api.github.com/users/mengyunzhi/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/mengyunzhi/MicroCourse2021","description":null,"fork":false,"url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021","forks_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/forks","keys_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/teams","hooks_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/hooks","issue_events_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/events{/number}","events_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/events","assignees_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/assignees{/user}","branches_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/branches{/branch}","tags_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/tags","blobs_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/refs{/sha}","trees_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/statuses/{sha}","languages_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/languages","stargazers_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/stargazers","contributors_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/contributors","subscribers_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/subscribers","subscription_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/subscription","commits_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/commits{/sha}","git_commits_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/commits{/sha}","comments_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/comments{/number}","issue_comment_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/comments{/number}","contents_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/contents/{+path}","compare_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/merges","archive_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/downloads","issues_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues{/number}","pulls_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls{/number}","milestones_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/milestones{/number}","notifications_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/labels{/name}","releases_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/releases{/id}","deployments_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/deployments","created_at":"2021-07-12T01:27:56Z","updated_at":"2021-07-21T03:37:30Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/mengyunzhi/MicroCourse2021.git","ssh_url":"git@github.com:mengyunzhi/MicroCourse2021.git","clone_url":"https://github.com/mengyunzhi/MicroCourse2021.git","svn_url":"https://github.com/mengyunzhi/MicroCourse2021","homepage":null,"size":1721,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":null,"forks":0,"open_issues":3,"watchers":0,"default_branch":"main"}},"base":{"label":"mengyunzhi:main","ref":"main","sha":"efc72ddde5289147a8b52130cb6a08517059727a","user":{"login":"mengyunzhi","id":25142052,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI1MTQyMDUy","avatar_url":"https://avatars.githubusercontent.com/u/25142052?v=4","gravatar_id":"","url":"https://api.github.com/users/mengyunzhi","html_url":"https://github.com/mengyunzhi","followers_url":"https://api.github.com/users/mengyunzhi/followers","following_url":"https://api.github.com/users/mengyunzhi/following{/other_user}","gists_url":"https://api.github.com/users/mengyunzhi/gists{/gist_id}","starred_url":"https://api.github.com/users/mengyunzhi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mengyunzhi/subscriptions","organizations_url":"https://api.github.com/users/mengyunzhi/orgs","repos_url":"https://api.github.com/users/mengyunzhi/repos","events_url":"https://api.github.com/users/mengyunzhi/events{/privacy}","received_events_url":"https://api.github.com/users/mengyunzhi/received_events","type":"Organization","site_admin":false},"repo":{"id":385091185,"node_id":"MDEwOlJlcG9zaXRvcnkzODUwOTExODU=","name":"MicroCourse2021","full_name":"mengyunzhi/MicroCourse2021","private":false,"owner":{"login":"mengyunzhi","id":25142052,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI1MTQyMDUy","avatar_url":"https://avatars.githubusercontent.com/u/25142052?v=4","gravatar_id":"","url":"https://api.github.com/users/mengyunzhi","html_url":"https://github.com/mengyunzhi","followers_url":"https://api.github.com/users/mengyunzhi/followers","following_url":"https://api.github.com/users/mengyunzhi/following{/other_user}","gists_url":"https://api.github.com/users/mengyunzhi/gists{/gist_id}","starred_url":"https://api.github.com/users/mengyunzhi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mengyunzhi/subscriptions","organizations_url":"https://api.github.com/users/mengyunzhi/orgs","repos_url":"https://api.github.com/users/mengyunzhi/repos","events_url":"https://api.github.com/users/mengyunzhi/events{/privacy}","received_events_url":"https://api.github.com/users/mengyunzhi/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/mengyunzhi/MicroCourse2021","description":null,"fork":false,"url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021","forks_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/forks","keys_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/teams","hooks_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/hooks","issue_events_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/events{/number}","events_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/events","assignees_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/assignees{/user}","branches_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/branches{/branch}","tags_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/tags","blobs_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/refs{/sha}","trees_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/statuses/{sha}","languages_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/languages","stargazers_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/stargazers","contributors_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/contributors","subscribers_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/subscribers","subscription_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/subscription","commits_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/commits{/sha}","git_commits_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/git/commits{/sha}","comments_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/comments{/number}","issue_comment_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/comments{/number}","contents_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/contents/{+path}","compare_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/merges","archive_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/downloads","issues_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues{/number}","pulls_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls{/number}","milestones_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/milestones{/number}","notifications_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/labels{/name}","releases_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/releases{/id}","deployments_url":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/deployments","created_at":"2021-07-12T01:27:56Z","updated_at":"2021-07-21T03:37:30Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/mengyunzhi/MicroCourse2021.git","ssh_url":"git@github.com:mengyunzhi/MicroCourse2021.git","clone_url":"https://github.com/mengyunzhi/MicroCourse2021.git","svn_url":"https://github.com/mengyunzhi/MicroCourse2021","homepage":null,"size":1721,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":null,"forks":0,"open_issues":3,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/213"},"html":{"href":"https://github.com/mengyunzhi/MicroCourse2021/pull/213"},"issue":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/213"},"comments":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/issues/213/comments"},"review_comments":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/213/comments"},"review_comment":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/pulls/213/commits"},"statuses":{"href":"https://api.github.com/repos/mengyunzhi/MicroCourse2021/statuses/aa35cf16aa2a8f229edd21db445e62e576b0680b"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":5,"deletions":8,"changed_files":1}},"public":true,"created_at":"2021-07-21T07:00:04Z","org":{"id":25142052,"login":"mengyunzhi","gravatar_id":"","url":"https://api.github.com/orgs/mengyunzhi","avatar_url":"https://avatars.githubusercontent.com/u/25142052?"}}
+{"id":"17244792494","type":"WatchEvent","actor":{"id":39883467,"login":"Drunos","display_login":"Drunos","gravatar_id":"","url":"https://api.github.com/users/Drunos","avatar_url":"https://avatars.githubusercontent.com/u/39883467?"},"repo":{"id":94253765,"name":"ctubio/Krypto-trading-bot","url":"https://api.github.com/repos/ctubio/Krypto-trading-bot"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792497","type":"IssueCommentEvent","actor":{"id":4639210,"login":"thc202","display_login":"thc202","gravatar_id":"","url":"https://api.github.com/users/thc202","avatar_url":"https://avatars.githubusercontent.com/u/4639210?"},"repo":{"id":35210580,"name":"zaproxy/zap-extensions","url":"https://api.github.com/repos/zaproxy/zap-extensions"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/zaproxy/zap-extensions/issues/2947","repository_url":"https://api.github.com/repos/zaproxy/zap-extensions","labels_url":"https://api.github.com/repos/zaproxy/zap-extensions/issues/2947/labels{/name}","comments_url":"https://api.github.com/repos/zaproxy/zap-extensions/issues/2947/comments","events_url":"https://api.github.com/repos/zaproxy/zap-extensions/issues/2947/events","html_url":"https://github.com/zaproxy/zap-extensions/pull/2947","id":897668974,"node_id":"MDExOlB1bGxSZXF1ZXN0NjQ5NjQ2MDM0","number":2947,"title":"Fix for ZAP Source Code Disclosure-Java-false positive Issue 6595","user":{"login":"kosap","id":3292761,"node_id":"MDQ6VXNlcjMyOTI3NjE=","avatar_url":"https://avatars.githubusercontent.com/u/3292761?v=4","gravatar_id":"","url":"https://api.github.com/users/kosap","html_url":"https://github.com/kosap","followers_url":"https://api.github.com/users/kosap/followers","following_url":"https://api.github.com/users/kosap/following{/other_user}","gists_url":"https://api.github.com/users/kosap/gists{/gist_id}","starred_url":"https://api.github.com/users/kosap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kosap/subscriptions","organizations_url":"https://api.github.com/users/kosap/orgs","repos_url":"https://api.github.com/users/kosap/repos","events_url":"https://api.github.com/users/kosap/events{/privacy}","received_events_url":"https://api.github.com/users/kosap/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":14,"created_at":"2021-05-21T04:37:08Z","updated_at":"2021-07-21T07:00:04Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/zaproxy/zap-extensions/pulls/2947","html_url":"https://github.com/zaproxy/zap-extensions/pull/2947","diff_url":"https://github.com/zaproxy/zap-extensions/pull/2947.diff","patch_url":"https://github.com/zaproxy/zap-extensions/pull/2947.patch"},"body":"As discussed in zaproxy/zaproxy#6595, modified SourceCodeDisclosureScanRule to ignore HttpResponse with content type header as css or javascript.\r\n\r\nFix zaproxy/zaproxy#6595.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/zaproxy/zap-extensions/issues/comments/883942813","html_url":"https://github.com/zaproxy/zap-extensions/pull/2947#issuecomment-883942813","issue_url":"https://api.github.com/repos/zaproxy/zap-extensions/issues/2947","id":883942813,"node_id":"IC_kwDOAhlFVM40r-Wd","user":{"login":"thc202","id":4639210,"node_id":"MDQ6VXNlcjQ2MzkyMTA=","avatar_url":"https://avatars.githubusercontent.com/u/4639210?v=4","gravatar_id":"","url":"https://api.github.com/users/thc202","html_url":"https://github.com/thc202","followers_url":"https://api.github.com/users/thc202/followers","following_url":"https://api.github.com/users/thc202/following{/other_user}","gists_url":"https://api.github.com/users/thc202/gists{/gist_id}","starred_url":"https://api.github.com/users/thc202/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thc202/subscriptions","organizations_url":"https://api.github.com/users/thc202/orgs","repos_url":"https://api.github.com/users/thc202/repos","events_url":"https://api.github.com/users/thc202/events{/privacy}","received_events_url":"https://api.github.com/users/thc202/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-21T07:00:04Z","author_association":"MEMBER","body":"Commits could be fixed up.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:04Z","org":{"id":6716868,"login":"zaproxy","gravatar_id":"","url":"https://api.github.com/orgs/zaproxy","avatar_url":"https://avatars.githubusercontent.com/u/6716868?"}}
+{"id":"17244792498","type":"WatchEvent","actor":{"id":74425534,"login":"sjoveska","display_login":"sjoveska","gravatar_id":"","url":"https://api.github.com/users/sjoveska","avatar_url":"https://avatars.githubusercontent.com/u/74425534?"},"repo":{"id":374106606,"name":"gabrieldim/Register-And-Payment-Form-Layout","url":"https://api.github.com/repos/gabrieldim/Register-And-Payment-Form-Layout"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792499","type":"CommitCommentEvent","actor":{"id":35613825,"login":"vercel[bot]","display_login":"vercel","gravatar_id":"","url":"https://api.github.com/users/vercel[bot]","avatar_url":"https://avatars.githubusercontent.com/u/35613825?"},"repo":{"id":356784453,"name":"lp-Imagine/lp-Imagine.github.io","url":"https://api.github.com/repos/lp-Imagine/lp-Imagine.github.io"},"payload":{"comment":{"url":"https://api.github.com/repos/lp-Imagine/lp-Imagine.github.io/comments/53767302","html_url":"https://github.com/lp-Imagine/lp-Imagine.github.io/commit/43a35f2161127c4a37492ca32b51535fcba0a4d4#commitcomment-53767302","id":53767302,"node_id":"MDEzOkNvbW1pdENvbW1lbnQ1Mzc2NzMwMg==","user":{"login":"vercel[bot]","id":35613825,"node_id":"MDM6Qm90MzU2MTM4MjU=","avatar_url":"https://avatars.githubusercontent.com/in/8329?v=4","gravatar_id":"","url":"https://api.github.com/users/vercel%5Bbot%5D","html_url":"https://github.com/apps/vercel","followers_url":"https://api.github.com/users/vercel%5Bbot%5D/followers","following_url":"https://api.github.com/users/vercel%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/vercel%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/vercel%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vercel%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/vercel%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/vercel%5Bbot%5D/repos","events_url":"https://api.github.com/users/vercel%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/vercel%5Bbot%5D/received_events","type":"Bot","site_admin":false},"position":null,"line":null,"path":null,"commit_id":"43a35f2161127c4a37492ca32b51535fcba0a4d4","created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-21T07:00:04Z","author_association":"NONE","body":"Successfully deployed to the following URLs:\n\n* [imagineblog.vercel.app](https://imagineblog.vercel.app)  \n* [lp-imagine-github-io.vercel.app](https://lp-imagine-github-io.vercel.app)  \n* [imagineblog.host](https://imagineblog.host)  \n* [lp-imagine-github-io-lp-imagine.vercel.app](https://lp-imagine-github-io-lp-imagine.vercel.app)  \n* [lp-imagine-github-io-git-master-lp-imagine.vercel.app](https://lp-imagine-github-io-git-master-lp-imagine.vercel.app)"}},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792503","type":"PushEvent","actor":{"id":40587912,"login":"supermobiteam2","display_login":"supermobiteam2","gravatar_id":"","url":"https://api.github.com/users/supermobiteam2","avatar_url":"https://avatars.githubusercontent.com/u/40587912?"},"repo":{"id":138681984,"name":"supermobiteam2/Tizi","url":"https://api.github.com/repos/supermobiteam2/Tizi"},"payload":{"push_id":7561706491,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"fe488697b938857878169d82f2b2d4c7f76deb8e","before":"3cdb66aaa102b90db6439b4933ad0771af9bce2b","commits":[{"sha":"fe488697b938857878169d82f2b2d4c7f76deb8e","author":{"name":"supermobiteam2","email":"f34688687956b708ea5937840a164da02e7b6797@users.noreply.github.com"},"message":"tizi ios","distinct":true,"url":"https://api.github.com/repos/supermobiteam2/Tizi/commits/fe488697b938857878169d82f2b2d4c7f76deb8e"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792504","type":"PushEvent","actor":{"id":1354510,"login":"leo91000","display_login":"leo91000","gravatar_id":"","url":"https://api.github.com/users/leo91000","avatar_url":"https://avatars.githubusercontent.com/u/1354510?"},"repo":{"id":372306529,"name":"leo91000/covid-japan-informations","url":"https://api.github.com/repos/leo91000/covid-japan-informations"},"payload":{"push_id":7561706493,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"84205448ea1418657e8ab7be41783563e47af2c3","before":"5586a9dc27e52729fcacc2f8436632c6bee95140","commits":[{"sha":"84205448ea1418657e8ab7be41783563e47af2c3","author":{"name":"Léo Coletta","email":"c44abbda51c039fd3030f3ac7bea105b5e3f239d@gmail.com"},"message":"update 2021-07-21T07:00:03.739Z","distinct":true,"url":"https://api.github.com/repos/leo91000/covid-japan-informations/commits/84205448ea1418657e8ab7be41783563e47af2c3"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792505","type":"PushEvent","actor":{"id":5430733,"login":"matsduf","display_login":"matsduf","gravatar_id":"","url":"https://api.github.com/users/matsduf","avatar_url":"https://avatars.githubusercontent.com/u/5430733?"},"repo":{"id":73199016,"name":"matsduf/zonemaster-backend","url":"https://api.github.com/repos/matsduf/zonemaster-backend"},"payload":{"push_id":7561706488,"size":3,"distinct_size":3,"ref":"refs/heads/develop","head":"d5588d0b1f0360de93ee97842ce7a1e014270a0a","before":"f7a76f2434537b52649e52c31507690355e89f5d","commits":[{"sha":"27c4f21734a1e4d7c99f4cc14c17411cf784c71b","author":{"name":"Mats Dufberg","email":"f8eab42c0f39d270f82330c995d2725c9b9a2c72@iis.se"},"message":"Adds API methods add_batch_job and get_batch_job_result","distinct":true,"url":"https://api.github.com/repos/matsduf/zonemaster-backend/commits/27c4f21734a1e4d7c99f4cc14c17411cf784c71b"},{"sha":"75b30eb334f4fc568134d059e988a3ea1f10f685","author":{"name":"Mats Dufberg","email":"f8eab42c0f39d270f82330c995d2725c9b9a2c72@iis.se"},"message":"Corrects typo in POD text","distinct":true,"url":"https://api.github.com/repos/matsduf/zonemaster-backend/commits/75b30eb334f4fc568134d059e988a3ea1f10f685"},{"sha":"d5588d0b1f0360de93ee97842ce7a1e014270a0a","author":{"name":"Mats Dufberg","email":"f8eab42c0f39d270f82330c995d2725c9b9a2c72@iis.se"},"message":"Merge pull request #825 from matsduf/add-batch-functions-zmb\n\nAdds API methods add_batch_job and get_batch_job_result","distinct":true,"url":"https://api.github.com/repos/matsduf/zonemaster-backend/commits/d5588d0b1f0360de93ee97842ce7a1e014270a0a"}]},"public":true,"created_at":"2021-07-21T07:00:04Z"}
+{"id":"17244792513","type":"GollumEvent","actor":{"id":7449066,"login":"idma88","display_login":"idma88","gravatar_id":"","url":"https://api.github.com/users/idma88","avatar_url":"https://avatars.githubusercontent.com/u/7449066?"},"repo":{"id":388024451,"name":"sk-zk/md141","url":"https://api.github.com/repos/sk-zk/md141"},"payload":{"pages":[{"page_name":"Map-Overlay","title":"Map Overlay","summary":null,"action":"created","sha":"bb767455f2fefdf19d8959af2cf0108f64ff623f","html_url":"https://github.com/sk-zk/md141/wiki/Map-Overlay"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792520","type":"PullRequestReviewEvent","actor":{"id":79920680,"login":"idevainstr","display_login":"idevainstr","gravatar_id":"","url":"https://api.github.com/users/idevainstr","avatar_url":"https://avatars.githubusercontent.com/u/79920680?"},"repo":{"id":171557612,"name":"instructure/canvas-ios","url":"https://api.github.com/repos/instructure/canvas-ios"},"payload":{"action":"created","review":{"id":711317400,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3NDAw","user":{"login":"idevainstr","id":79920680,"node_id":"MDQ6VXNlcjc5OTIwNjgw","avatar_url":"https://avatars.githubusercontent.com/u/79920680?v=4","gravatar_id":"","url":"https://api.github.com/users/idevainstr","html_url":"https://github.com/idevainstr","followers_url":"https://api.github.com/users/idevainstr/followers","following_url":"https://api.github.com/users/idevainstr/following{/other_user}","gists_url":"https://api.github.com/users/idevainstr/gists{/gist_id}","starred_url":"https://api.github.com/users/idevainstr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/idevainstr/subscriptions","organizations_url":"https://api.github.com/users/idevainstr/orgs","repos_url":"https://api.github.com/users/idevainstr/repos","events_url":"https://api.github.com/users/idevainstr/events{/privacy}","received_events_url":"https://api.github.com/users/idevainstr/received_events","type":"User","site_admin":false},"body":"QA+1","commit_id":"8448004988b4e8c2af1d081d581e61ce175efdc6","submitted_at":"2021-07-21T07:00:04Z","state":"approved","html_url":"https://github.com/instructure/canvas-ios/pull/1905#pullrequestreview-711317400","pull_request_url":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/instructure/canvas-ios/pull/1905#pullrequestreview-711317400"},"pull_request":{"href":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905"}}},"pull_request":{"url":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905","id":692717889,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyNzE3ODg5","html_url":"https://github.com/instructure/canvas-ios/pull/1905","diff_url":"https://github.com/instructure/canvas-ios/pull/1905.diff","patch_url":"https://github.com/instructure/canvas-ios/pull/1905.patch","issue_url":"https://api.github.com/repos/instructure/canvas-ios/issues/1905","number":1905,"state":"open","locked":false,"title":"Handle not supported font traits.","user":{"login":"vargaat","id":72396990,"node_id":"MDQ6VXNlcjcyMzk2OTkw","avatar_url":"https://avatars.githubusercontent.com/u/72396990?v=4","gravatar_id":"","url":"https://api.github.com/users/vargaat","html_url":"https://github.com/vargaat","followers_url":"https://api.github.com/users/vargaat/followers","following_url":"https://api.github.com/users/vargaat/following{/other_user}","gists_url":"https://api.github.com/users/vargaat/gists{/gist_id}","starred_url":"https://api.github.com/users/vargaat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vargaat/subscriptions","organizations_url":"https://api.github.com/users/vargaat/orgs","repos_url":"https://api.github.com/users/vargaat/repos","events_url":"https://api.github.com/users/vargaat/events{/privacy}","received_events_url":"https://api.github.com/users/vargaat/received_events","type":"User","site_admin":false},"body":"refs: MBL-15544\r\naffects: Student\r\nrelease note: none\r\n\r\ntest plan: See ticket.","created_at":"2021-07-19T15:38:50Z","updated_at":"2021-07-21T07:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8350e707ef06fcc740787e0cc5cc4278ce34a62c","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905/commits","review_comments_url":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905/comments","review_comment_url":"https://api.github.com/repos/instructure/canvas-ios/pulls/comments{/number}","comments_url":"https://api.github.com/repos/instructure/canvas-ios/issues/1905/comments","statuses_url":"https://api.github.com/repos/instructure/canvas-ios/statuses/8448004988b4e8c2af1d081d581e61ce175efdc6","head":{"label":"instructure:bugfix/MBL-15544-K5-modules-crash","ref":"bugfix/MBL-15544-K5-modules-crash","sha":"8448004988b4e8c2af1d081d581e61ce175efdc6","user":{"login":"instructure","id":515326,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNTMyNg==","avatar_url":"https://avatars.githubusercontent.com/u/515326?v=4","gravatar_id":"","url":"https://api.github.com/users/instructure","html_url":"https://github.com/instructure","followers_url":"https://api.github.com/users/instructure/followers","following_url":"https://api.github.com/users/instructure/following{/other_user}","gists_url":"https://api.github.com/users/instructure/gists{/gist_id}","starred_url":"https://api.github.com/users/instructure/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/instructure/subscriptions","organizations_url":"https://api.github.com/users/instructure/orgs","repos_url":"https://api.github.com/users/instructure/repos","events_url":"https://api.github.com/users/instructure/events{/privacy}","received_events_url":"https://api.github.com/users/instructure/received_events","type":"Organization","site_admin":false},"repo":{"id":171557612,"node_id":"MDEwOlJlcG9zaXRvcnkxNzE1NTc2MTI=","name":"canvas-ios","full_name":"instructure/canvas-ios","private":false,"owner":{"login":"instructure","id":515326,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNTMyNg==","avatar_url":"https://avatars.githubusercontent.com/u/515326?v=4","gravatar_id":"","url":"https://api.github.com/users/instructure","html_url":"https://github.com/instructure","followers_url":"https://api.github.com/users/instructure/followers","following_url":"https://api.github.com/users/instructure/following{/other_user}","gists_url":"https://api.github.com/users/instructure/gists{/gist_id}","starred_url":"https://api.github.com/users/instructure/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/instructure/subscriptions","organizations_url":"https://api.github.com/users/instructure/orgs","repos_url":"https://api.github.com/users/instructure/repos","events_url":"https://api.github.com/users/instructure/events{/privacy}","received_events_url":"https://api.github.com/users/instructure/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/instructure/canvas-ios","description":"Canvas iOS apps","fork":false,"url":"https://api.github.com/repos/instructure/canvas-ios","forks_url":"https://api.github.com/repos/instructure/canvas-ios/forks","keys_url":"https://api.github.com/repos/instructure/canvas-ios/keys{/key_id}","collaborators_url":"https://api.github.com/repos/instructure/canvas-ios/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/instructure/canvas-ios/teams","hooks_url":"https://api.github.com/repos/instructure/canvas-ios/hooks","issue_events_url":"https://api.github.com/repos/instructure/canvas-ios/issues/events{/number}","events_url":"https://api.github.com/repos/instructure/canvas-ios/events","assignees_url":"https://api.github.com/repos/instructure/canvas-ios/assignees{/user}","branches_url":"https://api.github.com/repos/instructure/canvas-ios/branches{/branch}","tags_url":"https://api.github.com/repos/instructure/canvas-ios/tags","blobs_url":"https://api.github.com/repos/instructure/canvas-ios/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/instructure/canvas-ios/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/instructure/canvas-ios/git/refs{/sha}","trees_url":"https://api.github.com/repos/instructure/canvas-ios/git/trees{/sha}","statuses_url":"https://api.github.com/repos/instructure/canvas-ios/statuses/{sha}","languages_url":"https://api.github.com/repos/instructure/canvas-ios/languages","stargazers_url":"https://api.github.com/repos/instructure/canvas-ios/stargazers","contributors_url":"https://api.github.com/repos/instructure/canvas-ios/contributors","subscribers_url":"https://api.github.com/repos/instructure/canvas-ios/subscribers","subscription_url":"https://api.github.com/repos/instructure/canvas-ios/subscription","commits_url":"https://api.github.com/repos/instructure/canvas-ios/commits{/sha}","git_commits_url":"https://api.github.com/repos/instructure/canvas-ios/git/commits{/sha}","comments_url":"https://api.github.com/repos/instructure/canvas-ios/comments{/number}","issue_comment_url":"https://api.github.com/repos/instructure/canvas-ios/issues/comments{/number}","contents_url":"https://api.github.com/repos/instructure/canvas-ios/contents/{+path}","compare_url":"https://api.github.com/repos/instructure/canvas-ios/compare/{base}...{head}","merges_url":"https://api.github.com/repos/instructure/canvas-ios/merges","archive_url":"https://api.github.com/repos/instructure/canvas-ios/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/instructure/canvas-ios/downloads","issues_url":"https://api.github.com/repos/instructure/canvas-ios/issues{/number}","pulls_url":"https://api.github.com/repos/instructure/canvas-ios/pulls{/number}","milestones_url":"https://api.github.com/repos/instructure/canvas-ios/milestones{/number}","notifications_url":"https://api.github.com/repos/instructure/canvas-ios/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/instructure/canvas-ios/labels{/name}","releases_url":"https://api.github.com/repos/instructure/canvas-ios/releases{/id}","deployments_url":"https://api.github.com/repos/instructure/canvas-ios/deployments","created_at":"2019-02-19T22:06:53Z","updated_at":"2021-07-20T12:59:08Z","pushed_at":"2021-07-20T15:02:24Z","git_url":"git://github.com/instructure/canvas-ios.git","ssh_url":"git@github.com:instructure/canvas-ios.git","clone_url":"https://github.com/instructure/canvas-ios.git","svn_url":"https://github.com/instructure/canvas-ios","homepage":"","size":325508,"stargazers_count":297,"watchers_count":297,"language":"Swift","has_issues":false,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":48,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":48,"open_issues":4,"watchers":297,"default_branch":"master"}},"base":{"label":"instructure:master","ref":"master","sha":"3db8b879b0b4f6983a8547a24e00bd090944d5ca","user":{"login":"instructure","id":515326,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNTMyNg==","avatar_url":"https://avatars.githubusercontent.com/u/515326?v=4","gravatar_id":"","url":"https://api.github.com/users/instructure","html_url":"https://github.com/instructure","followers_url":"https://api.github.com/users/instructure/followers","following_url":"https://api.github.com/users/instructure/following{/other_user}","gists_url":"https://api.github.com/users/instructure/gists{/gist_id}","starred_url":"https://api.github.com/users/instructure/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/instructure/subscriptions","organizations_url":"https://api.github.com/users/instructure/orgs","repos_url":"https://api.github.com/users/instructure/repos","events_url":"https://api.github.com/users/instructure/events{/privacy}","received_events_url":"https://api.github.com/users/instructure/received_events","type":"Organization","site_admin":false},"repo":{"id":171557612,"node_id":"MDEwOlJlcG9zaXRvcnkxNzE1NTc2MTI=","name":"canvas-ios","full_name":"instructure/canvas-ios","private":false,"owner":{"login":"instructure","id":515326,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNTMyNg==","avatar_url":"https://avatars.githubusercontent.com/u/515326?v=4","gravatar_id":"","url":"https://api.github.com/users/instructure","html_url":"https://github.com/instructure","followers_url":"https://api.github.com/users/instructure/followers","following_url":"https://api.github.com/users/instructure/following{/other_user}","gists_url":"https://api.github.com/users/instructure/gists{/gist_id}","starred_url":"https://api.github.com/users/instructure/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/instructure/subscriptions","organizations_url":"https://api.github.com/users/instructure/orgs","repos_url":"https://api.github.com/users/instructure/repos","events_url":"https://api.github.com/users/instructure/events{/privacy}","received_events_url":"https://api.github.com/users/instructure/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/instructure/canvas-ios","description":"Canvas iOS apps","fork":false,"url":"https://api.github.com/repos/instructure/canvas-ios","forks_url":"https://api.github.com/repos/instructure/canvas-ios/forks","keys_url":"https://api.github.com/repos/instructure/canvas-ios/keys{/key_id}","collaborators_url":"https://api.github.com/repos/instructure/canvas-ios/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/instructure/canvas-ios/teams","hooks_url":"https://api.github.com/repos/instructure/canvas-ios/hooks","issue_events_url":"https://api.github.com/repos/instructure/canvas-ios/issues/events{/number}","events_url":"https://api.github.com/repos/instructure/canvas-ios/events","assignees_url":"https://api.github.com/repos/instructure/canvas-ios/assignees{/user}","branches_url":"https://api.github.com/repos/instructure/canvas-ios/branches{/branch}","tags_url":"https://api.github.com/repos/instructure/canvas-ios/tags","blobs_url":"https://api.github.com/repos/instructure/canvas-ios/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/instructure/canvas-ios/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/instructure/canvas-ios/git/refs{/sha}","trees_url":"https://api.github.com/repos/instructure/canvas-ios/git/trees{/sha}","statuses_url":"https://api.github.com/repos/instructure/canvas-ios/statuses/{sha}","languages_url":"https://api.github.com/repos/instructure/canvas-ios/languages","stargazers_url":"https://api.github.com/repos/instructure/canvas-ios/stargazers","contributors_url":"https://api.github.com/repos/instructure/canvas-ios/contributors","subscribers_url":"https://api.github.com/repos/instructure/canvas-ios/subscribers","subscription_url":"https://api.github.com/repos/instructure/canvas-ios/subscription","commits_url":"https://api.github.com/repos/instructure/canvas-ios/commits{/sha}","git_commits_url":"https://api.github.com/repos/instructure/canvas-ios/git/commits{/sha}","comments_url":"https://api.github.com/repos/instructure/canvas-ios/comments{/number}","issue_comment_url":"https://api.github.com/repos/instructure/canvas-ios/issues/comments{/number}","contents_url":"https://api.github.com/repos/instructure/canvas-ios/contents/{+path}","compare_url":"https://api.github.com/repos/instructure/canvas-ios/compare/{base}...{head}","merges_url":"https://api.github.com/repos/instructure/canvas-ios/merges","archive_url":"https://api.github.com/repos/instructure/canvas-ios/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/instructure/canvas-ios/downloads","issues_url":"https://api.github.com/repos/instructure/canvas-ios/issues{/number}","pulls_url":"https://api.github.com/repos/instructure/canvas-ios/pulls{/number}","milestones_url":"https://api.github.com/repos/instructure/canvas-ios/milestones{/number}","notifications_url":"https://api.github.com/repos/instructure/canvas-ios/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/instructure/canvas-ios/labels{/name}","releases_url":"https://api.github.com/repos/instructure/canvas-ios/releases{/id}","deployments_url":"https://api.github.com/repos/instructure/canvas-ios/deployments","created_at":"2019-02-19T22:06:53Z","updated_at":"2021-07-20T12:59:08Z","pushed_at":"2021-07-20T15:02:24Z","git_url":"git://github.com/instructure/canvas-ios.git","ssh_url":"git@github.com:instructure/canvas-ios.git","clone_url":"https://github.com/instructure/canvas-ios.git","svn_url":"https://github.com/instructure/canvas-ios","homepage":"","size":325508,"stargazers_count":297,"watchers_count":297,"language":"Swift","has_issues":false,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":48,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":48,"open_issues":4,"watchers":297,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905"},"html":{"href":"https://github.com/instructure/canvas-ios/pull/1905"},"issue":{"href":"https://api.github.com/repos/instructure/canvas-ios/issues/1905"},"comments":{"href":"https://api.github.com/repos/instructure/canvas-ios/issues/1905/comments"},"review_comments":{"href":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905/comments"},"review_comment":{"href":"https://api.github.com/repos/instructure/canvas-ios/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/instructure/canvas-ios/pulls/1905/commits"},"statuses":{"href":"https://api.github.com/repos/instructure/canvas-ios/statuses/8448004988b4e8c2af1d081d581e61ce175efdc6"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":515326,"login":"instructure","gravatar_id":"","url":"https://api.github.com/orgs/instructure","avatar_url":"https://avatars.githubusercontent.com/u/515326?"}}
+{"id":"17244792521","type":"PushEvent","actor":{"id":5102591,"login":"tabuna","display_login":"tabuna","gravatar_id":"","url":"https://api.github.com/users/tabuna","avatar_url":"https://avatars.githubusercontent.com/u/5102591?"},"repo":{"id":273078175,"name":"xtsmi/aggregator","url":"https://api.github.com/repos/xtsmi/aggregator"},"payload":{"push_id":7561706481,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5a682170203389052eab2861fd7ce07a8e13b5e5","before":"67ad275961a0071a2acfb4e54fca6d72f4c10ee0","commits":[{"sha":"5a682170203389052eab2861fd7ce07a8e13b5e5","author":{"name":"tabuna","email":"0eac113397cac68650ea2a697b0e7ad1e804020e@users.noreply.github.com"},"message":"Deploying to master from  @ 05cbd9dbc98efa7aa33816dab7d5a14509efeee2 🚀","distinct":true,"url":"https://api.github.com/repos/xtsmi/aggregator/commits/5a682170203389052eab2861fd7ce07a8e13b5e5"}]},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":67076553,"login":"xtsmi","gravatar_id":"","url":"https://api.github.com/orgs/xtsmi","avatar_url":"https://avatars.githubusercontent.com/u/67076553?"}}
+{"id":"17244792531","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561706512,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"fd13b1c5319c1f9ad4a95ec828ec6c11d514f219","before":"1e8d3c37bdaa27f94049689bd806b189b0e2397b","commits":[{"sha":"fd13b1c5319c1f9ad4a95ec828ec6c11d514f219","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/fd13b1c5319c1f9ad4a95ec828ec6c11d514f219"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792535","type":"PushEvent","actor":{"id":15313630,"login":"michaelWuensch","display_login":"michaelWuensch","gravatar_id":"","url":"https://api.github.com/users/michaelWuensch","avatar_url":"https://avatars.githubusercontent.com/u/15313630?"},"repo":{"id":160931942,"name":"LN-Zap/zap-android","url":"https://api.github.com/repos/LN-Zap/zap-android"},"payload":{"push_id":7561706502,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"06df1ad43954195ed198ed64b238c184ec80b711","before":"7e2d404c4905b60ae608c9c3756f4f214aff0301","commits":[{"sha":"06df1ad43954195ed198ed64b238c184ec80b711","author":{"name":"Michael Wünsch","email":"3283b6f35a21cbf66b7cd85dcfceb4f427c981dc@protonmail.com"},"message":"Fix wallet status dot (#342)","distinct":true,"url":"https://api.github.com/repos/LN-Zap/zap-android/commits/06df1ad43954195ed198ed64b238c184ec80b711"}]},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":30905490,"login":"LN-Zap","gravatar_id":"","url":"https://api.github.com/orgs/LN-Zap","avatar_url":"https://avatars.githubusercontent.com/u/30905490?"}}
+{"id":"17244792541","type":"WatchEvent","actor":{"id":12371374,"login":"JimChenWYU","display_login":"JimChenWYU","gravatar_id":"","url":"https://api.github.com/users/JimChenWYU","avatar_url":"https://avatars.githubusercontent.com/u/12371374?"},"repo":{"id":272035489,"name":"greyireland/algorithm-pattern","url":"https://api.github.com/repos/greyireland/algorithm-pattern"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792545","type":"MemberEvent","actor":{"id":49743951,"login":"inbarhavilio","display_login":"inbarhavilio","gravatar_id":"","url":"https://api.github.com/users/inbarhavilio","avatar_url":"https://avatars.githubusercontent.com/u/49743951?"},"repo":{"id":374307936,"name":"inbarhavilio/ADT_List","url":"https://api.github.com/repos/inbarhavilio/ADT_List"},"payload":{"member":{"login":"yuvalbloom","id":69865367,"node_id":"MDQ6VXNlcjY5ODY1MzY3","avatar_url":"https://avatars.githubusercontent.com/u/69865367?v=4","gravatar_id":"","url":"https://api.github.com/users/yuvalbloom","html_url":"https://github.com/yuvalbloom","followers_url":"https://api.github.com/users/yuvalbloom/followers","following_url":"https://api.github.com/users/yuvalbloom/following{/other_user}","gists_url":"https://api.github.com/users/yuvalbloom/gists{/gist_id}","starred_url":"https://api.github.com/users/yuvalbloom/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yuvalbloom/subscriptions","organizations_url":"https://api.github.com/users/yuvalbloom/orgs","repos_url":"https://api.github.com/users/yuvalbloom/repos","events_url":"https://api.github.com/users/yuvalbloom/events{/privacy}","received_events_url":"https://api.github.com/users/yuvalbloom/received_events","type":"User","site_admin":false},"action":"added"},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792547","type":"WatchEvent","actor":{"id":12711726,"login":"sleepycodernotes","display_login":"sleepycodernotes","gravatar_id":"","url":"https://api.github.com/users/sleepycodernotes","avatar_url":"https://avatars.githubusercontent.com/u/12711726?"},"repo":{"id":235901813,"name":"PostHog/posthog","url":"https://api.github.com/repos/PostHog/posthog"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":60330232,"login":"PostHog","gravatar_id":"","url":"https://api.github.com/orgs/PostHog","avatar_url":"https://avatars.githubusercontent.com/u/60330232?"}}
+{"id":"17244792550","type":"IssueCommentEvent","actor":{"id":1070273,"login":"kvaster","display_login":"kvaster","gravatar_id":"","url":"https://api.github.com/users/kvaster","avatar_url":"https://avatars.githubusercontent.com/u/1070273?"},"repo":{"id":48109239,"name":"cilium/cilium","url":"https://api.github.com/repos/cilium/cilium"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/cilium/cilium/issues/16772","repository_url":"https://api.github.com/repos/cilium/cilium","labels_url":"https://api.github.com/repos/cilium/cilium/issues/16772/labels{/name}","comments_url":"https://api.github.com/repos/cilium/cilium/issues/16772/comments","events_url":"https://api.github.com/repos/cilium/cilium/issues/16772/events","html_url":"https://github.com/cilium/cilium/pull/16772","id":936735447,"node_id":"MDExOlB1bGxSZXF1ZXN0NjgzMzk5NjEy","number":16772,"title":"Pass vlan tagged packets back to the kernel stack.","user":{"login":"kvaster","id":1070273,"node_id":"MDQ6VXNlcjEwNzAyNzM=","avatar_url":"https://avatars.githubusercontent.com/u/1070273?v=4","gravatar_id":"","url":"https://api.github.com/users/kvaster","html_url":"https://github.com/kvaster","followers_url":"https://api.github.com/users/kvaster/followers","following_url":"https://api.github.com/users/kvaster/following{/other_user}","gists_url":"https://api.github.com/users/kvaster/gists{/gist_id}","starred_url":"https://api.github.com/users/kvaster/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kvaster/subscriptions","organizations_url":"https://api.github.com/users/kvaster/orgs","repos_url":"https://api.github.com/users/kvaster/repos","events_url":"https://api.github.com/users/kvaster/events{/privacy}","received_events_url":"https://api.github.com/users/kvaster/received_events","type":"User","site_admin":false},"labels":[{"id":732923415,"node_id":"MDU6TGFiZWw3MzI5MjM0MTU=","url":"https://api.github.com/repos/cilium/cilium/labels/release-note/minor","name":"release-note/minor","color":"c2e0c6","default":false,"description":"This PR changes functionality that users may find relevant to operating Cilium."}],"state":"open","locked":false,"assignee":{"login":"borkmann","id":677393,"node_id":"MDQ6VXNlcjY3NzM5Mw==","avatar_url":"https://avatars.githubusercontent.com/u/677393?v=4","gravatar_id":"","url":"https://api.github.com/users/borkmann","html_url":"https://github.com/borkmann","followers_url":"https://api.github.com/users/borkmann/followers","following_url":"https://api.github.com/users/borkmann/following{/other_user}","gists_url":"https://api.github.com/users/borkmann/gists{/gist_id}","starred_url":"https://api.github.com/users/borkmann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/borkmann/subscriptions","organizations_url":"https://api.github.com/users/borkmann/orgs","repos_url":"https://api.github.com/users/borkmann/repos","events_url":"https://api.github.com/users/borkmann/events{/privacy}","received_events_url":"https://api.github.com/users/borkmann/received_events","type":"User","site_admin":false},"assignees":[{"login":"borkmann","id":677393,"node_id":"MDQ6VXNlcjY3NzM5Mw==","avatar_url":"https://avatars.githubusercontent.com/u/677393?v=4","gravatar_id":"","url":"https://api.github.com/users/borkmann","html_url":"https://github.com/borkmann","followers_url":"https://api.github.com/users/borkmann/followers","following_url":"https://api.github.com/users/borkmann/following{/other_user}","gists_url":"https://api.github.com/users/borkmann/gists{/gist_id}","starred_url":"https://api.github.com/users/borkmann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/borkmann/subscriptions","organizations_url":"https://api.github.com/users/borkmann/orgs","repos_url":"https://api.github.com/users/borkmann/repos","events_url":"https://api.github.com/users/borkmann/events{/privacy}","received_events_url":"https://api.github.com/users/borkmann/received_events","type":"User","site_admin":false}],"milestone":null,"comments":24,"created_at":"2021-07-05T06:23:24Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/cilium/cilium/pulls/16772","html_url":"https://github.com/cilium/cilium/pull/16772","diff_url":"https://github.com/cilium/cilium/pull/16772.diff","patch_url":"https://github.com/cilium/cilium/pull/16772.patch"},"body":"VLAN packets will be catched with bpf on main interface first. We\r\nneed to passs it back to the kernel stack. VLAN info/tag will be stripped and\r\npacket will be reenqueued on proper interface or dropped.\r\n\r\nAlso we do not need to process VLAN packets on egress, cause either\r\nwe've already processed such packets in case bpf program is attached\r\nto VLAN interface or we do not need to process such packets at all in\r\nother way.\r\n\r\nVLAN tagged packets will be processed in the folowing way:\r\n* If vlan tag is zero packet will be processed as usual (cause it is targeted for main interface)\r\n* For each device will be allowed only corresponding vlan tags.\r\n* By default will be allowed only tags from devices controlled by cilium.\r\n* Any other tags may be allowed via option (`--vlan-bpf-bypass`), `--vlan-bpf-bypass 0` may be used for allowing all available vlan tags.\r\n* All other vlan tags will be always dropped for security reason.\r\n\r\nConcerns:\r\n* Probably ifindexes and vlan tags should be sorted to make configuration predictable.\r\n* Probably something like `*` should be used insteadof `0` for allowing all available vlan tags.\r\n\r\nPrevious pull request and discussion: https://github.com/cilium/cilium/pull/15534\r\n\r\nFixes: cilium#14579\r\n\r\nSigned-off-by: Viktor Kuzmin <kvaster@gmail.com>\r\n\r\n```release-note\r\nMake NodePort BPF to work on VLAN devices\r\n```","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/cilium/cilium/issues/comments/883942816","html_url":"https://github.com/cilium/cilium/pull/16772#issuecomment-883942816","issue_url":"https://api.github.com/repos/cilium/cilium/issues/16772","id":883942816,"node_id":"IC_kwDOAt4Wt840r-Wg","user":{"login":"kvaster","id":1070273,"node_id":"MDQ6VXNlcjEwNzAyNzM=","avatar_url":"https://avatars.githubusercontent.com/u/1070273?v=4","gravatar_id":"","url":"https://api.github.com/users/kvaster","html_url":"https://github.com/kvaster","followers_url":"https://api.github.com/users/kvaster/followers","following_url":"https://api.github.com/users/kvaster/following{/other_user}","gists_url":"https://api.github.com/users/kvaster/gists{/gist_id}","starred_url":"https://api.github.com/users/kvaster/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kvaster/subscriptions","organizations_url":"https://api.github.com/users/kvaster/orgs","repos_url":"https://api.github.com/users/kvaster/repos","events_url":"https://api.github.com/users/kvaster/events{/privacy}","received_events_url":"https://api.github.com/users/kvaster/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","author_association":"NONE","body":"> Thanks. Marking as ready to merge.\r\n> \r\n> @kvaster As a follow up, could you extend the kube-proxy-replacement guide by documenting your change?\r\n\r\nI will do this as a follow up PR!","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":21054566,"login":"cilium","gravatar_id":"","url":"https://api.github.com/orgs/cilium","avatar_url":"https://avatars.githubusercontent.com/u/21054566?"}}
+{"id":"17244792563","type":"PushEvent","actor":{"id":8789772,"login":"Surendra-Patil","display_login":"Surendra-Patil","gravatar_id":"","url":"https://api.github.com/users/Surendra-Patil","avatar_url":"https://avatars.githubusercontent.com/u/8789772?"},"repo":{"id":388010537,"name":"Surendra-Patil/cicd-pipeline-train-schedule-autodeploy","url":"https://api.github.com/repos/Surendra-Patil/cicd-pipeline-train-schedule-autodeploy"},"payload":{"push_id":7561706517,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"435633c0c21c324efc7ff43573cc5a5ae900f4c1","before":"b776195a468bb9dcd342ee727d6c0674d00eb73d","commits":[{"sha":"435633c0c21c324efc7ff43573cc5a5ae900f4c1","author":{"name":"Surendra Patil","email":"cc655173746c3439478882df241d8bd516e222fa@gmail.com"},"message":"Testing","distinct":true,"url":"https://api.github.com/repos/Surendra-Patil/cicd-pipeline-train-schedule-autodeploy/commits/435633c0c21c324efc7ff43573cc5a5ae900f4c1"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792567","type":"PullRequestEvent","actor":{"id":65147229,"login":"DonaldLTB","display_login":"DonaldLTB","gravatar_id":"","url":"https://api.github.com/users/DonaldLTB","avatar_url":"https://avatars.githubusercontent.com/u/65147229?"},"repo":{"id":340231166,"name":"DonaldLTB/HLL_Fan_Page_JP","url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP"},"payload":{"action":"opened","number":38,"pull_request":{"url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/38","id":694104898,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0ODk4","html_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP/pull/38","diff_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP/pull/38.diff","patch_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP/pull/38.patch","issue_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/38","number":38,"state":"open","locked":false,"title":"Tri","user":{"login":"DonaldLTB","id":65147229,"node_id":"MDQ6VXNlcjY1MTQ3MjI5","avatar_url":"https://avatars.githubusercontent.com/u/65147229?v=4","gravatar_id":"","url":"https://api.github.com/users/DonaldLTB","html_url":"https://github.com/DonaldLTB","followers_url":"https://api.github.com/users/DonaldLTB/followers","following_url":"https://api.github.com/users/DonaldLTB/following{/other_user}","gists_url":"https://api.github.com/users/DonaldLTB/gists{/gist_id}","starred_url":"https://api.github.com/users/DonaldLTB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DonaldLTB/subscriptions","organizations_url":"https://api.github.com/users/DonaldLTB/orgs","repos_url":"https://api.github.com/users/DonaldLTB/repos","events_url":"https://api.github.com/users/DonaldLTB/events{/privacy}","received_events_url":"https://api.github.com/users/DonaldLTB/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-21T07:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/38/commits","review_comments_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/38/comments","review_comment_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/comments{/number}","comments_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/38/comments","statuses_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/statuses/75cc0e19b782b177ddd5d12f5f655b84d1c9da89","head":{"label":"DonaldLTB:tri","ref":"tri","sha":"75cc0e19b782b177ddd5d12f5f655b84d1c9da89","user":{"login":"DonaldLTB","id":65147229,"node_id":"MDQ6VXNlcjY1MTQ3MjI5","avatar_url":"https://avatars.githubusercontent.com/u/65147229?v=4","gravatar_id":"","url":"https://api.github.com/users/DonaldLTB","html_url":"https://github.com/DonaldLTB","followers_url":"https://api.github.com/users/DonaldLTB/followers","following_url":"https://api.github.com/users/DonaldLTB/following{/other_user}","gists_url":"https://api.github.com/users/DonaldLTB/gists{/gist_id}","starred_url":"https://api.github.com/users/DonaldLTB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DonaldLTB/subscriptions","organizations_url":"https://api.github.com/users/DonaldLTB/orgs","repos_url":"https://api.github.com/users/DonaldLTB/repos","events_url":"https://api.github.com/users/DonaldLTB/events{/privacy}","received_events_url":"https://api.github.com/users/DonaldLTB/received_events","type":"User","site_admin":false},"repo":{"id":340231166,"node_id":"MDEwOlJlcG9zaXRvcnkzNDAyMzExNjY=","name":"HLL_Fan_Page_JP","full_name":"DonaldLTB/HLL_Fan_Page_JP","private":false,"owner":{"login":"DonaldLTB","id":65147229,"node_id":"MDQ6VXNlcjY1MTQ3MjI5","avatar_url":"https://avatars.githubusercontent.com/u/65147229?v=4","gravatar_id":"","url":"https://api.github.com/users/DonaldLTB","html_url":"https://github.com/DonaldLTB","followers_url":"https://api.github.com/users/DonaldLTB/followers","following_url":"https://api.github.com/users/DonaldLTB/following{/other_user}","gists_url":"https://api.github.com/users/DonaldLTB/gists{/gist_id}","starred_url":"https://api.github.com/users/DonaldLTB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DonaldLTB/subscriptions","organizations_url":"https://api.github.com/users/DonaldLTB/orgs","repos_url":"https://api.github.com/users/DonaldLTB/repos","events_url":"https://api.github.com/users/DonaldLTB/events{/privacy}","received_events_url":"https://api.github.com/users/DonaldLTB/received_events","type":"User","site_admin":false},"html_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP","description":"HLL Page for Japanese/Japanese-speaking audience","fork":false,"url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP","forks_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/forks","keys_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/keys{/key_id}","collaborators_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/teams","hooks_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/hooks","issue_events_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/events{/number}","events_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/events","assignees_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/assignees{/user}","branches_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/branches{/branch}","tags_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/tags","blobs_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/refs{/sha}","trees_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/trees{/sha}","statuses_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/statuses/{sha}","languages_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/languages","stargazers_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/stargazers","contributors_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/contributors","subscribers_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/subscribers","subscription_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/subscription","commits_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/commits{/sha}","git_commits_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/commits{/sha}","comments_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/comments{/number}","issue_comment_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/comments{/number}","contents_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/contents/{+path}","compare_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/compare/{base}...{head}","merges_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/merges","archive_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/downloads","issues_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues{/number}","pulls_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls{/number}","milestones_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/milestones{/number}","notifications_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/labels{/name}","releases_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/releases{/id}","deployments_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/deployments","created_at":"2021-02-19T01:59:51Z","updated_at":"2021-07-20T06:23:58Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/DonaldLTB/HLL_Fan_Page_JP.git","ssh_url":"git@github.com:DonaldLTB/HLL_Fan_Page_JP.git","clone_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP.git","svn_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP","homepage":null,"size":5422,"stargazers_count":1,"watchers_count":1,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":1,"default_branch":"master"}},"base":{"label":"DonaldLTB:master","ref":"master","sha":"ca3263e5a494d60464871687e012c0540be9bc85","user":{"login":"DonaldLTB","id":65147229,"node_id":"MDQ6VXNlcjY1MTQ3MjI5","avatar_url":"https://avatars.githubusercontent.com/u/65147229?v=4","gravatar_id":"","url":"https://api.github.com/users/DonaldLTB","html_url":"https://github.com/DonaldLTB","followers_url":"https://api.github.com/users/DonaldLTB/followers","following_url":"https://api.github.com/users/DonaldLTB/following{/other_user}","gists_url":"https://api.github.com/users/DonaldLTB/gists{/gist_id}","starred_url":"https://api.github.com/users/DonaldLTB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DonaldLTB/subscriptions","organizations_url":"https://api.github.com/users/DonaldLTB/orgs","repos_url":"https://api.github.com/users/DonaldLTB/repos","events_url":"https://api.github.com/users/DonaldLTB/events{/privacy}","received_events_url":"https://api.github.com/users/DonaldLTB/received_events","type":"User","site_admin":false},"repo":{"id":340231166,"node_id":"MDEwOlJlcG9zaXRvcnkzNDAyMzExNjY=","name":"HLL_Fan_Page_JP","full_name":"DonaldLTB/HLL_Fan_Page_JP","private":false,"owner":{"login":"DonaldLTB","id":65147229,"node_id":"MDQ6VXNlcjY1MTQ3MjI5","avatar_url":"https://avatars.githubusercontent.com/u/65147229?v=4","gravatar_id":"","url":"https://api.github.com/users/DonaldLTB","html_url":"https://github.com/DonaldLTB","followers_url":"https://api.github.com/users/DonaldLTB/followers","following_url":"https://api.github.com/users/DonaldLTB/following{/other_user}","gists_url":"https://api.github.com/users/DonaldLTB/gists{/gist_id}","starred_url":"https://api.github.com/users/DonaldLTB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DonaldLTB/subscriptions","organizations_url":"https://api.github.com/users/DonaldLTB/orgs","repos_url":"https://api.github.com/users/DonaldLTB/repos","events_url":"https://api.github.com/users/DonaldLTB/events{/privacy}","received_events_url":"https://api.github.com/users/DonaldLTB/received_events","type":"User","site_admin":false},"html_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP","description":"HLL Page for Japanese/Japanese-speaking audience","fork":false,"url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP","forks_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/forks","keys_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/keys{/key_id}","collaborators_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/teams","hooks_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/hooks","issue_events_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/events{/number}","events_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/events","assignees_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/assignees{/user}","branches_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/branches{/branch}","tags_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/tags","blobs_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/refs{/sha}","trees_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/trees{/sha}","statuses_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/statuses/{sha}","languages_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/languages","stargazers_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/stargazers","contributors_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/contributors","subscribers_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/subscribers","subscription_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/subscription","commits_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/commits{/sha}","git_commits_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/git/commits{/sha}","comments_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/comments{/number}","issue_comment_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/comments{/number}","contents_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/contents/{+path}","compare_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/compare/{base}...{head}","merges_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/merges","archive_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/downloads","issues_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues{/number}","pulls_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls{/number}","milestones_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/milestones{/number}","notifications_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/labels{/name}","releases_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/releases{/id}","deployments_url":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/deployments","created_at":"2021-02-19T01:59:51Z","updated_at":"2021-07-20T06:23:58Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/DonaldLTB/HLL_Fan_Page_JP.git","ssh_url":"git@github.com:DonaldLTB/HLL_Fan_Page_JP.git","clone_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP.git","svn_url":"https://github.com/DonaldLTB/HLL_Fan_Page_JP","homepage":null,"size":5422,"stargazers_count":1,"watchers_count":1,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/38"},"html":{"href":"https://github.com/DonaldLTB/HLL_Fan_Page_JP/pull/38"},"issue":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/38"},"comments":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/issues/38/comments"},"review_comments":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/38/comments"},"review_comment":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/pulls/38/commits"},"statuses":{"href":"https://api.github.com/repos/DonaldLTB/HLL_Fan_Page_JP/statuses/75cc0e19b782b177ddd5d12f5f655b84d1c9da89"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":15,"deletions":15,"changed_files":4}},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792578","type":"PullRequestEvent","actor":{"id":65045755,"login":"Vasile-Hij","display_login":"Vasile-Hij","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","avatar_url":"https://avatars.githubusercontent.com/u/65045755?"},"repo":{"id":387832280,"name":"Vasile-Hij/excels-pandas","url":"https://api.github.com/repos/Vasile-Hij/excels-pandas"},"payload":{"action":"opened","number":1,"pull_request":{"url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/1","id":694104900,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0OTAw","html_url":"https://github.com/Vasile-Hij/excels-pandas/pull/1","diff_url":"https://github.com/Vasile-Hij/excels-pandas/pull/1.diff","patch_url":"https://github.com/Vasile-Hij/excels-pandas/pull/1.patch","issue_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/1","number":1,"state":"open","locked":false,"title":"Update excels-pandas.ipynb","user":{"login":"Vasile-Hij","id":65045755,"node_id":"MDQ6VXNlcjY1MDQ1NzU1","avatar_url":"https://avatars.githubusercontent.com/u/65045755?v=4","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","html_url":"https://github.com/Vasile-Hij","followers_url":"https://api.github.com/users/Vasile-Hij/followers","following_url":"https://api.github.com/users/Vasile-Hij/following{/other_user}","gists_url":"https://api.github.com/users/Vasile-Hij/gists{/gist_id}","starred_url":"https://api.github.com/users/Vasile-Hij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vasile-Hij/subscriptions","organizations_url":"https://api.github.com/users/Vasile-Hij/orgs","repos_url":"https://api.github.com/users/Vasile-Hij/repos","events_url":"https://api.github.com/users/Vasile-Hij/events{/privacy}","received_events_url":"https://api.github.com/users/Vasile-Hij/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:00:04Z","updated_at":"2021-07-21T07:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/1/commits","review_comments_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/1/comments","review_comment_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/1/comments","statuses_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/statuses/2c236fd216550ebb29e8b91d16558be31a84a0ea","head":{"label":"Vasile-Hij:v0.1","ref":"v0.1","sha":"2c236fd216550ebb29e8b91d16558be31a84a0ea","user":{"login":"Vasile-Hij","id":65045755,"node_id":"MDQ6VXNlcjY1MDQ1NzU1","avatar_url":"https://avatars.githubusercontent.com/u/65045755?v=4","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","html_url":"https://github.com/Vasile-Hij","followers_url":"https://api.github.com/users/Vasile-Hij/followers","following_url":"https://api.github.com/users/Vasile-Hij/following{/other_user}","gists_url":"https://api.github.com/users/Vasile-Hij/gists{/gist_id}","starred_url":"https://api.github.com/users/Vasile-Hij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vasile-Hij/subscriptions","organizations_url":"https://api.github.com/users/Vasile-Hij/orgs","repos_url":"https://api.github.com/users/Vasile-Hij/repos","events_url":"https://api.github.com/users/Vasile-Hij/events{/privacy}","received_events_url":"https://api.github.com/users/Vasile-Hij/received_events","type":"User","site_admin":false},"repo":{"id":387832280,"node_id":"MDEwOlJlcG9zaXRvcnkzODc4MzIyODA=","name":"excels-pandas","full_name":"Vasile-Hij/excels-pandas","private":false,"owner":{"login":"Vasile-Hij","id":65045755,"node_id":"MDQ6VXNlcjY1MDQ1NzU1","avatar_url":"https://avatars.githubusercontent.com/u/65045755?v=4","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","html_url":"https://github.com/Vasile-Hij","followers_url":"https://api.github.com/users/Vasile-Hij/followers","following_url":"https://api.github.com/users/Vasile-Hij/following{/other_user}","gists_url":"https://api.github.com/users/Vasile-Hij/gists{/gist_id}","starred_url":"https://api.github.com/users/Vasile-Hij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vasile-Hij/subscriptions","organizations_url":"https://api.github.com/users/Vasile-Hij/orgs","repos_url":"https://api.github.com/users/Vasile-Hij/repos","events_url":"https://api.github.com/users/Vasile-Hij/events{/privacy}","received_events_url":"https://api.github.com/users/Vasile-Hij/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Vasile-Hij/excels-pandas","description":null,"fork":false,"url":"https://api.github.com/repos/Vasile-Hij/excels-pandas","forks_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/forks","keys_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/teams","hooks_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/hooks","issue_events_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/events{/number}","events_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/events","assignees_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/assignees{/user}","branches_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/branches{/branch}","tags_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/tags","blobs_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/refs{/sha}","trees_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/statuses/{sha}","languages_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/languages","stargazers_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/stargazers","contributors_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/contributors","subscribers_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/subscribers","subscription_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/subscription","commits_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/commits{/sha}","git_commits_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/commits{/sha}","comments_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/comments{/number}","issue_comment_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/comments{/number}","contents_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/contents/{+path}","compare_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/merges","archive_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/downloads","issues_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues{/number}","pulls_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls{/number}","milestones_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/milestones{/number}","notifications_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/labels{/name}","releases_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/releases{/id}","deployments_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/deployments","created_at":"2021-07-20T15:16:44Z","updated_at":"2021-07-20T20:39:08Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/Vasile-Hij/excels-pandas.git","ssh_url":"git@github.com:Vasile-Hij/excels-pandas.git","clone_url":"https://github.com/Vasile-Hij/excels-pandas.git","svn_url":"https://github.com/Vasile-Hij/excels-pandas","homepage":null,"size":39,"stargazers_count":0,"watchers_count":0,"language":"Jupyter Notebook","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"Vasile-Hij:main","ref":"main","sha":"8204e9cfd8ed1d0e3174e3fc9bc5edccaf443349","user":{"login":"Vasile-Hij","id":65045755,"node_id":"MDQ6VXNlcjY1MDQ1NzU1","avatar_url":"https://avatars.githubusercontent.com/u/65045755?v=4","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","html_url":"https://github.com/Vasile-Hij","followers_url":"https://api.github.com/users/Vasile-Hij/followers","following_url":"https://api.github.com/users/Vasile-Hij/following{/other_user}","gists_url":"https://api.github.com/users/Vasile-Hij/gists{/gist_id}","starred_url":"https://api.github.com/users/Vasile-Hij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vasile-Hij/subscriptions","organizations_url":"https://api.github.com/users/Vasile-Hij/orgs","repos_url":"https://api.github.com/users/Vasile-Hij/repos","events_url":"https://api.github.com/users/Vasile-Hij/events{/privacy}","received_events_url":"https://api.github.com/users/Vasile-Hij/received_events","type":"User","site_admin":false},"repo":{"id":387832280,"node_id":"MDEwOlJlcG9zaXRvcnkzODc4MzIyODA=","name":"excels-pandas","full_name":"Vasile-Hij/excels-pandas","private":false,"owner":{"login":"Vasile-Hij","id":65045755,"node_id":"MDQ6VXNlcjY1MDQ1NzU1","avatar_url":"https://avatars.githubusercontent.com/u/65045755?v=4","gravatar_id":"","url":"https://api.github.com/users/Vasile-Hij","html_url":"https://github.com/Vasile-Hij","followers_url":"https://api.github.com/users/Vasile-Hij/followers","following_url":"https://api.github.com/users/Vasile-Hij/following{/other_user}","gists_url":"https://api.github.com/users/Vasile-Hij/gists{/gist_id}","starred_url":"https://api.github.com/users/Vasile-Hij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vasile-Hij/subscriptions","organizations_url":"https://api.github.com/users/Vasile-Hij/orgs","repos_url":"https://api.github.com/users/Vasile-Hij/repos","events_url":"https://api.github.com/users/Vasile-Hij/events{/privacy}","received_events_url":"https://api.github.com/users/Vasile-Hij/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Vasile-Hij/excels-pandas","description":null,"fork":false,"url":"https://api.github.com/repos/Vasile-Hij/excels-pandas","forks_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/forks","keys_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/teams","hooks_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/hooks","issue_events_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/events{/number}","events_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/events","assignees_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/assignees{/user}","branches_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/branches{/branch}","tags_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/tags","blobs_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/refs{/sha}","trees_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/statuses/{sha}","languages_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/languages","stargazers_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/stargazers","contributors_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/contributors","subscribers_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/subscribers","subscription_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/subscription","commits_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/commits{/sha}","git_commits_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/git/commits{/sha}","comments_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/comments{/number}","issue_comment_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/comments{/number}","contents_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/contents/{+path}","compare_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/merges","archive_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/downloads","issues_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues{/number}","pulls_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls{/number}","milestones_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/milestones{/number}","notifications_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/labels{/name}","releases_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/releases{/id}","deployments_url":"https://api.github.com/repos/Vasile-Hij/excels-pandas/deployments","created_at":"2021-07-20T15:16:44Z","updated_at":"2021-07-20T20:39:08Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/Vasile-Hij/excels-pandas.git","ssh_url":"git@github.com:Vasile-Hij/excels-pandas.git","clone_url":"https://github.com/Vasile-Hij/excels-pandas.git","svn_url":"https://github.com/Vasile-Hij/excels-pandas","homepage":null,"size":39,"stargazers_count":0,"watchers_count":0,"language":"Jupyter Notebook","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/1"},"html":{"href":"https://github.com/Vasile-Hij/excels-pandas/pull/1"},"issue":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/1"},"comments":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/Vasile-Hij/excels-pandas/statuses/2c236fd216550ebb29e8b91d16558be31a84a0ea"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":15,"deletions":7,"changed_files":1}},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792579","type":"PushEvent","actor":{"id":22955941,"login":"Volodichev","display_login":"Volodichev","gravatar_id":"","url":"https://api.github.com/users/Volodichev","avatar_url":"https://avatars.githubusercontent.com/u/22955941?"},"repo":{"id":374556291,"name":"Volodichev/proxy-list","url":"https://api.github.com/repos/Volodichev/proxy-list"},"payload":{"push_id":7561706525,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"d88fed842c5252fff44229061355698c72c21a23","before":"c1363b4b7f22d217c0b38e74e4f603e31f328f2d","commits":[{"sha":"d88fed842c5252fff44229061355698c72c21a23","author":{"name":"Alexander","email":"db02dbb7d5376400a8069895ae273c92e0d1f31d@gmail.com"},"message":"hmn keys 21.07.21 10:00:01","distinct":true,"url":"https://api.github.com/repos/Volodichev/proxy-list/commits/d88fed842c5252fff44229061355698c72c21a23"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792580","type":"PushEvent","actor":{"id":13213761,"login":"spencer155","display_login":"spencer155","gravatar_id":"","url":"https://api.github.com/users/spencer155","avatar_url":"https://avatars.githubusercontent.com/u/13213761?"},"repo":{"id":124195997,"name":"spencer155/sun","url":"https://api.github.com/repos/spencer155/sun"},"payload":{"push_id":7561706524,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"4d61ee1e8212ffc776275da527223f5438827dea","before":"c82e3463493ecc9b3f36eab29e7dc1757c7b3247","commits":[{"sha":"4d61ee1e8212ffc776275da527223f5438827dea","author":{"name":"孙斌","email":"3a4ff063ca39860aa839c0a9171a57f22d750ae3@sunbin-MacBook-Pro.local"},"message":"context函数组件","distinct":true,"url":"https://api.github.com/repos/spencer155/sun/commits/4d61ee1e8212ffc776275da527223f5438827dea"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792582","type":"PullRequestReviewEvent","actor":{"id":7221389,"login":"mazipan","display_login":"mazipan","gravatar_id":"","url":"https://api.github.com/users/mazipan","avatar_url":"https://avatars.githubusercontent.com/u/7221389?"},"repo":{"id":383169156,"name":"kawalcovid19/wargabantuwarga.com","url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com"},"payload":{"action":"created","review":{"id":711317405,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3NDA1","user":{"login":"mazipan","id":7221389,"node_id":"MDQ6VXNlcjcyMjEzODk=","avatar_url":"https://avatars.githubusercontent.com/u/7221389?v=4","gravatar_id":"","url":"https://api.github.com/users/mazipan","html_url":"https://github.com/mazipan","followers_url":"https://api.github.com/users/mazipan/followers","following_url":"https://api.github.com/users/mazipan/following{/other_user}","gists_url":"https://api.github.com/users/mazipan/gists{/gist_id}","starred_url":"https://api.github.com/users/mazipan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mazipan/subscriptions","organizations_url":"https://api.github.com/users/mazipan/orgs","repos_url":"https://api.github.com/users/mazipan/repos","events_url":"https://api.github.com/users/mazipan/events{/privacy}","received_events_url":"https://api.github.com/users/mazipan/received_events","type":"User","site_admin":false},"body":"Looks good to me","commit_id":"d50f8c9f091c50f9d134975f2590a6b5dbddd99d","submitted_at":"2021-07-21T07:00:05Z","state":"approved","html_url":"https://github.com/kawalcovid19/wargabantuwarga.com/pull/239#pullrequestreview-711317405","pull_request_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239","author_association":"COLLABORATOR","_links":{"html":{"href":"https://github.com/kawalcovid19/wargabantuwarga.com/pull/239#pullrequestreview-711317405"},"pull_request":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239"}}},"pull_request":{"url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239","id":694023383,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDIzMzgz","html_url":"https://github.com/kawalcovid19/wargabantuwarga.com/pull/239","diff_url":"https://github.com/kawalcovid19/wargabantuwarga.com/pull/239.diff","patch_url":"https://github.com/kawalcovid19/wargabantuwarga.com/pull/239.patch","issue_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/239","number":239,"state":"open","locked":false,"title":"design system - button","user":{"login":"resir014","id":5663877,"node_id":"MDQ6VXNlcjU2NjM4Nzc=","avatar_url":"https://avatars.githubusercontent.com/u/5663877?v=4","gravatar_id":"","url":"https://api.github.com/users/resir014","html_url":"https://github.com/resir014","followers_url":"https://api.github.com/users/resir014/followers","following_url":"https://api.github.com/users/resir014/following{/other_user}","gists_url":"https://api.github.com/users/resir014/gists{/gist_id}","starred_url":"https://api.github.com/users/resir014/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/resir014/subscriptions","organizations_url":"https://api.github.com/users/resir014/orgs","repos_url":"https://api.github.com/users/resir014/repos","events_url":"https://api.github.com/users/resir014/events{/privacy}","received_events_url":"https://api.github.com/users/resir014/received_events","type":"User","site_admin":false},"body":"Closes #212\r\n\r\n## Description\r\n\r\nAdds various features to our existing button components\r\n\r\n## Current Tasks\r\n\r\n<!-- List the tasks that you're planning to do in this PR.\r\nThis is to indicate how much you have been progressing before this PR is ready for review -->\r\n\r\n- [x] Add White Button variant\r\n- [x] Expand each button's size options (xs, sm, md, lg, xl)\r\n- [x] Allow for rounded buttons\r\n- [x] Allow option to add icons in buttons (from Heroicons)\r\n- [x] Refactor button helper functions\r\n- [x] Apply to existing button components\r\n- [x] Add button loading states","created_at":"2021-07-21T03:53:15Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"0fe0d2ad030be929f15213445c79e690006c1820","assignee":null,"assignees":[],"requested_reviewers":[{"login":"zainfathoni","id":6315466,"node_id":"MDQ6VXNlcjYzMTU0NjY=","avatar_url":"https://avatars.githubusercontent.com/u/6315466?v=4","gravatar_id":"","url":"https://api.github.com/users/zainfathoni","html_url":"https://github.com/zainfathoni","followers_url":"https://api.github.com/users/zainfathoni/followers","following_url":"https://api.github.com/users/zainfathoni/following{/other_user}","gists_url":"https://api.github.com/users/zainfathoni/gists{/gist_id}","starred_url":"https://api.github.com/users/zainfathoni/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zainfathoni/subscriptions","organizations_url":"https://api.github.com/users/zainfathoni/orgs","repos_url":"https://api.github.com/users/zainfathoni/repos","events_url":"https://api.github.com/users/zainfathoni/events{/privacy}","received_events_url":"https://api.github.com/users/zainfathoni/received_events","type":"User","site_admin":false},{"login":"ekafyi","id":6597211,"node_id":"MDQ6VXNlcjY1OTcyMTE=","avatar_url":"https://avatars.githubusercontent.com/u/6597211?v=4","gravatar_id":"","url":"https://api.github.com/users/ekafyi","html_url":"https://github.com/ekafyi","followers_url":"https://api.github.com/users/ekafyi/followers","following_url":"https://api.github.com/users/ekafyi/following{/other_user}","gists_url":"https://api.github.com/users/ekafyi/gists{/gist_id}","starred_url":"https://api.github.com/users/ekafyi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ekafyi/subscriptions","organizations_url":"https://api.github.com/users/ekafyi/orgs","repos_url":"https://api.github.com/users/ekafyi/repos","events_url":"https://api.github.com/users/ekafyi/events{/privacy}","received_events_url":"https://api.github.com/users/ekafyi/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239/commits","review_comments_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239/comments","review_comment_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/comments{/number}","comments_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/239/comments","statuses_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/statuses/d50f8c9f091c50f9d134975f2590a6b5dbddd99d","head":{"label":"kawalcovid19:design-system-button","ref":"design-system-button","sha":"d50f8c9f091c50f9d134975f2590a6b5dbddd99d","user":{"login":"kawalcovid19","id":62234891,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyMjM0ODkx","avatar_url":"https://avatars.githubusercontent.com/u/62234891?v=4","gravatar_id":"","url":"https://api.github.com/users/kawalcovid19","html_url":"https://github.com/kawalcovid19","followers_url":"https://api.github.com/users/kawalcovid19/followers","following_url":"https://api.github.com/users/kawalcovid19/following{/other_user}","gists_url":"https://api.github.com/users/kawalcovid19/gists{/gist_id}","starred_url":"https://api.github.com/users/kawalcovid19/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kawalcovid19/subscriptions","organizations_url":"https://api.github.com/users/kawalcovid19/orgs","repos_url":"https://api.github.com/users/kawalcovid19/repos","events_url":"https://api.github.com/users/kawalcovid19/events{/privacy}","received_events_url":"https://api.github.com/users/kawalcovid19/received_events","type":"Organization","site_admin":false},"repo":{"id":383169156,"node_id":"MDEwOlJlcG9zaXRvcnkzODMxNjkxNTY=","name":"wargabantuwarga.com","full_name":"kawalcovid19/wargabantuwarga.com","private":false,"owner":{"login":"kawalcovid19","id":62234891,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyMjM0ODkx","avatar_url":"https://avatars.githubusercontent.com/u/62234891?v=4","gravatar_id":"","url":"https://api.github.com/users/kawalcovid19","html_url":"https://github.com/kawalcovid19","followers_url":"https://api.github.com/users/kawalcovid19/followers","following_url":"https://api.github.com/users/kawalcovid19/following{/other_user}","gists_url":"https://api.github.com/users/kawalcovid19/gists{/gist_id}","starred_url":"https://api.github.com/users/kawalcovid19/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kawalcovid19/subscriptions","organizations_url":"https://api.github.com/users/kawalcovid19/orgs","repos_url":"https://api.github.com/users/kawalcovid19/repos","events_url":"https://api.github.com/users/kawalcovid19/events{/privacy}","received_events_url":"https://api.github.com/users/kawalcovid19/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/kawalcovid19/wargabantuwarga.com","description":"Inisiatif warga untuk berbagi informasi seputar fasilitas kesehatan dan alat kesehatan untuk COVID-19.","fork":false,"url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com","forks_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/forks","keys_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/keys{/key_id}","collaborators_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/teams","hooks_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/hooks","issue_events_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/events{/number}","events_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/events","assignees_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/assignees{/user}","branches_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/branches{/branch}","tags_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/tags","blobs_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/refs{/sha}","trees_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/trees{/sha}","statuses_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/statuses/{sha}","languages_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/languages","stargazers_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/stargazers","contributors_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/contributors","subscribers_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/subscribers","subscription_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/subscription","commits_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/commits{/sha}","git_commits_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/commits{/sha}","comments_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/comments{/number}","issue_comment_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/comments{/number}","contents_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/contents/{+path}","compare_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/compare/{base}...{head}","merges_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/merges","archive_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/downloads","issues_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues{/number}","pulls_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls{/number}","milestones_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/milestones{/number}","notifications_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/labels{/name}","releases_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/releases{/id}","deployments_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/deployments","created_at":"2021-07-05T14:30:01Z","updated_at":"2021-07-21T06:52:39Z","pushed_at":"2021-07-21T06:55:38Z","git_url":"git://github.com/kawalcovid19/wargabantuwarga.com.git","ssh_url":"git@github.com:kawalcovid19/wargabantuwarga.com.git","clone_url":"https://github.com/kawalcovid19/wargabantuwarga.com.git","svn_url":"https://github.com/kawalcovid19/wargabantuwarga.com","homepage":"https://www.wargabantuwarga.com","size":1660,"stargazers_count":165,"watchers_count":165,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":37,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":53,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":37,"open_issues":53,"watchers":165,"default_branch":"main"}},"base":{"label":"kawalcovid19:main","ref":"main","sha":"551bdf55e8de6ee5c39bdb9de1838304fef8a6b8","user":{"login":"kawalcovid19","id":62234891,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyMjM0ODkx","avatar_url":"https://avatars.githubusercontent.com/u/62234891?v=4","gravatar_id":"","url":"https://api.github.com/users/kawalcovid19","html_url":"https://github.com/kawalcovid19","followers_url":"https://api.github.com/users/kawalcovid19/followers","following_url":"https://api.github.com/users/kawalcovid19/following{/other_user}","gists_url":"https://api.github.com/users/kawalcovid19/gists{/gist_id}","starred_url":"https://api.github.com/users/kawalcovid19/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kawalcovid19/subscriptions","organizations_url":"https://api.github.com/users/kawalcovid19/orgs","repos_url":"https://api.github.com/users/kawalcovid19/repos","events_url":"https://api.github.com/users/kawalcovid19/events{/privacy}","received_events_url":"https://api.github.com/users/kawalcovid19/received_events","type":"Organization","site_admin":false},"repo":{"id":383169156,"node_id":"MDEwOlJlcG9zaXRvcnkzODMxNjkxNTY=","name":"wargabantuwarga.com","full_name":"kawalcovid19/wargabantuwarga.com","private":false,"owner":{"login":"kawalcovid19","id":62234891,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyMjM0ODkx","avatar_url":"https://avatars.githubusercontent.com/u/62234891?v=4","gravatar_id":"","url":"https://api.github.com/users/kawalcovid19","html_url":"https://github.com/kawalcovid19","followers_url":"https://api.github.com/users/kawalcovid19/followers","following_url":"https://api.github.com/users/kawalcovid19/following{/other_user}","gists_url":"https://api.github.com/users/kawalcovid19/gists{/gist_id}","starred_url":"https://api.github.com/users/kawalcovid19/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kawalcovid19/subscriptions","organizations_url":"https://api.github.com/users/kawalcovid19/orgs","repos_url":"https://api.github.com/users/kawalcovid19/repos","events_url":"https://api.github.com/users/kawalcovid19/events{/privacy}","received_events_url":"https://api.github.com/users/kawalcovid19/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/kawalcovid19/wargabantuwarga.com","description":"Inisiatif warga untuk berbagi informasi seputar fasilitas kesehatan dan alat kesehatan untuk COVID-19.","fork":false,"url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com","forks_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/forks","keys_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/keys{/key_id}","collaborators_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/teams","hooks_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/hooks","issue_events_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/events{/number}","events_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/events","assignees_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/assignees{/user}","branches_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/branches{/branch}","tags_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/tags","blobs_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/refs{/sha}","trees_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/trees{/sha}","statuses_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/statuses/{sha}","languages_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/languages","stargazers_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/stargazers","contributors_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/contributors","subscribers_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/subscribers","subscription_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/subscription","commits_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/commits{/sha}","git_commits_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/git/commits{/sha}","comments_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/comments{/number}","issue_comment_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/comments{/number}","contents_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/contents/{+path}","compare_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/compare/{base}...{head}","merges_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/merges","archive_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/downloads","issues_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues{/number}","pulls_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls{/number}","milestones_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/milestones{/number}","notifications_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/labels{/name}","releases_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/releases{/id}","deployments_url":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/deployments","created_at":"2021-07-05T14:30:01Z","updated_at":"2021-07-21T06:52:39Z","pushed_at":"2021-07-21T06:55:38Z","git_url":"git://github.com/kawalcovid19/wargabantuwarga.com.git","ssh_url":"git@github.com:kawalcovid19/wargabantuwarga.com.git","clone_url":"https://github.com/kawalcovid19/wargabantuwarga.com.git","svn_url":"https://github.com/kawalcovid19/wargabantuwarga.com","homepage":"https://www.wargabantuwarga.com","size":1660,"stargazers_count":165,"watchers_count":165,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":37,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":53,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":37,"open_issues":53,"watchers":165,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239"},"html":{"href":"https://github.com/kawalcovid19/wargabantuwarga.com/pull/239"},"issue":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/239"},"comments":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/issues/239/comments"},"review_comments":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239/comments"},"review_comment":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/pulls/239/commits"},"statuses":{"href":"https://api.github.com/repos/kawalcovid19/wargabantuwarga.com/statuses/d50f8c9f091c50f9d134975f2590a6b5dbddd99d"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":62234891,"login":"kawalcovid19","gravatar_id":"","url":"https://api.github.com/orgs/kawalcovid19","avatar_url":"https://avatars.githubusercontent.com/u/62234891?"}}
+{"id":"17244792585","type":"CreateEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"ref":"4636","ref_type":"branch","master_branch":"master","description":"Testing Github Pull requests limits","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792586","type":"WatchEvent","actor":{"id":54252308,"login":"bfan6751","display_login":"bfan6751","gravatar_id":"","url":"https://api.github.com/users/bfan6751","avatar_url":"https://avatars.githubusercontent.com/u/54252308?"},"repo":{"id":280608729,"name":"UZ-SLAMLab/ORB_SLAM3","url":"https://api.github.com/repos/UZ-SLAMLab/ORB_SLAM3"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":25055183,"login":"UZ-SLAMLab","gravatar_id":"","url":"https://api.github.com/orgs/UZ-SLAMLab","avatar_url":"https://avatars.githubusercontent.com/u/25055183?"}}
+{"id":"17244792588","type":"PushEvent","actor":{"id":85989057,"login":"internetzbot","display_login":"internetzbot","gravatar_id":"","url":"https://api.github.com/users/internetzbot","avatar_url":"https://avatars.githubusercontent.com/u/85989057?"},"repo":{"id":377260146,"name":"internetztube/jaukerl-ooe-archive","url":"https://api.github.com/repos/internetztube/jaukerl-ooe-archive"},"payload":{"push_id":7561706523,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"a3b1abfd5e52cb7c5993c1a484dd8c851d73bf26","before":"9c7a65b8a9804d337f9bf30e1f07cbd40bab37fd","commits":[{"sha":"a3b1abfd5e52cb7c5993c1a484dd8c851d73bf26","author":{"name":"internetzbot","email":"c5d6e309f28eeb1bf280506bcf24a90da3518803@users.noreply.github.com"},"message":"Add 2021-07-21T07:00:00+00:00.json.","distinct":true,"url":"https://api.github.com/repos/internetztube/jaukerl-ooe-archive/commits/a3b1abfd5e52cb7c5993c1a484dd8c851d73bf26"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792592","type":"PushEvent","actor":{"id":3379460,"login":"beanslee2012","display_login":"beanslee2012","gravatar_id":"","url":"https://api.github.com/users/beanslee2012","avatar_url":"https://avatars.githubusercontent.com/u/3379460?"},"repo":{"id":215003385,"name":"beanslee2012/games","url":"https://api.github.com/repos/beanslee2012/games"},"payload":{"push_id":7561706526,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"d597a1ea1c79280206699e944c9b1dd315585ded","before":"c07ffe667a2cf2f0497cc701f27ec062b7f9150d","commits":[{"sha":"d597a1ea1c79280206699e944c9b1dd315585ded","author":{"name":"beanslee2012","email":"9aadcc12fe6ab8c01e6245204a102e9e34317220@gmail.com"},"message":"daily update","distinct":true,"url":"https://api.github.com/repos/beanslee2012/games/commits/d597a1ea1c79280206699e944c9b1dd315585ded"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792594","type":"IssueCommentEvent","actor":{"id":3520788,"login":"arnosthavelka","display_login":"arnosthavelka","gravatar_id":"","url":"https://api.github.com/users/arnosthavelka","avatar_url":"https://avatars.githubusercontent.com/u/3520788?"},"repo":{"id":80031573,"name":"arnosthavelka/junit-poc","url":"https://api.github.com/repos/arnosthavelka/junit-poc"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37","repository_url":"https://api.github.com/repos/arnosthavelka/junit-poc","labels_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37/labels{/name}","comments_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37/comments","events_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37/events","html_url":"https://github.com/arnosthavelka/junit-poc/issues/37","id":664238030,"node_id":"MDU6SXNzdWU2NjQyMzgwMzA=","number":37,"title":"Maven profile for JDK previews","user":{"login":"arnosthavelka","id":3520788,"node_id":"MDQ6VXNlcjM1MjA3ODg=","avatar_url":"https://avatars.githubusercontent.com/u/3520788?v=4","gravatar_id":"","url":"https://api.github.com/users/arnosthavelka","html_url":"https://github.com/arnosthavelka","followers_url":"https://api.github.com/users/arnosthavelka/followers","following_url":"https://api.github.com/users/arnosthavelka/following{/other_user}","gists_url":"https://api.github.com/users/arnosthavelka/gists{/gist_id}","starred_url":"https://api.github.com/users/arnosthavelka/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arnosthavelka/subscriptions","organizations_url":"https://api.github.com/users/arnosthavelka/orgs","repos_url":"https://api.github.com/users/arnosthavelka/repos","events_url":"https://api.github.com/users/arnosthavelka/events{/privacy}","received_events_url":"https://api.github.com/users/arnosthavelka/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2020-07-23T06:40:56Z","updated_at":"2021-07-21T07:00:05Z","closed_at":"2021-07-21T07:00:05Z","author_association":"OWNER","active_lock_reason":null,"body":"The preview features are enabled by flag `--enable-preview`. This option has to be added to these maven plugins:\r\n- `maven-compiler-plugin`\r\n- `maven-surefire-plugin`\r\n- `maven-failsafe-plugin`","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/comments/883942818","html_url":"https://github.com/arnosthavelka/junit-poc/issues/37#issuecomment-883942818","issue_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37","id":883942818,"node_id":"IC_kwDOBMUvVc40r-Wi","user":{"login":"arnosthavelka","id":3520788,"node_id":"MDQ6VXNlcjM1MjA3ODg=","avatar_url":"https://avatars.githubusercontent.com/u/3520788?v=4","gravatar_id":"","url":"https://api.github.com/users/arnosthavelka","html_url":"https://github.com/arnosthavelka","followers_url":"https://api.github.com/users/arnosthavelka/followers","following_url":"https://api.github.com/users/arnosthavelka/following{/other_user}","gists_url":"https://api.github.com/users/arnosthavelka/gists{/gist_id}","starred_url":"https://api.github.com/users/arnosthavelka/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arnosthavelka/subscriptions","organizations_url":"https://api.github.com/users/arnosthavelka/orgs","repos_url":"https://api.github.com/users/arnosthavelka/repos","events_url":"https://api.github.com/users/arnosthavelka/events{/privacy}","received_events_url":"https://api.github.com/users/arnosthavelka/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","author_association":"OWNER","body":"The preview features were removed as it complicates JDK upgrades.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792599","type":"PushEvent","actor":{"id":82876799,"login":"hvaish01","display_login":"hvaish01","gravatar_id":"","url":"https://api.github.com/users/hvaish01","avatar_url":"https://avatars.githubusercontent.com/u/82876799?"},"repo":{"id":359772248,"name":"hvaish01/StixBundles","url":"https://api.github.com/repos/hvaish01/StixBundles"},"payload":{"push_id":7561706531,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"9c83fb7bf31c43b73892fd80a90cc607adf902ca","before":"48f098644e5efee0604c33496b7d10ec32444853","commits":[{"sha":"9c83fb7bf31c43b73892fd80a90cc607adf902ca","author":{"name":"hvaish01","email":"2afd248fb67ac19cdeb0148e32ca7ee71c30c76d@users.noreply.github.com"},"message":"Updated at 12:00:04 21-07-2021","distinct":true,"url":"https://api.github.com/repos/hvaish01/StixBundles/commits/9c83fb7bf31c43b73892fd80a90cc607adf902ca"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792602","type":"PullRequestReviewEvent","actor":{"id":12186261,"login":"chengtbf","display_login":"chengtbf","gravatar_id":"","url":"https://api.github.com/users/chengtbf","avatar_url":"https://avatars.githubusercontent.com/u/12186261?"},"repo":{"id":81634683,"name":"Oneflow-Inc/oneflow","url":"https://api.github.com/repos/Oneflow-Inc/oneflow"},"payload":{"action":"created","review":{"id":711317403,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3NDAz","user":{"login":"chengtbf","id":12186261,"node_id":"MDQ6VXNlcjEyMTg2MjYx","avatar_url":"https://avatars.githubusercontent.com/u/12186261?v=4","gravatar_id":"","url":"https://api.github.com/users/chengtbf","html_url":"https://github.com/chengtbf","followers_url":"https://api.github.com/users/chengtbf/followers","following_url":"https://api.github.com/users/chengtbf/following{/other_user}","gists_url":"https://api.github.com/users/chengtbf/gists{/gist_id}","starred_url":"https://api.github.com/users/chengtbf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chengtbf/subscriptions","organizations_url":"https://api.github.com/users/chengtbf/orgs","repos_url":"https://api.github.com/users/chengtbf/repos","events_url":"https://api.github.com/users/chengtbf/events{/privacy}","received_events_url":"https://api.github.com/users/chengtbf/received_events","type":"User","site_admin":false},"body":null,"commit_id":"fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","submitted_at":"2021-07-21T07:00:05Z","state":"commented","html_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533#pullrequestreview-711317403","pull_request_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/Oneflow-Inc/oneflow/pull/5533#pullrequestreview-711317403"},"pull_request":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533"}}},"pull_request":{"url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533","id":692075999,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMDc1OTk5","html_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533","diff_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533.diff","patch_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533.patch","issue_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533","number":5533,"state":"open","locked":false,"title":"Fea/nn graph/optimizer","user":{"login":"strint","id":3468789,"node_id":"MDQ6VXNlcjM0Njg3ODk=","avatar_url":"https://avatars.githubusercontent.com/u/3468789?v=4","gravatar_id":"","url":"https://api.github.com/users/strint","html_url":"https://github.com/strint","followers_url":"https://api.github.com/users/strint/followers","following_url":"https://api.github.com/users/strint/following{/other_user}","gists_url":"https://api.github.com/users/strint/gists{/gist_id}","starred_url":"https://api.github.com/users/strint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/strint/subscriptions","organizations_url":"https://api.github.com/users/strint/orgs","repos_url":"https://api.github.com/users/strint/repos","events_url":"https://api.github.com/users/strint/events{/privacy}","received_events_url":"https://api.github.com/users/strint/received_events","type":"User","site_admin":false},"body":"- [x] add lazy optimizer\r\n- [x] add sgd optimizer\r\n- [x] eager tensor.backward() to lazy add_loss(tensor)\r\n\r\nsupprot l2：在adam + adamw optimizer的pr中处理，已经整理好了思路。\r\n\r\ng.config.proto\r\n```\r\njob_conf {\r\n  job_name: \"CustomGraph0_0\"\r\n  train_conf {\r\n    optimizer_conf {\r\n      variable_op_names: \"m.para0\"   # variable op_name\r\n      variable_op_names: \"m.para1\"\r\n      base_learning_rate: 0.10000000149011612   # lr\r\n      momentum_conf {  # momentum\r\n        beta: 0.20000000298023224  # beta\r\n      }\r\n    }\r\n    optimizer_conf {  # multi optimizer\r\n      variable_op_names: \"m.para3\"\r\n      base_learning_rate: 0.10000000149011612\r\n      momentum_conf {\r\n        beta: 0.20000000298023224\r\n      }\r\n    }\r\n    optimizer_conf {\r\n      variable_op_names: \"m.para4\"\r\n      base_learning_rate: 0.10000000149011612\r\n      momentum_conf {\r\n        beta: 0.20000000298023224\r\n      }\r\n    }\r\n    loss_lbn: \"input_0/out\"  # losss\r\n    loss_scale_factor: 0.30000001192092896  # scale\r\n  }\r\n}\r\n```","created_at":"2021-07-18T11:47:06Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3bd4b8cfefed1200a2bc0de3654eddac0a9b0dd6","assignee":null,"assignees":[],"requested_reviewers":[{"login":"leaves-zwx","id":7133477,"node_id":"MDQ6VXNlcjcxMzM0Nzc=","avatar_url":"https://avatars.githubusercontent.com/u/7133477?v=4","gravatar_id":"","url":"https://api.github.com/users/leaves-zwx","html_url":"https://github.com/leaves-zwx","followers_url":"https://api.github.com/users/leaves-zwx/followers","following_url":"https://api.github.com/users/leaves-zwx/following{/other_user}","gists_url":"https://api.github.com/users/leaves-zwx/gists{/gist_id}","starred_url":"https://api.github.com/users/leaves-zwx/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/leaves-zwx/subscriptions","organizations_url":"https://api.github.com/users/leaves-zwx/orgs","repos_url":"https://api.github.com/users/leaves-zwx/repos","events_url":"https://api.github.com/users/leaves-zwx/events{/privacy}","received_events_url":"https://api.github.com/users/leaves-zwx/received_events","type":"User","site_admin":false},{"login":"wyg1997","id":39889784,"node_id":"MDQ6VXNlcjM5ODg5Nzg0","avatar_url":"https://avatars.githubusercontent.com/u/39889784?v=4","gravatar_id":"","url":"https://api.github.com/users/wyg1997","html_url":"https://github.com/wyg1997","followers_url":"https://api.github.com/users/wyg1997/followers","following_url":"https://api.github.com/users/wyg1997/following{/other_user}","gists_url":"https://api.github.com/users/wyg1997/gists{/gist_id}","starred_url":"https://api.github.com/users/wyg1997/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wyg1997/subscriptions","organizations_url":"https://api.github.com/users/wyg1997/orgs","repos_url":"https://api.github.com/users/wyg1997/repos","events_url":"https://api.github.com/users/wyg1997/events{/privacy}","received_events_url":"https://api.github.com/users/wyg1997/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[{"id":857671186,"node_id":"MDU6TGFiZWw4NTc2NzExODY=","url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels/feature","name":"feature","color":"b127e8","default":false,"description":""},{"id":2424339898,"node_id":"MDU6TGFiZWwyNDI0MzM5ODk4","url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels/system","name":"system","color":"26d6ad","default":false,"description":""}],"milestone":{"url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones/7","html_url":"https://github.com/Oneflow-Inc/oneflow/milestone/7","labels_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones/7/labels","id":6786003,"node_id":"MDk6TWlsZXN0b25lNjc4NjAwMw==","number":7,"title":"v0.5.0","description":"The first anniversary of open source of OneFlow.\r\n\r\nEager new features:\r\n- Support Eager **Mirror** paralllel strategy in multi-devices\r\n- Support Eager **Consistent** paralllel strategy in multi-devices\r\n- nn.Module add a lot of ops\r\n\r\nFully compatible with pytorch interface, just `import oneflow as torch`.\r\n- flow.experimental.xx -> flow.xx\r\n- Old versions of interfaces (like tensorflow 1.x) will no longer be supported\r\n- Run OneFlow Lazy Consistent distribute training with 1.0 interface API （flow.nn.Graph）\r\n","creator":{"login":"chengtbf","id":12186261,"node_id":"MDQ6VXNlcjEyMTg2MjYx","avatar_url":"https://avatars.githubusercontent.com/u/12186261?v=4","gravatar_id":"","url":"https://api.github.com/users/chengtbf","html_url":"https://github.com/chengtbf","followers_url":"https://api.github.com/users/chengtbf/followers","following_url":"https://api.github.com/users/chengtbf/following{/other_user}","gists_url":"https://api.github.com/users/chengtbf/gists{/gist_id}","starred_url":"https://api.github.com/users/chengtbf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chengtbf/subscriptions","organizations_url":"https://api.github.com/users/chengtbf/orgs","repos_url":"https://api.github.com/users/chengtbf/repos","events_url":"https://api.github.com/users/chengtbf/events{/privacy}","received_events_url":"https://api.github.com/users/chengtbf/received_events","type":"User","site_admin":false},"open_issues":2,"closed_issues":16,"state":"open","created_at":"2021-05-24T07:59:37Z","updated_at":"2021-07-20T11:14:50Z","due_on":"2021-07-31T07:00:00Z","closed_at":null},"draft":false,"commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/commits","review_comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/comments","review_comment_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533/comments","statuses_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","head":{"label":"Oneflow-Inc:fea/nn_graph/optimizer","ref":"fea/nn_graph/optimizer","sha":"fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","user":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"repo":{"id":81634683,"node_id":"MDEwOlJlcG9zaXRvcnk4MTYzNDY4Mw==","name":"oneflow","full_name":"Oneflow-Inc/oneflow","private":false,"owner":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Oneflow-Inc/oneflow","description":"OneFlow is a performance-centered and open-source deep learning framework.","fork":false,"url":"https://api.github.com/repos/Oneflow-Inc/oneflow","forks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/forks","keys_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/teams","hooks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/hooks","issue_events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/events{/number}","events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/events","assignees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/assignees{/user}","branches_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/branches{/branch}","tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/tags","blobs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/refs{/sha}","trees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/{sha}","languages_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/languages","stargazers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/stargazers","contributors_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contributors","subscribers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscribers","subscription_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscription","commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/commits{/sha}","git_commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/commits{/sha}","comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/comments{/number}","issue_comment_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/comments{/number}","contents_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contents/{+path}","compare_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/merges","archive_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/downloads","issues_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues{/number}","pulls_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls{/number}","milestones_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones{/number}","notifications_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels{/name}","releases_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/releases{/id}","deployments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/deployments","created_at":"2017-02-11T06:09:53Z","updated_at":"2021-07-21T03:19:28Z","pushed_at":"2021-07-21T06:58:35Z","git_url":"git://github.com/Oneflow-Inc/oneflow.git","ssh_url":"git@github.com:Oneflow-Inc/oneflow.git","clone_url":"https://github.com/Oneflow-Inc/oneflow.git","svn_url":"https://github.com/Oneflow-Inc/oneflow","homepage":"http://www.oneflow.org","size":44881,"stargazers_count":2545,"watchers_count":2545,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":284,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":261,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":284,"open_issues":261,"watchers":2545,"default_branch":"master"}},"base":{"label":"Oneflow-Inc:fea/nn_graph/forward_graph","ref":"fea/nn_graph/forward_graph","sha":"b93ad178de46e2b81f83c5c645c6989f12dabbee","user":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"repo":{"id":81634683,"node_id":"MDEwOlJlcG9zaXRvcnk4MTYzNDY4Mw==","name":"oneflow","full_name":"Oneflow-Inc/oneflow","private":false,"owner":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Oneflow-Inc/oneflow","description":"OneFlow is a performance-centered and open-source deep learning framework.","fork":false,"url":"https://api.github.com/repos/Oneflow-Inc/oneflow","forks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/forks","keys_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/teams","hooks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/hooks","issue_events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/events{/number}","events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/events","assignees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/assignees{/user}","branches_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/branches{/branch}","tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/tags","blobs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/refs{/sha}","trees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/{sha}","languages_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/languages","stargazers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/stargazers","contributors_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contributors","subscribers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscribers","subscription_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscription","commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/commits{/sha}","git_commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/commits{/sha}","comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/comments{/number}","issue_comment_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/comments{/number}","contents_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contents/{+path}","compare_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/merges","archive_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/downloads","issues_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues{/number}","pulls_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls{/number}","milestones_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones{/number}","notifications_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels{/name}","releases_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/releases{/id}","deployments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/deployments","created_at":"2017-02-11T06:09:53Z","updated_at":"2021-07-21T03:19:28Z","pushed_at":"2021-07-21T06:58:35Z","git_url":"git://github.com/Oneflow-Inc/oneflow.git","ssh_url":"git@github.com:Oneflow-Inc/oneflow.git","clone_url":"https://github.com/Oneflow-Inc/oneflow.git","svn_url":"https://github.com/Oneflow-Inc/oneflow","homepage":"http://www.oneflow.org","size":44881,"stargazers_count":2545,"watchers_count":2545,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":284,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":261,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":284,"open_issues":261,"watchers":2545,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533"},"html":{"href":"https://github.com/Oneflow-Inc/oneflow/pull/5533"},"issue":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533"},"comments":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533/comments"},"review_comments":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/comments"},"review_comment":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/commits"},"statuses":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/fce5c08c04e97e6eb4cc8ba5b97aed34472382b7"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":24632470,"login":"Oneflow-Inc","gravatar_id":"","url":"https://api.github.com/orgs/Oneflow-Inc","avatar_url":"https://avatars.githubusercontent.com/u/24632470?"}}
+{"id":"17244792607","type":"PullRequestEvent","actor":{"id":1005065,"login":"DeepDiver1975","display_login":"DeepDiver1975","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","avatar_url":"https://avatars.githubusercontent.com/u/1005065?"},"repo":{"id":386559157,"name":"DeepDiver1975/laravel-cursor-paginator","url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator"},"payload":{"action":"closed","number":6,"pull_request":{"url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/6","id":694104352,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0MzUy","html_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator/pull/6","diff_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator/pull/6.diff","patch_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator/pull/6.patch","issue_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/6","number":6,"state":"closed","locked":false,"title":"Create dependabot.yml","user":{"login":"DeepDiver1975","id":1005065,"node_id":"MDQ6VXNlcjEwMDUwNjU=","avatar_url":"https://avatars.githubusercontent.com/u/1005065?v=4","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","html_url":"https://github.com/DeepDiver1975","followers_url":"https://api.github.com/users/DeepDiver1975/followers","following_url":"https://api.github.com/users/DeepDiver1975/following{/other_user}","gists_url":"https://api.github.com/users/DeepDiver1975/gists{/gist_id}","starred_url":"https://api.github.com/users/DeepDiver1975/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DeepDiver1975/subscriptions","organizations_url":"https://api.github.com/users/DeepDiver1975/orgs","repos_url":"https://api.github.com/users/DeepDiver1975/repos","events_url":"https://api.github.com/users/DeepDiver1975/events{/privacy}","received_events_url":"https://api.github.com/users/DeepDiver1975/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T06:59:02Z","updated_at":"2021-07-21T07:00:05Z","closed_at":"2021-07-21T07:00:05Z","merged_at":"2021-07-21T07:00:05Z","merge_commit_sha":"968ae80b6cb4f587eddbd69c4e8cbf7d0ac38ecb","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/6/commits","review_comments_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/6/comments","review_comment_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/comments{/number}","comments_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/6/comments","statuses_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/statuses/76945b443f10b16f5b98af9665023bcef65787cb","head":{"label":"DeepDiver1975:feat/dependabot","ref":"feat/dependabot","sha":"76945b443f10b16f5b98af9665023bcef65787cb","user":{"login":"DeepDiver1975","id":1005065,"node_id":"MDQ6VXNlcjEwMDUwNjU=","avatar_url":"https://avatars.githubusercontent.com/u/1005065?v=4","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","html_url":"https://github.com/DeepDiver1975","followers_url":"https://api.github.com/users/DeepDiver1975/followers","following_url":"https://api.github.com/users/DeepDiver1975/following{/other_user}","gists_url":"https://api.github.com/users/DeepDiver1975/gists{/gist_id}","starred_url":"https://api.github.com/users/DeepDiver1975/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DeepDiver1975/subscriptions","organizations_url":"https://api.github.com/users/DeepDiver1975/orgs","repos_url":"https://api.github.com/users/DeepDiver1975/repos","events_url":"https://api.github.com/users/DeepDiver1975/events{/privacy}","received_events_url":"https://api.github.com/users/DeepDiver1975/received_events","type":"User","site_admin":false},"repo":{"id":386559157,"node_id":"MDEwOlJlcG9zaXRvcnkzODY1NTkxNTc=","name":"laravel-cursor-paginator","full_name":"DeepDiver1975/laravel-cursor-paginator","private":false,"owner":{"login":"DeepDiver1975","id":1005065,"node_id":"MDQ6VXNlcjEwMDUwNjU=","avatar_url":"https://avatars.githubusercontent.com/u/1005065?v=4","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","html_url":"https://github.com/DeepDiver1975","followers_url":"https://api.github.com/users/DeepDiver1975/followers","following_url":"https://api.github.com/users/DeepDiver1975/following{/other_user}","gists_url":"https://api.github.com/users/DeepDiver1975/gists{/gist_id}","starred_url":"https://api.github.com/users/DeepDiver1975/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DeepDiver1975/subscriptions","organizations_url":"https://api.github.com/users/DeepDiver1975/orgs","repos_url":"https://api.github.com/users/DeepDiver1975/repos","events_url":"https://api.github.com/users/DeepDiver1975/events{/privacy}","received_events_url":"https://api.github.com/users/DeepDiver1975/received_events","type":"User","site_admin":false},"html_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator","description":"Cursor pagination for Laravel","fork":true,"url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator","forks_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/forks","keys_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/teams","hooks_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/hooks","issue_events_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/events{/number}","events_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/events","assignees_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/assignees{/user}","branches_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/branches{/branch}","tags_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/tags","blobs_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/refs{/sha}","trees_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/statuses/{sha}","languages_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/languages","stargazers_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/stargazers","contributors_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/contributors","subscribers_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/subscribers","subscription_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/subscription","commits_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/commits{/sha}","git_commits_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/commits{/sha}","comments_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/comments{/number}","issue_comment_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/comments{/number}","contents_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/contents/{+path}","compare_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/merges","archive_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/downloads","issues_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues{/number}","pulls_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls{/number}","milestones_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/milestones{/number}","notifications_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/labels{/name}","releases_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/releases{/id}","deployments_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/deployments","created_at":"2021-07-16T08:04:17Z","updated_at":"2021-07-16T10:15:05Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/DeepDiver1975/laravel-cursor-paginator.git","ssh_url":"git@github.com:DeepDiver1975/laravel-cursor-paginator.git","clone_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator.git","svn_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator","homepage":null,"size":197,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"DeepDiver1975:master","ref":"master","sha":"9d3751c0a369ca0f6435afb03eba7e175f83041a","user":{"login":"DeepDiver1975","id":1005065,"node_id":"MDQ6VXNlcjEwMDUwNjU=","avatar_url":"https://avatars.githubusercontent.com/u/1005065?v=4","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","html_url":"https://github.com/DeepDiver1975","followers_url":"https://api.github.com/users/DeepDiver1975/followers","following_url":"https://api.github.com/users/DeepDiver1975/following{/other_user}","gists_url":"https://api.github.com/users/DeepDiver1975/gists{/gist_id}","starred_url":"https://api.github.com/users/DeepDiver1975/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DeepDiver1975/subscriptions","organizations_url":"https://api.github.com/users/DeepDiver1975/orgs","repos_url":"https://api.github.com/users/DeepDiver1975/repos","events_url":"https://api.github.com/users/DeepDiver1975/events{/privacy}","received_events_url":"https://api.github.com/users/DeepDiver1975/received_events","type":"User","site_admin":false},"repo":{"id":386559157,"node_id":"MDEwOlJlcG9zaXRvcnkzODY1NTkxNTc=","name":"laravel-cursor-paginator","full_name":"DeepDiver1975/laravel-cursor-paginator","private":false,"owner":{"login":"DeepDiver1975","id":1005065,"node_id":"MDQ6VXNlcjEwMDUwNjU=","avatar_url":"https://avatars.githubusercontent.com/u/1005065?v=4","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","html_url":"https://github.com/DeepDiver1975","followers_url":"https://api.github.com/users/DeepDiver1975/followers","following_url":"https://api.github.com/users/DeepDiver1975/following{/other_user}","gists_url":"https://api.github.com/users/DeepDiver1975/gists{/gist_id}","starred_url":"https://api.github.com/users/DeepDiver1975/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DeepDiver1975/subscriptions","organizations_url":"https://api.github.com/users/DeepDiver1975/orgs","repos_url":"https://api.github.com/users/DeepDiver1975/repos","events_url":"https://api.github.com/users/DeepDiver1975/events{/privacy}","received_events_url":"https://api.github.com/users/DeepDiver1975/received_events","type":"User","site_admin":false},"html_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator","description":"Cursor pagination for Laravel","fork":true,"url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator","forks_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/forks","keys_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/teams","hooks_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/hooks","issue_events_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/events{/number}","events_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/events","assignees_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/assignees{/user}","branches_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/branches{/branch}","tags_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/tags","blobs_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/refs{/sha}","trees_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/statuses/{sha}","languages_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/languages","stargazers_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/stargazers","contributors_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/contributors","subscribers_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/subscribers","subscription_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/subscription","commits_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/commits{/sha}","git_commits_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/git/commits{/sha}","comments_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/comments{/number}","issue_comment_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/comments{/number}","contents_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/contents/{+path}","compare_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/merges","archive_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/downloads","issues_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues{/number}","pulls_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls{/number}","milestones_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/milestones{/number}","notifications_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/labels{/name}","releases_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/releases{/id}","deployments_url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/deployments","created_at":"2021-07-16T08:04:17Z","updated_at":"2021-07-16T10:15:05Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/DeepDiver1975/laravel-cursor-paginator.git","ssh_url":"git@github.com:DeepDiver1975/laravel-cursor-paginator.git","clone_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator.git","svn_url":"https://github.com/DeepDiver1975/laravel-cursor-paginator","homepage":null,"size":197,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/6"},"html":{"href":"https://github.com/DeepDiver1975/laravel-cursor-paginator/pull/6"},"issue":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/6"},"comments":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/issues/6/comments"},"review_comments":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/6/comments"},"review_comment":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/pulls/6/commits"},"statuses":{"href":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator/statuses/76945b443f10b16f5b98af9665023bcef65787cb"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"DeepDiver1975","id":1005065,"node_id":"MDQ6VXNlcjEwMDUwNjU=","avatar_url":"https://avatars.githubusercontent.com/u/1005065?v=4","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","html_url":"https://github.com/DeepDiver1975","followers_url":"https://api.github.com/users/DeepDiver1975/followers","following_url":"https://api.github.com/users/DeepDiver1975/following{/other_user}","gists_url":"https://api.github.com/users/DeepDiver1975/gists{/gist_id}","starred_url":"https://api.github.com/users/DeepDiver1975/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DeepDiver1975/subscriptions","organizations_url":"https://api.github.com/users/DeepDiver1975/orgs","repos_url":"https://api.github.com/users/DeepDiver1975/repos","events_url":"https://api.github.com/users/DeepDiver1975/events{/privacy}","received_events_url":"https://api.github.com/users/DeepDiver1975/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":6,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792608","type":"PullRequestReviewCommentEvent","actor":{"id":12186261,"login":"chengtbf","display_login":"chengtbf","gravatar_id":"","url":"https://api.github.com/users/chengtbf","avatar_url":"https://avatars.githubusercontent.com/u/12186261?"},"repo":{"id":81634683,"name":"Oneflow-Inc/oneflow","url":"https://api.github.com/repos/Oneflow-Inc/oneflow"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/comments/673711151","pull_request_review_id":711317403,"id":673711151,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3MzcxMTE1MQ==","diff_hunk":"@@ -189,6 +192,9 @@ class MirroredTensor final : public TensorIf<MirroredTensor>,\n     impl_->set_autograd_meta(autograd_meta);\n   }\n \n+  // Tensor.backward() to lazy add_loss(Tensor)\n+  Maybe<void> add_as_lazy_loss() const override { OF_UNIMPLEMENTED(); }","path":"oneflow/core/framework/tensor.h","position":15,"original_position":15,"commit_id":"fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","original_commit_id":"fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","user":{"login":"chengtbf","id":12186261,"node_id":"MDQ6VXNlcjEyMTg2MjYx","avatar_url":"https://avatars.githubusercontent.com/u/12186261?v=4","gravatar_id":"","url":"https://api.github.com/users/chengtbf","html_url":"https://github.com/chengtbf","followers_url":"https://api.github.com/users/chengtbf/followers","following_url":"https://api.github.com/users/chengtbf/following{/other_user}","gists_url":"https://api.github.com/users/chengtbf/gists{/gist_id}","starred_url":"https://api.github.com/users/chengtbf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chengtbf/subscriptions","organizations_url":"https://api.github.com/users/chengtbf/orgs","repos_url":"https://api.github.com/users/chengtbf/repos","events_url":"https://api.github.com/users/chengtbf/events{/privacy}","received_events_url":"https://api.github.com/users/chengtbf/received_events","type":"User","site_admin":false},"body":"这里没必要是只支持 Consistent Tensor 吧。Lazy 里的 Blob 是 Consistent 的，但我想 module 里的 LazyTensor 仍然允许是 Local 的，只是我 add op 的时候处理成 Consistent 就行了","created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","html_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533#discussion_r673711151","pull_request_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/comments/673711151"},"html":{"href":"https://github.com/Oneflow-Inc/oneflow/pull/5533#discussion_r673711151"},"pull_request":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533"}},"start_line":null,"original_start_line":null,"start_side":null,"line":196,"original_line":196,"side":"RIGHT"},"pull_request":{"url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533","id":692075999,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMDc1OTk5","html_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533","diff_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533.diff","patch_url":"https://github.com/Oneflow-Inc/oneflow/pull/5533.patch","issue_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533","number":5533,"state":"open","locked":false,"title":"Fea/nn graph/optimizer","user":{"login":"strint","id":3468789,"node_id":"MDQ6VXNlcjM0Njg3ODk=","avatar_url":"https://avatars.githubusercontent.com/u/3468789?v=4","gravatar_id":"","url":"https://api.github.com/users/strint","html_url":"https://github.com/strint","followers_url":"https://api.github.com/users/strint/followers","following_url":"https://api.github.com/users/strint/following{/other_user}","gists_url":"https://api.github.com/users/strint/gists{/gist_id}","starred_url":"https://api.github.com/users/strint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/strint/subscriptions","organizations_url":"https://api.github.com/users/strint/orgs","repos_url":"https://api.github.com/users/strint/repos","events_url":"https://api.github.com/users/strint/events{/privacy}","received_events_url":"https://api.github.com/users/strint/received_events","type":"User","site_admin":false},"body":"- [x] add lazy optimizer\r\n- [x] add sgd optimizer\r\n- [x] eager tensor.backward() to lazy add_loss(tensor)\r\n\r\nsupprot l2：在adam + adamw optimizer的pr中处理，已经整理好了思路。\r\n\r\ng.config.proto\r\n```\r\njob_conf {\r\n  job_name: \"CustomGraph0_0\"\r\n  train_conf {\r\n    optimizer_conf {\r\n      variable_op_names: \"m.para0\"   # variable op_name\r\n      variable_op_names: \"m.para1\"\r\n      base_learning_rate: 0.10000000149011612   # lr\r\n      momentum_conf {  # momentum\r\n        beta: 0.20000000298023224  # beta\r\n      }\r\n    }\r\n    optimizer_conf {  # multi optimizer\r\n      variable_op_names: \"m.para3\"\r\n      base_learning_rate: 0.10000000149011612\r\n      momentum_conf {\r\n        beta: 0.20000000298023224\r\n      }\r\n    }\r\n    optimizer_conf {\r\n      variable_op_names: \"m.para4\"\r\n      base_learning_rate: 0.10000000149011612\r\n      momentum_conf {\r\n        beta: 0.20000000298023224\r\n      }\r\n    }\r\n    loss_lbn: \"input_0/out\"  # losss\r\n    loss_scale_factor: 0.30000001192092896  # scale\r\n  }\r\n}\r\n```","created_at":"2021-07-18T11:47:06Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3bd4b8cfefed1200a2bc0de3654eddac0a9b0dd6","assignee":null,"assignees":[],"requested_reviewers":[{"login":"leaves-zwx","id":7133477,"node_id":"MDQ6VXNlcjcxMzM0Nzc=","avatar_url":"https://avatars.githubusercontent.com/u/7133477?v=4","gravatar_id":"","url":"https://api.github.com/users/leaves-zwx","html_url":"https://github.com/leaves-zwx","followers_url":"https://api.github.com/users/leaves-zwx/followers","following_url":"https://api.github.com/users/leaves-zwx/following{/other_user}","gists_url":"https://api.github.com/users/leaves-zwx/gists{/gist_id}","starred_url":"https://api.github.com/users/leaves-zwx/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/leaves-zwx/subscriptions","organizations_url":"https://api.github.com/users/leaves-zwx/orgs","repos_url":"https://api.github.com/users/leaves-zwx/repos","events_url":"https://api.github.com/users/leaves-zwx/events{/privacy}","received_events_url":"https://api.github.com/users/leaves-zwx/received_events","type":"User","site_admin":false},{"login":"wyg1997","id":39889784,"node_id":"MDQ6VXNlcjM5ODg5Nzg0","avatar_url":"https://avatars.githubusercontent.com/u/39889784?v=4","gravatar_id":"","url":"https://api.github.com/users/wyg1997","html_url":"https://github.com/wyg1997","followers_url":"https://api.github.com/users/wyg1997/followers","following_url":"https://api.github.com/users/wyg1997/following{/other_user}","gists_url":"https://api.github.com/users/wyg1997/gists{/gist_id}","starred_url":"https://api.github.com/users/wyg1997/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wyg1997/subscriptions","organizations_url":"https://api.github.com/users/wyg1997/orgs","repos_url":"https://api.github.com/users/wyg1997/repos","events_url":"https://api.github.com/users/wyg1997/events{/privacy}","received_events_url":"https://api.github.com/users/wyg1997/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[{"id":857671186,"node_id":"MDU6TGFiZWw4NTc2NzExODY=","url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels/feature","name":"feature","color":"b127e8","default":false,"description":""},{"id":2424339898,"node_id":"MDU6TGFiZWwyNDI0MzM5ODk4","url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels/system","name":"system","color":"26d6ad","default":false,"description":""}],"milestone":{"url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones/7","html_url":"https://github.com/Oneflow-Inc/oneflow/milestone/7","labels_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones/7/labels","id":6786003,"node_id":"MDk6TWlsZXN0b25lNjc4NjAwMw==","number":7,"title":"v0.5.0","description":"The first anniversary of open source of OneFlow.\r\n\r\nEager new features:\r\n- Support Eager **Mirror** paralllel strategy in multi-devices\r\n- Support Eager **Consistent** paralllel strategy in multi-devices\r\n- nn.Module add a lot of ops\r\n\r\nFully compatible with pytorch interface, just `import oneflow as torch`.\r\n- flow.experimental.xx -> flow.xx\r\n- Old versions of interfaces (like tensorflow 1.x) will no longer be supported\r\n- Run OneFlow Lazy Consistent distribute training with 1.0 interface API （flow.nn.Graph）\r\n","creator":{"login":"chengtbf","id":12186261,"node_id":"MDQ6VXNlcjEyMTg2MjYx","avatar_url":"https://avatars.githubusercontent.com/u/12186261?v=4","gravatar_id":"","url":"https://api.github.com/users/chengtbf","html_url":"https://github.com/chengtbf","followers_url":"https://api.github.com/users/chengtbf/followers","following_url":"https://api.github.com/users/chengtbf/following{/other_user}","gists_url":"https://api.github.com/users/chengtbf/gists{/gist_id}","starred_url":"https://api.github.com/users/chengtbf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chengtbf/subscriptions","organizations_url":"https://api.github.com/users/chengtbf/orgs","repos_url":"https://api.github.com/users/chengtbf/repos","events_url":"https://api.github.com/users/chengtbf/events{/privacy}","received_events_url":"https://api.github.com/users/chengtbf/received_events","type":"User","site_admin":false},"open_issues":2,"closed_issues":16,"state":"open","created_at":"2021-05-24T07:59:37Z","updated_at":"2021-07-20T11:14:50Z","due_on":"2021-07-31T07:00:00Z","closed_at":null},"draft":false,"commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/commits","review_comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/comments","review_comment_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533/comments","statuses_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","head":{"label":"Oneflow-Inc:fea/nn_graph/optimizer","ref":"fea/nn_graph/optimizer","sha":"fce5c08c04e97e6eb4cc8ba5b97aed34472382b7","user":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"repo":{"id":81634683,"node_id":"MDEwOlJlcG9zaXRvcnk4MTYzNDY4Mw==","name":"oneflow","full_name":"Oneflow-Inc/oneflow","private":false,"owner":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Oneflow-Inc/oneflow","description":"OneFlow is a performance-centered and open-source deep learning framework.","fork":false,"url":"https://api.github.com/repos/Oneflow-Inc/oneflow","forks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/forks","keys_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/teams","hooks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/hooks","issue_events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/events{/number}","events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/events","assignees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/assignees{/user}","branches_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/branches{/branch}","tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/tags","blobs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/refs{/sha}","trees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/{sha}","languages_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/languages","stargazers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/stargazers","contributors_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contributors","subscribers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscribers","subscription_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscription","commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/commits{/sha}","git_commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/commits{/sha}","comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/comments{/number}","issue_comment_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/comments{/number}","contents_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contents/{+path}","compare_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/merges","archive_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/downloads","issues_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues{/number}","pulls_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls{/number}","milestones_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones{/number}","notifications_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels{/name}","releases_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/releases{/id}","deployments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/deployments","created_at":"2017-02-11T06:09:53Z","updated_at":"2021-07-21T03:19:28Z","pushed_at":"2021-07-21T06:58:35Z","git_url":"git://github.com/Oneflow-Inc/oneflow.git","ssh_url":"git@github.com:Oneflow-Inc/oneflow.git","clone_url":"https://github.com/Oneflow-Inc/oneflow.git","svn_url":"https://github.com/Oneflow-Inc/oneflow","homepage":"http://www.oneflow.org","size":44881,"stargazers_count":2545,"watchers_count":2545,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":284,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":261,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":284,"open_issues":261,"watchers":2545,"default_branch":"master"}},"base":{"label":"Oneflow-Inc:fea/nn_graph/forward_graph","ref":"fea/nn_graph/forward_graph","sha":"b93ad178de46e2b81f83c5c645c6989f12dabbee","user":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"repo":{"id":81634683,"node_id":"MDEwOlJlcG9zaXRvcnk4MTYzNDY4Mw==","name":"oneflow","full_name":"Oneflow-Inc/oneflow","private":false,"owner":{"login":"Oneflow-Inc","id":24632470,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI0NjMyNDcw","avatar_url":"https://avatars.githubusercontent.com/u/24632470?v=4","gravatar_id":"","url":"https://api.github.com/users/Oneflow-Inc","html_url":"https://github.com/Oneflow-Inc","followers_url":"https://api.github.com/users/Oneflow-Inc/followers","following_url":"https://api.github.com/users/Oneflow-Inc/following{/other_user}","gists_url":"https://api.github.com/users/Oneflow-Inc/gists{/gist_id}","starred_url":"https://api.github.com/users/Oneflow-Inc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Oneflow-Inc/subscriptions","organizations_url":"https://api.github.com/users/Oneflow-Inc/orgs","repos_url":"https://api.github.com/users/Oneflow-Inc/repos","events_url":"https://api.github.com/users/Oneflow-Inc/events{/privacy}","received_events_url":"https://api.github.com/users/Oneflow-Inc/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Oneflow-Inc/oneflow","description":"OneFlow is a performance-centered and open-source deep learning framework.","fork":false,"url":"https://api.github.com/repos/Oneflow-Inc/oneflow","forks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/forks","keys_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/teams","hooks_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/hooks","issue_events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/events{/number}","events_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/events","assignees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/assignees{/user}","branches_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/branches{/branch}","tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/tags","blobs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/refs{/sha}","trees_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/{sha}","languages_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/languages","stargazers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/stargazers","contributors_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contributors","subscribers_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscribers","subscription_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/subscription","commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/commits{/sha}","git_commits_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/git/commits{/sha}","comments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/comments{/number}","issue_comment_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/comments{/number}","contents_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/contents/{+path}","compare_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/merges","archive_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/downloads","issues_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues{/number}","pulls_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls{/number}","milestones_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/milestones{/number}","notifications_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/labels{/name}","releases_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/releases{/id}","deployments_url":"https://api.github.com/repos/Oneflow-Inc/oneflow/deployments","created_at":"2017-02-11T06:09:53Z","updated_at":"2021-07-21T03:19:28Z","pushed_at":"2021-07-21T06:58:35Z","git_url":"git://github.com/Oneflow-Inc/oneflow.git","ssh_url":"git@github.com:Oneflow-Inc/oneflow.git","clone_url":"https://github.com/Oneflow-Inc/oneflow.git","svn_url":"https://github.com/Oneflow-Inc/oneflow","homepage":"http://www.oneflow.org","size":44881,"stargazers_count":2545,"watchers_count":2545,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":284,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":261,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":284,"open_issues":261,"watchers":2545,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533"},"html":{"href":"https://github.com/Oneflow-Inc/oneflow/pull/5533"},"issue":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533"},"comments":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/issues/5533/comments"},"review_comments":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/comments"},"review_comment":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/pulls/5533/commits"},"statuses":{"href":"https://api.github.com/repos/Oneflow-Inc/oneflow/statuses/fce5c08c04e97e6eb4cc8ba5b97aed34472382b7"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":24632470,"login":"Oneflow-Inc","gravatar_id":"","url":"https://api.github.com/orgs/Oneflow-Inc","avatar_url":"https://avatars.githubusercontent.com/u/24632470?"}}
+{"id":"17244792612","type":"PushEvent","actor":{"id":22955941,"login":"Volodichev","display_login":"Volodichev","gravatar_id":"","url":"https://api.github.com/users/Volodichev","avatar_url":"https://avatars.githubusercontent.com/u/22955941?"},"repo":{"id":374556291,"name":"Volodichev/proxy-list","url":"https://api.github.com/repos/Volodichev/proxy-list"},"payload":{"push_id":7561706536,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"20b0d04f5f704554b8a0198a6de18175ff2af93b","before":"d88fed842c5252fff44229061355698c72c21a23","commits":[{"sha":"20b0d04f5f704554b8a0198a6de18175ff2af93b","author":{"name":"Alexander","email":"db02dbb7d5376400a8069895ae273c92e0d1f31d@gmail.com"},"message":"awm proxy 21.07.21 10:00:01","distinct":true,"url":"https://api.github.com/repos/Volodichev/proxy-list/commits/20b0d04f5f704554b8a0198a6de18175ff2af93b"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792613","type":"CreateEvent","actor":{"id":10321883,"login":"qin-guan","display_login":"qin-guan","gravatar_id":"","url":"https://api.github.com/users/qin-guan","avatar_url":"https://avatars.githubusercontent.com/u/10321883?"},"repo":{"id":387750388,"name":"sst-inc/help","url":"https://api.github.com/repos/sst-inc/help"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":51281060,"login":"sst-inc","gravatar_id":"","url":"https://api.github.com/orgs/sst-inc","avatar_url":"https://avatars.githubusercontent.com/u/51281060?"}}
+{"id":"17244792615","type":"PushEvent","actor":{"id":66846932,"login":"resufer","display_login":"resufer","gravatar_id":"","url":"https://api.github.com/users/resufer","avatar_url":"https://avatars.githubusercontent.com/u/66846932?"},"repo":{"id":344154965,"name":"resufer/Miscellanea","url":"https://api.github.com/repos/resufer/Miscellanea"},"payload":{"push_id":7561706534,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f85e4c0a6013d5fff68e3a7f65f6d5097b7b8e6e","before":"5bb9253e263d5f71dbe494ea3e06497cdd733350","commits":[{"sha":"f85e4c0a6013d5fff68e3a7f65f6d5097b7b8e6e","author":{"name":"resufer","email":"598486b7100af8abb650bafeaa809e30ef0df506@users.noreply.github.com"},"message":"Create data.txt","distinct":true,"url":"https://api.github.com/repos/resufer/Miscellanea/commits/f85e4c0a6013d5fff68e3a7f65f6d5097b7b8e6e"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792617","type":"PushEvent","actor":{"id":68223916,"login":"June-Ruth","display_login":"June-Ruth","gravatar_id":"","url":"https://api.github.com/users/June-Ruth","avatar_url":"https://avatars.githubusercontent.com/u/68223916?"},"repo":{"id":368489955,"name":"June-Ruth/OC-Java-Projet8","url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8"},"payload":{"push_id":7561706541,"size":76,"distinct_size":1,"ref":"refs/heads/main","head":"c36cb8a0c99f924e94fa0c195645729b806a912d","before":"52520c99637be508e6722a9b35bf3d0c5caf3dc4","commits":[{"sha":"8a070824c6abb6930fabddaf40e8ef3a7472c063","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"add locale US to tests","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/8a070824c6abb6930fabddaf40e8ef3a7472c063"},{"sha":"b8227b6a2742d4066e7c6d7c381d72ade9a2ea0c","author":{"name":"June-Ruth","email":"a914dc489ccd9917cebd1df4d84d72f6764e162a@users.noreply.github.com"},"message":"Merge pull request #1 from June-Ruth/fix/NumberFormatException\n\nFix NumberFormatException","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/b8227b6a2742d4066e7c6d7c381d72ade9a2ea0c"},{"sha":"2021bcb4e34722a455845b549ebb7be5d3ddcb35","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"fix Concurrent ModificationException","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/2021bcb4e34722a455845b549ebb7be5d3ddcb35"},{"sha":"c177bd71c3478b3924898596cc49501636a64932","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"write all performance test step","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/c177bd71c3478b3924898596cc49501636a64932"},{"sha":"1376283922d80d6bbcfea7205b5acea6befaf3c2","author":{"name":"June-Ruth","email":"a914dc489ccd9917cebd1df4d84d72f6764e162a@users.noreply.github.com"},"message":"Merge pull request #2 from June-Ruth/fix/ConcurrentModificationException\n\nFix/concurrent modification exception","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/1376283922d80d6bbcfea7205b5acea6befaf3c2"},{"sha":"b0d56ea1d5df5f33ed57d724aad39907dd94cc7e","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"adapt syntax to Kts","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/b0d56ea1d5df5f33ed57d724aad39907dd94cc7e"},{"sha":"00a5374d67fd065b94b0d9e550ba1e2f4b7cf972","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"adapt jacoco part to kts","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/00a5374d67fd065b94b0d9e550ba1e2f4b7cf972"},{"sha":"de322de12ec8a5fe7b48139643be282522b2803f","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"upgrade gradle to 7.0.2","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/de322de12ec8a5fe7b48139643be282522b2803f"},{"sha":"cb4cb16384a68a501bd184d0e2183940cfa8d8fe","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"upgrade spring and junit","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/cb4cb16384a68a501bd184d0e2183940cfa8d8fe"},{"sha":"45f2d819453dd514d90f1b48c36299788e96e71c","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"migrate to Kts","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/45f2d819453dd514d90f1b48c36299788e96e71c"},{"sha":"9209c3ed094b5a50a8d31e302258a9ef9bbf88d0","author":{"name":"June-Ruth","email":"a914dc489ccd9917cebd1df4d84d72f6764e162a@users.noreply.github.com"},"message":"Merge pull request #3 from June-Ruth/feature/GradleKtsMigration\n\nGradle Migration to Kotlin Script","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/9209c3ed094b5a50a8d31e302258a9ef9bbf88d0"},{"sha":"eeb04f844f2455291e86fe50e4e497c1e8513923","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"create interface","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/eeb04f844f2455291e86fe50e4e497c1e8513923"},{"sha":"8c1170a7cc29fb106f1a159a732a9dabc3e325b9","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"adapt test to interface","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/8c1170a7cc29fb106f1a159a732a9dabc3e325b9"},{"sha":"9a712ef327e15d2dcf95ec773bfcb7a267ac79a1","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"clean model","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/9a712ef327e15d2dcf95ec773bfcb7a267ac79a1"},{"sha":"2f4d0d3d568f823da5710fef901ffd0a327a52a8","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"move methode from model to service","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/2f4d0d3d568f823da5710fef901ffd0a327a52a8"},{"sha":"98a5ac37f592a87eb38d4e08e9005ed9f38b533a","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"isolate test method","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/98a5ac37f592a87eb38d4e08e9005ed9f38b533a"},{"sha":"2d7ae9163ea9a90de712d3a30f4fb935b7a7adec","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"seperate controller with REST","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/2d7ae9163ea9a90de712d3a30f4fb935b7a7adec"},{"sha":"98998a7f1bb8df6650dd21558e3119467fcfb3e8","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"change tracker to be a runnable","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/98998a7f1bb8df6650dd21558e3119467fcfb3e8"},{"sha":"53114dc5387fef1f9db8a865eee73c721198c874","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"correct Tracker","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/53114dc5387fef1f9db8a865eee73c721198c874"},{"sha":"71cfe027d39ab6430d942649a724a31f1a816c82","author":{"name":"June-Ruth","email":"c23fd644484463c0addb7f0d93e482cb9f44de38@hotmail.fr"},"message":"modify controller division","distinct":false,"url":"https://api.github.com/repos/June-Ruth/OC-Java-Projet8/commits/71cfe027d39ab6430d942649a724a31f1a816c82"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792619","type":"PushEvent","actor":{"id":878058,"login":"ParkMinKyu","display_login":"ParkMinKyu","gravatar_id":"","url":"https://api.github.com/users/ParkMinKyu","avatar_url":"https://avatars.githubusercontent.com/u/878058?"},"repo":{"id":362471221,"name":"ApartMoney/Apartmoney.github.io","url":"https://api.github.com/repos/ApartMoney/Apartmoney.github.io"},"payload":{"push_id":7561706537,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"3ed91b3a8e61dc679c7baf56e58d84f4ddb9873b","before":"d0538453f335d7d5fbfda003156deace0144011d","commits":[{"sha":"3ed91b3a8e61dc679c7baf56e58d84f4ddb9873b","author":{"name":"ParkMinkyu","email":"f1d6fc1b4c5023402fddfd826b843346eec78543@naver.com"},"message":"update news data","distinct":true,"url":"https://api.github.com/repos/ApartMoney/Apartmoney.github.io/commits/3ed91b3a8e61dc679c7baf56e58d84f4ddb9873b"}]},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":60907646,"login":"ApartMoney","gravatar_id":"","url":"https://api.github.com/orgs/ApartMoney","avatar_url":"https://avatars.githubusercontent.com/u/60907646?"}}
+{"id":"17244792620","type":"WatchEvent","actor":{"id":86179625,"login":"ssbuild","display_login":"ssbuild","gravatar_id":"","url":"https://api.github.com/users/ssbuild","avatar_url":"https://avatars.githubusercontent.com/u/86179625?"},"repo":{"id":273269597,"name":"passion765/fastlabel","url":"https://api.github.com/repos/passion765/fastlabel"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792622","type":"CreateEvent","actor":{"id":36655932,"login":"rahulun","display_login":"rahulun","gravatar_id":"","url":"https://api.github.com/users/rahulun","avatar_url":"https://avatars.githubusercontent.com/u/36655932?"},"repo":{"id":388024739,"name":"rahulun/real_estate","url":"https://api.github.com/repos/rahulun/real_estate"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792623","type":"PushEvent","actor":{"id":60849980,"login":"jordans-bot","display_login":"jordans-bot","gravatar_id":"","url":"https://api.github.com/users/jordans-bot","avatar_url":"https://avatars.githubusercontent.com/u/60849980?"},"repo":{"id":139190305,"name":"JTuwiner/bitcoinclock","url":"https://api.github.com/repos/JTuwiner/bitcoinclock"},"payload":{"push_id":7561706543,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"213401a08ef9f67cc8ca185d15989391f95ce951","before":"1f7dc900c38b8b88126eda98e81c61e07cc23d07","commits":[{"sha":"213401a08ef9f67cc8ca185d15989391f95ce951","author":{"name":"jordans-bot","email":"6323b4aabf9938a958e69e4471281fb61992bb8f@users.noreply.github.com"},"message":"Updated block height","distinct":true,"url":"https://api.github.com/repos/JTuwiner/bitcoinclock/commits/213401a08ef9f67cc8ca185d15989391f95ce951"}]},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792624","type":"IssuesEvent","actor":{"id":9405495,"login":"livio-a","display_login":"livio-a","gravatar_id":"","url":"https://api.github.com/users/livio-a","avatar_url":"https://avatars.githubusercontent.com/u/9405495?"},"repo":{"id":247714750,"name":"caos/zitadel","url":"https://api.github.com/repos/caos/zitadel"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/caos/zitadel/issues/2051","repository_url":"https://api.github.com/repos/caos/zitadel","labels_url":"https://api.github.com/repos/caos/zitadel/issues/2051/labels{/name}","comments_url":"https://api.github.com/repos/caos/zitadel/issues/2051/comments","events_url":"https://api.github.com/repos/caos/zitadel/issues/2051/events","html_url":"https://github.com/caos/zitadel/issues/2051","id":949359759,"node_id":"MDU6SXNzdWU5NDkzNTk3NTk=","number":2051,"title":"userinfo attributs missing in id_token when requesting JWT access token with roles","user":{"login":"livio-a","id":9405495,"node_id":"MDQ6VXNlcjk0MDU0OTU=","avatar_url":"https://avatars.githubusercontent.com/u/9405495?v=4","gravatar_id":"","url":"https://api.github.com/users/livio-a","html_url":"https://github.com/livio-a","followers_url":"https://api.github.com/users/livio-a/followers","following_url":"https://api.github.com/users/livio-a/following{/other_user}","gists_url":"https://api.github.com/users/livio-a/gists{/gist_id}","starred_url":"https://api.github.com/users/livio-a/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/livio-a/subscriptions","organizations_url":"https://api.github.com/users/livio-a/orgs","repos_url":"https://api.github.com/users/livio-a/repos","events_url":"https://api.github.com/users/livio-a/events{/privacy}","received_events_url":"https://api.github.com/users/livio-a/received_events","type":"User","site_admin":false},"labels":[{"id":1913182587,"node_id":"MDU6TGFiZWwxOTEzMTgyNTg3","url":"https://api.github.com/repos/caos/zitadel/labels/bug","name":"bug","color":"d73a4a","default":true,"description":"Something isn't working"}],"state":"closed","locked":false,"assignee":{"login":"livio-a","id":9405495,"node_id":"MDQ6VXNlcjk0MDU0OTU=","avatar_url":"https://avatars.githubusercontent.com/u/9405495?v=4","gravatar_id":"","url":"https://api.github.com/users/livio-a","html_url":"https://github.com/livio-a","followers_url":"https://api.github.com/users/livio-a/followers","following_url":"https://api.github.com/users/livio-a/following{/other_user}","gists_url":"https://api.github.com/users/livio-a/gists{/gist_id}","starred_url":"https://api.github.com/users/livio-a/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/livio-a/subscriptions","organizations_url":"https://api.github.com/users/livio-a/orgs","repos_url":"https://api.github.com/users/livio-a/repos","events_url":"https://api.github.com/users/livio-a/events{/privacy}","received_events_url":"https://api.github.com/users/livio-a/received_events","type":"User","site_admin":false},"assignees":[{"login":"livio-a","id":9405495,"node_id":"MDQ6VXNlcjk0MDU0OTU=","avatar_url":"https://avatars.githubusercontent.com/u/9405495?v=4","gravatar_id":"","url":"https://api.github.com/users/livio-a","html_url":"https://github.com/livio-a","followers_url":"https://api.github.com/users/livio-a/followers","following_url":"https://api.github.com/users/livio-a/following{/other_user}","gists_url":"https://api.github.com/users/livio-a/gists{/gist_id}","starred_url":"https://api.github.com/users/livio-a/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/livio-a/subscriptions","organizations_url":"https://api.github.com/users/livio-a/orgs","repos_url":"https://api.github.com/users/livio-a/repos","events_url":"https://api.github.com/users/livio-a/events{/privacy}","received_events_url":"https://api.github.com/users/livio-a/received_events","type":"User","site_admin":false}],"milestone":null,"comments":1,"created_at":"2021-07-21T06:05:55Z","updated_at":"2021-07-21T07:00:05Z","closed_at":"2021-07-21T07:00:05Z","author_association":"MEMBER","active_lock_reason":null,"body":"### Discussed in https://github.com/caos/zitadel/discussions/2050\r\n\r\n<div type='discussions-op-text'>\r\n\r\n<sup>Originally posted by **astriffe** July 20, 2021</sup>\r\nHi caos!\r\n\r\nMight it be that the preferred email vanished from the token, while the checkbox 'User Info im ID Token' is still set?\r\n\r\nOf course I might be wrong, but I can't find the email claim on any of the tokens I receive :)\r\n\r\nCheers, Alex</div>","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":48989016,"login":"caos","gravatar_id":"","url":"https://api.github.com/orgs/caos","avatar_url":"https://avatars.githubusercontent.com/u/48989016?"}}
+{"id":"17244792628","type":"PullRequestEvent","actor":{"id":39814207,"login":"pull[bot]","display_login":"pull","gravatar_id":"","url":"https://api.github.com/users/pull[bot]","avatar_url":"https://avatars.githubusercontent.com/u/39814207?"},"repo":{"id":232690151,"name":"devilkun/awesome-mac","url":"https://api.github.com/repos/devilkun/awesome-mac"},"payload":{"action":"opened","number":94,"pull_request":{"url":"https://api.github.com/repos/devilkun/awesome-mac/pulls/94","id":694104905,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0OTA1","html_url":"https://github.com/devilkun/awesome-mac/pull/94","diff_url":"https://github.com/devilkun/awesome-mac/pull/94.diff","patch_url":"https://github.com/devilkun/awesome-mac/pull/94.patch","issue_url":"https://api.github.com/repos/devilkun/awesome-mac/issues/94","number":94,"state":"open","locked":false,"title":"[pull] master from jaywcjlove:master","user":{"login":"pull[bot]","id":39814207,"node_id":"MDM6Qm90Mzk4MTQyMDc=","avatar_url":"https://avatars.githubusercontent.com/in/12910?v=4","gravatar_id":"","url":"https://api.github.com/users/pull%5Bbot%5D","html_url":"https://github.com/apps/pull","followers_url":"https://api.github.com/users/pull%5Bbot%5D/followers","following_url":"https://api.github.com/users/pull%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/pull%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/pull%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pull%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/pull%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/pull%5Bbot%5D/repos","events_url":"https://api.github.com/users/pull%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/pull%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"See Commits and Changes for more details.\n\n-----\nCreated by [<img src=\"https://prod.download/pull-18h-svg\" valign=\"bottom\"/> **pull[bot]**](https://github.com/wei/pull)\n\n_Can you help keep this open source service alive? **[💖 Please sponsor : )](https://prod.download/pull-pr-sponsor)**_","created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/devilkun/awesome-mac/pulls/94/commits","review_comments_url":"https://api.github.com/repos/devilkun/awesome-mac/pulls/94/comments","review_comment_url":"https://api.github.com/repos/devilkun/awesome-mac/pulls/comments{/number}","comments_url":"https://api.github.com/repos/devilkun/awesome-mac/issues/94/comments","statuses_url":"https://api.github.com/repos/devilkun/awesome-mac/statuses/694ebf8d5e526b61641ac444ea9084bee7f051c6","head":{"label":"jaywcjlove:master","ref":"master","sha":"694ebf8d5e526b61641ac444ea9084bee7f051c6","user":{"login":"jaywcjlove","id":1680273,"node_id":"MDQ6VXNlcjE2ODAyNzM=","avatar_url":"https://avatars.githubusercontent.com/u/1680273?v=4","gravatar_id":"","url":"https://api.github.com/users/jaywcjlove","html_url":"https://github.com/jaywcjlove","followers_url":"https://api.github.com/users/jaywcjlove/followers","following_url":"https://api.github.com/users/jaywcjlove/following{/other_user}","gists_url":"https://api.github.com/users/jaywcjlove/gists{/gist_id}","starred_url":"https://api.github.com/users/jaywcjlove/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jaywcjlove/subscriptions","organizations_url":"https://api.github.com/users/jaywcjlove/orgs","repos_url":"https://api.github.com/users/jaywcjlove/repos","events_url":"https://api.github.com/users/jaywcjlove/events{/privacy}","received_events_url":"https://api.github.com/users/jaywcjlove/received_events","type":"User","site_admin":false},"repo":{"id":63539055,"node_id":"MDEwOlJlcG9zaXRvcnk2MzUzOTA1NQ==","name":"awesome-mac","full_name":"jaywcjlove/awesome-mac","private":false,"owner":{"login":"jaywcjlove","id":1680273,"node_id":"MDQ6VXNlcjE2ODAyNzM=","avatar_url":"https://avatars.githubusercontent.com/u/1680273?v=4","gravatar_id":"","url":"https://api.github.com/users/jaywcjlove","html_url":"https://github.com/jaywcjlove","followers_url":"https://api.github.com/users/jaywcjlove/followers","following_url":"https://api.github.com/users/jaywcjlove/following{/other_user}","gists_url":"https://api.github.com/users/jaywcjlove/gists{/gist_id}","starred_url":"https://api.github.com/users/jaywcjlove/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jaywcjlove/subscriptions","organizations_url":"https://api.github.com/users/jaywcjlove/orgs","repos_url":"https://api.github.com/users/jaywcjlove/repos","events_url":"https://api.github.com/users/jaywcjlove/events{/privacy}","received_events_url":"https://api.github.com/users/jaywcjlove/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jaywcjlove/awesome-mac","description":" Now we have become very big, Different from the original idea. Collect premium software in various categories.","fork":false,"url":"https://api.github.com/repos/jaywcjlove/awesome-mac","forks_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/forks","keys_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/teams","hooks_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/hooks","issue_events_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/issues/events{/number}","events_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/events","assignees_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/assignees{/user}","branches_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/branches{/branch}","tags_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/tags","blobs_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/git/refs{/sha}","trees_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/statuses/{sha}","languages_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/languages","stargazers_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/stargazers","contributors_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/contributors","subscribers_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/subscribers","subscription_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/subscription","commits_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/commits{/sha}","git_commits_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/git/commits{/sha}","comments_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/comments{/number}","issue_comment_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/issues/comments{/number}","contents_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/contents/{+path}","compare_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/merges","archive_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/downloads","issues_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/issues{/number}","pulls_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/pulls{/number}","milestones_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/milestones{/number}","notifications_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/labels{/name}","releases_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/releases{/id}","deployments_url":"https://api.github.com/repos/jaywcjlove/awesome-mac/deployments","created_at":"2016-07-17T15:33:47Z","updated_at":"2021-07-21T06:55:26Z","pushed_at":"2021-07-21T06:29:23Z","git_url":"git://github.com/jaywcjlove/awesome-mac.git","ssh_url":"git@github.com:jaywcjlove/awesome-mac.git","clone_url":"https://github.com/jaywcjlove/awesome-mac.git","svn_url":"https://github.com/jaywcjlove/awesome-mac","homepage":"https://git.io/macx","size":4507,"stargazers_count":44680,"watchers_count":44680,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":4871,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":111,"license":{"key":"cc0-1.0","name":"Creative Commons Zero v1.0 Universal","spdx_id":"CC0-1.0","url":"https://api.github.com/licenses/cc0-1.0","node_id":"MDc6TGljZW5zZTY="},"forks":4871,"open_issues":111,"watchers":44680,"default_branch":"master"}},"base":{"label":"devilkun:master","ref":"master","sha":"394013d3def085340f9d329539b903bf169516c1","user":{"login":"devilkun","id":20056743,"node_id":"MDQ6VXNlcjIwMDU2NzQz","avatar_url":"https://avatars.githubusercontent.com/u/20056743?v=4","gravatar_id":"","url":"https://api.github.com/users/devilkun","html_url":"https://github.com/devilkun","followers_url":"https://api.github.com/users/devilkun/followers","following_url":"https://api.github.com/users/devilkun/following{/other_user}","gists_url":"https://api.github.com/users/devilkun/gists{/gist_id}","starred_url":"https://api.github.com/users/devilkun/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/devilkun/subscriptions","organizations_url":"https://api.github.com/users/devilkun/orgs","repos_url":"https://api.github.com/users/devilkun/repos","events_url":"https://api.github.com/users/devilkun/events{/privacy}","received_events_url":"https://api.github.com/users/devilkun/received_events","type":"User","site_admin":false},"repo":{"id":232690151,"node_id":"MDEwOlJlcG9zaXRvcnkyMzI2OTAxNTE=","name":"awesome-mac","full_name":"devilkun/awesome-mac","private":false,"owner":{"login":"devilkun","id":20056743,"node_id":"MDQ6VXNlcjIwMDU2NzQz","avatar_url":"https://avatars.githubusercontent.com/u/20056743?v=4","gravatar_id":"","url":"https://api.github.com/users/devilkun","html_url":"https://github.com/devilkun","followers_url":"https://api.github.com/users/devilkun/followers","following_url":"https://api.github.com/users/devilkun/following{/other_user}","gists_url":"https://api.github.com/users/devilkun/gists{/gist_id}","starred_url":"https://api.github.com/users/devilkun/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/devilkun/subscriptions","organizations_url":"https://api.github.com/users/devilkun/orgs","repos_url":"https://api.github.com/users/devilkun/repos","events_url":"https://api.github.com/users/devilkun/events{/privacy}","received_events_url":"https://api.github.com/users/devilkun/received_events","type":"User","site_admin":false},"html_url":"https://github.com/devilkun/awesome-mac","description":" Now we have become very big, Different from the original idea. Collect premium software in various categories.","fork":true,"url":"https://api.github.com/repos/devilkun/awesome-mac","forks_url":"https://api.github.com/repos/devilkun/awesome-mac/forks","keys_url":"https://api.github.com/repos/devilkun/awesome-mac/keys{/key_id}","collaborators_url":"https://api.github.com/repos/devilkun/awesome-mac/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/devilkun/awesome-mac/teams","hooks_url":"https://api.github.com/repos/devilkun/awesome-mac/hooks","issue_events_url":"https://api.github.com/repos/devilkun/awesome-mac/issues/events{/number}","events_url":"https://api.github.com/repos/devilkun/awesome-mac/events","assignees_url":"https://api.github.com/repos/devilkun/awesome-mac/assignees{/user}","branches_url":"https://api.github.com/repos/devilkun/awesome-mac/branches{/branch}","tags_url":"https://api.github.com/repos/devilkun/awesome-mac/tags","blobs_url":"https://api.github.com/repos/devilkun/awesome-mac/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/devilkun/awesome-mac/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/devilkun/awesome-mac/git/refs{/sha}","trees_url":"https://api.github.com/repos/devilkun/awesome-mac/git/trees{/sha}","statuses_url":"https://api.github.com/repos/devilkun/awesome-mac/statuses/{sha}","languages_url":"https://api.github.com/repos/devilkun/awesome-mac/languages","stargazers_url":"https://api.github.com/repos/devilkun/awesome-mac/stargazers","contributors_url":"https://api.github.com/repos/devilkun/awesome-mac/contributors","subscribers_url":"https://api.github.com/repos/devilkun/awesome-mac/subscribers","subscription_url":"https://api.github.com/repos/devilkun/awesome-mac/subscription","commits_url":"https://api.github.com/repos/devilkun/awesome-mac/commits{/sha}","git_commits_url":"https://api.github.com/repos/devilkun/awesome-mac/git/commits{/sha}","comments_url":"https://api.github.com/repos/devilkun/awesome-mac/comments{/number}","issue_comment_url":"https://api.github.com/repos/devilkun/awesome-mac/issues/comments{/number}","contents_url":"https://api.github.com/repos/devilkun/awesome-mac/contents/{+path}","compare_url":"https://api.github.com/repos/devilkun/awesome-mac/compare/{base}...{head}","merges_url":"https://api.github.com/repos/devilkun/awesome-mac/merges","archive_url":"https://api.github.com/repos/devilkun/awesome-mac/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/devilkun/awesome-mac/downloads","issues_url":"https://api.github.com/repos/devilkun/awesome-mac/issues{/number}","pulls_url":"https://api.github.com/repos/devilkun/awesome-mac/pulls{/number}","milestones_url":"https://api.github.com/repos/devilkun/awesome-mac/milestones{/number}","notifications_url":"https://api.github.com/repos/devilkun/awesome-mac/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/devilkun/awesome-mac/labels{/name}","releases_url":"https://api.github.com/repos/devilkun/awesome-mac/releases{/id}","deployments_url":"https://api.github.com/repos/devilkun/awesome-mac/deployments","created_at":"2020-01-09T00:51:49Z","updated_at":"2021-07-20T08:44:31Z","pushed_at":"2021-07-20T08:44:21Z","git_url":"git://github.com/devilkun/awesome-mac.git","ssh_url":"git@github.com:devilkun/awesome-mac.git","clone_url":"https://github.com/devilkun/awesome-mac.git","svn_url":"https://github.com/devilkun/awesome-mac","homepage":"https://git.io/macx","size":3229,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"cc0-1.0","name":"Creative Commons Zero v1.0 Universal","spdx_id":"CC0-1.0","url":"https://api.github.com/licenses/cc0-1.0","node_id":"MDc6TGljZW5zZTY="},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/devilkun/awesome-mac/pulls/94"},"html":{"href":"https://github.com/devilkun/awesome-mac/pull/94"},"issue":{"href":"https://api.github.com/repos/devilkun/awesome-mac/issues/94"},"comments":{"href":"https://api.github.com/repos/devilkun/awesome-mac/issues/94/comments"},"review_comments":{"href":"https://api.github.com/repos/devilkun/awesome-mac/pulls/94/comments"},"review_comment":{"href":"https://api.github.com/repos/devilkun/awesome-mac/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/devilkun/awesome-mac/pulls/94/commits"},"statuses":{"href":"https://api.github.com/repos/devilkun/awesome-mac/statuses/694ebf8d5e526b61641ac444ea9084bee7f051c6"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":2,"deletions":0,"changed_files":2}},"public":true,"created_at":"2021-07-21T07:00:05Z"}
+{"id":"17244792694","type":"PullRequestReviewCommentEvent","actor":{"id":5922961,"login":"facewindu","display_login":"facewindu","gravatar_id":"","url":"https://api.github.com/users/facewindu","avatar_url":"https://avatars.githubusercontent.com/u/5922961?"},"repo":{"id":174415874,"name":"gradle/gradle-enterprise-build-config-samples","url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/comments/673711156","pull_request_review_id":711317411,"id":673711156,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3MzcxMTE1Ng==","diff_hunk":"@@ -0,0 +1,37 @@\n+package com.gradle.maven.common.user.data.extension;\n+\n+import org.apache.maven.eventspy.AbstractEventSpy;\n+import org.apache.maven.eventspy.EventSpy;\n+import org.codehaus.plexus.PlexusContainer;\n+import org.codehaus.plexus.component.annotations.Component;\n+import org.codehaus.plexus.logging.Logger;\n+\n+import javax.inject.Inject;\n+\n+@Component(","path":"common-custom-user-data-maven-extension/src/main/java/com/gradle/maven/common/user/data/extension/CommonCustomUserDataMavenExtensionEventSpy.java","position":11,"original_position":11,"commit_id":"ea2eb525f300c91f9228a4ddeb3fa83296316b9b","original_commit_id":"ea2eb525f300c91f9228a4ddeb3fa83296316b9b","user":{"login":"facewindu","id":5922961,"node_id":"MDQ6VXNlcjU5MjI5NjE=","avatar_url":"https://avatars.githubusercontent.com/u/5922961?v=4","gravatar_id":"","url":"https://api.github.com/users/facewindu","html_url":"https://github.com/facewindu","followers_url":"https://api.github.com/users/facewindu/followers","following_url":"https://api.github.com/users/facewindu/following{/other_user}","gists_url":"https://api.github.com/users/facewindu/gists{/gist_id}","starred_url":"https://api.github.com/users/facewindu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/facewindu/subscriptions","organizations_url":"https://api.github.com/users/facewindu/orgs","repos_url":"https://api.github.com/users/facewindu/repos","events_url":"https://api.github.com/users/facewindu/events{/privacy}","received_events_url":"https://api.github.com/users/facewindu/received_events","type":"User","site_admin":false},"body":"There are cases where the `CommonCustomUserDataGradleEnterpriseListener` is not constructed, even if marked with the `@Component` annotation.\r\nBut even there, it needs the `GradleEnterpriseListener` interface at runtime when constructed, so the interface needs to be available in its realm when constructed.(and luckily, it's constructed after `EventSpy#init` is called)","created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","html_url":"https://github.com/gradle/gradle-enterprise-build-config-samples/pull/115#discussion_r673711156","pull_request_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/comments/673711156"},"html":{"href":"https://github.com/gradle/gradle-enterprise-build-config-samples/pull/115#discussion_r673711156"},"pull_request":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115"}},"start_line":null,"original_start_line":null,"start_side":null,"line":11,"original_line":11,"side":"RIGHT","in_reply_to_id":673242063},"pull_request":{"url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115","id":693559121,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNTU5MTIx","html_url":"https://github.com/gradle/gradle-enterprise-build-config-samples/pull/115","diff_url":"https://github.com/gradle/gradle-enterprise-build-config-samples/pull/115.diff","patch_url":"https://github.com/gradle/gradle-enterprise-build-config-samples/pull/115.patch","issue_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/115","number":115,"state":"open","locked":false,"title":"Use the new GradleEnterpriseListener interface","user":{"login":"facewindu","id":5922961,"node_id":"MDQ6VXNlcjU5MjI5NjE=","avatar_url":"https://avatars.githubusercontent.com/u/5922961?v=4","gravatar_id":"","url":"https://api.github.com/users/facewindu","html_url":"https://github.com/facewindu","followers_url":"https://api.github.com/users/facewindu/followers","following_url":"https://api.github.com/users/facewindu/following{/other_user}","gists_url":"https://api.github.com/users/facewindu/gists{/gist_id}","starred_url":"https://api.github.com/users/facewindu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/facewindu/subscriptions","organizations_url":"https://api.github.com/users/facewindu/orgs","repos_url":"https://api.github.com/users/facewindu/repos","events_url":"https://api.github.com/users/facewindu/events{/privacy}","received_events_url":"https://api.github.com/users/facewindu/received_events","type":"User","site_admin":false},"body":"This PR changes quite a bit the structure of the CCUDME project.\r\nIt is now an EventSpy that register very early (in its init callback) a custom listener implementing the new `GradleEnterpriseListener` interface. This allows us to get rid of Maven callbacks quirks and totally control what's going on here (instead of e.g. relying on AbstractMavenLifecycleParticipant callbacks being fired 'at the right time')","created_at":"2021-07-20T15:22:01Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e79fe4577a0e48b9e0e7720c27de5a72e40c6ed7","assignee":{"login":"facewindu","id":5922961,"node_id":"MDQ6VXNlcjU5MjI5NjE=","avatar_url":"https://avatars.githubusercontent.com/u/5922961?v=4","gravatar_id":"","url":"https://api.github.com/users/facewindu","html_url":"https://github.com/facewindu","followers_url":"https://api.github.com/users/facewindu/followers","following_url":"https://api.github.com/users/facewindu/following{/other_user}","gists_url":"https://api.github.com/users/facewindu/gists{/gist_id}","starred_url":"https://api.github.com/users/facewindu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/facewindu/subscriptions","organizations_url":"https://api.github.com/users/facewindu/orgs","repos_url":"https://api.github.com/users/facewindu/repos","events_url":"https://api.github.com/users/facewindu/events{/privacy}","received_events_url":"https://api.github.com/users/facewindu/received_events","type":"User","site_admin":false},"assignees":[{"login":"facewindu","id":5922961,"node_id":"MDQ6VXNlcjU5MjI5NjE=","avatar_url":"https://avatars.githubusercontent.com/u/5922961?v=4","gravatar_id":"","url":"https://api.github.com/users/facewindu","html_url":"https://github.com/facewindu","followers_url":"https://api.github.com/users/facewindu/followers","following_url":"https://api.github.com/users/facewindu/following{/other_user}","gists_url":"https://api.github.com/users/facewindu/gists{/gist_id}","starred_url":"https://api.github.com/users/facewindu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/facewindu/subscriptions","organizations_url":"https://api.github.com/users/facewindu/orgs","repos_url":"https://api.github.com/users/facewindu/repos","events_url":"https://api.github.com/users/facewindu/events{/privacy}","received_events_url":"https://api.github.com/users/facewindu/received_events","type":"User","site_admin":false}],"requested_reviewers":[{"login":"marcphilipp","id":214207,"node_id":"MDQ6VXNlcjIxNDIwNw==","avatar_url":"https://avatars.githubusercontent.com/u/214207?v=4","gravatar_id":"","url":"https://api.github.com/users/marcphilipp","html_url":"https://github.com/marcphilipp","followers_url":"https://api.github.com/users/marcphilipp/followers","following_url":"https://api.github.com/users/marcphilipp/following{/other_user}","gists_url":"https://api.github.com/users/marcphilipp/gists{/gist_id}","starred_url":"https://api.github.com/users/marcphilipp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marcphilipp/subscriptions","organizations_url":"https://api.github.com/users/marcphilipp/orgs","repos_url":"https://api.github.com/users/marcphilipp/repos","events_url":"https://api.github.com/users/marcphilipp/events{/privacy}","received_events_url":"https://api.github.com/users/marcphilipp/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115/commits","review_comments_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115/comments","review_comment_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/115/comments","statuses_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/statuses/ea2eb525f300c91f9228a4ddeb3fa83296316b9b","head":{"label":"gradle:francois/ge-listener","ref":"francois/ge-listener","sha":"ea2eb525f300c91f9228a4ddeb3fa83296316b9b","user":{"login":"gradle","id":124156,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNDE1Ng==","avatar_url":"https://avatars.githubusercontent.com/u/124156?v=4","gravatar_id":"","url":"https://api.github.com/users/gradle","html_url":"https://github.com/gradle","followers_url":"https://api.github.com/users/gradle/followers","following_url":"https://api.github.com/users/gradle/following{/other_user}","gists_url":"https://api.github.com/users/gradle/gists{/gist_id}","starred_url":"https://api.github.com/users/gradle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gradle/subscriptions","organizations_url":"https://api.github.com/users/gradle/orgs","repos_url":"https://api.github.com/users/gradle/repos","events_url":"https://api.github.com/users/gradle/events{/privacy}","received_events_url":"https://api.github.com/users/gradle/received_events","type":"Organization","site_admin":false},"repo":{"id":174415874,"node_id":"MDEwOlJlcG9zaXRvcnkxNzQ0MTU4NzQ=","name":"gradle-enterprise-build-config-samples","full_name":"gradle/gradle-enterprise-build-config-samples","private":false,"owner":{"login":"gradle","id":124156,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNDE1Ng==","avatar_url":"https://avatars.githubusercontent.com/u/124156?v=4","gravatar_id":"","url":"https://api.github.com/users/gradle","html_url":"https://github.com/gradle","followers_url":"https://api.github.com/users/gradle/followers","following_url":"https://api.github.com/users/gradle/following{/other_user}","gists_url":"https://api.github.com/users/gradle/gists{/gist_id}","starred_url":"https://api.github.com/users/gradle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gradle/subscriptions","organizations_url":"https://api.github.com/users/gradle/orgs","repos_url":"https://api.github.com/users/gradle/repos","events_url":"https://api.github.com/users/gradle/events{/privacy}","received_events_url":"https://api.github.com/users/gradle/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/gradle/gradle-enterprise-build-config-samples","description":"Code samples that demonstrate how to customize your Gradle Enterprise build configuration using Gradle or Maven.","fork":false,"url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples","forks_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/forks","keys_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/teams","hooks_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/hooks","issue_events_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/events{/number}","events_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/events","assignees_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/assignees{/user}","branches_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/branches{/branch}","tags_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/tags","blobs_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/refs{/sha}","trees_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/statuses/{sha}","languages_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/languages","stargazers_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/stargazers","contributors_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/contributors","subscribers_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/subscribers","subscription_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/subscription","commits_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/commits{/sha}","git_commits_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/commits{/sha}","comments_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/comments{/number}","issue_comment_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/comments{/number}","contents_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/contents/{+path}","compare_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/merges","archive_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/downloads","issues_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues{/number}","pulls_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls{/number}","milestones_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/milestones{/number}","notifications_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/labels{/name}","releases_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/releases{/id}","deployments_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/deployments","created_at":"2019-03-07T20:33:16Z","updated_at":"2021-07-20T18:57:38Z","pushed_at":"2021-07-20T21:33:01Z","git_url":"git://github.com/gradle/gradle-enterprise-build-config-samples.git","ssh_url":"git@github.com:gradle/gradle-enterprise-build-config-samples.git","clone_url":"https://github.com/gradle/gradle-enterprise-build-config-samples.git","svn_url":"https://github.com/gradle/gradle-enterprise-build-config-samples","homepage":"https://gradle.com/enterprise","size":20749,"stargazers_count":34,"watchers_count":34,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":17,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":17,"open_issues":3,"watchers":34,"default_branch":"master"}},"base":{"label":"gradle:master","ref":"master","sha":"f67b09892daa3fbb9646b5bb6076d29ce92e0964","user":{"login":"gradle","id":124156,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNDE1Ng==","avatar_url":"https://avatars.githubusercontent.com/u/124156?v=4","gravatar_id":"","url":"https://api.github.com/users/gradle","html_url":"https://github.com/gradle","followers_url":"https://api.github.com/users/gradle/followers","following_url":"https://api.github.com/users/gradle/following{/other_user}","gists_url":"https://api.github.com/users/gradle/gists{/gist_id}","starred_url":"https://api.github.com/users/gradle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gradle/subscriptions","organizations_url":"https://api.github.com/users/gradle/orgs","repos_url":"https://api.github.com/users/gradle/repos","events_url":"https://api.github.com/users/gradle/events{/privacy}","received_events_url":"https://api.github.com/users/gradle/received_events","type":"Organization","site_admin":false},"repo":{"id":174415874,"node_id":"MDEwOlJlcG9zaXRvcnkxNzQ0MTU4NzQ=","name":"gradle-enterprise-build-config-samples","full_name":"gradle/gradle-enterprise-build-config-samples","private":false,"owner":{"login":"gradle","id":124156,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEyNDE1Ng==","avatar_url":"https://avatars.githubusercontent.com/u/124156?v=4","gravatar_id":"","url":"https://api.github.com/users/gradle","html_url":"https://github.com/gradle","followers_url":"https://api.github.com/users/gradle/followers","following_url":"https://api.github.com/users/gradle/following{/other_user}","gists_url":"https://api.github.com/users/gradle/gists{/gist_id}","starred_url":"https://api.github.com/users/gradle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gradle/subscriptions","organizations_url":"https://api.github.com/users/gradle/orgs","repos_url":"https://api.github.com/users/gradle/repos","events_url":"https://api.github.com/users/gradle/events{/privacy}","received_events_url":"https://api.github.com/users/gradle/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/gradle/gradle-enterprise-build-config-samples","description":"Code samples that demonstrate how to customize your Gradle Enterprise build configuration using Gradle or Maven.","fork":false,"url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples","forks_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/forks","keys_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/teams","hooks_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/hooks","issue_events_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/events{/number}","events_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/events","assignees_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/assignees{/user}","branches_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/branches{/branch}","tags_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/tags","blobs_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/refs{/sha}","trees_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/statuses/{sha}","languages_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/languages","stargazers_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/stargazers","contributors_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/contributors","subscribers_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/subscribers","subscription_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/subscription","commits_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/commits{/sha}","git_commits_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/git/commits{/sha}","comments_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/comments{/number}","issue_comment_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/comments{/number}","contents_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/contents/{+path}","compare_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/merges","archive_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/downloads","issues_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues{/number}","pulls_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls{/number}","milestones_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/milestones{/number}","notifications_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/labels{/name}","releases_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/releases{/id}","deployments_url":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/deployments","created_at":"2019-03-07T20:33:16Z","updated_at":"2021-07-20T18:57:38Z","pushed_at":"2021-07-20T21:33:01Z","git_url":"git://github.com/gradle/gradle-enterprise-build-config-samples.git","ssh_url":"git@github.com:gradle/gradle-enterprise-build-config-samples.git","clone_url":"https://github.com/gradle/gradle-enterprise-build-config-samples.git","svn_url":"https://github.com/gradle/gradle-enterprise-build-config-samples","homepage":"https://gradle.com/enterprise","size":20749,"stargazers_count":34,"watchers_count":34,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":17,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":17,"open_issues":3,"watchers":34,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115"},"html":{"href":"https://github.com/gradle/gradle-enterprise-build-config-samples/pull/115"},"issue":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/115"},"comments":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/issues/115/comments"},"review_comments":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115/comments"},"review_comment":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/pulls/115/commits"},"statuses":{"href":"https://api.github.com/repos/gradle/gradle-enterprise-build-config-samples/statuses/ea2eb525f300c91f9228a4ddeb3fa83296316b9b"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":124156,"login":"gradle","gravatar_id":"","url":"https://api.github.com/orgs/gradle","avatar_url":"https://avatars.githubusercontent.com/u/124156?"}}
+{"id":"17244792711","type":"PullRequestReviewCommentEvent","actor":{"id":2418812,"login":"Smurf-IV","display_login":"Smurf-IV","gravatar_id":"","url":"https://api.github.com/users/Smurf-IV","avatar_url":"https://avatars.githubusercontent.com/u/2418812?"},"repo":{"id":243247330,"name":"Krypton-Suite/Standard-Toolkit","url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/comments/673711157","pull_request_review_id":711317412,"id":673711157,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3MzcxMTE1Nw==","diff_hunk":"@@ -130,36 +133,40 @@ public override void Layout(ViewLayoutContext context)\n             // Find the rectangle available to each child by removing the rounding\n             Rectangle childRect = ClientRectangle;\n \n-            // Find the amount of rounding to apply\n-            int tempRounding = Convert.ToInt32(Rounding);\n+            RectangleF childRectF;","path":"Source/Krypton Components/Krypton.Navigator/View Layout/ViewLayoutInsetOverlap.cs","position":37,"original_position":24,"commit_id":"6045c9a6424e198f542c84a97ff094a4952c866d","original_commit_id":"e174641d5578c95967e8df67aea55a15ad919ac7","user":{"login":"Smurf-IV","id":2418812,"node_id":"MDQ6VXNlcjI0MTg4MTI=","avatar_url":"https://avatars.githubusercontent.com/u/2418812?v=4","gravatar_id":"","url":"https://api.github.com/users/Smurf-IV","html_url":"https://github.com/Smurf-IV","followers_url":"https://api.github.com/users/Smurf-IV/followers","following_url":"https://api.github.com/users/Smurf-IV/following{/other_user}","gists_url":"https://api.github.com/users/Smurf-IV/gists{/gist_id}","starred_url":"https://api.github.com/users/Smurf-IV/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Smurf-IV/subscriptions","organizations_url":"https://api.github.com/users/Smurf-IV/orgs","repos_url":"https://api.github.com/users/Smurf-IV/repos","events_url":"https://api.github.com/users/Smurf-IV/events{/privacy}","received_events_url":"https://api.github.com/users/Smurf-IV/received_events","type":"User","site_admin":false},"body":"Assign to ClientREctangle here","created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:06Z","html_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199#discussion_r673711157","pull_request_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/comments/673711157"},"html":{"href":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199#discussion_r673711157"},"pull_request":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199"}},"start_line":null,"original_start_line":null,"start_side":null,"line":136,"original_line":136,"side":"RIGHT"},"pull_request":{"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199","id":692062634,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMDYyNjM0","html_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199","diff_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199.diff","patch_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199.patch","issue_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199","number":199,"state":"open","locked":false,"title":"Alpha fr197","user":{"login":"Wagnerp","id":949607,"node_id":"MDQ6VXNlcjk0OTYwNw==","avatar_url":"https://avatars.githubusercontent.com/u/949607?v=4","gravatar_id":"","url":"https://api.github.com/users/Wagnerp","html_url":"https://github.com/Wagnerp","followers_url":"https://api.github.com/users/Wagnerp/followers","following_url":"https://api.github.com/users/Wagnerp/following{/other_user}","gists_url":"https://api.github.com/users/Wagnerp/gists{/gist_id}","starred_url":"https://api.github.com/users/Wagnerp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wagnerp/subscriptions","organizations_url":"https://api.github.com/users/Wagnerp/orgs","repos_url":"https://api.github.com/users/Wagnerp/repos","events_url":"https://api.github.com/users/Wagnerp/events{/privacy}","received_events_url":"https://api.github.com/users/Wagnerp/received_events","type":"User","site_admin":false},"body":"#197 pt. 1","created_at":"2021-07-18T09:59:40Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e7e5bc21581f2760133e1342dc94bf883113274a","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/commits","review_comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/comments","review_comment_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199/comments","statuses_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/6045c9a6424e198f542c84a97ff094a4952c866d","head":{"label":"Krypton-Suite:alpha-fr197","ref":"alpha-fr197","sha":"6045c9a6424e198f542c84a97ff094a4952c866d","user":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"repo":{"id":243247330,"node_id":"MDEwOlJlcG9zaXRvcnkyNDMyNDczMzA=","name":"Standard-Toolkit","full_name":"Krypton-Suite/Standard-Toolkit","private":false,"owner":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Krypton-Suite/Standard-Toolkit","description":"An update to Component factory's krypton toolkit to support .NET Framework 3.5 to .NET Core/.NET","fork":false,"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit","forks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/forks","keys_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/teams","hooks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/hooks","issue_events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/events{/number}","events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/events","assignees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/assignees{/user}","branches_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/branches{/branch}","tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/tags","blobs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/{sha}","languages_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/languages","stargazers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/stargazers","contributors_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contributors","subscribers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscribers","subscription_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscription","commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contents/{+path}","compare_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/merges","archive_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/downloads","issues_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues{/number}","pulls_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls{/number}","milestones_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/milestones{/number}","notifications_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/labels{/name}","releases_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/releases{/id}","deployments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/deployments","created_at":"2020-02-26T11:33:33Z","updated_at":"2021-07-20T17:53:46Z","pushed_at":"2021-07-20T17:47:02Z","git_url":"git://github.com/Krypton-Suite/Standard-Toolkit.git","ssh_url":"git@github.com:Krypton-Suite/Standard-Toolkit.git","clone_url":"https://github.com/Krypton-Suite/Standard-Toolkit.git","svn_url":"https://github.com/Krypton-Suite/Standard-Toolkit","homepage":"","size":12480,"stargazers_count":84,"watchers_count":84,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":12,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":59,"license":{"key":"bsd-3-clause","name":"BSD 3-Clause \"New\" or \"Revised\" License","spdx_id":"BSD-3-Clause","url":"https://api.github.com/licenses/bsd-3-clause","node_id":"MDc6TGljZW5zZTU="},"forks":12,"open_issues":59,"watchers":84,"default_branch":"master"}},"base":{"label":"Krypton-Suite:alpha","ref":"alpha","sha":"4c6b6a3d8990d1bc888f01369b2348bd909dda72","user":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"repo":{"id":243247330,"node_id":"MDEwOlJlcG9zaXRvcnkyNDMyNDczMzA=","name":"Standard-Toolkit","full_name":"Krypton-Suite/Standard-Toolkit","private":false,"owner":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Krypton-Suite/Standard-Toolkit","description":"An update to Component factory's krypton toolkit to support .NET Framework 3.5 to .NET Core/.NET","fork":false,"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit","forks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/forks","keys_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/teams","hooks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/hooks","issue_events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/events{/number}","events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/events","assignees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/assignees{/user}","branches_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/branches{/branch}","tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/tags","blobs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/{sha}","languages_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/languages","stargazers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/stargazers","contributors_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contributors","subscribers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscribers","subscription_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscription","commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contents/{+path}","compare_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/merges","archive_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/downloads","issues_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues{/number}","pulls_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls{/number}","milestones_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/milestones{/number}","notifications_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/labels{/name}","releases_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/releases{/id}","deployments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/deployments","created_at":"2020-02-26T11:33:33Z","updated_at":"2021-07-20T17:53:46Z","pushed_at":"2021-07-20T17:47:02Z","git_url":"git://github.com/Krypton-Suite/Standard-Toolkit.git","ssh_url":"git@github.com:Krypton-Suite/Standard-Toolkit.git","clone_url":"https://github.com/Krypton-Suite/Standard-Toolkit.git","svn_url":"https://github.com/Krypton-Suite/Standard-Toolkit","homepage":"","size":12480,"stargazers_count":84,"watchers_count":84,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":12,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":59,"license":{"key":"bsd-3-clause","name":"BSD 3-Clause \"New\" or \"Revised\" License","spdx_id":"BSD-3-Clause","url":"https://api.github.com/licenses/bsd-3-clause","node_id":"MDc6TGljZW5zZTU="},"forks":12,"open_issues":59,"watchers":84,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199"},"html":{"href":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199"},"issue":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199"},"comments":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199/comments"},"review_comments":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/comments"},"review_comment":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/commits"},"statuses":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/6045c9a6424e198f542c84a97ff094a4952c866d"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:05Z","org":{"id":61501509,"login":"Krypton-Suite","gravatar_id":"","url":"https://api.github.com/orgs/Krypton-Suite","avatar_url":"https://avatars.githubusercontent.com/u/61501509?"}}
+{"id":"17244792635","type":"IssuesEvent","actor":{"id":3520788,"login":"arnosthavelka","display_login":"arnosthavelka","gravatar_id":"","url":"https://api.github.com/users/arnosthavelka","avatar_url":"https://avatars.githubusercontent.com/u/3520788?"},"repo":{"id":80031573,"name":"arnosthavelka/junit-poc","url":"https://api.github.com/repos/arnosthavelka/junit-poc"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37","repository_url":"https://api.github.com/repos/arnosthavelka/junit-poc","labels_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37/labels{/name}","comments_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37/comments","events_url":"https://api.github.com/repos/arnosthavelka/junit-poc/issues/37/events","html_url":"https://github.com/arnosthavelka/junit-poc/issues/37","id":664238030,"node_id":"MDU6SXNzdWU2NjQyMzgwMzA=","number":37,"title":"Maven profile for JDK previews","user":{"login":"arnosthavelka","id":3520788,"node_id":"MDQ6VXNlcjM1MjA3ODg=","avatar_url":"https://avatars.githubusercontent.com/u/3520788?v=4","gravatar_id":"","url":"https://api.github.com/users/arnosthavelka","html_url":"https://github.com/arnosthavelka","followers_url":"https://api.github.com/users/arnosthavelka/followers","following_url":"https://api.github.com/users/arnosthavelka/following{/other_user}","gists_url":"https://api.github.com/users/arnosthavelka/gists{/gist_id}","starred_url":"https://api.github.com/users/arnosthavelka/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arnosthavelka/subscriptions","organizations_url":"https://api.github.com/users/arnosthavelka/orgs","repos_url":"https://api.github.com/users/arnosthavelka/repos","events_url":"https://api.github.com/users/arnosthavelka/events{/privacy}","received_events_url":"https://api.github.com/users/arnosthavelka/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2020-07-23T06:40:56Z","updated_at":"2021-07-21T07:00:05Z","closed_at":"2021-07-21T07:00:05Z","author_association":"OWNER","active_lock_reason":null,"body":"The preview features are enabled by flag `--enable-preview`. This option has to be added to these maven plugins:\r\n- `maven-compiler-plugin`\r\n- `maven-surefire-plugin`\r\n- `maven-failsafe-plugin`","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792638","type":"CreateEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388024741,"name":"thatjohn01/721001687","url":"https://api.github.com/repos/thatjohn01/721001687"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":"中国有个毛泽东-少年版_PDF下载_本书编委会编写，胡月生，林学勤执笔","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792639","type":"DeleteEvent","actor":{"id":26302304,"login":"Avokadoen","display_login":"Avokadoen","gravatar_id":"","url":"https://api.github.com/users/Avokadoen","avatar_url":"https://avatars.githubusercontent.com/u/26302304?"},"repo":{"id":340032111,"name":"Avokadoen/gowarcserver","url":"https://api.github.com/repos/Avokadoen/gowarcserver"},"payload":{"ref":"extend-lint","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792642","type":"PushEvent","actor":{"id":39609219,"login":"lyongchang","display_login":"lyongchang","gravatar_id":"","url":"https://api.github.com/users/lyongchang","avatar_url":"https://avatars.githubusercontent.com/u/39609219?"},"repo":{"id":322192101,"name":"lyongchang/blog-imgbed","url":"https://api.github.com/repos/lyongchang/blog-imgbed"},"payload":{"push_id":7561706548,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"866a14452984bd47dddb73862e37d0e79666ac08","before":"31a31b863a4a497d3ae32044544e87e2fa37fca8","commits":[{"sha":"866a14452984bd47dddb73862e37d0e79666ac08","author":{"name":"lyongchang","email":"2feb1c16820736bf33e9bb1397bb3292362c7d15@users.noreply.github.com"},"message":"Upload by PicGo","distinct":true,"url":"https://api.github.com/repos/lyongchang/blog-imgbed/commits/866a14452984bd47dddb73862e37d0e79666ac08"}]},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792643","type":"CreateEvent","actor":{"id":82650311,"login":"Niharika-Trivedi","display_login":"Niharika-Trivedi","gravatar_id":"","url":"https://api.github.com/users/Niharika-Trivedi","avatar_url":"https://avatars.githubusercontent.com/u/82650311?"},"repo":{"id":388024740,"name":"Niharika-Trivedi/Project-22-Bouncing-Ball-By-Niharika-Trivedi-","url":"https://api.github.com/repos/Niharika-Trivedi/Project-22-Bouncing-Ball-By-Niharika-Trivedi-"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792644","type":"IssueCommentEvent","actor":{"id":23638133,"login":"LaoXiZi","display_login":"LaoXiZi","gravatar_id":"","url":"https://api.github.com/users/LaoXiZi","avatar_url":"https://avatars.githubusercontent.com/u/23638133?"},"repo":{"id":28550872,"name":"Bigkoo/Android-PickerView","url":"https://api.github.com/repos/Bigkoo/Android-PickerView"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/Bigkoo/Android-PickerView/issues/823","repository_url":"https://api.github.com/repos/Bigkoo/Android-PickerView","labels_url":"https://api.github.com/repos/Bigkoo/Android-PickerView/issues/823/labels{/name}","comments_url":"https://api.github.com/repos/Bigkoo/Android-PickerView/issues/823/comments","events_url":"https://api.github.com/repos/Bigkoo/Android-PickerView/issues/823/events","html_url":"https://github.com/Bigkoo/Android-PickerView/issues/823","id":505028039,"node_id":"MDU6SXNzdWU1MDUwMjgwMzk=","number":823,"title":"时间倒序展示问题","user":{"login":"wojiaoyanxin","id":23535341,"node_id":"MDQ6VXNlcjIzNTM1MzQx","avatar_url":"https://avatars.githubusercontent.com/u/23535341?v=4","gravatar_id":"","url":"https://api.github.com/users/wojiaoyanxin","html_url":"https://github.com/wojiaoyanxin","followers_url":"https://api.github.com/users/wojiaoyanxin/followers","following_url":"https://api.github.com/users/wojiaoyanxin/following{/other_user}","gists_url":"https://api.github.com/users/wojiaoyanxin/gists{/gist_id}","starred_url":"https://api.github.com/users/wojiaoyanxin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wojiaoyanxin/subscriptions","organizations_url":"https://api.github.com/users/wojiaoyanxin/orgs","repos_url":"https://api.github.com/users/wojiaoyanxin/repos","events_url":"https://api.github.com/users/wojiaoyanxin/events{/privacy}","received_events_url":"https://api.github.com/users/wojiaoyanxin/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":3,"created_at":"2019-10-10T04:35:09Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"目前展示 :   1980 - 2019  需求:  2019 -1980 ","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/Bigkoo/Android-PickerView/issues/comments/883942820","html_url":"https://github.com/Bigkoo/Android-PickerView/issues/823#issuecomment-883942820","issue_url":"https://api.github.com/repos/Bigkoo/Android-PickerView/issues/823","id":883942820,"node_id":"IC_kwDOAbOm2M40r-Wk","user":{"login":"LaoXiZi","id":23638133,"node_id":"MDQ6VXNlcjIzNjM4MTMz","avatar_url":"https://avatars.githubusercontent.com/u/23638133?v=4","gravatar_id":"","url":"https://api.github.com/users/LaoXiZi","html_url":"https://github.com/LaoXiZi","followers_url":"https://api.github.com/users/LaoXiZi/followers","following_url":"https://api.github.com/users/LaoXiZi/following{/other_user}","gists_url":"https://api.github.com/users/LaoXiZi/gists{/gist_id}","starred_url":"https://api.github.com/users/LaoXiZi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LaoXiZi/subscriptions","organizations_url":"https://api.github.com/users/LaoXiZi/orgs","repos_url":"https://api.github.com/users/LaoXiZi/repos","events_url":"https://api.github.com/users/LaoXiZi/events{/privacy}","received_events_url":"https://api.github.com/users/LaoXiZi/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","author_association":"NONE","body":"有支持倒序的Api吗？","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T07:00:06Z","org":{"id":25974450,"login":"Bigkoo","gravatar_id":"","url":"https://api.github.com/orgs/Bigkoo","avatar_url":"https://avatars.githubusercontent.com/u/25974450?"}}
+{"id":"17244792647","type":"PushEvent","actor":{"id":49699333,"login":"dependabot[bot]","display_login":"dependabot","gravatar_id":"","url":"https://api.github.com/users/dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},"repo":{"id":252650570,"name":"kolebjak/game-of-clicks","url":"https://api.github.com/repos/kolebjak/game-of-clicks"},"payload":{"push_id":7561706546,"size":3,"distinct_size":1,"ref":"refs/heads/dependabot/npm_and_yarn/frontend/merge-deep-3.0.3","head":"7e11c2b5fc310c2ce6b5b0fdb496380182700bcb","before":"ef4224393cf98672b6a1efb2a540605e2bf8aa09","commits":[{"sha":"7f40b43c11a19b234183a48c9ec8bc65872b99b0","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"Bump @babel/core from 7.14.6 to 7.14.8 in /server\n\nBumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.6 to 7.14.8.\n- [Release notes](https://github.com/babel/babel/releases)\n- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)\n- [Commits](https://github.com/babel/babel/commits/v7.14.8/packages/babel-core)\n\nSigned-off-by: dependabot-preview[bot] <support@dependabot.com>","distinct":false,"url":"https://api.github.com/repos/kolebjak/game-of-clicks/commits/7f40b43c11a19b234183a48c9ec8bc65872b99b0"},{"sha":"4a363c59f67b335fa6d3bfa1b865d72b7329934b","author":{"name":"dependabot-preview[bot]","email":"6a4c1c4838f800d1998274cd5234e1f65c55e90c@users.noreply.github.com"},"message":"Merge pull request #722 from kolebjak/dependabot/npm_and_yarn/server/babel/core-7.14.8","distinct":false,"url":"https://api.github.com/repos/kolebjak/game-of-clicks/commits/4a363c59f67b335fa6d3bfa1b865d72b7329934b"},{"sha":"7e11c2b5fc310c2ce6b5b0fdb496380182700bcb","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump merge-deep from 3.0.2 to 3.0.3 in /frontend\n\nBumps [merge-deep](https://github.com/jonschlinkert/merge-deep) from 3.0.2 to 3.0.3.\n- [Release notes](https://github.com/jonschlinkert/merge-deep/releases)\n- [Commits](https://github.com/jonschlinkert/merge-deep/compare/3.0.2...3.0.3)\n\n---\nupdated-dependencies:\n- dependency-name: merge-deep\n  dependency-type: indirect\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":true,"url":"https://api.github.com/repos/kolebjak/game-of-clicks/commits/7e11c2b5fc310c2ce6b5b0fdb496380182700bcb"}]},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792652","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7561706556,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8c098f0de3a8250482ca67affcb8b58d25480642","before":"fd13b1c5319c1f9ad4a95ec828ec6c11d514f219","commits":[{"sha":"8c098f0de3a8250482ca67affcb8b58d25480642","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/8c098f0de3a8250482ca67affcb8b58d25480642"}]},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792672","type":"PullRequestEvent","actor":{"id":9405495,"login":"livio-a","display_login":"livio-a","gravatar_id":"","url":"https://api.github.com/users/livio-a","avatar_url":"https://avatars.githubusercontent.com/u/9405495?"},"repo":{"id":247714750,"name":"caos/zitadel","url":"https://api.github.com/repos/caos/zitadel"},"payload":{"action":"closed","number":2052,"pull_request":{"url":"https://api.github.com/repos/caos/zitadel/pulls/2052","id":694094797,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MDk0Nzk3","html_url":"https://github.com/caos/zitadel/pull/2052","diff_url":"https://github.com/caos/zitadel/pull/2052.diff","patch_url":"https://github.com/caos/zitadel/pull/2052.patch","issue_url":"https://api.github.com/repos/caos/zitadel/issues/2052","number":2052,"state":"closed","locked":false,"title":"fix: update oidc lib to fix userinfo claims in id_token","user":{"login":"livio-a","id":9405495,"node_id":"MDQ6VXNlcjk0MDU0OTU=","avatar_url":"https://avatars.githubusercontent.com/u/9405495?v=4","gravatar_id":"","url":"https://api.github.com/users/livio-a","html_url":"https://github.com/livio-a","followers_url":"https://api.github.com/users/livio-a/followers","following_url":"https://api.github.com/users/livio-a/following{/other_user}","gists_url":"https://api.github.com/users/livio-a/gists{/gist_id}","starred_url":"https://api.github.com/users/livio-a/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/livio-a/subscriptions","organizations_url":"https://api.github.com/users/livio-a/orgs","repos_url":"https://api.github.com/users/livio-a/repos","events_url":"https://api.github.com/users/livio-a/events{/privacy}","received_events_url":"https://api.github.com/users/livio-a/received_events","type":"User","site_admin":false},"body":"/closes #2051 ","created_at":"2021-07-21T06:40:12Z","updated_at":"2021-07-21T07:00:05Z","closed_at":"2021-07-21T07:00:05Z","merged_at":"2021-07-21T07:00:05Z","merge_commit_sha":"21001862ae749f8cc67bc308b9c6d68d3f97b76f","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/caos/zitadel/pulls/2052/commits","review_comments_url":"https://api.github.com/repos/caos/zitadel/pulls/2052/comments","review_comment_url":"https://api.github.com/repos/caos/zitadel/pulls/comments{/number}","comments_url":"https://api.github.com/repos/caos/zitadel/issues/2052/comments","statuses_url":"https://api.github.com/repos/caos/zitadel/statuses/791b7df747836965c0e1aa879753edd04072034b","head":{"label":"caos:userinfo-claims","ref":"userinfo-claims","sha":"791b7df747836965c0e1aa879753edd04072034b","user":{"login":"caos","id":48989016,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ4OTg5MDE2","avatar_url":"https://avatars.githubusercontent.com/u/48989016?v=4","gravatar_id":"","url":"https://api.github.com/users/caos","html_url":"https://github.com/caos","followers_url":"https://api.github.com/users/caos/followers","following_url":"https://api.github.com/users/caos/following{/other_user}","gists_url":"https://api.github.com/users/caos/gists{/gist_id}","starred_url":"https://api.github.com/users/caos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/caos/subscriptions","organizations_url":"https://api.github.com/users/caos/orgs","repos_url":"https://api.github.com/users/caos/repos","events_url":"https://api.github.com/users/caos/events{/privacy}","received_events_url":"https://api.github.com/users/caos/received_events","type":"Organization","site_admin":false},"repo":{"id":247714750,"node_id":"MDEwOlJlcG9zaXRvcnkyNDc3MTQ3NTA=","name":"zitadel","full_name":"caos/zitadel","private":false,"owner":{"login":"caos","id":48989016,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ4OTg5MDE2","avatar_url":"https://avatars.githubusercontent.com/u/48989016?v=4","gravatar_id":"","url":"https://api.github.com/users/caos","html_url":"https://github.com/caos","followers_url":"https://api.github.com/users/caos/followers","following_url":"https://api.github.com/users/caos/following{/other_user}","gists_url":"https://api.github.com/users/caos/gists{/gist_id}","starred_url":"https://api.github.com/users/caos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/caos/subscriptions","organizations_url":"https://api.github.com/users/caos/orgs","repos_url":"https://api.github.com/users/caos/repos","events_url":"https://api.github.com/users/caos/events{/privacy}","received_events_url":"https://api.github.com/users/caos/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/caos/zitadel","description":"ZITADEL - Cloud Native Identity and Access Management","fork":false,"url":"https://api.github.com/repos/caos/zitadel","forks_url":"https://api.github.com/repos/caos/zitadel/forks","keys_url":"https://api.github.com/repos/caos/zitadel/keys{/key_id}","collaborators_url":"https://api.github.com/repos/caos/zitadel/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/caos/zitadel/teams","hooks_url":"https://api.github.com/repos/caos/zitadel/hooks","issue_events_url":"https://api.github.com/repos/caos/zitadel/issues/events{/number}","events_url":"https://api.github.com/repos/caos/zitadel/events","assignees_url":"https://api.github.com/repos/caos/zitadel/assignees{/user}","branches_url":"https://api.github.com/repos/caos/zitadel/branches{/branch}","tags_url":"https://api.github.com/repos/caos/zitadel/tags","blobs_url":"https://api.github.com/repos/caos/zitadel/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/caos/zitadel/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/caos/zitadel/git/refs{/sha}","trees_url":"https://api.github.com/repos/caos/zitadel/git/trees{/sha}","statuses_url":"https://api.github.com/repos/caos/zitadel/statuses/{sha}","languages_url":"https://api.github.com/repos/caos/zitadel/languages","stargazers_url":"https://api.github.com/repos/caos/zitadel/stargazers","contributors_url":"https://api.github.com/repos/caos/zitadel/contributors","subscribers_url":"https://api.github.com/repos/caos/zitadel/subscribers","subscription_url":"https://api.github.com/repos/caos/zitadel/subscription","commits_url":"https://api.github.com/repos/caos/zitadel/commits{/sha}","git_commits_url":"https://api.github.com/repos/caos/zitadel/git/commits{/sha}","comments_url":"https://api.github.com/repos/caos/zitadel/comments{/number}","issue_comment_url":"https://api.github.com/repos/caos/zitadel/issues/comments{/number}","contents_url":"https://api.github.com/repos/caos/zitadel/contents/{+path}","compare_url":"https://api.github.com/repos/caos/zitadel/compare/{base}...{head}","merges_url":"https://api.github.com/repos/caos/zitadel/merges","archive_url":"https://api.github.com/repos/caos/zitadel/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/caos/zitadel/downloads","issues_url":"https://api.github.com/repos/caos/zitadel/issues{/number}","pulls_url":"https://api.github.com/repos/caos/zitadel/pulls{/number}","milestones_url":"https://api.github.com/repos/caos/zitadel/milestones{/number}","notifications_url":"https://api.github.com/repos/caos/zitadel/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/caos/zitadel/labels{/name}","releases_url":"https://api.github.com/repos/caos/zitadel/releases{/id}","deployments_url":"https://api.github.com/repos/caos/zitadel/deployments","created_at":"2020-03-16T13:51:31Z","updated_at":"2021-07-20T13:47:52Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/caos/zitadel.git","ssh_url":"git@github.com:caos/zitadel.git","clone_url":"https://github.com/caos/zitadel.git","svn_url":"https://github.com/caos/zitadel","homepage":"https://zitadel.ch","size":192076,"stargazers_count":168,"watchers_count":168,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":15,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":93,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":15,"open_issues":93,"watchers":168,"default_branch":"main"}},"base":{"label":"caos:main","ref":"main","sha":"25c9d7371d7442401f837ff60c82b27b7acaef1c","user":{"login":"caos","id":48989016,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ4OTg5MDE2","avatar_url":"https://avatars.githubusercontent.com/u/48989016?v=4","gravatar_id":"","url":"https://api.github.com/users/caos","html_url":"https://github.com/caos","followers_url":"https://api.github.com/users/caos/followers","following_url":"https://api.github.com/users/caos/following{/other_user}","gists_url":"https://api.github.com/users/caos/gists{/gist_id}","starred_url":"https://api.github.com/users/caos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/caos/subscriptions","organizations_url":"https://api.github.com/users/caos/orgs","repos_url":"https://api.github.com/users/caos/repos","events_url":"https://api.github.com/users/caos/events{/privacy}","received_events_url":"https://api.github.com/users/caos/received_events","type":"Organization","site_admin":false},"repo":{"id":247714750,"node_id":"MDEwOlJlcG9zaXRvcnkyNDc3MTQ3NTA=","name":"zitadel","full_name":"caos/zitadel","private":false,"owner":{"login":"caos","id":48989016,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ4OTg5MDE2","avatar_url":"https://avatars.githubusercontent.com/u/48989016?v=4","gravatar_id":"","url":"https://api.github.com/users/caos","html_url":"https://github.com/caos","followers_url":"https://api.github.com/users/caos/followers","following_url":"https://api.github.com/users/caos/following{/other_user}","gists_url":"https://api.github.com/users/caos/gists{/gist_id}","starred_url":"https://api.github.com/users/caos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/caos/subscriptions","organizations_url":"https://api.github.com/users/caos/orgs","repos_url":"https://api.github.com/users/caos/repos","events_url":"https://api.github.com/users/caos/events{/privacy}","received_events_url":"https://api.github.com/users/caos/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/caos/zitadel","description":"ZITADEL - Cloud Native Identity and Access Management","fork":false,"url":"https://api.github.com/repos/caos/zitadel","forks_url":"https://api.github.com/repos/caos/zitadel/forks","keys_url":"https://api.github.com/repos/caos/zitadel/keys{/key_id}","collaborators_url":"https://api.github.com/repos/caos/zitadel/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/caos/zitadel/teams","hooks_url":"https://api.github.com/repos/caos/zitadel/hooks","issue_events_url":"https://api.github.com/repos/caos/zitadel/issues/events{/number}","events_url":"https://api.github.com/repos/caos/zitadel/events","assignees_url":"https://api.github.com/repos/caos/zitadel/assignees{/user}","branches_url":"https://api.github.com/repos/caos/zitadel/branches{/branch}","tags_url":"https://api.github.com/repos/caos/zitadel/tags","blobs_url":"https://api.github.com/repos/caos/zitadel/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/caos/zitadel/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/caos/zitadel/git/refs{/sha}","trees_url":"https://api.github.com/repos/caos/zitadel/git/trees{/sha}","statuses_url":"https://api.github.com/repos/caos/zitadel/statuses/{sha}","languages_url":"https://api.github.com/repos/caos/zitadel/languages","stargazers_url":"https://api.github.com/repos/caos/zitadel/stargazers","contributors_url":"https://api.github.com/repos/caos/zitadel/contributors","subscribers_url":"https://api.github.com/repos/caos/zitadel/subscribers","subscription_url":"https://api.github.com/repos/caos/zitadel/subscription","commits_url":"https://api.github.com/repos/caos/zitadel/commits{/sha}","git_commits_url":"https://api.github.com/repos/caos/zitadel/git/commits{/sha}","comments_url":"https://api.github.com/repos/caos/zitadel/comments{/number}","issue_comment_url":"https://api.github.com/repos/caos/zitadel/issues/comments{/number}","contents_url":"https://api.github.com/repos/caos/zitadel/contents/{+path}","compare_url":"https://api.github.com/repos/caos/zitadel/compare/{base}...{head}","merges_url":"https://api.github.com/repos/caos/zitadel/merges","archive_url":"https://api.github.com/repos/caos/zitadel/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/caos/zitadel/downloads","issues_url":"https://api.github.com/repos/caos/zitadel/issues{/number}","pulls_url":"https://api.github.com/repos/caos/zitadel/pulls{/number}","milestones_url":"https://api.github.com/repos/caos/zitadel/milestones{/number}","notifications_url":"https://api.github.com/repos/caos/zitadel/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/caos/zitadel/labels{/name}","releases_url":"https://api.github.com/repos/caos/zitadel/releases{/id}","deployments_url":"https://api.github.com/repos/caos/zitadel/deployments","created_at":"2020-03-16T13:51:31Z","updated_at":"2021-07-20T13:47:52Z","pushed_at":"2021-07-21T07:00:05Z","git_url":"git://github.com/caos/zitadel.git","ssh_url":"git@github.com:caos/zitadel.git","clone_url":"https://github.com/caos/zitadel.git","svn_url":"https://github.com/caos/zitadel","homepage":"https://zitadel.ch","size":192076,"stargazers_count":168,"watchers_count":168,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":15,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":93,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":15,"open_issues":93,"watchers":168,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/caos/zitadel/pulls/2052"},"html":{"href":"https://github.com/caos/zitadel/pull/2052"},"issue":{"href":"https://api.github.com/repos/caos/zitadel/issues/2052"},"comments":{"href":"https://api.github.com/repos/caos/zitadel/issues/2052/comments"},"review_comments":{"href":"https://api.github.com/repos/caos/zitadel/pulls/2052/comments"},"review_comment":{"href":"https://api.github.com/repos/caos/zitadel/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/caos/zitadel/pulls/2052/commits"},"statuses":{"href":"https://api.github.com/repos/caos/zitadel/statuses/791b7df747836965c0e1aa879753edd04072034b"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"livio-a","id":9405495,"node_id":"MDQ6VXNlcjk0MDU0OTU=","avatar_url":"https://avatars.githubusercontent.com/u/9405495?v=4","gravatar_id":"","url":"https://api.github.com/users/livio-a","html_url":"https://github.com/livio-a","followers_url":"https://api.github.com/users/livio-a/followers","following_url":"https://api.github.com/users/livio-a/following{/other_user}","gists_url":"https://api.github.com/users/livio-a/gists{/gist_id}","starred_url":"https://api.github.com/users/livio-a/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/livio-a/subscriptions","organizations_url":"https://api.github.com/users/livio-a/orgs","repos_url":"https://api.github.com/users/livio-a/repos","events_url":"https://api.github.com/users/livio-a/events{/privacy}","received_events_url":"https://api.github.com/users/livio-a/received_events","type":"User","site_admin":false},"comments":2,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":3,"deletions":3,"changed_files":2}},"public":true,"created_at":"2021-07-21T07:00:06Z","org":{"id":48989016,"login":"caos","gravatar_id":"","url":"https://api.github.com/orgs/caos","avatar_url":"https://avatars.githubusercontent.com/u/48989016?"}}
+{"id":"17244792673","type":"PushEvent","actor":{"id":47466906,"login":"akjadon","display_login":"akjadon","gravatar_id":"","url":"https://api.github.com/users/akjadon","avatar_url":"https://avatars.githubusercontent.com/u/47466906?"},"repo":{"id":191207450,"name":"akjadon/HH","url":"https://api.github.com/repos/akjadon/HH"},"payload":{"push_id":7561706551,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"41d7ff8d4d593888363ba46dd31c357a74252e97","before":"9da22a1e1b74a25956bd3f2ab1f090840f2d9c90","commits":[{"sha":"41d7ff8d4d593888363ba46dd31c357a74252e97","author":{"name":"Anil Jadon","email":"ca0c2591d573677204b744617f3dee79ed1b3452@users.noreply.github.com"},"message":"Rename class_demo/w0.0/827_m1_demo4_v1.0.ipynb to class_demo/w0.0/ex0.0/827_m1_demo4_v1.0.ipynb","distinct":true,"url":"https://api.github.com/repos/akjadon/HH/commits/41d7ff8d4d593888363ba46dd31c357a74252e97"}]},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792677","type":"PushEvent","actor":{"id":3379460,"login":"beanslee2012","display_login":"beanslee2012","gravatar_id":"","url":"https://api.github.com/users/beanslee2012","avatar_url":"https://avatars.githubusercontent.com/u/3379460?"},"repo":{"id":215003385,"name":"beanslee2012/games","url":"https://api.github.com/repos/beanslee2012/games"},"payload":{"push_id":7561706562,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"ae21fd47cc607d28e3379bc786e8635e0c4ef896","before":"d597a1ea1c79280206699e944c9b1dd315585ded","commits":[{"sha":"ae21fd47cc607d28e3379bc786e8635e0c4ef896","author":{"name":"beanslee2012","email":"9aadcc12fe6ab8c01e6245204a102e9e34317220@gmail.com"},"message":"daily update","distinct":true,"url":"https://api.github.com/repos/beanslee2012/games/commits/ae21fd47cc607d28e3379bc786e8635e0c4ef896"}]},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792680","type":"CreateEvent","actor":{"id":791757,"login":"jmirtsch","display_login":"jmirtsch","gravatar_id":"","url":"https://api.github.com/users/jmirtsch","avatar_url":"https://avatars.githubusercontent.com/u/791757?"},"repo":{"id":346959145,"name":"jmirtsch/IFC-Specification","url":"https://api.github.com/repos/jmirtsch/IFC-Specification"},"payload":{"ref":"RailProperties_IfcFlowInstrument","ref_type":"branch","master_branch":"main","description":"IfcDoc baseline to produce the documentation","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792686","type":"DeleteEvent","actor":{"id":1005065,"login":"DeepDiver1975","display_login":"DeepDiver1975","gravatar_id":"","url":"https://api.github.com/users/DeepDiver1975","avatar_url":"https://avatars.githubusercontent.com/u/1005065?"},"repo":{"id":386559157,"name":"DeepDiver1975/laravel-cursor-paginator","url":"https://api.github.com/repos/DeepDiver1975/laravel-cursor-paginator"},"payload":{"ref":"feat/dependabot","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792688","type":"WatchEvent","actor":{"id":10879414,"login":"NagleZhang","display_login":"NagleZhang","gravatar_id":"","url":"https://api.github.com/users/NagleZhang","avatar_url":"https://avatars.githubusercontent.com/u/10879414?"},"repo":{"id":211085593,"name":"redguardtoo/company-ctags","url":"https://api.github.com/repos/redguardtoo/company-ctags"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792692","type":"PullRequestReviewEvent","actor":{"id":2418812,"login":"Smurf-IV","display_login":"Smurf-IV","gravatar_id":"","url":"https://api.github.com/users/Smurf-IV","avatar_url":"https://avatars.githubusercontent.com/u/2418812?"},"repo":{"id":243247330,"name":"Krypton-Suite/Standard-Toolkit","url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit"},"payload":{"action":"created","review":{"id":711317412,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzE3NDEy","user":{"login":"Smurf-IV","id":2418812,"node_id":"MDQ6VXNlcjI0MTg4MTI=","avatar_url":"https://avatars.githubusercontent.com/u/2418812?v=4","gravatar_id":"","url":"https://api.github.com/users/Smurf-IV","html_url":"https://github.com/Smurf-IV","followers_url":"https://api.github.com/users/Smurf-IV/followers","following_url":"https://api.github.com/users/Smurf-IV/following{/other_user}","gists_url":"https://api.github.com/users/Smurf-IV/gists{/gist_id}","starred_url":"https://api.github.com/users/Smurf-IV/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Smurf-IV/subscriptions","organizations_url":"https://api.github.com/users/Smurf-IV/orgs","repos_url":"https://api.github.com/users/Smurf-IV/repos","events_url":"https://api.github.com/users/Smurf-IV/events{/privacy}","received_events_url":"https://api.github.com/users/Smurf-IV/received_events","type":"User","site_admin":false},"body":null,"commit_id":"e174641d5578c95967e8df67aea55a15ad919ac7","submitted_at":"2021-07-21T07:00:05Z","state":"commented","html_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199#pullrequestreview-711317412","pull_request_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199#pullrequestreview-711317412"},"pull_request":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199"}}},"pull_request":{"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199","id":692062634,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMDYyNjM0","html_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199","diff_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199.diff","patch_url":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199.patch","issue_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199","number":199,"state":"open","locked":false,"title":"Alpha fr197","user":{"login":"Wagnerp","id":949607,"node_id":"MDQ6VXNlcjk0OTYwNw==","avatar_url":"https://avatars.githubusercontent.com/u/949607?v=4","gravatar_id":"","url":"https://api.github.com/users/Wagnerp","html_url":"https://github.com/Wagnerp","followers_url":"https://api.github.com/users/Wagnerp/followers","following_url":"https://api.github.com/users/Wagnerp/following{/other_user}","gists_url":"https://api.github.com/users/Wagnerp/gists{/gist_id}","starred_url":"https://api.github.com/users/Wagnerp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wagnerp/subscriptions","organizations_url":"https://api.github.com/users/Wagnerp/orgs","repos_url":"https://api.github.com/users/Wagnerp/repos","events_url":"https://api.github.com/users/Wagnerp/events{/privacy}","received_events_url":"https://api.github.com/users/Wagnerp/received_events","type":"User","site_admin":false},"body":"#197 pt. 1","created_at":"2021-07-18T09:59:40Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e7e5bc21581f2760133e1342dc94bf883113274a","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/commits","review_comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/comments","review_comment_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199/comments","statuses_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/6045c9a6424e198f542c84a97ff094a4952c866d","head":{"label":"Krypton-Suite:alpha-fr197","ref":"alpha-fr197","sha":"6045c9a6424e198f542c84a97ff094a4952c866d","user":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"repo":{"id":243247330,"node_id":"MDEwOlJlcG9zaXRvcnkyNDMyNDczMzA=","name":"Standard-Toolkit","full_name":"Krypton-Suite/Standard-Toolkit","private":false,"owner":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Krypton-Suite/Standard-Toolkit","description":"An update to Component factory's krypton toolkit to support .NET Framework 3.5 to .NET Core/.NET","fork":false,"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit","forks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/forks","keys_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/teams","hooks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/hooks","issue_events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/events{/number}","events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/events","assignees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/assignees{/user}","branches_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/branches{/branch}","tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/tags","blobs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/{sha}","languages_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/languages","stargazers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/stargazers","contributors_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contributors","subscribers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscribers","subscription_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscription","commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contents/{+path}","compare_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/merges","archive_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/downloads","issues_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues{/number}","pulls_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls{/number}","milestones_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/milestones{/number}","notifications_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/labels{/name}","releases_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/releases{/id}","deployments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/deployments","created_at":"2020-02-26T11:33:33Z","updated_at":"2021-07-20T17:53:46Z","pushed_at":"2021-07-20T17:47:02Z","git_url":"git://github.com/Krypton-Suite/Standard-Toolkit.git","ssh_url":"git@github.com:Krypton-Suite/Standard-Toolkit.git","clone_url":"https://github.com/Krypton-Suite/Standard-Toolkit.git","svn_url":"https://github.com/Krypton-Suite/Standard-Toolkit","homepage":"","size":12480,"stargazers_count":84,"watchers_count":84,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":12,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":59,"license":{"key":"bsd-3-clause","name":"BSD 3-Clause \"New\" or \"Revised\" License","spdx_id":"BSD-3-Clause","url":"https://api.github.com/licenses/bsd-3-clause","node_id":"MDc6TGljZW5zZTU="},"forks":12,"open_issues":59,"watchers":84,"default_branch":"master"}},"base":{"label":"Krypton-Suite:alpha","ref":"alpha","sha":"4c6b6a3d8990d1bc888f01369b2348bd909dda72","user":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"repo":{"id":243247330,"node_id":"MDEwOlJlcG9zaXRvcnkyNDMyNDczMzA=","name":"Standard-Toolkit","full_name":"Krypton-Suite/Standard-Toolkit","private":false,"owner":{"login":"Krypton-Suite","id":61501509,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYxNTAxNTA5","avatar_url":"https://avatars.githubusercontent.com/u/61501509?v=4","gravatar_id":"","url":"https://api.github.com/users/Krypton-Suite","html_url":"https://github.com/Krypton-Suite","followers_url":"https://api.github.com/users/Krypton-Suite/followers","following_url":"https://api.github.com/users/Krypton-Suite/following{/other_user}","gists_url":"https://api.github.com/users/Krypton-Suite/gists{/gist_id}","starred_url":"https://api.github.com/users/Krypton-Suite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Krypton-Suite/subscriptions","organizations_url":"https://api.github.com/users/Krypton-Suite/orgs","repos_url":"https://api.github.com/users/Krypton-Suite/repos","events_url":"https://api.github.com/users/Krypton-Suite/events{/privacy}","received_events_url":"https://api.github.com/users/Krypton-Suite/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/Krypton-Suite/Standard-Toolkit","description":"An update to Component factory's krypton toolkit to support .NET Framework 3.5 to .NET Core/.NET","fork":false,"url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit","forks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/forks","keys_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/teams","hooks_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/hooks","issue_events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/events{/number}","events_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/events","assignees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/assignees{/user}","branches_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/branches{/branch}","tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/tags","blobs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/{sha}","languages_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/languages","stargazers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/stargazers","contributors_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contributors","subscribers_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscribers","subscription_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/subscription","commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/contents/{+path}","compare_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/merges","archive_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/downloads","issues_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues{/number}","pulls_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls{/number}","milestones_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/milestones{/number}","notifications_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/labels{/name}","releases_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/releases{/id}","deployments_url":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/deployments","created_at":"2020-02-26T11:33:33Z","updated_at":"2021-07-20T17:53:46Z","pushed_at":"2021-07-20T17:47:02Z","git_url":"git://github.com/Krypton-Suite/Standard-Toolkit.git","ssh_url":"git@github.com:Krypton-Suite/Standard-Toolkit.git","clone_url":"https://github.com/Krypton-Suite/Standard-Toolkit.git","svn_url":"https://github.com/Krypton-Suite/Standard-Toolkit","homepage":"","size":12480,"stargazers_count":84,"watchers_count":84,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":12,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":59,"license":{"key":"bsd-3-clause","name":"BSD 3-Clause \"New\" or \"Revised\" License","spdx_id":"BSD-3-Clause","url":"https://api.github.com/licenses/bsd-3-clause","node_id":"MDc6TGljZW5zZTU="},"forks":12,"open_issues":59,"watchers":84,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199"},"html":{"href":"https://github.com/Krypton-Suite/Standard-Toolkit/pull/199"},"issue":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199"},"comments":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/issues/199/comments"},"review_comments":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/comments"},"review_comment":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/pulls/199/commits"},"statuses":{"href":"https://api.github.com/repos/Krypton-Suite/Standard-Toolkit/statuses/6045c9a6424e198f542c84a97ff094a4952c866d"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T07:00:06Z","org":{"id":61501509,"login":"Krypton-Suite","gravatar_id":"","url":"https://api.github.com/orgs/Krypton-Suite","avatar_url":"https://avatars.githubusercontent.com/u/61501509?"}}
+{"id":"17244792697","type":"PullRequestEvent","actor":{"id":48777463,"login":"parkinhee","display_login":"parkinhee","gravatar_id":"","url":"https://api.github.com/users/parkinhee","avatar_url":"https://avatars.githubusercontent.com/u/48777463?"},"repo":{"id":379487763,"name":"Taesun0727/wisevill","url":"https://api.github.com/repos/Taesun0727/wisevill"},"payload":{"action":"opened","number":110,"pull_request":{"url":"https://api.github.com/repos/Taesun0727/wisevill/pulls/110","id":694104913,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0OTEz","html_url":"https://github.com/Taesun0727/wisevill/pull/110","diff_url":"https://github.com/Taesun0727/wisevill/pull/110.diff","patch_url":"https://github.com/Taesun0727/wisevill/pull/110.patch","issue_url":"https://api.github.com/repos/Taesun0727/wisevill/issues/110","number":110,"state":"open","locked":false,"title":"Ttt","user":{"login":"parkinhee","id":48777463,"node_id":"MDQ6VXNlcjQ4Nzc3NDYz","avatar_url":"https://avatars.githubusercontent.com/u/48777463?v=4","gravatar_id":"","url":"https://api.github.com/users/parkinhee","html_url":"https://github.com/parkinhee","followers_url":"https://api.github.com/users/parkinhee/followers","following_url":"https://api.github.com/users/parkinhee/following{/other_user}","gists_url":"https://api.github.com/users/parkinhee/gists{/gist_id}","starred_url":"https://api.github.com/users/parkinhee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/parkinhee/subscriptions","organizations_url":"https://api.github.com/users/parkinhee/orgs","repos_url":"https://api.github.com/users/parkinhee/repos","events_url":"https://api.github.com/users/parkinhee/events{/privacy}","received_events_url":"https://api.github.com/users/parkinhee/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Taesun0727/wisevill/pulls/110/commits","review_comments_url":"https://api.github.com/repos/Taesun0727/wisevill/pulls/110/comments","review_comment_url":"https://api.github.com/repos/Taesun0727/wisevill/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Taesun0727/wisevill/issues/110/comments","statuses_url":"https://api.github.com/repos/Taesun0727/wisevill/statuses/83bfc6b84dd76d18ebac07976b1dce008c20a067","head":{"label":"Taesun0727:ttt","ref":"ttt","sha":"83bfc6b84dd76d18ebac07976b1dce008c20a067","user":{"login":"Taesun0727","id":77261999,"node_id":"MDQ6VXNlcjc3MjYxOTk5","avatar_url":"https://avatars.githubusercontent.com/u/77261999?v=4","gravatar_id":"","url":"https://api.github.com/users/Taesun0727","html_url":"https://github.com/Taesun0727","followers_url":"https://api.github.com/users/Taesun0727/followers","following_url":"https://api.github.com/users/Taesun0727/following{/other_user}","gists_url":"https://api.github.com/users/Taesun0727/gists{/gist_id}","starred_url":"https://api.github.com/users/Taesun0727/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Taesun0727/subscriptions","organizations_url":"https://api.github.com/users/Taesun0727/orgs","repos_url":"https://api.github.com/users/Taesun0727/repos","events_url":"https://api.github.com/users/Taesun0727/events{/privacy}","received_events_url":"https://api.github.com/users/Taesun0727/received_events","type":"User","site_admin":false},"repo":{"id":379487763,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk0ODc3NjM=","name":"wisevill","full_name":"Taesun0727/wisevill","private":false,"owner":{"login":"Taesun0727","id":77261999,"node_id":"MDQ6VXNlcjc3MjYxOTk5","avatar_url":"https://avatars.githubusercontent.com/u/77261999?v=4","gravatar_id":"","url":"https://api.github.com/users/Taesun0727","html_url":"https://github.com/Taesun0727","followers_url":"https://api.github.com/users/Taesun0727/followers","following_url":"https://api.github.com/users/Taesun0727/following{/other_user}","gists_url":"https://api.github.com/users/Taesun0727/gists{/gist_id}","starred_url":"https://api.github.com/users/Taesun0727/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Taesun0727/subscriptions","organizations_url":"https://api.github.com/users/Taesun0727/orgs","repos_url":"https://api.github.com/users/Taesun0727/repos","events_url":"https://api.github.com/users/Taesun0727/events{/privacy}","received_events_url":"https://api.github.com/users/Taesun0727/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Taesun0727/wisevill","description":null,"fork":false,"url":"https://api.github.com/repos/Taesun0727/wisevill","forks_url":"https://api.github.com/repos/Taesun0727/wisevill/forks","keys_url":"https://api.github.com/repos/Taesun0727/wisevill/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Taesun0727/wisevill/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Taesun0727/wisevill/teams","hooks_url":"https://api.github.com/repos/Taesun0727/wisevill/hooks","issue_events_url":"https://api.github.com/repos/Taesun0727/wisevill/issues/events{/number}","events_url":"https://api.github.com/repos/Taesun0727/wisevill/events","assignees_url":"https://api.github.com/repos/Taesun0727/wisevill/assignees{/user}","branches_url":"https://api.github.com/repos/Taesun0727/wisevill/branches{/branch}","tags_url":"https://api.github.com/repos/Taesun0727/wisevill/tags","blobs_url":"https://api.github.com/repos/Taesun0727/wisevill/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Taesun0727/wisevill/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Taesun0727/wisevill/git/refs{/sha}","trees_url":"https://api.github.com/repos/Taesun0727/wisevill/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Taesun0727/wisevill/statuses/{sha}","languages_url":"https://api.github.com/repos/Taesun0727/wisevill/languages","stargazers_url":"https://api.github.com/repos/Taesun0727/wisevill/stargazers","contributors_url":"https://api.github.com/repos/Taesun0727/wisevill/contributors","subscribers_url":"https://api.github.com/repos/Taesun0727/wisevill/subscribers","subscription_url":"https://api.github.com/repos/Taesun0727/wisevill/subscription","commits_url":"https://api.github.com/repos/Taesun0727/wisevill/commits{/sha}","git_commits_url":"https://api.github.com/repos/Taesun0727/wisevill/git/commits{/sha}","comments_url":"https://api.github.com/repos/Taesun0727/wisevill/comments{/number}","issue_comment_url":"https://api.github.com/repos/Taesun0727/wisevill/issues/comments{/number}","contents_url":"https://api.github.com/repos/Taesun0727/wisevill/contents/{+path}","compare_url":"https://api.github.com/repos/Taesun0727/wisevill/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Taesun0727/wisevill/merges","archive_url":"https://api.github.com/repos/Taesun0727/wisevill/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Taesun0727/wisevill/downloads","issues_url":"https://api.github.com/repos/Taesun0727/wisevill/issues{/number}","pulls_url":"https://api.github.com/repos/Taesun0727/wisevill/pulls{/number}","milestones_url":"https://api.github.com/repos/Taesun0727/wisevill/milestones{/number}","notifications_url":"https://api.github.com/repos/Taesun0727/wisevill/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Taesun0727/wisevill/labels{/name}","releases_url":"https://api.github.com/repos/Taesun0727/wisevill/releases{/id}","deployments_url":"https://api.github.com/repos/Taesun0727/wisevill/deployments","created_at":"2021-06-23T05:19:22Z","updated_at":"2021-07-21T04:52:00Z","pushed_at":"2021-07-21T06:59:56Z","git_url":"git://github.com/Taesun0727/wisevill.git","ssh_url":"git@github.com:Taesun0727/wisevill.git","clone_url":"https://github.com/Taesun0727/wisevill.git","svn_url":"https://github.com/Taesun0727/wisevill","homepage":null,"size":1329,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"base":{"label":"Taesun0727:master","ref":"master","sha":"3602731368c0b1ceb9287ece9b9341aeaf68ac20","user":{"login":"Taesun0727","id":77261999,"node_id":"MDQ6VXNlcjc3MjYxOTk5","avatar_url":"https://avatars.githubusercontent.com/u/77261999?v=4","gravatar_id":"","url":"https://api.github.com/users/Taesun0727","html_url":"https://github.com/Taesun0727","followers_url":"https://api.github.com/users/Taesun0727/followers","following_url":"https://api.github.com/users/Taesun0727/following{/other_user}","gists_url":"https://api.github.com/users/Taesun0727/gists{/gist_id}","starred_url":"https://api.github.com/users/Taesun0727/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Taesun0727/subscriptions","organizations_url":"https://api.github.com/users/Taesun0727/orgs","repos_url":"https://api.github.com/users/Taesun0727/repos","events_url":"https://api.github.com/users/Taesun0727/events{/privacy}","received_events_url":"https://api.github.com/users/Taesun0727/received_events","type":"User","site_admin":false},"repo":{"id":379487763,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk0ODc3NjM=","name":"wisevill","full_name":"Taesun0727/wisevill","private":false,"owner":{"login":"Taesun0727","id":77261999,"node_id":"MDQ6VXNlcjc3MjYxOTk5","avatar_url":"https://avatars.githubusercontent.com/u/77261999?v=4","gravatar_id":"","url":"https://api.github.com/users/Taesun0727","html_url":"https://github.com/Taesun0727","followers_url":"https://api.github.com/users/Taesun0727/followers","following_url":"https://api.github.com/users/Taesun0727/following{/other_user}","gists_url":"https://api.github.com/users/Taesun0727/gists{/gist_id}","starred_url":"https://api.github.com/users/Taesun0727/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Taesun0727/subscriptions","organizations_url":"https://api.github.com/users/Taesun0727/orgs","repos_url":"https://api.github.com/users/Taesun0727/repos","events_url":"https://api.github.com/users/Taesun0727/events{/privacy}","received_events_url":"https://api.github.com/users/Taesun0727/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Taesun0727/wisevill","description":null,"fork":false,"url":"https://api.github.com/repos/Taesun0727/wisevill","forks_url":"https://api.github.com/repos/Taesun0727/wisevill/forks","keys_url":"https://api.github.com/repos/Taesun0727/wisevill/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Taesun0727/wisevill/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Taesun0727/wisevill/teams","hooks_url":"https://api.github.com/repos/Taesun0727/wisevill/hooks","issue_events_url":"https://api.github.com/repos/Taesun0727/wisevill/issues/events{/number}","events_url":"https://api.github.com/repos/Taesun0727/wisevill/events","assignees_url":"https://api.github.com/repos/Taesun0727/wisevill/assignees{/user}","branches_url":"https://api.github.com/repos/Taesun0727/wisevill/branches{/branch}","tags_url":"https://api.github.com/repos/Taesun0727/wisevill/tags","blobs_url":"https://api.github.com/repos/Taesun0727/wisevill/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Taesun0727/wisevill/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Taesun0727/wisevill/git/refs{/sha}","trees_url":"https://api.github.com/repos/Taesun0727/wisevill/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Taesun0727/wisevill/statuses/{sha}","languages_url":"https://api.github.com/repos/Taesun0727/wisevill/languages","stargazers_url":"https://api.github.com/repos/Taesun0727/wisevill/stargazers","contributors_url":"https://api.github.com/repos/Taesun0727/wisevill/contributors","subscribers_url":"https://api.github.com/repos/Taesun0727/wisevill/subscribers","subscription_url":"https://api.github.com/repos/Taesun0727/wisevill/subscription","commits_url":"https://api.github.com/repos/Taesun0727/wisevill/commits{/sha}","git_commits_url":"https://api.github.com/repos/Taesun0727/wisevill/git/commits{/sha}","comments_url":"https://api.github.com/repos/Taesun0727/wisevill/comments{/number}","issue_comment_url":"https://api.github.com/repos/Taesun0727/wisevill/issues/comments{/number}","contents_url":"https://api.github.com/repos/Taesun0727/wisevill/contents/{+path}","compare_url":"https://api.github.com/repos/Taesun0727/wisevill/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Taesun0727/wisevill/merges","archive_url":"https://api.github.com/repos/Taesun0727/wisevill/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Taesun0727/wisevill/downloads","issues_url":"https://api.github.com/repos/Taesun0727/wisevill/issues{/number}","pulls_url":"https://api.github.com/repos/Taesun0727/wisevill/pulls{/number}","milestones_url":"https://api.github.com/repos/Taesun0727/wisevill/milestones{/number}","notifications_url":"https://api.github.com/repos/Taesun0727/wisevill/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Taesun0727/wisevill/labels{/name}","releases_url":"https://api.github.com/repos/Taesun0727/wisevill/releases{/id}","deployments_url":"https://api.github.com/repos/Taesun0727/wisevill/deployments","created_at":"2021-06-23T05:19:22Z","updated_at":"2021-07-21T04:52:00Z","pushed_at":"2021-07-21T06:59:56Z","git_url":"git://github.com/Taesun0727/wisevill.git","ssh_url":"git@github.com:Taesun0727/wisevill.git","clone_url":"https://github.com/Taesun0727/wisevill.git","svn_url":"https://github.com/Taesun0727/wisevill","homepage":null,"size":1329,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Taesun0727/wisevill/pulls/110"},"html":{"href":"https://github.com/Taesun0727/wisevill/pull/110"},"issue":{"href":"https://api.github.com/repos/Taesun0727/wisevill/issues/110"},"comments":{"href":"https://api.github.com/repos/Taesun0727/wisevill/issues/110/comments"},"review_comments":{"href":"https://api.github.com/repos/Taesun0727/wisevill/pulls/110/comments"},"review_comment":{"href":"https://api.github.com/repos/Taesun0727/wisevill/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Taesun0727/wisevill/pulls/110/commits"},"statuses":{"href":"https://api.github.com/repos/Taesun0727/wisevill/statuses/83bfc6b84dd76d18ebac07976b1dce008c20a067"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":9,"deletions":6,"changed_files":3}},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17244792702","type":"PullRequestEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"action":"opened","number":4614,"pull_request":{"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4614","id":694104914,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTA0OTE0","html_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4614","diff_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4614.diff","patch_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4614.patch","issue_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4614","number":4614,"state":"open","locked":false,"title":"Add file 4636.txt","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"body":null,"created_at":"2021-07-21T07:00:05Z","updated_at":"2021-07-21T07:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4614/commits","review_comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4614/comments","review_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4614/comments","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/cc419e1088340655ea9a7154225749984d74cee6","head":{"label":"gabrieldonadel:4636","ref":"4636","sha":"cc419e1088340655ea9a7154225749984d74cee6","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":968,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4612,"license":null,"forks":0,"open_issues":4612,"watchers":1,"default_branch":"master"}},"base":{"label":"gabrieldonadel:master","ref":"master","sha":"d82cf4fd9e97a60cfebab6b8f7f85f9f8380b29b","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T07:00:04Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":968,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4612,"license":null,"forks":0,"open_issues":4612,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4614"},"html":{"href":"https://github.com/gabrieldonadel/pull-requests-limits/pull/4614"},"issue":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4614"},"comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/4614/comments"},"review_comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4614/comments"},"review_comment":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/4614/commits"},"statuses":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/cc419e1088340655ea9a7154225749984d74cee6"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T07:00:06Z"}
+{"id":"17245514528","type":"PushEvent","actor":{"id":17990689,"login":"Hoversquid","display_login":"Hoversquid","gravatar_id":"","url":"https://api.github.com/users/Hoversquid","avatar_url":"https://avatars.githubusercontent.com/u/17990689?"},"repo":{"id":383327745,"name":"Hoversquid/VQGAN_CLIP_Z_Quantize","url":"https://api.github.com/repos/Hoversquid/VQGAN_CLIP_Z_Quantize"},"payload":{"push_id":7562054919,"size":1,"distinct_size":1,"ref":"refs/heads/video","head":"4242bc901557708da873694bb4eff3111a41b0e7","before":"fb8af0f86fcbd34c76d43c0cdc061dcb96e09c4d","commits":[{"sha":"4242bc901557708da873694bb4eff3111a41b0e7","author":{"name":"Hoversquid","email":"a37c47d728a80ccc7021f90a819de63984067c66@gmail.com"},"message":"fix combined path","distinct":true,"url":"https://api.github.com/repos/Hoversquid/VQGAN_CLIP_Z_Quantize/commits/4242bc901557708da873694bb4eff3111a41b0e7"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514533","type":"WatchEvent","actor":{"id":76926509,"login":"ArchivvonJang","display_login":"ArchivvonJang","gravatar_id":"","url":"https://api.github.com/users/ArchivvonJang","avatar_url":"https://avatars.githubusercontent.com/u/76926509?"},"repo":{"id":93291681,"name":"JaeYeopHan/Interview_Question_for_Beginner","url":"https://api.github.com/repos/JaeYeopHan/Interview_Question_for_Beginner"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514542","type":"PushEvent","actor":{"id":1093032,"login":"zwacky","display_login":"zwacky","gravatar_id":"","url":"https://api.github.com/users/zwacky","avatar_url":"https://avatars.githubusercontent.com/u/1093032?"},"repo":{"id":289489895,"name":"zwacky/wicki-io","url":"https://api.github.com/repos/zwacky/wicki-io"},"payload":{"push_id":7562054916,"size":1,"distinct_size":1,"ref":"refs/heads/gh-pages","head":"37b70cd5428b8dcc6a5e0f632890fc27dc847c5d","before":"a8827932073c9b086b2f0cf82e93d701f2a628d9","commits":[{"sha":"37b70cd5428b8dcc6a5e0f632890fc27dc847c5d","author":{"name":"Simon Wicki","email":"196e9f704a07d1e86724ae31cdc6341465df66a5@justwatch.com"},"message":"🚀 publish to gh-pages","distinct":true,"url":"https://api.github.com/repos/zwacky/wicki-io/commits/37b70cd5428b8dcc6a5e0f632890fc27dc847c5d"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514568","type":"PullRequestEvent","actor":{"id":80700348,"login":"githubvaladm","display_login":"githubvaladm","gravatar_id":"","url":"https://api.github.com/users/githubvaladm","avatar_url":"https://avatars.githubusercontent.com/u/80700348?"},"repo":{"id":388040199,"name":"philips-validation-beta/github-validation","url":"https://api.github.com/repos/philips-validation-beta/github-validation"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/1","id":694141259,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxMjU5","html_url":"https://github.com/philips-validation-beta/github-validation/pull/1","diff_url":"https://github.com/philips-validation-beta/github-validation/pull/1.diff","patch_url":"https://github.com/philips-validation-beta/github-validation/pull/1.patch","issue_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/1","number":1,"state":"closed","locked":false,"title":"TC13:changed readme file","user":{"login":"githubvaladm","id":80700348,"node_id":"MDQ6VXNlcjgwNzAwMzQ4","avatar_url":"https://avatars.githubusercontent.com/u/80700348?v=4","gravatar_id":"","url":"https://api.github.com/users/githubvaladm","html_url":"https://github.com/githubvaladm","followers_url":"https://api.github.com/users/githubvaladm/followers","following_url":"https://api.github.com/users/githubvaladm/following{/other_user}","gists_url":"https://api.github.com/users/githubvaladm/gists{/gist_id}","starred_url":"https://api.github.com/users/githubvaladm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubvaladm/subscriptions","organizations_url":"https://api.github.com/users/githubvaladm/orgs","repos_url":"https://api.github.com/users/githubvaladm/repos","events_url":"https://api.github.com/users/githubvaladm/events{/privacy}","received_events_url":"https://api.github.com/users/githubvaladm/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:59:23Z","updated_at":"2021-07-21T07:59:59Z","closed_at":"2021-07-21T07:59:59Z","merged_at":"2021-07-21T07:59:59Z","merge_commit_sha":"e6297b8fdce76a6675db6bdb5137c0c1efc3b534","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/1/commits","review_comments_url":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/1/comments","review_comment_url":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/comments{/number}","comments_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/1/comments","statuses_url":"https://api.github.com/repos/philips-validation-beta/github-validation/statuses/21a284abaec737d7d654e3f767ea007cc492c240","head":{"label":"philips-validation-beta:branch1","ref":"branch1","sha":"21a284abaec737d7d654e3f767ea007cc492c240","user":{"login":"philips-validation-beta","id":83454667,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0NjY3","avatar_url":"https://avatars.githubusercontent.com/u/83454667?v=4","gravatar_id":"","url":"https://api.github.com/users/philips-validation-beta","html_url":"https://github.com/philips-validation-beta","followers_url":"https://api.github.com/users/philips-validation-beta/followers","following_url":"https://api.github.com/users/philips-validation-beta/following{/other_user}","gists_url":"https://api.github.com/users/philips-validation-beta/gists{/gist_id}","starred_url":"https://api.github.com/users/philips-validation-beta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/philips-validation-beta/subscriptions","organizations_url":"https://api.github.com/users/philips-validation-beta/orgs","repos_url":"https://api.github.com/users/philips-validation-beta/repos","events_url":"https://api.github.com/users/philips-validation-beta/events{/privacy}","received_events_url":"https://api.github.com/users/philips-validation-beta/received_events","type":"Organization","site_admin":false},"repo":{"id":388040199,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDAxOTk=","name":"github-validation","full_name":"philips-validation-beta/github-validation","private":false,"owner":{"login":"philips-validation-beta","id":83454667,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0NjY3","avatar_url":"https://avatars.githubusercontent.com/u/83454667?v=4","gravatar_id":"","url":"https://api.github.com/users/philips-validation-beta","html_url":"https://github.com/philips-validation-beta","followers_url":"https://api.github.com/users/philips-validation-beta/followers","following_url":"https://api.github.com/users/philips-validation-beta/following{/other_user}","gists_url":"https://api.github.com/users/philips-validation-beta/gists{/gist_id}","starred_url":"https://api.github.com/users/philips-validation-beta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/philips-validation-beta/subscriptions","organizations_url":"https://api.github.com/users/philips-validation-beta/orgs","repos_url":"https://api.github.com/users/philips-validation-beta/repos","events_url":"https://api.github.com/users/philips-validation-beta/events{/privacy}","received_events_url":"https://api.github.com/users/philips-validation-beta/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/philips-validation-beta/github-validation","description":null,"fork":false,"url":"https://api.github.com/repos/philips-validation-beta/github-validation","forks_url":"https://api.github.com/repos/philips-validation-beta/github-validation/forks","keys_url":"https://api.github.com/repos/philips-validation-beta/github-validation/keys{/key_id}","collaborators_url":"https://api.github.com/repos/philips-validation-beta/github-validation/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/philips-validation-beta/github-validation/teams","hooks_url":"https://api.github.com/repos/philips-validation-beta/github-validation/hooks","issue_events_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/events{/number}","events_url":"https://api.github.com/repos/philips-validation-beta/github-validation/events","assignees_url":"https://api.github.com/repos/philips-validation-beta/github-validation/assignees{/user}","branches_url":"https://api.github.com/repos/philips-validation-beta/github-validation/branches{/branch}","tags_url":"https://api.github.com/repos/philips-validation-beta/github-validation/tags","blobs_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/refs{/sha}","trees_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/trees{/sha}","statuses_url":"https://api.github.com/repos/philips-validation-beta/github-validation/statuses/{sha}","languages_url":"https://api.github.com/repos/philips-validation-beta/github-validation/languages","stargazers_url":"https://api.github.com/repos/philips-validation-beta/github-validation/stargazers","contributors_url":"https://api.github.com/repos/philips-validation-beta/github-validation/contributors","subscribers_url":"https://api.github.com/repos/philips-validation-beta/github-validation/subscribers","subscription_url":"https://api.github.com/repos/philips-validation-beta/github-validation/subscription","commits_url":"https://api.github.com/repos/philips-validation-beta/github-validation/commits{/sha}","git_commits_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/commits{/sha}","comments_url":"https://api.github.com/repos/philips-validation-beta/github-validation/comments{/number}","issue_comment_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/comments{/number}","contents_url":"https://api.github.com/repos/philips-validation-beta/github-validation/contents/{+path}","compare_url":"https://api.github.com/repos/philips-validation-beta/github-validation/compare/{base}...{head}","merges_url":"https://api.github.com/repos/philips-validation-beta/github-validation/merges","archive_url":"https://api.github.com/repos/philips-validation-beta/github-validation/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/philips-validation-beta/github-validation/downloads","issues_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues{/number}","pulls_url":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls{/number}","milestones_url":"https://api.github.com/repos/philips-validation-beta/github-validation/milestones{/number}","notifications_url":"https://api.github.com/repos/philips-validation-beta/github-validation/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/philips-validation-beta/github-validation/labels{/name}","releases_url":"https://api.github.com/repos/philips-validation-beta/github-validation/releases{/id}","deployments_url":"https://api.github.com/repos/philips-validation-beta/github-validation/deployments","created_at":"2021-07-21T07:58:36Z","updated_at":"2021-07-21T07:58:39Z","pushed_at":"2021-07-21T07:59:59Z","git_url":"git://github.com/philips-validation-beta/github-validation.git","ssh_url":"git@github.com:philips-validation-beta/github-validation.git","clone_url":"https://github.com/philips-validation-beta/github-validation.git","svn_url":"https://github.com/philips-validation-beta/github-validation","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"base":{"label":"philips-validation-beta:main","ref":"main","sha":"da451304a2b638c617548abca4ac5b0d61369e2d","user":{"login":"philips-validation-beta","id":83454667,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0NjY3","avatar_url":"https://avatars.githubusercontent.com/u/83454667?v=4","gravatar_id":"","url":"https://api.github.com/users/philips-validation-beta","html_url":"https://github.com/philips-validation-beta","followers_url":"https://api.github.com/users/philips-validation-beta/followers","following_url":"https://api.github.com/users/philips-validation-beta/following{/other_user}","gists_url":"https://api.github.com/users/philips-validation-beta/gists{/gist_id}","starred_url":"https://api.github.com/users/philips-validation-beta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/philips-validation-beta/subscriptions","organizations_url":"https://api.github.com/users/philips-validation-beta/orgs","repos_url":"https://api.github.com/users/philips-validation-beta/repos","events_url":"https://api.github.com/users/philips-validation-beta/events{/privacy}","received_events_url":"https://api.github.com/users/philips-validation-beta/received_events","type":"Organization","site_admin":false},"repo":{"id":388040199,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDAxOTk=","name":"github-validation","full_name":"philips-validation-beta/github-validation","private":false,"owner":{"login":"philips-validation-beta","id":83454667,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNDU0NjY3","avatar_url":"https://avatars.githubusercontent.com/u/83454667?v=4","gravatar_id":"","url":"https://api.github.com/users/philips-validation-beta","html_url":"https://github.com/philips-validation-beta","followers_url":"https://api.github.com/users/philips-validation-beta/followers","following_url":"https://api.github.com/users/philips-validation-beta/following{/other_user}","gists_url":"https://api.github.com/users/philips-validation-beta/gists{/gist_id}","starred_url":"https://api.github.com/users/philips-validation-beta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/philips-validation-beta/subscriptions","organizations_url":"https://api.github.com/users/philips-validation-beta/orgs","repos_url":"https://api.github.com/users/philips-validation-beta/repos","events_url":"https://api.github.com/users/philips-validation-beta/events{/privacy}","received_events_url":"https://api.github.com/users/philips-validation-beta/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/philips-validation-beta/github-validation","description":null,"fork":false,"url":"https://api.github.com/repos/philips-validation-beta/github-validation","forks_url":"https://api.github.com/repos/philips-validation-beta/github-validation/forks","keys_url":"https://api.github.com/repos/philips-validation-beta/github-validation/keys{/key_id}","collaborators_url":"https://api.github.com/repos/philips-validation-beta/github-validation/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/philips-validation-beta/github-validation/teams","hooks_url":"https://api.github.com/repos/philips-validation-beta/github-validation/hooks","issue_events_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/events{/number}","events_url":"https://api.github.com/repos/philips-validation-beta/github-validation/events","assignees_url":"https://api.github.com/repos/philips-validation-beta/github-validation/assignees{/user}","branches_url":"https://api.github.com/repos/philips-validation-beta/github-validation/branches{/branch}","tags_url":"https://api.github.com/repos/philips-validation-beta/github-validation/tags","blobs_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/refs{/sha}","trees_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/trees{/sha}","statuses_url":"https://api.github.com/repos/philips-validation-beta/github-validation/statuses/{sha}","languages_url":"https://api.github.com/repos/philips-validation-beta/github-validation/languages","stargazers_url":"https://api.github.com/repos/philips-validation-beta/github-validation/stargazers","contributors_url":"https://api.github.com/repos/philips-validation-beta/github-validation/contributors","subscribers_url":"https://api.github.com/repos/philips-validation-beta/github-validation/subscribers","subscription_url":"https://api.github.com/repos/philips-validation-beta/github-validation/subscription","commits_url":"https://api.github.com/repos/philips-validation-beta/github-validation/commits{/sha}","git_commits_url":"https://api.github.com/repos/philips-validation-beta/github-validation/git/commits{/sha}","comments_url":"https://api.github.com/repos/philips-validation-beta/github-validation/comments{/number}","issue_comment_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/comments{/number}","contents_url":"https://api.github.com/repos/philips-validation-beta/github-validation/contents/{+path}","compare_url":"https://api.github.com/repos/philips-validation-beta/github-validation/compare/{base}...{head}","merges_url":"https://api.github.com/repos/philips-validation-beta/github-validation/merges","archive_url":"https://api.github.com/repos/philips-validation-beta/github-validation/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/philips-validation-beta/github-validation/downloads","issues_url":"https://api.github.com/repos/philips-validation-beta/github-validation/issues{/number}","pulls_url":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls{/number}","milestones_url":"https://api.github.com/repos/philips-validation-beta/github-validation/milestones{/number}","notifications_url":"https://api.github.com/repos/philips-validation-beta/github-validation/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/philips-validation-beta/github-validation/labels{/name}","releases_url":"https://api.github.com/repos/philips-validation-beta/github-validation/releases{/id}","deployments_url":"https://api.github.com/repos/philips-validation-beta/github-validation/deployments","created_at":"2021-07-21T07:58:36Z","updated_at":"2021-07-21T07:58:39Z","pushed_at":"2021-07-21T07:59:59Z","git_url":"git://github.com/philips-validation-beta/github-validation.git","ssh_url":"git@github.com:philips-validation-beta/github-validation.git","clone_url":"https://github.com/philips-validation-beta/github-validation.git","svn_url":"https://github.com/philips-validation-beta/github-validation","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/1"},"html":{"href":"https://github.com/philips-validation-beta/github-validation/pull/1"},"issue":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/1"},"comments":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/philips-validation-beta/github-validation/statuses/21a284abaec737d7d654e3f767ea007cc492c240"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"githubvaladm","id":80700348,"node_id":"MDQ6VXNlcjgwNzAwMzQ4","avatar_url":"https://avatars.githubusercontent.com/u/80700348?v=4","gravatar_id":"","url":"https://api.github.com/users/githubvaladm","html_url":"https://github.com/githubvaladm","followers_url":"https://api.github.com/users/githubvaladm/followers","following_url":"https://api.github.com/users/githubvaladm/following{/other_user}","gists_url":"https://api.github.com/users/githubvaladm/gists{/gist_id}","starred_url":"https://api.github.com/users/githubvaladm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubvaladm/subscriptions","organizations_url":"https://api.github.com/users/githubvaladm/orgs","repos_url":"https://api.github.com/users/githubvaladm/repos","events_url":"https://api.github.com/users/githubvaladm/events{/privacy}","received_events_url":"https://api.github.com/users/githubvaladm/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:00Z","org":{"id":83454667,"login":"philips-validation-beta","gravatar_id":"","url":"https://api.github.com/orgs/philips-validation-beta","avatar_url":"https://avatars.githubusercontent.com/u/83454667?"}}
+{"id":"17245514573","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":324273526,"name":"JiuRiend/auto-green","url":"https://api.github.com/repos/JiuRiend/auto-green"},"payload":{"push_id":7562054918,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"d584a4cd6ac5f536c6c49bda6296bb0fa1219dec","before":"e8f1828394136b097cba29fa1b10b945dbb40ca8","commits":[{"sha":"d584a4cd6ac5f536c6c49bda6296bb0fa1219dec","author":{"name":"xuliu","email":"d95d1f41266d37246ffc8610986934a6123a88f8@163.com"},"message":"a commit a day keeps your girlfriend away","distinct":true,"url":"https://api.github.com/repos/JiuRiend/auto-green/commits/d584a4cd6ac5f536c6c49bda6296bb0fa1219dec"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514574","type":"PushEvent","actor":{"id":35951221,"login":"RomanChasovitin","display_login":"RomanChasovitin","gravatar_id":"","url":"https://api.github.com/users/RomanChasovitin","avatar_url":"https://avatars.githubusercontent.com/u/35951221?"},"repo":{"id":65986375,"name":"maddevsio/maddevs","url":"https://api.github.com/repos/maddevsio/maddevs"},"payload":{"push_id":7562054950,"size":1,"distinct_size":1,"ref":"refs/heads/MAR-1462","head":"71ca8400b833cb332b5614a26c88cce89b239e51","before":"d9366b87c2a2af2af994c507800bba85616646e8","commits":[{"sha":"71ca8400b833cb332b5614a26c88cce89b239e51","author":{"name":"Roman Chasovitin","email":"87217576d07d099e2cf5fbb79b249300dd46c8f7@gmail.com"},"message":"MAR-1462. Updated radiator version.","distinct":true,"url":"https://api.github.com/repos/maddevsio/maddevs/commits/71ca8400b833cb332b5614a26c88cce89b239e51"}]},"public":true,"created_at":"2021-07-21T08:00:00Z","org":{"id":21100936,"login":"maddevsio","gravatar_id":"","url":"https://api.github.com/orgs/maddevsio","avatar_url":"https://avatars.githubusercontent.com/u/21100936?"}}
+{"id":"17245514585","type":"PushEvent","actor":{"id":71610591,"login":"VoidMasterX","display_login":"VoidMasterX","gravatar_id":"","url":"https://api.github.com/users/VoidMasterX","avatar_url":"https://avatars.githubusercontent.com/u/71610591?"},"repo":{"id":303836618,"name":"VoidMasterX/ui","url":"https://api.github.com/repos/VoidMasterX/ui"},"payload":{"push_id":7562054937,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"d473510859fe92130136c8250fa136fa0a0da1ad","before":"8eea84a1cdbb5645868d50174d950764d821d8c1","commits":[{"sha":"d473510859fe92130136c8250fa136fa0a0da1ad","author":{"name":"Siper","email":"b0913ff6d65907387cb2b5538879a0896f351e4e@users.noreply.github.com"},"message":"Update pw.lua","distinct":true,"url":"https://api.github.com/repos/VoidMasterX/ui/commits/d473510859fe92130136c8250fa136fa0a0da1ad"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514593","type":"PushEvent","actor":{"id":28486212,"login":"sierpien88","display_login":"sierpien88","gravatar_id":"","url":"https://api.github.com/users/sierpien88","avatar_url":"https://avatars.githubusercontent.com/u/28486212?"},"repo":{"id":379342839,"name":"GerardSzymanski94/awsa","url":"https://api.github.com/repos/GerardSzymanski94/awsa"},"payload":{"push_id":7562054954,"size":1,"distinct_size":1,"ref":"refs/heads/agata","head":"5e68ff55e89898e30d7d61cc0781b6cc09e24048","before":"ec7eaad1d3a05e16b66d51d1f1225795f9c36f7a","commits":[{"sha":"5e68ff55e89898e30d7d61cc0781b6cc09e24048","author":{"name":"sierpien","email":"64ddb662a6fe8c3067bb103e18022212faaf5220@gmail.com"},"message":"faq style","distinct":true,"url":"https://api.github.com/repos/GerardSzymanski94/awsa/commits/5e68ff55e89898e30d7d61cc0781b6cc09e24048"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514605","type":"PushEvent","actor":{"id":55564581,"login":"Cammin","display_login":"Cammin","gravatar_id":"","url":"https://api.github.com/users/Cammin","avatar_url":"https://avatars.githubusercontent.com/u/55564581?"},"repo":{"id":311052664,"name":"Cammin/LDtkToUnity","url":"https://api.github.com/repos/Cammin/LDtkToUnity"},"payload":{"push_id":7562054944,"size":1,"distinct_size":1,"ref":"refs/heads/develop","head":"a4e7c986c94e0d453554967c73d119941e659c90","before":"7f07a05aa88cefd6915c65bc75a422587b48ac1b","commits":[{"sha":"a4e7c986c94e0d453554967c73d119941e659c90","author":{"name":"Cammin","email":"7a30686c25637e367d36cdc41e2c059eda4340d0@gmail.com"},"message":"package update 2.1.5","distinct":true,"url":"https://api.github.com/repos/Cammin/LDtkToUnity/commits/a4e7c986c94e0d453554967c73d119941e659c90"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514645","type":"PushEvent","actor":{"id":67499961,"login":"Junbro0708","display_login":"Junbro0708","gravatar_id":"","url":"https://api.github.com/users/Junbro0708","avatar_url":"https://avatars.githubusercontent.com/u/67499961?"},"repo":{"id":363324027,"name":"Junbro0708/Algorithm_CPP","url":"https://api.github.com/repos/Junbro0708/Algorithm_CPP"},"payload":{"push_id":7562054956,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"e0b5230712e132b22f2e3d23fb7e5b1a8cd6cfe5","before":"ebd7953b94c732ba9183d3796da506915a91a1ec","commits":[{"sha":"e0b5230712e132b22f2e3d23fb7e5b1a8cd6cfe5","author":{"name":"Junbro0708","email":"53b767db09f342012768d85181756f63f7cbb737@soongsil.ac.kr"},"message":"[80] 백준 1929번 소수 구하기","distinct":true,"url":"https://api.github.com/repos/Junbro0708/Algorithm_CPP/commits/e0b5230712e132b22f2e3d23fb7e5b1a8cd6cfe5"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514653","type":"WatchEvent","actor":{"id":83502671,"login":"tulj","display_login":"tulj","gravatar_id":"","url":"https://api.github.com/users/tulj","avatar_url":"https://avatars.githubusercontent.com/u/83502671?"},"repo":{"id":150301917,"name":"gouravthakur39/beginners-C-program-examples","url":"https://api.github.com/repos/gouravthakur39/beginners-C-program-examples"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514669","type":"PushEvent","actor":{"id":80700348,"login":"githubvaladm","display_login":"githubvaladm","gravatar_id":"","url":"https://api.github.com/users/githubvaladm","avatar_url":"https://avatars.githubusercontent.com/u/80700348?"},"repo":{"id":388040199,"name":"philips-validation-beta/github-validation","url":"https://api.github.com/repos/philips-validation-beta/github-validation"},"payload":{"push_id":7562054993,"size":2,"distinct_size":1,"ref":"refs/heads/main","head":"e6297b8fdce76a6675db6bdb5137c0c1efc3b534","before":"da451304a2b638c617548abca4ac5b0d61369e2d","commits":[{"sha":"21a284abaec737d7d654e3f767ea007cc492c240","author":{"name":"githubvaladm","email":"be1c2e149223967c6160e455c5f97f6a07eae059@users.noreply.github.com"},"message":"Update README.md","distinct":false,"url":"https://api.github.com/repos/philips-validation-beta/github-validation/commits/21a284abaec737d7d654e3f767ea007cc492c240"},{"sha":"e6297b8fdce76a6675db6bdb5137c0c1efc3b534","author":{"name":"githubvaladm","email":"be1c2e149223967c6160e455c5f97f6a07eae059@users.noreply.github.com"},"message":"Merge pull request #1 from philips-validation-beta/branch1\n\nTC13:changed readme file","distinct":true,"url":"https://api.github.com/repos/philips-validation-beta/github-validation/commits/e6297b8fdce76a6675db6bdb5137c0c1efc3b534"}]},"public":true,"created_at":"2021-07-21T08:00:00Z","org":{"id":83454667,"login":"philips-validation-beta","gravatar_id":"","url":"https://api.github.com/orgs/philips-validation-beta","avatar_url":"https://avatars.githubusercontent.com/u/83454667?"}}
+{"id":"17245514686","type":"IssueCommentEvent","actor":{"id":57408660,"login":"bkocev","display_login":"bkocev","gravatar_id":"","url":"https://api.github.com/users/bkocev","avatar_url":"https://avatars.githubusercontent.com/u/57408660?"},"repo":{"id":25217345,"name":"rock-control/control-orogen-auv_control","url":"https://api.github.com/repos/rock-control/control-orogen-auv_control"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/rock-control/control-orogen-auv_control/issues/37","repository_url":"https://api.github.com/repos/rock-control/control-orogen-auv_control","labels_url":"https://api.github.com/repos/rock-control/control-orogen-auv_control/issues/37/labels{/name}","comments_url":"https://api.github.com/repos/rock-control/control-orogen-auv_control/issues/37/comments","events_url":"https://api.github.com/repos/rock-control/control-orogen-auv_control/issues/37/events","html_url":"https://github.com/rock-control/control-orogen-auv_control/issues/37","id":946365491,"node_id":"MDU6SXNzdWU5NDYzNjU0OTE=","number":37,"title":"Integration into Rock-ROS bridge release docker container","user":{"login":"bkocev","id":57408660,"node_id":"MDQ6VXNlcjU3NDA4NjYw","avatar_url":"https://avatars.githubusercontent.com/u/57408660?v=4","gravatar_id":"","url":"https://api.github.com/users/bkocev","html_url":"https://github.com/bkocev","followers_url":"https://api.github.com/users/bkocev/followers","following_url":"https://api.github.com/users/bkocev/following{/other_user}","gists_url":"https://api.github.com/users/bkocev/gists{/gist_id}","starred_url":"https://api.github.com/users/bkocev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bkocev/subscriptions","organizations_url":"https://api.github.com/users/bkocev/orgs","repos_url":"https://api.github.com/users/bkocev/repos","events_url":"https://api.github.com/users/bkocev/events{/privacy}","received_events_url":"https://api.github.com/users/bkocev/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":4,"created_at":"2021-07-16T14:52:49Z","updated_at":"2021-07-21T08:00:00Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"Hi everyone,\r\n\r\nI am trying to integrate this orogen component in the Rock-ROS bridge.\r\nUnfortunately, I am getting a build error using amake. Belo w is the traceback.\r\n\r\nTraceback (most recent call last):\r\n      File \"/opt/ros/melodic/lib/python2.7/dist-packages/geneus/geneus_main.py\", line 137, in genmain\r\n        pkg_map = get_pkg_map()\r\n      File \"/opt/ros/melodic/lib/python2.7/dist-packages/geneus/geneus_main.py\", line 56, in get_pkg_map\r\n        pkgs = packages.find_packages(ws)\r\n      File \"/usr/lib/python2.7/dist-packages/catkin_pkg/packages.py\", line 89, in find_packages\r\n        packages = find_packages_allowing_duplicates(basepath, exclude_paths=exclude_paths, exclude_subspaces=exclude_subspaces, warnings=warnings)\r\n      File \"/usr/lib/python2.7/dist-packages/catkin_pkg/packages.py\", line 150, in find_packages_allowing_duplicates\r\n        xml, filename=filename, warnings=warnings)\r\n      File \"/usr/lib/python2.7/dist-packages/catkin_pkg/package.py\", line 542, in parse_package_string\r\n        raise InvalidPackage('The manifest contains invalid XML:\\n%s' % ex, filename)\r\n    InvalidPackage: Error(s) in package '/opt/rock_workspace/install/lib/x86_64-linux-gnu/ruby/2.5.0/orogen/templates/typekit/package.xml':\r\n    The manifest contains invalid XML:\r\n    not well-formed (invalid token): line 2, column 9\r\n    ERROR:  Error(s) in package '/opt/rock_workspace/install/lib/x86_64-linux-gnu/ruby/2.5.0/orogen/templates/typekit/package.xml':\r\n    The manifest contains invalid XML:\r\n    not well-formed (invalid token): line 2, column 9\r\n    .orogen/typekit/transports/ros/CMakeFiles/orogen_auv_control_msgs_generate_messages_eus.dir/build.make:134: recipe for target 'devel/share/roseus/ros/orogen_auv_control_msgs/manifest.l' failed\r\n    make[2]: *** [devel/share/roseus/ros/orogen_auv_control_msgs/manifest.l] Error 3\r\n    CMakeFiles/Makefile2:1133: recipe for target '.orogen/typekit/transports/ros/CMakeFiles/orogen_auv_control_msgs_generate_messages_eus.dir/all' failed\r\n    make[1]: *** [.orogen/typekit/transports/ros/CMakeFiles/orogen_auv_control_msgs_generate_messages_eus.dir/all] Error 2\r\n\r\nI am guessing there might be an issue with the python version in the rock-ros bridge docker container out of which I got a release version. Nevertheless, I tried to update/upgrade as much as possible. Currently, I set python using autoproj reconfigure to /usr/bin/python2.7 but still it does not work.\r\n\r\nAny remarks/suggestions would be very welcome.\r\n\r\nThanks,\r\nBojan Kocev.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/rock-control/control-orogen-auv_control/issues/comments/883977107","html_url":"https://github.com/rock-control/control-orogen-auv_control/issues/37#issuecomment-883977107","issue_url":"https://api.github.com/repos/rock-control/control-orogen-auv_control/issues/37","id":883977107,"node_id":"IC_kwDOAYDJQc40sGuT","user":{"login":"bkocev","id":57408660,"node_id":"MDQ6VXNlcjU3NDA4NjYw","avatar_url":"https://avatars.githubusercontent.com/u/57408660?v=4","gravatar_id":"","url":"https://api.github.com/users/bkocev","html_url":"https://github.com/bkocev","followers_url":"https://api.github.com/users/bkocev/followers","following_url":"https://api.github.com/users/bkocev/following{/other_user}","gists_url":"https://api.github.com/users/bkocev/gists{/gist_id}","starred_url":"https://api.github.com/users/bkocev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bkocev/subscriptions","organizations_url":"https://api.github.com/users/bkocev/orgs","repos_url":"https://api.github.com/users/bkocev/repos","events_url":"https://api.github.com/users/bkocev/events{/privacy}","received_events_url":"https://api.github.com/users/bkocev/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:00Z","updated_at":"2021-07-21T08:00:00Z","author_association":"NONE","body":"Maybe, because it is a Rock-ROS bridge? :)","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:00Z","org":{"id":7403553,"login":"rock-control","gravatar_id":"","url":"https://api.github.com/orgs/rock-control","avatar_url":"https://avatars.githubusercontent.com/u/7403553?"}}
+{"id":"17245514706","type":"CreateEvent","actor":{"id":32644413,"login":"DavidZagury","display_login":"DavidZagury","gravatar_id":"","url":"https://api.github.com/users/DavidZagury","avatar_url":"https://avatars.githubusercontent.com/u/32644413?"},"repo":{"id":324731374,"name":"DavidZagury/sonic-buildimage","url":"https://api.github.com/repos/DavidZagury/sonic-buildimage"},"payload":{"ref":"master_submodule-platform-common","ref_type":"branch","master_branch":"master","description":"Scripts which perform an installable binary image build for SONiC","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514710","type":"IssuesEvent","actor":{"id":895503,"login":"poolpOrg","display_login":"poolpOrg","gravatar_id":"","url":"https://api.github.com/users/poolpOrg","avatar_url":"https://avatars.githubusercontent.com/u/895503?"},"repo":{"id":126189620,"name":"poolpOrg/poolp.org","url":"https://api.github.com/repos/poolpOrg/poolp.org"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/poolpOrg/poolp.org/issues/53","repository_url":"https://api.github.com/repos/poolpOrg/poolp.org","labels_url":"https://api.github.com/repos/poolpOrg/poolp.org/issues/53/labels{/name}","comments_url":"https://api.github.com/repos/poolpOrg/poolp.org/issues/53/comments","events_url":"https://api.github.com/repos/poolpOrg/poolp.org/issues/53/events","html_url":"https://github.com/poolpOrg/poolp.org/issues/53","id":739639613,"node_id":"MDU6SXNzdWU3Mzk2Mzk2MTM=","number":53,"title":"OpenSMTPD proc filters & fc-rDNS","user":{"login":"poolpOrg","id":895503,"node_id":"MDQ6VXNlcjg5NTUwMw==","avatar_url":"https://avatars.githubusercontent.com/u/895503?v=4","gravatar_id":"","url":"https://api.github.com/users/poolpOrg","html_url":"https://github.com/poolpOrg","followers_url":"https://api.github.com/users/poolpOrg/followers","following_url":"https://api.github.com/users/poolpOrg/following{/other_user}","gists_url":"https://api.github.com/users/poolpOrg/gists{/gist_id}","starred_url":"https://api.github.com/users/poolpOrg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/poolpOrg/subscriptions","organizations_url":"https://api.github.com/users/poolpOrg/orgs","repos_url":"https://api.github.com/users/poolpOrg/repos","events_url":"https://api.github.com/users/poolpOrg/events{/privacy}","received_events_url":"https://api.github.com/users/poolpOrg/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":true,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2018-12-06T21:24:52Z","updated_at":"2021-07-21T08:00:00Z","closed_at":"2021-07-21T08:00:00Z","author_association":"OWNER","active_lock_reason":null,"body":"","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514711","type":"PushEvent","actor":{"id":20966023,"login":"frycast","display_login":"frycast","gravatar_id":"","url":"https://api.github.com/users/frycast","avatar_url":"https://avatars.githubusercontent.com/u/20966023?"},"repo":{"id":352879183,"name":"frycast/danielvfryer3","url":"https://api.github.com/repos/frycast/danielvfryer3"},"payload":{"push_id":7562055018,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"d3b08a302bfd733b7bf6e573d09411a2e718d526","before":"42ff84a97b7c7d6f13df1a50e880bd5044a3ad91","commits":[{"sha":"d3b08a302bfd733b7bf6e573d09411a2e718d526","author":{"name":"Daniel Vidali Fryer","email":"c732ec7f32d589327653cd53e5534a5cbbb8a63b@live.com.au"},"message":"Update _index.md","distinct":true,"url":"https://api.github.com/repos/frycast/danielvfryer3/commits/d3b08a302bfd733b7bf6e573d09411a2e718d526"}]},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514712","type":"IssuesEvent","actor":{"id":3043118,"login":"mshirdel","display_login":"mshirdel","gravatar_id":"","url":"https://api.github.com/users/mshirdel","avatar_url":"https://avatars.githubusercontent.com/u/3043118?"},"repo":{"id":347923838,"name":"mshirdel/gapbug","url":"https://api.github.com/repos/mshirdel/gapbug"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/mshirdel/gapbug/issues/12","repository_url":"https://api.github.com/repos/mshirdel/gapbug","labels_url":"https://api.github.com/repos/mshirdel/gapbug/issues/12/labels{/name}","comments_url":"https://api.github.com/repos/mshirdel/gapbug/issues/12/comments","events_url":"https://api.github.com/repos/mshirdel/gapbug/issues/12/events","html_url":"https://github.com/mshirdel/gapbug/issues/12","id":947517864,"node_id":"MDU6SXNzdWU5NDc1MTc4NjQ=","number":12,"title":"Test","user":{"login":"zkeshtkar","id":49828035,"node_id":"MDQ6VXNlcjQ5ODI4MDM1","avatar_url":"https://avatars.githubusercontent.com/u/49828035?v=4","gravatar_id":"","url":"https://api.github.com/users/zkeshtkar","html_url":"https://github.com/zkeshtkar","followers_url":"https://api.github.com/users/zkeshtkar/followers","following_url":"https://api.github.com/users/zkeshtkar/following{/other_user}","gists_url":"https://api.github.com/users/zkeshtkar/gists{/gist_id}","starred_url":"https://api.github.com/users/zkeshtkar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zkeshtkar/subscriptions","organizations_url":"https://api.github.com/users/zkeshtkar/orgs","repos_url":"https://api.github.com/users/zkeshtkar/repos","events_url":"https://api.github.com/users/zkeshtkar/events{/privacy}","received_events_url":"https://api.github.com/users/zkeshtkar/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-19T10:40:45Z","updated_at":"2021-07-21T08:00:00Z","closed_at":"2021-07-21T08:00:00Z","author_association":"NONE","active_lock_reason":null,"body":"hello friends\r\nhope you all ok\r\ni wrote some test (views_test and model_test and form_test ) for Account application\r\nif you think it is good time, i will send them to take a look at them","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:00Z"}
+{"id":"17245514739","type":"PushEvent","actor":{"id":8517910,"login":"LombiqBot","display_login":"LombiqBot","gravatar_id":"","url":"https://api.github.com/users/LombiqBot","avatar_url":"https://avatars.githubusercontent.com/u/8517910?"},"repo":{"id":49138417,"name":"Lombiq/Om.Orchard.SocialMetaTags","url":"https://api.github.com/repos/Lombiq/Om.Orchard.SocialMetaTags"},"payload":{"push_id":7562055021,"size":0,"distinct_size":0,"ref":"refs/heads/master","head":"50c1ed259cabe08846c40291f8980a22a5a68062","before":"50c1ed259cabe08846c40291f8980a22a5a68062","commits":[]},"public":true,"created_at":"2021-07-21T08:00:01Z","org":{"id":8158177,"login":"Lombiq","gravatar_id":"","url":"https://api.github.com/orgs/Lombiq","avatar_url":"https://avatars.githubusercontent.com/u/8158177?"}}
+{"id":"17245514750","type":"PushEvent","actor":{"id":37301733,"login":"Gabinou","display_login":"Gabinou","gravatar_id":"","url":"https://api.github.com/users/Gabinou","avatar_url":"https://avatars.githubusercontent.com/u/37301733?"},"repo":{"id":233493236,"name":"Gabinou/Codename_FireSaga","url":"https://api.github.com/repos/Gabinou/Codename_FireSaga"},"payload":{"push_id":7562055023,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"5a94fc6251472ff884061cff6cb158f021e586c8","before":"36d1167a709af612043fbfafbbd41a81a83aab24","commits":[{"sha":"7d2e56b533e398497769d5a1bb488fad5a47cdb3","author":{"name":"Gabriel Taillon","email":"0b395b9c3a2ec99c61180c083347731d9ca4f03d@gmail.com"},"message":"many more patterns of differing order. make more colorssss","distinct":true,"url":"https://api.github.com/repos/Gabinou/Codename_FireSaga/commits/7d2e56b533e398497769d5a1bb488fad5a47cdb3"},{"sha":"5a94fc6251472ff884061cff6cb158f021e586c8","author":{"name":"Gabriel Taillon","email":"0b395b9c3a2ec99c61180c083347731d9ca4f03d@gmail.com"},"message":"more tilesss","distinct":true,"url":"https://api.github.com/repos/Gabinou/Codename_FireSaga/commits/5a94fc6251472ff884061cff6cb158f021e586c8"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514756","type":"IssuesEvent","actor":{"id":5029476,"login":"cis1124","display_login":"cis1124","gravatar_id":"","url":"https://api.github.com/users/cis1124","avatar_url":"https://avatars.githubusercontent.com/u/5029476?"},"repo":{"id":16662094,"name":"miguelgrinberg/Flask-SocketIO","url":"https://api.github.com/repos/miguelgrinberg/Flask-SocketIO"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/miguelgrinberg/Flask-SocketIO/issues/1641","repository_url":"https://api.github.com/repos/miguelgrinberg/Flask-SocketIO","labels_url":"https://api.github.com/repos/miguelgrinberg/Flask-SocketIO/issues/1641/labels{/name}","comments_url":"https://api.github.com/repos/miguelgrinberg/Flask-SocketIO/issues/1641/comments","events_url":"https://api.github.com/repos/miguelgrinberg/Flask-SocketIO/issues/1641/events","html_url":"https://github.com/miguelgrinberg/Flask-SocketIO/issues/1641","id":949435824,"node_id":"MDU6SXNzdWU5NDk0MzU4MjQ=","number":1641,"title":"Cannot get flask g in trigger_event.","user":{"login":"cis1124","id":5029476,"node_id":"MDQ6VXNlcjUwMjk0NzY=","avatar_url":"https://avatars.githubusercontent.com/u/5029476?v=4","gravatar_id":"","url":"https://api.github.com/users/cis1124","html_url":"https://github.com/cis1124","followers_url":"https://api.github.com/users/cis1124/followers","following_url":"https://api.github.com/users/cis1124/following{/other_user}","gists_url":"https://api.github.com/users/cis1124/gists{/gist_id}","starred_url":"https://api.github.com/users/cis1124/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cis1124/subscriptions","organizations_url":"https://api.github.com/users/cis1124/orgs","repos_url":"https://api.github.com/users/cis1124/repos","events_url":"https://api.github.com/users/cis1124/events{/privacy}","received_events_url":"https://api.github.com/users/cis1124/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T08:00:00Z","updated_at":"2021-07-21T08:00:00Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"I have a global custmom namespace for access control,\r\n\r\ncode:\r\n```\r\nclass SecurityNamespace(Namespace):\r\n\r\n    def trigger_event(self, event, *args):\r\n        if event == \"connect\":\r\n            print(\"custom namespace for access control\")\r\n            # get endpoint\r\n            user=g.user #get \"Working outside of application context\"\r\n            endpoint = self.namespace\r\n            if check_access(user, endpoint):\r\n                super().trigger_event(event, *args)\r\n            else:\r\n                return\r\n        else:\r\n            super().trigger_event(event, *args)\r\n```\r\n\r\n```\r\nclass WebAPI(SecurityNamespace):\r\n\r\n    def __init__(self, namespace):\r\n        super().__init__(namespace)\r\n\r\n  \r\n    def on_connect(self):\r\n     \r\n        print(g.user)# this will ok\r\n        self._do_something(request)\r\n        return True\r\n```\r\n\r\nCannot use g in trigger_event,any method to fix this?","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514772","type":"PushEvent","actor":{"id":32082243,"login":"wulivictor","display_login":"wulivictor","gravatar_id":"","url":"https://api.github.com/users/wulivictor","avatar_url":"https://avatars.githubusercontent.com/u/32082243?"},"repo":{"id":296179479,"name":"wulivictor/ExamOnline","url":"https://api.github.com/repos/wulivictor/ExamOnline"},"payload":{"push_id":7562055027,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"bee0329eb83a8c3a442807548fff7476e6370849","before":"1f9d677ca8688d7fd3e77fc919e916ee036ea02d","commits":[{"sha":"bee0329eb83a8c3a442807548fff7476e6370849","author":{"name":"wulivictor","email":"e86e5e643c2e7ae07b328af9adfbe878fe6abfb4@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/wulivictor/ExamOnline/commits/bee0329eb83a8c3a442807548fff7476e6370849"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514791","type":"WatchEvent","actor":{"id":34101367,"login":"HStarrr","display_login":"HStarrr","gravatar_id":"","url":"https://api.github.com/users/HStarrr","avatar_url":"https://avatars.githubusercontent.com/u/34101367?"},"repo":{"id":99946544,"name":"brianwarehime/inSp3ctor","url":"https://api.github.com/repos/brianwarehime/inSp3ctor"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514796","type":"DeleteEvent","actor":{"id":10810283,"login":"direwolf-github","display_login":"direwolf-github","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","avatar_url":"https://avatars.githubusercontent.com/u/10810283?"},"repo":{"id":388040450,"name":"direwolf-github/my-app-5f19618c","url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c"},"payload":{"ref":"branch-c9b911a8","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514805","type":"CreateEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"ref":"5101","ref_type":"branch","master_branch":"master","description":"Testing Github Pull requests limits","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514808","type":"PushEvent","actor":{"id":33158585,"login":"byteHulk","display_login":"byteHulk","gravatar_id":"","url":"https://api.github.com/users/byteHulk","avatar_url":"https://avatars.githubusercontent.com/u/33158585?"},"repo":{"id":358445863,"name":"byteHulk/internalSkill","url":"https://api.github.com/repos/byteHulk/internalSkill"},"payload":{"push_id":7562055054,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"c1ee665ae82597e04f593c0d78d6d4005a8a800d","before":"d17d119586e3bb2b07c7b9160a28bf77d535cfaf","commits":[{"sha":"c1ee665ae82597e04f593c0d78d6d4005a8a800d","author":{"name":"bowenhuang","email":"a48dbbbfd670a244a2e493e29f6500aed8927cf8@aminer.cn"},"message":"doc:complete leetcode 25","distinct":true,"url":"https://api.github.com/repos/byteHulk/internalSkill/commits/c1ee665ae82597e04f593c0d78d6d4005a8a800d"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514809","type":"ForkEvent","actor":{"id":20126113,"login":"ardiantutomo","display_login":"ardiantutomo","gravatar_id":"","url":"https://api.github.com/users/ardiantutomo","avatar_url":"https://avatars.githubusercontent.com/u/20126113?"},"repo":{"id":46707446,"name":"Adobe-Marketing-Cloud/aem-translation-framework-bootstrap-connector","url":"https://api.github.com/repos/Adobe-Marketing-Cloud/aem-translation-framework-bootstrap-connector"},"payload":{"forkee":{"id":388040562,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1NjI=","name":"aem-translation-framework-bootstrap-connector","full_name":"ardiantutomo/aem-translation-framework-bootstrap-connector","private":false,"owner":{"login":"ardiantutomo","id":20126113,"node_id":"MDQ6VXNlcjIwMTI2MTEz","avatar_url":"https://avatars.githubusercontent.com/u/20126113?v=4","gravatar_id":"","url":"https://api.github.com/users/ardiantutomo","html_url":"https://github.com/ardiantutomo","followers_url":"https://api.github.com/users/ardiantutomo/followers","following_url":"https://api.github.com/users/ardiantutomo/following{/other_user}","gists_url":"https://api.github.com/users/ardiantutomo/gists{/gist_id}","starred_url":"https://api.github.com/users/ardiantutomo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ardiantutomo/subscriptions","organizations_url":"https://api.github.com/users/ardiantutomo/orgs","repos_url":"https://api.github.com/users/ardiantutomo/repos","events_url":"https://api.github.com/users/ardiantutomo/events{/privacy}","received_events_url":"https://api.github.com/users/ardiantutomo/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ardiantutomo/aem-translation-framework-bootstrap-connector","description":"Bootstrap Translation connector using the Adobe Experience Manager (AEM) Translation Vendor API","fork":true,"url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector","forks_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/forks","keys_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/teams","hooks_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/hooks","issue_events_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/issues/events{/number}","events_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/events","assignees_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/assignees{/user}","branches_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/branches{/branch}","tags_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/tags","blobs_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/git/refs{/sha}","trees_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/statuses/{sha}","languages_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/languages","stargazers_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/stargazers","contributors_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/contributors","subscribers_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/subscribers","subscription_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/subscription","commits_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/commits{/sha}","git_commits_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/git/commits{/sha}","comments_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/comments{/number}","issue_comment_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/issues/comments{/number}","contents_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/contents/{+path}","compare_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/merges","archive_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/downloads","issues_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/issues{/number}","pulls_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/pulls{/number}","milestones_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/milestones{/number}","notifications_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/labels{/name}","releases_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/releases{/id}","deployments_url":"https://api.github.com/repos/ardiantutomo/aem-translation-framework-bootstrap-connector/deployments","created_at":"2021-07-21T08:00:00Z","updated_at":"2021-04-14T09:00:07Z","pushed_at":"2020-07-30T12:23:54Z","git_url":"git://github.com/ardiantutomo/aem-translation-framework-bootstrap-connector.git","ssh_url":"git@github.com:ardiantutomo/aem-translation-framework-bootstrap-connector.git","clone_url":"https://github.com/ardiantutomo/aem-translation-framework-bootstrap-connector.git","svn_url":"https://github.com/ardiantutomo/aem-translation-framework-bootstrap-connector","homepage":"https://helpx.adobe.com/experience-manager/using/bootstrap.html","size":2111,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:01Z","org":{"id":1440554,"login":"Adobe-Marketing-Cloud","gravatar_id":"","url":"https://api.github.com/orgs/Adobe-Marketing-Cloud","avatar_url":"https://avatars.githubusercontent.com/u/1440554?"}}
+{"id":"17245514813","type":"PushEvent","actor":{"id":34954731,"login":"jereldlimjy","display_login":"jereldlimjy","gravatar_id":"","url":"https://api.github.com/users/jereldlimjy","avatar_url":"https://avatars.githubusercontent.com/u/34954731?"},"repo":{"id":365973048,"name":"jereldlimjy/zilswap-webapp","url":"https://api.github.com/repos/jereldlimjy/zilswap-webapp"},"payload":{"push_id":7562055045,"size":2,"distinct_size":2,"ref":"refs/heads/bridge","head":"f1156f0de0fb43a3c55a547a7210ad073104729e","before":"dcdf061d55232da43b5f8eddfb9550bebf22d569","commits":[{"sha":"66898de2ad3a06cd3c562f1a3780a0cde1cb69c2","author":{"name":"Jereld Lim","email":"56b885a0714e6a7a484ba8cc02bc53bc315d5670@hotmail.com"},"message":"revert staging changes","distinct":true,"url":"https://api.github.com/repos/jereldlimjy/zilswap-webapp/commits/66898de2ad3a06cd3c562f1a3780a0cde1cb69c2"},{"sha":"f1156f0de0fb43a3c55a547a7210ad073104729e","author":{"name":"Jereld Lim","email":"56b885a0714e6a7a484ba8cc02bc53bc315d5670@hotmail.com"},"message":"updates","distinct":true,"url":"https://api.github.com/repos/jereldlimjy/zilswap-webapp/commits/f1156f0de0fb43a3c55a547a7210ad073104729e"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514815","type":"CreateEvent","actor":{"id":47575445,"login":"nikolvyskvarko","display_login":"nikolvyskvarko","gravatar_id":"","url":"https://api.github.com/users/nikolvyskvarko","avatar_url":"https://avatars.githubusercontent.com/u/47575445?"},"repo":{"id":388040561,"name":"nikolvyskvarko/StepTracker","url":"https://api.github.com/repos/nikolvyskvarko/StepTracker"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514820","type":"PushEvent","actor":{"id":82073759,"login":"oshima-yoppi","display_login":"oshima-yoppi","gravatar_id":"","url":"https://api.github.com/users/oshima-yoppi","avatar_url":"https://avatars.githubusercontent.com/u/82073759?"},"repo":{"id":367556643,"name":"Koji1116/Cansat2021ver","url":"https://api.github.com/repos/Koji1116/Cansat2021ver"},"payload":{"push_id":7562055056,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"2f5abe265b19914a6ecc1862f7ed5d7351a77f2f","before":"38115a8c230e2ade06419f1646fa7427f4f3c3d8","commits":[{"sha":"2f5abe265b19914a6ecc1862f7ed5d7351a77f2f","author":{"name":"gitub","email":"a1c235cfd221332c9f7fdcd9b8d925537c973383@users.noreply.github.com"},"message":"Update panoramashooting.py","distinct":true,"url":"https://api.github.com/repos/Koji1116/Cansat2021ver/commits/2f5abe265b19914a6ecc1862f7ed5d7351a77f2f"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514823","type":"PushEvent","actor":{"id":68417258,"login":"breakingheatmap","display_login":"breakingheatmap","gravatar_id":"","url":"https://api.github.com/users/breakingheatmap","avatar_url":"https://avatars.githubusercontent.com/u/68417258?"},"repo":{"id":280356388,"name":"breakingheatmap/breakingheatmap","url":"https://api.github.com/repos/breakingheatmap/breakingheatmap"},"payload":{"push_id":7562055062,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"150a35def34f0b26cea52a35cb49a24444a6c062","before":"4accee5358cac0b04702ebd3fc11938385222e35","commits":[{"sha":"150a35def34f0b26cea52a35cb49a24444a6c062","author":{"name":"sudomaze","email":"6fbf11c1befd5a6b40696150a1a62f21b2fc7860@gmail.com"},"message":"1626854397","distinct":true,"url":"https://api.github.com/repos/breakingheatmap/breakingheatmap/commits/150a35def34f0b26cea52a35cb49a24444a6c062"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514827","type":"PushEvent","actor":{"id":52290251,"login":"botcopado","display_login":"botcopado","gravatar_id":"","url":"https://api.github.com/users/botcopado","avatar_url":"https://avatars.githubusercontent.com/u/52290251?"},"repo":{"id":388040501,"name":"botcopado/moeldv_DSLQ77BE","url":"https://api.github.com/repos/botcopado/moeldv_DSLQ77BE"},"payload":{"push_id":7562055065,"size":1,"distinct_size":1,"ref":"refs/heads/feature/US-0062599","head":"2d0cfe019a81e1718bbee986b3b91111751b0756","before":"93d1fb4fb6e7902ae9084f0e4a4cdead533aeb7e","commits":[{"sha":"2d0cfe019a81e1718bbee986b3b91111751b0756","author":{"name":"Test QA User","email":"0aeb9bf205e33c465a83ad48c5898f09dd71cceb@copado.com"},"message":"Bot initialization","distinct":true,"url":"https://api.github.com/repos/botcopado/moeldv_DSLQ77BE/commits/2d0cfe019a81e1718bbee986b3b91111751b0756"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514840","type":"PushEvent","actor":{"id":85116961,"login":"tomdavie","display_login":"tomdavie","gravatar_id":"","url":"https://api.github.com/users/tomdavie","avatar_url":"https://avatars.githubusercontent.com/u/85116961?"},"repo":{"id":378964842,"name":"tomdavie/codeclan_homework_tomdavie","url":"https://api.github.com/repos/tomdavie/codeclan_homework_tomdavie"},"payload":{"push_id":7562055060,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1d03eb2da7af699859cf154a64a4010caaa9c74a","before":"725596fc5d1285a9d02b0fd092b722edd827e3d3","commits":[{"sha":"1d03eb2da7af699859cf154a64a4010caaa9c74a","author":{"name":"tomdavie","email":"e21b6ad2861613f260bb81a97977059c9aa94331@users.noreply.github.com"},"message":"Update","distinct":true,"url":"https://api.github.com/repos/tomdavie/codeclan_homework_tomdavie/commits/1d03eb2da7af699859cf154a64a4010caaa9c74a"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514852","type":"PullRequestEvent","actor":{"id":10810283,"login":"direwolf-github","display_login":"direwolf-github","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","avatar_url":"https://avatars.githubusercontent.com/u/10810283?"},"repo":{"id":388040450,"name":"direwolf-github/my-app-5f19618c","url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/1","id":694141419,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNDE5","html_url":"https://github.com/direwolf-github/my-app-5f19618c/pull/1","diff_url":"https://github.com/direwolf-github/my-app-5f19618c/pull/1.diff","patch_url":"https://github.com/direwolf-github/my-app-5f19618c/pull/1.patch","issue_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/1","number":1,"state":"closed","locked":false,"title":"Direwolf review apps test branch-c9b911a8","user":{"login":"direwolf-github","id":10810283,"node_id":"MDQ6VXNlcjEwODEwMjgz","avatar_url":"https://avatars.githubusercontent.com/u/10810283?v=4","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","html_url":"https://github.com/direwolf-github","followers_url":"https://api.github.com/users/direwolf-github/followers","following_url":"https://api.github.com/users/direwolf-github/following{/other_user}","gists_url":"https://api.github.com/users/direwolf-github/gists{/gist_id}","starred_url":"https://api.github.com/users/direwolf-github/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/direwolf-github/subscriptions","organizations_url":"https://api.github.com/users/direwolf-github/orgs","repos_url":"https://api.github.com/users/direwolf-github/repos","events_url":"https://api.github.com/users/direwolf-github/events{/privacy}","received_events_url":"https://api.github.com/users/direwolf-github/received_events","type":"User","site_admin":false},"body":"Direwolf review apps test branch-c9b911a8","created_at":"2021-07-21T07:59:39Z","updated_at":"2021-07-21T08:00:01Z","closed_at":"2021-07-21T08:00:01Z","merged_at":null,"merge_commit_sha":"f05eb5150c66048d8714910e3014ec5ad32fb45d","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/1/commits","review_comments_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/1/comments","review_comment_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/comments{/number}","comments_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/1/comments","statuses_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/statuses/fce7408bee7aef10398bec8e196d28b83aa93278","head":{"label":"direwolf-github:branch-c9b911a8","ref":"branch-c9b911a8","sha":"fce7408bee7aef10398bec8e196d28b83aa93278","user":{"login":"direwolf-github","id":10810283,"node_id":"MDQ6VXNlcjEwODEwMjgz","avatar_url":"https://avatars.githubusercontent.com/u/10810283?v=4","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","html_url":"https://github.com/direwolf-github","followers_url":"https://api.github.com/users/direwolf-github/followers","following_url":"https://api.github.com/users/direwolf-github/following{/other_user}","gists_url":"https://api.github.com/users/direwolf-github/gists{/gist_id}","starred_url":"https://api.github.com/users/direwolf-github/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/direwolf-github/subscriptions","organizations_url":"https://api.github.com/users/direwolf-github/orgs","repos_url":"https://api.github.com/users/direwolf-github/repos","events_url":"https://api.github.com/users/direwolf-github/events{/privacy}","received_events_url":"https://api.github.com/users/direwolf-github/received_events","type":"User","site_admin":false},"repo":{"id":388040450,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA0NTA=","name":"my-app-5f19618c","full_name":"direwolf-github/my-app-5f19618c","private":false,"owner":{"login":"direwolf-github","id":10810283,"node_id":"MDQ6VXNlcjEwODEwMjgz","avatar_url":"https://avatars.githubusercontent.com/u/10810283?v=4","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","html_url":"https://github.com/direwolf-github","followers_url":"https://api.github.com/users/direwolf-github/followers","following_url":"https://api.github.com/users/direwolf-github/following{/other_user}","gists_url":"https://api.github.com/users/direwolf-github/gists{/gist_id}","starred_url":"https://api.github.com/users/direwolf-github/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/direwolf-github/subscriptions","organizations_url":"https://api.github.com/users/direwolf-github/orgs","repos_url":"https://api.github.com/users/direwolf-github/repos","events_url":"https://api.github.com/users/direwolf-github/events{/privacy}","received_events_url":"https://api.github.com/users/direwolf-github/received_events","type":"User","site_admin":false},"html_url":"https://github.com/direwolf-github/my-app-5f19618c","description":null,"fork":false,"url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c","forks_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/forks","keys_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/keys{/key_id}","collaborators_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/teams","hooks_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/hooks","issue_events_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/events{/number}","events_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/events","assignees_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/assignees{/user}","branches_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/branches{/branch}","tags_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/tags","blobs_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/refs{/sha}","trees_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/trees{/sha}","statuses_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/statuses/{sha}","languages_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/languages","stargazers_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/stargazers","contributors_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/contributors","subscribers_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/subscribers","subscription_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/subscription","commits_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/commits{/sha}","git_commits_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/commits{/sha}","comments_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/comments{/number}","issue_comment_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/comments{/number}","contents_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/contents/{+path}","compare_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/compare/{base}...{head}","merges_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/merges","archive_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/downloads","issues_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues{/number}","pulls_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls{/number}","milestones_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/milestones{/number}","notifications_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/labels{/name}","releases_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/releases{/id}","deployments_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/deployments","created_at":"2021-07-21T07:59:33Z","updated_at":"2021-07-21T07:59:36Z","pushed_at":"2021-07-21T08:00:00Z","git_url":"git://github.com/direwolf-github/my-app-5f19618c.git","ssh_url":"git@github.com:direwolf-github/my-app-5f19618c.git","clone_url":"https://github.com/direwolf-github/my-app-5f19618c.git","svn_url":"https://github.com/direwolf-github/my-app-5f19618c","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"direwolf-github:master","ref":"master","sha":"24b649c0ada6e7be3ffd70fc5368b6bfd1ff602b","user":{"login":"direwolf-github","id":10810283,"node_id":"MDQ6VXNlcjEwODEwMjgz","avatar_url":"https://avatars.githubusercontent.com/u/10810283?v=4","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","html_url":"https://github.com/direwolf-github","followers_url":"https://api.github.com/users/direwolf-github/followers","following_url":"https://api.github.com/users/direwolf-github/following{/other_user}","gists_url":"https://api.github.com/users/direwolf-github/gists{/gist_id}","starred_url":"https://api.github.com/users/direwolf-github/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/direwolf-github/subscriptions","organizations_url":"https://api.github.com/users/direwolf-github/orgs","repos_url":"https://api.github.com/users/direwolf-github/repos","events_url":"https://api.github.com/users/direwolf-github/events{/privacy}","received_events_url":"https://api.github.com/users/direwolf-github/received_events","type":"User","site_admin":false},"repo":{"id":388040450,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA0NTA=","name":"my-app-5f19618c","full_name":"direwolf-github/my-app-5f19618c","private":false,"owner":{"login":"direwolf-github","id":10810283,"node_id":"MDQ6VXNlcjEwODEwMjgz","avatar_url":"https://avatars.githubusercontent.com/u/10810283?v=4","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","html_url":"https://github.com/direwolf-github","followers_url":"https://api.github.com/users/direwolf-github/followers","following_url":"https://api.github.com/users/direwolf-github/following{/other_user}","gists_url":"https://api.github.com/users/direwolf-github/gists{/gist_id}","starred_url":"https://api.github.com/users/direwolf-github/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/direwolf-github/subscriptions","organizations_url":"https://api.github.com/users/direwolf-github/orgs","repos_url":"https://api.github.com/users/direwolf-github/repos","events_url":"https://api.github.com/users/direwolf-github/events{/privacy}","received_events_url":"https://api.github.com/users/direwolf-github/received_events","type":"User","site_admin":false},"html_url":"https://github.com/direwolf-github/my-app-5f19618c","description":null,"fork":false,"url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c","forks_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/forks","keys_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/keys{/key_id}","collaborators_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/teams","hooks_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/hooks","issue_events_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/events{/number}","events_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/events","assignees_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/assignees{/user}","branches_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/branches{/branch}","tags_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/tags","blobs_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/refs{/sha}","trees_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/trees{/sha}","statuses_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/statuses/{sha}","languages_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/languages","stargazers_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/stargazers","contributors_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/contributors","subscribers_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/subscribers","subscription_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/subscription","commits_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/commits{/sha}","git_commits_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/git/commits{/sha}","comments_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/comments{/number}","issue_comment_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/comments{/number}","contents_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/contents/{+path}","compare_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/compare/{base}...{head}","merges_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/merges","archive_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/downloads","issues_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues{/number}","pulls_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls{/number}","milestones_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/milestones{/number}","notifications_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/labels{/name}","releases_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/releases{/id}","deployments_url":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/deployments","created_at":"2021-07-21T07:59:33Z","updated_at":"2021-07-21T07:59:36Z","pushed_at":"2021-07-21T08:00:00Z","git_url":"git://github.com/direwolf-github/my-app-5f19618c.git","ssh_url":"git@github.com:direwolf-github/my-app-5f19618c.git","clone_url":"https://github.com/direwolf-github/my-app-5f19618c.git","svn_url":"https://github.com/direwolf-github/my-app-5f19618c","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/1"},"html":{"href":"https://github.com/direwolf-github/my-app-5f19618c/pull/1"},"issue":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/1"},"comments":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/direwolf-github/my-app-5f19618c/statuses/fce7408bee7aef10398bec8e196d28b83aa93278"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":true,"rebaseable":true,"mergeable_state":"clean","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514865","type":"PushEvent","actor":{"id":54167233,"login":"ccqstark","display_login":"ccqstark","gravatar_id":"","url":"https://api.github.com/users/ccqstark","avatar_url":"https://avatars.githubusercontent.com/u/54167233?"},"repo":{"id":387765739,"name":"ccqstark/image-bed","url":"https://api.github.com/repos/ccqstark/image-bed"},"payload":{"push_id":7562055081,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2343c2993a9a44ff2fabb9ca4e94778019d1924e","before":"b2eb027a76f484b38ba76acb54507ca8ebbb97dc","commits":[{"sha":"2343c2993a9a44ff2fabb9ca4e94778019d1924e","author":{"name":"ccqstark","email":"30878b5c8d2997c6529b8afd13070e4f73722fa1@users.noreply.github.com"},"message":"Upload by PicGo","distinct":true,"url":"https://api.github.com/repos/ccqstark/image-bed/commits/2343c2993a9a44ff2fabb9ca4e94778019d1924e"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514872","type":"PushEvent","actor":{"id":85176794,"login":"kaneki-op","display_login":"kaneki-op","gravatar_id":"","url":"https://api.github.com/users/kaneki-op","avatar_url":"https://avatars.githubusercontent.com/u/85176794?"},"repo":{"id":377739699,"name":"kaneki-op/op.tv","url":"https://api.github.com/repos/kaneki-op/op.tv"},"payload":{"push_id":7562055093,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1a466ab78339ba194d20e5b181412089033450a2","before":"a4c4833d386b78c030d7c3138ea8e1c63357fe83","commits":[{"sha":"1a466ab78339ba194d20e5b181412089033450a2","author":{"name":"prakash-op","email":"92a4dc4a20f9188038025a3386c31841cf56ca43@users.noreply.github.com"},"message":"Update index.html","distinct":true,"url":"https://api.github.com/repos/kaneki-op/op.tv/commits/1a466ab78339ba194d20e5b181412089033450a2"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514876","type":"ForkEvent","actor":{"id":34512644,"login":"qq1134093272","display_login":"qq1134093272","gravatar_id":"","url":"https://api.github.com/users/qq1134093272","avatar_url":"https://avatars.githubusercontent.com/u/34512644?"},"repo":{"id":186777581,"name":"CheckChe0803/flink-recommandSystem-demo","url":"https://api.github.com/repos/CheckChe0803/flink-recommandSystem-demo"},"payload":{"forkee":{"id":388040563,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1NjM=","name":"flink-recommandSystem-demo","full_name":"qq1134093272/flink-recommandSystem-demo","private":false,"owner":{"login":"qq1134093272","id":34512644,"node_id":"MDQ6VXNlcjM0NTEyNjQ0","avatar_url":"https://avatars.githubusercontent.com/u/34512644?v=4","gravatar_id":"","url":"https://api.github.com/users/qq1134093272","html_url":"https://github.com/qq1134093272","followers_url":"https://api.github.com/users/qq1134093272/followers","following_url":"https://api.github.com/users/qq1134093272/following{/other_user}","gists_url":"https://api.github.com/users/qq1134093272/gists{/gist_id}","starred_url":"https://api.github.com/users/qq1134093272/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/qq1134093272/subscriptions","organizations_url":"https://api.github.com/users/qq1134093272/orgs","repos_url":"https://api.github.com/users/qq1134093272/repos","events_url":"https://api.github.com/users/qq1134093272/events{/privacy}","received_events_url":"https://api.github.com/users/qq1134093272/received_events","type":"User","site_admin":false},"html_url":"https://github.com/qq1134093272/flink-recommandSystem-demo","description":":helicopter::rocket:基于Flink实现的商品实时推荐系统。flink统计商品热度，放入redis缓存，分析日志信息，将画像标签和实时记录放入Hbase。在用户发起推荐请求后，根据用户画像重排序热度榜，并结合协同过滤和标签两个推荐模块为新生成的榜单的每一个产品添加关联产品，最后返回新的用户列表。","fork":true,"url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo","forks_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/forks","keys_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/teams","hooks_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/hooks","issue_events_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/issues/events{/number}","events_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/events","assignees_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/assignees{/user}","branches_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/branches{/branch}","tags_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/tags","blobs_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/git/refs{/sha}","trees_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/statuses/{sha}","languages_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/languages","stargazers_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/stargazers","contributors_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/contributors","subscribers_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/subscribers","subscription_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/subscription","commits_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/commits{/sha}","git_commits_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/git/commits{/sha}","comments_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/comments{/number}","issue_comment_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/issues/comments{/number}","contents_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/contents/{+path}","compare_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/merges","archive_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/downloads","issues_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/issues{/number}","pulls_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/pulls{/number}","milestones_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/milestones{/number}","notifications_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/labels{/name}","releases_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/releases{/id}","deployments_url":"https://api.github.com/repos/qq1134093272/flink-recommandSystem-demo/deployments","created_at":"2021-07-21T08:00:01Z","updated_at":"2021-07-21T01:39:15Z","pushed_at":"2021-07-02T02:07:51Z","git_url":"git://github.com/qq1134093272/flink-recommandSystem-demo.git","ssh_url":"git@github.com:qq1134093272/flink-recommandSystem-demo.git","clone_url":"https://github.com/qq1134093272/flink-recommandSystem-demo.git","svn_url":"https://github.com/qq1134093272/flink-recommandSystem-demo","homepage":"","size":4894,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514887","type":"ForkEvent","actor":{"id":10127287,"login":"miludan","display_login":"miludan","gravatar_id":"","url":"https://api.github.com/users/miludan","avatar_url":"https://avatars.githubusercontent.com/u/10127287?"},"repo":{"id":2203645,"name":"CocoaPods/CocoaPods","url":"https://api.github.com/repos/CocoaPods/CocoaPods"},"payload":{"forkee":{"id":388040566,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1NjY=","name":"CocoaPods","full_name":"miludan/CocoaPods","private":false,"owner":{"login":"miludan","id":10127287,"node_id":"MDQ6VXNlcjEwMTI3Mjg3","avatar_url":"https://avatars.githubusercontent.com/u/10127287?v=4","gravatar_id":"","url":"https://api.github.com/users/miludan","html_url":"https://github.com/miludan","followers_url":"https://api.github.com/users/miludan/followers","following_url":"https://api.github.com/users/miludan/following{/other_user}","gists_url":"https://api.github.com/users/miludan/gists{/gist_id}","starred_url":"https://api.github.com/users/miludan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/miludan/subscriptions","organizations_url":"https://api.github.com/users/miludan/orgs","repos_url":"https://api.github.com/users/miludan/repos","events_url":"https://api.github.com/users/miludan/events{/privacy}","received_events_url":"https://api.github.com/users/miludan/received_events","type":"User","site_admin":false},"html_url":"https://github.com/miludan/CocoaPods","description":"The Cocoa Dependency Manager.","fork":true,"url":"https://api.github.com/repos/miludan/CocoaPods","forks_url":"https://api.github.com/repos/miludan/CocoaPods/forks","keys_url":"https://api.github.com/repos/miludan/CocoaPods/keys{/key_id}","collaborators_url":"https://api.github.com/repos/miludan/CocoaPods/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/miludan/CocoaPods/teams","hooks_url":"https://api.github.com/repos/miludan/CocoaPods/hooks","issue_events_url":"https://api.github.com/repos/miludan/CocoaPods/issues/events{/number}","events_url":"https://api.github.com/repos/miludan/CocoaPods/events","assignees_url":"https://api.github.com/repos/miludan/CocoaPods/assignees{/user}","branches_url":"https://api.github.com/repos/miludan/CocoaPods/branches{/branch}","tags_url":"https://api.github.com/repos/miludan/CocoaPods/tags","blobs_url":"https://api.github.com/repos/miludan/CocoaPods/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/miludan/CocoaPods/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/miludan/CocoaPods/git/refs{/sha}","trees_url":"https://api.github.com/repos/miludan/CocoaPods/git/trees{/sha}","statuses_url":"https://api.github.com/repos/miludan/CocoaPods/statuses/{sha}","languages_url":"https://api.github.com/repos/miludan/CocoaPods/languages","stargazers_url":"https://api.github.com/repos/miludan/CocoaPods/stargazers","contributors_url":"https://api.github.com/repos/miludan/CocoaPods/contributors","subscribers_url":"https://api.github.com/repos/miludan/CocoaPods/subscribers","subscription_url":"https://api.github.com/repos/miludan/CocoaPods/subscription","commits_url":"https://api.github.com/repos/miludan/CocoaPods/commits{/sha}","git_commits_url":"https://api.github.com/repos/miludan/CocoaPods/git/commits{/sha}","comments_url":"https://api.github.com/repos/miludan/CocoaPods/comments{/number}","issue_comment_url":"https://api.github.com/repos/miludan/CocoaPods/issues/comments{/number}","contents_url":"https://api.github.com/repos/miludan/CocoaPods/contents/{+path}","compare_url":"https://api.github.com/repos/miludan/CocoaPods/compare/{base}...{head}","merges_url":"https://api.github.com/repos/miludan/CocoaPods/merges","archive_url":"https://api.github.com/repos/miludan/CocoaPods/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/miludan/CocoaPods/downloads","issues_url":"https://api.github.com/repos/miludan/CocoaPods/issues{/number}","pulls_url":"https://api.github.com/repos/miludan/CocoaPods/pulls{/number}","milestones_url":"https://api.github.com/repos/miludan/CocoaPods/milestones{/number}","notifications_url":"https://api.github.com/repos/miludan/CocoaPods/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/miludan/CocoaPods/labels{/name}","releases_url":"https://api.github.com/repos/miludan/CocoaPods/releases{/id}","deployments_url":"https://api.github.com/repos/miludan/CocoaPods/deployments","created_at":"2021-07-21T08:00:01Z","updated_at":"2021-07-20T22:20:03Z","pushed_at":"2021-07-20T22:19:59Z","git_url":"git://github.com/miludan/CocoaPods.git","ssh_url":"git@github.com:miludan/CocoaPods.git","clone_url":"https://github.com/miludan/CocoaPods.git","svn_url":"https://github.com/miludan/CocoaPods","homepage":"https://cocoapods.org/","size":76278,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:01Z","org":{"id":1189714,"login":"CocoaPods","gravatar_id":"","url":"https://api.github.com/orgs/CocoaPods","avatar_url":"https://avatars.githubusercontent.com/u/1189714?"}}
+{"id":"17245514889","type":"PullRequestReviewEvent","actor":{"id":372735,"login":"svenefftinge","display_login":"svenefftinge","gravatar_id":"","url":"https://api.github.com/users/svenefftinge","avatar_url":"https://avatars.githubusercontent.com/u/372735?"},"repo":{"id":130879558,"name":"gitpod-io/gitpod","url":"https://api.github.com/repos/gitpod-io/gitpod"},"payload":{"action":"created","review":{"id":711364882,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzY0ODgy","user":{"login":"svenefftinge","id":372735,"node_id":"MDQ6VXNlcjM3MjczNQ==","avatar_url":"https://avatars.githubusercontent.com/u/372735?v=4","gravatar_id":"","url":"https://api.github.com/users/svenefftinge","html_url":"https://github.com/svenefftinge","followers_url":"https://api.github.com/users/svenefftinge/followers","following_url":"https://api.github.com/users/svenefftinge/following{/other_user}","gists_url":"https://api.github.com/users/svenefftinge/gists{/gist_id}","starred_url":"https://api.github.com/users/svenefftinge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/svenefftinge/subscriptions","organizations_url":"https://api.github.com/users/svenefftinge/orgs","repos_url":"https://api.github.com/users/svenefftinge/repos","events_url":"https://api.github.com/users/svenefftinge/events{/privacy}","received_events_url":"https://api.github.com/users/svenefftinge/received_events","type":"User","site_admin":false},"body":null,"commit_id":"8601021844904dcd946b303258e7d1f71cf4a7b6","submitted_at":"2021-07-21T08:00:01Z","state":"commented","html_url":"https://github.com/gitpod-io/gitpod/pull/4631#pullrequestreview-711364882","pull_request_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/gitpod-io/gitpod/pull/4631#pullrequestreview-711364882"},"pull_request":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631"}}},"pull_request":{"url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631","id":678865592,"node_id":"MDExOlB1bGxSZXF1ZXN0Njc4ODY1NTky","html_url":"https://github.com/gitpod-io/gitpod/pull/4631","diff_url":"https://github.com/gitpod-io/gitpod/pull/4631.diff","patch_url":"https://github.com/gitpod-io/gitpod/pull/4631.patch","issue_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631","number":4631,"state":"open","locked":false,"title":"Implement project configurator","user":{"login":"jankeromnes","id":599268,"node_id":"MDQ6VXNlcjU5OTI2OA==","avatar_url":"https://avatars.githubusercontent.com/u/599268?v=4","gravatar_id":"","url":"https://api.github.com/users/jankeromnes","html_url":"https://github.com/jankeromnes","followers_url":"https://api.github.com/users/jankeromnes/followers","following_url":"https://api.github.com/users/jankeromnes/following{/other_user}","gists_url":"https://api.github.com/users/jankeromnes/gists{/gist_id}","starred_url":"https://api.github.com/users/jankeromnes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jankeromnes/subscriptions","organizations_url":"https://api.github.com/users/jankeromnes/orgs","repos_url":"https://api.github.com/users/jankeromnes/repos","events_url":"https://api.github.com/users/jankeromnes/events{/privacy}","received_events_url":"https://api.github.com/users/jankeromnes/received_events","type":"User","site_admin":false},"body":"Initial pass to fix https://github.com/gitpod-io/gitpod/issues/4648\r\n\r\nDepends on & contains https://github.com/gitpod-io/gitpod/pull/4846\r\n\r\nWhat it does:\r\n\r\n- Adds a `config` (text) field to `d_b_project`, so that Projects can have a custom `.gitpod.yml` content\r\n- Adds a Project Configurator view in the dashboard, as final step in the Add Project flow (also currently accessible via a Project's UI)\r\n- When determining the config of a new workspace, use this priority order:\r\n    1. From repository\r\n    2. (_new_) From Project DB\r\n    3. From definitely-gp\r\n    4. Derived (Go) or default\r\n- When starting from a custom `.gitpod.yml` (from the Project DB), the initializer also places the uncomitted `.gitpod.yml` into the workspace (to encourage repo-based configs)\r\n\r\nHow to test:\r\n\r\n- Create a new team\r\n- Add a new project (either by inserting into `d_b_project`, or we set up a GitHub App integration -- @AlexTugarev could you help with the latter?)\r\n- If the project already has a repo-based config, the configurator should indicate that and be disabled. If there is no repo config, the configurator should allow you to write a new `.gitpod.yml` (e.g. based on one of the presets) and then test it / iterate on it in a quick loop (with the build output on the right)\r\n\r\nThe UX of this is still rough, but the goal is to add this final step rather soon, and then iterate on the entire Add Project flow.","created_at":"2021-06-28T09:18:16Z","updated_at":"2021-07-21T08:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"15cbca865d27363a6344dd9cdb57e4155d6384e6","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3171280082,"node_id":"MDU6TGFiZWwzMTcxMjgwMDgy","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/approved","name":"approved","color":"ededed","default":false,"description":null},{"id":2481698797,"node_id":"MDU6TGFiZWwyNDgxNjk4Nzk3","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/component:%20dashboard","name":"component: dashboard","color":"e1e4e8","default":false,"description":""},{"id":3173195428,"node_id":"MDU6TGFiZWwzMTczMTk1NDI4","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/do-not-merge/hold","name":"do-not-merge/hold","color":"B60205","default":false,"description":""},{"id":3046862260,"node_id":"MDU6TGFiZWwzMDQ2ODYyMjYw","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/roadmap%20item:%20teams%20&%20projects","name":"roadmap item: teams & projects","color":"656769","default":false,"description":""},{"id":3171736349,"node_id":"MDU6TGFiZWwzMTcxNzM2MzQ5","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/size/XXL","name":"size/XXL","color":"BFD4F2","default":false,"description":""}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/commits","review_comments_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/comments","review_comment_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631/comments","statuses_url":"https://api.github.com/repos/gitpod-io/gitpod/statuses/8601021844904dcd946b303258e7d1f71cf4a7b6","head":{"label":"gitpod-io:jx/configure-project","ref":"jx/configure-project","sha":"8601021844904dcd946b303258e7d1f71cf4a7b6","user":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"repo":{"id":130879558,"node_id":"MDEwOlJlcG9zaXRvcnkxMzA4Nzk1NTg=","name":"gitpod","full_name":"gitpod-io/gitpod","private":false,"owner":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/gitpod-io/gitpod","description":"Gitpod automates the provisioning of ready-to-code development environments. ","fork":false,"url":"https://api.github.com/repos/gitpod-io/gitpod","forks_url":"https://api.github.com/repos/gitpod-io/gitpod/forks","keys_url":"https://api.github.com/repos/gitpod-io/gitpod/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gitpod-io/gitpod/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gitpod-io/gitpod/teams","hooks_url":"https://api.github.com/repos/gitpod-io/gitpod/hooks","issue_events_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/events{/number}","events_url":"https://api.github.com/repos/gitpod-io/gitpod/events","assignees_url":"https://api.github.com/repos/gitpod-io/gitpod/assignees{/user}","branches_url":"https://api.github.com/repos/gitpod-io/gitpod/branches{/branch}","tags_url":"https://api.github.com/repos/gitpod-io/gitpod/tags","blobs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gitpod-io/gitpod/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/refs{/sha}","trees_url":"https://api.github.com/repos/gitpod-io/gitpod/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gitpod-io/gitpod/statuses/{sha}","languages_url":"https://api.github.com/repos/gitpod-io/gitpod/languages","stargazers_url":"https://api.github.com/repos/gitpod-io/gitpod/stargazers","contributors_url":"https://api.github.com/repos/gitpod-io/gitpod/contributors","subscribers_url":"https://api.github.com/repos/gitpod-io/gitpod/subscribers","subscription_url":"https://api.github.com/repos/gitpod-io/gitpod/subscription","commits_url":"https://api.github.com/repos/gitpod-io/gitpod/commits{/sha}","git_commits_url":"https://api.github.com/repos/gitpod-io/gitpod/git/commits{/sha}","comments_url":"https://api.github.com/repos/gitpod-io/gitpod/comments{/number}","issue_comment_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/comments{/number}","contents_url":"https://api.github.com/repos/gitpod-io/gitpod/contents/{+path}","compare_url":"https://api.github.com/repos/gitpod-io/gitpod/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gitpod-io/gitpod/merges","archive_url":"https://api.github.com/repos/gitpod-io/gitpod/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gitpod-io/gitpod/downloads","issues_url":"https://api.github.com/repos/gitpod-io/gitpod/issues{/number}","pulls_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls{/number}","milestones_url":"https://api.github.com/repos/gitpod-io/gitpod/milestones{/number}","notifications_url":"https://api.github.com/repos/gitpod-io/gitpod/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gitpod-io/gitpod/labels{/name}","releases_url":"https://api.github.com/repos/gitpod-io/gitpod/releases{/id}","deployments_url":"https://api.github.com/repos/gitpod-io/gitpod/deployments","created_at":"2018-04-24T15:56:54Z","updated_at":"2021-07-21T07:36:46Z","pushed_at":"2021-07-21T07:59:25Z","git_url":"git://github.com/gitpod-io/gitpod.git","ssh_url":"git@github.com:gitpod-io/gitpod.git","clone_url":"https://github.com/gitpod-io/gitpod.git","svn_url":"https://github.com/gitpod-io/gitpod","homepage":"https://gitpod.io","size":46869,"stargazers_count":4483,"watchers_count":4483,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":530,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":394,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":530,"open_issues":394,"watchers":4483,"default_branch":"main"}},"base":{"label":"gitpod-io:main","ref":"main","sha":"0c778d9923eaa267712daa168d5ff2a94193ce2c","user":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"repo":{"id":130879558,"node_id":"MDEwOlJlcG9zaXRvcnkxMzA4Nzk1NTg=","name":"gitpod","full_name":"gitpod-io/gitpod","private":false,"owner":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/gitpod-io/gitpod","description":"Gitpod automates the provisioning of ready-to-code development environments. ","fork":false,"url":"https://api.github.com/repos/gitpod-io/gitpod","forks_url":"https://api.github.com/repos/gitpod-io/gitpod/forks","keys_url":"https://api.github.com/repos/gitpod-io/gitpod/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gitpod-io/gitpod/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gitpod-io/gitpod/teams","hooks_url":"https://api.github.com/repos/gitpod-io/gitpod/hooks","issue_events_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/events{/number}","events_url":"https://api.github.com/repos/gitpod-io/gitpod/events","assignees_url":"https://api.github.com/repos/gitpod-io/gitpod/assignees{/user}","branches_url":"https://api.github.com/repos/gitpod-io/gitpod/branches{/branch}","tags_url":"https://api.github.com/repos/gitpod-io/gitpod/tags","blobs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gitpod-io/gitpod/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/refs{/sha}","trees_url":"https://api.github.com/repos/gitpod-io/gitpod/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gitpod-io/gitpod/statuses/{sha}","languages_url":"https://api.github.com/repos/gitpod-io/gitpod/languages","stargazers_url":"https://api.github.com/repos/gitpod-io/gitpod/stargazers","contributors_url":"https://api.github.com/repos/gitpod-io/gitpod/contributors","subscribers_url":"https://api.github.com/repos/gitpod-io/gitpod/subscribers","subscription_url":"https://api.github.com/repos/gitpod-io/gitpod/subscription","commits_url":"https://api.github.com/repos/gitpod-io/gitpod/commits{/sha}","git_commits_url":"https://api.github.com/repos/gitpod-io/gitpod/git/commits{/sha}","comments_url":"https://api.github.com/repos/gitpod-io/gitpod/comments{/number}","issue_comment_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/comments{/number}","contents_url":"https://api.github.com/repos/gitpod-io/gitpod/contents/{+path}","compare_url":"https://api.github.com/repos/gitpod-io/gitpod/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gitpod-io/gitpod/merges","archive_url":"https://api.github.com/repos/gitpod-io/gitpod/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gitpod-io/gitpod/downloads","issues_url":"https://api.github.com/repos/gitpod-io/gitpod/issues{/number}","pulls_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls{/number}","milestones_url":"https://api.github.com/repos/gitpod-io/gitpod/milestones{/number}","notifications_url":"https://api.github.com/repos/gitpod-io/gitpod/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gitpod-io/gitpod/labels{/name}","releases_url":"https://api.github.com/repos/gitpod-io/gitpod/releases{/id}","deployments_url":"https://api.github.com/repos/gitpod-io/gitpod/deployments","created_at":"2018-04-24T15:56:54Z","updated_at":"2021-07-21T07:36:46Z","pushed_at":"2021-07-21T07:59:25Z","git_url":"git://github.com/gitpod-io/gitpod.git","ssh_url":"git@github.com:gitpod-io/gitpod.git","clone_url":"https://github.com/gitpod-io/gitpod.git","svn_url":"https://github.com/gitpod-io/gitpod","homepage":"https://gitpod.io","size":46869,"stargazers_count":4483,"watchers_count":4483,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":530,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":394,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":530,"open_issues":394,"watchers":4483,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631"},"html":{"href":"https://github.com/gitpod-io/gitpod/pull/4631"},"issue":{"href":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631"},"comments":{"href":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631/comments"},"review_comments":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/comments"},"review_comment":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/commits"},"statuses":{"href":"https://api.github.com/repos/gitpod-io/gitpod/statuses/8601021844904dcd946b303258e7d1f71cf4a7b6"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:01Z","org":{"id":37021919,"login":"gitpod-io","gravatar_id":"","url":"https://api.github.com/orgs/gitpod-io","avatar_url":"https://avatars.githubusercontent.com/u/37021919?"}}
+{"id":"17245514894","type":"PushEvent","actor":{"id":25157114,"login":"kaelynchen","display_login":"kaelynchen","gravatar_id":"","url":"https://api.github.com/users/kaelynchen","avatar_url":"https://avatars.githubusercontent.com/u/25157114?"},"repo":{"id":386208907,"name":"kaelynchen/PurifyH5","url":"https://api.github.com/repos/kaelynchen/PurifyH5"},"payload":{"push_id":7562055089,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1e9cc2a5a4c1bd778486d1414c9aeef4b51ce332","before":"37f45b13f0e1946f27fef1a4b9af44f5b4372dc0","commits":[{"sha":"1e9cc2a5a4c1bd778486d1414c9aeef4b51ce332","author":{"name":"kaelynchen","email":"622389b1dfdc3db8af29b94d5226b85d318be7db@qq.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/kaelynchen/PurifyH5/commits/1e9cc2a5a4c1bd778486d1414c9aeef4b51ce332"}]},"public":true,"created_at":"2021-07-21T08:00:01Z"}
+{"id":"17245514901","type":"PullRequestReviewCommentEvent","actor":{"id":372735,"login":"svenefftinge","display_login":"svenefftinge","gravatar_id":"","url":"https://api.github.com/users/svenefftinge","avatar_url":"https://avatars.githubusercontent.com/u/372735?"},"repo":{"id":130879558,"name":"gitpod-io/gitpod","url":"https://api.github.com/repos/gitpod-io/gitpod"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/comments/673748169","pull_request_review_id":711364882,"id":673748169,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3Mzc0ODE2OQ==","diff_hunk":"@@ -26,6 +26,9 @@ export class DBProject {\n   @Column()\n   appInstallationId: string;\n \n+  @Column()\n+  config?: string;","path":"components/gitpod-db/src/typeorm/entity/db-project.ts","position":null,"original_position":5,"commit_id":"8601021844904dcd946b303258e7d1f71cf4a7b6","original_commit_id":"19834883c4ab1c287da2755330c6d40d83950f26","user":{"login":"svenefftinge","id":372735,"node_id":"MDQ6VXNlcjM3MjczNQ==","avatar_url":"https://avatars.githubusercontent.com/u/372735?v=4","gravatar_id":"","url":"https://api.github.com/users/svenefftinge","html_url":"https://github.com/svenefftinge","followers_url":"https://api.github.com/users/svenefftinge/followers","following_url":"https://api.github.com/users/svenefftinge/following{/other_user}","gists_url":"https://api.github.com/users/svenefftinge/gists{/gist_id}","starred_url":"https://api.github.com/users/svenefftinge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/svenefftinge/subscriptions","organizations_url":"https://api.github.com/users/svenefftinge/orgs","repos_url":"https://api.github.com/users/svenefftinge/repos","events_url":"https://api.github.com/users/svenefftinge/events{/privacy}","received_events_url":"https://api.github.com/users/svenefftinge/received_events","type":"User","site_admin":false},"body":"something like this:\r\n```\r\ntype ConfigPath = '.gitpod.yml' | '.gitpod.Dockerfile';\r\n@Column(\"simple-json\", { nullable: true }) \r\nconfig?: {[filePath: ConfigPath]: string}\r\n```","created_at":"2021-07-21T08:00:01Z","updated_at":"2021-07-21T08:00:01Z","html_url":"https://github.com/gitpod-io/gitpod/pull/4631#discussion_r673748169","pull_request_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/comments/673748169"},"html":{"href":"https://github.com/gitpod-io/gitpod/pull/4631#discussion_r673748169"},"pull_request":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631"}},"start_line":null,"original_start_line":null,"start_side":null,"line":null,"original_line":30,"side":"RIGHT","in_reply_to_id":672897330},"pull_request":{"url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631","id":678865592,"node_id":"MDExOlB1bGxSZXF1ZXN0Njc4ODY1NTky","html_url":"https://github.com/gitpod-io/gitpod/pull/4631","diff_url":"https://github.com/gitpod-io/gitpod/pull/4631.diff","patch_url":"https://github.com/gitpod-io/gitpod/pull/4631.patch","issue_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631","number":4631,"state":"open","locked":false,"title":"Implement project configurator","user":{"login":"jankeromnes","id":599268,"node_id":"MDQ6VXNlcjU5OTI2OA==","avatar_url":"https://avatars.githubusercontent.com/u/599268?v=4","gravatar_id":"","url":"https://api.github.com/users/jankeromnes","html_url":"https://github.com/jankeromnes","followers_url":"https://api.github.com/users/jankeromnes/followers","following_url":"https://api.github.com/users/jankeromnes/following{/other_user}","gists_url":"https://api.github.com/users/jankeromnes/gists{/gist_id}","starred_url":"https://api.github.com/users/jankeromnes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jankeromnes/subscriptions","organizations_url":"https://api.github.com/users/jankeromnes/orgs","repos_url":"https://api.github.com/users/jankeromnes/repos","events_url":"https://api.github.com/users/jankeromnes/events{/privacy}","received_events_url":"https://api.github.com/users/jankeromnes/received_events","type":"User","site_admin":false},"body":"Initial pass to fix https://github.com/gitpod-io/gitpod/issues/4648\r\n\r\nDepends on & contains https://github.com/gitpod-io/gitpod/pull/4846\r\n\r\nWhat it does:\r\n\r\n- Adds a `config` (text) field to `d_b_project`, so that Projects can have a custom `.gitpod.yml` content\r\n- Adds a Project Configurator view in the dashboard, as final step in the Add Project flow (also currently accessible via a Project's UI)\r\n- When determining the config of a new workspace, use this priority order:\r\n    1. From repository\r\n    2. (_new_) From Project DB\r\n    3. From definitely-gp\r\n    4. Derived (Go) or default\r\n- When starting from a custom `.gitpod.yml` (from the Project DB), the initializer also places the uncomitted `.gitpod.yml` into the workspace (to encourage repo-based configs)\r\n\r\nHow to test:\r\n\r\n- Create a new team\r\n- Add a new project (either by inserting into `d_b_project`, or we set up a GitHub App integration -- @AlexTugarev could you help with the latter?)\r\n- If the project already has a repo-based config, the configurator should indicate that and be disabled. If there is no repo config, the configurator should allow you to write a new `.gitpod.yml` (e.g. based on one of the presets) and then test it / iterate on it in a quick loop (with the build output on the right)\r\n\r\nThe UX of this is still rough, but the goal is to add this final step rather soon, and then iterate on the entire Add Project flow.","created_at":"2021-06-28T09:18:16Z","updated_at":"2021-07-21T08:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"15cbca865d27363a6344dd9cdb57e4155d6384e6","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3171280082,"node_id":"MDU6TGFiZWwzMTcxMjgwMDgy","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/approved","name":"approved","color":"ededed","default":false,"description":null},{"id":2481698797,"node_id":"MDU6TGFiZWwyNDgxNjk4Nzk3","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/component:%20dashboard","name":"component: dashboard","color":"e1e4e8","default":false,"description":""},{"id":3173195428,"node_id":"MDU6TGFiZWwzMTczMTk1NDI4","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/do-not-merge/hold","name":"do-not-merge/hold","color":"B60205","default":false,"description":""},{"id":3046862260,"node_id":"MDU6TGFiZWwzMDQ2ODYyMjYw","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/roadmap%20item:%20teams%20&%20projects","name":"roadmap item: teams & projects","color":"656769","default":false,"description":""},{"id":3171736349,"node_id":"MDU6TGFiZWwzMTcxNzM2MzQ5","url":"https://api.github.com/repos/gitpod-io/gitpod/labels/size/XXL","name":"size/XXL","color":"BFD4F2","default":false,"description":""}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/commits","review_comments_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/comments","review_comment_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631/comments","statuses_url":"https://api.github.com/repos/gitpod-io/gitpod/statuses/8601021844904dcd946b303258e7d1f71cf4a7b6","head":{"label":"gitpod-io:jx/configure-project","ref":"jx/configure-project","sha":"8601021844904dcd946b303258e7d1f71cf4a7b6","user":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"repo":{"id":130879558,"node_id":"MDEwOlJlcG9zaXRvcnkxMzA4Nzk1NTg=","name":"gitpod","full_name":"gitpod-io/gitpod","private":false,"owner":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/gitpod-io/gitpod","description":"Gitpod automates the provisioning of ready-to-code development environments. ","fork":false,"url":"https://api.github.com/repos/gitpod-io/gitpod","forks_url":"https://api.github.com/repos/gitpod-io/gitpod/forks","keys_url":"https://api.github.com/repos/gitpod-io/gitpod/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gitpod-io/gitpod/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gitpod-io/gitpod/teams","hooks_url":"https://api.github.com/repos/gitpod-io/gitpod/hooks","issue_events_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/events{/number}","events_url":"https://api.github.com/repos/gitpod-io/gitpod/events","assignees_url":"https://api.github.com/repos/gitpod-io/gitpod/assignees{/user}","branches_url":"https://api.github.com/repos/gitpod-io/gitpod/branches{/branch}","tags_url":"https://api.github.com/repos/gitpod-io/gitpod/tags","blobs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gitpod-io/gitpod/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/refs{/sha}","trees_url":"https://api.github.com/repos/gitpod-io/gitpod/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gitpod-io/gitpod/statuses/{sha}","languages_url":"https://api.github.com/repos/gitpod-io/gitpod/languages","stargazers_url":"https://api.github.com/repos/gitpod-io/gitpod/stargazers","contributors_url":"https://api.github.com/repos/gitpod-io/gitpod/contributors","subscribers_url":"https://api.github.com/repos/gitpod-io/gitpod/subscribers","subscription_url":"https://api.github.com/repos/gitpod-io/gitpod/subscription","commits_url":"https://api.github.com/repos/gitpod-io/gitpod/commits{/sha}","git_commits_url":"https://api.github.com/repos/gitpod-io/gitpod/git/commits{/sha}","comments_url":"https://api.github.com/repos/gitpod-io/gitpod/comments{/number}","issue_comment_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/comments{/number}","contents_url":"https://api.github.com/repos/gitpod-io/gitpod/contents/{+path}","compare_url":"https://api.github.com/repos/gitpod-io/gitpod/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gitpod-io/gitpod/merges","archive_url":"https://api.github.com/repos/gitpod-io/gitpod/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gitpod-io/gitpod/downloads","issues_url":"https://api.github.com/repos/gitpod-io/gitpod/issues{/number}","pulls_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls{/number}","milestones_url":"https://api.github.com/repos/gitpod-io/gitpod/milestones{/number}","notifications_url":"https://api.github.com/repos/gitpod-io/gitpod/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gitpod-io/gitpod/labels{/name}","releases_url":"https://api.github.com/repos/gitpod-io/gitpod/releases{/id}","deployments_url":"https://api.github.com/repos/gitpod-io/gitpod/deployments","created_at":"2018-04-24T15:56:54Z","updated_at":"2021-07-21T07:36:46Z","pushed_at":"2021-07-21T07:59:25Z","git_url":"git://github.com/gitpod-io/gitpod.git","ssh_url":"git@github.com:gitpod-io/gitpod.git","clone_url":"https://github.com/gitpod-io/gitpod.git","svn_url":"https://github.com/gitpod-io/gitpod","homepage":"https://gitpod.io","size":46869,"stargazers_count":4483,"watchers_count":4483,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":530,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":394,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":530,"open_issues":394,"watchers":4483,"default_branch":"main"}},"base":{"label":"gitpod-io:main","ref":"main","sha":"0c778d9923eaa267712daa168d5ff2a94193ce2c","user":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"repo":{"id":130879558,"node_id":"MDEwOlJlcG9zaXRvcnkxMzA4Nzk1NTg=","name":"gitpod","full_name":"gitpod-io/gitpod","private":false,"owner":{"login":"gitpod-io","id":37021919,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM3MDIxOTE5","avatar_url":"https://avatars.githubusercontent.com/u/37021919?v=4","gravatar_id":"","url":"https://api.github.com/users/gitpod-io","html_url":"https://github.com/gitpod-io","followers_url":"https://api.github.com/users/gitpod-io/followers","following_url":"https://api.github.com/users/gitpod-io/following{/other_user}","gists_url":"https://api.github.com/users/gitpod-io/gists{/gist_id}","starred_url":"https://api.github.com/users/gitpod-io/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gitpod-io/subscriptions","organizations_url":"https://api.github.com/users/gitpod-io/orgs","repos_url":"https://api.github.com/users/gitpod-io/repos","events_url":"https://api.github.com/users/gitpod-io/events{/privacy}","received_events_url":"https://api.github.com/users/gitpod-io/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/gitpod-io/gitpod","description":"Gitpod automates the provisioning of ready-to-code development environments. ","fork":false,"url":"https://api.github.com/repos/gitpod-io/gitpod","forks_url":"https://api.github.com/repos/gitpod-io/gitpod/forks","keys_url":"https://api.github.com/repos/gitpod-io/gitpod/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gitpod-io/gitpod/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gitpod-io/gitpod/teams","hooks_url":"https://api.github.com/repos/gitpod-io/gitpod/hooks","issue_events_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/events{/number}","events_url":"https://api.github.com/repos/gitpod-io/gitpod/events","assignees_url":"https://api.github.com/repos/gitpod-io/gitpod/assignees{/user}","branches_url":"https://api.github.com/repos/gitpod-io/gitpod/branches{/branch}","tags_url":"https://api.github.com/repos/gitpod-io/gitpod/tags","blobs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gitpod-io/gitpod/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gitpod-io/gitpod/git/refs{/sha}","trees_url":"https://api.github.com/repos/gitpod-io/gitpod/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gitpod-io/gitpod/statuses/{sha}","languages_url":"https://api.github.com/repos/gitpod-io/gitpod/languages","stargazers_url":"https://api.github.com/repos/gitpod-io/gitpod/stargazers","contributors_url":"https://api.github.com/repos/gitpod-io/gitpod/contributors","subscribers_url":"https://api.github.com/repos/gitpod-io/gitpod/subscribers","subscription_url":"https://api.github.com/repos/gitpod-io/gitpod/subscription","commits_url":"https://api.github.com/repos/gitpod-io/gitpod/commits{/sha}","git_commits_url":"https://api.github.com/repos/gitpod-io/gitpod/git/commits{/sha}","comments_url":"https://api.github.com/repos/gitpod-io/gitpod/comments{/number}","issue_comment_url":"https://api.github.com/repos/gitpod-io/gitpod/issues/comments{/number}","contents_url":"https://api.github.com/repos/gitpod-io/gitpod/contents/{+path}","compare_url":"https://api.github.com/repos/gitpod-io/gitpod/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gitpod-io/gitpod/merges","archive_url":"https://api.github.com/repos/gitpod-io/gitpod/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gitpod-io/gitpod/downloads","issues_url":"https://api.github.com/repos/gitpod-io/gitpod/issues{/number}","pulls_url":"https://api.github.com/repos/gitpod-io/gitpod/pulls{/number}","milestones_url":"https://api.github.com/repos/gitpod-io/gitpod/milestones{/number}","notifications_url":"https://api.github.com/repos/gitpod-io/gitpod/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gitpod-io/gitpod/labels{/name}","releases_url":"https://api.github.com/repos/gitpod-io/gitpod/releases{/id}","deployments_url":"https://api.github.com/repos/gitpod-io/gitpod/deployments","created_at":"2018-04-24T15:56:54Z","updated_at":"2021-07-21T07:36:46Z","pushed_at":"2021-07-21T07:59:25Z","git_url":"git://github.com/gitpod-io/gitpod.git","ssh_url":"git@github.com:gitpod-io/gitpod.git","clone_url":"https://github.com/gitpod-io/gitpod.git","svn_url":"https://github.com/gitpod-io/gitpod","homepage":"https://gitpod.io","size":46869,"stargazers_count":4483,"watchers_count":4483,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":530,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":394,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":530,"open_issues":394,"watchers":4483,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631"},"html":{"href":"https://github.com/gitpod-io/gitpod/pull/4631"},"issue":{"href":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631"},"comments":{"href":"https://api.github.com/repos/gitpod-io/gitpod/issues/4631/comments"},"review_comments":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/comments"},"review_comment":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gitpod-io/gitpod/pulls/4631/commits"},"statuses":{"href":"https://api.github.com/repos/gitpod-io/gitpod/statuses/8601021844904dcd946b303258e7d1f71cf4a7b6"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:01Z","org":{"id":37021919,"login":"gitpod-io","gravatar_id":"","url":"https://api.github.com/orgs/gitpod-io","avatar_url":"https://avatars.githubusercontent.com/u/37021919?"}}
+{"id":"17245514907","type":"CreateEvent","actor":{"id":52290251,"login":"botcopado","display_login":"botcopado","gravatar_id":"","url":"https://api.github.com/users/botcopado","avatar_url":"https://avatars.githubusercontent.com/u/52290251?"},"repo":{"id":388040565,"name":"botcopado/moeldv_YBFPER8P","url":"https://api.github.com/repos/botcopado/moeldv_YBFPER8P"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514908","type":"PushEvent","actor":{"id":8111373,"login":"neocarto","display_login":"neocarto","gravatar_id":"","url":"https://api.github.com/users/neocarto","avatar_url":"https://avatars.githubusercontent.com/u/8111373?"},"repo":{"id":388028387,"name":"neocarto/cv","url":"https://api.github.com/repos/neocarto/cv"},"payload":{"push_id":7562055114,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"0345269f2cef1e280450b16f260aed34023340e0","before":"37ce16c4f7a879d769e950fcfdc73d10fba8d21c","commits":[{"sha":"0345269f2cef1e280450b16f260aed34023340e0","author":{"name":"Nicolas LAMBERT","email":"1aaec5f0bf5fb2c6a413b1cd6b8525d76afb0aee@ums-riate.fr"},"message":"Set theme jekyll-theme-hacker","distinct":true,"url":"https://api.github.com/repos/neocarto/cv/commits/0345269f2cef1e280450b16f260aed34023340e0"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514910","type":"PushEvent","actor":{"id":62052913,"login":"venkuppu-chn","display_login":"venkuppu-chn","gravatar_id":"","url":"https://api.github.com/users/venkuppu-chn","avatar_url":"https://avatars.githubusercontent.com/u/62052913?"},"repo":{"id":385274986,"name":"venkuppu-chn/cortx-hare","url":"https://api.github.com/repos/venkuppu-chn/cortx-hare"},"payload":{"push_id":7562055086,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"416863176f1fe09a6b23156316ad9878113fc98d","before":"254735da6d7fa2838abf48627cfb585a12cdca04","commits":[{"sha":"4838966677335e718d32cae1a70f78c8110bac96","author":{"name":"Venkatesh K","email":"70057838534969e1bdb576aea65bfd755d9ec4bb@seagate.com"},"message":"Alex is the tool used to scan inclusive words\n\nSigned-off-by: Venkatesh K <venkatesh.k@seagate.com>","distinct":true,"url":"https://api.github.com/repos/venkuppu-chn/cortx-hare/commits/4838966677335e718d32cae1a70f78c8110bac96"},{"sha":"416863176f1fe09a6b23156316ad9878113fc98d","author":{"name":"Venkatesh K","email":"70057838534969e1bdb576aea65bfd755d9ec4bb@seagate.com"},"message":"Merge remote-tracking branch 'origin/main' into main","distinct":true,"url":"https://api.github.com/repos/venkuppu-chn/cortx-hare/commits/416863176f1fe09a6b23156316ad9878113fc98d"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514912","type":"CreateEvent","actor":{"id":25700305,"login":"lsylo","display_login":"lsylo","gravatar_id":"","url":"https://api.github.com/users/lsylo","avatar_url":"https://avatars.githubusercontent.com/u/25700305?"},"repo":{"id":388040383,"name":"lsylo/income-report","url":"https://api.github.com/repos/lsylo/income-report"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514915","type":"WatchEvent","actor":{"id":10071813,"login":"caixiangyue","display_login":"caixiangyue","gravatar_id":"","url":"https://api.github.com/users/caixiangyue","avatar_url":"https://avatars.githubusercontent.com/u/10071813?"},"repo":{"id":283410102,"name":"sogou/workflow","url":"https://api.github.com/repos/sogou/workflow"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":15903299,"login":"sogou","gravatar_id":"","url":"https://api.github.com/orgs/sogou","avatar_url":"https://avatars.githubusercontent.com/u/15903299?"}}
+{"id":"17245514922","type":"CreateEvent","actor":{"id":67758551,"login":"lee857","display_login":"lee857","gravatar_id":"","url":"https://api.github.com/users/lee857","avatar_url":"https://avatars.githubusercontent.com/u/67758551?"},"repo":{"id":388040567,"name":"lee857/portfolio-project","url":"https://api.github.com/repos/lee857/portfolio-project"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514938","type":"PullRequestReviewEvent","actor":{"id":572898,"login":"DRiKE","display_login":"DRiKE","gravatar_id":"","url":"https://api.github.com/users/DRiKE","avatar_url":"https://avatars.githubusercontent.com/u/572898?"},"repo":{"id":142451959,"name":"NLnetLabs/routinator","url":"https://api.github.com/repos/NLnetLabs/routinator"},"payload":{"action":"created","review":{"id":711364891,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzY0ODkx","user":{"login":"DRiKE","id":572898,"node_id":"MDQ6VXNlcjU3Mjg5OA==","avatar_url":"https://avatars.githubusercontent.com/u/572898?v=4","gravatar_id":"","url":"https://api.github.com/users/DRiKE","html_url":"https://github.com/DRiKE","followers_url":"https://api.github.com/users/DRiKE/followers","following_url":"https://api.github.com/users/DRiKE/following{/other_user}","gists_url":"https://api.github.com/users/DRiKE/gists{/gist_id}","starred_url":"https://api.github.com/users/DRiKE/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DRiKE/subscriptions","organizations_url":"https://api.github.com/users/DRiKE/orgs","repos_url":"https://api.github.com/users/DRiKE/repos","events_url":"https://api.github.com/users/DRiKE/events{/privacy}","received_events_url":"https://api.github.com/users/DRiKE/received_events","type":"User","site_admin":false},"body":"","commit_id":"30dda575993ab37182615623eb0b274952043df6","submitted_at":"2021-07-21T08:00:01Z","state":"approved","html_url":"https://github.com/NLnetLabs/routinator/pull/611#pullrequestreview-711364891","pull_request_url":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/NLnetLabs/routinator/pull/611#pullrequestreview-711364891"},"pull_request":{"href":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611"}}},"pull_request":{"url":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611","id":693370658,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMzcwNjU4","html_url":"https://github.com/NLnetLabs/routinator/pull/611","diff_url":"https://github.com/NLnetLabs/routinator/pull/611.diff","patch_url":"https://github.com/NLnetLabs/routinator/pull/611.patch","issue_url":"https://api.github.com/repos/NLnetLabs/routinator/issues/611","number":611,"state":"open","locked":false,"title":"Set the RRDP connect timeout from the correct command line option.","user":{"login":"partim","id":1318494,"node_id":"MDQ6VXNlcjEzMTg0OTQ=","avatar_url":"https://avatars.githubusercontent.com/u/1318494?v=4","gravatar_id":"","url":"https://api.github.com/users/partim","html_url":"https://github.com/partim","followers_url":"https://api.github.com/users/partim/followers","following_url":"https://api.github.com/users/partim/following{/other_user}","gists_url":"https://api.github.com/users/partim/gists{/gist_id}","starred_url":"https://api.github.com/users/partim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/partim/subscriptions","organizations_url":"https://api.github.com/users/partim/orgs","repos_url":"https://api.github.com/users/partim/repos","events_url":"https://api.github.com/users/partim/events{/privacy}","received_events_url":"https://api.github.com/users/partim/received_events","type":"User","site_admin":false},"body":"Currently, the option is set from the `rrdp-timeout` command line option rather than `rrdp-connect-timeout`.","created_at":"2021-07-20T11:03:08Z","updated_at":"2021-07-21T08:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f05faf3efac2f9389ce1ea0dcf28b5d03d9d8675","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611/commits","review_comments_url":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611/comments","review_comment_url":"https://api.github.com/repos/NLnetLabs/routinator/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NLnetLabs/routinator/issues/611/comments","statuses_url":"https://api.github.com/repos/NLnetLabs/routinator/statuses/30dda575993ab37182615623eb0b274952043df6","head":{"label":"NLnetLabs:rrdp-connect-timeout-fix","ref":"rrdp-connect-timeout-fix","sha":"30dda575993ab37182615623eb0b274952043df6","user":{"login":"NLnetLabs","id":1895545,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE4OTU1NDU=","avatar_url":"https://avatars.githubusercontent.com/u/1895545?v=4","gravatar_id":"","url":"https://api.github.com/users/NLnetLabs","html_url":"https://github.com/NLnetLabs","followers_url":"https://api.github.com/users/NLnetLabs/followers","following_url":"https://api.github.com/users/NLnetLabs/following{/other_user}","gists_url":"https://api.github.com/users/NLnetLabs/gists{/gist_id}","starred_url":"https://api.github.com/users/NLnetLabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NLnetLabs/subscriptions","organizations_url":"https://api.github.com/users/NLnetLabs/orgs","repos_url":"https://api.github.com/users/NLnetLabs/repos","events_url":"https://api.github.com/users/NLnetLabs/events{/privacy}","received_events_url":"https://api.github.com/users/NLnetLabs/received_events","type":"Organization","site_admin":false},"repo":{"id":142451959,"node_id":"MDEwOlJlcG9zaXRvcnkxNDI0NTE5NTk=","name":"routinator","full_name":"NLnetLabs/routinator","private":false,"owner":{"login":"NLnetLabs","id":1895545,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE4OTU1NDU=","avatar_url":"https://avatars.githubusercontent.com/u/1895545?v=4","gravatar_id":"","url":"https://api.github.com/users/NLnetLabs","html_url":"https://github.com/NLnetLabs","followers_url":"https://api.github.com/users/NLnetLabs/followers","following_url":"https://api.github.com/users/NLnetLabs/following{/other_user}","gists_url":"https://api.github.com/users/NLnetLabs/gists{/gist_id}","starred_url":"https://api.github.com/users/NLnetLabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NLnetLabs/subscriptions","organizations_url":"https://api.github.com/users/NLnetLabs/orgs","repos_url":"https://api.github.com/users/NLnetLabs/repos","events_url":"https://api.github.com/users/NLnetLabs/events{/privacy}","received_events_url":"https://api.github.com/users/NLnetLabs/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/NLnetLabs/routinator","description":"An RPKI Validator written in Rust","fork":false,"url":"https://api.github.com/repos/NLnetLabs/routinator","forks_url":"https://api.github.com/repos/NLnetLabs/routinator/forks","keys_url":"https://api.github.com/repos/NLnetLabs/routinator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NLnetLabs/routinator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NLnetLabs/routinator/teams","hooks_url":"https://api.github.com/repos/NLnetLabs/routinator/hooks","issue_events_url":"https://api.github.com/repos/NLnetLabs/routinator/issues/events{/number}","events_url":"https://api.github.com/repos/NLnetLabs/routinator/events","assignees_url":"https://api.github.com/repos/NLnetLabs/routinator/assignees{/user}","branches_url":"https://api.github.com/repos/NLnetLabs/routinator/branches{/branch}","tags_url":"https://api.github.com/repos/NLnetLabs/routinator/tags","blobs_url":"https://api.github.com/repos/NLnetLabs/routinator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NLnetLabs/routinator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NLnetLabs/routinator/git/refs{/sha}","trees_url":"https://api.github.com/repos/NLnetLabs/routinator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NLnetLabs/routinator/statuses/{sha}","languages_url":"https://api.github.com/repos/NLnetLabs/routinator/languages","stargazers_url":"https://api.github.com/repos/NLnetLabs/routinator/stargazers","contributors_url":"https://api.github.com/repos/NLnetLabs/routinator/contributors","subscribers_url":"https://api.github.com/repos/NLnetLabs/routinator/subscribers","subscription_url":"https://api.github.com/repos/NLnetLabs/routinator/subscription","commits_url":"https://api.github.com/repos/NLnetLabs/routinator/commits{/sha}","git_commits_url":"https://api.github.com/repos/NLnetLabs/routinator/git/commits{/sha}","comments_url":"https://api.github.com/repos/NLnetLabs/routinator/comments{/number}","issue_comment_url":"https://api.github.com/repos/NLnetLabs/routinator/issues/comments{/number}","contents_url":"https://api.github.com/repos/NLnetLabs/routinator/contents/{+path}","compare_url":"https://api.github.com/repos/NLnetLabs/routinator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NLnetLabs/routinator/merges","archive_url":"https://api.github.com/repos/NLnetLabs/routinator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NLnetLabs/routinator/downloads","issues_url":"https://api.github.com/repos/NLnetLabs/routinator/issues{/number}","pulls_url":"https://api.github.com/repos/NLnetLabs/routinator/pulls{/number}","milestones_url":"https://api.github.com/repos/NLnetLabs/routinator/milestones{/number}","notifications_url":"https://api.github.com/repos/NLnetLabs/routinator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NLnetLabs/routinator/labels{/name}","releases_url":"https://api.github.com/repos/NLnetLabs/routinator/releases{/id}","deployments_url":"https://api.github.com/repos/NLnetLabs/routinator/deployments","created_at":"2018-07-26T14:24:08Z","updated_at":"2021-07-20T10:05:33Z","pushed_at":"2021-07-20T12:42:28Z","git_url":"git://github.com/NLnetLabs/routinator.git","ssh_url":"git@github.com:NLnetLabs/routinator.git","clone_url":"https://github.com/NLnetLabs/routinator.git","svn_url":"https://github.com/NLnetLabs/routinator","homepage":"https://nlnetlabs.nl/rpki","size":6014,"stargazers_count":249,"watchers_count":249,"language":"Rust","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":43,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":52,"license":{"key":"bsd-3-clause","name":"BSD 3-Clause \"New\" or \"Revised\" License","spdx_id":"BSD-3-Clause","url":"https://api.github.com/licenses/bsd-3-clause","node_id":"MDc6TGljZW5zZTU="},"forks":43,"open_issues":52,"watchers":249,"default_branch":"main"}},"base":{"label":"NLnetLabs:main","ref":"main","sha":"d838a43f2fd005f70a550bbd0cd91cfefa42e431","user":{"login":"NLnetLabs","id":1895545,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE4OTU1NDU=","avatar_url":"https://avatars.githubusercontent.com/u/1895545?v=4","gravatar_id":"","url":"https://api.github.com/users/NLnetLabs","html_url":"https://github.com/NLnetLabs","followers_url":"https://api.github.com/users/NLnetLabs/followers","following_url":"https://api.github.com/users/NLnetLabs/following{/other_user}","gists_url":"https://api.github.com/users/NLnetLabs/gists{/gist_id}","starred_url":"https://api.github.com/users/NLnetLabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NLnetLabs/subscriptions","organizations_url":"https://api.github.com/users/NLnetLabs/orgs","repos_url":"https://api.github.com/users/NLnetLabs/repos","events_url":"https://api.github.com/users/NLnetLabs/events{/privacy}","received_events_url":"https://api.github.com/users/NLnetLabs/received_events","type":"Organization","site_admin":false},"repo":{"id":142451959,"node_id":"MDEwOlJlcG9zaXRvcnkxNDI0NTE5NTk=","name":"routinator","full_name":"NLnetLabs/routinator","private":false,"owner":{"login":"NLnetLabs","id":1895545,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE4OTU1NDU=","avatar_url":"https://avatars.githubusercontent.com/u/1895545?v=4","gravatar_id":"","url":"https://api.github.com/users/NLnetLabs","html_url":"https://github.com/NLnetLabs","followers_url":"https://api.github.com/users/NLnetLabs/followers","following_url":"https://api.github.com/users/NLnetLabs/following{/other_user}","gists_url":"https://api.github.com/users/NLnetLabs/gists{/gist_id}","starred_url":"https://api.github.com/users/NLnetLabs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NLnetLabs/subscriptions","organizations_url":"https://api.github.com/users/NLnetLabs/orgs","repos_url":"https://api.github.com/users/NLnetLabs/repos","events_url":"https://api.github.com/users/NLnetLabs/events{/privacy}","received_events_url":"https://api.github.com/users/NLnetLabs/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/NLnetLabs/routinator","description":"An RPKI Validator written in Rust","fork":false,"url":"https://api.github.com/repos/NLnetLabs/routinator","forks_url":"https://api.github.com/repos/NLnetLabs/routinator/forks","keys_url":"https://api.github.com/repos/NLnetLabs/routinator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NLnetLabs/routinator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NLnetLabs/routinator/teams","hooks_url":"https://api.github.com/repos/NLnetLabs/routinator/hooks","issue_events_url":"https://api.github.com/repos/NLnetLabs/routinator/issues/events{/number}","events_url":"https://api.github.com/repos/NLnetLabs/routinator/events","assignees_url":"https://api.github.com/repos/NLnetLabs/routinator/assignees{/user}","branches_url":"https://api.github.com/repos/NLnetLabs/routinator/branches{/branch}","tags_url":"https://api.github.com/repos/NLnetLabs/routinator/tags","blobs_url":"https://api.github.com/repos/NLnetLabs/routinator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NLnetLabs/routinator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NLnetLabs/routinator/git/refs{/sha}","trees_url":"https://api.github.com/repos/NLnetLabs/routinator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NLnetLabs/routinator/statuses/{sha}","languages_url":"https://api.github.com/repos/NLnetLabs/routinator/languages","stargazers_url":"https://api.github.com/repos/NLnetLabs/routinator/stargazers","contributors_url":"https://api.github.com/repos/NLnetLabs/routinator/contributors","subscribers_url":"https://api.github.com/repos/NLnetLabs/routinator/subscribers","subscription_url":"https://api.github.com/repos/NLnetLabs/routinator/subscription","commits_url":"https://api.github.com/repos/NLnetLabs/routinator/commits{/sha}","git_commits_url":"https://api.github.com/repos/NLnetLabs/routinator/git/commits{/sha}","comments_url":"https://api.github.com/repos/NLnetLabs/routinator/comments{/number}","issue_comment_url":"https://api.github.com/repos/NLnetLabs/routinator/issues/comments{/number}","contents_url":"https://api.github.com/repos/NLnetLabs/routinator/contents/{+path}","compare_url":"https://api.github.com/repos/NLnetLabs/routinator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NLnetLabs/routinator/merges","archive_url":"https://api.github.com/repos/NLnetLabs/routinator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NLnetLabs/routinator/downloads","issues_url":"https://api.github.com/repos/NLnetLabs/routinator/issues{/number}","pulls_url":"https://api.github.com/repos/NLnetLabs/routinator/pulls{/number}","milestones_url":"https://api.github.com/repos/NLnetLabs/routinator/milestones{/number}","notifications_url":"https://api.github.com/repos/NLnetLabs/routinator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NLnetLabs/routinator/labels{/name}","releases_url":"https://api.github.com/repos/NLnetLabs/routinator/releases{/id}","deployments_url":"https://api.github.com/repos/NLnetLabs/routinator/deployments","created_at":"2018-07-26T14:24:08Z","updated_at":"2021-07-20T10:05:33Z","pushed_at":"2021-07-20T12:42:28Z","git_url":"git://github.com/NLnetLabs/routinator.git","ssh_url":"git@github.com:NLnetLabs/routinator.git","clone_url":"https://github.com/NLnetLabs/routinator.git","svn_url":"https://github.com/NLnetLabs/routinator","homepage":"https://nlnetlabs.nl/rpki","size":6014,"stargazers_count":249,"watchers_count":249,"language":"Rust","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":43,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":52,"license":{"key":"bsd-3-clause","name":"BSD 3-Clause \"New\" or \"Revised\" License","spdx_id":"BSD-3-Clause","url":"https://api.github.com/licenses/bsd-3-clause","node_id":"MDc6TGljZW5zZTU="},"forks":43,"open_issues":52,"watchers":249,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611"},"html":{"href":"https://github.com/NLnetLabs/routinator/pull/611"},"issue":{"href":"https://api.github.com/repos/NLnetLabs/routinator/issues/611"},"comments":{"href":"https://api.github.com/repos/NLnetLabs/routinator/issues/611/comments"},"review_comments":{"href":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611/comments"},"review_comment":{"href":"https://api.github.com/repos/NLnetLabs/routinator/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NLnetLabs/routinator/pulls/611/commits"},"statuses":{"href":"https://api.github.com/repos/NLnetLabs/routinator/statuses/30dda575993ab37182615623eb0b274952043df6"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":1895545,"login":"NLnetLabs","gravatar_id":"","url":"https://api.github.com/orgs/NLnetLabs","avatar_url":"https://avatars.githubusercontent.com/u/1895545?"}}
+{"id":"17245514939","type":"MemberEvent","actor":{"id":87553686,"login":"danhnguyen2","display_login":"danhnguyen2","gravatar_id":"","url":"https://api.github.com/users/danhnguyen2","avatar_url":"https://avatars.githubusercontent.com/u/87553686?"},"repo":{"id":386809027,"name":"danhnguyen2/TeamA","url":"https://api.github.com/repos/danhnguyen2/TeamA"},"payload":{"member":{"login":"Fabianlatina16","id":87752576,"node_id":"MDQ6VXNlcjg3NzUyNTc2","avatar_url":"https://avatars.githubusercontent.com/u/87752576?v=4","gravatar_id":"","url":"https://api.github.com/users/Fabianlatina16","html_url":"https://github.com/Fabianlatina16","followers_url":"https://api.github.com/users/Fabianlatina16/followers","following_url":"https://api.github.com/users/Fabianlatina16/following{/other_user}","gists_url":"https://api.github.com/users/Fabianlatina16/gists{/gist_id}","starred_url":"https://api.github.com/users/Fabianlatina16/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Fabianlatina16/subscriptions","organizations_url":"https://api.github.com/users/Fabianlatina16/orgs","repos_url":"https://api.github.com/users/Fabianlatina16/repos","events_url":"https://api.github.com/users/Fabianlatina16/events{/privacy}","received_events_url":"https://api.github.com/users/Fabianlatina16/received_events","type":"User","site_admin":false},"action":"added"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514943","type":"WatchEvent","actor":{"id":15075638,"login":"Fasjeit","display_login":"Fasjeit","gravatar_id":"","url":"https://api.github.com/users/Fasjeit","avatar_url":"https://avatars.githubusercontent.com/u/15075638?"},"repo":{"id":42267778,"name":"NuGetPackageExplorer/NuGetPackageExplorer","url":"https://api.github.com/repos/NuGetPackageExplorer/NuGetPackageExplorer"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":15967039,"login":"NuGetPackageExplorer","gravatar_id":"","url":"https://api.github.com/orgs/NuGetPackageExplorer","avatar_url":"https://avatars.githubusercontent.com/u/15967039?"}}
+{"id":"17245514950","type":"PushEvent","actor":{"id":52290251,"login":"botcopado","display_login":"botcopado","gravatar_id":"","url":"https://api.github.com/users/botcopado","avatar_url":"https://avatars.githubusercontent.com/u/52290251?"},"repo":{"id":388040370,"name":"botcopado/moeldv_QSOJVUTM","url":"https://api.github.com/repos/botcopado/moeldv_QSOJVUTM"},"payload":{"push_id":7562055116,"size":4,"distinct_size":0,"ref":"refs/heads/promotion/P25615-MOEDeployment","head":"692b977d32460e74ac35c95a30acbce734454787","before":"93d1fb4fb6e7902ae9084f0e4a4cdead533aeb7e","commits":[{"sha":"f869f9d82d1a046fd8264a1ca04023027de9e5bc","author":{"name":"Test QA User","email":"0aeb9bf205e33c465a83ad48c5898f09dd71cceb@copado.com"},"message":"Bot initialization","distinct":false,"url":"https://api.github.com/repos/botcopado/moeldv_QSOJVUTM/commits/f869f9d82d1a046fd8264a1ca04023027de9e5bc"},{"sha":"18b8f37bf65aaca74b5f4598bc5ae5f19f50b322","author":{"name":"Test QA User","email":"0aeb9bf205e33c465a83ad48c5898f09dd71cceb@copado.com"},"message":"Bot initialization","distinct":false,"url":"https://api.github.com/repos/botcopado/moeldv_QSOJVUTM/commits/18b8f37bf65aaca74b5f4598bc5ae5f19f50b322"},{"sha":"c93c876fd4ec8a45c3dc4b0440775058e8d12846","author":{"name":"Test QA User","email":"0aeb9bf205e33c465a83ad48c5898f09dd71cceb@copado.com"},"message":"Bot initialization","distinct":false,"url":"https://api.github.com/repos/botcopado/moeldv_QSOJVUTM/commits/c93c876fd4ec8a45c3dc4b0440775058e8d12846"},{"sha":"692b977d32460e74ac35c95a30acbce734454787","author":{"name":"Test QA User","email":"0aeb9bf205e33c465a83ad48c5898f09dd71cceb@copado.com"},"message":"Bot initialization","distinct":false,"url":"https://api.github.com/repos/botcopado/moeldv_QSOJVUTM/commits/692b977d32460e74ac35c95a30acbce734454787"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514962","type":"PushEvent","actor":{"id":81859158,"login":"cherin0115","display_login":"cherin0115","gravatar_id":"","url":"https://api.github.com/users/cherin0115","avatar_url":"https://avatars.githubusercontent.com/u/81859158?"},"repo":{"id":387420703,"name":"cherin0115/dothome21","url":"https://api.github.com/repos/cherin0115/dothome21"},"payload":{"push_id":7562055130,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f71745b391ebdd0384891aaabed74a5ceb8a8ab2","before":"f436fe6c85d990d56dcb0d808cd202a6c89ccb46","commits":[{"sha":"f71745b391ebdd0384891aaabed74a5ceb8a8ab2","author":{"name":"cherin0115","email":"bb8e7d489e5f40465bb4a825ee8d35c5a8846137@gmail.com"},"message":"layout06 added","distinct":true,"url":"https://api.github.com/repos/cherin0115/dothome21/commits/f71745b391ebdd0384891aaabed74a5ceb8a8ab2"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514968","type":"IssueCommentEvent","actor":{"id":8723280,"login":"OCA-git-bot","display_login":"OCA-git-bot","gravatar_id":"","url":"https://api.github.com/users/OCA-git-bot","avatar_url":"https://avatars.githubusercontent.com/u/8723280?"},"repo":{"id":265171081,"name":"OCA/dms","url":"https://api.github.com/repos/OCA/dms"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/OCA/dms/issues/117","repository_url":"https://api.github.com/repos/OCA/dms","labels_url":"https://api.github.com/repos/OCA/dms/issues/117/labels{/name}","comments_url":"https://api.github.com/repos/OCA/dms/issues/117/comments","events_url":"https://api.github.com/repos/OCA/dms/issues/117/events","html_url":"https://github.com/OCA/dms/pull/117","id":943237344,"node_id":"MDExOlB1bGxSZXF1ZXN0Njg4ODg2MTkz","number":117,"title":"[13.0][IMP+FIX] dms: Changes in file tree view + Fix file preview.","user":{"login":"victoralmau","id":4117568,"node_id":"MDQ6VXNlcjQxMTc1Njg=","avatar_url":"https://avatars.githubusercontent.com/u/4117568?v=4","gravatar_id":"","url":"https://api.github.com/users/victoralmau","html_url":"https://github.com/victoralmau","followers_url":"https://api.github.com/users/victoralmau/followers","following_url":"https://api.github.com/users/victoralmau/following{/other_user}","gists_url":"https://api.github.com/users/victoralmau/gists{/gist_id}","starred_url":"https://api.github.com/users/victoralmau/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/victoralmau/subscriptions","organizations_url":"https://api.github.com/users/victoralmau/orgs","repos_url":"https://api.github.com/users/victoralmau/repos","events_url":"https://api.github.com/users/victoralmau/events{/privacy}","received_events_url":"https://api.github.com/users/victoralmau/received_events","type":"User","site_admin":false},"labels":[{"id":2192238558,"node_id":"MDU6TGFiZWwyMTkyMjM4NTU4","url":"https://api.github.com/repos/OCA/dms/labels/approved","name":"approved","color":"045509","default":false,"description":null},{"id":2185119623,"node_id":"MDU6TGFiZWwyMTg1MTE5NjIz","url":"https://api.github.com/repos/OCA/dms/labels/bot%20is%20merging%20%E2%8F%B3","name":"bot is merging ⏳","color":"ededed","default":false,"description":null},{"id":2433081496,"node_id":"MDU6TGFiZWwyNDMzMDgxNDk2","url":"https://api.github.com/repos/OCA/dms/labels/ready%20to%20merge","name":"ready to merge","color":"bfdadc","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":{"url":"https://api.github.com/repos/OCA/dms/milestones/1","html_url":"https://github.com/OCA/dms/milestone/1","labels_url":"https://api.github.com/repos/OCA/dms/milestones/1/labels","id":5439894,"node_id":"MDk6TWlsZXN0b25lNTQzOTg5NA==","number":1,"title":"13.0","description":null,"creator":{"login":"pedrobaeza","id":7165771,"node_id":"MDQ6VXNlcjcxNjU3NzE=","avatar_url":"https://avatars.githubusercontent.com/u/7165771?v=4","gravatar_id":"","url":"https://api.github.com/users/pedrobaeza","html_url":"https://github.com/pedrobaeza","followers_url":"https://api.github.com/users/pedrobaeza/followers","following_url":"https://api.github.com/users/pedrobaeza/following{/other_user}","gists_url":"https://api.github.com/users/pedrobaeza/gists{/gist_id}","starred_url":"https://api.github.com/users/pedrobaeza/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pedrobaeza/subscriptions","organizations_url":"https://api.github.com/users/pedrobaeza/orgs","repos_url":"https://api.github.com/users/pedrobaeza/repos","events_url":"https://api.github.com/users/pedrobaeza/events{/privacy}","received_events_url":"https://api.github.com/users/pedrobaeza/received_events","type":"User","site_admin":false},"open_issues":5,"closed_issues":30,"state":"open","created_at":"2020-05-19T15:04:01Z","updated_at":"2021-07-20T09:14:11Z","due_on":null,"closed_at":null},"comments":4,"created_at":"2021-07-13T11:42:12Z","updated_at":"2021-07-21T08:00:02Z","closed_at":null,"author_association":"MEMBER","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/OCA/dms/pulls/117","html_url":"https://github.com/OCA/dms/pull/117","diff_url":"https://github.com/OCA/dms/pull/117.diff","patch_url":"https://github.com/OCA/dms/pull/117.patch"},"body":"[IMP] Changes in file tree view (It's necessary to change in 14.0)\r\n[FIX] File preview.\r\n[IMP ]Show in directory kanban view only root directories (Change **All** text to **Root**) + Change to searchpanel _directory_id_ (in files) or _parent_id_ (in directories) to filter equal and not _child_of_ (It's related to https://github.com/OCA/dms/issues/40 )\r\n\r\nLocked by:\r\n- [x] https://github.com/OCA/social/pull/744\r\n\r\nPlease @pedrobaeza and @Yajo can you review it?\r\n\r\n@Tecnativa TT30992","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/OCA/dms/issues/comments/883977116","html_url":"https://github.com/OCA/dms/pull/117#issuecomment-883977116","issue_url":"https://api.github.com/repos/OCA/dms/issues/117","id":883977116,"node_id":"IC_kwDOD84wic40sGuc","user":{"login":"OCA-git-bot","id":8723280,"node_id":"MDQ6VXNlcjg3MjMyODA=","avatar_url":"https://avatars.githubusercontent.com/u/8723280?v=4","gravatar_id":"","url":"https://api.github.com/users/OCA-git-bot","html_url":"https://github.com/OCA-git-bot","followers_url":"https://api.github.com/users/OCA-git-bot/followers","following_url":"https://api.github.com/users/OCA-git-bot/following{/other_user}","gists_url":"https://api.github.com/users/OCA-git-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/OCA-git-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OCA-git-bot/subscriptions","organizations_url":"https://api.github.com/users/OCA-git-bot/orgs","repos_url":"https://api.github.com/users/OCA-git-bot/repos","events_url":"https://api.github.com/users/OCA-git-bot/events{/privacy}","received_events_url":"https://api.github.com/users/OCA-git-bot/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:02Z","updated_at":"2021-07-21T08:00:02Z","author_association":"CONTRIBUTOR","body":"This PR has the `approved` label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":7600578,"login":"OCA","gravatar_id":"","url":"https://api.github.com/orgs/OCA","avatar_url":"https://avatars.githubusercontent.com/u/7600578?"}}
+{"id":"17245514971","type":"PushEvent","actor":{"id":25141652,"login":"15826954460","display_login":"15826954460","gravatar_id":"","url":"https://api.github.com/users/15826954460","avatar_url":"https://avatars.githubusercontent.com/u/25141652?"},"repo":{"id":363316501,"name":"15826954460/code_stage","url":"https://api.github.com/repos/15826954460/code_stage"},"payload":{"push_id":7562055132,"size":1,"distinct_size":1,"ref":"refs/heads/feat_equipment","head":"409156fc4c5fad9b612dc0fef82c42ad5d535066","before":"2957f3ef4415b35db9f72ac1d838a86c8d7c9fc4","commits":[{"sha":"409156fc4c5fad9b612dc0fef82c42ad5d535066","author":{"name":"xuLady","email":"b0cc720fb65056526a29317a32782e802f4558aa@qq.com"},"message":"设备展示table增加删除功能","distinct":true,"url":"https://api.github.com/repos/15826954460/code_stage/commits/409156fc4c5fad9b612dc0fef82c42ad5d535066"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514972","type":"PushEvent","actor":{"id":85989057,"login":"internetzbot","display_login":"internetzbot","gravatar_id":"","url":"https://api.github.com/users/internetzbot","avatar_url":"https://avatars.githubusercontent.com/u/85989057?"},"repo":{"id":377260146,"name":"internetztube/jaukerl-ooe-archive","url":"https://api.github.com/repos/internetztube/jaukerl-ooe-archive"},"payload":{"push_id":7562055134,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"bf6c4a186e636099e5402a87fdea0dc43a3e3871","before":"95d2922fb3f34dcbb385a4a7870f57431d9b8291","commits":[{"sha":"bf6c4a186e636099e5402a87fdea0dc43a3e3871","author":{"name":"internetzbot","email":"c5d6e309f28eeb1bf280506bcf24a90da3518803@users.noreply.github.com"},"message":"Add 2021-07-21T08:00:00+00:00.json.","distinct":true,"url":"https://api.github.com/repos/internetztube/jaukerl-ooe-archive/commits/bf6c4a186e636099e5402a87fdea0dc43a3e3871"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514986","type":"MemberEvent","actor":{"id":29756526,"login":"sinhaugoh","display_login":"sinhaugoh","gravatar_id":"","url":"https://api.github.com/users/sinhaugoh","avatar_url":"https://avatars.githubusercontent.com/u/29756526?"},"repo":{"id":387382376,"name":"sinhaugoh/DEALL","url":"https://api.github.com/repos/sinhaugoh/DEALL"},"payload":{"member":{"login":"lawrencehsj","id":58553029,"node_id":"MDQ6VXNlcjU4NTUzMDI5","avatar_url":"https://avatars.githubusercontent.com/u/58553029?v=4","gravatar_id":"","url":"https://api.github.com/users/lawrencehsj","html_url":"https://github.com/lawrencehsj","followers_url":"https://api.github.com/users/lawrencehsj/followers","following_url":"https://api.github.com/users/lawrencehsj/following{/other_user}","gists_url":"https://api.github.com/users/lawrencehsj/gists{/gist_id}","starred_url":"https://api.github.com/users/lawrencehsj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lawrencehsj/subscriptions","organizations_url":"https://api.github.com/users/lawrencehsj/orgs","repos_url":"https://api.github.com/users/lawrencehsj/repos","events_url":"https://api.github.com/users/lawrencehsj/events{/privacy}","received_events_url":"https://api.github.com/users/lawrencehsj/received_events","type":"User","site_admin":false},"action":"added"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514995","type":"PushEvent","actor":{"id":39814207,"login":"pull[bot]","display_login":"pull","gravatar_id":"","url":"https://api.github.com/users/pull[bot]","avatar_url":"https://avatars.githubusercontent.com/u/39814207?"},"repo":{"id":375126034,"name":"rahil-sh/tutorials","url":"https://api.github.com/repos/rahil-sh/tutorials"},"payload":{"push_id":7562055143,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"1a07f9d2bfa2ba750598e8da153f101f645e35fe","before":"182dfd4e9f5f3d5a938eac648bea09a082ddc711","commits":[{"sha":"1a07f9d2bfa2ba750598e8da153f101f645e35fe","author":{"name":"Kai Yuan","email":"52df5956e44d56b84d70cabdc4e598a97da05809@Gmail.com"},"message":"add Phaser implementations (#11051)","distinct":true,"url":"https://api.github.com/repos/rahil-sh/tutorials/commits/1a07f9d2bfa2ba750598e8da153f101f645e35fe"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245514997","type":"PushEvent","actor":{"id":25363384,"login":"falconray0704","display_login":"falconray0704","gravatar_id":"","url":"https://api.github.com/users/falconray0704","avatar_url":"https://avatars.githubusercontent.com/u/25363384?"},"repo":{"id":197487628,"name":"falconray0704/dkhub","url":"https://api.github.com/repos/falconray0704/dkhub"},"payload":{"push_id":7562055146,"size":1,"distinct_size":1,"ref":"refs/heads/buildroot","head":"1bba46eedf69d8c42511044128ccb5a6f1e54799","before":"cce1224271a092369c4de7f5315cd54e93e936a8","commits":[{"sha":"1bba46eedf69d8c42511044128ccb5a6f1e54799","author":{"name":"FalconRay","email":"890c79e11e9583844fdcd8f5a2a105fcc05aab9f@yahoo.com"},"message":"Added missing package liblz4-tool into buildroot base image.","distinct":true,"url":"https://api.github.com/repos/falconray0704/dkhub/commits/1bba46eedf69d8c42511044128ccb5a6f1e54799"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515010","type":"ForkEvent","actor":{"id":1853707,"login":"samever7","display_login":"samever7","gravatar_id":"","url":"https://api.github.com/users/samever7","avatar_url":"https://avatars.githubusercontent.com/u/1853707?"},"repo":{"id":122696125,"name":"wb14123/seq2seq-couplet","url":"https://api.github.com/repos/wb14123/seq2seq-couplet"},"payload":{"forkee":{"id":388040569,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1Njk=","name":"seq2seq-couplet","full_name":"samever7/seq2seq-couplet","private":false,"owner":{"login":"samever7","id":1853707,"node_id":"MDQ6VXNlcjE4NTM3MDc=","avatar_url":"https://avatars.githubusercontent.com/u/1853707?v=4","gravatar_id":"","url":"https://api.github.com/users/samever7","html_url":"https://github.com/samever7","followers_url":"https://api.github.com/users/samever7/followers","following_url":"https://api.github.com/users/samever7/following{/other_user}","gists_url":"https://api.github.com/users/samever7/gists{/gist_id}","starred_url":"https://api.github.com/users/samever7/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/samever7/subscriptions","organizations_url":"https://api.github.com/users/samever7/orgs","repos_url":"https://api.github.com/users/samever7/repos","events_url":"https://api.github.com/users/samever7/events{/privacy}","received_events_url":"https://api.github.com/users/samever7/received_events","type":"User","site_admin":false},"html_url":"https://github.com/samever7/seq2seq-couplet","description":"Play couplet with seq2seq model. 用深度学习对对联。","fork":true,"url":"https://api.github.com/repos/samever7/seq2seq-couplet","forks_url":"https://api.github.com/repos/samever7/seq2seq-couplet/forks","keys_url":"https://api.github.com/repos/samever7/seq2seq-couplet/keys{/key_id}","collaborators_url":"https://api.github.com/repos/samever7/seq2seq-couplet/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/samever7/seq2seq-couplet/teams","hooks_url":"https://api.github.com/repos/samever7/seq2seq-couplet/hooks","issue_events_url":"https://api.github.com/repos/samever7/seq2seq-couplet/issues/events{/number}","events_url":"https://api.github.com/repos/samever7/seq2seq-couplet/events","assignees_url":"https://api.github.com/repos/samever7/seq2seq-couplet/assignees{/user}","branches_url":"https://api.github.com/repos/samever7/seq2seq-couplet/branches{/branch}","tags_url":"https://api.github.com/repos/samever7/seq2seq-couplet/tags","blobs_url":"https://api.github.com/repos/samever7/seq2seq-couplet/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/samever7/seq2seq-couplet/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/samever7/seq2seq-couplet/git/refs{/sha}","trees_url":"https://api.github.com/repos/samever7/seq2seq-couplet/git/trees{/sha}","statuses_url":"https://api.github.com/repos/samever7/seq2seq-couplet/statuses/{sha}","languages_url":"https://api.github.com/repos/samever7/seq2seq-couplet/languages","stargazers_url":"https://api.github.com/repos/samever7/seq2seq-couplet/stargazers","contributors_url":"https://api.github.com/repos/samever7/seq2seq-couplet/contributors","subscribers_url":"https://api.github.com/repos/samever7/seq2seq-couplet/subscribers","subscription_url":"https://api.github.com/repos/samever7/seq2seq-couplet/subscription","commits_url":"https://api.github.com/repos/samever7/seq2seq-couplet/commits{/sha}","git_commits_url":"https://api.github.com/repos/samever7/seq2seq-couplet/git/commits{/sha}","comments_url":"https://api.github.com/repos/samever7/seq2seq-couplet/comments{/number}","issue_comment_url":"https://api.github.com/repos/samever7/seq2seq-couplet/issues/comments{/number}","contents_url":"https://api.github.com/repos/samever7/seq2seq-couplet/contents/{+path}","compare_url":"https://api.github.com/repos/samever7/seq2seq-couplet/compare/{base}...{head}","merges_url":"https://api.github.com/repos/samever7/seq2seq-couplet/merges","archive_url":"https://api.github.com/repos/samever7/seq2seq-couplet/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/samever7/seq2seq-couplet/downloads","issues_url":"https://api.github.com/repos/samever7/seq2seq-couplet/issues{/number}","pulls_url":"https://api.github.com/repos/samever7/seq2seq-couplet/pulls{/number}","milestones_url":"https://api.github.com/repos/samever7/seq2seq-couplet/milestones{/number}","notifications_url":"https://api.github.com/repos/samever7/seq2seq-couplet/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/samever7/seq2seq-couplet/labels{/name}","releases_url":"https://api.github.com/repos/samever7/seq2seq-couplet/releases{/id}","deployments_url":"https://api.github.com/repos/samever7/seq2seq-couplet/deployments","created_at":"2021-07-21T08:00:01Z","updated_at":"2021-07-21T07:58:42Z","pushed_at":"2021-07-11T19:59:12Z","git_url":"git://github.com/samever7/seq2seq-couplet.git","ssh_url":"git@github.com:samever7/seq2seq-couplet.git","clone_url":"https://github.com/samever7/seq2seq-couplet.git","svn_url":"https://github.com/samever7/seq2seq-couplet","homepage":"https://ai.binwang.me/couplet","size":43,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515011","type":"CreateEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388040568,"name":"thatjohn01/753021085","url":"https://api.github.com/repos/thatjohn01/753021085"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":"西藏的孩子_PDF下载_鹰萨·罗布次仁著","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515013","type":"PushEvent","actor":{"id":33610328,"login":"hueleev","display_login":"hueleev","gravatar_id":"","url":"https://api.github.com/users/hueleev","avatar_url":"https://avatars.githubusercontent.com/u/33610328?"},"repo":{"id":379176062,"name":"hueleev/hueleev.github.io","url":"https://api.github.com/repos/hueleev/hueleev.github.io"},"payload":{"push_id":7562055138,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"14d6140537353706c4671531dd7d209859f55a35","before":"87e273b65b1b9e6c0fa42ffc5bddad5772948d69","commits":[{"sha":"15e4c6f62975f52cecaedb49845f610d775da99a","author":{"name":"hueleev","email":"1be3825e8327d2d8cc156260749f9bea0380490a@gmail.com"},"message":"test","distinct":true,"url":"https://api.github.com/repos/hueleev/hueleev.github.io/commits/15e4c6f62975f52cecaedb49845f610d775da99a"},{"sha":"14d6140537353706c4671531dd7d209859f55a35","author":{"name":"hueleev","email":"1be3825e8327d2d8cc156260749f9bea0380490a@gmail.com"},"message":"merge","distinct":true,"url":"https://api.github.com/repos/hueleev/hueleev.github.io/commits/14d6140537353706c4671531dd7d209859f55a35"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515021","type":"CreateEvent","actor":{"id":1473072,"login":"vitalets","display_login":"vitalets","gravatar_id":"","url":"https://api.github.com/users/vitalets","avatar_url":"https://avatars.githubusercontent.com/u/1473072?"},"repo":{"id":363393951,"name":"vitalets/skill-dev-proxy","url":"https://api.github.com/repos/vitalets/skill-dev-proxy"},"payload":{"ref":"v2.0.0","ref_type":"tag","master_branch":"main","description":"Навык для Алисы, позволяющий отлаживать другие навыки прямо на устройстве","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515030","type":"WatchEvent","actor":{"id":26359783,"login":"6451G","display_login":"6451G","gravatar_id":"","url":"https://api.github.com/users/6451G","avatar_url":"https://avatars.githubusercontent.com/u/26359783?"},"repo":{"id":15590229,"name":"agavrilov76/ExpectIt","url":"https://api.github.com/repos/agavrilov76/ExpectIt"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515056","type":"WatchEvent","actor":{"id":32321,"login":"fire","display_login":"fire","gravatar_id":"","url":"https://api.github.com/users/fire","avatar_url":"https://avatars.githubusercontent.com/u/32321?"},"repo":{"id":347974223,"name":"rmbashirov/rgbd-kinect-pose","url":"https://api.github.com/repos/rmbashirov/rgbd-kinect-pose"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515060","type":"CreateEvent","actor":{"id":29139614,"login":"renovate[bot]","display_login":"renovate","gravatar_id":"","url":"https://api.github.com/users/renovate[bot]","avatar_url":"https://avatars.githubusercontent.com/u/29139614?"},"repo":{"id":227850434,"name":"prisma/e2e-tests","url":"https://api.github.com/repos/prisma/e2e-tests"},"payload":{"ref":"renovate/supertest-6.x","ref_type":"branch","master_branch":"dev","description":"🥼🧬🧪🔬🧫🦠 - Continuously tests Prisma Client with various operating systems, frameworks, platforms, databases and more.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":17219288,"login":"prisma","gravatar_id":"","url":"https://api.github.com/orgs/prisma","avatar_url":"https://avatars.githubusercontent.com/u/17219288?"}}
+{"id":"17245515063","type":"WatchEvent","actor":{"id":58673464,"login":"demvictory","display_login":"demvictory","gravatar_id":"","url":"https://api.github.com/users/demvictory","avatar_url":"https://avatars.githubusercontent.com/u/58673464?"},"repo":{"id":137451403,"name":"alibaba/nacos","url":"https://api.github.com/repos/alibaba/nacos"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":1961952,"login":"alibaba","gravatar_id":"","url":"https://api.github.com/orgs/alibaba","avatar_url":"https://avatars.githubusercontent.com/u/1961952?"}}
+{"id":"17245515069","type":"WatchEvent","actor":{"id":32164846,"login":"Nek0Lex","display_login":"Nek0Lex","gravatar_id":"","url":"https://api.github.com/users/Nek0Lex","avatar_url":"https://avatars.githubusercontent.com/u/32164846?"},"repo":{"id":40484398,"name":"discordjs/discord.js","url":"https://api.github.com/repos/discordjs/discord.js"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":26492485,"login":"discordjs","gravatar_id":"","url":"https://api.github.com/orgs/discordjs","avatar_url":"https://avatars.githubusercontent.com/u/26492485?"}}
+{"id":"17245515095","type":"CreateEvent","actor":{"id":50545818,"login":"caasiremos","display_login":"caasiremos","gravatar_id":"","url":"https://api.github.com/users/caasiremos","avatar_url":"https://avatars.githubusercontent.com/u/50545818?"},"repo":{"id":388039591,"name":"caasiremos/wamu","url":"https://api.github.com/repos/caasiremos/wamu"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":"Rotational group savings","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515083","type":"PushEvent","actor":{"id":82778280,"login":"Muir-UCSB","display_login":"Muir-UCSB","gravatar_id":"","url":"https://api.github.com/users/Muir-UCSB","avatar_url":"https://avatars.githubusercontent.com/u/82778280?"},"repo":{"id":379011192,"name":"Muir-UCSB/AE_ML_Comparative","url":"https://api.github.com/repos/Muir-UCSB/AE_ML_Comparative"},"payload":{"push_id":7562055160,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"149e74e1d507c250e5bd1002934e96f118737d7b","before":"3472ea6377e2444001fd484770601aa714a2d194","commits":[{"sha":"149e74e1d507c250e5bd1002934e96f118737d7b","author":{"name":"Muir-UCSB","email":"e23d91b1baab4fcf66dd530cff3e5b556fe0b8ad@users.noreply.github.com"},"message":"Add files via upload","distinct":true,"url":"https://api.github.com/repos/Muir-UCSB/AE_ML_Comparative/commits/149e74e1d507c250e5bd1002934e96f118737d7b"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515101","type":"PullRequestEvent","actor":{"id":59730796,"login":"avbuben","display_login":"avbuben","gravatar_id":"","url":"https://api.github.com/users/avbuben","avatar_url":"https://avatars.githubusercontent.com/u/59730796?"},"repo":{"id":386308872,"name":"a-devops/ansible-postgresql-role","url":"https://api.github.com/repos/a-devops/ansible-postgresql-role"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/1","id":691895631,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkxODk1NjMx","html_url":"https://github.com/a-devops/ansible-postgresql-role/pull/1","diff_url":"https://github.com/a-devops/ansible-postgresql-role/pull/1.diff","patch_url":"https://github.com/a-devops/ansible-postgresql-role/pull/1.patch","issue_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/1","number":1,"state":"closed","locked":false,"title":"devops-2367 update role","user":{"login":"avbuben","id":59730796,"node_id":"MDQ6VXNlcjU5NzMwNzk2","avatar_url":"https://avatars.githubusercontent.com/u/59730796?v=4","gravatar_id":"","url":"https://api.github.com/users/avbuben","html_url":"https://github.com/avbuben","followers_url":"https://api.github.com/users/avbuben/followers","following_url":"https://api.github.com/users/avbuben/following{/other_user}","gists_url":"https://api.github.com/users/avbuben/gists{/gist_id}","starred_url":"https://api.github.com/users/avbuben/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/avbuben/subscriptions","organizations_url":"https://api.github.com/users/avbuben/orgs","repos_url":"https://api.github.com/users/avbuben/repos","events_url":"https://api.github.com/users/avbuben/events{/privacy}","received_events_url":"https://api.github.com/users/avbuben/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-17T09:34:07Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":"2021-07-21T08:00:01Z","merge_commit_sha":"fbbdb8a7ff006efce63b7d5e59caf9b676ba6783","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/1/commits","review_comments_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/1/comments","review_comment_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/comments{/number}","comments_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/1/comments","statuses_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/statuses/7416dd1f1a5bd012d3531c2ddb976eea6effa3f3","head":{"label":"a-devops:internal/devops-2367-update-role","ref":"internal/devops-2367-update-role","sha":"7416dd1f1a5bd012d3531c2ddb976eea6effa3f3","user":{"login":"a-devops","id":59089336,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU5MDg5MzM2","avatar_url":"https://avatars.githubusercontent.com/u/59089336?v=4","gravatar_id":"","url":"https://api.github.com/users/a-devops","html_url":"https://github.com/a-devops","followers_url":"https://api.github.com/users/a-devops/followers","following_url":"https://api.github.com/users/a-devops/following{/other_user}","gists_url":"https://api.github.com/users/a-devops/gists{/gist_id}","starred_url":"https://api.github.com/users/a-devops/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/a-devops/subscriptions","organizations_url":"https://api.github.com/users/a-devops/orgs","repos_url":"https://api.github.com/users/a-devops/repos","events_url":"https://api.github.com/users/a-devops/events{/privacy}","received_events_url":"https://api.github.com/users/a-devops/received_events","type":"Organization","site_admin":false},"repo":{"id":386308872,"node_id":"MDEwOlJlcG9zaXRvcnkzODYzMDg4NzI=","name":"ansible-postgresql-role","full_name":"a-devops/ansible-postgresql-role","private":false,"owner":{"login":"a-devops","id":59089336,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU5MDg5MzM2","avatar_url":"https://avatars.githubusercontent.com/u/59089336?v=4","gravatar_id":"","url":"https://api.github.com/users/a-devops","html_url":"https://github.com/a-devops","followers_url":"https://api.github.com/users/a-devops/followers","following_url":"https://api.github.com/users/a-devops/following{/other_user}","gists_url":"https://api.github.com/users/a-devops/gists{/gist_id}","starred_url":"https://api.github.com/users/a-devops/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/a-devops/subscriptions","organizations_url":"https://api.github.com/users/a-devops/orgs","repos_url":"https://api.github.com/users/a-devops/repos","events_url":"https://api.github.com/users/a-devops/events{/privacy}","received_events_url":"https://api.github.com/users/a-devops/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/a-devops/ansible-postgresql-role","description":"Ansible role to install, configure and administrate Postgresql clusters","fork":true,"url":"https://api.github.com/repos/a-devops/ansible-postgresql-role","forks_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/forks","keys_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/keys{/key_id}","collaborators_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/teams","hooks_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/hooks","issue_events_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/events{/number}","events_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/events","assignees_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/assignees{/user}","branches_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/branches{/branch}","tags_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/tags","blobs_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/refs{/sha}","trees_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/trees{/sha}","statuses_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/statuses/{sha}","languages_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/languages","stargazers_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/stargazers","contributors_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/contributors","subscribers_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/subscribers","subscription_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/subscription","commits_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/commits{/sha}","git_commits_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/commits{/sha}","comments_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/comments{/number}","issue_comment_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/comments{/number}","contents_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/contents/{+path}","compare_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/compare/{base}...{head}","merges_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/merges","archive_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/downloads","issues_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues{/number}","pulls_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls{/number}","milestones_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/milestones{/number}","notifications_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/labels{/name}","releases_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/releases{/id}","deployments_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/deployments","created_at":"2021-07-15T13:56:39Z","updated_at":"2021-07-15T13:56:40Z","pushed_at":"2021-07-21T08:00:01Z","git_url":"git://github.com/a-devops/ansible-postgresql-role.git","ssh_url":"git@github.com:a-devops/ansible-postgresql-role.git","clone_url":"https://github.com/a-devops/ansible-postgresql-role.git","svn_url":"https://github.com/a-devops/ansible-postgresql-role","homepage":null,"size":136,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"a-devops:master","ref":"master","sha":"cb3e6294c1a0d7a606f8fe87ccdf9dc17d7a3b1b","user":{"login":"a-devops","id":59089336,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU5MDg5MzM2","avatar_url":"https://avatars.githubusercontent.com/u/59089336?v=4","gravatar_id":"","url":"https://api.github.com/users/a-devops","html_url":"https://github.com/a-devops","followers_url":"https://api.github.com/users/a-devops/followers","following_url":"https://api.github.com/users/a-devops/following{/other_user}","gists_url":"https://api.github.com/users/a-devops/gists{/gist_id}","starred_url":"https://api.github.com/users/a-devops/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/a-devops/subscriptions","organizations_url":"https://api.github.com/users/a-devops/orgs","repos_url":"https://api.github.com/users/a-devops/repos","events_url":"https://api.github.com/users/a-devops/events{/privacy}","received_events_url":"https://api.github.com/users/a-devops/received_events","type":"Organization","site_admin":false},"repo":{"id":386308872,"node_id":"MDEwOlJlcG9zaXRvcnkzODYzMDg4NzI=","name":"ansible-postgresql-role","full_name":"a-devops/ansible-postgresql-role","private":false,"owner":{"login":"a-devops","id":59089336,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU5MDg5MzM2","avatar_url":"https://avatars.githubusercontent.com/u/59089336?v=4","gravatar_id":"","url":"https://api.github.com/users/a-devops","html_url":"https://github.com/a-devops","followers_url":"https://api.github.com/users/a-devops/followers","following_url":"https://api.github.com/users/a-devops/following{/other_user}","gists_url":"https://api.github.com/users/a-devops/gists{/gist_id}","starred_url":"https://api.github.com/users/a-devops/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/a-devops/subscriptions","organizations_url":"https://api.github.com/users/a-devops/orgs","repos_url":"https://api.github.com/users/a-devops/repos","events_url":"https://api.github.com/users/a-devops/events{/privacy}","received_events_url":"https://api.github.com/users/a-devops/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/a-devops/ansible-postgresql-role","description":"Ansible role to install, configure and administrate Postgresql clusters","fork":true,"url":"https://api.github.com/repos/a-devops/ansible-postgresql-role","forks_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/forks","keys_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/keys{/key_id}","collaborators_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/teams","hooks_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/hooks","issue_events_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/events{/number}","events_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/events","assignees_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/assignees{/user}","branches_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/branches{/branch}","tags_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/tags","blobs_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/refs{/sha}","trees_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/trees{/sha}","statuses_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/statuses/{sha}","languages_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/languages","stargazers_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/stargazers","contributors_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/contributors","subscribers_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/subscribers","subscription_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/subscription","commits_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/commits{/sha}","git_commits_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/git/commits{/sha}","comments_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/comments{/number}","issue_comment_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/comments{/number}","contents_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/contents/{+path}","compare_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/compare/{base}...{head}","merges_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/merges","archive_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/downloads","issues_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues{/number}","pulls_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls{/number}","milestones_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/milestones{/number}","notifications_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/labels{/name}","releases_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/releases{/id}","deployments_url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/deployments","created_at":"2021-07-15T13:56:39Z","updated_at":"2021-07-15T13:56:40Z","pushed_at":"2021-07-21T08:00:01Z","git_url":"git://github.com/a-devops/ansible-postgresql-role.git","ssh_url":"git@github.com:a-devops/ansible-postgresql-role.git","clone_url":"https://github.com/a-devops/ansible-postgresql-role.git","svn_url":"https://github.com/a-devops/ansible-postgresql-role","homepage":null,"size":136,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/1"},"html":{"href":"https://github.com/a-devops/ansible-postgresql-role/pull/1"},"issue":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/1"},"comments":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/a-devops/ansible-postgresql-role/statuses/7416dd1f1a5bd012d3531c2ddb976eea6effa3f3"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"avbuben","id":59730796,"node_id":"MDQ6VXNlcjU5NzMwNzk2","avatar_url":"https://avatars.githubusercontent.com/u/59730796?v=4","gravatar_id":"","url":"https://api.github.com/users/avbuben","html_url":"https://github.com/avbuben","followers_url":"https://api.github.com/users/avbuben/followers","following_url":"https://api.github.com/users/avbuben/following{/other_user}","gists_url":"https://api.github.com/users/avbuben/gists{/gist_id}","starred_url":"https://api.github.com/users/avbuben/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/avbuben/subscriptions","organizations_url":"https://api.github.com/users/avbuben/orgs","repos_url":"https://api.github.com/users/avbuben/repos","events_url":"https://api.github.com/users/avbuben/events{/privacy}","received_events_url":"https://api.github.com/users/avbuben/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":109,"deletions":2075,"changed_files":12}},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":59089336,"login":"a-devops","gravatar_id":"","url":"https://api.github.com/orgs/a-devops","avatar_url":"https://avatars.githubusercontent.com/u/59089336?"}}
+{"id":"17245515102","type":"PushEvent","actor":{"id":33043145,"login":"notnotjake","display_login":"notnotjake","gravatar_id":"","url":"https://api.github.com/users/notnotjake","avatar_url":"https://avatars.githubusercontent.com/u/33043145?"},"repo":{"id":367396143,"name":"notnotjake/dayticket","url":"https://api.github.com/repos/notnotjake/dayticket"},"payload":{"push_id":7562055189,"size":1,"distinct_size":1,"ref":"refs/heads/development","head":"b128cc152ed79d727f8ce05647802bd7fc90c551","before":"2bc02ebd36fcf2de40bf29f07e3c8bcd5874ce38","commits":[{"sha":"b128cc152ed79d727f8ce05647802bd7fc90c551","author":{"name":"notnotjake","email":"c8d99c2f7cd5f432c163abcd422672b9f77550bb@notnotjake.com"},"message":"Prints labor section\n\nUses regular wage for costs. Overtime is part of data structure and can be used in the future (on roadmap)","distinct":true,"url":"https://api.github.com/repos/notnotjake/dayticket/commits/b128cc152ed79d727f8ce05647802bd7fc90c551"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515111","type":"PushEvent","actor":{"id":81775975,"login":"foxly-it","display_login":"foxly-it","gravatar_id":"","url":"https://api.github.com/users/foxly-it","avatar_url":"https://avatars.githubusercontent.com/u/81775975?"},"repo":{"id":385229725,"name":"foxly-it/Portainer-Templates","url":"https://api.github.com/repos/foxly-it/Portainer-Templates"},"payload":{"push_id":7562055185,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"b7534b002f235cfe7d6c0b5e615fa1dacdc89108","before":"de50db88c5da331e4bd4ca8c592cc4b7c95f1f9d","commits":[{"sha":"b7534b002f235cfe7d6c0b5e615fa1dacdc89108","author":{"name":"Foxly IT Blog","email":"ccd3bccdb4d93606e2151586f02febac944e9057@users.noreply.github.com"},"message":"Update templates-2.0.json v1.0.1","distinct":true,"url":"https://api.github.com/repos/foxly-it/Portainer-Templates/commits/b7534b002f235cfe7d6c0b5e615fa1dacdc89108"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515117","type":"ForkEvent","actor":{"id":5567374,"login":"austonlee","display_login":"austonlee","gravatar_id":"","url":"https://api.github.com/users/austonlee","avatar_url":"https://avatars.githubusercontent.com/u/5567374?"},"repo":{"id":250884502,"name":"vercel/next-learn-starter","url":"https://api.github.com/repos/vercel/next-learn-starter"},"payload":{"forkee":{"id":388040571,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1NzE=","name":"next-learn-starter","full_name":"austonlee/next-learn-starter","private":false,"owner":{"login":"austonlee","id":5567374,"node_id":"MDQ6VXNlcjU1NjczNzQ=","avatar_url":"https://avatars.githubusercontent.com/u/5567374?v=4","gravatar_id":"","url":"https://api.github.com/users/austonlee","html_url":"https://github.com/austonlee","followers_url":"https://api.github.com/users/austonlee/followers","following_url":"https://api.github.com/users/austonlee/following{/other_user}","gists_url":"https://api.github.com/users/austonlee/gists{/gist_id}","starred_url":"https://api.github.com/users/austonlee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/austonlee/subscriptions","organizations_url":"https://api.github.com/users/austonlee/orgs","repos_url":"https://api.github.com/users/austonlee/repos","events_url":"https://api.github.com/users/austonlee/events{/privacy}","received_events_url":"https://api.github.com/users/austonlee/received_events","type":"User","site_admin":false},"html_url":"https://github.com/austonlee/next-learn-starter","description":"Learn Next.js Starter Code","fork":true,"url":"https://api.github.com/repos/austonlee/next-learn-starter","forks_url":"https://api.github.com/repos/austonlee/next-learn-starter/forks","keys_url":"https://api.github.com/repos/austonlee/next-learn-starter/keys{/key_id}","collaborators_url":"https://api.github.com/repos/austonlee/next-learn-starter/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/austonlee/next-learn-starter/teams","hooks_url":"https://api.github.com/repos/austonlee/next-learn-starter/hooks","issue_events_url":"https://api.github.com/repos/austonlee/next-learn-starter/issues/events{/number}","events_url":"https://api.github.com/repos/austonlee/next-learn-starter/events","assignees_url":"https://api.github.com/repos/austonlee/next-learn-starter/assignees{/user}","branches_url":"https://api.github.com/repos/austonlee/next-learn-starter/branches{/branch}","tags_url":"https://api.github.com/repos/austonlee/next-learn-starter/tags","blobs_url":"https://api.github.com/repos/austonlee/next-learn-starter/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/austonlee/next-learn-starter/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/austonlee/next-learn-starter/git/refs{/sha}","trees_url":"https://api.github.com/repos/austonlee/next-learn-starter/git/trees{/sha}","statuses_url":"https://api.github.com/repos/austonlee/next-learn-starter/statuses/{sha}","languages_url":"https://api.github.com/repos/austonlee/next-learn-starter/languages","stargazers_url":"https://api.github.com/repos/austonlee/next-learn-starter/stargazers","contributors_url":"https://api.github.com/repos/austonlee/next-learn-starter/contributors","subscribers_url":"https://api.github.com/repos/austonlee/next-learn-starter/subscribers","subscription_url":"https://api.github.com/repos/austonlee/next-learn-starter/subscription","commits_url":"https://api.github.com/repos/austonlee/next-learn-starter/commits{/sha}","git_commits_url":"https://api.github.com/repos/austonlee/next-learn-starter/git/commits{/sha}","comments_url":"https://api.github.com/repos/austonlee/next-learn-starter/comments{/number}","issue_comment_url":"https://api.github.com/repos/austonlee/next-learn-starter/issues/comments{/number}","contents_url":"https://api.github.com/repos/austonlee/next-learn-starter/contents/{+path}","compare_url":"https://api.github.com/repos/austonlee/next-learn-starter/compare/{base}...{head}","merges_url":"https://api.github.com/repos/austonlee/next-learn-starter/merges","archive_url":"https://api.github.com/repos/austonlee/next-learn-starter/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/austonlee/next-learn-starter/downloads","issues_url":"https://api.github.com/repos/austonlee/next-learn-starter/issues{/number}","pulls_url":"https://api.github.com/repos/austonlee/next-learn-starter/pulls{/number}","milestones_url":"https://api.github.com/repos/austonlee/next-learn-starter/milestones{/number}","notifications_url":"https://api.github.com/repos/austonlee/next-learn-starter/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/austonlee/next-learn-starter/labels{/name}","releases_url":"https://api.github.com/repos/austonlee/next-learn-starter/releases{/id}","deployments_url":"https://api.github.com/repos/austonlee/next-learn-starter/deployments","created_at":"2021-07-21T08:00:02Z","updated_at":"2021-07-20T20:34:32Z","pushed_at":"2021-07-19T18:32:44Z","git_url":"git://github.com/austonlee/next-learn-starter.git","ssh_url":"git@github.com:austonlee/next-learn-starter.git","clone_url":"https://github.com/austonlee/next-learn-starter.git","svn_url":"https://github.com/austonlee/next-learn-starter","homepage":"https://next-learn-starter.vercel.app/","size":159,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:02Z","org":{"id":14985020,"login":"vercel","gravatar_id":"","url":"https://api.github.com/orgs/vercel","avatar_url":"https://avatars.githubusercontent.com/u/14985020?"}}
+{"id":"17245515122","type":"WatchEvent","actor":{"id":26083162,"login":"Kingcool759","display_login":"Kingcool759","gravatar_id":"","url":"https://api.github.com/users/Kingcool759","avatar_url":"https://avatars.githubusercontent.com/u/26083162?"},"repo":{"id":19148949,"name":"PhilJay/MPAndroidChart","url":"https://api.github.com/repos/PhilJay/MPAndroidChart"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515132","type":"PushEvent","actor":{"id":86361050,"login":"Fuggy","display_login":"Fuggy","gravatar_id":"","url":"https://api.github.com/users/Fuggy","avatar_url":"https://avatars.githubusercontent.com/u/86361050?"},"repo":{"id":379607199,"name":"Clismy/TinySummerProject","url":"https://api.github.com/repos/Clismy/TinySummerProject"},"payload":{"push_id":7562055187,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"6be463c82d5d8c9cb0da85566122084f5186e174","before":"698c7ce82394cc3b38f2f68104c04ef3d6083aa3","commits":[{"sha":"6be463c82d5d8c9cb0da85566122084f5186e174","author":{"name":"Fuggy","email":"6307ef61c0b40135fe59404c05335bddd135533f@gmail.com"},"message":"aaaa","distinct":true,"url":"https://api.github.com/repos/Clismy/TinySummerProject/commits/6be463c82d5d8c9cb0da85566122084f5186e174"}]},"public":true,"created_at":"2021-07-21T08:00:02Z"}
+{"id":"17245515138","type":"PullRequestEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"action":"opened","number":5079,"pull_request":{"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5079","id":694141675,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNjc1","html_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5079","diff_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5079.diff","patch_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5079.patch","issue_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5079","number":5079,"state":"open","locked":false,"title":"Add file 5101.txt","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"body":null,"created_at":"2021-07-21T08:00:02Z","updated_at":"2021-07-21T08:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5079/commits","review_comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5079/comments","review_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5079/comments","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/d1e571b755e2a44a753c375c443a5c5a528679fb","head":{"label":"gabrieldonadel:5101","ref":"5101","sha":"d1e571b755e2a44a753c375c443a5c5a528679fb","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T08:00:00Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":1090,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5077,"license":null,"forks":0,"open_issues":5077,"watchers":1,"default_branch":"master"}},"base":{"label":"gabrieldonadel:master","ref":"master","sha":"d82cf4fd9e97a60cfebab6b8f7f85f9f8380b29b","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T08:00:00Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":1090,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5077,"license":null,"forks":0,"open_issues":5077,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5079"},"html":{"href":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5079"},"issue":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5079"},"comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5079/comments"},"review_comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5079/comments"},"review_comment":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5079/commits"},"statuses":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/d1e571b755e2a44a753c375c443a5c5a528679fb"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515143","type":"PullRequestEvent","actor":{"id":61073116,"login":"snehaa1989","display_login":"snehaa1989","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","avatar_url":"https://avatars.githubusercontent.com/u/61073116?"},"repo":{"id":388038822,"name":"snehaa1989/imgbot","url":"https://api.github.com/repos/snehaa1989/imgbot"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/snehaa1989/imgbot/pulls/1","id":694139218,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTM5MjE4","html_url":"https://github.com/snehaa1989/imgbot/pull/1","diff_url":"https://github.com/snehaa1989/imgbot/pull/1.diff","patch_url":"https://github.com/snehaa1989/imgbot/pull/1.patch","issue_url":"https://api.github.com/repos/snehaa1989/imgbot/issues/1","number":1,"state":"closed","locked":false,"title":"[ImgBot] Optimize images","user":{"login":"imgbot[bot]","id":31301654,"node_id":"MDM6Qm90MzEzMDE2NTQ=","avatar_url":"https://avatars.githubusercontent.com/in/4706?v=4","gravatar_id":"","url":"https://api.github.com/users/imgbot%5Bbot%5D","html_url":"https://github.com/apps/imgbot","followers_url":"https://api.github.com/users/imgbot%5Bbot%5D/followers","following_url":"https://api.github.com/users/imgbot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/imgbot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/imgbot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/imgbot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/imgbot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/imgbot%5Bbot%5D/repos","events_url":"https://api.github.com/users/imgbot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/imgbot%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"## Beep boop. Your images are optimized!\r\n\r\nYour image file size has been reduced!\r\n\r\n<details>\r\n<summary>\r\nDetails\r\n</summary>\r\n\r\n| File | Before | After | Percent reduction |\r\n|:--|:--|:--|:--|\r\n| /demo-image.png | 392.53kb | 384.14kb | 2.14% |\r\n| /lofi1.jpg | 149.96kb | 147.09kb | 1.91% |\r\n| /violin.jpg | 20.80kb | 20.66kb | 0.69% |\r\n| | | | |\r\n| **Total :** | **563.29kb** | **551.89kb** | **2.02%** |\r\n</details>\r\n\r\n---\r\n\r\n**Black Lives Matter** | [💰 donate](https://blm-bookmarks.carrd.co/#donate) | [🎓 learn](https://blm-bookmarks.carrd.co/#learn) | [✍🏾 sign](https://blm-bookmarks.carrd.co/#sign)\r\n\r\n[📝 docs](https://imgbot.net/docs) | [:octocat: repo](https://github.com/dabutvin/ImgBot) | [🙋🏾 issues](https://github.com/dabutvin/ImgBot/issues) | [🏅 swag](https://goo.gl/forms/1GX7wlhGEX8nkhGO2) | [🏪 marketplace](https://github.com/marketplace/imgbot)\r\n","created_at":"2021-07-21T07:56:15Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":"2021-07-21T08:00:02Z","merge_commit_sha":"a084470ead9361c81f02c529a450eeed19a4d92f","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/snehaa1989/imgbot/pulls/1/commits","review_comments_url":"https://api.github.com/repos/snehaa1989/imgbot/pulls/1/comments","review_comment_url":"https://api.github.com/repos/snehaa1989/imgbot/pulls/comments{/number}","comments_url":"https://api.github.com/repos/snehaa1989/imgbot/issues/1/comments","statuses_url":"https://api.github.com/repos/snehaa1989/imgbot/statuses/dcd80cbf80a3abb5039fcb49649af7a7c49b9b31","head":{"label":"snehaa1989:imgbot","ref":"imgbot","sha":"dcd80cbf80a3abb5039fcb49649af7a7c49b9b31","user":{"login":"snehaa1989","id":61073116,"node_id":"MDQ6VXNlcjYxMDczMTE2","avatar_url":"https://avatars.githubusercontent.com/u/61073116?v=4","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","html_url":"https://github.com/snehaa1989","followers_url":"https://api.github.com/users/snehaa1989/followers","following_url":"https://api.github.com/users/snehaa1989/following{/other_user}","gists_url":"https://api.github.com/users/snehaa1989/gists{/gist_id}","starred_url":"https://api.github.com/users/snehaa1989/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snehaa1989/subscriptions","organizations_url":"https://api.github.com/users/snehaa1989/orgs","repos_url":"https://api.github.com/users/snehaa1989/repos","events_url":"https://api.github.com/users/snehaa1989/events{/privacy}","received_events_url":"https://api.github.com/users/snehaa1989/received_events","type":"User","site_admin":false},"repo":{"id":388038822,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMzg4MjI=","name":"imgbot","full_name":"snehaa1989/imgbot","private":false,"owner":{"login":"snehaa1989","id":61073116,"node_id":"MDQ6VXNlcjYxMDczMTE2","avatar_url":"https://avatars.githubusercontent.com/u/61073116?v=4","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","html_url":"https://github.com/snehaa1989","followers_url":"https://api.github.com/users/snehaa1989/followers","following_url":"https://api.github.com/users/snehaa1989/following{/other_user}","gists_url":"https://api.github.com/users/snehaa1989/gists{/gist_id}","starred_url":"https://api.github.com/users/snehaa1989/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snehaa1989/subscriptions","organizations_url":"https://api.github.com/users/snehaa1989/orgs","repos_url":"https://api.github.com/users/snehaa1989/repos","events_url":"https://api.github.com/users/snehaa1989/events{/privacy}","received_events_url":"https://api.github.com/users/snehaa1989/received_events","type":"User","site_admin":false},"html_url":"https://github.com/snehaa1989/imgbot","description":null,"fork":false,"url":"https://api.github.com/repos/snehaa1989/imgbot","forks_url":"https://api.github.com/repos/snehaa1989/imgbot/forks","keys_url":"https://api.github.com/repos/snehaa1989/imgbot/keys{/key_id}","collaborators_url":"https://api.github.com/repos/snehaa1989/imgbot/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/snehaa1989/imgbot/teams","hooks_url":"https://api.github.com/repos/snehaa1989/imgbot/hooks","issue_events_url":"https://api.github.com/repos/snehaa1989/imgbot/issues/events{/number}","events_url":"https://api.github.com/repos/snehaa1989/imgbot/events","assignees_url":"https://api.github.com/repos/snehaa1989/imgbot/assignees{/user}","branches_url":"https://api.github.com/repos/snehaa1989/imgbot/branches{/branch}","tags_url":"https://api.github.com/repos/snehaa1989/imgbot/tags","blobs_url":"https://api.github.com/repos/snehaa1989/imgbot/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/snehaa1989/imgbot/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/snehaa1989/imgbot/git/refs{/sha}","trees_url":"https://api.github.com/repos/snehaa1989/imgbot/git/trees{/sha}","statuses_url":"https://api.github.com/repos/snehaa1989/imgbot/statuses/{sha}","languages_url":"https://api.github.com/repos/snehaa1989/imgbot/languages","stargazers_url":"https://api.github.com/repos/snehaa1989/imgbot/stargazers","contributors_url":"https://api.github.com/repos/snehaa1989/imgbot/contributors","subscribers_url":"https://api.github.com/repos/snehaa1989/imgbot/subscribers","subscription_url":"https://api.github.com/repos/snehaa1989/imgbot/subscription","commits_url":"https://api.github.com/repos/snehaa1989/imgbot/commits{/sha}","git_commits_url":"https://api.github.com/repos/snehaa1989/imgbot/git/commits{/sha}","comments_url":"https://api.github.com/repos/snehaa1989/imgbot/comments{/number}","issue_comment_url":"https://api.github.com/repos/snehaa1989/imgbot/issues/comments{/number}","contents_url":"https://api.github.com/repos/snehaa1989/imgbot/contents/{+path}","compare_url":"https://api.github.com/repos/snehaa1989/imgbot/compare/{base}...{head}","merges_url":"https://api.github.com/repos/snehaa1989/imgbot/merges","archive_url":"https://api.github.com/repos/snehaa1989/imgbot/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/snehaa1989/imgbot/downloads","issues_url":"https://api.github.com/repos/snehaa1989/imgbot/issues{/number}","pulls_url":"https://api.github.com/repos/snehaa1989/imgbot/pulls{/number}","milestones_url":"https://api.github.com/repos/snehaa1989/imgbot/milestones{/number}","notifications_url":"https://api.github.com/repos/snehaa1989/imgbot/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/snehaa1989/imgbot/labels{/name}","releases_url":"https://api.github.com/repos/snehaa1989/imgbot/releases{/id}","deployments_url":"https://api.github.com/repos/snehaa1989/imgbot/deployments","created_at":"2021-07-21T07:53:41Z","updated_at":"2021-07-21T07:55:27Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/snehaa1989/imgbot.git","ssh_url":"git@github.com:snehaa1989/imgbot.git","clone_url":"https://github.com/snehaa1989/imgbot.git","svn_url":"https://github.com/snehaa1989/imgbot","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"base":{"label":"snehaa1989:main","ref":"main","sha":"edd4c4146633ac025ba60678d5e6d10a3e15f89e","user":{"login":"snehaa1989","id":61073116,"node_id":"MDQ6VXNlcjYxMDczMTE2","avatar_url":"https://avatars.githubusercontent.com/u/61073116?v=4","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","html_url":"https://github.com/snehaa1989","followers_url":"https://api.github.com/users/snehaa1989/followers","following_url":"https://api.github.com/users/snehaa1989/following{/other_user}","gists_url":"https://api.github.com/users/snehaa1989/gists{/gist_id}","starred_url":"https://api.github.com/users/snehaa1989/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snehaa1989/subscriptions","organizations_url":"https://api.github.com/users/snehaa1989/orgs","repos_url":"https://api.github.com/users/snehaa1989/repos","events_url":"https://api.github.com/users/snehaa1989/events{/privacy}","received_events_url":"https://api.github.com/users/snehaa1989/received_events","type":"User","site_admin":false},"repo":{"id":388038822,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMzg4MjI=","name":"imgbot","full_name":"snehaa1989/imgbot","private":false,"owner":{"login":"snehaa1989","id":61073116,"node_id":"MDQ6VXNlcjYxMDczMTE2","avatar_url":"https://avatars.githubusercontent.com/u/61073116?v=4","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","html_url":"https://github.com/snehaa1989","followers_url":"https://api.github.com/users/snehaa1989/followers","following_url":"https://api.github.com/users/snehaa1989/following{/other_user}","gists_url":"https://api.github.com/users/snehaa1989/gists{/gist_id}","starred_url":"https://api.github.com/users/snehaa1989/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snehaa1989/subscriptions","organizations_url":"https://api.github.com/users/snehaa1989/orgs","repos_url":"https://api.github.com/users/snehaa1989/repos","events_url":"https://api.github.com/users/snehaa1989/events{/privacy}","received_events_url":"https://api.github.com/users/snehaa1989/received_events","type":"User","site_admin":false},"html_url":"https://github.com/snehaa1989/imgbot","description":null,"fork":false,"url":"https://api.github.com/repos/snehaa1989/imgbot","forks_url":"https://api.github.com/repos/snehaa1989/imgbot/forks","keys_url":"https://api.github.com/repos/snehaa1989/imgbot/keys{/key_id}","collaborators_url":"https://api.github.com/repos/snehaa1989/imgbot/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/snehaa1989/imgbot/teams","hooks_url":"https://api.github.com/repos/snehaa1989/imgbot/hooks","issue_events_url":"https://api.github.com/repos/snehaa1989/imgbot/issues/events{/number}","events_url":"https://api.github.com/repos/snehaa1989/imgbot/events","assignees_url":"https://api.github.com/repos/snehaa1989/imgbot/assignees{/user}","branches_url":"https://api.github.com/repos/snehaa1989/imgbot/branches{/branch}","tags_url":"https://api.github.com/repos/snehaa1989/imgbot/tags","blobs_url":"https://api.github.com/repos/snehaa1989/imgbot/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/snehaa1989/imgbot/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/snehaa1989/imgbot/git/refs{/sha}","trees_url":"https://api.github.com/repos/snehaa1989/imgbot/git/trees{/sha}","statuses_url":"https://api.github.com/repos/snehaa1989/imgbot/statuses/{sha}","languages_url":"https://api.github.com/repos/snehaa1989/imgbot/languages","stargazers_url":"https://api.github.com/repos/snehaa1989/imgbot/stargazers","contributors_url":"https://api.github.com/repos/snehaa1989/imgbot/contributors","subscribers_url":"https://api.github.com/repos/snehaa1989/imgbot/subscribers","subscription_url":"https://api.github.com/repos/snehaa1989/imgbot/subscription","commits_url":"https://api.github.com/repos/snehaa1989/imgbot/commits{/sha}","git_commits_url":"https://api.github.com/repos/snehaa1989/imgbot/git/commits{/sha}","comments_url":"https://api.github.com/repos/snehaa1989/imgbot/comments{/number}","issue_comment_url":"https://api.github.com/repos/snehaa1989/imgbot/issues/comments{/number}","contents_url":"https://api.github.com/repos/snehaa1989/imgbot/contents/{+path}","compare_url":"https://api.github.com/repos/snehaa1989/imgbot/compare/{base}...{head}","merges_url":"https://api.github.com/repos/snehaa1989/imgbot/merges","archive_url":"https://api.github.com/repos/snehaa1989/imgbot/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/snehaa1989/imgbot/downloads","issues_url":"https://api.github.com/repos/snehaa1989/imgbot/issues{/number}","pulls_url":"https://api.github.com/repos/snehaa1989/imgbot/pulls{/number}","milestones_url":"https://api.github.com/repos/snehaa1989/imgbot/milestones{/number}","notifications_url":"https://api.github.com/repos/snehaa1989/imgbot/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/snehaa1989/imgbot/labels{/name}","releases_url":"https://api.github.com/repos/snehaa1989/imgbot/releases{/id}","deployments_url":"https://api.github.com/repos/snehaa1989/imgbot/deployments","created_at":"2021-07-21T07:53:41Z","updated_at":"2021-07-21T07:55:27Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/snehaa1989/imgbot.git","ssh_url":"git@github.com:snehaa1989/imgbot.git","clone_url":"https://github.com/snehaa1989/imgbot.git","svn_url":"https://github.com/snehaa1989/imgbot","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/snehaa1989/imgbot/pulls/1"},"html":{"href":"https://github.com/snehaa1989/imgbot/pull/1"},"issue":{"href":"https://api.github.com/repos/snehaa1989/imgbot/issues/1"},"comments":{"href":"https://api.github.com/repos/snehaa1989/imgbot/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/snehaa1989/imgbot/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/snehaa1989/imgbot/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/snehaa1989/imgbot/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/snehaa1989/imgbot/statuses/dcd80cbf80a3abb5039fcb49649af7a7c49b9b31"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"snehaa1989","id":61073116,"node_id":"MDQ6VXNlcjYxMDczMTE2","avatar_url":"https://avatars.githubusercontent.com/u/61073116?v=4","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","html_url":"https://github.com/snehaa1989","followers_url":"https://api.github.com/users/snehaa1989/followers","following_url":"https://api.github.com/users/snehaa1989/following{/other_user}","gists_url":"https://api.github.com/users/snehaa1989/gists{/gist_id}","starred_url":"https://api.github.com/users/snehaa1989/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snehaa1989/subscriptions","organizations_url":"https://api.github.com/users/snehaa1989/orgs","repos_url":"https://api.github.com/users/snehaa1989/repos","events_url":"https://api.github.com/users/snehaa1989/events{/privacy}","received_events_url":"https://api.github.com/users/snehaa1989/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":0,"deletions":0,"changed_files":3}},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515147","type":"IssuesEvent","actor":{"id":30256396,"login":"sundytt","display_login":"sundytt","gravatar_id":"","url":"https://api.github.com/users/sundytt","avatar_url":"https://avatars.githubusercontent.com/u/30256396?"},"repo":{"id":153050643,"name":"Tencent/bk-PaaS","url":"https://api.github.com/repos/Tencent/bk-PaaS"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/Tencent/bk-PaaS/issues/436","repository_url":"https://api.github.com/repos/Tencent/bk-PaaS","labels_url":"https://api.github.com/repos/Tencent/bk-PaaS/issues/436/labels{/name}","comments_url":"https://api.github.com/repos/Tencent/bk-PaaS/issues/436/comments","events_url":"https://api.github.com/repos/Tencent/bk-PaaS/issues/436/events","html_url":"https://github.com/Tencent/bk-PaaS/issues/436","id":949435843,"node_id":"MDU6SXNzdWU5NDk0MzU4NDM=","number":436,"title":"【lesscode】表单组件 加上v-model 可以获取表单值","user":{"login":"sundytt","id":30256396,"node_id":"MDQ6VXNlcjMwMjU2Mzk2","avatar_url":"https://avatars.githubusercontent.com/u/30256396?v=4","gravatar_id":"","url":"https://api.github.com/users/sundytt","html_url":"https://github.com/sundytt","followers_url":"https://api.github.com/users/sundytt/followers","following_url":"https://api.github.com/users/sundytt/following{/other_user}","gists_url":"https://api.github.com/users/sundytt/gists{/gist_id}","starred_url":"https://api.github.com/users/sundytt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sundytt/subscriptions","organizations_url":"https://api.github.com/users/sundytt/orgs","repos_url":"https://api.github.com/users/sundytt/repos","events_url":"https://api.github.com/users/sundytt/events{/privacy}","received_events_url":"https://api.github.com/users/sundytt/received_events","type":"User","site_admin":false},"labels":[{"id":2131446479,"node_id":"MDU6TGFiZWwyMTMxNDQ2NDc5","url":"https://api.github.com/repos/Tencent/bk-PaaS/labels/lesscode","name":"lesscode","color":"edbda8","default":false,"description":"lesscode bugs or features"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T08:00:02Z","updated_at":"2021-07-21T08:00:02Z","closed_at":null,"author_association":"COLLABORATOR","active_lock_reason":null,"body":"* [ ]  标签输入\r\n* [ ]  人员选择\r\n* [ ]  穿梭框，获取选择后的列表\r\n* [ ]  rate","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":18461506,"login":"Tencent","gravatar_id":"","url":"https://api.github.com/orgs/Tencent","avatar_url":"https://avatars.githubusercontent.com/u/18461506?"}}
+{"id":"17245515149","type":"PushEvent","actor":{"id":1473072,"login":"vitalets","display_login":"vitalets","gravatar_id":"","url":"https://api.github.com/users/vitalets","avatar_url":"https://avatars.githubusercontent.com/u/1473072?"},"repo":{"id":363393951,"name":"vitalets/skill-dev-proxy","url":"https://api.github.com/repos/vitalets/skill-dev-proxy"},"payload":{"push_id":7562055198,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"346e5aaca5b23b3eb8f9f7adb3bc7e0cab278d41","before":"ce389e66634841de39cd11e50ebc580a92da3616","commits":[{"sha":"a32f2a060540ebad7654f4e3bcb0afe395d7838c","author":{"name":"Vitaliy Potapov","email":"c9679860e330f3091c3e8d07027e1151860a1995@rambler.ru"},"message":"pkg: fix release","distinct":true,"url":"https://api.github.com/repos/vitalets/skill-dev-proxy/commits/a32f2a060540ebad7654f4e3bcb0afe395d7838c"},{"sha":"346e5aaca5b23b3eb8f9f7adb3bc7e0cab278d41","author":{"name":"Vitaliy Potapov","email":"c9679860e330f3091c3e8d07027e1151860a1995@rambler.ru"},"message":"2.0.0","distinct":true,"url":"https://api.github.com/repos/vitalets/skill-dev-proxy/commits/346e5aaca5b23b3eb8f9f7adb3bc7e0cab278d41"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515155","type":"PushEvent","actor":{"id":615952,"login":"billybobza","display_login":"billybobza","gravatar_id":"","url":"https://api.github.com/users/billybobza","avatar_url":"https://avatars.githubusercontent.com/u/615952?"},"repo":{"id":325888259,"name":"newstools/2021-the-chronicle","url":"https://api.github.com/repos/newstools/2021-the-chronicle"},"payload":{"push_id":7562055216,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"af0769c13e64fde267f804fd7a4b129cfd7c1bc0","before":"c0c791488c2ad413a4a000371b5b2869fcccd4eb","commits":[{"sha":"af0769c13e64fde267f804fd7a4b129cfd7c1bc0","author":{"name":"Billy Einkamerer","email":"051522d0c46404d8ba5b692a10a37b99b8186360@assemble.co.za"},"message":"Created Text For URL [www.chronicle.co.zw/byo-police-intercept-quantum-stolen-in-sa/]","distinct":true,"url":"https://api.github.com/repos/newstools/2021-the-chronicle/commits/af0769c13e64fde267f804fd7a4b129cfd7c1bc0"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":17193977,"login":"newstools","gravatar_id":"","url":"https://api.github.com/orgs/newstools","avatar_url":"https://avatars.githubusercontent.com/u/17193977?"}}
+{"id":"17245515160","type":"PushEvent","actor":{"id":50026275,"login":"botberry","display_login":"botberry","gravatar_id":"","url":"https://api.github.com/users/botberry","avatar_url":"https://avatars.githubusercontent.com/u/50026275?"},"repo":{"id":162690887,"name":"strawberry-graphql/strawberry","url":"https://api.github.com/repos/strawberry-graphql/strawberry"},"payload":{"push_id":7562055214,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"d1f78230699f0443f75a85b90606d42feb52ae39","before":"cb31a3aeefdc58dac24a37a22d6c6bd0b9c9cf17","commits":[{"sha":"d1f78230699f0443f75a85b90606d42feb52ae39","author":{"name":"Botberry","email":"c71e7261d37a4f6ae4cfb0cbd79081310a237e67@strawberry.rocks"},"message":"Release 🍓 0.69.2","distinct":true,"url":"https://api.github.com/repos/strawberry-graphql/strawberry/commits/d1f78230699f0443f75a85b90606d42feb52ae39"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":48071860,"login":"strawberry-graphql","gravatar_id":"","url":"https://api.github.com/orgs/strawberry-graphql","avatar_url":"https://avatars.githubusercontent.com/u/48071860?"}}
+{"id":"17245515161","type":"PushEvent","actor":{"id":78577301,"login":"Dhiyakhar","display_login":"Dhiyakhar","gravatar_id":"","url":"https://api.github.com/users/Dhiyakhar","avatar_url":"https://avatars.githubusercontent.com/u/78577301?"},"repo":{"id":385265283,"name":"Dhiyakhar/ulinsolution.github.io","url":"https://api.github.com/repos/Dhiyakhar/ulinsolution.github.io"},"payload":{"push_id":7562055209,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"4d4c17a4129c08d976a720f3c4fe9d8903ba4165","before":"c0440aaacb588e6748142c17da61ca2a697e3676","commits":[{"sha":"4d4c17a4129c08d976a720f3c4fe9d8903ba4165","author":{"name":"Quinque","email":"6dda6afbeb5267339624bc3c8e18e782788bb15d@users.noreply.github.com"},"message":"Update index.html","distinct":true,"url":"https://api.github.com/repos/Dhiyakhar/ulinsolution.github.io/commits/4d4c17a4129c08d976a720f3c4fe9d8903ba4165"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515165","type":"CreateEvent","actor":{"id":69674721,"login":"nishant26n","display_login":"nishant26n","gravatar_id":"","url":"https://api.github.com/users/nishant26n","avatar_url":"https://avatars.githubusercontent.com/u/69674721?"},"repo":{"id":388040574,"name":"nishant26n/todo-react","url":"https://api.github.com/repos/nishant26n/todo-react"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515166","type":"PushEvent","actor":{"id":68130091,"login":"digitalocean-e2e","display_login":"digitalocean-e2e","gravatar_id":"","url":"https://api.github.com/users/digitalocean-e2e","avatar_url":"https://avatars.githubusercontent.com/u/68130091?"},"repo":{"id":278740625,"name":"digitalocean-e2e/apps-deploy-on-push","url":"https://api.github.com/repos/digitalocean-e2e/apps-deploy-on-push"},"payload":{"push_id":7562055205,"size":1,"distinct_size":1,"ref":"refs/heads/goBl7XiAod","head":"1cf42bd65fc040bb85f25d1c89bcd51d0b85935e","before":"2d70374d81556aec591895093b062001debd84a7","commits":[{"sha":"1cf42bd65fc040bb85f25d1c89bcd51d0b85935e","author":{"name":"DigitalOcean E2E","email":"44491d4b74bd0174eebb1e35657a17a886edfb0c@digitalocean.com"},"message":"New commit on branch goBl7XiAod","distinct":true,"url":"https://api.github.com/repos/digitalocean-e2e/apps-deploy-on-push/commits/1cf42bd65fc040bb85f25d1c89bcd51d0b85935e"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515181","type":"PushEvent","actor":{"id":8651308,"login":"tadashi0713","display_login":"tadashi0713","gravatar_id":"","url":"https://api.github.com/users/tadashi0713","avatar_url":"https://avatars.githubusercontent.com/u/8651308?"},"repo":{"id":382344206,"name":"tadashi0713/flutter-orb","url":"https://api.github.com/repos/tadashi0713/flutter-orb"},"payload":{"push_id":7562055220,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"ff9ea0ae1db9e546ce8b7f14863ea031674b72c6","before":"34909c8f8eabb45ec58d5f1e10bd974301c73326","commits":[{"sha":"ff9ea0ae1db9e546ce8b7f14863ea031674b72c6","author":{"name":"Tadashi Nemoto","email":"70cc15cd743d408a333613bef762d1ae6915b9eb@gmail.com"},"message":"change flutter doctor","distinct":true,"url":"https://api.github.com/repos/tadashi0713/flutter-orb/commits/ff9ea0ae1db9e546ce8b7f14863ea031674b72c6"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515187","type":"PushEvent","actor":{"id":19972370,"login":"goutamp","display_login":"goutamp","gravatar_id":"","url":"https://api.github.com/users/goutamp","avatar_url":"https://avatars.githubusercontent.com/u/19972370?"},"repo":{"id":368109195,"name":"goutamp/sample3","url":"https://api.github.com/repos/goutamp/sample3"},"payload":{"push_id":7562055233,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"177c13a3bcb2e7ca16f1037b2a706d195a3894f7","before":"915814b97ac4b479c1ad1894ba1f66f7bc9fa5a6","commits":[{"sha":"177c13a3bcb2e7ca16f1037b2a706d195a3894f7","author":{"name":"Goutam Pramanick","email":"5d42db1c63d9d2080d94e2b5c81c92be76cd0d27@gmail.com"},"message":"Update requirements.txt","distinct":true,"url":"https://api.github.com/repos/goutamp/sample3/commits/177c13a3bcb2e7ca16f1037b2a706d195a3894f7"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515192","type":"PushEvent","actor":{"id":1381363,"login":"weskamm","display_login":"weskamm","gravatar_id":"","url":"https://api.github.com/users/weskamm","avatar_url":"https://avatars.githubusercontent.com/u/1381363?"},"repo":{"id":152080013,"name":"terrestris/react-geo-baseclient","url":"https://api.github.com/repos/terrestris/react-geo-baseclient"},"payload":{"push_id":7562055244,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"1fda6a3a2dd7ac6a586a28f025d2dfbd34e9bf95","before":"bff21bd42da42af3442ccd89f746aec4018b4273","commits":[{"sha":"1fda6a3a2dd7ac6a586a28f025d2dfbd34e9bf95","author":{"name":"Johannes Weskamm","email":"40c91adf413f390649564fd61a25503d7ec06601@terrestris.de"},"message":"Update CHANGELOG.md","distinct":true,"url":"https://api.github.com/repos/terrestris/react-geo-baseclient/commits/1fda6a3a2dd7ac6a586a28f025d2dfbd34e9bf95"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":1510416,"login":"terrestris","gravatar_id":"","url":"https://api.github.com/orgs/terrestris","avatar_url":"https://avatars.githubusercontent.com/u/1510416?"}}
+{"id":"17245515193","type":"PullRequestEvent","actor":{"id":7659712,"login":"zenkins","display_login":"zenkins","gravatar_id":"","url":"https://api.github.com/users/zenkins","avatar_url":"https://avatars.githubusercontent.com/u/7659712?"},"repo":{"id":53574465,"name":"wireapp/wire-ios-cryptobox","url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox"},"payload":{"action":"closed","number":59,"pull_request":{"url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/59","id":694138563,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTM4NTYz","html_url":"https://github.com/wireapp/wire-ios-cryptobox/pull/59","diff_url":"https://github.com/wireapp/wire-ios-cryptobox/pull/59.diff","patch_url":"https://github.com/wireapp/wire-ios-cryptobox/pull/59.patch","issue_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/59","number":59,"state":"closed","locked":false,"title":"chore: bump components","user":{"login":"github-actions[bot]","id":41898282,"node_id":"MDM6Qm90NDE4OTgyODI=","avatar_url":"https://avatars.githubusercontent.com/in/15368?v=4","gravatar_id":"","url":"https://api.github.com/users/github-actions%5Bbot%5D","html_url":"https://github.com/apps/github-actions","followers_url":"https://api.github.com/users/github-actions%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-actions%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-actions%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-actions%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-actions%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bump framework(s) version for: wireapp/wire-ios-utilities","created_at":"2021-07-21T07:55:10Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":"2021-07-21T08:00:02Z","merge_commit_sha":"f07ec3becc5f1b61a2f5312b1776fe526d25e678","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/59/commits","review_comments_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/59/comments","review_comment_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/comments{/number}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/59/comments","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/statuses/6ecbbd3bbba43d477bdd0b484ce9338049367934","head":{"label":"wireapp:chore/bump_2021-07-21-075451","ref":"chore/bump_2021-07-21-075451","sha":"6ecbbd3bbba43d477bdd0b484ce9338049367934","user":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":53574465,"node_id":"MDEwOlJlcG9zaXRvcnk1MzU3NDQ2NQ==","name":"wire-ios-cryptobox","full_name":"wireapp/wire-ios-cryptobox","private":false,"owner":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/wireapp/wire-ios-cryptobox","description":null,"fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox","forks_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/deployments","created_at":"2016-03-10T10:04:06Z","updated_at":"2021-07-16T11:28:06Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/wireapp/wire-ios-cryptobox.git","ssh_url":"git@github.com:wireapp/wire-ios-cryptobox.git","clone_url":"https://github.com/wireapp/wire-ios-cryptobox.git","svn_url":"https://github.com/wireapp/wire-ios-cryptobox","homepage":"https://wire.com","size":24702,"stargazers_count":24,"watchers_count":24,"language":"Swift","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":10,"open_issues":0,"watchers":24,"default_branch":"develop"}},"base":{"label":"wireapp:develop","ref":"develop","sha":"fae8d887d8f43e12b46ae7ee22c3365b284e59db","user":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":53574465,"node_id":"MDEwOlJlcG9zaXRvcnk1MzU3NDQ2NQ==","name":"wire-ios-cryptobox","full_name":"wireapp/wire-ios-cryptobox","private":false,"owner":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/wireapp/wire-ios-cryptobox","description":null,"fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox","forks_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/deployments","created_at":"2016-03-10T10:04:06Z","updated_at":"2021-07-16T11:28:06Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/wireapp/wire-ios-cryptobox.git","ssh_url":"git@github.com:wireapp/wire-ios-cryptobox.git","clone_url":"https://github.com/wireapp/wire-ios-cryptobox.git","svn_url":"https://github.com/wireapp/wire-ios-cryptobox","homepage":"https://wire.com","size":24702,"stargazers_count":24,"watchers_count":24,"language":"Swift","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":10,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":10,"open_issues":0,"watchers":24,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/59"},"html":{"href":"https://github.com/wireapp/wire-ios-cryptobox/pull/59"},"issue":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/59"},"comments":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/issues/59/comments"},"review_comments":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/59/comments"},"review_comment":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/pulls/59/commits"},"statuses":{"href":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/statuses/6ecbbd3bbba43d477bdd0b484ce9338049367934"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"zenkins","id":7659712,"node_id":"MDQ6VXNlcjc2NTk3MTI=","avatar_url":"https://avatars.githubusercontent.com/u/7659712?v=4","gravatar_id":"","url":"https://api.github.com/users/zenkins","html_url":"https://github.com/zenkins","followers_url":"https://api.github.com/users/zenkins/followers","following_url":"https://api.github.com/users/zenkins/following{/other_user}","gists_url":"https://api.github.com/users/zenkins/gists{/gist_id}","starred_url":"https://api.github.com/users/zenkins/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zenkins/subscriptions","organizations_url":"https://api.github.com/users/zenkins/orgs","repos_url":"https://api.github.com/users/zenkins/repos","events_url":"https://api.github.com/users/zenkins/events{/privacy}","received_events_url":"https://api.github.com/users/zenkins/received_events","type":"User","site_admin":false},"comments":2,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":3,"deletions":3,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":16047324,"login":"wireapp","gravatar_id":"","url":"https://api.github.com/orgs/wireapp","avatar_url":"https://avatars.githubusercontent.com/u/16047324?"}}
+{"id":"17245515199","type":"PullRequestEvent","actor":{"id":11852044,"login":"billypchan","display_login":"billypchan","gravatar_id":"","url":"https://api.github.com/users/billypchan","avatar_url":"https://avatars.githubusercontent.com/u/11852044?"},"repo":{"id":63856914,"name":"wireapp/wire-ios-link-preview","url":"https://api.github.com/repos/wireapp/wire-ios-link-preview"},"payload":{"action":"closed","number":80,"pull_request":{"url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/80","id":692806970,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyODA2OTcw","html_url":"https://github.com/wireapp/wire-ios-link-preview/pull/80","diff_url":"https://github.com/wireapp/wire-ios-link-preview/pull/80.diff","patch_url":"https://github.com/wireapp/wire-ios-link-preview/pull/80.patch","issue_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/80","number":80,"state":"closed","locked":false,"title":"chore: bump components","user":{"login":"github-actions[bot]","id":41898282,"node_id":"MDM6Qm90NDE4OTgyODI=","avatar_url":"https://avatars.githubusercontent.com/in/15368?v=4","gravatar_id":"","url":"https://api.github.com/users/github-actions%5Bbot%5D","html_url":"https://github.com/apps/github-actions","followers_url":"https://api.github.com/users/github-actions%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-actions%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-actions%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-actions%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-actions%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bump framework(s) version for: wireapp/wire-ios-utilities","created_at":"2021-07-19T17:52:53Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":null,"merge_commit_sha":"03f9797f405a9f3ac2a8e8b8b550f9ea27007e7f","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/80/commits","review_comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/80/comments","review_comment_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/comments{/number}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/80/comments","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/58d41c8de296d7dc7d2b3e173d82caf171efb291","head":{"label":"wireapp:chore/bump_2021-07-19-175234","ref":"chore/bump_2021-07-19-175234","sha":"58d41c8de296d7dc7d2b3e173d82caf171efb291","user":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":63856914,"node_id":"MDEwOlJlcG9zaXRvcnk2Mzg1NjkxNA==","name":"wire-ios-link-preview","full_name":"wireapp/wire-ios-link-preview","private":false,"owner":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/wireapp/wire-ios-link-preview","description":"🏷 Open Graph data parser used to generate link previews","fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios-link-preview","forks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/deployments","created_at":"2016-07-21T09:40:14Z","updated_at":"2021-07-21T07:59:30Z","pushed_at":"2021-07-21T07:59:30Z","git_url":"git://github.com/wireapp/wire-ios-link-preview.git","ssh_url":"git@github.com:wireapp/wire-ios-link-preview.git","clone_url":"https://github.com/wireapp/wire-ios-link-preview.git","svn_url":"https://github.com/wireapp/wire-ios-link-preview","homepage":" https://wire.com ","size":1295,"stargazers_count":52,"watchers_count":52,"language":"Swift","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":11,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":11,"open_issues":4,"watchers":52,"default_branch":"develop"}},"base":{"label":"wireapp:develop","ref":"develop","sha":"dc8f49fb86e6a078579a176c7300920d12e9571a","user":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":63856914,"node_id":"MDEwOlJlcG9zaXRvcnk2Mzg1NjkxNA==","name":"wire-ios-link-preview","full_name":"wireapp/wire-ios-link-preview","private":false,"owner":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/wireapp/wire-ios-link-preview","description":"🏷 Open Graph data parser used to generate link previews","fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios-link-preview","forks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/deployments","created_at":"2016-07-21T09:40:14Z","updated_at":"2021-07-21T07:59:30Z","pushed_at":"2021-07-21T07:59:30Z","git_url":"git://github.com/wireapp/wire-ios-link-preview.git","ssh_url":"git@github.com:wireapp/wire-ios-link-preview.git","clone_url":"https://github.com/wireapp/wire-ios-link-preview.git","svn_url":"https://github.com/wireapp/wire-ios-link-preview","homepage":" https://wire.com ","size":1295,"stargazers_count":52,"watchers_count":52,"language":"Swift","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":11,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":11,"open_issues":4,"watchers":52,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/80"},"html":{"href":"https://github.com/wireapp/wire-ios-link-preview/pull/80"},"issue":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/80"},"comments":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/80/comments"},"review_comments":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/80/comments"},"review_comment":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/80/commits"},"statuses":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/58d41c8de296d7dc7d2b3e173d82caf171efb291"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":3,"deletions":3,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":16047324,"login":"wireapp","gravatar_id":"","url":"https://api.github.com/orgs/wireapp","avatar_url":"https://avatars.githubusercontent.com/u/16047324?"}}
+{"id":"17245515202","type":"PullRequestEvent","actor":{"id":39814207,"login":"pull[bot]","display_login":"pull","gravatar_id":"","url":"https://api.github.com/users/pull[bot]","avatar_url":"https://avatars.githubusercontent.com/u/39814207?"},"repo":{"id":375126034,"name":"rahil-sh/tutorials","url":"https://api.github.com/repos/rahil-sh/tutorials"},"payload":{"action":"closed","number":60,"pull_request":{"url":"https://api.github.com/repos/rahil-sh/tutorials/pulls/60","id":694141538,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNTM4","html_url":"https://github.com/rahil-sh/tutorials/pull/60","diff_url":"https://github.com/rahil-sh/tutorials/pull/60.diff","patch_url":"https://github.com/rahil-sh/tutorials/pull/60.patch","issue_url":"https://api.github.com/repos/rahil-sh/tutorials/issues/60","number":60,"state":"closed","locked":false,"title":"[pull] master from eugenp:master","user":{"login":"pull[bot]","id":39814207,"node_id":"MDM6Qm90Mzk4MTQyMDc=","avatar_url":"https://avatars.githubusercontent.com/in/12910?v=4","gravatar_id":"","url":"https://api.github.com/users/pull%5Bbot%5D","html_url":"https://github.com/apps/pull","followers_url":"https://api.github.com/users/pull%5Bbot%5D/followers","following_url":"https://api.github.com/users/pull%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/pull%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/pull%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pull%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/pull%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/pull%5Bbot%5D/repos","events_url":"https://api.github.com/users/pull%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/pull%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"See [Commits](/rahil-sh/tutorials/pull/60/commits) and [Changes](/rahil-sh/tutorials/pull/60/files) for more details.\n\n-----\nCreated by [<img src=\"https://prod.download/pull-18h-svg\" valign=\"bottom\"/> **pull[bot]**](https://github.com/wei/pull)\n\n_Can you help keep this open source service alive? **[💖 Please sponsor : )](https://prod.download/pull-pr-sponsor)**_","created_at":"2021-07-21T07:59:48Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":"2021-07-21T08:00:02Z","merge_commit_sha":"1a07f9d2bfa2ba750598e8da153f101f645e35fe","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3073681260,"node_id":"MDU6TGFiZWwzMDczNjgxMjYw","url":"https://api.github.com/repos/rahil-sh/tutorials/labels/:arrow_heading_down:%20pull","name":":arrow_heading_down: pull","color":"ededed","default":false,"description":null}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/rahil-sh/tutorials/pulls/60/commits","review_comments_url":"https://api.github.com/repos/rahil-sh/tutorials/pulls/60/comments","review_comment_url":"https://api.github.com/repos/rahil-sh/tutorials/pulls/comments{/number}","comments_url":"https://api.github.com/repos/rahil-sh/tutorials/issues/60/comments","statuses_url":"https://api.github.com/repos/rahil-sh/tutorials/statuses/1a07f9d2bfa2ba750598e8da153f101f645e35fe","head":{"label":"eugenp:master","ref":"master","sha":"1a07f9d2bfa2ba750598e8da153f101f645e35fe","user":{"login":"eugenp","id":1022859,"node_id":"MDQ6VXNlcjEwMjI4NTk=","avatar_url":"https://avatars.githubusercontent.com/u/1022859?v=4","gravatar_id":"","url":"https://api.github.com/users/eugenp","html_url":"https://github.com/eugenp","followers_url":"https://api.github.com/users/eugenp/followers","following_url":"https://api.github.com/users/eugenp/following{/other_user}","gists_url":"https://api.github.com/users/eugenp/gists{/gist_id}","starred_url":"https://api.github.com/users/eugenp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eugenp/subscriptions","organizations_url":"https://api.github.com/users/eugenp/orgs","repos_url":"https://api.github.com/users/eugenp/repos","events_url":"https://api.github.com/users/eugenp/events{/privacy}","received_events_url":"https://api.github.com/users/eugenp/received_events","type":"User","site_admin":false},"repo":{"id":9754983,"node_id":"MDEwOlJlcG9zaXRvcnk5NzU0OTgz","name":"tutorials","full_name":"eugenp/tutorials","private":false,"owner":{"login":"eugenp","id":1022859,"node_id":"MDQ6VXNlcjEwMjI4NTk=","avatar_url":"https://avatars.githubusercontent.com/u/1022859?v=4","gravatar_id":"","url":"https://api.github.com/users/eugenp","html_url":"https://github.com/eugenp","followers_url":"https://api.github.com/users/eugenp/followers","following_url":"https://api.github.com/users/eugenp/following{/other_user}","gists_url":"https://api.github.com/users/eugenp/gists{/gist_id}","starred_url":"https://api.github.com/users/eugenp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eugenp/subscriptions","organizations_url":"https://api.github.com/users/eugenp/orgs","repos_url":"https://api.github.com/users/eugenp/repos","events_url":"https://api.github.com/users/eugenp/events{/privacy}","received_events_url":"https://api.github.com/users/eugenp/received_events","type":"User","site_admin":false},"html_url":"https://github.com/eugenp/tutorials","description":"Just Announced - \"Learn Spring Security OAuth\": ","fork":false,"url":"https://api.github.com/repos/eugenp/tutorials","forks_url":"https://api.github.com/repos/eugenp/tutorials/forks","keys_url":"https://api.github.com/repos/eugenp/tutorials/keys{/key_id}","collaborators_url":"https://api.github.com/repos/eugenp/tutorials/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/eugenp/tutorials/teams","hooks_url":"https://api.github.com/repos/eugenp/tutorials/hooks","issue_events_url":"https://api.github.com/repos/eugenp/tutorials/issues/events{/number}","events_url":"https://api.github.com/repos/eugenp/tutorials/events","assignees_url":"https://api.github.com/repos/eugenp/tutorials/assignees{/user}","branches_url":"https://api.github.com/repos/eugenp/tutorials/branches{/branch}","tags_url":"https://api.github.com/repos/eugenp/tutorials/tags","blobs_url":"https://api.github.com/repos/eugenp/tutorials/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/eugenp/tutorials/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/eugenp/tutorials/git/refs{/sha}","trees_url":"https://api.github.com/repos/eugenp/tutorials/git/trees{/sha}","statuses_url":"https://api.github.com/repos/eugenp/tutorials/statuses/{sha}","languages_url":"https://api.github.com/repos/eugenp/tutorials/languages","stargazers_url":"https://api.github.com/repos/eugenp/tutorials/stargazers","contributors_url":"https://api.github.com/repos/eugenp/tutorials/contributors","subscribers_url":"https://api.github.com/repos/eugenp/tutorials/subscribers","subscription_url":"https://api.github.com/repos/eugenp/tutorials/subscription","commits_url":"https://api.github.com/repos/eugenp/tutorials/commits{/sha}","git_commits_url":"https://api.github.com/repos/eugenp/tutorials/git/commits{/sha}","comments_url":"https://api.github.com/repos/eugenp/tutorials/comments{/number}","issue_comment_url":"https://api.github.com/repos/eugenp/tutorials/issues/comments{/number}","contents_url":"https://api.github.com/repos/eugenp/tutorials/contents/{+path}","compare_url":"https://api.github.com/repos/eugenp/tutorials/compare/{base}...{head}","merges_url":"https://api.github.com/repos/eugenp/tutorials/merges","archive_url":"https://api.github.com/repos/eugenp/tutorials/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/eugenp/tutorials/downloads","issues_url":"https://api.github.com/repos/eugenp/tutorials/issues{/number}","pulls_url":"https://api.github.com/repos/eugenp/tutorials/pulls{/number}","milestones_url":"https://api.github.com/repos/eugenp/tutorials/milestones{/number}","notifications_url":"https://api.github.com/repos/eugenp/tutorials/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/eugenp/tutorials/labels{/name}","releases_url":"https://api.github.com/repos/eugenp/tutorials/releases{/id}","deployments_url":"https://api.github.com/repos/eugenp/tutorials/deployments","created_at":"2013-04-29T18:26:36Z","updated_at":"2021-07-21T07:27:14Z","pushed_at":"2021-07-21T03:17:19Z","git_url":"git://github.com/eugenp/tutorials.git","ssh_url":"git@github.com:eugenp/tutorials.git","clone_url":"https://github.com/eugenp/tutorials.git","svn_url":"https://github.com/eugenp/tutorials","homepage":"http://bit.ly/github-lsso","size":323346,"stargazers_count":26689,"watchers_count":26689,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":43022,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":60,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":43022,"open_issues":60,"watchers":26689,"default_branch":"master"}},"base":{"label":"rahil-sh:master","ref":"master","sha":"182dfd4e9f5f3d5a938eac648bea09a082ddc711","user":{"login":"rahil-sh","id":85578837,"node_id":"MDQ6VXNlcjg1NTc4ODM3","avatar_url":"https://avatars.githubusercontent.com/u/85578837?v=4","gravatar_id":"","url":"https://api.github.com/users/rahil-sh","html_url":"https://github.com/rahil-sh","followers_url":"https://api.github.com/users/rahil-sh/followers","following_url":"https://api.github.com/users/rahil-sh/following{/other_user}","gists_url":"https://api.github.com/users/rahil-sh/gists{/gist_id}","starred_url":"https://api.github.com/users/rahil-sh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rahil-sh/subscriptions","organizations_url":"https://api.github.com/users/rahil-sh/orgs","repos_url":"https://api.github.com/users/rahil-sh/repos","events_url":"https://api.github.com/users/rahil-sh/events{/privacy}","received_events_url":"https://api.github.com/users/rahil-sh/received_events","type":"User","site_admin":false},"repo":{"id":375126034,"node_id":"MDEwOlJlcG9zaXRvcnkzNzUxMjYwMzQ=","name":"tutorials","full_name":"rahil-sh/tutorials","private":false,"owner":{"login":"rahil-sh","id":85578837,"node_id":"MDQ6VXNlcjg1NTc4ODM3","avatar_url":"https://avatars.githubusercontent.com/u/85578837?v=4","gravatar_id":"","url":"https://api.github.com/users/rahil-sh","html_url":"https://github.com/rahil-sh","followers_url":"https://api.github.com/users/rahil-sh/followers","following_url":"https://api.github.com/users/rahil-sh/following{/other_user}","gists_url":"https://api.github.com/users/rahil-sh/gists{/gist_id}","starred_url":"https://api.github.com/users/rahil-sh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rahil-sh/subscriptions","organizations_url":"https://api.github.com/users/rahil-sh/orgs","repos_url":"https://api.github.com/users/rahil-sh/repos","events_url":"https://api.github.com/users/rahil-sh/events{/privacy}","received_events_url":"https://api.github.com/users/rahil-sh/received_events","type":"User","site_admin":false},"html_url":"https://github.com/rahil-sh/tutorials","description":"Just Announced - \"Learn Spring Security OAuth\": ","fork":true,"url":"https://api.github.com/repos/rahil-sh/tutorials","forks_url":"https://api.github.com/repos/rahil-sh/tutorials/forks","keys_url":"https://api.github.com/repos/rahil-sh/tutorials/keys{/key_id}","collaborators_url":"https://api.github.com/repos/rahil-sh/tutorials/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/rahil-sh/tutorials/teams","hooks_url":"https://api.github.com/repos/rahil-sh/tutorials/hooks","issue_events_url":"https://api.github.com/repos/rahil-sh/tutorials/issues/events{/number}","events_url":"https://api.github.com/repos/rahil-sh/tutorials/events","assignees_url":"https://api.github.com/repos/rahil-sh/tutorials/assignees{/user}","branches_url":"https://api.github.com/repos/rahil-sh/tutorials/branches{/branch}","tags_url":"https://api.github.com/repos/rahil-sh/tutorials/tags","blobs_url":"https://api.github.com/repos/rahil-sh/tutorials/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/rahil-sh/tutorials/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/rahil-sh/tutorials/git/refs{/sha}","trees_url":"https://api.github.com/repos/rahil-sh/tutorials/git/trees{/sha}","statuses_url":"https://api.github.com/repos/rahil-sh/tutorials/statuses/{sha}","languages_url":"https://api.github.com/repos/rahil-sh/tutorials/languages","stargazers_url":"https://api.github.com/repos/rahil-sh/tutorials/stargazers","contributors_url":"https://api.github.com/repos/rahil-sh/tutorials/contributors","subscribers_url":"https://api.github.com/repos/rahil-sh/tutorials/subscribers","subscription_url":"https://api.github.com/repos/rahil-sh/tutorials/subscription","commits_url":"https://api.github.com/repos/rahil-sh/tutorials/commits{/sha}","git_commits_url":"https://api.github.com/repos/rahil-sh/tutorials/git/commits{/sha}","comments_url":"https://api.github.com/repos/rahil-sh/tutorials/comments{/number}","issue_comment_url":"https://api.github.com/repos/rahil-sh/tutorials/issues/comments{/number}","contents_url":"https://api.github.com/repos/rahil-sh/tutorials/contents/{+path}","compare_url":"https://api.github.com/repos/rahil-sh/tutorials/compare/{base}...{head}","merges_url":"https://api.github.com/repos/rahil-sh/tutorials/merges","archive_url":"https://api.github.com/repos/rahil-sh/tutorials/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/rahil-sh/tutorials/downloads","issues_url":"https://api.github.com/repos/rahil-sh/tutorials/issues{/number}","pulls_url":"https://api.github.com/repos/rahil-sh/tutorials/pulls{/number}","milestones_url":"https://api.github.com/repos/rahil-sh/tutorials/milestones{/number}","notifications_url":"https://api.github.com/repos/rahil-sh/tutorials/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/rahil-sh/tutorials/labels{/name}","releases_url":"https://api.github.com/repos/rahil-sh/tutorials/releases{/id}","deployments_url":"https://api.github.com/repos/rahil-sh/tutorials/deployments","created_at":"2021-06-08T19:42:50Z","updated_at":"2021-07-21T02:00:55Z","pushed_at":"2021-07-21T07:59:58Z","git_url":"git://github.com/rahil-sh/tutorials.git","ssh_url":"git@github.com:rahil-sh/tutorials.git","clone_url":"https://github.com/rahil-sh/tutorials.git","svn_url":"https://github.com/rahil-sh/tutorials","homepage":"http://bit.ly/github-lsso","size":332769,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/rahil-sh/tutorials/pulls/60"},"html":{"href":"https://github.com/rahil-sh/tutorials/pull/60"},"issue":{"href":"https://api.github.com/repos/rahil-sh/tutorials/issues/60"},"comments":{"href":"https://api.github.com/repos/rahil-sh/tutorials/issues/60/comments"},"review_comments":{"href":"https://api.github.com/repos/rahil-sh/tutorials/pulls/60/comments"},"review_comment":{"href":"https://api.github.com/repos/rahil-sh/tutorials/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/rahil-sh/tutorials/pulls/60/commits"},"statuses":{"href":"https://api.github.com/repos/rahil-sh/tutorials/statuses/1a07f9d2bfa2ba750598e8da153f101f645e35fe"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"pull[bot]","id":39814207,"node_id":"MDM6Qm90Mzk4MTQyMDc=","avatar_url":"https://avatars.githubusercontent.com/in/12910?v=4","gravatar_id":"","url":"https://api.github.com/users/pull%5Bbot%5D","html_url":"https://github.com/apps/pull","followers_url":"https://api.github.com/users/pull%5Bbot%5D/followers","following_url":"https://api.github.com/users/pull%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/pull%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/pull%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pull%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/pull%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/pull%5Bbot%5D/repos","events_url":"https://api.github.com/users/pull%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/pull%5Bbot%5D/received_events","type":"Bot","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":53,"deletions":0,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515205","type":"PushEvent","actor":{"id":86876730,"login":"sfr404sfrzed","display_login":"sfr404sfrzed","gravatar_id":"","url":"https://api.github.com/users/sfr404sfrzed","avatar_url":"https://avatars.githubusercontent.com/u/86876730?"},"repo":{"id":383315825,"name":"sfr404sfrzed/-","url":"https://api.github.com/repos/sfr404sfrzed/-"},"payload":{"push_id":7562055222,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f233b944ce3ec0be6cf7038527cf14ddf15f2cc8","before":"fe2e016c130dc5f2de204512fd0ad5460ef1dbba","commits":[{"sha":"f233b944ce3ec0be6cf7038527cf14ddf15f2cc8","author":{"name":"sfr404sfrzed","email":"e8b38d236e779bd3d93aa607ce187e27372ff3f7@users.noreply.github.com"},"message":"Update .dabll.py","distinct":true,"url":"https://api.github.com/repos/sfr404sfrzed/-/commits/f233b944ce3ec0be6cf7038527cf14ddf15f2cc8"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515211","type":"PushEvent","actor":{"id":46501627,"login":"0xhunster","display_login":"0xhunster","gravatar_id":"","url":"https://api.github.com/users/0xhunster","avatar_url":"https://avatars.githubusercontent.com/u/46501627?"},"repo":{"id":292098379,"name":"0xhunster/0xhunster.github.io","url":"https://api.github.com/repos/0xhunster/0xhunster.github.io"},"payload":{"push_id":7562055227,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"7c959432ea27aa928568d20636819603ad0382a1","before":"f9d9ca2abe676b4fb597961c224202b50ffd90f7","commits":[{"sha":"7c959432ea27aa928568d20636819603ad0382a1","author":{"name":"Akash Sarkar","email":"e1eef10dc4a5729ad931ea352715b4ae9cd01075@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/0xhunster/0xhunster.github.io/commits/7c959432ea27aa928568d20636819603ad0382a1"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515212","type":"PushEvent","actor":{"id":10975639,"login":"qtprojectorg","display_login":"qtprojectorg","gravatar_id":"","url":"https://api.github.com/users/qtprojectorg","avatar_url":"https://avatars.githubusercontent.com/u/10975639?"},"repo":{"id":9881624,"name":"qt/qttranslations","url":"https://api.github.com/repos/qt/qttranslations"},"payload":{"push_id":7562055232,"size":1,"distinct_size":1,"ref":"refs/heads/dev","head":"535b068b191cbe3a56dc90ae3d1af869c3fc3ec9","before":"437130042058bf19481bf7b53dfc10a819642e05","commits":[{"sha":"535b068b191cbe3a56dc90ae3d1af869c3fc3ec9","author":{"name":"Qt Submodule Update Bot","email":"2f81ea16450dd03d9daf9b88cc53108e117fc79b@qt-project.org"},"message":"Update dependencies on 'dev' in qt/qttranslations\n\nChange-Id: I01975c33e7329939ba36a17baa85b8fad443c227\nReviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>","distinct":true,"url":"https://api.github.com/repos/qt/qttranslations/commits/535b068b191cbe3a56dc90ae3d1af869c3fc3ec9"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":159455,"login":"qt","gravatar_id":"","url":"https://api.github.com/orgs/qt","avatar_url":"https://avatars.githubusercontent.com/u/159455?"}}
+{"id":"17245515217","type":"PushEvent","actor":{"id":59720881,"login":"J-hash-code","display_login":"J-hash-code","gravatar_id":"","url":"https://api.github.com/users/J-hash-code","avatar_url":"https://avatars.githubusercontent.com/u/59720881?"},"repo":{"id":385447829,"name":"J-hash-code/PoonSwimming","url":"https://api.github.com/repos/J-hash-code/PoonSwimming"},"payload":{"push_id":7562055241,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"06e8c5b12e6eb6ae5dc757eff391fb5111c02432","before":"61506c933217661dcf0a249e92b01b4ca2833204","commits":[{"sha":"06e8c5b12e6eb6ae5dc757eff391fb5111c02432","author":{"name":"J-hash-code","email":"991da99bcfc402530d397c6b753e7416e6ede3ee@users.noreply.github.com"},"message":"Update index.html","distinct":true,"url":"https://api.github.com/repos/J-hash-code/PoonSwimming/commits/06e8c5b12e6eb6ae5dc757eff391fb5111c02432"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515219","type":"PushEvent","actor":{"id":59730796,"login":"avbuben","display_login":"avbuben","gravatar_id":"","url":"https://api.github.com/users/avbuben","avatar_url":"https://avatars.githubusercontent.com/u/59730796?"},"repo":{"id":386308872,"name":"a-devops/ansible-postgresql-role","url":"https://api.github.com/repos/a-devops/ansible-postgresql-role"},"payload":{"push_id":7562055251,"size":2,"distinct_size":1,"ref":"refs/heads/master","head":"fbbdb8a7ff006efce63b7d5e59caf9b676ba6783","before":"cb3e6294c1a0d7a606f8fe87ccdf9dc17d7a3b1b","commits":[{"sha":"7416dd1f1a5bd012d3531c2ddb976eea6effa3f3","author":{"name":"Artur Buben","email":"853ff7c15ca2608fd8666e8315a14b21a726852e@admitad.com"},"message":"devops-2367 update role","distinct":false,"url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/commits/7416dd1f1a5bd012d3531c2ddb976eea6effa3f3"},{"sha":"fbbdb8a7ff006efce63b7d5e59caf9b676ba6783","author":{"name":"avbuben","email":"e14bbad8df6257e3228b2b59bf768b694e318bde@users.noreply.github.com"},"message":"Merge pull request #1 from a-devops/internal/devops-2367-update-role\n\ndevops-2367 update role","distinct":true,"url":"https://api.github.com/repos/a-devops/ansible-postgresql-role/commits/fbbdb8a7ff006efce63b7d5e59caf9b676ba6783"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":59089336,"login":"a-devops","gravatar_id":"","url":"https://api.github.com/orgs/a-devops","avatar_url":"https://avatars.githubusercontent.com/u/59089336?"}}
+{"id":"17245515220","type":"CreateEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388040568,"name":"thatjohn01/753021085","url":"https://api.github.com/repos/thatjohn01/753021085"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":"西藏的孩子_PDF下载_鹰萨·罗布次仁著","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515236","type":"PushEvent","actor":{"id":8517910,"login":"LombiqBot","display_login":"LombiqBot","gravatar_id":"","url":"https://api.github.com/users/LombiqBot","avatar_url":"https://avatars.githubusercontent.com/u/8517910?"},"repo":{"id":49138417,"name":"Lombiq/Om.Orchard.SocialMetaTags","url":"https://api.github.com/repos/Lombiq/Om.Orchard.SocialMetaTags"},"payload":{"push_id":7562055260,"size":0,"distinct_size":0,"ref":"refs/heads/Orchard-1.10.Version","head":"305ee65dde62fcbda897fcff9ccce06fde76e5d8","before":"305ee65dde62fcbda897fcff9ccce06fde76e5d8","commits":[]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":8158177,"login":"Lombiq","gravatar_id":"","url":"https://api.github.com/orgs/Lombiq","avatar_url":"https://avatars.githubusercontent.com/u/8158177?"}}
+{"id":"17245515246","type":"PullRequestEvent","actor":{"id":45119856,"login":"elephaint","display_login":"elephaint","gravatar_id":"","url":"https://api.github.com/users/elephaint","avatar_url":"https://avatars.githubusercontent.com/u/45119856?"},"repo":{"id":368168520,"name":"elephaint/pgbm","url":"https://api.github.com/repos/elephaint/pgbm"},"payload":{"action":"closed","number":2,"pull_request":{"url":"https://api.github.com/repos/elephaint/pgbm/pulls/2","id":687631920,"node_id":"MDExOlB1bGxSZXF1ZXN0Njg3NjMxOTIw","html_url":"https://github.com/elephaint/pgbm/pull/2","diff_url":"https://github.com/elephaint/pgbm/pull/2.diff","patch_url":"https://github.com/elephaint/pgbm/pull/2.patch","issue_url":"https://api.github.com/repos/elephaint/pgbm/issues/2","number":2,"state":"closed","locked":false,"title":"GitHub workflows for installing on Linux, Windows, and Mac with CPU only","user":{"login":"shubhaguha","id":8782581,"node_id":"MDQ6VXNlcjg3ODI1ODE=","avatar_url":"https://avatars.githubusercontent.com/u/8782581?v=4","gravatar_id":"","url":"https://api.github.com/users/shubhaguha","html_url":"https://github.com/shubhaguha","followers_url":"https://api.github.com/users/shubhaguha/followers","following_url":"https://api.github.com/users/shubhaguha/following{/other_user}","gists_url":"https://api.github.com/users/shubhaguha/gists{/gist_id}","starred_url":"https://api.github.com/users/shubhaguha/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shubhaguha/subscriptions","organizations_url":"https://api.github.com/users/shubhaguha/orgs","repos_url":"https://api.github.com/users/shubhaguha/repos","events_url":"https://api.github.com/users/shubhaguha/events{/privacy}","received_events_url":"https://api.github.com/users/shubhaguha/received_events","type":"User","site_admin":false},"body":"See project's \"Actions\" tab for some already successful runs: https://github.com/elephaint/pgbm/actions","created_at":"2021-07-12T08:39:37Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":"2021-07-21T08:00:02Z","merge_commit_sha":"d74fdc2777572de132b98d699005ee6e298b7cd4","assignee":null,"assignees":[],"requested_reviewers":[{"login":"sscdotopen","id":409707,"node_id":"MDQ6VXNlcjQwOTcwNw==","avatar_url":"https://avatars.githubusercontent.com/u/409707?v=4","gravatar_id":"","url":"https://api.github.com/users/sscdotopen","html_url":"https://github.com/sscdotopen","followers_url":"https://api.github.com/users/sscdotopen/followers","following_url":"https://api.github.com/users/sscdotopen/following{/other_user}","gists_url":"https://api.github.com/users/sscdotopen/gists{/gist_id}","starred_url":"https://api.github.com/users/sscdotopen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sscdotopen/subscriptions","organizations_url":"https://api.github.com/users/sscdotopen/orgs","repos_url":"https://api.github.com/users/sscdotopen/repos","events_url":"https://api.github.com/users/sscdotopen/events{/privacy}","received_events_url":"https://api.github.com/users/sscdotopen/received_events","type":"User","site_admin":false},{"login":"elephaint","id":45119856,"node_id":"MDQ6VXNlcjQ1MTE5ODU2","avatar_url":"https://avatars.githubusercontent.com/u/45119856?v=4","gravatar_id":"","url":"https://api.github.com/users/elephaint","html_url":"https://github.com/elephaint","followers_url":"https://api.github.com/users/elephaint/followers","following_url":"https://api.github.com/users/elephaint/following{/other_user}","gists_url":"https://api.github.com/users/elephaint/gists{/gist_id}","starred_url":"https://api.github.com/users/elephaint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elephaint/subscriptions","organizations_url":"https://api.github.com/users/elephaint/orgs","repos_url":"https://api.github.com/users/elephaint/repos","events_url":"https://api.github.com/users/elephaint/events{/privacy}","received_events_url":"https://api.github.com/users/elephaint/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/elephaint/pgbm/pulls/2/commits","review_comments_url":"https://api.github.com/repos/elephaint/pgbm/pulls/2/comments","review_comment_url":"https://api.github.com/repos/elephaint/pgbm/pulls/comments{/number}","comments_url":"https://api.github.com/repos/elephaint/pgbm/issues/2/comments","statuses_url":"https://api.github.com/repos/elephaint/pgbm/statuses/004f710484cf1300f2f1e92a358e187c143eed43","head":{"label":"elephaint:workflows","ref":"workflows","sha":"004f710484cf1300f2f1e92a358e187c143eed43","user":{"login":"elephaint","id":45119856,"node_id":"MDQ6VXNlcjQ1MTE5ODU2","avatar_url":"https://avatars.githubusercontent.com/u/45119856?v=4","gravatar_id":"","url":"https://api.github.com/users/elephaint","html_url":"https://github.com/elephaint","followers_url":"https://api.github.com/users/elephaint/followers","following_url":"https://api.github.com/users/elephaint/following{/other_user}","gists_url":"https://api.github.com/users/elephaint/gists{/gist_id}","starred_url":"https://api.github.com/users/elephaint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elephaint/subscriptions","organizations_url":"https://api.github.com/users/elephaint/orgs","repos_url":"https://api.github.com/users/elephaint/repos","events_url":"https://api.github.com/users/elephaint/events{/privacy}","received_events_url":"https://api.github.com/users/elephaint/received_events","type":"User","site_admin":false},"repo":{"id":368168520,"node_id":"MDEwOlJlcG9zaXRvcnkzNjgxNjg1MjA=","name":"pgbm","full_name":"elephaint/pgbm","private":false,"owner":{"login":"elephaint","id":45119856,"node_id":"MDQ6VXNlcjQ1MTE5ODU2","avatar_url":"https://avatars.githubusercontent.com/u/45119856?v=4","gravatar_id":"","url":"https://api.github.com/users/elephaint","html_url":"https://github.com/elephaint","followers_url":"https://api.github.com/users/elephaint/followers","following_url":"https://api.github.com/users/elephaint/following{/other_user}","gists_url":"https://api.github.com/users/elephaint/gists{/gist_id}","starred_url":"https://api.github.com/users/elephaint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elephaint/subscriptions","organizations_url":"https://api.github.com/users/elephaint/orgs","repos_url":"https://api.github.com/users/elephaint/repos","events_url":"https://api.github.com/users/elephaint/events{/privacy}","received_events_url":"https://api.github.com/users/elephaint/received_events","type":"User","site_admin":false},"html_url":"https://github.com/elephaint/pgbm","description":"Probabilistic Gradient Boosting Machines","fork":false,"url":"https://api.github.com/repos/elephaint/pgbm","forks_url":"https://api.github.com/repos/elephaint/pgbm/forks","keys_url":"https://api.github.com/repos/elephaint/pgbm/keys{/key_id}","collaborators_url":"https://api.github.com/repos/elephaint/pgbm/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/elephaint/pgbm/teams","hooks_url":"https://api.github.com/repos/elephaint/pgbm/hooks","issue_events_url":"https://api.github.com/repos/elephaint/pgbm/issues/events{/number}","events_url":"https://api.github.com/repos/elephaint/pgbm/events","assignees_url":"https://api.github.com/repos/elephaint/pgbm/assignees{/user}","branches_url":"https://api.github.com/repos/elephaint/pgbm/branches{/branch}","tags_url":"https://api.github.com/repos/elephaint/pgbm/tags","blobs_url":"https://api.github.com/repos/elephaint/pgbm/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/elephaint/pgbm/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/elephaint/pgbm/git/refs{/sha}","trees_url":"https://api.github.com/repos/elephaint/pgbm/git/trees{/sha}","statuses_url":"https://api.github.com/repos/elephaint/pgbm/statuses/{sha}","languages_url":"https://api.github.com/repos/elephaint/pgbm/languages","stargazers_url":"https://api.github.com/repos/elephaint/pgbm/stargazers","contributors_url":"https://api.github.com/repos/elephaint/pgbm/contributors","subscribers_url":"https://api.github.com/repos/elephaint/pgbm/subscribers","subscription_url":"https://api.github.com/repos/elephaint/pgbm/subscription","commits_url":"https://api.github.com/repos/elephaint/pgbm/commits{/sha}","git_commits_url":"https://api.github.com/repos/elephaint/pgbm/git/commits{/sha}","comments_url":"https://api.github.com/repos/elephaint/pgbm/comments{/number}","issue_comment_url":"https://api.github.com/repos/elephaint/pgbm/issues/comments{/number}","contents_url":"https://api.github.com/repos/elephaint/pgbm/contents/{+path}","compare_url":"https://api.github.com/repos/elephaint/pgbm/compare/{base}...{head}","merges_url":"https://api.github.com/repos/elephaint/pgbm/merges","archive_url":"https://api.github.com/repos/elephaint/pgbm/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/elephaint/pgbm/downloads","issues_url":"https://api.github.com/repos/elephaint/pgbm/issues{/number}","pulls_url":"https://api.github.com/repos/elephaint/pgbm/pulls{/number}","milestones_url":"https://api.github.com/repos/elephaint/pgbm/milestones{/number}","notifications_url":"https://api.github.com/repos/elephaint/pgbm/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/elephaint/pgbm/labels{/name}","releases_url":"https://api.github.com/repos/elephaint/pgbm/releases{/id}","deployments_url":"https://api.github.com/repos/elephaint/pgbm/deployments","created_at":"2021-05-17T11:57:25Z","updated_at":"2021-07-13T14:46:06Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/elephaint/pgbm.git","ssh_url":"git@github.com:elephaint/pgbm.git","clone_url":"https://github.com/elephaint/pgbm.git","svn_url":"https://github.com/elephaint/pgbm","homepage":null,"size":1059,"stargazers_count":51,"watchers_count":51,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":5,"open_issues":0,"watchers":51,"default_branch":"main"}},"base":{"label":"elephaint:main","ref":"main","sha":"82c79d35670ae91035e06285b0321455aff8fef9","user":{"login":"elephaint","id":45119856,"node_id":"MDQ6VXNlcjQ1MTE5ODU2","avatar_url":"https://avatars.githubusercontent.com/u/45119856?v=4","gravatar_id":"","url":"https://api.github.com/users/elephaint","html_url":"https://github.com/elephaint","followers_url":"https://api.github.com/users/elephaint/followers","following_url":"https://api.github.com/users/elephaint/following{/other_user}","gists_url":"https://api.github.com/users/elephaint/gists{/gist_id}","starred_url":"https://api.github.com/users/elephaint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elephaint/subscriptions","organizations_url":"https://api.github.com/users/elephaint/orgs","repos_url":"https://api.github.com/users/elephaint/repos","events_url":"https://api.github.com/users/elephaint/events{/privacy}","received_events_url":"https://api.github.com/users/elephaint/received_events","type":"User","site_admin":false},"repo":{"id":368168520,"node_id":"MDEwOlJlcG9zaXRvcnkzNjgxNjg1MjA=","name":"pgbm","full_name":"elephaint/pgbm","private":false,"owner":{"login":"elephaint","id":45119856,"node_id":"MDQ6VXNlcjQ1MTE5ODU2","avatar_url":"https://avatars.githubusercontent.com/u/45119856?v=4","gravatar_id":"","url":"https://api.github.com/users/elephaint","html_url":"https://github.com/elephaint","followers_url":"https://api.github.com/users/elephaint/followers","following_url":"https://api.github.com/users/elephaint/following{/other_user}","gists_url":"https://api.github.com/users/elephaint/gists{/gist_id}","starred_url":"https://api.github.com/users/elephaint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elephaint/subscriptions","organizations_url":"https://api.github.com/users/elephaint/orgs","repos_url":"https://api.github.com/users/elephaint/repos","events_url":"https://api.github.com/users/elephaint/events{/privacy}","received_events_url":"https://api.github.com/users/elephaint/received_events","type":"User","site_admin":false},"html_url":"https://github.com/elephaint/pgbm","description":"Probabilistic Gradient Boosting Machines","fork":false,"url":"https://api.github.com/repos/elephaint/pgbm","forks_url":"https://api.github.com/repos/elephaint/pgbm/forks","keys_url":"https://api.github.com/repos/elephaint/pgbm/keys{/key_id}","collaborators_url":"https://api.github.com/repos/elephaint/pgbm/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/elephaint/pgbm/teams","hooks_url":"https://api.github.com/repos/elephaint/pgbm/hooks","issue_events_url":"https://api.github.com/repos/elephaint/pgbm/issues/events{/number}","events_url":"https://api.github.com/repos/elephaint/pgbm/events","assignees_url":"https://api.github.com/repos/elephaint/pgbm/assignees{/user}","branches_url":"https://api.github.com/repos/elephaint/pgbm/branches{/branch}","tags_url":"https://api.github.com/repos/elephaint/pgbm/tags","blobs_url":"https://api.github.com/repos/elephaint/pgbm/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/elephaint/pgbm/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/elephaint/pgbm/git/refs{/sha}","trees_url":"https://api.github.com/repos/elephaint/pgbm/git/trees{/sha}","statuses_url":"https://api.github.com/repos/elephaint/pgbm/statuses/{sha}","languages_url":"https://api.github.com/repos/elephaint/pgbm/languages","stargazers_url":"https://api.github.com/repos/elephaint/pgbm/stargazers","contributors_url":"https://api.github.com/repos/elephaint/pgbm/contributors","subscribers_url":"https://api.github.com/repos/elephaint/pgbm/subscribers","subscription_url":"https://api.github.com/repos/elephaint/pgbm/subscription","commits_url":"https://api.github.com/repos/elephaint/pgbm/commits{/sha}","git_commits_url":"https://api.github.com/repos/elephaint/pgbm/git/commits{/sha}","comments_url":"https://api.github.com/repos/elephaint/pgbm/comments{/number}","issue_comment_url":"https://api.github.com/repos/elephaint/pgbm/issues/comments{/number}","contents_url":"https://api.github.com/repos/elephaint/pgbm/contents/{+path}","compare_url":"https://api.github.com/repos/elephaint/pgbm/compare/{base}...{head}","merges_url":"https://api.github.com/repos/elephaint/pgbm/merges","archive_url":"https://api.github.com/repos/elephaint/pgbm/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/elephaint/pgbm/downloads","issues_url":"https://api.github.com/repos/elephaint/pgbm/issues{/number}","pulls_url":"https://api.github.com/repos/elephaint/pgbm/pulls{/number}","milestones_url":"https://api.github.com/repos/elephaint/pgbm/milestones{/number}","notifications_url":"https://api.github.com/repos/elephaint/pgbm/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/elephaint/pgbm/labels{/name}","releases_url":"https://api.github.com/repos/elephaint/pgbm/releases{/id}","deployments_url":"https://api.github.com/repos/elephaint/pgbm/deployments","created_at":"2021-05-17T11:57:25Z","updated_at":"2021-07-13T14:46:06Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/elephaint/pgbm.git","ssh_url":"git@github.com:elephaint/pgbm.git","clone_url":"https://github.com/elephaint/pgbm.git","svn_url":"https://github.com/elephaint/pgbm","homepage":null,"size":1059,"stargazers_count":51,"watchers_count":51,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":5,"open_issues":0,"watchers":51,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/elephaint/pgbm/pulls/2"},"html":{"href":"https://github.com/elephaint/pgbm/pull/2"},"issue":{"href":"https://api.github.com/repos/elephaint/pgbm/issues/2"},"comments":{"href":"https://api.github.com/repos/elephaint/pgbm/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/elephaint/pgbm/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/elephaint/pgbm/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/elephaint/pgbm/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/elephaint/pgbm/statuses/004f710484cf1300f2f1e92a358e187c143eed43"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"elephaint","id":45119856,"node_id":"MDQ6VXNlcjQ1MTE5ODU2","avatar_url":"https://avatars.githubusercontent.com/u/45119856?v=4","gravatar_id":"","url":"https://api.github.com/users/elephaint","html_url":"https://github.com/elephaint","followers_url":"https://api.github.com/users/elephaint/followers","following_url":"https://api.github.com/users/elephaint/following{/other_user}","gists_url":"https://api.github.com/users/elephaint/gists{/gist_id}","starred_url":"https://api.github.com/users/elephaint/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elephaint/subscriptions","organizations_url":"https://api.github.com/users/elephaint/orgs","repos_url":"https://api.github.com/users/elephaint/repos","events_url":"https://api.github.com/users/elephaint/events{/privacy}","received_events_url":"https://api.github.com/users/elephaint/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":156,"deletions":0,"changed_files":3}},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515254","type":"PullRequestEvent","actor":{"id":813732,"login":"glasnt","display_login":"glasnt","gravatar_id":"","url":"https://api.github.com/users/glasnt","avatar_url":"https://avatars.githubusercontent.com/u/813732?"},"repo":{"id":387935031,"name":"glasnt/bookish-winner","url":"https://api.github.com/repos/glasnt/bookish-winner"},"payload":{"action":"closed","number":12,"pull_request":{"url":"https://api.github.com/repos/glasnt/bookish-winner/pulls/12","id":694131454,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTMxNDU0","html_url":"https://github.com/glasnt/bookish-winner/pull/12","diff_url":"https://github.com/glasnt/bookish-winner/pull/12.diff","patch_url":"https://github.com/glasnt/bookish-winner/pull/12.patch","issue_url":"https://api.github.com/repos/glasnt/bookish-winner/issues/12","number":12,"state":"closed","locked":false,"title":"Update app.py","user":{"login":"glasnt","id":813732,"node_id":"MDQ6VXNlcjgxMzczMg==","avatar_url":"https://avatars.githubusercontent.com/u/813732?v=4","gravatar_id":"","url":"https://api.github.com/users/glasnt","html_url":"https://github.com/glasnt","followers_url":"https://api.github.com/users/glasnt/followers","following_url":"https://api.github.com/users/glasnt/following{/other_user}","gists_url":"https://api.github.com/users/glasnt/gists{/gist_id}","starred_url":"https://api.github.com/users/glasnt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glasnt/subscriptions","organizations_url":"https://api.github.com/users/glasnt/orgs","repos_url":"https://api.github.com/users/glasnt/repos","events_url":"https://api.github.com/users/glasnt/events{/privacy}","received_events_url":"https://api.github.com/users/glasnt/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:43:38Z","updated_at":"2021-07-21T08:00:02Z","closed_at":"2021-07-21T08:00:02Z","merged_at":null,"merge_commit_sha":"e586fb4380189708c9499e6563932fb0ebb80217","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/glasnt/bookish-winner/pulls/12/commits","review_comments_url":"https://api.github.com/repos/glasnt/bookish-winner/pulls/12/comments","review_comment_url":"https://api.github.com/repos/glasnt/bookish-winner/pulls/comments{/number}","comments_url":"https://api.github.com/repos/glasnt/bookish-winner/issues/12/comments","statuses_url":"https://api.github.com/repos/glasnt/bookish-winner/statuses/8d70707b349a3915526354bf6044151b4cbd8692","head":{"label":"glasnt:glasnt-patch-11","ref":"glasnt-patch-11","sha":"8d70707b349a3915526354bf6044151b4cbd8692","user":{"login":"glasnt","id":813732,"node_id":"MDQ6VXNlcjgxMzczMg==","avatar_url":"https://avatars.githubusercontent.com/u/813732?v=4","gravatar_id":"","url":"https://api.github.com/users/glasnt","html_url":"https://github.com/glasnt","followers_url":"https://api.github.com/users/glasnt/followers","following_url":"https://api.github.com/users/glasnt/following{/other_user}","gists_url":"https://api.github.com/users/glasnt/gists{/gist_id}","starred_url":"https://api.github.com/users/glasnt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glasnt/subscriptions","organizations_url":"https://api.github.com/users/glasnt/orgs","repos_url":"https://api.github.com/users/glasnt/repos","events_url":"https://api.github.com/users/glasnt/events{/privacy}","received_events_url":"https://api.github.com/users/glasnt/received_events","type":"User","site_admin":false},"repo":{"id":387935031,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MzUwMzE=","name":"bookish-winner","full_name":"glasnt/bookish-winner","private":false,"owner":{"login":"glasnt","id":813732,"node_id":"MDQ6VXNlcjgxMzczMg==","avatar_url":"https://avatars.githubusercontent.com/u/813732?v=4","gravatar_id":"","url":"https://api.github.com/users/glasnt","html_url":"https://github.com/glasnt","followers_url":"https://api.github.com/users/glasnt/followers","following_url":"https://api.github.com/users/glasnt/following{/other_user}","gists_url":"https://api.github.com/users/glasnt/gists{/gist_id}","starred_url":"https://api.github.com/users/glasnt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glasnt/subscriptions","organizations_url":"https://api.github.com/users/glasnt/orgs","repos_url":"https://api.github.com/users/glasnt/repos","events_url":"https://api.github.com/users/glasnt/events{/privacy}","received_events_url":"https://api.github.com/users/glasnt/received_events","type":"User","site_admin":false},"html_url":"https://github.com/glasnt/bookish-winner","description":null,"fork":false,"url":"https://api.github.com/repos/glasnt/bookish-winner","forks_url":"https://api.github.com/repos/glasnt/bookish-winner/forks","keys_url":"https://api.github.com/repos/glasnt/bookish-winner/keys{/key_id}","collaborators_url":"https://api.github.com/repos/glasnt/bookish-winner/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/glasnt/bookish-winner/teams","hooks_url":"https://api.github.com/repos/glasnt/bookish-winner/hooks","issue_events_url":"https://api.github.com/repos/glasnt/bookish-winner/issues/events{/number}","events_url":"https://api.github.com/repos/glasnt/bookish-winner/events","assignees_url":"https://api.github.com/repos/glasnt/bookish-winner/assignees{/user}","branches_url":"https://api.github.com/repos/glasnt/bookish-winner/branches{/branch}","tags_url":"https://api.github.com/repos/glasnt/bookish-winner/tags","blobs_url":"https://api.github.com/repos/glasnt/bookish-winner/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/glasnt/bookish-winner/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/glasnt/bookish-winner/git/refs{/sha}","trees_url":"https://api.github.com/repos/glasnt/bookish-winner/git/trees{/sha}","statuses_url":"https://api.github.com/repos/glasnt/bookish-winner/statuses/{sha}","languages_url":"https://api.github.com/repos/glasnt/bookish-winner/languages","stargazers_url":"https://api.github.com/repos/glasnt/bookish-winner/stargazers","contributors_url":"https://api.github.com/repos/glasnt/bookish-winner/contributors","subscribers_url":"https://api.github.com/repos/glasnt/bookish-winner/subscribers","subscription_url":"https://api.github.com/repos/glasnt/bookish-winner/subscription","commits_url":"https://api.github.com/repos/glasnt/bookish-winner/commits{/sha}","git_commits_url":"https://api.github.com/repos/glasnt/bookish-winner/git/commits{/sha}","comments_url":"https://api.github.com/repos/glasnt/bookish-winner/comments{/number}","issue_comment_url":"https://api.github.com/repos/glasnt/bookish-winner/issues/comments{/number}","contents_url":"https://api.github.com/repos/glasnt/bookish-winner/contents/{+path}","compare_url":"https://api.github.com/repos/glasnt/bookish-winner/compare/{base}...{head}","merges_url":"https://api.github.com/repos/glasnt/bookish-winner/merges","archive_url":"https://api.github.com/repos/glasnt/bookish-winner/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/glasnt/bookish-winner/downloads","issues_url":"https://api.github.com/repos/glasnt/bookish-winner/issues{/number}","pulls_url":"https://api.github.com/repos/glasnt/bookish-winner/pulls{/number}","milestones_url":"https://api.github.com/repos/glasnt/bookish-winner/milestones{/number}","notifications_url":"https://api.github.com/repos/glasnt/bookish-winner/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/glasnt/bookish-winner/labels{/name}","releases_url":"https://api.github.com/repos/glasnt/bookish-winner/releases{/id}","deployments_url":"https://api.github.com/repos/glasnt/bookish-winner/deployments","created_at":"2021-07-20T23:12:03Z","updated_at":"2021-07-21T07:51:25Z","pushed_at":"2021-07-21T07:51:39Z","git_url":"git://github.com/glasnt/bookish-winner.git","ssh_url":"git@github.com:glasnt/bookish-winner.git","clone_url":"https://github.com/glasnt/bookish-winner.git","svn_url":"https://github.com/glasnt/bookish-winner","homepage":null,"size":33,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"glasnt:main","ref":"main","sha":"d5a2f6d84ec2ce114e388da95b1dc07ba7243b1c","user":{"login":"glasnt","id":813732,"node_id":"MDQ6VXNlcjgxMzczMg==","avatar_url":"https://avatars.githubusercontent.com/u/813732?v=4","gravatar_id":"","url":"https://api.github.com/users/glasnt","html_url":"https://github.com/glasnt","followers_url":"https://api.github.com/users/glasnt/followers","following_url":"https://api.github.com/users/glasnt/following{/other_user}","gists_url":"https://api.github.com/users/glasnt/gists{/gist_id}","starred_url":"https://api.github.com/users/glasnt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glasnt/subscriptions","organizations_url":"https://api.github.com/users/glasnt/orgs","repos_url":"https://api.github.com/users/glasnt/repos","events_url":"https://api.github.com/users/glasnt/events{/privacy}","received_events_url":"https://api.github.com/users/glasnt/received_events","type":"User","site_admin":false},"repo":{"id":387935031,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MzUwMzE=","name":"bookish-winner","full_name":"glasnt/bookish-winner","private":false,"owner":{"login":"glasnt","id":813732,"node_id":"MDQ6VXNlcjgxMzczMg==","avatar_url":"https://avatars.githubusercontent.com/u/813732?v=4","gravatar_id":"","url":"https://api.github.com/users/glasnt","html_url":"https://github.com/glasnt","followers_url":"https://api.github.com/users/glasnt/followers","following_url":"https://api.github.com/users/glasnt/following{/other_user}","gists_url":"https://api.github.com/users/glasnt/gists{/gist_id}","starred_url":"https://api.github.com/users/glasnt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glasnt/subscriptions","organizations_url":"https://api.github.com/users/glasnt/orgs","repos_url":"https://api.github.com/users/glasnt/repos","events_url":"https://api.github.com/users/glasnt/events{/privacy}","received_events_url":"https://api.github.com/users/glasnt/received_events","type":"User","site_admin":false},"html_url":"https://github.com/glasnt/bookish-winner","description":null,"fork":false,"url":"https://api.github.com/repos/glasnt/bookish-winner","forks_url":"https://api.github.com/repos/glasnt/bookish-winner/forks","keys_url":"https://api.github.com/repos/glasnt/bookish-winner/keys{/key_id}","collaborators_url":"https://api.github.com/repos/glasnt/bookish-winner/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/glasnt/bookish-winner/teams","hooks_url":"https://api.github.com/repos/glasnt/bookish-winner/hooks","issue_events_url":"https://api.github.com/repos/glasnt/bookish-winner/issues/events{/number}","events_url":"https://api.github.com/repos/glasnt/bookish-winner/events","assignees_url":"https://api.github.com/repos/glasnt/bookish-winner/assignees{/user}","branches_url":"https://api.github.com/repos/glasnt/bookish-winner/branches{/branch}","tags_url":"https://api.github.com/repos/glasnt/bookish-winner/tags","blobs_url":"https://api.github.com/repos/glasnt/bookish-winner/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/glasnt/bookish-winner/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/glasnt/bookish-winner/git/refs{/sha}","trees_url":"https://api.github.com/repos/glasnt/bookish-winner/git/trees{/sha}","statuses_url":"https://api.github.com/repos/glasnt/bookish-winner/statuses/{sha}","languages_url":"https://api.github.com/repos/glasnt/bookish-winner/languages","stargazers_url":"https://api.github.com/repos/glasnt/bookish-winner/stargazers","contributors_url":"https://api.github.com/repos/glasnt/bookish-winner/contributors","subscribers_url":"https://api.github.com/repos/glasnt/bookish-winner/subscribers","subscription_url":"https://api.github.com/repos/glasnt/bookish-winner/subscription","commits_url":"https://api.github.com/repos/glasnt/bookish-winner/commits{/sha}","git_commits_url":"https://api.github.com/repos/glasnt/bookish-winner/git/commits{/sha}","comments_url":"https://api.github.com/repos/glasnt/bookish-winner/comments{/number}","issue_comment_url":"https://api.github.com/repos/glasnt/bookish-winner/issues/comments{/number}","contents_url":"https://api.github.com/repos/glasnt/bookish-winner/contents/{+path}","compare_url":"https://api.github.com/repos/glasnt/bookish-winner/compare/{base}...{head}","merges_url":"https://api.github.com/repos/glasnt/bookish-winner/merges","archive_url":"https://api.github.com/repos/glasnt/bookish-winner/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/glasnt/bookish-winner/downloads","issues_url":"https://api.github.com/repos/glasnt/bookish-winner/issues{/number}","pulls_url":"https://api.github.com/repos/glasnt/bookish-winner/pulls{/number}","milestones_url":"https://api.github.com/repos/glasnt/bookish-winner/milestones{/number}","notifications_url":"https://api.github.com/repos/glasnt/bookish-winner/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/glasnt/bookish-winner/labels{/name}","releases_url":"https://api.github.com/repos/glasnt/bookish-winner/releases{/id}","deployments_url":"https://api.github.com/repos/glasnt/bookish-winner/deployments","created_at":"2021-07-20T23:12:03Z","updated_at":"2021-07-21T07:51:25Z","pushed_at":"2021-07-21T07:51:39Z","git_url":"git://github.com/glasnt/bookish-winner.git","ssh_url":"git@github.com:glasnt/bookish-winner.git","clone_url":"https://github.com/glasnt/bookish-winner.git","svn_url":"https://github.com/glasnt/bookish-winner","homepage":null,"size":33,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/glasnt/bookish-winner/pulls/12"},"html":{"href":"https://github.com/glasnt/bookish-winner/pull/12"},"issue":{"href":"https://api.github.com/repos/glasnt/bookish-winner/issues/12"},"comments":{"href":"https://api.github.com/repos/glasnt/bookish-winner/issues/12/comments"},"review_comments":{"href":"https://api.github.com/repos/glasnt/bookish-winner/pulls/12/comments"},"review_comment":{"href":"https://api.github.com/repos/glasnt/bookish-winner/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/glasnt/bookish-winner/pulls/12/commits"},"statuses":{"href":"https://api.github.com/repos/glasnt/bookish-winner/statuses/8d70707b349a3915526354bf6044151b4cbd8692"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515256","type":"CreateEvent","actor":{"id":8182807,"login":"todor-ivanov","display_login":"todor-ivanov","gravatar_id":"","url":"https://api.github.com/users/todor-ivanov","avatar_url":"https://avatars.githubusercontent.com/u/8182807?"},"repo":{"id":313302929,"name":"todor-ivanov/CMSKubernetes","url":"https://api.github.com/repos/todor-ivanov/CMSKubernetes"},"payload":{"ref":"MSUnmerged_FixMissingParams","ref_type":"branch","master_branch":"master","description":"Set of instructions and examples to deploy CMS data-services to Kubernetes cluster","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515257","type":"PushEvent","actor":{"id":32797107,"login":"hemanthm4u","display_login":"hemanthm4u","gravatar_id":"","url":"https://api.github.com/users/hemanthm4u","avatar_url":"https://avatars.githubusercontent.com/u/32797107?"},"repo":{"id":386977462,"name":"hemanthm4u/newmaven","url":"https://api.github.com/repos/hemanthm4u/newmaven"},"payload":{"push_id":7562055276,"size":1,"distinct_size":1,"ref":"refs/heads/demo","head":"bd08dbd9c81439917a745a6134a9a4d4d1687dcb","before":"a6493e4e2e23311448b3a4c9507fb4a7d82600b7","commits":[{"sha":"bd08dbd9c81439917a745a6134a9a4d4d1687dcb","author":{"name":"hemanthm4u","email":"07bf1a12383834977fea5217a8c8773485f11a1b@users.noreply.github.com"},"message":"Update index.jsp","distinct":true,"url":"https://api.github.com/repos/hemanthm4u/newmaven/commits/bd08dbd9c81439917a745a6134a9a4d4d1687dcb"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515259","type":"CreateEvent","actor":{"id":46904574,"login":"flinkbot","display_login":"flinkbot","gravatar_id":"","url":"https://api.github.com/users/flinkbot","avatar_url":"https://avatars.githubusercontent.com/u/46904574?"},"repo":{"id":195830211,"name":"flink-ci/flink","url":"https://api.github.com/repos/flink-ci/flink"},"payload":{"ref":"ci_16531_82207c5b0f2f7b37e495040574c7d308d9a66b48","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":52584586,"login":"flink-ci","gravatar_id":"","url":"https://api.github.com/orgs/flink-ci","avatar_url":"https://avatars.githubusercontent.com/u/52584586?"}}
+{"id":"17245515273","type":"PushEvent","actor":{"id":72529532,"login":"madelynarana","display_login":"madelynarana","gravatar_id":"","url":"https://api.github.com/users/madelynarana","avatar_url":"https://avatars.githubusercontent.com/u/72529532?"},"repo":{"id":388036698,"name":"madelynarana/cat_preloader","url":"https://api.github.com/repos/madelynarana/cat_preloader"},"payload":{"push_id":7562055246,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"6f9311c3a6edb3496003d05218cc89edfe12371a","before":"ab91b8a89d1b2a9e6ca3be2ae12eb8f4fb2cdbfd","commits":[{"sha":"6f9311c3a6edb3496003d05218cc89edfe12371a","author":{"name":"Madeleine","email":"554e6fa20ccc3e74776eca67b699508d06fc6169@gmail.com"},"message":":purple_heart: Animations.","distinct":true,"url":"https://api.github.com/repos/madelynarana/cat_preloader/commits/6f9311c3a6edb3496003d05218cc89edfe12371a"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515274","type":"PushEvent","actor":{"id":1354510,"login":"leo91000","display_login":"leo91000","gravatar_id":"","url":"https://api.github.com/users/leo91000","avatar_url":"https://avatars.githubusercontent.com/u/1354510?"},"repo":{"id":372306529,"name":"leo91000/covid-japan-informations","url":"https://api.github.com/repos/leo91000/covid-japan-informations"},"payload":{"push_id":7562055261,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"44f0883638c005b9767c8e90c2ebb43cc56b83b4","before":"df1c1006be1acc1f9ab8884d3139332215295226","commits":[{"sha":"44f0883638c005b9767c8e90c2ebb43cc56b83b4","author":{"name":"Léo Coletta","email":"c44abbda51c039fd3030f3ac7bea105b5e3f239d@gmail.com"},"message":"update 2021-07-21T08:00:02.225Z","distinct":true,"url":"https://api.github.com/repos/leo91000/covid-japan-informations/commits/44f0883638c005b9767c8e90c2ebb43cc56b83b4"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515276","type":"PushEvent","actor":{"id":86951355,"login":"cotxliang","display_login":"cotxliang","gravatar_id":"","url":"https://api.github.com/users/cotxliang","avatar_url":"https://avatars.githubusercontent.com/u/86951355?"},"repo":{"id":388038643,"name":"cotxliang/hotspot-app","url":"https://api.github.com/repos/cotxliang/hotspot-app"},"payload":{"push_id":7562055288,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"268462a8055d733ee2d3fb52e607c7d8df733576","before":"64081d16157ec166fc8283dca5e07ca78069473b","commits":[{"sha":"268462a8055d733ee2d3fb52e607c7d8df733576","author":{"name":"Liang Zhenwei","email":"174af0397a2703315e7903b8a2f46ac03e6025a5@users.noreply.github.com"},"message":"Create index.ts\n\nMy ID has been added to the original one. I don't know if it's suitable.","distinct":true,"url":"https://api.github.com/repos/cotxliang/hotspot-app/commits/268462a8055d733ee2d3fb52e607c7d8df733576"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515277","type":"PushEvent","actor":{"id":44251083,"login":"hangfaichao","display_login":"hangfaichao","gravatar_id":"","url":"https://api.github.com/users/hangfaichao","avatar_url":"https://avatars.githubusercontent.com/u/44251083?"},"repo":{"id":154464459,"name":"hangfaichao/hangfaichao.github.io","url":"https://api.github.com/repos/hangfaichao/hangfaichao.github.io"},"payload":{"push_id":7562055290,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"4198cddda652309449659d7aa9a6010c5cd8f620","before":"0f84258e06eb915e4367265f7a5d8b4a6037b188","commits":[{"sha":"4198cddda652309449659d7aa9a6010c5cd8f620","author":{"name":"wubidi","email":"e4630d3165e307420b2c56b281a186ad8b29eea1@pinduoduo.com"},"message":"Site updated: 2021-07-21 15:52:44","distinct":true,"url":"https://api.github.com/repos/hangfaichao/hangfaichao.github.io/commits/4198cddda652309449659d7aa9a6010c5cd8f620"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515282","type":"PullRequestEvent","actor":{"id":11852044,"login":"billypchan","display_login":"billypchan","gravatar_id":"","url":"https://api.github.com/users/billypchan","avatar_url":"https://avatars.githubusercontent.com/u/11852044?"},"repo":{"id":63856914,"name":"wireapp/wire-ios-link-preview","url":"https://api.github.com/repos/wireapp/wire-ios-link-preview"},"payload":{"action":"closed","number":81,"pull_request":{"url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/81","id":693671439,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNjcxNDM5","html_url":"https://github.com/wireapp/wire-ios-link-preview/pull/81","diff_url":"https://github.com/wireapp/wire-ios-link-preview/pull/81.diff","patch_url":"https://github.com/wireapp/wire-ios-link-preview/pull/81.patch","issue_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/81","number":81,"state":"closed","locked":false,"title":"chore: bump components","user":{"login":"github-actions[bot]","id":41898282,"node_id":"MDM6Qm90NDE4OTgyODI=","avatar_url":"https://avatars.githubusercontent.com/in/15368?v=4","gravatar_id":"","url":"https://api.github.com/users/github-actions%5Bbot%5D","html_url":"https://github.com/apps/github-actions","followers_url":"https://api.github.com/users/github-actions%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-actions%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-actions%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-actions%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-actions%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bump framework(s) version for: wireapp/wire-ios-utilities","created_at":"2021-07-20T17:52:46Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:03Z","merged_at":null,"merge_commit_sha":"4f24ceec2283128132182199a82efaea038b5d43","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/81/commits","review_comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/81/comments","review_comment_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/comments{/number}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/81/comments","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/c7dbff67f9edccf2c77879888adb1095a43b7b96","head":{"label":"wireapp:chore/bump_2021-07-20-175229","ref":"chore/bump_2021-07-20-175229","sha":"c7dbff67f9edccf2c77879888adb1095a43b7b96","user":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":63856914,"node_id":"MDEwOlJlcG9zaXRvcnk2Mzg1NjkxNA==","name":"wire-ios-link-preview","full_name":"wireapp/wire-ios-link-preview","private":false,"owner":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/wireapp/wire-ios-link-preview","description":"🏷 Open Graph data parser used to generate link previews","fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios-link-preview","forks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/deployments","created_at":"2016-07-21T09:40:14Z","updated_at":"2021-07-21T07:59:30Z","pushed_at":"2021-07-21T07:59:30Z","git_url":"git://github.com/wireapp/wire-ios-link-preview.git","ssh_url":"git@github.com:wireapp/wire-ios-link-preview.git","clone_url":"https://github.com/wireapp/wire-ios-link-preview.git","svn_url":"https://github.com/wireapp/wire-ios-link-preview","homepage":" https://wire.com ","size":1295,"stargazers_count":52,"watchers_count":52,"language":"Swift","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":11,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":11,"open_issues":4,"watchers":52,"default_branch":"develop"}},"base":{"label":"wireapp:develop","ref":"develop","sha":"dc8f49fb86e6a078579a176c7300920d12e9571a","user":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":63856914,"node_id":"MDEwOlJlcG9zaXRvcnk2Mzg1NjkxNA==","name":"wire-ios-link-preview","full_name":"wireapp/wire-ios-link-preview","private":false,"owner":{"login":"wireapp","id":16047324,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDQ3MzI0","avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=4","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/wireapp/wire-ios-link-preview","description":"🏷 Open Graph data parser used to generate link previews","fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios-link-preview","forks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios-link-preview/deployments","created_at":"2016-07-21T09:40:14Z","updated_at":"2021-07-21T07:59:30Z","pushed_at":"2021-07-21T07:59:30Z","git_url":"git://github.com/wireapp/wire-ios-link-preview.git","ssh_url":"git@github.com:wireapp/wire-ios-link-preview.git","clone_url":"https://github.com/wireapp/wire-ios-link-preview.git","svn_url":"https://github.com/wireapp/wire-ios-link-preview","homepage":" https://wire.com ","size":1295,"stargazers_count":52,"watchers_count":52,"language":"Swift","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":11,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"gpl-3.0","name":"GNU General Public License v3.0","spdx_id":"GPL-3.0","url":"https://api.github.com/licenses/gpl-3.0","node_id":"MDc6TGljZW5zZTk="},"forks":11,"open_issues":4,"watchers":52,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/81"},"html":{"href":"https://github.com/wireapp/wire-ios-link-preview/pull/81"},"issue":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/81"},"comments":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/issues/81/comments"},"review_comments":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/81/comments"},"review_comment":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/pulls/81/commits"},"statuses":{"href":"https://api.github.com/repos/wireapp/wire-ios-link-preview/statuses/c7dbff67f9edccf2c77879888adb1095a43b7b96"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":3,"deletions":3,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":16047324,"login":"wireapp","gravatar_id":"","url":"https://api.github.com/orgs/wireapp","avatar_url":"https://avatars.githubusercontent.com/u/16047324?"}}
+{"id":"17245515287","type":"PullRequestEvent","actor":{"id":9197716,"login":"ChrisRG","display_login":"ChrisRG","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","avatar_url":"https://avatars.githubusercontent.com/u/9197716?"},"repo":{"id":387739023,"name":"ChrisRG/lewagon","url":"https://api.github.com/repos/ChrisRG/lewagon"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/ChrisRG/lewagon/pulls/1","id":694140513,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQwNTEz","html_url":"https://github.com/ChrisRG/lewagon/pull/1","diff_url":"https://github.com/ChrisRG/lewagon/pull/1.diff","patch_url":"https://github.com/ChrisRG/lewagon/pull/1.patch","issue_url":"https://api.github.com/repos/ChrisRG/lewagon/issues/1","number":1,"state":"closed","locked":false,"title":"finished signup logic","user":{"login":"MarcelSF","id":39573049,"node_id":"MDQ6VXNlcjM5NTczMDQ5","avatar_url":"https://avatars.githubusercontent.com/u/39573049?v=4","gravatar_id":"","url":"https://api.github.com/users/MarcelSF","html_url":"https://github.com/MarcelSF","followers_url":"https://api.github.com/users/MarcelSF/followers","following_url":"https://api.github.com/users/MarcelSF/following{/other_user}","gists_url":"https://api.github.com/users/MarcelSF/gists{/gist_id}","starred_url":"https://api.github.com/users/MarcelSF/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MarcelSF/subscriptions","organizations_url":"https://api.github.com/users/MarcelSF/orgs","repos_url":"https://api.github.com/users/MarcelSF/repos","events_url":"https://api.github.com/users/MarcelSF/events{/privacy}","received_events_url":"https://api.github.com/users/MarcelSF/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T07:58:17Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:03Z","merged_at":"2021-07-21T08:00:03Z","merge_commit_sha":"802fb53c6b970df7d94dee03b772d8d0f1766f4f","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/ChrisRG/lewagon/pulls/1/commits","review_comments_url":"https://api.github.com/repos/ChrisRG/lewagon/pulls/1/comments","review_comment_url":"https://api.github.com/repos/ChrisRG/lewagon/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ChrisRG/lewagon/issues/1/comments","statuses_url":"https://api.github.com/repos/ChrisRG/lewagon/statuses/345771f53451684968e72336b285dc8e37869eb1","head":{"label":"ChrisRG:sign-up-logic","ref":"sign-up-logic","sha":"345771f53451684968e72336b285dc8e37869eb1","user":{"login":"ChrisRG","id":9197716,"node_id":"MDQ6VXNlcjkxOTc3MTY=","avatar_url":"https://avatars.githubusercontent.com/u/9197716?v=4","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","html_url":"https://github.com/ChrisRG","followers_url":"https://api.github.com/users/ChrisRG/followers","following_url":"https://api.github.com/users/ChrisRG/following{/other_user}","gists_url":"https://api.github.com/users/ChrisRG/gists{/gist_id}","starred_url":"https://api.github.com/users/ChrisRG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ChrisRG/subscriptions","organizations_url":"https://api.github.com/users/ChrisRG/orgs","repos_url":"https://api.github.com/users/ChrisRG/repos","events_url":"https://api.github.com/users/ChrisRG/events{/privacy}","received_events_url":"https://api.github.com/users/ChrisRG/received_events","type":"User","site_admin":false},"repo":{"id":387739023,"node_id":"MDEwOlJlcG9zaXRvcnkzODc3MzkwMjM=","name":"lewagon","full_name":"ChrisRG/lewagon","private":false,"owner":{"login":"ChrisRG","id":9197716,"node_id":"MDQ6VXNlcjkxOTc3MTY=","avatar_url":"https://avatars.githubusercontent.com/u/9197716?v=4","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","html_url":"https://github.com/ChrisRG","followers_url":"https://api.github.com/users/ChrisRG/followers","following_url":"https://api.github.com/users/ChrisRG/following{/other_user}","gists_url":"https://api.github.com/users/ChrisRG/gists{/gist_id}","starred_url":"https://api.github.com/users/ChrisRG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ChrisRG/subscriptions","organizations_url":"https://api.github.com/users/ChrisRG/orgs","repos_url":"https://api.github.com/users/ChrisRG/repos","events_url":"https://api.github.com/users/ChrisRG/events{/privacy}","received_events_url":"https://api.github.com/users/ChrisRG/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ChrisRG/lewagon","description":null,"fork":false,"url":"https://api.github.com/repos/ChrisRG/lewagon","forks_url":"https://api.github.com/repos/ChrisRG/lewagon/forks","keys_url":"https://api.github.com/repos/ChrisRG/lewagon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ChrisRG/lewagon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ChrisRG/lewagon/teams","hooks_url":"https://api.github.com/repos/ChrisRG/lewagon/hooks","issue_events_url":"https://api.github.com/repos/ChrisRG/lewagon/issues/events{/number}","events_url":"https://api.github.com/repos/ChrisRG/lewagon/events","assignees_url":"https://api.github.com/repos/ChrisRG/lewagon/assignees{/user}","branches_url":"https://api.github.com/repos/ChrisRG/lewagon/branches{/branch}","tags_url":"https://api.github.com/repos/ChrisRG/lewagon/tags","blobs_url":"https://api.github.com/repos/ChrisRG/lewagon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ChrisRG/lewagon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ChrisRG/lewagon/git/refs{/sha}","trees_url":"https://api.github.com/repos/ChrisRG/lewagon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ChrisRG/lewagon/statuses/{sha}","languages_url":"https://api.github.com/repos/ChrisRG/lewagon/languages","stargazers_url":"https://api.github.com/repos/ChrisRG/lewagon/stargazers","contributors_url":"https://api.github.com/repos/ChrisRG/lewagon/contributors","subscribers_url":"https://api.github.com/repos/ChrisRG/lewagon/subscribers","subscription_url":"https://api.github.com/repos/ChrisRG/lewagon/subscription","commits_url":"https://api.github.com/repos/ChrisRG/lewagon/commits{/sha}","git_commits_url":"https://api.github.com/repos/ChrisRG/lewagon/git/commits{/sha}","comments_url":"https://api.github.com/repos/ChrisRG/lewagon/comments{/number}","issue_comment_url":"https://api.github.com/repos/ChrisRG/lewagon/issues/comments{/number}","contents_url":"https://api.github.com/repos/ChrisRG/lewagon/contents/{+path}","compare_url":"https://api.github.com/repos/ChrisRG/lewagon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ChrisRG/lewagon/merges","archive_url":"https://api.github.com/repos/ChrisRG/lewagon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ChrisRG/lewagon/downloads","issues_url":"https://api.github.com/repos/ChrisRG/lewagon/issues{/number}","pulls_url":"https://api.github.com/repos/ChrisRG/lewagon/pulls{/number}","milestones_url":"https://api.github.com/repos/ChrisRG/lewagon/milestones{/number}","notifications_url":"https://api.github.com/repos/ChrisRG/lewagon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ChrisRG/lewagon/labels{/name}","releases_url":"https://api.github.com/repos/ChrisRG/lewagon/releases{/id}","deployments_url":"https://api.github.com/repos/ChrisRG/lewagon/deployments","created_at":"2021-07-20T09:23:45Z","updated_at":"2021-07-20T13:56:53Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/ChrisRG/lewagon.git","ssh_url":"git@github.com:ChrisRG/lewagon.git","clone_url":"https://github.com/ChrisRG/lewagon.git","svn_url":"https://github.com/ChrisRG/lewagon","homepage":null,"size":124,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"base":{"label":"ChrisRG:main","ref":"main","sha":"bdd0f038633581b1395b49cc1c2dd18ba666ea19","user":{"login":"ChrisRG","id":9197716,"node_id":"MDQ6VXNlcjkxOTc3MTY=","avatar_url":"https://avatars.githubusercontent.com/u/9197716?v=4","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","html_url":"https://github.com/ChrisRG","followers_url":"https://api.github.com/users/ChrisRG/followers","following_url":"https://api.github.com/users/ChrisRG/following{/other_user}","gists_url":"https://api.github.com/users/ChrisRG/gists{/gist_id}","starred_url":"https://api.github.com/users/ChrisRG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ChrisRG/subscriptions","organizations_url":"https://api.github.com/users/ChrisRG/orgs","repos_url":"https://api.github.com/users/ChrisRG/repos","events_url":"https://api.github.com/users/ChrisRG/events{/privacy}","received_events_url":"https://api.github.com/users/ChrisRG/received_events","type":"User","site_admin":false},"repo":{"id":387739023,"node_id":"MDEwOlJlcG9zaXRvcnkzODc3MzkwMjM=","name":"lewagon","full_name":"ChrisRG/lewagon","private":false,"owner":{"login":"ChrisRG","id":9197716,"node_id":"MDQ6VXNlcjkxOTc3MTY=","avatar_url":"https://avatars.githubusercontent.com/u/9197716?v=4","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","html_url":"https://github.com/ChrisRG","followers_url":"https://api.github.com/users/ChrisRG/followers","following_url":"https://api.github.com/users/ChrisRG/following{/other_user}","gists_url":"https://api.github.com/users/ChrisRG/gists{/gist_id}","starred_url":"https://api.github.com/users/ChrisRG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ChrisRG/subscriptions","organizations_url":"https://api.github.com/users/ChrisRG/orgs","repos_url":"https://api.github.com/users/ChrisRG/repos","events_url":"https://api.github.com/users/ChrisRG/events{/privacy}","received_events_url":"https://api.github.com/users/ChrisRG/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ChrisRG/lewagon","description":null,"fork":false,"url":"https://api.github.com/repos/ChrisRG/lewagon","forks_url":"https://api.github.com/repos/ChrisRG/lewagon/forks","keys_url":"https://api.github.com/repos/ChrisRG/lewagon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ChrisRG/lewagon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ChrisRG/lewagon/teams","hooks_url":"https://api.github.com/repos/ChrisRG/lewagon/hooks","issue_events_url":"https://api.github.com/repos/ChrisRG/lewagon/issues/events{/number}","events_url":"https://api.github.com/repos/ChrisRG/lewagon/events","assignees_url":"https://api.github.com/repos/ChrisRG/lewagon/assignees{/user}","branches_url":"https://api.github.com/repos/ChrisRG/lewagon/branches{/branch}","tags_url":"https://api.github.com/repos/ChrisRG/lewagon/tags","blobs_url":"https://api.github.com/repos/ChrisRG/lewagon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ChrisRG/lewagon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ChrisRG/lewagon/git/refs{/sha}","trees_url":"https://api.github.com/repos/ChrisRG/lewagon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ChrisRG/lewagon/statuses/{sha}","languages_url":"https://api.github.com/repos/ChrisRG/lewagon/languages","stargazers_url":"https://api.github.com/repos/ChrisRG/lewagon/stargazers","contributors_url":"https://api.github.com/repos/ChrisRG/lewagon/contributors","subscribers_url":"https://api.github.com/repos/ChrisRG/lewagon/subscribers","subscription_url":"https://api.github.com/repos/ChrisRG/lewagon/subscription","commits_url":"https://api.github.com/repos/ChrisRG/lewagon/commits{/sha}","git_commits_url":"https://api.github.com/repos/ChrisRG/lewagon/git/commits{/sha}","comments_url":"https://api.github.com/repos/ChrisRG/lewagon/comments{/number}","issue_comment_url":"https://api.github.com/repos/ChrisRG/lewagon/issues/comments{/number}","contents_url":"https://api.github.com/repos/ChrisRG/lewagon/contents/{+path}","compare_url":"https://api.github.com/repos/ChrisRG/lewagon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ChrisRG/lewagon/merges","archive_url":"https://api.github.com/repos/ChrisRG/lewagon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ChrisRG/lewagon/downloads","issues_url":"https://api.github.com/repos/ChrisRG/lewagon/issues{/number}","pulls_url":"https://api.github.com/repos/ChrisRG/lewagon/pulls{/number}","milestones_url":"https://api.github.com/repos/ChrisRG/lewagon/milestones{/number}","notifications_url":"https://api.github.com/repos/ChrisRG/lewagon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ChrisRG/lewagon/labels{/name}","releases_url":"https://api.github.com/repos/ChrisRG/lewagon/releases{/id}","deployments_url":"https://api.github.com/repos/ChrisRG/lewagon/deployments","created_at":"2021-07-20T09:23:45Z","updated_at":"2021-07-20T13:56:53Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/ChrisRG/lewagon.git","ssh_url":"git@github.com:ChrisRG/lewagon.git","clone_url":"https://github.com/ChrisRG/lewagon.git","svn_url":"https://github.com/ChrisRG/lewagon","homepage":null,"size":124,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/ChrisRG/lewagon/pulls/1"},"html":{"href":"https://github.com/ChrisRG/lewagon/pull/1"},"issue":{"href":"https://api.github.com/repos/ChrisRG/lewagon/issues/1"},"comments":{"href":"https://api.github.com/repos/ChrisRG/lewagon/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/ChrisRG/lewagon/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/ChrisRG/lewagon/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ChrisRG/lewagon/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/ChrisRG/lewagon/statuses/345771f53451684968e72336b285dc8e37869eb1"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"ChrisRG","id":9197716,"node_id":"MDQ6VXNlcjkxOTc3MTY=","avatar_url":"https://avatars.githubusercontent.com/u/9197716?v=4","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","html_url":"https://github.com/ChrisRG","followers_url":"https://api.github.com/users/ChrisRG/followers","following_url":"https://api.github.com/users/ChrisRG/following{/other_user}","gists_url":"https://api.github.com/users/ChrisRG/gists{/gist_id}","starred_url":"https://api.github.com/users/ChrisRG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ChrisRG/subscriptions","organizations_url":"https://api.github.com/users/ChrisRG/orgs","repos_url":"https://api.github.com/users/ChrisRG/repos","events_url":"https://api.github.com/users/ChrisRG/events{/privacy}","received_events_url":"https://api.github.com/users/ChrisRG/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":154,"deletions":9,"changed_files":7}},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515293","type":"PushEvent","actor":{"id":2687598,"login":"milesholt","display_login":"milesholt","gravatar_id":"","url":"https://api.github.com/users/milesholt","avatar_url":"https://avatars.githubusercontent.com/u/2687598?"},"repo":{"id":247480564,"name":"milesholt/autotrade1","url":"https://api.github.com/repos/milesholt/autotrade1"},"payload":{"push_id":7562055289,"size":1,"distinct_size":1,"ref":"refs/heads/version2","head":"6220697f7cb539c1750e2e933a0319994e3ae253","before":"aa3efb330607e0d9cd4e298455f1f22fc11f3791","commits":[{"sha":"6220697f7cb539c1750e2e933a0319994e3ae253","author":{"name":"milesholt","email":"1a73af9e7ae00182733b2292511b814be66f065f@milesholt.co.uk"},"message":"File updated - July 21, 2021 9:00 AM","distinct":true,"url":"https://api.github.com/repos/milesholt/autotrade1/commits/6220697f7cb539c1750e2e933a0319994e3ae253"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515295","type":"PushEvent","actor":{"id":67330171,"login":"tomas-laubr-smart-software","display_login":"tomas-laubr-smart-software","gravatar_id":"","url":"https://api.github.com/users/tomas-laubr-smart-software","avatar_url":"https://avatars.githubusercontent.com/u/67330171?"},"repo":{"id":387468472,"name":"soliteapay/spring-data-mongodb-datatables","url":"https://api.github.com/repos/soliteapay/spring-data-mongodb-datatables"},"payload":{"push_id":7562055281,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"a2f7de50913829407640dab5ea1afa17d54edde2","before":"29aee06c40920402944625279e933ab2e147c242","commits":[{"sha":"a2f7de50913829407640dab5ea1afa17d54edde2","author":{"name":"Tomáš Laubr","email":"78890522402760c642b263830372260c88c880da@smart-software.cz"},"message":"support multiple additional and prefitering criteria","distinct":true,"url":"https://api.github.com/repos/soliteapay/spring-data-mongodb-datatables/commits/a2f7de50913829407640dab5ea1afa17d54edde2"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":67330327,"login":"soliteapay","gravatar_id":"","url":"https://api.github.com/orgs/soliteapay","avatar_url":"https://avatars.githubusercontent.com/u/67330327?"}}
+{"id":"17245515300","type":"PushEvent","actor":{"id":61073116,"login":"snehaa1989","display_login":"snehaa1989","gravatar_id":"","url":"https://api.github.com/users/snehaa1989","avatar_url":"https://avatars.githubusercontent.com/u/61073116?"},"repo":{"id":388038822,"name":"snehaa1989/imgbot","url":"https://api.github.com/repos/snehaa1989/imgbot"},"payload":{"push_id":7562055293,"size":2,"distinct_size":1,"ref":"refs/heads/main","head":"a084470ead9361c81f02c529a450eeed19a4d92f","before":"edd4c4146633ac025ba60678d5e6d10a3e15f89e","commits":[{"sha":"dcd80cbf80a3abb5039fcb49649af7a7c49b9b31","author":{"name":"ImgBotApp","email":"858471a511451575f9769176c7c5b94525007a21@gmail.com"},"message":"[ImgBot] Optimize images\n\n*Total -- 563.29kb -> 551.89kb (2.02%)\n\n/demo-image.png -- 392.53kb -> 384.14kb (2.14%)\n/lofi1.jpg -- 149.96kb -> 147.09kb (1.91%)\n/violin.jpg -- 20.80kb -> 20.66kb (0.69%)\n\nSigned-off-by: ImgBotApp <ImgBotHelp@gmail.com>","distinct":false,"url":"https://api.github.com/repos/snehaa1989/imgbot/commits/dcd80cbf80a3abb5039fcb49649af7a7c49b9b31"},{"sha":"a084470ead9361c81f02c529a450eeed19a4d92f","author":{"name":"snehaa1989","email":"f580984500418b0c13e6eddfa1a4f8655e21f05f@users.noreply.github.com"},"message":"Merge pull request #1 from snehaa1989/imgbot\n\n[ImgBot] Optimize images","distinct":true,"url":"https://api.github.com/repos/snehaa1989/imgbot/commits/a084470ead9361c81f02c529a450eeed19a4d92f"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515305","type":"PullRequestEvent","actor":{"id":526307,"login":"endorama","display_login":"endorama","gravatar_id":"","url":"https://api.github.com/users/endorama","avatar_url":"https://avatars.githubusercontent.com/u/526307?"},"repo":{"id":16554739,"name":"elastic/beats","url":"https://api.github.com/repos/elastic/beats"},"payload":{"action":"closed","number":26932,"pull_request":{"url":"https://api.github.com/repos/elastic/beats/pulls/26932","id":691446799,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkxNDQ2Nzk5","html_url":"https://github.com/elastic/beats/pull/26932","diff_url":"https://github.com/elastic/beats/pull/26932.diff","patch_url":"https://github.com/elastic/beats/pull/26932.patch","issue_url":"https://api.github.com/repos/elastic/beats/issues/26932","number":26932,"state":"closed","locked":false,"title":"[7.x](backport #26870) [gcp/billing] always quote table name identifier","user":{"login":"mergify[bot]","id":37929162,"node_id":"MDM6Qm90Mzc5MjkxNjI=","avatar_url":"https://avatars.githubusercontent.com/in/10562?v=4","gravatar_id":"","url":"https://api.github.com/users/mergify%5Bbot%5D","html_url":"https://github.com/apps/mergify","followers_url":"https://api.github.com/users/mergify%5Bbot%5D/followers","following_url":"https://api.github.com/users/mergify%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/mergify%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/mergify%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mergify%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/mergify%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/mergify%5Bbot%5D/repos","events_url":"https://api.github.com/users/mergify%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/mergify%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"This is an automatic backport of pull request #26870 done by [Mergify](https://mergify.io).\n\n\n---\n\n\n<details>\n<summary>Mergify commands and options</summary>\n\n<br />\n\nMore conditions and actions can be found in the [documentation](https://docs.mergify.io/).\n\nYou can also trigger Mergify actions by commenting on this pull request:\n\n- `@Mergifyio refresh` will re-evaluate the rules\n- `@Mergifyio rebase` will rebase this PR on its base branch\n- `@Mergifyio update` will merge the base branch into this PR\n- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch\n\nAdditionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can:\n\n- look at your merge queues\n- generate the Mergify configuration with the config editor.\n\nFinally, you can contact us on https://mergify.io/\n</details>\n","created_at":"2021-07-16T12:19:27Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:02Z","merged_at":"2021-07-21T08:00:02Z","merge_commit_sha":"9f0cc3a673a75248ad7d7e0005c0c5303fbae609","assignee":{"login":"endorama","id":526307,"node_id":"MDQ6VXNlcjUyNjMwNw==","avatar_url":"https://avatars.githubusercontent.com/u/526307?v=4","gravatar_id":"","url":"https://api.github.com/users/endorama","html_url":"https://github.com/endorama","followers_url":"https://api.github.com/users/endorama/followers","following_url":"https://api.github.com/users/endorama/following{/other_user}","gists_url":"https://api.github.com/users/endorama/gists{/gist_id}","starred_url":"https://api.github.com/users/endorama/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/endorama/subscriptions","organizations_url":"https://api.github.com/users/endorama/orgs","repos_url":"https://api.github.com/users/endorama/repos","events_url":"https://api.github.com/users/endorama/events{/privacy}","received_events_url":"https://api.github.com/users/endorama/received_events","type":"User","site_admin":false},"assignees":[{"login":"endorama","id":526307,"node_id":"MDQ6VXNlcjUyNjMwNw==","avatar_url":"https://avatars.githubusercontent.com/u/526307?v=4","gravatar_id":"","url":"https://api.github.com/users/endorama","html_url":"https://github.com/endorama","followers_url":"https://api.github.com/users/endorama/followers","following_url":"https://api.github.com/users/endorama/following{/other_user}","gists_url":"https://api.github.com/users/endorama/gists{/gist_id}","starred_url":"https://api.github.com/users/endorama/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/endorama/subscriptions","organizations_url":"https://api.github.com/users/endorama/orgs","repos_url":"https://api.github.com/users/endorama/repos","events_url":"https://api.github.com/users/endorama/events{/privacy}","received_events_url":"https://api.github.com/users/endorama/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":1135227315,"node_id":"MDU6TGFiZWwxMTM1MjI3MzE1","url":"https://api.github.com/repos/elastic/beats/labels/Team:Integrations","name":"Team:Integrations","color":"1d76db","default":false,"description":"Label for the Integrations team"},{"id":306831030,"node_id":"MDU6TGFiZWwzMDY4MzEwMzA=","url":"https://api.github.com/repos/elastic/beats/labels/backport","name":"backport","color":"e99695","default":false,"description":null},{"id":2974730535,"node_id":"MDU6TGFiZWwyOTc0NzMwNTM1","url":"https://api.github.com/repos/elastic/beats/labels/v7.15.0","name":"v7.15.0","color":"ededed","default":false,"description":null}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/elastic/beats/pulls/26932/commits","review_comments_url":"https://api.github.com/repos/elastic/beats/pulls/26932/comments","review_comment_url":"https://api.github.com/repos/elastic/beats/pulls/comments{/number}","comments_url":"https://api.github.com/repos/elastic/beats/issues/26932/comments","statuses_url":"https://api.github.com/repos/elastic/beats/statuses/97f57284c05ff6f347ee3c7cb57c15c11e9e63a8","head":{"label":"elastic:mergify/bp/7.x/pr-26870","ref":"mergify/bp/7.x/pr-26870","sha":"97f57284c05ff6f347ee3c7cb57c15c11e9e63a8","user":{"login":"elastic","id":6764390,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NjQzOTA=","avatar_url":"https://avatars.githubusercontent.com/u/6764390?v=4","gravatar_id":"","url":"https://api.github.com/users/elastic","html_url":"https://github.com/elastic","followers_url":"https://api.github.com/users/elastic/followers","following_url":"https://api.github.com/users/elastic/following{/other_user}","gists_url":"https://api.github.com/users/elastic/gists{/gist_id}","starred_url":"https://api.github.com/users/elastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elastic/subscriptions","organizations_url":"https://api.github.com/users/elastic/orgs","repos_url":"https://api.github.com/users/elastic/repos","events_url":"https://api.github.com/users/elastic/events{/privacy}","received_events_url":"https://api.github.com/users/elastic/received_events","type":"Organization","site_admin":false},"repo":{"id":16554739,"node_id":"MDEwOlJlcG9zaXRvcnkxNjU1NDczOQ==","name":"beats","full_name":"elastic/beats","private":false,"owner":{"login":"elastic","id":6764390,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NjQzOTA=","avatar_url":"https://avatars.githubusercontent.com/u/6764390?v=4","gravatar_id":"","url":"https://api.github.com/users/elastic","html_url":"https://github.com/elastic","followers_url":"https://api.github.com/users/elastic/followers","following_url":"https://api.github.com/users/elastic/following{/other_user}","gists_url":"https://api.github.com/users/elastic/gists{/gist_id}","starred_url":"https://api.github.com/users/elastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elastic/subscriptions","organizations_url":"https://api.github.com/users/elastic/orgs","repos_url":"https://api.github.com/users/elastic/repos","events_url":"https://api.github.com/users/elastic/events{/privacy}","received_events_url":"https://api.github.com/users/elastic/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/elastic/beats","description":":tropical_fish: Beats - Lightweight shippers for Elasticsearch & Logstash ","fork":false,"url":"https://api.github.com/repos/elastic/beats","forks_url":"https://api.github.com/repos/elastic/beats/forks","keys_url":"https://api.github.com/repos/elastic/beats/keys{/key_id}","collaborators_url":"https://api.github.com/repos/elastic/beats/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/elastic/beats/teams","hooks_url":"https://api.github.com/repos/elastic/beats/hooks","issue_events_url":"https://api.github.com/repos/elastic/beats/issues/events{/number}","events_url":"https://api.github.com/repos/elastic/beats/events","assignees_url":"https://api.github.com/repos/elastic/beats/assignees{/user}","branches_url":"https://api.github.com/repos/elastic/beats/branches{/branch}","tags_url":"https://api.github.com/repos/elastic/beats/tags","blobs_url":"https://api.github.com/repos/elastic/beats/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/elastic/beats/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/elastic/beats/git/refs{/sha}","trees_url":"https://api.github.com/repos/elastic/beats/git/trees{/sha}","statuses_url":"https://api.github.com/repos/elastic/beats/statuses/{sha}","languages_url":"https://api.github.com/repos/elastic/beats/languages","stargazers_url":"https://api.github.com/repos/elastic/beats/stargazers","contributors_url":"https://api.github.com/repos/elastic/beats/contributors","subscribers_url":"https://api.github.com/repos/elastic/beats/subscribers","subscription_url":"https://api.github.com/repos/elastic/beats/subscription","commits_url":"https://api.github.com/repos/elastic/beats/commits{/sha}","git_commits_url":"https://api.github.com/repos/elastic/beats/git/commits{/sha}","comments_url":"https://api.github.com/repos/elastic/beats/comments{/number}","issue_comment_url":"https://api.github.com/repos/elastic/beats/issues/comments{/number}","contents_url":"https://api.github.com/repos/elastic/beats/contents/{+path}","compare_url":"https://api.github.com/repos/elastic/beats/compare/{base}...{head}","merges_url":"https://api.github.com/repos/elastic/beats/merges","archive_url":"https://api.github.com/repos/elastic/beats/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/elastic/beats/downloads","issues_url":"https://api.github.com/repos/elastic/beats/issues{/number}","pulls_url":"https://api.github.com/repos/elastic/beats/pulls{/number}","milestones_url":"https://api.github.com/repos/elastic/beats/milestones{/number}","notifications_url":"https://api.github.com/repos/elastic/beats/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/elastic/beats/labels{/name}","releases_url":"https://api.github.com/repos/elastic/beats/releases{/id}","deployments_url":"https://api.github.com/repos/elastic/beats/deployments","created_at":"2014-02-05T19:01:02Z","updated_at":"2021-07-21T07:11:22Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/elastic/beats.git","ssh_url":"git@github.com:elastic/beats.git","clone_url":"https://github.com/elastic/beats.git","svn_url":"https://github.com/elastic/beats","homepage":"https://www.elastic.co/products/beats","size":335922,"stargazers_count":10120,"watchers_count":10120,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":4004,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1621,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":4004,"open_issues":1621,"watchers":10120,"default_branch":"master"}},"base":{"label":"elastic:7.x","ref":"7.x","sha":"61b3b739eb13766111046863f8faa3c18efde8f5","user":{"login":"elastic","id":6764390,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NjQzOTA=","avatar_url":"https://avatars.githubusercontent.com/u/6764390?v=4","gravatar_id":"","url":"https://api.github.com/users/elastic","html_url":"https://github.com/elastic","followers_url":"https://api.github.com/users/elastic/followers","following_url":"https://api.github.com/users/elastic/following{/other_user}","gists_url":"https://api.github.com/users/elastic/gists{/gist_id}","starred_url":"https://api.github.com/users/elastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elastic/subscriptions","organizations_url":"https://api.github.com/users/elastic/orgs","repos_url":"https://api.github.com/users/elastic/repos","events_url":"https://api.github.com/users/elastic/events{/privacy}","received_events_url":"https://api.github.com/users/elastic/received_events","type":"Organization","site_admin":false},"repo":{"id":16554739,"node_id":"MDEwOlJlcG9zaXRvcnkxNjU1NDczOQ==","name":"beats","full_name":"elastic/beats","private":false,"owner":{"login":"elastic","id":6764390,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NjQzOTA=","avatar_url":"https://avatars.githubusercontent.com/u/6764390?v=4","gravatar_id":"","url":"https://api.github.com/users/elastic","html_url":"https://github.com/elastic","followers_url":"https://api.github.com/users/elastic/followers","following_url":"https://api.github.com/users/elastic/following{/other_user}","gists_url":"https://api.github.com/users/elastic/gists{/gist_id}","starred_url":"https://api.github.com/users/elastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elastic/subscriptions","organizations_url":"https://api.github.com/users/elastic/orgs","repos_url":"https://api.github.com/users/elastic/repos","events_url":"https://api.github.com/users/elastic/events{/privacy}","received_events_url":"https://api.github.com/users/elastic/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/elastic/beats","description":":tropical_fish: Beats - Lightweight shippers for Elasticsearch & Logstash ","fork":false,"url":"https://api.github.com/repos/elastic/beats","forks_url":"https://api.github.com/repos/elastic/beats/forks","keys_url":"https://api.github.com/repos/elastic/beats/keys{/key_id}","collaborators_url":"https://api.github.com/repos/elastic/beats/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/elastic/beats/teams","hooks_url":"https://api.github.com/repos/elastic/beats/hooks","issue_events_url":"https://api.github.com/repos/elastic/beats/issues/events{/number}","events_url":"https://api.github.com/repos/elastic/beats/events","assignees_url":"https://api.github.com/repos/elastic/beats/assignees{/user}","branches_url":"https://api.github.com/repos/elastic/beats/branches{/branch}","tags_url":"https://api.github.com/repos/elastic/beats/tags","blobs_url":"https://api.github.com/repos/elastic/beats/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/elastic/beats/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/elastic/beats/git/refs{/sha}","trees_url":"https://api.github.com/repos/elastic/beats/git/trees{/sha}","statuses_url":"https://api.github.com/repos/elastic/beats/statuses/{sha}","languages_url":"https://api.github.com/repos/elastic/beats/languages","stargazers_url":"https://api.github.com/repos/elastic/beats/stargazers","contributors_url":"https://api.github.com/repos/elastic/beats/contributors","subscribers_url":"https://api.github.com/repos/elastic/beats/subscribers","subscription_url":"https://api.github.com/repos/elastic/beats/subscription","commits_url":"https://api.github.com/repos/elastic/beats/commits{/sha}","git_commits_url":"https://api.github.com/repos/elastic/beats/git/commits{/sha}","comments_url":"https://api.github.com/repos/elastic/beats/comments{/number}","issue_comment_url":"https://api.github.com/repos/elastic/beats/issues/comments{/number}","contents_url":"https://api.github.com/repos/elastic/beats/contents/{+path}","compare_url":"https://api.github.com/repos/elastic/beats/compare/{base}...{head}","merges_url":"https://api.github.com/repos/elastic/beats/merges","archive_url":"https://api.github.com/repos/elastic/beats/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/elastic/beats/downloads","issues_url":"https://api.github.com/repos/elastic/beats/issues{/number}","pulls_url":"https://api.github.com/repos/elastic/beats/pulls{/number}","milestones_url":"https://api.github.com/repos/elastic/beats/milestones{/number}","notifications_url":"https://api.github.com/repos/elastic/beats/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/elastic/beats/labels{/name}","releases_url":"https://api.github.com/repos/elastic/beats/releases{/id}","deployments_url":"https://api.github.com/repos/elastic/beats/deployments","created_at":"2014-02-05T19:01:02Z","updated_at":"2021-07-21T07:11:22Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/elastic/beats.git","ssh_url":"git@github.com:elastic/beats.git","clone_url":"https://github.com/elastic/beats.git","svn_url":"https://github.com/elastic/beats","homepage":"https://www.elastic.co/products/beats","size":335922,"stargazers_count":10120,"watchers_count":10120,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":4004,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1621,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":4004,"open_issues":1621,"watchers":10120,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/elastic/beats/pulls/26932"},"html":{"href":"https://github.com/elastic/beats/pull/26932"},"issue":{"href":"https://api.github.com/repos/elastic/beats/issues/26932"},"comments":{"href":"https://api.github.com/repos/elastic/beats/issues/26932/comments"},"review_comments":{"href":"https://api.github.com/repos/elastic/beats/pulls/26932/comments"},"review_comment":{"href":"https://api.github.com/repos/elastic/beats/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/elastic/beats/pulls/26932/commits"},"statuses":{"href":"https://api.github.com/repos/elastic/beats/statuses/97f57284c05ff6f347ee3c7cb57c15c11e9e63a8"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"endorama","id":526307,"node_id":"MDQ6VXNlcjUyNjMwNw==","avatar_url":"https://avatars.githubusercontent.com/u/526307?v=4","gravatar_id":"","url":"https://api.github.com/users/endorama","html_url":"https://github.com/endorama","followers_url":"https://api.github.com/users/endorama/followers","following_url":"https://api.github.com/users/endorama/following{/other_user}","gists_url":"https://api.github.com/users/endorama/gists{/gist_id}","starred_url":"https://api.github.com/users/endorama/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/endorama/subscriptions","organizations_url":"https://api.github.com/users/endorama/orgs","repos_url":"https://api.github.com/users/endorama/repos","events_url":"https://api.github.com/users/endorama/events{/privacy}","received_events_url":"https://api.github.com/users/endorama/received_events","type":"User","site_admin":false},"comments":6,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":47,"deletions":17,"changed_files":3}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":6764390,"login":"elastic","gravatar_id":"","url":"https://api.github.com/orgs/elastic","avatar_url":"https://avatars.githubusercontent.com/u/6764390?"}}
+{"id":"17245515315","type":"IssueCommentEvent","actor":{"id":4973094,"login":"kmilos","display_login":"kmilos","gravatar_id":"","url":"https://api.github.com/users/kmilos","avatar_url":"https://avatars.githubusercontent.com/u/4973094?"},"repo":{"id":3791835,"name":"darktable-org/darktable","url":"https://api.github.com/repos/darktable-org/darktable"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/darktable-org/darktable/issues/9581","repository_url":"https://api.github.com/repos/darktable-org/darktable","labels_url":"https://api.github.com/repos/darktable-org/darktable/issues/9581/labels{/name}","comments_url":"https://api.github.com/repos/darktable-org/darktable/issues/9581/comments","events_url":"https://api.github.com/repos/darktable-org/darktable/issues/9581/events","html_url":"https://github.com/darktable-org/darktable/issues/9581","id":949172676,"node_id":"MDU6SXNzdWU5NDkxNzI2NzY=","number":9581,"title":"Nikon D780 Tethering does not work","user":{"login":"duelle","id":7212186,"node_id":"MDQ6VXNlcjcyMTIxODY=","avatar_url":"https://avatars.githubusercontent.com/u/7212186?v=4","gravatar_id":"","url":"https://api.github.com/users/duelle","html_url":"https://github.com/duelle","followers_url":"https://api.github.com/users/duelle/followers","following_url":"https://api.github.com/users/duelle/following{/other_user}","gists_url":"https://api.github.com/users/duelle/gists{/gist_id}","starred_url":"https://api.github.com/users/duelle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/duelle/subscriptions","organizations_url":"https://api.github.com/users/duelle/orgs","repos_url":"https://api.github.com/users/duelle/repos","events_url":"https://api.github.com/users/duelle/events{/privacy}","received_events_url":"https://api.github.com/users/duelle/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-20T22:55:09Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"Even though the troubleshooting steps (using `gphoto2`) seem to work perfectly fine, it is not possible to use tethering with `darktable`. The option to use tethering is not available in the _import_ module and selecting the tethering view results in the error message `no camera with tethering support available for use...`.\r\n\r\n**To Reproduce**\r\n1. Connect Nikon D780 with PC via USB cable \r\n2. Turn on Nikon D780\r\n3. Run `darktable`\r\n4. Check `import` module (only `mount camera` option available)\r\n5. Open `tethering` view (see message: _no camera with tethering support available for use..._)\r\n\r\n**Expected behavior**\r\n- Allow tethering with Nikon D780 as it seems to be supported by `gphoto2`\r\n- See `switch to tethered shooting` option in `import` module\r\n- Availability of actual tethererd shooting in the `tethering` view\r\n\r\n\r\n**Platform**\r\n* darktable version : 3.6.0\r\n* OS                : Linux Kernel 5.12.15-arch1-1\r\n* Linux - Distro    : ArchLinux\r\n* Memory            : 16 GB\r\n* Graphics card     : NVidia GeForce RTX 2060\r\n* Graphics driver   : \r\n* OpenCL installed  : yes\r\n* OpenCL activated  :  yes\r\n* Xorg              : 1.20.12-1\r\n* Desktop           : i3wm\r\n\r\n\r\n**Additional context**\r\n- I was able to *successfully* use tethering via `gphoto2` in the troubleshooting process as provided here: https://www.darktable.org/usermanual/en/tethering/troubleshooting/\r\n- Nonetheless, tethering with `darktable` seems not to work.\r\n\r\n**Further information**\r\nAs instructed in the troubleshooting section for tethering, I logged the output of `darktable -d camctl 2>1 >camctl.log` which is the following:\r\n```\r\n% cat camctl.log \r\n0.803433 [camera_control] creating new context 0x5636e41833a0\r\n0.823962 [camera_control] loaded 2562 camera drivers.\r\n1.344988 [camera_control] loaded 38 port drivers.\r\n1.358053 [camera_control] 1 cameras connected\r\n1.358062 [camera_control] found new Nikon DSC D780 on port usb:001,018\r\n18.097786 [camera_control] destroy darktable camcontrol\r\n```\r\n\r\n**Remarks**\r\nIn case there is any further information missing that could be of help for resolving this issue just let me know. I'll happily try to support to fix this to the best of my knowledge and abilities.","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/darktable-org/darktable/issues/comments/883977128","html_url":"https://github.com/darktable-org/darktable/issues/9581#issuecomment-883977128","issue_url":"https://api.github.com/repos/darktable-org/darktable/issues/9581","id":883977128,"node_id":"IC_kwDOADnb2840sGuo","user":{"login":"kmilos","id":4973094,"node_id":"MDQ6VXNlcjQ5NzMwOTQ=","avatar_url":"https://avatars.githubusercontent.com/u/4973094?v=4","gravatar_id":"","url":"https://api.github.com/users/kmilos","html_url":"https://github.com/kmilos","followers_url":"https://api.github.com/users/kmilos/followers","following_url":"https://api.github.com/users/kmilos/following{/other_user}","gists_url":"https://api.github.com/users/kmilos/gists{/gist_id}","starred_url":"https://api.github.com/users/kmilos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kmilos/subscriptions","organizations_url":"https://api.github.com/users/kmilos/orgs","repos_url":"https://api.github.com/users/kmilos/repos","events_url":"https://api.github.com/users/kmilos/events{/privacy}","received_events_url":"https://api.github.com/users/kmilos/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:03Z","updated_at":"2021-07-21T08:00:03Z","author_association":"CONTRIBUTOR","body":"@ptilopteri D780 is supported at the most basic level, otherwise it wouldn't be in the list at all.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":1561544,"login":"darktable-org","gravatar_id":"","url":"https://api.github.com/orgs/darktable-org","avatar_url":"https://avatars.githubusercontent.com/u/1561544?"}}
+{"id":"17245515318","type":"PushEvent","actor":{"id":7659712,"login":"zenkins","display_login":"zenkins","gravatar_id":"","url":"https://api.github.com/users/zenkins","avatar_url":"https://avatars.githubusercontent.com/u/7659712?"},"repo":{"id":53574465,"name":"wireapp/wire-ios-cryptobox","url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox"},"payload":{"push_id":7562055301,"size":1,"distinct_size":1,"ref":"refs/heads/develop","head":"f07ec3becc5f1b61a2f5312b1776fe526d25e678","before":"fae8d887d8f43e12b46ae7ee22c3365b284e59db","commits":[{"sha":"f07ec3becc5f1b61a2f5312b1776fe526d25e678","author":{"name":"github-actions[bot]","email":"17973dcf2e10b67f63417c88ca4c460b2c9439f2@users.noreply.github.com"},"message":"bump components (#59)\n\nCo-authored-by: runner <iosx@wire.com>","distinct":true,"url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox/commits/f07ec3becc5f1b61a2f5312b1776fe526d25e678"}]},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":16047324,"login":"wireapp","gravatar_id":"","url":"https://api.github.com/orgs/wireapp","avatar_url":"https://avatars.githubusercontent.com/u/16047324?"}}
+{"id":"17245515321","type":"PushEvent","actor":{"id":52447250,"login":"hualongfeng","display_login":"hualongfeng","gravatar_id":"","url":"https://api.github.com/users/hualongfeng","avatar_url":"https://avatars.githubusercontent.com/u/52447250?"},"repo":{"id":198813393,"name":"hualongfeng/ceph","url":"https://api.github.com/repos/hualongfeng/ceph"},"payload":{"push_id":7562055287,"size":1,"distinct_size":1,"ref":"refs/heads/teuthology","head":"7c9d134016e907f18e221570bc1b6a87c806214d","before":"07a5aead483d9580157411a07802b2987fcd9b83","commits":[{"sha":"7c9d134016e907f18e221570bc1b6a87c806214d","author":{"name":"Feng Hualong","email":"e5b342ebb6e7e1eeaf2a20301724c9c39bbce28c@intel.com"},"message":"alone\n\nSigned-off-by: Feng Hualong <hualong.feng@intel.com>","distinct":true,"url":"https://api.github.com/repos/hualongfeng/ceph/commits/7c9d134016e907f18e221570bc1b6a87c806214d"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515348","type":"PullRequestReviewEvent","actor":{"id":2869758,"login":"codingpotato","display_login":"codingpotato","gravatar_id":"","url":"https://api.github.com/users/codingpotato","avatar_url":"https://avatars.githubusercontent.com/u/2869758?"},"repo":{"id":376259206,"name":"aha-001/SeedLang","url":"https://api.github.com/repos/aha-001/SeedLang"},"payload":{"action":"created","review":{"id":711364924,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzY0OTI0","user":{"login":"codingpotato","id":2869758,"node_id":"MDQ6VXNlcjI4Njk3NTg=","avatar_url":"https://avatars.githubusercontent.com/u/2869758?v=4","gravatar_id":"","url":"https://api.github.com/users/codingpotato","html_url":"https://github.com/codingpotato","followers_url":"https://api.github.com/users/codingpotato/followers","following_url":"https://api.github.com/users/codingpotato/following{/other_user}","gists_url":"https://api.github.com/users/codingpotato/gists{/gist_id}","starred_url":"https://api.github.com/users/codingpotato/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/codingpotato/subscriptions","organizations_url":"https://api.github.com/users/codingpotato/orgs","repos_url":"https://api.github.com/users/codingpotato/repos","events_url":"https://api.github.com/users/codingpotato/events{/privacy}","received_events_url":"https://api.github.com/users/codingpotato/received_events","type":"User","site_admin":false},"body":"LGTM","commit_id":"7669a8bbbda63d6420e8efc1c623a2be5e9a1574","submitted_at":"2021-07-21T08:00:03Z","state":"approved","html_url":"https://github.com/aha-001/SeedLang/pull/28#pullrequestreview-711364924","pull_request_url":"https://api.github.com/repos/aha-001/SeedLang/pulls/28","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/aha-001/SeedLang/pull/28#pullrequestreview-711364924"},"pull_request":{"href":"https://api.github.com/repos/aha-001/SeedLang/pulls/28"}}},"pull_request":{"url":"https://api.github.com/repos/aha-001/SeedLang/pulls/28","id":693975056,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzOTc1MDU2","html_url":"https://github.com/aha-001/SeedLang/pull/28","diff_url":"https://github.com/aha-001/SeedLang/pull/28.diff","patch_url":"https://github.com/aha-001/SeedLang/pull/28.patch","issue_url":"https://api.github.com/repos/aha-001/SeedLang/issues/28","number":28,"state":"open","locked":false,"title":"Add Windows batch for the ANTLR generator","user":{"login":"wixette","id":5819968,"node_id":"MDQ6VXNlcjU4MTk5Njg=","avatar_url":"https://avatars.githubusercontent.com/u/5819968?v=4","gravatar_id":"","url":"https://api.github.com/users/wixette","html_url":"https://github.com/wixette","followers_url":"https://api.github.com/users/wixette/followers","following_url":"https://api.github.com/users/wixette/following{/other_user}","gists_url":"https://api.github.com/users/wixette/gists{/gist_id}","starred_url":"https://api.github.com/users/wixette/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wixette/subscriptions","organizations_url":"https://api.github.com/users/wixette/orgs","repos_url":"https://api.github.com/users/wixette/repos","events_url":"https://api.github.com/users/wixette/events{/privacy}","received_events_url":"https://api.github.com/users/wixette/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T01:29:56Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"014e0656be337f521beb20a64d95aee5393b8a33","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/aha-001/SeedLang/pulls/28/commits","review_comments_url":"https://api.github.com/repos/aha-001/SeedLang/pulls/28/comments","review_comment_url":"https://api.github.com/repos/aha-001/SeedLang/pulls/comments{/number}","comments_url":"https://api.github.com/repos/aha-001/SeedLang/issues/28/comments","statuses_url":"https://api.github.com/repos/aha-001/SeedLang/statuses/7669a8bbbda63d6420e8efc1c623a2be5e9a1574","head":{"label":"aha-001:wip_wixette_script","ref":"wip_wixette_script","sha":"7669a8bbbda63d6420e8efc1c623a2be5e9a1574","user":{"login":"aha-001","id":83710579,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNzEwNTc5","avatar_url":"https://avatars.githubusercontent.com/u/83710579?v=4","gravatar_id":"","url":"https://api.github.com/users/aha-001","html_url":"https://github.com/aha-001","followers_url":"https://api.github.com/users/aha-001/followers","following_url":"https://api.github.com/users/aha-001/following{/other_user}","gists_url":"https://api.github.com/users/aha-001/gists{/gist_id}","starred_url":"https://api.github.com/users/aha-001/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aha-001/subscriptions","organizations_url":"https://api.github.com/users/aha-001/orgs","repos_url":"https://api.github.com/users/aha-001/repos","events_url":"https://api.github.com/users/aha-001/events{/privacy}","received_events_url":"https://api.github.com/users/aha-001/received_events","type":"Organization","site_admin":false},"repo":{"id":376259206,"node_id":"MDEwOlJlcG9zaXRvcnkzNzYyNTkyMDY=","name":"SeedLang","full_name":"aha-001/SeedLang","private":false,"owner":{"login":"aha-001","id":83710579,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNzEwNTc5","avatar_url":"https://avatars.githubusercontent.com/u/83710579?v=4","gravatar_id":"","url":"https://api.github.com/users/aha-001","html_url":"https://github.com/aha-001","followers_url":"https://api.github.com/users/aha-001/followers","following_url":"https://api.github.com/users/aha-001/following{/other_user}","gists_url":"https://api.github.com/users/aha-001/gists{/gist_id}","starred_url":"https://api.github.com/users/aha-001/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aha-001/subscriptions","organizations_url":"https://api.github.com/users/aha-001/orgs","repos_url":"https://api.github.com/users/aha-001/repos","events_url":"https://api.github.com/users/aha-001/events{/privacy}","received_events_url":"https://api.github.com/users/aha-001/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/aha-001/SeedLang","description":"A visualizable low-code programming environment.","fork":false,"url":"https://api.github.com/repos/aha-001/SeedLang","forks_url":"https://api.github.com/repos/aha-001/SeedLang/forks","keys_url":"https://api.github.com/repos/aha-001/SeedLang/keys{/key_id}","collaborators_url":"https://api.github.com/repos/aha-001/SeedLang/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/aha-001/SeedLang/teams","hooks_url":"https://api.github.com/repos/aha-001/SeedLang/hooks","issue_events_url":"https://api.github.com/repos/aha-001/SeedLang/issues/events{/number}","events_url":"https://api.github.com/repos/aha-001/SeedLang/events","assignees_url":"https://api.github.com/repos/aha-001/SeedLang/assignees{/user}","branches_url":"https://api.github.com/repos/aha-001/SeedLang/branches{/branch}","tags_url":"https://api.github.com/repos/aha-001/SeedLang/tags","blobs_url":"https://api.github.com/repos/aha-001/SeedLang/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/aha-001/SeedLang/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/aha-001/SeedLang/git/refs{/sha}","trees_url":"https://api.github.com/repos/aha-001/SeedLang/git/trees{/sha}","statuses_url":"https://api.github.com/repos/aha-001/SeedLang/statuses/{sha}","languages_url":"https://api.github.com/repos/aha-001/SeedLang/languages","stargazers_url":"https://api.github.com/repos/aha-001/SeedLang/stargazers","contributors_url":"https://api.github.com/repos/aha-001/SeedLang/contributors","subscribers_url":"https://api.github.com/repos/aha-001/SeedLang/subscribers","subscription_url":"https://api.github.com/repos/aha-001/SeedLang/subscription","commits_url":"https://api.github.com/repos/aha-001/SeedLang/commits{/sha}","git_commits_url":"https://api.github.com/repos/aha-001/SeedLang/git/commits{/sha}","comments_url":"https://api.github.com/repos/aha-001/SeedLang/comments{/number}","issue_comment_url":"https://api.github.com/repos/aha-001/SeedLang/issues/comments{/number}","contents_url":"https://api.github.com/repos/aha-001/SeedLang/contents/{+path}","compare_url":"https://api.github.com/repos/aha-001/SeedLang/compare/{base}...{head}","merges_url":"https://api.github.com/repos/aha-001/SeedLang/merges","archive_url":"https://api.github.com/repos/aha-001/SeedLang/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/aha-001/SeedLang/downloads","issues_url":"https://api.github.com/repos/aha-001/SeedLang/issues{/number}","pulls_url":"https://api.github.com/repos/aha-001/SeedLang/pulls{/number}","milestones_url":"https://api.github.com/repos/aha-001/SeedLang/milestones{/number}","notifications_url":"https://api.github.com/repos/aha-001/SeedLang/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/aha-001/SeedLang/labels{/name}","releases_url":"https://api.github.com/repos/aha-001/SeedLang/releases{/id}","deployments_url":"https://api.github.com/repos/aha-001/SeedLang/deployments","created_at":"2021-06-12T10:16:20Z","updated_at":"2021-07-20T23:41:35Z","pushed_at":"2021-07-21T01:29:56Z","git_url":"git://github.com/aha-001/SeedLang.git","ssh_url":"git@github.com:aha-001/SeedLang.git","clone_url":"https://github.com/aha-001/SeedLang.git","svn_url":"https://github.com/aha-001/SeedLang","homepage":"","size":209,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":5,"watchers":0,"default_branch":"main"}},"base":{"label":"aha-001:main","ref":"main","sha":"aaeff9dafdaf05bbe436a489f66a7ae1975faca3","user":{"login":"aha-001","id":83710579,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNzEwNTc5","avatar_url":"https://avatars.githubusercontent.com/u/83710579?v=4","gravatar_id":"","url":"https://api.github.com/users/aha-001","html_url":"https://github.com/aha-001","followers_url":"https://api.github.com/users/aha-001/followers","following_url":"https://api.github.com/users/aha-001/following{/other_user}","gists_url":"https://api.github.com/users/aha-001/gists{/gist_id}","starred_url":"https://api.github.com/users/aha-001/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aha-001/subscriptions","organizations_url":"https://api.github.com/users/aha-001/orgs","repos_url":"https://api.github.com/users/aha-001/repos","events_url":"https://api.github.com/users/aha-001/events{/privacy}","received_events_url":"https://api.github.com/users/aha-001/received_events","type":"Organization","site_admin":false},"repo":{"id":376259206,"node_id":"MDEwOlJlcG9zaXRvcnkzNzYyNTkyMDY=","name":"SeedLang","full_name":"aha-001/SeedLang","private":false,"owner":{"login":"aha-001","id":83710579,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgzNzEwNTc5","avatar_url":"https://avatars.githubusercontent.com/u/83710579?v=4","gravatar_id":"","url":"https://api.github.com/users/aha-001","html_url":"https://github.com/aha-001","followers_url":"https://api.github.com/users/aha-001/followers","following_url":"https://api.github.com/users/aha-001/following{/other_user}","gists_url":"https://api.github.com/users/aha-001/gists{/gist_id}","starred_url":"https://api.github.com/users/aha-001/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aha-001/subscriptions","organizations_url":"https://api.github.com/users/aha-001/orgs","repos_url":"https://api.github.com/users/aha-001/repos","events_url":"https://api.github.com/users/aha-001/events{/privacy}","received_events_url":"https://api.github.com/users/aha-001/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/aha-001/SeedLang","description":"A visualizable low-code programming environment.","fork":false,"url":"https://api.github.com/repos/aha-001/SeedLang","forks_url":"https://api.github.com/repos/aha-001/SeedLang/forks","keys_url":"https://api.github.com/repos/aha-001/SeedLang/keys{/key_id}","collaborators_url":"https://api.github.com/repos/aha-001/SeedLang/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/aha-001/SeedLang/teams","hooks_url":"https://api.github.com/repos/aha-001/SeedLang/hooks","issue_events_url":"https://api.github.com/repos/aha-001/SeedLang/issues/events{/number}","events_url":"https://api.github.com/repos/aha-001/SeedLang/events","assignees_url":"https://api.github.com/repos/aha-001/SeedLang/assignees{/user}","branches_url":"https://api.github.com/repos/aha-001/SeedLang/branches{/branch}","tags_url":"https://api.github.com/repos/aha-001/SeedLang/tags","blobs_url":"https://api.github.com/repos/aha-001/SeedLang/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/aha-001/SeedLang/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/aha-001/SeedLang/git/refs{/sha}","trees_url":"https://api.github.com/repos/aha-001/SeedLang/git/trees{/sha}","statuses_url":"https://api.github.com/repos/aha-001/SeedLang/statuses/{sha}","languages_url":"https://api.github.com/repos/aha-001/SeedLang/languages","stargazers_url":"https://api.github.com/repos/aha-001/SeedLang/stargazers","contributors_url":"https://api.github.com/repos/aha-001/SeedLang/contributors","subscribers_url":"https://api.github.com/repos/aha-001/SeedLang/subscribers","subscription_url":"https://api.github.com/repos/aha-001/SeedLang/subscription","commits_url":"https://api.github.com/repos/aha-001/SeedLang/commits{/sha}","git_commits_url":"https://api.github.com/repos/aha-001/SeedLang/git/commits{/sha}","comments_url":"https://api.github.com/repos/aha-001/SeedLang/comments{/number}","issue_comment_url":"https://api.github.com/repos/aha-001/SeedLang/issues/comments{/number}","contents_url":"https://api.github.com/repos/aha-001/SeedLang/contents/{+path}","compare_url":"https://api.github.com/repos/aha-001/SeedLang/compare/{base}...{head}","merges_url":"https://api.github.com/repos/aha-001/SeedLang/merges","archive_url":"https://api.github.com/repos/aha-001/SeedLang/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/aha-001/SeedLang/downloads","issues_url":"https://api.github.com/repos/aha-001/SeedLang/issues{/number}","pulls_url":"https://api.github.com/repos/aha-001/SeedLang/pulls{/number}","milestones_url":"https://api.github.com/repos/aha-001/SeedLang/milestones{/number}","notifications_url":"https://api.github.com/repos/aha-001/SeedLang/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/aha-001/SeedLang/labels{/name}","releases_url":"https://api.github.com/repos/aha-001/SeedLang/releases{/id}","deployments_url":"https://api.github.com/repos/aha-001/SeedLang/deployments","created_at":"2021-06-12T10:16:20Z","updated_at":"2021-07-20T23:41:35Z","pushed_at":"2021-07-21T01:29:56Z","git_url":"git://github.com/aha-001/SeedLang.git","ssh_url":"git@github.com:aha-001/SeedLang.git","clone_url":"https://github.com/aha-001/SeedLang.git","svn_url":"https://github.com/aha-001/SeedLang","homepage":"","size":209,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":5,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/aha-001/SeedLang/pulls/28"},"html":{"href":"https://github.com/aha-001/SeedLang/pull/28"},"issue":{"href":"https://api.github.com/repos/aha-001/SeedLang/issues/28"},"comments":{"href":"https://api.github.com/repos/aha-001/SeedLang/issues/28/comments"},"review_comments":{"href":"https://api.github.com/repos/aha-001/SeedLang/pulls/28/comments"},"review_comment":{"href":"https://api.github.com/repos/aha-001/SeedLang/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/aha-001/SeedLang/pulls/28/commits"},"statuses":{"href":"https://api.github.com/repos/aha-001/SeedLang/statuses/7669a8bbbda63d6420e8efc1c623a2be5e9a1574"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":83710579,"login":"aha-001","gravatar_id":"","url":"https://api.github.com/orgs/aha-001","avatar_url":"https://avatars.githubusercontent.com/u/83710579?"}}
+{"id":"17245515316","type":"PushEvent","actor":{"id":87750170,"login":"Kuma-3","display_login":"Kuma-3","gravatar_id":"","url":"https://api.github.com/users/Kuma-3","avatar_url":"https://avatars.githubusercontent.com/u/87750170?"},"repo":{"id":388027199,"name":"Kuma-3/practice","url":"https://api.github.com/repos/Kuma-3/practice"},"payload":{"push_id":7562055310,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8ba3d32281fd904c816356c0059e27f69fe31bc0","before":"9d33a5b00780ad35711465c66f3b10e8e44de1d5","commits":[{"sha":"8ba3d32281fd904c816356c0059e27f69fe31bc0","author":{"name":"Kumagai","email":"c64c4dcd3c69f6f1d2c3abb8ed17a2dcbe5204f6@users.noreply.github.com"},"message":"Update test.txt","distinct":true,"url":"https://api.github.com/repos/Kuma-3/practice/commits/8ba3d32281fd904c816356c0059e27f69fe31bc0"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515324","type":"PullRequestEvent","actor":{"id":57535432,"login":"hi-Long","display_login":"hi-Long","gravatar_id":"","url":"https://api.github.com/users/hi-Long","avatar_url":"https://avatars.githubusercontent.com/u/57535432?"},"repo":{"id":387646214,"name":"awesome-academy/OE38-FE-PR1-Long","url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long"},"payload":{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/1","id":693240156,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMjQwMTU2","html_url":"https://github.com/awesome-academy/OE38-FE-PR1-Long/pull/1","diff_url":"https://github.com/awesome-academy/OE38-FE-PR1-Long/pull/1.diff","patch_url":"https://github.com/awesome-academy/OE38-FE-PR1-Long/pull/1.patch","issue_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues/1","number":1,"state":"closed","locked":false,"title":"Ref [Tracker][38673] Initial project structure.","user":{"login":"hi-Long","id":57535432,"node_id":"MDQ6VXNlcjU3NTM1NDMy","avatar_url":"https://avatars.githubusercontent.com/u/57535432?v=4","gravatar_id":"","url":"https://api.github.com/users/hi-Long","html_url":"https://github.com/hi-Long","followers_url":"https://api.github.com/users/hi-Long/followers","following_url":"https://api.github.com/users/hi-Long/following{/other_user}","gists_url":"https://api.github.com/users/hi-Long/gists{/gist_id}","starred_url":"https://api.github.com/users/hi-Long/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hi-Long/subscriptions","organizations_url":"https://api.github.com/users/hi-Long/orgs","repos_url":"https://api.github.com/users/hi-Long/repos","events_url":"https://api.github.com/users/hi-Long/events{/privacy}","received_events_url":"https://api.github.com/users/hi-Long/received_events","type":"User","site_admin":false},"body":"Link redmine: https://edu-redmine.sun-asterisk.vn/issues/38673","created_at":"2021-07-20T07:48:53Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:03Z","merged_at":null,"merge_commit_sha":"6a62a50387a68ca188ecca9e26e8bd1a8641234e","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/1/commits","review_comments_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/1/comments","review_comment_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/comments{/number}","comments_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues/1/comments","statuses_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/statuses/d02e823a4d582f17e8ac3385b1e8b88662bf67c5","head":{"label":"hi-Long:master","ref":"master","sha":"d02e823a4d582f17e8ac3385b1e8b88662bf67c5","user":{"login":"hi-Long","id":57535432,"node_id":"MDQ6VXNlcjU3NTM1NDMy","avatar_url":"https://avatars.githubusercontent.com/u/57535432?v=4","gravatar_id":"","url":"https://api.github.com/users/hi-Long","html_url":"https://github.com/hi-Long","followers_url":"https://api.github.com/users/hi-Long/followers","following_url":"https://api.github.com/users/hi-Long/following{/other_user}","gists_url":"https://api.github.com/users/hi-Long/gists{/gist_id}","starred_url":"https://api.github.com/users/hi-Long/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hi-Long/subscriptions","organizations_url":"https://api.github.com/users/hi-Long/orgs","repos_url":"https://api.github.com/users/hi-Long/repos","events_url":"https://api.github.com/users/hi-Long/events{/privacy}","received_events_url":"https://api.github.com/users/hi-Long/received_events","type":"User","site_admin":false},"repo":{"id":387669152,"node_id":"MDEwOlJlcG9zaXRvcnkzODc2NjkxNTI=","name":"OE38-FE-PR1-Long","full_name":"hi-Long/OE38-FE-PR1-Long","private":false,"owner":{"login":"hi-Long","id":57535432,"node_id":"MDQ6VXNlcjU3NTM1NDMy","avatar_url":"https://avatars.githubusercontent.com/u/57535432?v=4","gravatar_id":"","url":"https://api.github.com/users/hi-Long","html_url":"https://github.com/hi-Long","followers_url":"https://api.github.com/users/hi-Long/followers","following_url":"https://api.github.com/users/hi-Long/following{/other_user}","gists_url":"https://api.github.com/users/hi-Long/gists{/gist_id}","starred_url":"https://api.github.com/users/hi-Long/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hi-Long/subscriptions","organizations_url":"https://api.github.com/users/hi-Long/orgs","repos_url":"https://api.github.com/users/hi-Long/repos","events_url":"https://api.github.com/users/hi-Long/events{/privacy}","received_events_url":"https://api.github.com/users/hi-Long/received_events","type":"User","site_admin":false},"html_url":"https://github.com/hi-Long/OE38-FE-PR1-Long","description":null,"fork":true,"url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long","forks_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/forks","keys_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/teams","hooks_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/hooks","issue_events_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/issues/events{/number}","events_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/events","assignees_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/assignees{/user}","branches_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/branches{/branch}","tags_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/tags","blobs_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/git/refs{/sha}","trees_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/statuses/{sha}","languages_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/languages","stargazers_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/stargazers","contributors_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/contributors","subscribers_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/subscribers","subscription_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/subscription","commits_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/commits{/sha}","git_commits_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/git/commits{/sha}","comments_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/comments{/number}","issue_comment_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/issues/comments{/number}","contents_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/contents/{+path}","compare_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/merges","archive_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/downloads","issues_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/issues{/number}","pulls_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/pulls{/number}","milestones_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/milestones{/number}","notifications_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/labels{/name}","releases_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/releases{/id}","deployments_url":"https://api.github.com/repos/hi-Long/OE38-FE-PR1-Long/deployments","created_at":"2021-07-20T04:13:58Z","updated_at":"2021-07-21T07:46:17Z","pushed_at":"2021-07-21T07:46:14Z","git_url":"git://github.com/hi-Long/OE38-FE-PR1-Long.git","ssh_url":"git@github.com:hi-Long/OE38-FE-PR1-Long.git","clone_url":"https://github.com/hi-Long/OE38-FE-PR1-Long.git","svn_url":"https://github.com/hi-Long/OE38-FE-PR1-Long","homepage":null,"size":5,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"awesome-academy:master","ref":"master","sha":"3fe32f03f97245a1573fc969975cabd8b81baa20","user":{"login":"awesome-academy","id":33895223,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzODk1MjIz","avatar_url":"https://avatars.githubusercontent.com/u/33895223?v=4","gravatar_id":"","url":"https://api.github.com/users/awesome-academy","html_url":"https://github.com/awesome-academy","followers_url":"https://api.github.com/users/awesome-academy/followers","following_url":"https://api.github.com/users/awesome-academy/following{/other_user}","gists_url":"https://api.github.com/users/awesome-academy/gists{/gist_id}","starred_url":"https://api.github.com/users/awesome-academy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/awesome-academy/subscriptions","organizations_url":"https://api.github.com/users/awesome-academy/orgs","repos_url":"https://api.github.com/users/awesome-academy/repos","events_url":"https://api.github.com/users/awesome-academy/events{/privacy}","received_events_url":"https://api.github.com/users/awesome-academy/received_events","type":"Organization","site_admin":false},"repo":{"id":387646214,"node_id":"MDEwOlJlcG9zaXRvcnkzODc2NDYyMTQ=","name":"OE38-FE-PR1-Long","full_name":"awesome-academy/OE38-FE-PR1-Long","private":false,"owner":{"login":"awesome-academy","id":33895223,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzODk1MjIz","avatar_url":"https://avatars.githubusercontent.com/u/33895223?v=4","gravatar_id":"","url":"https://api.github.com/users/awesome-academy","html_url":"https://github.com/awesome-academy","followers_url":"https://api.github.com/users/awesome-academy/followers","following_url":"https://api.github.com/users/awesome-academy/following{/other_user}","gists_url":"https://api.github.com/users/awesome-academy/gists{/gist_id}","starred_url":"https://api.github.com/users/awesome-academy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/awesome-academy/subscriptions","organizations_url":"https://api.github.com/users/awesome-academy/orgs","repos_url":"https://api.github.com/users/awesome-academy/repos","events_url":"https://api.github.com/users/awesome-academy/events{/privacy}","received_events_url":"https://api.github.com/users/awesome-academy/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/awesome-academy/OE38-FE-PR1-Long","description":null,"fork":false,"url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long","forks_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/forks","keys_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/keys{/key_id}","collaborators_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/teams","hooks_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/hooks","issue_events_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues/events{/number}","events_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/events","assignees_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/assignees{/user}","branches_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/branches{/branch}","tags_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/tags","blobs_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/git/refs{/sha}","trees_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/git/trees{/sha}","statuses_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/statuses/{sha}","languages_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/languages","stargazers_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/stargazers","contributors_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/contributors","subscribers_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/subscribers","subscription_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/subscription","commits_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/commits{/sha}","git_commits_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/git/commits{/sha}","comments_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/comments{/number}","issue_comment_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues/comments{/number}","contents_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/contents/{+path}","compare_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/compare/{base}...{head}","merges_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/merges","archive_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/downloads","issues_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues{/number}","pulls_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls{/number}","milestones_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/milestones{/number}","notifications_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/labels{/name}","releases_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/releases{/id}","deployments_url":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/deployments","created_at":"2021-07-20T02:14:07Z","updated_at":"2021-07-20T02:14:10Z","pushed_at":"2021-07-21T07:46:16Z","git_url":"git://github.com/awesome-academy/OE38-FE-PR1-Long.git","ssh_url":"git@github.com:awesome-academy/OE38-FE-PR1-Long.git","clone_url":"https://github.com/awesome-academy/OE38-FE-PR1-Long.git","svn_url":"https://github.com/awesome-academy/OE38-FE-PR1-Long","homepage":null,"size":1,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":1,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/1"},"html":{"href":"https://github.com/awesome-academy/OE38-FE-PR1-Long/pull/1"},"issue":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues/1"},"comments":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/awesome-academy/OE38-FE-PR1-Long/statuses/d02e823a4d582f17e8ac3385b1e8b88662bf67c5"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":true,"rebaseable":false,"mergeable_state":"clean","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":2133,"deletions":0,"changed_files":57}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":33895223,"login":"awesome-academy","gravatar_id":"","url":"https://api.github.com/orgs/awesome-academy","avatar_url":"https://avatars.githubusercontent.com/u/33895223?"}}
+{"id":"17245515333","type":"PushEvent","actor":{"id":85554053,"login":"ruben6p","display_login":"ruben6p","gravatar_id":"","url":"https://api.github.com/users/ruben6p","avatar_url":"https://avatars.githubusercontent.com/u/85554053?"},"repo":{"id":383771555,"name":"PcMant/proyectoFinalFrontend-EOI2021","url":"https://api.github.com/repos/PcMant/proyectoFinalFrontend-EOI2021"},"payload":{"push_id":7562055295,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5f254102903fac391504574b8211697c4a49fbb3","before":"97417f4198fe9cd7887017803dfb9815bae5a437","commits":[{"sha":"5f254102903fac391504574b8211697c4a49fbb3","author":{"name":"ruben6p","email":"dac8f4352a845a58601d9c4c8763a244b6f9bc6e@users.noreply.github.com"},"message":"form","distinct":true,"url":"https://api.github.com/repos/PcMant/proyectoFinalFrontend-EOI2021/commits/5f254102903fac391504574b8211697c4a49fbb3"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515339","type":"ForkEvent","actor":{"id":63769993,"login":"jzy-byte-cmd","display_login":"jzy-byte-cmd","gravatar_id":"","url":"https://api.github.com/users/jzy-byte-cmd","avatar_url":"https://avatars.githubusercontent.com/u/63769993?"},"repo":{"id":262296122,"name":"PaddlePaddle/PaddleOCR","url":"https://api.github.com/repos/PaddlePaddle/PaddleOCR"},"payload":{"forkee":{"id":388040576,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1NzY=","name":"PaddleOCR","full_name":"jzy-byte-cmd/PaddleOCR","private":false,"owner":{"login":"jzy-byte-cmd","id":63769993,"node_id":"MDQ6VXNlcjYzNzY5OTkz","avatar_url":"https://avatars.githubusercontent.com/u/63769993?v=4","gravatar_id":"","url":"https://api.github.com/users/jzy-byte-cmd","html_url":"https://github.com/jzy-byte-cmd","followers_url":"https://api.github.com/users/jzy-byte-cmd/followers","following_url":"https://api.github.com/users/jzy-byte-cmd/following{/other_user}","gists_url":"https://api.github.com/users/jzy-byte-cmd/gists{/gist_id}","starred_url":"https://api.github.com/users/jzy-byte-cmd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jzy-byte-cmd/subscriptions","organizations_url":"https://api.github.com/users/jzy-byte-cmd/orgs","repos_url":"https://api.github.com/users/jzy-byte-cmd/repos","events_url":"https://api.github.com/users/jzy-byte-cmd/events{/privacy}","received_events_url":"https://api.github.com/users/jzy-byte-cmd/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jzy-byte-cmd/PaddleOCR","description":"Awesome multilingual OCR toolkits based on PaddlePaddle （practical ultra lightweight OCR system, support 80+ languages recognition, provide data annotation and synthesis tools, support training and deployment among server, mobile, embedded and IoT devices）","fork":true,"url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR","forks_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/forks","keys_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/teams","hooks_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/hooks","issue_events_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/issues/events{/number}","events_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/events","assignees_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/assignees{/user}","branches_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/branches{/branch}","tags_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/tags","blobs_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/git/refs{/sha}","trees_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/statuses/{sha}","languages_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/languages","stargazers_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/stargazers","contributors_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/contributors","subscribers_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/subscribers","subscription_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/subscription","commits_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/commits{/sha}","git_commits_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/git/commits{/sha}","comments_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/comments{/number}","issue_comment_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/issues/comments{/number}","contents_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/contents/{+path}","compare_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/merges","archive_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/downloads","issues_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/issues{/number}","pulls_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/pulls{/number}","milestones_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/milestones{/number}","notifications_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/labels{/name}","releases_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/releases{/id}","deployments_url":"https://api.github.com/repos/jzy-byte-cmd/PaddleOCR/deployments","created_at":"2021-07-21T08:00:03Z","updated_at":"2021-07-21T07:05:49Z","pushed_at":"2021-07-21T07:50:18Z","git_url":"git://github.com/jzy-byte-cmd/PaddleOCR.git","ssh_url":"git@github.com:jzy-byte-cmd/PaddleOCR.git","clone_url":"https://github.com/jzy-byte-cmd/PaddleOCR.git","svn_url":"https://github.com/jzy-byte-cmd/PaddleOCR","homepage":"","size":124201,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":23534030,"login":"PaddlePaddle","gravatar_id":"","url":"https://api.github.com/orgs/PaddlePaddle","avatar_url":"https://avatars.githubusercontent.com/u/23534030?"}}
+{"id":"17245515342","type":"CreateEvent","actor":{"id":76052938,"login":"karthick3-ux","display_login":"karthick3-ux","gravatar_id":"","url":"https://api.github.com/users/karthick3-ux","avatar_url":"https://avatars.githubusercontent.com/u/76052938?"},"repo":{"id":388040575,"name":"karthick3-ux/karthick3-ux","url":"https://api.github.com/repos/karthick3-ux/karthick3-ux"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":"Config files for my GitHub profile.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515358","type":"PushEvent","actor":{"id":1317792,"login":"xndcn","display_login":"xndcn","gravatar_id":"","url":"https://api.github.com/users/xndcn","avatar_url":"https://avatars.githubusercontent.com/u/1317792?"},"repo":{"id":10446275,"name":"xndcn/smzdm.com","url":"https://api.github.com/repos/xndcn/smzdm.com"},"payload":{"push_id":7562055345,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"822c6e347309b216d274f7a584043d52aa264654","before":"b15945ef5f2a60b4b5af9e0db9d5f80b16d9d317","commits":[{"sha":"822c6e347309b216d274f7a584043d52aa264654","author":{"name":"xndcn","email":"1e09e78f2250d149e0e983feae098f2c71429797@gmail.com"},"message":"30 items update","distinct":true,"url":"https://api.github.com/repos/xndcn/smzdm.com/commits/822c6e347309b216d274f7a584043d52aa264654"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515362","type":"PushEvent","actor":{"id":4264707,"login":"markdgray","display_login":"markdgray","gravatar_id":"","url":"https://api.github.com/users/markdgray","avatar_url":"https://avatars.githubusercontent.com/u/4264707?"},"repo":{"id":336240020,"name":"markdgray/metallb","url":"https://api.github.com/repos/markdgray/metallb"},"payload":{"push_id":7562055318,"size":1,"distinct_size":1,"ref":"refs/heads/feat/frr_design","head":"80fb248e8892322fd6eb0b53b29440be4100f1eb","before":"4921ce2503f25e44cd3f98e70385a2a34249ea9a","commits":[{"sha":"80fb248e8892322fd6eb0b53b29440be4100f1eb","author":{"name":"Mark Gray","email":"f9a4292a438d6a2a42926ff0dd671855d2f3c640@redhat.com"},"message":"Update design/0001-frr.md\r\n\r\nskip ci\n\nCo-authored-by: Johannes Liebermann <johanan.liebermann@gmail.com>","distinct":true,"url":"https://api.github.com/repos/markdgray/metallb/commits/80fb248e8892322fd6eb0b53b29440be4100f1eb"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515369","type":"PushEvent","actor":{"id":87694730,"login":"aji-tama","display_login":"aji-tama","gravatar_id":"","url":"https://api.github.com/users/aji-tama","avatar_url":"https://avatars.githubusercontent.com/u/87694730?"},"repo":{"id":388040508,"name":"aji-tama/Moonmap_cartesian","url":"https://api.github.com/repos/aji-tama/Moonmap_cartesian"},"payload":{"push_id":7562055368,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"53f72e3da51a7413f1b598ff9582e8a8854cf4ef","before":"86f5c5b0644575a5674584ddb100d59703d5dceb","commits":[{"sha":"53f72e3da51a7413f1b598ff9582e8a8854cf4ef","author":{"name":"aji-tama","email":"1a1fc93994fffa4514f2c86e7d35d51a367548bc@users.noreply.github.com"},"message":"Add files via upload","distinct":true,"url":"https://api.github.com/repos/aji-tama/Moonmap_cartesian/commits/53f72e3da51a7413f1b598ff9582e8a8854cf4ef"}]},"public":true,"created_at":"2021-07-21T08:00:03Z"}
+{"id":"17245515406","type":"PullRequestReviewEvent","actor":{"id":6417047,"login":"AlexeySachkov","display_login":"AlexeySachkov","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","avatar_url":"https://avatars.githubusercontent.com/u/6417047?"},"repo":{"id":127136978,"name":"KhronosGroup/SPIRV-LLVM-Translator","url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator"},"payload":{"action":"created","review":{"id":711364920,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzY0OTIw","user":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"body":null,"commit_id":"dbc54dd752c04bb65e8d2e2aedaaac22c247266e","submitted_at":"2021-07-21T08:00:03Z","state":"commented","html_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119#pullrequestreview-711364920","pull_request_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119","author_association":"CONTRIBUTOR","_links":{"html":{"href":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119#pullrequestreview-711364920"},"pull_request":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119"}}},"pull_request":{"url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119","id":693465500,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDY1NTAw","html_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119","diff_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119.diff","patch_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119.patch","issue_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119","number":1119,"state":"open","locked":false,"title":"Improve llvm.memmove translation","user":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"body":"The main change comparing to previous approach: we do not look for the underlying type which is being copied anymore. Instead, we directly allocate required amount of bytes and copy them.","created_at":"2021-07-20T13:26:14Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"1df177eccdd4f5230bed2491a8e681f5963ea9d7","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/commits","review_comments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/comments","review_comment_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/comments{/number}","comments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119/comments","statuses_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/statuses/dbc54dd752c04bb65e8d2e2aedaaac22c247266e","head":{"label":"AlexeySachkov:private/asachkov/memmove-translation-fixes","ref":"private/asachkov/memmove-translation-fixes","sha":"dbc54dd752c04bb65e8d2e2aedaaac22c247266e","user":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"repo":{"id":160663481,"node_id":"MDEwOlJlcG9zaXRvcnkxNjA2NjM0ODE=","name":"SPIRV-LLVM-Translator","full_name":"AlexeySachkov/SPIRV-LLVM-Translator","private":false,"owner":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"html_url":"https://github.com/AlexeySachkov/SPIRV-LLVM-Translator","description":"A tool and a library for bi-directional translation between SPIR-V and LLVM IR","fork":true,"url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator","forks_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/forks","keys_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/teams","hooks_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/hooks","issue_events_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/issues/events{/number}","events_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/events","assignees_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/assignees{/user}","branches_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/branches{/branch}","tags_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/tags","blobs_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/refs{/sha}","trees_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/statuses/{sha}","languages_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/languages","stargazers_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/stargazers","contributors_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/contributors","subscribers_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/subscribers","subscription_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/subscription","commits_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/commits{/sha}","git_commits_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/commits{/sha}","comments_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/comments{/number}","issue_comment_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/issues/comments{/number}","contents_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/contents/{+path}","compare_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/merges","archive_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/downloads","issues_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/issues{/number}","pulls_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/pulls{/number}","milestones_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/milestones{/number}","notifications_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/labels{/name}","releases_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/releases{/id}","deployments_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/deployments","created_at":"2018-12-06T11:12:57Z","updated_at":"2021-02-17T09:49:57Z","pushed_at":"2021-07-21T07:59:11Z","git_url":"git://github.com/AlexeySachkov/SPIRV-LLVM-Translator.git","ssh_url":"git@github.com:AlexeySachkov/SPIRV-LLVM-Translator.git","clone_url":"https://github.com/AlexeySachkov/SPIRV-LLVM-Translator.git","svn_url":"https://github.com/AlexeySachkov/SPIRV-LLVM-Translator","homepage":null,"size":8654,"stargazers_count":0,"watchers_count":0,"language":"LLVM","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"KhronosGroup:master","ref":"master","sha":"6795cab62f3ed36e9a5cec235c62a8d92a40cc8f","user":{"login":"KhronosGroup","id":1608701,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDg3MDE=","avatar_url":"https://avatars.githubusercontent.com/u/1608701?v=4","gravatar_id":"","url":"https://api.github.com/users/KhronosGroup","html_url":"https://github.com/KhronosGroup","followers_url":"https://api.github.com/users/KhronosGroup/followers","following_url":"https://api.github.com/users/KhronosGroup/following{/other_user}","gists_url":"https://api.github.com/users/KhronosGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/KhronosGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KhronosGroup/subscriptions","organizations_url":"https://api.github.com/users/KhronosGroup/orgs","repos_url":"https://api.github.com/users/KhronosGroup/repos","events_url":"https://api.github.com/users/KhronosGroup/events{/privacy}","received_events_url":"https://api.github.com/users/KhronosGroup/received_events","type":"Organization","site_admin":false},"repo":{"id":127136978,"node_id":"MDEwOlJlcG9zaXRvcnkxMjcxMzY5Nzg=","name":"SPIRV-LLVM-Translator","full_name":"KhronosGroup/SPIRV-LLVM-Translator","private":false,"owner":{"login":"KhronosGroup","id":1608701,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDg3MDE=","avatar_url":"https://avatars.githubusercontent.com/u/1608701?v=4","gravatar_id":"","url":"https://api.github.com/users/KhronosGroup","html_url":"https://github.com/KhronosGroup","followers_url":"https://api.github.com/users/KhronosGroup/followers","following_url":"https://api.github.com/users/KhronosGroup/following{/other_user}","gists_url":"https://api.github.com/users/KhronosGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/KhronosGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KhronosGroup/subscriptions","organizations_url":"https://api.github.com/users/KhronosGroup/orgs","repos_url":"https://api.github.com/users/KhronosGroup/repos","events_url":"https://api.github.com/users/KhronosGroup/events{/privacy}","received_events_url":"https://api.github.com/users/KhronosGroup/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator","description":"A tool and a library for bi-directional translation between SPIR-V and LLVM IR","fork":false,"url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator","forks_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/forks","keys_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/teams","hooks_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/hooks","issue_events_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/events{/number}","events_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/events","assignees_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/assignees{/user}","branches_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/branches{/branch}","tags_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/tags","blobs_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/refs{/sha}","trees_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/statuses/{sha}","languages_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/languages","stargazers_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/stargazers","contributors_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/contributors","subscribers_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/subscribers","subscription_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/subscription","commits_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/commits{/sha}","git_commits_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/commits{/sha}","comments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/comments{/number}","issue_comment_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/comments{/number}","contents_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/contents/{+path}","compare_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/merges","archive_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/downloads","issues_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues{/number}","pulls_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls{/number}","milestones_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/milestones{/number}","notifications_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/labels{/name}","releases_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/releases{/id}","deployments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/deployments","created_at":"2018-03-28T12:29:24Z","updated_at":"2021-07-19T17:01:10Z","pushed_at":"2021-07-21T07:59:13Z","git_url":"git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git","ssh_url":"git@github.com:KhronosGroup/SPIRV-LLVM-Translator.git","clone_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git","svn_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator","homepage":null,"size":9402,"stargazers_count":248,"watchers_count":248,"language":"LLVM","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":113,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":104,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":113,"open_issues":104,"watchers":248,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119"},"html":{"href":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119"},"issue":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119"},"comments":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119/comments"},"review_comments":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/comments"},"review_comment":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/commits"},"statuses":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/statuses/dbc54dd752c04bb65e8d2e2aedaaac22c247266e"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":1608701,"login":"KhronosGroup","gravatar_id":"","url":"https://api.github.com/orgs/KhronosGroup","avatar_url":"https://avatars.githubusercontent.com/u/1608701?"}}
+{"id":"17245515408","type":"PullRequestEvent","actor":{"id":39814207,"login":"pull[bot]","display_login":"pull","gravatar_id":"","url":"https://api.github.com/users/pull[bot]","avatar_url":"https://avatars.githubusercontent.com/u/39814207?"},"repo":{"id":381937845,"name":"sandutsar/PowerShell","url":"https://api.github.com/repos/sandutsar/PowerShell"},"payload":{"action":"opened","number":24,"pull_request":{"url":"https://api.github.com/repos/sandutsar/PowerShell/pulls/24","id":694141689,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNjg5","html_url":"https://github.com/sandutsar/PowerShell/pull/24","diff_url":"https://github.com/sandutsar/PowerShell/pull/24.diff","patch_url":"https://github.com/sandutsar/PowerShell/pull/24.patch","issue_url":"https://api.github.com/repos/sandutsar/PowerShell/issues/24","number":24,"state":"open","locked":false,"title":"[pull] master from PowerShell:master","user":{"login":"pull[bot]","id":39814207,"node_id":"MDM6Qm90Mzk4MTQyMDc=","avatar_url":"https://avatars.githubusercontent.com/in/12910?v=4","gravatar_id":"","url":"https://api.github.com/users/pull%5Bbot%5D","html_url":"https://github.com/apps/pull","followers_url":"https://api.github.com/users/pull%5Bbot%5D/followers","following_url":"https://api.github.com/users/pull%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/pull%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/pull%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pull%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/pull%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/pull%5Bbot%5D/repos","events_url":"https://api.github.com/users/pull%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/pull%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"See Commits and Changes for more details.\n\n-----\nCreated by [<img src=\"https://prod.download/pull-18h-svg\" valign=\"bottom\"/> **pull[bot]**](https://github.com/wei/pull)\n\n_Can you help keep this open source service alive? **[💖 Please sponsor : )](https://prod.download/pull-pr-sponsor)**_","created_at":"2021-07-21T08:00:03Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/sandutsar/PowerShell/pulls/24/commits","review_comments_url":"https://api.github.com/repos/sandutsar/PowerShell/pulls/24/comments","review_comment_url":"https://api.github.com/repos/sandutsar/PowerShell/pulls/comments{/number}","comments_url":"https://api.github.com/repos/sandutsar/PowerShell/issues/24/comments","statuses_url":"https://api.github.com/repos/sandutsar/PowerShell/statuses/408c4fd9ade57634c2ed1fbc2fd72a1e80b2a04a","head":{"label":"PowerShell:master","ref":"master","sha":"408c4fd9ade57634c2ed1fbc2fd72a1e80b2a04a","user":{"login":"PowerShell","id":11524380,"node_id":"MDEyOk9yZ2FuaXphdGlvbjExNTI0Mzgw","avatar_url":"https://avatars.githubusercontent.com/u/11524380?v=4","gravatar_id":"","url":"https://api.github.com/users/PowerShell","html_url":"https://github.com/PowerShell","followers_url":"https://api.github.com/users/PowerShell/followers","following_url":"https://api.github.com/users/PowerShell/following{/other_user}","gists_url":"https://api.github.com/users/PowerShell/gists{/gist_id}","starred_url":"https://api.github.com/users/PowerShell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PowerShell/subscriptions","organizations_url":"https://api.github.com/users/PowerShell/orgs","repos_url":"https://api.github.com/users/PowerShell/repos","events_url":"https://api.github.com/users/PowerShell/events{/privacy}","received_events_url":"https://api.github.com/users/PowerShell/received_events","type":"Organization","site_admin":false},"repo":{"id":49609581,"node_id":"MDEwOlJlcG9zaXRvcnk0OTYwOTU4MQ==","name":"PowerShell","full_name":"PowerShell/PowerShell","private":false,"owner":{"login":"PowerShell","id":11524380,"node_id":"MDEyOk9yZ2FuaXphdGlvbjExNTI0Mzgw","avatar_url":"https://avatars.githubusercontent.com/u/11524380?v=4","gravatar_id":"","url":"https://api.github.com/users/PowerShell","html_url":"https://github.com/PowerShell","followers_url":"https://api.github.com/users/PowerShell/followers","following_url":"https://api.github.com/users/PowerShell/following{/other_user}","gists_url":"https://api.github.com/users/PowerShell/gists{/gist_id}","starred_url":"https://api.github.com/users/PowerShell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PowerShell/subscriptions","organizations_url":"https://api.github.com/users/PowerShell/orgs","repos_url":"https://api.github.com/users/PowerShell/repos","events_url":"https://api.github.com/users/PowerShell/events{/privacy}","received_events_url":"https://api.github.com/users/PowerShell/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/PowerShell/PowerShell","description":"PowerShell for every system!","fork":false,"url":"https://api.github.com/repos/PowerShell/PowerShell","forks_url":"https://api.github.com/repos/PowerShell/PowerShell/forks","keys_url":"https://api.github.com/repos/PowerShell/PowerShell/keys{/key_id}","collaborators_url":"https://api.github.com/repos/PowerShell/PowerShell/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/PowerShell/PowerShell/teams","hooks_url":"https://api.github.com/repos/PowerShell/PowerShell/hooks","issue_events_url":"https://api.github.com/repos/PowerShell/PowerShell/issues/events{/number}","events_url":"https://api.github.com/repos/PowerShell/PowerShell/events","assignees_url":"https://api.github.com/repos/PowerShell/PowerShell/assignees{/user}","branches_url":"https://api.github.com/repos/PowerShell/PowerShell/branches{/branch}","tags_url":"https://api.github.com/repos/PowerShell/PowerShell/tags","blobs_url":"https://api.github.com/repos/PowerShell/PowerShell/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/PowerShell/PowerShell/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/PowerShell/PowerShell/git/refs{/sha}","trees_url":"https://api.github.com/repos/PowerShell/PowerShell/git/trees{/sha}","statuses_url":"https://api.github.com/repos/PowerShell/PowerShell/statuses/{sha}","languages_url":"https://api.github.com/repos/PowerShell/PowerShell/languages","stargazers_url":"https://api.github.com/repos/PowerShell/PowerShell/stargazers","contributors_url":"https://api.github.com/repos/PowerShell/PowerShell/contributors","subscribers_url":"https://api.github.com/repos/PowerShell/PowerShell/subscribers","subscription_url":"https://api.github.com/repos/PowerShell/PowerShell/subscription","commits_url":"https://api.github.com/repos/PowerShell/PowerShell/commits{/sha}","git_commits_url":"https://api.github.com/repos/PowerShell/PowerShell/git/commits{/sha}","comments_url":"https://api.github.com/repos/PowerShell/PowerShell/comments{/number}","issue_comment_url":"https://api.github.com/repos/PowerShell/PowerShell/issues/comments{/number}","contents_url":"https://api.github.com/repos/PowerShell/PowerShell/contents/{+path}","compare_url":"https://api.github.com/repos/PowerShell/PowerShell/compare/{base}...{head}","merges_url":"https://api.github.com/repos/PowerShell/PowerShell/merges","archive_url":"https://api.github.com/repos/PowerShell/PowerShell/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/PowerShell/PowerShell/downloads","issues_url":"https://api.github.com/repos/PowerShell/PowerShell/issues{/number}","pulls_url":"https://api.github.com/repos/PowerShell/PowerShell/pulls{/number}","milestones_url":"https://api.github.com/repos/PowerShell/PowerShell/milestones{/number}","notifications_url":"https://api.github.com/repos/PowerShell/PowerShell/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/PowerShell/PowerShell/labels{/name}","releases_url":"https://api.github.com/repos/PowerShell/PowerShell/releases{/id}","deployments_url":"https://api.github.com/repos/PowerShell/PowerShell/deployments","created_at":"2016-01-13T23:41:35Z","updated_at":"2021-07-21T07:42:45Z","pushed_at":"2021-07-21T06:34:39Z","git_url":"git://github.com/PowerShell/PowerShell.git","ssh_url":"git@github.com:PowerShell/PowerShell.git","clone_url":"https://github.com/PowerShell/PowerShell.git","svn_url":"https://github.com/PowerShell/PowerShell","homepage":"https://microsoft.com/PowerShell","size":80056,"stargazers_count":27823,"watchers_count":27823,"language":"C#","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":4393,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":3106,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":4393,"open_issues":3106,"watchers":27823,"default_branch":"master"}},"base":{"label":"sandutsar:master","ref":"master","sha":"ac762c1cce10b962394b9e7589ce8a2e3f8cebb1","user":{"login":"sandutsar","id":76633456,"node_id":"MDQ6VXNlcjc2NjMzNDU2","avatar_url":"https://avatars.githubusercontent.com/u/76633456?v=4","gravatar_id":"","url":"https://api.github.com/users/sandutsar","html_url":"https://github.com/sandutsar","followers_url":"https://api.github.com/users/sandutsar/followers","following_url":"https://api.github.com/users/sandutsar/following{/other_user}","gists_url":"https://api.github.com/users/sandutsar/gists{/gist_id}","starred_url":"https://api.github.com/users/sandutsar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sandutsar/subscriptions","organizations_url":"https://api.github.com/users/sandutsar/orgs","repos_url":"https://api.github.com/users/sandutsar/repos","events_url":"https://api.github.com/users/sandutsar/events{/privacy}","received_events_url":"https://api.github.com/users/sandutsar/received_events","type":"User","site_admin":false},"repo":{"id":381937845,"node_id":"MDEwOlJlcG9zaXRvcnkzODE5Mzc4NDU=","name":"PowerShell","full_name":"sandutsar/PowerShell","private":false,"owner":{"login":"sandutsar","id":76633456,"node_id":"MDQ6VXNlcjc2NjMzNDU2","avatar_url":"https://avatars.githubusercontent.com/u/76633456?v=4","gravatar_id":"","url":"https://api.github.com/users/sandutsar","html_url":"https://github.com/sandutsar","followers_url":"https://api.github.com/users/sandutsar/followers","following_url":"https://api.github.com/users/sandutsar/following{/other_user}","gists_url":"https://api.github.com/users/sandutsar/gists{/gist_id}","starred_url":"https://api.github.com/users/sandutsar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sandutsar/subscriptions","organizations_url":"https://api.github.com/users/sandutsar/orgs","repos_url":"https://api.github.com/users/sandutsar/repos","events_url":"https://api.github.com/users/sandutsar/events{/privacy}","received_events_url":"https://api.github.com/users/sandutsar/received_events","type":"User","site_admin":false},"html_url":"https://github.com/sandutsar/PowerShell","description":"PowerShell for every system!","fork":true,"url":"https://api.github.com/repos/sandutsar/PowerShell","forks_url":"https://api.github.com/repos/sandutsar/PowerShell/forks","keys_url":"https://api.github.com/repos/sandutsar/PowerShell/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sandutsar/PowerShell/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sandutsar/PowerShell/teams","hooks_url":"https://api.github.com/repos/sandutsar/PowerShell/hooks","issue_events_url":"https://api.github.com/repos/sandutsar/PowerShell/issues/events{/number}","events_url":"https://api.github.com/repos/sandutsar/PowerShell/events","assignees_url":"https://api.github.com/repos/sandutsar/PowerShell/assignees{/user}","branches_url":"https://api.github.com/repos/sandutsar/PowerShell/branches{/branch}","tags_url":"https://api.github.com/repos/sandutsar/PowerShell/tags","blobs_url":"https://api.github.com/repos/sandutsar/PowerShell/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sandutsar/PowerShell/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sandutsar/PowerShell/git/refs{/sha}","trees_url":"https://api.github.com/repos/sandutsar/PowerShell/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sandutsar/PowerShell/statuses/{sha}","languages_url":"https://api.github.com/repos/sandutsar/PowerShell/languages","stargazers_url":"https://api.github.com/repos/sandutsar/PowerShell/stargazers","contributors_url":"https://api.github.com/repos/sandutsar/PowerShell/contributors","subscribers_url":"https://api.github.com/repos/sandutsar/PowerShell/subscribers","subscription_url":"https://api.github.com/repos/sandutsar/PowerShell/subscription","commits_url":"https://api.github.com/repos/sandutsar/PowerShell/commits{/sha}","git_commits_url":"https://api.github.com/repos/sandutsar/PowerShell/git/commits{/sha}","comments_url":"https://api.github.com/repos/sandutsar/PowerShell/comments{/number}","issue_comment_url":"https://api.github.com/repos/sandutsar/PowerShell/issues/comments{/number}","contents_url":"https://api.github.com/repos/sandutsar/PowerShell/contents/{+path}","compare_url":"https://api.github.com/repos/sandutsar/PowerShell/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sandutsar/PowerShell/merges","archive_url":"https://api.github.com/repos/sandutsar/PowerShell/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sandutsar/PowerShell/downloads","issues_url":"https://api.github.com/repos/sandutsar/PowerShell/issues{/number}","pulls_url":"https://api.github.com/repos/sandutsar/PowerShell/pulls{/number}","milestones_url":"https://api.github.com/repos/sandutsar/PowerShell/milestones{/number}","notifications_url":"https://api.github.com/repos/sandutsar/PowerShell/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sandutsar/PowerShell/labels{/name}","releases_url":"https://api.github.com/repos/sandutsar/PowerShell/releases{/id}","deployments_url":"https://api.github.com/repos/sandutsar/PowerShell/deployments","created_at":"2021-07-01T06:51:52Z","updated_at":"2021-07-21T02:00:28Z","pushed_at":"2021-07-21T02:00:19Z","git_url":"git://github.com/sandutsar/PowerShell.git","ssh_url":"git@github.com:sandutsar/PowerShell.git","clone_url":"https://github.com/sandutsar/PowerShell.git","svn_url":"https://github.com/sandutsar/PowerShell","homepage":"https://microsoft.com/PowerShell","size":77641,"stargazers_count":0,"watchers_count":0,"language":"C#","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/sandutsar/PowerShell/pulls/24"},"html":{"href":"https://github.com/sandutsar/PowerShell/pull/24"},"issue":{"href":"https://api.github.com/repos/sandutsar/PowerShell/issues/24"},"comments":{"href":"https://api.github.com/repos/sandutsar/PowerShell/issues/24/comments"},"review_comments":{"href":"https://api.github.com/repos/sandutsar/PowerShell/pulls/24/comments"},"review_comment":{"href":"https://api.github.com/repos/sandutsar/PowerShell/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/sandutsar/PowerShell/pulls/24/commits"},"statuses":{"href":"https://api.github.com/repos/sandutsar/PowerShell/statuses/408c4fd9ade57634c2ed1fbc2fd72a1e80b2a04a"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":6,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515411","type":"PushEvent","actor":{"id":81431557,"login":"voyagebagage","display_login":"voyagebagage","gravatar_id":"","url":"https://api.github.com/users/voyagebagage","avatar_url":"https://avatars.githubusercontent.com/u/81431557?"},"repo":{"id":388036768,"name":"voyagebagage/voyagebagage","url":"https://api.github.com/repos/voyagebagage/voyagebagage"},"payload":{"push_id":7562055356,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"4807b964d0c9616f5502be34c20615d5d4bfd6df","before":"a683d05b0446b7d7e2518a31658e09b8c74a94ba","commits":[{"sha":"4807b964d0c9616f5502be34c20615d5d4bfd6df","author":{"name":"Oliv Dev","email":"9aab5662e6c75df679903a6d679cfcc913fcf574@gmail.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/voyagebagage/voyagebagage/commits/4807b964d0c9616f5502be34c20615d5d4bfd6df"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515428","type":"PullRequestEvent","actor":{"id":49736102,"login":"kodiakhq[bot]","display_login":"kodiakhq","gravatar_id":"","url":"https://api.github.com/users/kodiakhq[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49736102?"},"repo":{"id":352747621,"name":"esm-bundle/markdown-it-emoji","url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji"},"payload":{"action":"closed","number":62,"pull_request":{"url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/62","id":694141091,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxMDkx","html_url":"https://github.com/esm-bundle/markdown-it-emoji/pull/62","diff_url":"https://github.com/esm-bundle/markdown-it-emoji/pull/62.diff","patch_url":"https://github.com/esm-bundle/markdown-it-emoji/pull/62.patch","issue_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/62","number":62,"state":"closed","locked":false,"title":"Update dependency rollup to v2.53.3","user":{"login":"renovate[bot]","id":29139614,"node_id":"MDM6Qm90MjkxMzk2MTQ=","avatar_url":"https://avatars.githubusercontent.com/in/2740?v=4","gravatar_id":"","url":"https://api.github.com/users/renovate%5Bbot%5D","html_url":"https://github.com/apps/renovate","followers_url":"https://api.github.com/users/renovate%5Bbot%5D/followers","following_url":"https://api.github.com/users/renovate%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/renovate%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/renovate%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/renovate%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/renovate%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/renovate%5Bbot%5D/repos","events_url":"https://api.github.com/users/renovate%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/renovate%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [rollup](https://rollupjs.org/) ([source](https://togithub.com/rollup/rollup)) | [`2.53.2` -> `2.53.3`](https://renovatebot.com/diffs/npm/rollup/2.53.2/2.53.3) | [![age](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/compatibility-slim/2.53.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/confidence-slim/2.53.2)](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>rollup/rollup</summary>\n\n### [`v2.53.3`](https://togithub.com/rollup/rollup/blob/master/CHANGELOG.md#&#8203;2533)\n\n[Compare Source](https://togithub.com/rollup/rollup/compare/v2.53.2...v2.53.3)\n\n*2021-07-21*\n\n##### Bug Fixes\n\n-   Solve an issue that could lead to severe memory issues and crashes when there are a lot of hoisted variables ([#&#8203;4183](https://togithub.com/rollup/rollup/issues/4183))\n\n##### Pull Requests\n\n-   [#&#8203;4183](https://togithub.com/rollup/rollup/pull/4183): Avoid memory issues with hoisted variables ([@&#8203;lukastaegert](https://togithub.com/lukastaegert))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\n\n---\n\nThis PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/esm-bundle/markdown-it-emoji).","created_at":"2021-07-21T07:59:07Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:03Z","merged_at":"2021-07-21T08:00:03Z","merge_commit_sha":"179af100fa383064b40c6358632f2531cbc8f4b7","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/62/commits","review_comments_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/62/comments","review_comment_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/comments{/number}","comments_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/62/comments","statuses_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/statuses/65a4c4fef87320c962844ce366dd66be66040f79","head":{"label":"esm-bundle:renovate/rollup-2.x","ref":"renovate/rollup-2.x","sha":"65a4c4fef87320c962844ce366dd66be66040f79","user":{"login":"esm-bundle","id":60286277,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYwMjg2Mjc3","avatar_url":"https://avatars.githubusercontent.com/u/60286277?v=4","gravatar_id":"","url":"https://api.github.com/users/esm-bundle","html_url":"https://github.com/esm-bundle","followers_url":"https://api.github.com/users/esm-bundle/followers","following_url":"https://api.github.com/users/esm-bundle/following{/other_user}","gists_url":"https://api.github.com/users/esm-bundle/gists{/gist_id}","starred_url":"https://api.github.com/users/esm-bundle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/esm-bundle/subscriptions","organizations_url":"https://api.github.com/users/esm-bundle/orgs","repos_url":"https://api.github.com/users/esm-bundle/repos","events_url":"https://api.github.com/users/esm-bundle/events{/privacy}","received_events_url":"https://api.github.com/users/esm-bundle/received_events","type":"Organization","site_admin":false},"repo":{"id":352747621,"node_id":"MDEwOlJlcG9zaXRvcnkzNTI3NDc2MjE=","name":"markdown-it-emoji","full_name":"esm-bundle/markdown-it-emoji","private":false,"owner":{"login":"esm-bundle","id":60286277,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYwMjg2Mjc3","avatar_url":"https://avatars.githubusercontent.com/u/60286277?v=4","gravatar_id":"","url":"https://api.github.com/users/esm-bundle","html_url":"https://github.com/esm-bundle","followers_url":"https://api.github.com/users/esm-bundle/followers","following_url":"https://api.github.com/users/esm-bundle/following{/other_user}","gists_url":"https://api.github.com/users/esm-bundle/gists{/gist_id}","starred_url":"https://api.github.com/users/esm-bundle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/esm-bundle/subscriptions","organizations_url":"https://api.github.com/users/esm-bundle/orgs","repos_url":"https://api.github.com/users/esm-bundle/repos","events_url":"https://api.github.com/users/esm-bundle/events{/privacy}","received_events_url":"https://api.github.com/users/esm-bundle/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/esm-bundle/markdown-it-emoji","description":null,"fork":false,"url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji","forks_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/forks","keys_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/keys{/key_id}","collaborators_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/teams","hooks_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/hooks","issue_events_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/events{/number}","events_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/events","assignees_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/assignees{/user}","branches_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/branches{/branch}","tags_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/tags","blobs_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/refs{/sha}","trees_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/trees{/sha}","statuses_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/statuses/{sha}","languages_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/languages","stargazers_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/stargazers","contributors_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/contributors","subscribers_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/subscribers","subscription_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/subscription","commits_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/commits{/sha}","git_commits_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/commits{/sha}","comments_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/comments{/number}","issue_comment_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/comments{/number}","contents_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/contents/{+path}","compare_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/compare/{base}...{head}","merges_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/merges","archive_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/downloads","issues_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues{/number}","pulls_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls{/number}","milestones_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/milestones{/number}","notifications_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/labels{/name}","releases_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/releases{/id}","deployments_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/deployments","created_at":"2021-03-29T18:36:04Z","updated_at":"2021-07-15T23:47:28Z","pushed_at":"2021-07-21T08:00:03Z","git_url":"git://github.com/esm-bundle/markdown-it-emoji.git","ssh_url":"git@github.com:esm-bundle/markdown-it-emoji.git","clone_url":"https://github.com/esm-bundle/markdown-it-emoji.git","svn_url":"https://github.com/esm-bundle/markdown-it-emoji","homepage":null,"size":483,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":1,"open_issues":0,"watchers":0,"default_branch":"main"}},"base":{"label":"esm-bundle:main","ref":"main","sha":"68fdce2a9921331aaf8d208e93064aba36b20144","user":{"login":"esm-bundle","id":60286277,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYwMjg2Mjc3","avatar_url":"https://avatars.githubusercontent.com/u/60286277?v=4","gravatar_id":"","url":"https://api.github.com/users/esm-bundle","html_url":"https://github.com/esm-bundle","followers_url":"https://api.github.com/users/esm-bundle/followers","following_url":"https://api.github.com/users/esm-bundle/following{/other_user}","gists_url":"https://api.github.com/users/esm-bundle/gists{/gist_id}","starred_url":"https://api.github.com/users/esm-bundle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/esm-bundle/subscriptions","organizations_url":"https://api.github.com/users/esm-bundle/orgs","repos_url":"https://api.github.com/users/esm-bundle/repos","events_url":"https://api.github.com/users/esm-bundle/events{/privacy}","received_events_url":"https://api.github.com/users/esm-bundle/received_events","type":"Organization","site_admin":false},"repo":{"id":352747621,"node_id":"MDEwOlJlcG9zaXRvcnkzNTI3NDc2MjE=","name":"markdown-it-emoji","full_name":"esm-bundle/markdown-it-emoji","private":false,"owner":{"login":"esm-bundle","id":60286277,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYwMjg2Mjc3","avatar_url":"https://avatars.githubusercontent.com/u/60286277?v=4","gravatar_id":"","url":"https://api.github.com/users/esm-bundle","html_url":"https://github.com/esm-bundle","followers_url":"https://api.github.com/users/esm-bundle/followers","following_url":"https://api.github.com/users/esm-bundle/following{/other_user}","gists_url":"https://api.github.com/users/esm-bundle/gists{/gist_id}","starred_url":"https://api.github.com/users/esm-bundle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/esm-bundle/subscriptions","organizations_url":"https://api.github.com/users/esm-bundle/orgs","repos_url":"https://api.github.com/users/esm-bundle/repos","events_url":"https://api.github.com/users/esm-bundle/events{/privacy}","received_events_url":"https://api.github.com/users/esm-bundle/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/esm-bundle/markdown-it-emoji","description":null,"fork":false,"url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji","forks_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/forks","keys_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/keys{/key_id}","collaborators_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/teams","hooks_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/hooks","issue_events_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/events{/number}","events_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/events","assignees_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/assignees{/user}","branches_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/branches{/branch}","tags_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/tags","blobs_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/refs{/sha}","trees_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/trees{/sha}","statuses_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/statuses/{sha}","languages_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/languages","stargazers_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/stargazers","contributors_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/contributors","subscribers_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/subscribers","subscription_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/subscription","commits_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/commits{/sha}","git_commits_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/git/commits{/sha}","comments_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/comments{/number}","issue_comment_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/comments{/number}","contents_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/contents/{+path}","compare_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/compare/{base}...{head}","merges_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/merges","archive_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/downloads","issues_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues{/number}","pulls_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls{/number}","milestones_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/milestones{/number}","notifications_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/labels{/name}","releases_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/releases{/id}","deployments_url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/deployments","created_at":"2021-03-29T18:36:04Z","updated_at":"2021-07-15T23:47:28Z","pushed_at":"2021-07-21T08:00:03Z","git_url":"git://github.com/esm-bundle/markdown-it-emoji.git","ssh_url":"git@github.com:esm-bundle/markdown-it-emoji.git","clone_url":"https://github.com/esm-bundle/markdown-it-emoji.git","svn_url":"https://github.com/esm-bundle/markdown-it-emoji","homepage":null,"size":483,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":1,"open_issues":0,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/62"},"html":{"href":"https://github.com/esm-bundle/markdown-it-emoji/pull/62"},"issue":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/62"},"comments":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/issues/62/comments"},"review_comments":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/62/comments"},"review_comment":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/pulls/62/commits"},"statuses":{"href":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/statuses/65a4c4fef87320c962844ce366dd66be66040f79"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"kodiakhq[bot]","id":49736102,"node_id":"MDM6Qm90NDk3MzYxMDI=","avatar_url":"https://avatars.githubusercontent.com/in/29196?v=4","gravatar_id":"","url":"https://api.github.com/users/kodiakhq%5Bbot%5D","html_url":"https://github.com/apps/kodiakhq","followers_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/followers","following_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/repos","events_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/kodiakhq%5Bbot%5D/received_events","type":"Bot","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":22,"deletions":22,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":60286277,"login":"esm-bundle","gravatar_id":"","url":"https://api.github.com/orgs/esm-bundle","avatar_url":"https://avatars.githubusercontent.com/u/60286277?"}}
+{"id":"17245515433","type":"CreateEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":337718447,"name":"Alberto-S-P/Boilerplate_Nextjs","url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs"},"payload":{"ref":"dependabot/npm_and_yarn/types/node-16.4.0","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515438","type":"DeleteEvent","actor":{"id":7659712,"login":"zenkins","display_login":"zenkins","gravatar_id":"","url":"https://api.github.com/users/zenkins","avatar_url":"https://avatars.githubusercontent.com/u/7659712?"},"repo":{"id":53574465,"name":"wireapp/wire-ios-cryptobox","url":"https://api.github.com/repos/wireapp/wire-ios-cryptobox"},"payload":{"ref":"chore/bump_2021-07-21-075451","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":16047324,"login":"wireapp","gravatar_id":"","url":"https://api.github.com/orgs/wireapp","avatar_url":"https://avatars.githubusercontent.com/u/16047324?"}}
+{"id":"17245515445","type":"PushEvent","actor":{"id":9197716,"login":"ChrisRG","display_login":"ChrisRG","gravatar_id":"","url":"https://api.github.com/users/ChrisRG","avatar_url":"https://avatars.githubusercontent.com/u/9197716?"},"repo":{"id":387739023,"name":"ChrisRG/lewagon","url":"https://api.github.com/repos/ChrisRG/lewagon"},"payload":{"push_id":7562055401,"size":2,"distinct_size":1,"ref":"refs/heads/main","head":"802fb53c6b970df7d94dee03b772d8d0f1766f4f","before":"bdd0f038633581b1395b49cc1c2dd18ba666ea19","commits":[{"sha":"345771f53451684968e72336b285dc8e37869eb1","author":{"name":"Marcel Fonseca","email":"71eb495dfc5d0c27967d69c49874ccba6cedb3f7@gmail.com"},"message":"finished signup logic","distinct":false,"url":"https://api.github.com/repos/ChrisRG/lewagon/commits/345771f53451684968e72336b285dc8e37869eb1"},{"sha":"802fb53c6b970df7d94dee03b772d8d0f1766f4f","author":{"name":"Chris Geekie","email":"7b73d1a37a0d4016d238674803908da2429cfa5d@users.noreply.github.com"},"message":"Merge pull request #1 from ChrisRG/sign-up-logic\n\nfinished signup logic","distinct":true,"url":"https://api.github.com/repos/ChrisRG/lewagon/commits/802fb53c6b970df7d94dee03b772d8d0f1766f4f"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515461","type":"CreateEvent","actor":{"id":66831205,"login":"charlesmmarshall","display_login":"charlesmmarshall","gravatar_id":"","url":"https://api.github.com/users/charlesmmarshall","avatar_url":"https://avatars.githubusercontent.com/u/66831205?"},"repo":{"id":388040092,"name":"ministryofjustice/opg-infra-costs-action","url":"https://api.github.com/repos/ministryofjustice/opg-infra-costs-action"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":"Github action to generate AWS cost data: Managed by opg-org-infra & Terraform","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":2203574,"login":"ministryofjustice","gravatar_id":"","url":"https://api.github.com/orgs/ministryofjustice","avatar_url":"https://avatars.githubusercontent.com/u/2203574?"}}
+{"id":"17245515477","type":"PushEvent","actor":{"id":3379460,"login":"beanslee2012","display_login":"beanslee2012","gravatar_id":"","url":"https://api.github.com/users/beanslee2012","avatar_url":"https://avatars.githubusercontent.com/u/3379460?"},"repo":{"id":215003385,"name":"beanslee2012/games","url":"https://api.github.com/repos/beanslee2012/games"},"payload":{"push_id":7562055416,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"828a7e3fde4d5b3dd564e7064ea09361523439d2","before":"2c1ffaff60d52f1094427848ae9c6f326d821ca4","commits":[{"sha":"828a7e3fde4d5b3dd564e7064ea09361523439d2","author":{"name":"beanslee2012","email":"9aadcc12fe6ab8c01e6245204a102e9e34317220@gmail.com"},"message":"daily update","distinct":true,"url":"https://api.github.com/repos/beanslee2012/games/commits/828a7e3fde4d5b3dd564e7064ea09361523439d2"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515482","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7562055408,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"406a8945fddc6662b6816d96e7e9d21a8f088687","before":"1f46d3439c36fbf8ce98c15df365be16fcd33ef4","commits":[{"sha":"406a8945fddc6662b6816d96e7e9d21a8f088687","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/406a8945fddc6662b6816d96e7e9d21a8f088687"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515486","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249783941,"name":"miwebst/ssRunnerAngular","url":"https://api.github.com/repos/miwebst/ssRunnerAngular"},"payload":{"push_id":7562055417,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"3746f2fb01535a590f2d708471ca3f7ac849856b","before":"cc57825ea136c09cb0920dfbb4abbc473d44a7f7","commits":[{"sha":"3746f2fb01535a590f2d708471ca3f7ac849856b","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 8:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerAngular/commits/3746f2fb01535a590f2d708471ca3f7ac849856b"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515490","type":"PushEvent","actor":{"id":40586421,"login":"himobi","display_login":"himobi","gravatar_id":"","url":"https://api.github.com/users/himobi","avatar_url":"https://avatars.githubusercontent.com/u/40586421?"},"repo":{"id":138676186,"name":"himobi/hotspot","url":"https://api.github.com/repos/himobi/hotspot"},"payload":{"push_id":7562055414,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"cd0cdb510c3582ac98540b6700fa98d2a52855eb","before":"2eb2a9639e315e9f2d53cc98a5d1ff686833a145","commits":[{"sha":"cd0cdb510c3582ac98540b6700fa98d2a52855eb","author":{"name":"himobi","email":"25be52bce459ebff50c126f5ac512648f87cbe75@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/himobi/hotspot/commits/cd0cdb510c3582ac98540b6700fa98d2a52855eb"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515491","type":"PushEvent","actor":{"id":82876799,"login":"hvaish01","display_login":"hvaish01","gravatar_id":"","url":"https://api.github.com/users/hvaish01","avatar_url":"https://avatars.githubusercontent.com/u/82876799?"},"repo":{"id":359772248,"name":"hvaish01/StixBundles","url":"https://api.github.com/repos/hvaish01/StixBundles"},"payload":{"push_id":7562055415,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"73506f5776e1449063f1ff0220446408fb6865aa","before":"b6f5403b6ccf526d65c6e01b67845dc685135437","commits":[{"sha":"73506f5776e1449063f1ff0220446408fb6865aa","author":{"name":"hvaish01","email":"2afd248fb67ac19cdeb0148e32ca7ee71c30c76d@users.noreply.github.com"},"message":"Updated at 01:00:02 21-07-2021","distinct":true,"url":"https://api.github.com/repos/hvaish01/StixBundles/commits/73506f5776e1449063f1ff0220446408fb6865aa"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515509","type":"PullRequestEvent","actor":{"id":43602284,"login":"urbiz-nr","display_login":"urbiz-nr","gravatar_id":"","url":"https://api.github.com/users/urbiz-nr","avatar_url":"https://avatars.githubusercontent.com/u/43602284?"},"repo":{"id":287113304,"name":"newrelic/docs-website","url":"https://api.github.com/repos/newrelic/docs-website"},"payload":{"action":"opened","number":3204,"pull_request":{"url":"https://api.github.com/repos/newrelic/docs-website/pulls/3204","id":694141693,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNjkz","html_url":"https://github.com/newrelic/docs-website/pull/3204","diff_url":"https://github.com/newrelic/docs-website/pull/3204.diff","patch_url":"https://github.com/newrelic/docs-website/pull/3204.patch","issue_url":"https://api.github.com/repos/newrelic/docs-website/issues/3204","number":3204,"state":"open","locked":false,"title":"Deleting campfire orphan doc","user":{"login":"urbiz-nr","id":43602284,"node_id":"MDQ6VXNlcjQzNjAyMjg0","avatar_url":"https://avatars.githubusercontent.com/u/43602284?v=4","gravatar_id":"","url":"https://api.github.com/users/urbiz-nr","html_url":"https://github.com/urbiz-nr","followers_url":"https://api.github.com/users/urbiz-nr/followers","following_url":"https://api.github.com/users/urbiz-nr/following{/other_user}","gists_url":"https://api.github.com/users/urbiz-nr/gists{/gist_id}","starred_url":"https://api.github.com/users/urbiz-nr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/urbiz-nr/subscriptions","organizations_url":"https://api.github.com/users/urbiz-nr/orgs","repos_url":"https://api.github.com/users/urbiz-nr/repos","events_url":"https://api.github.com/users/urbiz-nr/events{/privacy}","received_events_url":"https://api.github.com/users/urbiz-nr/received_events","type":"User","site_admin":false},"body":"Leftover from the Orphan doc review project DOC-6956.","created_at":"2021-07-21T08:00:03Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/newrelic/docs-website/pulls/3204/commits","review_comments_url":"https://api.github.com/repos/newrelic/docs-website/pulls/3204/comments","review_comment_url":"https://api.github.com/repos/newrelic/docs-website/pulls/comments{/number}","comments_url":"https://api.github.com/repos/newrelic/docs-website/issues/3204/comments","statuses_url":"https://api.github.com/repos/newrelic/docs-website/statuses/242cb5d53668e891248903dfb97c2e98c6e17727","head":{"label":"newrelic:Removing-alerts-orphan-doc","ref":"Removing-alerts-orphan-doc","sha":"242cb5d53668e891248903dfb97c2e98c6e17727","user":{"login":"newrelic","id":31739,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMxNzM5","avatar_url":"https://avatars.githubusercontent.com/u/31739?v=4","gravatar_id":"","url":"https://api.github.com/users/newrelic","html_url":"https://github.com/newrelic","followers_url":"https://api.github.com/users/newrelic/followers","following_url":"https://api.github.com/users/newrelic/following{/other_user}","gists_url":"https://api.github.com/users/newrelic/gists{/gist_id}","starred_url":"https://api.github.com/users/newrelic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/newrelic/subscriptions","organizations_url":"https://api.github.com/users/newrelic/orgs","repos_url":"https://api.github.com/users/newrelic/repos","events_url":"https://api.github.com/users/newrelic/events{/privacy}","received_events_url":"https://api.github.com/users/newrelic/received_events","type":"Organization","site_admin":false},"repo":{"id":287113304,"node_id":"MDEwOlJlcG9zaXRvcnkyODcxMTMzMDQ=","name":"docs-website","full_name":"newrelic/docs-website","private":false,"owner":{"login":"newrelic","id":31739,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMxNzM5","avatar_url":"https://avatars.githubusercontent.com/u/31739?v=4","gravatar_id":"","url":"https://api.github.com/users/newrelic","html_url":"https://github.com/newrelic","followers_url":"https://api.github.com/users/newrelic/followers","following_url":"https://api.github.com/users/newrelic/following{/other_user}","gists_url":"https://api.github.com/users/newrelic/gists{/gist_id}","starred_url":"https://api.github.com/users/newrelic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/newrelic/subscriptions","organizations_url":"https://api.github.com/users/newrelic/orgs","repos_url":"https://api.github.com/users/newrelic/repos","events_url":"https://api.github.com/users/newrelic/events{/privacy}","received_events_url":"https://api.github.com/users/newrelic/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/newrelic/docs-website","description":"Source code and public issue backlog for @newrelic docs.","fork":false,"url":"https://api.github.com/repos/newrelic/docs-website","forks_url":"https://api.github.com/repos/newrelic/docs-website/forks","keys_url":"https://api.github.com/repos/newrelic/docs-website/keys{/key_id}","collaborators_url":"https://api.github.com/repos/newrelic/docs-website/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/newrelic/docs-website/teams","hooks_url":"https://api.github.com/repos/newrelic/docs-website/hooks","issue_events_url":"https://api.github.com/repos/newrelic/docs-website/issues/events{/number}","events_url":"https://api.github.com/repos/newrelic/docs-website/events","assignees_url":"https://api.github.com/repos/newrelic/docs-website/assignees{/user}","branches_url":"https://api.github.com/repos/newrelic/docs-website/branches{/branch}","tags_url":"https://api.github.com/repos/newrelic/docs-website/tags","blobs_url":"https://api.github.com/repos/newrelic/docs-website/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/newrelic/docs-website/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/newrelic/docs-website/git/refs{/sha}","trees_url":"https://api.github.com/repos/newrelic/docs-website/git/trees{/sha}","statuses_url":"https://api.github.com/repos/newrelic/docs-website/statuses/{sha}","languages_url":"https://api.github.com/repos/newrelic/docs-website/languages","stargazers_url":"https://api.github.com/repos/newrelic/docs-website/stargazers","contributors_url":"https://api.github.com/repos/newrelic/docs-website/contributors","subscribers_url":"https://api.github.com/repos/newrelic/docs-website/subscribers","subscription_url":"https://api.github.com/repos/newrelic/docs-website/subscription","commits_url":"https://api.github.com/repos/newrelic/docs-website/commits{/sha}","git_commits_url":"https://api.github.com/repos/newrelic/docs-website/git/commits{/sha}","comments_url":"https://api.github.com/repos/newrelic/docs-website/comments{/number}","issue_comment_url":"https://api.github.com/repos/newrelic/docs-website/issues/comments{/number}","contents_url":"https://api.github.com/repos/newrelic/docs-website/contents/{+path}","compare_url":"https://api.github.com/repos/newrelic/docs-website/compare/{base}...{head}","merges_url":"https://api.github.com/repos/newrelic/docs-website/merges","archive_url":"https://api.github.com/repos/newrelic/docs-website/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/newrelic/docs-website/downloads","issues_url":"https://api.github.com/repos/newrelic/docs-website/issues{/number}","pulls_url":"https://api.github.com/repos/newrelic/docs-website/pulls{/number}","milestones_url":"https://api.github.com/repos/newrelic/docs-website/milestones{/number}","notifications_url":"https://api.github.com/repos/newrelic/docs-website/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/newrelic/docs-website/labels{/name}","releases_url":"https://api.github.com/repos/newrelic/docs-website/releases{/id}","deployments_url":"https://api.github.com/repos/newrelic/docs-website/deployments","created_at":"2020-08-12T20:52:25Z","updated_at":"2021-07-20T23:54:27Z","pushed_at":"2021-07-21T08:00:04Z","git_url":"git://github.com/newrelic/docs-website.git","ssh_url":"git@github.com:newrelic/docs-website.git","clone_url":"https://github.com/newrelic/docs-website.git","svn_url":"https://github.com/newrelic/docs-website","homepage":"https://docs.newrelic.com","size":302903,"stargazers_count":33,"watchers_count":33,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":269,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":161,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":269,"open_issues":161,"watchers":33,"default_branch":"develop"}},"base":{"label":"newrelic:develop","ref":"develop","sha":"b2f0b84bb8f1cfd05dc88f27647f77b3b4efd41f","user":{"login":"newrelic","id":31739,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMxNzM5","avatar_url":"https://avatars.githubusercontent.com/u/31739?v=4","gravatar_id":"","url":"https://api.github.com/users/newrelic","html_url":"https://github.com/newrelic","followers_url":"https://api.github.com/users/newrelic/followers","following_url":"https://api.github.com/users/newrelic/following{/other_user}","gists_url":"https://api.github.com/users/newrelic/gists{/gist_id}","starred_url":"https://api.github.com/users/newrelic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/newrelic/subscriptions","organizations_url":"https://api.github.com/users/newrelic/orgs","repos_url":"https://api.github.com/users/newrelic/repos","events_url":"https://api.github.com/users/newrelic/events{/privacy}","received_events_url":"https://api.github.com/users/newrelic/received_events","type":"Organization","site_admin":false},"repo":{"id":287113304,"node_id":"MDEwOlJlcG9zaXRvcnkyODcxMTMzMDQ=","name":"docs-website","full_name":"newrelic/docs-website","private":false,"owner":{"login":"newrelic","id":31739,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMxNzM5","avatar_url":"https://avatars.githubusercontent.com/u/31739?v=4","gravatar_id":"","url":"https://api.github.com/users/newrelic","html_url":"https://github.com/newrelic","followers_url":"https://api.github.com/users/newrelic/followers","following_url":"https://api.github.com/users/newrelic/following{/other_user}","gists_url":"https://api.github.com/users/newrelic/gists{/gist_id}","starred_url":"https://api.github.com/users/newrelic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/newrelic/subscriptions","organizations_url":"https://api.github.com/users/newrelic/orgs","repos_url":"https://api.github.com/users/newrelic/repos","events_url":"https://api.github.com/users/newrelic/events{/privacy}","received_events_url":"https://api.github.com/users/newrelic/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/newrelic/docs-website","description":"Source code and public issue backlog for @newrelic docs.","fork":false,"url":"https://api.github.com/repos/newrelic/docs-website","forks_url":"https://api.github.com/repos/newrelic/docs-website/forks","keys_url":"https://api.github.com/repos/newrelic/docs-website/keys{/key_id}","collaborators_url":"https://api.github.com/repos/newrelic/docs-website/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/newrelic/docs-website/teams","hooks_url":"https://api.github.com/repos/newrelic/docs-website/hooks","issue_events_url":"https://api.github.com/repos/newrelic/docs-website/issues/events{/number}","events_url":"https://api.github.com/repos/newrelic/docs-website/events","assignees_url":"https://api.github.com/repos/newrelic/docs-website/assignees{/user}","branches_url":"https://api.github.com/repos/newrelic/docs-website/branches{/branch}","tags_url":"https://api.github.com/repos/newrelic/docs-website/tags","blobs_url":"https://api.github.com/repos/newrelic/docs-website/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/newrelic/docs-website/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/newrelic/docs-website/git/refs{/sha}","trees_url":"https://api.github.com/repos/newrelic/docs-website/git/trees{/sha}","statuses_url":"https://api.github.com/repos/newrelic/docs-website/statuses/{sha}","languages_url":"https://api.github.com/repos/newrelic/docs-website/languages","stargazers_url":"https://api.github.com/repos/newrelic/docs-website/stargazers","contributors_url":"https://api.github.com/repos/newrelic/docs-website/contributors","subscribers_url":"https://api.github.com/repos/newrelic/docs-website/subscribers","subscription_url":"https://api.github.com/repos/newrelic/docs-website/subscription","commits_url":"https://api.github.com/repos/newrelic/docs-website/commits{/sha}","git_commits_url":"https://api.github.com/repos/newrelic/docs-website/git/commits{/sha}","comments_url":"https://api.github.com/repos/newrelic/docs-website/comments{/number}","issue_comment_url":"https://api.github.com/repos/newrelic/docs-website/issues/comments{/number}","contents_url":"https://api.github.com/repos/newrelic/docs-website/contents/{+path}","compare_url":"https://api.github.com/repos/newrelic/docs-website/compare/{base}...{head}","merges_url":"https://api.github.com/repos/newrelic/docs-website/merges","archive_url":"https://api.github.com/repos/newrelic/docs-website/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/newrelic/docs-website/downloads","issues_url":"https://api.github.com/repos/newrelic/docs-website/issues{/number}","pulls_url":"https://api.github.com/repos/newrelic/docs-website/pulls{/number}","milestones_url":"https://api.github.com/repos/newrelic/docs-website/milestones{/number}","notifications_url":"https://api.github.com/repos/newrelic/docs-website/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/newrelic/docs-website/labels{/name}","releases_url":"https://api.github.com/repos/newrelic/docs-website/releases{/id}","deployments_url":"https://api.github.com/repos/newrelic/docs-website/deployments","created_at":"2020-08-12T20:52:25Z","updated_at":"2021-07-20T23:54:27Z","pushed_at":"2021-07-21T08:00:04Z","git_url":"git://github.com/newrelic/docs-website.git","ssh_url":"git@github.com:newrelic/docs-website.git","clone_url":"https://github.com/newrelic/docs-website.git","svn_url":"https://github.com/newrelic/docs-website","homepage":"https://docs.newrelic.com","size":302903,"stargazers_count":33,"watchers_count":33,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":269,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":161,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":269,"open_issues":161,"watchers":33,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/newrelic/docs-website/pulls/3204"},"html":{"href":"https://github.com/newrelic/docs-website/pull/3204"},"issue":{"href":"https://api.github.com/repos/newrelic/docs-website/issues/3204"},"comments":{"href":"https://api.github.com/repos/newrelic/docs-website/issues/3204/comments"},"review_comments":{"href":"https://api.github.com/repos/newrelic/docs-website/pulls/3204/comments"},"review_comment":{"href":"https://api.github.com/repos/newrelic/docs-website/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/newrelic/docs-website/pulls/3204/commits"},"statuses":{"href":"https://api.github.com/repos/newrelic/docs-website/statuses/242cb5d53668e891248903dfb97c2e98c6e17727"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":0,"deletions":34,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":31739,"login":"newrelic","gravatar_id":"","url":"https://api.github.com/orgs/newrelic","avatar_url":"https://avatars.githubusercontent.com/u/31739?"}}
+{"id":"17245515511","type":"PushEvent","actor":{"id":878058,"login":"ParkMinKyu","display_login":"ParkMinKyu","gravatar_id":"","url":"https://api.github.com/users/ParkMinKyu","avatar_url":"https://avatars.githubusercontent.com/u/878058?"},"repo":{"id":362471221,"name":"ApartMoney/Apartmoney.github.io","url":"https://api.github.com/repos/ApartMoney/Apartmoney.github.io"},"payload":{"push_id":7562055423,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"26905cbb104f4d6021935c878009df18632786d3","before":"6d674aad9aa3ab4961d8530422886323115fc825","commits":[{"sha":"26905cbb104f4d6021935c878009df18632786d3","author":{"name":"ParkMinkyu","email":"f1d6fc1b4c5023402fddfd826b843346eec78543@naver.com"},"message":"update news data","distinct":true,"url":"https://api.github.com/repos/ApartMoney/Apartmoney.github.io/commits/26905cbb104f4d6021935c878009df18632786d3"}]},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":60907646,"login":"ApartMoney","gravatar_id":"","url":"https://api.github.com/orgs/ApartMoney","avatar_url":"https://avatars.githubusercontent.com/u/60907646?"}}
+{"id":"17245515520","type":"PullRequestEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":337718447,"name":"Alberto-S-P/Boilerplate_Nextjs","url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs"},"payload":{"action":"opened","number":86,"pull_request":{"url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/86","id":694141690,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNjkw","html_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/86","diff_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/86.diff","patch_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/86.patch","issue_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/86","number":86,"state":"open","locked":false,"title":"Bump @types/node from 14.14.25 to 16.4.0","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.25 to 16.4.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=@types/node&package-manager=npm_and_yarn&previous-version=14.14.25&new-version=16.4.0)](https://dependabot.com/compatibility-score/?dependency-name=@types/node&package-manager=npm_and_yarn&previous-version=14.14.25&new-version=16.4.0)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):\n- Update frequency (including time of day and day of week)\n- Pull request limits (per update run and/or open at any time)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","created_at":"2021-07-21T08:00:03Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/86/commits","review_comments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/86/comments","review_comment_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/86/comments","statuses_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/statuses/8243f97eaaa9a4844f460c21c144c571638db940","head":{"label":"Alberto-S-P:dependabot/npm_and_yarn/types/node-16.4.0","ref":"dependabot/npm_and_yarn/types/node-16.4.0","sha":"8243f97eaaa9a4844f460c21c144c571638db940","user":{"login":"Alberto-S-P","id":77673768,"node_id":"MDQ6VXNlcjc3NjczNzY4","avatar_url":"https://avatars.githubusercontent.com/u/77673768?v=4","gravatar_id":"","url":"https://api.github.com/users/Alberto-S-P","html_url":"https://github.com/Alberto-S-P","followers_url":"https://api.github.com/users/Alberto-S-P/followers","following_url":"https://api.github.com/users/Alberto-S-P/following{/other_user}","gists_url":"https://api.github.com/users/Alberto-S-P/gists{/gist_id}","starred_url":"https://api.github.com/users/Alberto-S-P/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Alberto-S-P/subscriptions","organizations_url":"https://api.github.com/users/Alberto-S-P/orgs","repos_url":"https://api.github.com/users/Alberto-S-P/repos","events_url":"https://api.github.com/users/Alberto-S-P/events{/privacy}","received_events_url":"https://api.github.com/users/Alberto-S-P/received_events","type":"User","site_admin":false},"repo":{"id":337718447,"node_id":"MDEwOlJlcG9zaXRvcnkzMzc3MTg0NDc=","name":"Boilerplate_Nextjs","full_name":"Alberto-S-P/Boilerplate_Nextjs","private":false,"owner":{"login":"Alberto-S-P","id":77673768,"node_id":"MDQ6VXNlcjc3NjczNzY4","avatar_url":"https://avatars.githubusercontent.com/u/77673768?v=4","gravatar_id":"","url":"https://api.github.com/users/Alberto-S-P","html_url":"https://github.com/Alberto-S-P","followers_url":"https://api.github.com/users/Alberto-S-P/followers","following_url":"https://api.github.com/users/Alberto-S-P/following{/other_user}","gists_url":"https://api.github.com/users/Alberto-S-P/gists{/gist_id}","starred_url":"https://api.github.com/users/Alberto-S-P/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Alberto-S-P/subscriptions","organizations_url":"https://api.github.com/users/Alberto-S-P/orgs","repos_url":"https://api.github.com/users/Alberto-S-P/repos","events_url":"https://api.github.com/users/Alberto-S-P/events{/privacy}","received_events_url":"https://api.github.com/users/Alberto-S-P/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs","description":null,"fork":false,"url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs","forks_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/forks","keys_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/teams","hooks_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/hooks","issue_events_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/events{/number}","events_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/events","assignees_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/assignees{/user}","branches_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/branches{/branch}","tags_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/tags","blobs_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/refs{/sha}","trees_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/statuses/{sha}","languages_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/languages","stargazers_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/stargazers","contributors_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/contributors","subscribers_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/subscribers","subscription_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/subscription","commits_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/commits{/sha}","git_commits_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/commits{/sha}","comments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/comments{/number}","issue_comment_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/comments{/number}","contents_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/contents/{+path}","compare_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/merges","archive_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/downloads","issues_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues{/number}","pulls_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls{/number}","milestones_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/milestones{/number}","notifications_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/labels{/name}","releases_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/releases{/id}","deployments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/deployments","created_at":"2021-02-10T12:33:10Z","updated_at":"2021-04-09T01:45:06Z","pushed_at":"2021-07-21T08:00:04Z","git_url":"git://github.com/Alberto-S-P/Boilerplate_Nextjs.git","ssh_url":"git@github.com:Alberto-S-P/Boilerplate_Nextjs.git","clone_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs.git","svn_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs","homepage":null,"size":1471,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":12,"license":null,"forks":0,"open_issues":12,"watchers":0,"default_branch":"main"}},"base":{"label":"Alberto-S-P:main","ref":"main","sha":"e029c42d45fb29e13b99bbf3f7b9bfbec24d672f","user":{"login":"Alberto-S-P","id":77673768,"node_id":"MDQ6VXNlcjc3NjczNzY4","avatar_url":"https://avatars.githubusercontent.com/u/77673768?v=4","gravatar_id":"","url":"https://api.github.com/users/Alberto-S-P","html_url":"https://github.com/Alberto-S-P","followers_url":"https://api.github.com/users/Alberto-S-P/followers","following_url":"https://api.github.com/users/Alberto-S-P/following{/other_user}","gists_url":"https://api.github.com/users/Alberto-S-P/gists{/gist_id}","starred_url":"https://api.github.com/users/Alberto-S-P/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Alberto-S-P/subscriptions","organizations_url":"https://api.github.com/users/Alberto-S-P/orgs","repos_url":"https://api.github.com/users/Alberto-S-P/repos","events_url":"https://api.github.com/users/Alberto-S-P/events{/privacy}","received_events_url":"https://api.github.com/users/Alberto-S-P/received_events","type":"User","site_admin":false},"repo":{"id":337718447,"node_id":"MDEwOlJlcG9zaXRvcnkzMzc3MTg0NDc=","name":"Boilerplate_Nextjs","full_name":"Alberto-S-P/Boilerplate_Nextjs","private":false,"owner":{"login":"Alberto-S-P","id":77673768,"node_id":"MDQ6VXNlcjc3NjczNzY4","avatar_url":"https://avatars.githubusercontent.com/u/77673768?v=4","gravatar_id":"","url":"https://api.github.com/users/Alberto-S-P","html_url":"https://github.com/Alberto-S-P","followers_url":"https://api.github.com/users/Alberto-S-P/followers","following_url":"https://api.github.com/users/Alberto-S-P/following{/other_user}","gists_url":"https://api.github.com/users/Alberto-S-P/gists{/gist_id}","starred_url":"https://api.github.com/users/Alberto-S-P/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Alberto-S-P/subscriptions","organizations_url":"https://api.github.com/users/Alberto-S-P/orgs","repos_url":"https://api.github.com/users/Alberto-S-P/repos","events_url":"https://api.github.com/users/Alberto-S-P/events{/privacy}","received_events_url":"https://api.github.com/users/Alberto-S-P/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs","description":null,"fork":false,"url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs","forks_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/forks","keys_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/teams","hooks_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/hooks","issue_events_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/events{/number}","events_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/events","assignees_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/assignees{/user}","branches_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/branches{/branch}","tags_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/tags","blobs_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/refs{/sha}","trees_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/statuses/{sha}","languages_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/languages","stargazers_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/stargazers","contributors_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/contributors","subscribers_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/subscribers","subscription_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/subscription","commits_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/commits{/sha}","git_commits_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/git/commits{/sha}","comments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/comments{/number}","issue_comment_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/comments{/number}","contents_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/contents/{+path}","compare_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/merges","archive_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/downloads","issues_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues{/number}","pulls_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls{/number}","milestones_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/milestones{/number}","notifications_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/labels{/name}","releases_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/releases{/id}","deployments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/deployments","created_at":"2021-02-10T12:33:10Z","updated_at":"2021-04-09T01:45:06Z","pushed_at":"2021-07-21T08:00:04Z","git_url":"git://github.com/Alberto-S-P/Boilerplate_Nextjs.git","ssh_url":"git@github.com:Alberto-S-P/Boilerplate_Nextjs.git","clone_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs.git","svn_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs","homepage":null,"size":1471,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":12,"license":null,"forks":0,"open_issues":12,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/86"},"html":{"href":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/86"},"issue":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/86"},"comments":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/86/comments"},"review_comments":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/86/comments"},"review_comment":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/86/commits"},"statuses":{"href":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/statuses/8243f97eaaa9a4844f460c21c144c571638db940"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":5,"deletions":5,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515521","type":"CreateEvent","actor":{"id":79855143,"login":"meva-ranarison","display_login":"meva-ranarison","gravatar_id":"","url":"https://api.github.com/users/meva-ranarison","avatar_url":"https://avatars.githubusercontent.com/u/79855143?"},"repo":{"id":381090157,"name":"meva-ranarison/karuta-frontend","url":"https://api.github.com/repos/meva-ranarison/karuta-frontend"},"payload":{"ref":"amu","ref_type":"branch","master_branch":"3.0","description":"End user interface for Karuta","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515522","type":"CreateEvent","actor":{"id":60234658,"login":"guillaumew16","display_login":"guillaumew16","gravatar_id":"","url":"https://api.github.com/users/guillaumew16","avatar_url":"https://avatars.githubusercontent.com/u/60234658?"},"repo":{"id":388040578,"name":"guillaumew16/PI_INF442_distrJoin","url":"https://api.github.com/repos/guillaumew16/PI_INF442_distrJoin"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515523","type":"PushEvent","actor":{"id":541490,"login":"morrah","display_login":"morrah","gravatar_id":"","url":"https://api.github.com/users/morrah","avatar_url":"https://avatars.githubusercontent.com/u/541490?"},"repo":{"id":224001345,"name":"morrah/oro-market","url":"https://api.github.com/repos/morrah/oro-market"},"payload":{"push_id":7562055380,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"023c52f39be33694610a845a505eed5d2b568727","before":"8e4a3a256ead7ae2b4fee55f9d567358a7c139a3","commits":[{"sha":"023c52f39be33694610a845a505eed5d2b568727","author":{"name":"morrah","email":"5b2d4826958c41aa3d7920ac238926453de1302d@users.noreply.github.com"},"message":"data update","distinct":true,"url":"https://api.github.com/repos/morrah/oro-market/commits/023c52f39be33694610a845a505eed5d2b568727"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515525","type":"PushEvent","actor":{"id":6749661,"login":"test987987","display_login":"test987987","gravatar_id":"","url":"https://api.github.com/users/test987987","avatar_url":"https://avatars.githubusercontent.com/u/6749661?"},"repo":{"id":375970514,"name":"test987987/test-europe-central2","url":"https://api.github.com/repos/test987987/test-europe-central2"},"payload":{"push_id":7562055424,"size":1,"distinct_size":1,"ref":"refs/heads/csr-mirror","head":"258c12cf5ff0eec7e4c2fa447e0ed0eaa4bd64d9","before":"51f4033e63828d58ff0fbc912384a52ab3aa153b","commits":[{"sha":"258c12cf5ff0eec7e4c2fa447e0ed0eaa4bd64d9","author":{"name":"gerritcodereview-eu-prober@csr-europe-central2-prober.iam.gserviceaccount.com","email":"ddffdf4d0caafd830ea5425d6445998518f10cf0@csr-europe-central2-prober.iam.gserviceaccount.com"},"message":"adding timestamp file","distinct":true,"url":"https://api.github.com/repos/test987987/test-europe-central2/commits/258c12cf5ff0eec7e4c2fa447e0ed0eaa4bd64d9"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515527","type":"PushEvent","actor":{"id":86300656,"login":"nidhi-meraki","display_login":"nidhi-meraki","gravatar_id":"","url":"https://api.github.com/users/nidhi-meraki","avatar_url":"https://avatars.githubusercontent.com/u/86300656?"},"repo":{"id":106544223,"name":"navgurukul/newton","url":"https://api.github.com/repos/navgurukul/newton"},"payload":{"push_id":7562055422,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"80445712ef33a6294a7c80669c1eb2e087cd4cd4","before":"3d95c84379ac50ac4317bc9a62892a9e522c16e7","commits":[{"sha":"80445712ef33a6294a7c80669c1eb2e087cd4cd4","author":{"name":"nidhi-meraki","email":"873a93799817a673ac461f1d2903c664e42aaa95@users.noreply.github.com"},"message":"Create Volunteer-tracker.md","distinct":true,"url":"https://api.github.com/repos/navgurukul/newton/commits/80445712ef33a6294a7c80669c1eb2e087cd4cd4"}]},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":25605372,"login":"navgurukul","gravatar_id":"","url":"https://api.github.com/orgs/navgurukul","avatar_url":"https://avatars.githubusercontent.com/u/25605372?"}}
+{"id":"17245515530","type":"PushEvent","actor":{"id":1902623,"login":"trutx","display_login":"trutx","gravatar_id":"","url":"https://api.github.com/users/trutx","avatar_url":"https://avatars.githubusercontent.com/u/1902623?"},"repo":{"id":173382036,"name":"newrelic-forks/cluster-api-provider-aws","url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws"},"payload":{"push_id":7562055429,"size":10,"distinct_size":10,"ref":"refs/heads/master","head":"33c9ef97f852bf9b0866977911184e4e0f651ba5","before":"01f433dab26ab51c469060eff129e7bd9cdd9c61","commits":[{"sha":"51164fb320e65058b6cc74371c0fb622167c5577","author":{"name":"Yuvaraj Kakaraparthi","email":"ceddd27fc4dfbbe99eb2ec753a56aeee5fb631e5@vmware.com"},"message":"add AWSClusterTemplate type","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/51164fb320e65058b6cc74371c0fb622167c5577"},{"sha":"1956af1cb5fbfaf8469c5c215181e6acf5551f69","author":{"name":"shivi28","email":"2af264758635ce604a5fad615778f3665635f3fd@vmware.com"},"message":"Enabled GPU optimised AMIs for EKS\nRemoved unused field like ARN and Filters from AMIReference","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/1956af1cb5fbfaf8469c5c215181e6acf5551f69"},{"sha":"1ceb80e48a24ca2923039f2e29492507bd439c28","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump golang from 1.16.5 to 1.16.6\n\nBumps golang from 1.16.5 to 1.16.6.\n\n---\nupdated-dependencies:\n- dependency-name: golang\n  dependency-type: direct:production\n  update-type: version-update:semver-patch\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/1ceb80e48a24ca2923039f2e29492507bd439c28"},{"sha":"daf59aba4f8918696c9d9913e9440c147ded14b3","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump k8s.io/apimachinery from 0.21.2 to 0.21.3 in /hack/tools\n\nBumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.21.2 to 0.21.3.\n- [Release notes](https://github.com/kubernetes/apimachinery/releases)\n- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.21.2...v0.21.3)\n\n---\nupdated-dependencies:\n- dependency-name: k8s.io/apimachinery\n  dependency-type: direct:production\n  update-type: version-update:semver-patch\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/daf59aba4f8918696c9d9913e9440c147ded14b3"},{"sha":"9d2cc047d14567ec4a59f253100236227f996228","author":{"name":"Kubernetes Prow Robot","email":"5c2029016e1607554af814ace319699a11cecd88@users.noreply.github.com"},"message":"Merge pull request #2591 from kubernetes-sigs/dependabot/docker/golang-1.16.6\n\nBump golang from 1.16.5 to 1.16.6","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/9d2cc047d14567ec4a59f253100236227f996228"},{"sha":"d8ac4dab380a8eacb7bc51cac6fa9bdf088380d5","author":{"name":"Kubernetes Prow Robot","email":"5c2029016e1607554af814ace319699a11cecd88@users.noreply.github.com"},"message":"Merge pull request #2592 from kubernetes-sigs/dependabot/go_modules/hack/tools/k8s.io/apimachinery-0.21.3\n\nBump k8s.io/apimachinery from 0.21.2 to 0.21.3 in /hack/tools","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/d8ac4dab380a8eacb7bc51cac6fa9bdf088380d5"},{"sha":"68592bb4f5013f3689a09c8cffec0158ee1889d5","author":{"name":"dependabot[bot]","email":"1c358da00a777d4e9898c1280ab801e2df165188@users.noreply.github.com"},"message":"Bump k8s.io/code-generator from 0.21.2 to 0.21.3 in /hack/tools\n\nBumps [k8s.io/code-generator](https://github.com/kubernetes/code-generator) from 0.21.2 to 0.21.3.\n- [Release notes](https://github.com/kubernetes/code-generator/releases)\n- [Commits](https://github.com/kubernetes/code-generator/compare/v0.21.2...v0.21.3)\n\n---\nupdated-dependencies:\n- dependency-name: k8s.io/code-generator\n  dependency-type: direct:production\n  update-type: version-update:semver-patch\n...\n\nSigned-off-by: dependabot[bot] <support@github.com>","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/68592bb4f5013f3689a09c8cffec0158ee1889d5"},{"sha":"8c0d921e8596861a5a774098b2eb0e9b79dbfe0d","author":{"name":"Kubernetes Prow Robot","email":"5c2029016e1607554af814ace319699a11cecd88@users.noreply.github.com"},"message":"Merge pull request #2593 from kubernetes-sigs/dependabot/go_modules/hack/tools/k8s.io/code-generator-0.21.3\n\nBump k8s.io/code-generator from 0.21.2 to 0.21.3 in /hack/tools","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/8c0d921e8596861a5a774098b2eb0e9b79dbfe0d"},{"sha":"11e824649230b31f68e0442e5e520ada0ac7e4e0","author":{"name":"Kubernetes Prow Robot","email":"5c2029016e1607554af814ace319699a11cecd88@users.noreply.github.com"},"message":"Merge pull request #2549 from shivi28/aws_2275\n\nEnabled GPU optimised AMIs for EKS","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/11e824649230b31f68e0442e5e520ada0ac7e4e0"},{"sha":"33c9ef97f852bf9b0866977911184e4e0f651ba5","author":{"name":"Kubernetes Prow Robot","email":"5c2029016e1607554af814ace319699a11cecd88@users.noreply.github.com"},"message":"Merge pull request #2585 from ykakarap/awsclustertemplate\n\nadd AWSClusterTemplate type","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/cluster-api-provider-aws/commits/33c9ef97f852bf9b0866977911184e4e0f651ba5"}]},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":8526625,"login":"newrelic-forks","gravatar_id":"","url":"https://api.github.com/orgs/newrelic-forks","avatar_url":"https://avatars.githubusercontent.com/u/8526625?"}}
+{"id":"17245515533","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249503742,"name":"miwebst/ssRunnerReact","url":"https://api.github.com/repos/miwebst/ssRunnerReact"},"payload":{"push_id":7562055432,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"35b982ad24848bf21d15258b541034f632d87dac","before":"ed8bb708fb26166431d4f210770ec0b9e75f2f68","commits":[{"sha":"35b982ad24848bf21d15258b541034f632d87dac","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 8:00:03 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerReact/commits/35b982ad24848bf21d15258b541034f632d87dac"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515542","type":"CreateEvent","actor":{"id":84962076,"login":"NavneetO","display_login":"NavneetO","gravatar_id":"","url":"https://api.github.com/users/NavneetO","avatar_url":"https://avatars.githubusercontent.com/u/84962076?"},"repo":{"id":388040328,"name":"NavneetO/SLide","url":"https://api.github.com/repos/NavneetO/SLide"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515543","type":"WatchEvent","actor":{"id":23494020,"login":"NEWADS","display_login":"NEWADS","gravatar_id":"","url":"https://api.github.com/users/NEWADS","avatar_url":"https://avatars.githubusercontent.com/u/23494020?"},"repo":{"id":372813788,"name":"BiOmicsLab/AVPIden","url":"https://api.github.com/repos/BiOmicsLab/AVPIden"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":82027496,"login":"BiOmicsLab","gravatar_id":"","url":"https://api.github.com/orgs/BiOmicsLab","avatar_url":"https://avatars.githubusercontent.com/u/82027496?"}}
+{"id":"17245515550","type":"PushEvent","actor":{"id":84560927,"login":"neevhikeqa","display_login":"neevhikeqa","gravatar_id":"","url":"https://api.github.com/users/neevhikeqa","avatar_url":"https://avatars.githubusercontent.com/u/84560927?"},"repo":{"id":370386589,"name":"neevhikeqa/wordpress","url":"https://api.github.com/repos/neevhikeqa/wordpress"},"payload":{"push_id":7562055435,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"f4d14cfb007b64d80f6dfc5be61da1f737b20cb4","before":"71fde2aef9a88e2b6fa9d21fabd8b46b75db69c9","commits":[{"sha":"f4d14cfb007b64d80f6dfc5be61da1f737b20cb4","author":{"name":"neevhikeqa","email":"18cc8c9397aba9d661630654d760473e8d6d67a4@users.noreply.github.com"},"message":"Update appz.yml","distinct":true,"url":"https://api.github.com/repos/neevhikeqa/wordpress/commits/f4d14cfb007b64d80f6dfc5be61da1f737b20cb4"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515551","type":"IssueCommentEvent","actor":{"id":7548711,"login":"cardigliano","display_login":"cardigliano","gravatar_id":"","url":"https://api.github.com/users/cardigliano","avatar_url":"https://avatars.githubusercontent.com/u/7548711?"},"repo":{"id":69042496,"name":"ntop/n2disk","url":"https://api.github.com/repos/ntop/n2disk"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/ntop/n2disk/issues/41","repository_url":"https://api.github.com/repos/ntop/n2disk","labels_url":"https://api.github.com/repos/ntop/n2disk/issues/41/labels{/name}","comments_url":"https://api.github.com/repos/ntop/n2disk/issues/41/comments","events_url":"https://api.github.com/repos/ntop/n2disk/issues/41/events","html_url":"https://github.com/ntop/n2disk/issues/41","id":949381680,"node_id":"MDU6SXNzdWU5NDkzODE2ODA=","number":41,"title":"(code=killed, signal=KILL)","user":{"login":"MaoPann","id":44804599,"node_id":"MDQ6VXNlcjQ0ODA0NTk5","avatar_url":"https://avatars.githubusercontent.com/u/44804599?v=4","gravatar_id":"","url":"https://api.github.com/users/MaoPann","html_url":"https://github.com/MaoPann","followers_url":"https://api.github.com/users/MaoPann/followers","following_url":"https://api.github.com/users/MaoPann/following{/other_user}","gists_url":"https://api.github.com/users/MaoPann/gists{/gist_id}","starred_url":"https://api.github.com/users/MaoPann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MaoPann/subscriptions","organizations_url":"https://api.github.com/users/MaoPann/orgs","repos_url":"https://api.github.com/users/MaoPann/repos","events_url":"https://api.github.com/users/MaoPann/events{/privacy}","received_events_url":"https://api.github.com/users/MaoPann/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-07-21T06:43:10Z","updated_at":"2021-07-21T08:00:04Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"Now I want to use n2disk to export the stream to ntopng for monitoring, but starting n2disk fails and reports the following error：\r\nn2disk@test.service - n2disk ultra-high-speed traffic recorder with realtime indexing on test\r\n   Loaded: loaded (/etc/systemd/system/n2disk@.service; disabled; vendor preset: enabled)\r\n   Active: activating (auto-restart) (Result: signal) since Wed 2021-07-21 14:35:36 +08; 1s ago\r\n  Process: 3234 ExecStopPost=/bin/sh -c /bin/echo \"$(/bin/date) n2disk test StopPost\" >> /var/log/ntop-systemd.log (code=exited, status=0/SUCCESS)\r\n  Process: 3233 ExecStopPost=/bin/rm -rf /run/n2disk-test.conf (code=exited, status=0/SUCCESS)\r\n  Process: 3232 ExecStopPost=/bin/rm -rf /run/n2disk-test.env (code=exited, status=0/SUCCESS)\r\n  Process: 3215 ExecStartPost=/bin/sh -c /bin/echo \"$(/bin/date) n2disk test StartPost\" >> /var/log/ntop-systemd.log (code=exited, status=0/SUCCESS)\r\n  Process: 3214 ExecStart=/usr/bin/stdbuf -oL /usr/bin/${N2DISK_BINARY} /run/n2disk-test.conf (code=killed, signal=KILL)\r\n  Process: 3212 ExecStartPre=/bin/sh -c /bin/sed \"/-P.*$\\|--daemon.*\\|--pid.*/s/^/#/\" /etc/n2disk/n2disk-test.conf > /run/n2disk-test.conf (code=exited, st\r\n  Process: 3178 ExecStartPre=/bin/sh -c /usr/bin/n2disk --check-license | /bin/grep \"Ok\\|Time-Limited\" && /bin/echo \"N2DISK_BINARY=n2disk\" > /run/n2disk-te\r\n  Process: 3120 ExecStartPre=/bin/sh -c /usr/bin/n2disk5g --check-license | /bin/grep \"Ok\\|Time-Limited\" && /bin/echo \"N2DISK_BINARY=n2disk5g\" > /run/n2dis\r\n  Process: 3111 ExecStartPre=/bin/sh -c /usr/bin/n2disk1g --check-license | /bin/grep \"Ok\\|Time-Limited\" && /bin/echo \"N2DISK_BINARY=n2disk1g\" > /run/n2dis\r\n  Process: 3109 ExecStartPre=/bin/sh -c /bin/echo \"N2DISK_BINARY=n2disk\" > /run/n2disk-test.env (code=exited, status=0/SUCCESS)\r\n  Process: 3106 ExecStartPre=/bin/sh -c /bin/echo \"$(/bin/date) n2disk test StartPre\" >> /var/log/ntop-systemd.log (code=exited, status=0/SUCCESS)\r\n Main PID: 3214 (code=killed, signal=KILL)\r\n\r\nn2disk.conf \r\n\r\n# \r\n--interface=ens33\r\n--dump-directory=/storage/n2disk/pcap\r\n--timeline-dir=/storage/n2disk/timeline\r\n--disk-limit=512\r\n#\r\n--max-file-len=1000\r\n--buffer-len=4000\r\n--max-file-duration=60\r\n--index\r\n--snaplen=1536\r\n#\r\n--writer-cpu-affinity=0\r\n--reader-cpu-affinity=1\r\n--compressor-cpu-affinity=2,3\r\n--index-on-compressor-threads\r\n#\r\n-u=ntopng\r\n--zmq=tcp://127.0.0.1:5556\r\n--zmq-probe-mode\r\n--zmq-export-flows\r\n\r\nntopng.conf\r\n\r\n-i tcp://127.0.0.2:5556\r\n-w=3001\r\n-F=nindex\r\n-m=\"192.168.0.0/24,192.168.1.0/24\"\r\n-G=/var/run/ntopng.pid\r\n\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/ntop/n2disk/issues/comments/883977132","html_url":"https://github.com/ntop/n2disk/issues/41#issuecomment-883977132","issue_url":"https://api.github.com/repos/ntop/n2disk/issues/41","id":883977132,"node_id":"IC_kwDOBB2BQM40sGus","user":{"login":"cardigliano","id":7548711,"node_id":"MDQ6VXNlcjc1NDg3MTE=","avatar_url":"https://avatars.githubusercontent.com/u/7548711?v=4","gravatar_id":"","url":"https://api.github.com/users/cardigliano","html_url":"https://github.com/cardigliano","followers_url":"https://api.github.com/users/cardigliano/followers","following_url":"https://api.github.com/users/cardigliano/following{/other_user}","gists_url":"https://api.github.com/users/cardigliano/gists{/gist_id}","starred_url":"https://api.github.com/users/cardigliano/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cardigliano/subscriptions","organizations_url":"https://api.github.com/users/cardigliano/orgs","repos_url":"https://api.github.com/users/cardigliano/repos","events_url":"https://api.github.com/users/cardigliano/events{/privacy}","received_events_url":"https://api.github.com/users/cardigliano/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T08:00:04Z","author_association":"MEMBER","body":"Are you running out of memory perhaps? Could you provide cat /proc/meminfo ?","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":12014789,"login":"ntop","gravatar_id":"","url":"https://api.github.com/orgs/ntop","avatar_url":"https://avatars.githubusercontent.com/u/12014789?"}}
+{"id":"17245515552","type":"PushEvent","actor":{"id":69245708,"login":"yugam2001","display_login":"yugam2001","gravatar_id":"","url":"https://api.github.com/users/yugam2001","avatar_url":"https://avatars.githubusercontent.com/u/69245708?"},"repo":{"id":388040037,"name":"yugam2001/assignment-1","url":"https://api.github.com/repos/yugam2001/assignment-1"},"payload":{"push_id":7562055439,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"b434205915fa1d80a3c1e21fbcc109c0384a8f21","before":"a4f707b299b8ff4cdf955782a54ebc5a64205387","commits":[{"sha":"b434205915fa1d80a3c1e21fbcc109c0384a8f21","author":{"name":"yugam2001","email":"9b5d239560540b602ce8eff3aee8eb2502d7273b@users.noreply.github.com"},"message":"assignment-1(HTML)","distinct":true,"url":"https://api.github.com/repos/yugam2001/assignment-1/commits/b434205915fa1d80a3c1e21fbcc109c0384a8f21"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515554","type":"PushEvent","actor":{"id":77524128,"login":"vsanga04","display_login":"vsanga04","gravatar_id":"","url":"https://api.github.com/users/vsanga04","avatar_url":"https://avatars.githubusercontent.com/u/77524128?"},"repo":{"id":385436680,"name":"vsanga04/Project2-OaklandCrimeData","url":"https://api.github.com/repos/vsanga04/Project2-OaklandCrimeData"},"payload":{"push_id":7562055440,"size":2,"distinct_size":2,"ref":"refs/heads/main","head":"0fcb4c00e593b0e9807bd1551d4dfa7018acb8fa","before":"4f01d75a0839d95e214c2a374cc1c1be36580cad","commits":[{"sha":"8a191f35fe60fe341d57e43b068990e11d86f892","author":{"name":"vsanga","email":"21d39ef4c70caeedd736cc56b65f44a8811ab52e@gmail.com"},"message":"geojson","distinct":true,"url":"https://api.github.com/repos/vsanga04/Project2-OaklandCrimeData/commits/8a191f35fe60fe341d57e43b068990e11d86f892"},{"sha":"0fcb4c00e593b0e9807bd1551d4dfa7018acb8fa","author":{"name":"vsanga","email":"21d39ef4c70caeedd736cc56b65f44a8811ab52e@gmail.com"},"message":"Merge branch 'main' of github.com:vsanga04/Project2-OaklandCrimeData","distinct":true,"url":"https://api.github.com/repos/vsanga04/Project2-OaklandCrimeData/commits/0fcb4c00e593b0e9807bd1551d4dfa7018acb8fa"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515558","type":"ForkEvent","actor":{"id":69636355,"login":"Cyrix66","display_login":"Cyrix66","gravatar_id":"","url":"https://api.github.com/users/Cyrix66","avatar_url":"https://avatars.githubusercontent.com/u/69636355?"},"repo":{"id":86289901,"name":"baidu/uid-generator","url":"https://api.github.com/repos/baidu/uid-generator"},"payload":{"forkee":{"id":388040579,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1Nzk=","name":"uid-generator","full_name":"Cyrix66/uid-generator","private":false,"owner":{"login":"Cyrix66","id":69636355,"node_id":"MDQ6VXNlcjY5NjM2MzU1","avatar_url":"https://avatars.githubusercontent.com/u/69636355?v=4","gravatar_id":"","url":"https://api.github.com/users/Cyrix66","html_url":"https://github.com/Cyrix66","followers_url":"https://api.github.com/users/Cyrix66/followers","following_url":"https://api.github.com/users/Cyrix66/following{/other_user}","gists_url":"https://api.github.com/users/Cyrix66/gists{/gist_id}","starred_url":"https://api.github.com/users/Cyrix66/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Cyrix66/subscriptions","organizations_url":"https://api.github.com/users/Cyrix66/orgs","repos_url":"https://api.github.com/users/Cyrix66/repos","events_url":"https://api.github.com/users/Cyrix66/events{/privacy}","received_events_url":"https://api.github.com/users/Cyrix66/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Cyrix66/uid-generator","description":"UniqueID generator","fork":true,"url":"https://api.github.com/repos/Cyrix66/uid-generator","forks_url":"https://api.github.com/repos/Cyrix66/uid-generator/forks","keys_url":"https://api.github.com/repos/Cyrix66/uid-generator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Cyrix66/uid-generator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Cyrix66/uid-generator/teams","hooks_url":"https://api.github.com/repos/Cyrix66/uid-generator/hooks","issue_events_url":"https://api.github.com/repos/Cyrix66/uid-generator/issues/events{/number}","events_url":"https://api.github.com/repos/Cyrix66/uid-generator/events","assignees_url":"https://api.github.com/repos/Cyrix66/uid-generator/assignees{/user}","branches_url":"https://api.github.com/repos/Cyrix66/uid-generator/branches{/branch}","tags_url":"https://api.github.com/repos/Cyrix66/uid-generator/tags","blobs_url":"https://api.github.com/repos/Cyrix66/uid-generator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Cyrix66/uid-generator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Cyrix66/uid-generator/git/refs{/sha}","trees_url":"https://api.github.com/repos/Cyrix66/uid-generator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Cyrix66/uid-generator/statuses/{sha}","languages_url":"https://api.github.com/repos/Cyrix66/uid-generator/languages","stargazers_url":"https://api.github.com/repos/Cyrix66/uid-generator/stargazers","contributors_url":"https://api.github.com/repos/Cyrix66/uid-generator/contributors","subscribers_url":"https://api.github.com/repos/Cyrix66/uid-generator/subscribers","subscription_url":"https://api.github.com/repos/Cyrix66/uid-generator/subscription","commits_url":"https://api.github.com/repos/Cyrix66/uid-generator/commits{/sha}","git_commits_url":"https://api.github.com/repos/Cyrix66/uid-generator/git/commits{/sha}","comments_url":"https://api.github.com/repos/Cyrix66/uid-generator/comments{/number}","issue_comment_url":"https://api.github.com/repos/Cyrix66/uid-generator/issues/comments{/number}","contents_url":"https://api.github.com/repos/Cyrix66/uid-generator/contents/{+path}","compare_url":"https://api.github.com/repos/Cyrix66/uid-generator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Cyrix66/uid-generator/merges","archive_url":"https://api.github.com/repos/Cyrix66/uid-generator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Cyrix66/uid-generator/downloads","issues_url":"https://api.github.com/repos/Cyrix66/uid-generator/issues{/number}","pulls_url":"https://api.github.com/repos/Cyrix66/uid-generator/pulls{/number}","milestones_url":"https://api.github.com/repos/Cyrix66/uid-generator/milestones{/number}","notifications_url":"https://api.github.com/repos/Cyrix66/uid-generator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Cyrix66/uid-generator/labels{/name}","releases_url":"https://api.github.com/repos/Cyrix66/uid-generator/releases{/id}","deployments_url":"https://api.github.com/repos/Cyrix66/uid-generator/deployments","created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T01:51:29Z","pushed_at":"2021-06-07T17:25:16Z","git_url":"git://github.com/Cyrix66/uid-generator.git","ssh_url":"git@github.com:Cyrix66/uid-generator.git","clone_url":"https://github.com/Cyrix66/uid-generator.git","svn_url":"https://github.com/Cyrix66/uid-generator","homepage":"","size":369,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":13245940,"login":"baidu","gravatar_id":"","url":"https://api.github.com/orgs/baidu","avatar_url":"https://avatars.githubusercontent.com/u/13245940?"}}
+{"id":"17245515571","type":"MemberEvent","actor":{"id":86040839,"login":"Solstron","display_login":"Solstron","gravatar_id":"","url":"https://api.github.com/users/Solstron","avatar_url":"https://avatars.githubusercontent.com/u/86040839?"},"repo":{"id":378172154,"name":"Solstron/Second-West-Russian-War---Mod-Files","url":"https://api.github.com/repos/Solstron/Second-West-Russian-War---Mod-Files"},"payload":{"member":{"login":"Majchin","id":87670984,"node_id":"MDQ6VXNlcjg3NjcwOTg0","avatar_url":"https://avatars.githubusercontent.com/u/87670984?v=4","gravatar_id":"","url":"https://api.github.com/users/Majchin","html_url":"https://github.com/Majchin","followers_url":"https://api.github.com/users/Majchin/followers","following_url":"https://api.github.com/users/Majchin/following{/other_user}","gists_url":"https://api.github.com/users/Majchin/gists{/gist_id}","starred_url":"https://api.github.com/users/Majchin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Majchin/subscriptions","organizations_url":"https://api.github.com/users/Majchin/orgs","repos_url":"https://api.github.com/users/Majchin/repos","events_url":"https://api.github.com/users/Majchin/events{/privacy}","received_events_url":"https://api.github.com/users/Majchin/received_events","type":"User","site_admin":false},"action":"added"},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515573","type":"PushEvent","actor":{"id":75016136,"login":"CastformMadrid","display_login":"CastformMadrid","gravatar_id":"","url":"https://api.github.com/users/CastformMadrid","avatar_url":"https://avatars.githubusercontent.com/u/75016136?"},"repo":{"id":315383656,"name":"alexelgt/Castform-Madrid","url":"https://api.github.com/repos/alexelgt/Castform-Madrid"},"payload":{"push_id":7562055452,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"0a69f3e9a2644084e923725e8bed1eff1e10c7bd","before":"c18ce1429a65e78d4052a2f525048fc3d71c1012","commits":[{"sha":"0a69f3e9a2644084e923725e8bed1eff1e10c7bd","author":{"name":"CastformMadrid","email":"4bf3034b7f6dbaf30fedab8adaf278c90d929f80@gmail.com"},"message":"21/7/2021 10:00","distinct":true,"url":"https://api.github.com/repos/alexelgt/Castform-Madrid/commits/0a69f3e9a2644084e923725e8bed1eff1e10c7bd"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515574","type":"PushEvent","actor":{"id":79092341,"login":"Bhanuprasad45","display_login":"Bhanuprasad45","gravatar_id":"","url":"https://api.github.com/users/Bhanuprasad45","avatar_url":"https://avatars.githubusercontent.com/u/79092341?"},"repo":{"id":388039033,"name":"Bhanuprasad45/Counterfeit_Medicine_Sales","url":"https://api.github.com/repos/Bhanuprasad45/Counterfeit_Medicine_Sales"},"payload":{"push_id":7562055454,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"59e79c9f1855c081b6e43ade86a005edf1d39d13","before":"9ce00f09e30cb9aed9244ce59a30300de126ead9","commits":[{"sha":"59e79c9f1855c081b6e43ade86a005edf1d39d13","author":{"name":"Bhanuprasad45","email":"fe2b0d9ad05ef5c114ea306f138ef2330ac47615@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/Bhanuprasad45/Counterfeit_Medicine_Sales/commits/59e79c9f1855c081b6e43ade86a005edf1d39d13"}]},"public":true,"created_at":"2021-07-21T08:00:04Z"}
+{"id":"17245515586","type":"PushEvent","actor":{"id":49736102,"login":"kodiakhq[bot]","display_login":"kodiakhq","gravatar_id":"","url":"https://api.github.com/users/kodiakhq[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49736102?"},"repo":{"id":352747621,"name":"esm-bundle/markdown-it-emoji","url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji"},"payload":{"push_id":7562055451,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"179af100fa383064b40c6358632f2531cbc8f4b7","before":"68fdce2a9921331aaf8d208e93064aba36b20144","commits":[{"sha":"179af100fa383064b40c6358632f2531cbc8f4b7","author":{"name":"renovate[bot]","email":"1d2c67ad0e3429d16690809152e1083ff6af8a05@users.noreply.github.com"},"message":"Update dependency rollup to v2.53.3 (#62)\n\nCo-authored-by: Renovate Bot <bot@renovateapp.com>","distinct":true,"url":"https://api.github.com/repos/esm-bundle/markdown-it-emoji/commits/179af100fa383064b40c6358632f2531cbc8f4b7"}]},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":60286277,"login":"esm-bundle","gravatar_id":"","url":"https://api.github.com/orgs/esm-bundle","avatar_url":"https://avatars.githubusercontent.com/u/60286277?"}}
+{"id":"17245515651","type":"PullRequestReviewCommentEvent","actor":{"id":6770950,"login":"rebkwok","display_login":"rebkwok","gravatar_id":"","url":"https://api.github.com/users/rebkwok","avatar_url":"https://avatars.githubusercontent.com/u/6770950?"},"repo":{"id":379919397,"name":"opensafely-core/cohort-extractor-v2","url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/comments/673748220","pull_request_review_id":711364936,"id":673748220,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3Mzc0ODIyMA==","diff_hunk":"@@ -44,6 +51,14 @@ def __or__(self, other):\n     def __len__(self):\n         return len(self.children)\n \n+    def __invert__(self):\n+        self.negate()\n+        return self\n+\n+    def negate(self):\n+        \"\"\"Negate the sense of the root comparator.\"\"\"\n+        self.negated = not self.negated\n+","path":"cohortextractor/query_language.py","position":null,"original_position":34,"commit_id":"db8811b0c38db5f90a9358cc74e3f7393fe0ce3f","original_commit_id":"0379b2b97e05ce7e868b56ccc701a721a12e42f2","user":{"login":"rebkwok","id":6770950,"node_id":"MDQ6VXNlcjY3NzA5NTA=","avatar_url":"https://avatars.githubusercontent.com/u/6770950?v=4","gravatar_id":"","url":"https://api.github.com/users/rebkwok","html_url":"https://github.com/rebkwok","followers_url":"https://api.github.com/users/rebkwok/followers","following_url":"https://api.github.com/users/rebkwok/following{/other_user}","gists_url":"https://api.github.com/users/rebkwok/gists{/gist_id}","starred_url":"https://api.github.com/users/rebkwok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rebkwok/subscriptions","organizations_url":"https://api.github.com/users/rebkwok/orgs","repos_url":"https://api.github.com/users/rebkwok/repos","events_url":"https://api.github.com/users/rebkwok/events{/privacy}","received_events_url":"https://api.github.com/users/rebkwok/received_events","type":"User","site_admin":false},"body":"Actually, I think we could have an `__invert__` method on a Value too. In fact, we should, so we can do `~foo` and don't have to do `~c(foo)`. ","created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T08:00:04Z","html_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76#discussion_r673748220","pull_request_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76","author_association":"COLLABORATOR","_links":{"self":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/comments/673748220"},"html":{"href":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76#discussion_r673748220"},"pull_request":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76"}},"start_line":null,"original_start_line":54,"start_side":"RIGHT","line":null,"original_line":65,"side":"RIGHT","in_reply_to_id":672925923},"pull_request":{"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76","id":692523207,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyNTIzMjA3","html_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76","diff_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76.diff","patch_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76.patch","issue_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76","number":76,"state":"open","locked":false,"title":"Categorising by truthiness (non-nullness) of a value","user":{"login":"rebkwok","id":6770950,"node_id":"MDQ6VXNlcjY3NzA5NTA=","avatar_url":"https://avatars.githubusercontent.com/u/6770950?v=4","gravatar_id":"","url":"https://api.github.com/users/rebkwok","html_url":"https://github.com/rebkwok","followers_url":"https://api.github.com/users/rebkwok/followers","following_url":"https://api.github.com/users/rebkwok/following{/other_user}","gists_url":"https://api.github.com/users/rebkwok/gists{/gist_id}","starred_url":"https://api.github.com/users/rebkwok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rebkwok/subscriptions","organizations_url":"https://api.github.com/users/rebkwok/orgs","repos_url":"https://api.github.com/users/rebkwok/repos","events_url":"https://api.github.com/users/rebkwok/events{/privacy}","received_events_url":"https://api.github.com/users/rebkwok/received_events","type":"User","site_admin":false},"body":"Allows categorisation on whether a Value (of any sort) is truthy, by using a `c` function that returns a comparator for != None.  Since every patient will have a row in any value table created from a filter or aggregation, we can use the None values to check for existence.","created_at":"2021-07-19T11:29:40Z","updated_at":"2021-07-21T08:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"af958dfb92c525be886993e5219c5b12374ea86a","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/commits","review_comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/comments","review_comment_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76/comments","statuses_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/db8811b0c38db5f90a9358cc74e3f7393fe0ce3f","head":{"label":"opensafely-core:categorise_existence","ref":"categorise_existence","sha":"db8811b0c38db5f90a9358cc74e3f7393fe0ce3f","user":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"repo":{"id":379919397,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk5MTkzOTc=","name":"cohort-extractor-v2","full_name":"opensafely-core/cohort-extractor-v2","private":false,"owner":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/opensafely-core/cohort-extractor-v2","description":null,"fork":false,"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2","forks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/forks","keys_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/teams","hooks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/hooks","issue_events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/events{/number}","events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/events","assignees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/assignees{/user}","branches_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/branches{/branch}","tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/tags","blobs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/refs{/sha}","trees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/{sha}","languages_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/languages","stargazers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/stargazers","contributors_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contributors","subscribers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscribers","subscription_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscription","commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/commits{/sha}","git_commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/commits{/sha}","comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/comments{/number}","issue_comment_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/comments{/number}","contents_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contents/{+path}","compare_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/merges","archive_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/downloads","issues_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues{/number}","pulls_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls{/number}","milestones_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/milestones{/number}","notifications_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/labels{/name}","releases_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/releases{/id}","deployments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/deployments","created_at":"2021-06-24T12:36:00Z","updated_at":"2021-07-20T09:16:30Z","pushed_at":"2021-07-20T17:10:34Z","git_url":"git://github.com/opensafely-core/cohort-extractor-v2.git","ssh_url":"git@github.com:opensafely-core/cohort-extractor-v2.git","clone_url":"https://github.com/opensafely-core/cohort-extractor-v2.git","svn_url":"https://github.com/opensafely-core/cohort-extractor-v2","homepage":null,"size":488,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":19,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":19,"watchers":0,"default_branch":"main"}},"base":{"label":"opensafely-core:main","ref":"main","sha":"b72f356cbe1883b99426e46be9a67926269dc62a","user":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"repo":{"id":379919397,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk5MTkzOTc=","name":"cohort-extractor-v2","full_name":"opensafely-core/cohort-extractor-v2","private":false,"owner":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/opensafely-core/cohort-extractor-v2","description":null,"fork":false,"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2","forks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/forks","keys_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/teams","hooks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/hooks","issue_events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/events{/number}","events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/events","assignees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/assignees{/user}","branches_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/branches{/branch}","tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/tags","blobs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/refs{/sha}","trees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/{sha}","languages_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/languages","stargazers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/stargazers","contributors_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contributors","subscribers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscribers","subscription_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscription","commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/commits{/sha}","git_commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/commits{/sha}","comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/comments{/number}","issue_comment_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/comments{/number}","contents_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contents/{+path}","compare_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/merges","archive_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/downloads","issues_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues{/number}","pulls_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls{/number}","milestones_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/milestones{/number}","notifications_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/labels{/name}","releases_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/releases{/id}","deployments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/deployments","created_at":"2021-06-24T12:36:00Z","updated_at":"2021-07-20T09:16:30Z","pushed_at":"2021-07-20T17:10:34Z","git_url":"git://github.com/opensafely-core/cohort-extractor-v2.git","ssh_url":"git@github.com:opensafely-core/cohort-extractor-v2.git","clone_url":"https://github.com/opensafely-core/cohort-extractor-v2.git","svn_url":"https://github.com/opensafely-core/cohort-extractor-v2","homepage":null,"size":488,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":19,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":19,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76"},"html":{"href":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76"},"issue":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76"},"comments":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76/comments"},"review_comments":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/comments"},"review_comment":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/commits"},"statuses":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/db8811b0c38db5f90a9358cc74e3f7393fe0ce3f"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:04Z","org":{"id":77844139,"login":"opensafely-core","gravatar_id":"","url":"https://api.github.com/orgs/opensafely-core","avatar_url":"https://avatars.githubusercontent.com/u/77844139?"}}
+{"id":"17245515606","type":"PushEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388040568,"name":"thatjohn01/753021085","url":"https://api.github.com/repos/thatjohn01/753021085"},"payload":{"push_id":7562055464,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f736cdfa2587c4ea6ba2accdbba51b6c72767b79","before":"68f32c06defbf15c9ad528133292d1646ff4478a","commits":[{"sha":"f736cdfa2587c4ea6ba2accdbba51b6c72767b79","author":{"name":"thatjohn01","email":"72eb81e66410b3da65da4cca287ce0578825ce64@users.noreply.github.com"},"message":"change README.md","distinct":true,"url":"https://api.github.com/repos/thatjohn01/753021085/commits/f736cdfa2587c4ea6ba2accdbba51b6c72767b79"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515609","type":"PushEvent","actor":{"id":40587912,"login":"supermobiteam2","display_login":"supermobiteam2","gravatar_id":"","url":"https://api.github.com/users/supermobiteam2","avatar_url":"https://avatars.githubusercontent.com/u/40587912?"},"repo":{"id":138681984,"name":"supermobiteam2/Tizi","url":"https://api.github.com/repos/supermobiteam2/Tizi"},"payload":{"push_id":7562055468,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2618c8af037d293811fb372212fbd7fbbe187ca9","before":"8174bd0c89c1bb7d5ce452843d1eda0a05c858e8","commits":[{"sha":"2618c8af037d293811fb372212fbd7fbbe187ca9","author":{"name":"supermobiteam2","email":"f34688687956b708ea5937840a164da02e7b6797@users.noreply.github.com"},"message":"tizi ios","distinct":true,"url":"https://api.github.com/repos/supermobiteam2/Tizi/commits/2618c8af037d293811fb372212fbd7fbbe187ca9"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515610","type":"PushEvent","actor":{"id":37944667,"login":"xymox1987","display_login":"xymox1987","gravatar_id":"","url":"https://api.github.com/users/xymox1987","avatar_url":"https://avatars.githubusercontent.com/u/37944667?"},"repo":{"id":388034681,"name":"xymox1987/AgroCampo","url":"https://api.github.com/repos/xymox1987/AgroCampo"},"payload":{"push_id":7562055469,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"4b4b48feb7113d42f9db0dbd0088c9d2a28ab560","before":"fceb4b92a7a9c1f9af9d44ba7157a4b3f7ce4a14","commits":[{"sha":"4b4b48feb7113d42f9db0dbd0088c9d2a28ab560","author":{"name":"xymox1987","email":"1b511e670af0641721791560a65bcffb53e3d7e1@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/xymox1987/AgroCampo/commits/4b4b48feb7113d42f9db0dbd0088c9d2a28ab560"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515612","type":"IssueCommentEvent","actor":{"id":48406637,"login":"shy-tan","display_login":"shy-tan","gravatar_id":"","url":"https://api.github.com/users/shy-tan","avatar_url":"https://avatars.githubusercontent.com/u/48406637?"},"repo":{"id":35810174,"name":"electron-react-boilerplate/electron-react-boilerplate","url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate/issues/2395","repository_url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate","labels_url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate/issues/2395/labels{/name}","comments_url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate/issues/2395/comments","events_url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate/issues/2395/events","html_url":"https://github.com/electron-react-boilerplate/electron-react-boilerplate/issues/2395","id":573609402,"node_id":"MDU6SXNzdWU1NzM2MDk0MDI=","number":2395,"title":"How to properly set up material-ui with electron-react-boilerplate","user":{"login":"Vasniktel","id":23561899,"node_id":"MDQ6VXNlcjIzNTYxODk5","avatar_url":"https://avatars.githubusercontent.com/u/23561899?v=4","gravatar_id":"","url":"https://api.github.com/users/Vasniktel","html_url":"https://github.com/Vasniktel","followers_url":"https://api.github.com/users/Vasniktel/followers","following_url":"https://api.github.com/users/Vasniktel/following{/other_user}","gists_url":"https://api.github.com/users/Vasniktel/gists{/gist_id}","starred_url":"https://api.github.com/users/Vasniktel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vasniktel/subscriptions","organizations_url":"https://api.github.com/users/Vasniktel/orgs","repos_url":"https://api.github.com/users/Vasniktel/repos","events_url":"https://api.github.com/users/Vasniktel/events{/privacy}","received_events_url":"https://api.github.com/users/Vasniktel/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":31,"created_at":"2020-03-01T20:27:07Z","updated_at":"2021-07-21T08:00:04Z","closed_at":"2020-07-24T18:08:54Z","author_association":"NONE","active_lock_reason":null,"body":"See this question: https://stackoverflow.com/questions/60473495/how-to-properly-set-up-material-ui-with-electron-react-boilerplate\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate/issues/comments/883977137","html_url":"https://github.com/electron-react-boilerplate/electron-react-boilerplate/issues/2395#issuecomment-883977137","issue_url":"https://api.github.com/repos/electron-react-boilerplate/electron-react-boilerplate/issues/2395","id":883977137,"node_id":"IC_kwDOAiJrfs40sGux","user":{"login":"shy-tan","id":48406637,"node_id":"MDQ6VXNlcjQ4NDA2NjM3","avatar_url":"https://avatars.githubusercontent.com/u/48406637?v=4","gravatar_id":"","url":"https://api.github.com/users/shy-tan","html_url":"https://github.com/shy-tan","followers_url":"https://api.github.com/users/shy-tan/followers","following_url":"https://api.github.com/users/shy-tan/following{/other_user}","gists_url":"https://api.github.com/users/shy-tan/gists{/gist_id}","starred_url":"https://api.github.com/users/shy-tan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shy-tan/subscriptions","organizations_url":"https://api.github.com/users/shy-tan/orgs","repos_url":"https://api.github.com/users/shy-tan/repos","events_url":"https://api.github.com/users/shy-tan/events{/privacy}","received_events_url":"https://api.github.com/users/shy-tan/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T08:00:04Z","author_association":"NONE","body":"Deleting the cache worked for me.\r\nhttps://stackoverflow.com/a/65780651/10934636","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":28049053,"login":"electron-react-boilerplate","gravatar_id":"","url":"https://api.github.com/orgs/electron-react-boilerplate","avatar_url":"https://avatars.githubusercontent.com/u/28049053?"}}
+{"id":"17245515623","type":"IssueCommentEvent","actor":{"id":5003891,"login":"trasherdk","display_login":"trasherdk","gravatar_id":"","url":"https://api.github.com/users/trasherdk","avatar_url":"https://avatars.githubusercontent.com/u/5003891?"},"repo":{"id":217603326,"name":"hagopj13/node-express-boilerplate","url":"https://api.github.com/repos/hagopj13/node-express-boilerplate"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/hagopj13/node-express-boilerplate/issues/136","repository_url":"https://api.github.com/repos/hagopj13/node-express-boilerplate","labels_url":"https://api.github.com/repos/hagopj13/node-express-boilerplate/issues/136/labels{/name}","comments_url":"https://api.github.com/repos/hagopj13/node-express-boilerplate/issues/136/comments","events_url":"https://api.github.com/repos/hagopj13/node-express-boilerplate/issues/136/events","html_url":"https://github.com/hagopj13/node-express-boilerplate/issues/136","id":948991976,"node_id":"MDU6SXNzdWU5NDg5OTE5NzY=","number":136,"title":"PR - TypeScript Conversion","user":{"login":"dominick-more","id":62982489,"node_id":"MDQ6VXNlcjYyOTgyNDg5","avatar_url":"https://avatars.githubusercontent.com/u/62982489?v=4","gravatar_id":"","url":"https://api.github.com/users/dominick-more","html_url":"https://github.com/dominick-more","followers_url":"https://api.github.com/users/dominick-more/followers","following_url":"https://api.github.com/users/dominick-more/following{/other_user}","gists_url":"https://api.github.com/users/dominick-more/gists{/gist_id}","starred_url":"https://api.github.com/users/dominick-more/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dominick-more/subscriptions","organizations_url":"https://api.github.com/users/dominick-more/orgs","repos_url":"https://api.github.com/users/dominick-more/repos","events_url":"https://api.github.com/users/dominick-more/events{/privacy}","received_events_url":"https://api.github.com/users/dominick-more/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-20T19:23:06Z","updated_at":"2021-07-21T08:00:05Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"I set for myself the goal to make a \"mini\" app project, in order to showcase my skills and thought about what the basic functionality of backend server required, so that I can execute async calls from my client code, and add records in a db, so I saw the work that you did and think it's really quite well thought through, but I also want to demonstrate my typescript abilities.\r\nI wanted to use your work for a basis and did a complete typescript overhaul of all src and tests js files. All existing package.json scripts are running as before with noted changes (I will point these out in a pr).\r\n\r\nScope of changes:\r\n\r\nCode:\r\nAll function parameters and return types defined (where practical)\r\nBest effort to keep the original function signtatures unchanged.\r\n\r\nBuild-Configuration:\r\nDue to inclusion of TypeScript, have modified executable dev dependencies 'ts-node' for 'dev' script, babel-jest for 'test' script and 'babel-ci' for the 'server' script transpilation to 'dist' out directory.\r\n\r\nEslint:\r\nHave replaced extends \"airbnb-base\" with \"airbnb-typescript\" (and other typescript contraints).\r\n\r\nDocker:\r\nReordered DockerFile 'USER node' to first execution position and creating the checkout working directory /home/user/nope-app.\r\n\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/hagopj13/node-express-boilerplate/issues/comments/883977139","html_url":"https://github.com/hagopj13/node-express-boilerplate/issues/136#issuecomment-883977139","issue_url":"https://api.github.com/repos/hagopj13/node-express-boilerplate/issues/136","id":883977139,"node_id":"IC_kwDODPhc_s40sGuz","user":{"login":"trasherdk","id":5003891,"node_id":"MDQ6VXNlcjUwMDM4OTE=","avatar_url":"https://avatars.githubusercontent.com/u/5003891?v=4","gravatar_id":"","url":"https://api.github.com/users/trasherdk","html_url":"https://github.com/trasherdk","followers_url":"https://api.github.com/users/trasherdk/followers","following_url":"https://api.github.com/users/trasherdk/following{/other_user}","gists_url":"https://api.github.com/users/trasherdk/gists{/gist_id}","starred_url":"https://api.github.com/users/trasherdk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/trasherdk/subscriptions","organizations_url":"https://api.github.com/users/trasherdk/orgs","repos_url":"https://api.github.com/users/trasherdk/repos","events_url":"https://api.github.com/users/trasherdk/events{/privacy}","received_events_url":"https://api.github.com/users/trasherdk/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T08:00:04Z","author_association":"NONE","body":"Sounds interesting.\r\nCan you put it up in a repository? I would like to take a look.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515636","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7562055455,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"0b9c99f1728d7f200085293478e6e8549b40a455","before":"406a8945fddc6662b6816d96e7e9d21a8f088687","commits":[{"sha":"0b9c99f1728d7f200085293478e6e8549b40a455","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/0b9c99f1728d7f200085293478e6e8549b40a455"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515641","type":"PushEvent","actor":{"id":3469524,"login":"ahmetoz","display_login":"ahmetoz","gravatar_id":"","url":"https://api.github.com/users/ahmetoz","avatar_url":"https://avatars.githubusercontent.com/u/3469524?"},"repo":{"id":84962876,"name":"commercetools/commercetools-sync-java","url":"https://api.github.com/repos/commercetools/commercetools-sync-java"},"payload":{"push_id":7562055474,"size":3,"distinct_size":3,"ref":"refs/heads/update-readme","head":"818bf4d19712e0b4980113d5a2a02155e2a8192e","before":"b6022c2d068988f2feafdf97070466196a5a9067","commits":[{"sha":"04b09c819d158285c8037fc6fd8571f79ec4c045","author":{"name":"aoz","email":"13357b2be637093e650389a6f89d89c8296a9202@gmail.com"},"message":"remove roadmap.","distinct":true,"url":"https://api.github.com/repos/commercetools/commercetools-sync-java/commits/04b09c819d158285c8037fc6fd8571f79ec4c045"},{"sha":"75fd8d383130f161df0efe12d81183c4ae82c34a","author":{"name":"aoz","email":"13357b2be637093e650389a6f89d89c8296a9202@gmail.com"},"message":"edit main sentence.","distinct":true,"url":"https://api.github.com/repos/commercetools/commercetools-sync-java/commits/75fd8d383130f161df0efe12d81183c4ae82c34a"},{"sha":"818bf4d19712e0b4980113d5a2a02155e2a8192e","author":{"name":"aoz","email":"13357b2be637093e650389a6f89d89c8296a9202@gmail.com"},"message":"Update usage section.","distinct":true,"url":"https://api.github.com/repos/commercetools/commercetools-sync-java/commits/818bf4d19712e0b4980113d5a2a02155e2a8192e"}]},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":1084585,"login":"commercetools","gravatar_id":"","url":"https://api.github.com/orgs/commercetools","avatar_url":"https://avatars.githubusercontent.com/u/1084585?"}}
+{"id":"17245515647","type":"IssueCommentEvent","actor":{"id":15917439,"login":"xhcao","display_login":"xhcao","gravatar_id":"","url":"https://api.github.com/users/xhcao","avatar_url":"https://avatars.githubusercontent.com/u/15917439?"},"repo":{"id":123870315,"name":"tensorflow/tfjs","url":"https://api.github.com/repos/tensorflow/tfjs"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/tensorflow/tfjs/issues/5342","repository_url":"https://api.github.com/repos/tensorflow/tfjs","labels_url":"https://api.github.com/repos/tensorflow/tfjs/issues/5342/labels{/name}","comments_url":"https://api.github.com/repos/tensorflow/tfjs/issues/5342/comments","events_url":"https://api.github.com/repos/tensorflow/tfjs/issues/5342/events","html_url":"https://github.com/tensorflow/tfjs/pull/5342","id":947199230,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMjE1MTAz","number":5342,"title":"webgpu: optimize matmul with small output size","user":{"login":"xhcao","id":15917439,"node_id":"MDQ6VXNlcjE1OTE3NDM5","avatar_url":"https://avatars.githubusercontent.com/u/15917439?v=4","gravatar_id":"","url":"https://api.github.com/users/xhcao","html_url":"https://github.com/xhcao","followers_url":"https://api.github.com/users/xhcao/followers","following_url":"https://api.github.com/users/xhcao/following{/other_user}","gists_url":"https://api.github.com/users/xhcao/gists{/gist_id}","starred_url":"https://api.github.com/users/xhcao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xhcao/subscriptions","organizations_url":"https://api.github.com/users/xhcao/orgs","repos_url":"https://api.github.com/users/xhcao/repos","events_url":"https://api.github.com/users/xhcao/events{/privacy}","received_events_url":"https://api.github.com/users/xhcao/received_events","type":"User","site_admin":false},"labels":[{"id":1290978557,"node_id":"MDU6TGFiZWwxMjkwOTc4NTU3","url":"https://api.github.com/repos/tensorflow/tfjs/labels/cla:%20yes","name":"cla: yes","color":"ededed","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-07-19T02:22:48Z","updated_at":"2021-07-21T08:00:05Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/tensorflow/tfjs/pulls/5342","html_url":"https://github.com/tensorflow/tfjs/pull/5342","diff_url":"https://github.com/tensorflow/tfjs/pull/5342.diff","patch_url":"https://github.com/tensorflow/tfjs/pull/5342.patch"},"body":"Current matmul algorithm dispatches logical threads based on\r\noutput size, if output size is small and inner dimension size\r\nis large, there are few threads and every thread should handle\r\nlarge loads, so the performance is poor.\r\nThis patch dispatches logical threads based on output size and\r\ninner dimension size, increases the logical threads, makes load\r\nbalancing.\r\nThis patches also introduces two shared memory buffers, some\r\nlogical threads could handle arithmetic operations and others\r\nhandle IO operations between barrier api, makes ALUs and load/store\r\nunits work simultaneously, could improves the performance.\r\n\r\nTo see the logs from the Cloud Build CI, please join either our [discussion](https://groups.google.com/a/tensorflow.org/forum/#!forum/tfjs) or [announcement](https://groups.google.com/a/tensorflow.org/forum/#!forum/tfjs-announce) mailing list.\n\n<!-- Reviewable:start -->\n---\nThis change is [<img src=\"https://reviewable.io/review_button.svg\" height=\"34\" align=\"absmiddle\" alt=\"Reviewable\"/>](https://reviewable.io/reviews/tensorflow/tfjs/5342)\n<!-- Reviewable:end -->\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/tensorflow/tfjs/issues/comments/883977138","html_url":"https://github.com/tensorflow/tfjs/pull/5342#issuecomment-883977138","issue_url":"https://api.github.com/repos/tensorflow/tfjs/issues/5342","id":883977138,"node_id":"IC_kwDOB2Ica840sGuy","user":{"login":"xhcao","id":15917439,"node_id":"MDQ6VXNlcjE1OTE3NDM5","avatar_url":"https://avatars.githubusercontent.com/u/15917439?v=4","gravatar_id":"","url":"https://api.github.com/users/xhcao","html_url":"https://github.com/xhcao","followers_url":"https://api.github.com/users/xhcao/followers","following_url":"https://api.github.com/users/xhcao/following{/other_user}","gists_url":"https://api.github.com/users/xhcao/gists{/gist_id}","starred_url":"https://api.github.com/users/xhcao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xhcao/subscriptions","organizations_url":"https://api.github.com/users/xhcao/orgs","repos_url":"https://api.github.com/users/xhcao/repos","events_url":"https://api.github.com/users/xhcao/events{/privacy}","received_events_url":"https://api.github.com/users/xhcao/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T08:00:04Z","author_association":"CONTRIBUTOR","body":"@qjia7 @haoyunfeix @axinging @gyagp, please take a look, thank you.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":15658638,"login":"tensorflow","gravatar_id":"","url":"https://api.github.com/orgs/tensorflow","avatar_url":"https://avatars.githubusercontent.com/u/15658638?"}}
+{"id":"17245515653","type":"PullRequestEvent","actor":{"id":63818299,"login":"jgsheppa","display_login":"jgsheppa","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","avatar_url":"https://avatars.githubusercontent.com/u/63818299?"},"repo":{"id":299556960,"name":"jgsheppa/dictionary-app","url":"https://api.github.com/repos/jgsheppa/dictionary-app"},"payload":{"action":"closed","number":3,"pull_request":{"url":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/3","id":693963488,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzOTYzNDg4","html_url":"https://github.com/jgsheppa/dictionary-app/pull/3","diff_url":"https://github.com/jgsheppa/dictionary-app/pull/3.diff","patch_url":"https://github.com/jgsheppa/dictionary-app/pull/3.patch","issue_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/3","number":3,"state":"closed","locked":false,"title":"[Snyk] Upgrade @types/node from 14.14.7 to 14.17.4","user":{"login":"snyk-bot","id":19733683,"node_id":"MDQ6VXNlcjE5NzMzNjgz","avatar_url":"https://avatars.githubusercontent.com/u/19733683?v=4","gravatar_id":"","url":"https://api.github.com/users/snyk-bot","html_url":"https://github.com/snyk-bot","followers_url":"https://api.github.com/users/snyk-bot/followers","following_url":"https://api.github.com/users/snyk-bot/following{/other_user}","gists_url":"https://api.github.com/users/snyk-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/snyk-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snyk-bot/subscriptions","organizations_url":"https://api.github.com/users/snyk-bot/orgs","repos_url":"https://api.github.com/users/snyk-bot/repos","events_url":"https://api.github.com/users/snyk-bot/events{/privacy}","received_events_url":"https://api.github.com/users/snyk-bot/received_events","type":"User","site_admin":false},"body":"<h3>Snyk has created this PR to upgrade @types/node from 14.14.7 to 14.17.4.</h3>\n\n:information_source: Keep your dependencies up-to-date. This makes it easier to fix existing vulnerabilities and to more quickly identify and fix newly disclosed vulnerabilities when they affect your project.\n<hr/>\n\n- The recommended version is **43 versions** ahead of your current version.\n- The recommended version was released **a month ago**, on 2021-06-23.\n\n\n<hr/>\n\n**Note:** *You are seeing this because you or someone else with access to this repository has authorized Snyk to open upgrade PRs.*\n\nFor more information:  <img src=\"https://api.segment.io/v1/pixel/track?data=eyJ3cml0ZUtleSI6InJyWmxZcEdHY2RyTHZsb0lYd0dUcVg4WkFRTnNCOUEwIiwiYW5vbnltb3VzSWQiOiJhNTI3ZGRmMC00Y2E2LTRmYTgtYTRmZC0yMjE2NDJmOWQxNzQiLCJldmVudCI6IlBSIHZpZXdlZCIsInByb3BlcnRpZXMiOnsicHJJZCI6ImE1MjdkZGYwLTRjYTYtNGZhOC1hNGZkLTIyMTY0MmY5ZDE3NCJ9fQ==\" width=\"0\" height=\"0\"/><img src=\"https://app.snyk.io/badges/merge-advice/?package_manager=yarn&package_name=@types/node&from_version=14.14.7&to_version=14.17.4&pr_id=a527ddf0-4ca6-4fa8-a4fd-221642f9d174&visibility=false&has_feature_flag=false\" width=\"0\" height=\"0\"/>\n\n🧐 [View latest project report](https://app.snyk.io/org/jgsheppa/project/890b4ae1-03b6-448d-9daa-875c5f5add2a?utm_source&#x3D;github&amp;utm_medium&#x3D;upgrade-pr)\n\n🛠 [Adjust upgrade PR settings](https://app.snyk.io/org/jgsheppa/project/890b4ae1-03b6-448d-9daa-875c5f5add2a/settings/integration?utm_source&#x3D;github&amp;utm_medium&#x3D;upgrade-pr)\n\n🔕 [Ignore this dependency or unsubscribe from future upgrade PRs](https://app.snyk.io/org/jgsheppa/project/890b4ae1-03b6-448d-9daa-875c5f5add2a/settings/integration?pkg&#x3D;@types/node&amp;utm_source&#x3D;github&amp;utm_medium&#x3D;upgrade-pr#auto-dep-upgrades)\n\n<!--- (snyk:metadata:{\"prId\":\"a527ddf0-4ca6-4fa8-a4fd-221642f9d174\",\"prPublicId\":\"a527ddf0-4ca6-4fa8-a4fd-221642f9d174\",\"dependencies\":[{\"name\":\"@types/node\",\"from\":\"14.14.7\",\"to\":\"14.17.4\"}],\"packageManager\":\"yarn\",\"type\":\"auto\",\"projectUrl\":\"https://app.snyk.io/org/jgsheppa/project/890b4ae1-03b6-448d-9daa-875c5f5add2a?utm_source=github&utm_medium=upgrade-pr\",\"projectPublicId\":\"890b4ae1-03b6-448d-9daa-875c5f5add2a\",\"env\":\"prod\",\"prType\":\"upgrade\",\"vulns\":[],\"issuesToFix\":[],\"upgrade\":[],\"upgradeInfo\":{\"versionsDiff\":43,\"publishedDate\":\"2021-06-23T08:31:49.790Z\"},\"templateVariants\":[\"merge-advice-badge-shown\"],\"hasFixes\":false,\"isMajorUpgrade\":false,\"isBreakingChange\":false,\"priorityScoreList\":[]}) --->\n","created_at":"2021-07-21T00:55:53Z","updated_at":"2021-07-21T08:00:04Z","closed_at":"2021-07-21T08:00:04Z","merged_at":"2021-07-21T08:00:04Z","merge_commit_sha":"53234f0c8eecf2ab187a148d02feb857c21f9fb9","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/3/commits","review_comments_url":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/3/comments","review_comment_url":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/3/comments","statuses_url":"https://api.github.com/repos/jgsheppa/dictionary-app/statuses/fb82ec3f16b56286c28e2a263321341e44890dda","head":{"label":"jgsheppa:snyk-upgrade-4e77843a0a56b2a9fdd8525e47b1bbef","ref":"snyk-upgrade-4e77843a0a56b2a9fdd8525e47b1bbef","sha":"fb82ec3f16b56286c28e2a263321341e44890dda","user":{"login":"jgsheppa","id":63818299,"node_id":"MDQ6VXNlcjYzODE4Mjk5","avatar_url":"https://avatars.githubusercontent.com/u/63818299?v=4","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","html_url":"https://github.com/jgsheppa","followers_url":"https://api.github.com/users/jgsheppa/followers","following_url":"https://api.github.com/users/jgsheppa/following{/other_user}","gists_url":"https://api.github.com/users/jgsheppa/gists{/gist_id}","starred_url":"https://api.github.com/users/jgsheppa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jgsheppa/subscriptions","organizations_url":"https://api.github.com/users/jgsheppa/orgs","repos_url":"https://api.github.com/users/jgsheppa/repos","events_url":"https://api.github.com/users/jgsheppa/events{/privacy}","received_events_url":"https://api.github.com/users/jgsheppa/received_events","type":"User","site_admin":false},"repo":{"id":299556960,"node_id":"MDEwOlJlcG9zaXRvcnkyOTk1NTY5NjA=","name":"dictionary-app","full_name":"jgsheppa/dictionary-app","private":false,"owner":{"login":"jgsheppa","id":63818299,"node_id":"MDQ6VXNlcjYzODE4Mjk5","avatar_url":"https://avatars.githubusercontent.com/u/63818299?v=4","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","html_url":"https://github.com/jgsheppa","followers_url":"https://api.github.com/users/jgsheppa/followers","following_url":"https://api.github.com/users/jgsheppa/following{/other_user}","gists_url":"https://api.github.com/users/jgsheppa/gists{/gist_id}","starred_url":"https://api.github.com/users/jgsheppa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jgsheppa/subscriptions","organizations_url":"https://api.github.com/users/jgsheppa/orgs","repos_url":"https://api.github.com/users/jgsheppa/repos","events_url":"https://api.github.com/users/jgsheppa/events{/privacy}","received_events_url":"https://api.github.com/users/jgsheppa/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jgsheppa/dictionary-app","description":null,"fork":false,"url":"https://api.github.com/repos/jgsheppa/dictionary-app","forks_url":"https://api.github.com/repos/jgsheppa/dictionary-app/forks","keys_url":"https://api.github.com/repos/jgsheppa/dictionary-app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jgsheppa/dictionary-app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jgsheppa/dictionary-app/teams","hooks_url":"https://api.github.com/repos/jgsheppa/dictionary-app/hooks","issue_events_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/events{/number}","events_url":"https://api.github.com/repos/jgsheppa/dictionary-app/events","assignees_url":"https://api.github.com/repos/jgsheppa/dictionary-app/assignees{/user}","branches_url":"https://api.github.com/repos/jgsheppa/dictionary-app/branches{/branch}","tags_url":"https://api.github.com/repos/jgsheppa/dictionary-app/tags","blobs_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/refs{/sha}","trees_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jgsheppa/dictionary-app/statuses/{sha}","languages_url":"https://api.github.com/repos/jgsheppa/dictionary-app/languages","stargazers_url":"https://api.github.com/repos/jgsheppa/dictionary-app/stargazers","contributors_url":"https://api.github.com/repos/jgsheppa/dictionary-app/contributors","subscribers_url":"https://api.github.com/repos/jgsheppa/dictionary-app/subscribers","subscription_url":"https://api.github.com/repos/jgsheppa/dictionary-app/subscription","commits_url":"https://api.github.com/repos/jgsheppa/dictionary-app/commits{/sha}","git_commits_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/commits{/sha}","comments_url":"https://api.github.com/repos/jgsheppa/dictionary-app/comments{/number}","issue_comment_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/comments{/number}","contents_url":"https://api.github.com/repos/jgsheppa/dictionary-app/contents/{+path}","compare_url":"https://api.github.com/repos/jgsheppa/dictionary-app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jgsheppa/dictionary-app/merges","archive_url":"https://api.github.com/repos/jgsheppa/dictionary-app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jgsheppa/dictionary-app/downloads","issues_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues{/number}","pulls_url":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls{/number}","milestones_url":"https://api.github.com/repos/jgsheppa/dictionary-app/milestones{/number}","notifications_url":"https://api.github.com/repos/jgsheppa/dictionary-app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jgsheppa/dictionary-app/labels{/name}","releases_url":"https://api.github.com/repos/jgsheppa/dictionary-app/releases{/id}","deployments_url":"https://api.github.com/repos/jgsheppa/dictionary-app/deployments","created_at":"2020-09-29T08:43:49Z","updated_at":"2021-07-21T07:59:50Z","pushed_at":"2021-07-21T08:00:04Z","git_url":"git://github.com/jgsheppa/dictionary-app.git","ssh_url":"git@github.com:jgsheppa/dictionary-app.git","clone_url":"https://github.com/jgsheppa/dictionary-app.git","svn_url":"https://github.com/jgsheppa/dictionary-app","homepage":"https://word-divan.herokuapp.com/","size":5583,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"jgsheppa:master","ref":"master","sha":"6ea43a173456a2066c48366a163dbe11e7bcb649","user":{"login":"jgsheppa","id":63818299,"node_id":"MDQ6VXNlcjYzODE4Mjk5","avatar_url":"https://avatars.githubusercontent.com/u/63818299?v=4","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","html_url":"https://github.com/jgsheppa","followers_url":"https://api.github.com/users/jgsheppa/followers","following_url":"https://api.github.com/users/jgsheppa/following{/other_user}","gists_url":"https://api.github.com/users/jgsheppa/gists{/gist_id}","starred_url":"https://api.github.com/users/jgsheppa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jgsheppa/subscriptions","organizations_url":"https://api.github.com/users/jgsheppa/orgs","repos_url":"https://api.github.com/users/jgsheppa/repos","events_url":"https://api.github.com/users/jgsheppa/events{/privacy}","received_events_url":"https://api.github.com/users/jgsheppa/received_events","type":"User","site_admin":false},"repo":{"id":299556960,"node_id":"MDEwOlJlcG9zaXRvcnkyOTk1NTY5NjA=","name":"dictionary-app","full_name":"jgsheppa/dictionary-app","private":false,"owner":{"login":"jgsheppa","id":63818299,"node_id":"MDQ6VXNlcjYzODE4Mjk5","avatar_url":"https://avatars.githubusercontent.com/u/63818299?v=4","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","html_url":"https://github.com/jgsheppa","followers_url":"https://api.github.com/users/jgsheppa/followers","following_url":"https://api.github.com/users/jgsheppa/following{/other_user}","gists_url":"https://api.github.com/users/jgsheppa/gists{/gist_id}","starred_url":"https://api.github.com/users/jgsheppa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jgsheppa/subscriptions","organizations_url":"https://api.github.com/users/jgsheppa/orgs","repos_url":"https://api.github.com/users/jgsheppa/repos","events_url":"https://api.github.com/users/jgsheppa/events{/privacy}","received_events_url":"https://api.github.com/users/jgsheppa/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jgsheppa/dictionary-app","description":null,"fork":false,"url":"https://api.github.com/repos/jgsheppa/dictionary-app","forks_url":"https://api.github.com/repos/jgsheppa/dictionary-app/forks","keys_url":"https://api.github.com/repos/jgsheppa/dictionary-app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jgsheppa/dictionary-app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jgsheppa/dictionary-app/teams","hooks_url":"https://api.github.com/repos/jgsheppa/dictionary-app/hooks","issue_events_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/events{/number}","events_url":"https://api.github.com/repos/jgsheppa/dictionary-app/events","assignees_url":"https://api.github.com/repos/jgsheppa/dictionary-app/assignees{/user}","branches_url":"https://api.github.com/repos/jgsheppa/dictionary-app/branches{/branch}","tags_url":"https://api.github.com/repos/jgsheppa/dictionary-app/tags","blobs_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/refs{/sha}","trees_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jgsheppa/dictionary-app/statuses/{sha}","languages_url":"https://api.github.com/repos/jgsheppa/dictionary-app/languages","stargazers_url":"https://api.github.com/repos/jgsheppa/dictionary-app/stargazers","contributors_url":"https://api.github.com/repos/jgsheppa/dictionary-app/contributors","subscribers_url":"https://api.github.com/repos/jgsheppa/dictionary-app/subscribers","subscription_url":"https://api.github.com/repos/jgsheppa/dictionary-app/subscription","commits_url":"https://api.github.com/repos/jgsheppa/dictionary-app/commits{/sha}","git_commits_url":"https://api.github.com/repos/jgsheppa/dictionary-app/git/commits{/sha}","comments_url":"https://api.github.com/repos/jgsheppa/dictionary-app/comments{/number}","issue_comment_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/comments{/number}","contents_url":"https://api.github.com/repos/jgsheppa/dictionary-app/contents/{+path}","compare_url":"https://api.github.com/repos/jgsheppa/dictionary-app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jgsheppa/dictionary-app/merges","archive_url":"https://api.github.com/repos/jgsheppa/dictionary-app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jgsheppa/dictionary-app/downloads","issues_url":"https://api.github.com/repos/jgsheppa/dictionary-app/issues{/number}","pulls_url":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls{/number}","milestones_url":"https://api.github.com/repos/jgsheppa/dictionary-app/milestones{/number}","notifications_url":"https://api.github.com/repos/jgsheppa/dictionary-app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jgsheppa/dictionary-app/labels{/name}","releases_url":"https://api.github.com/repos/jgsheppa/dictionary-app/releases{/id}","deployments_url":"https://api.github.com/repos/jgsheppa/dictionary-app/deployments","created_at":"2020-09-29T08:43:49Z","updated_at":"2021-07-21T07:59:50Z","pushed_at":"2021-07-21T08:00:04Z","git_url":"git://github.com/jgsheppa/dictionary-app.git","ssh_url":"git@github.com:jgsheppa/dictionary-app.git","clone_url":"https://github.com/jgsheppa/dictionary-app.git","svn_url":"https://github.com/jgsheppa/dictionary-app","homepage":"https://word-divan.herokuapp.com/","size":5583,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/3"},"html":{"href":"https://github.com/jgsheppa/dictionary-app/pull/3"},"issue":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/3"},"comments":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/issues/3/comments"},"review_comments":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/3/comments"},"review_comment":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/pulls/3/commits"},"statuses":{"href":"https://api.github.com/repos/jgsheppa/dictionary-app/statuses/fb82ec3f16b56286c28e2a263321341e44890dda"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"jgsheppa","id":63818299,"node_id":"MDQ6VXNlcjYzODE4Mjk5","avatar_url":"https://avatars.githubusercontent.com/u/63818299?v=4","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","html_url":"https://github.com/jgsheppa","followers_url":"https://api.github.com/users/jgsheppa/followers","following_url":"https://api.github.com/users/jgsheppa/following{/other_user}","gists_url":"https://api.github.com/users/jgsheppa/gists{/gist_id}","starred_url":"https://api.github.com/users/jgsheppa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jgsheppa/subscriptions","organizations_url":"https://api.github.com/users/jgsheppa/orgs","repos_url":"https://api.github.com/users/jgsheppa/repos","events_url":"https://api.github.com/users/jgsheppa/events{/privacy}","received_events_url":"https://api.github.com/users/jgsheppa/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":6,"deletions":6,"changed_files":2}},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515654","type":"PullRequestReviewEvent","actor":{"id":6770950,"login":"rebkwok","display_login":"rebkwok","gravatar_id":"","url":"https://api.github.com/users/rebkwok","avatar_url":"https://avatars.githubusercontent.com/u/6770950?"},"repo":{"id":379919397,"name":"opensafely-core/cohort-extractor-v2","url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2"},"payload":{"action":"created","review":{"id":711364936,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzY0OTM2","user":{"login":"rebkwok","id":6770950,"node_id":"MDQ6VXNlcjY3NzA5NTA=","avatar_url":"https://avatars.githubusercontent.com/u/6770950?v=4","gravatar_id":"","url":"https://api.github.com/users/rebkwok","html_url":"https://github.com/rebkwok","followers_url":"https://api.github.com/users/rebkwok/followers","following_url":"https://api.github.com/users/rebkwok/following{/other_user}","gists_url":"https://api.github.com/users/rebkwok/gists{/gist_id}","starred_url":"https://api.github.com/users/rebkwok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rebkwok/subscriptions","organizations_url":"https://api.github.com/users/rebkwok/orgs","repos_url":"https://api.github.com/users/rebkwok/repos","events_url":"https://api.github.com/users/rebkwok/events{/privacy}","received_events_url":"https://api.github.com/users/rebkwok/received_events","type":"User","site_admin":false},"body":null,"commit_id":"db8811b0c38db5f90a9358cc74e3f7393fe0ce3f","submitted_at":"2021-07-21T08:00:04Z","state":"commented","html_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76#pullrequestreview-711364936","pull_request_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76","author_association":"COLLABORATOR","_links":{"html":{"href":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76#pullrequestreview-711364936"},"pull_request":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76"}}},"pull_request":{"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76","id":692523207,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyNTIzMjA3","html_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76","diff_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76.diff","patch_url":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76.patch","issue_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76","number":76,"state":"open","locked":false,"title":"Categorising by truthiness (non-nullness) of a value","user":{"login":"rebkwok","id":6770950,"node_id":"MDQ6VXNlcjY3NzA5NTA=","avatar_url":"https://avatars.githubusercontent.com/u/6770950?v=4","gravatar_id":"","url":"https://api.github.com/users/rebkwok","html_url":"https://github.com/rebkwok","followers_url":"https://api.github.com/users/rebkwok/followers","following_url":"https://api.github.com/users/rebkwok/following{/other_user}","gists_url":"https://api.github.com/users/rebkwok/gists{/gist_id}","starred_url":"https://api.github.com/users/rebkwok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rebkwok/subscriptions","organizations_url":"https://api.github.com/users/rebkwok/orgs","repos_url":"https://api.github.com/users/rebkwok/repos","events_url":"https://api.github.com/users/rebkwok/events{/privacy}","received_events_url":"https://api.github.com/users/rebkwok/received_events","type":"User","site_admin":false},"body":"Allows categorisation on whether a Value (of any sort) is truthy, by using a `c` function that returns a comparator for != None.  Since every patient will have a row in any value table created from a filter or aggregation, we can use the None values to check for existence.","created_at":"2021-07-19T11:29:40Z","updated_at":"2021-07-21T08:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"af958dfb92c525be886993e5219c5b12374ea86a","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/commits","review_comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/comments","review_comment_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76/comments","statuses_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/db8811b0c38db5f90a9358cc74e3f7393fe0ce3f","head":{"label":"opensafely-core:categorise_existence","ref":"categorise_existence","sha":"db8811b0c38db5f90a9358cc74e3f7393fe0ce3f","user":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"repo":{"id":379919397,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk5MTkzOTc=","name":"cohort-extractor-v2","full_name":"opensafely-core/cohort-extractor-v2","private":false,"owner":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/opensafely-core/cohort-extractor-v2","description":null,"fork":false,"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2","forks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/forks","keys_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/teams","hooks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/hooks","issue_events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/events{/number}","events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/events","assignees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/assignees{/user}","branches_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/branches{/branch}","tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/tags","blobs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/refs{/sha}","trees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/{sha}","languages_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/languages","stargazers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/stargazers","contributors_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contributors","subscribers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscribers","subscription_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscription","commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/commits{/sha}","git_commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/commits{/sha}","comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/comments{/number}","issue_comment_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/comments{/number}","contents_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contents/{+path}","compare_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/merges","archive_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/downloads","issues_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues{/number}","pulls_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls{/number}","milestones_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/milestones{/number}","notifications_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/labels{/name}","releases_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/releases{/id}","deployments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/deployments","created_at":"2021-06-24T12:36:00Z","updated_at":"2021-07-20T09:16:30Z","pushed_at":"2021-07-20T17:10:34Z","git_url":"git://github.com/opensafely-core/cohort-extractor-v2.git","ssh_url":"git@github.com:opensafely-core/cohort-extractor-v2.git","clone_url":"https://github.com/opensafely-core/cohort-extractor-v2.git","svn_url":"https://github.com/opensafely-core/cohort-extractor-v2","homepage":null,"size":488,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":19,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":19,"watchers":0,"default_branch":"main"}},"base":{"label":"opensafely-core:main","ref":"main","sha":"b72f356cbe1883b99426e46be9a67926269dc62a","user":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"repo":{"id":379919397,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk5MTkzOTc=","name":"cohort-extractor-v2","full_name":"opensafely-core/cohort-extractor-v2","private":false,"owner":{"login":"opensafely-core","id":77844139,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc3ODQ0MTM5","avatar_url":"https://avatars.githubusercontent.com/u/77844139?v=4","gravatar_id":"","url":"https://api.github.com/users/opensafely-core","html_url":"https://github.com/opensafely-core","followers_url":"https://api.github.com/users/opensafely-core/followers","following_url":"https://api.github.com/users/opensafely-core/following{/other_user}","gists_url":"https://api.github.com/users/opensafely-core/gists{/gist_id}","starred_url":"https://api.github.com/users/opensafely-core/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opensafely-core/subscriptions","organizations_url":"https://api.github.com/users/opensafely-core/orgs","repos_url":"https://api.github.com/users/opensafely-core/repos","events_url":"https://api.github.com/users/opensafely-core/events{/privacy}","received_events_url":"https://api.github.com/users/opensafely-core/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/opensafely-core/cohort-extractor-v2","description":null,"fork":false,"url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2","forks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/forks","keys_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/teams","hooks_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/hooks","issue_events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/events{/number}","events_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/events","assignees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/assignees{/user}","branches_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/branches{/branch}","tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/tags","blobs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/refs{/sha}","trees_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/{sha}","languages_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/languages","stargazers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/stargazers","contributors_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contributors","subscribers_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscribers","subscription_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/subscription","commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/commits{/sha}","git_commits_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/git/commits{/sha}","comments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/comments{/number}","issue_comment_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/comments{/number}","contents_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/contents/{+path}","compare_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/merges","archive_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/downloads","issues_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues{/number}","pulls_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls{/number}","milestones_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/milestones{/number}","notifications_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/labels{/name}","releases_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/releases{/id}","deployments_url":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/deployments","created_at":"2021-06-24T12:36:00Z","updated_at":"2021-07-20T09:16:30Z","pushed_at":"2021-07-20T17:10:34Z","git_url":"git://github.com/opensafely-core/cohort-extractor-v2.git","ssh_url":"git@github.com:opensafely-core/cohort-extractor-v2.git","clone_url":"https://github.com/opensafely-core/cohort-extractor-v2.git","svn_url":"https://github.com/opensafely-core/cohort-extractor-v2","homepage":null,"size":488,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":19,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":19,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76"},"html":{"href":"https://github.com/opensafely-core/cohort-extractor-v2/pull/76"},"issue":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76"},"comments":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/issues/76/comments"},"review_comments":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/comments"},"review_comment":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/pulls/76/commits"},"statuses":{"href":"https://api.github.com/repos/opensafely-core/cohort-extractor-v2/statuses/db8811b0c38db5f90a9358cc74e3f7393fe0ce3f"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":77844139,"login":"opensafely-core","gravatar_id":"","url":"https://api.github.com/orgs/opensafely-core","avatar_url":"https://avatars.githubusercontent.com/u/77844139?"}}
+{"id":"17245515665","type":"PushEvent","actor":{"id":3379460,"login":"beanslee2012","display_login":"beanslee2012","gravatar_id":"","url":"https://api.github.com/users/beanslee2012","avatar_url":"https://avatars.githubusercontent.com/u/3379460?"},"repo":{"id":215003385,"name":"beanslee2012/games","url":"https://api.github.com/repos/beanslee2012/games"},"payload":{"push_id":7562055527,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"382532ab0018e3a3b1e534b8c8fc55d33a9b2e79","before":"828a7e3fde4d5b3dd564e7064ea09361523439d2","commits":[{"sha":"382532ab0018e3a3b1e534b8c8fc55d33a9b2e79","author":{"name":"beanslee2012","email":"9aadcc12fe6ab8c01e6245204a102e9e34317220@gmail.com"},"message":"daily update","distinct":true,"url":"https://api.github.com/repos/beanslee2012/games/commits/382532ab0018e3a3b1e534b8c8fc55d33a9b2e79"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515672","type":"CreateEvent","actor":{"id":83330540,"login":"kamky","display_login":"kamky","gravatar_id":"","url":"https://api.github.com/users/kamky","avatar_url":"https://avatars.githubusercontent.com/u/83330540?"},"repo":{"id":378913953,"name":"kamky/react-app-six-cities","url":"https://api.github.com/repos/kamky/react-app-six-cities"},"payload":{"ref":"static-pages","ref_type":"branch","master_branch":"main","description":"React app \"6 Cities\"","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515680","type":"PushEvent","actor":{"id":82876799,"login":"hvaish01","display_login":"hvaish01","gravatar_id":"","url":"https://api.github.com/users/hvaish01","avatar_url":"https://avatars.githubusercontent.com/u/82876799?"},"repo":{"id":359772248,"name":"hvaish01/StixBundles","url":"https://api.github.com/repos/hvaish01/StixBundles"},"payload":{"push_id":7562055531,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"fac3f618997cee47d057c96a627ac4fa9fc09549","before":"73506f5776e1449063f1ff0220446408fb6865aa","commits":[{"sha":"fac3f618997cee47d057c96a627ac4fa9fc09549","author":{"name":"hvaish01","email":"2afd248fb67ac19cdeb0148e32ca7ee71c30c76d@users.noreply.github.com"},"message":"Updated at 01:00:04 21-07-2021","distinct":true,"url":"https://api.github.com/repos/hvaish01/StixBundles/commits/fac3f618997cee47d057c96a627ac4fa9fc09549"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515729","type":"WatchEvent","actor":{"id":87158991,"login":"heihei030","display_login":"heihei030","gravatar_id":"","url":"https://api.github.com/users/heihei030","avatar_url":"https://avatars.githubusercontent.com/u/87158991?"},"repo":{"id":21289110,"name":"vinta/awesome-python","url":"https://api.github.com/repos/vinta/awesome-python"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515735","type":"ForkEvent","actor":{"id":69457338,"login":"Tikhonov-Chen","display_login":"Tikhonov-Chen","gravatar_id":"","url":"https://api.github.com/users/Tikhonov-Chen","avatar_url":"https://avatars.githubusercontent.com/u/69457338?"},"repo":{"id":272731386,"name":"l0o0/jasminum","url":"https://api.github.com/repos/l0o0/jasminum"},"payload":{"forkee":{"id":388040581,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1ODE=","name":"jasminum","full_name":"Tikhonov-Chen/jasminum","private":false,"owner":{"login":"Tikhonov-Chen","id":69457338,"node_id":"MDQ6VXNlcjY5NDU3MzM4","avatar_url":"https://avatars.githubusercontent.com/u/69457338?v=4","gravatar_id":"","url":"https://api.github.com/users/Tikhonov-Chen","html_url":"https://github.com/Tikhonov-Chen","followers_url":"https://api.github.com/users/Tikhonov-Chen/followers","following_url":"https://api.github.com/users/Tikhonov-Chen/following{/other_user}","gists_url":"https://api.github.com/users/Tikhonov-Chen/gists{/gist_id}","starred_url":"https://api.github.com/users/Tikhonov-Chen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Tikhonov-Chen/subscriptions","organizations_url":"https://api.github.com/users/Tikhonov-Chen/orgs","repos_url":"https://api.github.com/users/Tikhonov-Chen/repos","events_url":"https://api.github.com/users/Tikhonov-Chen/events{/privacy}","received_events_url":"https://api.github.com/users/Tikhonov-Chen/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Tikhonov-Chen/jasminum","description":"A Zotero add-on to retrive CNKI meta data. 一个简单的Zotero 插件，用于识别中文元数据","fork":true,"url":"https://api.github.com/repos/Tikhonov-Chen/jasminum","forks_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/forks","keys_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/teams","hooks_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/hooks","issue_events_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/issues/events{/number}","events_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/events","assignees_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/assignees{/user}","branches_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/branches{/branch}","tags_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/tags","blobs_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/git/refs{/sha}","trees_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/statuses/{sha}","languages_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/languages","stargazers_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/stargazers","contributors_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/contributors","subscribers_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/subscribers","subscription_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/subscription","commits_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/commits{/sha}","git_commits_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/git/commits{/sha}","comments_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/comments{/number}","issue_comment_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/issues/comments{/number}","contents_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/contents/{+path}","compare_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/merges","archive_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/downloads","issues_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/issues{/number}","pulls_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/pulls{/number}","milestones_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/milestones{/number}","notifications_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/labels{/name}","releases_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/releases{/id}","deployments_url":"https://api.github.com/repos/Tikhonov-Chen/jasminum/deployments","created_at":"2021-07-21T08:00:04Z","updated_at":"2021-07-21T05:09:08Z","pushed_at":"2021-07-13T15:03:36Z","git_url":"git://github.com/Tikhonov-Chen/jasminum.git","ssh_url":"git@github.com:Tikhonov-Chen/jasminum.git","clone_url":"https://github.com/Tikhonov-Chen/jasminum.git","svn_url":"https://github.com/Tikhonov-Chen/jasminum","homepage":"","size":229,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515744","type":"IssuesEvent","actor":{"id":34935391,"login":"kondratyev-a","display_login":"kondratyev-a","gravatar_id":"","url":"https://api.github.com/users/kondratyev-a","avatar_url":"https://avatars.githubusercontent.com/u/34935391?"},"repo":{"id":378857135,"name":"kondratyev-a/pet-clinic","url":"https://api.github.com/repos/kondratyev-a/pet-clinic"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/kondratyev-a/pet-clinic/issues/56","repository_url":"https://api.github.com/repos/kondratyev-a/pet-clinic","labels_url":"https://api.github.com/repos/kondratyev-a/pet-clinic/issues/56/labels{/name}","comments_url":"https://api.github.com/repos/kondratyev-a/pet-clinic/issues/56/comments","events_url":"https://api.github.com/repos/kondratyev-a/pet-clinic/issues/56/events","html_url":"https://github.com/kondratyev-a/pet-clinic/issues/56","id":949435875,"node_id":"MDU6SXNzdWU5NDk0MzU4NzU=","number":56,"title":"Add ability to add or update a Pet","user":{"login":"kondratyev-a","id":34935391,"node_id":"MDQ6VXNlcjM0OTM1Mzkx","avatar_url":"https://avatars.githubusercontent.com/u/34935391?v=4","gravatar_id":"","url":"https://api.github.com/users/kondratyev-a","html_url":"https://github.com/kondratyev-a","followers_url":"https://api.github.com/users/kondratyev-a/followers","following_url":"https://api.github.com/users/kondratyev-a/following{/other_user}","gists_url":"https://api.github.com/users/kondratyev-a/gists{/gist_id}","starred_url":"https://api.github.com/users/kondratyev-a/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kondratyev-a/subscriptions","organizations_url":"https://api.github.com/users/kondratyev-a/orgs","repos_url":"https://api.github.com/users/kondratyev-a/repos","events_url":"https://api.github.com/users/kondratyev-a/events{/privacy}","received_events_url":"https://api.github.com/users/kondratyev-a/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T08:00:05Z","updated_at":"2021-07-21T08:00:05Z","closed_at":null,"author_association":"OWNER","active_lock_reason":null,"body":"","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515746","type":"DeleteEvent","actor":{"id":526307,"login":"endorama","display_login":"endorama","gravatar_id":"","url":"https://api.github.com/users/endorama","avatar_url":"https://avatars.githubusercontent.com/u/526307?"},"repo":{"id":16554739,"name":"elastic/beats","url":"https://api.github.com/repos/elastic/beats"},"payload":{"ref":"mergify/bp/7.x/pr-26870","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":6764390,"login":"elastic","gravatar_id":"","url":"https://api.github.com/orgs/elastic","avatar_url":"https://avatars.githubusercontent.com/u/6764390?"}}
+{"id":"17245515749","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7562055542,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"a9dfcf1ddd1ce9d3a35d090a2e4c00abf3d7d1d3","before":"0b9c99f1728d7f200085293478e6e8549b40a455","commits":[{"sha":"a9dfcf1ddd1ce9d3a35d090a2e4c00abf3d7d1d3","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/a9dfcf1ddd1ce9d3a35d090a2e4c00abf3d7d1d3"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515750","type":"PushEvent","actor":{"id":22955941,"login":"Volodichev","display_login":"Volodichev","gravatar_id":"","url":"https://api.github.com/users/Volodichev","avatar_url":"https://avatars.githubusercontent.com/u/22955941?"},"repo":{"id":374556291,"name":"Volodichev/proxy-list","url":"https://api.github.com/repos/Volodichev/proxy-list"},"payload":{"push_id":7562055535,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"33f74e7da997df14a562e393c486a58384492190","before":"181c3bc89352583c52404e8de5b283597ee29295","commits":[{"sha":"33f74e7da997df14a562e393c486a58384492190","author":{"name":"Alexander","email":"db02dbb7d5376400a8069895ae273c92e0d1f31d@gmail.com"},"message":"hmn keys 21.07.21 11:00:01","distinct":true,"url":"https://api.github.com/repos/Volodichev/proxy-list/commits/33f74e7da997df14a562e393c486a58384492190"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515751","type":"PushEvent","actor":{"id":39004010,"login":"Tsanfer","display_login":"Tsanfer","gravatar_id":"","url":"https://api.github.com/users/Tsanfer","avatar_url":"https://avatars.githubusercontent.com/u/39004010?"},"repo":{"id":360417924,"name":"Tsanfer/web_object_detection","url":"https://api.github.com/repos/Tsanfer/web_object_detection"},"payload":{"push_id":7562055544,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"e41afd31a9bcf482b4314c394a88722fb43fa00b","before":"590b90d21a8c9f2709744e43c7f8038f75bf163d","commits":[{"sha":"e41afd31a9bcf482b4314c394a88722fb43fa00b","author":{"name":"Tsanfer","email":"ac64262defbfe8875884ab8cc7327a83f5152011@gmail.com"},"message":"Create test.file","distinct":true,"url":"https://api.github.com/repos/Tsanfer/web_object_detection/commits/e41afd31a9bcf482b4314c394a88722fb43fa00b"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515757","type":"IssuesEvent","actor":{"id":6112685,"login":"sebastiendeleze","display_login":"sebastiendeleze","gravatar_id":"","url":"https://api.github.com/users/sebastiendeleze","avatar_url":"https://avatars.githubusercontent.com/u/6112685?"},"repo":{"id":149142372,"name":"rero/sonar","url":"https://api.github.com/repos/rero/sonar"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/rero/sonar/issues/570","repository_url":"https://api.github.com/repos/rero/sonar","labels_url":"https://api.github.com/repos/rero/sonar/issues/570/labels{/name}","comments_url":"https://api.github.com/repos/rero/sonar/issues/570/comments","events_url":"https://api.github.com/repos/rero/sonar/issues/570/events","html_url":"https://github.com/rero/sonar/issues/570","id":903781328,"node_id":"MDU6SXNzdWU5MDM3ODEzMjg=","number":570,"title":"Mask a document from the public view","user":{"login":"pronguen","id":8154915,"node_id":"MDQ6VXNlcjgxNTQ5MTU=","avatar_url":"https://avatars.githubusercontent.com/u/8154915?v=4","gravatar_id":"","url":"https://api.github.com/users/pronguen","html_url":"https://github.com/pronguen","followers_url":"https://api.github.com/users/pronguen/followers","following_url":"https://api.github.com/users/pronguen/following{/other_user}","gists_url":"https://api.github.com/users/pronguen/gists{/gist_id}","starred_url":"https://api.github.com/users/pronguen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pronguen/subscriptions","organizations_url":"https://api.github.com/users/pronguen/orgs","repos_url":"https://api.github.com/users/pronguen/repos","events_url":"https://api.github.com/users/pronguen/events{/privacy}","received_events_url":"https://api.github.com/users/pronguen/received_events","type":"User","site_admin":false},"labels":[{"id":2544776289,"node_id":"MDU6TGFiZWwyNTQ0Nzc2Mjg5","url":"https://api.github.com/repos/rero/sonar/labels/new","name":"new","color":"A3F7F7","default":false,"description":"New feature"}],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-05-27T13:46:51Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:03Z","author_association":"MEMBER","active_lock_reason":null,"body":"* A new field in the document editor (not in the deposit editor) enables to mask the document\r\n    * It appears in the very bottom of the editor.\r\n    * It appears by default when opening the form, disabled.\r\n    * Same spec than for RERO ILS, see [JSON schema](https://github.com/rero/rero-ils/blob/dev/rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json#L297)\r\n* An icon on the professional document detailed view indicates that the document is masked\r\n    * Tooltip: \"Masked in the public view\"\r\n\r\n![image](https://user-images.githubusercontent.com/8154915/119862071-6b955080-bf18-11eb-8186-5410411f1bcf.png)\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":105555,"login":"rero","gravatar_id":"","url":"https://api.github.com/orgs/rero","avatar_url":"https://avatars.githubusercontent.com/u/105555?"}}
+{"id":"17245515772","type":"WatchEvent","actor":{"id":69457338,"login":"Tikhonov-Chen","display_login":"Tikhonov-Chen","gravatar_id":"","url":"https://api.github.com/users/Tikhonov-Chen","avatar_url":"https://avatars.githubusercontent.com/u/69457338?"},"repo":{"id":272731386,"name":"l0o0/jasminum","url":"https://api.github.com/repos/l0o0/jasminum"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515784","type":"PushEvent","actor":{"id":2486411,"login":"DmitriiP","display_login":"DmitriiP","gravatar_id":"","url":"https://api.github.com/users/DmitriiP","avatar_url":"https://avatars.githubusercontent.com/u/2486411?"},"repo":{"id":135042737,"name":"DmitriiP/hello-github","url":"https://api.github.com/repos/DmitriiP/hello-github"},"payload":{"push_id":7562055553,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"f033dff665ffcb726b11cb101b666c98e97885b8","before":"9b5c6fbc0b1dfd590e253d6663020a84c7545cc2","commits":[{"sha":"f033dff665ffcb726b11cb101b666c98e97885b8","author":{"name":"Dmitrii Prihodco","email":"b597b9214547d49006fffec85ed8baebc73b6971@gmail.com"},"message":"Hello Github!","distinct":true,"url":"https://api.github.com/repos/DmitriiP/hello-github/commits/f033dff665ffcb726b11cb101b666c98e97885b8"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515785","type":"PushEvent","actor":{"id":55799457,"login":"wiisportsresort","display_login":"wiisportsresort","gravatar_id":"","url":"https://api.github.com/users/wiisportsresort","avatar_url":"https://avatars.githubusercontent.com/u/55799457?"},"repo":{"id":289093185,"name":"gamer-gang/gamerbot","url":"https://api.github.com/repos/gamer-gang/gamerbot"},"payload":{"push_id":7562055496,"size":1,"distinct_size":1,"ref":"refs/heads/djs-v13-packages","head":"ba08b2a5e86b51adc4b69cb640974170d42eca86","before":"e981f3513d685aa0872b5e48a2dbabe33c3b5eac","commits":[{"sha":"ba08b2a5e86b51adc4b69cb640974170d42eca86","author":{"name":"wiisportsresort","email":"4916bd11f433b46f57f656a801de1d7bae16e734@gmail.com"},"message":"update packages, rework color class, add $color","distinct":true,"url":"https://api.github.com/repos/gamer-gang/gamerbot/commits/ba08b2a5e86b51adc4b69cb640974170d42eca86"}]},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":58985866,"login":"gamer-gang","gravatar_id":"","url":"https://api.github.com/orgs/gamer-gang","avatar_url":"https://avatars.githubusercontent.com/u/58985866?"}}
+{"id":"17245515889","type":"PullRequestReviewCommentEvent","actor":{"id":6417047,"login":"AlexeySachkov","display_login":"AlexeySachkov","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","avatar_url":"https://avatars.githubusercontent.com/u/6417047?"},"repo":{"id":127136978,"name":"KhronosGroup/SPIRV-LLVM-Translator","url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/comments/673748196","pull_request_review_id":711364920,"id":673748196,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3Mzc0ODE5Ng==","diff_hunk":"@@ -54,54 +54,51 @@ namespace SPIRV {\n \n class SPIRVLowerMemmoveBase {\n public:\n-  SPIRVLowerMemmoveBase() : Context(nullptr), Mod(nullptr) {}\n+  SPIRVLowerMemmoveBase() : Context(nullptr) {}\n+\n   void LowerMemMoveInst(MemMoveInst &I) {\n+    // There is no direct equivalent of @llvm.memmove in SPIR-V and the closest\n+    // instructions are 'OpMemoryCopy' and 'OpMemoryCopySized'.","path":"lib/SPIRV/SPIRVLowerMemmove.cpp","position":null,"original_position":9,"commit_id":"dbc54dd752c04bb65e8d2e2aedaaac22c247266e","original_commit_id":"1551e65e73bb6f1461c31cca3c6e75a0d57d5ce8","user":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"body":"Done in dbc54dd752c04bb65e8d2e2aedaaac22c247266e","created_at":"2021-07-21T08:00:03Z","updated_at":"2021-07-21T08:00:03Z","html_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119#discussion_r673748196","pull_request_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/comments/673748196"},"html":{"href":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119#discussion_r673748196"},"pull_request":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119"}},"start_line":null,"original_start_line":null,"start_side":null,"line":null,"original_line":61,"side":"RIGHT","in_reply_to_id":673403624},"pull_request":{"url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119","id":693465500,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDY1NTAw","html_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119","diff_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119.diff","patch_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119.patch","issue_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119","number":1119,"state":"open","locked":false,"title":"Improve llvm.memmove translation","user":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"body":"The main change comparing to previous approach: we do not look for the underlying type which is being copied anymore. Instead, we directly allocate required amount of bytes and copy them.","created_at":"2021-07-20T13:26:14Z","updated_at":"2021-07-21T08:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"1df177eccdd4f5230bed2491a8e681f5963ea9d7","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/commits","review_comments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/comments","review_comment_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/comments{/number}","comments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119/comments","statuses_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/statuses/dbc54dd752c04bb65e8d2e2aedaaac22c247266e","head":{"label":"AlexeySachkov:private/asachkov/memmove-translation-fixes","ref":"private/asachkov/memmove-translation-fixes","sha":"dbc54dd752c04bb65e8d2e2aedaaac22c247266e","user":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"repo":{"id":160663481,"node_id":"MDEwOlJlcG9zaXRvcnkxNjA2NjM0ODE=","name":"SPIRV-LLVM-Translator","full_name":"AlexeySachkov/SPIRV-LLVM-Translator","private":false,"owner":{"login":"AlexeySachkov","id":6417047,"node_id":"MDQ6VXNlcjY0MTcwNDc=","avatar_url":"https://avatars.githubusercontent.com/u/6417047?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexeySachkov","html_url":"https://github.com/AlexeySachkov","followers_url":"https://api.github.com/users/AlexeySachkov/followers","following_url":"https://api.github.com/users/AlexeySachkov/following{/other_user}","gists_url":"https://api.github.com/users/AlexeySachkov/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexeySachkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexeySachkov/subscriptions","organizations_url":"https://api.github.com/users/AlexeySachkov/orgs","repos_url":"https://api.github.com/users/AlexeySachkov/repos","events_url":"https://api.github.com/users/AlexeySachkov/events{/privacy}","received_events_url":"https://api.github.com/users/AlexeySachkov/received_events","type":"User","site_admin":false},"html_url":"https://github.com/AlexeySachkov/SPIRV-LLVM-Translator","description":"A tool and a library for bi-directional translation between SPIR-V and LLVM IR","fork":true,"url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator","forks_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/forks","keys_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/teams","hooks_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/hooks","issue_events_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/issues/events{/number}","events_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/events","assignees_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/assignees{/user}","branches_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/branches{/branch}","tags_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/tags","blobs_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/refs{/sha}","trees_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/statuses/{sha}","languages_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/languages","stargazers_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/stargazers","contributors_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/contributors","subscribers_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/subscribers","subscription_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/subscription","commits_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/commits{/sha}","git_commits_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/git/commits{/sha}","comments_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/comments{/number}","issue_comment_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/issues/comments{/number}","contents_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/contents/{+path}","compare_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/merges","archive_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/downloads","issues_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/issues{/number}","pulls_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/pulls{/number}","milestones_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/milestones{/number}","notifications_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/labels{/name}","releases_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/releases{/id}","deployments_url":"https://api.github.com/repos/AlexeySachkov/SPIRV-LLVM-Translator/deployments","created_at":"2018-12-06T11:12:57Z","updated_at":"2021-02-17T09:49:57Z","pushed_at":"2021-07-21T07:59:11Z","git_url":"git://github.com/AlexeySachkov/SPIRV-LLVM-Translator.git","ssh_url":"git@github.com:AlexeySachkov/SPIRV-LLVM-Translator.git","clone_url":"https://github.com/AlexeySachkov/SPIRV-LLVM-Translator.git","svn_url":"https://github.com/AlexeySachkov/SPIRV-LLVM-Translator","homepage":null,"size":8654,"stargazers_count":0,"watchers_count":0,"language":"LLVM","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"KhronosGroup:master","ref":"master","sha":"6795cab62f3ed36e9a5cec235c62a8d92a40cc8f","user":{"login":"KhronosGroup","id":1608701,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDg3MDE=","avatar_url":"https://avatars.githubusercontent.com/u/1608701?v=4","gravatar_id":"","url":"https://api.github.com/users/KhronosGroup","html_url":"https://github.com/KhronosGroup","followers_url":"https://api.github.com/users/KhronosGroup/followers","following_url":"https://api.github.com/users/KhronosGroup/following{/other_user}","gists_url":"https://api.github.com/users/KhronosGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/KhronosGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KhronosGroup/subscriptions","organizations_url":"https://api.github.com/users/KhronosGroup/orgs","repos_url":"https://api.github.com/users/KhronosGroup/repos","events_url":"https://api.github.com/users/KhronosGroup/events{/privacy}","received_events_url":"https://api.github.com/users/KhronosGroup/received_events","type":"Organization","site_admin":false},"repo":{"id":127136978,"node_id":"MDEwOlJlcG9zaXRvcnkxMjcxMzY5Nzg=","name":"SPIRV-LLVM-Translator","full_name":"KhronosGroup/SPIRV-LLVM-Translator","private":false,"owner":{"login":"KhronosGroup","id":1608701,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE2MDg3MDE=","avatar_url":"https://avatars.githubusercontent.com/u/1608701?v=4","gravatar_id":"","url":"https://api.github.com/users/KhronosGroup","html_url":"https://github.com/KhronosGroup","followers_url":"https://api.github.com/users/KhronosGroup/followers","following_url":"https://api.github.com/users/KhronosGroup/following{/other_user}","gists_url":"https://api.github.com/users/KhronosGroup/gists{/gist_id}","starred_url":"https://api.github.com/users/KhronosGroup/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KhronosGroup/subscriptions","organizations_url":"https://api.github.com/users/KhronosGroup/orgs","repos_url":"https://api.github.com/users/KhronosGroup/repos","events_url":"https://api.github.com/users/KhronosGroup/events{/privacy}","received_events_url":"https://api.github.com/users/KhronosGroup/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator","description":"A tool and a library for bi-directional translation between SPIR-V and LLVM IR","fork":false,"url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator","forks_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/forks","keys_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/teams","hooks_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/hooks","issue_events_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/events{/number}","events_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/events","assignees_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/assignees{/user}","branches_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/branches{/branch}","tags_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/tags","blobs_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/refs{/sha}","trees_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/statuses/{sha}","languages_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/languages","stargazers_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/stargazers","contributors_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/contributors","subscribers_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/subscribers","subscription_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/subscription","commits_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/commits{/sha}","git_commits_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/git/commits{/sha}","comments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/comments{/number}","issue_comment_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/comments{/number}","contents_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/contents/{+path}","compare_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/merges","archive_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/downloads","issues_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues{/number}","pulls_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls{/number}","milestones_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/milestones{/number}","notifications_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/labels{/name}","releases_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/releases{/id}","deployments_url":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/deployments","created_at":"2018-03-28T12:29:24Z","updated_at":"2021-07-19T17:01:10Z","pushed_at":"2021-07-21T07:59:13Z","git_url":"git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git","ssh_url":"git@github.com:KhronosGroup/SPIRV-LLVM-Translator.git","clone_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git","svn_url":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator","homepage":null,"size":9402,"stargazers_count":248,"watchers_count":248,"language":"LLVM","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":113,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":104,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":113,"open_issues":104,"watchers":248,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119"},"html":{"href":"https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1119"},"issue":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119"},"comments":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/issues/1119/comments"},"review_comments":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/comments"},"review_comment":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/pulls/1119/commits"},"statuses":{"href":"https://api.github.com/repos/KhronosGroup/SPIRV-LLVM-Translator/statuses/dbc54dd752c04bb65e8d2e2aedaaac22c247266e"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T08:00:03Z","org":{"id":1608701,"login":"KhronosGroup","gravatar_id":"","url":"https://api.github.com/orgs/KhronosGroup","avatar_url":"https://avatars.githubusercontent.com/u/1608701?"}}
+{"id":"17245515782","type":"PushEvent","actor":{"id":40586421,"login":"himobi","display_login":"himobi","gravatar_id":"","url":"https://api.github.com/users/himobi","avatar_url":"https://avatars.githubusercontent.com/u/40586421?"},"repo":{"id":138676186,"name":"himobi/hotspot","url":"https://api.github.com/repos/himobi/hotspot"},"payload":{"push_id":7562055557,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"705a507d5d295d2589334ae412391fd7afe88ce7","before":"cd0cdb510c3582ac98540b6700fa98d2a52855eb","commits":[{"sha":"705a507d5d295d2589334ae412391fd7afe88ce7","author":{"name":"himobi","email":"25be52bce459ebff50c126f5ac512648f87cbe75@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/himobi/hotspot/commits/705a507d5d295d2589334ae412391fd7afe88ce7"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515788","type":"PushEvent","actor":{"id":22955941,"login":"Volodichev","display_login":"Volodichev","gravatar_id":"","url":"https://api.github.com/users/Volodichev","avatar_url":"https://avatars.githubusercontent.com/u/22955941?"},"repo":{"id":374556291,"name":"Volodichev/proxy-list","url":"https://api.github.com/repos/Volodichev/proxy-list"},"payload":{"push_id":7562055550,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"816d2973250cad2d38d0c9556183a477f06ab72d","before":"33f74e7da997df14a562e393c486a58384492190","commits":[{"sha":"816d2973250cad2d38d0c9556183a477f06ab72d","author":{"name":"Alexander","email":"db02dbb7d5376400a8069895ae273c92e0d1f31d@gmail.com"},"message":"awm proxy 21.07.21 11:00:01","distinct":true,"url":"https://api.github.com/repos/Volodichev/proxy-list/commits/816d2973250cad2d38d0c9556183a477f06ab72d"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515791","type":"PushEvent","actor":{"id":60849980,"login":"jordans-bot","display_login":"jordans-bot","gravatar_id":"","url":"https://api.github.com/users/jordans-bot","avatar_url":"https://avatars.githubusercontent.com/u/60849980?"},"repo":{"id":139190305,"name":"JTuwiner/bitcoinclock","url":"https://api.github.com/repos/JTuwiner/bitcoinclock"},"payload":{"push_id":7562055552,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5a001f4a5f5af68ec3da02c1ca004882a321b783","before":"cac51092053a2547310619861014856104b0e08e","commits":[{"sha":"5a001f4a5f5af68ec3da02c1ca004882a321b783","author":{"name":"jordans-bot","email":"6323b4aabf9938a958e69e4471281fb61992bb8f@users.noreply.github.com"},"message":"Updated block height","distinct":true,"url":"https://api.github.com/repos/JTuwiner/bitcoinclock/commits/5a001f4a5f5af68ec3da02c1ca004882a321b783"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515801","type":"PushEvent","actor":{"id":63818299,"login":"jgsheppa","display_login":"jgsheppa","gravatar_id":"","url":"https://api.github.com/users/jgsheppa","avatar_url":"https://avatars.githubusercontent.com/u/63818299?"},"repo":{"id":299556960,"name":"jgsheppa/dictionary-app","url":"https://api.github.com/repos/jgsheppa/dictionary-app"},"payload":{"push_id":7562055558,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"53234f0c8eecf2ab187a148d02feb857c21f9fb9","before":"5bb3e1434ab4eb09f024818a898526cce88e6180","commits":[{"sha":"53234f0c8eecf2ab187a148d02feb857c21f9fb9","author":{"name":"Snyk bot","email":"6524ae312692b75c8ed05087d0aa3c757ac39348@snyk.io"},"message":"fix: upgrade @types/node from 14.14.7 to 14.17.4 (#3)\n\nSnyk has created this PR to upgrade @types/node from 14.14.7 to 14.17.4.\r\n\r\nSee this package in npm:\r\n\r\n\r\nSee this project in Snyk:\r\nhttps://app.snyk.io/org/jgsheppa/project/890b4ae1-03b6-448d-9daa-875c5f5add2a?utm_source=github&utm_medium=upgrade-pr","distinct":true,"url":"https://api.github.com/repos/jgsheppa/dictionary-app/commits/53234f0c8eecf2ab187a148d02feb857c21f9fb9"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515816","type":"PushEvent","actor":{"id":31001511,"login":"Kimyuhwanpeter","display_login":"Kimyuhwanpeter","gravatar_id":"","url":"https://api.github.com/users/Kimyuhwanpeter","avatar_url":"https://avatars.githubusercontent.com/u/31001511?"},"repo":{"id":388040321,"name":"Kimyuhwanpeter/F2M_model_10","url":"https://api.github.com/repos/Kimyuhwanpeter/F2M_model_10"},"payload":{"push_id":7562055556,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"ba74d50f0bf2754b883bac59b6b513bc14f8c982","before":"ada7324ccce700559a1b85840469700cf18e770c","commits":[{"sha":"ba74d50f0bf2754b883bac59b6b513bc14f8c982","author":{"name":"YYu HHwan KKim","email":"dece1e7f54de1f8c609c68d4650eb27c2dca2de6@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/Kimyuhwanpeter/F2M_model_10/commits/ba74d50f0bf2754b883bac59b6b513bc14f8c982"}]},"public":true,"created_at":"2021-07-21T08:00:05Z"}
+{"id":"17245515827","type":"PullRequestEvent","actor":{"id":1858241,"login":"willseeyou","display_login":"willseeyou","gravatar_id":"","url":"https://api.github.com/users/willseeyou","avatar_url":"https://avatars.githubusercontent.com/u/1858241?"},"repo":{"id":18511687,"name":"igniterealtime/Openfire","url":"https://api.github.com/repos/igniterealtime/Openfire"},"payload":{"action":"opened","number":1864,"pull_request":{"url":"https://api.github.com/repos/igniterealtime/Openfire/pulls/1864","id":694141706,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTQxNzA2","html_url":"https://github.com/igniterealtime/Openfire/pull/1864","diff_url":"https://github.com/igniterealtime/Openfire/pull/1864.diff","patch_url":"https://github.com/igniterealtime/Openfire/pull/1864.patch","issue_url":"https://api.github.com/repos/igniterealtime/Openfire/issues/1864","number":1864,"state":"open","locked":false,"title":"fix wrong typo responsbile and immediatelly","user":{"login":"willseeyou","id":1858241,"node_id":"MDQ6VXNlcjE4NTgyNDE=","avatar_url":"https://avatars.githubusercontent.com/u/1858241?v=4","gravatar_id":"","url":"https://api.github.com/users/willseeyou","html_url":"https://github.com/willseeyou","followers_url":"https://api.github.com/users/willseeyou/followers","following_url":"https://api.github.com/users/willseeyou/following{/other_user}","gists_url":"https://api.github.com/users/willseeyou/gists{/gist_id}","starred_url":"https://api.github.com/users/willseeyou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/willseeyou/subscriptions","organizations_url":"https://api.github.com/users/willseeyou/orgs","repos_url":"https://api.github.com/users/willseeyou/repos","events_url":"https://api.github.com/users/willseeyou/events{/privacy}","received_events_url":"https://api.github.com/users/willseeyou/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T08:00:05Z","updated_at":"2021-07-21T08:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/igniterealtime/Openfire/pulls/1864/commits","review_comments_url":"https://api.github.com/repos/igniterealtime/Openfire/pulls/1864/comments","review_comment_url":"https://api.github.com/repos/igniterealtime/Openfire/pulls/comments{/number}","comments_url":"https://api.github.com/repos/igniterealtime/Openfire/issues/1864/comments","statuses_url":"https://api.github.com/repos/igniterealtime/Openfire/statuses/ed7b8cbe51fc30bff8c3e7c41749934d093bb699","head":{"label":"willseeyou:patch-1","ref":"patch-1","sha":"ed7b8cbe51fc30bff8c3e7c41749934d093bb699","user":{"login":"willseeyou","id":1858241,"node_id":"MDQ6VXNlcjE4NTgyNDE=","avatar_url":"https://avatars.githubusercontent.com/u/1858241?v=4","gravatar_id":"","url":"https://api.github.com/users/willseeyou","html_url":"https://github.com/willseeyou","followers_url":"https://api.github.com/users/willseeyou/followers","following_url":"https://api.github.com/users/willseeyou/following{/other_user}","gists_url":"https://api.github.com/users/willseeyou/gists{/gist_id}","starred_url":"https://api.github.com/users/willseeyou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/willseeyou/subscriptions","organizations_url":"https://api.github.com/users/willseeyou/orgs","repos_url":"https://api.github.com/users/willseeyou/repos","events_url":"https://api.github.com/users/willseeyou/events{/privacy}","received_events_url":"https://api.github.com/users/willseeyou/received_events","type":"User","site_admin":false},"repo":{"id":386548440,"node_id":"MDEwOlJlcG9zaXRvcnkzODY1NDg0NDA=","name":"Openfire","full_name":"willseeyou/Openfire","private":false,"owner":{"login":"willseeyou","id":1858241,"node_id":"MDQ6VXNlcjE4NTgyNDE=","avatar_url":"https://avatars.githubusercontent.com/u/1858241?v=4","gravatar_id":"","url":"https://api.github.com/users/willseeyou","html_url":"https://github.com/willseeyou","followers_url":"https://api.github.com/users/willseeyou/followers","following_url":"https://api.github.com/users/willseeyou/following{/other_user}","gists_url":"https://api.github.com/users/willseeyou/gists{/gist_id}","starred_url":"https://api.github.com/users/willseeyou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/willseeyou/subscriptions","organizations_url":"https://api.github.com/users/willseeyou/orgs","repos_url":"https://api.github.com/users/willseeyou/repos","events_url":"https://api.github.com/users/willseeyou/events{/privacy}","received_events_url":"https://api.github.com/users/willseeyou/received_events","type":"User","site_admin":false},"html_url":"https://github.com/willseeyou/Openfire","description":"An XMPP server licensed under the Open Source Apache License.","fork":true,"url":"https://api.github.com/repos/willseeyou/Openfire","forks_url":"https://api.github.com/repos/willseeyou/Openfire/forks","keys_url":"https://api.github.com/repos/willseeyou/Openfire/keys{/key_id}","collaborators_url":"https://api.github.com/repos/willseeyou/Openfire/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/willseeyou/Openfire/teams","hooks_url":"https://api.github.com/repos/willseeyou/Openfire/hooks","issue_events_url":"https://api.github.com/repos/willseeyou/Openfire/issues/events{/number}","events_url":"https://api.github.com/repos/willseeyou/Openfire/events","assignees_url":"https://api.github.com/repos/willseeyou/Openfire/assignees{/user}","branches_url":"https://api.github.com/repos/willseeyou/Openfire/branches{/branch}","tags_url":"https://api.github.com/repos/willseeyou/Openfire/tags","blobs_url":"https://api.github.com/repos/willseeyou/Openfire/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/willseeyou/Openfire/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/willseeyou/Openfire/git/refs{/sha}","trees_url":"https://api.github.com/repos/willseeyou/Openfire/git/trees{/sha}","statuses_url":"https://api.github.com/repos/willseeyou/Openfire/statuses/{sha}","languages_url":"https://api.github.com/repos/willseeyou/Openfire/languages","stargazers_url":"https://api.github.com/repos/willseeyou/Openfire/stargazers","contributors_url":"https://api.github.com/repos/willseeyou/Openfire/contributors","subscribers_url":"https://api.github.com/repos/willseeyou/Openfire/subscribers","subscription_url":"https://api.github.com/repos/willseeyou/Openfire/subscription","commits_url":"https://api.github.com/repos/willseeyou/Openfire/commits{/sha}","git_commits_url":"https://api.github.com/repos/willseeyou/Openfire/git/commits{/sha}","comments_url":"https://api.github.com/repos/willseeyou/Openfire/comments{/number}","issue_comment_url":"https://api.github.com/repos/willseeyou/Openfire/issues/comments{/number}","contents_url":"https://api.github.com/repos/willseeyou/Openfire/contents/{+path}","compare_url":"https://api.github.com/repos/willseeyou/Openfire/compare/{base}...{head}","merges_url":"https://api.github.com/repos/willseeyou/Openfire/merges","archive_url":"https://api.github.com/repos/willseeyou/Openfire/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/willseeyou/Openfire/downloads","issues_url":"https://api.github.com/repos/willseeyou/Openfire/issues{/number}","pulls_url":"https://api.github.com/repos/willseeyou/Openfire/pulls{/number}","milestones_url":"https://api.github.com/repos/willseeyou/Openfire/milestones{/number}","notifications_url":"https://api.github.com/repos/willseeyou/Openfire/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/willseeyou/Openfire/labels{/name}","releases_url":"https://api.github.com/repos/willseeyou/Openfire/releases{/id}","deployments_url":"https://api.github.com/repos/willseeyou/Openfire/deployments","created_at":"2021-07-16T07:25:01Z","updated_at":"2021-07-16T07:25:02Z","pushed_at":"2021-07-21T07:59:54Z","git_url":"git://github.com/willseeyou/Openfire.git","ssh_url":"git@github.com:willseeyou/Openfire.git","clone_url":"https://github.com/willseeyou/Openfire.git","svn_url":"https://github.com/willseeyou/Openfire","homepage":"https://igniterealtime.org/projects/openfire/","size":862051,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"igniterealtime:master","ref":"master","sha":"31b55763fdd5409e17f7b42391a7bee618230726","user":{"login":"igniterealtime","id":5991032,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU5OTEwMzI=","avatar_url":"https://avatars.githubusercontent.com/u/5991032?v=4","gravatar_id":"","url":"https://api.github.com/users/igniterealtime","html_url":"https://github.com/igniterealtime","followers_url":"https://api.github.com/users/igniterealtime/followers","following_url":"https://api.github.com/users/igniterealtime/following{/other_user}","gists_url":"https://api.github.com/users/igniterealtime/gists{/gist_id}","starred_url":"https://api.github.com/users/igniterealtime/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/igniterealtime/subscriptions","organizations_url":"https://api.github.com/users/igniterealtime/orgs","repos_url":"https://api.github.com/users/igniterealtime/repos","events_url":"https://api.github.com/users/igniterealtime/events{/privacy}","received_events_url":"https://api.github.com/users/igniterealtime/received_events","type":"Organization","site_admin":false},"repo":{"id":18511687,"node_id":"MDEwOlJlcG9zaXRvcnkxODUxMTY4Nw==","name":"Openfire","full_name":"igniterealtime/Openfire","private":false,"owner":{"login":"igniterealtime","id":5991032,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU5OTEwMzI=","avatar_url":"https://avatars.githubusercontent.com/u/5991032?v=4","gravatar_id":"","url":"https://api.github.com/users/igniterealtime","html_url":"https://github.com/igniterealtime","followers_url":"https://api.github.com/users/igniterealtime/followers","following_url":"https://api.github.com/users/igniterealtime/following{/other_user}","gists_url":"https://api.github.com/users/igniterealtime/gists{/gist_id}","starred_url":"https://api.github.com/users/igniterealtime/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/igniterealtime/subscriptions","organizations_url":"https://api.github.com/users/igniterealtime/orgs","repos_url":"https://api.github.com/users/igniterealtime/repos","events_url":"https://api.github.com/users/igniterealtime/events{/privacy}","received_events_url":"https://api.github.com/users/igniterealtime/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/igniterealtime/Openfire","description":"An XMPP server licensed under the Open Source Apache License.","fork":false,"url":"https://api.github.com/repos/igniterealtime/Openfire","forks_url":"https://api.github.com/repos/igniterealtime/Openfire/forks","keys_url":"https://api.github.com/repos/igniterealtime/Openfire/keys{/key_id}","collaborators_url":"https://api.github.com/repos/igniterealtime/Openfire/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/igniterealtime/Openfire/teams","hooks_url":"https://api.github.com/repos/igniterealtime/Openfire/hooks","issue_events_url":"https://api.github.com/repos/igniterealtime/Openfire/issues/events{/number}","events_url":"https://api.github.com/repos/igniterealtime/Openfire/events","assignees_url":"https://api.github.com/repos/igniterealtime/Openfire/assignees{/user}","branches_url":"https://api.github.com/repos/igniterealtime/Openfire/branches{/branch}","tags_url":"https://api.github.com/repos/igniterealtime/Openfire/tags","blobs_url":"https://api.github.com/repos/igniterealtime/Openfire/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/igniterealtime/Openfire/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/igniterealtime/Openfire/git/refs{/sha}","trees_url":"https://api.github.com/repos/igniterealtime/Openfire/git/trees{/sha}","statuses_url":"https://api.github.com/repos/igniterealtime/Openfire/statuses/{sha}","languages_url":"https://api.github.com/repos/igniterealtime/Openfire/languages","stargazers_url":"https://api.github.com/repos/igniterealtime/Openfire/stargazers","contributors_url":"https://api.github.com/repos/igniterealtime/Openfire/contributors","subscribers_url":"https://api.github.com/repos/igniterealtime/Openfire/subscribers","subscription_url":"https://api.github.com/repos/igniterealtime/Openfire/subscription","commits_url":"https://api.github.com/repos/igniterealtime/Openfire/commits{/sha}","git_commits_url":"https://api.github.com/repos/igniterealtime/Openfire/git/commits{/sha}","comments_url":"https://api.github.com/repos/igniterealtime/Openfire/comments{/number}","issue_comment_url":"https://api.github.com/repos/igniterealtime/Openfire/issues/comments{/number}","contents_url":"https://api.github.com/repos/igniterealtime/Openfire/contents/{+path}","compare_url":"https://api.github.com/repos/igniterealtime/Openfire/compare/{base}...{head}","merges_url":"https://api.github.com/repos/igniterealtime/Openfire/merges","archive_url":"https://api.github.com/repos/igniterealtime/Openfire/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/igniterealtime/Openfire/downloads","issues_url":"https://api.github.com/repos/igniterealtime/Openfire/issues{/number}","pulls_url":"https://api.github.com/repos/igniterealtime/Openfire/pulls{/number}","milestones_url":"https://api.github.com/repos/igniterealtime/Openfire/milestones{/number}","notifications_url":"https://api.github.com/repos/igniterealtime/Openfire/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/igniterealtime/Openfire/labels{/name}","releases_url":"https://api.github.com/repos/igniterealtime/Openfire/releases{/id}","deployments_url":"https://api.github.com/repos/igniterealtime/Openfire/deployments","created_at":"2014-04-07T09:12:33Z","updated_at":"2021-07-21T01:32:28Z","pushed_at":"2021-07-17T15:38:52Z","git_url":"git://github.com/igniterealtime/Openfire.git","ssh_url":"git@github.com:igniterealtime/Openfire.git","clone_url":"https://github.com/igniterealtime/Openfire.git","svn_url":"https://github.com/igniterealtime/Openfire","homepage":"https://igniterealtime.org/projects/openfire/","size":862051,"stargazers_count":2356,"watchers_count":2356,"language":"Java","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1249,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":28,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":1249,"open_issues":28,"watchers":2356,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/igniterealtime/Openfire/pulls/1864"},"html":{"href":"https://github.com/igniterealtime/Openfire/pull/1864"},"issue":{"href":"https://api.github.com/repos/igniterealtime/Openfire/issues/1864"},"comments":{"href":"https://api.github.com/repos/igniterealtime/Openfire/issues/1864/comments"},"review_comments":{"href":"https://api.github.com/repos/igniterealtime/Openfire/pulls/1864/comments"},"review_comment":{"href":"https://api.github.com/repos/igniterealtime/Openfire/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/igniterealtime/Openfire/pulls/1864/commits"},"statuses":{"href":"https://api.github.com/repos/igniterealtime/Openfire/statuses/ed7b8cbe51fc30bff8c3e7c41749934d093bb699"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":1,"additions":2,"deletions":2,"changed_files":1}},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":5991032,"login":"igniterealtime","gravatar_id":"","url":"https://api.github.com/orgs/igniterealtime","avatar_url":"https://avatars.githubusercontent.com/u/5991032?"}}
+{"id":"17245515828","type":"PullRequestEvent","actor":{"id":6112685,"login":"sebastiendeleze","display_login":"sebastiendeleze","gravatar_id":"","url":"https://api.github.com/users/sebastiendeleze","avatar_url":"https://avatars.githubusercontent.com/u/6112685?"},"repo":{"id":149142372,"name":"rero/sonar","url":"https://api.github.com/repos/rero/sonar"},"payload":{"action":"closed","number":601,"pull_request":{"url":"https://api.github.com/repos/rero/sonar/pulls/601","id":688525987,"node_id":"MDExOlB1bGxSZXF1ZXN0Njg4NTI1OTg3","html_url":"https://github.com/rero/sonar/pull/601","diff_url":"https://github.com/rero/sonar/pull/601.diff","patch_url":"https://github.com/rero/sonar/pull/601.patch","issue_url":"https://api.github.com/repos/rero/sonar/issues/601","number":601,"state":"closed","locked":false,"title":"documents: add `masked` property","user":{"login":"sebastiendeleze","id":6112685,"node_id":"MDQ6VXNlcjYxMTI2ODU=","avatar_url":"https://avatars.githubusercontent.com/u/6112685?v=4","gravatar_id":"","url":"https://api.github.com/users/sebastiendeleze","html_url":"https://github.com/sebastiendeleze","followers_url":"https://api.github.com/users/sebastiendeleze/followers","following_url":"https://api.github.com/users/sebastiendeleze/following{/other_user}","gists_url":"https://api.github.com/users/sebastiendeleze/gists{/gist_id}","starred_url":"https://api.github.com/users/sebastiendeleze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sebastiendeleze/subscriptions","organizations_url":"https://api.github.com/users/sebastiendeleze/orgs","repos_url":"https://api.github.com/users/sebastiendeleze/repos","events_url":"https://api.github.com/users/sebastiendeleze/events{/privacy}","received_events_url":"https://api.github.com/users/sebastiendeleze/received_events","type":"User","site_admin":false},"body":"* Adds `marked` property to documents and hides masked documents on the public interface.\r\n* Closes #570.\r\n\r\nCo-Authored-by: Sébastien Délèze <sebastien.deleze@rero.ch>","created_at":"2021-07-13T06:34:46Z","updated_at":"2021-07-21T08:00:03Z","closed_at":"2021-07-21T08:00:03Z","merged_at":"2021-07-21T08:00:03Z","merge_commit_sha":"4fbfcf41c5f203545ce4a8b8c3f7e9ffb7cc8c0b","assignee":null,"assignees":[],"requested_reviewers":[{"login":"jma","id":127249,"node_id":"MDQ6VXNlcjEyNzI0OQ==","avatar_url":"https://avatars.githubusercontent.com/u/127249?v=4","gravatar_id":"","url":"https://api.github.com/users/jma","html_url":"https://github.com/jma","followers_url":"https://api.github.com/users/jma/followers","following_url":"https://api.github.com/users/jma/following{/other_user}","gists_url":"https://api.github.com/users/jma/gists{/gist_id}","starred_url":"https://api.github.com/users/jma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jma/subscriptions","organizations_url":"https://api.github.com/users/jma/orgs","repos_url":"https://api.github.com/users/jma/repos","events_url":"https://api.github.com/users/jma/events{/privacy}","received_events_url":"https://api.github.com/users/jma/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/rero/sonar/pulls/601/commits","review_comments_url":"https://api.github.com/repos/rero/sonar/pulls/601/comments","review_comment_url":"https://api.github.com/repos/rero/sonar/pulls/comments{/number}","comments_url":"https://api.github.com/repos/rero/sonar/issues/601/comments","statuses_url":"https://api.github.com/repos/rero/sonar/statuses/ee3d9739e8ebbc2d2168448b47a3a8694249d73f","head":{"label":"sebastiendeleze:sed-masked-document","ref":"sed-masked-document","sha":"ee3d9739e8ebbc2d2168448b47a3a8694249d73f","user":{"login":"sebastiendeleze","id":6112685,"node_id":"MDQ6VXNlcjYxMTI2ODU=","avatar_url":"https://avatars.githubusercontent.com/u/6112685?v=4","gravatar_id":"","url":"https://api.github.com/users/sebastiendeleze","html_url":"https://github.com/sebastiendeleze","followers_url":"https://api.github.com/users/sebastiendeleze/followers","following_url":"https://api.github.com/users/sebastiendeleze/following{/other_user}","gists_url":"https://api.github.com/users/sebastiendeleze/gists{/gist_id}","starred_url":"https://api.github.com/users/sebastiendeleze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sebastiendeleze/subscriptions","organizations_url":"https://api.github.com/users/sebastiendeleze/orgs","repos_url":"https://api.github.com/users/sebastiendeleze/repos","events_url":"https://api.github.com/users/sebastiendeleze/events{/privacy}","received_events_url":"https://api.github.com/users/sebastiendeleze/received_events","type":"User","site_admin":false},"repo":{"id":185577052,"node_id":"MDEwOlJlcG9zaXRvcnkxODU1NzcwNTI=","name":"sonar","full_name":"sebastiendeleze/sonar","private":false,"owner":{"login":"sebastiendeleze","id":6112685,"node_id":"MDQ6VXNlcjYxMTI2ODU=","avatar_url":"https://avatars.githubusercontent.com/u/6112685?v=4","gravatar_id":"","url":"https://api.github.com/users/sebastiendeleze","html_url":"https://github.com/sebastiendeleze","followers_url":"https://api.github.com/users/sebastiendeleze/followers","following_url":"https://api.github.com/users/sebastiendeleze/following{/other_user}","gists_url":"https://api.github.com/users/sebastiendeleze/gists{/gist_id}","starred_url":"https://api.github.com/users/sebastiendeleze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sebastiendeleze/subscriptions","organizations_url":"https://api.github.com/users/sebastiendeleze/orgs","repos_url":"https://api.github.com/users/sebastiendeleze/repos","events_url":"https://api.github.com/users/sebastiendeleze/events{/privacy}","received_events_url":"https://api.github.com/users/sebastiendeleze/received_events","type":"User","site_admin":false},"html_url":"https://github.com/sebastiendeleze/sonar","description":"SONAR - Swiss Open Access Repository","fork":true,"url":"https://api.github.com/repos/sebastiendeleze/sonar","forks_url":"https://api.github.com/repos/sebastiendeleze/sonar/forks","keys_url":"https://api.github.com/repos/sebastiendeleze/sonar/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sebastiendeleze/sonar/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sebastiendeleze/sonar/teams","hooks_url":"https://api.github.com/repos/sebastiendeleze/sonar/hooks","issue_events_url":"https://api.github.com/repos/sebastiendeleze/sonar/issues/events{/number}","events_url":"https://api.github.com/repos/sebastiendeleze/sonar/events","assignees_url":"https://api.github.com/repos/sebastiendeleze/sonar/assignees{/user}","branches_url":"https://api.github.com/repos/sebastiendeleze/sonar/branches{/branch}","tags_url":"https://api.github.com/repos/sebastiendeleze/sonar/tags","blobs_url":"https://api.github.com/repos/sebastiendeleze/sonar/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sebastiendeleze/sonar/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sebastiendeleze/sonar/git/refs{/sha}","trees_url":"https://api.github.com/repos/sebastiendeleze/sonar/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sebastiendeleze/sonar/statuses/{sha}","languages_url":"https://api.github.com/repos/sebastiendeleze/sonar/languages","stargazers_url":"https://api.github.com/repos/sebastiendeleze/sonar/stargazers","contributors_url":"https://api.github.com/repos/sebastiendeleze/sonar/contributors","subscribers_url":"https://api.github.com/repos/sebastiendeleze/sonar/subscribers","subscription_url":"https://api.github.com/repos/sebastiendeleze/sonar/subscription","commits_url":"https://api.github.com/repos/sebastiendeleze/sonar/commits{/sha}","git_commits_url":"https://api.github.com/repos/sebastiendeleze/sonar/git/commits{/sha}","comments_url":"https://api.github.com/repos/sebastiendeleze/sonar/comments{/number}","issue_comment_url":"https://api.github.com/repos/sebastiendeleze/sonar/issues/comments{/number}","contents_url":"https://api.github.com/repos/sebastiendeleze/sonar/contents/{+path}","compare_url":"https://api.github.com/repos/sebastiendeleze/sonar/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sebastiendeleze/sonar/merges","archive_url":"https://api.github.com/repos/sebastiendeleze/sonar/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sebastiendeleze/sonar/downloads","issues_url":"https://api.github.com/repos/sebastiendeleze/sonar/issues{/number}","pulls_url":"https://api.github.com/repos/sebastiendeleze/sonar/pulls{/number}","milestones_url":"https://api.github.com/repos/sebastiendeleze/sonar/milestones{/number}","notifications_url":"https://api.github.com/repos/sebastiendeleze/sonar/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sebastiendeleze/sonar/labels{/name}","releases_url":"https://api.github.com/repos/sebastiendeleze/sonar/releases{/id}","deployments_url":"https://api.github.com/repos/sebastiendeleze/sonar/deployments","created_at":"2019-05-08T09:41:49Z","updated_at":"2021-07-14T09:18:29Z","pushed_at":"2021-07-21T07:34:27Z","git_url":"git://github.com/sebastiendeleze/sonar.git","ssh_url":"git@github.com:sebastiendeleze/sonar.git","clone_url":"https://github.com/sebastiendeleze/sonar.git","svn_url":"https://github.com/sebastiendeleze/sonar","homepage":null,"size":14195,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"rero:staging","ref":"staging","sha":"41d3d9f7c919eb851cd30f78fbfbcca5e5d7f289","user":{"login":"rero","id":105555,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwNTU1NQ==","avatar_url":"https://avatars.githubusercontent.com/u/105555?v=4","gravatar_id":"","url":"https://api.github.com/users/rero","html_url":"https://github.com/rero","followers_url":"https://api.github.com/users/rero/followers","following_url":"https://api.github.com/users/rero/following{/other_user}","gists_url":"https://api.github.com/users/rero/gists{/gist_id}","starred_url":"https://api.github.com/users/rero/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rero/subscriptions","organizations_url":"https://api.github.com/users/rero/orgs","repos_url":"https://api.github.com/users/rero/repos","events_url":"https://api.github.com/users/rero/events{/privacy}","received_events_url":"https://api.github.com/users/rero/received_events","type":"Organization","site_admin":false},"repo":{"id":149142372,"node_id":"MDEwOlJlcG9zaXRvcnkxNDkxNDIzNzI=","name":"sonar","full_name":"rero/sonar","private":false,"owner":{"login":"rero","id":105555,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwNTU1NQ==","avatar_url":"https://avatars.githubusercontent.com/u/105555?v=4","gravatar_id":"","url":"https://api.github.com/users/rero","html_url":"https://github.com/rero","followers_url":"https://api.github.com/users/rero/followers","following_url":"https://api.github.com/users/rero/following{/other_user}","gists_url":"https://api.github.com/users/rero/gists{/gist_id}","starred_url":"https://api.github.com/users/rero/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rero/subscriptions","organizations_url":"https://api.github.com/users/rero/orgs","repos_url":"https://api.github.com/users/rero/repos","events_url":"https://api.github.com/users/rero/events{/privacy}","received_events_url":"https://api.github.com/users/rero/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/rero/sonar","description":"SONAR - Swiss Open Access Repository","fork":false,"url":"https://api.github.com/repos/rero/sonar","forks_url":"https://api.github.com/repos/rero/sonar/forks","keys_url":"https://api.github.com/repos/rero/sonar/keys{/key_id}","collaborators_url":"https://api.github.com/repos/rero/sonar/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/rero/sonar/teams","hooks_url":"https://api.github.com/repos/rero/sonar/hooks","issue_events_url":"https://api.github.com/repos/rero/sonar/issues/events{/number}","events_url":"https://api.github.com/repos/rero/sonar/events","assignees_url":"https://api.github.com/repos/rero/sonar/assignees{/user}","branches_url":"https://api.github.com/repos/rero/sonar/branches{/branch}","tags_url":"https://api.github.com/repos/rero/sonar/tags","blobs_url":"https://api.github.com/repos/rero/sonar/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/rero/sonar/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/rero/sonar/git/refs{/sha}","trees_url":"https://api.github.com/repos/rero/sonar/git/trees{/sha}","statuses_url":"https://api.github.com/repos/rero/sonar/statuses/{sha}","languages_url":"https://api.github.com/repos/rero/sonar/languages","stargazers_url":"https://api.github.com/repos/rero/sonar/stargazers","contributors_url":"https://api.github.com/repos/rero/sonar/contributors","subscribers_url":"https://api.github.com/repos/rero/sonar/subscribers","subscription_url":"https://api.github.com/repos/rero/sonar/subscription","commits_url":"https://api.github.com/repos/rero/sonar/commits{/sha}","git_commits_url":"https://api.github.com/repos/rero/sonar/git/commits{/sha}","comments_url":"https://api.github.com/repos/rero/sonar/comments{/number}","issue_comment_url":"https://api.github.com/repos/rero/sonar/issues/comments{/number}","contents_url":"https://api.github.com/repos/rero/sonar/contents/{+path}","compare_url":"https://api.github.com/repos/rero/sonar/compare/{base}...{head}","merges_url":"https://api.github.com/repos/rero/sonar/merges","archive_url":"https://api.github.com/repos/rero/sonar/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/rero/sonar/downloads","issues_url":"https://api.github.com/repos/rero/sonar/issues{/number}","pulls_url":"https://api.github.com/repos/rero/sonar/pulls{/number}","milestones_url":"https://api.github.com/repos/rero/sonar/milestones{/number}","notifications_url":"https://api.github.com/repos/rero/sonar/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/rero/sonar/labels{/name}","releases_url":"https://api.github.com/repos/rero/sonar/releases{/id}","deployments_url":"https://api.github.com/repos/rero/sonar/deployments","created_at":"2018-09-17T14:57:08Z","updated_at":"2021-07-21T07:34:28Z","pushed_at":"2021-07-21T08:00:02Z","git_url":"git://github.com/rero/sonar.git","ssh_url":"git@github.com:rero/sonar.git","clone_url":"https://github.com/rero/sonar.git","svn_url":"https://github.com/rero/sonar","homepage":null,"size":14184,"stargazers_count":9,"watchers_count":9,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":7,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":45,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0","node_id":"MDc6TGljZW5zZTE="},"forks":7,"open_issues":45,"watchers":9,"default_branch":"staging"}},"_links":{"self":{"href":"https://api.github.com/repos/rero/sonar/pulls/601"},"html":{"href":"https://github.com/rero/sonar/pull/601"},"issue":{"href":"https://api.github.com/repos/rero/sonar/issues/601"},"comments":{"href":"https://api.github.com/repos/rero/sonar/issues/601/comments"},"review_comments":{"href":"https://api.github.com/repos/rero/sonar/pulls/601/comments"},"review_comment":{"href":"https://api.github.com/repos/rero/sonar/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/rero/sonar/pulls/601/commits"},"statuses":{"href":"https://api.github.com/repos/rero/sonar/statuses/ee3d9739e8ebbc2d2168448b47a3a8694249d73f"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"sebastiendeleze","id":6112685,"node_id":"MDQ6VXNlcjYxMTI2ODU=","avatar_url":"https://avatars.githubusercontent.com/u/6112685?v=4","gravatar_id":"","url":"https://api.github.com/users/sebastiendeleze","html_url":"https://github.com/sebastiendeleze","followers_url":"https://api.github.com/users/sebastiendeleze/followers","following_url":"https://api.github.com/users/sebastiendeleze/following{/other_user}","gists_url":"https://api.github.com/users/sebastiendeleze/gists{/gist_id}","starred_url":"https://api.github.com/users/sebastiendeleze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sebastiendeleze/subscriptions","organizations_url":"https://api.github.com/users/sebastiendeleze/orgs","repos_url":"https://api.github.com/users/sebastiendeleze/repos","events_url":"https://api.github.com/users/sebastiendeleze/events{/privacy}","received_events_url":"https://api.github.com/users/sebastiendeleze/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":47,"deletions":2,"changed_files":5}},"public":true,"created_at":"2021-07-21T08:00:05Z","org":{"id":105555,"login":"rero","gravatar_id":"","url":"https://api.github.com/orgs/rero","avatar_url":"https://avatars.githubusercontent.com/u/105555?"}}
+{"id":"17245515843","type":"PushEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":388040553,"name":"thatjohn01/750801443","url":"https://api.github.com/repos/thatjohn01/750801443"},"payload":{"push_id":7562055600,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"5dec6a986bb7a4b1228ddc134058e8e3be9cb212","before":"91dfe44135c81afb50213f0b9053560745a5f60e","commits":[{"sha":"5dec6a986bb7a4b1228ddc134058e8e3be9cb212","author":{"name":"thatjohn01","email":"72eb81e66410b3da65da4cca287ce0578825ce64@users.noreply.github.com"},"message":"change README.md","distinct":true,"url":"https://api.github.com/repos/thatjohn01/750801443/commits/5dec6a986bb7a4b1228ddc134058e8e3be9cb212"}]},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17245515883","type":"PullRequestEvent","actor":{"id":43779561,"login":"marionnousvalentin","display_login":"marionnousvalentin","gravatar_id":"","url":"https://api.github.com/users/marionnousvalentin","avatar_url":"https://avatars.githubusercontent.com/u/43779561?"},"repo":{"id":299546852,"name":"pass-culture/pass-culture-app-native","url":"https://api.github.com/repos/pass-culture/pass-culture-app-native"},"payload":{"action":"closed","number":1370,"pull_request":{"url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/1370","id":693630697,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNjMwNjk3","html_url":"https://github.com/pass-culture/pass-culture-app-native/pull/1370","diff_url":"https://github.com/pass-culture/pass-culture-app-native/pull/1370.diff","patch_url":"https://github.com/pass-culture/pass-culture-app-native/pull/1370.patch","issue_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/1370","number":1370,"state":"closed","locked":false,"title":"[PC-10051] fix pressable areas","user":{"login":"marionnousvalentin","id":43779561,"node_id":"MDQ6VXNlcjQzNzc5NTYx","avatar_url":"https://avatars.githubusercontent.com/u/43779561?v=4","gravatar_id":"","url":"https://api.github.com/users/marionnousvalentin","html_url":"https://github.com/marionnousvalentin","followers_url":"https://api.github.com/users/marionnousvalentin/followers","following_url":"https://api.github.com/users/marionnousvalentin/following{/other_user}","gists_url":"https://api.github.com/users/marionnousvalentin/gists{/gist_id}","starred_url":"https://api.github.com/users/marionnousvalentin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marionnousvalentin/subscriptions","organizations_url":"https://api.github.com/users/marionnousvalentin/orgs","repos_url":"https://api.github.com/users/marionnousvalentin/repos","events_url":"https://api.github.com/users/marionnousvalentin/events{/privacy}","received_events_url":"https://api.github.com/users/marionnousvalentin/received_events","type":"User","site_admin":false},"body":"Link to JIRA ticket: https://passculture.atlassian.net/browse/PC-10051\r\n\r\n## Checklist\r\n\r\nI have:\r\n\r\n- [ ] Made sure the title of my PR follows the convention `[PC-XXX] <summary>`.\r\n- [ ] Made sure my feature is working on the relevant real / virtual devices.\r\n- [ ] Written **unit tests** for my feature.\r\n- [ ] Written **documentation on Notion** for my feature.\r\n- [ ] Added new reusable components to the AppComponents page and communicate to the team on slack\r\n- [ ] Added a **screenshot** for UI tickets.\r\n- [ ] Attached a **ticket number** for any added TODO/FIXME \\\r\n       (for tech tasks, give the best context about the TODO resolution: what/who/when).\r\n\r\n## Screenshots\r\n\r\navant : zone bleue cliquable (qui fermait la modale)\r\naprès : zone bleue non cliquable\r\n| \\*iOS - [Phone name] | \\*Android - [Phone name] | Tablet - [Phone name] | Little - [Phone name] |\r\n| -------------------- | :----------------------: | --------------------: | --------------------: |\r\n|                      |                          |           \r\n![image](https://user-images.githubusercontent.com/43779561/126448133-c44425d1-9e12-4efa-bbc5-c233fd7ac92d.png)\r\n       \r\n![image](https://user-images.githubusercontent.com/43779561/126449944-db72af33-976d-4551-aaa6-486dd9cd99aa.png)\r\n     |                       |\r\n\r\n## Deploy hard\r\n\r\nIf native code (ios/android) was modified, **after** the PR is merged, on the master branch, upgrade the **app version** (+1 patch):\r\n\r\n- if you want an hard deployment of the testing environment, use `yarn trigger:testing:deploy`\r\n","created_at":"2021-07-20T16:46:02Z","updated_at":"2021-07-21T08:00:05Z","closed_at":"2021-07-21T08:00:05Z","merged_at":"2021-07-21T08:00:05Z","merge_commit_sha":"a56c3a33603cccd4dd61bb8f6aad9946779fd1d5","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/1370/commits","review_comments_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/1370/comments","review_comment_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/comments{/number}","comments_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/1370/comments","statuses_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/statuses/7cf719b69fdfbe0debe65f1686bcc8fc59981964","head":{"label":"pass-culture:pc-10051-fix-cliclable-areas","ref":"pc-10051-fix-cliclable-areas","sha":"7cf719b69fdfbe0debe65f1686bcc8fc59981964","user":{"login":"pass-culture","id":52448870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUyNDQ4ODcw","avatar_url":"https://avatars.githubusercontent.com/u/52448870?v=4","gravatar_id":"","url":"https://api.github.com/users/pass-culture","html_url":"https://github.com/pass-culture","followers_url":"https://api.github.com/users/pass-culture/followers","following_url":"https://api.github.com/users/pass-culture/following{/other_user}","gists_url":"https://api.github.com/users/pass-culture/gists{/gist_id}","starred_url":"https://api.github.com/users/pass-culture/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pass-culture/subscriptions","organizations_url":"https://api.github.com/users/pass-culture/orgs","repos_url":"https://api.github.com/users/pass-culture/repos","events_url":"https://api.github.com/users/pass-culture/events{/privacy}","received_events_url":"https://api.github.com/users/pass-culture/received_events","type":"Organization","site_admin":false},"repo":{"id":299546852,"node_id":"MDEwOlJlcG9zaXRvcnkyOTk1NDY4NTI=","name":"pass-culture-app-native","full_name":"pass-culture/pass-culture-app-native","private":false,"owner":{"login":"pass-culture","id":52448870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUyNDQ4ODcw","avatar_url":"https://avatars.githubusercontent.com/u/52448870?v=4","gravatar_id":"","url":"https://api.github.com/users/pass-culture","html_url":"https://github.com/pass-culture","followers_url":"https://api.github.com/users/pass-culture/followers","following_url":"https://api.github.com/users/pass-culture/following{/other_user}","gists_url":"https://api.github.com/users/pass-culture/gists{/gist_id}","starred_url":"https://api.github.com/users/pass-culture/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pass-culture/subscriptions","organizations_url":"https://api.github.com/users/pass-culture/orgs","repos_url":"https://api.github.com/users/pass-culture/repos","events_url":"https://api.github.com/users/pass-culture/events{/privacy}","received_events_url":"https://api.github.com/users/pass-culture/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/pass-culture/pass-culture-app-native","description":null,"fork":false,"url":"https://api.github.com/repos/pass-culture/pass-culture-app-native","forks_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/forks","keys_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/keys{/key_id}","collaborators_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/teams","hooks_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/hooks","issue_events_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/events{/number}","events_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/events","assignees_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/assignees{/user}","branches_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/branches{/branch}","tags_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/tags","blobs_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/refs{/sha}","trees_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/trees{/sha}","statuses_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/statuses/{sha}","languages_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/languages","stargazers_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/stargazers","contributors_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/contributors","subscribers_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/subscribers","subscription_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/subscription","commits_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/commits{/sha}","git_commits_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/commits{/sha}","comments_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/comments{/number}","issue_comment_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/comments{/number}","contents_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/contents/{+path}","compare_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/compare/{base}...{head}","merges_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/merges","archive_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/downloads","issues_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues{/number}","pulls_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls{/number}","milestones_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/milestones{/number}","notifications_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/labels{/name}","releases_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/releases{/id}","deployments_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/deployments","created_at":"2020-09-29T08:03:18Z","updated_at":"2021-07-20T18:54:49Z","pushed_at":"2021-07-21T08:00:05Z","git_url":"git://github.com/pass-culture/pass-culture-app-native.git","ssh_url":"git@github.com:pass-culture/pass-culture-app-native.git","clone_url":"https://github.com/pass-culture/pass-culture-app-native.git","svn_url":"https://github.com/pass-culture/pass-culture-app-native","homepage":null,"size":83028,"stargazers_count":5,"watchers_count":5,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":null,"forks":2,"open_issues":2,"watchers":5,"default_branch":"master"}},"base":{"label":"pass-culture:master","ref":"master","sha":"0ea462362beb43548655992ae20847858ca73739","user":{"login":"pass-culture","id":52448870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUyNDQ4ODcw","avatar_url":"https://avatars.githubusercontent.com/u/52448870?v=4","gravatar_id":"","url":"https://api.github.com/users/pass-culture","html_url":"https://github.com/pass-culture","followers_url":"https://api.github.com/users/pass-culture/followers","following_url":"https://api.github.com/users/pass-culture/following{/other_user}","gists_url":"https://api.github.com/users/pass-culture/gists{/gist_id}","starred_url":"https://api.github.com/users/pass-culture/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pass-culture/subscriptions","organizations_url":"https://api.github.com/users/pass-culture/orgs","repos_url":"https://api.github.com/users/pass-culture/repos","events_url":"https://api.github.com/users/pass-culture/events{/privacy}","received_events_url":"https://api.github.com/users/pass-culture/received_events","type":"Organization","site_admin":false},"repo":{"id":299546852,"node_id":"MDEwOlJlcG9zaXRvcnkyOTk1NDY4NTI=","name":"pass-culture-app-native","full_name":"pass-culture/pass-culture-app-native","private":false,"owner":{"login":"pass-culture","id":52448870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUyNDQ4ODcw","avatar_url":"https://avatars.githubusercontent.com/u/52448870?v=4","gravatar_id":"","url":"https://api.github.com/users/pass-culture","html_url":"https://github.com/pass-culture","followers_url":"https://api.github.com/users/pass-culture/followers","following_url":"https://api.github.com/users/pass-culture/following{/other_user}","gists_url":"https://api.github.com/users/pass-culture/gists{/gist_id}","starred_url":"https://api.github.com/users/pass-culture/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pass-culture/subscriptions","organizations_url":"https://api.github.com/users/pass-culture/orgs","repos_url":"https://api.github.com/users/pass-culture/repos","events_url":"https://api.github.com/users/pass-culture/events{/privacy}","received_events_url":"https://api.github.com/users/pass-culture/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/pass-culture/pass-culture-app-native","description":null,"fork":false,"url":"https://api.github.com/repos/pass-culture/pass-culture-app-native","forks_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/forks","keys_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/keys{/key_id}","collaborators_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/teams","hooks_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/hooks","issue_events_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/events{/number}","events_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/events","assignees_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/assignees{/user}","branches_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/branches{/branch}","tags_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/tags","blobs_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/refs{/sha}","trees_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/trees{/sha}","statuses_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/statuses/{sha}","languages_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/languages","stargazers_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/stargazers","contributors_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/contributors","subscribers_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/subscribers","subscription_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/subscription","commits_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/commits{/sha}","git_commits_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/git/commits{/sha}","comments_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/comments{/number}","issue_comment_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/comments{/number}","contents_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/contents/{+path}","compare_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/compare/{base}...{head}","merges_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/merges","archive_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/downloads","issues_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues{/number}","pulls_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls{/number}","milestones_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/milestones{/number}","notifications_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/labels{/name}","releases_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/releases{/id}","deployments_url":"https://api.github.com/repos/pass-culture/pass-culture-app-native/deployments","created_at":"2020-09-29T08:03:18Z","updated_at":"2021-07-20T18:54:49Z","pushed_at":"2021-07-21T08:00:05Z","git_url":"git://github.com/pass-culture/pass-culture-app-native.git","ssh_url":"git@github.com:pass-culture/pass-culture-app-native.git","clone_url":"https://github.com/pass-culture/pass-culture-app-native.git","svn_url":"https://github.com/pass-culture/pass-culture-app-native","homepage":null,"size":83028,"stargazers_count":5,"watchers_count":5,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":null,"forks":2,"open_issues":2,"watchers":5,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/1370"},"html":{"href":"https://github.com/pass-culture/pass-culture-app-native/pull/1370"},"issue":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/1370"},"comments":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/issues/1370/comments"},"review_comments":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/1370/comments"},"review_comment":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/pulls/1370/commits"},"statuses":{"href":"https://api.github.com/repos/pass-culture/pass-culture-app-native/statuses/7cf719b69fdfbe0debe65f1686bcc8fc59981964"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"marionnousvalentin","id":43779561,"node_id":"MDQ6VXNlcjQzNzc5NTYx","avatar_url":"https://avatars.githubusercontent.com/u/43779561?v=4","gravatar_id":"","url":"https://api.github.com/users/marionnousvalentin","html_url":"https://github.com/marionnousvalentin","followers_url":"https://api.github.com/users/marionnousvalentin/followers","following_url":"https://api.github.com/users/marionnousvalentin/following{/other_user}","gists_url":"https://api.github.com/users/marionnousvalentin/gists{/gist_id}","starred_url":"https://api.github.com/users/marionnousvalentin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marionnousvalentin/subscriptions","organizations_url":"https://api.github.com/users/marionnousvalentin/orgs","repos_url":"https://api.github.com/users/marionnousvalentin/repos","events_url":"https://api.github.com/users/marionnousvalentin/events{/privacy}","received_events_url":"https://api.github.com/users/marionnousvalentin/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":2,"additions":69,"deletions":198,"changed_files":7}},"public":true,"created_at":"2021-07-21T08:00:06Z","org":{"id":52448870,"login":"pass-culture","gravatar_id":"","url":"https://api.github.com/orgs/pass-culture","avatar_url":"https://avatars.githubusercontent.com/u/52448870?"}}
+{"id":"17245515888","type":"PushEvent","actor":{"id":526307,"login":"endorama","display_login":"endorama","gravatar_id":"","url":"https://api.github.com/users/endorama","avatar_url":"https://avatars.githubusercontent.com/u/526307?"},"repo":{"id":16554739,"name":"elastic/beats","url":"https://api.github.com/repos/elastic/beats"},"payload":{"push_id":7562055563,"size":1,"distinct_size":1,"ref":"refs/heads/7.x","head":"9f0cc3a673a75248ad7d7e0005c0c5303fbae609","before":"3ec07ce1e40d808e2121809294b56118630a2afb","commits":[{"sha":"9f0cc3a673a75248ad7d7e0005c0c5303fbae609","author":{"name":"mergify[bot]","email":"b09a6ee808b67e98a221404e7aaa52e0398a4954@users.noreply.github.com"},"message":"[7.x](backport #26870) [gcp/billing] always quote table name identifier (#26932)\n\n(cherry picked from commit f731832277488ad5d3f6153adc19b8de679bbb01)\r\n\r\nCo-authored-by: endorama <526307+endorama@users.noreply.github.com>","distinct":true,"url":"https://api.github.com/repos/elastic/beats/commits/9f0cc3a673a75248ad7d7e0005c0c5303fbae609"}]},"public":true,"created_at":"2021-07-21T08:00:06Z","org":{"id":6764390,"login":"elastic","gravatar_id":"","url":"https://api.github.com/orgs/elastic","avatar_url":"https://avatars.githubusercontent.com/u/6764390?"}}
+{"id":"17245515908","type":"WatchEvent","actor":{"id":544296,"login":"nolar","display_login":"nolar","gravatar_id":"","url":"https://api.github.com/users/nolar","avatar_url":"https://avatars.githubusercontent.com/u/544296?"},"repo":{"id":197192691,"name":"thilp/aiopykube","url":"https://api.github.com/repos/thilp/aiopykube"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17245515916","type":"PushEvent","actor":{"id":1739,"login":"brentp","display_login":"brentp","gravatar_id":"","url":"https://api.github.com/users/brentp","avatar_url":"https://avatars.githubusercontent.com/u/1739?"},"repo":{"id":34803627,"name":"brentp/vcfanno","url":"https://api.github.com/repos/brentp/vcfanno"},"payload":{"push_id":7562055607,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"49ef5005c2c76073d7a15a5a030eba0ee5f46b3b","before":"6e5a12ab6b104fd00f627bc41d1a967d0929b5b9","commits":[{"sha":"49ef5005c2c76073d7a15a5a030eba0ee5f46b3b","author":{"name":"Brent Pedersen","email":"dbfb915fc4c51a9c36a01385c4753fb269356914@gmail.com"},"message":"non-zero exit when no args are given\n\nsee #143\n\nalso add go.mod","distinct":true,"url":"https://api.github.com/repos/brentp/vcfanno/commits/49ef5005c2c76073d7a15a5a030eba0ee5f46b3b"}]},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17245515928","type":"CreateEvent","actor":{"id":87752629,"login":"lucasgs55","display_login":"lucasgs55","gravatar_id":"","url":"https://api.github.com/users/lucasgs55","avatar_url":"https://avatars.githubusercontent.com/u/87752629?"},"repo":{"id":388040583,"name":"lucasgs55/lucastest","url":"https://api.github.com/repos/lucasgs55/lucastest"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":"Test","pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17245515932","type":"ForkEvent","actor":{"id":35286162,"login":"huiyueun","display_login":"huiyueun","gravatar_id":"","url":"https://api.github.com/users/huiyueun","avatar_url":"https://avatars.githubusercontent.com/u/35286162?"},"repo":{"id":384031496,"name":"nui-dali/NUITizenGallery","url":"https://api.github.com/repos/nui-dali/NUITizenGallery"},"payload":{"forkee":{"id":388040585,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNDA1ODU=","name":"NUITizenGallery","full_name":"huiyueun/NUITizenGallery","private":false,"owner":{"login":"huiyueun","id":35286162,"node_id":"MDQ6VXNlcjM1Mjg2MTYy","avatar_url":"https://avatars.githubusercontent.com/u/35286162?v=4","gravatar_id":"","url":"https://api.github.com/users/huiyueun","html_url":"https://github.com/huiyueun","followers_url":"https://api.github.com/users/huiyueun/followers","following_url":"https://api.github.com/users/huiyueun/following{/other_user}","gists_url":"https://api.github.com/users/huiyueun/gists{/gist_id}","starred_url":"https://api.github.com/users/huiyueun/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/huiyueun/subscriptions","organizations_url":"https://api.github.com/users/huiyueun/orgs","repos_url":"https://api.github.com/users/huiyueun/repos","events_url":"https://api.github.com/users/huiyueun/events{/privacy}","received_events_url":"https://api.github.com/users/huiyueun/received_events","type":"User","site_admin":false},"html_url":"https://github.com/huiyueun/NUITizenGallery","description":null,"fork":true,"url":"https://api.github.com/repos/huiyueun/NUITizenGallery","forks_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/forks","keys_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/keys{/key_id}","collaborators_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/teams","hooks_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/hooks","issue_events_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/issues/events{/number}","events_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/events","assignees_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/assignees{/user}","branches_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/branches{/branch}","tags_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/tags","blobs_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/git/refs{/sha}","trees_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/git/trees{/sha}","statuses_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/statuses/{sha}","languages_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/languages","stargazers_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/stargazers","contributors_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/contributors","subscribers_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/subscribers","subscription_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/subscription","commits_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/commits{/sha}","git_commits_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/git/commits{/sha}","comments_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/comments{/number}","issue_comment_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/issues/comments{/number}","contents_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/contents/{+path}","compare_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/compare/{base}...{head}","merges_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/merges","archive_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/downloads","issues_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/issues{/number}","pulls_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/pulls{/number}","milestones_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/milestones{/number}","notifications_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/labels{/name}","releases_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/releases{/id}","deployments_url":"https://api.github.com/repos/huiyueun/NUITizenGallery/deployments","created_at":"2021-07-21T08:00:05Z","updated_at":"2021-07-21T07:27:47Z","pushed_at":"2021-07-21T07:27:44Z","git_url":"git://github.com/huiyueun/NUITizenGallery.git","ssh_url":"git@github.com:huiyueun/NUITizenGallery.git","clone_url":"https://github.com/huiyueun/NUITizenGallery.git","svn_url":"https://github.com/huiyueun/NUITizenGallery","homepage":null,"size":4679,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T08:00:06Z","org":{"id":50942044,"login":"nui-dali","gravatar_id":"","url":"https://api.github.com/orgs/nui-dali","avatar_url":"https://avatars.githubusercontent.com/u/50942044?"}}
+{"id":"17245515937","type":"IssueCommentEvent","actor":{"id":27856297,"login":"dependabot-preview[bot]","display_login":"dependabot-preview","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview[bot]","avatar_url":"https://avatars.githubusercontent.com/u/27856297?"},"repo":{"id":337718447,"name":"Alberto-S-P/Boilerplate_Nextjs","url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/85","repository_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs","labels_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/85/labels{/name}","comments_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/85/comments","events_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/85/events","html_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/85","id":947390757,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkyMzc4NzY1","number":85,"title":"Bump @types/node from 14.14.25 to 16.3.3","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"labels":[{"id":2806840825,"node_id":"MDU6TGFiZWwyODA2ODQwODI1","url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-07-19T08:12:28Z","updated_at":"2021-07-21T08:00:06Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/pulls/85","html_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/85","diff_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/85.diff","patch_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/85.patch"},"body":"Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.25 to 16.3.3.\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=@types/node&package-manager=npm_and_yarn&previous-version=14.14.25&new-version=16.3.3)](https://dependabot.com/compatibility-score/?dependency-name=@types/node&package-manager=npm_and_yarn&previous-version=14.14.25&new-version=16.3.3)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n- `@dependabot badge me` will comment on this PR with code to add a \"Dependabot enabled\" badge to your readme\n\nAdditionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):\n- Update frequency (including time of day and day of week)\n- Pull request limits (per update run and/or open at any time)\n- Out-of-range updates (receive only lockfile updates, if desired)\n- Security updates (receive only security updates, if desired)\n\n\n\n</details>","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/comments/883977156","html_url":"https://github.com/Alberto-S-P/Boilerplate_Nextjs/pull/85#issuecomment-883977156","issue_url":"https://api.github.com/repos/Alberto-S-P/Boilerplate_Nextjs/issues/85","id":883977156,"node_id":"IC_kwDOFCEsr840sGvE","user":{"login":"dependabot-preview[bot]","id":27856297,"node_id":"MDM6Qm90Mjc4NTYyOTc=","avatar_url":"https://avatars.githubusercontent.com/in/2141?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot-preview%5Bbot%5D","html_url":"https://github.com/apps/dependabot-preview","followers_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot-preview%5Bbot%5D/received_events","type":"Bot","site_admin":false},"created_at":"2021-07-21T08:00:05Z","updated_at":"2021-07-21T08:00:05Z","author_association":"CONTRIBUTOR","body":"Superseded by #86.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17245515940","type":"CreateEvent","actor":{"id":44154733,"login":"sebastian-zieba","display_login":"sebastian-zieba","gravatar_id":"","url":"https://api.github.com/users/sebastian-zieba","avatar_url":"https://avatars.githubusercontent.com/u/44154733?"},"repo":{"id":388040577,"name":"sebastian-zieba/betaPic_timedelay","url":"https://api.github.com/repos/sebastian-zieba/betaPic_timedelay"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17245515942","type":"PushEvent","actor":{"id":85473844,"login":"carryimg1","display_login":"carryimg1","gravatar_id":"","url":"https://api.github.com/users/carryimg1","avatar_url":"https://avatars.githubusercontent.com/u/85473844?"},"repo":{"id":375075446,"name":"carryimg1/wanmei","url":"https://api.github.com/repos/carryimg1/wanmei"},"payload":{"push_id":7562055620,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f240a70c93b961994dbdb10ca928da60a1c57908","before":"70c10339e9b7dc9d14e785007a3a7e42d118d9f9","commits":[{"sha":"f240a70c93b961994dbdb10ca928da60a1c57908","author":{"name":"carryimg1","email":"5d7993012f205b5caf4c16cfd1216a723b81a33a@users.noreply.github.com"},"message":"2021-07-21 16:00:05 上传","distinct":true,"url":"https://api.github.com/repos/carryimg1/wanmei/commits/f240a70c93b961994dbdb10ca928da60a1c57908"}]},"public":true,"created_at":"2021-07-21T08:00:06Z"}
+{"id":"17246339245","type":"PushEvent","actor":{"id":58833107,"login":"hrhwve3553","display_login":"hrhwve3553","gravatar_id":"","url":"https://api.github.com/users/hrhwve3553","avatar_url":"https://avatars.githubusercontent.com/u/58833107?"},"repo":{"id":227725053,"name":"hrhwve3553/ntdtv","url":"https://api.github.com/repos/hrhwve3553/ntdtv"},"payload":{"push_id":7562450993,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"2eb4f5b9b48c2a1db54cad856021f0dad94bf211","before":"bee0038eedffb985a0b7f4cde5b6d8e430cf1bdc","commits":[{"sha":"2eb4f5b9b48c2a1db54cad856021f0dad94bf211","author":{"name":"hrhwve3553","email":"10135ac1af9bed4c0bec7c29db44050e24a097b2@users.noreply.github.com"},"message":"Update 442749_2.md","distinct":true,"url":"https://api.github.com/repos/hrhwve3553/ntdtv/commits/2eb4f5b9b48c2a1db54cad856021f0dad94bf211"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339251","type":"CreateEvent","actor":{"id":73915791,"login":"maria-canals","display_login":"maria-canals","gravatar_id":"","url":"https://api.github.com/users/maria-canals","avatar_url":"https://avatars.githubusercontent.com/u/73915791?"},"repo":{"id":388056469,"name":"maria-canals/React-from-0-to-expert","url":"https://api.github.com/repos/maria-canals/React-from-0-to-expert"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339255","type":"PullRequestReviewEvent","actor":{"id":35560568,"login":"robinmetral","display_login":"robinmetral","gravatar_id":"","url":"https://api.github.com/users/robinmetral","avatar_url":"https://avatars.githubusercontent.com/u/35560568?"},"repo":{"id":95433249,"name":"sumup-oss/circuit-ui","url":"https://api.github.com/repos/sumup-oss/circuit-ui"},"payload":{"action":"created","review":{"id":711326737,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzI2NzM3","user":{"login":"robinmetral","id":35560568,"node_id":"MDQ6VXNlcjM1NTYwNTY4","avatar_url":"https://avatars.githubusercontent.com/u/35560568?v=4","gravatar_id":"","url":"https://api.github.com/users/robinmetral","html_url":"https://github.com/robinmetral","followers_url":"https://api.github.com/users/robinmetral/followers","following_url":"https://api.github.com/users/robinmetral/following{/other_user}","gists_url":"https://api.github.com/users/robinmetral/gists{/gist_id}","starred_url":"https://api.github.com/users/robinmetral/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robinmetral/subscriptions","organizations_url":"https://api.github.com/users/robinmetral/orgs","repos_url":"https://api.github.com/users/robinmetral/repos","events_url":"https://api.github.com/users/robinmetral/events{/privacy}","received_events_url":"https://api.github.com/users/robinmetral/received_events","type":"User","site_admin":false},"body":"","commit_id":"cf36d9948e816632153fb51523a5890496f21e95","submitted_at":"2021-07-21T08:59:59Z","state":"commented","html_url":"https://github.com/sumup-oss/circuit-ui/pull/1047#pullrequestreview-711326737","pull_request_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/sumup-oss/circuit-ui/pull/1047#pullrequestreview-711326737"},"pull_request":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047"}}},"pull_request":{"url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047","id":693321734,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMzIxNzM0","html_url":"https://github.com/sumup-oss/circuit-ui/pull/1047","diff_url":"https://github.com/sumup-oss/circuit-ui/pull/1047.diff","patch_url":"https://github.com/sumup-oss/circuit-ui/pull/1047.patch","issue_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047","number":1047,"state":"open","locked":false,"title":"Improve the ImageInput for custom components","user":{"login":"connor-baer","id":11017722,"node_id":"MDQ6VXNlcjExMDE3NzIy","avatar_url":"https://avatars.githubusercontent.com/u/11017722?v=4","gravatar_id":"","url":"https://api.github.com/users/connor-baer","html_url":"https://github.com/connor-baer","followers_url":"https://api.github.com/users/connor-baer/followers","following_url":"https://api.github.com/users/connor-baer/following{/other_user}","gists_url":"https://api.github.com/users/connor-baer/gists{/gist_id}","starred_url":"https://api.github.com/users/connor-baer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/connor-baer/subscriptions","organizations_url":"https://api.github.com/users/connor-baer/orgs","repos_url":"https://api.github.com/users/connor-baer/repos","events_url":"https://api.github.com/users/connor-baer/events{/privacy}","received_events_url":"https://api.github.com/users/connor-baer/received_events","type":"User","site_admin":false},"body":"## Purpose\r\n\r\n@justman00 and I are trying to use the ImageInput inside the Popover component. When clicking the button to clear the image, the popover is closed. We confirmed that the popover is closed by the `useOutsideClick` hook. We suspect this happens because the clear button is removed from the DOM before the outside click handler is executed, so it doesn't know that the clear button was _inside_ the popover. In order to prevent this, we plan to use `event.stopPropagation()` in the `onClear` callback.\r\n\r\nThe second challenge we faced was using the ImageInput with the `identity` variant of the Avatar component which has a circular border radius. \r\n\r\n## Approach and changes\r\n\r\n- Pass the click event to the `onClear` prop of the ImageInput\r\n- Make the ImageInput's border-radius configurable through the addition of a `borderRadius` prop (I’m not happy about exposing such a verbose styling prop, but I don’t see a better way 😕)\r\n\r\n## Definition of done\r\n\r\n* [x] Development completed\r\n* [x] Reviewers assigned\r\n* [x] Unit and integration tests\r\n* [x] Meets minimum browser support\r\n* [x] Meets accessibility requirements\r\n","created_at":"2021-07-20T09:46:56Z","updated_at":"2021-07-21T08:59:59Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c9981e00b8873ffec048751cff67c1124ee77975","assignee":null,"assignees":[],"requested_reviewers":[{"login":"justman00","id":36477870,"node_id":"MDQ6VXNlcjM2NDc3ODcw","avatar_url":"https://avatars.githubusercontent.com/u/36477870?v=4","gravatar_id":"","url":"https://api.github.com/users/justman00","html_url":"https://github.com/justman00","followers_url":"https://api.github.com/users/justman00/followers","following_url":"https://api.github.com/users/justman00/following{/other_user}","gists_url":"https://api.github.com/users/justman00/gists{/gist_id}","starred_url":"https://api.github.com/users/justman00/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/justman00/subscriptions","organizations_url":"https://api.github.com/users/justman00/orgs","repos_url":"https://api.github.com/users/justman00/repos","events_url":"https://api.github.com/users/justman00/events{/privacy}","received_events_url":"https://api.github.com/users/justman00/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[{"id":634343322,"node_id":"MDU6TGFiZWw2MzQzNDMzMjI=","url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels/%F0%9F%90%9E%20bug","name":"🐞 bug","color":"E99695","default":false,"description":"Something isn't working as it should"},{"id":2913852247,"node_id":"MDU6TGFiZWwyOTEzODUyMjQ3","url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels/%F0%9F%97%82%20circuit-ui","name":"🗂 circuit-ui","color":"ededed","default":false,"description":null}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/commits","review_comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/comments","review_comment_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/comments{/number}","comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047/comments","statuses_url":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/cf36d9948e816632153fb51523a5890496f21e95","head":{"label":"sumup-oss:bugfix/imageinput-clear-event","ref":"bugfix/imageinput-clear-event","sha":"cf36d9948e816632153fb51523a5890496f21e95","user":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"repo":{"id":95433249,"node_id":"MDEwOlJlcG9zaXRvcnk5NTQzMzI0OQ==","name":"circuit-ui","full_name":"sumup-oss/circuit-ui","private":false,"owner":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sumup-oss/circuit-ui","description":"SumUp's component library for the web","fork":false,"url":"https://api.github.com/repos/sumup-oss/circuit-ui","forks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/forks","keys_url":"https://api.github.com/repos/sumup-oss/circuit-ui/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sumup-oss/circuit-ui/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sumup-oss/circuit-ui/teams","hooks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/hooks","issue_events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/events{/number}","events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/events","assignees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/assignees{/user}","branches_url":"https://api.github.com/repos/sumup-oss/circuit-ui/branches{/branch}","tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/tags","blobs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/refs{/sha}","trees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/{sha}","languages_url":"https://api.github.com/repos/sumup-oss/circuit-ui/languages","stargazers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/stargazers","contributors_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contributors","subscribers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscribers","subscription_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscription","commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/commits{/sha}","git_commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/commits{/sha}","comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/comments{/number}","issue_comment_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/comments{/number}","contents_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contents/{+path}","compare_url":"https://api.github.com/repos/sumup-oss/circuit-ui/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sumup-oss/circuit-ui/merges","archive_url":"https://api.github.com/repos/sumup-oss/circuit-ui/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sumup-oss/circuit-ui/downloads","issues_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues{/number}","pulls_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls{/number}","milestones_url":"https://api.github.com/repos/sumup-oss/circuit-ui/milestones{/number}","notifications_url":"https://api.github.com/repos/sumup-oss/circuit-ui/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels{/name}","releases_url":"https://api.github.com/repos/sumup-oss/circuit-ui/releases{/id}","deployments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/deployments","created_at":"2017-06-26T09:57:50Z","updated_at":"2021-07-21T08:01:20Z","pushed_at":"2021-07-20T15:49:41Z","git_url":"git://github.com/sumup-oss/circuit-ui.git","ssh_url":"git@github.com:sumup-oss/circuit-ui.git","clone_url":"https://github.com/sumup-oss/circuit-ui.git","svn_url":"https://github.com/sumup-oss/circuit-ui","homepage":"https://circuit.sumup.com","size":19657,"stargazers_count":664,"watchers_count":664,"language":"TypeScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":114,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":31,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":114,"open_issues":31,"watchers":664,"default_branch":"main"}},"base":{"label":"sumup-oss:main","ref":"main","sha":"96e03ac4055310a4c7afc72344e3331fa778cacf","user":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"repo":{"id":95433249,"node_id":"MDEwOlJlcG9zaXRvcnk5NTQzMzI0OQ==","name":"circuit-ui","full_name":"sumup-oss/circuit-ui","private":false,"owner":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sumup-oss/circuit-ui","description":"SumUp's component library for the web","fork":false,"url":"https://api.github.com/repos/sumup-oss/circuit-ui","forks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/forks","keys_url":"https://api.github.com/repos/sumup-oss/circuit-ui/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sumup-oss/circuit-ui/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sumup-oss/circuit-ui/teams","hooks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/hooks","issue_events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/events{/number}","events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/events","assignees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/assignees{/user}","branches_url":"https://api.github.com/repos/sumup-oss/circuit-ui/branches{/branch}","tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/tags","blobs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/refs{/sha}","trees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/{sha}","languages_url":"https://api.github.com/repos/sumup-oss/circuit-ui/languages","stargazers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/stargazers","contributors_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contributors","subscribers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscribers","subscription_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscription","commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/commits{/sha}","git_commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/commits{/sha}","comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/comments{/number}","issue_comment_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/comments{/number}","contents_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contents/{+path}","compare_url":"https://api.github.com/repos/sumup-oss/circuit-ui/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sumup-oss/circuit-ui/merges","archive_url":"https://api.github.com/repos/sumup-oss/circuit-ui/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sumup-oss/circuit-ui/downloads","issues_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues{/number}","pulls_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls{/number}","milestones_url":"https://api.github.com/repos/sumup-oss/circuit-ui/milestones{/number}","notifications_url":"https://api.github.com/repos/sumup-oss/circuit-ui/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels{/name}","releases_url":"https://api.github.com/repos/sumup-oss/circuit-ui/releases{/id}","deployments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/deployments","created_at":"2017-06-26T09:57:50Z","updated_at":"2021-07-21T08:01:20Z","pushed_at":"2021-07-20T15:49:41Z","git_url":"git://github.com/sumup-oss/circuit-ui.git","ssh_url":"git@github.com:sumup-oss/circuit-ui.git","clone_url":"https://github.com/sumup-oss/circuit-ui.git","svn_url":"https://github.com/sumup-oss/circuit-ui","homepage":"https://circuit.sumup.com","size":19657,"stargazers_count":664,"watchers_count":664,"language":"TypeScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":114,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":31,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":114,"open_issues":31,"watchers":664,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047"},"html":{"href":"https://github.com/sumup-oss/circuit-ui/pull/1047"},"issue":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047"},"comments":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047/comments"},"review_comments":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/comments"},"review_comment":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/commits"},"statuses":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/cf36d9948e816632153fb51523a5890496f21e95"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":47663619,"login":"sumup-oss","gravatar_id":"","url":"https://api.github.com/orgs/sumup-oss","avatar_url":"https://avatars.githubusercontent.com/u/47663619?"}}
+{"id":"17246339256","type":"PullRequestEvent","actor":{"id":29139614,"login":"renovate[bot]","display_login":"renovate","gravatar_id":"","url":"https://api.github.com/users/renovate[bot]","avatar_url":"https://avatars.githubusercontent.com/u/29139614?"},"repo":{"id":388000702,"name":"egarciahz/sgen-client","url":"https://api.github.com/repos/egarciahz/sgen-client"},"payload":{"action":"opened","number":4,"pull_request":{"url":"https://api.github.com/repos/egarciahz/sgen-client/pulls/4","id":694185695,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1Njk1","html_url":"https://github.com/egarciahz/sgen-client/pull/4","diff_url":"https://github.com/egarciahz/sgen-client/pull/4.diff","patch_url":"https://github.com/egarciahz/sgen-client/pull/4.patch","issue_url":"https://api.github.com/repos/egarciahz/sgen-client/issues/4","number":4,"state":"open","locked":false,"title":"Pin dependencies","user":{"login":"renovate[bot]","id":29139614,"node_id":"MDM6Qm90MjkxMzk2MTQ=","avatar_url":"https://avatars.githubusercontent.com/in/2740?v=4","gravatar_id":"","url":"https://api.github.com/users/renovate%5Bbot%5D","html_url":"https://github.com/apps/renovate","followers_url":"https://api.github.com/users/renovate%5Bbot%5D/followers","following_url":"https://api.github.com/users/renovate%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/renovate%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/renovate%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/renovate%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/renovate%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/renovate%5Bbot%5D/repos","events_url":"https://api.github.com/users/renovate%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/renovate%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [react](https://reactjs.org/) ([source](https://togithub.com/facebook/react)) | dependencies | pin | [`^17.0.2` -> `17.0.2`](https://renovatebot.com/diffs/npm/react/17.0.2/17.0.2) |\n| [react-dom](https://reactjs.org/) ([source](https://togithub.com/facebook/react)) | dependencies | pin | [`^17.0.2` -> `17.0.2`](https://renovatebot.com/diffs/npm/react-dom/17.0.2/17.0.2) |\n\n📌 **Important**: Renovate will wait until you have merged this Pin PR before creating any *upgrade* PRs for the affected packages. Add the preset `:preserveSemverRanges` to your config if you instead don't wish to pin dependencies.\n\n---\n\n### Configuration\n\n📅 **Schedule**: At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\n\n---\n\nThis PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/egarciahz/sgen-client).","created_at":"2021-07-21T08:59:59Z","updated_at":"2021-07-21T08:59:59Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/egarciahz/sgen-client/pulls/4/commits","review_comments_url":"https://api.github.com/repos/egarciahz/sgen-client/pulls/4/comments","review_comment_url":"https://api.github.com/repos/egarciahz/sgen-client/pulls/comments{/number}","comments_url":"https://api.github.com/repos/egarciahz/sgen-client/issues/4/comments","statuses_url":"https://api.github.com/repos/egarciahz/sgen-client/statuses/2898832468e2a664e528515708c08e89d718981e","head":{"label":"egarciahz:renovate/react-monorepo","ref":"renovate/react-monorepo","sha":"2898832468e2a664e528515708c08e89d718981e","user":{"login":"egarciahz","id":44587679,"node_id":"MDQ6VXNlcjQ0NTg3Njc5","avatar_url":"https://avatars.githubusercontent.com/u/44587679?v=4","gravatar_id":"","url":"https://api.github.com/users/egarciahz","html_url":"https://github.com/egarciahz","followers_url":"https://api.github.com/users/egarciahz/followers","following_url":"https://api.github.com/users/egarciahz/following{/other_user}","gists_url":"https://api.github.com/users/egarciahz/gists{/gist_id}","starred_url":"https://api.github.com/users/egarciahz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/egarciahz/subscriptions","organizations_url":"https://api.github.com/users/egarciahz/orgs","repos_url":"https://api.github.com/users/egarciahz/repos","events_url":"https://api.github.com/users/egarciahz/events{/privacy}","received_events_url":"https://api.github.com/users/egarciahz/received_events","type":"User","site_admin":false},"repo":{"id":388000702,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMDA3MDI=","name":"sgen-client","full_name":"egarciahz/sgen-client","private":false,"owner":{"login":"egarciahz","id":44587679,"node_id":"MDQ6VXNlcjQ0NTg3Njc5","avatar_url":"https://avatars.githubusercontent.com/u/44587679?v=4","gravatar_id":"","url":"https://api.github.com/users/egarciahz","html_url":"https://github.com/egarciahz","followers_url":"https://api.github.com/users/egarciahz/followers","following_url":"https://api.github.com/users/egarciahz/following{/other_user}","gists_url":"https://api.github.com/users/egarciahz/gists{/gist_id}","starred_url":"https://api.github.com/users/egarciahz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/egarciahz/subscriptions","organizations_url":"https://api.github.com/users/egarciahz/orgs","repos_url":"https://api.github.com/users/egarciahz/repos","events_url":"https://api.github.com/users/egarciahz/events{/privacy}","received_events_url":"https://api.github.com/users/egarciahz/received_events","type":"User","site_admin":false},"html_url":"https://github.com/egarciahz/sgen-client","description":"web client for sgen server project","fork":false,"url":"https://api.github.com/repos/egarciahz/sgen-client","forks_url":"https://api.github.com/repos/egarciahz/sgen-client/forks","keys_url":"https://api.github.com/repos/egarciahz/sgen-client/keys{/key_id}","collaborators_url":"https://api.github.com/repos/egarciahz/sgen-client/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/egarciahz/sgen-client/teams","hooks_url":"https://api.github.com/repos/egarciahz/sgen-client/hooks","issue_events_url":"https://api.github.com/repos/egarciahz/sgen-client/issues/events{/number}","events_url":"https://api.github.com/repos/egarciahz/sgen-client/events","assignees_url":"https://api.github.com/repos/egarciahz/sgen-client/assignees{/user}","branches_url":"https://api.github.com/repos/egarciahz/sgen-client/branches{/branch}","tags_url":"https://api.github.com/repos/egarciahz/sgen-client/tags","blobs_url":"https://api.github.com/repos/egarciahz/sgen-client/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/egarciahz/sgen-client/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/egarciahz/sgen-client/git/refs{/sha}","trees_url":"https://api.github.com/repos/egarciahz/sgen-client/git/trees{/sha}","statuses_url":"https://api.github.com/repos/egarciahz/sgen-client/statuses/{sha}","languages_url":"https://api.github.com/repos/egarciahz/sgen-client/languages","stargazers_url":"https://api.github.com/repos/egarciahz/sgen-client/stargazers","contributors_url":"https://api.github.com/repos/egarciahz/sgen-client/contributors","subscribers_url":"https://api.github.com/repos/egarciahz/sgen-client/subscribers","subscription_url":"https://api.github.com/repos/egarciahz/sgen-client/subscription","commits_url":"https://api.github.com/repos/egarciahz/sgen-client/commits{/sha}","git_commits_url":"https://api.github.com/repos/egarciahz/sgen-client/git/commits{/sha}","comments_url":"https://api.github.com/repos/egarciahz/sgen-client/comments{/number}","issue_comment_url":"https://api.github.com/repos/egarciahz/sgen-client/issues/comments{/number}","contents_url":"https://api.github.com/repos/egarciahz/sgen-client/contents/{+path}","compare_url":"https://api.github.com/repos/egarciahz/sgen-client/compare/{base}...{head}","merges_url":"https://api.github.com/repos/egarciahz/sgen-client/merges","archive_url":"https://api.github.com/repos/egarciahz/sgen-client/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/egarciahz/sgen-client/downloads","issues_url":"https://api.github.com/repos/egarciahz/sgen-client/issues{/number}","pulls_url":"https://api.github.com/repos/egarciahz/sgen-client/pulls{/number}","milestones_url":"https://api.github.com/repos/egarciahz/sgen-client/milestones{/number}","notifications_url":"https://api.github.com/repos/egarciahz/sgen-client/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/egarciahz/sgen-client/labels{/name}","releases_url":"https://api.github.com/repos/egarciahz/sgen-client/releases{/id}","deployments_url":"https://api.github.com/repos/egarciahz/sgen-client/deployments","created_at":"2021-07-21T05:10:50Z","updated_at":"2021-07-21T05:12:40Z","pushed_at":"2021-07-21T08:59:59Z","git_url":"git://github.com/egarciahz/sgen-client.git","ssh_url":"git@github.com:egarciahz/sgen-client.git","clone_url":"https://github.com/egarciahz/sgen-client.git","svn_url":"https://github.com/egarciahz/sgen-client","homepage":null,"size":295,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":null,"forks":0,"open_issues":4,"watchers":0,"default_branch":"master"}},"base":{"label":"egarciahz:master","ref":"master","sha":"f6dd3adb54202c85ae1981e1a31cae1e66dd9ff5","user":{"login":"egarciahz","id":44587679,"node_id":"MDQ6VXNlcjQ0NTg3Njc5","avatar_url":"https://avatars.githubusercontent.com/u/44587679?v=4","gravatar_id":"","url":"https://api.github.com/users/egarciahz","html_url":"https://github.com/egarciahz","followers_url":"https://api.github.com/users/egarciahz/followers","following_url":"https://api.github.com/users/egarciahz/following{/other_user}","gists_url":"https://api.github.com/users/egarciahz/gists{/gist_id}","starred_url":"https://api.github.com/users/egarciahz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/egarciahz/subscriptions","organizations_url":"https://api.github.com/users/egarciahz/orgs","repos_url":"https://api.github.com/users/egarciahz/repos","events_url":"https://api.github.com/users/egarciahz/events{/privacy}","received_events_url":"https://api.github.com/users/egarciahz/received_events","type":"User","site_admin":false},"repo":{"id":388000702,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwMDA3MDI=","name":"sgen-client","full_name":"egarciahz/sgen-client","private":false,"owner":{"login":"egarciahz","id":44587679,"node_id":"MDQ6VXNlcjQ0NTg3Njc5","avatar_url":"https://avatars.githubusercontent.com/u/44587679?v=4","gravatar_id":"","url":"https://api.github.com/users/egarciahz","html_url":"https://github.com/egarciahz","followers_url":"https://api.github.com/users/egarciahz/followers","following_url":"https://api.github.com/users/egarciahz/following{/other_user}","gists_url":"https://api.github.com/users/egarciahz/gists{/gist_id}","starred_url":"https://api.github.com/users/egarciahz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/egarciahz/subscriptions","organizations_url":"https://api.github.com/users/egarciahz/orgs","repos_url":"https://api.github.com/users/egarciahz/repos","events_url":"https://api.github.com/users/egarciahz/events{/privacy}","received_events_url":"https://api.github.com/users/egarciahz/received_events","type":"User","site_admin":false},"html_url":"https://github.com/egarciahz/sgen-client","description":"web client for sgen server project","fork":false,"url":"https://api.github.com/repos/egarciahz/sgen-client","forks_url":"https://api.github.com/repos/egarciahz/sgen-client/forks","keys_url":"https://api.github.com/repos/egarciahz/sgen-client/keys{/key_id}","collaborators_url":"https://api.github.com/repos/egarciahz/sgen-client/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/egarciahz/sgen-client/teams","hooks_url":"https://api.github.com/repos/egarciahz/sgen-client/hooks","issue_events_url":"https://api.github.com/repos/egarciahz/sgen-client/issues/events{/number}","events_url":"https://api.github.com/repos/egarciahz/sgen-client/events","assignees_url":"https://api.github.com/repos/egarciahz/sgen-client/assignees{/user}","branches_url":"https://api.github.com/repos/egarciahz/sgen-client/branches{/branch}","tags_url":"https://api.github.com/repos/egarciahz/sgen-client/tags","blobs_url":"https://api.github.com/repos/egarciahz/sgen-client/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/egarciahz/sgen-client/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/egarciahz/sgen-client/git/refs{/sha}","trees_url":"https://api.github.com/repos/egarciahz/sgen-client/git/trees{/sha}","statuses_url":"https://api.github.com/repos/egarciahz/sgen-client/statuses/{sha}","languages_url":"https://api.github.com/repos/egarciahz/sgen-client/languages","stargazers_url":"https://api.github.com/repos/egarciahz/sgen-client/stargazers","contributors_url":"https://api.github.com/repos/egarciahz/sgen-client/contributors","subscribers_url":"https://api.github.com/repos/egarciahz/sgen-client/subscribers","subscription_url":"https://api.github.com/repos/egarciahz/sgen-client/subscription","commits_url":"https://api.github.com/repos/egarciahz/sgen-client/commits{/sha}","git_commits_url":"https://api.github.com/repos/egarciahz/sgen-client/git/commits{/sha}","comments_url":"https://api.github.com/repos/egarciahz/sgen-client/comments{/number}","issue_comment_url":"https://api.github.com/repos/egarciahz/sgen-client/issues/comments{/number}","contents_url":"https://api.github.com/repos/egarciahz/sgen-client/contents/{+path}","compare_url":"https://api.github.com/repos/egarciahz/sgen-client/compare/{base}...{head}","merges_url":"https://api.github.com/repos/egarciahz/sgen-client/merges","archive_url":"https://api.github.com/repos/egarciahz/sgen-client/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/egarciahz/sgen-client/downloads","issues_url":"https://api.github.com/repos/egarciahz/sgen-client/issues{/number}","pulls_url":"https://api.github.com/repos/egarciahz/sgen-client/pulls{/number}","milestones_url":"https://api.github.com/repos/egarciahz/sgen-client/milestones{/number}","notifications_url":"https://api.github.com/repos/egarciahz/sgen-client/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/egarciahz/sgen-client/labels{/name}","releases_url":"https://api.github.com/repos/egarciahz/sgen-client/releases{/id}","deployments_url":"https://api.github.com/repos/egarciahz/sgen-client/deployments","created_at":"2021-07-21T05:10:50Z","updated_at":"2021-07-21T05:12:40Z","pushed_at":"2021-07-21T08:59:59Z","git_url":"git://github.com/egarciahz/sgen-client.git","ssh_url":"git@github.com:egarciahz/sgen-client.git","clone_url":"https://github.com/egarciahz/sgen-client.git","svn_url":"https://github.com/egarciahz/sgen-client","homepage":null,"size":295,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":null,"forks":0,"open_issues":4,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/egarciahz/sgen-client/pulls/4"},"html":{"href":"https://github.com/egarciahz/sgen-client/pull/4"},"issue":{"href":"https://api.github.com/repos/egarciahz/sgen-client/issues/4"},"comments":{"href":"https://api.github.com/repos/egarciahz/sgen-client/issues/4/comments"},"review_comments":{"href":"https://api.github.com/repos/egarciahz/sgen-client/pulls/4/comments"},"review_comment":{"href":"https://api.github.com/repos/egarciahz/sgen-client/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/egarciahz/sgen-client/pulls/4/commits"},"statuses":{"href":"https://api.github.com/repos/egarciahz/sgen-client/statuses/2898832468e2a664e528515708c08e89d718981e"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":2,"deletions":2,"changed_files":1}},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339259","type":"PullRequestReviewEvent","actor":{"id":35560568,"login":"robinmetral","display_login":"robinmetral","gravatar_id":"","url":"https://api.github.com/users/robinmetral","avatar_url":"https://avatars.githubusercontent.com/u/35560568?"},"repo":{"id":95433249,"name":"sumup-oss/circuit-ui","url":"https://api.github.com/repos/sumup-oss/circuit-ui"},"payload":{"action":"created","review":{"id":711326737,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExMzI2NzM3","user":{"login":"robinmetral","id":35560568,"node_id":"MDQ6VXNlcjM1NTYwNTY4","avatar_url":"https://avatars.githubusercontent.com/u/35560568?v=4","gravatar_id":"","url":"https://api.github.com/users/robinmetral","html_url":"https://github.com/robinmetral","followers_url":"https://api.github.com/users/robinmetral/followers","following_url":"https://api.github.com/users/robinmetral/following{/other_user}","gists_url":"https://api.github.com/users/robinmetral/gists{/gist_id}","starred_url":"https://api.github.com/users/robinmetral/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robinmetral/subscriptions","organizations_url":"https://api.github.com/users/robinmetral/orgs","repos_url":"https://api.github.com/users/robinmetral/repos","events_url":"https://api.github.com/users/robinmetral/events{/privacy}","received_events_url":"https://api.github.com/users/robinmetral/received_events","type":"User","site_admin":false},"body":"","commit_id":"cf36d9948e816632153fb51523a5890496f21e95","submitted_at":"2021-07-21T08:59:59Z","state":"commented","html_url":"https://github.com/sumup-oss/circuit-ui/pull/1047#pullrequestreview-711326737","pull_request_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/sumup-oss/circuit-ui/pull/1047#pullrequestreview-711326737"},"pull_request":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047"}}},"pull_request":{"url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047","id":693321734,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMzIxNzM0","html_url":"https://github.com/sumup-oss/circuit-ui/pull/1047","diff_url":"https://github.com/sumup-oss/circuit-ui/pull/1047.diff","patch_url":"https://github.com/sumup-oss/circuit-ui/pull/1047.patch","issue_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047","number":1047,"state":"open","locked":false,"title":"Improve the ImageInput for custom components","user":{"login":"connor-baer","id":11017722,"node_id":"MDQ6VXNlcjExMDE3NzIy","avatar_url":"https://avatars.githubusercontent.com/u/11017722?v=4","gravatar_id":"","url":"https://api.github.com/users/connor-baer","html_url":"https://github.com/connor-baer","followers_url":"https://api.github.com/users/connor-baer/followers","following_url":"https://api.github.com/users/connor-baer/following{/other_user}","gists_url":"https://api.github.com/users/connor-baer/gists{/gist_id}","starred_url":"https://api.github.com/users/connor-baer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/connor-baer/subscriptions","organizations_url":"https://api.github.com/users/connor-baer/orgs","repos_url":"https://api.github.com/users/connor-baer/repos","events_url":"https://api.github.com/users/connor-baer/events{/privacy}","received_events_url":"https://api.github.com/users/connor-baer/received_events","type":"User","site_admin":false},"body":"## Purpose\r\n\r\n@justman00 and I are trying to use the ImageInput inside the Popover component. When clicking the button to clear the image, the popover is closed. We confirmed that the popover is closed by the `useOutsideClick` hook. We suspect this happens because the clear button is removed from the DOM before the outside click handler is executed, so it doesn't know that the clear button was _inside_ the popover. In order to prevent this, we plan to use `event.stopPropagation()` in the `onClear` callback.\r\n\r\nThe second challenge we faced was using the ImageInput with the `identity` variant of the Avatar component which has a circular border radius. \r\n\r\n## Approach and changes\r\n\r\n- Pass the click event to the `onClear` prop of the ImageInput\r\n- Make the ImageInput's border-radius configurable through the addition of a `borderRadius` prop (I’m not happy about exposing such a verbose styling prop, but I don’t see a better way 😕)\r\n\r\n## Definition of done\r\n\r\n* [x] Development completed\r\n* [x] Reviewers assigned\r\n* [x] Unit and integration tests\r\n* [x] Meets minimum browser support\r\n* [x] Meets accessibility requirements\r\n","created_at":"2021-07-20T09:46:56Z","updated_at":"2021-07-21T08:59:59Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c9981e00b8873ffec048751cff67c1124ee77975","assignee":null,"assignees":[],"requested_reviewers":[{"login":"justman00","id":36477870,"node_id":"MDQ6VXNlcjM2NDc3ODcw","avatar_url":"https://avatars.githubusercontent.com/u/36477870?v=4","gravatar_id":"","url":"https://api.github.com/users/justman00","html_url":"https://github.com/justman00","followers_url":"https://api.github.com/users/justman00/followers","following_url":"https://api.github.com/users/justman00/following{/other_user}","gists_url":"https://api.github.com/users/justman00/gists{/gist_id}","starred_url":"https://api.github.com/users/justman00/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/justman00/subscriptions","organizations_url":"https://api.github.com/users/justman00/orgs","repos_url":"https://api.github.com/users/justman00/repos","events_url":"https://api.github.com/users/justman00/events{/privacy}","received_events_url":"https://api.github.com/users/justman00/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[{"id":634343322,"node_id":"MDU6TGFiZWw2MzQzNDMzMjI=","url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels/%F0%9F%90%9E%20bug","name":"🐞 bug","color":"E99695","default":false,"description":"Something isn't working as it should"},{"id":2913852247,"node_id":"MDU6TGFiZWwyOTEzODUyMjQ3","url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels/%F0%9F%97%82%20circuit-ui","name":"🗂 circuit-ui","color":"ededed","default":false,"description":null}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/commits","review_comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/comments","review_comment_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/comments{/number}","comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047/comments","statuses_url":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/cf36d9948e816632153fb51523a5890496f21e95","head":{"label":"sumup-oss:bugfix/imageinput-clear-event","ref":"bugfix/imageinput-clear-event","sha":"cf36d9948e816632153fb51523a5890496f21e95","user":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"repo":{"id":95433249,"node_id":"MDEwOlJlcG9zaXRvcnk5NTQzMzI0OQ==","name":"circuit-ui","full_name":"sumup-oss/circuit-ui","private":false,"owner":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sumup-oss/circuit-ui","description":"SumUp's component library for the web","fork":false,"url":"https://api.github.com/repos/sumup-oss/circuit-ui","forks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/forks","keys_url":"https://api.github.com/repos/sumup-oss/circuit-ui/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sumup-oss/circuit-ui/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sumup-oss/circuit-ui/teams","hooks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/hooks","issue_events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/events{/number}","events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/events","assignees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/assignees{/user}","branches_url":"https://api.github.com/repos/sumup-oss/circuit-ui/branches{/branch}","tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/tags","blobs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/refs{/sha}","trees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/{sha}","languages_url":"https://api.github.com/repos/sumup-oss/circuit-ui/languages","stargazers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/stargazers","contributors_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contributors","subscribers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscribers","subscription_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscription","commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/commits{/sha}","git_commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/commits{/sha}","comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/comments{/number}","issue_comment_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/comments{/number}","contents_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contents/{+path}","compare_url":"https://api.github.com/repos/sumup-oss/circuit-ui/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sumup-oss/circuit-ui/merges","archive_url":"https://api.github.com/repos/sumup-oss/circuit-ui/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sumup-oss/circuit-ui/downloads","issues_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues{/number}","pulls_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls{/number}","milestones_url":"https://api.github.com/repos/sumup-oss/circuit-ui/milestones{/number}","notifications_url":"https://api.github.com/repos/sumup-oss/circuit-ui/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels{/name}","releases_url":"https://api.github.com/repos/sumup-oss/circuit-ui/releases{/id}","deployments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/deployments","created_at":"2017-06-26T09:57:50Z","updated_at":"2021-07-21T08:01:20Z","pushed_at":"2021-07-20T15:49:41Z","git_url":"git://github.com/sumup-oss/circuit-ui.git","ssh_url":"git@github.com:sumup-oss/circuit-ui.git","clone_url":"https://github.com/sumup-oss/circuit-ui.git","svn_url":"https://github.com/sumup-oss/circuit-ui","homepage":"https://circuit.sumup.com","size":19657,"stargazers_count":664,"watchers_count":664,"language":"TypeScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":114,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":31,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":114,"open_issues":31,"watchers":664,"default_branch":"main"}},"base":{"label":"sumup-oss:main","ref":"main","sha":"96e03ac4055310a4c7afc72344e3331fa778cacf","user":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"repo":{"id":95433249,"node_id":"MDEwOlJlcG9zaXRvcnk5NTQzMzI0OQ==","name":"circuit-ui","full_name":"sumup-oss/circuit-ui","private":false,"owner":{"login":"sumup-oss","id":47663619,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ3NjYzNjE5","avatar_url":"https://avatars.githubusercontent.com/u/47663619?v=4","gravatar_id":"","url":"https://api.github.com/users/sumup-oss","html_url":"https://github.com/sumup-oss","followers_url":"https://api.github.com/users/sumup-oss/followers","following_url":"https://api.github.com/users/sumup-oss/following{/other_user}","gists_url":"https://api.github.com/users/sumup-oss/gists{/gist_id}","starred_url":"https://api.github.com/users/sumup-oss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sumup-oss/subscriptions","organizations_url":"https://api.github.com/users/sumup-oss/orgs","repos_url":"https://api.github.com/users/sumup-oss/repos","events_url":"https://api.github.com/users/sumup-oss/events{/privacy}","received_events_url":"https://api.github.com/users/sumup-oss/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sumup-oss/circuit-ui","description":"SumUp's component library for the web","fork":false,"url":"https://api.github.com/repos/sumup-oss/circuit-ui","forks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/forks","keys_url":"https://api.github.com/repos/sumup-oss/circuit-ui/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sumup-oss/circuit-ui/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sumup-oss/circuit-ui/teams","hooks_url":"https://api.github.com/repos/sumup-oss/circuit-ui/hooks","issue_events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/events{/number}","events_url":"https://api.github.com/repos/sumup-oss/circuit-ui/events","assignees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/assignees{/user}","branches_url":"https://api.github.com/repos/sumup-oss/circuit-ui/branches{/branch}","tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/tags","blobs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/refs{/sha}","trees_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/{sha}","languages_url":"https://api.github.com/repos/sumup-oss/circuit-ui/languages","stargazers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/stargazers","contributors_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contributors","subscribers_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscribers","subscription_url":"https://api.github.com/repos/sumup-oss/circuit-ui/subscription","commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/commits{/sha}","git_commits_url":"https://api.github.com/repos/sumup-oss/circuit-ui/git/commits{/sha}","comments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/comments{/number}","issue_comment_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/comments{/number}","contents_url":"https://api.github.com/repos/sumup-oss/circuit-ui/contents/{+path}","compare_url":"https://api.github.com/repos/sumup-oss/circuit-ui/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sumup-oss/circuit-ui/merges","archive_url":"https://api.github.com/repos/sumup-oss/circuit-ui/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sumup-oss/circuit-ui/downloads","issues_url":"https://api.github.com/repos/sumup-oss/circuit-ui/issues{/number}","pulls_url":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls{/number}","milestones_url":"https://api.github.com/repos/sumup-oss/circuit-ui/milestones{/number}","notifications_url":"https://api.github.com/repos/sumup-oss/circuit-ui/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sumup-oss/circuit-ui/labels{/name}","releases_url":"https://api.github.com/repos/sumup-oss/circuit-ui/releases{/id}","deployments_url":"https://api.github.com/repos/sumup-oss/circuit-ui/deployments","created_at":"2017-06-26T09:57:50Z","updated_at":"2021-07-21T08:01:20Z","pushed_at":"2021-07-20T15:49:41Z","git_url":"git://github.com/sumup-oss/circuit-ui.git","ssh_url":"git@github.com:sumup-oss/circuit-ui.git","clone_url":"https://github.com/sumup-oss/circuit-ui.git","svn_url":"https://github.com/sumup-oss/circuit-ui","homepage":"https://circuit.sumup.com","size":19657,"stargazers_count":664,"watchers_count":664,"language":"TypeScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":114,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":31,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":114,"open_issues":31,"watchers":664,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047"},"html":{"href":"https://github.com/sumup-oss/circuit-ui/pull/1047"},"issue":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047"},"comments":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/issues/1047/comments"},"review_comments":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/comments"},"review_comment":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/pulls/1047/commits"},"statuses":{"href":"https://api.github.com/repos/sumup-oss/circuit-ui/statuses/cf36d9948e816632153fb51523a5890496f21e95"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":47663619,"login":"sumup-oss","gravatar_id":"","url":"https://api.github.com/orgs/sumup-oss","avatar_url":"https://avatars.githubusercontent.com/u/47663619?"}}
+{"id":"17246339270","type":"CreateEvent","actor":{"id":19872105,"login":"Sahil-Gulati","display_login":"Sahil-Gulati","gravatar_id":"","url":"https://api.github.com/users/Sahil-Gulati","avatar_url":"https://avatars.githubusercontent.com/u/19872105?"},"repo":{"id":388056956,"name":"Sahil-Gulati/backstage-demo","url":"https://api.github.com/repos/Sahil-Gulati/backstage-demo"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339283","type":"PushEvent","actor":{"id":36457245,"login":"t3dkich","display_login":"t3dkich","gravatar_id":"","url":"https://api.github.com/users/t3dkich","avatar_url":"https://avatars.githubusercontent.com/u/36457245?"},"repo":{"id":388014103,"name":"weichain/hydraswap-token-list","url":"https://api.github.com/repos/weichain/hydraswap-token-list"},"payload":{"push_id":7562450996,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"5b557eef0e779b803820806a152bd19b788a94b7","before":"24de463b55a3eaf80b0579845d77391945771d85","commits":[{"sha":"5b557eef0e779b803820806a152bd19b788a94b7","author":{"name":"Teodor Zafirov","email":"674b4d4f08a012bd5744abc82614b90bb0de19bd@users.noreply.github.com"},"message":"added hydraswap-list json file and token icons","distinct":true,"url":"https://api.github.com/repos/weichain/hydraswap-token-list/commits/5b557eef0e779b803820806a152bd19b788a94b7"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":66565535,"login":"weichain","gravatar_id":"","url":"https://api.github.com/orgs/weichain","avatar_url":"https://avatars.githubusercontent.com/u/66565535?"}}
+{"id":"17246339293","type":"PushEvent","actor":{"id":81258380,"login":"Helikopter-Bojowy","display_login":"Helikopter-Bojowy","gravatar_id":"","url":"https://api.github.com/users/Helikopter-Bojowy","avatar_url":"https://avatars.githubusercontent.com/u/81258380?"},"repo":{"id":352069365,"name":"Helikopter-Bojowy/Exp-na-helikopterze","url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze"},"payload":{"push_id":7562451014,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"47d3d6dd2d206a05c36104f502f202465a7b0a3b","before":"b92f8ef2ffaca678f13645cd8cc352807d9c86ae","commits":[{"sha":"47d3d6dd2d206a05c36104f502f202465a7b0a3b","author":{"name":"Helikopter-Bojowy","email":"733707e04c8bf7c874ce97516f8f637586fc79d7@users.noreply.github.com"},"message":"1626857999365:847486319664169040","distinct":true,"url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze/commits/47d3d6dd2d206a05c36104f502f202465a7b0a3b"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339295","type":"PushEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":385328662,"name":"thatjohn01/751618019","url":"https://api.github.com/repos/thatjohn01/751618019"},"payload":{"push_id":7562451001,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"474602f1bb47b9c773edf2dbff05de5d245c9272","before":"8609284b216bbc403327fd2acda1d90d5a55e223","commits":[{"sha":"474602f1bb47b9c773edf2dbff05de5d245c9272","author":{"name":"thatjohn01","email":"72eb81e66410b3da65da4cca287ce0578825ce64@users.noreply.github.com"},"message":"change README.md","distinct":true,"url":"https://api.github.com/repos/thatjohn01/751618019/commits/474602f1bb47b9c773edf2dbff05de5d245c9272"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339307","type":"PushEvent","actor":{"id":31834656,"login":"angelia-yuqi-personal","display_login":"angelia-yuqi-personal","gravatar_id":"","url":"https://api.github.com/users/angelia-yuqi-personal","avatar_url":"https://avatars.githubusercontent.com/u/31834656?"},"repo":{"id":357159441,"name":"Conflux-Chain/rigel","url":"https://api.github.com/repos/Conflux-Chain/rigel"},"payload":{"push_id":7562451021,"size":1,"distinct_size":1,"ref":"refs/heads/feature-history","head":"6edcf752f958925e5dfd730f3f5be2f8c9095e3f","before":"5c06dbd894131b9a85258149a660d732927c5af5","commits":[{"sha":"6edcf752f958925e5dfd730f3f5be2f8c9095e3f","author":{"name":"angelia","email":"3b539c6a1b7cc89542e684400f3757269d80c913@126.com"},"message":"fix: ui style","distinct":true,"url":"https://api.github.com/repos/Conflux-Chain/rigel/commits/6edcf752f958925e5dfd730f3f5be2f8c9095e3f"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":46887720,"login":"Conflux-Chain","gravatar_id":"","url":"https://api.github.com/orgs/Conflux-Chain","avatar_url":"https://avatars.githubusercontent.com/u/46887720?"}}
+{"id":"17246339310","type":"PushEvent","actor":{"id":48402225,"login":"SiongSng","display_login":"SiongSng","gravatar_id":"","url":"https://api.github.com/users/SiongSng","avatar_url":"https://avatars.githubusercontent.com/u/48402225?"},"repo":{"id":339984937,"name":"RPMTW/ResourcePack-Mod-zh_tw","url":"https://api.github.com/repos/RPMTW/ResourcePack-Mod-zh_tw"},"payload":{"push_id":7562450997,"size":1,"distinct_size":1,"ref":"refs/heads/Translated-1.12","head":"a45aa85e87eb7daa75b7bbce10c833954681fed9","before":"70ed25735169cb4fe26ba5646e2a3f4776f918e8","commits":[{"sha":"a45aa85e87eb7daa75b7bbce10c833954681fed9","author":{"name":"菘菘","email":"0797749c333bd5e99128fa8b6a96bed1d5c7004f@gmail.com"},"message":"New translations zh_tw.json (Chinese Traditional)","distinct":true,"url":"https://api.github.com/repos/RPMTW/ResourcePack-Mod-zh_tw/commits/a45aa85e87eb7daa75b7bbce10c833954681fed9"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":83767842,"login":"RPMTW","gravatar_id":"","url":"https://api.github.com/orgs/RPMTW","avatar_url":"https://avatars.githubusercontent.com/u/83767842?"}}
+{"id":"17246339327","type":"PushEvent","actor":{"id":87263540,"login":"garrydb","display_login":"garrydb","gravatar_id":"","url":"https://api.github.com/users/garrydb","avatar_url":"https://avatars.githubusercontent.com/u/87263540?"},"repo":{"id":384916504,"name":"garrydb/garrydb","url":"https://api.github.com/repos/garrydb/garrydb"},"payload":{"push_id":7562451016,"size":1,"distinct_size":1,"ref":"refs/heads/Autofac","head":"ce3d29304e014475e1db462cdf43a9c8de7a1962","before":"b8910e35b26cb7d5f5a515a4840f1431d00d67a1","commits":[{"sha":"ce3d29304e014475e1db462cdf43a9c8de7a1962","author":{"name":"GarryDB","email":"64b2b6d12bfe4baae7dad3d018f8cbf6b0e7a044@garrydb.com"},"message":"Implement a very basic plugin-to-plugin communication with Akka.NET","distinct":true,"url":"https://api.github.com/repos/garrydb/garrydb/commits/ce3d29304e014475e1db462cdf43a9c8de7a1962"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339328","type":"PushEvent","actor":{"id":58833107,"login":"hrhwve3553","display_login":"hrhwve3553","gravatar_id":"","url":"https://api.github.com/users/hrhwve3553","avatar_url":"https://avatars.githubusercontent.com/u/58833107?"},"repo":{"id":227724995,"name":"hrhwve3553/djy","url":"https://api.github.com/repos/hrhwve3553/djy"},"payload":{"push_id":7562451004,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8bcd3dcb3024f61d129bac8b13410a314c29191a","before":"9ae9ce3e94f27081e9865a5d0034d1944ac0e5cb","commits":[{"sha":"8bcd3dcb3024f61d129bac8b13410a314c29191a","author":{"name":"hrhwve3553","email":"10135ac1af9bed4c0bec7c29db44050e24a097b2@users.noreply.github.com"},"message":"Update nsc413_2.md","distinct":true,"url":"https://api.github.com/repos/hrhwve3553/djy/commits/8bcd3dcb3024f61d129bac8b13410a314c29191a"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339334","type":"CommitCommentEvent","actor":{"id":87752408,"login":"githubname21","display_login":"githubname21","gravatar_id":"","url":"https://api.github.com/users/githubname21","avatar_url":"https://avatars.githubusercontent.com/u/87752408?"},"repo":{"id":388055710,"name":"githubname21/test","url":"https://api.github.com/repos/githubname21/test"},"payload":{"comment":{"url":"https://api.github.com/repos/githubname21/test/comments/53771640","html_url":"https://github.com/githubname21/test/commit/9d746167b35af02a151bbed3ae3548af5b531ef9#commitcomment-53771640","id":53771640,"node_id":"MDEzOkNvbW1pdENvbW1lbnQ1Mzc3MTY0MA==","user":{"login":"githubname21","id":87752408,"node_id":"MDQ6VXNlcjg3NzUyNDA4","avatar_url":"https://avatars.githubusercontent.com/u/87752408?v=4","gravatar_id":"","url":"https://api.github.com/users/githubname21","html_url":"https://github.com/githubname21","followers_url":"https://api.github.com/users/githubname21/followers","following_url":"https://api.github.com/users/githubname21/following{/other_user}","gists_url":"https://api.github.com/users/githubname21/gists{/gist_id}","starred_url":"https://api.github.com/users/githubname21/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubname21/subscriptions","organizations_url":"https://api.github.com/users/githubname21/orgs","repos_url":"https://api.github.com/users/githubname21/repos","events_url":"https://api.github.com/users/githubname21/events{/privacy}","received_events_url":"https://api.github.com/users/githubname21/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":null,"commit_id":"9d746167b35af02a151bbed3ae3548af5b531ef9","created_at":"2021-07-21T09:00:00Z","updated_at":"2021-07-21T09:00:00Z","author_association":"OWNER","body":"a.php"}},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339335","type":"WatchEvent","actor":{"id":45672104,"login":"FDlucifer","display_login":"FDlucifer","gravatar_id":"","url":"https://api.github.com/users/FDlucifer","avatar_url":"https://avatars.githubusercontent.com/u/45672104?"},"repo":{"id":167602620,"name":"a0rtega/cpufuzz","url":"https://api.github.com/repos/a0rtega/cpufuzz"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339337","type":"CreateEvent","actor":{"id":190640,"login":"kahgeh","display_login":"kahgeh","gravatar_id":"","url":"https://api.github.com/users/kahgeh","avatar_url":"https://avatars.githubusercontent.com/u/190640?"},"repo":{"id":385939072,"name":"kahgeh/open-sse","url":"https://api.github.com/repos/kahgeh/open-sse"},"payload":{"ref":"v0.0.2","ref_type":"tag","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339339","type":"CreateEvent","actor":{"id":73436831,"login":"mayank-mallick","display_login":"mayank-mallick","gravatar_id":"","url":"https://api.github.com/users/mayank-mallick","avatar_url":"https://avatars.githubusercontent.com/u/73436831?"},"repo":{"id":388056957,"name":"mayank-mallick/password-generator","url":"https://api.github.com/repos/mayank-mallick/password-generator"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":"password-generator","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339349","type":"CreateEvent","actor":{"id":29139614,"login":"renovate[bot]","display_login":"renovate","gravatar_id":"","url":"https://api.github.com/users/renovate[bot]","avatar_url":"https://avatars.githubusercontent.com/u/29139614?"},"repo":{"id":315713528,"name":"Yfill/waves","url":"https://api.github.com/repos/Yfill/waves"},"payload":{"ref":"renovate/rollup-2.x","ref_type":"branch","master_branch":"main","description":"Click the wave effect","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339350","type":"PushEvent","actor":{"id":34973707,"login":"hyossid","display_login":"hyossid","gravatar_id":"","url":"https://api.github.com/users/hyossid","avatar_url":"https://avatars.githubusercontent.com/u/34973707?"},"repo":{"id":376212449,"name":"alexgo-io/alex-v1","url":"https://api.github.com/repos/alexgo-io/alex-v1"},"payload":{"push_id":7562451024,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"48da21038bec12d9f76d00f4cb3dafa2a697b453","before":"43e01f989430ca4a7b401cecc2d32833424e03c0","commits":[{"sha":"48da21038bec12d9f76d00f4cb3dafa2a697b453","author":{"name":"hyossid","email":"e2b25fcbfaa66f84d32bf6e2e1b3979fefe37d0c@gmail.com"},"message":"clear vault","distinct":true,"url":"https://api.github.com/repos/alexgo-io/alex-v1/commits/48da21038bec12d9f76d00f4cb3dafa2a697b453"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":85433080,"login":"alexgo-io","gravatar_id":"","url":"https://api.github.com/orgs/alexgo-io","avatar_url":"https://avatars.githubusercontent.com/u/85433080?"}}
+{"id":"17246339352","type":"PushEvent","actor":{"id":83697333,"login":"a-Cash-dixit","display_login":"a-Cash-dixit","gravatar_id":"","url":"https://api.github.com/users/a-Cash-dixit","avatar_url":"https://avatars.githubusercontent.com/u/83697333?"},"repo":{"id":388016859,"name":"a-Cash-dixit/Story","url":"https://api.github.com/repos/a-Cash-dixit/Story"},"payload":{"push_id":7562451043,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"ccae12e9b1cf21f22d3471c3a1703e9961a70a45","before":"1f4a437d0421a397264b8256d5665b9e2b072985","commits":[{"sha":"fc03062f1b50501074e6633a934d6988adeb814b","author":{"name":"Akash Dixit","email":"2e65d41939fafbacaf69a0b0e485b44ce28a2b11@gmail.com"},"message":"modify chapter 1 and 2 to have alien theme","distinct":true,"url":"https://api.github.com/repos/a-Cash-dixit/Story/commits/fc03062f1b50501074e6633a934d6988adeb814b"},{"sha":"5b795e1ea0a86e49dd5a99734a4383dc393a7eeb","author":{"name":"Akash Dixit","email":"2e65d41939fafbacaf69a0b0e485b44ce28a2b11@gmail.com"},"message":"add chapter4","distinct":true,"url":"https://api.github.com/repos/a-Cash-dixit/Story/commits/5b795e1ea0a86e49dd5a99734a4383dc393a7eeb"},{"sha":"ccae12e9b1cf21f22d3471c3a1703e9961a70a45","author":{"name":"Akash Dixit","email":"2e65d41939fafbacaf69a0b0e485b44ce28a2b11@gmail.com"},"message":"Merge branch 'alien-plot'","distinct":true,"url":"https://api.github.com/repos/a-Cash-dixit/Story/commits/ccae12e9b1cf21f22d3471c3a1703e9961a70a45"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339356","type":"PushEvent","actor":{"id":54520846,"login":"holloer","display_login":"holloer","gravatar_id":"","url":"https://api.github.com/users/holloer","avatar_url":"https://avatars.githubusercontent.com/u/54520846?"},"repo":{"id":387765978,"name":"holloer/html-css-js-","url":"https://api.github.com/repos/holloer/html-css-js-"},"payload":{"push_id":7562451027,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"99089a2c8ebeb002ea94335f441b74bb0415c53c","before":"fe9081e81fccb17d5b4fd8d437ae14b9eeaa6750","commits":[{"sha":"99089a2c8ebeb002ea94335f441b74bb0415c53c","author":{"name":"将也ka","email":"7fa7ff4dc8b93edba9197cd4c4524ddbfc1d0d05@qq.com"},"message":"提交测试","distinct":true,"url":"https://api.github.com/repos/holloer/html-css-js-/commits/99089a2c8ebeb002ea94335f441b74bb0415c53c"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339360","type":"IssueCommentEvent","actor":{"id":5970879,"login":"Mathadon","display_login":"Mathadon","gravatar_id":"","url":"https://api.github.com/users/Mathadon","avatar_url":"https://avatars.githubusercontent.com/u/5970879?"},"repo":{"id":16949064,"name":"open-ideas/IDEAS","url":"https://api.github.com/repos/open-ideas/IDEAS"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/open-ideas/IDEAS/issues/1225","repository_url":"https://api.github.com/repos/open-ideas/IDEAS","labels_url":"https://api.github.com/repos/open-ideas/IDEAS/issues/1225/labels{/name}","comments_url":"https://api.github.com/repos/open-ideas/IDEAS/issues/1225/comments","events_url":"https://api.github.com/repos/open-ideas/IDEAS/issues/1225/events","html_url":"https://github.com/open-ideas/IDEAS/issues/1225","id":949444367,"node_id":"MDU6SXNzdWU5NDk0NDQzNjc=","number":1225,"title":"Error in AHU example model simulation in Open Modelica ","user":{"login":"Kanchn12345","id":87692105,"node_id":"MDQ6VXNlcjg3NjkyMTA1","avatar_url":"https://avatars.githubusercontent.com/u/87692105?v=4","gravatar_id":"","url":"https://api.github.com/users/Kanchn12345","html_url":"https://github.com/Kanchn12345","followers_url":"https://api.github.com/users/Kanchn12345/followers","following_url":"https://api.github.com/users/Kanchn12345/following{/other_user}","gists_url":"https://api.github.com/users/Kanchn12345/gists{/gist_id}","starred_url":"https://api.github.com/users/Kanchn12345/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Kanchn12345/subscriptions","organizations_url":"https://api.github.com/users/Kanchn12345/orgs","repos_url":"https://api.github.com/users/Kanchn12345/repos","events_url":"https://api.github.com/users/Kanchn12345/events{/privacy}","received_events_url":"https://api.github.com/users/Kanchn12345/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":4,"created_at":"2021-07-21T08:10:22Z","updated_at":"2021-07-21T09:00:00Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"As discussed on the issue for Openmodelica with #7705, I am creating an issue here. \r\n\r\nI am trying to simulate the AHU example model (Adsolair58) available in IDEAS.AIRFLOW.AHU package of the IDEAS library. When I am trying to simulate the example it is giving the following errors “Illegal access of protected element XiSat.” and “Variable wetBulOut.XiSat not found in scope IndirectEvaporativeHex.”\r\n\r\n@Mathadon , kindly look into it and help me resolve the issue.\r\n\r\nThanks","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/open-ideas/IDEAS/issues/comments/884018688","html_url":"https://github.com/open-ideas/IDEAS/issues/1225#issuecomment-884018688","issue_url":"https://api.github.com/repos/open-ideas/IDEAS/issues/1225","id":884018688,"node_id":"IC_kwDOAQKfSM40sQ4A","user":{"login":"Mathadon","id":5970879,"node_id":"MDQ6VXNlcjU5NzA4Nzk=","avatar_url":"https://avatars.githubusercontent.com/u/5970879?v=4","gravatar_id":"","url":"https://api.github.com/users/Mathadon","html_url":"https://github.com/Mathadon","followers_url":"https://api.github.com/users/Mathadon/followers","following_url":"https://api.github.com/users/Mathadon/following{/other_user}","gists_url":"https://api.github.com/users/Mathadon/gists{/gist_id}","starred_url":"https://api.github.com/users/Mathadon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Mathadon/subscriptions","organizations_url":"https://api.github.com/users/Mathadon/orgs","repos_url":"https://api.github.com/users/Mathadon/repos","events_url":"https://api.github.com/users/Mathadon/events{/privacy}","received_events_url":"https://api.github.com/users/Mathadon/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:00Z","updated_at":"2021-07-21T09:00:00Z","author_association":"MEMBER","body":"@Kanchn12345 @YashwanthVellala can you try again?","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":5467967,"login":"open-ideas","gravatar_id":"","url":"https://api.github.com/orgs/open-ideas","avatar_url":"https://avatars.githubusercontent.com/u/5467967?"}}
+{"id":"17246339364","type":"PushEvent","actor":{"id":58665444,"login":"sandy1709","display_login":"sandy1709","gravatar_id":"","url":"https://api.github.com/users/sandy1709","avatar_url":"https://avatars.githubusercontent.com/u/58665444?"},"repo":{"id":256730612,"name":"sandy1709/catuserbot","url":"https://api.github.com/repos/sandy1709/catuserbot"},"payload":{"push_id":7562451052,"size":1,"distinct_size":1,"ref":"refs/heads/bugs","head":"37665ef04e5ffa8a0133596223fdecd19419c584","before":"10796270a5f038d403c68b67dfa67e24bcecfecd","commits":[{"sha":"37665ef04e5ffa8a0133596223fdecd19419c584","author":{"name":"sandeep.n","email":"50e816377cccb5e63b5f11b5b87a1649ec7e7c43@users.noreply.github.com"},"message":"Update ytdl.py","distinct":true,"url":"https://api.github.com/repos/sandy1709/catuserbot/commits/37665ef04e5ffa8a0133596223fdecd19419c584"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339367","type":"ForkEvent","actor":{"id":44321653,"login":"fengza","display_login":"fengza","gravatar_id":"","url":"https://api.github.com/users/fengza","avatar_url":"https://avatars.githubusercontent.com/u/44321653?"},"repo":{"id":181076419,"name":"JiancongWang/dummy","url":"https://api.github.com/repos/JiancongWang/dummy"},"payload":{"forkee":{"id":388056959,"node_id":"MDEwOlJlcG9zaXRvcnkzODgwNTY5NTk=","name":"dummy","full_name":"fengza/dummy","private":false,"owner":{"login":"fengza","id":44321653,"node_id":"MDQ6VXNlcjQ0MzIxNjUz","avatar_url":"https://avatars.githubusercontent.com/u/44321653?v=4","gravatar_id":"","url":"https://api.github.com/users/fengza","html_url":"https://github.com/fengza","followers_url":"https://api.github.com/users/fengza/followers","following_url":"https://api.github.com/users/fengza/following{/other_user}","gists_url":"https://api.github.com/users/fengza/gists{/gist_id}","starred_url":"https://api.github.com/users/fengza/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fengza/subscriptions","organizations_url":"https://api.github.com/users/fengza/orgs","repos_url":"https://api.github.com/users/fengza/repos","events_url":"https://api.github.com/users/fengza/events{/privacy}","received_events_url":"https://api.github.com/users/fengza/received_events","type":"User","site_admin":false},"html_url":"https://github.com/fengza/dummy","description":null,"fork":true,"url":"https://api.github.com/repos/fengza/dummy","forks_url":"https://api.github.com/repos/fengza/dummy/forks","keys_url":"https://api.github.com/repos/fengza/dummy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fengza/dummy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fengza/dummy/teams","hooks_url":"https://api.github.com/repos/fengza/dummy/hooks","issue_events_url":"https://api.github.com/repos/fengza/dummy/issues/events{/number}","events_url":"https://api.github.com/repos/fengza/dummy/events","assignees_url":"https://api.github.com/repos/fengza/dummy/assignees{/user}","branches_url":"https://api.github.com/repos/fengza/dummy/branches{/branch}","tags_url":"https://api.github.com/repos/fengza/dummy/tags","blobs_url":"https://api.github.com/repos/fengza/dummy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fengza/dummy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fengza/dummy/git/refs{/sha}","trees_url":"https://api.github.com/repos/fengza/dummy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fengza/dummy/statuses/{sha}","languages_url":"https://api.github.com/repos/fengza/dummy/languages","stargazers_url":"https://api.github.com/repos/fengza/dummy/stargazers","contributors_url":"https://api.github.com/repos/fengza/dummy/contributors","subscribers_url":"https://api.github.com/repos/fengza/dummy/subscribers","subscription_url":"https://api.github.com/repos/fengza/dummy/subscription","commits_url":"https://api.github.com/repos/fengza/dummy/commits{/sha}","git_commits_url":"https://api.github.com/repos/fengza/dummy/git/commits{/sha}","comments_url":"https://api.github.com/repos/fengza/dummy/comments{/number}","issue_comment_url":"https://api.github.com/repos/fengza/dummy/issues/comments{/number}","contents_url":"https://api.github.com/repos/fengza/dummy/contents/{+path}","compare_url":"https://api.github.com/repos/fengza/dummy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fengza/dummy/merges","archive_url":"https://api.github.com/repos/fengza/dummy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fengza/dummy/downloads","issues_url":"https://api.github.com/repos/fengza/dummy/issues{/number}","pulls_url":"https://api.github.com/repos/fengza/dummy/pulls{/number}","milestones_url":"https://api.github.com/repos/fengza/dummy/milestones{/number}","notifications_url":"https://api.github.com/repos/fengza/dummy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fengza/dummy/labels{/name}","releases_url":"https://api.github.com/repos/fengza/dummy/releases{/id}","deployments_url":"https://api.github.com/repos/fengza/dummy/deployments","created_at":"2021-07-21T09:00:00Z","updated_at":"2019-04-12T20:07:32Z","pushed_at":"2019-04-12T20:07:31Z","git_url":"git://github.com/fengza/dummy.git","ssh_url":"git@github.com:fengza/dummy.git","clone_url":"https://github.com/fengza/dummy.git","svn_url":"https://github.com/fengza/dummy","homepage":null,"size":5,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"main","public":true}},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339369","type":"PushEvent","actor":{"id":69119241,"login":"mohammadTaghiElmi","display_login":"mohammadTaghiElmi","gravatar_id":"","url":"https://api.github.com/users/mohammadTaghiElmi","avatar_url":"https://avatars.githubusercontent.com/u/69119241?"},"repo":{"id":76907276,"name":"oceanwp/oceanwp","url":"https://api.github.com/repos/oceanwp/oceanwp"},"payload":{"push_id":7562451039,"size":1,"distinct_size":1,"ref":"refs/heads/vanilla-js-fs","head":"bc4c6c00fe8efbe4cf6525a143d3a41c5f10574d","before":"78ac5a187db58ad6529bbe18987f36582f9e6fbf","commits":[{"sha":"bc4c6c00fe8efbe4cf6525a143d3a41c5f10574d","author":{"name":"Mohammad Taghi Elmi","email":"189a65585692af893470c7494471e2315218bcb3@gmail.com"},"message":"Compatible with WP 5.8.0","distinct":true,"url":"https://api.github.com/repos/oceanwp/oceanwp/commits/bc4c6c00fe8efbe4cf6525a143d3a41c5f10574d"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":54744968,"login":"oceanwp","gravatar_id":"","url":"https://api.github.com/orgs/oceanwp","avatar_url":"https://avatars.githubusercontent.com/u/54744968?"}}
+{"id":"17246339373","type":"CreateEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"ref":"5555","ref_type":"branch","master_branch":"master","description":"Testing Github Pull requests limits","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339375","type":"PushEvent","actor":{"id":67594991,"login":"makidai1212","display_login":"makidai1212","gravatar_id":"","url":"https://api.github.com/users/makidai1212","avatar_url":"https://avatars.githubusercontent.com/u/67594991?"},"repo":{"id":386547022,"name":"makidai1212/kenkou","url":"https://api.github.com/repos/makidai1212/kenkou"},"payload":{"push_id":7562451063,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5903e2dcacaf927dc880224f1b5adda318626126","before":"65b8ae8f4505e259c08a00d2043d80b273089c26","commits":[{"sha":"5903e2dcacaf927dc880224f1b5adda318626126","author":{"name":"makidai","email":"506f96d91d55111ac48729c3ec0e64734b0e6776@yahoo.co.jp"},"message":"uwagakishitai","distinct":true,"url":"https://api.github.com/repos/makidai1212/kenkou/commits/5903e2dcacaf927dc880224f1b5adda318626126"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339378","type":"PushEvent","actor":{"id":81258380,"login":"Helikopter-Bojowy","display_login":"Helikopter-Bojowy","gravatar_id":"","url":"https://api.github.com/users/Helikopter-Bojowy","avatar_url":"https://avatars.githubusercontent.com/u/81258380?"},"repo":{"id":352069365,"name":"Helikopter-Bojowy/Exp-na-helikopterze","url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze"},"payload":{"push_id":7562451058,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"0bfd0a1c279b39653a869a9c26a60e478c0aef34","before":"47d3d6dd2d206a05c36104f502f202465a7b0a3b","commits":[{"sha":"0bfd0a1c279b39653a869a9c26a60e478c0aef34","author":{"name":"Helikopter-Bojowy","email":"733707e04c8bf7c874ce97516f8f637586fc79d7@users.noreply.github.com"},"message":"1626857999689:419059893383856140","distinct":true,"url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze/commits/0bfd0a1c279b39653a869a9c26a60e478c0aef34"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339379","type":"PushEvent","actor":{"id":76887010,"login":"KoteTheInnkeeper","display_login":"KoteTheInnkeeper","gravatar_id":"","url":"https://api.github.com/users/KoteTheInnkeeper","avatar_url":"https://avatars.githubusercontent.com/u/76887010?"},"repo":{"id":384450476,"name":"KoteTheInnkeeper/fiados_qt","url":"https://api.github.com/repos/KoteTheInnkeeper/fiados_qt"},"payload":{"push_id":7562451061,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b1eb3463849b2b37d23974e6b0466c5b8a91403f","before":"43fbc87863c4bb39d462bd06408dc3fda057c07d","commits":[{"sha":"b1eb3463849b2b37d23974e6b0466c5b8a91403f","author":{"name":"KoteTheInnkeeper","email":"356b38822cc26315cd5c80f5c36b65b26337c391@gmail.com"},"message":"Updated .gitignore to ignore pyisntaller files.","distinct":true,"url":"https://api.github.com/repos/KoteTheInnkeeper/fiados_qt/commits/b1eb3463849b2b37d23974e6b0466c5b8a91403f"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339393","type":"IssuesEvent","actor":{"id":17969015,"login":"oguzdemirbasci","display_login":"oguzdemirbasci","gravatar_id":"","url":"https://api.github.com/users/oguzdemirbasci","avatar_url":"https://avatars.githubusercontent.com/u/17969015?"},"repo":{"id":161622906,"name":"inspirehep/inspirehep","url":"https://api.github.com/repos/inspirehep/inspirehep"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/inspirehep/inspirehep/issues/2058","repository_url":"https://api.github.com/repos/inspirehep/inspirehep","labels_url":"https://api.github.com/repos/inspirehep/inspirehep/issues/2058/labels{/name}","comments_url":"https://api.github.com/repos/inspirehep/inspirehep/issues/2058/comments","events_url":"https://api.github.com/repos/inspirehep/inspirehep/issues/2058/events","html_url":"https://github.com/inspirehep/inspirehep/issues/2058","id":949486827,"node_id":"MDU6SXNzdWU5NDk0ODY4Mjc=","number":2058,"title":"DESY parser does not strip auther id value","user":{"login":"oguzdemirbasci","id":17969015,"node_id":"MDQ6VXNlcjE3OTY5MDE1","avatar_url":"https://avatars.githubusercontent.com/u/17969015?v=4","gravatar_id":"","url":"https://api.github.com/users/oguzdemirbasci","html_url":"https://github.com/oguzdemirbasci","followers_url":"https://api.github.com/users/oguzdemirbasci/followers","following_url":"https://api.github.com/users/oguzdemirbasci/following{/other_user}","gists_url":"https://api.github.com/users/oguzdemirbasci/gists{/gist_id}","starred_url":"https://api.github.com/users/oguzdemirbasci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oguzdemirbasci/subscriptions","organizations_url":"https://api.github.com/users/oguzdemirbasci/orgs","repos_url":"https://api.github.com/users/oguzdemirbasci/repos","events_url":"https://api.github.com/users/oguzdemirbasci/events{/privacy}","received_events_url":"https://api.github.com/users/oguzdemirbasci/received_events","type":"User","site_admin":false},"labels":[{"id":2155634872,"node_id":"MDU6TGFiZWwyMTU1NjM0ODcy","url":"https://api.github.com/repos/inspirehep/inspirehep/labels/status:%20new","name":"status: new","color":"f237c6","default":false,"description":""},{"id":1160200155,"node_id":"MDU6TGFiZWwxMTYwMjAwMTU1","url":"https://api.github.com/repos/inspirehep/inspirehep/labels/type:%20bug","name":"type: bug","color":"d73a4a","default":false,"description":"Something isn't working"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T09:00:00Z","updated_at":"2021-07-21T09:00:00Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"body":"For DESY workflows, author ORCID ids are incorrect. \r\n\r\n`https://orcidorg/0000-0001-7325-2274` should be `0000-0001-7325-2274`.\r\n\r\nhttps://inspirehep.net/holdingpen/3174764\r\n\r\n```\r\nValidationError: {u'value': u'https://orcidorg/0000-0001-7325-2274', u'schema': u'ORCID'} is not valid under any of the given schemas\r\n```\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":356664,"login":"inspirehep","gravatar_id":"","url":"https://api.github.com/orgs/inspirehep","avatar_url":"https://avatars.githubusercontent.com/u/356664?"}}
+{"id":"17246339396","type":"PushEvent","actor":{"id":87330551,"login":"xz241","display_login":"xz241","gravatar_id":"","url":"https://api.github.com/users/xz241","avatar_url":"https://avatars.githubusercontent.com/u/87330551?"},"repo":{"id":385328687,"name":"xz241/wp-uploads","url":"https://api.github.com/repos/xz241/wp-uploads"},"payload":{"push_id":7562451065,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"ce7556e4c681ba0ee5334ee87ffa9cfd612a7916","before":"d065823c96427d420d2ac4c8c03990ff2c14ffd4","commits":[{"sha":"ce7556e4c681ba0ee5334ee87ffa9cfd612a7916","author":{"name":"xz241","email":"e17353502d0344fb9b4d10b6a471cc23c11850ec@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/xz241/wp-uploads/commits/ce7556e4c681ba0ee5334ee87ffa9cfd612a7916"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339408","type":"GollumEvent","actor":{"id":63827197,"login":"Frank-cc0426","display_login":"Frank-cc0426","gravatar_id":"","url":"https://api.github.com/users/Frank-cc0426","avatar_url":"https://avatars.githubusercontent.com/u/63827197?"},"repo":{"id":388000013,"name":"Frank-cc0426/cc_leetcode","url":"https://api.github.com/repos/Frank-cc0426/cc_leetcode"},"payload":{"pages":[{"page_name":"Wiki-grammar","title":"Wiki grammar","summary":null,"action":"edited","sha":"0b55912abfcb5a6dffdf7fb20a922eb5feba670e","html_url":"https://github.com/Frank-cc0426/cc_leetcode/wiki/Wiki-grammar"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339412","type":"PushEvent","actor":{"id":2041960,"login":"pofider","display_login":"pofider","gravatar_id":"","url":"https://api.github.com/users/pofider","avatar_url":"https://avatars.githubusercontent.com/u/2041960?"},"repo":{"id":304702492,"name":"jsreport/new-arch","url":"https://api.github.com/repos/jsreport/new-arch"},"payload":{"push_id":7562451059,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"667db2b2aae2eae645ef97859fea5d39e91927ba","before":"a62dbb7f21f9fd509002d8ec576aa4be66b32de3","commits":[{"sha":"667db2b2aae2eae645ef97859fea5d39e91927ba","author":{"name":"pofider","email":"94482ae862d6b703916f4cc2b746d969fcde1a63@seznam.cz"},"message":"fix errors when asset seems text but we fail to decode it","distinct":true,"url":"https://api.github.com/repos/jsreport/new-arch/commits/667db2b2aae2eae645ef97859fea5d39e91927ba"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":3989182,"login":"jsreport","gravatar_id":"","url":"https://api.github.com/orgs/jsreport","avatar_url":"https://avatars.githubusercontent.com/u/3989182?"}}
+{"id":"17246339414","type":"WatchEvent","actor":{"id":76192995,"login":"Y-yb","display_login":"Y-yb","gravatar_id":"","url":"https://api.github.com/users/Y-yb","avatar_url":"https://avatars.githubusercontent.com/u/76192995?"},"repo":{"id":177736533,"name":"996icu/996.ICU","url":"https://api.github.com/repos/996icu/996.ICU"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339416","type":"PullRequestEvent","actor":{"id":46416545,"login":"helmuth12081999","display_login":"helmuth12081999","gravatar_id":"","url":"https://api.github.com/users/helmuth12081999","avatar_url":"https://avatars.githubusercontent.com/u/46416545?"},"repo":{"id":330831044,"name":"jansennn/Plan-it-BE","url":"https://api.github.com/repos/jansennn/Plan-it-BE"},"payload":{"action":"opened","number":22,"pull_request":{"url":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/22","id":694185702,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzAy","html_url":"https://github.com/jansennn/Plan-it-BE/pull/22","diff_url":"https://github.com/jansennn/Plan-it-BE/pull/22.diff","patch_url":"https://github.com/jansennn/Plan-it-BE/pull/22.patch","issue_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/22","number":22,"state":"open","locked":false,"title":"async rute","user":{"login":"helmuth12081999","id":46416545,"node_id":"MDQ6VXNlcjQ2NDE2NTQ1","avatar_url":"https://avatars.githubusercontent.com/u/46416545?v=4","gravatar_id":"","url":"https://api.github.com/users/helmuth12081999","html_url":"https://github.com/helmuth12081999","followers_url":"https://api.github.com/users/helmuth12081999/followers","following_url":"https://api.github.com/users/helmuth12081999/following{/other_user}","gists_url":"https://api.github.com/users/helmuth12081999/gists{/gist_id}","starred_url":"https://api.github.com/users/helmuth12081999/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/helmuth12081999/subscriptions","organizations_url":"https://api.github.com/users/helmuth12081999/orgs","repos_url":"https://api.github.com/users/helmuth12081999/repos","events_url":"https://api.github.com/users/helmuth12081999/events{/privacy}","received_events_url":"https://api.github.com/users/helmuth12081999/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T09:00:00Z","updated_at":"2021-07-21T09:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/22/commits","review_comments_url":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/22/comments","review_comment_url":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/22/comments","statuses_url":"https://api.github.com/repos/jansennn/Plan-it-BE/statuses/47ee42ed38e37c3382af72a399c0ff8532493494","head":{"label":"jansennn:helmuth/async-rute","ref":"helmuth/async-rute","sha":"47ee42ed38e37c3382af72a399c0ff8532493494","user":{"login":"jansennn","id":38531347,"node_id":"MDQ6VXNlcjM4NTMxMzQ3","avatar_url":"https://avatars.githubusercontent.com/u/38531347?v=4","gravatar_id":"","url":"https://api.github.com/users/jansennn","html_url":"https://github.com/jansennn","followers_url":"https://api.github.com/users/jansennn/followers","following_url":"https://api.github.com/users/jansennn/following{/other_user}","gists_url":"https://api.github.com/users/jansennn/gists{/gist_id}","starred_url":"https://api.github.com/users/jansennn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jansennn/subscriptions","organizations_url":"https://api.github.com/users/jansennn/orgs","repos_url":"https://api.github.com/users/jansennn/repos","events_url":"https://api.github.com/users/jansennn/events{/privacy}","received_events_url":"https://api.github.com/users/jansennn/received_events","type":"User","site_admin":false},"repo":{"id":330831044,"node_id":"MDEwOlJlcG9zaXRvcnkzMzA4MzEwNDQ=","name":"Plan-it-BE","full_name":"jansennn/Plan-it-BE","private":false,"owner":{"login":"jansennn","id":38531347,"node_id":"MDQ6VXNlcjM4NTMxMzQ3","avatar_url":"https://avatars.githubusercontent.com/u/38531347?v=4","gravatar_id":"","url":"https://api.github.com/users/jansennn","html_url":"https://github.com/jansennn","followers_url":"https://api.github.com/users/jansennn/followers","following_url":"https://api.github.com/users/jansennn/following{/other_user}","gists_url":"https://api.github.com/users/jansennn/gists{/gist_id}","starred_url":"https://api.github.com/users/jansennn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jansennn/subscriptions","organizations_url":"https://api.github.com/users/jansennn/orgs","repos_url":"https://api.github.com/users/jansennn/repos","events_url":"https://api.github.com/users/jansennn/events{/privacy}","received_events_url":"https://api.github.com/users/jansennn/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jansennn/Plan-it-BE","description":"Tugas Akhir","fork":false,"url":"https://api.github.com/repos/jansennn/Plan-it-BE","forks_url":"https://api.github.com/repos/jansennn/Plan-it-BE/forks","keys_url":"https://api.github.com/repos/jansennn/Plan-it-BE/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jansennn/Plan-it-BE/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jansennn/Plan-it-BE/teams","hooks_url":"https://api.github.com/repos/jansennn/Plan-it-BE/hooks","issue_events_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/events{/number}","events_url":"https://api.github.com/repos/jansennn/Plan-it-BE/events","assignees_url":"https://api.github.com/repos/jansennn/Plan-it-BE/assignees{/user}","branches_url":"https://api.github.com/repos/jansennn/Plan-it-BE/branches{/branch}","tags_url":"https://api.github.com/repos/jansennn/Plan-it-BE/tags","blobs_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/refs{/sha}","trees_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jansennn/Plan-it-BE/statuses/{sha}","languages_url":"https://api.github.com/repos/jansennn/Plan-it-BE/languages","stargazers_url":"https://api.github.com/repos/jansennn/Plan-it-BE/stargazers","contributors_url":"https://api.github.com/repos/jansennn/Plan-it-BE/contributors","subscribers_url":"https://api.github.com/repos/jansennn/Plan-it-BE/subscribers","subscription_url":"https://api.github.com/repos/jansennn/Plan-it-BE/subscription","commits_url":"https://api.github.com/repos/jansennn/Plan-it-BE/commits{/sha}","git_commits_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/commits{/sha}","comments_url":"https://api.github.com/repos/jansennn/Plan-it-BE/comments{/number}","issue_comment_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/comments{/number}","contents_url":"https://api.github.com/repos/jansennn/Plan-it-BE/contents/{+path}","compare_url":"https://api.github.com/repos/jansennn/Plan-it-BE/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jansennn/Plan-it-BE/merges","archive_url":"https://api.github.com/repos/jansennn/Plan-it-BE/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jansennn/Plan-it-BE/downloads","issues_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues{/number}","pulls_url":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls{/number}","milestones_url":"https://api.github.com/repos/jansennn/Plan-it-BE/milestones{/number}","notifications_url":"https://api.github.com/repos/jansennn/Plan-it-BE/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jansennn/Plan-it-BE/labels{/name}","releases_url":"https://api.github.com/repos/jansennn/Plan-it-BE/releases{/id}","deployments_url":"https://api.github.com/repos/jansennn/Plan-it-BE/deployments","created_at":"2021-01-19T01:32:14Z","updated_at":"2021-07-17T12:57:48Z","pushed_at":"2021-07-21T08:57:08Z","git_url":"git://github.com/jansennn/Plan-it-BE.git","ssh_url":"git@github.com:jansennn/Plan-it-BE.git","clone_url":"https://github.com/jansennn/Plan-it-BE.git","svn_url":"https://github.com/jansennn/Plan-it-BE","homepage":null,"size":9052,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"jansennn:master","ref":"master","sha":"77f1ea70526d4218efba6bcb111ace91d2461895","user":{"login":"jansennn","id":38531347,"node_id":"MDQ6VXNlcjM4NTMxMzQ3","avatar_url":"https://avatars.githubusercontent.com/u/38531347?v=4","gravatar_id":"","url":"https://api.github.com/users/jansennn","html_url":"https://github.com/jansennn","followers_url":"https://api.github.com/users/jansennn/followers","following_url":"https://api.github.com/users/jansennn/following{/other_user}","gists_url":"https://api.github.com/users/jansennn/gists{/gist_id}","starred_url":"https://api.github.com/users/jansennn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jansennn/subscriptions","organizations_url":"https://api.github.com/users/jansennn/orgs","repos_url":"https://api.github.com/users/jansennn/repos","events_url":"https://api.github.com/users/jansennn/events{/privacy}","received_events_url":"https://api.github.com/users/jansennn/received_events","type":"User","site_admin":false},"repo":{"id":330831044,"node_id":"MDEwOlJlcG9zaXRvcnkzMzA4MzEwNDQ=","name":"Plan-it-BE","full_name":"jansennn/Plan-it-BE","private":false,"owner":{"login":"jansennn","id":38531347,"node_id":"MDQ6VXNlcjM4NTMxMzQ3","avatar_url":"https://avatars.githubusercontent.com/u/38531347?v=4","gravatar_id":"","url":"https://api.github.com/users/jansennn","html_url":"https://github.com/jansennn","followers_url":"https://api.github.com/users/jansennn/followers","following_url":"https://api.github.com/users/jansennn/following{/other_user}","gists_url":"https://api.github.com/users/jansennn/gists{/gist_id}","starred_url":"https://api.github.com/users/jansennn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jansennn/subscriptions","organizations_url":"https://api.github.com/users/jansennn/orgs","repos_url":"https://api.github.com/users/jansennn/repos","events_url":"https://api.github.com/users/jansennn/events{/privacy}","received_events_url":"https://api.github.com/users/jansennn/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jansennn/Plan-it-BE","description":"Tugas Akhir","fork":false,"url":"https://api.github.com/repos/jansennn/Plan-it-BE","forks_url":"https://api.github.com/repos/jansennn/Plan-it-BE/forks","keys_url":"https://api.github.com/repos/jansennn/Plan-it-BE/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jansennn/Plan-it-BE/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jansennn/Plan-it-BE/teams","hooks_url":"https://api.github.com/repos/jansennn/Plan-it-BE/hooks","issue_events_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/events{/number}","events_url":"https://api.github.com/repos/jansennn/Plan-it-BE/events","assignees_url":"https://api.github.com/repos/jansennn/Plan-it-BE/assignees{/user}","branches_url":"https://api.github.com/repos/jansennn/Plan-it-BE/branches{/branch}","tags_url":"https://api.github.com/repos/jansennn/Plan-it-BE/tags","blobs_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/refs{/sha}","trees_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jansennn/Plan-it-BE/statuses/{sha}","languages_url":"https://api.github.com/repos/jansennn/Plan-it-BE/languages","stargazers_url":"https://api.github.com/repos/jansennn/Plan-it-BE/stargazers","contributors_url":"https://api.github.com/repos/jansennn/Plan-it-BE/contributors","subscribers_url":"https://api.github.com/repos/jansennn/Plan-it-BE/subscribers","subscription_url":"https://api.github.com/repos/jansennn/Plan-it-BE/subscription","commits_url":"https://api.github.com/repos/jansennn/Plan-it-BE/commits{/sha}","git_commits_url":"https://api.github.com/repos/jansennn/Plan-it-BE/git/commits{/sha}","comments_url":"https://api.github.com/repos/jansennn/Plan-it-BE/comments{/number}","issue_comment_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/comments{/number}","contents_url":"https://api.github.com/repos/jansennn/Plan-it-BE/contents/{+path}","compare_url":"https://api.github.com/repos/jansennn/Plan-it-BE/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jansennn/Plan-it-BE/merges","archive_url":"https://api.github.com/repos/jansennn/Plan-it-BE/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jansennn/Plan-it-BE/downloads","issues_url":"https://api.github.com/repos/jansennn/Plan-it-BE/issues{/number}","pulls_url":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls{/number}","milestones_url":"https://api.github.com/repos/jansennn/Plan-it-BE/milestones{/number}","notifications_url":"https://api.github.com/repos/jansennn/Plan-it-BE/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jansennn/Plan-it-BE/labels{/name}","releases_url":"https://api.github.com/repos/jansennn/Plan-it-BE/releases{/id}","deployments_url":"https://api.github.com/repos/jansennn/Plan-it-BE/deployments","created_at":"2021-01-19T01:32:14Z","updated_at":"2021-07-17T12:57:48Z","pushed_at":"2021-07-21T08:57:08Z","git_url":"git://github.com/jansennn/Plan-it-BE.git","ssh_url":"git@github.com:jansennn/Plan-it-BE.git","clone_url":"https://github.com/jansennn/Plan-it-BE.git","svn_url":"https://github.com/jansennn/Plan-it-BE","homepage":null,"size":9052,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/22"},"html":{"href":"https://github.com/jansennn/Plan-it-BE/pull/22"},"issue":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/22"},"comments":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/issues/22/comments"},"review_comments":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/22/comments"},"review_comment":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/pulls/22/commits"},"statuses":{"href":"https://api.github.com/repos/jansennn/Plan-it-BE/statuses/47ee42ed38e37c3382af72a399c0ff8532493494"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":914,"deletions":742,"changed_files":5}},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339424","type":"CreateEvent","actor":{"id":79913779,"login":"conda-forge-curator[bot]","display_login":"conda-forge-curator","gravatar_id":"","url":"https://api.github.com/users/conda-forge-curator[bot]","avatar_url":"https://avatars.githubusercontent.com/u/79913779?"},"repo":{"id":288431736,"name":"conda-forge/releases","url":"https://api.github.com/repos/conda-forge/releases"},"payload":{"ref":"win-64/astroid-2.6.5-py38haa244fe_0.tar.bz2","ref_type":"tag","master_branch":"master","description":"releases of conda-forge builds","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":11897326,"login":"conda-forge","gravatar_id":"","url":"https://api.github.com/orgs/conda-forge","avatar_url":"https://avatars.githubusercontent.com/u/11897326?"}}
+{"id":"17246339427","type":"PushEvent","actor":{"id":615952,"login":"billybobza","display_login":"billybobza","gravatar_id":"","url":"https://api.github.com/users/billybobza","avatar_url":"https://avatars.githubusercontent.com/u/615952?"},"repo":{"id":325979131,"name":"newstools/2021-deutsche-welle-africa","url":"https://api.github.com/repos/newstools/2021-deutsche-welle-africa"},"payload":{"push_id":7562451076,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"dfca4b939881d4a1dac14fa038ab3ff7d0becb2c","before":"ef61bc73742941a3bfd390eecf3b3a74ad56f0d6","commits":[{"sha":"dfca4b939881d4a1dac14fa038ab3ff7d0becb2c","author":{"name":"Billy Einkamerer","email":"051522d0c46404d8ba5b692a10a37b99b8186360@assemble.co.za"},"message":"Created Text For URL [www.dw.com/en/climate-change-migration-how-merkels-successors-measure-up/a-58261469]","distinct":true,"url":"https://api.github.com/repos/newstools/2021-deutsche-welle-africa/commits/dfca4b939881d4a1dac14fa038ab3ff7d0becb2c"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":17193977,"login":"newstools","gravatar_id":"","url":"https://api.github.com/orgs/newstools","avatar_url":"https://avatars.githubusercontent.com/u/17193977?"}}
+{"id":"17246339433","type":"PushEvent","actor":{"id":74347264,"login":"boost-e2e-tester-user","display_login":"boost-e2e-tester-user","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-tester-user","avatar_url":"https://avatars.githubusercontent.com/u/74347264?"},"repo":{"id":376948559,"name":"boost-e2e-stage-ci-buildkite/pr-comments","url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments"},"payload":{"push_id":7562451080,"size":1,"distinct_size":1,"ref":"refs/heads/pr-comment","head":"cbfe19073ba710838d05858cdce5a23bc3c57894","before":"8402da60c61dd3efa44f3424268d09bbf44d850c","commits":[{"sha":"cbfe19073ba710838d05858cdce5a23bc3c57894","author":{"name":"Boost E2E tester script","email":"6bedb45c7c0408832d60210d552723fdc15d851e@boostsecurity.io"},"message":"[ci skip] Test PR Comment","distinct":true,"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/commits/cbfe19073ba710838d05858cdce5a23bc3c57894"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":81248900,"login":"boost-e2e-stage-ci-buildkite","gravatar_id":"","url":"https://api.github.com/orgs/boost-e2e-stage-ci-buildkite","avatar_url":"https://avatars.githubusercontent.com/u/81248900?"}}
+{"id":"17246339434","type":"PushEvent","actor":{"id":56023474,"login":"liulka-oxid","display_login":"liulka-oxid","gravatar_id":"","url":"https://api.github.com/users/liulka-oxid","avatar_url":"https://avatars.githubusercontent.com/u/56023474?"},"repo":{"id":45610331,"name":"OXID-eSales/developer_documentation","url":"https://api.github.com/repos/OXID-eSales/developer_documentation"},"payload":{"push_id":7562451075,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8961304f2bbdc712eb30b08bd8304c4ff042eca3","before":"70ff218a3aa206f305e180a91e3afa4599b5bfe6","commits":[{"sha":"8961304f2bbdc712eb30b08bd8304c4ff042eca3","author":{"name":"Vasyl Liulka","email":"8816c4cfb90e471b9a1568f5c9b62556f5e8017c@oxid-esales.com"},"message":"OXDEV-4739 - Remove assign_adv examples","distinct":true,"url":"https://api.github.com/repos/OXID-eSales/developer_documentation/commits/8961304f2bbdc712eb30b08bd8304c4ff042eca3"}]},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":3502610,"login":"OXID-eSales","gravatar_id":"","url":"https://api.github.com/orgs/OXID-eSales","avatar_url":"https://avatars.githubusercontent.com/u/3502610?"}}
+{"id":"17246339455","type":"PushEvent","actor":{"id":87718722,"login":"alezfergusonn9054","display_login":"alezfergusonn9054","gravatar_id":"","url":"https://api.github.com/users/alezfergusonn9054","avatar_url":"https://avatars.githubusercontent.com/u/87718722?"},"repo":{"id":387866864,"name":"alezfergusonn9054/hfdbx4","url":"https://api.github.com/repos/alezfergusonn9054/hfdbx4"},"payload":{"push_id":7562451095,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"a79af7a3248fc813269b95e0a487d32c3b080c74","before":"07a6007f00815c2bb5b8793e3c8d20ed80984b2c","commits":[{"sha":"a79af7a3248fc813269b95e0a487d32c3b080c74","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/alezfergusonn9054/hfdbx4/commits/a79af7a3248fc813269b95e0a487d32c3b080c74"}]},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339461","type":"PullRequestEvent","actor":{"id":29139614,"login":"renovate[bot]","display_login":"renovate","gravatar_id":"","url":"https://api.github.com/users/renovate[bot]","avatar_url":"https://avatars.githubusercontent.com/u/29139614?"},"repo":{"id":315713528,"name":"Yfill/waves","url":"https://api.github.com/repos/Yfill/waves"},"payload":{"action":"opened","number":168,"pull_request":{"url":"https://api.github.com/repos/Yfill/waves/pulls/168","id":694185705,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzA1","html_url":"https://github.com/Yfill/waves/pull/168","diff_url":"https://github.com/Yfill/waves/pull/168.diff","patch_url":"https://github.com/Yfill/waves/pull/168.patch","issue_url":"https://api.github.com/repos/Yfill/waves/issues/168","number":168,"state":"open","locked":false,"title":"chore(deps): update dependency rollup to v2.53.3","user":{"login":"renovate[bot]","id":29139614,"node_id":"MDM6Qm90MjkxMzk2MTQ=","avatar_url":"https://avatars.githubusercontent.com/in/2740?v=4","gravatar_id":"","url":"https://api.github.com/users/renovate%5Bbot%5D","html_url":"https://github.com/apps/renovate","followers_url":"https://api.github.com/users/renovate%5Bbot%5D/followers","following_url":"https://api.github.com/users/renovate%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/renovate%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/renovate%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/renovate%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/renovate%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/renovate%5Bbot%5D/repos","events_url":"https://api.github.com/users/renovate%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/renovate%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [rollup](https://rollupjs.org/) ([source](https://togithub.com/rollup/rollup)) | [`2.53.2` -> `2.53.3`](https://renovatebot.com/diffs/npm/rollup/2.53.2/2.53.3) | [![age](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/compatibility-slim/2.53.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/rollup/2.53.3/confidence-slim/2.53.2)](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>rollup/rollup</summary>\n\n### [`v2.53.3`](https://togithub.com/rollup/rollup/blob/master/CHANGELOG.md#&#8203;2533)\n\n[Compare Source](https://togithub.com/rollup/rollup/compare/v2.53.2...v2.53.3)\n\n*2021-07-21*\n\n##### Bug Fixes\n\n-   Solve an issue that could lead to severe memory issues and crashes when there are a lot of hoisted variables ([#&#8203;4183](https://togithub.com/rollup/rollup/issues/4183))\n\n##### Pull Requests\n\n-   [#&#8203;4183](https://togithub.com/rollup/rollup/pull/4183): Avoid memory issues with hoisted variables ([@&#8203;lukastaegert](https://togithub.com/lukastaegert))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\n\n---\n\nThis PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/Yfill/waves).","created_at":"2021-07-21T09:00:00Z","updated_at":"2021-07-21T09:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Yfill/waves/pulls/168/commits","review_comments_url":"https://api.github.com/repos/Yfill/waves/pulls/168/comments","review_comment_url":"https://api.github.com/repos/Yfill/waves/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Yfill/waves/issues/168/comments","statuses_url":"https://api.github.com/repos/Yfill/waves/statuses/6b24ceac101363876e2c89e7ecc65ad0137b06c3","head":{"label":"Yfill:renovate/rollup-2.x","ref":"renovate/rollup-2.x","sha":"6b24ceac101363876e2c89e7ecc65ad0137b06c3","user":{"login":"Yfill","id":33168885,"node_id":"MDQ6VXNlcjMzMTY4ODg1","avatar_url":"https://avatars.githubusercontent.com/u/33168885?v=4","gravatar_id":"","url":"https://api.github.com/users/Yfill","html_url":"https://github.com/Yfill","followers_url":"https://api.github.com/users/Yfill/followers","following_url":"https://api.github.com/users/Yfill/following{/other_user}","gists_url":"https://api.github.com/users/Yfill/gists{/gist_id}","starred_url":"https://api.github.com/users/Yfill/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Yfill/subscriptions","organizations_url":"https://api.github.com/users/Yfill/orgs","repos_url":"https://api.github.com/users/Yfill/repos","events_url":"https://api.github.com/users/Yfill/events{/privacy}","received_events_url":"https://api.github.com/users/Yfill/received_events","type":"User","site_admin":false},"repo":{"id":315713528,"node_id":"MDEwOlJlcG9zaXRvcnkzMTU3MTM1Mjg=","name":"waves","full_name":"Yfill/waves","private":false,"owner":{"login":"Yfill","id":33168885,"node_id":"MDQ6VXNlcjMzMTY4ODg1","avatar_url":"https://avatars.githubusercontent.com/u/33168885?v=4","gravatar_id":"","url":"https://api.github.com/users/Yfill","html_url":"https://github.com/Yfill","followers_url":"https://api.github.com/users/Yfill/followers","following_url":"https://api.github.com/users/Yfill/following{/other_user}","gists_url":"https://api.github.com/users/Yfill/gists{/gist_id}","starred_url":"https://api.github.com/users/Yfill/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Yfill/subscriptions","organizations_url":"https://api.github.com/users/Yfill/orgs","repos_url":"https://api.github.com/users/Yfill/repos","events_url":"https://api.github.com/users/Yfill/events{/privacy}","received_events_url":"https://api.github.com/users/Yfill/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Yfill/waves","description":"Click the wave effect","fork":false,"url":"https://api.github.com/repos/Yfill/waves","forks_url":"https://api.github.com/repos/Yfill/waves/forks","keys_url":"https://api.github.com/repos/Yfill/waves/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Yfill/waves/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Yfill/waves/teams","hooks_url":"https://api.github.com/repos/Yfill/waves/hooks","issue_events_url":"https://api.github.com/repos/Yfill/waves/issues/events{/number}","events_url":"https://api.github.com/repos/Yfill/waves/events","assignees_url":"https://api.github.com/repos/Yfill/waves/assignees{/user}","branches_url":"https://api.github.com/repos/Yfill/waves/branches{/branch}","tags_url":"https://api.github.com/repos/Yfill/waves/tags","blobs_url":"https://api.github.com/repos/Yfill/waves/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Yfill/waves/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Yfill/waves/git/refs{/sha}","trees_url":"https://api.github.com/repos/Yfill/waves/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Yfill/waves/statuses/{sha}","languages_url":"https://api.github.com/repos/Yfill/waves/languages","stargazers_url":"https://api.github.com/repos/Yfill/waves/stargazers","contributors_url":"https://api.github.com/repos/Yfill/waves/contributors","subscribers_url":"https://api.github.com/repos/Yfill/waves/subscribers","subscription_url":"https://api.github.com/repos/Yfill/waves/subscription","commits_url":"https://api.github.com/repos/Yfill/waves/commits{/sha}","git_commits_url":"https://api.github.com/repos/Yfill/waves/git/commits{/sha}","comments_url":"https://api.github.com/repos/Yfill/waves/comments{/number}","issue_comment_url":"https://api.github.com/repos/Yfill/waves/issues/comments{/number}","contents_url":"https://api.github.com/repos/Yfill/waves/contents/{+path}","compare_url":"https://api.github.com/repos/Yfill/waves/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Yfill/waves/merges","archive_url":"https://api.github.com/repos/Yfill/waves/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Yfill/waves/downloads","issues_url":"https://api.github.com/repos/Yfill/waves/issues{/number}","pulls_url":"https://api.github.com/repos/Yfill/waves/pulls{/number}","milestones_url":"https://api.github.com/repos/Yfill/waves/milestones{/number}","notifications_url":"https://api.github.com/repos/Yfill/waves/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Yfill/waves/labels{/name}","releases_url":"https://api.github.com/repos/Yfill/waves/releases{/id}","deployments_url":"https://api.github.com/repos/Yfill/waves/deployments","created_at":"2020-11-24T18:01:57Z","updated_at":"2021-07-20T02:47:37Z","pushed_at":"2021-07-21T08:59:59Z","git_url":"git://github.com/Yfill/waves.git","ssh_url":"git@github.com:Yfill/waves.git","clone_url":"https://github.com/Yfill/waves.git","svn_url":"https://github.com/Yfill/waves","homepage":"https://yfill.cn/waves","size":248,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":2,"watchers":0,"default_branch":"main"}},"base":{"label":"Yfill:main","ref":"main","sha":"c00ef7e4569ffa4056c700ee3753b1ad0ccc4706","user":{"login":"Yfill","id":33168885,"node_id":"MDQ6VXNlcjMzMTY4ODg1","avatar_url":"https://avatars.githubusercontent.com/u/33168885?v=4","gravatar_id":"","url":"https://api.github.com/users/Yfill","html_url":"https://github.com/Yfill","followers_url":"https://api.github.com/users/Yfill/followers","following_url":"https://api.github.com/users/Yfill/following{/other_user}","gists_url":"https://api.github.com/users/Yfill/gists{/gist_id}","starred_url":"https://api.github.com/users/Yfill/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Yfill/subscriptions","organizations_url":"https://api.github.com/users/Yfill/orgs","repos_url":"https://api.github.com/users/Yfill/repos","events_url":"https://api.github.com/users/Yfill/events{/privacy}","received_events_url":"https://api.github.com/users/Yfill/received_events","type":"User","site_admin":false},"repo":{"id":315713528,"node_id":"MDEwOlJlcG9zaXRvcnkzMTU3MTM1Mjg=","name":"waves","full_name":"Yfill/waves","private":false,"owner":{"login":"Yfill","id":33168885,"node_id":"MDQ6VXNlcjMzMTY4ODg1","avatar_url":"https://avatars.githubusercontent.com/u/33168885?v=4","gravatar_id":"","url":"https://api.github.com/users/Yfill","html_url":"https://github.com/Yfill","followers_url":"https://api.github.com/users/Yfill/followers","following_url":"https://api.github.com/users/Yfill/following{/other_user}","gists_url":"https://api.github.com/users/Yfill/gists{/gist_id}","starred_url":"https://api.github.com/users/Yfill/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Yfill/subscriptions","organizations_url":"https://api.github.com/users/Yfill/orgs","repos_url":"https://api.github.com/users/Yfill/repos","events_url":"https://api.github.com/users/Yfill/events{/privacy}","received_events_url":"https://api.github.com/users/Yfill/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Yfill/waves","description":"Click the wave effect","fork":false,"url":"https://api.github.com/repos/Yfill/waves","forks_url":"https://api.github.com/repos/Yfill/waves/forks","keys_url":"https://api.github.com/repos/Yfill/waves/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Yfill/waves/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Yfill/waves/teams","hooks_url":"https://api.github.com/repos/Yfill/waves/hooks","issue_events_url":"https://api.github.com/repos/Yfill/waves/issues/events{/number}","events_url":"https://api.github.com/repos/Yfill/waves/events","assignees_url":"https://api.github.com/repos/Yfill/waves/assignees{/user}","branches_url":"https://api.github.com/repos/Yfill/waves/branches{/branch}","tags_url":"https://api.github.com/repos/Yfill/waves/tags","blobs_url":"https://api.github.com/repos/Yfill/waves/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Yfill/waves/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Yfill/waves/git/refs{/sha}","trees_url":"https://api.github.com/repos/Yfill/waves/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Yfill/waves/statuses/{sha}","languages_url":"https://api.github.com/repos/Yfill/waves/languages","stargazers_url":"https://api.github.com/repos/Yfill/waves/stargazers","contributors_url":"https://api.github.com/repos/Yfill/waves/contributors","subscribers_url":"https://api.github.com/repos/Yfill/waves/subscribers","subscription_url":"https://api.github.com/repos/Yfill/waves/subscription","commits_url":"https://api.github.com/repos/Yfill/waves/commits{/sha}","git_commits_url":"https://api.github.com/repos/Yfill/waves/git/commits{/sha}","comments_url":"https://api.github.com/repos/Yfill/waves/comments{/number}","issue_comment_url":"https://api.github.com/repos/Yfill/waves/issues/comments{/number}","contents_url":"https://api.github.com/repos/Yfill/waves/contents/{+path}","compare_url":"https://api.github.com/repos/Yfill/waves/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Yfill/waves/merges","archive_url":"https://api.github.com/repos/Yfill/waves/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Yfill/waves/downloads","issues_url":"https://api.github.com/repos/Yfill/waves/issues{/number}","pulls_url":"https://api.github.com/repos/Yfill/waves/pulls{/number}","milestones_url":"https://api.github.com/repos/Yfill/waves/milestones{/number}","notifications_url":"https://api.github.com/repos/Yfill/waves/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Yfill/waves/labels{/name}","releases_url":"https://api.github.com/repos/Yfill/waves/releases{/id}","deployments_url":"https://api.github.com/repos/Yfill/waves/deployments","created_at":"2020-11-24T18:01:57Z","updated_at":"2021-07-20T02:47:37Z","pushed_at":"2021-07-21T08:59:59Z","git_url":"git://github.com/Yfill/waves.git","ssh_url":"git@github.com:Yfill/waves.git","clone_url":"https://github.com/Yfill/waves.git","svn_url":"https://github.com/Yfill/waves","homepage":"https://yfill.cn/waves","size":248,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":2,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/Yfill/waves/pulls/168"},"html":{"href":"https://github.com/Yfill/waves/pull/168"},"issue":{"href":"https://api.github.com/repos/Yfill/waves/issues/168"},"comments":{"href":"https://api.github.com/repos/Yfill/waves/issues/168/comments"},"review_comments":{"href":"https://api.github.com/repos/Yfill/waves/pulls/168/comments"},"review_comment":{"href":"https://api.github.com/repos/Yfill/waves/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Yfill/waves/pulls/168/commits"},"statuses":{"href":"https://api.github.com/repos/Yfill/waves/statuses/6b24ceac101363876e2c89e7ecc65ad0137b06c3"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T09:00:00Z"}
+{"id":"17246339465","type":"DeleteEvent","actor":{"id":42348110,"login":"johanneshiry","display_login":"johanneshiry","gravatar_id":"","url":"https://api.github.com/users/johanneshiry","avatar_url":"https://avatars.githubusercontent.com/u/42348110?"},"repo":{"id":235830706,"name":"ie3-institute/PowerSystemDataModel","url":"https://api.github.com/repos/ie3-institute/PowerSystemDataModel"},"payload":{"ref":"dependabot/gradle/dev/testcontainersVersion-1.16.0","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":58265273,"login":"ie3-institute","gravatar_id":"","url":"https://api.github.com/orgs/ie3-institute","avatar_url":"https://avatars.githubusercontent.com/u/58265273?"}}
+{"id":"17246339468","type":"PushEvent","actor":{"id":87652464,"login":"nature011235","display_login":"nature011235","gravatar_id":"","url":"https://api.github.com/users/nature011235","avatar_url":"https://avatars.githubusercontent.com/u/87652464?"},"repo":{"id":387830647,"name":"nature011235/Little-game","url":"https://api.github.com/repos/nature011235/Little-game"},"payload":{"push_id":7562451098,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"aa95bf483b1b30e6c39a1b711731cd428f2c5226","before":"11c59ea186e1579bba8c1ee5919fd71c0282c823","commits":[{"sha":"aa95bf483b1b30e6c39a1b711731cd428f2c5226","author":{"name":"nature011235","email":"d707a7066e8a92010dfd651e03305c5e523f4d61@users.noreply.github.com"},"message":"Add files via upload","distinct":true,"url":"https://api.github.com/repos/nature011235/Little-game/commits/aa95bf483b1b30e6c39a1b711731cd428f2c5226"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339490","type":"PushEvent","actor":{"id":81258380,"login":"Helikopter-Bojowy","display_login":"Helikopter-Bojowy","gravatar_id":"","url":"https://api.github.com/users/Helikopter-Bojowy","avatar_url":"https://avatars.githubusercontent.com/u/81258380?"},"repo":{"id":352069365,"name":"Helikopter-Bojowy/Exp-na-helikopterze","url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze"},"payload":{"push_id":7562451103,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"2003d5f663f56005804f900324a569f18e221913","before":"0bfd0a1c279b39653a869a9c26a60e478c0aef34","commits":[{"sha":"2003d5f663f56005804f900324a569f18e221913","author":{"name":"Helikopter-Bojowy","email":"733707e04c8bf7c874ce97516f8f637586fc79d7@users.noreply.github.com"},"message":"1626858000021:627954597599641601","distinct":true,"url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze/commits/2003d5f663f56005804f900324a569f18e221913"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339497","type":"PushEvent","actor":{"id":11331188,"login":"angulito","display_login":"angulito","gravatar_id":"","url":"https://api.github.com/users/angulito","avatar_url":"https://avatars.githubusercontent.com/u/11331188?"},"repo":{"id":387742598,"name":"angulito/sling-org-apache-sling-servlets-resolver","url":"https://api.github.com/repos/angulito/sling-org-apache-sling-servlets-resolver"},"payload":{"push_id":7562451104,"size":1,"distinct_size":1,"ref":"refs/heads/SLING-10644-return-servlet-resolver-information-in-json-format","head":"1bcf52e6d266743df8c2f9b7ba7bfbf7a53fb67c","before":"9f451c2c3d695a5535d6e993fbc48eb31bb4d59a","commits":[{"sha":"1bcf52e6d266743df8c2f9b7ba7bfbf7a53fb67c","author":{"name":"angulito","email":"c5035bfb9c1ac92bc56577d3d31b1940cf52b111@gmail.com"},"message":"Add more test cases to address sonar coverage\n\nSLING-10644","distinct":true,"url":"https://api.github.com/repos/angulito/sling-org-apache-sling-servlets-resolver/commits/1bcf52e6d266743df8c2f9b7ba7bfbf7a53fb67c"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339502","type":"PushEvent","actor":{"id":58833107,"login":"hrhwve3553","display_login":"hrhwve3553","gravatar_id":"","url":"https://api.github.com/users/hrhwve3553","avatar_url":"https://avatars.githubusercontent.com/u/58833107?"},"repo":{"id":227725053,"name":"hrhwve3553/ntdtv","url":"https://api.github.com/repos/hrhwve3553/ntdtv"},"payload":{"push_id":7562451096,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"7a4554a96e3e4f8a92b3179615a8ae26af3fcfc5","before":"2eb4f5b9b48c2a1db54cad856021f0dad94bf211","commits":[{"sha":"7a4554a96e3e4f8a92b3179615a8ae26af3fcfc5","author":{"name":"hrhwve3553","email":"10135ac1af9bed4c0bec7c29db44050e24a097b2@users.noreply.github.com"},"message":"Update 442749_3.md","distinct":true,"url":"https://api.github.com/repos/hrhwve3553/ntdtv/commits/7a4554a96e3e4f8a92b3179615a8ae26af3fcfc5"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339504","type":"WatchEvent","actor":{"id":37009435,"login":"zepherusqin","display_login":"zepherusqin","gravatar_id":"","url":"https://api.github.com/users/zepherusqin","avatar_url":"https://avatars.githubusercontent.com/u/37009435?"},"repo":{"id":375257099,"name":"yanlong-sun/lstm_unet","url":"https://api.github.com/repos/yanlong-sun/lstm_unet"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339505","type":"PushEvent","actor":{"id":58833107,"login":"hrhwve3553","display_login":"hrhwve3553","gravatar_id":"","url":"https://api.github.com/users/hrhwve3553","avatar_url":"https://avatars.githubusercontent.com/u/58833107?"},"repo":{"id":227724995,"name":"hrhwve3553/djy","url":"https://api.github.com/repos/hrhwve3553/djy"},"payload":{"push_id":7562451122,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"31ac9a45007e5c34dc9d3375d6b31ce590c9ad50","before":"8bcd3dcb3024f61d129bac8b13410a314c29191a","commits":[{"sha":"31ac9a45007e5c34dc9d3375d6b31ce590c9ad50","author":{"name":"hrhwve3553","email":"10135ac1af9bed4c0bec7c29db44050e24a097b2@users.noreply.github.com"},"message":"Update nsc413_3.md","distinct":true,"url":"https://api.github.com/repos/hrhwve3553/djy/commits/31ac9a45007e5c34dc9d3375d6b31ce590c9ad50"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339506","type":"CreateEvent","actor":{"id":73436831,"login":"mayank-mallick","display_login":"mayank-mallick","gravatar_id":"","url":"https://api.github.com/users/mayank-mallick","avatar_url":"https://avatars.githubusercontent.com/u/73436831?"},"repo":{"id":388056957,"name":"mayank-mallick/password-generator","url":"https://api.github.com/repos/mayank-mallick/password-generator"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":"password-generator","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339510","type":"WatchEvent","actor":{"id":86214990,"login":"px1794","display_login":"px1794","gravatar_id":"","url":"https://api.github.com/users/px1794","avatar_url":"https://avatars.githubusercontent.com/u/86214990?"},"repo":{"id":93947448,"name":"twintproject/twint","url":"https://api.github.com/repos/twintproject/twint"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":40190352,"login":"twintproject","gravatar_id":"","url":"https://api.github.com/orgs/twintproject","avatar_url":"https://avatars.githubusercontent.com/u/40190352?"}}
+{"id":"17246339514","type":"CreateEvent","actor":{"id":80614815,"login":"DimpleGore","display_login":"DimpleGore","gravatar_id":"","url":"https://api.github.com/users/DimpleGore","avatar_url":"https://avatars.githubusercontent.com/u/80614815?"},"repo":{"id":388056961,"name":"DimpleGore/pixel","url":"https://api.github.com/repos/DimpleGore/pixel"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339515","type":"PushEvent","actor":{"id":87110291,"login":"RohKumarT","display_login":"RohKumarT","gravatar_id":"","url":"https://api.github.com/users/RohKumarT","avatar_url":"https://avatars.githubusercontent.com/u/87110291?"},"repo":{"id":387377532,"name":"RohKumarT/Github-Action-test","url":"https://api.github.com/repos/RohKumarT/Github-Action-test"},"payload":{"push_id":7562451112,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"5aaa190d13ed7c9c061b512085c0836a4c4f035d","before":"0e35e1a37b1860d3819c9f50e26f610c95a90754","commits":[{"sha":"5aaa190d13ed7c9c061b512085c0836a4c4f035d","author":{"name":"Rohit Kumar","email":"0472d8daeabc9833babe0a28328d70f545aae9ca@tibco.com"},"message":"added the final workflow","distinct":true,"url":"https://api.github.com/repos/RohKumarT/Github-Action-test/commits/5aaa190d13ed7c9c061b512085c0836a4c4f035d"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339516","type":"WatchEvent","actor":{"id":261274,"login":"renothing","display_login":"renothing","gravatar_id":"","url":"https://api.github.com/users/renothing","avatar_url":"https://avatars.githubusercontent.com/u/261274?"},"repo":{"id":385332374,"name":"blueedgetechno/windows11","url":"https://api.github.com/repos/blueedgetechno/windows11"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339526","type":"PushEvent","actor":{"id":87747615,"login":"mitchelmarushh775","display_login":"mitchelmarushh775","gravatar_id":"","url":"https://api.github.com/users/mitchelmarushh775","avatar_url":"https://avatars.githubusercontent.com/u/87747615?"},"repo":{"id":388008198,"name":"mitchelmarushh775/cnlkfhw5","url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw5"},"payload":{"push_id":7562451110,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"a104d91b39bb150eeab640a0940aafeb1945cc9a","before":"0838c7e58caf049e1e18177f3c8b9eb18ddab2a0","commits":[{"sha":"a104d91b39bb150eeab640a0940aafeb1945cc9a","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw5/commits/a104d91b39bb150eeab640a0940aafeb1945cc9a"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339530","type":"PushEvent","actor":{"id":11451757,"login":"dolauli","display_login":"dolauli","gravatar_id":"","url":"https://api.github.com/users/dolauli","avatar_url":"https://avatars.githubusercontent.com/u/11451757?"},"repo":{"id":202304052,"name":"dolauli/autorest.powershell","url":"https://api.github.com/repos/dolauli/autorest.powershell"},"payload":{"push_id":7562451120,"size":1,"distinct_size":1,"ref":"refs/heads/breakingchange","head":"606f72d4b868575522cf4487cf9baa03b5d5e3d4","before":"459b250df37c0f84e02ca24482744dd1478fc74c","commits":[{"sha":"606f72d4b868575522cf4487cf9baa03b5d5e3d4","author":{"name":"derek","email":"2d41aa49352a9846d1919261cdc41d42c783ca3a@microsoft.com"},"message":"get old parameter type and output type from the schema defined in swagger","distinct":true,"url":"https://api.github.com/repos/dolauli/autorest.powershell/commits/606f72d4b868575522cf4487cf9baa03b5d5e3d4"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339534","type":"PullRequestReviewEvent","actor":{"id":40165257,"login":"Adrian-Chlopowiec","display_login":"Adrian-Chlopowiec","gravatar_id":"","url":"https://api.github.com/users/Adrian-Chlopowiec","avatar_url":"https://avatars.githubusercontent.com/u/40165257?"},"repo":{"id":358010569,"name":"PWR-Informatyka-biomedyczna/DoggOSFuzzy","url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy"},"payload":{"action":"created","review":{"id":711417104,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDE3MTA0","user":{"login":"Adrian-Chlopowiec","id":40165257,"node_id":"MDQ6VXNlcjQwMTY1MjU3","avatar_url":"https://avatars.githubusercontent.com/u/40165257?v=4","gravatar_id":"","url":"https://api.github.com/users/Adrian-Chlopowiec","html_url":"https://github.com/Adrian-Chlopowiec","followers_url":"https://api.github.com/users/Adrian-Chlopowiec/followers","following_url":"https://api.github.com/users/Adrian-Chlopowiec/following{/other_user}","gists_url":"https://api.github.com/users/Adrian-Chlopowiec/gists{/gist_id}","starred_url":"https://api.github.com/users/Adrian-Chlopowiec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Adrian-Chlopowiec/subscriptions","organizations_url":"https://api.github.com/users/Adrian-Chlopowiec/orgs","repos_url":"https://api.github.com/users/Adrian-Chlopowiec/repos","events_url":"https://api.github.com/users/Adrian-Chlopowiec/events{/privacy}","received_events_url":"https://api.github.com/users/Adrian-Chlopowiec/received_events","type":"User","site_admin":false},"body":"","commit_id":"5ee357510ef6374f658faf9798a96410e910fbbb","submitted_at":"2021-07-21T09:00:00Z","state":"changes_requested","html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71#pullrequestreview-711417104","pull_request_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71","author_association":"NONE","_links":{"html":{"href":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71#pullrequestreview-711417104"},"pull_request":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71"}}},"pull_request":{"url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71","id":693461605,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDYxNjA1","html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71","diff_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71.diff","patch_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71.patch","issue_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71","number":71,"state":"open","locked":false,"title":"Equal gausses generation","user":{"login":"Adam-Chlopowiec","id":54243218,"node_id":"MDQ6VXNlcjU0MjQzMjE4","avatar_url":"https://avatars.githubusercontent.com/u/54243218?v=4","gravatar_id":"","url":"https://api.github.com/users/Adam-Chlopowiec","html_url":"https://github.com/Adam-Chlopowiec","followers_url":"https://api.github.com/users/Adam-Chlopowiec/followers","following_url":"https://api.github.com/users/Adam-Chlopowiec/following{/other_user}","gists_url":"https://api.github.com/users/Adam-Chlopowiec/gists{/gist_id}","starred_url":"https://api.github.com/users/Adam-Chlopowiec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Adam-Chlopowiec/subscriptions","organizations_url":"https://api.github.com/users/Adam-Chlopowiec/orgs","repos_url":"https://api.github.com/users/Adam-Chlopowiec/repos","events_url":"https://api.github.com/users/Adam-Chlopowiec/events{/privacy}","received_events_url":"https://api.github.com/users/Adam-Chlopowiec/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T13:20:54Z","updated_at":"2021-07-21T09:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"9eb9f57d130266ab256680951e2275f66865aeb4","assignee":null,"assignees":[],"requested_reviewers":[{"login":"chrisgal77","id":70722272,"node_id":"MDQ6VXNlcjcwNzIyMjcy","avatar_url":"https://avatars.githubusercontent.com/u/70722272?v=4","gravatar_id":"","url":"https://api.github.com/users/chrisgal77","html_url":"https://github.com/chrisgal77","followers_url":"https://api.github.com/users/chrisgal77/followers","following_url":"https://api.github.com/users/chrisgal77/following{/other_user}","gists_url":"https://api.github.com/users/chrisgal77/gists{/gist_id}","starred_url":"https://api.github.com/users/chrisgal77/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chrisgal77/subscriptions","organizations_url":"https://api.github.com/users/chrisgal77/orgs","repos_url":"https://api.github.com/users/chrisgal77/repos","events_url":"https://api.github.com/users/chrisgal77/events{/privacy}","received_events_url":"https://api.github.com/users/chrisgal77/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/commits","review_comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/comments","review_comment_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71/comments","statuses_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/5ee357510ef6374f658faf9798a96410e910fbbb","head":{"label":"PWR-Informatyka-biomedyczna:equalGausses","ref":"equalGausses","sha":"5ee357510ef6374f658faf9798a96410e910fbbb","user":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"repo":{"id":358010569,"node_id":"MDEwOlJlcG9zaXRvcnkzNTgwMTA1Njk=","name":"DoggOSFuzzy","full_name":"PWR-Informatyka-biomedyczna/DoggOSFuzzy","private":false,"owner":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","description":"Open source fuzzy logic library.","fork":false,"url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy","forks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/forks","keys_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/teams","hooks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/hooks","issue_events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/events{/number}","events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/events","assignees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/assignees{/user}","branches_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/branches{/branch}","tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/tags","blobs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/refs{/sha}","trees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/{sha}","languages_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/languages","stargazers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/stargazers","contributors_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contributors","subscribers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscribers","subscription_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscription","commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/commits{/sha}","git_commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/commits{/sha}","comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/comments{/number}","issue_comment_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/comments{/number}","contents_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contents/{+path}","compare_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/merges","archive_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/downloads","issues_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues{/number}","pulls_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls{/number}","milestones_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/milestones{/number}","notifications_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/labels{/name}","releases_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/releases{/id}","deployments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/deployments","created_at":"2021-04-14T18:51:58Z","updated_at":"2021-05-03T22:22:54Z","pushed_at":"2021-07-20T13:23:43Z","git_url":"git://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","ssh_url":"git@github.com:PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","clone_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","svn_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","homepage":null,"size":478,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":13,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":13,"watchers":0,"default_branch":"master"}},"base":{"label":"PWR-Informatyka-biomedyczna:dev","ref":"dev","sha":"c5d8cdd9be05b5d3d34e693a112bb12002c1c46b","user":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"repo":{"id":358010569,"node_id":"MDEwOlJlcG9zaXRvcnkzNTgwMTA1Njk=","name":"DoggOSFuzzy","full_name":"PWR-Informatyka-biomedyczna/DoggOSFuzzy","private":false,"owner":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","description":"Open source fuzzy logic library.","fork":false,"url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy","forks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/forks","keys_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/teams","hooks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/hooks","issue_events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/events{/number}","events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/events","assignees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/assignees{/user}","branches_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/branches{/branch}","tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/tags","blobs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/refs{/sha}","trees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/{sha}","languages_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/languages","stargazers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/stargazers","contributors_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contributors","subscribers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscribers","subscription_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscription","commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/commits{/sha}","git_commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/commits{/sha}","comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/comments{/number}","issue_comment_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/comments{/number}","contents_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contents/{+path}","compare_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/merges","archive_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/downloads","issues_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues{/number}","pulls_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls{/number}","milestones_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/milestones{/number}","notifications_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/labels{/name}","releases_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/releases{/id}","deployments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/deployments","created_at":"2021-04-14T18:51:58Z","updated_at":"2021-05-03T22:22:54Z","pushed_at":"2021-07-20T13:23:43Z","git_url":"git://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","ssh_url":"git@github.com:PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","clone_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","svn_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","homepage":null,"size":478,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":13,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":13,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71"},"html":{"href":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71"},"issue":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71"},"comments":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71/comments"},"review_comments":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/comments"},"review_comment":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/commits"},"statuses":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/5ee357510ef6374f658faf9798a96410e910fbbb"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":67423257,"login":"PWR-Informatyka-biomedyczna","gravatar_id":"","url":"https://api.github.com/orgs/PWR-Informatyka-biomedyczna","avatar_url":"https://avatars.githubusercontent.com/u/67423257?"}}
+{"id":"17246339537","type":"CreateEvent","actor":{"id":70198139,"login":"Keisuke-Joulia","display_login":"Keisuke-Joulia","gravatar_id":"","url":"https://api.github.com/users/Keisuke-Joulia","avatar_url":"https://avatars.githubusercontent.com/u/70198139?"},"repo":{"id":388051165,"name":"Keisuke-Joulia/Portfolio","url":"https://api.github.com/repos/Keisuke-Joulia/Portfolio"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339549","type":"PushEvent","actor":{"id":79913779,"login":"conda-forge-curator[bot]","display_login":"conda-forge-curator","gravatar_id":"","url":"https://api.github.com/users/conda-forge-curator[bot]","avatar_url":"https://avatars.githubusercontent.com/u/79913779?"},"repo":{"id":286991282,"name":"conda-forge/repodata-shards","url":"https://api.github.com/repos/conda-forge/repodata-shards"},"payload":{"push_id":7562451124,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b621128ef3719675e3398376b07e3de84f00c1f1","before":"94b95286b7bdcc5f3109126f224f3c0ebf132a9f","commits":[{"sha":"b621128ef3719675e3398376b07e3de84f00c1f1","author":{"name":"conda-forge-curator[bot]","email":"33ed12a5a1eeb5dbf95e50afdeb87971316ce7da@users.noreply.github.com"},"message":"added win-64/astroid-2.6.5-py38haa244fe_0.tar.bz2 [ci skip] [cf admin skip] ***NO_CI***","distinct":true,"url":"https://api.github.com/repos/conda-forge/repodata-shards/commits/b621128ef3719675e3398376b07e3de84f00c1f1"}]},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":11897326,"login":"conda-forge","gravatar_id":"","url":"https://api.github.com/orgs/conda-forge","avatar_url":"https://avatars.githubusercontent.com/u/11897326?"}}
+{"id":"17246339555","type":"PushEvent","actor":{"id":47364493,"login":"kenken1199","display_login":"kenken1199","gravatar_id":"","url":"https://api.github.com/users/kenken1199","avatar_url":"https://avatars.githubusercontent.com/u/47364493?"},"repo":{"id":388023493,"name":"kenken1199/flask-docker-kn","url":"https://api.github.com/repos/kenken1199/flask-docker-kn"},"payload":{"push_id":7562451115,"size":1,"distinct_size":1,"ref":"refs/heads/ci","head":"b4e434b0dc6bb0ae9e7d499216453665321a85cd","before":"f4fc7ccaf6eef1d052251b6c5de5f87ebd97df1d","commits":[{"sha":"b4e434b0dc6bb0ae9e7d499216453665321a85cd","author":{"name":"kenta","email":"21b7f28c6328e04ba68d8a6bec860e5d73516fd8@gmail.com"},"message":"CircleCI修正 sudo3","distinct":true,"url":"https://api.github.com/repos/kenken1199/flask-docker-kn/commits/b4e434b0dc6bb0ae9e7d499216453665321a85cd"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339565","type":"WatchEvent","actor":{"id":12492626,"login":"ck19940316","display_login":"ck19940316","gravatar_id":"","url":"https://api.github.com/users/ck19940316","avatar_url":"https://avatars.githubusercontent.com/u/12492626?"},"repo":{"id":386492981,"name":"bytedance/flutter_ume","url":"https://api.github.com/repos/bytedance/flutter_ume"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":4158466,"login":"bytedance","gravatar_id":"","url":"https://api.github.com/orgs/bytedance","avatar_url":"https://avatars.githubusercontent.com/u/4158466?"}}
+{"id":"17246339569","type":"ReleaseEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":386520781,"name":"qcloud-apaas/web-sdk","url":"https://api.github.com/repos/qcloud-apaas/web-sdk"},"payload":{"action":"published","release":{"url":"https://api.github.com/repos/qcloud-apaas/web-sdk/releases/46527562","assets_url":"https://api.github.com/repos/qcloud-apaas/web-sdk/releases/46527562/assets","upload_url":"https://uploads.github.com/repos/qcloud-apaas/web-sdk/releases/46527562/assets{?name,label}","html_url":"https://github.com/qcloud-apaas/web-sdk/releases/tag/v0.1.4","id":46527562,"author":{"login":"github-actions[bot]","id":41898282,"node_id":"MDM6Qm90NDE4OTgyODI=","avatar_url":"https://avatars.githubusercontent.com/in/15368?v=4","gravatar_id":"","url":"https://api.github.com/users/github-actions%5Bbot%5D","html_url":"https://github.com/apps/github-actions","followers_url":"https://api.github.com/users/github-actions%5Bbot%5D/followers","following_url":"https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/github-actions%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/github-actions%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/github-actions%5Bbot%5D/repos","events_url":"https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/github-actions%5Bbot%5D/received_events","type":"Bot","site_admin":false},"node_id":"MDc6UmVsZWFzZTQ2NTI3NTYy","tag_name":"v0.1.4","target_commitish":"b7171e84919a370d46cf221a7138c2fc751be1ac","name":"v0.1.4","draft":false,"prerelease":false,"created_at":"2021-07-21T08:57:47Z","published_at":"2021-07-21T09:00:01Z","assets":[],"tarball_url":"https://api.github.com/repos/qcloud-apaas/web-sdk/tarball/v0.1.4","zipball_url":"https://api.github.com/repos/qcloud-apaas/web-sdk/zipball/v0.1.4","body":"","short_description_html":null,"is_short_description_html_truncated":false}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":82105299,"login":"qcloud-apaas","gravatar_id":"","url":"https://api.github.com/orgs/qcloud-apaas","avatar_url":"https://avatars.githubusercontent.com/u/82105299?"}}
+{"id":"17246339571","type":"PullRequestReviewEvent","actor":{"id":40165257,"login":"Adrian-Chlopowiec","display_login":"Adrian-Chlopowiec","gravatar_id":"","url":"https://api.github.com/users/Adrian-Chlopowiec","avatar_url":"https://avatars.githubusercontent.com/u/40165257?"},"repo":{"id":358010569,"name":"PWR-Informatyka-biomedyczna/DoggOSFuzzy","url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy"},"payload":{"action":"created","review":{"id":711417104,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDE3MTA0","user":{"login":"Adrian-Chlopowiec","id":40165257,"node_id":"MDQ6VXNlcjQwMTY1MjU3","avatar_url":"https://avatars.githubusercontent.com/u/40165257?v=4","gravatar_id":"","url":"https://api.github.com/users/Adrian-Chlopowiec","html_url":"https://github.com/Adrian-Chlopowiec","followers_url":"https://api.github.com/users/Adrian-Chlopowiec/followers","following_url":"https://api.github.com/users/Adrian-Chlopowiec/following{/other_user}","gists_url":"https://api.github.com/users/Adrian-Chlopowiec/gists{/gist_id}","starred_url":"https://api.github.com/users/Adrian-Chlopowiec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Adrian-Chlopowiec/subscriptions","organizations_url":"https://api.github.com/users/Adrian-Chlopowiec/orgs","repos_url":"https://api.github.com/users/Adrian-Chlopowiec/repos","events_url":"https://api.github.com/users/Adrian-Chlopowiec/events{/privacy}","received_events_url":"https://api.github.com/users/Adrian-Chlopowiec/received_events","type":"User","site_admin":false},"body":"","commit_id":"5ee357510ef6374f658faf9798a96410e910fbbb","submitted_at":"2021-07-21T09:00:00Z","state":"changes_requested","html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71#pullrequestreview-711417104","pull_request_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71","author_association":"NONE","_links":{"html":{"href":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71#pullrequestreview-711417104"},"pull_request":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71"}}},"pull_request":{"url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71","id":693461605,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDYxNjA1","html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71","diff_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71.diff","patch_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71.patch","issue_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71","number":71,"state":"open","locked":false,"title":"Equal gausses generation","user":{"login":"Adam-Chlopowiec","id":54243218,"node_id":"MDQ6VXNlcjU0MjQzMjE4","avatar_url":"https://avatars.githubusercontent.com/u/54243218?v=4","gravatar_id":"","url":"https://api.github.com/users/Adam-Chlopowiec","html_url":"https://github.com/Adam-Chlopowiec","followers_url":"https://api.github.com/users/Adam-Chlopowiec/followers","following_url":"https://api.github.com/users/Adam-Chlopowiec/following{/other_user}","gists_url":"https://api.github.com/users/Adam-Chlopowiec/gists{/gist_id}","starred_url":"https://api.github.com/users/Adam-Chlopowiec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Adam-Chlopowiec/subscriptions","organizations_url":"https://api.github.com/users/Adam-Chlopowiec/orgs","repos_url":"https://api.github.com/users/Adam-Chlopowiec/repos","events_url":"https://api.github.com/users/Adam-Chlopowiec/events{/privacy}","received_events_url":"https://api.github.com/users/Adam-Chlopowiec/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T13:20:54Z","updated_at":"2021-07-21T09:00:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"9eb9f57d130266ab256680951e2275f66865aeb4","assignee":null,"assignees":[],"requested_reviewers":[{"login":"chrisgal77","id":70722272,"node_id":"MDQ6VXNlcjcwNzIyMjcy","avatar_url":"https://avatars.githubusercontent.com/u/70722272?v=4","gravatar_id":"","url":"https://api.github.com/users/chrisgal77","html_url":"https://github.com/chrisgal77","followers_url":"https://api.github.com/users/chrisgal77/followers","following_url":"https://api.github.com/users/chrisgal77/following{/other_user}","gists_url":"https://api.github.com/users/chrisgal77/gists{/gist_id}","starred_url":"https://api.github.com/users/chrisgal77/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chrisgal77/subscriptions","organizations_url":"https://api.github.com/users/chrisgal77/orgs","repos_url":"https://api.github.com/users/chrisgal77/repos","events_url":"https://api.github.com/users/chrisgal77/events{/privacy}","received_events_url":"https://api.github.com/users/chrisgal77/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/commits","review_comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/comments","review_comment_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71/comments","statuses_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/5ee357510ef6374f658faf9798a96410e910fbbb","head":{"label":"PWR-Informatyka-biomedyczna:equalGausses","ref":"equalGausses","sha":"5ee357510ef6374f658faf9798a96410e910fbbb","user":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"repo":{"id":358010569,"node_id":"MDEwOlJlcG9zaXRvcnkzNTgwMTA1Njk=","name":"DoggOSFuzzy","full_name":"PWR-Informatyka-biomedyczna/DoggOSFuzzy","private":false,"owner":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","description":"Open source fuzzy logic library.","fork":false,"url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy","forks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/forks","keys_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/teams","hooks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/hooks","issue_events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/events{/number}","events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/events","assignees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/assignees{/user}","branches_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/branches{/branch}","tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/tags","blobs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/refs{/sha}","trees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/{sha}","languages_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/languages","stargazers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/stargazers","contributors_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contributors","subscribers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscribers","subscription_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscription","commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/commits{/sha}","git_commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/commits{/sha}","comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/comments{/number}","issue_comment_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/comments{/number}","contents_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contents/{+path}","compare_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/merges","archive_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/downloads","issues_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues{/number}","pulls_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls{/number}","milestones_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/milestones{/number}","notifications_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/labels{/name}","releases_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/releases{/id}","deployments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/deployments","created_at":"2021-04-14T18:51:58Z","updated_at":"2021-05-03T22:22:54Z","pushed_at":"2021-07-20T13:23:43Z","git_url":"git://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","ssh_url":"git@github.com:PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","clone_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","svn_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","homepage":null,"size":478,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":13,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":13,"watchers":0,"default_branch":"master"}},"base":{"label":"PWR-Informatyka-biomedyczna:dev","ref":"dev","sha":"c5d8cdd9be05b5d3d34e693a112bb12002c1c46b","user":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"repo":{"id":358010569,"node_id":"MDEwOlJlcG9zaXRvcnkzNTgwMTA1Njk=","name":"DoggOSFuzzy","full_name":"PWR-Informatyka-biomedyczna/DoggOSFuzzy","private":false,"owner":{"login":"PWR-Informatyka-biomedyczna","id":67423257,"node_id":"MDEyOk9yZ2FuaXphdGlvbjY3NDIzMjU3","avatar_url":"https://avatars.githubusercontent.com/u/67423257?v=4","gravatar_id":"","url":"https://api.github.com/users/PWR-Informatyka-biomedyczna","html_url":"https://github.com/PWR-Informatyka-biomedyczna","followers_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/followers","following_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/following{/other_user}","gists_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/gists{/gist_id}","starred_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/subscriptions","organizations_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/orgs","repos_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/repos","events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/events{/privacy}","received_events_url":"https://api.github.com/users/PWR-Informatyka-biomedyczna/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","description":"Open source fuzzy logic library.","fork":false,"url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy","forks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/forks","keys_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/teams","hooks_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/hooks","issue_events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/events{/number}","events_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/events","assignees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/assignees{/user}","branches_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/branches{/branch}","tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/tags","blobs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/refs{/sha}","trees_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/{sha}","languages_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/languages","stargazers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/stargazers","contributors_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contributors","subscribers_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscribers","subscription_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/subscription","commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/commits{/sha}","git_commits_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/git/commits{/sha}","comments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/comments{/number}","issue_comment_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/comments{/number}","contents_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/contents/{+path}","compare_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/merges","archive_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/downloads","issues_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues{/number}","pulls_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls{/number}","milestones_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/milestones{/number}","notifications_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/labels{/name}","releases_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/releases{/id}","deployments_url":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/deployments","created_at":"2021-04-14T18:51:58Z","updated_at":"2021-05-03T22:22:54Z","pushed_at":"2021-07-20T13:23:43Z","git_url":"git://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","ssh_url":"git@github.com:PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","clone_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy.git","svn_url":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy","homepage":null,"size":478,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":13,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":13,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71"},"html":{"href":"https://github.com/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pull/71"},"issue":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71"},"comments":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/issues/71/comments"},"review_comments":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/comments"},"review_comment":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/pulls/71/commits"},"statuses":{"href":"https://api.github.com/repos/PWR-Informatyka-biomedyczna/DoggOSFuzzy/statuses/5ee357510ef6374f658faf9798a96410e910fbbb"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":67423257,"login":"PWR-Informatyka-biomedyczna","gravatar_id":"","url":"https://api.github.com/orgs/PWR-Informatyka-biomedyczna","avatar_url":"https://avatars.githubusercontent.com/u/67423257?"}}
+{"id":"17246339574","type":"IssueCommentEvent","actor":{"id":2748981,"login":"BenjaminSchaaf","display_login":"BenjaminSchaaf","gravatar_id":"","url":"https://api.github.com/users/BenjaminSchaaf","avatar_url":"https://avatars.githubusercontent.com/u/2748981?"},"repo":{"id":9598363,"name":"sublimehq/sublime_text","url":"https://api.github.com/repos/sublimehq/sublime_text"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676","repository_url":"https://api.github.com/repos/sublimehq/sublime_text","labels_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676/labels{/name}","comments_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676/comments","events_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676/events","html_url":"https://github.com/sublimehq/sublime_text/issues/4676","id":949476971,"node_id":"MDU6SXNzdWU5NDk0NzY5NzE=","number":4676,"title":"Latex compiling is correct but opens an additional blank window","user":{"login":"jsbibra","id":55181504,"node_id":"MDQ6VXNlcjU1MTgxNTA0","avatar_url":"https://avatars.githubusercontent.com/u/55181504?v=4","gravatar_id":"","url":"https://api.github.com/users/jsbibra","html_url":"https://github.com/jsbibra","followers_url":"https://api.github.com/users/jsbibra/followers","following_url":"https://api.github.com/users/jsbibra/following{/other_user}","gists_url":"https://api.github.com/users/jsbibra/gists{/gist_id}","starred_url":"https://api.github.com/users/jsbibra/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsbibra/subscriptions","organizations_url":"https://api.github.com/users/jsbibra/orgs","repos_url":"https://api.github.com/users/jsbibra/repos","events_url":"https://api.github.com/users/jsbibra/events{/privacy}","received_events_url":"https://api.github.com/users/jsbibra/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-21T08:47:48Z","updated_at":"2021-07-21T09:00:01Z","closed_at":"2021-07-21T09:00:01Z","author_association":"NONE","active_lock_reason":null,"body":"### Description\r\n\r\nAdditional Blank window on compile\r\n### Steps to reproduce\r\n\r\n1. Start Sublime Text \r\n2. compile latex code\r\n3. code compiles in sumatra but also opens up an additional blank window\r\n\r\n### Expected behavior\r\n\r\ncode should compile without opening an additional blank window\r\n\r\n### Actual behavior\r\n\r\n code compiles in sumatra but also opens up an additional blank window\r\n\r\n### Environment\r\n\r\n* Build: [e.g. 4113]\r\n* Operating system and version: [Windows 10, desktop PC]\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/sublimehq/sublime_text/issues/comments/884018693","html_url":"https://github.com/sublimehq/sublime_text/issues/4676#issuecomment-884018693","issue_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676","id":884018693,"node_id":"IC_kwDOAJJ1m840sQ4F","user":{"login":"BenjaminSchaaf","id":2748981,"node_id":"MDQ6VXNlcjI3NDg5ODE=","avatar_url":"https://avatars.githubusercontent.com/u/2748981?v=4","gravatar_id":"","url":"https://api.github.com/users/BenjaminSchaaf","html_url":"https://github.com/BenjaminSchaaf","followers_url":"https://api.github.com/users/BenjaminSchaaf/followers","following_url":"https://api.github.com/users/BenjaminSchaaf/following{/other_user}","gists_url":"https://api.github.com/users/BenjaminSchaaf/gists{/gist_id}","starred_url":"https://api.github.com/users/BenjaminSchaaf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BenjaminSchaaf/subscriptions","organizations_url":"https://api.github.com/users/BenjaminSchaaf/orgs","repos_url":"https://api.github.com/users/BenjaminSchaaf/repos","events_url":"https://api.github.com/users/BenjaminSchaaf/events{/privacy}","received_events_url":"https://api.github.com/users/BenjaminSchaaf/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:00Z","updated_at":"2021-07-21T09:00:00Z","author_association":"MEMBER","body":"See #4621","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":1161584,"login":"sublimehq","gravatar_id":"","url":"https://api.github.com/orgs/sublimehq","avatar_url":"https://avatars.githubusercontent.com/u/1161584?"}}
+{"id":"17246339576","type":"PushEvent","actor":{"id":38880224,"login":"fazchanneltv","display_login":"fazchanneltv","gravatar_id":"","url":"https://api.github.com/users/fazchanneltv","avatar_url":"https://avatars.githubusercontent.com/u/38880224?"},"repo":{"id":387105424,"name":"fazchanneltv/radio","url":"https://api.github.com/repos/fazchanneltv/radio"},"payload":{"push_id":7562451136,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8b95de33a5b969ad713db589a251d54801eddeef","before":"564afb7016516fe9328f2ac1da58fee3182979fc","commits":[{"sha":"8b95de33a5b969ad713db589a251d54801eddeef","author":{"name":"fazchanneltv","email":"7588a9eb7622457cfef32d700780dfed85ec5b9f@users.noreply.github.com"},"message":"Update index.html","distinct":true,"url":"https://api.github.com/repos/fazchanneltv/radio/commits/8b95de33a5b969ad713db589a251d54801eddeef"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339577","type":"PushEvent","actor":{"id":61676330,"login":"gtlrajpatel","display_login":"gtlrajpatel","gravatar_id":"","url":"https://api.github.com/users/gtlrajpatel","avatar_url":"https://avatars.githubusercontent.com/u/61676330?"},"repo":{"id":374989092,"name":"nlplearningteam/pdf-text-extraction","url":"https://api.github.com/repos/nlplearningteam/pdf-text-extraction"},"payload":{"push_id":7562451145,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"276f5817f92f5310202f1322cba6b0a75bba5936","before":"893949858eace8c99cf844f4bd3c67ce4bb2a5a7","commits":[{"sha":"276f5817f92f5310202f1322cba6b0a75bba5936","author":{"name":"Raj Patel","email":"d2e45eb40a6b21b7262aaab5234dccfff40771f3@thegatewaycorp.com"},"message":"Refactor the text extraction code","distinct":true,"url":"https://api.github.com/repos/nlplearningteam/pdf-text-extraction/commits/276f5817f92f5310202f1322cba6b0a75bba5936"}]},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":85568703,"login":"nlplearningteam","gravatar_id":"","url":"https://api.github.com/orgs/nlplearningteam","avatar_url":"https://avatars.githubusercontent.com/u/85568703?"}}
+{"id":"17246339581","type":"PullRequestReviewCommentEvent","actor":{"id":35995629,"login":"DmitryChitalov","display_login":"DmitryChitalov","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","avatar_url":"https://avatars.githubusercontent.com/u/35995629?"},"repo":{"id":336795774,"name":"DmitryChitalov/-algorithms_2021","url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021"},"payload":{"action":"created","comment":{"url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/comments/673792284","pull_request_review_id":711422067,"id":673792284,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDY3Mzc5MjI4NA==","diff_hunk":"@@ -20,3 +20,37 @@\n Обязательно усложните задачу! Добавьте сохранение хеша в файле и получение его из файла.\n А если вы знаете как через Python работать с БД, привяжите к заданию БД и сохраняйте хеши там.\n \"\"\"\n+\n+from uuid import uuid4\n+import sqlite3\n+import hashlib\n+\n+\n+def pass_in_db():\n+\tconn = sqlite3.connect(\":memory:\")\n+\tcur = conn.cursor()\n+\tcur.execute(\"\"\"CREATE TABLE passwords (\n+\t\tid INT PRIMARY KEY,\n+\t\tpassword TEXT);\n+\t\"\"\")\n+\tconn.commit()\n+\t\n+\tsalt = uuid4().hex\n+\tcur.execute(\"INSERT INTO passwords VALUES(?, ?)\", (1, hashlib.sha256(salt.encode() + input(\"Введите пароль: \").encode()).hexdigest()))\n+\tconn.commit()\n+\t\n+\tcur.execute(\"SELECT password FROM passwords\")\n+\tprint(\"В базе данных хранится строка:\", cur.fetchone()[0], sep='\\n')\n+\t\n+\tpass_check = hashlib.sha256(salt.encode() + input(\"ВВведите пароль еще раз для проверки: \").encode()).hexdigest()\n+\tcur.execute(\"SELECT password FROM passwords\")\n+\t","path":"Урок 3. Практическое задание/task_2.py","position":28,"original_position":28,"commit_id":"785d22a4245376f077ebfb457b5533af2ebfc023","original_commit_id":"785d22a4245376f077ebfb457b5533af2ebfc023","user":{"login":"DmitryChitalov","id":35995629,"node_id":"MDQ6VXNlcjM1OTk1NjI5","avatar_url":"https://avatars.githubusercontent.com/u/35995629?v=4","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","html_url":"https://github.com/DmitryChitalov","followers_url":"https://api.github.com/users/DmitryChitalov/followers","following_url":"https://api.github.com/users/DmitryChitalov/following{/other_user}","gists_url":"https://api.github.com/users/DmitryChitalov/gists{/gist_id}","starred_url":"https://api.github.com/users/DmitryChitalov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DmitryChitalov/subscriptions","organizations_url":"https://api.github.com/users/DmitryChitalov/orgs","repos_url":"https://api.github.com/users/DmitryChitalov/repos","events_url":"https://api.github.com/users/DmitryChitalov/events{/privacy}","received_events_url":"https://api.github.com/users/DmitryChitalov/received_events","type":"User","site_admin":false},"body":"\tpass_check = hashlib.sha256(salt.encode() + input(\"ВВведите пароль еще раз для проверки: \").encode()).hexdigest()\r\n\tcur.execute(\"SELECT password FROM passwords\")\r\n\r\nнужно убрать дублир-я","created_at":"2021-07-21T09:00:01Z","updated_at":"2021-07-21T09:00:01Z","html_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253#discussion_r673792284","pull_request_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/comments/673792284"},"html":{"href":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253#discussion_r673792284"},"pull_request":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253"}},"start_line":null,"original_start_line":null,"start_side":null,"line":47,"original_line":47,"side":"RIGHT"},"pull_request":{"url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253","id":693635172,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNjM1MTcy","html_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253","diff_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253.diff","patch_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253.patch","issue_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253","number":1253,"state":"open","locked":false,"title":"less-3: 1,2,3","user":{"login":"staphw","id":76226605,"node_id":"MDQ6VXNlcjc2MjI2NjA1","avatar_url":"https://avatars.githubusercontent.com/u/76226605?v=4","gravatar_id":"","url":"https://api.github.com/users/staphw","html_url":"https://github.com/staphw","followers_url":"https://api.github.com/users/staphw/followers","following_url":"https://api.github.com/users/staphw/following{/other_user}","gists_url":"https://api.github.com/users/staphw/gists{/gist_id}","starred_url":"https://api.github.com/users/staphw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/staphw/subscriptions","organizations_url":"https://api.github.com/users/staphw/orgs","repos_url":"https://api.github.com/users/staphw/repos","events_url":"https://api.github.com/users/staphw/events{/privacy}","received_events_url":"https://api.github.com/users/staphw/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T16:53:32Z","updated_at":"2021-07-21T09:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3cd5cf184f6ff3957fc061f8e90753cc516f0792","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/commits","review_comments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/comments","review_comment_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/comments{/number}","comments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253/comments","statuses_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/statuses/785d22a4245376f077ebfb457b5533af2ebfc023","head":{"label":"staphw:lesson-3","ref":"lesson-3","sha":"785d22a4245376f077ebfb457b5533af2ebfc023","user":{"login":"staphw","id":76226605,"node_id":"MDQ6VXNlcjc2MjI2NjA1","avatar_url":"https://avatars.githubusercontent.com/u/76226605?v=4","gravatar_id":"","url":"https://api.github.com/users/staphw","html_url":"https://github.com/staphw","followers_url":"https://api.github.com/users/staphw/followers","following_url":"https://api.github.com/users/staphw/following{/other_user}","gists_url":"https://api.github.com/users/staphw/gists{/gist_id}","starred_url":"https://api.github.com/users/staphw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/staphw/subscriptions","organizations_url":"https://api.github.com/users/staphw/orgs","repos_url":"https://api.github.com/users/staphw/repos","events_url":"https://api.github.com/users/staphw/events{/privacy}","received_events_url":"https://api.github.com/users/staphw/received_events","type":"User","site_admin":false},"repo":{"id":384888939,"node_id":"MDEwOlJlcG9zaXRvcnkzODQ4ODg5Mzk=","name":"-algorithms_2021","full_name":"staphw/-algorithms_2021","private":false,"owner":{"login":"staphw","id":76226605,"node_id":"MDQ6VXNlcjc2MjI2NjA1","avatar_url":"https://avatars.githubusercontent.com/u/76226605?v=4","gravatar_id":"","url":"https://api.github.com/users/staphw","html_url":"https://github.com/staphw","followers_url":"https://api.github.com/users/staphw/followers","following_url":"https://api.github.com/users/staphw/following{/other_user}","gists_url":"https://api.github.com/users/staphw/gists{/gist_id}","starred_url":"https://api.github.com/users/staphw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/staphw/subscriptions","organizations_url":"https://api.github.com/users/staphw/orgs","repos_url":"https://api.github.com/users/staphw/repos","events_url":"https://api.github.com/users/staphw/events{/privacy}","received_events_url":"https://api.github.com/users/staphw/received_events","type":"User","site_admin":false},"html_url":"https://github.com/staphw/-algorithms_2021","description":null,"fork":true,"url":"https://api.github.com/repos/staphw/-algorithms_2021","forks_url":"https://api.github.com/repos/staphw/-algorithms_2021/forks","keys_url":"https://api.github.com/repos/staphw/-algorithms_2021/keys{/key_id}","collaborators_url":"https://api.github.com/repos/staphw/-algorithms_2021/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/staphw/-algorithms_2021/teams","hooks_url":"https://api.github.com/repos/staphw/-algorithms_2021/hooks","issue_events_url":"https://api.github.com/repos/staphw/-algorithms_2021/issues/events{/number}","events_url":"https://api.github.com/repos/staphw/-algorithms_2021/events","assignees_url":"https://api.github.com/repos/staphw/-algorithms_2021/assignees{/user}","branches_url":"https://api.github.com/repos/staphw/-algorithms_2021/branches{/branch}","tags_url":"https://api.github.com/repos/staphw/-algorithms_2021/tags","blobs_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/refs{/sha}","trees_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/trees{/sha}","statuses_url":"https://api.github.com/repos/staphw/-algorithms_2021/statuses/{sha}","languages_url":"https://api.github.com/repos/staphw/-algorithms_2021/languages","stargazers_url":"https://api.github.com/repos/staphw/-algorithms_2021/stargazers","contributors_url":"https://api.github.com/repos/staphw/-algorithms_2021/contributors","subscribers_url":"https://api.github.com/repos/staphw/-algorithms_2021/subscribers","subscription_url":"https://api.github.com/repos/staphw/-algorithms_2021/subscription","commits_url":"https://api.github.com/repos/staphw/-algorithms_2021/commits{/sha}","git_commits_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/commits{/sha}","comments_url":"https://api.github.com/repos/staphw/-algorithms_2021/comments{/number}","issue_comment_url":"https://api.github.com/repos/staphw/-algorithms_2021/issues/comments{/number}","contents_url":"https://api.github.com/repos/staphw/-algorithms_2021/contents/{+path}","compare_url":"https://api.github.com/repos/staphw/-algorithms_2021/compare/{base}...{head}","merges_url":"https://api.github.com/repos/staphw/-algorithms_2021/merges","archive_url":"https://api.github.com/repos/staphw/-algorithms_2021/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/staphw/-algorithms_2021/downloads","issues_url":"https://api.github.com/repos/staphw/-algorithms_2021/issues{/number}","pulls_url":"https://api.github.com/repos/staphw/-algorithms_2021/pulls{/number}","milestones_url":"https://api.github.com/repos/staphw/-algorithms_2021/milestones{/number}","notifications_url":"https://api.github.com/repos/staphw/-algorithms_2021/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/staphw/-algorithms_2021/labels{/name}","releases_url":"https://api.github.com/repos/staphw/-algorithms_2021/releases{/id}","deployments_url":"https://api.github.com/repos/staphw/-algorithms_2021/deployments","created_at":"2021-07-11T07:45:27Z","updated_at":"2021-07-11T07:45:28Z","pushed_at":"2021-07-20T16:52:45Z","git_url":"git://github.com/staphw/-algorithms_2021.git","ssh_url":"git@github.com:staphw/-algorithms_2021.git","clone_url":"https://github.com/staphw/-algorithms_2021.git","svn_url":"https://github.com/staphw/-algorithms_2021","homepage":null,"size":77,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"DmitryChitalov:master","ref":"master","sha":"93d9a166e5a961abf555ace5cb8f3a246510a403","user":{"login":"DmitryChitalov","id":35995629,"node_id":"MDQ6VXNlcjM1OTk1NjI5","avatar_url":"https://avatars.githubusercontent.com/u/35995629?v=4","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","html_url":"https://github.com/DmitryChitalov","followers_url":"https://api.github.com/users/DmitryChitalov/followers","following_url":"https://api.github.com/users/DmitryChitalov/following{/other_user}","gists_url":"https://api.github.com/users/DmitryChitalov/gists{/gist_id}","starred_url":"https://api.github.com/users/DmitryChitalov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DmitryChitalov/subscriptions","organizations_url":"https://api.github.com/users/DmitryChitalov/orgs","repos_url":"https://api.github.com/users/DmitryChitalov/repos","events_url":"https://api.github.com/users/DmitryChitalov/events{/privacy}","received_events_url":"https://api.github.com/users/DmitryChitalov/received_events","type":"User","site_admin":false},"repo":{"id":336795774,"node_id":"MDEwOlJlcG9zaXRvcnkzMzY3OTU3NzQ=","name":"-algorithms_2021","full_name":"DmitryChitalov/-algorithms_2021","private":false,"owner":{"login":"DmitryChitalov","id":35995629,"node_id":"MDQ6VXNlcjM1OTk1NjI5","avatar_url":"https://avatars.githubusercontent.com/u/35995629?v=4","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","html_url":"https://github.com/DmitryChitalov","followers_url":"https://api.github.com/users/DmitryChitalov/followers","following_url":"https://api.github.com/users/DmitryChitalov/following{/other_user}","gists_url":"https://api.github.com/users/DmitryChitalov/gists{/gist_id}","starred_url":"https://api.github.com/users/DmitryChitalov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DmitryChitalov/subscriptions","organizations_url":"https://api.github.com/users/DmitryChitalov/orgs","repos_url":"https://api.github.com/users/DmitryChitalov/repos","events_url":"https://api.github.com/users/DmitryChitalov/events{/privacy}","received_events_url":"https://api.github.com/users/DmitryChitalov/received_events","type":"User","site_admin":false},"html_url":"https://github.com/DmitryChitalov/-algorithms_2021","description":null,"fork":false,"url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021","forks_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/forks","keys_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/keys{/key_id}","collaborators_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/teams","hooks_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/hooks","issue_events_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/events{/number}","events_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/events","assignees_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/assignees{/user}","branches_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/branches{/branch}","tags_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/tags","blobs_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/refs{/sha}","trees_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/trees{/sha}","statuses_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/statuses/{sha}","languages_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/languages","stargazers_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/stargazers","contributors_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/contributors","subscribers_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/subscribers","subscription_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/subscription","commits_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/commits{/sha}","git_commits_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/commits{/sha}","comments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/comments{/number}","issue_comment_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/comments{/number}","contents_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/contents/{+path}","compare_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/compare/{base}...{head}","merges_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/merges","archive_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/downloads","issues_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues{/number}","pulls_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls{/number}","milestones_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/milestones{/number}","notifications_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/labels{/name}","releases_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/releases{/id}","deployments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/deployments","created_at":"2021-02-07T13:39:06Z","updated_at":"2021-07-13T18:43:54Z","pushed_at":"2021-07-21T07:44:18Z","git_url":"git://github.com/DmitryChitalov/-algorithms_2021.git","ssh_url":"git@github.com:DmitryChitalov/-algorithms_2021.git","clone_url":"https://github.com/DmitryChitalov/-algorithms_2021.git","svn_url":"https://github.com/DmitryChitalov/-algorithms_2021","homepage":null,"size":72,"stargazers_count":4,"watchers_count":4,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":271,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1152,"license":null,"forks":271,"open_issues":1152,"watchers":4,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253"},"html":{"href":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253"},"issue":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253"},"comments":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253/comments"},"review_comments":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/comments"},"review_comment":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/commits"},"statuses":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/statuses/785d22a4245376f077ebfb457b5533af2ebfc023"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339588","type":"WatchEvent","actor":{"id":20277283,"login":"giannissc","display_login":"giannissc","gravatar_id":"","url":"https://api.github.com/users/giannissc","avatar_url":"https://avatars.githubusercontent.com/u/20277283?"},"repo":{"id":373814100,"name":"dfrg/parley","url":"https://api.github.com/repos/dfrg/parley"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339592","type":"PushEvent","actor":{"id":21108631,"login":"shihabus","display_login":"shihabus","gravatar_id":"","url":"https://api.github.com/users/shihabus","avatar_url":"https://avatars.githubusercontent.com/u/21108631?"},"repo":{"id":367106789,"name":"shihabus/tailwind-portfolio","url":"https://api.github.com/repos/shihabus/tailwind-portfolio"},"payload":{"push_id":7562451127,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"829165c7e2d065eb634d25c1f83f71d15abeaeb8","before":"e6fe79fa956a52629bb98dc2eecfba5529ef5990","commits":[{"sha":"829165c7e2d065eb634d25c1f83f71d15abeaeb8","author":{"name":"Shihabudheen US","email":"d32f07aa6bc6aeff43d3d1837bb4b96684f8ad2c@dunzo.in"},"message":"added resume","distinct":true,"url":"https://api.github.com/repos/shihabus/tailwind-portfolio/commits/829165c7e2d065eb634d25c1f83f71d15abeaeb8"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339593","type":"IssuesEvent","actor":{"id":2748981,"login":"BenjaminSchaaf","display_login":"BenjaminSchaaf","gravatar_id":"","url":"https://api.github.com/users/BenjaminSchaaf","avatar_url":"https://avatars.githubusercontent.com/u/2748981?"},"repo":{"id":9598363,"name":"sublimehq/sublime_text","url":"https://api.github.com/repos/sublimehq/sublime_text"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676","repository_url":"https://api.github.com/repos/sublimehq/sublime_text","labels_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676/labels{/name}","comments_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676/comments","events_url":"https://api.github.com/repos/sublimehq/sublime_text/issues/4676/events","html_url":"https://github.com/sublimehq/sublime_text/issues/4676","id":949476971,"node_id":"MDU6SXNzdWU5NDk0NzY5NzE=","number":4676,"title":"Latex compiling is correct but opens an additional blank window","user":{"login":"jsbibra","id":55181504,"node_id":"MDQ6VXNlcjU1MTgxNTA0","avatar_url":"https://avatars.githubusercontent.com/u/55181504?v=4","gravatar_id":"","url":"https://api.github.com/users/jsbibra","html_url":"https://github.com/jsbibra","followers_url":"https://api.github.com/users/jsbibra/followers","following_url":"https://api.github.com/users/jsbibra/following{/other_user}","gists_url":"https://api.github.com/users/jsbibra/gists{/gist_id}","starred_url":"https://api.github.com/users/jsbibra/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsbibra/subscriptions","organizations_url":"https://api.github.com/users/jsbibra/orgs","repos_url":"https://api.github.com/users/jsbibra/repos","events_url":"https://api.github.com/users/jsbibra/events{/privacy}","received_events_url":"https://api.github.com/users/jsbibra/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2021-07-21T08:47:48Z","updated_at":"2021-07-21T09:00:01Z","closed_at":"2021-07-21T09:00:01Z","author_association":"NONE","active_lock_reason":null,"body":"### Description\r\n\r\nAdditional Blank window on compile\r\n### Steps to reproduce\r\n\r\n1. Start Sublime Text \r\n2. compile latex code\r\n3. code compiles in sumatra but also opens up an additional blank window\r\n\r\n### Expected behavior\r\n\r\ncode should compile without opening an additional blank window\r\n\r\n### Actual behavior\r\n\r\n code compiles in sumatra but also opens up an additional blank window\r\n\r\n### Environment\r\n\r\n* Build: [e.g. 4113]\r\n* Operating system and version: [Windows 10, desktop PC]\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":1161584,"login":"sublimehq","gravatar_id":"","url":"https://api.github.com/orgs/sublimehq","avatar_url":"https://avatars.githubusercontent.com/u/1161584?"}}
+{"id":"17246339598","type":"PushEvent","actor":{"id":87747615,"login":"mitchelmarushh775","display_login":"mitchelmarushh775","gravatar_id":"","url":"https://api.github.com/users/mitchelmarushh775","avatar_url":"https://avatars.githubusercontent.com/u/87747615?"},"repo":{"id":388008180,"name":"mitchelmarushh775/cnlkfhw4","url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw4"},"payload":{"push_id":7562451155,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"bd823744c3bc65789b76a0321996e0099d85623d","before":"817453691c1c109b0e00795d20ae8953b363c9fa","commits":[{"sha":"bd823744c3bc65789b76a0321996e0099d85623d","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw4/commits/bd823744c3bc65789b76a0321996e0099d85623d"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339602","type":"DeleteEvent","actor":{"id":10810283,"login":"direwolf-github","display_login":"direwolf-github","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","avatar_url":"https://avatars.githubusercontent.com/u/10810283?"},"repo":{"id":183051410,"name":"direwolf-github/my-app","url":"https://api.github.com/repos/direwolf-github/my-app"},"payload":{"ref":"branch-104803df","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339603","type":"PushEvent","actor":{"id":48682370,"login":"rikanakai0823","display_login":"rikanakai0823","gravatar_id":"","url":"https://api.github.com/users/rikanakai0823","avatar_url":"https://avatars.githubusercontent.com/u/48682370?"},"repo":{"id":176296125,"name":"rikanakai0823/bangumi-data","url":"https://api.github.com/repos/rikanakai0823/bangumi-data"},"payload":{"push_id":7562451149,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"642b89709d668aed0f7e503cf73b5fd409d142b9","before":"db0daa6b091a9a8ff03e003c866809720d33ffc8","commits":[{"sha":"642b89709d668aed0f7e503cf73b5fd409d142b9","author":{"name":"rikanakai0823","email":"b58812a1de528b10e45c95eac7749d14dececc61@users.noreply.github.com"},"message":"data update Wed Jul 21 06:00:05 PM JST 2021","distinct":true,"url":"https://api.github.com/repos/rikanakai0823/bangumi-data/commits/642b89709d668aed0f7e503cf73b5fd409d142b9"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339606","type":"PushEvent","actor":{"id":70032509,"login":"GulnazBakirova","display_login":"GulnazBakirova","gravatar_id":"","url":"https://api.github.com/users/GulnazBakirova","avatar_url":"https://avatars.githubusercontent.com/u/70032509?"},"repo":{"id":371379395,"name":"GulnazBakirova/1479343-keksobooking-23","url":"https://api.github.com/repos/GulnazBakirova/1479343-keksobooking-23"},"payload":{"push_id":7562451161,"size":1,"distinct_size":1,"ref":"refs/heads/patch-1","head":"73190845265c333040ef7308a57f682fc0bb6783","before":"2a83834a1b092fb68f9c97a2a5ce230720bacd6a","commits":[{"sha":"73190845265c333040ef7308a57f682fc0bb6783","author":{"name":"GulnazBakirova","email":"d4e59c81813944ad2eea0d9450b394ba3e0c416d@users.noreply.github.com"},"message":"Delete throttle.js","distinct":true,"url":"https://api.github.com/repos/GulnazBakirova/1479343-keksobooking-23/commits/73190845265c333040ef7308a57f682fc0bb6783"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339621","type":"PullRequestReviewEvent","actor":{"id":35995629,"login":"DmitryChitalov","display_login":"DmitryChitalov","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","avatar_url":"https://avatars.githubusercontent.com/u/35995629?"},"repo":{"id":336795774,"name":"DmitryChitalov/-algorithms_2021","url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021"},"payload":{"action":"created","review":{"id":711422067,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDIyMDY3","user":{"login":"DmitryChitalov","id":35995629,"node_id":"MDQ6VXNlcjM1OTk1NjI5","avatar_url":"https://avatars.githubusercontent.com/u/35995629?v=4","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","html_url":"https://github.com/DmitryChitalov","followers_url":"https://api.github.com/users/DmitryChitalov/followers","following_url":"https://api.github.com/users/DmitryChitalov/following{/other_user}","gists_url":"https://api.github.com/users/DmitryChitalov/gists{/gist_id}","starred_url":"https://api.github.com/users/DmitryChitalov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DmitryChitalov/subscriptions","organizations_url":"https://api.github.com/users/DmitryChitalov/orgs","repos_url":"https://api.github.com/users/DmitryChitalov/repos","events_url":"https://api.github.com/users/DmitryChitalov/events{/privacy}","received_events_url":"https://api.github.com/users/DmitryChitalov/received_events","type":"User","site_admin":false},"body":null,"commit_id":"785d22a4245376f077ebfb457b5533af2ebfc023","submitted_at":"2021-07-21T09:00:01Z","state":"commented","html_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253#pullrequestreview-711422067","pull_request_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253","author_association":"OWNER","_links":{"html":{"href":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253#pullrequestreview-711422067"},"pull_request":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253"}}},"pull_request":{"url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253","id":693635172,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNjM1MTcy","html_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253","diff_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253.diff","patch_url":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253.patch","issue_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253","number":1253,"state":"open","locked":false,"title":"less-3: 1,2,3","user":{"login":"staphw","id":76226605,"node_id":"MDQ6VXNlcjc2MjI2NjA1","avatar_url":"https://avatars.githubusercontent.com/u/76226605?v=4","gravatar_id":"","url":"https://api.github.com/users/staphw","html_url":"https://github.com/staphw","followers_url":"https://api.github.com/users/staphw/followers","following_url":"https://api.github.com/users/staphw/following{/other_user}","gists_url":"https://api.github.com/users/staphw/gists{/gist_id}","starred_url":"https://api.github.com/users/staphw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/staphw/subscriptions","organizations_url":"https://api.github.com/users/staphw/orgs","repos_url":"https://api.github.com/users/staphw/repos","events_url":"https://api.github.com/users/staphw/events{/privacy}","received_events_url":"https://api.github.com/users/staphw/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T16:53:32Z","updated_at":"2021-07-21T09:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3cd5cf184f6ff3957fc061f8e90753cc516f0792","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/commits","review_comments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/comments","review_comment_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/comments{/number}","comments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253/comments","statuses_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/statuses/785d22a4245376f077ebfb457b5533af2ebfc023","head":{"label":"staphw:lesson-3","ref":"lesson-3","sha":"785d22a4245376f077ebfb457b5533af2ebfc023","user":{"login":"staphw","id":76226605,"node_id":"MDQ6VXNlcjc2MjI2NjA1","avatar_url":"https://avatars.githubusercontent.com/u/76226605?v=4","gravatar_id":"","url":"https://api.github.com/users/staphw","html_url":"https://github.com/staphw","followers_url":"https://api.github.com/users/staphw/followers","following_url":"https://api.github.com/users/staphw/following{/other_user}","gists_url":"https://api.github.com/users/staphw/gists{/gist_id}","starred_url":"https://api.github.com/users/staphw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/staphw/subscriptions","organizations_url":"https://api.github.com/users/staphw/orgs","repos_url":"https://api.github.com/users/staphw/repos","events_url":"https://api.github.com/users/staphw/events{/privacy}","received_events_url":"https://api.github.com/users/staphw/received_events","type":"User","site_admin":false},"repo":{"id":384888939,"node_id":"MDEwOlJlcG9zaXRvcnkzODQ4ODg5Mzk=","name":"-algorithms_2021","full_name":"staphw/-algorithms_2021","private":false,"owner":{"login":"staphw","id":76226605,"node_id":"MDQ6VXNlcjc2MjI2NjA1","avatar_url":"https://avatars.githubusercontent.com/u/76226605?v=4","gravatar_id":"","url":"https://api.github.com/users/staphw","html_url":"https://github.com/staphw","followers_url":"https://api.github.com/users/staphw/followers","following_url":"https://api.github.com/users/staphw/following{/other_user}","gists_url":"https://api.github.com/users/staphw/gists{/gist_id}","starred_url":"https://api.github.com/users/staphw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/staphw/subscriptions","organizations_url":"https://api.github.com/users/staphw/orgs","repos_url":"https://api.github.com/users/staphw/repos","events_url":"https://api.github.com/users/staphw/events{/privacy}","received_events_url":"https://api.github.com/users/staphw/received_events","type":"User","site_admin":false},"html_url":"https://github.com/staphw/-algorithms_2021","description":null,"fork":true,"url":"https://api.github.com/repos/staphw/-algorithms_2021","forks_url":"https://api.github.com/repos/staphw/-algorithms_2021/forks","keys_url":"https://api.github.com/repos/staphw/-algorithms_2021/keys{/key_id}","collaborators_url":"https://api.github.com/repos/staphw/-algorithms_2021/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/staphw/-algorithms_2021/teams","hooks_url":"https://api.github.com/repos/staphw/-algorithms_2021/hooks","issue_events_url":"https://api.github.com/repos/staphw/-algorithms_2021/issues/events{/number}","events_url":"https://api.github.com/repos/staphw/-algorithms_2021/events","assignees_url":"https://api.github.com/repos/staphw/-algorithms_2021/assignees{/user}","branches_url":"https://api.github.com/repos/staphw/-algorithms_2021/branches{/branch}","tags_url":"https://api.github.com/repos/staphw/-algorithms_2021/tags","blobs_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/refs{/sha}","trees_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/trees{/sha}","statuses_url":"https://api.github.com/repos/staphw/-algorithms_2021/statuses/{sha}","languages_url":"https://api.github.com/repos/staphw/-algorithms_2021/languages","stargazers_url":"https://api.github.com/repos/staphw/-algorithms_2021/stargazers","contributors_url":"https://api.github.com/repos/staphw/-algorithms_2021/contributors","subscribers_url":"https://api.github.com/repos/staphw/-algorithms_2021/subscribers","subscription_url":"https://api.github.com/repos/staphw/-algorithms_2021/subscription","commits_url":"https://api.github.com/repos/staphw/-algorithms_2021/commits{/sha}","git_commits_url":"https://api.github.com/repos/staphw/-algorithms_2021/git/commits{/sha}","comments_url":"https://api.github.com/repos/staphw/-algorithms_2021/comments{/number}","issue_comment_url":"https://api.github.com/repos/staphw/-algorithms_2021/issues/comments{/number}","contents_url":"https://api.github.com/repos/staphw/-algorithms_2021/contents/{+path}","compare_url":"https://api.github.com/repos/staphw/-algorithms_2021/compare/{base}...{head}","merges_url":"https://api.github.com/repos/staphw/-algorithms_2021/merges","archive_url":"https://api.github.com/repos/staphw/-algorithms_2021/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/staphw/-algorithms_2021/downloads","issues_url":"https://api.github.com/repos/staphw/-algorithms_2021/issues{/number}","pulls_url":"https://api.github.com/repos/staphw/-algorithms_2021/pulls{/number}","milestones_url":"https://api.github.com/repos/staphw/-algorithms_2021/milestones{/number}","notifications_url":"https://api.github.com/repos/staphw/-algorithms_2021/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/staphw/-algorithms_2021/labels{/name}","releases_url":"https://api.github.com/repos/staphw/-algorithms_2021/releases{/id}","deployments_url":"https://api.github.com/repos/staphw/-algorithms_2021/deployments","created_at":"2021-07-11T07:45:27Z","updated_at":"2021-07-11T07:45:28Z","pushed_at":"2021-07-20T16:52:45Z","git_url":"git://github.com/staphw/-algorithms_2021.git","ssh_url":"git@github.com:staphw/-algorithms_2021.git","clone_url":"https://github.com/staphw/-algorithms_2021.git","svn_url":"https://github.com/staphw/-algorithms_2021","homepage":null,"size":77,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"DmitryChitalov:master","ref":"master","sha":"93d9a166e5a961abf555ace5cb8f3a246510a403","user":{"login":"DmitryChitalov","id":35995629,"node_id":"MDQ6VXNlcjM1OTk1NjI5","avatar_url":"https://avatars.githubusercontent.com/u/35995629?v=4","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","html_url":"https://github.com/DmitryChitalov","followers_url":"https://api.github.com/users/DmitryChitalov/followers","following_url":"https://api.github.com/users/DmitryChitalov/following{/other_user}","gists_url":"https://api.github.com/users/DmitryChitalov/gists{/gist_id}","starred_url":"https://api.github.com/users/DmitryChitalov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DmitryChitalov/subscriptions","organizations_url":"https://api.github.com/users/DmitryChitalov/orgs","repos_url":"https://api.github.com/users/DmitryChitalov/repos","events_url":"https://api.github.com/users/DmitryChitalov/events{/privacy}","received_events_url":"https://api.github.com/users/DmitryChitalov/received_events","type":"User","site_admin":false},"repo":{"id":336795774,"node_id":"MDEwOlJlcG9zaXRvcnkzMzY3OTU3NzQ=","name":"-algorithms_2021","full_name":"DmitryChitalov/-algorithms_2021","private":false,"owner":{"login":"DmitryChitalov","id":35995629,"node_id":"MDQ6VXNlcjM1OTk1NjI5","avatar_url":"https://avatars.githubusercontent.com/u/35995629?v=4","gravatar_id":"","url":"https://api.github.com/users/DmitryChitalov","html_url":"https://github.com/DmitryChitalov","followers_url":"https://api.github.com/users/DmitryChitalov/followers","following_url":"https://api.github.com/users/DmitryChitalov/following{/other_user}","gists_url":"https://api.github.com/users/DmitryChitalov/gists{/gist_id}","starred_url":"https://api.github.com/users/DmitryChitalov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DmitryChitalov/subscriptions","organizations_url":"https://api.github.com/users/DmitryChitalov/orgs","repos_url":"https://api.github.com/users/DmitryChitalov/repos","events_url":"https://api.github.com/users/DmitryChitalov/events{/privacy}","received_events_url":"https://api.github.com/users/DmitryChitalov/received_events","type":"User","site_admin":false},"html_url":"https://github.com/DmitryChitalov/-algorithms_2021","description":null,"fork":false,"url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021","forks_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/forks","keys_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/keys{/key_id}","collaborators_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/teams","hooks_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/hooks","issue_events_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/events{/number}","events_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/events","assignees_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/assignees{/user}","branches_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/branches{/branch}","tags_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/tags","blobs_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/refs{/sha}","trees_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/trees{/sha}","statuses_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/statuses/{sha}","languages_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/languages","stargazers_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/stargazers","contributors_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/contributors","subscribers_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/subscribers","subscription_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/subscription","commits_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/commits{/sha}","git_commits_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/git/commits{/sha}","comments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/comments{/number}","issue_comment_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/comments{/number}","contents_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/contents/{+path}","compare_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/compare/{base}...{head}","merges_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/merges","archive_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/downloads","issues_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues{/number}","pulls_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls{/number}","milestones_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/milestones{/number}","notifications_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/labels{/name}","releases_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/releases{/id}","deployments_url":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/deployments","created_at":"2021-02-07T13:39:06Z","updated_at":"2021-07-13T18:43:54Z","pushed_at":"2021-07-21T07:44:18Z","git_url":"git://github.com/DmitryChitalov/-algorithms_2021.git","ssh_url":"git@github.com:DmitryChitalov/-algorithms_2021.git","clone_url":"https://github.com/DmitryChitalov/-algorithms_2021.git","svn_url":"https://github.com/DmitryChitalov/-algorithms_2021","homepage":null,"size":72,"stargazers_count":4,"watchers_count":4,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":271,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1152,"license":null,"forks":271,"open_issues":1152,"watchers":4,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253"},"html":{"href":"https://github.com/DmitryChitalov/-algorithms_2021/pull/1253"},"issue":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253"},"comments":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/issues/1253/comments"},"review_comments":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/comments"},"review_comment":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/pulls/1253/commits"},"statuses":{"href":"https://api.github.com/repos/DmitryChitalov/-algorithms_2021/statuses/785d22a4245376f077ebfb457b5533af2ebfc023"}},"author_association":"NONE","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339630","type":"PushEvent","actor":{"id":87747615,"login":"mitchelmarushh775","display_login":"mitchelmarushh775","gravatar_id":"","url":"https://api.github.com/users/mitchelmarushh775","avatar_url":"https://avatars.githubusercontent.com/u/87747615?"},"repo":{"id":388008139,"name":"mitchelmarushh775/cnlkfhw2","url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw2"},"payload":{"push_id":7562451158,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"3cfe8d49ea6b8ce1b69e133bde1e2f257ac7fb26","before":"335117119c201f70f160ca6b2839521798041ae9","commits":[{"sha":"3cfe8d49ea6b8ce1b69e133bde1e2f257ac7fb26","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw2/commits/3cfe8d49ea6b8ce1b69e133bde1e2f257ac7fb26"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339637","type":"CreateEvent","actor":{"id":87711390,"login":"NehaCholle117","display_login":"NehaCholle117","gravatar_id":"","url":"https://api.github.com/users/NehaCholle117","avatar_url":"https://avatars.githubusercontent.com/u/87711390?"},"repo":{"id":388056962,"name":"NehaCholle117/College-management-system","url":"https://api.github.com/repos/NehaCholle117/College-management-system"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339647","type":"PushEvent","actor":{"id":85825531,"login":"ydmd111","display_login":"ydmd111","gravatar_id":"","url":"https://api.github.com/users/ydmd111","avatar_url":"https://avatars.githubusercontent.com/u/85825531?"},"repo":{"id":385971045,"name":"ydmd111/Python-machine_learning","url":"https://api.github.com/repos/ydmd111/Python-machine_learning"},"payload":{"push_id":7562451191,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f9ea360f2c1ca9d3b2cb62ef4e9227002551415b","before":"e634a0f5adb9f5c043c8477064ae5870111833a3","commits":[{"sha":"f9ea360f2c1ca9d3b2cb62ef4e9227002551415b","author":{"name":"ydmd111","email":"09b704b909e6a16419c05103b635cc2240e3bfaa@users.noreply.github.com"},"message":"Rename Training & Testing with PolynomialFeatures.ipynb to Training & Testing with PolynomialFeatures and fitting with LinearRegression.ipynb","distinct":true,"url":"https://api.github.com/repos/ydmd111/Python-machine_learning/commits/f9ea360f2c1ca9d3b2cb62ef4e9227002551415b"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339631","type":"PushEvent","actor":{"id":87747615,"login":"mitchelmarushh775","display_login":"mitchelmarushh775","gravatar_id":"","url":"https://api.github.com/users/mitchelmarushh775","avatar_url":"https://avatars.githubusercontent.com/u/87747615?"},"repo":{"id":388008109,"name":"mitchelmarushh775/cnlkfhw1","url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw1"},"payload":{"push_id":7562451180,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f42efe44e2031390f914130543052fda92a35489","before":"e70893baf9d5c8c9c42155e96d059d5d6cc3931e","commits":[{"sha":"f42efe44e2031390f914130543052fda92a35489","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/mitchelmarushh775/cnlkfhw1/commits/f42efe44e2031390f914130543052fda92a35489"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339644","type":"PushEvent","actor":{"id":73314663,"login":"eniolajohnson","display_login":"eniolajohnson","gravatar_id":"","url":"https://api.github.com/users/eniolajohnson","avatar_url":"https://avatars.githubusercontent.com/u/73314663?"},"repo":{"id":385756371,"name":"eniolajohnson/todo-skapp","url":"https://api.github.com/repos/eniolajohnson/todo-skapp"},"payload":{"push_id":7562451177,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8c6fa1f0b9de55d0317febc761d0ddae7602ef15","before":"9cb1f2425c30966d236589670e7253af8bc4fdbc","commits":[{"sha":"8c6fa1f0b9de55d0317febc761d0ddae7602ef15","author":{"name":"Eniola JOHNSON","email":"3d23e5f1d781de99e33ec800292bd0390cd0040f@gmail.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/eniolajohnson/todo-skapp/commits/8c6fa1f0b9de55d0317febc761d0ddae7602ef15"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339645","type":"CreateEvent","actor":{"id":33559353,"login":"ZarakiLancelot","display_login":"ZarakiLancelot","gravatar_id":"","url":"https://api.github.com/users/ZarakiLancelot","avatar_url":"https://avatars.githubusercontent.com/u/33559353?"},"repo":{"id":388056557,"name":"ZarakiLancelot/empleados","url":"https://api.github.com/repos/ZarakiLancelot/empleados"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":"Sistema de empelados en Angular","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339648","type":"CreateEvent","actor":{"id":79913779,"login":"conda-forge-curator[bot]","display_login":"conda-forge-curator","gravatar_id":"","url":"https://api.github.com/users/conda-forge-curator[bot]","avatar_url":"https://avatars.githubusercontent.com/u/79913779?"},"repo":{"id":288431736,"name":"conda-forge/releases","url":"https://api.github.com/repos/conda-forge/releases"},"payload":{"ref":"win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2","ref_type":"tag","master_branch":"master","description":"releases of conda-forge builds","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":11897326,"login":"conda-forge","gravatar_id":"","url":"https://api.github.com/orgs/conda-forge","avatar_url":"https://avatars.githubusercontent.com/u/11897326?"}}
+{"id":"17246339649","type":"PushEvent","actor":{"id":25180681,"login":"renovate-bot","display_login":"renovate-bot","gravatar_id":"","url":"https://api.github.com/users/renovate-bot","avatar_url":"https://avatars.githubusercontent.com/u/25180681?"},"repo":{"id":219561466,"name":"renovate-bot/java-compute","url":"https://api.github.com/repos/renovate-bot/java-compute"},"payload":{"push_id":7562451163,"size":0,"distinct_size":0,"ref":"refs/heads/master","head":"bd689646b0c802ff735f56c727734fb4124e1554","before":"bd689646b0c802ff735f56c727734fb4124e1554","commits":[]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339651","type":"PullRequestEvent","actor":{"id":29516565,"login":"drodriguezhdez","display_login":"drodriguezhdez","gravatar_id":"","url":"https://api.github.com/users/drodriguezhdez","avatar_url":"https://avatars.githubusercontent.com/u/29516565?"},"repo":{"id":41455269,"name":"jenkinsci/datadog-plugin","url":"https://api.github.com/repos/jenkinsci/datadog-plugin"},"payload":{"action":"opened","number":234,"pull_request":{"url":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/234","id":694185710,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzEw","html_url":"https://github.com/jenkinsci/datadog-plugin/pull/234","diff_url":"https://github.com/jenkinsci/datadog-plugin/pull/234.diff","patch_url":"https://github.com/jenkinsci/datadog-plugin/pull/234.patch","issue_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/234","number":234,"state":"open","locked":false,"title":"Remove APM Java Tracer dependency","user":{"login":"drodriguezhdez","id":29516565,"node_id":"MDQ6VXNlcjI5NTE2NTY1","avatar_url":"https://avatars.githubusercontent.com/u/29516565?v=4","gravatar_id":"","url":"https://api.github.com/users/drodriguezhdez","html_url":"https://github.com/drodriguezhdez","followers_url":"https://api.github.com/users/drodriguezhdez/followers","following_url":"https://api.github.com/users/drodriguezhdez/following{/other_user}","gists_url":"https://api.github.com/users/drodriguezhdez/gists{/gist_id}","starred_url":"https://api.github.com/users/drodriguezhdez/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/drodriguezhdez/subscriptions","organizations_url":"https://api.github.com/users/drodriguezhdez/orgs","repos_url":"https://api.github.com/users/drodriguezhdez/repos","events_url":"https://api.github.com/users/drodriguezhdez/events{/privacy}","received_events_url":"https://api.github.com/users/drodriguezhdez/received_events","type":"User","site_admin":false},"body":"### Requirements for Contributing to this repository\r\n\r\n* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.\r\n* The pull request must only fix one issue at the time.\r\n* The pull request must update the test suite to demonstrate the changed functionality.\r\n* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see [CONTRIBUTING](/CONTRIBUTING.md). \r\n\r\n### What does this PR do?\r\n\r\n<!-- \r\n\r\nWhat inspired you to submit this pull request?\r\nLink to the issue describing the bug that you're fixing.\r\n\r\nIf there is not yet an issue for your bug, please open a new issue and then link to that issue in your pull request.\r\nNote: In some cases, one person's \"bug\" is another person's \"feature.\" If the pull request does not address an existing issue with the \"bug\" label, the maintainers have the final say on whether the current behavior is a bug.\r\n\r\n-->\r\n\r\n### Description of the Change\r\n\r\n<!--\r\n\r\nA brief description of the change being made with this pull request. \r\n\r\nWe must be able to understand the design of your change from this description. \r\nIf we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. \r\nKeep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.\r\n\r\n-->\r\n\r\n### Alternate Designs\r\n\r\n<!-- Explain what other alternates were considered and why the proposed version was selected -->\r\n\r\n### Possible Drawbacks\r\n\r\n<!-- What are the possible side-effects or negative impacts of the code change? -->\r\n\r\n### Verification Process\r\n\r\n<!--\r\n\r\nWhat process did you follow to verify that your change has the desired effects?\r\n\r\n- How did you verify that all new functionality works as expected?\r\n- How did you verify that all changed functionality works as expected?\r\n- How did you verify that the change has not introduced any regressions?\r\n\r\nDescribe the actions you performed (including scripts, commands you ran, etc.), and describe the results you observed.\r\n\r\n-->\r\n\r\n### Additional Notes\r\n\r\n<!-- Anything else we should know when reviewing? -->\r\n\r\n### Release Notes\r\n\r\n<!--\r\n\r\nIf the PR title is not enough to describe the changes in a single line that explains this improvement in\r\nterms that a user can understand. This text will be added in release notes.\r\n\r\nFor example, you can provide additionnal notes about feature deprecation or backward incompatible changes.\r\n\r\n-->\r\n\r\n### Review checklist (to be filled by reviewers)\r\n\r\n- [ ] Feature or bug fix MUST have appropriate tests (unit, integration, etc...)\r\n- [ ] PR title must be written as a CHANGELOG entry [(see why)](/CONTRIBUTING.md#pull-request-title)\r\n- [ ] Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)\r\n- [ ] PR must have one `changelog/` label attached. If applicable it should have the `backward-incompatible` label attached.\r\n- [ ] PR should not have `do-not-merge/` label attached.\r\n- [ ] If Applicable, issue must have `kind/` and `severity/` labels attached at least.\r\n\r\n","created_at":"2021-07-21T09:00:01Z","updated_at":"2021-07-21T09:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":true,"commits_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/234/commits","review_comments_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/234/comments","review_comment_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/234/comments","statuses_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/statuses/0a07fbe519d7115ba552d421c085118943045d0a","head":{"label":"jenkinsci:drodriguezhdez/remove_java_tracer","ref":"drodriguezhdez/remove_java_tracer","sha":"0a07fbe519d7115ba552d421c085118943045d0a","user":{"login":"jenkinsci","id":107424,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwNzQyNA==","avatar_url":"https://avatars.githubusercontent.com/u/107424?v=4","gravatar_id":"","url":"https://api.github.com/users/jenkinsci","html_url":"https://github.com/jenkinsci","followers_url":"https://api.github.com/users/jenkinsci/followers","following_url":"https://api.github.com/users/jenkinsci/following{/other_user}","gists_url":"https://api.github.com/users/jenkinsci/gists{/gist_id}","starred_url":"https://api.github.com/users/jenkinsci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jenkinsci/subscriptions","organizations_url":"https://api.github.com/users/jenkinsci/orgs","repos_url":"https://api.github.com/users/jenkinsci/repos","events_url":"https://api.github.com/users/jenkinsci/events{/privacy}","received_events_url":"https://api.github.com/users/jenkinsci/received_events","type":"Organization","site_admin":false},"repo":{"id":41455269,"node_id":"MDEwOlJlcG9zaXRvcnk0MTQ1NTI2OQ==","name":"datadog-plugin","full_name":"jenkinsci/datadog-plugin","private":false,"owner":{"login":"jenkinsci","id":107424,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwNzQyNA==","avatar_url":"https://avatars.githubusercontent.com/u/107424?v=4","gravatar_id":"","url":"https://api.github.com/users/jenkinsci","html_url":"https://github.com/jenkinsci","followers_url":"https://api.github.com/users/jenkinsci/followers","following_url":"https://api.github.com/users/jenkinsci/following{/other_user}","gists_url":"https://api.github.com/users/jenkinsci/gists{/gist_id}","starred_url":"https://api.github.com/users/jenkinsci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jenkinsci/subscriptions","organizations_url":"https://api.github.com/users/jenkinsci/orgs","repos_url":"https://api.github.com/users/jenkinsci/repos","events_url":"https://api.github.com/users/jenkinsci/events{/privacy}","received_events_url":"https://api.github.com/users/jenkinsci/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/jenkinsci/datadog-plugin","description":"A Jenkins plugin used to forward metrics, events, and service checks to an account at Datadog, automatically.","fork":false,"url":"https://api.github.com/repos/jenkinsci/datadog-plugin","forks_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/forks","keys_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/teams","hooks_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/hooks","issue_events_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/events{/number}","events_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/events","assignees_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/assignees{/user}","branches_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/branches{/branch}","tags_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/tags","blobs_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/refs{/sha}","trees_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/statuses/{sha}","languages_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/languages","stargazers_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/stargazers","contributors_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/contributors","subscribers_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/subscribers","subscription_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/subscription","commits_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/commits{/sha}","git_commits_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/commits{/sha}","comments_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/comments{/number}","issue_comment_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/comments{/number}","contents_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/contents/{+path}","compare_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/merges","archive_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/downloads","issues_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues{/number}","pulls_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls{/number}","milestones_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/milestones{/number}","notifications_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/labels{/name}","releases_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/releases{/id}","deployments_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/deployments","created_at":"2015-08-26T23:41:56Z","updated_at":"2021-07-19T13:56:30Z","pushed_at":"2021-07-21T09:00:01Z","git_url":"git://github.com/jenkinsci/datadog-plugin.git","ssh_url":"git@github.com:jenkinsci/datadog-plugin.git","clone_url":"https://github.com/jenkinsci/datadog-plugin.git","svn_url":"https://github.com/jenkinsci/datadog-plugin","homepage":null,"size":2148,"stargazers_count":19,"watchers_count":19,"language":"Java","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":31,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":31,"open_issues":4,"watchers":19,"default_branch":"master"}},"base":{"label":"jenkinsci:master","ref":"master","sha":"a52cfa1fc67525e7ebcf81fb98f63b036689cdd5","user":{"login":"jenkinsci","id":107424,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwNzQyNA==","avatar_url":"https://avatars.githubusercontent.com/u/107424?v=4","gravatar_id":"","url":"https://api.github.com/users/jenkinsci","html_url":"https://github.com/jenkinsci","followers_url":"https://api.github.com/users/jenkinsci/followers","following_url":"https://api.github.com/users/jenkinsci/following{/other_user}","gists_url":"https://api.github.com/users/jenkinsci/gists{/gist_id}","starred_url":"https://api.github.com/users/jenkinsci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jenkinsci/subscriptions","organizations_url":"https://api.github.com/users/jenkinsci/orgs","repos_url":"https://api.github.com/users/jenkinsci/repos","events_url":"https://api.github.com/users/jenkinsci/events{/privacy}","received_events_url":"https://api.github.com/users/jenkinsci/received_events","type":"Organization","site_admin":false},"repo":{"id":41455269,"node_id":"MDEwOlJlcG9zaXRvcnk0MTQ1NTI2OQ==","name":"datadog-plugin","full_name":"jenkinsci/datadog-plugin","private":false,"owner":{"login":"jenkinsci","id":107424,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwNzQyNA==","avatar_url":"https://avatars.githubusercontent.com/u/107424?v=4","gravatar_id":"","url":"https://api.github.com/users/jenkinsci","html_url":"https://github.com/jenkinsci","followers_url":"https://api.github.com/users/jenkinsci/followers","following_url":"https://api.github.com/users/jenkinsci/following{/other_user}","gists_url":"https://api.github.com/users/jenkinsci/gists{/gist_id}","starred_url":"https://api.github.com/users/jenkinsci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jenkinsci/subscriptions","organizations_url":"https://api.github.com/users/jenkinsci/orgs","repos_url":"https://api.github.com/users/jenkinsci/repos","events_url":"https://api.github.com/users/jenkinsci/events{/privacy}","received_events_url":"https://api.github.com/users/jenkinsci/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/jenkinsci/datadog-plugin","description":"A Jenkins plugin used to forward metrics, events, and service checks to an account at Datadog, automatically.","fork":false,"url":"https://api.github.com/repos/jenkinsci/datadog-plugin","forks_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/forks","keys_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/teams","hooks_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/hooks","issue_events_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/events{/number}","events_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/events","assignees_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/assignees{/user}","branches_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/branches{/branch}","tags_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/tags","blobs_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/refs{/sha}","trees_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/statuses/{sha}","languages_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/languages","stargazers_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/stargazers","contributors_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/contributors","subscribers_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/subscribers","subscription_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/subscription","commits_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/commits{/sha}","git_commits_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/git/commits{/sha}","comments_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/comments{/number}","issue_comment_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/comments{/number}","contents_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/contents/{+path}","compare_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/merges","archive_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/downloads","issues_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues{/number}","pulls_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls{/number}","milestones_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/milestones{/number}","notifications_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/labels{/name}","releases_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/releases{/id}","deployments_url":"https://api.github.com/repos/jenkinsci/datadog-plugin/deployments","created_at":"2015-08-26T23:41:56Z","updated_at":"2021-07-19T13:56:30Z","pushed_at":"2021-07-21T09:00:01Z","git_url":"git://github.com/jenkinsci/datadog-plugin.git","ssh_url":"git@github.com:jenkinsci/datadog-plugin.git","clone_url":"https://github.com/jenkinsci/datadog-plugin.git","svn_url":"https://github.com/jenkinsci/datadog-plugin","homepage":null,"size":2148,"stargazers_count":19,"watchers_count":19,"language":"Java","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":31,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":31,"open_issues":4,"watchers":19,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/234"},"html":{"href":"https://github.com/jenkinsci/datadog-plugin/pull/234"},"issue":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/234"},"comments":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/issues/234/comments"},"review_comments":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/234/comments"},"review_comment":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/pulls/234/commits"},"statuses":{"href":"https://api.github.com/repos/jenkinsci/datadog-plugin/statuses/0a07fbe519d7115ba552d421c085118943045d0a"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"draft","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":18,"additions":1221,"deletions":776,"changed_files":30}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":107424,"login":"jenkinsci","gravatar_id":"","url":"https://api.github.com/orgs/jenkinsci","avatar_url":"https://avatars.githubusercontent.com/u/107424?"}}
+{"id":"17246339661","type":"PushEvent","actor":{"id":87718722,"login":"alezfergusonn9054","display_login":"alezfergusonn9054","gravatar_id":"","url":"https://api.github.com/users/alezfergusonn9054","avatar_url":"https://avatars.githubusercontent.com/u/87718722?"},"repo":{"id":387866845,"name":"alezfergusonn9054/hfdbx3","url":"https://api.github.com/repos/alezfergusonn9054/hfdbx3"},"payload":{"push_id":7562451200,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"7892bfe24f4ae020da7605bf89fd8faa20861758","before":"98aeafff9c8bf6a52bdde602803cb51df55b8a11","commits":[{"sha":"7892bfe24f4ae020da7605bf89fd8faa20861758","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/alezfergusonn9054/hfdbx3/commits/7892bfe24f4ae020da7605bf89fd8faa20861758"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339670","type":"WatchEvent","actor":{"id":1403893,"login":"kenshinji","display_login":"kenshinji","gravatar_id":"","url":"https://api.github.com/users/kenshinji","avatar_url":"https://avatars.githubusercontent.com/u/1403893?"},"repo":{"id":170248802,"name":"kuoruan/openwrt-v2ray","url":"https://api.github.com/repos/kuoruan/openwrt-v2ray"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339675","type":"PushEvent","actor":{"id":86923688,"login":"XiaoBai-12138","display_login":"XiaoBai-12138","gravatar_id":"","url":"https://api.github.com/users/XiaoBai-12138","avatar_url":"https://avatars.githubusercontent.com/u/86923688?"},"repo":{"id":388050505,"name":"XiaoBai-12138/ezOFFICE","url":"https://api.github.com/repos/XiaoBai-12138/ezOFFICE"},"payload":{"push_id":7562451201,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f15679b090f345f9621b1bec6f5bbf8e0fbf14bb","before":"6f65f2f6b1a7540a0d41c4bb537c450180576507","commits":[{"sha":"f15679b090f345f9621b1bec6f5bbf8e0fbf14bb","author":{"name":"XiaoBai","email":"95a80b1b37372c3f06fccd813cad8ca7003ead1c@users.noreply.github.com"},"message":"Create README.md","distinct":true,"url":"https://api.github.com/repos/XiaoBai-12138/ezOFFICE/commits/f15679b090f345f9621b1bec6f5bbf8e0fbf14bb"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339680","type":"PushEvent","actor":{"id":87741920,"login":"mikataysonn2053","display_login":"mikataysonn2053","gravatar_id":"","url":"https://api.github.com/users/mikataysonn2053","avatar_url":"https://avatars.githubusercontent.com/u/87741920?"},"repo":{"id":387970629,"name":"mikataysonn2053/dsvdvd4","url":"https://api.github.com/repos/mikataysonn2053/dsvdvd4"},"payload":{"push_id":7562451185,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"ae1ffe82282ff9f765c4c34545c1f662d608140c","before":"42f1d7ebc9ff626b02334beb1fa61ee292ea49f9","commits":[{"sha":"ae1ffe82282ff9f765c4c34545c1f662d608140c","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/mikataysonn2053/dsvdvd4/commits/ae1ffe82282ff9f765c4c34545c1f662d608140c"}]},"public":true,"created_at":"2021-07-21T09:00:01Z"}
+{"id":"17246339684","type":"IssueCommentEvent","actor":{"id":3595932,"login":"rouke-broersma","display_login":"rouke-broersma","gravatar_id":"","url":"https://api.github.com/users/rouke-broersma","avatar_url":"https://avatars.githubusercontent.com/u/3595932?"},"repo":{"id":120896210,"name":"argoproj/argo-cd","url":"https://api.github.com/repos/argoproj/argo-cd"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/argoproj/argo-cd/issues/4691","repository_url":"https://api.github.com/repos/argoproj/argo-cd","labels_url":"https://api.github.com/repos/argoproj/argo-cd/issues/4691/labels{/name}","comments_url":"https://api.github.com/repos/argoproj/argo-cd/issues/4691/comments","events_url":"https://api.github.com/repos/argoproj/argo-cd/issues/4691/events","html_url":"https://github.com/argoproj/argo-cd/issues/4691","id":731395926,"node_id":"MDU6SXNzdWU3MzEzOTU5MjY=","number":4691,"title":"Cluster name should be supported on AppProject CRD","user":{"login":"paveq","id":130256,"node_id":"MDQ6VXNlcjEzMDI1Ng==","avatar_url":"https://avatars.githubusercontent.com/u/130256?v=4","gravatar_id":"","url":"https://api.github.com/users/paveq","html_url":"https://github.com/paveq","followers_url":"https://api.github.com/users/paveq/followers","following_url":"https://api.github.com/users/paveq/following{/other_user}","gists_url":"https://api.github.com/users/paveq/gists{/gist_id}","starred_url":"https://api.github.com/users/paveq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/paveq/subscriptions","organizations_url":"https://api.github.com/users/paveq/orgs","repos_url":"https://api.github.com/users/paveq/repos","events_url":"https://api.github.com/users/paveq/events{/privacy}","received_events_url":"https://api.github.com/users/paveq/received_events","type":"User","site_admin":false},"labels":[{"id":832247448,"node_id":"MDU6TGFiZWw4MzIyNDc0NDg=","url":"https://api.github.com/repos/argoproj/argo-cd/labels/enhancement","name":"enhancement","color":"a2eeef","default":true,"description":"New feature or request"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":6,"created_at":"2020-10-28T12:26:07Z","updated_at":"2021-07-21T09:00:01Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"# Summary\r\n\r\nCluster name feature introduced in v1.7 should be supported in AppProjects as well.\r\n\r\n# Motivation\r\n\r\nShould be able to give easy to remember name, instead of URL for the destination clusters in AppProject CRD.\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/argoproj/argo-cd/issues/comments/884018700","html_url":"https://github.com/argoproj/argo-cd/issues/4691#issuecomment-884018700","issue_url":"https://api.github.com/repos/argoproj/argo-cd/issues/4691","id":884018700,"node_id":"IC_kwDOBzS60s40sQ4M","user":{"login":"rouke-broersma","id":3595932,"node_id":"MDQ6VXNlcjM1OTU5MzI=","avatar_url":"https://avatars.githubusercontent.com/u/3595932?v=4","gravatar_id":"","url":"https://api.github.com/users/rouke-broersma","html_url":"https://github.com/rouke-broersma","followers_url":"https://api.github.com/users/rouke-broersma/followers","following_url":"https://api.github.com/users/rouke-broersma/following{/other_user}","gists_url":"https://api.github.com/users/rouke-broersma/gists{/gist_id}","starred_url":"https://api.github.com/users/rouke-broersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rouke-broersma/subscriptions","organizations_url":"https://api.github.com/users/rouke-broersma/orgs","repos_url":"https://api.github.com/users/rouke-broersma/repos","events_url":"https://api.github.com/users/rouke-broersma/events{/privacy}","received_events_url":"https://api.github.com/users/rouke-broersma/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:01Z","updated_at":"2021-07-21T09:00:01Z","author_association":"NONE","body":"We are looking for this feature as well because we use app-of-apps with argo to provision other clusters with argo from automation. This automation does not know the the api url is going to be but it does know the cluster name.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:01Z","org":{"id":30269780,"login":"argoproj","gravatar_id":"","url":"https://api.github.com/orgs/argoproj","avatar_url":"https://avatars.githubusercontent.com/u/30269780?"}}
+{"id":"17246339689","type":"PushEvent","actor":{"id":81258380,"login":"Helikopter-Bojowy","display_login":"Helikopter-Bojowy","gravatar_id":"","url":"https://api.github.com/users/Helikopter-Bojowy","avatar_url":"https://avatars.githubusercontent.com/u/81258380?"},"repo":{"id":352069365,"name":"Helikopter-Bojowy/Exp-na-helikopterze","url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze"},"payload":{"push_id":7562451196,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8e776b85651aa9b1f13ae7982e1ad40e0f727484","before":"2003d5f663f56005804f900324a569f18e221913","commits":[{"sha":"8e776b85651aa9b1f13ae7982e1ad40e0f727484","author":{"name":"Helikopter-Bojowy","email":"733707e04c8bf7c874ce97516f8f637586fc79d7@users.noreply.github.com"},"message":"1626858000857:0","distinct":true,"url":"https://api.github.com/repos/Helikopter-Bojowy/Exp-na-helikopterze/commits/8e776b85651aa9b1f13ae7982e1ad40e0f727484"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339692","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":319743689,"name":"major/cronjobs","url":"https://api.github.com/repos/major/cronjobs"},"payload":{"push_id":7562451210,"size":1,"distinct_size":1,"ref":"refs/heads/cache-db","head":"c814c541a4ebe93f486a9c3b86646ef9056253ed","before":"adc9c4b6f06cf1c45753b4b9ca612810004e7cbe","commits":[{"sha":"c814c541a4ebe93f486a9c3b86646ef9056253ed","author":{"name":"major","email":"18c9d4621ef6c3113ce1f960346d7603e88406e8@users.noreply.github.com"},"message":"Update cache-db to output generated at 22f7f7d","distinct":true,"url":"https://api.github.com/repos/major/cronjobs/commits/c814c541a4ebe93f486a9c3b86646ef9056253ed"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339707","type":"PushEvent","actor":{"id":30502993,"login":"a-rsc","display_login":"a-rsc","gravatar_id":"","url":"https://api.github.com/users/a-rsc","avatar_url":"https://avatars.githubusercontent.com/u/30502993?"},"repo":{"id":387214145,"name":"a-rsc/AprenderVueJs","url":"https://api.github.com/repos/a-rsc/AprenderVueJs"},"payload":{"push_id":7562451216,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1c2de13d6d9505838d647f3d7e8a606364911573","before":"7e4ca914b4e137c218a78900347c40c75a5070e1","commits":[{"sha":"1c2de13d6d9505838d647f3d7e8a606364911573","author":{"name":"Alvaro","email":"863cb5dd62b263f0d9ad6cc29dad3f1ac57c467d@hotmail.com"},"message":"starting lesson 015","distinct":true,"url":"https://api.github.com/repos/a-rsc/AprenderVueJs/commits/1c2de13d6d9505838d647f3d7e8a606364911573"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339714","type":"IssueCommentEvent","actor":{"id":8723280,"login":"OCA-git-bot","display_login":"OCA-git-bot","gravatar_id":"","url":"https://api.github.com/users/OCA-git-bot","avatar_url":"https://avatars.githubusercontent.com/u/8723280?"},"repo":{"id":20881720,"name":"OCA/account-budgeting","url":"https://api.github.com/repos/OCA/account-budgeting"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/OCA/account-budgeting/issues/37","repository_url":"https://api.github.com/repos/OCA/account-budgeting","labels_url":"https://api.github.com/repos/OCA/account-budgeting/issues/37/labels{/name}","comments_url":"https://api.github.com/repos/OCA/account-budgeting/issues/37/comments","events_url":"https://api.github.com/repos/OCA/account-budgeting/issues/37/events","html_url":"https://github.com/OCA/account-budgeting/pull/37","id":583839305,"node_id":"MDExOlB1bGxSZXF1ZXN0MzkwNTI4MjQ2","number":37,"title":"13.0 mig account budget oca","user":{"login":"amcor","id":11444048,"node_id":"MDQ6VXNlcjExNDQ0MDQ4","avatar_url":"https://avatars.githubusercontent.com/u/11444048?v=4","gravatar_id":"","url":"https://api.github.com/users/amcor","html_url":"https://github.com/amcor","followers_url":"https://api.github.com/users/amcor/followers","following_url":"https://api.github.com/users/amcor/following{/other_user}","gists_url":"https://api.github.com/users/amcor/gists{/gist_id}","starred_url":"https://api.github.com/users/amcor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/amcor/subscriptions","organizations_url":"https://api.github.com/users/amcor/orgs","repos_url":"https://api.github.com/users/amcor/repos","events_url":"https://api.github.com/users/amcor/events{/privacy}","received_events_url":"https://api.github.com/users/amcor/received_events","type":"User","site_admin":false},"labels":[{"id":577768738,"node_id":"MDU6TGFiZWw1Nzc3Njg3Mzg=","url":"https://api.github.com/repos/OCA/account-budgeting/labels/approved","name":"approved","color":"045509","default":false,"description":null},{"id":1122897055,"node_id":"MDU6TGFiZWwxMTIyODk3MDU1","url":"https://api.github.com/repos/OCA/account-budgeting/labels/ready%20to%20merge","name":"ready to merge","color":"bfdadc","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":4,"created_at":"2020-03-18T16:07:28Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"author_association":"MEMBER","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/OCA/account-budgeting/pulls/37","html_url":"https://github.com/OCA/account-budgeting/pull/37","diff_url":"https://github.com/OCA/account-budgeting/pull/37.diff","patch_url":"https://github.com/OCA/account-budgeting/pull/37.patch"},"body":"cc @guadaltech\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/OCA/account-budgeting/issues/comments/884018703","html_url":"https://github.com/OCA/account-budgeting/pull/37#issuecomment-884018703","issue_url":"https://api.github.com/repos/OCA/account-budgeting/issues/37","id":884018703,"node_id":"IC_kwDOAT6hOM40sQ4P","user":{"login":"OCA-git-bot","id":8723280,"node_id":"MDQ6VXNlcjg3MjMyODA=","avatar_url":"https://avatars.githubusercontent.com/u/8723280?v=4","gravatar_id":"","url":"https://api.github.com/users/OCA-git-bot","html_url":"https://github.com/OCA-git-bot","followers_url":"https://api.github.com/users/OCA-git-bot/followers","following_url":"https://api.github.com/users/OCA-git-bot/following{/other_user}","gists_url":"https://api.github.com/users/OCA-git-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/OCA-git-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OCA-git-bot/subscriptions","organizations_url":"https://api.github.com/users/OCA-git-bot/orgs","repos_url":"https://api.github.com/users/OCA-git-bot/repos","events_url":"https://api.github.com/users/OCA-git-bot/events{/privacy}","received_events_url":"https://api.github.com/users/OCA-git-bot/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:01Z","updated_at":"2021-07-21T09:00:01Z","author_association":"CONTRIBUTOR","body":"This PR has the `approved` label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":7600578,"login":"OCA","gravatar_id":"","url":"https://api.github.com/orgs/OCA","avatar_url":"https://avatars.githubusercontent.com/u/7600578?"}}
+{"id":"17246339718","type":"CreateEvent","actor":{"id":87453487,"login":"niji486","display_login":"niji486","gravatar_id":"","url":"https://api.github.com/users/niji486","avatar_url":"https://avatars.githubusercontent.com/u/87453487?"},"repo":{"id":388056809,"name":"niji486/Algorithm","url":"https://api.github.com/repos/niji486/Algorithm"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339723","type":"PushEvent","actor":{"id":87360801,"login":"bhavaniashok13","display_login":"bhavaniashok13","gravatar_id":"","url":"https://api.github.com/users/bhavaniashok13","avatar_url":"https://avatars.githubusercontent.com/u/87360801?"},"repo":{"id":387716469,"name":"bhavaniashok13/pipeline","url":"https://api.github.com/repos/bhavaniashok13/pipeline"},"payload":{"push_id":7562451221,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"69e756c9839f86aa48f0e8cad61aab4996962b57","before":"6a69ada17dde3ca6c0768d7c5944cc9a134a4c85","commits":[{"sha":"69e756c9839f86aa48f0e8cad61aab4996962b57","author":{"name":"bhavaniashok13","email":"8f485a11d102eba834c7220c50ab36cd434f08c4@users.noreply.github.com"},"message":"Update Jenkinsfile","distinct":true,"url":"https://api.github.com/repos/bhavaniashok13/pipeline/commits/69e756c9839f86aa48f0e8cad61aab4996962b57"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339733","type":"CreateEvent","actor":{"id":3036176,"login":"Chaosus","display_login":"Chaosus","gravatar_id":"","url":"https://api.github.com/users/Chaosus","avatar_url":"https://avatars.githubusercontent.com/u/3036176?"},"repo":{"id":111555494,"name":"Chaosus/godot","url":"https://api.github.com/repos/Chaosus/godot"},"payload":{"ref":"vs_fix_triplanar","ref_type":"branch","master_branch":"master","description":"Godot Engine – Multi-platform 2D and 3D game engine","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339734","type":"WatchEvent","actor":{"id":38719088,"login":"Questdream","display_login":"Questdream","gravatar_id":"","url":"https://api.github.com/users/Questdream","avatar_url":"https://avatars.githubusercontent.com/u/38719088?"},"repo":{"id":152000215,"name":"jayboxyz/deeplearning_cv_notes","url":"https://api.github.com/repos/jayboxyz/deeplearning_cv_notes"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339735","type":"PushEvent","actor":{"id":58331543,"login":"rahilkapoor","display_login":"rahilkapoor","gravatar_id":"","url":"https://api.github.com/users/rahilkapoor","avatar_url":"https://avatars.githubusercontent.com/u/58331543?"},"repo":{"id":375583030,"name":"rahilkapoor/rahilkapoor","url":"https://api.github.com/repos/rahilkapoor/rahilkapoor"},"payload":{"push_id":7562451223,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"4a51cba0254ef6f00e7d8214f445ce5a64926a5a","before":"da66797bd8d2d689c27b318550815abcf0a6ba4b","commits":[{"sha":"4a51cba0254ef6f00e7d8214f445ce5a64926a5a","author":{"name":"Rahil Kapoor","email":"c4fa9e6a4b4167b3d6c939549f43c36e63b6893a@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/rahilkapoor/rahilkapoor/commits/4a51cba0254ef6f00e7d8214f445ce5a64926a5a"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339738","type":"WatchEvent","actor":{"id":562984,"login":"sanbroz","display_login":"sanbroz","gravatar_id":"","url":"https://api.github.com/users/sanbroz","avatar_url":"https://avatars.githubusercontent.com/u/562984?"},"repo":{"id":351510790,"name":"Flameeyes/unpaper","url":"https://api.github.com/repos/Flameeyes/unpaper"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339739","type":"PullRequestEvent","actor":{"id":11707729,"login":"gabrieldonadel","display_login":"gabrieldonadel","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","avatar_url":"https://avatars.githubusercontent.com/u/11707729?"},"repo":{"id":387916158,"name":"gabrieldonadel/pull-requests-limits","url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits"},"payload":{"action":"opened","number":5533,"pull_request":{"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5533","id":694185713,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzEz","html_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5533","diff_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5533.diff","patch_url":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5533.patch","issue_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5533","number":5533,"state":"open","locked":false,"title":"Add file 5555.txt","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"body":null,"created_at":"2021-07-21T09:00:01Z","updated_at":"2021-07-21T09:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5533/commits","review_comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5533/comments","review_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5533/comments","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/a20ac5023d462e437e2ea484528f10e10a8934f7","head":{"label":"gabrieldonadel:5555","ref":"5555","sha":"a20ac5023d462e437e2ea484528f10e10a8934f7","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":1196,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5531,"license":null,"forks":0,"open_issues":5531,"watchers":1,"default_branch":"master"}},"base":{"label":"gabrieldonadel:master","ref":"master","sha":"d82cf4fd9e97a60cfebab6b8f7f85f9f8380b29b","user":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"repo":{"id":387916158,"node_id":"MDEwOlJlcG9zaXRvcnkzODc5MTYxNTg=","name":"pull-requests-limits","full_name":"gabrieldonadel/pull-requests-limits","private":false,"owner":{"login":"gabrieldonadel","id":11707729,"node_id":"MDQ6VXNlcjExNzA3NzI5","avatar_url":"https://avatars.githubusercontent.com/u/11707729?v=4","gravatar_id":"","url":"https://api.github.com/users/gabrieldonadel","html_url":"https://github.com/gabrieldonadel","followers_url":"https://api.github.com/users/gabrieldonadel/followers","following_url":"https://api.github.com/users/gabrieldonadel/following{/other_user}","gists_url":"https://api.github.com/users/gabrieldonadel/gists{/gist_id}","starred_url":"https://api.github.com/users/gabrieldonadel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gabrieldonadel/subscriptions","organizations_url":"https://api.github.com/users/gabrieldonadel/orgs","repos_url":"https://api.github.com/users/gabrieldonadel/repos","events_url":"https://api.github.com/users/gabrieldonadel/events{/privacy}","received_events_url":"https://api.github.com/users/gabrieldonadel/received_events","type":"User","site_admin":false},"html_url":"https://github.com/gabrieldonadel/pull-requests-limits","description":"Testing Github Pull requests limits","fork":false,"url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits","forks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/forks","keys_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/teams","hooks_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/hooks","issue_events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/events{/number}","events_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/events","assignees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/assignees{/user}","branches_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/branches{/branch}","tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/tags","blobs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/refs{/sha}","trees_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/{sha}","languages_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/languages","stargazers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/stargazers","contributors_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contributors","subscribers_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscribers","subscription_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/subscription","commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/commits{/sha}","git_commits_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/git/commits{/sha}","comments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/comments{/number}","issue_comment_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/comments{/number}","contents_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/contents/{+path}","compare_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/merges","archive_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/downloads","issues_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues{/number}","pulls_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls{/number}","milestones_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/milestones{/number}","notifications_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/labels{/name}","releases_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/releases{/id}","deployments_url":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/deployments","created_at":"2021-07-20T21:17:40Z","updated_at":"2021-07-21T01:36:14Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/gabrieldonadel/pull-requests-limits.git","ssh_url":"git@github.com:gabrieldonadel/pull-requests-limits.git","clone_url":"https://github.com/gabrieldonadel/pull-requests-limits.git","svn_url":"https://github.com/gabrieldonadel/pull-requests-limits","homepage":null,"size":1196,"stargazers_count":1,"watchers_count":1,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5531,"license":null,"forks":0,"open_issues":5531,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5533"},"html":{"href":"https://github.com/gabrieldonadel/pull-requests-limits/pull/5533"},"issue":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5533"},"comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/issues/5533/comments"},"review_comments":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5533/comments"},"review_comment":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/pulls/5533/commits"},"statuses":{"href":"https://api.github.com/repos/gabrieldonadel/pull-requests-limits/statuses/a20ac5023d462e437e2ea484528f10e10a8934f7"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339741","type":"PushEvent","actor":{"id":82897431,"login":"ConveroMursa","display_login":"ConveroMursa","gravatar_id":"","url":"https://api.github.com/users/ConveroMursa","avatar_url":"https://avatars.githubusercontent.com/u/82897431?"},"repo":{"id":363058430,"name":"ConveroMursa/pyda_homeworks","url":"https://api.github.com/repos/ConveroMursa/pyda_homeworks"},"payload":{"push_id":7562451225,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8d3701ed6bba0b82ddb3a64a09d5b7f207b35a52","before":"feffe89746f056eca1ee698e629e172062335dd8","commits":[{"sha":"8d3701ed6bba0b82ddb3a64a09d5b7f207b35a52","author":{"name":"ConveroMursa","email":"8af7dc8ad633ccac5f53b51f69b5238f98a54821@gmail.com"},"message":"add HW corr and regr","distinct":true,"url":"https://api.github.com/repos/ConveroMursa/pyda_homeworks/commits/8d3701ed6bba0b82ddb3a64a09d5b7f207b35a52"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339746","type":"PushEvent","actor":{"id":87330551,"login":"xz241","display_login":"xz241","gravatar_id":"","url":"https://api.github.com/users/xz241","avatar_url":"https://avatars.githubusercontent.com/u/87330551?"},"repo":{"id":385328687,"name":"xz241/wp-uploads","url":"https://api.github.com/repos/xz241/wp-uploads"},"payload":{"push_id":7562451247,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"1d84d885421cf1a0f94f8720579a53734457c27d","before":"ce7556e4c681ba0ee5334ee87ffa9cfd612a7916","commits":[{"sha":"1d84d885421cf1a0f94f8720579a53734457c27d","author":{"name":"xz241","email":"e17353502d0344fb9b4d10b6a471cc23c11850ec@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/xz241/wp-uploads/commits/1d84d885421cf1a0f94f8720579a53734457c27d"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339756","type":"PullRequestEvent","actor":{"id":74347264,"login":"boost-e2e-tester-user","display_login":"boost-e2e-tester-user","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-tester-user","avatar_url":"https://avatars.githubusercontent.com/u/74347264?"},"repo":{"id":376948559,"name":"boost-e2e-stage-ci-buildkite/pr-comments","url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments"},"payload":{"action":"opened","number":3695,"pull_request":{"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3695","id":694185715,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzE1","html_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3695","diff_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3695.diff","patch_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3695.patch","issue_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3695","number":3695,"state":"open","locked":false,"title":"Test PR Comment","user":{"login":"boost-e2e-tester-user","id":74347264,"node_id":"MDQ6VXNlcjc0MzQ3MjY0","avatar_url":"https://avatars.githubusercontent.com/u/74347264?v=4","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-tester-user","html_url":"https://github.com/boost-e2e-tester-user","followers_url":"https://api.github.com/users/boost-e2e-tester-user/followers","following_url":"https://api.github.com/users/boost-e2e-tester-user/following{/other_user}","gists_url":"https://api.github.com/users/boost-e2e-tester-user/gists{/gist_id}","starred_url":"https://api.github.com/users/boost-e2e-tester-user/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boost-e2e-tester-user/subscriptions","organizations_url":"https://api.github.com/users/boost-e2e-tester-user/orgs","repos_url":"https://api.github.com/users/boost-e2e-tester-user/repos","events_url":"https://api.github.com/users/boost-e2e-tester-user/events{/privacy}","received_events_url":"https://api.github.com/users/boost-e2e-tester-user/received_events","type":"User","site_admin":false},"body":null,"created_at":"2021-07-21T09:00:01Z","updated_at":"2021-07-21T09:00:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3695/commits","review_comments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3695/comments","review_comment_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/comments{/number}","comments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3695/comments","statuses_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/statuses/cbfe19073ba710838d05858cdce5a23bc3c57894","head":{"label":"boost-e2e-stage-ci-buildkite:pr-comment","ref":"pr-comment","sha":"cbfe19073ba710838d05858cdce5a23bc3c57894","user":{"login":"boost-e2e-stage-ci-buildkite","id":81248900,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgxMjQ4OTAw","avatar_url":"https://avatars.githubusercontent.com/u/81248900?v=4","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite","html_url":"https://github.com/boost-e2e-stage-ci-buildkite","followers_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/followers","following_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/following{/other_user}","gists_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/gists{/gist_id}","starred_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/subscriptions","organizations_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/orgs","repos_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/repos","events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/events{/privacy}","received_events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/received_events","type":"Organization","site_admin":false},"repo":{"id":376948559,"node_id":"MDEwOlJlcG9zaXRvcnkzNzY5NDg1NTk=","name":"pr-comments","full_name":"boost-e2e-stage-ci-buildkite/pr-comments","private":false,"owner":{"login":"boost-e2e-stage-ci-buildkite","id":81248900,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgxMjQ4OTAw","avatar_url":"https://avatars.githubusercontent.com/u/81248900?v=4","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite","html_url":"https://github.com/boost-e2e-stage-ci-buildkite","followers_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/followers","following_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/following{/other_user}","gists_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/gists{/gist_id}","starred_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/subscriptions","organizations_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/orgs","repos_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/repos","events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/events{/privacy}","received_events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments","description":null,"fork":false,"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments","forks_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/forks","keys_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/keys{/key_id}","collaborators_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/teams","hooks_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/hooks","issue_events_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/events{/number}","events_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/events","assignees_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/assignees{/user}","branches_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/branches{/branch}","tags_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/tags","blobs_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/refs{/sha}","trees_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/trees{/sha}","statuses_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/statuses/{sha}","languages_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/languages","stargazers_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/stargazers","contributors_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/contributors","subscribers_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/subscribers","subscription_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/subscription","commits_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/commits{/sha}","git_commits_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/commits{/sha}","comments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/comments{/number}","issue_comment_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/comments{/number}","contents_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/contents/{+path}","compare_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/compare/{base}...{head}","merges_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/merges","archive_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/downloads","issues_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues{/number}","pulls_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls{/number}","milestones_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/milestones{/number}","notifications_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/labels{/name}","releases_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/releases{/id}","deployments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/deployments","created_at":"2021-06-14T20:31:07Z","updated_at":"2021-07-21T08:59:57Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/boost-e2e-stage-ci-buildkite/pr-comments.git","ssh_url":"git@github.com:boost-e2e-stage-ci-buildkite/pr-comments.git","clone_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments.git","svn_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments","homepage":null,"size":5,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"boost-e2e-stage-ci-buildkite:master","ref":"master","sha":"8402da60c61dd3efa44f3424268d09bbf44d850c","user":{"login":"boost-e2e-stage-ci-buildkite","id":81248900,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgxMjQ4OTAw","avatar_url":"https://avatars.githubusercontent.com/u/81248900?v=4","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite","html_url":"https://github.com/boost-e2e-stage-ci-buildkite","followers_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/followers","following_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/following{/other_user}","gists_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/gists{/gist_id}","starred_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/subscriptions","organizations_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/orgs","repos_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/repos","events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/events{/privacy}","received_events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/received_events","type":"Organization","site_admin":false},"repo":{"id":376948559,"node_id":"MDEwOlJlcG9zaXRvcnkzNzY5NDg1NTk=","name":"pr-comments","full_name":"boost-e2e-stage-ci-buildkite/pr-comments","private":false,"owner":{"login":"boost-e2e-stage-ci-buildkite","id":81248900,"node_id":"MDEyOk9yZ2FuaXphdGlvbjgxMjQ4OTAw","avatar_url":"https://avatars.githubusercontent.com/u/81248900?v=4","gravatar_id":"","url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite","html_url":"https://github.com/boost-e2e-stage-ci-buildkite","followers_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/followers","following_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/following{/other_user}","gists_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/gists{/gist_id}","starred_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/subscriptions","organizations_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/orgs","repos_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/repos","events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/events{/privacy}","received_events_url":"https://api.github.com/users/boost-e2e-stage-ci-buildkite/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments","description":null,"fork":false,"url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments","forks_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/forks","keys_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/keys{/key_id}","collaborators_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/teams","hooks_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/hooks","issue_events_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/events{/number}","events_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/events","assignees_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/assignees{/user}","branches_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/branches{/branch}","tags_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/tags","blobs_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/refs{/sha}","trees_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/trees{/sha}","statuses_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/statuses/{sha}","languages_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/languages","stargazers_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/stargazers","contributors_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/contributors","subscribers_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/subscribers","subscription_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/subscription","commits_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/commits{/sha}","git_commits_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/git/commits{/sha}","comments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/comments{/number}","issue_comment_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/comments{/number}","contents_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/contents/{+path}","compare_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/compare/{base}...{head}","merges_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/merges","archive_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/downloads","issues_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues{/number}","pulls_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls{/number}","milestones_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/milestones{/number}","notifications_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/labels{/name}","releases_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/releases{/id}","deployments_url":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/deployments","created_at":"2021-06-14T20:31:07Z","updated_at":"2021-07-21T08:59:57Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/boost-e2e-stage-ci-buildkite/pr-comments.git","ssh_url":"git@github.com:boost-e2e-stage-ci-buildkite/pr-comments.git","clone_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments.git","svn_url":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments","homepage":null,"size":5,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3695"},"html":{"href":"https://github.com/boost-e2e-stage-ci-buildkite/pr-comments/pull/3695"},"issue":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3695"},"comments":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/issues/3695/comments"},"review_comments":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3695/comments"},"review_comment":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/pulls/3695/commits"},"statuses":{"href":"https://api.github.com/repos/boost-e2e-stage-ci-buildkite/pr-comments/statuses/cbfe19073ba710838d05858cdce5a23bc3c57894"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":4,"deletions":0,"changed_files":1}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":81248900,"login":"boost-e2e-stage-ci-buildkite","gravatar_id":"","url":"https://api.github.com/orgs/boost-e2e-stage-ci-buildkite","avatar_url":"https://avatars.githubusercontent.com/u/81248900?"}}
+{"id":"17246339757","type":"PullRequestReviewEvent","actor":{"id":54418919,"login":"pascal-klesse","display_login":"pascal-klesse","gravatar_id":"","url":"https://api.github.com/users/pascal-klesse","avatar_url":"https://avatars.githubusercontent.com/u/54418919?"},"repo":{"id":379499395,"name":"lenneTech/academy","url":"https://api.github.com/repos/lenneTech/academy"},"payload":{"action":"created","review":{"id":711422083,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDIyMDgz","user":{"login":"pascal-klesse","id":54418919,"node_id":"MDQ6VXNlcjU0NDE4OTE5","avatar_url":"https://avatars.githubusercontent.com/u/54418919?v=4","gravatar_id":"","url":"https://api.github.com/users/pascal-klesse","html_url":"https://github.com/pascal-klesse","followers_url":"https://api.github.com/users/pascal-klesse/followers","following_url":"https://api.github.com/users/pascal-klesse/following{/other_user}","gists_url":"https://api.github.com/users/pascal-klesse/gists{/gist_id}","starred_url":"https://api.github.com/users/pascal-klesse/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pascal-klesse/subscriptions","organizations_url":"https://api.github.com/users/pascal-klesse/orgs","repos_url":"https://api.github.com/users/pascal-klesse/repos","events_url":"https://api.github.com/users/pascal-klesse/events{/privacy}","received_events_url":"https://api.github.com/users/pascal-klesse/received_events","type":"User","site_admin":false},"body":"","commit_id":"6437e242af4138fec51c91062b5c5398f8593bbb","submitted_at":"2021-07-21T09:00:01Z","state":"approved","html_url":"https://github.com/lenneTech/academy/pull/63#pullrequestreview-711422083","pull_request_url":"https://api.github.com/repos/lenneTech/academy/pulls/63","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/lenneTech/academy/pull/63#pullrequestreview-711422083"},"pull_request":{"href":"https://api.github.com/repos/lenneTech/academy/pulls/63"}}},"pull_request":{"url":"https://api.github.com/repos/lenneTech/academy/pulls/63","id":693404082,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDA0MDgy","html_url":"https://github.com/lenneTech/academy/pull/63","diff_url":"https://github.com/lenneTech/academy/pull/63.diff","patch_url":"https://github.com/lenneTech/academy/pull/63.patch","issue_url":"https://api.github.com/repos/lenneTech/academy/issues/63","number":63,"state":"open","locked":false,"title":"added section-navigation","user":{"login":"DKoenig9","id":85439028,"node_id":"MDQ6VXNlcjg1NDM5MDI4","avatar_url":"https://avatars.githubusercontent.com/u/85439028?v=4","gravatar_id":"","url":"https://api.github.com/users/DKoenig9","html_url":"https://github.com/DKoenig9","followers_url":"https://api.github.com/users/DKoenig9/followers","following_url":"https://api.github.com/users/DKoenig9/following{/other_user}","gists_url":"https://api.github.com/users/DKoenig9/gists{/gist_id}","starred_url":"https://api.github.com/users/DKoenig9/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DKoenig9/subscriptions","organizations_url":"https://api.github.com/users/DKoenig9/orgs","repos_url":"https://api.github.com/users/DKoenig9/repos","events_url":"https://api.github.com/users/DKoenig9/events{/privacy}","received_events_url":"https://api.github.com/users/DKoenig9/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T11:56:55Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7fc2873c7c1e3bc27c6f3dfdfdd9d1dfdd15fef2","assignee":null,"assignees":[],"requested_reviewers":[{"login":"FSteinhansesLT","id":82445251,"node_id":"MDQ6VXNlcjgyNDQ1MjUx","avatar_url":"https://avatars.githubusercontent.com/u/82445251?v=4","gravatar_id":"","url":"https://api.github.com/users/FSteinhansesLT","html_url":"https://github.com/FSteinhansesLT","followers_url":"https://api.github.com/users/FSteinhansesLT/followers","following_url":"https://api.github.com/users/FSteinhansesLT/following{/other_user}","gists_url":"https://api.github.com/users/FSteinhansesLT/gists{/gist_id}","starred_url":"https://api.github.com/users/FSteinhansesLT/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FSteinhansesLT/subscriptions","organizations_url":"https://api.github.com/users/FSteinhansesLT/orgs","repos_url":"https://api.github.com/users/FSteinhansesLT/repos","events_url":"https://api.github.com/users/FSteinhansesLT/events{/privacy}","received_events_url":"https://api.github.com/users/FSteinhansesLT/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/lenneTech/academy/pulls/63/commits","review_comments_url":"https://api.github.com/repos/lenneTech/academy/pulls/63/comments","review_comment_url":"https://api.github.com/repos/lenneTech/academy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/lenneTech/academy/issues/63/comments","statuses_url":"https://api.github.com/repos/lenneTech/academy/statuses/6437e242af4138fec51c91062b5c5398f8593bbb","head":{"label":"lenneTech:academy/section-navigation","ref":"academy/section-navigation","sha":"6437e242af4138fec51c91062b5c5398f8593bbb","user":{"login":"lenneTech","id":51728218,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNzI4MjE4","avatar_url":"https://avatars.githubusercontent.com/u/51728218?v=4","gravatar_id":"","url":"https://api.github.com/users/lenneTech","html_url":"https://github.com/lenneTech","followers_url":"https://api.github.com/users/lenneTech/followers","following_url":"https://api.github.com/users/lenneTech/following{/other_user}","gists_url":"https://api.github.com/users/lenneTech/gists{/gist_id}","starred_url":"https://api.github.com/users/lenneTech/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lenneTech/subscriptions","organizations_url":"https://api.github.com/users/lenneTech/orgs","repos_url":"https://api.github.com/users/lenneTech/repos","events_url":"https://api.github.com/users/lenneTech/events{/privacy}","received_events_url":"https://api.github.com/users/lenneTech/received_events","type":"Organization","site_admin":false},"repo":{"id":379499395,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk0OTkzOTU=","name":"academy","full_name":"lenneTech/academy","private":false,"owner":{"login":"lenneTech","id":51728218,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNzI4MjE4","avatar_url":"https://avatars.githubusercontent.com/u/51728218?v=4","gravatar_id":"","url":"https://api.github.com/users/lenneTech","html_url":"https://github.com/lenneTech","followers_url":"https://api.github.com/users/lenneTech/followers","following_url":"https://api.github.com/users/lenneTech/following{/other_user}","gists_url":"https://api.github.com/users/lenneTech/gists{/gist_id}","starred_url":"https://api.github.com/users/lenneTech/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lenneTech/subscriptions","organizations_url":"https://api.github.com/users/lenneTech/orgs","repos_url":"https://api.github.com/users/lenneTech/repos","events_url":"https://api.github.com/users/lenneTech/events{/privacy}","received_events_url":"https://api.github.com/users/lenneTech/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/lenneTech/academy","description":"An online learning platform for learning web development. ","fork":false,"url":"https://api.github.com/repos/lenneTech/academy","forks_url":"https://api.github.com/repos/lenneTech/academy/forks","keys_url":"https://api.github.com/repos/lenneTech/academy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lenneTech/academy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lenneTech/academy/teams","hooks_url":"https://api.github.com/repos/lenneTech/academy/hooks","issue_events_url":"https://api.github.com/repos/lenneTech/academy/issues/events{/number}","events_url":"https://api.github.com/repos/lenneTech/academy/events","assignees_url":"https://api.github.com/repos/lenneTech/academy/assignees{/user}","branches_url":"https://api.github.com/repos/lenneTech/academy/branches{/branch}","tags_url":"https://api.github.com/repos/lenneTech/academy/tags","blobs_url":"https://api.github.com/repos/lenneTech/academy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lenneTech/academy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lenneTech/academy/git/refs{/sha}","trees_url":"https://api.github.com/repos/lenneTech/academy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lenneTech/academy/statuses/{sha}","languages_url":"https://api.github.com/repos/lenneTech/academy/languages","stargazers_url":"https://api.github.com/repos/lenneTech/academy/stargazers","contributors_url":"https://api.github.com/repos/lenneTech/academy/contributors","subscribers_url":"https://api.github.com/repos/lenneTech/academy/subscribers","subscription_url":"https://api.github.com/repos/lenneTech/academy/subscription","commits_url":"https://api.github.com/repos/lenneTech/academy/commits{/sha}","git_commits_url":"https://api.github.com/repos/lenneTech/academy/git/commits{/sha}","comments_url":"https://api.github.com/repos/lenneTech/academy/comments{/number}","issue_comment_url":"https://api.github.com/repos/lenneTech/academy/issues/comments{/number}","contents_url":"https://api.github.com/repos/lenneTech/academy/contents/{+path}","compare_url":"https://api.github.com/repos/lenneTech/academy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lenneTech/academy/merges","archive_url":"https://api.github.com/repos/lenneTech/academy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lenneTech/academy/downloads","issues_url":"https://api.github.com/repos/lenneTech/academy/issues{/number}","pulls_url":"https://api.github.com/repos/lenneTech/academy/pulls{/number}","milestones_url":"https://api.github.com/repos/lenneTech/academy/milestones{/number}","notifications_url":"https://api.github.com/repos/lenneTech/academy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lenneTech/academy/labels{/name}","releases_url":"https://api.github.com/repos/lenneTech/academy/releases{/id}","deployments_url":"https://api.github.com/repos/lenneTech/academy/deployments","created_at":"2021-06-23T06:17:06Z","updated_at":"2021-07-20T19:03:21Z","pushed_at":"2021-07-21T08:51:09Z","git_url":"git://github.com/lenneTech/academy.git","ssh_url":"git@github.com:lenneTech/academy.git","clone_url":"https://github.com/lenneTech/academy.git","svn_url":"https://github.com/lenneTech/academy","homepage":"https://akademie.lenne.tech","size":14842,"stargazers_count":1,"watchers_count":1,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":1,"open_issues":1,"watchers":1,"default_branch":"main"}},"base":{"label":"lenneTech:main","ref":"main","sha":"9aacde5ce6f5a580208e002283c22c3afd54135f","user":{"login":"lenneTech","id":51728218,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNzI4MjE4","avatar_url":"https://avatars.githubusercontent.com/u/51728218?v=4","gravatar_id":"","url":"https://api.github.com/users/lenneTech","html_url":"https://github.com/lenneTech","followers_url":"https://api.github.com/users/lenneTech/followers","following_url":"https://api.github.com/users/lenneTech/following{/other_user}","gists_url":"https://api.github.com/users/lenneTech/gists{/gist_id}","starred_url":"https://api.github.com/users/lenneTech/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lenneTech/subscriptions","organizations_url":"https://api.github.com/users/lenneTech/orgs","repos_url":"https://api.github.com/users/lenneTech/repos","events_url":"https://api.github.com/users/lenneTech/events{/privacy}","received_events_url":"https://api.github.com/users/lenneTech/received_events","type":"Organization","site_admin":false},"repo":{"id":379499395,"node_id":"MDEwOlJlcG9zaXRvcnkzNzk0OTkzOTU=","name":"academy","full_name":"lenneTech/academy","private":false,"owner":{"login":"lenneTech","id":51728218,"node_id":"MDEyOk9yZ2FuaXphdGlvbjUxNzI4MjE4","avatar_url":"https://avatars.githubusercontent.com/u/51728218?v=4","gravatar_id":"","url":"https://api.github.com/users/lenneTech","html_url":"https://github.com/lenneTech","followers_url":"https://api.github.com/users/lenneTech/followers","following_url":"https://api.github.com/users/lenneTech/following{/other_user}","gists_url":"https://api.github.com/users/lenneTech/gists{/gist_id}","starred_url":"https://api.github.com/users/lenneTech/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lenneTech/subscriptions","organizations_url":"https://api.github.com/users/lenneTech/orgs","repos_url":"https://api.github.com/users/lenneTech/repos","events_url":"https://api.github.com/users/lenneTech/events{/privacy}","received_events_url":"https://api.github.com/users/lenneTech/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/lenneTech/academy","description":"An online learning platform for learning web development. ","fork":false,"url":"https://api.github.com/repos/lenneTech/academy","forks_url":"https://api.github.com/repos/lenneTech/academy/forks","keys_url":"https://api.github.com/repos/lenneTech/academy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lenneTech/academy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lenneTech/academy/teams","hooks_url":"https://api.github.com/repos/lenneTech/academy/hooks","issue_events_url":"https://api.github.com/repos/lenneTech/academy/issues/events{/number}","events_url":"https://api.github.com/repos/lenneTech/academy/events","assignees_url":"https://api.github.com/repos/lenneTech/academy/assignees{/user}","branches_url":"https://api.github.com/repos/lenneTech/academy/branches{/branch}","tags_url":"https://api.github.com/repos/lenneTech/academy/tags","blobs_url":"https://api.github.com/repos/lenneTech/academy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lenneTech/academy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lenneTech/academy/git/refs{/sha}","trees_url":"https://api.github.com/repos/lenneTech/academy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lenneTech/academy/statuses/{sha}","languages_url":"https://api.github.com/repos/lenneTech/academy/languages","stargazers_url":"https://api.github.com/repos/lenneTech/academy/stargazers","contributors_url":"https://api.github.com/repos/lenneTech/academy/contributors","subscribers_url":"https://api.github.com/repos/lenneTech/academy/subscribers","subscription_url":"https://api.github.com/repos/lenneTech/academy/subscription","commits_url":"https://api.github.com/repos/lenneTech/academy/commits{/sha}","git_commits_url":"https://api.github.com/repos/lenneTech/academy/git/commits{/sha}","comments_url":"https://api.github.com/repos/lenneTech/academy/comments{/number}","issue_comment_url":"https://api.github.com/repos/lenneTech/academy/issues/comments{/number}","contents_url":"https://api.github.com/repos/lenneTech/academy/contents/{+path}","compare_url":"https://api.github.com/repos/lenneTech/academy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lenneTech/academy/merges","archive_url":"https://api.github.com/repos/lenneTech/academy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lenneTech/academy/downloads","issues_url":"https://api.github.com/repos/lenneTech/academy/issues{/number}","pulls_url":"https://api.github.com/repos/lenneTech/academy/pulls{/number}","milestones_url":"https://api.github.com/repos/lenneTech/academy/milestones{/number}","notifications_url":"https://api.github.com/repos/lenneTech/academy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lenneTech/academy/labels{/name}","releases_url":"https://api.github.com/repos/lenneTech/academy/releases{/id}","deployments_url":"https://api.github.com/repos/lenneTech/academy/deployments","created_at":"2021-06-23T06:17:06Z","updated_at":"2021-07-20T19:03:21Z","pushed_at":"2021-07-21T08:51:09Z","git_url":"git://github.com/lenneTech/academy.git","ssh_url":"git@github.com:lenneTech/academy.git","clone_url":"https://github.com/lenneTech/academy.git","svn_url":"https://github.com/lenneTech/academy","homepage":"https://akademie.lenne.tech","size":14842,"stargazers_count":1,"watchers_count":1,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":1,"open_issues":1,"watchers":1,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/lenneTech/academy/pulls/63"},"html":{"href":"https://github.com/lenneTech/academy/pull/63"},"issue":{"href":"https://api.github.com/repos/lenneTech/academy/issues/63"},"comments":{"href":"https://api.github.com/repos/lenneTech/academy/issues/63/comments"},"review_comments":{"href":"https://api.github.com/repos/lenneTech/academy/pulls/63/comments"},"review_comment":{"href":"https://api.github.com/repos/lenneTech/academy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/lenneTech/academy/pulls/63/commits"},"statuses":{"href":"https://api.github.com/repos/lenneTech/academy/statuses/6437e242af4138fec51c91062b5c5398f8593bbb"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":51728218,"login":"lenneTech","gravatar_id":"","url":"https://api.github.com/orgs/lenneTech","avatar_url":"https://avatars.githubusercontent.com/u/51728218?"}}
+{"id":"17246339765","type":"WatchEvent","actor":{"id":87755141,"login":"Ehlod","display_login":"Ehlod","gravatar_id":"","url":"https://api.github.com/users/Ehlod","avatar_url":"https://avatars.githubusercontent.com/u/87755141?"},"repo":{"id":388056615,"name":"Ehlod/Ehlod","url":"https://api.github.com/repos/Ehlod/Ehlod"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339769","type":"CreateEvent","actor":{"id":42283162,"login":"aws-aemilia","display_login":"aws-aemilia","gravatar_id":"","url":"https://api.github.com/users/aws-aemilia","avatar_url":"https://avatars.githubusercontent.com/u/42283162?"},"repo":{"id":388056914,"name":"aws-aemilia/react-app44033922781758673","url":"https://api.github.com/repos/aws-aemilia/react-app44033922781758673"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339787","type":"PushEvent","actor":{"id":41898282,"login":"github-actions[bot]","display_login":"github-actions","gravatar_id":"","url":"https://api.github.com/users/github-actions[bot]","avatar_url":"https://avatars.githubusercontent.com/u/41898282?"},"repo":{"id":369713083,"name":"civictechsweden/JagVillHaVaccin","url":"https://api.github.com/repos/civictechsweden/JagVillHaVaccin"},"payload":{"push_id":7562451246,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"62fcc57c2330a6918cc1c546e3cecafe68efc983","before":"95c94556d43d856cf01e5f2eb9cffcdb38a4d46b","commits":[{"sha":"62fcc57c2330a6918cc1c546e3cecafe68efc983","author":{"name":"Pierre Mesure (Github Actions)","email":"ff019a5748a52b5641624af88a54a2f0e46a9fb5@mesu.re"},"message":"Updating the times for Region 01","distinct":true,"url":"https://api.github.com/repos/civictechsweden/JagVillHaVaccin/commits/62fcc57c2330a6918cc1c546e3cecafe68efc983"}]},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":44578964,"login":"civictechsweden","gravatar_id":"","url":"https://api.github.com/orgs/civictechsweden","avatar_url":"https://avatars.githubusercontent.com/u/44578964?"}}
+{"id":"17246339789","type":"PushEvent","actor":{"id":82411728,"login":"szczepienia","display_login":"szczepienia","gravatar_id":"","url":"https://api.github.com/users/szczepienia","avatar_url":"https://avatars.githubusercontent.com/u/82411728?"},"repo":{"id":357316184,"name":"szczepienia/szczepienia.github.io","url":"https://api.github.com/repos/szczepienia/szczepienia.github.io"},"payload":{"push_id":7562451259,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"388c29474db703cd39c1d1a13481431e9d31c5ce","before":"281c3ea4b0c374188a13fffc2d6dba365d4025d0","commits":[{"sha":"388c29474db703cd39c1d1a13481431e9d31c5ce","author":{"name":"szczepienia","email":"0eed6e50a807a406b20f90bdf0913a600cbd5a7e@users.noreply.github.com"},"message":"remote update","distinct":true,"url":"https://api.github.com/repos/szczepienia/szczepienia.github.io/commits/388c29474db703cd39c1d1a13481431e9d31c5ce"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339792","type":"PushEvent","actor":{"id":20824859,"login":"Sean-Black","display_login":"Sean-Black","gravatar_id":"","url":"https://api.github.com/users/Sean-Black","avatar_url":"https://avatars.githubusercontent.com/u/20824859?"},"repo":{"id":384748402,"name":"Sean-Black/next-port","url":"https://api.github.com/repos/Sean-Black/next-port"},"payload":{"push_id":7562451261,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"8d71648db95edc48d91af7d3dc231af780888305","before":"f34c2a989cd455ea7dd8e359162f29d114b5fb94","commits":[{"sha":"8d71648db95edc48d91af7d3dc231af780888305","author":{"name":"Sean-Black","email":"e8b90297222601b265e2b2b914a02ae26cb94c79@Yahoo.com"},"message":"Added xypo landing page, and updated urls","distinct":true,"url":"https://api.github.com/repos/Sean-Black/next-port/commits/8d71648db95edc48d91af7d3dc231af780888305"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339795","type":"PushEvent","actor":{"id":1282736,"login":"asenac","display_login":"asenac","gravatar_id":"","url":"https://api.github.com/users/asenac","avatar_url":"https://avatars.githubusercontent.com/u/1282736?"},"repo":{"id":357223266,"name":"asenac/materialize","url":"https://api.github.com/repos/asenac/materialize"},"payload":{"push_id":7562451269,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"30409fef9f21cde13f2c24d9f054afeafbaf1463","before":"4a79961d35da6803dd57884049300b4c6cb10606","commits":[{"sha":"30409fef9f21cde13f2c24d9f054afeafbaf1463","author":{"name":"Andrés Senac","email":"883768b6dd2c42aea0031b24be8a2da40fef4b64@senac.es"},"message":"Throw an error for unsupported outer joins in comma join (#7474)\n\nThrow an error when the planner tries to push down the current\r\ncomma join to the leftmost side of a join tree involving either\r\nright or full outer join, since otherwise the planner would build\r\na wrong join tree leading to wrong results.\r\n\r\nLeft joins are allowed since, even though the resulting plan may\r\nnot be optimal, it is semantically equivalent, ie. leads to the\r\nsame query results.","distinct":true,"url":"https://api.github.com/repos/asenac/materialize/commits/30409fef9f21cde13f2c24d9f054afeafbaf1463"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339796","type":"PullRequestEvent","actor":{"id":81756376,"login":"seiya1911","display_login":"seiya1911","gravatar_id":"","url":"https://api.github.com/users/seiya1911","avatar_url":"https://avatars.githubusercontent.com/u/81756376?"},"repo":{"id":381889365,"name":"seiya1911/Hikidashi","url":"https://api.github.com/repos/seiya1911/Hikidashi"},"payload":{"action":"opened","number":32,"pull_request":{"url":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/32","id":694185720,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzIw","html_url":"https://github.com/seiya1911/Hikidashi/pull/32","diff_url":"https://github.com/seiya1911/Hikidashi/pull/32.diff","patch_url":"https://github.com/seiya1911/Hikidashi/pull/32.patch","issue_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues/32","number":32,"state":"open","locked":false,"title":"Develop","user":{"login":"seiya1911","id":81756376,"node_id":"MDQ6VXNlcjgxNzU2Mzc2","avatar_url":"https://avatars.githubusercontent.com/u/81756376?v=4","gravatar_id":"","url":"https://api.github.com/users/seiya1911","html_url":"https://github.com/seiya1911","followers_url":"https://api.github.com/users/seiya1911/followers","following_url":"https://api.github.com/users/seiya1911/following{/other_user}","gists_url":"https://api.github.com/users/seiya1911/gists{/gist_id}","starred_url":"https://api.github.com/users/seiya1911/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seiya1911/subscriptions","organizations_url":"https://api.github.com/users/seiya1911/orgs","repos_url":"https://api.github.com/users/seiya1911/repos","events_url":"https://api.github.com/users/seiya1911/events{/privacy}","received_events_url":"https://api.github.com/users/seiya1911/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/32/commits","review_comments_url":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/32/comments","review_comment_url":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/comments{/number}","comments_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues/32/comments","statuses_url":"https://api.github.com/repos/seiya1911/Hikidashi/statuses/7239086faa1d085c3937cd068049fa463f7ca955","head":{"label":"seiya1911:develop","ref":"develop","sha":"7239086faa1d085c3937cd068049fa463f7ca955","user":{"login":"seiya1911","id":81756376,"node_id":"MDQ6VXNlcjgxNzU2Mzc2","avatar_url":"https://avatars.githubusercontent.com/u/81756376?v=4","gravatar_id":"","url":"https://api.github.com/users/seiya1911","html_url":"https://github.com/seiya1911","followers_url":"https://api.github.com/users/seiya1911/followers","following_url":"https://api.github.com/users/seiya1911/following{/other_user}","gists_url":"https://api.github.com/users/seiya1911/gists{/gist_id}","starred_url":"https://api.github.com/users/seiya1911/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seiya1911/subscriptions","organizations_url":"https://api.github.com/users/seiya1911/orgs","repos_url":"https://api.github.com/users/seiya1911/repos","events_url":"https://api.github.com/users/seiya1911/events{/privacy}","received_events_url":"https://api.github.com/users/seiya1911/received_events","type":"User","site_admin":false},"repo":{"id":381889365,"node_id":"MDEwOlJlcG9zaXRvcnkzODE4ODkzNjU=","name":"Hikidashi","full_name":"seiya1911/Hikidashi","private":false,"owner":{"login":"seiya1911","id":81756376,"node_id":"MDQ6VXNlcjgxNzU2Mzc2","avatar_url":"https://avatars.githubusercontent.com/u/81756376?v=4","gravatar_id":"","url":"https://api.github.com/users/seiya1911","html_url":"https://github.com/seiya1911","followers_url":"https://api.github.com/users/seiya1911/followers","following_url":"https://api.github.com/users/seiya1911/following{/other_user}","gists_url":"https://api.github.com/users/seiya1911/gists{/gist_id}","starred_url":"https://api.github.com/users/seiya1911/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seiya1911/subscriptions","organizations_url":"https://api.github.com/users/seiya1911/orgs","repos_url":"https://api.github.com/users/seiya1911/repos","events_url":"https://api.github.com/users/seiya1911/events{/privacy}","received_events_url":"https://api.github.com/users/seiya1911/received_events","type":"User","site_admin":false},"html_url":"https://github.com/seiya1911/Hikidashi","description":null,"fork":false,"url":"https://api.github.com/repos/seiya1911/Hikidashi","forks_url":"https://api.github.com/repos/seiya1911/Hikidashi/forks","keys_url":"https://api.github.com/repos/seiya1911/Hikidashi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/seiya1911/Hikidashi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/seiya1911/Hikidashi/teams","hooks_url":"https://api.github.com/repos/seiya1911/Hikidashi/hooks","issue_events_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues/events{/number}","events_url":"https://api.github.com/repos/seiya1911/Hikidashi/events","assignees_url":"https://api.github.com/repos/seiya1911/Hikidashi/assignees{/user}","branches_url":"https://api.github.com/repos/seiya1911/Hikidashi/branches{/branch}","tags_url":"https://api.github.com/repos/seiya1911/Hikidashi/tags","blobs_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/refs{/sha}","trees_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/seiya1911/Hikidashi/statuses/{sha}","languages_url":"https://api.github.com/repos/seiya1911/Hikidashi/languages","stargazers_url":"https://api.github.com/repos/seiya1911/Hikidashi/stargazers","contributors_url":"https://api.github.com/repos/seiya1911/Hikidashi/contributors","subscribers_url":"https://api.github.com/repos/seiya1911/Hikidashi/subscribers","subscription_url":"https://api.github.com/repos/seiya1911/Hikidashi/subscription","commits_url":"https://api.github.com/repos/seiya1911/Hikidashi/commits{/sha}","git_commits_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/commits{/sha}","comments_url":"https://api.github.com/repos/seiya1911/Hikidashi/comments{/number}","issue_comment_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues/comments{/number}","contents_url":"https://api.github.com/repos/seiya1911/Hikidashi/contents/{+path}","compare_url":"https://api.github.com/repos/seiya1911/Hikidashi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/seiya1911/Hikidashi/merges","archive_url":"https://api.github.com/repos/seiya1911/Hikidashi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/seiya1911/Hikidashi/downloads","issues_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues{/number}","pulls_url":"https://api.github.com/repos/seiya1911/Hikidashi/pulls{/number}","milestones_url":"https://api.github.com/repos/seiya1911/Hikidashi/milestones{/number}","notifications_url":"https://api.github.com/repos/seiya1911/Hikidashi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/seiya1911/Hikidashi/labels{/name}","releases_url":"https://api.github.com/repos/seiya1911/Hikidashi/releases{/id}","deployments_url":"https://api.github.com/repos/seiya1911/Hikidashi/deployments","created_at":"2021-07-01T02:44:09Z","updated_at":"2021-07-20T01:50:10Z","pushed_at":"2021-07-21T08:59:46Z","git_url":"git://github.com/seiya1911/Hikidashi.git","ssh_url":"git@github.com:seiya1911/Hikidashi.git","clone_url":"https://github.com/seiya1911/Hikidashi.git","svn_url":"https://github.com/seiya1911/Hikidashi","homepage":null,"size":34668,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"seiya1911:main","ref":"main","sha":"381b81b67b15b7430db5af9023bf91b8069c0e23","user":{"login":"seiya1911","id":81756376,"node_id":"MDQ6VXNlcjgxNzU2Mzc2","avatar_url":"https://avatars.githubusercontent.com/u/81756376?v=4","gravatar_id":"","url":"https://api.github.com/users/seiya1911","html_url":"https://github.com/seiya1911","followers_url":"https://api.github.com/users/seiya1911/followers","following_url":"https://api.github.com/users/seiya1911/following{/other_user}","gists_url":"https://api.github.com/users/seiya1911/gists{/gist_id}","starred_url":"https://api.github.com/users/seiya1911/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seiya1911/subscriptions","organizations_url":"https://api.github.com/users/seiya1911/orgs","repos_url":"https://api.github.com/users/seiya1911/repos","events_url":"https://api.github.com/users/seiya1911/events{/privacy}","received_events_url":"https://api.github.com/users/seiya1911/received_events","type":"User","site_admin":false},"repo":{"id":381889365,"node_id":"MDEwOlJlcG9zaXRvcnkzODE4ODkzNjU=","name":"Hikidashi","full_name":"seiya1911/Hikidashi","private":false,"owner":{"login":"seiya1911","id":81756376,"node_id":"MDQ6VXNlcjgxNzU2Mzc2","avatar_url":"https://avatars.githubusercontent.com/u/81756376?v=4","gravatar_id":"","url":"https://api.github.com/users/seiya1911","html_url":"https://github.com/seiya1911","followers_url":"https://api.github.com/users/seiya1911/followers","following_url":"https://api.github.com/users/seiya1911/following{/other_user}","gists_url":"https://api.github.com/users/seiya1911/gists{/gist_id}","starred_url":"https://api.github.com/users/seiya1911/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seiya1911/subscriptions","organizations_url":"https://api.github.com/users/seiya1911/orgs","repos_url":"https://api.github.com/users/seiya1911/repos","events_url":"https://api.github.com/users/seiya1911/events{/privacy}","received_events_url":"https://api.github.com/users/seiya1911/received_events","type":"User","site_admin":false},"html_url":"https://github.com/seiya1911/Hikidashi","description":null,"fork":false,"url":"https://api.github.com/repos/seiya1911/Hikidashi","forks_url":"https://api.github.com/repos/seiya1911/Hikidashi/forks","keys_url":"https://api.github.com/repos/seiya1911/Hikidashi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/seiya1911/Hikidashi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/seiya1911/Hikidashi/teams","hooks_url":"https://api.github.com/repos/seiya1911/Hikidashi/hooks","issue_events_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues/events{/number}","events_url":"https://api.github.com/repos/seiya1911/Hikidashi/events","assignees_url":"https://api.github.com/repos/seiya1911/Hikidashi/assignees{/user}","branches_url":"https://api.github.com/repos/seiya1911/Hikidashi/branches{/branch}","tags_url":"https://api.github.com/repos/seiya1911/Hikidashi/tags","blobs_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/refs{/sha}","trees_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/seiya1911/Hikidashi/statuses/{sha}","languages_url":"https://api.github.com/repos/seiya1911/Hikidashi/languages","stargazers_url":"https://api.github.com/repos/seiya1911/Hikidashi/stargazers","contributors_url":"https://api.github.com/repos/seiya1911/Hikidashi/contributors","subscribers_url":"https://api.github.com/repos/seiya1911/Hikidashi/subscribers","subscription_url":"https://api.github.com/repos/seiya1911/Hikidashi/subscription","commits_url":"https://api.github.com/repos/seiya1911/Hikidashi/commits{/sha}","git_commits_url":"https://api.github.com/repos/seiya1911/Hikidashi/git/commits{/sha}","comments_url":"https://api.github.com/repos/seiya1911/Hikidashi/comments{/number}","issue_comment_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues/comments{/number}","contents_url":"https://api.github.com/repos/seiya1911/Hikidashi/contents/{+path}","compare_url":"https://api.github.com/repos/seiya1911/Hikidashi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/seiya1911/Hikidashi/merges","archive_url":"https://api.github.com/repos/seiya1911/Hikidashi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/seiya1911/Hikidashi/downloads","issues_url":"https://api.github.com/repos/seiya1911/Hikidashi/issues{/number}","pulls_url":"https://api.github.com/repos/seiya1911/Hikidashi/pulls{/number}","milestones_url":"https://api.github.com/repos/seiya1911/Hikidashi/milestones{/number}","notifications_url":"https://api.github.com/repos/seiya1911/Hikidashi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/seiya1911/Hikidashi/labels{/name}","releases_url":"https://api.github.com/repos/seiya1911/Hikidashi/releases{/id}","deployments_url":"https://api.github.com/repos/seiya1911/Hikidashi/deployments","created_at":"2021-07-01T02:44:09Z","updated_at":"2021-07-20T01:50:10Z","pushed_at":"2021-07-21T08:59:46Z","git_url":"git://github.com/seiya1911/Hikidashi.git","ssh_url":"git@github.com:seiya1911/Hikidashi.git","clone_url":"https://github.com/seiya1911/Hikidashi.git","svn_url":"https://github.com/seiya1911/Hikidashi","homepage":null,"size":34668,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/32"},"html":{"href":"https://github.com/seiya1911/Hikidashi/pull/32"},"issue":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/issues/32"},"comments":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/issues/32/comments"},"review_comments":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/32/comments"},"review_comment":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/pulls/32/commits"},"statuses":{"href":"https://api.github.com/repos/seiya1911/Hikidashi/statuses/7239086faa1d085c3937cd068049fa463f7ca955"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":242,"deletions":133,"changed_files":19}},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339804","type":"IssueCommentEvent","actor":{"id":16579427,"login":"cziegenhain","display_login":"cziegenhain","gravatar_id":"","url":"https://api.github.com/users/cziegenhain","avatar_url":"https://avatars.githubusercontent.com/u/16579427?"},"repo":{"id":94886407,"name":"sdparekh/zUMIs","url":"https://api.github.com/repos/sdparekh/zUMIs"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272","repository_url":"https://api.github.com/repos/sdparekh/zUMIs","labels_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272/labels{/name}","comments_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272/comments","events_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272/events","html_url":"https://github.com/sdparekh/zUMIs/issues/272","id":949217001,"node_id":"MDU6SXNzdWU5NDkyMTcwMDE=","number":272,"title":"Reproducing HCA data using zUMI","user":{"login":"HaniJieunKim","id":62005528,"node_id":"MDQ6VXNlcjYyMDA1NTI4","avatar_url":"https://avatars.githubusercontent.com/u/62005528?v=4","gravatar_id":"","url":"https://api.github.com/users/HaniJieunKim","html_url":"https://github.com/HaniJieunKim","followers_url":"https://api.github.com/users/HaniJieunKim/followers","following_url":"https://api.github.com/users/HaniJieunKim/following{/other_user}","gists_url":"https://api.github.com/users/HaniJieunKim/gists{/gist_id}","starred_url":"https://api.github.com/users/HaniJieunKim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HaniJieunKim/subscriptions","organizations_url":"https://api.github.com/users/HaniJieunKim/orgs","repos_url":"https://api.github.com/users/HaniJieunKim/repos","events_url":"https://api.github.com/users/HaniJieunKim/events{/privacy}","received_events_url":"https://api.github.com/users/HaniJieunKim/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":3,"created_at":"2021-07-21T00:36:15Z","updated_at":"2021-07-21T09:00:02Z","closed_at":"2021-07-21T09:00:02Z","author_association":"NONE","active_lock_reason":null,"body":"Hi!\r\n\r\nThank you very much for creating and maintaining zUMIs. I have been successful at running the test data and also the fibroblast data from the original Smart-seq3 paper. However when I try running HCA, I get an error (see below for YAML file and log). I would be much grateful for you help!\r\n\r\n```\r\nproject: HCA_test\r\nsequence_files:\r\n  file1:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.R1.fastq.gz\r\n    base_definition:\r\n    - cDNA(23-150)\r\n    - UMI(12-19)\r\n    find_pattern: ATTGCGCAATG\r\n  file2:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.R2.fastq.gz\r\n    base_definition:\r\n    - cDNA(1-150)\r\n  file3:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.I1.fastq.gz\r\n    base_definition:\r\n    - BC(1-8)\r\n  file4:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.I2.fastq.gz\r\n    base_definition:\r\n    - BC(1-8)\r\nreference:\r\n  STAR_index: /home/data/data2/genomeDir/STARgenomes/human2\r\n  GTF_file: /home/data/data2/genomeDir/refdata-gex-GRCh38-2020-A/genes/genes.gtf\r\n  exon_extension: no\r\n  extension_length: 0\r\n  scaffold_length_min: 0\r\n  additional_STAR_params: '--clip3pAdapterSeq CTGTCTCTTATACACATCT --limitSjdbInsertNsj 2000000 --outFilterIntronMotifs --RemoveNoncanonicalUnannotated'\r\n  additional_files: ~\r\nout_dir: /home/data/data2/normalisation/zUMI/test4\r\nnum_threads: 50\r\nmem_limit: 200\r\nfilter_cutoffs:\r\n  BC_filter:\r\n    num_bases: 3\r\n    phred: 20\r\n  UMI_filter:\r\n    num_bases: 3\r\n    phred: 20\r\nbarcodes:\r\n  barcode_num: ~\r\n  barcode_file: ~\r\n  barcode_sharing: ~\r\n  automatic: yes\r\n  BarcodeBinning: 1\r\n  nReadsperCell: 100\r\ncounting_opts:\r\n  introns: yes\r\n  intronProb: no\r\n  downsampling: '0'\r\n  strand: 0\r\n  Ham_Dist: 1\r\n  velocyto: no\r\n  primaryHit: yes\r\n  multi_overlap: no\r\n  twoPass: no\r\n  demultiplex: no\r\nmake_stats: yes\r\nwhich_Stage: Filtering\r\nsamtools_exec: samtools\r\npigz_exec: pigz\r\n#STAR_exec: /home/ubuntu/STAR/bin/Linux_x86_64/STAR\r\nSTAR_exec: STAR\r\nRscript_exec: Rscript\r\nzUMIs_directory: /home/ubuntu/zUMIs\r\n```\r\n\r\n```\r\nUsing miniconda environment for zUMIs!\r\n note: internal executables will be used instead of those specified in the YAML file!\r\n\r\n\r\n You provided these parameters:\r\n YAML file:     script/HCA_test_v1.yaml\r\n zUMIs directory:               /home/ubuntu/zUMIs\r\n STAR executable                STAR\r\n samtools executable            samtools\r\n pigz executable                pigz\r\n Rscript executable             Rscript\r\n RAM limit:   200\r\n zUMIs version 2.9.6 \r\n\r\n\r\nFri Jul 16 04:03:11 UTC 2021\r\nWARNING: The STAR version used for mapping is 2.7.3a and the STAR index was created using the version 2.7.1a. This may lead to an error while mapping. If you encounte\r\nr any errors at the mapping stage, please make sure to create the STAR index using STAR 2.7.3a.\r\nFiltering...\r\npigz: skipping: /home/data/data2/Smart-seq3/raw/HCA.R2.fastq.gz: corrupted -- incomplete deflate data\r\npigz: abort: internal threads error\r\npigz: skipping: /home/data/data2/Smart-seq3/raw/HCA.R1.fastq.gz: corrupted -- incomplete deflate data\r\npigz: abort: internal threads error\r\npigz: skipping: /home/data/data2/normalisation/zUMI/test4/zUMIs_output/.tmpMerge/HCA.R2.fastqHCA_testbt.gz does not exist\r\n@A00187:188:HM3HKDSXX:4:2657:24532:15076\r\n\r\nERROR! Fastq files are not in the same order.\r\n Make sure to provide reads in the same order.\r\n\r\n@A00187:188:HM3HKDSXX:4:2657:24551:15076\r\n\r\nERROR! Fastq files are not in the same order.\r\n Make sure to provide reads in the same order.\r\n```\r\n\r\nThese are the FASTQ files downloaded.\r\n```\r\n-rw-rw-r-- 1 ubuntu ubuntu  29660183738 May 15  2020 HCA.I1.fastq.gz\r\n-rw-rw-r-- 1 ubuntu ubuntu  30477852902 May 15  2020 HCA.I2.fastq.gz\r\n-rw-rw-r-- 1 ubuntu ubuntu 227299256599 Jul 15 07:49 HCA.R1.fastq.gz\r\n-rw-rw-r-- 1 ubuntu ubuntu 227987249699 Jul 15 07:49 HCA.R2.fastq.gz\r\n```\r\n\r\nMany thanks for you time and help!\r\n\r\nBest regards,\r\n\r\nHani\r\n\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/sdparekh/zUMIs/issues/comments/884018704","html_url":"https://github.com/sdparekh/zUMIs/issues/272#issuecomment-884018704","issue_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272","id":884018704,"node_id":"IC_kwDOBafaB840sQ4Q","user":{"login":"cziegenhain","id":16579427,"node_id":"MDQ6VXNlcjE2NTc5NDI3","avatar_url":"https://avatars.githubusercontent.com/u/16579427?v=4","gravatar_id":"","url":"https://api.github.com/users/cziegenhain","html_url":"https://github.com/cziegenhain","followers_url":"https://api.github.com/users/cziegenhain/followers","following_url":"https://api.github.com/users/cziegenhain/following{/other_user}","gists_url":"https://api.github.com/users/cziegenhain/gists{/gist_id}","starred_url":"https://api.github.com/users/cziegenhain/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cziegenhain/subscriptions","organizations_url":"https://api.github.com/users/cziegenhain/orgs","repos_url":"https://api.github.com/users/cziegenhain/repos","events_url":"https://api.github.com/users/cziegenhain/events{/privacy}","received_events_url":"https://api.github.com/users/cziegenhain/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","author_association":"COLLABORATOR","body":"for example, you can count the number of reads in each of the files that you download to confirm they all match.\r\nI'm sure ArrayExpress also has md5 checksums to verify your download.\r\n\r\nClosing this issue as it is not related to zUMIs.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339805","type":"PullRequestReviewEvent","actor":{"id":158871,"login":"machisuji","display_login":"machisuji","gravatar_id":"","url":"https://api.github.com/users/machisuji","avatar_url":"https://avatars.githubusercontent.com/u/158871?"},"repo":{"id":6899875,"name":"opf/openproject","url":"https://api.github.com/repos/opf/openproject"},"payload":{"action":"created","review":{"id":711422084,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDIyMDg0","user":{"login":"machisuji","id":158871,"node_id":"MDQ6VXNlcjE1ODg3MQ==","avatar_url":"https://avatars.githubusercontent.com/u/158871?v=4","gravatar_id":"","url":"https://api.github.com/users/machisuji","html_url":"https://github.com/machisuji","followers_url":"https://api.github.com/users/machisuji/followers","following_url":"https://api.github.com/users/machisuji/following{/other_user}","gists_url":"https://api.github.com/users/machisuji/gists{/gist_id}","starred_url":"https://api.github.com/users/machisuji/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/machisuji/subscriptions","organizations_url":"https://api.github.com/users/machisuji/orgs","repos_url":"https://api.github.com/users/machisuji/repos","events_url":"https://api.github.com/users/machisuji/events{/privacy}","received_events_url":"https://api.github.com/users/machisuji/received_events","type":"User","site_admin":false},"body":"👍 ","commit_id":"5c1718ec5e84886cb18b5972ab4de28cbba4c3d6","submitted_at":"2021-07-21T09:00:01Z","state":"approved","html_url":"https://github.com/opf/openproject/pull/9495#pullrequestreview-711422084","pull_request_url":"https://api.github.com/repos/opf/openproject/pulls/9495","author_association":"MEMBER","_links":{"html":{"href":"https://github.com/opf/openproject/pull/9495#pullrequestreview-711422084"},"pull_request":{"href":"https://api.github.com/repos/opf/openproject/pulls/9495"}}},"pull_request":{"url":"https://api.github.com/repos/opf/openproject/pulls/9495","id":693710783,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNzEwNzgz","html_url":"https://github.com/opf/openproject/pull/9495","diff_url":"https://github.com/opf/openproject/pull/9495.diff","patch_url":"https://github.com/opf/openproject/pull/9495.patch","issue_url":"https://api.github.com/repos/opf/openproject/issues/9495","number":9495,"state":"open","locked":false,"title":"Add API documentation for notifications","user":{"login":"oliverguenther","id":459462,"node_id":"MDQ6VXNlcjQ1OTQ2Mg==","avatar_url":"https://avatars.githubusercontent.com/u/459462?v=4","gravatar_id":"","url":"https://api.github.com/users/oliverguenther","html_url":"https://github.com/oliverguenther","followers_url":"https://api.github.com/users/oliverguenther/followers","following_url":"https://api.github.com/users/oliverguenther/following{/other_user}","gists_url":"https://api.github.com/users/oliverguenther/gists{/gist_id}","starred_url":"https://api.github.com/users/oliverguenther/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oliverguenther/subscriptions","organizations_url":"https://api.github.com/users/oliverguenther/orgs","repos_url":"https://api.github.com/users/oliverguenther/repos","events_url":"https://api.github.com/users/oliverguenther/events{/privacy}","received_events_url":"https://api.github.com/users/oliverguenther/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T18:43:15Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"db02bf918c70d6ecfc37047bc8c127a05d35f54e","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/opf/openproject/pulls/9495/commits","review_comments_url":"https://api.github.com/repos/opf/openproject/pulls/9495/comments","review_comment_url":"https://api.github.com/repos/opf/openproject/pulls/comments{/number}","comments_url":"https://api.github.com/repos/opf/openproject/issues/9495/comments","statuses_url":"https://api.github.com/repos/opf/openproject/statuses/5c1718ec5e84886cb18b5972ab4de28cbba4c3d6","head":{"label":"opf:notifications-api-doc","ref":"notifications-api-doc","sha":"5c1718ec5e84886cb18b5972ab4de28cbba4c3d6","user":{"login":"opf","id":1756674,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE3NTY2NzQ=","avatar_url":"https://avatars.githubusercontent.com/u/1756674?v=4","gravatar_id":"","url":"https://api.github.com/users/opf","html_url":"https://github.com/opf","followers_url":"https://api.github.com/users/opf/followers","following_url":"https://api.github.com/users/opf/following{/other_user}","gists_url":"https://api.github.com/users/opf/gists{/gist_id}","starred_url":"https://api.github.com/users/opf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opf/subscriptions","organizations_url":"https://api.github.com/users/opf/orgs","repos_url":"https://api.github.com/users/opf/repos","events_url":"https://api.github.com/users/opf/events{/privacy}","received_events_url":"https://api.github.com/users/opf/received_events","type":"Organization","site_admin":false},"repo":{"id":6899875,"node_id":"MDEwOlJlcG9zaXRvcnk2ODk5ODc1","name":"openproject","full_name":"opf/openproject","private":false,"owner":{"login":"opf","id":1756674,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE3NTY2NzQ=","avatar_url":"https://avatars.githubusercontent.com/u/1756674?v=4","gravatar_id":"","url":"https://api.github.com/users/opf","html_url":"https://github.com/opf","followers_url":"https://api.github.com/users/opf/followers","following_url":"https://api.github.com/users/opf/following{/other_user}","gists_url":"https://api.github.com/users/opf/gists{/gist_id}","starred_url":"https://api.github.com/users/opf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opf/subscriptions","organizations_url":"https://api.github.com/users/opf/orgs","repos_url":"https://api.github.com/users/opf/repos","events_url":"https://api.github.com/users/opf/events{/privacy}","received_events_url":"https://api.github.com/users/opf/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/opf/openproject","description":"OpenProject is the leading open source project management software.","fork":false,"url":"https://api.github.com/repos/opf/openproject","forks_url":"https://api.github.com/repos/opf/openproject/forks","keys_url":"https://api.github.com/repos/opf/openproject/keys{/key_id}","collaborators_url":"https://api.github.com/repos/opf/openproject/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/opf/openproject/teams","hooks_url":"https://api.github.com/repos/opf/openproject/hooks","issue_events_url":"https://api.github.com/repos/opf/openproject/issues/events{/number}","events_url":"https://api.github.com/repos/opf/openproject/events","assignees_url":"https://api.github.com/repos/opf/openproject/assignees{/user}","branches_url":"https://api.github.com/repos/opf/openproject/branches{/branch}","tags_url":"https://api.github.com/repos/opf/openproject/tags","blobs_url":"https://api.github.com/repos/opf/openproject/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/opf/openproject/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/opf/openproject/git/refs{/sha}","trees_url":"https://api.github.com/repos/opf/openproject/git/trees{/sha}","statuses_url":"https://api.github.com/repos/opf/openproject/statuses/{sha}","languages_url":"https://api.github.com/repos/opf/openproject/languages","stargazers_url":"https://api.github.com/repos/opf/openproject/stargazers","contributors_url":"https://api.github.com/repos/opf/openproject/contributors","subscribers_url":"https://api.github.com/repos/opf/openproject/subscribers","subscription_url":"https://api.github.com/repos/opf/openproject/subscription","commits_url":"https://api.github.com/repos/opf/openproject/commits{/sha}","git_commits_url":"https://api.github.com/repos/opf/openproject/git/commits{/sha}","comments_url":"https://api.github.com/repos/opf/openproject/comments{/number}","issue_comment_url":"https://api.github.com/repos/opf/openproject/issues/comments{/number}","contents_url":"https://api.github.com/repos/opf/openproject/contents/{+path}","compare_url":"https://api.github.com/repos/opf/openproject/compare/{base}...{head}","merges_url":"https://api.github.com/repos/opf/openproject/merges","archive_url":"https://api.github.com/repos/opf/openproject/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/opf/openproject/downloads","issues_url":"https://api.github.com/repos/opf/openproject/issues{/number}","pulls_url":"https://api.github.com/repos/opf/openproject/pulls{/number}","milestones_url":"https://api.github.com/repos/opf/openproject/milestones{/number}","notifications_url":"https://api.github.com/repos/opf/openproject/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/opf/openproject/labels{/name}","releases_url":"https://api.github.com/repos/opf/openproject/releases{/id}","deployments_url":"https://api.github.com/repos/opf/openproject/deployments","created_at":"2012-11-28T09:59:11Z","updated_at":"2021-07-21T03:19:12Z","pushed_at":"2021-07-21T08:59:45Z","git_url":"git://github.com/opf/openproject.git","ssh_url":"git@github.com:opf/openproject.git","clone_url":"https://github.com/opf/openproject.git","svn_url":"https://github.com/opf/openproject","homepage":"https://www.openproject.org","size":514621,"stargazers_count":4993,"watchers_count":4993,"language":"Ruby","has_issues":false,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1462,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":20,"license":null,"forks":1462,"open_issues":20,"watchers":4993,"default_branch":"dev"}},"base":{"label":"opf:release/11.4","ref":"release/11.4","sha":"938c6e56197ab1eb6c542a48cbfe92d0831f6c4e","user":{"login":"opf","id":1756674,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE3NTY2NzQ=","avatar_url":"https://avatars.githubusercontent.com/u/1756674?v=4","gravatar_id":"","url":"https://api.github.com/users/opf","html_url":"https://github.com/opf","followers_url":"https://api.github.com/users/opf/followers","following_url":"https://api.github.com/users/opf/following{/other_user}","gists_url":"https://api.github.com/users/opf/gists{/gist_id}","starred_url":"https://api.github.com/users/opf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opf/subscriptions","organizations_url":"https://api.github.com/users/opf/orgs","repos_url":"https://api.github.com/users/opf/repos","events_url":"https://api.github.com/users/opf/events{/privacy}","received_events_url":"https://api.github.com/users/opf/received_events","type":"Organization","site_admin":false},"repo":{"id":6899875,"node_id":"MDEwOlJlcG9zaXRvcnk2ODk5ODc1","name":"openproject","full_name":"opf/openproject","private":false,"owner":{"login":"opf","id":1756674,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE3NTY2NzQ=","avatar_url":"https://avatars.githubusercontent.com/u/1756674?v=4","gravatar_id":"","url":"https://api.github.com/users/opf","html_url":"https://github.com/opf","followers_url":"https://api.github.com/users/opf/followers","following_url":"https://api.github.com/users/opf/following{/other_user}","gists_url":"https://api.github.com/users/opf/gists{/gist_id}","starred_url":"https://api.github.com/users/opf/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opf/subscriptions","organizations_url":"https://api.github.com/users/opf/orgs","repos_url":"https://api.github.com/users/opf/repos","events_url":"https://api.github.com/users/opf/events{/privacy}","received_events_url":"https://api.github.com/users/opf/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/opf/openproject","description":"OpenProject is the leading open source project management software.","fork":false,"url":"https://api.github.com/repos/opf/openproject","forks_url":"https://api.github.com/repos/opf/openproject/forks","keys_url":"https://api.github.com/repos/opf/openproject/keys{/key_id}","collaborators_url":"https://api.github.com/repos/opf/openproject/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/opf/openproject/teams","hooks_url":"https://api.github.com/repos/opf/openproject/hooks","issue_events_url":"https://api.github.com/repos/opf/openproject/issues/events{/number}","events_url":"https://api.github.com/repos/opf/openproject/events","assignees_url":"https://api.github.com/repos/opf/openproject/assignees{/user}","branches_url":"https://api.github.com/repos/opf/openproject/branches{/branch}","tags_url":"https://api.github.com/repos/opf/openproject/tags","blobs_url":"https://api.github.com/repos/opf/openproject/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/opf/openproject/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/opf/openproject/git/refs{/sha}","trees_url":"https://api.github.com/repos/opf/openproject/git/trees{/sha}","statuses_url":"https://api.github.com/repos/opf/openproject/statuses/{sha}","languages_url":"https://api.github.com/repos/opf/openproject/languages","stargazers_url":"https://api.github.com/repos/opf/openproject/stargazers","contributors_url":"https://api.github.com/repos/opf/openproject/contributors","subscribers_url":"https://api.github.com/repos/opf/openproject/subscribers","subscription_url":"https://api.github.com/repos/opf/openproject/subscription","commits_url":"https://api.github.com/repos/opf/openproject/commits{/sha}","git_commits_url":"https://api.github.com/repos/opf/openproject/git/commits{/sha}","comments_url":"https://api.github.com/repos/opf/openproject/comments{/number}","issue_comment_url":"https://api.github.com/repos/opf/openproject/issues/comments{/number}","contents_url":"https://api.github.com/repos/opf/openproject/contents/{+path}","compare_url":"https://api.github.com/repos/opf/openproject/compare/{base}...{head}","merges_url":"https://api.github.com/repos/opf/openproject/merges","archive_url":"https://api.github.com/repos/opf/openproject/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/opf/openproject/downloads","issues_url":"https://api.github.com/repos/opf/openproject/issues{/number}","pulls_url":"https://api.github.com/repos/opf/openproject/pulls{/number}","milestones_url":"https://api.github.com/repos/opf/openproject/milestones{/number}","notifications_url":"https://api.github.com/repos/opf/openproject/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/opf/openproject/labels{/name}","releases_url":"https://api.github.com/repos/opf/openproject/releases{/id}","deployments_url":"https://api.github.com/repos/opf/openproject/deployments","created_at":"2012-11-28T09:59:11Z","updated_at":"2021-07-21T03:19:12Z","pushed_at":"2021-07-21T08:59:45Z","git_url":"git://github.com/opf/openproject.git","ssh_url":"git@github.com:opf/openproject.git","clone_url":"https://github.com/opf/openproject.git","svn_url":"https://github.com/opf/openproject","homepage":"https://www.openproject.org","size":514621,"stargazers_count":4993,"watchers_count":4993,"language":"Ruby","has_issues":false,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1462,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":20,"license":null,"forks":1462,"open_issues":20,"watchers":4993,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/opf/openproject/pulls/9495"},"html":{"href":"https://github.com/opf/openproject/pull/9495"},"issue":{"href":"https://api.github.com/repos/opf/openproject/issues/9495"},"comments":{"href":"https://api.github.com/repos/opf/openproject/issues/9495/comments"},"review_comments":{"href":"https://api.github.com/repos/opf/openproject/pulls/9495/comments"},"review_comment":{"href":"https://api.github.com/repos/opf/openproject/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/opf/openproject/pulls/9495/commits"},"statuses":{"href":"https://api.github.com/repos/opf/openproject/statuses/5c1718ec5e84886cb18b5972ab4de28cbba4c3d6"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":1756674,"login":"opf","gravatar_id":"","url":"https://api.github.com/orgs/opf","avatar_url":"https://avatars.githubusercontent.com/u/1756674?"}}
+{"id":"17246339811","type":"PushEvent","actor":{"id":64682801,"login":"shashankx86","display_login":"shashankx86","gravatar_id":"","url":"https://api.github.com/users/shashankx86","avatar_url":"https://avatars.githubusercontent.com/u/64682801?"},"repo":{"id":384875664,"name":"shashankx86/DebloaterX","url":"https://api.github.com/repos/shashankx86/DebloaterX"},"payload":{"push_id":7562451263,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"7a3b6aeec3d2561f70d81c47cbba5313fccc7011","before":"21f642f68f3ef407f35b44ffd58a91d1fdc6b348","commits":[{"sha":"7a3b6aeec3d2561f70d81c47cbba5313fccc7011","author":{"name":"Shashank Pandey","email":"030cafcc69c51f316a4290f17be0b5231fd75dcc@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/shashankx86/DebloaterX/commits/7a3b6aeec3d2561f70d81c47cbba5313fccc7011"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339814","type":"PushEvent","actor":{"id":87743028,"login":"lukaromes895","display_login":"lukaromes895","gravatar_id":"","url":"https://api.github.com/users/lukaromes895","avatar_url":"https://avatars.githubusercontent.com/u/87743028?"},"repo":{"id":387979195,"name":"lukaromes895/verlng2","url":"https://api.github.com/repos/lukaromes895/verlng2"},"payload":{"push_id":7562451268,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8c5ca8b02c95477d81e8bb847fa5a181a0552474","before":"d1b0aea8cf16aa545f4c97757426a4d97d155549","commits":[{"sha":"8c5ca8b02c95477d81e8bb847fa5a181a0552474","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/lukaromes895/verlng2/commits/8c5ca8b02c95477d81e8bb847fa5a181a0552474"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339816","type":"WatchEvent","actor":{"id":30831045,"login":"amanchopra95","display_login":"amanchopra95","gravatar_id":"","url":"https://api.github.com/users/amanchopra95","avatar_url":"https://avatars.githubusercontent.com/u/30831045?"},"repo":{"id":173529836,"name":"hnasr/javascript_playground","url":"https://api.github.com/repos/hnasr/javascript_playground"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339818","type":"PushEvent","actor":{"id":69341855,"login":"kimu-naoki","display_login":"kimu-naoki","gravatar_id":"","url":"https://api.github.com/users/kimu-naoki","avatar_url":"https://avatars.githubusercontent.com/u/69341855?"},"repo":{"id":293456744,"name":"kimu-naoki/kimu-naoki.github.io","url":"https://api.github.com/repos/kimu-naoki/kimu-naoki.github.io"},"payload":{"push_id":7562451266,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"bbf39e7cc23e9e6ea238bd2b25002697164bac5f","before":"a76ee7457242d10e48c2e6e97a15c8d053f25521","commits":[{"sha":"bbf39e7cc23e9e6ea238bd2b25002697164bac5f","author":{"name":"kimu-naoki","email":"fdede8c5b30e6059490360c89428ab86a0bc0357@users.noreply.github.com"},"message":"Update index.html","distinct":true,"url":"https://api.github.com/repos/kimu-naoki/kimu-naoki.github.io/commits/bbf39e7cc23e9e6ea238bd2b25002697164bac5f"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339820","type":"PushEvent","actor":{"id":10191894,"login":"khanglq","display_login":"khanglq","gravatar_id":"","url":"https://api.github.com/users/khanglq","avatar_url":"https://avatars.githubusercontent.com/u/10191894?"},"repo":{"id":388034241,"name":"khanglq/support-java-doan","url":"https://api.github.com/repos/khanglq/support-java-doan"},"payload":{"push_id":7562451281,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"2f996572df67d2fcc915e1a32d323527ec8d2bf7","before":"c221a812ae32b6fed18bc9dd5497c0b2a38449cf","commits":[{"sha":"2f996572df67d2fcc915e1a32d323527ec8d2bf7","author":{"name":"khanglq","email":"caacf6bc6c783cafabc934d326886ea4f06d6d09@gmail.com"},"message":"add db resized","distinct":true,"url":"https://api.github.com/repos/khanglq/support-java-doan/commits/2f996572df67d2fcc915e1a32d323527ec8d2bf7"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339822","type":"PushEvent","actor":{"id":87330551,"login":"xz241","display_login":"xz241","gravatar_id":"","url":"https://api.github.com/users/xz241","avatar_url":"https://avatars.githubusercontent.com/u/87330551?"},"repo":{"id":385328687,"name":"xz241/wp-uploads","url":"https://api.github.com/repos/xz241/wp-uploads"},"payload":{"push_id":7562451293,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"94d80572a2b9faafef90bebf50c0c6fcdd4b91b8","before":"1d84d885421cf1a0f94f8720579a53734457c27d","commits":[{"sha":"94d80572a2b9faafef90bebf50c0c6fcdd4b91b8","author":{"name":"xz241","email":"e17353502d0344fb9b4d10b6a471cc23c11850ec@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/xz241/wp-uploads/commits/94d80572a2b9faafef90bebf50c0c6fcdd4b91b8"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339832","type":"IssuesEvent","actor":{"id":16579427,"login":"cziegenhain","display_login":"cziegenhain","gravatar_id":"","url":"https://api.github.com/users/cziegenhain","avatar_url":"https://avatars.githubusercontent.com/u/16579427?"},"repo":{"id":94886407,"name":"sdparekh/zUMIs","url":"https://api.github.com/repos/sdparekh/zUMIs"},"payload":{"action":"closed","issue":{"url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272","repository_url":"https://api.github.com/repos/sdparekh/zUMIs","labels_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272/labels{/name}","comments_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272/comments","events_url":"https://api.github.com/repos/sdparekh/zUMIs/issues/272/events","html_url":"https://github.com/sdparekh/zUMIs/issues/272","id":949217001,"node_id":"MDU6SXNzdWU5NDkyMTcwMDE=","number":272,"title":"Reproducing HCA data using zUMI","user":{"login":"HaniJieunKim","id":62005528,"node_id":"MDQ6VXNlcjYyMDA1NTI4","avatar_url":"https://avatars.githubusercontent.com/u/62005528?v=4","gravatar_id":"","url":"https://api.github.com/users/HaniJieunKim","html_url":"https://github.com/HaniJieunKim","followers_url":"https://api.github.com/users/HaniJieunKim/followers","following_url":"https://api.github.com/users/HaniJieunKim/following{/other_user}","gists_url":"https://api.github.com/users/HaniJieunKim/gists{/gist_id}","starred_url":"https://api.github.com/users/HaniJieunKim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HaniJieunKim/subscriptions","organizations_url":"https://api.github.com/users/HaniJieunKim/orgs","repos_url":"https://api.github.com/users/HaniJieunKim/repos","events_url":"https://api.github.com/users/HaniJieunKim/events{/privacy}","received_events_url":"https://api.github.com/users/HaniJieunKim/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":3,"created_at":"2021-07-21T00:36:15Z","updated_at":"2021-07-21T09:00:02Z","closed_at":"2021-07-21T09:00:02Z","author_association":"NONE","active_lock_reason":null,"body":"Hi!\r\n\r\nThank you very much for creating and maintaining zUMIs. I have been successful at running the test data and also the fibroblast data from the original Smart-seq3 paper. However when I try running HCA, I get an error (see below for YAML file and log). I would be much grateful for you help!\r\n\r\n```\r\nproject: HCA_test\r\nsequence_files:\r\n  file1:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.R1.fastq.gz\r\n    base_definition:\r\n    - cDNA(23-150)\r\n    - UMI(12-19)\r\n    find_pattern: ATTGCGCAATG\r\n  file2:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.R2.fastq.gz\r\n    base_definition:\r\n    - cDNA(1-150)\r\n  file3:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.I1.fastq.gz\r\n    base_definition:\r\n    - BC(1-8)\r\n  file4:\r\n    name: /home/data/data2/Smart-seq3/raw/HCA.I2.fastq.gz\r\n    base_definition:\r\n    - BC(1-8)\r\nreference:\r\n  STAR_index: /home/data/data2/genomeDir/STARgenomes/human2\r\n  GTF_file: /home/data/data2/genomeDir/refdata-gex-GRCh38-2020-A/genes/genes.gtf\r\n  exon_extension: no\r\n  extension_length: 0\r\n  scaffold_length_min: 0\r\n  additional_STAR_params: '--clip3pAdapterSeq CTGTCTCTTATACACATCT --limitSjdbInsertNsj 2000000 --outFilterIntronMotifs --RemoveNoncanonicalUnannotated'\r\n  additional_files: ~\r\nout_dir: /home/data/data2/normalisation/zUMI/test4\r\nnum_threads: 50\r\nmem_limit: 200\r\nfilter_cutoffs:\r\n  BC_filter:\r\n    num_bases: 3\r\n    phred: 20\r\n  UMI_filter:\r\n    num_bases: 3\r\n    phred: 20\r\nbarcodes:\r\n  barcode_num: ~\r\n  barcode_file: ~\r\n  barcode_sharing: ~\r\n  automatic: yes\r\n  BarcodeBinning: 1\r\n  nReadsperCell: 100\r\ncounting_opts:\r\n  introns: yes\r\n  intronProb: no\r\n  downsampling: '0'\r\n  strand: 0\r\n  Ham_Dist: 1\r\n  velocyto: no\r\n  primaryHit: yes\r\n  multi_overlap: no\r\n  twoPass: no\r\n  demultiplex: no\r\nmake_stats: yes\r\nwhich_Stage: Filtering\r\nsamtools_exec: samtools\r\npigz_exec: pigz\r\n#STAR_exec: /home/ubuntu/STAR/bin/Linux_x86_64/STAR\r\nSTAR_exec: STAR\r\nRscript_exec: Rscript\r\nzUMIs_directory: /home/ubuntu/zUMIs\r\n```\r\n\r\n```\r\nUsing miniconda environment for zUMIs!\r\n note: internal executables will be used instead of those specified in the YAML file!\r\n\r\n\r\n You provided these parameters:\r\n YAML file:     script/HCA_test_v1.yaml\r\n zUMIs directory:               /home/ubuntu/zUMIs\r\n STAR executable                STAR\r\n samtools executable            samtools\r\n pigz executable                pigz\r\n Rscript executable             Rscript\r\n RAM limit:   200\r\n zUMIs version 2.9.6 \r\n\r\n\r\nFri Jul 16 04:03:11 UTC 2021\r\nWARNING: The STAR version used for mapping is 2.7.3a and the STAR index was created using the version 2.7.1a. This may lead to an error while mapping. If you encounte\r\nr any errors at the mapping stage, please make sure to create the STAR index using STAR 2.7.3a.\r\nFiltering...\r\npigz: skipping: /home/data/data2/Smart-seq3/raw/HCA.R2.fastq.gz: corrupted -- incomplete deflate data\r\npigz: abort: internal threads error\r\npigz: skipping: /home/data/data2/Smart-seq3/raw/HCA.R1.fastq.gz: corrupted -- incomplete deflate data\r\npigz: abort: internal threads error\r\npigz: skipping: /home/data/data2/normalisation/zUMI/test4/zUMIs_output/.tmpMerge/HCA.R2.fastqHCA_testbt.gz does not exist\r\n@A00187:188:HM3HKDSXX:4:2657:24532:15076\r\n\r\nERROR! Fastq files are not in the same order.\r\n Make sure to provide reads in the same order.\r\n\r\n@A00187:188:HM3HKDSXX:4:2657:24551:15076\r\n\r\nERROR! Fastq files are not in the same order.\r\n Make sure to provide reads in the same order.\r\n```\r\n\r\nThese are the FASTQ files downloaded.\r\n```\r\n-rw-rw-r-- 1 ubuntu ubuntu  29660183738 May 15  2020 HCA.I1.fastq.gz\r\n-rw-rw-r-- 1 ubuntu ubuntu  30477852902 May 15  2020 HCA.I2.fastq.gz\r\n-rw-rw-r-- 1 ubuntu ubuntu 227299256599 Jul 15 07:49 HCA.R1.fastq.gz\r\n-rw-rw-r-- 1 ubuntu ubuntu 227987249699 Jul 15 07:49 HCA.R2.fastq.gz\r\n```\r\n\r\nMany thanks for you time and help!\r\n\r\nBest regards,\r\n\r\nHani\r\n\r\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339833","type":"CreateEvent","actor":{"id":87711390,"login":"NehaCholle117","display_login":"NehaCholle117","gravatar_id":"","url":"https://api.github.com/users/NehaCholle117","avatar_url":"https://avatars.githubusercontent.com/u/87711390?"},"repo":{"id":388056962,"name":"NehaCholle117/College-management-system","url":"https://api.github.com/repos/NehaCholle117/College-management-system"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339836","type":"CreateEvent","actor":{"id":10532611,"login":"felixfbecker","display_login":"felixfbecker","gravatar_id":"","url":"https://api.github.com/users/felixfbecker","avatar_url":"https://avatars.githubusercontent.com/u/10532611?"},"repo":{"id":41288708,"name":"sourcegraph/sourcegraph","url":"https://api.github.com/repos/sourcegraph/sourcegraph"},"payload":{"ref":"insights-backend-codenotify","ref_type":"branch","master_branch":"main","description":"Universal code search (self-hosted)","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":3979584,"login":"sourcegraph","gravatar_id":"","url":"https://api.github.com/orgs/sourcegraph","avatar_url":"https://avatars.githubusercontent.com/u/3979584?"}}
+{"id":"17246339844","type":"CreateEvent","actor":{"id":63582211,"login":"imarco20","display_login":"imarco20","gravatar_id":"","url":"https://api.github.com/users/imarco20","avatar_url":"https://avatars.githubusercontent.com/u/63582211?"},"repo":{"id":388055757,"name":"imarco20/Lets-Go","url":"https://api.github.com/repos/imarco20/Lets-Go"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":"This repository contains the code I am writing based on reading \"Let's Go\" Book by Alex Edwards","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339853","type":"PushEvent","actor":{"id":1991673,"login":"DanySK","display_login":"DanySK","gravatar_id":"","url":"https://api.github.com/users/DanySK","avatar_url":"https://avatars.githubusercontent.com/u/1991673?"},"repo":{"id":235406820,"name":"DanySK/alchemist-intellij-plugin","url":"https://api.github.com/repos/DanySK/alchemist-intellij-plugin"},"payload":{"push_id":7562451285,"size":1,"distinct_size":1,"ref":"refs/heads/bump-git-sensitive-semantic-versioning-to-0.3.0","head":"c59f22b383ca28be1b82dd6b4b1a1ce98e22fb40","before":"1b30adf1385930b72aec988870c29cc12d72ced1","commits":[{"sha":"c59f22b383ca28be1b82dd6b4b1a1ce98e22fb40","author":{"name":"Danilo Pianini","email":"606269d560238419e4b69aaa991b3a01c7df4fc1@unibo.it"},"message":"Update build.gradle.kts","distinct":true,"url":"https://api.github.com/repos/DanySK/alchemist-intellij-plugin/commits/c59f22b383ca28be1b82dd6b4b1a1ce98e22fb40"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339857","type":"CreateEvent","actor":{"id":58910463,"login":"davendu","display_login":"davendu","gravatar_id":"","url":"https://api.github.com/users/davendu","avatar_url":"https://avatars.githubusercontent.com/u/58910463?"},"repo":{"id":388054998,"name":"davendu/dnsmasq-china-list","url":"https://api.github.com/repos/davendu/dnsmasq-china-list"},"payload":{"ref":"feat/binaryai","ref_type":"branch","master_branch":"master","description":"Chinese-specific configuration to improve your favorite DNS server. Best partner for chnroutes.","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339869","type":"PullRequestEvent","actor":{"id":45790494,"login":"merlynjocol","display_login":"merlynjocol","gravatar_id":"","url":"https://api.github.com/users/merlynjocol","avatar_url":"https://avatars.githubusercontent.com/u/45790494?"},"repo":{"id":387825491,"name":"merlynjocol/merlynjocol.github.io","url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io"},"payload":{"action":"opened","number":1,"pull_request":{"url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/1","id":694185723,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzIz","html_url":"https://github.com/merlynjocol/merlynjocol.github.io/pull/1","diff_url":"https://github.com/merlynjocol/merlynjocol.github.io/pull/1.diff","patch_url":"https://github.com/merlynjocol/merlynjocol.github.io/pull/1.patch","issue_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/1","number":1,"state":"open","locked":false,"title":"Update _config.yml","user":{"login":"merlynjocol","id":45790494,"node_id":"MDQ6VXNlcjQ1NzkwNDk0","avatar_url":"https://avatars.githubusercontent.com/u/45790494?v=4","gravatar_id":"","url":"https://api.github.com/users/merlynjocol","html_url":"https://github.com/merlynjocol","followers_url":"https://api.github.com/users/merlynjocol/followers","following_url":"https://api.github.com/users/merlynjocol/following{/other_user}","gists_url":"https://api.github.com/users/merlynjocol/gists{/gist_id}","starred_url":"https://api.github.com/users/merlynjocol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/merlynjocol/subscriptions","organizations_url":"https://api.github.com/users/merlynjocol/orgs","repos_url":"https://api.github.com/users/merlynjocol/repos","events_url":"https://api.github.com/users/merlynjocol/events{/privacy}","received_events_url":"https://api.github.com/users/merlynjocol/received_events","type":"User","site_admin":false},"body":"configuration Theme_Memoirs \r\nhttps://bootstrapstarter.com/jekyll-theme-memoirs/","created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/1/commits","review_comments_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/1/comments","review_comment_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/comments{/number}","comments_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/1/comments","statuses_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/statuses/72657a9062f8c9a69523078225b83ed01ae790ac","head":{"label":"merlynjocol:merlynjocol-patch-1","ref":"merlynjocol-patch-1","sha":"72657a9062f8c9a69523078225b83ed01ae790ac","user":{"login":"merlynjocol","id":45790494,"node_id":"MDQ6VXNlcjQ1NzkwNDk0","avatar_url":"https://avatars.githubusercontent.com/u/45790494?v=4","gravatar_id":"","url":"https://api.github.com/users/merlynjocol","html_url":"https://github.com/merlynjocol","followers_url":"https://api.github.com/users/merlynjocol/followers","following_url":"https://api.github.com/users/merlynjocol/following{/other_user}","gists_url":"https://api.github.com/users/merlynjocol/gists{/gist_id}","starred_url":"https://api.github.com/users/merlynjocol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/merlynjocol/subscriptions","organizations_url":"https://api.github.com/users/merlynjocol/orgs","repos_url":"https://api.github.com/users/merlynjocol/repos","events_url":"https://api.github.com/users/merlynjocol/events{/privacy}","received_events_url":"https://api.github.com/users/merlynjocol/received_events","type":"User","site_admin":false},"repo":{"id":387825491,"node_id":"MDEwOlJlcG9zaXRvcnkzODc4MjU0OTE=","name":"merlynjocol.github.io","full_name":"merlynjocol/merlynjocol.github.io","private":false,"owner":{"login":"merlynjocol","id":45790494,"node_id":"MDQ6VXNlcjQ1NzkwNDk0","avatar_url":"https://avatars.githubusercontent.com/u/45790494?v=4","gravatar_id":"","url":"https://api.github.com/users/merlynjocol","html_url":"https://github.com/merlynjocol","followers_url":"https://api.github.com/users/merlynjocol/followers","following_url":"https://api.github.com/users/merlynjocol/following{/other_user}","gists_url":"https://api.github.com/users/merlynjocol/gists{/gist_id}","starred_url":"https://api.github.com/users/merlynjocol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/merlynjocol/subscriptions","organizations_url":"https://api.github.com/users/merlynjocol/orgs","repos_url":"https://api.github.com/users/merlynjocol/repos","events_url":"https://api.github.com/users/merlynjocol/events{/privacy}","received_events_url":"https://api.github.com/users/merlynjocol/received_events","type":"User","site_admin":false},"html_url":"https://github.com/merlynjocol/merlynjocol.github.io","description":"Portfolio of a Professional in the International Cooperation sector and Digital transformation towards SDG's","fork":false,"url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io","forks_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/forks","keys_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/keys{/key_id}","collaborators_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/teams","hooks_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/hooks","issue_events_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/events{/number}","events_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/events","assignees_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/assignees{/user}","branches_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/branches{/branch}","tags_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/tags","blobs_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/refs{/sha}","trees_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/trees{/sha}","statuses_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/statuses/{sha}","languages_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/languages","stargazers_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/stargazers","contributors_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/contributors","subscribers_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/subscribers","subscription_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/subscription","commits_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/commits{/sha}","git_commits_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/commits{/sha}","comments_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/comments{/number}","issue_comment_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/comments{/number}","contents_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/contents/{+path}","compare_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/compare/{base}...{head}","merges_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/merges","archive_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/downloads","issues_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues{/number}","pulls_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls{/number}","milestones_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/milestones{/number}","notifications_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/labels{/name}","releases_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/releases{/id}","deployments_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/deployments","created_at":"2021-07-20T14:53:27Z","updated_at":"2021-07-21T08:51:06Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/merlynjocol/merlynjocol.github.io.git","ssh_url":"git@github.com:merlynjocol/merlynjocol.github.io.git","clone_url":"https://github.com/merlynjocol/merlynjocol.github.io.git","svn_url":"https://github.com/merlynjocol/merlynjocol.github.io","homepage":"","size":22,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"base":{"label":"merlynjocol:main","ref":"main","sha":"e607c9b78640103bb1f65d2a48cb8afe4c1bac88","user":{"login":"merlynjocol","id":45790494,"node_id":"MDQ6VXNlcjQ1NzkwNDk0","avatar_url":"https://avatars.githubusercontent.com/u/45790494?v=4","gravatar_id":"","url":"https://api.github.com/users/merlynjocol","html_url":"https://github.com/merlynjocol","followers_url":"https://api.github.com/users/merlynjocol/followers","following_url":"https://api.github.com/users/merlynjocol/following{/other_user}","gists_url":"https://api.github.com/users/merlynjocol/gists{/gist_id}","starred_url":"https://api.github.com/users/merlynjocol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/merlynjocol/subscriptions","organizations_url":"https://api.github.com/users/merlynjocol/orgs","repos_url":"https://api.github.com/users/merlynjocol/repos","events_url":"https://api.github.com/users/merlynjocol/events{/privacy}","received_events_url":"https://api.github.com/users/merlynjocol/received_events","type":"User","site_admin":false},"repo":{"id":387825491,"node_id":"MDEwOlJlcG9zaXRvcnkzODc4MjU0OTE=","name":"merlynjocol.github.io","full_name":"merlynjocol/merlynjocol.github.io","private":false,"owner":{"login":"merlynjocol","id":45790494,"node_id":"MDQ6VXNlcjQ1NzkwNDk0","avatar_url":"https://avatars.githubusercontent.com/u/45790494?v=4","gravatar_id":"","url":"https://api.github.com/users/merlynjocol","html_url":"https://github.com/merlynjocol","followers_url":"https://api.github.com/users/merlynjocol/followers","following_url":"https://api.github.com/users/merlynjocol/following{/other_user}","gists_url":"https://api.github.com/users/merlynjocol/gists{/gist_id}","starred_url":"https://api.github.com/users/merlynjocol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/merlynjocol/subscriptions","organizations_url":"https://api.github.com/users/merlynjocol/orgs","repos_url":"https://api.github.com/users/merlynjocol/repos","events_url":"https://api.github.com/users/merlynjocol/events{/privacy}","received_events_url":"https://api.github.com/users/merlynjocol/received_events","type":"User","site_admin":false},"html_url":"https://github.com/merlynjocol/merlynjocol.github.io","description":"Portfolio of a Professional in the International Cooperation sector and Digital transformation towards SDG's","fork":false,"url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io","forks_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/forks","keys_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/keys{/key_id}","collaborators_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/teams","hooks_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/hooks","issue_events_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/events{/number}","events_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/events","assignees_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/assignees{/user}","branches_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/branches{/branch}","tags_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/tags","blobs_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/refs{/sha}","trees_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/trees{/sha}","statuses_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/statuses/{sha}","languages_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/languages","stargazers_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/stargazers","contributors_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/contributors","subscribers_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/subscribers","subscription_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/subscription","commits_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/commits{/sha}","git_commits_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/git/commits{/sha}","comments_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/comments{/number}","issue_comment_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/comments{/number}","contents_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/contents/{+path}","compare_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/compare/{base}...{head}","merges_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/merges","archive_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/downloads","issues_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues{/number}","pulls_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls{/number}","milestones_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/milestones{/number}","notifications_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/labels{/name}","releases_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/releases{/id}","deployments_url":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/deployments","created_at":"2021-07-20T14:53:27Z","updated_at":"2021-07-21T08:51:06Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/merlynjocol/merlynjocol.github.io.git","ssh_url":"git@github.com:merlynjocol/merlynjocol.github.io.git","clone_url":"https://github.com/merlynjocol/merlynjocol.github.io.git","svn_url":"https://github.com/merlynjocol/merlynjocol.github.io","homepage":"","size":22,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/1"},"html":{"href":"https://github.com/merlynjocol/merlynjocol.github.io/pull/1"},"issue":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/1"},"comments":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/merlynjocol/merlynjocol.github.io/statuses/72657a9062f8c9a69523078225b83ed01ae790ac"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":1,"deletions":1,"changed_files":1}},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339892","type":"PullRequestEvent","actor":{"id":10532611,"login":"felixfbecker","display_login":"felixfbecker","gravatar_id":"","url":"https://api.github.com/users/felixfbecker","avatar_url":"https://avatars.githubusercontent.com/u/10532611?"},"repo":{"id":41288708,"name":"sourcegraph/sourcegraph","url":"https://api.github.com/repos/sourcegraph/sourcegraph"},"payload":{"action":"opened","number":23063,"pull_request":{"url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/23063","id":694185726,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzI2","html_url":"https://github.com/sourcegraph/sourcegraph/pull/23063","diff_url":"https://github.com/sourcegraph/sourcegraph/pull/23063.diff","patch_url":"https://github.com/sourcegraph/sourcegraph/pull/23063.patch","issue_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/23063","number":23063,"state":"open","locked":false,"title":"Remove myself from CODENOTIFY for insights","user":{"login":"felixfbecker","id":10532611,"node_id":"MDQ6VXNlcjEwNTMyNjEx","avatar_url":"https://avatars.githubusercontent.com/u/10532611?v=4","gravatar_id":"","url":"https://api.github.com/users/felixfbecker","html_url":"https://github.com/felixfbecker","followers_url":"https://api.github.com/users/felixfbecker/followers","following_url":"https://api.github.com/users/felixfbecker/following{/other_user}","gists_url":"https://api.github.com/users/felixfbecker/gists{/gist_id}","starred_url":"https://api.github.com/users/felixfbecker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/felixfbecker/subscriptions","organizations_url":"https://api.github.com/users/felixfbecker/orgs","repos_url":"https://api.github.com/users/felixfbecker/repos","events_url":"https://api.github.com/users/felixfbecker/events{/privacy}","received_events_url":"https://api.github.com/users/felixfbecker/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/23063/commits","review_comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/23063/comments","review_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/comments{/number}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/23063/comments","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/1739139b8c442270d76df2900ca266f1e0e6d675","head":{"label":"sourcegraph:insights-backend-codenotify","ref":"insights-backend-codenotify","sha":"1739139b8c442270d76df2900ca266f1e0e6d675","user":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"repo":{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Universal code search (self-hosted)","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2021-07-21T08:57:54Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":512321,"stargazers_count":4894,"watchers_count":4894,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":579,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2534,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":579,"open_issues":2534,"watchers":4894,"default_branch":"main"}},"base":{"label":"sourcegraph:main","ref":"main","sha":"aaec1239e46ef2e7899542472e35dcac68342769","user":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"repo":{"id":41288708,"node_id":"MDEwOlJlcG9zaXRvcnk0MTI4ODcwOA==","name":"sourcegraph","full_name":"sourcegraph/sourcegraph","private":false,"owner":{"login":"sourcegraph","id":3979584,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM5Nzk1ODQ=","avatar_url":"https://avatars.githubusercontent.com/u/3979584?v=4","gravatar_id":"","url":"https://api.github.com/users/sourcegraph","html_url":"https://github.com/sourcegraph","followers_url":"https://api.github.com/users/sourcegraph/followers","following_url":"https://api.github.com/users/sourcegraph/following{/other_user}","gists_url":"https://api.github.com/users/sourcegraph/gists{/gist_id}","starred_url":"https://api.github.com/users/sourcegraph/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sourcegraph/subscriptions","organizations_url":"https://api.github.com/users/sourcegraph/orgs","repos_url":"https://api.github.com/users/sourcegraph/repos","events_url":"https://api.github.com/users/sourcegraph/events{/privacy}","received_events_url":"https://api.github.com/users/sourcegraph/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/sourcegraph/sourcegraph","description":"Universal code search (self-hosted)","fork":false,"url":"https://api.github.com/repos/sourcegraph/sourcegraph","forks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/forks","keys_url":"https://api.github.com/repos/sourcegraph/sourcegraph/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sourcegraph/sourcegraph/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sourcegraph/sourcegraph/teams","hooks_url":"https://api.github.com/repos/sourcegraph/sourcegraph/hooks","issue_events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/events{/number}","events_url":"https://api.github.com/repos/sourcegraph/sourcegraph/events","assignees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/assignees{/user}","branches_url":"https://api.github.com/repos/sourcegraph/sourcegraph/branches{/branch}","tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/tags","blobs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/refs{/sha}","trees_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/{sha}","languages_url":"https://api.github.com/repos/sourcegraph/sourcegraph/languages","stargazers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/stargazers","contributors_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contributors","subscribers_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscribers","subscription_url":"https://api.github.com/repos/sourcegraph/sourcegraph/subscription","commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/commits{/sha}","git_commits_url":"https://api.github.com/repos/sourcegraph/sourcegraph/git/commits{/sha}","comments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/comments{/number}","issue_comment_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/comments{/number}","contents_url":"https://api.github.com/repos/sourcegraph/sourcegraph/contents/{+path}","compare_url":"https://api.github.com/repos/sourcegraph/sourcegraph/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sourcegraph/sourcegraph/merges","archive_url":"https://api.github.com/repos/sourcegraph/sourcegraph/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sourcegraph/sourcegraph/downloads","issues_url":"https://api.github.com/repos/sourcegraph/sourcegraph/issues{/number}","pulls_url":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls{/number}","milestones_url":"https://api.github.com/repos/sourcegraph/sourcegraph/milestones{/number}","notifications_url":"https://api.github.com/repos/sourcegraph/sourcegraph/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sourcegraph/sourcegraph/labels{/name}","releases_url":"https://api.github.com/repos/sourcegraph/sourcegraph/releases{/id}","deployments_url":"https://api.github.com/repos/sourcegraph/sourcegraph/deployments","created_at":"2015-08-24T07:27:28Z","updated_at":"2021-07-21T08:57:54Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/sourcegraph/sourcegraph.git","ssh_url":"git@github.com:sourcegraph/sourcegraph.git","clone_url":"https://github.com/sourcegraph/sourcegraph.git","svn_url":"https://github.com/sourcegraph/sourcegraph","homepage":"https://sourcegraph.com","size":512321,"stargazers_count":4894,"watchers_count":4894,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":579,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":2534,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":579,"open_issues":2534,"watchers":4894,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/23063"},"html":{"href":"https://github.com/sourcegraph/sourcegraph/pull/23063"},"issue":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/23063"},"comments":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/issues/23063/comments"},"review_comments":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/23063/comments"},"review_comment":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/pulls/23063/commits"},"statuses":{"href":"https://api.github.com/repos/sourcegraph/sourcegraph/statuses/1739139b8c442270d76df2900ca266f1e0e6d675"}},"author_association":"MEMBER","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":2,"deletions":2,"changed_files":2}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":3979584,"login":"sourcegraph","gravatar_id":"","url":"https://api.github.com/orgs/sourcegraph","avatar_url":"https://avatars.githubusercontent.com/u/3979584?"}}
+{"id":"17246339861","type":"WatchEvent","actor":{"id":664076,"login":"jonaskello","display_login":"jonaskello","gravatar_id":"","url":"https://api.github.com/users/jonaskello","avatar_url":"https://avatars.githubusercontent.com/u/664076?"},"repo":{"id":178991158,"name":"starship/starship","url":"https://api.github.com/repos/starship/starship"},"payload":{"action":"started"},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":49654870,"login":"starship","gravatar_id":"","url":"https://api.github.com/orgs/starship","avatar_url":"https://avatars.githubusercontent.com/u/49654870?"}}
+{"id":"17246339863","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7562451286,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b6cb047bb302033ffc190e6274c47cd04a5b7f0d","before":"31adc436527008f4fbd031f1b2d64e18bb6184c5","commits":[{"sha":"b6cb047bb302033ffc190e6274c47cd04a5b7f0d","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/b6cb047bb302033ffc190e6274c47cd04a5b7f0d"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339864","type":"DeleteEvent","actor":{"id":10810283,"login":"direwolf-github","display_login":"direwolf-github","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","avatar_url":"https://avatars.githubusercontent.com/u/10810283?"},"repo":{"id":183051410,"name":"direwolf-github/my-app","url":"https://api.github.com/repos/direwolf-github/my-app"},"payload":{"ref":"branch-a6ccd853","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339877","type":"PushEvent","actor":{"id":8517910,"login":"LombiqBot","display_login":"LombiqBot","gravatar_id":"","url":"https://api.github.com/users/LombiqBot","avatar_url":"https://avatars.githubusercontent.com/u/8517910?"},"repo":{"id":264168728,"name":"Lombiq/OrchardCMS.Poll","url":"https://api.github.com/repos/Lombiq/OrchardCMS.Poll"},"payload":{"push_id":7562451296,"size":0,"distinct_size":0,"ref":"refs/heads/dev","head":"0ad7be63fcce942d979bb024f403dc08f789e593","before":"0ad7be63fcce942d979bb024f403dc08f789e593","commits":[]},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":8158177,"login":"Lombiq","gravatar_id":"","url":"https://api.github.com/orgs/Lombiq","avatar_url":"https://avatars.githubusercontent.com/u/8158177?"}}
+{"id":"17246339882","type":"PushEvent","actor":{"id":67819815,"login":"PRASAD-DANGARE","display_login":"PRASAD-DANGARE","gravatar_id":"","url":"https://api.github.com/users/PRASAD-DANGARE","avatar_url":"https://avatars.githubusercontent.com/u/67819815?"},"repo":{"id":358221901,"name":"PRASAD-DANGARE/Machine_Learning-Applications","url":"https://api.github.com/repos/PRASAD-DANGARE/Machine_Learning-Applications"},"payload":{"push_id":7562451317,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"283fac602e08db879ce0a589afee949a609e5a06","before":"59f29fc9287f8d8dc16ff41a32e68c5dfae4299e","commits":[{"sha":"283fac602e08db879ce0a589afee949a609e5a06","author":{"name":"Prasad_Dangare","email":"b0d2f1d57f52050017900d03cca92a142a984e26@users.noreply.github.com"},"message":"About This Repository....","distinct":true,"url":"https://api.github.com/repos/PRASAD-DANGARE/Machine_Learning-Applications/commits/283fac602e08db879ce0a589afee949a609e5a06"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339884","type":"PushEvent","actor":{"id":68853062,"login":"lkunjumon","display_login":"lkunjumon","gravatar_id":"","url":"https://api.github.com/users/lkunjumon","avatar_url":"https://avatars.githubusercontent.com/u/68853062?"},"repo":{"id":333340959,"name":"lkunjumon/sonic-buildimage-1","url":"https://api.github.com/repos/lkunjumon/sonic-buildimage-1"},"payload":{"push_id":7562451305,"size":1,"distinct_size":1,"ref":"refs/heads/PMON","head":"8047bbf4d06f077d11a843d9a5fb100d929a491c","before":"d1ff6ae85e0429def58b91dad4948eef5c023b83","commits":[{"sha":"8047bbf4d06f077d11a843d9a5fb100d929a491c","author":{"name":"lkunjumon","email":"48c45adbe7f7c490f6a6115cfca94c89937402fb@marvell.com"},"message":"Adding platform changes for intel","distinct":true,"url":"https://api.github.com/repos/lkunjumon/sonic-buildimage-1/commits/8047bbf4d06f077d11a843d9a5fb100d929a491c"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339885","type":"PushEvent","actor":{"id":79913779,"login":"conda-forge-curator[bot]","display_login":"conda-forge-curator","gravatar_id":"","url":"https://api.github.com/users/conda-forge-curator[bot]","avatar_url":"https://avatars.githubusercontent.com/u/79913779?"},"repo":{"id":286991282,"name":"conda-forge/repodata-shards","url":"https://api.github.com/repos/conda-forge/repodata-shards"},"payload":{"push_id":7562451315,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"f075d97679af69fa2099a519d5d9aa8f65483e67","before":"b621128ef3719675e3398376b07e3de84f00c1f1","commits":[{"sha":"f075d97679af69fa2099a519d5d9aa8f65483e67","author":{"name":"conda-forge-curator[bot]","email":"33ed12a5a1eeb5dbf95e50afdeb87971316ce7da@users.noreply.github.com"},"message":"added win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2 [ci skip] [cf admin skip] ***NO_CI***","distinct":true,"url":"https://api.github.com/repos/conda-forge/repodata-shards/commits/f075d97679af69fa2099a519d5d9aa8f65483e67"}]},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":11897326,"login":"conda-forge","gravatar_id":"","url":"https://api.github.com/orgs/conda-forge","avatar_url":"https://avatars.githubusercontent.com/u/11897326?"}}
+{"id":"17246339896","type":"PushEvent","actor":{"id":44903710,"login":"Mj-Techs","display_login":"Mj-Techs","gravatar_id":"","url":"https://api.github.com/users/Mj-Techs","avatar_url":"https://avatars.githubusercontent.com/u/44903710?"},"repo":{"id":388055598,"name":"Mj-Techs/memories-api","url":"https://api.github.com/repos/Mj-Techs/memories-api"},"payload":{"push_id":7562451313,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"f52220369c2643b672096666f57c0c7f564a8276","before":"f2b2a06140d61c9b58c097b708e685031aa94bb7","commits":[{"sha":"f52220369c2643b672096666f57c0c7f564a8276","author":{"name":"Mrityunjay","email":"47fbbf25c13870316dd8aa8a59dea16366eabc82@users.noreply.github.com"},"message":"'update'","distinct":true,"url":"https://api.github.com/repos/Mj-Techs/memories-api/commits/f52220369c2643b672096666f57c0c7f564a8276"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339899","type":"CreateEvent","actor":{"id":45231395,"login":"appleRtsan","display_login":"appleRtsan","gravatar_id":"","url":"https://api.github.com/users/appleRtsan","avatar_url":"https://avatars.githubusercontent.com/u/45231395?"},"repo":{"id":388055402,"name":"appleRtsan/testdlib","url":"https://api.github.com/repos/appleRtsan/testdlib"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339900","type":"PullRequestEvent","actor":{"id":6995524,"login":"yurabakhtin","display_login":"yurabakhtin","gravatar_id":"","url":"https://api.github.com/users/yurabakhtin","avatar_url":"https://avatars.githubusercontent.com/u/6995524?"},"repo":{"id":16685462,"name":"humhub/humhub","url":"https://api.github.com/repos/humhub/humhub"},"payload":{"action":"opened","number":5181,"pull_request":{"url":"https://api.github.com/repos/humhub/humhub/pulls/5181","id":694185722,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTg1NzIy","html_url":"https://github.com/humhub/humhub/pull/5181","diff_url":"https://github.com/humhub/humhub/pull/5181.diff","patch_url":"https://github.com/humhub/humhub/pull/5181.patch","issue_url":"https://api.github.com/repos/humhub/humhub/issues/5181","number":5181,"state":"open","locked":false,"title":"Allow to disable comments per content","user":{"login":"yurabakhtin","id":6995524,"node_id":"MDQ6VXNlcjY5OTU1MjQ=","avatar_url":"https://avatars.githubusercontent.com/u/6995524?v=4","gravatar_id":"","url":"https://api.github.com/users/yurabakhtin","html_url":"https://github.com/yurabakhtin","followers_url":"https://api.github.com/users/yurabakhtin/followers","following_url":"https://api.github.com/users/yurabakhtin/following{/other_user}","gists_url":"https://api.github.com/users/yurabakhtin/gists{/gist_id}","starred_url":"https://api.github.com/users/yurabakhtin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yurabakhtin/subscriptions","organizations_url":"https://api.github.com/users/yurabakhtin/orgs","repos_url":"https://api.github.com/users/yurabakhtin/repos","events_url":"https://api.github.com/users/yurabakhtin/events{/privacy}","received_events_url":"https://api.github.com/users/yurabakhtin/received_events","type":"User","site_admin":false},"body":"<!-- PULL REQUEST TEMPLATE -->\r\n<!-- (Update \"[ ]\" to \"[x]\" to check a box) -->\r\n\r\n**What kind of change does this PR introduce?** (check at least one)\r\n\r\n- [x] Feature\r\n- [x] Code style update\r\n- [x] Refactor\r\n\r\n**The PR fulfills these requirements:**\r\n\r\n- [z] It's submitted to the `develop` branch, _not_ the `master` branch if no hotfix\r\n- [ ] All tests are passing\r\n- [ ] Changelog was modified\r\n\r\n**Other information:**\r\nIssue: https://github.com/humhub/humhub/issues/4495","created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[{"login":"luke-","id":4736168,"node_id":"MDQ6VXNlcjQ3MzYxNjg=","avatar_url":"https://avatars.githubusercontent.com/u/4736168?v=4","gravatar_id":"","url":"https://api.github.com/users/luke-","html_url":"https://github.com/luke-","followers_url":"https://api.github.com/users/luke-/followers","following_url":"https://api.github.com/users/luke-/following{/other_user}","gists_url":"https://api.github.com/users/luke-/gists{/gist_id}","starred_url":"https://api.github.com/users/luke-/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/luke-/subscriptions","organizations_url":"https://api.github.com/users/luke-/orgs","repos_url":"https://api.github.com/users/luke-/repos","events_url":"https://api.github.com/users/luke-/events{/privacy}","received_events_url":"https://api.github.com/users/luke-/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/humhub/humhub/pulls/5181/commits","review_comments_url":"https://api.github.com/repos/humhub/humhub/pulls/5181/comments","review_comment_url":"https://api.github.com/repos/humhub/humhub/pulls/comments{/number}","comments_url":"https://api.github.com/repos/humhub/humhub/issues/5181/comments","statuses_url":"https://api.github.com/repos/humhub/humhub/statuses/f228afb744865702496c50266dba0eda5fe02f31","head":{"label":"humhub:enh/4495-disable-comments","ref":"enh/4495-disable-comments","sha":"f228afb744865702496c50266dba0eda5fe02f31","user":{"login":"humhub","id":6262639,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyNjI2Mzk=","avatar_url":"https://avatars.githubusercontent.com/u/6262639?v=4","gravatar_id":"","url":"https://api.github.com/users/humhub","html_url":"https://github.com/humhub","followers_url":"https://api.github.com/users/humhub/followers","following_url":"https://api.github.com/users/humhub/following{/other_user}","gists_url":"https://api.github.com/users/humhub/gists{/gist_id}","starred_url":"https://api.github.com/users/humhub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/humhub/subscriptions","organizations_url":"https://api.github.com/users/humhub/orgs","repos_url":"https://api.github.com/users/humhub/repos","events_url":"https://api.github.com/users/humhub/events{/privacy}","received_events_url":"https://api.github.com/users/humhub/received_events","type":"Organization","site_admin":false},"repo":{"id":16685462,"node_id":"MDEwOlJlcG9zaXRvcnkxNjY4NTQ2Mg==","name":"humhub","full_name":"humhub/humhub","private":false,"owner":{"login":"humhub","id":6262639,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyNjI2Mzk=","avatar_url":"https://avatars.githubusercontent.com/u/6262639?v=4","gravatar_id":"","url":"https://api.github.com/users/humhub","html_url":"https://github.com/humhub","followers_url":"https://api.github.com/users/humhub/followers","following_url":"https://api.github.com/users/humhub/following{/other_user}","gists_url":"https://api.github.com/users/humhub/gists{/gist_id}","starred_url":"https://api.github.com/users/humhub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/humhub/subscriptions","organizations_url":"https://api.github.com/users/humhub/orgs","repos_url":"https://api.github.com/users/humhub/repos","events_url":"https://api.github.com/users/humhub/events{/privacy}","received_events_url":"https://api.github.com/users/humhub/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/humhub/humhub","description":"HumHub is an Open Source Enterprise Social Network. Easy to install, intuitive to use and extendable with countless freely available modules.","fork":false,"url":"https://api.github.com/repos/humhub/humhub","forks_url":"https://api.github.com/repos/humhub/humhub/forks","keys_url":"https://api.github.com/repos/humhub/humhub/keys{/key_id}","collaborators_url":"https://api.github.com/repos/humhub/humhub/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/humhub/humhub/teams","hooks_url":"https://api.github.com/repos/humhub/humhub/hooks","issue_events_url":"https://api.github.com/repos/humhub/humhub/issues/events{/number}","events_url":"https://api.github.com/repos/humhub/humhub/events","assignees_url":"https://api.github.com/repos/humhub/humhub/assignees{/user}","branches_url":"https://api.github.com/repos/humhub/humhub/branches{/branch}","tags_url":"https://api.github.com/repos/humhub/humhub/tags","blobs_url":"https://api.github.com/repos/humhub/humhub/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/humhub/humhub/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/humhub/humhub/git/refs{/sha}","trees_url":"https://api.github.com/repos/humhub/humhub/git/trees{/sha}","statuses_url":"https://api.github.com/repos/humhub/humhub/statuses/{sha}","languages_url":"https://api.github.com/repos/humhub/humhub/languages","stargazers_url":"https://api.github.com/repos/humhub/humhub/stargazers","contributors_url":"https://api.github.com/repos/humhub/humhub/contributors","subscribers_url":"https://api.github.com/repos/humhub/humhub/subscribers","subscription_url":"https://api.github.com/repos/humhub/humhub/subscription","commits_url":"https://api.github.com/repos/humhub/humhub/commits{/sha}","git_commits_url":"https://api.github.com/repos/humhub/humhub/git/commits{/sha}","comments_url":"https://api.github.com/repos/humhub/humhub/comments{/number}","issue_comment_url":"https://api.github.com/repos/humhub/humhub/issues/comments{/number}","contents_url":"https://api.github.com/repos/humhub/humhub/contents/{+path}","compare_url":"https://api.github.com/repos/humhub/humhub/compare/{base}...{head}","merges_url":"https://api.github.com/repos/humhub/humhub/merges","archive_url":"https://api.github.com/repos/humhub/humhub/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/humhub/humhub/downloads","issues_url":"https://api.github.com/repos/humhub/humhub/issues{/number}","pulls_url":"https://api.github.com/repos/humhub/humhub/pulls{/number}","milestones_url":"https://api.github.com/repos/humhub/humhub/milestones{/number}","notifications_url":"https://api.github.com/repos/humhub/humhub/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/humhub/humhub/labels{/name}","releases_url":"https://api.github.com/repos/humhub/humhub/releases{/id}","deployments_url":"https://api.github.com/repos/humhub/humhub/deployments","created_at":"2014-02-10T05:31:03Z","updated_at":"2021-07-20T17:30:39Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/humhub/humhub.git","ssh_url":"git@github.com:humhub/humhub.git","clone_url":"https://github.com/humhub/humhub.git","svn_url":"https://github.com/humhub/humhub","homepage":"http://www.humhub.com","size":93616,"stargazers_count":5462,"watchers_count":5462,"language":"PHP","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1545,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":513,"license":null,"forks":1545,"open_issues":513,"watchers":5462,"default_branch":"master"}},"base":{"label":"humhub:develop","ref":"develop","sha":"91d4b03b7a87eff546c4bc4dfa6a0b06559572b4","user":{"login":"humhub","id":6262639,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyNjI2Mzk=","avatar_url":"https://avatars.githubusercontent.com/u/6262639?v=4","gravatar_id":"","url":"https://api.github.com/users/humhub","html_url":"https://github.com/humhub","followers_url":"https://api.github.com/users/humhub/followers","following_url":"https://api.github.com/users/humhub/following{/other_user}","gists_url":"https://api.github.com/users/humhub/gists{/gist_id}","starred_url":"https://api.github.com/users/humhub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/humhub/subscriptions","organizations_url":"https://api.github.com/users/humhub/orgs","repos_url":"https://api.github.com/users/humhub/repos","events_url":"https://api.github.com/users/humhub/events{/privacy}","received_events_url":"https://api.github.com/users/humhub/received_events","type":"Organization","site_admin":false},"repo":{"id":16685462,"node_id":"MDEwOlJlcG9zaXRvcnkxNjY4NTQ2Mg==","name":"humhub","full_name":"humhub/humhub","private":false,"owner":{"login":"humhub","id":6262639,"node_id":"MDEyOk9yZ2FuaXphdGlvbjYyNjI2Mzk=","avatar_url":"https://avatars.githubusercontent.com/u/6262639?v=4","gravatar_id":"","url":"https://api.github.com/users/humhub","html_url":"https://github.com/humhub","followers_url":"https://api.github.com/users/humhub/followers","following_url":"https://api.github.com/users/humhub/following{/other_user}","gists_url":"https://api.github.com/users/humhub/gists{/gist_id}","starred_url":"https://api.github.com/users/humhub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/humhub/subscriptions","organizations_url":"https://api.github.com/users/humhub/orgs","repos_url":"https://api.github.com/users/humhub/repos","events_url":"https://api.github.com/users/humhub/events{/privacy}","received_events_url":"https://api.github.com/users/humhub/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/humhub/humhub","description":"HumHub is an Open Source Enterprise Social Network. Easy to install, intuitive to use and extendable with countless freely available modules.","fork":false,"url":"https://api.github.com/repos/humhub/humhub","forks_url":"https://api.github.com/repos/humhub/humhub/forks","keys_url":"https://api.github.com/repos/humhub/humhub/keys{/key_id}","collaborators_url":"https://api.github.com/repos/humhub/humhub/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/humhub/humhub/teams","hooks_url":"https://api.github.com/repos/humhub/humhub/hooks","issue_events_url":"https://api.github.com/repos/humhub/humhub/issues/events{/number}","events_url":"https://api.github.com/repos/humhub/humhub/events","assignees_url":"https://api.github.com/repos/humhub/humhub/assignees{/user}","branches_url":"https://api.github.com/repos/humhub/humhub/branches{/branch}","tags_url":"https://api.github.com/repos/humhub/humhub/tags","blobs_url":"https://api.github.com/repos/humhub/humhub/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/humhub/humhub/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/humhub/humhub/git/refs{/sha}","trees_url":"https://api.github.com/repos/humhub/humhub/git/trees{/sha}","statuses_url":"https://api.github.com/repos/humhub/humhub/statuses/{sha}","languages_url":"https://api.github.com/repos/humhub/humhub/languages","stargazers_url":"https://api.github.com/repos/humhub/humhub/stargazers","contributors_url":"https://api.github.com/repos/humhub/humhub/contributors","subscribers_url":"https://api.github.com/repos/humhub/humhub/subscribers","subscription_url":"https://api.github.com/repos/humhub/humhub/subscription","commits_url":"https://api.github.com/repos/humhub/humhub/commits{/sha}","git_commits_url":"https://api.github.com/repos/humhub/humhub/git/commits{/sha}","comments_url":"https://api.github.com/repos/humhub/humhub/comments{/number}","issue_comment_url":"https://api.github.com/repos/humhub/humhub/issues/comments{/number}","contents_url":"https://api.github.com/repos/humhub/humhub/contents/{+path}","compare_url":"https://api.github.com/repos/humhub/humhub/compare/{base}...{head}","merges_url":"https://api.github.com/repos/humhub/humhub/merges","archive_url":"https://api.github.com/repos/humhub/humhub/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/humhub/humhub/downloads","issues_url":"https://api.github.com/repos/humhub/humhub/issues{/number}","pulls_url":"https://api.github.com/repos/humhub/humhub/pulls{/number}","milestones_url":"https://api.github.com/repos/humhub/humhub/milestones{/number}","notifications_url":"https://api.github.com/repos/humhub/humhub/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/humhub/humhub/labels{/name}","releases_url":"https://api.github.com/repos/humhub/humhub/releases{/id}","deployments_url":"https://api.github.com/repos/humhub/humhub/deployments","created_at":"2014-02-10T05:31:03Z","updated_at":"2021-07-20T17:30:39Z","pushed_at":"2021-07-21T09:00:02Z","git_url":"git://github.com/humhub/humhub.git","ssh_url":"git@github.com:humhub/humhub.git","clone_url":"https://github.com/humhub/humhub.git","svn_url":"https://github.com/humhub/humhub","homepage":"http://www.humhub.com","size":93616,"stargazers_count":5462,"watchers_count":5462,"language":"PHP","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1545,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":513,"license":null,"forks":1545,"open_issues":513,"watchers":5462,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/humhub/humhub/pulls/5181"},"html":{"href":"https://github.com/humhub/humhub/pull/5181"},"issue":{"href":"https://api.github.com/repos/humhub/humhub/issues/5181"},"comments":{"href":"https://api.github.com/repos/humhub/humhub/issues/5181/comments"},"review_comments":{"href":"https://api.github.com/repos/humhub/humhub/pulls/5181/comments"},"review_comment":{"href":"https://api.github.com/repos/humhub/humhub/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/humhub/humhub/pulls/5181/commits"},"statuses":{"href":"https://api.github.com/repos/humhub/humhub/statuses/f228afb744865702496c50266dba0eda5fe02f31"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":272,"deletions":7,"changed_files":10}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":6262639,"login":"humhub","gravatar_id":"","url":"https://api.github.com/orgs/humhub","avatar_url":"https://avatars.githubusercontent.com/u/6262639?"}}
+{"id":"17246339902","type":"IssueCommentEvent","actor":{"id":3491412,"login":"miguelgfierro","display_login":"miguelgfierro","gravatar_id":"","url":"https://api.github.com/users/miguelgfierro","avatar_url":"https://avatars.githubusercontent.com/u/3491412?"},"repo":{"id":149430917,"name":"microsoft/recommenders","url":"https://api.github.com/repos/microsoft/recommenders"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/microsoft/recommenders/issues/1398","repository_url":"https://api.github.com/repos/microsoft/recommenders","labels_url":"https://api.github.com/repos/microsoft/recommenders/issues/1398/labels{/name}","comments_url":"https://api.github.com/repos/microsoft/recommenders/issues/1398/comments","events_url":"https://api.github.com/repos/microsoft/recommenders/issues/1398/events","html_url":"https://github.com/microsoft/recommenders/pull/1398","id":884329895,"node_id":"MDExOlB1bGxSZXF1ZXN0NjM3NzIxMTAz","number":1398,"title":"Create azure-cg-pipelines.yml","user":{"login":"dciborow","id":9027725,"node_id":"MDQ6VXNlcjkwMjc3MjU=","avatar_url":"https://avatars.githubusercontent.com/u/9027725?v=4","gravatar_id":"","url":"https://api.github.com/users/dciborow","html_url":"https://github.com/dciborow","followers_url":"https://api.github.com/users/dciborow/followers","following_url":"https://api.github.com/users/dciborow/following{/other_user}","gists_url":"https://api.github.com/users/dciborow/gists{/gist_id}","starred_url":"https://api.github.com/users/dciborow/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dciborow/subscriptions","organizations_url":"https://api.github.com/users/dciborow/orgs","repos_url":"https://api.github.com/users/dciborow/repos","events_url":"https://api.github.com/users/dciborow/events{/privacy}","received_events_url":"https://api.github.com/users/dciborow/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-05-10T14:19:06Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"author_association":"COLLABORATOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/microsoft/recommenders/pulls/1398","html_url":"https://github.com/microsoft/recommenders/pull/1398","diff_url":"https://github.com/microsoft/recommenders/pull/1398.diff","patch_url":"https://github.com/microsoft/recommenders/pull/1398.patch"},"body":"### Description\r\n<!--- Describe your changes in detail -->\r\n<!--- Why is this change required? What problem does it solve? -->\r\n\r\n\r\n### Related Issues\r\n<!--- If it fixes an open issue, please link to the issue here. -->\r\n\r\n\r\n### Checklist:\r\n<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->\r\n<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->\r\n- [ ] I have followed the [contribution guidelines](../CONTRIBUTING.md) and code style for this project.\r\n- [ ] I have added tests covering my contributions.\r\n- [ ] I have updated the documentation accordingly.\r\n- [ ] This PR is being made to `staging branch` and not to `main branch`.\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/microsoft/recommenders/issues/comments/884018710","html_url":"https://github.com/microsoft/recommenders/pull/1398#issuecomment-884018710","issue_url":"https://api.github.com/repos/microsoft/recommenders/issues/1398","id":884018710,"node_id":"IC_kwDOCOgihc40sQ4W","user":{"login":"miguelgfierro","id":3491412,"node_id":"MDQ6VXNlcjM0OTE0MTI=","avatar_url":"https://avatars.githubusercontent.com/u/3491412?v=4","gravatar_id":"","url":"https://api.github.com/users/miguelgfierro","html_url":"https://github.com/miguelgfierro","followers_url":"https://api.github.com/users/miguelgfierro/followers","following_url":"https://api.github.com/users/miguelgfierro/following{/other_user}","gists_url":"https://api.github.com/users/miguelgfierro/gists{/gist_id}","starred_url":"https://api.github.com/users/miguelgfierro/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/miguelgfierro/subscriptions","organizations_url":"https://api.github.com/users/miguelgfierro/orgs","repos_url":"https://api.github.com/users/miguelgfierro/repos","events_url":"https://api.github.com/users/miguelgfierro/events{/privacy}","received_events_url":"https://api.github.com/users/miguelgfierro/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","author_association":"MEMBER","body":"@dciborow is this still needed?","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":6154722,"login":"microsoft","gravatar_id":"","url":"https://api.github.com/orgs/microsoft","avatar_url":"https://avatars.githubusercontent.com/u/6154722?"}}
+{"id":"17246339904","type":"PushEvent","actor":{"id":58833107,"login":"hrhwve3553","display_login":"hrhwve3553","gravatar_id":"","url":"https://api.github.com/users/hrhwve3553","avatar_url":"https://avatars.githubusercontent.com/u/58833107?"},"repo":{"id":227724995,"name":"hrhwve3553/djy","url":"https://api.github.com/repos/hrhwve3553/djy"},"payload":{"push_id":7562451298,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"0807a70faf7740d66bcea2d4b49051465acf24af","before":"31ac9a45007e5c34dc9d3375d6b31ce590c9ad50","commits":[{"sha":"0807a70faf7740d66bcea2d4b49051465acf24af","author":{"name":"hrhwve3553","email":"10135ac1af9bed4c0bec7c29db44050e24a097b2@users.noreply.github.com"},"message":"Update nscrw413.md","distinct":true,"url":"https://api.github.com/repos/hrhwve3553/djy/commits/0807a70faf7740d66bcea2d4b49051465acf24af"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339907","type":"IssueCommentEvent","actor":{"id":43336822,"login":"openjdk[bot]","display_login":"openjdk","gravatar_id":"","url":"https://api.github.com/users/openjdk[bot]","avatar_url":"https://avatars.githubusercontent.com/u/43336822?"},"repo":{"id":183030217,"name":"openjdk/jdk11u-dev","url":"https://api.github.com/repos/openjdk/jdk11u-dev"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/openjdk/jdk11u-dev/issues/147","repository_url":"https://api.github.com/repos/openjdk/jdk11u-dev","labels_url":"https://api.github.com/repos/openjdk/jdk11u-dev/issues/147/labels{/name}","comments_url":"https://api.github.com/repos/openjdk/jdk11u-dev/issues/147/comments","events_url":"https://api.github.com/repos/openjdk/jdk11u-dev/issues/147/events","html_url":"https://github.com/openjdk/jdk11u-dev/pull/147","id":948786370,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNTc3MDEz","number":147,"title":"8240983: Incorrect copyright header in Apache Santuario 2.1.3 files","user":{"login":"TheRealMDoerr","id":44297768,"node_id":"MDQ6VXNlcjQ0Mjk3NzY4","avatar_url":"https://avatars.githubusercontent.com/u/44297768?v=4","gravatar_id":"","url":"https://api.github.com/users/TheRealMDoerr","html_url":"https://github.com/TheRealMDoerr","followers_url":"https://api.github.com/users/TheRealMDoerr/followers","following_url":"https://api.github.com/users/TheRealMDoerr/following{/other_user}","gists_url":"https://api.github.com/users/TheRealMDoerr/gists{/gist_id}","starred_url":"https://api.github.com/users/TheRealMDoerr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TheRealMDoerr/subscriptions","organizations_url":"https://api.github.com/users/TheRealMDoerr/orgs","repos_url":"https://api.github.com/users/TheRealMDoerr/repos","events_url":"https://api.github.com/users/TheRealMDoerr/events{/privacy}","received_events_url":"https://api.github.com/users/TheRealMDoerr/received_events","type":"User","site_admin":false},"labels":[{"id":3050563200,"node_id":"MDU6TGFiZWwzMDUwNTYzMjAw","url":"https://api.github.com/repos/openjdk/jdk11u-dev/labels/backport","name":"backport","color":"ededed","default":false,"description":null},{"id":3053112164,"node_id":"MDU6TGFiZWwzMDUzMTEyMTY0","url":"https://api.github.com/repos/openjdk/jdk11u-dev/labels/clean","name":"clean","color":"ededed","default":false,"description":null},{"id":3052342185,"node_id":"MDU6TGFiZWwzMDUyMzQyMTg1","url":"https://api.github.com/repos/openjdk/jdk11u-dev/labels/ready","name":"ready","color":"23d900","default":false,"description":"Pull request is ready to be integrated"},{"id":3050564827,"node_id":"MDU6TGFiZWwzMDUwNTY0ODI3","url":"https://api.github.com/repos/openjdk/jdk11u-dev/labels/rfr","name":"rfr","color":"ff8400","default":false,"description":"Pull request is ready for review"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":6,"created_at":"2021-07-20T15:40:43Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/openjdk/jdk11u-dev/pulls/147","html_url":"https://github.com/openjdk/jdk11u-dev/pull/147","diff_url":"https://github.com/openjdk/jdk11u-dev/pull/147.diff","patch_url":"https://github.com/openjdk/jdk11u-dev/pull/147.patch"},"body":"Clean backport of JDK-8240983. Required for other changes to apply.\n\n<!-- Anything below this marker will be automatically updated, please do not edit manually! -->\n---------\n### Progress\n- [x] Change must not contain extraneous whitespace\n- [x] Commit message must refer to an issue\n\n### Issue\n * [JDK-8240983](https://bugs.openjdk.java.net/browse/JDK-8240983): Incorrect copyright header in Apache Santuario 2.1.3 files\n\n\n### Reviewing\n<details><summary>Using <code>git</code></summary>\n\nCheckout this PR locally: \\\n`$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/147/head:pull/147` \\\n`$ git checkout pull/147`\n\nUpdate a local copy of the PR: \\\n`$ git checkout pull/147` \\\n`$ git pull https://git.openjdk.java.net/jdk11u-dev pull/147/head`\n\n</details>\n<details><summary>Using Skara CLI tools</summary>\n\nCheckout this PR locally: \\\n`$ git pr checkout 147`\n\nView PR using the GUI difftool: \\\n`$ git pr show -t 147`\n\n</details>\n<details><summary>Using diff file</summary>\n\nDownload this PR as a diff file: \\\n<a href=\"https://git.openjdk.java.net/jdk11u-dev/pull/147.diff\">https://git.openjdk.java.net/jdk11u-dev/pull/147.diff</a>\n\n</details>\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/openjdk/jdk11u-dev/issues/comments/884018712","html_url":"https://github.com/openjdk/jdk11u-dev/pull/147#issuecomment-884018712","issue_url":"https://api.github.com/repos/openjdk/jdk11u-dev/issues/147","id":884018712,"node_id":"IC_kwDOCujRyc40sQ4Y","user":{"login":"openjdk[bot]","id":43336822,"node_id":"MDM6Qm90NDMzMzY4MjI=","avatar_url":"https://avatars.githubusercontent.com/u/41768318?v=4","gravatar_id":"","url":"https://api.github.com/users/openjdk%5Bbot%5D","html_url":"https://github.com/apps/openjdk","followers_url":"https://api.github.com/users/openjdk%5Bbot%5D/followers","following_url":"https://api.github.com/users/openjdk%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/openjdk%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/openjdk%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openjdk%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/openjdk%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/openjdk%5Bbot%5D/repos","events_url":"https://api.github.com/users/openjdk%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/openjdk%5Bbot%5D/received_events","type":"Bot","site_admin":false},"created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","author_association":"NONE","body":"<!-- prepush fd2ec8ad1124188b5f39005b098924f684132450 -->\nGoing to push as commit fd2ec8ad1124188b5f39005b098924f684132450.\nSince your change was applied there have been 2 commits pushed to the `master` branch:\n\n * 44ef6fef19531de102089ed21c8e6fe7b80cae03: 8236671: NullPointerException in JKS keystore\n * 240ef4496291ce25737f0012da260b834afdd37a: 8267042: bug in monitor locking/unlocking on ARM32 C1 due to uninitialized BasicObjectLock::_displaced_header\n\n\nYour commit was automatically rebased without conflicts.\n\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:02Z","org":{"id":41768318,"login":"openjdk","gravatar_id":"","url":"https://api.github.com/orgs/openjdk","avatar_url":"https://avatars.githubusercontent.com/u/41768318?"}}
+{"id":"17246339908","type":"PushEvent","actor":{"id":87330551,"login":"xz241","display_login":"xz241","gravatar_id":"","url":"https://api.github.com/users/xz241","avatar_url":"https://avatars.githubusercontent.com/u/87330551?"},"repo":{"id":385328687,"name":"xz241/wp-uploads","url":"https://api.github.com/repos/xz241/wp-uploads"},"payload":{"push_id":7562451330,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"d2ef866944436499cc87340aed2c248e5c5cf793","before":"94d80572a2b9faafef90bebf50c0c6fcdd4b91b8","commits":[{"sha":"d2ef866944436499cc87340aed2c248e5c5cf793","author":{"name":"xz241","email":"e17353502d0344fb9b4d10b6a471cc23c11850ec@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/xz241/wp-uploads/commits/d2ef866944436499cc87340aed2c248e5c5cf793"}]},"public":true,"created_at":"2021-07-21T09:00:02Z"}
+{"id":"17246339913","type":"PushEvent","actor":{"id":65212910,"login":"Hall-1910","display_login":"Hall-1910","gravatar_id":"","url":"https://api.github.com/users/Hall-1910","avatar_url":"https://avatars.githubusercontent.com/u/65212910?"},"repo":{"id":222505696,"name":"brand22/d3","url":"https://api.github.com/repos/brand22/d3"},"payload":{"push_id":7562451339,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"af741ccd65855d20fc1dbb2960ff8fe16621f450","before":"b0b6d64988c1bc1a407224e72ee2b703970d7ecc","commits":[{"sha":"af741ccd65855d20fc1dbb2960ff8fe16621f450","author":{"name":"Hall-1910","email":"82b2a317210219cb74c49a50f60ce4b4ef49066b@users.noreply.github.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/brand22/d3/commits/af741ccd65855d20fc1dbb2960ff8fe16621f450"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339914","type":"PushEvent","actor":{"id":18316027,"login":"xn3cr0nx","display_login":"xn3cr0nx","gravatar_id":"","url":"https://api.github.com/users/xn3cr0nx","avatar_url":"https://avatars.githubusercontent.com/u/18316027?"},"repo":{"id":368538085,"name":"elysiumbridge/email-service","url":"https://api.github.com/repos/elysiumbridge/email-service"},"payload":{"push_id":7562451338,"size":1,"distinct_size":1,"ref":"refs/heads/staging","head":"989142affe8674925af9c54c6d56c9ad28ac954e","before":"5da6510fd0b51e23becbc105f136573be396eb59","commits":[{"sha":"989142affe8674925af9c54c6d56c9ad28ac954e","author":{"name":"Patrick Jusic","email":"564961049dee2a941e65b77838bc1f9b60f0e5b6@gmail.com"},"message":"Implement auction offer email","distinct":true,"url":"https://api.github.com/repos/elysiumbridge/email-service/commits/989142affe8674925af9c54c6d56c9ad28ac954e"}]},"public":true,"created_at":"2021-07-21T09:00:03Z","org":{"id":83607158,"login":"elysiumbridge","gravatar_id":"","url":"https://api.github.com/orgs/elysiumbridge","avatar_url":"https://avatars.githubusercontent.com/u/83607158?"}}
+{"id":"17246339922","type":"PushEvent","actor":{"id":87753729,"login":"GabrielASC21","display_login":"GabrielASC21","gravatar_id":"","url":"https://api.github.com/users/GabrielASC21","avatar_url":"https://avatars.githubusercontent.com/u/87753729?"},"repo":{"id":388049279,"name":"GabrielASC21/myFirstRespository","url":"https://api.github.com/repos/GabrielASC21/myFirstRespository"},"payload":{"push_id":7562451321,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"7551bdc486660c117a0faa738c98554b0b440d53","before":"3e7f85565670b6a30d7b5219efeee708d108cf85","commits":[{"sha":"7551bdc486660c117a0faa738c98554b0b440d53","author":{"name":"GabrielASC21","email":"51c203f273118b7f0f2126b6ebe512537bafd420@gmail.com"},"message":"First commit","distinct":true,"url":"https://api.github.com/repos/GabrielASC21/myFirstRespository/commits/7551bdc486660c117a0faa738c98554b0b440d53"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339924","type":"PushEvent","actor":{"id":58833107,"login":"hrhwve3553","display_login":"hrhwve3553","gravatar_id":"","url":"https://api.github.com/users/hrhwve3553","avatar_url":"https://avatars.githubusercontent.com/u/58833107?"},"repo":{"id":227725053,"name":"hrhwve3553/ntdtv","url":"https://api.github.com/repos/hrhwve3553/ntdtv"},"payload":{"push_id":7562451336,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"dbad1d02038cecc3b7bb097d739f2d42b63994d8","before":"7a4554a96e3e4f8a92b3179615a8ae26af3fcfc5","commits":[{"sha":"dbad1d02038cecc3b7bb097d739f2d42b63994d8","author":{"name":"hrhwve3553","email":"10135ac1af9bed4c0bec7c29db44050e24a097b2@users.noreply.github.com"},"message":"Update culture-world_1.md","distinct":true,"url":"https://api.github.com/repos/hrhwve3553/ntdtv/commits/dbad1d02038cecc3b7bb097d739f2d42b63994d8"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339927","type":"CreateEvent","actor":{"id":85146151,"login":"Jey0205","display_login":"Jey0205","gravatar_id":"","url":"https://api.github.com/users/Jey0205","avatar_url":"https://avatars.githubusercontent.com/u/85146151?"},"repo":{"id":388056614,"name":"Jey0205/BreadJson","url":"https://api.github.com/repos/Jey0205/BreadJson"},"payload":{"ref":"main","ref_type":"branch","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339929","type":"PushEvent","actor":{"id":87743028,"login":"lukaromes895","display_login":"lukaromes895","gravatar_id":"","url":"https://api.github.com/users/lukaromes895","avatar_url":"https://avatars.githubusercontent.com/u/87743028?"},"repo":{"id":387979216,"name":"lukaromes895/verlng3","url":"https://api.github.com/repos/lukaromes895/verlng3"},"payload":{"push_id":7562451334,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"bcf7d3a89885f9ab3b3d77c576cb0194bcc3b0a7","before":"67a5c38fedd4b7f2e312ac1064e0daa32b3a57d7","commits":[{"sha":"bcf7d3a89885f9ab3b3d77c576cb0194bcc3b0a7","author":{"name":"O","email":"08a914cde05039694ef0194d9ee79ff9a79dde33@a.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/lukaromes895/verlng3/commits/bcf7d3a89885f9ab3b3d77c576cb0194bcc3b0a7"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339933","type":"PushEvent","actor":{"id":85441621,"login":"thatjohn01","display_login":"thatjohn01","gravatar_id":"","url":"https://api.github.com/users/thatjohn01","avatar_url":"https://avatars.githubusercontent.com/u/85441621?"},"repo":{"id":385329061,"name":"thatjohn01/753104284","url":"https://api.github.com/repos/thatjohn01/753104284"},"payload":{"push_id":7562451354,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"e5a712c43dd7da39f0e15cacce87e3f0c30631ee","before":"b59bb83346f2bdae15bca98990e7e101e938f800","commits":[{"sha":"e5a712c43dd7da39f0e15cacce87e3f0c30631ee","author":{"name":"thatjohn01","email":"72eb81e66410b3da65da4cca287ce0578825ce64@users.noreply.github.com"},"message":"change README.md","distinct":true,"url":"https://api.github.com/repos/thatjohn01/753104284/commits/e5a712c43dd7da39f0e15cacce87e3f0c30631ee"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339938","type":"PushEvent","actor":{"id":46065349,"login":"xhayper","display_login":"xhayper","gravatar_id":"","url":"https://api.github.com/users/xhayper","avatar_url":"https://avatars.githubusercontent.com/u/46065349?"},"repo":{"id":381891279,"name":"xhayper/Animator","url":"https://api.github.com/repos/xhayper/Animator"},"payload":{"push_id":7562451343,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"6243e063401e76a918219de22f243a0fd142e473","before":"d8ffc34451b18ddeb2fad88dcc21c5a89200fc96","commits":[{"sha":"6243e063401e76a918219de22f243a0fd142e473","author":{"name":"hayper","email":"ce1b58c20f3e4c517d1bfa5f0f98e207ce58b174@gmail.com"},"message":"a","distinct":true,"url":"https://api.github.com/repos/xhayper/Animator/commits/6243e063401e76a918219de22f243a0fd142e473"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339952","type":"PushEvent","actor":{"id":40921989,"login":"AdewaleAdeniji","display_login":"AdewaleAdeniji","gravatar_id":"","url":"https://api.github.com/users/AdewaleAdeniji","avatar_url":"https://avatars.githubusercontent.com/u/40921989?"},"repo":{"id":383033718,"name":"AdewaleAdeniji/phalconwise","url":"https://api.github.com/repos/AdewaleAdeniji/phalconwise"},"payload":{"push_id":7562451352,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"94c8410549b4731b41f683c50b628cb86ffa27b8","before":"924f7e787297ae45ce28eeba02cb33c600aa48aa","commits":[{"sha":"94c8410549b4731b41f683c50b628cb86ffa27b8","author":{"name":"Adeniji Oluwaferanmi","email":"14310bb6d5e60d4c33c4af4517b212c2fbb94f30@student.lautech.edu.ng"},"message":"commit","distinct":true,"url":"https://api.github.com/repos/AdewaleAdeniji/phalconwise/commits/94c8410549b4731b41f683c50b628cb86ffa27b8"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339953","type":"PushEvent","actor":{"id":42319300,"login":"thalals","display_login":"thalals","gravatar_id":"","url":"https://api.github.com/users/thalals","avatar_url":"https://avatars.githubusercontent.com/u/42319300?"},"repo":{"id":331019217,"name":"thalals/Algorithm_Study","url":"https://api.github.com/repos/thalals/Algorithm_Study"},"payload":{"push_id":7562451350,"size":17,"distinct_size":17,"ref":"refs/heads/main","head":"ceb29b8a84554b55edc0c4250f41761eb556ca6a","before":"cb4c3c05dc982ccf94d90f9ee6099cf1842a993b","commits":[{"sha":"8733b779d8b441f5a2d112ce052b6986aaeaffa1","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15649[해결]","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/8733b779d8b441f5a2d112ce052b6986aaeaffa1"},{"sha":"0755c70eedf1b6c12a25b70b934d9561458ddfc6","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15650(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/0755c70eedf1b6c12a25b70b934d9561458ddfc6"},{"sha":"53ccd1badc2f85cac549ffafb622c1366cf5690d","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15651(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/53ccd1badc2f85cac549ffafb622c1366cf5690d"},{"sha":"c4dd95a48908aa14e602a213c9ef3a0d9a014c07","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[UPD] BOJ15651(수정)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/c4dd95a48908aa14e602a213c9ef3a0d9a014c07"},{"sha":"7d66d5e2ce6811a14e89d4b155f9d6371ff4c13a","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15652(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/7d66d5e2ce6811a14e89d4b155f9d6371ff4c13a"},{"sha":"2e7da26646c6b17ee927daaa21c1480d392965f1","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[UPD] BOJ15652(수정)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/2e7da26646c6b17ee927daaa21c1480d392965f1"},{"sha":"4f9090e05d850f48cdafafba6a378ad73a50619b","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15654(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/4f9090e05d850f48cdafafba6a378ad73a50619b"},{"sha":"ee776f9f08539cfac46a04f8f4c27e211d1d01eb","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15655(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/ee776f9f08539cfac46a04f8f4c27e211d1d01eb"},{"sha":"d439a0396d6b2b4c51323a9cff9649fae6ecdea6","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15656(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/d439a0396d6b2b4c51323a9cff9649fae6ecdea6"},{"sha":"1c4d0dc0a29d8c085fdbeced402c1a1454ecf156","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15657(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/1c4d0dc0a29d8c085fdbeced402c1a1454ecf156"},{"sha":"f7f0bdd16df848f947835b866c61aa6cdcdc2a93","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15663(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/f7f0bdd16df848f947835b866c61aa6cdcdc2a93"},{"sha":"69279d6466789220ed8ca2de03bccdb2e0f67c3c","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15664(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/69279d6466789220ed8ca2de03bccdb2e0f67c3c"},{"sha":"65279ea9b20d8eeb8717a99970758603cc58fdbd","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15665(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/65279ea9b20d8eeb8717a99970758603cc58fdbd"},{"sha":"1c3ad6915ed47b98b1ab7b1e067e6cb36eaf4b8b","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ15666(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/1c3ad6915ed47b98b1ab7b1e067e6cb36eaf4b8b"},{"sha":"4710ea642c111d2fb4a4080ec5a87d53a7c04dd1","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ1182(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/4710ea642c111d2fb4a4080ec5a87d53a7c04dd1"},{"sha":"6bddc948f7a12cfa96dda55250c0a8b034864c1b","author":{"name":"Gun1Yun","email":"e9e18c820c59411cdbfb5a07fccd792d8b0bfb45@gmail.com"},"message":"[ADD] BOJ10971(해결)","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/6bddc948f7a12cfa96dda55250c0a8b034864c1b"},{"sha":"ceb29b8a84554b55edc0c4250f41761eb556ca6a","author":{"name":"Yun Geonil","email":"ac1688b8889497d5475a07ba16a0a8cc45fb660a@users.noreply.github.com"},"message":"Merge pull request #216 from Gun1Yun/geonil\n\nGeonil","distinct":true,"url":"https://api.github.com/repos/thalals/Algorithm_Study/commits/ceb29b8a84554b55edc0c4250f41761eb556ca6a"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339955","type":"PushEvent","actor":{"id":28945700,"login":"DX4D","display_login":"DX4D","gravatar_id":"","url":"https://api.github.com/users/DX4D","avatar_url":"https://avatars.githubusercontent.com/u/28945700?"},"repo":{"id":237986525,"name":"wovencode/OpenMMO","url":"https://api.github.com/repos/wovencode/OpenMMO"},"payload":{"push_id":7562451257,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"3efe348412815d3f1aa7fbc6c82dbfd90615c3d2","before":"8e61a08612f536319bdf0f81813819ad2f9d56ca","commits":[{"sha":"28b0b456990b1e71c7ee29d7bed6699d6b9e14bb","author":{"name":"Dave Mandrella","email":"2a887f95d0a6fa507c37ab1958e2a2e90b1f7323@gmail.com"},"message":"UPDATE MIRROR v43.3.1","distinct":true,"url":"https://api.github.com/repos/wovencode/OpenMMO/commits/28b0b456990b1e71c7ee29d7bed6699d6b9e14bb"},{"sha":"3efe348412815d3f1aa7fbc6c82dbfd90615c3d2","author":{"name":"Dave Mandrella","email":"2a887f95d0a6fa507c37ab1958e2a2e90b1f7323@gmail.com"},"message":"FIX: MIRROR UPDATE","distinct":true,"url":"https://api.github.com/repos/wovencode/OpenMMO/commits/3efe348412815d3f1aa7fbc6c82dbfd90615c3d2"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339957","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7562451348,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9d8a22e0234d4a85de68a32e7861ffa610d57edd","before":"b6cb047bb302033ffc190e6274c47cd04a5b7f0d","commits":[{"sha":"9d8a22e0234d4a85de68a32e7861ffa610d57edd","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/9d8a22e0234d4a85de68a32e7861ffa610d57edd"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339976","type":"PushEvent","actor":{"id":1317792,"login":"xndcn","display_login":"xndcn","gravatar_id":"","url":"https://api.github.com/users/xndcn","avatar_url":"https://avatars.githubusercontent.com/u/1317792?"},"repo":{"id":10446275,"name":"xndcn/smzdm.com","url":"https://api.github.com/repos/xndcn/smzdm.com"},"payload":{"push_id":7562451358,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"74e538a609d77e731fb68444527a6e1f65cfbccb","before":"d45dc2953c0fd3e41da64373b3674c1d95b1ed98","commits":[{"sha":"74e538a609d77e731fb68444527a6e1f65cfbccb","author":{"name":"xndcn","email":"1e09e78f2250d149e0e983feae098f2c71429797@gmail.com"},"message":"30 items update","distinct":true,"url":"https://api.github.com/repos/xndcn/smzdm.com/commits/74e538a609d77e731fb68444527a6e1f65cfbccb"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339977","type":"IssuesEvent","actor":{"id":19289477,"login":"EmilJunker","display_login":"EmilJunker","gravatar_id":"","url":"https://api.github.com/users/EmilJunker","avatar_url":"https://avatars.githubusercontent.com/u/19289477?"},"repo":{"id":132147328,"name":"davidhealey/waistline","url":"https://api.github.com/repos/davidhealey/waistline"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/davidhealey/waistline/issues/269","repository_url":"https://api.github.com/repos/davidhealey/waistline","labels_url":"https://api.github.com/repos/davidhealey/waistline/issues/269/labels{/name}","comments_url":"https://api.github.com/repos/davidhealey/waistline/issues/269/comments","events_url":"https://api.github.com/repos/davidhealey/waistline/issues/269/events","html_url":"https://github.com/davidhealey/waistline/issues/269","id":949486862,"node_id":"MDU6SXNzdWU5NDk0ODY4NjI=","number":269,"title":"USDA API link not working","user":{"login":"EmilJunker","id":19289477,"node_id":"MDQ6VXNlcjE5Mjg5NDc3","avatar_url":"https://avatars.githubusercontent.com/u/19289477?v=4","gravatar_id":"","url":"https://api.github.com/users/EmilJunker","html_url":"https://github.com/EmilJunker","followers_url":"https://api.github.com/users/EmilJunker/followers","following_url":"https://api.github.com/users/EmilJunker/following{/other_user}","gists_url":"https://api.github.com/users/EmilJunker/gists{/gist_id}","starred_url":"https://api.github.com/users/EmilJunker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/EmilJunker/subscriptions","organizations_url":"https://api.github.com/users/EmilJunker/orgs","repos_url":"https://api.github.com/users/EmilJunker/repos","events_url":"https://api.github.com/users/EmilJunker/events{/privacy}","received_events_url":"https://api.github.com/users/EmilJunker/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:02Z","closed_at":null,"author_association":"NONE","active_lock_reason":null,"body":"On the USDA API settings page, it says \"You can request a free API Key by clicking _here_\" but nothing happens when I tap on the link.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339990","type":"CreateEvent","actor":{"id":80450565,"login":"Tanvisingh10","display_login":"Tanvisingh10","gravatar_id":"","url":"https://api.github.com/users/Tanvisingh10","avatar_url":"https://avatars.githubusercontent.com/u/80450565?"},"repo":{"id":388056968,"name":"Tanvisingh10/Project-84","url":"https://api.github.com/repos/Tanvisingh10/Project-84"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339995","type":"PushEvent","actor":{"id":87714900,"login":"Luissprof","display_login":"Luissprof","gravatar_id":"","url":"https://api.github.com/users/Luissprof","avatar_url":"https://avatars.githubusercontent.com/u/87714900?"},"repo":{"id":387857059,"name":"Luissprof/reposit-riodetestes","url":"https://api.github.com/repos/Luissprof/reposit-riodetestes"},"payload":{"push_id":7562451383,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"d669f56382ec09cf1f0e3dbfe6994515c4defcfb","before":"c2bd4bd2ccd354e5bc985bc234cec6e97d8aaf4b","commits":[{"sha":"d669f56382ec09cf1f0e3dbfe6994515c4defcfb","author":{"name":"Luís Filipe Santos","email":"300efc7396c1b017e7a510eafe43d3043fa92d06@criticaltechworks.com"},"message":"teste1","distinct":true,"url":"https://api.github.com/repos/Luissprof/reposit-riodetestes/commits/d669f56382ec09cf1f0e3dbfe6994515c4defcfb"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340002","type":"PushEvent","actor":{"id":16854166,"login":"juli9797","display_login":"juli9797","gravatar_id":"","url":"https://api.github.com/users/juli9797","avatar_url":"https://avatars.githubusercontent.com/u/16854166?"},"repo":{"id":387826926,"name":"juli9797/despace","url":"https://api.github.com/repos/juli9797/despace"},"payload":{"push_id":7562451364,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"e31671398e4b0acb693288c8a1fe8f090254e0a5","before":"a1250cc47cf289db73c56d3c28ab1e94190cf1d0","commits":[{"sha":"e31671398e4b0acb693288c8a1fe8f090254e0a5","author":{"name":"julian","email":"4b7893977a90fdb0a95ca7f0ee78f262e522f6a6@gmail.com"},"message":"switched to std::filesystem::rename)","distinct":true,"url":"https://api.github.com/repos/juli9797/despace/commits/e31671398e4b0acb693288c8a1fe8f090254e0a5"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340018","type":"IssuesEvent","actor":{"id":48132025,"login":"progress-git-user","display_login":"progress-git-user","gravatar_id":"","url":"https://api.github.com/users/progress-git-user","avatar_url":"https://avatars.githubusercontent.com/u/48132025?"},"repo":{"id":174307044,"name":"support-ops/sit-repo","url":"https://api.github.com/repos/support-ops/sit-repo"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/support-ops/sit-repo/issues/55296","repository_url":"https://api.github.com/repos/support-ops/sit-repo","labels_url":"https://api.github.com/repos/support-ops/sit-repo/issues/55296/labels{/name}","comments_url":"https://api.github.com/repos/support-ops/sit-repo/issues/55296/comments","events_url":"https://api.github.com/repos/support-ops/sit-repo/issues/55296/events","html_url":"https://github.com/support-ops/sit-repo/issues/55296","id":949486861,"node_id":"MDU6SXNzdWU5NDk0ODY4NjE=","number":55296,"title":"Public Thread 81a33935-791a-441c-8d22-70c438d6f679","user":{"login":"progress-git-user","id":48132025,"node_id":"MDQ6VXNlcjQ4MTMyMDI1","avatar_url":"https://avatars.githubusercontent.com/u/48132025?v=4","gravatar_id":"","url":"https://api.github.com/users/progress-git-user","html_url":"https://github.com/progress-git-user","followers_url":"https://api.github.com/users/progress-git-user/followers","following_url":"https://api.github.com/users/progress-git-user/following{/other_user}","gists_url":"https://api.github.com/users/progress-git-user/gists{/gist_id}","starred_url":"https://api.github.com/users/progress-git-user/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progress-git-user/subscriptions","organizations_url":"https://api.github.com/users/progress-git-user/orgs","repos_url":"https://api.github.com/users/progress-git-user/repos","events_url":"https://api.github.com/users/progress-git-user/events{/privacy}","received_events_url":"https://api.github.com/users/progress-git-user/received_events","type":"User","site_admin":false},"labels":[{"id":1310856078,"node_id":"MDU6TGFiZWwxMzEwODU2MDc4","url":"https://api.github.com/repos/support-ops/sit-repo/labels/FP:%20Pending%20Review","name":"FP: Pending Review","color":"ededed","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T09:00:02Z","updated_at":"2021-07-21T09:00:03Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"body":"Message 75208471-4231-4f0d-bfdf-9591cdeeb249","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:03Z","org":{"id":48132131,"login":"support-ops","gravatar_id":"","url":"https://api.github.com/orgs/support-ops","avatar_url":"https://avatars.githubusercontent.com/u/48132131?"}}
+{"id":"17246340035","type":"PushEvent","actor":{"id":28395786,"login":"leisure1211","display_login":"leisure1211","gravatar_id":"","url":"https://api.github.com/users/leisure1211","avatar_url":"https://avatars.githubusercontent.com/u/28395786?"},"repo":{"id":276402235,"name":"leisure1211/leaf","url":"https://api.github.com/repos/leisure1211/leaf"},"payload":{"push_id":7562451384,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"0cd7a4053b5de34ecb41989d2be5115d6b7a3f2d","before":"3cb65c6958ef1e7e8c1124b4c3c50394d1801ea1","commits":[{"sha":"0cd7a4053b5de34ecb41989d2be5115d6b7a3f2d","author":{"name":"leisure1211","email":"37c4dd09a77d3ad4dd46b41239997ef191795160@qq.com"},"message":"Upload by PicGo","distinct":true,"url":"https://api.github.com/repos/leisure1211/leaf/commits/0cd7a4053b5de34ecb41989d2be5115d6b7a3f2d"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340041","type":"PushEvent","actor":{"id":1122618,"login":"AndyLnd","display_login":"AndyLnd","gravatar_id":"","url":"https://api.github.com/users/AndyLnd","avatar_url":"https://avatars.githubusercontent.com/u/1122618?"},"repo":{"id":63881328,"name":"wireapp/wire-webapp","url":"https://api.github.com/repos/wireapp/wire-webapp"},"payload":{"push_id":7562451373,"size":1,"distinct_size":1,"ref":"refs/heads/runfix/reactive-cell-state","head":"181e796a28c9ff84ac335885ad2d4f419272d1c0","before":"690fa434169d97a3b72ba3afedd71b0def2d82bb","commits":[{"sha":"181e796a28c9ff84ac335885ad2d4f419272d1c0","author":{"name":"AndyLnd","email":"e3579b1e47f273529f0f929453e939a68ede9fd1@wire.com"},"message":"remove conversation dependency","distinct":true,"url":"https://api.github.com/repos/wireapp/wire-webapp/commits/181e796a28c9ff84ac335885ad2d4f419272d1c0"}]},"public":true,"created_at":"2021-07-21T09:00:03Z","org":{"id":16047324,"login":"wireapp","gravatar_id":"","url":"https://api.github.com/orgs/wireapp","avatar_url":"https://avatars.githubusercontent.com/u/16047324?"}}
+{"id":"17246340055","type":"PushEvent","actor":{"id":87330551,"login":"xz241","display_login":"xz241","gravatar_id":"","url":"https://api.github.com/users/xz241","avatar_url":"https://avatars.githubusercontent.com/u/87330551?"},"repo":{"id":385328687,"name":"xz241/wp-uploads","url":"https://api.github.com/repos/xz241/wp-uploads"},"payload":{"push_id":7562451389,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"2a09914ed7c072ee60c61bdaf9e023625cef6b19","before":"d2ef866944436499cc87340aed2c248e5c5cf793","commits":[{"sha":"2a09914ed7c072ee60c61bdaf9e023625cef6b19","author":{"name":"xz241","email":"e17353502d0344fb9b4d10b6a471cc23c11850ec@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/xz241/wp-uploads/commits/2a09914ed7c072ee60c61bdaf9e023625cef6b19"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340058","type":"PushEvent","actor":{"id":87752113,"login":"nidscb","display_login":"nidscb","gravatar_id":"","url":"https://api.github.com/users/nidscb","avatar_url":"https://avatars.githubusercontent.com/u/87752113?"},"repo":{"id":388036549,"name":"iamgique/git-working","url":"https://api.github.com/repos/iamgique/git-working"},"payload":{"push_id":7562451392,"size":7,"distinct_size":7,"ref":"refs/heads/main","head":"a0c473980aa8c1922285791336bfa36e45ee9fcf","before":"efb495fa4eacb63c7a07089cea5bf2f89d0d15e4","commits":[{"sha":"ff1302e86974440e99ca4eab2927a08a52a8675b","author":{"name":"NuNid Ja","email":"35e81bf38bacc2ba4f40dbe5d23f534be8fa699e@scb.co.th"},"message":"add","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/ff1302e86974440e99ca4eab2927a08a52a8675b"},{"sha":"48bc0372b47373e1ac808f3283fdcddd2f82704b","author":{"name":"NATCHANUN WANGBOON","email":"e9b56d831f8a83c79c3c257084b666e5882dc819@scbcorp.co.th"},"message":"add Natchanun.c","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/48bc0372b47373e1ac808f3283fdcddd2f82704b"},{"sha":"8023e67468cc7417cff39b6f2a096a8cb05a5380","author":{"name":"NuNid Ja","email":"35e81bf38bacc2ba4f40dbe5d23f534be8fa699e@scb.co.th"},"message":"Merge https://github.com/iamgique/git-working into main","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/8023e67468cc7417cff39b6f2a096a8cb05a5380"},{"sha":"4d5804f80ffbe79245e49f7660cb0e8928c1dd6b","author":{"name":"NATCHANUN WANGBOON","email":"e9b56d831f8a83c79c3c257084b666e5882dc819@scbcorp.co.th"},"message":"Merge branch 'main' of https://github.com/iamgique/git-working into main","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/4d5804f80ffbe79245e49f7660cb0e8928c1dd6b"},{"sha":"754bd6980895612e108ece27199110a82d04553d","author":{"name":"NuNid Ja","email":"35e81bf38bacc2ba4f40dbe5d23f534be8fa699e@scb.co.th"},"message":"Merge https://github.com/iamgique/git-working into main","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/754bd6980895612e108ece27199110a82d04553d"},{"sha":"a5f89277f2553404812a945113dd46fac3ba5e15","author":{"name":"NuNid Ja","email":"35e81bf38bacc2ba4f40dbe5d23f534be8fa699e@scb.co.th"},"message":"nid","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/a5f89277f2553404812a945113dd46fac3ba5e15"},{"sha":"a0c473980aa8c1922285791336bfa36e45ee9fcf","author":{"name":"NuNid Ja","email":"35e81bf38bacc2ba4f40dbe5d23f534be8fa699e@scb.co.th"},"message":"Merge https://github.com/iamgique/git-working into main","distinct":true,"url":"https://api.github.com/repos/iamgique/git-working/commits/a0c473980aa8c1922285791336bfa36e45ee9fcf"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340069","type":"PushEvent","actor":{"id":82069321,"login":"HoRay86","display_login":"HoRay86","gravatar_id":"","url":"https://api.github.com/users/HoRay86","avatar_url":"https://avatars.githubusercontent.com/u/82069321?"},"repo":{"id":355380005,"name":"HoRay86/HoRay1.github.io","url":"https://api.github.com/repos/HoRay86/HoRay1.github.io"},"payload":{"push_id":7562451395,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"eee9ef47fe8ed2f3f4cb2bb5e5f7bb096f34728f","before":"dcaadaa8d91fa7091382d09a06d626848fbbad33","commits":[{"sha":"eee9ef47fe8ed2f3f4cb2bb5e5f7bb096f34728f","author":{"name":"HoRay86","email":"87acc6f87c5c2eb827b87e4817dcb9351db1ba61@users.noreply.github.com"},"message":"img更新","distinct":true,"url":"https://api.github.com/repos/HoRay86/HoRay1.github.io/commits/eee9ef47fe8ed2f3f4cb2bb5e5f7bb096f34728f"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340083","type":"PushEvent","actor":{"id":2687598,"login":"milesholt","display_login":"milesholt","gravatar_id":"","url":"https://api.github.com/users/milesholt","avatar_url":"https://avatars.githubusercontent.com/u/2687598?"},"repo":{"id":247480564,"name":"milesholt/autotrade1","url":"https://api.github.com/repos/milesholt/autotrade1"},"payload":{"push_id":7562451400,"size":1,"distinct_size":1,"ref":"refs/heads/version2","head":"fc70cfabd89fd6d77de8114666499d964eea668f","before":"4523c94960849d711badb2877a5d273c11ef90f5","commits":[{"sha":"fc70cfabd89fd6d77de8114666499d964eea668f","author":{"name":"milesholt","email":"1a73af9e7ae00182733b2292511b814be66f065f@milesholt.co.uk"},"message":"File updated - July 21, 2021 10:00 AM","distinct":true,"url":"https://api.github.com/repos/milesholt/autotrade1/commits/fc70cfabd89fd6d77de8114666499d964eea668f"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340085","type":"IssueCommentEvent","actor":{"id":6266037,"login":"Findus23","display_login":"Findus23","gravatar_id":"","url":"https://api.github.com/users/Findus23","avatar_url":"https://avatars.githubusercontent.com/u/6266037?"},"repo":{"id":1548202,"name":"matomo-org/matomo","url":"https://api.github.com/repos/matomo-org/matomo"},"payload":{"action":"created","issue":{"url":"https://api.github.com/repos/matomo-org/matomo/issues/17798","repository_url":"https://api.github.com/repos/matomo-org/matomo","labels_url":"https://api.github.com/repos/matomo-org/matomo/issues/17798/labels{/name}","comments_url":"https://api.github.com/repos/matomo-org/matomo/issues/17798/comments","events_url":"https://api.github.com/repos/matomo-org/matomo/issues/17798/events","html_url":"https://github.com/matomo-org/matomo/pull/17798","id":948212798,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzMDg0MzI1","number":17798,"title":"Set CSP header to prevent XSS","user":{"login":"justinvelluppillai","id":1127121,"node_id":"MDQ6VXNlcjExMjcxMjE=","avatar_url":"https://avatars.githubusercontent.com/u/1127121?v=4","gravatar_id":"","url":"https://api.github.com/users/justinvelluppillai","html_url":"https://github.com/justinvelluppillai","followers_url":"https://api.github.com/users/justinvelluppillai/followers","following_url":"https://api.github.com/users/justinvelluppillai/following{/other_user}","gists_url":"https://api.github.com/users/justinvelluppillai/gists{/gist_id}","starred_url":"https://api.github.com/users/justinvelluppillai/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/justinvelluppillai/subscriptions","organizations_url":"https://api.github.com/users/justinvelluppillai/orgs","repos_url":"https://api.github.com/users/justinvelluppillai/repos","events_url":"https://api.github.com/users/justinvelluppillai/events{/privacy}","received_events_url":"https://api.github.com/users/justinvelluppillai/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2021-07-20T03:26:02Z","updated_at":"2021-07-21T09:00:03Z","closed_at":null,"author_association":"CONTRIBUTOR","active_lock_reason":null,"pull_request":{"url":"https://api.github.com/repos/matomo-org/matomo/pulls/17798","html_url":"https://github.com/matomo-org/matomo/pull/17798","diff_url":"https://github.com/matomo-org/matomo/pull/17798.diff","patch_url":"https://github.com/matomo-org/matomo/pull/17798.patch"},"body":"### Description:\r\n\r\nFixes #17773 by setting a Content-Security-Policy which is fairly loose at this stage.\r\n\r\n### Review\r\n\r\n* [ ] Functional review done\r\n* [ ] Potential edge cases thought about (behavior of the code with strange input, with strange internal state or possible interactions with other Matomo subsystems)\r\n* [ ] Usability review done (is anything maybe unclear or think about anything that would cause people to reach out to support)\r\n* [ ] Security review done [see checklist](https://developer.matomo.org/guides/security-in-piwik#checklist)\r\n* [ ] Code review done\r\n* [ ] Tests were added if useful/possible\r\n* [ ] Reviewed for breaking changes\r\n* [ ] Developer changelog updated if needed\r\n* [ ] Documentation added if needed\r\n* [ ] Existing documentation updated if needed\r\n","performed_via_github_app":null},"comment":{"url":"https://api.github.com/repos/matomo-org/matomo/issues/comments/884018722","html_url":"https://github.com/matomo-org/matomo/pull/17798#issuecomment-884018722","issue_url":"https://api.github.com/repos/matomo-org/matomo/issues/17798","id":884018722,"node_id":"IC_kwDOABefqs40sQ4i","user":{"login":"Findus23","id":6266037,"node_id":"MDQ6VXNlcjYyNjYwMzc=","avatar_url":"https://avatars.githubusercontent.com/u/6266037?v=4","gravatar_id":"","url":"https://api.github.com/users/Findus23","html_url":"https://github.com/Findus23","followers_url":"https://api.github.com/users/Findus23/followers","following_url":"https://api.github.com/users/Findus23/following{/other_user}","gists_url":"https://api.github.com/users/Findus23/gists{/gist_id}","starred_url":"https://api.github.com/users/Findus23/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Findus23/subscriptions","organizations_url":"https://api.github.com/users/Findus23/orgs","repos_url":"https://api.github.com/users/Findus23/repos","events_url":"https://api.github.com/users/Findus23/events{/privacy}","received_events_url":"https://api.github.com/users/Findus23/received_events","type":"User","site_admin":false},"created_at":"2021-07-21T09:00:03Z","updated_at":"2021-07-21T09:00:03Z","author_association":"MEMBER","body":"I think we should only be using `Content-Security-Policy-Report-Only` for at least one or two releases as I'm sure there are a lot of people with weird setups where the CSP will break in fascinating ways. \r\nI still think it is worth creating a secure one for Matomo as it will make Matomo a lot more secure, but also provide an option to fall back to Report-Only or disable it, for setups where using one is not possible.","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:03Z","org":{"id":698038,"login":"matomo-org","gravatar_id":"","url":"https://api.github.com/orgs/matomo-org","avatar_url":"https://avatars.githubusercontent.com/u/698038?"}}
+{"id":"17246340086","type":"PullRequestReviewEvent","actor":{"id":13147834,"login":"YajB","display_login":"YajB","gravatar_id":"","url":"https://api.github.com/users/YajB","avatar_url":"https://avatars.githubusercontent.com/u/13147834?"},"repo":{"id":135286803,"name":"logzio/logz-docs","url":"https://api.github.com/repos/logzio/logz-docs"},"payload":{"action":"created","review":{"id":711422105,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDIyMTA1","user":{"login":"YajB","id":13147834,"node_id":"MDQ6VXNlcjEzMTQ3ODM0","avatar_url":"https://avatars.githubusercontent.com/u/13147834?v=4","gravatar_id":"","url":"https://api.github.com/users/YajB","html_url":"https://github.com/YajB","followers_url":"https://api.github.com/users/YajB/followers","following_url":"https://api.github.com/users/YajB/following{/other_user}","gists_url":"https://api.github.com/users/YajB/gists{/gist_id}","starred_url":"https://api.github.com/users/YajB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/YajB/subscriptions","organizations_url":"https://api.github.com/users/YajB/orgs","repos_url":"https://api.github.com/users/YajB/repos","events_url":"https://api.github.com/users/YajB/events{/privacy}","received_events_url":"https://api.github.com/users/YajB/received_events","type":"User","site_admin":false},"body":"Recommendations:\r\n-  Where order matters, number the substeps in each procedure section for clearer user flow.  \r\n- \"The following screen will appear:\"  Change to present tense : \r\n\"The following screen appears\" or \r\n\"...is displayed\" \r\n or, \r\n> In the following screen: \r\n> 1.\r\n> 2.\r\n> 3.\r\n\r\n- In step 4  **Install the extension**, telling a user to \"wait until...\" is potentially anxiety-inducing and may raise the question of \"how long?\" - \r\n\r\nConsider: \r\n\"Select Install: You will be redirected to the **Installed extensions** page.\"\r\n\r\n- In step 5: \"...confirm that you authorize this extension.\"  or \"...confirm the action.\" \r\n\r\n- In step 6: \"Upon authorizing the extension, you will be taken to the Logs Export page. Here you can see the events that are exported to Logz.io\". \r\n\r\nConsider \r\n\" On authorizing the extension, the Logs Export page opens, where you view (or see)....\"\r\n Or\r\n \"After you authorize the extension, you are directed to the **Logs Export** page...","commit_id":"1bf31508c3a89241a54730a0e8c72300f997dbef","submitted_at":"2021-07-21T09:00:03Z","state":"commented","html_url":"https://github.com/logzio/logz-docs/pull/1196#pullrequestreview-711422105","pull_request_url":"https://api.github.com/repos/logzio/logz-docs/pulls/1196","author_association":"COLLABORATOR","_links":{"html":{"href":"https://github.com/logzio/logz-docs/pull/1196#pullrequestreview-711422105"},"pull_request":{"href":"https://api.github.com/repos/logzio/logz-docs/pulls/1196"}}},"pull_request":{"url":"https://api.github.com/repos/logzio/logz-docs/pulls/1196","id":687364705,"node_id":"MDExOlB1bGxSZXF1ZXN0Njg3MzY0NzA1","html_url":"https://github.com/logzio/logz-docs/pull/1196","diff_url":"https://github.com/logzio/logz-docs/pull/1196.diff","patch_url":"https://github.com/logzio/logz-docs/pull/1196.patch","issue_url":"https://api.github.com/repos/logzio/logz-docs/issues/1196","number":1196,"state":"open","locked":false,"title":"DOC-58: Added auth0 integration","user":{"login":"nico-shishkin","id":86240618,"node_id":"MDQ6VXNlcjg2MjQwNjE4","avatar_url":"https://avatars.githubusercontent.com/u/86240618?v=4","gravatar_id":"","url":"https://api.github.com/users/nico-shishkin","html_url":"https://github.com/nico-shishkin","followers_url":"https://api.github.com/users/nico-shishkin/followers","following_url":"https://api.github.com/users/nico-shishkin/following{/other_user}","gists_url":"https://api.github.com/users/nico-shishkin/gists{/gist_id}","starred_url":"https://api.github.com/users/nico-shishkin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nico-shishkin/subscriptions","organizations_url":"https://api.github.com/users/nico-shishkin/orgs","repos_url":"https://api.github.com/users/nico-shishkin/repos","events_url":"https://api.github.com/users/nico-shishkin/events{/privacy}","received_events_url":"https://api.github.com/users/nico-shishkin/received_events","type":"User","site_admin":false},"body":"# What changed\r\n\r\nAdded:\r\n\r\nhttps://deploy-preview-1196--logz-docs.netlify.app/shipping/security-sources/auth0.html\r\n\r\nhttps://app.logz.io/#/dashboard/send-your-data/security-sources/auth0?deployPreviewNumber=1196\r\n\r\n----\r\n\r\n<!-- ⬆︎⬆︎⬆︎⬆︎⬆︎⬆︎ Just let us know what you changed at the top of the template. ⬆︎⬆︎⬆︎⬆︎⬆︎⬆︎\r\nThe docs team can take care of everything below this line. -->\r\n\r\n## Pages to review\r\n\r\n<!-- Don't remove this section. If you don't fill it out, the docs team can still use it -->\r\n<!-- After the build, paste URLs with the pages affected by this revision -->\r\n- LinkToPage1\r\n- LinkToPage2\r\n\r\n## Remaining work\r\n\r\n<!-- List any outstanding work here -->\r\n- [ ] Technical review\r\n- [ ] Copy Review\r\n- [ ] Redirects: <!-- Give a list of redirects. Provide old URL and new URL. -->\r\n\r\n## Post launch\r\n\r\nTo be completed by the docs team upon merge:\r\n\r\n- [ ] Teams to update with the new information:\r\n- [ ] Replace original content on the support portal with 'this page has been moved to ...' - paste the URL\r\n- [ ] Update these log shipping pages in the app: - paste the URL\r\n","created_at":"2021-07-11T16:50:55Z","updated_at":"2021-07-21T09:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c20141ea89bd9b58539cbc6c8feac28e7314e9eb","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/logzio/logz-docs/pulls/1196/commits","review_comments_url":"https://api.github.com/repos/logzio/logz-docs/pulls/1196/comments","review_comment_url":"https://api.github.com/repos/logzio/logz-docs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/logzio/logz-docs/issues/1196/comments","statuses_url":"https://api.github.com/repos/logzio/logz-docs/statuses/1bf31508c3a89241a54730a0e8c72300f997dbef","head":{"label":"logzio:auth0","ref":"auth0","sha":"1bf31508c3a89241a54730a0e8c72300f997dbef","user":{"login":"logzio","id":7902073,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc5MDIwNzM=","avatar_url":"https://avatars.githubusercontent.com/u/7902073?v=4","gravatar_id":"","url":"https://api.github.com/users/logzio","html_url":"https://github.com/logzio","followers_url":"https://api.github.com/users/logzio/followers","following_url":"https://api.github.com/users/logzio/following{/other_user}","gists_url":"https://api.github.com/users/logzio/gists{/gist_id}","starred_url":"https://api.github.com/users/logzio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/logzio/subscriptions","organizations_url":"https://api.github.com/users/logzio/orgs","repos_url":"https://api.github.com/users/logzio/repos","events_url":"https://api.github.com/users/logzio/events{/privacy}","received_events_url":"https://api.github.com/users/logzio/received_events","type":"Organization","site_admin":false},"repo":{"id":135286803,"node_id":"MDEwOlJlcG9zaXRvcnkxMzUyODY4MDM=","name":"logz-docs","full_name":"logzio/logz-docs","private":false,"owner":{"login":"logzio","id":7902073,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc5MDIwNzM=","avatar_url":"https://avatars.githubusercontent.com/u/7902073?v=4","gravatar_id":"","url":"https://api.github.com/users/logzio","html_url":"https://github.com/logzio","followers_url":"https://api.github.com/users/logzio/followers","following_url":"https://api.github.com/users/logzio/following{/other_user}","gists_url":"https://api.github.com/users/logzio/gists{/gist_id}","starred_url":"https://api.github.com/users/logzio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/logzio/subscriptions","organizations_url":"https://api.github.com/users/logzio/orgs","repos_url":"https://api.github.com/users/logzio/repos","events_url":"https://api.github.com/users/logzio/events{/privacy}","received_events_url":"https://api.github.com/users/logzio/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/logzio/logz-docs","description":"Logz.io user documentation","fork":false,"url":"https://api.github.com/repos/logzio/logz-docs","forks_url":"https://api.github.com/repos/logzio/logz-docs/forks","keys_url":"https://api.github.com/repos/logzio/logz-docs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/logzio/logz-docs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/logzio/logz-docs/teams","hooks_url":"https://api.github.com/repos/logzio/logz-docs/hooks","issue_events_url":"https://api.github.com/repos/logzio/logz-docs/issues/events{/number}","events_url":"https://api.github.com/repos/logzio/logz-docs/events","assignees_url":"https://api.github.com/repos/logzio/logz-docs/assignees{/user}","branches_url":"https://api.github.com/repos/logzio/logz-docs/branches{/branch}","tags_url":"https://api.github.com/repos/logzio/logz-docs/tags","blobs_url":"https://api.github.com/repos/logzio/logz-docs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/logzio/logz-docs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/logzio/logz-docs/git/refs{/sha}","trees_url":"https://api.github.com/repos/logzio/logz-docs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/logzio/logz-docs/statuses/{sha}","languages_url":"https://api.github.com/repos/logzio/logz-docs/languages","stargazers_url":"https://api.github.com/repos/logzio/logz-docs/stargazers","contributors_url":"https://api.github.com/repos/logzio/logz-docs/contributors","subscribers_url":"https://api.github.com/repos/logzio/logz-docs/subscribers","subscription_url":"https://api.github.com/repos/logzio/logz-docs/subscription","commits_url":"https://api.github.com/repos/logzio/logz-docs/commits{/sha}","git_commits_url":"https://api.github.com/repos/logzio/logz-docs/git/commits{/sha}","comments_url":"https://api.github.com/repos/logzio/logz-docs/comments{/number}","issue_comment_url":"https://api.github.com/repos/logzio/logz-docs/issues/comments{/number}","contents_url":"https://api.github.com/repos/logzio/logz-docs/contents/{+path}","compare_url":"https://api.github.com/repos/logzio/logz-docs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/logzio/logz-docs/merges","archive_url":"https://api.github.com/repos/logzio/logz-docs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/logzio/logz-docs/downloads","issues_url":"https://api.github.com/repos/logzio/logz-docs/issues{/number}","pulls_url":"https://api.github.com/repos/logzio/logz-docs/pulls{/number}","milestones_url":"https://api.github.com/repos/logzio/logz-docs/milestones{/number}","notifications_url":"https://api.github.com/repos/logzio/logz-docs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/logzio/logz-docs/labels{/name}","releases_url":"https://api.github.com/repos/logzio/logz-docs/releases{/id}","deployments_url":"https://api.github.com/repos/logzio/logz-docs/deployments","created_at":"2018-05-29T11:35:46Z","updated_at":"2021-07-20T15:00:29Z","pushed_at":"2021-07-21T08:39:42Z","git_url":"git://github.com/logzio/logz-docs.git","ssh_url":"git@github.com:logzio/logz-docs.git","clone_url":"https://github.com/logzio/logz-docs.git","svn_url":"https://github.com/logzio/logz-docs","homepage":"https://docs.logz.io","size":19711,"stargazers_count":11,"watchers_count":11,"language":"JavaScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":28,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":60,"license":null,"forks":28,"open_issues":60,"watchers":11,"default_branch":"master"}},"base":{"label":"logzio:master","ref":"master","sha":"41825251b962016e17ccfb4b44202ae99b4cd496","user":{"login":"logzio","id":7902073,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc5MDIwNzM=","avatar_url":"https://avatars.githubusercontent.com/u/7902073?v=4","gravatar_id":"","url":"https://api.github.com/users/logzio","html_url":"https://github.com/logzio","followers_url":"https://api.github.com/users/logzio/followers","following_url":"https://api.github.com/users/logzio/following{/other_user}","gists_url":"https://api.github.com/users/logzio/gists{/gist_id}","starred_url":"https://api.github.com/users/logzio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/logzio/subscriptions","organizations_url":"https://api.github.com/users/logzio/orgs","repos_url":"https://api.github.com/users/logzio/repos","events_url":"https://api.github.com/users/logzio/events{/privacy}","received_events_url":"https://api.github.com/users/logzio/received_events","type":"Organization","site_admin":false},"repo":{"id":135286803,"node_id":"MDEwOlJlcG9zaXRvcnkxMzUyODY4MDM=","name":"logz-docs","full_name":"logzio/logz-docs","private":false,"owner":{"login":"logzio","id":7902073,"node_id":"MDEyOk9yZ2FuaXphdGlvbjc5MDIwNzM=","avatar_url":"https://avatars.githubusercontent.com/u/7902073?v=4","gravatar_id":"","url":"https://api.github.com/users/logzio","html_url":"https://github.com/logzio","followers_url":"https://api.github.com/users/logzio/followers","following_url":"https://api.github.com/users/logzio/following{/other_user}","gists_url":"https://api.github.com/users/logzio/gists{/gist_id}","starred_url":"https://api.github.com/users/logzio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/logzio/subscriptions","organizations_url":"https://api.github.com/users/logzio/orgs","repos_url":"https://api.github.com/users/logzio/repos","events_url":"https://api.github.com/users/logzio/events{/privacy}","received_events_url":"https://api.github.com/users/logzio/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/logzio/logz-docs","description":"Logz.io user documentation","fork":false,"url":"https://api.github.com/repos/logzio/logz-docs","forks_url":"https://api.github.com/repos/logzio/logz-docs/forks","keys_url":"https://api.github.com/repos/logzio/logz-docs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/logzio/logz-docs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/logzio/logz-docs/teams","hooks_url":"https://api.github.com/repos/logzio/logz-docs/hooks","issue_events_url":"https://api.github.com/repos/logzio/logz-docs/issues/events{/number}","events_url":"https://api.github.com/repos/logzio/logz-docs/events","assignees_url":"https://api.github.com/repos/logzio/logz-docs/assignees{/user}","branches_url":"https://api.github.com/repos/logzio/logz-docs/branches{/branch}","tags_url":"https://api.github.com/repos/logzio/logz-docs/tags","blobs_url":"https://api.github.com/repos/logzio/logz-docs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/logzio/logz-docs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/logzio/logz-docs/git/refs{/sha}","trees_url":"https://api.github.com/repos/logzio/logz-docs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/logzio/logz-docs/statuses/{sha}","languages_url":"https://api.github.com/repos/logzio/logz-docs/languages","stargazers_url":"https://api.github.com/repos/logzio/logz-docs/stargazers","contributors_url":"https://api.github.com/repos/logzio/logz-docs/contributors","subscribers_url":"https://api.github.com/repos/logzio/logz-docs/subscribers","subscription_url":"https://api.github.com/repos/logzio/logz-docs/subscription","commits_url":"https://api.github.com/repos/logzio/logz-docs/commits{/sha}","git_commits_url":"https://api.github.com/repos/logzio/logz-docs/git/commits{/sha}","comments_url":"https://api.github.com/repos/logzio/logz-docs/comments{/number}","issue_comment_url":"https://api.github.com/repos/logzio/logz-docs/issues/comments{/number}","contents_url":"https://api.github.com/repos/logzio/logz-docs/contents/{+path}","compare_url":"https://api.github.com/repos/logzio/logz-docs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/logzio/logz-docs/merges","archive_url":"https://api.github.com/repos/logzio/logz-docs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/logzio/logz-docs/downloads","issues_url":"https://api.github.com/repos/logzio/logz-docs/issues{/number}","pulls_url":"https://api.github.com/repos/logzio/logz-docs/pulls{/number}","milestones_url":"https://api.github.com/repos/logzio/logz-docs/milestones{/number}","notifications_url":"https://api.github.com/repos/logzio/logz-docs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/logzio/logz-docs/labels{/name}","releases_url":"https://api.github.com/repos/logzio/logz-docs/releases{/id}","deployments_url":"https://api.github.com/repos/logzio/logz-docs/deployments","created_at":"2018-05-29T11:35:46Z","updated_at":"2021-07-20T15:00:29Z","pushed_at":"2021-07-21T08:39:42Z","git_url":"git://github.com/logzio/logz-docs.git","ssh_url":"git@github.com:logzio/logz-docs.git","clone_url":"https://github.com/logzio/logz-docs.git","svn_url":"https://github.com/logzio/logz-docs","homepage":"https://docs.logz.io","size":19711,"stargazers_count":11,"watchers_count":11,"language":"JavaScript","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":28,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":60,"license":null,"forks":28,"open_issues":60,"watchers":11,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/logzio/logz-docs/pulls/1196"},"html":{"href":"https://github.com/logzio/logz-docs/pull/1196"},"issue":{"href":"https://api.github.com/repos/logzio/logz-docs/issues/1196"},"comments":{"href":"https://api.github.com/repos/logzio/logz-docs/issues/1196/comments"},"review_comments":{"href":"https://api.github.com/repos/logzio/logz-docs/pulls/1196/comments"},"review_comment":{"href":"https://api.github.com/repos/logzio/logz-docs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/logzio/logz-docs/pulls/1196/commits"},"statuses":{"href":"https://api.github.com/repos/logzio/logz-docs/statuses/1bf31508c3a89241a54730a0e8c72300f997dbef"}},"author_association":"COLLABORATOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:03Z","org":{"id":7902073,"login":"logzio","gravatar_id":"","url":"https://api.github.com/orgs/logzio","avatar_url":"https://avatars.githubusercontent.com/u/7902073?"}}
+{"id":"17246340106","type":"PushEvent","actor":{"id":77620363,"login":"hunksammy","display_login":"hunksammy","gravatar_id":"","url":"https://api.github.com/users/hunksammy","avatar_url":"https://avatars.githubusercontent.com/u/77620363?"},"repo":{"id":330883873,"name":"hunksammy/2084377289testbysam","url":"https://api.github.com/repos/hunksammy/2084377289testbysam"},"payload":{"push_id":7562451419,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"23d2d09c5ffc922ead6565a16c9c198d65df4a8f","before":"32fa2f80be9f0a86462668142027a1addfecc313","commits":[{"sha":"23d2d09c5ffc922ead6565a16c9c198d65df4a8f","author":{"name":"hunksammy","email":"29ceb644d373db31fb44a8f97cba06d00e31a5e9@gmail.com"},"message":"t","distinct":true,"url":"https://api.github.com/repos/hunksammy/2084377289testbysam/commits/23d2d09c5ffc922ead6565a16c9c198d65df4a8f"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246339407","type":"ReleaseEvent","actor":{"id":79913779,"login":"conda-forge-curator[bot]","display_login":"conda-forge-curator","gravatar_id":"","url":"https://api.github.com/users/conda-forge-curator[bot]","avatar_url":"https://avatars.githubusercontent.com/u/79913779?"},"repo":{"id":288431736,"name":"conda-forge/releases","url":"https://api.github.com/repos/conda-forge/releases"},"payload":{"action":"published","release":{"url":"https://api.github.com/repos/conda-forge/releases/releases/46527560","assets_url":"https://api.github.com/repos/conda-forge/releases/releases/46527560/assets","upload_url":"https://uploads.github.com/repos/conda-forge/releases/releases/46527560/assets{?name,label}","html_url":"https://github.com/conda-forge/releases/releases/tag/win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2","id":46527560,"author":{"login":"conda-forge-curator[bot]","id":79913779,"node_id":"MDM6Qm90Nzk5MTM3Nzk=","avatar_url":"https://avatars.githubusercontent.com/in/102928?v=4","gravatar_id":"","url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D","html_url":"https://github.com/apps/conda-forge-curator","followers_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/followers","following_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/repos","events_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/conda-forge-curator%5Bbot%5D/received_events","type":"Bot","site_admin":false},"node_id":"MDc6UmVsZWFzZTQ2NTI3NTYw","tag_name":"win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2","target_commitish":"c3a740206b9712f93a2b4982821d8b86964e2c3d","name":"win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2","draft":false,"prerelease":false,"created_at":"2021-03-04T14:45:35Z","published_at":"2021-07-21T09:00:00Z","assets":[],"tarball_url":"https://api.github.com/repos/conda-forge/releases/tarball/win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2","zipball_url":"https://api.github.com/repos/conda-forge/releases/zipball/win-64/astroid-2.6.5-py37h03978a9_0.tar.bz2","body":"","short_description_html":null,"is_short_description_html_truncated":false}},"public":true,"created_at":"2021-07-21T09:00:00Z","org":{"id":11897326,"login":"conda-forge","gravatar_id":"","url":"https://api.github.com/orgs/conda-forge","avatar_url":"https://avatars.githubusercontent.com/u/11897326?"}}
+{"id":"17246339934","type":"PushEvent","actor":{"id":158862,"login":"arlac77","display_login":"arlac77","gravatar_id":"","url":"https://api.github.com/users/arlac77","avatar_url":"https://avatars.githubusercontent.com/u/158862?"},"repo":{"id":253911783,"name":"arlac77/sync-test-repository","url":"https://api.github.com/repos/arlac77/sync-test-repository"},"payload":{"push_id":7562451323,"size":1,"distinct_size":1,"ref":"refs/heads/template-sync/template-node-app","head":"b81911746ccbc04009e4a59ba4db8271fc53be43","before":"e0f397bcc6b705ac3abe4d10e24dd31db2bdce40","commits":[{"sha":"b81911746ccbc04009e4a59ba4db8271fc53be43","author":{"name":"Markus Felten","email":"d7345cc33cdae6a44846871372d59b8178f00e4c@gmx.de"},"message":"fix(engines): add >=14.17.3 remove >=12.18.0 (engines.node)\nchore(scripts): add mocha tests/*-test.js && ava --timeout 2m && npm run test:ava (scripts.test)\nchore(scripts): add c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 2m tests/*.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp (scripts.cover)\nchore(scripts): add ava --timeout 2m tests/*.mjs (scripts.test:ava)\nchore(deps): add ^3.15.0 remove ^3.9.0 (devDependencies.ava)\nchore(deps): add ^7.7.3 remove ^7.2.0 (devDependencies.c8)\nchore(deps): add ^17.4.4 remove ^17.1.1 (devDependencies.semantic-release)","distinct":true,"url":"https://api.github.com/repos/arlac77/sync-test-repository/commits/b81911746ccbc04009e4a59ba4db8271fc53be43"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340117","type":"PushEvent","actor":{"id":1354510,"login":"leo91000","display_login":"leo91000","gravatar_id":"","url":"https://api.github.com/users/leo91000","avatar_url":"https://avatars.githubusercontent.com/u/1354510?"},"repo":{"id":372306529,"name":"leo91000/covid-japan-informations","url":"https://api.github.com/repos/leo91000/covid-japan-informations"},"payload":{"push_id":7562451408,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"fafa76838f2d7ae82d83edab2dcb622ac423f29f","before":"564c260362255b2d829a869ff254f6da4d1f4d53","commits":[{"sha":"fafa76838f2d7ae82d83edab2dcb622ac423f29f","author":{"name":"Léo Coletta","email":"c44abbda51c039fd3030f3ac7bea105b5e3f239d@gmail.com"},"message":"update 2021-07-21T09:00:02.379Z","distinct":true,"url":"https://api.github.com/repos/leo91000/covid-japan-informations/commits/fafa76838f2d7ae82d83edab2dcb622ac423f29f"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340120","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":248646333,"name":"miwebst/ssRunner","url":"https://api.github.com/repos/miwebst/ssRunner"},"payload":{"push_id":7562451423,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"51ae1529c6065198c56c3de231ce4a71fa3f00b3","before":"d107e584f70d3ec90a4105a6286c6ea1d7dee0d7","commits":[{"sha":"51ae1529c6065198c56c3de231ce4a71fa3f00b3","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 9:00:02 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunner/commits/51ae1529c6065198c56c3de231ce4a71fa3f00b3"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340124","type":"CreateEvent","actor":{"id":42283162,"login":"aws-aemilia","display_login":"aws-aemilia","gravatar_id":"","url":"https://api.github.com/users/aws-aemilia","avatar_url":"https://avatars.githubusercontent.com/u/42283162?"},"repo":{"id":388056929,"name":"aws-aemilia/react-app29188951774410475","url":"https://api.github.com/repos/aws-aemilia/react-app29188951774410475"},"payload":{"ref":"master","ref_type":"branch","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340130","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249503742,"name":"miwebst/ssRunnerReact","url":"https://api.github.com/repos/miwebst/ssRunnerReact"},"payload":{"push_id":7562451420,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"9db28650d668aea1ba90f112a80147271ae16809","before":"6992b1362e5906c546e574623e2300432850132e","commits":[{"sha":"9db28650d668aea1ba90f112a80147271ae16809","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 9:00:02 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerReact/commits/9db28650d668aea1ba90f112a80147271ae16809"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340135","type":"PushEvent","actor":{"id":62687145,"login":"vpnsuperapp","display_login":"vpnsuperapp","gravatar_id":"","url":"https://api.github.com/users/vpnsuperapp","avatar_url":"https://avatars.githubusercontent.com/u/62687145?"},"repo":{"id":250208038,"name":"vpnsuperapp/fast","url":"https://api.github.com/repos/vpnsuperapp/fast"},"payload":{"push_id":7562451431,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"e243c4a619a3bed3abd880b444749b8157c11514","before":"9d8a22e0234d4a85de68a32e7861ffa610d57edd","commits":[{"sha":"e243c4a619a3bed3abd880b444749b8157c11514","author":{"name":"vpnsuperapp","email":"a10ef24ae1deeaf0f19ef9771332325c38d8dfe4@users.noreply.github.com"},"message":"thank you","distinct":true,"url":"https://api.github.com/repos/vpnsuperapp/fast/commits/e243c4a619a3bed3abd880b444749b8157c11514"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340138","type":"PushEvent","actor":{"id":65212910,"login":"Hall-1910","display_login":"Hall-1910","gravatar_id":"","url":"https://api.github.com/users/Hall-1910","avatar_url":"https://avatars.githubusercontent.com/u/65212910?"},"repo":{"id":222505696,"name":"brand22/d3","url":"https://api.github.com/repos/brand22/d3"},"payload":{"push_id":7562451422,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"c2861fa9d58d7c3a1b3f2e517a996465e51a0ed5","before":"af741ccd65855d20fc1dbb2960ff8fe16621f450","commits":[{"sha":"c2861fa9d58d7c3a1b3f2e517a996465e51a0ed5","author":{"name":"Hall-1910","email":"82b2a317210219cb74c49a50f60ce4b4ef49066b@users.noreply.github.com"},"message":"m","distinct":true,"url":"https://api.github.com/repos/brand22/d3/commits/c2861fa9d58d7c3a1b3f2e517a996465e51a0ed5"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340139","type":"PushEvent","actor":{"id":87330551,"login":"xz241","display_login":"xz241","gravatar_id":"","url":"https://api.github.com/users/xz241","avatar_url":"https://avatars.githubusercontent.com/u/87330551?"},"repo":{"id":385328687,"name":"xz241/wp-uploads","url":"https://api.github.com/repos/xz241/wp-uploads"},"payload":{"push_id":7562451433,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"adf7992fa66f825614e3b6e2ded102040f057211","before":"2a09914ed7c072ee60c61bdaf9e023625cef6b19","commits":[{"sha":"adf7992fa66f825614e3b6e2ded102040f057211","author":{"name":"xz241","email":"e17353502d0344fb9b4d10b6a471cc23c11850ec@users.noreply.github.com"},"message":"","distinct":true,"url":"https://api.github.com/repos/xz241/wp-uploads/commits/adf7992fa66f825614e3b6e2ded102040f057211"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340140","type":"PushEvent","actor":{"id":50640090,"login":"miwebst","display_login":"miwebst","gravatar_id":"","url":"https://api.github.com/users/miwebst","avatar_url":"https://avatars.githubusercontent.com/u/50640090?"},"repo":{"id":249783941,"name":"miwebst/ssRunnerAngular","url":"https://api.github.com/repos/miwebst/ssRunnerAngular"},"payload":{"push_id":7562451410,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"cbf21837e966822d4fcab8e6b4b81cb2501afb44","before":"4aa971e975e04eec2e69a6c90b23ca78f5371a40","commits":[{"sha":"cbf21837e966822d4fcab8e6b4b81cb2501afb44","author":{"name":"Static Sites Runner","email":"655ff4c91d8e57f5219dcc5151b7d910327c974a@microsoft.com"},"message":"Runner Commit: 7/21/2021 9:00:02 AM","distinct":true,"url":"https://api.github.com/repos/miwebst/ssRunnerAngular/commits/cbf21837e966822d4fcab8e6b4b81cb2501afb44"}]},"public":true,"created_at":"2021-07-21T09:00:03Z"}
+{"id":"17246340144","type":"PullRequestEvent","actor":{"id":24419357,"login":"jan-dolejsi","display_login":"jan-dolejsi","gravatar_id":"","url":"https://api.github.com/users/jan-dolejsi","avatar_url":"https://avatars.githubusercontent.com/u/24419357?"},"repo":{"id":88296913,"name":"jan-dolejsi/vscode-pddl","url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl"},"payload":{"action":"closed","number":106,"pull_request":{"url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/106","id":694150505,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTUwNTA1","html_url":"https://github.com/jan-dolejsi/vscode-pddl/pull/106","diff_url":"https://github.com/jan-dolejsi/vscode-pddl/pull/106.diff","patch_url":"https://github.com/jan-dolejsi/vscode-pddl/pull/106.patch","issue_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/106","number":106,"state":"closed","locked":false,"title":"Bump lodash from 4.17.20 to 4.17.21","user":{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/lodash/lodash/commit/f299b52f39486275a9e6483b60a410e06520c538\"><code>f299b52</code></a> Bump to v4.17.21</li>\n<li><a href=\"https://github.com/lodash/lodash/commit/c4847ebe7d14540bb28a8b932a9ce1b9ecbfee1a\"><code>c4847eb</code></a> Improve performance of <code>toNumber</code>, <code>trim</code> and <code>trimEnd</code> on large input strings</li>\n<li><a href=\"https://github.com/lodash/lodash/commit/3469357cff396a26c363f8c1b5a91dde28ba4b1c\"><code>3469357</code></a> Prevent command injection through <code>_.template</code>'s <code>variable</code> option</li>\n<li>See full diff in <a href=\"https://github.com/lodash/lodash/compare/4.17.20...4.17.21\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=lodash&package-manager=npm_and_yarn&previous-version=4.17.20&new-version=4.17.21)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/jan-dolejsi/vscode-pddl/network/alerts).\n\n</details>","created_at":"2021-07-21T08:12:19Z","updated_at":"2021-07-21T09:00:03Z","closed_at":"2021-07-21T09:00:03Z","merged_at":"2021-07-21T09:00:03Z","merge_commit_sha":"e2018a657671dae067d78233f08e31bd8c89453b","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":1732797251,"node_id":"MDU6TGFiZWwxNzMyNzk3MjUx","url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/106/commits","review_comments_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/106/comments","review_comment_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/106/comments","statuses_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/statuses/8693cf737e450b96e021362f1741030442deb19f","head":{"label":"jan-dolejsi:dependabot/npm_and_yarn/lodash-4.17.21","ref":"dependabot/npm_and_yarn/lodash-4.17.21","sha":"8693cf737e450b96e021362f1741030442deb19f","user":{"login":"jan-dolejsi","id":24419357,"node_id":"MDQ6VXNlcjI0NDE5MzU3","avatar_url":"https://avatars.githubusercontent.com/u/24419357?v=4","gravatar_id":"","url":"https://api.github.com/users/jan-dolejsi","html_url":"https://github.com/jan-dolejsi","followers_url":"https://api.github.com/users/jan-dolejsi/followers","following_url":"https://api.github.com/users/jan-dolejsi/following{/other_user}","gists_url":"https://api.github.com/users/jan-dolejsi/gists{/gist_id}","starred_url":"https://api.github.com/users/jan-dolejsi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jan-dolejsi/subscriptions","organizations_url":"https://api.github.com/users/jan-dolejsi/orgs","repos_url":"https://api.github.com/users/jan-dolejsi/repos","events_url":"https://api.github.com/users/jan-dolejsi/events{/privacy}","received_events_url":"https://api.github.com/users/jan-dolejsi/received_events","type":"User","site_admin":false},"repo":{"id":88296913,"node_id":"MDEwOlJlcG9zaXRvcnk4ODI5NjkxMw==","name":"vscode-pddl","full_name":"jan-dolejsi/vscode-pddl","private":false,"owner":{"login":"jan-dolejsi","id":24419357,"node_id":"MDQ6VXNlcjI0NDE5MzU3","avatar_url":"https://avatars.githubusercontent.com/u/24419357?v=4","gravatar_id":"","url":"https://api.github.com/users/jan-dolejsi","html_url":"https://github.com/jan-dolejsi","followers_url":"https://api.github.com/users/jan-dolejsi/followers","following_url":"https://api.github.com/users/jan-dolejsi/following{/other_user}","gists_url":"https://api.github.com/users/jan-dolejsi/gists{/gist_id}","starred_url":"https://api.github.com/users/jan-dolejsi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jan-dolejsi/subscriptions","organizations_url":"https://api.github.com/users/jan-dolejsi/orgs","repos_url":"https://api.github.com/users/jan-dolejsi/repos","events_url":"https://api.github.com/users/jan-dolejsi/events{/privacy}","received_events_url":"https://api.github.com/users/jan-dolejsi/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jan-dolejsi/vscode-pddl","description":"Planning Domain Description Language (PDDL) grammar, syntax highlighting, code snippets, parser and planner integration for Visual Studio Code.","fork":false,"url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl","forks_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/forks","keys_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/teams","hooks_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/hooks","issue_events_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/events{/number}","events_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/events","assignees_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/assignees{/user}","branches_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/branches{/branch}","tags_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/tags","blobs_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/refs{/sha}","trees_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/statuses/{sha}","languages_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/languages","stargazers_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/stargazers","contributors_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/contributors","subscribers_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/subscribers","subscription_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/subscription","commits_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/commits{/sha}","git_commits_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/commits{/sha}","comments_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/comments{/number}","issue_comment_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/comments{/number}","contents_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/contents/{+path}","compare_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/merges","archive_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/downloads","issues_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues{/number}","pulls_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls{/number}","milestones_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/milestones{/number}","notifications_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/labels{/name}","releases_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/releases{/id}","deployments_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/deployments","created_at":"2017-04-14T19:33:34Z","updated_at":"2021-07-21T08:09:36Z","pushed_at":"2021-07-21T09:00:03Z","git_url":"git://github.com/jan-dolejsi/vscode-pddl.git","ssh_url":"git@github.com:jan-dolejsi/vscode-pddl.git","clone_url":"https://github.com/jan-dolejsi/vscode-pddl.git","svn_url":"https://github.com/jan-dolejsi/vscode-pddl","homepage":"","size":4527,"stargazers_count":43,"watchers_count":43,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":13,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":33,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":13,"open_issues":33,"watchers":43,"default_branch":"master"}},"base":{"label":"jan-dolejsi:master","ref":"master","sha":"7f6854405011d8df417853832739e067266cdb00","user":{"login":"jan-dolejsi","id":24419357,"node_id":"MDQ6VXNlcjI0NDE5MzU3","avatar_url":"https://avatars.githubusercontent.com/u/24419357?v=4","gravatar_id":"","url":"https://api.github.com/users/jan-dolejsi","html_url":"https://github.com/jan-dolejsi","followers_url":"https://api.github.com/users/jan-dolejsi/followers","following_url":"https://api.github.com/users/jan-dolejsi/following{/other_user}","gists_url":"https://api.github.com/users/jan-dolejsi/gists{/gist_id}","starred_url":"https://api.github.com/users/jan-dolejsi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jan-dolejsi/subscriptions","organizations_url":"https://api.github.com/users/jan-dolejsi/orgs","repos_url":"https://api.github.com/users/jan-dolejsi/repos","events_url":"https://api.github.com/users/jan-dolejsi/events{/privacy}","received_events_url":"https://api.github.com/users/jan-dolejsi/received_events","type":"User","site_admin":false},"repo":{"id":88296913,"node_id":"MDEwOlJlcG9zaXRvcnk4ODI5NjkxMw==","name":"vscode-pddl","full_name":"jan-dolejsi/vscode-pddl","private":false,"owner":{"login":"jan-dolejsi","id":24419357,"node_id":"MDQ6VXNlcjI0NDE5MzU3","avatar_url":"https://avatars.githubusercontent.com/u/24419357?v=4","gravatar_id":"","url":"https://api.github.com/users/jan-dolejsi","html_url":"https://github.com/jan-dolejsi","followers_url":"https://api.github.com/users/jan-dolejsi/followers","following_url":"https://api.github.com/users/jan-dolejsi/following{/other_user}","gists_url":"https://api.github.com/users/jan-dolejsi/gists{/gist_id}","starred_url":"https://api.github.com/users/jan-dolejsi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jan-dolejsi/subscriptions","organizations_url":"https://api.github.com/users/jan-dolejsi/orgs","repos_url":"https://api.github.com/users/jan-dolejsi/repos","events_url":"https://api.github.com/users/jan-dolejsi/events{/privacy}","received_events_url":"https://api.github.com/users/jan-dolejsi/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jan-dolejsi/vscode-pddl","description":"Planning Domain Description Language (PDDL) grammar, syntax highlighting, code snippets, parser and planner integration for Visual Studio Code.","fork":false,"url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl","forks_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/forks","keys_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/teams","hooks_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/hooks","issue_events_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/events{/number}","events_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/events","assignees_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/assignees{/user}","branches_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/branches{/branch}","tags_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/tags","blobs_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/refs{/sha}","trees_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/statuses/{sha}","languages_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/languages","stargazers_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/stargazers","contributors_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/contributors","subscribers_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/subscribers","subscription_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/subscription","commits_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/commits{/sha}","git_commits_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/git/commits{/sha}","comments_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/comments{/number}","issue_comment_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/comments{/number}","contents_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/contents/{+path}","compare_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/merges","archive_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/downloads","issues_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues{/number}","pulls_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls{/number}","milestones_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/milestones{/number}","notifications_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/labels{/name}","releases_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/releases{/id}","deployments_url":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/deployments","created_at":"2017-04-14T19:33:34Z","updated_at":"2021-07-21T08:09:36Z","pushed_at":"2021-07-21T09:00:03Z","git_url":"git://github.com/jan-dolejsi/vscode-pddl.git","ssh_url":"git@github.com:jan-dolejsi/vscode-pddl.git","clone_url":"https://github.com/jan-dolejsi/vscode-pddl.git","svn_url":"https://github.com/jan-dolejsi/vscode-pddl","homepage":"","size":4527,"stargazers_count":43,"watchers_count":43,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":13,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":33,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":13,"open_issues":33,"watchers":43,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/106"},"html":{"href":"https://github.com/jan-dolejsi/vscode-pddl/pull/106"},"issue":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/106"},"comments":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/issues/106/comments"},"review_comments":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/106/comments"},"review_comment":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/pulls/106/commits"},"statuses":{"href":"https://api.github.com/repos/jan-dolejsi/vscode-pddl/statuses/8693cf737e450b96e021362f1741030442deb19f"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"jan-dolejsi","id":24419357,"node_id":"MDQ6VXNlcjI0NDE5MzU3","avatar_url":"https://avatars.githubusercontent.com/u/24419357?v=4","gravatar_id":"","url":"https://api.github.com/users/jan-dolejsi","html_url":"https://github.com/jan-dolejsi","followers_url":"https://api.github.com/users/jan-dolejsi/followers","following_url":"https://api.github.com/users/jan-dolejsi/following{/other_user}","gists_url":"https://api.github.com/users/jan-dolejsi/gists{/gist_id}","starred_url":"https://api.github.com/users/jan-dolejsi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jan-dolejsi/subscriptions","organizations_url":"https://api.github.com/users/jan-dolejsi/orgs","repos_url":"https://api.github.com/users/jan-dolejsi/repos","events_url":"https://api.github.com/users/jan-dolejsi/events{/privacy}","received_events_url":"https://api.github.com/users/jan-dolejsi/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":1,"additions":3,"deletions":9,"changed_files":1}},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340150","type":"PushEvent","actor":{"id":72054858,"login":"jafar-shodiq","display_login":"jafar-shodiq","gravatar_id":"","url":"https://api.github.com/users/jafar-shodiq","avatar_url":"https://avatars.githubusercontent.com/u/72054858?"},"repo":{"id":388005216,"name":"jafar-shodiq/complete-proj","url":"https://api.github.com/repos/jafar-shodiq/complete-proj"},"payload":{"push_id":7562451440,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"c146c9f13d4a948850019b5d82a4eb5f13b58aae","before":"01bf398a03377be22889442ff84f0fe600cfee99","commits":[{"sha":"c146c9f13d4a948850019b5d82a4eb5f13b58aae","author":{"name":"Jafar Shodiq","email":"df4effa2a7c0b5077d0f000b7640be0f6c43880b@gmail.com"},"message":"first commit","distinct":true,"url":"https://api.github.com/repos/jafar-shodiq/complete-proj/commits/c146c9f13d4a948850019b5d82a4eb5f13b58aae"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340153","type":"CreateEvent","actor":{"id":56758491,"login":"saiarchana463","display_login":"saiarchana463","gravatar_id":"","url":"https://api.github.com/users/saiarchana463","avatar_url":"https://avatars.githubusercontent.com/u/56758491?"},"repo":{"id":388056972,"name":"saiarchana463/prac","url":"https://api.github.com/repos/saiarchana463/prac"},"payload":{"ref":null,"ref_type":"repository","master_branch":"master","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340154","type":"IssuesEvent","actor":{"id":56415283,"login":"Space-Turtle0","display_login":"Space-Turtle0","gravatar_id":"","url":"https://api.github.com/users/Space-Turtle0","avatar_url":"https://avatars.githubusercontent.com/u/56415283?"},"repo":{"id":328220827,"name":"Space-Turtle0/PortalBOT-Hosting","url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting"},"payload":{"action":"opened","issue":{"url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting/issues/209","repository_url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting","labels_url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting/issues/209/labels{/name}","comments_url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting/issues/209/comments","events_url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting/issues/209/events","html_url":"https://github.com/Space-Turtle0/PortalBOT-Hosting/issues/209","id":949486869,"node_id":"MDU6SXNzdWU5NDk0ODY4Njk=","number":209,"title":"🛑 STABLE is down","user":{"login":"Space-Turtle0","id":56415283,"node_id":"MDQ6VXNlcjU2NDE1Mjgz","avatar_url":"https://avatars.githubusercontent.com/u/56415283?v=4","gravatar_id":"","url":"https://api.github.com/users/Space-Turtle0","html_url":"https://github.com/Space-Turtle0","followers_url":"https://api.github.com/users/Space-Turtle0/followers","following_url":"https://api.github.com/users/Space-Turtle0/following{/other_user}","gists_url":"https://api.github.com/users/Space-Turtle0/gists{/gist_id}","starred_url":"https://api.github.com/users/Space-Turtle0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Space-Turtle0/subscriptions","organizations_url":"https://api.github.com/users/Space-Turtle0/orgs","repos_url":"https://api.github.com/users/Space-Turtle0/repos","events_url":"https://api.github.com/users/Space-Turtle0/events{/privacy}","received_events_url":"https://api.github.com/users/Space-Turtle0/received_events","type":"User","site_admin":false},"labels":[{"id":2677312959,"node_id":"MDU6TGFiZWwyNjc3MzEyOTU5","url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting/labels/stable","name":"stable","color":"ededed","default":false,"description":null},{"id":2645118087,"node_id":"MDU6TGFiZWwyNjQ1MTE4MDg3","url":"https://api.github.com/repos/Space-Turtle0/PortalBOT-Hosting/labels/status","name":"status","color":"ededed","default":false,"description":null}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2021-07-21T09:00:03Z","updated_at":"2021-07-21T09:00:03Z","closed_at":null,"author_association":"OWNER","active_lock_reason":null,"body":"In [`a248098`](https://github.com/Space-Turtle0/PortalBOT-Hosting/commit/a248098b77dc0c403b5843f0bca0c8d98e7afcc9\n), STABLE ($PORTALBOT_STABLE) was **down**:\n- HTTP code: 0\n- Response time: 0 ms\n","performed_via_github_app":null}},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340165","type":"PushEvent","actor":{"id":68417258,"login":"breakingheatmap","display_login":"breakingheatmap","gravatar_id":"","url":"https://api.github.com/users/breakingheatmap","avatar_url":"https://avatars.githubusercontent.com/u/68417258?"},"repo":{"id":280356388,"name":"breakingheatmap/breakingheatmap","url":"https://api.github.com/repos/breakingheatmap/breakingheatmap"},"payload":{"push_id":7562451371,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"505f71c07780dca3dd06b32d93ba0056409aabb8","before":"a2b346732919027ef2ee16484cca939cf09eeb46","commits":[{"sha":"505f71c07780dca3dd06b32d93ba0056409aabb8","author":{"name":"sudomaze","email":"6fbf11c1befd5a6b40696150a1a62f21b2fc7860@gmail.com"},"message":"1626857999","distinct":true,"url":"https://api.github.com/repos/breakingheatmap/breakingheatmap/commits/505f71c07780dca3dd06b32d93ba0056409aabb8"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340167","type":"PushEvent","actor":{"id":49872940,"login":"CC5447","display_login":"CC5447","gravatar_id":"","url":"https://api.github.com/users/CC5447","avatar_url":"https://avatars.githubusercontent.com/u/49872940?"},"repo":{"id":278609073,"name":"CC5447/Cat","url":"https://api.github.com/repos/CC5447/Cat"},"payload":{"push_id":7562451437,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"866dcdde151635a69a3e0f062ab8ad2ed4cce5b3","before":"6b27361afdb227f3d39c39d463971e7ab6d1d065","commits":[{"sha":"866dcdde151635a69a3e0f062ab8ad2ed4cce5b3","author":{"name":"CC5447","email":"766acee26f18aa9ff3d3fe7f3a9dccc94d2da63c@users.noreply.github.com"},"message":"Update Untitled Diagram.drawio","distinct":true,"url":"https://api.github.com/repos/CC5447/Cat/commits/866dcdde151635a69a3e0f062ab8ad2ed4cce5b3"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340173","type":"PushEvent","actor":{"id":62852156,"login":"DevJakey","display_login":"DevJakey","gravatar_id":"","url":"https://api.github.com/users/DevJakey","avatar_url":"https://avatars.githubusercontent.com/u/62852156?"},"repo":{"id":358965426,"name":"DevJakey/DevJakey","url":"https://api.github.com/repos/DevJakey/DevJakey"},"payload":{"push_id":7562451405,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"f7f59c47d9def471ec46c83000521e5d7c8d6216","before":"7942719dba04f97595846d6650764003e35bd98d","commits":[{"sha":"f7f59c47d9def471ec46c83000521e5d7c8d6216","author":{"name":"DevJakey","email":"c867a43406065281684282e5a2dee005bd8c655a@users.noreply.github.com"},"message":"Update README.md","distinct":true,"url":"https://api.github.com/repos/DevJakey/DevJakey/commits/f7f59c47d9def471ec46c83000521e5d7c8d6216"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340178","type":"PushEvent","actor":{"id":73460065,"login":"KINyonji","display_login":"KINyonji","gravatar_id":"","url":"https://api.github.com/users/KINyonji","avatar_url":"https://avatars.githubusercontent.com/u/73460065?"},"repo":{"id":382640846,"name":"KINyonji/Board_Spring","url":"https://api.github.com/repos/KINyonji/Board_Spring"},"payload":{"push_id":7562451450,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"8852ad8af5c4fda8d5bef03c399b7e9c039a6639","before":"cfd670632d41a2cca908cf8ab6545ecfda578bbc","commits":[{"sha":"8852ad8af5c4fda8d5bef03c399b7e9c039a6639","author":{"name":"KINyonji","email":"d74f643880c3d9027fd35030c0c33a34c31b3f97@users.noreply.github.com"},"message":".","distinct":true,"url":"https://api.github.com/repos/KINyonji/Board_Spring/commits/8852ad8af5c4fda8d5bef03c399b7e9c039a6639"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340182","type":"PushEvent","actor":{"id":68257043,"login":"haruyama8940","display_login":"haruyama8940","gravatar_id":"","url":"https://api.github.com/users/haruyama8940","avatar_url":"https://avatars.githubusercontent.com/u/68257043?"},"repo":{"id":378888019,"name":"haruyama8940/switching_by_etc","url":"https://api.github.com/repos/haruyama8940/switching_by_etc"},"payload":{"push_id":7562451428,"size":1,"distinct_size":1,"ref":"refs/heads/devel","head":"b255968c38517fa75893542ec7f2ac09d4402e69","before":"84108e18670f38dc4a17011cb13055c95b9a3624","commits":[{"sha":"b255968c38517fa75893542ec7f2ac09d4402e69","author":{"name":"haruyama8940","email":"8d383dd5dae3345c1a3439469328e9fe1994fc64@gmail.com"},"message":"add switching_by_alpha","distinct":true,"url":"https://api.github.com/repos/haruyama8940/switching_by_etc/commits/b255968c38517fa75893542ec7f2ac09d4402e69"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340184","type":"PullRequestReviewEvent","actor":{"id":52416718,"login":"fussel178","display_login":"fussel178","gravatar_id":"","url":"https://api.github.com/users/fussel178","avatar_url":"https://avatars.githubusercontent.com/u/52416718?"},"repo":{"id":377954977,"name":"fussel178/react-spring-rocket","url":"https://api.github.com/repos/fussel178/react-spring-rocket"},"payload":{"action":"created","review":{"id":711422114,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDIyMTE0","user":{"login":"fussel178","id":52416718,"node_id":"MDQ6VXNlcjUyNDE2NzE4","avatar_url":"https://avatars.githubusercontent.com/u/52416718?v=4","gravatar_id":"","url":"https://api.github.com/users/fussel178","html_url":"https://github.com/fussel178","followers_url":"https://api.github.com/users/fussel178/followers","following_url":"https://api.github.com/users/fussel178/following{/other_user}","gists_url":"https://api.github.com/users/fussel178/gists{/gist_id}","starred_url":"https://api.github.com/users/fussel178/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fussel178/subscriptions","organizations_url":"https://api.github.com/users/fussel178/orgs","repos_url":"https://api.github.com/users/fussel178/repos","events_url":"https://api.github.com/users/fussel178/events{/privacy}","received_events_url":"https://api.github.com/users/fussel178/received_events","type":"User","site_admin":false},"body":"","commit_id":"4e26bdd37f51890ca2493293ce40e6f1b83fd0ae","submitted_at":"2021-07-21T09:00:03Z","state":"approved","html_url":"https://github.com/fussel178/react-spring-rocket/pull/31#pullrequestreview-711422114","pull_request_url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31","author_association":"OWNER","_links":{"html":{"href":"https://github.com/fussel178/react-spring-rocket/pull/31#pullrequestreview-711422114"},"pull_request":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31"}}},"pull_request":{"url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31","id":694112951,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTEyOTUx","html_url":"https://github.com/fussel178/react-spring-rocket/pull/31","diff_url":"https://github.com/fussel178/react-spring-rocket/pull/31.diff","patch_url":"https://github.com/fussel178/react-spring-rocket/pull/31.patch","issue_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/31","number":31,"state":"open","locked":false,"title":"chore(deps): bump actions/setup-node from 2.2.0 to 2.3.0","user":{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","site_admin":false},"body":"Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.2.0 to 2.3.0.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/actions/setup-node/releases\">actions/setup-node's releases</a>.</em></p>\n<blockquote>\n<h2>Support caching pnpm dependencies</h2>\n<p>This release introduces dependency caching support for the <code>pnpm</code> package manager (<a href=\"https://github-redirect.dependabot.com/actions/setup-node/issues/278\">#278</a>).</p>\n<p><strong>Caching pnpm dependencies:</strong></p>\n<pre lang=\"yaml\"><code># This workflow uses actions that are not certified by GitHub.\n# They are provided by a third-party and are governed by\n# separate terms of service, privacy policy, and support\n# documentation.\n<p>steps:</p>\n<ul>\n<li>uses: actions/checkout@v2</li>\n<li>uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2\nwith:\nversion: 6.10.0</li>\n<li>uses: actions/setup-node@v2\nwith:\nnode-version: '14'\ncache: 'pnpm'</li>\n<li>run: pnpm install</li>\n<li>run: pnpm test\n</code></pre></li>\n</ul>\n<p><strong>NOTE</strong>: pnpm caching support requires pnpm version &gt;= 6.10.0</p>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/actions/setup-node/commit/aa759c6c94d3800c55b8601f21ba4b2371704cb7\"><code>aa759c6</code></a> Merge pull request <a href=\"https://github-redirect.dependabot.com/actions/setup-node/issues/278\">#278</a> from jacobwgillespie/cache-pnpm</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/0ae03de2b799ae88b378c51b87476d242b3d8ef0\"><code>0ae03de</code></a> Reorder to npm, yarn, pnpm</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/4bc87b8e10a7f0f76173ad410d874a0b1f984af0\"><code>4bc87b8</code></a> Bump e2e tests to 6.10.0</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/b96348a4e97e0510304e475e5cec7a7a05518c5d\"><code>b96348a</code></a> Remove unused imports</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/3af302a4f220de9ff48cd21cc1ab8e9c54382600\"><code>3af302a</code></a> Switch to pnpm store path command</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/f452812b440ff2d1b0ee9d300a037464407004e5\"><code>f452812</code></a> Unmock fs.existsSync after tests</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/e93556ca6645851a427f77742aeb1b22a95b4700\"><code>e93556c</code></a> Mock fs.existsSync in tests</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/0453e516eb2a16fb262fa8f9db51405c7089b869\"><code>0453e51</code></a> Regenerate compiled files</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/399982b36805ac9d772a419dc9f95fb5a8eb5c55\"><code>399982b</code></a> Move existence check to cache-save</li>\n<li><a href=\"https://github.com/actions/setup-node/commit/d278e78bddf957771f319214444100b4032fb7aa\"><code>d278e78</code></a> Add logic to check that cache folder exists</li>\n<li>Additional commits viewable in <a href=\"https://github.com/actions/setup-node/compare/v2.2.0...v2.3.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-node&package-manager=github_actions&previous-version=2.2.0&new-version=2.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\n\n\n</details>","created_at":"2021-07-21T07:12:46Z","updated_at":"2021-07-21T09:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e82e44c45721e2f694174b8c9b701412888fc35b","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":3095788298,"node_id":"MDU6TGFiZWwzMDk1Nzg4Mjk4","url":"https://api.github.com/repos/fussel178/react-spring-rocket/labels/dependencies","name":"dependencies","color":"0366d6","default":false,"description":"Pull requests that update a dependency file"},{"id":3095788302,"node_id":"MDU6TGFiZWwzMDk1Nzg4MzAy","url":"https://api.github.com/repos/fussel178/react-spring-rocket/labels/github_actions","name":"github_actions","color":"000000","default":false,"description":"Pull requests that update Github_actions code"}],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31/commits","review_comments_url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31/comments","review_comment_url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/comments{/number}","comments_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/31/comments","statuses_url":"https://api.github.com/repos/fussel178/react-spring-rocket/statuses/4e26bdd37f51890ca2493293ce40e6f1b83fd0ae","head":{"label":"fussel178:dependabot/github_actions/actions/setup-node-2.3.0","ref":"dependabot/github_actions/actions/setup-node-2.3.0","sha":"4e26bdd37f51890ca2493293ce40e6f1b83fd0ae","user":{"login":"fussel178","id":52416718,"node_id":"MDQ6VXNlcjUyNDE2NzE4","avatar_url":"https://avatars.githubusercontent.com/u/52416718?v=4","gravatar_id":"","url":"https://api.github.com/users/fussel178","html_url":"https://github.com/fussel178","followers_url":"https://api.github.com/users/fussel178/followers","following_url":"https://api.github.com/users/fussel178/following{/other_user}","gists_url":"https://api.github.com/users/fussel178/gists{/gist_id}","starred_url":"https://api.github.com/users/fussel178/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fussel178/subscriptions","organizations_url":"https://api.github.com/users/fussel178/orgs","repos_url":"https://api.github.com/users/fussel178/repos","events_url":"https://api.github.com/users/fussel178/events{/privacy}","received_events_url":"https://api.github.com/users/fussel178/received_events","type":"User","site_admin":false},"repo":{"id":377954977,"node_id":"MDEwOlJlcG9zaXRvcnkzNzc5NTQ5Nzc=","name":"react-spring-rocket","full_name":"fussel178/react-spring-rocket","private":false,"owner":{"login":"fussel178","id":52416718,"node_id":"MDQ6VXNlcjUyNDE2NzE4","avatar_url":"https://avatars.githubusercontent.com/u/52416718?v=4","gravatar_id":"","url":"https://api.github.com/users/fussel178","html_url":"https://github.com/fussel178","followers_url":"https://api.github.com/users/fussel178/followers","following_url":"https://api.github.com/users/fussel178/following{/other_user}","gists_url":"https://api.github.com/users/fussel178/gists{/gist_id}","starred_url":"https://api.github.com/users/fussel178/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fussel178/subscriptions","organizations_url":"https://api.github.com/users/fussel178/orgs","repos_url":"https://api.github.com/users/fussel178/repos","events_url":"https://api.github.com/users/fussel178/events{/privacy}","received_events_url":"https://api.github.com/users/fussel178/received_events","type":"User","site_admin":false},"html_url":"https://github.com/fussel178/react-spring-rocket","description":"A simple rocket. Made with React Spring.","fork":false,"url":"https://api.github.com/repos/fussel178/react-spring-rocket","forks_url":"https://api.github.com/repos/fussel178/react-spring-rocket/forks","keys_url":"https://api.github.com/repos/fussel178/react-spring-rocket/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fussel178/react-spring-rocket/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fussel178/react-spring-rocket/teams","hooks_url":"https://api.github.com/repos/fussel178/react-spring-rocket/hooks","issue_events_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/events{/number}","events_url":"https://api.github.com/repos/fussel178/react-spring-rocket/events","assignees_url":"https://api.github.com/repos/fussel178/react-spring-rocket/assignees{/user}","branches_url":"https://api.github.com/repos/fussel178/react-spring-rocket/branches{/branch}","tags_url":"https://api.github.com/repos/fussel178/react-spring-rocket/tags","blobs_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/refs{/sha}","trees_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fussel178/react-spring-rocket/statuses/{sha}","languages_url":"https://api.github.com/repos/fussel178/react-spring-rocket/languages","stargazers_url":"https://api.github.com/repos/fussel178/react-spring-rocket/stargazers","contributors_url":"https://api.github.com/repos/fussel178/react-spring-rocket/contributors","subscribers_url":"https://api.github.com/repos/fussel178/react-spring-rocket/subscribers","subscription_url":"https://api.github.com/repos/fussel178/react-spring-rocket/subscription","commits_url":"https://api.github.com/repos/fussel178/react-spring-rocket/commits{/sha}","git_commits_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/commits{/sha}","comments_url":"https://api.github.com/repos/fussel178/react-spring-rocket/comments{/number}","issue_comment_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/comments{/number}","contents_url":"https://api.github.com/repos/fussel178/react-spring-rocket/contents/{+path}","compare_url":"https://api.github.com/repos/fussel178/react-spring-rocket/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fussel178/react-spring-rocket/merges","archive_url":"https://api.github.com/repos/fussel178/react-spring-rocket/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fussel178/react-spring-rocket/downloads","issues_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues{/number}","pulls_url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls{/number}","milestones_url":"https://api.github.com/repos/fussel178/react-spring-rocket/milestones{/number}","notifications_url":"https://api.github.com/repos/fussel178/react-spring-rocket/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fussel178/react-spring-rocket/labels{/name}","releases_url":"https://api.github.com/repos/fussel178/react-spring-rocket/releases{/id}","deployments_url":"https://api.github.com/repos/fussel178/react-spring-rocket/deployments","created_at":"2021-06-17T20:36:51Z","updated_at":"2021-07-20T21:54:20Z","pushed_at":"2021-07-21T07:13:21Z","git_url":"git://github.com/fussel178/react-spring-rocket.git","ssh_url":"git@github.com:fussel178/react-spring-rocket.git","clone_url":"https://github.com/fussel178/react-spring-rocket.git","svn_url":"https://github.com/fussel178/react-spring-rocket","homepage":"https://fussel178.github.io/react-spring-rocket/","size":9606,"stargazers_count":2,"watchers_count":2,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":5,"watchers":2,"default_branch":"main"}},"base":{"label":"fussel178:main","ref":"main","sha":"64937a602194c3ab5e4e2394e2a869d32e6fcc0b","user":{"login":"fussel178","id":52416718,"node_id":"MDQ6VXNlcjUyNDE2NzE4","avatar_url":"https://avatars.githubusercontent.com/u/52416718?v=4","gravatar_id":"","url":"https://api.github.com/users/fussel178","html_url":"https://github.com/fussel178","followers_url":"https://api.github.com/users/fussel178/followers","following_url":"https://api.github.com/users/fussel178/following{/other_user}","gists_url":"https://api.github.com/users/fussel178/gists{/gist_id}","starred_url":"https://api.github.com/users/fussel178/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fussel178/subscriptions","organizations_url":"https://api.github.com/users/fussel178/orgs","repos_url":"https://api.github.com/users/fussel178/repos","events_url":"https://api.github.com/users/fussel178/events{/privacy}","received_events_url":"https://api.github.com/users/fussel178/received_events","type":"User","site_admin":false},"repo":{"id":377954977,"node_id":"MDEwOlJlcG9zaXRvcnkzNzc5NTQ5Nzc=","name":"react-spring-rocket","full_name":"fussel178/react-spring-rocket","private":false,"owner":{"login":"fussel178","id":52416718,"node_id":"MDQ6VXNlcjUyNDE2NzE4","avatar_url":"https://avatars.githubusercontent.com/u/52416718?v=4","gravatar_id":"","url":"https://api.github.com/users/fussel178","html_url":"https://github.com/fussel178","followers_url":"https://api.github.com/users/fussel178/followers","following_url":"https://api.github.com/users/fussel178/following{/other_user}","gists_url":"https://api.github.com/users/fussel178/gists{/gist_id}","starred_url":"https://api.github.com/users/fussel178/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fussel178/subscriptions","organizations_url":"https://api.github.com/users/fussel178/orgs","repos_url":"https://api.github.com/users/fussel178/repos","events_url":"https://api.github.com/users/fussel178/events{/privacy}","received_events_url":"https://api.github.com/users/fussel178/received_events","type":"User","site_admin":false},"html_url":"https://github.com/fussel178/react-spring-rocket","description":"A simple rocket. Made with React Spring.","fork":false,"url":"https://api.github.com/repos/fussel178/react-spring-rocket","forks_url":"https://api.github.com/repos/fussel178/react-spring-rocket/forks","keys_url":"https://api.github.com/repos/fussel178/react-spring-rocket/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fussel178/react-spring-rocket/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fussel178/react-spring-rocket/teams","hooks_url":"https://api.github.com/repos/fussel178/react-spring-rocket/hooks","issue_events_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/events{/number}","events_url":"https://api.github.com/repos/fussel178/react-spring-rocket/events","assignees_url":"https://api.github.com/repos/fussel178/react-spring-rocket/assignees{/user}","branches_url":"https://api.github.com/repos/fussel178/react-spring-rocket/branches{/branch}","tags_url":"https://api.github.com/repos/fussel178/react-spring-rocket/tags","blobs_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/refs{/sha}","trees_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fussel178/react-spring-rocket/statuses/{sha}","languages_url":"https://api.github.com/repos/fussel178/react-spring-rocket/languages","stargazers_url":"https://api.github.com/repos/fussel178/react-spring-rocket/stargazers","contributors_url":"https://api.github.com/repos/fussel178/react-spring-rocket/contributors","subscribers_url":"https://api.github.com/repos/fussel178/react-spring-rocket/subscribers","subscription_url":"https://api.github.com/repos/fussel178/react-spring-rocket/subscription","commits_url":"https://api.github.com/repos/fussel178/react-spring-rocket/commits{/sha}","git_commits_url":"https://api.github.com/repos/fussel178/react-spring-rocket/git/commits{/sha}","comments_url":"https://api.github.com/repos/fussel178/react-spring-rocket/comments{/number}","issue_comment_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/comments{/number}","contents_url":"https://api.github.com/repos/fussel178/react-spring-rocket/contents/{+path}","compare_url":"https://api.github.com/repos/fussel178/react-spring-rocket/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fussel178/react-spring-rocket/merges","archive_url":"https://api.github.com/repos/fussel178/react-spring-rocket/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fussel178/react-spring-rocket/downloads","issues_url":"https://api.github.com/repos/fussel178/react-spring-rocket/issues{/number}","pulls_url":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls{/number}","milestones_url":"https://api.github.com/repos/fussel178/react-spring-rocket/milestones{/number}","notifications_url":"https://api.github.com/repos/fussel178/react-spring-rocket/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fussel178/react-spring-rocket/labels{/name}","releases_url":"https://api.github.com/repos/fussel178/react-spring-rocket/releases{/id}","deployments_url":"https://api.github.com/repos/fussel178/react-spring-rocket/deployments","created_at":"2021-06-17T20:36:51Z","updated_at":"2021-07-20T21:54:20Z","pushed_at":"2021-07-21T07:13:21Z","git_url":"git://github.com/fussel178/react-spring-rocket.git","ssh_url":"git@github.com:fussel178/react-spring-rocket.git","clone_url":"https://github.com/fussel178/react-spring-rocket.git","svn_url":"https://github.com/fussel178/react-spring-rocket","homepage":"https://fussel178.github.io/react-spring-rocket/","size":9606,"stargazers_count":2,"watchers_count":2,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":5,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":5,"watchers":2,"default_branch":"main"}},"_links":{"self":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31"},"html":{"href":"https://github.com/fussel178/react-spring-rocket/pull/31"},"issue":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/31"},"comments":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/issues/31/comments"},"review_comments":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31/comments"},"review_comment":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/pulls/31/commits"},"statuses":{"href":"https://api.github.com/repos/fussel178/react-spring-rocket/statuses/4e26bdd37f51890ca2493293ce40e6f1b83fd0ae"}},"author_association":"CONTRIBUTOR","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340190","type":"PullRequestReviewEvent","actor":{"id":87754812,"login":"abhinavg2787","display_login":"abhinavg2787","gravatar_id":"","url":"https://api.github.com/users/abhinavg2787","avatar_url":"https://avatars.githubusercontent.com/u/87754812?"},"repo":{"id":387483056,"name":"abhinavg27/sysfoo","url":"https://api.github.com/repos/abhinavg27/sysfoo"},"payload":{"action":"created","review":{"id":711422116,"node_id":"MDE3OlB1bGxSZXF1ZXN0UmV2aWV3NzExNDIyMTE2","user":{"login":"abhinavg2787","id":87754812,"node_id":"MDQ6VXNlcjg3NzU0ODEy","avatar_url":"https://avatars.githubusercontent.com/u/87754812?v=4","gravatar_id":"","url":"https://api.github.com/users/abhinavg2787","html_url":"https://github.com/abhinavg2787","followers_url":"https://api.github.com/users/abhinavg2787/followers","following_url":"https://api.github.com/users/abhinavg2787/following{/other_user}","gists_url":"https://api.github.com/users/abhinavg2787/gists{/gist_id}","starred_url":"https://api.github.com/users/abhinavg2787/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abhinavg2787/subscriptions","organizations_url":"https://api.github.com/users/abhinavg2787/orgs","repos_url":"https://api.github.com/users/abhinavg2787/repos","events_url":"https://api.github.com/users/abhinavg2787/events{/privacy}","received_events_url":"https://api.github.com/users/abhinavg2787/received_events","type":"User","site_admin":false},"body":"LGTM.","commit_id":"40c2b9023159a7b4629e82e98f54df872d8825e1","submitted_at":"2021-07-21T09:00:03Z","state":"approved","html_url":"https://github.com/abhinavg27/sysfoo/pull/1#pullrequestreview-711422116","pull_request_url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1","author_association":"COLLABORATOR","_links":{"html":{"href":"https://github.com/abhinavg27/sysfoo/pull/1#pullrequestreview-711422116"},"pull_request":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1"}}},"pull_request":{"url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1","id":693431224,"node_id":"MDExOlB1bGxSZXF1ZXN0NjkzNDMxMjI0","html_url":"https://github.com/abhinavg27/sysfoo/pull/1","diff_url":"https://github.com/abhinavg27/sysfoo/pull/1.diff","patch_url":"https://github.com/abhinavg27/sysfoo/pull/1.patch","issue_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues/1","number":1,"state":"open","locked":false,"title":"Test policy","user":{"login":"abhinavg27","id":38690244,"node_id":"MDQ6VXNlcjM4NjkwMjQ0","avatar_url":"https://avatars.githubusercontent.com/u/38690244?v=4","gravatar_id":"","url":"https://api.github.com/users/abhinavg27","html_url":"https://github.com/abhinavg27","followers_url":"https://api.github.com/users/abhinavg27/followers","following_url":"https://api.github.com/users/abhinavg27/following{/other_user}","gists_url":"https://api.github.com/users/abhinavg27/gists{/gist_id}","starred_url":"https://api.github.com/users/abhinavg27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abhinavg27/subscriptions","organizations_url":"https://api.github.com/users/abhinavg27/orgs","repos_url":"https://api.github.com/users/abhinavg27/repos","events_url":"https://api.github.com/users/abhinavg27/events{/privacy}","received_events_url":"https://api.github.com/users/abhinavg27/received_events","type":"User","site_admin":false},"body":"","created_at":"2021-07-20T12:38:42Z","updated_at":"2021-07-21T09:00:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"37b260d266651822455fc629af5b38a497896ec6","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1/commits","review_comments_url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1/comments","review_comment_url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/comments{/number}","comments_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues/1/comments","statuses_url":"https://api.github.com/repos/abhinavg27/sysfoo/statuses/40c2b9023159a7b4629e82e98f54df872d8825e1","head":{"label":"abhinavg27:test_policy","ref":"test_policy","sha":"40c2b9023159a7b4629e82e98f54df872d8825e1","user":{"login":"abhinavg27","id":38690244,"node_id":"MDQ6VXNlcjM4NjkwMjQ0","avatar_url":"https://avatars.githubusercontent.com/u/38690244?v=4","gravatar_id":"","url":"https://api.github.com/users/abhinavg27","html_url":"https://github.com/abhinavg27","followers_url":"https://api.github.com/users/abhinavg27/followers","following_url":"https://api.github.com/users/abhinavg27/following{/other_user}","gists_url":"https://api.github.com/users/abhinavg27/gists{/gist_id}","starred_url":"https://api.github.com/users/abhinavg27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abhinavg27/subscriptions","organizations_url":"https://api.github.com/users/abhinavg27/orgs","repos_url":"https://api.github.com/users/abhinavg27/repos","events_url":"https://api.github.com/users/abhinavg27/events{/privacy}","received_events_url":"https://api.github.com/users/abhinavg27/received_events","type":"User","site_admin":false},"repo":{"id":387483056,"node_id":"MDEwOlJlcG9zaXRvcnkzODc0ODMwNTY=","name":"sysfoo","full_name":"abhinavg27/sysfoo","private":false,"owner":{"login":"abhinavg27","id":38690244,"node_id":"MDQ6VXNlcjM4NjkwMjQ0","avatar_url":"https://avatars.githubusercontent.com/u/38690244?v=4","gravatar_id":"","url":"https://api.github.com/users/abhinavg27","html_url":"https://github.com/abhinavg27","followers_url":"https://api.github.com/users/abhinavg27/followers","following_url":"https://api.github.com/users/abhinavg27/following{/other_user}","gists_url":"https://api.github.com/users/abhinavg27/gists{/gist_id}","starred_url":"https://api.github.com/users/abhinavg27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abhinavg27/subscriptions","organizations_url":"https://api.github.com/users/abhinavg27/orgs","repos_url":"https://api.github.com/users/abhinavg27/repos","events_url":"https://api.github.com/users/abhinavg27/events{/privacy}","received_events_url":"https://api.github.com/users/abhinavg27/received_events","type":"User","site_admin":false},"html_url":"https://github.com/abhinavg27/sysfoo","description":"Sample java webapp with maven which prints system info","fork":true,"url":"https://api.github.com/repos/abhinavg27/sysfoo","forks_url":"https://api.github.com/repos/abhinavg27/sysfoo/forks","keys_url":"https://api.github.com/repos/abhinavg27/sysfoo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/abhinavg27/sysfoo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/abhinavg27/sysfoo/teams","hooks_url":"https://api.github.com/repos/abhinavg27/sysfoo/hooks","issue_events_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues/events{/number}","events_url":"https://api.github.com/repos/abhinavg27/sysfoo/events","assignees_url":"https://api.github.com/repos/abhinavg27/sysfoo/assignees{/user}","branches_url":"https://api.github.com/repos/abhinavg27/sysfoo/branches{/branch}","tags_url":"https://api.github.com/repos/abhinavg27/sysfoo/tags","blobs_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/refs{/sha}","trees_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/abhinavg27/sysfoo/statuses/{sha}","languages_url":"https://api.github.com/repos/abhinavg27/sysfoo/languages","stargazers_url":"https://api.github.com/repos/abhinavg27/sysfoo/stargazers","contributors_url":"https://api.github.com/repos/abhinavg27/sysfoo/contributors","subscribers_url":"https://api.github.com/repos/abhinavg27/sysfoo/subscribers","subscription_url":"https://api.github.com/repos/abhinavg27/sysfoo/subscription","commits_url":"https://api.github.com/repos/abhinavg27/sysfoo/commits{/sha}","git_commits_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/commits{/sha}","comments_url":"https://api.github.com/repos/abhinavg27/sysfoo/comments{/number}","issue_comment_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues/comments{/number}","contents_url":"https://api.github.com/repos/abhinavg27/sysfoo/contents/{+path}","compare_url":"https://api.github.com/repos/abhinavg27/sysfoo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/abhinavg27/sysfoo/merges","archive_url":"https://api.github.com/repos/abhinavg27/sysfoo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/abhinavg27/sysfoo/downloads","issues_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues{/number}","pulls_url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls{/number}","milestones_url":"https://api.github.com/repos/abhinavg27/sysfoo/milestones{/number}","notifications_url":"https://api.github.com/repos/abhinavg27/sysfoo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/abhinavg27/sysfoo/labels{/name}","releases_url":"https://api.github.com/repos/abhinavg27/sysfoo/releases{/id}","deployments_url":"https://api.github.com/repos/abhinavg27/sysfoo/deployments","created_at":"2021-07-19T13:58:05Z","updated_at":"2021-07-20T11:29:25Z","pushed_at":"2021-07-20T12:38:42Z","git_url":"git://github.com/abhinavg27/sysfoo.git","ssh_url":"git@github.com:abhinavg27/sysfoo.git","clone_url":"https://github.com/abhinavg27/sysfoo.git","svn_url":"https://github.com/abhinavg27/sysfoo","homepage":null,"size":1656,"stargazers_count":0,"watchers_count":0,"language":"SCSS","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"abhinavg27:master","ref":"master","sha":"8fa236dee8a9f54851441973d7ef502b66a2d777","user":{"login":"abhinavg27","id":38690244,"node_id":"MDQ6VXNlcjM4NjkwMjQ0","avatar_url":"https://avatars.githubusercontent.com/u/38690244?v=4","gravatar_id":"","url":"https://api.github.com/users/abhinavg27","html_url":"https://github.com/abhinavg27","followers_url":"https://api.github.com/users/abhinavg27/followers","following_url":"https://api.github.com/users/abhinavg27/following{/other_user}","gists_url":"https://api.github.com/users/abhinavg27/gists{/gist_id}","starred_url":"https://api.github.com/users/abhinavg27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abhinavg27/subscriptions","organizations_url":"https://api.github.com/users/abhinavg27/orgs","repos_url":"https://api.github.com/users/abhinavg27/repos","events_url":"https://api.github.com/users/abhinavg27/events{/privacy}","received_events_url":"https://api.github.com/users/abhinavg27/received_events","type":"User","site_admin":false},"repo":{"id":387483056,"node_id":"MDEwOlJlcG9zaXRvcnkzODc0ODMwNTY=","name":"sysfoo","full_name":"abhinavg27/sysfoo","private":false,"owner":{"login":"abhinavg27","id":38690244,"node_id":"MDQ6VXNlcjM4NjkwMjQ0","avatar_url":"https://avatars.githubusercontent.com/u/38690244?v=4","gravatar_id":"","url":"https://api.github.com/users/abhinavg27","html_url":"https://github.com/abhinavg27","followers_url":"https://api.github.com/users/abhinavg27/followers","following_url":"https://api.github.com/users/abhinavg27/following{/other_user}","gists_url":"https://api.github.com/users/abhinavg27/gists{/gist_id}","starred_url":"https://api.github.com/users/abhinavg27/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abhinavg27/subscriptions","organizations_url":"https://api.github.com/users/abhinavg27/orgs","repos_url":"https://api.github.com/users/abhinavg27/repos","events_url":"https://api.github.com/users/abhinavg27/events{/privacy}","received_events_url":"https://api.github.com/users/abhinavg27/received_events","type":"User","site_admin":false},"html_url":"https://github.com/abhinavg27/sysfoo","description":"Sample java webapp with maven which prints system info","fork":true,"url":"https://api.github.com/repos/abhinavg27/sysfoo","forks_url":"https://api.github.com/repos/abhinavg27/sysfoo/forks","keys_url":"https://api.github.com/repos/abhinavg27/sysfoo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/abhinavg27/sysfoo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/abhinavg27/sysfoo/teams","hooks_url":"https://api.github.com/repos/abhinavg27/sysfoo/hooks","issue_events_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues/events{/number}","events_url":"https://api.github.com/repos/abhinavg27/sysfoo/events","assignees_url":"https://api.github.com/repos/abhinavg27/sysfoo/assignees{/user}","branches_url":"https://api.github.com/repos/abhinavg27/sysfoo/branches{/branch}","tags_url":"https://api.github.com/repos/abhinavg27/sysfoo/tags","blobs_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/refs{/sha}","trees_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/abhinavg27/sysfoo/statuses/{sha}","languages_url":"https://api.github.com/repos/abhinavg27/sysfoo/languages","stargazers_url":"https://api.github.com/repos/abhinavg27/sysfoo/stargazers","contributors_url":"https://api.github.com/repos/abhinavg27/sysfoo/contributors","subscribers_url":"https://api.github.com/repos/abhinavg27/sysfoo/subscribers","subscription_url":"https://api.github.com/repos/abhinavg27/sysfoo/subscription","commits_url":"https://api.github.com/repos/abhinavg27/sysfoo/commits{/sha}","git_commits_url":"https://api.github.com/repos/abhinavg27/sysfoo/git/commits{/sha}","comments_url":"https://api.github.com/repos/abhinavg27/sysfoo/comments{/number}","issue_comment_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues/comments{/number}","contents_url":"https://api.github.com/repos/abhinavg27/sysfoo/contents/{+path}","compare_url":"https://api.github.com/repos/abhinavg27/sysfoo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/abhinavg27/sysfoo/merges","archive_url":"https://api.github.com/repos/abhinavg27/sysfoo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/abhinavg27/sysfoo/downloads","issues_url":"https://api.github.com/repos/abhinavg27/sysfoo/issues{/number}","pulls_url":"https://api.github.com/repos/abhinavg27/sysfoo/pulls{/number}","milestones_url":"https://api.github.com/repos/abhinavg27/sysfoo/milestones{/number}","notifications_url":"https://api.github.com/repos/abhinavg27/sysfoo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/abhinavg27/sysfoo/labels{/name}","releases_url":"https://api.github.com/repos/abhinavg27/sysfoo/releases{/id}","deployments_url":"https://api.github.com/repos/abhinavg27/sysfoo/deployments","created_at":"2021-07-19T13:58:05Z","updated_at":"2021-07-20T11:29:25Z","pushed_at":"2021-07-20T12:38:42Z","git_url":"git://github.com/abhinavg27/sysfoo.git","ssh_url":"git@github.com:abhinavg27/sysfoo.git","clone_url":"https://github.com/abhinavg27/sysfoo.git","svn_url":"https://github.com/abhinavg27/sysfoo","homepage":null,"size":1656,"stargazers_count":0,"watchers_count":0,"language":"SCSS","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1"},"html":{"href":"https://github.com/abhinavg27/sysfoo/pull/1"},"issue":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/issues/1"},"comments":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/abhinavg27/sysfoo/statuses/40c2b9023159a7b4629e82e98f54df872d8825e1"}},"author_association":"OWNER","auto_merge":null,"active_lock_reason":null}},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340191","type":"CreateEvent","actor":{"id":68545867,"login":"suman7569","display_login":"suman7569","gravatar_id":"","url":"https://api.github.com/users/suman7569","avatar_url":"https://avatars.githubusercontent.com/u/68545867?"},"repo":{"id":388056970,"name":"suman7569/Video_Calling","url":"https://api.github.com/repos/suman7569/Video_Calling"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340199","type":"PushEvent","actor":{"id":43335750,"login":"paologallinaharbur","display_login":"paologallinaharbur","gravatar_id":"","url":"https://api.github.com/users/paologallinaharbur","avatar_url":"https://avatars.githubusercontent.com/u/43335750?"},"repo":{"id":385546865,"name":"newrelic-forks/entity-definitions","url":"https://api.github.com/repos/newrelic-forks/entity-definitions"},"payload":{"push_id":7562451444,"size":1,"distinct_size":1,"ref":"refs/heads/pgallina/powerDNS","head":"302b0f1a51ce7a0b74b147a2f17bc526a2db3613","before":"109bf65708bfa0b2ecb69984597397e08065380d","commits":[{"sha":"302b0f1a51ce7a0b74b147a2f17bc526a2db3613","author":{"name":"paologallinaharbur","email":"58deb4c7dc322085b6f44f808f6cc1b2d6d2895d@gmail.com"},"message":"feat(dashboards): updated Dashboards for powerdns","distinct":true,"url":"https://api.github.com/repos/newrelic-forks/entity-definitions/commits/302b0f1a51ce7a0b74b147a2f17bc526a2db3613"}]},"public":true,"created_at":"2021-07-21T09:00:04Z","org":{"id":8526625,"login":"newrelic-forks","gravatar_id":"","url":"https://api.github.com/orgs/newrelic-forks","avatar_url":"https://avatars.githubusercontent.com/u/8526625?"}}
+{"id":"17246340203","type":"DeleteEvent","actor":{"id":7077857,"login":"peterbarker","display_login":"peterbarker","gravatar_id":"","url":"https://api.github.com/users/peterbarker","avatar_url":"https://avatars.githubusercontent.com/u/7077857?"},"repo":{"id":34165570,"name":"peterbarker/ardupilot","url":"https://api.github.com/repos/peterbarker/ardupilot"},"payload":{"ref":"pr/drain-pexpects-in-set_parameters-loop","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340206","type":"CreateEvent","actor":{"id":87755047,"login":"dasintasuheri","display_login":"dasintasuheri","gravatar_id":"","url":"https://api.github.com/users/dasintasuheri","avatar_url":"https://avatars.githubusercontent.com/u/87755047?"},"repo":{"id":388056973,"name":"dasintasuheri/dsinta","url":"https://api.github.com/repos/dasintasuheri/dsinta"},"payload":{"ref":null,"ref_type":"repository","master_branch":"main","description":null,"pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340209","type":"PushEvent","actor":{"id":20703732,"login":"junjie2018","display_login":"junjie2018","gravatar_id":"","url":"https://api.github.com/users/junjie2018","avatar_url":"https://avatars.githubusercontent.com/u/20703732?"},"repo":{"id":382508484,"name":"junjie2018/junjie2018.github.io","url":"https://api.github.com/repos/junjie2018/junjie2018.github.io"},"payload":{"push_id":7562451435,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"49c4b55f2c4ba821673b403fd1ec1a6198e710ca","before":"3ebd32937852df67f5db62d42d637a5e89b5e715","commits":[{"sha":"49c4b55f2c4ba821673b403fd1ec1a6198e710ca","author":{"name":"小桀","email":"0955e153c666b72b7cede7efc5d13eb56c6f89b7@qq.com"},"message":"from github actions","distinct":true,"url":"https://api.github.com/repos/junjie2018/junjie2018.github.io/commits/49c4b55f2c4ba821673b403fd1ec1a6198e710ca"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340219","type":"PushEvent","actor":{"id":5253690,"login":"weirdcalculator","display_login":"weirdcalculator","gravatar_id":"","url":"https://api.github.com/users/weirdcalculator","avatar_url":"https://avatars.githubusercontent.com/u/5253690?"},"repo":{"id":153466799,"name":"weirdcalculator/wptdolphin","url":"https://api.github.com/repos/weirdcalculator/wptdolphin"},"payload":{"push_id":7562451473,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"b5e6e711f092c8b601e284af666927e872545973","before":"df45489efc07509c7b3714561e54329006f888b7","commits":[{"sha":"b5e6e711f092c8b601e284af666927e872545973","author":{"name":"Amin","email":"f839be73d85218da9157c84c3cf7240c2e88dab7@gmail.com"},"message":"test update","distinct":true,"url":"https://api.github.com/repos/weirdcalculator/wptdolphin/commits/b5e6e711f092c8b601e284af666927e872545973"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340228","type":"PushEvent","actor":{"id":59016359,"login":"ewp-scripts","display_login":"ewp-scripts","gravatar_id":"","url":"https://api.github.com/users/ewp-scripts","avatar_url":"https://avatars.githubusercontent.com/u/59016359?"},"repo":{"id":225612963,"name":"erasmus-without-paper/ewp-registry-log-prod","url":"https://api.github.com/repos/erasmus-without-paper/ewp-registry-log-prod"},"payload":{"push_id":7562451471,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"0a8c848f9eb232e57bc95ae967d2946a3e63b9f9","before":"30b8c3d161b001b5123cce7a9d6db20738f1fea4","commits":[{"sha":"18654d2c51e8b64e528bc984a8a6c7bbe8a9f8de","author":{"name":"EWP Registry Service","email":"8254d1186852c26c9fb3d343db6a5be86317fea9@registry.erasmuswithoutpaper.eu"},"message":"Update manifest: https://ewp.ugent.be/public-api/discovery/manifest.xml","distinct":true,"url":"https://api.github.com/repos/erasmus-without-paper/ewp-registry-log-prod/commits/18654d2c51e8b64e528bc984a8a6c7bbe8a9f8de"},{"sha":"0a8c848f9eb232e57bc95ae967d2946a3e63b9f9","author":{"name":"EWP Registry Service","email":"8254d1186852c26c9fb3d343db6a5be86317fea9@registry.erasmuswithoutpaper.eu"},"message":"Update manifest: https://ewp.erasmusport.com/manifest.xml","distinct":true,"url":"https://api.github.com/repos/erasmus-without-paper/ewp-registry-log-prod/commits/0a8c848f9eb232e57bc95ae967d2946a3e63b9f9"}]},"public":true,"created_at":"2021-07-21T09:00:04Z","org":{"id":15247436,"login":"erasmus-without-paper","gravatar_id":"","url":"https://api.github.com/orgs/erasmus-without-paper","avatar_url":"https://avatars.githubusercontent.com/u/15247436?"}}
+{"id":"17246340232","type":"DeleteEvent","actor":{"id":10650072,"login":"nsteenbeek","display_login":"nsteenbeek","gravatar_id":"","url":"https://api.github.com/users/nsteenbeek","avatar_url":"https://avatars.githubusercontent.com/u/10650072?"},"repo":{"id":223273550,"name":"hso-nn/d365-cli","url":"https://api.github.com/repos/hso-nn/d365-cli"},"payload":{"ref":"bugfix/5.0.3","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:04Z","org":{"id":59829618,"login":"hso-nn","gravatar_id":"","url":"https://api.github.com/orgs/hso-nn","avatar_url":"https://avatars.githubusercontent.com/u/59829618?"}}
+{"id":"17246340237","type":"DeleteEvent","actor":{"id":10810283,"login":"direwolf-github","display_login":"direwolf-github","gravatar_id":"","url":"https://api.github.com/users/direwolf-github","avatar_url":"https://avatars.githubusercontent.com/u/10810283?"},"repo":{"id":388056838,"name":"direwolf-github/my-app-91037827","url":"https://api.github.com/repos/direwolf-github/my-app-91037827"},"payload":{"ref":"branch-0f271523","ref_type":"branch","pusher_type":"user"},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340244","type":"PushEvent","actor":{"id":24226219,"login":"Nasfame","display_login":"Nasfame","gravatar_id":"","url":"https://api.github.com/users/Nasfame","avatar_url":"https://avatars.githubusercontent.com/u/24226219?"},"repo":{"id":362322638,"name":"Nasfame/Mibonacci","url":"https://api.github.com/repos/Nasfame/Mibonacci"},"payload":{"push_id":7562451472,"size":10,"distinct_size":10,"ref":"refs/heads/master","head":"c3afde09957e3c350507b6daddb6413bf15731c7","before":"5aec37f7f05577a018a0cee3583e2c3b2830ff19","commits":[{"sha":"b87deda2f5674f37fb4c0dd371e56de207aa361a","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"timeit/4407.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/b87deda2f5674f37fb4c0dd371e56de207aa361a"},{"sha":"207003d35f4849472500290c35457bcf7f552556","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"4408.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/207003d35f4849472500290c35457bcf7f552556"},{"sha":"834bb652868807f5487e8d00bbbaefd26593d8bb","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"timeit/4408.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/834bb652868807f5487e8d00bbbaefd26593d8bb"},{"sha":"aec40ddd363e14ad28ce31d30e16800b9ab47ac5","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"4409.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/aec40ddd363e14ad28ce31d30e16800b9ab47ac5"},{"sha":"e89c83afaa4152948c63e886cd9b48eb6ba5a0aa","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"timeit/4409.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/e89c83afaa4152948c63e886cd9b48eb6ba5a0aa"},{"sha":"2effccb44329698d447af60fe12fafcd38767730","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"4410.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/2effccb44329698d447af60fe12fafcd38767730"},{"sha":"83f2966b0d563f5f35e5866ba4bda5d54df30c19","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"timeit/4410.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/83f2966b0d563f5f35e5866ba4bda5d54df30c19"},{"sha":"d509e748cfdc94f64d4100e9799276e7f1388314","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"4411.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/d509e748cfdc94f64d4100e9799276e7f1388314"},{"sha":"262652bdef19ab55615ab41017b2e40e8eb5f0d7","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"timeit/4411.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/262652bdef19ab55615ab41017b2e40e8eb5f0d7"},{"sha":"c3afde09957e3c350507b6daddb6413bf15731c7","author":{"name":"Hiro Hamada","email":"d160ddea0366475ad05f3967f70c38535067c171@gmail.com"},"message":"4412.txt","distinct":true,"url":"https://api.github.com/repos/Nasfame/Mibonacci/commits/c3afde09957e3c350507b6daddb6413bf15731c7"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340248","type":"PullRequestEvent","actor":{"id":25895405,"login":"Zeroto521","display_login":"Zeroto521","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","avatar_url":"https://avatars.githubusercontent.com/u/25895405?"},"repo":{"id":373016534,"name":"Zeroto521/my-data-toolkit","url":"https://api.github.com/repos/Zeroto521/my-data-toolkit"},"payload":{"action":"closed","number":75,"pull_request":{"url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/75","id":694132621,"node_id":"MDExOlB1bGxSZXF1ZXN0Njk0MTMyNjIx","html_url":"https://github.com/Zeroto521/my-data-toolkit/pull/75","diff_url":"https://github.com/Zeroto521/my-data-toolkit/pull/75.diff","patch_url":"https://github.com/Zeroto521/my-data-toolkit/pull/75.patch","issue_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/75","number":75,"state":"closed","locked":false,"title":"EHN: assign new columns to dataframe via function","user":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"body":"- EHN: assign new columns to dataframe via function\r\n- TST, BUG: test assigntf + miss `operate` method in assigntf\r\n- add a new `make` command to lint source codes","created_at":"2021-07-21T07:45:37Z","updated_at":"2021-07-21T09:00:04Z","closed_at":"2021-07-21T09:00:04Z","merged_at":"2021-07-21T09:00:03Z","merge_commit_sha":"742fba6c6f86d0c6391cb409da8f13550021d6cf","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"draft":false,"commits_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/75/commits","review_comments_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/75/comments","review_comment_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/75/comments","statuses_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/statuses/4300023c620c73df8dab34f08126dd66edb09f27","head":{"label":"Zeroto521:tf","ref":"tf","sha":"4300023c620c73df8dab34f08126dd66edb09f27","user":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"repo":{"id":373016534,"node_id":"MDEwOlJlcG9zaXRvcnkzNzMwMTY1MzQ=","name":"my-data-toolkit","full_name":"Zeroto521/my-data-toolkit","private":false,"owner":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Zeroto521/my-data-toolkit","description":"A series of toolkits to decrease the same work include geographic calculation, data engineering, and so on.","fork":false,"url":"https://api.github.com/repos/Zeroto521/my-data-toolkit","forks_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/forks","keys_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/teams","hooks_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/hooks","issue_events_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/events{/number}","events_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/events","assignees_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/assignees{/user}","branches_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/branches{/branch}","tags_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/tags","blobs_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/statuses/{sha}","languages_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/languages","stargazers_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/stargazers","contributors_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/contributors","subscribers_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/subscribers","subscription_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/subscription","commits_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/contents/{+path}","compare_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/merges","archive_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/downloads","issues_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues{/number}","pulls_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls{/number}","milestones_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/milestones{/number}","notifications_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/labels{/name}","releases_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/releases{/id}","deployments_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/deployments","created_at":"2021-06-02T02:29:50Z","updated_at":"2021-07-21T07:44:15Z","pushed_at":"2021-07-21T09:00:03Z","git_url":"git://github.com/Zeroto521/my-data-toolkit.git","ssh_url":"git@github.com:Zeroto521/my-data-toolkit.git","clone_url":"https://github.com/Zeroto521/my-data-toolkit.git","svn_url":"https://github.com/Zeroto521/my-data-toolkit","homepage":"","size":216,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"Zeroto521:master","ref":"master","sha":"7d11b8637ecd957172105dface7b0009bf825ffe","user":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"repo":{"id":373016534,"node_id":"MDEwOlJlcG9zaXRvcnkzNzMwMTY1MzQ=","name":"my-data-toolkit","full_name":"Zeroto521/my-data-toolkit","private":false,"owner":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Zeroto521/my-data-toolkit","description":"A series of toolkits to decrease the same work include geographic calculation, data engineering, and so on.","fork":false,"url":"https://api.github.com/repos/Zeroto521/my-data-toolkit","forks_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/forks","keys_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/teams","hooks_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/hooks","issue_events_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/events{/number}","events_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/events","assignees_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/assignees{/user}","branches_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/branches{/branch}","tags_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/tags","blobs_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/refs{/sha}","trees_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/statuses/{sha}","languages_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/languages","stargazers_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/stargazers","contributors_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/contributors","subscribers_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/subscribers","subscription_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/subscription","commits_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/commits{/sha}","git_commits_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/git/commits{/sha}","comments_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/comments{/number}","issue_comment_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/comments{/number}","contents_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/contents/{+path}","compare_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/merges","archive_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/downloads","issues_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues{/number}","pulls_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls{/number}","milestones_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/milestones{/number}","notifications_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/labels{/name}","releases_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/releases{/id}","deployments_url":"https://api.github.com/repos/Zeroto521/my-data-toolkit/deployments","created_at":"2021-06-02T02:29:50Z","updated_at":"2021-07-21T07:44:15Z","pushed_at":"2021-07-21T09:00:03Z","git_url":"git://github.com/Zeroto521/my-data-toolkit.git","ssh_url":"git@github.com:Zeroto521/my-data-toolkit.git","clone_url":"https://github.com/Zeroto521/my-data-toolkit.git","svn_url":"https://github.com/Zeroto521/my-data-toolkit","homepage":"","size":216,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":1,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/75"},"html":{"href":"https://github.com/Zeroto521/my-data-toolkit/pull/75"},"issue":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/75"},"comments":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/issues/75/comments"},"review_comments":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/75/comments"},"review_comment":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/pulls/75/commits"},"statuses":{"href":"https://api.github.com/repos/Zeroto521/my-data-toolkit/statuses/4300023c620c73df8dab34f08126dd66edb09f27"}},"author_association":"OWNER","auto_merge":{"enabled_by":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"merge_method":"merge","commit_title":"EHN: assign new columns to dataframe via function (#75)","commit_message":"- EHN: assign new columns to dataframe via function\r\n- TST, BUG: test assigntf + miss `operate` method in assigntf\r\n- add a new `make` command to lint source codes"},"active_lock_reason":null,"merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"Zeroto521","id":25895405,"node_id":"MDQ6VXNlcjI1ODk1NDA1","avatar_url":"https://avatars.githubusercontent.com/u/25895405?v=4","gravatar_id":"","url":"https://api.github.com/users/Zeroto521","html_url":"https://github.com/Zeroto521","followers_url":"https://api.github.com/users/Zeroto521/followers","following_url":"https://api.github.com/users/Zeroto521/following{/other_user}","gists_url":"https://api.github.com/users/Zeroto521/gists{/gist_id}","starred_url":"https://api.github.com/users/Zeroto521/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Zeroto521/subscriptions","organizations_url":"https://api.github.com/users/Zeroto521/orgs","repos_url":"https://api.github.com/users/Zeroto521/repos","events_url":"https://api.github.com/users/Zeroto521/events{/privacy}","received_events_url":"https://api.github.com/users/Zeroto521/received_events","type":"User","site_admin":false},"comments":2,"review_comments":0,"maintainer_can_modify":false,"commits":5,"additions":35,"deletions":2,"changed_files":3}},"public":true,"created_at":"2021-07-21T09:00:04Z"}
+{"id":"17246340250","type":"PushEvent","actor":{"id":75016136,"login":"CastformMadrid","display_login":"CastformMadrid","gravatar_id":"","url":"https://api.github.com/users/CastformMadrid","avatar_url":"https://avatars.githubusercontent.com/u/75016136?"},"repo":{"id":315383656,"name":"alexelgt/Castform-Madrid","url":"https://api.github.com/repos/alexelgt/Castform-Madrid"},"payload":{"push_id":7562451482,"size":1,"distinct_size":1,"ref":"refs/heads/main","head":"a4708d6dcf8d8ba3b15c37ac47a92c29394e7c0d","before":"0a69f3e9a2644084e923725e8bed1eff1e10c7bd","commits":[{"sha":"a4708d6dcf8d8ba3b15c37ac47a92c29394e7c0d","author":{"name":"CastformMadrid","email":"4bf3034b7f6dbaf30fedab8adaf278c90d929f80@gmail.com"},"message":"21/7/2021 11:00","distinct":true,"url":"https://api.github.com/repos/alexelgt/Castform-Madrid/commits/a4708d6dcf8d8ba3b15c37ac47a92c29394e7c0d"}]},"public":true,"created_at":"2021-07-21T09:00:04Z"}
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/docker/pullRequestMergedEvents_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/docker/pullRequestMergedEvents_realtime_table_config.json
similarity index 100%
rename from pinot-tools/src/main/resources/examples/stream/githubEvents/docker/pullRequestMergedEvents_realtime_table_config.json
rename to pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/docker/pullRequestMergedEvents_realtime_table_config.json
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/pullRequestMergedEvents_kinesis_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_kinesis_realtime_table_config.json
similarity index 100%
rename from pinot-tools/src/main/resources/examples/stream/githubEvents/pullRequestMergedEvents_kinesis_realtime_table_config.json
rename to pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_kinesis_realtime_table_config.json
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/pullRequestMergedEvents_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_realtime_table_config.json
similarity index 100%
rename from pinot-tools/src/main/resources/examples/stream/githubEvents/pullRequestMergedEvents_realtime_table_config.json
rename to pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_realtime_table_config.json
diff --git a/pinot-tools/src/main/resources/examples/stream/githubEvents/pullRequestMergedEvents_schema.json b/pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_schema.json
similarity index 100%
rename from pinot-tools/src/main/resources/examples/stream/githubEvents/pullRequestMergedEvents_schema.json
rename to pinot-tools/src/main/resources/examples/stream/pullRequestMergedEvents/pullRequestMergedEvents_schema.json
diff --git a/pinot-tools/src/main/resources/examples/stream/upsertMeetupRsvp/upsertMeetupRsvp_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/upsertMeetupRsvp/upsertMeetupRsvp_realtime_table_config.json
index d29431c6835..d7fa20d8fc3 100644
--- a/pinot-tools/src/main/resources/examples/stream/upsertMeetupRsvp/upsertMeetupRsvp_realtime_table_config.json
+++ b/pinot-tools/src/main/resources/examples/stream/upsertMeetupRsvp/upsertMeetupRsvp_realtime_table_config.json
@@ -8,7 +8,7 @@
     "retentionTimeValue": "1",
     "segmentPushType": "APPEND",
     "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
-    "schemaName": "meetupRsvp",
+    "schemaName": "upsertMeetupRsvp",
     "replicasPerPartition": "1",
     "replicaGroupStrategyConfig": {
       "partitionColumn": "event_id",
@@ -57,6 +57,8 @@
     "instanceSelectorType": "strictReplicaGroup"
   },
   "upsertConfig": {
-    "mode": "FULL"
+    "mode": "FULL",
+    "enableSnapshot": "true",
+    "enablePreload": "true"
   }
 }
diff --git a/pinot-tools/src/main/resources/examples/stream/upsertPartialMeetupRsvp/upsertPartialMeetupRsvp_realtime_table_config.json b/pinot-tools/src/main/resources/examples/stream/upsertPartialMeetupRsvp/upsertPartialMeetupRsvp_realtime_table_config.json
index 2ebf3bb3795..e712f5f13dd 100644
--- a/pinot-tools/src/main/resources/examples/stream/upsertPartialMeetupRsvp/upsertPartialMeetupRsvp_realtime_table_config.json
+++ b/pinot-tools/src/main/resources/examples/stream/upsertPartialMeetupRsvp/upsertPartialMeetupRsvp_realtime_table_config.json
@@ -8,7 +8,7 @@
     "retentionTimeValue": "1",
     "segmentPushType": "APPEND",
     "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
-    "schemaName": "meetupRsvp",
+    "schemaName": "upsertPartialMeetupRsvp",
     "replicasPerPartition": "1"
   },
   "tenants": {},
diff --git a/pom.xml b/pom.xml
index 4c9b0510ef8..fdfe0506317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,22 +122,22 @@
     <SKIP_INTEGRATION_TESTS>true</SKIP_INTEGRATION_TESTS>
     <!-- Configuration for unit/integration tests section 1 of 3 (properties) ENDS HERE.-->
     <avro.version>1.9.2</avro.version>
-    <parquet.version>1.11.1</parquet.version>
+    <parquet.version>1.11.2</parquet.version>
     <helix.version>1.0.4</helix.version>
     <zkclient.version>0.7</zkclient.version>
     <jackson.version>2.12.7</jackson.version>
     <zookeeper.version>3.6.3</zookeeper.version>
     <async-http-client.version>2.12.3</async-http-client.version>
-    <jersey.version>2.35</jersey.version>
+    <jersey.version>2.39</jersey.version>
     <grizzly.version>2.4.4</grizzly.version>
     <hk2.version>2.6.1</hk2.version>
-    <swagger.version>1.6.6</swagger.version>
+    <swagger.version>1.6.9</swagger.version>
     <hadoop.version>2.10.1</hadoop.version>
     <antlr.version>4.6</antlr.version>
     <jsonpath.version>2.7.0</jsonpath.version>
-    <jsonsmart.version>2.4.7</jsonsmart.version>
+    <jsonsmart.version>2.4.10</jsonsmart.version>
     <quartz.version>2.3.2</quartz.version>
-    <calcite.version>1.29.0</calcite.version>
+    <calcite.version>1.30.0</calcite.version>
     <lucene.version>8.2.0</lucene.version>
     <reflections.version>0.9.11</reflections.version>
     <!-- commons-configuration, hadoop-common, hadoop-client use commons-lang -->
@@ -148,17 +148,18 @@
     <commons-net.version>3.1</commons-net.version>
     <!-- helix-core, spark-core use libraries from io.dropwizard.metrics -->
     <dropwizard-metrics.version>4.2.2</dropwizard-metrics.version>
-    <snappy-java.version>1.1.8.2</snappy-java.version>
+    <snappy-java.version>1.1.10.1</snappy-java.version>
     <zstd-jni.version>1.5.2-3</zstd-jni.version>
     <lz4-java.version>1.8.0</lz4-java.version>
     <log4j.version>2.17.1</log4j.version>
-    <netty.version>4.1.79.Final</netty.version>
+    <netty.version>4.1.94.Final</netty.version>
     <reactivestreams.version>1.0.3</reactivestreams.version>
-    <jts.version>1.16.1</jts.version>
-    <h3.version>4.0.0</h3.version>
+    <jts.version>1.19.0</jts.version>
+    <h3.version>4.1.1</h3.version>
     <jmh.version>1.26</jmh.version>
     <audienceannotations.version>0.13.0</audienceannotations.version>
-
+    <clp-ffi.version>0.4.3</clp-ffi.version>
+    <aws.sdk.version>2.20.94</aws.sdk.version>
     <!-- Sets the VM argument line used when unit tests are run. -->
     <argLine>-Xms4g -Xmx4g</argLine>
 
@@ -167,8 +168,8 @@
     To change kafka connector dependency, we only need to update this version number config.
     TODO: figure out a way to inject kafka dependency instead of explicitly setting the kafka module dependency -->
     <kafka.version>2.0</kafka.version>
-    <protobuf.version>3.19.2</protobuf.version>
-    <grpc.version>1.41.0</grpc.version>
+    <protobuf.version>3.22.0</protobuf.version>
+    <grpc.version>1.53.0</grpc.version>
     <confluent.version>5.5.3</confluent.version>
 
     <!-- Checkstyle violation prop.-->
@@ -249,6 +250,23 @@
           </plugins>
         </pluginManagement>
       </build>
+      <dependencyManagement>
+        <!-- The updated version of these plugins don't work on Java 8 -->
+        <dependencies>
+          <dependency>
+            <groupId>nl.jqno.equalsverifier</groupId>
+            <artifactId>equalsverifier</artifactId>
+            <version>3.6</version>
+            <scope>test</scope>
+          </dependency>
+          <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.12.4</version>
+            <scope>test</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
     </profile>
     <profile>
       <id>other-jdk-maven-compiler-plugin</id>
@@ -422,7 +440,7 @@
       <dependency>
         <groupId>nl.jqno.equalsverifier</groupId>
         <artifactId>equalsverifier</artifactId>
-        <version>3.6</version>
+        <version>3.14.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -463,17 +481,33 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>20.0</version>
+        <version>32.0.1-jre</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auto.service</groupId>
+        <artifactId>auto-service</artifactId>
+        <version>1.0.1</version>
+        <optional>true</optional> <!-- This is only needed at compilation time as an annotation processor -->
       </dependency>
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.2</version>
+        <version>1.5.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.11</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
@@ -523,7 +557,7 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.10.5</version>
+        <version>2.11.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
@@ -649,7 +683,7 @@
       <dependency>
         <groupId>org.yaml</groupId>
         <artifactId>snakeyaml</artifactId>
-        <version>1.33</version>
+        <version>2.0</version>
       </dependency>
       <dependency>
         <groupId>org.xerial.larray</groupId>
@@ -853,30 +887,10 @@
         <artifactId>orc-mapreduce</artifactId>
         <version>1.5.9</version>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
-        <version>1.9.13</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
-        <version>1.9.13</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-jaxrs</artifactId>
-        <version>1.9.13</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-xc</artifactId>
-        <version>1.9.13</version>
-      </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>swagger-ui</artifactId>
-        <version>3.23.11</version>
+        <version>5.1.0</version>
       </dependency>
       <dependency>
         <groupId>com.clearspring.analytics</groupId>
@@ -886,7 +900,7 @@
       <dependency>
         <groupId>org.apache.datasketches</groupId>
         <artifactId>datasketches-java</artifactId>
-        <version>1.2.0-incubating</version>
+        <version>4.1.0</version>
       </dependency>
       <dependency>
         <groupId>com.tdunning</groupId>
@@ -979,7 +993,7 @@
       <dependency>
         <groupId>com.jcabi</groupId>
         <artifactId>jcabi-log</artifactId>
-        <version>0.17.1</version>
+        <version>0.18.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -1100,7 +1114,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.9.0</version>
+        <version>5.3.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1117,12 +1131,17 @@
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>1.4.193</version>
+        <version>2.2.220</version>
       </dependency>
       <dependency>
         <groupId>com.github.jnr</groupId>
         <artifactId>jnr-posix</artifactId>
-        <version>3.0.12</version>
+        <version>3.1.15</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.jnr</groupId>
+        <artifactId>jnr-constants</artifactId>
+        <version>0.10.3</version>
       </dependency>
       <dependency>
         <groupId>info.picocli</groupId>
@@ -1204,12 +1223,66 @@
         <artifactId>h3</artifactId>
         <version>${h3.version}</version>
       </dependency>
-
       <dependency>
         <groupId>com.github.seancfoley</groupId>
         <artifactId>ipaddress</artifactId>
         <version>5.3.4</version>
       </dependency>
+      <dependency>
+        <groupId>com.mercateo</groupId>
+        <artifactId>test-clock</artifactId>
+        <version>1.0.2</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <!-- Older versions fail with Java >= 16 -->
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <version>1.18.28</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.openhft</groupId>
+        <artifactId>posix</artifactId>
+        <version>2.23.2</version>
+      </dependency>
+      <dependency>
+        <groupId>net.openhft</groupId>
+        <artifactId>chronicle-core</artifactId>
+        <version>2.24ea16</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>9.3</version>
+      </dependency>
+      <dependency>
+        <groupId>net.java.dev.jna</groupId>
+        <artifactId>jna</artifactId>
+        <version>5.5.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.yscope.clp</groupId>
+        <artifactId>clp-ffi</artifactId>
+        <version>${clp-ffi.version}</version>
+      </dependency>
+
+      <!-- This configures all aws sdk dependencies. -->
+      <!-- See https://reflectoring.io/maven-bom/ to understand how this work -->
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>bom</artifactId>
+        <version>${aws.sdk.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -1342,13 +1415,22 @@
             </systemPropertyVariables>
             <trimStackTrace>false</trimStackTrace>
             <reportFormat>plain</reportFormat>
+            <argLine>
+              ${argLine}
+              --add-opens=java.base/java.nio=ALL-UNNAMED
+              --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+              --add-opens=java.base/java.lang=ALL-UNNAMED
+              --add-opens=java.base/java.util=ALL-UNNAMED
+              --add-exports=java.base/jdk.internal.util.random=ALL-UNNAMED
+              --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+            </argLine>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
           <!-- Note that 3.0.0, while newer, has bugs w/provided transitive dependencies -->
-          <version>3.0.0-M3</version>
+          <version>3.2.1</version>
           <executions>
             <execution>
               <id>enforce-dependency-convergence</id>
@@ -1367,7 +1449,7 @@
         <plugin>
           <groupId>com.mycila</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>4.0</version>
+          <version>4.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1555,7 +1637,7 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>4.0</version>
+        <version>4.2</version>
         <configuration>
           <header>${pinot.root}/HEADER</header>
           <headerDefinitions>
@@ -1570,6 +1652,7 @@
             <exclude>**/*.generated</exclude>
             <exclude>**/*.json</exclude>
             <exclude>**/*.schema</exclude>
+            <exclude>**/*.sql</exclude>
 
             <!-- JDBC Drivers -->
             <exclude>**/java.sql.*</exclude>
@@ -1683,6 +1766,7 @@
             <exclude>**/*.generated</exclude>
             <exclude>**/*.json</exclude>
             <exclude>**/*.schema</exclude>
+            <exclude>**/*.sql</exclude>
 
             <!-- JDBC Drivers -->
             <exclude>**/java.sql.*</exclude>